From: Hugh McMaster Subject: [PATCH] regedit: Output the registry data type as a string when it is used in error messages (v2) Message-Id: Date: Thu, 21 Jul 2016 10:57:01 +0000 Patches 124609 (Norwegian update) and 124629 (German update) must be applied prior to this patch. Signed-off-by: Hugh McMaster --- po/ar.po | 4 ++-- po/bg.po | 4 ++-- po/ca.po | 4 ++-- po/cs.po | 4 ++-- po/da.po | 4 ++-- po/de.po | 8 ++++---- po/el.po | 4 ++-- po/en.po | 8 ++++---- po/en_US.po | 8 ++++---- po/eo.po | 4 ++-- po/es.po | 4 ++-- po/fa.po | 4 ++-- po/fi.po | 4 ++-- po/fr.po | 4 ++-- po/he.po | 4 ++-- po/hi.po | 4 ++-- po/hr.po | 4 ++-- po/hu.po | 4 ++-- po/it.po | 4 ++-- po/ja.po | 4 ++-- po/ko.po | 4 ++-- po/lt.po | 8 ++++---- po/ml.po | 4 ++-- po/nb_NO.po | 8 ++++---- po/nl.po | 4 ++-- po/or.po | 4 ++-- po/pa.po | 4 ++-- po/pl.po | 4 ++-- po/pt_BR.po | 4 ++-- po/pt_PT.po | 4 ++-- po/rm.po | 4 ++-- po/ro.po | 4 ++-- po/ru.po | 8 ++++---- po/sk.po | 4 ++-- po/sl.po | 4 ++-- po/sr_RS@cyrillic.po | 4 ++-- po/sr_RS@latin.po | 4 ++-- po/sv.po | 4 ++-- po/te.po | 4 ++-- po/th.po | 4 ++-- po/tr.po | 4 ++-- po/uk.po | 8 ++++---- po/wa.po | 4 ++-- po/wine.pot | 4 ++-- po/zh_CN.po | 4 ++-- po/zh_TW.po | 4 ++-- programs/regedit/regedit.rc | 4 ++-- programs/regedit/regproc.c | 43 +++++++++++++++++++++++++++++++++++++++++-- 48 files changed, 149 insertions(+), 110 deletions(-) diff --git a/po/ar.po b/po/ar.po index f8cc24f..238ba6c 100644 --- a/po/ar.po +++ b/po/ar.po @@ -12222,7 +12222,7 @@ msgstr "" #: regedit.rc:371 #, fuzzy #| msgid "Unsupported type.\n" -msgid "regedit: Unsupported registry data type [%1!u!]\n" +msgid "regedit: Unsupported registry data type [%1]\n" msgstr "النوع غير مدعوم.\n" #: regedit.rc:372 @@ -12252,7 +12252,7 @@ msgstr "خطأ : تعذر إضافة المفاتيح للجهاز البعيد\ #: regedit.rc:376 #, fuzzy #| msgid "Unsupported type.\n" -msgid "regedit: Unsupported registry data type [%1!u!] encountered in '%2'.\n" +msgid "regedit: Unsupported registry data type [%1] encountered in '%2'.\n" msgstr "النوع غير مدعوم.\n" #: regedit.rc:377 diff --git a/po/bg.po b/po/bg.po index b020850..c2ebe15 100644 --- a/po/bg.po +++ b/po/bg.po @@ -11839,7 +11839,7 @@ msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" msgstr "" #: regedit.rc:371 -msgid "regedit: Unsupported registry data type [%1!u!]\n" +msgid "regedit: Unsupported registry data type [%1]\n" msgstr "" #: regedit.rc:372 @@ -11861,7 +11861,7 @@ msgid "regedit: Unable to open the registry key '%1'.\n" msgstr "Наистина ли искате да изтриете '%1'?" #: regedit.rc:376 -msgid "regedit: Unsupported registry data type [%1!u!] encountered in '%2'.\n" +msgid "regedit: Unsupported registry data type [%1] encountered in '%2'.\n" msgstr "" #: regedit.rc:377 diff --git a/po/ca.po b/po/ca.po index 0f46ffa..f1b277d 100644 --- a/po/ca.po +++ b/po/ca.po @@ -12116,7 +12116,7 @@ msgstr "" #: regedit.rc:371 #, fuzzy #| msgid "Error: Unsupported type\n" -msgid "regedit: Unsupported registry data type [%1!u!]\n" +msgid "regedit: Unsupported registry data type [%1]\n" msgstr "Error: Tipus incompatible\n" #: regedit.rc:372 @@ -12146,7 +12146,7 @@ msgstr "Error: No es pot accedir a la màquina remota\n" #: regedit.rc:376 #, fuzzy #| msgid "Error: Unsupported type\n" -msgid "regedit: Unsupported registry data type [%1!u!] encountered in '%2'.\n" +msgid "regedit: Unsupported registry data type [%1] encountered in '%2'.\n" msgstr "Error: Tipus incompatible\n" #: regedit.rc:377 diff --git a/po/cs.po b/po/cs.po index 0e0fdb6..09c5aef 100644 --- a/po/cs.po +++ b/po/cs.po @@ -11911,7 +11911,7 @@ msgstr "" #: regedit.rc:371 #, fuzzy #| msgid "Unsupported type.\n" -msgid "regedit: Unsupported registry data type [%1!u!]\n" +msgid "regedit: Unsupported registry data type [%1]\n" msgstr "Nepodporovaný typ.\n" #: regedit.rc:372 @@ -11941,7 +11941,7 @@ msgstr "Chyba: Nepodařilo se přidat klíče na vzdálený stroj\n" #: regedit.rc:376 #, fuzzy #| msgid "Unsupported type.\n" -msgid "regedit: Unsupported registry data type [%1!u!] encountered in '%2'.\n" +msgid "regedit: Unsupported registry data type [%1] encountered in '%2'.\n" msgstr "Nepodporovaný typ.\n" #: regedit.rc:377 diff --git a/po/da.po b/po/da.po index 2c7c823..8c96219 100644 --- a/po/da.po +++ b/po/da.po @@ -12177,7 +12177,7 @@ msgstr "" #: regedit.rc:371 #, fuzzy #| msgid "Unsupported type.\n" -msgid "regedit: Unsupported registry data type [%1!u!]\n" +msgid "regedit: Unsupported registry data type [%1]\n" msgstr "Ikke-understøttet type.\n" #: regedit.rc:372 @@ -12207,7 +12207,7 @@ msgstr "Fejl: Kunne ikke tilføje nøgler til fjern maskinen\n" #: regedit.rc:376 #, fuzzy #| msgid "Unsupported type.\n" -msgid "regedit: Unsupported registry data type [%1!u!] encountered in '%2'.\n" +msgid "regedit: Unsupported registry data type [%1] encountered in '%2'.\n" msgstr "Ikke-understøttet type.\n" #: regedit.rc:377 diff --git a/po/de.po b/po/de.po index 55b6edd..c7dbaad 100644 --- a/po/de.po +++ b/po/de.po @@ -12047,8 +12047,8 @@ msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" msgstr "regedit: Unbekannte Escape-Sequenz [\\%1!c!]\n" #: regedit.rc:371 -msgid "regedit: Unsupported registry data type [%1!u!]\n" -msgstr "regedit: Nicht unterstützter Registrierungsdatentyp [%1!u!]\n" +msgid "regedit: Unsupported registry data type [%1]\n" +msgstr "regedit: Nicht unterstützter Registrierungsdatentyp [%1]\n" #: regedit.rc:372 msgid "regedit: Unexpected end of line in '%1'.\n" @@ -12067,9 +12067,9 @@ msgid "regedit: Unable to open the registry key '%1'.\n" msgstr "regedit: Der Schlüssel '%1' konnte nicht geöffnet werden.\n" #: regedit.rc:376 -msgid "regedit: Unsupported registry data type [%1!u!] encountered in '%2'.\n" +msgid "regedit: Unsupported registry data type [%1] encountered in '%2'.\n" msgstr "" -"regedit: Nicht unterstützter Registrierungsdatentyp [%1!u!] wurde in '%2' " +"regedit: Nicht unterstützter Registrierungsdatentyp [%1] wurde in '%2' " "gefunden.\n" #: regedit.rc:377 diff --git a/po/el.po b/po/el.po index f7e8fcf..b03804f 100644 --- a/po/el.po +++ b/po/el.po @@ -11624,7 +11624,7 @@ msgstr "" #: regedit.rc:371 #, fuzzy -msgid "regedit: Unsupported registry data type [%1!u!]\n" +msgid "regedit: Unsupported registry data type [%1]\n" msgstr "Επιλογές.\n" #: regedit.rc:372 @@ -11645,7 +11645,7 @@ msgstr "" #: regedit.rc:376 #, fuzzy -msgid "regedit: Unsupported registry data type [%1!u!] encountered in '%2'.\n" +msgid "regedit: Unsupported registry data type [%1] encountered in '%2'.\n" msgstr "Επιλογές.\n" #: regedit.rc:377 diff --git a/po/en.po b/po/en.po index 9822551..78529da 100644 --- a/po/en.po +++ b/po/en.po @@ -11998,8 +11998,8 @@ msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" msgstr "regedit: Unrecognized escape sequence [\\%1!c!]\n" #: regedit.rc:371 -msgid "regedit: Unsupported registry data type [%1!u!]\n" -msgstr "regedit: Unsupported registry data type [%1!u!]\n" +msgid "regedit: Unsupported registry data type [%1]\n" +msgstr "regedit: Unsupported registry data type [%1]\n" #: regedit.rc:372 msgid "regedit: Unexpected end of line in '%1'.\n" @@ -12018,8 +12018,8 @@ msgid "regedit: Unable to open the registry key '%1'.\n" msgstr "regedit: Unable to open the registry key '%1'.\n" #: regedit.rc:376 -msgid "regedit: Unsupported registry data type [%1!u!] encountered in '%2'.\n" -msgstr "regedit: Unsupported registry data type [%1!u!] encountered in '%2'.\n" +msgid "regedit: Unsupported registry data type [%1] encountered in '%2'.\n" +msgstr "regedit: Unsupported registry data type [%1] encountered in '%2'.\n" #: regedit.rc:377 msgid "regedit: The registry value '%1' will be exported as binary data.\n" diff --git a/po/en_US.po b/po/en_US.po index a8d7c1c..c9c3d1e 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -11998,8 +11998,8 @@ msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" msgstr "regedit: Unrecognized escape sequence [\\%1!c!]\n" #: regedit.rc:371 -msgid "regedit: Unsupported registry data type [%1!u!]\n" -msgstr "regedit: Unsupported registry data type [%1!u!]\n" +msgid "regedit: Unsupported registry data type [%1]\n" +msgstr "regedit: Unsupported registry data type [%1]\n" #: regedit.rc:372 msgid "regedit: Unexpected end of line in '%1'.\n" @@ -12018,8 +12018,8 @@ msgid "regedit: Unable to open the registry key '%1'.\n" msgstr "regedit: Unable to open the registry key '%1'.\n" #: regedit.rc:376 -msgid "regedit: Unsupported registry data type [%1!u!] encountered in '%2'.\n" -msgstr "regedit: Unsupported registry data type [%1!u!] encountered in '%2'.\n" +msgid "regedit: Unsupported registry data type [%1] encountered in '%2'.\n" +msgstr "regedit: Unsupported registry data type [%1] encountered in '%2'.\n" #: regedit.rc:377 msgid "regedit: The registry value '%1' will be exported as binary data.\n" diff --git a/po/eo.po b/po/eo.po index a3d5446..25f38ef 100644 --- a/po/eo.po +++ b/po/eo.po @@ -11525,7 +11525,7 @@ msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" msgstr "" #: regedit.rc:371 -msgid "regedit: Unsupported registry data type [%1!u!]\n" +msgid "regedit: Unsupported registry data type [%1]\n" msgstr "" #: regedit.rc:372 @@ -11547,7 +11547,7 @@ msgid "regedit: Unable to open the registry key '%1'.\n" msgstr "Ĉu vi estas certa pri forigo de '%1'?" #: regedit.rc:376 -msgid "regedit: Unsupported registry data type [%1!u!] encountered in '%2'.\n" +msgid "regedit: Unsupported registry data type [%1] encountered in '%2'.\n" msgstr "" #: regedit.rc:377 diff --git a/po/es.po b/po/es.po index de704f1..bda6d22 100644 --- a/po/es.po +++ b/po/es.po @@ -12256,7 +12256,7 @@ msgstr "" #: regedit.rc:371 #, fuzzy #| msgid "Unsupported type.\n" -msgid "regedit: Unsupported registry data type [%1!u!]\n" +msgid "regedit: Unsupported registry data type [%1]\n" msgstr "Tipo no soportado.\n" #: regedit.rc:372 @@ -12286,7 +12286,7 @@ msgstr "Error: No se puede agregar claves al equipo remoto\n" #: regedit.rc:376 #, fuzzy #| msgid "Unsupported type.\n" -msgid "regedit: Unsupported registry data type [%1!u!] encountered in '%2'.\n" +msgid "regedit: Unsupported registry data type [%1] encountered in '%2'.\n" msgstr "Tipo no soportado.\n" #: regedit.rc:377 diff --git a/po/fa.po b/po/fa.po index 2bcb8c0..db9b70e 100644 --- a/po/fa.po +++ b/po/fa.po @@ -11617,7 +11617,7 @@ msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" msgstr "" #: regedit.rc:371 -msgid "regedit: Unsupported registry data type [%1!u!]\n" +msgid "regedit: Unsupported registry data type [%1]\n" msgstr "" #: regedit.rc:372 @@ -11638,7 +11638,7 @@ msgid "regedit: Unable to open the registry key '%1'.\n" msgstr "پرونده‌های متنی (*.txt).\n" #: regedit.rc:376 -msgid "regedit: Unsupported registry data type [%1!u!] encountered in '%2'.\n" +msgid "regedit: Unsupported registry data type [%1] encountered in '%2'.\n" msgstr "" #: regedit.rc:377 diff --git a/po/fi.po b/po/fi.po index 179fc74..a26c35a 100644 --- a/po/fi.po +++ b/po/fi.po @@ -11979,7 +11979,7 @@ msgstr "regedit: Virheellinen tai tuntematon valitsin [%1]\n" #: regedit.rc:371 #, fuzzy #| msgid "reg: Unsupported registry data type [%1]\n" -msgid "regedit: Unsupported registry data type [%1!u!]\n" +msgid "regedit: Unsupported registry data type [%1]\n" msgstr "reg: Rekisterin tietotyypille [%1] ei ole tukea\n" #: regedit.rc:372 @@ -12009,7 +12009,7 @@ msgstr "regedit: Tiedostoa '%1' ei voida avata.\n" #: regedit.rc:376 #, fuzzy #| msgid "reg: Unsupported registry data type [%1]\n" -msgid "regedit: Unsupported registry data type [%1!u!] encountered in '%2'.\n" +msgid "regedit: Unsupported registry data type [%1] encountered in '%2'.\n" msgstr "reg: Rekisterin tietotyypille [%1] ei ole tukea\n" #: regedit.rc:377 diff --git a/po/fr.po b/po/fr.po index baf6594..1bd3c94 100644 --- a/po/fr.po +++ b/po/fr.po @@ -12129,7 +12129,7 @@ msgstr "" #: regedit.rc:371 #, fuzzy #| msgid "reg: Unsupported registry data type [%1]\n" -msgid "regedit: Unsupported registry data type [%1!u!]\n" +msgid "regedit: Unsupported registry data type [%1]\n" msgstr "reg : type non pris en charge [%1]\n" #: regedit.rc:372 @@ -12159,7 +12159,7 @@ msgstr "reg : impossible d'accéder à une machine distante\n" #: regedit.rc:376 #, fuzzy #| msgid "reg: Unsupported registry data type [%1]\n" -msgid "regedit: Unsupported registry data type [%1!u!] encountered in '%2'.\n" +msgid "regedit: Unsupported registry data type [%1] encountered in '%2'.\n" msgstr "reg : type non pris en charge [%1]\n" #: regedit.rc:377 diff --git a/po/he.po b/po/he.po index 6981ccb..783b70a 100644 --- a/po/he.po +++ b/po/he.po @@ -11996,7 +11996,7 @@ msgstr "" #: regedit.rc:371 #, fuzzy #| msgid "Error: Command line not supported\n" -msgid "regedit: Unsupported registry data type [%1!u!]\n" +msgid "regedit: Unsupported registry data type [%1]\n" msgstr "Error: Command line not supported\n" #: regedit.rc:372 @@ -12024,7 +12024,7 @@ msgstr "Error: Unable to add keys to remote machine\n" #: regedit.rc:376 #, fuzzy #| msgid "Error: Command line not supported\n" -msgid "regedit: Unsupported registry data type [%1!u!] encountered in '%2'.\n" +msgid "regedit: Unsupported registry data type [%1] encountered in '%2'.\n" msgstr "Error: Command line not supported\n" #: regedit.rc:377 diff --git a/po/hi.po b/po/hi.po index 5399495..b6f6720 100644 --- a/po/hi.po +++ b/po/hi.po @@ -11415,7 +11415,7 @@ msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" msgstr "" #: regedit.rc:371 -msgid "regedit: Unsupported registry data type [%1!u!]\n" +msgid "regedit: Unsupported registry data type [%1]\n" msgstr "" #: regedit.rc:372 @@ -11435,7 +11435,7 @@ msgid "regedit: Unable to open the registry key '%1'.\n" msgstr "" #: regedit.rc:376 -msgid "regedit: Unsupported registry data type [%1!u!] encountered in '%2'.\n" +msgid "regedit: Unsupported registry data type [%1] encountered in '%2'.\n" msgstr "" #: regedit.rc:377 diff --git a/po/hr.po b/po/hr.po index 0efc085..a0bf772 100644 --- a/po/hr.po +++ b/po/hr.po @@ -11730,7 +11730,7 @@ msgstr "" #: regedit.rc:371 #, fuzzy #| msgid "Unsupported type.\n" -msgid "regedit: Unsupported registry data type [%1!u!]\n" +msgid "regedit: Unsupported registry data type [%1]\n" msgstr "Nepodržan tip.\n" #: regedit.rc:372 @@ -11758,7 +11758,7 @@ msgstr "Datoteka se ne može otvoriti." #: regedit.rc:376 #, fuzzy #| msgid "Unsupported type.\n" -msgid "regedit: Unsupported registry data type [%1!u!] encountered in '%2'.\n" +msgid "regedit: Unsupported registry data type [%1] encountered in '%2'.\n" msgstr "Nepodržan tip.\n" #: regedit.rc:377 diff --git a/po/hu.po b/po/hu.po index 9190426..80b3bd8 100644 --- a/po/hu.po +++ b/po/hu.po @@ -12174,7 +12174,7 @@ msgstr "" #: regedit.rc:371 #, fuzzy #| msgid "Unsupported type.\n" -msgid "regedit: Unsupported registry data type [%1!u!]\n" +msgid "regedit: Unsupported registry data type [%1]\n" msgstr "Nem támogatott típus.\n" #: regedit.rc:372 @@ -12204,7 +12204,7 @@ msgstr "Hiba: nem lehet kulcsokat hozzáadni a távoli gépnél\n" #: regedit.rc:376 #, fuzzy #| msgid "Unsupported type.\n" -msgid "regedit: Unsupported registry data type [%1!u!] encountered in '%2'.\n" +msgid "regedit: Unsupported registry data type [%1] encountered in '%2'.\n" msgstr "Nem támogatott típus.\n" #: regedit.rc:377 diff --git a/po/it.po b/po/it.po index 27965bd..75578f6 100644 --- a/po/it.po +++ b/po/it.po @@ -12257,7 +12257,7 @@ msgstr "" #: regedit.rc:371 #, fuzzy #| msgid "Unsupported type.\n" -msgid "regedit: Unsupported registry data type [%1!u!]\n" +msgid "regedit: Unsupported registry data type [%1]\n" msgstr "Tipo non supportato.\n" #: regedit.rc:372 @@ -12287,7 +12287,7 @@ msgstr "Errore: impossibile aggiungere chiavi alla macchina remota\n" #: regedit.rc:376 #, fuzzy #| msgid "Unsupported type.\n" -msgid "regedit: Unsupported registry data type [%1!u!] encountered in '%2'.\n" +msgid "regedit: Unsupported registry data type [%1] encountered in '%2'.\n" msgstr "Tipo non supportato.\n" #: regedit.rc:377 diff --git a/po/ja.po b/po/ja.po index a0af85a..4e5c8e1 100644 --- a/po/ja.po +++ b/po/ja.po @@ -11971,7 +11971,7 @@ msgstr "" #: regedit.rc:371 #, fuzzy #| msgid "reg: Unsupported registry data type [%1]\n" -msgid "regedit: Unsupported registry data type [%1!u!]\n" +msgid "regedit: Unsupported registry data type [%1]\n" msgstr "reg: サポートされていないレジストリのデータ型 [%1]\n" #: regedit.rc:372 @@ -12001,7 +12001,7 @@ msgstr "reg: リモート マシンにアクセスできませんでした\n" #: regedit.rc:376 #, fuzzy #| msgid "reg: Unsupported registry data type [%1]\n" -msgid "regedit: Unsupported registry data type [%1!u!] encountered in '%2'.\n" +msgid "regedit: Unsupported registry data type [%1] encountered in '%2'.\n" msgstr "reg: サポートされていないレジストリのデータ型 [%1]\n" #: regedit.rc:377 diff --git a/po/ko.po b/po/ko.po index 0eb181a..a8117fb 100644 --- a/po/ko.po +++ b/po/ko.po @@ -12244,7 +12244,7 @@ msgstr "" #: regedit.rc:371 #, fuzzy #| msgid "Unsupported type.\n" -msgid "regedit: Unsupported registry data type [%1!u!]\n" +msgid "regedit: Unsupported registry data type [%1]\n" msgstr "지원하지 않는 형식.\n" #: regedit.rc:372 @@ -12274,7 +12274,7 @@ msgstr "오류: 원격 머신에 키를 더하는 것은 가능하지 않습니 #: regedit.rc:376 #, fuzzy #| msgid "Unsupported type.\n" -msgid "regedit: Unsupported registry data type [%1!u!] encountered in '%2'.\n" +msgid "regedit: Unsupported registry data type [%1] encountered in '%2'.\n" msgstr "지원하지 않는 형식.\n" #: regedit.rc:377 diff --git a/po/lt.po b/po/lt.po index d695575..4e263ae 100644 --- a/po/lt.po +++ b/po/lt.po @@ -12001,8 +12001,8 @@ msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" msgstr "regedit: Neatpažinta kaitos seka [\\%1!c!]\n" #: regedit.rc:371 -msgid "regedit: Unsupported registry data type [%1!u!]\n" -msgstr "regedit: Nepalaikomas registro duomenų tipas [%1!u!]\n" +msgid "regedit: Unsupported registry data type [%1]\n" +msgstr "regedit: Nepalaikomas registro duomenų tipas [%1]\n" #: regedit.rc:372 msgid "regedit: Unexpected end of line in '%1'.\n" @@ -12021,8 +12021,8 @@ msgid "regedit: Unable to open the registry key '%1'.\n" msgstr "regedit: Nepavyko atverti registro rakto „%1“.\n" #: regedit.rc:376 -msgid "regedit: Unsupported registry data type [%1!u!] encountered in '%2'.\n" -msgstr "regedit: Nepalaikomas registro duomenų tipas [%1!u!] sutiktas „%2“.\n" +msgid "regedit: Unsupported registry data type [%1] encountered in '%2'.\n" +msgstr "regedit: Nepalaikomas registro duomenų tipas [%1] sutiktas „%2“.\n" #: regedit.rc:377 msgid "regedit: The registry value '%1' will be exported as binary data.\n" diff --git a/po/ml.po b/po/ml.po index 6ff15f0..341c979 100644 --- a/po/ml.po +++ b/po/ml.po @@ -11415,7 +11415,7 @@ msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" msgstr "" #: regedit.rc:371 -msgid "regedit: Unsupported registry data type [%1!u!]\n" +msgid "regedit: Unsupported registry data type [%1]\n" msgstr "" #: regedit.rc:372 @@ -11435,7 +11435,7 @@ msgid "regedit: Unable to open the registry key '%1'.\n" msgstr "" #: regedit.rc:376 -msgid "regedit: Unsupported registry data type [%1!u!] encountered in '%2'.\n" +msgid "regedit: Unsupported registry data type [%1] encountered in '%2'.\n" msgstr "" #: regedit.rc:377 diff --git a/po/nb_NO.po b/po/nb_NO.po index 95811ec..0232576 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -11995,8 +11995,8 @@ msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" msgstr "regedit: Ukjent escape-sekvens [\\%1!c!]\n" #: regedit.rc:371 -msgid "regedit: Unsupported registry data type [%1!u!]\n" -msgstr "regedit: Registerdatatypen [%1!u!] støttes ikke\n" +msgid "regedit: Unsupported registry data type [%1]\n" +msgstr "regedit: Registerdatatypen [%1] støttes ikke\n" #: regedit.rc:372 msgid "regedit: Unexpected end of line in '%1'.\n" @@ -12015,8 +12015,8 @@ msgid "regedit: Unable to open the registry key '%1'.\n" msgstr "regedit: Kan ikke åpne registernøkkelen \"%1\".\n" #: regedit.rc:376 -msgid "regedit: Unsupported registry data type [%1!u!] encountered in '%2'.\n" -msgstr "regedit: Registerdatatypen [%1!u!], funnet i \"%2\", støttes ikke.\n" +msgid "regedit: Unsupported registry data type [%1] encountered in '%2'.\n" +msgstr "regedit: Registerdatatypen [%1], funnet i \"%2\", støttes ikke.\n" #: regedit.rc:377 msgid "regedit: The registry value '%1' will be exported as binary data.\n" diff --git a/po/nl.po b/po/nl.po index 8f4ca99..de8388b 100644 --- a/po/nl.po +++ b/po/nl.po @@ -12222,7 +12222,7 @@ msgstr "" #: regedit.rc:371 #, fuzzy #| msgid "Unsupported type.\n" -msgid "regedit: Unsupported registry data type [%1!u!]\n" +msgid "regedit: Unsupported registry data type [%1]\n" msgstr "Niet-ondersteund type.\n" #: regedit.rc:372 @@ -12252,7 +12252,7 @@ msgstr "Fout: Sleutels konden niet toegevoegd worden aan de remote machine\n" #: regedit.rc:376 #, fuzzy #| msgid "Unsupported type.\n" -msgid "regedit: Unsupported registry data type [%1!u!] encountered in '%2'.\n" +msgid "regedit: Unsupported registry data type [%1] encountered in '%2'.\n" msgstr "Niet-ondersteund type.\n" #: regedit.rc:377 diff --git a/po/or.po b/po/or.po index aa72927..571419b 100644 --- a/po/or.po +++ b/po/or.po @@ -11415,7 +11415,7 @@ msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" msgstr "" #: regedit.rc:371 -msgid "regedit: Unsupported registry data type [%1!u!]\n" +msgid "regedit: Unsupported registry data type [%1]\n" msgstr "" #: regedit.rc:372 @@ -11435,7 +11435,7 @@ msgid "regedit: Unable to open the registry key '%1'.\n" msgstr "" #: regedit.rc:376 -msgid "regedit: Unsupported registry data type [%1!u!] encountered in '%2'.\n" +msgid "regedit: Unsupported registry data type [%1] encountered in '%2'.\n" msgstr "" #: regedit.rc:377 diff --git a/po/pa.po b/po/pa.po index df4072b..2923f16 100644 --- a/po/pa.po +++ b/po/pa.po @@ -11415,7 +11415,7 @@ msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" msgstr "" #: regedit.rc:371 -msgid "regedit: Unsupported registry data type [%1!u!]\n" +msgid "regedit: Unsupported registry data type [%1]\n" msgstr "" #: regedit.rc:372 @@ -11435,7 +11435,7 @@ msgid "regedit: Unable to open the registry key '%1'.\n" msgstr "" #: regedit.rc:376 -msgid "regedit: Unsupported registry data type [%1!u!] encountered in '%2'.\n" +msgid "regedit: Unsupported registry data type [%1] encountered in '%2'.\n" msgstr "" #: regedit.rc:377 diff --git a/po/pl.po b/po/pl.po index 56ce654..4090b13 100644 --- a/po/pl.po +++ b/po/pl.po @@ -12071,7 +12071,7 @@ msgstr "" #: regedit.rc:371 #, fuzzy #| msgid "Error: Unsupported type\n" -msgid "regedit: Unsupported registry data type [%1!u!]\n" +msgid "regedit: Unsupported registry data type [%1]\n" msgstr "Błąd: Niewspierany typ\n" #: regedit.rc:372 @@ -12101,7 +12101,7 @@ msgstr "Błąd: Błąd dostępu do zdalnej maszyny\n" #: regedit.rc:376 #, fuzzy #| msgid "Error: Unsupported type\n" -msgid "regedit: Unsupported registry data type [%1!u!] encountered in '%2'.\n" +msgid "regedit: Unsupported registry data type [%1] encountered in '%2'.\n" msgstr "Błąd: Niewspierany typ\n" #: regedit.rc:377 diff --git a/po/pt_BR.po b/po/pt_BR.po index 866dec3..ec45fa4 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -12078,7 +12078,7 @@ msgstr "" #: regedit.rc:371 #, fuzzy #| msgid "Error: Unsupported type\n" -msgid "regedit: Unsupported registry data type [%1!u!]\n" +msgid "regedit: Unsupported registry data type [%1]\n" msgstr "Erro: Tipo não suportado.\n" #: regedit.rc:372 @@ -12108,7 +12108,7 @@ msgstr "Erro: Não foi possível acessar a máquina remota\n" #: regedit.rc:376 #, fuzzy #| msgid "Error: Unsupported type\n" -msgid "regedit: Unsupported registry data type [%1!u!] encountered in '%2'.\n" +msgid "regedit: Unsupported registry data type [%1] encountered in '%2'.\n" msgstr "Erro: Tipo não suportado.\n" #: regedit.rc:377 diff --git a/po/pt_PT.po b/po/pt_PT.po index 358859f..c35ed6e 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -12052,7 +12052,7 @@ msgstr "" #: regedit.rc:371 #, fuzzy #| msgid "Unsupported type.\n" -msgid "regedit: Unsupported registry data type [%1!u!]\n" +msgid "regedit: Unsupported registry data type [%1]\n" msgstr "Tipo não suportado.\n" #: regedit.rc:372 @@ -12082,7 +12082,7 @@ msgstr "Erro: Incapaz de adicionar chaves à máquina remota\n" #: regedit.rc:376 #, fuzzy #| msgid "Unsupported type.\n" -msgid "regedit: Unsupported registry data type [%1!u!] encountered in '%2'.\n" +msgid "regedit: Unsupported registry data type [%1] encountered in '%2'.\n" msgstr "Tipo não suportado.\n" #: regedit.rc:377 diff --git a/po/rm.po b/po/rm.po index fa958a7..2e94bd9 100644 --- a/po/rm.po +++ b/po/rm.po @@ -11502,7 +11502,7 @@ msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" msgstr "" #: regedit.rc:371 -msgid "regedit: Unsupported registry data type [%1!u!]\n" +msgid "regedit: Unsupported registry data type [%1]\n" msgstr "" #: regedit.rc:372 @@ -11523,7 +11523,7 @@ msgid "regedit: Unable to open the registry key '%1'.\n" msgstr "Tuot las datotecas (*.*).\n" #: regedit.rc:376 -msgid "regedit: Unsupported registry data type [%1!u!] encountered in '%2'.\n" +msgid "regedit: Unsupported registry data type [%1] encountered in '%2'.\n" msgstr "" #: regedit.rc:377 diff --git a/po/ro.po b/po/ro.po index f8dc3ba..6412113 100644 --- a/po/ro.po +++ b/po/ro.po @@ -12266,7 +12266,7 @@ msgstr "" #: regedit.rc:371 #, fuzzy #| msgid "Error: Command line not supported\n" -msgid "regedit: Unsupported registry data type [%1!u!]\n" +msgid "regedit: Unsupported registry data type [%1]\n" msgstr "Eroare: Linie de comandă nesuportată\n" #: regedit.rc:372 @@ -12296,7 +12296,7 @@ msgstr "Eroare: Nu se pot adăuga chei pe calculatorul de la distanță\n" #: regedit.rc:376 #, fuzzy #| msgid "Error: Command line not supported\n" -msgid "regedit: Unsupported registry data type [%1!u!] encountered in '%2'.\n" +msgid "regedit: Unsupported registry data type [%1] encountered in '%2'.\n" msgstr "Eroare: Linie de comandă nesuportată\n" #: regedit.rc:377 diff --git a/po/ru.po b/po/ru.po index e67ae36..cbd81ef 100644 --- a/po/ru.po +++ b/po/ru.po @@ -11998,8 +11998,8 @@ msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" msgstr "regedit: неизвестная управляющая последовательность [\\%1!c!]\n" #: regedit.rc:371 -msgid "regedit: Unsupported registry data type [%1!u!]\n" -msgstr "regedit: тип данных [%1!u!] не поддерживается\n" +msgid "regedit: Unsupported registry data type [%1]\n" +msgstr "regedit: тип данных [%1] не поддерживается\n" #: regedit.rc:372 msgid "regedit: Unexpected end of line in '%1'.\n" @@ -12018,8 +12018,8 @@ msgid "regedit: Unable to open the registry key '%1'.\n" msgstr "regedit: не удалось открыть ключ «%1».\n" #: regedit.rc:376 -msgid "regedit: Unsupported registry data type [%1!u!] encountered in '%2'.\n" -msgstr "regedit: «%2» содержит неподдерживаемый тип данных [%1!u!].\n" +msgid "regedit: Unsupported registry data type [%1] encountered in '%2'.\n" +msgstr "regedit: «%2» содержит неподдерживаемый тип данных [%1].\n" #: regedit.rc:377 msgid "regedit: The registry value '%1' will be exported as binary data.\n" diff --git a/po/sk.po b/po/sk.po index bc2def5..9efc3f8 100644 --- a/po/sk.po +++ b/po/sk.po @@ -11698,7 +11698,7 @@ msgstr "" #: regedit.rc:371 #, fuzzy #| msgid "Unsupported type.\n" -msgid "regedit: Unsupported registry data type [%1!u!]\n" +msgid "regedit: Unsupported registry data type [%1]\n" msgstr "Nepodporovaný typ.\n" #: regedit.rc:372 @@ -11728,7 +11728,7 @@ msgstr "Chyba: Nemožno ukončiť proces \"%1\".\n" #: regedit.rc:376 #, fuzzy #| msgid "Unsupported type.\n" -msgid "regedit: Unsupported registry data type [%1!u!] encountered in '%2'.\n" +msgid "regedit: Unsupported registry data type [%1] encountered in '%2'.\n" msgstr "Nepodporovaný typ.\n" #: regedit.rc:377 diff --git a/po/sl.po b/po/sl.po index 29a5d75..bf0877b 100644 --- a/po/sl.po +++ b/po/sl.po @@ -12198,7 +12198,7 @@ msgstr "" #: regedit.rc:371 #, fuzzy #| msgid "Unsupported type.\n" -msgid "regedit: Unsupported registry data type [%1!u!]\n" +msgid "regedit: Unsupported registry data type [%1]\n" msgstr "Nepodprta vrsta.\n" #: regedit.rc:372 @@ -12228,7 +12228,7 @@ msgstr "Napaka: ni mogoče dodati ključa na oddaljen računalnik\n" #: regedit.rc:376 #, fuzzy #| msgid "Unsupported type.\n" -msgid "regedit: Unsupported registry data type [%1!u!] encountered in '%2'.\n" +msgid "regedit: Unsupported registry data type [%1] encountered in '%2'.\n" msgstr "Nepodprta vrsta.\n" #: regedit.rc:377 diff --git a/po/sr_RS@cyrillic.po b/po/sr_RS@cyrillic.po index 806fb8e..cf16d4f 100644 --- a/po/sr_RS@cyrillic.po +++ b/po/sr_RS@cyrillic.po @@ -12105,7 +12105,7 @@ msgstr "" #: regedit.rc:371 #, fuzzy #| msgid "Error: Invalid command line parameters\n" -msgid "regedit: Unsupported registry data type [%1!u!]\n" +msgid "regedit: Unsupported registry data type [%1]\n" msgstr "" "Грешка: унесени су непознати или неисправни параметри наредбене линије\n" @@ -12130,7 +12130,7 @@ msgstr "Желите ли да избришете „%1“?" #: regedit.rc:376 #, fuzzy #| msgid "Error: Invalid command line parameters\n" -msgid "regedit: Unsupported registry data type [%1!u!] encountered in '%2'.\n" +msgid "regedit: Unsupported registry data type [%1] encountered in '%2'.\n" msgstr "" "Грешка: унесени су непознати или неисправни параметри наредбене линије\n" diff --git a/po/sr_RS@latin.po b/po/sr_RS@latin.po index 0eb4473..8033b3a 100644 --- a/po/sr_RS@latin.po +++ b/po/sr_RS@latin.po @@ -12252,7 +12252,7 @@ msgstr "" #: regedit.rc:371 #, fuzzy #| msgid "Error: Invalid command line parameters\n" -msgid "regedit: Unsupported registry data type [%1!u!]\n" +msgid "regedit: Unsupported registry data type [%1]\n" msgstr "" "Greška: uneseni su nepoznati ili neispravni parametri naredbene linije\n" @@ -12277,7 +12277,7 @@ msgstr "Želite li da izbrišete „%1“?" #: regedit.rc:376 #, fuzzy #| msgid "Error: Invalid command line parameters\n" -msgid "regedit: Unsupported registry data type [%1!u!] encountered in '%2'.\n" +msgid "regedit: Unsupported registry data type [%1] encountered in '%2'.\n" msgstr "" "Greška: uneseni su nepoznati ili neispravni parametri naredbene linije\n" diff --git a/po/sv.po b/po/sv.po index a2dba87..7cc2fb2 100644 --- a/po/sv.po +++ b/po/sv.po @@ -11871,7 +11871,7 @@ msgstr "" #: regedit.rc:371 #, fuzzy #| msgid "reg: Unsupported registry data type [%1]\n" -msgid "regedit: Unsupported registry data type [%1!u!]\n" +msgid "regedit: Unsupported registry data type [%1]\n" msgstr "reg: Ej stödd typ [%1] i registret\n" #: regedit.rc:372 @@ -11901,7 +11901,7 @@ msgstr "reg: Kan inte få tillgång till fjärrmaskin\n" #: regedit.rc:376 #, fuzzy #| msgid "reg: Unsupported registry data type [%1]\n" -msgid "regedit: Unsupported registry data type [%1!u!] encountered in '%2'.\n" +msgid "regedit: Unsupported registry data type [%1] encountered in '%2'.\n" msgstr "reg: Ej stödd typ [%1] i registret\n" #: regedit.rc:377 diff --git a/po/te.po b/po/te.po index 70363bc..a111814 100644 --- a/po/te.po +++ b/po/te.po @@ -11415,7 +11415,7 @@ msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" msgstr "" #: regedit.rc:371 -msgid "regedit: Unsupported registry data type [%1!u!]\n" +msgid "regedit: Unsupported registry data type [%1]\n" msgstr "" #: regedit.rc:372 @@ -11435,7 +11435,7 @@ msgid "regedit: Unable to open the registry key '%1'.\n" msgstr "" #: regedit.rc:376 -msgid "regedit: Unsupported registry data type [%1!u!] encountered in '%2'.\n" +msgid "regedit: Unsupported registry data type [%1] encountered in '%2'.\n" msgstr "" #: regedit.rc:377 diff --git a/po/th.po b/po/th.po index 428049f..2422d5f 100644 --- a/po/th.po +++ b/po/th.po @@ -11657,7 +11657,7 @@ msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" msgstr "" #: regedit.rc:371 -msgid "regedit: Unsupported registry data type [%1!u!]\n" +msgid "regedit: Unsupported registry data type [%1]\n" msgstr "" #: regedit.rc:372 @@ -11678,7 +11678,7 @@ msgid "regedit: Unable to open the registry key '%1'.\n" msgstr "แฟ้มตํารา (*.txt).\n" #: regedit.rc:376 -msgid "regedit: Unsupported registry data type [%1!u!] encountered in '%2'.\n" +msgid "regedit: Unsupported registry data type [%1] encountered in '%2'.\n" msgstr "" #: regedit.rc:377 diff --git a/po/tr.po b/po/tr.po index a52870f..fb1d7f2 100644 --- a/po/tr.po +++ b/po/tr.po @@ -12041,7 +12041,7 @@ msgstr "" #: regedit.rc:371 #, fuzzy #| msgid "Error: Unsupported type\n" -msgid "regedit: Unsupported registry data type [%1!u!]\n" +msgid "regedit: Unsupported registry data type [%1]\n" msgstr "Hata: Desteklenmeyen tür\n" #: regedit.rc:372 @@ -12071,7 +12071,7 @@ msgstr "Hata: Uzak makineye erişilemiyor\n" #: regedit.rc:376 #, fuzzy #| msgid "Error: Unsupported type\n" -msgid "regedit: Unsupported registry data type [%1!u!] encountered in '%2'.\n" +msgid "regedit: Unsupported registry data type [%1] encountered in '%2'.\n" msgstr "Hata: Desteklenmeyen tür\n" #: regedit.rc:377 diff --git a/po/uk.po b/po/uk.po index c350b51..f571ac7 100644 --- a/po/uk.po +++ b/po/uk.po @@ -12083,8 +12083,8 @@ msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" msgstr "regedit: Нерозпізнана послідовність [\\%1!c!]\n" #: regedit.rc:371 -msgid "regedit: Unsupported registry data type [%1!u!]\n" -msgstr "regedit: Непідтримуваний тип даних [%1!u!]\n" +msgid "regedit: Unsupported registry data type [%1]\n" +msgstr "regedit: Непідтримуваний тип даних [%1]\n" #: regedit.rc:372 msgid "regedit: Unexpected end of line in '%1'.\n" @@ -12103,8 +12103,8 @@ msgid "regedit: Unable to open the registry key '%1'.\n" msgstr "regedit: Неможливо відкрити ключ '%1'.\n" #: regedit.rc:376 -msgid "regedit: Unsupported registry data type [%1!u!] encountered in '%2'.\n" -msgstr "regedit: '%2' містить непідтримуваний тип даних [%1!u!].\n" +msgid "regedit: Unsupported registry data type [%1] encountered in '%2'.\n" +msgstr "regedit: '%2' містить непідтримуваний тип даних [%1].\n" #: regedit.rc:377 msgid "regedit: The registry value '%1' will be exported as binary data.\n" diff --git a/po/wa.po b/po/wa.po index 75e5739..9143822 100644 --- a/po/wa.po +++ b/po/wa.po @@ -11565,7 +11565,7 @@ msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" msgstr "" #: regedit.rc:371 -msgid "regedit: Unsupported registry data type [%1!u!]\n" +msgid "regedit: Unsupported registry data type [%1]\n" msgstr "" #: regedit.rc:372 @@ -11586,7 +11586,7 @@ msgid "regedit: Unable to open the registry key '%1'.\n" msgstr "Fitchîs tekse (*.txt).\n" #: regedit.rc:376 -msgid "regedit: Unsupported registry data type [%1!u!] encountered in '%2'.\n" +msgid "regedit: Unsupported registry data type [%1] encountered in '%2'.\n" msgstr "" #: regedit.rc:377 diff --git a/po/wine.pot b/po/wine.pot index 53163be..ec10840 100644 --- a/po/wine.pot +++ b/po/wine.pot @@ -11351,7 +11351,7 @@ msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" msgstr "" #: regedit.rc:371 -msgid "regedit: Unsupported registry data type [%1!u!]\n" +msgid "regedit: Unsupported registry data type [%1]\n" msgstr "" #: regedit.rc:372 @@ -11371,7 +11371,7 @@ msgid "regedit: Unable to open the registry key '%1'.\n" msgstr "" #: regedit.rc:376 -msgid "regedit: Unsupported registry data type [%1!u!] encountered in '%2'.\n" +msgid "regedit: Unsupported registry data type [%1] encountered in '%2'.\n" msgstr "" #: regedit.rc:377 diff --git a/po/zh_CN.po b/po/zh_CN.po index b2058e9..f95cc66 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -11531,7 +11531,7 @@ msgstr "" #: regedit.rc:371 #, fuzzy #| msgid "Error: Unsupported type\n" -msgid "regedit: Unsupported registry data type [%1!u!]\n" +msgid "regedit: Unsupported registry data type [%1]\n" msgstr "错误：不支持的格式\n" #: regedit.rc:372 @@ -11561,7 +11561,7 @@ msgstr "错误：无法访问远程机器\n" #: regedit.rc:376 #, fuzzy #| msgid "Error: Unsupported type\n" -msgid "regedit: Unsupported registry data type [%1!u!] encountered in '%2'.\n" +msgid "regedit: Unsupported registry data type [%1] encountered in '%2'.\n" msgstr "错误：不支持的格式\n" #: regedit.rc:377 diff --git a/po/zh_TW.po b/po/zh_TW.po index fee8977..950ed73 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -12129,7 +12129,7 @@ msgstr "" #: regedit.rc:371 #, fuzzy #| msgid "Unsupported type.\n" -msgid "regedit: Unsupported registry data type [%1!u!]\n" +msgid "regedit: Unsupported registry data type [%1]\n" msgstr "不受支援的型態。\n" #: regedit.rc:372 @@ -12159,7 +12159,7 @@ msgstr "錯誤：無法加入索引鍵到遠端機器\n" #: regedit.rc:376 #, fuzzy #| msgid "Unsupported type.\n" -msgid "regedit: Unsupported registry data type [%1!u!] encountered in '%2'.\n" +msgid "regedit: Unsupported registry data type [%1] encountered in '%2'.\n" msgstr "不受支援的型態。\n" #: regedit.rc:377 diff --git a/programs/regedit/regedit.rc b/programs/regedit/regedit.rc index 61e3be1..072648e 100644 --- a/programs/regedit/regedit.rc +++ b/programs/regedit/regedit.rc @@ -367,12 +367,12 @@ STRINGTABLE STRING_INVALID_HEX, "regedit: Invalid hexadecimal value.\n" STRING_CSV_HEX_ERROR, "regedit: Unable to convert hexadecimal data. An invalid value was encountered at '%1'.\n" STRING_ESCAPE_SEQUENCE, "regedit: Unrecognized escape sequence [\\%1!c!]\n" - STRING_UNKNOWN_DATA_FORMAT, "regedit: Unsupported registry data type [%1!u!]\n" + STRING_UNKNOWN_DATA_FORMAT, "regedit: Unsupported registry data type [%1]\n" STRING_UNEXPECTED_EOL, "regedit: Unexpected end of line in '%1'.\n" STRING_UNRECOGNIZED_LINE, "regedit: The line '%1' was not recognized.\n" STRING_SETVALUE_FAILED, "regedit: Unable to add the registry value '%1' to '%2'.\n" STRING_OPEN_KEY_FAILED, "regedit: Unable to open the registry key '%1'.\n" - STRING_UNSUPPORTED_TYPE, "regedit: Unsupported registry data type [%1!u!] encountered in '%2'.\n" + STRING_UNSUPPORTED_TYPE, "regedit: Unsupported registry data type [%1] encountered in '%2'.\n" STRING_EXPORT_AS_BINARY, "regedit: The registry value '%1' will be exported as binary data.\n" STRING_INCORRECT_REG_CLASS, "regedit: Incorrect registry class specification in '%1'.\n" STRING_REG_KEY_NOT_FOUND, "regedit: Unable to export '%1'. The specified registry key was not found.\n" diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index eefa35f..bc5c09c 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -339,6 +339,45 @@ static BOOL parseKeyName(LPWSTR lpKeyName, HKEY *hKey, LPWSTR *lpKeyPath) static WCHAR *currentKeyName; static HKEY currentKeyHandle = NULL; +/* Registry data types */ +static const WCHAR type_none[] = {'R','E','G','_','N','O','N','E',0}; +static const WCHAR type_sz[] = {'R','E','G','_','S','Z',0}; +static const WCHAR type_expand_sz[] = {'R','E','G','_','E','X','P','A','N','D','_','S','Z',0}; +static const WCHAR type_binary[] = {'R','E','G','_','B','I','N','A','R','Y',0}; +static const WCHAR type_dword[] = {'R','E','G','_','D','W','O','R','D',0}; +static const WCHAR type_dword_le[] = {'R','E','G','_','D','W','O','R','D','_','L','I','T','T','L','E','_','E','N','D','I','A','N',0}; +static const WCHAR type_dword_be[] = {'R','E','G','_','D','W','O','R','D','_','B','I','G','_','E','N','D','I','A','N',0}; +static const WCHAR type_multi_sz[] = {'R','E','G','_','M','U','L','T','I','_','S','Z',0}; + +static const struct +{ + DWORD type; + const WCHAR *name; +} +type_rels[] = +{ + {REG_NONE, type_none}, + {REG_SZ, type_sz}, + {REG_EXPAND_SZ, type_expand_sz}, + {REG_BINARY, type_binary}, + {REG_DWORD, type_dword}, + {REG_DWORD_LITTLE_ENDIAN, type_dword_le}, + {REG_DWORD_BIG_ENDIAN, type_dword_be}, + {REG_MULTI_SZ, type_multi_sz}, +}; + +static const WCHAR *reg_type_to_wchar(DWORD type) +{ + int i, array_size = ARRAY_SIZE(type_rels); + + for (i = 0; i < array_size; i++) + { + if (type == type_rels[i].type) + return type_rels[i].name; + } + return NULL; +} + /****************************************************************************** * Sets the value with name val_name to the data in val_data for the currently * opened key. @@ -399,7 +438,7 @@ static LONG setValue(WCHAR* val_name, WCHAR* val_data, BOOL is_unicode) } else /* unknown format */ { - output_message(STRING_UNKNOWN_DATA_FORMAT, dwDataType); + output_message(STRING_UNKNOWN_DATA_FORMAT, reg_type_to_wchar(dwDataType)); return ERROR_INVALID_DATA; } @@ -1157,7 +1196,7 @@ static void export_hkey(FILE *file, HKEY key, default: { - output_message(STRING_UNSUPPORTED_TYPE, value_type, *reg_key_name_buf); + output_message(STRING_UNSUPPORTED_TYPE, reg_type_to_wchar(value_type), *reg_key_name_buf); output_message(STRING_EXPORT_AS_BINARY, *val_name_buf); } /* falls through */ -- 2.7.4