From 193eebd852e4752611946e7484662f5b5c3bcb12 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sun, 7 Jan 2018 13:37:47 -0500 Subject: [PATCH] l10n removal of STRING_COLUMN_LABEL_MASK, STRING_COLUMN_LABEL_MASK_IDX --- src/columns/ColIMask.cpp | 3 +-- src/columns/ColMask.cpp | 3 +-- src/commands/CmdInfo.cpp | 4 ++-- src/l10n/deu-DEU.h | 2 -- src/l10n/eng-USA.h | 2 -- src/l10n/epo-RUS.h | 2 -- src/l10n/esp-ESP.h | 2 -- src/l10n/fra-FRA.h | 2 -- src/l10n/ita-ITA.h | 2 -- src/l10n/jpn-JPN.h | 2 -- src/l10n/pol-POL.h | 2 -- src/l10n/por-PRT.h | 2 -- 12 files changed, 4 insertions(+), 24 deletions(-) diff --git a/src/columns/ColIMask.cpp b/src/columns/ColIMask.cpp index 4fab12430..20c574547 100644 --- a/src/columns/ColIMask.cpp +++ b/src/columns/ColIMask.cpp @@ -27,14 +27,13 @@ #include #include #include -#include //////////////////////////////////////////////////////////////////////////////// ColumnIMask::ColumnIMask () { _name = "imask"; _style = "number"; - _label = STRING_COLUMN_LABEL_MASK_IDX; + _label = "Mask Index"; _modifiable = false; _styles = {"number"}; _examples = {"12"}; diff --git a/src/columns/ColMask.cpp b/src/columns/ColMask.cpp index 48db2feb5..aa029421b 100644 --- a/src/columns/ColMask.cpp +++ b/src/columns/ColMask.cpp @@ -27,14 +27,13 @@ #include #include #include -#include //////////////////////////////////////////////////////////////////////////////// ColumnMask::ColumnMask () { _name = "mask"; _style = "default"; - _label = STRING_COLUMN_LABEL_MASK; + _label = "Mask"; _modifiable = false; _styles = {"default"}; _examples = {"++++---"}; diff --git a/src/commands/CmdInfo.cpp b/src/commands/CmdInfo.cpp index 67cf59951..0d38fe393 100644 --- a/src/commands/CmdInfo.cpp +++ b/src/commands/CmdInfo.cpp @@ -200,7 +200,7 @@ int CmdInfo::execute (std::string& output) if (task.has ("mask")) { row = view.addRow (); - view.set (row, 0, STRING_COLUMN_LABEL_MASK); + view.set (row, 0, "Mask"); view.set (row, 1, task.get ("mask")); } @@ -209,7 +209,7 @@ int CmdInfo::execute (std::string& output) if (task.has ("imask")) { row = view.addRow (); - view.set (row, 0, STRING_COLUMN_LABEL_MASK_IDX); + view.set (row, 0, "Mask Index"); view.set (row, 1, task.get ("imask")); } diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h index 728f81546..f72fc41d2 100644 --- a/src/l10n/deu-DEU.h +++ b/src/l10n/deu-DEU.h @@ -155,8 +155,6 @@ #define STRING_COLUMN_LABEL_URGENCY "Dringlichkeit" #define STRING_COLUMN_LABEL_NAME "Name" #define STRING_COLUMN_LABEL_VALUE "Wert" -#define STRING_COLUMN_LABEL_MASK "Maske" -#define STRING_COLUMN_LABEL_MASK_IDX "Masken-Index" #define STRING_COLUMN_LABEL_LAST "Last instance" #define STRING_COLUMN_LABEL_RTYPE "Recurrence type" #define STRING_COLUMN_LABEL_PARENT "Vorgänger-Aufgabe" diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h index c2d839a7e..93121f3a6 100644 --- a/src/l10n/eng-USA.h +++ b/src/l10n/eng-USA.h @@ -155,8 +155,6 @@ #define STRING_COLUMN_LABEL_URGENCY "Urgency" #define STRING_COLUMN_LABEL_NAME "Name" #define STRING_COLUMN_LABEL_VALUE "Value" -#define STRING_COLUMN_LABEL_MASK "Mask" -#define STRING_COLUMN_LABEL_MASK_IDX "Mask Index" #define STRING_COLUMN_LABEL_LAST "Last instance" #define STRING_COLUMN_LABEL_RTYPE "Recurrence type" #define STRING_COLUMN_LABEL_PARENT "Parent task" diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h index 5c4565ee3..7400160c7 100644 --- a/src/l10n/epo-RUS.h +++ b/src/l10n/epo-RUS.h @@ -155,8 +155,6 @@ #define STRING_COLUMN_LABEL_URGENCY "Urĝeco" #define STRING_COLUMN_LABEL_NAME "Nomo" #define STRING_COLUMN_LABEL_VALUE "Valoro" -#define STRING_COLUMN_LABEL_MASK "Masko" -#define STRING_COLUMN_LABEL_MASK_IDX "Mask-indico" #define STRING_COLUMN_LABEL_LAST "Last instance" #define STRING_COLUMN_LABEL_RTYPE "Recurrence type" #define STRING_COLUMN_LABEL_PARENT "Patra tasko" diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h index 2235249b9..09ca646b2 100644 --- a/src/l10n/esp-ESP.h +++ b/src/l10n/esp-ESP.h @@ -156,8 +156,6 @@ #define STRING_COLUMN_LABEL_URGENCY "Urgencia" #define STRING_COLUMN_LABEL_NAME "Nombre" #define STRING_COLUMN_LABEL_VALUE "Valor" -#define STRING_COLUMN_LABEL_MASK "Máscara" -#define STRING_COLUMN_LABEL_MASK_IDX "Máscara de Índice" #define STRING_COLUMN_LABEL_LAST "Last instance" #define STRING_COLUMN_LABEL_RTYPE "Recurrence type" #define STRING_COLUMN_LABEL_PARENT "Tarea madre" diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h index ba082d864..765602d69 100644 --- a/src/l10n/fra-FRA.h +++ b/src/l10n/fra-FRA.h @@ -155,8 +155,6 @@ #define STRING_COLUMN_LABEL_URGENCY "Urgence" #define STRING_COLUMN_LABEL_NAME "Nom" #define STRING_COLUMN_LABEL_VALUE "Valeur" -#define STRING_COLUMN_LABEL_MASK "Masque" -#define STRING_COLUMN_LABEL_MASK_IDX "Indice de masque" #define STRING_COLUMN_LABEL_LAST "Last instance" #define STRING_COLUMN_LABEL_RTYPE "Recurrence type" #define STRING_COLUMN_LABEL_PARENT "Tâche mère" diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h index 7fef7d99f..03ca6b77d 100644 --- a/src/l10n/ita-ITA.h +++ b/src/l10n/ita-ITA.h @@ -155,8 +155,6 @@ #define STRING_COLUMN_LABEL_URGENCY "Urgenza" #define STRING_COLUMN_LABEL_NAME "Nome" #define STRING_COLUMN_LABEL_VALUE "Valore" -#define STRING_COLUMN_LABEL_MASK "Maschera" -#define STRING_COLUMN_LABEL_MASK_IDX "Indice Maschera" #define STRING_COLUMN_LABEL_LAST "Last instance" #define STRING_COLUMN_LABEL_RTYPE "Recurrence type" #define STRING_COLUMN_LABEL_PARENT "Task genitore" diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h index d2a14ebc3..a4208a6ec 100644 --- a/src/l10n/jpn-JPN.h +++ b/src/l10n/jpn-JPN.h @@ -155,8 +155,6 @@ #define STRING_COLUMN_LABEL_URGENCY "Urgency" #define STRING_COLUMN_LABEL_NAME "Name" #define STRING_COLUMN_LABEL_VALUE "Value" -#define STRING_COLUMN_LABEL_MASK "Mask" -#define STRING_COLUMN_LABEL_MASK_IDX "Mask Index" #define STRING_COLUMN_LABEL_LAST "Last instance" #define STRING_COLUMN_LABEL_RTYPE "Recurrence type" #define STRING_COLUMN_LABEL_PARENT "Parent task" diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h index 25a1c901a..3a741b76f 100644 --- a/src/l10n/pol-POL.h +++ b/src/l10n/pol-POL.h @@ -155,8 +155,6 @@ #define STRING_COLUMN_LABEL_URGENCY "Pilność" #define STRING_COLUMN_LABEL_NAME "Nazwa" #define STRING_COLUMN_LABEL_VALUE "Wartość" -#define STRING_COLUMN_LABEL_MASK "Maska" -#define STRING_COLUMN_LABEL_MASK_IDX "Indeks Maski" #define STRING_COLUMN_LABEL_LAST "Last instance" #define STRING_COLUMN_LABEL_RTYPE "Recurrence type" #define STRING_COLUMN_LABEL_PARENT "Zadanie rodzic" diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h index 35f8c365d..4f8e7f7fa 100644 --- a/src/l10n/por-PRT.h +++ b/src/l10n/por-PRT.h @@ -156,8 +156,6 @@ #define STRING_COLUMN_LABEL_URGENCY "Urgência" #define STRING_COLUMN_LABEL_NAME "Nome" #define STRING_COLUMN_LABEL_VALUE "Valor" -#define STRING_COLUMN_LABEL_MASK "Máscara" -#define STRING_COLUMN_LABEL_MASK_IDX "Índice de Máscara" #define STRING_COLUMN_LABEL_LAST "Last instance" #define STRING_COLUMN_LABEL_RTYPE "Recurrence type" #define STRING_COLUMN_LABEL_PARENT "Tarefa mãe"