Switch to using "Microsoft YaHei UI" for zh localized dialogs

Do this by applying a post-processing step to the generated RC file.
This lets us fix up any minor, per-language layout problems.

Apparently using "MS Shell Dlg" for Chinese gylphs is "annoying", so use
"Microsoft YaHei UI".

See https://cygwin.com/pipermail/cygwin/2024-April/255806.html

diff --git a/Makefile.am b/Makefile.am
index 8a50cb058d5a264b5f1337cdeece0e23b467fdc6..72c6610908e9a5d9fc475d1758629b33a020b841 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -323,7 +323,8 @@ po2rc:
                ./langopts $$l >/dev/null && \
                $(MKDIR_P) res/$$l/ && \
                po2rc -t res/en/res.rc --charset-output=utf-8 $$(./langopts $$l) po/$$l/res.po res/$$l/res.rc && \
-               d2u -q res/$$l/res.rc ; \
+               d2u -q res/$$l/res.rc && \
+               ./rc-postprocess $$l res/$$l/res.rc ; \
        done
 
 # files included by res.rc

diff --git a/rc-postprocess b/rc-postprocess
new file mode 100755 (executable)
index 0000000..086bfa1
--- /dev/null
+++ b/rc-postprocess
@@ -0,0 +1,8 @@
+#!
+# post-process the generated rc file
+
+case $1 in
+    zh_Hans)  # 0804
+        sed -i 's#FONT 8, "MS Shell Dlg"#FONT 9, "Microsoft YaHei UI"#' $2
+        ;;
+esac

diff --git a/res/zh_Hans/res.rc b/res/zh_Hans/res.rc
index 0aede05f93a395d9202f724112b8ce8cf36f6ef9..1a3366a2e331b11a9fa47ce997a6e73523eb1555 100644 (file)
--- a/res/zh_Hans/res.rc
+++ b/res/zh_Hans/res.rc
@@ -8,7 +8,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
 IDD_SOURCE DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
 STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin 安装程序 - 选择安装类型"
-FONT 8, "MS Shell Dlg"
+FONT 9, "Microsoft YaHei UI"
 BEGIN
     CONTROL         "从互联网安装(&I)\n（下载的文件将保留以备将来重复使用）",IDC_SOURCE_NETINST,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP | BS_MULTILINE | BS_TOP,71,60,200,30
     CONTROL         "下载而不安装(&D)",IDC_SOURCE_DOWNLOAD,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,71,90,200,10
@@ -22,7 +22,7 @@ END
 IDD_VIRUS DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
 STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin 安装程序 - 禁用病毒扫描程序？"
-FONT 8, "MS Shell Dlg"
+FONT 9, "Microsoft YaHei UI"
 BEGIN
     CONTROL         "禁用病毒扫描程序(&D)",IDC_DISABLE_AV,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,101,69,115,10
     CONTROL         "保留病毒扫描程序(&L)",IDC_LEAVE_AV,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,101,84,115,10
@@ -36,7 +36,7 @@ END
 IDD_LOCAL_DIR DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
 STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin 安装程序 - 选择本地软件包目录"
-FONT 8, "MS Shell Dlg"
+FONT 9, "Microsoft YaHei UI"
 BEGIN
     LTEXT           "选择本地软件包目录",IDC_STATIC_HEADER_TITLE,7,0,258,8,NOT WS_GROUP
     LTEXT           "选择希望安装程序存储其下载的安装文件的目录。如果该目录尚不存在，则将创建该目录。",IDC_LOCAL_DIR_DOWNLOAD_DESC,21,9,248,16,NOT WS_GROUP
@@ -51,7 +51,7 @@ END
 IDD_ROOT DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
 STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin 安装程序 - 选择安装目录"
-FONT 8, "MS Shell Dlg"
+FONT 9, "Microsoft YaHei UI"
 BEGIN
     LTEXT           "选择根安装目录",IDC_STATIC_HEADER_TITLE,7,0,258,8,NOT WS_GROUP
     LTEXT           "选择要安装 Cygwin 的目录。以及一些安装参数。",IDC_ROOTDIR_SUBTEXT,21,9,239,16,NOT WS_GROUP
