diff options
| author | Tomás Touceda <chiiph@leap.se> | 2014-01-22 15:09:57 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2014-01-22 15:09:57 -0300 |
| commit | fd1a1d3b6d1492e3746ba43591a8e458eb33b592 (patch) | |
| tree | ae67ef9a0bf15e34ca5d4ff684f51a968681423f | |
| parent | 8a05b6fcc913a21ce7b3fa950c63a2ebda76c6f2 (diff) | |
| parent | 4426635373a4f59249f4da17b581cea3ee7f33d8 (diff) | |
Merge remote-tracking branch 'refs/remotes/ivan/bug/4985_config-help-menu-non-empty-password' into develop
| -rw-r--r-- | changes/bug-4985_config-help-menu-non-empty-password | 1 | ||||
| -rw-r--r-- | src/leap/bitmask/gui/mainwindow.py | 5 |
2 files changed, 4 insertions, 2 deletions
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) |