From 515f23ecd7506fa21c9e2c5ea8b27c1e5666970f Mon Sep 17 00:00:00 2001 From: Joachim Henze Date: Thu, 13 Jul 2023 03:08:48 +0200 Subject: [PATCH] [0.4.9][TRANSLATION] Fix font glitches in zh-CN.rc & zh-TW.rc Actually I was working on a much bigger commit in the same context for releases/0.4.7 when I realized that related glitches do also affect master head and also other release-branches in some areas. this ports back (also) the following commit: 0.4.15-dev-6308-g 2d9877470d54952d904a6ad18e7f4998d4292a4c While touching those files, port back some minor translation improvements also. --- dll/cpl/appwiz/lang/zh-CN.rc | 16 ++++++---------- dll/cpl/appwiz/lang/zh-TW.rc | 29 +++++++++++++---------------- dll/cpl/desk/lang/zh-CN.rc | 10 ++++------ dll/cpl/desk/lang/zh-TW.rc | 8 +++++--- dll/cpl/inetcpl/lang/zh-CN.rc | 8 ++++---- dll/cpl/inetcpl/lang/zh-TW.rc | 12 ++++++------ dll/cpl/usrmgr/lang/zh-TW.rc | 22 +++++++++++----------- dll/cpl/wined3dcfg/lang/zh-TW.rc | 2 +- 8 files changed, 50 insertions(+), 57 deletions(-) diff --git a/dll/cpl/appwiz/lang/zh-CN.rc b/dll/cpl/appwiz/lang/zh-CN.rc index 9a07ba1ecbf..4b199a05fbe 100644 --- a/dll/cpl/appwiz/lang/zh-CN.rc +++ b/dll/cpl/appwiz/lang/zh-CN.rc @@ -1,10 +1,6 @@ -/* - * Simplified Chinese resource for appwiz (dll/cpl/appwiz/lang/zh-CN.rc) - * - * TRANSLATOR: Jingjing Fu (jingjingf AT 188.com) - * Luo Yufan (njlyf2011@hotmail.com) - * CREATED: 2009-04-25 - * UPDATED: 2018-01-05 +/* + * TRANSLATORS: 2009 Jingjing Fu + * 2018 Luke Luo */ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED @@ -53,9 +49,9 @@ END IDD_CONFIG_STARTMENU DIALOGEX 0, 0, 212, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "删除快捷方式/文件夹" -FONT 8, "宋体" +FONT 9, "宋体" BEGIN - LTEXT "从「 开始 」菜单中删除项目，选择项目并单击删除。(&T)", -1, 10, 10, 192, 16 + LTEXT "从「开始」菜单中删除项目，选择项目并单击删除。(&T)", -1, 10, 10, 192, 16 CONTROL "List1", IDC_STARTMENU_TREE, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 10, 32, 192, 138 PUSHBUTTON "删除(&R)", IDC_REMOVE_ENTRIES, 98, 176, 50, 14, WS_GROUP | WS_TABSTOP @@ -64,7 +60,7 @@ END ID_DWL_GECKO_DIALOG DIALOGEX 0, 0, 260, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Wine Gecko 安装包" +CAPTION "Wine Gecko 套件" FONT 9, "宋体" BEGIN CONTROL "ReactOS 无法找到使内嵌 HTML 的应用程序正常工作的 Wine Gecko 包。ReactOS 能为您自动下载并安装。", diff --git a/dll/cpl/appwiz/lang/zh-TW.rc b/dll/cpl/appwiz/lang/zh-TW.rc index 083365a0e2f..50f373c1d17 100644 --- a/dll/cpl/appwiz/lang/zh-TW.rc +++ b/dll/cpl/appwiz/lang/zh-TW.rc @@ -1,8 +1,5 @@ -/* - * Traditional Chinese resource for appwiz (dll/cpl/appwiz/lang/zh-CN.rc) - * - * TRANSLATOR: Henry Tang Ih (henrytang2 at hotmail dot com) - * CREATED: 2016 +/* + * TRANSLATOR: 2016 Henry Tang Ih */ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL @@ -28,14 +25,14 @@ END IDD_SHORTCUT_LOCATION DIALOGEX 0, 0, 340, 200 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "新建快捷方式" +CAPTION "新增捷徑" FONT 9, "新細明體", 0, 0, 0x0 BEGIN - LTEXT "此嚮導幫助您創建本地或網路程式、檔案、目錄、計算機或Internet地址的快捷方式。", -1, 120, 15, 200, 30 + LTEXT "此精靈幫助您創建本地或網路程式、檔案、目錄、電腦或網際網路地址的捷徑。", -1, 120, 15, 200, 30 LTEXT "輸入項目位置：", -1, 120, 50, 120, 10 EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT PUSHBUTTON "瀏覽...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT - LTEXT "點選“下一步”繼續。", -1, 120, 97, 162, 10 + LTEXT "按［下一步］繼續。", -1, 120, 97, 162, 10 END IDD_SHORTCUT_FINISH DIALOGEX 0, 0, 340, 200 @@ -43,15 +40,15 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "選擇程式標題" FONT 9, "新細明體", 0, 0, 0x0 BEGIN - LTEXT "輸入快捷方式名稱(&T)：", -1, 120, 15, 150, 10 + LTEXT "輸入捷徑名稱(&T)：", -1, 120, 15, 150, 10 EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT - LTEXT "點選“完成”創建快捷方式", -1, 118, 97, 178, 17 + LTEXT "按［完成］建立捷徑", -1, 118, 97, 178, 17 END IDD_CONFIG_STARTMENU DIALOGEX 0, 0, 212, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "刪除快捷方式/資料夾" -FONT 8, "新細明體" +CAPTION "刪除捷徑/資料夾" +FONT 9, "新細明體" BEGIN LTEXT "從「 開始 」選單中刪除項目，選擇項目並單擊刪除。(&T)", -1, 10, 10, 192, 16 CONTROL "List1", IDC_STARTMENU_TREE, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | @@ -62,10 +59,10 @@ END ID_DWL_GECKO_DIALOG DIALOGEX 0, 0, 260, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Wine Gecko 安裝包" +CAPTION "Wine Gecko 套件" FONT 9, "新細明體" BEGIN - CONTROL "ReactOS找不到這嵌入 HTML 的應用程式正常工作所需的Wine Gecko包。 ReactOS 可以自動下載，併為您安裝。", + CONTROL "ReactOS 無法找到使內嵌 HTML 的應用程式正常工作的 Wine Gecko 套件。ReactOS 能為您自動下載並安裝。", ID_DWL_STATUS, "SysLink", 0, 10, 10, 240, 65 CONTROL "", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER | PBS_SMOOTH, 10, 40, 240, 12 DEFPUSHBUTTON "安裝(&I)", ID_DWL_INSTALL, 200, 76, 50, 14, WS_GROUP | WS_TABSTOP @@ -75,8 +72,8 @@ END STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "添加/刪除程式" - IDS_CPLSYSTEMDESCRIPTION "設定程式和快捷方式" - IDS_CREATE_SHORTCUT "建立快捷方式" + IDS_CPLSYSTEMDESCRIPTION "設定程式和捷徑" + IDS_CREATE_SHORTCUT "建立捷徑" IDS_ERROR_NOT_FOUND "找不到檔案 %s" END diff --git a/dll/cpl/desk/lang/zh-CN.rc b/dll/cpl/desk/lang/zh-CN.rc index 5267ef85bc0..01d5044a7e0 100644 --- a/dll/cpl/desk/lang/zh-CN.rc +++ b/dll/cpl/desk/lang/zh-CN.rc @@ -1,9 +1,7 @@ /* - * (Simplified Chinese resources) - * (简体中文资源) - * by zhangbing 2008 - * Updated: 2009-04-26 Jingjing Fu - * 2018-01-05 Luo Yufan + * TRANSLATORS: 2008 zhangbing + * 2009 Jingjing Fu + * 2018 Luke Luo */ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED @@ -163,7 +161,7 @@ END IDD_CONFIRMSETTINGS DIALOGEX 20, 30, 233, 57 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "显示设置" -FONT 8, "宋体" +FONT 9, "宋体" BEGIN LTEXT "是否保留这些设置？", IDC_STATIC, 7, 7, 219, 8 LTEXT "", IDC_TIMEOUTTEXT, 7, 20, 219, 8 diff --git a/dll/cpl/desk/lang/zh-TW.rc b/dll/cpl/desk/lang/zh-TW.rc index bc847445d0d..c4f628a69d3 100644 --- a/dll/cpl/desk/lang/zh-TW.rc +++ b/dll/cpl/desk/lang/zh-TW.rc @@ -1,5 +1,7 @@ -/* Traditional Chinese translation by Henry Tang Ih 2016 (henrytang2@hotmail.com) */ -/* Translation has been changed by Luo Yufan 2018 (njlyf2011@hotmail.com) */ +/* + * TRANSLATORS: 2016 Henry Tang Ih + * 2018 Luke Luo + */ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL @@ -158,7 +160,7 @@ END IDD_CONFIRMSETTINGS DIALOGEX 20, 30, 233, 57 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "顯示設定" -FONT 8, "新細明體" +FONT 9, "新細明體" BEGIN LTEXT "您是否想要保留顯示設定?", IDC_STATIC, 7, 7, 219, 8 LTEXT "", IDC_TIMEOUTTEXT, 7, 20, 219, 8 diff --git a/dll/cpl/inetcpl/lang/zh-CN.rc b/dll/cpl/inetcpl/lang/zh-CN.rc index b272da8c804..c8e9924738e 100644 --- a/dll/cpl/inetcpl/lang/zh-CN.rc +++ b/dll/cpl/inetcpl/lang/zh-CN.rc @@ -39,7 +39,7 @@ END /* "General" propsheet */ IDD_GENERAL DIALOG 0, 0, 320, 220 STYLE WS_CAPTION | WS_CHILD | WS_DISABLED -FONT 8, "宋体" +FONT 9, "宋体" CAPTION "常规" BEGIN @@ -61,7 +61,7 @@ END /* "Delete browsing history" dialog */ IDD_DELETE_HISTORY DIALOG 0, 0, 250, 250 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -FONT 8, "宋体" +FONT 9, "宋体" CAPTION "删除浏览历史记录" BEGIN @@ -83,7 +83,7 @@ END /* "Security" propsheet */ IDD_SECURITY DIALOG 0, 0, 320, 220 STYLE WS_CAPTION | WS_CHILD | WS_DISABLED -FONT 8, "宋体" +FONT 9, "宋体" CAPTION "安全" BEGIN @@ -101,7 +101,7 @@ END /* "Content" propsheet */ IDD_CONTENT DIALOG 0, 0, 320, 220 STYLE WS_CAPTION | WS_CHILD | WS_DISABLED -FONT 8, "宋体" +FONT 9, "宋体" CAPTION "内容" BEGIN diff --git a/dll/cpl/inetcpl/lang/zh-TW.rc b/dll/cpl/inetcpl/lang/zh-TW.rc index 223253cf8e8..af16114964c 100644 --- a/dll/cpl/inetcpl/lang/zh-TW.rc +++ b/dll/cpl/inetcpl/lang/zh-TW.rc @@ -28,7 +28,7 @@ BEGIN IDS_CPL_NAME "網際網路設定" IDS_CPL_INFO "配置Wine網際網路瀏覽器和相關的設定" IDS_SEC_SETTINGS "區域的安全設定: " - IDS_SEC_LEVEL0 "自定義" + IDS_SEC_LEVEL0 "自訂" IDS_SEC_LEVEL1 "非常低" IDS_SEC_LEVEL2 "低" IDS_SEC_LEVEL3 "中等" @@ -39,7 +39,7 @@ END /* "General" propsheet */ IDD_GENERAL DIALOG 0, 0, 320, 220 STYLE WS_CAPTION | WS_CHILD | WS_DISABLED -FONT 8, "新細明體" +FONT 9, "新細明體" CAPTION "常規" BEGIN @@ -61,13 +61,13 @@ END /* "Delete browsing history" dialog */ IDD_DELETE_HISTORY DIALOG 0, 0, 250, 250 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -FONT 8, "新細明體" +FONT 9, "新細明體" CAPTION "刪除瀏覽歷史記錄" BEGIN AUTOCHECKBOX "網際網路臨時檔案\n快取的網站頁面、 影象和證書的副本。", IDC_DELETE_TEMP_FILES, 10, 8, 230, 40, BS_TOP | BS_MULTILINE - AUTOCHECKBOX "小型文字檔案\n通過網站在您的計算機上儲存檔案存儲使用者首選項和登入資訊。", + AUTOCHECKBOX "Cookie\n通過網站在您的電腦上儲存檔案存儲使用者首選項和登入資訊。", IDC_DELETE_COOKIES, 10, 48, 230, 40, BS_TOP | BS_MULTILINE AUTOCHECKBOX "歷史記錄\n您進入的網站的列表。", IDC_DELETE_HISTORY, 10, 88, 230, 40, BS_TOP | BS_MULTILINE @@ -83,7 +83,7 @@ END /* "Security" propsheet */ IDD_SECURITY DIALOG 0, 0, 320, 220 STYLE WS_CAPTION | WS_CHILD | WS_DISABLED -FONT 8, "新細明體" +FONT 9, "新細明體" CAPTION "安全" BEGIN @@ -101,7 +101,7 @@ END /* "Content" propsheet */ IDD_CONTENT DIALOG 0, 0, 320, 220 STYLE WS_CAPTION | WS_CHILD | WS_DISABLED -FONT 8, "新細明體" +FONT 9, "新細明體" CAPTION "內容" BEGIN diff --git a/dll/cpl/usrmgr/lang/zh-TW.rc b/dll/cpl/usrmgr/lang/zh-TW.rc index afba7190c0a..4b1cc59dda7 100644 --- a/dll/cpl/usrmgr/lang/zh-TW.rc +++ b/dll/cpl/usrmgr/lang/zh-TW.rc @@ -7,7 +7,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL IDD_USERS DIALOGEX 0, 0, 252, 223 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "使用者" -FONT 8, "新細明體" +FONT 9, "新細明體" BEGIN CONTROL "", IDC_USERS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 7, 238, 85, WS_EX_CLIENTEDGE @@ -21,7 +21,7 @@ END IDD_GROUPS DIALOGEX 0, 0, 252, 223 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "小組" -FONT 8, "新細明體" +FONT 9, "新細明體" BEGIN CONTROL "", IDC_GROUPS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 7, 238, 85, WS_EX_CLIENTEDGE @@ -33,7 +33,7 @@ END IDD_EXTRA DIALOGEX 0, 0, 252, 223 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "額外" -FONT 8, "新細明體" +FONT 9, "新細明體" BEGIN LTEXT "這個空間是故意留空", IDC_STATIC, 66, 90, 112, 8 END @@ -41,7 +41,7 @@ END IDD_USER_GENERAL DIALOGEX 0, 0, 252, 223 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "常規" -FONT 8, "新細明體" +FONT 9, "新細明體" BEGIN LTEXT "", IDC_USER_GENERAL_NAME, 7, 12, 112, 8 LTEXT "全名:", -1, 7, 46, 63, 8 @@ -58,7 +58,7 @@ END IDD_USER_MEMBERSHIP DIALOGEX 0, 0, 252, 223 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "會員" -FONT 8, "新細明體" +FONT 9, "新細明體" BEGIN LTEXT "成員:", -1, 7, 7, 170, 8 CONTROL "", IDC_USER_MEMBERSHIP_LIST, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | @@ -70,7 +70,7 @@ END IDD_USER_PROFILE DIALOGEX 0, 0, 252, 223 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "配置檔案" -FONT 8, "新細明體" +FONT 9, "新細明體" BEGIN GROUPBOX "使用者配置檔案", -1, 7, 7, 238, 54 LTEXT "配置檔案路徑:", -1, 16, 22, 55, 8 @@ -90,7 +90,7 @@ END IDD_GROUP_GENERAL DIALOGEX 0, 0, 252, 223 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "常規" -FONT 8, "新細明體" +FONT 9, "新細明體" BEGIN LTEXT "", IDC_GROUP_GENERAL_NAME, 7, 12, 112, 8 LTEXT "描述:", -1, 7, 45, 46, 8 @@ -105,7 +105,7 @@ END IDD_CHANGE_PASSWORD DIALOGEX 0, 0, 267, 74 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT CAPTION "更換密碼" -FONT 8, "新細明體" +FONT 9, "新細明體" BEGIN EDITTEXT IDC_EDIT_PASSWORD1, 107, 7, 153, 14, ES_AUTOHSCROLL | ES_PASSWORD RTEXT "新密碼:", -1, 7, 10, 96, 8 @@ -118,7 +118,7 @@ END IDD_USER_NEW DIALOGEX 0, 0, 267, 200 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT CAPTION "新使用者" -FONT 8, "新細明體" +FONT 9, "新細明體" BEGIN EDITTEXT IDC_USER_NEW_NAME, 107, 7, 153, 14, ES_AUTOHSCROLL RTEXT "使用者名稱:", -1, 7, 10, 96, 8 @@ -141,7 +141,7 @@ END IDD_GROUP_NEW DIALOGEX 0, 0, 267, 74 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT CAPTION "新組" -FONT 8, "新細明體" +FONT 9, "新細明體" BEGIN EDITTEXT IDC_GROUP_NEW_NAME, 107, 7, 153, 14, ES_AUTOHSCROLL RTEXT "組名:", -1, 7, 10, 96, 8 @@ -154,7 +154,7 @@ END IDD_USER_ADD_MEMBERSHIP DIALOGEX 0, 0, 252, 223 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT CAPTION "組成員身份" -FONT 8, "新細明體" +FONT 9, "新細明體" BEGIN LTEXT "成員:", -1, 7, 7, 56, 8 CONTROL "", IDC_USER_ADD_MEMBERSHIP_LIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | diff --git a/dll/cpl/wined3dcfg/lang/zh-TW.rc b/dll/cpl/wined3dcfg/lang/zh-TW.rc index 56b0d9df362..9cae6a80826 100644 --- a/dll/cpl/wined3dcfg/lang/zh-TW.rc +++ b/dll/cpl/wined3dcfg/lang/zh-TW.rc @@ -5,7 +5,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL IDD_PROPPAGEGENERAL DIALOGEX 0, 0, 246, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "常規" -FONT 8, "新細明體" +FONT 9, "新細明體" BEGIN ICON IDI_CPLICON, IDI_CPLICON, 8, 0, 21, 20 GROUPBOX "着色器", -1, 5, 25, 230, 80