[COMCTL32]

- Fix include order of resources.
- remove comctl_Cn.rc, it contains and outdated simplified chineese translation, that wine has in comctl_Zh.rc

svn path=/trunk/; revision=50890

diff --git a/reactos/dll/win32/comctl32/comctl_Cn.rc b/reactos/dll/win32/comctl32/comctl_Cn.rc
deleted file mode 100644 (file)
index a9fa997..0000000
--- a/reactos/dll/win32/comctl32/comctl_Cn.rc
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright 2002 Tisheng Chen
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
-#pragma code_page(936)
-
-IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
-STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "ÊôÐÔ %s"
-FONT 8, "MS Shell Dlg"
-BEGIN
-  DEFPUSHBUTTON "È·¶¨",     IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
-  PUSHBUTTON    "È¡Ïû", IDCANCEL,58,122,50,14
-  PUSHBUTTON    "Ó¦ÓÃ(&A)", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED
-  PUSHBUTTON    "°ïÖú",   IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP
-  CONTROL       "Tab",    IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114
-END
-
-
-IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Wizard"
-FONT 8, "MS Shell Dlg"
-BEGIN
-  PUSHBUTTON    "< ÉÏÒ»²½(&B)", IDC_BACK_BUTTON,71,138,50,14
-  DEFPUSHBUTTON "ÏÂÒ»²½(&N) >", IDC_NEXT_BUTTON,121,138,50,14
-  DEFPUSHBUTTON "½áÊø",  IDC_FINISH_BUTTON,121,138,50,14
-  PUSHBUTTON    "È¡Ïû",  IDCANCEL,178,138,50,14
-  PUSHBUTTON    "°ïÖú",    IDHELP,235,138,50,14,WS_GROUP
-  LTEXT         "",        IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN
-  CONTROL       "Tab",     IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5
-  LTEXT                "",        IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE
-END
-
-
-IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "×Ô¶¨Ò幤¾ßÀ¸"
-FONT 8, "MS Shell Dlg"
-BEGIN
-  DEFPUSHBUTTON "¹Ø±Õ(&C)",     IDCANCEL,308,6,44,14
-  PUSHBUTTON    "ÖØÖÃ(&e)",     IDC_RESET_BTN,308,23,44,14
-  PUSHBUTTON    "°ïÖú(&H)",      IDC_HELP_BTN,308,40,44,14
-  PUSHBUTTON    "ÉÏÒÆ(&U)",   IDC_MOVEUP_BTN,308,74,44,14
-  PUSHBUTTON    "ÏÂÒÆ(&D)", IDC_MOVEDN_BTN,308,91,44,14
-  LTEXT         "¿ÉÓù¤¾ßÀ¸°´Å¥(&V):", -1,4,5,84,10
-  LISTBOX       IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
-  PUSHBUTTON    "Ìí¼Ó(&A) ->",    IDOK, 131, 42, 44, 14
-  PUSHBUTTON    "<- ɾ³ý(&R)", IDC_REMOVE_BTN,131,62,44,14
-  LTEXT         "µ±Ç°¹¤¾ßÀ¸°´Å¥(&T):", -1,182,5,78,10
-  LISTBOX       IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
-END
-
-STRINGTABLE DISCARDABLE
-{
-    IDS_CLOSE    "¹Ø±Õ"
-}
-
-STRINGTABLE DISCARDABLE
-{
-    IDM_TODAY    "Today:"
-    IDM_GOTODAY  "Go to today"
-}
-
-STRINGTABLE DISCARDABLE
-{
-    IDS_SEPARATOR "·Ö¸ô·û"
-}
-
-STRINGTABLE DISCARDABLE
-{
-    HKY_NONE "None"
-}
-
-#pragma code_page(default)

diff --git a/reactos/dll/win32/comctl32/rsrc.rc b/reactos/dll/win32/comctl32/rsrc.rc
index 350834f..903c147 100644 (file)
--- a/reactos/dll/win32/comctl32/rsrc.rc
+++ b/reactos/dll/win32/comctl32/rsrc.rc
@@ -94,24 +94,26 @@ IDI_TT_ERROR_SM ICON idi_tt_error_sm.ico
 #include "comctl_Cs.rc"
 #include "comctl_El.rc"
 #include "comctl_En.rc"
+#include "comctl_Eo.rc"
 #include "comctl_Es.rc"
 #include "comctl_Hu.rc"
-#include "comctl_It.rc"
-#include "comctl_Ko.rc"
-//#include "comctl_Nl.rc"
-//#include "comctl_No.rc"
-//#include "comctl_Pl.rc"
-//#include "comctl_Sk.rc"
-//#include "comctl_Sv.rc"
-//#include "comctl_Th.rc"
-//#include "comctl_Tr.rc"
-//#include "comctl_Uk.rc"
+#include "comctl_Nl.rc"
+#include "comctl_No.rc"
+#include "comctl_Pl.rc"
+#include "comctl_Sk.rc"
+#include "comctl_Sv.rc"
+#include "comctl_Th.rc"
+#include "comctl_Tr.rc"
+#include "comctl_Uk.rc"
 
 /* UTF-8 */
 #include "comctl_Da.rc"
 #include "comctl_De.rc"
 #include "comctl_Fr.rc"
+#include "comctl_He.rc"
+#include "comctl_It.rc"
 #include "comctl_Ja.rc"
+#include "comctl_Ko.rc"
 #include "comctl_Lt.rc"
 #include "comctl_Pt.rc"
 #include "comctl_Ro.rc"