Ros-diffs February 2023

ros-diffs@reactos.org

16 participants
97 discussions

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

by Jose Carlos Jesus

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f691efefc26ef554e9715… commit f691efefc26ef554e9715abfa1916527277599bb Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Fri Feb 10 11:05:11 2023 -0400 Commit: GitHub <noreply(a)github.com> 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))

1 year, 7 months

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

by Ratin Gao

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5c22ce374280c05b4d583… commit 5c22ce374280c05b4d583e4a16192327746f1926 Author: Ratin Gao <ratin(a)knsoft.org> AuthorDate: Fri Feb 10 22:56:13 2023 +0800 Commit: GitHub <noreply(a)github.com> 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;

1 year, 7 months

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

by Ratin Gao

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2f70f79904a480d800e23… commit 2f70f79904a480d800e23f4f47bb8d30a5da913b Author: Ratin Gao <ratin(a)knsoft.org> AuthorDate: Fri Feb 10 22:15:25 2023 +0800 Commit: GitHub <noreply(a)github.com> 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 00000000000..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 <ratin(a)knsoft.org> + */ + +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", IDC_ICONS_INTERNET, "button", + CONTROL "Internet浏览器(&I)", IDC_ICONS_INTERNET, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 116, 28, 100, 12 CONTROL "", IDC_ICONS_LISTVIEW, "SysListView32", LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP | WS_HSCROLL, 6, 60, 212, 56 - PUSHBUTTON "C&hange Icon...", IDC_ICONS_CHANGEICON, 86, 120, 64, 15 - PUSHBUTTON "Re&store Default", IDC_ICONS_SETDEFAULT, 154, 120, 64, 15 + PUSHBUTTON "更改图标(&H)...", IDC_ICONS_CHANGEICON, 86, 120, 64, 15 + PUSHBUTTON "还原默认图标(&S)", IDC_ICONS_SETDEFAULT, 154, 120, 64, 15 END IDD_ADVANCED_GENERAL DIALOGEX 0, 0, 253, 204 @@ -243,7 +243,7 @@ END STRINGTABLE BEGIN - IDS_DESKTOP_ITEMS "Desktop Items" + IDS_DESKTOP_ITEMS "桌面项目" END STRINGTABLE diff --git a/dll/cpl/hotplug/hotplug.rc b/dll/cpl/hotplug/hotplug.rc index 885713aad6b..8979476f923 100644 --- a/dll/cpl/hotplug/hotplug.rc +++ b/dll/cpl/hotplug/hotplug.rc @@ -60,6 +60,9 @@ IDI_HOTPLUG ICON "resources/1.ico" #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/dll/cpl/hotplug/lang/zh-CN.rc b/dll/cpl/hotplug/lang/zh-CN.rc new file mode 100644 index 00000000000..53c3eacb3bc --- /dev/null +++ b/dll/cpl/hotplug/lang/zh-CN.rc @@ -0,0 +1,40 @@ +/* + * PROJECT: Safely Remove Hardware Applet + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Chinese (Simplified) resource file + * TRANSLATORS: Copyright 2023 Ratin Gao <ratin(a)knsoft.org> + */ + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +IDD_SAFE_REMOVE_HARDWARE_DIALOG DIALOGEX 0, 0, 278, 245 +CAPTION "" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +FONT 9, "宋体" +BEGIN + ICON IDI_HOTPLUG, IDC_SAFE_REMOVE_ICON, 7, 10, 20, 20 + LTEXT "选定要拔出或弹出的设备，然后单击“停止”。当 ReactOS 通知您可以安全从计算机拔出设备时，再这样做。", IDC_STATIC, 36, 10, 234, 24, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "硬件设备(&H)：", IDC_STATIC, 7, 42, 248, 8, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_SAFE_REMOVE_DEVICE_TREE, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_GROUP | WS_TABSTOP, 7, 52, 264, 102 + LTEXT "", IDC_SAFE_REMOVE_TEXT, 7, 156, 264, 16, WS_CHILD | WS_VISIBLE | WS_GROUP + PUSHBUTTON "属性(&P)", IDC_SAFE_REMOVE_PROPERTIES, 158, 178, 55, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "停止(&S)", IDC_SAFE_REMOVE_STOP, 216, 178, 55, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + CONTROL "", IDC_STATIC, "static", SS_CENTER | SS_SUNKEN | WS_CHILD | WS_VISIBLE, 7, 200, 264, 1 + AUTOCHECKBOX "显示设备组件(&D)", IDC_SAFE_REMOVE_DISPLAY_COMPONENTS, 7, 208, 140, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "关闭(&C)", IDCLOSE, 216, 224, 55, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +IDM_POPUP_DEVICE_TREE MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "停止", IDM_STOP + MENUITEM "內容", IDM_PROPERTIES + END +END + +STRINGTABLE +BEGIN + IDS_CPLNAME "安全地移除硬件" + IDS_CPLDESCRIPTION "从您的计算机安全地拔出或弹出设备。" +END diff --git a/dll/cpl/sysdm/lang/zh-CN.rc b/dll/cpl/sysdm/lang/zh-CN.rc index e6cb5bd2378..9d9e24eb595 100644 --- a/dll/cpl/sysdm/lang/zh-CN.rc +++ b/dll/cpl/sysdm/lang/zh-CN.rc @@ -365,8 +365,8 @@ BEGIN IDS_MESSAGEBOXTITLE "系统控制面板小程序" IDS_WARNINITIALSIZE "为分页文件的初始大小输入一个数字值。" IDS_WARNMAXIMUMSIZE "为分页文件的最大大小输入一个数字值。" - IDS_WARNINITIALRANGE "The initial paging file size must be between 2 MB and %lu MB on the selected drive." - IDS_WARNMAXIMUMRANGE "The maximum paging file size must be larger than or equal to its initial size, and less than %lu MB on the selected drive." + IDS_WARNINITIALRANGE "在所选驱动器上初始页面文件大小必须介于 2 MB 和 %lu MB 之间。" + IDS_WARNMAXIMUMRANGE "在所选驱动器上页面文件大小最大值必须大于或等于初始页面文件大小，但要小于 %lu MB。" IDS_PAGEFILE_MB "%lu MB" IDS_PAGEFILE_NONE "无" IDS_PAGEFILE_SYSTEM "系统已托管" diff --git a/dll/shellext/cryptext/cryptext.rc b/dll/shellext/cryptext/cryptext.rc index cbeb046d993..9e2e70070da 100644 --- a/dll/shellext/cryptext/cryptext.rc +++ b/dll/shellext/cryptext/cryptext.rc @@ -47,6 +47,9 @@ #ifdef LANGUAGE_UK_UA #include "lang/uk-UA.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/dll/shellext/cryptext/lang/zh-CN.rc b/dll/shellext/cryptext/lang/zh-CN.rc new file mode 100644 index 00000000000..cbdebebd36f --- /dev/null +++ b/dll/shellext/cryptext/lang/zh-CN.rc @@ -0,0 +1,14 @@ +/* + * PROJECT: ReactOS CryptExt Shell Extension + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Chinese (Simplified) resource file + * TRANSLATOR: Copyright 2023 Ratin Gao <ratin(a)knsoft.org> + */ + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +STRINGTABLE +BEGIN + IDS_INVALIDFILE "这不是有效的证书文件" + IDS_CER_FILE "证书文件" +END diff --git a/dll/shellext/fontext/fontext.rc b/dll/shellext/fontext/fontext.rc index 7b555d88730..933e8f56081 100644 --- a/dll/shellext/fontext/fontext.rc +++ b/dll/shellext/fontext/fontext.rc @@ -31,6 +31,9 @@ IDR_FONTEXT REGISTRY "res/fontext.rgs" #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/dll/shellext/fontext/lang/zh-CN.rc b/dll/shellext/fontext/lang/zh-CN.rc new file mode 100644 index 00000000000..cf537e76f49 --- /dev/null +++ b/dll/shellext/fontext/lang/zh-CN.rc @@ -0,0 +1,32 @@ +/* + * PROJECT: ReactOS Font Shell Extension + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Chinese (Simplified) resource file + * TRANSLATORS: Copyright 2023 Ratin Gao <ratin(a)knsoft.org> + */ + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +STRINGTABLE +BEGIN + IDS_REACTOS_FONTS_FOLDER "ReactOS 字体文件夹" +END + +STRINGTABLE +BEGIN + IDS_COL_NAME "名称" +END + +STRINGTABLE +BEGIN + IDS_COL_FILENAME "文件名" + IDS_COL_SIZE "大小" + IDS_COL_MODIFIED "修改日期" + IDS_COL_ATTR "属性" + IDS_COL_ATTR_LETTERS "RHSAC" +END + +STRINGTABLE +BEGIN + IDS_FONT_PREVIEW "预览" +END diff --git a/dll/shellext/netplwiz/lang/zh-CN.rc b/dll/shellext/netplwiz/lang/zh-CN.rc new file mode 100644 index 00000000000..f4638a26c88 --- /dev/null +++ b/dll/shellext/netplwiz/lang/zh-CN.rc @@ -0,0 +1,28 @@ +/* + * PROJECT: ReactOS Network Places Wizard + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Chinese (Simplified) resource file + * TRANSLATORS: Copyright 2023 Ratin Gao <ratin(a)knsoft.org> + */ + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +IDD_DISCONNECTDRIVES DIALOGEX 0, 0, 300, 200 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "中断网络驱动器连接" +FONT 9, "宋体" +BEGIN + LTEXT "选择要中断哪些网络驱动器的连接，然后单击“确定”。", -1, 7, 7, 286, 8 + LTEXT "网络驱动器(&N):", -1, 7, 23, 286, 8 + CONTROL "", IDC_CONNECTEDDRIVELIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_SINGLESEL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 7, 31, 286, 140 + PUSHBUTTON "确定", ID_OK, 189, 179, 50, 14 + PUSHBUTTON "取消", IDCANCEL, 243, 179, 50, 14 +END + +STRINGTABLE +BEGIN + IDS_DIALOG_CAPTION "断开网络驱动器" + IDS_DRIVE_LETTER "驱动器盘符" + IDS_NETWORK_PATH "网络路径" + IDS_NO_DRIVES "没有可断开的网络驱动器。" +END diff --git a/dll/shellext/netplwiz/netplwiz.rc b/dll/shellext/netplwiz/netplwiz.rc index 958e305174b..3d843f11bf3 100644 --- a/dll/shellext/netplwiz/netplwiz.rc +++ b/dll/shellext/netplwiz/netplwiz.rc @@ -48,6 +48,9 @@ IDI_DISCONNECT_NET_DRIVES ICON "res/4400.ico" #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/dll/win32/browseui/lang/zh-CN.rc b/dll/win32/browseui/lang/zh-CN.rc index c6ceb6c4214..198a1b46d10 100644 --- a/dll/win32/browseui/lang/zh-CN.rc +++ b/dll/win32/browseui/lang/zh-CN.rc @@ -320,7 +320,7 @@ END STRINGTABLE BEGIN - IDS_ADDRESSMENUTEXT "&Address" + IDS_ADDRESSMENUTEXT "地址(&A)" IDS_HISTORYTEXT "历史(&H)\tCtrl+H" END diff --git a/dll/win32/msgina/lang/zh-CN.rc b/dll/win32/msgina/lang/zh-CN.rc index 5fc10066efa..6c94954edfb 100644 --- a/dll/win32/msgina/lang/zh-CN.rc +++ b/dll/win32/msgina/lang/zh-CN.rc @@ -248,7 +248,7 @@ END /* Shutdown Dialog Strings */ STRINGTABLE BEGIN - IDS_SHUTDOWN_LOGOFF "注销“%S”" + IDS_SHUTDOWN_LOGOFF "注销 %s" IDS_SHUTDOWN_SHUTDOWN "关闭" IDS_SHUTDOWN_RESTART "重新启动" IDS_SHUTDOWN_SLEEP "睡眠" diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc index cef2a4582d9..4e0bf96736d 100644 --- a/dll/win32/shell32/lang/zh-CN.rc +++ b/dll/win32/shell32/lang/zh-CN.rc @@ -149,7 +149,7 @@ BEGIN LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20, SS_NOPREFIX - LTEXT "这个 ReactOS 版本注册到：", IDC_ABOUT_REG_TO, 35, 115, 180, 10 + LTEXT "这个 ReactOS 版本授权给：", IDC_ABOUT_REG_TO, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10, SS_NOPREFIX LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10, SS_NOPREFIX LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ @@ -233,11 +233,11 @@ BEGIN LTEXT "文件类型：", 14004, 8, 40, 55, 10 CONTROL "文件夹", 14005, "edit", ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL, 58, 40, 170, 10 LTEXT "", -1, 8, 31, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "地点：", 14008, 8, 56, 55, 10 + LTEXT "位置：", 14008, 8, 56, 55, 10 EDITTEXT 14009, 58, 56, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "大小：", 14010, 8, 72, 55, 10 EDITTEXT 14011, 58, 72, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "在磁盘上的大小：", 140101, 8, 88, 55, 10 + LTEXT "占用空间：", 140101, 8, 88, 55, 10 EDITTEXT 14012, 58, 88, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "包含：", 14026, 8, 104, 55, 10 EDITTEXT 14027, 58, 104, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL @@ -267,11 +267,11 @@ BEGIN PUSHBUTTON "更改(&C)...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "地点：", 14008, 8, 75, 45, 10 + LTEXT "位置：", 14008, 8, 75, 45, 10 EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "大小：", 14010, 8, 91, 45, 10 EDITTEXT 14011, 58, 91, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "在磁盘上的大小：", 140112, 8, 107, 55, 10 + LTEXT "占用空间：", 140112, 8, 107, 55, 10 EDITTEXT 14012, 58, 107, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "", -1, 8, 123, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "创建日期：", 14014, 8, 131, 45, 10 @@ -765,7 +765,7 @@ BEGIN IDS_SHV_COLUMN_NETLOCATION "网络位置" IDS_SHV_COLUMN_DOCUMENTS "文件" IDS_SHV_COLUMN_STATUS "状态" - IDS_SHV_COLUMN_COMMENTS "评论" + IDS_SHV_COLUMN_COMMENTS "备注" IDS_SHV_COLUMN_LOCATION "位置" IDS_SHV_COLUMN_MODEL "模型" @@ -992,8 +992,8 @@ BEGIN IDS_TITLE_MYCOMP "我的电脑" IDS_TITLE_MYNET "网上邻居" - IDS_TITLE_BIN_1 "Recycle Bin (full)" - IDS_TITLE_BIN_0 "Recycle Bin (empty)" + IDS_TITLE_BIN_1 "回收站(满)" + IDS_TITLE_BIN_0 "回收站(空)" IDS_ADVANCED_FOLDER "文件和文件夹" IDS_ADVANCED_NET_CRAWLER "自动搜索网络文件夹和打印机"

1 year, 7 months

