Merge remote-tracking branch 'ivan/bug/3319_log-out-texts' into develop

4 files changed, 12 insertions, 11 deletions

diff --git a/changes/bug-3319_change-log-out-texts b/changes/bug-3319_change-log-out-texts
new file mode 100644
index 00000000..ffe1cef8
--- /dev/null
+++ b/changes/bug-3319_change-log-out-texts
@@ -0,0 +1 @@
+  o Replace 'Sign Out' with 'Log Out' and 'User' with 'Username'. Closes #3319.
diff --git a/src/leap/gui/mainwindow.py b/src/leap/gui/mainwindow.py
index 2325ecf0..395b9329 100644
--- a/src/leap/gui/mainwindow.py
+++ b/src/leap/gui/mainwindow.py
@@ -218,8 +218,8 @@ class MainWindow(QtGui.QMainWindow):
         self._vpn.qtsigs.process_finished.connect(
             self._eip_finished)
 
-        self.ui.action_sign_out.setEnabled(False)
-        self.ui.action_sign_out.triggered.connect(self._logout)
+        self.ui.action_log_out.setEnabled(False)
+        self.ui.action_log_out.triggered.connect(self._logout)
         self.ui.action_about_leap.triggered.connect(self._about)
         self.ui.action_quit.triggered.connect(self.quit)
         self.ui.action_wizard.triggered.connect(self._launch_wizard)
@@ -563,7 +563,7 @@ class MainWindow(QtGui.QMainWindow):
         systrayMenu.addAction(preferences_action)
         systrayMenu.addAction(help_action)
         systrayMenu.addSeparator()
-        systrayMenu.addAction(self.ui.action_sign_out)
+        systrayMenu.addAction(self.ui.action_log_out)
         systrayMenu.addAction(self.ui.action_quit)
         self._systray = QtGui.QSystemTrayIcon(self)
         self._systray.setContextMenu(systrayMenu)
@@ -866,7 +866,7 @@ class MainWindow(QtGui.QMainWindow):
         self._login_widget.set_status(message, error=not ok)
         if ok:
             self._logged_user = self._login_widget.get_user()
-            self.ui.action_sign_out.setEnabled(True)
+            self.ui.action_log_out.setEnabled(True)
             # We leave a bit of room for the user to see the
             # "Succeeded" message and then we switch to the EIP status
             # panel
@@ -1233,7 +1233,7 @@ class MainWindow(QtGui.QMainWindow):
     def _logout(self):
         """
         SLOT
-        TRIGGER: self.ui.action_sign_out.triggered
+        TRIGGER: self.ui.action_log_out.triggered
 
         Starts the logout sequence
         """
@@ -1250,7 +1250,7 @@ class MainWindow(QtGui.QMainWindow):
         logging out
         """
         self._logged_user = None
-        self.ui.action_sign_out.setEnabled(False)
+        self.ui.action_log_out.setEnabled(False)
         self.ui.stackedWidget.setCurrentIndex(self.LOGIN_INDEX)
         self._login_widget.set_password("")
         self._login_widget.set_enabled(True)
diff --git a/src/leap/gui/ui/mainwindow.ui b/src/leap/gui/ui/mainwindow.ui
index 58827fe0..67d78736 100644
--- a/src/leap/gui/ui/mainwindow.ui
+++ b/src/leap/gui/ui/mainwindow.ui
@@ -253,14 +253,14 @@
      <x>0</x>
      <y>0</y>
      <width>429</width>
-     <height>25</height>
+     <height>21</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuSession">
     <property name="title">
      <string>&amp;Session</string>
     </property>
-    <addaction name="action_sign_out"/>
+    <addaction name="action_log_out"/>
     <addaction name="separator"/>
     <addaction name="action_quit"/>
    </widget>
@@ -276,9 +276,9 @@
    <addaction name="menuHelp"/>
   </widget>
   <widget class="QStatusBar" name="statusbar"/>
-  <action name="action_sign_out">
+  <action name="action_log_out">
    <property name="text">
-    <string>&amp;Sign out</string>
+    <string>Log &amp;out</string>
    </property>
   </action>
   <action name="action_quit">
diff --git a/src/leap/gui/ui/wizard.ui b/src/leap/gui/ui/wizard.ui
index 4b9cab1c..d8acd69a 100644
--- a/src/leap/gui/ui/wizard.ui
+++ b/src/leap/gui/ui/wizard.ui
@@ -668,7 +668,7 @@
     <item row="2" column="0">
      <widget class="QLabel" name="label_15">
       <property name="text">
-       <string>&lt;b&gt;User:&lt;/b&gt;</string>
+       <string>&lt;b&gt;Username:&lt;/b&gt;</string>
       </property>
       <property name="alignment">
        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>