diff --git a/src/columns/ColDescription.cpp b/src/columns/ColDescription.cpp index 116dc78fb..98187b798 100644 --- a/src/columns/ColDescription.cpp +++ b/src/columns/ColDescription.cpp @@ -33,7 +33,6 @@ #include #include #include -#include extern Context context; @@ -42,7 +41,7 @@ ColumnDescription::ColumnDescription () { _name = "description"; _style = "combined"; - _label = STRING_COLUMN_LABEL_DESC; + _label = "Description"; _modifiable = true; _styles = {"combined", @@ -57,11 +56,11 @@ ColumnDescription::ColumnDescription () _dateformat = context.config.get ("dateformat"); std::string t = Datetime ().toString (_dateformat); - std::string d = STRING_COLUMN_EXAMPLES_DESC; - std::string a1 = STRING_COLUMN_EXAMPLES_ANNO1; - std::string a2 = STRING_COLUMN_EXAMPLES_ANNO2; - std::string a3 = STRING_COLUMN_EXAMPLES_ANNO3; - std::string a4 = STRING_COLUMN_EXAMPLES_ANNO4; + std::string d = "Move your clothes down on to the lower peg"; + std::string a1 = "Immediately before your lunch"; + std::string a2 = "If you are playing in the match this afternoon"; + std::string a3 = "Before you write your letter home"; + std::string a4 = "If you're not getting your hair cut"; _examples = {d + "\n " + t + ' ' + a1 + "\n " + t + ' ' + a2 diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h index b46066fa4..44274ebdb 100644 --- a/src/l10n/deu-DEU.h +++ b/src/l10n/deu-DEU.h @@ -27,11 +27,6 @@ #ifndef INCLUDED_STRINGS #define INCLUDED_STRINGS -#define STRING_COLUMN_EXAMPLES_ANNO1 "Direkt vor dem Mittagessen" -#define STRING_COLUMN_EXAMPLES_ANNO2 "Wenn Du heute Nachmittag in der Partie mitspielst" -#define STRING_COLUMN_EXAMPLES_ANNO3 "Bevor Du den Brief nach Hause schreibst" -#define STRING_COLUMN_EXAMPLES_ANNO4 "Wenn Dein Haar nicht geschnitten wird" -#define STRING_COLUMN_EXAMPLES_DESC "Bekleidung einen Haken tiefer hängen" #define STRING_COLUMN_EXAMPLES_IND " Haus.Garten" #define STRING_COLUMN_EXAMPLES_PAR "Haus" #define STRING_COLUMN_EXAMPLES_PROJ "Haus.Garten" diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h index 9c8b7db73..0a6f4d0ee 100644 --- a/src/l10n/eng-USA.h +++ b/src/l10n/eng-USA.h @@ -27,11 +27,6 @@ #ifndef INCLUDED_STRINGS #define INCLUDED_STRINGS -#define STRING_COLUMN_EXAMPLES_ANNO1 "Immediately before your lunch" -#define STRING_COLUMN_EXAMPLES_ANNO2 "If you are playing in the match this afternoon" -#define STRING_COLUMN_EXAMPLES_ANNO3 "Before you write your letter home" -#define STRING_COLUMN_EXAMPLES_ANNO4 "If you're not getting your hair cut" -#define STRING_COLUMN_EXAMPLES_DESC "Move your clothes down on to the lower peg" #define STRING_COLUMN_EXAMPLES_IND " home.garden" #define STRING_COLUMN_EXAMPLES_PAR "home" #define STRING_COLUMN_EXAMPLES_PROJ "home.garden" diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h index c06285509..1f9bb7e3c 100644 --- a/src/l10n/epo-RUS.h +++ b/src/l10n/epo-RUS.h @@ -27,11 +27,6 @@ #ifndef INCLUDED_STRINGS #define INCLUDED_STRINGS -#define STRING_COLUMN_EXAMPLES_ANNO1 "Juste antaŭ tagmanĝi" -#define STRING_COLUMN_EXAMPLES_ANNO2 "Se vi ludos en la maĉo hodiaŭ posttagmeze" -#define STRING_COLUMN_EXAMPLES_ANNO3 "Antaŭ skribi poŝtaĵon hejmen" -#define STRING_COLUMN_EXAMPLES_ANNO4 "Se vi ne faŝonas al si la hararon" -#define STRING_COLUMN_EXAMPLES_DESC "Transloki vian robon suben al la fundan kejlon" #define STRING_COLUMN_EXAMPLES_IND " domo.ĝardeno" #define STRING_COLUMN_EXAMPLES_PAR "domo" #define STRING_COLUMN_EXAMPLES_PROJ "domo.ĝardeno" diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h index d7b33bb23..95d3f25f1 100644 --- a/src/l10n/esp-ESP.h +++ b/src/l10n/esp-ESP.h @@ -27,11 +27,6 @@ #ifndef INCLUDED_STRINGS #define INCLUDED_STRINGS -#define STRING_COLUMN_EXAMPLES_ANNO1 "Inmediatamente antes de comer" -#define STRING_COLUMN_EXAMPLES_ANNO2 "Si juegas en el partido de esta tarde" -#define STRING_COLUMN_EXAMPLES_ANNO3 "Antes de que escribas a casa" -#define STRING_COLUMN_EXAMPLES_ANNO4 "Si no te estás cortando el pelo" -#define STRING_COLUMN_EXAMPLES_DESC "Mueve tu ropa a la percha de abajo" #define STRING_COLUMN_EXAMPLES_IND " casa.jardín" #define STRING_COLUMN_EXAMPLES_PAR "casa" #define STRING_COLUMN_EXAMPLES_PROJ "casa.jardín" diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h index 4b01fe046..663ce86e0 100644 --- a/src/l10n/fra-FRA.h +++ b/src/l10n/fra-FRA.h @@ -27,11 +27,6 @@ #ifndef INCLUDED_STRINGS #define INCLUDED_STRINGS -#define STRING_COLUMN_EXAMPLES_ANNO1 "Juste avant votre repas" -#define STRING_COLUMN_EXAMPLES_ANNO2 "If you are playing in the match this afternoon" -#define STRING_COLUMN_EXAMPLES_ANNO3 "Before you write your letter home" -#define STRING_COLUMN_EXAMPLES_ANNO4 "If you're not getting your hair cut" -#define STRING_COLUMN_EXAMPLES_DESC "Move your clothes down on to the lower peg" #define STRING_COLUMN_EXAMPLES_IND " maison.jardin" #define STRING_COLUMN_EXAMPLES_PAR "maison" #define STRING_COLUMN_EXAMPLES_PROJ "maison.jardin" diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h index 1029c2dbf..f5d5876e4 100644 --- a/src/l10n/ita-ITA.h +++ b/src/l10n/ita-ITA.h @@ -27,11 +27,6 @@ #ifndef INCLUDED_STRINGS #define INCLUDED_STRINGS -#define STRING_COLUMN_EXAMPLES_ANNO1 "Immediatamente prima di pranzo" -#define STRING_COLUMN_EXAMPLES_ANNO2 "Se si sta giocando la partita questo pomeriggio" -#define STRING_COLUMN_EXAMPLES_ANNO3 "Prima di scrivere la lettera a casa" -#define STRING_COLUMN_EXAMPLES_ANNO4 "Se non si va a tagliare i capelli" -#define STRING_COLUMN_EXAMPLES_DESC "Spostare i vestiti sul gancio più basso" #define STRING_COLUMN_EXAMPLES_IND " casa.giardino" #define STRING_COLUMN_EXAMPLES_PAR "casa" #define STRING_COLUMN_EXAMPLES_PROJ "casa.giardino" diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h index 1ba1820c1..42beba2f6 100644 --- a/src/l10n/jpn-JPN.h +++ b/src/l10n/jpn-JPN.h @@ -27,11 +27,6 @@ #ifndef INCLUDED_STRINGS #define INCLUDED_STRINGS -#define STRING_COLUMN_EXAMPLES_ANNO1 "Immediately before your lunch" -#define STRING_COLUMN_EXAMPLES_ANNO2 "If you are playing in the match this afternoon" -#define STRING_COLUMN_EXAMPLES_ANNO3 "Before you write your letter home" -#define STRING_COLUMN_EXAMPLES_ANNO4 "If you're not getting your hair cut" -#define STRING_COLUMN_EXAMPLES_DESC "Move your clothes down on to the lower peg" #define STRING_COLUMN_EXAMPLES_IND " home.garden" #define STRING_COLUMN_EXAMPLES_PAR "home" #define STRING_COLUMN_EXAMPLES_PROJ "home.garden" diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h index b9767ab3d..243321c75 100644 --- a/src/l10n/pol-POL.h +++ b/src/l10n/pol-POL.h @@ -27,11 +27,6 @@ #ifndef INCLUDED_STRINGS #define INCLUDED_STRINGS -#define STRING_COLUMN_EXAMPLES_ANNO1 "Odrazu przed obiadem" -#define STRING_COLUMN_EXAMPLES_ANNO2 "Jesli grasz mecz tego popołudnia" -#define STRING_COLUMN_EXAMPLES_ANNO3 "Przed napisaniem listu do domu" -#define STRING_COLUMN_EXAMPLES_ANNO4 "Jeśli nie udajesz się do fryzjera" -#define STRING_COLUMN_EXAMPLES_DESC "Przewieś swoje ubrania na dolny wieszak" #define STRING_COLUMN_EXAMPLES_IND " dom.ogród" #define STRING_COLUMN_EXAMPLES_PAR "dom" #define STRING_COLUMN_EXAMPLES_PROJ "dom.ogród" diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h index c96d04300..e47c28239 100644 --- a/src/l10n/por-PRT.h +++ b/src/l10n/por-PRT.h @@ -27,11 +27,6 @@ #ifndef INCLUDED_STRINGS #define INCLUDED_STRINGS -#define STRING_COLUMN_EXAMPLES_ANNO1 "Imediatamente antes do almoço" -#define STRING_COLUMN_EXAMPLES_ANNO2 "Se vais jogar no torneio esta tarde" -#define STRING_COLUMN_EXAMPLES_ANNO3 "Antes de escrever para casa" -#define STRING_COLUMN_EXAMPLES_ANNO4 "Se não vais cortar o cabelo" -#define STRING_COLUMN_EXAMPLES_DESC "Mover as roupas para a prateleira mais baixa" #define STRING_COLUMN_EXAMPLES_IND " casa.jardim" #define STRING_COLUMN_EXAMPLES_PAR "casa" #define STRING_COLUMN_EXAMPLES_PROJ "casa.jardim"