diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-08-02 11:36:31 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-08-02 11:36:31 -0300 |
| commit | 1b329b507a4ce430ece6629d2b0a8e40526ede3b (patch) | |
| tree | ec33dd3aa39753d94ef5b0f8ef7bfb838f3816a1 /src/leap/gui/ui | |
| parent | 89934702c57fa2314f0d6d1f82942f6f42d10f94 (diff) | |
| parent | f4d0de3de479f99dd33f750c438035913ad7bf43 (diff) | |
Merge remote-tracking branch 'ivan/bug/3319_log-out-texts' into develop
Diffstat (limited to 'src/leap/gui/ui')
| -rw-r--r-- | src/leap/gui/ui/mainwindow.ui | 8 | ||||
| -rw-r--r-- | src/leap/gui/ui/wizard.ui | 2 |
2 files changed, 5 insertions, 5 deletions
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>&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>&Sign out</string> + <string>Log &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><b>User:</b></string> + <string><b>Username:</b></string> </property> <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> |