From 87ec85c1fe20fa709e8275cf545f88849f274838 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sun, 21 Jan 2018 19:43:05 -0500 Subject: [PATCH] l10n: Eliminated some column labels --- src/commands/CmdColumns.cpp | 17 +++++++---------- src/commands/CmdUDAs.cpp | 2 +- src/l10n/deu-DEU.h | 6 ------ src/l10n/eng-USA.h | 6 ------ src/l10n/epo-RUS.h | 6 ------ src/l10n/esp-ESP.h | 6 ------ src/l10n/fra-FRA.h | 6 ------ src/l10n/ita-ITA.h | 6 ------ src/l10n/jpn-JPN.h | 6 ------ src/l10n/pol-POL.h | 6 ------ src/l10n/por-PRT.h | 6 ------ 11 files changed, 8 insertions(+), 65 deletions(-) diff --git a/src/commands/CmdColumns.cpp b/src/commands/CmdColumns.cpp index 6cbf4935b..1d7b0c076 100644 --- a/src/commands/CmdColumns.cpp +++ b/src/commands/CmdColumns.cpp @@ -32,11 +32,8 @@ #include #include #include -#include #include -#define STRING_CMD_COLUMNS_USAGE "All supported columns and formatting styles" - extern Context context; //////////////////////////////////////////////////////////////////////////////// @@ -44,7 +41,7 @@ CmdColumns::CmdColumns () { _keyword = "columns"; _usage = "task columns [substring]"; - _description = STRING_CMD_COLUMNS_USAGE; + _description = "All supported columns and formatting styles"; _read_only = true; _displays_id = false; _needs_gc = false; @@ -74,11 +71,11 @@ int CmdColumns::execute (std::string& output) // Render a list of column names, formats and examples. Table formats; formats.width (context.getWidth ()); - formats.add (STRING_COLUMN_LABEL_COLUMN); - formats.add (STRING_COLUMN_LABEL_TYPE); - formats.add (STRING_COLUMN_LABEL_MODIFY); - formats.add (STRING_COLUMN_LABEL_STYLES); - formats.add (STRING_COLUMN_LABEL_EXAMPLES); + formats.add ("Columns"); + formats.add ("Type"); + formats.add ("Modifiable"); + formats.add ("Supported Formats"); + formats.add ("Example"); setHeaderUnderline (formats); for (const auto& name : names) @@ -94,7 +91,7 @@ int CmdColumns::execute (std::string& output) auto row = formats.addRow (); formats.set (row, 0, i == 0 ? name : ""); formats.set (row, 1, i == 0 ? context.columns[name]->type () : ""); - formats.set (row, 2, i == 0 ? (context.columns[name]->modifiable () ? STRING_COLUMN_LABEL_MODIFY : STRING_COLUMN_LABEL_NOMODIFY) : ""); + formats.set (row, 2, i == 0 ? (context.columns[name]->modifiable () ? "Modifiable" : "Read Only") : ""); formats.set (row, 3, styles[i] + (i == 0 ? "*" : "")); formats.set (row, 4, i < examples.size () ? examples[i] : ""); } diff --git a/src/commands/CmdUDAs.cpp b/src/commands/CmdUDAs.cpp index 2b2fb70f1..8e870217c 100644 --- a/src/commands/CmdUDAs.cpp +++ b/src/commands/CmdUDAs.cpp @@ -87,7 +87,7 @@ int CmdUDAs::execute (std::string& output) Table table; table.width (context.getWidth ()); table.add (STRING_COLUMN_LABEL_UDA); - table.add (STRING_COLUMN_LABEL_TYPE); + table.add ("Type"); table.add (STRING_COLUMN_LABEL_LABEL); table.add (STRING_COLUMN_LABEL_VALUES); table.add (STRING_COLUMN_LABEL_DEFAULT); diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h index e0adc876c..1f41d8824 100644 --- a/src/l10n/deu-DEU.h +++ b/src/l10n/deu-DEU.h @@ -27,7 +27,6 @@ #ifndef INCLUDED_STRINGS #define INCLUDED_STRINGS -#define STRING_COLUMN_LABEL_COLUMN "Spalten" #define STRING_COLUMN_LABEL_COMPLETE "Erledigt" #define STRING_COLUMN_LABEL_COUNT "Anzahl" #define STRING_COLUMN_LABEL_DATE "Datum" @@ -35,13 +34,10 @@ #define STRING_COLUMN_LABEL_DUE "Fällig" #define STRING_COLUMN_LABEL_END "Ende" #define STRING_COLUMN_LABEL_ENTERED "Erfasst" -#define STRING_COLUMN_LABEL_EXAMPLES "Beispiele" #define STRING_COLUMN_LABEL_LABEL "Beschreibung" #define STRING_COLUMN_LABEL_LAST "Last instance" #define STRING_COLUMN_LABEL_MOD "Geändert" -#define STRING_COLUMN_LABEL_MODIFY "Modifiable" #define STRING_COLUMN_LABEL_NAME "Name" -#define STRING_COLUMN_LABEL_NOMODIFY "Read Only" #define STRING_COLUMN_LABEL_ORPHAN "Verwaiste UDA" #define STRING_COLUMN_LABEL_PROJECT "Projekt" #define STRING_COLUMN_LABEL_RECUR "Wiederh." @@ -60,10 +56,8 @@ #define STRING_COLUMN_LABEL_STAT_RE "Wiederholend" #define STRING_COLUMN_LABEL_STAT_W "A" #define STRING_COLUMN_LABEL_STAT_WA "Wartet" -#define STRING_COLUMN_LABEL_STYLES "Unterstützte Formate" #define STRING_COLUMN_LABEL_TAG "Schlagwort" #define STRING_COLUMN_LABEL_TAGS "Schlagworte" -#define STRING_COLUMN_LABEL_TYPE "Typ" #define STRING_COLUMN_LABEL_UDA "Name" #define STRING_COLUMN_LABEL_UDACOUNT "Nutzungshäufigkeit" #define STRING_COLUMN_LABEL_UNTIL "Bis" diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h index 435acb574..9528a089f 100644 --- a/src/l10n/eng-USA.h +++ b/src/l10n/eng-USA.h @@ -27,7 +27,6 @@ #ifndef INCLUDED_STRINGS #define INCLUDED_STRINGS -#define STRING_COLUMN_LABEL_COLUMN "Columns" #define STRING_COLUMN_LABEL_COMPLETE "Completed" #define STRING_COLUMN_LABEL_COUNT "Count" #define STRING_COLUMN_LABEL_DATE "Date" @@ -35,13 +34,10 @@ #define STRING_COLUMN_LABEL_DUE "Due" #define STRING_COLUMN_LABEL_END "End" #define STRING_COLUMN_LABEL_ENTERED "Entered" -#define STRING_COLUMN_LABEL_EXAMPLES "Example" #define STRING_COLUMN_LABEL_LABEL "Label" #define STRING_COLUMN_LABEL_LAST "Last instance" #define STRING_COLUMN_LABEL_MOD "Modified" -#define STRING_COLUMN_LABEL_MODIFY "Modifiable" #define STRING_COLUMN_LABEL_NAME "Name" -#define STRING_COLUMN_LABEL_NOMODIFY "Read Only" #define STRING_COLUMN_LABEL_ORPHAN "Orphan UDA" #define STRING_COLUMN_LABEL_PROJECT "Project" #define STRING_COLUMN_LABEL_RECUR "Recur" @@ -61,10 +57,8 @@ #define STRING_COLUMN_LABEL_STAT_RE "Recurring" #define STRING_COLUMN_LABEL_STAT_W "W" #define STRING_COLUMN_LABEL_STAT_WA "Waiting" -#define STRING_COLUMN_LABEL_STYLES "Supported Formats" #define STRING_COLUMN_LABEL_TAG "Tag" #define STRING_COLUMN_LABEL_TAGS "Tags" -#define STRING_COLUMN_LABEL_TYPE "Type" #define STRING_COLUMN_LABEL_UDA "Name" #define STRING_COLUMN_LABEL_UDACOUNT "Usage Count" #define STRING_COLUMN_LABEL_UNTIL "Until" diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h index 1b09cd936..a4a20b4b2 100644 --- a/src/l10n/epo-RUS.h +++ b/src/l10n/epo-RUS.h @@ -27,7 +27,6 @@ #ifndef INCLUDED_STRINGS #define INCLUDED_STRINGS -#define STRING_COLUMN_LABEL_COLUMN "Kolumnoj" #define STRING_COLUMN_LABEL_COMPLETE "Finita" #define STRING_COLUMN_LABEL_COUNT "Nombro" #define STRING_COLUMN_LABEL_DATE "Dato" @@ -35,13 +34,10 @@ #define STRING_COLUMN_LABEL_DUE "Datlimo" #define STRING_COLUMN_LABEL_END "Fino" #define STRING_COLUMN_LABEL_ENTERED "Kreita" -#define STRING_COLUMN_LABEL_EXAMPLES "Ekzemplo" #define STRING_COLUMN_LABEL_LABEL "Rubriko" #define STRING_COLUMN_LABEL_LAST "Last instance" #define STRING_COLUMN_LABEL_MOD "Modifo" -#define STRING_COLUMN_LABEL_MODIFY "Modifiable" #define STRING_COLUMN_LABEL_NAME "Nomo" -#define STRING_COLUMN_LABEL_NOMODIFY "Read Only" #define STRING_COLUMN_LABEL_ORPHAN "Orfa UDA" #define STRING_COLUMN_LABEL_PROJECT "Projekto" #define STRING_COLUMN_LABEL_RECUR "Reokazas" @@ -61,10 +57,8 @@ #define STRING_COLUMN_LABEL_STAT_RE "Reokazanta" #define STRING_COLUMN_LABEL_STAT_W "At" #define STRING_COLUMN_LABEL_STAT_WA "Atendanta" -#define STRING_COLUMN_LABEL_STYLES "Formaĝoj Subtenataj" #define STRING_COLUMN_LABEL_TAG "Etik" #define STRING_COLUMN_LABEL_TAGS "Etikedoj" -#define STRING_COLUMN_LABEL_TYPE "Tipo" #define STRING_COLUMN_LABEL_UDA "Nomo" #define STRING_COLUMN_LABEL_UDACOUNT "Nombro de uzoj" #define STRING_COLUMN_LABEL_UNTIL "Ĝis" diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h index 188c7e44a..bcc9d79a1 100644 --- a/src/l10n/esp-ESP.h +++ b/src/l10n/esp-ESP.h @@ -27,7 +27,6 @@ #ifndef INCLUDED_STRINGS #define INCLUDED_STRINGS -#define STRING_COLUMN_LABEL_COLUMN "Columnas" #define STRING_COLUMN_LABEL_COMPLETE "Completada" #define STRING_COLUMN_LABEL_COUNT "Recuento" #define STRING_COLUMN_LABEL_DATE "Fecha" @@ -35,13 +34,10 @@ #define STRING_COLUMN_LABEL_DUE "Vencimiento" #define STRING_COLUMN_LABEL_END "Fin" #define STRING_COLUMN_LABEL_ENTERED "Entrada" -#define STRING_COLUMN_LABEL_EXAMPLES "Ejemplo" #define STRING_COLUMN_LABEL_LABEL "Etiqueta" #define STRING_COLUMN_LABEL_LAST "Last instance" #define STRING_COLUMN_LABEL_MOD "Modificada" -#define STRING_COLUMN_LABEL_MODIFY "Modificable" #define STRING_COLUMN_LABEL_NAME "Nombre" -#define STRING_COLUMN_LABEL_NOMODIFY "Solo lectura" #define STRING_COLUMN_LABEL_ORPHAN "UDA huérfano" #define STRING_COLUMN_LABEL_PROJECT "Proyecto" #define STRING_COLUMN_LABEL_RECUR "Recur" // |esp-ESP|==|eng-USA| @@ -61,10 +57,8 @@ #define STRING_COLUMN_LABEL_STAT_RE "Recurrentes" #define STRING_COLUMN_LABEL_STAT_W "E" #define STRING_COLUMN_LABEL_STAT_WA "Esperando" -#define STRING_COLUMN_LABEL_STYLES "Formatos soportados" #define STRING_COLUMN_LABEL_TAG "Marca" #define STRING_COLUMN_LABEL_TAGS "Marcas" -#define STRING_COLUMN_LABEL_TYPE "Tipo" #define STRING_COLUMN_LABEL_UDA "Nombre" #define STRING_COLUMN_LABEL_UDACOUNT "Recuento de uso" #define STRING_COLUMN_LABEL_UNTIL "Hasta" diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h index 3cb87bdf9..292c4fea5 100644 --- a/src/l10n/fra-FRA.h +++ b/src/l10n/fra-FRA.h @@ -27,7 +27,6 @@ #ifndef INCLUDED_STRINGS #define INCLUDED_STRINGS -#define STRING_COLUMN_LABEL_COLUMN "Colonnes" #define STRING_COLUMN_LABEL_COMPLETE "Complétée" #define STRING_COLUMN_LABEL_COUNT "Temps restant" #define STRING_COLUMN_LABEL_DATE "Date" @@ -35,13 +34,10 @@ #define STRING_COLUMN_LABEL_DUE "Échéance" #define STRING_COLUMN_LABEL_END "Fin" #define STRING_COLUMN_LABEL_ENTERED "Entrée" -#define STRING_COLUMN_LABEL_EXAMPLES "Exemple" #define STRING_COLUMN_LABEL_LABEL "Étiq" #define STRING_COLUMN_LABEL_LAST "Last instance" #define STRING_COLUMN_LABEL_MOD "Modifiée" -#define STRING_COLUMN_LABEL_MODIFY "Modifiable" #define STRING_COLUMN_LABEL_NAME "Nom" -#define STRING_COLUMN_LABEL_NOMODIFY "Read Only" #define STRING_COLUMN_LABEL_ORPHAN "ADU orphelins" #define STRING_COLUMN_LABEL_PROJECT "Projet" #define STRING_COLUMN_LABEL_RECUR "Récur" @@ -61,10 +57,8 @@ #define STRING_COLUMN_LABEL_STAT_RE "Récurrente" #define STRING_COLUMN_LABEL_STAT_W "A" #define STRING_COLUMN_LABEL_STAT_WA "En attente" -#define STRING_COLUMN_LABEL_STYLES "Formats supportés" #define STRING_COLUMN_LABEL_TAG "Étiq" #define STRING_COLUMN_LABEL_TAGS "Étiquettes" -#define STRING_COLUMN_LABEL_TYPE "Type" #define STRING_COLUMN_LABEL_UDA "Nom" #define STRING_COLUMN_LABEL_UDACOUNT "Compte d’utilisation" #define STRING_COLUMN_LABEL_UNTIL "Until" diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h index dcac43512..725b52ccc 100644 --- a/src/l10n/ita-ITA.h +++ b/src/l10n/ita-ITA.h @@ -27,7 +27,6 @@ #ifndef INCLUDED_STRINGS #define INCLUDED_STRINGS -#define STRING_COLUMN_LABEL_COLUMN "Colonna" #define STRING_COLUMN_LABEL_COMPLETE "Completato" #define STRING_COLUMN_LABEL_COUNT "Conteggio" #define STRING_COLUMN_LABEL_DATE "Data" @@ -35,13 +34,10 @@ #define STRING_COLUMN_LABEL_DUE "Scadenza" #define STRING_COLUMN_LABEL_END "Fine" #define STRING_COLUMN_LABEL_ENTERED "Inserito" -#define STRING_COLUMN_LABEL_EXAMPLES "Esempio" #define STRING_COLUMN_LABEL_LABEL "Etichetta" #define STRING_COLUMN_LABEL_LAST "Last instance" #define STRING_COLUMN_LABEL_MOD "Modificato" -#define STRING_COLUMN_LABEL_MODIFY "Modifiable" #define STRING_COLUMN_LABEL_NAME "Nome" -#define STRING_COLUMN_LABEL_NOMODIFY "Read Only" #define STRING_COLUMN_LABEL_ORPHAN "UDA Orfano" #define STRING_COLUMN_LABEL_PROJECT "Progetto" #define STRING_COLUMN_LABEL_RECUR "Period" @@ -61,10 +57,8 @@ #define STRING_COLUMN_LABEL_STAT_RE "Periodicamente" #define STRING_COLUMN_LABEL_STAT_W "W" #define STRING_COLUMN_LABEL_STAT_WA "In attesa" -#define STRING_COLUMN_LABEL_STYLES "Formati Supportati" #define STRING_COLUMN_LABEL_TAG "Tag" #define STRING_COLUMN_LABEL_TAGS "Tags" -#define STRING_COLUMN_LABEL_TYPE "Tipo" #define STRING_COLUMN_LABEL_UDA "Nome" #define STRING_COLUMN_LABEL_UDACOUNT "Conteggio Uso" #define STRING_COLUMN_LABEL_UNTIL "Fino a" diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h index b7c9ce11a..f149e1478 100644 --- a/src/l10n/jpn-JPN.h +++ b/src/l10n/jpn-JPN.h @@ -27,7 +27,6 @@ #ifndef INCLUDED_STRINGS #define INCLUDED_STRINGS -#define STRING_COLUMN_LABEL_COLUMN "Columns" #define STRING_COLUMN_LABEL_COMPLETE "Completed" #define STRING_COLUMN_LABEL_COUNT "Count" #define STRING_COLUMN_LABEL_DATE "Date" @@ -35,13 +34,10 @@ #define STRING_COLUMN_LABEL_DUE "Due" #define STRING_COLUMN_LABEL_END "End" #define STRING_COLUMN_LABEL_ENTERED "Entered" -#define STRING_COLUMN_LABEL_EXAMPLES "Example" #define STRING_COLUMN_LABEL_LABEL "Label" #define STRING_COLUMN_LABEL_LAST "Last instance" #define STRING_COLUMN_LABEL_MOD "Modified" -#define STRING_COLUMN_LABEL_MODIFY "Modifiable" #define STRING_COLUMN_LABEL_NAME "Name" -#define STRING_COLUMN_LABEL_NOMODIFY "Read Only" #define STRING_COLUMN_LABEL_ORPHAN "Orphan UDA" #define STRING_COLUMN_LABEL_PROJECT "Project" #define STRING_COLUMN_LABEL_RECUR "Recur" @@ -61,10 +57,8 @@ #define STRING_COLUMN_LABEL_STAT_RE "Recurring" #define STRING_COLUMN_LABEL_STAT_W "W" #define STRING_COLUMN_LABEL_STAT_WA "Waiting" -#define STRING_COLUMN_LABEL_STYLES "Supported Formats" #define STRING_COLUMN_LABEL_TAG "Tag" #define STRING_COLUMN_LABEL_TAGS "Tags" -#define STRING_COLUMN_LABEL_TYPE "Type" #define STRING_COLUMN_LABEL_UDA "Name" #define STRING_COLUMN_LABEL_UDACOUNT "Usage Count" #define STRING_COLUMN_LABEL_UNTIL "Until" diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h index 7fc2bbd75..edbaa1381 100644 --- a/src/l10n/pol-POL.h +++ b/src/l10n/pol-POL.h @@ -27,7 +27,6 @@ #ifndef INCLUDED_STRINGS #define INCLUDED_STRINGS -#define STRING_COLUMN_LABEL_COLUMN "Kolumny" #define STRING_COLUMN_LABEL_COMPLETE "Ukończone" #define STRING_COLUMN_LABEL_COUNT "Ile" #define STRING_COLUMN_LABEL_DATE "Data" @@ -35,13 +34,10 @@ #define STRING_COLUMN_LABEL_DUE "Do" #define STRING_COLUMN_LABEL_END "Koniec" #define STRING_COLUMN_LABEL_ENTERED "Dodane" -#define STRING_COLUMN_LABEL_EXAMPLES "Przykłady" #define STRING_COLUMN_LABEL_LABEL "Etykieta" #define STRING_COLUMN_LABEL_LAST "Last instance" #define STRING_COLUMN_LABEL_MOD "Zmienione" -#define STRING_COLUMN_LABEL_MODIFY "Modifiable" #define STRING_COLUMN_LABEL_NAME "Nazwa" -#define STRING_COLUMN_LABEL_NOMODIFY "Read Only" #define STRING_COLUMN_LABEL_ORPHAN "Osierocone UDA" #define STRING_COLUMN_LABEL_PROJECT "Projekt" #define STRING_COLUMN_LABEL_RECUR "Period" @@ -61,10 +57,8 @@ #define STRING_COLUMN_LABEL_STAT_RE "Zależne" #define STRING_COLUMN_LABEL_STAT_W "W" #define STRING_COLUMN_LABEL_STAT_WA "Zawieszone" -#define STRING_COLUMN_LABEL_STYLES "Formaty" #define STRING_COLUMN_LABEL_TAG "Tag" #define STRING_COLUMN_LABEL_TAGS "Tagi" -#define STRING_COLUMN_LABEL_TYPE "Typ" #define STRING_COLUMN_LABEL_UDA "Nazwa" #define STRING_COLUMN_LABEL_UDACOUNT "Licznik Użycia" #define STRING_COLUMN_LABEL_UNTIL "Do" diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h index 53a4bda72..d266d704e 100644 --- a/src/l10n/por-PRT.h +++ b/src/l10n/por-PRT.h @@ -27,7 +27,6 @@ #ifndef INCLUDED_STRINGS #define INCLUDED_STRINGS -#define STRING_COLUMN_LABEL_COLUMN "Colunas" #define STRING_COLUMN_LABEL_COMPLETE "Concluída" #define STRING_COLUMN_LABEL_COUNT "Contagem" #define STRING_COLUMN_LABEL_DATE "Data" @@ -35,13 +34,10 @@ #define STRING_COLUMN_LABEL_DUE "Vence" #define STRING_COLUMN_LABEL_END "Fim" #define STRING_COLUMN_LABEL_ENTERED "Criada" -#define STRING_COLUMN_LABEL_EXAMPLES "Exemplo" #define STRING_COLUMN_LABEL_LABEL "Rótulo" #define STRING_COLUMN_LABEL_LAST "Last instance" #define STRING_COLUMN_LABEL_MOD "Modificada" -#define STRING_COLUMN_LABEL_MODIFY "Modifiable" #define STRING_COLUMN_LABEL_NAME "Nome" -#define STRING_COLUMN_LABEL_NOMODIFY "Read Only" #define STRING_COLUMN_LABEL_ORPHAN "UDA Orfão" #define STRING_COLUMN_LABEL_PROJECT "Projeto" #define STRING_COLUMN_LABEL_RECUR "Period" @@ -61,10 +57,8 @@ #define STRING_COLUMN_LABEL_STAT_RE "Recorrentes" #define STRING_COLUMN_LABEL_STAT_W "A" #define STRING_COLUMN_LABEL_STAT_WA "Adiadas" -#define STRING_COLUMN_LABEL_STYLES "Formatos Suportados" #define STRING_COLUMN_LABEL_TAG "Marca" #define STRING_COLUMN_LABEL_TAGS "Marcas" -#define STRING_COLUMN_LABEL_TYPE "Tipo" #define STRING_COLUMN_LABEL_UDA "Nome" #define STRING_COLUMN_LABEL_UDACOUNT "Contagem de Uso" #define STRING_COLUMN_LABEL_UNTIL "Até"