Ros-diffs December 2023

ros-diffs@reactos.org

20 participants
274 discussions

[reactos] 01/01: [XDK] kefuncs.h: Unduplicate 2 function definitions (#6057)
by Serge Gautherie 04 Dec '23

04 Dec '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0c568c0c908863d8e8089… commit 0c568c0c908863d8e80897265d114a3caf74b20a Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Mon Dec 4 13:49:57 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Dec 4 13:49:57 2023 +0100 [XDK] kefuncs.h: Unduplicate 2 function definitions (#6057) --- sdk/include/xdk/kefuncs.h | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/sdk/include/xdk/kefuncs.h b/sdk/include/xdk/kefuncs.h index b1f02f5a9a1..fa6a22150d1 100644 --- a/sdk/include/xdk/kefuncs.h +++ b/sdk/include/xdk/kefuncs.h @@ -139,21 +139,9 @@ VOID NTAPI KeSetSystemAffinityThread( _In_ KAFFINITY Affinity); - -NTKERNELAPI -VOID -NTAPI -KeSetTargetProcessorDpc( - _Inout_ PRKDPC Dpc, - _In_ CCHAR Number); - -NTKERNELAPI -KAFFINITY -NTAPI -KeQueryActiveProcessors(VOID); $endif (_WDMDDK_) -$if (_NTDDK_) +$if (_WDMDDK_ || _NTDDK_) NTKERNELAPI VOID NTAPI @@ -165,8 +153,6 @@ NTKERNELAPI KAFFINITY NTAPI KeQueryActiveProcessors(VOID); -$endif (_NTDDK_) -$if (_WDMDDK_ || _NTDDK_) #endif /* defined(SINGLE_GROUP_LEGACY_API) */ $endif (_WDMDDK_ || _NTDDK_)

1 0

[reactos] 02/02: [IMM32] Include ldrfuncs.h for RtlDllShutdownInProgress (#6071)
by Hermès Bélusca-Maïto 04 Dec '23

04 Dec '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1797566d734cac94c9d49… commit 1797566d734cac94c9d4987179dbaa7ce5a37574 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Dec 3 19:57:45 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Dec 4 13:47:39 2023 +0100 [IMM32] Include ldrfuncs.h for RtlDllShutdownInProgress (#6071) --- dll/win32/imm32/ctf.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dll/win32/imm32/ctf.c b/dll/win32/imm32/ctf.c index 1a0e26788ed..0c69428184d 100644 --- a/dll/win32/imm32/ctf.c +++ b/dll/win32/imm32/ctf.c @@ -6,15 +6,13 @@ */ #include "precomp.h" +#include <ndk/ldrfuncs.h> /* for RtlDllShutdownInProgress */ #include <msctf.h> /* for ITfLangBarMgr */ #include <objidl.h> /* for IInitializeSpy */ #include <compat_undoc.h> /* for BaseCheckAppcompatCache */ WINE_DEFAULT_DEBUG_CHANNEL(imm); -/* FIXME: Use proper header */ -BOOLEAN WINAPI RtlDllShutdownInProgress(VOID); - static BOOL Imm32InsideLoaderLock(VOID) { return NtCurrentTeb()->ProcessEnvironmentBlock->LoaderLock->OwningThread ==

1 0

[reactos] 01/02: [NDK] ldrfuncs.h: Add RtlDllShutdownInProgress; make the header C++-compatible (#6071)
by Hermès Bélusca-Maïto 04 Dec '23

04 Dec '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=48456d91085026d4489d2… commit 48456d91085026d4489d2f820b8ca793a8bdda3f Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Nov 30 17:13:16 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Dec 4 13:47:33 2023 +0100 [NDK] ldrfuncs.h: Add RtlDllShutdownInProgress; make the header C++-compatible (#6071) The function is added here, because it is loader-related and thus making sense there, instead of in rtlfuncs.h. --- sdk/include/ndk/ldrfuncs.h | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/sdk/include/ndk/ldrfuncs.h b/sdk/include/ndk/ldrfuncs.h index 52e682b57fb..9b58e9d5f20 100644 --- a/sdk/include/ndk/ldrfuncs.h +++ b/sdk/include/ndk/ldrfuncs.h @@ -28,6 +28,10 @@ Author: #include <ntimage.h> #endif +#ifdef __cplusplus +extern "C" { +#endif + // // Resource Functions // @@ -59,7 +63,6 @@ LdrEnumResources( _Out_writes_to_(*ResourceCount,*ResourceCount) LDR_ENUM_RESOURCE_INFO *Resources ); - NTSTATUS NTAPI LdrFindResourceDirectory_U( @@ -144,4 +147,17 @@ LdrEnumerateLoadedModules( _In_opt_ PVOID Context ); +#ifdef NTOS_MODE_USER +NTSYSAPI +BOOLEAN +NTAPI +RtlDllShutdownInProgress( + VOID +); +#endif + +#ifdef __cplusplus +} +#endif + #endif

1 0

[reactos] 01/01: [ACPI] Add acpi.rc to CMakeLists (#6089)
by Thamatip Chitpong 04 Dec '23

04 Dec '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2dd0c6c32b5bc9498899e… commit 2dd0c6c32b5bc9498899e70c9c1fa5095fe5b346 Author: Thamatip Chitpong <thamatip.chitpong(a)reactos.org> AuthorDate: Mon Dec 4 07:17:08 2023 +0700 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Dec 4 07:17:08 2023 +0700 [ACPI] Add acpi.rc to CMakeLists (#6089) Fix missing version info. --- drivers/bus/acpi/CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/bus/acpi/CMakeLists.txt b/drivers/bus/acpi/CMakeLists.txt index f9ee29be83d..3535cf5604c 100644 --- a/drivers/bus/acpi/CMakeLists.txt +++ b/drivers/bus/acpi/CMakeLists.txt @@ -199,7 +199,10 @@ list(APPEND ACPI_SOURCE buspdo.c main.c) -add_library(acpi MODULE ${ACPI_SOURCE}) +add_library(acpi MODULE + ${ACPI_SOURCE} + acpi.rc) + set_module_type(acpi kernelmodedriver) target_link_libraries(acpi wdmguid acpica memcmp strtol ${PSEH_LIB}) add_importlibs(acpi ntoskrnl hal)

1 0

[reactos] 01/01: [NETSHELL] 640x480-ify complete that module (#6109)
by Joachim Henze 03 Dec '23

03 Dec '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a6341b49d866b037ad5bc… commit a6341b49d866b037ad5bc1f6e6eb7bc641dec474 Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Sun Dec 3 22:35:57 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Dec 3 21:35:57 2023 +0000 [NETSHELL] 640x480-ify complete that module (#6109) Addendum to (#5899) The change in sk-SK.rc IDD_NETPROPERTIES DIALOGEX 0, 0, 246, 246 to IDD_NETPROPERTIES DIALOGEX 0, 0, 246, 216 is an addendum to (#5899). In sk-SK.rc that line was accidentally forgotten to be changed. The change to "all" rc's: IDD_STATUS DIALOGEX 0, 0, 200, 280 to IDD_STATUS DIALOGEX 0, 0, 200, 180 changes the last dialog, that had a greater value here than 220 (which is the max we can use for 640x480-ability). I decided to use 180 for 2 reasons: 1.) bg-BG.rc already used IDD_STATUS DIALOGEX 0, 0, 200, 180 here, so we can sync all langs to that. 2.) We have some dialogs nearby which do use that same dimension for all langs, e.g.: IDD_LAN_NETSTATUS DIALOGEX 0, 0, 200, 180 IDD_LAN_NETSTATUSADVANCED DIALOGEX 0, 0, 200, 180 --- dll/shellext/netshell/lang/cs-CZ.rc | 2 +- dll/shellext/netshell/lang/da-DK.rc | 2 +- dll/shellext/netshell/lang/de-DE.rc | 2 +- dll/shellext/netshell/lang/el-GR.rc | 2 +- dll/shellext/netshell/lang/en-US.rc | 2 +- dll/shellext/netshell/lang/es-ES.rc | 2 +- dll/shellext/netshell/lang/fr-FR.rc | 2 +- dll/shellext/netshell/lang/he-IL.rc | 2 +- dll/shellext/netshell/lang/hi-IN.rc | 2 +- dll/shellext/netshell/lang/hu-HU.rc | 2 +- dll/shellext/netshell/lang/id-ID.rc | 2 +- dll/shellext/netshell/lang/it-IT.rc | 2 +- dll/shellext/netshell/lang/ja-JP.rc | 2 +- dll/shellext/netshell/lang/nl-NL.rc | 2 +- dll/shellext/netshell/lang/no-NO.rc | 2 +- dll/shellext/netshell/lang/pl-PL.rc | 2 +- dll/shellext/netshell/lang/pt-PT.rc | 2 +- dll/shellext/netshell/lang/ro-RO.rc | 2 +- dll/shellext/netshell/lang/ru-RU.rc | 2 +- dll/shellext/netshell/lang/sk-SK.rc | 4 ++-- dll/shellext/netshell/lang/sq-AL.rc | 2 +- dll/shellext/netshell/lang/sv-SE.rc | 2 +- dll/shellext/netshell/lang/tr-TR.rc | 2 +- dll/shellext/netshell/lang/uk-UA.rc | 2 +- dll/shellext/netshell/lang/zh-CN.rc | 2 +- dll/shellext/netshell/lang/zh-HK.rc | 2 +- dll/shellext/netshell/lang/zh-TW.rc | 2 +- 27 files changed, 28 insertions(+), 28 deletions(-) diff --git a/dll/shellext/netshell/lang/cs-CZ.rc b/dll/shellext/netshell/lang/cs-CZ.rc index 2adeeec0364..d8c18c17d9a 100644 --- a/dll/shellext/netshell/lang/cs-CZ.rc +++ b/dll/shellext/netshell/lang/cs-CZ.rc @@ -19,7 +19,7 @@ BEGIN AUTOCHECKBOX "&Upozornit při omezeném nebo žádném připojení", IDC_NOTIFYNOCONNECTION, 9, 195, 230, 20, WS_TABSTOP | BS_TOP | BS_MULTILINE END -IDD_STATUS DIALOGEX 0, 0, 200, 280 +IDD_STATUS DIALOGEX 0, 0, 200, 180 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | DS_MODALFRAME | WS_SYSMENU CAPTION "Obecné nastavení" FONT 8, "MS Shell Dlg" diff --git a/dll/shellext/netshell/lang/da-DK.rc b/dll/shellext/netshell/lang/da-DK.rc index b787c7180fe..557b5f61bca 100644 --- a/dll/shellext/netshell/lang/da-DK.rc +++ b/dll/shellext/netshell/lang/da-DK.rc @@ -19,7 +19,7 @@ BEGIN AUTOCHECKBOX "&Notify me when this connection has limited or no connectivity", IDC_NOTIFYNOCONNECTION, 9, 195, 230, 20, BS_MULTILINE | BS_TOP | WS_TABSTOP END -IDD_STATUS DIALOGEX 0, 0, 200, 280 +IDD_STATUS DIALOGEX 0, 0, 200, 180 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | DS_MODALFRAME | WS_SYSMENU CAPTION "Allgemein" FONT 8, "MS Shell Dlg" diff --git a/dll/shellext/netshell/lang/de-DE.rc b/dll/shellext/netshell/lang/de-DE.rc index cf3324eed7c..cfb2da5f0b5 100644 --- a/dll/shellext/netshell/lang/de-DE.rc +++ b/dll/shellext/netshell/lang/de-DE.rc @@ -19,7 +19,7 @@ BEGIN AUTOCHECKBOX "&Benachrichtigen bei eingeschränkter oder keiner Konnektivität", IDC_NOTIFYNOCONNECTION, 9, 195, 230, 20, BS_MULTILINE | BS_TOP | WS_TABSTOP END -IDD_STATUS DIALOGEX 0, 0, 200, 280 +IDD_STATUS DIALOGEX 0, 0, 200, 180 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | DS_MODALFRAME | WS_SYSMENU CAPTION "Allgemein" FONT 8, "MS Shell Dlg" diff --git a/dll/shellext/netshell/lang/el-GR.rc b/dll/shellext/netshell/lang/el-GR.rc index c4e32390ac6..42cce6e4c83 100644 --- a/dll/shellext/netshell/lang/el-GR.rc +++ b/dll/shellext/netshell/lang/el-GR.rc @@ -19,7 +19,7 @@ BEGIN AUTOCHECKBOX "&Notify me when this connection has limited or no connectivity", IDC_NOTIFYNOCONNECTION, 9, 195, 230, 20, BS_MULTILINE | BS_TOP | WS_TABSTOP END -IDD_STATUS DIALOGEX 0, 0, 200, 280 +IDD_STATUS DIALOGEX 0, 0, 200, 180 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | DS_MODALFRAME | WS_SYSMENU CAPTION "Γενικά" FONT 8, "MS Shell Dlg" diff --git a/dll/shellext/netshell/lang/en-US.rc b/dll/shellext/netshell/lang/en-US.rc index 89a7f588638..3b9ac61b58b 100644 --- a/dll/shellext/netshell/lang/en-US.rc +++ b/dll/shellext/netshell/lang/en-US.rc @@ -19,7 +19,7 @@ BEGIN AUTOCHECKBOX "&Notify me when this connection has limited or no connectivity", IDC_NOTIFYNOCONNECTION, 9, 195, 230, 20, BS_MULTILINE | BS_TOP | WS_TABSTOP END -IDD_STATUS DIALOGEX 0, 0, 200, 280 +IDD_STATUS DIALOGEX 0, 0, 200, 180 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | DS_MODALFRAME | WS_SYSMENU CAPTION "General" FONT 8, "MS Shell Dlg" diff --git a/dll/shellext/netshell/lang/es-ES.rc b/dll/shellext/netshell/lang/es-ES.rc index a4b26bca0a1..7c4431da9a8 100644 --- a/dll/shellext/netshell/lang/es-ES.rc +++ b/dll/shellext/netshell/lang/es-ES.rc @@ -27,7 +27,7 @@ BEGIN AUTOCHECKBOX "Notificarme cuando esta conexión tenga conectividad limitada o nula", IDC_NOTIFYNOCONNECTION, 9, 195, 230, 20, BS_MULTILINE | BS_TOP | WS_TABSTOP END -IDD_STATUS DIALOGEX 0, 0, 200, 280 +IDD_STATUS DIALOGEX 0, 0, 200, 180 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | DS_MODALFRAME | WS_SYSMENU CAPTION "General" FONT 8, "MS Shell Dlg" diff --git a/dll/shellext/netshell/lang/fr-FR.rc b/dll/shellext/netshell/lang/fr-FR.rc index 180b1294635..092aa710e62 100644 --- a/dll/shellext/netshell/lang/fr-FR.rc +++ b/dll/shellext/netshell/lang/fr-FR.rc @@ -19,7 +19,7 @@ BEGIN AUTOCHECKBOX "Me &notifier quand cette connexion n'a pas de connectivité ou une limitée", IDC_NOTIFYNOCONNECTION, 9, 195, 230, 20, BS_MULTILINE | BS_TOP | WS_TABSTOP END -IDD_STATUS DIALOGEX 0, 0, 200, 280 +IDD_STATUS DIALOGEX 0, 0, 200, 180 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | DS_MODALFRAME | WS_SYSMENU CAPTION "Général" FONT 8, "MS Shell Dlg" diff --git a/dll/shellext/netshell/lang/he-IL.rc b/dll/shellext/netshell/lang/he-IL.rc index 7d05062e766..ea668baa15f 100644 --- a/dll/shellext/netshell/lang/he-IL.rc +++ b/dll/shellext/netshell/lang/he-IL.rc @@ -19,7 +19,7 @@ BEGIN AUTOCHECKBOX "&Notify me when this connection has limited or no connectivity", IDC_NOTIFYNOCONNECTION, 9, 195, 230, 20, BS_MULTILINE | BS_TOP | WS_TABSTOP END -IDD_STATUS DIALOGEX 0, 0, 200, 280 +IDD_STATUS DIALOGEX 0, 0, 200, 180 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | DS_MODALFRAME | WS_SYSMENU CAPTION "כללי" FONT 8, "MS Shell Dlg" diff --git a/dll/shellext/netshell/lang/hi-IN.rc b/dll/shellext/netshell/lang/hi-IN.rc index 412756b30b7..698f640db12 100644 --- a/dll/shellext/netshell/lang/hi-IN.rc +++ b/dll/shellext/netshell/lang/hi-IN.rc @@ -25,7 +25,7 @@ BEGIN AUTOCHECKBOX "मुझे &सूचित करें जब यह कनेक्शन सीमित है या कोई कनेक्टिविटी नहीं है", IDC_NOTIFYNOCONNECTION, 9, 195, 230, 20, BS_MULTILINE | BS_TOP | WS_TABSTOP END -IDD_STATUS DIALOGEX 0, 0, 200, 280 +IDD_STATUS DIALOGEX 0, 0, 200, 180 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | DS_MODALFRAME | WS_SYSMENU CAPTION "सामान्य" FONT 8, "MS Shell Dlg" diff --git a/dll/shellext/netshell/lang/hu-HU.rc b/dll/shellext/netshell/lang/hu-HU.rc index c29ec621176..599ac84ce3b 100644 --- a/dll/shellext/netshell/lang/hu-HU.rc +++ b/dll/shellext/netshell/lang/hu-HU.rc @@ -19,7 +19,7 @@ BEGIN AUTOCHECKBOX "&Értesítsen amikor a kapcsolat korlátozott vagy nem elérhető", IDC_NOTIFYNOCONNECTION, 9, 195, 230, 20, BS_MULTILINE | BS_TOP | WS_TABSTOP END -IDD_STATUS DIALOGEX 0, 0, 200, 280 +IDD_STATUS DIALOGEX 0, 0, 200, 180 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | DS_MODALFRAME | WS_SYSMENU CAPTION "Általános" FONT 8, "MS Shell Dlg" diff --git a/dll/shellext/netshell/lang/id-ID.rc b/dll/shellext/netshell/lang/id-ID.rc index ceaad795f97..063538fd644 100644 --- a/dll/shellext/netshell/lang/id-ID.rc +++ b/dll/shellext/netshell/lang/id-ID.rc @@ -19,7 +19,7 @@ BEGIN AUTOCHECKBOX "&Notify me when this connection has limited or no connectivity", IDC_NOTIFYNOCONNECTION, 9, 195, 230, 20, BS_MULTILINE | BS_TOP | WS_TABSTOP END -IDD_STATUS DIALOGEX 0, 0, 200, 280 +IDD_STATUS DIALOGEX 0, 0, 200, 180 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | DS_MODALFRAME | WS_SYSMENU CAPTION "Allgemein" FONT 8, "MS Shell Dlg" diff --git a/dll/shellext/netshell/lang/it-IT.rc b/dll/shellext/netshell/lang/it-IT.rc index 1c93017496e..abcbc962619 100644 --- a/dll/shellext/netshell/lang/it-IT.rc +++ b/dll/shellext/netshell/lang/it-IT.rc @@ -19,7 +19,7 @@ BEGIN AUTOCHECKBOX "Notificare quando la connessione è limitata o non attiva", IDC_NOTIFYNOCONNECTION, 9, 195, 230, 20, BS_MULTILINE | BS_TOP | WS_TABSTOP END -IDD_STATUS DIALOGEX 0, 0, 200, 280 +IDD_STATUS DIALOGEX 0, 0, 200, 180 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | DS_MODALFRAME | WS_SYSMENU CAPTION "Generale" FONT 8, "MS Shell Dlg" diff --git a/dll/shellext/netshell/lang/ja-JP.rc b/dll/shellext/netshell/lang/ja-JP.rc index 8a897bcf977..52fa74df0f9 100644 --- a/dll/shellext/netshell/lang/ja-JP.rc +++ b/dll/shellext/netshell/lang/ja-JP.rc @@ -19,7 +19,7 @@ BEGIN AUTOCHECKBOX "この接続が制限されているか接続なしの場合に通知する(&N)", IDC_NOTIFYNOCONNECTION, 9, 195, 230, 20, BS_MULTILINE | BS_TOP | WS_TABSTOP END -IDD_STATUS DIALOGEX 0, 0, 200, 280 +IDD_STATUS DIALOGEX 0, 0, 200, 180 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | DS_MODALFRAME | WS_SYSMENU CAPTION "全般" FONT 9, "MS UI Gothic" diff --git a/dll/shellext/netshell/lang/nl-NL.rc b/dll/shellext/netshell/lang/nl-NL.rc index 55da4beef78..9d580bf59e8 100644 --- a/dll/shellext/netshell/lang/nl-NL.rc +++ b/dll/shellext/netshell/lang/nl-NL.rc @@ -19,7 +19,7 @@ BEGIN AUTOCHECKBOX "&Breng me op de hoogte wanneer deze verbinding geen of beperkte connectiviteit heeft", IDC_NOTIFYNOCONNECTION, 9, 195, 230, 20, BS_MULTILINE | BS_TOP | WS_TABSTOP END -IDD_STATUS DIALOGEX 0, 0, 200, 280 +IDD_STATUS DIALOGEX 0, 0, 200, 180 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | DS_MODALFRAME | WS_SYSMENU CAPTION "Algemeen" FONT 8, "MS Shell Dlg" diff --git a/dll/shellext/netshell/lang/no-NO.rc b/dll/shellext/netshell/lang/no-NO.rc index 9c7cb6d34cd..b687747e32e 100644 --- a/dll/shellext/netshell/lang/no-NO.rc +++ b/dll/shellext/netshell/lang/no-NO.rc @@ -19,7 +19,7 @@ BEGIN AUTOCHECKBOX "Gi beskjed hvis denne tilkoblingen har begrenset eller ingen tilkobling", IDC_NOTIFYNOCONNECTION, 9, 195, 230, 20, BS_MULTILINE | BS_TOP | WS_TABSTOP END -IDD_STATUS DIALOGEX 0, 0, 200, 280 +IDD_STATUS DIALOGEX 0, 0, 200, 180 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | DS_MODALFRAME | WS_SYSMENU CAPTION "Generielt" FONT 8, "MS Shell Dlg" diff --git a/dll/shellext/netshell/lang/pl-PL.rc b/dll/shellext/netshell/lang/pl-PL.rc index 62e46b93382..5b110e2c82b 100644 --- a/dll/shellext/netshell/lang/pl-PL.rc +++ b/dll/shellext/netshell/lang/pl-PL.rc @@ -21,7 +21,7 @@ BEGIN AUTOCHECKBOX "Powiadom mnie, gdy to połączenie ma ograniczoną łączność lub całkowity brak łączności", IDC_NOTIFYNOCONNECTION, 9, 195, 230, 20, BS_MULTILINE | BS_TOP | WS_TABSTOP END -IDD_STATUS DIALOGEX 0, 0, 200, 280 +IDD_STATUS DIALOGEX 0, 0, 200, 180 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | DS_MODALFRAME | WS_SYSMENU CAPTION "Właściwości" FONT 8, "MS Shell Dlg" diff --git a/dll/shellext/netshell/lang/pt-PT.rc b/dll/shellext/netshell/lang/pt-PT.rc index f32853c57f4..d41575b8963 100644 --- a/dll/shellext/netshell/lang/pt-PT.rc +++ b/dll/shellext/netshell/lang/pt-PT.rc @@ -19,7 +19,7 @@ BEGIN AUTOCHECKBOX "&Notificar-me quando a conectividade desta ligação for limitada ou nula", IDC_NOTIFYNOCONNECTION, 9, 195, 230, 20, BS_MULTILINE | BS_TOP | WS_TABSTOP END -IDD_STATUS DIALOGEX 0, 0, 200, 280 +IDD_STATUS DIALOGEX 0, 0, 200, 180 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | DS_MODALFRAME | WS_SYSMENU CAPTION "Geral" FONT 8, "MS Shell Dlg" diff --git a/dll/shellext/netshell/lang/ro-RO.rc b/dll/shellext/netshell/lang/ro-RO.rc index f4666212cac..ab1f5b1cbaa 100644 --- a/dll/shellext/netshell/lang/ro-RO.rc +++ b/dll/shellext/netshell/lang/ro-RO.rc @@ -22,7 +22,7 @@ BEGIN AUTOCHECKBOX "N&otifică problemele de conectivitate", IDC_NOTIFYNOCONNECTION, 9, 195, 230, 20, BS_MULTILINE | BS_TOP | WS_TABSTOP END -IDD_STATUS DIALOGEX 0, 0, 200, 280 +IDD_STATUS DIALOGEX 0, 0, 200, 180 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | DS_MODALFRAME | WS_SYSMENU CAPTION "Generale" FONT 8, "MS Shell Dlg" diff --git a/dll/shellext/netshell/lang/ru-RU.rc b/dll/shellext/netshell/lang/ru-RU.rc index d08fb57b7e9..f62468d3a65 100644 --- a/dll/shellext/netshell/lang/ru-RU.rc +++ b/dll/shellext/netshell/lang/ru-RU.rc @@ -19,7 +19,7 @@ BEGIN AUTOCHECKBOX "Оповещать в случае разрыва соединения", IDC_NOTIFYNOCONNECTION, 9, 195, 230, 20, BS_MULTILINE | BS_TOP | WS_TABSTOP END -IDD_STATUS DIALOGEX 0, 0, 200, 280 +IDD_STATUS DIALOGEX 0, 0, 200, 180 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | DS_MODALFRAME | WS_SYSMENU CAPTION "Свойства" FONT 8, "MS Shell Dlg" diff --git a/dll/shellext/netshell/lang/sk-SK.rc b/dll/shellext/netshell/lang/sk-SK.rc index d59dcb74015..21f93eefd9c 100644 --- a/dll/shellext/netshell/lang/sk-SK.rc +++ b/dll/shellext/netshell/lang/sk-SK.rc @@ -2,7 +2,7 @@ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT -IDD_NETPROPERTIES DIALOGEX 0, 0, 246, 246 +IDD_NETPROPERTIES DIALOGEX 0, 0, 246, 216 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Všeobecné" FONT 8, "MS Shell Dlg" @@ -21,7 +21,7 @@ BEGIN AUTOCHECKBOX "&Notify me when this connection has limited or no connectivity", IDC_NOTIFYNOCONNECTION, 9, 195, 230, 20, BS_MULTILINE | BS_TOP | WS_TABSTOP END -IDD_STATUS DIALOGEX 0, 0, 200, 280 +IDD_STATUS DIALOGEX 0, 0, 200, 180 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | DS_MODALFRAME | WS_SYSMENU CAPTION "Všeobecné" FONT 8, "MS Shell Dlg" diff --git a/dll/shellext/netshell/lang/sq-AL.rc b/dll/shellext/netshell/lang/sq-AL.rc index 641d7dbe9fc..28f8071757a 100644 --- a/dll/shellext/netshell/lang/sq-AL.rc +++ b/dll/shellext/netshell/lang/sq-AL.rc @@ -21,7 +21,7 @@ BEGIN AUTOCHECKBOX "&Më njofto kur kjo linjë ka kufizim ose ska lidhje", IDC_NOTIFYNOCONNECTION, 9, 195, 230, 20, BS_MULTILINE | BS_TOP | WS_TABSTOP END -IDD_STATUS DIALOGEX 0, 0, 200, 280 +IDD_STATUS DIALOGEX 0, 0, 200, 180 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | DS_MODALFRAME | WS_SYSMENU CAPTION "Përgjithshëm" FONT 8, "MS Shell Dlg" diff --git a/dll/shellext/netshell/lang/sv-SE.rc b/dll/shellext/netshell/lang/sv-SE.rc index c5db74a8ac1..faecdb3a58d 100644 --- a/dll/shellext/netshell/lang/sv-SE.rc +++ b/dll/shellext/netshell/lang/sv-SE.rc @@ -19,7 +19,7 @@ BEGIN AUTOCHECKBOX "&Notify me when this connection has limited or no connectivity", IDC_NOTIFYNOCONNECTION, 9, 195, 230, 20, BS_MULTILINE | BS_TOP | WS_TABSTOP END -IDD_STATUS DIALOGEX 0, 0, 200, 280 +IDD_STATUS DIALOGEX 0, 0, 200, 180 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | DS_MODALFRAME | WS_SYSMENU CAPTION "Allmänt" FONT 8, "MS Shell Dlg" diff --git a/dll/shellext/netshell/lang/tr-TR.rc b/dll/shellext/netshell/lang/tr-TR.rc index 4dbeb7d12ba..b4e553afb6e 100644 --- a/dll/shellext/netshell/lang/tr-TR.rc +++ b/dll/shellext/netshell/lang/tr-TR.rc @@ -21,7 +21,7 @@ BEGIN AUTOCHECKBOX "B&u bağlantı kısıtlıysa veya bağlanamıyorsa beni uyar", IDC_NOTIFYNOCONNECTION, 9, 195, 230, 20, BS_MULTILINE | BS_TOP | WS_TABSTOP END -IDD_STATUS DIALOGEX 0, 0, 200, 280 +IDD_STATUS DIALOGEX 0, 0, 200, 180 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | DS_MODALFRAME | WS_SYSMENU CAPTION "Genel" FONT 8, "MS Shell Dlg" diff --git a/dll/shellext/netshell/lang/uk-UA.rc b/dll/shellext/netshell/lang/uk-UA.rc index 0a34bec2e70..73851236c8f 100644 --- a/dll/shellext/netshell/lang/uk-UA.rc +++ b/dll/shellext/netshell/lang/uk-UA.rc @@ -25,7 +25,7 @@ BEGIN AUTOCHECKBOX "Сповіщати мене, якщо це підключення обмежене чи відсутнє", IDC_NOTIFYNOCONNECTION, 9, 195, 230, 20, BS_MULTILINE | BS_TOP | WS_TABSTOP END -IDD_STATUS DIALOGEX 0, 0, 200, 280 +IDD_STATUS DIALOGEX 0, 0, 200, 180 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | DS_MODALFRAME | WS_SYSMENU CAPTION "Загальні" FONT 8, "MS Shell Dlg" diff --git a/dll/shellext/netshell/lang/zh-CN.rc b/dll/shellext/netshell/lang/zh-CN.rc index 5b306d02082..533465a8295 100644 --- a/dll/shellext/netshell/lang/zh-CN.rc +++ b/dll/shellext/netshell/lang/zh-CN.rc @@ -27,7 +27,7 @@ BEGIN AUTOCHECKBOX "通知我当此连接受限制或无连接(&N)", IDC_NOTIFYNOCONNECTION, 9, 195, 230, 20, BS_MULTILINE | BS_TOP | WS_TABSTOP END -IDD_STATUS DIALOGEX 0, 0, 200, 280 +IDD_STATUS DIALOGEX 0, 0, 200, 180 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | DS_MODALFRAME | WS_SYSMENU CAPTION "常规" FONT 9, "宋体" diff --git a/dll/shellext/netshell/lang/zh-HK.rc b/dll/shellext/netshell/lang/zh-HK.rc index 3a44b9eeb56..f759809083c 100644 --- a/dll/shellext/netshell/lang/zh-HK.rc +++ b/dll/shellext/netshell/lang/zh-HK.rc @@ -27,7 +27,7 @@ BEGIN AUTOCHECKBOX "在這個連線受限制或無連線時通知我(&N)", IDC_NOTIFYNOCONNECTION, 9, 195, 230, 20, BS_MULTILINE | BS_TOP | WS_TABSTOP END -IDD_STATUS DIALOGEX 0, 0, 200, 280 +IDD_STATUS DIALOGEX 0, 0, 200, 180 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | DS_MODALFRAME | WS_SYSMENU CAPTION "一般" FONT 9, "新細明體" diff --git a/dll/shellext/netshell/lang/zh-TW.rc b/dll/shellext/netshell/lang/zh-TW.rc index 1c5a1f54d63..eb73e47c058 100644 --- a/dll/shellext/netshell/lang/zh-TW.rc +++ b/dll/shellext/netshell/lang/zh-TW.rc @@ -27,7 +27,7 @@ BEGIN AUTOCHECKBOX "在此連線受限制或無連線時通知我(&N)", IDC_NOTIFYNOCONNECTION, 9, 195, 230, 20, BS_MULTILINE | BS_TOP | WS_TABSTOP END -IDD_STATUS DIALOGEX 0, 0, 200, 280 +IDD_STATUS DIALOGEX 0, 0, 200, 180 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | DS_MODALFRAME | WS_SYSMENU CAPTION "一般" FONT 9, "新細明體"

1 0

[reactos] 01/01: [TASKMGR] RC trivia el-GR.rc pt-BR.rc pt-PT.rc ru-RU.rc sv-SE.rc (#6097)
by Joachim Henze 03 Dec '23

03 Dec '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=471cceb14f7d89476ace3… commit 471cceb14f7d89476ace3ac1741d21129b2cfaba Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Sun Dec 3 22:35:01 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Dec 3 21:35:01 2023 +0000 [TASKMGR] RC trivia el-GR.rc pt-BR.rc pt-PT.rc ru-RU.rc sv-SE.rc (#6097) As the title says: Just some trivia --- base/applications/taskmgr/lang/el-GR.rc | 8 ++++---- base/applications/taskmgr/lang/pt-BR.rc | 2 +- base/applications/taskmgr/lang/pt-PT.rc | 2 +- base/applications/taskmgr/lang/ru-RU.rc | 2 +- base/applications/taskmgr/lang/sv-SE.rc | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/base/applications/taskmgr/lang/el-GR.rc b/base/applications/taskmgr/lang/el-GR.rc index 0ac9a133d3d..d14477e21fc 100644 --- a/base/applications/taskmgr/lang/el-GR.rc +++ b/base/applications/taskmgr/lang/el-GR.rc @@ -10,17 +10,17 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Έ&ξοδος από τον Διαχειριστή Διεργασιών", ID_FILE_EXIT END - POPUP "&Επιλογές" + POPUP "&Επιλογές" //FIXME: accelerator collision &E BEGIN MENUITEM "&Πάντα Μπροστά", ID_OPTIONS_ALWAYSONTOP, CHECKED MENUITEM "&Σμίκρυνση κατά τη Χρήση", ID_OPTIONS_MINIMIZEONUSE, CHECKED MENUITEM "&Απόκρυψη όταν είναι σε Σμίκρυνση", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED END - POPUP "&Εμφάνιση" + POPUP "&Εμφάνιση" //FIXME: accelerator collision &E BEGIN - MENUITEM "&Ανανέωση Τώρα", ID_VIEW_REFRESH - POPUP "&Ανανέωση Ταχύτητας" + MENUITEM "&Ανανέωση Τώρα", ID_VIEW_REFRESH //FIXME: accelerator collision &A + POPUP "&Ανανέωση Ταχύτητας" //FIXME: accelerator collision &A BEGIN MENUITEM "&Υψηλή", ID_VIEW_UPDATESPEED_HIGH MENUITEM "&Κανονική", ID_VIEW_UPDATESPEED_NORMAL, CHECKED diff --git a/base/applications/taskmgr/lang/pt-BR.rc b/base/applications/taskmgr/lang/pt-BR.rc index 1f65f343855..9b96517ea7f 100644 --- a/base/applications/taskmgr/lang/pt-BR.rc +++ b/base/applications/taskmgr/lang/pt-BR.rc @@ -185,7 +185,7 @@ BEGIN GROUPBOX "Uso de MEM", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT GROUPBOX "Totais", IDC_TOTALS_FRAME, 5, 122, 114, 39, 0, WS_EX_TRANSPARENT GROUPBOX "Carga comprometida (K)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 114, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Memória física(K)", IDC_PHYSICAL_MEMORY_FRAME, 128, 122, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Memória física (K)", IDC_PHYSICAL_MEMORY_FRAME, 128, 122, 114, 39, 0, WS_EX_TRANSPARENT GROUPBOX "Memória usada pelo núcleo (K)", IDC_KERNEL_MEMORY_FRAME, 128, 166, 114, 39, 0, WS_EX_TRANSPARENT LTEXT "Identificadores", IDS_TOTALS_HANDLE_COUNT, 12, 131, 57, 8 LTEXT "Segmentos", IDS_TOTALS_THREAD_COUNT, 12, 140, 57, 8 diff --git a/base/applications/taskmgr/lang/pt-PT.rc b/base/applications/taskmgr/lang/pt-PT.rc index f154a956ef9..a2f466d7848 100644 --- a/base/applications/taskmgr/lang/pt-PT.rc +++ b/base/applications/taskmgr/lang/pt-PT.rc @@ -187,7 +187,7 @@ BEGIN GROUPBOX "Uso de MEM", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT GROUPBOX "Totais", IDC_TOTALS_FRAME, 5, 122, 114, 39, 0, WS_EX_TRANSPARENT GROUPBOX "Carga comprometida (K)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 114, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Memória física(K)", IDC_PHYSICAL_MEMORY_FRAME, 128, 122, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Memória física (K)", IDC_PHYSICAL_MEMORY_FRAME, 128, 122, 114, 39, 0, WS_EX_TRANSPARENT GROUPBOX "Memória usada pelo núcleo (K)", IDC_KERNEL_MEMORY_FRAME, 128, 166, 114, 39, 0, WS_EX_TRANSPARENT LTEXT "Identificadores", IDS_TOTALS_HANDLE_COUNT, 12, 131, 57, 8 LTEXT "Segmentos", IDS_TOTALS_THREAD_COUNT, 12, 140, 57, 8 diff --git a/base/applications/taskmgr/lang/ru-RU.rc b/base/applications/taskmgr/lang/ru-RU.rc index 302c9530f09..047e620b47c 100644 --- a/base/applications/taskmgr/lang/ru-RU.rc +++ b/base/applications/taskmgr/lang/ru-RU.rc @@ -1,4 +1,4 @@ -// COPYRIGHT: Dmitry Chapyshev, 2007, Kudratov Olimjon <olim98(a)bk.ru> +// COPYRIGHT: 2007 Dmitry Chapyshev, Kudratov Olimjon <olim98(a)bk.ru> LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT diff --git a/base/applications/taskmgr/lang/sv-SE.rc b/base/applications/taskmgr/lang/sv-SE.rc index 619952573f6..faeeaae3935 100644 --- a/base/applications/taskmgr/lang/sv-SE.rc +++ b/base/applications/taskmgr/lang/sv-SE.rc @@ -136,7 +136,7 @@ BEGIN MENUITEM "&Under normal", ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL MENUITEM "&Låg", ID_PROCESS_PAGE_SETPRIORITY_LOW END - MENUITEM "Välj &källa (FIXME)...", ID_PROCESS_PAGE_SETAFFINITY + MENUITEM "Välj &källa...", ID_PROCESS_PAGE_SETAFFINITY MENUITEM SEPARATOR MENUITEM "P&roperties", ID_PROCESS_PAGE_PROPERTIES MENUITEM "&Open File Location", ID_PROCESS_PAGE_OPENFILELOCATION

1 0

[reactos] 01/01: [NETCFGX] IDD_TCPIP_ALTCF_DLG Fix radiobutton (#6083)
by Joachim Henze 03 Dec '23

03 Dec '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6a7315228cca84e85619c… commit 6a7315228cca84e85619c54d7b2a755697fa55a6 Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Sun Dec 3 22:34:29 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Dec 3 21:34:29 2023 +0000 [NETCFGX] IDD_TCPIP_ALTCF_DLG Fix radiobutton (#6083) Do to the 2nd dialog the same what (#6049) did for the first dialog: - Flip the controls - move vertical position of the groupbox from 55 to 57 to make it look better - sync vertical position of 2 more controls for fr-FR.rc --- dll/win32/netcfgx/lang/bg-BG.rc | 2 +- dll/win32/netcfgx/lang/cs-CZ.rc | 2 +- dll/win32/netcfgx/lang/da-DK.rc | 2 +- dll/win32/netcfgx/lang/de-DE.rc | 2 +- dll/win32/netcfgx/lang/el-GR.rc | 2 +- dll/win32/netcfgx/lang/en-US.rc | 2 +- dll/win32/netcfgx/lang/es-ES.rc | 2 +- dll/win32/netcfgx/lang/fr-FR.rc | 6 +++--- dll/win32/netcfgx/lang/he-IL.rc | 2 +- dll/win32/netcfgx/lang/hu-HU.rc | 2 +- dll/win32/netcfgx/lang/id-ID.rc | 2 +- dll/win32/netcfgx/lang/it-IT.rc | 2 +- dll/win32/netcfgx/lang/ja-JP.rc | 2 +- dll/win32/netcfgx/lang/nl-NL.rc | 2 +- dll/win32/netcfgx/lang/no-NO.rc | 2 +- dll/win32/netcfgx/lang/pl-PL.rc | 2 +- dll/win32/netcfgx/lang/pt-PT.rc | 2 +- dll/win32/netcfgx/lang/ro-RO.rc | 2 +- dll/win32/netcfgx/lang/ru-RU.rc | 2 +- dll/win32/netcfgx/lang/sk-SK.rc | 2 +- dll/win32/netcfgx/lang/sq-AL.rc | 2 +- dll/win32/netcfgx/lang/sv-SE.rc | 2 +- dll/win32/netcfgx/lang/tr-TR.rc | 2 +- dll/win32/netcfgx/lang/uk-UA.rc | 2 +- dll/win32/netcfgx/lang/zh-CN.rc | 2 +- dll/win32/netcfgx/lang/zh-HK.rc | 2 +- dll/win32/netcfgx/lang/zh-TW.rc | 2 +- 27 files changed, 29 insertions(+), 29 deletions(-) diff --git a/dll/win32/netcfgx/lang/bg-BG.rc b/dll/win32/netcfgx/lang/bg-BG.rc index 54b1119d2cc..2a21a94e116 100644 --- a/dll/win32/netcfgx/lang/bg-BG.rc +++ b/dll/win32/netcfgx/lang/bg-BG.rc @@ -31,8 +31,8 @@ CAPTION "Заместваща настройка" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Ако компютърът се използва в повече от една мрежа, въведете заместващи IP настройки отдолу", -1, 9, 9, 220, 20 + GROUPBOX "", -1, 9, 57, 228, 125, BS_GROUPBOX CONTROL "&Автоматични лични IP адреси", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 - GROUPBOX "", -1, 9, 55, 228, 125, BS_GROUPBOX CONTROL "На&строено от потребителя", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12 LTEXT "Адрес за IP:", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12 diff --git a/dll/win32/netcfgx/lang/cs-CZ.rc b/dll/win32/netcfgx/lang/cs-CZ.rc index fb8e44a87d7..cbb5a3a5870 100644 --- a/dll/win32/netcfgx/lang/cs-CZ.rc +++ b/dll/win32/netcfgx/lang/cs-CZ.rc @@ -34,8 +34,8 @@ CAPTION "Alternativní konfigurace" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Pokud je tento počítač používán ve více než jedné síti, lze zadat alternativní nastavení níže", -1, 9, 9, 220, 20 + GROUPBOX "", -1, 9, 57, 228, 125, BS_GROUPBOX CONTROL "Au&tomatická privátní IP adresa", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 - GROUPBOX "", -1, 9, 55, 228, 125, BS_GROUPBOX CONTROL "&Uživatelské nastavení", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12 LTEXT "&IP adresa:", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12 diff --git a/dll/win32/netcfgx/lang/da-DK.rc b/dll/win32/netcfgx/lang/da-DK.rc index 80f11ccddf2..82fe35d148d 100644 --- a/dll/win32/netcfgx/lang/da-DK.rc +++ b/dll/win32/netcfgx/lang/da-DK.rc @@ -31,8 +31,8 @@ CAPTION "Alternate Configuration" FONT 8, "MS Shell Dlg" BEGIN LTEXT "If this computer is used on more than one network, enter the alternate IP settings below", -1, 9, 9, 220, 20 + GROUPBOX "", -1, 9, 57, 228, 125, BS_GROUPBOX CONTROL "Au&tomatic private IP address", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 - GROUPBOX "", -1, 9, 55, 228, 125, BS_GROUPBOX CONTROL "U&ser configured", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12 LTEXT "&IP address:", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12 diff --git a/dll/win32/netcfgx/lang/de-DE.rc b/dll/win32/netcfgx/lang/de-DE.rc index 5797c535b57..5fc8047dced 100644 --- a/dll/win32/netcfgx/lang/de-DE.rc +++ b/dll/win32/netcfgx/lang/de-DE.rc @@ -31,8 +31,8 @@ CAPTION "Alternative Konfiguration" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Geben Sie alternative IP-Einstellungen an, falls dieser Computer in mehreren Netzwerken verwendet wird.", -1, 9, 9, 220, 20 + GROUPBOX "", -1, 9, 57, 228, 125, BS_GROUPBOX CONTROL "Au&tomatisch zugewiesene, private IP-Adresse", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 - GROUPBOX "", -1, 9, 55, 228, 125, BS_GROUPBOX CONTROL "B&enutzerdefiniert", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12 LTEXT "&IP-Adresse:", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12 diff --git a/dll/win32/netcfgx/lang/el-GR.rc b/dll/win32/netcfgx/lang/el-GR.rc index c227d76ec41..a742cc120a8 100644 --- a/dll/win32/netcfgx/lang/el-GR.rc +++ b/dll/win32/netcfgx/lang/el-GR.rc @@ -31,8 +31,8 @@ CAPTION "Alternate Configuration" FONT 8, "MS Shell Dlg" BEGIN LTEXT "If this computer is used on more than one network, enter the alternate IP settings below", -1, 9, 9, 220, 20 + GROUPBOX "", -1, 9, 57, 228, 125, BS_GROUPBOX CONTROL "Au&tomatic private IP address", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 - GROUPBOX "", -1, 9, 55, 228, 125, BS_GROUPBOX CONTROL "U&ser configured", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12 LTEXT "&IP address:", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12 diff --git a/dll/win32/netcfgx/lang/en-US.rc b/dll/win32/netcfgx/lang/en-US.rc index 358ac48e063..acbc0f2b70c 100644 --- a/dll/win32/netcfgx/lang/en-US.rc +++ b/dll/win32/netcfgx/lang/en-US.rc @@ -31,8 +31,8 @@ CAPTION "Alternate Configuration" FONT 8, "MS Shell Dlg" BEGIN LTEXT "If this computer is used on more than one network, enter the alternate IP settings below", -1, 9, 9, 220, 20 + GROUPBOX "", -1, 9, 57, 228, 125, BS_GROUPBOX CONTROL "Au&tomatic private IP address", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 - GROUPBOX "", -1, 9, 55, 228, 125, BS_GROUPBOX CONTROL "U&ser configured", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12 LTEXT "&IP address:", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12 diff --git a/dll/win32/netcfgx/lang/es-ES.rc b/dll/win32/netcfgx/lang/es-ES.rc index ae490b23a13..3be8b462101 100644 --- a/dll/win32/netcfgx/lang/es-ES.rc +++ b/dll/win32/netcfgx/lang/es-ES.rc @@ -39,8 +39,8 @@ CAPTION "Configuración alternativa" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Escriba a continuación la configuración IP alternativa si este equipo se utiliza en más de una red.", -1, 9, 9, 220, 20 + GROUPBOX "", -1, 9, 57, 228, 125, BS_GROUPBOX CONTROL "&Dirección IP privada automática", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 - GROUPBOX "", -1, 9, 55, 228, 125, BS_GROUPBOX CONTROL "Configurada por el u&suario:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 100, 12 LTEXT "Dire&cción IP:", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 140, 75, 85, 12 diff --git a/dll/win32/netcfgx/lang/fr-FR.rc b/dll/win32/netcfgx/lang/fr-FR.rc index 87832eb63ed..ae68a925cd5 100644 --- a/dll/win32/netcfgx/lang/fr-FR.rc +++ b/dll/win32/netcfgx/lang/fr-FR.rc @@ -31,9 +31,9 @@ CAPTION "Configuration alternative" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Si cet ordinateur est utilisé sur plusieurs réseaux, entrez les paramètres alternatifs IP ci-dessous", -1, 9, 9, 220, 20 - CONTROL "Obtenir automatiquement l'adresse IP", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12 - GROUPBOX "", -1, 9, 55, 228, 125, BS_GROUPBOX - CONTROL "&Utiliser l'adresse IP suivante :", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12 + GROUPBOX "", -1, 9, 57, 228, 125, BS_GROUPBOX + CONTROL "Obtenir automatiquement l'adresse IP", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 + CONTROL "&Utiliser l'adresse IP suivante :", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 120, 12 LTEXT "Adresse &IP :", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12 LTEXT "Masque de so&us-réseau :", -1, 14, 95, 135, 8 diff --git a/dll/win32/netcfgx/lang/he-IL.rc b/dll/win32/netcfgx/lang/he-IL.rc index a39e64a6d60..ff38cce85df 100644 --- a/dll/win32/netcfgx/lang/he-IL.rc +++ b/dll/win32/netcfgx/lang/he-IL.rc @@ -31,8 +31,8 @@ CAPTION "הגדרה חלופית" FONT 8, "MS Shell Dlg" BEGIN LTEXT "If this computer is used on more than one network, enter the alternate IP settings below", -1, 9, 9, 220, 20 + GROUPBOX "", -1, 9, 57, 228, 125, BS_GROUPBOX CONTROL "כתובת IP פרטית אוטומטית", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 - GROUPBOX "", -1, 9, 55, 228, 125, BS_GROUPBOX CONTROL "הגדרת משתמש", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12 LTEXT "כתובת IP:", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12 diff --git a/dll/win32/netcfgx/lang/hu-HU.rc b/dll/win32/netcfgx/lang/hu-HU.rc index e44b7653080..1f058aa97e6 100644 --- a/dll/win32/netcfgx/lang/hu-HU.rc +++ b/dll/win32/netcfgx/lang/hu-HU.rc @@ -31,8 +31,8 @@ CAPTION "Alternate Configuration" FONT 8, "MS Shell Dlg" BEGIN LTEXT "If this computer is used on more than one network, enter the alternate IP settings below", -1, 9, 9, 220, 20 + GROUPBOX "", -1, 9, 57, 228, 125, BS_GROUPBOX CONTROL "Au&tomatic private IP address", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 - GROUPBOX "", -1, 9, 55, 228, 125, BS_GROUPBOX CONTROL "U&ser configured", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12 LTEXT "&IP address:", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12 diff --git a/dll/win32/netcfgx/lang/id-ID.rc b/dll/win32/netcfgx/lang/id-ID.rc index 2feb756df05..a3d52f63f6e 100644 --- a/dll/win32/netcfgx/lang/id-ID.rc +++ b/dll/win32/netcfgx/lang/id-ID.rc @@ -31,8 +31,8 @@ CAPTION "Alternate Configuration" FONT 8, "MS Shell Dlg" BEGIN LTEXT "If this computer is used on more than one network, enter the alternate IP settings below", -1, 9, 9, 220, 20 + GROUPBOX "", -1, 9, 57, 228, 125, BS_GROUPBOX CONTROL "Au&tomatic private IP address", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 - GROUPBOX "", -1, 9, 55, 228, 125, BS_GROUPBOX CONTROL "U&ser configured", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12 LTEXT "&IP address:", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12 diff --git a/dll/win32/netcfgx/lang/it-IT.rc b/dll/win32/netcfgx/lang/it-IT.rc index 25537f7df61..18894b76442 100644 --- a/dll/win32/netcfgx/lang/it-IT.rc +++ b/dll/win32/netcfgx/lang/it-IT.rc @@ -31,8 +31,8 @@ CAPTION "Configurazione alternativa" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Se questo computer viene utilizzato in più di una rete indicare di seguito le configurazioni di rete alternative", -1, 9, 9, 220, 20 + GROUPBOX "", -1, 9, 57, 228, 125, BS_GROUPBOX CONTROL "Indirizzo IP privato &automatico", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 - GROUPBOX "", -1, 9, 55, 228, 125, BS_GROUPBOX CONTROL "Configurato dall'&utente", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12 LTEXT "&Indirizzo IP:", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12 diff --git a/dll/win32/netcfgx/lang/ja-JP.rc b/dll/win32/netcfgx/lang/ja-JP.rc index eed8b46b0a1..ea6cad0353b 100644 --- a/dll/win32/netcfgx/lang/ja-JP.rc +++ b/dll/win32/netcfgx/lang/ja-JP.rc @@ -31,8 +31,8 @@ CAPTION "Alternate Configuration" FONT 9, "MS UI Gothic" BEGIN LTEXT "If this computer is used on more than one network, enter the alternate IP settings below", -1, 9, 9, 220, 20 + GROUPBOX "", -1, 9, 57, 228, 125, BS_GROUPBOX CONTROL "Au&tomatic private IP address", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 - GROUPBOX "", -1, 9, 55, 228, 125, BS_GROUPBOX CONTROL "U&ser configured", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12 LTEXT "&IP address:", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12 diff --git a/dll/win32/netcfgx/lang/nl-NL.rc b/dll/win32/netcfgx/lang/nl-NL.rc index 8b3fd84e94e..7a421f3ffab 100644 --- a/dll/win32/netcfgx/lang/nl-NL.rc +++ b/dll/win32/netcfgx/lang/nl-NL.rc @@ -31,8 +31,8 @@ CAPTION "Alternate Configuration" FONT 8, "MS Shell Dlg" BEGIN LTEXT "If this computer is used on more than one network, enter the alternate IP settings below", -1, 9, 9, 220, 20 + GROUPBOX "", -1, 9, 57, 228, 125, BS_GROUPBOX CONTROL "Au&tomatic private IP address", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 - GROUPBOX "", -1, 9, 55, 228, 125, BS_GROUPBOX CONTROL "U&ser configured", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12 LTEXT "&IP address:", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12 diff --git a/dll/win32/netcfgx/lang/no-NO.rc b/dll/win32/netcfgx/lang/no-NO.rc index 22004304587..9e21f57a876 100644 --- a/dll/win32/netcfgx/lang/no-NO.rc +++ b/dll/win32/netcfgx/lang/no-NO.rc @@ -31,8 +31,8 @@ CAPTION "Alternativ Konfigurasjon" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Hvis denne datamaskinen bruker mere en et nettverk, sett inn et alternativt IP adresse i innstilling under", -1, 9, 9, 220, 20 + GROUPBOX "", -1, 9, 57, 228, 125, BS_GROUPBOX CONTROL "Au&tomatisk privat IP addresse", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 - GROUPBOX "", -1, 9, 55, 228, 125, BS_GROUPBOX CONTROL "B&ruker konfigurert", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12 LTEXT "&IP addresse:", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12 diff --git a/dll/win32/netcfgx/lang/pl-PL.rc b/dll/win32/netcfgx/lang/pl-PL.rc index 4041f61ae69..0480786687f 100644 --- a/dll/win32/netcfgx/lang/pl-PL.rc +++ b/dll/win32/netcfgx/lang/pl-PL.rc @@ -33,8 +33,8 @@ CAPTION "Konfiguracja alternatywna" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Jeśli ten komputer jest używany w więcej niż jednej sieci, wprowadź poniżej alternatywne ustawienia protokołu IP", -1, 9, 9, 220, 20 + GROUPBOX "", -1, 9, 57, 228, 125, BS_GROUPBOX CONTROL "Au&tomatyczny prywatny adres IP", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 - GROUPBOX "", -1, 9, 55, 228, 125, BS_GROUPBOX CONTROL "&Ustawienia konfigurowane przez użytkownika", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 210, 12 LTEXT "Adres &IP:", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12 diff --git a/dll/win32/netcfgx/lang/pt-PT.rc b/dll/win32/netcfgx/lang/pt-PT.rc index 039cebb4b6a..503c5fa4995 100644 --- a/dll/win32/netcfgx/lang/pt-PT.rc +++ b/dll/win32/netcfgx/lang/pt-PT.rc @@ -33,8 +33,8 @@ CAPTION "Configuração alternativa" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Se este computador for usado em mais de uma rede, insira as configurações de IP alternativas abaixo.", -1, 9, 9, 220, 20 + GROUPBOX "", -1, 9, 57, 228, 125, BS_GROUPBOX CONTROL "IP privado &automático", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 - GROUPBOX "", -1, 9, 55, 228, 125, BS_GROUPBOX CONTROL "&Config. do utilizador", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12 LTEXT "Endereço &IP:", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12 diff --git a/dll/win32/netcfgx/lang/ro-RO.rc b/dll/win32/netcfgx/lang/ro-RO.rc index 57f10cc542e..f87bdcd46bf 100644 --- a/dll/win32/netcfgx/lang/ro-RO.rc +++ b/dll/win32/netcfgx/lang/ro-RO.rc @@ -33,8 +33,8 @@ CAPTION "Configurație alternativă" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Dacă acest calculator este utilizat în mai multe rețele, puteți specifica mai jos o configurație alternativă.", -1, 9, 9, 220, 20 + GROUPBOX "", -1, 9, 57, 228, 125, BS_GROUPBOX CONTROL "Adresă IP p&rivată obținută automat", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 - GROUPBOX "", -1, 9, 55, 228, 125, BS_GROUPBOX CONTROL "Configurată &manual", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 90, 12 LTEXT "Adresă I&P:", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12 diff --git a/dll/win32/netcfgx/lang/ru-RU.rc b/dll/win32/netcfgx/lang/ru-RU.rc index d10ceabeb80..bb8bf0151d8 100644 --- a/dll/win32/netcfgx/lang/ru-RU.rc +++ b/dll/win32/netcfgx/lang/ru-RU.rc @@ -31,8 +31,8 @@ CAPTION "Альтернативная конфигурация" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Если этот компьютер используется в нескольких сетях, введите параметры альтернативной конфигурации протокола IP:", -1, 9, 9, 230, 20 + GROUPBOX "", -1, 9, 57, 228, 125, BS_GROUPBOX CONTROL "А&втоматический частный IP-адрес", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 - GROUPBOX "", -1, 9, 55, 228, 125, BS_GROUPBOX CONTROL "Настраиваем&ый пользователем", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 130, 12 LTEXT "IP-&адрес:", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12 diff --git a/dll/win32/netcfgx/lang/sk-SK.rc b/dll/win32/netcfgx/lang/sk-SK.rc index f2a2c5bb770..070e64dd0b1 100644 --- a/dll/win32/netcfgx/lang/sk-SK.rc +++ b/dll/win32/netcfgx/lang/sk-SK.rc @@ -31,8 +31,8 @@ CAPTION "Alternate Configuration" FONT 8, "MS Shell Dlg" BEGIN LTEXT "If this computer is used on more than one network, enter the alternate IP settings below", -1, 9, 9, 220, 20 + GROUPBOX "", -1, 9, 57, 228, 125, BS_GROUPBOX CONTROL "Au&tomatic private IP address", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 - GROUPBOX "", -1, 9, 55, 228, 125, BS_GROUPBOX CONTROL "U&ser configured", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12 LTEXT "Adresa &IP:", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12 diff --git a/dll/win32/netcfgx/lang/sq-AL.rc b/dll/win32/netcfgx/lang/sq-AL.rc index ca63bd7e049..ce9a3936a30 100644 --- a/dll/win32/netcfgx/lang/sq-AL.rc +++ b/dll/win32/netcfgx/lang/sq-AL.rc @@ -33,8 +33,8 @@ CAPTION "Alterno Konfigurimin" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Në qoftë se ky kompjuter është përdorur në më shumë se një rrjet, futni cilësimet alternative IP poshtë", -1, 9, 9, 220, 20 + GROUPBOX "", -1, 9, 57, 228, 125, BS_GROUPBOX CONTROL "Adresë IP private auto%matike", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 - GROUPBOX "", -1, 9, 55, 228, 125, BS_GROUPBOX CONTROL "Përdorue&si konfiguruar", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12 LTEXT "Adresa &IP:", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12 diff --git a/dll/win32/netcfgx/lang/sv-SE.rc b/dll/win32/netcfgx/lang/sv-SE.rc index d9600dd2a6e..99bcc589d99 100644 --- a/dll/win32/netcfgx/lang/sv-SE.rc +++ b/dll/win32/netcfgx/lang/sv-SE.rc @@ -31,8 +31,8 @@ CAPTION "Alternate Configuration" FONT 8, "MS Shell Dlg" BEGIN LTEXT "If this computer is used on more than one network, enter the alternate IP settings below", -1, 9, 9, 220, 20 + GROUPBOX "", -1, 9, 57, 228, 125, BS_GROUPBOX CONTROL "Au&tomatic private IP address", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 - GROUPBOX "", -1, 9, 55, 228, 125, BS_GROUPBOX CONTROL "U&ser configured", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12 LTEXT "&IP address:", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12 diff --git a/dll/win32/netcfgx/lang/tr-TR.rc b/dll/win32/netcfgx/lang/tr-TR.rc index 74476640ea9..85b940910a5 100644 --- a/dll/win32/netcfgx/lang/tr-TR.rc +++ b/dll/win32/netcfgx/lang/tr-TR.rc @@ -33,8 +33,8 @@ CAPTION "Alternatif Yapılandırma" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Eğer bu bilgisayar birden çok ağda kullanılıyorsa, aşağıya alternatif IP ayarlarını giriniz.", -1, 9, 9, 220, 20 + GROUPBOX "", -1, 9, 57, 228, 125, BS_GROUPBOX CONTROL "&Otomatik özel IP adresi", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 - GROUPBOX "", -1, 9, 55, 228, 125, BS_GROUPBOX CONTROL "K&ullanıcının yapılandırdığı", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12 LTEXT "&IP adresi:", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12 diff --git a/dll/win32/netcfgx/lang/uk-UA.rc b/dll/win32/netcfgx/lang/uk-UA.rc index eb96e16a4b0..5f76b6f3928 100644 --- a/dll/win32/netcfgx/lang/uk-UA.rc +++ b/dll/win32/netcfgx/lang/uk-UA.rc @@ -31,8 +31,8 @@ CAPTION "Альтернативна конфігурація" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Якщо цей комп'ютер використовується в декількох мережах, введіть параметри альтернативної конфігурації IP", -1, 9, 9, 220, 20 + GROUPBOX "", -1, 9, 57, 228, 125, BS_GROUPBOX CONTROL "А&втоматична приватна IP-адреса", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 - GROUPBOX "", -1, 9, 55, 228, 125, BS_GROUPBOX CONTROL "Н&алаштована користувачем", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 120, 12 LTEXT "&IP-адреса:", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12 diff --git a/dll/win32/netcfgx/lang/zh-CN.rc b/dll/win32/netcfgx/lang/zh-CN.rc index e7fbc9fe6b6..4d9be5fa3b1 100644 --- a/dll/win32/netcfgx/lang/zh-CN.rc +++ b/dll/win32/netcfgx/lang/zh-CN.rc @@ -40,8 +40,8 @@ CAPTION "备用配置" FONT 9, "宋体" BEGIN LTEXT "如果此计算机使用多个网络，输入下面的备用 IP 设置", -1, 9, 9, 220, 20 + GROUPBOX "", -1, 9, 57, 228, 125, BS_GROUPBOX CONTROL "自动专用 IP 地址(&T)", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 - GROUPBOX "", -1, 9, 55, 228, 125, BS_GROUPBOX CONTROL "用户配置(&S)", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12 LTEXT "IP 地址(&I)：", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12 diff --git a/dll/win32/netcfgx/lang/zh-HK.rc b/dll/win32/netcfgx/lang/zh-HK.rc index 855fba1851d..858bf8f2769 100644 --- a/dll/win32/netcfgx/lang/zh-HK.rc +++ b/dll/win32/netcfgx/lang/zh-HK.rc @@ -39,8 +39,8 @@ CAPTION "其他設定" FONT 9, "新細明體" BEGIN LTEXT "如果這台電腦是被用在多個網絡上，請在下列輸入其他 IP 設定", -1, 9, 9, 220, 20 + GROUPBOX "", -1, 9, 57, 228, 125, BS_GROUPBOX CONTROL "自動專用 IP 位址(&T)", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 - GROUPBOX "", -1, 9, 55, 228, 125, BS_GROUPBOX CONTROL "使用者設定(&S)", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12 LTEXT "IP 位址(&I)：", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12 diff --git a/dll/win32/netcfgx/lang/zh-TW.rc b/dll/win32/netcfgx/lang/zh-TW.rc index 4468e1f86dc..d7ae82700a1 100644 --- a/dll/win32/netcfgx/lang/zh-TW.rc +++ b/dll/win32/netcfgx/lang/zh-TW.rc @@ -39,8 +39,8 @@ CAPTION "其他設定" FONT 9, "新細明體" BEGIN LTEXT "如果這台電腦是被用在多個網路上，在下列輸入其他 IP 設定", -1, 9, 9, 220, 20 + GROUPBOX "", -1, 9, 57, 228, 125, BS_GROUPBOX CONTROL "自動專用 IP 位址(&T)", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 - GROUPBOX "", -1, 9, 55, 228, 125, BS_GROUPBOX CONTROL "使用者設定(&S)", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12 LTEXT "IP 位址(&I)：", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12

1 0

[reactos] 05/05: [HOTPLUG] Update Russian (ru-RU) translation
by Stanislav Motylkov 03 Dec '23

03 Dec '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7c5f93a58283663f7a34d… commit 7c5f93a58283663f7a34d8e648dfdc20e7794d2d Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Mon Dec 4 00:20:40 2023 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Mon Dec 4 00:20:40 2023 +0300 [HOTPLUG] Update Russian (ru-RU) translation --- dll/cpl/hotplug/lang/ru-RU.rc | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/dll/cpl/hotplug/lang/ru-RU.rc b/dll/cpl/hotplug/lang/ru-RU.rc index 688ee84c6f6..314b56d6904 100644 --- a/dll/cpl/hotplug/lang/ru-RU.rc +++ b/dll/cpl/hotplug/lang/ru-RU.rc @@ -1,3 +1,10 @@ +/* + * PROJECT: Safely Remove Hardware Applet + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Russian resource file + * TRANSLATOR: Copyright 2020-2023 Stanislav Motylkov <binarymaster(a)mail.ru> + */ + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT IDD_SAFE_REMOVE_HARDWARE_DIALOG DIALOGEX 0, 0, 278, 245 @@ -10,7 +17,7 @@ BEGIN LTEXT "&Подключённые устройства:", 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 "&Свойства", IDC_SAFE_REMOVE_PROPERTIES, 158, 178, 55, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Сво&йства", IDC_SAFE_REMOVE_PROPERTIES, 158, 178, 55, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Остановить", 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 "Показать &компоненты устройств", IDC_SAFE_REMOVE_DISPLAY_COMPONENTS, 7, 208, 140, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP @@ -18,15 +25,15 @@ BEGIN END IDD_CONFIRM_STOP_HARDWARE_DIALOG DIALOGEX 32, 10, 256, 148 -CAPTION "Stop a Hardware Device" +CAPTION "Остановка устройства" STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Confirm devices to be stopped, choose OK to continue.", IDC_STATIC, 7, 8, 241, 14, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "ReactOS will attempt to stop the following devices. After the devices are stopped they may be removed safely.", IDC_STATIC, 7, 22, 240, 18, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Проверьте список останавливаемых устройств, и нажмите OK для продолжения.", IDC_STATIC, 7, 8, 241, 16, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "ReactOS попытается остановить следующие устройства. После остановки устройства могут быть безопасно отключены.", IDC_STATIC, 7, 26, 240, 18, WS_CHILD | WS_VISIBLE | WS_GROUP CONTROL "", IDC_CONFIRM_STOP_DEVICE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_ALIGNLEFT | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_GROUP | WS_TABSTOP, 8, 45, 240, 78 DEFPUSHBUTTON "OK", IDOK, 144, 127, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 198, 127, 50, 14 + PUSHBUTTON "Отмена", IDCANCEL, 198, 127, 50, 14 END @@ -48,6 +55,6 @@ STRINGTABLE BEGIN IDS_CPLNAME "Безопасное извлечение устройств" IDS_CPLDESCRIPTION "Безопасно отключайте или извлекайте устройства из вашего компьютера." - IDS_UNKNOWN_DEVICE "Unknown Device" - IDS_EJECT_ERROR_FORMAT "Failed to remove device (0x%x)\0" + IDS_UNKNOWN_DEVICE "Неизвестное устройство" + IDS_EJECT_ERROR_FORMAT "Не удалось извлечь устройство (0x%x)\0" END

1 0

[reactos] 04/05: [STOBJECT] Update Russian (ru-RU) translation
by Stanislav Motylkov 03 Dec '23

03 Dec '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0fd51c9fe341e3c0096d2… commit 0fd51c9fe341e3c0096d27e73f9077e52bf6bc06 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sun Dec 3 23:56:07 2023 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sun Dec 3 23:56:07 2023 +0300 [STOBJECT] Update Russian (ru-RU) translation --- dll/shellext/stobject/lang/ru-RU.rc | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dll/shellext/stobject/lang/ru-RU.rc b/dll/shellext/stobject/lang/ru-RU.rc index 07fae4b374d..a3bd305690f 100644 --- a/dll/shellext/stobject/lang/ru-RU.rc +++ b/dll/shellext/stobject/lang/ru-RU.rc @@ -1,11 +1,17 @@ -/* Russian language resource file by Kudratov Olimjon (olim98(a)bk.ru) */ +/* + * PROJECT: ReactOS system libraries + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Russian resource file + * TRANSLATORS: Copyright 2016 Kudratov Olimjon <olim98(a)bk.ru> + * Copyright 2023 Stanislav Motylkov <binarymaster(a)mail.ru> + */ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT IDD_POWER_METER DIALOGEX 0, 0, 252, 218 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_CONTEXTHELP -CAPTION "Power Meter" +CAPTION "Индикатор батарей" FONT 8, "MS Shell Dlg" BEGIN CONTROL "Статус электропитания", 1001, "Button", BS_GROUPBOX | WS_CHILD | WS_VISIBLE, 9, 20, 234, 189 @@ -21,7 +27,7 @@ BEGIN IDS_PWR_METER "&Открыть показатели питания" IDS_PWR_RUN "shell32.dll,Control_RunDLL PowerCfg.cpl" IDS_PWR_PERCENT_REMAINING "%u%% осталось" - IDS_PWR_CHARGING "%u%% and charging" + IDS_PWR_CHARGING "%u%% и заряжается" IDS_PWR_UNKNOWN_REMAINING "Неизвестно" IDS_PWR_AC "От сети переменного тока" IDS_PWR_HOURS_REMAINING "%1!u!:%2!02u! часов (%3!u!%%) осталось"

1 0

[reactos] 03/05: [USETUP] Update Russian (ru-RU) translation
by Stanislav Motylkov 03 Dec '23

03 Dec '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8bc6c8fa5623c6fe67af3… commit 8bc6c8fa5623c6fe67af30e1c48dcd3dc1119ac6 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sun Dec 3 23:38:32 2023 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sun Dec 3 23:40:45 2023 +0300 [USETUP] Update Russian (ru-RU) translation - Translate one untranslated string - Fix some "е" -> "ё" occurences and punctuation. --- base/setup/usetup/lang/ru-RU.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/base/setup/usetup/lang/ru-RU.h b/base/setup/usetup/lang/ru-RU.h index d6f51eb6a1f..745138aaa1b 100644 --- a/base/setup/usetup/lang/ru-RU.h +++ b/base/setup/usetup/lang/ru-RU.h @@ -321,7 +321,7 @@ static MUI_ENTRY ruRULicensePageEntries[] = { 8, 11, - "\202\341\245 \257\340\256\243\340\240\254\254\255\256\245 \256\241\245\341\257\245\347\245\255\250\245 \242\345\256\244\357\351\245\245 \242 \341\250\341\342\245\254\343 ReactOS \242\353\257\343\351\245\255\256", + "\202\341\361 \257\340\256\243\340\240\254\254\255\256\245 \256\241\245\341\257\245\347\245\255\250\245, \242\345\256\244\357\351\245\245 \242 \341\250\341\342\245\254\343 ReactOS, \242\353\257\343\351\245\255\256", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -1207,7 +1207,7 @@ static MUI_ENTRY ruRUConfirmDeleteSystemPartitionEntries[] = { 6, 17, - "\252\256\254\257\354\356\342\245\340 \341 \246\245\341\342\252\256\243\256 \244\250\341\252\240, \257\256\252\240 \255\245 \247\240\252\256\255\347\250\342\245 \343\341\342\240\255\256\242\252\343 ReactOS.", + "\252\256\254\257\354\356\342\245\340 \341 \246\361\341\342\252\256\243\256 \244\250\341\252\240, \257\256\252\240 \255\245 \247\240\252\256\255\347\250\342\245 \343\341\342\240\255\256\242\252\343 ReactOS.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -1439,21 +1439,21 @@ static MUI_ENTRY ruRUBootLoaderSelectPageEntries[] = { 6, 8, - "Please select where Setup should install the bootloader:", + "\217\256\246\240\253\343\251\341\342\240, \242\353\241\245\340\250\342\245 \340\240\341\257\256\253\256\246\245\255\250\245 \244\253\357 \343\341\342\240\255\256\242\252\250 \247\240\243\340\343\247\347\250\252\240:", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 12, - "\223\341\342\240\255\256\242\250\342\354 \247\240\243\340\343\247\347\250\252 \255\240 \246\245\341\342\252\250\251 \244\250\341\252 (MBR \250 VBR).", + "\223\341\342\240\255\256\242\250\342\354 \247\240\243\340\343\247\347\250\252 \255\240 \246\361\341\342\252\250\251 \244\250\341\252 (MBR \250 VBR).", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 13, - "\223\341\342\240\255\256\242\250\342\354 \247\240\243\340\343\247\347\250\252 \255\240 \246\245\341\342\252\250\251 \244\250\341\252 (\342\256\253\354\252\256 VBR).", + "\223\341\342\240\255\256\242\250\342\354 \247\240\243\340\343\247\347\250\252 \255\240 \246\361\341\342\252\250\251 \244\250\341\252 (\342\256\253\354\252\256 VBR).", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -1536,7 +1536,7 @@ static MUI_ENTRY ruRUBootLoaderRemovableDiskPageEntries[] = { 6, 9, - "\246\245\341\342\252\250\251 \244\250\341\252 \242\240\350\245\243\256 \252\256\254\257\354\356\342\245\340\240.", + "\246\361\341\342\252\250\251 \244\250\341\252 \242\240\350\245\243\256 \252\256\254\257\354\356\342\245\340\240.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -1886,7 +1886,7 @@ MUI_ERROR ruRUErrorEntries[] = }, { // ERROR_NO_HDD - "\215\245 \343\244\240\253\256\341\354 \255\240\251\342\250 \246\245\341\342\252\250\251 \244\250\341\252.\n", + "\215\245 \343\244\240\253\256\341\354 \255\240\251\342\250 \246\361\341\342\252\250\251 \244\250\341\252.\n", "ENTER = \217\245\340\245\247\240\243\340\343\247\252\240" }, { @@ -1941,7 +1941,7 @@ MUI_ERROR ruRUErrorEntries[] = }, { // ERROR_WARN_PARTITION, - "\215\240\251\244\245\255 \257\256 \252\340\240\251\255\245\251 \254\245\340\245 \256\244\250\255 \246\245\341\342\252\250\251 \244\250\341\252, \252\256\342\256\340\353\251 \341\256\244\245\340\246\250\342 \340\240\247\244\245\253\n" + "\215\240\251\244\245\255 \257\256 \252\340\240\251\255\245\251 \254\245\340\245 \256\244\250\255 \246\361\341\342\252\250\251 \244\250\341\252, \252\256\342\256\340\353\251 \341\256\244\245\340\246\250\342 \340\240\247\244\245\253\n" "\255\245\257\256\244\244\245\340\246\250\242\240\245\254\353\251 ReactOS!\n" "\n" "\221\256\247\244\240\255\250\245 \250\253\250 \343\244\240\253\245\255\250\245 \340\240\247\244\245\253\256\242 \254\256\246\245\342 \255\240\340\343\350\250\342\354 \342\240\241\253\250\346\343 \340\240\247\244\245\253\256\242.\n" @@ -2322,11 +2322,11 @@ MUI_STRING ruRUStrings[] = {STRING_PARTTYPE, "\207\240\257\250\341\354 0x%02x"}, {STRING_HDDINFO1, - // "\206\245\341\342\252\250\251 \244\250\341\252 %lu (%I64u %s), \217\256\340\342=%hu, \230\250\255\240=%hu, Id=%hu (%wZ) [%s]" - "%I64u %s \206\245\341\342\252\250\251 \244\250\341\252 %lu (\217\256\340\342=%hu, \230\250\255\240=%hu, Id=%hu) \255\240 %wZ [%s]"}, + // "\206\361\341\342\252\250\251 \244\250\341\252 %lu (%I64u %s), \217\256\340\342=%hu, \230\250\255\240=%hu, Id=%hu (%wZ) [%s]" + "%I64u %s \206\361\341\342\252\250\251 \244\250\341\252 %lu (\217\256\340\342=%hu, \230\250\255\240=%hu, Id=%hu) \255\240 %wZ [%s]"}, {STRING_HDDINFO2, - // "\206\245\341\342\252\250\251 \244\250\341\252 %lu (%I64u %s), \217\256\340\342=%hu, \230\250\255\240=%hu, Id=%hu [%s]" - "%I64u %s \206\245\341\342\252\250\251 \244\250\341\252 %lu (\217\256\340\342=%hu, \230\250\255\240=%hu, Id=%hu) [%s]"}, + // "\206\361\341\342\252\250\251 \244\250\341\252 %lu (%I64u %s), \217\256\340\342=%hu, \230\250\255\240=%hu, Id=%hu [%s]" + "%I64u %s \206\361\341\342\252\250\251 \244\250\341\252 %lu (\217\256\340\342=%hu, \230\250\255\240=%hu, Id=%hu) [%s]"}, {STRING_UNPSPACE, "\215\245\340\240\247\254\245\347\245\255\255\256\245 \257\340\256\341\342\340\240\255\341\342\242\256"}, {STRING_MAXSIZE,

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2023