From 1857882d9ea531aafa22ebb376f3174d79914d68 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sat, 20 Jan 2018 14:10:45 -0500 Subject: [PATCH] l10n: Eliminated STRING_CMD_COLUMNS_* --- src/commands/CmdColumns.cpp | 9 +++++---- src/l10n/deu-DEU.h | 5 ----- src/l10n/eng-USA.h | 5 ----- src/l10n/epo-RUS.h | 5 ----- src/l10n/esp-ESP.h | 5 ----- src/l10n/fra-FRA.h | 5 ----- src/l10n/ita-ITA.h | 5 ----- src/l10n/jpn-JPN.h | 5 ----- src/l10n/pol-POL.h | 5 ----- src/l10n/por-PRT.h | 5 ----- 10 files changed, 5 insertions(+), 49 deletions(-) diff --git a/src/commands/CmdColumns.cpp b/src/commands/CmdColumns.cpp index ef923f96e..6cbf4935b 100644 --- a/src/commands/CmdColumns.cpp +++ b/src/commands/CmdColumns.cpp @@ -35,6 +35,8 @@ #include #include +#define STRING_CMD_COLUMNS_USAGE "All supported columns and formatting styles" + extern Context context; //////////////////////////////////////////////////////////////////////////////// @@ -60,7 +62,7 @@ int CmdColumns::execute (std::string& output) // have already been handled. auto words = context.cli2.getWords (); if (words.size () > 1) - throw std::string (STRING_CMD_COLUMNS_ARGS); + throw std::string ("You can only specify one search string."); // Include all columns in the table. std::vector names; @@ -112,8 +114,7 @@ int CmdColumns::execute (std::string& output) output = optionalBlankLine () + formats.render () + '\n' - + STRING_CMD_COLUMNS_NOTE - + '\n'; + + "* Means default format, and therefore optional. For example, 'due' and 'due.formatted' are equivalent.\n"; return 0; } @@ -123,7 +124,7 @@ CmdCompletionColumns::CmdCompletionColumns () { _keyword = "_columns"; _usage = "task _columns"; - _description = STRING_CMD_COLUMNS_USAGE2; + _description = "Displays only a list of supported columns"; _read_only = true; _displays_id = false; _needs_gc = false; diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h index 01e56c88c..477f97f9d 100644 --- a/src/l10n/deu-DEU.h +++ b/src/l10n/deu-DEU.h @@ -313,11 +313,6 @@ #define STRING_CMD_ANNO_1 "{1} Aufgabe kommentiert." #define STRING_CMD_ANNO_N "{1} Aufgaben kommentiert." -#define STRING_CMD_COLUMNS_USAGE "Alle unterstützten Spalten und Darstellungsoptionen" -#define STRING_CMD_COLUMNS_NOTE "* kennzeichnet das Standardformat, und ist daher optional. Zum Beispiel sind 'due' und 'due.formatted' gleichwertig." -#define STRING_CMD_COLUMNS_USAGE2 "Zeigt ausschließlich eine Liste der unterstützten Spalten" -#define STRING_CMD_COLUMNS_ARGS "Es darf nur ein Suchwort angegeben werden." - #define STRING_CMD_DENO_USAGE "Löscht einen Kommentar" #define STRING_CMD_DENO_NONE "Die gewählte Aufgabe hat keine Kommentare, welche gelöscht werden können." #define STRING_CMD_DENO_CONFIRM "Kommentar in Aufgabe {1} '{2}' löschen?" diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h index 1beed718f..8475dcb8a 100644 --- a/src/l10n/eng-USA.h +++ b/src/l10n/eng-USA.h @@ -310,11 +310,6 @@ #define STRING_CMD_ANNO_1 "Annotated {1} task." #define STRING_CMD_ANNO_N "Annotated {1} tasks." -#define STRING_CMD_COLUMNS_USAGE "All supported columns and formatting styles" -#define STRING_CMD_COLUMNS_NOTE "* Means default format, and therefore optional. For example, 'due' and 'due.formatted' are equivalent." -#define STRING_CMD_COLUMNS_USAGE2 "Displays only a list of supported columns" -#define STRING_CMD_COLUMNS_ARGS "You can only specify one search string." - #define STRING_CMD_DENO_USAGE "Deletes an annotation" #define STRING_CMD_DENO_NONE "The specified task has no annotations that can be deleted." #define STRING_CMD_DENO_CONFIRM "Denotate task {1} '{2}'?" diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h index 7e1b5970c..40aa1dc2c 100644 --- a/src/l10n/epo-RUS.h +++ b/src/l10n/epo-RUS.h @@ -313,11 +313,6 @@ #define STRING_CMD_ANNO_1 "Komentis {1} taskon." #define STRING_CMD_ANNO_N "Komentis {1} taskojn." -#define STRING_CMD_COLUMNS_USAGE "Ĉia kolumno kaj stilo subtenata" -#define STRING_CMD_COLUMNS_NOTE "* Signifas defaŭltan stilon, do ne estas deviga. Ekzemple, 'due' estas identa kun 'due.formatted'." -#define STRING_CMD_COLUMNS_USAGE2 "Montras liston sole de subtenataj kolumnoj" -#define STRING_CMD_COLUMNS_ARGS "Oni ne povas specifi plu de unu serĉĉenon." - #define STRING_CMD_DENO_USAGE "Viŝas komenton" #define STRING_CMD_DENO_NONE "La specifita tasko ne havas nenian viŝeblan komenton." #define STRING_CMD_DENO_CONFIRM "Malkomenti taskon {1} '{2}'?" diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h index 3527f9e4e..9b3c753d6 100644 --- a/src/l10n/esp-ESP.h +++ b/src/l10n/esp-ESP.h @@ -322,11 +322,6 @@ #define STRING_CMD_ANNO_1 "Anotada {1} tarea." #define STRING_CMD_ANNO_N "Anotadas {1} tareas." -#define STRING_CMD_COLUMNS_USAGE "Todas las columnas y estilos de formato soportados" -#define STRING_CMD_COLUMNS_NOTE "* Significa formato por defecto, y por lo tanto opcional. Por ejemplo 'due' y 'due.formatted' son equivalentes." -#define STRING_CMD_COLUMNS_USAGE2 "Muestra una lista de columnas (solo nombres) soportadas" -#define STRING_CMD_COLUMNS_ARGS "Solo puede especificar un término de búsqueda." - #define STRING_CMD_DENO_USAGE "Elimina una anotación" #define STRING_CMD_DENO_NONE "La tarea especificada no tiene anotaciones que puedan ser eliminadas." #define STRING_CMD_DENO_CONFIRM "¿Desanotar la tarea {1} '{2}'?" diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h index 0f28e603a..63e77b398 100644 --- a/src/l10n/fra-FRA.h +++ b/src/l10n/fra-FRA.h @@ -315,11 +315,6 @@ #define STRING_CMD_ANNO_1 "Annotated {1} task." #define STRING_CMD_ANNO_N "Annotated {1} tasks." -#define STRING_CMD_COLUMNS_USAGE "All supported columns and formatting styles" -#define STRING_CMD_COLUMNS_NOTE "* Means default format, and therefore optional. For example, 'due' and 'due.formatted' are equivalent." -#define STRING_CMD_COLUMNS_USAGE2 "Displays only a list of supported columns" -#define STRING_CMD_COLUMNS_ARGS "You can only specify one search string." - #define STRING_CMD_DENO_USAGE "Deletes an annotation" #define STRING_CMD_DENO_NONE "The specified task has no annotations that can be deleted." #define STRING_CMD_DENO_CONFIRM "Denotate task {1} '{2}'?" diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h index c1a0c9d0a..a7195368a 100644 --- a/src/l10n/ita-ITA.h +++ b/src/l10n/ita-ITA.h @@ -314,11 +314,6 @@ #define STRING_CMD_ANNO_1 "Aggiunta al task {1}." #define STRING_CMD_ANNO_N "Aggiunte ai task {1}." -#define STRING_CMD_COLUMNS_USAGE "Tutte le colonne e gli stili di formattazione" -#define STRING_CMD_COLUMNS_NOTE "* significa formato di default, quindi opzionale. Per esempio, 'due' e 'due.formatted' sono equivalenti." -#define STRING_CMD_COLUMNS_USAGE2 "Mostra solo una lista delle colonne supportate" -#define STRING_CMD_COLUMNS_ARGS "Può essere specificata solo una stringa di ricerca." - #define STRING_CMD_DENO_USAGE "Cancella una annotazione" #define STRING_CMD_DENO_NONE "Il task specificato non ha annotazioni che possano essere cancellate." #define STRING_CMD_DENO_CONFIRM "Denotare il task {1} '{2}'?" diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h index 944ddcde0..ead6f5e44 100644 --- a/src/l10n/jpn-JPN.h +++ b/src/l10n/jpn-JPN.h @@ -315,11 +315,6 @@ #define STRING_CMD_ANNO_1 "{1} task に注釈付加." #define STRING_CMD_ANNO_N "{1} task に注釈付加." -#define STRING_CMD_COLUMNS_USAGE "All supported columns and formatting styles" -#define STRING_CMD_COLUMNS_NOTE "* Means default format, and therefore optional. For example, 'due' and 'due.formatted' are equivalent." -#define STRING_CMD_COLUMNS_USAGE2 "Displays only a list of supported columns" -#define STRING_CMD_COLUMNS_ARGS "You can only specify one search string." - #define STRING_CMD_DENO_USAGE "Deletes an annotation" #define STRING_CMD_DENO_NONE "指定されたtaskには注釈がないので削除できません。" #define STRING_CMD_DENO_CONFIRM "タスク {1} から注釈 '{2}' を削除しますか?" diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h index 7a3ce6bf2..6e733c183 100644 --- a/src/l10n/pol-POL.h +++ b/src/l10n/pol-POL.h @@ -315,11 +315,6 @@ #define STRING_CMD_ANNO_1 "Skomentowano {1} zadanie." #define STRING_CMD_ANNO_N "Skomentowano {1} zadań." -#define STRING_CMD_COLUMNS_USAGE "Wszystkie kolumny i wspierane style formatowania" -#define STRING_CMD_COLUMNS_NOTE "* Oznacza domyślne formatowanie, w konsekwencji niewymagane explicite. Na przykład: 'due' i 'due.formatted' są równoznaczne." -#define STRING_CMD_COLUMNS_USAGE2 "Wyświetla tylko listę wspieranych kolumn" -#define STRING_CMD_COLUMNS_ARGS "Możesz podać tylko jeden szukany ciąg znaków." - #define STRING_CMD_DENO_USAGE "Usuwa komentarz" #define STRING_CMD_DENO_NONE "Wybrane zadanie nie posiada komentarza do usunięcia." #define STRING_CMD_DENO_CONFIRM "Usunąć komentarz zadania {1} '{2}'?" diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h index c006acad0..023bdf30e 100644 --- a/src/l10n/por-PRT.h +++ b/src/l10n/por-PRT.h @@ -315,11 +315,6 @@ #define STRING_CMD_ANNO_1 "Anotada {1} tarefa." #define STRING_CMD_ANNO_N "Anotadas {1} tarefas." -#define STRING_CMD_COLUMNS_USAGE "Todas as colunas suportadas e os estilos de formatação" -#define STRING_CMD_COLUMNS_NOTE "* Significa formato por defeito, e por consequência opcional. Por exemplo 'due' e 'due.formatted' são equivalentes." -#define STRING_CMD_COLUMNS_USAGE2 "Exibe apenas a lista de colunas suportadas" -#define STRING_CMD_COLUMNS_ARGS "Pode apenas especificar uma frase para procura." - #define STRING_CMD_DENO_USAGE "Elimina uma anotação" #define STRING_CMD_DENO_NONE "A tarefa especificada não tem anotações que possam ser eliminadas." #define STRING_CMD_DENO_CONFIRM "Remover anotação da tarefa {1} '{2}'?"