diff --git a/src/feedback.cpp b/src/feedback.cpp index 24469a220..03f7875a0 100644 --- a/src/feedback.cpp +++ b/src/feedback.cpp @@ -39,7 +39,6 @@ #include #include #include -#include extern Context context; @@ -77,7 +76,7 @@ std::string taskDifferences (const Task& before, const Task& after) std::stringstream out; for (auto& name : beforeOnly) out << " - " - << format (STRING_FEEDBACK_DELETED, Lexer::ucFirst (name)) + << format ("{1} will be deleted.", Lexer::ucFirst (name)) << "\n"; for (auto& name : afterOnly) @@ -87,12 +86,12 @@ std::string taskDifferences (const Task& before, const Task& after) auto deps_after = after.getDependencyTasks (); out << " - " - << format (STRING_FEEDBACK_DEP_SET, taskIdentifiers (deps_after)) + << format ("Dependencies will be set to '{1}'.", taskIdentifiers (deps_after)) << "\n"; } else out << " - " - << format (STRING_FEEDBACK_ATT_SET, + << format ("{1} will be set to '{2}'.", Lexer::ucFirst (name), renderAttribute (name, after.get (name))) << "\n"; @@ -116,12 +115,12 @@ std::string taskDifferences (const Task& before, const Task& after) std::string to = taskIdentifiers (deps_after); out << " - " - << format (STRING_FEEDBACK_DEP_MOD, from, to) + << format ("Dependencies will be changed from '{1}' to '{2}'.", from, to) << "\n"; } else out << " - " - << format (STRING_FEEDBACK_ATT_MOD, + << format ("{1} will be changed from '{2}' to '{3}'.", Lexer::ucFirst (name), renderAttribute (name, before.get (name)), renderAttribute (name, after.get (name))) @@ -131,9 +130,7 @@ std::string taskDifferences (const Task& before, const Task& after) // Shouldn't just say nothing. if (out.str ().length () == 0) - out << " - " - << STRING_FEEDBACK_NOP - << "\n"; + out << " - No changes will be made.\n"; return out.str (); } @@ -166,24 +163,23 @@ std::string taskInfoDifferences ( { if (name == "depends") { - out << format (STRING_FEEDBACK_DEP_DEL, taskIdentifiers (before.getDependencyTasks ())) + out << format ("Dependencies '{1}' deleted.", taskIdentifiers (before.getDependencyTasks ())) << "\n"; } else if (name.substr (0, 11) == "annotation_") { - out << format (STRING_FEEDBACK_ANN_DEL, before.get (name)) - << "\n"; + out << format ("Annotation '{1}' deleted.\n", before.get (name)); } else if (name == "start") { - out << format (STRING_FEEDBACK_ATT_DEL_DUR, Lexer::ucFirst (name), + out << format ("{1} deleted (duration: {2}).", + Lexer::ucFirst (name), Duration (current_timestamp - last_timestamp).format ()) << "\n"; } else { - out << format (STRING_FEEDBACK_ATT_DEL, Lexer::ucFirst (name)) - << "\n"; + out << format ("{1} deleted.\n", Lexer::ucFirst (name)); } } @@ -191,20 +187,19 @@ std::string taskInfoDifferences ( { if (name == "depends") { - out << format (STRING_FEEDBACK_DEP_WAS_SET, taskIdentifiers (after.getDependencyTasks ())) + out << format ("Dependencies set to '{1}'.", taskIdentifiers (after.getDependencyTasks ())) << "\n"; } else if (name.substr (0, 11) == "annotation_") { - out << format (STRING_FEEDBACK_ANN_ADD, after.get (name)) - << "\n"; + out << format ("Annotation of '{1}' added.\n", after.get (name)); } else { if (name == "start") last_timestamp = current_timestamp; - out << format (STRING_FEEDBACK_ATT_WAS_SET, + out << format ("{1} set to '{2}'.", Lexer::ucFirst (name), renderAttribute (name, after.get (name), dateformat)) << "\n"; @@ -223,16 +218,14 @@ std::string taskInfoDifferences ( auto from = taskIdentifiers (before.getDependencyTasks ()); auto to = taskIdentifiers (after.getDependencyTasks ()); - out << format (STRING_FEEDBACK_DEP_WAS_MOD, from, to) - << "\n"; + out << format ("Dependencies changed from '{1}' to '{2}'.\n", from, to); } else if (name.substr (0, 11) == "annotation_") { - out << format (STRING_FEEDBACK_ANN_WAS_MOD, after.get (name)) - << "\n"; + out << format ("Annotation changed to '{1}'.\n", after.get (name)); } else - out << format (STRING_FEEDBACK_ATT_WAS_MOD, + out << format ("{1} changed from '{2}' to '{3}'.", Lexer::ucFirst (name), renderAttribute (name, before.get (name), dateformat), renderAttribute (name, after.get (name), dateformat)) @@ -241,8 +234,7 @@ std::string taskInfoDifferences ( // Shouldn't just say nothing. if (out.str ().length () == 0) - out << STRING_FEEDBACK_WAS_NOP - << "\n"; + out << "No changes made.\n"; return out.str (); } @@ -344,7 +336,7 @@ void feedback_reserved_tags (const std::string& tag) tag == "YEAR" || tag == "YESTERDAY") { - throw format (STRING_FEEDBACK_TAG_VIRTUAL, tag); + throw format ("Virtual tags (including '{1}') are reserved and may not be added or removed.", tag); } } @@ -356,10 +348,10 @@ void feedback_special_tags (const Task& task, const std::string& tag) { std::string msg; std::string explanation; - if (tag == "nocolor") msg = STRING_FEEDBACK_TAG_NOCOLOR; - else if (tag == "nonag") msg = STRING_FEEDBACK_TAG_NONAG; - else if (tag == "nocal") msg = STRING_FEEDBACK_TAG_NOCAL; - else if (tag == "next") msg = STRING_FEEDBACK_TAG_NEXT; + if (tag == "nocolor") msg = "The 'nocolor' special tag will disable color rules for this task."; + else if (tag == "nonag") msg = "The 'nonag' special tag will prevent nagging when this task is modified."; + else if (tag == "nocal") msg = "The 'nocal' special tag will keep this task off the 'calendar' report."; + else if (tag == "next") msg = "The 'next' special tag will boost the urgency of this task so it appears on the 'next' report."; if (msg.length ()) { @@ -390,14 +382,14 @@ void feedback_unblocked (const Task& task) if (blocking.size () == 0) { if (i.id) - std::cout << format (STRING_FEEDBACK_UNBLOCKED, + std::cout << format ("Unblocked {1} '{2}'.", i.id, i.get ("description")) << "\n"; else { std::string uuid = i.get ("uuid"); - std::cout << format (STRING_FEEDBACK_UNBLOCKED, + std::cout << format ("Unblocked {1} '{2}'.", i.get ("uuid"), i.get ("description")) << "\n"; @@ -420,8 +412,8 @@ void feedback_backlog () ++count; if (count) - context.footnote (format (count > 1 ? STRING_FEEDBACK_BACKLOG_N - : STRING_FEEDBACK_BACKLOG, count)); + context.footnote (format (count > 1 ? "There are {1} local changes. Sync required." + : "There is {1} local change. Sync required.", count)); } } @@ -490,7 +482,7 @@ std::string onExpiration (Task& task) std::stringstream msg; if (context.verbose ("affected")) - msg << format (STRING_FEEDBACK_EXPIRED, + msg << format ("Task {1} '{2}' expired and was deleted.", task.identifier (true), task.get ("description")); diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h index 353bcbef5..d754bb899 100644 --- a/src/l10n/deu-DEU.h +++ b/src/l10n/deu-DEU.h @@ -27,36 +27,10 @@ #ifndef INCLUDED_STRINGS #define INCLUDED_STRINGS -#define STRING_FEEDBACK_ANN_ADD "Kommentar von '{1}' hinzugefügt." -#define STRING_FEEDBACK_ANN_DEL "Kommentar '{1}' gelöscht." -#define STRING_FEEDBACK_ANN_WAS_MOD "Kommentar zu '{1}' geändert." -#define STRING_FEEDBACK_ATT_DEL "{1} wird gelöscht." -#define STRING_FEEDBACK_ATT_DEL_DUR "{1} wird gelöscht (Dauer: {2})." -#define STRING_FEEDBACK_ATT_MOD "{1} wird von '{2}' zu '{3}' geändert." -#define STRING_FEEDBACK_ATT_SET "{1} wird auf '{2}' gesetzt." -#define STRING_FEEDBACK_ATT_WAS_MOD "{1} wurde von '{2}' zu '{3}' geändert." -#define STRING_FEEDBACK_ATT_WAS_SET "{1} wurde auf '{2}' gesetzt." -#define STRING_FEEDBACK_BACKLOG "{1} Lokale Änderungen. Datenabgleich erforderlich." -#define STRING_FEEDBACK_BACKLOG_N "{1} Lokale Änderungen. Datenabgleich erforderlich." -#define STRING_FEEDBACK_DELETED "{1} wird gelöscht." -#define STRING_FEEDBACK_DEP_DEL "Abhängigkeit '{1}' wird gelöscht." -#define STRING_FEEDBACK_DEP_MOD "Abhängigkeit wird von '{1}' zu '{2}' geändert." -#define STRING_FEEDBACK_DEP_SET "Abhängigkeit wird auf '{1}' gesetzt." -#define STRING_FEEDBACK_DEP_WAS_MOD "Dependencies wurde von '{1}' zu '{2}' geändert." -#define STRING_FEEDBACK_DEP_WAS_SET "Abhängigkeit wurde auf '{1}' gesetzt." -#define STRING_FEEDBACK_EXPIRED "Aufgabe {1} '{2}' ist abgelaufen und wurde gelöscht." -#define STRING_FEEDBACK_NOP "Keine Änderungen werden durchgeführt." #define STRING_FEEDBACK_NO_MATCH "Keine treffer." #define STRING_FEEDBACK_NO_TASKS "Keine Aufgaben." -#define STRING_FEEDBACK_TAG_NEXT "Das besondere Schlagwort 'next' erhöht die Dringlichkeit dieser Aufgabe, sodass sie im 'next'-Report erscheint." -#define STRING_FEEDBACK_TAG_NOCAL "Das besondere Schlagwort 'nocal' verhindert, dass diese Aufgabe im 'calendar'-Report erscheint." -#define STRING_FEEDBACK_TAG_NOCOLOR "Das besondere Schlagwort 'nocolor' deaktiviert Farb-Regeln für diese Aufgabe." -#define STRING_FEEDBACK_TAG_NONAG "Das besondere Schlagwort 'nonag' verhindert Nachfragen, wenn diese Aufgabe geändert wird." -#define STRING_FEEDBACK_TAG_VIRTUAL "Virtual tags (including '{1}') are reserved and may not be added or removed." #define STRING_FEEDBACK_TASKS_PLURAL "({1} Aufgaben)" #define STRING_FEEDBACK_TASKS_SINGLE "(1 Aufgabe)" -#define STRING_FEEDBACK_UNBLOCKED "Aufgabe {1} '{2}' entsperrt." -#define STRING_FEEDBACK_WAS_NOP "Keine Änderungen wurden durchgeführt." #define STRING_TASK_DEPEND_CIRCULAR "Verbotene zyklische Abhängigkeit erkannt." #define STRING_TASK_DEPEND_DUP "Aufgabe {1} hängt bereits von Aufgabe {2} ab." #define STRING_TASK_DEPEND_ITSELF "Eine Aufgabe kann nicht von sich selbst abhängen." diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h index e0ce1071f..b3a7ad65f 100644 --- a/src/l10n/eng-USA.h +++ b/src/l10n/eng-USA.h @@ -27,36 +27,10 @@ #ifndef INCLUDED_STRINGS #define INCLUDED_STRINGS -#define STRING_FEEDBACK_ANN_ADD "Annotation of '{1}' added." -#define STRING_FEEDBACK_ANN_DEL "Annotation '{1}' deleted." -#define STRING_FEEDBACK_ANN_WAS_MOD "Annotation changed to '{1}'." -#define STRING_FEEDBACK_ATT_DEL "{1} deleted." -#define STRING_FEEDBACK_ATT_DEL_DUR "{1} deleted (duration: {2})." -#define STRING_FEEDBACK_ATT_MOD "{1} will be changed from '{2}' to '{3}'." -#define STRING_FEEDBACK_ATT_SET "{1} will be set to '{2}'." -#define STRING_FEEDBACK_ATT_WAS_MOD "{1} changed from '{2}' to '{3}'." -#define STRING_FEEDBACK_ATT_WAS_SET "{1} set to '{2}'." -#define STRING_FEEDBACK_BACKLOG "There is {1} local change. Sync required." -#define STRING_FEEDBACK_BACKLOG_N "There are {1} local changes. Sync required." -#define STRING_FEEDBACK_DELETED "{1} will be deleted." -#define STRING_FEEDBACK_DEP_DEL "Dependencies '{1}' deleted." -#define STRING_FEEDBACK_DEP_MOD "Dependencies will be changed from '{1}' to '{2}'." -#define STRING_FEEDBACK_DEP_SET "Dependencies will be set to '{1}'." -#define STRING_FEEDBACK_DEP_WAS_MOD "Dependencies changed from '{1}' to '{2}'." -#define STRING_FEEDBACK_DEP_WAS_SET "Dependencies set to '{1}'." -#define STRING_FEEDBACK_EXPIRED "Task {1} '{2}' expired and was deleted." -#define STRING_FEEDBACK_NOP "No changes will be made." #define STRING_FEEDBACK_NO_MATCH "No matches." #define STRING_FEEDBACK_NO_TASKS "No tasks." -#define STRING_FEEDBACK_TAG_NEXT "The 'next' special tag will boost the urgency of this task so it appears on the 'next' report." -#define STRING_FEEDBACK_TAG_NOCAL "The 'nocal' special tag will keep this task off the 'calendar' report." -#define STRING_FEEDBACK_TAG_NOCOLOR "The 'nocolor' special tag will disable color rules for this task." -#define STRING_FEEDBACK_TAG_NONAG "The 'nonag' special tag will prevent nagging when this task is modified." -#define STRING_FEEDBACK_TAG_VIRTUAL "Virtual tags (including '{1}') are reserved and may not be added or removed." #define STRING_FEEDBACK_TASKS_PLURAL "({1} tasks)" #define STRING_FEEDBACK_TASKS_SINGLE "(1 task)" -#define STRING_FEEDBACK_UNBLOCKED "Unblocked {1} '{2}'." -#define STRING_FEEDBACK_WAS_NOP "No changes made." #define STRING_TASK_DEPEND_CIRCULAR "Circular dependency detected and disallowed." #define STRING_TASK_DEPEND_DUP "Task {1} already depends on task {2}." #define STRING_TASK_DEPEND_ITSELF "A task cannot be dependent on itself." diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h index 14bf0df2d..5b4765997 100644 --- a/src/l10n/epo-RUS.h +++ b/src/l10n/epo-RUS.h @@ -27,36 +27,10 @@ #ifndef INCLUDED_STRINGS #define INCLUDED_STRINGS -#define STRING_FEEDBACK_ANN_ADD "Aldonis komenton '{1}'." -#define STRING_FEEDBACK_ANN_DEL "Viŝis komenton '{1}'." -#define STRING_FEEDBACK_ANN_WAS_MOD "Komento iĝis '{1}'." -#define STRING_FEEDBACK_ATT_DEL "Viŝis {1}." -#define STRING_FEEDBACK_ATT_DEL_DUR "Viŝis {1} (duration: {2})." -#define STRING_FEEDBACK_ATT_MOD "{1} ŝanĝos el '{2}' al '{3}'." -#define STRING_FEEDBACK_ATT_SET "{1} iĝos '{2}'." -#define STRING_FEEDBACK_ATT_WAS_MOD "{1} ŝanĝis el '{2}' al '{3}'." -#define STRING_FEEDBACK_ATT_WAS_SET "{1} iĝis '{2}'." -#define STRING_FEEDBACK_BACKLOG "Estas {1} lokaj ŝanĝoj. Sinkronigo devita." -#define STRING_FEEDBACK_BACKLOG_N "Estas {1} lokaj ŝanĝoj. Sinkronigo devita." -#define STRING_FEEDBACK_DELETED "Viŝos {1}." -#define STRING_FEEDBACK_DEP_DEL "Viŝis dependojn '{1}'." -#define STRING_FEEDBACK_DEP_MOD "Dependoj ŝanĝos el '{1}' al '{2}'." -#define STRING_FEEDBACK_DEP_SET "Dependoj iĝos '{1}'." -#define STRING_FEEDBACK_DEP_WAS_MOD "Dependoj ŝanĝis el '{1}' al '{2}'." -#define STRING_FEEDBACK_DEP_WAS_SET "Dependoj iĝis '{1}'." -#define STRING_FEEDBACK_EXPIRED "Tasko {1} '{2}' fortempiĝis do estis viŝata." -#define STRING_FEEDBACK_NOP "Ne ŝanĝos nenion." #define STRING_FEEDBACK_NO_MATCH "Nenia kongruanto." #define STRING_FEEDBACK_NO_TASKS "Nenia tasko." -#define STRING_FEEDBACK_TAG_NEXT "Speciala etikedo 'next' pligrandigos la urĝecon de tiu tasko por ke ĝi aperus ĉe raporto 'next'." -#define STRING_FEEDBACK_TAG_NOCAL "Speciala etikedo 'nocal' ekskluzivos tiun taskon ĉe raporto 'calendar'." -#define STRING_FEEDBACK_TAG_NOCOLOR "Speciala etikedo 'nocolor' malebligos kolorreguloj por tiu tasko." -#define STRING_FEEDBACK_TAG_NONAG "Speciala etikedo 'nonag' antaŭmalebligitos molestojn, kiam oni modifus tiun taskon." -#define STRING_FEEDBACK_TAG_VIRTUAL "Virtual tags (including '{1}') are reserved and may not be added or removed." #define STRING_FEEDBACK_TASKS_PLURAL "({1} taskoj)" #define STRING_FEEDBACK_TASKS_SINGLE "(1 tasko)" -#define STRING_FEEDBACK_UNBLOCKED "Malblokis {1} '{2}'." -#define STRING_FEEDBACK_WAS_NOP "Ne ŝanĝis nenion." #define STRING_TASK_DEPEND_CIRCULAR "Detektis kaj malpermesis ciklan dependecon." #define STRING_TASK_DEPEND_DUP "Tasko {1} jam dependas de tasko {2}." #define STRING_TASK_DEPEND_ITSELF "Tasko ne povas dependi de si mem." diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h index 56dbe11a8..754602f7d 100644 --- a/src/l10n/esp-ESP.h +++ b/src/l10n/esp-ESP.h @@ -27,36 +27,10 @@ #ifndef INCLUDED_STRINGS #define INCLUDED_STRINGS -#define STRING_FEEDBACK_ANN_ADD "Anotación de '{1}' añadida." -#define STRING_FEEDBACK_ANN_DEL "Anotación '{1}' eliminada." -#define STRING_FEEDBACK_ANN_WAS_MOD "Anotación cambiada a '{1}'." -#define STRING_FEEDBACK_ATT_DEL "{1} eliminado." -#define STRING_FEEDBACK_ATT_DEL_DUR "{1} eliminado (duración: {2})." -#define STRING_FEEDBACK_ATT_MOD "{1} se cambiará de '{2}' a '{3}'." -#define STRING_FEEDBACK_ATT_SET "{1} se establecerá como '{2}'." -#define STRING_FEEDBACK_ATT_WAS_MOD "{1} cambiado de '{2}' a '{3}'." -#define STRING_FEEDBACK_ATT_WAS_SET "{1} establecido como '{2}'." -#define STRING_FEEDBACK_BACKLOG "Hay {1} modificaciones locales. Se require una sincronización." -#define STRING_FEEDBACK_BACKLOG_N "Hay {1} modificaciones locales. Se require una sincronización." -#define STRING_FEEDBACK_DELETED "Se eliminará {1}." -#define STRING_FEEDBACK_DEP_DEL "Dependencias '{1}' eliminadas." -#define STRING_FEEDBACK_DEP_MOD "Las dependencias se cambiarán de '{1}' a '{2}'." -#define STRING_FEEDBACK_DEP_SET "Las dependencias se ajustarán a '{1}'." -#define STRING_FEEDBACK_DEP_WAS_MOD "Dependencias cambiadas de '{1}' a '{2}'." -#define STRING_FEEDBACK_DEP_WAS_SET "Dependencias ajustadas a '{1}'." -#define STRING_FEEDBACK_EXPIRED "La tarea {1} '{2}' caducó y fue eliminada." -#define STRING_FEEDBACK_NOP "No se harán cambios." #define STRING_FEEDBACK_NO_MATCH "Ninguna coincidencia." #define STRING_FEEDBACK_NO_TASKS "Ninguna tarea." -#define STRING_FEEDBACK_TAG_NEXT "La etiqueta especial 'next' aumentará la urgencia de esta tarea para que aparezca en el informe 'next'." -#define STRING_FEEDBACK_TAG_NOCAL "La marca especial 'nocal' mantendrá esta tarea fuera del informe 'calendar'." -#define STRING_FEEDBACK_TAG_NOCOLOR "La marca especial 'nocolor' deshabilitará las reglas de color para esta tarea." -#define STRING_FEEDBACK_TAG_NONAG "La marca especial 'nonag' evitará el recuerdo fastidioso cuando la tarea sea modificada." -#define STRING_FEEDBACK_TAG_VIRTUAL "Las marcas virtuales (incluída '{1}') están reservadas y no pueden ser añadidas o eliminadas." #define STRING_FEEDBACK_TASKS_PLURAL "({1} tareas)" #define STRING_FEEDBACK_TASKS_SINGLE "(1 tarea)" -#define STRING_FEEDBACK_UNBLOCKED "Desbloqueada {1} '{2}'." -#define STRING_FEEDBACK_WAS_NOP "No se hicieron cambios." #define STRING_TASK_DEPEND_CIRCULAR "Dependencia circular detectada y anulada." #define STRING_TASK_DEPEND_DUP "La tarea {1} ya depende de la tarea {2}." #define STRING_TASK_DEPEND_ITSELF "Una tarea no puede depender de sí misma." diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h index 8880a4677..e8f5e6da7 100644 --- a/src/l10n/fra-FRA.h +++ b/src/l10n/fra-FRA.h @@ -27,36 +27,10 @@ #ifndef INCLUDED_STRINGS #define INCLUDED_STRINGS -#define STRING_FEEDBACK_ANN_ADD "Annotation of '{1}' added." -#define STRING_FEEDBACK_ANN_DEL "Annotation '{1}' deleted." -#define STRING_FEEDBACK_ANN_WAS_MOD "Annotation changed to '{1}'." -#define STRING_FEEDBACK_ATT_DEL "{1} deleted." -#define STRING_FEEDBACK_ATT_DEL_DUR "{1} deleted (duration: {2})." -#define STRING_FEEDBACK_ATT_MOD "{1} will be changed from '{2}' to '{3}'." -#define STRING_FEEDBACK_ATT_SET "{1} will be set to '{2}'." -#define STRING_FEEDBACK_ATT_WAS_MOD "{1} changed from '{2}' to '{3}'." -#define STRING_FEEDBACK_ATT_WAS_SET "{1} set to '{2}'." -#define STRING_FEEDBACK_BACKLOG "Il y a des {1} changements locaux. Synchronisation requise." -#define STRING_FEEDBACK_BACKLOG_N "Il y a des {1} changements locaux. Synchronisation requise." -#define STRING_FEEDBACK_DELETED "{1} will be deleted." -#define STRING_FEEDBACK_DEP_DEL "Dependencies '{1}' deleted." -#define STRING_FEEDBACK_DEP_MOD "Dependencies will be changed from '{1}' to '{2}'." -#define STRING_FEEDBACK_DEP_SET "Dependencies will be set to '{1}'." -#define STRING_FEEDBACK_DEP_WAS_MOD "Dependencies changed from '{1}' to '{2}'." -#define STRING_FEEDBACK_DEP_WAS_SET "Dependencies set to '{1}'." -#define STRING_FEEDBACK_EXPIRED "Tâche {1} '{2}' a expiré et a été supprimée." -#define STRING_FEEDBACK_NOP "No changes will be made." #define STRING_FEEDBACK_NO_MATCH "No matches." #define STRING_FEEDBACK_NO_TASKS "No tasks." -#define STRING_FEEDBACK_TAG_NEXT "The 'next' special tag will boost the urgency of this task so it appears on the 'next' report." -#define STRING_FEEDBACK_TAG_NOCAL "The 'nocal' special tag will keep this task off the 'calendar' report." -#define STRING_FEEDBACK_TAG_NOCOLOR "The 'nocolor' special tag will disable color rules for this task." -#define STRING_FEEDBACK_TAG_NONAG "The 'nonag' special tag will prevent nagging when this task is modified." -#define STRING_FEEDBACK_TAG_VIRTUAL "Virtual tags (including '{1}') are reserved and may not be added or removed." #define STRING_FEEDBACK_TASKS_PLURAL "({1} tasks)" #define STRING_FEEDBACK_TASKS_SINGLE "(1 task)" -#define STRING_FEEDBACK_UNBLOCKED "Unblocked {1} '{2}'." -#define STRING_FEEDBACK_WAS_NOP "No changes made." #define STRING_TASK_DEPEND_CIRCULAR "Circular dependency detected and disallowed." #define STRING_TASK_DEPEND_DUP "La tâche {1} dépend déjà de la tâche {2}." #define STRING_TASK_DEPEND_ITSELF "A task cannot be dependent on itself." diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h index a08d363bc..fd835ca0f 100644 --- a/src/l10n/ita-ITA.h +++ b/src/l10n/ita-ITA.h @@ -27,36 +27,10 @@ #ifndef INCLUDED_STRINGS #define INCLUDED_STRINGS -#define STRING_FEEDBACK_ANN_ADD "Annotazione di '{1}' aggiunta." -#define STRING_FEEDBACK_ANN_DEL "Annotazione '{1}' cancellata." -#define STRING_FEEDBACK_ANN_WAS_MOD "Annotazione modificata in '{1}'." -#define STRING_FEEDBACK_ATT_DEL "{1} cancellato." -#define STRING_FEEDBACK_ATT_DEL_DUR "{1} cancellato (durata: {2})." -#define STRING_FEEDBACK_ATT_MOD "{1} sarà modificata da '{2}' a '{3}'." -#define STRING_FEEDBACK_ATT_SET "{1} sarà impostata a '{2}'." -#define STRING_FEEDBACK_ATT_WAS_MOD "{1} modificata da '{2}' a '{3}'." -#define STRING_FEEDBACK_ATT_WAS_SET "{1} impostata a '{2}'." -#define STRING_FEEDBACK_BACKLOG "There is {1} local change. Sync required." -#define STRING_FEEDBACK_BACKLOG_N "There are {1} local changes. Sync required." -#define STRING_FEEDBACK_DELETED "{1} sarà cancellato." -#define STRING_FEEDBACK_DEP_DEL "Dipendenze '{1}' cancellate." -#define STRING_FEEDBACK_DEP_MOD "Le dipendenze saranno modificate da '{1}' in '{2}'." -#define STRING_FEEDBACK_DEP_SET "Le dipendenze saranno impostate a '{1}'." -#define STRING_FEEDBACK_DEP_WAS_MOD "Dipendenze cambiate da '{1}' a '{2}'." -#define STRING_FEEDBACK_DEP_WAS_SET "Dipendenze impostate a '{1}'." -#define STRING_FEEDBACK_EXPIRED "Il task {1} '{2}' è scaduto ed è stato eliminato" -#define STRING_FEEDBACK_NOP "Nessuna modifica sarà apportata." #define STRING_FEEDBACK_NO_MATCH "Nessuna corrispondenza." #define STRING_FEEDBACK_NO_TASKS "Nessun task." -#define STRING_FEEDBACK_TAG_NEXT "Il tag speciale 'next' aumenterà l'urgenza di questo task in modo che appaia nel report 'next'." -#define STRING_FEEDBACK_TAG_NOCAL "Il tag speciale 'nocal' manterrà il task fuori dal report 'calendar'." -#define STRING_FEEDBACK_TAG_NOCOLOR "Il tag speciale 'nocolor' disabilita le regole dei colori per questo task." -#define STRING_FEEDBACK_TAG_NONAG "Il tag speciale 'nonag' eviterà problemi quando il task è modificato." -#define STRING_FEEDBACK_TAG_VIRTUAL "Virtual tags (including '{1}') are reserved and may not be added or removed." #define STRING_FEEDBACK_TASKS_PLURAL "({1} task)" #define STRING_FEEDBACK_TASKS_SINGLE "(1 task)" -#define STRING_FEEDBACK_UNBLOCKED "Sbloccato {1} '{2}'." -#define STRING_FEEDBACK_WAS_NOP "Nessuna modifica apportata." #define STRING_TASK_DEPEND_CIRCULAR "Dipendenza circolare riscontrata ed evitata." #define STRING_TASK_DEPEND_DUP "Task {1} già dipende da {2}." #define STRING_TASK_DEPEND_ITSELF "Un task non può dipendere da sè stesso." diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h index 0b067fad7..eb9026c38 100644 --- a/src/l10n/jpn-JPN.h +++ b/src/l10n/jpn-JPN.h @@ -27,36 +27,10 @@ #ifndef INCLUDED_STRINGS #define INCLUDED_STRINGS -#define STRING_FEEDBACK_ANN_ADD "Annotation of '{1}' added." -#define STRING_FEEDBACK_ANN_DEL "Annotation '{1}' deleted." -#define STRING_FEEDBACK_ANN_WAS_MOD "Annotation changed to '{1}'." -#define STRING_FEEDBACK_ATT_DEL "{1} deleted." -#define STRING_FEEDBACK_ATT_DEL_DUR "{1} deleted (duration: {2})." -#define STRING_FEEDBACK_ATT_MOD "{1} will be changed from '{2}' to '{3}'." -#define STRING_FEEDBACK_ATT_SET "{1} will be set to '{2}'." -#define STRING_FEEDBACK_ATT_WAS_MOD "{1} changed from '{2}' to '{3}'." -#define STRING_FEEDBACK_ATT_WAS_SET "{1} set to '{2}'." -#define STRING_FEEDBACK_BACKLOG "There is {1} local change. Sync required." -#define STRING_FEEDBACK_BACKLOG_N "There are {1} local changes. Sync required." -#define STRING_FEEDBACK_DELETED "{1} will be deleted." -#define STRING_FEEDBACK_DEP_DEL "Dependencies '{1}' deleted." -#define STRING_FEEDBACK_DEP_MOD "Dependencies will be changed from '{1}' to '{2}'." -#define STRING_FEEDBACK_DEP_SET "Dependencies will be set to '{1}'." -#define STRING_FEEDBACK_DEP_WAS_MOD "Dependencies changed from '{1}' to '{2}'." -#define STRING_FEEDBACK_DEP_WAS_SET "Dependencies set to '{1}'." -#define STRING_FEEDBACK_EXPIRED "Task {1} '{2}' expired and was deleted." -#define STRING_FEEDBACK_NOP "No changes will be made." #define STRING_FEEDBACK_NO_MATCH "一致したものはありません。" #define STRING_FEEDBACK_NO_TASKS "タスクがない。" -#define STRING_FEEDBACK_TAG_NEXT "The 'next' special tag will boost the urgency of this task so it appears on the 'next' report." -#define STRING_FEEDBACK_TAG_NOCAL "The 'nocal' special tag will keep this task off the 'calendar' report." -#define STRING_FEEDBACK_TAG_NOCOLOR "The 'nocolor' special tag will disable color rules for this task." -#define STRING_FEEDBACK_TAG_NONAG "The 'nonag' special tag will prevent nagging when this task is modified." -#define STRING_FEEDBACK_TAG_VIRTUAL "Virtual tags (including '{1}') are reserved and may not be added or removed." #define STRING_FEEDBACK_TASKS_PLURAL "({1} タスク)" #define STRING_FEEDBACK_TASKS_SINGLE "(1 タスク)" -#define STRING_FEEDBACK_UNBLOCKED "Unblocked {1} '{2}'." -#define STRING_FEEDBACK_WAS_NOP "No changes made." #define STRING_TASK_DEPEND_CIRCULAR "Circular dependency detected and disallowed." #define STRING_TASK_DEPEND_DUP "Task {1} already depends on task {2}." #define STRING_TASK_DEPEND_ITSELF "A task cannot be dependent on itself." diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h index 0f5d0a000..45e89eae7 100644 --- a/src/l10n/pol-POL.h +++ b/src/l10n/pol-POL.h @@ -27,36 +27,10 @@ #ifndef INCLUDED_STRINGS #define INCLUDED_STRINGS -#define STRING_FEEDBACK_ANN_ADD "Notatka '{1}' dodana." -#define STRING_FEEDBACK_ANN_DEL "Notatka '{1}' usunięta." -#define STRING_FEEDBACK_ANN_WAS_MOD "Notatka zmieniona na '{1}'." -#define STRING_FEEDBACK_ATT_DEL "{1} usunięte." -#define STRING_FEEDBACK_ATT_DEL_DUR "{1} usunięte (czas trwania: {2})." -#define STRING_FEEDBACK_ATT_MOD "{1} będzie ustawione z '{2}' na '{3}'." -#define STRING_FEEDBACK_ATT_SET "{1} będzie ustawione na '{2}'." -#define STRING_FEEDBACK_ATT_WAS_MOD "{1} zmieniono z '{2}' na '{3}'." -#define STRING_FEEDBACK_ATT_WAS_SET "{1} ustawiono na '{2}'." -#define STRING_FEEDBACK_BACKLOG "Wykryto {1} lokalne zmiany. Wymagana synchronizacja." -#define STRING_FEEDBACK_BACKLOG_N "Wykryto {1} lokalne zmiany. Wymagana synchronizacja." -#define STRING_FEEDBACK_DELETED "{1} będzie usunięte." -#define STRING_FEEDBACK_DEP_DEL "Zależności '{1}' usunięte." -#define STRING_FEEDBACK_DEP_MOD "Zależności będą zmienione z '{1}' na '{2}'." -#define STRING_FEEDBACK_DEP_SET "Zależności będą ustawione na '{1}'." -#define STRING_FEEDBACK_DEP_WAS_MOD "Zależności zmienione z '{1}' na '{2}'." -#define STRING_FEEDBACK_DEP_WAS_SET "Zależności ustawione na '{1}'." -#define STRING_FEEDBACK_EXPIRED "Zadanie {1} '{2}' jest przedawnione i zostało usunięte." -#define STRING_FEEDBACK_NOP "Nie będą wprowadzone żadne zmiany." #define STRING_FEEDBACK_NO_MATCH "Nie znaleziono pasujących." #define STRING_FEEDBACK_NO_TASKS "Brak zadań." -#define STRING_FEEDBACK_TAG_NEXT "Specjalny tag 'next' podniesie pilność tego zadania co spowoduje wyświetlenie go w raporcie 'next'." -#define STRING_FEEDBACK_TAG_NOCAL "Specjalny tag 'nocal' spowoduje nie dodawanie zadania do kalendarza." -#define STRING_FEEDBACK_TAG_NOCOLOR "Specjalny tag 'nocolor' wyłączy reguły kolorowania dla tego zadania." -#define STRING_FEEDBACK_TAG_NONAG "Specjalny tag 'nonag' uchroni przed upierdliwością kiedy zadanie jest modyfikowane." -#define STRING_FEEDBACK_TAG_VIRTUAL "Virtual tags (including '{1}') are reserved and may not be added or removed." #define STRING_FEEDBACK_TASKS_PLURAL "({1} zadania)" #define STRING_FEEDBACK_TASKS_SINGLE "(1 zadanie)" -#define STRING_FEEDBACK_UNBLOCKED "Odblokowane {1} '{2}'." -#define STRING_FEEDBACK_WAS_NOP "Nie wprowadzono żadnych zmian." #define STRING_TASK_DEPEND_CIRCULAR "Wykryto i nie dopuszczono do zależności cyklicznej." #define STRING_TASK_DEPEND_DUP "Zadanie {1} już jest zależne od zadania {2}." #define STRING_TASK_DEPEND_ITSELF "Zadanie nie może zależeć od samego siebie." diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h index c3f9fa7ab..f79569aa6 100644 --- a/src/l10n/por-PRT.h +++ b/src/l10n/por-PRT.h @@ -27,36 +27,10 @@ #ifndef INCLUDED_STRINGS #define INCLUDED_STRINGS -#define STRING_FEEDBACK_ANN_ADD "Adicionada anotação de '{1}'." -#define STRING_FEEDBACK_ANN_DEL "Eliminada anotação '{1}'." -#define STRING_FEEDBACK_ANN_WAS_MOD "Anotação alterada para '{1}'." -#define STRING_FEEDBACK_ATT_DEL "{1} eliminado." -#define STRING_FEEDBACK_ATT_DEL_DUR "{1} eliminado (duração: {2})." -#define STRING_FEEDBACK_ATT_MOD "{1} será alterado de '{2}' para '{3}'." -#define STRING_FEEDBACK_ATT_SET "{1} será definido como '{2}'." -#define STRING_FEEDBACK_ATT_WAS_MOD "{1} alterado de '{2}' para '{3}'." -#define STRING_FEEDBACK_ATT_WAS_SET "{1} definido como '{2}'." -#define STRING_FEEDBACK_BACKLOG "Há {1} modificações locais. Necessário sincronizar (sync)." -#define STRING_FEEDBACK_BACKLOG_N "Há {1} modificações locais. Necessário sincronizar (sync)." -#define STRING_FEEDBACK_DELETED "{1} será eliminada." -#define STRING_FEEDBACK_DEP_DEL "Eliminadas as dependências '{1}'." -#define STRING_FEEDBACK_DEP_MOD "As dependências serão alteradas de '{1}' para '{2}'." -#define STRING_FEEDBACK_DEP_SET "As dependências serão alteradas para '{1}'." -#define STRING_FEEDBACK_DEP_WAS_MOD "Alteradas as dependências de '{1}' para '{2}'." -#define STRING_FEEDBACK_DEP_WAS_SET "Alteradas as dependências para '{1}'." -#define STRING_FEEDBACK_EXPIRED "Tarefa {1} '{2}' expirou e foi eliminada." -#define STRING_FEEDBACK_NOP "Não serão efetuadas alterações." #define STRING_FEEDBACK_NO_MATCH "Nenhuma correspondência." #define STRING_FEEDBACK_NO_TASKS "Nenhuma tarefa." -#define STRING_FEEDBACK_TAG_NEXT "A marca especial 'next' irá aumentar a urgência desta tarefa de modo a que apareça no relatório 'next'." -#define STRING_FEEDBACK_TAG_NOCAL "A marca especial 'nocal' irá manter esta tarefa ausente do relatório de 'calendário'." -#define STRING_FEEDBACK_TAG_NOCOLOR "A marca especial 'nocolor' irá desactivar as regras de cor nesta tarefa." -#define STRING_FEEDBACK_TAG_NONAG "A marca especial 'nonag' irá prevenir avisos quando a tarefa é modificada." -#define STRING_FEEDBACK_TAG_VIRTUAL "Virtual tags (including '{1}') are reserved and may not be added or removed." #define STRING_FEEDBACK_TASKS_PLURAL "({1} tarefas)" #define STRING_FEEDBACK_TASKS_SINGLE "(1 tarefa)" -#define STRING_FEEDBACK_UNBLOCKED "Desbloqueada {1} '{2}'." -#define STRING_FEEDBACK_WAS_NOP "Nenhuma alteração efetuada." #define STRING_TASK_DEPEND_CIRCULAR "Dependência circular detetada e não permitida." #define STRING_TASK_DEPEND_DUP "Tarefa {1} já depende da tarefa {2}." #define STRING_TASK_DEPEND_ITSELF "Uma tarefa não pode depender dela própria."