date:20230210

[ros-diffs] [reactos] 01/01: [TRANSLATION] Improve Simplified Chinese (zh-CN) translation (#4979)

2023-02-10 Thread Ratin Gao

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2f70f79904a480d800e23f4f47bb8d30a5da913b

commit 2f70f79904a480d800e23f4f47bb8d30a5da913b
Author: Ratin Gao 
AuthorDate: Fri Feb 10 22:15:25 2023 +0800
Commit: GitHub 
CommitDate: Fri Feb 10 23:15:25 2023 +0900

[TRANSLATION] Improve Simplified Chinese (zh-CN) translation (#4979)

- Add and improve translation
- Fix mistakes
---
 base/applications/cmdutils/help/lang/zh-CN.rc |  2 +-
 base/services/w32time/lang/zh-CN.rc   | 14 ++
 base/services/w32time/w32time.rc  |  3 ++
 base/shell/explorer/lang/zh-CN.rc |  6 ++--
 dll/cpl/desk/lang/zh-CN.rc| 22 +++
 dll/cpl/hotplug/hotplug.rc|  3 ++
 dll/cpl/hotplug/lang/zh-CN.rc | 40 +++
 dll/cpl/sysdm/lang/zh-CN.rc   |  4 +--
 dll/shellext/cryptext/cryptext.rc |  3 ++
 dll/shellext/cryptext/lang/zh-CN.rc   | 14 ++
 dll/shellext/fontext/fontext.rc   |  3 ++
 dll/shellext/fontext/lang/zh-CN.rc| 32 +
 dll/shellext/netplwiz/lang/zh-CN.rc   | 28 +++
 dll/shellext/netplwiz/netplwiz.rc |  3 ++
 dll/win32/browseui/lang/zh-CN.rc  |  2 +-
 dll/win32/msgina/lang/zh-CN.rc|  2 +-
 dll/win32/shell32/lang/zh-CN.rc   | 16 +--
 17 files changed, 170 insertions(+), 27 deletions(-)

diff --git a/base/applications/cmdutils/help/lang/zh-CN.rc 
b/base/applications/cmdutils/help/lang/zh-CN.rc
index d0b309779f9..e8f5aa48c70 100644
--- a/base/applications/cmdutils/help/lang/zh-CN.rc
+++ b/base/applications/cmdutils/help/lang/zh-CN.rc
@@ -56,7 +56,7 @@ POPD 恢复由 PUSHD 存储的前一个当前工作目录的路径。\n\
 PROMPT   更改命令提示符。\n\
 PUSHD保存当前工作目录然后更改它。\n\
 RD   删除一个目录。\n\
-REM  在批处理文件中记录注释（评论）。\n\
+REM  在批处理文件中记录注释（批注）。\n\
 REN  重命名一个或多个文件。\n\
 RENAME   重命名一个或多个文件。\n\
 REPLACE  替换文件。\n\
diff --git a/base/services/w32time/lang/zh-CN.rc 
b/base/services/w32time/lang/zh-CN.rc
new file mode 100644
index 000..8507d11607d
--- /dev/null
+++ b/base/services/w32time/lang/zh-CN.rc
@@ -0,0 +1,14 @@
+/*
+ * PROJECT: ReactOS W32Time Service
+ * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
+ * PURPOSE: Chinese (Simplified) resource file
+ * TRANSLATORS: Copyright 2023 Ratin Gao 
+ */
+
+LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
+
+STRINGTABLE
+BEGIN
+IDS_DISPLAYNAME "时间服务"
+IDS_DESCRIPTION "维护在网络上的所有客户端和服务器的时间和日期同步。"
+END
diff --git a/base/services/w32time/w32time.rc b/base/services/w32time/w32time.rc
index 4177188a782..b03fb863aaf 100644
--- a/base/services/w32time/w32time.rc
+++ b/base/services/w32time/w32time.rc
@@ -33,6 +33,9 @@
 #ifdef LANGUAGE_TR_TR
 #include "lang/tr-TR.rc"
 #endif
+#ifdef LANGUAGE_ZH_CN
+#include "lang/zh-CN.rc"
+#endif
 #ifdef LANGUAGE_ZH_HK
 #include "lang/zh-HK.rc"
 #endif
diff --git a/base/shell/explorer/lang/zh-CN.rc 
b/base/shell/explorer/lang/zh-CN.rc
index d1807953dc0..e6eeccab616 100644
--- a/base/shell/explorer/lang/zh-CN.rc
+++ b/base/shell/explorer/lang/zh-CN.rc
@@ -202,8 +202,8 @@ END
 
 STRINGTABLE
 BEGIN
-IDS_TASKBAR_STARTMENU_PROP_CAPTION "任务栏和开始菜单属性"
+IDS_TASKBAR_STARTMENU_PROP_CAPTION "任务栏和开始菜单"
 IDS_RESTORE_ALL "显示打开的窗口(&S)"
-IDS_TRAYWND_UNDO_CASCADE "&Undo Cascade"
-IDS_TRAYWND_UNDO_TILE "&Undo Tile"
+IDS_TRAYWND_UNDO_CASCADE "撤销层叠(&U)"
+IDS_TRAYWND_UNDO_TILE "撤销平铺(&U)"
 END
diff --git a/dll/cpl/desk/lang/zh-CN.rc b/dll/cpl/desk/lang/zh-CN.rc
index 24bc3dff196..623ecdd2c2a 100644
--- a/dll/cpl/desk/lang/zh-CN.rc
+++ b/dll/cpl/desk/lang/zh-CN.rc
@@ -36,7 +36,7 @@ BEGIN
 PUSHBUTTON "颜色(&C)...", IDC_COLOR_BUTTON, 188, 167, 55, 15
 LTEXT "位置：", IDC_STATIC, 188, 128, 55, 9
 COMBOBOX IDC_PLACEMENT_COMBO, 188, 139, 55, 54, CBS_DROPDOWNLIST | 
WS_VSCROLL | WS_TABSTOP
-PUSHBUTTON "Customize &Desktop...", IDC_DESKTOP_CUSTOM, 8, 194, 90, 15
+PUSHBUTTON "自定义桌面(&D)...", IDC_DESKTOP_CUSTOM, 8, 194, 90, 15
 END
 
 IDD_SCREENSAVER DIALOGEX 0, 0, 246, 202
@@ -164,23 +164,23 @@ END
 
 IDD_DESKTOP_GENERAL DIALOGEX 0, 0, 224, 202
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "General"
-FONT 8, "MS Shell Dlg"
+CAPTION "常规"
+FONT 9, "宋体"
 BEGIN
-GROUPBOX "Desktop icons", IDC_STATIC, 6, 4, 212, 40
-CONTROL "My &Documents", IDC_ICONS_MYDOCS, "button",
+GROUPBOX "桌面图标", IDC_STATIC, 6, 4, 212, 40
+CONTROL "我的文档(&D)", IDC_ICONS_MYDOCS, "button",
 BS_AUTOCHECKBOX | WS_TABSTOP, 14, 14, 100, 12
-CONTROL "My &Network Places", IDC_ICONS_MYNET, "button",
+CONTROL "网上邻居(&N)", IDC_ICONS_MYNET, "button",
 BS_AUTOCHECKBOX | WS_TABSTOP, 116, 14, 100, 12
-CONTROL "&My Computer", IDC_ICONS_MYCOMP, "button",
+CONTROL "我的电脑(&M)", IDC_ICONS_MYCOMP, "button",
 BS_AUTOCHECKBOX | WS_TABSTOP, 14, 28, 100, 12
-CONTROL "&Internet Browser", ID

[ros-diffs] [reactos] 01/01: [SHELL32] Remove unused flag SEE_MASK_UNICODE (#5033)

2023-02-10 Thread Ratin Gao

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5c22ce374280c05b4d583e4a16192327746f1926

commit 5c22ce374280c05b4d583e4a16192327746f1926
Author: Ratin Gao 
AuthorDate: Fri Feb 10 22:56:13 2023 +0800
Commit: GitHub 
CommitDate: Fri Feb 10 23:56:13 2023 +0900

[SHELL32] Remove unused flag SEE_MASK_UNICODE (#5033)

SEE_MASK_UNICODE does nothing, so we needn't mark it as "unsupported flag" 
and output FIXME
---
 dll/win32/shell32/shlexec.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dll/win32/shell32/shlexec.cpp b/dll/win32/shell32/shlexec.cpp
index 8784bbf4373..746c92076bb 100644
--- a/dll/win32/shell32/shlexec.cpp
+++ b/dll/win32/shell32/shlexec.cpp
@@ -1823,7 +1823,7 @@ static BOOL SHELL_execute(LPSHELLEXECUTEINFOW sei, 
SHELL_ExecuteW32 execfunc)
 static const DWORD unsupportedFlags =
 SEE_MASK_ICON | SEE_MASK_HOTKEY |
 SEE_MASK_CONNECTNETDRV | SEE_MASK_FLAG_DDEWAIT |
-SEE_MASK_UNICODE   | SEE_MASK_ASYNCOK  | SEE_MASK_HMONITOR;
+SEE_MASK_ASYNCOK  | SEE_MASK_HMONITOR;
 
 WCHAR parametersBuffer[1024], dirBuffer[MAX_PATH], wcmdBuffer[1024];
 WCHAR *wszApplicationName, *wszParameters, *wszDir, *wcmd;

[ros-diffs] [reactos] 01/01: [SHLWAPI] No need extension to execute '.bat' files CORE-17612 (#4932)

2023-02-10 Thread Jose Carlos Jesus

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

commit f691efefc26ef554e9715abfa1916527277599bb
Author: Jose Carlos Jesus 
AuthorDate: Fri Feb 10 11:05:11 2023 -0400
Commit: GitHub 
CommitDate: Sat Feb 11 00:05:11 2023 +0900

[SHLWAPI] No need extension to execute '.bat' files CORE-17612 (#4932)

When no extension is provided, add default extension with correct 
precedence using PathFileExistsDefExtW.
- Use PathFindOnPathExW when searching in current directory and PATH 
environment variable.
- Fix Width String terminator to UNICODE_NULL.
- Fix all failed tests on PathFindPathExW KVM test.
CORE-17612
---
 dll/win32/kernel32/client/path.c |  4 ++--
 dll/win32/shell32/shlexec.cpp| 28 +---
 dll/win32/shlwapi/path.c |  1 +
 3 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/dll/win32/kernel32/client/path.c b/dll/win32/kernel32/client/path.c
index 1fa09d530c8..ea014bb512d 100644
--- a/dll/win32/kernel32/client/path.c
+++ b/dll/win32/kernel32/client/path.c
@@ -2321,7 +2321,7 @@ GetSystemDirectoryW(OUT LPWSTR lpBuffer,
 RtlCopyMemory(lpBuffer,
   BaseWindowsSystemDirectory.Buffer,
   BaseWindowsSystemDirectory.Length);
-lpBuffer[BaseWindowsSystemDirectory.Length / sizeof(WCHAR)] = 
ANSI_NULL;
+lpBuffer[BaseWindowsSystemDirectory.Length / sizeof(WCHAR)] = 
UNICODE_NULL;
 
 ReturnLength = BaseWindowsSystemDirectory.Length;
 }
@@ -2405,7 +2405,7 @@ GetSystemWindowsDirectoryW(OUT LPWSTR lpBuffer,
 RtlCopyMemory(lpBuffer,
   BaseWindowsDirectory.Buffer,
   BaseWindowsDirectory.Length);
-lpBuffer[BaseWindowsDirectory.Length / sizeof(WCHAR)] = ANSI_NULL;
+lpBuffer[BaseWindowsDirectory.Length / sizeof(WCHAR)] = UNICODE_NULL;
 
 ReturnLength = BaseWindowsDirectory.Length;
 }
diff --git a/dll/win32/shell32/shlexec.cpp b/dll/win32/shell32/shlexec.cpp
index 746c92076bb..292c8db8292 100644
--- a/dll/win32/shell32/shlexec.cpp
+++ b/dll/win32/shell32/shlexec.cpp
@@ -2531,6 +2531,8 @@ HRESULT WINAPI ShellExecCmdLine(
 }
 else
 {
+PCWSTR apPathList[2];
+
 pchParams = SplitParams(lpCommand, szFile, _countof(szFile));
 if (szFile[0] != UNICODE_NULL && szFile[1] == L':' &&
 szFile[2] == UNICODE_NULL)
@@ -2551,30 +2553,10 @@ HRESULT WINAPI ShellExecCmdLine(
 {
 StringCchCopyW(szFile, _countof(szFile), szFile2);
 }
-else if (SearchPathW(NULL, szFile, NULL, _countof(szFile2), szFile2, 
NULL) ||
- SearchPathW(NULL, szFile, L".exe", _countof(szFile2), 
szFile2, NULL) ||
- SearchPathW(NULL, szFile, L".com", _countof(szFile2), 
szFile2, NULL) ||
- SearchPathW(pwszStartDir, szFile, NULL, _countof(szFile2), 
szFile2, NULL) ||
- SearchPathW(pwszStartDir, szFile, L".exe", _countof(szFile2), 
szFile2, NULL) ||
- SearchPathW(pwszStartDir, szFile, L".com", _countof(szFile2), 
szFile2, NULL))
-{
-StringCchCopyW(szFile, _countof(szFile), szFile2);
-}
-else if (SearchPathW(NULL, lpCommand, NULL, _countof(szFile2), 
szFile2, NULL) ||
- SearchPathW(NULL, lpCommand, L".exe", _countof(szFile2), 
szFile2, NULL) ||
- SearchPathW(NULL, lpCommand, L".com", _countof(szFile2), 
szFile2, NULL) ||
- SearchPathW(pwszStartDir, lpCommand, NULL, _countof(szFile2), 
szFile2, NULL) ||
- SearchPathW(pwszStartDir, lpCommand, L".exe", 
_countof(szFile2), szFile2, NULL) ||
- SearchPathW(pwszStartDir, lpCommand, L".com", 
_countof(szFile2), szFile2, NULL))
-{
-StringCchCopyW(szFile, _countof(szFile), szFile2);
-pchParams = NULL;
-}
 
-if (pwszStartDir)
-{
-SetCurrentDirectoryW(szCurDir);
-}
+apPathList[0] = pwszStartDir;
+apPathList[1] = NULL;
+PathFindOnPathExW(szFile, apPathList, WHICH_DEFAULT);
 
 if (!(dwSeclFlags & SECL_ALLOW_NONEXE))
 {
diff --git a/dll/win32/shlwapi/path.c b/dll/win32/shlwapi/path.c
index fc698251cf2..2966a8bf93b 100644
--- a/dll/win32/shlwapi/path.c
+++ b/dll/win32/shlwapi/path.c
@@ -1151,6 +1151,7 @@ BOOL WINAPI PathFileExistsDefExtW(LPWSTR lpszPath,DWORD 
dwWhich)
 #ifdef __REACTOS__
 if (dwWhich & 0x1)
 {
+if (GetFileAttributes(lpszPath) != FILE_ATTRIBUTE_DIRECTORY)
 #endif
 lstrcpyW(lpszPath + iLen, pszExts[iChoose]);
 if (PathFileExistsW(lpszPath))

[ros-diffs] [reactos] 01/01: [TRANSLATION] Improve Simplified Chinese (zh-CN) translation (#4979)

[ros-diffs] [reactos] 01/01: [SHELL32] Remove unused flag SEE_MASK_UNICODE (#5033)

[ros-diffs] [reactos] 01/01: [SHLWAPI] No need extension to execute '.bat' files CORE-17612 (#4932)

3 matches

Site Navigation

Mail list logo

Footer information