[ros-diffs] [cfinck] 40689: Merge r40600

Author: cfinck
Date: Sat Apr 25 02:21:48 2009
New Revision: 40689

URL: http://svn.reactos.org/svn/reactos?rev=40689&view=rev
Log:
Merge r40600

Modified:
    branches/ros-branch-0_3_9/reactos/base/setup/usetup/lang/zh-CN.h
    branches/ros-branch-0_3_9/reactos/base/setup/usetup/lang/zh-TW.h
    branches/ros-branch-0_3_9/reactos/boot/bootdata/hivesys_arm.inf
    branches/ros-branch-0_3_9/reactos/boot/bootdata/hivesys_i386.inf

Modified: branches/ros-branch-0_3_9/reactos/base/setup/usetup/lang/zh-CN.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_9/reactos/base/s…
==============================================================================
--- branches/ros-branch-0_3_9/reactos/base/setup/usetup/lang/zh-CN.h [iso-8859-1]
(original)
+++ branches/ros-branch-0_3_9/reactos/base/setup/usetup/lang/zh-CN.h [iso-8859-1] Sat Apr
25 02:21:48 2009
@@ -3,6 +3,7 @@
 
 MUI_LAYOUTS zhCNLayouts[] =
 {
+    { L"0409", L"00000409" },
     { L"0804", L"00000804" },
     { L"0804", L"E00E0804" },
     { L"0804", L"E0010804" },

Modified: branches/ros-branch-0_3_9/reactos/base/setup/usetup/lang/zh-TW.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_9/reactos/base/s…
==============================================================================
--- branches/ros-branch-0_3_9/reactos/base/setup/usetup/lang/zh-TW.h [iso-8859-1]
(original)
+++ branches/ros-branch-0_3_9/reactos/base/setup/usetup/lang/zh-TW.h [iso-8859-1] Sat Apr
25 02:21:48 2009
@@ -3,6 +3,7 @@
 
 MUI_LAYOUTS zhTWLayouts[] =
 {
+    { L"0409", L"00000409" },
     { L"0404", L"00000404" },
     { L"0404", L"E0080404" },
     { L"0404", L"E0010404" },

Modified: branches/ros-branch-0_3_9/reactos/boot/bootdata/hivesys_arm.inf
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_9/reactos/boot/b…
==============================================================================
--- branches/ros-branch-0_3_9/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1]
(original)
+++ branches/ros-branch-0_3_9/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] Sat Apr
25 02:21:48 2009
@@ -448,6 +448,9 @@

HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0403",0x00000000,"l_intl.nls"

HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0404",0x00000000,"l_intl.nls"

HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0804",0x00000000,"l_intl.nls"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0c04",0x00000000,"l_intl.nls"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","1004",0x00000000,"l_intl.nls"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","1404",0x00000000,"l_intl.nls"

HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0405",0x00000000,"l_intl.nls"

HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0406",0x00000000,"l_intl.nls"

HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0407",0x00000000,"l_intl.nls"

Modified: branches/ros-branch-0_3_9/reactos/boot/bootdata/hivesys_i386.inf
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_9/reactos/boot/b…
==============================================================================
--- branches/ros-branch-0_3_9/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1]
(original)
+++ branches/ros-branch-0_3_9/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Sat Apr
25 02:21:48 2009
@@ -448,6 +448,9 @@

HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0403",0x00000000,"l_intl.nls"

HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0404",0x00000000,"l_intl.nls"

HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0804",0x00000000,"l_intl.nls"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0c04",0x00000000,"l_intl.nls"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","1004",0x00000000,"l_intl.nls"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","1404",0x00000000,"l_intl.nls"

HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0405",0x00000000,"l_intl.nls"

HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0406",0x00000000,"l_intl.nls"

HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0407",0x00000000,"l_intl.nls"