diff options
| author | Tomás Touceda <chiiph@leap.se> | 2014-07-11 16:50:17 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2014-07-11 16:50:17 -0300 |
| commit | 8a721bd351d1ab47004e4835faaec70c73d3c1c0 (patch) | |
| tree | c8a55fbeb218a23d9261ebde99a4fd3c42b69330 | |
| parent | aa1241acb0c2480b3368337193df675a5ea2ecbc (diff) | |
| parent | 2bf9a1c9768e13a148d4bc92687f8cae9fbc2198 (diff) | |
Merge remote-tracking branch 'refs/remotes/ivan/bug/5875_better-initial-sync-message' into develop
| -rw-r--r-- | changes/bug-5875_better-initial-sync-message | 1 | ||||
| -rw-r--r-- | src/leap/bitmask/gui/mail_status.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/changes/bug-5875_better-initial-sync-message b/changes/bug-5875_better-initial-sync-message new file mode 100644 index 00000000..473093ed --- /dev/null +++ b/changes/bug-5875_better-initial-sync-message @@ -0,0 +1 @@ +- Initial sync message is confusing. Closes #5875. diff --git a/src/leap/bitmask/gui/mail_status.py b/src/leap/bitmask/gui/mail_status.py index 5caef745..bb755b5c 100644 --- a/src/leap/bitmask/gui/mail_status.py +++ b/src/leap/bitmask/gui/mail_status.py @@ -304,7 +304,7 @@ class MailStatusWidget(QtGui.QWidget): ext_status = "" if req.event == proto.KEYMANAGER_LOOKING_FOR_KEY: - ext_status = self.tr("Looking for key for this user") + ext_status = self.tr("Initial sync in progress, please wait...") elif req.event == proto.KEYMANAGER_KEY_FOUND: ext_status = self.tr("Found key! Starting mail...") # elif req.event == proto.KEYMANAGER_KEY_NOT_FOUND: |