summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorIvan Alejandro <ivanalejandro0@gmail.com>2013-09-09 12:28:17 -0300
committerIvan Alejandro <ivanalejandro0@gmail.com>2013-09-09 17:29:55 -0300
commit724d149aea99173674493ad1f1f4f9a948202749 (patch)
tree87beb7ecffbcaa20570d49889a86fc0941d5f81e /src
parent528ed8aa4fbd4550fe41fa6afa96eb6ddcab7d1c (diff)
Make user messages more consistent.
Diffstat (limited to 'src')
-rw-r--r--src/leap/bitmask/gui/mainwindow.py2
-rw-r--r--src/leap/bitmask/gui/statuspanel.py7
2 files changed, 5 insertions, 4 deletions
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py
index 0950462b..6141a3a2 100644
--- a/src/leap/bitmask/gui/mainwindow.py
+++ b/src/leap/bitmask/gui/mainwindow.py
@@ -256,7 +256,7 @@ class MainWindow(QtGui.QMainWindow):
self._action_eip_provider.setEnabled(False)
self._action_eip_status = QtGui.QAction(
- self.tr("Encrypted internet is OFF"),
+ self.tr("Encrypted Internet is OFF"),
self)
self._action_eip_status.setEnabled(False)
self._status_panel.set_action_eip_status(
diff --git a/src/leap/bitmask/gui/statuspanel.py b/src/leap/bitmask/gui/statuspanel.py
index 190bc02f..10e6bca3 100644
--- a/src/leap/bitmask/gui/statuspanel.py
+++ b/src/leap/bitmask/gui/statuspanel.py
@@ -346,7 +346,8 @@ class StatusPanelWidget(QtGui.QWidget):
Updates the system tray icon tooltip using the eip and mx statuses.
"""
status = self.tr("Encrypted Internet is {0}").format(self._eip_status)
- status += self.tr("\nEncrypted Mail is {0}").format(self._mx_status)
+ status += '\n'
+ status += self.tr("Encrypted Mail is {0}").format(self._mx_status)
self._systray.setToolTip(status)
def set_action_eip_startstop(self, action_eip_startstop):
@@ -544,14 +545,14 @@ class StatusPanelWidget(QtGui.QWidget):
"""
selected_pixmap = self.ERROR_ICON
selected_pixmap_tray = self.ERROR_ICON_TRAY
- tray_message = self.tr("Encryption is OFF")
+ tray_message = self.tr("Encrypted Internet is OFF")
if status in ("WAIT", "AUTH", "GET_CONFIG",
"RECONNECTING", "ASSIGN_IP"):
selected_pixmap = self.CONNECTING_ICON
selected_pixmap_tray = self.CONNECTING_ICON_TRAY
tray_message = self.tr("Turning ON")
elif status in ("CONNECTED"):
- tray_message = self.tr("Encryption is ON")
+ tray_message = self.tr("Encrypted Internet is ON")
selected_pixmap = self.CONNECTED_ICON
selected_pixmap_tray = self.CONNECTED_ICON_TRAY