From 208ca071dc0ab75ae2887b87ca6e421f15df5e3c Mon Sep 17 00:00:00 2001 From: Jonathan Vollebregt Date: Thu, 19 Feb 2015 13:19:10 +0100 Subject: [PATCH] reg: Add sane_path function to do preliminary key validation. --- po/ar.po | 4 +++- po/bg.po | 2 +- po/ca.po | 4 +++- po/cs.po | 4 +++- po/da.po | 4 +++- po/de.po | 4 +++- po/el.po | 2 +- po/en.po | 4 ++-- po/en_US.po | 4 ++-- po/eo.po | 2 +- po/es.po | 4 +++- po/fa.po | 2 +- po/fi.po | 4 +++- po/fr.po | 4 +++- po/he.po | 4 +++- po/hi.po | 2 +- po/hr.po | 2 +- po/hu.po | 4 +++- po/it.po | 4 +++- po/ja.po | 4 +++- po/ko.po | 4 +++- po/lt.po | 4 +++- po/ml.po | 2 +- po/nb_NO.po | 4 +++- po/nl.po | 4 +++- po/or.po | 2 +- po/pa.po | 2 +- po/pl.po | 4 +++- po/pt_BR.po | 4 +++- po/pt_PT.po | 4 +++- po/rm.po | 2 +- po/ro.po | 4 +++- po/ru.po | 4 +++- po/sk.po | 6 ++++-- po/sl.po | 4 +++- po/sr_RS@cyrillic.po | 2 +- po/sr_RS@latin.po | 2 +- po/sv.po | 4 +++- po/te.po | 2 +- po/th.po | 2 +- po/tr.po | 2 +- po/uk.po | 4 +++- po/wa.po | 2 +- po/wine.pot | 2 +- po/zh_CN.po | 4 +++- po/zh_TW.po | 4 +++- programs/reg/reg.c | 21 +++++++++++++-------- programs/reg/reg.rc | 2 +- 48 files changed, 117 insertions(+), 58 deletions(-) diff --git a/po/ar.po b/po/ar.po index 4278786983f..978170b9785 100644 --- a/po/ar.po +++ b/po/ar.po @@ -11522,7 +11522,9 @@ msgid "Error: Invalid command line parameters\n" msgstr "خطأ : معاملات سطر الاوامر غير سليمة\n" #: reg.rc:37 -msgid "Error: Unable to add keys to remote machine\n" +#, fuzzy +#| msgid "Error: Unable to add keys to remote machine\n" +msgid "Error: Unable to access remote machine\n" msgstr "خطأ : تعذر إضافة المفاتيح للجهاز البعيد\n" #: reg.rc:38 diff --git a/po/bg.po b/po/bg.po index e6775ed4195..0cdfd53baef 100644 --- a/po/bg.po +++ b/po/bg.po @@ -11347,7 +11347,7 @@ msgid "Error: Invalid command line parameters\n" msgstr "" #: reg.rc:37 -msgid "Error: Unable to add keys to remote machine\n" +msgid "Error: Unable to access remote machine\n" msgstr "" #: reg.rc:38 diff --git a/po/ca.po b/po/ca.po index 793d664ff4f..01c2ff22903 100644 --- a/po/ca.po +++ b/po/ca.po @@ -11747,7 +11747,9 @@ msgid "Error: Invalid command line parameters\n" msgstr "Error: Paràmetres de línia d'ordres no vàlids\n" #: reg.rc:37 -msgid "Error: Unable to add keys to remote machine\n" +#, fuzzy +#| msgid "Error: Unable to add keys to remote machine\n" +msgid "Error: Unable to access remote machine\n" msgstr "Error: No es pot afegir els claus a un equip remot\n" #: reg.rc:38 diff --git a/po/cs.po b/po/cs.po index cd21dc72c15..b344f6b4ae7 100644 --- a/po/cs.po +++ b/po/cs.po @@ -11398,7 +11398,9 @@ msgid "Error: Invalid command line parameters\n" msgstr "Chyba: Neplatné parametry příkazové řádky\n" #: reg.rc:37 -msgid "Error: Unable to add keys to remote machine\n" +#, fuzzy +#| msgid "Error: Unable to add keys to remote machine\n" +msgid "Error: Unable to access remote machine\n" msgstr "Chyba: Nepodařilo se přidat klíče na vzdálený stroj\n" #: reg.rc:38 diff --git a/po/da.po b/po/da.po index 1201b0b5a98..6f4f6519cd8 100644 --- a/po/da.po +++ b/po/da.po @@ -11655,7 +11655,9 @@ msgid "Error: Invalid command line parameters\n" msgstr "Fejl: Ugyldige kommando linje parametre\n" #: reg.rc:37 -msgid "Error: Unable to add keys to remote machine\n" +#, fuzzy +#| msgid "Error: Unable to add keys to remote machine\n" +msgid "Error: Unable to access remote machine\n" msgstr "Fejl: Kunne ikke tilføje nøgler til fjern maskinen\n" #: reg.rc:38 diff --git a/po/de.po b/po/de.po index 75a44157851..09781409ac6 100644 --- a/po/de.po +++ b/po/de.po @@ -11577,7 +11577,9 @@ msgid "Error: Invalid command line parameters\n" msgstr "Fehler: Ungültige Befehlszeilenargumente\n" #: reg.rc:37 -msgid "Error: Unable to add keys to remote machine\n" +#, fuzzy +#| msgid "Error: Unable to add keys to remote machine\n" +msgid "Error: Unable to access remote machine\n" msgstr "Fehler: Konnte Schlüssel nicht zum Remoterechner hinzufügen\n" #: reg.rc:38 diff --git a/po/el.po b/po/el.po index 0bd33dc5986..ef5f2a64b29 100644 --- a/po/el.po +++ b/po/el.po @@ -11141,7 +11141,7 @@ msgid "Error: Invalid command line parameters\n" msgstr "" #: reg.rc:37 -msgid "Error: Unable to add keys to remote machine\n" +msgid "Error: Unable to access remote machine\n" msgstr "" #: reg.rc:38 diff --git a/po/en.po b/po/en.po index a473713e697..284056e3aa0 100644 --- a/po/en.po +++ b/po/en.po @@ -11500,8 +11500,8 @@ msgid "Error: Invalid command line parameters\n" msgstr "Error: Invalid command line parameters\n" #: reg.rc:37 -msgid "Error: Unable to add keys to remote machine\n" -msgstr "Error: Unable to add keys to remote machine\n" +msgid "Error: Unable to access remote machine\n" +msgstr "Error: Unable to access remote machine\n" #: reg.rc:38 msgid "" diff --git a/po/en_US.po b/po/en_US.po index 61d1c8e3c04..3bc7fdcca3e 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -11500,8 +11500,8 @@ msgid "Error: Invalid command line parameters\n" msgstr "Error: Invalid command line parameters\n" #: reg.rc:37 -msgid "Error: Unable to add keys to remote machine\n" -msgstr "Error: Unable to add keys to remote machine\n" +msgid "Error: Unable to access remote machine\n" +msgstr "Error: Unable to access remote machine\n" #: reg.rc:38 msgid "" diff --git a/po/eo.po b/po/eo.po index 9ce278d7611..8940c27435d 100644 --- a/po/eo.po +++ b/po/eo.po @@ -11033,7 +11033,7 @@ msgid "Error: Invalid command line parameters\n" msgstr "" #: reg.rc:37 -msgid "Error: Unable to add keys to remote machine\n" +msgid "Error: Unable to access remote machine\n" msgstr "" #: reg.rc:38 diff --git a/po/es.po b/po/es.po index cbf9ed6edde..4d25db559f2 100644 --- a/po/es.po +++ b/po/es.po @@ -11735,7 +11735,9 @@ msgid "Error: Invalid command line parameters\n" msgstr "Error: parámetros de línea de comandos inválidos\n" #: reg.rc:37 -msgid "Error: Unable to add keys to remote machine\n" +#, fuzzy +#| msgid "Error: Unable to add keys to remote machine\n" +msgid "Error: Unable to access remote machine\n" msgstr "Error: No se puede agregar claves al equipo remoto\n" #: reg.rc:38 diff --git a/po/fa.po b/po/fa.po index da6c4e600a7..6feba064bcb 100644 --- a/po/fa.po +++ b/po/fa.po @@ -11140,7 +11140,7 @@ msgid "Error: Invalid command line parameters\n" msgstr "" #: reg.rc:37 -msgid "Error: Unable to add keys to remote machine\n" +msgid "Error: Unable to access remote machine\n" msgstr "" #: reg.rc:38 diff --git a/po/fi.po b/po/fi.po index 6a3026b9493..129365c9f7f 100644 --- a/po/fi.po +++ b/po/fi.po @@ -11486,7 +11486,9 @@ msgid "Error: Invalid command line parameters\n" msgstr "Virhe: Viallisia komentoriviparametreja\n" #: reg.rc:37 -msgid "Error: Unable to add keys to remote machine\n" +#, fuzzy +#| msgid "Error: Unable to add keys to remote machine\n" +msgid "Error: Unable to access remote machine\n" msgstr "Virhe: Etäkoneelle ei voitu lisätä avaimia\n" #: reg.rc:38 diff --git a/po/fr.po b/po/fr.po index 9491d4a95db..fe8f906ceec 100644 --- a/po/fr.po +++ b/po/fr.po @@ -11642,7 +11642,9 @@ msgid "Error: Invalid command line parameters\n" msgstr "Erreur : paramètre de ligne de commande invalide\n" #: reg.rc:37 -msgid "Error: Unable to add keys to remote machine\n" +#, fuzzy +#| msgid "Error: Unable to add keys to remote machine\n" +msgid "Error: Unable to access remote machine\n" msgstr "Erreur : impossible d'ajouter des clés à une machine distante\n" #: reg.rc:38 diff --git a/po/he.po b/po/he.po index 4f930c7788c..dfced64faf9 100644 --- a/po/he.po +++ b/po/he.po @@ -11716,7 +11716,9 @@ msgid "Error: Invalid command line parameters\n" msgstr "Error: Invalid command line parameters\n" #: reg.rc:37 -msgid "Error: Unable to add keys to remote machine\n" +#, fuzzy +#| msgid "Error: Unable to add keys to remote machine\n" +msgid "Error: Unable to access remote machine\n" msgstr "Error: Unable to add keys to remote machine\n" #: reg.rc:38 diff --git a/po/hi.po b/po/hi.po index 7e7c6e33eaa..24972a90c9e 100644 --- a/po/hi.po +++ b/po/hi.po @@ -10953,7 +10953,7 @@ msgid "Error: Invalid command line parameters\n" msgstr "" #: reg.rc:37 -msgid "Error: Unable to add keys to remote machine\n" +msgid "Error: Unable to access remote machine\n" msgstr "" #: reg.rc:38 diff --git a/po/hr.po b/po/hr.po index a47acb3b9ca..7a286992a80 100644 --- a/po/hr.po +++ b/po/hr.po @@ -11218,7 +11218,7 @@ msgstr "" "Greška: uneseni su nepoznati ili neispravni parametri naredbene linije\n" #: reg.rc:37 -msgid "Error: Unable to add keys to remote machine\n" +msgid "Error: Unable to access remote machine\n" msgstr "" #: reg.rc:38 diff --git a/po/hu.po b/po/hu.po index 10d1986652e..a56a27bde96 100644 --- a/po/hu.po +++ b/po/hu.po @@ -11659,7 +11659,9 @@ msgid "Error: Invalid command line parameters\n" msgstr "Hiba: Érvénytelen parancssor paraméterek\n" #: reg.rc:37 -msgid "Error: Unable to add keys to remote machine\n" +#, fuzzy +#| msgid "Error: Unable to add keys to remote machine\n" +msgid "Error: Unable to access remote machine\n" msgstr "Hiba: nem lehet kulcsokat hozzáadni a távoli gépnél\n" #: reg.rc:38 diff --git a/po/it.po b/po/it.po index 25e7b974d9e..244d864058b 100644 --- a/po/it.po +++ b/po/it.po @@ -11736,7 +11736,9 @@ msgid "Error: Invalid command line parameters\n" msgstr "Errore: parametri della linea di comando non validi\n" #: reg.rc:37 -msgid "Error: Unable to add keys to remote machine\n" +#, fuzzy +#| msgid "Error: Unable to add keys to remote machine\n" +msgid "Error: Unable to access remote machine\n" msgstr "Errore: impossibile aggiungere chiavi alla macchina remota\n" #: reg.rc:38 diff --git a/po/ja.po b/po/ja.po index b0062ffaccd..4444bd3d594 100644 --- a/po/ja.po +++ b/po/ja.po @@ -11492,7 +11492,9 @@ msgid "Error: Invalid command line parameters\n" msgstr "エラー: コマンド ライン引数が無効です\n" #: reg.rc:37 -msgid "Error: Unable to add keys to remote machine\n" +#, fuzzy +#| msgid "Error: Unable to add keys to remote machine\n" +msgid "Error: Unable to access remote machine\n" msgstr "エラー: リモート マシンにキーを追加できませんでした\n" #: reg.rc:38 diff --git a/po/ko.po b/po/ko.po index 3889e639bfa..ad047647721 100644 --- a/po/ko.po +++ b/po/ko.po @@ -11546,7 +11546,9 @@ msgid "Error: Invalid command line parameters\n" msgstr "오류:올바르지 않은 명령라인 매개변수\n" #: reg.rc:37 -msgid "Error: Unable to add keys to remote machine\n" +#, fuzzy +#| msgid "Error: Unable to add keys to remote machine\n" +msgid "Error: Unable to access remote machine\n" msgstr "오류: 원격 머신에 키를 더하는 것은 가능하지 않습니다\n" #: reg.rc:38 diff --git a/po/lt.po b/po/lt.po index 6049b4e9c85..c9de47f43f2 100644 --- a/po/lt.po +++ b/po/lt.po @@ -11507,7 +11507,9 @@ msgid "Error: Invalid command line parameters\n" msgstr "Klaida: Netinkami komandos eilutės parametrai\n" #: reg.rc:37 -msgid "Error: Unable to add keys to remote machine\n" +#, fuzzy +#| msgid "Error: Unable to add keys to remote machine\n" +msgid "Error: Unable to access remote machine\n" msgstr "Klaida: Negalima pridėti raktų nuotoliniame kompiuteryje\n" #: reg.rc:38 diff --git a/po/ml.po b/po/ml.po index 35bb3770fd0..54a25744b62 100644 --- a/po/ml.po +++ b/po/ml.po @@ -10953,7 +10953,7 @@ msgid "Error: Invalid command line parameters\n" msgstr "" #: reg.rc:37 -msgid "Error: Unable to add keys to remote machine\n" +msgid "Error: Unable to access remote machine\n" msgstr "" #: reg.rc:38 diff --git a/po/nb_NO.po b/po/nb_NO.po index 0aa6ed91baf..7cbacb01a8f 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -11561,7 +11561,9 @@ msgid "Error: Invalid command line parameters\n" msgstr "Feil: Ugyldige parametere på kommandolinjen\n" #: reg.rc:37 -msgid "Error: Unable to add keys to remote machine\n" +#, fuzzy +#| msgid "Error: Unable to add keys to remote machine\n" +msgid "Error: Unable to access remote machine\n" msgstr "Feil: Kan ikke legge til nøkler på ekstern maskin\n" #: reg.rc:38 diff --git a/po/nl.po b/po/nl.po index 50e614bdd39..c89e88c61cc 100644 --- a/po/nl.po +++ b/po/nl.po @@ -11702,7 +11702,9 @@ msgid "Error: Invalid command line parameters\n" msgstr "Fout: Foutieve commandoregel-parameters\n" #: reg.rc:37 -msgid "Error: Unable to add keys to remote machine\n" +#, fuzzy +#| msgid "Error: Unable to add keys to remote machine\n" +msgid "Error: Unable to access remote machine\n" msgstr "Fout: Sleutels konden niet toegevoegd worden aan de remote machine\n" #: reg.rc:38 diff --git a/po/or.po b/po/or.po index aa00ea2a4a9..f69b1eee1d6 100644 --- a/po/or.po +++ b/po/or.po @@ -10953,7 +10953,7 @@ msgid "Error: Invalid command line parameters\n" msgstr "" #: reg.rc:37 -msgid "Error: Unable to add keys to remote machine\n" +msgid "Error: Unable to access remote machine\n" msgstr "" #: reg.rc:38 diff --git a/po/pa.po b/po/pa.po index 3ba9cb406eb..8b879400a28 100644 --- a/po/pa.po +++ b/po/pa.po @@ -10953,7 +10953,7 @@ msgid "Error: Invalid command line parameters\n" msgstr "" #: reg.rc:37 -msgid "Error: Unable to add keys to remote machine\n" +msgid "Error: Unable to access remote machine\n" msgstr "" #: reg.rc:38 diff --git a/po/pl.po b/po/pl.po index 1e9882f8045..fab441881fd 100644 --- a/po/pl.po +++ b/po/pl.po @@ -11555,7 +11555,9 @@ msgid "Error: Invalid command line parameters\n" msgstr "Błąd: Niewłaściwe parametry wiersza poleceń\n" #: reg.rc:37 -msgid "Error: Unable to add keys to remote machine\n" +#, fuzzy +#| msgid "Error: Unable to add keys to remote machine\n" +msgid "Error: Unable to access remote machine\n" msgstr "Błąd: Nie można dodać kluczy do zdalnej maszyny\n" #: reg.rc:38 diff --git a/po/pt_BR.po b/po/pt_BR.po index f08b8e9dbdc..3e9bfd5b7be 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -11560,7 +11560,9 @@ msgid "Error: Invalid command line parameters\n" msgstr "Erro: Parâmetros da linha de comandos inválidos\n" #: reg.rc:37 -msgid "Error: Unable to add keys to remote machine\n" +#, fuzzy +#| msgid "Error: Unable to add keys to remote machine\n" +msgid "Error: Unable to access remote machine\n" msgstr "Erro: Incapaz de adicionar chaves à máquina remota\n" #: reg.rc:38 diff --git a/po/pt_PT.po b/po/pt_PT.po index 6d76fd2ef39..0d06c2bdfb1 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -11529,7 +11529,9 @@ msgid "Error: Invalid command line parameters\n" msgstr "Erro: Parâmetros da linha de comandos inválidos\n" #: reg.rc:37 -msgid "Error: Unable to add keys to remote machine\n" +#, fuzzy +#| msgid "Error: Unable to add keys to remote machine\n" +msgid "Error: Unable to access remote machine\n" msgstr "Erro: Incapaz de adicionar chaves à máquina remota\n" #: reg.rc:38 diff --git a/po/rm.po b/po/rm.po index f0ef01d3fd2..65919bb9fbe 100644 --- a/po/rm.po +++ b/po/rm.po @@ -11031,7 +11031,7 @@ msgid "Error: Invalid command line parameters\n" msgstr "" #: reg.rc:37 -msgid "Error: Unable to add keys to remote machine\n" +msgid "Error: Unable to access remote machine\n" msgstr "" #: reg.rc:38 diff --git a/po/ro.po b/po/ro.po index f958b6aa7f9..3b167e16e35 100644 --- a/po/ro.po +++ b/po/ro.po @@ -11743,7 +11743,9 @@ msgid "Error: Invalid command line parameters\n" msgstr "Eroare: Parametri nevalizi pentru linia de comandă\n" #: reg.rc:37 -msgid "Error: Unable to add keys to remote machine\n" +#, fuzzy +#| msgid "Error: Unable to add keys to remote machine\n" +msgid "Error: Unable to access remote machine\n" msgstr "Eroare: Nu se pot adăuga chei pe calculatorul de la distanță\n" #: reg.rc:38 diff --git a/po/ru.po b/po/ru.po index f44c612c9a9..3fce967dcb7 100644 --- a/po/ru.po +++ b/po/ru.po @@ -11512,7 +11512,9 @@ msgid "Error: Invalid command line parameters\n" msgstr "Ошибка: неправильные параметры командной строки\n" #: reg.rc:37 -msgid "Error: Unable to add keys to remote machine\n" +#, fuzzy +#| msgid "Error: Unable to add keys to remote machine\n" +msgid "Error: Unable to access remote machine\n" msgstr "Ошибка: нельзя добавлять разделы на удалённом компьютере\n" #: reg.rc:38 diff --git a/po/sk.po b/po/sk.po index 9f246ed45b0..211fdd8a97a 100644 --- a/po/sk.po +++ b/po/sk.po @@ -11181,8 +11181,10 @@ msgid "Error: Invalid command line parameters\n" msgstr "" #: reg.rc:37 -msgid "Error: Unable to add keys to remote machine\n" -msgstr "" +#, fuzzy +#| msgid "Error: Unable to terminate process \"%1\".\n" +msgid "Error: Unable to access remote machine\n" +msgstr "Chyba: Nemožno ukončiť proces \"%1\".\n" #: reg.rc:38 msgid "" diff --git a/po/sl.po b/po/sl.po index 4cab37377c6..d85952009f1 100644 --- a/po/sl.po +++ b/po/sl.po @@ -11686,7 +11686,9 @@ msgid "Error: Invalid command line parameters\n" msgstr "Napaka: neveljaven parameter v ukazni vrstici\n" #: reg.rc:37 -msgid "Error: Unable to add keys to remote machine\n" +#, fuzzy +#| msgid "Error: Unable to add keys to remote machine\n" +msgid "Error: Unable to access remote machine\n" msgstr "Napaka: ni mogoče dodati ključa na oddaljen računalnik\n" #: reg.rc:38 diff --git a/po/sr_RS@cyrillic.po b/po/sr_RS@cyrillic.po index f06070fb7fa..aa526f83332 100644 --- a/po/sr_RS@cyrillic.po +++ b/po/sr_RS@cyrillic.po @@ -11584,7 +11584,7 @@ msgstr "" "Грешка: унесени су непознати или неисправни параметри наредбене линије\n" #: reg.rc:37 -msgid "Error: Unable to add keys to remote machine\n" +msgid "Error: Unable to access remote machine\n" msgstr "" #: reg.rc:38 diff --git a/po/sr_RS@latin.po b/po/sr_RS@latin.po index d89519760e9..19a9c70244b 100644 --- a/po/sr_RS@latin.po +++ b/po/sr_RS@latin.po @@ -11722,7 +11722,7 @@ msgstr "" "Greška: uneseni su nepoznati ili neispravni parametri naredbene linije\n" #: reg.rc:37 -msgid "Error: Unable to add keys to remote machine\n" +msgid "Error: Unable to access remote machine\n" msgstr "" #: reg.rc:38 diff --git a/po/sv.po b/po/sv.po index 03b6634b6a0..fbfc93725ec 100644 --- a/po/sv.po +++ b/po/sv.po @@ -11452,7 +11452,9 @@ msgid "Error: Invalid command line parameters\n" msgstr "Fel: Ogiltiga kommandoradsparametrar\n" #: reg.rc:37 -msgid "Error: Unable to add keys to remote machine\n" +#, fuzzy +#| msgid "Error: Unable to add keys to remote machine\n" +msgid "Error: Unable to access remote machine\n" msgstr "Fel: Kan inte lägga till nycklar till fjärrmaskin\n" #: reg.rc:38 diff --git a/po/te.po b/po/te.po index e3a17c62cd2..58ab7877542 100644 --- a/po/te.po +++ b/po/te.po @@ -10953,7 +10953,7 @@ msgid "Error: Invalid command line parameters\n" msgstr "" #: reg.rc:37 -msgid "Error: Unable to add keys to remote machine\n" +msgid "Error: Unable to access remote machine\n" msgstr "" #: reg.rc:38 diff --git a/po/th.po b/po/th.po index b6ecbaef3a1..40abbf875ca 100644 --- a/po/th.po +++ b/po/th.po @@ -11178,7 +11178,7 @@ msgid "Error: Invalid command line parameters\n" msgstr "" #: reg.rc:37 -msgid "Error: Unable to add keys to remote machine\n" +msgid "Error: Unable to access remote machine\n" msgstr "" #: reg.rc:38 diff --git a/po/tr.po b/po/tr.po index 52f525f94e3..fa6163fb29e 100644 --- a/po/tr.po +++ b/po/tr.po @@ -11514,7 +11514,7 @@ msgid "Error: Invalid command line parameters\n" msgstr "" #: reg.rc:37 -msgid "Error: Unable to add keys to remote machine\n" +msgid "Error: Unable to access remote machine\n" msgstr "" #: reg.rc:38 diff --git a/po/uk.po b/po/uk.po index 2a9a49b8b15..2c6ab6a9197 100644 --- a/po/uk.po +++ b/po/uk.po @@ -11594,7 +11594,9 @@ msgid "Error: Invalid command line parameters\n" msgstr "Помилка: неправильні параметри командного рядка\n" #: reg.rc:37 -msgid "Error: Unable to add keys to remote machine\n" +#, fuzzy +#| msgid "Error: Unable to add keys to remote machine\n" +msgid "Error: Unable to access remote machine\n" msgstr "Помилка: неможливо додати ключі на віддаленій машині\n" #: reg.rc:38 diff --git a/po/wa.po b/po/wa.po index 1f965ce86e8..5aaa1173679 100644 --- a/po/wa.po +++ b/po/wa.po @@ -11083,7 +11083,7 @@ msgid "Error: Invalid command line parameters\n" msgstr "" #: reg.rc:37 -msgid "Error: Unable to add keys to remote machine\n" +msgid "Error: Unable to access remote machine\n" msgstr "" #: reg.rc:38 diff --git a/po/wine.pot b/po/wine.pot index fc6ca89e777..3626d88dba9 100644 --- a/po/wine.pot +++ b/po/wine.pot @@ -10892,7 +10892,7 @@ msgid "Error: Invalid command line parameters\n" msgstr "" #: reg.rc:37 -msgid "Error: Unable to add keys to remote machine\n" +msgid "Error: Unable to access remote machine\n" msgstr "" #: reg.rc:38 diff --git a/po/zh_CN.po b/po/zh_CN.po index a94ef242503..8dd3fe1eb20 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -11044,7 +11044,9 @@ msgid "Error: Invalid command line parameters\n" msgstr "错误：命令行参数无效\n" #: reg.rc:37 -msgid "Error: Unable to add keys to remote machine\n" +#, fuzzy +#| msgid "Error: Unable to add keys to remote machine\n" +msgid "Error: Unable to access remote machine\n" msgstr "错误：无法将键添加到远程机器\n" #: reg.rc:38 diff --git a/po/zh_TW.po b/po/zh_TW.po index 2d24fde9211..e9de30a2ef8 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -11431,7 +11431,9 @@ msgid "Error: Invalid command line parameters\n" msgstr "錯誤：無效的命令列參數\n" #: reg.rc:37 -msgid "Error: Unable to add keys to remote machine\n" +#, fuzzy +#| msgid "Error: Unable to add keys to remote machine\n" +msgid "Error: Unable to access remote machine\n" msgstr "錯誤：無法加入索引鍵到遠端機器\n" #: reg.rc:38 diff --git a/programs/reg/reg.c b/programs/reg/reg.c index e9c7d16dce1..ffcbd4ad858 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -179,6 +179,17 @@ static LPBYTE get_regdata(LPWSTR data, DWORD reg_type, WCHAR separator, DWORD *r return out_data; } +static BOOL sane_path(const WCHAR *key) +{ + if (key[0] == '\\' && key[1] == '\\' && key[2] != '\\') + { + reg_message(STRING_NO_REMOTE); + return FALSE; + } + + return TRUE; +} + static int reg_add(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, WCHAR *type, WCHAR separator, WCHAR *data, BOOL force) { @@ -189,11 +200,8 @@ static int reg_add(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, reg_printfW(stubW, key_name, value_name, value_empty, type, data, force); - if (key_name[0]=='\\' && key_name[1]=='\\') - { - reg_message(STRING_NO_REMOTE); + if (!sane_path(key_name)) return 1; - } p = strchrW(key_name,'\\'); if (!p) @@ -262,11 +270,8 @@ static int reg_delete(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, ,0}; reg_printfW(stubW, key_name, value_name, value_empty, value_all, force); - if (key_name[0]=='\\' && key_name[1]=='\\') - { - reg_message(STRING_NO_REMOTE); + if (!sane_path(key_name)) return 1; - } p = strchrW(key_name,'\\'); if (!p) diff --git a/programs/reg/reg.rc b/programs/reg/reg.rc index 479912b5013..6f4c0c84e35 100644 --- a/programs/reg/reg.rc +++ b/programs/reg/reg.rc @@ -33,6 +33,6 @@ STRINGTABLE STRING_SUCCESS, "The operation completed successfully\n" STRING_INVALID_KEY, "Error: Invalid key name\n" STRING_INVALID_CMDLINE, "Error: Invalid command line parameters\n" - STRING_NO_REMOTE, "Error: Unable to add keys to remote machine\n" + STRING_NO_REMOTE, "Error: Unable to access remote machine\n" STRING_CANNOT_FIND, "Error: The system was unable to find the specified registry key or value\n" }