From 4426635373a4f59249f4da17b581cea3ee7f33d8 Mon Sep 17 00:00:00 2001
From: Ivan Alejandro <ivanalejandro0@gmail.com>
Date: Wed, 22 Jan 2014 14:58:38 -0300
Subject: Don't use an empty password to configure email.

- Also add translation support for the help message.

[Closes #4985]
---
 changes/bug-4985_config-help-menu-non-empty-password | 1 +
 src/leap/bitmask/gui/mainwindow.py                   | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 changes/bug-4985_config-help-menu-non-empty-password

diff --git a/changes/bug-4985_config-help-menu-non-empty-password b/changes/bug-4985_config-help-menu-non-empty-password
new file mode 100644
index 00000000..c6c5266f
--- /dev/null
+++ b/changes/bug-4985_config-help-menu-non-empty-password
@@ -0,0 +1 @@
+- Config help menu: do not use an empty password. Closes #4985.
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py
index 3f41900b..ffedfa1c 100644
--- a/src/leap/bitmask/gui/mainwindow.py
+++ b/src/leap/bitmask/gui/mainwindow.py
@@ -888,7 +888,7 @@ class MainWindow(QtGui.QMainWindow):
         url = ("<a href='https://addons.mozilla.org/es/thunderbird/"
                "addon/bitmask/'>bitmask addon</a>")
 
-        msg = (
+        msg = self.tr(
             "<strong>Instructions to use mail:</strong><br>"
             "If you use Thunderbird you can use the Bitmask extension helper. "
             "Search for 'Bitmask' in the add-on manager or download it "
@@ -898,7 +898,8 @@ class MainWindow(QtGui.QMainWindow):
             "   Incoming -> IMAP, port: {1}<br>"
             "   Outgoing -> SMTP, port: {2}<br>"
             "   Username -> your bitmask username.<br>"
-            "   Password -> leave it empty."
+            "   Password -> does not matter, use any text. "
+            " Just don't leave it empty and don't use your account's password."
             "</em>").format(url, IMAP_PORT, smtp_port)
         QtGui.QMessageBox.about(self, self.tr("Bitmask Help"), msg)
 
-- 
cgit v1.2.3