From 8a00eb8609eadcd5f2e2f80c39373683d58accb7 Mon Sep 17 00:00:00 2001 From: Akihiro Sagawa Date: Wed, 14 Dec 2011 21:22:58 +0900 Subject: [PATCH] cmd: Improve the message when the volume has no label. --- po/ar.po | 11 +++++++++-- po/bg.po | 11 +++++++++-- po/ca.po | 11 +++++++++-- po/cs.po | 11 +++++++++-- po/da.po | 11 +++++++++-- po/de.po | 12 ++++++++++-- po/el.po | 11 +++++++++-- po/en.po | 14 ++++++++++---- po/en_US.po | 14 ++++++++++---- po/eo.po | 11 +++++++++-- po/es.po | 11 +++++++++-- po/fa.po | 11 +++++++++-- po/fi.po | 11 +++++++++-- po/fr.po | 12 ++++++++++-- po/he.po | 11 +++++++++-- po/hi.po | 11 +++++++++-- po/hu.po | 11 +++++++++-- po/it.po | 12 ++++++++++-- po/ja.po | 11 +++++++++-- po/ko.po | 12 ++++++++++-- po/lt.po | 12 ++++++++++-- po/ml.po | 11 +++++++++-- po/nb_NO.po | 11 +++++++++-- po/nl.po | 12 ++++++++++-- po/or.po | 11 +++++++++-- po/pa.po | 11 +++++++++-- po/pl.po | 12 ++++++++++-- po/pt_BR.po | 11 +++++++++-- po/pt_PT.po | 11 +++++++++-- po/rm.po | 11 +++++++++-- po/ro.po | 11 +++++++++-- po/ru.po | 12 ++++++++++-- po/sk.po | 11 +++++++++-- po/sl.po | 11 +++++++++-- po/sr_RS@cyrillic.po | 11 +++++++++-- po/sr_RS@latin.po | 11 +++++++++-- po/sv.po | 11 +++++++++-- po/te.po | 11 +++++++++-- po/th.po | 11 +++++++++-- po/tr.po | 11 +++++++++-- po/uk.po | 11 +++++++++-- po/wa.po | 11 +++++++++-- po/wine.pot | 11 +++++++++-- po/zh_CN.po | 11 +++++++++-- po/zh_TW.po | 11 +++++++++-- programs/cmd/builtins.c | 12 ++++++++++-- programs/cmd/cmd.rc | 4 +++- programs/cmd/wcmd.h | 4 +++- 48 files changed, 431 insertions(+), 98 deletions(-) diff --git a/po/ar.po b/po/ar.po index 5279d6f15d4..d8109c72e6a 100644 --- a/po/ar.po +++ b/po/ar.po @@ -9645,8 +9645,7 @@ msgstr "" #: cmd.rc:318 msgid "" -"Volume in drive %1!c! is %2\n" -"Volume Serial Number is %3!04x!-%4!04x!\n" +"Volume Serial Number is %1!04x!-%2!04x!\n" "\n" msgstr "" @@ -9678,6 +9677,14 @@ msgstr "" msgid "The input line is too long.\n" msgstr "" +#: cmd.rc:326 +msgid "Volume in drive %1!c! is %2\n" +msgstr "" + +#: cmd.rc:327 +msgid "Volume in drive %1!c! has no label.\n" +msgstr "" + #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" msgstr "" diff --git a/po/bg.po b/po/bg.po index 40ebc16639f..d5fb0af4a70 100644 --- a/po/bg.po +++ b/po/bg.po @@ -9762,8 +9762,7 @@ msgstr "" #: cmd.rc:318 msgid "" -"Volume in drive %1!c! is %2\n" -"Volume Serial Number is %3!04x!-%4!04x!\n" +"Volume Serial Number is %1!04x!-%2!04x!\n" "\n" msgstr "" @@ -9795,6 +9794,14 @@ msgstr "" msgid "The input line is too long.\n" msgstr "" +#: cmd.rc:326 +msgid "Volume in drive %1!c! is %2\n" +msgstr "" + +#: cmd.rc:327 +msgid "Volume in drive %1!c! has no label.\n" +msgstr "" + #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" msgstr "" diff --git a/po/ca.po b/po/ca.po index 59b0ce2ed4f..e128b2e96cc 100644 --- a/po/ca.po +++ b/po/ca.po @@ -10065,8 +10065,7 @@ msgstr "Error de paràmetre\n" #: cmd.rc:318 #, fuzzy msgid "" -"Volume in drive %1!c! is %2\n" -"Volume Serial Number is %3!04x!-%4!04x!\n" +"Volume Serial Number is %1!04x!-%2!04x!\n" "\n" msgstr "" "Volum en unitat %c és %s\n" @@ -10102,6 +10101,14 @@ msgstr "Més? " msgid "The input line is too long.\n" msgstr "La lìnia d'entrada és massa llarga.\n" +#: cmd.rc:326 +msgid "Volume in drive %1!c! is %2\n" +msgstr "" + +#: cmd.rc:327 +msgid "Volume in drive %1!c! has no label.\n" +msgstr "" + #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" msgstr "Eina Diagnòstica de DirextX" diff --git a/po/cs.po b/po/cs.po index b86d9d1268c..6f00a87001e 100644 --- a/po/cs.po +++ b/po/cs.po @@ -10129,8 +10129,7 @@ msgstr "" #: cmd.rc:318 msgid "" -"Volume in drive %1!c! is %2\n" -"Volume Serial Number is %3!04x!-%4!04x!\n" +"Volume Serial Number is %1!04x!-%2!04x!\n" "\n" msgstr "" @@ -10162,6 +10161,14 @@ msgstr "" msgid "The input line is too long.\n" msgstr "" +#: cmd.rc:326 +msgid "Volume in drive %1!c! is %2\n" +msgstr "" + +#: cmd.rc:327 +msgid "Volume in drive %1!c! has no label.\n" +msgstr "" + #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" msgstr "" diff --git a/po/da.po b/po/da.po index 5fde3632500..7d970f2a078 100644 --- a/po/da.po +++ b/po/da.po @@ -10164,8 +10164,7 @@ msgstr "Parameter fejl\n" #: cmd.rc:318 #, fuzzy msgid "" -"Volume in drive %1!c! is %2\n" -"Volume Serial Number is %3!04x!-%4!04x!\n" +"Volume Serial Number is %1!04x!-%2!04x!\n" "\n" msgstr "" "Volumen i drevet %c er %s\n" @@ -10202,6 +10201,14 @@ msgstr "Mere? " msgid "The input line is too long.\n" msgstr "" +#: cmd.rc:326 +msgid "Volume in drive %1!c! is %2\n" +msgstr "" + +#: cmd.rc:327 +msgid "Volume in drive %1!c! has no label.\n" +msgstr "" + #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" msgstr "" diff --git a/po/de.po b/po/de.po index 24419bb9d7a..7aed9c7c29c 100644 --- a/po/de.po +++ b/po/de.po @@ -10056,9 +10056,9 @@ msgid "Parameter error\n" msgstr "Parameterfehler\n" #: cmd.rc:318 +#, fuzzy msgid "" -"Volume in drive %1!c! is %2\n" -"Volume Serial Number is %3!04x!-%4!04x!\n" +"Volume Serial Number is %1!04x!-%2!04x!\n" "\n" msgstr "" "Volume in Laufwerk %1!c! ist %2\n" @@ -10093,6 +10093,14 @@ msgstr "Mehr? " msgid "The input line is too long.\n" msgstr "Die Eingabezeile ist zu lang.\n" +#: cmd.rc:326 +msgid "Volume in drive %1!c! is %2\n" +msgstr "" + +#: cmd.rc:327 +msgid "Volume in drive %1!c! has no label.\n" +msgstr "" + #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" msgstr "DirectX Diagnosewerkzeug" diff --git a/po/el.po b/po/el.po index 5031ad95eea..7dbdd0d5c24 100644 --- a/po/el.po +++ b/po/el.po @@ -9627,8 +9627,7 @@ msgstr "" #: cmd.rc:318 msgid "" -"Volume in drive %1!c! is %2\n" -"Volume Serial Number is %3!04x!-%4!04x!\n" +"Volume Serial Number is %1!04x!-%2!04x!\n" "\n" msgstr "" @@ -9660,6 +9659,14 @@ msgstr "" msgid "The input line is too long.\n" msgstr "" +#: cmd.rc:326 +msgid "Volume in drive %1!c! is %2\n" +msgstr "" + +#: cmd.rc:327 +msgid "Volume in drive %1!c! has no label.\n" +msgstr "" + #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" msgstr "" diff --git a/po/en.po b/po/en.po index ed5764c8e9e..032e80da5b3 100644 --- a/po/en.po +++ b/po/en.po @@ -9787,12 +9787,10 @@ msgstr "Parameter error\n" #: cmd.rc:318 msgid "" -"Volume in drive %1!c! is %2\n" -"Volume Serial Number is %3!04x!-%4!04x!\n" +"Volume Serial Number is %1!04x!-%2!04x!\n" "\n" msgstr "" -"Volume in drive %1!c! is %2\n" -"Volume Serial Number is %3!04x!-%4!04x!\n" +"Volume Serial Number is %1!04x!-%2!04x!\n" "\n" #: cmd.rc:319 @@ -9823,6 +9821,14 @@ msgstr "More? " msgid "The input line is too long.\n" msgstr "The input line is too long.\n" +#: cmd.rc:326 +msgid "Volume in drive %1!c! is %2\n" +msgstr "" + +#: cmd.rc:327 +msgid "Volume in drive %1!c! has no label.\n" +msgstr "" + #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" msgstr "" diff --git a/po/en_US.po b/po/en_US.po index 06b8e33e48e..9570533259f 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -9976,12 +9976,10 @@ msgstr "Parameter error\n" #: cmd.rc:318 msgid "" -"Volume in drive %1!c! is %2\n" -"Volume Serial Number is %3!04x!-%4!04x!\n" +"Volume Serial Number is %1!04x!-%2!04x!\n" "\n" msgstr "" -"Volume in drive %1!c! is %2\n" -"Volume Serial Number is %3!04x!-%4!04x!\n" +"Volume Serial Number is %1!04x!-%2!04x!\n" "\n" #: cmd.rc:319 @@ -10012,6 +10010,14 @@ msgstr "More? " msgid "The input line is too long.\n" msgstr "The input line is too long.\n" +#: cmd.rc:326 +msgid "Volume in drive %1!c! is %2\n" +msgstr "" + +#: cmd.rc:327 +msgid "Volume in drive %1!c! has no label.\n" +msgstr "" + #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" msgstr "DirectX Diagnostic Tool" diff --git a/po/eo.po b/po/eo.po index 5506802a7e7..b86757d8965 100644 --- a/po/eo.po +++ b/po/eo.po @@ -9787,8 +9787,7 @@ msgstr "" #: cmd.rc:318 msgid "" -"Volume in drive %1!c! is %2\n" -"Volume Serial Number is %3!04x!-%4!04x!\n" +"Volume Serial Number is %1!04x!-%2!04x!\n" "\n" msgstr "" @@ -9820,6 +9819,14 @@ msgstr "" msgid "The input line is too long.\n" msgstr "" +#: cmd.rc:326 +msgid "Volume in drive %1!c! is %2\n" +msgstr "" + +#: cmd.rc:327 +msgid "Volume in drive %1!c! has no label.\n" +msgstr "" + #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" msgstr "" diff --git a/po/es.po b/po/es.po index fc937e3751c..2435fb4dc85 100644 --- a/po/es.po +++ b/po/es.po @@ -10368,8 +10368,7 @@ msgstr "Error de parámetro\n" #: cmd.rc:318 #, fuzzy msgid "" -"Volume in drive %1!c! is %2\n" -"Volume Serial Number is %3!04x!-%4!04x!\n" +"Volume Serial Number is %1!04x!-%2!04x!\n" "\n" msgstr "" "El volumen en la unidad %c es %s\n" @@ -10406,6 +10405,14 @@ msgstr "Más? " msgid "The input line is too long.\n" msgstr "La línea de entrada es demasiado larga.\n" +#: cmd.rc:326 +msgid "Volume in drive %1!c! is %2\n" +msgstr "" + +#: cmd.rc:327 +msgid "Volume in drive %1!c! has no label.\n" +msgstr "" + #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" msgstr "" diff --git a/po/fa.po b/po/fa.po index af422e8ffac..6d618ebb91f 100644 --- a/po/fa.po +++ b/po/fa.po @@ -9647,8 +9647,7 @@ msgstr "" #: cmd.rc:318 msgid "" -"Volume in drive %1!c! is %2\n" -"Volume Serial Number is %3!04x!-%4!04x!\n" +"Volume Serial Number is %1!04x!-%2!04x!\n" "\n" msgstr "" @@ -9680,6 +9679,14 @@ msgstr "" msgid "The input line is too long.\n" msgstr "" +#: cmd.rc:326 +msgid "Volume in drive %1!c! is %2\n" +msgstr "" + +#: cmd.rc:327 +msgid "Volume in drive %1!c! has no label.\n" +msgstr "" + #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" msgstr "" diff --git a/po/fi.po b/po/fi.po index 5f634d042ac..87f9b1265af 100644 --- a/po/fi.po +++ b/po/fi.po @@ -9884,8 +9884,7 @@ msgstr "" #: cmd.rc:318 msgid "" -"Volume in drive %1!c! is %2\n" -"Volume Serial Number is %3!04x!-%4!04x!\n" +"Volume Serial Number is %1!04x!-%2!04x!\n" "\n" msgstr "" @@ -9917,6 +9916,14 @@ msgstr "" msgid "The input line is too long.\n" msgstr "" +#: cmd.rc:326 +msgid "Volume in drive %1!c! is %2\n" +msgstr "" + +#: cmd.rc:327 +msgid "Volume in drive %1!c! has no label.\n" +msgstr "" + #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" msgstr "" diff --git a/po/fr.po b/po/fr.po index eebaf7aabfe..10fd7d55577 100644 --- a/po/fr.po +++ b/po/fr.po @@ -10086,9 +10086,9 @@ msgid "Parameter error\n" msgstr "Erreur de paramètre\n" #: cmd.rc:318 +#, fuzzy msgid "" -"Volume in drive %1!c! is %2\n" -"Volume Serial Number is %3!04x!-%4!04x!\n" +"Volume Serial Number is %1!04x!-%2!04x!\n" "\n" msgstr "" "Le volume dans le lecteur %1!c! est %2\n" @@ -10123,6 +10123,14 @@ msgstr "Plus ? " msgid "The input line is too long.\n" msgstr "La ligne d'entrée est trop longue.\n" +#: cmd.rc:326 +msgid "Volume in drive %1!c! is %2\n" +msgstr "" + +#: cmd.rc:327 +msgid "Volume in drive %1!c! has no label.\n" +msgstr "" + #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" msgstr "Outil de diagnostic DirectX" diff --git a/po/he.po b/po/he.po index 5e7fc244189..434c5f010c5 100644 --- a/po/he.po +++ b/po/he.po @@ -10070,8 +10070,7 @@ msgstr "Parameter error\n" #: cmd.rc:318 #, fuzzy msgid "" -"Volume in drive %1!c! is %2\n" -"Volume Serial Number is %3!04x!-%4!04x!\n" +"Volume Serial Number is %1!04x!-%2!04x!\n" "\n" msgstr "" "Volume in drive %c is %s\n" @@ -10108,6 +10107,14 @@ msgstr "More? " msgid "The input line is too long.\n" msgstr "The input line is too long.\n" +#: cmd.rc:326 +msgid "Volume in drive %1!c! is %2\n" +msgstr "" + +#: cmd.rc:327 +msgid "Volume in drive %1!c! has no label.\n" +msgstr "" + #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" msgstr "כלי ניתוח ה־DirectX" diff --git a/po/hi.po b/po/hi.po index 647657e0b94..3d9da65ba91 100644 --- a/po/hi.po +++ b/po/hi.po @@ -9503,8 +9503,7 @@ msgstr "" #: cmd.rc:318 msgid "" -"Volume in drive %1!c! is %2\n" -"Volume Serial Number is %3!04x!-%4!04x!\n" +"Volume Serial Number is %1!04x!-%2!04x!\n" "\n" msgstr "" @@ -9536,6 +9535,14 @@ msgstr "" msgid "The input line is too long.\n" msgstr "" +#: cmd.rc:326 +msgid "Volume in drive %1!c! is %2\n" +msgstr "" + +#: cmd.rc:327 +msgid "Volume in drive %1!c! has no label.\n" +msgstr "" + #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" msgstr "" diff --git a/po/hu.po b/po/hu.po index ec807ccdddb..87b7080798b 100644 --- a/po/hu.po +++ b/po/hu.po @@ -10072,8 +10072,7 @@ msgstr "" #: cmd.rc:318 msgid "" -"Volume in drive %1!c! is %2\n" -"Volume Serial Number is %3!04x!-%4!04x!\n" +"Volume Serial Number is %1!04x!-%2!04x!\n" "\n" msgstr "" @@ -10106,6 +10105,14 @@ msgstr "" msgid "The input line is too long.\n" msgstr "" +#: cmd.rc:326 +msgid "Volume in drive %1!c! is %2\n" +msgstr "" + +#: cmd.rc:327 +msgid "Volume in drive %1!c! has no label.\n" +msgstr "" + #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" msgstr "" diff --git a/po/it.po b/po/it.po index f35023335dd..bff714eecab 100644 --- a/po/it.po +++ b/po/it.po @@ -10037,9 +10037,9 @@ msgid "Parameter error\n" msgstr "Errore nel parametro\n" #: cmd.rc:318 +#, fuzzy msgid "" -"Volume in drive %1!c! is %2\n" -"Volume Serial Number is %3!04x!-%4!04x!\n" +"Volume Serial Number is %1!04x!-%2!04x!\n" "\n" msgstr "" "Il volume nell'unità %1!c! è %2\n" @@ -10074,6 +10074,14 @@ msgstr "Di più? " msgid "The input line is too long.\n" msgstr "La linea di input è troppo lunga.\n" +#: cmd.rc:326 +msgid "Volume in drive %1!c! is %2\n" +msgstr "" + +#: cmd.rc:327 +msgid "Volume in drive %1!c! has no label.\n" +msgstr "" + #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" msgstr "Strumento di Diagnostica DirectX" diff --git a/po/ja.po b/po/ja.po index ee30ba62f11..64b358db206 100644 --- a/po/ja.po +++ b/po/ja.po @@ -9982,8 +9982,7 @@ msgstr "パラメータ エラー\n" #: cmd.rc:318 #, fuzzy msgid "" -"Volume in drive %1!c! is %2\n" -"Volume Serial Number is %3!04x!-%4!04x!\n" +"Volume Serial Number is %1!04x!-%2!04x!\n" "\n" msgstr "" "ドライブ %c のボリューム ラベルは %s\n" @@ -10019,6 +10018,14 @@ msgstr "More? " msgid "The input line is too long.\n" msgstr "入力行が長すぎます。\n" +#: cmd.rc:326 +msgid "Volume in drive %1!c! is %2\n" +msgstr "" + +#: cmd.rc:327 +msgid "Volume in drive %1!c! has no label.\n" +msgstr "" + #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" msgstr "DirectX 診断ツール" diff --git a/po/ko.po b/po/ko.po index 0a201de2261..10970462f3b 100644 --- a/po/ko.po +++ b/po/ko.po @@ -9936,9 +9936,9 @@ msgid "Parameter error\n" msgstr "매개변수 오류\n" #: cmd.rc:318 +#, fuzzy msgid "" -"Volume in drive %1!c! is %2\n" -"Volume Serial Number is %3!04x!-%4!04x!\n" +"Volume Serial Number is %1!04x!-%2!04x!\n" "\n" msgstr "" "드라이브 %1!c!의 볼륨은 %2임\n" @@ -9973,6 +9973,14 @@ msgstr "더? " msgid "The input line is too long.\n" msgstr "이 출력 줄은 너무 깁니다.\n" +#: cmd.rc:326 +msgid "Volume in drive %1!c! is %2\n" +msgstr "" + +#: cmd.rc:327 +msgid "Volume in drive %1!c! has no label.\n" +msgstr "" + #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" msgstr "다이렉트엑스 진단 도구" diff --git a/po/lt.po b/po/lt.po index 80340209676..e6e0186a3a7 100644 --- a/po/lt.po +++ b/po/lt.po @@ -9992,9 +9992,9 @@ msgid "Parameter error\n" msgstr "Parametro klaida\n" #: cmd.rc:318 +#, fuzzy msgid "" -"Volume in drive %1!c! is %2\n" -"Volume Serial Number is %3!04x!-%4!04x!\n" +"Volume Serial Number is %1!04x!-%2!04x!\n" "\n" msgstr "" "Tomas diske %1!c! yra %2\n" @@ -10029,6 +10029,14 @@ msgstr "Daugiau? " msgid "The input line is too long.\n" msgstr "Įvedimo eilutė per ilga.\n" +#: cmd.rc:326 +msgid "Volume in drive %1!c! is %2\n" +msgstr "" + +#: cmd.rc:327 +msgid "Volume in drive %1!c! has no label.\n" +msgstr "" + #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" msgstr "DirectX diagnostikos įrankis" diff --git a/po/ml.po b/po/ml.po index fed59aa5064..9623f263ef2 100644 --- a/po/ml.po +++ b/po/ml.po @@ -9503,8 +9503,7 @@ msgstr "" #: cmd.rc:318 msgid "" -"Volume in drive %1!c! is %2\n" -"Volume Serial Number is %3!04x!-%4!04x!\n" +"Volume Serial Number is %1!04x!-%2!04x!\n" "\n" msgstr "" @@ -9536,6 +9535,14 @@ msgstr "" msgid "The input line is too long.\n" msgstr "" +#: cmd.rc:326 +msgid "Volume in drive %1!c! is %2\n" +msgstr "" + +#: cmd.rc:327 +msgid "Volume in drive %1!c! has no label.\n" +msgstr "" + #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" msgstr "" diff --git a/po/nb_NO.po b/po/nb_NO.po index 877f823da90..45b80d40e8f 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -10231,8 +10231,7 @@ msgstr "" #: cmd.rc:318 msgid "" -"Volume in drive %1!c! is %2\n" -"Volume Serial Number is %3!04x!-%4!04x!\n" +"Volume Serial Number is %1!04x!-%2!04x!\n" "\n" msgstr "" @@ -10265,6 +10264,14 @@ msgstr "" msgid "The input line is too long.\n" msgstr "" +#: cmd.rc:326 +msgid "Volume in drive %1!c! is %2\n" +msgstr "" + +#: cmd.rc:327 +msgid "Volume in drive %1!c! has no label.\n" +msgstr "" + #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" msgstr "" diff --git a/po/nl.po b/po/nl.po index bc8535f7c9b..9acf798c857 100644 --- a/po/nl.po +++ b/po/nl.po @@ -10033,9 +10033,9 @@ msgid "Parameter error\n" msgstr "Parameter onjuist\n" #: cmd.rc:318 +#, fuzzy msgid "" -"Volume in drive %1!c! is %2\n" -"Volume Serial Number is %3!04x!-%4!04x!\n" +"Volume Serial Number is %1!04x!-%2!04x!\n" "\n" msgstr "" "Schijf in drive %1!c! is %2\n" @@ -10070,6 +10070,14 @@ msgstr "Meer? " msgid "The input line is too long.\n" msgstr "De invoerregel is te lang.\n" +#: cmd.rc:326 +msgid "Volume in drive %1!c! is %2\n" +msgstr "" + +#: cmd.rc:327 +msgid "Volume in drive %1!c! has no label.\n" +msgstr "" + #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" msgstr "Diagnostisch instrument voor DirectX" diff --git a/po/or.po b/po/or.po index 69767c362a0..c4e0fbceb10 100644 --- a/po/or.po +++ b/po/or.po @@ -9503,8 +9503,7 @@ msgstr "" #: cmd.rc:318 msgid "" -"Volume in drive %1!c! is %2\n" -"Volume Serial Number is %3!04x!-%4!04x!\n" +"Volume Serial Number is %1!04x!-%2!04x!\n" "\n" msgstr "" @@ -9536,6 +9535,14 @@ msgstr "" msgid "The input line is too long.\n" msgstr "" +#: cmd.rc:326 +msgid "Volume in drive %1!c! is %2\n" +msgstr "" + +#: cmd.rc:327 +msgid "Volume in drive %1!c! has no label.\n" +msgstr "" + #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" msgstr "" diff --git a/po/pa.po b/po/pa.po index d2c63a1f488..99dbc138121 100644 --- a/po/pa.po +++ b/po/pa.po @@ -9503,8 +9503,7 @@ msgstr "" #: cmd.rc:318 msgid "" -"Volume in drive %1!c! is %2\n" -"Volume Serial Number is %3!04x!-%4!04x!\n" +"Volume Serial Number is %1!04x!-%2!04x!\n" "\n" msgstr "" @@ -9536,6 +9535,14 @@ msgstr "" msgid "The input line is too long.\n" msgstr "" +#: cmd.rc:326 +msgid "Volume in drive %1!c! is %2\n" +msgstr "" + +#: cmd.rc:327 +msgid "Volume in drive %1!c! has no label.\n" +msgstr "" + #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" msgstr "" diff --git a/po/pl.po b/po/pl.po index 962552c95af..45cf61b5502 100644 --- a/po/pl.po +++ b/po/pl.po @@ -10023,9 +10023,9 @@ msgid "Parameter error\n" msgstr "Błąd parametru\n" #: cmd.rc:318 +#, fuzzy msgid "" -"Volume in drive %1!c! is %2\n" -"Volume Serial Number is %3!04x!-%4!04x!\n" +"Volume Serial Number is %1!04x!-%2!04x!\n" "\n" msgstr "" "Wolumenem w napędzie %1!c! jest %2\n" @@ -10060,6 +10060,14 @@ msgstr "Więcej? " msgid "The input line is too long.\n" msgstr "Wpisany tekst jest zbyt długi.\n" +#: cmd.rc:326 +msgid "Volume in drive %1!c! is %2\n" +msgstr "" + +#: cmd.rc:327 +msgid "Volume in drive %1!c! has no label.\n" +msgstr "" + #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" msgstr "Narzędzie diagnostyki DirectX" diff --git a/po/pt_BR.po b/po/pt_BR.po index dddfeac5efd..6dca5e487b2 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -10259,8 +10259,7 @@ msgstr "Erro de parâmetro\n" #: cmd.rc:318 #, fuzzy msgid "" -"Volume in drive %1!c! is %2\n" -"Volume Serial Number is %3!04x!-%4!04x!\n" +"Volume Serial Number is %1!04x!-%2!04x!\n" "\n" msgstr "" "Volume no drive %c é %s\n" @@ -10297,6 +10296,14 @@ msgstr "Mais? " msgid "The input line is too long.\n" msgstr "A linha de entrada é muito longa.\n" +#: cmd.rc:326 +msgid "Volume in drive %1!c! is %2\n" +msgstr "" + +#: cmd.rc:327 +msgid "Volume in drive %1!c! has no label.\n" +msgstr "" + #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" msgstr "" diff --git a/po/pt_PT.po b/po/pt_PT.po index 1a3512c2872..12dc9fc9793 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -10270,8 +10270,7 @@ msgstr "" #: cmd.rc:318 msgid "" -"Volume in drive %1!c! is %2\n" -"Volume Serial Number is %3!04x!-%4!04x!\n" +"Volume Serial Number is %1!04x!-%2!04x!\n" "\n" msgstr "" @@ -10304,6 +10303,14 @@ msgstr "" msgid "The input line is too long.\n" msgstr "" +#: cmd.rc:326 +msgid "Volume in drive %1!c! is %2\n" +msgstr "" + +#: cmd.rc:327 +msgid "Volume in drive %1!c! has no label.\n" +msgstr "" + #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" msgstr "" diff --git a/po/rm.po b/po/rm.po index 45ad7acbb3a..a7edbdb7d9d 100644 --- a/po/rm.po +++ b/po/rm.po @@ -9580,8 +9580,7 @@ msgstr "" #: cmd.rc:318 msgid "" -"Volume in drive %1!c! is %2\n" -"Volume Serial Number is %3!04x!-%4!04x!\n" +"Volume Serial Number is %1!04x!-%2!04x!\n" "\n" msgstr "" @@ -9613,6 +9612,14 @@ msgstr "" msgid "The input line is too long.\n" msgstr "" +#: cmd.rc:326 +msgid "Volume in drive %1!c! is %2\n" +msgstr "" + +#: cmd.rc:327 +msgid "Volume in drive %1!c! has no label.\n" +msgstr "" + #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" msgstr "" diff --git a/po/ro.po b/po/ro.po index b0bc83b12e5..745505574aa 100644 --- a/po/ro.po +++ b/po/ro.po @@ -10501,8 +10501,7 @@ msgstr "Eroare de parametri\n" #: cmd.rc:318 #, fuzzy msgid "" -"Volume in drive %1!c! is %2\n" -"Volume Serial Number is %3!04x!-%4!04x!\n" +"Volume Serial Number is %1!04x!-%2!04x!\n" "\n" msgstr "" "Volumul din unitatea %c este %s\n" @@ -10539,6 +10538,14 @@ msgstr "Mai mult? " msgid "The input line is too long.\n" msgstr "Șirul introdus este prea lung.\n" +#: cmd.rc:326 +msgid "Volume in drive %1!c! is %2\n" +msgstr "" + +#: cmd.rc:327 +msgid "Volume in drive %1!c! has no label.\n" +msgstr "" + #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" msgstr "" diff --git a/po/ru.po b/po/ru.po index 948321ce4aa..c73eea2ef31 100644 --- a/po/ru.po +++ b/po/ru.po @@ -9984,9 +9984,9 @@ msgid "Parameter error\n" msgstr "Неверный параметр\n" #: cmd.rc:318 +#, fuzzy msgid "" -"Volume in drive %1!c! is %2\n" -"Volume Serial Number is %3!04x!-%4!04x!\n" +"Volume Serial Number is %1!04x!-%2!04x!\n" "\n" msgstr "" "Том диска %1!c! %2\n" @@ -10021,6 +10021,14 @@ msgstr "Ещё? " msgid "The input line is too long.\n" msgstr "Введённая команда слишком длинная.\n" +#: cmd.rc:326 +msgid "Volume in drive %1!c! is %2\n" +msgstr "" + +#: cmd.rc:327 +msgid "Volume in drive %1!c! has no label.\n" +msgstr "" + #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" msgstr "Утилита диагностики DirectX" diff --git a/po/sk.po b/po/sk.po index 05f836c9889..d82467f9808 100644 --- a/po/sk.po +++ b/po/sk.po @@ -9658,8 +9658,7 @@ msgstr "" #: cmd.rc:318 msgid "" -"Volume in drive %1!c! is %2\n" -"Volume Serial Number is %3!04x!-%4!04x!\n" +"Volume Serial Number is %1!04x!-%2!04x!\n" "\n" msgstr "" @@ -9691,6 +9690,14 @@ msgstr "" msgid "The input line is too long.\n" msgstr "" +#: cmd.rc:326 +msgid "Volume in drive %1!c! is %2\n" +msgstr "" + +#: cmd.rc:327 +msgid "Volume in drive %1!c! has no label.\n" +msgstr "" + #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" msgstr "" diff --git a/po/sl.po b/po/sl.po index fd59d171676..10bdaff728d 100644 --- a/po/sl.po +++ b/po/sl.po @@ -10033,8 +10033,7 @@ msgstr "Napaka parametra\n" #: cmd.rc:318 #, fuzzy msgid "" -"Volume in drive %1!c! is %2\n" -"Volume Serial Number is %3!04x!-%4!04x!\n" +"Volume Serial Number is %1!04x!-%2!04x!\n" "\n" msgstr "" "Nosilec v pogonu %c je %s\n" @@ -10071,6 +10070,14 @@ msgstr "Več? " msgid "The input line is too long.\n" msgstr "Vrstica vhoda je predolga.\n" +#: cmd.rc:326 +msgid "Volume in drive %1!c! is %2\n" +msgstr "" + +#: cmd.rc:327 +msgid "Volume in drive %1!c! has no label.\n" +msgstr "" + #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" msgstr "" diff --git a/po/sr_RS@cyrillic.po b/po/sr_RS@cyrillic.po index 4fe82729334..9a740209023 100644 --- a/po/sr_RS@cyrillic.po +++ b/po/sr_RS@cyrillic.po @@ -9930,8 +9930,7 @@ msgstr "" #: cmd.rc:318 msgid "" -"Volume in drive %1!c! is %2\n" -"Volume Serial Number is %3!04x!-%4!04x!\n" +"Volume Serial Number is %1!04x!-%2!04x!\n" "\n" msgstr "" @@ -9963,6 +9962,14 @@ msgstr "" msgid "The input line is too long.\n" msgstr "" +#: cmd.rc:326 +msgid "Volume in drive %1!c! is %2\n" +msgstr "" + +#: cmd.rc:327 +msgid "Volume in drive %1!c! has no label.\n" +msgstr "" + #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" msgstr "" diff --git a/po/sr_RS@latin.po b/po/sr_RS@latin.po index 24be0511703..005d7d83dc6 100644 --- a/po/sr_RS@latin.po +++ b/po/sr_RS@latin.po @@ -10036,8 +10036,7 @@ msgstr "" #: cmd.rc:318 msgid "" -"Volume in drive %1!c! is %2\n" -"Volume Serial Number is %3!04x!-%4!04x!\n" +"Volume Serial Number is %1!04x!-%2!04x!\n" "\n" msgstr "" @@ -10069,6 +10068,14 @@ msgstr "" msgid "The input line is too long.\n" msgstr "" +#: cmd.rc:326 +msgid "Volume in drive %1!c! is %2\n" +msgstr "" + +#: cmd.rc:327 +msgid "Volume in drive %1!c! has no label.\n" +msgstr "" + #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" msgstr "" diff --git a/po/sv.po b/po/sv.po index 2ee708da05f..21175af5460 100644 --- a/po/sv.po +++ b/po/sv.po @@ -9962,8 +9962,7 @@ msgstr "Parameterfel\n" #: cmd.rc:318 #, fuzzy msgid "" -"Volume in drive %1!c! is %2\n" -"Volume Serial Number is %3!04x!-%4!04x!\n" +"Volume Serial Number is %1!04x!-%2!04x!\n" "\n" msgstr "" "Diskvolymen på hårddisk %c är %s\n" @@ -9999,6 +9998,14 @@ msgstr "Mer? " msgid "The input line is too long.\n" msgstr "Inmatningen är för lång.\n" +#: cmd.rc:326 +msgid "Volume in drive %1!c! is %2\n" +msgstr "" + +#: cmd.rc:327 +msgid "Volume in drive %1!c! has no label.\n" +msgstr "" + #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" msgstr "" diff --git a/po/te.po b/po/te.po index e056044dded..7bc7ba9e68a 100644 --- a/po/te.po +++ b/po/te.po @@ -9503,8 +9503,7 @@ msgstr "" #: cmd.rc:318 msgid "" -"Volume in drive %1!c! is %2\n" -"Volume Serial Number is %3!04x!-%4!04x!\n" +"Volume Serial Number is %1!04x!-%2!04x!\n" "\n" msgstr "" @@ -9536,6 +9535,14 @@ msgstr "" msgid "The input line is too long.\n" msgstr "" +#: cmd.rc:326 +msgid "Volume in drive %1!c! is %2\n" +msgstr "" + +#: cmd.rc:327 +msgid "Volume in drive %1!c! has no label.\n" +msgstr "" + #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" msgstr "" diff --git a/po/th.po b/po/th.po index 1f1e215eb9e..62585262590 100644 --- a/po/th.po +++ b/po/th.po @@ -9655,8 +9655,7 @@ msgstr "" #: cmd.rc:318 msgid "" -"Volume in drive %1!c! is %2\n" -"Volume Serial Number is %3!04x!-%4!04x!\n" +"Volume Serial Number is %1!04x!-%2!04x!\n" "\n" msgstr "" @@ -9688,6 +9687,14 @@ msgstr "" msgid "The input line is too long.\n" msgstr "" +#: cmd.rc:326 +msgid "Volume in drive %1!c! is %2\n" +msgstr "" + +#: cmd.rc:327 +msgid "Volume in drive %1!c! has no label.\n" +msgstr "" + #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" msgstr "" diff --git a/po/tr.po b/po/tr.po index 2b63bff18cd..12007572bff 100644 --- a/po/tr.po +++ b/po/tr.po @@ -10246,8 +10246,7 @@ msgstr "" #: cmd.rc:318 msgid "" -"Volume in drive %1!c! is %2\n" -"Volume Serial Number is %3!04x!-%4!04x!\n" +"Volume Serial Number is %1!04x!-%2!04x!\n" "\n" msgstr "" @@ -10279,6 +10278,14 @@ msgstr "" msgid "The input line is too long.\n" msgstr "" +#: cmd.rc:326 +msgid "Volume in drive %1!c! is %2\n" +msgstr "" + +#: cmd.rc:327 +msgid "Volume in drive %1!c! has no label.\n" +msgstr "" + #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" msgstr "" diff --git a/po/uk.po b/po/uk.po index 20fbb904ced..269229da544 100644 --- a/po/uk.po +++ b/po/uk.po @@ -9963,8 +9963,7 @@ msgstr "Помилка параметру\n" #: cmd.rc:318 #, fuzzy msgid "" -"Volume in drive %1!c! is %2\n" -"Volume Serial Number is %3!04x!-%4!04x!\n" +"Volume Serial Number is %1!04x!-%2!04x!\n" "\n" msgstr "" "Диск %c має мітку %s\n" @@ -10001,6 +10000,14 @@ msgstr "Більше? " msgid "The input line is too long.\n" msgstr "Введений рядок задовгий.\n" +#: cmd.rc:326 +msgid "Volume in drive %1!c! is %2\n" +msgstr "" + +#: cmd.rc:327 +msgid "Volume in drive %1!c! has no label.\n" +msgstr "" + #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" msgstr "Утиліта Діагностики DirectX" diff --git a/po/wa.po b/po/wa.po index 63ce75a5da6..598a53e07e1 100644 --- a/po/wa.po +++ b/po/wa.po @@ -9620,8 +9620,7 @@ msgstr "" #: cmd.rc:318 msgid "" -"Volume in drive %1!c! is %2\n" -"Volume Serial Number is %3!04x!-%4!04x!\n" +"Volume Serial Number is %1!04x!-%2!04x!\n" "\n" msgstr "" @@ -9653,6 +9652,14 @@ msgstr "" msgid "The input line is too long.\n" msgstr "" +#: cmd.rc:326 +msgid "Volume in drive %1!c! is %2\n" +msgstr "" + +#: cmd.rc:327 +msgid "Volume in drive %1!c! has no label.\n" +msgstr "" + #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" msgstr "" diff --git a/po/wine.pot b/po/wine.pot index 41392f4407b..e4039813999 100644 --- a/po/wine.pot +++ b/po/wine.pot @@ -9450,8 +9450,7 @@ msgstr "" #: cmd.rc:318 msgid "" -"Volume in drive %1!c! is %2\n" -"Volume Serial Number is %3!04x!-%4!04x!\n" +"Volume Serial Number is %1!04x!-%2!04x!\n" "\n" msgstr "" @@ -9483,6 +9482,14 @@ msgstr "" msgid "The input line is too long.\n" msgstr "" +#: cmd.rc:326 +msgid "Volume in drive %1!c! is %2\n" +msgstr "" + +#: cmd.rc:327 +msgid "Volume in drive %1!c! has no label.\n" +msgstr "" + #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index 091e4833d0d..3d2a4c6fc2c 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -9880,8 +9880,7 @@ msgstr "" #: cmd.rc:318 msgid "" -"Volume in drive %1!c! is %2\n" -"Volume Serial Number is %3!04x!-%4!04x!\n" +"Volume Serial Number is %1!04x!-%2!04x!\n" "\n" msgstr "" @@ -9913,6 +9912,14 @@ msgstr "" msgid "The input line is too long.\n" msgstr "" +#: cmd.rc:326 +msgid "Volume in drive %1!c! is %2\n" +msgstr "" + +#: cmd.rc:327 +msgid "Volume in drive %1!c! has no label.\n" +msgstr "" + #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" msgstr "" diff --git a/po/zh_TW.po b/po/zh_TW.po index dd05307d8f9..49cc0f7b2a8 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -9939,8 +9939,7 @@ msgstr "" #: cmd.rc:318 msgid "" -"Volume in drive %1!c! is %2\n" -"Volume Serial Number is %3!04x!-%4!04x!\n" +"Volume Serial Number is %1!04x!-%2!04x!\n" "\n" msgstr "" @@ -9972,6 +9971,14 @@ msgstr "" msgid "The input line is too long.\n" msgstr "" +#: cmd.rc:326 +msgid "Volume in drive %1!c! is %2\n" +msgstr "" + +#: cmd.rc:327 +msgid "Volume in drive %1!c! has no label.\n" +msgstr "" + #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" msgstr "" diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index ed34585519d..ca4fa8750aa 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2729,8 +2729,16 @@ int WCMD_volume(BOOL set_label, const WCHAR *path) WCMD_print_error (); return 0; } - WCMD_output (WCMD_LoadMessage(WCMD_VOLUMEDETAIL), - curdir[0], label, HIWORD(serial), LOWORD(serial)); + if (label[0] != '\0') { + WCMD_output (WCMD_LoadMessage(WCMD_VOLUMELABEL), + curdir[0], label); + } + else { + WCMD_output (WCMD_LoadMessage(WCMD_VOLUMENOLABEL), + curdir[0]); + } + WCMD_output (WCMD_LoadMessage(WCMD_VOLUMESERIALNO), + HIWORD(serial), LOWORD(serial)); if (set_label) { WCMD_output (WCMD_LoadMessage(WCMD_VOLUMEPROMPT)); WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), string, sizeof(string)/sizeof(WCHAR), &count); diff --git a/programs/cmd/cmd.rc b/programs/cmd/cmd.rc index c12c6b2031e..8ed0e2a3701 100644 --- a/programs/cmd/cmd.rc +++ b/programs/cmd/cmd.rc @@ -315,7 +315,7 @@ Enter HELP for further information on any of the above commands.\n" WCMD_VERIFYPROMPT, "Verify is %1\n" WCMD_VERIFYERR, "Verify must be ON or OFF\n" WCMD_ARGERR, "Parameter error\n" - WCMD_VOLUMEDETAIL, "Volume in drive %1!c! is %2\nVolume Serial Number is %3!04x!-%4!04x!\n\n" + WCMD_VOLUMESERIALNO, "Volume Serial Number is %1!04x!-%2!04x!\n\n" WCMD_VOLUMEPROMPT, "Volume label (11 characters, ENTER for none)?" WCMD_NOPATH, "PATH not found\n" WCMD_ANYKEY,"Press any key to continue... " @@ -323,4 +323,6 @@ Enter HELP for further information on any of the above commands.\n" WCMD_VERSION,"CMD Version %1!S!\n" WCMD_MOREPROMPT, "More? " WCMD_LINETOOLONG, "The input line is too long.\n" + WCMD_VOLUMELABEL, "Volume in drive %1!c! is %2\n" + WCMD_VOLUMENOLABEL, "Volume in drive %1!c! has no label.\n" } diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 3a35a14e530..7ffa5227ff6 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -269,7 +269,7 @@ extern WCHAR version_string[]; #define WCMD_VERIFYPROMPT 1025 #define WCMD_VERIFYERR 1026 #define WCMD_ARGERR 1027 -#define WCMD_VOLUMEDETAIL 1028 +#define WCMD_VOLUMESERIALNO 1028 #define WCMD_VOLUMEPROMPT 1029 #define WCMD_NOPATH 1030 #define WCMD_ANYKEY 1031 @@ -277,3 +277,5 @@ extern WCHAR version_string[]; #define WCMD_VERSION 1033 #define WCMD_MOREPROMPT 1034 #define WCMD_LINETOOLONG 1035 +#define WCMD_VOLUMELABEL 1036 +#define WCMD_VOLUMENOLABEL 1037 -- 2.11.4.GIT