From c937f18ab86890645a805d71ff43034cdf3eb94a Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sun, 21 Jan 2018 11:13:13 -0500 Subject: [PATCH] l10n: Eliminated STRING_CMD_PREPEND_* --- src/commands/CmdPrepend.cpp | 15 +++++++-------- 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(+), 89 deletions(-) diff --git a/src/commands/CmdPrepend.cpp b/src/commands/CmdPrepend.cpp index 56abfb9b4..ec83e65b4 100644 --- a/src/commands/CmdPrepend.cpp +++ b/src/commands/CmdPrepend.cpp @@ -31,7 +31,6 @@ #include #include #include -#include #include extern Context context; @@ -41,7 +40,7 @@ CmdPrepend::CmdPrepend () { _keyword = "prepend"; _usage = "task prepend "; - _description = STRING_CMD_PREPEND_USAGE; + _description = "Prepends text to an existing task description"; _read_only = false; _displays_id = false; _needs_gc = false; @@ -78,7 +77,7 @@ int CmdPrepend::execute (std::string&) Task before (task); // Prepend to the specified task. - std::string question = format (STRING_CMD_PREPEND_CONFIRM, + std::string question = format ("Prepend to task {1} '{2}'?", task.identifier (true), task.get ("description")); @@ -88,7 +87,7 @@ int CmdPrepend::execute (std::string&) { context.tdb2.modify (task); ++count; - feedback_affected (STRING_CMD_PREPEND_TASK, task); + feedback_affected ("Prepending to task {1} '{2}'.", task); if (context.verbose ("project")) projectChanges[task.get ("project")] = onProjectChange (task, false); @@ -96,7 +95,7 @@ int CmdPrepend::execute (std::string&) if (task.has ("parent")) { if ((context.config.get ("recurrence.confirmation") == "prompt" - && confirm (STRING_CMD_PREPEND_CONFIRM_R)) || + && confirm ("This is a recurring task. Do you want to prepend to all pending recurrences of this same task?")) || context.config.getBoolean ("recurrence.confirmation")) { std::vector siblings = context.tdb2.siblings (task); @@ -105,7 +104,7 @@ int CmdPrepend::execute (std::string&) sibling.modify (Task::modPrepend, true); context.tdb2.modify (sibling); ++count; - feedback_affected (STRING_CMD_PREPEND_TASK_R, sibling); + feedback_affected ("Prepending to recurring task {1} '{2}'.", sibling); } // Prepend to the parent @@ -118,7 +117,7 @@ int CmdPrepend::execute (std::string&) } else { - std::cout << STRING_CMD_PREPEND_NO << '\n'; + std::cout << "Task not prepended.\n"; rc = 1; if (_permission_quit) break; @@ -130,7 +129,7 @@ int CmdPrepend::execute (std::string&) if (change.first != "") context.footnote (change.second); - feedback_affected (count == 1 ? STRING_CMD_PREPEND_1 : STRING_CMD_PREPEND_N, count); + feedback_affected (count == 1 ? "Prepended {1} task." : "Prepended {1} tasks.", count); return rc; } diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h index 40c9bb811..a46538d4f 100644 --- a/src/l10n/deu-DEU.h +++ b/src/l10n/deu-DEU.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_PREPEND_USAGE "Stellt einer Aufgabenbeschreibung Text voran" -#define STRING_CMD_PREPEND_1 "Vor {1} Aufgabe vorangestellt." -#define STRING_CMD_PREPEND_N "Vor {1} Aufgaben vorangestellt." -#define STRING_CMD_PREPEND_TASK "Stelle Aufgabe {1} '{2}' voran." -#define STRING_CMD_PREPEND_TASK_R "Stelle wiederholender Aufgabe {1} '{2}' voran." -#define STRING_CMD_PREPEND_CONFIRM_R "Dies ist eine wiederholende Aufgabe. Möchten Sie vor allen offenen Wiederholungen dieser Aufgabe anfügen?" -#define STRING_CMD_PREPEND_CONFIRM "Vor Aufgabe {1} '{2}' anfügen?" -#define STRING_CMD_PREPEND_NO "Nicht vor Aufgabe angefügt." - #define STRING_CMD_IMPORT_USAGE "Importiert eine JSON-Datei" #define STRING_CMD_IMPORT_SUMMARY "{1} Aufgabe importiert." #define STRING_CMD_IMPORT_FILE "Importiere '{1}'" diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h index 0b3c7616a..ce8da5e8e 100644 --- a/src/l10n/eng-USA.h +++ b/src/l10n/eng-USA.h @@ -169,15 +169,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_PREPEND_USAGE "Prepends text to an existing task description" -#define STRING_CMD_PREPEND_1 "Prepended {1} task." -#define STRING_CMD_PREPEND_N "Prepended {1} tasks." -#define STRING_CMD_PREPEND_TASK "Prepending to task {1} '{2}'." -#define STRING_CMD_PREPEND_TASK_R "Prepending to recurring task {1} '{2}'." -#define STRING_CMD_PREPEND_CONFIRM_R "This is a recurring task. Do you want to prepend to all pending recurrences of this same task?" -#define STRING_CMD_PREPEND_CONFIRM "Prepend to task {1} '{2}'?" -#define STRING_CMD_PREPEND_NO "Task not prepended." - #define STRING_CMD_IMPORT_USAGE "Imports JSON files" #define STRING_CMD_IMPORT_SUMMARY "Imported {1} tasks." #define STRING_CMD_IMPORT_FILE "Importing '{1}'" diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h index 50a1414ab..085886b59 100644 --- a/src/l10n/epo-RUS.h +++ b/src/l10n/epo-RUS.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_PREPEND_USAGE "Aldonas tekston antaŭ task-priskribo" -#define STRING_CMD_PREPEND_1 "Predonis al {1} tasko." -#define STRING_CMD_PREPEND_N "Predonis {1} taskoj." -#define STRING_CMD_PREPEND_TASK "Predonanta al tasko {1} '{2}'." -#define STRING_CMD_PREPEND_TASK_R "Predonanta al reokazanta tasko {1} '{2}'." -#define STRING_CMD_PREPEND_CONFIRM_R "Tio estas reokazanta tasko. Ĉu vi volas predoni al ĉia pendanta okazaĵo de ĉi tiu tasko?" -#define STRING_CMD_PREPEND_CONFIRM "Predonis al taskon {1} '{2}'?" -#define STRING_CMD_PREPEND_NO "Ne predonis al tasko." - #define STRING_CMD_IMPORT_USAGE "Importas JSON-dosierojn" #define STRING_CMD_IMPORT_SUMMARY "Importis {1} taskojn." #define STRING_CMD_IMPORT_FILE "Importanta '{1}'" diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h index 6c8468e23..9273915a8 100644 --- a/src/l10n/esp-ESP.h +++ b/src/l10n/esp-ESP.h @@ -178,15 +178,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_PREPEND_USAGE "Antepone texto a la descripción de una tarea existente" -#define STRING_CMD_PREPEND_1 "Antepuesto texto a {1} tarea." -#define STRING_CMD_PREPEND_N "Antepuesto texto a {1} tareas." -#define STRING_CMD_PREPEND_TASK "Anteponiendo texto a la tarea {1} '{2}'." -#define STRING_CMD_PREPEND_TASK_R "Antepuesto texto a la tarea recurrente {1} '{2}'." -#define STRING_CMD_PREPEND_CONFIRM_R "Esta es una tarea recurrente. ¿Quiere anteponer texto a todas las recurrencias pendientes de esta misma tarea?" -#define STRING_CMD_PREPEND_CONFIRM "¿Anteponer texto a la tarea {1} '{2}'?" -#define STRING_CMD_PREPEND_NO "Texto no antepuesto." - #define STRING_CMD_IMPORT_USAGE "Importa archivos JSON" #define STRING_CMD_IMPORT_SUMMARY "Importadas {1} tareas." #define STRING_CMD_IMPORT_FILE "Importando '{1}'" diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h index 0300edb22..eb23e567a 100644 --- a/src/l10n/fra-FRA.h +++ b/src/l10n/fra-FRA.h @@ -174,15 +174,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_PREPEND_USAGE "Prepends text to an existing task description" -#define STRING_CMD_PREPEND_1 "Prepended {1} task." -#define STRING_CMD_PREPEND_N "Prepended {1} tasks." -#define STRING_CMD_PREPEND_TASK "Prepending to task {1} '{2}'." -#define STRING_CMD_PREPEND_TASK_R "Prepending to recurring task {1} '{2}'." -#define STRING_CMD_PREPEND_CONFIRM_R "This is a recurring task. Do you want to prepend to all pending recurrences of this same task?" -#define STRING_CMD_PREPEND_CONFIRM "Prepend to task {1} '{2}'?" -#define STRING_CMD_PREPEND_NO "Tâche not prepended." - #define STRING_CMD_IMPORT_USAGE "Imports JSON files" #define STRING_CMD_IMPORT_SUMMARY "Imported {1} tasks." #define STRING_CMD_IMPORT_FILE "Importing '{1}'" diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h index 5928cfeff..aa94cc400 100644 --- a/src/l10n/ita-ITA.h +++ b/src/l10n/ita-ITA.h @@ -173,15 +173,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_PREPEND_USAGE "Aggiunge testo all'inizio di una descrizione di un task esistente" -#define STRING_CMD_PREPEND_1 "Aggiunta al task {1}." -#define STRING_CMD_PREPEND_N "Aggiunte ai task {1}." -#define STRING_CMD_PREPEND_TASK "Aggiunta al task {1} '{2}'." -#define STRING_CMD_PREPEND_TASK_R "Aggiunta al task periodico {1} '{2}'." -#define STRING_CMD_PREPEND_CONFIRM_R "Questo è un task periodico. Aggiungere il testo all'inizio della descrizione di tutti i task associati?" -#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_IMPORT_USAGE "Importa file JSON" #define STRING_CMD_IMPORT_SUMMARY "Importati {1} task." #define STRING_CMD_IMPORT_FILE "Importazione di '{1}'" diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h index 240c1102f..b43ac117c 100644 --- a/src/l10n/jpn-JPN.h +++ b/src/l10n/jpn-JPN.h @@ -174,15 +174,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_PREPEND_USAGE "Prepends text to an existing task description" -#define STRING_CMD_PREPEND_1 "Prepended {1} task." -#define STRING_CMD_PREPEND_N "Prepended {1} tasks." -#define STRING_CMD_PREPEND_TASK "Prepending to task {1} '{2}'." -#define STRING_CMD_PREPEND_TASK_R "Prepending to recurring task {1} '{2}'." -#define STRING_CMD_PREPEND_CONFIRM_R "This is a recurring task. Do you want to prepend to all pending recurrences of this same task?" -#define STRING_CMD_PREPEND_CONFIRM "Prepend to task {1} '{2}'?" -#define STRING_CMD_PREPEND_NO "Task not prepended." - #define STRING_CMD_IMPORT_USAGE "JSON ファイルをインポート" #define STRING_CMD_IMPORT_SUMMARY "{1} task をインポートしました。" #define STRING_CMD_IMPORT_FILE "'{1}' をインポート中" diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h index 28f6aaedf..5806327d1 100644 --- a/src/l10n/pol-POL.h +++ b/src/l10n/pol-POL.h @@ -174,15 +174,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_PREPEND_USAGE "Dodaje ciąg na początku opisu zadania" -#define STRING_CMD_PREPEND_1 "Dodano ciąg do opisu {1} zadania." -#define STRING_CMD_PREPEND_N "Dodano ciąg do opisu {1} zadań." -#define STRING_CMD_PREPEND_TASK "Dodawanie ciągu do opisu zadania {1} '{2}'." -#define STRING_CMD_PREPEND_TASK_R "Dodawanie ciągu do opisu zadania cyklicznego {1} '{2}'." -#define STRING_CMD_PREPEND_CONFIRM_R "To zadanie jest cykliczne. Czy chcesz dodać ciąg do opisu kolejnych zadań w cyklu?" -#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_IMPORT_USAGE "Importuje pliki JSON" #define STRING_CMD_IMPORT_SUMMARY "Zaimportowano {1} zadań." #define STRING_CMD_IMPORT_FILE "Importowanie '{1}'" diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h index 84859d3df..dba1de0e0 100644 --- a/src/l10n/por-PRT.h +++ b/src/l10n/por-PRT.h @@ -174,15 +174,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_PREPEND_USAGE "Antepõe texto à descrição de uma tarefa existente" -#define STRING_CMD_PREPEND_1 "Anteposta {1} tarefa." -#define STRING_CMD_PREPEND_N "Antepostas {1} tarefas." -#define STRING_CMD_PREPEND_TASK "Antepor à tarefa {1} '{2}'." -#define STRING_CMD_PREPEND_TASK_R "Antepor à tarefa recorrente {1} '{2}'." -#define STRING_CMD_PREPEND_CONFIRM_R "Esta é uma tarefa recorrente. Deseja antepor a todas as ocorrências pendentes desta tarefa?" -#define STRING_CMD_PREPEND_CONFIRM "Antepor à tarefa {1} '{2}'?" -#define STRING_CMD_PREPEND_NO "Tarefa não anteposta." - #define STRING_CMD_IMPORT_USAGE "Importa ficheiros JSON" #define STRING_CMD_IMPORT_SUMMARY "Importadas {1} tarefas." #define STRING_CMD_IMPORT_FILE "A importar '{1}'"