[reactos] 01/01: [NOTEPAD] Treat empty file correctly (#5057)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1b20c7312fa2e03f4fbc1… commit 1b20c7312fa2e03f4fbc11d81415043d5c30a3e2 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Feb 9 21:54:20 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Feb 9 21:54:20 2023 +0900 [NOTEPAD] Treat empty file correctly (#5057) #5012 had a regression on opening an empty file. CORE-14641, CORE-18826 --- base/applications/notepad/text.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/base/applications/notepad/text.c b/base/applications/notepad/text.c index 3ce3a889bfe..0025ddf9dac 100644 --- a/base/applications/notepad/text.c +++ b/base/applications/notepad/text.c @@ -179,6 +179,22 @@ ReadText(HANDLE hFile, HLOCAL *phLocal, ENCODING *pencFile, EOLN *piEoln) if (dwSize == INVALID_FILE_SIZE) goto done; + if (dwSize == 0) // If file is empty + { + hNewLocal = LocalReAlloc(*phLocal, sizeof(UNICODE_NULL), LMEM_MOVEABLE); + pszNewText = LocalLock(hNewLocal); + if (hNewLocal == NULL || pszNewText == NULL) + goto done; + + *pszNewText = UNICODE_NULL; + LocalUnlock(hNewLocal); + + *phLocal = hNewLocal; + *piEoln = EOLN_CRLF; + *pencFile = ENCODING_UTF8; + return TRUE; + } + hMapping = CreateFileMappingW(hFile, NULL, PAGE_READONLY, 0, 0, NULL); if (hMapping == NULL) goto done;

1 year, 7 months

[reactos] 01/01: [EXPLORER][BROWSEUI] de-DE.rc fix 3 german keyboard accelerators

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=06b25bc9dd22060aad79f… commit 06b25bc9dd22060aad79f29a97f8d23dce8227e0 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Wed Feb 8 10:05:04 2023 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Wed Feb 8 10:05:04 2023 +0100 [EXPLORER][BROWSEUI] de-DE.rc fix 3 german keyboard accelerators [BROWSEUI] German accelerator for "F&avoriten" collided with "&Ansicht". [EXPLORER] German accelerator for "F&avoriten" must be "&Favoriten" also in the startmenu. [BROWSEUI] German accelerator for "S&chnellstartleiste" was missing. Fix all 3 by switching to what MS uses in german XPSP3. see the before-state with the [BROWSEUI] collision here: https://jira.reactos.org/secure/attachment/65116/ros.png Please note that in current master head the accelerators in [BROWSEUI] filebrowser are generally broken for other reasons. So this commit will not entirely fix CORE-18824 yet, but just rules out the small related glitches in the german rc-files. --- base/shell/explorer/lang/de-DE.rc | 2 +- dll/win32/browseui/lang/de-DE.rc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/base/shell/explorer/lang/de-DE.rc b/base/shell/explorer/lang/de-DE.rc index 55a62189cd1..0f582a20a76 100644 --- a/base/shell/explorer/lang/de-DE.rc +++ b/base/shell/explorer/lang/de-DE.rc @@ -30,7 +30,7 @@ BEGIN BEGIN MENUITEM "(Leer)", -1, MFT_STRING, MFS_GRAYED END - POPUP "F&avoriten", IDM_FAVORITES + POPUP "&Favoriten", IDM_FAVORITES BEGIN MENUITEM "(Leer)", -1, MFT_STRING, MFS_GRAYED END diff --git a/dll/win32/browseui/lang/de-DE.rc b/dll/win32/browseui/lang/de-DE.rc index eabd07d55b1..2670095c0e8 100644 --- a/dll/win32/browseui/lang/de-DE.rc +++ b/dll/win32/browseui/lang/de-DE.rc @@ -73,7 +73,7 @@ BEGIN END MENUITEM "&Aktualisieren", IDM_VIEW_REFRESH END - POPUP "F&avoriten", FCIDM_MENU_FAVORITES + POPUP "&Favoriten", FCIDM_MENU_FAVORITES BEGIN MENUITEM "&Zu Favoriten hinzufügen...", IDM_FAVORITES_ADDTOFAVORITES MENUITEM "Fav&oriten verwalten...", IDM_FAVORITES_ORGANIZEFAVORITES @@ -99,7 +99,7 @@ BEGIN POPUP "&Symbolleisten", -1, MFT_STRING, MFS_ENABLED, 0 BEGIN MENUITEM "&Desktop", IDM_TASKBAR_TOOLBARS_DESKTOP, MFT_STRING - MENUITEM "Schnellstartleiste", IDM_TASKBAR_TOOLBARS_QUICKLAUNCH, MFT_STRING + MENUITEM "S&chnellstartleiste", IDM_TASKBAR_TOOLBARS_QUICKLAUNCH, MFT_STRING MENUITEM "", -1, MFT_SEPARATOR, MFS_ENABLED MENUITEM "&Neue Symbolleiste...", IDM_TASKBAR_TOOLBARS_NEW, MFT_STRING END

1 year, 7 months

[reactos] 03/03: [WINMM] Constify some variables

by Thamatip Chitpong

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f73ac17e3089efd68378c… commit f73ac17e3089efd68378ca45cf1dbfcab4d4aab0 Author: Thamatip Chitpong <tangaming123456(a)outlook.com> AuthorDate: Tue Feb 7 00:52:53 2023 +0700 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Tue Feb 7 20:53:08 2023 +0100 [WINMM] Constify some variables Wine commit: 4aca7601265ca76339662aa4e1a9c6669cebc9a0 author: Andrew Talbot <andrew.talbot(a)talbotville.com> Mon, 22 Aug 2011 19:31:51 +0000 (20:31 +0100) committer: Alexandre Julliard <julliard(a)winehq.org> Tue, 23 Aug 2011 14:53:53 +0000 (16:53 +0200) --- dll/win32/winmm/mmio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/winmm/mmio.c b/dll/win32/winmm/mmio.c index a0043d6627e..5e86722e747 100644 --- a/dll/win32/winmm/mmio.c +++ b/dll/win32/winmm/mmio.c @@ -366,8 +366,8 @@ static FOURCC MMIO_ParseExtA(LPCSTR szFileName) FOURCC ret = 0; /* Note that ext{Start,End} point to the . and + respectively */ - LPSTR extEnd; - LPSTR extStart; + LPCSTR extEnd; + LPCSTR extStart; CHAR ext[5];

1 year, 7 months

[reactos] 02/03: [WINMM] Fixed boundary condition in mmioOpen file name parsing

by Thamatip Chitpong

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=940bbd2e02e1e8112e028… commit 940bbd2e02e1e8112e0284655c9bf06ef7d4ab7e Author: Thamatip Chitpong <tangaming123456(a)outlook.com> AuthorDate: Mon Feb 6 23:43:45 2023 +0700 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Tue Feb 7 20:53:08 2023 +0100 [WINMM] Fixed boundary condition in mmioOpen file name parsing Wine commit: 4431c32c91206040d59d3eb82a971245594d1243 author: Alexander Puzankov <alxpnv(a)gmail.com> Sun, 5 Dec 2010 14:24:59 +0000 (17:24 +0300) committer: Alexandre Julliard <julliard(a)winehq.org> Sun, 5 Dec 2010 15:44:28 +0000 (16:44 +0100) --- dll/win32/winmm/mmio.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dll/win32/winmm/mmio.c b/dll/win32/winmm/mmio.c index 899b990d994..a0043d6627e 100644 --- a/dll/win32/winmm/mmio.c +++ b/dll/win32/winmm/mmio.c @@ -385,13 +385,13 @@ static FOURCC MMIO_ParseExtA(LPCSTR szFileName) } else { /* Find the first '.' before '+' */ extStart = extEnd - 1; - while (*extStart != '.') { - if (extStart == szFileName) { - ERR("No extension in szFileName: %s\n", debugstr_a(szFileName)); - return ret; - } + while (extStart >= szFileName && *extStart != '.') { extStart--; } + if (extStart < szFileName) { + ERR("No extension in szFileName: %s\n", debugstr_a(szFileName)); + return ret; + } } if (extEnd - extStart - 1 > 4)

1 year, 7 months

[reactos] 01/03: [WINMM] Revert "Handle playing of files containing a '+' as part of the filename."

by Thamatip Chitpong

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d27e2b0b2399d3d04a347… commit d27e2b0b2399d3d04a347342a39d95a787750097 Author: Thamatip Chitpong <tangaming123456(a)outlook.com> AuthorDate: Mon Feb 6 22:47:21 2023 +0700 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Tue Feb 7 20:53:08 2023 +0100 [WINMM] Revert "Handle playing of files containing a '+' as part of the filename." Wine commit: cc5f2b2c766bbe4975d7ee4a7c3b269650cbf874 author: Alexander Puzankov <alxpnv(a)gmail.com> Mon, 29 Nov 2010 18:15:16 +0000 (21:15 +0300) committer: Alexandre Julliard <julliard(a)winehq.org> Wed, 1 Dec 2010 16:16:20 +0000 (17:16 +0100) --- dll/win32/winmm/mmio.c | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/dll/win32/winmm/mmio.c b/dll/win32/winmm/mmio.c index cd8b1da8aca..899b990d994 100644 --- a/dll/win32/winmm/mmio.c +++ b/dll/win32/winmm/mmio.c @@ -369,39 +369,40 @@ static FOURCC MMIO_ParseExtA(LPCSTR szFileName) LPSTR extEnd; LPSTR extStart; + CHAR ext[5]; + TRACE("(%s)\n", debugstr_a(szFileName)); if (!szFileName) return ret; - /* Find the last '.' */ - extStart = strrchr(szFileName,'.'); + /* Find the last '+' */ + extEnd = strrchr(szFileName,'+'); - if (!extStart) { - ERR("No . in szFileName: %s\n", debugstr_a(szFileName)); + if (!extEnd) { + /* No + so just an extension */ + return ret; } else { - CHAR ext[5]; + /* Find the first '.' before '+' */ + extStart = extEnd - 1; + while (*extStart != '.') { + if (extStart == szFileName) { + ERR("No extension in szFileName: %s\n", debugstr_a(szFileName)); + return ret; + } + extStart--; + } + } - /* Find the '+' afterwards */ - extEnd = strchr(extStart,'+'); - if (extEnd) { + if (extEnd - extStart - 1 > 4) + WARN("Extension length > 4\n"); + lstrcpynA(ext, extStart + 1, min(extEnd-extStart,5)); - if (extEnd - extStart - 1 > 4) - WARN("Extension length > 4\n"); - lstrcpynA(ext, extStart + 1, min(extEnd-extStart,5)); + TRACE("Got extension: %s\n", debugstr_a(ext)); - } else { - /* No + so just an extension */ - if (strlen(extStart) > 4) { - WARN("Extension length > 4\n"); - } - lstrcpynA(ext, extStart + 1, 5); - } - TRACE("Got extension: %s\n", debugstr_a(ext)); + /* FOURCC codes identifying file-extensions must be uppercase */ + ret = mmioStringToFOURCCA(ext, MMIO_TOUPPER); - /* FOURCC codes identifying file-extensions must be uppercase */ - ret = mmioStringToFOURCCA(ext, MMIO_TOUPPER); - } return ret; }

1 year, 7 months

