From bbc9c0bb476f1d8aff8a79c8154f276d11c9bde7 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sat, 20 Jan 2018 21:12:12 -0500 Subject: [PATCH] l10n: Eliminated STRING_CMD_ANNO_* --- src/commands/CmdAnnotate.cpp | 14 +++++++------- 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 --------- 10 files changed, 7 insertions(+), 88 deletions(-) diff --git a/src/commands/CmdAnnotate.cpp b/src/commands/CmdAnnotate.cpp index 1ae5b1c9e..f837db508 100644 --- a/src/commands/CmdAnnotate.cpp +++ b/src/commands/CmdAnnotate.cpp @@ -41,7 +41,7 @@ CmdAnnotate::CmdAnnotate () { _keyword = "annotate"; _usage = "task annotate "; - _description = STRING_CMD_ANNO_USAGE; + _description = "Adds an annotation to an existing task"; _read_only = false; _displays_id = false; _needs_gc = false; @@ -78,7 +78,7 @@ int CmdAnnotate::execute (std::string&) Task before (task); // Annotate the specified task. - std::string question = format (STRING_CMD_ANNO_CONFIRM, + std::string question = format ("Annotate task {1} '{2}'?", task.identifier (true), task.get ("description")); @@ -88,7 +88,7 @@ int CmdAnnotate::execute (std::string&) { context.tdb2.modify (task); ++count; - feedback_affected (STRING_CMD_ANNO_TASK, task); + feedback_affected ("Annotating task {1} '{2}'.", task); if (context.verbose ("project")) projectChanges[task.get ("project")] = onProjectChange (task, false); @@ -96,7 +96,7 @@ int CmdAnnotate::execute (std::string&) if (task.has ("parent")) { if ((context.config.get ("recurrence.confirmation") == "prompt" - && confirm (STRING_CMD_ANNO_CONFIRM_R)) || + && confirm ("This is a recurring task. Do you want to annotate all pending recurrences of this same task?")) || context.config.getBoolean ("recurrence.confirmation")) { auto siblings = context.tdb2.siblings (task); @@ -105,7 +105,7 @@ int CmdAnnotate::execute (std::string&) sibling.modify (Task::modAnnotate, true); context.tdb2.modify (sibling); ++count; - feedback_affected (STRING_CMD_ANNO_TASK_R, sibling); + feedback_affected ("Annotating recurring task {1} '{2}'.", sibling); } // Annotate the parent @@ -118,7 +118,7 @@ int CmdAnnotate::execute (std::string&) } else { - std::cout << STRING_CMD_ANNO_NO << '\n'; + std::cout << "Task not annotated.\n"; rc = 1; if (_permission_quit) break; @@ -130,7 +130,7 @@ int CmdAnnotate::execute (std::string&) if (change.first != "") context.footnote (change.second); - feedback_affected (count == 1 ? STRING_CMD_ANNO_1 : STRING_CMD_ANNO_N, count); + feedback_affected (count == 1 ? "Annotated {1} task." : "Annotated {1} tasks.", count); return rc; } diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h index b555687e4..ede35d3e8 100644 --- a/src/l10n/deu-DEU.h +++ b/src/l10n/deu-DEU.h @@ -205,15 +205,6 @@ #define STRING_CMD_PREPEND_CONFIRM "Vor Aufgabe {1} '{2}' anfügen?" #define STRING_CMD_PREPEND_NO "Nicht vor Aufgabe angefügt." -#define STRING_CMD_ANNO_USAGE "Kommentiert eine bestehene Aufgabe" -#define STRING_CMD_ANNO_CONFIRM "Aufgabe {1} '{2}' kommentieren?" -#define STRING_CMD_ANNO_TASK "Kommentiere Aufgabe {1} '{2}'." -#define STRING_CMD_ANNO_TASK_R "Kommentiere wiederholende Aufgabe {1} '{2}'." -#define STRING_CMD_ANNO_CONFIRM_R "Dies ist eine wiederholende Aufgabe. Möchten Sie alle offenen Wiederholungen dieser Aufgabe kommentieren?" -#define STRING_CMD_ANNO_NO "Aufgabe nicht kommentiert." -#define STRING_CMD_ANNO_1 "{1} Aufgabe kommentiert." -#define STRING_CMD_ANNO_N "{1} Aufgaben kommentiert." - #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 1354a544c..784b48318 100644 --- a/src/l10n/eng-USA.h +++ b/src/l10n/eng-USA.h @@ -202,15 +202,6 @@ #define STRING_CMD_PREPEND_CONFIRM "Prepend to task {1} '{2}'?" #define STRING_CMD_PREPEND_NO "Task not prepended." -#define STRING_CMD_ANNO_USAGE "Adds an annotation to an existing task" -#define STRING_CMD_ANNO_CONFIRM "Annotate task {1} '{2}'?" -#define STRING_CMD_ANNO_TASK "Annotating task {1} '{2}'." -#define STRING_CMD_ANNO_TASK_R "Annotating recurring task {1} '{2}'." -#define STRING_CMD_ANNO_CONFIRM_R "This is a recurring task. Do you want to annotate all pending recurrences of this same task?" -#define STRING_CMD_ANNO_NO "Task not annotated." -#define STRING_CMD_ANNO_1 "Annotated {1} task." -#define STRING_CMD_ANNO_N "Annotated {1} tasks." - #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 0f5a3e2d7..050b66f29 100644 --- a/src/l10n/epo-RUS.h +++ b/src/l10n/epo-RUS.h @@ -205,15 +205,6 @@ #define STRING_CMD_PREPEND_CONFIRM "Predonis al taskon {1} '{2}'?" #define STRING_CMD_PREPEND_NO "Ne predonis al tasko." -#define STRING_CMD_ANNO_USAGE "Donas komenton al ekzistanta tasko" -#define STRING_CMD_ANNO_CONFIRM "Komenti taskon {1} '{2}'?" -#define STRING_CMD_ANNO_TASK "Komentanta taskon {1} '{2}'." -#define STRING_CMD_ANNO_TASK_R "Komentanta reokazantan taskon {1} '{2}'." -#define STRING_CMD_ANNO_CONFIRM_R "Tiu esta reokazanta tasko. Ĉu vi volas komenti ĉia pendanta okazaĵo de tiu tasko?" -#define STRING_CMD_ANNO_NO "Ne komentis taskon." -#define STRING_CMD_ANNO_1 "Komentis {1} taskon." -#define STRING_CMD_ANNO_N "Komentis {1} taskojn." - #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 9ffd75ccc..c06eeb693 100644 --- a/src/l10n/esp-ESP.h +++ b/src/l10n/esp-ESP.h @@ -211,15 +211,6 @@ #define STRING_CMD_PREPEND_CONFIRM "¿Anteponer texto a la tarea {1} '{2}'?" #define STRING_CMD_PREPEND_NO "Texto no antepuesto." -#define STRING_CMD_ANNO_USAGE "Añade una anotación a una tarea existente" -#define STRING_CMD_ANNO_CONFIRM "¿Anotar la tarea {1} '{2}'?" -#define STRING_CMD_ANNO_TASK "Anotando la tarea {1} '{2}'." -#define STRING_CMD_ANNO_TASK_R "Anotando la tarea recurrente {1} '{2}'." -#define STRING_CMD_ANNO_CONFIRM_R "Esta es una tarea recurrente. ¿Quiere anotar todas las recurrencias pendientes de esta misma tarea?" -#define STRING_CMD_ANNO_NO "Tarea no anotada." -#define STRING_CMD_ANNO_1 "Anotada {1} tarea." -#define STRING_CMD_ANNO_N "Anotadas {1} tareas." - #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 9deba0045..41bf3fee2 100644 --- a/src/l10n/fra-FRA.h +++ b/src/l10n/fra-FRA.h @@ -207,15 +207,6 @@ #define STRING_CMD_PREPEND_CONFIRM "Prepend to task {1} '{2}'?" #define STRING_CMD_PREPEND_NO "Tâche not prepended." -#define STRING_CMD_ANNO_USAGE "Adds an annotation to an existing task" -#define STRING_CMD_ANNO_CONFIRM "Annotate task {1} '{2}'?" -#define STRING_CMD_ANNO_TASK "Annotating task {1} '{2}'." -#define STRING_CMD_ANNO_TASK_R "Annotating recurring task {1} '{2}'." -#define STRING_CMD_ANNO_CONFIRM_R "This is a recurring task. Do you want to annotate all pending recurrences of this same task?" -#define STRING_CMD_ANNO_NO "Tâche non annotée." -#define STRING_CMD_ANNO_1 "Annotated {1} task." -#define STRING_CMD_ANNO_N "Annotated {1} tasks." - #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 82275b321..d109573ca 100644 --- a/src/l10n/ita-ITA.h +++ b/src/l10n/ita-ITA.h @@ -206,15 +206,6 @@ #define STRING_CMD_PREPEND_CONFIRM "Aggiungere all'inizio della descrizione del task {1} '{2}'?" #define STRING_CMD_PREPEND_NO "Aggiunta non effettuata." -#define STRING_CMD_ANNO_USAGE "Aggiunge una annotazione a un task esistente" -#define STRING_CMD_ANNO_CONFIRM "Aggiungere una annotazione al task {1} '{2}'?" -#define STRING_CMD_ANNO_TASK "Aggiunta al task {1} '{2}'." -#define STRING_CMD_ANNO_TASK_R "Aggiunta al task periodico {1} '{2}'." -#define STRING_CMD_ANNO_CONFIRM_R "Questo è un task periodico. Aggiungere una annotazione a tutti i task associati?" -#define STRING_CMD_ANNO_NO "Aggiunta non effettuata." -#define STRING_CMD_ANNO_1 "Aggiunta al task {1}." -#define STRING_CMD_ANNO_N "Aggiunte ai task {1}." - #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 d30d808ae..6c33681ad 100644 --- a/src/l10n/jpn-JPN.h +++ b/src/l10n/jpn-JPN.h @@ -207,15 +207,6 @@ #define STRING_CMD_PREPEND_CONFIRM "Prepend to task {1} '{2}'?" #define STRING_CMD_PREPEND_NO "Task not prepended." -#define STRING_CMD_ANNO_USAGE "既存のタスクに注釈を追加" -#define STRING_CMD_ANNO_CONFIRM "Annotate task {1} '{2}'?" -#define STRING_CMD_ANNO_TASK "タスク{1} に注釈 '{2}' を追加" -#define STRING_CMD_ANNO_TASK_R "Annotating recurring task {1} '{2}'." -#define STRING_CMD_ANNO_CONFIRM_R "This is a recurring task. Do you want to annotate all pending recurrences of this same task?" -#define STRING_CMD_ANNO_NO "Task not annotated." -#define STRING_CMD_ANNO_1 "{1} task に注釈付加." -#define STRING_CMD_ANNO_N "{1} task に注釈付加." - #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 e7932695e..6c013be4f 100644 --- a/src/l10n/pol-POL.h +++ b/src/l10n/pol-POL.h @@ -207,15 +207,6 @@ #define STRING_CMD_PREPEND_CONFIRM "Dodać ciąg do opisu zadania {1} '{2}'?" #define STRING_CMD_PREPEND_NO "Nie dodano ciągu do opisu." -#define STRING_CMD_ANNO_USAGE "Dodaje komentarz do istniejącego zadania" -#define STRING_CMD_ANNO_CONFIRM "Skomentować zadanie {1} '{2}'?" -#define STRING_CMD_ANNO_TASK "Komentowanie zadania {1} '{2}'." -#define STRING_CMD_ANNO_TASK_R "Komentowanie zadania cyklicznego {1} '{2}'." -#define STRING_CMD_ANNO_CONFIRM_R "To zadanie jest cykliczne. Czy chcesz skomentować kolejne zadania w cyklu?" -#define STRING_CMD_ANNO_NO "Nie skomentowano zadania." -#define STRING_CMD_ANNO_1 "Skomentowano {1} zadanie." -#define STRING_CMD_ANNO_N "Skomentowano {1} zadań." - #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 e07e84f59..27068da7d 100644 --- a/src/l10n/por-PRT.h +++ b/src/l10n/por-PRT.h @@ -207,15 +207,6 @@ #define STRING_CMD_PREPEND_CONFIRM "Antepor à tarefa {1} '{2}'?" #define STRING_CMD_PREPEND_NO "Tarefa não anteposta." -#define STRING_CMD_ANNO_USAGE "Adiciona uma anotação a uma tarefa existente" -#define STRING_CMD_ANNO_CONFIRM "Anotar tarefa {1} '{2}'?" -#define STRING_CMD_ANNO_TASK "A anotar tarefa {1} '{2}'." -#define STRING_CMD_ANNO_TASK_R "A anotar tarefa recorrente {1} '{2}'." -#define STRING_CMD_ANNO_CONFIRM_R "Esta é uma tarefa recorrente. Deseja anotar em todas as ocorrências pendentes desta tarefa?" -#define STRING_CMD_ANNO_NO "Tarefa não anotada." -#define STRING_CMD_ANNO_1 "Anotada {1} tarefa." -#define STRING_CMD_ANNO_N "Anotadas {1} tarefas." - #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}'?"