@@ -71,7 +71,7 @@ IDD_SITE DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
 STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_CONTROLPARENT
 CAPTION "Cygwin 安装程序 - 选择下载站点"
-FONT 8, "MS Shell Dlg"
+FONT 9, "Microsoft YaHei UI"
 BEGIN
     ICON            IDI_CYGWIN,IDC_HEADICON,SETUP_HEADICON_X,0,21,20
     LISTBOX         IDC_URL_LIST,66,45,185,110,LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_HSCROLL | WS_GROUP | WS_TABSTOP
@@ -87,7 +87,7 @@ END
 IDD_NET DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
 STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin 安装程序 - 选择连接类型"
-FONT 8, "MS Shell Dlg"
+FONT 9, "Microsoft YaHei UI"
 BEGIN
     CONTROL         "使用系统代理设置(&S)",IDC_NET_PRECONFIG,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,60,55,185,10
     CONTROL         "直接连接(&D)",IDC_NET_DIRECT,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,60,70,185,10
@@ -106,7 +106,7 @@ END
 IDD_INSTATUS DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
 STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin 安装程序"
-FONT 8, "MS Shell Dlg"
+FONT 9, "Microsoft YaHei UI"
 BEGIN
     LTEXT           "正在安装...",IDC_INS_ACTION,45,55,205,8,SS_ENDELLIPSIS
     LTEXT           "（软件包）",IDC_INS_PKG,45,70,205,8,SS_ENDELLIPSIS
@@ -126,7 +126,7 @@ END
 IDD_PROXY_AUTH DIALOG 0, 0, SETUP_SMALL_DIALOG_DIMS
 STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "需要代理身份验证"
-FONT 8, "MS Shell Dlg"
+FONT 9, "Microsoft YaHei UI"
 BEGIN
     ICON            IDI_CYGWIN,IDC_HEADICON,5,5,21,20
     LTEXT           "代理用户 ID(&U)",IDC_STATIC,5,28,55,15,SS_CENTERIMAGE,WS_EX_RIGHT
@@ -141,7 +141,7 @@ END
 IDD_NET_AUTH DIALOG 0, 0, SETUP_SMALL_DIALOG_DIMS
 STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "需要服务器身份验证"
-FONT 8, "MS Shell Dlg"
+FONT 9, "Microsoft YaHei UI"
 BEGIN
     ICON            IDI_CYGWIN,IDC_HEADICON,5,5,21,20
     LTEXT           "用户 ID(&U)",IDC_STATIC,5,28,55,15,SS_CENTERIMAGE,WS_EX_RIGHT
@@ -156,7 +156,7 @@ END
 IDD_SPLASH DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
 STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin 安装程序"
-FONT 8, "MS Shell Dlg"
+FONT 9, "Microsoft YaHei UI"
 BEGIN
     LTEXT           "Cygwin 在线安装程序",IDC_STATIC_WELCOME_TITLE,115,1,195,24
     LTEXT           "本安装程序用于 Cygwin 环境的初始安装以及所有后续更新。以下页面将指导您完成安装。\n\n请注意，默认情况下，我们只安装一组基本的软件包。Cygwin 提供了大量涵盖各种用途的软件包。\n\n您将来可以随时运行此程序，以根据需要添加、删除或升级软件包。",IDC_SPLASH_TEXT,115,25,195,100
@@ -170,7 +170,7 @@ END
 IDD_DESKTOP DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
 STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin 安装程序 - 安装状态和创建快捷方式"
-FONT 8, "MS Shell Dlg"
+FONT 9, "Microsoft YaHei UI"
 BEGIN
     CONTROL         "在桌面上创建快捷方式(&D)",IDC_ROOT_DESKTOP,"Button",BS_AUTOCHECKBOX,108,78,110,8
     CONTROL         "将快捷方式添加到“开始”菜单(&S)",IDC_ROOT_MENU,"Button",BS_AUTOCHECKBOX,108,93,140,8
