Author: hbelusca Date: Sat Jun 1 18:45:04 2013 New Revision: 59132 URL: http://svn.reactos.org/svn/reactos?rev=59132&view=rev Log: [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.
Patch by Radek Liška CORE-7246 #resolve #comment Committed in revision r59132. Thanks :) Modified: trunk/reactos/base/shell/cmd/lang/de-DE.rc trunk/reactos/base/shell/cmd/lang/el-GR.rc trunk/reactos/base/shell/cmd/lang/en-US.rc trunk/reactos/base/shell/cmd/lang/es-ES.rc trunk/reactos/base/shell/cmd/lang/fr-FR.rc trunk/reactos/base/shell/cmd/lang/hu-HU.rc trunk/reactos/base/shell/cmd/lang/id-ID.rc trunk/reactos/base/shell/cmd/lang/it-IT.rc trunk/reactos/base/shell/cmd/lang/ja-JP.rc trunk/reactos/base/shell/cmd/lang/no-NO.rc trunk/reactos/base/shell/cmd/lang/pl-PL.rc trunk/reactos/base/shell/cmd/lang/ro-RO.rc trunk/reactos/base/shell/cmd/lang/ru-RU.rc trunk/reactos/base/shell/cmd/lang/sk-SK.rc trunk/reactos/base/shell/cmd/lang/sv-SE.rc trunk/reactos/base/shell/cmd/lang/uk-UA.rc trunk/reactos/base/shell/cmd/lang/zh-CN.rc Modified: trunk/reactos/base/shell/cmd/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/de-DE.rc?rev=59132&r1=59131&r2=59132&view=diff ============================================================================== --- trunk/reactos/base/shell/cmd/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/de-DE.rc [iso-8859-1] Sat Jun 1 18:45:04 2013 @@ -633,7 +633,7 @@ 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" Modified: trunk/reactos/base/shell/cmd/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/el-GR.rc?rev=59132&r1=59131&r2=59132&view=diff ============================================================================== --- trunk/reactos/base/shell/cmd/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/el-GR.rc [iso-8859-1] Sat Jun 1 18:45:04 2013 @@ -633,7 +633,7 @@ 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" Modified: trunk/reactos/base/shell/cmd/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/en-US.rc?rev=59132&r1=59131&r2=59132&view=diff ============================================================================== --- trunk/reactos/base/shell/cmd/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/en-US.rc [iso-8859-1] Sat Jun 1 18:45:04 2013 @@ -636,7 +636,7 @@ 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" Modified: trunk/reactos/base/shell/cmd/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/es-ES.rc?rev=59132&r1=59131&r2=59132&view=diff ============================================================================== --- trunk/reactos/base/shell/cmd/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/es-ES.rc [iso-8859-1] Sat Jun 1 18:45:04 2013 @@ -636,7 +636,7 @@ 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" Modified: trunk/reactos/base/shell/cmd/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/fr-FR.rc?rev=59132&r1=59131&r2=59132&view=diff ============================================================================== --- trunk/reactos/base/shell/cmd/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/fr-FR.rc [iso-8859-1] Sat Jun 1 18:45:04 2013 @@ -651,7 +651,7 @@ 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" Modified: trunk/reactos/base/shell/cmd/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/hu-HU.rc?rev=59132&r1=59131&r2=59132&view=diff ============================================================================== --- trunk/reactos/base/shell/cmd/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/hu-HU.rc [iso-8859-1] Sat Jun 1 18:45:04 2013 @@ -615,7 +615,7 @@ 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" Modified: trunk/reactos/base/shell/cmd/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/id-ID.rc?rev=59132&r1=59131&r2=59132&view=diff ============================================================================== --- trunk/reactos/base/shell/cmd/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/id-ID.rc [iso-8859-1] Sat Jun 1 18:45:04 2013 @@ -635,7 +635,7 @@ 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" Modified: trunk/reactos/base/shell/cmd/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/it-IT.rc?rev=59132&r1=59131&r2=59132&view=diff ============================================================================== --- trunk/reactos/base/shell/cmd/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/it-IT.rc [iso-8859-1] Sat Jun 1 18:45:04 2013 @@ -641,7 +641,7 @@ 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" Modified: trunk/reactos/base/shell/cmd/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ja-JP.rc?rev=59132&r1=59131&r2=59132&view=diff ============================================================================== --- trunk/reactos/base/shell/cmd/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/ja-JP.rc [iso-8859-1] Sat Jun 1 18:45:04 2013 @@ -641,7 +641,7 @@ 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" Modified: trunk/reactos/base/shell/cmd/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/no-NO.rc?rev=59132&r1=59131&r2=59132&view=diff ============================================================================== --- trunk/reactos/base/shell/cmd/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/no-NO.rc [iso-8859-1] Sat Jun 1 18:45:04 2013 @@ -628,7 +628,7 @@ 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" Modified: trunk/reactos/base/shell/cmd/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/pl-PL.rc?rev=59132&r1=59131&r2=59132&view=diff ============================================================================== --- trunk/reactos/base/shell/cmd/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/pl-PL.rc [iso-8859-1] Sat Jun 1 18:45:04 2013 @@ -636,7 +636,7 @@ 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" Modified: trunk/reactos/base/shell/cmd/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ro-RO.rc?rev=59132&r1=59131&r2=59132&view=diff ============================================================================== --- trunk/reactos/base/shell/cmd/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/ro-RO.rc [iso-8859-1] Sat Jun 1 18:45:04 2013 @@ -680,7 +680,7 @@ 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" Modified: trunk/reactos/base/shell/cmd/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ru-RU.rc?rev=59132&r1=59131&r2=59132&view=diff ============================================================================== --- trunk/reactos/base/shell/cmd/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/ru-RU.rc [iso-8859-1] Sat Jun 1 18:45:04 2013 @@ -640,7 +640,7 @@ 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" Modified: trunk/reactos/base/shell/cmd/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/sk-SK.rc?rev=59132&r1=59131&r2=59132&view=diff ============================================================================== --- trunk/reactos/base/shell/cmd/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/sk-SK.rc [iso-8859-1] Sat Jun 1 18:45:04 2013 @@ -640,7 +640,7 @@ 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" Modified: trunk/reactos/base/shell/cmd/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/sv-SE.rc?rev=59132&r1=59131&r2=59132&view=diff ============================================================================== --- trunk/reactos/base/shell/cmd/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/sv-SE.rc [iso-8859-1] Sat Jun 1 18:45:04 2013 @@ -628,7 +628,7 @@ 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" Modified: trunk/reactos/base/shell/cmd/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/uk-UA.rc?rev=59132&r1=59131&r2=59132&view=diff ============================================================================== --- trunk/reactos/base/shell/cmd/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/uk-UA.rc [iso-8859-1] Sat Jun 1 18:45:04 2013 @@ -642,7 +642,7 @@ 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" Modified: trunk/reactos/base/shell/cmd/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/zh-CN.rc?rev=59132&r1=59131&r2=59132&view=diff ============================================================================== --- trunk/reactos/base/shell/cmd/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/zh-CN.rc [iso-8859-1] Sat Jun 1 18:45:04 2013 @@ -600,7 +600,7 @@ 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"