[ros-diffs] [reactos] 04/04: [SHELLEXT] Use correct font name in Chinese resources, CORE-9566 (#224).

[Katayama Hirofumi MZ]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bf51ed17f8f1b3140dcb3…

commit bf51ed17f8f1b3140dcb384408571d4236c55bef
Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com>
AuthorDate: Tue Dec 26 21:48:53 2017 +0900

    [SHELLEXT] Use correct font name in Chinese resources, CORE-9566 (#224).
    
    Localized resources should use the correct Chinese font names compatible with
Windows.
---
 dll/shellext/acppage/lang/zh-CN.rc  |  4 ++--
 dll/shellext/acppage/lang/zh-TW.rc  |  4 ++--
 dll/shellext/deskadp/lang/zh-CN.rc  |  4 ++--
 dll/shellext/deskadp/lang/zh-TW.rc  |  4 ++--
 dll/shellext/deskmon/lang/zh-CN.rc  |  2 +-
 dll/shellext/deskmon/lang/zh-TW.rc  |  2 +-
 dll/shellext/netshell/lang/zh-CN.rc | 16 ++++++++--------
 dll/shellext/netshell/lang/zh-TW.rc | 16 ++++++++--------
 dll/shellext/stobject/lang/zh-CN.rc |  2 +-
 dll/shellext/stobject/lang/zh-TW.rc |  2 +-
 10 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/dll/shellext/acppage/lang/zh-CN.rc b/dll/shellext/acppage/lang/zh-CN.rc
index c410c9d22c..6a76bad4f1 100644
--- a/dll/shellext/acppage/lang/zh-CN.rc
+++ b/dll/shellext/acppage/lang/zh-CN.rc
@@ -5,7 +5,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
 IDD_ACPPAGESHEET DIALOGEX 0, 0, 224, 226
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "兼容性"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
+FONT 9, "宋体", 0, 0, 0x0
 BEGIN
     LTEXT "如果您有问题在 ReactOS 中运行此程序，选择 ReactOS 应报告给应用程序的操作系统。\nPlease note that this
is a work in progress.", -1, 7, 7, 210, 31
     GROUPBOX "兼容模式", IDC_COMPATGROUP, 7, 41, 210, 49
@@ -22,7 +22,7 @@ END
 IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "编辑兼容模式"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
+FONT 9, "宋体", 0, 0, 0x0
 BEGIN
     COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN |
WS_VSCROLL
     LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT |
LBS_WANTKEYBOARDINPUT | WS_BORDER
diff --git a/dll/shellext/acppage/lang/zh-TW.rc b/dll/shellext/acppage/lang/zh-TW.rc
index 0e8e6f1b1e..02cbf1c2a3 100644
--- a/dll/shellext/acppage/lang/zh-TW.rc
+++ b/dll/shellext/acppage/lang/zh-TW.rc
@@ -5,7 +5,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
 IDD_ACPPAGESHEET DIALOGEX 0, 0, 224, 226
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "相容性"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
+FONT 9, "新細明體", 0, 0, 0x0
 BEGIN
     LTEXT "如果您有問題在 ReactOS 中運行此程式，選擇 ReactOS 應報告給應用程式的作業系統。\nPlease note that this
is a work in progress.", -1, 7, 7, 210, 31
     GROUPBOX "相容模式", IDC_COMPATGROUP, 7, 41, 210, 49
@@ -22,7 +22,7 @@ END
 IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "編輯相容模式"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
+FONT 9, "新細明體", 0, 0, 0x0
 BEGIN
     COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN |
WS_VSCROLL
     LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT |
LBS_WANTKEYBOARDINPUT | WS_BORDER
diff --git a/dll/shellext/deskadp/lang/zh-CN.rc b/dll/shellext/deskadp/lang/zh-CN.rc
index 4011880c9f..59b21c9a8a 100644
--- a/dll/shellext/deskadp/lang/zh-CN.rc
+++ b/dll/shellext/deskadp/lang/zh-CN.rc
@@ -5,7 +5,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
 IDD_DISPLAYADAPTER DIALOGEX 0, 0, 252, 226
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "适配器"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
+FONT 9, "宋体", 0, 0, 0x0
 BEGIN
     GROUPBOX "适配器类型", -1, 7, 3, 237, 50
     ICON IDC_DESK_ADAPTER, IDC_DESK_ADAPTER, 13, 11, 21, 20, SS_ICON
@@ -28,7 +28,7 @@ END
 IDD_LISTALLMODES DIALOGEX 0, 0, 225, 135
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME
 CAPTION "列出所有模式"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
+FONT 9, "宋体", 0, 0, 0x0
 BEGIN
     DEFPUSHBUTTON "确定", IDOK, 112, 115, 50, 15
     PUSHBUTTON "取消", IDCANCEL, 167, 115, 50, 15
diff --git a/dll/shellext/deskadp/lang/zh-TW.rc b/dll/shellext/deskadp/lang/zh-TW.rc
index 552f8b5fc3..84258148f5 100644
--- a/dll/shellext/deskadp/lang/zh-TW.rc
+++ b/dll/shellext/deskadp/lang/zh-TW.rc
@@ -5,7 +5,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
 IDD_DISPLAYADAPTER DIALOGEX 0, 0, 252, 226
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "介面卡"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
+FONT 9, "新細明體", 0, 0, 0x0
 BEGIN
     GROUPBOX "介面卡類型", -1, 7, 3, 237, 50
     ICON IDC_DESK_ADAPTER, IDC_DESK_ADAPTER, 13, 11, 21, 20, SS_ICON
@@ -28,7 +28,7 @@ END
 IDD_LISTALLMODES DIALOGEX 0, 0, 225, 135
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME
 CAPTION "列出所有模式"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
+FONT 9, "新細明體", 0, 0, 0x0
 BEGIN
     DEFPUSHBUTTON "確定", IDOK, 112, 115, 50, 15
     PUSHBUTTON "取消", IDCANCEL, 167, 115, 50, 15
diff --git a/dll/shellext/deskmon/lang/zh-CN.rc b/dll/shellext/deskmon/lang/zh-CN.rc
index a64ddb8d74..d75b23773d 100644
--- a/dll/shellext/deskmon/lang/zh-CN.rc
+++ b/dll/shellext/deskmon/lang/zh-CN.rc
@@ -5,7 +5,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
 IDD_MONITOR DIALOGEX 0, 0, 252, 226
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "萤幕机"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
+FONT 9, "宋体", 0, 0, 0x0
 BEGIN
     GROUPBOX "萤幕机类型", -1, 7, 3, 237, 52
     ICON IDC_MONITORICO, IDC_MONITORICO, 13, 11, 21, 20, SS_ICON
diff --git a/dll/shellext/deskmon/lang/zh-TW.rc b/dll/shellext/deskmon/lang/zh-TW.rc
index c70fba6eb8..4e1fd37f82 100644
--- a/dll/shellext/deskmon/lang/zh-TW.rc
+++ b/dll/shellext/deskmon/lang/zh-TW.rc
@@ -5,7 +5,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
 IDD_MONITOR DIALOGEX 0, 0, 252, 226
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "螢幕機"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
+FONT 9, "新細明體", 0, 0, 0x0
 BEGIN
     GROUPBOX "螢幕機類型", -1, 7, 3, 237, 52
     ICON IDC_MONITORICO, IDC_MONITORICO, 13, 11, 21, 20, SS_ICON
diff --git a/dll/shellext/netshell/lang/zh-CN.rc b/dll/shellext/netshell/lang/zh-CN.rc
index 0d2b89f412..13a31f3e5c 100644
--- a/dll/shellext/netshell/lang/zh-CN.rc
+++ b/dll/shellext/netshell/lang/zh-CN.rc
@@ -11,7 +11,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
 IDD_NETPROPERTIES DIALOGEX 0, 0, 246, 246
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "常规"
-FONT 9, "MS Shell Dlg"
+FONT 9, "宋体"
 BEGIN
     CONTROL "", IDC_COMPONENTSLIST, "SysListView32", LVS_REPORT |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_BORDER |
WS_TABSTOP, 9, 71, 230, 55
     LTEXT "连接时使用:", -1, 9, 9, 217, 8
@@ -30,14 +30,14 @@ END
 IDD_STATUS DIALOGEX 0, 0, 200, 280
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | DS_MODALFRAME | WS_SYSMENU
 CAPTION "常规"
-FONT 9, "MS Shell Dlg"
+FONT 9, "宋体"
 BEGIN
 END
 
 IDD_LAN_NETSTATUS DIALOGEX 0, 0, 200, 180
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "常规"
-FONT 9, "MS Shell Dlg"
+FONT 9, "宋体"
 BEGIN
     GROUPBOX "连接", -1, 9, 8, 182, 58, BS_GROUPBOX
     LTEXT "状态:", -1, 19, 20, 60, 8
@@ -60,7 +60,7 @@ END
 IDD_LAN_NETSTATUSADVANCED DIALOGEX 0, 0, 200, 180
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "维持"
-FONT 9, "MS Shell Dlg"
+FONT 9, "宋体"
 BEGIN
     GROUPBOX "连接状态", -1, 9, 8, 190, 88, BS_GROUPBOX
     LTEXT "地址类型:", -1, 22, 20, 80, 8
@@ -77,7 +77,7 @@ END
 IDD_LAN_NETSTATUSDETAILS DIALOGEX 0, 0, 190, 175
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | DS_MODALFRAME
 CAPTION "网络连接详细信息"
-FONT 9, "MS Shell Dlg"
+FONT 9, "宋体"
 BEGIN
     LTEXT "网络连接详细信息:(&D)", -1, 10, 4, 170, 12
     CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 10, 15,
170, 130
@@ -87,7 +87,7 @@ END
 IDD_NETWORKSETTINGSPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Setup"
-FONT 8, "MS Shell Dlg"
+FONT 9, "宋体"
 BEGIN
     ICON IDI_NET_SETUP, IDC_STATIC, 21, 10, 20, 20
     LTEXT "Choose whether to use typical or custom settings:", IDC_STATIC, 53,
7, 240, 20
@@ -100,7 +100,7 @@ END
 IDD_NETWORKCOMPONENTPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Setup"
-FONT 8, "MS Shell Dlg"
+FONT 9, "宋体"
 BEGIN
     LTEXT "For Device:", IDC_STATIC, 33, 2, 100, 20
     LTEXT "n/a", IDC_NETWORK_DEVICE, 75, 2, 253, 20
@@ -115,7 +115,7 @@ END
 IDD_NETWORKDOMAINPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Setup"
-FONT 8, "MS Shell Dlg"
+FONT 9, "宋体"
 BEGIN
     LTEXT "Do you want this computer to be a member of a domain?\n\
 (You can obtain this information from your network administrator.)", IDC_STATIC, 33,
2, 263, 50
diff --git a/dll/shellext/netshell/lang/zh-TW.rc b/dll/shellext/netshell/lang/zh-TW.rc
index 17fc248162..4974976077 100644
--- a/dll/shellext/netshell/lang/zh-TW.rc
+++ b/dll/shellext/netshell/lang/zh-TW.rc
@@ -11,7 +11,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
 IDD_NETPROPERTIES DIALOGEX 0, 0, 246, 246
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "一般"
-FONT 9, "MS Shell Dlg"
+FONT 9, "新細明體"
 BEGIN
     CONTROL "", IDC_COMPONENTSLIST, "SysListView32", LVS_REPORT |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_BORDER |
WS_TABSTOP, 9, 71, 230, 55
     LTEXT "連接時使用:", -1, 9, 9, 217, 8
@@ -30,14 +30,14 @@ END
 IDD_STATUS DIALOGEX 0, 0, 200, 280
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | DS_MODALFRAME | WS_SYSMENU
 CAPTION "一般"
-FONT 9, "MS Shell Dlg"
+FONT 9, "新細明體"
 BEGIN
 END
 
 IDD_LAN_NETSTATUS DIALOGEX 0, 0, 200, 180
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "一般"
-FONT 9, "MS Shell Dlg"
+FONT 9, "新細明體"
 BEGIN
     GROUPBOX "連接", -1, 9, 8, 182, 58, BS_GROUPBOX
     LTEXT "狀態:", -1, 19, 20, 60, 8
@@ -60,7 +60,7 @@ END
 IDD_LAN_NETSTATUSADVANCED DIALOGEX 0, 0, 200, 180
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "維持"
-FONT 9, "MS Shell Dlg"
+FONT 9, "新細明體"
 BEGIN
     GROUPBOX "連接狀態", -1, 9, 8, 190, 88, BS_GROUPBOX
     LTEXT "位址類型:", -1, 22, 20, 80, 8
@@ -77,7 +77,7 @@ END
 IDD_LAN_NETSTATUSDETAILS DIALOGEX 0, 0, 190, 175
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | DS_MODALFRAME
 CAPTION "網路連線詳細資料"
-FONT 9, "MS Shell Dlg"
+FONT 9, "新細明體"
 BEGIN
     LTEXT "網路連線詳細資料(&D):", -1, 10, 4, 170, 12
     CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 10, 15,
170, 130
@@ -87,7 +87,7 @@ END
 IDD_NETWORKSETTINGSPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Setup"
-FONT 8, "MS Shell Dlg"
+FONT 9, "新細明體"
 BEGIN
     ICON IDI_NET_SETUP, IDC_STATIC, 21, 10, 20, 20
     LTEXT "Choose whether to use typical or custom settings:", IDC_STATIC, 53,
7, 240, 20
@@ -100,7 +100,7 @@ END
 IDD_NETWORKCOMPONENTPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Setup"
-FONT 8, "MS Shell Dlg"
+FONT 9, "新細明體"
 BEGIN
     LTEXT "For Device:", IDC_STATIC, 33, 2, 100, 20
     LTEXT "n/a", IDC_NETWORK_DEVICE, 75, 2, 253, 20
@@ -115,7 +115,7 @@ END
 IDD_NETWORKDOMAINPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Setup"
-FONT 8, "MS Shell Dlg"
+FONT 9, "新細明體"
 BEGIN
     LTEXT "Do you want this computer to be a member of a domain?\n\
 (You can obtain this information from your network administrator.)", IDC_STATIC, 33,
2, 263, 50
diff --git a/dll/shellext/stobject/lang/zh-CN.rc b/dll/shellext/stobject/lang/zh-CN.rc
index 1d402493d0..b75b267d61 100644
--- a/dll/shellext/stobject/lang/zh-CN.rc
+++ b/dll/shellext/stobject/lang/zh-CN.rc
@@ -6,7 +6,7 @@ IDD_POWER_METER DIALOGEX 0, 0, 252, 218
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_CONTEXTHELP
 CAPTION "电源表"
-FONT 8, "MS Shell Dlg"
+FONT 9, "宋体"
 BEGIN
     CONTROL "电源状态", 1001, "Button", BS_GROUPBOX | WS_CHILD |
WS_VISIBLE, 9, 20, 234, 189 
     CONTROL "总是在任务栏上显示图标。(&A)", 1002, "Button", BS_AUTOCHECKBOX |
WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 6, 6, 120, 10 
diff --git a/dll/shellext/stobject/lang/zh-TW.rc b/dll/shellext/stobject/lang/zh-TW.rc
index 3d9a5265b8..001cf847f3 100644
--- a/dll/shellext/stobject/lang/zh-TW.rc
+++ b/dll/shellext/stobject/lang/zh-TW.rc
@@ -6,7 +6,7 @@ IDD_POWER_METER DIALOGEX 0, 0, 252, 218
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_CONTEXTHELP
 CAPTION "電源表"
-FONT 8, "MS Shell Dlg"
+FONT 9, "新細明體"
 BEGIN
     CONTROL "電源狀態", 1001, "Button", BS_GROUPBOX | WS_CHILD |
WS_VISIBLE, 9, 20, 234, 189 
     CONTROL "總是在工作列上顯示圖示。(&A)", 1002, "Button", BS_AUTOCHECKBOX |
WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 6, 6, 120, 10