diff --git a/src/columns/ColProject.cpp b/src/columns/ColProject.cpp index a68c22fe4..b29d9309c 100644 --- a/src/columns/ColProject.cpp +++ b/src/columns/ColProject.cpp @@ -35,7 +35,6 @@ #include #include #include -#include extern Context context; extern Task& contextTask; @@ -45,7 +44,7 @@ ColumnProject::ColumnProject () { _name = "project"; _style = "full"; - _label = STRING_COLUMN_LABEL_PROJECT; + _label = "Project"; _styles = {"full", "parent", "indented"}; _examples = {"home.garden", "home", diff --git a/src/columns/ColRType.cpp b/src/columns/ColRType.cpp index 747caace5..d64267712 100644 --- a/src/columns/ColRType.cpp +++ b/src/columns/ColRType.cpp @@ -29,7 +29,6 @@ #include #include #include -#include #include extern Context context; @@ -39,7 +38,7 @@ ColumnRType::ColumnRType () { _name = "rtype"; _style = "default"; - _label = STRING_COLUMN_LABEL_RTYPE; + _label = "Recurrence type"; _modifiable = false; _styles = {"default", "indicator"}; _examples = {"periodic", "chained"}; @@ -52,7 +51,7 @@ void ColumnRType::setStyle (const std::string& value) { Column::setStyle (value); - if (_style == "indicator" && _label == STRING_COLUMN_LABEL_RTYPE) + if (_style == "indicator" && _label == "Recurrence type") _label = _label.substr (0, context.config.get ("rtype.indicator").length ()); } diff --git a/src/columns/ColStatus.cpp b/src/columns/ColStatus.cpp index 7c041232f..a2eec1a38 100644 --- a/src/columns/ColStatus.cpp +++ b/src/columns/ColStatus.cpp @@ -35,7 +35,7 @@ ColumnStatus::ColumnStatus () { _name = "status"; _style = "long"; - _label = STRING_COLUMN_LABEL_STATUS; + _label = "Status"; _styles = {"long", "short"}; _examples = {STRING_COLUMN_LABEL_STAT_PE, STRING_COLUMN_LABEL_STAT_P}; @@ -48,7 +48,7 @@ void ColumnStatus::setStyle (const std::string& value) { Column::setStyle (value); - if (_style == "short" && _label == STRING_COLUMN_LABEL_STATUS) + if (_style == "short" && _label == "Status") _label = STRING_COLUMN_LABEL_STAT; } diff --git a/src/columns/ColTags.cpp b/src/columns/ColTags.cpp index 91806a2a0..9b90a5de4 100644 --- a/src/columns/ColTags.cpp +++ b/src/columns/ColTags.cpp @@ -45,7 +45,7 @@ ColumnTags::ColumnTags () { _name = "tags"; _style = "list"; - _label = STRING_COLUMN_LABEL_TAGS; + _label = "Tags"; _styles = {"list", "indicator", "count"}; _examples = {"home @chore next", context.config.get ("tag.indicator"), @@ -61,12 +61,12 @@ void ColumnTags::setStyle (const std::string& value) Column::setStyle (value); if (_style == "indicator" && - _label == STRING_COLUMN_LABEL_TAGS) + _label == "Tags") _label = _label.substr (0, context.config.get ("tag.indicator").length ()); else if (_style == "count" && - _label == STRING_COLUMN_LABEL_TAGS) - _label = STRING_COLUMN_LABEL_TAG; + _label == "Tags") + _label = "Tag"; } //////////////////////////////////////////////////////////////////////////////// diff --git a/src/columns/ColUUID.cpp b/src/columns/ColUUID.cpp index 5583e7086..87341e5a7 100644 --- a/src/columns/ColUUID.cpp +++ b/src/columns/ColUUID.cpp @@ -27,14 +27,13 @@ #include #include #include -#include //////////////////////////////////////////////////////////////////////////////// ColumnUUID::ColumnUUID () { _name = "uuid"; _style = "long"; - _label = STRING_COLUMN_LABEL_UUID; + _label = "UUID"; _modifiable = false; _styles = {"long", "short"}; _examples = {"f30cb9c3-3fc0-483f-bfb2-3bf134f00694", "f30cb9c3"}; diff --git a/src/columns/ColUrgency.cpp b/src/columns/ColUrgency.cpp index d492d4b0d..7b32d5081 100644 --- a/src/columns/ColUrgency.cpp +++ b/src/columns/ColUrgency.cpp @@ -27,14 +27,13 @@ #include #include #include -#include //////////////////////////////////////////////////////////////////////////////// ColumnUrgency::ColumnUrgency () { _name = "urgency"; _style = "real"; - _label = STRING_COLUMN_LABEL_URGENCY; + _label = "Urgency"; _modifiable = false; _styles = {"real", "integer"}; _examples = {"4.6", "4"}; diff --git a/src/commands/CmdInfo.cpp b/src/commands/CmdInfo.cpp index dccc9ac1e..c36bd62bd 100644 --- a/src/commands/CmdInfo.cpp +++ b/src/commands/CmdInfo.cpp @@ -37,7 +37,6 @@ #include #include #include -#include extern Context context; @@ -75,7 +74,7 @@ int CmdInfo::execute (std::string& output) if (! filtered.size ()) { - context.footnote (STRING_FEEDBACK_NO_MATCH); + context.footnote ("No matches."); rc = 1; } @@ -105,8 +104,8 @@ int CmdInfo::execute (std::string& output) view.obfuscate (); if (context.color ()) view.forceColor (); - view.add (STRING_COLUMN_LABEL_NAME); - view.add (STRING_COLUMN_LABEL_VALUE); + view.add ("Name"); + view.add ("Value"); setHeaderUnderline (view); Datetime now; @@ -137,14 +136,14 @@ int CmdInfo::execute (std::string& output) // status row = view.addRow (); - view.set (row, 0, STRING_COLUMN_LABEL_STATUS); + view.set (row, 0, "Status"); view.set (row, 1, status); // project if (task.has ("project")) { row = view.addRow (); - view.set (row, 0, STRING_COLUMN_LABEL_PROJECT); + view.set (row, 0, "Project"); view.set (row, 1, task.get ("project")); } @@ -182,7 +181,7 @@ int CmdInfo::execute (std::string& output) if (task.has ("recur")) { row = view.addRow (); - view.set (row, 0, STRING_COLUMN_LABEL_RECUR_L); + view.set (row, 0, "Recurrence"); view.set (row, 1, task.get ("recur")); } @@ -233,13 +232,13 @@ int CmdInfo::execute (std::string& output) if (task.has ("rtype")) { row = view.addRow (); - view.set (row, 0, STRING_COLUMN_LABEL_RTYPE); + view.set (row, 0, "Recurrence type"); view.set (row, 1, task.get ("rtype")); } // entry row = view.addRow (); - view.set (row, 0, STRING_COLUMN_LABEL_ENTERED); + view.set (row, 0, "Entered"); Datetime dt (task.get_date ("entry")); std::string entry = dt.toString (dateformat); @@ -257,7 +256,7 @@ int CmdInfo::execute (std::string& output) if (task.has ("wait")) { row = view.addRow (); - view.set (row, 0, STRING_COLUMN_LABEL_WAITING); + view.set (row, 0, "Waiting until"); view.set (row, 1, Datetime (task.get_date ("wait")).toString (dateformat)); } @@ -273,7 +272,7 @@ int CmdInfo::execute (std::string& output) if (task.has ("start")) { row = view.addRow (); - view.set (row, 0, STRING_COLUMN_LABEL_START); + view.set (row, 0, "Start"); view.set (row, 1, Datetime (task.get_date ("start")).toString (dateformat)); } @@ -319,7 +318,7 @@ int CmdInfo::execute (std::string& output) auto allTags = join (" ", tags); row = view.addRow (); - view.set (row, 0, STRING_COLUMN_LABEL_TAGS); + view.set (row, 0, "Tags"); view.set (row, 1, allTags); } @@ -368,13 +367,13 @@ int CmdInfo::execute (std::string& output) // uuid row = view.addRow (); - view.set (row, 0, STRING_COLUMN_LABEL_UUID); + view.set (row, 0, "UUID"); auto uuid = task.get ("uuid"); view.set (row, 1, uuid); // Task::urgency row = view.addRow (); - view.set (row, 0, STRING_COLUMN_LABEL_URGENCY); + view.set (row, 0, "Urgency"); view.set (row, 1, format (task.urgency (), 4, 4)); // Show any UDAs diff --git a/src/commands/CmdProjects.cpp b/src/commands/CmdProjects.cpp index ecc64c621..4c752989f 100644 --- a/src/commands/CmdProjects.cpp +++ b/src/commands/CmdProjects.cpp @@ -33,7 +33,6 @@ #include #include #include -#include #include extern Context context; @@ -108,7 +107,7 @@ int CmdProjects::execute (std::string& output) // Render a list of project names from the map. Table view; view.width (context.getWidth ()); - view.add (STRING_COLUMN_LABEL_PROJECT); + view.add ("Project"); view.add ("Tasks", false); setHeaderUnderline (view); diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h index 7905cff28..4d940e72e 100644 --- a/src/l10n/deu-DEU.h +++ b/src/l10n/deu-DEU.h @@ -27,17 +27,11 @@ #ifndef INCLUDED_STRINGS #define INCLUDED_STRINGS -#define STRING_COLUMN_LABEL_ENTERED "Erfasst" #define STRING_COLUMN_LABEL_LABEL "Beschreibung" #define STRING_COLUMN_LABEL_MOD "Geändert" -#define STRING_COLUMN_LABEL_NAME "Name" #define STRING_COLUMN_LABEL_ORPHAN "Verwaiste UDA" -#define STRING_COLUMN_LABEL_PROJECT "Projekt" #define STRING_COLUMN_LABEL_RECUR "Wiederh." -#define STRING_COLUMN_LABEL_RECUR_L "Wiederholung" -#define STRING_COLUMN_LABEL_RTYPE "Recurrence type" #define STRING_COLUMN_LABEL_STAT "St" -#define STRING_COLUMN_LABEL_STATUS "Status" #define STRING_COLUMN_LABEL_STAT_C "E" #define STRING_COLUMN_LABEL_STAT_CO "Erledigt" #define STRING_COLUMN_LABEL_STAT_D "G" @@ -49,15 +43,10 @@ #define STRING_COLUMN_LABEL_STAT_W "A" #define STRING_COLUMN_LABEL_STAT_WA "Wartet" #define STRING_COLUMN_LABEL_TAG "Schlagwort" -#define STRING_COLUMN_LABEL_TAGS "Schlagworte" #define STRING_COLUMN_LABEL_UDA "Name" #define STRING_COLUMN_LABEL_UDACOUNT "Nutzungshäufigkeit" #define STRING_COLUMN_LABEL_UNTIL "Bis" -#define STRING_COLUMN_LABEL_URGENCY "Dringlichkeit" -#define STRING_COLUMN_LABEL_UUID "UUID" -#define STRING_COLUMN_LABEL_VALUE "Wert" #define STRING_COLUMN_LABEL_VALUES "Erlaubte Werte" -#define STRING_COLUMN_LABEL_WAITING "Aufgeschoben bis" #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." @@ -106,6 +95,5 @@ #define STRING_TASK_VALID_BEFORE "Warnung: Das '{1}'-Datum ist nach dem '{2}'-Datum." #define STRING_TASK_VALID_BLANK "Leere Aufgaben können nicht angelegt werden." #define STRING_TASK_VALID_REC_DUE "Wiederholende Aufgaben müssen eine Fälligkeit besitzen." -tdefine STRING_COLUMN_LABEL_START "Beginn" #endif diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h index dd2bec023..4f3e7edb0 100644 --- a/src/l10n/eng-USA.h +++ b/src/l10n/eng-USA.h @@ -27,18 +27,11 @@ #ifndef INCLUDED_STRINGS #define INCLUDED_STRINGS -#define STRING_COLUMN_LABEL_ENTERED "Entered" #define STRING_COLUMN_LABEL_LABEL "Label" #define STRING_COLUMN_LABEL_MOD "Modified" -#define STRING_COLUMN_LABEL_NAME "Name" #define STRING_COLUMN_LABEL_ORPHAN "Orphan UDA" -#define STRING_COLUMN_LABEL_PROJECT "Project" #define STRING_COLUMN_LABEL_RECUR "Recur" -#define STRING_COLUMN_LABEL_RECUR_L "Recurrence" -#define STRING_COLUMN_LABEL_RTYPE "Recurrence type" -#define STRING_COLUMN_LABEL_START "Start" #define STRING_COLUMN_LABEL_STAT "St" -#define STRING_COLUMN_LABEL_STATUS "Status" #define STRING_COLUMN_LABEL_STAT_C "C" #define STRING_COLUMN_LABEL_STAT_CO "Completed" #define STRING_COLUMN_LABEL_STAT_D "D" @@ -50,15 +43,10 @@ #define STRING_COLUMN_LABEL_STAT_W "W" #define STRING_COLUMN_LABEL_STAT_WA "Waiting" #define STRING_COLUMN_LABEL_TAG "Tag" -#define STRING_COLUMN_LABEL_TAGS "Tags" #define STRING_COLUMN_LABEL_UDA "Name" #define STRING_COLUMN_LABEL_UDACOUNT "Usage Count" #define STRING_COLUMN_LABEL_UNTIL "Until" -#define STRING_COLUMN_LABEL_URGENCY "Urgency" -#define STRING_COLUMN_LABEL_UUID "UUID" -#define STRING_COLUMN_LABEL_VALUE "Value" #define STRING_COLUMN_LABEL_VALUES "Allowed Values" -#define STRING_COLUMN_LABEL_WAITING "Waiting until" #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}'." diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h index 03436304e..a70f231c5 100644 --- a/src/l10n/epo-RUS.h +++ b/src/l10n/epo-RUS.h @@ -27,18 +27,11 @@ #ifndef INCLUDED_STRINGS #define INCLUDED_STRINGS -#define STRING_COLUMN_LABEL_ENTERED "Entered" #define STRING_COLUMN_LABEL_LABEL "Label" #define STRING_COLUMN_LABEL_MOD "Modified" -#define STRING_COLUMN_LABEL_NAME "Name" #define STRING_COLUMN_LABEL_ORPHAN "Orphan UDA" -#define STRING_COLUMN_LABEL_PROJECT "Project" #define STRING_COLUMN_LABEL_RECUR "Recur" -#define STRING_COLUMN_LABEL_RECUR_L "Recurrence" -#define STRING_COLUMN_LABEL_RTYPE "Recurrence type" -#define STRING_COLUMN_LABEL_START "Eko" #define STRING_COLUMN_LABEL_STAT "St" -#define STRING_COLUMN_LABEL_STATUS "Stato" #define STRING_COLUMN_LABEL_STAT_C "Fn" #define STRING_COLUMN_LABEL_STAT_CO "Finita" #define STRING_COLUMN_LABEL_STAT_D "Vŝ" @@ -50,15 +43,10 @@ #define STRING_COLUMN_LABEL_STAT_W "At" #define STRING_COLUMN_LABEL_STAT_WA "Atendanta" #define STRING_COLUMN_LABEL_TAG "Etik" -#define STRING_COLUMN_LABEL_TAGS "Etikedoj" #define STRING_COLUMN_LABEL_UDA "Nomo" #define STRING_COLUMN_LABEL_UDACOUNT "Nombro de uzoj" #define STRING_COLUMN_LABEL_UNTIL "Ĝis" -#define STRING_COLUMN_LABEL_URGENCY "Urĝeco" -#define STRING_COLUMN_LABEL_UUID "UUID" -#define STRING_COLUMN_LABEL_VALUE "Valoro" #define STRING_COLUMN_LABEL_VALUES "Valoroj permesataj" -#define STRING_COLUMN_LABEL_WAITING "Atendu ĝis" #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}'." diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h index fff820861..56551e568 100644 --- a/src/l10n/esp-ESP.h +++ b/src/l10n/esp-ESP.h @@ -27,18 +27,11 @@ #ifndef INCLUDED_STRINGS #define INCLUDED_STRINGS -#define STRING_COLUMN_LABEL_ENTERED "Entrada" #define STRING_COLUMN_LABEL_LABEL "Etiqueta" #define STRING_COLUMN_LABEL_MOD "Modificada" -#define STRING_COLUMN_LABEL_NAME "Nombre" #define STRING_COLUMN_LABEL_ORPHAN "UDA huérfano" -#define STRING_COLUMN_LABEL_PROJECT "Proyecto" #define STRING_COLUMN_LABEL_RECUR "Recur" // |esp-ESP|==|eng-USA| -#define STRING_COLUMN_LABEL_RECUR_L "Recurrencia" -#define STRING_COLUMN_LABEL_RTYPE "Recurrence type" -#define STRING_COLUMN_LABEL_START "Comienzo" #define STRING_COLUMN_LABEL_STAT "Est" -#define STRING_COLUMN_LABEL_STATUS "Estatus" #define STRING_COLUMN_LABEL_STAT_C "C" // |esp-ESP|==|eng-USA| #define STRING_COLUMN_LABEL_STAT_CO "Completadas" #define STRING_COLUMN_LABEL_STAT_D "S" @@ -50,15 +43,10 @@ #define STRING_COLUMN_LABEL_STAT_W "E" #define STRING_COLUMN_LABEL_STAT_WA "Esperando" #define STRING_COLUMN_LABEL_TAG "Marca" -#define STRING_COLUMN_LABEL_TAGS "Marcas" #define STRING_COLUMN_LABEL_UDA "Nombre" #define STRING_COLUMN_LABEL_UDACOUNT "Recuento de uso" #define STRING_COLUMN_LABEL_UNTIL "Hasta" -#define STRING_COLUMN_LABEL_URGENCY "Urgencia" -#define STRING_COLUMN_LABEL_UUID "UUID" // |esp-ESP|==|eng-USA| -#define STRING_COLUMN_LABEL_VALUE "Valor" #define STRING_COLUMN_LABEL_VALUES "Valores permitidos" -#define STRING_COLUMN_LABEL_WAITING "Esperando hasta" #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}'." diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h index ee1caaa13..cb4c11649 100644 --- a/src/l10n/fra-FRA.h +++ b/src/l10n/fra-FRA.h @@ -27,18 +27,11 @@ #ifndef INCLUDED_STRINGS #define INCLUDED_STRINGS -#define STRING_COLUMN_LABEL_ENTERED "Entrée" #define STRING_COLUMN_LABEL_LABEL "Étiq" #define STRING_COLUMN_LABEL_MOD "Modifiée" -#define STRING_COLUMN_LABEL_NAME "Nom" #define STRING_COLUMN_LABEL_ORPHAN "ADU orphelins" -#define STRING_COLUMN_LABEL_PROJECT "Projet" #define STRING_COLUMN_LABEL_RECUR "Récur" -#define STRING_COLUMN_LABEL_RECUR_L "Récurrence" -#define STRING_COLUMN_LABEL_RTYPE "Recurrence type" -#define STRING_COLUMN_LABEL_START "Début" #define STRING_COLUMN_LABEL_STAT "St" -#define STRING_COLUMN_LABEL_STATUS "Statut" #define STRING_COLUMN_LABEL_STAT_C "C" #define STRING_COLUMN_LABEL_STAT_CO "Complétée" #define STRING_COLUMN_LABEL_STAT_D "S" @@ -50,15 +43,10 @@ #define STRING_COLUMN_LABEL_STAT_W "A" #define STRING_COLUMN_LABEL_STAT_WA "En attente" #define STRING_COLUMN_LABEL_TAG "Étiq" -#define STRING_COLUMN_LABEL_TAGS "Étiquettes" #define STRING_COLUMN_LABEL_UDA "Nom" #define STRING_COLUMN_LABEL_UDACOUNT "Compte d’utilisation" #define STRING_COLUMN_LABEL_UNTIL "Until" -#define STRING_COLUMN_LABEL_URGENCY "Urgence" -#define STRING_COLUMN_LABEL_UUID "UUID" -#define STRING_COLUMN_LABEL_VALUE "Valeur" #define STRING_COLUMN_LABEL_VALUES "Valeurs autorisées" -#define STRING_COLUMN_LABEL_WAITING "En attente jusqu’au" #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}'." diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h index d7256b44d..76320db73 100644 --- a/src/l10n/ita-ITA.h +++ b/src/l10n/ita-ITA.h @@ -27,18 +27,11 @@ #ifndef INCLUDED_STRINGS #define INCLUDED_STRINGS -#define STRING_COLUMN_LABEL_ENTERED "Inserito" #define STRING_COLUMN_LABEL_LABEL "Etichetta" #define STRING_COLUMN_LABEL_MOD "Modificato" -#define STRING_COLUMN_LABEL_NAME "Nome" #define STRING_COLUMN_LABEL_ORPHAN "UDA Orfano" -#define STRING_COLUMN_LABEL_PROJECT "Progetto" #define STRING_COLUMN_LABEL_RECUR "Period" -#define STRING_COLUMN_LABEL_RECUR_L "Periodico" -#define STRING_COLUMN_LABEL_RTYPE "Recurrence type" -#define STRING_COLUMN_LABEL_START "Inizio" #define STRING_COLUMN_LABEL_STAT "St" -#define STRING_COLUMN_LABEL_STATUS "Stato" #define STRING_COLUMN_LABEL_STAT_C "C" #define STRING_COLUMN_LABEL_STAT_CO "Completati" #define STRING_COLUMN_LABEL_STAT_D "D" @@ -50,15 +43,10 @@ #define STRING_COLUMN_LABEL_STAT_W "W" #define STRING_COLUMN_LABEL_STAT_WA "In attesa" #define STRING_COLUMN_LABEL_TAG "Tag" -#define STRING_COLUMN_LABEL_TAGS "Tags" #define STRING_COLUMN_LABEL_UDA "Nome" #define STRING_COLUMN_LABEL_UDACOUNT "Conteggio Uso" #define STRING_COLUMN_LABEL_UNTIL "Fino a" -#define STRING_COLUMN_LABEL_URGENCY "Urgenza" -#define STRING_COLUMN_LABEL_UUID "UUID" -#define STRING_COLUMN_LABEL_VALUE "Valore" #define STRING_COLUMN_LABEL_VALUES "Valori consentiti" -#define STRING_COLUMN_LABEL_WAITING "Attesa fino" #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}'." diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h index 637df0ac1..bb9f28054 100644 --- a/src/l10n/jpn-JPN.h +++ b/src/l10n/jpn-JPN.h @@ -27,18 +27,11 @@ #ifndef INCLUDED_STRINGS #define INCLUDED_STRINGS -#define STRING_COLUMN_LABEL_ENTERED "Entered" #define STRING_COLUMN_LABEL_LABEL "Label" #define STRING_COLUMN_LABEL_MOD "Modified" -#define STRING_COLUMN_LABEL_NAME "Name" #define STRING_COLUMN_LABEL_ORPHAN "Orphan UDA" -#define STRING_COLUMN_LABEL_PROJECT "Project" #define STRING_COLUMN_LABEL_RECUR "Recur" -#define STRING_COLUMN_LABEL_RECUR_L "Recurrence" -#define STRING_COLUMN_LABEL_RTYPE "Recurrence type" -#define STRING_COLUMN_LABEL_START "Start" #define STRING_COLUMN_LABEL_STAT "St" -#define STRING_COLUMN_LABEL_STATUS "Status" #define STRING_COLUMN_LABEL_STAT_C "C" #define STRING_COLUMN_LABEL_STAT_CO "Completed" #define STRING_COLUMN_LABEL_STAT_D "D" @@ -50,15 +43,10 @@ #define STRING_COLUMN_LABEL_STAT_W "W" #define STRING_COLUMN_LABEL_STAT_WA "Waiting" #define STRING_COLUMN_LABEL_TAG "Tag" -#define STRING_COLUMN_LABEL_TAGS "Tags" #define STRING_COLUMN_LABEL_UDA "Name" #define STRING_COLUMN_LABEL_UDACOUNT "Usage Count" #define STRING_COLUMN_LABEL_UNTIL "Until" -#define STRING_COLUMN_LABEL_URGENCY "Urgency" -#define STRING_COLUMN_LABEL_UUID "UUID" -#define STRING_COLUMN_LABEL_VALUE "Value" #define STRING_COLUMN_LABEL_VALUES "Allowed Values" -#define STRING_COLUMN_LABEL_WAITING "Waiting until" #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}'." diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h index 1a35015e4..76a4eb615 100644 --- a/src/l10n/pol-POL.h +++ b/src/l10n/pol-POL.h @@ -27,18 +27,11 @@ #ifndef INCLUDED_STRINGS #define INCLUDED_STRINGS -#define STRING_COLUMN_LABEL_ENTERED "Dodane" #define STRING_COLUMN_LABEL_LABEL "Etykieta" #define STRING_COLUMN_LABEL_MOD "Zmienione" -#define STRING_COLUMN_LABEL_NAME "Nazwa" #define STRING_COLUMN_LABEL_ORPHAN "Osierocone UDA" -#define STRING_COLUMN_LABEL_PROJECT "Projekt" #define STRING_COLUMN_LABEL_RECUR "Period" -#define STRING_COLUMN_LABEL_RECUR_L "Periodyczny" -#define STRING_COLUMN_LABEL_RTYPE "Recurrence type" -#define STRING_COLUMN_LABEL_START "Start" #define STRING_COLUMN_LABEL_STAT "St" -#define STRING_COLUMN_LABEL_STATUS "Status" #define STRING_COLUMN_LABEL_STAT_C "C" #define STRING_COLUMN_LABEL_STAT_CO "Ukończone" #define STRING_COLUMN_LABEL_STAT_D "D" @@ -50,15 +43,10 @@ #define STRING_COLUMN_LABEL_STAT_W "W" #define STRING_COLUMN_LABEL_STAT_WA "Zawieszone" #define STRING_COLUMN_LABEL_TAG "Tag" -#define STRING_COLUMN_LABEL_TAGS "Tagi" #define STRING_COLUMN_LABEL_UDA "Nazwa" #define STRING_COLUMN_LABEL_UDACOUNT "Licznik Użycia" #define STRING_COLUMN_LABEL_UNTIL "Do" -#define STRING_COLUMN_LABEL_URGENCY "Pilność" -#define STRING_COLUMN_LABEL_UUID "UUID" -#define STRING_COLUMN_LABEL_VALUE "Wartość" #define STRING_COLUMN_LABEL_VALUES "Dozwolone Wartości" -#define STRING_COLUMN_LABEL_WAITING "Czeka dopóki" #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}'." diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h index 0e24a25b5..eb50c6605 100644 --- a/src/l10n/por-PRT.h +++ b/src/l10n/por-PRT.h @@ -27,18 +27,11 @@ #ifndef INCLUDED_STRINGS #define INCLUDED_STRINGS -#define STRING_COLUMN_LABEL_ENTERED "Criada" #define STRING_COLUMN_LABEL_LABEL "Rótulo" #define STRING_COLUMN_LABEL_MOD "Modificada" -#define STRING_COLUMN_LABEL_NAME "Nome" #define STRING_COLUMN_LABEL_ORPHAN "UDA Orfão" -#define STRING_COLUMN_LABEL_PROJECT "Projeto" #define STRING_COLUMN_LABEL_RECUR "Period" -#define STRING_COLUMN_LABEL_RECUR_L "Periodicidade" -#define STRING_COLUMN_LABEL_RTYPE "Recurrence type" -#define STRING_COLUMN_LABEL_START "Início" #define STRING_COLUMN_LABEL_STAT "Es" -#define STRING_COLUMN_LABEL_STATUS "Estado" #define STRING_COLUMN_LABEL_STAT_C "C" // |por-PRT|==|eng-USA| #define STRING_COLUMN_LABEL_STAT_CO "Concluídas" #define STRING_COLUMN_LABEL_STAT_D "E" @@ -50,15 +43,10 @@ #define STRING_COLUMN_LABEL_STAT_W "A" #define STRING_COLUMN_LABEL_STAT_WA "Adiadas" #define STRING_COLUMN_LABEL_TAG "Marca" -#define STRING_COLUMN_LABEL_TAGS "Marcas" #define STRING_COLUMN_LABEL_UDA "Nome" #define STRING_COLUMN_LABEL_UDACOUNT "Contagem de Uso" #define STRING_COLUMN_LABEL_UNTIL "Até" -#define STRING_COLUMN_LABEL_URGENCY "Urgência" -#define STRING_COLUMN_LABEL_UUID "UUID" // |por-PRT|==|eng-USA| -#define STRING_COLUMN_LABEL_VALUE "Valor" #define STRING_COLUMN_LABEL_VALUES "Valores Permitidos" -#define STRING_COLUMN_LABEL_WAITING "Adiada até" #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}'."