Alexandre Julliard : shell32: Merge Chinese resources into a single file.

Alexandre Julliard julliard at winehq.org
Fri Aug 29 07:30:54 CDT 2008


Module: wine
Branch: master
Commit: 2bf33c0a324d98406a05e9d3721cb4faa51692c2
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=2bf33c0a324d98406a05e9d3721cb4faa51692c2

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Fri Aug 29 13:52:10 2008 +0200

shell32: Merge Chinese resources into a single file.

---

 dlls/shell32/shell32_Cn.rc |  115 --------------------------------------------
 dlls/shell32/shell32_Zh.rc |   95 ++++++++++++++++++++++++++++++++++++
 dlls/shell32/shres.rc      |    1 -
 3 files changed, 95 insertions(+), 116 deletions(-)

diff --git a/dlls/shell32/shell32_Cn.rc b/dlls/shell32/shell32_Cn.rc
deleted file mode 100644
index 31ee724..0000000
--- a/dlls/shell32/shell32_Cn.rc
+++ /dev/null
@@ -1,115 +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
- */
-
-/* Chinese text is encoded in UTF-8 */
-#pragma code_page(65001)
-
-LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
-
-/*
- shellview item menu
-*/
-MENU_SHV_FILE MENU DISCARDABLE
-BEGIN
-	POPUP ""
-	BEGIN
-	  MENUITEM "选择(&S)"		FCIDM_SHVIEW_OPEN
-	  MENUITEM "文件管理器(&x)",FCIDM_SHVIEW_EXPLORE
-	  MENUITEM "打开(&O)",		FCIDM_SHVIEW_OPEN
-	  MENUITEM SEPARATOR
-	  MENUITEM "剪切(&u)",		FCIDM_SHVIEW_CUT
-	  MENUITEM "复制(&C)",		FCIDM_SHVIEW_COPY
-	  MENUITEM SEPARATOR
-	  MENUITEM "生成连接(&L)",	FCIDM_SHVIEW_CREATELINK
-	  MENUITEM "删除(&D)",		FCIDM_SHVIEW_DELETE
-	  MENUITEM "改名(&R)",		FCIDM_SHVIEW_RENAME
-	  MENUITEM SEPARATOR
-	  MENUITEM "属性(&P)",		FCIDM_SHVIEW_PROPERTIES
-	END
-END
-
-MENU_CPANEL MENU
-BEGIN
-    POPUP "文件(&F)"
-    BEGIN
-        MENUITEM SEPARATOR
-        MENUITEM "退出(&x)", IDM_CPANEL_EXIT
-    END
-
-    POPUP "查看(&V)"
-    BEGIN
-        MENUITEM "大图标(&g)", FCIDM_SHVIEW_BIGICON
-        MENUITEM "小图标(&m)", FCIDM_SHVIEW_SMALLICON
-        MENUITEM "列表(&L)", FCIDM_SHVIEW_LISTVIEW
-        MENUITEM "详情(&D)", FCIDM_SHVIEW_REPORTVIEW
-    END
-
-    POPUP "帮助(&H)"
-    BEGIN
-        MENUITEM "关于控制面板(&A)...", IDM_CPANEL_ABOUT
-    END
-END
-
-SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 220, 152
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "关于 %s"
-FONT 9, "MS Song"
-{
- DEFPUSHBUTTON "确定", IDOK, 153, 133, 60, 12, WS_TABSTOP
- PUSHBUTTON "使用许可(&l)...", IDC_ABOUT_LICENSE, 153, 113, 60, 12, WS_TABSTOP
- LISTBOX IDC_ABOUT_LISTBOX, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER
- ICON "", stc1, 10, 10, 30, 30
- LTEXT "", IDC_ABOUT_STATIC_TEXT1, 40, 10, 170, 10
- LTEXT "", IDC_ABOUT_STATIC_TEXT2, 40, 22, 170, 10
- LTEXT "运行于 %s", IDC_ABOUT_STATIC_TEXT3, 42, 34, 170, 10
- LTEXT "Wine 开发人员:", IDC_ABOUT_WINE_TEXT, 8, 55, 137, 10
-}
-
-SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION ""
-FONT 9, "MS Song"
-{
- ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE
- LTEXT "输入程序,目录,文件或者Internet资源名,Wine将为您打开它。", 12289, 36, 11, 182, 18
- LTEXT "打开(&O):", 12305, 7, 39, 24, 10
- CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100
- DEFPUSHBUTTON "确定", IDOK, 62, 63, 50, 14, WS_TABSTOP
- PUSHBUTTON "取消", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP
- PUSHBUTTON "浏览(&B)...", 12288, 170, 63, 50, 14, WS_TABSTOP
-}
-
-/*	columns in the shellview	*/
-STRINGTABLE
-BEGIN
-	IDS_SHV_COLUMN1		"文件"
-	IDS_SHV_COLUMN2		"大小"
-	IDS_SHV_COLUMN3		"类型"
-	IDS_SHV_COLUMN4		"修改"
-	IDS_SHV_COLUMN5		"属性"
-	IDS_SHV_COLUMN6		"使用空间"
-	IDS_SHV_COLUMN7		"剩余空间"
-	IDS_SHV_COLUMN8		"名称"
-	IDS_SHV_COLUMN9		"备注"
-
-	IDS_CPANEL_TITLE	"Wine 控制面板"
-	IDS_CPANEL_NAME		"名称"
-	IDS_CPANEL_DESCRIPTION	"描述"
-END
-
-#pragma code_page(default)
diff --git a/dlls/shell32/shell32_Zh.rc b/dlls/shell32/shell32_Zh.rc
index b6218fb..282e88b 100644
--- a/dlls/shell32/shell32_Zh.rc
+++ b/dlls/shell32/shell32_Zh.rc
@@ -2,6 +2,7 @@
  * shell32 (Traditional Chinese Resource)
  *
  * Copyright 1998 Juergen Schmied
