diff --git a/src/commands/CmdDuplicate.cpp b/src/commands/CmdDuplicate.cpp index 0baefe1b9..9f86b7512 100644 --- a/src/commands/CmdDuplicate.cpp +++ b/src/commands/CmdDuplicate.cpp @@ -41,7 +41,7 @@ CmdDuplicate::CmdDuplicate () { _keyword = "duplicate"; _usage = "task duplicate "; - _description = STRING_CMD_DUPLICATE_USAGE; + _description = "Duplicates the specified tasks"; _read_only = false; _displays_id = false; _needs_gc = false; @@ -88,7 +88,7 @@ int CmdDuplicate::execute (std::string&) dup.remove ("recur"); dup.remove ("until"); dup.remove ("imask"); - std::cout << format (STRING_CMD_DUPLICATE_NON_REC, task.identifier ()) + std::cout << format ("Note: task {1} was a recurring task. The duplicated task is not.", task.identifier ()) << '\n'; } @@ -96,7 +96,7 @@ int CmdDuplicate::execute (std::string&) else if (dup.getStatus () == Task::recurring) { dup.remove ("mask"); - std::cout << format (STRING_CMD_DUPLICATE_REC, task.identifier ()) + std::cout << format ("Note: task {1} was a parent recurring task. The duplicated task is too.", task.identifier ()) << '\n'; } @@ -105,14 +105,14 @@ int CmdDuplicate::execute (std::string&) dup.modify (Task::modAnnotate); - if (permission (format (STRING_CMD_DUPLICATE_CONFIRM, + if (permission (format ("Duplicate task {1} '{2}'?", task.identifier (true), task.get ("description")), filtered.size ())) { context.tdb2.add (dup); ++count; - feedback_affected (STRING_CMD_DUPLICATE_TASK, task); + feedback_affected ("Duplicated task {1} '{2}'.", task); auto status = dup.getStatus (); if (context.verbose ("new-id") && @@ -129,7 +129,7 @@ int CmdDuplicate::execute (std::string&) } else { - std::cout << STRING_CMD_DUPLICATE_NO << '\n'; + std::cout << "Task not duplicated.\n"; rc = 1; if (_permission_quit) break; @@ -141,7 +141,8 @@ int CmdDuplicate::execute (std::string&) if (change.first != "") context.footnote (change.second); - feedback_affected (count == 1 ? STRING_CMD_DUPLICATE_1 : STRING_CMD_DUPLICATE_N, count); + feedback_affected (count == 1 ? "Duplicated {1} task." : "Duplicated {1} tasks.", count); + return rc; } diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h index c55e8542b..873a3164f 100644 --- a/src/l10n/deu-DEU.h +++ b/src/l10n/deu-DEU.h @@ -231,15 +231,6 @@ #define STRING_CMD_DELETE_1 "{1} Aufgabe gelöscht." #define STRING_CMD_DELETE_N "{1} Aufgaben gelöscht." -#define STRING_CMD_DUPLICATE_USAGE "Dupliziere die gewählte Aufgabe" -#define STRING_CMD_DUPLICATE_REC "Hinweis: Aufgabe {1} ist Vorgänger für wiederholende Aufgaben. Die duplizierte Aufgabe ist dies auch." -#define STRING_CMD_DUPLICATE_NON_REC "Hinweis: Aufgabe {1} ist eine wiederholende Aufgabe. Die duplizierte Aufgabe ist dies nicht." -#define STRING_CMD_DUPLICATE_CONFIRM "Aufgabe {1} '{2}' duplizieren?" -#define STRING_CMD_DUPLICATE_TASK "Aufgabe {1} '{2}' dupliziert." -#define STRING_CMD_DUPLICATE_NO "Aufgabe nicht verdoppelt." -#define STRING_CMD_DUPLICATE_1 "{1} Aufgabe verdoppelt." -#define STRING_CMD_DUPLICATE_N "{1} Aufgaben verdoppelt." - #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." diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h index 5f5f09028..cc35959f7 100644 --- a/src/l10n/eng-USA.h +++ b/src/l10n/eng-USA.h @@ -228,15 +228,6 @@ #define STRING_CMD_DELETE_1 "Deleted {1} task." #define STRING_CMD_DELETE_N "Deleted {1} tasks." -#define STRING_CMD_DUPLICATE_USAGE "Duplicates the specified tasks" -#define STRING_CMD_DUPLICATE_REC "Note: task {1} was a parent recurring task. The duplicated task is too." -#define STRING_CMD_DUPLICATE_NON_REC "Note: task {1} was a recurring task. The duplicated task is not." -#define STRING_CMD_DUPLICATE_CONFIRM "Duplicate task {1} '{2}'?" -#define STRING_CMD_DUPLICATE_TASK "Duplicated task {1} '{2}'." -#define STRING_CMD_DUPLICATE_NO "Task not duplicated." -#define STRING_CMD_DUPLICATE_1 "Duplicated {1} task." -#define STRING_CMD_DUPLICATE_N "Duplicated {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." diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h index 7455945bd..666bc72fd 100644 --- a/src/l10n/epo-RUS.h +++ b/src/l10n/epo-RUS.h @@ -231,15 +231,6 @@ #define STRING_CMD_DELETE_1 "Viŝis {1} taskon." #define STRING_CMD_DELETE_N "Viŝis {1} taskojn." -#define STRING_CMD_DUPLICATE_USAGE "Kopias la specifatan taskon" -#define STRING_CMD_DUPLICATE_REC "Notu: tasko {1} estis patra reokazanta tasko. La kopia tasko ankaŭ estas." -#define STRING_CMD_DUPLICATE_NON_REC "Notu: tasko {1} estis reokazanta tasko. La kopia tasko ne estas." -#define STRING_CMD_DUPLICATE_CONFIRM "Kopii taskon {1} '{2}'?" -#define STRING_CMD_DUPLICATE_TASK "Kopiis taskon {1} '{2}'." -#define STRING_CMD_DUPLICATE_NO "Ne kopiis taskon." -#define STRING_CMD_DUPLICATE_1 "Kopiis {1} taskon." -#define STRING_CMD_DUPLICATE_N "Kopiis {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." diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h index 16ede4108..2cf3e4223 100644 --- a/src/l10n/esp-ESP.h +++ b/src/l10n/esp-ESP.h @@ -239,15 +239,6 @@ #define STRING_CMD_DELETE_1 "Suprimida {1} tarea." #define STRING_CMD_DELETE_N "Suprimidas {1} tareas." -#define STRING_CMD_DUPLICATE_USAGE "Duplica las tareas especificadas" -#define STRING_CMD_DUPLICATE_REC "Nota: la tarea {1} era una tarea madre recurrente. La tarea duplicada también lo es." -#define STRING_CMD_DUPLICATE_NON_REC "Nota: la tarea {1} era una tarea recurrente. La tarea duplicada no lo es." -#define STRING_CMD_DUPLICATE_CONFIRM "¿Duplicar tarea {1} '{2}'?" -#define STRING_CMD_DUPLICATE_TASK "Duplicada tarea {1} '{2}'." -#define STRING_CMD_DUPLICATE_NO "Tarea no duplicada." -#define STRING_CMD_DUPLICATE_1 "Duplicada {1} tarea." -#define STRING_CMD_DUPLICATE_N "Duplicadas {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." diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h index b1668be7c..be0e04774 100644 --- a/src/l10n/fra-FRA.h +++ b/src/l10n/fra-FRA.h @@ -233,15 +233,6 @@ #define STRING_CMD_DELETE_1 "{1} tâche supprimée." #define STRING_CMD_DELETE_N "{1} tâches supprimées." -#define STRING_CMD_DUPLICATE_USAGE "Duplique la tâche spécifiée" -#define STRING_CMD_DUPLICATE_REC "Note : la tâche {1} était une tâche parent récurrente. Sa copie l'est aussi." -#define STRING_CMD_DUPLICATE_NON_REC "Note : la tâche {1} était une tâche récurrente. Sa copie ne l'est pas." -#define STRING_CMD_DUPLICATE_CONFIRM "Dupliquer la tâche {1} '{2}' ?" -#define STRING_CMD_DUPLICATE_TASK "Tâche {1} '{2}' dupliquée." -#define STRING_CMD_DUPLICATE_NO "Tâche non dupliquée" -#define STRING_CMD_DUPLICATE_1 "Duplicated {1} task." -#define STRING_CMD_DUPLICATE_N "Duplicated {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." diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h index 8386aa01a..82d88df2b 100644 --- a/src/l10n/ita-ITA.h +++ b/src/l10n/ita-ITA.h @@ -232,15 +232,6 @@ #define STRING_CMD_DELETE_1 "Task {1} cancellato." #define STRING_CMD_DELETE_N "Task {1} cancellati." -#define STRING_CMD_DUPLICATE_USAGE "Duplica il task specificato" -#define STRING_CMD_DUPLICATE_REC "Nota: il task {1} genera task periodici. Il task duplicato anche." -#define STRING_CMD_DUPLICATE_NON_REC "Nota: il task {1} era un task periodico. Il task duplicato non lo è." -#define STRING_CMD_DUPLICATE_CONFIRM "Duplicare il task {1} '{2}'?" -#define STRING_CMD_DUPLICATE_TASK "Duplicated task {1} '{2}'." -#define STRING_CMD_DUPLICATE_NO "Task non duplicato" -#define STRING_CMD_DUPLICATE_1 "Task {1} duplicato." -#define STRING_CMD_DUPLICATE_N "Task {1} duplicati." - #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." diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h index 00c6ff430..f36a517a0 100644 --- a/src/l10n/jpn-JPN.h +++ b/src/l10n/jpn-JPN.h @@ -233,15 +233,6 @@ #define STRING_CMD_DELETE_1 " {1} タスク を削除しました。" #define STRING_CMD_DELETE_N " {1} タスク を削除しました。" -#define STRING_CMD_DUPLICATE_USAGE "指定したタスクが重複しています" -#define STRING_CMD_DUPLICATE_REC "Note: task {1} was a parent recurring task. The duplicated task is too." -#define STRING_CMD_DUPLICATE_NON_REC "Note: task {1} was a recurring task. The duplicated task is not." -#define STRING_CMD_DUPLICATE_CONFIRM "タスク {1} '{2}' が重複?" -#define STRING_CMD_DUPLICATE_TASK "タスク {1} '{2}' が重複。" -#define STRING_CMD_DUPLICATE_NO "タスク は重複していません。" -#define STRING_CMD_DUPLICATE_1 "重複した {1} タスク。" -#define STRING_CMD_DUPLICATE_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." diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h index 056b390f4..3484afacb 100644 --- a/src/l10n/pol-POL.h +++ b/src/l10n/pol-POL.h @@ -233,15 +233,6 @@ #define STRING_CMD_DELETE_1 "Usunięto {1} zadanie " #define STRING_CMD_DELETE_N "Usunięto {1} zadań" -#define STRING_CMD_DUPLICATE_USAGE "Tworzy kopię wybranego zadania" -#define STRING_CMD_DUPLICATE_REC "Uwaga: zadanie {1} było cyklicznym zadaniem-rodzicem. Kopia jest nim również" -#define STRING_CMD_DUPLICATE_NON_REC "Uwaga: zadanie {1} było cykliczne. Kopia nie jest cykliczna." -#define STRING_CMD_DUPLICATE_CONFIRM "Skopiować zadanie {1} '{2}'?" -#define STRING_CMD_DUPLICATE_TASK "Skopiowano zadanie {1} '{2}'." -#define STRING_CMD_DUPLICATE_NO "Nie skopiowano zadańia" -#define STRING_CMD_DUPLICATE_1 "Skopiowano {1} zadanie." -#define STRING_CMD_DUPLICATE_N "Skopiowano {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." diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h index 0447c34bc..1aa69cd74 100644 --- a/src/l10n/por-PRT.h +++ b/src/l10n/por-PRT.h @@ -233,15 +233,6 @@ #define STRING_CMD_DELETE_1 "Eliminada {1} tarefa." #define STRING_CMD_DELETE_N "Eliminadas {1} tarefas." -#define STRING_CMD_DUPLICATE_USAGE "Duplica as tarefas especificadas" -#define STRING_CMD_DUPLICATE_REC "Nota: A tarefa {1} era uma tarefa mãe periódica. A tarefa duplicada também." -#define STRING_CMD_DUPLICATE_NON_REC "Nota: A tarefa {1} era uma tarefa periódica. A tarefa duplicada não é." -#define STRING_CMD_DUPLICATE_CONFIRM "Duplicar tarefa {1} '{2}'?" -#define STRING_CMD_DUPLICATE_TASK "Tarefa duplicada {1} '{2}'." -#define STRING_CMD_DUPLICATE_NO "Tarefa não duplicada." -#define STRING_CMD_DUPLICATE_1 "Duplicada {1} tarefa." -#define STRING_CMD_DUPLICATE_N "Duplicadas {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."