@@ -188,7 +188,7 @@ END
 IDD_FTP_AUTH DIALOG 0, 0, SETUP_SMALL_DIALOG_DIMS
 STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "需要 FTP 身份验证"
-FONT 8, "MS Shell Dlg"
+FONT 9, "Microsoft YaHei UI"
 BEGIN
     ICON            IDI_CYGWIN,IDC_HEADICON,5,5,21,20
     LTEXT           "用户 ID(&U)",IDC_STATIC,5,28,55,15,SS_CENTERIMAGE,WS_EX_RIGHT
@@ -203,7 +203,7 @@ END
 IDD_CHOOSE DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
 STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin 安装程序 - 选择软件包"
-FONT 8, "MS Shell Dlg"
+FONT 9, "Microsoft YaHei UI"
 BEGIN
     LTEXT           "视图(&V)",IDC_CHOOSE_VIEWCAPTION,SETUP_VIEW_X,33,SETUP_VIEW_W,10
     COMBOBOX        IDC_CHOOSE_VIEW,SETUP_VIEWLIST_X,30,SETUP_VIEWLIST_W,84,CBS_DROPDOWNLIST | WS_TABSTOP
@@ -227,7 +227,7 @@ END
 IDD_PREREQ DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
 STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin 安装程序 - 解决依赖关系"
-FONT 8, "MS Shell Dlg"
+FONT 9, "Microsoft YaHei UI"
 BEGIN
     CONTROL         "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,SETUP_STANDARD_DIALOG_W,1
     ICON            IDI_CYGWIN,IDC_HEADICON,SETUP_HEADICON_X,0,21,20
@@ -240,7 +240,7 @@ END
 IDD_CONFIRM DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
 STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin 安装程序 - 审查并确认更改"
-FONT 8, "MS Shell Dlg"
+FONT 9, "Microsoft YaHei UI"
 BEGIN
     CONTROL         "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,SETUP_STANDARD_DIALOG_W,1
     ICON            IDI_CYGWIN,IDC_HEADICON,SETUP_HEADICON_X,0,21,20
@@ -251,7 +251,7 @@ END
 IDD_DROPPED DIALOG 0, 0, SETUP_STANDARD_DIALOG_W, 142
 STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin 安装程序 - 使用非官方镜像？"
-FONT 8, "MS Shell Dlg"
+FONT 9, "Microsoft YaHei UI"
 BEGIN
     LTEXT           "警告：",IDC_STATIC,7,8,40,8
     LTEXT           "您选择的一个或多个镜像不再在官方 Cygwin 镜像列表中。它/它们可能已过时或缺少某些软件包。\n这会影响以下镜像：",IDC_STATIC,47,8,263,32
@@ -265,7 +265,7 @@ END
 IDD_DOWNLOAD_ERROR DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
 STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "下载不完整"
-FONT 8, "MS Shell Dlg"
+FONT 9, "Microsoft YaHei UI"
 BEGIN
     ICON            IDI_WARNING,IDC_HEADICON,10,10
     LTEXT           "以下软件包出现下载错误：",IDC_STATIC,7,8,320,16
@@ -280,7 +280,7 @@ END
 IDD_POSTINSTALL DIALOG 0, 0, SETUP_STANDARD_DIALOG_W, 142
 STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin 安装程序 - 执行安装后操作"
-FONT 8, "MS Shell Dlg"
+FONT 9, "Microsoft YaHei UI"
 BEGIN
     CONTROL         "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,SETUP_STANDARD_DIALOG_W,1
     ICON            IDI_CYGWIN,IDC_HEADICON,SETUP_HEADICON_X,0,21,20
@@ -292,7 +292,7 @@ END
 IDD_FILE_INUSE DIALOG 0, 0, SETUP_MEDIUM_DIALOG_DIMS
 STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "检测到正在使用的文件"
-FONT 8, "MS Shell Dlg"
+FONT 9, "Microsoft YaHei UI"
 BEGIN
     ICON            IDI_WARNING,IDC_HEADICON,10,10
     LTEXT           "无法解压缩",IDC_FILE_INUSE_MSG,33,10,234,8,SS_PATHELLIPSIS