l10n: Eliminated STRING_CMD_DELETE_*

src/commands/CmdDelete.cpp

@@ -34,6 +34,9 @@
 #include <i18n.h>
 #include <main.h>
 
+#define STRING_CMD_DELETE_TASK_R     "Deleting recurring task {1} '{2}'."
+#define STRING_CMD_DELETE_CONFIRM_R  "This is a recurring task.  Do you want to delete all pending recurrences of this same task?"
+
 extern Context context;
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -41,7 +44,7 @@ CmdDelete::CmdDelete ()
 {
   _keyword               = "delete";
   _usage                 = "task <filter> delete <mods>";
-  _description           = STRING_CMD_DELETE_USAGE;
+  _description           = "Deletes the specified task";
   _read_only             = false;
   _displays_id           = false;
   _needs_confirm         = true;
@@ -80,7 +83,7 @@ int CmdDelete::execute (std::string&)
     {
       // Delete the specified task.
       std::string question;
-      question = format (STRING_CMD_DELETE_CONFIRM,
+      question = format ("Delete task {1} '{2}'?",
                          task.identifier (true),
                          task.get ("description"));
 
@@ -94,7 +97,7 @@ int CmdDelete::execute (std::string&)
         updateRecurrenceMask (task);
         ++count;
         context.tdb2.modify (task);
-        feedback_affected (STRING_CMD_DELETE_TASK, task);
+        feedback_affected ("Deleting task {1} '{2}'.", task);
         feedback_unblocked (task);
         dependencyChainOnComplete (task);
         if (context.verbose ("project"))
@@ -159,7 +162,7 @@ int CmdDelete::execute (std::string&)
       }
       else
       {
-        std::cout << STRING_CMD_DELETE_NO << '\n';
+        std::cout << "Task not deleted.\n";
         rc = 1;
         if (_permission_quit)
           break;
@@ -167,7 +170,7 @@ int CmdDelete::execute (std::string&)
     }
     else
     {
-      std::cout << format (STRING_CMD_DELETE_NOT_DEL,
+      std::cout << format ("Task {1} '{2}' is not deletable.",
                            task.identifier (true),
                            task.get ("description"))
           << '\n';
@@ -180,7 +183,8 @@ int CmdDelete::execute (std::string&)
     if (change.first != "")
       context.footnote (change.second);
 
-  feedback_affected (count == 1 ? STRING_CMD_DELETE_1 : STRING_CMD_DELETE_N, count);
+  feedback_affected (count == 1 ? "Deleted {1} task." : "Deleted {1} tasks.", count);
+
   return rc;
 }
 

src/l10n/deu-DEU.h

@@ -213,16 +213,6 @@
 #define STRING_CMD_GET_NO_DOM        "Keine DOM-Referenz spezifiziert."
 #define STRING_CMD_GET_BAD_REF       "'{1}' is not a DOM reference."
 
-#define STRING_CMD_DELETE_USAGE      "Löscht die gewählte Aufgabe"
-#define STRING_CMD_DELETE_CONFIRM    "Aufgabe {1} '{2}' dauerhaft löschen?"
-#define STRING_CMD_DELETE_TASK       "Lösche Aufgabe {1} '{2}'."
-#define STRING_CMD_DELETE_TASK_R     "Lösche wiederholende Aufgabe {1} '{2}'."
-#define STRING_CMD_DELETE_CONFIRM_R  "Dies ist eine wiederholende Aufgabe.  Möchten Sie alle offenen Wiederholungen dieser Aufgabe löschen?"
-#define STRING_CMD_DELETE_NO         "Aufgabe nicht gelöscht."
-#define STRING_CMD_DELETE_NOT_DEL    "Aufgabe {1} '{2}' kann nicht gelöscht werden."
-#define STRING_CMD_DELETE_1          "{1} Aufgabe gelöscht."
-#define STRING_CMD_DELETE_N          "{1} Aufgaben gelöscht."
-
 #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."

src/l10n/eng-USA.h

@@ -210,16 +210,6 @@
 #define STRING_CMD_GET_NO_DOM        "No DOM reference specified."
 #define STRING_CMD_GET_BAD_REF       "'{1}' is not a DOM reference."
 
-#define STRING_CMD_DELETE_USAGE      "Deletes the specified task"
-#define STRING_CMD_DELETE_CONFIRM    "Delete task {1} '{2}'?"
-#define STRING_CMD_DELETE_TASK       "Deleting task {1} '{2}'."
-#define STRING_CMD_DELETE_TASK_R     "Deleting recurring task {1} '{2}'."
-#define STRING_CMD_DELETE_CONFIRM_R  "This is a recurring task.  Do you want to delete all pending recurrences of this same task?"
-#define STRING_CMD_DELETE_NO         "Task not deleted."
-#define STRING_CMD_DELETE_NOT_DEL    "Task {1} '{2}' is not deletable."
-#define STRING_CMD_DELETE_1          "Deleted {1} task."
-#define STRING_CMD_DELETE_N          "Deleted {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."

src/l10n/epo-RUS.h

@@ -213,16 +213,6 @@
 #define STRING_CMD_GET_NO_DOM        "Nenia DOM-referenco specifata."
 #define STRING_CMD_GET_BAD_REF       "'{1}' is not a DOM reference."
 
-#define STRING_CMD_DELETE_USAGE      "Viŝas la specifatan taskon"
-#define STRING_CMD_DELETE_CONFIRM    "Forviŝi taskon {1} '{2}'?"
-#define STRING_CMD_DELETE_TASK       "Viŝanta taskon {1} '{2}'."
-#define STRING_CMD_DELETE_TASK_R     "Viŝanta reokazantan taskon {1} '{2}'."
-#define STRING_CMD_DELETE_CONFIRM_R  "Tio estas reokazanta tasko. Ĉu vi volas viŝi ĉian pendantan okazon?"
-#define STRING_CMD_DELETE_NO         "Ne viŝis taskon."
-#define STRING_CMD_DELETE_NOT_DEL    "Tasko {1} '{2}' ne estas viŝebla."
-#define STRING_CMD_DELETE_1          "Viŝis {1} taskon."
-#define STRING_CMD_DELETE_N          "Viŝis {1} taskojn."
-
 #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."

src/l10n/esp-ESP.h

@@ -221,16 +221,6 @@
 #define STRING_CMD_GET_NO_DOM        "Referencia a DOM no especificada."
 #define STRING_CMD_GET_BAD_REF       "'{1}' no es una referencia a DOM."
 
-#define STRING_CMD_DELETE_USAGE      "Suprime la tarea especificada"
-#define STRING_CMD_DELETE_CONFIRM    "¿Suprimir permanentemente la tarea {1} '{2}'?"
-#define STRING_CMD_DELETE_TASK       "Suprimiendo tarea {1} '{2}'."
-#define STRING_CMD_DELETE_TASK_R     "Suprimiendo tarea recurrente {1} '{2}'."
-#define STRING_CMD_DELETE_CONFIRM_R  "Esta es una tarea recurrente. ¿Quiere suprimir todas las recurrencias pendientes de esta misma tarea?"
-#define STRING_CMD_DELETE_NO         "Tarea no suprimida."
-#define STRING_CMD_DELETE_NOT_DEL    "La tarea {1} '{2}' no es suprimible."
-#define STRING_CMD_DELETE_1          "Suprimida {1} tarea."
-#define STRING_CMD_DELETE_N          "Suprimidas {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."

src/l10n/fra-FRA.h

@@ -215,16 +215,6 @@
 #define STRING_CMD_GET_NO_DOM        "Aucune référence de DOM spécifié."
 #define STRING_CMD_GET_BAD_REF       "'{1}' is not a DOM reference."
 
-#define STRING_CMD_DELETE_USAGE      "Deletes the specified task"
-#define STRING_CMD_DELETE_CONFIRM    "Permanently delete task {1} '{2}'?"
-#define STRING_CMD_DELETE_TASK       "Deleting task {1} '{2}'."
-#define STRING_CMD_DELETE_TASK_R     "Deleting recurring task {1} '{2}'."
-#define STRING_CMD_DELETE_CONFIRM_R  "This is a recurring task.  Do you want to delete all pending recurrences of this same task?"
-#define STRING_CMD_DELETE_NO         "Tâche non supprimée."
-#define STRING_CMD_DELETE_NOT_DEL    "Tâche {1} '{2}' n'est pas supprimable."
-#define STRING_CMD_DELETE_1          "{1} tâche supprimée."
-#define STRING_CMD_DELETE_N          "{1} tâches supprimées."
-
 #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."

src/l10n/ita-ITA.h

@@ -214,16 +214,6 @@
 #define STRING_CMD_GET_NO_DOM        "No DOM reference specified."
 #define STRING_CMD_GET_BAD_REF       "'{1}' is not a DOM reference."
 
-#define STRING_CMD_DELETE_USAGE      "Cancella il task specificato"
-#define STRING_CMD_DELETE_CONFIRM    "Cancellare permanentemente il task {1} '{2}'?"
-#define STRING_CMD_DELETE_TASK       "Cancellazione del task {1} '{2}'."
-#define STRING_CMD_DELETE_TASK_R     "Cancellazione del task periodico {1} '{2}'."
-#define STRING_CMD_DELETE_CONFIRM_R  "Questo è un task periodico. Cancellare tutti i task pendenti associati a queso task?"
-#define STRING_CMD_DELETE_NO         "Task non cancellato."
-#define STRING_CMD_DELETE_NOT_DEL    "Il task {1} '{2}' non può essere elminato."
-#define STRING_CMD_DELETE_1          "Task {1} cancellato."
-#define STRING_CMD_DELETE_N          "Task {1} cancellati."
-
 #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."

src/l10n/jpn-JPN.h

@@ -215,16 +215,6 @@
 #define STRING_CMD_GET_NO_DOM        "No DOM reference specified."
 #define STRING_CMD_GET_BAD_REF       "'{1}' is not a DOM reference."
 
-#define STRING_CMD_DELETE_USAGE      "指定されたタスクの削除"
-#define STRING_CMD_DELETE_CONFIRM    "完全にタスク {1} '{2}' を削除して良いですか?"
-#define STRING_CMD_DELETE_TASK       "タスク {1} '{2}' を削除中。"
-#define STRING_CMD_DELETE_TASK_R     "Deleting recurring task {1} '{2}'."
-#define STRING_CMD_DELETE_CONFIRM_R  "This is a recurring task.  Do you want to delete all pending recurrences of this same task?"
-#define STRING_CMD_DELETE_NO         "タスク は削除されませんでした。"
-#define STRING_CMD_DELETE_NOT_DEL    "タスク {1} '{2}' は削除できません。"
-#define STRING_CMD_DELETE_1          " {1} タスク を削除しました。"
-#define STRING_CMD_DELETE_N          " {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."

src/l10n/pol-POL.h

@@ -215,16 +215,6 @@
 #define STRING_CMD_GET_NO_DOM        "Brak zdefiniowanej referencji do DOM."
 #define STRING_CMD_GET_BAD_REF       "'{1}' is not a DOM reference."
 
-#define STRING_CMD_DELETE_USAGE      "Usuwa wybrane zadanie"
-#define STRING_CMD_DELETE_CONFIRM    "Usunąć zadanie {1} '{2}'?"
-#define STRING_CMD_DELETE_TASK       "Usuwanie zadania {1} '{2}'."
-#define STRING_CMD_DELETE_TASK_R     "Usuwanie zadania cyklicznego {1} '{2}'."
-#define STRING_CMD_DELETE_CONFIRM_R  "To zadanie jest cykliczne. Czy chcesz usunąć wszystkie pozostałe cykle tego zadania?"
-#define STRING_CMD_DELETE_NO         "Zadanie nie zostało usunięte"
-#define STRING_CMD_DELETE_NOT_DEL    "Zadanie {1} '{2}' jest nieusuwalne."
-#define STRING_CMD_DELETE_1          "Usunięto {1} zadanie "
-#define STRING_CMD_DELETE_N          "Usunięto {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."

src/l10n/por-PRT.h

@@ -215,16 +215,6 @@
 #define STRING_CMD_GET_NO_DOM        "Referência DOM não especificada."
 #define STRING_CMD_GET_BAD_REF       "'{1}' is not a DOM reference."
 
-#define STRING_CMD_DELETE_USAGE      "Elimina a tarefa indicada"
-#define STRING_CMD_DELETE_CONFIRM    "Eliminar permanentemente a tarefa {1} '{2}'?"
-#define STRING_CMD_DELETE_TASK       "A eliminar tarefa {1} '{2}'."
-#define STRING_CMD_DELETE_TASK_R     "A eliminar tarefa recorrente {1} '{2}'."
-#define STRING_CMD_DELETE_CONFIRM_R  "Esta é uma tarefa recorrente. Deseja eliminar todas as ocorrências pendentes da mesma tarefa?"
-#define STRING_CMD_DELETE_NO         "Tarefa não eliminada."
-#define STRING_CMD_DELETE_NOT_DEL    "Tarefa {1} '{2}' não é eliminável."
-#define STRING_CMD_DELETE_1          "Eliminada {1} tarefa."
-#define STRING_CMD_DELETE_N          "Eliminadas {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."