diff --git a/src/commands/CmdColor.cpp b/src/commands/CmdColor.cpp index f79e97562..23c9cd4e8 100644 --- a/src/commands/CmdColor.cpp +++ b/src/commands/CmdColor.cpp @@ -33,7 +33,6 @@ #include #include #include -#include extern Context context; @@ -42,7 +41,7 @@ CmdColor::CmdColor () { _keyword = "colors"; _usage = "task colors [sample | legend]"; - _description = STRING_CMD_COLOR_USAGE; + _description = "All colors, a sample, or a legend"; _read_only = true; _displays_id = false; _needs_gc = false; @@ -72,14 +71,14 @@ int CmdColor::execute (std::string& output) // use. if (legend) { - out << '\n' << STRING_CMD_COLOR_HERE << '\n'; + out << "\nHere are the colors currently in use:\n"; Table view; view.width (context.getWidth ()); if (context.config.getBoolean ("color")) view.forceColor (); - view.add (STRING_CMD_COLOR_COLOR); - view.add (STRING_CMD_COLOR_DEFINITION); + view.add ("Color"); + view.add ("Definition"); for (auto& item : context.config) { @@ -123,19 +122,19 @@ int CmdColor::execute (std::string& output) Color sample (swatch); out << '\n' - << STRING_CMD_COLOR_EXPLANATION << '\n' + << "Use this command to see how colors are displayed by your terminal.\n" << "\n\n" - << STRING_CMD_COLOR_16 << '\n' + << "16-color usage (supports underline, bold text, bright background):\n" << " " << one.colorize ("task color black on bright yellow") << '\n' << " " << two.colorize ("task color underline cyan on bright blue") << '\n' << '\n' - << STRING_CMD_COLOR_256 << '\n' + << "256-color usage (supports underline):\n" << " " << three.colorize ("task color color214 on color202") << '\n' << " " << four.colorize ("task color rgb150 on rgb020") << '\n' << " " << five.colorize ("task color underline grey10 on grey3") << '\n' << " " << six.colorize ("task color red on color173") << '\n' << '\n' - << STRING_CMD_COLOR_YOURS << "\n\n" + << "Your sample:\n\n" << " " << sample.colorize ("task color " + swatch) << "\n\n"; } @@ -143,8 +142,7 @@ int CmdColor::execute (std::string& output) else { out << '\n' - << STRING_CMD_COLOR_BASIC - << '\n' + << "Basic colors\n" << ' ' << Color::colorize (" black ", "black") << ' ' << Color::colorize (" red ", "red") << ' ' << Color::colorize (" blue ", "blue") @@ -164,8 +162,7 @@ int CmdColor::execute (std::string& output) << ' ' << Color::colorize (" white ", "black on white") << "\n\n"; - out << STRING_CMD_COLOR_EFFECTS - << '\n' + out << "Effects\n" << ' ' << Color::colorize (" red ", "red") << ' ' << Color::colorize (" bold red ", "bold red") << ' ' << Color::colorize (" underline on blue ", "underline on blue") @@ -194,7 +191,7 @@ int CmdColor::execute (std::string& output) out << " . . . 15\n\n"; // Color cube. - out << STRING_CMD_COLOR_CUBE + out << "Color cube rgb" << Color::colorize ("0", "bold red") << Color::colorize ("0", "bold green") << Color::colorize ("0", "bold blue") @@ -242,8 +239,7 @@ int CmdColor::execute (std::string& output) out << '\n'; // Grey ramp. - out << STRING_CMD_COLOR_RAMP - << " gray0 - gray23 (also color232 - color255)\n" + out << "Gray ramp gray0 - gray23 (also color232 - color255)\n" << " 0 1 2 . . . . . . 23\n" << " "; for (int g = 0; g < 24; ++g) @@ -254,13 +250,13 @@ int CmdColor::execute (std::string& output) } out << "\n\n" - << format (STRING_CMD_COLOR_TRY, "task color white on red") - << "\n\n"; + << "Try running 'task color white on red'.\n" + << '\n'; } } else { - out << STRING_CMD_COLOR_OFF << '\n'; + out << "Color is currently turned off in your .taskrc file. To enable color, remove the line 'color=off', or change the 'off' to 'on'.\n"; rc = 1; } diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h index ccd81fb29..22f58dd77 100644 --- a/src/l10n/deu-DEU.h +++ b/src/l10n/deu-DEU.h @@ -193,20 +193,6 @@ #define STRING_CMD_ZSHATTS_USAGE "Erzeugt eine Liste Eigenschaften zur ZSH-Auto-Vervollständigung" #define STRING_CMD_ALIASES_USAGE "Erzeugt eine Liste aller Aliase zur Auto-Vervollständigung" -#define STRING_CMD_COLOR_USAGE "Alle Farben, ein Beispiel, oder eine Legende" -#define STRING_CMD_COLOR_HERE "Diese Farben werden zur Zeit genutzt:" -#define STRING_CMD_COLOR_COLOR "Farbe" -#define STRING_CMD_COLOR_DEFINITION "Definition" -#define STRING_CMD_COLOR_EXPLANATION "Nutzen Sie diesen Befehl, um zu sehen, wie die Farben auf Ihrem Terminal dargestellt werden." -#define STRING_CMD_COLOR_16 "16 Farben (unterstützt underline, bold text, bright background):" -#define STRING_CMD_COLOR_256 "256 Farben (unterstützt underline):" -#define STRING_CMD_COLOR_YOURS "Ihr Beispiel:" -#define STRING_CMD_COLOR_BASIC "Basisfarben" -#define STRING_CMD_COLOR_EFFECTS "Effekte" -#define STRING_CMD_COLOR_CUBE "RGB-Farbwürfel " -#define STRING_CMD_COLOR_RAMP "Grauskala" -#define STRING_CMD_COLOR_TRY "Versuchen Sie '{1}' auszuführen." -#define STRING_CMD_COLOR_OFF "Farben wurden in Ihrer .taskrc-Datei deaktiviert. Um zie zu aktivieren, löschen Sie die Zeile 'color=off' oder ändern Sie 'off' zu 'on'." #define STRING_CMD_CONFIG_USAGE "task-Konfiguration verändern" #define STRING_CMD_CONFIG_CONFIRM "Wirklich die Option '{1}' von '{2}' zu '{3}' ändern?" #define STRING_CMD_CONFIG_CONFIRM2 "Wirklich die Option '{1}' mit Wert '{2}' hinzufügen?" diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h index 47d4791c5..171abf8ea 100644 --- a/src/l10n/eng-USA.h +++ b/src/l10n/eng-USA.h @@ -190,20 +190,6 @@ #define STRING_CMD_ZSHATTS_USAGE "Generates a list of all attributes, for zsh autocompletion purposes" #define STRING_CMD_ALIASES_USAGE "Generates a list of all aliases, for autocompletion purposes" -#define STRING_CMD_COLOR_USAGE "All colors, a sample, or a legend" -#define STRING_CMD_COLOR_HERE "Here are the colors currently in use:" -#define STRING_CMD_COLOR_COLOR "Color" -#define STRING_CMD_COLOR_DEFINITION "Definition" -#define STRING_CMD_COLOR_EXPLANATION "Use this command to see how colors are displayed by your terminal." -#define STRING_CMD_COLOR_16 "16-color usage (supports underline, bold text, bright background):" -#define STRING_CMD_COLOR_256 "256-color usage (supports underline):" -#define STRING_CMD_COLOR_YOURS "Your sample:" -#define STRING_CMD_COLOR_BASIC "Basic colors" -#define STRING_CMD_COLOR_EFFECTS "Effects" -#define STRING_CMD_COLOR_CUBE "Color cube rgb" -#define STRING_CMD_COLOR_RAMP "Gray ramp" -#define STRING_CMD_COLOR_TRY "Try running '{1}'." -#define STRING_CMD_COLOR_OFF "Color is currently turned off in your .taskrc file. To enable color, remove the line 'color=off', or change the 'off' to 'on'." #define STRING_CMD_CONFIG_USAGE "Change settings in the task configuration" #define STRING_CMD_CONFIG_CONFIRM "Are you sure you want to change the value of '{1}' from '{2}' to '{3}'?" #define STRING_CMD_CONFIG_CONFIRM2 "Are you sure you want to add '{1}' with a value of '{2}'?" diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h index 4955aec31..10e6d39c1 100644 --- a/src/l10n/epo-RUS.h +++ b/src/l10n/epo-RUS.h @@ -193,20 +193,6 @@ #define STRING_CMD_ZSHATTS_USAGE "Generates a list of all attributes, for zsh autocompletion purposes" #define STRING_CMD_ALIASES_USAGE "Generates a list of all aliases, for autocompletion purposes" -#define STRING_CMD_COLOR_USAGE "All colors, a sample, or a legend" -#define STRING_CMD_COLOR_HERE "Here are the colors currently in use:" -#define STRING_CMD_COLOR_COLOR "Color" -#define STRING_CMD_COLOR_DEFINITION "Definition" -#define STRING_CMD_COLOR_EXPLANATION "Use this command to see how colors are displayed by your terminal." -#define STRING_CMD_COLOR_16 "16-color usage (supports underline, bold text, bright background):" -#define STRING_CMD_COLOR_256 "256-color usage (supports underline):" -#define STRING_CMD_COLOR_YOURS "Your sample:" -#define STRING_CMD_COLOR_BASIC "Basic colors" -#define STRING_CMD_COLOR_EFFECTS "Effects" -#define STRING_CMD_COLOR_CUBE "Color cube rgb" -#define STRING_CMD_COLOR_RAMP "Gray ramp" -#define STRING_CMD_COLOR_TRY "Try running '{1}'." -#define STRING_CMD_COLOR_OFF "Color is currently turned off in your .taskrc file. To enable color, remove the line 'color=off', or change the 'off' to 'on'." #define STRING_CMD_CONFIG_USAGE "Change settings in the task configuration" #define STRING_CMD_CONFIG_CONFIRM "Are you sure you want to change the value of '{1}' from '{2}' to '{3}'?" #define STRING_CMD_CONFIG_CONFIRM2 "Are you sure you want to add '{1}' with a value of '{2}'?" diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h index a273e4c1d..81fda5f21 100644 --- a/src/l10n/esp-ESP.h +++ b/src/l10n/esp-ESP.h @@ -200,21 +200,6 @@ #define STRING_CMD_ZSHATTS_USAGE "Genera una lista de todos los atributos, con fines de auto-completado zsh" #define STRING_CMD_ALIASES_USAGE "Genera una lista de todos los alias, con fines de auto-completado" -#define STRING_CMD_COLOR_USAGE "Todos los colores, una muestra, o una leyenda" -#define STRING_CMD_COLOR_HERE "Aquí están los colores en uso actualmente:" -#define STRING_CMD_COLOR_COLOR "Color" // |esp-ESP|==|eng-USA| -#define STRING_CMD_COLOR_DEFINITION "Definición" -#define STRING_CMD_COLOR_EXPLANATION "Use este comando para ver como los colores son mostrados por su terminal." -#define STRING_CMD_COLOR_16 "Uso de 16-colores (soporta subrayado, negrita, fondo brillante):" -#define STRING_CMD_COLOR_256 "Uso de 256-colores (soporta subrayado):" -#define STRING_CMD_COLOR_YOURS "Su muestra:" -#define STRING_CMD_COLOR_BASIC "Colores básicos" -#define STRING_CMD_COLOR_EFFECTS "Efectos" -#define STRING_CMD_COLOR_CUBE "Cubo de color rgb" -#define STRING_CMD_COLOR_RAMP "Rampa de grises" -#define STRING_CMD_COLOR_TRY "Intente ejecutar '{1}'." -//#define STRING_CMD_COLOR_TRY "Try running '{1}'." -#define STRING_CMD_COLOR_OFF "El color está actualmente desactivado en su archivo .taskrc . Para activar el color elimine la línea 'color=off', o cambie el 'off' a 'on'." #define STRING_CMD_CONFIG_USAGE "Cambia los ajustes en la configuración de task" #define STRING_CMD_CONFIG_CONFIRM "¿Está seguro de querer cambiar el valor de '{1}' de '{2}' a '{3}'?" #define STRING_CMD_CONFIG_CONFIRM2 "¿Está seguro de querer añadir '{1}' con un valor de '{2}'?" diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h index b7b85f5db..1866d1aae 100644 --- a/src/l10n/fra-FRA.h +++ b/src/l10n/fra-FRA.h @@ -195,20 +195,6 @@ #define STRING_CMD_ZSHATTS_USAGE "Generates a list of all attributes, for zsh autocompletion purposes" #define STRING_CMD_ALIASES_USAGE "Generates a list of all aliases, for autocompletion purposes" -#define STRING_CMD_COLOR_USAGE "All colors, a sample, or a legend" -#define STRING_CMD_COLOR_HERE "Here are the colors currently in use:" -#define STRING_CMD_COLOR_COLOR "Color" -#define STRING_CMD_COLOR_DEFINITION "Definition" -#define STRING_CMD_COLOR_EXPLANATION "Use this command to see how colors are displayed by your terminal." -#define STRING_CMD_COLOR_16 "16-color usage (supports underline, bold text, bright background):" -#define STRING_CMD_COLOR_256 "256-color usage (supports underline):" -#define STRING_CMD_COLOR_YOURS "Your sample:" -#define STRING_CMD_COLOR_BASIC "Basic colors" -#define STRING_CMD_COLOR_EFFECTS "Effects" -#define STRING_CMD_COLOR_CUBE "Color cube rgb" -#define STRING_CMD_COLOR_RAMP "Gray ramp" -#define STRING_CMD_COLOR_TRY "Try running '{1}'." -#define STRING_CMD_COLOR_OFF "Color is currently turned off in your .taskrc file. To enable color, remove the line 'color=off', or change the 'off' to 'on'." #define STRING_CMD_CONFIG_USAGE "Change settings in the task configuration" #define STRING_CMD_CONFIG_CONFIRM "Are you sure you want to change the value of '{1}' from '{2}' to '{3}'?" #define STRING_CMD_CONFIG_CONFIRM2 "Are you sure you want to add '{1}' with a value of '{2}'?" diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h index 489edcee3..05eeef5f1 100644 --- a/src/l10n/ita-ITA.h +++ b/src/l10n/ita-ITA.h @@ -194,20 +194,6 @@ #define STRING_CMD_ZSHATTS_USAGE "Generates a list of all attributes, for zsh autocompletion purposes" #define STRING_CMD_ALIASES_USAGE "Genera la lista di tutti gli alias, per autocompletamento" -#define STRING_CMD_COLOR_USAGE "Tutti i colori, un esempio, o una legenda" -#define STRING_CMD_COLOR_HERE "Coloti in uso:" -#define STRING_CMD_COLOR_COLOR "Colore" -#define STRING_CMD_COLOR_DEFINITION "Definizione" -#define STRING_CMD_COLOR_EXPLANATION "Usare questo comando per vedere come i colori sono visualizzati sul terminale in uso." -#define STRING_CMD_COLOR_16 "16-colori in uso (supporto per sottolineatura, grassetto, e sfondo):" -#define STRING_CMD_COLOR_256 "256-colori in uso (supporto per sottolineatura):" -#define STRING_CMD_COLOR_YOURS "Esempio:" -#define STRING_CMD_COLOR_BASIC "Colori base" -#define STRING_CMD_COLOR_EFFECTS "Effetti" -#define STRING_CMD_COLOR_CUBE "Cubo dei colori RGB" -#define STRING_CMD_COLOR_RAMP "Rampa dei grigi" -#define STRING_CMD_COLOR_TRY "Provare eseguendo '{1}'." -#define STRING_CMD_COLOR_OFF "Il colore è attualmente disabilitato nel file .taskrc. Per abilitarlo, rimuovi la linea 'color=off', o cambia 'off' in 'on'." #define STRING_CMD_CONFIG_USAGE "Modifica le impostazioni nella configurazione dei task" #define STRING_CMD_CONFIG_CONFIRM "Sei sicuro di voler cambiare il valore di '{1}' da '{2}' a '{3}'?" #define STRING_CMD_CONFIG_CONFIRM2 "Sei sicuro di voler aggiungere '{1}' con valore '{2}'?" diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h index b09f70fb0..0761fd6e3 100644 --- a/src/l10n/jpn-JPN.h +++ b/src/l10n/jpn-JPN.h @@ -195,20 +195,6 @@ #define STRING_CMD_ZSHATTS_USAGE "Generates a list of all attributes, for zsh autocompletion purposes" #define STRING_CMD_ALIASES_USAGE "Generates a list of all aliases, for autocompletion purposes" -#define STRING_CMD_COLOR_USAGE "All colors, a sample, or a legend" -#define STRING_CMD_COLOR_HERE "Here are the colors currently in use:" -#define STRING_CMD_COLOR_COLOR "Color" -#define STRING_CMD_COLOR_DEFINITION "Definition" -#define STRING_CMD_COLOR_EXPLANATION "Use this command to see how colors are displayed by your terminal." -#define STRING_CMD_COLOR_16 "16-color usage (supports underline, bold text, bright background):" -#define STRING_CMD_COLOR_256 "256-color usage (supports underline):" -#define STRING_CMD_COLOR_YOURS "Your sample:" -#define STRING_CMD_COLOR_BASIC "Basic colors" -#define STRING_CMD_COLOR_EFFECTS "Effects" -#define STRING_CMD_COLOR_CUBE "Color cube rgb" -#define STRING_CMD_COLOR_RAMP "Gray ramp" -#define STRING_CMD_COLOR_TRY "Try running '{1}'." -#define STRING_CMD_COLOR_OFF "Color is currently turned off in your .taskrc file. To enable color, remove the line 'color=off', or change the 'off' to 'on'." #define STRING_CMD_CONFIG_USAGE "Change settings in the task configuration" #define STRING_CMD_CONFIG_CONFIRM "Are you sure you want to change the value of '{1}' from '{2}' to '{3}'?" #define STRING_CMD_CONFIG_CONFIRM2 "Are you sure you want to add '{1}' with a value of '{2}'?" diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h index 47a34cdc4..df5f70eb5 100644 --- a/src/l10n/pol-POL.h +++ b/src/l10n/pol-POL.h @@ -195,20 +195,6 @@ #define STRING_CMD_ZSHATTS_USAGE "Generates a list of all attributes, for zsh autocompletion purposes" #define STRING_CMD_ALIASES_USAGE "Generuje listę wszystkich aliasów dla funkcji autouzupełniania" -#define STRING_CMD_COLOR_USAGE "Wszystkie kolory, próbki lub legenda" -#define STRING_CMD_COLOR_HERE "To są aktualnie używane kolory:" -#define STRING_CMD_COLOR_COLOR "Kolor" -#define STRING_CMD_COLOR_DEFINITION "Definicja" -#define STRING_CMD_COLOR_EXPLANATION "Użyj tego polecenia aby sprawdzić jak twój terminal wyświetla kolory." -#define STRING_CMD_COLOR_16 "16 kolorów (wsparcie dla podkreślenia, pogrubienia, jasnego tła):" -#define STRING_CMD_COLOR_256 "256 kolorów (wsparcie dla podkreślenia):" -#define STRING_CMD_COLOR_YOURS "Twoja próbka kolorów:" -#define STRING_CMD_COLOR_BASIC "Podstawowe kolory" -#define STRING_CMD_COLOR_EFFECTS "Efekty tekstu" -#define STRING_CMD_COLOR_CUBE "Kostka kolorów rgb" -#define STRING_CMD_COLOR_RAMP "Odcienie szarości" -#define STRING_CMD_COLOR_TRY "Spróbuj wykonać '{1}'." -#define STRING_CMD_COLOR_OFF "Aktualnie, kolorowanie jest wyłączone w twoim pliku .taskrc. Aby włączyć kolorowanie, usuń linie 'color=off', lub zmień wartość 'off' na 'on'." #define STRING_CMD_CONFIG_USAGE "Zmienia konfigurację programu" #define STRING_CMD_CONFIG_CONFIRM "Czy na pewno chcesz zmienić wartość '{1}' z '{2}' na '{3}'?" #define STRING_CMD_CONFIG_CONFIRM2 "Czy na pewno chcesz dodać '{1}' z wartością '{2}'?" diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h index dc96bafa7..ff46fcb22 100644 --- a/src/l10n/por-PRT.h +++ b/src/l10n/por-PRT.h @@ -195,20 +195,6 @@ #define STRING_CMD_ZSHATTS_USAGE "Gera uma lista de todos os atributos, para terminação automática em zsh" #define STRING_CMD_ALIASES_USAGE "Gera uma lista com todos os 'alias', para fins de terminação automática" -#define STRING_CMD_COLOR_USAGE "Todas as cores, uma amostra ou a legenda" -#define STRING_CMD_COLOR_HERE "Estas são as cores actualmente em uso:" -#define STRING_CMD_COLOR_COLOR "Cor" -#define STRING_CMD_COLOR_DEFINITION "Definição" -#define STRING_CMD_COLOR_EXPLANATION "Use este comando para ver como as cores são apresentadas no seu terminal." -#define STRING_CMD_COLOR_16 "Modo 16-cores (suporta sublinhado, negrito e fundo brilhante):" -#define STRING_CMD_COLOR_256 "Modo 256-cores (suporta sublinhado):" -#define STRING_CMD_COLOR_YOURS "A sua amostra:" -#define STRING_CMD_COLOR_BASIC "Cores básicas" -#define STRING_CMD_COLOR_EFFECTS "Efeitos" -#define STRING_CMD_COLOR_CUBE "Cubo de cor rgb" -#define STRING_CMD_COLOR_RAMP "Gradiente cinza" -#define STRING_CMD_COLOR_TRY "Tente executar '{1}'." -#define STRING_CMD_COLOR_OFF "O modo de cor encontra-se desactivado no seu ficheiro .taskrc. Para ativar cor, remova a linha 'color=off', ou altere de 'off' para 'on'." #define STRING_CMD_CONFIG_USAGE "Altera parametros na configuração do 'task'" #define STRING_CMD_CONFIG_CONFIRM "Tem a certeza que pretende alterar o valor de '{1}' de '{2}' para '{3}'?" #define STRING_CMD_CONFIG_CONFIRM2 "Tem a certeza que pretende adicionar '{1}' com o valor '{2}'?"