From 82e9061e364e28196dccd24e0b9d268349379a73 Mon Sep 17 00:00:00 2001 From: Joachim Henze Date: Tue, 1 Aug 2023 21:40:48 +0200 Subject: [PATCH] [0.4.7][TRANSLATION] Simplified Chinese translation improved. (#346) This is a partial backport of: 0.4.8-dev-946-g 7082b621a5bd49a9a34b9580e94ccd0c894d9f70 It fixes the broken bootcd Startmenu (and very likely also other stuff, like 3rd party apps) for zh-CN by untranslating selected folder paths. It regressed in multiple steps on master before the SVN->GIT-transition. Ftr: It was mentioned in the PR, that even MS Windows for Simplified Chinese does not translate those folders. shell32.dll GCC4.7.2dbg RosBEWin2.1.6 0.4.7 8.668.160 -> 8.668.160 shimgvw.dll GCC4.7.2dbg RosBEWin2.1.6 0.4.7 173.056 -> 173.056 syssetup.dll GCC4.7.2dbg RosBEWin2.1.6 0.4.7 829.440 -> 829.440 userenv.dll GCC4.7.2dbg RosBEWin2.1.6 0.4.7 185.344 -> 185.344 --- dll/win32/shell32/lang/zh-CN.rc | 32 +++++++++++++++++--------------- dll/win32/shimgvw/lang/zh-CN.rc | 2 +- dll/win32/syssetup/lang/zh-CN.rc | 7 +++++-- dll/win32/userenv/lang/zh-CN.rc | 29 ++++++++++++++++------------- 4 files changed, 39 insertions(+), 31 deletions(-) diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc index eaed4113c60..c1fe365e3ea 100644 --- a/dll/win32/shell32/lang/zh-CN.rc +++ b/dll/win32/shell32/lang/zh-CN.rc @@ -735,33 +735,35 @@ BEGIN IDS_RUNDLG_BROWSE_FILTER "可执行文件 (*.exe)\0*.exe\0所有文件 (*.*)\0*.*\0" /* shell folder path default values */ + /* ATTENTION: If there is no special situation, please DO NOT change + English folder names into Chinese, or it may cause problems in the system. */ IDS_PROGRAMS "开始菜单\\程序" IDS_PERSONAL "我的文档" IDS_FAVORITES "收藏夹" IDS_STARTUP "开始菜单\\程序\\启动" - IDS_RECENT "最近" - IDS_SENDTO "为必填项" + IDS_RECENT "Recent" + IDS_SENDTO "SendTo" IDS_STARTMENU "开始菜单" IDS_MYMUSIC "我的音乐" IDS_MYVIDEO "我的视频" IDS_DESKTOPDIRECTORY "桌面" IDS_NETHOOD "NetHood" - IDS_TEMPLATES "模板" - IDS_APPDATA "应用程序数据" + IDS_TEMPLATES "Templates" + IDS_APPDATA "Application Data" IDS_PRINTHOOD "PrintHood" - IDS_LOCAL_APPDATA "本地设置\\应用程序数据" - IDS_INTERNET_CACHE "本地设置\\互联网临时文件" - IDS_COOKIES "小型文字檔案" - IDS_HISTORY "本地设置\\历史记录" - IDS_PROGRAM_FILES "程序文件" + IDS_LOCAL_APPDATA "Local Settings\\Application Data" + IDS_INTERNET_CACHE "Local Settings\\Temporary Internet Files" + IDS_COOKIES "Cookies" + IDS_HISTORY "Local Settings\\History" + IDS_PROGRAM_FILES "Program Files" IDS_MYPICTURES "我的图片" - IDS_PROGRAM_FILES_COMMON "程序文件\\共同文件" - IDS_COMMON_DOCUMENTS "文件" + IDS_PROGRAM_FILES_COMMON "Program Files\\Common Files" + IDS_COMMON_DOCUMENTS "Documents" IDS_ADMINTOOLS "开始菜单\\程序\\管理工具" - IDS_COMMON_MUSIC "我的文件\\我的音乐" - IDS_COMMON_PICTURES "我的文件\\我的图片" - IDS_COMMON_VIDEO "我的文件\\我的视频" - IDS_CDBURN_AREA "本地设置\\应用程序数据\\微软\\光盘刻录" + IDS_COMMON_MUSIC "Documents\\我的音乐" + IDS_COMMON_PICTURES "Documents\\我的图片" + IDS_COMMON_VIDEO "Documents\\我的视频" + IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" IDS_NETWORKPLACE "网上邻居" IDS_NEWFOLDER "新的文件夹" diff --git a/dll/win32/shimgvw/lang/zh-CN.rc b/dll/win32/shimgvw/lang/zh-CN.rc index 0722333cc66..0df513d0a5d 100644 --- a/dll/win32/shimgvw/lang/zh-CN.rc +++ b/dll/win32/shimgvw/lang/zh-CN.rc @@ -23,7 +23,7 @@ BEGIN IDS_EMF_FILE "EMF 图像" IDS_GIF_FILE "GIF 图像" IDS_JPG_FILE "JPEG 图像" - IDS_BMP_FILE "Bitmap 图像" + IDS_BMP_FILE "BMP 图像" IDS_PNG_FILE "PNG 图像" IDS_TIF_FILE "TIF 图像" IDS_WMF_FILE "WMF 图像" diff --git a/dll/win32/syssetup/lang/zh-CN.rc b/dll/win32/syssetup/lang/zh-CN.rc index 0c9ca1e4976..974f8383d77 100644 --- a/dll/win32/syssetup/lang/zh-CN.rc +++ b/dll/win32/syssetup/lang/zh-CN.rc @@ -184,8 +184,11 @@ BEGIN END /* ATTENTION: Synchronize these strings with dll/win32/shell32/lang */ +/* If there is no special situation, please DO NOT change English folder names +into Chinese, or it may cause problems in the system. */ + STRINGTABLE BEGIN - IDS_PROGRAMFILES "%SystemDrive%\\程序文件" - IDS_COMMONFILES "共同文件" + IDS_PROGRAMFILES "%SystemDrive%\\Program Files" + IDS_COMMONFILES "Common Files" END diff --git a/dll/win32/userenv/lang/zh-CN.rc b/dll/win32/userenv/lang/zh-CN.rc index 038e575d9cf..de4be0bb773 100644 --- a/dll/win32/userenv/lang/zh-CN.rc +++ b/dll/win32/userenv/lang/zh-CN.rc @@ -1,26 +1,29 @@ /* Simplified Chinese translation by Henry Tang Ih 2016 (henrytang2@hotmail.com) */ +/* ATTENTION: If there is no special situation, please DO NOT change +English folder names into Chinese, or it may cause problems in the system. */ + LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED STRINGTABLE BEGIN - IDS_PROFILEPATH "%SystemDrive%\\文档和设置" - IDS_APPDATA "应用程序数据" + IDS_PROFILEPATH "%SystemDrive%\\Documents and Settings" + IDS_APPDATA "Application Data" IDS_DESKTOP "桌面" IDS_FAVORITES "收藏夹" IDS_MYDOCUMENTS "我的文档" IDS_NETHOOD "NetHood" IDS_PRINTHOOD "PrintHood" - IDS_RECENT "最近" - IDS_SENDTO "为必填项" - IDS_TEMPLATES "模板" + IDS_RECENT "Recent" + IDS_SENDTO "SendTo" + IDS_TEMPLATES "Templates" IDS_STARTMENU "开始菜单" - IDS_PROGRAMS "开始菜单\\应用程序" - IDS_STARTUP "开始菜单\\应用程序\\启动" - IDS_LOCALSETTINGS "本地设置" - IDS_LOCALAPPDATA "本地设置\\应用程序数据" - IDS_TEMP "本地设置\\Temp" - IDS_CACHE "本地设置\\互联网临时文件" - IDS_HISTORY "本地设置\\历史" - IDS_COOKIES "小型文字檔案" + IDS_PROGRAMS "开始菜单\\程序" + IDS_STARTUP "开始菜单\\程序\\启动" + IDS_LOCALSETTINGS "Local Settings" + IDS_LOCALAPPDATA "Local Settings\\Application Data" + IDS_TEMP "Local Settings\\Temp" + IDS_CACHE "Local Settings\\Temporary Internet Files" + IDS_HISTORY "Local Settings\\History" + IDS_COOKIES "Cookies" END