diff options
| author | Ruben Pollan <meskio@sindominio.net> | 2014-10-06 09:58:31 -0500 |
|---|---|---|
| committer | Ruben Pollan <meskio@sindominio.net> | 2014-10-06 09:58:31 -0500 |
| commit | 43217db58bf06f4b89f506f38bef64f536bc9bbb (patch) | |
| tree | ef283c3a052d1de644fe5ce93105e7a505ccb1d8 | |
| parent | 2e1ea69c83cc698da15765b7a014d6f21477f12e (diff) | |
| parent | b76bd3a8e298f14afd62bff5ebed52285c9053c1 (diff) | |
Merge branch 'ivan/bug/fix-broken-str' into develop
| -rw-r--r-- | data/ts/en_US.ts | 5 | ||||
| -rw-r--r-- | src/leap/bitmask/gui/mail_status.py | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/data/ts/en_US.ts b/data/ts/en_US.ts index 7ab39646..87aaf0e3 100644 --- a/data/ts/en_US.ts +++ b/data/ts/en_US.ts @@ -721,11 +721,6 @@ Export canceled.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mail_status.py" line="232"/> - <source>Starting…</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/leap/bitmask/gui/mail_status.py" line="308"/> <source>Initial sync in progress, please wait...</source> <translation type="unfinished"></translation> diff --git a/src/leap/bitmask/gui/mail_status.py b/src/leap/bitmask/gui/mail_status.py index d523f449..92e1e4c4 100644 --- a/src/leap/bitmask/gui/mail_status.py +++ b/src/leap/bitmask/gui/mail_status.py @@ -228,7 +228,7 @@ class MailStatusWidget(QtGui.QWidget): self._service_name)) elif ready == 1: icon = self.CONNECTING_ICON - self._mx_status = self.tr('Starting…') + self._mx_status = self.tr('Starting...') tray_status = self.tr('Mail is starting') elif ready >= 2: icon = self.CONNECTED_ICON |