From 60bd85ff6c38cdb0e6a62f56bc61b30144a25939 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Sat, 1 Jun 2013 18:45:04 +0000 Subject: [PATCH] [CMD] COLOR builtin command of CMD does not format output color correctly. When changing the color of the foreground of the console with the command "color 3" for instance, the confirmation message "Color 3" appears whereas it should say "Color 03" as the number is output in 1-byte hexadecimal form. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Patch by Radek Liška CORE-7246 #resolve #comment Committed in revision r59132. Thanks :) svn path=/trunk/; revision=59132 --- reactos/base/shell/cmd/lang/de-DE.rc | 2 +- reactos/base/shell/cmd/lang/el-GR.rc | 2 +- reactos/base/shell/cmd/lang/en-US.rc | 2 +- reactos/base/shell/cmd/lang/es-ES.rc | 2 +- reactos/base/shell/cmd/lang/fr-FR.rc | 2 +- reactos/base/shell/cmd/lang/hu-HU.rc | 2 +- reactos/base/shell/cmd/lang/id-ID.rc | 2 +- reactos/base/shell/cmd/lang/it-IT.rc | 2 +- reactos/base/shell/cmd/lang/ja-JP.rc | 2 +- reactos/base/shell/cmd/lang/no-NO.rc | 2 +- reactos/base/shell/cmd/lang/pl-PL.rc | 2 +- reactos/base/shell/cmd/lang/ro-RO.rc | 2 +- reactos/base/shell/cmd/lang/ru-RU.rc | 2 +- reactos/base/shell/cmd/lang/sk-SK.rc | 2 +- reactos/base/shell/cmd/lang/sv-SE.rc | 2 +- reactos/base/shell/cmd/lang/uk-UA.rc | 2 +- reactos/base/shell/cmd/lang/zh-CN.rc | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/reactos/base/shell/cmd/lang/de-DE.rc b/reactos/base/shell/cmd/lang/de-DE.rc index 2bb27b13fd4..f6c03e9e3d6 100644 --- a/reactos/base/shell/cmd/lang/de-DE.rc +++ b/reactos/base/shell/cmd/lang/de-DE.rc @@ -633,7 +633,7 @@ STRING_CMD_ERROR4, "Ausführend %s...\n" STRING_CMD_ERROR5, "Ausführend cmdexit.bat...\n" STRING_COLOR_ERROR1, "Fehler: Hinter- und Vordergrund können nicht die selben Farben haben!" STRING_COLOR_ERROR2, "Fehler in der Farbangabe" -STRING_COLOR_ERROR3, "Farbe %x\n" +STRING_COLOR_ERROR3, "Farbe %02x\n" STRING_CONSOLE_ERROR, "Unbekannter Fehler: %d\n" STRING_COPY_ERROR1, "Fehler: Quelle kann nicht geöffnet werden - %s!\n" STRING_COPY_ERROR2, "Fehler: Kann nicht über sich selbst kopiert werden.\n" diff --git a/reactos/base/shell/cmd/lang/el-GR.rc b/reactos/base/shell/cmd/lang/el-GR.rc index c8804c43833..bee177e170a 100644 --- a/reactos/base/shell/cmd/lang/el-GR.rc +++ b/reactos/base/shell/cmd/lang/el-GR.rc @@ -633,7 +633,7 @@ STRING_CMD_ERROR4, "Εκτελείται το %s...\n" STRING_CMD_ERROR5, "Running cmdexit.bat...\n" STRING_COLOR_ERROR1, "Same colors error! (Background and foreground can't be the same color)" STRING_COLOR_ERROR2, "error in color specification" -STRING_COLOR_ERROR3, "Color %x\n" +STRING_COLOR_ERROR3, "Color %02x\n" STRING_CONSOLE_ERROR, "Άγνωστο σφάλμα: %d\n" STRING_COPY_ERROR1, "Σφάλμα: Δεν ήταν δυνατό το άνοιγμα της πηγής - %s!\n" STRING_COPY_ERROR2, "Σφάλμα: Can't copy onto itself!\n" diff --git a/reactos/base/shell/cmd/lang/en-US.rc b/reactos/base/shell/cmd/lang/en-US.rc index c36613df376..fdf87e7e257 100644 --- a/reactos/base/shell/cmd/lang/en-US.rc +++ b/reactos/base/shell/cmd/lang/en-US.rc @@ -636,7 +636,7 @@ STRING_CMD_ERROR4, "Running %s...\n" STRING_CMD_ERROR5, "Running cmdexit.bat...\n" STRING_COLOR_ERROR1, "Same colors error! (Background and foreground can't be the same color)" STRING_COLOR_ERROR2, "error in color specification" -STRING_COLOR_ERROR3, "Color %x\n" +STRING_COLOR_ERROR3, "Color %02x\n" STRING_CONSOLE_ERROR, "Unknown error: %d\n" STRING_COPY_ERROR1, "Error: Cannot open source - %s!\n" STRING_COPY_ERROR2, "Error: Can't copy onto itself!\n" diff --git a/reactos/base/shell/cmd/lang/es-ES.rc b/reactos/base/shell/cmd/lang/es-ES.rc index cd2f34cd14b..54c26add5a5 100644 --- a/reactos/base/shell/cmd/lang/es-ES.rc +++ b/reactos/base/shell/cmd/lang/es-ES.rc @@ -636,7 +636,7 @@ STRING_CMD_ERROR4, "Ejecutando %s...\n" STRING_CMD_ERROR5, "Ejecutando cmdexit.bat...\n" STRING_COLOR_ERROR1, "¡Mismos colores! (El color de frente y de fondo no pueden ser el mismo)" STRING_COLOR_ERROR2, "Error en la especificación del color" -STRING_COLOR_ERROR3, "Color %x\n" +STRING_COLOR_ERROR3, "Color %02x\n" STRING_CONSOLE_ERROR, "Error desconocido: %d\n" STRING_COPY_ERROR1, "Error: No se puede abrir el origen - %s!\n" STRING_COPY_ERROR2, "Error: ¡No se puede copiar sobre si mismo!\n" diff --git a/reactos/base/shell/cmd/lang/fr-FR.rc b/reactos/base/shell/cmd/lang/fr-FR.rc index a2bfc46ed99..f99b073b0df 100644 --- a/reactos/base/shell/cmd/lang/fr-FR.rc +++ b/reactos/base/shell/cmd/lang/fr-FR.rc @@ -651,7 +651,7 @@ STRING_CMD_ERROR4, "Lance %s...\n" STRING_CMD_ERROR5, "Lance cmdexit.bat...\n" STRING_COLOR_ERROR1, "L'arrière plan et l'avant plan ne peuvent être de la même couleur" STRING_COLOR_ERROR2, "Erreur dans la spécification des couleurs" -STRING_COLOR_ERROR3, "Couleur %x\n" +STRING_COLOR_ERROR3, "Couleur %02x\n" STRING_CONSOLE_ERROR, "Erreur inconnue : %d\n" STRING_COPY_ERROR1, "Erreur : Ne peut ouvrir la source - %s !\n" STRING_COPY_ERROR2, "Erreur : Ne peut copier le fichier sur lui-même !\n" diff --git a/reactos/base/shell/cmd/lang/hu-HU.rc b/reactos/base/shell/cmd/lang/hu-HU.rc index 95d4d4e250d..71986d9f515 100644 --- a/reactos/base/shell/cmd/lang/hu-HU.rc +++ b/reactos/base/shell/cmd/lang/hu-HU.rc @@ -615,7 +615,7 @@ STRING_CMD_ERROR4, "%s futtatása...\n" STRING_CMD_ERROR5, "cmdexit.bat futtatása...\n" STRING_COLOR_ERROR1, "Ugyanaz a szín nem lehet! (Az elõ- és háttérszín nem lehet ugyanolyan)" STRING_COLOR_ERROR2, "Hibás szín megadás" -STRING_COLOR_ERROR3, "Szín %x\n" +STRING_COLOR_ERROR3, "Szín %02x\n" STRING_CONSOLE_ERROR, "Ismeretlen hiba: %d\n" STRING_COPY_ERROR1, "Hiba: a forrás nem nyitható meg - %s!\n" STRING_COPY_ERROR2, "Hiba: nem másolhatod önmagára az állományt!\n" diff --git a/reactos/base/shell/cmd/lang/id-ID.rc b/reactos/base/shell/cmd/lang/id-ID.rc index 2cf58e973d4..1bdc3675528 100644 --- a/reactos/base/shell/cmd/lang/id-ID.rc +++ b/reactos/base/shell/cmd/lang/id-ID.rc @@ -635,7 +635,7 @@ STRING_CMD_ERROR4, "Menjalankan %s...\n" STRING_CMD_ERROR5, "Menjalankan cmdexit.bat...\n" STRING_COLOR_ERROR1, "Warna sama salah! (Latar belakang dan latar depan tidak bisa berwarna sama)" STRING_COLOR_ERROR2, "Kesalahan dalam spesifikasi warna" -STRING_COLOR_ERROR3, "Warna %x\n" +STRING_COLOR_ERROR3, "Warna %02x\n" STRING_CONSOLE_ERROR, "Kesalahan tidak dikenal: %d\n" STRING_COPY_ERROR1, "Salah: Tidak dapat membuka sumber - %s!\n" STRING_COPY_ERROR2, "Salah: Tidak dapat mengcopy ke dirinya sendiri!\n" diff --git a/reactos/base/shell/cmd/lang/it-IT.rc b/reactos/base/shell/cmd/lang/it-IT.rc index b5ad2091cb9..fafbcbea229 100644 --- a/reactos/base/shell/cmd/lang/it-IT.rc +++ b/reactos/base/shell/cmd/lang/it-IT.rc @@ -641,7 +641,7 @@ STRING_CMD_ERROR4, "Esecuzione di %s...\n" STRING_CMD_ERROR5, "Esecuzione di cmdexit.bat...\n" STRING_COLOR_ERROR1, "Il colore di primo piano e sfondo non possono essere uguali" STRING_COLOR_ERROR2, "errore nella indicazione dei colori" -STRING_COLOR_ERROR3, "Colore %x\n" +STRING_COLOR_ERROR3, "Colore %02x\n" STRING_CONSOLE_ERROR, "errore sconosciuto: %d\n" STRING_COPY_ERROR1, "Errore: Impossibile aprire il file sorgente - %s!\n" STRING_COPY_ERROR2, "Errore: Impossibile copiare un file su se stesso!\n" diff --git a/reactos/base/shell/cmd/lang/ja-JP.rc b/reactos/base/shell/cmd/lang/ja-JP.rc index e92de63ce7f..e4ad3487d7e 100644 --- a/reactos/base/shell/cmd/lang/ja-JP.rc +++ b/reactos/base/shell/cmd/lang/ja-JP.rc @@ -641,7 +641,7 @@ STRING_CMD_ERROR4, "%s を実行しています...\n" STRING_CMD_ERROR5, "cmdexit.bat を実行しています...\n" STRING_COLOR_ERROR1, "エラー! 同じ色が指定されました。\n (前景色と背景色を同じ色にすることはできません)" STRING_COLOR_ERROR2, "色の指定に問題があります。" -STRING_COLOR_ERROR3, "Color %x\n" +STRING_COLOR_ERROR3, "Color %02x\n" STRING_CONSOLE_ERROR, "不明なエラー: %d\n" STRING_COPY_ERROR1, "エラー: 元のファイル %s を開けません!\n" STRING_COPY_ERROR2, "エラー: コピー元とコピー先が一緒です!\n" diff --git a/reactos/base/shell/cmd/lang/no-NO.rc b/reactos/base/shell/cmd/lang/no-NO.rc index d3680895ac7..3777833726a 100644 --- a/reactos/base/shell/cmd/lang/no-NO.rc +++ b/reactos/base/shell/cmd/lang/no-NO.rc @@ -628,7 +628,7 @@ STRING_CMD_ERROR4, "Kjører %s...\n" STRING_CMD_ERROR5, "Kjører cmdexit.bat...\n" STRING_COLOR_ERROR1, "Samme farge feil! (Bakgrunn og forgrunn kan ikke ha samme farge)" STRING_COLOR_ERROR2, "feil i farge spesifikasjon" -STRING_COLOR_ERROR3, "Farge %x\n" +STRING_COLOR_ERROR3, "Farge %02x\n" STRING_CONSOLE_ERROR, "Ukjent feil: %d\n" STRING_COPY_ERROR1, "Feil: kan ikke åpne kilden - %s!\n" STRING_COPY_ERROR2, "Feil: kan ikke kopiere til seg selv!\n" diff --git a/reactos/base/shell/cmd/lang/pl-PL.rc b/reactos/base/shell/cmd/lang/pl-PL.rc index d4433f51c18..686e0be74ae 100644 --- a/reactos/base/shell/cmd/lang/pl-PL.rc +++ b/reactos/base/shell/cmd/lang/pl-PL.rc @@ -636,7 +636,7 @@ STRING_CMD_ERROR4, "Wykonywanie %s...\n" STRING_CMD_ERROR5, "Wykonywanie cmdexit.bat...\n" STRING_COLOR_ERROR1, "Błąd! Kolor tła i tekstu nie może być taki sam" STRING_COLOR_ERROR2, "Błąd w oznaczeniu kolorów." -STRING_COLOR_ERROR3, "Kolor %x\n" +STRING_COLOR_ERROR3, "Kolor %02x\n" STRING_CONSOLE_ERROR, "Nieznany błąd: %d\n" STRING_COPY_ERROR1, "Błąd: Nie można otworzyć źródła - %s!\n" STRING_COPY_ERROR2, "Błąd: Nie można przekopiować pliku na niego samego!\n" diff --git a/reactos/base/shell/cmd/lang/ro-RO.rc b/reactos/base/shell/cmd/lang/ro-RO.rc index 66e548846d5..629bd780ff0 100644 --- a/reactos/base/shell/cmd/lang/ro-RO.rc +++ b/reactos/base/shell/cmd/lang/ro-RO.rc @@ -680,7 +680,7 @@ STRING_CMD_ERROR4, "Executare «%s»...\n" STRING_CMD_ERROR5, "Executare «cmdexit.bat»...\n" STRING_COLOR_ERROR1, "Eroare de culoare identică! (Culorile nu trebuie să fie identice)" STRING_COLOR_ERROR2, "Eroare la specificarea culorii" -STRING_COLOR_ERROR3, "Culoare %x\n" +STRING_COLOR_ERROR3, "Culoare %02x\n" STRING_CONSOLE_ERROR, "Eroare necunoscută: %d\n" STRING_COPY_ERROR1, "Eroare: Nu se poate deschide fișierul - «%s»!\n" STRING_COPY_ERROR2, "Eroare: Nu se poate copia peste el însuși!\n" diff --git a/reactos/base/shell/cmd/lang/ru-RU.rc b/reactos/base/shell/cmd/lang/ru-RU.rc index 694c77f08a9..9af2ac35276 100644 --- a/reactos/base/shell/cmd/lang/ru-RU.rc +++ b/reactos/base/shell/cmd/lang/ru-RU.rc @@ -640,7 +640,7 @@ STRING_CMD_ERROR4, "Запуск %s...\n" STRING_CMD_ERROR5, "Запуск cmdexit.bat...\n" STRING_COLOR_ERROR1, "Одинаковые цвета! (Цвета фона и текста не могут быть одинаковыми)" STRING_COLOR_ERROR2, "ошибка в указании цвета" -STRING_COLOR_ERROR3, "Цвет %x\n" +STRING_COLOR_ERROR3, "Цвет %02x\n" STRING_CONSOLE_ERROR, "Неизвестная ошибка: %d\n" STRING_COPY_ERROR1, "Ошибка: Невозможно открыть источник - %s!\n" STRING_COPY_ERROR2, "Ошибка: Невозможно копировать в себя!\n" diff --git a/reactos/base/shell/cmd/lang/sk-SK.rc b/reactos/base/shell/cmd/lang/sk-SK.rc index 640725245d4..83fb1f85b59 100644 --- a/reactos/base/shell/cmd/lang/sk-SK.rc +++ b/reactos/base/shell/cmd/lang/sk-SK.rc @@ -640,7 +640,7 @@ STRING_CMD_ERROR4, "Running %s...\n" STRING_CMD_ERROR5, "Running cmdexit.bat...\n" STRING_COLOR_ERROR1, "Same colors error! (Background and foreground can't be the same color)" STRING_COLOR_ERROR2, "error in color specification" -STRING_COLOR_ERROR3, "Color %x\n" +STRING_COLOR_ERROR3, "Color %02x\n" STRING_CONSOLE_ERROR, "Neznáma chyba: %d\n" STRING_COPY_ERROR1, "Chyba: Cannot open source - %s!\n" STRING_COPY_ERROR2, "Chyba: Can't copy onto itself!\n" diff --git a/reactos/base/shell/cmd/lang/sv-SE.rc b/reactos/base/shell/cmd/lang/sv-SE.rc index 38e59b1377b..5ca41019278 100644 --- a/reactos/base/shell/cmd/lang/sv-SE.rc +++ b/reactos/base/shell/cmd/lang/sv-SE.rc @@ -628,7 +628,7 @@ STRING_CMD_ERROR4, "Kör %s...\n" STRING_CMD_ERROR5, "Kör cmdexit.bat...\n" STRING_COLOR_ERROR1, "Samme farge feil! (Bakgrunn och forgrunn kan inte ha samme farge)" STRING_COLOR_ERROR2, "feil i farge spesifikasjon" -STRING_COLOR_ERROR3, "Farge %x\n" +STRING_COLOR_ERROR3, "Farge %02x\n" STRING_CONSOLE_ERROR, "Ukjent feil: %d\n" STRING_COPY_ERROR1, "Feil: kan inte åpne kilden - %s!\n" STRING_COPY_ERROR2, "Feil: kan inte kopiere til seg selv!\n" diff --git a/reactos/base/shell/cmd/lang/uk-UA.rc b/reactos/base/shell/cmd/lang/uk-UA.rc index b5b24678f86..9f80c74d12b 100644 --- a/reactos/base/shell/cmd/lang/uk-UA.rc +++ b/reactos/base/shell/cmd/lang/uk-UA.rc @@ -642,7 +642,7 @@ STRING_CMD_ERROR4, "Запуск %s...\n" STRING_CMD_ERROR5, "Запуск cmdexit.bat...\n" STRING_COLOR_ERROR1, "помилка - однаковi кольори! (тло та текст не можуть бути однакового кольору)" STRING_COLOR_ERROR2, "помилка при вказаннi кольору" -STRING_COLOR_ERROR3, "Колiр %x\n" +STRING_COLOR_ERROR3, "Колiр %02x\n" STRING_CONSOLE_ERROR, "Невiдома помилка: %d\n" STRING_COPY_ERROR1, "Помилка: Неможливо вiдкрити джерело - %s!\n" STRING_COPY_ERROR2, "Помилка: Неможливо копiювати в себе!\n" diff --git a/reactos/base/shell/cmd/lang/zh-CN.rc b/reactos/base/shell/cmd/lang/zh-CN.rc index ecc40755e54..195529e5176 100644 --- a/reactos/base/shell/cmd/lang/zh-CN.rc +++ b/reactos/base/shell/cmd/lang/zh-CN.rc @@ -600,7 +600,7 @@ STRING_CMD_ERROR4, "正在运行 %s...\n" STRING_CMD_ERROR5, "正在运行 cmdexit.bat...\n" STRING_COLOR_ERROR1, "同样颜色错误！ (背景和前景不能同色)" STRING_COLOR_ERROR2, "颜色指定错误" -STRING_COLOR_ERROR3, "颜色 %x\n" +STRING_COLOR_ERROR3, "颜色 %02x\n" STRING_CONSOLE_ERROR, "未知错误：%d\n" STRING_COPY_ERROR1, "错误：无法打开源 - %s！\n" STRING_COPY_ERROR2, "错误：无法复制到自身！\n"