l10n: Eliminated STRING_CMD_START_*

src/commands/CmdStart.cpp

@@ -41,7 +41,7 @@ CmdStart::CmdStart ()
 {
   _keyword               = "start";
   _usage                 = "task <filter> start <mods>";
-  _description           = STRING_CMD_START_USAGE;
+  _description           = "Marks specified task as started";
   _read_only             = false;
   _displays_id           = false;
   _needs_gc              = false;
@@ -79,7 +79,7 @@ int CmdStart::execute (std::string&)
       Task before (task);
 
       // Start the specified task.
-      std::string question = format (STRING_CMD_START_CONFIRM,
+      std::string question = format ("Start task {1} '{2}'?",
                                      task.identifier (true),
                                      task.get ("description"));
       task.modify (Task::modAnnotate);
@@ -100,7 +100,7 @@ int CmdStart::execute (std::string&)
         updateRecurrenceMask (task);
         context.tdb2.modify (task);
         ++count;
-        feedback_affected (STRING_CMD_START_TASK, task);
+        feedback_affected ("Starting task {1} '{2}'.", task);
         if (!nagged)
           nagged = nag (task);
         dependencyChainOnStart (task);
@@ -109,7 +109,7 @@ int CmdStart::execute (std::string&)
       }
       else
       {
-        std::cout << STRING_CMD_START_NO << '\n';
+        std::cout << "Task not started.\n";
         rc = 1;
         if (_permission_quit)
           break;
@@ -117,7 +117,7 @@ int CmdStart::execute (std::string&)
     }
     else
     {
-      std::cout << format (STRING_CMD_START_ALREADY,
+      std::cout << format ("Task {1} '{2}' already started.",
                            task.id,
                            task.get ("description"))
                 << '\n';
@@ -130,7 +130,7 @@ int CmdStart::execute (std::string&)
     if (change.first != "")
       context.footnote (change.second);
 
-  feedback_affected (count == 1 ? STRING_CMD_START_1 : STRING_CMD_START_N, count);
+  feedback_affected (count == 1 ? "Started {1} task." : "Started {1} tasks.", count);
   return rc;
 }
 

src/commands/Command.cpp

@@ -31,7 +31,6 @@
 #include <shared.h>
 #include <format.h>
 #include <util.h>
-#include <i18n.h>
 #include <Command.h>
 #include <main.h>
 
@@ -190,7 +189,7 @@ void Command::factory (std::map <std::string, Command*>& all)
   {
     // Make sure a custom report does not clash with a built-in command.
     if (all.find (report) != all.end ())
-      throw format (STRING_CMD_CONFLICT, report);
+      throw format ("Custom report '{1}' conflicts with built-in task command.", report);
 
     c = new CmdCustom (
               report,

src/l10n/deu-DEU.h

@@ -104,7 +104,6 @@
 
 // commands/Cmd*
 // USAGE strings are visible in 'task help'
-#define STRING_CMD_CONFLICT          "Benutzerdefinierter Report '{1}' steht mit eingebautem task-Befehl in Konflikt."
 #define STRING_CMD_VERSION_USAGE     "Zeigt die taskwarrior-Versionsnummer"
 #define STRING_CMD_VERSION_USAGE2    "Zeigt ausschließlich die taskwarrior-Versionsnummer"
 #define STRING_CMD_VERSION_DOCS      "Dokumentation für taskwarrior finden Sie in 'man task', 'man taskrc', 'man task-color', 'man task-sync' oder auf http://taskwarrior.org"
@@ -257,14 +256,6 @@
 #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_START_USAGE       "Kennzeichnet die gewählte Aufgabe als begonnen."
-#define STRING_CMD_START_NO          "Aufgabe nicht begonnen."
-#define STRING_CMD_START_ALREADY     "Aufgabe {1} '{2}' ist bereits gestartet."
-#define STRING_CMD_START_TASK        "Starte Aufgabe {1} '{2}'."
-#define STRING_CMD_START_CONFIRM     "Aufgabe {1} '{2}' starten?"
-#define STRING_CMD_START_1           "{1} Aufgabe gestartet."
-#define STRING_CMD_START_N           "{1} Aufgaben gestartet."
-
 #define STRING_CMD_STOP_USAGE        "Entfernt die 'start'-Zeit einer Aufgabe"
 #define STRING_CMD_STOP_NO           "Aufgabe nicht beendet."
 #define STRING_CMD_STOP_ALREADY      "Aufgabe {1} '{2}' nicht beendet."

src/l10n/eng-USA.h

@@ -104,7 +104,6 @@
 
 // commands/Cmd*
 // USAGE strings are visible in 'task help'
-#define STRING_CMD_CONFLICT          "Custom report '{1}' conflicts with built-in task command."
 #define STRING_CMD_VERSION_USAGE     "Shows the Taskwarrior version number"
 #define STRING_CMD_VERSION_USAGE2    "Shows only the Taskwarrior version number"
 #define STRING_CMD_VERSION_DOCS      "Documentation for Taskwarrior can be found using 'man task', 'man taskrc', 'man task-color', 'man task-sync' or at http://taskwarrior.org"
@@ -254,14 +253,6 @@
 #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_START_USAGE       "Marks specified task as started"
-#define STRING_CMD_START_NO          "Task not started."
-#define STRING_CMD_START_ALREADY     "Task {1} '{2}' already started."
-#define STRING_CMD_START_TASK        "Starting task {1} '{2}'."
-#define STRING_CMD_START_CONFIRM     "Start task {1} '{2}'?"
-#define STRING_CMD_START_1           "Started {1} task."
-#define STRING_CMD_START_N           "Started {1} tasks."
-
 #define STRING_CMD_STOP_USAGE        "Removes the 'start' time from a task"
 #define STRING_CMD_STOP_NO           "Task not stopped."
 #define STRING_CMD_STOP_ALREADY      "Task {1} '{2}' not started."

src/l10n/epo-RUS.h

@@ -104,7 +104,6 @@
 
 // commands/Cmd*
 // USAGE strings are visible in 'task help'
-#define STRING_CMD_CONFLICT          "Personala raporto '{1}' konfliktas kun enkonstruita taskkomando."
 #define STRING_CMD_VERSION_USAGE     "Montras la versinombro de taskwarrior"
 #define STRING_CMD_VERSION_USAGE2    "Montras sole la versinombro de taskwarrior"
 #define STRING_CMD_VERSION_DOCS      "Oni povas trovi la dokumentojn por Taskwarrior kun 'man task', 'man taskrc', 'man task-tutorial', 'man task-color', 'man task-sync', 'man task-faq', aŭ ĉe http://taskwarrior.org."
@@ -257,14 +256,6 @@
 #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_START_USAGE       "Markas la specifatan taskon kiel ekita"
-#define STRING_CMD_START_NO          "Ne ekis taskon."
-#define STRING_CMD_START_ALREADY     "Tasko {1} '{2}' jam ekita."
-#define STRING_CMD_START_TASK        "Ekanta taskon {1} '{2}'."
-#define STRING_CMD_START_CONFIRM     "Eki taskon {1} '{2}'?"
-#define STRING_CMD_START_1           "Ekis {1} taskon."
-#define STRING_CMD_START_N           "Ekis {1} taskojn."
-
 #define STRING_CMD_STOP_USAGE        "Viŝas la ek-tempon de tasko"
 #define STRING_CMD_STOP_NO           "Tasko ne haltita."
 #define STRING_CMD_STOP_ALREADY      "Tasko {1} '{2}' ne ekita."

src/l10n/esp-ESP.h

@@ -104,7 +104,6 @@
 #define STRING_COLUMN_EXAMPLES_ANNO4 "Si no te estás cortando el pelo"
 
 // commands/Cmd*
-#define STRING_CMD_CONFLICT          "informe personalizado '{1}' en conflicto con comando interno de taskwarrior."
 #define STRING_CMD_VERSION_USAGE     "Muestra el número de versión de taskwarrior"
 #define STRING_CMD_VERSION_USAGE2    "Muestra el número de versión (solamente) de taskwarrior"
 
@@ -265,14 +264,6 @@
 #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_START_USAGE       "Marca la tarea especificada como comenzada"
-#define STRING_CMD_START_NO          "Tarea no comenzada."
-#define STRING_CMD_START_ALREADY     "Tarea {1} '{2}' ya comenzada."
-#define STRING_CMD_START_TASK        "Comenzando tarea {1} '{2}'."
-#define STRING_CMD_START_CONFIRM     "¿Comenzar tarea {1} '{2}'?"
-#define STRING_CMD_START_1           "Comenzada {1} tarea."
-#define STRING_CMD_START_N           "Comenzadas {1} tareas."
-
 #define STRING_CMD_STOP_USAGE        "Elimina el tiempo de 'comienzo' de una tarea"
 
 #define STRING_CMD_STOP_NO           "Tarea no detenida."

src/l10n/fra-FRA.h

@@ -104,7 +104,6 @@
 
 // commands/Cmd*
 // USAGE strings are visible in 'task help'
-#define STRING_CMD_CONFLICT          "Le rapport personnalisé '{1}' entre en conflit avec une commande prédéfinie de task."
 #define STRING_CMD_VERSION_USAGE     "Affiche le numéro de version de taskwarrior"
 #define STRING_CMD_VERSION_USAGE2    "Affiche uniquement le numéro de version de taskwarrior"
 #define STRING_CMD_VERSION_DOCS      "On peut trouver les documents de taskwarrior en utilisant 'man task', 'man taskrc', 'man task-color', 'man task-sync', ou chez http://taskwarrior.org"
@@ -259,14 +258,6 @@
 #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_START_USAGE       "Marks specified task as started"
-#define STRING_CMD_START_NO          "Tâche non démarrée."
-#define STRING_CMD_START_ALREADY     "Tâche {1} '{2}' déjà démarré."
-#define STRING_CMD_START_TASK        "Starting task {1} '{2}'."
-#define STRING_CMD_START_CONFIRM     "Start task {1} '{2}'?"
-#define STRING_CMD_START_1           "Started {1} task."
-#define STRING_CMD_START_N           "Started {1} tasks."
-
 #define STRING_CMD_STOP_USAGE        "Suppression de l'attribut 'start' d'une tâche"
 #define STRING_CMD_STOP_NO           "Tâche non arrếtée"
 #define STRING_CMD_STOP_ALREADY      "Tâche {1} '{2}' non arrêtée" // Étrange

src/l10n/ita-ITA.h

@@ -103,7 +103,6 @@
 #define STRING_COLUMN_EXAMPLES_ANNO4 "Se non si va a tagliare i capelli"
 
 // commands/Cmd*
-#define STRING_CMD_CONFLICT          "Report personalizzato '{1}' provoca conflitto con un comando standard."
 #define STRING_CMD_VERSION_USAGE     "Mostra il numero di versione di taskwarrior"
 #define STRING_CMD_VERSION_USAGE2    "Mostra solo il numero di versione di taskwarrior"
 #define STRING_CMD_VERSION_DOCS      "La documentazione di taskwarrior è consultabile con 'man task', 'man taskrc', 'man task-color', 'man task-sync' o presso http://taskwarrior.org"
@@ -258,14 +257,6 @@
 #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_START_USAGE       "Contrassegna i task specificati come avviati"
-#define STRING_CMD_START_NO          "Task non avviato."
-#define STRING_CMD_START_ALREADY     "Task {1} '{2}' già avviati."
-#define STRING_CMD_START_TASK        "Avvio task {1} '{2}'."
-#define STRING_CMD_START_CONFIRM     "Avviare task {1} '{2}'?"
-#define STRING_CMD_START_1           "Task {1} avviato."
-#define STRING_CMD_START_N           "Task {1} avviati."
-
 #define STRING_CMD_STOP_USAGE        "Rimuove il tempo di 'avvio' dal task"
 #define STRING_CMD_STOP_NO           "Task non fermato."
 #define STRING_CMD_STOP_ALREADY      "Task {1} '{2}' non fermato."

src/l10n/jpn-JPN.h

@@ -104,7 +104,6 @@
 
 // commands/Cmd*
 // USAGE strings are visible in 'task help'
-#define STRING_CMD_CONFLICT          "Custom report '{1}' conflicts with built-in task command."
 #define STRING_CMD_VERSION_USAGE     "taskwarrior バージョン番号の表示"
 #define STRING_CMD_VERSION_USAGE2    "taskwarrior バージョン番号のみの表示"
 #define STRING_CMD_VERSION_DOCS      "taskwarrior のドキュメントは 'man task', 'man taskrc', 'man task-color', 'man task-sync' あるいは http://taskwarrior.org にあります。"
@@ -259,14 +258,6 @@
 #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_START_USAGE       "Marks specified task as started"
-#define STRING_CMD_START_NO          "タスク は開始していません。"
-#define STRING_CMD_START_ALREADY     "タスク {1} '{2}' は既に開始しています。"
-#define STRING_CMD_START_TASK        "タスク {1} '{2}' を開始。"
-#define STRING_CMD_START_CONFIRM     "タスク {1} '{2}' を開始?"
-#define STRING_CMD_START_1           " {1} タスク を開始しました。"
-#define STRING_CMD_START_N           " {1} タスク を開始しました。"
-
 #define STRING_CMD_STOP_USAGE        "Removes the 'start' time from a task"
 #define STRING_CMD_STOP_NO           "Task は停止できません。"
 #define STRING_CMD_STOP_ALREADY      "Task {1} '{2}' は停止できません。"

src/l10n/pol-POL.h

@@ -104,7 +104,6 @@
 
 // commands/Cmd*
 // USAGE strings are visible in 'task help'
-#define STRING_CMD_CONFLICT          "Raport urzytkownika '{1}' jest w konflikcie z wbudowanym poleceniem."
 #define STRING_CMD_VERSION_USAGE     "Pokazuje wersję programu taskwarrior"
 #define STRING_CMD_VERSION_USAGE2    "Pokazuje numer wersji programu taskwarrior"
 #define STRING_CMD_VERSION_DOCS      "Dokumentację dla taskwarrior można znaleźć z pomocą 'man task', 'man taskrc', 'man task-tutorial', 'man task-color', 'man task-sync', 'man task-faq' lub pod adresem http://taskwarrior.org"
@@ -259,14 +258,6 @@
 #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_START_USAGE       "Oznacza zadanie jako uruchomione"
-#define STRING_CMD_START_NO          "Zadanie nie uruchomione"
-#define STRING_CMD_START_ALREADY     "Zadanie {1} '{2}' jest już uruchomione"
-#define STRING_CMD_START_TASK        "Uruchamianie zadania {1} '{2}'"
-#define STRING_CMD_START_CONFIRM     "Uruchomić zadanie {1} '{2}'?"
-#define STRING_CMD_START_1           "Uruchomiono {1} zadanie."
-#define STRING_CMD_START_N           "Uruchomiono {1} zadań."
-
 #define STRING_CMD_STOP_USAGE        "Usuwa marker 'start' z zadania"
 #define STRING_CMD_STOP_NO           "Zadanie nie zatrzymane"
 #define STRING_CMD_STOP_ALREADY      "Zadanie {1} '{2}' nie jest uruchomione"

src/l10n/por-PRT.h

@@ -104,7 +104,6 @@
 #define STRING_COLUMN_EXAMPLES_ANNO4 "Se não vais cortar o cabelo"
 
 // commands/Cmd*
-#define STRING_CMD_CONFLICT          "Conflito entre relatório personalizado '{1}' e um comando interno do taskwarrior."
 #define STRING_CMD_VERSION_USAGE     "Exibe o número de versão do taskwarrior"
 #define STRING_CMD_VERSION_USAGE2    "Exibe apenas o número de versão do taskwarrior"
 #define STRING_CMD_VERSION_DOCS      "A documentação do taskwarrior pode ser encontrada usando os comandos 'man task', 'man taskrc', 'man task-color', 'man task-sync' ou em http://taskwarrior.org"
@@ -259,14 +258,6 @@
 #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_START_USAGE       "Assinala a tarefa especificada como iniciada"
-#define STRING_CMD_START_NO          "Tarefa não iniciada."
-#define STRING_CMD_START_ALREADY     "Tarefa {1} '{2}' já iniciada."
-#define STRING_CMD_START_TASK        "A iniciar tarefa {1} '{2}'."
-#define STRING_CMD_START_CONFIRM     "Iniciar tarefa {1} '{2}'?"
-#define STRING_CMD_START_1           "Iniciada {1} tarefa."
-#define STRING_CMD_START_N           "Iniciadas {1} tarefas."
-
 #define STRING_CMD_STOP_USAGE        "Remove o estado de iniciado 'start' de uma tarefa"
 #define STRING_CMD_STOP_NO           "Tarefa não parada."
 #define STRING_CMD_STOP_ALREADY      "Tarefa {1} '{2}' não iniciada."