diff options
author | Ivan Alejandro <ivanalejandro0@gmail.com> | 2014-09-22 16:17:02 -0300 |
---|---|---|
committer | Ivan Alejandro <ivanalejandro0@gmail.com> | 2014-09-22 16:17:02 -0300 |
commit | c1fa3959fbffb381e067dcd619d528412e235401 (patch) | |
tree | 72662a8d2102dd782d68006d69e3b3058d8bd899 /src/leap/bitmask/gui/ui/mainwindow.ui | |
parent | 30fe51fa5c90a5ec08491b6d3f8524838ec75ac2 (diff) | |
parent | 668a9f9aa327c3c055b9e0f641f8c33d59e1c452 (diff) |
Merge remote-tracking branch 'elijah/feature/prefui' into develop
Diffstat (limited to 'src/leap/bitmask/gui/ui/mainwindow.ui')
-rw-r--r-- | src/leap/bitmask/gui/ui/mainwindow.ui | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/leap/bitmask/gui/ui/mainwindow.ui b/src/leap/bitmask/gui/ui/mainwindow.ui index f7570ee6..b1d68c4a 100644 --- a/src/leap/bitmask/gui/ui/mainwindow.ui +++ b/src/leap/bitmask/gui/ui/mainwindow.ui @@ -317,7 +317,6 @@ <addaction name="action_advanced_key_management"/> <addaction name="separator"/> <addaction name="action_preferences"/> - <addaction name="action_eip_preferences"/> <addaction name="separator"/> <addaction name="action_quit"/> </widget> @@ -338,12 +337,7 @@ <bool>true</bool> </property> <property name="text"> - <string>Account Preferences...</string> - </property> - </action> - <action name="action_eip_preferences"> - <property name="text"> - <string>Internet Preferences...</string> + <string>Pr&eferences...</string> </property> </action> <action name="action_quit"> |