From 2098b0166f08fcc1cbca27abf7a56d813cb48e17 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sun, 21 Jan 2018 12:55:07 -0500 Subject: [PATCH] l10n: Eliminated STRING_CMD_CUSTOM_* --- src/commands/CmdCustom.cpp | 10 +++++----- 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(+), 50 deletions(-) diff --git a/src/commands/CmdCustom.cpp b/src/commands/CmdCustom.cpp index ba53b3dd2..ce173ef22 100644 --- a/src/commands/CmdCustom.cpp +++ b/src/commands/CmdCustom.cpp @@ -79,7 +79,7 @@ int CmdCustom::execute (std::string& output) auto labels = split (reportLabels, ','); if (columns.size () != labels.size () && labels.size () != 0) - throw format (STRING_CMD_CUSTOM_MISMATCH, _keyword); + throw format ("There are different numbers of columns and labels for report '{1}'.", _keyword); auto sortOrder = split (reportSort, ','); if (sortOrder.size () != 0 && @@ -214,15 +214,15 @@ int CmdCustom::execute (std::string& output) if (context.verbose ("affected")) { out << (filtered.size () == 1 - ? STRING_CMD_CUSTOM_COUNT - : format (STRING_CMD_CUSTOM_COUNTN, filtered.size ())); + ? "1 task" + : format ("{1} tasks", filtered.size ())); if (maxrows && maxrows < (int)filtered.size ()) - out << ", " << format (STRING_CMD_CUSTOM_SHOWN, maxrows); + out << ", " << format ("{1} shown", maxrows); if (maxlines && maxlines < (int)filtered.size ()) out << ", " - << format (STRING_CMD_CUSTOM_TRUNCATED, maxlines - table_header); + << format ("truncated to {1} lines", maxlines - table_header); out << '\n'; } diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h index df02f6066..7dc93ee78 100644 --- a/src/l10n/deu-DEU.h +++ b/src/l10n/deu-DEU.h @@ -28,11 +28,6 @@ #define INCLUDED_STRINGS #define STRING_CMD_COMTAGS_USAGE "Listet ausschließlich alle genutzten Schlagwörter zur Auto-Vervollständigung" -#define STRING_CMD_CUSTOM_COUNT "1 Aufgabe" -#define STRING_CMD_CUSTOM_COUNTN "{1} Aufgaben" -#define STRING_CMD_CUSTOM_MISMATCH "Die Anzahl von Spalten und Beschriftungen für Report '{1}' unterscheidet sich." -#define STRING_CMD_CUSTOM_SHOWN "{1} gezeigt" -#define STRING_CMD_CUSTOM_TRUNCATED "auf {1} Zeilen gekürzt" #define STRING_CMD_IDS_USAGE_LIST "Zeigt die IDs passender Aufgaben als Liste" #define STRING_CMD_IDS_USAGE_RANGE "Zeigt die IDs passender Aufgaben als Folge" #define STRING_CMD_IDS_USAGE_ZSH "Zeigt die IDs und Beschreibungen passender Aufgaben" diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h index 29cc07a3a..02c17db26 100644 --- a/src/l10n/eng-USA.h +++ b/src/l10n/eng-USA.h @@ -28,11 +28,6 @@ #define INCLUDED_STRINGS #define STRING_CMD_COMTAGS_USAGE "Shows only a list of all tags used, for autocompletion purposes" -#define STRING_CMD_CUSTOM_COUNT "1 task" -#define STRING_CMD_CUSTOM_COUNTN "{1} tasks" -#define STRING_CMD_CUSTOM_MISMATCH "There are different numbers of columns and labels for report '{1}'." -#define STRING_CMD_CUSTOM_SHOWN "{1} shown" -#define STRING_CMD_CUSTOM_TRUNCATED "truncated to {1} lines" #define STRING_CMD_IDS_USAGE_LIST "Shows the IDs of matching tasks, in the form of a list" #define STRING_CMD_IDS_USAGE_RANGE "Shows the IDs of matching tasks, as a range" #define STRING_CMD_IDS_USAGE_ZSH "Shows the IDs and descriptions of matching tasks" diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h index 636d51c87..d70e48b97 100644 --- a/src/l10n/epo-RUS.h +++ b/src/l10n/epo-RUS.h @@ -28,11 +28,6 @@ #define INCLUDED_STRINGS #define STRING_CMD_COMTAGS_USAGE "Montras sole listo de ĉia uzata etikedo, por motivo memkompletada" -#define STRING_CMD_CUSTOM_COUNT "1 tasko" -#define STRING_CMD_CUSTOM_COUNTN "{1} taskoj" -#define STRING_CMD_CUSTOM_MISMATCH "La nombroj de kolumnoj kaj de siaj titoloj ne kongruas por raporto '{1}'." -#define STRING_CMD_CUSTOM_SHOWN "{1} montritaj" -#define STRING_CMD_CUSTOM_TRUNCATED "stumpigis al {1} vicojn" #define STRING_CMD_IDS_USAGE_LIST "Montras la identigilon de ĉia kongruanta tasko, kiel listo" #define STRING_CMD_IDS_USAGE_RANGE "Montras la identigilon de ĉia kongruanta tasko, kiel atingopovo" #define STRING_CMD_IDS_USAGE_ZSH "Montras la identigilon kaj la priskribon de ĉia kongruanta tasko" diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h index e5d76719e..a7a0c4c3f 100644 --- a/src/l10n/esp-ESP.h +++ b/src/l10n/esp-ESP.h @@ -28,11 +28,6 @@ #define INCLUDED_STRINGS #define STRING_CMD_COMTAGS_USAGE "Muestra una lista de todas las marcas (solo nombres) en uso, con fines de auto-completado" -#define STRING_CMD_CUSTOM_COUNT "1 tarea" -#define STRING_CMD_CUSTOM_COUNTN "{1} tareas" -#define STRING_CMD_CUSTOM_MISMATCH "Hay diferente número de columnas y etiquetas para el informe '{1}'." -#define STRING_CMD_CUSTOM_SHOWN "{1} mostrada(s)" -#define STRING_CMD_CUSTOM_TRUNCATED "truncado a {1} líneas" #define STRING_CMD_IDS_USAGE_LIST "Muestra los IDs de las tareas coincidentes, en forma de lista" #define STRING_CMD_IDS_USAGE_RANGE "Muestra los IDs de las tareas coincidentes, como un rango" #define STRING_CMD_IDS_USAGE_ZSH "Muestra los IDs y descripciones de las tareas coincidentes" diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h index 7e3d3f259..bba2dd975 100644 --- a/src/l10n/fra-FRA.h +++ b/src/l10n/fra-FRA.h @@ -28,11 +28,6 @@ #define INCLUDED_STRINGS #define STRING_CMD_COMTAGS_USAGE "Affiche uniquement une liste des étiquettes utilisées, pour la complétion" -#define STRING_CMD_CUSTOM_COUNT "1 tâche" -#define STRING_CMD_CUSTOM_COUNTN "{1} tâches" -#define STRING_CMD_CUSTOM_MISMATCH "There are different numbers of columns and labels for report '{1}'." -#define STRING_CMD_CUSTOM_SHOWN "{1} affichées" -#define STRING_CMD_CUSTOM_TRUNCATED "tronquées sur {1} lignes" #define STRING_CMD_IDS_USAGE_LIST "Affiche les IDs des tâches correspondantes, sous forme de liste" #define STRING_CMD_IDS_USAGE_RANGE "Affiche les IDs des tâches correspondantes, comme une plage" #define STRING_CMD_IDS_USAGE_ZSH "Affiche les IDs et les descriptions des tâches correspondantes" diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h index 99cf50fee..81172967a 100644 --- a/src/l10n/ita-ITA.h +++ b/src/l10n/ita-ITA.h @@ -28,11 +28,6 @@ #define INCLUDED_STRINGS #define STRING_CMD_COMTAGS_USAGE "Mostra solo una lista dei tag utilizzati, per autocompletamento" -#define STRING_CMD_CUSTOM_COUNT "1 task" -#define STRING_CMD_CUSTOM_COUNTN "{1} task" -#define STRING_CMD_CUSTOM_MISMATCH "Differente numero di colonne ed etichette per il report '{1}'." -#define STRING_CMD_CUSTOM_SHOWN "{1} mostrato" -#define STRING_CMD_CUSTOM_TRUNCATED "troncato alla linea {1}" #define STRING_CMD_IDS_USAGE_LIST "Mostra gli ID dei task corrispondenti, in forma di lista" #define STRING_CMD_IDS_USAGE_RANGE "Mostra gli ID dei task corrispondenti, come intervallo" #define STRING_CMD_IDS_USAGE_ZSH "Mostra gli ID e le descrizioni dei task corrispondenti" diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h index 416d7ae12..290693ccb 100644 --- a/src/l10n/jpn-JPN.h +++ b/src/l10n/jpn-JPN.h @@ -28,11 +28,6 @@ #define INCLUDED_STRINGS #define STRING_CMD_COMTAGS_USAGE "Shows only a list of all tags used, for autocompletion purposes" -#define STRING_CMD_CUSTOM_COUNT "1 task" -#define STRING_CMD_CUSTOM_COUNTN "{1} tasks" -#define STRING_CMD_CUSTOM_MISMATCH "There are different numbers of columns and labels for report '{1}'." -#define STRING_CMD_CUSTOM_SHOWN "{1} shown" -#define STRING_CMD_CUSTOM_TRUNCATED "truncated to {1} lines" #define STRING_CMD_IDS_USAGE_LIST "Shows the IDs of matching tasks, in the form of a list" #define STRING_CMD_IDS_USAGE_RANGE "Shows the IDs of matching tasks, as a range" #define STRING_CMD_IDS_USAGE_ZSH "Shows the IDs and descriptions of matching tasks" diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h index dfbfffe1c..bb838e32e 100644 --- a/src/l10n/pol-POL.h +++ b/src/l10n/pol-POL.h @@ -28,11 +28,6 @@ #define INCLUDED_STRINGS #define STRING_CMD_COMTAGS_USAGE "Pokazuje listę użytych tagów dla celów autouzupełniania" -#define STRING_CMD_CUSTOM_COUNT "1 zadanie" -#define STRING_CMD_CUSTOM_COUNTN "{1} zadań" -#define STRING_CMD_CUSTOM_MISMATCH "Liczba kolumn i nagłówków nie zgadza się dla raportu '{1}'." -#define STRING_CMD_CUSTOM_SHOWN "{1} pokazanych" -#define STRING_CMD_CUSTOM_TRUNCATED "przycięte do {1} linii" #define STRING_CMD_IDS_USAGE_LIST "Pokazuje IDki pasujących zadań, w formie listy" #define STRING_CMD_IDS_USAGE_RANGE "Pokazuje IDki pasujących zadań, w formie zakresu" #define STRING_CMD_IDS_USAGE_ZSH "Pokazuje IDki i opisy pasujących zadań" diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h index 24ade6d88..2a8b91f84 100644 --- a/src/l10n/por-PRT.h +++ b/src/l10n/por-PRT.h @@ -28,11 +28,6 @@ #define INCLUDED_STRINGS #define STRING_CMD_COMTAGS_USAGE "Exibe apenas a lista de todas as marcas em uso, para fins de terminação automática" -#define STRING_CMD_CUSTOM_COUNT "1 tarefa" -#define STRING_CMD_CUSTOM_COUNTN "{1} tarefas" -#define STRING_CMD_CUSTOM_MISMATCH "O número de colunas e de rótulos não é o mesmo no relatório '{1}'." -#define STRING_CMD_CUSTOM_SHOWN "{1} visiveis" -#define STRING_CMD_CUSTOM_TRUNCATED "truncado a {1} linhas" #define STRING_CMD_IDS_USAGE_LIST "Exibe em formato de lista, os IDs das tarefas correspondentes" #define STRING_CMD_IDS_USAGE_RANGE "Exibe como intervalo, os IDs das tarefas correspondentes" #define STRING_CMD_IDS_USAGE_ZSH "Exibe os IDs e descrições das tarefas correspondentes"