From 73f60910e497c44f7dac1d2a78e05a5584253c46 Mon Sep 17 00:00:00 2001 From: Hugh McMaster Date: Thu, 21 Jul 2016 07:36:44 +0000 Subject: [PATCH] reg: Handle a special case for Default values and 'reg query'. Signed-off-by: Hugh McMaster Signed-off-by: Alexandre Julliard --- po/ar.po | 8 ++++---- po/bg.po | 8 ++++---- po/ca.po | 8 ++++---- po/cs.po | 8 ++++---- po/da.po | 8 ++++---- po/de.po | 8 ++++---- po/el.po | 8 ++++---- po/en.po | 8 ++++---- po/en_US.po | 8 ++++---- po/eo.po | 8 ++++---- po/es.po | 8 ++++---- po/fa.po | 8 ++++---- po/fi.po | 8 ++++---- po/fr.po | 8 ++++---- po/he.po | 8 ++++---- po/hi.po | 8 ++++---- po/hr.po | 8 ++++---- po/hu.po | 8 ++++---- po/it.po | 8 ++++---- po/ja.po | 8 ++++---- po/ko.po | 8 ++++---- po/lt.po | 8 ++++---- po/ml.po | 8 ++++---- po/nb_NO.po | 8 ++++---- po/nl.po | 8 ++++---- po/or.po | 8 ++++---- po/pa.po | 8 ++++---- po/pl.po | 8 ++++---- po/pt_BR.po | 8 ++++---- po/pt_PT.po | 8 ++++---- po/rm.po | 8 ++++---- po/ro.po | 8 ++++---- po/ru.po | 8 ++++---- po/sk.po | 8 ++++---- po/sl.po | 8 ++++---- po/sr_RS@cyrillic.po | 8 ++++---- po/sr_RS@latin.po | 8 ++++---- po/sv.po | 8 ++++---- po/te.po | 8 ++++---- po/th.po | 8 ++++---- po/tr.po | 8 ++++---- po/uk.po | 8 ++++---- po/wa.po | 8 ++++---- po/wine.pot | 8 ++++---- po/zh_CN.po | 8 ++++---- po/zh_TW.po | 8 ++++---- programs/reg/reg.c | 26 ++++++++++++++++++++------ programs/reg/reg.h | 1 + programs/reg/reg.rc | 1 + programs/reg/tests/reg.c | 2 +- 50 files changed, 207 insertions(+), 191 deletions(-) diff --git a/po/ar.po b/po/ar.po index 238ba6c71c2..c2d5f71075c 100644 --- a/po/ar.po +++ b/po/ar.po @@ -11921,6 +11921,10 @@ msgstr "" msgid "Type \"REG %1 /?\" for help.\n" msgstr "" +#: reg.rc:65 regedit.rc:205 +msgid "(value not set)" +msgstr "(القيمة غير مضبوطة)" + #: regedit.rc:34 msgid "&Registry" msgstr "ال&سجل" @@ -12122,10 +12126,6 @@ msgstr "الملفات التسجيلية (*.reg)" msgid "Win9x/NT4 Registry files (REGEDIT4)" msgstr "الملفات التسجيلية من الجيل الرابع win9x/nt4" -#: regedit.rc:205 -msgid "(value not set)" -msgstr "(القيمة غير مضبوطة)" - #: regedit.rc:206 msgid "(cannot display value)" msgstr "(القيمة غير قابلة للعرض)" diff --git a/po/bg.po b/po/bg.po index c2ebe15cdc3..7afd0419213 100644 --- a/po/bg.po +++ b/po/bg.po @@ -11539,6 +11539,10 @@ msgstr "" msgid "Type \"REG %1 /?\" for help.\n" msgstr "" +#: reg.rc:65 regedit.rc:205 +msgid "(value not set)" +msgstr "" + #: regedit.rc:34 msgid "&Registry" msgstr "&Регистър" @@ -11748,10 +11752,6 @@ msgstr "&Вмъкни файл в регистъра..." msgid "Win9x/NT4 Registry files (REGEDIT4)" msgstr "" -#: regedit.rc:205 -msgid "(value not set)" -msgstr "" - #: regedit.rc:206 msgid "(cannot display value)" msgstr "" diff --git a/po/ca.po b/po/ca.po index f1b277d49bc..f74b9f59081 100644 --- a/po/ca.po +++ b/po/ca.po @@ -11800,6 +11800,10 @@ msgstr "" msgid "Type \"REG %1 /?\" for help.\n" msgstr "" +#: reg.rc:65 regedit.rc:205 +msgid "(value not set)" +msgstr "(valor no definit)" + #: regedit.rc:34 msgid "&Registry" msgstr "&Registre" @@ -12002,10 +12006,6 @@ msgstr "Fitxers de registre (*.reg)" msgid "Win9x/NT4 Registry files (REGEDIT4)" msgstr "Fitxers de registre Win9x/NT4 (REGEDIT4)" -#: regedit.rc:205 -msgid "(value not set)" -msgstr "(valor no definit)" - #: regedit.rc:206 msgid "(cannot display value)" msgstr "(no es pot mostrar el valor)" diff --git a/po/cs.po b/po/cs.po index 09c5aefd301..2881dbc5dcf 100644 --- a/po/cs.po +++ b/po/cs.po @@ -11612,6 +11612,10 @@ msgstr "" msgid "Type \"REG %1 /?\" for help.\n" msgstr "" +#: reg.rc:65 regedit.rc:205 +msgid "(value not set)" +msgstr "(hodnota nenastavena)" + #: regedit.rc:34 msgid "&Registry" msgstr "&Registr" @@ -11813,10 +11817,6 @@ msgstr "Soubory registru (*.reg)" msgid "Win9x/NT4 Registry files (REGEDIT4)" msgstr "Soubory registru Win9x/NT4 (REGEDIT4)" -#: regedit.rc:205 -msgid "(value not set)" -msgstr "(hodnota nenastavena)" - #: regedit.rc:206 msgid "(cannot display value)" msgstr "(není možné zobrazit hodnotu)" diff --git a/po/da.po b/po/da.po index 8c9621924da..031bc0ab5ef 100644 --- a/po/da.po +++ b/po/da.po @@ -11874,6 +11874,10 @@ msgstr "" msgid "Type \"REG %1 /?\" for help.\n" msgstr "" +#: reg.rc:65 regedit.rc:205 +msgid "(value not set)" +msgstr "(værdi ikke sat)" + #: regedit.rc:34 msgid "&Registry" msgstr "&Register" @@ -12077,10 +12081,6 @@ msgstr "Registreringsdatabasefiler (*.reg)" msgid "Win9x/NT4 Registry files (REGEDIT4)" msgstr "Win9x-/NT4-registeringsdatabasefiler (REGEDIT4)" -#: regedit.rc:205 -msgid "(value not set)" -msgstr "(værdi ikke sat)" - #: regedit.rc:206 msgid "(cannot display value)" msgstr "(kunne ikke vise værdi)" diff --git a/po/de.po b/po/de.po index c7dbaadc95b..0354ab7004b 100644 --- a/po/de.po +++ b/po/de.po @@ -11753,6 +11753,10 @@ msgstr "Geben Sie \"REG /?\" ein, um Hilfe zu erhalten.\n" msgid "Type \"REG %1 /?\" for help.\n" msgstr "Geben Sie \"REG %1 /?\" ein, um Hilfe zu erhalten.\n" +#: reg.rc:65 regedit.rc:205 +msgid "(value not set)" +msgstr "(Wert nicht gesetzt)" + #: regedit.rc:34 msgid "&Registry" msgstr "&Registrierung" @@ -11955,10 +11959,6 @@ msgstr "Registrierungsdateien (*.reg)" msgid "Win9x/NT4 Registry files (REGEDIT4)" msgstr "Win9x/NT4-Registrierungsdateien (REGEDIT4)" -#: regedit.rc:205 -msgid "(value not set)" -msgstr "(Wert nicht gesetzt)" - #: regedit.rc:206 msgid "(cannot display value)" msgstr "(Wert kann nicht dargestellt werden)" diff --git a/po/el.po b/po/el.po index b03804f9a47..47cddc30ac8 100644 --- a/po/el.po +++ b/po/el.po @@ -11325,6 +11325,10 @@ msgstr "" msgid "Type \"REG %1 /?\" for help.\n" msgstr "" +#: reg.rc:65 regedit.rc:205 +msgid "(value not set)" +msgstr "" + #: regedit.rc:34 msgid "&Registry" msgstr "" @@ -11532,10 +11536,6 @@ msgstr "" msgid "Win9x/NT4 Registry files (REGEDIT4)" msgstr "" -#: regedit.rc:205 -msgid "(value not set)" -msgstr "" - #: regedit.rc:206 msgid "(cannot display value)" msgstr "" diff --git a/po/en.po b/po/en.po index 78529da90cd..3eb8632be2d 100644 --- a/po/en.po +++ b/po/en.po @@ -11677,6 +11677,10 @@ msgstr "Type \"REG /?\" for help.\n" msgid "Type \"REG %1 /?\" for help.\n" msgstr "Type \"REG %1 /?\" for help.\n" +#: reg.rc:65 regedit.rc:205 +msgid "(value not set)" +msgstr "(value not set)" + #: regedit.rc:34 msgid "&Registry" msgstr "&Registry" @@ -11879,10 +11883,6 @@ msgstr "Registry files (*.reg)" msgid "Win9x/NT4 Registry files (REGEDIT4)" msgstr "Win9x/NT4 Registry files (REGEDIT4)" -#: regedit.rc:205 -msgid "(value not set)" -msgstr "(value not set)" - #: regedit.rc:206 msgid "(cannot display value)" msgstr "(cannot display value)" diff --git a/po/en_US.po b/po/en_US.po index c9c3d1e620e..3369c00a464 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -11677,6 +11677,10 @@ msgstr "Type \"REG /?\" for help.\n" msgid "Type \"REG %1 /?\" for help.\n" msgstr "Type \"REG %1 /?\" for help.\n" +#: reg.rc:65 regedit.rc:205 +msgid "(value not set)" +msgstr "(value not set)" + #: regedit.rc:34 msgid "&Registry" msgstr "&Registry" @@ -11879,10 +11883,6 @@ msgstr "Registry Files (*.reg)" msgid "Win9x/NT4 Registry files (REGEDIT4)" msgstr "Win9x/NT4 Registry Files (REGEDIT4)" -#: regedit.rc:205 -msgid "(value not set)" -msgstr "(value not set)" - #: regedit.rc:206 msgid "(cannot display value)" msgstr "(cannot display value)" diff --git a/po/eo.po b/po/eo.po index 25f38eff08c..7cf8fc3c9e9 100644 --- a/po/eo.po +++ b/po/eo.po @@ -11231,6 +11231,10 @@ msgstr "" msgid "Type \"REG %1 /?\" for help.\n" msgstr "" +#: reg.rc:65 regedit.rc:205 +msgid "(value not set)" +msgstr "(valoro ne elektita)" + #: regedit.rc:34 msgid "&Registry" msgstr "&Registrejo" @@ -11433,10 +11437,6 @@ msgstr "Registrejaj dosieroj (*.reg)" msgid "Win9x/NT4 Registry files (REGEDIT4)" msgstr "Arkaikaj registreja dosieroj (REGEDIT4)" -#: regedit.rc:205 -msgid "(value not set)" -msgstr "(valoro ne elektita)" - #: regedit.rc:206 msgid "(cannot display value)" msgstr "(ne eblas elmontri valoron)" diff --git a/po/es.po b/po/es.po index bda6d22444e..2d38b9760f0 100644 --- a/po/es.po +++ b/po/es.po @@ -11953,6 +11953,10 @@ msgstr "" msgid "Type \"REG %1 /?\" for help.\n" msgstr "" +#: reg.rc:65 regedit.rc:205 +msgid "(value not set)" +msgstr "(valor no definido)" + #: regedit.rc:34 msgid "&Registry" msgstr "&Registro" @@ -12156,10 +12160,6 @@ msgstr "Archivos de registro (*.reg)" msgid "Win9x/NT4 Registry files (REGEDIT4)" msgstr "Archivos de registro de Win9x/NT4 (REGEDIT4)" -#: regedit.rc:205 -msgid "(value not set)" -msgstr "(valor no definido)" - #: regedit.rc:206 msgid "(cannot display value)" msgstr "(no se puede mostrar valor)" diff --git a/po/fa.po b/po/fa.po index db9b70ecedd..3820203bdfc 100644 --- a/po/fa.po +++ b/po/fa.po @@ -11317,6 +11317,10 @@ msgstr "" msgid "Type \"REG %1 /?\" for help.\n" msgstr "" +#: reg.rc:65 regedit.rc:205 +msgid "(value not set)" +msgstr "" + #: regedit.rc:34 msgid "&Registry" msgstr "" @@ -11527,10 +11531,6 @@ msgstr "پرونده‌های متنی (*.txt)" msgid "Win9x/NT4 Registry files (REGEDIT4)" msgstr "" -#: regedit.rc:205 -msgid "(value not set)" -msgstr "" - #: regedit.rc:206 msgid "(cannot display value)" msgstr "" diff --git a/po/fi.po b/po/fi.po index a26c35a3402..ebf71f7b772 100644 --- a/po/fi.po +++ b/po/fi.po @@ -11656,6 +11656,10 @@ msgstr "Komennolla \"REG /?\" saat apua.\n" msgid "Type \"REG %1 /?\" for help.\n" msgstr "Komennolla \"REG %1 /?\" saat apua.\n" +#: reg.rc:65 regedit.rc:205 +msgid "(value not set)" +msgstr "(arvoa ei asetettu)" + #: regedit.rc:34 msgid "&Registry" msgstr "&Rekisteri" @@ -11858,10 +11862,6 @@ msgstr "Rekisteritiedostot (*.reg)" msgid "Win9x/NT4 Registry files (REGEDIT4)" msgstr "Win9x/NT4-rekisteritiedostot (REGEDIT4)" -#: regedit.rc:205 -msgid "(value not set)" -msgstr "(arvoa ei asetettu)" - #: regedit.rc:206 msgid "(cannot display value)" msgstr "(arvoa ei voi näyttää)" diff --git a/po/fr.po b/po/fr.po index 1bd3c94da3d..1d46e1fbed6 100644 --- a/po/fr.po +++ b/po/fr.po @@ -11812,6 +11812,10 @@ msgstr "" msgid "Type \"REG %1 /?\" for help.\n" msgstr "" +#: reg.rc:65 regedit.rc:205 +msgid "(value not set)" +msgstr "(valeur non définie)" + #: regedit.rc:34 msgid "&Registry" msgstr "&Registre" @@ -12015,10 +12019,6 @@ msgstr "Fichiers de registre (*.reg)" msgid "Win9x/NT4 Registry files (REGEDIT4)" msgstr "Fichiers de registre Win9x/NT4 (REGEDIT4)" -#: regedit.rc:205 -msgid "(value not set)" -msgstr "(valeur non définie)" - #: regedit.rc:206 msgid "(cannot display value)" msgstr "(impossible d'afficher la valeur)" diff --git a/po/he.po b/po/he.po index 783b70a5122..9bb01904f64 100644 --- a/po/he.po +++ b/po/he.po @@ -11698,6 +11698,10 @@ msgstr "" msgid "Type \"REG %1 /?\" for help.\n" msgstr "" +#: reg.rc:65 regedit.rc:205 +msgid "(value not set)" +msgstr "(לא הוגדר ערך)" + #: regedit.rc:34 msgid "&Registry" msgstr "&רישום המערכת" @@ -11899,10 +11903,6 @@ msgstr "קובצי רישום מערכת (‎*.reg)" msgid "Win9x/NT4 Registry files (REGEDIT4)" msgstr "קובצי רישום מערכת של Win9x/NT4‏ (REGEDIT4)" -#: regedit.rc:205 -msgid "(value not set)" -msgstr "(לא הוגדר ערך)" - #: regedit.rc:206 msgid "(cannot display value)" msgstr "(לא ניתן להציג את הערך)" diff --git a/po/hi.po b/po/hi.po index b6f672022c4..70a52af7314 100644 --- a/po/hi.po +++ b/po/hi.po @@ -11124,6 +11124,10 @@ msgstr "" msgid "Type \"REG %1 /?\" for help.\n" msgstr "" +#: reg.rc:65 regedit.rc:205 +msgid "(value not set)" +msgstr "" + #: regedit.rc:34 msgid "&Registry" msgstr "" @@ -11325,10 +11329,6 @@ msgstr "" msgid "Win9x/NT4 Registry files (REGEDIT4)" msgstr "" -#: regedit.rc:205 -msgid "(value not set)" -msgstr "" - #: regedit.rc:206 msgid "(cannot display value)" msgstr "" diff --git a/po/hr.po b/po/hr.po index a0bf772daff..f7cdb5b5f58 100644 --- a/po/hr.po +++ b/po/hr.po @@ -11431,6 +11431,10 @@ msgstr "" msgid "Type \"REG %1 /?\" for help.\n" msgstr "" +#: reg.rc:65 regedit.rc:205 +msgid "(value not set)" +msgstr "(vrijednost nije postavljena)" + #: regedit.rc:34 msgid "&Registry" msgstr "&Registar" @@ -11632,10 +11636,6 @@ msgstr "Datotoeke registra (*.reg)" msgid "Win9x/NT4 Registry files (REGEDIT4)" msgstr "" -#: regedit.rc:205 -msgid "(value not set)" -msgstr "(vrijednost nije postavljena)" - #: regedit.rc:206 msgid "(cannot display value)" msgstr "(ne mogu prikazati vrijednost)" diff --git a/po/hu.po b/po/hu.po index 80b3bd80dcc..211510c14ae 100644 --- a/po/hu.po +++ b/po/hu.po @@ -11868,6 +11868,10 @@ msgstr "" msgid "Type \"REG %1 /?\" for help.\n" msgstr "" +#: reg.rc:65 regedit.rc:205 +msgid "(value not set)" +msgstr "(nem beállított)" + #: regedit.rc:34 msgid "&Registry" msgstr "&Fájl" @@ -12074,10 +12078,6 @@ msgstr "Regisztrációs adatbázis fájlok (*.reg)" msgid "Win9x/NT4 Registry files (REGEDIT4)" msgstr "Win9x/NT4 Regisztrációs fájlok (REGEDIT4)" -#: regedit.rc:205 -msgid "(value not set)" -msgstr "(nem beállított)" - #: regedit.rc:206 msgid "(cannot display value)" msgstr "(nem kijelezhető)" diff --git a/po/it.po b/po/it.po index 75578f6ec58..ed321ed93eb 100644 --- a/po/it.po +++ b/po/it.po @@ -11954,6 +11954,10 @@ msgstr "" msgid "Type \"REG %1 /?\" for help.\n" msgstr "" +#: reg.rc:65 regedit.rc:205 +msgid "(value not set)" +msgstr "(valore non immesso)" + #: regedit.rc:34 msgid "&Registry" msgstr "&Registro" @@ -12157,10 +12161,6 @@ msgstr "File di registro (*.reg)" msgid "Win9x/NT4 Registry files (REGEDIT4)" msgstr "File di registro Win9x/NT4 (REGEDIT4)" -#: regedit.rc:205 -msgid "(value not set)" -msgstr "(valore non immesso)" - #: regedit.rc:206 msgid "(cannot display value)" msgstr "(impossibile visualizzare valore)" diff --git a/po/ja.po b/po/ja.po index 4e5c8e116c5..358cb7df856 100644 --- a/po/ja.po +++ b/po/ja.po @@ -11656,6 +11656,10 @@ msgstr "" msgid "Type \"REG %1 /?\" for help.\n" msgstr "" +#: reg.rc:65 regedit.rc:205 +msgid "(value not set)" +msgstr "(値の設定なし)" + #: regedit.rc:34 msgid "&Registry" msgstr "レジストリ(&R)" @@ -11857,10 +11861,6 @@ msgstr "登録ファイル (*.reg)" msgid "Win9x/NT4 Registry files (REGEDIT4)" msgstr "Win9x/NT4 登録ファイル (REGEDIT4)" -#: regedit.rc:205 -msgid "(value not set)" -msgstr "(値の設定なし)" - #: regedit.rc:206 msgid "(cannot display value)" msgstr "(値を表示できません)" diff --git a/po/ko.po b/po/ko.po index a8117fb697a..5949c86598c 100644 --- a/po/ko.po +++ b/po/ko.po @@ -11943,6 +11943,10 @@ msgstr "" msgid "Type \"REG %1 /?\" for help.\n" msgstr "" +#: reg.rc:65 regedit.rc:205 +msgid "(value not set)" +msgstr "(값이 정해지지 않음)" + #: regedit.rc:34 msgid "&Registry" msgstr "레지스트리(&R)" @@ -12144,10 +12148,6 @@ msgstr "레지스트리 파일 (*.reg)" msgid "Win9x/NT4 Registry files (REGEDIT4)" msgstr "Win9x/NT4 레지스트리 파일 (REGEDIT4)" -#: regedit.rc:205 -msgid "(value not set)" -msgstr "(값이 정해지지 않음)" - #: regedit.rc:206 msgid "(cannot display value)" msgstr "(값을 보여 줄수 없음)" diff --git a/po/lt.po b/po/lt.po index 4e263ae6fba..df79b61c166 100644 --- a/po/lt.po +++ b/po/lt.po @@ -11681,6 +11681,10 @@ msgstr "Pagalbai įrašykite „REG /?“.\n" msgid "Type \"REG %1 /?\" for help.\n" msgstr "Pagalbai įrašykite „REG %1 /?“.\n" +#: reg.rc:65 regedit.rc:205 +msgid "(value not set)" +msgstr "(reikšmė nenustatyta)" + #: regedit.rc:34 msgid "&Registry" msgstr "R&egistras" @@ -11883,10 +11887,6 @@ msgstr "Registro failai (*.reg)" msgid "Win9x/NT4 Registry files (REGEDIT4)" msgstr "Win9x/NT4 registro failai (REGEDIT4)" -#: regedit.rc:205 -msgid "(value not set)" -msgstr "(reikšmė nenustatyta)" - #: regedit.rc:206 msgid "(cannot display value)" msgstr "(negalima parodyti reikšmės)" diff --git a/po/ml.po b/po/ml.po index 341c9796153..4258aeaeeff 100644 --- a/po/ml.po +++ b/po/ml.po @@ -11124,6 +11124,10 @@ msgstr "" msgid "Type \"REG %1 /?\" for help.\n" msgstr "" +#: reg.rc:65 regedit.rc:205 +msgid "(value not set)" +msgstr "" + #: regedit.rc:34 msgid "&Registry" msgstr "" @@ -11325,10 +11329,6 @@ msgstr "" msgid "Win9x/NT4 Registry files (REGEDIT4)" msgstr "" -#: regedit.rc:205 -msgid "(value not set)" -msgstr "" - #: regedit.rc:206 msgid "(cannot display value)" msgstr "" diff --git a/po/nb_NO.po b/po/nb_NO.po index 79f0da50bbb..def5854297b 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -11672,6 +11672,10 @@ msgstr "Skriv \"REG /?\" for hjelp.\n" msgid "Type \"REG %1 /?\" for help.\n" msgstr "Skriv \"REG %1 /?\" for hjelp.\n" +#: reg.rc:65 regedit.rc:205 +msgid "(value not set)" +msgstr "(verdi ikke oppgitt)" + #: regedit.rc:34 msgid "&Registry" msgstr "&Register" @@ -11874,10 +11878,6 @@ msgstr "Registerfiler (*.reg)" msgid "Win9x/NT4 Registry files (REGEDIT4)" msgstr "Win9x-/NT4-registerfiler (REGEDIT4)" -#: regedit.rc:205 -msgid "(value not set)" -msgstr "(verdi ikke oppgitt)" - #: regedit.rc:206 msgid "(cannot display value)" msgstr "(kan ikke vise verdi)" diff --git a/po/nl.po b/po/nl.po index de8388b5d3b..ea53fa18a70 100644 --- a/po/nl.po +++ b/po/nl.po @@ -11920,6 +11920,10 @@ msgstr "" msgid "Type \"REG %1 /?\" for help.\n" msgstr "" +#: reg.rc:65 regedit.rc:205 +msgid "(value not set)" +msgstr "(Geen waarde ingesteld)" + #: regedit.rc:34 msgid "&Registry" msgstr "&Registerbestand" @@ -12122,10 +12126,6 @@ msgstr "Registerbestanden (*.reg)" msgid "Win9x/NT4 Registry files (REGEDIT4)" msgstr "Win9x/NT4 Registerbestanden (REGEDIT4)" -#: regedit.rc:205 -msgid "(value not set)" -msgstr "(Geen waarde ingesteld)" - #: regedit.rc:206 msgid "(cannot display value)" msgstr "(kan waarde niet weergeven)" diff --git a/po/or.po b/po/or.po index 571419b484f..a92581c2916 100644 --- a/po/or.po +++ b/po/or.po @@ -11124,6 +11124,10 @@ msgstr "" msgid "Type \"REG %1 /?\" for help.\n" msgstr "" +#: reg.rc:65 regedit.rc:205 +msgid "(value not set)" +msgstr "" + #: regedit.rc:34 msgid "&Registry" msgstr "" @@ -11325,10 +11329,6 @@ msgstr "" msgid "Win9x/NT4 Registry files (REGEDIT4)" msgstr "" -#: regedit.rc:205 -msgid "(value not set)" -msgstr "" - #: regedit.rc:206 msgid "(cannot display value)" msgstr "" diff --git a/po/pa.po b/po/pa.po index 2923f1652d5..55ae3f5bf72 100644 --- a/po/pa.po +++ b/po/pa.po @@ -11124,6 +11124,10 @@ msgstr "" msgid "Type \"REG %1 /?\" for help.\n" msgstr "" +#: reg.rc:65 regedit.rc:205 +msgid "(value not set)" +msgstr "" + #: regedit.rc:34 msgid "&Registry" msgstr "" @@ -11325,10 +11329,6 @@ msgstr "" msgid "Win9x/NT4 Registry files (REGEDIT4)" msgstr "" -#: regedit.rc:205 -msgid "(value not set)" -msgstr "" - #: regedit.rc:206 msgid "(cannot display value)" msgstr "" diff --git a/po/pl.po b/po/pl.po index 4090b13636c..af821de4816 100644 --- a/po/pl.po +++ b/po/pl.po @@ -11756,6 +11756,10 @@ msgstr "" msgid "Type \"REG %1 /?\" for help.\n" msgstr "" +#: reg.rc:65 regedit.rc:205 +msgid "(value not set)" +msgstr "(wartość nie ustalona)" + #: regedit.rc:34 msgid "&Registry" msgstr "&Rejestr" @@ -11957,10 +11961,6 @@ msgstr "Pliki rejestru (*.reg)" msgid "Win9x/NT4 Registry files (REGEDIT4)" msgstr "Pliki rejestru Win9x/NT4 (REGEDIT4)" -#: regedit.rc:205 -msgid "(value not set)" -msgstr "(wartość nie ustalona)" - #: regedit.rc:206 msgid "(cannot display value)" msgstr "(nie mogę wyświetlić wartości)" diff --git a/po/pt_BR.po b/po/pt_BR.po index ec45fa41f83..f34f87b2524 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -11763,6 +11763,10 @@ msgstr "" msgid "Type \"REG %1 /?\" for help.\n" msgstr "" +#: reg.rc:65 regedit.rc:205 +msgid "(value not set)" +msgstr "(valor não dado)" + #: regedit.rc:34 msgid "&Registry" msgstr "&Registro" @@ -11966,10 +11970,6 @@ msgstr "Arquivos de Registro (*.reg)" msgid "Win9x/NT4 Registry files (REGEDIT4)" msgstr "Arquivos de Registro Win9x/NT4 (REGEDIT4)" -#: regedit.rc:205 -msgid "(value not set)" -msgstr "(valor não dado)" - #: regedit.rc:206 msgid "(cannot display value)" msgstr "(não pode mostrar o valor)" diff --git a/po/pt_PT.po b/po/pt_PT.po index c35ed6e3527..d8978819b74 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -11745,6 +11745,10 @@ msgstr "" msgid "Type \"REG %1 /?\" for help.\n" msgstr "" +#: reg.rc:65 regedit.rc:205 +msgid "(value not set)" +msgstr "(valor não dado)" + #: regedit.rc:34 msgid "&Registry" msgstr "&Registo" @@ -11952,10 +11956,6 @@ msgstr "Ficheiros de Registo (*.reg)" msgid "Win9x/NT4 Registry files (REGEDIT4)" msgstr "Ficheiros de Registo Win9x/NT4 (REGEDIT4)" -#: regedit.rc:205 -msgid "(value not set)" -msgstr "(valor não dado)" - #: regedit.rc:206 msgid "(cannot display value)" msgstr "(não pode mostrar o valor)" diff --git a/po/rm.po b/po/rm.po index 2e94bd9a764..e1e6769b53d 100644 --- a/po/rm.po +++ b/po/rm.po @@ -11202,6 +11202,10 @@ msgstr "" msgid "Type \"REG %1 /?\" for help.\n" msgstr "" +#: reg.rc:65 regedit.rc:205 +msgid "(value not set)" +msgstr "" + #: regedit.rc:34 msgid "&Registry" msgstr "" @@ -11412,10 +11416,6 @@ msgstr "Tuot las datotecas (*.*)" msgid "Win9x/NT4 Registry files (REGEDIT4)" msgstr "" -#: regedit.rc:205 -msgid "(value not set)" -msgstr "" - #: regedit.rc:206 msgid "(cannot display value)" msgstr "" diff --git a/po/ro.po b/po/ro.po index 64121138551..0cd157f31e8 100644 --- a/po/ro.po +++ b/po/ro.po @@ -11964,6 +11964,10 @@ msgstr "" msgid "Type \"REG %1 /?\" for help.\n" msgstr "" +#: reg.rc:65 regedit.rc:205 +msgid "(value not set)" +msgstr "(valoare nestabilită)" + #: regedit.rc:34 msgid "&Registry" msgstr "&Registru" @@ -12167,10 +12171,6 @@ msgstr "Fișiere de registru (*.reg)" msgid "Win9x/NT4 Registry files (REGEDIT4)" msgstr "Fișiere de registru Win9x/NT4 (REGEDIT4)" -#: regedit.rc:205 -msgid "(value not set)" -msgstr "(valoare nestabilită)" - #: regedit.rc:206 msgid "(cannot display value)" msgstr "(valoarea nu poate fi afișată)" diff --git a/po/ru.po b/po/ru.po index cbd81ef8f94..a5030d962dc 100644 --- a/po/ru.po +++ b/po/ru.po @@ -11678,6 +11678,10 @@ msgstr "Для справки введите «REG /?».\n" msgid "Type \"REG %1 /?\" for help.\n" msgstr "Для справки введите «REG %1 /?».\n" +#: reg.rc:65 regedit.rc:205 +msgid "(value not set)" +msgstr "(значение не задано)" + #: regedit.rc:34 msgid "&Registry" msgstr "&Реестр" @@ -11880,10 +11884,6 @@ msgstr "Файлы реестра (*.reg)" msgid "Win9x/NT4 Registry files (REGEDIT4)" msgstr "Файлы реестра Win9x/NT4 (REGEDIT4)" -#: regedit.rc:205 -msgid "(value not set)" -msgstr "(значение не задано)" - #: regedit.rc:206 msgid "(cannot display value)" msgstr "(невозможно отобразить)" diff --git a/po/sk.po b/po/sk.po index 9efc3f8a215..f887a6d0573 100644 --- a/po/sk.po +++ b/po/sk.po @@ -11398,6 +11398,10 @@ msgstr "" msgid "Type \"REG %1 /?\" for help.\n" msgstr "" +#: reg.rc:65 regedit.rc:205 +msgid "(value not set)" +msgstr "" + #: regedit.rc:34 msgid "&Registry" msgstr "&Registry" @@ -11600,10 +11604,6 @@ msgstr "Súbory registrov (*.reg)" msgid "Win9x/NT4 Registry files (REGEDIT4)" msgstr "Win9x/NT4 súbory registrov (REGEDIT4)" -#: regedit.rc:205 -msgid "(value not set)" -msgstr "" - #: regedit.rc:206 msgid "(cannot display value)" msgstr "(nemôžem zobraziť hodnotu)" diff --git a/po/sl.po b/po/sl.po index bf0877ba354..9653ec44664 100644 --- a/po/sl.po +++ b/po/sl.po @@ -11897,6 +11897,10 @@ msgstr "" msgid "Type \"REG %1 /?\" for help.\n" msgstr "" +#: reg.rc:65 regedit.rc:205 +msgid "(value not set)" +msgstr "(vrednost ni nastavljena)" + #: regedit.rc:34 msgid "&Registry" msgstr "&Register" @@ -12098,10 +12102,6 @@ msgstr "Datoteke registra (*.reg)" msgid "Win9x/NT4 Registry files (REGEDIT4)" msgstr "Datoteke registra Win9x/NT4 (REGEDIT4)" -#: regedit.rc:205 -msgid "(value not set)" -msgstr "(vrednost ni nastavljena)" - #: regedit.rc:206 msgid "(cannot display value)" msgstr "(vrednosti ni mogoče prikazati)" diff --git a/po/sr_RS@cyrillic.po b/po/sr_RS@cyrillic.po index cf16d4fc172..db2aa0d6036 100644 --- a/po/sr_RS@cyrillic.po +++ b/po/sr_RS@cyrillic.po @@ -11791,6 +11791,10 @@ msgstr "" msgid "Type \"REG %1 /?\" for help.\n" msgstr "" +#: reg.rc:65 regedit.rc:205 +msgid "(value not set)" +msgstr "" + #: regedit.rc:34 msgid "&Registry" msgstr "" @@ -12010,10 +12014,6 @@ msgstr "Текстуалне датотеке (*.txt)" msgid "Win9x/NT4 Registry files (REGEDIT4)" msgstr "" -#: regedit.rc:205 -msgid "(value not set)" -msgstr "" - #: regedit.rc:206 msgid "(cannot display value)" msgstr "" diff --git a/po/sr_RS@latin.po b/po/sr_RS@latin.po index 8033b3a85e1..7ad74f1e4f2 100644 --- a/po/sr_RS@latin.po +++ b/po/sr_RS@latin.po @@ -11930,6 +11930,10 @@ msgstr "" msgid "Type \"REG %1 /?\" for help.\n" msgstr "" +#: reg.rc:65 regedit.rc:205 +msgid "(value not set)" +msgstr "" + #: regedit.rc:34 msgid "&Registry" msgstr "" @@ -12157,10 +12161,6 @@ msgstr "Tekstualne datoteke (*.txt)" msgid "Win9x/NT4 Registry files (REGEDIT4)" msgstr "" -#: regedit.rc:205 -msgid "(value not set)" -msgstr "" - #: regedit.rc:206 msgid "(cannot display value)" msgstr "" diff --git a/po/sv.po b/po/sv.po index 7cc2fb28365..5cdebd3bda5 100644 --- a/po/sv.po +++ b/po/sv.po @@ -11569,6 +11569,10 @@ msgstr "" msgid "Type \"REG %1 /?\" for help.\n" msgstr "" +#: reg.rc:65 regedit.rc:205 +msgid "(value not set)" +msgstr "(värde ej angivet)" + #: regedit.rc:34 msgid "&Registry" msgstr "&Register" @@ -11771,10 +11775,6 @@ msgstr "Registerfiler (*.reg)" msgid "Win9x/NT4 Registry files (REGEDIT4)" msgstr "Win9x-/NT4-registerfiler (REGEDIT4)" -#: regedit.rc:205 -msgid "(value not set)" -msgstr "(värde ej angivet)" - #: regedit.rc:206 msgid "(cannot display value)" msgstr "(kunde inte visa värde)" diff --git a/po/te.po b/po/te.po index a111814ae6e..125924aa6a5 100644 --- a/po/te.po +++ b/po/te.po @@ -11124,6 +11124,10 @@ msgstr "" msgid "Type \"REG %1 /?\" for help.\n" msgstr "" +#: reg.rc:65 regedit.rc:205 +msgid "(value not set)" +msgstr "" + #: regedit.rc:34 msgid "&Registry" msgstr "" @@ -11325,10 +11329,6 @@ msgstr "" msgid "Win9x/NT4 Registry files (REGEDIT4)" msgstr "" -#: regedit.rc:205 -msgid "(value not set)" -msgstr "" - #: regedit.rc:206 msgid "(cannot display value)" msgstr "" diff --git a/po/th.po b/po/th.po index 2422d5f3b85..9f49539850d 100644 --- a/po/th.po +++ b/po/th.po @@ -11355,6 +11355,10 @@ msgstr "" msgid "Type \"REG %1 /?\" for help.\n" msgstr "" +#: reg.rc:65 regedit.rc:205 +msgid "(value not set)" +msgstr "" + #: regedit.rc:34 msgid "&Registry" msgstr "" @@ -11567,10 +11571,6 @@ msgstr "แฟ้มตํารา (*.txt)" msgid "Win9x/NT4 Registry files (REGEDIT4)" msgstr "" -#: regedit.rc:205 -msgid "(value not set)" -msgstr "" - #: regedit.rc:206 msgid "(cannot display value)" msgstr "" diff --git a/po/tr.po b/po/tr.po index fb1d7f2b29d..c76cc897940 100644 --- a/po/tr.po +++ b/po/tr.po @@ -11725,6 +11725,10 @@ msgstr "" msgid "Type \"REG %1 /?\" for help.\n" msgstr "" +#: reg.rc:65 regedit.rc:205 +msgid "(value not set)" +msgstr "(değer belirlenmemiş)" + #: regedit.rc:34 msgid "&Registry" msgstr "&Kayıt" @@ -11927,10 +11931,6 @@ msgstr "Kayıt dosyaları (*.reg)" msgid "Win9x/NT4 Registry files (REGEDIT4)" msgstr "Win9X/NT4 Kayıt Dosyaları (REGEDIT4)" -#: regedit.rc:205 -msgid "(value not set)" -msgstr "(değer belirlenmemiş)" - #: regedit.rc:206 msgid "(cannot display value)" msgstr "(değer görüntülenemiyor)" diff --git a/po/uk.po b/po/uk.po index f571ac7617b..fc1cb11d806 100644 --- a/po/uk.po +++ b/po/uk.po @@ -11763,6 +11763,10 @@ msgstr "Введіть \"REG /?\" для довідки.\n" msgid "Type \"REG %1 /?\" for help.\n" msgstr "Введіть \"REG %1 /?\" для довідки.\n" +#: reg.rc:65 regedit.rc:205 +msgid "(value not set)" +msgstr "(значення не задане)" + #: regedit.rc:34 msgid "&Registry" msgstr "&Реєстр" @@ -11965,10 +11969,6 @@ msgstr "Файли реєстру (*.reg)" msgid "Win9x/NT4 Registry files (REGEDIT4)" msgstr "Файли реєстру Win9x/NT4 (REGEDIT4)" -#: regedit.rc:205 -msgid "(value not set)" -msgstr "(значення не задане)" - #: regedit.rc:206 msgid "(cannot display value)" msgstr "(неможливо відобразити значення)" diff --git a/po/wa.po b/po/wa.po index 9143822ed61..0dbdb29d7fd 100644 --- a/po/wa.po +++ b/po/wa.po @@ -11263,6 +11263,10 @@ msgstr "" msgid "Type \"REG %1 /?\" for help.\n" msgstr "" +#: reg.rc:65 regedit.rc:205 +msgid "(value not set)" +msgstr "" + #: regedit.rc:34 msgid "&Registry" msgstr "" @@ -11475,10 +11479,6 @@ msgstr "Fitchîs tekse (*.txt)" msgid "Win9x/NT4 Registry files (REGEDIT4)" msgstr "" -#: regedit.rc:205 -msgid "(value not set)" -msgstr "" - #: regedit.rc:206 msgid "(cannot display value)" msgstr "" diff --git a/po/wine.pot b/po/wine.pot index ec108405eb0..6faf2bb353d 100644 --- a/po/wine.pot +++ b/po/wine.pot @@ -11060,6 +11060,10 @@ msgstr "" msgid "Type \"REG %1 /?\" for help.\n" msgstr "" +#: reg.rc:65 regedit.rc:205 +msgid "(value not set)" +msgstr "" + #: regedit.rc:34 msgid "&Registry" msgstr "" @@ -11261,10 +11265,6 @@ msgstr "" msgid "Win9x/NT4 Registry files (REGEDIT4)" msgstr "" -#: regedit.rc:205 -msgid "(value not set)" -msgstr "" - #: regedit.rc:206 msgid "(cannot display value)" msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index f95cc661059..8e37ac8bc21 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -11228,6 +11228,10 @@ msgstr "" msgid "Type \"REG %1 /?\" for help.\n" msgstr "" +#: reg.rc:65 regedit.rc:205 +msgid "(value not set)" +msgstr "(没有设值)" + #: regedit.rc:34 msgid "&Registry" msgstr "注册表(&R)" @@ -11429,10 +11433,6 @@ msgstr "注册表文件 (*.reg)" msgid "Win9x/NT4 Registry files (REGEDIT4)" msgstr "Win9x/NT4 注册表文件 (REGEDIT4)" -#: regedit.rc:205 -msgid "(value not set)" -msgstr "(没有设值)" - #: regedit.rc:206 msgid "(cannot display value)" msgstr "(不能显示值)" diff --git a/po/zh_TW.po b/po/zh_TW.po index 950ed7368af..6c098c73899 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -11828,6 +11828,10 @@ msgstr "" msgid "Type \"REG %1 /?\" for help.\n" msgstr "" +#: reg.rc:65 regedit.rc:205 +msgid "(value not set)" +msgstr "(沒有設值)" + #: regedit.rc:34 msgid "&Registry" msgstr "註冊表(&R)" @@ -12029,10 +12033,6 @@ msgstr "註冊表檔案 (*.reg)" msgid "Win9x/NT4 Registry files (REGEDIT4)" msgstr "Win9x/NT4 註冊表檔案 (REGEDIT4)" -#: regedit.rc:205 -msgid "(value not set)" -msgstr "(沒有設值)" - #: regedit.rc:206 msgid "(cannot display value)" msgstr "(不能顯示值)" diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 0d6bec4cc0b..6fcf1290360 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -583,6 +583,7 @@ static const WCHAR *reg_type_to_wchar(DWORD type) static void output_value(const WCHAR *value_name, DWORD type, BYTE *data, DWORD data_size) { WCHAR fmt[] = {' ',' ',' ',' ','%','1',0}; + WCHAR defval[32]; WCHAR *reg_data; WCHAR newlineW[] = {'\n',0}; @@ -590,14 +591,22 @@ static void output_value(const WCHAR *value_name, DWORD type, BYTE *data, DWORD output_string(fmt, value_name); else { - WCHAR defval[32]; LoadStringW(GetModuleHandleW(NULL), STRING_DEFAULT_VALUE, defval, ARRAY_SIZE(defval)); output_string(fmt, defval); } output_string(fmt, reg_type_to_wchar(type)); - reg_data = reg_data_to_wchar(type, data, data_size); - output_string(fmt, reg_data); - HeapFree(GetProcessHeap(), 0, reg_data); + + if (data) + { + reg_data = reg_data_to_wchar(type, data, data_size); + output_string(fmt, reg_data); + HeapFree(GetProcessHeap(), 0, reg_data); + } + else + { + LoadStringW(GetModuleHandleW(NULL), STRING_VALUE_NOT_SET, defval, ARRAY_SIZE(defval)); + output_string(fmt, defval); + } output_string(newlineW); } @@ -661,8 +670,13 @@ static int query_value(HKEY key, WCHAR *value_name, WCHAR *path, BOOL recurse) { if (rc == ERROR_FILE_NOT_FOUND) { - output_message(STRING_CANNOT_FIND); - return 1; + if (value_name && *value_name) + { + output_message(STRING_CANNOT_FIND); + return 1; + } + output_string(fmt, path); + output_value(NULL, REG_SZ, NULL, 0); } return 0; } diff --git a/programs/reg/reg.h b/programs/reg/reg.h index e7bb5909991..1142278a19c 100644 --- a/programs/reg/reg.h +++ b/programs/reg/reg.h @@ -51,3 +51,4 @@ #define STRING_INVALID_OPTION 128 #define STRING_REG_HELP 129 #define STRING_FUNC_HELP 130 +#define STRING_VALUE_NOT_SET 131 diff --git a/programs/reg/reg.rc b/programs/reg/reg.rc index 8714dae51b6..ae69cb7adfd 100644 --- a/programs/reg/reg.rc +++ b/programs/reg/reg.rc @@ -61,4 +61,5 @@ STRINGTABLE STRING_INVALID_OPTION, "reg: Invalid option [%1]. " STRING_REG_HELP, "Type \"REG /?\" for help.\n" STRING_FUNC_HELP, "Type \"REG %1 /?\" for help.\n" + STRING_VALUE_NOT_SET, "(value not set)" } diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 7556870b151..0339e6e3852 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -547,7 +547,7 @@ static void test_query(void) ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); run_reg_exe("reg query HKCU\\" KEY_BASE " /ve", &r); - todo_wine ok(r == REG_EXIT_SUCCESS || broken(r == REG_EXIT_FAILURE /* WinXP */), + ok(r == REG_EXIT_SUCCESS || broken(r == REG_EXIT_FAILURE /* WinXP */), "got exit code %d, expected 0\n", r); err = RegSetValueExA(key, "Test", 0, REG_SZ, (BYTE *)hello, sizeof(hello));