[reactos] 01/01: [REACTOS] "http://www.reactos" -> "https://reactos" (#5043)

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=09dde2cff938513e81ac5… commit 09dde2cff938513e81ac5451b84e69e11b6acfa1 Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Mon Feb 6 15:01:52 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Feb 6 17:01:52 2023 +0300 [REACTOS] "http://www.reactos" -> "https://reactos" (#5043) To harmonize, to save some bytes, and last but not least for security reasons. This can be understood as an addendum to (#2619). --- base/applications/calc/lang/bg-BG.rc | 2 +- base/applications/calc/lang/pl-PL.rc | 2 +- base/applications/charmap/lang/bg-BG.rc | 2 +- base/applications/charmap/lang/ro-RO.rc | 2 +- base/applications/cmdutils/attrib/lang/pl-PL.rc | 2 +- base/applications/cmdutils/chcp/lang/pl-PL.rc | 2 +- base/applications/cmdutils/doskey/lang/pl-PL.rc | 2 +- base/applications/cmdutils/doskey/lang/ro-RO.rc | 2 +- base/applications/cmdutils/find/lang/pl-PL.rc | 2 +- base/applications/cmdutils/find/lang/ro-RO.rc | 2 +- base/applications/cmdutils/help/lang/pl-PL.rc | 2 +- base/applications/cmdutils/help/lang/ro-RO.rc | 2 +- base/applications/cmdutils/label/lang/pl-PL.rc | 2 +- base/applications/cmdutils/more/lang/pl-PL.rc | 2 +- base/applications/cmdutils/more/lang/ro-RO.rc | 2 +- base/applications/dxdiag/lang/pl-PL.rc | 2 +- base/applications/dxdiag/lang/ro-RO.rc | 2 +- base/applications/findstr/lang/pl-PL.rc | 2 +- base/applications/findstr/lang/ro-RO.rc | 2 +- base/applications/fontview/lang/pl-PL.rc | 2 +- base/applications/kbswitch/lang/pl-PL.rc | 2 +- base/applications/kbswitch/lang/ro-RO.rc | 2 +- base/applications/logoff/lang/pl-PL.rc | 2 +- base/applications/logoff/lang/ro-RO.rc | 2 +- base/applications/magnify/lang/pl-PL.rc | 2 +- base/applications/mmc/lang/ro-RO.rc | 2 +- base/applications/mplay32/lang/bg-BG.rc | 2 +- base/applications/mplay32/lang/pl-PL.rc | 2 +- base/applications/mplay32/lang/ro-RO.rc | 2 +- base/applications/mspaint/lang/bg-BG.rc | 2 +- base/applications/mstsc/lang/pl-PL.rc | 2 +- base/applications/network/ipconfig/lang/ro-RO.rc | 2 +- base/applications/regedit/lang/bg-BG.rc | 2 +- base/applications/regedit/lang/pl-PL.rc | 2 +- base/applications/screensavers/3dtext/lang/pl-PL.rc | 2 +- base/applications/screensavers/3dtext/lang/ro-RO.rc | 2 +- base/applications/screensavers/logon/lang/pl-PL.rc | 2 +- base/applications/sndrec32/lang/pl-PL.rc | 2 +- base/applications/sndvol32/lang/bg-BG.rc | 2 +- base/applications/write/lang/Bg.rc | 2 +- base/setup/usetup/lang/ru-RU.h | 2 +- base/setup/usetup/lang/uk-UA.h | 4 ++-- base/shell/cmd/lang/cs-CZ.rc | 2 +- base/shell/cmd/lang/de-DE.rc | 2 +- base/shell/cmd/lang/el-GR.rc | 2 +- base/shell/cmd/lang/en-US.rc | 2 +- base/shell/cmd/lang/es-ES.rc | 2 +- base/shell/cmd/lang/fr-FR.rc | 2 +- base/shell/cmd/lang/hu-HU.rc | 2 +- base/shell/cmd/lang/id-ID.rc | 2 +- base/shell/cmd/lang/it-IT.rc | 2 +- base/shell/cmd/lang/ja-JP.rc | 2 +- base/shell/cmd/lang/no-NO.rc | 2 +- base/shell/cmd/lang/pl-PL.rc | 4 ++-- base/shell/cmd/lang/pt-PT.rc | 2 +- base/shell/cmd/lang/ro-RO.rc | 2 +- base/shell/cmd/lang/ru-RU.rc | 2 +- base/shell/cmd/lang/sk-SK.rc | 2 +- base/shell/cmd/lang/sq-AL.rc | 2 +- base/shell/cmd/lang/sv-SE.rc | 2 +- base/shell/cmd/lang/tr-TR.rc | 2 +- base/shell/cmd/lang/uk-UA.rc | 2 +- base/shell/cmd/lang/zh-CN.rc | 2 +- base/shell/cmd/lang/zh-TW.rc | 2 +- base/system/runonce/lang/pl-PL.rc | 2 +- base/system/subst/lang/pl-PL.rc | 2 +- dll/cpl/appwiz/lang/pl-PL.rc | 2 +- dll/cpl/intl/lang/pl-PL.rc | 2 +- dll/cpl/joy/lang/pl-PL.rc | 2 +- dll/cpl/liccpa/lang/ro-RO.rc | 2 +- dll/cpl/mmsys/lang/pl-PL.rc | 2 +- dll/cpl/telephon/lang/pl-PL.rc | 2 +- dll/cpl/usrmgr/lang/pl-PL.rc | 2 +- dll/cpl/wined3dcfg/lang/pl-PL.rc | 2 +- dll/shellext/deskadp/lang/pl-PL.rc | 2 +- dll/shellext/deskmon/lang/pl-PL.rc | 2 +- dll/shellext/deskmon/lang/ro-RO.rc | 2 +- dll/win32/aclui/lang/ro-RO.rc | 2 +- dll/win32/browseui/lang/pl-PL.rc | 2 +- dll/win32/modemui/lang/pl-PL.rc | 2 +- dll/win32/msports/lang/pl-PL.rc | 2 +- dll/win32/msports/lang/ro-RO.rc | 2 +- dll/win32/netcfgx/lang/ro-RO.rc | 2 +- dll/win32/netid/lang/ro-RO.rc | 2 +- dll/win32/rasdlg/lang/pl-PL.rc | 2 +- dll/win32/rasdlg/lang/ro-RO.rc | 2 +- dll/win32/serialui/lang/pl-PL.rc | 2 +- dll/win32/serialui/lang/ro-RO.rc | 2 +- dll/win32/shimgvw/lang/ro-RO.rc | 2 +- dll/win32/tapiui/lang/pl-PL.rc | 2 +- dll/win32/tapiui/lang/ro-RO.rc | 2 +- dll/win32/userenv/lang/ro-RO.rc | 2 +- drivers/storage/ide/uniata/id_init.cpp | 4 ++-- media/doc/HACKING | 2 +- media/fonts/doc/UniVGA/README.txt | 4 ++-- modules/rosapps/applications/explorer-old/shell/mainframe.cpp | 2 +- .../rosapps/applications/screensavers/blankscr/lang/pl-PL.rc | 2 +- .../applications/screensavers/butterflies/lang/pl-PL.rc | 2 +- .../rosapps/applications/screensavers/cylfrac/lang/pl-PL.rc | 2 +- modules/rosapps/applications/screensavers/matrix/lang/pl-PL.rc | 2 +- .../rosapps/applications/screensavers/starfield/lang/pl-PL.rc | 2 +- modules/rosapps/applications/sysutils/systeminfo/lang/pl-PL.rc | 2 +- modules/rostests/kmtests/readme.txt | 2 +- modules/wallpapers/Angelus/ReadMe.txt | 2 +- modules/wallpapers/ReadMe.txt | 10 +++++----- sdk/include/crt/mingw32/intrin.h | 2 +- sdk/include/crt/mingw32/intrin_arm.h | 2 +- sdk/include/crt/mingw32/intrin_ppc.h | 2 +- sdk/include/crt/mingw32/intrin_x86.h | 2 +- sdk/include/reactos/wine/config.h | 2 +- win32ss/user/ntuser/windc.c | 4 ++-- win32ss/user/user32/misc/usrapihk.c | 2 +- 112 files changed, 121 insertions(+), 121 deletions(-) diff --git a/base/applications/calc/lang/bg-BG.rc b/base/applications/calc/lang/bg-BG.rc index cfc08b5703b..a637bd61f60 100644 --- a/base/applications/calc/lang/bg-BG.rc +++ b/base/applications/calc/lang/bg-BG.rc @@ -1,5 +1,5 @@ /* Превод на Български/ Bulgarian translation - * http://www.reactos.org/wiki/Bulgarian_translation + * https://reactos.org/wiki/Bulgarian_translation * FILE: base/applications/calc/lang/bg-BG.rc * Недовършен / Incomplete */ diff --git a/base/applications/calc/lang/pl-PL.rc b/base/applications/calc/lang/pl-PL.rc index bb022ad14ba..348f70efabb 100644 --- a/base/applications/calc/lang/pl-PL.rc +++ b/base/applications/calc/lang/pl-PL.rc @@ -1,7 +1,7 @@ /* * Translated by Caemyr - Olaf Siejka (Feb, Jun 2008) * Use ReactOS forum PM or IRC to contact me - * http://www.reactos.org + * https://reactos.org * IRC: irc.freenode.net #reactos-pl; * Updated by Saibamen - Adam Stachowicz (saibamenppl(a)gmail.com) (Apr, 2011) * UTF-8 conversion by Caemyr (May, 2011) diff --git a/base/applications/charmap/lang/bg-BG.rc b/base/applications/charmap/lang/bg-BG.rc index c370ed32518..fabc6cbdd3a 100644 --- a/base/applications/charmap/lang/bg-BG.rc +++ b/base/applications/charmap/lang/bg-BG.rc @@ -1,5 +1,5 @@ /* Превод на Български/ Bulgarian translation */ -/* http://www.reactos.org/wiki/Bulgarian_translation */ +/* https://reactos.org/wiki/Bulgarian_translation */ LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT diff --git a/base/applications/charmap/lang/ro-RO.rc b/base/applications/charmap/lang/ro-RO.rc index 392bd1ca63d..923ef5128ae 100644 --- a/base/applications/charmap/lang/ro-RO.rc +++ b/base/applications/charmap/lang/ro-RO.rc @@ -1,6 +1,6 @@ /* * FILE: base/applications/charmap/lang/ro-RO.rc - * ReactOS Project (http://www.reactos.org) + * ReactOS Project (https://reactos.org) * TRANSLATOR: Ștefan Fulea (stefan dot fulea at mail dot com) */ diff --git a/base/applications/cmdutils/attrib/lang/pl-PL.rc b/base/applications/cmdutils/attrib/lang/pl-PL.rc index fe8d0974589..b9b64eb9c1c 100644 --- a/base/applications/cmdutils/attrib/lang/pl-PL.rc +++ b/base/applications/cmdutils/attrib/lang/pl-PL.rc @@ -2,7 +2,7 @@ * Translated by Caemyr - Olaf Siejka (Jan, 2008) * Updated by niski - Maciej Bialas (Mar, 2010) * Use ReactOS forum PM or IRC to contact me - * http://www.reactos.org + * https://reactos.org * IRC: irc.freenode.net #reactos-pl; * UTF-8 conversion by Caemyr (May, 2011) * Updated by pithwz - Piotr Hetnarowicz (piotrhwz(a)gmail.com) (April, 2020) diff --git a/base/applications/cmdutils/chcp/lang/pl-PL.rc b/base/applications/cmdutils/chcp/lang/pl-PL.rc index 67433a9b6c5..4277da9e37d 100644 --- a/base/applications/cmdutils/chcp/lang/pl-PL.rc +++ b/base/applications/cmdutils/chcp/lang/pl-PL.rc @@ -2,7 +2,7 @@ * Translated by Caemyr - Olaf Siejka (Jan, 2008) * Updated by niski - Maciej Bialas (Mar, 2010) * Use ReactOS forum PM or IRC to contact me - * http://www.reactos.org + * https://reactos.org * IRC: irc.freenode.net #reactos-pl; * UTF-8 conversion by Caemyr (May, 2011) */ diff --git a/base/applications/cmdutils/doskey/lang/pl-PL.rc b/base/applications/cmdutils/doskey/lang/pl-PL.rc index 2863da23da7..35231e29ae6 100644 --- a/base/applications/cmdutils/doskey/lang/pl-PL.rc +++ b/base/applications/cmdutils/doskey/lang/pl-PL.rc @@ -1,7 +1,7 @@ /* * Translated by Saibamen - Adam Stachowicz (Apr, 2011) * Use ReactOS forum PM, IRC or saibamenppl at gmail.com to contact me - * http://www.reactos.org + * https://reactos.org * IRC: irc.freenode.net #reactos-pl * UTF-8 conversion by Caemyr (May, 2011) */ diff --git a/base/applications/cmdutils/doskey/lang/ro-RO.rc b/base/applications/cmdutils/doskey/lang/ro-RO.rc index 1cf35f9b5a5..f1a5742a9db 100644 --- a/base/applications/cmdutils/doskey/lang/ro-RO.rc +++ b/base/applications/cmdutils/doskey/lang/ro-RO.rc @@ -1,6 +1,6 @@ /* * FILE: base/applications/cmdutils/doskey/lang/ro-RO.rc - * ReactOS Project (http://www.reactos.org) + * ReactOS Project (https://reactos.org) * TRANSLATOR: Fulea Ștefan (PM on ReactOS Forum at fulea.stefan) * CHANGE LOG: 2011-08-20 initial translation * 2011-10-17 diacritics change, other minor changes diff --git a/base/applications/cmdutils/find/lang/pl-PL.rc b/base/applications/cmdutils/find/lang/pl-PL.rc index fd4c515f362..b0af14ee420 100644 --- a/base/applications/cmdutils/find/lang/pl-PL.rc +++ b/base/applications/cmdutils/find/lang/pl-PL.rc @@ -1,7 +1,7 @@ /* * Translated by Caemyr - Olaf Siejka (Dec,2007) * Use ReactOS forum PM or IRC to contact me - * http://www.reactos.org + * https://reactos.org * IRC: irc.freenode.net #reactos-pl * UTF-8 conversion by Caemyr (May, 2011) */ diff --git a/base/applications/cmdutils/find/lang/ro-RO.rc b/base/applications/cmdutils/find/lang/ro-RO.rc index e7c9b96ba8d..a4382a0b73f 100644 --- a/base/applications/cmdutils/find/lang/ro-RO.rc +++ b/base/applications/cmdutils/find/lang/ro-RO.rc @@ -1,6 +1,6 @@ /* * FILE: base/applications/cmdutils/find/lang/ro-RO.rc - * ReactOS Project (http://www.reactos.org) + * ReactOS Project (https://reactos.org) * TRANSLATOR: Fulea Ștefan (PM on ReactOS Forum at fulea.stefan) * CHANGE LOG: 2011-08-20 initial translation * 2011-10-17 diacritics change, other minor changes diff --git a/base/applications/cmdutils/help/lang/pl-PL.rc b/base/applications/cmdutils/help/lang/pl-PL.rc index bc6aa74c7b5..d9e0d55de74 100644 --- a/base/applications/cmdutils/help/lang/pl-PL.rc +++ b/base/applications/cmdutils/help/lang/pl-PL.rc @@ -2,7 +2,7 @@ * Translated by Caemyr - Olaf Siejka (Jan, 2008) * Updated by niski - Maciej Bialas (Mar, 2010) * Use ReactOS forum PM or IRC to contact me - * http://www.reactos.org + * https://reactos.org * IRC: irc.freenode.net #reactos-pl; * UTF-8 conversion by Caemyr (May, 2011) * Updated by Saibamen - Adam Stachowicz (saibamenppl(a)gmail.com) (November, 2013) diff --git a/base/applications/cmdutils/help/lang/ro-RO.rc b/base/applications/cmdutils/help/lang/ro-RO.rc index 2bd6d1756e6..0fd320cc732 100644 --- a/base/applications/cmdutils/help/lang/ro-RO.rc +++ b/base/applications/cmdutils/help/lang/ro-RO.rc @@ -1,6 +1,6 @@ /* * FILE: base/applications/cmdutils/help/lang/ro-RO.rc - * ReactOS Project (http://www.reactos.org) + * ReactOS Project (https://reactos.org) * AUTHOR: Magnus Olsen, 2005 * TRANSLATOR: Ștefan Fulea (stefan dot fulea at mail dot com) */ diff --git a/base/applications/cmdutils/label/lang/pl-PL.rc b/base/applications/cmdutils/label/lang/pl-PL.rc index 67a8d033f4e..6d1ba1cc6da 100644 --- a/base/applications/cmdutils/label/lang/pl-PL.rc +++ b/base/applications/cmdutils/label/lang/pl-PL.rc @@ -2,7 +2,7 @@ * Translated by Caemyr - Olaf Siejka (Jan, 2008) * Updated by niski - Maciej Bialas (Mar, 2010) * Use ReactOS forum PM or IRC to contact me - * http://www.reactos.org + * https://reactos.org * IRC: irc.freenode.net #reactos-pl; * UTF-8 conversion by Caemyr (May, 2011) * Updated by pithwz - Piotr Hetnarowicz (piotrhwz(a)gmail.com) (April, 2020) diff --git a/base/applications/cmdutils/more/lang/pl-PL.rc b/base/applications/cmdutils/more/lang/pl-PL.rc index b10a7c7e9ff..9ae488cfb6e 100644 --- a/base/applications/cmdutils/more/lang/pl-PL.rc +++ b/base/applications/cmdutils/more/lang/pl-PL.rc @@ -1,7 +1,7 @@ /* * Translated by Caemyr - Olaf Siejka (Dec, 2007) * Use ReactOS forum PM or IRC to contact me - * http://www.reactos.org + * https://reactos.org * IRC: irc.freenode.net #reactos-pl; * UTF-8 conversion by Caemyr (May, 2011) */ diff --git a/base/applications/cmdutils/more/lang/ro-RO.rc b/base/applications/cmdutils/more/lang/ro-RO.rc index 547db65ceef..3d74ec3b92f 100644 --- a/base/applications/cmdutils/more/lang/ro-RO.rc +++ b/base/applications/cmdutils/more/lang/ro-RO.rc @@ -1,6 +1,6 @@ /* * FILE: base/applications/cmdutils/more/lang/ro-RO.rc - * ReactOS Project (http://www.reactos.org) + * ReactOS Project (https://reactos.org) * TRANSLATOR: Fulea Ștefan (PM on ReactOS Forum at fulea.stefan) * CHANGE LOG: 2011-08-20 initial translation * 2011-10-17 diacritics change, other minor changes diff --git a/base/applications/dxdiag/lang/pl-PL.rc b/base/applications/dxdiag/lang/pl-PL.rc index 78cba2c2b49..103df0c34c0 100644 --- a/base/applications/dxdiag/lang/pl-PL.rc +++ b/base/applications/dxdiag/lang/pl-PL.rc @@ -2,7 +2,7 @@ * Translated by Caemyr - Olaf Siejka (Apr,2008) * Updated by Saibamen - Adam Stachowicz (saibamenppl(a)gmail.com) (August, 2011) * Use ReactOS forum PM or IRC to contact me - * http://www.reactos.org + * https://reactos.org * IRC: irc.freenode.net #reactos-pl * UTF-8 conversion by Caemyr (May, 2011) */ diff --git a/base/applications/dxdiag/lang/ro-RO.rc b/base/applications/dxdiag/lang/ro-RO.rc index 6ef4613155d..f9c28313517 100644 --- a/base/applications/dxdiag/lang/ro-RO.rc +++ b/base/applications/dxdiag/lang/ro-RO.rc @@ -1,6 +1,6 @@ /* * FILE: base/applications/dxdiag/lang/ro-RO.rc - * ReactOS Project (http://www.reactos.org) + * ReactOS Project (https://reactos.org) * TRANSLATOR: Ștefan Fulea (stefan dot fulea at mail dot com) */ diff --git a/base/applications/findstr/lang/pl-PL.rc b/base/applications/findstr/lang/pl-PL.rc index bf10a5ecbc9..74b93dade7a 100644 --- a/base/applications/findstr/lang/pl-PL.rc +++ b/base/applications/findstr/lang/pl-PL.rc @@ -1,7 +1,7 @@ /* * Translated by Caemyr - Olaf Siejka (Dec,2007) * Use ReactOS forum PM or IRC to contact me - * http://www.reactos.org + * https://reactos.org * IRC: irc.freenode.net #reactos-pl * UTF-8 conversion by Caemyr (May, 2011) */ diff --git a/base/applications/findstr/lang/ro-RO.rc b/base/applications/findstr/lang/ro-RO.rc index 66042670f7d..bf941204cf7 100644 --- a/base/applications/findstr/lang/ro-RO.rc +++ b/base/applications/findstr/lang/ro-RO.rc @@ -1,6 +1,6 @@ /* * FILE: base/applications/findstr/lang/ro-RO.rc - * ReactOS Project (http://www.reactos.org) + * ReactOS Project (https://reactos.org) * TRANSLATOR: Fulea Ștefan (PM on ReactOS Forum at fulea.stefan) * CHANGE LOG: 2011-08-20 initial translation * 2011-10-17 diacritics change, other minor changes diff --git a/base/applications/fontview/lang/pl-PL.rc b/base/applications/fontview/lang/pl-PL.rc index a06b32c656e..f3f83fc3289 100644 --- a/base/applications/fontview/lang/pl-PL.rc +++ b/base/applications/fontview/lang/pl-PL.rc @@ -1,7 +1,7 @@ /* * Translated by Caemyr - Olaf Siejka (Feb, 2008; Jul, 2012) * Use ReactOS forum PM or IRC to contact me - * http://www.reactos.org + * https://reactos.org * IRC: irc.freenode.net #reactos-pl; * UTF-8 conversion by Caemyr (May, 2011) */ diff --git a/base/applications/kbswitch/lang/pl-PL.rc b/base/applications/kbswitch/lang/pl-PL.rc index f2b4f79f219..2e778c6afca 100644 --- a/base/applications/kbswitch/lang/pl-PL.rc +++ b/base/applications/kbswitch/lang/pl-PL.rc @@ -1,7 +1,7 @@ /* * Translated by Caemyr - Olaf Siejka (Apr, 2008) * Use ReactOS forum PM or IRC to contact me - * http://www.reactos.org + * https://reactos.org * IRC: irc.freenode.net #reactos-pl * UTF-8 conversion by Caemyr (May, 2011) */ diff --git a/base/applications/kbswitch/lang/ro-RO.rc b/base/applications/kbswitch/lang/ro-RO.rc index feb5d0d853a..13125ca2b03 100644 --- a/base/applications/kbswitch/lang/ro-RO.rc +++ b/base/applications/kbswitch/lang/ro-RO.rc @@ -1,6 +1,6 @@ /* * FILE: base/applications/kbswitch/lang/ro-RO.rc - * ReactOS Project (http://www.reactos.org) + * ReactOS Project (https://reactos.org) * TRANSLATOR: Fulea Ștefan (PM on ReactOS Forum at fulea.stefan) * CHANGE LOG: 2011-08-21 initial translation */ diff --git a/base/applications/logoff/lang/pl-PL.rc b/base/applications/logoff/lang/pl-PL.rc index 9807151e188..e0b3b969359 100644 --- a/base/applications/logoff/lang/pl-PL.rc +++ b/base/applications/logoff/lang/pl-PL.rc @@ -1,7 +1,7 @@ /* * Translated by Caemyr - Olaf Siejka (Dec, 2007) * Use ReactOS forum PM or IRC to contact me - * http://www.reactos.org + * https://reactos.org * IRC: irc.freenode.net #reactos-pl; * UTF-8 conversion by Caemyr (May, 2011) */ diff --git a/base/applications/logoff/lang/ro-RO.rc b/base/applications/logoff/lang/ro-RO.rc index 3a7a820c7c9..fff451881b0 100644 --- a/base/applications/logoff/lang/ro-RO.rc +++ b/base/applications/logoff/lang/ro-RO.rc @@ -1,6 +1,6 @@ /* * FILE: base/applications/logoff/lang/ro-RO.rc - * ReactOS Project (http://www.reactos.org) + * ReactOS Project (https://reactos.org) * TRANSLATOR: Fulea Ștefan (PM on ReactOS Forum at fulea.stefan) * CHANGE LOG: 2011-08-21 initial translation * 2011-10-18 diacritics change diff --git a/base/applications/magnify/lang/pl-PL.rc b/base/applications/magnify/lang/pl-PL.rc index 9d36fa55694..068eabac1ea 100644 --- a/base/applications/magnify/lang/pl-PL.rc +++ b/base/applications/magnify/lang/pl-PL.rc @@ -1,7 +1,7 @@ /* * Translated by Caemyr - Olaf Siejka (Feb, 2008) * Use ReactOS forum PM or IRC to contact me - * http://www.reactos.org + * https://reactos.org * IRC: irc.freenode.net #reactos-pl; * UTF-8 conversion by Caemyr (May, 2011) */ diff --git a/base/applications/mmc/lang/ro-RO.rc b/base/applications/mmc/lang/ro-RO.rc index a8c00034eb5..1c29ef47504 100644 --- a/base/applications/mmc/lang/ro-RO.rc +++ b/base/applications/mmc/lang/ro-RO.rc @@ -1,6 +1,6 @@ /* * FILE: base/applications/mmc/lang/ro-RO.rc - * ReactOS Project (http://www.reactos.org) + * ReactOS Project (https://reactos.org) * TRANSLATOR: Ștefan Fulea (stefan dot fulea at mail dot com) */ diff --git a/base/applications/mplay32/lang/bg-BG.rc b/base/applications/mplay32/lang/bg-BG.rc index 2a7d3d0a0b6..fd53ca43332 100644 --- a/base/applications/mplay32/lang/bg-BG.rc +++ b/base/applications/mplay32/lang/bg-BG.rc @@ -1,5 +1,5 @@ /* Превод на Български/ Bulgarian translation - * http://www.reactos.org/wiki/Bulgarian_translation + * https://reactos.org/wiki/Bulgarian_translation * LOCATION:\base\applications\mplay32\lang */ LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT diff --git a/base/applications/mplay32/lang/pl-PL.rc b/base/applications/mplay32/lang/pl-PL.rc index 2cb41bfaf26..d19a01deae3 100644 --- a/base/applications/mplay32/lang/pl-PL.rc +++ b/base/applications/mplay32/lang/pl-PL.rc @@ -1,6 +1,6 @@ /* * Translated by Maciej Białas - * http://www.reactos.org + * https://reactos.org * IRC: irc.freenode.net #reactos-pl * UTF-8 conversion by Caemyr (May, 2011) * Updated by Saibamen - Adam Stachowicz (saibamenppl(a)gmail.com) (May, 2014) diff --git a/base/applications/mplay32/lang/ro-RO.rc b/base/applications/mplay32/lang/ro-RO.rc index 1645cdf8c81..f7c1f06bfff 100644 --- a/base/applications/mplay32/lang/ro-RO.rc +++ b/base/applications/mplay32/lang/ro-RO.rc @@ -1,6 +1,6 @@ /* * FILE: base/applications/mplay32/lang/ro-RO.rc - * ReactOS Project (http://www.reactos.org) + * ReactOS Project (https://reactos.org) * TRANSLATOR: Ștefan Fulea (stefan dot fulea at mail dot com) */ diff --git a/base/applications/mspaint/lang/bg-BG.rc b/base/applications/mspaint/lang/bg-BG.rc index 79b84b2bc18..d5be4c3339f 100644 --- a/base/applications/mspaint/lang/bg-BG.rc +++ b/base/applications/mspaint/lang/bg-BG.rc @@ -2,7 +2,7 @@ * PROJECT: PAINT for ReactOS * LICENSE: LGPL * Превод на Български/ Bulgarian translation - * http://www.reactos.org/wiki/Bulgarian_translation + * https://reactos.org/wiki/Bulgarian_translation * LOCATION: base/applications/mspaint/lang */ diff --git a/base/applications/mstsc/lang/pl-PL.rc b/base/applications/mstsc/lang/pl-PL.rc index 4fc216b20ff..9f5e7caffec 100644 --- a/base/applications/mstsc/lang/pl-PL.rc +++ b/base/applications/mstsc/lang/pl-PL.rc @@ -1,7 +1,7 @@ /* * Translated by Caemyr - Olaf Siejka (Dec, 2007) * Use ReactOS forum PM or IRC to contact me - * http://www.reactos.org + * https://reactos.org * IRC: irc.freenode.net #reactos-pl; * Updated by Saibamen - Adam Stachowicz (saibamenppl(a)gmail.com) (August, 2011) * UTF-8 conversion by Caemyr (May, 2011) diff --git a/base/applications/network/ipconfig/lang/ro-RO.rc b/base/applications/network/ipconfig/lang/ro-RO.rc index c91ddf48e7d..a7a1a8c70e9 100644 --- a/base/applications/network/ipconfig/lang/ro-RO.rc +++ b/base/applications/network/ipconfig/lang/ro-RO.rc @@ -1,6 +1,6 @@ /* * FILE: base/applications/network/ipconfig/lang/ro-RO.rc - * ReactOS Project (http://www.reactos.org) + * ReactOS Project (https://reactos.org) * TRANSLATOR: Ștefan Fulea (stefan dot fulea at mail dot com) */ diff --git a/base/applications/regedit/lang/bg-BG.rc b/base/applications/regedit/lang/bg-BG.rc index 96d43d1cd27..d3fb06924a5 100644 --- a/base/applications/regedit/lang/bg-BG.rc +++ b/base/applications/regedit/lang/bg-BG.rc @@ -1,5 +1,5 @@ /* Превод на Български/ Bulgarian translation */ -/* http://www.reactos.org/wiki/Bulgarian_translation */ +/* https://reactos.org/wiki/Bulgarian_translation */ /* LOCATION: base/applications/regedit/lang */ /* НЕДОВЪРШЕН/ INCOMPLETE */ diff --git a/base/applications/regedit/lang/pl-PL.rc b/base/applications/regedit/lang/pl-PL.rc index fbff2d011c8..456e1abf8ba 100644 --- a/base/applications/regedit/lang/pl-PL.rc +++ b/base/applications/regedit/lang/pl-PL.rc @@ -1,7 +1,7 @@ /* * Update by Caemyr - Olaf Siejka (Jan, 2007; May, 2011) * Use ReactOS forum PM or IRC to contact me - * http://www.reactos.org + * https://reactos.org * IRC: irc.freenode.net #reactos-pl; * Updated by Saibamen - Adam Stachowicz (saibamenppl(a)gmail.com) (August, 2011) * UTF-8 conversion by Caemyr (May, 2011) diff --git a/base/applications/screensavers/3dtext/lang/pl-PL.rc b/base/applications/screensavers/3dtext/lang/pl-PL.rc index 67658a0fe63..86dd0cbf802 100644 --- a/base/applications/screensavers/3dtext/lang/pl-PL.rc +++ b/base/applications/screensavers/3dtext/lang/pl-PL.rc @@ -1,7 +1,7 @@ /* * Translated by Caemyr - Olaf Siejka (Dec,2007) * Use ReactOS forum PM or IRC to contact me - * http://www.reactos.org + * https://reactos.org * IRC: irc.freenode.net #reactos-pl; * UTF-8 conversion by Caemyr (May, 2011) */ diff --git a/base/applications/screensavers/3dtext/lang/ro-RO.rc b/base/applications/screensavers/3dtext/lang/ro-RO.rc index fae9183ea12..5ed9c5c83e6 100644 --- a/base/applications/screensavers/3dtext/lang/ro-RO.rc +++ b/base/applications/screensavers/3dtext/lang/ro-RO.rc @@ -1,6 +1,6 @@ /* * FILE: base/applications/screensavers/3dtext/lang/ro-RO.rc - * ReactOS Project (http://www.reactos.org) + * ReactOS Project (https://reactos.org) * TRANSLATOR: Fulea Ștefan (PM on ReactOS Forum at fulea.stefan) * CHANGE LOG: 2011-08-24 initial translation */ diff --git a/base/applications/screensavers/logon/lang/pl-PL.rc b/base/applications/screensavers/logon/lang/pl-PL.rc index 8dc29a74dd3..92ac4284b5e 100644 --- a/base/applications/screensavers/logon/lang/pl-PL.rc +++ b/base/applications/screensavers/logon/lang/pl-PL.rc @@ -1,7 +1,7 @@ /* * Translated by Caemyr - Olaf Siejka (Dec, 2007) * Use ReactOS forum PM or IRC to contact me - * http://www.reactos.org + * https://reactos.org * IRC: irc.freenode.net #reactos-pl; * UTF-8 conversion by Caemyr (ł) (May, 2011) */ diff --git a/base/applications/sndrec32/lang/pl-PL.rc b/base/applications/sndrec32/lang/pl-PL.rc index cde78ff1abb..e1591bc2e99 100644 --- a/base/applications/sndrec32/lang/pl-PL.rc +++ b/base/applications/sndrec32/lang/pl-PL.rc @@ -1,7 +1,7 @@ /* * Translated by Saibamen - Adam Stachowicz (Apr, 2011) * Use ReactOS forum PM, IRC or saibamenppl at gmail.com to contact me - * http://www.reactos.org + * https://reactos.org * IRC: irc.freenode.net #reactos-pl; * UTF-8 conversion by Caemyr (May, 2011) * Update by wojo664 and Saibamen (May 2014) diff --git a/base/applications/sndvol32/lang/bg-BG.rc b/base/applications/sndvol32/lang/bg-BG.rc index 9f61bc31530..88be1b3c33d 100644 --- a/base/applications/sndvol32/lang/bg-BG.rc +++ b/base/applications/sndvol32/lang/bg-BG.rc @@ -1,5 +1,5 @@ /* Превод на Български/ Bulgarian translation */ -/* http://www.reactos.org/wiki/Bulgarian_translation */ +/* https://reactos.org/wiki/Bulgarian_translation */ /* LOCATION: base/applications/sndvol32/lang */ LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT diff --git a/base/applications/write/lang/Bg.rc b/base/applications/write/lang/Bg.rc index 03e6306cf88..d89914cde38 100644 --- a/base/applications/write/lang/Bg.rc +++ b/base/applications/write/lang/Bg.rc @@ -19,7 +19,7 @@ */ /* Превод на Български/ Bulgarian translation */ -/* http://www.reactos.org/wiki/Bulgarian_translation */ +/* https://reactos.org/wiki/Bulgarian_translation */ /* LOCATION: \base\applications\write\lang */ /* WARNING */ diff --git a/base/setup/usetup/lang/ru-RU.h b/base/setup/usetup/lang/ru-RU.h index 9b6b1c9b7c1..aa4dd8cc8a3 100644 --- a/base/setup/usetup/lang/ru-RU.h +++ b/base/setup/usetup/lang/ru-RU.h @@ -161,7 +161,7 @@ static MUI_ENTRY ruRUWelcomePageEntries[] = { 6, 24, - "http://www.reactos.ru", + "https://reactos.org", TEXT_STYLE_HIGHLIGHT, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/uk-UA.h b/base/setup/usetup/lang/uk-UA.h index ce68ce4cb86..cd701ec7f17 100644 --- a/base/setup/usetup/lang/uk-UA.h +++ b/base/setup/usetup/lang/uk-UA.h @@ -3,7 +3,7 @@ // To revert conversion, please execute "code7bit -r <file>". /* * translated by Artem Reznikov, Igor Paliychuk, 2010 - * http://www.reactos.org/uk/ + * https://reactos.org */ #pragma once @@ -166,7 +166,7 @@ static MUI_ENTRY ukUAWelcomePageEntries[] = { 6, 24, - "http://www.reactos.org/uk/", + "https://reactos.org", TEXT_STYLE_HIGHLIGHT, TEXT_ID_STATIC }, diff --git a/base/shell/cmd/lang/cs-CZ.rc b/base/shell/cmd/lang/cs-CZ.rc index 0a656af3f4b..4754bff4a95 100644 --- a/base/shell/cmd/lang/cs-CZ.rc +++ b/base/shell/cmd/lang/cs-CZ.rc @@ -445,7 +445,7 @@ listing of credits." the Free Software Foundation; either version 2 of the License, or\n\ (at your option) any later version.\n" STRING_VERSION_HELP5 "\nSend bug reports to <ros-dev(a)reactos.org>.\n\ -Updates are available at: http://www.reactos.org" +Updates are available at: https://reactos.org" STRING_VERSION_HELP6 "\nFreeDOS version written by:\n" STRING_VERSION_HELP7 "\nReactOS version written by:\n" STRING_VOL_HELP1 " Volume in drive %c is %s\n" diff --git a/base/shell/cmd/lang/de-DE.rc b/base/shell/cmd/lang/de-DE.rc index 0ca0a488ffb..7422018a5f2 100644 --- a/base/shell/cmd/lang/de-DE.rc +++ b/base/shell/cmd/lang/de-DE.rc @@ -441,7 +441,7 @@ VER [/C][/R][/W]\n\n\ (nach eigenem Belieben) jeder höheren Version veröffentlicht, verändern." STRING_VERSION_HELP5 "\nSenden Sie Fehlerberichte an <ros-dev(a)reactos.org>.\n\ Updates sind auf der offiziellen ReactOS-Webseite verfügbar:\n\ -http://www.reactos.org" +https://reactos.org" STRING_VERSION_HELP6 "\nFreeDOS-Version programmiert von:\n" STRING_VERSION_HELP7 "\nReactOS-Version programmiert von:\n" STRING_VOL_HELP1 " Datenträger im Laufwerk %c ist %s\n" diff --git a/base/shell/cmd/lang/el-GR.rc b/base/shell/cmd/lang/el-GR.rc index 4df8d643f9e..3c81b6a4827 100644 --- a/base/shell/cmd/lang/el-GR.rc +++ b/base/shell/cmd/lang/el-GR.rc @@ -444,7 +444,7 @@ listing of credits." the Free Software Foundation; either version 2 of the License, or\n\ (at your option) any later version.\n" STRING_VERSION_HELP5 "\nSend bug reports to <ros-dev(a)reactos.org>.\n\ -Updates are available at: http://www.reactos.org" +Updates are available at: https://reactos.org" STRING_VERSION_HELP6 "\nFreeDOS version written by:\n" STRING_VERSION_HELP7 "\nReactOS version written by:\n" STRING_VOL_HELP1 " Volume in drive %c is %s\n" diff --git a/base/shell/cmd/lang/en-US.rc b/base/shell/cmd/lang/en-US.rc index c3b7b02d6e6..3751bdb54b0 100644 --- a/base/shell/cmd/lang/en-US.rc +++ b/base/shell/cmd/lang/en-US.rc @@ -440,7 +440,7 @@ listing of credits." the Free Software Foundation; either version 2 of the License, or\n\ (at your option) any later version.\n" STRING_VERSION_HELP5 "\nSend bug reports to <ros-dev(a)reactos.org>.\n\ -Updates are available at: http://www.reactos.org" +Updates are available at: https://reactos.org" STRING_VERSION_HELP6 "\nFreeDOS version written by:\n" STRING_VERSION_HELP7 "\nReactOS version written by:\n" STRING_VOL_HELP1 " Volume in drive %c is %s\n" diff --git a/base/shell/cmd/lang/es-ES.rc b/base/shell/cmd/lang/es-ES.rc index 8f7156cfa4e..85e74e06520 100644 --- a/base/shell/cmd/lang/es-ES.rc +++ b/base/shell/cmd/lang/es-ES.rc @@ -448,7 +448,7 @@ lista de los créditos." la Fundación de Software Libre; tanto en la versión 2 de la Licencia, o\n\ (según tu elección) cualquier otra posterior.\n" STRING_VERSION_HELP5 "\nManda los informes de bugs a <ros-dev(a)reactos.org>.\n\ -Actualizaciones disponibles en: http://www.reactos.org" +Actualizaciones disponibles en: https://reactos.org" STRING_VERSION_HELP6 "\nVersión de FreeDOS escrita por:\n" STRING_VERSION_HELP7 "\nVersión de ReactOS escrita por:\n" STRING_VOL_HELP1 " El volumen en la unidad %c es %s\n" diff --git a/base/shell/cmd/lang/fr-FR.rc b/base/shell/cmd/lang/fr-FR.rc index 66ba4466f73..4401cb31f98 100644 --- a/base/shell/cmd/lang/fr-FR.rc +++ b/base/shell/cmd/lang/fr-FR.rc @@ -456,7 +456,7 @@ listing of credits." the Free Software Foundation; either version 2 of the License, or\n\ (at your option) any later version.\n" STRING_VERSION_HELP5 "\nEnvoyer les rapports d'erreur à <ros-dev(a)reactos.org>.\n\ -Les mises à jour sont disponibles à : http://www.reactos.org" +Les mises à jour sont disponibles à : https://reactos.org" STRING_VERSION_HELP6 "\nVersion FreeDOS écrite par:\n" STRING_VERSION_HELP7 "\nVersion ReactOS écrite par:\n" STRING_VOL_HELP1 " Le nom de volume du lecteur %c est %s\n" diff --git a/base/shell/cmd/lang/hu-HU.rc b/base/shell/cmd/lang/hu-HU.rc index fbcbab44545..a6b32acd36f 100644 --- a/base/shell/cmd/lang/hu-HU.rc +++ b/base/shell/cmd/lang/hu-HU.rc @@ -432,7 +432,7 @@ Gépelje be a `ver /c'-t a készítők listájáért." ahogy a Free Software Foundation közölte; akár a Licenc 2-es\n\ verziója, akár (választása alapján) bármely későbbi verzió szerint.\n" STRING_VERSION_HELP5 "\nHibákról e-maileket ide küldhet: <ros-dev(a)reactos.org>.\n\ -Frissítések és egyéb információk: http://www.reactos.org" +Frissítések és egyéb információk: https://reactos.org" STRING_VERSION_HELP6 "\nA FreeDOS verzió készítői:\n" STRING_VERSION_HELP7 "\nA ReactOS verzió készítői:\n" STRING_VOL_HELP1 " A %c meghajtóban lévő kötet: %s\n" diff --git a/base/shell/cmd/lang/id-ID.rc b/base/shell/cmd/lang/id-ID.rc index 8f12beb3526..f5fa43576f3 100644 --- a/base/shell/cmd/lang/id-ID.rc +++ b/base/shell/cmd/lang/id-ID.rc @@ -439,7 +439,7 @@ untuk daftar penghargaan." STRING_VERSION_HELP4 "\n Program ini adalah software bebas; anda dapat mendistribusikan dan/atau\n\ mengubahnya di bawah ketentuan lisensi GNU General Public License sebagaimana dipublikasikan oleh Free Software Foundation; baik Lisensi versi 2, atau (menurut opini anda) setiap versi berikutnya.\n" STRING_VERSION_HELP5 "\nKirim laporan bug ke <ros-dev(a)reactos.org>.\n\ -Pemutakiran tersedia di: http://www.reactos.org" +Pemutakiran tersedia di: https://reactos.org" STRING_VERSION_HELP6 "\nVersi FreeDOS ditulis oleh:\n" STRING_VERSION_HELP7 "\nVersi ReactOS ditulis oleh:\n" STRING_VOL_HELP1 " Volume dalam drive %c adalah %s\n" diff --git a/base/shell/cmd/lang/it-IT.rc b/base/shell/cmd/lang/it-IT.rc index 5c2bf7f94af..6451daaea96 100644 --- a/base/shell/cmd/lang/it-IT.rc +++ b/base/shell/cmd/lang/it-IT.rc @@ -448,7 +448,7 @@ elenco dei crediti." Free Software Foundation; a scelta la versione 2 della licenza o una\n\ qualunque successiva.\n" STRING_VERSION_HELP5 "\nInviare le segnalazioni di anomalie a <ros-dev(a)reactos.org>.\n\ -Gli aggiornamenti sono disponibili presso: http://www.reactos.org" +Gli aggiornamenti sono disponibili presso: https://reactos.org" STRING_VERSION_HELP6 "\nVersione FreeDOS scritto da:\n" STRING_VERSION_HELP7 "\nVersione ReactOS scritto da:\n" STRING_VOL_HELP1 " Il Volume del disco %c è %s\n" diff --git a/base/shell/cmd/lang/ja-JP.rc b/base/shell/cmd/lang/ja-JP.rc index e5e4d3f6d1e..b74faf98385 100644 --- a/base/shell/cmd/lang/ja-JP.rc +++ b/base/shell/cmd/lang/ja-JP.rc @@ -447,7 +447,7 @@ VER [/C][/R][/W]\n\n\ 希望によってはそれ以降のバージョンのうちどれか) の定める条件の下で再頒\n\ 布または改変することができます。\n" STRING_VERSION_HELP5 "\nバグ報告は <ros-dev(a)reactos.org> へ送ってください。\n\ -最新のバージョンは次のページから入手できます: http://www.reactos.org" +最新のバージョンは次のページから入手できます: https://reactos.org" STRING_VERSION_HELP6 "\nFreeDOS version written by:\n" STRING_VERSION_HELP7 "\nReactOS version written by:\n" STRING_VOL_HELP1 " ドライブ %c: のボリュームラベルは %s です。\n" diff --git a/base/shell/cmd/lang/no-NO.rc b/base/shell/cmd/lang/no-NO.rc index c53f699e39e..d63aa0ebaca 100644 --- a/base/shell/cmd/lang/no-NO.rc +++ b/base/shell/cmd/lang/no-NO.rc @@ -438,7 +438,7 @@ liste av anerkjennelser." Lisens som utgivelses av Free Software Foundation; enten versjon 2 av\n\ Lisens, eller (ved din mulighet) andre nyere versjon.\n" STRING_VERSION_HELP5 "\nSend bug rapporter til <ros-dev(a)reactos.org>.\n\ -oppdateringer er tilgjengelig her: http://www.reactos.org" +oppdateringer er tilgjengelig her: https://reactos.org" STRING_VERSION_HELP6 "\nFreeDOS versjon skrevet av:\n" STRING_VERSION_HELP7 "\nReactOS versjon skrevet av:\n" STRING_VOL_HELP1 " Volumet i stasjon %c er %s\n" diff --git a/base/shell/cmd/lang/pl-PL.rc b/base/shell/cmd/lang/pl-PL.rc index 3105667e526..e19b7841ca9 100644 --- a/base/shell/cmd/lang/pl-PL.rc +++ b/base/shell/cmd/lang/pl-PL.rc @@ -2,7 +2,7 @@ * Translated by Caemyr - Olaf Siejka (Jan, 2008) * Updated by niski - Maciej Bialas (Mar, 2010) * Use ReactOS forum PM or IRC to contact me - * http://www.reactos.org + * https://reactos.org * IRC: irc.freenode.net #reactos-pl; * UTF-8 conversion by Caemyr (May, 2011) * Updated by pithwz - Piotr Hetnarowicz (piotrhwz(a)gmail.com) (April, 2020) @@ -445,7 +445,7 @@ parametrem: `ver /c'." o ile nie naruszasz warunków GNU General Public License, w formie opublikowanej\n\ przez Free Software Foundation; wersja 2 albo dowolna późniejsza.\n" STRING_VERSION_HELP5 "\nRaporty o błędach prosimy przesyłać pod adres: <ros-dev(a)reactos.org>.\n\ -Uaktualnienia dostępne na stronie: http://www.reactos.org" +Uaktualnienia dostępne na stronie: https://reactos.org" STRING_VERSION_HELP6 "\nwersja FreeDOS, napisana przez:\n" STRING_VERSION_HELP7 "\nwersja ReactOS, napisana przez:\n" STRING_VOL_HELP1 " Wolumin w napędzie %c ma etykietę: %s" diff --git a/base/shell/cmd/lang/pt-PT.rc b/base/shell/cmd/lang/pt-PT.rc index 91377ab6926..5726a6f33cc 100644 --- a/base/shell/cmd/lang/pt-PT.rc +++ b/base/shell/cmd/lang/pt-PT.rc @@ -461,7 +461,7 @@ lista de créditos. " Fundação para o Software Livre; a versão 2 da Licença ou\n\ (à sua escolha) qualquer versão posterior.\n" STRING_VERSION_HELP5 "\nEnvie relatórios de bug para <ros-dev(a)reactos.org>.\n\ -As actualizações estão disponíveis em: http://www.reactos.org" +As actualizações estão disponíveis em: https://reactos.org" STRING_VERSION_HELP6 "\nVersão do FreeDOS escrita por:\n" STRING_VERSION_HELP7 "\nReactOS versão escrita por:\n" STRING_VOL_HELP1 "O volume na unidade %c é %s\n" diff --git a/base/shell/cmd/lang/ro-RO.rc b/base/shell/cmd/lang/ro-RO.rc index 39536e6a1ad..12b282417b0 100644 --- a/base/shell/cmd/lang/ro-RO.rc +++ b/base/shell/cmd/lang/ro-RO.rc @@ -473,7 +473,7 @@ pentru lista de autori." de Free Software Foundation; fie în termenii versiunii 2 a Licenței, sau (la\n\ alegerea dumneavoastră) ai unei versiuni ulterioare.\n" STRING_VERSION_HELP5 "\nRaportați defectele la <ros-dev(a)reactos.org>.\n\ -Eventuale actualizări pot fi găsite la: http://www.reactos.org" +Eventuale actualizări pot fi găsite la: https://reactos.org" STRING_VERSION_HELP6 "\nVersiunea FreeDOS a fost scrisă de:\n" STRING_VERSION_HELP7 "\nVersiunea ReactOS a fost scrisă de:\n" STRING_VOL_HELP1 " Volumul unității %c este etichetat ca %s\n" diff --git a/base/shell/cmd/lang/ru-RU.rc b/base/shell/cmd/lang/ru-RU.rc index f6f3d114452..48f007feb57 100644 --- a/base/shell/cmd/lang/ru-RU.rc +++ b/base/shell/cmd/lang/ru-RU.rc @@ -457,7 +457,7 @@ GNU General Public License для получения дополнительно организацией Free Software Foundation, версии 2 или\n\ (по вашему выбору) любой более поздней версии.\n" STRING_VERSION_HELP5 "\nПосылайте отчеты об ошибках на <ros-dev(a)reactos.org>.\n\ -Обновления доступны по адресу: http://www.reactos.org" +Обновления доступны по адресу: https://reactos.org" STRING_VERSION_HELP6 "\nFreeDOS версия написана:\n" STRING_VERSION_HELP7 "\nReactOS версия написана:\n" STRING_VOL_HELP1 " Том в устройстве %c имеет метку %s\n" diff --git a/base/shell/cmd/lang/sk-SK.rc b/base/shell/cmd/lang/sk-SK.rc index 8d872f717e7..261b8cde527 100644 --- a/base/shell/cmd/lang/sk-SK.rc +++ b/base/shell/cmd/lang/sk-SK.rc @@ -446,7 +446,7 @@ listing of credits." the Free Software Foundation; either version 2 of the License, or\n\ (at your option) any later version.\n" STRING_VERSION_HELP5 "\nHlásenia o chybách zasielajte na <ros-dev(a)reactos.org>.\n\ -Aktualizácie sú dostupné na: http://www.reactos.org" +Aktualizácie sú dostupné na: https://reactos.org" STRING_VERSION_HELP6 "\nFreeDOS version written by:\n" STRING_VERSION_HELP7 "\nReactOS version written by:\n" STRING_VOL_HELP1 " Volume in drive %c is %s\n" diff --git a/base/shell/cmd/lang/sq-AL.rc b/base/shell/cmd/lang/sq-AL.rc index a39fae42a16..70c523c5867 100644 --- a/base/shell/cmd/lang/sq-AL.rc +++ b/base/shell/cmd/lang/sq-AL.rc @@ -444,7 +444,7 @@ por PA ASNJË GARANCI; madje edhe pa garancinë e shprehur të\n\ Free Software Foundation; ose version 2 të Liçenses, ose\n\ (në opsionin tuaj) çfarëdo versioni të mëvonshëm.\n" STRING_VERSION_HELP5 "\nDërgo raportime të metash në<ros-dev(a)reactos.org>.\n\ -Updates janë në dispozicion në: http://www.reactos.org" +Updates janë në dispozicion në: https://reactos.org" STRING_VERSION_HELP6 "\nVersion FreeDOS shkruar nga:\n" STRING_VERSION_HELP7 "\nVersion FreeDOS shkruar nga:\n" STRING_VOL_HELP1 " Volumi është drive %c është %s\n" diff --git a/base/shell/cmd/lang/sv-SE.rc b/base/shell/cmd/lang/sv-SE.rc index f9e961ccbb7..ba10b6c944d 100644 --- a/base/shell/cmd/lang/sv-SE.rc +++ b/base/shell/cmd/lang/sv-SE.rc @@ -438,7 +438,7 @@ liste av anerkjennelser." Lisens som utgivelses av Free Software Foundation; enten version 2 av\n\ Lisens, eller (ved din mulighet) andre nyere version.\n" STRING_VERSION_HELP5 "\nSend bug rapporter till <ros-dev(a)reactos.org>.\n\ -oppdateringer är tilgjengelig her: http://www.reactos.org" +oppdateringer är tilgjengelig her: https://reactos.org" STRING_VERSION_HELP6 "\nFreeDOS version skruvet av:\n" STRING_VERSION_HELP7 "\nReactOS version skrivet av:\n" STRING_VOL_HELP1 " Volymen i enhet %c är %s\n" diff --git a/base/shell/cmd/lang/tr-TR.rc b/base/shell/cmd/lang/tr-TR.rc index 85b5029c4bd..2f86c3646d4 100644 --- a/base/shell/cmd/lang/tr-TR.rc +++ b/base/shell/cmd/lang/tr-TR.rc @@ -433,7 +433,7 @@ yayınlanan GNU Genel Kamu Lisansı'nın 2. sürümü ya da (sizin tercihinize g bir sürüm altında olmak kaydı ile, lisansın size sağladığı koşullar altında yeniden dağıtabilir ve\n\ / veya değiştirebilirsiniz;\n" STRING_VERSION_HELP5 "\nHata raporlarını <jira.reactos.org> e-posta adresine bildirin.\n\ -Güncellemeleri takip etmek için: http://www.reactos.org" +Güncellemeleri takip etmek için: https://reactos.org" STRING_VERSION_HELP6 "\nFreeDOS sürümü şu kişi tarafından yazılmıştır:\n" STRING_VERSION_HELP7 "\nReactOS sürümü şu kişi tarafından yazılmıştır:\n" STRING_VOL_HELP1 " %c sürücüsündeki birim %s'dir\n" diff --git a/base/shell/cmd/lang/uk-UA.rc b/base/shell/cmd/lang/uk-UA.rc index 7e8accb8b15..4dbd88aa831 100644 --- a/base/shell/cmd/lang/uk-UA.rc +++ b/base/shell/cmd/lang/uk-UA.rc @@ -450,7 +450,7 @@ VER [/C][/R][/W]\n\n\ Free Software Foundation; версiї 2 Лiцензiї, чи\n\ (на ваш вибiр) будь-якої новiшої версiї.\n" STRING_VERSION_HELP5 "\nВiдсилайте звiти про помилки на <ros-dev(a)reactos.org>.\n\ -Оновлення доступнi на: http://www.reactos.org" +Оновлення доступнi на: https://reactos.org" STRING_VERSION_HELP6 "\nFreeDOS-версiя написана:\n" STRING_VERSION_HELP7 "\nReactOS-версiя написана:\n" STRING_VOL_HELP1 " Том в пристрої %c має мiтку %s\n" diff --git a/base/shell/cmd/lang/zh-CN.rc b/base/shell/cmd/lang/zh-CN.rc index e2000aa5428..e51d6d41d5a 100644 --- a/base/shell/cmd/lang/zh-CN.rc +++ b/base/shell/cmd/lang/zh-CN.rc @@ -413,7 +413,7 @@ VER [/C][/R][/W]\n\n\ 第二版（如果您自己愿意，也可以是任何一个新的版本）规定的条款下自由地\n\ 传播和/或修改本软件。\n" STRING_VERSION_HELP5 "\nBug 报告发送到 <ros-dev(a)reactos.org>。\n\ -更新可在 http://www.reactos.org 查看。" +更新可在 https://reactos.org 查看。" STRING_VERSION_HELP6 "\nFreeDOS 版本作者：\n" STRING_VERSION_HELP7 "\nReactOS 版本作者：\n" STRING_VOL_HELP1 " 驱动器 %c 中的卷是 %s\n" diff --git a/base/shell/cmd/lang/zh-TW.rc b/base/shell/cmd/lang/zh-TW.rc index 6a87b5e8e35..b4447a8b6f2 100644 --- a/base/shell/cmd/lang/zh-TW.rc +++ b/base/shell/cmd/lang/zh-TW.rc @@ -417,7 +417,7 @@ listing of credits." the Free Software Foundation; either version 2 of the License, or\n\ (at your option) any later version.\n" STRING_VERSION_HELP5 "\nBug 報告發送到 <ros-dev(a)reactos.org>。\n\ -更新可在 http://www.reactos.org 檢視。" +更新可在 https://reactos.org 檢視。" STRING_VERSION_HELP6 "\nFreeDOS 版本作者：\n" STRING_VERSION_HELP7 "\nReactOS 版本作者：\n" STRING_VOL_HELP1 " 磁碟機 %c 中的磁碟區標籤是 %s\n" diff --git a/base/system/runonce/lang/pl-PL.rc b/base/system/runonce/lang/pl-PL.rc index d9f040d4e1c..34d0114fbc7 100644 --- a/base/system/runonce/lang/pl-PL.rc +++ b/base/system/runonce/lang/pl-PL.rc @@ -1,7 +1,7 @@ /* * Translated by Caemyr - Olaf Siejka (May, 2011) * Use ReactOS forum PM or IRC to contact me - * http://www.reactos.org + * https://reactos.org * IRC: irc.freenode.net #reactos-pl; * UTF-8 conversion by Caemyr (May, 2011) */ diff --git a/base/system/subst/lang/pl-PL.rc b/base/system/subst/lang/pl-PL.rc index b4a1ec7c065..7d149d69dc0 100644 --- a/base/system/subst/lang/pl-PL.rc +++ b/base/system/subst/lang/pl-PL.rc @@ -1,7 +1,7 @@ /* * Translated by Caemyr - Olaf Siejka (May, 2011) * Use ReactOS forum PM or IRC to contact me - * http://www.reactos.org + * https://reactos.org * IRC: irc.freenode.net #reactos-pl; * UTF-8 conversion by Caemyr (May, 2011) */ diff --git a/dll/cpl/appwiz/lang/pl-PL.rc b/dll/cpl/appwiz/lang/pl-PL.rc index 15a153f24f7..8cbb5f3a136 100644 --- a/dll/cpl/appwiz/lang/pl-PL.rc +++ b/dll/cpl/appwiz/lang/pl-PL.rc @@ -1,7 +1,7 @@ /* * translated by Caemyr - Olaf Siejka (Jan, 2008) * Use ReactOS forum PM or IRC to contact me - * http://www.reactos.org + * https://reactos.org * IRC: irc.freenode.net #reactos-pl; * UTF-8 conversion by Caemyr (May, 2011) * Updated by Saibamen - Adam Stachowicz (saibamenppl(a)gmail.com) (April, 2014) diff --git a/dll/cpl/intl/lang/pl-PL.rc b/dll/cpl/intl/lang/pl-PL.rc index 971b5daf414..1d97b5628c2 100644 --- a/dll/cpl/intl/lang/pl-PL.rc +++ b/dll/cpl/intl/lang/pl-PL.rc @@ -1,7 +1,7 @@ /* * Translated by Caemyr - Olaf Siejka (Jan, 2008; May 2010) * Use ReactOS forum PM or IRC to contact me - * http://www.reactos.org + * https://reactos.org * IRC: irc.freenode.net #reactos-pl; * UTF-8 conversion by Caemyr (May, 2011) * Polish translation updated by pithwz - Piotr Hetnarowicz (piotrhwz(a)gmail.com) (May, 2020) diff --git a/dll/cpl/joy/lang/pl-PL.rc b/dll/cpl/joy/lang/pl-PL.rc index 1fa957727e8..53ed8965fa1 100644 --- a/dll/cpl/joy/lang/pl-PL.rc +++ b/dll/cpl/joy/lang/pl-PL.rc @@ -1,7 +1,7 @@ /* * Translated by Caemyr - Olaf Siejka (Jan, 2008) * Use ReactOS forum PM or IRC to contact me - * http://www.reactos.org + * https://reactos.org * IRC: irc.freenode.net #reactos-pl; * UTF-8 conversion by Caemyr (May, 2011) */ diff --git a/dll/cpl/liccpa/lang/ro-RO.rc b/dll/cpl/liccpa/lang/ro-RO.rc index 6b56b15b94b..b11cf106bdf 100644 --- a/dll/cpl/liccpa/lang/ro-RO.rc +++ b/dll/cpl/liccpa/lang/ro-RO.rc @@ -1,6 +1,6 @@ /* * FILE: dll/cpl/liccpa/lang/ro-RO.rc - * ReactOS Project (http://www.reactos.org) + * ReactOS Project (https://reactos.org) * TRANSLATOR: Ștefan Fulea (stefan dot fulea at mail dot com) */ diff --git a/dll/cpl/mmsys/lang/pl-PL.rc b/dll/cpl/mmsys/lang/pl-PL.rc index 36cb6385520..ff11e0a8c33 100644 --- a/dll/cpl/mmsys/lang/pl-PL.rc +++ b/dll/cpl/mmsys/lang/pl-PL.rc @@ -1,7 +1,7 @@ /* * Translated by Caemyr - Olaf Siejka (Jan-Feb, 2008) * Use ReactOS forum PM or IRC to contact me - * http://www.reactos.org + * https://reactos.org * IRC: irc.freenode.net #reactos-pl; * * IDS_CPLNAME and IDS_CPLDESCRIPTION translated by xrogers diff --git a/dll/cpl/telephon/lang/pl-PL.rc b/dll/cpl/telephon/lang/pl-PL.rc index 0033f3f5a90..b7727fd0f10 100644 --- a/dll/cpl/telephon/lang/pl-PL.rc +++ b/dll/cpl/telephon/lang/pl-PL.rc @@ -1,7 +1,7 @@ /* * Translated by Caemyr - Olaf Siejka (Jan, 2008) * Use ReactOS forum PM or IRC to contact me - * http://www.reactos.org + * https://reactos.org * IRC: irc.freenode.net #reactos-pl; * UTF-8 conversion by Caemyr (May, 2011) */ diff --git a/dll/cpl/usrmgr/lang/pl-PL.rc b/dll/cpl/usrmgr/lang/pl-PL.rc index eeef360f441..a7efa7a90c1 100644 --- a/dll/cpl/usrmgr/lang/pl-PL.rc +++ b/dll/cpl/usrmgr/lang/pl-PL.rc @@ -2,7 +2,7 @@ * Translated by Caemyr - Olaf Siejka (Jun, 2008) * Updated by Saibamen - Adam Stachowicz (Jul, 2008) * Use ReactOS forum PM or IRC to contact me - * http://www.reactos.org + * https://reactos.org * IRC: irc.freenode.net #reactos-pl * UTF-8 conversion by Caemyr (May, 2011) * Updated by Saibamen - Adam Stachowicz (saibamenppl(a)gmail.com) (April, 2014) diff --git a/dll/cpl/wined3dcfg/lang/pl-PL.rc b/dll/cpl/wined3dcfg/lang/pl-PL.rc index 39cfb92796c..2e896cda6a6 100644 --- a/dll/cpl/wined3dcfg/lang/pl-PL.rc +++ b/dll/cpl/wined3dcfg/lang/pl-PL.rc @@ -1,6 +1,6 @@ /* * Translated by Caemyr - Olaf Siejka (Mar 2012) - * http://www.reactos.org + * https://reactos.org * IRC: irc.freenode.net #reactos-pl; * Updated by Saibamen and wojo664 (May 2014) */ diff --git a/dll/shellext/deskadp/lang/pl-PL.rc b/dll/shellext/deskadp/lang/pl-PL.rc index 12e9a86c408..72761253285 100644 --- a/dll/shellext/deskadp/lang/pl-PL.rc +++ b/dll/shellext/deskadp/lang/pl-PL.rc @@ -2,7 +2,7 @@ * Translated by Caemyr - Olaf Siejka (Jan, 2008) * Updated by Piotr Hetnarowicz <piotrhwz(a)gmail.com> (March, 2021) * Use ReactOS forum PM or IRC to contact me - * http://www.reactos.org + * https://reactos.org * IRC: irc.freenode.net #reactos-pl; * UTF-8 conversion by Caemyr (May, 2011) */ diff --git a/dll/shellext/deskmon/lang/pl-PL.rc b/dll/shellext/deskmon/lang/pl-PL.rc index c6c14a26e59..31b35e16699 100644 --- a/dll/shellext/deskmon/lang/pl-PL.rc +++ b/dll/shellext/deskmon/lang/pl-PL.rc @@ -1,7 +1,7 @@ /* * Translated by Caemyr - Olaf Siejka (Jan, 2008) * Use ReactOS forum PM or IRC to contact me - * http://www.reactos.org + * https://reactos.org * IRC: irc.freenode.net #reactos-pl; * UTF-8 conversion by Caemyr (May, 2011) */ diff --git a/dll/shellext/deskmon/lang/ro-RO.rc b/dll/shellext/deskmon/lang/ro-RO.rc index a8714b17e65..e9bac4cca16 100644 --- a/dll/shellext/deskmon/lang/ro-RO.rc +++ b/dll/shellext/deskmon/lang/ro-RO.rc @@ -1,6 +1,6 @@ /* * FILE: dll/shellext/deskmon/lang/ro-RO.rc - * ReactOS Project (http://www.reactos.org) + * ReactOS Project (https://reactos.org) * TRANSLATOR: Fulea Ștefan (PM on ReactOS Forum to fulea.stefan) * CHANGE LOG: 2011-09-02 initial translation */ diff --git a/dll/win32/aclui/lang/ro-RO.rc b/dll/win32/aclui/lang/ro-RO.rc index 369eb6f95c1..8c870c933e0 100644 --- a/dll/win32/aclui/lang/ro-RO.rc +++ b/dll/win32/aclui/lang/ro-RO.rc @@ -1,6 +1,6 @@ /* * FILE: dll/win32/aclui/lang/to-RO.rc - * ReactOS Project (http://www.reactos.org) + * ReactOS Project (https://reactos.org) * TRANSLATOR: Fulea Ștefan (PM on ReactOS Forum to fulea.stefan) * CHANGE LOG: 2011-09-03 initial translation */ diff --git a/dll/win32/browseui/lang/pl-PL.rc b/dll/win32/browseui/lang/pl-PL.rc index d6c62bf13c1..f7b671858ce 100644 --- a/dll/win32/browseui/lang/pl-PL.rc +++ b/dll/win32/browseui/lang/pl-PL.rc @@ -1,7 +1,7 @@ /* * Translated by Caemyr - Olaf Siejka (May, 2011) * Use ReactOS forum PM or IRC to contact me - * http://www.reactos.org + * https://reactos.org * IRC: irc.freenode.net #reactos-pl; * UTF-8 conversion by Caemyr (May, 2011) * Polish translation updated by pithwz - Piotr Hetnarowicz (piotrhwz(a)gmail.com) (May, 2021) diff --git a/dll/win32/modemui/lang/pl-PL.rc b/dll/win32/modemui/lang/pl-PL.rc index a41645b2b73..d5801e7fd0b 100644 --- a/dll/win32/modemui/lang/pl-PL.rc +++ b/dll/win32/modemui/lang/pl-PL.rc @@ -1,7 +1,7 @@ /* * Translated by Caemyr - Olaf Siejka (Jan, 2008) * Use ReactOS forum PM or IRC to contact me - * http://www.reactos.org + * https://reactos.org * IRC: irc.freenode.net #reactos-pl; * UTF-8 conversion by Caemyr (May, 2011) */ diff --git a/dll/win32/msports/lang/pl-PL.rc b/dll/win32/msports/lang/pl-PL.rc index 6bc044744ab..bd79d7a4ae3 100644 --- a/dll/win32/msports/lang/pl-PL.rc +++ b/dll/win32/msports/lang/pl-PL.rc @@ -1,7 +1,7 @@ /* * Translated by Caemyr - Olaf Siejka (May, 2011) * Use ReactOS forum PM or IRC to contact me - * http://www.reactos.org + * https://reactos.org * IRC: irc.freenode.net #reactos-pl; * UTF-8 conversion by Caemyr (May, 2011) */ diff --git a/dll/win32/msports/lang/ro-RO.rc b/dll/win32/msports/lang/ro-RO.rc index 6521ae522ff..dab89b297a5 100644 --- a/dll/win32/msports/lang/ro-RO.rc +++ b/dll/win32/msports/lang/ro-RO.rc @@ -1,6 +1,6 @@ /* * FILE: dll/win32/msports/lang/ro-RO.rc - * ReactOS Project (http://www.reactos.org) + * ReactOS Project (https://reactos.org) * TRANSLATOR: Ștefan Fulea (stefan dot fulea at mail dot com) */ diff --git a/dll/win32/netcfgx/lang/ro-RO.rc b/dll/win32/netcfgx/lang/ro-RO.rc index ccdbcf2dd2a..a92b4ea12dc 100644 --- a/dll/win32/netcfgx/lang/ro-RO.rc +++ b/dll/win32/netcfgx/lang/ro-RO.rc @@ -1,6 +1,6 @@ /* * FILE: dll/win32/netcfgx/lang/ro-RO.rc - * ReactOS Project (http://www.reactos.org) + * ReactOS Project (https://reactos.org) * TRANSLATOR: Ștefan Fulea (stefan dot fulea at mail dot com) */ diff --git a/dll/win32/netid/lang/ro-RO.rc b/dll/win32/netid/lang/ro-RO.rc index 418e1cb0d79..dd835f717a3 100644 --- a/dll/win32/netid/lang/ro-RO.rc +++ b/dll/win32/netid/lang/ro-RO.rc @@ -1,6 +1,6 @@ /* * FILE: dll/win32/netid/lang/ro-RO.rc - * ReactOS Project (http://www.reactos.org) + * ReactOS Project (https://reactos.org) * TRANSLATOR: Ștefan Fulea (stefan dot fulea at mail dot com) */ diff --git a/dll/win32/rasdlg/lang/pl-PL.rc b/dll/win32/rasdlg/lang/pl-PL.rc index 2c499d44c0d..94f84ec966b 100644 --- a/dll/win32/rasdlg/lang/pl-PL.rc +++ b/dll/win32/rasdlg/lang/pl-PL.rc @@ -1,7 +1,7 @@ /* * Translated by Caemyr - Olaf Siejka (Jan, 2008) * Use ReactOS forum PM or IRC to contact me - * http://www.reactos.org + * https://reactos.org * IRC: irc.freenode.net #reactos-pl; * UTF-8 conversion by Caemyr (May, 2011) */ diff --git a/dll/win32/rasdlg/lang/ro-RO.rc b/dll/win32/rasdlg/lang/ro-RO.rc index 95d331f7c45..35915d8f311 100644 --- a/dll/win32/rasdlg/lang/ro-RO.rc +++ b/dll/win32/rasdlg/lang/ro-RO.rc @@ -1,6 +1,6 @@ /* * FILE: dll/win32/rasdlg/lang/ro-RO.rc - * ReactOS Project (http://www.reactos.org) + * ReactOS Project (https://reactos.org) * TRANSLATOR: Ștefan Fulea (stefan dot fulea at mail dot com) */ diff --git a/dll/win32/serialui/lang/pl-PL.rc b/dll/win32/serialui/lang/pl-PL.rc index 6134549f366..ad90486da56 100644 --- a/dll/win32/serialui/lang/pl-PL.rc +++ b/dll/win32/serialui/lang/pl-PL.rc @@ -1,7 +1,7 @@ /* * Translated by Caemyr - Olaf Siejka * Use ReactOS forum PM or IRC to contact me - * http://www.reactos.org + * https://reactos.org * IRC: irc.freenode.net #reactos-pl; * UTF-8 conversion by Caemyr (May, 2011) */ diff --git a/dll/win32/serialui/lang/ro-RO.rc b/dll/win32/serialui/lang/ro-RO.rc index 7db39079f81..e586ee3ea52 100644 --- a/dll/win32/serialui/lang/ro-RO.rc +++ b/dll/win32/serialui/lang/ro-RO.rc @@ -1,6 +1,6 @@ /* * FILE: dll/win32/serialui/lang/ro-RO.rc - * ReactOS Project (http://www.reactos.org) + * ReactOS Project (https://reactos.org) * TRANSLATOR: Fulea Ștefan (PM on ReactOS Forum to fulea.stefan) * CHANGE LOG: 2011-10-10 initial translation */ diff --git a/dll/win32/shimgvw/lang/ro-RO.rc b/dll/win32/shimgvw/lang/ro-RO.rc index c3f69452304..e5f05f12258 100644 --- a/dll/win32/shimgvw/lang/ro-RO.rc +++ b/dll/win32/shimgvw/lang/ro-RO.rc @@ -1,6 +1,6 @@ /* * FILE: dll/win32/shimgvw/lang/ro-RO.rc - * ReactOS Project (http://www.reactos.org) + * ReactOS Project (https://reactos.org) * TRANSLATOR: Fulea Ștefan (PM on ReactOS Forum to fulea.stefan) * LAST CHANGE: 2011-12-17 small correction */ diff --git a/dll/win32/tapiui/lang/pl-PL.rc b/dll/win32/tapiui/lang/pl-PL.rc index ce2a20f577e..12ae8961a0b 100644 --- a/dll/win32/tapiui/lang/pl-PL.rc +++ b/dll/win32/tapiui/lang/pl-PL.rc @@ -1,7 +1,7 @@ /* * Translated by Caemyr - Olaf Siejka (Jan, 2008) * Use ReactOS forum PM or IRC to contact me - * http://www.reactos.org + * https://reactos.org * IRC: irc.freenode.net #reactos-pl; * UTF-8 conversion by Caemyr (May, 2011) * Updated by pithwz - Piotr Hetnarowicz (piotrhwz(a)gmail.com) (April, 2020) diff --git a/dll/win32/tapiui/lang/ro-RO.rc b/dll/win32/tapiui/lang/ro-RO.rc index 649727ee706..a7f00d4ade3 100644 --- a/dll/win32/tapiui/lang/ro-RO.rc +++ b/dll/win32/tapiui/lang/ro-RO.rc @@ -1,6 +1,6 @@ /* * FILE: dll/win32/tapiui/lang/ro-RO.rc - * ReactOS Project (http://www.reactos.org) + * ReactOS Project (https://reactos.org) * TRANSLATOR: Ștefan Fulea (stefan dot fulea at mail dot com) */ diff --git a/dll/win32/userenv/lang/ro-RO.rc b/dll/win32/userenv/lang/ro-RO.rc index 99ae7f7f1f5..1a72d9ce54c 100644 --- a/dll/win32/userenv/lang/ro-RO.rc +++ b/dll/win32/userenv/lang/ro-RO.rc @@ -1,6 +1,6 @@ /* * FILE: dll/win32/userenv/lang/ro-RO.rc - * ReactOS Project (http://www.reactos.org) + * ReactOS Project (https://reactos.org) * TRANSLATOR: Ștefan Fulea (stefan dot fulea at mail dot com) */ diff --git a/drivers/storage/ide/uniata/id_init.cpp b/drivers/storage/ide/uniata/id_init.cpp index 0ca074d0cc8..243f35f1eea 100644 --- a/drivers/storage/ide/uniata/id_init.cpp +++ b/drivers/storage/ide/uniata/id_init.cpp @@ -31,7 +31,7 @@ Notes: Revision History: Some parts of code were taken from FreeBSD 5.1-6.1 ATA driver by - S�ren Schmidt, Copyright (c) 1998-2007 + Søren Schmidt, Copyright (c) 1998-2007 added IT8172 IDE controller support from Linux added VIA 8233/8235 fix from Linux added 80-pin cable detection from Linux for @@ -2555,7 +2555,7 @@ AtapiChipInit( * size goes below 32DW. Setting it to 1 makes the watermark * 64DW. * - * http://www.reactos.org/bugzilla/show_bug.cgi?id=6500 + * https://jira.reactos.org/browse/CORE-5897 */ if(DeviceID == 0x3149 || DeviceID == 0x3249) { //vt6420 or vt6421 diff --git a/media/doc/HACKING b/media/doc/HACKING index 9461872a44a..9e1806c8b7a 100644 --- a/media/doc/HACKING +++ b/media/doc/HACKING @@ -27,7 +27,7 @@ questions, * Style There is a coding style used for ReactOS, it's described in a ReactOS's Wiki -page called Coding Style: http://www.reactos.org/wiki/index.php/Coding_Style +page called Coding Style: https://reactos.org/wiki/index.php/Coding_Style However, not all codebase complies with the rules outlined in that page, so if you need to hack some code which has not been yet formatted, it's wise diff --git a/media/fonts/doc/UniVGA/README.txt b/media/fonts/doc/UniVGA/README.txt index 0179600f655..4cca79ad2d7 100644 --- a/media/fonts/doc/UniVGA/README.txt +++ b/media/fonts/doc/UniVGA/README.txt @@ -18,8 +18,8 @@ Thanks to Birger Langkjer for idea, to Mark Leisher for his wonderful XmBDFEd, a Adapted version, converted to TTF, by Roy Tam -See http://www.reactos.org/forum/viewtopic.php?f=2&t=12930#p105065 -and http://www.reactos.org/forum/viewtopic.php?f=2&t=12930&start=15#p105307 +See https://reactos.org/forum/viewtopic.php?f=2&t=12930#p105065 +and https://reactos.org/forum/viewtopic.php?f=2&t=12930&start=15#p105307 for more information. Unicode VGA font - Medium size 16px (UniVGA16.ttf) diff --git a/modules/rosapps/applications/explorer-old/shell/mainframe.cpp b/modules/rosapps/applications/explorer-old/shell/mainframe.cpp index 6cda867b928..d1d5e7c0332 100644 --- a/modules/rosapps/applications/explorer-old/shell/mainframe.cpp +++ b/modules/rosapps/applications/explorer-old/shell/mainframe.cpp @@ -1150,7 +1150,7 @@ int MDIMainFrame::Command(int id, int code) #ifdef _DEBUG create_webchildwindow(WebChildWndInfo(_hmdiclient, TEXT("http://localhost"))); #else - create_webchildwindow(WebChildWndInfo(_hmdiclient, TEXT("http://www.reactos.org"))); + create_webchildwindow(WebChildWndInfo(_hmdiclient, TEXT("https://reactos.org"))); #endif break; diff --git a/modules/rosapps/applications/screensavers/blankscr/lang/pl-PL.rc b/modules/rosapps/applications/screensavers/blankscr/lang/pl-PL.rc index 5a4e19d27f6..88ff617fb50 100644 --- a/modules/rosapps/applications/screensavers/blankscr/lang/pl-PL.rc +++ b/modules/rosapps/applications/screensavers/blankscr/lang/pl-PL.rc @@ -1,7 +1,7 @@ /* * translated by Caemyr - Olaf Siejka (Feb, 2008) * Use ReactOS forum PM or IRC to contact me - * http://www.reactos.org + * https://reactos.org * IRC: irc.freenode.net #reactos-pl; */ diff --git a/modules/rosapps/applications/screensavers/butterflies/lang/pl-PL.rc b/modules/rosapps/applications/screensavers/butterflies/lang/pl-PL.rc index 0a21ddeb6c0..0d5eb4213e3 100644 --- a/modules/rosapps/applications/screensavers/butterflies/lang/pl-PL.rc +++ b/modules/rosapps/applications/screensavers/butterflies/lang/pl-PL.rc @@ -1,7 +1,7 @@ /* * translated by Caemyr - Olaf Siejka (Feb, 2008) * Use ReactOS forum PM or IRC to contact me - * http://www.reactos.org + * https://reactos.org * IRC: irc.freenode.net #reactos-pl; */ diff --git a/modules/rosapps/applications/screensavers/cylfrac/lang/pl-PL.rc b/modules/rosapps/applications/screensavers/cylfrac/lang/pl-PL.rc index 0fe00cd2f17..c9aca2a3af3 100644 --- a/modules/rosapps/applications/screensavers/cylfrac/lang/pl-PL.rc +++ b/modules/rosapps/applications/screensavers/cylfrac/lang/pl-PL.rc @@ -1,7 +1,7 @@ /* * translated by Caemyr - Olaf Siejka (Feb, 2008) * Use ReactOS forum PM or IRC to contact me - * http://www.reactos.org + * https://reactos.org * IRC: irc.freenode.net #reactos-pl; */ diff --git a/modules/rosapps/applications/screensavers/matrix/lang/pl-PL.rc b/modules/rosapps/applications/screensavers/matrix/lang/pl-PL.rc index 69a5c0f2513..b0b7e58aa6f 100644 --- a/modules/rosapps/applications/screensavers/matrix/lang/pl-PL.rc +++ b/modules/rosapps/applications/screensavers/matrix/lang/pl-PL.rc @@ -3,7 +3,7 @@ /* * translated by Caemyr - Olaf Siejka (Feb, 2008) * Use ReactOS forum PM or IRC to contact me - * http://www.reactos.org + * https://reactos.org * IRC: irc.freenode.net #reactos-pl; */ diff --git a/modules/rosapps/applications/screensavers/starfield/lang/pl-PL.rc b/modules/rosapps/applications/screensavers/starfield/lang/pl-PL.rc index 8588e2778fa..3b4f09df426 100644 --- a/modules/rosapps/applications/screensavers/starfield/lang/pl-PL.rc +++ b/modules/rosapps/applications/screensavers/starfield/lang/pl-PL.rc @@ -1,7 +1,7 @@ /* * translated by Caemyr - Olaf Siejka (Feb, 2008) * Use ReactOS forum PM or IRC to contact me - * http://www.reactos.org + * https://reactos.org * IRC: irc.freenode.net #reactos-pl; */ diff --git a/modules/rosapps/applications/sysutils/systeminfo/lang/pl-PL.rc b/modules/rosapps/applications/sysutils/systeminfo/lang/pl-PL.rc index 5377c217f37..499684413d0 100644 --- a/modules/rosapps/applications/sysutils/systeminfo/lang/pl-PL.rc +++ b/modules/rosapps/applications/sysutils/systeminfo/lang/pl-PL.rc @@ -1,7 +1,7 @@ /* * translated by Caemyr - Olaf Siejka (Feb, 2008) * Use ReactOS forum PM or IRC to contact me - * http://www.reactos.org + * https://reactos.org * IRC: irc.freenode.net #reactos-pl; */ diff --git a/modules/rostests/kmtests/readme.txt b/modules/rostests/kmtests/readme.txt index 7a328b5d6d2..3680b037e25 100644 --- a/modules/rostests/kmtests/readme.txt +++ b/modules/rostests/kmtests/readme.txt @@ -7,5 +7,5 @@ The example subdirectory contains a set of small tests that can be used as examples and templates. -See http://www.reactos.org/wiki/KmtestsHowto for more +See https://reactos.org/wiki/KmtestsHowto for more information and a guide on how to use the framework. diff --git a/modules/wallpapers/Angelus/ReadMe.txt b/modules/wallpapers/Angelus/ReadMe.txt index b970254db05..d8a17321cf9 100644 --- a/modules/wallpapers/Angelus/ReadMe.txt +++ b/modules/wallpapers/Angelus/ReadMe.txt @@ -2,7 +2,7 @@ Angelus' Wallpapers =================== Forum User "Angelus" (jedi.knight(a)wanadoo.es) Under Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License. -See forum thread: http://www.reactos.org/forum/viewtopic.php?f=25&t=6153 +See forum thread: https://reactos.org/forum/viewtopic.php?f=25&t=6153 Bliss Series: 1; 2; 3 (Cristal ROS); 4 (DreamBliss) ------------- diff --git a/modules/wallpapers/ReadMe.txt b/modules/wallpapers/ReadMe.txt index a5df0fa96a8..70e3b05ee0c 100644 --- a/modules/wallpapers/ReadMe.txt +++ b/modules/wallpapers/ReadMe.txt @@ -3,18 +3,18 @@ Wallpapers File Name | Author | Origin -------------------------------------------------------------------------------------------------------------------------------------------------- -Angelus collection | Forum user "Angelus" (jedi.knight(a)wanadoo.es) | http://www.reactos.org/forum/viewtopic.php?p=50543#p50543 +Angelus collection | Forum user "Angelus" (jedi.knight(a)wanadoo.es) | https://reactos.org/forum/viewtopic.php?p=50543#p50543 Angelus_02_ROSWP_4-3_1440x1080.jpg | See above | See above Angelus_02_ROSWP_4-3_1024x768.jpg | See above | See above 1920px_Polarlicht.jpg | Public domain | https://jira.reactos.org/browse/CORE-8446 and links inside grass.jpg | See above | See above -clouds.jpg | Andreas Bjerkeholt (harteex(a)gmail.com) | http://www.reactos.org/forum/viewtopic.php?p=17732#p17732 -lake.jpg | Andreas Bjerkeholt (harteex(a)gmail.com) | http://www.reactos.org/forum/viewtopic.php?p=17732#p17732 -ReactOS_CirclesBlue_1.jpg | Forum user "henrytang5247" (Henry Tang) | http://www.reactos.org/forum/viewtopic.php?p=109529#p109529 +clouds.jpg | Andreas Bjerkeholt (harteex(a)gmail.com) | https://reactos.org/forum/viewtopic.php?p=17732#p17732 +lake.jpg | Andreas Bjerkeholt (harteex(a)gmail.com) | https://reactos.org/forum/viewtopic.php?p=17732#p17732 +ReactOS_CirclesBlue_1.jpg | Forum user "henrytang5247" (Henry Tang) | https://reactos.org/forum/viewtopic.php?p=109529#p109529 ReactOS_CirclesBlue_2.jpg | See above | See above ReactOS_CirclesGold_1.jpg | See above | See above ReactOS_CirclesGold_2.jpg | See above | See above -ReactOS_Hexagons.jpg | See above | http://www.reactos.org/forum/viewtopic.php?p=109866#p109866 +ReactOS_Hexagons.jpg | See above | https://reactos.org/forum/viewtopic.php?p=109866#p109866 ReactOS_Mizu.png | Forum user "Foxlet" (foxlet(a)furcode.co) | https://jira.reactos.org/browse/CORE-15783 ReactOS_Mizu_4x3.png | See above | See above ReactOS_Mizu_16x9_A.png | See above | See above diff --git a/sdk/include/crt/mingw32/intrin.h b/sdk/include/crt/mingw32/intrin.h index 051199a0315..de61b07add8 100644 --- a/sdk/include/crt/mingw32/intrin.h +++ b/sdk/include/crt/mingw32/intrin.h @@ -1,7 +1,7 @@ /* Compatibility <intrin.h> header for GCC -- GCC equivalents of intrinsic Microsoft Visual C++ functions. Originally developed for the ReactOS - (<http://www.reactos.org/>) and TinyKrnl (<http://www.tinykrnl.org/>) + (<https://reactos.org/>) and TinyKrnl (<http://www.tinykrnl.org/>) projects. Copyright (c) 2006 KJK::Hyperion <hackbunny(a)reactos.com> diff --git a/sdk/include/crt/mingw32/intrin_arm.h b/sdk/include/crt/mingw32/intrin_arm.h index 7799f15bdd6..6e3296c3dff 100644 --- a/sdk/include/crt/mingw32/intrin_arm.h +++ b/sdk/include/crt/mingw32/intrin_arm.h @@ -1,7 +1,7 @@ /* Compatibility <intrin.h> header for GCC -- GCC equivalents of intrinsic Microsoft Visual C++ functions. Originally developed for the ReactOS - (<http://www.reactos.org/>) and TinyKrnl (<http://www.tinykrnl.org/>) + (<https://reactos.org/>) and TinyKrnl (<http://www.tinykrnl.org/>) projects. Copyright (c) 2006 KJK::Hyperion <hackbunny(a)reactos.com> diff --git a/sdk/include/crt/mingw32/intrin_ppc.h b/sdk/include/crt/mingw32/intrin_ppc.h index f66bfd49d63..164e66245ae 100644 --- a/sdk/include/crt/mingw32/intrin_ppc.h +++ b/sdk/include/crt/mingw32/intrin_ppc.h @@ -1,7 +1,7 @@ /* Compatibility <intrin.h> header for GCC -- GCC equivalents of intrinsic Microsoft Visual C++ functions. Originally developed for the ReactOS - (<http://www.reactos.org/>) and TinyKrnl (<http://www.tinykrnl.org/>) + (<https://reactos.org/>) and TinyKrnl (<http://www.tinykrnl.org/>) projects. Copyright (c) 2006 KJK::Hyperion <hackbunny(a)reactos.com> diff --git a/sdk/include/crt/mingw32/intrin_x86.h b/sdk/include/crt/mingw32/intrin_x86.h index fa6a74f6407..5adaf67c7cd 100644 --- a/sdk/include/crt/mingw32/intrin_x86.h +++ b/sdk/include/crt/mingw32/intrin_x86.h @@ -1,7 +1,7 @@ /* Compatibility <intrin_x86.h> header for GCC -- GCC equivalents of intrinsic Microsoft Visual C++ functions. Originally developed for the ReactOS - (<http://www.reactos.org/>) and TinyKrnl (<http://www.tinykrnl.org/>) + (<https://reactos.org/>) and TinyKrnl (<http://www.tinykrnl.org/>) projects. Copyright (c) 2006 KJK::Hyperion <hackbunny(a)reactos.com> diff --git a/sdk/include/reactos/wine/config.h b/sdk/include/reactos/wine/config.h index 7fd05d526e3..6f06eee730c 100644 --- a/sdk/include/reactos/wine/config.h +++ b/sdk/include/reactos/wine/config.h @@ -1197,7 +1197,7 @@ #define PACKAGE_TARNAME "ReactOS" /* Define to the home page for this package. */ -#define PACKAGE_URL "http://www.reactos.org/" +#define PACKAGE_URL "https://reactos.org/" /* Define to the version of this package. */ #define PACKAGE_VERSION KERNEL_VERSION_STR diff --git a/win32ss/user/ntuser/windc.c b/win32ss/user/ntuser/windc.c index 7f677b89c1f..9a4a7dde211 100644 --- a/win32ss/user/ntuser/windc.c +++ b/win32ss/user/ntuser/windc.c @@ -546,8 +546,8 @@ UserGetDCEx(PWND Wnd OPTIONAL, HANDLE ClipRegion, ULONG Flags) * Bump it up! This prevents the random errors in wine dce tests and with * proper bits set in DCX_CACHECOMPAREMASK. * Reference: - * http://www.reactos.org/archives/public/ros-dev/2008-July/010498.html - * http://www.reactos.org/archives/public/ros-dev/2008-July/010499.html + * https://reactos.org/archives/public/ros-dev/2008-July/010498.html + * https://reactos.org/archives/public/ros-dev/2008-July/010499.html */ RemoveEntryList(&Dce->List); InsertHeadList(&LEDce, &Dce->List); diff --git a/win32ss/user/user32/misc/usrapihk.c b/win32ss/user/user32/misc/usrapihk.c index 515fab6c7bd..c281eb265d5 100644 --- a/win32ss/user/user32/misc/usrapihk.c +++ b/win32ss/user/user32/misc/usrapihk.c @@ -8,7 +8,7 @@ * * * Information: - * http://www.reactos.org/wiki/RegisterUserApiHook + * https://reactos.org/wiki/RegisterUserApiHook * */

1 year, 7 months

[reactos] 01/01: [BROWSEUI] Execute command line from address bar (#5026)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7ce58e177c98f66a6e50e… commit 7ce58e177c98f66a6e50e6538f29d5a286590927 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Feb 6 22:46:26 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Feb 6 22:46:26 2023 +0900 [BROWSEUI] Execute command line from address bar (#5026) CORE-15453 --- dll/win32/browseui/addresseditbox.cpp | 125 ++++++++++++++++++++++------------ dll/win32/browseui/addresseditbox.h | 3 + 2 files changed, 86 insertions(+), 42 deletions(-) diff --git a/dll/win32/browseui/addresseditbox.cpp b/dll/win32/browseui/addresseditbox.cpp index 4e018cc5bc1..e1faf69b38f 100644 --- a/dll/win32/browseui/addresseditbox.cpp +++ b/dll/win32/browseui/addresseditbox.cpp @@ -2,6 +2,7 @@ * ReactOS Explorer * * Copyright 2009 Andrew Hill <ash77 at domain reactos.org> + * Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -94,6 +95,68 @@ HRESULT STDMETHODCALLTYPE CAddressEditBox::SetCurrentDir(long paramC) return E_NOTIMPL; } +BOOL CAddressEditBox::GetComboBoxText(CComHeapPtr<WCHAR>& pszText) +{ + pszText.Free(); + INT cchMax = fCombobox.GetWindowTextLength() + sizeof(UNICODE_NULL); + if (!pszText.Allocate(cchMax)) + return FALSE; + return fCombobox.GetWindowText(pszText, cchMax); +} + +HRESULT CAddressEditBox::GetAbsolutePidl(PIDLIST_ABSOLUTE *pAbsolutePIDL) +{ + CComPtr<IBrowserService> isb; + HRESULT hr = IUnknown_QueryService(fSite, SID_STopLevelBrowser, IID_PPV_ARG(IBrowserService, &isb)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + hr = isb->GetPidl(pAbsolutePIDL); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + return S_OK; +} + +/* Execute command line from address bar */ +BOOL CAddressEditBox::ExecuteCommandLine() +{ + /* Get command line */ + CComHeapPtr<WCHAR> pszCmdLine; + if (!GetComboBoxText(pszCmdLine)) + return FALSE; + + /* Split 1st parameter from trailing arguments */ + PWCHAR args = PathGetArgsW(pszCmdLine); + PathRemoveArgsW(pszCmdLine); + + PathUnquoteSpacesW(pszCmdLine); /* Unquote the 1st parameter */ + + /* Get ready for execution */ + SHELLEXECUTEINFOW info = { sizeof(info), SEE_MASK_FLAG_NO_UI, m_hWnd }; + info.lpFile = pszCmdLine; + info.lpParameters = args; + info.nShow = SW_SHOWNORMAL; + + /* Set current directory */ + WCHAR dir[MAX_PATH] = L""; + CComHeapPtr<ITEMIDLIST> pidl; + if (SUCCEEDED(GetAbsolutePidl(&pidl))) + { + if (SHGetPathFromIDListW(pidl, dir) && PathIsDirectoryW(dir)) + info.lpDirectory = dir; + } + + if (!::ShellExecuteExW(&info)) /* Execute! */ + return FALSE; + + /* Execution succeeded. Reset the combobox. */ + if (dir[0] != UNICODE_NULL) + fCombobox.SetWindowText(dir); + + return TRUE; +} + HRESULT STDMETHODCALLTYPE CAddressEditBox::ParseNow(long paramC) { ULONG eaten; @@ -114,28 +177,17 @@ HRESULT STDMETHODCALLTYPE CAddressEditBox::ParseNow(long paramC) return hr; /* Get the path to browse and expand it if needed */ - LPWSTR input; - int inputLength = fCombobox.GetWindowTextLength() + 2; - - input = new WCHAR[inputLength]; - fCombobox.GetWindowText(input, inputLength); - - LPWSTR address; - int addressLength = ExpandEnvironmentStrings(input, NULL, 0); - - if (addressLength <= 0) + CComHeapPtr<WCHAR> input, address; + if (!GetComboBoxText(input)) + return E_FAIL; + + INT addressLength = (wcschr(input, L'%') ? ::SHExpandEnvironmentStringsW(input, NULL, 0) : 0); + if (addressLength <= 0 || + !address.Allocate(addressLength + 1) || + !::SHExpandEnvironmentStringsW(input, address, addressLength)) { - address = input; - } - else - { - addressLength += 2; - address = new WCHAR[addressLength]; - if (!ExpandEnvironmentStrings(input, address, addressLength)) - { - delete[] address; - address = input; - } + address.Free(); + address.Attach(input.Detach()); } /* Try to parse a relative path and if it fails, try to browse an absolute path */ @@ -167,20 +219,14 @@ parseabsolute: cleanup: if (pidlCurrent) ILFree(pidlCurrent); - if (address != input) - delete[] address; - delete[] input; - return hr; } HRESULT STDMETHODCALLTYPE CAddressEditBox::ShowFileNotFoundError(HRESULT hRet) { CComHeapPtr<WCHAR> input; - int inputLength = fCombobox.GetWindowTextLength() + 2; - - input.Allocate(inputLength); - fCombobox.GetWindowText(input, inputLength); + if (!GetComboBoxText(input)) + return E_FAIL; ShellMessageBoxW(_AtlBaseModule.GetResourceInstance(), fCombobox.m_hWnd, MAKEINTRESOURCEW(IDS_PARSE_ADDR_ERR_TEXT), MAKEINTRESOURCEW(IDS_PARSE_ADDR_ERR_TITLE), MB_OK | MB_ICONERROR, input.m_pData); @@ -200,7 +246,12 @@ HRESULT STDMETHODCALLTYPE CAddressEditBox::Execute(long paramC) /* If the destination path doesn't exist then display an error message */ if (hr == HRESULT_FROM_WIN32(ERROR_INVALID_DRIVE) || hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)) + { + if (ExecuteCommandLine()) + return S_OK; + return ShowFileNotFoundError(hr); + } if (!pidlLastParsed) return E_FAIL; @@ -214,16 +265,11 @@ HRESULT STDMETHODCALLTYPE CAddressEditBox::Execute(long paramC) if (FAILED(hr)) return hr; - CComPtr<IBrowserService> pbs; - pisb->QueryInterface(IID_PPV_ARG(IBrowserService, &pbs)); - if (FAILED(hr)) - return hr; - /* * Get the current pidl of the shellbrowser and check if it is the same with the parsed one */ PIDLIST_ABSOLUTE pidl; - hr = pbs->GetPidl(&pidl); + hr = GetAbsolutePidl(&pidl); if (FAILED(hr)) return hr; @@ -361,7 +407,6 @@ HRESULT STDMETHODCALLTYPE CAddressEditBox::GetIDsOfNames( HRESULT STDMETHODCALLTYPE CAddressEditBox::Invoke(DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { - CComPtr<IBrowserService> isb; CComPtr<IShellFolder> sf; HRESULT hr; PIDLIST_ABSOLUTE absolutePIDL; @@ -382,12 +427,8 @@ HRESULT STDMETHODCALLTYPE CAddressEditBox::Invoke(DISPID dispIdMember, REFIID ri pidlLastParsed = NULL; /* Get the current pidl of the browser */ - hr = IUnknown_QueryService(fSite, SID_STopLevelBrowser, IID_PPV_ARG(IBrowserService, &isb)); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; - - hr = isb->GetPidl(&absolutePIDL); - if (FAILED_UNEXPECTEDLY(hr)) + hr = GetAbsolutePidl(&absolutePIDL); + if (FAILED(hr)) return hr; if (!absolutePIDL) diff --git a/dll/win32/browseui/addresseditbox.h b/dll/win32/browseui/addresseditbox.h index 4b56a0f997b..1f0e003d06a 100644 --- a/dll/win32/browseui/addresseditbox.h +++ b/dll/win32/browseui/addresseditbox.h @@ -48,6 +48,9 @@ private: void FillOneLevel(int index, int levelIndent, int indent); LPITEMIDLIST GetItemData(int index); HRESULT STDMETHODCALLTYPE ShowFileNotFoundError(HRESULT hRet); + HRESULT GetAbsolutePidl(PIDLIST_ABSOLUTE *pAbsolutePIDL); + BOOL ExecuteCommandLine(); + BOOL GetComboBoxText(CComHeapPtr<WCHAR>& pszText); public: // *** IShellService methods *** virtual HRESULT STDMETHODCALLTYPE SetOwner(IUnknown *);

1 year, 7 months

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2023