From: Hermès Bélusca-Maïto Date: Sat, 30 Sep 2017 09:50:08 +0000 (+0000) Subject: [CMD]: Fix translations for the COLOR command. X-Git-Tag: 0.4.8-dev~247 X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=ff79952c22ba175e7eb0c9a63540e2fc72ac6150 [CMD]: Fix translations for the COLOR command. For few translations, the COLOR command help contained a deprecated /F switch, which was changed long time ago to the /-F switch ("Does not fill the console blank space with color attribute"). Also, remove a now-unneeded localized informative string for the COLOR command (which rendered it Windows-incompatible). svn path=/trunk/; revision=75994 --- diff --git a/reactos/base/shell/cmd/color.c b/reactos/base/shell/cmd/color.c index cce61831aa7..42995fd26df 100644 --- a/reactos/base/shell/cmd/color.c +++ b/reactos/base/shell/cmd/color.c @@ -73,7 +73,7 @@ INT CommandColor(LPTSTR rest) /* Let's prepare %ERRORLEVEL% */ nErrorLevel = 0; - /* No parameter. Set the default colors */ + /* No parameter: Set the default colors */ if (rest[0] == _T('\0')) { SetScreenColor(wDefColor, FALSE); @@ -111,11 +111,7 @@ INT CommandColor(LPTSTR rest) return 1; } - /* Print the chosen color if we are in echo mode (NOTE: Not Windows-compliant) */ - if ((bc && bc->bEcho) || !bc) - { - ConErrResPrintf(STRING_COLOR_ERROR3, wColor); - } + TRACE("Color %02x\n", wColor); /* * Set the chosen color. Use also the following advanced flag: diff --git a/reactos/base/shell/cmd/lang/cs-CZ.rc b/reactos/base/shell/cmd/lang/cs-CZ.rc index 38bdd1884c6..805a638a987 100644 --- a/reactos/base/shell/cmd/lang/cs-CZ.rc +++ b/reactos/base/shell/cmd/lang/cs-CZ.rc @@ -76,9 +76,9 @@ CMD [/[C|K] command][/P][/Q][/T:bf]\n\n\ (cannot be terminated).\n\ /T:bf Sets the background/foreground color (see COLOR command).\n" STRING_COLOR_HELP1 "Sets the default foreground and background colors.\n\n\ -COLOR [attr [/-F]] \n\n\ - attr Specifies color attribute of console output\n\ - /-F Does not fill the console blank space with color attribute\n\n\ +COLOR [attr [/-F]]\n\n\ + attr Specifies color attribute of console output.\n\ + /-F Does not fill the console blank space with color attribute.\n\n\ There are three ways to specify the colors:\n\ 1) [bright] name on [bright] name (only the first three letters are required)\n\ 2) decimal on decimal\n\ @@ -479,8 +479,7 @@ title new title\n" STRING_CMD_ERROR4 "SpouÅ¡tí se %s...\n" STRING_CMD_ERROR5 "SpouÅ¡tí se cmdexit.bat...\n" STRING_COLOR_ERROR1 "Chyba stejných barev! (Pozadí a popředí nemohou mít stejnou barvu)" - STRING_COLOR_ERROR2 "chyba ve specifikaci barvy" - STRING_COLOR_ERROR3 "Barva %02x\n" + STRING_COLOR_ERROR2 "Chyba ve specifikaci barvy" STRING_CONSOLE_ERROR "Neznámá chyba: %d\n" STRING_COPY_ERROR1 "Chyba: Nelze otevřít zdroj - %s!\n" STRING_COPY_ERROR2 "Chyba: Zdroj a cíl jsou shodné!\n" diff --git a/reactos/base/shell/cmd/lang/de-DE.rc b/reactos/base/shell/cmd/lang/de-DE.rc index 2057c3b709c..5c4ea5031c2 100644 --- a/reactos/base/shell/cmd/lang/de-DE.rc +++ b/reactos/base/shell/cmd/lang/de-DE.rc @@ -74,9 +74,9 @@ CMD [/[C|K] Befehl][/P][/Q][/T:bf]\n\n\ (kann nicht beendet werden).\n\ /T:bf Ändert die Hintergrund- und Vordergrund-Farbe (siehe COLOR Befehl)." STRING_COLOR_HELP1 "Legt die Standardhinter- und Vordergrundfarben für die Konsole fest.\n\n\ -COLOR [attr [/F]] \n\n\ +COLOR [attr [/-F]]\n\n\ attr Gibt die Farbattribute für die Konsolenausgabe an.\n\ - /F Füllt die Konsolenausgabe mit dem Farbattribut\n\n\ + /-F Füllt nicht die Konsolenausgabe mit dem Farbattribut.\n\n\ Es gibt 2 Möglichkeiten, die Farben festzulegen:\n\ 2) Zwei Dezimalzahlen\n\ 3) Zwei Hexadezimalziffern\n\n\ @@ -474,7 +474,6 @@ Titel neuer Titel" 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 %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 acab5a092a4..086718716f4 100644 --- a/reactos/base/shell/cmd/lang/el-GR.rc +++ b/reactos/base/shell/cmd/lang/el-GR.rc @@ -76,9 +76,9 @@ CMD [/[C|K] εντολή][/P][/Q][/T:bf]\n\n\ (δε μπορεί να τερματιστεί).\n\ /T:bf Ορίζει το χρώμα φόντου/πρώτου πλάνου (βλέπε την COLOR εντολή).\n" STRING_COLOR_HELP1 "Ορίζει τα προεπιλεγμένα χρώματα πρώτου πλάνου και φόντου για την κονσόλα.\n\n\ -COLOR [χαρακτηριστικό [/-F]] \n\n\ - χαρακτηριστικό Καθορίζει το χαρακτηριστικό χρώματος για την έξοδο της κονσόλας\n\ - /-F Does not fill the console blank space with color attribute\n\n\ +COLOR [χαρακτηριστικό [/-F]]\n\n\ + χαρακτηριστικό Καθορίζει το χαρακτηριστικό χρώματος για την έξοδο της κονσόλας.\n\ + /-F Does not fill the console blank space with color attribute.\n\n\ Υπάρχουν 3 τρόποι για να οριστούν τα χρώματα:\n\ 1) [ανοιχτό] όνομα σε [ανοιχτό] όνομα (μόνο τα πρώτα τρία γράμματα απαιτούνται)\n\ 2) δεκαδικό σε δεκαδικό\n\ @@ -478,8 +478,7 @@ title new title\n" 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 %02x\n" + STRING_COLOR_ERROR2 "Error in color specification" 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 e77e00108ec..b287bfa9790 100644 --- a/reactos/base/shell/cmd/lang/en-US.rc +++ b/reactos/base/shell/cmd/lang/en-US.rc @@ -71,9 +71,9 @@ CMD [/[C|K] command][/P][/Q][/T:bf]\n\n\ (cannot be terminated).\n\ /T:bf Sets the background/foreground color (see COLOR command).\n" STRING_COLOR_HELP1 "Sets the default foreground and background colors.\n\n\ -COLOR [attr [/-F]] \n\n\ - attr Specifies color attribute of console output\n\ - /-F Does not fill the console blank space with color attribute\n\n\ +COLOR [attr [/-F]]\n\n\ + attr Specifies color attribute of console output.\n\ + /-F Does not fill the console blank space with color attribute.\n\n\ There are three ways to specify the colors:\n\ 1) [bright] name on [bright] name (only the first three letters are required)\n\ 2) decimal on decimal\n\ @@ -474,8 +474,7 @@ title new title\n" 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 %02x\n" + STRING_COLOR_ERROR2 "Error in color specification" 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 014d87de736..a3c5da6af8e 100644 --- a/reactos/base/shell/cmd/lang/es-ES.rc +++ b/reactos/base/shell/cmd/lang/es-ES.rc @@ -73,7 +73,7 @@ CMD [/[C|K] command][/P][/Q][/T:bf]\n\n\ (no puede ser cerrado).\n\ /T:bf Configura el color de fondo/primer plano (mirar el comando COLOR).\n" STRING_COLOR_HELP1 "Configura el color de primer plano y fondo.\n\n\ -COLOR [attr [/-F]] \n\n\ +COLOR [attr [/-F]]\n\n\ attr Especifica el atributo de color de salida de consola.\n\ /-F No rellena el espacio en blanco de la consola con el color del atributo.\n\n\ Hay tres maneras de especificar los colores:\n\ @@ -477,7 +477,6 @@ title Nuevo título\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 %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 dec8e3243f3..d4b02b6d0e2 100644 --- a/reactos/base/shell/cmd/lang/fr-FR.rc +++ b/reactos/base/shell/cmd/lang/fr-FR.rc @@ -76,9 +76,9 @@ CMD [/[C|K] commande][/P][/Q][/T:ap]\n\n\ /T:ap Changer la couleur d'arrière/premier plan\n\ (voir la commande COLOR.)" STRING_COLOR_HELP1 "Change les couleurs de premier et d'arrière plan.\n\n\ -COLOR [attr [/F]] \n\n\ - attr Spécifie l'attribut des couleurs de la console\n\ - /F remplit la console avec l'attribut de couleur\n\n\ +COLOR [attr [/-F]]\n\n\ + attr Spécifie l'attribut de couleur de la console.\n\ + /-F Ne remplit pas les espaces blancs avec l'attribut de couleur.\n\n\ Il y a trois façons de spécifier les couleurs :\n\ 1) [bright] nom on [bright] nom (seules les trois premières lettres \n\ sont nécessaires)\n\ @@ -489,7 +489,6 @@ titre titre de la fenêtre" 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 %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 bd458b136fc..bc8b83a375f 100644 --- a/reactos/base/shell/cmd/lang/hu-HU.rc +++ b/reactos/base/shell/cmd/lang/hu-HU.rc @@ -70,9 +70,9 @@ CMD [/[C|K] parancs][/P][/Q][/T:eh]\n\n\ /P Értelmezi az autoexec.bat állományt és a memóriában marad.\n\ /T:eh COLOR parancs használata.\n" STRING_COLOR_HELP1 "A konzol elõ- és háttérszínét állítja be.\n\n\ -COLOR [eh [/-F]] \n\n\ +COLOR [eh [/-F]]\n\n\ eh A konzol elõ- és háttérszínét állítja be.\n\ - /-F Nem frissíti az egész képernyõt\n\n\ + /-F Nem frissíti az egész képernyõt.\n\n\ A színt két hexadecimális számjeggyel lehet beállítani\n\n\ Az elérhetõ színek:\n\ hex név hex név\n\ @@ -459,7 +459,6 @@ title new title\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 %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 9cebf5cfe61..7f67f230b2c 100644 --- a/reactos/base/shell/cmd/lang/id-ID.rc +++ b/reactos/base/shell/cmd/lang/id-ID.rc @@ -73,9 +73,9 @@ CMD [/[C|K] command][/P][/Q][/T:bf]\n\n\ (tidak bisa diakhiri).\n\ /T:bf Menyetel warna latar belakang/depan (lihat perintah COLOR).\n" STRING_COLOR_HELP1 "Menyetel warna standar latar belakang dan depan.\n\n\ -COLOR [attr [/-F]] \n\n\ - attr Menetapkan atribut warna output konsol\n\ - /-F Tidak memenuhi ruang kosong konsol dengan atribut warna\n\n\ +COLOR [attr [/-F]]\n\n\ + attr Menetapkan atribut warna output konsol.\n\ + /-F Tidak memenuhi ruang kosong konsol dengan atribut warna.\n\n\ Ada tiga cara untuk menetapkan warna:\n\ 1) [bright] nama pada [bright] nama (hanya tiga huruf pertama yang dipakai)\n\ 2) desimal pada desimal\n\ @@ -474,7 +474,6 @@ title judul baru\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 %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 585e6a6afb8..1f23d5e3182 100644 --- a/reactos/base/shell/cmd/lang/it-IT.rc +++ b/reactos/base/shell/cmd/lang/it-IT.rc @@ -71,9 +71,9 @@ CMD [/[C|K] comando][/P][/Q][/T:bf]\n\n\ /T:bf Definisce i colori di primo piano e sfondo\n\ (vedi anche il comando COLOR).\n" STRING_COLOR_HELP1 "Definisce i colori predefiniti di primo piano e sfondo.\n\n\ -COLOR [attr [/-F]] \n\n\ - attr Indica gli attributi di colore per i messaggi su console\n\ - /-F Non riempie lo spazio vuoto della console con gli attributi di colore\n\n\ +COLOR [attr [/-F]]\n\n\ + attr Indica gli attributi di colore per i messaggi su console.\n\ + /-F Non riempie lo spazio vuoto della console con gli attributi di colore.\n\n\ Ci sono tre modi per indicare i colori:\n\ 1) [bright] nome su [bright] nome (sono necessarie solo le prime tre lettere)\n\ 2) decimale su decimale\n\ @@ -484,9 +484,8 @@ titolo il nuovo titolo\n" 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 %02x\n" - STRING_CONSOLE_ERROR "errore sconosciuto: %d\n" + STRING_COLOR_ERROR2 "Errore nella indicazione dei colori" + 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" STRING_COPY_ERROR3 "Errore durante la scrittura della destinazione!\n" diff --git a/reactos/base/shell/cmd/lang/ja-JP.rc b/reactos/base/shell/cmd/lang/ja-JP.rc index 749f207bfe9..70af6baa4d0 100644 --- a/reactos/base/shell/cmd/lang/ja-JP.rc +++ b/reactos/base/shell/cmd/lang/ja-JP.rc @@ -72,7 +72,7 @@ CMD [/[C|K] コマンド][/P][/Q][/T:bf]\n\n\ /T:bf 前景色および背景色を設定します \n\ (詳細は COLOR /? を参照してください)。\n" STRING_COLOR_HELP1 "コンソールのデフォルトの前景色および背景色を設定します。\n\n\ -COLOR [属性 [/-F]] \n\n\ +COLOR [属性 [/-F]]\n\n\ 属性 コンソール出力の色属性を指定します。\n\ /-F コンソールの空いている空間には色属性を適用しない。\n\n\ 色は次の 3 種類の方法で指定することができます。\n\ @@ -482,7 +482,6 @@ RESTORE ウィンドウを元のサイズに戻します。\n\ STRING_CMD_ERROR5 "cmdexit.bat を実行しています...\n" STRING_COLOR_ERROR1 "エラー! 同じ色が指定されました。\n (前景色と背景色を同じ色にすることはできません)" STRING_COLOR_ERROR2 "色の指定に問題があります。" - 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 5be546459e6..54bfa30c45e 100644 --- a/reactos/base/shell/cmd/lang/no-NO.rc +++ b/reactos/base/shell/cmd/lang/no-NO.rc @@ -71,9 +71,9 @@ CMD [/[C|K] kommando][/P][/Q][/T:bf]\n\n\ (kan ikke avsluttes).\n\ /T:bf Velg bakgrunn/forgrunn farge (se COLOR kommando).\n" STRING_COLOR_HELP1 "Velg standard forgrunns- og bakgrunnsfarger.\n\n\ -COLOR [attr [/-F]] \n\n\ - attr Spesifisere fargeattributter for konsollteksten\n\ - /-F Fyller ikke blank plass med fargeattributter\n\n\ +COLOR [attr [/-F]]\n\n\ + attr Spesifisere fargeattributter for konsollteksten.\n\ + /-F Fyller ikke blank plass med fargeattributter.\n\n\ Det er tre nÃ¥ter Ã¥ spesifisere fargene:\n\ 1) [bright] navn pÃ¥ [bright] navn (bare de tre første bokstaver er krevet)\n\ 2) desimal pÃ¥ desimal\n\ @@ -472,8 +472,7 @@ tittel ny tittel\n" 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 %02x\n" + STRING_COLOR_ERROR2 "Feil i farge spesifikasjon" 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 959a5175c98..0c64c069e32 100644 --- a/reactos/base/shell/cmd/lang/pl-PL.rc +++ b/reactos/base/shell/cmd/lang/pl-PL.rc @@ -80,9 +80,9 @@ CMD [/[C|K] komenda][/P][/Q][/T:bf]\n\n\ (okno nie może zostać zamknięte).\n\ /T:bf Ustawia kolor tła/tekstu (patrz komenda COLOR).\n" STRING_COLOR_HELP1 "Ustawia domyślny kolor tła i tekstu.\n\n\ -COLOR [atr [/-F]] \n\n\ - atr Ustawienia koloru \n\ - /-F Nie uzupełnia kolorem pustych przestrzeni w konsoli\n\n\ +COLOR [atr [/-F]]\n\n\ + atr Ustawienia koloru.\n\ + /-F Nie uzupełnia kolorem pustych przestrzeni w konsoli.\n\n\ Ustawienia koloru można wyznaczyć na trzy sposoby:\n\ 1) [jasny] nazwa on [jasny] nazwa (wystarczą pierwsze trzy litery nazwy)\n\ 2) numer_dec on numer_dec\n\ @@ -479,7 +479,6 @@ title nowy tytuł okna\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 %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 95578f3ae61..92ea9ac0c54 100644 --- a/reactos/base/shell/cmd/lang/ro-RO.rc +++ b/reactos/base/shell/cmd/lang/ro-RO.rc @@ -74,9 +74,9 @@ CMD [/[C|K] comandă][/P][/Q][/T:culori]\n\n\ /T:culori Stabilește culorile pentru text și fundal\n\ (a se vedea comanda COLOR).\n" STRING_COLOR_HELP1 "Stabilește culorile implicite pentru text și fundal.\n\n\ -COLOR [attr [/-F]] \n\n\ - attr Atributele de culoare pentru consolă\n\ - /-F Omite umplerea spațiului gol al consolei\n\n\ +COLOR [attr [/-F]]\n\n\ + attr Atributele de culoare pentru consolă.\n\ + /-F Omite umplerea spațiului gol al consolei.\n\n\ Există trei moduri de formulare a atributelor de culoare:\n\ 1) nume_englez ON nume_englez\n\ (sunt suficiente doar primele trei litere per cuvânt)\n\ @@ -506,7 +506,6 @@ titlu Noul titlu.\n" STRING_CMD_ERROR5 "«cmdexit.bat» în execuție...\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 %02x\n" STRING_CONSOLE_ERROR "Eroare necunoscută: %d\n" STRING_COPY_ERROR1 "Eroare: Fișierul - «%s» nu a putut fi deschis!\n" STRING_COPY_ERROR2 "Eroare: Nu poate fi copiat 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 be820011e59..ee3b16a22f2 100644 --- a/reactos/base/shell/cmd/lang/ru-RU.rc +++ b/reactos/base/shell/cmd/lang/ru-RU.rc @@ -73,9 +73,9 @@ CMD [/[C|K] команда][/P][/Q][/T:bf]\n\n\ (процесс неможет быть завершен).\n\ /T:bf Выбор цвета текста/фона (более подробно см. COLOR /?).\n" STRING_COLOR_HELP1 "Установка цветов по умолчанию для текста и фона.\n\n\ -COLOR [цвета [/-F]] \n\n\ - цвета Атрибуты цветов для текстовых окон\n\ - /-F Не заливать незаполненные места цветом\n\n\ +COLOR [цвета [/-F]]\n\n\ + цвета Атрибуты цветов для текстовых окон.\n\ + /-F Не заливать незаполненные места цветом.\n\n\ Есть три способа обозначать цвета:\n\ 1) по названию на английском языке (требуются только первые три буквы цвета)\n\ 2) в виде десятичных чисел (decimal on decimal)\n\ @@ -485,7 +485,6 @@ RESTORE восстанавливает окно\n\ STRING_CMD_ERROR5 "Запуск cmdexit.bat...\n" STRING_COLOR_ERROR1 "Одинаковые цвета! (Цвета фона и текста не могут быть одинаковыми)" STRING_COLOR_ERROR2 "Ошибка в указании цвета" - 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 a37e610e919..b2575718b22 100644 --- a/reactos/base/shell/cmd/lang/sk-SK.rc +++ b/reactos/base/shell/cmd/lang/sk-SK.rc @@ -77,9 +77,9 @@ CMD [/[C|K] command][/P][/Q][/T:bf]\n\n\ (cannot be terminated).\n\ /T:bf Sets the background/foreground color (see COLOR command).\n" STRING_COLOR_HELP1 "Sets the default foreground and background colors.\n\n\ -COLOR [attr [/-F]] \n\n\ - attr Specifies color attribute of console output\n\ - /-F Does not fill the console blank space with color attribute\n\n\ +COLOR [attr [/-F]]\n\n\ + attr Specifies color attribute of console output.\n\ + /-F Does not fill the console blank space with color attribute.\n\n\ There are three ways to specify the colors:\n\ 1) [bright] name on [bright] name (only the first three letters are required)\n\ 2) decimal on decimal\n\ @@ -480,8 +480,7 @@ title new title\n" 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 %02x\n" + STRING_COLOR_ERROR2 "Error in color specification" 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/sq-AL.rc b/reactos/base/shell/cmd/lang/sq-AL.rc index 21cabe9e8b7..24a5b724ac7 100644 --- a/reactos/base/shell/cmd/lang/sq-AL.rc +++ b/reactos/base/shell/cmd/lang/sq-AL.rc @@ -75,9 +75,9 @@ CMD [/[C|K] komande][/P][/Q][/T:bf]\n\n\ (nuk mund të ndërpritet).\n\ /T:bf Përcakton ngjyrën e sfondit/parasfondin(shih NGJYRAT e komandave).\n" STRING_COLOR_HELP1 "Vë parazgjedhjene e ngjyrave të sfondit dhe parasfondit.\n\n\ -COLOR [attr [/-F]] \n\n\ - attr Përcakton atributin e ngjyrave të prodhimit nga konsoli\n\ - /-F Nuk e mbush hapësirën bosh të konsolit me atribute ngjyrash\n\n\ +COLOR [attr [/-F]]\n\n\ + attr Përcakton atributin e ngjyrave të prodhimit nga konsoli.\n\ + /-F Nuk e mbush hapësirën bosh të konsolit me atribute ngjyrash.\n\n\ Ka tre mënyra për të specifikuar ngjyrat:\n\ 1) [e ndritshem] emri [e ndritshem] emri (vetëm tre letrat e para janë të nevojshme)\n\ 2) decimal në decimal\n\ @@ -478,8 +478,7 @@ title titull i ri\n" STRING_CMD_ERROR4 "Fillo %s...\n" STRING_CMD_ERROR5 "Fillo cmdexit.bat...\n" STRING_COLOR_ERROR1 "Error i njëta ngjyra! (Historiku dhe prioritetit nuk mund të jetë ngjyrë të njëjtë)" - STRING_COLOR_ERROR2 "gabim në specifikim ngjyra" - STRING_COLOR_ERROR3 "Ngjyra %02x\n" + STRING_COLOR_ERROR2 "Gabim në specifikim ngjyra" STRING_CONSOLE_ERROR "Error i paditur: %d\n" STRING_COPY_ERROR1 "Error: Nuk mund të hapni burim - %s!\n" STRING_COPY_ERROR2 "Error: Nuk mund të kopjoni mbi veten!\n" diff --git a/reactos/base/shell/cmd/lang/sv-SE.rc b/reactos/base/shell/cmd/lang/sv-SE.rc index eeae86cbbc2..559fd37159e 100644 --- a/reactos/base/shell/cmd/lang/sv-SE.rc +++ b/reactos/base/shell/cmd/lang/sv-SE.rc @@ -71,9 +71,9 @@ CMD [/[C|K] kommando][/P][/Q][/T:bf]\n\n\ (kan inte avsluttes).\n\ /T:bf Ställer in bakgrunn/forgrunn färg (se COLOR kommando).\n" STRING_COLOR_HELP1 "Ställer in standard forgrunns- och bakgrunnsfarger.\n\n\ -COLOR [attr [/-F]] \n\n\ - attr Anger fargeattributter for konsollteksten\n\ - /-F Fyller inte blank plass med fargeattributter\n\n\ +COLOR [attr [/-F]]\n\n\ + attr Anger fargeattributter for konsollteksten.\n\ + /-F Fyller inte blank plass med fargeattributter.\n\n\ Det finns tre sätt att ange färgerna:\n\ 1) [bright] namn pÃ¥ [bright] namn (bara de tre första bokstäverna krävs)\n\ 2) decimal pÃ¥ decimal\n\ @@ -472,8 +472,7 @@ tittel ny tittel\n" 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 %02x\n" + STRING_COLOR_ERROR2 "Feil i farge spesifikasjon" 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/tr-TR.rc b/reactos/base/shell/cmd/lang/tr-TR.rc index 29e5c0ac800..a6492eef45d 100644 --- a/reactos/base/shell/cmd/lang/tr-TR.rc +++ b/reactos/base/shell/cmd/lang/tr-TR.rc @@ -73,7 +73,7 @@ CMD [/[C|K] komut][/P][/Q][/T:aö]\n\n\ (sonlandırılamaz).\n\ /T:aö Arka plan/ön plan rengini ayarlar (COLOR komutuna bakınız).\n" STRING_COLOR_HELP1 "Ön tanımlı ön plan ve arka plan renklerini ayarlar.\n\n\ -COLOR [öznt [/-F]] \n\n\ +COLOR [öznt [/-F]]\n\n\ öznt Konsol çıktısının renk öz niteliğini belirtir.\n\ /-F Konsol boş alanı renk öz niteliğiyle doldurma.\n\n\ Renkleri belirtmek için üç yol var:\n\ @@ -480,7 +480,6 @@ başlık Yeni başlık\n" STRING_CMD_ERROR5 "cmdexit.bat çalıştırılıyor...\n" STRING_COLOR_ERROR1 "Aynı renk yanlışlığı! (Arka plan ve ön plan aynı renk olamaz.)" STRING_COLOR_ERROR2 "Renk belirtmede yanlışlık" - STRING_COLOR_ERROR3 "Renk %02x\n" STRING_CONSOLE_ERROR "Bilinmeyen yanlışlık: %d\n" STRING_COPY_ERROR1 "Yanlışlık: %s kaynağı açılamıyor!\n" STRING_COPY_ERROR2 "Yanlışlık: Kendisinin üstüne çoğaltılamıyor!\n" diff --git a/reactos/base/shell/cmd/lang/uk-UA.rc b/reactos/base/shell/cmd/lang/uk-UA.rc index 7acb12c3a31..ec250509a83 100644 --- a/reactos/base/shell/cmd/lang/uk-UA.rc +++ b/reactos/base/shell/cmd/lang/uk-UA.rc @@ -79,9 +79,9 @@ CMD [/[C|K] команда][/P][/Q][/T:кл]\n\n\ (процес не може бути завершений).\n\ /T:кл Вибiр кольору тексту/тла (детальнiше див. COLOR /?).\n" STRING_COLOR_HELP1 "Встановлення кольорiв по замовчуванню для тексту та тла.\n\n\ -COLOR [attr [/-F]] \n\n\ - attr Атрибути кольорiв для текстових вiкон\n\ - /-F Не заливати незаповненi мiсця кольором\n\n\ +COLOR [attr [/-F]]\n\n\ + attr Атрибути кольорiв для текстових вiкон.\n\ + /-F Не заливати незаповненi мiсця кольором.\n\n\ Iснує три способи задання кольорiв:\n\ 1) за назвою на англiйськiй мовi (потрiбно лише першi три букви назви)\n\ 2) в виглядi десяткових чисел (decimal on decimal)\n\ @@ -483,9 +483,8 @@ title новий заголовок\n" STRING_CMD_ERROR3 "Не можу перенаправити в файл %s\n" STRING_CMD_ERROR4 "Запуск %s...\n" STRING_CMD_ERROR5 "Запуск cmdexit.bat...\n" - STRING_COLOR_ERROR1 "помилка - однаковi кольори! (тло та текст не можуть бути однакового кольору)" - STRING_COLOR_ERROR2 "помилка при вказаннi кольору" - STRING_COLOR_ERROR3 "Колiр %02x\n" + STRING_COLOR_ERROR1 "Помилка - однаковi кольори! (тло та текст не можуть бути однакового кольору)" + STRING_COLOR_ERROR2 "Помилка при вказаннi кольору" 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 9e14eecdcf2..3f5a4cb8316 100644 --- a/reactos/base/shell/cmd/lang/zh-CN.rc +++ b/reactos/base/shell/cmd/lang/zh-CN.rc @@ -70,7 +70,7 @@ CMD [/[C|K] 命令][/P][/Q][/T:bf]\n\n\ /P 永久保留 CMD 并运行 autoexec.bat (无法终止)。\n\ /T:bf 设置前景/背景颜色 (参见 COLOR 命令)。\n" STRING_COLOR_HELP1 "设置默认前景和背景颜色。\n\n\ -COLOR [属性 [/-F]] \n\n\ +COLOR [属性 [/-F]]\n\n\ 属性 指定控制台输出的颜色属性。\n\ /-F 不要使用颜色填充控制台的空白区域。\n\n\ 有3种方法指定颜色：\n\ @@ -444,7 +444,6 @@ RESTORE 恢复窗口\n\ STRING_CMD_ERROR5 "正在运行 cmdexit.bat...\n" STRING_COLOR_ERROR1 "同样颜色错误！ (背景和前景不能同色)" STRING_COLOR_ERROR2 "颜色指定错误" - 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/zh-TW.rc b/reactos/base/shell/cmd/lang/zh-TW.rc index afe8443316a..db7a031b86c 100644 --- a/reactos/base/shell/cmd/lang/zh-TW.rc +++ b/reactos/base/shell/cmd/lang/zh-TW.rc @@ -70,7 +70,7 @@ CMD [/[C|K] 命令][/P][/Q][/T:bf]\n\n\ /P 永久保留 CMD 並運行 autoexec.bat (無法終止)。\n\ /T:bf 設定前景/背景顏色 (參見 COLOR 命令)。\n" STRING_COLOR_HELP1 "設定默認前景和背景顏色。\n\n\ -COLOR [屬性 [/-F]] \n\n\ +COLOR [屬性 [/-F]]\n\n\ 屬性 指定控制檯輸出的顏色屬性。\n\ /-F 不要使用顏色填充控制檯的空白區域。\n\n\ 有3種方法指定顏色：\n\ @@ -444,7 +444,6 @@ RESTORE 恢復視窗\n\ STRING_CMD_ERROR5 "正在運行 cmdexit.bat...\n" STRING_COLOR_ERROR1 "同樣顏色錯誤！ (背景和前景不能同色)" STRING_COLOR_ERROR2 "顏色指定錯誤" - 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/resource.h b/reactos/base/shell/cmd/resource.h index b22a86754fa..fdd98d51472 100644 --- a/reactos/base/shell/cmd/resource.h +++ b/reactos/base/shell/cmd/resource.h @@ -31,8 +31,7 @@ #define STRING_CMD_ERROR5 313 #define STRING_COLOR_ERROR1 314 #define STRING_COLOR_ERROR2 315 -#define STRING_COLOR_ERROR3 316 -#define STRING_CONSOLE_ERROR 317 +#define STRING_CONSOLE_ERROR 316 #define STRING_COPY_ERROR1 320 #define STRING_COPY_ERROR2 321 #define STRING_COPY_ERROR3 322