From 481958471441581dd2fad1db23cd10cf42490cc9 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sun, 21 Jan 2018 19:21:48 -0500 Subject: [PATCH] l10n: Eliminated STRING_COLUMN_LABEL_ACTIVE, STRING_COLUMN_LABEL_STARTED --- src/columns/ColStart.cpp | 7 +++---- 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 -- 10 files changed, 3 insertions(+), 22 deletions(-) diff --git a/src/columns/ColStart.cpp b/src/columns/ColStart.cpp index eb27cd3a2..056873790 100644 --- a/src/columns/ColStart.cpp +++ b/src/columns/ColStart.cpp @@ -28,7 +28,6 @@ #include #include #include -#include extern Context context; @@ -36,7 +35,7 @@ extern Context context; ColumnStart::ColumnStart () { _name = "start"; - _label = STRING_COLUMN_LABEL_STARTED; + _label = "Started"; _styles.push_back ("active"); _examples.push_back (context.config.get ("active.indicator")); @@ -49,8 +48,8 @@ void ColumnStart::setStyle (const std::string& value) { Column::setStyle (value); - if (_style == "active" && _label == STRING_COLUMN_LABEL_STARTED) - _label = STRING_COLUMN_LABEL_ACTIVE; + if (_style == "active" && _label == "Started") + _label = "A"; } //////////////////////////////////////////////////////////////////////////////// diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h index 6442733e1..6e007e7e4 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_ACTIVE "A" #define STRING_COLUMN_LABEL_ADDED "Hinzugefügt" #define STRING_COLUMN_LABEL_AGE "Alter" #define STRING_COLUMN_LABEL_CATEGORY "Category" @@ -60,7 +59,6 @@ #define STRING_COLUMN_LABEL_RTYPE "Recurrence type" #define STRING_COLUMN_LABEL_SCHED "Geplant" #define STRING_COLUMN_LABEL_SHOWS_ID "ID" -#define STRING_COLUMN_LABEL_STARTED "Begonnen" #define STRING_COLUMN_LABEL_STAT "St" #define STRING_COLUMN_LABEL_STATUS "Status" #define STRING_COLUMN_LABEL_STAT_C "E" diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h index 3b5d26320..749cbc841 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_ACTIVE "A" #define STRING_COLUMN_LABEL_ADDED "Added" #define STRING_COLUMN_LABEL_AGE "Age" #define STRING_COLUMN_LABEL_CATEGORY "Category" @@ -61,7 +60,6 @@ #define STRING_COLUMN_LABEL_SCHED "Scheduled" #define STRING_COLUMN_LABEL_SHOWS_ID "ID" #define STRING_COLUMN_LABEL_START "Start" -#define STRING_COLUMN_LABEL_STARTED "Started" #define STRING_COLUMN_LABEL_STAT "St" #define STRING_COLUMN_LABEL_STATUS "Status" #define STRING_COLUMN_LABEL_STAT_C "C" diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h index 782da0bbf..d607ef114 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_ACTIVE "Ak" #define STRING_COLUMN_LABEL_ADDED "Kreita" #define STRING_COLUMN_LABEL_AGE "Aĝo" #define STRING_COLUMN_LABEL_CATEGORY "Category" @@ -61,7 +60,6 @@ #define STRING_COLUMN_LABEL_SCHED "Fiksa" #define STRING_COLUMN_LABEL_SHOWS_ID "ID" #define STRING_COLUMN_LABEL_START "Eko" -#define STRING_COLUMN_LABEL_STARTED "Ekita" #define STRING_COLUMN_LABEL_STAT "St" #define STRING_COLUMN_LABEL_STATUS "Stato" #define STRING_COLUMN_LABEL_STAT_C "Fn" diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h index 40a0f7e02..b365c7668 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_ACTIVE "A" // |esp-ESP|==|eng-USA| #define STRING_COLUMN_LABEL_ADDED "Añadida" #define STRING_COLUMN_LABEL_AGE "Edad" #define STRING_COLUMN_LABEL_CATEGORY "Categoría" @@ -61,7 +60,6 @@ #define STRING_COLUMN_LABEL_SCHED "Programada" #define STRING_COLUMN_LABEL_SHOWS_ID "ID" // |esp-ESP|==|eng-USA| #define STRING_COLUMN_LABEL_START "Comienzo" -#define STRING_COLUMN_LABEL_STARTED "Comenzada" #define STRING_COLUMN_LABEL_STAT "Est" #define STRING_COLUMN_LABEL_STATUS "Estatus" #define STRING_COLUMN_LABEL_STAT_C "C" // |esp-ESP|==|eng-USA| diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h index d4801803b..8f281111a 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_ACTIVE "A" #define STRING_COLUMN_LABEL_ADDED "Ajoutée" #define STRING_COLUMN_LABEL_AGE "Age" #define STRING_COLUMN_LABEL_CATEGORY "Category" @@ -61,7 +60,6 @@ #define STRING_COLUMN_LABEL_SCHED "Planifiée" #define STRING_COLUMN_LABEL_SHOWS_ID "ID" #define STRING_COLUMN_LABEL_START "Début" -#define STRING_COLUMN_LABEL_STARTED "Débutée" #define STRING_COLUMN_LABEL_STAT "St" #define STRING_COLUMN_LABEL_STATUS "Statut" #define STRING_COLUMN_LABEL_STAT_C "C" diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h index 456bf4af6..a3d57f4cd 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_ACTIVE "A" #define STRING_COLUMN_LABEL_ADDED "Aggiunto" #define STRING_COLUMN_LABEL_AGE "Età" #define STRING_COLUMN_LABEL_CATEGORY "Category" @@ -61,7 +60,6 @@ #define STRING_COLUMN_LABEL_SCHED "Fissato" #define STRING_COLUMN_LABEL_SHOWS_ID "ID" #define STRING_COLUMN_LABEL_START "Inizio" -#define STRING_COLUMN_LABEL_STARTED "Iniziati" #define STRING_COLUMN_LABEL_STAT "St" #define STRING_COLUMN_LABEL_STATUS "Stato" #define STRING_COLUMN_LABEL_STAT_C "C" diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h index 3ff733910..e85a1801a 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_ACTIVE "A" #define STRING_COLUMN_LABEL_ADDED "Added" #define STRING_COLUMN_LABEL_AGE "Age" #define STRING_COLUMN_LABEL_CATEGORY "Category" @@ -61,7 +60,6 @@ #define STRING_COLUMN_LABEL_SCHED "Scheduled" #define STRING_COLUMN_LABEL_SHOWS_ID "ID" #define STRING_COLUMN_LABEL_START "Start" -#define STRING_COLUMN_LABEL_STARTED "Started" #define STRING_COLUMN_LABEL_STAT "St" #define STRING_COLUMN_LABEL_STATUS "Status" #define STRING_COLUMN_LABEL_STAT_C "C" diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h index 5a69a47ef..857543407 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_ACTIVE "A" #define STRING_COLUMN_LABEL_ADDED "Dodane" #define STRING_COLUMN_LABEL_AGE "Wiek" #define STRING_COLUMN_LABEL_CATEGORY "Category" @@ -61,7 +60,6 @@ #define STRING_COLUMN_LABEL_SCHED "Zaplanowane" #define STRING_COLUMN_LABEL_SHOWS_ID "ID" #define STRING_COLUMN_LABEL_START "Start" -#define STRING_COLUMN_LABEL_STARTED "Rozpoczęte" #define STRING_COLUMN_LABEL_STAT "St" #define STRING_COLUMN_LABEL_STATUS "Status" #define STRING_COLUMN_LABEL_STAT_C "C" diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h index a44a8ff85..19d4cf21b 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_ACTIVE "A" // |por-PRT|==|eng-USA| #define STRING_COLUMN_LABEL_ADDED "Adicionada" #define STRING_COLUMN_LABEL_AGE "Idade" #define STRING_COLUMN_LABEL_CATEGORY "Category" @@ -61,7 +60,6 @@ #define STRING_COLUMN_LABEL_SCHED "Agendado" #define STRING_COLUMN_LABEL_SHOWS_ID "ID" #define STRING_COLUMN_LABEL_START "Início" -#define STRING_COLUMN_LABEL_STARTED "Iniciada" #define STRING_COLUMN_LABEL_STAT "Es" #define STRING_COLUMN_LABEL_STATUS "Estado" #define STRING_COLUMN_LABEL_STAT_C "C" // |por-PRT|==|eng-USA|