Merge tag '0.7.0rc3' into deb-0.7.1-rc3

Tag leap.bitmask version 0.7.0rc3

Conflicts:
	src/leap/bitmask/services/soledad/soledadbootstrapper.py

6 files changed, 6 insertions, 20 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/loggerwindow.py b/src/leap/bitmask/gui/loggerwindow.py
index 360dd5f0..463d2412 100644
--- a/src/leap/bitmask/gui/loggerwindow.py
+++ b/src/leap/bitmask/gui/loggerwindow.py
@@ -225,7 +225,7 @@ class LoggerWindow(QtGui.QDialog):
 
         msg = self.tr("Sending logs to Pastebin failed!")
         if isinstance(failure, pastebin.PostLimitError):
-            msg = self.tr('Maximum posts per day reached')
+            msg = self.tr('Maximum amount of submissions reached for today.')
 
         # We save the dialog in an instance member to avoid dialog being
         # deleted right after we exit this method
diff --git a/src/leap/bitmask/gui/mail_status.py b/src/leap/bitmask/gui/mail_status.py
index d523f449..92e1e4c4 100644
--- a/src/leap/bitmask/gui/mail_status.py
+++ b/src/leap/bitmask/gui/mail_status.py
@@ -228,7 +228,7 @@ class MailStatusWidget(QtGui.QWidget):
                     self._service_name))
         elif ready == 1:
             icon = self.CONNECTING_ICON
-            self._mx_status = self.tr('Starting…')
+            self._mx_status = self.tr('Starting...')
             tray_status = self.tr('Mail is starting')
         elif ready >= 2:
             icon = self.CONNECTED_ICON
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/>
diff --git a/src/leap/bitmask/services/soledad/soledadbootstrapper.py b/src/leap/bitmask/services/soledad/soledadbootstrapper.py
index 02ad9403..c4e43bfe 100644
--- a/src/leap/bitmask/services/soledad/soledadbootstrapper.py
+++ b/src/leap/bitmask/services/soledad/soledadbootstrapper.py
@@ -45,8 +45,7 @@ from leap.common.files import which
 from leap.keymanager import KeyManager, openpgp
 from leap.keymanager.errors import KeyNotFound
 from leap.soledad.common.errors import InvalidAuthTokenError
-from leap.soledad.client import Soledad
-from leap.soledad.client import BootstrapSequenceError
+from leap.soledad.client import Soledad, BootstrapSequenceError
 
 logger = logging.getLogger(__name__)