Merge branch 'deb-0.7.1-rc4' into debian

9 files changed, 10 insertions, 25 deletions

diff --git a/src/leap/bitmask/_version.py b/src/leap/bitmask/_version.py
index c9c934a0..59a59fa3 100644
--- a/src/leap/bitmask/_version.py
+++ b/src/leap/bitmask/_version.py
@@ -5,8 +5,8 @@
 # unpacked source archive. Distribution tarballs contain a pre-generated copy
 # of this file.
 
-version_version = '0.7.0-rc1'
-version_full = 'f7da7ebb24e1a1c1f65cd257e949c0aa7ff23781'
+version_version = '0.7.0rc4'
+version_full = 'ed2274b7d90a9b487f201355d16507f98aead905'
 
 
 def get_versions(default={}, verbose=False):
diff --git a/src/leap/bitmask/config/providerconfig.py b/src/leap/bitmask/config/providerconfig.py
index 57bc3a98..386c697d 100644
--- a/src/leap/bitmask/config/providerconfig.py
+++ b/src/leap/bitmask/config/providerconfig.py
@@ -201,7 +201,8 @@ class ProviderConfig(BaseConfig):
             leap_check(cert_exists, error_msg, MissingCACert)
             logger.debug("Going to verify SSL against %s" % (cert_path,))
 
-        return cert_path
+        # OpenSSL does not handle unicode.
+        return cert_path.encode('utf-8')
 
     def provides_eip(self):
         """
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/provider/providerbootstrapper.py b/src/leap/bitmask/provider/providerbootstrapper.py
index 71edbb87..8eefb9d9 100644
--- a/src/leap/bitmask/provider/providerbootstrapper.py
+++ b/src/leap/bitmask/provider/providerbootstrapper.py
@@ -148,7 +148,6 @@ class ProviderBootstrapper(AbstractBootstrapper):
                                     timeout=REQUEST_TIMEOUT)
             res.raise_for_status()
         except requests.exceptions.SSLError as exc:
-            logger.exception(exc)
             self._err_msg = self.tr("Provider certificate could "
                                     "not be verified")
             raise
@@ -156,7 +155,6 @@ class ProviderBootstrapper(AbstractBootstrapper):
             # XXX careful!. The error might be also a SSL handshake
             # timeout error, in which case we should retry a couple of times
             # more, for cases where the ssl server gives high latencies.
-            logger.exception(exc)
             self._err_msg = self.tr("Provider does not support HTTPS")
             raise
 
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__)