summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-11-07 13:28:24 -0300
committerTomás Touceda <chiiph@leap.se>2013-11-07 13:28:24 -0300
commit9d3dff5cc21cffc14dde9d4ab901f47fcd56cf87 (patch)
treedd417a038fc89e494e211e0469c52f34e7ca38f4
parent46e54dae224817da14a0259282395bd8c6b3e9c1 (diff)
parent1899d12a134d7657a902bd9d4006098a98e02277 (diff)
Merge remote-tracking branch 'ivan/feature/3958_add-hint-about-duration-of-key-generation' into develop
-rw-r--r--changes/feature-3958_add-hint-about-duration-of-key-generation1
-rw-r--r--src/leap/bitmask/gui/mail_status.py4
2 files changed, 4 insertions, 1 deletions
diff --git a/changes/feature-3958_add-hint-about-duration-of-key-generation b/changes/feature-3958_add-hint-about-duration-of-key-generation
new file mode 100644
index 00000000..a5110e49
--- /dev/null
+++ b/changes/feature-3958_add-hint-about-duration-of-key-generation
@@ -0,0 +1 @@
+- Add hint to user about the duration of the key generation. Closes #3958.
diff --git a/src/leap/bitmask/gui/mail_status.py b/src/leap/bitmask/gui/mail_status.py
index c1e82d4d..d637fd52 100644
--- a/src/leap/bitmask/gui/mail_status.py
+++ b/src/leap/bitmask/gui/mail_status.py
@@ -296,7 +296,9 @@ class MailStatusWidget(QtGui.QWidget):
# elif req.event == proto.KEYMANAGER_KEY_NOT_FOUND:
# ext_status = self.tr("Key not found!")
elif req.event == proto.KEYMANAGER_STARTED_KEY_GENERATION:
- ext_status = self.tr("Generating new key, please wait...")
+ ext_status = self.tr(
+ "Generating new key, please wait... \n"
+ "(this may take up to 10 minutes depending on the machine)")
elif req.event == proto.KEYMANAGER_FINISHED_KEY_GENERATION:
ext_status = self.tr("Finished generating key!")
elif req.event == proto.KEYMANAGER_DONE_UPLOADING_KEYS: