From 44a94b0b50071b15c9bf40b400fb82e51323c815 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sat, 20 Jan 2018 21:29:51 -0500 Subject: [PATCH] l10n: Eliminated STRING_CMD_PURGE_* --- src/commands/CmdPurge.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/CmdPurge.cpp b/src/commands/CmdPurge.cpp index 55d3dc758..19905d4f3 100644 --- a/src/commands/CmdPurge.cpp +++ b/src/commands/CmdPurge.cpp @@ -40,7 +40,7 @@ CmdPurge::CmdPurge () { _keyword = "purge"; _usage = "task purge"; - _description = STRING_CMD_PURGE_USAGE; + _description = "Removes the specified tasks from the data files. Causes permanent loss of data."; _read_only = false; _displays_id = false; _needs_confirm = true; @@ -104,7 +104,7 @@ void CmdPurge::handleChildren (Task& task, int& count) { if (child.getStatus () != Task::deleted) // In case any child task is not deleted, bail out - throw format (STRING_CMD_PURGE_NDEL_CHILD, + throw format ("Task '{1}' is a recurrence template. Its child task {2} must be deleted before it can be purged.", task.get ("description"), child.identifier (true)); else @@ -117,7 +117,7 @@ void CmdPurge::handleChildren (Task& task, int& count) return; // Ask for confirmation to purge them, if needed - std::string question = format (STRING_CMD_PURGE_CONFIRM_R, + std::string question = format ("Task '{1}' is a recurrence template. All its {2} deleted children tasks will be purged as well. Continue?", task.get ("description"), children.size ()); @@ -129,7 +129,7 @@ void CmdPurge::handleChildren (Task& task, int& count) purgeTask (child, count); } else - throw std::string (STRING_CMD_PURGE_ABRT); + throw std::string ("Purge operation aborted."); } @@ -160,7 +160,7 @@ int CmdPurge::execute (std::string&) if (task.getStatus () == Task::deleted) { std::string question; - question = format (STRING_CMD_PURGE_CONFIRM, + question = format ("Permanently remove task {1} '{2}'?", task.identifier (true), task.get ("description")); @@ -169,7 +169,7 @@ int CmdPurge::execute (std::string&) } } - feedback_affected (count == 1 ? STRING_CMD_PURGE_1 : STRING_CMD_PURGE_N, count); + feedback_affected (count == 1 ? "Purged {1} task." : "Purged {1} tasks.", count); return rc; } diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h index e38210476..d94f9c7bd 100644 --- a/src/l10n/deu-DEU.h +++ b/src/l10n/deu-DEU.h @@ -170,14 +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_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." -#define STRING_CMD_PURGE_N "Purged {1} tasks." -#define STRING_CMD_PURGE_CONFIRM "Permanently remove task {1} '{2}'?" -#define STRING_CMD_PURGE_CONFIRM_R "Task '{1}' is a recurrence template. All its {2} deleted children tasks will be purged as well. Continue?" -#define STRING_CMD_PURGE_NDEL_CHILD "Task '{1}' is a recurrence template. Its child task {2} must be deleted before it can be purged." - #define STRING_CMD_APPEND_USAGE "Fügt einer Aufgabenbeschreibung Text hinzu" #define STRING_CMD_APPEND_1 "Zu {1} Aufgabe hinzugefügt." #define STRING_CMD_APPEND_N "Zu {1} Aufgaben hinzugefügt." diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h index 355875026..52a133816 100644 --- a/src/l10n/eng-USA.h +++ b/src/l10n/eng-USA.h @@ -167,14 +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_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." -#define STRING_CMD_PURGE_N "Purged {1} tasks." -#define STRING_CMD_PURGE_CONFIRM "Permanently remove task {1} '{2}'?" -#define STRING_CMD_PURGE_CONFIRM_R "Task '{1}' is a recurrence template. All its {2} deleted children tasks will be purged as well. Continue?" -#define STRING_CMD_PURGE_NDEL_CHILD "Task '{1}' is a recurrence template. Its child task {2} must be deleted before it can be purged." - #define STRING_CMD_APPEND_USAGE "Appends text to an existing task description" #define STRING_CMD_APPEND_1 "Appended {1} task." #define STRING_CMD_APPEND_N "Appended {1} tasks." diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h index c366a980e..e1f5cdec2 100644 --- a/src/l10n/epo-RUS.h +++ b/src/l10n/epo-RUS.h @@ -170,14 +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_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." -#define STRING_CMD_PURGE_N "Purged {1} tasks." -#define STRING_CMD_PURGE_CONFIRM "Permanently remove task {1} '{2}'?" -#define STRING_CMD_PURGE_CONFIRM_R "Task '{1}' is a recurrence template. All its {2} deleted children tasks will be purged as well. Continue?" -#define STRING_CMD_PURGE_NDEL_CHILD "Task '{1}' is a recurrence template. Its child task {2} must be deleted before it can be purged." - #define STRING_CMD_APPEND_USAGE "Aldonas tekston post task-priskribo" #define STRING_CMD_APPEND_1 "Aldonis al {1} tasko." #define STRING_CMD_APPEND_N "Aldonis al {1} taskoj." diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h index 2af95ebbb..dacbb5450 100644 --- a/src/l10n/esp-ESP.h +++ b/src/l10n/esp-ESP.h @@ -176,14 +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_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." -#define STRING_CMD_PURGE_N "Purged {1} tasks." -#define STRING_CMD_PURGE_CONFIRM "Permanently remove task {1} '{2}'?" -#define STRING_CMD_PURGE_CONFIRM_R "Task '{1}' is a recurrence template. All its {2} deleted children tasks will be purged as well. Continue?" -#define STRING_CMD_PURGE_NDEL_CHILD "Task '{1}' is a recurrence template. Its child task {2} must be deleted before it can be purged." - #define STRING_CMD_APPEND_USAGE "Añade texto al final de la descripción de una tarea existente" #define STRING_CMD_APPEND_1 "Añadiendo texto a {1} tarea." #define STRING_CMD_APPEND_N "Añadiendo texto a {1} tareas." diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h index 3e0abbe91..be897936b 100644 --- a/src/l10n/fra-FRA.h +++ b/src/l10n/fra-FRA.h @@ -172,14 +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_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." -#define STRING_CMD_PURGE_N "Purged {1} tasks." -#define STRING_CMD_PURGE_CONFIRM "Permanently remove task {1} '{2}'?" -#define STRING_CMD_PURGE_CONFIRM_R "Task '{1}' is a recurrence template. All its {2} deleted children tasks will be purged as well. Continue?" -#define STRING_CMD_PURGE_NDEL_CHILD "Task '{1}' is a recurrence template. Its child task {2} must be deleted before it can be purged." - #define STRING_CMD_APPEND_USAGE "Appends text to an existing task description" #define STRING_CMD_APPEND_1 "Appended {1} task." #define STRING_CMD_APPEND_N "Appended {1} tasks." diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h index 0c729d399..ec5f016b6 100644 --- a/src/l10n/ita-ITA.h +++ b/src/l10n/ita-ITA.h @@ -171,14 +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_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." -#define STRING_CMD_PURGE_N "Purged {1} tasks." -#define STRING_CMD_PURGE_CONFIRM "Permanently remove task {1} '{2}'?" -#define STRING_CMD_PURGE_CONFIRM_R "Task '{1}' is a recurrence template. All its {2} deleted children tasks will be purged as well. Continue?" -#define STRING_CMD_PURGE_NDEL_CHILD "Task '{1}' is a recurrence template. Its child task {2} must be deleted before it can be purged." - #define STRING_CMD_APPEND_USAGE "Aggiunge testo alla fine di una descrizione di un task esistente" #define STRING_CMD_APPEND_1 "Aggiunta al task {1}." #define STRING_CMD_APPEND_N "Aggiunte ai task {1}." diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h index efacc1609..725d4a3c4 100644 --- a/src/l10n/jpn-JPN.h +++ b/src/l10n/jpn-JPN.h @@ -172,14 +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_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." -#define STRING_CMD_PURGE_N "Purged {1} tasks." -#define STRING_CMD_PURGE_CONFIRM "Permanently remove task {1} '{2}'?" -#define STRING_CMD_PURGE_CONFIRM_R "Task '{1}' is a recurrence template. All its {2} deleted children tasks will be purged as well. Continue?" -#define STRING_CMD_PURGE_NDEL_CHILD "Task '{1}' is a recurrence template. Its child task {2} must be deleted before it can be purged." - #define STRING_CMD_APPEND_USAGE "存在する task 説明文にテキストを追加" #define STRING_CMD_APPEND_1 "{1} タスク を追加。" #define STRING_CMD_APPEND_N "{1} タスク を追加。" diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h index 31d44e447..859540f59 100644 --- a/src/l10n/pol-POL.h +++ b/src/l10n/pol-POL.h @@ -172,14 +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_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." -#define STRING_CMD_PURGE_N "Purged {1} tasks." -#define STRING_CMD_PURGE_CONFIRM "Permanently remove task {1} '{2}'?" -#define STRING_CMD_PURGE_CONFIRM_R "Task '{1}' is a recurrence template. All its {2} deleted children tasks will be purged as well. Continue?" -#define STRING_CMD_PURGE_NDEL_CHILD "Task '{1}' is a recurrence template. Its child task {2} must be deleted before it can be purged." - #define STRING_CMD_APPEND_USAGE "Dodaje ciąg na końcu opisu zadania" #define STRING_CMD_APPEND_1 "Dodano ciąg do opisu {1} zadania" #define STRING_CMD_APPEND_N "Dodano ciąg do opisu {1} zadań" diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h index d06dfd780..82c6ace2b 100644 --- a/src/l10n/por-PRT.h +++ b/src/l10n/por-PRT.h @@ -172,14 +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_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." -#define STRING_CMD_PURGE_N "Purged {1} tasks." -#define STRING_CMD_PURGE_CONFIRM "Permanently remove task {1} '{2}'?" -#define STRING_CMD_PURGE_CONFIRM_R "Task '{1}' is a recurrence template. All its {2} deleted children tasks will be purged as well. Continue?" -#define STRING_CMD_PURGE_NDEL_CHILD "Task '{1}' is a recurrence template. Its child task {2} must be deleted before it can be purged." - #define STRING_CMD_APPEND_USAGE "Acrescenta texto à descrição de uma tarefa existente" #define STRING_CMD_APPEND_1 "Acrescentada {1} tarefa." #define STRING_CMD_APPEND_N "Acrescentadas {1} tarefas."