https://git.reactos.org/?p=reactos.git;a=commitdiff;h=068fcd38945d0c306fe00…
commit 068fcd38945d0c306fe000744ccd3e85e2d76a21
Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
AuthorDate: Mon Dec 26 13:16:17 2022 +0100
Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
CommitDate: Mon Dec 26 13:16:31 2022 +0100
[REG] Fix mis-converted Yes-No-All keypress shortcuts strings.
The PO \"#msgctx\" control strings were not stripped out.
---
base/applications/cmdutils/reg/lang/bg-BG.rc | 6 +++---
base/applications/cmdutils/reg/lang/cs-CZ.rc | 6 +++---
base/applications/cmdutils/reg/lang/da-DK.rc | 6 +++---
base/applications/cmdutils/reg/lang/de-DE.rc | 6 +++---
base/applications/cmdutils/reg/lang/en-US.rc | 6 +++---
base/applications/cmdutils/reg/lang/es-ES.rc | 6 +++---
base/applications/cmdutils/reg/lang/fr-FR.rc | 6 +++---
base/applications/cmdutils/reg/lang/it-IT.rc | 6 +++---
base/applications/cmdutils/reg/lang/ja-JP.rc | 6 +++---
base/applications/cmdutils/reg/lang/ko-KR.rc | 6 +++---
base/applications/cmdutils/reg/lang/lt-LT.rc | 6 +++---
base/applications/cmdutils/reg/lang/nl-NL.rc | 6 +++---
base/applications/cmdutils/reg/lang/no-NO.rc | 6 +++---
base/applications/cmdutils/reg/lang/pl-PL.rc | 6 +++---
base/applications/cmdutils/reg/lang/pt-PT.rc | 6 +++---
base/applications/cmdutils/reg/lang/ro-RO.rc | 6 +++---
base/applications/cmdutils/reg/lang/ru-RU.rc | 6 +++---
base/applications/cmdutils/reg/lang/sl-SI.rc | 6 +++---
base/applications/cmdutils/reg/lang/sq-AL.rc | 6 +++---
base/applications/cmdutils/reg/lang/sv-SE.rc | 6 +++---
base/applications/cmdutils/reg/lang/tr-TR.rc | 6 +++---
base/applications/cmdutils/reg/lang/uk-UA.rc | 6 +++---
base/applications/cmdutils/reg/lang/zh-CN.rc | 2 +-
base/applications/cmdutils/reg/lang/zh-TW.rc | 6 +++---
24 files changed, 70 insertions(+), 70 deletions(-)
diff --git a/base/applications/cmdutils/reg/lang/bg-BG.rc b/base/applications/cmdutils/reg/lang/bg-BG.rc
index 63677c3ceee..b95b72a364b 100644
--- a/base/applications/cmdutils/reg/lang/bg-BG.rc
+++ b/base/applications/cmdutils/reg/lang/bg-BG.rc
@@ -98,9 +98,9 @@ For help on a specific operation, type:\n\
STRING_MISSING_HEXDATA, "reg: The option [/d] must be followed by a valid hexadecimal value\n"
STRING_UNHANDLED_TYPE, "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n"
STRING_OVERWRITE_VALUE, "The registry value '%1' already exists. Do you want to overwrite it?"
- STRING_YES, "#msgctxt#Yes key#Y"
- STRING_NO, "#msgctxt#No key#N"
- STRING_ALL, "#msgctxt#All key#A"
+ STRING_YES, "Y"
+ STRING_NO, "N"
+ STRING_ALL, "A"
STRING_YESNO, " (Yes|No)"
STRING_YESNOALL, " (Yes|No|All)"
STRING_CANCELLED, "reg: The registry operation was cancelled\n"
diff --git a/base/applications/cmdutils/reg/lang/cs-CZ.rc b/base/applications/cmdutils/reg/lang/cs-CZ.rc
index e54d13ec51e..81cabc4f877 100644
--- a/base/applications/cmdutils/reg/lang/cs-CZ.rc
+++ b/base/applications/cmdutils/reg/lang/cs-CZ.rc
@@ -102,9 +102,9 @@ For help on a specific operation, type:\n\
STRING_MISSING_HEXDATA, "reg: The option [/d] must be followed by a valid hexadecimal value\n"
STRING_UNHANDLED_TYPE, "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n"
STRING_OVERWRITE_VALUE, "The registry value '%1' already exists. Do you want to overwrite it?"
- STRING_YES, "#msgctxt#Yes key#Y"
- STRING_NO, "#msgctxt#No key#N"
- STRING_ALL, "#msgctxt#All key#A"
+ STRING_YES, "Y"
+ STRING_NO, "N"
+ STRING_ALL, "A"
STRING_YESNO, " (Yes|No)"
STRING_YESNOALL, " (Yes|No|All)"
STRING_CANCELLED, "reg: The registry operation was cancelled\n"
diff --git a/base/applications/cmdutils/reg/lang/da-DK.rc b/base/applications/cmdutils/reg/lang/da-DK.rc
index 66ad85c162b..9c199645cde 100644
--- a/base/applications/cmdutils/reg/lang/da-DK.rc
+++ b/base/applications/cmdutils/reg/lang/da-DK.rc
@@ -97,9 +97,9 @@ For help on a specific operation, type:\n\
STRING_MISSING_HEXDATA, "reg: The option [/d] must be followed by a valid hexadecimal value\n"
STRING_UNHANDLED_TYPE, "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n"
STRING_OVERWRITE_VALUE, "The registry value '%1' already exists. Do you want to overwrite it?"
- STRING_YES, "#msgctxt#Yes key#Y"
- STRING_NO, "#msgctxt#No key#N"
- STRING_ALL, "#msgctxt#All key#A"
+ STRING_YES, "Y"
+ STRING_NO, "N"
+ STRING_ALL, "A"
STRING_YESNO, " (Yes|No)"
STRING_YESNOALL, " (Yes|No|All)"
STRING_CANCELLED, "reg: The registry operation was cancelled\n"
diff --git a/base/applications/cmdutils/reg/lang/de-DE.rc b/base/applications/cmdutils/reg/lang/de-DE.rc
index e00c30dab82..bff91675801 100644
--- a/base/applications/cmdutils/reg/lang/de-DE.rc
+++ b/base/applications/cmdutils/reg/lang/de-DE.rc
@@ -97,9 +97,9 @@ For help on a specific operation, type:\n\
STRING_MISSING_HEXDATA, "reg: The option [/d] must be followed by a valid hexadecimal value\n"
STRING_UNHANDLED_TYPE, "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n"
STRING_OVERWRITE_VALUE, "The registry value '%1' already exists. Do you want to overwrite it?"
- STRING_YES, "#msgctxt#Yes key#Y"
- STRING_NO, "#msgctxt#No key#N"
- STRING_ALL, "#msgctxt#All key#A"
+ STRING_YES, "Y"
+ STRING_NO, "N"
+ STRING_ALL, "A"
STRING_YESNO, " (Yes|No)"
STRING_YESNOALL, " (Yes|No|All)"
STRING_CANCELLED, "reg: The registry operation was cancelled\n"
diff --git a/base/applications/cmdutils/reg/lang/en-US.rc b/base/applications/cmdutils/reg/lang/en-US.rc
index d9fdb613113..3b3a61c0d54 100644
--- a/base/applications/cmdutils/reg/lang/en-US.rc
+++ b/base/applications/cmdutils/reg/lang/en-US.rc
@@ -98,9 +98,9 @@ For help on a specific operation, type:\n\
STRING_MISSING_HEXDATA, "reg: The option [/d] must be followed by a valid hexadecimal value\n"
STRING_UNHANDLED_TYPE, "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n"
STRING_OVERWRITE_VALUE, "The registry value '%1' already exists. Do you want to overwrite it?"
- STRING_YES, "#msgctxt#Yes key#Y"
- STRING_NO, "#msgctxt#No key#N"
- STRING_ALL, "#msgctxt#All key#A"
+ STRING_YES, "Y"
+ STRING_NO, "N"
+ STRING_ALL, "A"
STRING_YESNO, " (Yes|No)"
STRING_YESNOALL, " (Yes|No|All)"
STRING_CANCELLED, "reg: The registry operation was cancelled\n"
diff --git a/base/applications/cmdutils/reg/lang/es-ES.rc b/base/applications/cmdutils/reg/lang/es-ES.rc
index 53f0c8f37c6..93967ed105a 100644
--- a/base/applications/cmdutils/reg/lang/es-ES.rc
+++ b/base/applications/cmdutils/reg/lang/es-ES.rc
@@ -103,9 +103,9 @@ For help on a specific operation, type:\n\
STRING_MISSING_HEXDATA, "reg: La opción [/d] debe estar seguido por un balor hexadecimal válido\n"
STRING_UNHANDLED_TYPE, "reg: Incapaz de trabajar con ese tipo de dato de Registro [/t 0x%1!x!, /d %2]\n"
STRING_OVERWRITE_VALUE, "El valor '%1' ya existe en el Registro. ¿Desea sobreescribirlo?"
- STRING_YES, "#msgctxt#Yes key#Y"
- STRING_NO, "#msgctxt#No key#N"
- STRING_ALL, "#msgctxt#All key#A"
+ STRING_YES, "Y"
+ STRING_NO, "N"
+ STRING_ALL, "A"
STRING_YESNO, " (Yes|No)"
STRING_YESNOALL, " (Yes|No|All)"
STRING_CANCELLED, "La operación de registro se ha cancelado\n"
diff --git a/base/applications/cmdutils/reg/lang/fr-FR.rc b/base/applications/cmdutils/reg/lang/fr-FR.rc
index 0bbc97aa078..f40911a06c1 100644
--- a/base/applications/cmdutils/reg/lang/fr-FR.rc
+++ b/base/applications/cmdutils/reg/lang/fr-FR.rc
@@ -98,9 +98,9 @@ For help on a specific operation, type:\n\
STRING_MISSING_HEXDATA, "reg: The option [/d] must be followed by a valid hexadecimal value\n"
STRING_UNHANDLED_TYPE, "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n"
STRING_OVERWRITE_VALUE, "The registry value '%1' already exists. Do you want to overwrite it?"
- STRING_YES, "#msgctxt#Yes key#Y"
- STRING_NO, "#msgctxt#No key#N"
- STRING_ALL, "#msgctxt#All key#A"
+ STRING_YES, "Y"
+ STRING_NO, "N"
+ STRING_ALL, "A"
STRING_YESNO, " (Yes|No)"
STRING_YESNOALL, " (Yes|No|All)"
STRING_CANCELLED, "reg: The registry operation was cancelled\n"
diff --git a/base/applications/cmdutils/reg/lang/it-IT.rc b/base/applications/cmdutils/reg/lang/it-IT.rc
index ec6a6b04487..9a451bcedda 100644
--- a/base/applications/cmdutils/reg/lang/it-IT.rc
+++ b/base/applications/cmdutils/reg/lang/it-IT.rc
@@ -98,9 +98,9 @@ For help on a specific operation, type:\n\
STRING_MISSING_HEXDATA, "reg: The option [/d] must be followed by a valid hexadecimal value\n"
STRING_UNHANDLED_TYPE, "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n"
STRING_OVERWRITE_VALUE, "The registry value '%1' already exists. Do you want to overwrite it?"
- STRING_YES, "#msgctxt#Yes key#Y"
- STRING_NO, "#msgctxt#No key#N"
- STRING_ALL, "#msgctxt#All key#A"
+ STRING_YES, "Y"
+ STRING_NO, "N"
+ STRING_ALL, "A"
STRING_YESNO, " (Yes|No)"
STRING_YESNOALL, " (Yes|No|All)"
STRING_CANCELLED, "reg: The registry operation was cancelled\n"
diff --git a/base/applications/cmdutils/reg/lang/ja-JP.rc b/base/applications/cmdutils/reg/lang/ja-JP.rc
index 09c3ec15499..1803676922e 100644
--- a/base/applications/cmdutils/reg/lang/ja-JP.rc
+++ b/base/applications/cmdutils/reg/lang/ja-JP.rc
@@ -98,9 +98,9 @@ For help on a specific operation, type:\n\
STRING_MISSING_HEXDATA, "reg: The option [/d] must be followed by a valid hexadecimal value\n"
STRING_UNHANDLED_TYPE, "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n"
STRING_OVERWRITE_VALUE, "The registry value '%1' already exists. Do you want to overwrite it?"
- STRING_YES, "#msgctxt#Yes key#Y"
- STRING_NO, "#msgctxt#No key#N"
- STRING_ALL, "#msgctxt#All key#A"
+ STRING_YES, "Y"
+ STRING_NO, "N"
+ STRING_ALL, "A"
STRING_YESNO, " (Yes|No)"
STRING_YESNOALL, " (Yes|No|All)"
STRING_CANCELLED, "reg: The registry operation was cancelled\n"
diff --git a/base/applications/cmdutils/reg/lang/ko-KR.rc b/base/applications/cmdutils/reg/lang/ko-KR.rc
index 6ff353204ab..640f105abe8 100644
--- a/base/applications/cmdutils/reg/lang/ko-KR.rc
+++ b/base/applications/cmdutils/reg/lang/ko-KR.rc
@@ -98,9 +98,9 @@ For help on a specific operation, type:\n\
STRING_MISSING_HEXDATA, "reg: The option [/d] must be followed by a valid hexadecimal value\n"
STRING_UNHANDLED_TYPE, "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n"
STRING_OVERWRITE_VALUE, "The registry value '%1' already exists. Do you want to overwrite it?"
- STRING_YES, "#msgctxt#Yes key#Y"
- STRING_NO, "#msgctxt#No key#N"
- STRING_ALL, "#msgctxt#All key#A"
+ STRING_YES, "Y"
+ STRING_NO, "N"
+ STRING_ALL, "A"
STRING_YESNO, " (Yes|No)"
STRING_YESNOALL, " (Yes|No|All)"
STRING_CANCELLED, "reg: The registry operation was cancelled\n"
diff --git a/base/applications/cmdutils/reg/lang/lt-LT.rc b/base/applications/cmdutils/reg/lang/lt-LT.rc
index f59e9e0214f..a2705fd1bab 100644
--- a/base/applications/cmdutils/reg/lang/lt-LT.rc
+++ b/base/applications/cmdutils/reg/lang/lt-LT.rc
@@ -98,9 +98,9 @@ For help on a specific operation, type:\n\
STRING_MISSING_HEXDATA, "reg: The option [/d] must be followed by a valid hexadecimal value\n"
STRING_UNHANDLED_TYPE, "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n"
STRING_OVERWRITE_VALUE, "The registry value '%1' already exists. Do you want to overwrite it?"
- STRING_YES, "#msgctxt#Yes key#Y"
- STRING_NO, "#msgctxt#No key#N"
- STRING_ALL, "#msgctxt#All key#A"
+ STRING_YES, "Y"
+ STRING_NO, "N"
+ STRING_ALL, "A"
STRING_YESNO, " (Yes|No)"
STRING_YESNOALL, " (Yes|No|All)"
STRING_CANCELLED, "reg: The registry operation was cancelled\n"
diff --git a/base/applications/cmdutils/reg/lang/nl-NL.rc b/base/applications/cmdutils/reg/lang/nl-NL.rc
index 1200e03927a..72ae96c360b 100644
--- a/base/applications/cmdutils/reg/lang/nl-NL.rc
+++ b/base/applications/cmdutils/reg/lang/nl-NL.rc
@@ -97,9 +97,9 @@ For help on a specific operation, type:\n\
STRING_MISSING_HEXDATA, "reg: The option [/d] must be followed by a valid hexadecimal value\n"
STRING_UNHANDLED_TYPE, "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n"
STRING_OVERWRITE_VALUE, "The registry value '%1' already exists. Do you want to overwrite it?"
- STRING_YES, "#msgctxt#Yes key#Y"
- STRING_NO, "#msgctxt#No key#N"
- STRING_ALL, "#msgctxt#All key#A"
+ STRING_YES, "Y"
+ STRING_NO, "N"
+ STRING_ALL, "A"
STRING_YESNO, " (Yes|No)"
STRING_YESNOALL, " (Yes|No|All)"
STRING_CANCELLED, "reg: The registry operation was cancelled\n"
diff --git a/base/applications/cmdutils/reg/lang/no-NO.rc b/base/applications/cmdutils/reg/lang/no-NO.rc
index e8379948982..0a4d18d5048 100644
--- a/base/applications/cmdutils/reg/lang/no-NO.rc
+++ b/base/applications/cmdutils/reg/lang/no-NO.rc
@@ -98,9 +98,9 @@ For help on a specific operation, type:\n\
STRING_MISSING_HEXDATA, "reg: The option [/d] must be followed by a valid hexadecimal value\n"
STRING_UNHANDLED_TYPE, "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n"
STRING_OVERWRITE_VALUE, "The registry value '%1' already exists. Do you want to overwrite it?"
- STRING_YES, "#msgctxt#Yes key#Y"
- STRING_NO, "#msgctxt#No key#N"
- STRING_ALL, "#msgctxt#All key#A"
+ STRING_YES, "Y"
+ STRING_NO, "N"
+ STRING_ALL, "A"
STRING_YESNO, " (Yes|No)"
STRING_YESNOALL, " (Yes|No|All)"
STRING_CANCELLED, "reg: The registry operation was cancelled\n"
diff --git a/base/applications/cmdutils/reg/lang/pl-PL.rc b/base/applications/cmdutils/reg/lang/pl-PL.rc
index 8840ccfbc6f..731f4dec327 100644
--- a/base/applications/cmdutils/reg/lang/pl-PL.rc
+++ b/base/applications/cmdutils/reg/lang/pl-PL.rc
@@ -98,9 +98,9 @@ For help on a specific operation, type:\n\
STRING_MISSING_HEXDATA, "reg: Opcja [/d] musi poprzedzona poprawną wartością szesnastkową\n"
STRING_UNHANDLED_TYPE, "reg: Nieobsługiwany typ danych rejestru [/t 0x%1!x!, /d %2]\n"
STRING_OVERWRITE_VALUE, "Wartość rejestru '%1' już istnieje. Czy chcessz ją zastąpić?"
- STRING_YES, "#msgctxt#Yes key#Y"
- STRING_NO, "#msgctxt#No key#N"
- STRING_ALL, "#msgctxt#All key#A"
+ STRING_YES, "Y"
+ STRING_NO, "N"
+ STRING_ALL, "A"
STRING_YESNO, " (Yes|No)"
STRING_YESNOALL, " (Yes|No|All)"
STRING_CANCELLED, "Operacja rejestru została anulowana\n"
diff --git a/base/applications/cmdutils/reg/lang/pt-PT.rc b/base/applications/cmdutils/reg/lang/pt-PT.rc
index 90aa4ff33c2..ab146793ab9 100644
--- a/base/applications/cmdutils/reg/lang/pt-PT.rc
+++ b/base/applications/cmdutils/reg/lang/pt-PT.rc
@@ -97,9 +97,9 @@ For help on a specific operation, type:\n\
STRING_MISSING_HEXDATA, "reg: The option [/d] must be followed by a valid hexadecimal value\n"
STRING_UNHANDLED_TYPE, "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n"
STRING_OVERWRITE_VALUE, "The registry value '%1' already exists. Do you want to overwrite it?"
- STRING_YES, "#msgctxt#Yes key#Y"
- STRING_NO, "#msgctxt#No key#N"
- STRING_ALL, "#msgctxt#All key#A"
+ STRING_YES, "Y"
+ STRING_NO, "N"
+ STRING_ALL, "A"
STRING_YESNO, " (Yes|No)"
STRING_YESNOALL, " (Yes|No|All)"
STRING_CANCELLED, "reg: The registry operation was cancelled\n"
diff --git a/base/applications/cmdutils/reg/lang/ro-RO.rc b/base/applications/cmdutils/reg/lang/ro-RO.rc
index d7e7e2c40d5..d0972749ccf 100644
--- a/base/applications/cmdutils/reg/lang/ro-RO.rc
+++ b/base/applications/cmdutils/reg/lang/ro-RO.rc
@@ -104,9 +104,9 @@ For help on a specific operation, type:\n\
STRING_MISSING_HEXDATA, "reg: Opțiunea [/d] trebuie să fie urmată de o valoare hexezecimală\n"
STRING_UNHANDLED_TYPE, "reg: Tip de dată nerecunoscut [/t 0x%1!x!, /d %2]\n"
STRING_OVERWRITE_VALUE, "Valoarea de registru «%1» deja există. Doriți s-o suprascrieți?"
- STRING_YES, "#msgctxt#Yes key#Y"
- STRING_NO, "#msgctxt#No key#N"
- STRING_ALL, "#msgctxt#All key#A"
+ STRING_YES, "Y"
+ STRING_NO, "N"
+ STRING_ALL, "A"
STRING_YESNO, " (Yes|No)"
STRING_YESNOALL, " (Yes|No|All)"
STRING_CANCELLED, "Operația de registru a fost anulată\n"
diff --git a/base/applications/cmdutils/reg/lang/ru-RU.rc b/base/applications/cmdutils/reg/lang/ru-RU.rc
index 4c9fd4833d0..22b17b9dbd1 100644
--- a/base/applications/cmdutils/reg/lang/ru-RU.rc
+++ b/base/applications/cmdutils/reg/lang/ru-RU.rc
@@ -97,9 +97,9 @@ For help on a specific operation, type:\n\
STRING_MISSING_HEXDATA, "Ошибка: Задайте допустимое шестнадцатеричное значение параметра [/d]\n"
STRING_UNHANDLED_TYPE, "reg: Неизвестный тип данных реестра [/t 0x%1!x!, /d %2]\n"
STRING_OVERWRITE_VALUE, "Параметр '%1' уже существует. Заменить?"
- STRING_YES, "#msgctxt#Yes key#Y"
- STRING_NO, "#msgctxt#No key#N"
- STRING_ALL, "#msgctxt#All key#A"
+ STRING_YES, "Y"
+ STRING_NO, "N"
+ STRING_ALL, "A"
STRING_YESNO, " (Yes|No)"
STRING_YESNOALL, " (Yes|No|All)"
STRING_CANCELLED, "reg: The registry operation was cancelled\n"
diff --git a/base/applications/cmdutils/reg/lang/sl-SI.rc b/base/applications/cmdutils/reg/lang/sl-SI.rc
index f4512921071..3e6ac850c84 100644
--- a/base/applications/cmdutils/reg/lang/sl-SI.rc
+++ b/base/applications/cmdutils/reg/lang/sl-SI.rc
@@ -98,9 +98,9 @@ For help on a specific operation, type:\n\
STRING_MISSING_HEXDATA, "reg: The option [/d] must be followed by a valid hexadecimal value\n"
STRING_UNHANDLED_TYPE, "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n"
STRING_OVERWRITE_VALUE, "The registry value '%1' already exists. Do you want to overwrite it?"
- STRING_YES, "#msgctxt#Yes key#Y"
- STRING_NO, "#msgctxt#No key#N"
- STRING_ALL, "#msgctxt#All key#A"
+ STRING_YES, "Y"
+ STRING_NO, "N"
+ STRING_ALL, "A"
STRING_YESNO, " (Yes|No)"
STRING_YESNOALL, " (Yes|No|All)"
STRING_CANCELLED, "reg: The registry operation was cancelled\n"
diff --git a/base/applications/cmdutils/reg/lang/sq-AL.rc b/base/applications/cmdutils/reg/lang/sq-AL.rc
index 5b6968d06b0..b7ca52553d3 100644
--- a/base/applications/cmdutils/reg/lang/sq-AL.rc
+++ b/base/applications/cmdutils/reg/lang/sq-AL.rc
@@ -102,9 +102,9 @@ For help on a specific operation, type:\n\
STRING_MISSING_HEXDATA, "reg: The option [/d] must be followed by a valid hexadecimal value\n"
STRING_UNHANDLED_TYPE, "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n"
STRING_OVERWRITE_VALUE, "The registry value '%1' already exists. Do you want to overwrite it?"
- STRING_YES, "#msgctxt#Yes key#Y"
- STRING_NO, "#msgctxt#No key#N"
- STRING_ALL, "#msgctxt#All key#A"
+ STRING_YES, "Y"
+ STRING_NO, "N"
+ STRING_ALL, "A"
STRING_YESNO, " (Yes|No)"
STRING_YESNOALL, " (Yes|No|All)"
STRING_CANCELLED, "reg: The registry operation was cancelled\n"
diff --git a/base/applications/cmdutils/reg/lang/sv-SE.rc b/base/applications/cmdutils/reg/lang/sv-SE.rc
index 67fed219bfd..8d59c84a5c9 100644
--- a/base/applications/cmdutils/reg/lang/sv-SE.rc
+++ b/base/applications/cmdutils/reg/lang/sv-SE.rc
@@ -98,9 +98,9 @@ For help on a specific operation, type:\n\
STRING_MISSING_HEXDATA, "reg: The option [/d] must be followed by a valid hexadecimal value\n"
STRING_UNHANDLED_TYPE, "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n"
STRING_OVERWRITE_VALUE, "The registry value '%1' already exists. Do you want to overwrite it?"
- STRING_YES, "#msgctxt#Yes key#Y"
- STRING_NO, "#msgctxt#No key#N"
- STRING_ALL, "#msgctxt#All key#A"
+ STRING_YES, "Y"
+ STRING_NO, "N"
+ STRING_ALL, "A"
STRING_YESNO, " (Yes|No)"
STRING_YESNOALL, " (Yes|No|All)"
STRING_CANCELLED, "reg: The registry operation was cancelled\n"
diff --git a/base/applications/cmdutils/reg/lang/tr-TR.rc b/base/applications/cmdutils/reg/lang/tr-TR.rc
index 01c7607e81e..54c70793ba6 100644
--- a/base/applications/cmdutils/reg/lang/tr-TR.rc
+++ b/base/applications/cmdutils/reg/lang/tr-TR.rc
@@ -101,9 +101,9 @@ For help on a specific operation, type:\n\
STRING_UNHANDLED_TYPE, "reg: İşlenemeyen kayıt defteri veri türü [/t 0x%1!x!, /d %2]\n"
STRING_OVERWRITE_VALUE, """%1"" kayıt defteri değeri önceden var. Üzerine yazmak ister misiniz?"
- STRING_YES, "#msgctxt#Yes key#Y"
- STRING_NO, "#msgctxt#No key#N"
- STRING_ALL, "#msgctxt#All key#A"
+ STRING_YES, "Y"
+ STRING_NO, "N"
+ STRING_ALL, "A"
STRING_YESNO, " (Evet|Hayır)"
STRING_YESNOALL, " (Yes|No|All)"
STRING_CANCELLED, "Kayıt defteri işlemi iptal edildi\n"
diff --git a/base/applications/cmdutils/reg/lang/uk-UA.rc b/base/applications/cmdutils/reg/lang/uk-UA.rc
index 4ff58f0eabd..31d08082714 100644
--- a/base/applications/cmdutils/reg/lang/uk-UA.rc
+++ b/base/applications/cmdutils/reg/lang/uk-UA.rc
@@ -98,9 +98,9 @@ For help on a specific operation, type:\n\
STRING_MISSING_HEXDATA, "reg: The option [/d] must be followed by a valid hexadecimal value\n"
STRING_UNHANDLED_TYPE, "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n"
STRING_OVERWRITE_VALUE, "The registry value '%1' already exists. Do you want to overwrite it?"
- STRING_YES, "#msgctxt#Yes key#Y"
- STRING_NO, "#msgctxt#No key#N"
- STRING_ALL, "#msgctxt#All key#A"
+ STRING_YES, "Y"
+ STRING_NO, "N"
+ STRING_ALL, "A"
STRING_YESNO, " (Yes|No)"
STRING_YESNOALL, " (Yes|No|All)"
STRING_CANCELLED, "reg: The registry operation was cancelled\n"
diff --git a/base/applications/cmdutils/reg/lang/zh-CN.rc b/base/applications/cmdutils/reg/lang/zh-CN.rc
index 0ad002d49cf..7eab7be54ab 100644
--- a/base/applications/cmdutils/reg/lang/zh-CN.rc
+++ b/base/applications/cmdutils/reg/lang/zh-CN.rc
@@ -109,7 +109,7 @@ For help on a specific operation, type:\n\
STRING_OVERWRITE_VALUE, "注册表值 '%1' 已经存在。您是否要覆盖它?"
STRING_YES, "Y"
STRING_NO, "N"
- STRING_ALL, "#msgctxt#All key#A"
+ STRING_ALL, "A"
STRING_YESNO, " (Yes|No)"
STRING_YESNOALL, " (Yes|No|All)"
STRING_CANCELLED, "注册表操作被取消。\n"
diff --git a/base/applications/cmdutils/reg/lang/zh-TW.rc b/base/applications/cmdutils/reg/lang/zh-TW.rc
index e87d531b613..bfff212a82a 100644
--- a/base/applications/cmdutils/reg/lang/zh-TW.rc
+++ b/base/applications/cmdutils/reg/lang/zh-TW.rc
@@ -107,9 +107,9 @@ STRINGTABLE
STRING_MISSING_HEXDATA, "reg: 選項 [/d] 後必須接著一個有效的十六進制值\n"
STRING_UNHANDLED_TYPE, "reg: 未處理的登錄資料類型 [/t 0x%1!x!, /d %2]\n"
STRING_OVERWRITE_VALUE, "登錄值 '%1' 已經存在。您要覆寫它嗎?"
- STRING_YES, "#msgctxt#Yes key#Y"
- STRING_NO, "#msgctxt#No key#N"
- STRING_ALL, "#msgctxt#All key#A"
+ STRING_YES, "Y"
+ STRING_NO, "N"
+ STRING_ALL, "A"
STRING_YESNO, " (Yes|No)"
STRING_YESNOALL, " (Yes|No|All)"
STRING_CANCELLED, "reg: 登錄操作已經取消\n"
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9385830b33486f1544754…
commit 9385830b33486f154475429d112e53fdc42f7c20
Author: George Bișoc <george.bisoc(a)reactos.org>
AuthorDate: Thu Dec 22 22:14:36 2022 +0100
Commit: George Bișoc <george.bisoc(a)reactos.org>
CommitDate: Fri Dec 23 19:45:25 2022 +0100
[NTOS:CM] Enable verbose debug output of registry lazy flushing component
Log debug output of the lazy flusher as much information as possible so that we can examine how does the lazy flusher behave, since it didn't work for almost a decade. Verbose debugging will be disabled once we're confident enough the registry implementation in ReactOS is rock solid.
---
ntoskrnl/config/cmlazy.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ntoskrnl/config/cmlazy.c b/ntoskrnl/config/cmlazy.c
index 04d87a7ea12..13b74570b00 100644
--- a/ntoskrnl/config/cmlazy.c
+++ b/ntoskrnl/config/cmlazy.c
@@ -9,7 +9,7 @@
/* INCLUDES *******************************************************************/
#include "ntoskrnl.h"
-#define NDEBUG
+//#define NDEBUG
#include "debug.h"
/* GLOBALS ********************************************************************/
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=578f2fc51236893d57973…
commit 578f2fc51236893d579734f715ef035e1497f6c7
Author: George Bișoc <george.bisoc(a)reactos.org>
AuthorDate: Thu Dec 22 22:12:55 2022 +0100
Commit: George Bișoc <george.bisoc(a)reactos.org>
CommitDate: Fri Dec 23 19:45:13 2022 +0100
[NTOS:CM] Don't lazy flush the registry during unlocking operation
Whenever ReactOS finishes its operations onto the registry and unlocks it, a lazy flush is invoked to do an eventual flushing of the registry to the backing storage of the system. Except that... lazy flushing never comes into place.
This is because whenever CmpLazyFlush is called that sets up a timer which needs to expire in order to trigger the lazy flusher engine worker. However, registry locking/unlocking is a frequent occurrence, mainly when on desktop. Therefore as a matter of fact, CmpLazyFlush keeps removing and inserting the timer and the lazy flusher will never kick in that way.
Ironically the lazy flusher actually does the flushing when on USETUP installation phase because during text-mode setup installation in ReactOS the frequency of registry operations is actually less so the timer has the opportunity to expire and fire up the flusher.
In addition to that, we must queue a lazy flush when marking cells as dirty because such dirty data has to be flushed down to the media storage of the system. Of course, the real place where lazy flushing operation is done should be in a subset helper like HvMarkDirty that marks parts of a hive as dirty but since we do not have that, we'll be lazy flushing the registry during cells dirty marking instead for now.
CORE-18303
---
ntoskrnl/config/cmsysini.c | 5 -----
sdk/lib/cmlib/hivecell.c | 28 ++++++++++++++++++++++++++++
2 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/ntoskrnl/config/cmsysini.c b/ntoskrnl/config/cmsysini.c
index 5260cb69a42..572f8a342f8 100644
--- a/ntoskrnl/config/cmsysini.c
+++ b/ntoskrnl/config/cmsysini.c
@@ -1956,11 +1956,6 @@ CmpUnlockRegistry(VOID)
CmpDoFlushAll(TRUE);
CmpFlushOnLockRelease = FALSE;
}
- else
- {
- /* Lazy flush the registry */
- CmpLazyFlush();
- }
/* Release the lock and leave the critical region */
ExReleaseResourceLite(&CmpRegistryLock);
diff --git a/sdk/lib/cmlib/hivecell.c b/sdk/lib/cmlib/hivecell.c
index 9820ab8de22..2354631ad8c 100644
--- a/sdk/lib/cmlib/hivecell.c
+++ b/sdk/lib/cmlib/hivecell.c
@@ -9,6 +9,16 @@
#define NDEBUG
#include <debug.h>
+/* DECLARATIONS *************************************************************/
+
+#if !defined(CMLIB_HOST) && !defined(_BLDR_)
+VOID
+NTAPI
+CmpLazyFlush(VOID);
+#endif
+
+/* FUNCTIONS *****************************************************************/
+
static __inline PHCELL CMAPI
HvpGetCellHeader(
PHHIVE RegistryHive,
@@ -118,6 +128,24 @@ HvMarkCellDirty(
RtlSetBits(&RegistryHive->DirtyVector,
CellBlock, CellLastBlock - CellBlock);
RegistryHive->DirtyCount++;
+
+ /*
+ * FIXME: Querying a lazy flush operation is needed to
+ * ensure that the dirty data is being flushed to disk
+ * accordingly. However, this operation has to be done
+ * in a helper like HvMarkDirty that marks specific parts
+ * of the hive as dirty. Since we do not have such kind
+ * of helper we have to perform an eventual lazy flush
+ * when marking cells as dirty here for the moment being,
+ * so that not only we flush dirty data but also write
+ * logs.
+ */
+#if !defined(CMLIB_HOST) && !defined(_BLDR_)
+ if (!(RegistryHive->HiveFlags & HIVE_NOLAZYFLUSH))
+ {
+ CmpLazyFlush();
+ }
+#endif
return TRUE;
}