From cafe1478e61e62bfed696b7f9a1b6f56f582a254 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sat, 20 Jan 2018 21:16:21 -0500 Subject: [PATCH] l10n: Eliminated STRING_CMD_DENO_* --- src/commands/CmdDenotate.cpp | 14 +++++++++----- src/l10n/deu-DEU.h | 9 --------- src/l10n/eng-USA.h | 9 --------- src/l10n/epo-RUS.h | 9 --------- src/l10n/esp-ESP.h | 9 --------- src/l10n/fra-FRA.h | 9 --------- src/l10n/ita-ITA.h | 9 --------- src/l10n/jpn-JPN.h | 9 --------- src/l10n/pol-POL.h | 9 --------- src/l10n/por-PRT.h | 9 --------- 10 files changed, 9 insertions(+), 86 deletions(-) diff --git a/src/commands/CmdDenotate.cpp b/src/commands/CmdDenotate.cpp index 8da869b21..34d12ead3 100644 --- a/src/commands/CmdDenotate.cpp +++ b/src/commands/CmdDenotate.cpp @@ -35,6 +35,10 @@ #include #include +#define STRING_CMD_DENO_NO "Task not denotated." +#define STRING_CMD_DENO_1 "Denotated {1} task." +#define STRING_CMD_DENO_N "Denotated {1} tasks." + extern Context context; //////////////////////////////////////////////////////////////////////////////// @@ -42,7 +46,7 @@ CmdDenotate::CmdDenotate () { _keyword = "denotate"; _usage = "task denotate "; - _description = STRING_CMD_DENO_USAGE; + _description = "Deletes an annotation"; _read_only = false; _displays_id = false; _needs_gc = false; @@ -93,7 +97,7 @@ int CmdDenotate::execute (std::string&) auto annotations = task.getAnnotations (); if (annotations.size () == 0) - throw std::string (STRING_CMD_DENO_NONE); + throw std::string ("The specified task has no annotations that can be deleted."); std::string anno; auto match = false; @@ -126,7 +130,7 @@ int CmdDenotate::execute (std::string&) if (before.data != task.data) { - auto question = format (STRING_CMD_DENO_CONFIRM, + auto question = format ("Denotate task {1} '{2}'?", task.identifier (true), task.get ("description")); @@ -134,7 +138,7 @@ int CmdDenotate::execute (std::string&) { ++count; context.tdb2.modify (task); - feedback_affected (format (STRING_CMD_DENO_FOUND, anno)); + feedback_affected (format ("Found annotation '{1}' and deleted it.", anno)); if (context.verbose ("project")) projectChanges[task.get ("project")] = onProjectChange (task, false); } @@ -148,7 +152,7 @@ int CmdDenotate::execute (std::string&) } else { - std::cout << format (STRING_CMD_DENO_NOMATCH, pattern) << '\n'; + std::cout << format ("Did not find any matching annotation to be deleted for '{1}'.\n", pattern); rc = 1; } } diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h index ede35d3e8..8fda5e42b 100644 --- a/src/l10n/deu-DEU.h +++ b/src/l10n/deu-DEU.h @@ -205,15 +205,6 @@ #define STRING_CMD_PREPEND_CONFIRM "Vor Aufgabe {1} '{2}' anfügen?" #define STRING_CMD_PREPEND_NO "Nicht vor Aufgabe angefügt." -#define STRING_CMD_DENO_USAGE "Löscht einen Kommentar" -#define STRING_CMD_DENO_NONE "Die gewählte Aufgabe hat keine Kommentare, welche gelöscht werden können." -#define STRING_CMD_DENO_CONFIRM "Kommentar in Aufgabe {1} '{2}' löschen?" -#define STRING_CMD_DENO_FOUND "Kommentar '{1}' gefunden und gelöscht." -#define STRING_CMD_DENO_NOMATCH "Keine passenden Kommentare zu '{1}' gefunden und gelöscht." -#define STRING_CMD_DENO_NO "Keine Kommentare gelöscht." -#define STRING_CMD_DENO_1 "Kommentar zu {1} Aufgabe gelöscht." -#define STRING_CMD_DENO_N "Kommentare zu {1} Aufgaben gelöscht." - #define STRING_CMD_IMPORT_USAGE "Importiert eine JSON-Datei" #define STRING_CMD_IMPORT_SUMMARY "{1} Aufgabe importiert." #define STRING_CMD_IMPORT_FILE "Importiere '{1}'" diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h index 784b48318..568ce5794 100644 --- a/src/l10n/eng-USA.h +++ b/src/l10n/eng-USA.h @@ -202,15 +202,6 @@ #define STRING_CMD_PREPEND_CONFIRM "Prepend to task {1} '{2}'?" #define STRING_CMD_PREPEND_NO "Task not prepended." -#define STRING_CMD_DENO_USAGE "Deletes an annotation" -#define STRING_CMD_DENO_NONE "The specified task has no annotations that can be deleted." -#define STRING_CMD_DENO_CONFIRM "Denotate task {1} '{2}'?" -#define STRING_CMD_DENO_FOUND "Found annotation '{1}' and deleted it." -#define STRING_CMD_DENO_NOMATCH "Did not find any matching annotation to be deleted for '{1}'." -#define STRING_CMD_DENO_NO "Task not denotated." -#define STRING_CMD_DENO_1 "Denotated {1} task." -#define STRING_CMD_DENO_N "Denotated {1} tasks." - #define STRING_CMD_IMPORT_USAGE "Imports JSON files" #define STRING_CMD_IMPORT_SUMMARY "Imported {1} tasks." #define STRING_CMD_IMPORT_FILE "Importing '{1}'" diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h index 050b66f29..97f2f61d2 100644 --- a/src/l10n/epo-RUS.h +++ b/src/l10n/epo-RUS.h @@ -205,15 +205,6 @@ #define STRING_CMD_PREPEND_CONFIRM "Predonis al taskon {1} '{2}'?" #define STRING_CMD_PREPEND_NO "Ne predonis al tasko." -#define STRING_CMD_DENO_USAGE "Viŝas komenton" -#define STRING_CMD_DENO_NONE "La specifita tasko ne havas nenian viŝeblan komenton." -#define STRING_CMD_DENO_CONFIRM "Malkomenti taskon {1} '{2}'?" -#define STRING_CMD_DENO_FOUND "Trovis kaj viŝis komenton '{1}'." -#define STRING_CMD_DENO_NOMATCH "Ne trovis nenian komenton por viŝi, kiu kongruas al '{1}'." -#define STRING_CMD_DENO_NO "Ne malkomentis taskon." -#define STRING_CMD_DENO_1 "Malkomentis {1} taskon." -#define STRING_CMD_DENO_N "Malkomentis {1} taskojn." - #define STRING_CMD_IMPORT_USAGE "Importas JSON-dosierojn" #define STRING_CMD_IMPORT_SUMMARY "Importis {1} taskojn." #define STRING_CMD_IMPORT_FILE "Importanta '{1}'" diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h index c06eeb693..bddeb2557 100644 --- a/src/l10n/esp-ESP.h +++ b/src/l10n/esp-ESP.h @@ -211,15 +211,6 @@ #define STRING_CMD_PREPEND_CONFIRM "¿Anteponer texto a la tarea {1} '{2}'?" #define STRING_CMD_PREPEND_NO "Texto no antepuesto." -#define STRING_CMD_DENO_USAGE "Elimina una anotación" -#define STRING_CMD_DENO_NONE "La tarea especificada no tiene anotaciones que puedan ser eliminadas." -#define STRING_CMD_DENO_CONFIRM "¿Desanotar la tarea {1} '{2}'?" -#define STRING_CMD_DENO_FOUND "Encontrada anotación '{1}' y eliminada." -#define STRING_CMD_DENO_NOMATCH "No se encontró ninguna anotación coincidente para eliminar en '{1}'." -#define STRING_CMD_DENO_NO "Tarea no desanotada." -#define STRING_CMD_DENO_1 "Desanotada {1} tarea." -#define STRING_CMD_DENO_N "Desanotadas {1} tareas." - #define STRING_CMD_IMPORT_USAGE "Importa archivos JSON" #define STRING_CMD_IMPORT_SUMMARY "Importadas {1} tareas." #define STRING_CMD_IMPORT_FILE "Importando '{1}'" diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h index 41bf3fee2..ac17006ec 100644 --- a/src/l10n/fra-FRA.h +++ b/src/l10n/fra-FRA.h @@ -207,15 +207,6 @@ #define STRING_CMD_PREPEND_CONFIRM "Prepend to task {1} '{2}'?" #define STRING_CMD_PREPEND_NO "Tâche not prepended." -#define STRING_CMD_DENO_USAGE "Deletes an annotation" -#define STRING_CMD_DENO_NONE "The specified task has no annotations that can be deleted." -#define STRING_CMD_DENO_CONFIRM "Denotate task {1} '{2}'?" -#define STRING_CMD_DENO_FOUND "Found annotation '{1}' and deleted it." -#define STRING_CMD_DENO_NOMATCH "Did not find any matching annotation to be deleted for '{1}'." -#define STRING_CMD_DENO_NO "Tâche non désannotée." -#define STRING_CMD_DENO_1 "Denotated {1} task." -#define STRING_CMD_DENO_N "Denotated {1} tasks." - #define STRING_CMD_IMPORT_USAGE "Imports JSON files" #define STRING_CMD_IMPORT_SUMMARY "Imported {1} tasks." #define STRING_CMD_IMPORT_FILE "Importing '{1}'" diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h index d109573ca..cea2a8c36 100644 --- a/src/l10n/ita-ITA.h +++ b/src/l10n/ita-ITA.h @@ -206,15 +206,6 @@ #define STRING_CMD_PREPEND_CONFIRM "Aggiungere all'inizio della descrizione del task {1} '{2}'?" #define STRING_CMD_PREPEND_NO "Aggiunta non effettuata." -#define STRING_CMD_DENO_USAGE "Cancella una annotazione" -#define STRING_CMD_DENO_NONE "Il task specificato non ha annotazioni che possano essere cancellate." -#define STRING_CMD_DENO_CONFIRM "Denotare il task {1} '{2}'?" -#define STRING_CMD_DENO_FOUND "Annotazione '{1}' trovata e cancellata." -#define STRING_CMD_DENO_NOMATCH "Nessuna annotazione da cancellare trovata per '{1}'." -#define STRING_CMD_DENO_NO "Annotazione non rimossa." -#define STRING_CMD_DENO_1 "Annotazione rimossa da task {1}." -#define STRING_CMD_DENO_N "Annotazioni rimosse da task {1}." - #define STRING_CMD_IMPORT_USAGE "Importa file JSON" #define STRING_CMD_IMPORT_SUMMARY "Importati {1} task." #define STRING_CMD_IMPORT_FILE "Importazione di '{1}'" diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h index 6c33681ad..5267bf944 100644 --- a/src/l10n/jpn-JPN.h +++ b/src/l10n/jpn-JPN.h @@ -207,15 +207,6 @@ #define STRING_CMD_PREPEND_CONFIRM "Prepend to task {1} '{2}'?" #define STRING_CMD_PREPEND_NO "Task not prepended." -#define STRING_CMD_DENO_USAGE "Deletes an annotation" -#define STRING_CMD_DENO_NONE "指定されたtaskには注釈がないので削除できません。" -#define STRING_CMD_DENO_CONFIRM "タスク {1} から注釈 '{2}' を削除しますか?" -#define STRING_CMD_DENO_FOUND "注釈 '{1}' が見つかったので削除します。" -#define STRING_CMD_DENO_NOMATCH "'{1}' に一致する注釈が見つからなかったので削除できません。" -#define STRING_CMD_DENO_NO "Task not denotated." -#define STRING_CMD_DENO_1 "Denotated {1} task." -#define STRING_CMD_DENO_N "Denotated {1} tasks." - #define STRING_CMD_IMPORT_USAGE "JSON ファイルをインポート" #define STRING_CMD_IMPORT_SUMMARY "{1} task をインポートしました。" #define STRING_CMD_IMPORT_FILE "'{1}' をインポート中" diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h index 6c013be4f..a2986ecab 100644 --- a/src/l10n/pol-POL.h +++ b/src/l10n/pol-POL.h @@ -207,15 +207,6 @@ #define STRING_CMD_PREPEND_CONFIRM "Dodać ciąg do opisu zadania {1} '{2}'?" #define STRING_CMD_PREPEND_NO "Nie dodano ciągu do opisu." -#define STRING_CMD_DENO_USAGE "Usuwa komentarz" -#define STRING_CMD_DENO_NONE "Wybrane zadanie nie posiada komentarza do usunięcia." -#define STRING_CMD_DENO_CONFIRM "Usunąć komentarz zadania {1} '{2}'?" -#define STRING_CMD_DENO_FOUND "Znaleziono i usunięto komentarz '{1}'." -#define STRING_CMD_DENO_NOMATCH "Nie znaleziono żadnego pasującego komentarza do usunięcia '{1}'." -#define STRING_CMD_DENO_NO "Nie usunięto komentarza." -#define STRING_CMD_DENO_1 "Usunięto {1} komentarz." -#define STRING_CMD_DENO_N "Usunięto {1} komentarzy." - #define STRING_CMD_IMPORT_USAGE "Importuje pliki JSON" #define STRING_CMD_IMPORT_SUMMARY "Zaimportowano {1} zadań." #define STRING_CMD_IMPORT_FILE "Importowanie '{1}'" diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h index 27068da7d..ed7ae1360 100644 --- a/src/l10n/por-PRT.h +++ b/src/l10n/por-PRT.h @@ -207,15 +207,6 @@ #define STRING_CMD_PREPEND_CONFIRM "Antepor à tarefa {1} '{2}'?" #define STRING_CMD_PREPEND_NO "Tarefa não anteposta." -#define STRING_CMD_DENO_USAGE "Elimina uma anotação" -#define STRING_CMD_DENO_NONE "A tarefa especificada não tem anotações que possam ser eliminadas." -#define STRING_CMD_DENO_CONFIRM "Remover anotação da tarefa {1} '{2}'?" -#define STRING_CMD_DENO_FOUND "Foi encontrada e removida a anotação '{1}'." -#define STRING_CMD_DENO_NOMATCH "Não foi encontrada nenhuma anotação a remover que corresponda a '{1}'." -#define STRING_CMD_DENO_NO "Nenhuma anotação removida da tarefa." -#define STRING_CMD_DENO_1 "Removida(s) anotação(ôes) de {1} tarefa." -#define STRING_CMD_DENO_N "Removida(s) anotação(ôes) de {1} tarefas." - #define STRING_CMD_IMPORT_USAGE "Importa ficheiros JSON" #define STRING_CMD_IMPORT_SUMMARY "Importadas {1} tarefas." #define STRING_CMD_IMPORT_FILE "A importar '{1}'"