+ * Copyright 2002 Tisheng Chen
  * Copyright 2008 Hongbo Ni <hongbo.at.njstar.com>
  *
  * This library is free software; you can redistribute it and/or
@@ -22,6 +23,100 @@
 /* Chinese text is encoded in UTF-8 */
 #pragma code_page(65001)
 
+LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
+
+/*
+ shellview item menu
+*/
+MENU_SHV_FILE MENU DISCARDABLE
+BEGIN
+	POPUP ""
+	BEGIN
+	  MENUITEM "选择(&S)"		FCIDM_SHVIEW_OPEN
+	  MENUITEM "文件管理器(&x)",FCIDM_SHVIEW_EXPLORE
+	  MENUITEM "打开(&O)",		FCIDM_SHVIEW_OPEN
+	  MENUITEM SEPARATOR
+	  MENUITEM "剪切(&u)",		FCIDM_SHVIEW_CUT
+	  MENUITEM "复制(&C)",		FCIDM_SHVIEW_COPY
+	  MENUITEM SEPARATOR
+	  MENUITEM "生成连接(&L)",	FCIDM_SHVIEW_CREATELINK
+	  MENUITEM "删除(&D)",		FCIDM_SHVIEW_DELETE
+	  MENUITEM "改名(&R)",		FCIDM_SHVIEW_RENAME
+	  MENUITEM SEPARATOR
+	  MENUITEM "属性(&P)",		FCIDM_SHVIEW_PROPERTIES
+	END
+END
+
+MENU_CPANEL MENU
+BEGIN
+    POPUP "文件(&F)"
+    BEGIN
+        MENUITEM SEPARATOR
+        MENUITEM "退出(&x)", IDM_CPANEL_EXIT
+    END
+
+    POPUP "查看(&V)"
+    BEGIN
+        MENUITEM "大图标(&g)", FCIDM_SHVIEW_BIGICON
+        MENUITEM "小图标(&m)", FCIDM_SHVIEW_SMALLICON
+        MENUITEM "列表(&L)", FCIDM_SHVIEW_LISTVIEW
+        MENUITEM "详情(&D)", FCIDM_SHVIEW_REPORTVIEW
+    END
+
+    POPUP "帮助(&H)"
+    BEGIN
+        MENUITEM "关于控制面板(&A)...", IDM_CPANEL_ABOUT
+    END
+END
+
+SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 220, 152
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "关于 %s"
+FONT 9, "MS Song"
+{
+ DEFPUSHBUTTON "确定", IDOK, 153, 133, 60, 12, WS_TABSTOP
+ PUSHBUTTON "使用许可(&l)...", IDC_ABOUT_LICENSE, 153, 113, 60, 12, WS_TABSTOP
+ LISTBOX IDC_ABOUT_LISTBOX, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER
+ ICON "", stc1, 10, 10, 30, 30
+ LTEXT "", IDC_ABOUT_STATIC_TEXT1, 40, 10, 170, 10
+ LTEXT "", IDC_ABOUT_STATIC_TEXT2, 40, 22, 170, 10
+ LTEXT "运行于 %s", IDC_ABOUT_STATIC_TEXT3, 42, 34, 170, 10
+ LTEXT "Wine 开发人员:", IDC_ABOUT_WINE_TEXT, 8, 55, 137, 10
+}
+
+SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION ""
+FONT 9, "MS Song"
+{
+ ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE
+ LTEXT "输入程序,目录,文件或者Internet资源名,Wine将为您打开它。", 12289, 36, 11, 182, 18
+ LTEXT "打开(&O):", 12305, 7, 39, 24, 10
+ CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100
+ DEFPUSHBUTTON "确定", IDOK, 62, 63, 50, 14, WS_TABSTOP
+ PUSHBUTTON "取消", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP
+ PUSHBUTTON "浏览(&B)...", 12288, 170, 63, 50, 14, WS_TABSTOP
+}
+
+/*	columns in the shellview	*/
+STRINGTABLE
+BEGIN
+	IDS_SHV_COLUMN1		"文件"
+	IDS_SHV_COLUMN2		"大小"
+	IDS_SHV_COLUMN3		"类型"
+	IDS_SHV_COLUMN4		"修改"
+	IDS_SHV_COLUMN5		"属性"
+	IDS_SHV_COLUMN6		"使用空间"
+	IDS_SHV_COLUMN7		"剩余空间"
+	IDS_SHV_COLUMN8		"名称"
+	IDS_SHV_COLUMN9		"备注"
+
+	IDS_CPANEL_TITLE	"Wine 控制面板"
+	IDS_CPANEL_NAME		"名称"
+	IDS_CPANEL_DESCRIPTION	"描述"
+END
+
+
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
 
 /*
diff --git a/dlls/shell32/shres.rc b/dlls/shell32/shres.rc
index b82c839..8222f95 100644
--- a/dlls/shell32/shres.rc
+++ b/dlls/shell32/shres.rc
@@ -130,7 +130,6 @@ IDR_AVI_FILEDELETE AVI searching.avi
  */
 #include "shell32_Bg.rc"
 #include "shell32_Ca.rc"
-#include "shell32_Cn.rc"
 #include "shell32_Cs.rc"
 #include "shell32_Da.rc"
 #include "shell32_De.rc"




More information about the wine-cvs mailing list