diff options
| -rw-r--r-- | data/ts/en_US.ts | 25 | ||||
| -rw-r--r-- | src/leap/bitmask/gui/advanced_key_management.py | 2 | ||||
| -rw-r--r-- | src/leap/bitmask/gui/eip_status.py | 4 | ||||
| -rw-r--r-- | src/leap/bitmask/gui/ui/preferences_email_page.ui | 13 |
4 files changed, 13 insertions, 31 deletions
diff --git a/data/ts/en_US.ts b/data/ts/en_US.ts index 87aaf0e3..8b457988 100644 --- a/data/ts/en_US.ts +++ b/data/ts/en_US.ts @@ -117,11 +117,6 @@ Import canceled.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/advanced_key_management.py" line="125"/> - <source>Are you sure that you want to replace the current key pair whith the imported?</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/leap/bitmask/gui/advanced_key_management.py" line="144"/> <source>Import Successful</source> <translation type="unfinished"></translation> @@ -168,6 +163,11 @@ Export canceled.</source> <source><span style='color:#0000FF;'>NOTE</span>: </source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../src/leap/bitmask/gui/advanced_key_management.py" line="125"/> + <source>Are you sure that you want to replace the current key pair with the imported?</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>App</name> @@ -379,11 +379,6 @@ Export canceled.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/eip_status.py" line="746"/> - <source>We could not find any authentication agent in your system.<br/>Make sure you have<b>polkit-gnome-authentication-agent-1</b> running andtry again.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/leap/bitmask/gui/eip_status.py" line="754"/> <source>We could not find <b>pkexec</b> in your system.</source> <translation type="unfinished"></translation> @@ -413,6 +408,11 @@ Export canceled.</source> <source>Encrypted Internet failed to start</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../src/leap/bitmask/gui/eip_status.py" line="746"/> + <source>We could not find any authentication agent in your system.<br/>Make sure you have <b>polkit-gnome-authentication-agent-1</b> running and try again.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Form</name> @@ -1179,11 +1179,6 @@ Export canceled.</source> <source>Form</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../src/leap/bitmask/gui/ui/preferences_email_page.ui" line="26"/> - <source>PushButton</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>PreferencesVpnPage</name> diff --git a/src/leap/bitmask/gui/advanced_key_management.py b/src/leap/bitmask/gui/advanced_key_management.py index b3a4ed8e..48a1db93 100644 --- a/src/leap/bitmask/gui/advanced_key_management.py +++ b/src/leap/bitmask/gui/advanced_key_management.py @@ -121,7 +121,7 @@ class AdvancedKeyManagement(QtGui.QDialog): if file_name: question = self.tr("Are you sure that you want to replace " - "the current key pair whith the imported?") + "the current key pair with the imported?") res = QtGui.QMessageBox.question( None, "Change key pair", question, QtGui.QMessageBox.Yes | QtGui.QMessageBox.No, diff --git a/src/leap/bitmask/gui/eip_status.py b/src/leap/bitmask/gui/eip_status.py index a5cd03d3..14ff5972 100644 --- a/src/leap/bitmask/gui/eip_status.py +++ b/src/leap/bitmask/gui/eip_status.py @@ -741,8 +741,8 @@ class EIPStatusWidget(QtGui.QWidget): # XXX this should change to polkit-kde where # applicable. self.tr("We could not find any authentication agent in your " - "system.<br/>Make sure you have" - "<b>polkit-gnome-authentication-agent-1</b> running and" + "system.<br/>Make sure you have " + "<b>polkit-gnome-authentication-agent-1</b> running and " "try again."), error=True) self.set_eipstatus_off() diff --git a/src/leap/bitmask/gui/ui/preferences_email_page.ui b/src/leap/bitmask/gui/ui/preferences_email_page.ui index 41b3c28d..7cc5bb3c 100644 --- a/src/leap/bitmask/gui/ui/preferences_email_page.ui +++ b/src/leap/bitmask/gui/ui/preferences_email_page.ui @@ -13,19 +13,6 @@ <property name="windowTitle"> <string>Form</string> </property> - <widget class="QPushButton" name="pushButton"> - <property name="geometry"> - <rect> - <x>250</x> - <y>210</y> - <width>98</width> - <height>27</height> - </rect> - </property> - <property name="text"> - <string>PushButton</string> - </property> - </widget> </widget> <resources/> <connections/> |