From 34c81307e58f0356ae7275c88590d77728367fee Mon Sep 17 00:00:00 2001
From: Ivan Alejandro <ivanalejandro0@gmail.com>
Date: Tue, 7 Oct 2014 17:01:14 -0300
Subject: Fix typos on strings and remove unused button.

This was reported by the user 'strel' on transifex.
---
 data/ts/en_US.ts                                  | 25 +++++++++--------------
 src/leap/bitmask/gui/advanced_key_management.py   |  2 +-
 src/leap/bitmask/gui/eip_status.py                |  4 ++--
 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
@@ -116,11 +116,6 @@ Import canceled.</source>
 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>
@@ -168,6 +163,11 @@ Export canceled.</source>
         <source>&lt;span style=&apos;color:#0000FF;&apos;&gt;NOTE&lt;/span&gt;: </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>
@@ -378,11 +378,6 @@ Export canceled.</source>
         <source>We could not find openvpn binary.</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.&lt;br/&gt;Make sure you have&lt;b&gt;polkit-gnome-authentication-agent-1&lt;/b&gt; 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 &lt;b&gt;pkexec&lt;/b&gt; in your system.</source>
@@ -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.&lt;br/&gt;Make sure you have &lt;b&gt;polkit-gnome-authentication-agent-1&lt;/b&gt; 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/>
-- 
cgit v1.2.3