Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [RTL][ADVAPI32_APITEST] RtlIsTextUnicode: Don't change weight unless lead-byte flag (#5396)
by Katayama Hirofumi MZ 05 Jul '23

05 Jul '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=17e9dcc9224b7773148c0… commit 17e9dcc9224b7773148c015f6b4d916e4478272b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Jul 5 12:01:42 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jul 5 12:01:42 2023 +0900 [RTL][ADVAPI32_APITEST] RtlIsTextUnicode: Don't change weight unless lead-byte flag (#5396) - Fix the garbled characters (a.k.a. mojibake) in some Japanese text files. - weight will remain 3 unless IS_TEXT_UNICODE_DBCS_LEADBYTE flag is set. - Strengthen advapi32_apitest IsTextUnicode testcase. CORE-19016 --- modules/rostests/apitests/advapi32/IsTextUnicode.c | 30 ++++++++++++++++++++-- sdk/lib/rtl/unicode.c | 5 ++-- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/modules/rostests/apitests/advapi32/IsTextUnicode.c b/modules/rostests/apitests/advapi32/IsTextUnicode.c index 404ab69d07d..d3f9f3dfcb5 100644 --- a/modules/rostests/apitests/advapi32/IsTextUnicode.c +++ b/modules/rostests/apitests/advapi32/IsTextUnicode.c @@ -4,6 +4,7 @@ * PURPOSE: Tests for (Rtl)IsTextUnicode. * PROGRAMMERS: Hermes Belusca-Maito * Dmitry Chapyshev + * Katayama Hirofumi MZ */ #include "precomp.h" @@ -128,6 +129,9 @@ START_TEST(IsTextUnicode) }; const char japanese_with_lead[] = "ABC" "\x83\x40" "D"; + const char japanese_sjis[] = "\x93\xFA\x96\x7B\x8C\xEA\x31\x32\x33\x93\xFA\x96\x7B\x8C\xEA"; + const char japanese_utf8[] = "\xE6\x97\xA5\xE6\x9C\xAC\xE8\xAA\x9E\x31\x32\x33\xE6\x97\xA5" + "\xE6\x9C\xAC\xE8\xAA\x9E"; const char simplfied_chinese_with_lead[] = "ABC" "\xC5\xC5" "D"; const char korean_with_lead[] = "ABC" "\xBF\xAD" "D"; const char traditional_chinese_with_lead[] = "ABC" "\xB1\xC1" "D"; @@ -149,8 +153,30 @@ START_TEST(IsTextUnicode) SetupLocale(932, 932, -1); Result = IS_TEXT_UNICODE_DBCS_LEADBYTE; - ok(!IsTextUnicode(japanese_with_lead, sizeof(japanese_with_lead), &Result), "IsTextUnicode() returned TRUE, expected FALSE\n"); - ok(Result == IS_TEXT_UNICODE_DBCS_LEADBYTE, "Result returned 0x%x, expected 0x%x\n", Result, IS_TEXT_UNICODE_DBCS_LEADBYTE); + ok_int(IsTextUnicode(japanese_with_lead, sizeof(japanese_with_lead), &Result), FALSE); + ok_int(Result, IS_TEXT_UNICODE_DBCS_LEADBYTE); + + ok_int(IsTextUnicode(japanese_sjis, sizeof(japanese_sjis) - 1, NULL), FALSE); + + Result = IS_TEXT_UNICODE_STATISTICS | IS_TEXT_UNICODE_REVERSE_STATISTICS; + ok_int(IsTextUnicode(japanese_sjis, sizeof(japanese_sjis) - 1, &Result), FALSE); + ok_int(Result, 0); + + Result = IS_TEXT_UNICODE_STATISTICS | IS_TEXT_UNICODE_REVERSE_STATISTICS | + IS_TEXT_UNICODE_DBCS_LEADBYTE; + ok_int(IsTextUnicode(japanese_sjis, sizeof(japanese_sjis) - 1, &Result), FALSE); + ok_int(Result, (IS_TEXT_UNICODE_DBCS_LEADBYTE | IS_TEXT_UNICODE_REVERSE_STATISTICS)); + + ok_int(IsTextUnicode(japanese_utf8, sizeof(japanese_utf8) - 1, NULL), FALSE); + + Result = IS_TEXT_UNICODE_STATISTICS | IS_TEXT_UNICODE_REVERSE_STATISTICS; + ok_int(IsTextUnicode(japanese_utf8, sizeof(japanese_utf8) - 1, &Result), FALSE); + ok_int(Result, 0); + + Result = IS_TEXT_UNICODE_STATISTICS | IS_TEXT_UNICODE_REVERSE_STATISTICS | + IS_TEXT_UNICODE_DBCS_LEADBYTE; + ok_int(IsTextUnicode(japanese_utf8, sizeof(japanese_utf8) - 1, &Result), FALSE); + ok_int(Result, (IS_TEXT_UNICODE_DBCS_LEADBYTE | IS_TEXT_UNICODE_STATISTICS)); /* Simplified Chinese */ SetupLocale(936, 936, -1); diff --git a/sdk/lib/rtl/unicode.c b/sdk/lib/rtl/unicode.c index 8c7248db155..c29dfa4f3b8 100644 --- a/sdk/lib/rtl/unicode.c +++ b/sdk/lib/rtl/unicode.c @@ -1356,7 +1356,7 @@ RtlIsTextUnicode(CONST VOID* buf, INT len, INT* pf) } } - if (NlsMbCodePageTag) + if (NlsMbCodePageTag && pf && (*pf & IS_TEXT_UNICODE_DBCS_LEADBYTE)) { for (i = 0; i < len; i++) { @@ -1378,8 +1378,7 @@ RtlIsTextUnicode(CONST VOID* buf, INT len, INT* pf) else weight = 1; - if (pf && (*pf & IS_TEXT_UNICODE_DBCS_LEADBYTE)) - out_flags |= IS_TEXT_UNICODE_DBCS_LEADBYTE; + out_flags |= IS_TEXT_UNICODE_DBCS_LEADBYTE; } }

1 0

[reactos] 01/01: [EXPLORER] Save taskbar position and locked state after reboot (#5393)
by Carl J. Bialorucki 04 Jul '23

04 Jul '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7fafeb6390448aed9c435… commit 7fafeb6390448aed9c435cf4baf2dd175fa2dc81 Author: Carl J. Bialorucki <cbialo2(a)outlook.com> AuthorDate: Tue Jul 4 07:16:24 2023 -0600 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Jul 4 16:16:24 2023 +0300 [EXPLORER] Save taskbar position and locked state after reboot (#5393) - Save locked state of the taskbar when toggled using its context menu. - Save position of the taskbar after dragging it around the desktop. - Invoke TRAYCMD_LOCK_TASKBAR command when (un)locking the taskbar by the context menu, instead of duplicating this functionality. CORE-11621 CORE-16997 --- base/shell/explorer/traywnd.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/base/shell/explorer/traywnd.cpp b/base/shell/explorer/traywnd.cpp index 05d130b4c3d..542c71c1dd5 100644 --- a/base/shell/explorer/traywnd.cpp +++ b/base/shell/explorer/traywnd.cpp @@ -843,10 +843,7 @@ public: break; case ID_LOCKTASKBAR: - if (SHRestricted(REST_CLASSICSHELL) == 0) - { - Lock(!g_TaskbarSettings.bLock); - } + HandleCommand(TRAYCMD_LOCK_TASKBAR); break; case ID_SHELL_CMD_OPEN_TASKMGR: @@ -1016,6 +1013,7 @@ public: if (SHRestricted(REST_CLASSICSHELL) == 0) { Lock(!g_TaskbarSettings.bLock); + g_TaskbarSettings.Save(); } break; case TRAYCMD_HELP_AND_SUPPORT: @@ -1609,6 +1607,8 @@ GetPrimaryScreenRect: m_Monitor = m_DraggingMonitor; m_Position = m_DraggingPosition; + g_TaskbarSettings.sr.Position = m_Position; + g_TaskbarSettings.Save(); IsDragging = FALSE; m_TrayRects[m_Position] = rcTray;

1 0

[reactos] 01/01: [THEMEUI] Fix Japanese translation (ja-JP) as UTF-8
by Katayama Hirofumi MZ 04 Jul '23

04 Jul '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bfb973e0b3c62b7a7be01… commit bfb973e0b3c62b7a7be01e4dbcb1a532e165c3c4 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Jul 4 19:35:31 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Jul 4 19:35:31 2023 +0900 [THEMEUI] Fix Japanese translation (ja-JP) as UTF-8 CORE-18706 --- dll/win32/themeui/lang/ja-JP.rc | 52 ++++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/dll/win32/themeui/lang/ja-JP.rc b/dll/win32/themeui/lang/ja-JP.rc index 01016a152ec..842674773df 100644 --- a/dll/win32/themeui/lang/ja-JP.rc +++ b/dll/win32/themeui/lang/ja-JP.rc @@ -2,34 +2,34 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT STRINGTABLE BEGIN - IDS_BRICK "��K" - IDS_EGGPLANT "�Ȃ��" - IDS_GOLIVE "�΂̃I��[�u" //Spruce - IDS_HCONTRAST_1 "�n�C�R��g��X�g 1" - IDS_HCONTRAST_2 "�n�C�R��g��X�g 2" - IDS_HCONTRAST_BLACK "�n�C�R��g��X�g ��" - IDS_HCONTRAST_WHITE "�n�C�R��g��X�g ��" - IDS_LILAC "��C��b�N" - IDS_MAPLE "�J�G�f" - IDS_MARINE "�C" - IDS_PLUM "�~" - IDS_PUMPKIN "�J�{�`��" - IDS_RAIN "�J�̓�" - IDS_RWB "�ԁE��E��" - IDS_CLASSIC "ReactOS �N��V�b�N" - IDS_STANDARD "ReactOS �W��" - IDS_ROSE "�o��" - IDS_SAND "��" //Desert - IDS_SLATE "�Δ�" - IDS_SKY "��" - IDS_STORM "��" - IDS_TEAL "��" - IDS_WHEAT "��" + IDS_BRICK "レンガ" + IDS_EGGPLANT "なすび" + IDS_GOLIVE "緑のオリーブ" //Spruce + IDS_HCONTRAST_1 "ハイコントラスト 1" + IDS_HCONTRAST_2 "ハイコントラスト 2" + IDS_HCONTRAST_BLACK "ハイコントラスト黒" + IDS_HCONTRAST_WHITE "ハイコントラスト白" + IDS_LILAC "ライラック" + IDS_MAPLE "カエデ" + IDS_MARINE "海" + IDS_PLUM "梅" + IDS_PUMPKIN "カボチャ" + IDS_RAIN "雨の日" + IDS_RWB "赤・白・青" + IDS_CLASSIC "ReactOS クラシック" + IDS_STANDARD "ReactOS 標準" + IDS_ROSE "バラ" + IDS_SAND "砂漠" //Desert + IDS_SLATE "石盤" + IDS_SKY "空" + IDS_STORM "嵐" + IDS_TEAL "青緑" + IDS_WHEAT "小麦" END STRINGTABLE BEGIN - IDS_SIZE_NORMAL "�ʏ�" - IDS_SIZE_LARGE "�傫��" - IDS_SIZE_XLARGE "��" + IDS_SIZE_NORMAL "通常" + IDS_SIZE_LARGE "大きい" + IDS_SIZE_XLARGE "特大" END

1 0

[reactos] 01/01: [SERVMAN] Respect the user-selected export format (#5394)
by Yukinari Mitsu 04 Jul '23

04 Jul '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cce12eb9edd212bfe47ce… commit cce12eb9edd212bfe47ce3af64f9a05d24ebc731 Author: Yukinari Mitsu <bimy1280163(a)gn.iwasaki.ac.jp> AuthorDate: Tue Jul 4 19:04:44 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Jul 4 13:04:44 2023 +0300 [SERVMAN] Respect the user-selected export format (#5394) - Use either tab or comma separator depending on user's selection. - Skip adding a separator after the last table cell. CORE-19001 --- base/applications/mscutils/servman/export.c | 20 +++++++++++++++----- base/applications/mscutils/servman/precomp.h | 1 + 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/base/applications/mscutils/servman/export.c b/base/applications/mscutils/servman/export.c index 53bf8633019..f8cc61dd970 100644 --- a/base/applications/mscutils/servman/export.c +++ b/base/applications/mscutils/servman/export.c @@ -34,11 +34,17 @@ GetTextFromListView(PMAIN_WND_INFO Info, static BOOL SaveServicesToFile(PMAIN_WND_INFO Info, - LPCWSTR pszFileName) + LPCWSTR pszFileName, + DWORD nFormat) { HANDLE hFile; BOOL bSuccess = FALSE; + if (!nFormat || nFormat > 2) + { + return bSuccess; + } + hFile = CreateFileW(pszFileName, GENERIC_WRITE, 0, @@ -51,7 +57,7 @@ SaveServicesToFile(PMAIN_WND_INFO Info, { WCHAR LVText[500]; WCHAR newl[2] = {L'\r', L'\n'}; - WCHAR tab = L'\t'; + WCHAR seps[2] = {L'\t', L','}; DWORD dwTextLength, dwWritten; INT NumListedServ = 0; INT i, k; @@ -60,7 +66,7 @@ SaveServicesToFile(PMAIN_WND_INFO Info, for (i=0; i < NumListedServ; i++) { - for (k=0; k<5; k++) + for (k=0; k < LVMAX; k++) { dwTextLength = GetTextFromListView(Info, LVText, @@ -73,9 +79,13 @@ SaveServicesToFile(PMAIN_WND_INFO Info, sizeof(WCHAR) * dwTextLength, &dwWritten, NULL); + } + if (k < LVMAX - 1) + { + /* Do not add separator after the last table cell */ WriteFile(hFile, - &tab, + &seps[nFormat-1], sizeof(WCHAR), &dwWritten, NULL); @@ -113,7 +123,7 @@ VOID ExportFile(PMAIN_WND_INFO Info) if(GetSaveFileName(&ofn)) { - if (SaveServicesToFile(Info, szFileName)) + if (SaveServicesToFile(Info, szFileName, ofn.nFilterIndex)) return; } diff --git a/base/applications/mscutils/servman/precomp.h b/base/applications/mscutils/servman/precomp.h index d070bbc4dc3..af5cbbe276b 100644 --- a/base/applications/mscutils/servman/precomp.h +++ b/base/applications/mscutils/servman/precomp.h @@ -31,6 +31,7 @@ #define LVSTATUS 2 #define LVSTARTUP 3 #define LVLOGONAS 4 +#define LVMAX 5 #define IMAGE_UNKNOWN 0 #define IMAGE_SERVICE 1

1 0

[reactos] 01/01: [CHARMAP] Improve Japanese (ja-JP) translation 2
by Katayama Hirofumi MZ 04 Jul '23

04 Jul '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7342163b0dee36fe3c6ef… commit 7342163b0dee36fe3c6efc2baf6ad9209fbaabe5 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Jul 4 13:28:19 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Jul 4 13:28:19 2023 +0900 [CHARMAP] Improve Japanese (ja-JP) translation 2 CORE-18706 --- base/applications/charmap/lang/ja-JP.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/charmap/lang/ja-JP.rc b/base/applications/charmap/lang/ja-JP.rc index acb6d63de1e..e866d1e9df4 100644 --- a/base/applications/charmap/lang/ja-JP.rc +++ b/base/applications/charmap/lang/ja-JP.rc @@ -48,7 +48,7 @@ END STRINGTABLE BEGIN - IDS_LICENSE "本プログラムはフリーソフトウェアです。フリーソフトウェア財団が発行した GNU 一般公有使用許諾のバージョン2、またはそれ以降のバージョン（任意選択）の条件の下で再配布、または改変することができます。詳細はGNU一般公衆利用許諾契約書をご覧ください。" + IDS_LICENSE "本プログラムはフリーソフトウェアです。フリーソフトウェア財団が発行した GNU 一般公衆利用許諾契約書のバージョン2、またはそれ以降のバージョン（任意選択）の条件の下で再配布、または改変することができます。\r\n\r\n本プログラムは、有用であることを期待して配布されていますが、商品性や特定目的への適合性についての暗黙の保証もなく、いかなる保証もありません。詳細は GNU 一般公衆利用許諾契約書をご覧ください。\r\n\r\nあなたはこのプログラムとともに GNU 一般公衆利用許諾書のコピーを受け取っているはずです。そうでない場合は、フリーソフトウェア財団（Free Software Foundation, Inc, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA）までご連絡ください。" IDS_ABOUT "バージョン情報(&B)..." IDS_TITLE "文字コード表" IDS_UNICODE "Unicode"

1 0

[reactos] 01/01: [CHARMAP] Improve Japanese (ja-JP) translation
by Katayama Hirofumi MZ 04 Jul '23

04 Jul '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=93445131e3e08df2cbb7c… commit 93445131e3e08df2cbb7cbf3d64cb0f207dc4569 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Jul 4 13:18:11 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Jul 4 13:18:11 2023 +0900 [CHARMAP] Improve Japanese (ja-JP) translation CORE-18706 --- base/applications/charmap/lang/ja-JP.rc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/base/applications/charmap/lang/ja-JP.rc b/base/applications/charmap/lang/ja-JP.rc index e1f0bd3f6c6..acb6d63de1e 100644 --- a/base/applications/charmap/lang/ja-JP.rc +++ b/base/applications/charmap/lang/ja-JP.rc @@ -15,7 +15,7 @@ BEGIN WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13 DEFPUSHBUTTON "選択", IDC_SELECT, 194, 186, 44, 13 PUSHBUTTON "コピー", IDC_COPY, 242, 186, 44, 13, WS_DISABLED - CONTROL "Advanced view", IDC_CHECK_ADVANCED, "Button", BS_AUTOCHECKBOX | + CONTROL "詳細表示", IDC_CHECK_ADVANCED, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 208, 95, 10 END @@ -23,13 +23,13 @@ IDD_ADVANCED DIALOGEX 0, 0, 292, 64 STYLE DS_SHELLFONT | WS_CHILD FONT 9, "MS UI Gothic" BEGIN - LTEXT "Charset:", IDC_STATIC, 8, 8, 48, 8 + LTEXT "文字セット:", IDC_STATIC, 8, 8, 48, 8 COMBOBOX IDC_COMBO_CHARSET, 72, 4, 116, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Group by:", IDC_STATIC, 8, 28, 50, 8 + LTEXT "分類:", IDC_STATIC, 8, 28, 50, 8 COMBOBOX IDC_COMBO_GROUPBY, 72, 24, 116, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Search", IDC_BUTTON_SEARCH, 200, 44, 50, 14 + PUSHBUTTON "検索", IDC_BUTTON_SEARCH, 200, 44, 50, 14 EDITTEXT IDC_EDIT_SEARCH, 72, 44, 116, 14, ES_AUTOHSCROLL - LTEXT "Search for:", IDC_STATIC, 8, 48, 42, 8 + LTEXT "検索文字列:", IDC_STATIC, 8, 48, 42, 8 LTEXT "Unicode:", IDC_STATIC, 200, 8, 30, 8 EDITTEXT IDC_EDIT_UNICODE, 236, 4, 28, 12, ES_AUTOHSCROLL END @@ -48,9 +48,9 @@ END STRINGTABLE BEGIN - IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more det [...] + IDS_LICENSE "本プログラムはフリーソフトウェアです。フリーソフトウェア財団が発行した GNU 一般公有使用許諾のバージョン2、またはそれ以降のバージョン（任意選択）の条件の下で再配布、または改変することができます。詳細はGNU一般公衆利用許諾契約書をご覧ください。" IDS_ABOUT "バージョン情報(&B)..." - IDS_TITLE "Character Map" + IDS_TITLE "文字コード表" IDS_UNICODE "Unicode" - IDS_ALL "All" + IDS_ALL "すべて" END

1 0

[reactos] 01/01: [SAMSRV] Improve Japanese (ja-JP) translation
by Katayama Hirofumi MZ 04 Jul '23

04 Jul '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=180bc8155efc792746583… commit 180bc8155efc7927465832e163fedde8281320ec Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Jul 4 12:58:23 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Jul 4 12:58:23 2023 +0900 [SAMSRV] Improve Japanese (ja-JP) translation CORE-18706 --- dll/win32/samsrv/lang/ja-JP.rc | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dll/win32/samsrv/lang/ja-JP.rc b/dll/win32/samsrv/lang/ja-JP.rc index b9ee44eac07..a7dbce64372 100644 --- a/dll/win32/samsrv/lang/ja-JP.rc +++ b/dll/win32/samsrv/lang/ja-JP.rc @@ -13,20 +13,20 @@ BEGIN IDS_ALIAS_POWER_USERS_COMMENT "パワーユーザーは、いくつかの制限付きでほとんどの管理権限を持ちます。" IDS_ALIAS_USERS_NAME "ユーザー" IDS_ALIAS_USERS_COMMENT "ユーザーは、システム規模の変更をすることができません。" - IDS_ALIAS_PRINT_OPS_NAME "Print Operators" - IDS_ALIAS_PRINT_OPS_COMMENT "Members can administer domain printers" - IDS_ALIAS_BACKUP_OPS_NAME "Backup Operators" - IDS_ALIAS_BACKUP_OPS_COMMENT "Backup Operators can override security restrictions for the sole purpose of backing up or restoring files" - IDS_ALIAS_REPLICATOR_NAME "Replicator" - IDS_ALIAS_REPLICATOR_COMMENT "Supports file replication in a domain" - IDS_ALIAS_REMOTE_DESKTOP_USERS_NAME "Remote Desktop Users" - IDS_ALIAS_REMOTE_DESKTOP_USERS_COMMENT "Members in this group are granted the right to logon remotely" - IDS_ALIAS_NETWORK_CONFIGURATION_OPS_NAME "Network Configuration Operators" - IDS_ALIAS_NETWORK_CONFIGURATION_OPS_COMMENT "Members in this group can have some administrative privileges to manage configuration of networking features" - IDS_ALIAS_MONITORING_USERS_NAME "Performance Monitor Users" - IDS_ALIAS_MONITORING_USERS_COMMENT "Members of this group have remote access to monitor this computer" - IDS_ALIAS_LOGGING_USERS_NAME "Performance Log Users" - IDS_ALIAS_LOGGING_USERS_COMMENT "Members of this group have remote access to schedule logging of performance counters on this computer" + IDS_ALIAS_PRINT_OPS_NAME "印刷オペレータ" + IDS_ALIAS_PRINT_OPS_COMMENT "メンバーはドメインプリンターを管理できます。" + IDS_ALIAS_BACKUP_OPS_NAME "バックアップオペレータ" + IDS_ALIAS_BACKUP_OPS_COMMENT "バックアップオペレーターは、ファイルのバックアップまたはリストアのみを目的として、セキュリティ制限を無効にすることができます。" + IDS_ALIAS_REPLICATOR_NAME "レプリケーター" + IDS_ALIAS_REPLICATOR_COMMENT "ドメイン内のファイルレプリケーションをサポートします" + IDS_ALIAS_REMOTE_DESKTOP_USERS_NAME "リモートデスクトップユーザー" + IDS_ALIAS_REMOTE_DESKTOP_USERS_COMMENT "このグループのメンバーには、リモートでログオンする権利が与えられます。" + IDS_ALIAS_NETWORK_CONFIGURATION_OPS_NAME "ネットワーク構成オペレーター" + IDS_ALIAS_NETWORK_CONFIGURATION_OPS_COMMENT "このグループのメンバーは、ネットワーク機能の設定を管理するための管理者権限を持つことができます。" + IDS_ALIAS_MONITORING_USERS_NAME "パフォーマンス監視ユーザー" + IDS_ALIAS_MONITORING_USERS_COMMENT "このグループのメンバーは、このコンピュータを監視するためのリモートアクセスを持っています。" + IDS_ALIAS_LOGGING_USERS_NAME "パフォーマンスログユーザー" + IDS_ALIAS_LOGGING_USERS_COMMENT "このグループのメンバーは、このコンピュータのパフォーマンスカウンタのロギングをスケジュールするためのリモートアクセスが可能です。" /* * ATTENTION: * If you translate the administrator account name, keep IDS_USER_ADMINISTRATOR_NAME and

1 0

[reactos] 01/01: [THEMEUI] Add Japanese (ja-JP) translation
by Katayama Hirofumi MZ 04 Jul '23

04 Jul '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=de85acff69cfb9b8a08a5… commit de85acff69cfb9b8a08a554333642c3a9aeec415 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Jul 4 12:50:31 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Jul 4 12:50:31 2023 +0900 [THEMEUI] Add Japanese (ja-JP) translation CORE-18706 --- dll/win32/themeui/lang/ja-JP.rc | 35 +++++++++++++++++++++++++++++++++++ dll/win32/themeui/themeui.rc | 3 +++ 2 files changed, 38 insertions(+) diff --git a/dll/win32/themeui/lang/ja-JP.rc b/dll/win32/themeui/lang/ja-JP.rc new file mode 100644 index 00000000000..01016a152ec --- /dev/null +++ b/dll/win32/themeui/lang/ja-JP.rc @@ -0,0 +1,35 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_BRICK "��K" + IDS_EGGPLANT "�Ȃ��" + IDS_GOLIVE "�΂̃I��[�u" //Spruce + IDS_HCONTRAST_1 "�n�C�R��g��X�g 1" + IDS_HCONTRAST_2 "�n�C�R��g��X�g 2" + IDS_HCONTRAST_BLACK "�n�C�R��g��X�g ��" + IDS_HCONTRAST_WHITE "�n�C�R��g��X�g ��" + IDS_LILAC "��C��b�N" + IDS_MAPLE "�J�G�f" + IDS_MARINE "�C" + IDS_PLUM "�~" + IDS_PUMPKIN "�J�{�`��" + IDS_RAIN "�J�̓�" + IDS_RWB "�ԁE��E��" + IDS_CLASSIC "ReactOS �N��V�b�N" + IDS_STANDARD "ReactOS �W��" + IDS_ROSE "�o��" + IDS_SAND "��" //Desert + IDS_SLATE "�Δ�" + IDS_SKY "��" + IDS_STORM "��" + IDS_TEAL "��" + IDS_WHEAT "��" +END + +STRINGTABLE +BEGIN + IDS_SIZE_NORMAL "�ʏ�" + IDS_SIZE_LARGE "�傫��" + IDS_SIZE_XLARGE "��" +END diff --git a/dll/win32/themeui/themeui.rc b/dll/win32/themeui/themeui.rc index 21de11681b7..230cac724d4 100644 --- a/dll/win32/themeui/themeui.rc +++ b/dll/win32/themeui/themeui.rc @@ -34,6 +34,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif +#ifdef LANGUAGE_JA_JP + #include "lang/ja-JP.rc" +#endif #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif

1 0

[reactos] 01/01: [IPCONFIG] Add Japanese (ja-JP) translation
by Katayama Hirofumi MZ 04 Jul '23

04 Jul '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e8cb1677eee613e25456d… commit e8cb1677eee613e25456d071ad0acdb48cbc8971 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Jul 4 12:32:47 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Jul 4 12:32:47 2023 +0900 [IPCONFIG] Add Japanese (ja-JP) translation CORE-18706 --- base/applications/network/ipconfig/ipconfig.rc | 3 + base/applications/network/ipconfig/lang/ja-JP.rc | 137 +++++++++++++++++++++++ 2 files changed, 140 insertions(+) diff --git a/base/applications/network/ipconfig/ipconfig.rc b/base/applications/network/ipconfig/ipconfig.rc index 6c92ee6076e..3932cd610c3 100644 --- a/base/applications/network/ipconfig/ipconfig.rc +++ b/base/applications/network/ipconfig/ipconfig.rc @@ -32,6 +32,9 @@ #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif +#ifdef LANGUAGE_JA_JP + #include "lang/ja-JP.rc" +#endif #ifdef LANGUAGE_NB_NO #include "lang/no-NO.rc" #endif diff --git a/base/applications/network/ipconfig/lang/ja-JP.rc b/base/applications/network/ipconfig/lang/ja-JP.rc new file mode 100644 index 00000000000..2133178d43f --- /dev/null +++ b/base/applications/network/ipconfig/lang/ja-JP.rc @@ -0,0 +1,137 @@ +/* + * PROJECT: ReactOS ipconfig utility + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Japanese (Japan) resource file + * TRANSLATOR: Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_HEADER "\nReactOS IP 設定\n\n" + IDS_HOSTNAME "\tホスト名 . . . . . . . . . . . . : %hs\n" + IDS_PRIMARYDNSSUFFIX "\tプライマリ DNS サフィックス . . . : %hs\n" + IDS_NODETYPEBCAST "\tノードの種類 . . . . . . . . . . : ブロードキャスト\n" + IDS_NODETYPEP2P "\tノードの種類 . . . . . . . . . . : ピアツーピア\n" + IDS_NODETYPEMIXED "\tノードの種類 . . . . . . . . . . : 混合\n" + IDS_NODETYPEHYBRID "\tノードの種類 . . . . . . . . . . : ハイブリッド\n" + IDS_NODETYPEUNKNOWN "\tノードの種類 . . . . . . . . . . : 不明\n" + IDS_IPROUTINGNO "\tIP ルーティング有効 . . . . . . . : いいえ\n" + IDS_IPROUTINGYES "\tIP ルーティング有効 . . . . . . . : はい\n" + IDS_WINSPROXYNO "\tWINS プロキシ有効 . . . . . . . . : いいえ\n" + IDS_WINSPROXYYES "\tWINS プロキシ有効 . . . . . . . . : はい\n" + IDS_DNSSUFFIXLIST "\tDNS サフィックス検索リスト . . . : %hs\n" + IDS_EMPTYLINE "\t %hs\n" + IDS_MEDIADISCONNECTED "\tメディアの状態. . . . . . . . . . : 未接続\n" + IDS_CONNECTIONDNSSUFFIX "\t接続専用の DNS サフィックス . . . : %hs\n" + IDS_DESCRIPTION "\t詳しい説明 . . . . . . . . . . . : " + IDS_PHYSICALADDRESS "\t物理アドレス. . . . . . . . . . . : %hs\n" + IDS_DHCPNO "\tDHCP 有効 . . . . . . . . . . . . : いいえ\n" + IDS_DHCPYES "\tDHCP 有効 . . . . . . . . . . . . : はい\n" + IDS_AUTOCONFIGNO "\t自動設定有効. . . . . . . . . . . : いいえ\n" + IDS_AUTOCONFIGYES "\t自動設定有効. . . . . . . . . . . : はい\n" + IDS_IPADDRESS "\tIP アドレス . . . . . . . . . . . : %hs\n" + IDS_SUBNETMASK "\tサブネットマスク. . . . . . . . . : %hs\n" + IDS_DEFAULTGATEWAY "\tデフォルトゲートウェイ. . . . . . : %hs\n" + IDS_DHCPSERVER "\tDHCP サーバー . . . . . . . . . . : %hs\n" + IDS_DNSSERVERS "\tDNS サーバー. . . . . . . . . . . : %hs\n" + IDS_PRIMARYWINSSERVER "\tプライマリ WINS サーバー. . . . . : %hs\n" + IDS_SECONDARYWINSSERVER "\tセカンダリ WINS サーバー. . . . . : %hs\n" + IDS_LEASEOBTAINED "\tリース取得. . . . . . . . . . . . : %s\n" + IDS_LEASEEXPIRES "\tリース期限. . . . . . . . . . . . : %s\n" +END + +STRINGTABLE +BEGIN + IDS_UNKNOWNADAPTER "\n未知のアダプタ: %ls\n\n" + IDS_OTHER "\n他の種類のアダプタ: %ls\n\n" + IDS_ETH "\nイーサネットアダプタ: %ls\n\n" + IDS_TOKEN "\nトークンリングアダプタ: %ls\n\n" + IDS_FDDI "\nFDDI アダプタ: %ls\n\n" + IDS_PPP "\nPPP アダプタ: %ls\n\n" + IDS_LOOP "\nループバックアダプタ: %ls\n\n" + IDS_SLIP "\nSLIP アダプタ: %ls\n\n" + IDS_WIFI "\nワイヤレスネットワークアダプタ: %ls\n\n" +END + +STRINGTABLE +BEGIN + IDS_DNSNAME "\t%ls\n" + IDS_DNSLINE "\t----------------------------------------\n" + IDS_DNSRECORDNAME "\tレコード名. . . . . . : %ls\n" + IDS_DNSRECORDTYPE "\tレコードの種類. . . . : %hu\n" + IDS_DNSRECORDTTL "\t生存時間. . . . . . . : %lu\n" + IDS_DNSRECORDLENGTH "\tデータ長. . . . . . . : %hu\n" + IDS_DNSSECTIONQUESTION "\tセクション. . . . . . : Question\n" + IDS_DNSSECTIONANSWER "\tセクション. . . . . . : Answer\n" + IDS_DNSSECTIONAUTHORITY "\tセクション. . . . . . : Authority\n" + IDS_DNSSECTIONADDITIONAL "\tセクション. . . . . . : Additional\n" + IDS_DNSTYPEA "\tA (ホスト) レコード . : %ls\n" + IDS_DNSTYPENS "\tNS レコード . . . . . : %ls\n" + IDS_DNSTYPECNAME "\tCNAME レコード. . . . : %ls\n" + IDS_DNSTYPESOA1 "\tSOA レコード. . . . . : %ls\n\t %ls\n\t %lu\n" + IDS_DNSTYPESOA2 "\t %lu\n\t %lu\n\t %lu\n\t %lu\n" + IDS_DNSTYPEPTR "\tPTR レコード. . . . . : %ls\n" + IDS_DNSTYPEMX "\tMX レコード . . . . . : %ls\n\t %hu\n\t %hu\n" + IDS_DNSTYPEAAAA "\tAAAA レコード . . . . : %ls\n" + IDS_DNSTYPEATMA "\tATMA レコード . . . . : \n" + IDS_DNSTYPESRV "\tSRV レコード. . . . . : %ls\n\t %hu\n\t %hu\n\t %hu\n" +END + +STRINGTABLE +BEGIN + IDS_DNSNORECORD "\t種類 %ls のレコードはありません\n\n" + IDS_DNSNONAME "\t名前が存在しません。\n\n" + IDS_DNSFLUSHERROR "DNSリゾルバキャッシュをフラッシュできませんでした: " + IDS_DNSFLUSHSUCCESS "DNSリゾルバキャッシュは正常にフラッシュされました。\n" + IDS_DHCPNOTCONNECTED "メディアが未接続の間は %ls での処理は実行できません\n" + IDS_DHCPNOTENABLED "アダプタ %ls は DHCP に対して有効になっていません。\n" + IDS_DHCPNOADAPTER "アダプタがこの操作を許可する状態にないため、操作は失敗しました。\n" + IDS_DHCPRELEASED "アダプタ %ls に対する IP アドレスはすでに解放されています。\n" + IDS_DHCPRELEASEERROR "インターフェース %ls の解放中にエラーが起きました: " + IDS_DHCPRENEWERROR "インターフェース %ls の更新中にエラーが起きました: " +END + +STRINGTABLE +BEGIN +/* Please keep the spacing/formatting as per En.rc when translating */ + IDS_USAGE + "\n使い方:\n\ + ipconfig [/? | /all | /renew [adapter] | /release [adapter] |\n\ + /flushdns | /displaydns | /registerdns |\n\ + /showclassid adapter |\n\ + /setclassid adapter [classid] ]\n\ +\n\ + 指定項目\n\ + adapter 接続名\n\ + (ワイルドカード文字の * と ? が使えます。例をご覧下さい)\n\ +\n\ + オプション:\n\ + /? このヘルプ　メッセージを表示します。\n\ + /all すべての設定情報を表示します。\n\ + /release 指定したアダプタの IP アドレスを解放します。\n\ + /renew 指定したアダプタの IP アドレスを更新します。\n\ + /flushdns DNS リゾルバキャッシュをフラッシュします。\n\ + /registerdns すべてのDHCPリースを更新し、DNS名を再登録します。\n\ + /displaydns DNS リゾルバキャッシュの内容を表示します。\n\ + /showclassid アダプタで許可されているすべての dhcp クラス ID を表示します。\n\ + /setclassid dhcpクラスIDを変更します。\n\ +\n\ + デフォルトでは、TCP/IPにバインドされている各アダプタのIPアドレス、\n\ + サブネットマスク、デフォルトゲートウェイのみが表示されます。\n\ +\n\ + 解放と更新では、アダプタ名が指定されていない場合、TCP/IPにバインド\n\ + されているすべてのアダプタのIPアドレス・リースがリリースまたは更新されます。\n\ +\n\ + setclassid の場合、classid が指定されていなければ、classid は削除されます。\n\ +\n\ + 例:\n\ + > ipconfig ... 情報を表示します\n\ + > ipconfig /all ... 詳細情報を表示します\n\ + > ipconfig /renew ... すべてのアダプタを更新します\n\ + > ipconfig /renew EL* ... ELで始まる接続を更新します\n\ + > ipconfig /release *Con* ... すべてのマッチする接続を解放します。\n\ + 例) ""Local Area Connection 1"" または\n\ + ""Local Area Connection 2""\n" +END

1 0

[reactos] 01/01: [NETSTAT] -b flag implies -o flag on Windows XP/2003. CORE-19006 (#5377)
by Joachim Henze 03 Jul '23

03 Jul '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5ee97b95370cc1ad05d94… commit 5ee97b95370cc1ad05d944206b51ad597f111ac8 Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Mon Jul 3 22:30:34 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jul 3 22:30:34 2023 +0200 [NETSTAT] -b flag implies -o flag on Windows XP/2003. CORE-19006 (#5377) When calling 'netstat -abn' Win 2k3sp2 and XPSP3 do show both: the processes name and the PID. Contrary Win 7 and Win 8.1 would show only the process name then without the PID. The newer Windows versions would require you to explicitly pass -o if you want to see the PID also. We do follow 2k3sp2 because it is our target. The process name is not of much use without having the PID as well, especially if multiple processes with the same name do run on a system, e.g.: multiple 'svchost.exe' processes. Ros will automatically switch to the Win7-way when newer Windows versions will be targeted at build-time. --- base/applications/network/netstat/netstat.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/base/applications/network/netstat/netstat.c b/base/applications/network/netstat/netstat.c index f9f05046d92..b3754fa2de1 100644 --- a/base/applications/network/netstat/netstat.c +++ b/base/applications/network/netstat/netstat.c @@ -98,6 +98,9 @@ BOOL ParseCmdline(int argc, wchar_t* argv[]) // UNIMPLEMENTED. ConPuts(StdErr, L"'b' option is FIXME (Accepted option though unimplemented feature).\n"); bDoShowProcName = TRUE; +#if (_WIN32_WINNT < _WIN32_WINNT_VISTA) + bDoShowProcessId = TRUE; +#endif break; case L'e': bDoShowEthStats = TRUE;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs