diff options
author | kali <kali@leap.se> | 2014-08-08 19:10:39 -0500 |
---|---|---|
committer | kali <kali@leap.se> | 2014-08-08 19:10:39 -0500 |
commit | cef0be0b4f866c9283eaf696fbc23b8120e40443 (patch) | |
tree | ff54448f7354e56235d22dabaf0fb03597790c98 /src/leap/bitmask/gui/mail_status.py | |
parent | a9173e8e2816b767028787735e4a84b2576f258d (diff) | |
parent | 465c0b89ca61279eb036afec2de3b4d24b257311 (diff) |
Merge branch '0.6.1-rc' into deb-0.6.1-rc
Conflicts:
pkg/linux/bitmask-root
src/leap/bitmask/gui/login.py
Diffstat (limited to 'src/leap/bitmask/gui/mail_status.py')
-rw-r--r-- | src/leap/bitmask/gui/mail_status.py | 2 |
1 files changed, 1 insertions, 1 deletions
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: |