From 0cdabdd64873439052b3efa84850bc08cacf5395 Mon Sep 17 00:00:00 2001 From: Francois Gouget Date: Tue, 18 Oct 2011 16:44:32 +0200 Subject: [PATCH] xcopy: Use FormatMessage() for better internationalization support. This makes it possible to reorder the format string placeholders in message translations. --- po/ar.po | 22 +++++++++++++--------- po/bg.po | 22 +++++++++++++--------- po/ca.po | 31 ++++++++++++++++++++++--------- po/cs.po | 22 +++++++++++++--------- po/da.po | 31 ++++++++++++++++++++++--------- po/de.po | 31 ++++++++++++++++++++++--------- po/el.po | 22 +++++++++++++--------- po/en.po | 38 +++++++++++++++++++++----------------- po/en_US.po | 38 +++++++++++++++++++++----------------- po/eo.po | 22 +++++++++++++--------- po/es.po | 26 ++++++++++++++++---------- po/fa.po | 22 +++++++++++++--------- po/fi.po | 22 +++++++++++++--------- po/fr.po | 31 ++++++++++++++++++++++--------- po/he.po | 31 ++++++++++++++++++++++--------- po/hi.po | 22 +++++++++++++--------- po/hu.po | 22 +++++++++++++--------- po/it.po | 31 ++++++++++++++++++++++--------- po/ja.po | 31 ++++++++++++++++++++++--------- po/ko.po | 31 ++++++++++++++++++++++--------- po/lt.po | 31 ++++++++++++++++++++++--------- po/ml.po | 22 +++++++++++++--------- po/nb_NO.po | 31 ++++++++++++++++++++++--------- po/nl.po | 31 ++++++++++++++++++++++--------- po/or.po | 22 +++++++++++++--------- po/pa.po | 22 +++++++++++++--------- po/pl.po | 31 ++++++++++++++++++++++--------- po/pt_BR.po | 31 ++++++++++++++++++++++--------- po/pt_PT.po | 31 ++++++++++++++++++++++--------- po/rm.po | 22 +++++++++++++--------- po/ro.po | 31 ++++++++++++++++++++++--------- po/ru.po | 31 ++++++++++++++++++++++--------- po/sk.po | 22 +++++++++++++--------- po/sl.po | 31 ++++++++++++++++++++++--------- po/sr_RS@cyrillic.po | 31 ++++++++++++++++++++++--------- po/sr_RS@latin.po | 31 ++++++++++++++++++++++--------- po/sv.po | 31 ++++++++++++++++++++++--------- po/te.po | 22 +++++++++++++--------- po/th.po | 22 +++++++++++++--------- po/tr.po | 22 +++++++++++++--------- po/uk.po | 33 +++++++++++++++++++++++---------- po/wa.po | 22 +++++++++++++--------- po/wine.pot | 22 +++++++++++++--------- po/zh_CN.po | 22 +++++++++++++--------- po/zh_TW.po | 22 +++++++++++++--------- programs/xcopy/xcopy.c | 16 +++++++++------- programs/xcopy/xcopy.rc | 18 +++++++++--------- 47 files changed, 812 insertions(+), 439 deletions(-) diff --git a/po/ar.po b/po/ar.po index 22d9941342f..0efb54ce13e 100644 --- a/po/ar.po +++ b/po/ar.po @@ -8022,7 +8022,7 @@ msgstr "" msgid "Environment variable %s not defined\n" msgstr "" -#: cmd.rc:310 xcopy.rc:38 +#: cmd.rc:310 msgid "Failed to open '%s'\n" msgstr "" @@ -10898,7 +10898,7 @@ msgid "Invalid number of parameters - Use xcopy /? for help\n" msgstr "" #: xcopy.rc:28 -msgid "Invalid parameter '%s' - Use xcopy /? for help\n" +msgid "Invalid parameter '%1' - Use xcopy /? for help\n" msgstr "" #: xcopy.rc:29 @@ -10906,34 +10906,38 @@ msgid "Press to begin copying\n" msgstr "" #: xcopy.rc:30 -msgid "%d file(s) would be copied\n" +msgid "%1!d! file(s) would be copied\n" msgstr "" #: xcopy.rc:31 -msgid "%d file(s) copied\n" +msgid "%1!d! file(s) copied\n" msgstr "" #: xcopy.rc:34 msgid "" -"Is '%s' a filename or directory\n" +"Is '%1' a filename or directory\n" "on the target?\n" "(F - File, D - Directory)\n" msgstr "" #: xcopy.rc:35 -msgid "%s? (Yes|No)\n" +msgid "%1? (Yes|No)\n" msgstr "" #: xcopy.rc:36 -msgid "Overwrite %s? (Yes|No|All)\n" +msgid "Overwrite %1? (Yes|No|All)\n" msgstr "" #: xcopy.rc:37 -msgid "Copying of '%s' to '%s' failed with r/c %d\n" +msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" +msgstr "" + +#: xcopy.rc:38 +msgid "Failed to open '%1'\n" msgstr "" #: xcopy.rc:39 -msgid "Failed during reading of '%s'\n" +msgid "Failed during reading of '%1'\n" msgstr "" #: xcopy.rc:43 diff --git a/po/bg.po b/po/bg.po index 6a348d09a4e..a8b83ebe27f 100644 --- a/po/bg.po +++ b/po/bg.po @@ -8140,7 +8140,7 @@ msgstr "" msgid "Environment variable %s not defined\n" msgstr "" -#: cmd.rc:310 xcopy.rc:38 +#: cmd.rc:310 msgid "Failed to open '%s'\n" msgstr "" @@ -11056,7 +11056,7 @@ msgid "Invalid number of parameters - Use xcopy /? for help\n" msgstr "" #: xcopy.rc:28 -msgid "Invalid parameter '%s' - Use xcopy /? for help\n" +msgid "Invalid parameter '%1' - Use xcopy /? for help\n" msgstr "" #: xcopy.rc:29 @@ -11064,34 +11064,38 @@ msgid "Press to begin copying\n" msgstr "" #: xcopy.rc:30 -msgid "%d file(s) would be copied\n" +msgid "%1!d! file(s) would be copied\n" msgstr "" #: xcopy.rc:31 -msgid "%d file(s) copied\n" +msgid "%1!d! file(s) copied\n" msgstr "" #: xcopy.rc:34 msgid "" -"Is '%s' a filename or directory\n" +"Is '%1' a filename or directory\n" "on the target?\n" "(F - File, D - Directory)\n" msgstr "" #: xcopy.rc:35 -msgid "%s? (Yes|No)\n" +msgid "%1? (Yes|No)\n" msgstr "" #: xcopy.rc:36 -msgid "Overwrite %s? (Yes|No|All)\n" +msgid "Overwrite %1? (Yes|No|All)\n" msgstr "" #: xcopy.rc:37 -msgid "Copying of '%s' to '%s' failed with r/c %d\n" +msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" +msgstr "" + +#: xcopy.rc:38 +msgid "Failed to open '%1'\n" msgstr "" #: xcopy.rc:39 -msgid "Failed during reading of '%s'\n" +msgid "Failed during reading of '%1'\n" msgstr "" #: xcopy.rc:43 diff --git a/po/ca.po b/po/ca.po index 073f7c1137d..4c7633c2d0a 100644 --- a/po/ca.po +++ b/po/ca.po @@ -8439,7 +8439,7 @@ msgstr "Introduïu hora nova: " msgid "Environment variable %s not defined\n" msgstr "Variable d'entorn %s no definida\n" -#: cmd.rc:310 xcopy.rc:38 +#: cmd.rc:310 msgid "Failed to open '%s'\n" msgstr "S'ha fallat en obrir '%s'\n" @@ -11400,7 +11400,8 @@ msgid "Invalid number of parameters - Use xcopy /? for help\n" msgstr "Nombre de paràmetres invàlid - Useu xcopy /? per ajuda\n" #: xcopy.rc:28 -msgid "Invalid parameter '%s' - Use xcopy /? for help\n" +#, fuzzy +msgid "Invalid parameter '%1' - Use xcopy /? for help\n" msgstr "Paràmetre invàlida '%s' - Useu xcopy /? per ajuda\n" #: xcopy.rc:29 @@ -11408,16 +11409,19 @@ msgid "Press to begin copying\n" msgstr "Premeu per començar a copiar\n" #: xcopy.rc:30 -msgid "%d file(s) would be copied\n" +#, fuzzy +msgid "%1!d! file(s) would be copied\n" msgstr "%d fitxer(s) es copiarian\n" #: xcopy.rc:31 -msgid "%d file(s) copied\n" +#, fuzzy +msgid "%1!d! file(s) copied\n" msgstr "%d fitxer(s) copiat(s)\n" #: xcopy.rc:34 +#, fuzzy msgid "" -"Is '%s' a filename or directory\n" +"Is '%1' a filename or directory\n" "on the target?\n" "(F - File, D - Directory)\n" msgstr "" @@ -11426,19 +11430,28 @@ msgstr "" "(F - Fitxer, D - Directori)\n" #: xcopy.rc:35 -msgid "%s? (Yes|No)\n" +#, fuzzy +msgid "%1? (Yes|No)\n" msgstr "%s? (Sí|No)\n" #: xcopy.rc:36 -msgid "Overwrite %s? (Yes|No|All)\n" +#, fuzzy +msgid "Overwrite %1? (Yes|No|All)\n" msgstr "Sobreescriure %s? (Yes|No|All)\n" #: xcopy.rc:37 -msgid "Copying of '%s' to '%s' failed with r/c %d\n" +#, fuzzy +msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" msgstr "La còpia de '%s' a '%s' ha fallat amb r/c %d\n" +#: xcopy.rc:38 +#, fuzzy +msgid "Failed to open '%1'\n" +msgstr "S'ha fallat en obrir '%s'\n" + #: xcopy.rc:39 -msgid "Failed during reading of '%s'\n" +#, fuzzy +msgid "Failed during reading of '%1'\n" msgstr "S'ha fallat durant la lectura de '%s'\n" #: xcopy.rc:43 diff --git a/po/cs.po b/po/cs.po index badbcc17900..fcc63c6310f 100644 --- a/po/cs.po +++ b/po/cs.po @@ -8519,7 +8519,7 @@ msgstr "" msgid "Environment variable %s not defined\n" msgstr "" -#: cmd.rc:310 xcopy.rc:38 +#: cmd.rc:310 msgid "Failed to open '%s'\n" msgstr "" @@ -11533,7 +11533,7 @@ msgid "Invalid number of parameters - Use xcopy /? for help\n" msgstr "" #: xcopy.rc:28 -msgid "Invalid parameter '%s' - Use xcopy /? for help\n" +msgid "Invalid parameter '%1' - Use xcopy /? for help\n" msgstr "" #: xcopy.rc:29 @@ -11541,34 +11541,38 @@ msgid "Press to begin copying\n" msgstr "" #: xcopy.rc:30 -msgid "%d file(s) would be copied\n" +msgid "%1!d! file(s) would be copied\n" msgstr "" #: xcopy.rc:31 -msgid "%d file(s) copied\n" +msgid "%1!d! file(s) copied\n" msgstr "" #: xcopy.rc:34 msgid "" -"Is '%s' a filename or directory\n" +"Is '%1' a filename or directory\n" "on the target?\n" "(F - File, D - Directory)\n" msgstr "" #: xcopy.rc:35 -msgid "%s? (Yes|No)\n" +msgid "%1? (Yes|No)\n" msgstr "" #: xcopy.rc:36 -msgid "Overwrite %s? (Yes|No|All)\n" +msgid "Overwrite %1? (Yes|No|All)\n" msgstr "" #: xcopy.rc:37 -msgid "Copying of '%s' to '%s' failed with r/c %d\n" +msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" +msgstr "" + +#: xcopy.rc:38 +msgid "Failed to open '%1'\n" msgstr "" #: xcopy.rc:39 -msgid "Failed during reading of '%s'\n" +msgid "Failed during reading of '%1'\n" msgstr "" #: xcopy.rc:43 diff --git a/po/da.po b/po/da.po index 09302f9dfa5..404fffc5fcf 100644 --- a/po/da.po +++ b/po/da.po @@ -8562,7 +8562,7 @@ msgstr "Skriv ny tid: " msgid "Environment variable %s not defined\n" msgstr "Miljøvariable %s ikke defineret\n" -#: cmd.rc:310 xcopy.rc:38 +#: cmd.rc:310 msgid "Failed to open '%s'\n" msgstr "Kunne ikke åbne «%s»\n" @@ -11609,7 +11609,8 @@ msgid "Invalid number of parameters - Use xcopy /? for help\n" msgstr "Ugyldigt antal parametere; brug «xcopy /?» for hjelp\n" #: xcopy.rc:28 -msgid "Invalid parameter '%s' - Use xcopy /? for help\n" +#, fuzzy +msgid "Invalid parameter '%1' - Use xcopy /? for help\n" msgstr "Ugyldigt parameter «%s»; brug «xcopy /?» for hjelp\n" #: xcopy.rc:29 @@ -11617,16 +11618,19 @@ msgid "Press to begin copying\n" msgstr "Tryk Enter for at begynde at kopiere\n" #: xcopy.rc:30 -msgid "%d file(s) would be copied\n" +#, fuzzy +msgid "%1!d! file(s) would be copied\n" msgstr "%d fil(er) vil blive kopieret\n" #: xcopy.rc:31 -msgid "%d file(s) copied\n" +#, fuzzy +msgid "%1!d! file(s) copied\n" msgstr "%d fil(er) kopieret\n" #: xcopy.rc:34 +#, fuzzy msgid "" -"Is '%s' a filename or directory\n" +"Is '%1' a filename or directory\n" "on the target?\n" "(F - File, D - Directory)\n" msgstr "" @@ -11635,19 +11639,28 @@ msgstr "" "(F - Fil, K - Katalog)\n" #: xcopy.rc:35 -msgid "%s? (Yes|No)\n" +#, fuzzy +msgid "%1? (Yes|No)\n" msgstr "%s? (Ja|Nei)\n" #: xcopy.rc:36 -msgid "Overwrite %s? (Yes|No|All)\n" +#, fuzzy +msgid "Overwrite %1? (Yes|No|All)\n" msgstr "Overskrive «%s»? (Ja|Nei|Alle)\n" #: xcopy.rc:37 -msgid "Copying of '%s' to '%s' failed with r/c %d\n" +#, fuzzy +msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" msgstr "Kunne ikke kopiere «%s» til «%s»; fejlet med r/c %d\n" +#: xcopy.rc:38 +#, fuzzy +msgid "Failed to open '%1'\n" +msgstr "Kunne ikke åbne «%s»\n" + #: xcopy.rc:39 -msgid "Failed during reading of '%s'\n" +#, fuzzy +msgid "Failed during reading of '%1'\n" msgstr "Kunne ikke læse «%s»\n" #: xcopy.rc:43 diff --git a/po/de.po b/po/de.po index 3f2fa083d00..1cbe113b841 100644 --- a/po/de.po +++ b/po/de.po @@ -8466,7 +8466,7 @@ msgstr "Geben Sie die neue Zeit ein: " msgid "Environment variable %s not defined\n" msgstr "Die Umgebungsvariable %s ist nicht definiert\n" -#: cmd.rc:310 xcopy.rc:38 +#: cmd.rc:310 msgid "Failed to open '%s'\n" msgstr "'%s' konnte nicht geöffnet werden\n" @@ -11442,7 +11442,8 @@ msgid "Invalid number of parameters - Use xcopy /? for help\n" msgstr "Falsche Parameteranzahl - xcopy /? zeigt Hilfe an\n" #: xcopy.rc:28 -msgid "Invalid parameter '%s' - Use xcopy /? for help\n" +#, fuzzy +msgid "Invalid parameter '%1' - Use xcopy /? for help\n" msgstr "Unbekannter Parameter '%s' - xcopy /? zeigt Hilfe an\n" #: xcopy.rc:29 @@ -11450,16 +11451,19 @@ msgid "Press to begin copying\n" msgstr "Eingabetaste betätigen, um mit dem Kopieren zu beginnen\n" #: xcopy.rc:30 -msgid "%d file(s) would be copied\n" +#, fuzzy +msgid "%1!d! file(s) would be copied\n" msgstr "%d Datei(en) würden kopiert\n" #: xcopy.rc:31 -msgid "%d file(s) copied\n" +#, fuzzy +msgid "%1!d! file(s) copied\n" msgstr "%d Datei(en) kopiert\n" #: xcopy.rc:34 +#, fuzzy msgid "" -"Is '%s' a filename or directory\n" +"Is '%1' a filename or directory\n" "on the target?\n" "(F - File, D - Directory)\n" msgstr "" @@ -11468,19 +11472,28 @@ msgstr "" "(D - Datei, V - Verzeichnis)\n" #: xcopy.rc:35 -msgid "%s? (Yes|No)\n" +#, fuzzy +msgid "%1? (Yes|No)\n" msgstr "%s? (Ja|Nein)\n" #: xcopy.rc:36 -msgid "Overwrite %s? (Yes|No|All)\n" +#, fuzzy +msgid "Overwrite %1? (Yes|No|All)\n" msgstr "%s überschreiben? (Ja|Nein|Alle)\n" #: xcopy.rc:37 -msgid "Copying of '%s' to '%s' failed with r/c %d\n" +#, fuzzy +msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" msgstr "Kopieren von '%s' nach '%s' fehlgeschlagen. Fehlernummer: %d\n" +#: xcopy.rc:38 +#, fuzzy +msgid "Failed to open '%1'\n" +msgstr "'%s' konnte nicht geöffnet werden\n" + #: xcopy.rc:39 -msgid "Failed during reading of '%s'\n" +#, fuzzy +msgid "Failed during reading of '%1'\n" msgstr "Fehler beim Lesen von '%s'\n" #: xcopy.rc:43 diff --git a/po/el.po b/po/el.po index 85b2ba64adc..863039087c8 100644 --- a/po/el.po +++ b/po/el.po @@ -8046,7 +8046,7 @@ msgstr "" msgid "Environment variable %s not defined\n" msgstr "" -#: cmd.rc:310 xcopy.rc:38 +#: cmd.rc:310 msgid "Failed to open '%s'\n" msgstr "" @@ -10878,7 +10878,7 @@ msgid "Invalid number of parameters - Use xcopy /? for help\n" msgstr "" #: xcopy.rc:28 -msgid "Invalid parameter '%s' - Use xcopy /? for help\n" +msgid "Invalid parameter '%1' - Use xcopy /? for help\n" msgstr "" #: xcopy.rc:29 @@ -10886,34 +10886,38 @@ msgid "Press to begin copying\n" msgstr "" #: xcopy.rc:30 -msgid "%d file(s) would be copied\n" +msgid "%1!d! file(s) would be copied\n" msgstr "" #: xcopy.rc:31 -msgid "%d file(s) copied\n" +msgid "%1!d! file(s) copied\n" msgstr "" #: xcopy.rc:34 msgid "" -"Is '%s' a filename or directory\n" +"Is '%1' a filename or directory\n" "on the target?\n" "(F - File, D - Directory)\n" msgstr "" #: xcopy.rc:35 -msgid "%s? (Yes|No)\n" +msgid "%1? (Yes|No)\n" msgstr "" #: xcopy.rc:36 -msgid "Overwrite %s? (Yes|No|All)\n" +msgid "Overwrite %1? (Yes|No|All)\n" msgstr "" #: xcopy.rc:37 -msgid "Copying of '%s' to '%s' failed with r/c %d\n" +msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" +msgstr "" + +#: xcopy.rc:38 +msgid "Failed to open '%1'\n" msgstr "" #: xcopy.rc:39 -msgid "Failed during reading of '%s'\n" +msgid "Failed during reading of '%1'\n" msgstr "" #: xcopy.rc:43 diff --git a/po/en.po b/po/en.po index df41820cbe5..ade4cf695ba 100644 --- a/po/en.po +++ b/po/en.po @@ -8238,7 +8238,7 @@ msgstr "Enter new time: " msgid "Environment variable %s not defined\n" msgstr "Environment variable %s not defined\n" -#: cmd.rc:310 xcopy.rc:38 +#: cmd.rc:310 msgid "Failed to open '%s'\n" msgstr "Failed to open '%s'\n" @@ -11103,46 +11103,50 @@ msgid "Invalid number of parameters - Use xcopy /? for help\n" msgstr "Invalid number of parameters - Use xcopy /? for help\n" #: xcopy.rc:28 -msgid "Invalid parameter '%s' - Use xcopy /? for help\n" -msgstr "Invalid parameter '%s' - Use xcopy /? for help\n" +msgid "Invalid parameter '%1' - Use xcopy /? for help\n" +msgstr "Invalid parameter '%1' - Use xcopy /? for help\n" #: xcopy.rc:29 msgid "Press to begin copying\n" msgstr "Press to begin copying\n" #: xcopy.rc:30 -msgid "%d file(s) would be copied\n" -msgstr "%d file(s) would be copied\n" +msgid "%1!d! file(s) would be copied\n" +msgstr "%1!d! file(s) would be copied\n" #: xcopy.rc:31 -msgid "%d file(s) copied\n" -msgstr "%d file(s) copied\n" +msgid "%1!d! file(s) copied\n" +msgstr "%1!d! file(s) copied\n" #: xcopy.rc:34 msgid "" -"Is '%s' a filename or directory\n" +"Is '%1' a filename or directory\n" "on the target?\n" "(F - File, D - Directory)\n" msgstr "" -"Is '%s' a filename or directory\n" +"Is '%1' a filename or directory\n" "on the target?\n" "(F - File, D - Directory)\n" #: xcopy.rc:35 -msgid "%s? (Yes|No)\n" -msgstr "%s? (Yes|No)\n" +msgid "%1? (Yes|No)\n" +msgstr "%1? (Yes|No)\n" #: xcopy.rc:36 -msgid "Overwrite %s? (Yes|No|All)\n" -msgstr "Overwrite %s? (Yes|No|All)\n" +msgid "Overwrite %1? (Yes|No|All)\n" +msgstr "Overwrite %1? (Yes|No|All)\n" #: xcopy.rc:37 -msgid "Copying of '%s' to '%s' failed with r/c %d\n" -msgstr "Copying of '%s' to '%s' failed with r/c %d\n" +msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" +msgstr "Copying of '%1' to '%2' failed with r/c %3!d!\n" + +#: xcopy.rc:38 +msgid "Failed to open '%1'\n" +msgstr "Failed to open '%1'\n" #: xcopy.rc:39 -msgid "Failed during reading of '%s'\n" -msgstr "Failed during reading of '%s'\n" +msgid "Failed during reading of '%1'\n" +msgstr "Failed during reading of '%1'\n" #: xcopy.rc:43 msgctxt "File key" diff --git a/po/en_US.po b/po/en_US.po index 1301e41df8b..03a1ba8fc1c 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -8380,7 +8380,7 @@ msgstr "Enter new time: " msgid "Environment variable %s not defined\n" msgstr "Environment variable %s not defined\n" -#: cmd.rc:310 xcopy.rc:38 +#: cmd.rc:310 msgid "Failed to open '%s'\n" msgstr "Failed to open '%s'\n" @@ -11319,46 +11319,50 @@ msgid "Invalid number of parameters - Use xcopy /? for help\n" msgstr "Invalid number of parameters - Use xcopy /? for help\n" #: xcopy.rc:28 -msgid "Invalid parameter '%s' - Use xcopy /? for help\n" -msgstr "Invalid parameter '%s' - Use xcopy /? for help\n" +msgid "Invalid parameter '%1' - Use xcopy /? for help\n" +msgstr "Invalid parameter '%1' - Use xcopy /? for help\n" #: xcopy.rc:29 msgid "Press to begin copying\n" msgstr "Press to begin copying\n" #: xcopy.rc:30 -msgid "%d file(s) would be copied\n" -msgstr "%d file(s) would be copied\n" +msgid "%1!d! file(s) would be copied\n" +msgstr "%1!d! file(s) would be copied\n" #: xcopy.rc:31 -msgid "%d file(s) copied\n" -msgstr "%d file(s) copied\n" +msgid "%1!d! file(s) copied\n" +msgstr "%1!d! file(s) copied\n" #: xcopy.rc:34 msgid "" -"Is '%s' a filename or directory\n" +"Is '%1' a filename or directory\n" "on the target?\n" "(F - File, D - Directory)\n" msgstr "" -"Is '%s' a filename or directory\n" +"Is '%1' a filename or directory\n" "on the target?\n" "(F - File, D - Directory)\n" #: xcopy.rc:35 -msgid "%s? (Yes|No)\n" -msgstr "%s? (Yes|No)\n" +msgid "%1? (Yes|No)\n" +msgstr "%1? (Yes|No)\n" #: xcopy.rc:36 -msgid "Overwrite %s? (Yes|No|All)\n" -msgstr "Overwrite %s? (Yes|No|All)\n" +msgid "Overwrite %1? (Yes|No|All)\n" +msgstr "Overwrite %1? (Yes|No|All)\n" #: xcopy.rc:37 -msgid "Copying of '%s' to '%s' failed with r/c %d\n" -msgstr "Copying of '%s' to '%s' failed with r/c %d\n" +msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" +msgstr "Copying of '%1' to '%2' failed with r/c %3!d!\n" + +#: xcopy.rc:38 +msgid "Failed to open '%1'\n" +msgstr "Failed to open '%1'\n" #: xcopy.rc:39 -msgid "Failed during reading of '%s'\n" -msgstr "Failed during reading of '%s'\n" +msgid "Failed during reading of '%1'\n" +msgstr "Failed during reading of '%1'\n" #: xcopy.rc:43 msgctxt "File key" diff --git a/po/eo.po b/po/eo.po index 4002fe896bd..249d61391d1 100644 --- a/po/eo.po +++ b/po/eo.po @@ -8147,7 +8147,7 @@ msgstr "" msgid "Environment variable %s not defined\n" msgstr "" -#: cmd.rc:310 xcopy.rc:38 +#: cmd.rc:310 msgid "Failed to open '%s'\n" msgstr "" @@ -11072,7 +11072,7 @@ msgid "Invalid number of parameters - Use xcopy /? for help\n" msgstr "" #: xcopy.rc:28 -msgid "Invalid parameter '%s' - Use xcopy /? for help\n" +msgid "Invalid parameter '%1' - Use xcopy /? for help\n" msgstr "" #: xcopy.rc:29 @@ -11080,34 +11080,38 @@ msgid "Press to begin copying\n" msgstr "" #: xcopy.rc:30 -msgid "%d file(s) would be copied\n" +msgid "%1!d! file(s) would be copied\n" msgstr "" #: xcopy.rc:31 -msgid "%d file(s) copied\n" +msgid "%1!d! file(s) copied\n" msgstr "" #: xcopy.rc:34 msgid "" -"Is '%s' a filename or directory\n" +"Is '%1' a filename or directory\n" "on the target?\n" "(F - File, D - Directory)\n" msgstr "" #: xcopy.rc:35 -msgid "%s? (Yes|No)\n" +msgid "%1? (Yes|No)\n" msgstr "" #: xcopy.rc:36 -msgid "Overwrite %s? (Yes|No|All)\n" +msgid "Overwrite %1? (Yes|No|All)\n" msgstr "" #: xcopy.rc:37 -msgid "Copying of '%s' to '%s' failed with r/c %d\n" +msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" +msgstr "" + +#: xcopy.rc:38 +msgid "Failed to open '%1'\n" msgstr "" #: xcopy.rc:39 -msgid "Failed during reading of '%s'\n" +msgid "Failed during reading of '%1'\n" msgstr "" #: xcopy.rc:43 diff --git a/po/es.po b/po/es.po index e640f743a20..e0f3340ac14 100644 --- a/po/es.po +++ b/po/es.po @@ -8756,7 +8756,7 @@ msgstr "Ingrese la nueva hora: " msgid "Environment variable %s not defined\n" msgstr "Variable de entorno %s no definida\n" -#: cmd.rc:310 xcopy.rc:38 +#: cmd.rc:310 msgid "Failed to open '%s'\n" msgstr "No se pudo abrir '%s'\n" @@ -11837,7 +11837,7 @@ msgid "Invalid number of parameters - Use xcopy /? for help\n" msgstr "" #: xcopy.rc:28 -msgid "Invalid parameter '%s' - Use xcopy /? for help\n" +msgid "Invalid parameter '%1' - Use xcopy /? for help\n" msgstr "" #: xcopy.rc:29 @@ -11845,36 +11845,42 @@ msgid "Press to begin copying\n" msgstr "" #: xcopy.rc:30 -msgid "%d file(s) would be copied\n" +msgid "%1!d! file(s) would be copied\n" msgstr "" #: xcopy.rc:31 -msgid "%d file(s) copied\n" +msgid "%1!d! file(s) copied\n" msgstr "" #: xcopy.rc:34 msgid "" -"Is '%s' a filename or directory\n" +"Is '%1' a filename or directory\n" "on the target?\n" "(F - File, D - Directory)\n" msgstr "" #: xcopy.rc:35 -msgid "%s? (Yes|No)\n" -msgstr "" +#, fuzzy +msgid "%1? (Yes|No)\n" +msgstr "Sobrescribir %s" #: xcopy.rc:36 #, fuzzy -msgid "Overwrite %s? (Yes|No|All)\n" +msgid "Overwrite %1? (Yes|No|All)\n" msgstr "Sobrescribir %s" #: xcopy.rc:37 -msgid "Copying of '%s' to '%s' failed with r/c %d\n" +msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" msgstr "" +#: xcopy.rc:38 +#, fuzzy +msgid "Failed to open '%1'\n" +msgstr "No se pudo abrir '%s'\n" + #: xcopy.rc:39 #, fuzzy -msgid "Failed during reading of '%s'\n" +msgid "Failed during reading of '%1'\n" msgstr "No se pudo abrir '%s'\n" #: xcopy.rc:43 diff --git a/po/fa.po b/po/fa.po index b984ff14c76..8863faffc95 100644 --- a/po/fa.po +++ b/po/fa.po @@ -8024,7 +8024,7 @@ msgstr "" msgid "Environment variable %s not defined\n" msgstr "" -#: cmd.rc:310 xcopy.rc:38 +#: cmd.rc:310 msgid "Failed to open '%s'\n" msgstr "" @@ -10901,7 +10901,7 @@ msgid "Invalid number of parameters - Use xcopy /? for help\n" msgstr "" #: xcopy.rc:28 -msgid "Invalid parameter '%s' - Use xcopy /? for help\n" +msgid "Invalid parameter '%1' - Use xcopy /? for help\n" msgstr "" #: xcopy.rc:29 @@ -10909,34 +10909,38 @@ msgid "Press to begin copying\n" msgstr "" #: xcopy.rc:30 -msgid "%d file(s) would be copied\n" +msgid "%1!d! file(s) would be copied\n" msgstr "" #: xcopy.rc:31 -msgid "%d file(s) copied\n" +msgid "%1!d! file(s) copied\n" msgstr "" #: xcopy.rc:34 msgid "" -"Is '%s' a filename or directory\n" +"Is '%1' a filename or directory\n" "on the target?\n" "(F - File, D - Directory)\n" msgstr "" #: xcopy.rc:35 -msgid "%s? (Yes|No)\n" +msgid "%1? (Yes|No)\n" msgstr "" #: xcopy.rc:36 -msgid "Overwrite %s? (Yes|No|All)\n" +msgid "Overwrite %1? (Yes|No|All)\n" msgstr "" #: xcopy.rc:37 -msgid "Copying of '%s' to '%s' failed with r/c %d\n" +msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" +msgstr "" + +#: xcopy.rc:38 +msgid "Failed to open '%1'\n" msgstr "" #: xcopy.rc:39 -msgid "Failed during reading of '%s'\n" +msgid "Failed during reading of '%1'\n" msgstr "" #: xcopy.rc:43 diff --git a/po/fi.po b/po/fi.po index 773b7f40f6e..ed4b2d573e6 100644 --- a/po/fi.po +++ b/po/fi.po @@ -8250,7 +8250,7 @@ msgstr "" msgid "Environment variable %s not defined\n" msgstr "" -#: cmd.rc:310 xcopy.rc:38 +#: cmd.rc:310 msgid "Failed to open '%s'\n" msgstr "" @@ -11201,7 +11201,7 @@ msgid "Invalid number of parameters - Use xcopy /? for help\n" msgstr "" #: xcopy.rc:28 -msgid "Invalid parameter '%s' - Use xcopy /? for help\n" +msgid "Invalid parameter '%1' - Use xcopy /? for help\n" msgstr "" #: xcopy.rc:29 @@ -11209,34 +11209,38 @@ msgid "Press to begin copying\n" msgstr "" #: xcopy.rc:30 -msgid "%d file(s) would be copied\n" +msgid "%1!d! file(s) would be copied\n" msgstr "" #: xcopy.rc:31 -msgid "%d file(s) copied\n" +msgid "%1!d! file(s) copied\n" msgstr "" #: xcopy.rc:34 msgid "" -"Is '%s' a filename or directory\n" +"Is '%1' a filename or directory\n" "on the target?\n" "(F - File, D - Directory)\n" msgstr "" #: xcopy.rc:35 -msgid "%s? (Yes|No)\n" +msgid "%1? (Yes|No)\n" msgstr "" #: xcopy.rc:36 -msgid "Overwrite %s? (Yes|No|All)\n" +msgid "Overwrite %1? (Yes|No|All)\n" msgstr "" #: xcopy.rc:37 -msgid "Copying of '%s' to '%s' failed with r/c %d\n" +msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" +msgstr "" + +#: xcopy.rc:38 +msgid "Failed to open '%1'\n" msgstr "" #: xcopy.rc:39 -msgid "Failed during reading of '%s'\n" +msgid "Failed during reading of '%1'\n" msgstr "" #: xcopy.rc:43 diff --git a/po/fr.po b/po/fr.po index 7de4dc6b088..765a844debf 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8477,7 +8477,7 @@ msgstr "Saisissez la nouvelle heure : " msgid "Environment variable %s not defined\n" msgstr "La variable d'environnement %s n'est pas définie\n" -#: cmd.rc:310 xcopy.rc:38 +#: cmd.rc:310 msgid "Failed to open '%s'\n" msgstr "Impossible d'ouvrir « %s »\n" @@ -11461,7 +11461,8 @@ msgstr "" "Nombre invalide de paramètres - Utilisez xcopy /? pour obtenir de l'aide\n" #: xcopy.rc:28 -msgid "Invalid parameter '%s' - Use xcopy /? for help\n" +#, fuzzy +msgid "Invalid parameter '%1' - Use xcopy /? for help\n" msgstr "" "Paramètre invalide « %s » - Utilisez xcopy /? pour obtenir de l'aide\n" @@ -11470,16 +11471,19 @@ msgid "Press to begin copying\n" msgstr "Appuyez sur ENTRÉE pour démarrer la copie\n" #: xcopy.rc:30 -msgid "%d file(s) would be copied\n" +#, fuzzy +msgid "%1!d! file(s) would be copied\n" msgstr "%d fichier(s) seront copiés\n" #: xcopy.rc:31 -msgid "%d file(s) copied\n" +#, fuzzy +msgid "%1!d! file(s) copied\n" msgstr "%d fichier(s) copiés\n" #: xcopy.rc:34 +#, fuzzy msgid "" -"Is '%s' a filename or directory\n" +"Is '%1' a filename or directory\n" "on the target?\n" "(F - File, D - Directory)\n" msgstr "" @@ -11488,19 +11492,28 @@ msgstr "" "(F - Fichier, R - Répertoire)\n" #: xcopy.rc:35 -msgid "%s? (Yes|No)\n" +#, fuzzy +msgid "%1? (Yes|No)\n" msgstr "%s ? (Oui|Non)\n" #: xcopy.rc:36 -msgid "Overwrite %s? (Yes|No|All)\n" +#, fuzzy +msgid "Overwrite %1? (Yes|No|All)\n" msgstr "Écraser %s ? (Oui|Non|Tous)\n" #: xcopy.rc:37 -msgid "Copying of '%s' to '%s' failed with r/c %d\n" +#, fuzzy +msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" msgstr "La copie de « %s » vers « %s » a échoué avec le code de retour %d\n" +#: xcopy.rc:38 +#, fuzzy +msgid "Failed to open '%1'\n" +msgstr "Impossible d'ouvrir « %s »\n" + #: xcopy.rc:39 -msgid "Failed during reading of '%s'\n" +#, fuzzy +msgid "Failed during reading of '%1'\n" msgstr "Impossible de lire « %s »\n" #: xcopy.rc:43 diff --git a/po/he.po b/po/he.po index 5d31be4a410..77307b49671 100644 --- a/po/he.po +++ b/po/he.po @@ -8449,7 +8449,7 @@ msgstr "Enter new time: " msgid "Environment variable %s not defined\n" msgstr "Environment variable %s not defined\n" -#: cmd.rc:310 xcopy.rc:38 +#: cmd.rc:310 msgid "Failed to open '%s'\n" msgstr "Failed to open '%s'\n" @@ -11466,7 +11466,8 @@ msgid "Invalid number of parameters - Use xcopy /? for help\n" msgstr "Invalid number of parameters - Use xcopy /? for help\n" #: xcopy.rc:28 -msgid "Invalid parameter '%s' - Use xcopy /? for help\n" +#, fuzzy +msgid "Invalid parameter '%1' - Use xcopy /? for help\n" msgstr "Invalid parameter '%s' - Use xcopy /? for help\n" #: xcopy.rc:29 @@ -11474,16 +11475,19 @@ msgid "Press to begin copying\n" msgstr "Press to begin copying\n" #: xcopy.rc:30 -msgid "%d file(s) would be copied\n" +#, fuzzy +msgid "%1!d! file(s) would be copied\n" msgstr "%d file(s) would be copied\n" #: xcopy.rc:31 -msgid "%d file(s) copied\n" +#, fuzzy +msgid "%1!d! file(s) copied\n" msgstr "%d file(s) copied\n" #: xcopy.rc:34 +#, fuzzy msgid "" -"Is '%s' a filename or directory\n" +"Is '%1' a filename or directory\n" "on the target?\n" "(F - File, D - Directory)\n" msgstr "" @@ -11492,19 +11496,28 @@ msgstr "" "(F - File, D - Directory)\n" #: xcopy.rc:35 -msgid "%s? (Yes|No)\n" +#, fuzzy +msgid "%1? (Yes|No)\n" msgstr "%s? (Yes|No)\n" #: xcopy.rc:36 -msgid "Overwrite %s? (Yes|No|All)\n" +#, fuzzy +msgid "Overwrite %1? (Yes|No|All)\n" msgstr "Overwrite %s? (Yes|No|All)\n" #: xcopy.rc:37 -msgid "Copying of '%s' to '%s' failed with r/c %d\n" +#, fuzzy +msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" msgstr "Copying of '%s' to '%s' failed with r/c %d\n" +#: xcopy.rc:38 +#, fuzzy +msgid "Failed to open '%1'\n" +msgstr "Failed to open '%s'\n" + #: xcopy.rc:39 -msgid "Failed during reading of '%s'\n" +#, fuzzy +msgid "Failed during reading of '%1'\n" msgstr "Failed during reading of '%s'\n" #: xcopy.rc:43 diff --git a/po/hi.po b/po/hi.po index 713603ac246..9ae60c2abb7 100644 --- a/po/hi.po +++ b/po/hi.po @@ -7933,7 +7933,7 @@ msgstr "" msgid "Environment variable %s not defined\n" msgstr "" -#: cmd.rc:310 xcopy.rc:38 +#: cmd.rc:310 msgid "Failed to open '%s'\n" msgstr "" @@ -10743,7 +10743,7 @@ msgid "Invalid number of parameters - Use xcopy /? for help\n" msgstr "" #: xcopy.rc:28 -msgid "Invalid parameter '%s' - Use xcopy /? for help\n" +msgid "Invalid parameter '%1' - Use xcopy /? for help\n" msgstr "" #: xcopy.rc:29 @@ -10751,34 +10751,38 @@ msgid "Press to begin copying\n" msgstr "" #: xcopy.rc:30 -msgid "%d file(s) would be copied\n" +msgid "%1!d! file(s) would be copied\n" msgstr "" #: xcopy.rc:31 -msgid "%d file(s) copied\n" +msgid "%1!d! file(s) copied\n" msgstr "" #: xcopy.rc:34 msgid "" -"Is '%s' a filename or directory\n" +"Is '%1' a filename or directory\n" "on the target?\n" "(F - File, D - Directory)\n" msgstr "" #: xcopy.rc:35 -msgid "%s? (Yes|No)\n" +msgid "%1? (Yes|No)\n" msgstr "" #: xcopy.rc:36 -msgid "Overwrite %s? (Yes|No|All)\n" +msgid "Overwrite %1? (Yes|No|All)\n" msgstr "" #: xcopy.rc:37 -msgid "Copying of '%s' to '%s' failed with r/c %d\n" +msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" +msgstr "" + +#: xcopy.rc:38 +msgid "Failed to open '%1'\n" msgstr "" #: xcopy.rc:39 -msgid "Failed during reading of '%s'\n" +msgid "Failed during reading of '%1'\n" msgstr "" #: xcopy.rc:43 diff --git a/po/hu.po b/po/hu.po index 43de5aff1a0..006d9e4fdc8 100644 --- a/po/hu.po +++ b/po/hu.po @@ -8446,7 +8446,7 @@ msgstr "" msgid "Environment variable %s not defined\n" msgstr "" -#: cmd.rc:310 xcopy.rc:38 +#: cmd.rc:310 msgid "Failed to open '%s'\n" msgstr "" @@ -11455,7 +11455,7 @@ msgid "Invalid number of parameters - Use xcopy /? for help\n" msgstr "" #: xcopy.rc:28 -msgid "Invalid parameter '%s' - Use xcopy /? for help\n" +msgid "Invalid parameter '%1' - Use xcopy /? for help\n" msgstr "" #: xcopy.rc:29 @@ -11463,34 +11463,38 @@ msgid "Press to begin copying\n" msgstr "" #: xcopy.rc:30 -msgid "%d file(s) would be copied\n" +msgid "%1!d! file(s) would be copied\n" msgstr "" #: xcopy.rc:31 -msgid "%d file(s) copied\n" +msgid "%1!d! file(s) copied\n" msgstr "" #: xcopy.rc:34 msgid "" -"Is '%s' a filename or directory\n" +"Is '%1' a filename or directory\n" "on the target?\n" "(F - File, D - Directory)\n" msgstr "" #: xcopy.rc:35 -msgid "%s? (Yes|No)\n" +msgid "%1? (Yes|No)\n" msgstr "" #: xcopy.rc:36 -msgid "Overwrite %s? (Yes|No|All)\n" +msgid "Overwrite %1? (Yes|No|All)\n" msgstr "" #: xcopy.rc:37 -msgid "Copying of '%s' to '%s' failed with r/c %d\n" +msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" +msgstr "" + +#: xcopy.rc:38 +msgid "Failed to open '%1'\n" msgstr "" #: xcopy.rc:39 -msgid "Failed during reading of '%s'\n" +msgid "Failed during reading of '%1'\n" msgstr "" #: xcopy.rc:43 diff --git a/po/it.po b/po/it.po index eabf4e91798..e43d32766a6 100644 --- a/po/it.po +++ b/po/it.po @@ -8436,7 +8436,7 @@ msgstr "Inserisci una nuova ora: " msgid "Environment variable %s not defined\n" msgstr "Variabile d'ambiente %s non definita\n" -#: cmd.rc:310 xcopy.rc:38 +#: cmd.rc:310 msgid "Failed to open '%s'\n" msgstr "Impossibile aprire '%s'\n" @@ -11404,7 +11404,8 @@ msgid "Invalid number of parameters - Use xcopy /? for help\n" msgstr "Numero non valido di parametri - Digita xcopy /? per l'aiuto\n" #: xcopy.rc:28 -msgid "Invalid parameter '%s' - Use xcopy /? for help\n" +#, fuzzy +msgid "Invalid parameter '%1' - Use xcopy /? for help\n" msgstr "Parametro '%s' non valido - Digita xcopy /? per l'aiuto\n" #: xcopy.rc:29 @@ -11412,16 +11413,19 @@ msgid "Press to begin copying\n" msgstr "Premi Invio per iniziare a copiare\n" #: xcopy.rc:30 -msgid "%d file(s) would be copied\n" +#, fuzzy +msgid "%1!d! file(s) would be copied\n" msgstr "%d file saranno copiati\n" #: xcopy.rc:31 -msgid "%d file(s) copied\n" +#, fuzzy +msgid "%1!d! file(s) copied\n" msgstr "%d file copiato/i\n" #: xcopy.rc:34 +#, fuzzy msgid "" -"Is '%s' a filename or directory\n" +"Is '%1' a filename or directory\n" "on the target?\n" "(F - File, D - Directory)\n" msgstr "" @@ -11430,19 +11434,28 @@ msgstr "" "(F - File, C - Cartella)\n" #: xcopy.rc:35 -msgid "%s? (Yes|No)\n" +#, fuzzy +msgid "%1? (Yes|No)\n" msgstr "%s? (Sì|No)\n" #: xcopy.rc:36 -msgid "Overwrite %s? (Yes|No|All)\n" +#, fuzzy +msgid "Overwrite %1? (Yes|No|All)\n" msgstr "Sovrascrivere %s? (Sì|No|Tutti)\n" #: xcopy.rc:37 -msgid "Copying of '%s' to '%s' failed with r/c %d\n" +#, fuzzy +msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" msgstr "La copia di '%s' in '%s' è fallita con r/c %d\n" +#: xcopy.rc:38 +#, fuzzy +msgid "Failed to open '%1'\n" +msgstr "Impossibile aprire '%s'\n" + #: xcopy.rc:39 -msgid "Failed during reading of '%s'\n" +#, fuzzy +msgid "Failed during reading of '%1'\n" msgstr "Errore durante la lettura di '%s'\n" #: xcopy.rc:43 diff --git a/po/ja.po b/po/ja.po index 3d539c392d5..a1d97ee35ff 100644 --- a/po/ja.po +++ b/po/ja.po @@ -8363,7 +8363,7 @@ msgstr "新しい時刻を入力してください: " msgid "Environment variable %s not defined\n" msgstr "環境変数 %s は定義されていません\n" -#: cmd.rc:310 xcopy.rc:38 +#: cmd.rc:310 msgid "Failed to open '%s'\n" msgstr "'%s' を開けません\n" @@ -11315,7 +11315,8 @@ msgid "Invalid number of parameters - Use xcopy /? for help\n" msgstr "パラメータの数が違います。xcopy /? で使い方を表示します\n" #: xcopy.rc:28 -msgid "Invalid parameter '%s' - Use xcopy /? for help\n" +#, fuzzy +msgid "Invalid parameter '%1' - Use xcopy /? for help\n" msgstr "無効なパラメータ '%s' です。xcopy /? で使い方を表示します\n" #: xcopy.rc:29 @@ -11323,16 +11324,19 @@ msgid "Press to begin copying\n" msgstr "コピーを開始するには を押してください\n" #: xcopy.rc:30 -msgid "%d file(s) would be copied\n" +#, fuzzy +msgid "%1!d! file(s) would be copied\n" msgstr "%d ファイルがコピーされる見込みです。\n" #: xcopy.rc:31 -msgid "%d file(s) copied\n" +#, fuzzy +msgid "%1!d! file(s) copied\n" msgstr "%d ファイルをコピーしました\n" #: xcopy.rc:34 +#, fuzzy msgid "" -"Is '%s' a filename or directory\n" +"Is '%1' a filename or directory\n" "on the target?\n" "(F - File, D - Directory)\n" msgstr "" @@ -11341,19 +11345,28 @@ msgstr "" "(F - ファイル、D - ディレクトリ)\n" #: xcopy.rc:35 -msgid "%s? (Yes|No)\n" +#, fuzzy +msgid "%1? (Yes|No)\n" msgstr "%s? (Yes|No)\n" #: xcopy.rc:36 -msgid "Overwrite %s? (Yes|No|All)\n" +#, fuzzy +msgid "Overwrite %1? (Yes|No|All)\n" msgstr "%s を上書きしますか? (Yes|No|All)\n" #: xcopy.rc:37 -msgid "Copying of '%s' to '%s' failed with r/c %d\n" +#, fuzzy +msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" msgstr "'%s' から '%s' へのコピーは失敗しました。戻り値 %d\n" +#: xcopy.rc:38 +#, fuzzy +msgid "Failed to open '%1'\n" +msgstr "'%s' を開けません\n" + #: xcopy.rc:39 -msgid "Failed during reading of '%s'\n" +#, fuzzy +msgid "Failed during reading of '%1'\n" msgstr "'%s' の読み込み中に失敗しました\n" #: xcopy.rc:43 diff --git a/po/ko.po b/po/ko.po index 8eb2f34d7c1..280b22d19be 100644 --- a/po/ko.po +++ b/po/ko.po @@ -8346,7 +8346,7 @@ msgstr "새 시간 입력: " msgid "Environment variable %s not defined\n" msgstr "환경 변수 %s 는 정의되지 않았습니다\n" -#: cmd.rc:310 xcopy.rc:38 +#: cmd.rc:310 msgid "Failed to open '%s'\n" msgstr "'%s' 열기 실패\n" @@ -11275,7 +11275,8 @@ msgid "Invalid number of parameters - Use xcopy /? for help\n" msgstr "올바르지 않은 매개변수의 갯수 - xcopy /?로 도움말을 보시오\n" #: xcopy.rc:28 -msgid "Invalid parameter '%s' - Use xcopy /? for help\n" +#, fuzzy +msgid "Invalid parameter '%1' - Use xcopy /? for help\n" msgstr "올바르지 않은 매개변수 '%s' - xcopy /?로 도움말을 보시오\n" #: xcopy.rc:29 @@ -11283,16 +11284,19 @@ msgid "Press to begin copying\n" msgstr " 를 누르면 복사가 시작될 것입니다\n" #: xcopy.rc:30 -msgid "%d file(s) would be copied\n" +#, fuzzy +msgid "%1!d! file(s) would be copied\n" msgstr "%d 파일이 복사될 것입니다\n" #: xcopy.rc:31 -msgid "%d file(s) copied\n" +#, fuzzy +msgid "%1!d! file(s) copied\n" msgstr "%d 파일이 복사되었습니다\n" #: xcopy.rc:34 +#, fuzzy msgid "" -"Is '%s' a filename or directory\n" +"Is '%1' a filename or directory\n" "on the target?\n" "(F - File, D - Directory)\n" msgstr "" @@ -11301,19 +11305,28 @@ msgstr "" "(F - 파일, D - 디렉토리)\n" #: xcopy.rc:35 -msgid "%s? (Yes|No)\n" +#, fuzzy +msgid "%1? (Yes|No)\n" msgstr "%s? (예|아니오)\n" #: xcopy.rc:36 -msgid "Overwrite %s? (Yes|No|All)\n" +#, fuzzy +msgid "Overwrite %1? (Yes|No|All)\n" msgstr "%s를 덮어쓰겠습니까? (예|아니오|모두)\n" #: xcopy.rc:37 -msgid "Copying of '%s' to '%s' failed with r/c %d\n" +#, fuzzy +msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" msgstr "r/c %d로 '%s'를 '%s'로 복사 실패 \n" +#: xcopy.rc:38 +#, fuzzy +msgid "Failed to open '%1'\n" +msgstr "'%s' 열기 실패\n" + #: xcopy.rc:39 -msgid "Failed during reading of '%s'\n" +#, fuzzy +msgid "Failed during reading of '%1'\n" msgstr "'%s를 읽지 못했습니다'\n" #: xcopy.rc:43 diff --git a/po/lt.po b/po/lt.po index 86d843e0cbd..1fb3f5edcd4 100644 --- a/po/lt.po +++ b/po/lt.po @@ -8393,7 +8393,7 @@ msgstr "Įveskite naują laiką: " msgid "Environment variable %s not defined\n" msgstr "Aplinkos kintamasis %s neapibrėžtas\n" -#: cmd.rc:310 xcopy.rc:38 +#: cmd.rc:310 msgid "Failed to open '%s'\n" msgstr "Nepavyko atverti „%s“\n" @@ -11342,7 +11342,8 @@ msgid "Invalid number of parameters - Use xcopy /? for help\n" msgstr "Neteisingas parametrų skaičius - pagalba: xcopy /?\n" #: xcopy.rc:28 -msgid "Invalid parameter '%s' - Use xcopy /? for help\n" +#, fuzzy +msgid "Invalid parameter '%1' - Use xcopy /? for help\n" msgstr "Neteisingas parametras „%s“ - pagalba: xcopy /?\n" #: xcopy.rc:29 @@ -11350,16 +11351,19 @@ msgid "Press to begin copying\n" msgstr "Spauskite <įvesti> kopijavimui pradėti\n" #: xcopy.rc:30 -msgid "%d file(s) would be copied\n" +#, fuzzy +msgid "%1!d! file(s) would be copied\n" msgstr "bus nukopijuota failų: %d\n" #: xcopy.rc:31 -msgid "%d file(s) copied\n" +#, fuzzy +msgid "%1!d! file(s) copied\n" msgstr "nukopijuota failų: %d\n" #: xcopy.rc:34 +#, fuzzy msgid "" -"Is '%s' a filename or directory\n" +"Is '%1' a filename or directory\n" "on the target?\n" "(F - File, D - Directory)\n" msgstr "" @@ -11368,19 +11372,28 @@ msgstr "" "(F - failas, K - katalogas)\n" #: xcopy.rc:35 -msgid "%s? (Yes|No)\n" +#, fuzzy +msgid "%1? (Yes|No)\n" msgstr "%s? (Taip|Ne)\n" #: xcopy.rc:36 -msgid "Overwrite %s? (Yes|No|All)\n" +#, fuzzy +msgid "Overwrite %1? (Yes|No|All)\n" msgstr "Perrašyti %s? (Taip|Ne|Visus)\n" #: xcopy.rc:37 -msgid "Copying of '%s' to '%s' failed with r/c %d\n" +#, fuzzy +msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" msgstr "„%s“ kopijavimas į „%s“ nepavyko su r/c %d\n" +#: xcopy.rc:38 +#, fuzzy +msgid "Failed to open '%1'\n" +msgstr "Nepavyko atverti „%s“\n" + #: xcopy.rc:39 -msgid "Failed during reading of '%s'\n" +#, fuzzy +msgid "Failed during reading of '%1'\n" msgstr "Klaida skaitant „%s“\n" #: xcopy.rc:43 diff --git a/po/ml.po b/po/ml.po index 0e30bde699d..84b6b2f6eae 100644 --- a/po/ml.po +++ b/po/ml.po @@ -7933,7 +7933,7 @@ msgstr "" msgid "Environment variable %s not defined\n" msgstr "" -#: cmd.rc:310 xcopy.rc:38 +#: cmd.rc:310 msgid "Failed to open '%s'\n" msgstr "" @@ -10743,7 +10743,7 @@ msgid "Invalid number of parameters - Use xcopy /? for help\n" msgstr "" #: xcopy.rc:28 -msgid "Invalid parameter '%s' - Use xcopy /? for help\n" +msgid "Invalid parameter '%1' - Use xcopy /? for help\n" msgstr "" #: xcopy.rc:29 @@ -10751,34 +10751,38 @@ msgid "Press to begin copying\n" msgstr "" #: xcopy.rc:30 -msgid "%d file(s) would be copied\n" +msgid "%1!d! file(s) would be copied\n" msgstr "" #: xcopy.rc:31 -msgid "%d file(s) copied\n" +msgid "%1!d! file(s) copied\n" msgstr "" #: xcopy.rc:34 msgid "" -"Is '%s' a filename or directory\n" +"Is '%1' a filename or directory\n" "on the target?\n" "(F - File, D - Directory)\n" msgstr "" #: xcopy.rc:35 -msgid "%s? (Yes|No)\n" +msgid "%1? (Yes|No)\n" msgstr "" #: xcopy.rc:36 -msgid "Overwrite %s? (Yes|No|All)\n" +msgid "Overwrite %1? (Yes|No|All)\n" msgstr "" #: xcopy.rc:37 -msgid "Copying of '%s' to '%s' failed with r/c %d\n" +msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" +msgstr "" + +#: xcopy.rc:38 +msgid "Failed to open '%1'\n" msgstr "" #: xcopy.rc:39 -msgid "Failed during reading of '%s'\n" +msgid "Failed during reading of '%1'\n" msgstr "" #: xcopy.rc:43 diff --git a/po/nb_NO.po b/po/nb_NO.po index 973cb74bb56..f1c087b57b9 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -8633,7 +8633,7 @@ msgstr "" msgid "Environment variable %s not defined\n" msgstr "" -#: cmd.rc:310 xcopy.rc:38 +#: cmd.rc:310 msgid "Failed to open '%s'\n" msgstr "Klarte ikke åpne «%s»\n" @@ -11642,7 +11642,8 @@ msgid "Invalid number of parameters - Use xcopy /? for help\n" msgstr "Ugyldig antall parametere; bruk «xcopy /?» for hjelp\n" #: xcopy.rc:28 -msgid "Invalid parameter '%s' - Use xcopy /? for help\n" +#, fuzzy +msgid "Invalid parameter '%1' - Use xcopy /? for help\n" msgstr "Ugyldig parameter «%s»; bruk «xcopy /?» for hjelp\n" #: xcopy.rc:29 @@ -11650,16 +11651,19 @@ msgid "Press to begin copying\n" msgstr "Trykk Enter for å begynne å kopiere\n" #: xcopy.rc:30 -msgid "%d file(s) would be copied\n" +#, fuzzy +msgid "%1!d! file(s) would be copied\n" msgstr "%d fil(er) ville blitt kopiert\n" #: xcopy.rc:31 -msgid "%d file(s) copied\n" +#, fuzzy +msgid "%1!d! file(s) copied\n" msgstr "%d fil(er) kopiert\n" #: xcopy.rc:34 +#, fuzzy msgid "" -"Is '%s' a filename or directory\n" +"Is '%1' a filename or directory\n" "on the target?\n" "(F - File, D - Directory)\n" msgstr "" @@ -11668,19 +11672,28 @@ msgstr "" "(F - Fil, K - Katalog)\n" #: xcopy.rc:35 -msgid "%s? (Yes|No)\n" +#, fuzzy +msgid "%1? (Yes|No)\n" msgstr "%s? (Ja|Nei)\n" #: xcopy.rc:36 -msgid "Overwrite %s? (Yes|No|All)\n" +#, fuzzy +msgid "Overwrite %1? (Yes|No|All)\n" msgstr "Skrive over «%s»? (Ja|Nei|Alle)\n" #: xcopy.rc:37 -msgid "Copying of '%s' to '%s' failed with r/c %d\n" +#, fuzzy +msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" msgstr "Klarte ikke kopiere «%s» til «%s»; feilet med r/c %d\n" +#: xcopy.rc:38 +#, fuzzy +msgid "Failed to open '%1'\n" +msgstr "Klarte ikke åpne «%s»\n" + #: xcopy.rc:39 -msgid "Failed during reading of '%s'\n" +#, fuzzy +msgid "Failed during reading of '%1'\n" msgstr "Klarte ikke lese «%s»\n" #: xcopy.rc:43 diff --git a/po/nl.po b/po/nl.po index 17d5b3ea1db..12fef9fa2c6 100644 --- a/po/nl.po +++ b/po/nl.po @@ -8492,7 +8492,7 @@ msgstr "voer de nieuwe tijd in: " msgid "Environment variable %s not defined\n" msgstr "Omgevingsvariable %s niet gedefinieerd\n" -#: cmd.rc:310 xcopy.rc:38 +#: cmd.rc:310 msgid "Failed to open '%s'\n" msgstr "Openen van '%s' is mislukt\n" @@ -11498,7 +11498,8 @@ msgid "Invalid number of parameters - Use xcopy /? for help\n" msgstr "Onjuist aantal parameters - Gebruik xcopy /? om hulp te krijgen\n" #: xcopy.rc:28 -msgid "Invalid parameter '%s' - Use xcopy /? for help\n" +#, fuzzy +msgid "Invalid parameter '%1' - Use xcopy /? for help\n" msgstr "Onjuiste parameter '%s' - Gebruik xcopy /? om hulp te krijgen\n" #: xcopy.rc:29 @@ -11506,16 +11507,19 @@ msgid "Press to begin copying\n" msgstr "Druk op om te beginnen met kopiëren\n" #: xcopy.rc:30 -msgid "%d file(s) would be copied\n" +#, fuzzy +msgid "%1!d! file(s) would be copied\n" msgstr "%d bestand(en) zouden worden gekopieerd\n" #: xcopy.rc:31 -msgid "%d file(s) copied\n" +#, fuzzy +msgid "%1!d! file(s) copied\n" msgstr "%d bestand(en) gekopieerd\n" #: xcopy.rc:34 +#, fuzzy msgid "" -"Is '%s' a filename or directory\n" +"Is '%1' a filename or directory\n" "on the target?\n" "(F - File, D - Directory)\n" msgstr "" @@ -11524,19 +11528,28 @@ msgstr "" "(B - Bestand, D - Directory)\n" #: xcopy.rc:35 -msgid "%s? (Yes|No)\n" +#, fuzzy +msgid "%1? (Yes|No)\n" msgstr "%s? (Ja|Nee)\n" #: xcopy.rc:36 -msgid "Overwrite %s? (Yes|No|All)\n" +#, fuzzy +msgid "Overwrite %1? (Yes|No|All)\n" msgstr "Overschrijven %s? (Ja|Nee|Alles)\n" #: xcopy.rc:37 -msgid "Copying of '%s' to '%s' failed with r/c %d\n" +#, fuzzy +msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" msgstr "Kopiëren van '%s' naar '%s' mislukt met r/c %d\n" +#: xcopy.rc:38 +#, fuzzy +msgid "Failed to open '%1'\n" +msgstr "Openen van '%s' is mislukt\n" + #: xcopy.rc:39 -msgid "Failed during reading of '%s'\n" +#, fuzzy +msgid "Failed during reading of '%1'\n" msgstr "Fout tijdens lezen van '%s'\n" #: xcopy.rc:43 diff --git a/po/or.po b/po/or.po index 62d21c45028..543764bc738 100644 --- a/po/or.po +++ b/po/or.po @@ -7933,7 +7933,7 @@ msgstr "" msgid "Environment variable %s not defined\n" msgstr "" -#: cmd.rc:310 xcopy.rc:38 +#: cmd.rc:310 msgid "Failed to open '%s'\n" msgstr "" @@ -10743,7 +10743,7 @@ msgid "Invalid number of parameters - Use xcopy /? for help\n" msgstr "" #: xcopy.rc:28 -msgid "Invalid parameter '%s' - Use xcopy /? for help\n" +msgid "Invalid parameter '%1' - Use xcopy /? for help\n" msgstr "" #: xcopy.rc:29 @@ -10751,34 +10751,38 @@ msgid "Press to begin copying\n" msgstr "" #: xcopy.rc:30 -msgid "%d file(s) would be copied\n" +msgid "%1!d! file(s) would be copied\n" msgstr "" #: xcopy.rc:31 -msgid "%d file(s) copied\n" +msgid "%1!d! file(s) copied\n" msgstr "" #: xcopy.rc:34 msgid "" -"Is '%s' a filename or directory\n" +"Is '%1' a filename or directory\n" "on the target?\n" "(F - File, D - Directory)\n" msgstr "" #: xcopy.rc:35 -msgid "%s? (Yes|No)\n" +msgid "%1? (Yes|No)\n" msgstr "" #: xcopy.rc:36 -msgid "Overwrite %s? (Yes|No|All)\n" +msgid "Overwrite %1? (Yes|No|All)\n" msgstr "" #: xcopy.rc:37 -msgid "Copying of '%s' to '%s' failed with r/c %d\n" +msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" +msgstr "" + +#: xcopy.rc:38 +msgid "Failed to open '%1'\n" msgstr "" #: xcopy.rc:39 -msgid "Failed during reading of '%s'\n" +msgid "Failed during reading of '%1'\n" msgstr "" #: xcopy.rc:43 diff --git a/po/pa.po b/po/pa.po index b5393309124..ed8b494dbf8 100644 --- a/po/pa.po +++ b/po/pa.po @@ -7933,7 +7933,7 @@ msgstr "" msgid "Environment variable %s not defined\n" msgstr "" -#: cmd.rc:310 xcopy.rc:38 +#: cmd.rc:310 msgid "Failed to open '%s'\n" msgstr "" @@ -10743,7 +10743,7 @@ msgid "Invalid number of parameters - Use xcopy /? for help\n" msgstr "" #: xcopy.rc:28 -msgid "Invalid parameter '%s' - Use xcopy /? for help\n" +msgid "Invalid parameter '%1' - Use xcopy /? for help\n" msgstr "" #: xcopy.rc:29 @@ -10751,34 +10751,38 @@ msgid "Press to begin copying\n" msgstr "" #: xcopy.rc:30 -msgid "%d file(s) would be copied\n" +msgid "%1!d! file(s) would be copied\n" msgstr "" #: xcopy.rc:31 -msgid "%d file(s) copied\n" +msgid "%1!d! file(s) copied\n" msgstr "" #: xcopy.rc:34 msgid "" -"Is '%s' a filename or directory\n" +"Is '%1' a filename or directory\n" "on the target?\n" "(F - File, D - Directory)\n" msgstr "" #: xcopy.rc:35 -msgid "%s? (Yes|No)\n" +msgid "%1? (Yes|No)\n" msgstr "" #: xcopy.rc:36 -msgid "Overwrite %s? (Yes|No|All)\n" +msgid "Overwrite %1? (Yes|No|All)\n" msgstr "" #: xcopy.rc:37 -msgid "Copying of '%s' to '%s' failed with r/c %d\n" +msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" +msgstr "" + +#: xcopy.rc:38 +msgid "Failed to open '%1'\n" msgstr "" #: xcopy.rc:39 -msgid "Failed during reading of '%s'\n" +msgid "Failed during reading of '%1'\n" msgstr "" #: xcopy.rc:43 diff --git a/po/pl.po b/po/pl.po index 873a69f4449..dd1835b3b13 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8365,7 +8365,7 @@ msgstr "Wpisz nowy czas: " msgid "Environment variable %s not defined\n" msgstr "Zmienna środowiskowa %s niezdefiniowana\n" -#: cmd.rc:310 xcopy.rc:38 +#: cmd.rc:310 msgid "Failed to open '%s'\n" msgstr "Nieudane otwarcie '%s'\n" @@ -11317,7 +11317,8 @@ msgstr "" "Niewłaściwa liczba parametrów - uruchom xcopy /? aby wyświetlić pomoc\n" #: xcopy.rc:28 -msgid "Invalid parameter '%s' - Use xcopy /? for help\n" +#, fuzzy +msgid "Invalid parameter '%1' - Use xcopy /? for help\n" msgstr "Nieznany parameter '%s' - uruchom xcopy /? aby wyświetlić pomoc\n" #: xcopy.rc:29 @@ -11325,16 +11326,19 @@ msgid "Press to begin copying\n" msgstr "Naciśnij aby rozpocząć kopiowanie\n" #: xcopy.rc:30 -msgid "%d file(s) would be copied\n" +#, fuzzy +msgid "%1!d! file(s) would be copied\n" msgstr "%d plik(ów) zostałoby skopiowanych\n" #: xcopy.rc:31 -msgid "%d file(s) copied\n" +#, fuzzy +msgid "%1!d! file(s) copied\n" msgstr "%d plik(ów) skopiowanych\n" #: xcopy.rc:34 +#, fuzzy msgid "" -"Is '%s' a filename or directory\n" +"Is '%1' a filename or directory\n" "on the target?\n" "(F - File, D - Directory)\n" msgstr "" @@ -11343,19 +11347,28 @@ msgstr "" "(P - plik, K - katalog)\n" #: xcopy.rc:35 -msgid "%s? (Yes|No)\n" +#, fuzzy +msgid "%1? (Yes|No)\n" msgstr "%s? (Tak|Nie)\n" #: xcopy.rc:36 -msgid "Overwrite %s? (Yes|No|All)\n" +#, fuzzy +msgid "Overwrite %1? (Yes|No|All)\n" msgstr "Zastąpić %s? (Tak|Nie|Wszystkie)\n" #: xcopy.rc:37 -msgid "Copying of '%s' to '%s' failed with r/c %d\n" +#, fuzzy +msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" msgstr "Kopiowanie '%s' do '%s' nie powiodło się - kod błędu %d\n" +#: xcopy.rc:38 +#, fuzzy +msgid "Failed to open '%1'\n" +msgstr "Nieudane otwarcie '%s'\n" + #: xcopy.rc:39 -msgid "Failed during reading of '%s'\n" +#, fuzzy +msgid "Failed during reading of '%1'\n" msgstr "Błąd podczas czytania '%s'\n" #: xcopy.rc:43 diff --git a/po/pt_BR.po b/po/pt_BR.po index d2cefcebc60..d8e56caef4f 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -8660,7 +8660,7 @@ msgstr "Entre nova hora: " msgid "Environment variable %s not defined\n" msgstr "Variável de ambiente %s não definida\n" -#: cmd.rc:310 xcopy.rc:38 +#: cmd.rc:310 msgid "Failed to open '%s'\n" msgstr "Falha ao abrir '%s'\n" @@ -11726,7 +11726,8 @@ msgid "Invalid number of parameters - Use xcopy /? for help\n" msgstr "Número de parâmetros inválido - Use xcopy /? para ajuda\n" #: xcopy.rc:28 -msgid "Invalid parameter '%s' - Use xcopy /? for help\n" +#, fuzzy +msgid "Invalid parameter '%1' - Use xcopy /? for help\n" msgstr "Parâmetro inválido '%s' - Use xcopy /? para ajuda\n" #: xcopy.rc:29 @@ -11734,16 +11735,19 @@ msgid "Press to begin copying\n" msgstr "Pressione para iniciar a cópia\n" #: xcopy.rc:30 -msgid "%d file(s) would be copied\n" +#, fuzzy +msgid "%1!d! file(s) would be copied\n" msgstr "%d arquivo(s) seriam copiado(s)\n" #: xcopy.rc:31 -msgid "%d file(s) copied\n" +#, fuzzy +msgid "%1!d! file(s) copied\n" msgstr "%d arquivo(s) copiado(s)\n" #: xcopy.rc:34 +#, fuzzy msgid "" -"Is '%s' a filename or directory\n" +"Is '%1' a filename or directory\n" "on the target?\n" "(F - File, D - Directory)\n" msgstr "" @@ -11752,19 +11756,28 @@ msgstr "" "(A - Arquivo, D - Directório)\n" #: xcopy.rc:35 -msgid "%s? (Yes|No)\n" +#, fuzzy +msgid "%1? (Yes|No)\n" msgstr "%s? (Sim|Não)\n" #: xcopy.rc:36 -msgid "Overwrite %s? (Yes|No|All)\n" +#, fuzzy +msgid "Overwrite %1? (Yes|No|All)\n" msgstr "Reescrever %s? (Sim|Não|Tudo)\n" #: xcopy.rc:37 -msgid "Copying of '%s' to '%s' failed with r/c %d\n" +#, fuzzy +msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" msgstr "Falha ao copiar '%s' para '%s' com r/c %d\n" +#: xcopy.rc:38 +#, fuzzy +msgid "Failed to open '%1'\n" +msgstr "Falha ao abrir '%s'\n" + #: xcopy.rc:39 -msgid "Failed during reading of '%s'\n" +#, fuzzy +msgid "Failed during reading of '%1'\n" msgstr "Falha a ler '%s'\n" #: xcopy.rc:43 diff --git a/po/pt_PT.po b/po/pt_PT.po index 96aaa1b5e3e..0deb3ffe4a6 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -8673,7 +8673,7 @@ msgstr "" msgid "Environment variable %s not defined\n" msgstr "" -#: cmd.rc:310 xcopy.rc:38 +#: cmd.rc:310 msgid "Failed to open '%s'\n" msgstr "Falhou ao abrir '%s'\n" @@ -11743,7 +11743,8 @@ msgid "Invalid number of parameters - Use xcopy /? for help\n" msgstr "Número de parâmetros inválido - Use xcopy /? para ajuda\n" #: xcopy.rc:28 -msgid "Invalid parameter '%s' - Use xcopy /? for help\n" +#, fuzzy +msgid "Invalid parameter '%1' - Use xcopy /? for help\n" msgstr "Parâmetro inválido '%s' - Use xcopy /? para ajuda\n" #: xcopy.rc:29 @@ -11751,16 +11752,19 @@ msgid "Press to begin copying\n" msgstr "Carregue para iniciar cópia\n" #: xcopy.rc:30 -msgid "%d file(s) would be copied\n" +#, fuzzy +msgid "%1!d! file(s) would be copied\n" msgstr "%d ficheiro(s) seriam copiado(s)\n" #: xcopy.rc:31 -msgid "%d file(s) copied\n" +#, fuzzy +msgid "%1!d! file(s) copied\n" msgstr "%d ficheiro(s) copiado(s)\n" #: xcopy.rc:34 +#, fuzzy msgid "" -"Is '%s' a filename or directory\n" +"Is '%1' a filename or directory\n" "on the target?\n" "(F - File, D - Directory)\n" msgstr "" @@ -11769,19 +11773,28 @@ msgstr "" "(F - Ficheiro, D - Directório)\n" #: xcopy.rc:35 -msgid "%s? (Yes|No)\n" +#, fuzzy +msgid "%1? (Yes|No)\n" msgstr "%s? (Yes|No)\n" #: xcopy.rc:36 -msgid "Overwrite %s? (Yes|No|All)\n" +#, fuzzy +msgid "Overwrite %1? (Yes|No|All)\n" msgstr "Reescrever %s? (Yes|No|All)\n" #: xcopy.rc:37 -msgid "Copying of '%s' to '%s' failed with r/c %d\n" +#, fuzzy +msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" msgstr "Cópia de '%s' para '%s' falhou com r/c %d\n" +#: xcopy.rc:38 +#, fuzzy +msgid "Failed to open '%1'\n" +msgstr "Falhou ao abrir '%s'\n" + #: xcopy.rc:39 -msgid "Failed during reading of '%s'\n" +#, fuzzy +msgid "Failed during reading of '%1'\n" msgstr "Falhou a ler '%s'\n" #: xcopy.rc:43 diff --git a/po/rm.po b/po/rm.po index eadc578a80c..90595524d85 100644 --- a/po/rm.po +++ b/po/rm.po @@ -7967,7 +7967,7 @@ msgstr "" msgid "Environment variable %s not defined\n" msgstr "" -#: cmd.rc:310 xcopy.rc:38 +#: cmd.rc:310 msgid "Failed to open '%s'\n" msgstr "" @@ -10799,7 +10799,7 @@ msgid "Invalid number of parameters - Use xcopy /? for help\n" msgstr "" #: xcopy.rc:28 -msgid "Invalid parameter '%s' - Use xcopy /? for help\n" +msgid "Invalid parameter '%1' - Use xcopy /? for help\n" msgstr "" #: xcopy.rc:29 @@ -10807,34 +10807,38 @@ msgid "Press to begin copying\n" msgstr "" #: xcopy.rc:30 -msgid "%d file(s) would be copied\n" +msgid "%1!d! file(s) would be copied\n" msgstr "" #: xcopy.rc:31 -msgid "%d file(s) copied\n" +msgid "%1!d! file(s) copied\n" msgstr "" #: xcopy.rc:34 msgid "" -"Is '%s' a filename or directory\n" +"Is '%1' a filename or directory\n" "on the target?\n" "(F - File, D - Directory)\n" msgstr "" #: xcopy.rc:35 -msgid "%s? (Yes|No)\n" +msgid "%1? (Yes|No)\n" msgstr "" #: xcopy.rc:36 -msgid "Overwrite %s? (Yes|No|All)\n" +msgid "Overwrite %1? (Yes|No|All)\n" msgstr "" #: xcopy.rc:37 -msgid "Copying of '%s' to '%s' failed with r/c %d\n" +msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" +msgstr "" + +#: xcopy.rc:38 +msgid "Failed to open '%1'\n" msgstr "" #: xcopy.rc:39 -msgid "Failed during reading of '%s'\n" +msgid "Failed during reading of '%1'\n" msgstr "" #: xcopy.rc:43 diff --git a/po/ro.po b/po/ro.po index 713a7df5d87..d5d9b031ddb 100644 --- a/po/ro.po +++ b/po/ro.po @@ -8892,7 +8892,7 @@ msgstr "Introduceți noua oră: " msgid "Environment variable %s not defined\n" msgstr "Variabila de mediu %s nu este definită\n" -#: cmd.rc:310 xcopy.rc:38 +#: cmd.rc:310 msgid "Failed to open '%s'\n" msgstr "Deschiderea „%s” a eșuat\n" @@ -11961,7 +11961,8 @@ msgid "Invalid number of parameters - Use xcopy /? for help\n" msgstr "Număr de parametri nevalid - Utilizați xcopy /? pentru ajutor\n" #: xcopy.rc:28 -msgid "Invalid parameter '%s' - Use xcopy /? for help\n" +#, fuzzy +msgid "Invalid parameter '%1' - Use xcopy /? for help\n" msgstr "Parametru nevalid „%s” - Utilizați xcopy /? pentru ajutor\n" #: xcopy.rc:29 @@ -11969,16 +11970,19 @@ msgid "Press to begin copying\n" msgstr "Apăsați pe pentru a începe copierea\n" #: xcopy.rc:30 -msgid "%d file(s) would be copied\n" +#, fuzzy +msgid "%1!d! file(s) would be copied\n" msgstr "%d fișier(e) ar fi copiat(e)\n" #: xcopy.rc:31 -msgid "%d file(s) copied\n" +#, fuzzy +msgid "%1!d! file(s) copied\n" msgstr "%d fișier(e) copiat(e)\n" #: xcopy.rc:34 +#, fuzzy msgid "" -"Is '%s' a filename or directory\n" +"Is '%1' a filename or directory\n" "on the target?\n" "(F - File, D - Directory)\n" msgstr "" @@ -11987,19 +11991,28 @@ msgstr "" "(F - Fișier, D - Director)\n" #: xcopy.rc:35 -msgid "%s? (Yes|No)\n" +#, fuzzy +msgid "%1? (Yes|No)\n" msgstr "%s? (Da|Nu)\n" #: xcopy.rc:36 -msgid "Overwrite %s? (Yes|No|All)\n" +#, fuzzy +msgid "Overwrite %1? (Yes|No|All)\n" msgstr "Se suprascrie %s? (Da|Nu|Toate)\n" #: xcopy.rc:37 -msgid "Copying of '%s' to '%s' failed with r/c %d\n" +#, fuzzy +msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" msgstr "Copierea „%s” în „%s” a eșuat cu cod de retur %d\n" +#: xcopy.rc:38 +#, fuzzy +msgid "Failed to open '%1'\n" +msgstr "Deschiderea „%s” a eșuat\n" + #: xcopy.rc:39 -msgid "Failed during reading of '%s'\n" +#, fuzzy +msgid "Failed during reading of '%1'\n" msgstr "Citirea „%s” a eșuat\n" #: xcopy.rc:43 diff --git a/po/ru.po b/po/ru.po index 88fab0fc5bc..2b5d7ba84a6 100644 --- a/po/ru.po +++ b/po/ru.po @@ -8379,7 +8379,7 @@ msgstr "Введите новое время: " msgid "Environment variable %s not defined\n" msgstr "Переменная окружения %s не определена\n" -#: cmd.rc:310 xcopy.rc:38 +#: cmd.rc:310 msgid "Failed to open '%s'\n" msgstr "Не удалось открыть '%s'\n" @@ -11331,7 +11331,8 @@ msgstr "" "подробного описания.\n" #: xcopy.rc:28 -msgid "Invalid parameter '%s' - Use xcopy /? for help\n" +#, fuzzy +msgid "Invalid parameter '%1' - Use xcopy /? for help\n" msgstr "" "Недопустимый параметр '%s' - попробуйте 'xcopy /?' для получения подробного\n" "описания.\n" @@ -11341,16 +11342,19 @@ msgid "Press to begin copying\n" msgstr "Нажмите клавишу , чтобы начать копирование.\n" #: xcopy.rc:30 -msgid "%d file(s) would be copied\n" +#, fuzzy +msgid "%1!d! file(s) would be copied\n" msgstr "%d файл(ов) было бы скопировано.\n" #: xcopy.rc:31 -msgid "%d file(s) copied\n" +#, fuzzy +msgid "%1!d! file(s) copied\n" msgstr "%d файл(ов) скопировано.\n" #: xcopy.rc:34 +#, fuzzy msgid "" -"Is '%s' a filename or directory\n" +"Is '%1' a filename or directory\n" "on the target?\n" "(F - File, D - Directory)\n" msgstr "" @@ -11358,19 +11362,28 @@ msgstr "" "(F - Файл, D - Папка)\n" #: xcopy.rc:35 -msgid "%s? (Yes|No)\n" +#, fuzzy +msgid "%1? (Yes|No)\n" msgstr "%s? (Y - Да|N - Нет)\n" #: xcopy.rc:36 -msgid "Overwrite %s? (Yes|No|All)\n" +#, fuzzy +msgid "Overwrite %1? (Yes|No|All)\n" msgstr "Переписать %s? (Y - Да|N - Нет|А - Все)\n" #: xcopy.rc:37 -msgid "Copying of '%s' to '%s' failed with r/c %d\n" +#, fuzzy +msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" msgstr "При копировании '%s' в '%s' произошла ошибка: %d\n" +#: xcopy.rc:38 +#, fuzzy +msgid "Failed to open '%1'\n" +msgstr "Не удалось открыть '%s'\n" + #: xcopy.rc:39 -msgid "Failed during reading of '%s'\n" +#, fuzzy +msgid "Failed during reading of '%1'\n" msgstr "При чтении '%s' произошла ошибка\n" #: xcopy.rc:43 diff --git a/po/sk.po b/po/sk.po index ee0bdd13cf8..f0ca19c9529 100644 --- a/po/sk.po +++ b/po/sk.po @@ -8051,7 +8051,7 @@ msgstr "" msgid "Environment variable %s not defined\n" msgstr "" -#: cmd.rc:310 xcopy.rc:38 +#: cmd.rc:310 msgid "Failed to open '%s'\n" msgstr "" @@ -10896,7 +10896,7 @@ msgid "Invalid number of parameters - Use xcopy /? for help\n" msgstr "" #: xcopy.rc:28 -msgid "Invalid parameter '%s' - Use xcopy /? for help\n" +msgid "Invalid parameter '%1' - Use xcopy /? for help\n" msgstr "" #: xcopy.rc:29 @@ -10904,34 +10904,38 @@ msgid "Press to begin copying\n" msgstr "" #: xcopy.rc:30 -msgid "%d file(s) would be copied\n" +msgid "%1!d! file(s) would be copied\n" msgstr "" #: xcopy.rc:31 -msgid "%d file(s) copied\n" +msgid "%1!d! file(s) copied\n" msgstr "" #: xcopy.rc:34 msgid "" -"Is '%s' a filename or directory\n" +"Is '%1' a filename or directory\n" "on the target?\n" "(F - File, D - Directory)\n" msgstr "" #: xcopy.rc:35 -msgid "%s? (Yes|No)\n" +msgid "%1? (Yes|No)\n" msgstr "" #: xcopy.rc:36 -msgid "Overwrite %s? (Yes|No|All)\n" +msgid "Overwrite %1? (Yes|No|All)\n" msgstr "" #: xcopy.rc:37 -msgid "Copying of '%s' to '%s' failed with r/c %d\n" +msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" +msgstr "" + +#: xcopy.rc:38 +msgid "Failed to open '%1'\n" msgstr "" #: xcopy.rc:39 -msgid "Failed during reading of '%s'\n" +msgid "Failed during reading of '%1'\n" msgstr "" #: xcopy.rc:43 diff --git a/po/sl.po b/po/sl.po index b221444a28f..2f7ea65b188 100644 --- a/po/sl.po +++ b/po/sl.po @@ -8390,7 +8390,7 @@ msgstr "Vnesite nov čas:" msgid "Environment variable %s not defined\n" msgstr "Okoljska spremenljivka %s ni določena\n" -#: cmd.rc:310 xcopy.rc:38 +#: cmd.rc:310 msgid "Failed to open '%s'\n" msgstr "Napaka med odpiranjem '%s'\n" @@ -11385,7 +11385,8 @@ msgid "Invalid number of parameters - Use xcopy /? for help\n" msgstr "Neveljavno število parametrov - za pomoč uporabite xcopy /?\n" #: xcopy.rc:28 -msgid "Invalid parameter '%s' - Use xcopy /? for help\n" +#, fuzzy +msgid "Invalid parameter '%1' - Use xcopy /? for help\n" msgstr "Neveljaven parameter '%s' - za pomoč uporabite xcopy /?\n" #: xcopy.rc:29 @@ -11393,16 +11394,19 @@ msgid "Press to begin copying\n" msgstr "Za začetek kopiranja pritisnite \n" #: xcopy.rc:30 -msgid "%d file(s) would be copied\n" +#, fuzzy +msgid "%1!d! file(s) would be copied\n" msgstr "%d datotek bo bilo prekopiranih\n" #: xcopy.rc:31 -msgid "%d file(s) copied\n" +#, fuzzy +msgid "%1!d! file(s) copied\n" msgstr "Prekopiranih je bilo %d datotek\n" #: xcopy.rc:34 +#, fuzzy msgid "" -"Is '%s' a filename or directory\n" +"Is '%1' a filename or directory\n" "on the target?\n" "(F - File, D - Directory)\n" msgstr "" @@ -11411,19 +11415,28 @@ msgstr "" "(F - Datoteka, D - Mapa)\n" #: xcopy.rc:35 -msgid "%s? (Yes|No)\n" +#, fuzzy +msgid "%1? (Yes|No)\n" msgstr "%s? (Da|Ne)\n" #: xcopy.rc:36 -msgid "Overwrite %s? (Yes|No|All)\n" +#, fuzzy +msgid "Overwrite %1? (Yes|No|All)\n" msgstr "Ali želite %s prepisati? (Da|Ne|Vse)\n" #: xcopy.rc:37 -msgid "Copying of '%s' to '%s' failed with r/c %d\n" +#, fuzzy +msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" msgstr "Kopiranje '%s' v '%s' je spodletelo (koda napake: %d)\n" +#: xcopy.rc:38 +#, fuzzy +msgid "Failed to open '%1'\n" +msgstr "Napaka med odpiranjem '%s'\n" + #: xcopy.rc:39 -msgid "Failed during reading of '%s'\n" +#, fuzzy +msgid "Failed during reading of '%1'\n" msgstr "Napaka med branjem '%s'\n" #: xcopy.rc:43 diff --git a/po/sr_RS@cyrillic.po b/po/sr_RS@cyrillic.po index ff62e9436c1..a6fdb13538b 100644 --- a/po/sr_RS@cyrillic.po +++ b/po/sr_RS@cyrillic.po @@ -8330,7 +8330,7 @@ msgstr "" msgid "Environment variable %s not defined\n" msgstr "" -#: cmd.rc:310 xcopy.rc:38 +#: cmd.rc:310 msgid "Failed to open '%s'\n" msgstr "Отварање „%s“ датотеке није успело\n" @@ -11304,7 +11304,8 @@ msgid "Invalid number of parameters - Use xcopy /? for help\n" msgstr "Неисправан број параметара. Користите xcopy /? за помоћ\n" #: xcopy.rc:28 -msgid "Invalid parameter '%s' - Use xcopy /? for help\n" +#, fuzzy +msgid "Invalid parameter '%1' - Use xcopy /? for help\n" msgstr "Неисправан параметар „%s“. Користите xcopy /? за помоћ\n" #: xcopy.rc:29 @@ -11312,16 +11313,19 @@ msgid "Press to begin copying\n" msgstr "Притисните да започнете умножавање\n" #: xcopy.rc:30 -msgid "%d file(s) would be copied\n" +#, fuzzy +msgid "%1!d! file(s) would be copied\n" msgstr "%d датотека/е ће бити уможено\n" #: xcopy.rc:31 -msgid "%d file(s) copied\n" +#, fuzzy +msgid "%1!d! file(s) copied\n" msgstr "%d датотека/е је умножено\n" #: xcopy.rc:34 +#, fuzzy msgid "" -"Is '%s' a filename or directory\n" +"Is '%1' a filename or directory\n" "on the target?\n" "(F - File, D - Directory)\n" msgstr "" @@ -11330,19 +11334,28 @@ msgstr "" "(Д - датотека, Ф - фасцикла)\n" #: xcopy.rc:35 -msgid "%s? (Yes|No)\n" +#, fuzzy +msgid "%1? (Yes|No)\n" msgstr "%s? (Да|Не)\n" #: xcopy.rc:36 -msgid "Overwrite %s? (Yes|No|All)\n" +#, fuzzy +msgid "Overwrite %1? (Yes|No|All)\n" msgstr "Заменити %s? (Да|Не|Све)\n" #: xcopy.rc:37 -msgid "Copying of '%s' to '%s' failed with r/c %d\n" +#, fuzzy +msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" msgstr "Умножавање „%s“ у „%s“ није успело са r/c %d\n" +#: xcopy.rc:38 +#, fuzzy +msgid "Failed to open '%1'\n" +msgstr "Отварање „%s“ датотеке није успело\n" + #: xcopy.rc:39 -msgid "Failed during reading of '%s'\n" +#, fuzzy +msgid "Failed during reading of '%1'\n" msgstr "Читање „%s“ датотеке није успело\n" #: xcopy.rc:43 diff --git a/po/sr_RS@latin.po b/po/sr_RS@latin.po index 6200fd87d64..ff0ee48820a 100644 --- a/po/sr_RS@latin.po +++ b/po/sr_RS@latin.po @@ -8378,7 +8378,7 @@ msgstr "" msgid "Environment variable %s not defined\n" msgstr "" -#: cmd.rc:310 xcopy.rc:38 +#: cmd.rc:310 msgid "Failed to open '%s'\n" msgstr "Otvaranje „%s“ datoteke nije uspelo\n" @@ -11384,7 +11384,8 @@ msgid "Invalid number of parameters - Use xcopy /? for help\n" msgstr "Neispravan broj parametara. Koristite xcopy /? za pomoć\n" #: xcopy.rc:28 -msgid "Invalid parameter '%s' - Use xcopy /? for help\n" +#, fuzzy +msgid "Invalid parameter '%1' - Use xcopy /? for help\n" msgstr "Neispravan parametar „%s“. Koristite xcopy /? za pomoć\n" #: xcopy.rc:29 @@ -11392,16 +11393,19 @@ msgid "Press to begin copying\n" msgstr "Pritisnite da započnete umnožavanje\n" #: xcopy.rc:30 -msgid "%d file(s) would be copied\n" +#, fuzzy +msgid "%1!d! file(s) would be copied\n" msgstr "%d datoteka/e će biti umoženo\n" #: xcopy.rc:31 -msgid "%d file(s) copied\n" +#, fuzzy +msgid "%1!d! file(s) copied\n" msgstr "%d datoteka/e je umnoženo\n" #: xcopy.rc:34 +#, fuzzy msgid "" -"Is '%s' a filename or directory\n" +"Is '%1' a filename or directory\n" "on the target?\n" "(F - File, D - Directory)\n" msgstr "" @@ -11410,19 +11414,28 @@ msgstr "" "(D - datoteka, F - fascikla)\n" #: xcopy.rc:35 -msgid "%s? (Yes|No)\n" +#, fuzzy +msgid "%1? (Yes|No)\n" msgstr "%s? (Da|Ne)\n" #: xcopy.rc:36 -msgid "Overwrite %s? (Yes|No|All)\n" +#, fuzzy +msgid "Overwrite %1? (Yes|No|All)\n" msgstr "Zameniti %s? (Da|Ne|Sve)\n" #: xcopy.rc:37 -msgid "Copying of '%s' to '%s' failed with r/c %d\n" +#, fuzzy +msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" msgstr "Umnožavanje „%s“ u „%s“ nije uspelo sa r/c %d\n" +#: xcopy.rc:38 +#, fuzzy +msgid "Failed to open '%1'\n" +msgstr "Otvaranje „%s“ datoteke nije uspelo\n" + #: xcopy.rc:39 -msgid "Failed during reading of '%s'\n" +#, fuzzy +msgid "Failed during reading of '%1'\n" msgstr "Čitanje „%s“ datoteke nije uspelo\n" #: xcopy.rc:43 diff --git a/po/sv.po b/po/sv.po index 1834a5c1153..ed8766581c7 100644 --- a/po/sv.po +++ b/po/sv.po @@ -8353,7 +8353,7 @@ msgstr "Skriv in den nya tiden: " msgid "Environment variable %s not defined\n" msgstr "Miljövariabeln %s ej definierad\n" -#: cmd.rc:310 xcopy.rc:38 +#: cmd.rc:310 msgid "Failed to open '%s'\n" msgstr "Misslyckades med att öppna '%s'\n" @@ -11325,7 +11325,8 @@ msgid "Invalid number of parameters - Use xcopy /? for help\n" msgstr "Ogiltigt antal parametrar - Använd xcopy /? för hjälp\n" #: xcopy.rc:28 -msgid "Invalid parameter '%s' - Use xcopy /? for help\n" +#, fuzzy +msgid "Invalid parameter '%1' - Use xcopy /? for help\n" msgstr "Ogiltig parameter '%s' - Använd xcopy /? för hjälp\n" #: xcopy.rc:29 @@ -11333,16 +11334,19 @@ msgid "Press to begin copying\n" msgstr "Tryck för att börja kopiera\n" #: xcopy.rc:30 -msgid "%d file(s) would be copied\n" +#, fuzzy +msgid "%1!d! file(s) would be copied\n" msgstr "%d fil(er) skulle kopieras\n" #: xcopy.rc:31 -msgid "%d file(s) copied\n" +#, fuzzy +msgid "%1!d! file(s) copied\n" msgstr "%d fil(er) kopierade\n" #: xcopy.rc:34 +#, fuzzy msgid "" -"Is '%s' a filename or directory\n" +"Is '%1' a filename or directory\n" "on the target?\n" "(F - File, D - Directory)\n" msgstr "" @@ -11351,19 +11355,28 @@ msgstr "" "(F - Fil, K - Katalog)\n" #: xcopy.rc:35 -msgid "%s? (Yes|No)\n" +#, fuzzy +msgid "%1? (Yes|No)\n" msgstr "%s? (Ja|Nej)\n" #: xcopy.rc:36 -msgid "Overwrite %s? (Yes|No|All)\n" +#, fuzzy +msgid "Overwrite %1? (Yes|No|All)\n" msgstr "Skriv över %s? (Ja|Nej|Alla)\n" #: xcopy.rc:37 -msgid "Copying of '%s' to '%s' failed with r/c %d\n" +#, fuzzy +msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" msgstr "Kunde inte kopiera '%s' till '%s'; misslyckades med r/c %d\n" +#: xcopy.rc:38 +#, fuzzy +msgid "Failed to open '%1'\n" +msgstr "Misslyckades med att öppna '%s'\n" + #: xcopy.rc:39 -msgid "Failed during reading of '%s'\n" +#, fuzzy +msgid "Failed during reading of '%1'\n" msgstr "Kunde inte läsa '%s'\n" #: xcopy.rc:43 diff --git a/po/te.po b/po/te.po index 3fd32296ba1..ad61c911344 100644 --- a/po/te.po +++ b/po/te.po @@ -7933,7 +7933,7 @@ msgstr "" msgid "Environment variable %s not defined\n" msgstr "" -#: cmd.rc:310 xcopy.rc:38 +#: cmd.rc:310 msgid "Failed to open '%s'\n" msgstr "" @@ -10743,7 +10743,7 @@ msgid "Invalid number of parameters - Use xcopy /? for help\n" msgstr "" #: xcopy.rc:28 -msgid "Invalid parameter '%s' - Use xcopy /? for help\n" +msgid "Invalid parameter '%1' - Use xcopy /? for help\n" msgstr "" #: xcopy.rc:29 @@ -10751,34 +10751,38 @@ msgid "Press to begin copying\n" msgstr "" #: xcopy.rc:30 -msgid "%d file(s) would be copied\n" +msgid "%1!d! file(s) would be copied\n" msgstr "" #: xcopy.rc:31 -msgid "%d file(s) copied\n" +msgid "%1!d! file(s) copied\n" msgstr "" #: xcopy.rc:34 msgid "" -"Is '%s' a filename or directory\n" +"Is '%1' a filename or directory\n" "on the target?\n" "(F - File, D - Directory)\n" msgstr "" #: xcopy.rc:35 -msgid "%s? (Yes|No)\n" +msgid "%1? (Yes|No)\n" msgstr "" #: xcopy.rc:36 -msgid "Overwrite %s? (Yes|No|All)\n" +msgid "Overwrite %1? (Yes|No|All)\n" msgstr "" #: xcopy.rc:37 -msgid "Copying of '%s' to '%s' failed with r/c %d\n" +msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" +msgstr "" + +#: xcopy.rc:38 +msgid "Failed to open '%1'\n" msgstr "" #: xcopy.rc:39 -msgid "Failed during reading of '%s'\n" +msgid "Failed during reading of '%1'\n" msgstr "" #: xcopy.rc:43 diff --git a/po/th.po b/po/th.po index 9e385bc06da..23b26da46e0 100644 --- a/po/th.po +++ b/po/th.po @@ -8042,7 +8042,7 @@ msgstr "" msgid "Environment variable %s not defined\n" msgstr "" -#: cmd.rc:310 xcopy.rc:38 +#: cmd.rc:310 msgid "Failed to open '%s'\n" msgstr "" @@ -10905,7 +10905,7 @@ msgid "Invalid number of parameters - Use xcopy /? for help\n" msgstr "" #: xcopy.rc:28 -msgid "Invalid parameter '%s' - Use xcopy /? for help\n" +msgid "Invalid parameter '%1' - Use xcopy /? for help\n" msgstr "" #: xcopy.rc:29 @@ -10913,34 +10913,38 @@ msgid "Press to begin copying\n" msgstr "" #: xcopy.rc:30 -msgid "%d file(s) would be copied\n" +msgid "%1!d! file(s) would be copied\n" msgstr "" #: xcopy.rc:31 -msgid "%d file(s) copied\n" +msgid "%1!d! file(s) copied\n" msgstr "" #: xcopy.rc:34 msgid "" -"Is '%s' a filename or directory\n" +"Is '%1' a filename or directory\n" "on the target?\n" "(F - File, D - Directory)\n" msgstr "" #: xcopy.rc:35 -msgid "%s? (Yes|No)\n" +msgid "%1? (Yes|No)\n" msgstr "" #: xcopy.rc:36 -msgid "Overwrite %s? (Yes|No|All)\n" +msgid "Overwrite %1? (Yes|No|All)\n" msgstr "" #: xcopy.rc:37 -msgid "Copying of '%s' to '%s' failed with r/c %d\n" +msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" +msgstr "" + +#: xcopy.rc:38 +msgid "Failed to open '%1'\n" msgstr "" #: xcopy.rc:39 -msgid "Failed during reading of '%s'\n" +msgid "Failed during reading of '%1'\n" msgstr "" #: xcopy.rc:43 diff --git a/po/tr.po b/po/tr.po index 573af620830..6b2c9e4ae72 100644 --- a/po/tr.po +++ b/po/tr.po @@ -8637,7 +8637,7 @@ msgstr "" msgid "Environment variable %s not defined\n" msgstr "" -#: cmd.rc:310 xcopy.rc:38 +#: cmd.rc:310 msgid "Failed to open '%s'\n" msgstr "" @@ -11640,7 +11640,7 @@ msgid "Invalid number of parameters - Use xcopy /? for help\n" msgstr "" #: xcopy.rc:28 -msgid "Invalid parameter '%s' - Use xcopy /? for help\n" +msgid "Invalid parameter '%1' - Use xcopy /? for help\n" msgstr "" #: xcopy.rc:29 @@ -11648,34 +11648,38 @@ msgid "Press to begin copying\n" msgstr "" #: xcopy.rc:30 -msgid "%d file(s) would be copied\n" +msgid "%1!d! file(s) would be copied\n" msgstr "" #: xcopy.rc:31 -msgid "%d file(s) copied\n" +msgid "%1!d! file(s) copied\n" msgstr "" #: xcopy.rc:34 msgid "" -"Is '%s' a filename or directory\n" +"Is '%1' a filename or directory\n" "on the target?\n" "(F - File, D - Directory)\n" msgstr "" #: xcopy.rc:35 -msgid "%s? (Yes|No)\n" +msgid "%1? (Yes|No)\n" msgstr "" #: xcopy.rc:36 -msgid "Overwrite %s? (Yes|No|All)\n" +msgid "Overwrite %1? (Yes|No|All)\n" msgstr "" #: xcopy.rc:37 -msgid "Copying of '%s' to '%s' failed with r/c %d\n" +msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" +msgstr "" + +#: xcopy.rc:38 +msgid "Failed to open '%1'\n" msgstr "" #: xcopy.rc:39 -msgid "Failed during reading of '%s'\n" +msgid "Failed during reading of '%1'\n" msgstr "" #: xcopy.rc:43 diff --git a/po/uk.po b/po/uk.po index c916166acd2..1c461af1c50 100644 --- a/po/uk.po +++ b/po/uk.po @@ -8347,7 +8347,7 @@ msgstr "Введіть новий час: " msgid "Environment variable %s not defined\n" msgstr "Змінна оточення %s не визначена\n" -#: cmd.rc:310 xcopy.rc:38 +#: cmd.rc:310 msgid "Failed to open '%s'\n" msgstr "Не вдалось відкрити '%s'\n" @@ -11308,7 +11308,8 @@ msgid "Invalid number of parameters - Use xcopy /? for help\n" msgstr "Невірна кількість параметрів - Введіть xcopy /? для довідки\n" #: xcopy.rc:28 -msgid "Invalid parameter '%s' - Use xcopy /? for help\n" +#, fuzzy +msgid "Invalid parameter '%1' - Use xcopy /? for help\n" msgstr "Невірний параметр '%s' - Введіть xcopy /? для довідки\n" #: xcopy.rc:29 @@ -11316,16 +11317,19 @@ msgid "Press to begin copying\n" msgstr "Натисніть щоб почати копіювання\n" #: xcopy.rc:30 -msgid "%d file(s) would be copied\n" +#, fuzzy +msgid "%1!d! file(s) would be copied\n" msgstr "%d файл(ів) буде скопійовано\n" #: xcopy.rc:31 -msgid "%d file(s) copied\n" +#, fuzzy +msgid "%1!d! file(s) copied\n" msgstr "%d файл(ів) скопійовано\n" #: xcopy.rc:34 +#, fuzzy msgid "" -"Is '%s' a filename or directory\n" +"Is '%1' a filename or directory\n" "on the target?\n" "(F - File, D - Directory)\n" msgstr "" @@ -11333,19 +11337,28 @@ msgstr "" "(F - Файл, D - Директорія)\n" #: xcopy.rc:35 -msgid "%s? (Yes|No)\n" -msgstr "" +#, fuzzy +msgid "%1? (Yes|No)\n" +msgstr "Переписати %s? (Yes|No|All)\n" #: xcopy.rc:36 -msgid "Overwrite %s? (Yes|No|All)\n" +#, fuzzy +msgid "Overwrite %1? (Yes|No|All)\n" msgstr "Переписати %s? (Yes|No|All)\n" #: xcopy.rc:37 -msgid "Copying of '%s' to '%s' failed with r/c %d\n" +#, fuzzy +msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" msgstr "Під час копіювання '%s' в '%s' сталась помилка r/c %d\n" +#: xcopy.rc:38 +#, fuzzy +msgid "Failed to open '%1'\n" +msgstr "Не вдалось відкрити '%s'\n" + #: xcopy.rc:39 -msgid "Failed during reading of '%s'\n" +#, fuzzy +msgid "Failed during reading of '%1'\n" msgstr "Помилка читання '%s'\n" #: xcopy.rc:43 diff --git a/po/wa.po b/po/wa.po index aa3fb6b911c..a0efae8219f 100644 --- a/po/wa.po +++ b/po/wa.po @@ -8001,7 +8001,7 @@ msgstr "" msgid "Environment variable %s not defined\n" msgstr "" -#: cmd.rc:310 xcopy.rc:38 +#: cmd.rc:310 msgid "Failed to open '%s'\n" msgstr "" @@ -10866,7 +10866,7 @@ msgid "Invalid number of parameters - Use xcopy /? for help\n" msgstr "" #: xcopy.rc:28 -msgid "Invalid parameter '%s' - Use xcopy /? for help\n" +msgid "Invalid parameter '%1' - Use xcopy /? for help\n" msgstr "" #: xcopy.rc:29 @@ -10874,34 +10874,38 @@ msgid "Press to begin copying\n" msgstr "" #: xcopy.rc:30 -msgid "%d file(s) would be copied\n" +msgid "%1!d! file(s) would be copied\n" msgstr "" #: xcopy.rc:31 -msgid "%d file(s) copied\n" +msgid "%1!d! file(s) copied\n" msgstr "" #: xcopy.rc:34 msgid "" -"Is '%s' a filename or directory\n" +"Is '%1' a filename or directory\n" "on the target?\n" "(F - File, D - Directory)\n" msgstr "" #: xcopy.rc:35 -msgid "%s? (Yes|No)\n" +msgid "%1? (Yes|No)\n" msgstr "" #: xcopy.rc:36 -msgid "Overwrite %s? (Yes|No|All)\n" +msgid "Overwrite %1? (Yes|No|All)\n" msgstr "" #: xcopy.rc:37 -msgid "Copying of '%s' to '%s' failed with r/c %d\n" +msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" +msgstr "" + +#: xcopy.rc:38 +msgid "Failed to open '%1'\n" msgstr "" #: xcopy.rc:39 -msgid "Failed during reading of '%s'\n" +msgid "Failed during reading of '%1'\n" msgstr "" #: xcopy.rc:43 diff --git a/po/wine.pot b/po/wine.pot index f98183ba136..ebc7e095b15 100644 --- a/po/wine.pot +++ b/po/wine.pot @@ -7909,7 +7909,7 @@ msgstr "" msgid "Environment variable %s not defined\n" msgstr "" -#: cmd.rc:310 xcopy.rc:38 +#: cmd.rc:310 msgid "Failed to open '%s'\n" msgstr "" @@ -10708,7 +10708,7 @@ msgid "Invalid number of parameters - Use xcopy /? for help\n" msgstr "" #: xcopy.rc:28 -msgid "Invalid parameter '%s' - Use xcopy /? for help\n" +msgid "Invalid parameter '%1' - Use xcopy /? for help\n" msgstr "" #: xcopy.rc:29 @@ -10716,34 +10716,38 @@ msgid "Press to begin copying\n" msgstr "" #: xcopy.rc:30 -msgid "%d file(s) would be copied\n" +msgid "%1!d! file(s) would be copied\n" msgstr "" #: xcopy.rc:31 -msgid "%d file(s) copied\n" +msgid "%1!d! file(s) copied\n" msgstr "" #: xcopy.rc:34 msgid "" -"Is '%s' a filename or directory\n" +"Is '%1' a filename or directory\n" "on the target?\n" "(F - File, D - Directory)\n" msgstr "" #: xcopy.rc:35 -msgid "%s? (Yes|No)\n" +msgid "%1? (Yes|No)\n" msgstr "" #: xcopy.rc:36 -msgid "Overwrite %s? (Yes|No|All)\n" +msgid "Overwrite %1? (Yes|No|All)\n" msgstr "" #: xcopy.rc:37 -msgid "Copying of '%s' to '%s' failed with r/c %d\n" +msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" +msgstr "" + +#: xcopy.rc:38 +msgid "Failed to open '%1'\n" msgstr "" #: xcopy.rc:39 -msgid "Failed during reading of '%s'\n" +msgid "Failed during reading of '%1'\n" msgstr "" #: xcopy.rc:43 diff --git a/po/zh_CN.po b/po/zh_CN.po index 20cebedf3d9..b480b13597a 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -8285,7 +8285,7 @@ msgstr "" msgid "Environment variable %s not defined\n" msgstr "" -#: cmd.rc:310 xcopy.rc:38 +#: cmd.rc:310 msgid "Failed to open '%s'\n" msgstr "" @@ -11243,7 +11243,7 @@ msgid "Invalid number of parameters - Use xcopy /? for help\n" msgstr "" #: xcopy.rc:28 -msgid "Invalid parameter '%s' - Use xcopy /? for help\n" +msgid "Invalid parameter '%1' - Use xcopy /? for help\n" msgstr "" #: xcopy.rc:29 @@ -11251,34 +11251,38 @@ msgid "Press to begin copying\n" msgstr "" #: xcopy.rc:30 -msgid "%d file(s) would be copied\n" +msgid "%1!d! file(s) would be copied\n" msgstr "" #: xcopy.rc:31 -msgid "%d file(s) copied\n" +msgid "%1!d! file(s) copied\n" msgstr "" #: xcopy.rc:34 msgid "" -"Is '%s' a filename or directory\n" +"Is '%1' a filename or directory\n" "on the target?\n" "(F - File, D - Directory)\n" msgstr "" #: xcopy.rc:35 -msgid "%s? (Yes|No)\n" +msgid "%1? (Yes|No)\n" msgstr "" #: xcopy.rc:36 -msgid "Overwrite %s? (Yes|No|All)\n" +msgid "Overwrite %1? (Yes|No|All)\n" msgstr "" #: xcopy.rc:37 -msgid "Copying of '%s' to '%s' failed with r/c %d\n" +msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" +msgstr "" + +#: xcopy.rc:38 +msgid "Failed to open '%1'\n" msgstr "" #: xcopy.rc:39 -msgid "Failed during reading of '%s'\n" +msgid "Failed during reading of '%1'\n" msgstr "" #: xcopy.rc:43 diff --git a/po/zh_TW.po b/po/zh_TW.po index b3134a57e89..d6ec003189b 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -8326,7 +8326,7 @@ msgstr "" msgid "Environment variable %s not defined\n" msgstr "" -#: cmd.rc:310 xcopy.rc:38 +#: cmd.rc:310 msgid "Failed to open '%s'\n" msgstr "" @@ -11289,7 +11289,7 @@ msgid "Invalid number of parameters - Use xcopy /? for help\n" msgstr "" #: xcopy.rc:28 -msgid "Invalid parameter '%s' - Use xcopy /? for help\n" +msgid "Invalid parameter '%1' - Use xcopy /? for help\n" msgstr "" #: xcopy.rc:29 @@ -11297,34 +11297,38 @@ msgid "Press to begin copying\n" msgstr "" #: xcopy.rc:30 -msgid "%d file(s) would be copied\n" +msgid "%1!d! file(s) would be copied\n" msgstr "" #: xcopy.rc:31 -msgid "%d file(s) copied\n" +msgid "%1!d! file(s) copied\n" msgstr "" #: xcopy.rc:34 msgid "" -"Is '%s' a filename or directory\n" +"Is '%1' a filename or directory\n" "on the target?\n" "(F - File, D - Directory)\n" msgstr "" #: xcopy.rc:35 -msgid "%s? (Yes|No)\n" +msgid "%1? (Yes|No)\n" msgstr "" #: xcopy.rc:36 -msgid "Overwrite %s? (Yes|No|All)\n" +msgid "Overwrite %1? (Yes|No|All)\n" msgstr "" #: xcopy.rc:37 -msgid "Copying of '%s' to '%s' failed with r/c %d\n" +msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" +msgstr "" + +#: xcopy.rc:38 +msgid "Failed to open '%1'\n" msgstr "" #: xcopy.rc:39 -msgid "Failed during reading of '%s'\n" +msgid "Failed during reading of '%1'\n" msgstr "" #: xcopy.rc:43 diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index f684a55cf71..cfe58f3b6e6 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -120,10 +120,12 @@ static int XCOPY_wprintf(const WCHAR *format, ...) { } va_start(parms, format); - len = vsnprintfW(output_bufW, MAX_WRITECONSOLE_SIZE/sizeof(WCHAR), format, parms); + SetLastError(NO_ERROR); + len = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, format, 0, 0, output_bufW, + MAX_WRITECONSOLE_SIZE/sizeof(*output_bufW), &parms); va_end(parms); - if (len < 0) { - WINE_FIXME("String too long.\n"); + if (len == 0 && GetLastError() != NO_ERROR) { + WINE_FIXME("Could not format string: le=%u, fmt=%s\n", GetLastError(), wine_dbgstr_w(format)); return 0; } @@ -183,7 +185,7 @@ static void XCOPY_FailMessage(DWORD err) { WINE_FIXME("FIXME: Cannot display message for error %d, status %d\n", err, GetLastError()); } else { - const WCHAR infostr[] = {'%', 's', '\n', 0}; + const WCHAR infostr[] = {'%', '1', '\n', 0}; XCOPY_wprintf(infostr, lpMsgBuf); LocalFree ((HLOCAL)lpMsgBuf); } @@ -534,12 +536,12 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec, if (flags & OPT_QUIET) { /* Skip message */ } else if (flags & OPT_FULL) { - const WCHAR infostr[] = {'%', 's', ' ', '-', '>', ' ', - '%', 's', '\n', 0}; + const WCHAR infostr[] = {'%', '1', ' ', '-', '>', ' ', + '%', '2', '\n', 0}; XCOPY_wprintf(infostr, copyFrom, copyTo); } else { - const WCHAR infostr[] = {'%', 's', '\n', 0}; + const WCHAR infostr[] = {'%', '1', '\n', 0}; XCOPY_wprintf(infostr, copyFrom); } diff --git a/programs/xcopy/xcopy.rc b/programs/xcopy/xcopy.rc index 72e7632154a..d3bf7bd9e71 100644 --- a/programs/xcopy/xcopy.rc +++ b/programs/xcopy/xcopy.rc @@ -25,18 +25,18 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE { STRING_INVPARMS, "Invalid number of parameters - Use xcopy /? for help\n" - STRING_INVPARM, "Invalid parameter '%s' - Use xcopy /? for help\n" + STRING_INVPARM, "Invalid parameter '%1' - Use xcopy /? for help\n" STRING_PAUSE, "Press to begin copying\n" - STRING_SIMCOPY, "%d file(s) would be copied\n" - STRING_COPY, "%d file(s) copied\n" - STRING_QISDIR, "Is '%s' a filename or directory\n\ + STRING_SIMCOPY, "%1!d! file(s) would be copied\n" + STRING_COPY, "%1!d! file(s) copied\n" + STRING_QISDIR, "Is '%1' a filename or directory\n\ on the target?\n\ (F - File, D - Directory)\n" - STRING_SRCPROMPT,"%s? (Yes|No)\n" - STRING_OVERWRITE,"Overwrite %s? (Yes|No|All)\n" - STRING_COPYFAIL, "Copying of '%s' to '%s' failed with r/c %d\n" - STRING_OPENFAIL, "Failed to open '%s'\n" - STRING_READFAIL, "Failed during reading of '%s'\n" + STRING_SRCPROMPT,"%1? (Yes|No)\n" + STRING_OVERWRITE,"Overwrite %1? (Yes|No|All)\n" + STRING_COPYFAIL, "Copying of '%1' to '%2' failed with r/c %3!d!\n" + STRING_OPENFAIL, "Failed to open '%1'\n" + STRING_READFAIL, "Failed during reading of '%1'\n" STRING_YES_CHAR, "#msgctxt#Yes key#Y" STRING_NO_CHAR, "#msgctxt#No key#N" STRING_ALL_CHAR, "#msgctxt#All key#A"