summaryrefslogtreecommitdiff
path: root/src/leap
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2014-02-27 12:47:51 -0300
committerTomás Touceda <chiiph@leap.se>2014-02-27 12:47:51 -0300
commit540d6eb995ee87856f6670707309b8e4d5bfc282 (patch)
tree48e96b94c515ef735616fc3710d023cbc0ff62e5 /src/leap
parent48403c05ebc2515bf33ff26512218ad72489d01b (diff)
parent2abe8f333f9b920b79d30903697f0ecd616d8c71 (diff)
Merge remote-tracking branch 'refs/remotes/kali/fix/unread-notification-phrasing' into develop
Diffstat (limited to 'src/leap')
-rw-r--r--src/leap/bitmask/gui/mail_status.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/leap/bitmask/gui/mail_status.py b/src/leap/bitmask/gui/mail_status.py
index 6db17427..1d5ff319 100644
--- a/src/leap/bitmask/gui/mail_status.py
+++ b/src/leap/bitmask/gui/mail_status.py
@@ -362,12 +362,17 @@ class MailStatusWidget(QtGui.QWidget):
ext_status = None
if req.event == proto.IMAP_UNREAD_MAIL:
+ # By now, the semantics of the UNREAD_MAIL event are
+ # limited to mails with the Unread flag *in the Inbox".
+ # We could make this configurable to include all unread mail
+ # or all unread mail in subscribed folders.
if self._started:
count = req.content
if count != "0":
- status = self.tr("{0} Unread Emails").format(count)
+ status = self.tr("{0} Unread Emails "
+ "in your Inbox").format(count)
if count == "1":
- status = self.tr("1 Unread Email")
+ status = self.tr("1 Unread Email in your Inbox")
self._set_mail_status(status, ready=2)
else: