diff --git a/src/commands/CmdEdit.cpp b/src/commands/CmdEdit.cpp index 7e1678d19..69bf3034d 100644 --- a/src/commands/CmdEdit.cpp +++ b/src/commands/CmdEdit.cpp @@ -39,14 +39,18 @@ #include #include #include -#include #include #include #include -#include #include #include +#define STRING_EDIT_START_MOD "Start date modified." +#define STRING_EDIT_SCHED_MOD "Scheduled date modified." +#define STRING_EDIT_DUE_MOD "Due date modified." +#define STRING_EDIT_UNTIL_MOD "Until date modified." +#define STRING_EDIT_WAIT_MOD "Wait date modified." + extern Context context; //////////////////////////////////////////////////////////////////////////////// @@ -54,7 +58,7 @@ CmdEdit::CmdEdit () { _keyword = "edit"; _usage = "task edit"; - _description = STRING_CMD_EDIT_USAGE; + _description = "Launches an editor to modify a task directly"; _read_only = false; _displays_id = false; _needs_gc = false; @@ -79,7 +83,7 @@ int CmdEdit::execute (std::string&) if (! filtered.size ()) { - context.footnote (STRING_FEEDBACK_NO_MATCH); + context.footnote ("No matches."); return 1; } @@ -199,21 +203,21 @@ std::string CmdEdit::formatTask (Task task, const std::string& dateformat) auto verbose = context.verbose ("edit"); if (verbose) - before << "# " << STRING_EDIT_HEADER_1 << '\n' - << "# " << STRING_EDIT_HEADER_2 << '\n' - << "# " << STRING_EDIT_HEADER_3 << '\n' - << "# " << STRING_EDIT_HEADER_4 << '\n' - << "# " << STRING_EDIT_HEADER_5 << '\n' - << "# " << STRING_EDIT_HEADER_6 << '\n' - << "#\n" - << "# " << STRING_EDIT_HEADER_7 << '\n' - << "# " << STRING_EDIT_HEADER_8 << '\n' - << "# " << STRING_EDIT_HEADER_9 << '\n' - << "#\n" - << "# " << STRING_EDIT_HEADER_10 << '\n' - << "# " << STRING_EDIT_HEADER_11 << '\n' - << "# " << STRING_EDIT_HEADER_12 << '\n' - << "#\n"; + before << "# The 'task edit' command allows you to modify all aspects of a task\n" + "# using a text editor. Below is a representation of all the task details.\n" + "# Modify what you wish, and when you save and quit your editor,\n" + "# Taskwarrior will read this file, determine what changed, and apply\n" + "# those changes. If you exit your editor without saving or making\n" + "# modifications, Taskwarrior will do nothing.\n" + "#\n" + "# Lines that begin with # represent data you cannot change, like ID.\n" + "# If you get too creative with your editing, Taskwarrior will send you\n" + "# back to the editor to try again.\n" + "#\n" + "# Should you find yourself in an endless loop, re-editing the same file,\n" + "# just quit the editor without making any changes. Taskwarrior will\n" + "# notice this and stop the editing.\n" + "#\n"; before << "# Name Editable details\n" << "# ----------------- ----------------------------------------------------\n" @@ -225,7 +229,7 @@ std::string CmdEdit::formatTask (Task task, const std::string& dateformat) << " Project: " << task.get ("project") << '\n'; if (verbose) - before << "# " << STRING_EDIT_TAG_SEP << '\n'; + before << "# Separate the tags with spaces, like this: tag1 tag2\n"; before << " Tags: " << join (" ", task.getTags ()) << '\n' << " Description: " << task.get ("description") << '\n' @@ -241,9 +245,9 @@ std::string CmdEdit::formatTask (Task task, const std::string& dateformat) << " Parent: " << task.get ("parent") << '\n'; if (verbose) - before << "# " << STRING_EDIT_HEADER_13 << '\n' - << "# " << STRING_EDIT_HEADER_14 << '\n' - << "# " << STRING_EDIT_HEADER_15 << '\n'; + before << "# Annotations look like this: -- and there can be any number of them.\n" + "# The ' -- ' separator between the date and text field should not be removed.\n" + "# A \"blank slot\" for adding an annotation follows for your convenience.\n"; for (auto& anno : task.getAnnotations ()) { @@ -273,7 +277,7 @@ std::string CmdEdit::formatTask (Task task, const std::string& dateformat) } if (verbose) - before << "# " << STRING_EDIT_DEP_SEP << '\n'; + before << "# Dependencies should be a comma-separated list of task IDs/UUIDs or ID ranges, with no spaces.\n"; before << " Dependencies: " << allDeps.str () << '\n'; @@ -285,7 +289,7 @@ std::string CmdEdit::formatTask (Task task, const std::string& dateformat) if (udas.size ()) { - before << "# " << STRING_EDIT_UDA_SEP << '\n'; + before << "# User Defined Attributes\n"; std::sort (udas.begin (), udas.end ()); for (auto& uda : udas) { @@ -308,7 +312,7 @@ std::string CmdEdit::formatTask (Task task, const std::string& dateformat) auto orphans = task.getUDAOrphanUUIDs (); if (orphans.size ()) { - before << "# " << STRING_EDIT_UDA_ORPHAN_SEP << '\n'; + before << "# User Defined Attribute Orphans\n"; std::sort (orphans.begin (), orphans.end ()); for (auto& orphan : orphans) { @@ -321,7 +325,7 @@ std::string CmdEdit::formatTask (Task task, const std::string& dateformat) } } - before << "# " << STRING_EDIT_END << '\n'; + before << "# End\n"; return before.str (); } @@ -334,12 +338,12 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string { if (value != "") { - context.footnote (STRING_EDIT_PROJECT_MOD); + context.footnote ("Project modified."); task.set ("project", value); } else { - context.footnote (STRING_EDIT_PROJECT_DEL); + context.footnote ("Project deleted."); task.remove ("project"); } } @@ -355,11 +359,11 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string { if (value != "") { - context.footnote (STRING_EDIT_DESC_MOD); + context.footnote ("Description modified."); task.set ("description", value); } else - throw std::string (STRING_EDIT_DESC_REMOVE_ERR); + throw std::string ("Cannot remove description."); } // entry @@ -368,12 +372,12 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string { if (value != formatDate (task, "entry", dateformat)) { - context.footnote (STRING_EDIT_ENTRY_MOD); + context.footnote ("Creation date modified."); task.set ("entry", Datetime (value, dateformat).toEpochString ()); } } else - throw std::string (STRING_EDIT_ENTRY_REMOVE_ERR); + throw std::string ("Cannot remove creation date."); // start value = findValue (after, "\n Started:"); @@ -397,7 +401,7 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string { if (task.get ("start") != "") { - context.footnote (STRING_EDIT_START_DEL); + context.footnote ("Start date removed."); task.remove ("start"); } } @@ -410,18 +414,18 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string { if (value != formatDate (task, "end", dateformat)) { - context.footnote (STRING_EDIT_END_MOD); + context.footnote ("End date modified."); task.set ("end", Datetime (value, dateformat).toEpochString ()); } } else if (task.getStatus () != Task::deleted) - throw std::string (STRING_EDIT_END_SET_ERR); + throw std::string ("Cannot set a done date on a pending task."); } else { if (task.get ("end") != "") { - context.footnote (STRING_EDIT_END_DEL); + context.footnote ("End date removed."); task.setStatus (Task::pending); task.remove ("end"); } @@ -449,7 +453,7 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string { if (task.get ("scheduled") != "") { - context.footnote (STRING_EDIT_SCHED_DEL); + context.footnote ("Scheduled date removed."); task.remove ("scheduled"); } } @@ -479,11 +483,11 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string if (task.getStatus () == Task::recurring || task.get ("parent") != "") { - context.footnote (STRING_EDIT_DUE_DEL_ERR); + context.footnote ("Cannot remove a due date from a recurring task."); } else { - context.footnote (STRING_EDIT_DUE_DEL); + context.footnote ("Due date removed."); task.remove ("due"); } } @@ -511,7 +515,7 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string { if (task.get ("until") != "") { - context.footnote (STRING_EDIT_UNTIL_DEL); + context.footnote ("Until date removed."); task.remove ("until"); } } @@ -526,21 +530,21 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string std::string::size_type idx = 0; if (p.parse (value, idx)) { - context.footnote (STRING_EDIT_RECUR_MOD); + context.footnote ("Recurrence modified."); if (task.get ("due") != "") { task.set ("recur", value); task.setStatus (Task::recurring); } else - throw std::string (STRING_EDIT_RECUR_DUE_ERR); + throw std::string ("A recurring task must have a due date."); } else - throw std::string (STRING_EDIT_RECUR_ERR); + throw std::string ("Not a valid recurrence duration."); } else { - context.footnote (STRING_EDIT_RECUR_DEL); + context.footnote ("Recurrence removed."); task.setStatus (Task::pending); task.remove ("recur"); task.remove ("until"); @@ -573,7 +577,7 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string { if (task.get ("wait") != "") { - context.footnote (STRING_EDIT_WAIT_DEL); + context.footnote ("Wait date removed."); task.remove ("wait"); task.setStatus (Task::pending); } @@ -585,12 +589,12 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string { if (value != "") { - context.footnote (STRING_EDIT_PARENT_MOD); + context.footnote ("Parent UUID modified."); task.set ("parent", value); } else { - context.footnote (STRING_EDIT_PARENT_DEL); + context.footnote ("Parent UUID removed."); task.remove ("parent"); } } @@ -667,7 +671,7 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string { if (value != "") { - context.footnote (format (STRING_EDIT_UDA_MOD, col.first)); + context.footnote (format ("UDA {1} modified.", col.first)); if (type == "string") { @@ -694,7 +698,7 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string } else { - context.footnote (format (STRING_EDIT_UDA_DEL, col.first)); + context.footnote (format ("UDA {1} deleted.", col.first)); task.remove (col.first); } } @@ -724,7 +728,7 @@ CmdEdit::editResult CmdEdit::editFile (Task& task) // Check for file permissions. Directory location (context.config.get ("data.location")); if (! location.writable ()) - throw std::string (STRING_EDIT_UNWRITABLE); + throw std::string ("Your data.location directory is not writable."); // Create a temp file name in data.location. std::stringstream file; @@ -745,7 +749,7 @@ CmdEdit::editResult CmdEdit::editFile (Task& task) // Check if the file already exists, if so, bail out Path filepath = Path (file.str ()); if (filepath.exists ()) - throw std::string (STRING_EDIT_IN_PROGRESS); + throw std::string ("Task is already being edited."); // Format the contents, T -> text, write to a file. auto before = formatTask (task, dateformat); @@ -768,14 +772,14 @@ ARE_THESE_REALLY_HARMFUL: bool changes = false; // No changes made. // Launch the editor. - std::cout << format (STRING_EDIT_LAUNCHING, editor) << '\n'; + std::cout << format ("Launching '{1}' now...\n", editor); int exitcode = system (editor.c_str ()); auto captured_errno = errno; if (0 == exitcode) - std::cout << STRING_EDIT_COMPLETE << '\n'; + std::cout << "Editing complete.\n"; else { - std::cout << format (STRING_EDIT_FAILED, exitcode) << '\n'; + std::cout << format ("Editing failed with exit code {1}.\n", exitcode); if (-1 == exitcode) std::cout << std::strerror (captured_errno) << '\n'; return CmdEdit::editResult::error; @@ -789,7 +793,7 @@ ARE_THESE_REALLY_HARMFUL: // if changes were made. if (before_orig != after) { - std::cout << STRING_EDIT_CHANGES << '\n'; + std::cout << "Edits were detected.\n"; std::string problem = ""; auto oops = false; @@ -806,13 +810,13 @@ ARE_THESE_REALLY_HARMFUL: if (oops) { - std::cerr << STRING_ERROR_PREFIX << problem << '\n'; + std::cerr << "Error: " << problem << '\n'; // Preserve the edits. before = after; File::write (file.str (), before); - if (confirm (STRING_EDIT_UNPARSEABLE)) + if (confirm ("Taskwarrior couldn't handle your edits. Would you like to try again?")) goto ARE_THESE_REALLY_HARMFUL; } else @@ -820,7 +824,7 @@ ARE_THESE_REALLY_HARMFUL: } else { - std::cout << STRING_EDIT_NO_CHANGES << '\n'; + std::cout << "No edits were detected.\n"; changes = false; } diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h index 97d31e603..d299c0ed7 100644 --- a/src/l10n/deu-DEU.h +++ b/src/l10n/deu-DEU.h @@ -489,73 +489,8 @@ #define STRING_CMD_CAL_LABEL_DATE "Datum" #define STRING_CMD_CAL_LABEL_HOL "Feiertag" #define STRING_CMD_CAL_SUN_MON "Die 'weekstart'-Konfigurationsoption darf nur 'Sunday' oder 'Monday' lauten." -#define STRING_CMD_EDIT_USAGE "Startet einen Editor, um eine Aufgabe direkt zu bearbeiten" #define STRING_CMD_CALC_USAGE "Rechner" -// edit -#define STRING_EDIT_NO_CHANGES "Keine Änderungen entdeckt." -#define STRING_EDIT_FAILED "Editing failed with exit code {1}." -#define STRING_EDIT_COMPLETE "Bearbeitung abgeschlossen." -#define STRING_EDIT_IN_PROGRESS "Task is already being edited." -#define STRING_EDIT_LAUNCHING "Starte jetzt '{1}'..." -#define STRING_EDIT_CHANGES "Änderungen entdeckt." -#define STRING_EDIT_UNPARSEABLE "Taskwarrior konnte Ihre Änderungen nicht verarbeiten. Möchten Sie es erneut probieren?" -#define STRING_EDIT_UNWRITABLE "Ihr data.location-Order ist nicht beschreibbar." -#define STRING_EDIT_TAG_SEP "Trennen Sie die Schlagworte mit Leerzeichen, zum Beispiel: tag1 tag2" -#define STRING_EDIT_DEP_SEP "Abhängigkeiten sollten eine Komma-getrennte Liste von Aufgaben-IDs/UUIDs oder ID-Intervallen ohne Leerzeichen sein." -#define STRING_EDIT_UDA_SEP "Benutzerdefinierte Eigenschaften" -#define STRING_EDIT_UDA_ORPHAN_SEP "Verwaiste Benutzerdefinierte Eigenschaften" -#define STRING_EDIT_END "Ende" - -#define STRING_EDIT_PROJECT_MOD "Projekt geändert." -#define STRING_EDIT_PROJECT_DEL "Projekt gelöscht." -#define STRING_EDIT_DESC_MOD "Beschreibung geändert." -#define STRING_EDIT_DESC_REMOVE_ERR "Beschreibung kann nicht entfernt werden." -#define STRING_EDIT_ENTRY_REMOVE_ERR "Erstelldatum kann nicht entfernt werden." -#define STRING_EDIT_ENTRY_MOD "Erstelldatum geändert." -#define STRING_EDIT_START_MOD "Start-Datum geändert." -#define STRING_EDIT_START_DEL "Start-Datum gelöscht." -#define STRING_EDIT_END_MOD "End-Datum geändert." -#define STRING_EDIT_END_DEL "End-Datum gelöscht." -#define STRING_EDIT_END_SET_ERR "Kann kein Ende-Datum für eine offene Aufgabe setzen." -#define STRING_EDIT_SCHED_MOD "Geplantes Datum geändert." -#define STRING_EDIT_SCHED_DEL "Geplantes Datum gelöscht." -#define STRING_EDIT_DUE_MOD "Fälligkeit geändert." -#define STRING_EDIT_DUE_DEL "Fälligkeit gelöscht." -#define STRING_EDIT_DUE_DEL_ERR "Fälligkeit einer wiederholenden Aufgabe kann nicht gelöscht werden." -#define STRING_EDIT_UNTIL_MOD "Ende-Datum geändert." -#define STRING_EDIT_UNTIL_DEL "Ende-Datum gelöscht." -#define STRING_EDIT_RECUR_MOD "Wiederholungsperiode geändert." -#define STRING_EDIT_RECUR_DEL "Wiederholungsperiode gelöscht." -#define STRING_EDIT_RECUR_DUE_ERR "Wiederholende Aufgaben benötigen eine Fälligkeit." -#define STRING_EDIT_RECUR_ERR "Keine gültige Wiederholungsperiode." -#define STRING_EDIT_WAIT_MOD "Aufschiebe-Datum geändert." -#define STRING_EDIT_WAIT_DEL "Aufschiebe-Datum gelöscht." -#define STRING_EDIT_PARENT_MOD "Vorgänger-UUID geändert." -#define STRING_EDIT_PARENT_DEL "Vorgänger-UUID gelöscht." -#define STRING_EDIT_UDA_MOD "UDA {1} geändert." -#define STRING_EDIT_UDA_DEL "UDA {1} gelöscht." - -// These four blocks can be replaced, but the number of lines must not change. -#define STRING_EDIT_HEADER_1 "Der Befehl 'task edit' ermöglicht es, alle Eigenschaften einer Aufgabe" -#define STRING_EDIT_HEADER_2 "mit einem Text-Editor zu bearbeiten. Bearbeiten Sie nach Ihren Wünschen." -#define STRING_EDIT_HEADER_3 "Nachdem Sie gespeichert und den Text Editor beendet haben, wird taskwarrior" -#define STRING_EDIT_HEADER_4 "die Datei einlesen und durchgeführte Änderungen anwenden. Wenn Sie den" -#define STRING_EDIT_HEADER_5 "Text-Editor beenden, ohne zu speichern oder Änderungen durchzuführen, wird" -#define STRING_EDIT_HEADER_6 "taskwarrior nichts tun." - -#define STRING_EDIT_HEADER_7 "Zeilen, welche mit # beginnen, beinhalten nicht änderbare Eigenschaften" -#define STRING_EDIT_HEADER_8 "(z.B. die ID). Sollte taskwarrior Ihre Änderungen nicht verstehen, wird er" -#define STRING_EDIT_HEADER_9 "den Editor erneut öffnen, sodass Sie es erneut versuchen können." - -#define STRING_EDIT_HEADER_10 "Sollten Sie sich in einer Endlosschleife befinden und immer die selbe Datei" -#define STRING_EDIT_HEADER_11 "bearbeiten, schließen Sie den Text-Editor ohne Änderungen vorzunehmen." -#define STRING_EDIT_HEADER_12 "Taskwarrior wird dies feststellen und die Bearbeitung beenden." - -#define STRING_EDIT_HEADER_13 "Kommentare haben das Format ' -- ', es darf beliebig viele geben." -#define STRING_EDIT_HEADER_14 "Die ' -- '-Trennung zwischen Datum und Text darf nicht entfernt werden." -#define STRING_EDIT_HEADER_15 "Zum einfachen hinzufügen neuer Kommentare folgt ein leeres Kommentarfeld." - // Errors // TODO Move each of these to appropriate section. #define STRING_ERROR_PREFIX "Fehler: " diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h index c8de7c653..ee9016593 100644 --- a/src/l10n/eng-USA.h +++ b/src/l10n/eng-USA.h @@ -486,73 +486,8 @@ #define STRING_CMD_CAL_LABEL_DATE "Date" #define STRING_CMD_CAL_LABEL_HOL "Holiday" #define STRING_CMD_CAL_SUN_MON "The 'weekstart' configuration variable may only contain 'Sunday' or 'Monday'." -#define STRING_CMD_EDIT_USAGE "Launches an editor to modify a task directly" #define STRING_CMD_CALC_USAGE "Calculator" -// edit -#define STRING_EDIT_NO_CHANGES "No edits were detected." -#define STRING_EDIT_FAILED "Editing failed with exit code {1}." -#define STRING_EDIT_COMPLETE "Editing complete." -#define STRING_EDIT_IN_PROGRESS "Task is already being edited." -#define STRING_EDIT_LAUNCHING "Launching '{1}' now..." -#define STRING_EDIT_CHANGES "Edits were detected." -#define STRING_EDIT_UNPARSEABLE "Taskwarrior couldn't handle your edits. Would you like to try again?" -#define STRING_EDIT_UNWRITABLE "Your data.location directory is not writable." -#define STRING_EDIT_TAG_SEP "Separate the tags with spaces, like this: tag1 tag2" -#define STRING_EDIT_DEP_SEP "Dependencies should be a comma-separated list of task IDs/UUIDs or ID ranges, with no spaces." -#define STRING_EDIT_UDA_SEP "User Defined Attributes" -#define STRING_EDIT_UDA_ORPHAN_SEP "User Defined Attribute Orphans" -#define STRING_EDIT_END "End" - -#define STRING_EDIT_PROJECT_MOD "Project modified." -#define STRING_EDIT_PROJECT_DEL "Project deleted." -#define STRING_EDIT_DESC_MOD "Description modified." -#define STRING_EDIT_DESC_REMOVE_ERR "Cannot remove description." -#define STRING_EDIT_ENTRY_REMOVE_ERR "Cannot remove creation date." -#define STRING_EDIT_ENTRY_MOD "Creation date modified." -#define STRING_EDIT_START_MOD "Start date modified." -#define STRING_EDIT_START_DEL "Start date removed." -#define STRING_EDIT_END_MOD "End date modified." -#define STRING_EDIT_END_DEL "End date removed." -#define STRING_EDIT_END_SET_ERR "Cannot set a done date on a pending task." -#define STRING_EDIT_SCHED_MOD "Scheduled date modified." -#define STRING_EDIT_SCHED_DEL "Scheduled date removed." -#define STRING_EDIT_DUE_MOD "Due date modified." -#define STRING_EDIT_DUE_DEL "Due date removed." -#define STRING_EDIT_DUE_DEL_ERR "Cannot remove a due date from a recurring task." -#define STRING_EDIT_UNTIL_MOD "Until date modified." -#define STRING_EDIT_UNTIL_DEL "Until date removed." -#define STRING_EDIT_RECUR_MOD "Recurrence modified." -#define STRING_EDIT_RECUR_DEL "Recurrence removed." -#define STRING_EDIT_RECUR_DUE_ERR "A recurring task must have a due date." -#define STRING_EDIT_RECUR_ERR "Not a valid recurrence duration." -#define STRING_EDIT_WAIT_MOD "Wait date modified." -#define STRING_EDIT_WAIT_DEL "Wait date removed." -#define STRING_EDIT_PARENT_MOD "Parent UUID modified." -#define STRING_EDIT_PARENT_DEL "Parent UUID removed." -#define STRING_EDIT_UDA_MOD "UDA {1} modified." -#define STRING_EDIT_UDA_DEL "UDA {1} deleted." - -// These four blocks can be replaced, but the number of lines must not change. -#define STRING_EDIT_HEADER_1 "The 'task edit' command allows you to modify all aspects of a task" -#define STRING_EDIT_HEADER_2 "using a text editor. Below is a representation of all the task details." -#define STRING_EDIT_HEADER_3 "Modify what you wish, and when you save and quit your editor," -#define STRING_EDIT_HEADER_4 "Taskwarrior will read this file, determine what changed, and apply" -#define STRING_EDIT_HEADER_5 "those changes. If you exit your editor without saving or making" -#define STRING_EDIT_HEADER_6 "modifications, Taskwarrior will do nothing." - -#define STRING_EDIT_HEADER_7 "Lines that begin with # represent data you cannot change, like ID." -#define STRING_EDIT_HEADER_8 "If you get too creative with your editing, Taskwarrior will send you" -#define STRING_EDIT_HEADER_9 "back to the editor to try again." - -#define STRING_EDIT_HEADER_10 "Should you find yourself in an endless loop, re-editing the same file," -#define STRING_EDIT_HEADER_11 "just quit the editor without making any changes. Taskwarrior will" -#define STRING_EDIT_HEADER_12 "notice this and stop the editing." - -#define STRING_EDIT_HEADER_13 "Annotations look like this: -- and there can be any number of them." -#define STRING_EDIT_HEADER_14 "The ' -- ' separator between the date and text field should not be removed." -#define STRING_EDIT_HEADER_15 "A \"blank slot\" for adding an annotation follows for your convenience." - // Errors // TODO Move each of these to appropriate section. #define STRING_ERROR_PREFIX "Error: " diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h index 0f0ef19cc..e672af313 100644 --- a/src/l10n/epo-RUS.h +++ b/src/l10n/epo-RUS.h @@ -489,73 +489,8 @@ #define STRING_CMD_CAL_LABEL_DATE "Dato" #define STRING_CMD_CAL_LABEL_HOL "Ferio" #define STRING_CMD_CAL_SUN_MON "agordvariablo 'weekstart' devas esti 'Sunday' aŭ 'Monday'." -#define STRING_CMD_EDIT_USAGE "Lanĉas redaktilo por rekte modifi taskon" #define STRING_CMD_CALC_USAGE "Kalkulilo" -// edit -#define STRING_EDIT_NO_CHANGES "Ne detektis nenian redakton." -#define STRING_EDIT_FAILED "Editing failed with exit code {1}." -#define STRING_EDIT_COMPLETE "Redaktis komplete." -#define STRING_EDIT_IN_PROGRESS "Task is already being edited." -#define STRING_EDIT_LAUNCHING "Lanĉanta nun '{1}'..." -#define STRING_EDIT_CHANGES "Detektis redaktojn." -#define STRING_EDIT_UNPARSEABLE "Taskwarrior ne povis trakti viaj redaktojn. Ĉu vi volas ripovi?" -#define STRING_EDIT_UNWRITABLE "Via dosierumo data.location ne estas skribebla." -#define STRING_EDIT_TAG_SEP "Apartigi la etikedojn kun spaceto, kiel: etiked1 etiked2" -#define STRING_EDIT_DEP_SEP "Dependoj devas esti listo komdividata de task-identigilojn (ID aŭ UUID) aŭ ID-atingopovoj, sen spacetoj." -#define STRING_EDIT_UDA_SEP "Uzanto-Definitaj Atributoj" -#define STRING_EDIT_UDA_ORPHAN_SEP "Uzanto-Definitaj Atributoj kiu estas Orfoj" -#define STRING_EDIT_END "Fino" - -#define STRING_EDIT_PROJECT_MOD "Modifis la projekton." -#define STRING_EDIT_PROJECT_DEL "Viŝis la projekton." -#define STRING_EDIT_DESC_MOD "Modifis la priskribon." -#define STRING_EDIT_DESC_REMOVE_ERR "Ne povis viŝi la priskribon." -#define STRING_EDIT_ENTRY_REMOVE_ERR "Ne povis viŝi la krean daton." -#define STRING_EDIT_ENTRY_MOD "Modifis la krean daton." -#define STRING_EDIT_START_MOD "Modifis la ekan daton." -#define STRING_EDIT_START_DEL "Viŝis la ekan daton." -#define STRING_EDIT_END_MOD "Modifis la finan daton." -#define STRING_EDIT_END_DEL "Viŝis la finan daton." -#define STRING_EDIT_END_SET_ERR "Ne povas doni fin-dato al pendanta tasko." -#define STRING_EDIT_SCHED_MOD "Modifis la fiksan daton." -#define STRING_EDIT_SCHED_DEL "Viŝis la fiksan daton." -#define STRING_EDIT_DUE_MOD "Modifis la datlimon." -#define STRING_EDIT_DUE_DEL "Viŝis la datlimon." -#define STRING_EDIT_DUE_DEL_ERR "Ne povas viŝi datlimon de reokazanta tasko." -#define STRING_EDIT_UNTIL_MOD "Modifis la ĝisan daton." -#define STRING_EDIT_UNTIL_DEL "Viŝis la ĝisan daton." -#define STRING_EDIT_RECUR_MOD "Modifis la reokazon." -#define STRING_EDIT_RECUR_DEL "Viŝis la reokazon." -#define STRING_EDIT_RECUR_DUE_ERR "Reokazanta tasko devas havi datlimon." -#define STRING_EDIT_RECUR_ERR "Nevalida reokaza daŭro." -#define STRING_EDIT_WAIT_MOD "Modifis la atend-daton." -#define STRING_EDIT_WAIT_DEL "Viŝis la atend-daton." -#define STRING_EDIT_PARENT_MOD "Modifis la patran UUID-identigilon." -#define STRING_EDIT_PARENT_DEL "Viŝis la patran UUID-identigilon." -#define STRING_EDIT_UDA_MOD "Modifis la UDA {1}." -#define STRING_EDIT_UDA_DEL "Viŝis la UDA {1}." - -// These four blocks can be replaced, but the number of lines must not change. -#define STRING_EDIT_HEADER_1 "Komando 'task edit' vi permesas modifi ĉian aspekton de tasko kun" -#define STRING_EDIT_HEADER_2 "tekst-redaktilo. Jen sube reprezento de ĉia taska detalo. Modifu kion vi" -#define STRING_EDIT_HEADER_3 "volas. Kiam vi konservos ĉi tiun dosieron kaj iros el la redaktilo," -#define STRING_EDIT_HEADER_4 "taskwarrior legos la dosieron, trovos la ŝanĝojn, kaj apliki ĝin. Se vi" -#define STRING_EDIT_HEADER_5 "iras el redaktilo sen konservi aŭ sen modifi, taskwarrior ne faros" -#define STRING_EDIT_HEADER_6 "nenion." - -#define STRING_EDIT_HEADER_7 "Vicoj ke ekas kun # reprezentas datumojn neŝanĝeblajn, ekzemple ID." -#define STRING_EDIT_HEADER_8 "Se vi redaktis tro kreeme, taskwarrior risendos vin al redaktilo por" -#define STRING_EDIT_HEADER_9 "ripovi." - -#define STRING_EDIT_HEADER_10 "Se vi trovas en senfina ripeto, riredaktanta la meman dosieron, simple" -#define STRING_EDIT_HEADER_11 "iru el redaktilo sen ŝanĝi nenion. Taskwarrior notos ĝin kaj haltos la" -#define STRING_EDIT_HEADER_12 "redaktciklon." - -#define STRING_EDIT_HEADER_13 "Komentoj devas aspekti kiel: -- ; povas ekzisti ajna" -#define STRING_EDIT_HEADER_14 "nombro de komentojn. Ne viŝus la apartigilon ' -- ' inter la dato kaj la" -#define STRING_EDIT_HEADER_15 "teksto. Malplena loko sekvas por simpligi la aldonon de komenton." - // Errors // TODO Move each of these to appropriate section. #define STRING_ERROR_PREFIX "Eraro: " diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h index 0fa7d47b2..bfb8502a5 100644 --- a/src/l10n/esp-ESP.h +++ b/src/l10n/esp-ESP.h @@ -501,73 +501,8 @@ #define STRING_CMD_CAL_LABEL_DATE "Fecha" #define STRING_CMD_CAL_LABEL_HOL "Festivo" #define STRING_CMD_CAL_SUN_MON "La variable de configuración 'weekstart' solamente puede contener 'domingo' o 'lunes'." -#define STRING_CMD_EDIT_USAGE "Lanza un editor para modificar una tarea directamente" #define STRING_CMD_CALC_USAGE "Calculadora" -// edit -#define STRING_EDIT_NO_CHANGES "No se detectaron modificaciones." -#define STRING_EDIT_FAILED "Edición fallida con código de salida {1}." -#define STRING_EDIT_COMPLETE "Edición completada." -#define STRING_EDIT_IN_PROGRESS "La tarea ya está siendo editada." -#define STRING_EDIT_LAUNCHING "Lanzando '{1}' ahora..." -#define STRING_EDIT_CHANGES "Se detectaron modificaciones." -#define STRING_EDIT_UNPARSEABLE "Taskwarrior no pudo manejar sus modificaciones. ¿Quiere intentarlo de nuevo?" -#define STRING_EDIT_UNWRITABLE "No tiene permiso de escritura en su directorio data.location ." -#define STRING_EDIT_TAG_SEP "Separe las marcas mediante espacios, así: marca1 marca2" -#define STRING_EDIT_DEP_SEP "Las dependencias deben ser una lista separada por comas de IDs/UUIDs de tareas o intervalos de ID, sin espacios." -#define STRING_EDIT_UDA_SEP "Atributos Definidos por el Usuario" -#define STRING_EDIT_UDA_ORPHAN_SEP "Huérfanos de Atributo Definido por el Usuario" -#define STRING_EDIT_END "Fin" - -#define STRING_EDIT_PROJECT_MOD "Proyecto modificado." -#define STRING_EDIT_PROJECT_DEL "Proyecto eliminado." -#define STRING_EDIT_DESC_MOD "Descripción modificada." -#define STRING_EDIT_DESC_REMOVE_ERR "No se puede eliminar la descripción." -#define STRING_EDIT_ENTRY_REMOVE_ERR "No se puede eliminar la fecha de creación." -#define STRING_EDIT_ENTRY_MOD "Fecha de creación modificada." -#define STRING_EDIT_START_MOD "Fecha de comienzo modificada." -#define STRING_EDIT_START_DEL "Fecha de comienzo eliminada." -#define STRING_EDIT_END_MOD "Fecha de terminación modificada." -#define STRING_EDIT_END_DEL "Fecha de terminación eliminada." -#define STRING_EDIT_END_SET_ERR "No se puede establecer una fecha de completado en una tarea pendiente." -#define STRING_EDIT_SCHED_MOD "Fecha programada modificada." -#define STRING_EDIT_SCHED_DEL "Fecha programada eliminada." -#define STRING_EDIT_DUE_MOD "Fecha de vencimiento modificada." -#define STRING_EDIT_DUE_DEL "Fecha de vencimiento eliminada." -#define STRING_EDIT_DUE_DEL_ERR "No se puede eliminar una fecha de vencimiento de una tarea recurrente." -#define STRING_EDIT_UNTIL_MOD "Fecha 'hasta' modificada." -#define STRING_EDIT_UNTIL_DEL "Fecha 'hasta' eliminada." -#define STRING_EDIT_RECUR_MOD "Recurrencia modificada." -#define STRING_EDIT_RECUR_DEL "Recurrencia eliminada." -#define STRING_EDIT_RECUR_DUE_ERR "Una tarea recurrente debe tener una fecha de vencimiento." -#define STRING_EDIT_RECUR_ERR "No es una duración de recurrencia válida." -#define STRING_EDIT_WAIT_MOD "Fecha de espera modificada." -#define STRING_EDIT_WAIT_DEL "Fecha de espera eliminada." -#define STRING_EDIT_PARENT_MOD "UUID primario modificado." -#define STRING_EDIT_PARENT_DEL "UUID primario eliminado." -#define STRING_EDIT_UDA_MOD "UDA {1} modificado." -#define STRING_EDIT_UDA_DEL "UDA {1} eliminado." - -// These four blocks can be replaced, but the number of lines must not change. -#define STRING_EDIT_HEADER_1 "El comando 'task edit' le permite modificar todos los detalles de" -#define STRING_EDIT_HEADER_2 "una tarea usando un editor de textos. Más abajo hay una representación" -#define STRING_EDIT_HEADER_3 "de todos los detalles de la tarea. Modifique lo que desee y, cuando grabe" -#define STRING_EDIT_HEADER_4 "y salga del editor, taskwarrior leerá este archivo, determinará qué ha" -#define STRING_EDIT_HEADER_5 "cambiado, y aplicará esos cambios. Si sale del editor sin grabar o sin" -#define STRING_EDIT_HEADER_6 "hacer modificaciones, taskwarrior no hará nada." - -#define STRING_EDIT_HEADER_7 "Las líneas que comienzan con # representan datos que no puede cambiar, como ID." -#define STRING_EDIT_HEADER_8 "Si es demasiado creativo con sus modificaciones, taskwarrior le enviará de vuelta" -#define STRING_EDIT_HEADER_9 "al editor para que lo intente de nuevo." - -#define STRING_EDIT_HEADER_10 "Si queda atrapado en un ciclo sin fin, volviendo a editar el mismo archivo" -#define STRING_EDIT_HEADER_11 "una y otra vez, simplemente abandone el editor sin hacer ningún cambio." -#define STRING_EDIT_HEADER_12 "Taskwarrior lo advertirá y detendrá el proceso." - -#define STRING_EDIT_HEADER_13 "Las anotaciones aparecen así: -- y puede haber cualquier número de ellas." -#define STRING_EDIT_HEADER_14 "El separador ' -- ' entre la fecha y el campo de texto no debe ser eliminado." -#define STRING_EDIT_HEADER_15 "La última es una \"entrada en blanco\" para añadir una anotación, si le conviene:" - // Errors // TODO Move each of these to appropriate section. #define STRING_ERROR_PREFIX "Error: " // |esp-ESP|==|eng-USA| diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h index 2e052e49a..ec44d4b97 100644 --- a/src/l10n/fra-FRA.h +++ b/src/l10n/fra-FRA.h @@ -491,53 +491,8 @@ #define STRING_CMD_CAL_LABEL_DATE "Date" #define STRING_CMD_CAL_LABEL_HOL "Holiday" #define STRING_CMD_CAL_SUN_MON "The 'weekstart' configuration variable may only contain 'Sunday' or 'Monday'." -#define STRING_CMD_EDIT_USAGE "Launches an editor to modify a task directly" #define STRING_CMD_CALC_USAGE "Calculator" -// edit -#define STRING_EDIT_NO_CHANGES "Aucunes modifications détectées." -#define STRING_EDIT_FAILED "Editing failed with exit code {1}." -#define STRING_EDIT_COMPLETE "Édition terminée." -#define STRING_EDIT_IN_PROGRESS "Task is already being edited." -#define STRING_EDIT_LAUNCHING "Lancement de '{1}' maintenant..." -#define STRING_EDIT_CHANGES "Des modifications ont été détectées." -#define STRING_EDIT_UNPARSEABLE "Taskwarrior n'a pas pu appliquer vos modifications. Désirez-vous essayer à nouveau ?" -#define STRING_EDIT_UNWRITABLE "Votre dossier data.location n'est pas inscriptible." -#define STRING_EDIT_TAG_SEP "Séparez les étiquettes (tag) ainsi : tag1 tag2" -#define STRING_EDIT_DEP_SEP "Les dépendances devraient être une liste d'ID/UUID de tâches ou un interval d'ID, séparés par des virgules, sans espaces." -#define STRING_EDIT_UDA_SEP "Attributs définis par l'utilisateur" -#define STRING_EDIT_UDA_ORPHAN_SEP "Attributs orphelins définis par l'utilisateur" -#define STRING_EDIT_END "Fin" - -#define STRING_EDIT_PROJECT_MOD "Projet modifié." -#define STRING_EDIT_PROJECT_DEL "Projet supprimé." -#define STRING_EDIT_DESC_MOD "Description modifiée." -#define STRING_EDIT_DESC_REMOVE_ERR "Impossible de supprimer la description." -#define STRING_EDIT_ENTRY_REMOVE_ERR "Impossible de supprimer la date de création." -#define STRING_EDIT_ENTRY_MOD "Date de création modifiée." -#define STRING_EDIT_START_MOD "Date de départ modifiée." -#define STRING_EDIT_START_DEL "Date de départ supprimée." -#define STRING_EDIT_END_MOD "Date de fin modifiée." -#define STRING_EDIT_END_DEL "Date de fin supprimée." -#define STRING_EDIT_END_SET_ERR "Impossible de régler une date de fin sur une tâche en cours." -#define STRING_EDIT_SCHED_MOD "Date prévue modifiée." -#define STRING_EDIT_SCHED_DEL "Date prévue supprimée." -#define STRING_EDIT_DUE_MOD "Échéance modifiée." -#define STRING_EDIT_DUE_DEL "Échéance supprimée." -#define STRING_EDIT_DUE_DEL_ERR "Impossible de retirer une échéance d'une tâche récurrente." -#define STRING_EDIT_UNTIL_MOD "Date jusqu'à modifiée." -#define STRING_EDIT_UNTIL_DEL "Date jusqu'à supprimée." -#define STRING_EDIT_RECUR_MOD "Récurrence modifiée." -#define STRING_EDIT_RECUR_DEL "Récurrence supprimée." -#define STRING_EDIT_RECUR_DUE_ERR "Une tâche récurrente doit avoir une date planifiée." -#define STRING_EDIT_RECUR_ERR "Durée de récurrence invalide." -#define STRING_EDIT_WAIT_MOD "Retardement modifié." -#define STRING_EDIT_WAIT_DEL "Retardement supprimé." -#define STRING_EDIT_PARENT_MOD "UUID parent modifié." -#define STRING_EDIT_PARENT_DEL "UUID parent supprimé." -#define STRING_EDIT_UDA_MOD "ADU {1} modifié." -#define STRING_EDIT_UDA_DEL "ADU {1} supprimé." - // These four blocks can be replaced, but the number of lines must not change. #define STRING_EDIT_HEADER_1 "La commande 'task edit' vous permet de modifier tous les aspects d'une tâche" #define STRING_EDIT_HEADER_2 "en utilisant un éditeur de texte. Ci-dessous sont listés toutes les caractéristiques de la tâche." diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h index 8d2aad3c6..389512f17 100644 --- a/src/l10n/ita-ITA.h +++ b/src/l10n/ita-ITA.h @@ -490,73 +490,8 @@ #define STRING_CMD_CAL_LABEL_DATE "Data" #define STRING_CMD_CAL_LABEL_HOL "Festività" #define STRING_CMD_CAL_SUN_MON "La variabile di configurazione 'weekstart' può solo contenere i valori 'Domenica' or 'Lunedì'." -#define STRING_CMD_EDIT_USAGE "Esegue un editor per la modifica diretta di un task" #define STRING_CMD_CALC_USAGE "Calculator" -// edit -#define STRING_EDIT_NO_CHANGES "Nessuna modifica riscontrata." -#define STRING_EDIT_FAILED "Editing failed with exit code {1}." -#define STRING_EDIT_COMPLETE "Modifica completa." -#define STRING_EDIT_IN_PROGRESS "Task is already being edited." -#define STRING_EDIT_LAUNCHING "Esecuzione di '{1}' ora..." -#define STRING_EDIT_CHANGES "Modifiche rilevate." -#define STRING_EDIT_UNPARSEABLE "Taskwarrior non può gestire le modifiche. Provare di nuovo?" -#define STRING_EDIT_UNWRITABLE "La directory data.location non è scrivibile." -#define STRING_EDIT_TAG_SEP "Separare i tag con spazi; es.: tag1 tag2" -#define STRING_EDIT_DEP_SEP "Le dipendenze dovrebbero consistere in una lista separata da virgole di ID/UUID o intervalli di ID, senza spazi." -#define STRING_EDIT_UDA_SEP "User Defined Attribute" -#define STRING_EDIT_UDA_ORPHAN_SEP "User Defined Attribute orfani" -#define STRING_EDIT_END "Fine" - -#define STRING_EDIT_PROJECT_MOD "Progetto modificato." -#define STRING_EDIT_PROJECT_DEL "Progetto cancellato." -#define STRING_EDIT_DESC_MOD "Descrizione modificata." -#define STRING_EDIT_DESC_REMOVE_ERR "Impossibile rimuovere la descrizione." -#define STRING_EDIT_ENTRY_REMOVE_ERR "Impossibile rimuovere la data di creazione." -#define STRING_EDIT_ENTRY_MOD "Data di creazione modificata." -#define STRING_EDIT_START_MOD "Data di inizio modificata." -#define STRING_EDIT_START_DEL "Data di inizio rimossa." -#define STRING_EDIT_END_MOD "Data di fine modificata." -#define STRING_EDIT_END_DEL "Data di fine rimossa." -#define STRING_EDIT_END_SET_ERR "Impossibile impostare la data di chiusura del task pendente." -#define STRING_EDIT_SCHED_MOD "Data di schedulazione modificata." -#define STRING_EDIT_SCHED_DEL "Data di schedulazione rimossa." -#define STRING_EDIT_DUE_MOD "Scadenza modificata." -#define STRING_EDIT_DUE_DEL "Scadenza rimossa." -#define STRING_EDIT_DUE_DEL_ERR "Impossibile rimuovere la data di scadenza di un task periodico." -#define STRING_EDIT_UNTIL_MOD "Data 'Fino a' modificata." -#define STRING_EDIT_UNTIL_DEL "Data 'Fino a' rimossa." -#define STRING_EDIT_RECUR_MOD "Ricorrenza periodica modificata." -#define STRING_EDIT_RECUR_DEL "Ricorrenza periodica rimossa." -#define STRING_EDIT_RECUR_DUE_ERR "Un task periodico deve avere una data di scadenza." -#define STRING_EDIT_RECUR_ERR "Durata del task periodico non valida." -#define STRING_EDIT_WAIT_MOD "Data di attesa modificata." -#define STRING_EDIT_WAIT_DEL "Data di attesa rimossa." -#define STRING_EDIT_PARENT_MOD "UUID genitore modificato." -#define STRING_EDIT_PARENT_DEL "UUID genitore rimosso." -#define STRING_EDIT_UDA_MOD "UDA {1} modificato." -#define STRING_EDIT_UDA_DEL "UDA {1} cancellato." - -// These four blocks can be replaced, but the number of lines must not change. -#define STRING_EDIT_HEADER_1 "Il comando 'task edit' permette di modificare ogni aspetto di un task" -#define STRING_EDIT_HEADER_2 "utilizzando un editor di testo. Segue la rappresentazione dei dettagli di un task." -#define STRING_EDIT_HEADER_3 "Modificare quanto desiderato, e quando si salva e si esce dall'editor," -#define STRING_EDIT_HEADER_4 "taskwarrior leggerà il file, determinando ciò che è cambiato, e applicherà" -#define STRING_EDIT_HEADER_5 "le modifiche. Se si esce dall'editor senza salvare o effettuare" -#define STRING_EDIT_HEADER_6 "modifiche, taskwarrior non farà alcunché." - -#define STRING_EDIT_HEADER_7 "Le linee che iniziano con # rappresentano dati che non possono essere modificati, come l'ID." -#define STRING_EDIT_HEADER_8 "Se si è troppo creativi con le modifiche, taskwarrior aprirà" -#define STRING_EDIT_HEADER_9 "nuovamente l'editor per un secondo tentativo." - -#define STRING_EDIT_HEADER_10 "Se ci si trova in un ciclo senza fine, continuando a editare lo stesso file," -#define STRING_EDIT_HEADER_11 "si chiuda semplicemente l'editor senza effettuare modifiche. Taskwarrior" -#define STRING_EDIT_HEADER_12 "se ne accorgerà e terminerà l'editing." - -#define STRING_EDIT_HEADER_13 "Le annotazioni sono del tipo: -- e possono essere in numero arbitrario." -#define STRING_EDIT_HEADER_14 "Il separatore ' -- ' tra la data e il campo di teso non dovrebbe essere rimosso." -#define STRING_EDIT_HEADER_15 "Una linea preimpostata per aggiungere una annotazione è stata aggiunta per comodità." - // Errors // TODO Move each of these to appropriate section. #define STRING_ERROR_PREFIX "Errore: " diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h index d228610c5..2d61c82b0 100644 --- a/src/l10n/jpn-JPN.h +++ b/src/l10n/jpn-JPN.h @@ -491,73 +491,8 @@ #define STRING_CMD_CAL_LABEL_DATE "Date" #define STRING_CMD_CAL_LABEL_HOL "Holiday" #define STRING_CMD_CAL_SUN_MON "'weekstart' 設定変数は 'Sunday' または 'Monday' のみが使えます。" -#define STRING_CMD_EDIT_USAGE "task を直接変更するためにエディタを起動します" #define STRING_CMD_CALC_USAGE "電卓" -// edit -#define STRING_EDIT_NO_CHANGES "No edits were detected." -#define STRING_EDIT_FAILED "Editing failed with exit code {1}." -#define STRING_EDIT_COMPLETE "Editing complete." -#define STRING_EDIT_IN_PROGRESS "Task is already being edited." -#define STRING_EDIT_LAUNCHING "Launching '{1}' now..." -#define STRING_EDIT_CHANGES "Edits were detected." -#define STRING_EDIT_UNPARSEABLE "Taskwarrior couldn't handle your edits. Would you like to try again?" -#define STRING_EDIT_UNWRITABLE "Your data.location directory is not writable." -#define STRING_EDIT_TAG_SEP "Separate the tags with spaces, like this: tag1 tag2" -#define STRING_EDIT_DEP_SEP "Dependencies should be a comma-separated list of task IDs/UUIDs or ID ranges, with no spaces." -#define STRING_EDIT_UDA_SEP "User Defined Attributes" -#define STRING_EDIT_UDA_ORPHAN_SEP "User Defined Attribute Orphans" -#define STRING_EDIT_END "End" - -#define STRING_EDIT_PROJECT_MOD "Project modified." -#define STRING_EDIT_PROJECT_DEL "Project deleted." -#define STRING_EDIT_DESC_MOD "Description modified." -#define STRING_EDIT_DESC_REMOVE_ERR "Cannot remove description." -#define STRING_EDIT_ENTRY_REMOVE_ERR "Cannot remove creation date." -#define STRING_EDIT_ENTRY_MOD "Creation date modified." -#define STRING_EDIT_START_MOD "Start date modified." -#define STRING_EDIT_START_DEL "Start date removed." -#define STRING_EDIT_END_MOD "End date modified." -#define STRING_EDIT_END_DEL "End date removed." -#define STRING_EDIT_END_SET_ERR "Cannot set a done date on a pending task." -#define STRING_EDIT_SCHED_MOD "Scheduled date modified." -#define STRING_EDIT_SCHED_DEL "Scheduled date removed." -#define STRING_EDIT_DUE_MOD "Due date modified." -#define STRING_EDIT_DUE_DEL "Due date removed." -#define STRING_EDIT_DUE_DEL_ERR "Cannot remove a due date from a recurring task." -#define STRING_EDIT_UNTIL_MOD "Until date modified." -#define STRING_EDIT_UNTIL_DEL "Until date removed." -#define STRING_EDIT_RECUR_MOD "Recurrence modified." -#define STRING_EDIT_RECUR_DEL "Recurrence removed." -#define STRING_EDIT_RECUR_DUE_ERR "A recurring task must have a due date." -#define STRING_EDIT_RECUR_ERR "Not a valid recurrence duration." -#define STRING_EDIT_WAIT_MOD "Wait date modified." -#define STRING_EDIT_WAIT_DEL "Wait date removed." -#define STRING_EDIT_PARENT_MOD "Parent UUID modified." -#define STRING_EDIT_PARENT_DEL "Parent UUID removed." -#define STRING_EDIT_UDA_MOD "UDA {1} modified." -#define STRING_EDIT_UDA_DEL "UDA {1} deleted." - -// These four blocks can be replaced, but the number of lines must not change. -#define STRING_EDIT_HEADER_1 "The 'task edit' command allows you to modify all aspects of a task" -#define STRING_EDIT_HEADER_2 "using a text editor. Below is a representation of all the task details." -#define STRING_EDIT_HEADER_3 "Modify what you wish, and when you save and quit your editor," -#define STRING_EDIT_HEADER_4 "taskwarrior will read this file, determine what changed, and apply" -#define STRING_EDIT_HEADER_5 "those changes. If you exit your editor without saving or making" -#define STRING_EDIT_HEADER_6 "modifications, taskwarrior will do nothing." - -#define STRING_EDIT_HEADER_7 "Lines that begin with # represent data you cannot change, like ID." -#define STRING_EDIT_HEADER_8 "If you get too creative with your editing, taskwarrior will send you" -#define STRING_EDIT_HEADER_9 "back to the editor to try again." - -#define STRING_EDIT_HEADER_10 "Should you find yourself in an endless loop, re-editing the same file," -#define STRING_EDIT_HEADER_11 "just quit the editor without making any changes. Taskwarrior will" -#define STRING_EDIT_HEADER_12 "notice this and stop the editing." - -#define STRING_EDIT_HEADER_13 "Annotations look like this: -- and there can be any number of them." -#define STRING_EDIT_HEADER_14 "The ' -- ' separator between the date and text field should not be removed." -#define STRING_EDIT_HEADER_15 "A \"blank slot\" for adding an annotation follows for your convenience." - // Errors // TODO Move each of these to appropriate section. #define STRING_ERROR_PREFIX "エラー: " diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h index 0522bd22f..82dbe89c5 100644 --- a/src/l10n/pol-POL.h +++ b/src/l10n/pol-POL.h @@ -491,73 +491,8 @@ #define STRING_CMD_CAL_LABEL_DATE "Data" #define STRING_CMD_CAL_LABEL_HOL "Wakacje" #define STRING_CMD_CAL_SUN_MON "Początek tygodnia może mieć wartość 'Niedziela' lub 'Poniedziałek'." -#define STRING_CMD_EDIT_USAGE "Uruchamia edytor do zmiany zadania" #define STRING_CMD_CALC_USAGE "Kalkulator" -// edit -#define STRING_EDIT_NO_CHANGES "Nie znaleziono żadnych edycji." -#define STRING_EDIT_FAILED "Editing failed with exit code {1}." -#define STRING_EDIT_COMPLETE "Edycja zakończona." -#define STRING_EDIT_IN_PROGRESS "Task is already being edited." -#define STRING_EDIT_LAUNCHING "Uruchamianie '{1}'..." -#define STRING_EDIT_CHANGES "Zmiany wykryte." -#define STRING_EDIT_UNPARSEABLE "Taskwarrior nie może wprowadzić twoich zmian. Czy chcesz spróbować jeszcze raz?" -#define STRING_EDIT_UNWRITABLE "Brak możliwości zapisu do katalogu data.location" -#define STRING_EDIT_TAG_SEP "Rozdziel tagi białymi znakami, na przykład: tag1 tag2" -#define STRING_EDIT_DEP_SEP "Zależności powinny być elementami listy, rozdzielonymi przecinkami. Na listę składają się ID/UUID lub zakresy ID, bez spacji." -#define STRING_EDIT_UDA_SEP "Atrybuty definiowane przez użytkownika" -#define STRING_EDIT_UDA_ORPHAN_SEP "Atrybuty Orphan definiowane przez użytkownika" -#define STRING_EDIT_END "Koniec" - -#define STRING_EDIT_PROJECT_MOD "Projekt zmieniony." -#define STRING_EDIT_PROJECT_DEL "Projekt usunięty." -#define STRING_EDIT_DESC_MOD "Opis zmieniony." -#define STRING_EDIT_DESC_REMOVE_ERR "Nie można usunąć opisu." -#define STRING_EDIT_ENTRY_REMOVE_ERR "Nie można usunąć daty utworzenia." -#define STRING_EDIT_ENTRY_MOD "Data utworzenia zmieniona." -#define STRING_EDIT_START_MOD "Data startu zmieniona." -#define STRING_EDIT_START_DEL "Data startu usunięta." -#define STRING_EDIT_END_MOD "Data zakończenia zmieniona." -#define STRING_EDIT_END_DEL "Data zakończenia usunięta." -#define STRING_EDIT_END_SET_ERR "Nie można ustawić daty ukończenia na zadaniu oczekującym." -#define STRING_EDIT_SCHED_MOD "Harmonogram zmieniony." -#define STRING_EDIT_SCHED_DEL "Harmonogram usunięty." -#define STRING_EDIT_DUE_MOD "Termin zmieniony." -#define STRING_EDIT_DUE_DEL "Termin usunięty." -#define STRING_EDIT_DUE_DEL_ERR "Nie można usunąć terminu z zadanie rekurencyjnego." -#define STRING_EDIT_UNTIL_MOD "Data końcowa zmieniona." -#define STRING_EDIT_UNTIL_DEL "Data końcowa usunięta." -#define STRING_EDIT_RECUR_MOD "Rekurencja zmieniona." -#define STRING_EDIT_RECUR_DEL "Rekurencja usunięta." -#define STRING_EDIT_RECUR_DUE_ERR "Zadanie rekurencyjne musi posiadać termin." -#define STRING_EDIT_RECUR_ERR "Nie poprawny termin zadania rekurencyjnego." -#define STRING_EDIT_WAIT_MOD "Data oczekiwania zmieniona." -#define STRING_EDIT_WAIT_DEL "Data oczekiwania usunięta." -#define STRING_EDIT_PARENT_MOD "UUID rodzica zmieniony." -#define STRING_EDIT_PARENT_DEL "UUID rodzica usunięty." -#define STRING_EDIT_UDA_MOD "UDA {1} zmieniony." -#define STRING_EDIT_UDA_DEL "UDA {1} usunięty." - -// These four blocks can be replaced, but the number of lines must not change. -#define STRING_EDIT_HEADER_1 "Polecenie 'task edit' pozwala Ci na modyfikację wszystkich aspektów zadania" -#define STRING_EDIT_HEADER_2 "za pomocą edytora. Poniżej przedstawiono reprezentację właściwości zadania." -#define STRING_EDIT_HEADER_3 "Zmodyfikuj co tylko chcesz a następnie zapisz i zamknij edytor," -#define STRING_EDIT_HEADER_4 "taskwarrior odczyta plik, odnajdzie modyfikacje, a następnie zastosuje" -#define STRING_EDIT_HEADER_5 "te zmiany. Jeśli zamkniesz edytor bez zapisywania zmian lub ich nie zrobisz," -#define STRING_EDIT_HEADER_6 "taskwarrior nie podejmie żadych działań." - -#define STRING_EDIT_HEADER_7 "Linie zaczynające się od # oznaczają dane których nie możesz zmieniać, np. ID" -#define STRING_EDIT_HEADER_8 "Jeśli będziesz zbyt kreatywny przy edycji, taskwarrior odeśle Cię" -#define STRING_EDIT_HEADER_9 "zpowrotem do edytora abyś spróbował jeszcze raz." - -#define STRING_EDIT_HEADER_10 "Jeśli zapętlisz się przy edycji tego samego pliku, poprostu zamknij" -#define STRING_EDIT_HEADER_11 "edytor bez dokonywania zmian. Taskwarrior rozpozna to i przerwie" -#define STRING_EDIT_HEADER_12 "edycję." - -#define STRING_EDIT_HEADER_13 "Notatki wyglądają tak: -- i może ich być dowolna ilość." -#define STRING_EDIT_HEADER_14 "Separator ' -- ' pomiędzy datą a tekstem nie powinien być pominięty." -#define STRING_EDIT_HEADER_15 "Pusty slot poniżej został dodany dla Twojej wygody." - // Errors // TODO Move each of these to appropriate section. #define STRING_ERROR_PREFIX "Błąd: " diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h index f82fc3d9f..84db97afe 100644 --- a/src/l10n/por-PRT.h +++ b/src/l10n/por-PRT.h @@ -491,73 +491,8 @@ #define STRING_CMD_CAL_LABEL_DATE "Data" #define STRING_CMD_CAL_LABEL_HOL "Feriado" #define STRING_CMD_CAL_SUN_MON "A variável de configuração 'weekstart' apenas pode conter 'domingo' ou 'segunda-feira'." -#define STRING_CMD_EDIT_USAGE "Inicia um editor externo para modificar a tarefa diretamente" #define STRING_CMD_CALC_USAGE "Calculadora" -// edit -#define STRING_EDIT_NO_CHANGES "Não foram detetadas alterações." -#define STRING_EDIT_FAILED "Editing failed with exit code {1}." -#define STRING_EDIT_COMPLETE "Edição concluída." -#define STRING_EDIT_IN_PROGRESS "Task is already being edited." -#define STRING_EDIT_LAUNCHING "A iniciar '{1}' ..." -#define STRING_EDIT_CHANGES "Alterações detetadas." -#define STRING_EDIT_UNPARSEABLE "O taskwarrior não conseguiu processar as suas alterações. Deseja tentar novamente?" -#define STRING_EDIT_UNWRITABLE "Não é possível escrever no diretório indicado por data.location." -#define STRING_EDIT_TAG_SEP "Separe as marcas com espaços, por exemplo: marca1 marca2" -#define STRING_EDIT_DEP_SEP "As dependências deverão ser uma lista de IDs/UUIDs ou intervalos de IDs, sem espaços e separados por vírgulas." -#define STRING_EDIT_UDA_SEP "Atributos Definidos pelo Utilizador (UDAs)" -#define STRING_EDIT_UDA_ORPHAN_SEP "Atributos Orfãos Definidos pelo Utilizador" -#define STRING_EDIT_END "Fim" - -#define STRING_EDIT_PROJECT_MOD "Projeto modificado." -#define STRING_EDIT_PROJECT_DEL "Projeto removido." -#define STRING_EDIT_DESC_MOD "Descrição modificada." -#define STRING_EDIT_DESC_REMOVE_ERR "Não é possível remover a descrição." -#define STRING_EDIT_ENTRY_REMOVE_ERR "Não é possível remover a data de criação." -#define STRING_EDIT_ENTRY_MOD "Data de criação modificada." -#define STRING_EDIT_START_MOD "Data de início modificada." -#define STRING_EDIT_START_DEL "Data de início removida." -#define STRING_EDIT_END_MOD "Data de conclusão modificada." -#define STRING_EDIT_END_DEL "Data de conclusão removida." -#define STRING_EDIT_END_SET_ERR "Não é possível adicionar uma data de conclusão a uma tarefa pendente." -#define STRING_EDIT_SCHED_MOD "Data de agendamento modificada." -#define STRING_EDIT_SCHED_DEL "Data de agendamento removida." -#define STRING_EDIT_DUE_MOD "Data de vencimento modificada." -#define STRING_EDIT_DUE_DEL "Data de vencimento removida." -#define STRING_EDIT_DUE_DEL_ERR "Não é possível remover a data de vencimento de uma tarefa recorrente." -#define STRING_EDIT_UNTIL_MOD "Data 'até' modificada." -#define STRING_EDIT_UNTIL_DEL "Data 'até' removida." -#define STRING_EDIT_RECUR_MOD "Recorrência modificada." -#define STRING_EDIT_RECUR_DEL "Recorrência removida." -#define STRING_EDIT_RECUR_DUE_ERR "É obrigatório que tarefas recorrentes tenham uma data de vencimento." -#define STRING_EDIT_RECUR_ERR "Duração de recorrência inválida." -#define STRING_EDIT_WAIT_MOD "Data de espera modificada." -#define STRING_EDIT_WAIT_DEL "Data de espera removida." -#define STRING_EDIT_PARENT_MOD "UUID mãe modificado." -#define STRING_EDIT_PARENT_DEL "UUID mãe removido." -#define STRING_EDIT_UDA_MOD "UDA {1} modificado." -#define STRING_EDIT_UDA_DEL "UDA {1} eliminado." - -// These four blocks can be replaced, but the number of lines must not change. -#define STRING_EDIT_HEADER_1 "O comando 'task edit' permite modificar todos os aspetos de uma tarefa" -#define STRING_EDIT_HEADER_2 "usando um editor de texto. Por baixo segue uma representação de todos os" -#define STRING_EDIT_HEADER_3 "detalhes da tarefa. Modifique o que deseja, e quando guardar e sair do seu" -#define STRING_EDIT_HEADER_4 "editor, o taskwarrior irá ler este ficheiro, identificar as alterações e" -#define STRING_EDIT_HEADER_5 "aplicá-las. Se sair do editor sem guardar ou fazer alterações, o taskwarrior" -#define STRING_EDIT_HEADER_6 "não irá fazer nada." - -#define STRING_EDIT_HEADER_7 "Linhas começadas por # representam dados que não podem ser alterados, como ID." -#define STRING_EDIT_HEADER_8 "Se for demasiado criativo com a edição, o taskwarrior enviá-lo-à de volta" -#define STRING_EDIT_HEADER_9 "para o editor para corrigir eventuais erros." - -#define STRING_EDIT_HEADER_10 "Caso este comportamento o atire para um ciclo infinito de re-edição do mesmo" -#define STRING_EDIT_HEADER_11 "ficheiro, apenas saia do editor sem fazer quaisquer alterações. O taskwarrior" -#define STRING_EDIT_HEADER_12 "irá ter isso em conta e interrompe a edição." - -#define STRING_EDIT_HEADER_13 "As anotações são: -- e pode haver um número variável das mesmas." -#define STRING_EDIT_HEADER_14 "O separador ' -- ' entre os campos data e texto deverá ser mantido." -#define STRING_EDIT_HEADER_15 "Segue-se uma \"linha em branco\" onde adicionar anotações para sua conveniência." - // Errors // TODO Move each of these to appropriate section. #define STRING_ERROR_PREFIX "Erro: "