diff options
| author | Ruben Pollan <meskio@sindominio.net> | 2014-10-08 09:24:36 -0500 |
|---|---|---|
| committer | Ruben Pollan <meskio@sindominio.net> | 2014-10-08 09:24:36 -0500 |
| commit | e22295c56a39a31602b58186afa528513363fe35 (patch) | |
| tree | 7655d34e19725bef849bc02282ecfdbfa141518d /src | |
| parent | 24ff067793ad1d9e347ea96da2d262f2f8cb8977 (diff) | |
| parent | 34c81307e58f0356ae7275c88590d77728367fee (diff) | |
Merge branch 'ivan/bug/fix-strings' into develop
Diffstat (limited to 'src')
| -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 |
3 files changed, 3 insertions, 16 deletions
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/> |