From 9244828618a62c1ec304a7c3d21f6fb310994c54 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sat, 20 Jan 2018 15:04:10 -0500 Subject: [PATCH] l10n: Eliminated STRING_CMD_DONE_* --- src/commands/CmdDone.cpp | 12 ++++++------ src/l10n/deu-DEU.h | 8 -------- src/l10n/eng-USA.h | 8 -------- src/l10n/epo-RUS.h | 8 -------- src/l10n/esp-ESP.h | 8 -------- src/l10n/fra-FRA.h | 8 -------- src/l10n/ita-ITA.h | 8 -------- src/l10n/jpn-JPN.h | 8 -------- src/l10n/pol-POL.h | 8 -------- src/l10n/por-PRT.h | 8 -------- 10 files changed, 6 insertions(+), 78 deletions(-) diff --git a/src/commands/CmdDone.cpp b/src/commands/CmdDone.cpp index 0d591f022..c066dc185 100644 --- a/src/commands/CmdDone.cpp +++ b/src/commands/CmdDone.cpp @@ -41,7 +41,7 @@ CmdDone::CmdDone () { _keyword = "done"; _usage = "task done "; - _description = STRING_CMD_DONE_USAGE; + _description = "Marks the specified task as completed"; _read_only = false; _displays_id = false; _needs_gc = false; @@ -80,7 +80,7 @@ int CmdDone::execute (std::string&) task.getStatus () == Task::waiting) { // Complete the specified task. - std::string question = format (STRING_CMD_DONE_CONFIRM, + std::string question = format ("Complete task {1} '{2}'?", task.identifier (true), task.get ("description")); @@ -102,7 +102,7 @@ int CmdDone::execute (std::string&) updateRecurrenceMask (task); context.tdb2.modify (task); ++count; - feedback_affected (STRING_CMD_DONE_TASK, task); + feedback_affected ("Completed task {1} '{2}'.", task); feedback_unblocked (task); if (!nagged) nagged = nag (task); @@ -112,7 +112,7 @@ int CmdDone::execute (std::string&) } else { - std::cout << STRING_CMD_DONE_NO << '\n'; + std::cout << "Task not completed.\n"; rc = 1; if (_permission_quit) break; @@ -120,7 +120,7 @@ int CmdDone::execute (std::string&) } else { - std::cout << format (STRING_CMD_DONE_NOTPEND, + std::cout << format ("Task {1} '{2}' is neither pending nor waiting.", task.identifier (true), task.get ("description")) << '\n'; @@ -133,7 +133,7 @@ int CmdDone::execute (std::string&) if (change.first != "") context.footnote (change.second); - feedback_affected (count == 1 ? STRING_CMD_DONE_1 : STRING_CMD_DONE_N, count); + feedback_affected (count == 1 ? "Completed {1} task." : "Completed {1} tasks.", count); return rc; } diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h index db0de6306..871f4ce5c 100644 --- a/src/l10n/deu-DEU.h +++ b/src/l10n/deu-DEU.h @@ -194,14 +194,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_DONE_USAGE "Kennzeichnet die gewählte Aufgabe als erledigt" -#define STRING_CMD_DONE_CONFIRM "Aufgabe {1} '{2}' als erledigt kennzeichnen?" -#define STRING_CMD_DONE_TASK "Aufgabe {1} '{2}' erledigt." -#define STRING_CMD_DONE_NO "Aufgabe nicht erledigt." -#define STRING_CMD_DONE_NOTPEND "Aufgabe {1} '{2}' ist weder offen noch aufgeschoben." -#define STRING_CMD_DONE_1 "{1} Aufgabe erledigt." -#define STRING_CMD_DONE_N "{1} Aufgaben erledigt." - #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." diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h index e0a83fd70..3ba43013b 100644 --- a/src/l10n/eng-USA.h +++ b/src/l10n/eng-USA.h @@ -191,14 +191,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_DONE_USAGE "Marks the specified task as completed" -#define STRING_CMD_DONE_CONFIRM "Complete task {1} '{2}'?" -#define STRING_CMD_DONE_TASK "Completed task {1} '{2}'." -#define STRING_CMD_DONE_NO "Task not completed." -#define STRING_CMD_DONE_NOTPEND "Task {1} '{2}' is neither pending nor waiting." -#define STRING_CMD_DONE_1 "Completed {1} task." -#define STRING_CMD_DONE_N "Completed {1} tasks." - #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." diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h index 6413acf93..c9a793035 100644 --- a/src/l10n/epo-RUS.h +++ b/src/l10n/epo-RUS.h @@ -194,14 +194,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_DONE_USAGE "Markas la specifatan taskon kiel finita" -#define STRING_CMD_DONE_CONFIRM "Fini taskon {1} '{2}'?" -#define STRING_CMD_DONE_TASK "Finis taskon {1} '{2}'." -#define STRING_CMD_DONE_NO "Tasko nefinita." -#define STRING_CMD_DONE_NOTPEND "La tasko {1} '{2}' ne estas ni pendanta ni atendanta." -#define STRING_CMD_DONE_1 "Finis {1} taskon." -#define STRING_CMD_DONE_N "Finis {1} taskojn." - #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." diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h index d8a92fa96..54a0e833d 100644 --- a/src/l10n/esp-ESP.h +++ b/src/l10n/esp-ESP.h @@ -202,14 +202,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_DONE_USAGE "Marca la tarea especificada como completada" -#define STRING_CMD_DONE_CONFIRM "¿Completar tarea {1} '{2}'?" -#define STRING_CMD_DONE_TASK "Completada tarea {1} '{2}'." -#define STRING_CMD_DONE_NO "Tarea no completada." -#define STRING_CMD_DONE_NOTPEND "La tarea {1} '{2}' no está pendiente ni esperando." -#define STRING_CMD_DONE_1 "Completada {1} tarea." -#define STRING_CMD_DONE_N "Completadas {1} tareas." - #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." diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h index c62be3994..aa0fa6d33 100644 --- a/src/l10n/fra-FRA.h +++ b/src/l10n/fra-FRA.h @@ -196,14 +196,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_DONE_USAGE "Marque la tâche spécifiée comme terminée" -#define STRING_CMD_DONE_CONFIRM "Terminer la tâche {1} '{2}'?" -#define STRING_CMD_DONE_TASK "Tâche {1} '{2}' terminée." -#define STRING_CMD_DONE_NO "Tâche non terminée." -#define STRING_CMD_DONE_NOTPEND "Tâche {1} '{2}' n'est plus ni en cours, ni en attente." -#define STRING_CMD_DONE_1 "{1} tâche terminée." -#define STRING_CMD_DONE_N "{1} tâches terminées." - #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." diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h index 4ce96765b..7473338ad 100644 --- a/src/l10n/ita-ITA.h +++ b/src/l10n/ita-ITA.h @@ -195,14 +195,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_DONE_USAGE "Contrassegna il task specificato come completato" -#define STRING_CMD_DONE_CONFIRM "Completare il task {1} '{2}'?" -#define STRING_CMD_DONE_TASK "Task completato {1} '{2}'." -#define STRING_CMD_DONE_NO "Task non completato." -#define STRING_CMD_DONE_NOTPEND "Il task {1} '{2}' non è ne' pendente ne' in attesa." -#define STRING_CMD_DONE_1 "Completato {1} task." -#define STRING_CMD_DONE_N "Completati {1} task." - #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." diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h index 634ea0abe..2de22f97d 100644 --- a/src/l10n/jpn-JPN.h +++ b/src/l10n/jpn-JPN.h @@ -196,14 +196,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_DONE_USAGE "Marks the specified task as completed" -#define STRING_CMD_DONE_CONFIRM "タスク {1} '{2}' を完了?" -#define STRING_CMD_DONE_TASK "タスク {1} '{2}' を完了します。" -#define STRING_CMD_DONE_NO "タスク は完了しなかった。" -#define STRING_CMD_DONE_NOTPEND "Task {1} '{2}' is neither pending nor waiting." -#define STRING_CMD_DONE_1 "{1} task を完了。" -#define STRING_CMD_DONE_N "{1} task を完了。" - #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 "プロジェクトがない。" diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h index 58381efdb..0c52e615e 100644 --- a/src/l10n/pol-POL.h +++ b/src/l10n/pol-POL.h @@ -196,14 +196,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_DONE_USAGE "Oznacza wybrane zadanie jako zakończone" -#define STRING_CMD_DONE_CONFIRM "Zakończyć zadanie {1} '{2}'?" -#define STRING_CMD_DONE_TASK "Zakończono zadanie {1} '{2}'." -#define STRING_CMD_DONE_NO "Zadanie niezakończone." -#define STRING_CMD_DONE_NOTPEND "Zadanie {1} '{2}' nie jest realizowane ani oczekujące." -#define STRING_CMD_DONE_1 "Zakończono {1} zadanie." -#define STRING_CMD_DONE_N "Zakończono {1} zadań." - #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" diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h index f81bb2a2a..3b6b9e914 100644 --- a/src/l10n/por-PRT.h +++ b/src/l10n/por-PRT.h @@ -196,14 +196,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_DONE_USAGE "Concluí a tarefa indicada" -#define STRING_CMD_DONE_CONFIRM "Concluír tarefa {1} '{2}'?" -#define STRING_CMD_DONE_TASK "Concluída tarefa {1} '{2}'." -#define STRING_CMD_DONE_NO "Tarefa não concluída." -#define STRING_CMD_DONE_NOTPEND "Tarefa {1} '{2}' não está pendente nem em espera." -#define STRING_CMD_DONE_1 "Concluída {1} tarefa." -#define STRING_CMD_DONE_N "Concluída {1} tarefas." - #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."