Author: akhaldi
Date: Sun Dec 27 17:23:26 2015
New Revision: 70438
URL: http://svn.reactos.org/svn/reactos?rev=70438&view=rev
Log:
[0.4.0] * Merge msgina's text improvements by Henry Tang Ih in r70437.
CORE-10720
Modified:
branches/ros-branch-0_4_0/ (props changed)
branches/ros-branch-0_4_0/reactos/ (props changed)
branches/ros-branch-0_4_0/reactos/dll/win32/msgina/lang/en-US.rc
Propchange: branches/ros-branch-0_4_0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Dec 27 17:23:26 2015
@@ -1 +1 @@
-/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400
+/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70437
Propchange: branches/ros-branch-0_4_0/reactos/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Dec 27 17:23:26 2015
@@ -20,4 +20,4 @@
/branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859
/branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567
/branches/wlan-bringup:54809-54998
-/trunk/reactos:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400
+/trunk/reactos:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70437
Modified: branches/ros-branch-0_4_0/reactos/dll/win32/msgina/lang/en-US.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/win32/msgina/lang/en-US.rc?rev=70438&r1=70437&r2=70438&view=diff
==============================================================================
--- branches/ros-branch-0_4_0/reactos/dll/win32/msgina/lang/en-US.rc
[iso-8859-1] (original)
+++ branches/ros-branch-0_4_0/reactos/dll/win32/msgina/lang/en-US.rc
[iso-8859-1] Sun Dec 27 17:23:26 2015
@@ -33,7 +33,7 @@
COMBOBOX IDC_LOGON_TO, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL |
WS_TABSTOP
PUSHBUTTON "OK",IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON
PUSHBUTTON "Cancel", IDCANCEL, 160, 122, 50, 14
- PUSHBUTTON "Shutdown", IDC_SHUTDOWN, 214, 122, 50, 14
+ PUSHBUTTON "&Shut Down", IDC_SHUTDOWN, 214, 122, 50, 14
END
IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175
@@ -46,11 +46,11 @@
LTEXT "<Message>", IDC_LOGONMSG, 15, 73, 245, 18
LTEXT "<Logon date>", IDC_LOGONDATE, 15, 94, 245, 8
CTEXT "What do you want to do?", IDC_STATIC, 10, 119, 255, 8
- PUSHBUTTON "Lock computer", IDC_LOCK, 10, 135, 76, 14
- PUSHBUTTON "Log off...", IDC_LOGOFF, 100, 135, 75, 14
- PUSHBUTTON "Shutdown", IDC_SHUTDOWN, 189, 135, 76, 14
- PUSHBUTTON "Change Password", IDC_CHANGEPWD, 10, 154, 76, 14
- PUSHBUTTON "Task manager", IDC_TASKMGR, 100, 154, 75, 14
+ PUSHBUTTON "Loc&k Computer", IDC_LOCK, 10, 135, 76, 14
+ PUSHBUTTON "&Log Off...", IDC_LOGOFF, 100, 135, 75, 14
+ PUSHBUTTON "&Shut Down", IDC_SHUTDOWN, 189, 135, 76, 14
+ PUSHBUTTON "&Change Password", IDC_CHANGEPWD, 10, 154, 76, 14
+ PUSHBUTTON "&Task Manager", IDC_TASKMGR, 100, 154, 75, 14
PUSHBUTTON "Cancel", IDCANCEL, 189, 154, 76, 14
END
