diff --git a/src/commands/CmdStop.cpp b/src/commands/CmdStop.cpp index b7acbbbcf..8e89e0c62 100644 --- a/src/commands/CmdStop.cpp +++ b/src/commands/CmdStop.cpp @@ -40,7 +40,7 @@ CmdStop::CmdStop () { _keyword = "stop"; _usage = "task stop "; - _description = STRING_CMD_STOP_USAGE; + _description = "Removes the 'start' time from a task"; _read_only = false; _displays_id = false; _needs_gc = false; @@ -77,7 +77,7 @@ int CmdStop::execute (std::string&) Task before (task); // Stop the specified task. - std::string question = format (STRING_CMD_STOP_CONFIRM, + std::string question = format ("Stop task {1} '{2}'?", task.identifier (true), task.get ("description")); @@ -92,14 +92,14 @@ int CmdStop::execute (std::string&) updateRecurrenceMask (task); context.tdb2.modify (task); ++count; - feedback_affected (STRING_CMD_STOP_TASK, task); + feedback_affected ("Stopping task {1} '{2}'.", task); dependencyChainOnStart (task); if (context.verbose ("project")) projectChanges[task.get ("project")] = onProjectChange (task, false); } else { - std::cout << STRING_CMD_STOP_NO << '\n'; + std::cout << "Task not stopped.\n"; rc = 1; if (_permission_quit) break; @@ -107,7 +107,7 @@ int CmdStop::execute (std::string&) } else { - std::cout << format (STRING_CMD_STOP_ALREADY, + std::cout << format ("Task {1} '{2}' not started.", task.identifier (true), task.get ("description")) << '\n'; @@ -120,7 +120,7 @@ int CmdStop::execute (std::string&) if (change.first != "") context.footnote (change.second); - feedback_affected (count == 1 ? STRING_CMD_STOP_1 : STRING_CMD_STOP_N, count); + feedback_affected (count == 1 ? "Stopped {1} task." : "Stopped {1} tasks.", count); return rc; } diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h index c947fc346..db0de6306 100644 --- a/src/l10n/deu-DEU.h +++ b/src/l10n/deu-DEU.h @@ -254,14 +254,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_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." -#define STRING_CMD_STOP_TASK "Beende Aufgabe {1} '{2}'." -#define STRING_CMD_STOP_CONFIRM "Aufgabe {1} '{2}' beenden?" -#define STRING_CMD_STOP_1 "{1} Aufgabe beendet." -#define STRING_CMD_STOP_N "{1} Aufgaben beendet." - #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 b6aad088c..e0a83fd70 100644 --- a/src/l10n/eng-USA.h +++ b/src/l10n/eng-USA.h @@ -251,14 +251,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_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." -#define STRING_CMD_STOP_TASK "Stopping task {1} '{2}'." -#define STRING_CMD_STOP_CONFIRM "Stop task {1} '{2}'?" -#define STRING_CMD_STOP_1 "Stopped {1} task." -#define STRING_CMD_STOP_N "Stopped {1} tasks." - #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 650f88c73..6413acf93 100644 --- a/src/l10n/epo-RUS.h +++ b/src/l10n/epo-RUS.h @@ -254,14 +254,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_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." -#define STRING_CMD_STOP_TASK "Haltanta taskon {1} '{2}'." -#define STRING_CMD_STOP_CONFIRM "Halti taskon {1} '{2}'?" -#define STRING_CMD_STOP_1 "Haltis {1} taskon." -#define STRING_CMD_STOP_N "Haltis {1} taskojn." - #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 979ae8c42..d8a92fa96 100644 --- a/src/l10n/esp-ESP.h +++ b/src/l10n/esp-ESP.h @@ -262,15 +262,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_STOP_USAGE "Elimina el tiempo de 'comienzo' de una tarea" - -#define STRING_CMD_STOP_NO "Tarea no detenida." -#define STRING_CMD_STOP_ALREADY "Tarea {1} '{2}' no comenzada." -#define STRING_CMD_STOP_TASK "Deteniendo tarea {1} '{2}'." -#define STRING_CMD_STOP_CONFIRM "¿Detener tarea {1} '{2}'?" -#define STRING_CMD_STOP_1 "Detenida {1} tarea." -#define STRING_CMD_STOP_N "Detenidas {1} tareas." - #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 0beecd5ee..c62be3994 100644 --- a/src/l10n/fra-FRA.h +++ b/src/l10n/fra-FRA.h @@ -256,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_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 -#define STRING_CMD_STOP_TASK "Arrêt de la tâche {1} '{2}'." -#define STRING_CMD_STOP_CONFIRM "Stop task {1} '{2}'?" -#define STRING_CMD_STOP_1 "Stopped {1} task." -#define STRING_CMD_STOP_N "Stopped {1} tasks." - #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 95d91b0c7..4ce96765b 100644 --- a/src/l10n/ita-ITA.h +++ b/src/l10n/ita-ITA.h @@ -255,14 +255,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_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." -#define STRING_CMD_STOP_TASK "Sto fermando il task {1} '{2}'." -#define STRING_CMD_STOP_CONFIRM "Fermare task {1} '{2}'?" -#define STRING_CMD_STOP_1 "Task {1} fermato." -#define STRING_CMD_STOP_N "Task {1} fermati." - #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 b57669064..634ea0abe 100644 --- a/src/l10n/jpn-JPN.h +++ b/src/l10n/jpn-JPN.h @@ -256,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_STOP_USAGE "Removes the 'start' time from a task" -#define STRING_CMD_STOP_NO "Task は停止できません。" -#define STRING_CMD_STOP_ALREADY "Task {1} '{2}' は停止できません。" -#define STRING_CMD_STOP_TASK "task {1} '{2}' を停止中。" -#define STRING_CMD_STOP_CONFIRM "task {1} '{2}' を停止?" -#define STRING_CMD_STOP_1 "{1} タスク を停止。" -#define STRING_CMD_STOP_N "{1} タスク を停止。" - #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 980c8192d..58381efdb 100644 --- a/src/l10n/pol-POL.h +++ b/src/l10n/pol-POL.h @@ -256,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_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" -#define STRING_CMD_STOP_TASK "Zatrzymywanie zadania {1} '{2}'." -#define STRING_CMD_STOP_CONFIRM "Zatrzymać zadanie {1} '{2}'?" -#define STRING_CMD_STOP_1 "Zatrzymano {1} zadanie." -#define STRING_CMD_STOP_N "Zatrzymano {1} zadań." - #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 27e4bf4ca..f81bb2a2a 100644 --- a/src/l10n/por-PRT.h +++ b/src/l10n/por-PRT.h @@ -256,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_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." -#define STRING_CMD_STOP_TASK "A parar tarefa {1} '{2}'." -#define STRING_CMD_STOP_CONFIRM "Parar tarefa {1} '{2}'?" -#define STRING_CMD_STOP_1 "Parada {1} tarefa." -#define STRING_CMD_STOP_N "Paradas {1} tarefas." - #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."