From 12171e3318253bbbbdc8e40db6ee9d86911eac57 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sat, 20 Jan 2018 21:25:31 -0500 Subject: [PATCH] l10n: Eliminated STRING_CMD_PROJECTS_* --- src/commands/CmdProjects.cpp | 16 ++++++++-------- src/commands/CmdSummary.cpp | 4 ++-- src/l10n/deu-DEU.h | 9 --------- src/l10n/eng-USA.h | 9 --------- src/l10n/epo-RUS.h | 9 --------- src/l10n/esp-ESP.h | 9 --------- src/l10n/fra-FRA.h | 9 --------- src/l10n/ita-ITA.h | 9 --------- src/l10n/jpn-JPN.h | 9 --------- src/l10n/pol-POL.h | 9 --------- src/l10n/por-PRT.h | 9 --------- 11 files changed, 10 insertions(+), 91 deletions(-) diff --git a/src/commands/CmdProjects.cpp b/src/commands/CmdProjects.cpp index e116dd482..b1654b4c6 100644 --- a/src/commands/CmdProjects.cpp +++ b/src/commands/CmdProjects.cpp @@ -43,7 +43,7 @@ CmdProjects::CmdProjects () { _keyword = "projects"; _usage = "task projects"; - _description = STRING_CMD_PROJECTS_USAGE; + _description = "Shows all project names used"; _read_only = true; _displays_id = false; _needs_gc = true; @@ -126,7 +126,7 @@ int CmdProjects::execute (std::string& output) } int row = view.addRow (); view.set (row, 0, (project.first == "" - ? STRING_CMD_PROJECTS_NONE + ? "(none)" : indentProject (project.first, " ", '.'))); view.set (row, 1, project.second); processed.push_back (project.first); @@ -140,17 +140,17 @@ int CmdProjects::execute (std::string& output) << view.render () << optionalBlankLine () << (number_projects == 1 - ? format (STRING_CMD_PROJECTS_SUMMARY, number_projects) - : format (STRING_CMD_PROJECTS_SUMMARY2, number_projects)) + ? format ("{1} project", number_projects) + : format ("{1} projects", number_projects)) << ' ' << (quantity == 1 - ? format (STRING_CMD_PROJECTS_TASK, quantity) - : format (STRING_CMD_PROJECTS_TASKS, quantity)) + ? format ("({1} task)", quantity) + : format ("({1} tasks)", quantity)) << '\n'; } else { - out << STRING_CMD_PROJECTS_NO << '\n'; + out << "No projects.\n"; rc = 1; } @@ -163,7 +163,7 @@ CmdCompletionProjects::CmdCompletionProjects () { _keyword = "_projects"; _usage = "task _projects"; - _description = STRING_CMD_PROJECTS_USAGE_2; + _description = "Shows only a list of all project names used"; _read_only = true; _displays_id = false; _needs_gc = true; diff --git a/src/commands/CmdSummary.cpp b/src/commands/CmdSummary.cpp index 880bdf625..1fd483d9b 100644 --- a/src/commands/CmdSummary.cpp +++ b/src/commands/CmdSummary.cpp @@ -210,11 +210,11 @@ int CmdSummary::execute (std::string& output) << view.render () << optionalBlankLine (); - out << format (STRING_CMD_PROJECTS_SUMMARY2, view.rows ()) << '\n'; + out << format ("{1} projects\n", view.rows ()); } else { - out << STRING_CMD_PROJECTS_NO << '\n'; + out << "No projects.\n"; rc = 1; } diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h index 8fda5e42b..e38210476 100644 --- a/src/l10n/deu-DEU.h +++ b/src/l10n/deu-DEU.h @@ -170,15 +170,6 @@ #define STRING_CMD_UNIQUE_MISSING "An attribute must be specified. See 'task _columns'." #define STRING_CMD_UNIQUE_VALID "You must specify an attribute or UDA." -#define STRING_CMD_PROJECTS_USAGE "Zeigt alle genutzten Projektnamen" -#define STRING_CMD_PROJECTS_USAGE_2 "Zeigt ausschließlich alle genutzten Projektnamen" -#define STRING_CMD_PROJECTS_NO "Keine Projekte." -#define STRING_CMD_PROJECTS_NONE "(keine)" -#define STRING_CMD_PROJECTS_SUMMARY "{1} Projekt" -#define STRING_CMD_PROJECTS_SUMMARY2 "{1} Projekte" -#define STRING_CMD_PROJECTS_TASK "({1} Aufgabe)" -#define STRING_CMD_PROJECTS_TASKS "({1} Aufgaben)" - #define STRING_CMD_PURGE_USAGE "Removes the specified tasks from the data files. Causes permanent loss of data." #define STRING_CMD_PURGE_ABRT "Purge operation aborted." #define STRING_CMD_PURGE_1 "Purged {1} task." diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h index 568ce5794..355875026 100644 --- a/src/l10n/eng-USA.h +++ b/src/l10n/eng-USA.h @@ -167,15 +167,6 @@ #define STRING_CMD_UNIQUE_MISSING "An attribute must be specified. See 'task _columns'." #define STRING_CMD_UNIQUE_VALID "You must specify an attribute or UDA." -#define STRING_CMD_PROJECTS_USAGE "Shows all project names used" -#define STRING_CMD_PROJECTS_USAGE_2 "Shows only a list of all project names used" -#define STRING_CMD_PROJECTS_NO "No projects." -#define STRING_CMD_PROJECTS_NONE "(none)" -#define STRING_CMD_PROJECTS_SUMMARY "{1} project" -#define STRING_CMD_PROJECTS_SUMMARY2 "{1} projects" -#define STRING_CMD_PROJECTS_TASK "({1} task)" -#define STRING_CMD_PROJECTS_TASKS "({1} tasks)" - #define STRING_CMD_PURGE_USAGE "Removes the specified tasks from the data files. Causes permanent loss of data." #define STRING_CMD_PURGE_ABRT "Purge operation aborted." #define STRING_CMD_PURGE_1 "Purged {1} task." diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h index 97f2f61d2..c366a980e 100644 --- a/src/l10n/epo-RUS.h +++ b/src/l10n/epo-RUS.h @@ -170,15 +170,6 @@ #define STRING_CMD_UNIQUE_MISSING "An attribute must be specified. See 'task _columns'." #define STRING_CMD_UNIQUE_VALID "You must specify an attribute or UDA." -#define STRING_CMD_PROJECTS_USAGE "Montras la uzatajn projekt-nomojn" -#define STRING_CMD_PROJECTS_USAGE_2 "Montras sole liston de ĉia uzata projekt-nomo" -#define STRING_CMD_PROJECTS_NO "Nenia projekto." -#define STRING_CMD_PROJECTS_NONE "(nenio)" -#define STRING_CMD_PROJECTS_SUMMARY "{1} projekto" -#define STRING_CMD_PROJECTS_SUMMARY2 "{1} projektoj" -#define STRING_CMD_PROJECTS_TASK "({1} tasko)" -#define STRING_CMD_PROJECTS_TASKS "({1} taskoj)" - #define STRING_CMD_PURGE_USAGE "Removes the specified tasks from the data files. Causes permanent loss of data." #define STRING_CMD_PURGE_ABRT "Purge operation aborted." #define STRING_CMD_PURGE_1 "Purged {1} task." diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h index bddeb2557..2af95ebbb 100644 --- a/src/l10n/esp-ESP.h +++ b/src/l10n/esp-ESP.h @@ -176,15 +176,6 @@ #define STRING_CMD_UNIQUE_MISSING "Se debe especificar un atributo. Ver 'task _columns'." #define STRING_CMD_UNIQUE_VALID "Debe especificar un atributo o un UDA." -#define STRING_CMD_PROJECTS_USAGE "Muestra todos los nombres de proyecto en uso" -#define STRING_CMD_PROJECTS_USAGE_2 "Muestra una lista de todos los nombres (solamente) de proyecto en uso" -#define STRING_CMD_PROJECTS_NO "No hay proyectos." -#define STRING_CMD_PROJECTS_NONE "(ninguno)" -#define STRING_CMD_PROJECTS_SUMMARY "{1} proyecto" -#define STRING_CMD_PROJECTS_SUMMARY2 "{1} proyectos" -#define STRING_CMD_PROJECTS_TASK "({1} tarea)" -#define STRING_CMD_PROJECTS_TASKS "({1} tareas)" - #define STRING_CMD_PURGE_USAGE "Removes the specified tasks from the data files. Causes permanent loss of data." #define STRING_CMD_PURGE_ABRT "Purge operation aborted." #define STRING_CMD_PURGE_1 "Purged {1} task." diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h index ac17006ec..3e0abbe91 100644 --- a/src/l10n/fra-FRA.h +++ b/src/l10n/fra-FRA.h @@ -172,15 +172,6 @@ #define STRING_CMD_UNIQUE_MISSING "An attribute must be specified. See 'task _columns'." #define STRING_CMD_UNIQUE_VALID "You must specify an attribute or UDA." -#define STRING_CMD_PROJECTS_USAGE "Shows all project names used" -#define STRING_CMD_PROJECTS_USAGE_2 "Shows only a list of all project names used" -#define STRING_CMD_PROJECTS_NO "No projects." -#define STRING_CMD_PROJECTS_NONE "(none)" -#define STRING_CMD_PROJECTS_SUMMARY "{1} project" -#define STRING_CMD_PROJECTS_SUMMARY2 "{1} projects" -#define STRING_CMD_PROJECTS_TASK "({1} task)" -#define STRING_CMD_PROJECTS_TASKS "({1} tasks)" - #define STRING_CMD_PURGE_USAGE "Removes the specified tasks from the data files. Causes permanent loss of data." #define STRING_CMD_PURGE_ABRT "Purge operation aborted." #define STRING_CMD_PURGE_1 "Purged {1} task." diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h index cea2a8c36..0c729d399 100644 --- a/src/l10n/ita-ITA.h +++ b/src/l10n/ita-ITA.h @@ -171,15 +171,6 @@ #define STRING_CMD_UNIQUE_MISSING "An attribute must be specified. See 'task _columns'." #define STRING_CMD_UNIQUE_VALID "You must specify an attribute or UDA." -#define STRING_CMD_PROJECTS_USAGE "Mostra tutti i nomi di progetto utilizzati" -#define STRING_CMD_PROJECTS_USAGE_2 "Mostra solo i nomi di progetto utilizzati" -#define STRING_CMD_PROJECTS_NO "Nessun progetto." -#define STRING_CMD_PROJECTS_NONE "(nessuno)" -#define STRING_CMD_PROJECTS_SUMMARY "{1} progetto" -#define STRING_CMD_PROJECTS_SUMMARY2 "{1} progetti" -#define STRING_CMD_PROJECTS_TASK "({1} task)" -#define STRING_CMD_PROJECTS_TASKS "({1} task)" - #define STRING_CMD_PURGE_USAGE "Removes the specified tasks from the data files. Causes permanent loss of data." #define STRING_CMD_PURGE_ABRT "Purge operation aborted." #define STRING_CMD_PURGE_1 "Purged {1} task." diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h index 5267bf944..efacc1609 100644 --- a/src/l10n/jpn-JPN.h +++ b/src/l10n/jpn-JPN.h @@ -172,15 +172,6 @@ #define STRING_CMD_UNIQUE_MISSING "An attribute must be specified. See 'task _columns'." #define STRING_CMD_UNIQUE_VALID "You must specify an attribute or UDA." -#define STRING_CMD_PROJECTS_USAGE "Shows all project names used" -#define STRING_CMD_PROJECTS_USAGE_2 "Shows only a list of all project names used" -#define STRING_CMD_PROJECTS_NO "プロジェクトがない。" -#define STRING_CMD_PROJECTS_NONE "(none)" -#define STRING_CMD_PROJECTS_SUMMARY "{1} プロジェクト" -#define STRING_CMD_PROJECTS_SUMMARY2 "{1} プロジェクト" -#define STRING_CMD_PROJECTS_TASK "({1} タスク)" -#define STRING_CMD_PROJECTS_TASKS "({1} タスク)" - #define STRING_CMD_PURGE_USAGE "Removes the specified tasks from the data files. Causes permanent loss of data." #define STRING_CMD_PURGE_ABRT "Purge operation aborted." #define STRING_CMD_PURGE_1 "Purged {1} task." diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h index a2986ecab..31d44e447 100644 --- a/src/l10n/pol-POL.h +++ b/src/l10n/pol-POL.h @@ -172,15 +172,6 @@ #define STRING_CMD_UNIQUE_MISSING "An attribute must be specified. See 'task _columns'." #define STRING_CMD_UNIQUE_VALID "You must specify an attribute or UDA." -#define STRING_CMD_PROJECTS_USAGE "Pokazuje statystyki wszystkich projektów" -#define STRING_CMD_PROJECTS_USAGE_2 "Pokazuje tylko nazwy prowadzonych projektów" -#define STRING_CMD_PROJECTS_NO "Brak projektów" -#define STRING_CMD_PROJECTS_NONE "(brak)" -#define STRING_CMD_PROJECTS_SUMMARY "{1} projekt" -#define STRING_CMD_PROJECTS_SUMMARY2 "{1} projektów" -#define STRING_CMD_PROJECTS_TASK "({1} zadanie)" -#define STRING_CMD_PROJECTS_TASKS "({1} zadań)" - #define STRING_CMD_PURGE_USAGE "Removes the specified tasks from the data files. Causes permanent loss of data." #define STRING_CMD_PURGE_ABRT "Purge operation aborted." #define STRING_CMD_PURGE_1 "Purged {1} task." diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h index ed7ae1360..d06dfd780 100644 --- a/src/l10n/por-PRT.h +++ b/src/l10n/por-PRT.h @@ -172,15 +172,6 @@ #define STRING_CMD_UNIQUE_MISSING "An attribute must be specified. See 'task _columns'." #define STRING_CMD_UNIQUE_VALID "You must specify an attribute or UDA." -#define STRING_CMD_PROJECTS_USAGE "Exibe todos os nomes de projeto em uso" -#define STRING_CMD_PROJECTS_USAGE_2 "Exibe apenas uma lista de todos os nomes de projeto em uso" -#define STRING_CMD_PROJECTS_NO "Sem projetos." -#define STRING_CMD_PROJECTS_NONE "(nenhum)" -#define STRING_CMD_PROJECTS_SUMMARY "{1} projeto" -#define STRING_CMD_PROJECTS_SUMMARY2 "{1} projetos" -#define STRING_CMD_PROJECTS_TASK "({1} tarefa)" -#define STRING_CMD_PROJECTS_TASKS "({1} tarefas)" - #define STRING_CMD_PURGE_USAGE "Removes the specified tasks from the data files. Causes permanent loss of data." #define STRING_CMD_PURGE_ABRT "Purge operation aborted." #define STRING_CMD_PURGE_1 "Purged {1} task."