summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2009-07-23 19:31:50 +0000
committerrubidium <rubidium@openttd.org>2009-07-23 19:31:50 +0000
commite9bc557b2a3c13ab8038d577c047813c691122dd (patch)
tree70792ef1ccec63af813dd750920ba9d86a0febd2 /src
parent20c1e42be128c915087b0ecf081b3101bcec234e (diff)
downloadopenttd-e9bc557b2a3c13ab8038d577c047813c691122dd.tar.xz
(svn r16930) -Codechange: more StringID name unification and grouping
Diffstat (limited to 'src')
-rw-r--r--src/ai/ai_gui.cpp2
-rw-r--r--src/build_vehicle_gui.cpp8
-rw-r--r--src/genworld_gui.cpp18
-rw-r--r--src/industry_gui.cpp4
-rw-r--r--src/lang/afrikaans.txt32
-rw-r--r--src/lang/arabic_egypt.txt32
-rw-r--r--src/lang/brazilian_portuguese.txt32
-rw-r--r--src/lang/bulgarian.txt32
-rw-r--r--src/lang/catalan.txt32
-rw-r--r--src/lang/croatian.txt32
-rw-r--r--src/lang/czech.txt32
-rw-r--r--src/lang/danish.txt32
-rw-r--r--src/lang/dutch.txt32
-rw-r--r--src/lang/english.txt122
-rw-r--r--src/lang/english_US.txt32
-rw-r--r--src/lang/esperanto.txt32
-rw-r--r--src/lang/estonian.txt32
-rw-r--r--src/lang/finnish.txt32
-rw-r--r--src/lang/french.txt32
-rw-r--r--src/lang/galician.txt32
-rw-r--r--src/lang/german.txt32
-rw-r--r--src/lang/hebrew.txt32
-rw-r--r--src/lang/hungarian.txt32
-rw-r--r--src/lang/icelandic.txt32
-rw-r--r--src/lang/indonesian.txt32
-rw-r--r--src/lang/italian.txt32
-rw-r--r--src/lang/japanese.txt32
-rw-r--r--src/lang/korean.txt32
-rw-r--r--src/lang/latvian.txt32
-rw-r--r--src/lang/lithuanian.txt32
-rw-r--r--src/lang/luxembourgish.txt32
-rw-r--r--src/lang/norwegian_bokmal.txt32
-rw-r--r--src/lang/norwegian_nynorsk.txt32
-rw-r--r--src/lang/polish.txt32
-rw-r--r--src/lang/portuguese.txt32
-rw-r--r--src/lang/romanian.txt32
-rw-r--r--src/lang/russian.txt32
-rw-r--r--src/lang/serbian.txt32
-rw-r--r--src/lang/simplified_chinese.txt32
-rw-r--r--src/lang/slovak.txt32
-rw-r--r--src/lang/slovenian.txt32
-rw-r--r--src/lang/spanish.txt32
-rw-r--r--src/lang/swedish.txt32
-rw-r--r--src/lang/traditional_chinese.txt32
-rw-r--r--src/lang/turkish.txt32
-rw-r--r--src/lang/ukrainian.txt32
-rw-r--r--src/lang/unfinished/frisian.txt22
-rw-r--r--src/lang/unfinished/greek.txt30
-rw-r--r--src/lang/unfinished/ido.txt4
-rw-r--r--src/lang/unfinished/macedonian.txt17
-rw-r--r--src/lang/unfinished/malay.txt23
-rw-r--r--src/lang/unfinished/persian.txt17
-rw-r--r--src/lang/unfinished/thai.txt21
-rw-r--r--src/lang/unfinished/urdu.txt5
-rw-r--r--src/lang/unfinished/vietnamese.txt5
-rw-r--r--src/lang/welsh.txt32
-rw-r--r--src/network/network_gui.cpp6
-rw-r--r--src/order_gui.cpp2
-rw-r--r--src/rail_gui.cpp16
-rw-r--r--src/roadveh_gui.cpp2
-rw-r--r--src/settings_gui.cpp30
-rw-r--r--src/signs_gui.cpp8
-rw-r--r--src/station_gui.cpp2
-rw-r--r--src/statusbar_gui.cpp2
-rw-r--r--src/timetable_gui.cpp2
-rw-r--r--src/toolbar_gui.cpp4
-rw-r--r--src/vehicle_gui.cpp14
-rw-r--r--src/widget.cpp4
68 files changed, 822 insertions, 912 deletions
diff --git a/src/ai/ai_gui.cpp b/src/ai/ai_gui.cpp
index 6e1826bef..b4bfbce3c 100644
--- a/src/ai/ai_gui.cpp
+++ b/src/ai/ai_gui.cpp
@@ -343,7 +343,7 @@ struct AISettingsWindow : public Window {
/* Display a query box so users can enter a custom value. */
this->clicked_row = num;
SetDParam(0, this->ai_config->GetSetting(config_item.name));
- ShowQueryString(STR_CONFIG_SETTING_INT32, STR_CONFIG_SETTING_QUERY_CAPT, 10, 100, this, CS_NUMERAL, QSF_NONE);
+ ShowQueryString(STR_JUST_INT, STR_CONFIG_SETTING_QUERY_CAPT, 10, 100, this, CS_NUMERAL, QSF_NONE);
}
this->SetDirty();
diff --git a/src/build_vehicle_gui.cpp b/src/build_vehicle_gui.cpp
index 4e9e6483b..706a6e1dc 100644
--- a/src/build_vehicle_gui.cpp
+++ b/src/build_vehicle_gui.cpp
@@ -359,7 +359,7 @@ static const StringID _sort_listing[][11] = {{
STR_SORT_BY_MAX_SPEED,
STR_SORT_BY_POWER,
STR_SORT_BY_INTRO_DATE,
- STR_SORT_BY_DROPDOWN_NAME,
+ STR_SORT_BY_NAME,
STR_SORT_BY_RUNNING_COST,
STR_SORT_BY_POWER_VS_RUNNING_COST,
STR_SORT_BY_RELIABILITY,
@@ -371,7 +371,7 @@ static const StringID _sort_listing[][11] = {{
STR_SORT_BY_COST,
STR_SORT_BY_MAX_SPEED,
STR_SORT_BY_INTRO_DATE,
- STR_SORT_BY_DROPDOWN_NAME,
+ STR_SORT_BY_NAME,
STR_SORT_BY_RUNNING_COST,
STR_SORT_BY_RELIABILITY,
STR_SORT_BY_CARGO_CAPACITY,
@@ -382,7 +382,7 @@ static const StringID _sort_listing[][11] = {{
STR_SORT_BY_COST,
STR_SORT_BY_MAX_SPEED,
STR_SORT_BY_INTRO_DATE,
- STR_SORT_BY_DROPDOWN_NAME,
+ STR_SORT_BY_NAME,
STR_SORT_BY_RUNNING_COST,
STR_SORT_BY_RELIABILITY,
STR_SORT_BY_CARGO_CAPACITY,
@@ -393,7 +393,7 @@ static const StringID _sort_listing[][11] = {{
STR_SORT_BY_COST,
STR_SORT_BY_MAX_SPEED,
STR_SORT_BY_INTRO_DATE,
- STR_SORT_BY_DROPDOWN_NAME,
+ STR_SORT_BY_NAME,
STR_SORT_BY_RUNNING_COST,
STR_SORT_BY_RELIABILITY,
STR_SORT_BY_CARGO_CAPACITY,
diff --git a/src/genworld_gui.cpp b/src/genworld_gui.cpp
index 398ac6b68..8503938fe 100644
--- a/src/genworld_gui.cpp
+++ b/src/genworld_gui.cpp
@@ -381,11 +381,11 @@ static const Widget _heightmap_load_widgets[] = {
/* Tree placer */
{ WWT_TEXT, RESIZE_NONE, COLOUR_ORANGE, 12, 110, 197, 207, STR_TREE_PLACER, STR_NULL}, // GLAND_TREE_TEXT
-{ WWT_DROPDOWN, RESIZE_NONE, COLOUR_ORANGE, 114, 231, 196, 207, STR_ARROW_DOWN, STR_NULL}, // GLAND_TREE_PULLDOWN
+{ WWT_DROPDOWN, RESIZE_NONE, COLOUR_ORANGE, 114, 231, 196, 207, STR_BLACK_ARROW_DOWN, STR_NULL}, // GLAND_TREE_PULLDOWN
/* Heightmap rotation */
{ WWT_TEXT, RESIZE_NONE, COLOUR_ORANGE, 12, 110, 215, 225, STR_HEIGHTMAP_ROTATION, STR_NULL}, // GLAND_HEIGHTMAP_ROTATION_TEXT
-{ WWT_DROPDOWN, RESIZE_NONE, COLOUR_ORANGE, 114, 231, 214, 225, STR_ARROW_DOWN, STR_NULL}, // GLAND_HEIGHTMAP_ROTATION_PULLDOWN
+{ WWT_DROPDOWN, RESIZE_NONE, COLOUR_ORANGE, 114, 231, 214, 225, STR_BLACK_ARROW_DOWN, STR_NULL}, // GLAND_HEIGHTMAP_ROTATION_PULLDOWN
{ WIDGETS_END},
};
@@ -476,10 +476,10 @@ static const NWidgetPart _nested_heightmap_load_widgets[] = {
NWidget(NWID_HORIZONTAL),
NWidget(NWID_VERTICAL),
/* Tree placer. */
- NWidget(WWT_DROPDOWN, COLOUR_ORANGE, GLAND_TREE_PULLDOWN), SetMinimalSize(118, 12), SetDataTip(STR_ARROW_DOWN, STR_NULL),
+ NWidget(WWT_DROPDOWN, COLOUR_ORANGE, GLAND_TREE_PULLDOWN), SetMinimalSize(118, 12), SetDataTip(STR_BLACK_ARROW_DOWN, STR_NULL),
NWidget(NWID_SPACER), SetMinimalSize(0, 6),
/* Heightmap rotation. */
- NWidget(WWT_DROPDOWN, COLOUR_ORANGE, GLAND_HEIGHTMAP_ROTATION_PULLDOWN), SetMinimalSize(118, 12), SetDataTip(STR_ARROW_DOWN, STR_NULL),
+ NWidget(WWT_DROPDOWN, COLOUR_ORANGE, GLAND_HEIGHTMAP_ROTATION_PULLDOWN), SetMinimalSize(118, 12), SetDataTip(STR_BLACK_ARROW_DOWN, STR_NULL),
EndContainer(),
NWidget(NWID_SPACER), SetMinimalSize(11, 0),
/* Generate button. */
@@ -719,7 +719,7 @@ struct GenerateLandscapeWindow : public QueryStringBaseWindow {
case GLAND_START_DATE_TEXT: // Year text
this->widget_id = GLAND_START_DATE_TEXT;
SetDParam(0, _settings_newgame.game_creation.starting_year);
- ShowQueryString(STR_CONFIG_SETTING_INT32, STR_START_DATE_QUERY_CAPT, 8, 100, this, CS_NUMERAL, QSF_NONE);
+ ShowQueryString(STR_JUST_INT, STR_START_DATE_QUERY_CAPT, 8, 100, this, CS_NUMERAL, QSF_NONE);
break;
case GLAND_SNOW_LEVEL_DOWN:
@@ -737,7 +737,7 @@ struct GenerateLandscapeWindow : public QueryStringBaseWindow {
case GLAND_SNOW_LEVEL_TEXT: // Snow line text
this->widget_id = GLAND_SNOW_LEVEL_TEXT;
SetDParam(0, _settings_newgame.game_creation.snow_line_height);
- ShowQueryString(STR_CONFIG_SETTING_INT32, STR_SNOW_LINE_QUERY_CAPT, 3, 100, this, CS_NUMERAL, QSF_NONE);
+ ShowQueryString(STR_JUST_INT, STR_SNOW_LINE_QUERY_CAPT, 3, 100, this, CS_NUMERAL, QSF_NONE);
break;
case GLAND_TREE_PULLDOWN: // Tree placer
@@ -818,7 +818,7 @@ struct GenerateLandscapeWindow : public QueryStringBaseWindow {
if ((uint)index == CUSTOM_TOWN_NUMBER_DIFFICULTY) {
this->widget_id = widget;
SetDParam(0, _settings_newgame.game_creation.custom_town_number);
- ShowQueryString(STR_CONFIG_SETTING_INT32, STR_NUMBER_OF_TOWNS, 5, 50, this, CS_NUMERAL, QSF_NONE);
+ ShowQueryString(STR_JUST_INT, STR_NUMBER_OF_TOWNS, 5, 50, this, CS_NUMERAL, QSF_NONE);
};
IConsoleSetSetting("difficulty.number_towns", index);
break;
@@ -1043,7 +1043,7 @@ struct CreateScenarioWindow : public Window
case CSCEN_START_DATE_TEXT: // Year text
this->widget_id = CSCEN_START_DATE_TEXT;
SetDParam(0, _settings_newgame.game_creation.starting_year);
- ShowQueryString(STR_CONFIG_SETTING_INT32, STR_START_DATE_QUERY_CAPT, 8, 100, this, CS_NUMERAL, QSF_NONE);
+ ShowQueryString(STR_JUST_INT, STR_START_DATE_QUERY_CAPT, 8, 100, this, CS_NUMERAL, QSF_NONE);
break;
case CSCEN_FLAT_LAND_HEIGHT_DOWN:
@@ -1061,7 +1061,7 @@ struct CreateScenarioWindow : public Window
case CSCEN_FLAT_LAND_HEIGHT_TEXT: // Height level text
this->widget_id = CSCEN_FLAT_LAND_HEIGHT_TEXT;
SetDParam(0, _settings_newgame.game_creation.se_flat_world_height);
- ShowQueryString(STR_CONFIG_SETTING_INT32, STR_FLAT_WORLD_HEIGHT_QUERY_CAPT, 3, 100, this, CS_NUMERAL, QSF_NONE);
+ ShowQueryString(STR_JUST_INT, STR_FLAT_WORLD_HEIGHT_QUERY_CAPT, 3, 100, this, CS_NUMERAL, QSF_NONE);
break;
}
}
diff --git a/src/industry_gui.cpp b/src/industry_gui.cpp
index 6e1d93c33..65b2ec593 100644
--- a/src/industry_gui.cpp
+++ b/src/industry_gui.cpp
@@ -622,7 +622,7 @@ public:
/* clicked the text */
this->editbox_line = line;
SetDParam(0, i->production_rate[line] * 8);
- ShowQueryString(STR_CONFIG_SETTING_INT32, STR_CONFIG_GAME_PRODUCTION, 10, 100, this, CS_ALPHANUMERAL, QSF_NONE);
+ ShowQueryString(STR_JUST_INT, STR_CONFIG_GAME_PRODUCTION, 10, 100, this, CS_ALPHANUMERAL, QSF_NONE);
}
}
} break;
@@ -1039,7 +1039,7 @@ GUIIndustryList::SortFunction * const IndustryDirectoryWindow::sorter_funcs[] =
/* Names of the sorting functions */
const StringID IndustryDirectoryWindow::sorter_names[] = {
- STR_SORT_BY_DROPDOWN_NAME,
+ STR_SORT_BY_NAME,
STR_SORT_BY_TYPE,
STR_SORT_BY_PRODUCTION,
STR_SORT_BY_TRANSPORTED,
diff --git a/src/lang/afrikaans.txt b/src/lang/afrikaans.txt
index 0d29197bd..dc7d3ce89 100644
--- a/src/lang/afrikaans.txt
+++ b/src/lang/afrikaans.txt
@@ -155,8 +155,8 @@ STR_ABBREV_PLASTIC :{TINYFONT}PL
STR_ABBREV_FIZZY_DRINKS :{TINYFONT}KD
STR_ABBREV_NONE :{TINYFONT}NS
STR_ABBREV_ALL :{TINYFONT}ALMAL
-STR_DATE_SHORT_WHITE :{WHITE}{DATE_SHORT}
-STR_DATE_LONG_WHITE :{WHITE}{DATE_LONG}
+STR_WHITE_DATE_SHORT :{WHITE}{DATE_SHORT}
+STR_WHITE_DATE_LONG :{WHITE}{DATE_LONG}
STR_SMALLMAP_CAPTION :{WHITE}Kaart - {STRING}
STR_GAME_OPTIONS_CAPTION :{WHITE}Spel Opsies
STR_ERROR_MESSAGE_CAPTION :{YELLOW}Boodskap
@@ -329,7 +329,6 @@ STR_SORT_BY_PRODUCTION :Produksie
STR_SORT_BY_TYPE :Tipe
STR_SORT_BY_TRANSPORTED :Vervoer
STR_SORT_BY_NAME :{BLACK}Naam
-STR_SORT_BY_DROPDOWN_NAME :Naam
STR_SORT_BY_DATE :{BLACK}Datum
STR_SORT_BY_NUMBER :Nommer
STR_SORT_BY_PROFIT_LAST_YEAR :Profyt verlede jaar
@@ -411,8 +410,8 @@ STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS :{BLACK}Bou lugh
STR_TOOLBAR_TOOLTIP_PLANT_TREES_PLACE_SIGNS :{BLACK}Plant bome, plaas tekens ens.
STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION :{BLACK}Land gebied informasie
STR_TOOLBAR_TOOLTIP_OPTIONS :{BLACK}Opsies
-STR_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
-STR_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
+STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
+STR_BLACK_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
STR_ERROR_CAN_T_CHANGE_SERVICING :{WHITE}Kan nie diens interval verander nie...
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Maak venster toe
STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Venster titel - sleep om venster te beweeg
@@ -581,12 +580,12 @@ STR_HIGHSCORE_NAME :{BIGFONT}{PRESI
STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA})
STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} behaal '{STRING}' status!
STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} van {COMPANY} behaal '{STRING}' status!
-STR_BLUE_NUMBER :{BLUE}{COMMA}
+STR_BLUE_COMMA :{BLUE}{COMMA}
STR_SCENEDIT_TOOLBAR_OPENTTD :{YELLOW}OpenTTD
STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR :{YELLOW}Draaiboek Redigeerder
STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION :{WHITE}Land Generasie
-STR_ARROW_UP :{BLACK}{UPARROW}
-STR_ARROW_DOWN :{BLACK}{DOWNARROW}
+STR_BLACK_ARROW_UP :{BLACK}{UPARROW}
+STR_BLACK_ARROW_DOWN :{BLACK}{DOWNARROW}
STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA :{BLACK}Vergroot gebied wat verlaag/verhoog moet word
STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA :{BLACK}Verminder gebied wat verlaag/verhoog moet word
STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND :{BLACK}Genereer lukraake land
@@ -664,7 +663,7 @@ STR_FULL :Vol
STR_STATUSBAR_COMPANY_NAME :{SILVER}- - {COMPANY} - -
STR_BLACK_STRING :{BLACK}{STRING}
-STR_CHECKMARK :{CHECKMARK}
+STR_JUST_CHECKMARK :{CHECKMARK}
############ range for menu starts
STR_SETTINGS_MENU_GAME_OPTIONS :Speletjie opsies
STR_SETTINGS_MENU_DIFFICULTY_SETTINGS :Moelikheid stellings
@@ -770,8 +769,8 @@ STR_STATUSBAR_SAVING_GAME :{RED}* * SPAA
STR_SAVE_STILL_IN_PROGRESS :{WHITE}Spaar nog in vorder, {}wag asb tot dit klaar is!
STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE :{BLACK}Kies 'Ezy Straat styl musiek' program
-STR_6 :{BLACK}6
-STR_7 :{BLACK}7
+STR_BLACK_6 :{BLACK}6
+STR_BLACK_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :Engels (Oorspronkilik)
@@ -878,7 +877,7 @@ STR_CRATES :hokke
STR_RES_OTHER :ander
STR_NOTHING :
-STR_SMALL_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
+STR_TINY_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
STR_CANT_SHARE_ORDER_LIST :{WHITE}Kan nie opdraglys deel nie...
STR_CANT_COPY_ORDER_LIST :{WHITE}Kan nie opdrag lys kopie nie...
@@ -1134,8 +1133,7 @@ STR_CONFIG_SETTING_MAP_Y :{LTBLUE}Y-groot
############ generic strings for settings
STR_CONFIG_SETTING_DISABLED :gestrem
-STR_CONFIG_SETTING_INT32 :{NUM}
-STR_CONFIG_SETTING_CURRENCY :{CURRENCY}
+STR_JUST_CURRENCY :{CURRENCY}
STR_CONFIG_SETTING_QUERY_CAPT :{WHITE}Verander stel waarde
STR_TEMPERATE_LANDSCAPE :Magtig landskap
@@ -2085,8 +2083,8 @@ STR_NUM_LOW :Laag
STR_NUM_NORMAL :Normaal
STR_NUM_HIGH :Hoog
STR_NUM_CUSTOM :Bestelling
-STR_ARROW_LEFT_SMALL :{BLACK}{SMALLLEFTARROW}
-STR_ARROW_RIGHT_SMALL :{BLACK}{SMALLRIGHTARROW}
+STR_BLACK_SMALL_ARROW_LEFT :{BLACK}{SMALLLEFTARROW}
+STR_BLACK_SMALL_ARROW_RIGHT :{BLACK}{SMALLRIGHTARROW}
STR_AI_SPEED_VERY_SLOW :Baie Stadig
STR_AI_SPEED_SLOW :Stadig
STR_AI_SPEED_MEDIUM :Gemiddel
@@ -2820,7 +2818,7 @@ STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Senter s
STR_BUILD_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP :{BLACK}Pad voertuig keuse lys - kliek op voertuig vir inligting
STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_TOOLTIP :{BLACK}Bou die verlig pad voertuig
STR_ARTICULATED_RV_CAPACITY :{BLACK}Kapasiteit: {LTBLUE}
-STR_BARE_CARGO :{CARGO}
+STR_JUST_CARGO :{CARGO}
STR_DEPOT_VEHICLE_TOOLTIP :{BLACK}{ENGINE}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CHAIN :{BLACK}{NUM} voertuig{P "" s}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CARGO :{}{CARGO} ({SHORTCARGO})
diff --git a/src/lang/arabic_egypt.txt b/src/lang/arabic_egypt.txt
index 6f2ee5494..114f144fa 100644
--- a/src/lang/arabic_egypt.txt
+++ b/src/lang/arabic_egypt.txt
@@ -154,8 +154,8 @@ STR_ABBREV_PLASTIC :{TINYFONT}بل
STR_ABBREV_FIZZY_DRINKS :{TINYFONT}شراب مخفوق
STR_ABBREV_NONE :{TINYFONT}لا شيء
STR_ABBREV_ALL :{TINYFONT}الكل
-STR_DATE_SHORT_WHITE :{WHITE}{DATE_SHORT}
-STR_DATE_LONG_WHITE :{WHITE}{DATE_LONG}
+STR_WHITE_DATE_SHORT :{WHITE}{DATE_SHORT}
+STR_WHITE_DATE_LONG :{WHITE}{DATE_LONG}
STR_SMALLMAP_CAPTION :{WHITE}الخريطة- {STRING}
STR_GAME_OPTIONS_CAPTION :{WHITE}خيارات
STR_ERROR_MESSAGE_CAPTION :{YELLOW}رسالة
@@ -328,7 +328,6 @@ STR_SORT_BY_PRODUCTION :إنتاج
STR_SORT_BY_TYPE :نوع
STR_SORT_BY_TRANSPORTED :الحمولة المنقولة
STR_SORT_BY_NAME :{BLACK}اسم
-STR_SORT_BY_DROPDOWN_NAME :اسم
STR_SORT_BY_DATE :{BLACK}تاريخ
STR_SORT_BY_NUMBER :رقم
STR_SORT_BY_PROFIT_LAST_YEAR :دخل السنة الماضية
@@ -410,8 +409,8 @@ STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS :{BLACK}ادوا
STR_TOOLBAR_TOOLTIP_PLANT_TREES_PLACE_SIGNS :{BLACK}زراعة شجر, علامات و اشارات ...
STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION :{BLACK}معلومات مناطق الخريطة
STR_TOOLBAR_TOOLTIP_OPTIONS :{BLACK}خيارات
-STR_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
-STR_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
+STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
+STR_BLACK_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
STR_ERROR_CAN_T_CHANGE_SERVICING :{WHITE}لا يمكن تغيير فترات الصيانة
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}اغلاق الاطار
STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}عنوان الاطار- اسحب لتحريك الاطار
@@ -581,12 +580,12 @@ STR_HIGHSCORE_NAME :{BIGFONT}{PRESI
STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA})
STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BLACK}{BIGFONT}حققت شركة {COMPANY} بجدارة'{STRING}'
STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{WHITE}{BIGFONT}حقق {PRESIDENTNAME}مدير شركة {COMPANY} '{STRING}' بجدارة
-STR_BLUE_NUMBER :{BLUE}{COMMA}
+STR_BLUE_COMMA :{BLUE}{COMMA}
STR_SCENEDIT_TOOLBAR_OPENTTD :{YELLOW}النسخة المفتوحة
STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR :{YELLOW}محرر الخريطة
STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION :{WHITE}بناء المسطحات الأرضية
-STR_ARROW_UP :{BLACK}{UPARROW}
-STR_ARROW_DOWN :{BLACK}{DOWNARROW}
+STR_BLACK_ARROW_UP :{BLACK}{UPARROW}
+STR_BLACK_ARROW_DOWN :{BLACK}{DOWNARROW}
STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA :{BLACK}زيادة ارتفاع و انخفاض المسطحات الأرضية
STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA :{BLACK}انقاص ارتفاع و انخفاض المسطحات الأرضية
STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND :{BLACK}انشاء مسطحات عشوائية
@@ -670,7 +669,7 @@ STR_FULL :ممتلئ
STR_STATUSBAR_COMPANY_NAME :{SILVER}- - {COMPANY} - -
STR_BLACK_STRING :{BLACK}{STRING}
-STR_CHECKMARK :{CHECKMARK}
+STR_JUST_CHECKMARK :{CHECKMARK}
############ range for menu starts
STR_SETTINGS_MENU_GAME_OPTIONS :خيارات اللعبة
STR_SETTINGS_MENU_DIFFICULTY_SETTINGS :خيارات الصعوبة
@@ -778,8 +777,8 @@ STR_STATUSBAR_SAVING_GAME :{RED}* * يت
STR_SAVE_STILL_IN_PROGRESS :{WHITE}الحفظ مازال جاريا الآن{}الرجاء الأنتظار حتر ينتهي
STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE :{BLACK}اختر'Ezy Street style music'برنامج
-STR_6 :{BLACK}6
-STR_7 :{BLACK}7
+STR_BLACK_6 :{BLACK}6
+STR_BLACK_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :English (Original)
@@ -887,7 +886,7 @@ STR_CRATES :صناديق
STR_RES_OTHER :اخرى
STR_NOTHING :
-STR_SMALL_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
+STR_TINY_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
STR_CANT_SHARE_ORDER_LIST :{WHITE}لا يمكن مشاركة قائمة الأوامر
STR_CANT_COPY_ORDER_LIST :{WHITE}لا يمكن نسخ قائمة الأوامر
@@ -1160,8 +1159,7 @@ STR_CONFIG_SETTING_MAP_Y :{LTBLUE}طول
############ generic strings for settings
STR_CONFIG_SETTING_DISABLED :غير مفعل
-STR_CONFIG_SETTING_INT32 :{NUM}
-STR_CONFIG_SETTING_CURRENCY :{CURRENCY}
+STR_JUST_CURRENCY :{CURRENCY}
STR_CONFIG_SETTING_QUERY_CAPT :{WHITE}عدل قيمة التغيير
STR_TEMPERATE_LANDSCAPE :مناطق معتدلة
@@ -2127,8 +2125,8 @@ STR_NUM_LOW :قليل
STR_NUM_NORMAL :طبيعي
STR_NUM_HIGH :عالي
STR_NUM_CUSTOM :اختياري
-STR_ARROW_LEFT_SMALL :{BLACK}{SMALLLEFTARROW}
-STR_ARROW_RIGHT_SMALL :{BLACK}{SMALLRIGHTARROW}
+STR_BLACK_SMALL_ARROW_LEFT :{BLACK}{SMALLLEFTARROW}
+STR_BLACK_SMALL_ARROW_RIGHT :{BLACK}{SMALLRIGHTARROW}
STR_AI_SPEED_VERY_SLOW :بطيء جدا
STR_AI_SPEED_SLOW :بطيء
STR_AI_SPEED_MEDIUM :متوسط
@@ -2884,7 +2882,7 @@ STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}ضع و
STR_BUILD_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP :{BLACK}قائمة اختيار العربات - اضغط على العربة لاظهار معلوماتها
STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_TOOLTIP :{BLACK}شراء العربة
STR_ARTICULATED_RV_CAPACITY :{BLACK}السعة: {LTBLUE}
-STR_BARE_CARGO :{CARGO}
+STR_JUST_CARGO :{CARGO}
STR_DEPOT_VEHICLE_TOOLTIP :{BLACK}{ENGINE}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CHAIN :{BLACK}{NUM}العربات {STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CARGO :{}{CARGO} ({SHORTCARGO})
diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt
index 1ae7e205a..32c7a65bb 100644
--- a/src/lang/brazilian_portuguese.txt
+++ b/src/lang/brazilian_portuguese.txt
@@ -155,8 +155,8 @@ STR_ABBREV_PLASTIC :{TINYFONT}PS
STR_ABBREV_FIZZY_DRINKS :{TINYFONT}RE
STR_ABBREV_NONE :{TINYFONT}NADA
STR_ABBREV_ALL :{TINYFONT}TUDO
-STR_DATE_SHORT_WHITE :{WHITE}{DATE_SHORT}
-STR_DATE_LONG_WHITE :{WHITE}{DATE_LONG}
+STR_WHITE_DATE_SHORT :{WHITE}{DATE_SHORT}
+STR_WHITE_DATE_LONG :{WHITE}{DATE_LONG}
STR_SMALLMAP_CAPTION :{WHITE}Mapa - {STRING}
STR_GAME_OPTIONS_CAPTION :{WHITE}Opções do Jogo
STR_ERROR_MESSAGE_CAPTION :{YELLOW}Mensagem
@@ -329,7 +329,6 @@ STR_SORT_BY_PRODUCTION :Produção
STR_SORT_BY_TYPE :Tipo
STR_SORT_BY_TRANSPORTED :Transportado
STR_SORT_BY_NAME :{BLACK}Nome
-STR_SORT_BY_DROPDOWN_NAME :Nome
STR_SORT_BY_DATE :{BLACK}Data
STR_SORT_BY_NUMBER :Número
STR_SORT_BY_PROFIT_LAST_YEAR :Lucros do último ano
@@ -411,8 +410,8 @@ STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS :{BLACK}Construi
STR_TOOLBAR_TOOLTIP_PLANT_TREES_PLACE_SIGNS :{BLACK}Plantar árvores, colocar placas, etc...
STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION :{BLACK}Informações sobre o terreno
STR_TOOLBAR_TOOLTIP_OPTIONS :{BLACK}Opções
-STR_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
-STR_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
+STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
+STR_BLACK_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
STR_ERROR_CAN_T_CHANGE_SERVICING :{WHITE}Impossível alterar o intervalo de manutenção...
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Fechar janela
STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Título da janela - arraste para mover a janela
@@ -582,12 +581,12 @@ STR_HIGHSCORE_NAME :{BIGFONT}{PRESI
STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA})
STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} conquista o status de '{STRING}'!
STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} de {COMPANY} conquista o status de '{STRING}'!
-STR_BLUE_NUMBER :{BLUE}{COMMA}
+STR_BLUE_COMMA :{BLUE}{COMMA}
STR_SCENEDIT_TOOLBAR_OPENTTD :{YELLOW}OpenTTD
STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR :{YELLOW}Editor de Cenário
STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION :{WHITE}Gerar Terreno
-STR_ARROW_UP :{BLACK}{UPARROW}
-STR_ARROW_DOWN :{BLACK}{DOWNARROW}
+STR_BLACK_ARROW_UP :{BLACK}{UPARROW}
+STR_BLACK_ARROW_DOWN :{BLACK}{DOWNARROW}
STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA :{BLACK}Aumentar área de terreno a baixar/levantar
STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA :{BLACK}Diminuir área de terreno a baixar/levantar
STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND :{BLACK}Gerar terreno aleatório
@@ -671,7 +670,7 @@ STR_FULL :Completo
STR_STATUSBAR_COMPANY_NAME :{SILVER}- - {COMPANY} - -
STR_BLACK_STRING :{BLACK}{STRING}
-STR_CHECKMARK :{CHECKMARK}
+STR_JUST_CHECKMARK :{CHECKMARK}
############ range for menu starts
STR_SETTINGS_MENU_GAME_OPTIONS :Opções do Jogo
STR_SETTINGS_MENU_DIFFICULTY_SETTINGS :Configurações de dificuldade
@@ -779,8 +778,8 @@ STR_STATUSBAR_SAVING_GAME :{RED}* * SALV
STR_SAVE_STILL_IN_PROGRESS :{WHITE}Gravação em progresso,{}por favor aguarde até que termine!
STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE :{BLACK}Selecionar programa 'Ezy Street'
-STR_6 :{BLACK}6
-STR_7 :{BLACK}7
+STR_BLACK_6 :{BLACK}6
+STR_BLACK_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :Inglês (Original)
@@ -888,7 +887,7 @@ STR_CRATES :caixas
STR_RES_OTHER :outra
STR_NOTHING :
-STR_SMALL_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
+STR_TINY_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
STR_CANT_SHARE_ORDER_LIST :{WHITE}Impossível compartilhar a lista de ordens...
STR_CANT_COPY_ORDER_LIST :{WHITE}Impossível copiar a lista de ordens...
@@ -1161,8 +1160,7 @@ STR_CONFIG_SETTING_MAP_Y :{LTBLUE}Y-taman
############ generic strings for settings
STR_CONFIG_SETTING_DISABLED :desativado
-STR_CONFIG_SETTING_INT32 :{NUM}
-STR_CONFIG_SETTING_CURRENCY :{CURRENCY}
+STR_JUST_CURRENCY :{CURRENCY}
STR_CONFIG_SETTING_QUERY_CAPT :{WHITE}Alterar valor
STR_TEMPERATE_LANDSCAPE :terreno temperado
@@ -2128,8 +2126,8 @@ STR_NUM_LOW :Baixo
STR_NUM_NORMAL :Normal
STR_NUM_HIGH :Alto
STR_NUM_CUSTOM :Personalizado
-STR_ARROW_LEFT_SMALL :{BLACK}{SMALLLEFTARROW}
-STR_ARROW_RIGHT_SMALL :{BLACK}{SMALLRIGHTARROW}
+STR_BLACK_SMALL_ARROW_LEFT :{BLACK}{SMALLLEFTARROW}
+STR_BLACK_SMALL_ARROW_RIGHT :{BLACK}{SMALLRIGHTARROW}
STR_AI_SPEED_VERY_SLOW :Muito Lento
STR_AI_SPEED_SLOW :Lento
STR_AI_SPEED_MEDIUM :Médio
@@ -2885,7 +2883,7 @@ STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Centrar
STR_BUILD_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP :{BLACK}Lista de automóveis - clique num automóvel para informações
STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_TOOLTIP :{BLACK}Construir o veículo selecionado
STR_ARTICULATED_RV_CAPACITY :{BLACK}Capacidade: {LTBLUE}
-STR_BARE_CARGO :{CARGO}
+STR_JUST_CARGO :{CARGO}
STR_DEPOT_VEHICLE_TOOLTIP :{BLACK}{ENGINE}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CHAIN :{BLACK}{NUM} veículo{P "" s}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CARGO :{}{CARGO} ({SHORTCARGO})
diff --git a/src/lang/bulgarian.txt b/src/lang/bulgarian.txt
index 596f03a4e..f90099aae 100644
--- a/src/lang/bulgarian.txt
+++ b/src/lang/bulgarian.txt
@@ -156,8 +156,8 @@ STR_ABBREV_PLASTIC :{TINYFONT}ПМ
STR_ABBREV_FIZZY_DRINKS :{TINYFONT}ГН
STR_ABBREV_NONE :{TINYFONT}НЩ
STR_ABBREV_ALL :{TINYFONT}ВЧ
-STR_DATE_SHORT_WHITE :{WHITE}{DATE_SHORT}
-STR_DATE_LONG_WHITE :{WHITE}{DATE_LONG}
+STR_WHITE_DATE_SHORT :{WHITE}{DATE_SHORT}
+STR_WHITE_DATE_LONG :{WHITE}{DATE_LONG}
STR_SMALLMAP_CAPTION :{WHITE}Карта - {STRING}
STR_GAME_OPTIONS_CAPTION :{WHITE}Настройки
STR_ERROR_MESSAGE_CAPTION :{YELLOW}Съобщение
@@ -329,7 +329,6 @@ STR_SORT_BY_PRODUCTION :Продукц
STR_SORT_BY_TYPE :Вид
STR_SORT_BY_TRANSPORTED :Транспортирано
STR_SORT_BY_NAME :{BLACK}Име
-STR_SORT_BY_DROPDOWN_NAME :Име
STR_SORT_BY_DATE :{BLACK}Дата
STR_SORT_BY_NUMBER :Номер
STR_SORT_BY_PROFIT_LAST_YEAR :Чиста печалба миналата година
@@ -411,8 +410,8 @@ STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS :{BLACK}Пост
STR_TOOLBAR_TOOLTIP_PLANT_TREES_PLACE_SIGNS :{BLACK}Засади дървета, постави знаци и др.
STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION :{BLACK}Информация за земята
STR_TOOLBAR_TOOLTIP_OPTIONS :{BLACK}Настройки
-STR_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
-STR_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
+STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
+STR_BLACK_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
STR_ERROR_CAN_T_CHANGE_SERVICING :{WHITE}Интервала на техн. преглед не може да се промени...
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Затвори прозореца
STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Заглавие на прозорец - преместване на прозореца с мишката
@@ -582,12 +581,12 @@ STR_HIGHSCORE_NAME :{BIGFONT}{PRESI
STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA})
STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} достигна статус '{STRING}'!
STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} от {COMPANY} достигна статус '{STRING}'!
-STR_BLUE_NUMBER :{BLUE}{COMMA}
+STR_BLUE_COMMA :{BLUE}{COMMA}
STR_SCENEDIT_TOOLBAR_OPENTTD :{YELLOW}OpenTTD
STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR :{YELLOW}Редактор на сценарии
STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION :{WHITE}Генератор на терен
-STR_ARROW_UP :{BLACK}{UPARROW}
-STR_ARROW_DOWN :{BLACK}{DOWNARROW}
+STR_BLACK_ARROW_UP :{BLACK}{UPARROW}
+STR_BLACK_ARROW_DOWN :{BLACK}{DOWNARROW}
STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA :{BLACK}Увеличи площа на терена, за да го понижиш/повишиш
STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA :{BLACK}Намали площа на терена, за да го понижиш/повишиш
STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND :{BLACK}Генерирай случаен терен
@@ -670,7 +669,7 @@ STR_FULL :Пълно
STR_STATUSBAR_COMPANY_NAME :{SILVER}- - {COMPANY} - -
STR_BLACK_STRING :{BLACK}{STRING}
-STR_CHECKMARK :{CHECKMARK}
+STR_JUST_CHECKMARK :{CHECKMARK}
############ range for menu starts
STR_SETTINGS_MENU_GAME_OPTIONS :Игрови опции
STR_SETTINGS_MENU_DIFFICULTY_SETTINGS :Опции за трудност
@@ -777,8 +776,8 @@ STR_STATUSBAR_SAVING_GAME :{RED}* * ЗА
STR_SAVE_STILL_IN_PROGRESS :{WHITE}Записването продължава,{}моля изчакайте да сръши!
STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE :{BLACK}Избери програмата 'Ezy Street style music'
-STR_6 :{BLACK}6
-STR_7 :{BLACK}7
+STR_BLACK_6 :{BLACK}6
+STR_BLACK_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :английски (оригинални)
@@ -884,7 +883,7 @@ STR_CRATES :кратери
STR_RES_OTHER :друго
STR_NOTHING :
-STR_SMALL_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
+STR_TINY_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
STR_CANT_SHARE_ORDER_LIST :{WHITE}Не може да се споделя списъка със задачи...
STR_CANT_COPY_ORDER_LIST :{WHITE}Не може да се копира списъка от задачи...
@@ -1140,8 +1139,7 @@ STR_CONFIG_SETTING_MAP_Y :{LTBLUE}Y-ра
############ generic strings for settings
STR_CONFIG_SETTING_DISABLED :изключено
-STR_CONFIG_SETTING_INT32 :{NUM}
-STR_CONFIG_SETTING_CURRENCY :{CURRENCY}
+STR_JUST_CURRENCY :{CURRENCY}
STR_CONFIG_SETTING_QUERY_CAPT :{WHITE}Промяна стойноста на настройка
STR_TEMPERATE_LANDSCAPE :умерен климат
@@ -2102,8 +2100,8 @@ STR_NUM_LOW :малко
STR_NUM_NORMAL :нормално
STR_NUM_HIGH :голямо
STR_NUM_CUSTOM :Изборен
-STR_ARROW_LEFT_SMALL :{BLACK}{SMALLLEFTARROW}
-STR_ARROW_RIGHT_SMALL :{BLACK}{SMALLRIGHTARROW}
+STR_BLACK_SMALL_ARROW_LEFT :{BLACK}{SMALLLEFTARROW}
+STR_BLACK_SMALL_ARROW_RIGHT :{BLACK}{SMALLRIGHTARROW}
STR_AI_SPEED_VERY_SLOW :много бавно
STR_AI_SPEED_SLOW :бавно
STR_AI_SPEED_MEDIUM :средно
@@ -2845,7 +2843,7 @@ STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Фоку
STR_BUILD_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP :{BLACK}Списък с избор на МПС-та - натисни върху МПС за информация
STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_TOOLTIP :{BLACK}Купи посоченото МПС
STR_ARTICULATED_RV_CAPACITY :{BLACK}Капацитет: {LTBLUE}
-STR_BARE_CARGO :{CARGO}
+STR_JUST_CARGO :{CARGO}
STR_DEPOT_VEHICLE_TOOLTIP :{BLACK}{ENGINE}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CHAIN :{BLACK}{NUM} превозно средство{P о а}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CARGO :{}{CARGO} ({SHORTCARGO})
diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt
index 8cecec03d..bc9f87cbd 100644
--- a/src/lang/catalan.txt
+++ b/src/lang/catalan.txt
@@ -154,8 +154,8 @@ STR_ABBREV_PLASTIC :{TINYFONT}PL
STR_ABBREV_FIZZY_DRINKS :{TINYFONT}BG
STR_ABBREV_NONE :{TINYFONT}NO
STR_ABBREV_ALL :{TINYFONT}TOT
-STR_DATE_SHORT_WHITE :{WHITE}{DATE_SHORT}
-STR_DATE_LONG_WHITE :{WHITE}{DATE_LONG}
+STR_WHITE_DATE_SHORT :{WHITE}{DATE_SHORT}
+STR_WHITE_DATE_LONG :{WHITE}{DATE_LONG}
STR_SMALLMAP_CAPTION :{WHITE}Mapa - {STRING}
STR_GAME_OPTIONS_CAPTION :{WHITE}Opcions del Joc
STR_ERROR_MESSAGE_CAPTION :{YELLOW}Missatge
@@ -328,7 +328,6 @@ STR_SORT_BY_PRODUCTION :Producció
STR_SORT_BY_TYPE :Tipus
STR_SORT_BY_TRANSPORTED :Transportat
STR_SORT_BY_NAME :{BLACK}Nom
-STR_SORT_BY_DROPDOWN_NAME :Nom
STR_SORT_BY_DATE :{BLACK}Data
STR_SORT_BY_NUMBER :Número
STR_SORT_BY_PROFIT_LAST_YEAR :Benef. darrer any
@@ -410,8 +409,8 @@ STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS :{BLACK}Construe
STR_TOOLBAR_TOOLTIP_PLANT_TREES_PLACE_SIGNS :{BLACK}Planta arbres, situa senyals, etc.
STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION :{BLACK}Informació del terreny
STR_TOOLBAR_TOOLTIP_OPTIONS :{BLACK}Opcions
-STR_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
-STR_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
+STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
+STR_BLACK_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
STR_ERROR_CAN_T_CHANGE_SERVICING :{WHITE}No es pot canviar l'interval del manteniment...
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Tanca la finestra
STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Títol de la finestra - arrossega això per moure la finestra
@@ -581,12 +580,12 @@ STR_HIGHSCORE_NAME :{BIGFONT}{PRESI
STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA})
STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} assoleix l'estat '{STRING}' !
STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} de {COMPANY} assoleix l'estat '{STRING}' !
-STR_BLUE_NUMBER :{BLUE}{COMMA}
+STR_BLUE_COMMA :{BLUE}{COMMA}
STR_SCENEDIT_TOOLBAR_OPENTTD :{YELLOW}OpenTTD
STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR :{YELLOW}Editor d'Escenaris
STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION :{WHITE}Generador de Terreny
-STR_ARROW_UP :{BLACK}{UPARROW}
-STR_ARROW_DOWN :{BLACK}{DOWNARROW}
+STR_BLACK_ARROW_UP :{BLACK}{UPARROW}
+STR_BLACK_ARROW_DOWN :{BLACK}{DOWNARROW}
STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA :{BLACK}Augmenta la mida de l'àrea de terreny a rebaixar/elevar
STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA :{BLACK}Disminueix la mida de l'àrea de terreny a rebaixar/elevar
STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND :{BLACK}Genera un terreny aleatori
@@ -670,7 +669,7 @@ STR_FULL :Complet
STR_STATUSBAR_COMPANY_NAME :{SILVER}- - {COMPANY} - -
STR_BLACK_STRING :{BLACK}{STRING}
-STR_CHECKMARK :{CHECKMARK}
+STR_JUST_CHECKMARK :{CHECKMARK}
############ range for menu starts
STR_SETTINGS_MENU_GAME_OPTIONS :Opcions del Joc
STR_SETTINGS_MENU_DIFFICULTY_SETTINGS :Paràmetres de dificultat
@@ -775,8 +774,8 @@ STR_STATUSBAR_SAVING_GAME :{RED}* * DESA
STR_SAVE_STILL_IN_PROGRESS :{WHITE}S'està desant el joc,{}espera a que acabi l'operació!
STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE :{BLACK}Selecciona el programa 'Ezy Street style music'
-STR_6 :{BLACK}6
-STR_7 :{BLACK}7
+STR_BLACK_6 :{BLACK}6
+STR_BLACK_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :Anglès
@@ -884,7 +883,7 @@ STR_CRATES :palets
STR_RES_OTHER :altres
STR_NOTHING :
-STR_SMALL_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
+STR_TINY_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
STR_CANT_SHARE_ORDER_LIST :{WHITE}No es pot compartir la llista d'ordres...
STR_CANT_COPY_ORDER_LIST :{WHITE}No es pot copiar la llista d'ordres...
@@ -1157,8 +1156,7 @@ STR_CONFIG_SETTING_MAP_Y :{LTBLUE}Mida-Y
############ generic strings for settings
STR_CONFIG_SETTING_DISABLED :desactivat
-STR_CONFIG_SETTING_INT32 :{NUM}
-STR_CONFIG_SETTING_CURRENCY :{CURRENCY}
+STR_JUST_CURRENCY :{CURRENCY}
STR_CONFIG_SETTING_QUERY_CAPT :{WHITE}Canvia el valor de l'ajustament
STR_TEMPERATE_LANDSCAPE :paisatge temperat
@@ -2125,8 +2123,8 @@ STR_NUM_LOW :Baix
STR_NUM_NORMAL :Normal
STR_NUM_HIGH :Alt
STR_NUM_CUSTOM :Personalitzat
-STR_ARROW_LEFT_SMALL :{BLACK}{SMALLLEFTARROW}
-STR_ARROW_RIGHT_SMALL :{BLACK}{SMALLRIGHTARROW}
+STR_BLACK_SMALL_ARROW_LEFT :{BLACK}{SMALLLEFTARROW}
+STR_BLACK_SMALL_ARROW_RIGHT :{BLACK}{SMALLRIGHTARROW}
STR_AI_SPEED_VERY_SLOW :Molt lent
STR_AI_SPEED_SLOW :Lent
STR_AI_SPEED_MEDIUM :Mitjà
@@ -2876,7 +2874,7 @@ STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Centra l
STR_BUILD_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP :{BLACK}Llista de selecció de Vehicles - clica en un vehicle per més informació
STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_TOOLTIP :{BLACK}Construeix l'automòbil seleccionat
STR_ARTICULATED_RV_CAPACITY :{BLACK}Capacitat: {LTBLUE}
-STR_BARE_CARGO :{CARGO}
+STR_JUST_CARGO :{CARGO}
STR_DEPOT_VEHICLE_TOOLTIP :{BLACK}{ENGINE}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CHAIN :{BLACK}{NUM} vehicle{P "" s}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CARGO :{}{CARGO} ({SHORTCARGO})
diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt
index 9566e22de..41b3ddc32 100644
--- a/src/lang/croatian.txt
+++ b/src/lang/croatian.txt
@@ -219,8 +219,8 @@ STR_ABBREV_PLASTIC :{TINYFONT}PL
STR_ABBREV_FIZZY_DRINKS :{TINYFONT}GP
STR_ABBREV_NONE :{TINYFONT}NI
STR_ABBREV_ALL :{TINYFONT}SVE
-STR_DATE_SHORT_WHITE :{WHITE}{DATE_SHORT}
-STR_DATE_LONG_WHITE :{WHITE}{DATE_LONG}
+STR_WHITE_DATE_SHORT :{WHITE}{DATE_SHORT}
+STR_WHITE_DATE_LONG :{WHITE}{DATE_LONG}
STR_SMALLMAP_CAPTION :{WHITE}Karta - {STRING}
STR_GAME_OPTIONS_CAPTION :{WHITE}Postavke igre
STR_ERROR_MESSAGE_CAPTION :{YELLOW}Poruka
@@ -392,7 +392,6 @@ STR_SORT_BY_PRODUCTION :Proizvodnja
STR_SORT_BY_TYPE :Vrsta
STR_SORT_BY_TRANSPORTED :Prevezeno
STR_SORT_BY_NAME :{BLACK}Ime
-STR_SORT_BY_DROPDOWN_NAME :Ime
STR_SORT_BY_DATE :{BLACK}Datum
STR_SORT_BY_NUMBER :Broj
STR_SORT_BY_PROFIT_LAST_YEAR :Dobit prošle godine
@@ -472,8 +471,8 @@ STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS :{BLACK}Izgradi
STR_TOOLBAR_TOOLTIP_PLANT_TREES_PLACE_SIGNS :{BLACK}Posadi drveće, postavi znakove itd.
STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION :{BLACK}Podaci o zemlji
STR_TOOLBAR_TOOLTIP_OPTIONS :{BLACK}Postavke
-STR_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
-STR_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
+STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
+STR_BLACK_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
STR_ERROR_CAN_T_CHANGE_SERVICING :{WHITE}Nije moguće promijeniti servisni interval...
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Zatvori prozor
STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Naslov prozora - povuci ovo za micanje prozora
@@ -643,12 +642,12 @@ STR_HIGHSCORE_NAME :{BIGFONT}{PRESI
STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA})
STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BLACK}{BIGFONT}Tvrtka {COMPANY} postigla je status '{STRING}' !
STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} iz tvrtke {COMPANY} postigao je status '{STRING}' !
-STR_BLUE_NUMBER :{BLUE}{COMMA}
+STR_BLUE_COMMA :{BLUE}{COMMA}
STR_SCENEDIT_TOOLBAR_OPENTTD :{YELLOW}OpenTTD
STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR :{YELLOW}Uređivanje scenarija
STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION :{WHITE}Stvaranje zemljišta
-STR_ARROW_UP :{BLACK}{UPARROW}
-STR_ARROW_DOWN :{BLACK}{DOWNARROW}
+STR_BLACK_ARROW_UP :{BLACK}{UPARROW}
+STR_BLACK_ARROW_DOWN :{BLACK}{DOWNARROW}
STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA :{BLACK}Povećaj područje koje će biti povišeno/sniženo
STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA :{BLACK}Smanji područje koje će biti povišeno/sniženo
STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND :{BLACK}Napravi nasumično zemljište
@@ -732,7 +731,7 @@ STR_FULL :Puno
STR_STATUSBAR_COMPANY_NAME :{SILVER}- - {COMPANY} - -
STR_BLACK_STRING :{BLACK}{STRING}
-STR_CHECKMARK :{CHECKMARK}
+STR_JUST_CHECKMARK :{CHECKMARK}
############ range for menu starts
STR_SETTINGS_MENU_GAME_OPTIONS :Postavke igre
STR_SETTINGS_MENU_DIFFICULTY_SETTINGS :Postavke težine
@@ -840,8 +839,8 @@ STR_STATUSBAR_SAVING_GAME :{RED}* * SPRE
STR_SAVE_STILL_IN_PROGRESS :{WHITE}Spremanje još u tijeku,{}molimo pričekajte dok se ne završi!
STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE :{BLACK}Odaberi glazbeni program 'Ezy Street style'
-STR_6 :{BLACK}6
-STR_7 :{BLACK}7
+STR_BLACK_6 :{BLACK}6
+STR_BLACK_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :Engleski (original)
@@ -948,7 +947,7 @@ STR_CRATES :sanduci
STR_RES_OTHER :ostalo
STR_NOTHING :
-STR_SMALL_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
+STR_TINY_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
STR_CANT_SHARE_ORDER_LIST :{WHITE}Nije moguće dijeliti popis naredbi...
STR_CANT_COPY_ORDER_LIST :{WHITE}Nije moguće kopirati popis naredbi...
@@ -1216,8 +1215,7 @@ STR_CONFIG_SETTING_MAP_Y :{LTBLUE}Y veli
############ generic strings for settings
STR_CONFIG_SETTING_DISABLED :onemogućeno
-STR_CONFIG_SETTING_INT32 :{NUM}
-STR_CONFIG_SETTING_CURRENCY :{CURRENCY}
+STR_JUST_CURRENCY :{CURRENCY}
STR_CONFIG_SETTING_QUERY_CAPT :{WHITE}Promijeni vrijednost postavke
STR_TEMPERATE_LANDSCAPE :Blagi krajolik
@@ -2183,8 +2181,8 @@ STR_NUM_LOW :Nisko
STR_NUM_NORMAL :Normalno
STR_NUM_HIGH :Visoko
STR_NUM_CUSTOM :Proizvoljno
-STR_ARROW_LEFT_SMALL :{BLACK}{SMALLLEFTARROW}
-STR_ARROW_RIGHT_SMALL :{BLACK}{SMALLRIGHTARROW}
+STR_BLACK_SMALL_ARROW_LEFT :{BLACK}{SMALLLEFTARROW}
+STR_BLACK_SMALL_ARROW_RIGHT :{BLACK}{SMALLRIGHTARROW}
STR_AI_SPEED_VERY_SLOW :Vrlo sporo
STR_AI_SPEED_SLOW :Sporo
STR_AI_SPEED_MEDIUM :Umjereno
@@ -2921,7 +2919,7 @@ STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Centrira
STR_BUILD_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP :{BLACK}Popis izabranih cestovnih vozila - klikni na vozilo za informacije
STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_TOOLTIP :{BLACK}Izgradi označeno cestovno vozilo
STR_ARTICULATED_RV_CAPACITY :{BLACK}Nosivost: {LTBLUE}
-STR_BARE_CARGO :{CARGO}
+STR_JUST_CARGO :{CARGO}
STR_DEPOT_VEHICLE_TOOLTIP :{BLACK}{ENGINE}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CHAIN :{BLACK}{NUM} vozil{P o a a}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CARGO :{}{CARGO} ({SHORTCARGO})
diff --git a/src/lang/czech.txt b/src/lang/czech.txt
index 133d7770a..0e8bfe098 100644
--- a/src/lang/czech.txt
+++ b/src/lang/czech.txt
@@ -222,8 +222,8 @@ STR_ABBREV_PLASTIC :{TINYFONT}PL
STR_ABBREV_FIZZY_DRINKS :{TINYFONT}LI
STR_ABBREV_NONE :{TINYFONT}NIC
STR_ABBREV_ALL :{TINYFONT}VŠE
-STR_DATE_SHORT_WHITE :{WHITE}{DATE_SHORT}
-STR_DATE_LONG_WHITE :{WHITE}{DATE_LONG}
+STR_WHITE_DATE_SHORT :{WHITE}{DATE_SHORT}
+STR_WHITE_DATE_LONG :{WHITE}{DATE_LONG}
STR_SMALLMAP_CAPTION :{WHITE}Mapa - {STRING}
STR_GAME_OPTIONS_CAPTION :{WHITE}Možnosti hry
STR_ERROR_MESSAGE_CAPTION :{YELLOW}Zpráva
@@ -396,7 +396,6 @@ STR_SORT_BY_PRODUCTION :Prudukce
STR_SORT_BY_TYPE :Typu
STR_SORT_BY_TRANSPORTED :Přepraveno
STR_SORT_BY_NAME :{BLACK}Podle jména
-STR_SORT_BY_DROPDOWN_NAME :jména
STR_SORT_BY_DATE :{BLACK}Podle data
STR_SORT_BY_NUMBER :čísla
STR_SORT_BY_PROFIT_LAST_YEAR :hrubého zisku vloni
@@ -480,8 +479,8 @@ STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS :{BLACK}Stavět
STR_TOOLBAR_TOOLTIP_PLANT_TREES_PLACE_SIGNS :{BLACK}Vysadit stromy
STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION :{BLACK}Informace o zemi
STR_TOOLBAR_TOOLTIP_OPTIONS :{BLACK}Možnosti
-STR_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
-STR_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
+STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
+STR_BLACK_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
STR_ERROR_CAN_T_CHANGE_SERVICING :{WHITE}Nelze změnit interval oprav...
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Zavřít okno
STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Titulek okna - tahej pro posun okna
@@ -651,12 +650,12 @@ STR_HIGHSCORE_NAME :{BIGFONT}{PRESI
STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA})
STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} získal titul '{STRING}'!
STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} z {COMPANY} získal titul '{STRING}'!
-STR_BLUE_NUMBER :{BLUE}{COMMA}
+STR_BLUE_COMMA :{BLUE}{COMMA}
STR_SCENEDIT_TOOLBAR_OPENTTD :{YELLOW}OpenTTD
STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR :{YELLOW}Editor mapy
STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION :{WHITE}Generovat zemi
-STR_ARROW_UP :{BLACK}{UPARROW}
-STR_ARROW_DOWN :{BLACK}{DOWNARROW}
+STR_BLACK_ARROW_UP :{BLACK}{UPARROW}
+STR_BLACK_ARROW_DOWN :{BLACK}{DOWNARROW}
STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA :{BLACK}Zvětšit oblast země pro snížení/zvýšení
STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA :{BLACK}Zmenšit oblast země pro snížení/zvýšení
STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND :{BLACK}Generovat náhodnou zemi
@@ -740,7 +739,7 @@ STR_FULL :Plná
STR_STATUSBAR_COMPANY_NAME :{SILVER}- - {COMPANY} - -
STR_BLACK_STRING :{BLACK}{STRING}
-STR_CHECKMARK :{CHECKMARK}
+STR_JUST_CHECKMARK :{CHECKMARK}
############ range for menu starts
STR_SETTINGS_MENU_GAME_OPTIONS :Možnosti hry
STR_SETTINGS_MENU_DIFFICULTY_SETTINGS :Nastavení obtížnosti
@@ -845,8 +844,8 @@ STR_STATUSBAR_SAVING_GAME :{RED}* * UKL
STR_SAVE_STILL_IN_PROGRESS :{WHITE}Ukládání ještě běží,{}počkej prosím, než doběhne!
STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE :{BLACK}Zvolit 'Ezy Street style music' program
-STR_6 :{BLACK}6
-STR_7 :{BLACK}7
+STR_BLACK_6 :{BLACK}6
+STR_BLACK_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :Anglická (původní)
@@ -954,7 +953,7 @@ STR_CRATES :krabic
STR_RES_OTHER :Jiné
STR_NOTHING :
-STR_SMALL_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
+STR_TINY_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
STR_CANT_SHARE_ORDER_LIST :{WHITE}Nemůžu sdílet seznam příkazů...
STR_CANT_COPY_ORDER_LIST :{WHITE}Nemůžu kopírovat seznam příkazů...
@@ -1227,8 +1226,7 @@ STR_CONFIG_SETTING_MAP_Y :{LTBLUE}Výška
############ generic strings for settings
STR_CONFIG_SETTING_DISABLED :vypnuto
-STR_CONFIG_SETTING_INT32 :{NUM}
-STR_CONFIG_SETTING_CURRENCY :{CURRENCY}
+STR_JUST_CURRENCY :{CURRENCY}
STR_CONFIG_SETTING_QUERY_CAPT :{WHITE}Změnit hodnotu nastavení
STR_TEMPERATE_LANDSCAPE :krajina mírného pásma
@@ -2194,8 +2192,8 @@ STR_NUM_LOW :nízké
STR_NUM_NORMAL :střední
STR_NUM_HIGH :vysoké
STR_NUM_CUSTOM :vlastní
-STR_ARROW_LEFT_SMALL :{BLACK}{SMALLLEFTARROW}
-STR_ARROW_RIGHT_SMALL :{BLACK}{SMALLRIGHTARROW}
+STR_BLACK_SMALL_ARROW_LEFT :{BLACK}{SMALLLEFTARROW}
+STR_BLACK_SMALL_ARROW_RIGHT :{BLACK}{SMALLRIGHTARROW}
STR_AI_SPEED_VERY_SLOW :velmi nízká
STR_AI_SPEED_SLOW :nízká
STR_AI_SPEED_MEDIUM :střední
@@ -2881,7 +2879,7 @@ STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT :{WHITE}... mus
STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT :{WHITE}Nemohu najít místní garáž
STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP :{BLACK}Otoč vozidlo
STR_ARTICULATED_RV_CAPACITY :{BLACK}Kapacita: {LTBLUE}
-STR_BARE_CARGO :{CARGO}
+STR_JUST_CARGO :{CARGO}
STR_DEPOT_VEHICLE_TOOLTIP :{BLACK}{ENGINE}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CHAIN :{BLACK}{NUM} vozid{P lo la el}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CARGO :{}{CARGO} ({SHORTCARGO})
diff --git a/src/lang/danish.txt b/src/lang/danish.txt
index bafde515a..876a2a1c5 100644
--- a/src/lang/danish.txt
+++ b/src/lang/danish.txt
@@ -154,8 +154,8 @@ STR_ABBREV_PLASTIC :{TINYFONT}PL
STR_ABBREV_FIZZY_DRINKS :{TINYFONT}SV
STR_ABBREV_NONE :{TINYFONT}INT
STR_ABBREV_ALL :{TINYFONT}ALT
-STR_DATE_SHORT_WHITE :{WHITE}{DATE_SHORT}
-STR_DATE_LONG_WHITE :{WHITE}{DATE_LONG}
+STR_WHITE_DATE_SHORT :{WHITE}{DATE_SHORT}
+STR_WHITE_DATE_LONG :{WHITE}{DATE_LONG}
STR_SMALLMAP_CAPTION :{WHITE}Kort - {STRING}
STR_GAME_OPTIONS_CAPTION :{WHITE}Spilvalg
STR_ERROR_MESSAGE_CAPTION :{YELLOW}Besked
@@ -328,7 +328,6 @@ STR_SORT_BY_PRODUCTION :Produktion
STR_SORT_BY_TYPE :Type
STR_SORT_BY_TRANSPORTED :Transporteret
STR_SORT_BY_NAME :{BLACK}Navn
-STR_SORT_BY_DROPDOWN_NAME :Navn
STR_SORT_BY_DATE :{BLACK}Dato
STR_SORT_BY_NUMBER :Nummer
STR_SORT_BY_PROFIT_LAST_YEAR :Afkast sidste år
@@ -410,8 +409,8 @@ STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS :{BLACK}Byg luft
STR_TOOLBAR_TOOLTIP_PLANT_TREES_PLACE_SIGNS :{BLACK}Plant træer, placér skilte osv.
STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION :{BLACK}Landområde information
STR_TOOLBAR_TOOLTIP_OPTIONS :{BLACK}Valg
-STR_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
-STR_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
+STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
+STR_BLACK_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
STR_ERROR_CAN_T_CHANGE_SERVICING :{WHITE}Kan ikke ændre serviceinterval...
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Luk vindue
STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Vinduestitel - træk her for at flytte vinduet
@@ -581,12 +580,12 @@ STR_HIGHSCORE_NAME :{BIGFONT}{PRESI
STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA})
STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} får '{STRING}' status!
STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} fra {COMPANY} får '{STRING}' status!
-STR_BLUE_NUMBER :{BLUE}{COMMA}
+STR_BLUE_COMMA :{BLUE}{COMMA}
STR_SCENEDIT_TOOLBAR_OPENTTD :{YELLOW}OpenTTD
STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR :{YELLOW}Scenarieeditor
STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION :{WHITE}Land-generering
-STR_ARROW_UP :{BLACK}{UPARROW}
-STR_ARROW_DOWN :{BLACK}{DOWNARROW}
+STR_BLACK_ARROW_UP :{BLACK}{UPARROW}
+STR_BLACK_ARROW_DOWN :{BLACK}{DOWNARROW}
STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA :{BLACK}Forstør landområdet der skal sænkes/hæves
STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA :{BLACK}Formindsk landområdet der skal sænkes/hæves
STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND :{BLACK}Generer tilfældigt land
@@ -670,7 +669,7 @@ STR_FULL :Fuld
STR_STATUSBAR_COMPANY_NAME :{SILVER}- - {COMPANY} - -
STR_BLACK_STRING :{BLACK}{STRING}
-STR_CHECKMARK :{CHECKMARK}
+STR_JUST_CHECKMARK :{CHECKMARK}
############ range for menu starts
STR_SETTINGS_MENU_GAME_OPTIONS :Spilvalg
STR_SETTINGS_MENU_DIFFICULTY_SETTINGS :Sværhedsgrad
@@ -775,8 +774,8 @@ STR_STATUSBAR_SAVING_GAME :{RED}* * GEMM
STR_SAVE_STILL_IN_PROGRESS :{WHITE}Gemmer stadig,{}vent venligst!
STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE :{BLACK}Vælg 'Ezy Street musik' program
-STR_6 :{BLACK}6
-STR_7 :{BLACK}7
+STR_BLACK_6 :{BLACK}6
+STR_BLACK_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :Engelske
@@ -884,7 +883,7 @@ STR_CRATES :kasser
STR_RES_OTHER :andet
STR_NOTHING :
-STR_SMALL_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
+STR_TINY_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
STR_CANT_SHARE_ORDER_LIST :{WHITE}Kan ikke dele ordreliste...
STR_CANT_COPY_ORDER_LIST :{WHITE}Kan ikke kopiere ordreliste...
@@ -1157,8 +1156,7 @@ STR_CONFIG_SETTING_MAP_Y :{LTBLUE}Y-stør
############ generic strings for settings
STR_CONFIG_SETTING_DISABLED :deaktiveret
-STR_CONFIG_SETTING_INT32 :{NUM}
-STR_CONFIG_SETTING_CURRENCY :{CURRENCY}
+STR_JUST_CURRENCY :{CURRENCY}
STR_CONFIG_SETTING_QUERY_CAPT :{WHITE}Skift indstillingsværdi
STR_TEMPERATE_LANDSCAPE :Tempereret klima
@@ -2124,8 +2122,8 @@ STR_NUM_LOW :Lav
STR_NUM_NORMAL :Normal
STR_NUM_HIGH :Høj
STR_NUM_CUSTOM :Brugerdefineret
-STR_ARROW_LEFT_SMALL :{BLACK}{SMALLLEFTARROW}
-STR_ARROW_RIGHT_SMALL :{BLACK}{SMALLRIGHTARROW}
+STR_BLACK_SMALL_ARROW_LEFT :{BLACK}{SMALLLEFTARROW}
+STR_BLACK_SMALL_ARROW_RIGHT :{BLACK}{SMALLRIGHTARROW}
STR_AI_SPEED_VERY_SLOW :Meget langsom
STR_AI_SPEED_SLOW :Langsom
STR_AI_SPEED_MEDIUM :Mellem
@@ -2875,7 +2873,7 @@ STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Centrer
STR_BUILD_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP :{BLACK}Liste over køretøjstyper - klik på køretøj for information
STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_TOOLTIP :{BLACK}Byg det markerede køretøj
STR_ARTICULATED_RV_CAPACITY :{BLACK}Kapacitet: {LTBLUE}
-STR_BARE_CARGO :{CARGO}
+STR_JUST_CARGO :{CARGO}
STR_DEPOT_VEHICLE_TOOLTIP :{BLACK}{ENGINE}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CHAIN :{BLACK}{NUM} køretøj{P "" er}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CARGO :{}{CARGO} ({SHORTCARGO})
diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt
index 4f6c0753b..99e64e4bd 100644
--- a/src/lang/dutch.txt
+++ b/src/lang/dutch.txt
@@ -154,8 +154,8 @@ STR_ABBREV_PLASTIC :{TINYFONT}PL
STR_ABBREV_FIZZY_DRINKS :{TINYFONT}FR
STR_ABBREV_NONE :{TINYFONT}NEE
STR_ABBREV_ALL :{TINYFONT}ALLES
-STR_DATE_SHORT_WHITE :{WHITE}{DATE_SHORT}
-STR_DATE_LONG_WHITE :{WHITE}{DATE_LONG}
+STR_WHITE_DATE_SHORT :{WHITE}{DATE_SHORT}
+STR_WHITE_DATE_LONG :{WHITE}{DATE_LONG}
STR_SMALLMAP_CAPTION :{WHITE}Kaart - {STRING}
STR_GAME_OPTIONS_CAPTION :{WHITE}Spelopties
STR_ERROR_MESSAGE_CAPTION :{YELLOW}Bericht
@@ -328,7 +328,6 @@ STR_SORT_BY_PRODUCTION :Productie
STR_SORT_BY_TYPE :Soort
STR_SORT_BY_TRANSPORTED :Vervoerd
STR_SORT_BY_NAME :{BLACK}Naam
-STR_SORT_BY_DROPDOWN_NAME :Naam
STR_SORT_BY_DATE :{BLACK}Datum
STR_SORT_BY_NUMBER :Nummer
STR_SORT_BY_PROFIT_LAST_YEAR :Winst vorig jaar
@@ -412,8 +411,8 @@ STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS :{BLACK}Bouw vli
STR_TOOLBAR_TOOLTIP_PLANT_TREES_PLACE_SIGNS :{BLACK}Plaats bomen, borden, etc.
STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION :{BLACK}Landinformatie
STR_TOOLBAR_TOOLTIP_OPTIONS :{BLACK}Opties
-STR_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
-STR_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
+STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
+STR_BLACK_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
STR_ERROR_CAN_T_CHANGE_SERVICING :{WHITE}Kan onderhoudsinterval niet aanpassen...
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Sluit venster
STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Vensternaam - sleep om venster te verplaatsen
@@ -583,12 +582,12 @@ STR_HIGHSCORE_NAME :{BIGFONT}{PRESI
STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA})
STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} bereikt '{STRING}' status!
STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} van {COMPANY} bereikt '{STRING}' status!
-STR_BLUE_NUMBER :{BLUE}{COMMA}
+STR_BLUE_COMMA :{BLUE}{COMMA}
STR_SCENEDIT_TOOLBAR_OPENTTD :{YELLOW}OpenTTD
STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR :{YELLOW}Scenario-editor
STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION :{WHITE}Landontwikkeling
-STR_ARROW_UP :{BLACK}{UPARROW}
-STR_ARROW_DOWN :{BLACK}{DOWNARROW}
+STR_BLACK_ARROW_UP :{BLACK}{UPARROW}
+STR_BLACK_ARROW_DOWN :{BLACK}{DOWNARROW}
STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA :{BLACK}Vergroot het stuk land om te verhogen/verlagen
STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA :{BLACK}Verklein het stuk land om te verhogen/verlagen
STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND :{BLACK}Genereer willekeurig land
@@ -672,7 +671,7 @@ STR_FULL :Volledig
STR_STATUSBAR_COMPANY_NAME :{SILVER}- - {COMPANY} - -
STR_BLACK_STRING :{BLACK}{STRING}
-STR_CHECKMARK :{CHECKMARK}
+STR_JUST_CHECKMARK :{CHECKMARK}
############ range for menu starts
STR_SETTINGS_MENU_GAME_OPTIONS :Spelopties
STR_SETTINGS_MENU_DIFFICULTY_SETTINGS :Moeilijkheidsgraad
@@ -777,8 +776,8 @@ STR_STATUSBAR_SAVING_GAME :{RED}* * SPEL
STR_SAVE_STILL_IN_PROGRESS :{WHITE}Opslaan van spel is nog bezig,{}Wacht tot dit voltooid is!
STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE :{BLACK}Kies 'Ezy Street style music' programma
-STR_6 :{BLACK}6
-STR_7 :{BLACK}7
+STR_BLACK_6 :{BLACK}6
+STR_BLACK_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :Engels (Origineel)
@@ -886,7 +885,7 @@ STR_CRATES :kratten
STR_RES_OTHER :anders
STR_NOTHING :
-STR_SMALL_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
+STR_TINY_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
STR_CANT_SHARE_ORDER_LIST :{WHITE}Kan orderlijst niet delen...
STR_CANT_COPY_ORDER_LIST :{WHITE}Kan orderlijst niet kopiëren...
@@ -1159,8 +1158,7 @@ STR_CONFIG_SETTING_MAP_Y :{LTBLUE}Y-groot
############ generic strings for settings
STR_CONFIG_SETTING_DISABLED :uitgeschakeld
-STR_CONFIG_SETTING_INT32 :{NUM}
-STR_CONFIG_SETTING_CURRENCY :{CURRENCY}
+STR_JUST_CURRENCY :{CURRENCY}
STR_CONFIG_SETTING_QUERY_CAPT :{WHITE}Verander waarde
STR_TEMPERATE_LANDSCAPE :gematigd landschap
@@ -2126,8 +2124,8 @@ STR_NUM_LOW :Laag
STR_NUM_NORMAL :Normaal
STR_NUM_HIGH :Hoog
STR_NUM_CUSTOM :Aangepast
-STR_ARROW_LEFT_SMALL :{BLACK}{SMALLLEFTARROW}
-STR_ARROW_RIGHT_SMALL :{BLACK}{SMALLRIGHTARROW}
+STR_BLACK_SMALL_ARROW_LEFT :{BLACK}{SMALLLEFTARROW}
+STR_BLACK_SMALL_ARROW_RIGHT :{BLACK}{SMALLRIGHTARROW}
STR_AI_SPEED_VERY_SLOW :Erg langzaam
STR_AI_SPEED_SLOW :Langzaam
STR_AI_SPEED_MEDIUM :Gemiddeld
@@ -2808,7 +2806,7 @@ STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT :{WHITE}...moet
STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT :{WHITE}Kan geen lokaal depot vinden
STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP :{BLACK}Dwing het voertuig om om te draaien
STR_ARTICULATED_RV_CAPACITY :{BLACK}Capaciteit: {LTBLUE}
-STR_BARE_CARGO :{CARGO}
+STR_JUST_CARGO :{CARGO}
STR_DEPOT_VEHICLE_TOOLTIP :{BLACK}{ENGINE}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CHAIN :{BLACK}{NUM} voertuig{P "" en}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CARGO :{}{CARGO} ({SHORTCARGO})
diff --git a/src/lang/english.txt b/src/lang/english.txt
index 0547e3439..d132a4071 100644
--- a/src/lang/english.txt
+++ b/src/lang/english.txt
@@ -154,8 +154,6 @@ STR_ABBREV_PLASTIC :{TINYFONT}PL
STR_ABBREV_FIZZY_DRINKS :{TINYFONT}FZ
STR_ABBREV_NONE :{TINYFONT}NO
STR_ABBREV_ALL :{TINYFONT}ALL
-STR_DATE_SHORT_WHITE :{WHITE}{DATE_SHORT}
-STR_DATE_LONG_WHITE :{WHITE}{DATE_LONG}
STR_SMALLMAP_CAPTION :{WHITE}Map - {STRING}
STR_GAME_OPTIONS_CAPTION :{WHITE}Game Options
STR_ERROR_MESSAGE_CAPTION :{YELLOW}Message
@@ -167,17 +165,11 @@ STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Original
STR_ABOUT_VERSION :{BLACK}OpenTTD version {REV}
STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2009 The OpenTTD team
-STR_BLACK_CROSS :{BLACK}{CROSS}
-STR_SILVER_CROSS :{SILVER}{CROSS}
STR_QUIT_CAPTION :{WHITE}Quit
STR_YES :{BLACK}Yes
STR_NO :{BLACK}No
STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Are you sure you want to exit OpenTTD and return to {STRING}?
-STR_BLACK_1 :{BLACK}1
-STR_BLACK_2 :{BLACK}2
-STR_BLACK_3 :{BLACK}3
-STR_BLACK_4 :{BLACK}4
-STR_BLACK_5 :{BLACK}5
+
STR_JUST_NOTHING :Nothing
STR_COLOUR_DARK_BLUE :Dark Blue
STR_COLOUR_PALE_GREEN :Pale Green
@@ -196,8 +188,6 @@ STR_COLOUR_BROWN :Brown
STR_COLOUR_GREY :Grey
STR_COLOUR_WHITE :White
STR_ERROR_TOO_MANY_VEHICLES_IN_GAME :{WHITE}Too many vehicles in game
-STR_BLACK_COMMA :{BLACK}{COMMA}
-STR_RED_COMMA :{RED}{COMMA}
STR_BUTTON_LOCATION :{BLACK}Location
STR_SMALLMAP_TYPE_CONTOURS :Contours
STR_SMALLMAP_TYPE_VEHICLES :Vehicles
@@ -323,13 +313,13 @@ STR_SORT_CRITERIA_TIP :{BLACK}Select s
STR_FILTER_CRITERIA_TIP :{BLACK}Select filtering criteria
STR_SORT_BY :{BLACK}Sort by
+### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
STR_SORT_BY_POPULATION :{BLACK}Population
+STR_SORT_BY_NAME :{BLACK}Name
+STR_SORT_BY_DATE :{BLACK}Date
STR_SORT_BY_PRODUCTION :Production
STR_SORT_BY_TYPE :Type
STR_SORT_BY_TRANSPORTED :Transported
-STR_SORT_BY_NAME :{BLACK}Name
-STR_SORT_BY_DROPDOWN_NAME :Name
-STR_SORT_BY_DATE :{BLACK}Date
STR_SORT_BY_NUMBER :Number
STR_SORT_BY_PROFIT_LAST_YEAR :Profit last year
STR_SORT_BY_PROFIT_THIS_YEAR :Profit this year
@@ -352,6 +342,7 @@ STR_SORT_BY_INTRO_DATE :Introduction Da
STR_SORT_BY_RUNNING_COST :Running Cost
STR_SORT_BY_POWER_VS_RUNNING_COST :Power/Running Cost
STR_SORT_BY_CARGO_CAPACITY :Cargo Capacity
+
STR_NO_WAITING_CARGO :{BLACK}No cargo of any type is waiting
STR_SELECT_ALL_FACILITIES :{BLACK}Select all facilities
STR_SELECT_ALL_TYPES :{BLACK}Select all cargo types (including no waiting cargo)
@@ -371,21 +362,6 @@ STR_SEND_ROAD_VEHICLE_TO_DEPOT :Send to Depot
STR_SEND_SHIP_TO_DEPOT :Send to Depot
STR_SEND_AIRCRAFT_TO_HANGAR :Send to Hangar
-############ range for months starts
-STR_MONTH_ABBREV_JAN :Jan
-STR_MONTH_ABBREV_FEB :Feb
-STR_MONTH_ABBREV_MAR :Mar
-STR_MONTH_ABBREV_APR :Apr
-STR_MONTH_ABBREV_MAY :May
-STR_MONTH_ABBREV_JUN :Jun
-STR_MONTH_ABBREV_JUL :Jul
-STR_MONTH_ABBREV_AUG :Aug
-STR_MONTH_ABBREV_SEP :Sep
-STR_MONTH_ABBREV_OCT :Oct
-STR_MONTH_ABBREV_NOV :Nov
-STR_MONTH_ABBREV_DEC :Dec
-############ range for months ends
-
STR_GRAPH_X_LABEL_MONTH :{TINYFONT}{STRING}{} {STRING}
STR_GRAPH_X_LABEL_MONTH_YEAR :{TINYFONT}{STRING}{} {STRING}{}{NUM}
STR_GRAPH_Y_LABEL :{TINYFONT}{STRING2}-
@@ -412,8 +388,6 @@ STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS :{BLACK}Build ai
STR_TOOLBAR_TOOLTIP_PLANT_TREES_PLACE_SIGNS :{BLACK}Plant trees, place signs etc.
STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION :{BLACK}Land area information
STR_TOOLBAR_TOOLTIP_OPTIONS :{BLACK}Options
-STR_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
-STR_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
STR_ERROR_CAN_T_CHANGE_SERVICING :{WHITE}Can't change servicing interval...
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Close window
STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Window title - drag this to move window
@@ -460,7 +434,7 @@ STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE :None
STR_VEHICLE_NAME_BUTTON :{BLACK}Name
STR_VEHICLE_NAME_SMALL :{BLACK}{TINYFONT}{VEHICLE}
-############ range for days starts
+############ range for days starts (also used for the place in the highscore window)
STR_ORDINAL_NUMBER_1ST :1st
STR_ORDINAL_NUMBER_2ND :2nd
STR_ORDINAL_NUMBER_3RD :3rd
@@ -494,6 +468,34 @@ STR_ORDINAL_NUMBER_30TH :30th
STR_ORDINAL_NUMBER_31ST :31st
############ range for days ends
+############ range for months starts
+STR_MONTH_ABBREV_JAN :Jan
+STR_MONTH_ABBREV_FEB :Feb
+STR_MONTH_ABBREV_MAR :Mar
+STR_MONTH_ABBREV_APR :Apr
+STR_MONTH_ABBREV_MAY :May
+STR_MONTH_ABBREV_JUN :Jun
+STR_MONTH_ABBREV_JUL :Jul
+STR_MONTH_ABBREV_AUG :Aug
+STR_MONTH_ABBREV_SEP :Sep
+STR_MONTH_ABBREV_OCT :Oct
+STR_MONTH_ABBREV_NOV :Nov
+STR_MONTH_ABBREV_DEC :Dec
+
+STR_MONTH_JAN :January
+STR_MONTH_FEB :February
+STR_MONTH_MAR :March
+STR_MONTH_APR :April
+STR_MONTH_MAY :May
+STR_MONTH_JUN :June
+STR_MONTH_JUL :July
+STR_MONTH_AUG :August
+STR_MONTH_SEP :September
+STR_MONTH_OCT :October
+STR_MONTH_NOV :November
+STR_MONTH_DEC :December
+############ range for months ends
+
STR_GRAPH_Y_LABEL_NUMBER :{TINYFONT}{COMMA}
STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED :{BLACK}Cargo accepted: {LTBLUE}
@@ -583,12 +585,9 @@ STR_HIGHSCORE_NAME :{BIGFONT}{PRESI
STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA})
STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} achieves '{STRING}' status!
STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} of {COMPANY} achieves '{STRING}' status!
-STR_BLUE_NUMBER :{BLUE}{COMMA}
STR_SCENEDIT_TOOLBAR_OPENTTD :{YELLOW}OpenTTD
STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR :{YELLOW}Scenario Editor
STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION :{WHITE}Land Generation
-STR_ARROW_UP :{BLACK}{UPARROW}
-STR_ARROW_DOWN :{BLACK}{DOWNARROW}
STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA :{BLACK}Increase area of land to lower/raise
STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA :{BLACK}Decrease area of land to lower/raise
STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND :{BLACK}Generate random land
@@ -670,9 +669,7 @@ STR_OFF :Off
STR_SUMMARY :Summary
STR_FULL :Full
STR_STATUSBAR_COMPANY_NAME :{SILVER}- - {COMPANY} - -
-STR_BLACK_STRING :{BLACK}{STRING}
-STR_CHECKMARK :{CHECKMARK}
############ range for menu starts
STR_SETTINGS_MENU_GAME_OPTIONS :Game options
STR_SETTINGS_MENU_DIFFICULTY_SETTINGS :Difficulty settings
@@ -777,9 +774,6 @@ STR_STATUSBAR_SAVING_GAME :{RED}* * SAVI
STR_SAVE_STILL_IN_PROGRESS :{WHITE}Saving still in progress,{}please wait until it is finished!
STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE :{BLACK}Select 'Ezy Street style music' programme
-STR_6 :{BLACK}6
-STR_7 :{BLACK}7
-
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :English (Original)
STR_TOWNNAME_FRENCH :French
@@ -859,19 +853,6 @@ STR_OPTIONS_BASE_GRF_DESCRIPTION_TIP :{BLACK}Addition
STR_AUTOSAVE_FAILED :{WHITE}Autosave failed
-STR_MONTH_JAN :January
-STR_MONTH_FEB :February
-STR_MONTH_MAR :March
-STR_MONTH_APR :April
-STR_MONTH_MAY :May
-STR_MONTH_JUN :June
-STR_MONTH_JUL :July
-STR_MONTH_AUG :August
-STR_MONTH_SEP :September
-STR_MONTH_OCT :October
-STR_MONTH_NOV :November
-STR_MONTH_DEC :December
-
STR_HEADING_FOR_STATION :{LTBLUE}Heading for {STATION}
STR_HEADING_FOR_STATION_VEL :{LTBLUE}Heading for {STATION}, {VELOCITY}
STR_NO_ORDERS :{LTBLUE}No orders
@@ -886,8 +867,6 @@ STR_CRATES :crates
STR_RES_OTHER :other
STR_NOTHING :
-STR_SMALL_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
-
STR_CANT_SHARE_ORDER_LIST :{WHITE}Can't share order list...
STR_CANT_COPY_ORDER_LIST :{WHITE}Can't copy order list...
STR_END_OF_SHARED_ORDERS :{SETX 10}- - End of Shared Orders - -
@@ -1159,8 +1138,6 @@ STR_CONFIG_SETTING_MAP_Y :{LTBLUE}Y-size
############ generic strings for settings
STR_CONFIG_SETTING_DISABLED :disabled
-STR_CONFIG_SETTING_INT32 :{NUM}
-STR_CONFIG_SETTING_CURRENCY :{CURRENCY}
STR_CONFIG_SETTING_QUERY_CAPT :{WHITE}Change setting value
STR_TEMPERATE_LANDSCAPE :Temperate landscape
@@ -2126,8 +2103,6 @@ STR_NUM_LOW :Low
STR_NUM_NORMAL :Normal
STR_NUM_HIGH :High
STR_NUM_CUSTOM :Custom
-STR_ARROW_LEFT_SMALL :{BLACK}{SMALLLEFTARROW}
-STR_ARROW_RIGHT_SMALL :{BLACK}{SMALLRIGHTARROW}
STR_AI_SPEED_VERY_SLOW :Very Slow
STR_AI_SPEED_SLOW :Slow
STR_AI_SPEED_MEDIUM :Medium
@@ -2808,7 +2783,6 @@ STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT :{WHITE}...must
STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT :{WHITE}Unable to find local depot
STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP :{BLACK}Force vehicle to turn around
STR_ARTICULATED_RV_CAPACITY :{BLACK}Capacity: {LTBLUE}
-STR_BARE_CARGO :{CARGO}
STR_DEPOT_VEHICLE_TOOLTIP :{BLACK}{ENGINE}{RAW_STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CHAIN :{BLACK}{NUM} vehicle{P "" s}{RAW_STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CARGO :{}{CARGO} ({SHORTCARGO})
@@ -3474,7 +3448,10 @@ STR_TOWN_NAME :{TOWN}
STR_VEHICLE_NAME :{VEHICLE}
STR_WAYPOINT_NAME :{WAYPOINT}
+STR_JUST_CARGO :{CARGO}
+STR_JUST_CHECKMARK :{CHECKMARK}
STR_JUST_COMMA :{COMMA}
+STR_JUST_CURRENCY :{CURRENCY}
STR_JUST_INT :{NUM}
STR_JUST_DATE_TINY :{DATE_TINY}
STR_JUST_DATE_SHORT :{DATE_SHORT}
@@ -3492,6 +3469,31 @@ STR_FORMAT_COMPANY_NUM :(Company {COMMA
STR_FORMAT_GROUP_NAME :Group {COMMA}
STR_FORMAT_INDUSTRY_NAME :{TOWN} {STRING}
+STR_BLACK_ARROW_DOWN :{BLACK}{DOWNARROW}
+STR_BLACK_ARROW_UP :{BLACK}{UPARROW}
+STR_BLACK_COMMA :{BLACK}{COMMA}
+STR_BLUE_COMMA :{BLUE}{COMMA}
+STR_RED_COMMA :{RED}{COMMA}
+STR_BLACK_CROSS :{BLACK}{CROSS}
+STR_SILVER_CROSS :{SILVER}{CROSS}
+STR_WHITE_DATE_SHORT :{WHITE}{DATE_SHORT}
+STR_WHITE_DATE_LONG :{WHITE}{DATE_LONG}
+STR_BLACK_STRING :{BLACK}{STRING}
+
+STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
+STR_BLACK_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
+STR_TINY_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
+STR_BLACK_SMALL_ARROW_LEFT :{BLACK}{SMALLLEFTARROW}
+STR_BLACK_SMALL_ARROW_RIGHT :{BLACK}{SMALLRIGHTARROW}
+
+STR_BLACK_1 :{BLACK}1
+STR_BLACK_2 :{BLACK}2
+STR_BLACK_3 :{BLACK}3
+STR_BLACK_4 :{BLACK}4
+STR_BLACK_5 :{BLACK}5
+STR_BLACK_6 :{BLACK}6
+STR_BLACK_7 :{BLACK}7
+
STR_NAME_MUST_BE_UNIQUE :{WHITE}Name must be unique
#### Improved sign GUI
diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt
index ceb91ee9b..32b3842bd 100644
--- a/src/lang/english_US.txt
+++ b/src/lang/english_US.txt
@@ -154,8 +154,8 @@ STR_ABBREV_PLASTIC :{TINYFONT}PL
STR_ABBREV_FIZZY_DRINKS :{TINYFONT}FZ
STR_ABBREV_NONE :{TINYFONT}NO
STR_ABBREV_ALL :{TINYFONT}ALL
-STR_DATE_SHORT_WHITE :{WHITE}{DATE_SHORT}
-STR_DATE_LONG_WHITE :{WHITE}{DATE_LONG}
+STR_WHITE_DATE_SHORT :{WHITE}{DATE_SHORT}
+STR_WHITE_DATE_LONG :{WHITE}{DATE_LONG}
STR_SMALLMAP_CAPTION :{WHITE}Map - {STRING}
STR_GAME_OPTIONS_CAPTION :{WHITE}Game Options
STR_ERROR_MESSAGE_CAPTION :{YELLOW}Message
@@ -328,7 +328,6 @@ STR_SORT_BY_PRODUCTION :Production
STR_SORT_BY_TYPE :Type
STR_SORT_BY_TRANSPORTED :Transported
STR_SORT_BY_NAME :{BLACK}Name
-STR_SORT_BY_DROPDOWN_NAME :Name
STR_SORT_BY_DATE :{BLACK}Date
STR_SORT_BY_NUMBER :Number
STR_SORT_BY_PROFIT_LAST_YEAR :Profit last year
@@ -412,8 +411,8 @@ STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS :{BLACK}Build ai
STR_TOOLBAR_TOOLTIP_PLANT_TREES_PLACE_SIGNS :{BLACK}Plant trees, place signs etc.
STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION :{BLACK}Land area information
STR_TOOLBAR_TOOLTIP_OPTIONS :{BLACK}Options
-STR_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
-STR_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
+STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
+STR_BLACK_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
STR_ERROR_CAN_T_CHANGE_SERVICING :{WHITE}Can't change servicing interval...
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Close window
STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Window title - drag this to move window
@@ -583,12 +582,12 @@ STR_HIGHSCORE_NAME :{BIGFONT}{PRESI
STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA})
STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} achieves '{STRING}' status!
STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} of {COMPANY} achieves '{STRING}' status!
-STR_BLUE_NUMBER :{BLUE}{COMMA}
+STR_BLUE_COMMA :{BLUE}{COMMA}
STR_SCENEDIT_TOOLBAR_OPENTTD :{YELLOW}OpenTTD
STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR :{YELLOW}Scenario Editor
STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION :{WHITE}Land Generation
-STR_ARROW_UP :{BLACK}{UPARROW}
-STR_ARROW_DOWN :{BLACK}{DOWNARROW}
+STR_BLACK_ARROW_UP :{BLACK}{UPARROW}
+STR_BLACK_ARROW_DOWN :{BLACK}{DOWNARROW}
STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA :{BLACK}Increase area of land to lower/raise
STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA :{BLACK}Decrease area of land to lower/raise
STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND :{BLACK}Generate random land
@@ -672,7 +671,7 @@ STR_FULL :Full
STR_STATUSBAR_COMPANY_NAME :{SILVER}- - {COMPANY} - -
STR_BLACK_STRING :{BLACK}{STRING}
-STR_CHECKMARK :{CHECKMARK}
+STR_JUST_CHECKMARK :{CHECKMARK}
############ range for menu starts
STR_SETTINGS_MENU_GAME_OPTIONS :Game options
STR_SETTINGS_MENU_DIFFICULTY_SETTINGS :Difficulty settings
@@ -777,8 +776,8 @@ STR_STATUSBAR_SAVING_GAME :{RED}* * SAVI
STR_SAVE_STILL_IN_PROGRESS :{WHITE}Saving still in progress,{}please wait until it is finished!
STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE :{BLACK}Select 'Ezy Street style music' program
-STR_6 :{BLACK}6
-STR_7 :{BLACK}7
+STR_BLACK_6 :{BLACK}6
+STR_BLACK_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :English (Original)
@@ -886,7 +885,7 @@ STR_CRATES :crates
STR_RES_OTHER :other
STR_NOTHING :
-STR_SMALL_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
+STR_TINY_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
STR_CANT_SHARE_ORDER_LIST :{WHITE}Can't share order list...
STR_CANT_COPY_ORDER_LIST :{WHITE}Can't copy order list...
@@ -1159,8 +1158,7 @@ STR_CONFIG_SETTING_MAP_Y :{LTBLUE}Y-size
############ generic strings for settings
STR_CONFIG_SETTING_DISABLED :disabled
-STR_CONFIG_SETTING_INT32 :{NUM}
-STR_CONFIG_SETTING_CURRENCY :{CURRENCY}
+STR_JUST_CURRENCY :{CURRENCY}
STR_CONFIG_SETTING_QUERY_CAPT :{WHITE}Change setting value
STR_TEMPERATE_LANDSCAPE :Temperate landscape
@@ -2126,8 +2124,8 @@ STR_NUM_LOW :Low
STR_NUM_NORMAL :Normal
STR_NUM_HIGH :High
STR_NUM_CUSTOM :Custom
-STR_ARROW_LEFT_SMALL :{BLACK}{SMALLLEFTARROW}
-STR_ARROW_RIGHT_SMALL :{BLACK}{SMALLRIGHTARROW}
+STR_BLACK_SMALL_ARROW_LEFT :{BLACK}{SMALLLEFTARROW}
+STR_BLACK_SMALL_ARROW_RIGHT :{BLACK}{SMALLRIGHTARROW}
STR_AI_SPEED_VERY_SLOW :Very Slow
STR_AI_SPEED_SLOW :Slow
STR_AI_SPEED_MEDIUM :Medium
@@ -2808,7 +2806,7 @@ STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT :{WHITE}...must
STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT :{WHITE}Unable to find local depot
STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP :{BLACK}Force vehicle to turn around
STR_ARTICULATED_RV_CAPACITY :{BLACK}Capacity: {LTBLUE}
-STR_BARE_CARGO :{CARGO}
+STR_JUST_CARGO :{CARGO}
STR_DEPOT_VEHICLE_TOOLTIP :{BLACK}{ENGINE}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CHAIN :{BLACK}{NUM} vehicle{P "" s}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CARGO :{}{CARGO} ({SHORTCARGO})
diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt
index ed6e35c07..7d6c89ded 100644
--- a/src/lang/esperanto.txt
+++ b/src/lang/esperanto.txt
@@ -155,8 +155,8 @@ STR_ABBREV_PLASTIC :{TINYFONT}PL
STR_ABBREV_FIZZY_DRINKS :{TINYFONT}AT
STR_ABBREV_NONE :{TINYFONT}NE
STR_ABBREV_ALL :{TINYFONT}ĈIU
-STR_DATE_SHORT_WHITE :{WHITE}{DATE_SHORT}
-STR_DATE_LONG_WHITE :{WHITE}{DATE_LONG}
+STR_WHITE_DATE_SHORT :{WHITE}{DATE_SHORT}
+STR_WHITE_DATE_LONG :{WHITE}{DATE_LONG}
STR_SMALLMAP_CAPTION :{WHITE}Mapo - {STRING}
STR_GAME_OPTIONS_CAPTION :{WHITE}Ludaj Opcioj
STR_ERROR_MESSAGE_CAPTION :{YELLOW}Mesaĝo
@@ -329,7 +329,6 @@ STR_SORT_BY_PRODUCTION :Produktado
STR_SORT_BY_TYPE :Tipo
STR_SORT_BY_TRANSPORTED :Transportiĝis
STR_SORT_BY_NAME :{BLACK}Nomo
-STR_SORT_BY_DROPDOWN_NAME :Nomo
STR_SORT_BY_DATE :{BLACK}Dato
STR_SORT_BY_NUMBER :Numero
STR_SORT_BY_PROFIT_LAST_YEAR :Gajno lastjara
@@ -411,8 +410,8 @@ STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS :{BLACK}Konstruu
STR_TOOLBAR_TOOLTIP_PLANT_TREES_PLACE_SIGNS :{BLACK}Plantu arbojn, metu afiŝojn ktp.
STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION :{BLACK}Landregionaj informoj
STR_TOOLBAR_TOOLTIP_OPTIONS :{BLACK}Opcioj
-STR_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
-STR_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
+STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
+STR_BLACK_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
STR_ERROR_CAN_T_CHANGE_SERVICING :{WHITE}Ne povas ŝanĝi prizorga intervalo...
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Fermu fenestron
STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Fenestra titolo - tiru por movi la fenestron
@@ -582,12 +581,12 @@ STR_HIGHSCORE_NAME :{BIGFONT}{PRESI
STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA})
STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} atingis staton de '{STRING}'!
STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} de {COMPANY} atingis staton de '{STRING}'!
-STR_BLUE_NUMBER :{BLUE}{COMMA}
+STR_BLUE_COMMA :{BLUE}{COMMA}
STR_SCENEDIT_TOOLBAR_OPENTTD :{YELLOW}OpenTTD
STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR :{YELLOW}Scenarkreilon
STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION :{WHITE}Landa Generado
-STR_ARROW_UP :{BLACK}{UPARROW}
-STR_ARROW_DOWN :{BLACK}{DOWNARROW}
+STR_BLACK_ARROW_UP :{BLACK}{UPARROW}
+STR_BLACK_ARROW_DOWN :{BLACK}{DOWNARROW}
STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA :{BLACK}Grandigu landparton por (mal)altigi
STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA :{BLACK}Malgrandigu landparton por (mal)altigi
STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND :{BLACK}Kreu landon hazarde
@@ -671,7 +670,7 @@ STR_FULL :Plene
STR_STATUSBAR_COMPANY_NAME :{SILVER}- - {COMPANY} - -
STR_BLACK_STRING :{BLACK}{STRING}
-STR_CHECKMARK :{CHECKMARK}
+STR_JUST_CHECKMARK :{CHECKMARK}
############ range for menu starts
STR_SETTINGS_MENU_GAME_OPTIONS :Ludaj opcioj
STR_SETTINGS_MENU_DIFFICULTY_SETTINGS :Malfacilec-agordoj
@@ -776,8 +775,8 @@ STR_STATUSBAR_SAVING_GAME :{RED}* * KONS
STR_SAVE_STILL_IN_PROGRESS :{WHITE}Ankoraŭ konservas,{}bv atendi ĝis finiĝo!
STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE :{BLACK}Elektu programon de 'Facilvoja muziko'
-STR_6 :{BLACK}6
-STR_7 :{BLACK}7
+STR_BLACK_6 :{BLACK}6
+STR_BLACK_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :Angle (Origine)
@@ -885,7 +884,7 @@ STR_CRATES :kestoj
STR_RES_OTHER :alia
STR_NOTHING :
-STR_SMALL_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
+STR_TINY_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
STR_CANT_SHARE_ORDER_LIST :{WHITE}Ne povas dividi ordenliston...
STR_CANT_COPY_ORDER_LIST :{WHITE}Ne povas kopii ordenliston...
@@ -1158,8 +1157,7 @@ STR_CONFIG_SETTING_MAP_Y :{LTBLUE}Y-grand
############ generic strings for settings
STR_CONFIG_SETTING_DISABLED :malaktiva
-STR_CONFIG_SETTING_INT32 :{NUM}
-STR_CONFIG_SETTING_CURRENCY :{CURRENCY}
+STR_JUST_CURRENCY :{CURRENCY}
STR_CONFIG_SETTING_QUERY_CAPT :{WHITE}Ŝanĝu agord-valoron
STR_TEMPERATE_LANDSCAPE :Modera landaspekto
@@ -2059,8 +2057,8 @@ STR_NUM_LOW :Malalte
STR_NUM_NORMAL :Normale
STR_NUM_HIGH :Alte
STR_NUM_CUSTOM :Ŝanĝitaj
-STR_ARROW_LEFT_SMALL :{BLACK}{SMALLLEFTARROW}
-STR_ARROW_RIGHT_SMALL :{BLACK}{SMALLRIGHTARROW}
+STR_BLACK_SMALL_ARROW_LEFT :{BLACK}{SMALLLEFTARROW}
+STR_BLACK_SMALL_ARROW_RIGHT :{BLACK}{SMALLRIGHTARROW}
STR_AI_SPEED_VERY_SLOW :Tre Malrapide
STR_AI_SPEED_SLOW :Malrapide
STR_AI_SPEED_MEDIUM :Meze
@@ -2669,7 +2667,7 @@ STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Centre v
STR_BUILD_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP :{BLACK}Vojveturilelektan liston - alklaku veturilon por informoj
STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_TOOLTIP :{BLACK}Kreu la elektitan vojveturilon
STR_ARTICULATED_RV_CAPACITY :{BLACK}Kapacito: {LTBLUE}
-STR_BARE_CARGO :{CARGO}
+STR_JUST_CARGO :{CARGO}
STR_DEPOT_VEHICLE_TOOLTIP :{BLACK}{ENGINE}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CHAIN :{BLACK}{NUM} veturilo{P "" j}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CARGO :{}{CARGO} ({SHORTCARGO})
diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt
index 95c5924c3..ad2e74532 100644
--- a/src/lang/estonian.txt
+++ b/src/lang/estonian.txt
@@ -211,8 +211,8 @@ STR_ABBREV_PLASTIC :{TINYFONT}PL
STR_ABBREV_FIZZY_DRINKS :{TINYFONT}FZ
STR_ABBREV_NONE :{TINYFONT}EI
STR_ABBREV_ALL :{TINYFONT}KÕIK
-STR_DATE_SHORT_WHITE :{WHITE}{DATE_SHORT}
-STR_DATE_LONG_WHITE :{WHITE}{DATE_LONG}
+STR_WHITE_DATE_SHORT :{WHITE}{DATE_SHORT}
+STR_WHITE_DATE_LONG :{WHITE}{DATE_LONG}
STR_SMALLMAP_CAPTION :{WHITE}Kaart - {STRING}
STR_GAME_OPTIONS_CAPTION :{WHITE}Mängu valikud
STR_ERROR_MESSAGE_CAPTION :{YELLOW}Sõnum
@@ -385,7 +385,6 @@ STR_SORT_BY_PRODUCTION :Toodang
STR_SORT_BY_TYPE :Tüüp
STR_SORT_BY_TRANSPORTED :Veetud
STR_SORT_BY_NAME :{BLACK}Nimi
-STR_SORT_BY_DROPDOWN_NAME :Nimi
STR_SORT_BY_DATE :{BLACK}Daatum
STR_SORT_BY_NUMBER :Number
STR_SORT_BY_PROFIT_LAST_YEAR :Eelmise aasta kasum
@@ -467,8 +466,8 @@ STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS :{BLACK}Ehita le
STR_TOOLBAR_TOOLTIP_PLANT_TREES_PLACE_SIGNS :{BLACK}Puude istutamine, siltide paigaldamine jne.
STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION :{BLACK}Maa-ala andmed
STR_TOOLBAR_TOOLTIP_OPTIONS :{BLACK}Valikud
-STR_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
-STR_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
+STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
+STR_BLACK_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
STR_ERROR_CAN_T_CHANGE_SERVICING :{WHITE}Hooldusvahemiku ei saa muuta...
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Sulge aken
STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Akna pealkiri. Liigutamiseks lohista seda hiirega.
@@ -638,12 +637,12 @@ STR_HIGHSCORE_NAME :{BIGFONT}{PRESI
STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA})
STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} saavutas '{STRING}' staatuse!
STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} {COMPANY}'st saavutas '{STRING}' staatuse!
-STR_BLUE_NUMBER :{BLUE}{COMMA}
+STR_BLUE_COMMA :{BLUE}{COMMA}
STR_SCENEDIT_TOOLBAR_OPENTTD :{YELLOW}OpenTTD
STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR :{YELLOW}Kaardiredaktor
STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION :{WHITE}Maastiku loomine
-STR_ARROW_UP :{BLACK}{UPARROW}
-STR_ARROW_DOWN :{BLACK}{DOWNARROW}
+STR_BLACK_ARROW_UP :{BLACK}{UPARROW}
+STR_BLACK_ARROW_DOWN :{BLACK}{DOWNARROW}
STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA :{BLACK}Suurenda kõrgendatava/madaldatava maa-ala pindala
STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA :{BLACK}Vähenda kõrgendatava/madaldatava maa-ala pindala
STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND :{BLACK}Suvalise kaardi tekitamine
@@ -727,7 +726,7 @@ STR_FULL :Täielik
STR_STATUSBAR_COMPANY_NAME :{SILVER}- - {COMPANY} - -
STR_BLACK_STRING :{BLACK}{STRING}
-STR_CHECKMARK :{CHECKMARK}
+STR_JUST_CHECKMARK :{CHECKMARK}
############ range for menu starts
STR_SETTINGS_MENU_GAME_OPTIONS :Mängu valikud
STR_SETTINGS_MENU_DIFFICULTY_SETTINGS :Raskusastme seadistused
@@ -835,8 +834,8 @@ STR_STATUSBAR_SAVING_GAME :{RED}* * MÄN
STR_SAVE_STILL_IN_PROGRESS :{WHITE}Ikka salvestamisel,{}palun oota salvestuse lõpuni!
STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE :{BLACK}'Ezy Street' stiilis muusikaprogrammi valimine
-STR_6 :{BLACK}6
-STR_7 :{BLACK}7
+STR_BLACK_6 :{BLACK}6
+STR_BLACK_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :Inglise (originaalne)
@@ -944,7 +943,7 @@ STR_CRATES :kasti
STR_RES_OTHER :muu
STR_NOTHING :
-STR_SMALL_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
+STR_TINY_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
STR_CANT_SHARE_ORDER_LIST :{WHITE}Sihtpunktide nimekirja ei saa jagada...
STR_CANT_COPY_ORDER_LIST :{WHITE}Sihtpunktide nimekirja ei saa kopeerida...
@@ -1217,8 +1216,7 @@ STR_CONFIG_SETTING_MAP_Y :{LTBLUE}Kaardi
############ generic strings for settings
STR_CONFIG_SETTING_DISABLED :väljas
-STR_CONFIG_SETTING_INT32 :{NUM}
-STR_CONFIG_SETTING_CURRENCY :{CURRENCY}
+STR_JUST_CURRENCY :{CURRENCY}
STR_CONFIG_SETTING_QUERY_CAPT :{WHITE}Muuda seadete väärtusi
STR_TEMPERATE_LANDSCAPE :Parasvöötme maastik
@@ -2184,8 +2182,8 @@ STR_NUM_LOW :Madal
STR_NUM_NORMAL :Harilik
STR_NUM_HIGH :Kõrge
STR_NUM_CUSTOM :Omatehtud
-STR_ARROW_LEFT_SMALL :{BLACK}{SMALLLEFTARROW}
-STR_ARROW_RIGHT_SMALL :{BLACK}{SMALLRIGHTARROW}
+STR_BLACK_SMALL_ARROW_LEFT :{BLACK}{SMALLLEFTARROW}
+STR_BLACK_SMALL_ARROW_RIGHT :{BLACK}{SMALLRIGHTARROW}
STR_AI_SPEED_VERY_SLOW :Väga aeglane
STR_AI_SPEED_SLOW :Aeglane
STR_AI_SPEED_MEDIUM :Keskmine
@@ -2939,7 +2937,7 @@ STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Vii vaad
STR_BUILD_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP :{BLACK}Mootorsõidukite nimekiri - andmete saamiseks klõpsa sõidukile
STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_TOOLTIP :{BLACK}Ehita valitud mootorsõiduk
STR_ARTICULATED_RV_CAPACITY :{BLACK}Kandevõime: {LTBLUE}
-STR_BARE_CARGO :{CARGO}
+STR_JUST_CARGO :{CARGO}
STR_DEPOT_VEHICLE_TOOLTIP :{BLACK}{ENGINE}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CHAIN :{BLACK}{NUM} sõiduk{P "" id}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CARGO :{}{CARGO} ({SHORTCARGO})
diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt
index 96a3a0f03..482a1fb95 100644
--- a/src/lang/finnish.txt
+++ b/src/lang/finnish.txt
@@ -154,8 +154,8 @@ STR_ABBREV_PLASTIC :{TINYFONT}MV
STR_ABBREV_FIZZY_DRINKS :{TINYFONT}SJ
STR_ABBREV_NONE :{TINYFONT}EI
STR_ABBREV_ALL :{TINYFONT}KAIKKI
-STR_DATE_SHORT_WHITE :{WHITE}{DATE_SHORT}
-STR_DATE_LONG_WHITE :{WHITE}{DATE_LONG}
+STR_WHITE_DATE_SHORT :{WHITE}{DATE_SHORT}
+STR_WHITE_DATE_LONG :{WHITE}{DATE_LONG}
STR_SMALLMAP_CAPTION :{WHITE}Kartta - {STRING}
STR_GAME_OPTIONS_CAPTION :{WHITE}Pelin Asetukset
STR_ERROR_MESSAGE_CAPTION :{YELLOW}Viesti
@@ -328,7 +328,6 @@ STR_SORT_BY_PRODUCTION :Tuotto
STR_SORT_BY_TYPE :Tyyppi
STR_SORT_BY_TRANSPORTED :Kuljetettu
STR_SORT_BY_NAME :{BLACK}Nimi
-STR_SORT_BY_DROPDOWN_NAME :Nimi
STR_SORT_BY_DATE :{BLACK}Päiväys
STR_SORT_BY_NUMBER :Numero
STR_SORT_BY_PROFIT_LAST_YEAR :Tuottoa viime vuonna
@@ -410,8 +409,8 @@ STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS :{BLACK}Rakenna
STR_TOOLBAR_TOOLTIP_PLANT_TREES_PLACE_SIGNS :{BLACK}Istuta puita, asenna kylttejä, jne.
STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION :{BLACK}Maa-aluetiedot
STR_TOOLBAR_TOOLTIP_OPTIONS :{BLACK}Asetukset
-STR_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
-STR_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
+STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
+STR_BLACK_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
STR_ERROR_CAN_T_CHANGE_SERVICING :{WHITE}Huoltoväliä ei voi muuttaa.
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Sulje ikkuna
STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Ikkunan otsake - vedä tästä siirtääksesi ikkunaa
@@ -581,12 +580,12 @@ STR_HIGHSCORE_NAME :{BIGFONT}{PRESI
STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA})
STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} saavuttaa arvon '{STRING}'!
STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} yhtiöstä {COMPANY} saavuttaa arvon '{STRING}'!
-STR_BLUE_NUMBER :{BLUE}{COMMA}
+STR_BLUE_COMMA :{BLUE}{COMMA}
STR_SCENEDIT_TOOLBAR_OPENTTD :{YELLOW}OpenTTD
STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR :{YELLOW}Skenaariomuokkain
STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION :{WHITE}Maanrakennus
-STR_ARROW_UP :{BLACK}{UPARROW}
-STR_ARROW_DOWN :{BLACK}{DOWNARROW}
+STR_BLACK_ARROW_UP :{BLACK}{UPARROW}
+STR_BLACK_ARROW_DOWN :{BLACK}{DOWNARROW}
STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA :{BLACK}Suurenna madallettavan/korotettavan maa-alueen kokoa.
STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA :{BLACK}Pienennä madallettavan/korotettavan maa-alueen kokoa.
STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND :{BLACK}Luo satunnainen maa
@@ -670,7 +669,7 @@ STR_FULL :Täysi
STR_STATUSBAR_COMPANY_NAME :{SILVER}- - {COMPANY} - -
STR_BLACK_STRING :{BLACK}{STRING}
-STR_CHECKMARK :{CHECKMARK}
+STR_JUST_CHECKMARK :{CHECKMARK}
############ range for menu starts
STR_SETTINGS_MENU_GAME_OPTIONS :Pelin asetukset
STR_SETTINGS_MENU_DIFFICULTY_SETTINGS :Vaikeusasetukset
@@ -775,8 +774,8 @@ STR_STATUSBAR_SAVING_GAME :{RED}* * TALL
STR_SAVE_STILL_IN_PROGRESS :{WHITE}Tallentaminen käynnissä,{}odota, kunnes se päättyy!
STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE :{BLACK}Valitse 'Ezy Street'.
-STR_6 :{BLACK}6
-STR_7 :{BLACK}7
+STR_BLACK_6 :{BLACK}6
+STR_BLACK_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :Englantilainen
@@ -884,7 +883,7 @@ STR_CRATES :laatikkoa
STR_RES_OTHER :muut
STR_NOTHING :
-STR_SMALL_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
+STR_TINY_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
STR_CANT_SHARE_ORDER_LIST :{WHITE}Aikataulua ei voi jakaa...
STR_CANT_COPY_ORDER_LIST :{WHITE}Aikataulua ei voi kopioida...
@@ -1157,8 +1156,7 @@ STR_CONFIG_SETTING_MAP_Y :{LTBLUE}Kartan
############ generic strings for settings
STR_CONFIG_SETTING_DISABLED :pois käytöstä
-STR_CONFIG_SETTING_INT32 :{NUM}
-STR_CONFIG_SETTING_CURRENCY :{CURRENCY}
+STR_JUST_CURRENCY :{CURRENCY}
STR_CONFIG_SETTING_QUERY_CAPT :{WHITE}Muuta asetusarvo
STR_TEMPERATE_LANDSCAPE :lauhkea maasto
@@ -2129,8 +2127,8 @@ STR_NUM_LOW :Matala
STR_NUM_NORMAL :Normaali
STR_NUM_HIGH :Korkea
STR_NUM_CUSTOM :Oma
-STR_ARROW_LEFT_SMALL :{BLACK}{SMALLLEFTARROW}
-STR_ARROW_RIGHT_SMALL :{BLACK}{SMALLRIGHTARROW}
+STR_BLACK_SMALL_ARROW_LEFT :{BLACK}{SMALLLEFTARROW}
+STR_BLACK_SMALL_ARROW_RIGHT :{BLACK}{SMALLRIGHTARROW}
STR_AI_SPEED_VERY_SLOW :Hyvin hidas
STR_AI_SPEED_SLOW :Hidas
STR_AI_SPEED_MEDIUM :Keskitaso
@@ -2880,7 +2878,7 @@ STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Keskitä
STR_BUILD_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP :{BLACK}Ajoneuvon valintalista - napsauta ajoneuvoa saadaksesi tietoja.
STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_TOOLTIP :{BLACK}Rakenna valittu ajoneuvo.
STR_ARTICULATED_RV_CAPACITY :{BLACK}Kapasiteetti: {LTBLUE}
-STR_BARE_CARGO :{CARGO}
+STR_JUST_CARGO :{CARGO}
STR_DEPOT_VEHICLE_TOOLTIP :{BLACK}{ENGINE}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CHAIN :{BLACK}{NUM} kulkuneuvo{P "" a}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CARGO :{}{CARGO} ({SHORTCARGO})
diff --git a/src/lang/french.txt b/src/lang/french.txt
index 246b59a95..6c6ef1fe8 100644
--- a/src/lang/french.txt
+++ b/src/lang/french.txt
@@ -155,8 +155,8 @@ STR_ABBREV_PLASTIC :{TINYFONT}PL
STR_ABBREV_FIZZY_DRINKS :{TINYFONT}GZ
STR_ABBREV_NONE :{TINYFONT}NO
STR_ABBREV_ALL :{TINYFONT}ALL
-STR_DATE_SHORT_WHITE :{WHITE}{DATE_SHORT}
-STR_DATE_LONG_WHITE :{WHITE}{DATE_LONG}
+STR_WHITE_DATE_SHORT :{WHITE}{DATE_SHORT}
+STR_WHITE_DATE_LONG :{WHITE}{DATE_LONG}
STR_SMALLMAP_CAPTION :{WHITE}Carte - {STRING}
STR_GAME_OPTIONS_CAPTION :{WHITE}Options
STR_ERROR_MESSAGE_CAPTION :{YELLOW}Message
@@ -329,7 +329,6 @@ STR_SORT_BY_PRODUCTION :Production
STR_SORT_BY_TYPE :Type
STR_SORT_BY_TRANSPORTED :Transporté
STR_SORT_BY_NAME :{BLACK}Nom
-STR_SORT_BY_DROPDOWN_NAME :Nom
STR_SORT_BY_DATE :{BLACK}Date
STR_SORT_BY_NUMBER :Numéro
STR_SORT_BY_PROFIT_LAST_YEAR :Profit année précédente
@@ -413,8 +412,8 @@ STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS :{BLACK}Construc
STR_TOOLBAR_TOOLTIP_PLANT_TREES_PLACE_SIGNS :{BLACK}Planter des arbres
STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION :{BLACK}Outil d'Inspection
STR_TOOLBAR_TOOLTIP_OPTIONS :{BLACK}Options
-STR_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
-STR_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
+STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
+STR_BLACK_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
STR_ERROR_CAN_T_CHANGE_SERVICING :{WHITE}Impossible de modifier l'intervalle de service...
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Fermer la fenêtre
STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Titre de fenêtre - Faire Glisser pour déplacer la fenêtre
@@ -584,12 +583,12 @@ STR_HIGHSCORE_NAME :{BIGFONT}{PRESI
STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA})
STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} atteint le niveau de '{STRING}' !
STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} de {COMPANY} atteint le niveau de '{STRING}' !
-STR_BLUE_NUMBER :{BLUE}{COMMA}
+STR_BLUE_COMMA :{BLUE}{COMMA}
STR_SCENEDIT_TOOLBAR_OPENTTD :{YELLOW}OpenTTD
STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR :{YELLOW}Éditeur de Scénario
STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION :{WHITE}Création du terrain
-STR_ARROW_UP :{BLACK}{UPARROW}
-STR_ARROW_DOWN :{BLACK}{DOWNARROW}
+STR_BLACK_ARROW_UP :{BLACK}{UPARROW}
+STR_BLACK_ARROW_DOWN :{BLACK}{DOWNARROW}
STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA :{BLACK}Augmenter la quantité de terre à modifier
STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA :{BLACK}Diminuer la quantité de terre à modifier
STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND :{BLACK}Créer un monde aléatoire
@@ -673,7 +672,7 @@ STR_FULL :Complet
STR_STATUSBAR_COMPANY_NAME :{SILVER}- - {COMPANY} - -
STR_BLACK_STRING :{BLACK}{STRING}
-STR_CHECKMARK :{CHECKMARK}
+STR_JUST_CHECKMARK :{CHECKMARK}
############ range for menu starts
STR_SETTINGS_MENU_GAME_OPTIONS :Options du Jeu
STR_SETTINGS_MENU_DIFFICULTY_SETTINGS :Niveau de Difficulté
@@ -778,8 +777,8 @@ STR_STATUSBAR_SAVING_GAME :{RED}* * Part
STR_SAVE_STILL_IN_PROGRESS :{WHITE}Sauvegarde en cours,{}Veuillez attendre la fin du processus!
STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE :{BLACK}Sélectionner programme de musique 'Ezy Street'
-STR_6 :{BLACK}6
-STR_7 :{BLACK}7
+STR_BLACK_6 :{BLACK}6
+STR_BLACK_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :Anglais (Originaux)
@@ -887,7 +886,7 @@ STR_CRATES :caisses
STR_RES_OTHER :autre
STR_NOTHING :
-STR_SMALL_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
+STR_TINY_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
STR_CANT_SHARE_ORDER_LIST :{WHITE}Impossible de partager les ordres...
STR_CANT_COPY_ORDER_LIST :{WHITE}Impossible de copier les ordres...
@@ -1160,8 +1159,7 @@ STR_CONFIG_SETTING_MAP_Y :{LTBLUE}Taille
############ generic strings for settings
STR_CONFIG_SETTING_DISABLED :inactif
-STR_CONFIG_SETTING_INT32 :{NUM}
-STR_CONFIG_SETTING_CURRENCY :{CURRENCY}
+STR_JUST_CURRENCY :{CURRENCY}
STR_CONFIG_SETTING_QUERY_CAPT :{WHITE}Changer valeur du paramètre
STR_TEMPERATE_LANDSCAPE :environnement 'Tempéré'
@@ -2127,8 +2125,8 @@ STR_NUM_LOW :Bas
STR_NUM_NORMAL :Normal
STR_NUM_HIGH :Élevé
STR_NUM_CUSTOM :Personnalisé
-STR_ARROW_LEFT_SMALL :{BLACK}{SMALLLEFTARROW}
-STR_ARROW_RIGHT_SMALL :{BLACK}{SMALLRIGHTARROW}
+STR_BLACK_SMALL_ARROW_LEFT :{BLACK}{SMALLLEFTARROW}
+STR_BLACK_SMALL_ARROW_RIGHT :{BLACK}{SMALLRIGHTARROW}
STR_AI_SPEED_VERY_SLOW :Très Lent
STR_AI_SPEED_SLOW :Lent
STR_AI_SPEED_MEDIUM :Moyen
@@ -2809,7 +2807,7 @@ STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT :{WHITE}...doit
STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT :{WHITE}Impossible de trouver le dépôt
STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP :{BLACK}Force le véhicule à faire demi-tour
STR_ARTICULATED_RV_CAPACITY :{BLACK}Capacité: {LTBLUE}
-STR_BARE_CARGO :{CARGO}
+STR_JUST_CARGO :{CARGO}
STR_DEPOT_VEHICLE_TOOLTIP :{BLACK}{ENGINE}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CHAIN :{BLACK}{NUM} véhicule{P "" s}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CARGO :{}{CARGO} ({SHORTCARGO})
diff --git a/src/lang/galician.txt b/src/lang/galician.txt
index 73880fe86..ad44b32dc 100644
--- a/src/lang/galician.txt
+++ b/src/lang/galician.txt
@@ -155,8 +155,8 @@ STR_ABBREV_PLASTIC :{TINYFONT}PL
STR_ABBREV_FIZZY_DRINKS :{TINYFONT}BE
STR_ABBREV_NONE :{TINYFONT}NON
STR_ABBREV_ALL :{TINYFONT}TODO
-STR_DATE_SHORT_WHITE :{WHITE}{DATE_SHORT}
-STR_DATE_LONG_WHITE :{WHITE}{DATE_LONG}
+STR_WHITE_DATE_SHORT :{WHITE}{DATE_SHORT}
+STR_WHITE_DATE_LONG :{WHITE}{DATE_LONG}
STR_SMALLMAP_CAPTION :{WHITE}Mapa - {STRING}
STR_GAME_OPTIONS_CAPTION :{WHITE}Opcións da Partida
STR_ERROR_MESSAGE_CAPTION :{YELLOW}Mensaxe
@@ -329,7 +329,6 @@ STR_SORT_BY_PRODUCTION :Producción
STR_SORT_BY_TYPE :Tipo
STR_SORT_BY_TRANSPORTED :Transportado
STR_SORT_BY_NAME :{BLACK}Nome
-STR_SORT_BY_DROPDOWN_NAME :Nome
STR_SORT_BY_DATE :{BLACK}Data
STR_SORT_BY_NUMBER :Número
STR_SORT_BY_PROFIT_LAST_YEAR :Beneficio último ano
@@ -409,8 +408,8 @@ STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS :{BLACK}Constru
STR_TOOLBAR_TOOLTIP_PLANT_TREES_PLACE_SIGNS :{BLACK}Plantar árbores, situar sinais, etc.
STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION :{BLACK}Información dunha área de terreo
STR_TOOLBAR_TOOLTIP_OPTIONS :{BLACK}Opcións
-STR_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
-STR_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
+STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
+STR_BLACK_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
STR_ERROR_CAN_T_CHANGE_SERVICING :{WHITE}Non se pode cambia-lo intervalo de servizo...
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Pechar fiestra
STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Título da fiestra - arrástrao para move-la fiestra
@@ -579,12 +578,12 @@ STR_HIGHSCORE_NAME :{BIGFONT}{PRESI
STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA})
STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BLACK}{BIGFONT}¡{COMPANY} logra o status de '{STRING}'!
STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{WHITE}{BIGFONT}¡{PRESIDENTNAME} de {COMPANY} logra o status '{STRING}'!
-STR_BLUE_NUMBER :{BLUE}{COMMA}
+STR_BLUE_COMMA :{BLUE}{COMMA}
STR_SCENEDIT_TOOLBAR_OPENTTD :{YELLOW}OpenTTD
STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR :{YELLOW}Editor de Escenario
STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION :{WHITE}Xeración de Terreo
-STR_ARROW_UP :{BLACK}{UPARROW}
-STR_ARROW_DOWN :{BLACK}{DOWNARROW}
+STR_BLACK_ARROW_UP :{BLACK}{UPARROW}
+STR_BLACK_ARROW_DOWN :{BLACK}{DOWNARROW}
STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA :{BLACK}Aumenta-lo tamaño de terreo a baixar/subir
STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA :{BLACK}Disminuí-lo tamaño de terreo a baixar/subir
STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND :{BLACK}Xerar terreo aleatorio
@@ -666,7 +665,7 @@ STR_FULL :Completo
STR_STATUSBAR_COMPANY_NAME :{SILVER}- - {COMPANY} - -
STR_BLACK_STRING :{BLACK}{STRING}
-STR_CHECKMARK :{CHECKMARK}
+STR_JUST_CHECKMARK :{CHECKMARK}
############ range for menu starts
STR_SETTINGS_MENU_GAME_OPTIONS :Opcións da Partida
STR_SETTINGS_MENU_DIFFICULTY_SETTINGS :Configuración de Dificultade
@@ -771,8 +770,8 @@ STR_STATUSBAR_SAVING_GAME :{RED}* * GRAB
STR_SAVE_STILL_IN_PROGRESS :{WHITE}¡Grabación en progreso,{}por favor espera ata que termine!
STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE :{BLACK}Selecciona-lo programa 'Música Estilo Ezy Street'
-STR_6 :{BLACK}6
-STR_7 :{BLACK}7
+STR_BLACK_6 :{BLACK}6
+STR_BLACK_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :Inglés (Orixinal)
@@ -880,7 +879,7 @@ STR_CRATES :caixóns
STR_RES_OTHER :outro
STR_NOTHING :
-STR_SMALL_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
+STR_TINY_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
STR_CANT_SHARE_ORDER_LIST :{WHITE}Non se pode comparti-la lista de ordes...
STR_CANT_COPY_ORDER_LIST :{WHITE}Non se pode copia-la lista de ordes...
@@ -1135,8 +1134,7 @@ STR_CONFIG_SETTING_MAP_Y :{LTBLUE}Tamaño
############ generic strings for settings
STR_CONFIG_SETTING_DISABLED :deshabilitado
-STR_CONFIG_SETTING_INT32 :{NUM}
-STR_CONFIG_SETTING_CURRENCY :{CURRENCY}
+STR_JUST_CURRENCY :{CURRENCY}
STR_CONFIG_SETTING_QUERY_CAPT :{WHITE}Cambia-lo valor
STR_TEMPERATE_LANDSCAPE :Escenario temperado
@@ -2095,8 +2093,8 @@ STR_NUM_LOW :Baixo
STR_NUM_NORMAL :Normal
STR_NUM_HIGH :Alto
STR_NUM_CUSTOM :Persoalizado
-STR_ARROW_LEFT_SMALL :{BLACK}{SMALLLEFTARROW}
-STR_ARROW_RIGHT_SMALL :{BLACK}{SMALLRIGHTARROW}
+STR_BLACK_SMALL_ARROW_LEFT :{BLACK}{SMALLLEFTARROW}
+STR_BLACK_SMALL_ARROW_RIGHT :{BLACK}{SMALLRIGHTARROW}
STR_AI_SPEED_VERY_SLOW :Moi Lento
STR_AI_SPEED_SLOW :Lento
STR_AI_SPEED_MEDIUM :Medio
@@ -2840,7 +2838,7 @@ STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Centra-l
STR_BUILD_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP :{BLACK}Lista de selección de vehículos de estrada - pincha nun vehículo para máis información
STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_TOOLTIP :{BLACK}Construí-lo vehículo de estrada seleccionado
STR_ARTICULATED_RV_CAPACITY :{BLACK}Capacidade: {LTBLUE}
-STR_BARE_CARGO :{CARGO}
+STR_JUST_CARGO :{CARGO}
STR_DEPOT_VEHICLE_TOOLTIP :{BLACK}{ENGINE}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CHAIN :{BLACK}{NUM} vehículo{P "" s}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CARGO :{}{CARGO} ({SHORTCARGO})
diff --git a/src/lang/german.txt b/src/lang/german.txt
index 2fc4c6002..aedea4c29 100644
--- a/src/lang/german.txt
+++ b/src/lang/german.txt
@@ -155,8 +155,8 @@ STR_ABBREV_PLASTIC :{TINYFONT}PL
STR_ABBREV_FIZZY_DRINKS :{TINYFONT}LI
STR_ABBREV_NONE :{TINYFONT}KEINE
STR_ABBREV_ALL :{TINYFONT}ALLE
-STR_DATE_SHORT_WHITE :{WHITE}{DATE_SHORT}
-STR_DATE_LONG_WHITE :{WHITE}{DATE_LONG}
+STR_WHITE_DATE_SHORT :{WHITE}{DATE_SHORT}
+STR_WHITE_DATE_LONG :{WHITE}{DATE_LONG}
STR_SMALLMAP_CAPTION :{WHITE}Weltkarte - {STRING}
STR_GAME_OPTIONS_CAPTION :{WHITE}Spieleinstellungen
STR_ERROR_MESSAGE_CAPTION :{YELLOW}Nachricht
@@ -329,7 +329,6 @@ STR_SORT_BY_PRODUCTION :Produktion
STR_SORT_BY_TYPE :Typ
STR_SORT_BY_TRANSPORTED :Transportiert
STR_SORT_BY_NAME :{BLACK}Name
-STR_SORT_BY_DROPDOWN_NAME :Name
STR_SORT_BY_DATE :{BLACK}Datum
STR_SORT_BY_NUMBER :Nummer
STR_SORT_BY_PROFIT_LAST_YEAR :Gewinn im letzten Jahr
@@ -413,8 +412,8 @@ STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS :{BLACK}Flughafe
STR_TOOLBAR_TOOLTIP_PLANT_TREES_PLACE_SIGNS :{BLACK}Bäume pflanzen
STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION :{BLACK}Gebietsinformation
STR_TOOLBAR_TOOLTIP_OPTIONS :{BLACK}Einstellungen
-STR_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
-STR_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
+STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
+STR_BLACK_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
STR_ERROR_CAN_T_CHANGE_SERVICING :{WHITE}Das Wartungsintervall kann nicht geändert werden...
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Fenster schließen
STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Titelleiste klicken und ziehen, um das Fenster zu verschieben
@@ -584,12 +583,12 @@ STR_HIGHSCORE_NAME :{BIGFONT}{PRESI
STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA})
STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} erreicht '{STRING}' Status!
STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} von {COMPANY} erreicht '{STRING}' Status!
-STR_BLUE_NUMBER :{BLUE}{COMMA}
+STR_BLUE_COMMA :{BLUE}{COMMA}
STR_SCENEDIT_TOOLBAR_OPENTTD :{YELLOW}OpenTTD
STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR :{YELLOW}Szenario Editor
STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION :{WHITE}Land erstellen
-STR_ARROW_UP :{BLACK}{UPARROW}
-STR_ARROW_DOWN :{BLACK}{DOWNARROW}
+STR_BLACK_ARROW_UP :{BLACK}{UPARROW}
+STR_BLACK_ARROW_DOWN :{BLACK}{DOWNARROW}
STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA :{BLACK}Landfläche zum Anheben / Absenken vergrößern
STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA :{BLACK}Landfläche zum Anheben / Absenken verkleinern
STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND :{BLACK}Erzeuge Land durch Zufall
@@ -673,7 +672,7 @@ STR_FULL :Zeitung
STR_STATUSBAR_COMPANY_NAME :{SILVER}- - {COMPANY} - -
STR_BLACK_STRING :{BLACK}{STRING}
-STR_CHECKMARK :{CHECKMARK}
+STR_JUST_CHECKMARK :{CHECKMARK}
############ range for menu starts
STR_SETTINGS_MENU_GAME_OPTIONS :Spieleinstellungen
STR_SETTINGS_MENU_DIFFICULTY_SETTINGS :Schwierigkeitsgrad
@@ -778,8 +777,8 @@ STR_STATUSBAR_SAVING_GAME :{RED}* * SPEI
STR_SAVE_STILL_IN_PROGRESS :{WHITE}Speichern läuft,{}bitte warten, bis es beendet ist!
STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE :{BLACK}Wähle 'Ezy Street style music'-Programm
-STR_6 :{BLACK}6
-STR_7 :{BLACK}7
+STR_BLACK_6 :{BLACK}6
+STR_BLACK_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :Englisch
@@ -887,7 +886,7 @@ STR_CRATES :Kisten
STR_RES_OTHER :Andere
STR_NOTHING :
-STR_SMALL_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
+STR_TINY_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
STR_CANT_SHARE_ORDER_LIST :{WHITE}Fehler beim Erstellen eines gemeinsam genutzten Fahrplans...
STR_CANT_COPY_ORDER_LIST :{WHITE}Fahrplan kann nicht kopiert werden...
@@ -1160,8 +1159,7 @@ STR_CONFIG_SETTING_MAP_Y :{LTBLUE}Y-Abmes
############ generic strings for settings
STR_CONFIG_SETTING_DISABLED :ausgeschaltet
-STR_CONFIG_SETTING_INT32 :{NUM}
-STR_CONFIG_SETTING_CURRENCY :{CURRENCY}
+STR_JUST_CURRENCY :{CURRENCY}
STR_CONFIG_SETTING_QUERY_CAPT :{WHITE}Wert der Einstellung ändern
STR_TEMPERATE_LANDSCAPE :Gemäßigt
@@ -2127,8 +2125,8 @@ STR_NUM_LOW :Niedrig
STR_NUM_NORMAL :Normal
STR_NUM_HIGH :Hoch
STR_NUM_CUSTOM :Eigene
-STR_ARROW_LEFT_SMALL :{BLACK}{SMALLLEFTARROW}
-STR_ARROW_RIGHT_SMALL :{BLACK}{SMALLRIGHTARROW}
+STR_BLACK_SMALL_ARROW_LEFT :{BLACK}{SMALLLEFTARROW}
+STR_BLACK_SMALL_ARROW_RIGHT :{BLACK}{SMALLRIGHTARROW}
STR_AI_SPEED_VERY_SLOW :Sehr langsam
STR_AI_SPEED_SLOW :Langsam
STR_AI_SPEED_MEDIUM :Mittel
@@ -2809,7 +2807,7 @@ STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT :{WHITE}...muss
STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT :{WHITE}Fahrzeugdepot unauffindbar
STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP :{BLACK}Das Fahrzeug zur Umkehr zwingen
STR_ARTICULATED_RV_CAPACITY :{BLACK}Kapazität: {LTBLUE}
-STR_BARE_CARGO :{CARGO}
+STR_JUST_CARGO :{CARGO}
STR_DEPOT_VEHICLE_TOOLTIP :{BLACK}{ENGINE}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CHAIN :{BLACK}{NUM} Fahrzeug{P "" e}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CARGO :{}{CARGO} ({SHORTCARGO})
diff --git a/src/lang/hebrew.txt b/src/lang/hebrew.txt
index 7775aaa9b..c4e58d273 100644
--- a/src/lang/hebrew.txt
+++ b/src/lang/hebrew.txt
@@ -155,8 +155,8 @@ STR_ABBREV_PLASTIC :{TINYFONT}פל
STR_ABBREV_FIZZY_DRINKS :{TINYFONT}ממ
STR_ABBREV_NONE :{TINYFONT}כל
STR_ABBREV_ALL :{TINYFONT}הכל
-STR_DATE_SHORT_WHITE :{WHITE}{DATE_SHORT}
-STR_DATE_LONG_WHITE :{WHITE}{DATE_LONG}
+STR_WHITE_DATE_SHORT :{WHITE}{DATE_SHORT}
+STR_WHITE_DATE_LONG :{WHITE}{DATE_LONG}
STR_SMALLMAP_CAPTION :{WHITE}{STRING} - מפה
STR_GAME_OPTIONS_CAPTION :{WHITE}אפשרויות משחק
STR_ERROR_MESSAGE_CAPTION :{YELLOW}הודעה
@@ -328,7 +328,6 @@ STR_SORT_BY_PRODUCTION :ייצור
STR_SORT_BY_TYPE :סוג
STR_SORT_BY_TRANSPORTED :סחורה שנשלחה
STR_SORT_BY_NAME :{BLACK}שם
-STR_SORT_BY_DROPDOWN_NAME :שם
STR_SORT_BY_DATE :{BLACK}תאריך
STR_SORT_BY_NUMBER :מספר
STR_SORT_BY_PROFIT_LAST_YEAR :רווח שנה שעברה
@@ -408,8 +407,8 @@ STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS :{BLACK}בניי
STR_TOOLBAR_TOOLTIP_PLANT_TREES_PLACE_SIGNS :{BLACK}'נטיעת עצים, הצבת סימניות וכו
STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION :{BLACK}מידע על משבצת קרקע
STR_TOOLBAR_TOOLTIP_OPTIONS :{BLACK}אפשרויות
-STR_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
-STR_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
+STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
+STR_BLACK_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
STR_ERROR_CAN_T_CHANGE_SERVICING :{WHITE}...לא ניתן לשנות את מרווחי הטיפול
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}סגור חלון
STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}כותרת החלון - גרור להזזה
@@ -579,12 +578,12 @@ STR_HIGHSCORE_NAME :{BIGFONT}{PRESI
STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA})
STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BLACK}{BIGFONT} !'{1:STRING}'} הגיעה למעמד{NBSP} {0:COMPANY}
STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{WHITE}{BIGFONT} '{2:STRING}' הגיע לדרגת {NBSP}{1:COMPANY} מ {NBSP}{0:PRESIDENTNAME}
-STR_BLUE_NUMBER :{BLUE}{COMMA}
+STR_BLUE_COMMA :{BLUE}{COMMA}
STR_SCENEDIT_TOOLBAR_OPENTTD :{YELLOW}OpenTTD
STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR :{YELLOW}עורך הסצנריו
STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION :{WHITE}יצירת טופוגרפיה
-STR_ARROW_UP :{BLACK}{UPARROW}
-STR_ARROW_DOWN :{BLACK}{DOWNARROW}
+STR_BLACK_ARROW_UP :{BLACK}{UPARROW}
+STR_BLACK_ARROW_DOWN :{BLACK}{DOWNARROW}
STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA :{BLACK}הגדל מספר משבצות לעיבוד
STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA :{BLACK}הקטן מספר משבצות לעיבוד
STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND :{BLACK}צור קרקע אקראית
@@ -662,7 +661,7 @@ STR_FULL :מלא
STR_STATUSBAR_COMPANY_NAME :{SILVER}- - {COMPANY} - -
STR_BLACK_STRING :{BLACK}{STRING}
-STR_CHECKMARK :{CHECKMARK}
+STR_JUST_CHECKMARK :{CHECKMARK}
############ range for menu starts
STR_SETTINGS_MENU_GAME_OPTIONS :אפשרויות המשחק
STR_SETTINGS_MENU_DIFFICULTY_SETTINGS :הגדרות קושי
@@ -770,8 +769,8 @@ STR_STATUSBAR_SAVING_GAME :{RED}* * שו
STR_SAVE_STILL_IN_PROGRESS :{WHITE}!שמירה מתבצעת,{} אנא המתן עד לסיום השמירה
STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE :{BLACK}בחר בתוכנית מנגינה בסגנון קליל
-STR_6 :{BLACK}6
-STR_7 :{BLACK}7
+STR_BLACK_6 :{BLACK}6
+STR_BLACK_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :אנגלית
@@ -877,7 +876,7 @@ STR_CRATES :ארגזים
STR_RES_OTHER :אחר
STR_NOTHING :
-STR_SMALL_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
+STR_TINY_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
STR_CANT_SHARE_ORDER_LIST :{WHITE}לא ניתן לצמד יעדים...
STR_CANT_COPY_ORDER_LIST :{WHITE}לא ניתן להעתיק יעדים...
@@ -1141,8 +1140,7 @@ STR_CONFIG_SETTING_MAP_Y :{LTBLUE}Y-גו
############ generic strings for settings
STR_CONFIG_SETTING_DISABLED :מבוטל
-STR_CONFIG_SETTING_INT32 :{NUM}
-STR_CONFIG_SETTING_CURRENCY :{CURRENCY}
+STR_JUST_CURRENCY :{CURRENCY}
STR_CONFIG_SETTING_QUERY_CAPT :{WHITE}שנה ערך
STR_TEMPERATE_LANDSCAPE :אקלים ממוזג
@@ -2103,8 +2101,8 @@ STR_NUM_LOW :נמוך
STR_NUM_NORMAL :רגיל
STR_NUM_HIGH :גבוה
STR_NUM_CUSTOM :אחר
-STR_ARROW_LEFT_SMALL :{BLACK}{SMALLLEFTARROW}
-STR_ARROW_RIGHT_SMALL :{BLACK}{SMALLRIGHTARROW}
+STR_BLACK_SMALL_ARROW_LEFT :{BLACK}{SMALLLEFTARROW}
+STR_BLACK_SMALL_ARROW_RIGHT :{BLACK}{SMALLRIGHTARROW}
STR_AI_SPEED_VERY_SLOW :איטי ביותר
STR_AI_SPEED_SLOW :איטי
STR_AI_SPEED_MEDIUM :בינוני
@@ -2841,7 +2839,7 @@ STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}מקד
STR_BUILD_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP :{BLACK}רשימת כלי הרכב - בחר כלי רכב למידע
STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_TOOLTIP :{BLACK}בנה כלי רכב מהסוג שנבחר
STR_ARTICULATED_RV_CAPACITY :{BLACK} :קיבולת {LTBLUE}
-STR_BARE_CARGO :{CARGO}
+STR_JUST_CARGO :{CARGO}
STR_DEPOT_VEHICLE_TOOLTIP :{BLACK}{0:ENGINE}{1:STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CHAIN :{BLACK} {1:STRING} כלים {NBSP}{0:NUM}
STR_DEPOT_VEHICLE_TOOLTIP_CARGO :{}{CARGO} ({SHORTCARGO})
diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt
index 4b66dc30c..24325b707 100644
--- a/src/lang/hungarian.txt
+++ b/src/lang/hungarian.txt
@@ -187,8 +187,8 @@ STR_ABBREV_PLASTIC :{TINYFONT}MA
STR_ABBREV_FIZZY_DRINKS :{TINYFONT}SS
STR_ABBREV_NONE :{TINYFONT}SÁ
STR_ABBREV_ALL :{TINYFONT}ÖS
-STR_DATE_SHORT_WHITE :{WHITE}{DATE_SHORT}
-STR_DATE_LONG_WHITE :{WHITE}{DATE_LONG}
+STR_WHITE_DATE_SHORT :{WHITE}{DATE_SHORT}
+STR_WHITE_DATE_LONG :{WHITE}{DATE_LONG}
STR_SMALLMAP_CAPTION :{WHITE}Térkép - {STRING}
STR_GAME_OPTIONS_CAPTION :{WHITE}Beállítások
STR_ERROR_MESSAGE_CAPTION :{YELLOW}Üzenet
@@ -362,7 +362,6 @@ STR_SORT_BY_PRODUCTION :Termelés
STR_SORT_BY_TYPE :Típus
STR_SORT_BY_TRANSPORTED :Elszállítás
STR_SORT_BY_NAME :{BLACK}Név
-STR_SORT_BY_DROPDOWN_NAME :Név
STR_SORT_BY_DATE :{BLACK}Dátum
STR_SORT_BY_NUMBER :Szám
STR_SORT_BY_PROFIT_LAST_YEAR :Tavalyi profit
@@ -446,8 +445,8 @@ STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS :{BLACK}Repülő
STR_TOOLBAR_TOOLTIP_PLANT_TREES_PLACE_SIGNS :{BLACK}Faültetés, feliratok lerakása stb.
STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION :{BLACK}Terület-információ
STR_TOOLBAR_TOOLTIP_OPTIONS :{BLACK}Beállítások
-STR_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
-STR_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
+STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
+STR_BLACK_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
STR_ERROR_CAN_T_CHANGE_SERVICING :{WHITE}Nem változtathatod meg a javítási időközt...
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Az ablak bezárása
STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Az ablak címsora - húzd ezt a mozgatáshoz
@@ -617,12 +616,12 @@ STR_HIGHSCORE_NAME :{BIGFONT}{PRESI
STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA})
STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} elérte a '{STRING}' rangot!
STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} - {COMPANY} elérte a '{STRING}' rangot!
-STR_BLUE_NUMBER :{BLUE}{COMMA}
+STR_BLUE_COMMA :{BLUE}{COMMA}
STR_SCENEDIT_TOOLBAR_OPENTTD :{YELLOW}OpenTTD
STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR :{YELLOW}pályaszerkesztő
STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION :{WHITE}Táj szerkesztése
-STR_ARROW_UP :{BLACK}{UPARROW}
-STR_ARROW_DOWN :{BLACK}{DOWNARROW}
+STR_BLACK_ARROW_UP :{BLACK}{UPARROW}
+STR_BLACK_ARROW_DOWN :{BLACK}{DOWNARROW}
STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA :{BLACK}Az emelendő/süllyesztendő földterület növelése
STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA :{BLACK}Az emelendő/süllyesztendő földterület csökkentése
STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND :{BLACK}Véletlenszerű táj készítése
@@ -706,7 +705,7 @@ STR_FULL :Teljes
STR_STATUSBAR_COMPANY_NAME :{SILVER}- - {COMPANY} - -
STR_BLACK_STRING :{BLACK}{STRING}
-STR_CHECKMARK :{CHECKMARK}
+STR_JUST_CHECKMARK :{CHECKMARK}
############ range for menu starts
STR_SETTINGS_MENU_GAME_OPTIONS :Beállítások
STR_SETTINGS_MENU_DIFFICULTY_SETTINGS :Nehézségi beállítások
@@ -811,8 +810,8 @@ STR_STATUSBAR_SAVING_GAME :{RED}* * JÁT
STR_SAVE_STILL_IN_PROGRESS :{WHITE}A mentés még tart,{}kérlek várd meg a végét!
STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE :{BLACK}A 'szép az élet' zenei műsor kiválasztása
-STR_6 :{BLACK}6
-STR_7 :{BLACK}7
+STR_BLACK_6 :{BLACK}6
+STR_BLACK_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :Angol (Eredeti)
@@ -920,7 +919,7 @@ STR_CRATES :láda
STR_RES_OTHER :egyéb
STR_NOTHING :
-STR_SMALL_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
+STR_TINY_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
STR_CANT_SHARE_ORDER_LIST :{WHITE}Nem lehet megosztani a menetrendet...
STR_CANT_COPY_ORDER_LIST :{WHITE}Nem lehet másolni a menetrendet...
@@ -1193,8 +1192,7 @@ STR_CONFIG_SETTING_MAP_Y :{LTBLUE}ÉNY-DK
############ generic strings for settings
STR_CONFIG_SETTING_DISABLED :kikapcsolva
-STR_CONFIG_SETTING_INT32 :{NUM}
-STR_CONFIG_SETTING_CURRENCY :{CURRENCY}
+STR_JUST_CURRENCY :{CURRENCY}
STR_CONFIG_SETTING_QUERY_CAPT :{WHITE}Válassz beállítási értéket
STR_TEMPERATE_LANDSCAPE :mérsékelt táj
@@ -2197,8 +2195,8 @@ STR_NUM_LOW :Kevés
STR_NUM_NORMAL :Normál
STR_NUM_HIGH :Sok
STR_NUM_CUSTOM :Saját
-STR_ARROW_LEFT_SMALL :{BLACK}{SMALLLEFTARROW}
-STR_ARROW_RIGHT_SMALL :{BLACK}{SMALLRIGHTARROW}
+STR_BLACK_SMALL_ARROW_LEFT :{BLACK}{SMALLLEFTARROW}
+STR_BLACK_SMALL_ARROW_RIGHT :{BLACK}{SMALLRIGHTARROW}
STR_AI_SPEED_VERY_SLOW :Nagyon lassú
STR_AI_SPEED_SLOW :Lassú
STR_AI_SPEED_MEDIUM :Közepes
@@ -2879,7 +2877,7 @@ STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT :{WHITE}...gará
STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT :{WHITE}Nem találom a helyi garázst
STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP :{BLACK}Visszafordítja a járművet
STR_ARTICULATED_RV_CAPACITY :{BLACK}Kapacitás: {LTBLUE}
-STR_BARE_CARGO :{CARGO}
+STR_JUST_CARGO :{CARGO}
STR_DEPOT_VEHICLE_TOOLTIP :{BLACK}{ENGINE}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CHAIN :{BLACK}{NUM} jármű{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CARGO :{}{CARGO} ({SHORTCARGO})
diff --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt
index 72c420ca2..bca309710 100644
--- a/src/lang/icelandic.txt
+++ b/src/lang/icelandic.txt
@@ -155,8 +155,8 @@ STR_ABBREV_PLASTIC :{TINYFONT}PL
STR_ABBREV_FIZZY_DRINKS :{TINYFONT}FZ
STR_ABBREV_NONE :{TINYFONT}EKKERT
STR_ABBREV_ALL :{TINYFONT}ALLT
-STR_DATE_SHORT_WHITE :{WHITE}{DATE_SHORT}
-STR_DATE_LONG_WHITE :{WHITE}{DATE_LONG}
+STR_WHITE_DATE_SHORT :{WHITE}{DATE_SHORT}
+STR_WHITE_DATE_LONG :{WHITE}{DATE_LONG}
STR_SMALLMAP_CAPTION :{WHITE}Kort - {STRING}
STR_GAME_OPTIONS_CAPTION :{WHITE}Stillingar
STR_ERROR_MESSAGE_CAPTION :{YELLOW}Skilaboð
@@ -329,7 +329,6 @@ STR_SORT_BY_PRODUCTION :Framleiðsla
STR_SORT_BY_TYPE :Tegund
STR_SORT_BY_TRANSPORTED :Flutt
STR_SORT_BY_NAME :{BLACK}Nafn
-STR_SORT_BY_DROPDOWN_NAME :Nafn
STR_SORT_BY_DATE :{BLACK}Dagsetning
STR_SORT_BY_NUMBER :Númer
STR_SORT_BY_PROFIT_LAST_YEAR :Hagnaður síðasta árs
@@ -411,8 +410,8 @@ STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS :{BLACK}Byggja f
STR_TOOLBAR_TOOLTIP_PLANT_TREES_PLACE_SIGNS :{BLACK}Gróðursetja tré, setja skilti o.s.frv.
STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION :{BLACK}Landssvæðisupplýsingar
STR_TOOLBAR_TOOLTIP_OPTIONS :{BLACK}Stillingar
-STR_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
-STR_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
+STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
+STR_BLACK_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
STR_ERROR_CAN_T_CHANGE_SERVICING :{WHITE}Get ekki breytt viðgerðarmillibili...
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Loka glugga
STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Haus glugga - dragðu með músinni til að færa gluggann
@@ -582,12 +581,12 @@ STR_HIGHSCORE_NAME :{BIGFONT}{PRESI
STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA})
STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} öðlast '{STRING}' titil!
STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} úr {COMPANY} öðlast '{STRING}' titil!
-STR_BLUE_NUMBER :{BLUE}{COMMA}
+STR_BLUE_COMMA :{BLUE}{COMMA}
STR_SCENEDIT_TOOLBAR_OPENTTD :{YELLOW}OpenTTD
STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR :{YELLOW}Kortagerð
STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION :{WHITE}Landslagsgerð
-STR_ARROW_UP :{BLACK}{UPARROW}
-STR_ARROW_DOWN :{BLACK}{DOWNARROW}
+STR_BLACK_ARROW_UP :{BLACK}{UPARROW}
+STR_BLACK_ARROW_DOWN :{BLACK}{DOWNARROW}
STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA :{BLACK}Stækka svæði til að lækka/hækka
STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA :{BLACK}Minnka svæði til að lækka/hækka
STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND :{BLACK}Mynda til land af handahófi
@@ -671,7 +670,7 @@ STR_FULL :Allt
STR_STATUSBAR_COMPANY_NAME :{SILVER}- - {COMPANY} - -
STR_BLACK_STRING :{BLACK}{STRING}
-STR_CHECKMARK :{CHECKMARK}
+STR_JUST_CHECKMARK :{CHECKMARK}
############ range for menu starts
STR_SETTINGS_MENU_GAME_OPTIONS :Stillingar
STR_SETTINGS_MENU_DIFFICULTY_SETTINGS :Erfiðleikastig
@@ -779,8 +778,8 @@ STR_STATUSBAR_SAVING_GAME :{RED}* * VIST
STR_SAVE_STILL_IN_PROGRESS :{WHITE}Vistun er enn í gangi,{}vinsamlegast bíddu á meðan hún klárst!
STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE :{BLACK}Velja 'Ezy gata' listann
-STR_6 :{BLACK}6
-STR_7 :{BLACK}7
+STR_BLACK_6 :{BLACK}6
+STR_BLACK_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :Ensk (Upphafleg)
@@ -888,7 +887,7 @@ STR_CRATES :kassar
STR_RES_OTHER :annað
STR_NOTHING :
-STR_SMALL_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
+STR_TINY_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
STR_CANT_SHARE_ORDER_LIST :{WHITE}Get ekki deilt áætlun...
STR_CANT_COPY_ORDER_LIST :{WHITE}Get ekki afritað áætlun...
@@ -1161,8 +1160,7 @@ STR_CONFIG_SETTING_MAP_Y :{LTBLUE}Breidd
############ generic strings for settings
STR_CONFIG_SETTING_DISABLED :óvirkt
-STR_CONFIG_SETTING_INT32 :{NUM}
-STR_CONFIG_SETTING_CURRENCY :{CURRENCY}
+STR_JUST_CURRENCY :{CURRENCY}
STR_CONFIG_SETTING_QUERY_CAPT :{WHITE}Breyta gildi stillingar
STR_TEMPERATE_LANDSCAPE :Temprað landslag
@@ -2128,8 +2126,8 @@ STR_NUM_LOW :Fáir
STR_NUM_NORMAL :Miðlungs
STR_NUM_HIGH :Margir
STR_NUM_CUSTOM :Sérstillt
-STR_ARROW_LEFT_SMALL :{BLACK}{SMALLLEFTARROW}
-STR_ARROW_RIGHT_SMALL :{BLACK}{SMALLRIGHTARROW}
+STR_BLACK_SMALL_ARROW_LEFT :{BLACK}{SMALLLEFTARROW}
+STR_BLACK_SMALL_ARROW_RIGHT :{BLACK}{SMALLRIGHTARROW}
STR_AI_SPEED_VERY_SLOW :Mjög hægt
STR_AI_SPEED_SLOW :Hægt
STR_AI_SPEED_MEDIUM :Miðlungs
@@ -2885,7 +2883,7 @@ STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Miðja a
STR_BUILD_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP :{BLACK}Bifreiðalisti - ýttu á bifreið fyrir nánari upplýsingar
STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_TOOLTIP :{BLACK}Kaupa valda bifreið
STR_ARTICULATED_RV_CAPACITY :{BLACK}Rými: {LTBLUE}
-STR_BARE_CARGO :{CARGO}
+STR_JUST_CARGO :{CARGO}
STR_DEPOT_VEHICLE_TOOLTIP :{BLACK}{ENGINE}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CHAIN :{BLACK}{NUM} farartæki{P "" s}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CARGO :{}{CARGO} ({SHORTCARGO})
diff --git a/src/lang/indonesian.txt b/src/lang/indonesian.txt
index ef3bb0dbe..af2011975 100644
--- a/src/lang/indonesian.txt
+++ b/src/lang/indonesian.txt
@@ -154,8 +154,8 @@ STR_ABBREV_PLASTIC :{TINYFONT}PL
STR_ABBREV_FIZZY_DRINKS :{TINYFONT}MB
STR_ABBREV_NONE :{TINYFONT}TANPA
STR_ABBREV_ALL :{TINYFONT}SMA
-STR_DATE_SHORT_WHITE :{WHITE}{DATE_SHORT}
-STR_DATE_LONG_WHITE :{WHITE}{DATE_LONG}
+STR_WHITE_DATE_SHORT :{WHITE}{DATE_SHORT}
+STR_WHITE_DATE_LONG :{WHITE}{DATE_LONG}
STR_SMALLMAP_CAPTION :{WHITE}Peta - {STRING}
STR_GAME_OPTIONS_CAPTION :{WHITE}Pengaturan permainan
STR_ERROR_MESSAGE_CAPTION :{YELLOW}Pesan
@@ -328,7 +328,6 @@ STR_SORT_BY_PRODUCTION :Produksi
STR_SORT_BY_TYPE :Jenis
STR_SORT_BY_TRANSPORTED :Terkirim
STR_SORT_BY_NAME :{BLACK}Nama
-STR_SORT_BY_DROPDOWN_NAME :Nama
STR_SORT_BY_DATE :{BLACK}Tanggal
STR_SORT_BY_NUMBER :Nomer
STR_SORT_BY_PROFIT_LAST_YEAR :Keuntungan tahun lalu
@@ -412,8 +411,8 @@ STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS :{BLACK}Membangu
STR_TOOLBAR_TOOLTIP_PLANT_TREES_PLACE_SIGNS :{BLACK}Menanam pohon, meletakkan papan nama, dll
STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION :{BLACK}Informasi area daratan
STR_TOOLBAR_TOOLTIP_OPTIONS :{BLACK}Pilihan
-STR_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
-STR_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
+STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
+STR_BLACK_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
STR_ERROR_CAN_T_CHANGE_SERVICING :{WHITE}Tidak dapat mengubah waktu servis
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Tutup window
STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Judul Jendela - klik dan tahan disini untuk memindahkan jendela
@@ -583,12 +582,12 @@ STR_HIGHSCORE_NAME :{BIGFONT}{PRESI
STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA})
STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} mencapai status '{STRING}' !
STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} dari {COMPANY} mencapai status '{STRING}' !
-STR_BLUE_NUMBER :{BLUE}{COMMA}
+STR_BLUE_COMMA :{BLUE}{COMMA}
STR_SCENEDIT_TOOLBAR_OPENTTD :{YELLOW}OpenTTD
STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR :{YELLOW}Editor Skenario
STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION :{WHITE}Pertumbuhan Wilayah
-STR_ARROW_UP :{BLACK}{UPARROW}
-STR_ARROW_DOWN :{BLACK}{DOWNARROW}
+STR_BLACK_ARROW_UP :{BLACK}{UPARROW}
+STR_BLACK_ARROW_DOWN :{BLACK}{DOWNARROW}
STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA :{BLACK}Tambah ukuran area untuk menurunkan/menaikkan
STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA :{BLACK}Kurangi ukuran area untuk menurunkan/menaikkan
STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND :{BLACK}Buat wilayah secara acak
@@ -672,7 +671,7 @@ STR_FULL :Penuh
STR_STATUSBAR_COMPANY_NAME :{SILVER}- - {COMPANY} - -
STR_BLACK_STRING :{BLACK}{STRING}
-STR_CHECKMARK :{CHECKMARK}
+STR_JUST_CHECKMARK :{CHECKMARK}
############ range for menu starts
STR_SETTINGS_MENU_GAME_OPTIONS :Pengaturan permainan
STR_SETTINGS_MENU_DIFFICULTY_SETTINGS :Pengaturan tingkat kesulitan
@@ -777,8 +776,8 @@ STR_STATUSBAR_SAVING_GAME :{RED}* * MENY
STR_SAVE_STILL_IN_PROGRESS :{WHITE}Penyimpanan sedang berlangsung,{}mohon tunggu hingga selesai
STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE :{BLACK}Pilih program 'gaya music Ezy Street'
-STR_6 :{BLACK}6
-STR_7 :{BLACK}7
+STR_BLACK_6 :{BLACK}6
+STR_BLACK_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :Inggris (Orisinil)
@@ -886,7 +885,7 @@ STR_CRATES :peti
STR_RES_OTHER :lainnya
STR_NOTHING :
-STR_SMALL_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
+STR_TINY_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
STR_CANT_SHARE_ORDER_LIST :{WHITE}Tidak dapat berbagi perintah...
STR_CANT_COPY_ORDER_LIST :{WHITE}Tidak dapat meniru perintah...
@@ -1159,8 +1158,7 @@ STR_CONFIG_SETTING_MAP_Y :{LTBLUE}Ukuran
############ generic strings for settings
STR_CONFIG_SETTING_DISABLED :Non-aktifkan
-STR_CONFIG_SETTING_INT32 :{NUM}
-STR_CONFIG_SETTING_CURRENCY :{CURRENCY}
+STR_JUST_CURRENCY :{CURRENCY}
STR_CONFIG_SETTING_QUERY_CAPT :{WHITE}Ganti nilai tetapan
STR_TEMPERATE_LANDSCAPE :Lansekap 'sederhana'
@@ -2126,8 +2124,8 @@ STR_NUM_LOW :Sedikit
STR_NUM_NORMAL :Normal
STR_NUM_HIGH :Padat
STR_NUM_CUSTOM :Bebas
-STR_ARROW_LEFT_SMALL :{BLACK}{SMALLLEFTARROW}
-STR_ARROW_RIGHT_SMALL :{BLACK}{SMALLRIGHTARROW}
+STR_BLACK_SMALL_ARROW_LEFT :{BLACK}{SMALLLEFTARROW}
+STR_BLACK_SMALL_ARROW_RIGHT :{BLACK}{SMALLRIGHTARROW}
STR_AI_SPEED_VERY_SLOW :Sangat lambat
STR_AI_SPEED_SLOW :Lambat
STR_AI_SPEED_MEDIUM :Sedang
@@ -2808,7 +2806,7 @@ STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT :{WHITE}...harus
STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT :{WHITE}Tidak dapat menemukan garasi terdekat
STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP :{BLACK}Paksa kendaraan untuk berbalik arah
STR_ARTICULATED_RV_CAPACITY :{BLACK}Kapasitas: {LTBLUE}
-STR_BARE_CARGO :{CARGO}
+STR_JUST_CARGO :{CARGO}
STR_DEPOT_VEHICLE_TOOLTIP :{BLACK}{ENGINE}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CHAIN :{BLACK}{NUM} kendaraan{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CARGO :{}{CARGO} ({SHORTCARGO})
diff --git a/src/lang/italian.txt b/src/lang/italian.txt
index 3a2fa279a..2bb6b2d53 100644
--- a/src/lang/italian.txt
+++ b/src/lang/italian.txt
@@ -156,8 +156,8 @@ STR_ABBREV_PLASTIC :{TINYFONT}PL
STR_ABBREV_FIZZY_DRINKS :{TINYFONT}BF
STR_ABBREV_NONE :{TINYFONT}NO
STR_ABBREV_ALL :{TINYFONT}TUT
-STR_DATE_SHORT_WHITE :{WHITE}{DATE_SHORT}
-STR_DATE_LONG_WHITE :{WHITE}{DATE_LONG}
+STR_WHITE_DATE_SHORT :{WHITE}{DATE_SHORT}
+STR_WHITE_DATE_LONG :{WHITE}{DATE_LONG}
STR_SMALLMAP_CAPTION :{WHITE}Mappa - {STRING}
STR_GAME_OPTIONS_CAPTION :{WHITE}Opzioni di gioco
STR_ERROR_MESSAGE_CAPTION :{YELLOW}Messaggio
@@ -330,7 +330,6 @@ STR_SORT_BY_PRODUCTION :Produzione
STR_SORT_BY_TYPE :Tipo
STR_SORT_BY_TRANSPORTED :Trasportato
STR_SORT_BY_NAME :{BLACK}Nome
-STR_SORT_BY_DROPDOWN_NAME :Nome
STR_SORT_BY_DATE :{BLACK}Data
STR_SORT_BY_NUMBER :Numero
STR_SORT_BY_PROFIT_LAST_YEAR :Profitto dell'anno scorso
@@ -414,8 +413,8 @@ STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS :{BLACK}Costruis
STR_TOOLBAR_TOOLTIP_PLANT_TREES_PLACE_SIGNS :{BLACK}Pianta alberi, posiziona cartelli etc.
STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION :{BLACK}Informazioni area terreno
STR_TOOLBAR_TOOLTIP_OPTIONS :{BLACK}Opzioni
-STR_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
-STR_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
+STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
+STR_BLACK_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
STR_ERROR_CAN_T_CHANGE_SERVICING :{WHITE}Impossibile cambiare l'intervallo di manutenzione...
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Chiude la finestra
STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Titolo della finestra - trascinarlo per muovere la finestra
@@ -585,12 +584,12 @@ STR_HIGHSCORE_NAME :{BIGFONT}{PRESI
STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA})
STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} raggiunge lo status di '{STRING}'!
STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} della {COMPANY} raggiunge lo status di '{STRING}'!
-STR_BLUE_NUMBER :{BLUE}{COMMA}
+STR_BLUE_COMMA :{BLUE}{COMMA}
STR_SCENEDIT_TOOLBAR_OPENTTD :{YELLOW}OpenTTD
STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR :{YELLOW}Editor di scenari
STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION :{WHITE}Generazione terreno
-STR_ARROW_UP :{BLACK}{UPARROW}
-STR_ARROW_DOWN :{BLACK}{DOWNARROW}
+STR_BLACK_ARROW_UP :{BLACK}{UPARROW}
+STR_BLACK_ARROW_DOWN :{BLACK}{DOWNARROW}
STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA :{BLACK}Aumenta l'ampiezza del terreno da abbassare/alzare
STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA :{BLACK}Riduce l'ampiezza del terreno da abbassare/alzare
STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND :{BLACK}Genera terreno casuale
@@ -674,7 +673,7 @@ STR_FULL :Completo
STR_STATUSBAR_COMPANY_NAME :{SILVER}- - {COMPANY} - -
STR_BLACK_STRING :{BLACK}{STRING}
-STR_CHECKMARK :{CHECKMARK}
+STR_JUST_CHECKMARK :{CHECKMARK}
############ range for menu starts
STR_SETTINGS_MENU_GAME_OPTIONS :Opzioni gioco
STR_SETTINGS_MENU_DIFFICULTY_SETTINGS :Impostazioni difficoltà
@@ -779,8 +778,8 @@ STR_STATUSBAR_SAVING_GAME :{RED}* * SALV
STR_SAVE_STILL_IN_PROGRESS :{WHITE}Salvataggio in corso,{}prego attenderne la fine!
STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE :{BLACK}Seleziona il programma 'Musica ezy street'
-STR_6 :{BLACK}6
-STR_7 :{BLACK}7
+STR_BLACK_6 :{BLACK}6
+STR_BLACK_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :Inglesi (originali)
@@ -888,7 +887,7 @@ STR_CRATES :casse
STR_RES_OTHER :Altra
STR_NOTHING :
-STR_SMALL_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
+STR_TINY_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
STR_CANT_SHARE_ORDER_LIST :{WHITE}Impossibile condividere la lista degli ordini...
STR_CANT_COPY_ORDER_LIST :{WHITE}Impossibile copiare la lista degli ordini...
@@ -1161,8 +1160,7 @@ STR_CONFIG_SETTING_MAP_Y :{LTBLUE}Dimensi
############ generic strings for settings
STR_CONFIG_SETTING_DISABLED :disabilitato
-STR_CONFIG_SETTING_INT32 :{NUM}
-STR_CONFIG_SETTING_CURRENCY :{CURRENCY}
+STR_JUST_CURRENCY :{CURRENCY}
STR_CONFIG_SETTING_QUERY_CAPT :{WHITE}Cambia impostazione
STR_TEMPERATE_LANDSCAPE :Paesaggio 'temperato'
@@ -2128,8 +2126,8 @@ STR_NUM_LOW :Basso
STR_NUM_NORMAL :Normale
STR_NUM_HIGH :Alto
STR_NUM_CUSTOM :Personalizzati
-STR_ARROW_LEFT_SMALL :{BLACK}{SMALLLEFTARROW}
-STR_ARROW_RIGHT_SMALL :{BLACK}{SMALLRIGHTARROW}
+STR_BLACK_SMALL_ARROW_LEFT :{BLACK}{SMALLLEFTARROW}
+STR_BLACK_SMALL_ARROW_RIGHT :{BLACK}{SMALLRIGHTARROW}
STR_AI_SPEED_VERY_SLOW :Molto lenta
STR_AI_SPEED_SLOW :Lenta
STR_AI_SPEED_MEDIUM :Media
@@ -2810,7 +2808,7 @@ STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT :{WHITE}...deve
STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT :{WHITE}Impossibile trovare il deposito più vicino
STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP :{BLACK}Fa fare un'inversione al veicolo
STR_ARTICULATED_RV_CAPACITY :{BLACK}Capacità: {LTBLUE}
-STR_BARE_CARGO :{CARGO}
+STR_JUST_CARGO :{CARGO}
STR_DEPOT_VEHICLE_TOOLTIP :{BLACK}{ENGINE}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CHAIN :{BLACK}{NUM} component{P e i}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CARGO :{}{CARGO} ({SHORTCARGO})
diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt
index 4aba592e5..73eab73a6 100644
--- a/src/lang/japanese.txt
+++ b/src/lang/japanese.txt
@@ -154,8 +154,8 @@ STR_ABBREV_PLASTIC :{TINYFONT}プ
STR_ABBREV_FIZZY_DRINKS :{TINYFONT}ソ
STR_ABBREV_NONE :{TINYFONT}無
STR_ABBREV_ALL :{TINYFONT}全
-STR_DATE_SHORT_WHITE :{WHITE}{DATE_SHORT}
-STR_DATE_LONG_WHITE :{WHITE}{DATE_LONG}
+STR_WHITE_DATE_SHORT :{WHITE}{DATE_SHORT}
+STR_WHITE_DATE_LONG :{WHITE}{DATE_LONG}
STR_SMALLMAP_CAPTION :{WHITE}地図 - {STRING}
STR_GAME_OPTIONS_CAPTION :{WHITE}ゲームの設定
STR_ERROR_MESSAGE_CAPTION :{YELLOW}メッセージ
@@ -327,7 +327,6 @@ STR_SORT_BY_PRODUCTION :生産量
STR_SORT_BY_TYPE :種類
STR_SORT_BY_TRANSPORTED :運送済み
STR_SORT_BY_NAME :{BLACK}名前
-STR_SORT_BY_DROPDOWN_NAME :名前
STR_SORT_BY_DATE :{BLACK}日付
STR_SORT_BY_NUMBER :番号
STR_SORT_BY_PROFIT_LAST_YEAR :昨年の損益
@@ -407,8 +406,8 @@ STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS :{BLACK}空港
STR_TOOLBAR_TOOLTIP_PLANT_TREES_PLACE_SIGNS :{BLACK}植林、標示設置等を行います
STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION :{BLACK}地域情報
STR_TOOLBAR_TOOLTIP_OPTIONS :{BLACK}設定
-STR_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
-STR_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
+STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
+STR_BLACK_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
STR_ERROR_CAN_T_CHANGE_SERVICING :{WHITE}整備間隔を変更できません
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}ウィンドウを閉じます
STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}ウィンドウのタイトル - ウィンドウを動かすには、クリックしてドラッグします
@@ -577,12 +576,12 @@ STR_HIGHSCORE_NAME :{BIGFONT}{PRESI
STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}'({COMMA})
STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} は「{STRING}」に達した!
STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME}({COMPANY})は「{STRING}」に達した!
-STR_BLUE_NUMBER :{BLUE}{COMMA}
+STR_BLUE_COMMA :{BLUE}{COMMA}
STR_SCENEDIT_TOOLBAR_OPENTTD :{YELLOW}OpenTTD
STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR :{YELLOW}シナリオエディタ
STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION :{WHITE}地形の作成
-STR_ARROW_UP :{BLACK}{UPARROW}
-STR_ARROW_DOWN :{BLACK}{DOWNARROW}
+STR_BLACK_ARROW_UP :{BLACK}{UPARROW}
+STR_BLACK_ARROW_DOWN :{BLACK}{DOWNARROW}
STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA :{BLACK}上げる/下げる地域のサイズを拡大します
STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA :{BLACK}上げる/下げる地域のサイズを縮小します
STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND :{BLACK}ランダムな地形を作成します
@@ -666,7 +665,7 @@ STR_FULL :完全
STR_STATUSBAR_COMPANY_NAME :{SILVER}- - {COMPANY} - -
STR_BLACK_STRING :{BLACK}{STRING}
-STR_CHECKMARK :{CHECKMARK}
+STR_JUST_CHECKMARK :{CHECKMARK}
############ range for menu starts
STR_SETTINGS_MENU_GAME_OPTIONS :ゲームの基本設定
STR_SETTINGS_MENU_DIFFICULTY_SETTINGS :難易度の設定
@@ -774,8 +773,8 @@ STR_STATUSBAR_SAVING_GAME :{RED}**ゲ
STR_SAVE_STILL_IN_PROGRESS :{WHITE}ゲームを保存しています{}完了してからしばらくお待ちください!
STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE :{BLACK}'Ezy Street 式の音楽'のプレイリストを選択します
-STR_6 :{BLACK}6
-STR_7 :{BLACK}7
+STR_BLACK_6 :{BLACK}6
+STR_BLACK_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :イギリス
@@ -882,7 +881,7 @@ STR_CRATES :箱
STR_RES_OTHER :その他
STR_NOTHING :
-STR_SMALL_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
+STR_TINY_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
STR_CANT_SHARE_ORDER_LIST :{WHITE}指令リストを共有できません...
STR_CANT_COPY_ORDER_LIST :{WHITE}指令リストをコピーできません...
@@ -1138,8 +1137,7 @@ STR_CONFIG_SETTING_MAP_Y :{LTBLUE}地図
############ generic strings for settings
STR_CONFIG_SETTING_DISABLED :切
-STR_CONFIG_SETTING_INT32 :{NUM}
-STR_CONFIG_SETTING_CURRENCY :{CURRENCY}
+STR_JUST_CURRENCY :{CURRENCY}
STR_CONFIG_SETTING_QUERY_CAPT :{WHITE}設定を変更します
STR_TEMPERATE_LANDSCAPE :温帯国
@@ -2104,8 +2102,8 @@ STR_NUM_LOW :低い
STR_NUM_NORMAL :通常
STR_NUM_HIGH :高い
STR_NUM_CUSTOM :カスタム
-STR_ARROW_LEFT_SMALL :{BLACK}{SMALLLEFTARROW}
-STR_ARROW_RIGHT_SMALL :{BLACK}{SMALLRIGHTARROW}
+STR_BLACK_SMALL_ARROW_LEFT :{BLACK}{SMALLLEFTARROW}
+STR_BLACK_SMALL_ARROW_RIGHT :{BLACK}{SMALLRIGHTARROW}
STR_AI_SPEED_VERY_SLOW :特に遅い
STR_AI_SPEED_SLOW :遅い
STR_AI_SPEED_MEDIUM :中位
@@ -2844,7 +2842,7 @@ STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}主の
STR_BUILD_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP :{BLACK}道路車両のリスト - 情報を見るには車両をクリックします
STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_TOOLTIP :{BLACK}選択した道路車両を購入します
STR_ARTICULATED_RV_CAPACITY :{BLACK}容量:{LTBLUE}
-STR_BARE_CARGO :{CARGO}
+STR_JUST_CARGO :{CARGO}
STR_DEPOT_VEHICLE_TOOLTIP :{BLACK}{ENGINE}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CARGO :{}{CARGO} ({SHORTCARGO})
diff --git a/src/lang/korean.txt b/src/lang/korean.txt
index 6dde86d97..72dd89533 100644
--- a/src/lang/korean.txt
+++ b/src/lang/korean.txt
@@ -155,8 +155,8 @@ STR_ABBREV_PLASTIC :{TINYFONT}PL
STR_ABBREV_FIZZY_DRINKS :{TINYFONT}FZ
STR_ABBREV_NONE :{TINYFONT}NO
STR_ABBREV_ALL :{TINYFONT}ALL
-STR_DATE_SHORT_WHITE :{WHITE}{DATE_SHORT}
-STR_DATE_LONG_WHITE :{WHITE}{DATE_LONG}
+STR_WHITE_DATE_SHORT :{WHITE}{DATE_SHORT}
+STR_WHITE_DATE_LONG :{WHITE}{DATE_LONG}
STR_SMALLMAP_CAPTION :{WHITE}지도 - {STRING}
STR_GAME_OPTIONS_CAPTION :{WHITE}게임 설정
STR_ERROR_MESSAGE_CAPTION :{YELLOW}알림
@@ -329,7 +329,6 @@ STR_SORT_BY_PRODUCTION :생산
STR_SORT_BY_TYPE :종류
STR_SORT_BY_TRANSPORTED :수송량
STR_SORT_BY_NAME :{BLACK}이름
-STR_SORT_BY_DROPDOWN_NAME :이름
STR_SORT_BY_DATE :{BLACK}날짜
STR_SORT_BY_NUMBER :번호
STR_SORT_BY_PROFIT_LAST_YEAR :작년 수익
@@ -411,8 +410,8 @@ STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS :{BLACK}공항
STR_TOOLBAR_TOOLTIP_PLANT_TREES_PLACE_SIGNS :{BLACK}나무 심기
STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION :{BLACK}지역 정보
STR_TOOLBAR_TOOLTIP_OPTIONS :{BLACK}옵션
-STR_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
-STR_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
+STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
+STR_BLACK_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
STR_ERROR_CAN_T_CHANGE_SERVICING :{WHITE}점검 기간 간격을 바꿀 수 없습니다...
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}창 닫기
STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}창 제목 - 창을 움직이려면 여기를 드래그하세요
@@ -582,12 +581,12 @@ STR_HIGHSCORE_NAME :{BIGFONT}{PRESI
STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA})
STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY}가 '{STRING}'{G 0 "을" "를"} 달성했습니다!
STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME}의 {COMPANY}이(가) 드디어 {STRING}을(를) 달성했습니다!
-STR_BLUE_NUMBER :{BLUE}{COMMA}
+STR_BLUE_COMMA :{BLUE}{COMMA}
STR_SCENEDIT_TOOLBAR_OPENTTD :{YELLOW}OpenTTD
STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR :{YELLOW}시나리오 에디터
STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION :{WHITE}지형 만들기
-STR_ARROW_UP :{BLACK}{UPARROW}
-STR_ARROW_DOWN :{BLACK}{DOWNARROW}
+STR_BLACK_ARROW_UP :{BLACK}{UPARROW}
+STR_BLACK_ARROW_DOWN :{BLACK}{DOWNARROW}
STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA :{BLACK}지형 편집툴의 크기를 키움
STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA :{BLACK}지형 편집툴의 크기를 줄임
STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND :{BLACK}무작위로 지형 만들기
@@ -671,7 +670,7 @@ STR_FULL :전체
STR_STATUSBAR_COMPANY_NAME :{SILVER}- - {COMPANY} - -
STR_BLACK_STRING :{BLACK}{STRING}
-STR_CHECKMARK :{CHECKMARK}
+STR_JUST_CHECKMARK :{CHECKMARK}
############ range for menu starts
STR_SETTINGS_MENU_GAME_OPTIONS :게임 옵션
STR_SETTINGS_MENU_DIFFICULTY_SETTINGS :난이도 설정
@@ -776,8 +775,8 @@ STR_STATUSBAR_SAVING_GAME :{RED}* * 게
STR_SAVE_STILL_IN_PROGRESS :{WHITE}저장중입니다,{}끝날때까지 기다려주세요
STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE :{BLACK}'Ezy Street 스타일 음악' 프로그램을 선택합니다
-STR_6 :{G=m}{BLACK}6
-STR_7 :{G=m}{BLACK}7
+STR_BLACK_6 :{G=m}{BLACK}6
+STR_BLACK_7 :{G=m}{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :영국 식 (기본)
@@ -885,7 +884,7 @@ STR_CRATES :{G=f}상자
STR_RES_OTHER :{G=f}기타
STR_NOTHING :
-STR_SMALL_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
+STR_TINY_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
STR_CANT_SHARE_ORDER_LIST :{WHITE}경로를 공유할 수 없습니다...
STR_CANT_COPY_ORDER_LIST :{WHITE}경로를 복사할 수 없습니다...
@@ -1158,8 +1157,7 @@ STR_CONFIG_SETTING_MAP_Y :{LTBLUE}맵의
############ generic strings for settings
STR_CONFIG_SETTING_DISABLED :사용불가
-STR_CONFIG_SETTING_INT32 :{NUM}
-STR_CONFIG_SETTING_CURRENCY :{CURRENCY}
+STR_JUST_CURRENCY :{CURRENCY}
STR_CONFIG_SETTING_QUERY_CAPT :{WHITE}설정값 변경
STR_TEMPERATE_LANDSCAPE :온대 기후
@@ -2125,8 +2123,8 @@ STR_NUM_LOW :낮음
STR_NUM_NORMAL :보통
STR_NUM_HIGH :높음
STR_NUM_CUSTOM :사용자
-STR_ARROW_LEFT_SMALL :{BLACK}{SMALLLEFTARROW}
-STR_ARROW_RIGHT_SMALL :{BLACK}{SMALLRIGHTARROW}
+STR_BLACK_SMALL_ARROW_LEFT :{BLACK}{SMALLLEFTARROW}
+STR_BLACK_SMALL_ARROW_RIGHT :{BLACK}{SMALLRIGHTARROW}
STR_AI_SPEED_VERY_SLOW :매우 느림
STR_AI_SPEED_SLOW :느림
STR_AI_SPEED_MEDIUM :보통
@@ -2876,7 +2874,7 @@ STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}이 차
STR_BUILD_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP :{BLACK}자동차 선택 목록 - 차량 정보를 보려면 클릭
STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_TOOLTIP :{BLACK}선택한 자동차 만들기
STR_ARTICULATED_RV_CAPACITY :{BLACK}수송량: {LTBLUE}
-STR_BARE_CARGO :{CARGO}
+STR_JUST_CARGO :{CARGO}
STR_DEPOT_VEHICLE_TOOLTIP :{BLACK}{ENGINE}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CHAIN :{BLACK}{NUM} 차량{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CARGO :{}{CARGO} ({SHORTCARGO})
diff --git a/src/lang/latvian.txt b/src/lang/latvian.txt
index 816dc1d32..1d067571d 100644
--- a/src/lang/latvian.txt
+++ b/src/lang/latvian.txt
@@ -156,8 +156,8 @@ STR_ABBREV_PLASTIC :{TINYFONT}PL
STR_ABBREV_FIZZY_DRINKS :{TINYFONT}BU
STR_ABBREV_NONE :{TINYFONT}NAV
STR_ABBREV_ALL :{TINYFONT}VISI
-STR_DATE_SHORT_WHITE :{WHITE}{DATE_SHORT}
-STR_DATE_LONG_WHITE :{WHITE}{DATE_LONG}
+STR_WHITE_DATE_SHORT :{WHITE}{DATE_SHORT}
+STR_WHITE_DATE_LONG :{WHITE}{DATE_LONG}
STR_SMALLMAP_CAPTION :{WHITE}Karte - {STRING}
STR_GAME_OPTIONS_CAPTION :{WHITE}Spēles opcijas
STR_ERROR_MESSAGE_CAPTION :{YELLOW}Ziņa
@@ -329,7 +329,6 @@ STR_SORT_BY_PRODUCTION :Produkcijas
STR_SORT_BY_TYPE :Tipa
STR_SORT_BY_TRANSPORTED :Transportētā
STR_SORT_BY_NAME :{BLACK}Vārda
-STR_SORT_BY_DROPDOWN_NAME :Vārda
STR_SORT_BY_DATE :{BLACK}Datuma
STR_SORT_BY_NUMBER :Numura
STR_SORT_BY_PROFIT_LAST_YEAR :Ienākumiem pērn
@@ -409,8 +408,8 @@ STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS :{BLACK}Būvēt
STR_TOOLBAR_TOOLTIP_PLANT_TREES_PLACE_SIGNS :{BLACK}Stādīt kokus, novietot zīmes, uc.
STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION :{BLACK}Informācija par zemes pleķi
STR_TOOLBAR_TOOLTIP_OPTIONS :{BLACK}Opcijas
-STR_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
-STR_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
+STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
+STR_BLACK_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
STR_ERROR_CAN_T_CHANGE_SERVICING :{WHITE}Nevar mainīt apkopes intervālu...
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Aizvērt logu
STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Loga virsraksts - velc šo, lai pārvietotu logu
@@ -580,12 +579,12 @@ STR_HIGHSCORE_NAME :{BIGFONT}{PRESI
STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA})
STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} sasnieguši '{STRING}' statusu!
STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} no {COMPANY} sasnieguši '{STRING}' statusu!
-STR_BLUE_NUMBER :{BLUE}{COMMA}
+STR_BLUE_COMMA :{BLUE}{COMMA}
STR_SCENEDIT_TOOLBAR_OPENTTD :{YELLOW}OpenTTD
STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR :{YELLOW}Scenāriju redaktors
STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION :{WHITE}Zemes ģenerēšana
-STR_ARROW_UP :{BLACK}{UPARROW}
-STR_ARROW_DOWN :{BLACK}{DOWNARROW}
+STR_BLACK_ARROW_UP :{BLACK}{UPARROW}
+STR_BLACK_ARROW_DOWN :{BLACK}{DOWNARROW}
STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA :{BLACK}Palielināt zemes apgabalu pazemināšanai/paaugstināšanai
STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA :{BLACK}Samazināt zemes apgabalu pazemināšanai/paaugstināšanai
STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND :{BLACK}Ģenerēt nejaušu zemi
@@ -668,7 +667,7 @@ STR_FULL :Pilns
STR_STATUSBAR_COMPANY_NAME :{SILVER}- - {COMPANY} - -
STR_BLACK_STRING :{BLACK}{STRING}
-STR_CHECKMARK :{CHECKMARK}
+STR_JUST_CHECKMARK :{CHECKMARK}
############ range for menu starts
STR_SETTINGS_MENU_GAME_OPTIONS :Spēles režīmi
STR_SETTINGS_MENU_DIFFICULTY_SETTINGS :Grūtības pakāpes
@@ -776,8 +775,8 @@ STR_STATUSBAR_SAVING_GAME :{RED}* * Spē
STR_SAVE_STILL_IN_PROGRESS :{WHITE}Notiek saglabāšana,{}lLūdzu uzgaidiet!
STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE :{BLACK}Izvēlēties 'Ezy Ielas muzikas stila' programmu
-STR_6 :{BLACK}6
-STR_7 :{BLACK}7
+STR_BLACK_6 :{BLACK}6
+STR_BLACK_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :Angļu (oriģinālie)
@@ -883,7 +882,7 @@ STR_CRATES :kastes
STR_RES_OTHER :cita
STR_NOTHING :
-STR_SMALL_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
+STR_TINY_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
STR_CANT_SHARE_ORDER_LIST :{WHITE}Nevar dalīties ar rīkojumu sarakstu...
STR_CANT_COPY_ORDER_LIST :{WHITE}Nevar kopēt rīkojumu sarakstu...
@@ -1151,8 +1150,7 @@ STR_CONFIG_SETTING_MAP_Y :{LTBLUE}Kartes
############ generic strings for settings
STR_CONFIG_SETTING_DISABLED :atspējots
-STR_CONFIG_SETTING_INT32 :{NUM}
-STR_CONFIG_SETTING_CURRENCY :{CURRENCY}
+STR_JUST_CURRENCY :{CURRENCY}
STR_CONFIG_SETTING_QUERY_CAPT :{WHITE}Mainīt iestatījuma vērtību
STR_TEMPERATE_LANDSCAPE :Mērenais klimats
@@ -2117,8 +2115,8 @@ STR_NUM_LOW :Zems
STR_NUM_NORMAL :Normāls
STR_NUM_HIGH :Augsts
STR_NUM_CUSTOM :Speciālie
-STR_ARROW_LEFT_SMALL :{BLACK}{SMALLLEFTARROW}
-STR_ARROW_RIGHT_SMALL :{BLACK}{SMALLRIGHTARROW}
+STR_BLACK_SMALL_ARROW_LEFT :{BLACK}{SMALLLEFTARROW}
+STR_BLACK_SMALL_ARROW_RIGHT :{BLACK}{SMALLRIGHTARROW}
STR_AI_SPEED_VERY_SLOW :Ļoti lēns
STR_AI_SPEED_SLOW :Lēns
STR_AI_SPEED_MEDIUM :Vidējs
@@ -2855,7 +2853,7 @@ STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Centrēt
STR_BUILD_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP :{BLACK}Transportl. izvēles saraksts - klik uz tā, priekš informācijas
STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_TOOLTIP :{BLACK}Būvēt atzīmēto transportl.
STR_ARTICULATED_RV_CAPACITY :{BLACK}Ietilpība: {LTBLUE}
-STR_BARE_CARGO :{CARGO}
+STR_JUST_CARGO :{CARGO}
STR_DEPOT_VEHICLE_TOOLTIP :{BLACK}{ENGINE}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CHAIN :{BLACK}{NUM} transportlīdzek{P lis ļi ļu}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CARGO :{}{CARGO} ({SHORTCARGO})
diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt
index 204cb1166..e1886fa71 100644
--- a/src/lang/lithuanian.txt
+++ b/src/lang/lithuanian.txt
@@ -188,8 +188,8 @@ STR_ABBREV_PLASTIC :{TINYFONT}PM
STR_ABBREV_FIZZY_DRINKS :{TINYFONT}GG
STR_ABBREV_NONE :{TINYFONT}-
STR_ABBREV_ALL :{TINYFONT}VISI
-STR_DATE_SHORT_WHITE :{WHITE}{DATE_SHORT}
-STR_DATE_LONG_WHITE :{WHITE}{DATE_LONG}
+STR_WHITE_DATE_SHORT :{WHITE}{DATE_SHORT}
+STR_WHITE_DATE_LONG :{WHITE}{DATE_LONG}
STR_SMALLMAP_CAPTION :{WHITE}Žemėlapis - {STRING}
STR_GAME_OPTIONS_CAPTION :{WHITE}Žaidimo nustatymai
STR_ERROR_MESSAGE_CAPTION :{YELLOW}Žinutė
@@ -361,7 +361,6 @@ STR_SORT_BY_PRODUCTION :Produkciją
STR_SORT_BY_TYPE :Tipą
STR_SORT_BY_TRANSPORTED :Pervežimus
STR_SORT_BY_NAME :{BLACK}Vardą
-STR_SORT_BY_DROPDOWN_NAME :Vardą
STR_SORT_BY_DATE :{BLACK}Datą
STR_SORT_BY_NUMBER :Kiekį
STR_SORT_BY_PROFIT_LAST_YEAR :Pernai metų pelną
@@ -441,8 +440,8 @@ STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS :{BLACK}Statyti
STR_TOOLBAR_TOOLTIP_PLANT_TREES_PLACE_SIGNS :{BLACK}Sodinti medžius, statyti ženklus ir kt.
STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION :{BLACK}Žemės ploto informacija
STR_TOOLBAR_TOOLTIP_OPTIONS :{BLACK}Nustatymai
-STR_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
-STR_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
+STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
+STR_BLACK_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
STR_ERROR_CAN_T_CHANGE_SERVICING :{WHITE}Aptarnavimo intervalo keisti negalima...
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Uždaryti langą
STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Lango pavadinimas - už jo tempiant galima judinti langą
@@ -612,12 +611,12 @@ STR_HIGHSCORE_NAME :{BIGFONT}{PRESI
STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA})
STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} pasiekė „{STRING}“ statusą!
STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} iš {COMPANY} pasiekė „{STRING}“ statusą!
-STR_BLUE_NUMBER :{BLUE}{COMMA}
+STR_BLUE_COMMA :{BLUE}{COMMA}
STR_SCENEDIT_TOOLBAR_OPENTTD :{YELLOW}OpenTTD
STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR :{YELLOW}Scenarijaus redaktorius
STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION :{WHITE}Kraštovaidžio kūrimas
-STR_ARROW_UP :{BLACK}{UPARROW}
-STR_ARROW_DOWN :{BLACK}{DOWNARROW}
+STR_BLACK_ARROW_UP :{BLACK}{UPARROW}
+STR_BLACK_ARROW_DOWN :{BLACK}{DOWNARROW}
STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA :{BLACK}Padidinkite sausumos plotą norėdami paaukštinti/pažeminti
STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA :{BLACK}Sumažinkite sausumos plotą norėdami paaukštinti/pažeminti
STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND :{BLACK}Kurti atsitiktinę sausumą
@@ -701,7 +700,7 @@ STR_FULL :Pilnas
STR_STATUSBAR_COMPANY_NAME :{SILVER}- - {COMPANY} - -
STR_BLACK_STRING :{BLACK}{STRING}
-STR_CHECKMARK :{CHECKMARK}
+STR_JUST_CHECKMARK :{CHECKMARK}
############ range for menu starts
STR_SETTINGS_MENU_GAME_OPTIONS :Žaidimo nustatymai
STR_SETTINGS_MENU_DIFFICULTY_SETTINGS :Sunkumo lygio nustatymai
@@ -809,8 +808,8 @@ STR_STATUSBAR_SAVING_GAME :{RED}* * Išs
STR_SAVE_STILL_IN_PROGRESS :{WHITE}Vyksta išsaugojimas,{}palaukite kol baigsis!
STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE :{BLACK}Pasirink „Ezy Street“ muzikos stiliaus programą
-STR_6 :{BLACK}6
-STR_7 :{BLACK}7
+STR_BLACK_6 :{BLACK}6
+STR_BLACK_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :Anglų (Oginalus)
@@ -915,7 +914,7 @@ STR_CRATES :dežių
STR_RES_OTHER :Kita
STR_NOTHING :
-STR_SMALL_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
+STR_TINY_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
STR_CANT_SHARE_ORDER_LIST :{WHITE}Užduočių sąrašu dalintis negalima...
STR_CANT_COPY_ORDER_LIST :{WHITE}Užduočių sąrašo kopijuoti negalima...
@@ -1172,8 +1171,7 @@ STR_CONFIG_SETTING_MAP_Y :{LTBLUE}Zemelap
############ generic strings for settings
STR_CONFIG_SETTING_DISABLED :išjungta
-STR_CONFIG_SETTING_INT32 :{NUM}
-STR_CONFIG_SETTING_CURRENCY :{CURRENCY}
+STR_JUST_CURRENCY :{CURRENCY}
STR_CONFIG_SETTING_QUERY_CAPT :{WHITE}Keisti reikšmes
STR_TEMPERATE_LANDSCAPE :Normalus klimatas
@@ -2133,8 +2131,8 @@ STR_NUM_LOW :Žemas
STR_NUM_NORMAL :Vidutinis
STR_NUM_HIGH :Aukštas
STR_NUM_CUSTOM :Tinkintas
-STR_ARROW_LEFT_SMALL :{BLACK}{SMALLLEFTARROW}
-STR_ARROW_RIGHT_SMALL :{BLACK}{SMALLRIGHTARROW}
+STR_BLACK_SMALL_ARROW_LEFT :{BLACK}{SMALLLEFTARROW}
+STR_BLACK_SMALL_ARROW_RIGHT :{BLACK}{SMALLRIGHTARROW}
STR_AI_SPEED_VERY_SLOW :Labai lėtas
STR_AI_SPEED_SLOW :Lėtas
STR_AI_SPEED_MEDIUM :Vidutinis
@@ -2853,7 +2851,7 @@ STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Rodyti a
STR_BUILD_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP :{BLACK}Automobiliu pasirinkimo sarasas - paspausk ant automobilio jei nori detalesnes informacijos
STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_TOOLTIP :{BLACK}Isigyti pazymeta automobili
STR_ARTICULATED_RV_CAPACITY :{BLACK}Talpa: {LTBLUE}
-STR_BARE_CARGO :{CARGO}
+STR_JUST_CARGO :{CARGO}
STR_DEPOT_VEHICLE_TOOLTIP :{BLACK}{ENGINE}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CARGO :{}{CARGO} ({SHORTCARGO})
diff --git a/src/lang/luxembourgish.txt b/src/lang/luxembourgish.txt
index 4f27c559e..1133055eb 100644
--- a/src/lang/luxembourgish.txt
+++ b/src/lang/luxembourgish.txt
@@ -154,8 +154,8 @@ STR_ABBREV_PLASTIC :{TINYFONT}PL
STR_ABBREV_FIZZY_DRINKS :{TINYFONT}KG
STR_ABBREV_NONE :{TINYFONT}NO
STR_ABBREV_ALL :{TINYFONT}ALL
-STR_DATE_SHORT_WHITE :{WHITE}{DATE_SHORT}
-STR_DATE_LONG_WHITE :{WHITE}{DATE_LONG}
+STR_WHITE_DATE_SHORT :{WHITE}{DATE_SHORT}
+STR_WHITE_DATE_LONG :{WHITE}{DATE_LONG}
STR_SMALLMAP_CAPTION :{WHITE}Kaart - {STRING}
STR_GAME_OPTIONS_CAPTION :{WHITE}Spill Optiounen
STR_ERROR_MESSAGE_CAPTION :{YELLOW}Meldung
@@ -328,7 +328,6 @@ STR_SORT_BY_PRODUCTION :Produktioun
STR_SORT_BY_TYPE :Typ
STR_SORT_BY_TRANSPORTED :Transportéiert
STR_SORT_BY_NAME :{BLACK}Numm
-STR_SORT_BY_DROPDOWN_NAME :Numm
STR_SORT_BY_DATE :{BLACK}Datum
STR_SORT_BY_NUMBER :Nummer
STR_SORT_BY_PROFIT_LAST_YEAR :Profit am leschten Joer
@@ -410,8 +409,8 @@ STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS :{BLACK}Flughafe
STR_TOOLBAR_TOOLTIP_PLANT_TREES_PLACE_SIGNS :{BLACK}Beem planzen, Schëlder opsetzen etc.
STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION :{BLACK}Informatiounen zum Land
STR_TOOLBAR_TOOLTIP_OPTIONS :{BLACK}Optiounen
-STR_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
-STR_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
+STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
+STR_BLACK_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
STR_ERROR_CAN_T_CHANGE_SERVICING :{WHITE}Den Service-Intervall kann net geännert ginn...
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Fënster zoumaachen
STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Fënstertitel - hei zéien fir d'Fënster ze bewegen
@@ -581,12 +580,12 @@ STR_HIGHSCORE_NAME :{BIGFONT}{PRESI
STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA})
STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} ereescht den Status '{STRING}'!
STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} vun {COMPANY} ereescht den Status '{STRING}'!
-STR_BLUE_NUMBER :{BLUE}{COMMA}
+STR_BLUE_COMMA :{BLUE}{COMMA}
STR_SCENEDIT_TOOLBAR_OPENTTD :{YELLOW}OpenTTD
STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR :{YELLOW}Szenarien Editor
STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION :{WHITE}Landerstellung
-STR_ARROW_UP :{BLACK}{UPARROW}
-STR_ARROW_DOWN :{BLACK}{DOWNARROW}
+STR_BLACK_ARROW_UP :{BLACK}{UPARROW}
+STR_BLACK_ARROW_DOWN :{BLACK}{DOWNARROW}
STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA :{BLACK}Vergréisser d'Zone fir d'Land unzehiewen/eroofzesetzen
STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA :{BLACK}Verklenger d'Zone fir d'Land unzehiewen/eroofzesetzen
STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND :{BLACK}Generéier en Zoufallsland
@@ -670,7 +669,7 @@ STR_FULL :Ganz
STR_STATUSBAR_COMPANY_NAME :{SILVER}- - {COMPANY} - -
STR_BLACK_STRING :{BLACK}{STRING}
-STR_CHECKMARK :{CHECKMARK}
+STR_JUST_CHECKMARK :{CHECKMARK}
############ range for menu starts
STR_SETTINGS_MENU_GAME_OPTIONS :Spilloptiounen
STR_SETTINGS_MENU_DIFFICULTY_SETTINGS :Schwieregkeetsastellungen
@@ -778,8 +777,8 @@ STR_STATUSBAR_SAVING_GAME :{RED}* * SPÄ
STR_SAVE_STILL_IN_PROGRESS :{WHITE}Nach umgaangen ze späicheren. {} Weg. waarden bis daat faerdeg ass!
STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE :{BLACK}Wielt 'Ezy Street Musék' Programm
-STR_6 :{BLACK}6
-STR_7 :{BLACK}7
+STR_BLACK_6 :{BLACK}6
+STR_BLACK_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :Englësch (Original)
@@ -887,7 +886,7 @@ STR_CRATES :Këschten
STR_RES_OTHER :Aaneres
STR_NOTHING :
-STR_SMALL_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
+STR_TINY_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
STR_CANT_SHARE_ORDER_LIST :{WHITE}Kann d'Optragslëscht net deelen...
STR_CANT_COPY_ORDER_LIST :{WHITE}Kann d'Optragslëscht net kopéieren...
@@ -1158,8 +1157,7 @@ STR_CONFIG_SETTING_MAP_Y :{LTBLUE}Y-Gréi
############ generic strings for settings
STR_CONFIG_SETTING_DISABLED :ausgeschalt
-STR_CONFIG_SETTING_INT32 :{NUM}
-STR_CONFIG_SETTING_CURRENCY :{CURRENCY}
+STR_JUST_CURRENCY :{CURRENCY}
STR_CONFIG_SETTING_QUERY_CAPT :{WHITE}Astellung änneren
STR_TEMPERATE_LANDSCAPE :Temperéiert Landschaft
@@ -2125,8 +2123,8 @@ STR_NUM_LOW :Wéineg
STR_NUM_NORMAL :Normal
STR_NUM_HIGH :Vill
STR_NUM_CUSTOM :Benotzerdéfineiert
-STR_ARROW_LEFT_SMALL :{BLACK}{SMALLLEFTARROW}
-STR_ARROW_RIGHT_SMALL :{BLACK}{SMALLRIGHTARROW}
+STR_BLACK_SMALL_ARROW_LEFT :{BLACK}{SMALLLEFTARROW}
+STR_BLACK_SMALL_ARROW_RIGHT :{BLACK}{SMALLRIGHTARROW}
STR_AI_SPEED_VERY_SLOW :Ganz lues
STR_AI_SPEED_SLOW :Lues
STR_AI_SPEED_MEDIUM :Mëttel
@@ -2880,7 +2878,7 @@ STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Zentréi
STR_BUILD_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP :{BLACK}Stroossengefiert Lëscht - klickt op en Gefiert fir Informatiounen
STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_TOOLTIP :{BLACK}Baut dat ungewieltent Stroossengefiert
STR_ARTICULATED_RV_CAPACITY :{BLACK}Kapazitéit: {LTBLUE}
-STR_BARE_CARGO :{CARGO}
+STR_JUST_CARGO :{CARGO}
STR_DEPOT_VEHICLE_TOOLTIP :{BLACK}{ENGINE}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CHAIN :{BLACK}{NUM} Gefier{P t er}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CARGO :{}{CARGO} ({SHORTCARGO})
diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt
index 01a9976a3..789bfbc06 100644
--- a/src/lang/norwegian_bokmal.txt
+++ b/src/lang/norwegian_bokmal.txt
@@ -154,8 +154,8 @@ STR_ABBREV_PLASTIC :{TINYFONT}PL
STR_ABBREV_FIZZY_DRINKS :{TINYFONT}MV
STR_ABBREV_NONE :{TINYFONT}NE
STR_ABBREV_ALL :{TINYFONT}ALL
-STR_DATE_SHORT_WHITE :{WHITE}{DATE_SHORT}
-STR_DATE_LONG_WHITE :{WHITE}{DATE_LONG}
+STR_WHITE_DATE_SHORT :{WHITE}{DATE_SHORT}
+STR_WHITE_DATE_LONG :{WHITE}{DATE_LONG}
STR_SMALLMAP_CAPTION :{WHITE}Kart - {STRING}
STR_GAME_OPTIONS_CAPTION :{WHITE}Spillinnstillinger
STR_ERROR_MESSAGE_CAPTION :{YELLOW}Melding
@@ -328,7 +328,6 @@ STR_SORT_BY_PRODUCTION :Produksjon
STR_SORT_BY_TYPE :Type
STR_SORT_BY_TRANSPORTED :Transportert
STR_SORT_BY_NAME :{BLACK}Navn
-STR_SORT_BY_DROPDOWN_NAME :Navn
STR_SORT_BY_DATE :{BLACK}Dato
STR_SORT_BY_NUMBER :Nummer
STR_SORT_BY_PROFIT_LAST_YEAR :Fortjeneste i fjor
@@ -412,8 +411,8 @@ STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS :{BLACK}Bygg fly
STR_TOOLBAR_TOOLTIP_PLANT_TREES_PLACE_SIGNS :{BLACK}Plant trær, skilt, o.l.
STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION :{BLACK}Informasjon om felt
STR_TOOLBAR_TOOLTIP_OPTIONS :{BLACK}Innstillinger
-STR_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
-STR_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
+STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
+STR_BLACK_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
STR_ERROR_CAN_T_CHANGE_SERVICING :{WHITE}Kan ikke endre serviceintervall...
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Lukk vindu
STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Vindustittel - dra her for å flytte vindu
@@ -583,12 +582,12 @@ STR_HIGHSCORE_NAME :{BIGFONT}{PRESI
STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA})
STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} oppnår '{STRING}'-status!
STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} fra {COMPANY} oppnår '{STRING}'-status!
-STR_BLUE_NUMBER :{BLUE}{COMMA}
+STR_BLUE_COMMA :{BLUE}{COMMA}
STR_SCENEDIT_TOOLBAR_OPENTTD :{YELLOW}OpenTTD
STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR :{YELLOW}Scenarioredigerer
STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION :{WHITE}Landgenerering
-STR_ARROW_UP :{BLACK}{UPARROW}
-STR_ARROW_DOWN :{BLACK}{DOWNARROW}
+STR_BLACK_ARROW_UP :{BLACK}{UPARROW}
+STR_BLACK_ARROW_DOWN :{BLACK}{DOWNARROW}
STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA :{BLACK}Øk størrelse av landareal å heve/senke
STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA :{BLACK}Mink størrelse av landareal å heve/senke
STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND :{BLACK}Generer tilfeldig landskap
@@ -672,7 +671,7 @@ STR_FULL :Fullt
STR_STATUSBAR_COMPANY_NAME :{SILVER}- - {COMPANY} - -
STR_BLACK_STRING :{BLACK}{STRING}
-STR_CHECKMARK :{CHECKMARK}
+STR_JUST_CHECKMARK :{CHECKMARK}
############ range for menu starts
STR_SETTINGS_MENU_GAME_OPTIONS :Spillinnstillinger
STR_SETTINGS_MENU_DIFFICULTY_SETTINGS :Vanskelighetsgrad
@@ -777,8 +776,8 @@ STR_STATUSBAR_SAVING_GAME :{RED}* * LAGR
STR_SAVE_STILL_IN_PROGRESS :{WHITE}Lagring pågår enda,{}vennligst vent til det er ferdig!
STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE :{BLACK}Velg 'Ezy style music'-program
-STR_6 :{BLACK}6
-STR_7 :{BLACK}7
+STR_BLACK_6 :{BLACK}6
+STR_BLACK_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :Engelsk (Original)
@@ -886,7 +885,7 @@ STR_CRATES :kasser
STR_RES_OTHER :annet
STR_NOTHING :
-STR_SMALL_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
+STR_TINY_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
STR_CANT_SHARE_ORDER_LIST :{WHITE}Kan ikke dele ordreliste...
STR_CANT_COPY_ORDER_LIST :{WHITE}Kan ikke kopiere ordreliste...
@@ -1159,8 +1158,7 @@ STR_CONFIG_SETTING_MAP_Y :{LTBLUE}Y-stør
############ generic strings for settings
STR_CONFIG_SETTING_DISABLED :slått av
-STR_CONFIG_SETTING_INT32 :{NUM}
-STR_CONFIG_SETTING_CURRENCY :{CURRENCY}
+STR_JUST_CURRENCY :{CURRENCY}
STR_CONFIG_SETTING_QUERY_CAPT :{WHITE}Endre innstillingsverdi
STR_TEMPERATE_LANDSCAPE :Temperert landskap
@@ -2126,8 +2124,8 @@ STR_NUM_LOW :Lite
STR_NUM_NORMAL :Normal
STR_NUM_HIGH :Høyt
STR_NUM_CUSTOM :Egendefinert
-STR_ARROW_LEFT_SMALL :{BLACK}{SMALLLEFTARROW}
-STR_ARROW_RIGHT_SMALL :{BLACK}{SMALLRIGHTARROW}
+STR_BLACK_SMALL_ARROW_LEFT :{BLACK}{SMALLLEFTARROW}
+STR_BLACK_SMALL_ARROW_RIGHT :{BLACK}{SMALLRIGHTARROW}
STR_AI_SPEED_VERY_SLOW :Veldig sent
STR_AI_SPEED_SLOW :Sent
STR_AI_SPEED_MEDIUM :Middels
@@ -2808,7 +2806,7 @@ STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT :{WHITE}...må v
STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT :{WHITE}Kan ikke finne en garasje i nærheten
STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP :{BLACK}Bytt kjøreretning
STR_ARTICULATED_RV_CAPACITY :{BLACK}Kapasitet: {LTBLUE}
-STR_BARE_CARGO :{CARGO}
+STR_JUST_CARGO :{CARGO}
STR_DEPOT_VEHICLE_TOOLTIP :{BLACK}{ENGINE}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CHAIN :{BLACK}{NUM} kjøretøy{P "" s}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CARGO :{}{CARGO} ({SHORTCARGO})
diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt
index 68e844c57..36d087850 100644
--- a/src/lang/norwegian_nynorsk.txt
+++ b/src/lang/norwegian_nynorsk.txt
@@ -155,8 +155,8 @@ STR_ABBREV_PLASTIC :{TINYFONT}PL
STR_ABBREV_FIZZY_DRINKS :{TINYFONT}MV
STR_ABBREV_NONE :{TINYFONT}IN
STR_ABBREV_ALL :{TINYFONT}ALL
-STR_DATE_SHORT_WHITE :{WHITE}{DATE_SHORT}
-STR_DATE_LONG_WHITE :{WHITE}{DATE_LONG}
+STR_WHITE_DATE_SHORT :{WHITE}{DATE_SHORT}
+STR_WHITE_DATE_LONG :{WHITE}{DATE_LONG}
STR_SMALLMAP_CAPTION :{WHITE}Kart - {STRING}
STR_GAME_OPTIONS_CAPTION :{WHITE}Spelinnstillingar
STR_ERROR_MESSAGE_CAPTION :{YELLOW}Melding
@@ -328,7 +328,6 @@ STR_SORT_BY_PRODUCTION :Produksjon
STR_SORT_BY_TYPE :Type
STR_SORT_BY_TRANSPORTED :Transportert
STR_SORT_BY_NAME :{BLACK}Namn
-STR_SORT_BY_DROPDOWN_NAME :Namn
STR_SORT_BY_DATE :{BLACK}Dato
STR_SORT_BY_NUMBER :Nummer
STR_SORT_BY_PROFIT_LAST_YEAR :Forteneste i fjor
@@ -408,8 +407,8 @@ STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS :{BLACK}Bygg fly
STR_TOOLBAR_TOOLTIP_PLANT_TREES_PLACE_SIGNS :{BLACK}Plant tre, plasser skilt o.l.
STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION :{BLACK}Informasjon om felt
STR_TOOLBAR_TOOLTIP_OPTIONS :{BLACK}Instillingar
-STR_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
-STR_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
+STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
+STR_BLACK_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
STR_ERROR_CAN_T_CHANGE_SERVICING :{WHITE}Kan ikkje endre serviceintervall...
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Lukk vindauge
STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Tittel på vindauget - dra for å flytte vindauget
@@ -579,12 +578,12 @@ STR_HIGHSCORE_NAME :{BIGFONT}{PRESI
STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA})
STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} oppnår status som '{STRING}'!
STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} frå {COMPANY} oppnår status som '{STRING}'!
-STR_BLUE_NUMBER :{BLUE}{COMMA}
+STR_BLUE_COMMA :{BLUE}{COMMA}
STR_SCENEDIT_TOOLBAR_OPENTTD :{YELLOW}OpenTTD
STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR :{YELLOW}Scenario-redigerar
STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION :{WHITE}Landgenerering
-STR_ARROW_UP :{BLACK}{UPARROW}
-STR_ARROW_DOWN :{BLACK}{DOWNARROW}
+STR_BLACK_ARROW_UP :{BLACK}{UPARROW}
+STR_BLACK_ARROW_DOWN :{BLACK}{DOWNARROW}
STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA :{BLACK}Øk storleiken på landarealet som skal hevast/senkast
STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA :{BLACK}Mink storleiken på landarealet som skal hevast/senkast
STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND :{BLACK}Generer tilfeldig landskap
@@ -668,7 +667,7 @@ STR_FULL :Fullt
STR_STATUSBAR_COMPANY_NAME :{SILVER}- - {COMPANY} - -
STR_BLACK_STRING :{BLACK}{STRING}
-STR_CHECKMARK :{CHECKMARK}
+STR_JUST_CHECKMARK :{CHECKMARK}
############ range for menu starts
STR_SETTINGS_MENU_GAME_OPTIONS :Spelinstillingar
STR_SETTINGS_MENU_DIFFICULTY_SETTINGS :Vanskegrad
@@ -776,8 +775,8 @@ STR_STATUSBAR_SAVING_GAME :{RED}* * LAGR
STR_SAVE_STILL_IN_PROGRESS :{WHITE}Lagring foregår framleis,{}ver venleg å vente til det er ferdig!
STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE :{BLACK}Vel 'Ezy Street style music'-program
-STR_6 :{BLACK}6
-STR_7 :{BLACK}7
+STR_BLACK_6 :{BLACK}6
+STR_BLACK_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :Engelsk
@@ -883,7 +882,7 @@ STR_CRATES :kasser
STR_RES_OTHER :anna
STR_NOTHING :
-STR_SMALL_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
+STR_TINY_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
STR_CANT_SHARE_ORDER_LIST :{WHITE}Kan ikkje dele ordreliste...
STR_CANT_COPY_ORDER_LIST :{WHITE}Kan ikkje kopiere ordreliste...
@@ -1151,8 +1150,7 @@ STR_CONFIG_SETTING_MAP_Y :{LTBLUE}Y-storl
############ generic strings for settings
STR_CONFIG_SETTING_DISABLED :slått av
-STR_CONFIG_SETTING_INT32 :{NUM}
-STR_CONFIG_SETTING_CURRENCY :{CURRENCY}
+STR_JUST_CURRENCY :{CURRENCY}
STR_CONFIG_SETTING_QUERY_CAPT :{WHITE}Endre innstillingsverdi
STR_TEMPERATE_LANDSCAPE :Temperert landskap
@@ -2118,8 +2116,8 @@ STR_NUM_LOW :Lite
STR_NUM_NORMAL :Normal
STR_NUM_HIGH :Høgt
STR_NUM_CUSTOM :Eigendefinert
-STR_ARROW_LEFT_SMALL :{BLACK}{SMALLLEFTARROW}
-STR_ARROW_RIGHT_SMALL :{BLACK}{SMALLRIGHTARROW}
+STR_BLACK_SMALL_ARROW_LEFT :{BLACK}{SMALLLEFTARROW}
+STR_BLACK_SMALL_ARROW_RIGHT :{BLACK}{SMALLRIGHTARROW}
STR_AI_SPEED_VERY_SLOW :Særs seint
STR_AI_SPEED_SLOW :Seint
STR_AI_SPEED_MEDIUM :Middels
@@ -2856,7 +2854,7 @@ STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Vis kvar
STR_BUILD_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP :{BLACK}Køyretøyliste - trykk på køyretøy for meir informasjon
STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_TOOLTIP :{BLACK}Bygg det valde køyretøyet
STR_ARTICULATED_RV_CAPACITY :{BLACK}Kapasitet: {LTBLUE}
-STR_BARE_CARGO :{CARGO}
+STR_JUST_CARGO :{CARGO}
STR_DEPOT_VEHICLE_TOOLTIP :{BLACK}{ENGINE}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CHAIN :{BLACK}{NUM} kjøretøy{P "" s}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CARGO :{}{CARGO} ({SHORTCARGO})
diff --git a/src/lang/polish.txt b/src/lang/polish.txt
index cab07f893..59b2e4c27 100644
--- a/src/lang/polish.txt
+++ b/src/lang/polish.txt
@@ -527,8 +527,8 @@ STR_ABBREV_PLASTIC :{TINYFONT}PL
STR_ABBREV_FIZZY_DRINKS :{TINYFONT}FZ
STR_ABBREV_NONE :{TINYFONT}0
STR_ABBREV_ALL :{TINYFONT}+
-STR_DATE_SHORT_WHITE :{WHITE}{DATE_SHORT}
-STR_DATE_LONG_WHITE :{WHITE}{DATE_LONG}
+STR_WHITE_DATE_SHORT :{WHITE}{DATE_SHORT}
+STR_WHITE_DATE_LONG :{WHITE}{DATE_LONG}
STR_SMALLMAP_CAPTION :{WHITE}Mapa - {STRING}
STR_GAME_OPTIONS_CAPTION :{WHITE}Opcje Gry
STR_ERROR_MESSAGE_CAPTION :{YELLOW}Wiadomość
@@ -702,7 +702,6 @@ STR_SORT_BY_PRODUCTION :Produkcja
STR_SORT_BY_TYPE :Typ
STR_SORT_BY_TRANSPORTED :Przetransportowano
STR_SORT_BY_NAME :{BLACK}Nazwa
-STR_SORT_BY_DROPDOWN_NAME :Nazwa
STR_SORT_BY_DATE :{BLACK}Data
STR_SORT_BY_NUMBER :Numer
STR_SORT_BY_PROFIT_LAST_YEAR :Zysk w ostatnim roku
@@ -782,8 +781,8 @@ STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS :{BLACK}Budowa l
STR_TOOLBAR_TOOLTIP_PLANT_TREES_PLACE_SIGNS :{BLACK}Umieść drzewa, napisy, itp.
STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION :{BLACK}Informacje o terenie
STR_TOOLBAR_TOOLTIP_OPTIONS :{BLACK}Opcje
-STR_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
-STR_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
+STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
+STR_BLACK_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
STR_ERROR_CAN_T_CHANGE_SERVICING :{WHITE}Nie można zmienić okresu między serwisowaniem...
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Zamknięcie okna
STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Tytuł okna - przeciągnij aby przesunąć okno
@@ -953,12 +952,12 @@ STR_HIGHSCORE_NAME :{BIGFONT}{PRESI
STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA})
STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} osiąga status: '{STRING}'!
STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} z {COMPANY} osiągnęło status '{STRING}'!
-STR_BLUE_NUMBER :{BLUE}{COMMA}
+STR_BLUE_COMMA :{BLUE}{COMMA}
STR_SCENEDIT_TOOLBAR_OPENTTD :{YELLOW}OpenTTD
STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR :{YELLOW}Edytor Scenariuszy
STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION :{WHITE}Tworzenie terenu
-STR_ARROW_UP :{BLACK}{UPARROW}
-STR_ARROW_DOWN :{BLACK}{DOWNARROW}
+STR_BLACK_ARROW_UP :{BLACK}{UPARROW}
+STR_BLACK_ARROW_DOWN :{BLACK}{DOWNARROW}
STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA :{BLACK}Zwiększ powierzchnie do podwyższenia/obniżenia
STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA :{BLACK}Zmniejsz powierzchnie do podwyższenia/obniżenia
STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND :{BLACK}Tworzenie przypadkowego lądu
@@ -1042,7 +1041,7 @@ STR_FULL :Pełne
STR_STATUSBAR_COMPANY_NAME :{SILVER}- - {COMPANY} - -
STR_BLACK_STRING :{BLACK}{STRING}
-STR_CHECKMARK :{CHECKMARK}
+STR_JUST_CHECKMARK :{CHECKMARK}
############ range for menu starts
STR_SETTINGS_MENU_GAME_OPTIONS :Opcje gry
STR_SETTINGS_MENU_DIFFICULTY_SETTINGS :Ustawienia trudności
@@ -1150,8 +1149,8 @@ STR_STATUSBAR_SAVING_GAME :{RED}* * ZAPI
STR_SAVE_STILL_IN_PROGRESS :{WHITE}Zapisywanie trwa,{}proszę zaczekać do zakończenia!
STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE :{BLACK}Wybierz program 'Ezy Street'
-STR_6 :{BLACK}6
-STR_7 :{BLACK}7
+STR_BLACK_6 :{BLACK}6
+STR_BLACK_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :Angielskie (Oryginalne)
@@ -1263,7 +1262,7 @@ STR_CRATES :skrzyń
STR_RES_OTHER :inna
STR_NOTHING :
-STR_SMALL_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
+STR_TINY_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
STR_CANT_SHARE_ORDER_LIST :{WHITE}Nie można współdzielić poleceń...
STR_CANT_COPY_ORDER_LIST :{WHITE}Nie można skopiować listy poleceń...
@@ -1533,8 +1532,7 @@ STR_CONFIG_SETTING_MAP_Y :{LTBLUE}Rozmiar
############ generic strings for settings
STR_CONFIG_SETTING_DISABLED :niedostępne
-STR_CONFIG_SETTING_INT32 :{NUM}
-STR_CONFIG_SETTING_CURRENCY :{CURRENCY}
+STR_JUST_CURRENCY :{CURRENCY}
STR_CONFIG_SETTING_QUERY_CAPT :{WHITE}Zmiana wartości
STR_TEMPERATE_LANDSCAPE :Krajobraz umiarkowany
@@ -2536,8 +2534,8 @@ STR_NUM_LOW :Mało
STR_NUM_NORMAL :Średnio
STR_NUM_HIGH :Dużo
STR_NUM_CUSTOM :Własne
-STR_ARROW_LEFT_SMALL :{BLACK}{SMALLLEFTARROW}
-STR_ARROW_RIGHT_SMALL :{BLACK}{SMALLRIGHTARROW}
+STR_BLACK_SMALL_ARROW_LEFT :{BLACK}{SMALLLEFTARROW}
+STR_BLACK_SMALL_ARROW_RIGHT :{BLACK}{SMALLRIGHTARROW}
STR_AI_SPEED_VERY_SLOW :Bardzo wolno
STR_AI_SPEED_SLOW :Wolno
STR_AI_SPEED_MEDIUM :Umiarkowanie
@@ -3298,7 +3296,7 @@ STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Centruj
STR_BUILD_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP :{BLACK}Lista wyboru pojazdów drogowych - kliknij na pojeździe, aby uzyskać więcej informacji
STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_TOOLTIP :{BLACK}Zbuduj podświetlony pojazd drogowy
STR_ARTICULATED_RV_CAPACITY :{BLACK}Pojemność: {LTBLUE}
-STR_BARE_CARGO :{CARGO}
+STR_JUST_CARGO :{CARGO}
STR_DEPOT_VEHICLE_TOOLTIP :{BLACK}{ENGINE}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CHAIN :{BLACK}{NUM} pojazd{P "" y ów}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CARGO :{}{CARGO} ({SHORTCARGO})
diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt
index a26d3bca2..bb86c09ce 100644
--- a/src/lang/portuguese.txt
+++ b/src/lang/portuguese.txt
@@ -154,8 +154,8 @@ STR_ABBREV_PLASTIC :{TINYFONT}PL
STR_ABBREV_FIZZY_DRINKS :{TINYFONT}BG
STR_ABBREV_NONE :{TINYFONT}NÃO
STR_ABBREV_ALL :{TINYFONT}TUDO
-STR_DATE_SHORT_WHITE :{WHITE}{DATE_SHORT}
-STR_DATE_LONG_WHITE :{WHITE}{DATE_LONG}
+STR_WHITE_DATE_SHORT :{WHITE}{DATE_SHORT}
+STR_WHITE_DATE_LONG :{WHITE}{DATE_LONG}
STR_SMALLMAP_CAPTION :{WHITE}Mapa - {STRING}
STR_GAME_OPTIONS_CAPTION :{WHITE}Opções do Jogo
STR_ERROR_MESSAGE_CAPTION :{YELLOW}Mensagem
@@ -328,7 +328,6 @@ STR_SORT_BY_PRODUCTION :Produção
STR_SORT_BY_TYPE :Tipo
STR_SORT_BY_TRANSPORTED :Transportado
STR_SORT_BY_NAME :{BLACK}Nome
-STR_SORT_BY_DROPDOWN_NAME :Nome
STR_SORT_BY_DATE :{BLACK}Data
STR_SORT_BY_NUMBER :Número
STR_SORT_BY_PROFIT_LAST_YEAR :Lucros do último ano
@@ -410,8 +409,8 @@ STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS :{BLACK}Construi
STR_TOOLBAR_TOOLTIP_PLANT_TREES_PLACE_SIGNS :{BLACK}Plantar árvores, colocar indicações, etc...
STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION :{BLACK}Informações do terreno
STR_TOOLBAR_TOOLTIP_OPTIONS :{BLACK}Opções
-STR_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
-STR_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
+STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
+STR_BLACK_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
STR_ERROR_CAN_T_CHANGE_SERVICING :{WHITE}Não é possível alterar o intervalo de serviço...
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Fechar janela
STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Título da janela - arraste isto para mover a janela
@@ -581,12 +580,12 @@ STR_HIGHSCORE_NAME :{BIGFONT}{PRESI
STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA})
STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} conquista '{STRING}' desempenho!
STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} de {COMPANY} conquista '{STRING}' desempenho!
-STR_BLUE_NUMBER :{BLUE}{COMMA}
+STR_BLUE_COMMA :{BLUE}{COMMA}
STR_SCENEDIT_TOOLBAR_OPENTTD :{YELLOW}OpenTTD
STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR :{YELLOW}Editor de Cenário
STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION :{WHITE}Gerar Terreno
-STR_ARROW_UP :{BLACK}{UPARROW}
-STR_ARROW_DOWN :{BLACK}{DOWNARROW}
+STR_BLACK_ARROW_UP :{BLACK}{UPARROW}
+STR_BLACK_ARROW_DOWN :{BLACK}{DOWNARROW}
STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA :{BLACK}Aumentar área de terreno a baixar/levantar
STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA :{BLACK}Diminuir área de terreno a baixar/levantar
STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND :{BLACK}Gerar terreno aleatório
@@ -670,7 +669,7 @@ STR_FULL :Completo
STR_STATUSBAR_COMPANY_NAME :{SILVER}- - {COMPANY} - -
STR_BLACK_STRING :{BLACK}{STRING}
-STR_CHECKMARK :{CHECKMARK}
+STR_JUST_CHECKMARK :{CHECKMARK}
############ range for menu starts
STR_SETTINGS_MENU_GAME_OPTIONS :Opções do Jogo
STR_SETTINGS_MENU_DIFFICULTY_SETTINGS :Configurações de dificuldade
@@ -778,8 +777,8 @@ STR_STATUSBAR_SAVING_GAME :{RED}* * GRAV
STR_SAVE_STILL_IN_PROGRESS :{WHITE}Gravação ainda em curso,{}por favor aguarde!
STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE :{BLACK}Seleccionar programa 'Ezy Street'
-STR_6 :{BLACK}6
-STR_7 :{BLACK}7
+STR_BLACK_6 :{BLACK}6
+STR_BLACK_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :Inglês
@@ -887,7 +886,7 @@ STR_CRATES :caixas
STR_RES_OTHER :outros
STR_NOTHING :
-STR_SMALL_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
+STR_TINY_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
STR_CANT_SHARE_ORDER_LIST :{WHITE}Não é possível partilhar a lista de ordens...
STR_CANT_COPY_ORDER_LIST :{WHITE}Não é possível copiar a lista de ordens...
@@ -1160,8 +1159,7 @@ STR_CONFIG_SETTING_MAP_Y :{LTBLUE}Y-taman
############ generic strings for settings
STR_CONFIG_SETTING_DISABLED :desactivado
-STR_CONFIG_SETTING_INT32 :{NUM}
-STR_CONFIG_SETTING_CURRENCY :{CURRENCY}
+STR_JUST_CURRENCY :{CURRENCY}
STR_CONFIG_SETTING_QUERY_CAPT :{WHITE}Alterar valor
STR_TEMPERATE_LANDSCAPE :Terreno temperado
@@ -2127,8 +2125,8 @@ STR_NUM_LOW :Baixo
STR_NUM_NORMAL :Normal
STR_NUM_HIGH :Alto
STR_NUM_CUSTOM :Personalizado
-STR_ARROW_LEFT_SMALL :{BLACK}{SMALLLEFTARROW}
-STR_ARROW_RIGHT_SMALL :{BLACK}{SMALLRIGHTARROW}
+STR_BLACK_SMALL_ARROW_LEFT :{BLACK}{SMALLLEFTARROW}
+STR_BLACK_SMALL_ARROW_RIGHT :{BLACK}{SMALLRIGHTARROW}
STR_AI_SPEED_VERY_SLOW :Muito Lento
STR_AI_SPEED_SLOW :Lento
STR_AI_SPEED_MEDIUM :Médio
@@ -2884,7 +2882,7 @@ STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Centrar
STR_BUILD_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP :{BLACK}Lista de veículos de estrada - clique num veículo para informações
STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_TOOLTIP :{BLACK}Construir o veículo de estrada seleccionado
STR_ARTICULATED_RV_CAPACITY :{BLACK}Capacidade: {LTBLUE}
-STR_BARE_CARGO :{CARGO}
+STR_JUST_CARGO :{CARGO}
STR_DEPOT_VEHICLE_TOOLTIP :{BLACK}{ENGINE}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CHAIN :{BLACK}{NUM} veículo{P "" s}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CARGO :{}{CARGO} ({SHORTCARGO})
diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt
index a7c230621..8d9d80b34 100644
--- a/src/lang/romanian.txt
+++ b/src/lang/romanian.txt
@@ -154,8 +154,8 @@ STR_ABBREV_PLASTIC :{TINYFONT}PL
STR_ABBREV_FIZZY_DRINKS :{TINYFONT}SC
STR_ABBREV_NONE :{TINYFONT}NU
STR_ABBREV_ALL :{TINYFONT}TOT
-STR_DATE_SHORT_WHITE :{WHITE}{DATE_SHORT}
-STR_DATE_LONG_WHITE :{WHITE}{DATE_LONG}
+STR_WHITE_DATE_SHORT :{WHITE}{DATE_SHORT}
+STR_WHITE_DATE_LONG :{WHITE}{DATE_LONG}
STR_SMALLMAP_CAPTION :{WHITE}Harta - {STRING}
STR_GAME_OPTIONS_CAPTION :{WHITE}Opţiuni
STR_ERROR_MESSAGE_CAPTION :{YELLOW}Mesaj
@@ -328,7 +328,6 @@ STR_SORT_BY_PRODUCTION :Productie
STR_SORT_BY_TYPE :Tip
STR_SORT_BY_TRANSPORTED :Transportat
STR_SORT_BY_NAME :{BLACK}Nume
-STR_SORT_BY_DROPDOWN_NAME :Nume
STR_SORT_BY_DATE :{BLACK}Datã
STR_SORT_BY_NUMBER :Numar
STR_SORT_BY_PROFIT_LAST_YEAR :Profit anul trecut
@@ -412,8 +411,8 @@ STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS :{BLACK}Construi
STR_TOOLBAR_TOOLTIP_PLANT_TREES_PLACE_SIGNS :{BLACK}Plantează arbori
STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION :{BLACK}Informatii despre teren
STR_TOOLBAR_TOOLTIP_OPTIONS :{BLACK}Optiuni
-STR_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
-STR_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
+STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
+STR_BLACK_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
STR_ERROR_CAN_T_CHANGE_SERVICING :{WHITE}Nu se poate schimba intervalul de întreţinere...
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Închide fereastra
STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Titlul ferestrei - trage de aici pentru a muta fereastra
@@ -583,12 +582,12 @@ STR_HIGHSCORE_NAME :{BIGFONT}{PRESI
STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA})
STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} a dobandit titlul de '{STRING}'!
STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} al {COMPANY} dobandeste titlul de '{STRING}'!
-STR_BLUE_NUMBER :{BLUE}{COMMA}
+STR_BLUE_COMMA :{BLUE}{COMMA}
STR_SCENEDIT_TOOLBAR_OPENTTD :{YELLOW}OpenTTD
STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR :{YELLOW}Editor de scenarii
STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION :{WHITE}Generator suprafaţă uscat
-STR_ARROW_UP :{BLACK}{UPARROW}
-STR_ARROW_DOWN :{BLACK}{DOWNARROW}
+STR_BLACK_ARROW_UP :{BLACK}{UPARROW}
+STR_BLACK_ARROW_DOWN :{BLACK}{DOWNARROW}
STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA :{BLACK}Măreşte aria de editare a terenului
STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA :{BLACK}Micşorează aria de editare a terenului
STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND :{BLACK}Generează teren aleator
@@ -672,7 +671,7 @@ STR_FULL :Pe larg
STR_STATUSBAR_COMPANY_NAME :{SILVER}- - {COMPANY} - -
STR_BLACK_STRING :{BLACK}{STRING}
-STR_CHECKMARK :{CHECKMARK}
+STR_JUST_CHECKMARK :{CHECKMARK}
############ range for menu starts
STR_SETTINGS_MENU_GAME_OPTIONS :Opţiunile jocului (F2)
STR_SETTINGS_MENU_DIFFICULTY_SETTINGS :Setări dificultate
@@ -777,8 +776,8 @@ STR_STATUSBAR_SAVING_GAME :{RED}* * SALV
STR_SAVE_STILL_IN_PROGRESS :{WHITE}Salvarea se efectueaza încã,{}vã rugãm asteptati pânã se încheie!
STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE :{BLACK}Selectează programul muzical 'Ezy Street'
-STR_6 :{BLACK}6
-STR_7 :{BLACK}7
+STR_BLACK_6 :{BLACK}6
+STR_BLACK_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :Engleza (Original)
@@ -886,7 +885,7 @@ STR_CRATES :pachete
STR_RES_OTHER :(alta/nespecificată)
STR_NOTHING :
-STR_SMALL_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
+STR_TINY_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
STR_CANT_SHARE_ORDER_LIST :{WHITE}Nu se poate trece la comenzi sincronizate...
STR_CANT_COPY_ORDER_LIST :{WHITE}Nu pot copia lista de comenzi...
@@ -1159,8 +1158,7 @@ STR_CONFIG_SETTING_MAP_Y :{LTBLUE}Marimea
############ generic strings for settings
STR_CONFIG_SETTING_DISABLED :dezactivat
-STR_CONFIG_SETTING_INT32 :{NUM}
-STR_CONFIG_SETTING_CURRENCY :{CURRENCY}
+STR_JUST_CURRENCY :{CURRENCY}
STR_CONFIG_SETTING_QUERY_CAPT :{WHITE}Schimbă valoarea setării
STR_TEMPERATE_LANDSCAPE :peisajul temperat
@@ -2126,8 +2124,8 @@ STR_NUM_LOW :scăzut
STR_NUM_NORMAL :normal
STR_NUM_HIGH :ridicat
STR_NUM_CUSTOM :Propriu
-STR_ARROW_LEFT_SMALL :{BLACK}{SMALLLEFTARROW}
-STR_ARROW_RIGHT_SMALL :{BLACK}{SMALLRIGHTARROW}
+STR_BLACK_SMALL_ARROW_LEFT :{BLACK}{SMALLLEFTARROW}
+STR_BLACK_SMALL_ARROW_RIGHT :{BLACK}{SMALLRIGHTARROW}
STR_AI_SPEED_VERY_SLOW :foarte încet
STR_AI_SPEED_SLOW :încet
STR_AI_SPEED_MEDIUM :mediu
@@ -2808,7 +2806,7 @@ STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT :{WHITE}...trebu
STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT :{WHITE}Nu pot găsi o autobază apropiată
STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP :{BLACK}Forţează vehiculul să întoarcă
STR_ARTICULATED_RV_CAPACITY :{BLACK}Capacitate: {LTBLUE}
-STR_BARE_CARGO :{CARGO}
+STR_JUST_CARGO :{CARGO}
STR_DEPOT_VEHICLE_TOOLTIP :{BLACK}{ENGINE}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CHAIN :{BLACK}{NUM} vehicul{P "" e}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CARGO :{}{CARGO} ({SHORTCARGO})
diff --git a/src/lang/russian.txt b/src/lang/russian.txt
index 1fa6428f3..28b9d1df6 100644
--- a/src/lang/russian.txt
+++ b/src/lang/russian.txt
@@ -280,8 +280,8 @@ STR_ABBREV_PLASTIC :{TINYFONT}ПЛ
STR_ABBREV_FIZZY_DRINKS :{TINYFONT}ГЗ
STR_ABBREV_NONE :{TINYFONT}НЕТ
STR_ABBREV_ALL :{TINYFONT}Все
-STR_DATE_SHORT_WHITE :{WHITE}{DATE_SHORT}
-STR_DATE_LONG_WHITE :{WHITE}{DATE_LONG}
+STR_WHITE_DATE_SHORT :{WHITE}{DATE_SHORT}
+STR_WHITE_DATE_LONG :{WHITE}{DATE_LONG}
STR_SMALLMAP_CAPTION :{WHITE}Карта - {STRING}
STR_GAME_OPTIONS_CAPTION :{WHITE}Настройки игры
STR_ERROR_MESSAGE_CAPTION :{YELLOW}Сообщение
@@ -454,7 +454,6 @@ STR_SORT_BY_PRODUCTION :Продукц
STR_SORT_BY_TYPE :Тип
STR_SORT_BY_TRANSPORTED :Вывоз
STR_SORT_BY_NAME :{BLACK}Имя
-STR_SORT_BY_DROPDOWN_NAME :Название
STR_SORT_BY_DATE :{BLACK}Дата
STR_SORT_BY_NUMBER :Номер
STR_SORT_BY_PROFIT_LAST_YEAR :Прибыль в прошлом году
@@ -550,8 +549,8 @@ STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS :{BLACK}Стро
STR_TOOLBAR_TOOLTIP_PLANT_TREES_PLACE_SIGNS :{BLACK}Высадка деревьев
STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION :{BLACK}Информация о земле
STR_TOOLBAR_TOOLTIP_OPTIONS :{BLACK}Настройки
-STR_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
-STR_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
+STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
+STR_BLACK_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
STR_ERROR_CAN_T_CHANGE_SERVICING :{WHITE}Невозможно изменить сервисный интервал...
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Закрыть окно
STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Заголовок окна - для перемещения окна тащить за него
@@ -732,12 +731,12 @@ STR_HIGHSCORE_NAME :{BIGFONT}{PRESI
STR_HIGHSCORE_STATS :{BIGFONT}«{STRING}» ({COMMA})
STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BLACK}{BIGFONT}Директора компании «{COMPANY}» называют {STRING.abl}!
STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME}, президент компании «{COMPANY}», заслужил титул «{STRING}»!
-STR_BLUE_NUMBER :{BLUE}{COMMA}
+STR_BLUE_COMMA :{BLUE}{COMMA}
STR_SCENEDIT_TOOLBAR_OPENTTD :{YELLOW}OpenTTD
STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR :{YELLOW}Редактор сценариев
STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION :{WHITE}Генератор карты
-STR_ARROW_UP :{BLACK}{UPARROW}
-STR_ARROW_DOWN :{BLACK}{DOWNARROW}
+STR_BLACK_ARROW_UP :{BLACK}{UPARROW}
+STR_BLACK_ARROW_DOWN :{BLACK}{DOWNARROW}
STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA :{BLACK}Увеличить площадь изменения рельефа
STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA :{BLACK}Уменьшить площадь изменения рельефа
STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND :{BLACK}Создать случайную карту
@@ -821,7 +820,7 @@ STR_FULL :Полно
STR_STATUSBAR_COMPANY_NAME :{SILVER}- - {COMPANY} - -
STR_BLACK_STRING :{BLACK}{STRING}
-STR_CHECKMARK :{CHECKMARK}
+STR_JUST_CHECKMARK :{CHECKMARK}
############ range for menu starts
STR_SETTINGS_MENU_GAME_OPTIONS :Настройки игры
STR_SETTINGS_MENU_DIFFICULTY_SETTINGS :Настройки сложности
@@ -926,8 +925,8 @@ STR_STATUSBAR_SAVING_GAME :{RED}* * СО
STR_SAVE_STILL_IN_PROGRESS :{WHITE}Идёт сохранение,{}пожалуйста, дождитесь завершения!
STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE :{BLACK}Выбрать музыкальную программу
-STR_6 :{BLACK}6
-STR_7 :{BLACK}7
+STR_BLACK_6 :{BLACK}6
+STR_BLACK_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :Английские
@@ -1035,7 +1034,7 @@ STR_CRATES :мешков
STR_RES_OTHER :Другое
STR_NOTHING :
-STR_SMALL_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
+STR_TINY_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
STR_CANT_SHARE_ORDER_LIST :{WHITE}Невозможно использовать общий список заданий
STR_CANT_COPY_ORDER_LIST :{WHITE}Невозможно скопировать список заданий
@@ -1308,8 +1307,7 @@ STR_CONFIG_SETTING_MAP_Y :{LTBLUE}Вер
############ generic strings for settings
STR_CONFIG_SETTING_DISABLED :отключено
-STR_CONFIG_SETTING_INT32 :{NUM}
-STR_CONFIG_SETTING_CURRENCY :{CURRENCY}
+STR_JUST_CURRENCY :{CURRENCY}
STR_CONFIG_SETTING_QUERY_CAPT :{WHITE}Изменить значение
STR_TEMPERATE_LANDSCAPE :Умеренный ландшафт
@@ -2279,8 +2277,8 @@ STR_NUM_LOW :Малое
STR_NUM_NORMAL :Среднее
STR_NUM_HIGH :Большое
STR_NUM_CUSTOM :Указанное
-STR_ARROW_LEFT_SMALL :{BLACK}{SMALLLEFTARROW}
-STR_ARROW_RIGHT_SMALL :{BLACK}{SMALLRIGHTARROW}
+STR_BLACK_SMALL_ARROW_LEFT :{BLACK}{SMALLLEFTARROW}
+STR_BLACK_SMALL_ARROW_RIGHT :{BLACK}{SMALLRIGHTARROW}
STR_AI_SPEED_VERY_SLOW :Очень медленная
STR_AI_SPEED_SLOW :Медленная
STR_AI_SPEED_MEDIUM :Средняя
@@ -2971,7 +2969,7 @@ STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT :{WHITE}...до
STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT :{WHITE}Невозможно найти гараж
STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP :{BLACK}Принудительно развернуть автомобиль
STR_ARTICULATED_RV_CAPACITY :{BLACK}Ёмкость: {LTBLUE}
-STR_BARE_CARGO :{CARGO}
+STR_JUST_CARGO :{CARGO}
STR_DEPOT_VEHICLE_TOOLTIP :{BLACK}{ENGINE}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CHAIN :{BLACK}{NUM} единиц{P а "" ""}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CARGO :{}{CARGO} ({SHORTCARGO})
diff --git a/src/lang/serbian.txt b/src/lang/serbian.txt
index 7e994a9c6..e959047d5 100644
--- a/src/lang/serbian.txt
+++ b/src/lang/serbian.txt
@@ -329,8 +329,8 @@ STR_ABBREV_PLASTIC :{TINYFONT}PL
STR_ABBREV_FIZZY_DRINKS :{TINYFONT}FZ
STR_ABBREV_NONE :{TINYFONT}NO
STR_ABBREV_ALL :{TINYFONT}ALL
-STR_DATE_SHORT_WHITE :{WHITE}{DATE_SHORT}
-STR_DATE_LONG_WHITE :{WHITE}{DATE_LONG}
+STR_WHITE_DATE_SHORT :{WHITE}{DATE_SHORT}
+STR_WHITE_DATE_LONG :{WHITE}{DATE_LONG}
STR_SMALLMAP_CAPTION :{WHITE}Mapa - {STRING}
STR_GAME_OPTIONS_CAPTION :{WHITE}Opcije
STR_ERROR_MESSAGE_CAPTION :{YELLOW}Poruka
@@ -503,7 +503,6 @@ STR_SORT_BY_PRODUCTION :Proizvodnji
STR_SORT_BY_TYPE :Vrsti
STR_SORT_BY_TRANSPORTED :Transportovano
STR_SORT_BY_NAME :{BLACK}Ime
-STR_SORT_BY_DROPDOWN_NAME :Imenu
STR_SORT_BY_DATE :{BLACK}Datumu
STR_SORT_BY_NUMBER :Broju
STR_SORT_BY_PROFIT_LAST_YEAR :Zaradi prošle godine
@@ -585,8 +584,8 @@ STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS :{BLACK}Izgradnj
STR_TOOLBAR_TOOLTIP_PLANT_TREES_PLACE_SIGNS :{BLACK}Sađenje drveća, postavljanje znakova itd.
STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION :{BLACK}Informacije o zemljištu
STR_TOOLBAR_TOOLTIP_OPTIONS :{BLACK}Opcije
-STR_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
-STR_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
+STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
+STR_BLACK_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
STR_ERROR_CAN_T_CHANGE_SERVICING :{WHITE}Servisni interval nije moguće promeniti...
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Zatvori prozor
STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Naslov - povucite mišem da biste pomerili prozor
@@ -773,12 +772,12 @@ STR_HIGHSCORE_NAME :{BIGFONT}{PRESI
STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA})
STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} dostiže status '{STRING}'!
STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME}, vlasnik kompanije {COMPANY} je dostigao status '{STRING}'!
-STR_BLUE_NUMBER :{BLUE}{COMMA}
+STR_BLUE_COMMA :{BLUE}{COMMA}
STR_SCENEDIT_TOOLBAR_OPENTTD :{YELLOW}OpenTTD
STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR :{YELLOW}Editor scenarija
STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION :{WHITE}Generator terena
-STR_ARROW_UP :{BLACK}{UPARROW}
-STR_ARROW_DOWN :{BLACK}{DOWNARROW}
+STR_BLACK_ARROW_UP :{BLACK}{UPARROW}
+STR_BLACK_ARROW_DOWN :{BLACK}{DOWNARROW}
STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA :{BLACK}Uvećaj područje koje treba sniziti/povisiti
STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA :{BLACK}Smanji područje koje treba sniziti/povisiti
STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND :{BLACK}Generiši nov nasumičan teren
@@ -862,7 +861,7 @@ STR_FULL :Puni
STR_STATUSBAR_COMPANY_NAME :{SILVER}- - {COMPANY} - -
STR_BLACK_STRING :{BLACK}{STRING}
-STR_CHECKMARK :{CHECKMARK}
+STR_JUST_CHECKMARK :{CHECKMARK}
############ range for menu starts
STR_SETTINGS_MENU_GAME_OPTIONS :Opcije
STR_SETTINGS_MENU_DIFFICULTY_SETTINGS :Podešavanje težine
@@ -967,8 +966,8 @@ STR_STATUSBAR_SAVING_GAME :{RED}* * ČUV
STR_SAVE_STILL_IN_PROGRESS :{WHITE}Čuvanje je još u toku,{}molim sačekajte dok se ne završi!
STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE :{BLACK}Izbor programa 'lagane stvari'
-STR_6 :{BLACK}6
-STR_7 :{BLACK}7
+STR_BLACK_6 :{BLACK}6
+STR_BLACK_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :Engleska (Originalna)
@@ -1076,7 +1075,7 @@ STR_CRATES :sanduka
STR_RES_OTHER :drugo
STR_NOTHING :
-STR_SMALL_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
+STR_TINY_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
STR_CANT_SHARE_ORDER_LIST :{WHITE}Lista naredbi se ne može deliti...
STR_CANT_COPY_ORDER_LIST :{WHITE}Lista naredbi se ne može kopirati...
@@ -1349,8 +1348,7 @@ STR_CONFIG_SETTING_MAP_Y :{LTBLUE}Y-veli
############ generic strings for settings
STR_CONFIG_SETTING_DISABLED :isključeno
-STR_CONFIG_SETTING_INT32 :{NUM}
-STR_CONFIG_SETTING_CURRENCY :{CURRENCY}
+STR_JUST_CURRENCY :{CURRENCY}
STR_CONFIG_SETTING_QUERY_CAPT :{WHITE}Promena vrednosti
STR_TEMPERATE_LANDSCAPE :Umereni klimatski pojas
@@ -2312,8 +2310,8 @@ STR_NUM_LOW :niski
STR_NUM_NORMAL :normalni
STR_NUM_HIGH :visoki
STR_NUM_CUSTOM :Prilagođen
-STR_ARROW_LEFT_SMALL :{BLACK}{SMALLLEFTARROW}
-STR_ARROW_RIGHT_SMALL :{BLACK}{SMALLRIGHTARROW}
+STR_BLACK_SMALL_ARROW_LEFT :{BLACK}{SMALLLEFTARROW}
+STR_BLACK_SMALL_ARROW_RIGHT :{BLACK}{SMALLRIGHTARROW}
STR_AI_SPEED_VERY_SLOW :jako spora
STR_AI_SPEED_SLOW :spora
STR_AI_SPEED_MEDIUM :srednja
@@ -2919,7 +2917,7 @@ STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Prebacit
STR_BUILD_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP :{BLACK}Spisak probranih drumskih vozila - kliknite na vozilo za više podataka
STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_TOOLTIP :{BLACK}Kupite označeno drumsko vozilo
STR_ARTICULATED_RV_CAPACITY :{BLACK}Nosivost: {LTBLUE}
-STR_BARE_CARGO :{CARGO}
+STR_JUST_CARGO :{CARGO}
STR_DEPOT_VEHICLE_TOOLTIP :{BLACK}{ENGINE}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CHAIN :{BLACK}{NUM} vozil{P o a a}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CARGO :{}{CARGO} ({SHORTCARGO})
diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt
index 10435a91e..92779d067 100644
--- a/src/lang/simplified_chinese.txt
+++ b/src/lang/simplified_chinese.txt
@@ -154,8 +154,8 @@ STR_ABBREV_PLASTIC :{TINYFONT}塑
STR_ABBREV_FIZZY_DRINKS :{TINYFONT}跳
STR_ABBREV_NONE :{TINYFONT}无
STR_ABBREV_ALL :{TINYFONT}全
-STR_DATE_SHORT_WHITE :{WHITE}{DATE_SHORT}
-STR_DATE_LONG_WHITE :{WHITE}{DATE_LONG}
+STR_WHITE_DATE_SHORT :{WHITE}{DATE_SHORT}
+STR_WHITE_DATE_LONG :{WHITE}{DATE_LONG}
STR_SMALLMAP_CAPTION :{WHITE}地图 - {STRING}
STR_GAME_OPTIONS_CAPTION :{WHITE}游戏选项
STR_ERROR_MESSAGE_CAPTION :{YELLOW}消息
@@ -328,7 +328,6 @@ STR_SORT_BY_PRODUCTION :产量
STR_SORT_BY_TYPE :类型
STR_SORT_BY_TRANSPORTED :已运输
STR_SORT_BY_NAME :{BLACK}名称
-STR_SORT_BY_DROPDOWN_NAME :名称
STR_SORT_BY_DATE :{BLACK}日期
STR_SORT_BY_NUMBER :序号
STR_SORT_BY_PROFIT_LAST_YEAR :去年利润
@@ -410,8 +409,8 @@ STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS :{BLACK}建设
STR_TOOLBAR_TOOLTIP_PLANT_TREES_PLACE_SIGNS :{BLACK}打开植树工具菜单
STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION :{BLACK}查询地块信息
STR_TOOLBAR_TOOLTIP_OPTIONS :{BLACK}选项
-STR_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
-STR_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
+STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
+STR_BLACK_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
STR_ERROR_CAN_T_CHANGE_SERVICING :{WHITE}不能改变保养周期……
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}关闭窗口
STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}窗口标题 - 拖动这里可以移动该窗口
@@ -581,12 +580,12 @@ STR_HIGHSCORE_NAME :{BIGFONT}{PRESI
STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA})
STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} 达到 '{STRING}' 的状态!
STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} 在 {COMPANY} 达到 '{STRING}' 状态!
-STR_BLUE_NUMBER :{BLUE}{COMMA}
+STR_BLUE_COMMA :{BLUE}{COMMA}
STR_SCENEDIT_TOOLBAR_OPENTTD :{YELLOW}OpenTTD
STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR :{YELLOW}场景编辑器
STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION :{WHITE}生成土地
-STR_ARROW_UP :{BLACK}{UPARROW}
-STR_ARROW_DOWN :{BLACK}{DOWNARROW}
+STR_BLACK_ARROW_UP :{BLACK}{UPARROW}
+STR_BLACK_ARROW_DOWN :{BLACK}{DOWNARROW}
STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA :{BLACK}增加要升高/降低的土地面积
STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA :{BLACK}减少要升高/降低的土地面积
STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND :{BLACK}随机生成土地
@@ -670,7 +669,7 @@ STR_FULL :完全
STR_STATUSBAR_COMPANY_NAME :{SILVER}- - {COMPANY} - -
STR_BLACK_STRING :{BLACK}{STRING}
-STR_CHECKMARK :{CHECKMARK}
+STR_JUST_CHECKMARK :{CHECKMARK}
############ range for menu starts
STR_SETTINGS_MENU_GAME_OPTIONS :游戏选项
STR_SETTINGS_MENU_DIFFICULTY_SETTINGS :难度设定
@@ -775,8 +774,8 @@ STR_STATUSBAR_SAVING_GAME :{RED}* * 保
STR_SAVE_STILL_IN_PROGRESS :{WHITE}保存仍在继续{}请耐心等待……
STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE :{BLACK}选择'Ezy街头'风格的音乐列表
-STR_6 :{BLACK}6
-STR_7 :{BLACK}7
+STR_BLACK_6 :{BLACK}6
+STR_BLACK_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :英国 (原始的)
@@ -884,7 +883,7 @@ STR_CRATES :件
STR_RES_OTHER :其他
STR_NOTHING :
-STR_SMALL_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
+STR_TINY_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
STR_CANT_SHARE_ORDER_LIST :{WHITE}不能共享调度计划……
STR_CANT_COPY_ORDER_LIST :{WHITE}不能复制调度计划……
@@ -1157,8 +1156,7 @@ STR_CONFIG_SETTING_MAP_Y :{LTBLUE}地图
############ generic strings for settings
STR_CONFIG_SETTING_DISABLED :禁用
-STR_CONFIG_SETTING_INT32 :{NUM}
-STR_CONFIG_SETTING_CURRENCY :{CURRENCY}
+STR_JUST_CURRENCY :{CURRENCY}
STR_CONFIG_SETTING_QUERY_CAPT :{WHITE}改变设置值
STR_TEMPERATE_LANDSCAPE :温带景观
@@ -2124,8 +2122,8 @@ STR_NUM_LOW :低
STR_NUM_NORMAL :一般
STR_NUM_HIGH :高
STR_NUM_CUSTOM :自定义
-STR_ARROW_LEFT_SMALL :{BLACK}{SMALLLEFTARROW}
-STR_ARROW_RIGHT_SMALL :{BLACK}{SMALLRIGHTARROW}
+STR_BLACK_SMALL_ARROW_LEFT :{BLACK}{SMALLLEFTARROW}
+STR_BLACK_SMALL_ARROW_RIGHT :{BLACK}{SMALLRIGHTARROW}
STR_AI_SPEED_VERY_SLOW :非常慢
STR_AI_SPEED_SLOW :慢
STR_AI_SPEED_MEDIUM :适中
@@ -2875,7 +2873,7 @@ STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}将屏
STR_BUILD_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP :{BLACK}汽车列表 - 点击可以查看详细信息
STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_TOOLTIP :{BLACK}购买选定的汽车
STR_ARTICULATED_RV_CAPACITY :{BLACK}运力: {LTBLUE}
-STR_BARE_CARGO :{CARGO}
+STR_JUST_CARGO :{CARGO}
STR_DEPOT_VEHICLE_TOOLTIP :{BLACK}{ENGINE}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CHAIN :{BLACK}{NUM} 车辆{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CARGO :{}{CARGO} ({SHORTCARGO})
diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt
index 6d06c0c64..c3d615811 100644
--- a/src/lang/slovak.txt
+++ b/src/lang/slovak.txt
@@ -218,8 +218,8 @@ STR_ABBREV_PLASTIC :{TINYFONT}ZU
STR_ABBREV_FIZZY_DRINKS :{TINYFONT}SU
STR_ABBREV_NONE :{TINYFONT}NIC
STR_ABBREV_ALL :{TINYFONT}VS.
-STR_DATE_SHORT_WHITE :{WHITE}{DATE_SHORT}
-STR_DATE_LONG_WHITE :{WHITE}{DATE_LONG}
+STR_WHITE_DATE_SHORT :{WHITE}{DATE_SHORT}
+STR_WHITE_DATE_LONG :{WHITE}{DATE_LONG}
STR_SMALLMAP_CAPTION :{WHITE}Mapa - {STRING}
STR_GAME_OPTIONS_CAPTION :{WHITE}Nastavenia hry
STR_ERROR_MESSAGE_CAPTION :{YELLOW}Správa
@@ -395,7 +395,6 @@ STR_SORT_BY_PRODUCTION :Produkcia
STR_SORT_BY_TYPE :Typ
STR_SORT_BY_TRANSPORTED :Prepravene
STR_SORT_BY_NAME :{BLACK}Nazov
-STR_SORT_BY_DROPDOWN_NAME :Nazov
STR_SORT_BY_DATE :{BLACK}Datum
STR_SORT_BY_NUMBER :Cislo
STR_SORT_BY_PROFIT_LAST_YEAR :Zisk v poslednom roku
@@ -477,8 +476,8 @@ STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS :{BLACK}Výstavb
STR_TOOLBAR_TOOLTIP_PLANT_TREES_PLACE_SIGNS :{BLACK}Výsadba stromov, kúpa pozemku, ...
STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION :{BLACK}Informácie o pozemku
STR_TOOLBAR_TOOLTIP_OPTIONS :{BLACK}Nastavenia
-STR_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
-STR_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
+STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
+STR_BLACK_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
STR_ERROR_CAN_T_CHANGE_SERVICING :{WHITE}Nie je možné zmenit servisný interval ...
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Zavriet okno
STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Nadpis okna - potiahni pre posun okna
@@ -648,12 +647,12 @@ STR_HIGHSCORE_NAME :{BIGFONT}{PRESI
STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA})
STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} ziskal oznacenie '{STRING}' !
STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} z {COMPANY} ziskal oznacenie '{STRING}' !
-STR_BLUE_NUMBER :{BLUE}{COMMA}
+STR_BLUE_COMMA :{BLUE}{COMMA}
STR_SCENEDIT_TOOLBAR_OPENTTD :{YELLOW}OpenTTD
STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR :{YELLOW}Editor scenárov
STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION :{WHITE}Generovanie uzemia
-STR_ARROW_UP :{BLACK}{UPARROW}
-STR_ARROW_DOWN :{BLACK}{DOWNARROW}
+STR_BLACK_ARROW_UP :{BLACK}{UPARROW}
+STR_BLACK_ARROW_DOWN :{BLACK}{DOWNARROW}
STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA :{BLACK}Pre zvysenie/znizenie oblasti je potrebne zvacsit uzemie
STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA :{BLACK}Pre zvysenie/znizenie oblasti je potrebne zmensit uzemie
STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND :{BLACK}Vygenerovat nahodne uzemie
@@ -737,7 +736,7 @@ STR_FULL :Plne
STR_STATUSBAR_COMPANY_NAME :{SILVER}- - {COMPANY} - -
STR_BLACK_STRING :{BLACK}{STRING}
-STR_CHECKMARK :{CHECKMARK}
+STR_JUST_CHECKMARK :{CHECKMARK}
############ range for menu starts
STR_SETTINGS_MENU_GAME_OPTIONS :Nastavenia hry
STR_SETTINGS_MENU_DIFFICULTY_SETTINGS :Nastavenia obtiaznosti
@@ -845,8 +844,8 @@ STR_STATUSBAR_SAVING_GAME :{RED}* * HRA
STR_SAVE_STILL_IN_PROGRESS :{WHITE}Ukladanie hry este bezi,{}pockajte prosim na dokoncenie!
STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE :{BLACK}Vyber 'Ezy Street style music' program
-STR_6 :{BLACK}6
-STR_7 :{BLACK}7
+STR_BLACK_6 :{BLACK}6
+STR_BLACK_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :Anglicke
@@ -954,7 +953,7 @@ STR_CRATES :debien
STR_RES_OTHER :iné
STR_NOTHING :
-STR_SMALL_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
+STR_TINY_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
STR_CANT_SHARE_ORDER_LIST :{WHITE}Nemozno zdielat zoznam smerov ...
STR_CANT_COPY_ORDER_LIST :{WHITE}Nemozno kopirovat zoznam prikazov ...
@@ -1227,8 +1226,7 @@ STR_CONFIG_SETTING_MAP_Y :{LTBLUE}Y-rozme
############ generic strings for settings
STR_CONFIG_SETTING_DISABLED :zakazane
-STR_CONFIG_SETTING_INT32 :{NUM}
-STR_CONFIG_SETTING_CURRENCY :{CURRENCY}
+STR_JUST_CURRENCY :{CURRENCY}
STR_CONFIG_SETTING_QUERY_CAPT :{WHITE}Zmenit hodnotu nastavenia
STR_TEMPERATE_LANDSCAPE :krajina mierneho pasma
@@ -2194,8 +2192,8 @@ STR_NUM_LOW :Nízky
STR_NUM_NORMAL :Normálny
STR_NUM_HIGH :Vysoký
STR_NUM_CUSTOM :Vlastne
-STR_ARROW_LEFT_SMALL :{BLACK}{SMALLLEFTARROW}
-STR_ARROW_RIGHT_SMALL :{BLACK}{SMALLRIGHTARROW}
+STR_BLACK_SMALL_ARROW_LEFT :{BLACK}{SMALLLEFTARROW}
+STR_BLACK_SMALL_ARROW_RIGHT :{BLACK}{SMALLRIGHTARROW}
STR_AI_SPEED_VERY_SLOW :Velmi Pomale
STR_AI_SPEED_SLOW :Pomale
STR_AI_SPEED_MEDIUM :Stredne
@@ -2950,7 +2948,7 @@ STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Centrova
STR_BUILD_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP :{BLACK}Vyber vozidiel - kliknut pre detaily
STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_TOOLTIP :{BLACK}Zakupit vybrany automobil
STR_ARTICULATED_RV_CAPACITY :{BLACK}Kapacita: {LTBLUE}
-STR_BARE_CARGO :{CARGO}
+STR_JUST_CARGO :{CARGO}
STR_DEPOT_VEHICLE_TOOLTIP :{BLACK}{ENGINE}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CHAIN :{BLACK}{NUM} vozid{P lo lá iel}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CARGO :{}{CARGO} ({SHORTCARGO})
diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt
index b29322939..56322b0ba 100644
--- a/src/lang/slovenian.txt
+++ b/src/lang/slovenian.txt
@@ -196,8 +196,8 @@ STR_ABBREV_PLASTIC :{TINYFONT}PL
STR_ABBREV_FIZZY_DRINKS :{TINYFONT}GP
STR_ABBREV_NONE :{TINYFONT}NO
STR_ABBREV_ALL :{TINYFONT}VSE
-STR_DATE_SHORT_WHITE :{WHITE}{DATE_SHORT}
-STR_DATE_LONG_WHITE :{WHITE}{DATE_LONG}
+STR_WHITE_DATE_SHORT :{WHITE}{DATE_SHORT}
+STR_WHITE_DATE_LONG :{WHITE}{DATE_LONG}
STR_SMALLMAP_CAPTION :{WHITE}Zemljevid - {STRING}
STR_GAME_OPTIONS_CAPTION :{WHITE}Možnosti Igre
STR_ERROR_MESSAGE_CAPTION :{YELLOW}Sporočilo
@@ -370,7 +370,6 @@ STR_SORT_BY_PRODUCTION :Proizvodnja
STR_SORT_BY_TYPE :Tip
STR_SORT_BY_TRANSPORTED :Prepeljano
STR_SORT_BY_NAME :{BLACK}Ime
-STR_SORT_BY_DROPDOWN_NAME :Ime
STR_SORT_BY_DATE :{BLACK}Datum
STR_SORT_BY_NUMBER :Število
STR_SORT_BY_PROFIT_LAST_YEAR :Dobiček v zadnjem letu
@@ -452,8 +451,8 @@ STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS :{BLACK}Zgradi l
STR_TOOLBAR_TOOLTIP_PLANT_TREES_PLACE_SIGNS :{BLACK}Posadi drevesa, postavi znake, ipd.
STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION :{BLACK}Informacije o terenu
STR_TOOLBAR_TOOLTIP_OPTIONS :{BLACK}Možnosti
-STR_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
-STR_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
+STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
+STR_BLACK_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
STR_ERROR_CAN_T_CHANGE_SERVICING :{WHITE}Ni mogoča sprememba obdobja servisiranja ...
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Zapri okno
STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Naslov okna - primi in vleci za premik okna
@@ -623,12 +622,12 @@ STR_HIGHSCORE_NAME :{BIGFONT}{PRESI
STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA})
STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} dosega naslov '{STRING}'!
STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} iz podjetja {COMPANY} prejema naslov '{STRING}'!
-STR_BLUE_NUMBER :{BLUE}{COMMA}
+STR_BLUE_COMMA :{BLUE}{COMMA}
STR_SCENEDIT_TOOLBAR_OPENTTD :{YELLOW}OpenTTD
STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR :{YELLOW}Urejevalnik scenarijev
STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION :{WHITE}Generator terena
-STR_ARROW_UP :{BLACK}{UPARROW}
-STR_ARROW_DOWN :{BLACK}{DOWNARROW}
+STR_BLACK_ARROW_UP :{BLACK}{UPARROW}
+STR_BLACK_ARROW_DOWN :{BLACK}{DOWNARROW}
STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA :{BLACK}Povečaj območje za nižanje/višanje terena
STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA :{BLACK}Zmanjšaj območje za nižanje/višanje terena
STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND :{BLACK}Ustvari naključni teren
@@ -712,7 +711,7 @@ STR_FULL :Polno
STR_STATUSBAR_COMPANY_NAME :{SILVER}- - {COMPANY} - -
STR_BLACK_STRING :{BLACK}{STRING}
-STR_CHECKMARK :{CHECKMARK}
+STR_JUST_CHECKMARK :{CHECKMARK}
############ range for menu starts
STR_SETTINGS_MENU_GAME_OPTIONS :Možnosti igre
STR_SETTINGS_MENU_DIFFICULTY_SETTINGS :Nastavitve težavnosti
@@ -820,8 +819,8 @@ STR_STATUSBAR_SAVING_GAME :{RED}* * SHRA
STR_SAVE_STILL_IN_PROGRESS :{WHITE}Shranjevanje poteka,{}Prosim počakaj, da se zaključi!
STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE :{BLACK}Izberi 'Poulični' glasbeni program
-STR_6 :{BLACK}6
-STR_7 :{BLACK}7
+STR_BLACK_6 :{BLACK}6
+STR_BLACK_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :Angleška (Originalna)
@@ -929,7 +928,7 @@ STR_CRATES :palet
STR_RES_OTHER :drugo
STR_NOTHING :
-STR_SMALL_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
+STR_TINY_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
STR_CANT_SHARE_ORDER_LIST :{WHITE}Ni mogoče deliti navodil ...
STR_CANT_COPY_ORDER_LIST :{WHITE}Ni mogoče skopirati urnika ...
@@ -1202,8 +1201,7 @@ STR_CONFIG_SETTING_MAP_Y :{LTBLUE}Y-velik
############ generic strings for settings
STR_CONFIG_SETTING_DISABLED :onemogočeno
-STR_CONFIG_SETTING_INT32 :{NUM}
-STR_CONFIG_SETTING_CURRENCY :{CURRENCY}
+STR_JUST_CURRENCY :{CURRENCY}
STR_CONFIG_SETTING_QUERY_CAPT :{WHITE}Spremeni vrednost
STR_TEMPERATE_LANDSCAPE :Zmerno podnebje
@@ -2207,8 +2205,8 @@ STR_NUM_LOW :Malo
STR_NUM_NORMAL :Normalno
STR_NUM_HIGH :Veliko
STR_NUM_CUSTOM :Po meri
-STR_ARROW_LEFT_SMALL :{BLACK}{SMALLLEFTARROW}
-STR_ARROW_RIGHT_SMALL :{BLACK}{SMALLRIGHTARROW}
+STR_BLACK_SMALL_ARROW_LEFT :{BLACK}{SMALLLEFTARROW}
+STR_BLACK_SMALL_ARROW_RIGHT :{BLACK}{SMALLRIGHTARROW}
STR_AI_SPEED_VERY_SLOW :Zelo počasi
STR_AI_SPEED_SLOW :Počasi
STR_AI_SPEED_MEDIUM :Srednje
@@ -2962,7 +2960,7 @@ STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Pogled n
STR_BUILD_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP :{BLACK}Seznam cestnih vozil - klikni na vozilo za informacije
STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_TOOLTIP :{BLACK}Zgradi izbrano cestno vozilo
STR_ARTICULATED_RV_CAPACITY :{BLACK}Zmogljivost: {LTBLUE}
-STR_BARE_CARGO :{CARGO}
+STR_JUST_CARGO :{CARGO}
STR_DEPOT_VEHICLE_TOOLTIP :{BLACK}{ENGINE}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CHAIN :{BLACK}{NUM} vozil{P o i a ""}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CARGO :{}{CARGO} ({SHORTCARGO})
diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt
index 598acc842..1106b636d 100644
--- a/src/lang/spanish.txt
+++ b/src/lang/spanish.txt
@@ -155,8 +155,8 @@ STR_ABBREV_PLASTIC :{TINYFONT}PL
STR_ABBREV_FIZZY_DRINKS :{TINYFONT}FZ
STR_ABBREV_NONE :{TINYFONT}NO
STR_ABBREV_ALL :{TINYFONT}TODOS
-STR_DATE_SHORT_WHITE :{WHITE}{DATE_SHORT}
-STR_DATE_LONG_WHITE :{WHITE}{DATE_LONG}
+STR_WHITE_DATE_SHORT :{WHITE}{DATE_SHORT}
+STR_WHITE_DATE_LONG :{WHITE}{DATE_LONG}
STR_SMALLMAP_CAPTION :{WHITE}Mapa - {STRING}
STR_GAME_OPTIONS_CAPTION :{WHITE}Opciones del juego
STR_ERROR_MESSAGE_CAPTION :{YELLOW}Mensaje
@@ -329,7 +329,6 @@ STR_SORT_BY_PRODUCTION :Producción
STR_SORT_BY_TYPE :Tipo
STR_SORT_BY_TRANSPORTED :Transportado
STR_SORT_BY_NAME :{BLACK}Nombre
-STR_SORT_BY_DROPDOWN_NAME :Nombre
STR_SORT_BY_DATE :{BLACK}Fecha
STR_SORT_BY_NUMBER :Número
STR_SORT_BY_PROFIT_LAST_YEAR :Beneficio año pasado
@@ -413,8 +412,8 @@ STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS :{BLACK}Construi
STR_TOOLBAR_TOOLTIP_PLANT_TREES_PLACE_SIGNS :{BLACK}Plantar árboles, señales, etc.
STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION :{BLACK}Consultar bloque de terreno
STR_TOOLBAR_TOOLTIP_OPTIONS :{BLACK}Opciones
-STR_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
-STR_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
+STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
+STR_BLACK_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
STR_ERROR_CAN_T_CHANGE_SERVICING :{WHITE}No se puede cambiar el intervalo de mantenimiento
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Cerrar ventana
STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Título de la ventana - arrastrelo para moverla
@@ -584,12 +583,12 @@ STR_HIGHSCORE_NAME :{BIGFONT}{PRESI
STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA})
STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} logra el estado '{STRING}'!
STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} de {COMPANY} logra el estado '{STRING}'!
-STR_BLUE_NUMBER :{BLUE}{COMMA}
+STR_BLUE_COMMA :{BLUE}{COMMA}
STR_SCENEDIT_TOOLBAR_OPENTTD :{YELLOW}OpenTTD
STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR :{YELLOW}Editor de escenarios
STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION :{WHITE}Generación de terrenos
-STR_ARROW_UP :{BLACK}{UPARROW}
-STR_ARROW_DOWN :{BLACK}{DOWNARROW}
+STR_BLACK_ARROW_UP :{BLACK}{UPARROW}
+STR_BLACK_ARROW_DOWN :{BLACK}{DOWNARROW}
STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA :{BLACK}Aumentar el tamaño del bloque de terreno a bajar/subir
STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA :{BLACK}Reducir tamaño del bloque de terreno a bajar/subir
STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND :{BLACK}Generar terreno al azar
@@ -673,7 +672,7 @@ STR_FULL :Completo
STR_STATUSBAR_COMPANY_NAME :{SILVER}- - {COMPANY} - -
STR_BLACK_STRING :{BLACK}{STRING}
-STR_CHECKMARK :{CHECKMARK}
+STR_JUST_CHECKMARK :{CHECKMARK}
############ range for menu starts
STR_SETTINGS_MENU_GAME_OPTIONS :Opciones de juego
STR_SETTINGS_MENU_DIFFICULTY_SETTINGS :Configuración de dificultad
@@ -778,8 +777,8 @@ STR_STATUSBAR_SAVING_GAME :{RED}* * GUAR
STR_SAVE_STILL_IN_PROGRESS :{WHITE}El grabado está en progreso,{}por favor espere hasta que termine!
STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE :{BLACK}Elegir el programa musical de estilo 'Ezy Street'
-STR_6 :{BLACK}6
-STR_7 :{BLACK}7
+STR_BLACK_6 :{BLACK}6
+STR_BLACK_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :Inglés
@@ -887,7 +886,7 @@ STR_CRATES :cajones
STR_RES_OTHER :Otras
STR_NOTHING :
-STR_SMALL_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
+STR_TINY_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
STR_CANT_SHARE_ORDER_LIST :{WHITE}No se puede compartir la lista de órdenes...
STR_CANT_COPY_ORDER_LIST :{WHITE}No se puede copiar la lista de órdenes...
@@ -1160,8 +1159,7 @@ STR_CONFIG_SETTING_MAP_Y :{LTBLUE}Tamaño
############ generic strings for settings
STR_CONFIG_SETTING_DISABLED :desactivado
-STR_CONFIG_SETTING_INT32 :{NUM}
-STR_CONFIG_SETTING_CURRENCY :{CURRENCY}
+STR_JUST_CURRENCY :{CURRENCY}
STR_CONFIG_SETTING_QUERY_CAPT :{WHITE}Cambiar valor de la opción
STR_TEMPERATE_LANDSCAPE :Paisaje templado
@@ -2127,8 +2125,8 @@ STR_NUM_LOW :Baja
STR_NUM_NORMAL :Normal
STR_NUM_HIGH :Alta
STR_NUM_CUSTOM :Personalizado
-STR_ARROW_LEFT_SMALL :{BLACK}{SMALLLEFTARROW}
-STR_ARROW_RIGHT_SMALL :{BLACK}{SMALLRIGHTARROW}
+STR_BLACK_SMALL_ARROW_LEFT :{BLACK}{SMALLLEFTARROW}
+STR_BLACK_SMALL_ARROW_RIGHT :{BLACK}{SMALLRIGHTARROW}
STR_AI_SPEED_VERY_SLOW :Muy lenta
STR_AI_SPEED_SLOW :Lenta
STR_AI_SPEED_MEDIUM :Media
@@ -2809,7 +2807,7 @@ STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT :{WHITE}...debe
STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT :{WHITE}No se puede encontrar ruta al depósito
STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP :{BLACK}Forzar vehículo a girar
STR_ARTICULATED_RV_CAPACITY :{BLACK}Capacidad: {LTBLUE}
-STR_BARE_CARGO :{CARGO}
+STR_JUST_CARGO :{CARGO}
STR_DEPOT_VEHICLE_TOOLTIP :{BLACK}{ENGINE}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CHAIN :{BLACK}{NUM} vehículo {P "" s}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CARGO :{}{CARGO} ({SHORTCARGO})
diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt
index 8cd697ccd..8c0755766 100644
--- a/src/lang/swedish.txt
+++ b/src/lang/swedish.txt
@@ -154,8 +154,8 @@ STR_ABBREV_PLASTIC :{TINYFONT}PL
STR_ABBREV_FIZZY_DRINKS :{TINYFONT}LÄ
STR_ABBREV_NONE :{TINYFONT}NEJ
STR_ABBREV_ALL :{TINYFONT}ALLA
-STR_DATE_SHORT_WHITE :{WHITE}{DATE_SHORT}
-STR_DATE_LONG_WHITE :{WHITE}{DATE_LONG}
+STR_WHITE_DATE_SHORT :{WHITE}{DATE_SHORT}
+STR_WHITE_DATE_LONG :{WHITE}{DATE_LONG}
STR_SMALLMAP_CAPTION :{WHITE}Karta - {STRING}
STR_GAME_OPTIONS_CAPTION :{WHITE}Spelinställningar
STR_ERROR_MESSAGE_CAPTION :{YELLOW}Meddelande
@@ -328,7 +328,6 @@ STR_SORT_BY_PRODUCTION :Produktion
STR_SORT_BY_TYPE :Typ
STR_SORT_BY_TRANSPORTED :Transporterat
STR_SORT_BY_NAME :{BLACK}Namn
-STR_SORT_BY_DROPDOWN_NAME :Namn
STR_SORT_BY_DATE :{BLACK}Datum
STR_SORT_BY_NUMBER :Nummer
STR_SORT_BY_PROFIT_LAST_YEAR :Vinst förra året
@@ -412,8 +411,8 @@ STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS :{BLACK}Bygg fly
STR_TOOLBAR_TOOLTIP_PLANT_TREES_PLACE_SIGNS :{BLACK}Plantera träd, placera skyltar etc.
STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION :{BLACK}Markinformation
STR_TOOLBAR_TOOLTIP_OPTIONS :{BLACK}Inställningar
-STR_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
-STR_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
+STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
+STR_BLACK_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
STR_ERROR_CAN_T_CHANGE_SERVICING :{WHITE}Kan inte ändra service-intervall...
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Stäng fönster
STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Fönstertitel - dra för att flytta fönstret
@@ -583,12 +582,12 @@ STR_HIGHSCORE_NAME :{BIGFONT}{PRESI
STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA})
STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} uppnår '{STRING}' status!
STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} från {COMPANY} uppnår '{STRING}' status!
-STR_BLUE_NUMBER :{BLUE}{COMMA}
+STR_BLUE_COMMA :{BLUE}{COMMA}
STR_SCENEDIT_TOOLBAR_OPENTTD :{YELLOW}OpenTTD
STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR :{YELLOW}Scenario-editor
STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION :{WHITE}Skapa mark
-STR_ARROW_UP :{BLACK}{UPARROW}
-STR_ARROW_DOWN :{BLACK}{DOWNARROW}
+STR_BLACK_ARROW_UP :{BLACK}{UPARROW}
+STR_BLACK_ARROW_DOWN :{BLACK}{DOWNARROW}
STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA :{BLACK}Öka storlek av yta att höja/sänka
STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA :{BLACK}Minska storlek av yta att höja/sänka
STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND :{BLACK}Generera slumpmässig mark
@@ -672,7 +671,7 @@ STR_FULL :Full
STR_STATUSBAR_COMPANY_NAME :{SILVER}- - {COMPANY} - -
STR_BLACK_STRING :{BLACK}{STRING}
-STR_CHECKMARK :{CHECKMARK}
+STR_JUST_CHECKMARK :{CHECKMARK}
############ range for menu starts
STR_SETTINGS_MENU_GAME_OPTIONS :Spelinställningar
STR_SETTINGS_MENU_DIFFICULTY_SETTINGS :Svårighetsgrad
@@ -777,8 +776,8 @@ STR_STATUSBAR_SAVING_GAME :{RED}* * SPAR
STR_SAVE_STILL_IN_PROGRESS :{WHITE}Sparar fortfarande,{}vänta tills det är slutfört!
STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE :{BLACK}Välj 'Ezy Street style music'-program
-STR_6 :{BLACK}6
-STR_7 :{BLACK}7
+STR_BLACK_6 :{BLACK}6
+STR_BLACK_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :Engelska
@@ -886,7 +885,7 @@ STR_CRATES :lådor
STR_RES_OTHER :annan
STR_NOTHING :
-STR_SMALL_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
+STR_TINY_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
STR_CANT_SHARE_ORDER_LIST :{WHITE}Kan inte dela orderlistan...
STR_CANT_COPY_ORDER_LIST :{WHITE}Kan inte kopiera orderlistan...
@@ -1159,8 +1158,7 @@ STR_CONFIG_SETTING_MAP_Y :{LTBLUE}Y-storl
############ generic strings for settings
STR_CONFIG_SETTING_DISABLED :Avaktiverat
-STR_CONFIG_SETTING_INT32 :{NUM}
-STR_CONFIG_SETTING_CURRENCY :{CURRENCY}
+STR_JUST_CURRENCY :{CURRENCY}
STR_CONFIG_SETTING_QUERY_CAPT :{WHITE}Ändra inställningsvärde
STR_TEMPERATE_LANDSCAPE :Tempererat landskap
@@ -2124,8 +2122,8 @@ STR_NUM_LOW :Låg
STR_NUM_NORMAL :Normal
STR_NUM_HIGH :Hög
STR_NUM_CUSTOM :Egna
-STR_ARROW_LEFT_SMALL :{BLACK}{SMALLLEFTARROW}
-STR_ARROW_RIGHT_SMALL :{BLACK}{SMALLRIGHTARROW}
+STR_BLACK_SMALL_ARROW_LEFT :{BLACK}{SMALLLEFTARROW}
+STR_BLACK_SMALL_ARROW_RIGHT :{BLACK}{SMALLRIGHTARROW}
STR_AI_SPEED_VERY_SLOW :Väldigt långsam
STR_AI_SPEED_SLOW :Långsam
STR_AI_SPEED_MEDIUM :Mellan
@@ -2806,7 +2804,7 @@ STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT :{WHITE}...måst
STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT :{WHITE}Kan inte hitta till lokal depå
STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP :{BLACK}Tvinga fordonet att vända om
STR_ARTICULATED_RV_CAPACITY :{BLACK}Kapacitet: {LTBLUE}
-STR_BARE_CARGO :{CARGO}
+STR_JUST_CARGO :{CARGO}
STR_DEPOT_VEHICLE_TOOLTIP :{BLACK}{ENGINE}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CHAIN :{BLACK}{NUM} fordon{P "" s}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CARGO :{}{CARGO} ({SHORTCARGO})
diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt
index ba9849ac2..a6e39d10a 100644
--- a/src/lang/traditional_chinese.txt
+++ b/src/lang/traditional_chinese.txt
@@ -154,8 +154,8 @@ STR_ABBREV_PLASTIC :{TINYFONT}塑
STR_ABBREV_FIZZY_DRINKS :{TINYFONT}汽
STR_ABBREV_NONE :{TINYFONT}無
STR_ABBREV_ALL :{TINYFONT}全
-STR_DATE_SHORT_WHITE :{WHITE}{DATE_SHORT}
-STR_DATE_LONG_WHITE :{WHITE}{DATE_LONG}
+STR_WHITE_DATE_SHORT :{WHITE}{DATE_SHORT}
+STR_WHITE_DATE_LONG :{WHITE}{DATE_LONG}
STR_SMALLMAP_CAPTION :{WHITE}地圖 - {STRING}
STR_GAME_OPTIONS_CAPTION :{WHITE}遊戲選項
STR_ERROR_MESSAGE_CAPTION :{YELLOW}訊息
@@ -328,7 +328,6 @@ STR_SORT_BY_PRODUCTION :產量
STR_SORT_BY_TYPE :種類
STR_SORT_BY_TRANSPORTED :已運送
STR_SORT_BY_NAME :{BLACK}名稱
-STR_SORT_BY_DROPDOWN_NAME :名稱
STR_SORT_BY_DATE :{BLACK}日期
STR_SORT_BY_NUMBER :編號
STR_SORT_BY_PROFIT_LAST_YEAR :去年盈利
@@ -410,8 +409,8 @@ STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS :{BLACK}興建
STR_TOOLBAR_TOOLTIP_PLANT_TREES_PLACE_SIGNS :{BLACK}植樹、設置標誌等
STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION :{BLACK}土地資訊
STR_TOOLBAR_TOOLTIP_OPTIONS :{BLACK}選項
-STR_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
-STR_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
+STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
+STR_BLACK_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
STR_ERROR_CAN_T_CHANGE_SERVICING :{WHITE}不能更改檢修週期...
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}關閉視窗
STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}視窗標題 - 點此拖曳可移動視窗
@@ -581,12 +580,12 @@ STR_HIGHSCORE_NAME :{BIGFONT}{PRESI
STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA})
STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} 達成「{STRING}」的地位!
STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} 的 {COMPANY} 達成「{STRING}」 的地位!
-STR_BLUE_NUMBER :{BLUE}{COMMA}
+STR_BLUE_COMMA :{BLUE}{COMMA}
STR_SCENEDIT_TOOLBAR_OPENTTD :{YELLOW}OpenTTD
STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR :{YELLOW}場景編輯器
STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION :{WHITE}產生地形
-STR_ARROW_UP :{BLACK}{UPARROW}
-STR_ARROW_DOWN :{BLACK}{DOWNARROW}
+STR_BLACK_ARROW_UP :{BLACK}{UPARROW}
+STR_BLACK_ARROW_DOWN :{BLACK}{DOWNARROW}
STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA :{BLACK}增加地形升降的範圍
STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA :{BLACK}減少地形升降的範圍
STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND :{BLACK}產生隨機地形
@@ -670,7 +669,7 @@ STR_FULL :詳細
STR_STATUSBAR_COMPANY_NAME :{SILVER}- - {COMPANY} - -
STR_BLACK_STRING :{BLACK}{STRING}
-STR_CHECKMARK :{CHECKMARK}
+STR_JUST_CHECKMARK :{CHECKMARK}
############ range for menu starts
STR_SETTINGS_MENU_GAME_OPTIONS :遊戲選項
STR_SETTINGS_MENU_DIFFICULTY_SETTINGS :難易設定
@@ -778,8 +777,8 @@ STR_STATUSBAR_SAVING_GAME :{RED}* * 遊
STR_SAVE_STILL_IN_PROGRESS :{WHITE}遊戲還在儲存中,{}請稍候!
STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE :{BLACK}選擇「街頭音樂」播放清單
-STR_6 :{BLACK}6
-STR_7 :{BLACK}7
+STR_BLACK_6 :{BLACK}6
+STR_BLACK_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :英國 (原版)
@@ -887,7 +886,7 @@ STR_CRATES :箱
STR_RES_OTHER :其它
STR_NOTHING :
-STR_SMALL_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
+STR_TINY_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
STR_CANT_SHARE_ORDER_LIST :{WHITE}無法共享指令清單...
STR_CANT_COPY_ORDER_LIST :{WHITE}無法複製指令清單...
@@ -1160,8 +1159,7 @@ STR_CONFIG_SETTING_MAP_Y :{LTBLUE}地圖
############ generic strings for settings
STR_CONFIG_SETTING_DISABLED :關閉
-STR_CONFIG_SETTING_INT32 :{NUM}
-STR_CONFIG_SETTING_CURRENCY :{CURRENCY}
+STR_JUST_CURRENCY :{CURRENCY}
STR_CONFIG_SETTING_QUERY_CAPT :{WHITE}修改設定值
STR_TEMPERATE_LANDSCAPE :溫帶
@@ -2127,8 +2125,8 @@ STR_NUM_LOW :低
STR_NUM_NORMAL :普通
STR_NUM_HIGH :高
STR_NUM_CUSTOM :自訂
-STR_ARROW_LEFT_SMALL :{BLACK}{SMALLLEFTARROW}
-STR_ARROW_RIGHT_SMALL :{BLACK}{SMALLRIGHTARROW}
+STR_BLACK_SMALL_ARROW_LEFT :{BLACK}{SMALLLEFTARROW}
+STR_BLACK_SMALL_ARROW_RIGHT :{BLACK}{SMALLRIGHTARROW}
STR_AI_SPEED_VERY_SLOW :非常慢
STR_AI_SPEED_SLOW :慢
STR_AI_SPEED_MEDIUM :普通
@@ -2884,7 +2882,7 @@ STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}將車
STR_BUILD_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP :{BLACK}車輛清單 - 點選車輛可看到詳細資料
STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_TOOLTIP :{BLACK}購置選定的車輛
STR_ARTICULATED_RV_CAPACITY :{BLACK}容量:{LTBLUE}
-STR_BARE_CARGO :{CARGO}
+STR_JUST_CARGO :{CARGO}
STR_DEPOT_VEHICLE_TOOLTIP :{BLACK}{ENGINE}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CHAIN :{BLACK}車輛 {NUM} 部 {STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CARGO :{}{CARGO} ({SHORTCARGO})
diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt
index f4920006f..69897a243 100644
--- a/src/lang/turkish.txt
+++ b/src/lang/turkish.txt
@@ -154,8 +154,8 @@ STR_ABBREV_PLASTIC :{TINYFONT}PL
STR_ABBREV_FIZZY_DRINKS :{TINYFONT}İÇ
STR_ABBREV_NONE :{TINYFONT}YOK
STR_ABBREV_ALL :{TINYFONT}HEPSI
-STR_DATE_SHORT_WHITE :{WHITE}{DATE_SHORT}
-STR_DATE_LONG_WHITE :{WHITE}{DATE_LONG}
+STR_WHITE_DATE_SHORT :{WHITE}{DATE_SHORT}
+STR_WHITE_DATE_LONG :{WHITE}{DATE_LONG}
STR_SMALLMAP_CAPTION :{WHITE}Harita - {STRING}
STR_GAME_OPTIONS_CAPTION :{WHITE}Seçenekler
STR_ERROR_MESSAGE_CAPTION :{YELLOW}Mesaj
@@ -328,7 +328,6 @@ STR_SORT_BY_PRODUCTION :Üretim
STR_SORT_BY_TYPE :Tür
STR_SORT_BY_TRANSPORTED :Taşınan
STR_SORT_BY_NAME :{BLACK}İsim
-STR_SORT_BY_DROPDOWN_NAME :İsim
STR_SORT_BY_DATE :{BLACK}Tarih
STR_SORT_BY_NUMBER :Numara
STR_SORT_BY_PROFIT_LAST_YEAR :Geçen seneki kâr
@@ -412,8 +411,8 @@ STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS :{BLACK}Havalima
STR_TOOLBAR_TOOLTIP_PLANT_TREES_PLACE_SIGNS :{BLACK}Ağaç dik, tabela koy vs.
STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION :{BLACK}Arazi bilgisi
STR_TOOLBAR_TOOLTIP_OPTIONS :{BLACK}Seçenekler
-STR_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
-STR_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
+STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
+STR_BLACK_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
STR_ERROR_CAN_T_CHANGE_SERVICING :{WHITE}Servis aralığı değiştirilemiyor...
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Pencereyi kapat
STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Pencere başlığı - pencereyi hareket ettirmek için sürükle
@@ -583,12 +582,12 @@ STR_HIGHSCORE_NAME :{BIGFONT}{PRESI
STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA})
STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} '{STRING}' ünvanını kazandı!
STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} - {COMPANY} '{STRING}' ünvanını kazandı!
-STR_BLUE_NUMBER :{BLUE}{COMMA}
+STR_BLUE_COMMA :{BLUE}{COMMA}
STR_SCENEDIT_TOOLBAR_OPENTTD :{YELLOW}OpenTTD
STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR :{YELLOW}Senaryo Düzenleyicisi
STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION :{WHITE}Arazi Yapımı
-STR_ARROW_UP :{BLACK}{UPARROW}
-STR_ARROW_DOWN :{BLACK}{DOWNARROW}
+STR_BLACK_ARROW_UP :{BLACK}{UPARROW}
+STR_BLACK_ARROW_DOWN :{BLACK}{DOWNARROW}
STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA :{BLACK}yükseltme/alçaltma alanını arttır
STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA :{BLACK}Yükseltme/alçaltma alanını arttır
STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND :{BLACK}Rastgele harita yarat
@@ -672,7 +671,7 @@ STR_FULL :Tam
STR_STATUSBAR_COMPANY_NAME :{SILVER}- - {COMPANY} - -
STR_BLACK_STRING :{BLACK}{STRING}
-STR_CHECKMARK :{CHECKMARK}
+STR_JUST_CHECKMARK :{CHECKMARK}
############ range for menu starts
STR_SETTINGS_MENU_GAME_OPTIONS :Seçenekler
STR_SETTINGS_MENU_DIFFICULTY_SETTINGS :Zorluk Ayarları
@@ -777,8 +776,8 @@ STR_STATUSBAR_SAVING_GAME :{RED}* * KAYD
STR_SAVE_STILL_IN_PROGRESS :{WHITE}Kayıt işlemi sürüyor,{}lütfen bitene kadar bekleyin!
STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE :{BLACK}'Ezy Sokagi stili müzik' programını seç
-STR_6 :{BLACK}6
-STR_7 :{BLACK}7
+STR_BLACK_6 :{BLACK}6
+STR_BLACK_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :İngilizce (Orjinal)
@@ -886,7 +885,7 @@ STR_CRATES :kasa
STR_RES_OTHER :diğer
STR_NOTHING :
-STR_SMALL_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
+STR_TINY_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
STR_CANT_SHARE_ORDER_LIST :{WHITE}Talimat listesi paylasilamiyor...
STR_CANT_COPY_ORDER_LIST :{WHITE}Talimat listesi kopyalanamiyor...
@@ -1159,8 +1158,7 @@ STR_CONFIG_SETTING_MAP_Y :{LTBLUE}Haritan
############ generic strings for settings
STR_CONFIG_SETTING_DISABLED :kapalı
-STR_CONFIG_SETTING_INT32 :{NUM}
-STR_CONFIG_SETTING_CURRENCY :{CURRENCY}
+STR_JUST_CURRENCY :{CURRENCY}
STR_CONFIG_SETTING_QUERY_CAPT :{WHITE}Ayar değerini değiştir
STR_TEMPERATE_LANDSCAPE :Ilıman iklim
@@ -2126,8 +2124,8 @@ STR_NUM_LOW :Düşük
STR_NUM_NORMAL :Normal
STR_NUM_HIGH :Yüksek
STR_NUM_CUSTOM :Özel
-STR_ARROW_LEFT_SMALL :{BLACK}{SMALLLEFTARROW}
-STR_ARROW_RIGHT_SMALL :{BLACK}{SMALLRIGHTARROW}
+STR_BLACK_SMALL_ARROW_LEFT :{BLACK}{SMALLLEFTARROW}
+STR_BLACK_SMALL_ARROW_RIGHT :{BLACK}{SMALLRIGHTARROW}
STR_AI_SPEED_VERY_SLOW :Çok Yavas
STR_AI_SPEED_SLOW :Yavas
STR_AI_SPEED_MEDIUM :Orta
@@ -2808,7 +2806,7 @@ STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT :{WHITE}...bir a
STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT :{WHITE}Yerel garaj bulunamadı
STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP :{BLACK}Aracı etrafta dolaşmaya zorla
STR_ARTICULATED_RV_CAPACITY :{BLACK}Kapasite: {LTBLUE}
-STR_BARE_CARGO :{CARGO}
+STR_JUST_CARGO :{CARGO}
STR_DEPOT_VEHICLE_TOOLTIP :{BLACK}{ENGINE}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CHAIN :{BLACK}{NUM} araç{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CARGO :{}{CARGO} ({SHORTCARGO})
diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt
index 047e422b8..fd27ca537 100644
--- a/src/lang/ukrainian.txt
+++ b/src/lang/ukrainian.txt
@@ -279,8 +279,8 @@ STR_ABBREV_PLASTIC :{TINYFONT}ПЛ
STR_ABBREV_FIZZY_DRINKS :{TINYFONT}ГЗ
STR_ABBREV_NONE :{TINYFONT}Ні
STR_ABBREV_ALL :{TINYFONT}Все
-STR_DATE_SHORT_WHITE :{WHITE}{DATE_SHORT}
-STR_DATE_LONG_WHITE :{WHITE}{DATE_LONG}
+STR_WHITE_DATE_SHORT :{WHITE}{DATE_SHORT}
+STR_WHITE_DATE_LONG :{WHITE}{DATE_LONG}
STR_SMALLMAP_CAPTION :{WHITE}Карта - {STRING}
STR_GAME_OPTIONS_CAPTION :{WHITE}Опції гри
STR_ERROR_MESSAGE_CAPTION :{YELLOW}Повідомлення
@@ -453,7 +453,6 @@ STR_SORT_BY_PRODUCTION :за проду
STR_SORT_BY_TYPE :за типом
STR_SORT_BY_TRANSPORTED :за перевезенням
STR_SORT_BY_NAME :{BLACK}за назвою
-STR_SORT_BY_DROPDOWN_NAME :за назвою
STR_SORT_BY_DATE :{BLACK}за датою
STR_SORT_BY_NUMBER :за номером
STR_SORT_BY_PROFIT_LAST_YEAR :за прибутком минулого року
@@ -535,8 +534,8 @@ STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS :{BLACK}Буду
STR_TOOLBAR_TOOLTIP_PLANT_TREES_PLACE_SIGNS :{BLACK}Посадити дерева, позначити місце, тощо
STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION :{BLACK}Інформація про земельну ділянку
STR_TOOLBAR_TOOLTIP_OPTIONS :{BLACK}Опції
-STR_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
-STR_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
+STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
+STR_BLACK_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
STR_ERROR_CAN_T_CHANGE_SERVICING :{WHITE}Не можна змінити інтервал обслуговування...
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Закрити вікно
STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Заголовок вікна - потягніть для переміщення вікна
@@ -706,12 +705,12 @@ STR_HIGHSCORE_NAME :{BIGFONT}{PRESI
STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA})
STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} досягла статусу '{STRING}'!
STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{WHITE}{BIGFONT}Гравець {PRESIDENTNAME} з {COMPANY} досяг статусу '{STRING}'
-STR_BLUE_NUMBER :{BLUE}{COMMA}
+STR_BLUE_COMMA :{BLUE}{COMMA}
STR_SCENEDIT_TOOLBAR_OPENTTD :{YELLOW}OpenTTD
STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR :{YELLOW}Редактор сценарію
STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION :{WHITE}Створити ландшафт
-STR_ARROW_UP :{BLACK}{UPARROW}
-STR_ARROW_DOWN :{BLACK}{DOWNARROW}
+STR_BLACK_ARROW_UP :{BLACK}{UPARROW}
+STR_BLACK_ARROW_DOWN :{BLACK}{DOWNARROW}
STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA :{BLACK}Збільшити область ділянки для підняття/опускання
STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA :{BLACK}Зменшити область ділянки для підняття/опускання
STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND :{BLACK}Створити випадкову ділянку
@@ -795,7 +794,7 @@ STR_FULL :Повніст
STR_STATUSBAR_COMPANY_NAME :{SILVER}- - {COMPANY} - -
STR_BLACK_STRING :{BLACK}{STRING}
-STR_CHECKMARK :{CHECKMARK}
+STR_JUST_CHECKMARK :{CHECKMARK}
############ range for menu starts
STR_SETTINGS_MENU_GAME_OPTIONS :Налаштування гри
STR_SETTINGS_MENU_DIFFICULTY_SETTINGS :Налаштування складності
@@ -900,8 +899,8 @@ STR_STATUSBAR_SAVING_GAME :{RED}* * ЗБ
STR_SAVE_STILL_IN_PROGRESS :{WHITE}Збереження...{}зачекайте, доки завершиться!
STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE :{BLACK}Вибрати програму 'Дорожні теми'
-STR_6 :{BLACK}6
-STR_7 :{BLACK}7
+STR_BLACK_6 :{BLACK}6
+STR_BLACK_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :Англійські (оригінальні)
@@ -1009,7 +1008,7 @@ STR_CRATES :ЯщикИ
STR_RES_OTHER :інша
STR_NOTHING :
-STR_SMALL_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
+STR_TINY_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
STR_CANT_SHARE_ORDER_LIST :{WHITE}Неможливо розділити список завдань...
STR_CANT_COPY_ORDER_LIST :{WHITE}Неможливо скопіювати список завдань...
@@ -1282,8 +1281,7 @@ STR_CONFIG_SETTING_MAP_Y :{LTBLUE}Y-ро
############ generic strings for settings
STR_CONFIG_SETTING_DISABLED :вимкнено
-STR_CONFIG_SETTING_INT32 :{NUM}
-STR_CONFIG_SETTING_CURRENCY :{CURRENCY}
+STR_JUST_CURRENCY :{CURRENCY}
STR_CONFIG_SETTING_QUERY_CAPT :{WHITE}Змініть значення
STR_TEMPERATE_LANDSCAPE :Помірний ландшафт
@@ -2287,8 +2285,8 @@ STR_NUM_LOW :мало
STR_NUM_NORMAL :нормально
STR_NUM_HIGH :багато
STR_NUM_CUSTOM :Власні
-STR_ARROW_LEFT_SMALL :{BLACK}{SMALLLEFTARROW}
-STR_ARROW_RIGHT_SMALL :{BLACK}{SMALLRIGHTARROW}
+STR_BLACK_SMALL_ARROW_LEFT :{BLACK}{SMALLLEFTARROW}
+STR_BLACK_SMALL_ARROW_RIGHT :{BLACK}{SMALLRIGHTARROW}
STR_AI_SPEED_VERY_SLOW :Дуже повільно
STR_AI_SPEED_SLOW :Повільно
STR_AI_SPEED_MEDIUM :середньо
@@ -3038,7 +3036,7 @@ STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Пока
STR_BUILD_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP :{BLACK}Список авто - натисніть на авто для інформації
STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_TOOLTIP :{BLACK}Будувати вибране авто
STR_ARTICULATED_RV_CAPACITY :{BLACK}Місткість: {LTBLUE}
-STR_BARE_CARGO :{CARGO}
+STR_JUST_CARGO :{CARGO}
STR_DEPOT_VEHICLE_TOOLTIP :{BLACK}{ENGINE}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CHAIN :{BLACK}{NUM} транспорт{P "" и ів}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CARGO :{}{CARGO} ({SHORTCARGO})
diff --git a/src/lang/unfinished/frisian.txt b/src/lang/unfinished/frisian.txt
index 8b7ef3916..c33ab5080 100644
--- a/src/lang/unfinished/frisian.txt
+++ b/src/lang/unfinished/frisian.txt
@@ -101,8 +101,8 @@ STR_QUANTITY_FOOD :{WEIGHT} ton it
STR_QUANTITY_PAPER :{WEIGHT} ton papier
STR_QUANTITY_GOLD :{COMMA} sekken goud
STR_QUANTITY_WATER :{VOLUME} wetter
-STR_DATE_SHORT_WHITE :{WHITE}{DATE_SHORT}
-STR_DATE_LONG_WHITE :{WHITE}{DATE_LONG}
+STR_WHITE_DATE_SHORT :{WHITE}{DATE_SHORT}
+STR_WHITE_DATE_LONG :{WHITE}{DATE_LONG}
STR_SMALLMAP_CAPTION :{WHITE}Kaart - {STRING}
STR_GAME_OPTIONS_CAPTION :{WHITE}Spul Opsjes
STR_ERROR_MESSAGE_CAPTION :{YELLOW}Berjocht
@@ -280,8 +280,8 @@ STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS :{BLACK}Bou flea
STR_TOOLBAR_TOOLTIP_PLANT_TREES_PLACE_SIGNS :{BLACK}Plantsje beamen, set buordsjes del, ensfh.
STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION :{BLACK}Lân ynformaasje
STR_TOOLBAR_TOOLTIP_OPTIONS :{BLACK}Opsjes
-STR_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
-STR_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
+STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
+STR_BLACK_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
STR_ERROR_CAN_T_CHANGE_SERVICING :{WHITE}Kin tiid tusken ûnderhâldsbeurten net feroarje...
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Slút finster
STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Finstertitel - hjirmei kinst it finster ferslepe
@@ -451,12 +451,12 @@ STR_HIGHSCORE_NAME :{BIGFONT}{PRESI
STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA})
STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} behellet '{STRING}' status!
STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} fan {COMPANY} behellet '{STRING}' status!
-STR_BLUE_NUMBER :{BLUE}{COMMA}
+STR_BLUE_COMMA :{BLUE}{COMMA}
STR_SCENEDIT_TOOLBAR_OPENTTD :{YELLOW}OpenTTD
STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR :{YELLOW}Lânskip Ferbouer
STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION :{WHITE}Lân Generaasje
-STR_ARROW_UP :{BLACK}{UPARROW}
-STR_ARROW_DOWN :{BLACK}{DOWNARROW}
+STR_BLACK_ARROW_UP :{BLACK}{UPARROW}
+STR_BLACK_ARROW_DOWN :{BLACK}{DOWNARROW}
STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA :{BLACK}Fergrutsje gebiet om te ferheegjen/ferleegjen
STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA :{BLACK}Ferlyts gebiet om te ferheegjen/ferleegjen
STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND :{BLACK}Meitsje samar wat lân
@@ -618,8 +618,8 @@ STR_TERRAFORM_TOOLTIP_PURCHASE_LAND :{BLACK}Keapje l
STR_STATUSBAR_AUTOSAVE :{RED}AUTOSAVE
STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE :{BLACK}Selektear 'Ezy Street' musyk programma
-STR_6 :{BLACK}6
-STR_7 :{BLACK}7
+STR_BLACK_6 :{BLACK}6
+STR_BLACK_7 :{BLACK}7
############ start of townname region
############ end of townname region
@@ -1142,8 +1142,8 @@ STR_NUM_LOW :Leech
STR_NUM_NORMAL :Gewoan
STR_NUM_HIGH :Heech
STR_NUM_CUSTOM :Oars
-STR_ARROW_LEFT_SMALL :{BLACK}{SMALLLEFTARROW}
-STR_ARROW_RIGHT_SMALL :{BLACK}{SMALLRIGHTARROW}
+STR_BLACK_SMALL_ARROW_LEFT :{BLACK}{SMALLLEFTARROW}
+STR_BLACK_SMALL_ARROW_RIGHT :{BLACK}{SMALLRIGHTARROW}
STR_AI_SPEED_VERY_SLOW :Traach
STR_AI_SPEED_SLOW :Stadich
STR_AI_SPEED_MEDIUM :Gewoan
diff --git a/src/lang/unfinished/greek.txt b/src/lang/unfinished/greek.txt
index 8c4a090f2..0f666e6e0 100644
--- a/src/lang/unfinished/greek.txt
+++ b/src/lang/unfinished/greek.txt
@@ -155,8 +155,8 @@ STR_ABBREV_PLASTIC :{TINYFONT}PL
STR_ABBREV_FIZZY_DRINKS :{TINYFONT}FZ
STR_ABBREV_NONE :{TINYFONT}NO
STR_ABBREV_ALL :{TINYFONT}ALL
-STR_DATE_SHORT_WHITE :{WHITE}{DATE_SHORT}
-STR_DATE_LONG_WHITE :{WHITE}{DATE_LONG}
+STR_WHITE_DATE_SHORT :{WHITE}{DATE_SHORT}
+STR_WHITE_DATE_LONG :{WHITE}{DATE_LONG}
STR_SMALLMAP_CAPTION :{WHITE}Χάρτης - {STRING}
STR_GAME_OPTIONS_CAPTION :{WHITE}Επιλογές Παιχνιδιού
STR_ERROR_MESSAGE_CAPTION :{YELLOW}Μήνυμα
@@ -329,7 +329,6 @@ STR_SORT_BY_PRODUCTION :Παραγωγ
STR_SORT_BY_TYPE :Τύπος
STR_SORT_BY_TRANSPORTED :Μεταφέρθηκαν
STR_SORT_BY_NAME :{BLACK}Όνομα
-STR_SORT_BY_DROPDOWN_NAME :Όνομα
STR_SORT_BY_DATE :{BLACK}Μέρα
STR_SORT_BY_NUMBER :Αριθμός
STR_SORT_BY_PROFIT_LAST_YEAR :Κέρδος προηγούμενου χρόνου
@@ -411,8 +410,8 @@ STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS :{BLACK}Κατα
STR_TOOLBAR_TOOLTIP_PLANT_TREES_PLACE_SIGNS :{BLACK}Τοποθέτηση δεντρων, πινακίδων κλπ.
STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION :{BLACK}Πληροφορίες περιοχής
STR_TOOLBAR_TOOLTIP_OPTIONS :{BLACK}Επιλογές
-STR_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
-STR_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
+STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
+STR_BLACK_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
STR_ERROR_CAN_T_CHANGE_SERVICING :{WHITE}Δεν μπορεί να αλλάξει το διάστημα της συντήρησης...
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Κλείσιμο παραθύρου
STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Τίτλος παραθύρου - σύρετε για να το μετακινήσετε
@@ -582,12 +581,12 @@ STR_HIGHSCORE_NAME :{BIGFONT}{PRESI
STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA})
STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} έφτασε στο επίπεδο '{STRING}'
STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} της εταιρείας {COMPANY} έφτασε στο επίπεδο '{STRING}'!
-STR_BLUE_NUMBER :{BLUE}{COMMA}
+STR_BLUE_COMMA :{BLUE}{COMMA}
STR_SCENEDIT_TOOLBAR_OPENTTD :{YELLOW}OpenTTD
STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR :{YELLOW}Πρόγραμμα Επεξεργασίας Σεναρίου
STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION :{WHITE}Δημιουργία Γης
-STR_ARROW_UP :{BLACK}{UPARROW}
-STR_ARROW_DOWN :{BLACK}{DOWNARROW}
+STR_BLACK_ARROW_UP :{BLACK}{UPARROW}
+STR_BLACK_ARROW_DOWN :{BLACK}{DOWNARROW}
STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA :{BLACK}Αύξηση περιοχής για χαμήλωμα/ανύψωση γης
STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA :{BLACK}Μείωση περιοχής για χαμήλωμα/ανύψωση γης
STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND :{BLACK}Δημιουργία τυχαίου εδάφους
@@ -671,7 +670,7 @@ STR_FULL :Ολόκληρ
STR_STATUSBAR_COMPANY_NAME :{SILVER}- - {COMPANY} - -
STR_BLACK_STRING :{BLACK}{STRING}
-STR_CHECKMARK :{CHECKMARK}
+STR_JUST_CHECKMARK :{CHECKMARK}
############ range for menu starts
STR_SETTINGS_MENU_GAME_OPTIONS :Επιλογές παιχνιδιού
STR_SETTINGS_MENU_DIFFICULTY_SETTINGS :Ρυθμίσεις δυσκολίας
@@ -779,8 +778,8 @@ STR_STATUSBAR_SAVING_GAME :{RED}* * ΑΠ
STR_SAVE_STILL_IN_PROGRESS :{WHITE}Η αποθήκευση είναι σε εξέλιξη,{}παρακαλώ περιμένετε να τελειώσει!
STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE :{BLACK}Επιλογή προγράμματος 'Ezy Street στυλ μουσικής'
-STR_6 :{BLACK}6
-STR_7 :{BLACK}7
+STR_BLACK_6 :{BLACK}6
+STR_BLACK_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :Αγγλικά (Αυθεντικά)
@@ -888,7 +887,7 @@ STR_CRATES :Κουτιά
STR_RES_OTHER :άλλα
STR_NOTHING :
-STR_SMALL_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
+STR_TINY_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
STR_CANT_SHARE_ORDER_LIST :{WHITE}Αδύνατο να μοιραστεί η λίστα εντολών...
STR_CANT_COPY_ORDER_LIST :{WHITE}Αδύνατο να αντιγραφεί η λίστα εντολών...
@@ -1146,8 +1145,7 @@ STR_CONFIG_SETTING_MAP_Y :{LTBLUE}Y-μέ
############ generic strings for settings
STR_CONFIG_SETTING_DISABLED :απενεργοποιημένο
-STR_CONFIG_SETTING_INT32 :{NUM}
-STR_CONFIG_SETTING_CURRENCY :{CURRENCY}
+STR_JUST_CURRENCY :{CURRENCY}
STR_CONFIG_SETTING_QUERY_CAPT :{WHITE}Αλλαγή τιμής ρύθμισης
STR_TEMPERATE_LANDSCAPE :Συγκρατημένο τοπίο
@@ -1899,8 +1897,8 @@ STR_NUM_LOW :Χαμηλό
STR_NUM_NORMAL :Κανονικό
STR_NUM_HIGH :Υψηλό
STR_NUM_CUSTOM :Προσαρμοσμέν{G ος η ο}
-STR_ARROW_LEFT_SMALL :{BLACK}{SMALLLEFTARROW}
-STR_ARROW_RIGHT_SMALL :{BLACK}{SMALLRIGHTARROW}
+STR_BLACK_SMALL_ARROW_LEFT :{BLACK}{SMALLLEFTARROW}
+STR_BLACK_SMALL_ARROW_RIGHT :{BLACK}{SMALLRIGHTARROW}
STR_AI_SPEED_VERY_SLOW :Πολύ αργό
STR_AI_SPEED_SLOW :Αργό
STR_AI_SPEED_MEDIUM :Μέτριο
diff --git a/src/lang/unfinished/ido.txt b/src/lang/unfinished/ido.txt
index 9da2009d1..3a2c09714 100644
--- a/src/lang/unfinished/ido.txt
+++ b/src/lang/unfinished/ido.txt
@@ -81,8 +81,8 @@ STR_CARGO_SINGULAR_TOFFEE :Karamelo
STR_CARGO_SINGULAR_BATTERY :Baterio
STR_CARGO_SINGULAR_PLASTIC :Plastiko
STR_CARGO_SINGULAR_FIZZY_DRINK :Gasoza Drinkajo
-STR_DATE_SHORT_WHITE :{WHITE}{DATE_SHORT}
-STR_DATE_LONG_WHITE :{WHITE}{DATE_LONG}
+STR_WHITE_DATE_SHORT :{WHITE}{DATE_SHORT}
+STR_WHITE_DATE_LONG :{WHITE}{DATE_LONG}
STR_SMALLMAP_CAPTION :{WHITE}Mapo - {STRING}
STR_GAME_OPTIONS_CAPTION :{WHITE}Ludo Selekti
STR_ERROR_MESSAGE_CAPTION :{YELLOW}Sendajo
diff --git a/src/lang/unfinished/macedonian.txt b/src/lang/unfinished/macedonian.txt
index a30b43473..5cf5e6195 100644
--- a/src/lang/unfinished/macedonian.txt
+++ b/src/lang/unfinished/macedonian.txt
@@ -154,8 +154,8 @@ STR_ABBREV_PLASTIC :{TINYFONT}ПЛ
STR_ABBREV_FIZZY_DRINKS :{TINYFONT}ПП
STR_ABBREV_NONE :{TINYFONT}НТ
STR_ABBREV_ALL :{TINYFONT}Се`
-STR_DATE_SHORT_WHITE :{WHITE}{DATE_SHORT}
-STR_DATE_LONG_WHITE :{WHITE}{DATE_LONG}
+STR_WHITE_DATE_SHORT :{WHITE}{DATE_SHORT}
+STR_WHITE_DATE_LONG :{WHITE}{DATE_LONG}
STR_SMALLMAP_CAPTION :{WHITE}Мапа - {STRING}
STR_GAME_OPTIONS_CAPTION :{WHITE}Опции на Играта
STR_ERROR_MESSAGE_CAPTION :{YELLOW}Порака
@@ -325,7 +325,6 @@ STR_SORT_BY_PRODUCTION :Произво
STR_SORT_BY_TYPE :Тип
STR_SORT_BY_TRANSPORTED :Транспортирано
STR_SORT_BY_NAME :{BLACK}Име
-STR_SORT_BY_DROPDOWN_NAME :Име
STR_SORT_BY_DATE :{BLACK}Датум
STR_SORT_BY_NUMBER :Број
STR_SORT_BY_PROFIT_LAST_YEAR :Минатогодишен профит
@@ -403,8 +402,8 @@ STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS :{BLACK}Град
STR_TOOLBAR_TOOLTIP_PLANT_TREES_PLACE_SIGNS :{BLACK}Засадување на дрва, местење знаци итн.
STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION :{BLACK}Информација за земјишна област
STR_TOOLBAR_TOOLTIP_OPTIONS :{BLACK}Опции
-STR_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
-STR_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
+STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
+STR_BLACK_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
STR_ERROR_CAN_T_CHANGE_SERVICING :{WHITE}Не може да се смени интервалот за сервисирање...
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Затвори го прозорецот
STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Наслов на прозорец - влечи тука за да го поместиш прозорецот
@@ -551,12 +550,12 @@ STR_HIGHSCORE_PERFORMANCE_TITLE_MOGUL :Могул
STR_HIGHSCORE_PERFORMANCE_TITLE_TYCOON_OF_THE_CENTURY :Тајкун на векот
STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} постигна статус на '{STRING}'!
STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} од {COMPANY} постигна статус на'{STRING}'!
-STR_BLUE_NUMBER :{BLUE}{COMMA}
+STR_BLUE_COMMA :{BLUE}{COMMA}
STR_SCENEDIT_TOOLBAR_OPENTTD :{YELLOW}OpenTTD
STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR :{YELLOW}Сценарио Едитор
STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION :{WHITE}Генерирање на терен
-STR_ARROW_UP :{BLACK}{UPARROW}
-STR_ARROW_DOWN :{BLACK}{DOWNARROW}
+STR_BLACK_ARROW_UP :{BLACK}{UPARROW}
+STR_BLACK_ARROW_DOWN :{BLACK}{DOWNARROW}
STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA :{BLACK}Зголеми површина на област за спуштање/подигање
STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA :{BLACK}Намали површина на област за спуштање/подигање
STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND :{BLACK}Генерирај случаен терен
@@ -822,7 +821,7 @@ STR_BUILD_VEHICLE_TRAIN_ALL_CAPTION :{WHITE}Шинс
##id 0x9000
STR_ARTICULATED_RV_CAPACITY :{BLACK}Капацитет: {LTBLUE}
-STR_BARE_CARGO :{CARGO}
+STR_JUST_CARGO :{CARGO}
diff --git a/src/lang/unfinished/malay.txt b/src/lang/unfinished/malay.txt
index e6fcf64cb..939d2ddfb 100644
--- a/src/lang/unfinished/malay.txt
+++ b/src/lang/unfinished/malay.txt
@@ -135,8 +135,8 @@ STR_ABBREV_WATER :{TINYFONT}AR
STR_ABBREV_RUBBER :{TINYFONT}GT
STR_ABBREV_SUGAR :{TINYFONT}GU
STR_ABBREV_TOYS :{TINYFONT}MA
-STR_DATE_SHORT_WHITE :{WHITE}{DATE_SHORT}
-STR_DATE_LONG_WHITE :{WHITE}{DATE_LONG}
+STR_WHITE_DATE_SHORT :{WHITE}{DATE_SHORT}
+STR_WHITE_DATE_LONG :{WHITE}{DATE_LONG}
STR_SMALLMAP_CAPTION :{WHITE}MAP-{STRING}
STR_GAME_OPTIONS_CAPTION :{WHITE}Pilihan Permainan
STR_ERROR_MESSAGE_CAPTION :{YELLOW}Pesanan
@@ -305,7 +305,6 @@ STR_SORT_BY_PRODUCTION :Pengeluaran
STR_SORT_BY_TYPE :Jenis
STR_SORT_BY_TRANSPORTED :Telah dihantarkan
STR_SORT_BY_NAME :{BLACK}Nama
-STR_SORT_BY_DROPDOWN_NAME :Nama
STR_SORT_BY_DATE :{BLACK}Tarikh
STR_SORT_BY_NUMBER :Nombor
STR_SORT_BY_PROFIT_LAST_YEAR :Keuntungan tahun lepas
@@ -380,8 +379,8 @@ STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS :{BLACK}Bina lap
STR_TOOLBAR_TOOLTIP_PLANT_TREES_PLACE_SIGNS :{BLACK}Tumbuh pokok, letak papan tanda dll.
STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION :{BLACK}Maklumat kawasan tanah
STR_TOOLBAR_TOOLTIP_OPTIONS :{BLACK}Pilihan
-STR_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
-STR_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
+STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
+STR_BLACK_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
STR_ERROR_CAN_T_CHANGE_SERVICING :{WHITE}Tidak boleh tukar jarak waktu perkhidmatan...
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Tutup window
STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Tajuk tetingkap - seret ini untuk pindahkan tetingkap
@@ -540,12 +539,12 @@ STR_HIGHSCORE_NAME :{BIGFONT}{PRESI
STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA})
STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} mencapai status '{STRING}'!
STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} dari {COMPANY} mencapai status '{STRING}'!
-STR_BLUE_NUMBER :{BLUE}{COMMA}
+STR_BLUE_COMMA :{BLUE}{COMMA}
STR_SCENEDIT_TOOLBAR_OPENTTD :{YELLOW}OpenTTD
STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR :{YELLOW}Penyunting Senario
STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION :{WHITE}Pembentukan Tanah
-STR_ARROW_UP :{BLACK}{UPARROW}
-STR_ARROW_DOWN :{BLACK}{DOWNARROW}
+STR_BLACK_ARROW_UP :{BLACK}{UPARROW}
+STR_BLACK_ARROW_DOWN :{BLACK}{DOWNARROW}
STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA :{BLACK}Meningkatan penyebaran kawasan tanah untuk dinaikkan/diturunkan
STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA :{BLACK}Menurunkan penyebaran kawasan tanah untuk dinaikkan/diturunkan
STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND :{BLACK}Hasilkan secara rawak
@@ -618,7 +617,7 @@ STR_FULL :Penuh
STR_STATUSBAR_COMPANY_NAME :{SILVER}- - {COMPANY} - -
STR_BLACK_STRING :{BLACK}{STRING}
-STR_CHECKMARK :{CHECKMARK}
+STR_JUST_CHECKMARK :{CHECKMARK}
############ range for menu starts
STR_SETTINGS_MENU_GAME_OPTIONS :Pilihan permainan
STR_SETTINGS_MENU_DIFFICULTY_SETTINGS :Tetapan kesukaran
@@ -707,8 +706,8 @@ STR_TERRAFORM_TOOLTIP_PURCHASE_LAND :{BLACK}Beli tan
STR_STATUSBAR_SAVING_GAME :{RED}* * SIMPAN PERMAINAN * *
STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE :{BLACK}Pilih program 'Muzik gaya Ezy Street'
-STR_6 :{BLACK}6
-STR_7 :{BLACK}7
+STR_BLACK_6 :{BLACK}6
+STR_BLACK_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :Inggeris (Original)
@@ -786,7 +785,7 @@ STR_CRATES :peti
STR_RES_OTHER :lain
STR_NOTHING :
-STR_SMALL_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
+STR_TINY_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
STR_TRAIN_IS_STUCK :{WHITE}{VEHICLE} tidak boleh mencari arah jalan untuk teruskan jalan
diff --git a/src/lang/unfinished/persian.txt b/src/lang/unfinished/persian.txt
index 7a91b5ace..08f164cb9 100644
--- a/src/lang/unfinished/persian.txt
+++ b/src/lang/unfinished/persian.txt
@@ -154,8 +154,8 @@ STR_ABBREV_PLASTIC :{TINYFONT}PL
STR_ABBREV_FIZZY_DRINKS :{TINYFONT}FZ
STR_ABBREV_NONE :{TINYFONT}NO
STR_ABBREV_ALL :{TINYFONT}همه
-STR_DATE_SHORT_WHITE :{WHITE}{DATE_SHORT}
-STR_DATE_LONG_WHITE :{WHITE}{DATE_LONG}
+STR_WHITE_DATE_SHORT :{WHITE}{DATE_SHORT}
+STR_WHITE_DATE_LONG :{WHITE}{DATE_LONG}
STR_SMALLMAP_CAPTION :{WHITE}نقشه - {STRING}
STR_GAME_OPTIONS_CAPTION :{WHITE}تنظیمات بازی
STR_ERROR_MESSAGE_CAPTION :{YELLOW}پیام
@@ -328,7 +328,6 @@ STR_SORT_BY_PRODUCTION :تولید
STR_SORT_BY_TYPE :نوع
STR_SORT_BY_TRANSPORTED :منتقل شده
STR_SORT_BY_NAME :{BLACK}نام
-STR_SORT_BY_DROPDOWN_NAME :نام
STR_SORT_BY_DATE :{BLACK}تاریخ
STR_SORT_BY_NUMBER :تعداد
STR_SORT_BY_PROFIT_LAST_YEAR :سود در سال گذشته
@@ -412,8 +411,8 @@ STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS :{BLACK}ساخت
STR_TOOLBAR_TOOLTIP_PLANT_TREES_PLACE_SIGNS :{BLACK}کاشتن درختان، قرار دادن علامت و غیره
STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION :{BLACK}توضیحات درباره ی زمین
STR_TOOLBAR_TOOLTIP_OPTIONS :{BLACK}تنضیمات
-STR_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
-STR_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
+STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
+STR_BLACK_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
STR_ERROR_CAN_T_CHANGE_SERVICING :{WHITE}امکان تغییر فواصل زمانی سرویس وجود ندارد...
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}بستن پنجره
STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC :{BLACK}تخریب ساختمان و ... در بخشی از زمین
@@ -526,11 +525,11 @@ STR_NEWS_MESSAGE_TYPE_GENERAL_INFORMATION :{YELLOW}توض
STR_ERROR_TOO_FAR_FROM_PREVIOUS_DESTINATION :{WHITE}از هدف قبلی بسیار دور است......
STR_HIGHSCORE_POSITION :{BLACK}{BIGFONT}{COMMA}.
STR_HIGHSCORE_PERFORMANCE_TITLE_BUSINESSMAN :تاجر
-STR_BLUE_NUMBER :{BLUE}{COMMA}
+STR_BLUE_COMMA :{BLUE}{COMMA}
STR_SCENEDIT_TOOLBAR_OPENTTD :{YELLOW}OpenTTD
STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION :{WHITE}طراحی اتوماتیک سرزمین
-STR_ARROW_UP :{BLACK}{UPARROW}
-STR_ARROW_DOWN :{BLACK}{DOWNARROW}
+STR_BLACK_ARROW_UP :{BLACK}{UPARROW}
+STR_BLACK_ARROW_DOWN :{BLACK}{DOWNARROW}
STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND :{BLACK}نقشه ی تصادفی بساز
STR_TERRAFORM_RESET_LANDSCAPE :{BLACK}تمام تغییرات را بر گردان
STR_QUERY_RESET_LANDSCAPE_CAPTION :{WHITE}تمام تغییرات را بر گردان
@@ -651,7 +650,7 @@ STR_ERROR_SCREENSHOT_FAILED :{WHITE}تصئی
STR_TERRAFORM_TOOLTIP_PURCHASE_LAND :{BLACK}خرید زمین برای استفاده های بعدی
STR_STATUSBAR_AUTOSAVE :{RED}ذخیره اتوماتیک
-STR_6 :{BLACK}6
+STR_BLACK_6 :{BLACK}6
############ start of townname region
############ end of townname region
diff --git a/src/lang/unfinished/thai.txt b/src/lang/unfinished/thai.txt
index 800bfae58..48d2611d5 100644
--- a/src/lang/unfinished/thai.txt
+++ b/src/lang/unfinished/thai.txt
@@ -154,8 +154,8 @@ STR_ABBREV_PLASTIC :{TINYFONT}พ
STR_ABBREV_FIZZY_DRINKS :{TINYFONT}น้ำอัดลม
STR_ABBREV_NONE :{TINYFONT}ว่าง
STR_ABBREV_ALL :{TINYFONT}ทั้งหมด
-STR_DATE_SHORT_WHITE :{WHITE}{DATE_SHORT}
-STR_DATE_LONG_WHITE :{WHITE}{DATE_LONG}
+STR_WHITE_DATE_SHORT :{WHITE}{DATE_SHORT}
+STR_WHITE_DATE_LONG :{WHITE}{DATE_LONG}
STR_SMALLMAP_CAPTION :{WHITE}แผนที่ - {STRING}
STR_GAME_OPTIONS_CAPTION :{WHITE}การตั้งค่าของเกม
STR_ERROR_MESSAGE_CAPTION :{YELLOW}ข้อความ
@@ -321,7 +321,6 @@ STR_SORT_BY :{BLACK}เร
STR_SORT_BY_POPULATION :{BLACK}ประชากร
STR_SORT_BY_TYPE :ประเภท
STR_SORT_BY_NAME :{BLACK}ชื่อ
-STR_SORT_BY_DROPDOWN_NAME :ชื่อ
STR_SORT_BY_DATE :{BLACK}วันที่
STR_SORT_BY_PROFIT_LAST_YEAR :กำไรปีที่แล้ว
STR_SORT_BY_PROFIT_THIS_YEAR :กำไรปีนี้
@@ -380,8 +379,8 @@ STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS :{BLACK}สร
STR_TOOLBAR_TOOLTIP_PLANT_TREES_PLACE_SIGNS :{BLACK}ปลูกต้นไม้ ปักป้าย ฯลฯ
STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION :{BLACK}ข้อมูลที่ดิน
STR_TOOLBAR_TOOLTIP_OPTIONS :{BLACK}ตั้งค่า
-STR_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
-STR_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
+STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
+STR_BLACK_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
STR_ERROR_CAN_T_CHANGE_SERVICING :{WHITE}ไม่สามารถเปลี่ยนระยะเวลาการซ่อมบำรุงได้...
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}ปิดหน้าต่าง
STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}หัวของหน้าต่าง - คลิกค้างแล้วลากเพื่อเลื่อนหน้าต่าง
@@ -536,12 +535,12 @@ STR_HIGHSCORE_NAME :{BIGFONT}{PRESI
STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA})
STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} ได้ก้าวไปสู่ขั้น '{STRING}'!
STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} จาก {COMPANY} ได้ก้าวไปสู่ขั้น '{STRING}'!
-STR_BLUE_NUMBER :{BLUE}{COMMA}
+STR_BLUE_COMMA :{BLUE}{COMMA}
STR_SCENEDIT_TOOLBAR_OPENTTD :{YELLOW}OpenTTD
STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR :{YELLOW}โปรแกรมสร้างฉาก
STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION :{WHITE}สร้างแผ่นดิน
-STR_ARROW_UP :{BLACK}{UPARROW}
-STR_ARROW_DOWN :{BLACK}{DOWNARROW}
+STR_BLACK_ARROW_UP :{BLACK}{UPARROW}
+STR_BLACK_ARROW_DOWN :{BLACK}{DOWNARROW}
STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA :{BLACK}เพิ่มพื้นที่ในการปรับระดับแผ่นดิน
STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA :{BLACK}ลดพื้นที่ในการปรับระดับแผ่นดิน
STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND :{BLACK}สร้างแผ่นดินแบบสุ่ม
@@ -608,8 +607,8 @@ STR_STATUSBAR_SAVING_GAME :{RED}* * ก
STR_SAVE_STILL_IN_PROGRESS :{WHITE}ขณะนี้กำลังบันทึก,{}โปรดรอจนกว่าจะเสร็จ!
STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE :{BLACK}เลือกเพลงฟังรายการเพลง Ezy Street
-STR_6 :{BLACK}6
-STR_7 :{BLACK}7
+STR_BLACK_6 :{BLACK}6
+STR_BLACK_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :อังกฤษ (ดั้งเดิม)
@@ -660,7 +659,7 @@ STR_CRATES :ลัง
STR_RES_OTHER :อื่นๆ
STR_NOTHING :
-STR_SMALL_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
+STR_TINY_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
STR_CANT_SHARE_ORDER_LIST :{WHITE}ไม่สามารถใช้รายการสถานที่ร่วมกันได้
STR_CANT_COPY_ORDER_LIST :{WHITE}ไม่สามารถคัดลอกรายการสถานที่ได้
diff --git a/src/lang/unfinished/urdu.txt b/src/lang/unfinished/urdu.txt
index 31f0ff4f2..a58dd5368 100644
--- a/src/lang/unfinished/urdu.txt
+++ b/src/lang/unfinished/urdu.txt
@@ -177,7 +177,6 @@ STR_SORT_BY_PRODUCTION :پیداوار
STR_SORT_BY_TYPE :طرز
STR_SORT_BY_TRANSPORTED :منتقل شدہ
STR_SORT_BY_NAME :{BLACK}نام
-STR_SORT_BY_DROPDOWN_NAME :نام
STR_SORT_BY_DATE :{BLACK}تاریخ
STR_SORT_BY_NUMBER :تعداد
STR_SORT_BY_PROFIT_LAST_YEAR :پچھلے سال کا منافع
@@ -209,8 +208,8 @@ STR_TOOLBAR_TOOLTIP_BUILD_SHIP_DOCKS :{BLACK}بندر
STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS :{BLACK}ہوای اڈے بناو
STR_TOOLBAR_TOOLTIP_PLANT_TREES_PLACE_SIGNS :{BLACK}درخت اگاو، اشارے لگاو، وغیرہ
STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION :{BLACK}زمینی رقبہ کی معلومات
-STR_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
-STR_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
+STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
+STR_BLACK_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}کھڑکی بند کرو
STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}کھڑکی کا نام - کھڑکی کو ہلانے کیلیے اسے پکڑ کر ہلاو
STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC :{BLACK}زمین کے ایک مربے پر عمارتیں وغیرہ گراو
diff --git a/src/lang/unfinished/vietnamese.txt b/src/lang/unfinished/vietnamese.txt
index fff56acd7..a25ac9df8 100644
--- a/src/lang/unfinished/vietnamese.txt
+++ b/src/lang/unfinished/vietnamese.txt
@@ -141,8 +141,8 @@ STR_ABBREV_PLASTIC :{TINYFONT}Cd
STR_ABBREV_FIZZY_DRINKS :{TINYFONT}Ug
STR_ABBREV_NONE :{TINYFONT}K0
STR_ABBREV_ALL :{TINYFONT}Tất
-STR_DATE_SHORT_WHITE :{WHITE}{DATE_SHORT}
-STR_DATE_LONG_WHITE :{WHITE}{DATE_LONG}
+STR_WHITE_DATE_SHORT :{WHITE}{DATE_SHORT}
+STR_WHITE_DATE_LONG :{WHITE}{DATE_LONG}
STR_SMALLMAP_CAPTION :{WHITE}Bản đồ - {STRING}
STR_GAME_OPTIONS_CAPTION :{WHITE}Tùy chọn Trò chơi
STR_ERROR_MESSAGE_CAPTION :{YELLOW}Thông điệp
@@ -299,7 +299,6 @@ STR_SORT_BY_PRODUCTION :Sản lượng
STR_SORT_BY_TYPE :Loại
STR_SORT_BY_TRANSPORTED :Dung lượng đã vận chuyển
STR_SORT_BY_NAME :{BLACK}Tên
-STR_SORT_BY_DROPDOWN_NAME :Tên
STR_SORT_BY_DATE :{BLACK}Ngày tháng
STR_SORT_BY_NUMBER :Số
STR_SORT_BY_PROFIT_LAST_YEAR :Lợi nhuận năm trước
diff --git a/src/lang/welsh.txt b/src/lang/welsh.txt
index f259279f3..7c714d02d 100644
--- a/src/lang/welsh.txt
+++ b/src/lang/welsh.txt
@@ -154,8 +154,8 @@ STR_ABBREV_PLASTIC :{TINYFONT}PL
STR_ABBREV_FIZZY_DRINKS :{TINYFONT}FZ
STR_ABBREV_NONE :{TINYFONT}NO
STR_ABBREV_ALL :{TINYFONT}ALL
-STR_DATE_SHORT_WHITE :{WHITE}{DATE_SHORT}
-STR_DATE_LONG_WHITE :{WHITE}{DATE_LONG}
+STR_WHITE_DATE_SHORT :{WHITE}{DATE_SHORT}
+STR_WHITE_DATE_LONG :{WHITE}{DATE_LONG}
STR_SMALLMAP_CAPTION :{WHITE}Map - {STRING}
STR_GAME_OPTIONS_CAPTION :{WHITE}Dewisiadau Gêm
STR_ERROR_MESSAGE_CAPTION :{YELLOW}Neges
@@ -328,7 +328,6 @@ STR_SORT_BY_PRODUCTION :Cynyrch
STR_SORT_BY_TYPE :Math
STR_SORT_BY_TRANSPORTED :Wedi'i gludo
STR_SORT_BY_NAME :{BLACK}Enw
-STR_SORT_BY_DROPDOWN_NAME :Enw
STR_SORT_BY_DATE :{BLACK}Dyddiad
STR_SORT_BY_NUMBER :Rhif
STR_SORT_BY_PROFIT_LAST_YEAR :Elw eleni
@@ -410,8 +409,8 @@ STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS :{BLACK}Adeiladu
STR_TOOLBAR_TOOLTIP_PLANT_TREES_PLACE_SIGNS :{BLACK}Plannu Coed, gosod arwyddion ayb.
STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION :{BLACK}Gwybodaeth am yr ardal tir
STR_TOOLBAR_TOOLTIP_OPTIONS :{BLACK}Dewisiadau
-STR_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
-STR_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
+STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW}
+STR_BLACK_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW}
STR_ERROR_CAN_T_CHANGE_SERVICING :{WHITE}Methu newid hyd y cyfnod rhwng pob gwasanaeth...
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Clau Ffenestr
STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Teitl ffenestr - llusgwch hwn i symud ffenestr
@@ -581,12 +580,12 @@ STR_HIGHSCORE_NAME :{BIGFONT}{PRESI
STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA})
STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BLACK}{BIGFONT}Mae {COMPANY} wedi cyrraedd statws '{STRING}'!
STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{WHITE}{BIGFONT}Mae {PRESIDENTNAME} o gwmni {COMPANY} wedi cyrraedd statws '{STRING}'!
-STR_BLUE_NUMBER :{BLUE}{COMMA}
+STR_BLUE_COMMA :{BLUE}{COMMA}
STR_SCENEDIT_TOOLBAR_OPENTTD :{YELLOW}OpenTTD
STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR :{YELLOW}Golygydd Senario
STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION :{WHITE}Cynhyrchu Tirwedd
-STR_ARROW_UP :{BLACK}{UPARROW}
-STR_ARROW_DOWN :{BLACK}{DOWNARROW}
+STR_BLACK_ARROW_UP :{BLACK}{UPARROW}
+STR_BLACK_ARROW_DOWN :{BLACK}{DOWNARROW}
STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA :{BLACK}Cynyddu'r arwynebedd tir i'w godi neu ostwng
STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA :{BLACK}Lleihau'r arwynebedd tir i'w godi neu ostwng
STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND :{BLACK}Cynhyrchu Tir ar Hap
@@ -670,7 +669,7 @@ STR_FULL :Llawn
STR_STATUSBAR_COMPANY_NAME :{SILVER}- - {COMPANY} - -
STR_BLACK_STRING :{BLACK}{STRING}
-STR_CHECKMARK :{CHECKMARK}
+STR_JUST_CHECKMARK :{CHECKMARK}
############ range for menu starts
STR_SETTINGS_MENU_GAME_OPTIONS :Dewisiadau Ge^m
STR_SETTINGS_MENU_DIFFICULTY_SETTINGS :Gosodiadau Anhawster
@@ -775,8 +774,8 @@ STR_STATUSBAR_SAVING_GAME :{RED}* * CADW
STR_SAVE_STILL_IN_PROGRESS :{WHITE}Mae'r gêm wrthi'n cael ei chadw,{}Arhoswch nes y bydd y broses wedi'i chwblhau!
STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE :{BLACK}Dewis y rhaglen 'Ezy Scoedent style music'
-STR_6 :{BLACK}6
-STR_7 :{BLACK}7
+STR_BLACK_6 :{BLACK}6
+STR_BLACK_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :Saesneg (Gwreiddiol)
@@ -884,7 +883,7 @@ STR_CRATES :crât
STR_RES_OTHER :arall
STR_NOTHING :
-STR_SMALL_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
+STR_TINY_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
STR_CANT_SHARE_ORDER_LIST :{WHITE}Does dim modd rhannu'r rhestr gorchmynion...
STR_CANT_COPY_ORDER_LIST :{WHITE}Does dim modd copïo'r rhestr gorchmynion...
@@ -1157,8 +1156,7 @@ STR_CONFIG_SETTING_MAP_Y :{LTBLUE}Y-faint
############ generic strings for settings
STR_CONFIG_SETTING_DISABLED :analluogwyd
-STR_CONFIG_SETTING_INT32 :{NUM}
-STR_CONFIG_SETTING_CURRENCY :{CURRENCY}
+STR_JUST_CURRENCY :{CURRENCY}
STR_CONFIG_SETTING_QUERY_CAPT :{WHITE}Newid gwerth gosodiad
STR_TEMPERATE_LANDSCAPE :Tirwedd Tymherus
@@ -2124,8 +2122,8 @@ STR_NUM_LOW :Isel
STR_NUM_NORMAL :Arferol
STR_NUM_HIGH :Anodd
STR_NUM_CUSTOM :Addasedig
-STR_ARROW_LEFT_SMALL :{BLACK}{SMALLLEFTARROW}
-STR_ARROW_RIGHT_SMALL :{BLACK}{SMALLRIGHTARROW}
+STR_BLACK_SMALL_ARROW_LEFT :{BLACK}{SMALLLEFTARROW}
+STR_BLACK_SMALL_ARROW_RIGHT :{BLACK}{SMALLRIGHTARROW}
STR_AI_SPEED_VERY_SLOW :Araf Iawn
STR_AI_SPEED_SLOW :Araf
STR_AI_SPEED_MEDIUM :Canolig
@@ -2875,7 +2873,7 @@ STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Canoli'r
STR_BUILD_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP :{BLACK}Rhestr dewis cerbydau ffordd - cliciwch ar gerbyd am wybodaeth
STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_TOOLTIP :{BLACK}Adeiladu'r cerbyd ffordd sydd wedi'i amlygu
STR_ARTICULATED_RV_CAPACITY :{BLACK}Cynhwysedd: {LTBLUE}
-STR_BARE_CARGO :{CARGO}
+STR_JUST_CARGO :{CARGO}
STR_DEPOT_VEHICLE_TOOLTIP :{BLACK}{ENGINE}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CHAIN :{BLACK}{NUM} cerbyd{P "" au}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CARGO :{}{CARGO} ({SHORTCARGO})
diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp
index 9623ac11a..0293b64c8 100644
--- a/src/network/network_gui.cpp
+++ b/src/network/network_gui.cpp
@@ -1112,19 +1112,19 @@ struct NetworkStartServerWindow : public QueryStringBaseWindow {
case NSSW_CLIENTS_TXT: // Click on number of clients
this->widget_id = NSSW_CLIENTS_TXT;
SetDParam(0, _settings_client.network.max_clients);
- ShowQueryString(STR_CONFIG_SETTING_INT32, STR_NETWORK_NUMBER_OF_CLIENTS, 4, 50, this, CS_NUMERAL, QSF_NONE);
+ ShowQueryString(STR_JUST_INT, STR_NETWORK_NUMBER_OF_CLIENTS, 4, 50, this, CS_NUMERAL, QSF_NONE);
break;
case NSSW_COMPANIES_TXT: // Click on number of companies
this->widget_id = NSSW_COMPANIES_TXT;
SetDParam(0, _settings_client.network.max_companies);
- ShowQueryString(STR_CONFIG_SETTING_INT32, STR_NETWORK_NUMBER_OF_COMPANIES, 3, 50, this, CS_NUMERAL, QSF_NONE);
+ ShowQueryString(STR_JUST_INT, STR_NETWORK_NUMBER_OF_COMPANIES, 3, 50, this, CS_NUMERAL, QSF_NONE);
break;
case NSSW_SPECTATORS_TXT: // Click on number of spectators
this->widget_id = NSSW_SPECTATORS_TXT;
SetDParam(0, _settings_client.network.max_spectators);
- ShowQueryString(STR_CONFIG_SETTING_INT32, STR_NETWORK_NUMBER_OF_SPECTATORS, 4, 50, this, CS_NUMERAL, QSF_NONE);
+ ShowQueryString(STR_JUST_INT, STR_NETWORK_NUMBER_OF_SPECTATORS, 4, 50, this, CS_NUMERAL, QSF_NONE);
break;
case NSSW_LANGUAGE_BTN: { // Language
diff --git a/src/order_gui.cpp b/src/order_gui.cpp
index b00377049..2d09acb73 100644
--- a/src/order_gui.cpp
+++ b/src/order_gui.cpp
@@ -974,7 +974,7 @@ public:
uint value = order->GetConditionValue();
if (order->GetConditionVariable() == OCV_MAX_SPEED) value = ConvertSpeedToDisplaySpeed(value);
SetDParam(0, value);
- ShowQueryString(STR_CONFIG_SETTING_INT32, STR_ORDER_CONDITIONAL_VALUE_CAPT, 5, 100, this, CS_NUMERAL, QSF_NONE);
+ ShowQueryString(STR_JUST_INT, STR_ORDER_CONDITIONAL_VALUE_CAPT, 5, 100, this, CS_NUMERAL, QSF_NONE);
} break;
case ORDER_WIDGET_SHARED_ORDER_LIST:
diff --git a/src/rail_gui.cpp b/src/rail_gui.cpp
index adfd3dc46..04700a237 100644
--- a/src/rail_gui.cpp
+++ b/src/rail_gui.cpp
@@ -1315,8 +1315,8 @@ static const NWidgetPart _nested_station_builder_widgets[] = {
NWidget(WWT_TEXTBTN, COLOUR_GREY, BRSW_PLATFORM_NUM_3), SetMinimalSize(15, 12), SetDataTip(STR_BLACK_3, STR_STATION_BUILD_NUMBER_OF_TRACKS_TOOLTIP),
NWidget(WWT_TEXTBTN, COLOUR_GREY, BRSW_PLATFORM_NUM_4), SetMinimalSize(15, 12), SetDataTip(STR_BLACK_4, STR_STATION_BUILD_NUMBER_OF_TRACKS_TOOLTIP),
NWidget(WWT_TEXTBTN, COLOUR_GREY, BRSW_PLATFORM_NUM_5), SetMinimalSize(15, 12), SetDataTip(STR_BLACK_5, STR_STATION_BUILD_NUMBER_OF_TRACKS_TOOLTIP),
- NWidget(WWT_TEXTBTN, COLOUR_GREY, BRSW_PLATFORM_NUM_6), SetMinimalSize(15, 12), SetDataTip(STR_6, STR_STATION_BUILD_NUMBER_OF_TRACKS_TOOLTIP),
- NWidget(WWT_TEXTBTN, COLOUR_GREY, BRSW_PLATFORM_NUM_7), SetMinimalSize(15, 12), SetDataTip(STR_7, STR_STATION_BUILD_NUMBER_OF_TRACKS_TOOLTIP),
+ NWidget(WWT_TEXTBTN, COLOUR_GREY, BRSW_PLATFORM_NUM_6), SetMinimalSize(15, 12), SetDataTip(STR_BLACK_6, STR_STATION_BUILD_NUMBER_OF_TRACKS_TOOLTIP),
+ NWidget(WWT_TEXTBTN, COLOUR_GREY, BRSW_PLATFORM_NUM_7), SetMinimalSize(15, 12), SetDataTip(STR_BLACK_7, STR_STATION_BUILD_NUMBER_OF_TRACKS_TOOLTIP),
EndContainer(),
NWidget(WWT_LABEL, COLOUR_DARK_GREEN, BRSW_PLATFORM_LEN_LABEL), SetMinimalSize(144, 11), SetDataTip(STR_STATION_BUILD_PLATFORM_LENGTH, STR_NULL), SetPadding(2, 2, 0, 2),
NWidget(NWID_HORIZONTAL), SetPIP(22, 0, 21),
@@ -1325,8 +1325,8 @@ static const NWidgetPart _nested_station_builder_widgets[] = {
NWidget(WWT_TEXTBTN, COLOUR_GREY, BRSW_PLATFORM_LEN_3), SetMinimalSize(15, 12), SetDataTip(STR_BLACK_3, STR_STATION_BUILD_PLATFORM_LENGTH_TOOLTIP),
NWidget(WWT_TEXTBTN, COLOUR_GREY, BRSW_PLATFORM_LEN_4), SetMinimalSize(15, 12), SetDataTip(STR_BLACK_4, STR_STATION_BUILD_PLATFORM_LENGTH_TOOLTIP),
NWidget(WWT_TEXTBTN, COLOUR_GREY, BRSW_PLATFORM_LEN_5), SetMinimalSize(15, 12), SetDataTip(STR_BLACK_5, STR_STATION_BUILD_PLATFORM_LENGTH_TOOLTIP),
- NWidget(WWT_TEXTBTN, COLOUR_GREY, BRSW_PLATFORM_LEN_6), SetMinimalSize(15, 12), SetDataTip(STR_6, STR_STATION_BUILD_PLATFORM_LENGTH_TOOLTIP),
- NWidget(WWT_TEXTBTN, COLOUR_GREY, BRSW_PLATFORM_LEN_7), SetMinimalSize(15, 12), SetDataTip(STR_7, STR_STATION_BUILD_PLATFORM_LENGTH_TOOLTIP),
+ NWidget(WWT_TEXTBTN, COLOUR_GREY, BRSW_PLATFORM_LEN_6), SetMinimalSize(15, 12), SetDataTip(STR_BLACK_6, STR_STATION_BUILD_PLATFORM_LENGTH_TOOLTIP),
+ NWidget(WWT_TEXTBTN, COLOUR_GREY, BRSW_PLATFORM_LEN_7), SetMinimalSize(15, 12), SetDataTip(STR_BLACK_7, STR_STATION_BUILD_PLATFORM_LENGTH_TOOLTIP),
EndContainer(),
NWidget(NWID_SPACER), SetMinimalSize(0, 2),
NWidget(NWID_HORIZONTAL), SetPIP(37, 0, 0),
@@ -1373,8 +1373,8 @@ static const NWidgetPart _nested_newstation_builder_widgets[] = {
NWidget(WWT_TEXTBTN, COLOUR_GREY, BRSW_PLATFORM_NUM_3), SetMinimalSize(15, 12), SetDataTip(STR_BLACK_3, STR_STATION_BUILD_NUMBER_OF_TRACKS_TOOLTIP),
NWidget(WWT_TEXTBTN, COLOUR_GREY, BRSW_PLATFORM_NUM_4), SetMinimalSize(15, 12), SetDataTip(STR_BLACK_4, STR_STATION_BUILD_NUMBER_OF_TRACKS_TOOLTIP),
NWidget(WWT_TEXTBTN, COLOUR_GREY, BRSW_PLATFORM_NUM_5), SetMinimalSize(15, 12), SetDataTip(STR_BLACK_5, STR_STATION_BUILD_NUMBER_OF_TRACKS_TOOLTIP),
- NWidget(WWT_TEXTBTN, COLOUR_GREY, BRSW_PLATFORM_NUM_6), SetMinimalSize(15, 12), SetDataTip(STR_6, STR_STATION_BUILD_NUMBER_OF_TRACKS_TOOLTIP),
- NWidget(WWT_TEXTBTN, COLOUR_GREY, BRSW_PLATFORM_NUM_7), SetMinimalSize(15, 12), SetDataTip(STR_7, STR_STATION_BUILD_NUMBER_OF_TRACKS_TOOLTIP),
+ NWidget(WWT_TEXTBTN, COLOUR_GREY, BRSW_PLATFORM_NUM_6), SetMinimalSize(15, 12), SetDataTip(STR_BLACK_6, STR_STATION_BUILD_NUMBER_OF_TRACKS_TOOLTIP),
+ NWidget(WWT_TEXTBTN, COLOUR_GREY, BRSW_PLATFORM_NUM_7), SetMinimalSize(15, 12), SetDataTip(STR_BLACK_7, STR_STATION_BUILD_NUMBER_OF_TRACKS_TOOLTIP),
EndContainer(),
NWidget(WWT_LABEL, COLOUR_DARK_GREEN, BRSW_PLATFORM_LEN_LABEL), SetMinimalSize(144, 11), SetDataTip(STR_STATION_BUILD_PLATFORM_LENGTH, STR_NULL), SetPadding(2, 2, 0, 2),
NWidget(NWID_HORIZONTAL), SetPIP(22, 0, 21),
@@ -1383,8 +1383,8 @@ static const NWidgetPart _nested_newstation_builder_widgets[] = {
NWidget(WWT_TEXTBTN, COLOUR_GREY, BRSW_PLATFORM_LEN_3), SetMinimalSize(15, 12), SetDataTip(STR_BLACK_3, STR_STATION_BUILD_PLATFORM_LENGTH_TOOLTIP),
NWidget(WWT_TEXTBTN, COLOUR_GREY, BRSW_PLATFORM_LEN_4), SetMinimalSize(15, 12), SetDataTip(STR_BLACK_4, STR_STATION_BUILD_PLATFORM_LENGTH_TOOLTIP),
NWidget(WWT_TEXTBTN, COLOUR_GREY, BRSW_PLATFORM_LEN_5), SetMinimalSize(15, 12), SetDataTip(STR_BLACK_5, STR_STATION_BUILD_PLATFORM_LENGTH_TOOLTIP),
- NWidget(WWT_TEXTBTN, COLOUR_GREY, BRSW_PLATFORM_LEN_6), SetMinimalSize(15, 12), SetDataTip(STR_6, STR_STATION_BUILD_PLATFORM_LENGTH_TOOLTIP),
- NWidget(WWT_TEXTBTN, COLOUR_GREY, BRSW_PLATFORM_LEN_7), SetMinimalSize(15, 12), SetDataTip(STR_7, STR_STATION_BUILD_PLATFORM_LENGTH_TOOLTIP),
+ NWidget(WWT_TEXTBTN, COLOUR_GREY, BRSW_PLATFORM_LEN_6), SetMinimalSize(15, 12), SetDataTip(STR_BLACK_6, STR_STATION_BUILD_PLATFORM_LENGTH_TOOLTIP),
+ NWidget(WWT_TEXTBTN, COLOUR_GREY, BRSW_PLATFORM_LEN_7), SetMinimalSize(15, 12), SetDataTip(STR_BLACK_7, STR_STATION_BUILD_PLATFORM_LENGTH_TOOLTIP),
EndContainer(),
NWidget(NWID_SPACER), SetMinimalSize(0, 2),
NWidget(NWID_HORIZONTAL), SetPIP(37, 0, 0),
diff --git a/src/roadveh_gui.cpp b/src/roadveh_gui.cpp
index 49a608a06..4107ac608 100644
--- a/src/roadveh_gui.cpp
+++ b/src/roadveh_gui.cpp
@@ -59,7 +59,7 @@ void DrawRoadVehDetails(const Vehicle *v, int left, int right, int y)
SetDParam(0, i);
SetDParam(1, max_cargo[i]);
- GetString(buffer, STR_BARE_CARGO, lastof(buffer));
+ GetString(buffer, STR_JUST_CARGO, lastof(buffer));
if (!first) strecat(capacity, ", ", lastof(capacity));
strecat(capacity, buffer, lastof(capacity));
diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp
index 359905db5..3569dea80 100644
--- a/src/settings_gui.cpp
+++ b/src/settings_gui.cpp
@@ -1036,11 +1036,11 @@ void SettingEntry::DrawSetting(GameSettings *settings_ptr, const SettingDesc *sd
SetDParam(0, STR_CONFIG_SETTING_DISABLED);
} else {
if (sdb->flags & SGF_CURRENCY) {
- SetDParam(0, STR_CONFIG_SETTING_CURRENCY);
+ SetDParam(0, STR_JUST_CURRENCY);
} else if (sdb->flags & SGF_MULTISTRING) {
SetDParam(0, sdb->str + value + 1);
} else {
- SetDParam(0, (sdb->flags & SGF_NOCOMMA) ? STR_CONFIG_SETTING_INT32 : STR_JUST_COMMA);
+ SetDParam(0, (sdb->flags & SGF_NOCOMMA) ? STR_JUST_INT : STR_JUST_COMMA);
}
SetDParam(1, value);
}
@@ -1520,7 +1520,7 @@ struct GameSettingsWindow : Window {
this->valuewindow_entry = pe;
SetDParam(0, value);
- ShowQueryString(STR_CONFIG_SETTING_INT32, STR_CONFIG_SETTING_QUERY_CAPT, 10, 100, this, CS_NUMERAL, QSF_NONE);
+ ShowQueryString(STR_JUST_INT, STR_CONFIG_SETTING_QUERY_CAPT, 10, 100, this, CS_NUMERAL, QSF_NONE);
}
}
}
@@ -1617,8 +1617,8 @@ void DrawArrowButtons(int x, int y, Colours button_colour, byte state, bool clic
DrawFrameRect(x, y + 1, x + 9, y + 9, button_colour, (state == 1) ? FR_LOWERED : FR_NONE);
DrawFrameRect(x + 10, y + 1, x + 19, y + 9, button_colour, (state == 2) ? FR_LOWERED : FR_NONE);
- DrawString(x, x + 9, y + 1, STR_ARROW_LEFT_SMALL, TC_FROMSTRING, SA_CENTER); // [<]
- DrawString(x + 10, x + 19, y + 1, STR_ARROW_RIGHT_SMALL, TC_FROMSTRING, SA_CENTER); // [>]
+ DrawString(x, x + 9, y + 1, STR_BLACK_SMALL_ARROW_LEFT, TC_FROMSTRING, SA_CENTER); // [<]
+ DrawString(x + 10, x + 19, y + 1, STR_BLACK_SMALL_ARROW_RIGHT, TC_FROMSTRING, SA_CENTER); // [>]
/* Grey out the buttons that aren't clickable */
if (!clickable_left) {
@@ -1703,7 +1703,7 @@ struct CustomCurrencyWindow : Window {
case CUSTCURR_RATE:
SetDParam(0, _custom_currency.rate);
- str = STR_CONFIG_SETTING_INT32;
+ str = STR_JUST_INT;
len = 5;
line = CUSTCURR_RATE;
afilter = CS_NUMERAL;
@@ -1747,7 +1747,7 @@ struct CustomCurrencyWindow : Window {
case CUSTCURR_YEAR:
SetDParam(0, _custom_currency.to_euro);
- str = STR_CONFIG_SETTING_INT32;
+ str = STR_JUST_INT;
len = 7;
line = CUSTCURR_YEAR;
afilter = CS_NUMERAL;
@@ -1806,8 +1806,8 @@ static const Widget _cust_currency_widgets[] = {
{ WWT_CAPTION, RESIZE_NONE, COLOUR_GREY, 11, 229, 0, 13, STR_CURRENCY_WINDOW, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS}, // CUSTCURR_CAPTION
{ WWT_PANEL, RESIZE_NONE, COLOUR_GREY, 0, 229, 14, 119, 0x0, STR_NULL}, // CUSTCURR_BACKGROUND
-{ WWT_PUSHTXTBTN, RESIZE_NONE, COLOUR_YELLOW, 10, 19, 21, 29, STR_ARROW_LEFT_SMALL, STR_TOOLTIP_DECREASE_EXCHANGE_RATE}, // CUSTCURR_RATE_DOWN
-{ WWT_PUSHTXTBTN, RESIZE_NONE, COLOUR_YELLOW, 20, 29, 21, 29, STR_ARROW_RIGHT_SMALL, STR_TOOLTIP_INCREASE_EXCHANGE_RATE}, // CUSTCURR_RATE_UP
+{ WWT_PUSHTXTBTN, RESIZE_NONE, COLOUR_YELLOW, 10, 19, 21, 29, STR_BLACK_SMALL_ARROW_LEFT, STR_TOOLTIP_DECREASE_EXCHANGE_RATE}, // CUSTCURR_RATE_DOWN
+{ WWT_PUSHTXTBTN, RESIZE_NONE, COLOUR_YELLOW, 20, 29, 21, 29, STR_BLACK_SMALL_ARROW_RIGHT, STR_TOOLTIP_INCREASE_EXCHANGE_RATE}, // CUSTCURR_RATE_UP
{ WWT_TEXT, RESIZE_NONE, COLOUR_BLUE, 35, 227, 21, 29, STR_CURRENCY_EXCHANGE_RATE, STR_TOOLTIP_SET_EXCHANGE_RATE}, // CUSTCURR_RATE
{ WWT_PUSHBTN, RESIZE_NONE, COLOUR_DARK_BLUE, 10, 29, 33, 41, 0x0, STR_TOOLTIP_SET_CUSTOM_CURRENCY_SEPARATOR}, // CUSTCURR_SEPARATOR_EDIT
@@ -1819,8 +1819,8 @@ static const Widget _cust_currency_widgets[] = {
{ WWT_PUSHBTN, RESIZE_NONE, COLOUR_DARK_BLUE, 10, 29, 57, 65, 0x0, STR_TOOLTIP_SET_CUSTOM_CURRENCY_SUFFIX}, // CUSTCURR_SUFFIX_EDIT
{ WWT_TEXT, RESIZE_NONE, COLOUR_BLUE, 35, 227, 57, 65, STR_CURRENCY_SUFFIX, STR_TOOLTIP_SET_CUSTOM_CURRENCY_SUFFIX}, // CUSTCURR_SUFFIX
-{ WWT_PUSHTXTBTN, RESIZE_NONE, COLOUR_YELLOW, 10, 19, 69, 77, STR_ARROW_LEFT_SMALL, STR_TOOLTIP_DECREASE_CUSTOM_CURRENCY_TO_EURO}, // CUSTCURR_YEAR_DOWN
-{ WWT_PUSHTXTBTN, RESIZE_NONE, COLOUR_YELLOW, 20, 29, 69, 77, STR_ARROW_RIGHT_SMALL, STR_TOOLTIP_INCREASE_CUSTOM_CURRENCY_TO_EURO}, // CUSTCURR_YEAR_UP
+{ WWT_PUSHTXTBTN, RESIZE_NONE, COLOUR_YELLOW, 10, 19, 69, 77, STR_BLACK_SMALL_ARROW_LEFT, STR_TOOLTIP_DECREASE_CUSTOM_CURRENCY_TO_EURO}, // CUSTCURR_YEAR_DOWN
+{ WWT_PUSHTXTBTN, RESIZE_NONE, COLOUR_YELLOW, 20, 29, 69, 77, STR_BLACK_SMALL_ARROW_RIGHT, STR_TOOLTIP_INCREASE_CUSTOM_CURRENCY_TO_EURO}, // CUSTCURR_YEAR_UP
{ WWT_TEXT, RESIZE_NONE, COLOUR_BLUE, 35, 227, 69, 77, STR_CURRENCY_SWITCH_TO_EURO, STR_TOOLTIP_SET_CUSTOM_CURRENCY_TO_EURO}, // CUSTCURR_YEAR
{ WWT_LABEL, RESIZE_NONE, COLOUR_BLUE, 2, 227, 93, 101, STR_CURRENCY_PREVIEW, STR_TOOLTIP_CUSTOM_CURRENCY_PREVIEW}, // CUSTCURR_PREVIEW
@@ -1836,8 +1836,8 @@ static const NWidgetPart _nested_cust_currency_widgets[] = {
NWidget(WWT_PANEL, COLOUR_GREY, CUSTCURR_BACKGROUND),
NWidget(NWID_SPACER), SetMinimalSize(0, 7),
NWidget(NWID_HORIZONTAL), SetPIP(10, 0, 2),
- NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, CUSTCURR_RATE_DOWN), SetMinimalSize(10, 9), SetDataTip(STR_ARROW_LEFT_SMALL, STR_TOOLTIP_DECREASE_EXCHANGE_RATE),
- NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, CUSTCURR_RATE_UP), SetMinimalSize(10, 9), SetDataTip(STR_ARROW_RIGHT_SMALL, STR_TOOLTIP_INCREASE_EXCHANGE_RATE),
+ NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, CUSTCURR_RATE_DOWN), SetMinimalSize(10, 9), SetDataTip(STR_BLACK_SMALL_ARROW_LEFT, STR_TOOLTIP_DECREASE_EXCHANGE_RATE),
+ NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, CUSTCURR_RATE_UP), SetMinimalSize(10, 9), SetDataTip(STR_BLACK_SMALL_ARROW_RIGHT, STR_TOOLTIP_INCREASE_EXCHANGE_RATE),
NWidget(NWID_SPACER), SetMinimalSize(5, 0),
NWidget(WWT_TEXT, COLOUR_BLUE, CUSTCURR_RATE), SetMinimalSize(193, 9), SetDataTip(STR_CURRENCY_EXCHANGE_RATE, STR_TOOLTIP_SET_EXCHANGE_RATE),
NWidget(NWID_SPACER), SetFill(1, 0),
@@ -1865,8 +1865,8 @@ static const NWidgetPart _nested_cust_currency_widgets[] = {
EndContainer(),
NWidget(NWID_SPACER), SetMinimalSize(0, 3),
NWidget(NWID_HORIZONTAL), SetPIP(10, 0, 2),
- NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, CUSTCURR_YEAR_DOWN), SetMinimalSize(10, 9), SetDataTip(STR_ARROW_LEFT_SMALL, STR_TOOLTIP_DECREASE_CUSTOM_CURRENCY_TO_EURO),
- NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, CUSTCURR_YEAR_UP), SetMinimalSize(10, 9), SetDataTip(STR_ARROW_RIGHT_SMALL, STR_TOOLTIP_INCREASE_CUSTOM_CURRENCY_TO_EURO),
+ NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, CUSTCURR_YEAR_DOWN), SetMinimalSize(10, 9), SetDataTip(STR_BLACK_SMALL_ARROW_LEFT, STR_TOOLTIP_DECREASE_CUSTOM_CURRENCY_TO_EURO),
+ NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, CUSTCURR_YEAR_UP), SetMinimalSize(10, 9), SetDataTip(STR_BLACK_SMALL_ARROW_RIGHT, STR_TOOLTIP_INCREASE_CUSTOM_CURRENCY_TO_EURO),
NWidget(NWID_SPACER), SetMinimalSize(5, 0),
NWidget(WWT_TEXT, COLOUR_BLUE, CUSTCURR_YEAR), SetMinimalSize(193, 9), SetDataTip(STR_CURRENCY_SWITCH_TO_EURO, STR_TOOLTIP_SET_CUSTOM_CURRENCY_TO_EURO),
NWidget(NWID_SPACER), SetFill(1, 0),
diff --git a/src/signs_gui.cpp b/src/signs_gui.cpp
index e9f1c85d9..d83908cf6 100644
--- a/src/signs_gui.cpp
+++ b/src/signs_gui.cpp
@@ -356,8 +356,8 @@ static const Widget _query_sign_edit_widgets[] = {
{ WWT_TEXTBTN, RESIZE_NONE, COLOUR_GREY, 61, 120, 30, 41, STR_QUERY_CANCEL, STR_NULL }, // QUERY_EDIT_SIGN_WIDGET_CANCEL
{ WWT_TEXTBTN, RESIZE_NONE, COLOUR_GREY, 121, 180, 30, 41, STR_TOWN_VIEW_DELETE_BUTTON, STR_NULL }, // QUERY_EDIT_SIGN_WIDGET_DELETE
{ WWT_PANEL, RESIZE_NONE, COLOUR_GREY, 181, 237, 30, 41, STR_NULL, STR_NULL }, // QUERY_EDIT_SIGN_WIDGET_FILL
-{ WWT_TEXTBTN, RESIZE_NONE, COLOUR_GREY, 238, 248, 30, 41, STR_ARROW_LEFT_SMALL, STR_PREVIOUS_SIGN_TOOLTIP }, // QUERY_EDIT_SIGN_WIDGET_PREVIOUS
-{ WWT_TEXTBTN, RESIZE_NONE, COLOUR_GREY, 249, 259, 30, 41, STR_ARROW_RIGHT_SMALL, STR_NEXT_SIGN_TOOLTIP }, // QUERY_EDIT_SIGN_WIDGET_NEXT
+{ WWT_TEXTBTN, RESIZE_NONE, COLOUR_GREY, 238, 248, 30, 41, STR_BLACK_SMALL_ARROW_LEFT, STR_PREVIOUS_SIGN_TOOLTIP }, // QUERY_EDIT_SIGN_WIDGET_PREVIOUS
+{ WWT_TEXTBTN, RESIZE_NONE, COLOUR_GREY, 249, 259, 30, 41, STR_BLACK_SMALL_ARROW_RIGHT, STR_NEXT_SIGN_TOOLTIP }, // QUERY_EDIT_SIGN_WIDGET_NEXT
{ WIDGETS_END },
};
@@ -374,8 +374,8 @@ static const NWidgetPart _nested_query_sign_edit_widgets[] = {
NWidget(WWT_TEXTBTN, COLOUR_GREY, QUERY_EDIT_SIGN_WIDGET_CANCEL), SetMinimalSize(60, 12), SetDataTip(STR_QUERY_CANCEL, STR_NULL),
NWidget(WWT_TEXTBTN, COLOUR_GREY, QUERY_EDIT_SIGN_WIDGET_DELETE), SetMinimalSize(60, 12), SetDataTip(STR_TOWN_VIEW_DELETE_BUTTON, STR_NULL),
NWidget(WWT_PANEL, COLOUR_GREY, QUERY_EDIT_SIGN_WIDGET_FILL), SetFill(1, 1), EndContainer(),
- NWidget(WWT_TEXTBTN, COLOUR_GREY, QUERY_EDIT_SIGN_WIDGET_PREVIOUS), SetMinimalSize(11, 12), SetDataTip(STR_ARROW_LEFT_SMALL, STR_PREVIOUS_SIGN_TOOLTIP),
- NWidget(WWT_TEXTBTN, COLOUR_GREY, QUERY_EDIT_SIGN_WIDGET_NEXT), SetMinimalSize(11, 12), SetDataTip(STR_ARROW_RIGHT_SMALL, STR_NEXT_SIGN_TOOLTIP),
+ NWidget(WWT_TEXTBTN, COLOUR_GREY, QUERY_EDIT_SIGN_WIDGET_PREVIOUS), SetMinimalSize(11, 12), SetDataTip(STR_BLACK_SMALL_ARROW_LEFT, STR_PREVIOUS_SIGN_TOOLTIP),
+ NWidget(WWT_TEXTBTN, COLOUR_GREY, QUERY_EDIT_SIGN_WIDGET_NEXT), SetMinimalSize(11, 12), SetDataTip(STR_BLACK_SMALL_ARROW_RIGHT, STR_NEXT_SIGN_TOOLTIP),
EndContainer(),
};
diff --git a/src/station_gui.cpp b/src/station_gui.cpp
index 6656428a0..ac0eaf51b 100644
--- a/src/station_gui.cpp
+++ b/src/station_gui.cpp
@@ -591,7 +591,7 @@ GUIStationList::SortFunction * const CompanyStationsWindow::sorter_funcs[] = {
/* Names of the sorting functions */
const StringID CompanyStationsWindow::sorter_names[] = {
- STR_SORT_BY_DROPDOWN_NAME,
+ STR_SORT_BY_NAME,
STR_SORT_BY_FACILITY,
STR_SORT_BY_WAITING,
STR_SORT_BY_RATING_MAX,
diff --git a/src/statusbar_gui.cpp b/src/statusbar_gui.cpp
index 20dcefb6d..72610a026 100644
--- a/src/statusbar_gui.cpp
+++ b/src/statusbar_gui.cpp
@@ -98,7 +98,7 @@ struct StatusBarWindow : Window {
this->DrawWidgets();
SetDParam(0, _date);
- DrawString(this->widget[SBW_LEFT].left + 1, this->widget[SBW_LEFT].right - 1, 1, (_pause_mode || _settings_client.gui.status_long_date) ? STR_DATE_LONG_WHITE : STR_DATE_SHORT_WHITE, TC_FROMSTRING, SA_CENTER);
+ DrawString(this->widget[SBW_LEFT].left + 1, this->widget[SBW_LEFT].right - 1, 1, (_pause_mode || _settings_client.gui.status_long_date) ? STR_WHITE_DATE_LONG : STR_WHITE_DATE_SHORT, TC_FROMSTRING, SA_CENTER);
if (c != NULL) {
/* Draw company money */
diff --git a/src/timetable_gui.cpp b/src/timetable_gui.cpp
index a02dd696a..f2a9d4965 100644
--- a/src/timetable_gui.cpp
+++ b/src/timetable_gui.cpp
@@ -282,7 +282,7 @@ struct TimetableWindow : Window {
if (time != 0) {
SetDParam(0, time);
- current = STR_CONFIG_SETTING_INT32;
+ current = STR_JUST_INT;
}
}
diff --git a/src/toolbar_gui.cpp b/src/toolbar_gui.cpp
index ec447a1e9..7296ae1a3 100644
--- a/src/toolbar_gui.cpp
+++ b/src/toolbar_gui.cpp
@@ -132,7 +132,7 @@ public:
void Draw(int left, int right, int top, int bottom, bool sel, int bg_colour) const
{
if (checked) {
- DrawString(left + 2, right - 2, top, STR_CHECKMARK, sel ? TC_WHITE : TC_BLACK);
+ DrawString(left + 2, right - 2, top, STR_JUST_CHECKMARK, sel ? TC_WHITE : TC_BLACK);
}
DrawString(left + 2, right - 2, top, this->String(), sel ? TC_WHITE : TC_BLACK);
}
@@ -1248,7 +1248,7 @@ public:
this->DrawWidgets();
SetDParam(0, ConvertYMDToDate(_settings_game.game_creation.starting_year, 0, 1));
- DrawString(this->widget[TBSE_DATEBACKWARD].right, this->widget[TBSE_DATEFORWARD].left, 6, STR_DATE_LONG_WHITE, TC_FROMSTRING, SA_CENTER);
+ DrawString(this->widget[TBSE_DATEBACKWARD].right, this->widget[TBSE_DATEFORWARD].left, 6, STR_WHITE_DATE_LONG, TC_FROMSTRING, SA_CENTER);
/* We hide this panel when the toolbar space gets too small */
const Widget *panel = &this->widget[TBSE_SPACERPANEL];
diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp
index 1ba7779e7..3d9724a9c 100644
--- a/src/vehicle_gui.cpp
+++ b/src/vehicle_gui.cpp
@@ -69,7 +69,7 @@ GUIVehicleList::SortFunction * const BaseVehicleListWindow::vehicle_sorter_funcs
const StringID BaseVehicleListWindow::vehicle_sorter_names[] = {
STR_SORT_BY_NUMBER,
- STR_SORT_BY_DROPDOWN_NAME,
+ STR_SORT_BY_NAME,
STR_SORT_BY_AGE,
STR_SORT_BY_PROFIT_THIS_YEAR,
STR_SORT_BY_PROFIT_LAST_YEAR,
@@ -748,7 +748,7 @@ static void DrawSmallOrderList(const Vehicle *v, int left, int right, int y)
sel = v->cur_order_index;
FOR_VEHICLE_ORDERS(v, order) {
- if (sel == 0) DrawString(left - 6, left, y, STR_SMALL_RIGHT_ARROW, TC_BLACK);
+ if (sel == 0) DrawString(left - 6, left, y, STR_TINY_RIGHT_ARROW, TC_BLACK);
sel--;
if (order->IsType(OT_GOTO_STATION)) {
@@ -813,7 +813,7 @@ void BaseVehicleListWindow::DrawVehicleListItems(int x, VehicleID selected_vehic
if (this->resize.step_height == PLY_WND_PRC__SIZE_OF_ROW_BIG) DrawSmallOrderList(v, x + 138, this->widget[VLW_WIDGET_LIST].right, y);
if (v->IsInDepot()) {
- str = STR_BLUE_NUMBER;
+ str = STR_BLUE_COMMA;
} else {
str = (v->age > v->max_age - DAYS_IN_LEAP_YEAR) ? STR_RED_COMMA : STR_BLACK_COMMA;
}
@@ -1201,8 +1201,8 @@ static const Widget _vehicle_details_widgets[] = {
{ WWT_PUSHTXTBTN, RESIZE_LR, COLOUR_GREY, 353, 392, 0, 13, STR_VEHICLE_NAME_BUTTON, STR_NULL /* filled in later */}, // VLD_WIDGET_RENAME_VEHICLE
{ WWT_STICKYBOX, RESIZE_LR, COLOUR_GREY, 393, 404, 0, 13, STR_NULL, STR_STICKY_BUTTON}, // VLD_WIDGET_STICKY
{ WWT_PANEL, RESIZE_RIGHT, COLOUR_GREY, 0, 404, 14, 55, 0x0, STR_NULL}, // VLD_WIDGET_TOP_DETAILS
- { WWT_PUSHTXTBTN, RESIZE_TB, COLOUR_GREY, 0, 10, 101, 106, STR_SMALL_ARROW_UP, STR_VEHICLE_DETAILS_INCREASE_SERVICING_INTERVAL_TOOLTIP}, // VLD_WIDGET_INCREASE_SERVICING_INTERVAL
- { WWT_PUSHTXTBTN, RESIZE_TB, COLOUR_GREY, 0, 10, 107, 112, STR_SMALL_ARROW_DOWN, STR_VEHICLE_DETAILS_DECREASE_SERVICING_INTERVAL_TOOLTIP}, // VLD_WIDGET_DECREASE_SERVICING_INTERVAL
+ { WWT_PUSHTXTBTN, RESIZE_TB, COLOUR_GREY, 0, 10, 101, 106, STR_BLACK_SMALL_ARROW_UP, STR_VEHICLE_DETAILS_INCREASE_SERVICING_INTERVAL_TOOLTIP}, // VLD_WIDGET_INCREASE_SERVICING_INTERVAL
+ { WWT_PUSHTXTBTN, RESIZE_TB, COLOUR_GREY, 0, 10, 107, 112, STR_BLACK_SMALL_ARROW_DOWN, STR_VEHICLE_DETAILS_DECREASE_SERVICING_INTERVAL_TOOLTIP}, // VLD_WIDGET_DECREASE_SERVICING_INTERVAL
{ WWT_PANEL, RESIZE_RTB, COLOUR_GREY, 11, 404, 101, 112, 0x0, STR_NULL}, // VLD_WIDGET_BOTTOM_RIGHT
{ WWT_MATRIX, RESIZE_RB, COLOUR_GREY, 0, 392, 56, 100, 0x701, STR_NULL}, // VLD_WIDGET_MIDDLE_DETAILS
{ WWT_SCROLLBAR, RESIZE_LRB, COLOUR_GREY, 393, 404, 56, 100, 0x0, STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST}, // VLD_WIDGET_SCROLLBAR
@@ -1228,8 +1228,8 @@ static const NWidgetPart _nested_vehicle_details_widgets[] = {
EndContainer(),
NWidget(NWID_HORIZONTAL),
NWidget(NWID_VERTICAL),
- NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, VLD_WIDGET_INCREASE_SERVICING_INTERVAL), SetMinimalSize(11, 6), SetDataTip(STR_SMALL_ARROW_UP, STR_VEHICLE_DETAILS_INCREASE_SERVICING_INTERVAL_TOOLTIP),
- NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, VLD_WIDGET_DECREASE_SERVICING_INTERVAL), SetMinimalSize(11, 6), SetDataTip(STR_SMALL_ARROW_DOWN, STR_VEHICLE_DETAILS_DECREASE_SERVICING_INTERVAL_TOOLTIP),
+ NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, VLD_WIDGET_INCREASE_SERVICING_INTERVAL), SetMinimalSize(11, 6), SetDataTip(STR_BLACK_SMALL_ARROW_UP, STR_VEHICLE_DETAILS_INCREASE_SERVICING_INTERVAL_TOOLTIP),
+ NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, VLD_WIDGET_DECREASE_SERVICING_INTERVAL), SetMinimalSize(11, 6), SetDataTip(STR_BLACK_SMALL_ARROW_DOWN, STR_VEHICLE_DETAILS_DECREASE_SERVICING_INTERVAL_TOOLTIP),
EndContainer(),
NWidget(WWT_PANEL, COLOUR_GREY, VLD_WIDGET_BOTTOM_RIGHT), SetFill(1, 1), SetResize(1, 0), EndContainer(),
EndContainer(),
diff --git a/src/widget.cpp b/src/widget.cpp
index 9e5c3b988..700d59ee9 100644
--- a/src/widget.cpp
+++ b/src/widget.cpp
@@ -552,12 +552,12 @@ static inline void DrawDropdown(const Rect &r, Colours colour, bool clicked, Str
if (_dynlang.text_dir == TD_LTR) {
DrawFrameRect(r.left, r.top, r.right - 12, r.bottom, colour, FR_NONE);
DrawFrameRect(r.right - 11, r.top, r.right, r.bottom, colour, clicked ? FR_LOWERED : FR_NONE);
- DrawString(r.right - (clicked ? 10 : 11), r.right, r.top + (clicked ? 2 : 1), STR_ARROW_DOWN, TC_BLACK, SA_CENTER);
+ DrawString(r.right - (clicked ? 10 : 11), r.right, r.top + (clicked ? 2 : 1), STR_BLACK_ARROW_DOWN, TC_FROMSTRING, SA_CENTER);
if (str != STR_NULL) DrawString(r.left + WD_DROPDOWNTEXT_LEFT, r.right - WD_DROPDOWNTEXT_RIGHT, r.top + WD_DROPDOWNTEXT_TOP, str, TC_BLACK);
} else {
DrawFrameRect(r.left + 12, r.top, r.right, r.bottom, colour, FR_NONE);
DrawFrameRect(r.left, r.top, r.left + 11, r.bottom, colour, clicked ? FR_LOWERED : FR_NONE);
- DrawString(r.left + clicked, r.left + 11, r.top + (clicked ? 2 : 1), STR_ARROW_DOWN, TC_BLACK, SA_CENTER);
+ DrawString(r.left + clicked, r.left + 11, r.top + (clicked ? 2 : 1), STR_BLACK_ARROW_DOWN, TC_FROMSTRING, SA_CENTER);
if (str != STR_NULL) DrawString(r.left + WD_DROPDOWNTEXT_RIGHT, r.right - WD_DROPDOWNTEXT_LEFT, r.top + WD_DROPDOWNTEXT_TOP, str, TC_BLACK);
}
}