(svn r16932) -Update from WebTranslator v3.0:

all languages - update for latest commits which moved around lots of strings
dutch - 5 changes by Yexo
norwegian_bokmal - 1 changes by CyberKenny
romanian - 1 changes by kkmic
spanish - 1 changes by Terkhen

51 files changed, 10126 insertions, 8349 deletions

diff --git a/src/lang/afrikaans.txt b/src/lang/afrikaans.txt
index dc7d3ce89..36543e14b 100644
--- a/src/lang/afrikaans.txt
+++ b/src/lang/afrikaans.txt
@@ -155,8 +155,6 @@ STR_ABBREV_PLASTIC                                              :{TINYFONT}PL
 STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}KD
 STR_ABBREV_NONE                                                 :{TINYFONT}NS
 STR_ABBREV_ALL                                                  :{TINYFONT}ALMAL
-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
@@ -168,17 +166,11 @@ STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Oorspron
 STR_ABOUT_VERSION                                               :{BLACK}OpenTTD uitgawe {REV}
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 Die OpenTTD span
 
-STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
-STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_QUIT_CAPTION                                                :{WHITE}Verlaat
 STR_YES                                                         :{BLACK}Ja
 STR_NO                                                          :{BLACK}Nee
 STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Is u seker u wil OpenTTD verlaat en terug keer na {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                                                :Niks
 STR_COLOUR_DARK_BLUE                                            :Donker Blou
 STR_COLOUR_PALE_GREEN                                           :Vaal Groen
@@ -197,8 +189,6 @@ STR_COLOUR_BROWN                                                :Bruin
 STR_COLOUR_GREY                                                 :Grys
 STR_COLOUR_WHITE                                                :Wit
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}Te veel voertuie in spel
-STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
-STR_RED_COMMA                                                   :{RED}{COMMA}
 STR_BUTTON_LOCATION                                             :{BLACK}Lokasie
 STR_SMALLMAP_TYPE_CONTOURS                                      :Kontoere
 STR_SMALLMAP_TYPE_VEHICLES                                      :Voertuie
@@ -324,12 +314,13 @@ STR_SORT_CRITERIA_TIP                                           :{BLACK}Selektee
 STR_FILTER_CRITERIA_TIP                                         :{BLACK}Selekteer filtrering kriteria
 STR_SORT_BY                                                     :{BLACK}Sorteer by
 
+### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}Populasie
+STR_SORT_BY_NAME                                                :{BLACK}Naam
+STR_SORT_BY_DATE                                                :{BLACK}Datum
 STR_SORT_BY_PRODUCTION                                          :Produksie
 STR_SORT_BY_TYPE                                                :Tipe
 STR_SORT_BY_TRANSPORTED                                         :Vervoer
-STR_SORT_BY_NAME                                                :{BLACK}Naam
-STR_SORT_BY_DATE                                                :{BLACK}Datum
 STR_SORT_BY_NUMBER                                              :Nommer
 STR_SORT_BY_PROFIT_LAST_YEAR                                    :Profyt verlede jaar
 STR_SORT_BY_PROFIT_THIS_YEAR                                    :Profyt die jaar
@@ -352,37 +343,25 @@ STR_SORT_BY_INTRO_DATE                                          :Inleiding Datum
 STR_SORT_BY_RUNNING_COST                                        :Loopkoste
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :Krag/Loopkoste
 STR_SORT_BY_CARGO_CAPACITY                                      :Vrag Kapasiteit
+
 STR_NO_WAITING_CARGO                                            :{BLACK}Geen vrag van enige tipe is op wag
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}Kies alle fakulteite
 STR_SELECT_ALL_TYPES                                            :{BLACK}Kies alle vrag tipes (geen wag vrag ingesluit)
-STR_AVAILABLE_TRAINS                                            :{BLACK}Beskikbaar Treine
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Beskikbaar Voertuie
-STR_AVAILABLE_SHIPS                                             :{BLACK}Beskikbaar Skepe
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Beskikbaar Vliegtuie
 STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Toon 'n lys van beskikbaare enjin tipes vir die voertiug tipe.
 STR_MANAGE_LIST                                                 :{BLACK}Bestuur lys
 STR_MANAGE_LIST_TIP                                             :{BLACK}Stuur instruksies na alle voertuie in die lys
 STR_REPLACE_VEHICLES                                            :Vervang voertuie
+STR_SEND_FOR_SERVICING                                          :Stuur vir Diens
+
+STR_AVAILABLE_TRAINS                                            :{BLACK}Beskikbaar Treine
+STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Beskikbaar Voertuie
+STR_AVAILABLE_SHIPS                                             :{BLACK}Beskikbaar Skepe
+STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Beskikbaar Vliegtuie
+
 STR_SEND_TRAIN_TO_DEPOT                                         :Stuur na Depot
 STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Stuur na Depot
 STR_SEND_SHIP_TO_DEPOT                                          :Stuur na Depot
 STR_SEND_AIRCRAFT_TO_HANGAR                                     :Stuur na Hangar
-STR_SEND_FOR_SERVICING                                          :Stuur vir Diens
-
-############ range for months starts
-STR_MONTH_ABBREV_JAN                                            :Jan
-STR_MONTH_ABBREV_FEB                                            :Feb
-STR_MONTH_ABBREV_MAR                                            :Mrt
-STR_MONTH_ABBREV_APR                                            :Apr
-STR_MONTH_ABBREV_MAY                                            :Mei
-STR_MONTH_ABBREV_JUN                                            :Jun
-STR_MONTH_ABBREV_JUL                                            :Jul
-STR_MONTH_ABBREV_AUG                                            :Aug
-STR_MONTH_ABBREV_SEP                                            :Sep
-STR_MONTH_ABBREV_OCT                                            :Okt
-STR_MONTH_ABBREV_NOV                                            :Nov
-STR_MONTH_ABBREV_DEC                                            :Des
-############ range for months ends
 
 STR_GRAPH_X_LABEL_MONTH                                         :{TINYFONT}{STRING}{} {STRING}
 STR_GRAPH_X_LABEL_MONTH_YEAR                                    :{TINYFONT}{STRING}{} {STRING}{}{NUM}
@@ -410,8 +389,6 @@ 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_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
@@ -457,7 +434,7 @@ STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Geen
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Naam
 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                                          :1ste
 STR_ORDINAL_NUMBER_2ND                                          :2de
 STR_ORDINAL_NUMBER_3RD                                          :3de
@@ -491,6 +468,34 @@ STR_ORDINAL_NUMBER_30TH                                         :30ste
 STR_ORDINAL_NUMBER_31ST                                         :31ste
 ############ range for days ends
 
+############ range for months starts
+STR_MONTH_ABBREV_JAN                                            :Jan
+STR_MONTH_ABBREV_FEB                                            :Feb
+STR_MONTH_ABBREV_MAR                                            :Mrt
+STR_MONTH_ABBREV_APR                                            :Apr
+STR_MONTH_ABBREV_MAY                                            :Mei
+STR_MONTH_ABBREV_JUN                                            :Jun
+STR_MONTH_ABBREV_JUL                                            :Jul
+STR_MONTH_ABBREV_AUG                                            :Aug
+STR_MONTH_ABBREV_SEP                                            :Sep
+STR_MONTH_ABBREV_OCT                                            :Okt
+STR_MONTH_ABBREV_NOV                                            :Nov
+STR_MONTH_ABBREV_DEC                                            :Des
+
+STR_MONTH_JAN                                                   :Januarie
+STR_MONTH_FEB                                                   :Februarie
+STR_MONTH_MAR                                                   :Maart
+STR_MONTH_APR                                                   :April
+STR_MONTH_MAY                                                   :Mei
+STR_MONTH_JUN                                                   :Junie
+STR_MONTH_JUL                                                   :Julie
+STR_MONTH_AUG                                                   :Augustus
+STR_MONTH_SEP                                                   :September
+STR_MONTH_OCT                                                   :Oktober
+STR_MONTH_NOV                                                   :November
+STR_MONTH_DEC                                                   :Desember
+############ range for months ends
+
 STR_GRAPH_Y_LABEL_NUMBER                                        :{TINYFONT}{COMMA}
 
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}Vrag aangeneem: {LTBLUE}
@@ -580,12 +585,9 @@ 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_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_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
@@ -661,9 +663,7 @@ STR_OFF                                                         :Af
 STR_SUMMARY                                                     :Opsomming
 STR_FULL                                                        :Vol
 STR_STATUSBAR_COMPANY_NAME                                      :{SILVER}- -  {COMPANY}  - -
-STR_BLACK_STRING                                                :{BLACK}{STRING}
 
-STR_JUST_CHECKMARK                                              :{CHECKMARK}
 ############ range for menu starts
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Speletjie opsies
 STR_SETTINGS_MENU_DIFFICULTY_SETTINGS                           :Moelikheid stellings
@@ -753,9 +753,6 @@ STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY                             :Konsolideer nuw
 ############ range ends here
 
 STR_FUND_INDUSTRY_CAPTION                                       :{WHITE}Konsolideer nuwe nywerheid
-STR_JUST_STRING                                                 :{STRING}
-STR_JUST_RAW_STRING                                             :{STRING}
-STR_JUST_INT                                                    :{NUM}
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_RAINFOREST                       :{WHITE}...kan slegs in reenwoud gebiede gebou word
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT                           :{WHITE}...kan slegs in woestyn gebiede gebou word
 STR_STATUSBAR_PAUSED                                            :{YELLOW}* *  STIL  *  *
@@ -769,9 +766,6 @@ 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_BLACK_6                                                     :{BLACK}6
-STR_BLACK_7                                                     :{BLACK}7
-
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Engels (Oorspronkilik)
 STR_TOWNNAME_FRENCH                                             :Frans
@@ -850,19 +844,6 @@ STR_OPTIONS_BASE_GRF_DESCRIPTION_TIP                            :{BLACK}Addision
 
 STR_AUTOSAVE_FAILED                                             :{WHITE}Outostoor het misluk
 
-STR_MONTH_JAN                                                   :Januarie
-STR_MONTH_FEB                                                   :Februarie
-STR_MONTH_MAR                                                   :Maart
-STR_MONTH_APR                                                   :April
-STR_MONTH_MAY                                                   :Mei
-STR_MONTH_JUN                                                   :Junie
-STR_MONTH_JUL                                                   :Julie
-STR_MONTH_AUG                                                   :Augustus
-STR_MONTH_SEP                                                   :September
-STR_MONTH_OCT                                                   :Oktober
-STR_MONTH_NOV                                                   :November
-STR_MONTH_DEC                                                   :Desember
-
 STR_HEADING_FOR_STATION                                         :{LTBLUE}Op pad na {STATION}
 STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}Op pad na {STATION}, {VELOCITY}
 STR_NO_ORDERS                                                   :{LTBLUE}Geen opdrae
@@ -877,8 +858,6 @@ STR_CRATES                                                      :hokke
 STR_RES_OTHER                                                   :ander
 STR_NOTHING                                                     :
 
-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...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Einde van Gedeel Opdrae - -
@@ -1133,7 +1112,6 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Y-groot
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :gestrem
-STR_JUST_CURRENCY                                               :{CURRENCY}
 STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Verander stel waarde
 
 STR_TEMPERATE_LANDSCAPE                                         :Magtig landskap
@@ -1169,7 +1147,6 @@ STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}Kies weg
 
 STR_WAYPOINT_VIEWPORT                                           :{WHITE}{WAYPOINT}
 STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WHITE}{WAYPOINT}
-STR_WAYPOINT_NAME                                               :{WAYPOINT}
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Redigeer wegpunt naam
 
 STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}Kan nie wegpunt naam verander nie...
@@ -1235,11 +1212,6 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Nywerhei
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...te naby aan 'n ander nywerheid
 
-STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Herstel trein om 'n ander vrag tipe te ontvoer
-STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Herstel trein
-STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Kies vrag tipe vir trein te ontvoer
-STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Herstel trein om verlig vrag tipe te ontvoer
-STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}kan nie trein herstel nie...
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Verander produksie
 
 ############ network gui strings
@@ -1734,11 +1706,6 @@ STR_TOWN_BUILDING_NAME_TEPEES_1                                 :Tepees
 STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1                           :Teepot-Huis
 STR_TOWN_BUILDING_NAME_PIGGY_BANK_1                             :Varkie-Bank
 
-STR_INDUSTRY_NAME                                               :{INDUSTRY}
-STR_TOWN_NAME                                                   :{TOWN}
-STR_FORMAT_INDUSTRY_NAME                                        :{TOWN} {STRING}
-STR_STATION_NAME                                                :{STATION}
-
 ##id 0x2800
 STR_LANDSCAPING_MENU_LANDSCAPING                                :Landargitekteur
 STR_LANDSCAPING_MENU_PLANT_TREES                                :Boome beplant
@@ -1793,6 +1760,12 @@ STR_CARGO_RATING_EXCELLENT                                      :Uitsteekent
 STR_CARGO_RATING_OUTSTANDING                                    :Treffend
 ############ range for rating ends
 
+### station view strings
+STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Toon alle treine wat hierdie stasie op hul skedule het
+STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Toon alle pad voertuie wat hierdie stasie op hul skedule het
+STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Toon alle vliegtuie wat hierdie stasie op hul skedule het
+STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Toon alle skepe wat hierdie stasie op hul skedule het
+
 STR_STATION_VIEW_CARGO_RATING                                   :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO                        :{WHITE}{STATION} aanvaar nie meer {STRING} nie
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO               :{WHITE}{STATION} aanvaar nie meer {STRING} of {STRING} nie
@@ -2036,6 +2009,7 @@ STR_SV_STNAME_AIRPORT                                           :{STRING} Lughaw
 STR_SV_STNAME_OILFIELD                                          :{STRING} Olieveld
 STR_SV_STNAME_MINES                                             :{STRING} Myne
 STR_SV_STNAME_DOCKS                                             :{STRING} Werfe
+##id 0x6020
 STR_SV_STNAME_ANNEXE                                            :{STRING} Anneks
 STR_SV_STNAME_SIDINGS                                           :{STRING} Wisselspoore
 STR_SV_STNAME_BRANCH                                            :{STRING} Tak
@@ -2083,8 +2057,6 @@ STR_NUM_LOW                                                     :Laag
 STR_NUM_NORMAL                                                  :Normaal
 STR_NUM_HIGH                                                    :Hoog
 STR_NUM_CUSTOM                                                  :Bestelling
-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
@@ -2117,7 +2089,6 @@ STR_CITY_APPROVAL_HOSTILE                                       :Vyandelik
 
 ##id 0x7000
 STR_COMPANY_VIEW_CAPTION                                        :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
-STR_FORMAT_COMPANY_NUM                                          :(Company {COMMA})
 STR_COMPANY_VIEW_NEW_FACE_BUTTON                                :{BLACK}Nuwe Gesig
 STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON                           :{BLACK}Kleur Skema
 STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}Kleur Skema
@@ -2150,7 +2121,6 @@ STR_FINANCES_TOTAL_CAPTION                                      :{WHITE}Totaal:
 STR_COMPANY_NAME_COMPANY_NUM                                    :{COMPANY} {COMPANYNUM}
 STR_GRAPH_INCOME_CAPTION                                        :{WHITE}Inkome Grafiek
 STR_CURRCOMPACT                                                 :{CURRCOMPACT}
-STR_JUST_COMMA                                                  :{COMMA}
 STR_GRAPH_OPERATING_PROFIT_CAPTION                              :{WHITE}Bediening Profyt Grafiek
 STR_FINANCES_BANK_BALANCE_TITLE                                 :{WHITE}Bank Balans
 STR_FINANCES_LOAN_TITLE                                         :{WHITE}Lening
@@ -2552,10 +2522,8 @@ STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE                          :eenspoor lokomo
 STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE                            :maglev lokomotief
 
 ##id 0x8800
-STR_DEPOT_TRAIN_CAPTION                                         :{WHITE}{TOWN} Trein Depot
 STR_NEWS_FIRST_TRAIN_ARRIVAL                                    :{BLACK}{BIGFONT}Burgers herdenk . . .{}Eerste trein arriveer by {STATION}!
 STR_VEHICLE_DETAILS_CAPTION                                     :{WHITE}{VEHICLE} (Aanwyse)
-STR_ERROR_TRAIN_IN_THE_WAY                                      :{WHITE}Trein in die weg
 STR_ORDER                                                       :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 STR_ORDER_SELECTED                                              :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 STR_ORDER_NON_STOP                                              :{BLACK}Sonder-stop
@@ -2643,37 +2611,16 @@ STR_TIMETABLE_AND_TRAVEL_FOR                                    :en reis vir {ST
 STR_TIMETABLE_DAYS                                              :{COMMA} da{P g e}
 STR_TIMETABLE_TICKS                                             :{COMMA} tick{P "" e}
 
-STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Op pad na {TOWN} Trein Depot
-STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Op pad na {TOWN} Trein Depot, {VELOCITY}
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Diens by {TOWN} Trein Depot
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Diens by {TOWN} Trein Depot, {VELOCITY}
-
 STR_INVALID_ORDER                                               :{RED} (Ongeldig Opdrag)
 
 STR_UNKNOWN_STATION                                             :onbekende stasie
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}Leë
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} vanaf {STATION}
 STR_VEHICLE_DETAILS_CARGO_FROM_MULT                             :{LTBLUE}{CARGO} van {STATION} (x{NUM})
-STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Nuwe Voertuie
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}Trein te lank
 STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}Treine kan slegs verander word as hulle in die depot gestop is
-STR_VEHICLE_LIST_TRAIN_CAPTION                                  :{WHITE}{STRING} - {COMMA} Trein{P "" e}
 
-STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}Nuwe Spoor Voertuie
-STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}Nuwe Elektries Spoor Voertuie
-STR_BUILD_VEHICLE_TRAIN_MONORAIL_CAPTION                        :{WHITE}Nuwe Eenspoor Voertuie
-STR_BUILD_VEHICLE_TRAIN_MAGLEV_CAPTION                          :{WHITE}Nuwe Maglev Voertuie
-STR_BUILD_VEHICLE_TRAIN_ALL_CAPTION                             :{WHITE}Spoorweg Voertuie
-
-STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_BUTTON                    :{BLACK}Bou Voertuig
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Kloon Voertuig
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Dit sal 'n kopie van die pad voertuig bou. Control-kliek sal die opdrae deel
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Dit sal 'n kopie van 'n pad voertuig bou. Kliek die knoppie en dan op 'n pad voertuig binne of buite die depot. Control-kliek sal die opdrae deel
-STR_CLONE_TRAIN                                                 :{BLACK}Kloon Trein
-STR_CLONE_TRAIN_INFO                                            :{BLACK}Dit sa 'n kopie van die trein bou insluitend alle trokke. Control-kliek sal die opdrae deel
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Dit sal 'n kopie van 'n trein bou insluitend alle trokke. Kliek die knoppie en dan op 'n trein binne of buite die depot. Control-kliek sal die opdrae deel
-STR_BUILD_VEHICLE_TRAIN_RENAME_BUTTON                           :{BLACK}Hernoem
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Sprong
 STR_ORDERS_DELETE_BUTTON                                        :{BLACK}Uit vee
 STR_ORDERS_GO_TO_BUTTON                                         :{BLACK}Gaan Na
@@ -2688,14 +2635,12 @@ STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Verander
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Opdrae)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Einde van Opdrae - -
 STR_SERVICE                                                     :{BLACK}Diens
-STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Kan nie spoorweg voertuig bou nie...
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Gebou: {LTBLUE}{NUM}{BLACK} Waarde: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Waarde: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
 STR_VEHICLE_STATUS_LOADING_UNLOADING                            :{LTBLUE}Laai / Aflaai
 STR_VEHICLE_STATUS_LEAVING                                      :{LTBLUE}Verlaat
 STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}Trein moet binne in 'n depot gestop word
-STR_ERROR_CAN_T_SEND_TRAIN_TO_DEPOT                             :{WHITE}Kan nie trein na depot stuur nie...
 STR_ERROR_NO_MORE_SPACE_FOR_ORDERS                              :{WHITE}Geen spasie vir nog opdrae
 STR_ERROR_TOO_MANY_ORDERS                                       :{WHITE}Te veel opdrae
 STR_ERROR_CAN_T_INSERT_NEW_ORDER                                :{WHITE}Kan nie nuwe opdrag invoeg nie...
@@ -2710,26 +2655,11 @@ STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE}'n voert
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}Kan nie voertuig beweeg nie...
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}Die agterste motor sal altyd die voorste motor volg
 STR_CARGO_N_A                                                   :N/A{SKIP}
-STR_ERROR_CAN_T_SELL_TRAIN                                      :{WHITE}Kan nie spoorweg voertuig verkoop nie...
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}Kan nie roete na plaaslike depot vind nie
-STR_ERROR_CAN_T_STOP_START_TRAIN                                :{WHITE}Trein kan nie stop/aanvang word nie...
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}Diens tussentyd: {LTBLUE}{COMMA}dae{BLACK}   Laaste diens: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}Diens tussentyd: {LTBLUE}{COMMA}%{BLACK}   Laaste diens: {LTBLUE}{DATE_LONG}
-STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP                             :{BLACK}Treine - kliek op trein vir informasie
-STR_DEPOT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Treine - kliek op trein vir info., sleep voertuig om te bysit/verwyder van trein
-STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP                            :{BLACK}Bou nuwe trein voertuig
-STR_DEPOT_TRAIN_SELL_TOOLTIP                                    :{BLACK}Sleep trein voertuig hier om dit te verkoop
-STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}Senter skerm op trein depot
-STR_BUILD_VEHICLE_TRAIN_LIST_TOOLTIP                            :{BLACK}Trein voertuig keuse lys - kliek op voertuig vir inligting
-STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_TOOLTIP                   :{BLACK}Bou die verlig trein voertuig
-STR_BUILD_VEHICLE_TRAIN_RENAME_TOOLTIP                          :{BLACK}Hernoem trein voertuig tipe
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP                 :{BLACK}Huidige trein aksie - kliek hier om trein te stop/aanskakel
-STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP                           :{BLACK}Toon trein se opdrae
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP                         :{BLACK}Senter skerm op trein
-STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP                    :{BLACK}Stuur trein na depot. CTRL+kliek sal net diens
 STR_VEHICLE_VIEW_TRAIN_IGNORE_SIGNAL_TOOLTIP                    :{BLACK}Forseer trein om voort te gaan sonder om vir sien die uit te klaar
 STR_VEHICLE_VIEW_TRAIN_REVERSE_TOOLTIP                          :{BLACK}Omkeer rigting van trein
-STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Toon trein besonderhede
 STR_VEHICLE_DETAILS_INCREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Vergroot diens tussentyd
 STR_VEHICLE_DETAILS_DECREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Verminder diens tussentyd
 STR_VEHICLE_DETAILS_TRAIN_CARGO_TOOLTIP                         :{BLACK}Toon besonderhede van vrag gedra
@@ -2750,13 +2680,9 @@ STR_VEHICLE_STATUS_STOPPED                                      :{RED}Gestop
 STR_ERROR_CAN_T_MAKE_TRAIN_PASS_SIGNAL                          :{WHITE}Kan nie trein forseer om sein te vermy op gevaar...
 STR_VEHICLE_STATUS_CRASHED                                      :{RED}Botsing!
 
-STR_QUERY_RENAME_TRAIN_CAPTION                                  :{WHITE}Benaam trein
-STR_ERROR_CAN_T_RENAME_TRAIN                                    :{WHITE}Trein kan nie benaam word nie...
-STR_VEHICLE_DETAILS_TRAIN_RENAME                                :{BLACK}Benaam trein
 STR_NEWS_TRAIN_CRASH                                            :{BLACK}{BIGFONT}Trein Botsing!{}{COMMA} sterf in vuurbol na botsing
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Kan nie rigting van trein omkeer nie...
-STR_QUERY_RENAME_TRAIN_TYPE_CAPTION                             :{WHITE}Hernoem trein voertuig tipe
-STR_ERROR_CAN_T_RENAME_TRAIN_TYPE                               :{WHITE}Trein voertuig tipe kan nie hernoem word nie...
+STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Kan nie voertuie van veel deele draai nie
 STR_CLEAR_TIME                                                  :{BLACK}Reinig Tyd
 STR_RESET_LATENESS                                              :{BLACK}Herstel Laat Teller
 STR_CHANGE_WAYPOINT_NAME                                        :{BLACK}Verander wegpunt name
@@ -2788,176 +2714,53 @@ STR_TIMETABLE_AUTOFILL                                          :{BLACK}Outovul
 STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Vul die tydtabel outomaties in met die waardes van die volgende reis (CTRL-linker muis om die wagtyd te probeer hou)
 
 ##id 0x9000
-STR_ERROR_ROAD_VEHICLE_IN_THE_WAY                               :{WHITE}Pad voertuig in die pad
-STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING} - {COMMA} Pad voert{P uig uie}
-STR_DEPOT_ROAD_VEHICLE_CAPTION                                  :{WHITE}{TOWN} Pad Voertuig Depot
-STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_BUTTON                      :{BLACK}Nuwe Voertuie
-STR_BUILD_VEHICLE_ROAD_VEHICLE_CAPTION                          :{WHITE}Nuwe Pad Voertuie
-STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_BUTTON             :{BLACK}Bou Voertuig
-STR_ERROR_CAN_T_BUILD_ROAD_VEHICLE                              :{WHITE}Kan nie pad voertuig bou nie...
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}...moet gestop binne 'n pad voertuig depot wees
-STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}Kan nie pad voertuig verkoop nie
-STR_ERROR_CAN_T_STOP_START_ROAD_VEHICLE                         :{WHITE}Kani nie pad voertuig stop/aanskakel nie...
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Op pad na {TOWN} Pad Depot
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Op pad na {TOWN} Pad Depot, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Diens by {TOWN} Pad Depot
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Diens by {TOWN} Pad Depot, {VELOCITY}
-STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Kan nie voertuig na depot stuur nie...
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Kan nie plaaslike depot vind nie
-STR_VEHICLE_LIST_ROAD_VEHICLE_TOOLTIP                           :{BLACK}Pad voertuie - kliek op voertuig vir inligting
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP          :{BLACK}Huidige voertuig aksie - kliek hier om voertuig to stop/aanskakel
-STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP                    :{BLACK}Toon voertuig se opdrae
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP                  :{BLACK}Senter skerm op voertuig
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}Stuur voertuig na depot. CTRL+kliek sal net diens
 STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP                   :{BLACK}Forseer voertuig om te draai om
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Wys pad voertuig aanwyse
-STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Voertuie - kliek op voertuig vir inligting
-STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}Bou nuwe pad voertuig
-STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}Sleep pad voertuig hier om dit te verkoop
-STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}Senter skerm op pad voertuig depot
-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_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})
 
-STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Benaam pad voertuig
-STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Pad voertuig kan nie benaam word nie...
-STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Benaam pad voertuig
 STR_NEWS_FIRST_BUS_ARRIVAL                                      :{BLACK}{BIGFONT}Burgers herdenk . . .{}Eerste bus arriveer by {STATION}!
 STR_NEWS_FIRST_TRUCK_ARRIVAL                                    :{BLACK}{BIGFONT}Burgers herdenk . . .{}Eerste trok arriveer by {STATION}!
 STR_NEWS_FIRST_PASSENGER_TRAM_ARRIVAL                           :{BLACK}{BIGFONT}Burgers herdenk . . .{}Eerste passasier trein arriveer by {STATION}!
 STR_NEWS_FIRST_CARGO_TRAM_ARRIVAL                               :{BLACK}{BIGFONT}Burgers herdenk . . .{}Eerste vrag trein arriveer by {STATION}!
 STR_NEWS_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Pad Voertuig Botsing!{}Bestuurder sterf in vuurbol na botsing met trein
 STR_NEWS_ROAD_VEHICLE_CRASH                                     :{BLACK}{BIGFONT}Pad voertuig Botsing!{}{COMMA} sterf in vuurbol na botsing met trein
-STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Kan nie voertuie van veel deele draai nie
-STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Hernoem
-STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Hernoem pad voertuig tipe
-STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Hernoem pad voertuig tipe
-STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Pad voertuig tipe kan nie hernoem word nie...
 
-STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Herpas pad voertuig om 'n ander vrag tipe te ontvoer
-STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Herpas pad voertuig
-STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Herpas pad voertuig om beklemtoonde vrat tipe te ontvoer
-STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Kan nie pad voertuig herpas nie...
-STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Kies vrag tipe vir pad voertuig om te vervoer
 
 ##id 0x9800
 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :Waterweg konstruksie
 STR_WATERWAYS_TOOLBAR_CAPTION                                   :{WHITE}Waterweg konstruksie
 STR_WATERWAYS_TOOLBAR_CAPTION_SE                                :{WHITE}Waterweë
 STR_ERROR_CAN_T_BUILD_DOCK_HERE                                 :{WHITE}Kan nie werf hier bou nie...
-STR_DEPOT_SHIP_CAPTION                                          :{WHITE}{TOWN} Skip Depot
-STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON                              :{BLACK}Nuwe Skepe
-STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - {COMMA} Skeep{P "" e}
-STR_BUILD_VEHICLE_SHIP_CAPTION                                  :{WHITE}Nuwe Skepe
-STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON                     :{BLACK}Bou Skip
-STR_CLONE_SHIP                                                  :{BLACK}Kloon Skip
-STR_CLONE_SHIP_INFO                                             :{BLACK}Dit sal 'n kopie van die skip bou. Control-kliek sal die opdrae deel
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Dit sal 'n kopie van 'n skip bou. Kliek die knoppie en dan op 'n skip binne of buite die depot. Control-kliek sal die opdrae deel
 STR_ERROR_SHIP_MUST_BE_STOPPED_IN_DEPOT                         :{WHITE}Skip moet in 'n depot gestop wees
-STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}Skip kan nie verkoop word nie...
-STR_ERROR_CAN_T_BUILD_SHIP                                      :{WHITE}Kan nie skip bou nie...
-STR_ERROR_SHIP_IN_THE_WAY                                       :{WHITE}Skip in die pad
-STR_ERROR_CAN_T_STOP_START_SHIP                                 :{WHITE}Kan nie skip stop/aanskakel nie
-STR_ERROR_CAN_T_SEND_SHIP_TO_DEPOT                              :{WHITE}Kan nie skip na depot stuur nie...
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Op pad na {TOWN} Skip Depot
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Op pad na {TOWN} Skip Depot, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Diens by {TOWN} Skip Depot
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Diens by {TOWN} Skip Depot, {VELOCITY}
 STR_WATERWAYS_TOOLBAR_BUILD_DOCK_TOOLTIP                        :{BLACK}Bou skip werf
 STR_WATERWAYS_TOOLBAR_BUILD_DEPOT_TOOLTIP                       :{BLACK}Bou skip depot (vir opbou en diens van skepe)
-STR_DEPOT_SHIP_LIST_TOOLTIP                                     :{BLACK}Skepe - kliek op skeep vir inligting
-STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}Bou nuwe skip
-STR_DEPOT_SHIP_SELL_TOOLTIP                                     :{BLACK}Sleep skip hier om dit te verkoop
-STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}Senter skerm op skip depot
-STR_VEHICLE_LIST_SHIP_TOOLTIP                                   :{BLACK}Skepe - kliek op skip vir informasie
-STR_BUILD_VEHICLE_SHIP_LIST_TOOLTIP                             :{BLACK}Skip keuse lys - kliek op skip vir inligting
-STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP                    :{BLACK}Bou die verlig skip
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP                  :{BLACK}Huidige skip aksie - kliek hier om skip te stop/aanskakel
-STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Wys skip se opdrae
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP                          :{BLACK}Senter skerm op skip
-STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}Stuur skip na depot
-STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Wys skip se aanwyse
-STR_VEHICLE_DETAILS_SHIP_RENAME                                 :{BLACK}Benaam skip
 
-STR_QUERY_RENAME_SHIP_CAPTION                                   :{WHITE}Benaam skip
-STR_ERROR_CAN_T_RENAME_SHIP                                     :{WHITE}Kan nie skip benaam nie...
 STR_NEWS_FIRST_SHIP_ARRIVAL                                     :{BLACK}{BIGFONT}Burgers herdenk . . .{}Eerste skip arriveer by {STATION}!
 STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}Plaas baken wat kan as 'n wegpunt gebruik word
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}Kan nie baken hier plaas nie...
 STR_BUILD_AQUEDUCT                                              :{BLACK}Bou akwamaryn
 STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}Kan nie akwamaryn hier bou nie...
-STR_BUILD_VEHICLE_SHIP_RENAME_BUTTON                            :{BLACK}Hernoem
-STR_BUILD_VEHICLE_SHIP_RENAME_TOOLTIP                           :{BLACK}Hernoem skip tipe
-STR_QUERY_RENAME_SHIP_TYPE_CAPTION                              :{WHITE}Hernoem skip tipe
-STR_ERROR_CAN_T_RENAME_SHIP_TYPE                                :{WHITE}Kan nie skip tipe hernoem nie...
-STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}Herstel vrag skip om 'n ander vrag tipe te ontvoer
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (Herstel)
-STR_REFIT_SHIP_REFIT_BUTTON                                     :{BLACK}Herstel skip
-STR_REFIT_SHIP_LIST_TOOLTIP                                     :{BLACK}Kies vrag tipe vir skip te ontvoer
-STR_REFIT_SHIP_REFIT_TOOLTIP                                    :{BLACK}Herstel skip om die verlig vrag tipe te ontvoer
 STR_REFIT_TITLE                                                 :{GOLD}Kies vrag tipe vir skip te ontvoer:
 STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}Nuwe kapasiteit: {GOLD}{CARGO}{}{BLACK}Herstelkoste: {GOLD}{CURRENCY}
-STR_ERROR_CAN_T_REFIT_SHIP                                      :{WHITE}Skip kan nie herstel word nie...
 STR_REFITTABLE                                                  :(herstelbaar)
 
 ##id 0xA000
 STR_TOOLBAR_AIRCRAFT_CAPTION                                    :{WHITE}Lughawe
 STR_ERROR_CAN_T_BUILD_AIRPORT_HERE                              :{WHITE}Lughawe kan nie hier gebou word nie...
-STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}{STATION} Vliegtuig Hangar
-STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON                          :{BLACK}Nuwe Vliegtuig
-STR_CLONE_AIRCRAFT                                              :{BLACK}Kloon Vliegtuig
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Dit sal 'n kopie van die vliegtuig bou. Control-kliek sal die opdrae deel
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Dit sal 'n kopie van 'n vliegtuig bou. Kliek die knoppie en dan op 'n vliegtuig binne of buite die hangar. Control-kliek sal die opdrae deel
-STR_BUILD_VEHICLE_AIRCRAFT_CAPTION                              :{WHITE}Nuwe Vliegtuig
-STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON                 :{BLACK}Bou Vliegtuig
-STR_ERROR_CAN_T_BUILD_AIRCRAFT                                  :{WHITE}Kan nie vliegtuig bou nie...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} Vliegtuie
-STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR                         :{WHITE}Kan nie vlietuig na hangar stuur nie...
-STR_HEADING_FOR_HANGAR                                          :{ORANGE}Op pad na {STATION} Hangar
-STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Op pad na {STATION} Hangar, {VELOCITY}
-STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Diens by {STATION} Hangar
-STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Diens by {STATION} Hangar, {VELOCITY}
-STR_NEWS_AIRCRAFT_IS_WAITING                                    :{WHITE}{VEHICLE} wag in die vliegtuig hangar
-STR_ERROR_AIRCRAFT_IN_THE_WAY                                   :{WHITE}Vliegtuig in die pad
-STR_ERROR_CAN_T_STOP_START_AIRCRAFT                             :{WHITE}Kan nie vliegtuig stop/aanskakel nie...
 STR_ERROR_AIRCRAFT_IS_IN_FLIGHT                                 :{WHITE}Vliegtuig is opvlug
 STR_ERROR_AIRCRAFT_MUST_BE_STOPPED                              :{WHITE}Vliegtuig moet in hangar gestop wees
-STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}Vliegtuig kan nie verkoop word nie...
 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION                          :Lughawe konstruksie
 STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Bou lughawe
-STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP                               :{BLACK}Vliegtuie - kliek op vliegtuig vir informasie
-STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Vliegtuie - kliek op vliegtuig vir informasie
-STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}Bou nuwe vliegtuig
-STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}Sleep vliegtuig hier om dit te verkoop
-STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Senter skerm op hangar
-STR_BUILD_VEHICLE_AIRCRAFT_LIST_TOOLTIP                         :{BLACK}Vliegtuig keuse lys - kliek op vliegtuig vir inligting
-STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_TOOLTIP                :{BLACK}Bou die verlig vliegtuig
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP              :{BLACK}Huidige vliegtuig aksie - kliek hier on vliegtuig te stop/aanskakel
-STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Toon vliegtuig se opdrae
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP                      :{BLACK}Senter skerm op vliegtuig
-STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}Stuur vliegtuig na hangar. CTRL+kliek sal net diens
-STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Toon vliegtuig aanwyse
 
-STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}Benaam vliegtuig
-STR_ERROR_CAN_T_RENAME_AIRCRAFT                                 :{WHITE}Vliegtuig kan nie benaam word nie...
-STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}Benaam vliegtuig
 STR_NEWS_FIRST_AIRCRAFT_ARRIVAL                                 :{BLACK}{BIGFONT}Burgers herdenk . . .{}Eerste vliegtuig arriveer by {STATION}!
 STR_NEWS_AIRCRAFT_CRASH                                         :{BLACK}{BIGFONT}Vliegtuig Botsing!{}{COMMA} stef in die vuurbol by {STATION}
 STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Vliegtuig Ongeluk!{}Vliegtuig het geen petrol nie, {COMMA} sterf in 'n bal van vuur!
 STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
-STR_BUILD_VEHICLE_AIRCRAFT_RENAME_BUTTON                        :{BLACK}Hernoem
-STR_BUILD_VEHICLE_AIRCRAFT_RENAME_TOOLTIP                       :{BLACK}Hernoem vliegtuig tipe
-STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION                          :{WHITE}Hernoem vliegtuig tipe
-STR_ERROR_CAN_T_RENAME_AIRCRAFT_TYPE                            :{WHITE}Kan nie vliegtuig tipe hernoem nie...
-STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Hestel vliegtuig om 'n ander vrag tipe te ontvoer
-STR_REFIT_AIRCRAFT_REFIT_BUTTON                                 :{BLACK}Herstel vliegtuig
-STR_REFIT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Kies vrag tipe vir vliegtuig om te ontvoer
-STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}Herstel vliegtuig om verlig vrag tipe te ontvoer
-STR_ERROR_CAN_T_REFIT_AIRCRAFT                                  :{WHITE}Vliegtuig kan nie herstel word nie...
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Rooster)
 
@@ -3103,15 +2906,222 @@ STR_LORRY                                                       :{BLACK}{LORRY}
 STR_PLANE                                                       :{BLACK}{PLANE}
 STR_SHIP                                                        :{BLACK}{SHIP}
 
+############ Vehicle lists
+STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP                             :{BLACK}Treine - kliek op trein vir informasie
+STR_VEHICLE_LIST_ROAD_VEHICLE_TOOLTIP                           :{BLACK}Pad voertuie - kliek op voertuig vir inligting
+STR_VEHICLE_LIST_SHIP_TOOLTIP                                   :{BLACK}Skepe - kliek op skip vir informasie
+STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP                               :{BLACK}Vliegtuie - kliek op vliegtuig vir informasie
 
-STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Toon alle treine wat hierdie stasie op hul skedule het
-STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Toon alle pad voertuie wat hierdie stasie op hul skedule het
-STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Toon alle vliegtuie wat hierdie stasie op hul skedule het
-STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Toon alle skepe wat hierdie stasie op hul skedule het
+STR_VEHICLE_LIST_TRAIN_CAPTION                                  :{WHITE}{STRING} - {COMMA} Trein{P "" e}
+STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING} - {COMMA} Pad voert{P uig uie}
+STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - {COMMA} Skeep{P "" e}
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} Vliegtuie
 
 STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}Gedeel opdrae van {COMMA} Voertui{P g e}
 STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Toon alle voertuie wat die rooster deel
 
+STR_NEWS_AIRCRAFT_IS_WAITING                                    :{WHITE}{VEHICLE} wag in die vliegtuig hangar
+
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Herstel trein
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Herpas pad voertuig
+STR_REFIT_SHIP_REFIT_BUTTON                                     :{BLACK}Herstel skip
+STR_REFIT_AIRCRAFT_REFIT_BUTTON                                 :{BLACK}Herstel vliegtuig
+
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Herstel trein om verlig vrag tipe te ontvoer
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Herpas pad voertuig om beklemtoonde vrat tipe te ontvoer
+STR_REFIT_SHIP_REFIT_TOOLTIP                                    :{BLACK}Herstel skip om die verlig vrag tipe te ontvoer
+STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}Herstel vliegtuig om verlig vrag tipe te ontvoer
+
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Kies vrag tipe vir trein te ontvoer
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Kies vrag tipe vir pad voertuig om te vervoer
+STR_REFIT_SHIP_LIST_TOOLTIP                                     :{BLACK}Kies vrag tipe vir skip te ontvoer
+STR_REFIT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Kies vrag tipe vir vliegtuig om te ontvoer
+
+STR_DEPOT_TRAIN_CAPTION                                         :{WHITE}{TOWN} Trein Depot
+STR_DEPOT_ROAD_VEHICLE_CAPTION                                  :{WHITE}{TOWN} Pad Voertuig Depot
+STR_DEPOT_SHIP_CAPTION                                          :{WHITE}{TOWN} Skip Depot
+STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}{STATION} Vliegtuig Hangar
+
+STR_VEHICLE_DETAILS_TRAIN_RENAME                                :{BLACK}Benaam trein
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Benaam pad voertuig
+STR_VEHICLE_DETAILS_SHIP_RENAME                                 :{BLACK}Benaam skip
+STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}Benaam vliegtuig
+
+STR_QUERY_RENAME_TRAIN_CAPTION                                  :{WHITE}Benaam trein
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Benaam pad voertuig
+STR_QUERY_RENAME_SHIP_CAPTION                                   :{WHITE}Benaam skip
+STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}Benaam vliegtuig
+
+STR_ERROR_TRAIN_IN_THE_WAY                                      :{WHITE}Trein in die weg
+STR_ERROR_ROAD_VEHICLE_IN_THE_WAY                               :{WHITE}Pad voertuig in die pad
+STR_ERROR_SHIP_IN_THE_WAY                                       :{WHITE}Skip in die pad
+STR_ERROR_AIRCRAFT_IN_THE_WAY                                   :{WHITE}Vliegtuig in die pad
+
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}kan nie trein herstel nie...
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Kan nie pad voertuig herpas nie...
+STR_ERROR_CAN_T_REFIT_SHIP                                      :{WHITE}Skip kan nie herstel word nie...
+STR_ERROR_CAN_T_REFIT_AIRCRAFT                                  :{WHITE}Vliegtuig kan nie herstel word nie...
+
+STR_ERROR_CAN_T_RENAME_TRAIN                                    :{WHITE}Trein kan nie benaam word nie...
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Pad voertuig kan nie benaam word nie...
+STR_ERROR_CAN_T_RENAME_SHIP                                     :{WHITE}Kan nie skip benaam nie...
+STR_ERROR_CAN_T_RENAME_AIRCRAFT                                 :{WHITE}Vliegtuig kan nie benaam word nie...
+
+STR_ERROR_CAN_T_STOP_START_TRAIN                                :{WHITE}Trein kan nie stop/aanvang word nie...
+STR_ERROR_CAN_T_STOP_START_ROAD_VEHICLE                         :{WHITE}Kani nie pad voertuig stop/aanskakel nie...
+STR_ERROR_CAN_T_STOP_START_SHIP                                 :{WHITE}Kan nie skip stop/aanskakel nie
+STR_ERROR_CAN_T_STOP_START_AIRCRAFT                             :{WHITE}Kan nie vliegtuig stop/aanskakel nie...
+
+STR_ERROR_CAN_T_SEND_TRAIN_TO_DEPOT                             :{WHITE}Kan nie trein na depot stuur nie...
+STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Kan nie voertuig na depot stuur nie...
+STR_ERROR_CAN_T_SEND_SHIP_TO_DEPOT                              :{WHITE}Kan nie skip na depot stuur nie...
+STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR                         :{WHITE}Kan nie vlietuig na hangar stuur nie...
+
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Kan nie spoorweg voertuig bou nie...
+STR_ERROR_CAN_T_BUILD_ROAD_VEHICLE                              :{WHITE}Kan nie pad voertuig bou nie...
+STR_ERROR_CAN_T_BUILD_SHIP                                      :{WHITE}Kan nie skip bou nie...
+STR_ERROR_CAN_T_BUILD_AIRCRAFT                                  :{WHITE}Kan nie vliegtuig bou nie...
+
+STR_ERROR_CAN_T_RENAME_TRAIN_TYPE                               :{WHITE}Trein voertuig tipe kan nie hernoem word nie...
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Pad voertuig tipe kan nie hernoem word nie...
+STR_ERROR_CAN_T_RENAME_SHIP_TYPE                                :{WHITE}Kan nie skip tipe hernoem nie...
+STR_ERROR_CAN_T_RENAME_AIRCRAFT_TYPE                            :{WHITE}Kan nie vliegtuig tipe hernoem nie...
+
+STR_ERROR_CAN_T_SELL_TRAIN                                      :{WHITE}Kan nie spoorweg voertuig verkoop nie...
+STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}Kan nie pad voertuig verkoop nie
+STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}Skip kan nie verkoop word nie...
+STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}Vliegtuig kan nie verkoop word nie...
+
+STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP                 :{BLACK}Huidige trein aksie - kliek hier om trein te stop/aanskakel
+STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP          :{BLACK}Huidige voertuig aksie - kliek hier om voertuig to stop/aanskakel
+STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP                  :{BLACK}Huidige skip aksie - kliek hier om skip te stop/aanskakel
+STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP              :{BLACK}Huidige vliegtuig aksie - kliek hier on vliegtuig te stop/aanskakel
+
+STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP                           :{BLACK}Toon trein se opdrae
+STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP                    :{BLACK}Toon voertuig se opdrae
+STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Wys skip se opdrae
+STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Toon vliegtuig se opdrae
+
+STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP                         :{BLACK}Senter skerm op trein
+STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP                  :{BLACK}Senter skerm op voertuig
+STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP                          :{BLACK}Senter skerm op skip
+STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP                      :{BLACK}Senter skerm op vliegtuig
+
+STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP                    :{BLACK}Stuur trein na depot. CTRL+kliek sal net diens
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}Stuur voertuig na depot. CTRL+kliek sal net diens
+STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}Stuur skip na depot
+STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}Stuur vliegtuig na hangar. CTRL+kliek sal net diens
+
+STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Toon trein besonderhede
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Wys pad voertuig aanwyse
+STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Wys skip se aanwyse
+STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Toon vliegtuig aanwyse
+
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Herstel trein om 'n ander vrag tipe te ontvoer
+STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Herpas pad voertuig om 'n ander vrag tipe te ontvoer
+STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}Herstel vrag skip om 'n ander vrag tipe te ontvoer
+STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Hestel vliegtuig om 'n ander vrag tipe te ontvoer
+
+STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Op pad na {TOWN} Trein Depot
+STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Op pad na {TOWN} Trein Depot, {VELOCITY}
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Op pad na {TOWN} Pad Depot
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Op pad na {TOWN} Pad Depot, {VELOCITY}
+STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Op pad na {TOWN} Skip Depot
+STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Op pad na {TOWN} Skip Depot, {VELOCITY}
+STR_HEADING_FOR_HANGAR                                          :{ORANGE}Op pad na {STATION} Hangar
+STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Op pad na {STATION} Hangar, {VELOCITY}
+
+STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Diens by {TOWN} Trein Depot
+STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Diens by {TOWN} Trein Depot, {VELOCITY}
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Diens by {TOWN} Pad Depot
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Diens by {TOWN} Pad Depot, {VELOCITY}
+STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Diens by {TOWN} Skip Depot
+STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Diens by {TOWN} Skip Depot, {VELOCITY}
+STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Diens by {STATION} Hangar
+STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Diens by {STATION} Hangar, {VELOCITY}
+
+
+STR_CLONE_TRAIN                                                 :{BLACK}Kloon Trein
+STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Kloon Voertuig
+STR_CLONE_SHIP                                                  :{BLACK}Kloon Skip
+STR_CLONE_AIRCRAFT                                              :{BLACK}Kloon Vliegtuig
+
+STR_CLONE_TRAIN_INFO                                            :{BLACK}Dit sa 'n kopie van die trein bou insluitend alle trokke. Control-kliek sal die opdrae deel
+STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Dit sal 'n kopie van die pad voertuig bou. Control-kliek sal die opdrae deel
+STR_CLONE_SHIP_INFO                                             :{BLACK}Dit sal 'n kopie van die skip bou. Control-kliek sal die opdrae deel
+STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Dit sal 'n kopie van die vliegtuig bou. Control-kliek sal die opdrae deel
+
+STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Dit sal 'n kopie van 'n trein bou insluitend alle trokke. Kliek die knoppie en dan op 'n trein binne of buite die depot. Control-kliek sal die opdrae deel
+STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Dit sal 'n kopie van 'n pad voertuig bou. Kliek die knoppie en dan op 'n pad voertuig binne of buite die depot. Control-kliek sal die opdrae deel
+STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Dit sal 'n kopie van 'n skip bou. Kliek die knoppie en dan op 'n skip binne of buite die depot. Control-kliek sal die opdrae deel
+STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Dit sal 'n kopie van 'n vliegtuig bou. Kliek die knoppie en dan op 'n vliegtuig binne of buite die hangar. Control-kliek sal die opdrae deel
+
+STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}Nuwe Spoor Voertuie
+STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}Nuwe Elektries Spoor Voertuie
+STR_BUILD_VEHICLE_TRAIN_MONORAIL_CAPTION                        :{WHITE}Nuwe Eenspoor Voertuie
+STR_BUILD_VEHICLE_TRAIN_MAGLEV_CAPTION                          :{WHITE}Nuwe Maglev Voertuie
+
+STR_BUILD_VEHICLE_TRAIN_ALL_CAPTION                             :{WHITE}Spoorweg Voertuie
+STR_BUILD_VEHICLE_ROAD_VEHICLE_CAPTION                          :{WHITE}Nuwe Pad Voertuie
+STR_BUILD_VEHICLE_SHIP_CAPTION                                  :{WHITE}Nuwe Skepe
+STR_BUILD_VEHICLE_AIRCRAFT_CAPTION                              :{WHITE}Nuwe Vliegtuig
+
+STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_BUTTON                    :{BLACK}Bou Voertuig
+STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_BUTTON             :{BLACK}Bou Voertuig
+STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON                     :{BLACK}Bou Skip
+STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON                 :{BLACK}Bou Vliegtuig
+
+STR_BUILD_VEHICLE_TRAIN_LIST_TOOLTIP                            :{BLACK}Trein voertuig keuse lys - kliek op voertuig vir inligting
+STR_BUILD_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP                     :{BLACK}Pad voertuig keuse lys - kliek op voertuig vir inligting
+STR_BUILD_VEHICLE_SHIP_LIST_TOOLTIP                             :{BLACK}Skip keuse lys - kliek op skip vir inligting
+STR_BUILD_VEHICLE_AIRCRAFT_LIST_TOOLTIP                         :{BLACK}Vliegtuig keuse lys - kliek op vliegtuig vir inligting
+
+STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_TOOLTIP                   :{BLACK}Bou die verlig trein voertuig
+STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_TOOLTIP            :{BLACK}Bou die verlig pad voertuig
+STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP                    :{BLACK}Bou die verlig skip
+STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_TOOLTIP                :{BLACK}Bou die verlig vliegtuig
+
+STR_BUILD_VEHICLE_TRAIN_RENAME_BUTTON                           :{BLACK}Hernoem
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Hernoem
+STR_BUILD_VEHICLE_SHIP_RENAME_BUTTON                            :{BLACK}Hernoem
+STR_BUILD_VEHICLE_AIRCRAFT_RENAME_BUTTON                        :{BLACK}Hernoem
+
+STR_BUILD_VEHICLE_TRAIN_RENAME_TOOLTIP                          :{BLACK}Hernoem trein voertuig tipe
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Hernoem pad voertuig tipe
+STR_BUILD_VEHICLE_SHIP_RENAME_TOOLTIP                           :{BLACK}Hernoem skip tipe
+STR_BUILD_VEHICLE_AIRCRAFT_RENAME_TOOLTIP                       :{BLACK}Hernoem vliegtuig tipe
+
+STR_QUERY_RENAME_TRAIN_TYPE_CAPTION                             :{WHITE}Hernoem trein voertuig tipe
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Hernoem pad voertuig tipe
+STR_QUERY_RENAME_SHIP_TYPE_CAPTION                              :{WHITE}Hernoem skip tipe
+STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION                          :{WHITE}Hernoem vliegtuig tipe
+
+STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Nuwe Voertuie
+STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_BUTTON                      :{BLACK}Nuwe Voertuie
+STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON                              :{BLACK}Nuwe Skepe
+STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON                          :{BLACK}Nuwe Vliegtuig
+
+STR_DEPOT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Treine - kliek op trein vir info., sleep voertuig om te bysit/verwyder van trein
+STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Voertuie - kliek op voertuig vir inligting
+STR_DEPOT_SHIP_LIST_TOOLTIP                                     :{BLACK}Skepe - kliek op skeep vir inligting
+STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Vliegtuie - kliek op vliegtuig vir informasie
+
+STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP                            :{BLACK}Bou nuwe trein voertuig
+STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}Bou nuwe pad voertuig
+STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}Bou nuwe skip
+STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}Bou nuwe vliegtuig
+
+STR_DEPOT_TRAIN_SELL_TOOLTIP                                    :{BLACK}Sleep trein voertuig hier om dit te verkoop
+STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}Sleep pad voertuig hier om dit te verkoop
+STR_DEPOT_SHIP_SELL_TOOLTIP                                     :{BLACK}Sleep skip hier om dit te verkoop
+STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}Sleep vliegtuig hier om dit te verkoop
+
+STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}Senter skerm op trein depot
+STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}Senter skerm op pad voertuig depot
+STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}Senter skerm op skip depot
+STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Senter skerm op hangar
+
+
 ### depot strings
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}U staan op die punt om al die voertuie in die depot te verkoop. Is jy seker?
 STR_DEPOT_WRONG_DEPOT_TYPE                                      :Verkeerde depot tipe
@@ -3131,7 +3141,6 @@ STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TIP                          :{BLACK}Outoverv
 STR_DEPOT_AUTOREPLACE_SHIP_TIP                                  :{BLACK}Outovervang alle skepe in die depot
 STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP                              :{BLACK}Outovervang alle vlietuie in die hangar
 
-
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Vervang {STRING}
 STR_REPLACE_VEHICLES_START                                      :{BLACK}Begin Voertuie Vervang
 STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Stop Voertuie Vervang
@@ -3147,6 +3156,7 @@ STR_REPLACE_REMOVE_WAGON                                        :{BLACK}Wa verwy
 STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Maak autoreplace hou die lengte van 'n trein dieselfde deur verwyder waens (begin by die voor), indien vervang die enjin sal die trein langer maak
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}Vervang: {ORANGE}{SKIP}{SKIP}{STRING}
 STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}Skakel tussen enjin en wa vervang vensters
+
 STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Voertuig is nie beskikbaar nie
 STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Voertuig is nie beskikbaar nie
 STR_SHIP_NOT_AVAILABLE                                          :{WHITE}Skip is nie beskikbaar
@@ -3294,16 +3304,6 @@ STR_MEASURE_AREA                                                :{BLACK}Area: {N
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Lengte: {NUM}{}Hoogte verskil: {NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Area: {NUM} x {NUM}{}Hoogte verskil: {NUM} m
 
-############ Date formatting
-STR_FORMAT_DATE_TINY                                            :{STRING}-{STRING}-{NUM}
-STR_FORMAT_DATE_SHORT                                           :{STRING} {NUM}
-STR_FORMAT_DATE_LONG                                            :{STRING} {STRING} {NUM}
-
-STR_JUST_DATE_TINY                                              :{DATE_TINY}
-STR_JUST_DATE_LONG                                              :{DATE_LONG}
-STR_JUST_DATE_ISO                                               :{DATE_ISO}
-########
-
 STR_FEEDER_CARGO_VALUE                                          :{BLACK}oordra Krediete: {LTBLUE}{CURRENCY}
 STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD                            :{WHITE}...hierdie is 'n dorp besit pad
 STR_DRIVE_THROUGH_ERROR_DIRECTION                               :{WHITE}...pad teenoor in die verkeerde rigting
@@ -3327,7 +3327,6 @@ STR_PERCENT_UP_DOWN_SMALL                                       :{TINYFONT}{WHIT
 STR_PERCENT_UP_DOWN                                             :{WHITE}{NUM}%{UPARROW}{DOWNARROW}
 
 ##### Mass Order
-STR_FORMAT_GROUP_NAME                                           :Groep {COMMA}
 STR_GROUP_TINY_NAME                                             :{TINYFONT}{GROUP}
 STR_GROUP_ALL_TRAINS                                            :Alle triene
 STR_GROUP_ALL_ROAD_VEHICLES                                     :Alle pad voertuie
@@ -3356,12 +3355,61 @@ STR_GROUP_DELETE_TIP                                            :{BLACK}Vee uit
 STR_GROUP_RENAME_TIP                                            :{BLACK}Hernoem die gekose groep
 STR_GROUP_REPLACE_PROTECTION_TIP                                :{BLACK}Kliek om te beskerm hierdie groep van wêreldwyd outovervang
 
+#### String control codes and their formatting
 STR_COMPANY_NAME                                                :{COMPANY}
 STR_ENGINE_NAME                                                 :{ENGINE}
 STR_GROUP_NAME                                                  :{GROUP}
+STR_INDUSTRY_NAME                                               :{INDUSTRY}
 STR_PRESIDENT_NAME                                              :{PRESIDENTNAME}
 STR_SIGN_NAME                                                   :{SIGN}
+STR_STATION_NAME                                                :{STATION}
+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_LONG                                              :{DATE_LONG}
+STR_JUST_DATE_ISO                                               :{DATE_ISO}
+STR_JUST_STRING                                                 :{STRING}
+STR_JUST_RAW_STRING                                             :{STRING}
+
+STR_FORMAT_DATE_TINY                                            :{STRING}-{STRING}-{NUM}
+STR_FORMAT_DATE_SHORT                                           :{STRING} {NUM}
+STR_FORMAT_DATE_LONG                                            :{STRING} {STRING} {NUM}
+
+STR_FORMAT_COMPANY_NUM                                          :(Company {COMMA})
+STR_FORMAT_GROUP_NAME                                           :Groep {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}Naam moet unike wees
 
diff --git a/src/lang/arabic_egypt.txt b/src/lang/arabic_egypt.txt
index 114f144fa..ac7a210e3 100644
--- a/src/lang/arabic_egypt.txt
+++ b/src/lang/arabic_egypt.txt
@@ -154,8 +154,6 @@ STR_ABBREV_PLASTIC                                              :{TINYFONT}بل�
 STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}شراب مخفوق
 STR_ABBREV_NONE                                                 :{TINYFONT}لا شيء
 STR_ABBREV_ALL                                                  :{TINYFONT}الكل
-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}رسالة
@@ -167,17 +165,11 @@ STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}الحق
 STR_ABOUT_VERSION                                               :{BLACK}النسخة المفتوحة رقم {REV}
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}النسخة المفتوحة {COPYRIGHT}2002-2009 فريق النسخة المفتوحة
 
-STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
-STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_QUIT_CAPTION                                                :{WHITE}انهاء
 STR_YES                                                         :{BLACK}نعم
 STR_NO                                                          :{BLACK}لا
 STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}هل تود اغلاق النسخة المفتوحة و العودة لـ {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                                                :فارغ
 STR_COLOUR_DARK_BLUE                                            :ازرق غامق
 STR_COLOUR_PALE_GREEN                                           :اخضر فاتح
@@ -196,8 +188,6 @@ STR_COLOUR_BROWN                                                :بني
 STR_COLOUR_GREY                                                 :رمادي
 STR_COLOUR_WHITE                                                :ابيض
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}العربات كثيرة جدا في اللعبة
-STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
-STR_RED_COMMA                                                   :{RED}{COMMA}
 STR_BUTTON_LOCATION                                             :{BLACK}الموقع
 STR_SMALLMAP_TYPE_CONTOURS                                      :يحتوي على
 STR_SMALLMAP_TYPE_VEHICLES                                      :عربات
@@ -323,12 +313,13 @@ STR_SORT_CRITERIA_TIP                                           :{BLACK} اخت�
 STR_FILTER_CRITERIA_TIP                                         :{BLACK} اختر معايير الفلترة
 STR_SORT_BY                                                     :{BLACK} رتب بـ
 
+### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}عدد السكان
+STR_SORT_BY_NAME                                                :{BLACK}اسم
+STR_SORT_BY_DATE                                                :{BLACK}تاريخ
 STR_SORT_BY_PRODUCTION                                          :إنتاج
 STR_SORT_BY_TYPE                                                :نوع
 STR_SORT_BY_TRANSPORTED                                         :الحمولة المنقولة
-STR_SORT_BY_NAME                                                :{BLACK}اسم
-STR_SORT_BY_DATE                                                :{BLACK}تاريخ
 STR_SORT_BY_NUMBER                                              :رقم
 STR_SORT_BY_PROFIT_LAST_YEAR                                    :دخل السنة الماضية
 STR_SORT_BY_PROFIT_THIS_YEAR                                    :دخل هذه السنة
@@ -351,37 +342,25 @@ STR_SORT_BY_INTRO_DATE                                          :بداية ال
 STR_SORT_BY_RUNNING_COST                                        :تكلفة التشغيل
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :القوة/تكلفة التشغيل
 STR_SORT_BY_CARGO_CAPACITY                                      :سعة الشحن
+
 STR_NO_WAITING_CARGO                                            :{BLACK}لا يوجد اي شحنة منتظرة
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}اختر جميع المرافق
 STR_SELECT_ALL_TYPES                                            :{BLACK}اختر كل انواع الشحن (حتى غير المنتظرة(
-STR_AVAILABLE_TRAINS                                            :{BLACK}القطارات المتاحة
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}العربات المتاحة
-STR_AVAILABLE_SHIPS                                             :{BLACK}السفن المتاحة
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}الطائرات المتاحة
 STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}عرض جميع المحركات لهذا النوع من العربات
 STR_MANAGE_LIST                                                 :{BLACK}ادارة الوحدات
 STR_MANAGE_LIST_TIP                                             :{BLACK}ارسل تعليمات لكل الوحدات المتاحة
 STR_REPLACE_VEHICLES                                            :استبدال بجديد
+STR_SEND_FOR_SERVICING                                          :توجة للصيانة
+
+STR_AVAILABLE_TRAINS                                            :{BLACK}القطارات المتاحة
+STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}العربات المتاحة
+STR_AVAILABLE_SHIPS                                             :{BLACK}السفن المتاحة
+STR_AVAILABLE_AIRCRAFT                                          :{BLACK}الطائرات المتاحة
+
 STR_SEND_TRAIN_TO_DEPOT                                         :توجة الى الورشة
 STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :توجة الى الورشة
 STR_SEND_SHIP_TO_DEPOT                                          :توجة الى حوض الصيانة
 STR_SEND_AIRCRAFT_TO_HANGAR                                     :توجة الى حظيرة الصيانة
-STR_SEND_FOR_SERVICING                                          :توجة للصيانة
-
-############ range for months starts
-STR_MONTH_ABBREV_JAN                                            :يناير
-STR_MONTH_ABBREV_FEB                                            :فبراير
-STR_MONTH_ABBREV_MAR                                            :مارس
-STR_MONTH_ABBREV_APR                                            :ابريل
-STR_MONTH_ABBREV_MAY                                            :مايو
-STR_MONTH_ABBREV_JUN                                            :يونيو
-STR_MONTH_ABBREV_JUL                                            :يوليو
-STR_MONTH_ABBREV_AUG                                            :اغسطس
-STR_MONTH_ABBREV_SEP                                            :سبتمبر
-STR_MONTH_ABBREV_OCT                                            :اكتوبر
-STR_MONTH_ABBREV_NOV                                            :نوفمبر
-STR_MONTH_ABBREV_DEC                                            :ديسمبر
-############ range for months ends
 
 STR_GRAPH_X_LABEL_MONTH                                         :{TINYFONT}{STRING}{} {STRING}
 STR_GRAPH_X_LABEL_MONTH_YEAR                                    :{TINYFONT}{STRING}{} {STRING}{}{NUM}
@@ -409,8 +388,6 @@ 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_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}عنوان الاطار- اسحب لتحريك الاطار
@@ -457,7 +434,7 @@ STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :فارغ
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}اسم
 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                                          :1
 STR_ORDINAL_NUMBER_2ND                                          :2
 STR_ORDINAL_NUMBER_3RD                                          :3
@@ -491,6 +468,34 @@ STR_ORDINAL_NUMBER_30TH                                         :30
 STR_ORDINAL_NUMBER_31ST                                         :31
 ############ range for days ends
 
+############ range for months starts
+STR_MONTH_ABBREV_JAN                                            :يناير
+STR_MONTH_ABBREV_FEB                                            :فبراير
+STR_MONTH_ABBREV_MAR                                            :مارس
+STR_MONTH_ABBREV_APR                                            :ابريل
+STR_MONTH_ABBREV_MAY                                            :مايو
+STR_MONTH_ABBREV_JUN                                            :يونيو
+STR_MONTH_ABBREV_JUL                                            :يوليو
+STR_MONTH_ABBREV_AUG                                            :اغسطس
+STR_MONTH_ABBREV_SEP                                            :سبتمبر
+STR_MONTH_ABBREV_OCT                                            :اكتوبر
+STR_MONTH_ABBREV_NOV                                            :نوفمبر
+STR_MONTH_ABBREV_DEC                                            :ديسمبر
+
+STR_MONTH_JAN                                                   :يناير
+STR_MONTH_FEB                                                   :فبراير
+STR_MONTH_MAR                                                   :مارس
+STR_MONTH_APR                                                   :ابريل
+STR_MONTH_MAY                                                   :مايو
+STR_MONTH_JUN                                                   :يونيو
+STR_MONTH_JUL                                                   :يوليو
+STR_MONTH_AUG                                                   :اغسطس
+STR_MONTH_SEP                                                   :سبتمبر
+STR_MONTH_OCT                                                   :اكتوبر
+STR_MONTH_NOV                                                   :نوفمبر
+STR_MONTH_DEC                                                   :ديسمبر
+############ range for months ends
+
 STR_GRAPH_Y_LABEL_NUMBER                                        :{TINYFONT}{COMMA}
 
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}الشحنة المقبولة: {LTBLUE}
@@ -580,12 +585,9 @@ 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_COMMA                                                  :{BLUE}{COMMA}
 STR_SCENEDIT_TOOLBAR_OPENTTD                                    :{YELLOW}النسخة المفتوحة
 STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR                            :{YELLOW}محرر الخريطة
 STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION                   :{WHITE}بناء المسطحات الأرضية
-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}انشاء مسطحات عشوائية
@@ -667,9 +669,7 @@ STR_OFF                                                         :اغلاق
 STR_SUMMARY                                                     :ملخص
 STR_FULL                                                        :ممتلئ
 STR_STATUSBAR_COMPANY_NAME                                      :{SILVER}- -  {COMPANY}  - -
-STR_BLACK_STRING                                                :{BLACK}{STRING}
 
-STR_JUST_CHECKMARK                                              :{CHECKMARK}
 ############ range for menu starts
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :خيارات اللعبة
 STR_SETTINGS_MENU_DIFFICULTY_SETTINGS                           :خيارات الصعوبة
@@ -761,9 +761,6 @@ STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY                             :مول بناء
 ############ range ends here
 
 STR_FUND_INDUSTRY_CAPTION                                       :{WHITE}مول بناء مصنع جديد
-STR_JUST_STRING                                                 :{STRING}
-STR_JUST_RAW_STRING                                             :{STRING}
-STR_JUST_INT                                                    :{NUM}
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_RAINFOREST                       :{WHITE}... يمكن بنائة في الغابات المطيرة فقط
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT                           :{WHITE}...يمكن بنائة في المناطق الصحراوية فقط
 STR_STATUSBAR_PAUSED                                            :{YELLOW}* *  متوقف  *  *
@@ -777,9 +774,6 @@ STR_STATUSBAR_SAVING_GAME                                       :{RED}*  *  يت
 STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}الحفظ مازال جاريا الآن{}الرجاء الأنتظار حتر ينتهي
 STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE                       :{BLACK}اختر'Ezy Street style music'برنامج
 
-STR_BLACK_6                                                     :{BLACK}6
-STR_BLACK_7                                                     :{BLACK}7
-
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :English (Original)
 STR_TOWNNAME_FRENCH                                             :فرنسي
@@ -859,19 +853,6 @@ STR_OPTIONS_BASE_GRF_DESCRIPTION_TIP                            :{BLACK} معل�
 
 STR_AUTOSAVE_FAILED                                             :{WHITE}فشل الحفظ التلقائي
 
-STR_MONTH_JAN                                                   :يناير
-STR_MONTH_FEB                                                   :فبراير
-STR_MONTH_MAR                                                   :مارس
-STR_MONTH_APR                                                   :ابريل
-STR_MONTH_MAY                                                   :مايو
-STR_MONTH_JUN                                                   :يونيو
-STR_MONTH_JUL                                                   :يوليو
-STR_MONTH_AUG                                                   :اغسطس
-STR_MONTH_SEP                                                   :سبتمبر
-STR_MONTH_OCT                                                   :اكتوبر
-STR_MONTH_NOV                                                   :نوفمبر
-STR_MONTH_DEC                                                   :ديسمبر
-
 STR_HEADING_FOR_STATION                                         :{LTBLUE}تتوجة الى {STATION}
 STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}تتوجة الى {STATION}, {VELOCITY}
 STR_NO_ORDERS                                                   :{LTBLUE}لايوجد اوامر وجهات
@@ -886,8 +867,6 @@ STR_CRATES                                                      :صناديق
 STR_RES_OTHER                                                   :اخرى
 STR_NOTHING                                                     :
 
-STR_TINY_RIGHT_ARROW                                            :{TINYFONT}{RIGHTARROW}
-
 STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}لا يمكن مشاركة قائمة الأوامر
 STR_CANT_COPY_ORDER_LIST                                        :{WHITE}لا يمكن نسخ قائمة الأوامر
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - نهاية الأوامر المشتركة - -
@@ -1159,7 +1138,6 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}طول
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :غير مفعل
-STR_JUST_CURRENCY                                               :{CURRENCY}
 STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}عدل قيمة التغيير
 
 STR_TEMPERATE_LANDSCAPE                                         :مناطق معتدلة
@@ -1195,7 +1173,6 @@ STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK} اخت�
 
 STR_WAYPOINT_VIEWPORT                                           :{WHITE}{WAYPOINT}
 STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WHITE}{WAYPOINT}
-STR_WAYPOINT_NAME                                               :{WAYPOINT}
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}عدل اسم نقطة العبور
 
 STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}لا يمكن تعديل نقطة العبور
@@ -1262,11 +1239,6 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}اسما
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}قريب جدا من مصنع آخر
 
-STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}اعادة تهيئة القطار لحمل نوع اخر من البضائع
-STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}تهيئة القطار
-STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}أختر نوع البضاعة لينقلها القطار
-STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}اعادة تهيئة القطار لحمل البضائع المختارة
-STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}لايمكن اعادة تهيئة القطار
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}تغيير الانتاج
 
 ############ network gui strings
@@ -1776,11 +1748,6 @@ STR_TOWN_BUILDING_NAME_TEPEES_1                                 :خيم
 STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1                           :مبنى ابريق الشاي
 STR_TOWN_BUILDING_NAME_PIGGY_BANK_1                             :بنك الخنزير
 
-STR_INDUSTRY_NAME                                               :{INDUSTRY}
-STR_TOWN_NAME                                                   :{TOWN}
-STR_FORMAT_INDUSTRY_NAME                                        :{1:STRING}  {0:TOWN}
-STR_STATION_NAME                                                :{STATION}
-
 ##id 0x2800
 STR_LANDSCAPING_MENU_LANDSCAPING                                :تصميم الخريطة
 STR_LANDSCAPING_MENU_PLANT_TREES                                :زراعة اشجار
@@ -1835,6 +1802,12 @@ STR_CARGO_RATING_EXCELLENT                                      :ممتاز
 STR_CARGO_RATING_OUTSTANDING                                    :خارق
 ############ range for rating ends
 
+### station view strings
+STR_SCHEDULED_TRAINS_TIP                                        :{BLACK} عرض جميع القطارات المرتبطة بهذه المحطة
+STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK} عرض جميع العربات المرتبطة بهذه المحطة
+STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK} عرض جميع القطارات المرتبطة بهذه المحطة
+STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}عرض جميع السفن المرتبطة بهذا المرفئ
+
 STR_STATION_VIEW_CARGO_RATING                                   :{WHITE}{STRING} :{YELLOW}{STRING} ) {COMMA}%)
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO                        :{WHITE}{STATION} لم تعد تقبل {STRING}
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO               :{WHITE}{STATION}لم تعد تقبل {STRING} او {STRING}
@@ -2078,6 +2051,7 @@ STR_SV_STNAME_AIRPORT                                           :مطار {STRIN
 STR_SV_STNAME_OILFIELD                                          :{STRING} النفطية
 STR_SV_STNAME_MINES                                             :مناجم {STRING}
 STR_SV_STNAME_DOCKS                                             :مرفئ {STRING}
+##id 0x6020
 STR_SV_STNAME_ANNEXE                                            :{STRING} ملحق
 STR_SV_STNAME_SIDINGS                                           :{STRING} تحويلات
 STR_SV_STNAME_BRANCH                                            :{STRING} متفرع
@@ -2125,8 +2099,6 @@ STR_NUM_LOW                                                     :قليل
 STR_NUM_NORMAL                                                  :طبيعي
 STR_NUM_HIGH                                                    :عالي
 STR_NUM_CUSTOM                                                  :اختياري
-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                                             :متوسط
@@ -2160,7 +2132,6 @@ STR_CITY_APPROVAL_HOSTILE                                       :معاد
 
 ##id 0x7000
 STR_COMPANY_VIEW_CAPTION                                        :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
-STR_FORMAT_COMPANY_NUM                                          :شركة {COMMA}
 STR_COMPANY_VIEW_NEW_FACE_BUTTON                                :{BLACK}وجة جديد
 STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON                           :{BLACK}اللون
 STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}اللون
@@ -2193,7 +2164,6 @@ STR_FINANCES_TOTAL_CAPTION                                      :{WHITE}المج
 STR_COMPANY_NAME_COMPANY_NUM                                    :{COMPANY} {COMPANYNUM}
 STR_GRAPH_INCOME_CAPTION                                        :{WHITE}الرسم البياني للدخل
 STR_CURRCOMPACT                                                 :{CURRCOMPACT}
-STR_JUST_COMMA                                                  :{COMMA}
 STR_GRAPH_OPERATING_PROFIT_CAPTION                              :{WHITE}الرسم البياني لتشغيل
 STR_FINANCES_BANK_BALANCE_TITLE                                 :{WHITE}السيولة المتاحة
 STR_FINANCES_LOAN_TITLE                                         :{WHITE}القرض
@@ -2596,10 +2566,8 @@ STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE                          :قاطرة سك
 STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE                            :قاطرة سكة قطار ممغنطة
 
 ##id 0x8800
-STR_DEPOT_TRAIN_CAPTION                                         :{WHITE}{TOWN} ورشة صيانة قطارات
 STR_NEWS_FIRST_TRAIN_ARRIVAL                                    :{BLACK}{BIGFONT} ... المواطنون يحتفلون{} اول قطار وصل في {STATION}!
 STR_VEHICLE_DETAILS_CAPTION                                     :{WHITE}{VEHICLE} تفاصيل
-STR_ERROR_TRAIN_IN_THE_WAY                                      :{WHITE}قطار في الطريق
 STR_ORDER                                                       :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 STR_ORDER_SELECTED                                              :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 STR_ORDER_NON_STOP                                              :{BLACK}بدون توقف
@@ -2689,38 +2657,16 @@ STR_TIMETABLE_AND_TRAVEL_FOR                                    :ويسافر ل
 STR_TIMETABLE_DAYS                                              :{COMMA}يوم
 STR_TIMETABLE_TICKS                                             :{COMMA} علامة
 
-STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}متوجه لورشة قطارات {TOWN}
-STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}متوجة الى ورشة {TOWN}, {VELOCITY}
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}صيانة في ورشة قطار {TOWN}
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE} صيانة في ورشة {TOWN}, {VELOCITY}
-
 STR_INVALID_ORDER                                               :{RED} (أمر خاطئ)
 
 STR_UNKNOWN_STATION                                             :محطة غير معروفة
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}فارغ
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} الى {STATION}
 STR_VEHICLE_DETAILS_CARGO_FROM_MULT                             :{LTBLUE}{CARGO} من{STATION} (x{NUM})
-STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} ينتظر في المستودع
-STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}عربات جديدة
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}القطار طويل جدا
 STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}يمكن تعديل القطارعندما يكون متوقف في ورشة الصيانة
-STR_VEHICLE_LIST_TRAIN_CAPTION                                  :{WHITE}{STRING} - {COMMA}قطار
 
-STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}عربات قطار جديدة
-STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}عربات قطار كهربائية جديدة
-STR_BUILD_VEHICLE_TRAIN_MONORAIL_CAPTION                        :{WHITE}عربات قطار احادي جديدة
-STR_BUILD_VEHICLE_TRAIN_MAGLEV_CAPTION                          :{WHITE}عربات قطار ممغنط جديدة
-STR_BUILD_VEHICLE_TRAIN_ALL_CAPTION                             :{WHITE}عربات قطار
-
-STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_BUTTON                    :{BLACK}شراء عربات
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}نسخ عربة
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}هذا سوف يشتري عربة مطابقة للمختارة. مفتاح التحكم كنترول + الضغط سوف يتشارك بالاوامر.
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}هذا سوف يشتري نسخة مطابقة من العربة. اضغط على هذا الزر ثم اي عربة داخل او خارج ورشة الصيانة. مفناح كنترول + الضغط سوف يشارك الأوامر.
-STR_CLONE_TRAIN                                                 :{BLACK}نسخ قطار
-STR_CLONE_TRAIN_INFO                                            :{BLACK}هذا سوف يشتري نسخة عن قطار بكل عرباته. مفتاح التحكم + الضغط سوف يشارك الاوامر.
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}هذا سوف يشتري نسخة مطابقة من القطار. اضغط على هذا الزر ثم اي قطار داخل او خارج ورشة الصيانة. مفناح كنترول + الضغط سوف يشارك الأوامر.
-STR_BUILD_VEHICLE_TRAIN_RENAME_BUTTON                           :{BLACK}اعادة تسمية
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}تجاوز
 STR_ORDERS_DELETE_BUTTON                                        :{BLACK}حذف
 STR_ORDERS_GO_TO_BUTTON                                         :{BLACK}اذهب الى
@@ -2736,14 +2682,12 @@ STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}حول �
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (اوامر)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - نهاية الاوامر - -
 STR_SERVICE                                                     :{BLACK} صيانة
-STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}لايمكن بناء عربات سكة حديد ...
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}بني: {LTBLUE}{NUM}{BLACK} تكلفة: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK} تكلفة: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
 STR_VEHICLE_STATUS_LOADING_UNLOADING                            :{LTBLUE}تحميل / تفريغ
 STR_VEHICLE_STATUS_LEAVING                                      :{LTBLUE}يرحل
 STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE} يجب ان يتوقف القطار بالكامل داخل مستودع الصيانة
-STR_ERROR_CAN_T_SEND_TRAIN_TO_DEPOT                             :{WHITE}لا يمكن ارسال القطار الى الورشة
 STR_ERROR_NO_MORE_SPACE_FOR_ORDERS                              :{WHITE}لا يوجد فراغ لمزيد من الاوامر
 STR_ERROR_TOO_MANY_ORDERS                                       :{WHITE}الاوامر كثيرة جدا
 STR_ERROR_CAN_T_INSERT_NEW_ORDER                                :{WHITE}لا يمكن اضافة امر جديد
@@ -2758,26 +2702,11 @@ STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE} الع�
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}لا يمكن تحريك العربة ...
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}المحرك الخلفي دائما سيتبع الامامي
 STR_CARGO_N_A                                                   :غير متاح {SKIP}
-STR_ERROR_CAN_T_SELL_TRAIN                                      :{WHITE}لا يمكن بيع العربات
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}لا يمكن ايجاد طريق للورشة
-STR_ERROR_CAN_T_STOP_START_TRAIN                                :{WHITE}لا يمكن ايقاف / تشغيل القطار
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}فترات الصيانة: {LTBLUE}{COMMA} يوم {BLACK} اخر صيانة: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}فترات الصيانة: {LTBLUE}{COMMA}% {BLACK}    الصيانة الأخيرة: {LTBLUE}{DATE_LONG}
-STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP                             :{BLACK}القطارات - اضغط على القطار للتفاصيل
-STR_DEPOT_TRAIN_LIST_TOOLTIP                                    :{BLACK}قطارات - اضغط على القطار للمعلومات, اسحب العربة لاضافتها / حذفها من القطار
-STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP                            :{BLACK}بناء عربات قطار جديدة
-STR_DEPOT_TRAIN_SELL_TOOLTIP                                    :{BLACK}اسحب عربات القطار الى هنا لبيعها
-STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}وسط الشاشة الرئيسية على ورشة صيانة القطارات
-STR_BUILD_VEHICLE_TRAIN_LIST_TOOLTIP                            :{BLACK}قائمة اختيار القطارات - اضغط على العربة لعرض معلوماتها
-STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_TOOLTIP                   :{BLACK}شراء العربة الموضحة
-STR_BUILD_VEHICLE_TRAIN_RENAME_TOOLTIP                          :{BLACK}اعادة تسمية نوع عربة القطار
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP                 :{BLACK}حركة القطار الحالية - اضغط هنا لايقاف / تشغيل القطار
-STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP                           :{BLACK}عرض اوامر القطار
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP                         :{BLACK}ضع القطار في مركز شاشة العرض
-STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP                    :{BLACK} ارسل القطار للورشة - مفتاح التحكم (كنترول) + الضغط سيرسله لصيانة فقط
 STR_VEHICLE_VIEW_TRAIN_IGNORE_SIGNAL_TOOLTIP                    :{BLACK}اجبر القطار على التحرك بدون انتظار الاشارة الخضراء
 STR_VEHICLE_VIEW_TRAIN_REVERSE_TOOLTIP                          :{BLACK}عكس اتجاة القطار
-STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}عرض معلومات القطار
 STR_VEHICLE_DETAILS_INCREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}زيادة فترات الصيانة
 STR_VEHICLE_DETAILS_DECREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}انقاص فترات الصيانة
 STR_VEHICLE_DETAILS_TRAIN_CARGO_TOOLTIP                         :{BLACK}عرض معلومات الشحنة
@@ -2811,15 +2740,10 @@ STR_VEHICLE_STATUS_STOPPED                                      :{RED} متوق�
 STR_ERROR_CAN_T_MAKE_TRAIN_PASS_SIGNAL                          :{WHITE}لا يمكن السماح للقطار بالعبور من الاشارة في وضع الخطر
 STR_VEHICLE_STATUS_CRASHED                                      :{RED}تحطم!
 
-STR_QUERY_RENAME_TRAIN_CAPTION                                  :{WHITE}اسم القطار
-STR_ERROR_CAN_T_RENAME_TRAIN                                    :{WHITE}لا يمكن تسمية القطار ...
-STR_VEHICLE_DETAILS_TRAIN_RENAME                                :{BLACK} اسم القطار
 STR_NEWS_TRAIN_CRASH                                            :{BLACK}{BIGFONT}تحطم قطار! {}{COMMA} مات في حريق بعد الحادث
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}لا يمكن عكس اتجاة القطار...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE                  :{WHITE} لا يمكن تغيير اتجاة العربة ...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}لا يمكن انعطاف العربات المكونة من اكثر من وحدة.
-STR_QUERY_RENAME_TRAIN_TYPE_CAPTION                             :{WHITE}اعادة تسمية عربات القطار
-STR_ERROR_CAN_T_RENAME_TRAIN_TYPE                               :{WHITE}لا يمكن اعادة تسمية عربات القطار ...
 STR_CLEAR_TIME                                                  :{BLACK}مسح الوقت
 STR_RESET_LATENESS                                              :{BLACK}اعد ضبط العداد التأخير
 STR_CHANGE_WAYPOINT_NAME                                        :{BLACK}غير اسم نقطة العبور
@@ -2851,45 +2775,14 @@ STR_TIMETABLE_AUTOFILL                                          :{BLACK}تهيئ
 STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}املأ الجدولة تلقائيا بقيم الرحلة التالية (مفتاح كنترول لمحاولة ابقائ وقت الانتظار).
 
 ##id 0x9000
-STR_ERROR_ROAD_VEHICLE_IN_THE_WAY                               :{WHITE}العربة في الطريق
-STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING} - {COMMA}عربة
-STR_DEPOT_ROAD_VEHICLE_CAPTION                                  :{WHITE}{TOWN} ورشة صيانة العربات
-STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_BUTTON                      :{BLACK}عربات جديدة
-STR_BUILD_VEHICLE_ROAD_VEHICLE_CAPTION                          :{WHITE}عربات جديدة
-STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_BUTTON             :{BLACK}شراء عربة
-STR_ERROR_CAN_T_BUILD_ROAD_VEHICLE                              :{WHITE}لا يمكن شراء عربة ...
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE} ... يجب ان يوقف داخل ورشة الصيانة.
-STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}لا يمكن بيع العربة...
-STR_ERROR_CAN_T_STOP_START_ROAD_VEHICLE                         :{WHITE}لا يمكن ايقاف / تشغيل العربة
-STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} تنتظر في المستودع
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}متوجه لورشة {TOWN}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}متوجة الى ورشة {TOWN}, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}صيانة في ورشة {TOWN}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE} صيانة في ورشة {TOWN}, {VELOCITY}
-STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}لا يمكن ارسال العربة الى ورشة الصيانة
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}لم يتم العثور على ورشة قريبة من العربة
-STR_VEHICLE_LIST_ROAD_VEHICLE_TOOLTIP                           :{BLACK}العربات - اضغط على العربة لعرض المعلومات
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP          :{BLACK}حركة العربة الحالية - اضغط هنا لايقاف / تشغيل العربة
-STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP                    :{BLACK}عرض اوامر العربة
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP                  :{BLACK}وضع العربة في مركز شاشة العرض
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}ارسل العربة الى الورشة. مفتاح التحكم (كنترول) + الضغط ترسل للصيانة فقط
 STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP                   :{BLACK}اجبر العربة لدوان للخلف
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}عرض معلومات العربة
-STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}العربات - اضغط على المركبة لعرض معلوماتها
-STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}شراء عربات جديدة
-STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}اسحب العربة هنا لبيعها
-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_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})
 
-STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}تسمية العربة
-STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}لا يمكن تسمية العربة
-STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}تسمية العربة
 STR_NEWS_FIRST_BUS_ARRIVAL                                      :{BLACK}{BIGFONT}يحتفل الأهالي ..............{}بوصول اول باص للمحطة ...{STATION}!
 STR_NEWS_FIRST_TRUCK_ARRIVAL                                    :{BLACK}{BIGFONT}الأهالي يحتفلون ......... {}بوصول اول عربة الى .. {STATION}!
 STR_NEWS_FIRST_PASSENGER_TRAM_ARRIVAL                           :{BLACK}{BIGFONT}المواطنون يحتفلون . . .{}بوصول اول عربة ركاب ترام الى {STATION}!
@@ -2897,132 +2790,39 @@ STR_NEWS_FIRST_CARGO_TRAM_ARRIVAL                               :{BLACK}{BIGFONT
 STR_NEWS_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}العربة تحطمت !{}السائق توفي في شعلة الحريق بعد الاصطدام بقطار
 STR_NEWS_ROAD_VEHICLE_CRASH                                     :{BLACK}{BIGFONT}العربة تحطمت !{}{COMMA} توفي في شعلة الحريق بعد الاصطدام بقطار
 STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE} لا يمكن تغيير اتجاة المركبة الان
-STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}أعد التسمية
-STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK} اعادة تسمية العربة
-STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE} اعادة تسمية العربة
-STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE} لايمكن اعادة تسمية العربات
 
-STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK} هيئ العربة لحمولة أخرى
-STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}تهيئة نوع حمولة العربة
-STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK} هيئ العربة لنوع الحمولة المختار
-STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE} لا يمكن اعادة تهيئة العربة ...
-STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK} اختر نوع حمولة العربة
 
 ##id 0x9800
 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :بناء ممرات مائيه
 STR_WATERWAYS_TOOLBAR_CAPTION                                   :{WHITE}بناء ممرات مائيه
 STR_WATERWAYS_TOOLBAR_CAPTION_SE                                :{WHITE}ممرات مائية
 STR_ERROR_CAN_T_BUILD_DOCK_HERE                                 :{WHITE}لا يمكن بناء مرفء هنا ...
-STR_DEPOT_SHIP_CAPTION                                          :{WHITE}{TOWN}حوض صيانة السفن
-STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON                              :{BLACK}سفين جديدة
-STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - {COMMA} سفينة
-STR_BUILD_VEHICLE_SHIP_CAPTION                                  :{WHITE}سفن جديدة
-STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON                     :{BLACK}شراء سفينة
-STR_CLONE_SHIP                                                  :{BLACK}انسخ السفينة
-STR_CLONE_SHIP_INFO                                             :{BLACK}هذا سوف يشتري سفينة مطابقة للمختارة. مفتاح التحكم كنترول + الضغط سوف يتشارك بالاوامر.
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}هذا سوف يشتري نسخة مطابقة من السفينة. اضغط على هذا الزر ثم اي سفينة داخل او خارج حوض السفن. مفناح كنترول + الضغط سوف يشارك الأوامر.
 STR_ERROR_SHIP_MUST_BE_STOPPED_IN_DEPOT                         :{WHITE}يجب ان تكون السفينة متوقفة في حوض الصيانة
-STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}لا يمكن بيع السفينة ......
-STR_ERROR_CAN_T_BUILD_SHIP                                      :{WHITE}لا يمكن شراء السفينة...
-STR_ERROR_SHIP_IN_THE_WAY                                       :{WHITE}سفينة في الطريق
-STR_ERROR_CAN_T_STOP_START_SHIP                                 :{WHITE}لا يمكن توقيف/ تشغيل السفينة ...
-STR_ERROR_CAN_T_SEND_SHIP_TO_DEPOT                              :{WHITE}لا يمكن ارسال السفينة الى حوض الصيانة ...
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}متوجه لحوض سفن{TOWN}
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}تتجة الى حوض {TOWN}للسفن, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}صيانة في حوض سفن  {TOWN}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}صيانة في حوض{TOWN}للسفن, {VELOCITY}
-STR_NEWS_SHIP_IS_WAITING                                        :{WHITE}{VEHICLE} تنتظر في حوض السفن
 STR_WATERWAYS_TOOLBAR_BUILD_DOCK_TOOLTIP                        :{BLACK}بناء مرفء سفن
 STR_WATERWAYS_TOOLBAR_BUILD_DEPOT_TOOLTIP                       :{BLACK}بناء حوض سفن - لشراء/ بيع/ صيانة السفن -
-STR_DEPOT_SHIP_LIST_TOOLTIP                                     :{BLACK}السفن - اضغط على السفينة للتفاصيل
-STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}شراء سفينة جديدة
-STR_DEPOT_SHIP_SELL_TOOLTIP                                     :{BLACK}اسحب السفينة هنا لبيعها
-STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}وضع حوض السفن في مركز الشاشة
-STR_VEHICLE_LIST_SHIP_TOOLTIP                                   :{BLACK}السفن - اضغط على السفينة للتفاصيل
-STR_BUILD_VEHICLE_SHIP_LIST_TOOLTIP                             :{BLACK}قائمة اختيار السفن - اضغط على السفينة للتفاصيل
-STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP                    :{BLACK}شراء السفينة المختارة
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP                  :{BLACK}امر السفينة الحالي - اضغط لايقاف / تشغيل السفينة
-STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}عرض اوامر السفينة
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP                          :{BLACK}عرض السفينة في مركز الشاشة
-STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}ارسال السفينة الى حوض الصيانة. اضغط مفتاح التحكم (كنترول) + الضغط لارسالة للصيانة فقط
-STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}عرض تفاصيل السفينة
-STR_VEHICLE_DETAILS_SHIP_RENAME                                 :{BLACK}تسمية السفينة
 
-STR_QUERY_RENAME_SHIP_CAPTION                                   :{WHITE}تسمية السفينة
-STR_ERROR_CAN_T_RENAME_SHIP                                     :{WHITE}لا يمكن تسمية السفينة ...
 STR_NEWS_FIRST_SHIP_ARRIVAL                                     :{BLACK}{BIGFONT}المواطنون يحتفلون ..... {}بوصول اول سفينة الى {STATION}!
 STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}وضع عوامة - يمكن استخدامها نقطة عبور
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}لا يمكن وضع عوامة هنا
 STR_BUILD_AQUEDUCT                                              :{BLACK}بناء قناة مائية
 STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}لا يمكن بناء قناة مياة هنا ...
-STR_BUILD_VEHICLE_SHIP_RENAME_BUTTON                            :{BLACK}تسمية
-STR_BUILD_VEHICLE_SHIP_RENAME_TOOLTIP                           :{BLACK}اعادة تسمية نوع السفينة
-STR_QUERY_RENAME_SHIP_TYPE_CAPTION                              :{WHITE}اعادة تسمية نوع السفينة
-STR_ERROR_CAN_T_RENAME_SHIP_TYPE                                :{WHITE}لا يمكن اعادة تسمية نوع السفينة
-STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}تغيير نوع الحمولة للسفينة
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} )تغيير(
-STR_REFIT_SHIP_REFIT_BUTTON                                     :{BLACK}تغيير الحمولة للسفينة
-STR_REFIT_SHIP_LIST_TOOLTIP                                     :{BLACK}اختر نوع الحمولة للسفينة
-STR_REFIT_SHIP_REFIT_TOOLTIP                                    :{BLACK}غير للحمولة المختارة
 STR_REFIT_TITLE                                                 :{GOLD}اختر نوع الحمولة ...
 STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}السعة الجديدة:  {GOLD}{CARGO}{}{BLACK}تكلفة التغيير:  {GOLD}{CURRENCY}
-STR_ERROR_CAN_T_REFIT_SHIP                                      :{WHITE}لا يمكن التغيير ....
 STR_REFITTABLE                                                  :)قابل لتغيير(
 
 ##id 0xA000
 STR_TOOLBAR_AIRCRAFT_CAPTION                                    :{WHITE}مطارات
 STR_ERROR_CAN_T_BUILD_AIRPORT_HERE                              :{WHITE}لا يمكن بناء مطار هنا ...
-STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}{STATION} حظيرة طائرات
-STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON                          :{BLACK}طائرة جديدة
-STR_CLONE_AIRCRAFT                                              :{BLACK}نسخ الطائرة
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}هذا سوف يشتري طائرة مطابقة للمختارة. مفتاح التحكم كنترول + الضغط سوف يتشارك بالاوامر.
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}هذا سوف يشتري نسخة مطابقة من الطائرة. اضغط على هذا الزر ثم اي طائرة داخل او خارج حظيرة الطائرات. مفناح كنترول + الضغط سوف يشارك الأوامر.
-STR_BUILD_VEHICLE_AIRCRAFT_CAPTION                              :{WHITE}طائرة جديدة
-STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON                 :{BLACK}شراء طائرة
-STR_ERROR_CAN_T_BUILD_AIRCRAFT                                  :{WHITE}لا يمكن شراء الطائرة
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} طائرة
-STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR                         :{WHITE}لا يمكن ارسال الطائرة لحظيرةالصيانة
-STR_HEADING_FOR_HANGAR                                          :{ORANGE}متوجه لحظيرة {STATION}
-STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}تتوجة الى حظيرة {STATION}, {VELOCITY}
-STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}صيانه في حظيرة  {STATION}
-STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}الصيانة في حظيرة {STATION}, {VELOCITY}
-STR_NEWS_AIRCRAFT_IS_WAITING                                    :{WHITE}{VEHICLE} تنتظر في الحظيرة
-STR_ERROR_AIRCRAFT_IN_THE_WAY                                   :{WHITE}طائرة في الطريق
-STR_ERROR_CAN_T_STOP_START_AIRCRAFT                             :{WHITE}لا يمكن توقيف / تشغيل الطائرة
 STR_ERROR_AIRCRAFT_IS_IN_FLIGHT                                 :{WHITE}الطائرة تقوم بالطيران الآن
 STR_ERROR_AIRCRAFT_MUST_BE_STOPPED                              :{WHITE}يجب ان تكون الطائرة متوقفة في الحظيرة
-STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}لا يمكن بيع الطائرة
 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION                          :بناء المطار
 STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}بناء مطار
-STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP                               :{BLACK}الطائرات - اضغط على الطائرة للمعلومات
-STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}طائرة - اضغط على طائرة ما لتفاصيل
-STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}شراء طائرة جديدة
-STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}اسحب الطائرة هنا لبيعها
-STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}وضع الحظيرة في مركز الشاشة
-STR_BUILD_VEHICLE_AIRCRAFT_LIST_TOOLTIP                         :{BLACK}قائمة اختيار الطائرات - اضغط على الطائرة للتفاصيل
-STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_TOOLTIP                :{BLACK}اشتر الطائرة المختارة
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP              :{BLACK}وضع الطائرة الحالي - اضغط هنا لايقاف / تشغيل الطائرة
-STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}عرض اوامر الطائرة
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP                      :{BLACK}وضع الطائرة في مركز الشاشة
-STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}ارسل الطائرة الى حظيرة الصيانة - مفتاح التحكم (كنترول) + الضغط يرسلها للصيانة فقط
-STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}عرض تفاصيل الطائرة
 
-STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}تسمية الطائرة
-STR_ERROR_CAN_T_RENAME_AIRCRAFT                                 :{WHITE}لا يمكن تسمية الطائرة ...
-STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK} تسمية الطائرة
 STR_NEWS_FIRST_AIRCRAFT_ARRIVAL                                 :{BLACK}{BIGFONT}الأهالي يحتفلون . . . {}بوصول أول طائرة الى {STATION}!
 STR_NEWS_AIRCRAFT_CRASH                                         :{BLACK}{BIGFONT}تحطم طائرة !{}{COMMA}ماتوا في الحريق بمطار {STATION}
 STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}تحطم طائرة ! {}انتهى الوقود من الطائرة, {COMMA}توفي اثر الحادث !
 STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
-STR_BUILD_VEHICLE_AIRCRAFT_RENAME_BUTTON                        :{BLACK}اعادة تسمية
-STR_BUILD_VEHICLE_AIRCRAFT_RENAME_TOOLTIP                       :{BLACK}اعادة تسمية نوع الطائرة
-STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION                          :{WHITE}اعادة تسمية نوع الطائرة
-STR_ERROR_CAN_T_RENAME_AIRCRAFT_TYPE                            :{WHITE}لا يمكن اعادة تسمية نوع الطائرة ....
-STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}غير نوع الحمولة الى نوع آخر
-STR_REFIT_AIRCRAFT_REFIT_BUTTON                                 :{BLACK}تغيير حمولة الطائرة
-STR_REFIT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}اختر نوع الحمولة للطائرة
-STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}غير الحمولة للنوع المختار
-STR_ERROR_CAN_T_REFIT_AIRCRAFT                                  :{WHITE}لا يمكن تغيير الحمولة ...
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} جدولة الاوامر
 
@@ -3176,15 +2976,225 @@ STR_LORRY                                                       :{BLACK}{LORRY}
 STR_PLANE                                                       :{BLACK}{PLANE}
 STR_SHIP                                                        :{BLACK}{SHIP}
 
+############ Vehicle lists
+STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP                             :{BLACK}القطارات - اضغط على القطار للتفاصيل
+STR_VEHICLE_LIST_ROAD_VEHICLE_TOOLTIP                           :{BLACK}العربات - اضغط على العربة لعرض المعلومات
+STR_VEHICLE_LIST_SHIP_TOOLTIP                                   :{BLACK}السفن - اضغط على السفينة للتفاصيل
+STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP                               :{BLACK}الطائرات - اضغط على الطائرة للمعلومات
 
-STR_SCHEDULED_TRAINS_TIP                                        :{BLACK} عرض جميع القطارات المرتبطة بهذه المحطة
-STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK} عرض جميع العربات المرتبطة بهذه المحطة
-STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK} عرض جميع القطارات المرتبطة بهذه المحطة
-STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}عرض جميع السفن المرتبطة بهذا المرفئ
+STR_VEHICLE_LIST_TRAIN_CAPTION                                  :{WHITE}{STRING} - {COMMA}قطار
+STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING} - {COMMA}عربة
+STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - {COMMA} سفينة
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} طائرة
 
 STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE} مشاركة الاوامر لـ {COMMA} عربة
 STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK} عرض جميع العربات التي تشترك في هذا الجدول
 
+STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} ينتظر في المستودع
+STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} تنتظر في المستودع
+STR_NEWS_SHIP_IS_WAITING                                        :{WHITE}{VEHICLE} تنتظر في حوض السفن
+STR_NEWS_AIRCRAFT_IS_WAITING                                    :{WHITE}{VEHICLE} تنتظر في الحظيرة
+
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}تهيئة القطار
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}تهيئة نوع حمولة العربة
+STR_REFIT_SHIP_REFIT_BUTTON                                     :{BLACK}تغيير الحمولة للسفينة
+STR_REFIT_AIRCRAFT_REFIT_BUTTON                                 :{BLACK}تغيير حمولة الطائرة
+
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}اعادة تهيئة القطار لحمل البضائع المختارة
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK} هيئ العربة لنوع الحمولة المختار
+STR_REFIT_SHIP_REFIT_TOOLTIP                                    :{BLACK}غير للحمولة المختارة
+STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}غير الحمولة للنوع المختار
+
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}أختر نوع البضاعة لينقلها القطار
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK} اختر نوع حمولة العربة
+STR_REFIT_SHIP_LIST_TOOLTIP                                     :{BLACK}اختر نوع الحمولة للسفينة
+STR_REFIT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}اختر نوع الحمولة للطائرة
+
+STR_DEPOT_TRAIN_CAPTION                                         :{WHITE}{TOWN} ورشة صيانة قطارات
+STR_DEPOT_ROAD_VEHICLE_CAPTION                                  :{WHITE}{TOWN} ورشة صيانة العربات
+STR_DEPOT_SHIP_CAPTION                                          :{WHITE}{TOWN}حوض صيانة السفن
+STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}{STATION} حظيرة طائرات
+
+STR_VEHICLE_DETAILS_TRAIN_RENAME                                :{BLACK} اسم القطار
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}تسمية العربة
+STR_VEHICLE_DETAILS_SHIP_RENAME                                 :{BLACK}تسمية السفينة
+STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK} تسمية الطائرة
+
+STR_QUERY_RENAME_TRAIN_CAPTION                                  :{WHITE}اسم القطار
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}تسمية العربة
+STR_QUERY_RENAME_SHIP_CAPTION                                   :{WHITE}تسمية السفينة
+STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}تسمية الطائرة
+
+STR_ERROR_TRAIN_IN_THE_WAY                                      :{WHITE}قطار في الطريق
+STR_ERROR_ROAD_VEHICLE_IN_THE_WAY                               :{WHITE}العربة في الطريق
+STR_ERROR_SHIP_IN_THE_WAY                                       :{WHITE}سفينة في الطريق
+STR_ERROR_AIRCRAFT_IN_THE_WAY                                   :{WHITE}طائرة في الطريق
+
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}لايمكن اعادة تهيئة القطار
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE} لا يمكن اعادة تهيئة العربة ...
+STR_ERROR_CAN_T_REFIT_SHIP                                      :{WHITE}لا يمكن التغيير ....
+STR_ERROR_CAN_T_REFIT_AIRCRAFT                                  :{WHITE}لا يمكن تغيير الحمولة ...
+
+STR_ERROR_CAN_T_RENAME_TRAIN                                    :{WHITE}لا يمكن تسمية القطار ...
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}لا يمكن تسمية العربة
+STR_ERROR_CAN_T_RENAME_SHIP                                     :{WHITE}لا يمكن تسمية السفينة ...
+STR_ERROR_CAN_T_RENAME_AIRCRAFT                                 :{WHITE}لا يمكن تسمية الطائرة ...
+
+STR_ERROR_CAN_T_STOP_START_TRAIN                                :{WHITE}لا يمكن ايقاف / تشغيل القطار
+STR_ERROR_CAN_T_STOP_START_ROAD_VEHICLE                         :{WHITE}لا يمكن ايقاف / تشغيل العربة
+STR_ERROR_CAN_T_STOP_START_SHIP                                 :{WHITE}لا يمكن توقيف/ تشغيل السفينة ...
+STR_ERROR_CAN_T_STOP_START_AIRCRAFT                             :{WHITE}لا يمكن توقيف / تشغيل الطائرة
+
+STR_ERROR_CAN_T_SEND_TRAIN_TO_DEPOT                             :{WHITE}لا يمكن ارسال القطار الى الورشة
+STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}لا يمكن ارسال العربة الى ورشة الصيانة
+STR_ERROR_CAN_T_SEND_SHIP_TO_DEPOT                              :{WHITE}لا يمكن ارسال السفينة الى حوض الصيانة ...
+STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR                         :{WHITE}لا يمكن ارسال الطائرة لحظيرةالصيانة
+
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}لايمكن بناء عربات سكة حديد ...
+STR_ERROR_CAN_T_BUILD_ROAD_VEHICLE                              :{WHITE}لا يمكن شراء عربة ...
+STR_ERROR_CAN_T_BUILD_SHIP                                      :{WHITE}لا يمكن شراء السفينة...
+STR_ERROR_CAN_T_BUILD_AIRCRAFT                                  :{WHITE}لا يمكن شراء الطائرة
+
+STR_ERROR_CAN_T_RENAME_TRAIN_TYPE                               :{WHITE}لا يمكن اعادة تسمية عربات القطار ...
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE} لايمكن اعادة تسمية العربات
+STR_ERROR_CAN_T_RENAME_SHIP_TYPE                                :{WHITE}لا يمكن اعادة تسمية نوع السفينة
+STR_ERROR_CAN_T_RENAME_AIRCRAFT_TYPE                            :{WHITE}لا يمكن اعادة تسمية نوع الطائرة ....
+
+STR_ERROR_CAN_T_SELL_TRAIN                                      :{WHITE}لا يمكن بيع العربات
+STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}لا يمكن بيع العربة...
+STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}لا يمكن بيع السفينة ......
+STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}لا يمكن بيع الطائرة
+
+STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP                 :{BLACK}حركة القطار الحالية - اضغط هنا لايقاف / تشغيل القطار
+STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP          :{BLACK}حركة العربة الحالية - اضغط هنا لايقاف / تشغيل العربة
+STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP                  :{BLACK}امر السفينة الحالي - اضغط لايقاف / تشغيل السفينة
+STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP              :{BLACK}وضع الطائرة الحالي - اضغط هنا لايقاف / تشغيل الطائرة
+
+STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP                           :{BLACK}عرض اوامر القطار
+STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP                    :{BLACK}عرض اوامر العربة
+STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}عرض اوامر السفينة
+STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}عرض اوامر الطائرة
+
+STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP                         :{BLACK}ضع القطار في مركز شاشة العرض
+STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP                  :{BLACK}وضع العربة في مركز شاشة العرض
+STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP                          :{BLACK}عرض السفينة في مركز الشاشة
+STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP                      :{BLACK}وضع الطائرة في مركز الشاشة
+
+STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP                    :{BLACK} ارسل القطار للورشة - مفتاح التحكم (كنترول) + الضغط سيرسله لصيانة فقط
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}ارسل العربة الى الورشة. مفتاح التحكم (كنترول) + الضغط ترسل للصيانة فقط
+STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}ارسال السفينة الى حوض الصيانة. اضغط مفتاح التحكم (كنترول) + الضغط لارسالة للصيانة فقط
+STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}ارسل الطائرة الى حظيرة الصيانة - مفتاح التحكم (كنترول) + الضغط يرسلها للصيانة فقط
+
+STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}عرض معلومات القطار
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}عرض معلومات العربة
+STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}عرض تفاصيل السفينة
+STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}عرض تفاصيل الطائرة
+
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}اعادة تهيئة القطار لحمل نوع اخر من البضائع
+STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK} هيئ العربة لحمولة أخرى
+STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}تغيير نوع الحمولة للسفينة
+STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}غير نوع الحمولة الى نوع آخر
+
+STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}متوجه لورشة قطارات {TOWN}
+STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}متوجة الى ورشة {TOWN}, {VELOCITY}
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}متوجه لورشة {TOWN}
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}متوجة الى ورشة {TOWN}, {VELOCITY}
+STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}متوجه لحوض سفن{TOWN}
+STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}تتجة الى حوض {TOWN}للسفن, {VELOCITY}
+STR_HEADING_FOR_HANGAR                                          :{ORANGE}متوجه لحظيرة {STATION}
+STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}تتوجة الى حظيرة {STATION}, {VELOCITY}
+
+STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}صيانة في ورشة قطار {TOWN}
+STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE} صيانة في ورشة {TOWN}, {VELOCITY}
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}صيانة في ورشة {TOWN}
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE} صيانة في ورشة {TOWN}, {VELOCITY}
+STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}صيانة في حوض سفن  {TOWN}
+STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}صيانة في حوض{TOWN}للسفن, {VELOCITY}
+STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}صيانه في حظيرة  {STATION}
+STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}الصيانة في حظيرة {STATION}, {VELOCITY}
+
+
+STR_CLONE_TRAIN                                                 :{BLACK}نسخ قطار
+STR_CLONE_ROAD_VEHICLE                                          :{BLACK}نسخ عربة
+STR_CLONE_SHIP                                                  :{BLACK}انسخ السفينة
+STR_CLONE_AIRCRAFT                                              :{BLACK}نسخ الطائرة
+
+STR_CLONE_TRAIN_INFO                                            :{BLACK}هذا سوف يشتري نسخة عن قطار بكل عرباته. مفتاح التحكم + الضغط سوف يشارك الاوامر.
+STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}هذا سوف يشتري عربة مطابقة للمختارة. مفتاح التحكم كنترول + الضغط سوف يتشارك بالاوامر.
+STR_CLONE_SHIP_INFO                                             :{BLACK}هذا سوف يشتري سفينة مطابقة للمختارة. مفتاح التحكم كنترول + الضغط سوف يتشارك بالاوامر.
+STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}هذا سوف يشتري طائرة مطابقة للمختارة. مفتاح التحكم كنترول + الضغط سوف يتشارك بالاوامر.
+
+STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}هذا سوف يشتري نسخة مطابقة من القطار. اضغط على هذا الزر ثم اي قطار داخل او خارج ورشة الصيانة. مفناح كنترول + الضغط سوف يشارك الأوامر.
+STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}هذا سوف يشتري نسخة مطابقة من العربة. اضغط على هذا الزر ثم اي عربة داخل او خارج ورشة الصيانة. مفناح كنترول + الضغط سوف يشارك الأوامر.
+STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}هذا سوف يشتري نسخة مطابقة من السفينة. اضغط على هذا الزر ثم اي سفينة داخل او خارج حوض السفن. مفناح كنترول + الضغط سوف يشارك الأوامر.
+STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}هذا سوف يشتري نسخة مطابقة من الطائرة. اضغط على هذا الزر ثم اي طائرة داخل او خارج حظيرة الطائرات. مفناح كنترول + الضغط سوف يشارك الأوامر.
+
+STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}عربات قطار جديدة
+STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}عربات قطار كهربائية جديدة
+STR_BUILD_VEHICLE_TRAIN_MONORAIL_CAPTION                        :{WHITE}عربات قطار احادي جديدة
+STR_BUILD_VEHICLE_TRAIN_MAGLEV_CAPTION                          :{WHITE}عربات قطار ممغنط جديدة
+
+STR_BUILD_VEHICLE_TRAIN_ALL_CAPTION                             :{WHITE}عربات قطار
+STR_BUILD_VEHICLE_ROAD_VEHICLE_CAPTION                          :{WHITE}عربات جديدة
+STR_BUILD_VEHICLE_SHIP_CAPTION                                  :{WHITE}سفن جديدة
+STR_BUILD_VEHICLE_AIRCRAFT_CAPTION                              :{WHITE}طائرة جديدة
+
+STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_BUTTON                    :{BLACK}شراء عربات
+STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_BUTTON             :{BLACK}شراء عربة
+STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON                     :{BLACK}شراء سفينة
+STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON                 :{BLACK}شراء طائرة
+
+STR_BUILD_VEHICLE_TRAIN_LIST_TOOLTIP                            :{BLACK}قائمة اختيار القطارات - اضغط على العربة لعرض معلوماتها
+STR_BUILD_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP                     :{BLACK}قائمة اختيار العربات - اضغط على العربة لاظهار معلوماتها
+STR_BUILD_VEHICLE_SHIP_LIST_TOOLTIP                             :{BLACK}قائمة اختيار السفن - اضغط على السفينة للتفاصيل
+STR_BUILD_VEHICLE_AIRCRAFT_LIST_TOOLTIP                         :{BLACK}قائمة اختيار الطائرات - اضغط على الطائرة للتفاصيل
+
+STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_TOOLTIP                   :{BLACK}شراء العربة الموضحة
+STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_TOOLTIP            :{BLACK}شراء العربة
+STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP                    :{BLACK}شراء السفينة المختارة
+STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_TOOLTIP                :{BLACK}اشتر الطائرة المختارة
+
+STR_BUILD_VEHICLE_TRAIN_RENAME_BUTTON                           :{BLACK}اعادة تسمية
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}أعد التسمية
+STR_BUILD_VEHICLE_SHIP_RENAME_BUTTON                            :{BLACK}تسمية
+STR_BUILD_VEHICLE_AIRCRAFT_RENAME_BUTTON                        :{BLACK}اعادة تسمية
+
+STR_BUILD_VEHICLE_TRAIN_RENAME_TOOLTIP                          :{BLACK}اعادة تسمية نوع عربة القطار
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK} اعادة تسمية العربة
+STR_BUILD_VEHICLE_SHIP_RENAME_TOOLTIP                           :{BLACK}اعادة تسمية نوع السفينة
+STR_BUILD_VEHICLE_AIRCRAFT_RENAME_TOOLTIP                       :{BLACK}اعادة تسمية نوع الطائرة
+
+STR_QUERY_RENAME_TRAIN_TYPE_CAPTION                             :{WHITE}اعادة تسمية عربات القطار
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE} اعادة تسمية العربة
+STR_QUERY_RENAME_SHIP_TYPE_CAPTION                              :{WHITE}اعادة تسمية نوع السفينة
+STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION                          :{WHITE}اعادة تسمية نوع الطائرة
+
+STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}عربات جديدة
+STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_BUTTON                      :{BLACK}عربات جديدة
+STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON                              :{BLACK}سفين جديدة
+STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON                          :{BLACK}طائرة جديدة
+
+STR_DEPOT_TRAIN_LIST_TOOLTIP                                    :{BLACK}قطارات - اضغط على القطار للمعلومات, اسحب العربة لاضافتها / حذفها من القطار
+STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}العربات - اضغط على المركبة لعرض معلوماتها
+STR_DEPOT_SHIP_LIST_TOOLTIP                                     :{BLACK}السفن - اضغط على السفينة للتفاصيل
+STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}طائرة - اضغط على طائرة ما لتفاصيل
+
+STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP                            :{BLACK}بناء عربات قطار جديدة
+STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}شراء عربات جديدة
+STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}شراء سفينة جديدة
+STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}شراء طائرة جديدة
+
+STR_DEPOT_TRAIN_SELL_TOOLTIP                                    :{BLACK}اسحب عربات القطار الى هنا لبيعها
+STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}اسحب العربة هنا لبيعها
+STR_DEPOT_SHIP_SELL_TOOLTIP                                     :{BLACK}اسحب السفينة هنا لبيعها
+STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}اسحب الطائرة هنا لبيعها
+
+STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}وسط الشاشة الرئيسية على ورشة صيانة القطارات
+STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}ضع ورشة الصيانة في وسط الشاشة
+STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}وضع حوض السفن في مركز الشاشة
+STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}وضع الحظيرة في مركز الشاشة
+
+
 ### depot strings
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}أنت على وشك بيع جميع المركبات الموجودة في الورشة، هل أنت متأكد؟
 STR_DEPOT_WRONG_DEPOT_TYPE                                      :ورشةمن نوع خاطئ
@@ -3204,7 +3214,6 @@ STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TIP                          :{BLACK}بدل �
 STR_DEPOT_AUTOREPLACE_SHIP_TIP                                  :{BLACK}بدل جميع السفن في حوض السفن آلياً
 STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP                              :{BLACK}بدل جميع الطائرات في الحظيرة آلياً
 
-
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE} تبديل {STRING}
 STR_REPLACE_VEHICLES_START                                      :{BLACK} بدأ تبديل العربات
 STR_REPLACE_VEHICLES_STOP                                       :{BLACK} اوقف تبديل العربات
@@ -3220,6 +3229,7 @@ STR_REPLACE_REMOVE_WAGON                                        :{BLACK} ازا�
 STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK} المحافظة على طول القطار بازالة عربات ابتداء من المقدمة عند التبديل - عندما يكون التبدل ينتج قطارا اطول.
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK} تبديل:  {ORANGE}{SKIP}{SKIP}{STRING}
 STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK} بدل بين نافذة استبدال المحركات و العربات
+
 STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}العربة غير متاحة
 STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE} العربات غير متاحة
 STR_SHIP_NOT_AVAILABLE                                          :{WHITE} السفن غير متاحة
@@ -3370,17 +3380,6 @@ STR_MEASURE_AREA                                                :{BLACK}المس
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}الطول: {NUM}{}فرق الارتفاع: {NUM} م
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}المساحة: {NUM} x {NUM}{}فرق الارتفاع{NUM} م
 
-############ Date formatting
-STR_FORMAT_DATE_TINY                                            :{STRING}-{STRING}-{NUM}
-STR_FORMAT_DATE_SHORT                                           :{STRING} {NUM}
-STR_FORMAT_DATE_LONG                                            :{STRING} {STRING} {NUM}
-STR_FORMAT_DATE_ISO                                             :{2:NUM}-{1:STRING}-{0:STRING}
-
-STR_JUST_DATE_TINY                                              :{DATE_TINY}
-STR_JUST_DATE_LONG                                              :{DATE_LONG}
-STR_JUST_DATE_ISO                                               :{DATE_ISO}
-########
-
 STR_FEEDER_CARGO_VALUE                                          :{BLACK}مقدار التحويل: {LTBLUE}{CURRENCY}
 STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD                            :{WHITE}هذا طريق مملوك للمدينه
 STR_DRIVE_THROUGH_ERROR_DIRECTION                               :{WHITE}... اتجاة الطريق خاطئ
@@ -3405,7 +3404,6 @@ STR_PERCENT_UP_DOWN_SMALL                                       :{TINYFONT}{WHIT
 STR_PERCENT_UP_DOWN                                             :{WHITE}{NUM}%{UPARROW}{DOWNARROW}
 
 ##### Mass Order
-STR_FORMAT_GROUP_NAME                                           :مجموعة{COMMA}
 STR_GROUP_TINY_NAME                                             :{TINYFONT}{GROUP}
 STR_GROUP_ALL_TRAINS                                            :جميع القطارات
 STR_GROUP_ALL_ROAD_VEHICLES                                     :جميع المركبات
@@ -3434,12 +3432,62 @@ STR_GROUP_DELETE_TIP                                            :{BLACK}أحذف
 STR_GROUP_RENAME_TIP                                            :{BLACK}أعد تسمية المجموعة المختارة
 STR_GROUP_REPLACE_PROTECTION_TIP                                :{BLACK}اضغط لحماية المجموعة من التغيير الكلي للعربات
 
+#### String control codes and their formatting
 STR_COMPANY_NAME                                                :{COMPANY}
 STR_ENGINE_NAME                                                 :{ENGINE}
 STR_GROUP_NAME                                                  :{GROUP}
+STR_INDUSTRY_NAME                                               :{INDUSTRY}
 STR_PRESIDENT_NAME                                              :{PRESIDENTNAME}
 STR_SIGN_NAME                                                   :{SIGN}
+STR_STATION_NAME                                                :{STATION}
+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_LONG                                              :{DATE_LONG}
+STR_JUST_DATE_ISO                                               :{DATE_ISO}
+STR_JUST_STRING                                                 :{STRING}
+STR_JUST_RAW_STRING                                             :{STRING}
+
+STR_FORMAT_DATE_TINY                                            :{STRING}-{STRING}-{NUM}
+STR_FORMAT_DATE_SHORT                                           :{STRING} {NUM}
+STR_FORMAT_DATE_LONG                                            :{STRING} {STRING} {NUM}
+STR_FORMAT_DATE_ISO                                             :{2:NUM}-{1:STRING}-{0:STRING}
+
+STR_FORMAT_COMPANY_NUM                                          :شركة {COMMA}
+STR_FORMAT_GROUP_NAME                                           :مجموعة{COMMA}
+STR_FORMAT_INDUSTRY_NAME                                        :{1:STRING}  {0:TOWN}
+
+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}السم يجب ان يكون فريدا - غير مستخدم
 
diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt
index 32c7a65bb..0ef249525 100644
--- a/src/lang/brazilian_portuguese.txt
+++ b/src/lang/brazilian_portuguese.txt
@@ -155,8 +155,6 @@ STR_ABBREV_PLASTIC                                              :{TINYFONT}PS
 STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}RE
 STR_ABBREV_NONE                                                 :{TINYFONT}NADA
 STR_ABBREV_ALL                                                  :{TINYFONT}TUDO
-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
@@ -168,17 +166,11 @@ STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Copyrigh
 STR_ABOUT_VERSION                                               :{BLACK}OpenTTD versão {REV}
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 A equipe do OpenTTD
 
-STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
-STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_QUIT_CAPTION                                                :{WHITE}Sair
 STR_YES                                                         :{BLACK}Sim
 STR_NO                                                          :{BLACK}Não
 STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Tem a certeza que deseja abandonar este jogo e voltar ao {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                                                :Nada
 STR_COLOUR_DARK_BLUE                                            :Azul Escuro
 STR_COLOUR_PALE_GREEN                                           :Verde Claro
@@ -197,8 +189,6 @@ STR_COLOUR_BROWN                                                :Marrom
 STR_COLOUR_GREY                                                 :Cinza
 STR_COLOUR_WHITE                                                :Branco
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}Existem muitos veículos em jogo
-STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
-STR_RED_COMMA                                                   :{RED}{COMMA}
 STR_BUTTON_LOCATION                                             :{BLACK}Localização
 STR_SMALLMAP_TYPE_CONTOURS                                      :Relevos
 STR_SMALLMAP_TYPE_VEHICLES                                      :Veículos
@@ -324,12 +314,13 @@ STR_SORT_CRITERIA_TIP                                           :{BLACK}Selecion
 STR_FILTER_CRITERIA_TIP                                         :{BLACK}Selecionar critério para filtração
 STR_SORT_BY                                                     :{BLACK}Ordenar por
 
+### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}População
+STR_SORT_BY_NAME                                                :{BLACK}Nome
+STR_SORT_BY_DATE                                                :{BLACK}Data
 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_DATE                                                :{BLACK}Data
 STR_SORT_BY_NUMBER                                              :Número
 STR_SORT_BY_PROFIT_LAST_YEAR                                    :Lucros do último ano
 STR_SORT_BY_PROFIT_THIS_YEAR                                    :Lucro anual
@@ -352,37 +343,25 @@ STR_SORT_BY_INTRO_DATE                                          :Data de Introdu
 STR_SORT_BY_RUNNING_COST                                        :Custo de Manutenção
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :Potência por Custo
 STR_SORT_BY_CARGO_CAPACITY                                      :Capacidade de Carga
+
 STR_NO_WAITING_CARGO                                            :{BLACK}Não há carga de nenhum tipo aguardando
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}Selecionar todas as instalações
 STR_SELECT_ALL_TYPES                                            :{BLACK}Selecionar todos os tipos de carga (inclusive as que não tem espera)
-STR_AVAILABLE_TRAINS                                            :{BLACK}Trens disponíveis
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Automóveis disponíveis
-STR_AVAILABLE_SHIPS                                             :{BLACK}Embarcações disponíveis
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Aeronaves disponíveis
 STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Ver uma lista dos designs de motor disponíveis para este tipo de veículo.
 STR_MANAGE_LIST                                                 :{BLACK}Administrar lista
 STR_MANAGE_LIST_TIP                                             :{BLACK}Envia instruções a todos os veículos desta lista
 STR_REPLACE_VEHICLES                                            :Substituir veículos
+STR_SEND_FOR_SERVICING                                          :Enviar para Manutenção
+
+STR_AVAILABLE_TRAINS                                            :{BLACK}Trens disponíveis
+STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Automóveis disponíveis
+STR_AVAILABLE_SHIPS                                             :{BLACK}Embarcações disponíveis
+STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Aeronaves disponíveis
+
 STR_SEND_TRAIN_TO_DEPOT                                         :Enviar para Depósito
 STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Enviar para Garagem
 STR_SEND_SHIP_TO_DEPOT                                          :Enviar para Depósito Naval
 STR_SEND_AIRCRAFT_TO_HANGAR                                     :Enviar para Hangar
-STR_SEND_FOR_SERVICING                                          :Enviar para Manutenção
-
-############ range for months starts
-STR_MONTH_ABBREV_JAN                                            :Jan
-STR_MONTH_ABBREV_FEB                                            :Fev
-STR_MONTH_ABBREV_MAR                                            :Mar
-STR_MONTH_ABBREV_APR                                            :Abr
-STR_MONTH_ABBREV_MAY                                            :Mai
-STR_MONTH_ABBREV_JUN                                            :Jun
-STR_MONTH_ABBREV_JUL                                            :Jul
-STR_MONTH_ABBREV_AUG                                            :Ago
-STR_MONTH_ABBREV_SEP                                            :Set
-STR_MONTH_ABBREV_OCT                                            :Out
-STR_MONTH_ABBREV_NOV                                            :Nov
-STR_MONTH_ABBREV_DEC                                            :Dez
-############ range for months ends
 
 STR_GRAPH_X_LABEL_MONTH                                         :{TINYFONT}{STRING}{} {STRING}
 STR_GRAPH_X_LABEL_MONTH_YEAR                                    :{TINYFONT}{STRING}{} {STRING}{} {NUM}
@@ -410,8 +389,6 @@ 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_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
@@ -458,7 +435,7 @@ STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Nenhum
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Nome
 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                                          :1
 STR_ORDINAL_NUMBER_2ND                                          :2
 STR_ORDINAL_NUMBER_3RD                                          :3
@@ -492,6 +469,34 @@ STR_ORDINAL_NUMBER_30TH                                         :30
 STR_ORDINAL_NUMBER_31ST                                         :31
 ############ range for days ends
 
+############ range for months starts
+STR_MONTH_ABBREV_JAN                                            :Jan
+STR_MONTH_ABBREV_FEB                                            :Fev
+STR_MONTH_ABBREV_MAR                                            :Mar
+STR_MONTH_ABBREV_APR                                            :Abr
+STR_MONTH_ABBREV_MAY                                            :Mai
+STR_MONTH_ABBREV_JUN                                            :Jun
+STR_MONTH_ABBREV_JUL                                            :Jul
+STR_MONTH_ABBREV_AUG                                            :Ago
+STR_MONTH_ABBREV_SEP                                            :Set
+STR_MONTH_ABBREV_OCT                                            :Out
+STR_MONTH_ABBREV_NOV                                            :Nov
+STR_MONTH_ABBREV_DEC                                            :Dez
+
+STR_MONTH_JAN                                                   :Janeiro
+STR_MONTH_FEB                                                   :Fevereiro
+STR_MONTH_MAR                                                   :Março
+STR_MONTH_APR                                                   :Abril
+STR_MONTH_MAY                                                   :Maio
+STR_MONTH_JUN                                                   :Junho
+STR_MONTH_JUL                                                   :Julho
+STR_MONTH_AUG                                                   :Agosto
+STR_MONTH_SEP                                                   :Setembro
+STR_MONTH_OCT                                                   :Outubro
+STR_MONTH_NOV                                                   :Novembro
+STR_MONTH_DEC                                                   :Dezembro
+############ range for months ends
+
 STR_GRAPH_Y_LABEL_NUMBER                                        :{TINYFONT}{COMMA}
 
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}Carga aceita: {LTBLUE}
@@ -581,12 +586,9 @@ 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_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_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
@@ -668,9 +670,7 @@ STR_OFF                                                         :Desligado
 STR_SUMMARY                                                     :Resumo
 STR_FULL                                                        :Completo
 STR_STATUSBAR_COMPANY_NAME                                      :{SILVER}- -  {COMPANY}  - -
-STR_BLACK_STRING                                                :{BLACK}{STRING}
 
-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
@@ -762,9 +762,6 @@ STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY                             :Financiar nova
 ############ range ends here
 
 STR_FUND_INDUSTRY_CAPTION                                       :{WHITE}Financiar nova indústria
-STR_JUST_STRING                                                 :{STRING}
-STR_JUST_RAW_STRING                                             :{STRING}
-STR_JUST_INT                                                    :{NUM}
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_RAINFOREST                       :{WHITE}...só pode ser construído em zonas florestais
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT                           :{WHITE}...só pode ser construído em áreas desérticas
 STR_STATUSBAR_PAUSED                                            :{YELLOW}* *  PAUSADO *  *
@@ -778,9 +775,6 @@ 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_BLACK_6                                                     :{BLACK}6
-STR_BLACK_7                                                     :{BLACK}7
-
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Inglês (Original)
 STR_TOWNNAME_FRENCH                                             :Francês
@@ -860,19 +854,6 @@ STR_OPTIONS_BASE_GRF_DESCRIPTION_TIP                            :{BLACK}Informa�
 
 STR_AUTOSAVE_FAILED                                             :{WHITE}Falha ao salvar automaticamente
 
-STR_MONTH_JAN                                                   :Janeiro
-STR_MONTH_FEB                                                   :Fevereiro
-STR_MONTH_MAR                                                   :Março
-STR_MONTH_APR                                                   :Abril
-STR_MONTH_MAY                                                   :Maio
-STR_MONTH_JUN                                                   :Junho
-STR_MONTH_JUL                                                   :Julho
-STR_MONTH_AUG                                                   :Agosto
-STR_MONTH_SEP                                                   :Setembro
-STR_MONTH_OCT                                                   :Outubro
-STR_MONTH_NOV                                                   :Novembro
-STR_MONTH_DEC                                                   :Dezembro
-
 STR_HEADING_FOR_STATION                                         :{LTBLUE}Indo para {STATION}
 STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}Indo para {STATION}, {VELOCITY}
 STR_NO_ORDERS                                                   :{LTBLUE}Sem ordens
@@ -887,8 +868,6 @@ STR_CRATES                                                      :caixas
 STR_RES_OTHER                                                   :outra
 STR_NOTHING                                                     :
 
-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...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Fim de Ordens Compartilhadas - -
@@ -1160,7 +1139,6 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Y-taman
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :desativado
-STR_JUST_CURRENCY                                               :{CURRENCY}
 STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Alterar valor
 
 STR_TEMPERATE_LANDSCAPE                                         :terreno temperado
@@ -1196,7 +1174,6 @@ STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}Selecion
 
 STR_WAYPOINT_VIEWPORT                                           :{WHITE}{WAYPOINT}
 STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WHITE}{WAYPOINT}
-STR_WAYPOINT_NAME                                               :{WAYPOINT}
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Editar nome do ponto de controle
 
 STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}Impossível alterar o nome do ponto de controle...
@@ -1263,11 +1240,6 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Nomes da
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...muito perto de outra indústria
 
-STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Adaptar trem para um tipo de carga diferente
-STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Adaptar trem
-STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Selecionar tipo de carga para o trem
-STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Adaptar trem para transportar a carga selecionada
-STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Impossível adaptar o trem...
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Modificar produção
 
 ############ network gui strings
@@ -1777,11 +1749,6 @@ STR_TOWN_BUILDING_NAME_TEPEES_1                                 :Ocas
 STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1                           :Casa-bule
 STR_TOWN_BUILDING_NAME_PIGGY_BANK_1                             :Mealheiro
 
-STR_INDUSTRY_NAME                                               :{INDUSTRY}
-STR_TOWN_NAME                                                   :{TOWN}
-STR_FORMAT_INDUSTRY_NAME                                        :{1:STRING} de {0:TOWN}
-STR_STATION_NAME                                                :{STATION}
-
 ##id 0x2800
 STR_LANDSCAPING_MENU_LANDSCAPING                                :Paisagem
 STR_LANDSCAPING_MENU_PLANT_TREES                                :Plantar árvores
@@ -1836,6 +1803,12 @@ STR_CARGO_RATING_EXCELLENT                                      :Excelente
 STR_CARGO_RATING_OUTSTANDING                                    :Proeminente
 ############ range for rating ends
 
+### station view strings
+STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Exibir todos os trens que possuem esta estação nas ordens de serviço
+STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Exibir todos os automóveis que possuem esta estação nas ordens de serviço
+STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Exibir todas as aeronaves que possuem esta estação nas ordens de serviço
+STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Exibir todas as embarcações que possuem esta estação nas ordens de serviço
+
 STR_STATION_VIEW_CARGO_RATING                                   :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO                        :{WHITE}{STATION} não aceita mais {STRING}
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO               :{WHITE}{STATION} não aceita mais {STRING} ou {STRING}
@@ -2079,6 +2052,7 @@ STR_SV_STNAME_AIRPORT                                           :Aeroporto de {S
 STR_SV_STNAME_OILFIELD                                          :Petrolífera de {STRING}
 STR_SV_STNAME_MINES                                             :Minas de {STRING}
 STR_SV_STNAME_DOCKS                                             :Docas de {STRING}
+##id 0x6020
 STR_SV_STNAME_ANNEXE                                            :Anexo de {STRING}
 STR_SV_STNAME_SIDINGS                                           :Desvio de {STRING}
 STR_SV_STNAME_BRANCH                                            :Ramal de {STRING}
@@ -2126,8 +2100,6 @@ STR_NUM_LOW                                                     :Baixo
 STR_NUM_NORMAL                                                  :Normal
 STR_NUM_HIGH                                                    :Alto
 STR_NUM_CUSTOM                                                  :Personalizado
-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
@@ -2161,7 +2133,6 @@ STR_CITY_APPROVAL_HOSTILE                                       :Hostil
 
 ##id 0x7000
 STR_COMPANY_VIEW_CAPTION                                        :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
-STR_FORMAT_COMPANY_NUM                                          :(Companhia {COMMA})
 STR_COMPANY_VIEW_NEW_FACE_BUTTON                                :{BLACK}Novo Rosto
 STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON                           :{BLACK}Cores
 STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}Cores:
@@ -2194,7 +2165,6 @@ STR_FINANCES_TOTAL_CAPTION                                      :{WHITE}Total:
 STR_COMPANY_NAME_COMPANY_NUM                                    :{COMPANY} {COMPANYNUM}
 STR_GRAPH_INCOME_CAPTION                                        :{WHITE}Gráfico de Rendimentos
 STR_CURRCOMPACT                                                 :{CURRCOMPACT}
-STR_JUST_COMMA                                                  :{COMMA}
 STR_GRAPH_OPERATING_PROFIT_CAPTION                              :{WHITE}Gráfico de Lucros Operacionais
 STR_FINANCES_BANK_BALANCE_TITLE                                 :{WHITE}Balanço Bancário
 STR_FINANCES_LOAN_TITLE                                         :{WHITE}Empréstimo
@@ -2597,10 +2567,8 @@ STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE                          :locomotiva mono
 STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE                            :locomotiva trem-bala
 
 ##id 0x8800
-STR_DEPOT_TRAIN_CAPTION                                         :{WHITE}Depósito ferroviário de {TOWN}
 STR_NEWS_FIRST_TRAIN_ARRIVAL                                    :{BLACK}{BIGFONT}Cidadãos celebram . . .{}Primeiro trem chega a {STATION}!
 STR_VEHICLE_DETAILS_CAPTION                                     :{WHITE}{VEHICLE} (Detalhes)
-STR_ERROR_TRAIN_IN_THE_WAY                                      :{WHITE}Trem no caminho
 STR_ORDER                                                       :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 STR_ORDER_SELECTED                                              :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 STR_ORDER_NON_STOP                                              :{BLACK}Sem parar
@@ -2690,38 +2658,16 @@ STR_TIMETABLE_AND_TRAVEL_FOR                                    :e viajar por {S
 STR_TIMETABLE_DAYS                                              :{COMMA} dia{P "" s}
 STR_TIMETABLE_TICKS                                             :{COMMA} tique{P "" s}
 
-STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Indo para o depósito de {TOWN}
-STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Indo para o depósito de {TOWN}, {VELOCITY}
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Manutenção no depósito de {TOWN}
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Manutenção no depósito de {TOWN}, {VELOCITY}
-
 STR_INVALID_ORDER                                               :{RED} (Ordem Inválida)
 
 STR_UNKNOWN_STATION                                             :estação desconhecida
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}Vazio
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} de {STATION}
 STR_VEHICLE_DETAILS_CARGO_FROM_MULT                             :{LTBLUE}{CARGO} de {STATION} (x{NUM})
-STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} está aguardando no depósito
-STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Novos Veículos
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}Trem muito longo
 STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}Os trens só podem ser alterados quando parados num depósito
-STR_VEHICLE_LIST_TRAIN_CAPTION                                  :{WHITE}{STRING} - {COMMA} Trens
 
-STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}Novos Veículos Ferroviários
-STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}Nova Locomotiva Elétrica
-STR_BUILD_VEHICLE_TRAIN_MONORAIL_CAPTION                        :{WHITE}Nova Locomotiva Monotrilho
-STR_BUILD_VEHICLE_TRAIN_MAGLEV_CAPTION                          :{WHITE}Nova Locomotiva Trem-Bala
-STR_BUILD_VEHICLE_TRAIN_ALL_CAPTION                             :{WHITE}Trens
-
-STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_BUTTON                    :{BLACK}Construir Veículo
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Clonar Automóvel
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Isso irá construir uma cópia do automóvel. Control-clique vai compartilhar as ordens
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Isso irá construir uma cópia do automóvel. Clique neste botão e depois em um automóvel dentro ou fora da garagem. Control-clique vai compartilhar as ordens
-STR_CLONE_TRAIN                                                 :{BLACK}Clonar Trem
-STR_CLONE_TRAIN_INFO                                            :{BLACK}Isso vai construir uma cópia do trem, incluindo os vagões. Control-clique vai compartilhar as ordens
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Isso irá construir uma cópia do trem, incluindo os vagões. Clique neste botão e depois em um trem dentro ou fora do depósito . Control-clique vai compartilhar as ordens
-STR_BUILD_VEHICLE_TRAIN_RENAME_BUTTON                           :{BLACK}Renomear
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Saltar
 STR_ORDERS_DELETE_BUTTON                                        :{BLACK}Remover
 STR_ORDERS_GO_TO_BUTTON                                         :{BLACK}Ir Para
@@ -2737,14 +2683,12 @@ STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Alternar
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Ordens)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Fim de Ordens - -
 STR_SERVICE                                                     :{BLACK}Manutenção
-STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Impossível construir veículo ferroviário...
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Construído: {LTBLUE}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Valor: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
 STR_VEHICLE_STATUS_LOADING_UNLOADING                            :{LTBLUE}Carregando / descarregando
 STR_VEHICLE_STATUS_LEAVING                                      :{LTBLUE}Saindo
 STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}O trem deve estar parado dentro do depósito
-STR_ERROR_CAN_T_SEND_TRAIN_TO_DEPOT                             :{WHITE}Impossível enviar o trem para o depósito...
 STR_ERROR_NO_MORE_SPACE_FOR_ORDERS                              :{WHITE}Não há espaço para mais ordens
 STR_ERROR_TOO_MANY_ORDERS                                       :{WHITE}Muitas ordens
 STR_ERROR_CAN_T_INSERT_NEW_ORDER                                :{WHITE}Impossível inserir nova ordem...
@@ -2759,26 +2703,11 @@ STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE}um veíc
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}Impossível mover veículo...
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}A locomotiva traseira sempre deve seguir sua complementar frontal
 STR_CARGO_N_A                                                   :N/D{SKIP}
-STR_ERROR_CAN_T_SELL_TRAIN                                      :{WHITE}Impossível vender veículo ferroviário...
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}Incapaz de encontrar rota para o depósito local
-STR_ERROR_CAN_T_STOP_START_TRAIN                                :{WHITE}Impossível iniciar/parar o trem...
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}Intervalo de serviço: {LTBLUE}{COMMA}dias{BLACK}   Último serviço: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}Intervalo de serviço: {LTBLUE}{COMMA}%{BLACK}   Último serviço: {LTBLUE}{DATE_LONG}
-STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP                             :{BLACK}Trens - clique num trem para informações
-STR_DEPOT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Trens - clique num trem para informações, arraste um veículo o adicionar ao tren ou remover
-STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP                            :{BLACK}Construir novo veículo ferroviário
-STR_DEPOT_TRAIN_SELL_TOOLTIP                                    :{BLACK}Arraste o veículo aqui para vendê-lo
-STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}Centrar visualização na localização de um depósito ferroviário
-STR_BUILD_VEHICLE_TRAIN_LIST_TOOLTIP                            :{BLACK}Lista de trens - clique num trem para informações
-STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_TOOLTIP                   :{BLACK}Construir o veículo ferroviário selecionado
-STR_BUILD_VEHICLE_TRAIN_RENAME_TOOLTIP                          :{BLACK}Renomear tipo de veículo ferroviário
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP                 :{BLACK}Tarefa atual do trem - clique aqui para iniciar/parar o trem
-STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP                           :{BLACK}Exibir ordens do trem
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP                         :{BLACK}Centrar visualização na localização do trem
-STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP                    :{BLACK}Enviar trem para o depósito
 STR_VEHICLE_VIEW_TRAIN_IGNORE_SIGNAL_TOOLTIP                    :{BLACK}Forçar trem a prosseguir sem esperar pelo sinal
 STR_VEHICLE_VIEW_TRAIN_REVERSE_TOOLTIP                          :{BLACK}Inverter direção do trem
-STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Exibir detalhes do trem
 STR_VEHICLE_DETAILS_INCREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Aumentar intervalo de serviço
 STR_VEHICLE_DETAILS_DECREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Diminuir intervalo de serviço
 STR_VEHICLE_DETAILS_TRAIN_CARGO_TOOLTIP                         :{BLACK}Exibir detalhes da carga transportada
@@ -2812,15 +2741,10 @@ STR_VEHICLE_STATUS_STOPPED                                      :{RED}Parado
 STR_ERROR_CAN_T_MAKE_TRAIN_PASS_SIGNAL                          :{WHITE}Impossível fazer o trem passar o sinal de perigo...
 STR_VEHICLE_STATUS_CRASHED                                      :{RED}Acidentado!
 
-STR_QUERY_RENAME_TRAIN_CAPTION                                  :{WHITE}Renomear trem
-STR_ERROR_CAN_T_RENAME_TRAIN                                    :{WHITE}Impossível renomear trem...
-STR_VEHICLE_DETAILS_TRAIN_RENAME                                :{BLACK}Renomear trem
 STR_NEWS_TRAIN_CRASH                                            :{BLACK}{BIGFONT}Acidente Ferroviário!{} {COMMA} mortos numa explosão após a colisão
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Impossível inverter a direção do trem...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE                  :{WHITE}Impossível virar o veículo...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Impossível virar veículos formados por unidades múltiplas
-STR_QUERY_RENAME_TRAIN_TYPE_CAPTION                             :{WHITE}Renomear tipo de veículo ferroviário
-STR_ERROR_CAN_T_RENAME_TRAIN_TYPE                               :{WHITE}Impossível renomear tipo de veículo ferroviário...
 STR_CLEAR_TIME                                                  :{BLACK}Resetar horário
 STR_RESET_LATENESS                                              :{BLACK}Resetar contador de atraso
 STR_CHANGE_WAYPOINT_NAME                                        :{BLACK}Renomear ponto de controle
@@ -2852,45 +2776,14 @@ STR_TIMETABLE_AUTOFILL                                          :{BLACK}Autopree
 STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Preenche automaticamente com os valores da próxima viagem. (CTRL-clique para tentar manter os intervalos de espera)
 
 ##id 0x9000
-STR_ERROR_ROAD_VEHICLE_IN_THE_WAY                               :{WHITE}Automóvel no caminho
-STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING} - {COMMA} Automóve{P l is}
-STR_DEPOT_ROAD_VEHICLE_CAPTION                                  :{WHITE}{TOWN} Garagem
-STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_BUTTON                      :{BLACK}Novos Veículos
-STR_BUILD_VEHICLE_ROAD_VEHICLE_CAPTION                          :{WHITE}Novos Automóveis
-STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_BUTTON             :{BLACK}Construir Veículo
-STR_ERROR_CAN_T_BUILD_ROAD_VEHICLE                              :{WHITE}Impossível construir automóvel...
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}...deve estar parado dentro de uma garagem
-STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}Impossível vender automóvel...
-STR_ERROR_CAN_T_STOP_START_ROAD_VEHICLE                         :{WHITE}Impossível iniciar/parar automóvel...
-STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} está aguardando no depósito
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Indo para a garagem de {TOWN}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Indo para a garagem de {TOWN}, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Manutenção na garagem de {TOWN}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Manutenção na garagem de {TOWN}, {VELOCITY}
-STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Impossível enviar o veículo para a garagem...
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Incapaz de encontrar a garagem local
-STR_VEHICLE_LIST_ROAD_VEHICLE_TOOLTIP                           :{BLACK}Automóveis - clique num veículo para informações
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP          :{BLACK}Tarefa atual do veículo - clique aqui para iniciar/parar veículo
-STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP                    :{BLACK}Exibir ordens do veículo
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP                  :{BLACK}Centrar visualização na localização do veículo
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}Enviar veículo para a garagem. CTRL+clique irá apenas reparar
 STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP                   :{BLACK}Forçar veículo a dar a volta
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Exibir detalhes do automóvel
-STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Veículos - clique num veículo para informações
-STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}Construir novo automóvel
-STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}Arraste o automóvel aqui para vendê-lo
-STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}Centrar visualização na localização da garagem
-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_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})
 
-STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Renomear automóvel
-STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Impossível renomear automóvel...
-STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Renomear automóvel
 STR_NEWS_FIRST_BUS_ARRIVAL                                      :{BLACK}{BIGFONT}Cidadãos celebram . . .{}Primeiro ônibus chega a {STATION}!
 STR_NEWS_FIRST_TRUCK_ARRIVAL                                    :{BLACK}{BIGFONT}Cidadãos celebram . . .{}Primeiro caminhão chega a {STATION}!
 STR_NEWS_FIRST_PASSENGER_TRAM_ARRIVAL                           :{BLACK}{BIGFONT}Cidadãos celebram . . .{}Primeiro bonde de passageiros chega a {STATION}!
@@ -2898,132 +2791,39 @@ STR_NEWS_FIRST_CARGO_TRAM_ARRIVAL                               :{BLACK}{BIGFONT
 STR_NEWS_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Acidente Rodoviário!{} Condutor morre numa explosão após a colisão com um trem
 STR_NEWS_ROAD_VEHICLE_CRASH                                     :{BLACK}{BIGFONT}Acidente Rodoviário!{} {COMMA} mortos numa explosão após a colisão com um trem
 STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}Impossível virar o veículo...
-STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Renomear
-STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Renomear tipo do automóvel
-STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Renomear tipo do automóvel
-STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Impossível renomear tipo do automóvel...
 
-STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Adaptar automóvel para carregar tipo de carga diferente
-STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Adaptar automóvel
-STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Adaptar automóvel para carregar o tipo de carga selecionado
-STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Impossível adaptar automóvel...
-STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Selecionar tipo de carga para o automóvel
 
 ##id 0x9800
 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :Construção de hidrovias
 STR_WATERWAYS_TOOLBAR_CAPTION                                   :{WHITE}Construção de hidrovias
 STR_WATERWAYS_TOOLBAR_CAPTION_SE                                :{WHITE}Hidrovias
 STR_ERROR_CAN_T_BUILD_DOCK_HERE                                 :{WHITE}Impossível construir doca aqui...
-STR_DEPOT_SHIP_CAPTION                                          :{WHITE}Depósito Naval de {TOWN}
-STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON                              :{BLACK}Novas Embarcações
-STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - {COMMA} Embarcaç{P ão ões}
-STR_BUILD_VEHICLE_SHIP_CAPTION                                  :{WHITE}Novas Embarcações
-STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON                     :{BLACK}Construir Embarcação
-STR_CLONE_SHIP                                                  :{BLACK}Clonar Embarcação
-STR_CLONE_SHIP_INFO                                             :{BLACK}Isso vai construir uma cópia da embarcação. Control-clique vai compartilhar as ordens
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Isso irá construir uma cópia da embarcação. Clique neste botão e depois em uma embarcação dentro ou fora do depósito naval. Control-clique vai compartilhar as ordens
 STR_ERROR_SHIP_MUST_BE_STOPPED_IN_DEPOT                         :{WHITE}A embarcação deve estar parado no depósito naval
-STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}Impossível vender embarcação...
-STR_ERROR_CAN_T_BUILD_SHIP                                      :{WHITE}Impossível construir embarcação...
-STR_ERROR_SHIP_IN_THE_WAY                                       :{WHITE}Embarcação no caminho
-STR_ERROR_CAN_T_STOP_START_SHIP                                 :{WHITE}Impossível iniciar/parar embarcação...
-STR_ERROR_CAN_T_SEND_SHIP_TO_DEPOT                              :{WHITE}Impossível enviar embarcação para o depósito...
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Indo para o depósito naval de {TOWN}
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Indo para o depósito naval {TOWN}, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Manutenção no depósito naval de {TOWN}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Manutenção no depósito naval de {TOWN}, {VELOCITY}
-STR_NEWS_SHIP_IS_WAITING                                        :{WHITE}{VEHICLE} está aguardando no depósito
 STR_WATERWAYS_TOOLBAR_BUILD_DOCK_TOOLTIP                        :{BLACK}Construir doca naval
 STR_WATERWAYS_TOOLBAR_BUILD_DEPOT_TOOLTIP                       :{BLACK}Construir depósito naval (para criação e manutenção de embarcações)
-STR_DEPOT_SHIP_LIST_TOOLTIP                                     :{BLACK}Embarcações - clique numa embarcação para informações
-STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}Construir nova embarcação
-STR_DEPOT_SHIP_SELL_TOOLTIP                                     :{BLACK}Arraste a embarcação aqui para vendê-la
-STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}Centrar visualização na localização do depósito naval
-STR_VEHICLE_LIST_SHIP_TOOLTIP                                   :{BLACK}Embarcações - clique numa embarcação para informações
-STR_BUILD_VEHICLE_SHIP_LIST_TOOLTIP                             :{BLACK}Lista de embarcações - clique numa embarcação para informações
-STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP                    :{BLACK}Construir embarcação selecionado
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP                  :{BLACK}Tarefa atual da embarcação - clique aqui para iniciar/parar embarcação
-STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Exibir ordens da embarcação
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP                          :{BLACK}Centrar visualização na localização da embarcação
-STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}Enviar embarcação para o depósito. CTRL+clique fará apenas manutenção
-STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Exibir detalhes da embarcação
-STR_VEHICLE_DETAILS_SHIP_RENAME                                 :{BLACK}Renomear embarcação
 
-STR_QUERY_RENAME_SHIP_CAPTION                                   :{WHITE}Renomear embarcação
-STR_ERROR_CAN_T_RENAME_SHIP                                     :{WHITE}Impossível renomear embarcação...
 STR_NEWS_FIRST_SHIP_ARRIVAL                                     :{BLACK}{BIGFONT}Cidadãos celebram . . .{} Primeira embarcação chega a {STATION}!
 STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}Posicione a bóia, que pode ser usada para marcar pontos de rota adicionais
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}Impossível posicionar bóia aqui...
 STR_BUILD_AQUEDUCT                                              :{BLACK}Construir aqueduto
 STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}Impossível construir aqueduto aqui
-STR_BUILD_VEHICLE_SHIP_RENAME_BUTTON                            :{BLACK}Renomear
-STR_BUILD_VEHICLE_SHIP_RENAME_TOOLTIP                           :{BLACK}Renomear tipo de embarcação
-STR_QUERY_RENAME_SHIP_TYPE_CAPTION                              :{WHITE}Renomear tipo de embarcação
-STR_ERROR_CAN_T_RENAME_SHIP_TYPE                                :{WHITE}Impossível renomear tipo de embarcação...
-STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}Adaptar a carga da embarcação para transportar uma carga diferente
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (Adaptar)
-STR_REFIT_SHIP_REFIT_BUTTON                                     :{BLACK}Adaptar embarcação
-STR_REFIT_SHIP_LIST_TOOLTIP                                     :{BLACK}Selecionar tipo de carga para a embarcação
-STR_REFIT_SHIP_REFIT_TOOLTIP                                    :{BLACK}Adaptar embarcação para transportar a carga selecionada
 STR_REFIT_TITLE                                                 :{GOLD}Selecionar tipo de carga:
 STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}Nova capacidade: {GOLD}{CARGO}{}{BLACK}Custo da adaptação: {GOLD}{CURRENCY}
-STR_ERROR_CAN_T_REFIT_SHIP                                      :{WHITE}Impossível adaptar embarcação...
 STR_REFITTABLE                                                  :(adaptável)
 
 ##id 0xA000
 STR_TOOLBAR_AIRCRAFT_CAPTION                                    :{WHITE}Aeroportos
 STR_ERROR_CAN_T_BUILD_AIRPORT_HERE                              :{WHITE}Impossível construir aeroporto aqui...
-STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}{STATION} Hangar
-STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON                          :{BLACK}Nova Aeronave
-STR_CLONE_AIRCRAFT                                              :{BLACK}Clonar Aeronave
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Isso vai construir uma cópia da aeronave. Control-clique vai compartilhar as ordens
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Isso vai construir uma cópia de uma aeronave. Clique nesse botão e depois em uma aeronave dentro ou fora do hangar. Control-clique vai compartilhar as ordens
-STR_BUILD_VEHICLE_AIRCRAFT_CAPTION                              :{WHITE}Nova Aeronave
-STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON                 :{BLACK}Construir Aeronave
-STR_ERROR_CAN_T_BUILD_AIRCRAFT                                  :{WHITE}Impossível construir aeronave...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} Aeronaves
-STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR                         :{WHITE}Impossível enviar aeronave para o hangar...
-STR_HEADING_FOR_HANGAR                                          :{ORANGE}Indo para o hangar de {STATION}
-STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Indo para o hangar de {STATION}, {VELOCITY}
-STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Manutenção no Hangar de {STATION}
-STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Manutenção no Hangar de {STATION}, {VELOCITY}
-STR_NEWS_AIRCRAFT_IS_WAITING                                    :{WHITE}{VEHICLE} está aguardando no hangar
-STR_ERROR_AIRCRAFT_IN_THE_WAY                                   :{WHITE}Aeronave no caminho
-STR_ERROR_CAN_T_STOP_START_AIRCRAFT                             :{WHITE}Impossível iniciar/parar aeronave...
 STR_ERROR_AIRCRAFT_IS_IN_FLIGHT                                 :{WHITE}Aeronave está em voo
 STR_ERROR_AIRCRAFT_MUST_BE_STOPPED                              :{WHITE}A aeronave deve estar parada no hangar
-STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}Impossível vender aeronave...
 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION                          :Construir aeroporto
 STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Construir aeroporto
-STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP                               :{BLACK}Aeronave - clique na aeronave para informações
-STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Aeronave - clique na aeronave para informações
-STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}Construir nova aeronave
-STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}Arraste a aeronave aqui para vendê-la
-STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Centrar visualização na localização do hangar
-STR_BUILD_VEHICLE_AIRCRAFT_LIST_TOOLTIP                         :{BLACK}Lista de aeronaves - clique numa aeronave para informações
-STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_TOOLTIP                :{BLACK}Construir a aeronave selecionada
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP              :{BLACK}Tarefa atual da aeronave - clique aqui para iniciar/parar a aeronave
-STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Exibir ordens da aeronave
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP                      :{BLACK}Centrar visualização na localização da aeronave
-STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}Enviar aeronave para o hangar
-STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Exibir detalhes da aeronave
 
-STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}Renomear aeronave
-STR_ERROR_CAN_T_RENAME_AIRCRAFT                                 :{WHITE}Impossível renomear aeronave...
-STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}Renomear aeronave
 STR_NEWS_FIRST_AIRCRAFT_ARRIVAL                                 :{BLACK}{BIGFONT}Cidadãos celebram . . .{}Primeira aeronave chega a {STATION}!
 STR_NEWS_AIRCRAFT_CRASH                                         :{BLACK}{BIGFONT}Acidente Aéreo!{} {COMMA} mortos numa explosão em {STATION}
 STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Acidente Aéreo!{} Aeronave ficou sem combustivél, {COMMA} mortos numa explosão!
 STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
-STR_BUILD_VEHICLE_AIRCRAFT_RENAME_BUTTON                        :{BLACK}Renomear
-STR_BUILD_VEHICLE_AIRCRAFT_RENAME_TOOLTIP                       :{BLACK}Renomear tipo de aeronave
-STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION                          :{WHITE}Renomear tipo de aeronave
-STR_ERROR_CAN_T_RENAME_AIRCRAFT_TYPE                            :{WHITE}Impossível renomear tipo de aeronave...
-STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Adaptar aeronave para transportar uma carga diferente
-STR_REFIT_AIRCRAFT_REFIT_BUTTON                                 :{BLACK}Adaptar aeronave
-STR_REFIT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Selecionar tipo de carga para a aeronave
-STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}Adaptar aeronave para transportar a carga selecionada
-STR_ERROR_CAN_T_REFIT_AIRCRAFT                                  :{WHITE}Impossível adaptar aeronave...
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Timetable)
 
@@ -3177,15 +2977,225 @@ STR_LORRY                                                       :{BLACK}{LORRY}
 STR_PLANE                                                       :{BLACK}{PLANE}
 STR_SHIP                                                        :{BLACK}{SHIP}
 
+############ Vehicle lists
+STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP                             :{BLACK}Trens - clique num trem para informações
+STR_VEHICLE_LIST_ROAD_VEHICLE_TOOLTIP                           :{BLACK}Automóveis - clique num veículo para informações
+STR_VEHICLE_LIST_SHIP_TOOLTIP                                   :{BLACK}Embarcações - clique numa embarcação para informações
+STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP                               :{BLACK}Aeronave - clique na aeronave para informações
 
-STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Exibir todos os trens que possuem esta estação nas ordens de serviço
-STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Exibir todos os automóveis que possuem esta estação nas ordens de serviço
-STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Exibir todas as aeronaves que possuem esta estação nas ordens de serviço
-STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Exibir todas as embarcações que possuem esta estação nas ordens de serviço
+STR_VEHICLE_LIST_TRAIN_CAPTION                                  :{WHITE}{STRING} - {COMMA} Trens
+STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING} - {COMMA} Automóve{P l is}
+STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - {COMMA} Embarcaç{P ão ões}
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} Aeronaves
 
 STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}Ordens compartilhadas de {COMMA} veículo{P "" s}
 STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Exibir todos os veículos com a mesma rota
 
+STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} está aguardando no depósito
+STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} está aguardando no depósito
+STR_NEWS_SHIP_IS_WAITING                                        :{WHITE}{VEHICLE} está aguardando no depósito
+STR_NEWS_AIRCRAFT_IS_WAITING                                    :{WHITE}{VEHICLE} está aguardando no hangar
+
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Adaptar trem
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Adaptar automóvel
+STR_REFIT_SHIP_REFIT_BUTTON                                     :{BLACK}Adaptar embarcação
+STR_REFIT_AIRCRAFT_REFIT_BUTTON                                 :{BLACK}Adaptar aeronave
+
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Adaptar trem para transportar a carga selecionada
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Adaptar automóvel para carregar o tipo de carga selecionado
+STR_REFIT_SHIP_REFIT_TOOLTIP                                    :{BLACK}Adaptar embarcação para transportar a carga selecionada
+STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}Adaptar aeronave para transportar a carga selecionada
+
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Selecionar tipo de carga para o trem
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Selecionar tipo de carga para o automóvel
+STR_REFIT_SHIP_LIST_TOOLTIP                                     :{BLACK}Selecionar tipo de carga para a embarcação
+STR_REFIT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Selecionar tipo de carga para a aeronave
+
+STR_DEPOT_TRAIN_CAPTION                                         :{WHITE}Depósito ferroviário de {TOWN}
+STR_DEPOT_ROAD_VEHICLE_CAPTION                                  :{WHITE}{TOWN} Garagem
+STR_DEPOT_SHIP_CAPTION                                          :{WHITE}Depósito Naval de {TOWN}
+STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}{STATION} Hangar
+
+STR_VEHICLE_DETAILS_TRAIN_RENAME                                :{BLACK}Renomear trem
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Renomear automóvel
+STR_VEHICLE_DETAILS_SHIP_RENAME                                 :{BLACK}Renomear embarcação
+STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}Renomear aeronave
+
+STR_QUERY_RENAME_TRAIN_CAPTION                                  :{WHITE}Renomear trem
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Renomear automóvel
+STR_QUERY_RENAME_SHIP_CAPTION                                   :{WHITE}Renomear embarcação
+STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}Renomear aeronave
+
+STR_ERROR_TRAIN_IN_THE_WAY                                      :{WHITE}Trem no caminho
+STR_ERROR_ROAD_VEHICLE_IN_THE_WAY                               :{WHITE}Automóvel no caminho
+STR_ERROR_SHIP_IN_THE_WAY                                       :{WHITE}Embarcação no caminho
+STR_ERROR_AIRCRAFT_IN_THE_WAY                                   :{WHITE}Aeronave no caminho
+
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Impossível adaptar o trem...
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Impossível adaptar automóvel...
+STR_ERROR_CAN_T_REFIT_SHIP                                      :{WHITE}Impossível adaptar embarcação...
+STR_ERROR_CAN_T_REFIT_AIRCRAFT                                  :{WHITE}Impossível adaptar aeronave...
+
+STR_ERROR_CAN_T_RENAME_TRAIN                                    :{WHITE}Impossível renomear trem...
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Impossível renomear automóvel...
+STR_ERROR_CAN_T_RENAME_SHIP                                     :{WHITE}Impossível renomear embarcação...
+STR_ERROR_CAN_T_RENAME_AIRCRAFT                                 :{WHITE}Impossível renomear aeronave...
+
+STR_ERROR_CAN_T_STOP_START_TRAIN                                :{WHITE}Impossível iniciar/parar o trem...
+STR_ERROR_CAN_T_STOP_START_ROAD_VEHICLE                         :{WHITE}Impossível iniciar/parar automóvel...
+STR_ERROR_CAN_T_STOP_START_SHIP                                 :{WHITE}Impossível iniciar/parar embarcação...
+STR_ERROR_CAN_T_STOP_START_AIRCRAFT                             :{WHITE}Impossível iniciar/parar aeronave...
+
+STR_ERROR_CAN_T_SEND_TRAIN_TO_DEPOT                             :{WHITE}Impossível enviar o trem para o depósito...
+STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Impossível enviar o veículo para a garagem...
+STR_ERROR_CAN_T_SEND_SHIP_TO_DEPOT                              :{WHITE}Impossível enviar embarcação para o depósito...
+STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR                         :{WHITE}Impossível enviar aeronave para o hangar...
+
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Impossível construir veículo ferroviário...
+STR_ERROR_CAN_T_BUILD_ROAD_VEHICLE                              :{WHITE}Impossível construir automóvel...
+STR_ERROR_CAN_T_BUILD_SHIP                                      :{WHITE}Impossível construir embarcação...
+STR_ERROR_CAN_T_BUILD_AIRCRAFT                                  :{WHITE}Impossível construir aeronave...
+
+STR_ERROR_CAN_T_RENAME_TRAIN_TYPE                               :{WHITE}Impossível renomear tipo de veículo ferroviário...
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Impossível renomear tipo do automóvel...
+STR_ERROR_CAN_T_RENAME_SHIP_TYPE                                :{WHITE}Impossível renomear tipo de embarcação...
+STR_ERROR_CAN_T_RENAME_AIRCRAFT_TYPE                            :{WHITE}Impossível renomear tipo de aeronave...
+
+STR_ERROR_CAN_T_SELL_TRAIN                                      :{WHITE}Impossível vender veículo ferroviário...
+STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}Impossível vender automóvel...
+STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}Impossível vender embarcação...
+STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}Impossível vender aeronave...
+
+STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP                 :{BLACK}Tarefa atual do trem - clique aqui para iniciar/parar o trem
+STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP          :{BLACK}Tarefa atual do veículo - clique aqui para iniciar/parar veículo
+STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP                  :{BLACK}Tarefa atual da embarcação - clique aqui para iniciar/parar embarcação
+STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP              :{BLACK}Tarefa atual da aeronave - clique aqui para iniciar/parar a aeronave
+
+STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP                           :{BLACK}Exibir ordens do trem
+STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP                    :{BLACK}Exibir ordens do veículo
+STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Exibir ordens da embarcação
+STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Exibir ordens da aeronave
+
+STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP                         :{BLACK}Centrar visualização na localização do trem
+STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP                  :{BLACK}Centrar visualização na localização do veículo
+STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP                          :{BLACK}Centrar visualização na localização da embarcação
+STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP                      :{BLACK}Centrar visualização na localização da aeronave
+
+STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP                    :{BLACK}Enviar trem para o depósito
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}Enviar veículo para a garagem. CTRL+clique irá apenas reparar
+STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}Enviar embarcação para o depósito. CTRL+clique fará apenas manutenção
+STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}Enviar aeronave para o hangar
+
+STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Exibir detalhes do trem
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Exibir detalhes do automóvel
+STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Exibir detalhes da embarcação
+STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Exibir detalhes da aeronave
+
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Adaptar trem para um tipo de carga diferente
+STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Adaptar automóvel para carregar tipo de carga diferente
+STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}Adaptar a carga da embarcação para transportar uma carga diferente
+STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Adaptar aeronave para transportar uma carga diferente
+
+STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Indo para o depósito de {TOWN}
+STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Indo para o depósito de {TOWN}, {VELOCITY}
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Indo para a garagem de {TOWN}
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Indo para a garagem de {TOWN}, {VELOCITY}
+STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Indo para o depósito naval de {TOWN}
+STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Indo para o depósito naval {TOWN}, {VELOCITY}
+STR_HEADING_FOR_HANGAR                                          :{ORANGE}Indo para o hangar de {STATION}
+STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Indo para o hangar de {STATION}, {VELOCITY}
+
+STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Manutenção no depósito de {TOWN}
+STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Manutenção no depósito de {TOWN}, {VELOCITY}
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Manutenção na garagem de {TOWN}
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Manutenção na garagem de {TOWN}, {VELOCITY}
+STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Manutenção no depósito naval de {TOWN}
+STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Manutenção no depósito naval de {TOWN}, {VELOCITY}
+STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Manutenção no Hangar de {STATION}
+STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Manutenção no Hangar de {STATION}, {VELOCITY}
+
+
+STR_CLONE_TRAIN                                                 :{BLACK}Clonar Trem
+STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Clonar Automóvel
+STR_CLONE_SHIP                                                  :{BLACK}Clonar Embarcação
+STR_CLONE_AIRCRAFT                                              :{BLACK}Clonar Aeronave
+
+STR_CLONE_TRAIN_INFO                                            :{BLACK}Isso vai construir uma cópia do trem, incluindo os vagões. Control-clique vai compartilhar as ordens
+STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Isso irá construir uma cópia do automóvel. Control-clique vai compartilhar as ordens
+STR_CLONE_SHIP_INFO                                             :{BLACK}Isso vai construir uma cópia da embarcação. Control-clique vai compartilhar as ordens
+STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Isso vai construir uma cópia da aeronave. Control-clique vai compartilhar as ordens
+
+STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Isso irá construir uma cópia do trem, incluindo os vagões. Clique neste botão e depois em um trem dentro ou fora do depósito . Control-clique vai compartilhar as ordens
+STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Isso irá construir uma cópia do automóvel. Clique neste botão e depois em um automóvel dentro ou fora da garagem. Control-clique vai compartilhar as ordens
+STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Isso irá construir uma cópia da embarcação. Clique neste botão e depois em uma embarcação dentro ou fora do depósito naval. Control-clique vai compartilhar as ordens
+STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Isso vai construir uma cópia de uma aeronave. Clique nesse botão e depois em uma aeronave dentro ou fora do hangar. Control-clique vai compartilhar as ordens
+
+STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}Novos Veículos Ferroviários
+STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}Nova Locomotiva Elétrica
+STR_BUILD_VEHICLE_TRAIN_MONORAIL_CAPTION                        :{WHITE}Nova Locomotiva Monotrilho
+STR_BUILD_VEHICLE_TRAIN_MAGLEV_CAPTION                          :{WHITE}Nova Locomotiva Trem-Bala
+
+STR_BUILD_VEHICLE_TRAIN_ALL_CAPTION                             :{WHITE}Trens
+STR_BUILD_VEHICLE_ROAD_VEHICLE_CAPTION                          :{WHITE}Novos Automóveis
+STR_BUILD_VEHICLE_SHIP_CAPTION                                  :{WHITE}Novas Embarcações
+STR_BUILD_VEHICLE_AIRCRAFT_CAPTION                              :{WHITE}Nova Aeronave
+
+STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_BUTTON                    :{BLACK}Construir Veículo
+STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_BUTTON             :{BLACK}Construir Veículo
+STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON                     :{BLACK}Construir Embarcação
+STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON                 :{BLACK}Construir Aeronave
+
+STR_BUILD_VEHICLE_TRAIN_LIST_TOOLTIP                            :{BLACK}Lista de trens - clique num trem para informações
+STR_BUILD_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP                     :{BLACK}Lista de automóveis - clique num automóvel para informações
+STR_BUILD_VEHICLE_SHIP_LIST_TOOLTIP                             :{BLACK}Lista de embarcações - clique numa embarcação para informações
+STR_BUILD_VEHICLE_AIRCRAFT_LIST_TOOLTIP                         :{BLACK}Lista de aeronaves - clique numa aeronave para informações
+
+STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_TOOLTIP                   :{BLACK}Construir o veículo ferroviário selecionado
+STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_TOOLTIP            :{BLACK}Construir o veículo selecionado
+STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP                    :{BLACK}Construir embarcação selecionado
+STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_TOOLTIP                :{BLACK}Construir a aeronave selecionada
+
+STR_BUILD_VEHICLE_TRAIN_RENAME_BUTTON                           :{BLACK}Renomear
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Renomear
+STR_BUILD_VEHICLE_SHIP_RENAME_BUTTON                            :{BLACK}Renomear
+STR_BUILD_VEHICLE_AIRCRAFT_RENAME_BUTTON                        :{BLACK}Renomear
+
+STR_BUILD_VEHICLE_TRAIN_RENAME_TOOLTIP                          :{BLACK}Renomear tipo de veículo ferroviário
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Renomear tipo do automóvel
+STR_BUILD_VEHICLE_SHIP_RENAME_TOOLTIP                           :{BLACK}Renomear tipo de embarcação
+STR_BUILD_VEHICLE_AIRCRAFT_RENAME_TOOLTIP                       :{BLACK}Renomear tipo de aeronave
+
+STR_QUERY_RENAME_TRAIN_TYPE_CAPTION                             :{WHITE}Renomear tipo de veículo ferroviário
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Renomear tipo do automóvel
+STR_QUERY_RENAME_SHIP_TYPE_CAPTION                              :{WHITE}Renomear tipo de embarcação
+STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION                          :{WHITE}Renomear tipo de aeronave
+
+STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Novos Veículos
+STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_BUTTON                      :{BLACK}Novos Veículos
+STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON                              :{BLACK}Novas Embarcações
+STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON                          :{BLACK}Nova Aeronave
+
+STR_DEPOT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Trens - clique num trem para informações, arraste um veículo o adicionar ao tren ou remover
+STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Veículos - clique num veículo para informações
+STR_DEPOT_SHIP_LIST_TOOLTIP                                     :{BLACK}Embarcações - clique numa embarcação para informações
+STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Aeronave - clique na aeronave para informações
+
+STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP                            :{BLACK}Construir novo veículo ferroviário
+STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}Construir novo automóvel
+STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}Construir nova embarcação
+STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}Construir nova aeronave
+
+STR_DEPOT_TRAIN_SELL_TOOLTIP                                    :{BLACK}Arraste o veículo aqui para vendê-lo
+STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}Arraste o automóvel aqui para vendê-lo
+STR_DEPOT_SHIP_SELL_TOOLTIP                                     :{BLACK}Arraste a embarcação aqui para vendê-la
+STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}Arraste a aeronave aqui para vendê-la
+
+STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}Centrar visualização na localização de um depósito ferroviário
+STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}Centrar visualização na localização da garagem
+STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}Centrar visualização na localização do depósito naval
+STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Centrar visualização na localização do hangar
+
+
 ### depot strings
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}Você está prestes a vender todos os automóveis da garagem. Você tem certeza?
 STR_DEPOT_WRONG_DEPOT_TYPE                                      :Tipo de depósito errado
@@ -3205,7 +3215,6 @@ STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TIP                          :{BLACK}Autosubs
 STR_DEPOT_AUTOREPLACE_SHIP_TIP                                  :{BLACK}Autosubstituir todos as embarcações no depósito naval
 STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP                              :{BLACK}Autosubstituir todas as aeronaves no hangar
 
-
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Substituir {STRING}
 STR_REPLACE_VEHICLES_START                                      :{BLACK}Iniciar Substituição
 STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Parar Substituição
@@ -3221,6 +3230,7 @@ STR_REPLACE_REMOVE_WAGON                                        :{BLACK}Remoçã
 STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Faz autosubstituição manter o tamanho do trem removendo vagões (começando pela frente), se ao substituir a locomotiva o trem ficar maior.
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}Substituindo: {ORANGE}{SKIP}{SKIP}{STRING}
 STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}Troca entre substituir máquinas e substituir vagões
+
 STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Trem não disponível
 STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Automóvel não disponível
 STR_SHIP_NOT_AVAILABLE                                          :{WHITE}Embarcação não disponível
@@ -3371,17 +3381,6 @@ STR_MEASURE_AREA                                                :{BLACK}Area: {N
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Comprimento: {NUM}{}Diferença de Altura: {NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Area: {NUM} x {NUM}{}Diferença de altura: {NUM} m
 
-############ Date formatting
-STR_FORMAT_DATE_TINY                                            :{STRING}-{STRING}-{NUM}
-STR_FORMAT_DATE_SHORT                                           :{STRING} {NUM}
-STR_FORMAT_DATE_LONG                                            :{STRING} {STRING} {NUM}
-STR_FORMAT_DATE_ISO                                             :{2:NUM}-{1:STRING}-{0:STRING}
-
-STR_JUST_DATE_TINY                                              :{DATE_TINY}
-STR_JUST_DATE_LONG                                              :{DATE_LONG}
-STR_JUST_DATE_ISO                                               :{DATE_ISO}
-########
-
 STR_FEEDER_CARGO_VALUE                                          :{BLACK}Transferir Dinheiro: {LTBLUE}{CURRENCY}
 STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD                            :{WHITE}...é uma rua local
 STR_DRIVE_THROUGH_ERROR_DIRECTION                               :{WHITE}...rua na direção errada
@@ -3406,7 +3405,6 @@ STR_PERCENT_UP_DOWN_SMALL                                       :{TINYFONT}{WHIT
 STR_PERCENT_UP_DOWN                                             :{WHITE}{NUM}%{UPARROW}{DOWNARROW}
 
 ##### Mass Order
-STR_FORMAT_GROUP_NAME                                           :Agrupar {COMMA}
 STR_GROUP_TINY_NAME                                             :{TINYFONT}{GROUP}
 STR_GROUP_ALL_TRAINS                                            :Todos os trens
 STR_GROUP_ALL_ROAD_VEHICLES                                     :Todos os automóveis
@@ -3435,12 +3433,62 @@ STR_GROUP_DELETE_TIP                                            :{BLACK}Remove o
 STR_GROUP_RENAME_TIP                                            :{BLACK}Renomeia o grupo selecionado
 STR_GROUP_REPLACE_PROTECTION_TIP                                :{BLACK}Clique para excluir esse grupo da substituição automática
 
+#### String control codes and their formatting
 STR_COMPANY_NAME                                                :{COMPANY}
 STR_ENGINE_NAME                                                 :{ENGINE}
 STR_GROUP_NAME                                                  :{GROUP}
+STR_INDUSTRY_NAME                                               :{INDUSTRY}
 STR_PRESIDENT_NAME                                              :{PRESIDENTNAME}
 STR_SIGN_NAME                                                   :{SIGN}
+STR_STATION_NAME                                                :{STATION}
+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_LONG                                              :{DATE_LONG}
+STR_JUST_DATE_ISO                                               :{DATE_ISO}
+STR_JUST_STRING                                                 :{STRING}
+STR_JUST_RAW_STRING                                             :{STRING}
+
+STR_FORMAT_DATE_TINY                                            :{STRING}-{STRING}-{NUM}
+STR_FORMAT_DATE_SHORT                                           :{STRING} {NUM}
+STR_FORMAT_DATE_LONG                                            :{STRING} {STRING} {NUM}
+STR_FORMAT_DATE_ISO                                             :{2:NUM}-{1:STRING}-{0:STRING}
+
+STR_FORMAT_COMPANY_NUM                                          :(Companhia {COMMA})
+STR_FORMAT_GROUP_NAME                                           :Agrupar {COMMA}
+STR_FORMAT_INDUSTRY_NAME                                        :{1:STRING} de {0:TOWN}
+
+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}Nome deve ser único
 
diff --git a/src/lang/bulgarian.txt b/src/lang/bulgarian.txt
index f90099aae..5df47edcf 100644
--- a/src/lang/bulgarian.txt
+++ b/src/lang/bulgarian.txt
@@ -156,8 +156,6 @@ STR_ABBREV_PLASTIC                                              :{TINYFONT}ПМ
 STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}ГН
 STR_ABBREV_NONE                                                 :{TINYFONT}НЩ
 STR_ABBREV_ALL                                                  :{TINYFONT}ВЧ
-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}Съобщение
@@ -169,17 +167,11 @@ STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Авто
 STR_ABOUT_VERSION                                               :{BLACK}OpenTTD версия {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}Изход
 STR_YES                                                         :{BLACK}Да
 STR_NO                                                          :{BLACK}Не
 STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Желаете ли да прекъснете играта и да се върнете към {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                                                :Нищо
 STR_COLOUR_DARK_BLUE                                            :Тъмно синьо
 STR_COLOUR_PALE_GREEN                                           :Бледо зелено
@@ -198,8 +190,6 @@ STR_COLOUR_BROWN                                                :Кафяво
 STR_COLOUR_GREY                                                 :Сиво
 STR_COLOUR_WHITE                                                :Бяло
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}Прекалено много превозни средства
-STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
-STR_RED_COMMA                                                   :{RED}{COMMA}
 STR_BUTTON_LOCATION                                             :{BLACK}Позиция
 STR_SMALLMAP_TYPE_CONTOURS                                      :Контури
 STR_SMALLMAP_TYPE_VEHICLES                                      :Превозни средства
@@ -324,12 +314,13 @@ STR_SORT_ORDER_TIP                                              :{BLACK}Избе
 STR_SORT_CRITERIA_TIP                                           :{BLACK}Избери критерий за сортиране
 STR_SORT_BY                                                     :{BLACK}Сортирай по
 
+### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}Население
+STR_SORT_BY_NAME                                                :{BLACK}Име
+STR_SORT_BY_DATE                                                :{BLACK}Дата
 STR_SORT_BY_PRODUCTION                                          :Продукция
 STR_SORT_BY_TYPE                                                :Вид
 STR_SORT_BY_TRANSPORTED                                         :Транспортирано
-STR_SORT_BY_NAME                                                :{BLACK}Име
-STR_SORT_BY_DATE                                                :{BLACK}Дата
 STR_SORT_BY_NUMBER                                              :Номер
 STR_SORT_BY_PROFIT_LAST_YEAR                                    :Чиста печалба миналата година
 STR_SORT_BY_PROFIT_THIS_YEAR                                    :Чиста печалба тази година
@@ -352,37 +343,25 @@ STR_SORT_BY_INTRO_DATE                                          :Дата на �
 STR_SORT_BY_RUNNING_COST                                        :Цена за движение
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :Мощност/Цена за движение
 STR_SORT_BY_CARGO_CAPACITY                                      :Товарен капацитет
+
 STR_NO_WAITING_CARGO                                            :{BLACK}Няма чакащ товар
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}Избор на всички съоръжения
 STR_SELECT_ALL_TYPES                                            :{BLACK}Избор на всички товари (включително нечакащите)
-STR_AVAILABLE_TRAINS                                            :{BLACK}Налични влакове
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Налични коли
-STR_AVAILABLE_SHIPS                                             :{BLACK}Налични кораби
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Налични самолети
 STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Виж списъкът с наличните видове машини за този тип превозно средство.
 STR_MANAGE_LIST                                                 :{BLACK}Направи списък
 STR_MANAGE_LIST_TIP                                             :{BLACK}Прати инструкциите до всички машини в този лист
 STR_REPLACE_VEHICLES                                            :Замяна на превозни средства
+STR_SEND_FOR_SERVICING                                          :Прати за обслужване
+
+STR_AVAILABLE_TRAINS                                            :{BLACK}Налични влакове
+STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Налични коли
+STR_AVAILABLE_SHIPS                                             :{BLACK}Налични кораби
+STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Налични самолети
+
 STR_SEND_TRAIN_TO_DEPOT                                         :Прати в депото
 STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Прати в сервиза
 STR_SEND_SHIP_TO_DEPOT                                          :Прати в дока
 STR_SEND_AIRCRAFT_TO_HANGAR                                     :Прати в хангара
-STR_SEND_FOR_SERVICING                                          :Прати за обслужване
-
-############ range for months starts
-STR_MONTH_ABBREV_JAN                                            :Ян
-STR_MONTH_ABBREV_FEB                                            :Фев
-STR_MONTH_ABBREV_MAR                                            :Март
-STR_MONTH_ABBREV_APR                                            :Апр
-STR_MONTH_ABBREV_MAY                                            :Май
-STR_MONTH_ABBREV_JUN                                            :Юни
-STR_MONTH_ABBREV_JUL                                            :Юли
-STR_MONTH_ABBREV_AUG                                            :Авг
-STR_MONTH_ABBREV_SEP                                            :Сеп
-STR_MONTH_ABBREV_OCT                                            :Окт
-STR_MONTH_ABBREV_NOV                                            :Ное
-STR_MONTH_ABBREV_DEC                                            :Дек
-############ range for months ends
 
 STR_GRAPH_X_LABEL_MONTH                                         :{TINYFONT}{STRING}{} {STRING}
 STR_GRAPH_X_LABEL_MONTH_YEAR                                    :{TINYFONT}{STRING}{} {STRING}{}{NUM}
@@ -410,8 +389,6 @@ 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_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}Заглавие на прозорец - преместване на прозореца с мишката
@@ -458,7 +435,7 @@ STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Нищо
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Име
 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                                          :1-ви
 STR_ORDINAL_NUMBER_2ND                                          :2-ри
 STR_ORDINAL_NUMBER_3RD                                          :3-ти
@@ -492,6 +469,34 @@ STR_ORDINAL_NUMBER_30TH                                         :30-ти
 STR_ORDINAL_NUMBER_31ST                                         :31-ви
 ############ range for days ends
 
+############ range for months starts
+STR_MONTH_ABBREV_JAN                                            :Ян
+STR_MONTH_ABBREV_FEB                                            :Фев
+STR_MONTH_ABBREV_MAR                                            :Март
+STR_MONTH_ABBREV_APR                                            :Апр
+STR_MONTH_ABBREV_MAY                                            :Май
+STR_MONTH_ABBREV_JUN                                            :Юни
+STR_MONTH_ABBREV_JUL                                            :Юли
+STR_MONTH_ABBREV_AUG                                            :Авг
+STR_MONTH_ABBREV_SEP                                            :Сеп
+STR_MONTH_ABBREV_OCT                                            :Окт
+STR_MONTH_ABBREV_NOV                                            :Ное
+STR_MONTH_ABBREV_DEC                                            :Дек
+
+STR_MONTH_JAN                                                   :Януари
+STR_MONTH_FEB                                                   :Февруари
+STR_MONTH_MAR                                                   :Март
+STR_MONTH_APR                                                   :Април
+STR_MONTH_MAY                                                   :Май
+STR_MONTH_JUN                                                   :Юни
+STR_MONTH_JUL                                                   :Юли
+STR_MONTH_AUG                                                   :Август
+STR_MONTH_SEP                                                   :Септември
+STR_MONTH_OCT                                                   :Октомври
+STR_MONTH_NOV                                                   :Ноември
+STR_MONTH_DEC                                                   :Декември
+############ range for months ends
+
 STR_GRAPH_Y_LABEL_NUMBER                                        :{TINYFONT}{COMMA}
 
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}Приет товар: {LTBLUE}
@@ -581,12 +586,9 @@ 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_COMMA                                                  :{BLUE}{COMMA}
 STR_SCENEDIT_TOOLBAR_OPENTTD                                    :{YELLOW}OpenTTD
 STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR                            :{YELLOW}Редактор на сценарии
 STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION                   :{WHITE}Генератор на терен
-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}Генерирай случаен терен
@@ -667,9 +669,7 @@ STR_OFF                                                         :изключе�
 STR_SUMMARY                                                     :Обобщение
 STR_FULL                                                        :Пълно
 STR_STATUSBAR_COMPANY_NAME                                      :{SILVER}- -  {COMPANY}  - -
-STR_BLACK_STRING                                                :{BLACK}{STRING}
 
-STR_JUST_CHECKMARK                                              :{CHECKMARK}
 ############ range for menu starts
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Игрови опции
 STR_SETTINGS_MENU_DIFFICULTY_SETTINGS                           :Опции за трудност
@@ -760,9 +760,6 @@ STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY                             :Инвести�
 ############ range ends here
 
 STR_FUND_INDUSTRY_CAPTION                                       :{WHITE}Инвестирай в нова индустрия
-STR_JUST_STRING                                                 :{STRING}
-STR_JUST_RAW_STRING                                             :{STRING}
-STR_JUST_INT                                                    :{NUM}
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_RAINFOREST                       :{WHITE}...може да бъде построено само около и в джунглите
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT                           :{WHITE}...може да бъде построено само около и в пустините
 STR_STATUSBAR_PAUSED                                            :{YELLOW}* * ИГРАТА Е В ПАУЗА  *  *
@@ -776,9 +773,6 @@ STR_STATUSBAR_SAVING_GAME                                       :{RED}*  *  ЗА
 STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Записването продължава,{}моля изчакайте да сръши!
 STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE                       :{BLACK}Избери програмата 'Ezy Street style music'
 
-STR_BLACK_6                                                     :{BLACK}6
-STR_BLACK_7                                                     :{BLACK}7
-
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :английски (оригинални)
 STR_TOWNNAME_FRENCH                                             :френски
@@ -856,19 +850,6 @@ STR_OPTIONS_BASE_GRF_TIP                                        :{BLACK}Избе
 
 STR_AUTOSAVE_FAILED                                             :{WHITE}Автозапазването е неуспешно
 
-STR_MONTH_JAN                                                   :Януари
-STR_MONTH_FEB                                                   :Февруари
-STR_MONTH_MAR                                                   :Март
-STR_MONTH_APR                                                   :Април
-STR_MONTH_MAY                                                   :Май
-STR_MONTH_JUN                                                   :Юни
-STR_MONTH_JUL                                                   :Юли
-STR_MONTH_AUG                                                   :Август
-STR_MONTH_SEP                                                   :Септември
-STR_MONTH_OCT                                                   :Октомври
-STR_MONTH_NOV                                                   :Ноември
-STR_MONTH_DEC                                                   :Декември
-
 STR_HEADING_FOR_STATION                                         :{LTBLUE}Отиващ към {STATION}
 STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}Отиващ към {STATION}, {VELOCITY}
 STR_NO_ORDERS                                                   :{LTBLUE}Без заповеди
@@ -883,8 +864,6 @@ STR_CRATES                                                      :кратери
 STR_RES_OTHER                                                   :друго
 STR_NOTHING                                                     :
 
-STR_TINY_RIGHT_ARROW                                            :{TINYFONT}{RIGHTARROW}
-
 STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}Не може да се споделя списъка със задачи...
 STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Не може да се копира списъка от задачи...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Край на Споделения пътен лист - -
@@ -1139,7 +1118,6 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Y-ра�
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :изключено
-STR_JUST_CURRENCY                                               :{CURRENCY}
 STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Промяна стойноста на настройка
 
 STR_TEMPERATE_LANDSCAPE                                         :умерен климат
@@ -1175,7 +1153,6 @@ STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}Избо
 
 STR_WAYPOINT_VIEWPORT                                           :{WHITE}{WAYPOINT}
 STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WHITE}{WAYPOINT}
-STR_WAYPOINT_NAME                                               :{WAYPOINT}
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Редакция името на пътна точка
 
 STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}Не може да се променя името на пункта...
@@ -1241,11 +1218,6 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Имен
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...прекалено близо до друка индустрия
 
-STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Преоборудване на влак да превозва друг товар
-STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Проборудване
-STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Избор тип на товар за влак
-STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Преоборудва влака да превозва избрания тип товар
-STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Преоборудването на влака е невъзможно...
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Промяна на производство
 
 ############ network gui strings
@@ -1751,11 +1723,6 @@ STR_TOWN_BUILDING_NAME_TEPEES_1                                 :Индианс�
 STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1                           :Фабрика за чай
 STR_TOWN_BUILDING_NAME_PIGGY_BANK_1                             :Детска касичка
 
-STR_INDUSTRY_NAME                                               :{INDUSTRY}
-STR_TOWN_NAME                                                   :{TOWN}
-STR_FORMAT_INDUSTRY_NAME                                        :{1:STRING} {0:TOWN}
-STR_STATION_NAME                                                :{STATION}
-
 ##id 0x2800
 STR_LANDSCAPING_MENU_LANDSCAPING                                :Тераформиране
 STR_LANDSCAPING_MENU_PLANT_TREES                                :Засаждане на дървета
@@ -1810,6 +1777,12 @@ STR_CARGO_RATING_EXCELLENT                                      :Отлично
 STR_CARGO_RATING_OUTSTANDING                                    :Невероятно
 ############ range for rating ends
 
+### station view strings
+STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Показване на всички влакове които минават през гарата
+STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Показване на всички автомобили които минават през гарата
+STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Показване на всички самолети които кацат на летището
+STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Показване на всички кораби които спират на пристанището
+
 STR_STATION_VIEW_CARGO_RATING                                   :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO                        :{WHITE}{STATION} вече не приема {STRING}
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO               :{WHITE}{STATION} вече не приема {STRING} или {STRING}
@@ -2053,6 +2026,7 @@ STR_SV_STNAME_AIRPORT                                           :{STRING} Лет
 STR_SV_STNAME_OILFIELD                                          :{STRING} Нефтено поле
 STR_SV_STNAME_MINES                                             :{STRING} Мини
 STR_SV_STNAME_DOCKS                                             :{STRING} Докове
+##id 0x6020
 STR_SV_STNAME_ANNEXE                                            :{STRING} Пристройка
 STR_SV_STNAME_SIDINGS                                           :{STRING} Обшивки
 STR_SV_STNAME_BRANCH                                            :{STRING} Клон
@@ -2100,8 +2074,6 @@ STR_NUM_LOW                                                     :малко
 STR_NUM_NORMAL                                                  :нормално
 STR_NUM_HIGH                                                    :голямо
 STR_NUM_CUSTOM                                                  :Изборен
-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                                             :средно
@@ -2135,7 +2107,6 @@ STR_CITY_APPROVAL_HOSTILE                                       :враждеб�
 
 ##id 0x7000
 STR_COMPANY_VIEW_CAPTION                                        :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
-STR_FORMAT_COMPANY_NUM                                          :(Компания {COMMA})
 STR_COMPANY_VIEW_NEW_FACE_BUTTON                                :{BLACK}Ново лице
 STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON                           :{BLACK}Цветове
 STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}Цветове:
@@ -2168,7 +2139,6 @@ STR_FINANCES_TOTAL_CAPTION                                      :{WHITE}Всич
 STR_COMPANY_NAME_COMPANY_NUM                                    :{COMPANY} {COMPANYNUM}
 STR_GRAPH_INCOME_CAPTION                                        :{WHITE}Графика на приходите
 STR_CURRCOMPACT                                                 :{CURRCOMPACT}
-STR_JUST_COMMA                                                  :{COMMA}
 STR_GRAPH_OPERATING_PROFIT_CAPTION                              :{WHITE}Графика на оперативните приходи
 STR_FINANCES_BANK_BALANCE_TITLE                                 :{WHITE}Баланс на банковата сметка
 STR_FINANCES_LOAN_TITLE                                         :{WHITE}Заем
@@ -2570,10 +2540,8 @@ STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE                          :локомот�
 STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE                            :локомотив за магниторелсов път
 
 ##id 0x8800
-STR_DEPOT_TRAIN_CAPTION                                         :{WHITE}{TOWN} Влаково депо
 STR_NEWS_FIRST_TRAIN_ARRIVAL                                    :{BLACK}{BIGFONT}Хората празнуват . . .{}Първи влак пристигна на {STATION}!
 STR_VEHICLE_DETAILS_CAPTION                                     :{WHITE}{VEHICLE} (Подробности)
-STR_ERROR_TRAIN_IN_THE_WAY                                      :{WHITE}Влак на пътя
 STR_ORDER                                                       :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 STR_ORDER_SELECTED                                              :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 STR_ORDER_NON_STOP                                              :{BLACK}Без спирка
@@ -2663,38 +2631,16 @@ STR_TIMETABLE_AND_TRAVEL_FOR                                    :и отпъту
 STR_TIMETABLE_DAYS                                              :{COMMA} ден{P "" s}
 STR_TIMETABLE_TICKS                                             :{COMMA} щракане{P "" та}
 
-STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Отиващ към Влаковото депо на {TOWN}
-STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Отиващ към Влаковото депо на {TOWN}, {VELOCITY}
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}На ремонт във Влаковото депо на {TOWN}
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Ремонт във Влаковото депо на {TOWN}, {VELOCITY}
-
 STR_INVALID_ORDER                                               :{RED} (Невалидна заповед)
 
 STR_UNKNOWN_STATION                                             :неизвестна гара
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}Празен
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} от {STATION}
 STR_VEHICLE_DETAILS_CARGO_FROM_MULT                             :{LTBLUE}{CARGO} от {STATION} (x{NUM})
-STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} чака в депото
-STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Нови ПС
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}Влакът е прекалено дълъг
 STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}Влаковете могат да бъдат променяни само когато са спрени в депото
-STR_VEHICLE_LIST_TRAIN_CAPTION                                  :{WHITE}{STRING} - {COMMA} Влак{P "" ове}
 
-STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}Нови Машини за Двурелсов път
-STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}Нови електрически влакове
-STR_BUILD_VEHICLE_TRAIN_MONORAIL_CAPTION                        :{WHITE}Нови Машини за Монорелсов път
-STR_BUILD_VEHICLE_TRAIN_MAGLEV_CAPTION                          :{WHITE}Нови Машини за Магниторелсов път
-STR_BUILD_VEHICLE_TRAIN_ALL_CAPTION                             :{WHITE}ЖП превозни средства
-
-STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_BUTTON                    :{BLACK}Купи Машина
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Копиране на превозно средство
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Така ще бъде построено копие на пътното превозно средство. Натисни CTRL за да споделиш задачите
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Така ще бъде построено копие на пътното превозно средство. Натисни на този бутон и след това на пътно превозно средство вътре или вън от депото. Натисни CTRL за да споделиш задачите
-STR_CLONE_TRAIN                                                 :{BLACK}Клониране на влак
-STR_CLONE_TRAIN_INFO                                            :{BLACK}Така ще бъде построено копие на влака заедно с всички негови вагони. Натисни CTRL за да споделиш задачите
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Така ще бъде построено копие на влака заедно с всички негови вагони. Натисни на този бутон и след това на влак вътре или вън от депото. Натисни CTRL за да споделиш задачите
-STR_BUILD_VEHICLE_TRAIN_RENAME_BUTTON                           :{BLACK}Преименувай
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Остави
 STR_ORDERS_DELETE_BUTTON                                        :{BLACK}Изтрий
 STR_ORDERS_GO_TO_BUTTON                                         :{BLACK}Отиди на
@@ -2710,14 +2656,12 @@ STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Пром
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Заповеди)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Край на Заповедите - -
 STR_SERVICE                                                     :{BLACK}Ремонт
-STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Не може да купиш ЖП машина...
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Купи: {LTBLUE}{NUM}{BLACK} Цена: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Цена: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
 STR_VEHICLE_STATUS_LOADING_UNLOADING                            :{LTBLUE}Товарене/ Разтоварване
 STR_VEHICLE_STATUS_LEAVING                                      :{LTBLUE}Напуска
 STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}Влакът трябва да бъде спрян в депото
-STR_ERROR_CAN_T_SEND_TRAIN_TO_DEPOT                             :{WHITE}Не може да пратиш влака в депото...
 STR_ERROR_NO_MORE_SPACE_FOR_ORDERS                              :{WHITE}Няма повече място за още заповеди
 STR_ERROR_TOO_MANY_ORDERS                                       :{WHITE}Прекалено много заповеди
 STR_ERROR_CAN_T_INSERT_NEW_ORDER                                :{WHITE}Не може да зададеш нова заповед...
@@ -2731,26 +2675,11 @@ STR_ERROR_CAN_T_ADD_ORDER                                       :{WHITE}прев
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}Не може да преместиш машината...
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}Задния локомотив ще следва винаги предния си събрат
 STR_CARGO_N_A                                                   :Не се предлага{SKIP}
-STR_ERROR_CAN_T_SELL_TRAIN                                      :{WHITE}Не може да продадеш ЖП машината...
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}Не може да намери маршрута до местното депо
-STR_ERROR_CAN_T_STOP_START_TRAIN                                :{WHITE}Не може да спреш/пуснеш влака...
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}Дни на обслужване: {LTBLUE}{COMMA}дни{BLACK}   Последно облужване: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}Интервал на сервиз: {LTBLUE}{COMMA}%{BLACK}   Последен сервиз: {LTBLUE}{DATE_LONG}
-STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP                             :{BLACK}Влакове - кликни върху някой влак за повече информация
-STR_DEPOT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Влакове - кликни върху някой влак за повече информация, домъкни машина за да я довавиш/премахнеш от влака
-STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP                            :{BLACK}Купи нова ЖП машина
-STR_DEPOT_TRAIN_SELL_TOOLTIP                                    :{BLACK}Домъкни ЖП машина тук, за да я продадеш
-STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}Фокусирай върху мястото на влаковото депо
-STR_BUILD_VEHICLE_TRAIN_LIST_TOOLTIP                            :{BLACK}Списък с влакове - натисни върху влак за информация
-STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_TOOLTIP                   :{BLACK}Строене на избрания влак
-STR_BUILD_VEHICLE_TRAIN_RENAME_TOOLTIP                          :{BLACK}Преименуване на влак
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP                 :{BLACK}Текущо същояние на влака - натиснете за спиране/пускане
-STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP                           :{BLACK}Пътен лист
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP                         :{BLACK}Центриране главния прозорец върху влака
-STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP                    :{BLACK}Изпращане влака в депо
 STR_VEHICLE_VIEW_TRAIN_IGNORE_SIGNAL_TOOLTIP                    :{BLACK}Игнориране на семафор
 STR_VEHICLE_VIEW_TRAIN_REVERSE_TOOLTIP                          :{BLACK}Обръщане посоката на влака
-STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Показва информация за влака
 STR_VEHICLE_DETAILS_INCREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Увеличава интервалa за сервиз
 STR_VEHICLE_DETAILS_DECREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Намалява интервал за сервиз
 STR_VEHICLE_DETAILS_TRAIN_CARGO_TOOLTIP                         :{BLACK}Информация за превозвания товар
@@ -2774,13 +2703,9 @@ STR_VEHICLE_STATUS_STOPPED                                      :{RED}Спрян
 STR_ERROR_CAN_T_MAKE_TRAIN_PASS_SIGNAL                          :{WHITE}Влака не може да пропусне сигнала при опасност...
 STR_VEHICLE_STATUS_CRASHED                                      :{RED}Катастрофа!
 
-STR_QUERY_RENAME_TRAIN_CAPTION                                  :{WHITE}Име на влак
-STR_ERROR_CAN_T_RENAME_TRAIN                                    :{WHITE}Не може да сложи име...
-STR_VEHICLE_DETAILS_TRAIN_RENAME                                :{BLACK}Име на влак
 STR_NEWS_TRAIN_CRASH                                            :{BLACK}{BIGFONT}Влакова катастрофа!{}{COMMA} умрели в огнената експлозия
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Не може да обърне посоката на влак...
-STR_QUERY_RENAME_TRAIN_TYPE_CAPTION                             :{WHITE}Преименуване на влак
-STR_ERROR_CAN_T_RENAME_TRAIN_TYPE                               :{WHITE}Не може да се преименува влак...
+STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Не може да обърне превозно средство състоящо се от няколко елемента
 STR_CLEAR_TIME                                                  :{BLACK}Изчисти времето
 STR_RESET_LATENESS                                              :{BLACK}Преправи закъснялата бройка
 STR_CHANGE_WAYPOINT_NAME                                        :{BLACK}Смяна на името на пътната точка
@@ -2812,178 +2737,53 @@ STR_TIMETABLE_AUTOFILL                                          :{BLACK}Афто
 STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Запълни времевата таблица със стойностите от следващото пътуване (CTRL-клик за опит за запазване на времената за изчакване)
 
 ##id 0x9000
-STR_ERROR_ROAD_VEHICLE_IN_THE_WAY                               :{WHITE}Кола на пътя
-STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING} - {COMMA} Кол{P а и}
-STR_DEPOT_ROAD_VEHICLE_CAPTION                                  :{WHITE}{TOWN} гараж за коли
-STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_BUTTON                      :{BLACK}Ново превозно средство
-STR_BUILD_VEHICLE_ROAD_VEHICLE_CAPTION                          :{WHITE}Нова кола
-STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_BUTTON             :{BLACK}Покупка на превозно средство
-STR_ERROR_CAN_T_BUILD_ROAD_VEHICLE                              :{WHITE}Не може да купи кола...
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}...трябва да бъде спряно в сервиз за коли
-STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}Не може да продаде колата...
-STR_ERROR_CAN_T_STOP_START_ROAD_VEHICLE                         :{WHITE}Не може да пусне/спре колата...
-STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} чака в депото
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Отиващ към Автодепото на {TOWN}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Отиващ към Автодепото на {TOWN}, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}На ремонт в Автодепото на {TOWN}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}На ремонт в Автодепото на {TOWN}, {VELOCITY}
-STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Не може да изпрати колата в сервиз...
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Не може да намери локалния сервиз
-STR_VEHICLE_LIST_ROAD_VEHICLE_TOOLTIP                           :{BLACK}Коли - натиснете върху кола за информация
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP          :{BLACK}Текущо действие - натиснете за спиране/пускане на превозното средство
-STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP                    :{BLACK}Пътен лист
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP                  :{BLACK}Центриране на главния прозорец върху превозното средство
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}Изпращане на ПС в депо. CTRL+натискане ще изпрати само за преглед
 STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP                   :{BLACK}Насилствено обръщане на ПС
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Показва информация за автомобила
-STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}ПС - натиснете върху ПС за информация
-STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}Покупка на нов автомобил
-STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}Преместен автомобил тук ще го продаде
-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_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})
 
-STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Преименувай МПС-то
-STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Не може да преименуваш МПС-то...
-STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Преименувай МПС-то
 STR_NEWS_FIRST_BUS_ARRIVAL                                      :{BLACK}{BIGFONT}Гражданите празнуват . . .{}Първият автобус пристигнал в {STATION}!
 STR_NEWS_FIRST_TRUCK_ARRIVAL                                    :{BLACK}{BIGFONT}Хората празнуват . . .{}Първи камион пристигна на {STATION}!
 STR_NEWS_FIRST_PASSENGER_TRAM_ARRIVAL                           :{BLACK}{BIGFONT}Гражданите празнуват . . .{}Първият пътнически трамвай пристигна на {STATION}!
 STR_NEWS_FIRST_CARGO_TRAM_ARRIVAL                               :{BLACK}{BIGFONT}Гражданите празнуват . . .{}Първият товарен трамвай пристигна на {STATION}!
 STR_NEWS_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Пътно-транспортно Произшествие!{}Шофьор загина на място при екплозия на МПС след сблъсък с влак
 STR_NEWS_ROAD_VEHICLE_CRASH                                     :{BLACK}{BIGFONT}Пътно-транспортно Произшествие!{}{COMMA} загинаха на място при екплозия на МПС след сблъсък с влак
-STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Не може да обърне превозно средство състоящо се от няколко елемента
-STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Преименувай
-STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Преименувай МПС-то
-STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Преименувай МПС-то
-STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Не може да преименуваш МПС-то...
 
-STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Преоборудване автомобила за друг товар
-STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Проборудване на автомобила
-STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Преоборудване на автомобила за избрания товар
-STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Преоборудването на автомобила е невъзможно...
-STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Избор тип това за автомобила да превозва
 
 ##id 0x9800
 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :Воднопътен строеж
 STR_WATERWAYS_TOOLBAR_CAPTION                                   :{WHITE}Воднопътен строеж
 STR_WATERWAYS_TOOLBAR_CAPTION_SE                                :{WHITE}Воден път
 STR_ERROR_CAN_T_BUILD_DOCK_HERE                                 :{WHITE}Не може да построиш пристанище тук...
-STR_DEPOT_SHIP_CAPTION                                          :{WHITE}{TOWN} Корабно депо
-STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON                              :{BLACK}Нови Кораби
-STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - {COMMA} Кораб{P "" и}
-STR_BUILD_VEHICLE_SHIP_CAPTION                                  :{WHITE}Нови Кораби
-STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON                     :{BLACK}Купи Кораб
-STR_CLONE_SHIP                                                  :{BLACK}Клониране на кораб
-STR_CLONE_SHIP_INFO                                             :{BLACK}Така ще бъде построено копие на кораб. Натисни CTRL за да споделиш задачите
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Така ще бъде построено копие на кораб. Натисни този бутон и след това върху кораб вътре или вън от депото. Натисни CTRL за да споделиш задачите
 STR_ERROR_SHIP_MUST_BE_STOPPED_IN_DEPOT                         :{WHITE}Корабът трябва да е спрян в депото
-STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}Не може да продадеш кораба...
-STR_ERROR_CAN_T_BUILD_SHIP                                      :{WHITE}Не може да купиш кораба...
-STR_ERROR_SHIP_IN_THE_WAY                                       :{WHITE}Кораб на пътя
-STR_ERROR_CAN_T_STOP_START_SHIP                                 :{WHITE}Не може да спреш/задвижиш кораба...
-STR_ERROR_CAN_T_SEND_SHIP_TO_DEPOT                              :{WHITE}Не може да пратиш кораба в депото...
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Отиващ към Корабното депо на {TOWN}
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Отиващ към Корабното депо на {TOWN}, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}На ремонт в Корабното депо на {TOWN}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}На ремонт в Корабното депо на {TOWN}, {VELOCITY}
-STR_NEWS_SHIP_IS_WAITING                                        :{WHITE}{VEHICLE} чака в депото
 STR_WATERWAYS_TOOLBAR_BUILD_DOCK_TOOLTIP                        :{BLACK}Създай Пристанище
 STR_WATERWAYS_TOOLBAR_BUILD_DEPOT_TOOLTIP                       :{BLACK}Създай Корабно Депо (за закупуване и обслужване на кораби)
-STR_DEPOT_SHIP_LIST_TOOLTIP                                     :{BLACK}Кораби - натисни върху кораб за инфорамция
-STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}Купи нов кораб
-STR_DEPOT_SHIP_SELL_TOOLTIP                                     :{BLACK}Премести кораба тук, за да го продадеш
-STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}Фокусирай общия план върху местонахождението на корабното депо
-STR_VEHICLE_LIST_SHIP_TOOLTIP                                   :{BLACK}Кораби - натисни върху кораб за информация
-STR_BUILD_VEHICLE_SHIP_LIST_TOOLTIP                             :{BLACK}Списък с избор на кораби - натисни върху кораб за информация
-STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP                    :{BLACK}Купи посоченият кораб
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP                  :{BLACK}Настоящо корабно действие - натисни тук, за да спреш/задвижиш кораба
-STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Покажи заповедите на кораба
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP                          :{BLACK}Фокусирай общия план върху местонахождението на кораба
-STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}Прати кораба в депото
-STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Покажи детайлите за кораба
-STR_VEHICLE_DETAILS_SHIP_RENAME                                 :{BLACK}Наименувай кораба
 
-STR_QUERY_RENAME_SHIP_CAPTION                                   :{WHITE}Наименувай кораба
-STR_ERROR_CAN_T_RENAME_SHIP                                     :{WHITE}Не може да наименуваш кораба...
 STR_NEWS_FIRST_SHIP_ARRIVAL                                     :{BLACK}{BIGFONT}Гражданите празнуват . . .{}Първия кораб пристигнал в {STATION}!
 STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}Поставете шамандура, използва се като отправна точка
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}Не може да постави шамандура...
 STR_BUILD_AQUEDUCT                                              :{BLACK}Построй акведукт
 STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}Не може да построиш акведукт тук...
-STR_BUILD_VEHICLE_SHIP_RENAME_BUTTON                            :{BLACK}Промяна на име
-STR_BUILD_VEHICLE_SHIP_RENAME_TOOLTIP                           :{BLACK}Промяна името на кораб
-STR_QUERY_RENAME_SHIP_TYPE_CAPTION                              :{WHITE}Промяна името на кораба
-STR_ERROR_CAN_T_RENAME_SHIP_TYPE                                :{WHITE}Не може да смени името на кораба...
-STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}Преустройване на товарен кораб за друг тип товар
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (Преустройване)
-STR_REFIT_SHIP_REFIT_BUTTON                                     :{BLACK}Преустройване на кораб
-STR_REFIT_SHIP_LIST_TOOLTIP                                     :{BLACK}Избор на вид товар за превоз от кораба
-STR_REFIT_SHIP_REFIT_TOOLTIP                                    :{BLACK}Преустройване на кораба да превозва избрания вид товар
 STR_REFIT_TITLE                                                 :{GOLD}Изберете вид товар за превозване:
 STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}Нов капацитет: {GOLD}{CARGO}{}{BLACK}Цена за преустройство: {GOLD}{CURRENCY}
-STR_ERROR_CAN_T_REFIT_SHIP                                      :{WHITE}Не може да преустрои кораб...
 STR_REFITTABLE                                                  :(преустроим)
 
 ##id 0xA000
 STR_TOOLBAR_AIRCRAFT_CAPTION                                    :{WHITE}Летища
 STR_ERROR_CAN_T_BUILD_AIRPORT_HERE                              :{WHITE}Не може да построи летище...
-STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}{STATION} хангар за самолети
-STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON                          :{BLACK}Ново летище
-STR_CLONE_AIRCRAFT                                              :{BLACK}Клониране на летателен апарат
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Така ще бъде построено копие на летателния апарат. Натисни CTRL за да споделиш задачите
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Така ще бъде построено копие на летателния апарат. Натисни на този бутон и след това на летателен апарат вътре или вън от хангара. Натисни CTRL за да споделиш задачите
-STR_BUILD_VEHICLE_AIRCRAFT_CAPTION                              :{WHITE}Ново самолет
-STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON                 :{BLACK}Строене на самолет
-STR_ERROR_CAN_T_BUILD_AIRCRAFT                                  :{WHITE}Не може да построи самолет...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} Самолет
-STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR                         :{WHITE}Не може да изпрати самолета в хангар...
-STR_HEADING_FOR_HANGAR                                          :{ORANGE}Отиващ към Хангара на летище {STATION}
-STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Отиващ към Хангара на летище {STATION}, {VELOCITY}
-STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}На ремонт в Хангара на летище {STATION}
-STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}На ремонт в Хангара на летище {STATION}, {VELOCITY}
-STR_NEWS_AIRCRAFT_IS_WAITING                                    :{WHITE}{VEHICLE} чака в хангара
-STR_ERROR_AIRCRAFT_IN_THE_WAY                                   :{WHITE}Самолет на пътя
-STR_ERROR_CAN_T_STOP_START_AIRCRAFT                             :{WHITE}Не може да спре/пусне самолет...
 STR_ERROR_AIRCRAFT_IS_IN_FLIGHT                                 :{WHITE}Самолета е във въздуха
 STR_ERROR_AIRCRAFT_MUST_BE_STOPPED                              :{WHITE}Самолета трябва да бъде спрян в хангар
-STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}Не може да продаде самолета...
 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION                          :Строене на летище
 STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Строене на летище
-STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP                               :{BLACK}Самолет - натиснете върху самолет за информация
-STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Самолет - натиснете върху самолет за информация
-STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}Строене на самолет
-STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}Преместете самолет тук за да го продадете
-STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Центриране на главния прозорец върху хангара
-STR_BUILD_VEHICLE_AIRCRAFT_LIST_TOOLTIP                         :{BLACK}Избор на самолет - натиснете върху самолет за информация
-STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_TOOLTIP                :{BLACK}Строене на избрания самолет
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP              :{BLACK}Състояние на самолета - натиснете за спиране/пускане
-STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Маршрут на самолета
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP                      :{BLACK}Центриране на главния прозорец върху самолета
-STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}Изпращане на самолета в хангар
-STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Информация за самолета
 
-STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}Име на самолет
-STR_ERROR_CAN_T_RENAME_AIRCRAFT                                 :{WHITE}Не може да нарече самолета...
-STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}Име на самолет
 STR_NEWS_FIRST_AIRCRAFT_ARRIVAL                                 :{BLACK}{BIGFONT}Гражданите празнуват . . .{}Първия самолет кацнал на {STATION}!
 STR_NEWS_AIRCRAFT_CRASH                                         :{BLACK}{BIGFONT}Самолетна катастрофа!{}{COMMA} умират в огъня на {STATION}
 STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Самолетна катастрофа!{}Самолета остана без гориво, {COMMA} умряха в огненото кълбо!
 STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
-STR_BUILD_VEHICLE_AIRCRAFT_RENAME_BUTTON                        :{BLACK}Смяна на името
-STR_BUILD_VEHICLE_AIRCRAFT_RENAME_TOOLTIP                       :{BLACK}Смяна името на самолета
-STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION                          :{WHITE}Сняна името на самолета
-STR_ERROR_CAN_T_RENAME_AIRCRAFT_TYPE                            :{WHITE}Не може да се смени името на самолета...
-STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Преустройване на самолета за превоз на друг товар
-STR_REFIT_AIRCRAFT_REFIT_BUTTON                                 :{BLACK}Преустрой самолета
-STR_REFIT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Избор какъв тип товар да превозва самолета
-STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}Преустрой самолета да превозва посочения тип товар
-STR_ERROR_CAN_T_REFIT_AIRCRAFT                                  :{WHITE}Не може да се преустрои самолета...
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Разписание)
 
@@ -3125,15 +2925,225 @@ STR_LORRY                                                       :{BLACK}{LORRY}
 STR_PLANE                                                       :{BLACK}{PLANE}
 STR_SHIP                                                        :{BLACK}{SHIP}
 
+############ Vehicle lists
+STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP                             :{BLACK}Влакове - кликни върху някой влак за повече информация
+STR_VEHICLE_LIST_ROAD_VEHICLE_TOOLTIP                           :{BLACK}Коли - натиснете върху кола за информация
+STR_VEHICLE_LIST_SHIP_TOOLTIP                                   :{BLACK}Кораби - натисни върху кораб за информация
+STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP                               :{BLACK}Самолет - натиснете върху самолет за информация
 
-STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Показване на всички влакове които минават през гарата
-STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Показване на всички автомобили които минават през гарата
-STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Показване на всички самолети които кацат на летището
-STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Показване на всички кораби които спират на пристанището
+STR_VEHICLE_LIST_TRAIN_CAPTION                                  :{WHITE}{STRING} - {COMMA} Влак{P "" ове}
+STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING} - {COMMA} Кол{P а и}
+STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - {COMMA} Кораб{P "" и}
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} Самолет
 
 STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}Споделено разписание с {COMMA} превозн{P о и} средст{P о а}
 STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Показване на всички превозни средства които споделят разписанието
 
+STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} чака в депото
+STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} чака в депото
+STR_NEWS_SHIP_IS_WAITING                                        :{WHITE}{VEHICLE} чака в депото
+STR_NEWS_AIRCRAFT_IS_WAITING                                    :{WHITE}{VEHICLE} чака в хангара
+
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Проборудване
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Проборудване на автомобила
+STR_REFIT_SHIP_REFIT_BUTTON                                     :{BLACK}Преустройване на кораб
+STR_REFIT_AIRCRAFT_REFIT_BUTTON                                 :{BLACK}Преустрой самолета
+
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Преоборудва влака да превозва избрания тип товар
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Преоборудване на автомобила за избрания товар
+STR_REFIT_SHIP_REFIT_TOOLTIP                                    :{BLACK}Преустройване на кораба да превозва избрания вид товар
+STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}Преустрой самолета да превозва посочения тип товар
+
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Избор тип на товар за влак
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Избор тип това за автомобила да превозва
+STR_REFIT_SHIP_LIST_TOOLTIP                                     :{BLACK}Избор на вид товар за превоз от кораба
+STR_REFIT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Избор какъв тип товар да превозва самолета
+
+STR_DEPOT_TRAIN_CAPTION                                         :{WHITE}{TOWN} Влаково депо
+STR_DEPOT_ROAD_VEHICLE_CAPTION                                  :{WHITE}{TOWN} гараж за коли
+STR_DEPOT_SHIP_CAPTION                                          :{WHITE}{TOWN} Корабно депо
+STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}{STATION} хангар за самолети
+
+STR_VEHICLE_DETAILS_TRAIN_RENAME                                :{BLACK}Име на влак
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Преименувай МПС-то
+STR_VEHICLE_DETAILS_SHIP_RENAME                                 :{BLACK}Наименувай кораба
+STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}Име на самолет
+
+STR_QUERY_RENAME_TRAIN_CAPTION                                  :{WHITE}Име на влак
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Преименувай МПС-то
+STR_QUERY_RENAME_SHIP_CAPTION                                   :{WHITE}Наименувай кораба
+STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}Име на самолет
+
+STR_ERROR_TRAIN_IN_THE_WAY                                      :{WHITE}Влак на пътя
+STR_ERROR_ROAD_VEHICLE_IN_THE_WAY                               :{WHITE}Кола на пътя
+STR_ERROR_SHIP_IN_THE_WAY                                       :{WHITE}Кораб на пътя
+STR_ERROR_AIRCRAFT_IN_THE_WAY                                   :{WHITE}Самолет на пътя
+
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Преоборудването на влака е невъзможно...
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Преоборудването на автомобила е невъзможно...
+STR_ERROR_CAN_T_REFIT_SHIP                                      :{WHITE}Не може да преустрои кораб...
+STR_ERROR_CAN_T_REFIT_AIRCRAFT                                  :{WHITE}Не може да се преустрои самолета...
+
+STR_ERROR_CAN_T_RENAME_TRAIN                                    :{WHITE}Не може да сложи име...
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Не може да преименуваш МПС-то...
+STR_ERROR_CAN_T_RENAME_SHIP                                     :{WHITE}Не може да наименуваш кораба...
+STR_ERROR_CAN_T_RENAME_AIRCRAFT                                 :{WHITE}Не може да нарече самолета...
+
+STR_ERROR_CAN_T_STOP_START_TRAIN                                :{WHITE}Не може да спреш/пуснеш влака...
+STR_ERROR_CAN_T_STOP_START_ROAD_VEHICLE                         :{WHITE}Не може да пусне/спре колата...
+STR_ERROR_CAN_T_STOP_START_SHIP                                 :{WHITE}Не може да спреш/задвижиш кораба...
+STR_ERROR_CAN_T_STOP_START_AIRCRAFT                             :{WHITE}Не може да спре/пусне самолет...
+
+STR_ERROR_CAN_T_SEND_TRAIN_TO_DEPOT                             :{WHITE}Не може да пратиш влака в депото...
+STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Не може да изпрати колата в сервиз...
+STR_ERROR_CAN_T_SEND_SHIP_TO_DEPOT                              :{WHITE}Не може да пратиш кораба в депото...
+STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR                         :{WHITE}Не може да изпрати самолета в хангар...
+
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Не може да купиш ЖП машина...
+STR_ERROR_CAN_T_BUILD_ROAD_VEHICLE                              :{WHITE}Не може да купи кола...
+STR_ERROR_CAN_T_BUILD_SHIP                                      :{WHITE}Не може да купиш кораба...
+STR_ERROR_CAN_T_BUILD_AIRCRAFT                                  :{WHITE}Не може да построи самолет...
+
+STR_ERROR_CAN_T_RENAME_TRAIN_TYPE                               :{WHITE}Не може да се преименува влак...
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Не може да преименуваш МПС-то...
+STR_ERROR_CAN_T_RENAME_SHIP_TYPE                                :{WHITE}Не може да смени името на кораба...
+STR_ERROR_CAN_T_RENAME_AIRCRAFT_TYPE                            :{WHITE}Не може да се смени името на самолета...
+
+STR_ERROR_CAN_T_SELL_TRAIN                                      :{WHITE}Не може да продадеш ЖП машината...
+STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}Не може да продаде колата...
+STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}Не може да продадеш кораба...
+STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}Не може да продаде самолета...
+
+STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP                 :{BLACK}Текущо същояние на влака - натиснете за спиране/пускане
+STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP          :{BLACK}Текущо действие - натиснете за спиране/пускане на превозното средство
+STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP                  :{BLACK}Настоящо корабно действие - натисни тук, за да спреш/задвижиш кораба
+STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP              :{BLACK}Състояние на самолета - натиснете за спиране/пускане
+
+STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP                           :{BLACK}Пътен лист
+STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP                    :{BLACK}Пътен лист
+STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Покажи заповедите на кораба
+STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Маршрут на самолета
+
+STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP                         :{BLACK}Центриране главния прозорец върху влака
+STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP                  :{BLACK}Центриране на главния прозорец върху превозното средство
+STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP                          :{BLACK}Фокусирай общия план върху местонахождението на кораба
+STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP                      :{BLACK}Центриране на главния прозорец върху самолета
+
+STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP                    :{BLACK}Изпращане влака в депо
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}Изпращане на ПС в депо. CTRL+натискане ще изпрати само за преглед
+STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}Прати кораба в депото
+STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}Изпращане на самолета в хангар
+
+STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Показва информация за влака
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Показва информация за автомобила
+STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Покажи детайлите за кораба
+STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Информация за самолета
+
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Преоборудване на влак да превозва друг товар
+STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Преоборудване автомобила за друг товар
+STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}Преустройване на товарен кораб за друг тип товар
+STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Преустройване на самолета за превоз на друг товар
+
+STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Отиващ към Влаковото депо на {TOWN}
+STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Отиващ към Влаковото депо на {TOWN}, {VELOCITY}
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Отиващ към Автодепото на {TOWN}
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Отиващ към Автодепото на {TOWN}, {VELOCITY}
+STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Отиващ към Корабното депо на {TOWN}
+STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Отиващ към Корабното депо на {TOWN}, {VELOCITY}
+STR_HEADING_FOR_HANGAR                                          :{ORANGE}Отиващ към Хангара на летище {STATION}
+STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Отиващ към Хангара на летище {STATION}, {VELOCITY}
+
+STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}На ремонт във Влаковото депо на {TOWN}
+STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Ремонт във Влаковото депо на {TOWN}, {VELOCITY}
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}На ремонт в Автодепото на {TOWN}
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}На ремонт в Автодепото на {TOWN}, {VELOCITY}
+STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}На ремонт в Корабното депо на {TOWN}
+STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}На ремонт в Корабното депо на {TOWN}, {VELOCITY}
+STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}На ремонт в Хангара на летище {STATION}
+STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}На ремонт в Хангара на летище {STATION}, {VELOCITY}
+
+
+STR_CLONE_TRAIN                                                 :{BLACK}Клониране на влак
+STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Копиране на превозно средство
+STR_CLONE_SHIP                                                  :{BLACK}Клониране на кораб
+STR_CLONE_AIRCRAFT                                              :{BLACK}Клониране на летателен апарат
+
+STR_CLONE_TRAIN_INFO                                            :{BLACK}Така ще бъде построено копие на влака заедно с всички негови вагони. Натисни CTRL за да споделиш задачите
+STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Така ще бъде построено копие на пътното превозно средство. Натисни CTRL за да споделиш задачите
+STR_CLONE_SHIP_INFO                                             :{BLACK}Така ще бъде построено копие на кораб. Натисни CTRL за да споделиш задачите
+STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Така ще бъде построено копие на летателния апарат. Натисни CTRL за да споделиш задачите
+
+STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Така ще бъде построено копие на влака заедно с всички негови вагони. Натисни на този бутон и след това на влак вътре или вън от депото. Натисни CTRL за да споделиш задачите
+STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Така ще бъде построено копие на пътното превозно средство. Натисни на този бутон и след това на пътно превозно средство вътре или вън от депото. Натисни CTRL за да споделиш задачите
+STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Така ще бъде построено копие на кораб. Натисни този бутон и след това върху кораб вътре или вън от депото. Натисни CTRL за да споделиш задачите
+STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Така ще бъде построено копие на летателния апарат. Натисни на този бутон и след това на летателен апарат вътре или вън от хангара. Натисни CTRL за да споделиш задачите
+
+STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}Нови Машини за Двурелсов път
+STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}Нови електрически влакове
+STR_BUILD_VEHICLE_TRAIN_MONORAIL_CAPTION                        :{WHITE}Нови Машини за Монорелсов път
+STR_BUILD_VEHICLE_TRAIN_MAGLEV_CAPTION                          :{WHITE}Нови Машини за Магниторелсов път
+
+STR_BUILD_VEHICLE_TRAIN_ALL_CAPTION                             :{WHITE}ЖП превозни средства
+STR_BUILD_VEHICLE_ROAD_VEHICLE_CAPTION                          :{WHITE}Нова кола
+STR_BUILD_VEHICLE_SHIP_CAPTION                                  :{WHITE}Нови Кораби
+STR_BUILD_VEHICLE_AIRCRAFT_CAPTION                              :{WHITE}Ново самолет
+
+STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_BUTTON                    :{BLACK}Купи Машина
+STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_BUTTON             :{BLACK}Покупка на превозно средство
+STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON                     :{BLACK}Купи Кораб
+STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON                 :{BLACK}Строене на самолет
+
+STR_BUILD_VEHICLE_TRAIN_LIST_TOOLTIP                            :{BLACK}Списък с влакове - натисни върху влак за информация
+STR_BUILD_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP                     :{BLACK}Списък с избор на МПС-та - натисни върху МПС за информация
+STR_BUILD_VEHICLE_SHIP_LIST_TOOLTIP                             :{BLACK}Списък с избор на кораби - натисни върху кораб за информация
+STR_BUILD_VEHICLE_AIRCRAFT_LIST_TOOLTIP                         :{BLACK}Избор на самолет - натиснете върху самолет за информация
+
+STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_TOOLTIP                   :{BLACK}Строене на избрания влак
+STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_TOOLTIP            :{BLACK}Купи посоченото МПС
+STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP                    :{BLACK}Купи посоченият кораб
+STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_TOOLTIP                :{BLACK}Строене на избрания самолет
+
+STR_BUILD_VEHICLE_TRAIN_RENAME_BUTTON                           :{BLACK}Преименувай
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Преименувай
+STR_BUILD_VEHICLE_SHIP_RENAME_BUTTON                            :{BLACK}Промяна на име
+STR_BUILD_VEHICLE_AIRCRAFT_RENAME_BUTTON                        :{BLACK}Смяна на името
+
+STR_BUILD_VEHICLE_TRAIN_RENAME_TOOLTIP                          :{BLACK}Преименуване на влак
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Преименувай МПС-то
+STR_BUILD_VEHICLE_SHIP_RENAME_TOOLTIP                           :{BLACK}Промяна името на кораб
+STR_BUILD_VEHICLE_AIRCRAFT_RENAME_TOOLTIP                       :{BLACK}Смяна името на самолета
+
+STR_QUERY_RENAME_TRAIN_TYPE_CAPTION                             :{WHITE}Преименуване на влак
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Преименувай МПС-то
+STR_QUERY_RENAME_SHIP_TYPE_CAPTION                              :{WHITE}Промяна името на кораба
+STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION                          :{WHITE}Сняна името на самолета
+
+STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Нови ПС
+STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_BUTTON                      :{BLACK}Ново превозно средство
+STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON                              :{BLACK}Нови Кораби
+STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON                          :{BLACK}Ново летище
+
+STR_DEPOT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Влакове - кликни върху някой влак за повече информация, домъкни машина за да я довавиш/премахнеш от влака
+STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}ПС - натиснете върху ПС за информация
+STR_DEPOT_SHIP_LIST_TOOLTIP                                     :{BLACK}Кораби - натисни върху кораб за инфорамция
+STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Самолет - натиснете върху самолет за информация
+
+STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP                            :{BLACK}Купи нова ЖП машина
+STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}Покупка на нов автомобил
+STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}Купи нов кораб
+STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}Строене на самолет
+
+STR_DEPOT_TRAIN_SELL_TOOLTIP                                    :{BLACK}Домъкни ЖП машина тук, за да я продадеш
+STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}Преместен автомобил тук ще го продаде
+STR_DEPOT_SHIP_SELL_TOOLTIP                                     :{BLACK}Премести кораба тук, за да го продадеш
+STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}Преместете самолет тук за да го продадете
+
+STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}Фокусирай върху мястото на влаковото депо
+STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}Фокусирай общия план върху местонахождението на МПС-депото
+STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}Фокусирай общия план върху местонахождението на корабното депо
+STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Центриране на главния прозорец върху хангара
+
+
 ### depot strings
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}Искате ли да продадете всички коли в депото?
 STR_DEPOT_WRONG_DEPOT_TYPE                                      :Погрешен депо теп
@@ -3153,7 +3163,6 @@ STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TIP                          :{BLACK}Авто
 STR_DEPOT_AUTOREPLACE_SHIP_TIP                                  :{BLACK}Автоматична замяна на всички кораби в депото
 STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP                              :{BLACK}Автоматична замяна на всички самолети в хангара
 
-
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Замяна {STRING}
 STR_REPLACE_VEHICLES_START                                      :{BLACK}Започване замяната
 STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Спиране на замяната
@@ -3169,6 +3178,7 @@ STR_REPLACE_REMOVE_WAGON                                        :{BLACK}Прем
 STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Автоматичната замяна ще запази дължината на влака като премахне вагони (започвайки от предните), ако замяната довежда до по-дълъг влак.
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}Замяна: {ORANGE}{SKIP}{SKIP}{STRING}
 STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}Превключване между замяна на локомотиви и вагони
+
 STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Превозното средство не е на разположение
 STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Превозното средство не е на разположение
 STR_SHIP_NOT_AVAILABLE                                          :{WHITE}Корабът не е на разположение
@@ -3316,17 +3326,6 @@ STR_MEASURE_AREA                                                :{BLACK}Площ
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Дължина: {NUM}{}Разлика във височината: {NUM} м
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Площ: {NUM} x {NUM}{}Разлика във височината: {NUM} м
 
-############ Date formatting
-STR_FORMAT_DATE_TINY                                            :{STRING}-{STRING}-{NUM}
-STR_FORMAT_DATE_SHORT                                           :{STRING} {NUM}
-STR_FORMAT_DATE_LONG                                            :{STRING} {STRING} {NUM}
-STR_FORMAT_DATE_ISO                                             :{2:NUM}-{1:STRING}-{0:STRING}
-
-STR_JUST_DATE_TINY                                              :{DATE_TINY}
-STR_JUST_DATE_LONG                                              :{DATE_LONG}
-STR_JUST_DATE_ISO                                               :{DATE_ISO}
-########
-
 STR_FEEDER_CARGO_VALUE                                          :{BLACK}Сума за преместване: {LTBLUE}{CURRENCY}
 STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD                            :{WHITE}...този път принадлежи на градът
 STR_DRIVE_THROUGH_ERROR_DIRECTION                               :{WHITE}...пътят е насочен в погрешната посока
@@ -3351,7 +3350,6 @@ STR_PERCENT_UP_DOWN_SMALL                                       :{TINYFONT}{WHIT
 STR_PERCENT_UP_DOWN                                             :{WHITE}{NUM}%{UPARROW}{DOWNARROW}
 
 ##### Mass Order
-STR_FORMAT_GROUP_NAME                                           :Група {COMMA}
 STR_GROUP_TINY_NAME                                             :{TINYFONT}{GROUP}
 STR_GROUP_ALL_TRAINS                                            :Всички влакове
 STR_GROUP_ALL_ROAD_VEHICLES                                     :Всички пътни превозни средства
@@ -3380,12 +3378,62 @@ STR_GROUP_DELETE_TIP                                            :{BLACK}Изтр
 STR_GROUP_RENAME_TIP                                            :{BLACK}Преименувай избраната група
 STR_GROUP_REPLACE_PROTECTION_TIP                                :{BLACK}Щракни да защитиш тази група от глобална автоматична замяна
 
+#### String control codes and their formatting
 STR_COMPANY_NAME                                                :{COMPANY}
 STR_ENGINE_NAME                                                 :{ENGINE}
 STR_GROUP_NAME                                                  :{GROUP}
+STR_INDUSTRY_NAME                                               :{INDUSTRY}
 STR_PRESIDENT_NAME                                              :{PRESIDENTNAME}
 STR_SIGN_NAME                                                   :{SIGN}
+STR_STATION_NAME                                                :{STATION}
+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_LONG                                              :{DATE_LONG}
+STR_JUST_DATE_ISO                                               :{DATE_ISO}
+STR_JUST_STRING                                                 :{STRING}
+STR_JUST_RAW_STRING                                             :{STRING}
+
+STR_FORMAT_DATE_TINY                                            :{STRING}-{STRING}-{NUM}
+STR_FORMAT_DATE_SHORT                                           :{STRING} {NUM}
+STR_FORMAT_DATE_LONG                                            :{STRING} {STRING} {NUM}
+STR_FORMAT_DATE_ISO                                             :{2:NUM}-{1:STRING}-{0:STRING}
+
+STR_FORMAT_COMPANY_NUM                                          :(Компания {COMMA})
+STR_FORMAT_GROUP_NAME                                           :Група {COMMA}
+STR_FORMAT_INDUSTRY_NAME                                        :{1:STRING} {0:TOWN}
+
+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}Името трябва да е уникално
 
diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt
index bc9f87cbd..32b4d4a65 100644
--- a/src/lang/catalan.txt
+++ b/src/lang/catalan.txt
@@ -154,8 +154,6 @@ STR_ABBREV_PLASTIC                                              :{TINYFONT}PL
 STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}BG
 STR_ABBREV_NONE                                                 :{TINYFONT}NO
 STR_ABBREV_ALL                                                  :{TINYFONT}TOT
-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
@@ -167,17 +165,11 @@ STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Copyrigh
 STR_ABOUT_VERSION                                               :{BLACK}OpenTTD versió {REV}
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 L'equip d'OpenTTD
 
-STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
-STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_QUIT_CAPTION                                                :{WHITE}Surt
 STR_YES                                                         :{BLACK}Si
 STR_NO                                                          :{BLACK}No
 STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Estàs segur que vols abandonar aquest joc i tornar a {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                                                :Res
 STR_COLOUR_DARK_BLUE                                            :Blau Fosc
 STR_COLOUR_PALE_GREEN                                           :Verd Pàl·lid
@@ -196,8 +188,6 @@ STR_COLOUR_BROWN                                                :Marró
 STR_COLOUR_GREY                                                 :Gris
 STR_COLOUR_WHITE                                                :Blanc
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}Massa vehicles en joc
-STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
-STR_RED_COMMA                                                   :{RED}{COMMA}
 STR_BUTTON_LOCATION                                             :{BLACK}Situació
 STR_SMALLMAP_TYPE_CONTOURS                                      :Límits
 STR_SMALLMAP_TYPE_VEHICLES                                      :Vehicles
@@ -323,12 +313,13 @@ STR_SORT_CRITERIA_TIP                                           :{BLACK}Seleccio
 STR_FILTER_CRITERIA_TIP                                         :{BLACK}Selecciona el criteri de filtratge
 STR_SORT_BY                                                     :{BLACK}Ordenar per
 
+### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}Població
+STR_SORT_BY_NAME                                                :{BLACK}Nom
+STR_SORT_BY_DATE                                                :{BLACK}Data
 STR_SORT_BY_PRODUCTION                                          :Producció
 STR_SORT_BY_TYPE                                                :Tipus
 STR_SORT_BY_TRANSPORTED                                         :Transportat
-STR_SORT_BY_NAME                                                :{BLACK}Nom
-STR_SORT_BY_DATE                                                :{BLACK}Data
 STR_SORT_BY_NUMBER                                              :Número
 STR_SORT_BY_PROFIT_LAST_YEAR                                    :Benef. darrer any
 STR_SORT_BY_PROFIT_THIS_YEAR                                    :Benef. aquest any
@@ -351,37 +342,25 @@ STR_SORT_BY_INTRO_DATE                                          :Data de llança
 STR_SORT_BY_RUNNING_COST                                        :Cost d'utilització
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :Potència/Cost d'utilització
 STR_SORT_BY_CARGO_CAPACITY                                      :Capacitat de càrrega
+
 STR_NO_WAITING_CARGO                                            :{BLACK}No hi ha càrrega d'aquest tipus esperant
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}Seleccionar totes les instal·lacions
 STR_SELECT_ALL_TYPES                                            :{BLACK}Selecciona tots els tipus de càrrega (incloent carga sense espera)
-STR_AVAILABLE_TRAINS                                            :{BLACK}Trens Disponibles
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Vehicles Disponibles
-STR_AVAILABLE_SHIPS                                             :{BLACK}Vaixells Disponibles
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Avions Disponibles
 STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Veure una llista dels motors disponibles per aquest tipus de vehicle
 STR_MANAGE_LIST                                                 :{BLACK}Administra llista
 STR_MANAGE_LIST_TIP                                             :{BLACK}Envia instruccions a tots els vehicles de la llista
 STR_REPLACE_VEHICLES                                            :Substitueix Vehicles
+STR_SEND_FOR_SERVICING                                          :Enviar a fer Revisió
+
+STR_AVAILABLE_TRAINS                                            :{BLACK}Trens Disponibles
+STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Vehicles Disponibles
+STR_AVAILABLE_SHIPS                                             :{BLACK}Vaixells Disponibles
+STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Avions Disponibles
+
 STR_SEND_TRAIN_TO_DEPOT                                         :Enviar a la Cotxera
 STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Enviar a la Cotxera
 STR_SEND_SHIP_TO_DEPOT                                          :Enviar a la Drassana
 STR_SEND_AIRCRAFT_TO_HANGAR                                     :Enviar a l'Hangar
-STR_SEND_FOR_SERVICING                                          :Enviar a fer Revisió
-
-############ range for months starts
-STR_MONTH_ABBREV_JAN                                            :Gen
-STR_MONTH_ABBREV_FEB                                            :Feb
-STR_MONTH_ABBREV_MAR                                            :Mar
-STR_MONTH_ABBREV_APR                                            :Abr
-STR_MONTH_ABBREV_MAY                                            :Mai
-STR_MONTH_ABBREV_JUN                                            :Jun
-STR_MONTH_ABBREV_JUL                                            :Jul
-STR_MONTH_ABBREV_AUG                                            :Ago
-STR_MONTH_ABBREV_SEP                                            :Sep
-STR_MONTH_ABBREV_OCT                                            :Oct
-STR_MONTH_ABBREV_NOV                                            :Nov
-STR_MONTH_ABBREV_DEC                                            :Des
-############ range for months ends
 
 STR_GRAPH_X_LABEL_MONTH                                         :{TINYFONT}{STRING}{} {STRING}
 STR_GRAPH_X_LABEL_MONTH_YEAR                                    :{TINYFONT}{STRING}{} {STRING}{}{NUM}
@@ -409,8 +388,6 @@ 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_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
@@ -457,7 +434,7 @@ STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Ningú
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Nom
 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                                          :1
 STR_ORDINAL_NUMBER_2ND                                          :2
 STR_ORDINAL_NUMBER_3RD                                          :3
@@ -491,6 +468,34 @@ STR_ORDINAL_NUMBER_30TH                                         :30
 STR_ORDINAL_NUMBER_31ST                                         :31
 ############ range for days ends
 
+############ range for months starts
+STR_MONTH_ABBREV_JAN                                            :Gen
+STR_MONTH_ABBREV_FEB                                            :Feb
+STR_MONTH_ABBREV_MAR                                            :Mar
+STR_MONTH_ABBREV_APR                                            :Abr
+STR_MONTH_ABBREV_MAY                                            :Mai
+STR_MONTH_ABBREV_JUN                                            :Jun
+STR_MONTH_ABBREV_JUL                                            :Jul
+STR_MONTH_ABBREV_AUG                                            :Ago
+STR_MONTH_ABBREV_SEP                                            :Sep
+STR_MONTH_ABBREV_OCT                                            :Oct
+STR_MONTH_ABBREV_NOV                                            :Nov
+STR_MONTH_ABBREV_DEC                                            :Des
+
+STR_MONTH_JAN                                                   :Gener
+STR_MONTH_FEB                                                   :Febrer
+STR_MONTH_MAR                                                   :Març
+STR_MONTH_APR                                                   :Abril
+STR_MONTH_MAY                                                   :Maig
+STR_MONTH_JUN                                                   :Juny
+STR_MONTH_JUL                                                   :Juliol
+STR_MONTH_AUG                                                   :Agost
+STR_MONTH_SEP                                                   :Setembre
+STR_MONTH_OCT                                                   :Octubre
+STR_MONTH_NOV                                                   :Novembre
+STR_MONTH_DEC                                                   :Desembre
+############ range for months ends
+
 STR_GRAPH_Y_LABEL_NUMBER                                        :{TINYFONT}{COMMA}
 
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}Càrrega acceptada: {LTBLUE}
@@ -580,12 +585,9 @@ 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_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_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
@@ -667,9 +669,7 @@ STR_OFF                                                         :Fora
 STR_SUMMARY                                                     :Resum
 STR_FULL                                                        :Complet
 STR_STATUSBAR_COMPANY_NAME                                      :{SILVER}- -  {COMPANY}  - -
-STR_BLACK_STRING                                                :{BLACK}{STRING}
 
-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
@@ -774,9 +774,6 @@ 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_BLACK_6                                                     :{BLACK}6
-STR_BLACK_7                                                     :{BLACK}7
-
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Anglès
 STR_TOWNNAME_FRENCH                                             :Francès
@@ -856,19 +853,6 @@ STR_OPTIONS_BASE_GRF_DESCRIPTION_TIP                            :{BLACK}Informac
 
 STR_AUTOSAVE_FAILED                                             :{WHITE}Ha fallat el desat automàtic
 
-STR_MONTH_JAN                                                   :Gener
-STR_MONTH_FEB                                                   :Febrer
-STR_MONTH_MAR                                                   :Març
-STR_MONTH_APR                                                   :Abril
-STR_MONTH_MAY                                                   :Maig
-STR_MONTH_JUN                                                   :Juny
-STR_MONTH_JUL                                                   :Juliol
-STR_MONTH_AUG                                                   :Agost
-STR_MONTH_SEP                                                   :Setembre
-STR_MONTH_OCT                                                   :Octubre
-STR_MONTH_NOV                                                   :Novembre
-STR_MONTH_DEC                                                   :Desembre
-
 STR_HEADING_FOR_STATION                                         :{LTBLUE}Cap a {STATION}
 STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}Cap a {STATION}, a {VELOCITY}
 STR_NO_ORDERS                                                   :{LTBLUE}Sense ordres
@@ -883,8 +867,6 @@ STR_CRATES                                                      :palets
 STR_RES_OTHER                                                   :altres
 STR_NOTHING                                                     :
 
-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...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Fi d'Ordres Compartides - -
@@ -1156,7 +1138,6 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Mida-Y
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :desactivat
-STR_JUST_CURRENCY                                               :{CURRENCY}
 STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Canvia el valor de l'ajustament
 
 STR_TEMPERATE_LANDSCAPE                                         :paisatge temperat
@@ -1258,11 +1239,6 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Nom de l
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...massa a prop d'altres indústries
 
-STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Remodela un tren per transportar un altre tipus de càrrega
-STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Remodela tren
-STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Selecciona tipus de càrrega a transportar
-STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Remodela un tren per transportar el tipus de càrrega seleccionada
-STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}No es pot remodelar el tren...
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Canvi de producció
 
 ############ network gui strings
@@ -2123,8 +2099,6 @@ STR_NUM_LOW                                                     :Baix
 STR_NUM_NORMAL                                                  :Normal
 STR_NUM_HIGH                                                    :Alt
 STR_NUM_CUSTOM                                                  :Personalitzat
-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à
@@ -2592,10 +2566,8 @@ STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE                          :locomotora de m
 STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE                            :locomotora de maglev
 
 ##id 0x8800
-STR_DEPOT_TRAIN_CAPTION                                         :{WHITE}{TOWN} Cotxeres de Tren
 STR_NEWS_FIRST_TRAIN_ARRIVAL                                    :{BLACK}{BIGFONT}Celebració popular . . .{} Arribada del 1er. tren a {STATION}!
 STR_VEHICLE_DETAILS_CAPTION                                     :{WHITE}{VEHICLE} (Detalls)
-STR_ERROR_TRAIN_IN_THE_WAY                                      :{WHITE}Tren en el camí
 STR_ORDER                                                       :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 STR_ORDER_SELECTED                                              :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 STR_ORDER_NON_STOP                                              :{BLACK}Sense parar
@@ -2685,37 +2657,16 @@ STR_TIMETABLE_AND_TRAVEL_FOR                                    :i viatge per {S
 STR_TIMETABLE_DAYS                                              :{COMMA} di{P a es}
 STR_TIMETABLE_TICKS                                             :{COMMA} mar{P ca ques}
 
-STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Cap a cotxeres de {TOWN}.
-STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Cap a cotxeres de {TOWN}, a {VELOCITY}
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Revisió a la cotxera de {TOWN}
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Revisió a la cotxera de {TOWN}, {VELOCITY}
-
 STR_INVALID_ORDER                                               :{RED} (Ordre incorrecte)
 
 STR_UNKNOWN_STATION                                             :estació desconeguda
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}Buit
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} procedent{P "" s} de {STATION}
 STR_VEHICLE_DETAILS_CARGO_FROM_MULT                             :{LTBLUE}{CARGO} des de {STATION} (x{NUM})
-STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} està esperant a la cotxera
-STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Nous Vehicles
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}Tren massa llarg
 STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}Els trens només es poden modificar quan estan parats dins d'una cotxera
 
-STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}Nous Trens
-STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}Nous Trens de Via Electrificada
-STR_BUILD_VEHICLE_TRAIN_MONORAIL_CAPTION                        :{WHITE}Nous Trens Monorail
-STR_BUILD_VEHICLE_TRAIN_MAGLEV_CAPTION                          :{WHITE}Nous Trens Maglev
-STR_BUILD_VEHICLE_TRAIN_ALL_CAPTION                             :{WHITE}Vehicles amb Vies
-
-STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_BUTTON                    :{BLACK}Construeix Vehicle
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Clona Vehicle
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Fa una còpia del vehicle. Control+Clic compartirà les ordres
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Fa una còpia del vehicle. Prem aquest botó i després en un vehicle dins o fora cotxeres. Control+Clic compartirà les ordres
-STR_CLONE_TRAIN                                                 :{BLACK}Clona Tren
-STR_CLONE_TRAIN_INFO                                            :{BLACK}Fa una còpia del tren inclosos tots els vagons. Control+Clic compartirà les ordres
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Fa una còpia del tren inclosos tots els vagons. Prem aquest botó i després en un tren dins o fora cotxeres. Control+Clic compartirà les ordres
-STR_BUILD_VEHICLE_TRAIN_RENAME_BUTTON                           :{BLACK}Reanomena
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Salta
 STR_ORDERS_DELETE_BUTTON                                        :{BLACK}Esborra
 STR_ORDERS_GO_TO_BUTTON                                         :{BLACK}Ves a
@@ -2731,14 +2682,12 @@ STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Commuta
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Ordres)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Fi d'Ordres - -
 STR_SERVICE                                                     :{BLACK}Servei
-STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}No es pot construir el vehicle...
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Construït: {LTBLUE}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Valor: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
 STR_VEHICLE_STATUS_LOADING_UNLOADING                            :{LTBLUE}Carregant / Descarregant
 STR_VEHICLE_STATUS_LEAVING                                      :{LTBLUE}Deixant
 STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}El tren s'ha de parar dins de la cotxera
-STR_ERROR_CAN_T_SEND_TRAIN_TO_DEPOT                             :{WHITE}No pots enviar el tren a cotxeres...
 STR_ERROR_NO_MORE_SPACE_FOR_ORDERS                              :{WHITE}No hi ha més espai per ordres
 STR_ERROR_TOO_MANY_ORDERS                                       :{WHITE}Massa ordres
 STR_ERROR_CAN_T_INSERT_NEW_ORDER                                :{WHITE}No es pot afegir una nova ordre...
@@ -2753,25 +2702,11 @@ STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE}un vehic
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}No es pot moure el vehicle...
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}La màquina posterior sempre ha de seguir la seva parella davantera
 STR_CARGO_N_A                                                   :N/A{SKIP}
-STR_ERROR_CAN_T_SELL_TRAIN                                      :{WHITE}No es pot vendre el vehicle...
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}Incapaç de trobar el camí a la cotxera local
-STR_ERROR_CAN_T_STOP_START_TRAIN                                :{WHITE}No es pot parar/arrencar el tren...
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}Interval de manteniment: {LTBLUE}{COMMA}dies{BLACK}   Darrer manteniment: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}Interval de manteniment: {LTBLUE}{COMMA}%{BLACK}   Darrer manteniment: {LTBLUE}{DATE_LONG}
-STR_DEPOT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Trens - clica al tren per info., arrossega el vehicle per afegir/treure del tren
-STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP                            :{BLACK}Construeix un nou element de tren
-STR_DEPOT_TRAIN_SELL_TOOLTIP                                    :{BLACK}Arrossega l'element de tren fins aquí per vendre'l
-STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}Centra la vista de la pantalla principal en la situació de la cotxera
-STR_BUILD_VEHICLE_TRAIN_LIST_TOOLTIP                            :{BLACK}Llista de selecció d'elements de tren - clica a l'element per més informació
-STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_TOOLTIP                   :{BLACK}Construeix l'element de tren seleccionat
-STR_BUILD_VEHICLE_TRAIN_RENAME_TOOLTIP                          :{BLACK}Reanomena el tipus d'element del tren
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP                 :{BLACK}Acció sobre el tren actual - clica aquí per parar/arrencar el tren
-STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP                           :{BLACK}Mostra les ordres del tren
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP                         :{BLACK}Centra la vista de la pantalla principal a la situació del tren
-STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP                    :{BLACK}Envia el tren a cotxera
 STR_VEHICLE_VIEW_TRAIN_IGNORE_SIGNAL_TOOLTIP                    :{BLACK}Obliga al tren a actuar sense esperar a tenir la senyal lliure
 STR_VEHICLE_VIEW_TRAIN_REVERSE_TOOLTIP                          :{BLACK}Inverteix la direcció del tren
-STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Mostra els detalls del tren
 STR_VEHICLE_DETAILS_INCREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Augmenta l'interval de manteniment
 STR_VEHICLE_DETAILS_DECREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Disminueix l'interval de manteniment
 STR_VEHICLE_DETAILS_TRAIN_CARGO_TOOLTIP                         :{BLACK}Mostra els detalls de càrrega transportada
@@ -2805,15 +2740,10 @@ STR_VEHICLE_STATUS_STOPPED                                      :{RED}Parat
 STR_ERROR_CAN_T_MAKE_TRAIN_PASS_SIGNAL                          :{WHITE}No pots fer que un tren passi d'una senyal amb perill...
 STR_VEHICLE_STATUS_CRASHED                                      :{RED}Accident!
 
-STR_QUERY_RENAME_TRAIN_CAPTION                                  :{WHITE}Anomena tren
-STR_ERROR_CAN_T_RENAME_TRAIN                                    :{WHITE}No es pot anomenar el tren...
-STR_VEHICLE_DETAILS_TRAIN_RENAME                                :{BLACK}Anomena tren
 STR_NEWS_TRAIN_CRASH                                            :{BLACK}{BIGFONT}Accident de Tren!{}{COMMA} moren en una bola de foc després de la col·lisió
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}No es pot invertir la direcció del tren...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE                  :{WHITE}No s'ha pogut invertir el sentit del vehicle...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}No es poden girar vehicles que estan formats per múltiples unitats
-STR_QUERY_RENAME_TRAIN_TYPE_CAPTION                             :{WHITE}Reanomena el tipus d'element del tren
-STR_ERROR_CAN_T_RENAME_TRAIN_TYPE                               :{WHITE}No es pot reanomenar el tipus d'element del tren...
 STR_CLEAR_TIME                                                  :{BLACK}Esborra Temps
 STR_RESET_LATENESS                                              :{BLACK}Reset. control de retard
 STR_CHANGE_WAYPOINT_NAME                                        :{BLACK}Canvia el nom del punt de trobada
@@ -2845,43 +2775,14 @@ STR_TIMETABLE_AUTOFILL                                          :{BLACK}Autoompl
 STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Omple automàticament l'horari amb valors del proper viatge (CTRL+clic per intentar mantenir els temps d'espera)
 
 ##id 0x9000
-STR_ERROR_ROAD_VEHICLE_IN_THE_WAY                               :{WHITE}Automòbil en camí
-STR_DEPOT_ROAD_VEHICLE_CAPTION                                  :{WHITE}{TOWN} Cotxera de Vehicles
-STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_BUTTON                      :{BLACK}Nous Vehicles
-STR_BUILD_VEHICLE_ROAD_VEHICLE_CAPTION                          :{WHITE}Nous Vehicles
-STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_BUTTON             :{BLACK}Construeix Vehicle
-STR_ERROR_CAN_T_BUILD_ROAD_VEHICLE                              :{WHITE}No es pot construir l'automòbil...
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}...s'ha de parar dins d'una cotxera
-STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}No pots vendre l'automòbil...
-STR_ERROR_CAN_T_STOP_START_ROAD_VEHICLE                         :{WHITE}No es pot parar/arrencar l'automòbil...
-STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} està esperant a la cotxera
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Cap a la cotxera de {TOWN}.
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Cap a la cotxera de {TOWN}, a {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Revisió a la cotxera de {TOWN}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Revisió a la cotxera de {TOWN}, {VELOCITY}
-STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}No es pot enviar el vehicle a cotxera...
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Impossible trobar la cotxera local
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP          :{BLACK}Acció sobre el vehicle actual - clica aquí per parar/arrencar el vehicle
-STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP                    :{BLACK}Mostra les ordres dels vehicles
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP                  :{BLACK}Centra la pantalla principal a la situació del vehicle
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}Envia el vehicle a cotxera
 STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP                   :{BLACK}Obliga al vehicle a tornar
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Mostra els detalls del vehicle
-STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Vehicles - clica en un vehicle per més informació
-STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}Construeix un nou automòbil
-STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}Arrossega el vehicle fins aquí per vendre'l
-STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}Centra la pantalla principal en la situació de la cotxera
-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_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})
 
-STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Anomena automòbil
-STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}No es pot anomenar l'automòbil...
-STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Anomena automòbil
 STR_NEWS_FIRST_BUS_ARRIVAL                                      :{BLACK}{BIGFONT}Celebració popular . . .{}Primer autobús arriba a {STATION}!
 STR_NEWS_FIRST_TRUCK_ARRIVAL                                    :{BLACK}{BIGFONT}Celebració popular . . .{}Primer camió arriba a {STATION}!
 STR_NEWS_FIRST_PASSENGER_TRAM_ARRIVAL                           :{BLACK}{BIGFONT}Els ciutadans celebren . . .{}El primer tramvia de passatgers arriba a {STATION}!
@@ -2889,128 +2790,39 @@ STR_NEWS_FIRST_CARGO_TRAM_ARRIVAL                               :{BLACK}{BIGFONT
 STR_NEWS_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Accident d'automòbil!{}El conductor mor en una bola de foc després de la col·lisió amb un tren
 STR_NEWS_ROAD_VEHICLE_CRASH                                     :{BLACK}{BIGFONT}Accident d'automòbil!{}{COMMA} moren en una bola de foc després d'una col·lisió amb un tren
 STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}No s'ha pogut fer girar el vehicle...
-STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Reanomena
-STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Reanomena tipus d'automòbil
-STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Reanomena tipus d'automòbil
-STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}No es pot reanomenar tipus d'automòbil
 
-STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Remodela vehicle de carretera per dur un tipus diferent de càrrega
-STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Remodela vehicle de carretera
-STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Remodela vehicle de carretera per a dur el tipus de carrega senyalat
-STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}No es pot remodelar el vehicle de carretera...
-STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Selecciona el tipus de càrrega a transportar pel vehicle
 
 ##id 0x9800
 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :Construcció de vies d'aigua
 STR_WATERWAYS_TOOLBAR_CAPTION                                   :{WHITE}Construcció de vies d'aigua
 STR_WATERWAYS_TOOLBAR_CAPTION_SE                                :{WHITE}Vies d'aigua
 STR_ERROR_CAN_T_BUILD_DOCK_HERE                                 :{WHITE}Aquí no es pot construir un port...
-STR_DEPOT_SHIP_CAPTION                                          :{WHITE}{TOWN} Drassana
-STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON                              :{BLACK}Nous Vaixells
-STR_BUILD_VEHICLE_SHIP_CAPTION                                  :{WHITE}Nous Vaixells
-STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON                     :{BLACK}Construeix Vaixell
-STR_CLONE_SHIP                                                  :{BLACK}Clona Vaixell
-STR_CLONE_SHIP_INFO                                             :{BLACK}Fa una còpia del vaixell. Control+Clic compartirà les ordres
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Fa una còpia del vaixell. Prem aquest botó i després en un vaixell dins o fora les drassanes. Control+Clic compartirà les ordres
 STR_ERROR_SHIP_MUST_BE_STOPPED_IN_DEPOT                         :{WHITE}El vaixell s'ha de parar a la drassana
-STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}No es pot vendre el vaixell...
-STR_ERROR_CAN_T_BUILD_SHIP                                      :{WHITE}No es pot construir el vaixell...
-STR_ERROR_SHIP_IN_THE_WAY                                       :{WHITE}Vaixell en el camí
-STR_ERROR_CAN_T_STOP_START_SHIP                                 :{WHITE}No es pot parar/arrencar el vaixell...
-STR_ERROR_CAN_T_SEND_SHIP_TO_DEPOT                              :{WHITE}No es pot enviar vaixell a la drassana...
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Cap a la drassana de {TOWN}.
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Cap a la drassana de{TOWN}, a {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Revisió a la drassana de {TOWN}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Revisió a la drassana de {TOWN}, {VELOCITY}
-STR_NEWS_SHIP_IS_WAITING                                        :{WHITE}{VEHICLE} està esperant a la drassana
 STR_WATERWAYS_TOOLBAR_BUILD_DOCK_TOOLTIP                        :{BLACK}Construeix un port
 STR_WATERWAYS_TOOLBAR_BUILD_DEPOT_TOOLTIP                       :{BLACK}Construeix una drassana (per construir i revisar vaixells)
-STR_DEPOT_SHIP_LIST_TOOLTIP                                     :{BLACK}Vaixells - clica en un vaixell per més informació
-STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}Construeix un nou vaixell
-STR_DEPOT_SHIP_SELL_TOOLTIP                                     :{BLACK}Arrossega el vaixell fins aquí per vendre'l
-STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}Centra la pantalla principal en la situació de la drassana
-STR_BUILD_VEHICLE_SHIP_LIST_TOOLTIP                             :{BLACK}Llista de selecció de Vaixells - clica en un vaixell per més informació
-STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP                    :{BLACK}Construeix el vaixell seleccionat
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP                  :{BLACK}Accions sobre el vaixell actual - clica aquí per parar/arrencar el vaixell
-STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Mostra les ordres del vaixell
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP                          :{BLACK}Centra la pantalla principal en la situació del vaixell
-STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}Envia el vaixell a la drassana. CTRL+Clic per només revisió
-STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Mostra els detalls del vaixell
-STR_VEHICLE_DETAILS_SHIP_RENAME                                 :{BLACK}Anomena vaixell
 
-STR_QUERY_RENAME_SHIP_CAPTION                                   :{WHITE}Anomena vaixell
-STR_ERROR_CAN_T_RENAME_SHIP                                     :{WHITE}No es pot anomenar el vaixell...
 STR_NEWS_FIRST_SHIP_ARRIVAL                                     :{BLACK}{BIGFONT}Celebració popular . . .{}El 1er. vaixell arriba a {STATION}!
 STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}Situa boia, que pot ser útil per marques de ruta addicionals
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}Aquí no es pot situar una boia...
 STR_BUILD_AQUEDUCT                                              :{BLACK} Construeix aqüeducte
 STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}Aquí no es pot construir un aqüeducte...
-STR_BUILD_VEHICLE_SHIP_RENAME_BUTTON                            :{BLACK}Reanomena
-STR_BUILD_VEHICLE_SHIP_RENAME_TOOLTIP                           :{BLACK}Reanomena tipus de vaixell
-STR_QUERY_RENAME_SHIP_TYPE_CAPTION                              :{WHITE}Reanomena tipus de vaixell
-STR_ERROR_CAN_T_RENAME_SHIP_TYPE                                :{WHITE}No es pot reanomenar el tipus de vaixell...
-STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}Remodela vaixell mercant per portar un tipus diferent de càrrega
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (Remodela)
-STR_REFIT_SHIP_REFIT_BUTTON                                     :{BLACK}Remodela vaixell
-STR_REFIT_SHIP_LIST_TOOLTIP                                     :{BLACK}Selecciona el tipus de càrrega a transportar
-STR_REFIT_SHIP_REFIT_TOOLTIP                                    :{BLACK}Remodela vaixell per portar el tipus de càrrega seleccionat
 STR_REFIT_TITLE                                                 :{GOLD}Selecciona el tipus de càrrega a transportar:
 STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}Nova capacitat: {GOLD}{CARGO}{}{BLACK}Cost de la remodelació: {GOLD}{CURRENCY}
-STR_ERROR_CAN_T_REFIT_SHIP                                      :{WHITE}No es pot remodelar el vaixell...
 STR_REFITTABLE                                                  :(remodelable)
 
 ##id 0xA000
 STR_TOOLBAR_AIRCRAFT_CAPTION                                    :{WHITE}Aeroports
 STR_ERROR_CAN_T_BUILD_AIRPORT_HERE                              :{WHITE}Aquí no es pot construir un aeroport...
-STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}{STATION} Hangar d'Avions
-STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON                          :{BLACK}Nou Avió
-STR_CLONE_AIRCRAFT                                              :{BLACK}Clona Avió
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Fa una còpia de l'avió. Control+Clic compartirà les ordres
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Fa una còpia de l'avió. Prem aquest botó i després en un avió dins o fora l'hangar. Control+Clic compartirà les ordres
-STR_BUILD_VEHICLE_AIRCRAFT_CAPTION                              :{WHITE}Nou Avió
-STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON                 :{BLACK}Construeix Avió
-STR_ERROR_CAN_T_BUILD_AIRCRAFT                                  :{WHITE}No es pot construir l'avió...
-STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR                         :{WHITE}No es pot enviar l'avió a l'hangar...
-STR_HEADING_FOR_HANGAR                                          :{ORANGE}Cap a l'hangar de {STATION}.
-STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Cap a l'hangar de {STATION}, a {VELOCITY}
-STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Revisió a l'hangar de {STATION}
-STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Revisió a l'hangar de {STATION}, {VELOCITY}
-STR_NEWS_AIRCRAFT_IS_WAITING                                    :{WHITE}{VEHICLE} està esperant a l'hangar
-STR_ERROR_AIRCRAFT_IN_THE_WAY                                   :{WHITE}Avió al camí
-STR_ERROR_CAN_T_STOP_START_AIRCRAFT                             :{WHITE}No es pot parar/arrencar l'avió...
 STR_ERROR_AIRCRAFT_IS_IN_FLIGHT                                 :{WHITE}L'avió està volant
 STR_ERROR_AIRCRAFT_MUST_BE_STOPPED                              :{WHITE}L'avió s'ha de parar a l'hangar
-STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}No es pot vendre l'avió...
 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION                          :Construcció d'Aeroport
 STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Construeix un aeroport
-STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Avió - clica sobre l'avió per més informació
-STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}Construeix nous avions
-STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}Arrossega l'avió fins aquí per vendre'l
-STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Centra la pantalla principal en la situació de l'hangar
-STR_BUILD_VEHICLE_AIRCRAFT_LIST_TOOLTIP                         :{BLACK}Llista de selecció d'Avions - clica sobre l'avió per més informació
-STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_TOOLTIP                :{BLACK}Construeix l'avió seleccionat
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP              :{BLACK}Accions sobre l'avió actual - clica aquí per parar/arrencar l'avió
-STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Mostra les ordres de l'avió
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP                      :{BLACK}Centra la pantalla principal a la situació de l'avió
-STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}Envia avió a l'hangar
-STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Mostra els detalls de l'avió
 
-STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}Anomena avió
-STR_ERROR_CAN_T_RENAME_AIRCRAFT                                 :{WHITE}No es pot anomenar l'avió...
-STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}Anomena avió
 STR_NEWS_FIRST_AIRCRAFT_ARRIVAL                                 :{BLACK}{BIGFONT}Celebració popular . . .{}El primer avió arriba a {STATION}!
 STR_NEWS_AIRCRAFT_CRASH                                         :{BLACK}{BIGFONT}Accident d'avió!{}{COMMA} moren en una bola de foc a {STATION}
 STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Accident d'aviació!{}L'avió s'ha quedat sense combustible, {COMMA} morts en l'accident!
 STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
-STR_BUILD_VEHICLE_AIRCRAFT_RENAME_BUTTON                        :{BLACK}Reanomena
-STR_BUILD_VEHICLE_AIRCRAFT_RENAME_TOOLTIP                       :{BLACK}Reanomena tipus d'avió
-STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION                          :{WHITE}Reanomena tipus d'avió
-STR_ERROR_CAN_T_RENAME_AIRCRAFT_TYPE                            :{WHITE}No es pot reanomenar el tipus d'avió...
-STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Remodela avions per poder transportar diferents tipus de càrrega
-STR_REFIT_AIRCRAFT_REFIT_BUTTON                                 :{BLACK}Remodela avió
-STR_REFIT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Selecciona tipus de càrrega a transportar
-STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}Remodela l'avió per poder transportar el tipus de càrrega seleccionat
-STR_ERROR_CAN_T_REFIT_AIRCRAFT                                  :{WHITE}No es pot remodelar l'avió...
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Horari)
 
@@ -3178,6 +2990,211 @@ STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING}
 STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}Ordres compartides de {COMMA} Vehicle{P "" s}
 STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Mostra tots els vehicles que tenen les mateixes ordres
 
+STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} està esperant a la cotxera
+STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} està esperant a la cotxera
+STR_NEWS_SHIP_IS_WAITING                                        :{WHITE}{VEHICLE} està esperant a la drassana
+STR_NEWS_AIRCRAFT_IS_WAITING                                    :{WHITE}{VEHICLE} està esperant a l'hangar
+
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Remodela tren
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Remodela vehicle de carretera
+STR_REFIT_SHIP_REFIT_BUTTON                                     :{BLACK}Remodela vaixell
+STR_REFIT_AIRCRAFT_REFIT_BUTTON                                 :{BLACK}Remodela avió
+
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Remodela un tren per transportar el tipus de càrrega seleccionada
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Remodela vehicle de carretera per a dur el tipus de carrega senyalat
+STR_REFIT_SHIP_REFIT_TOOLTIP                                    :{BLACK}Remodela vaixell per portar el tipus de càrrega seleccionat
+STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}Remodela l'avió per poder transportar el tipus de càrrega seleccionat
+
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Selecciona tipus de càrrega a transportar
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Selecciona el tipus de càrrega a transportar pel vehicle
+STR_REFIT_SHIP_LIST_TOOLTIP                                     :{BLACK}Selecciona el tipus de càrrega a transportar
+STR_REFIT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Selecciona tipus de càrrega a transportar
+
+STR_DEPOT_TRAIN_CAPTION                                         :{WHITE}{TOWN} Cotxeres de Tren
+STR_DEPOT_ROAD_VEHICLE_CAPTION                                  :{WHITE}{TOWN} Cotxera de Vehicles
+STR_DEPOT_SHIP_CAPTION                                          :{WHITE}{TOWN} Drassana
+STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}{STATION} Hangar d'Avions
+
+STR_VEHICLE_DETAILS_TRAIN_RENAME                                :{BLACK}Anomena tren
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Anomena automòbil
+STR_VEHICLE_DETAILS_SHIP_RENAME                                 :{BLACK}Anomena vaixell
+STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}Anomena avió
+
+STR_QUERY_RENAME_TRAIN_CAPTION                                  :{WHITE}Anomena tren
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Anomena automòbil
+STR_QUERY_RENAME_SHIP_CAPTION                                   :{WHITE}Anomena vaixell
+STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}Anomena avió
+
+STR_ERROR_TRAIN_IN_THE_WAY                                      :{WHITE}Tren en el camí
+STR_ERROR_ROAD_VEHICLE_IN_THE_WAY                               :{WHITE}Automòbil en camí
+STR_ERROR_SHIP_IN_THE_WAY                                       :{WHITE}Vaixell en el camí
+STR_ERROR_AIRCRAFT_IN_THE_WAY                                   :{WHITE}Avió al camí
+
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}No es pot remodelar el tren...
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}No es pot remodelar el vehicle de carretera...
+STR_ERROR_CAN_T_REFIT_SHIP                                      :{WHITE}No es pot remodelar el vaixell...
+STR_ERROR_CAN_T_REFIT_AIRCRAFT                                  :{WHITE}No es pot remodelar l'avió...
+
+STR_ERROR_CAN_T_RENAME_TRAIN                                    :{WHITE}No es pot anomenar el tren...
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}No es pot anomenar l'automòbil...
+STR_ERROR_CAN_T_RENAME_SHIP                                     :{WHITE}No es pot anomenar el vaixell...
+STR_ERROR_CAN_T_RENAME_AIRCRAFT                                 :{WHITE}No es pot anomenar l'avió...
+
+STR_ERROR_CAN_T_STOP_START_TRAIN                                :{WHITE}No es pot parar/arrencar el tren...
+STR_ERROR_CAN_T_STOP_START_ROAD_VEHICLE                         :{WHITE}No es pot parar/arrencar l'automòbil...
+STR_ERROR_CAN_T_STOP_START_SHIP                                 :{WHITE}No es pot parar/arrencar el vaixell...
+STR_ERROR_CAN_T_STOP_START_AIRCRAFT                             :{WHITE}No es pot parar/arrencar l'avió...
+
+STR_ERROR_CAN_T_SEND_TRAIN_TO_DEPOT                             :{WHITE}No pots enviar el tren a cotxeres...
+STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}No es pot enviar el vehicle a cotxera...
+STR_ERROR_CAN_T_SEND_SHIP_TO_DEPOT                              :{WHITE}No es pot enviar vaixell a la drassana...
+STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR                         :{WHITE}No es pot enviar l'avió a l'hangar...
+
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}No es pot construir el vehicle...
+STR_ERROR_CAN_T_BUILD_ROAD_VEHICLE                              :{WHITE}No es pot construir l'automòbil...
+STR_ERROR_CAN_T_BUILD_SHIP                                      :{WHITE}No es pot construir el vaixell...
+STR_ERROR_CAN_T_BUILD_AIRCRAFT                                  :{WHITE}No es pot construir l'avió...
+
+STR_ERROR_CAN_T_RENAME_TRAIN_TYPE                               :{WHITE}No es pot reanomenar el tipus d'element del tren...
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}No es pot reanomenar tipus d'automòbil
+STR_ERROR_CAN_T_RENAME_SHIP_TYPE                                :{WHITE}No es pot reanomenar el tipus de vaixell...
+STR_ERROR_CAN_T_RENAME_AIRCRAFT_TYPE                            :{WHITE}No es pot reanomenar el tipus d'avió...
+
+STR_ERROR_CAN_T_SELL_TRAIN                                      :{WHITE}No es pot vendre el vehicle...
+STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}No pots vendre l'automòbil...
+STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}No es pot vendre el vaixell...
+STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}No es pot vendre l'avió...
+
+STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP                 :{BLACK}Acció sobre el tren actual - clica aquí per parar/arrencar el tren
+STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP          :{BLACK}Acció sobre el vehicle actual - clica aquí per parar/arrencar el vehicle
+STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP                  :{BLACK}Accions sobre el vaixell actual - clica aquí per parar/arrencar el vaixell
+STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP              :{BLACK}Accions sobre l'avió actual - clica aquí per parar/arrencar l'avió
+
+STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP                           :{BLACK}Mostra les ordres del tren
+STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP                    :{BLACK}Mostra les ordres dels vehicles
+STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Mostra les ordres del vaixell
+STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Mostra les ordres de l'avió
+
+STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP                         :{BLACK}Centra la vista de la pantalla principal a la situació del tren
+STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP                  :{BLACK}Centra la pantalla principal a la situació del vehicle
+STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP                          :{BLACK}Centra la pantalla principal en la situació del vaixell
+STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP                      :{BLACK}Centra la pantalla principal a la situació de l'avió
+
+STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP                    :{BLACK}Envia el tren a cotxera
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}Envia el vehicle a cotxera
+STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}Envia el vaixell a la drassana. CTRL+Clic per només revisió
+STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}Envia avió a l'hangar
+
+STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Mostra els detalls del tren
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Mostra els detalls del vehicle
+STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Mostra els detalls del vaixell
+STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Mostra els detalls de l'avió
+
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Remodela un tren per transportar un altre tipus de càrrega
+STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Remodela vehicle de carretera per dur un tipus diferent de càrrega
+STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}Remodela vaixell mercant per portar un tipus diferent de càrrega
+STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Remodela avions per poder transportar diferents tipus de càrrega
+
+STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Cap a cotxeres de {TOWN}.
+STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Cap a cotxeres de {TOWN}, a {VELOCITY}
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Cap a la cotxera de {TOWN}.
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Cap a la cotxera de {TOWN}, a {VELOCITY}
+STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Cap a la drassana de {TOWN}.
+STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Cap a la drassana de{TOWN}, a {VELOCITY}
+STR_HEADING_FOR_HANGAR                                          :{ORANGE}Cap a l'hangar de {STATION}.
+STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Cap a l'hangar de {STATION}, a {VELOCITY}
+
+STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Revisió a la cotxera de {TOWN}
+STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Revisió a la cotxera de {TOWN}, {VELOCITY}
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Revisió a la cotxera de {TOWN}
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Revisió a la cotxera de {TOWN}, {VELOCITY}
+STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Revisió a la drassana de {TOWN}
+STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Revisió a la drassana de {TOWN}, {VELOCITY}
+STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Revisió a l'hangar de {STATION}
+STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Revisió a l'hangar de {STATION}, {VELOCITY}
+
+
+STR_CLONE_TRAIN                                                 :{BLACK}Clona Tren
+STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Clona Vehicle
+STR_CLONE_SHIP                                                  :{BLACK}Clona Vaixell
+STR_CLONE_AIRCRAFT                                              :{BLACK}Clona Avió
+
+STR_CLONE_TRAIN_INFO                                            :{BLACK}Fa una còpia del tren inclosos tots els vagons. Control+Clic compartirà les ordres
+STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Fa una còpia del vehicle. Control+Clic compartirà les ordres
+STR_CLONE_SHIP_INFO                                             :{BLACK}Fa una còpia del vaixell. Control+Clic compartirà les ordres
+STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Fa una còpia de l'avió. Control+Clic compartirà les ordres
+
+STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Fa una còpia del tren inclosos tots els vagons. Prem aquest botó i després en un tren dins o fora cotxeres. Control+Clic compartirà les ordres
+STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Fa una còpia del vehicle. Prem aquest botó i després en un vehicle dins o fora cotxeres. Control+Clic compartirà les ordres
+STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Fa una còpia del vaixell. Prem aquest botó i després en un vaixell dins o fora les drassanes. Control+Clic compartirà les ordres
+STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Fa una còpia de l'avió. Prem aquest botó i després en un avió dins o fora l'hangar. Control+Clic compartirà les ordres
+
+STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}Nous Trens
+STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}Nous Trens de Via Electrificada
+STR_BUILD_VEHICLE_TRAIN_MONORAIL_CAPTION                        :{WHITE}Nous Trens Monorail
+STR_BUILD_VEHICLE_TRAIN_MAGLEV_CAPTION                          :{WHITE}Nous Trens Maglev
+
+STR_BUILD_VEHICLE_TRAIN_ALL_CAPTION                             :{WHITE}Vehicles amb Vies
+STR_BUILD_VEHICLE_ROAD_VEHICLE_CAPTION                          :{WHITE}Nous Vehicles
+STR_BUILD_VEHICLE_SHIP_CAPTION                                  :{WHITE}Nous Vaixells
+STR_BUILD_VEHICLE_AIRCRAFT_CAPTION                              :{WHITE}Nou Avió
+
+STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_BUTTON                    :{BLACK}Construeix Vehicle
+STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_BUTTON             :{BLACK}Construeix Vehicle
+STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON                     :{BLACK}Construeix Vaixell
+STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON                 :{BLACK}Construeix Avió
+
+STR_BUILD_VEHICLE_TRAIN_LIST_TOOLTIP                            :{BLACK}Llista de selecció d'elements de tren - clica a l'element per més informació
+STR_BUILD_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP                     :{BLACK}Llista de selecció de Vehicles - clica en un vehicle per més informació
+STR_BUILD_VEHICLE_SHIP_LIST_TOOLTIP                             :{BLACK}Llista de selecció de Vaixells - clica en un vaixell per més informació
+STR_BUILD_VEHICLE_AIRCRAFT_LIST_TOOLTIP                         :{BLACK}Llista de selecció d'Avions - clica sobre l'avió per més informació
+
+STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_TOOLTIP                   :{BLACK}Construeix l'element de tren seleccionat
+STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_TOOLTIP            :{BLACK}Construeix l'automòbil seleccionat
+STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP                    :{BLACK}Construeix el vaixell seleccionat
+STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_TOOLTIP                :{BLACK}Construeix l'avió seleccionat
+
+STR_BUILD_VEHICLE_TRAIN_RENAME_BUTTON                           :{BLACK}Reanomena
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Reanomena
+STR_BUILD_VEHICLE_SHIP_RENAME_BUTTON                            :{BLACK}Reanomena
+STR_BUILD_VEHICLE_AIRCRAFT_RENAME_BUTTON                        :{BLACK}Reanomena
+
+STR_BUILD_VEHICLE_TRAIN_RENAME_TOOLTIP                          :{BLACK}Reanomena el tipus d'element del tren
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Reanomena tipus d'automòbil
+STR_BUILD_VEHICLE_SHIP_RENAME_TOOLTIP                           :{BLACK}Reanomena tipus de vaixell
+STR_BUILD_VEHICLE_AIRCRAFT_RENAME_TOOLTIP                       :{BLACK}Reanomena tipus d'avió
+
+STR_QUERY_RENAME_TRAIN_TYPE_CAPTION                             :{WHITE}Reanomena el tipus d'element del tren
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Reanomena tipus d'automòbil
+STR_QUERY_RENAME_SHIP_TYPE_CAPTION                              :{WHITE}Reanomena tipus de vaixell
+STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION                          :{WHITE}Reanomena tipus d'avió
+
+STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Nous Vehicles
+STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_BUTTON                      :{BLACK}Nous Vehicles
+STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON                              :{BLACK}Nous Vaixells
+STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON                          :{BLACK}Nou Avió
+
+STR_DEPOT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Trens - clica al tren per info., arrossega el vehicle per afegir/treure del tren
+STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Vehicles - clica en un vehicle per més informació
+STR_DEPOT_SHIP_LIST_TOOLTIP                                     :{BLACK}Vaixells - clica en un vaixell per més informació
+STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Avió - clica sobre l'avió per més informació
+
+STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP                            :{BLACK}Construeix un nou element de tren
+STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}Construeix un nou automòbil
+STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}Construeix un nou vaixell
+STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}Construeix nous avions
+
+STR_DEPOT_TRAIN_SELL_TOOLTIP                                    :{BLACK}Arrossega l'element de tren fins aquí per vendre'l
+STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}Arrossega el vehicle fins aquí per vendre'l
+STR_DEPOT_SHIP_SELL_TOOLTIP                                     :{BLACK}Arrossega el vaixell fins aquí per vendre'l
+STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}Arrossega l'avió fins aquí per vendre'l
+
+STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}Centra la vista de la pantalla principal en la situació de la cotxera
+STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}Centra la pantalla principal en la situació de la cotxera
+STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}Centra la pantalla principal en la situació de la drassana
+STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Centra la pantalla principal en la situació de l'hangar
+
+
 ### depot strings
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}Estàs a punt de vendre tots els vehicles de la cotxera. N'estàs segur?
 STR_DEPOT_WRONG_DEPOT_TYPE                                      :Tipus de cotxera incorrecta
@@ -3212,6 +3229,7 @@ STR_REPLACE_REMOVE_WAGON                                        :{BLACK}Treure v
 STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Fer que la substitució automàtica mantingui la llargària del tren eliminant vagons (començant pel front), si substituint la màquina el tren es fa més llarg
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}Substituint: {ORANGE}{SKIP}{SKIP}{STRING}
 STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}Alterna entre finestres de substitució de vagons i de motors
+
 STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}El tren no està disponible
 STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}El vehicle no està disponible
 STR_SHIP_NOT_AVAILABLE                                          :{WHITE}El vaixell no està disponible
@@ -3426,7 +3444,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}
@@ -3444,6 +3465,31 @@ STR_FORMAT_COMPANY_NUM                                          :(Companyia {COM
 STR_FORMAT_GROUP_NAME                                           :Grup {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}El nom ha de ser únic
 
 #### Improved sign GUI
diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt
index 41b3ddc32..b86b529b1 100644
--- a/src/lang/croatian.txt
+++ b/src/lang/croatian.txt
@@ -219,8 +219,6 @@ STR_ABBREV_PLASTIC                                              :{TINYFONT}PL
 STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}GP
 STR_ABBREV_NONE                                                 :{TINYFONT}NI
 STR_ABBREV_ALL                                                  :{TINYFONT}SVE
-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
@@ -232,17 +230,11 @@ STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Izvorno
 STR_ABOUT_VERSION                                               :{BLACK}OpenTTD verzija {REV}
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 OpenTTD tim
 
-STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
-STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_QUIT_CAPTION                                                :{WHITE}Prekid
 STR_YES                                                         :{BLACK}Da
 STR_NO                                                          :{BLACK}Ne
 STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Jesi li siguran da želiš napustiti OpenTTD i vratiti se u {STRING}e?
-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                                                :Ništa
 STR_COLOUR_DARK_BLUE                                            :Tamnoplava
 STR_COLOUR_PALE_GREEN                                           :Blijedozelena
@@ -261,8 +253,6 @@ STR_COLOUR_BROWN                                                :Smeđa
 STR_COLOUR_GREY                                                 :Siva
 STR_COLOUR_WHITE                                                :Bijela
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}Previše vozila u igri
-STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
-STR_RED_COMMA                                                   :{RED}{COMMA}
 STR_BUTTON_LOCATION                                             :{BLACK}Lokacija
 STR_SMALLMAP_TYPE_CONTOURS                                      :Obrisi
 STR_SMALLMAP_TYPE_VEHICLES                                      :Vozila
@@ -387,12 +377,13 @@ STR_SORT_ORDER_TIP                                              :{BLACK}Izaberi
 STR_SORT_CRITERIA_TIP                                           :{BLACK}Izaberi kriterij za sortiranje
 STR_SORT_BY                                                     :{BLACK}Sortiraj prema
 
+### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}Stanovništvo
+STR_SORT_BY_NAME                                                :{BLACK}Ime
+STR_SORT_BY_DATE                                                :{BLACK}Datum
 STR_SORT_BY_PRODUCTION                                          :Proizvodnja
 STR_SORT_BY_TYPE                                                :Vrsta
 STR_SORT_BY_TRANSPORTED                                         :Prevezeno
-STR_SORT_BY_NAME                                                :{BLACK}Ime
-STR_SORT_BY_DATE                                                :{BLACK}Datum
 STR_SORT_BY_NUMBER                                              :Broj
 STR_SORT_BY_PROFIT_LAST_YEAR                                    :Dobit prošle godine
 STR_SORT_BY_PROFIT_THIS_YEAR                                    :Dobit ove godine
@@ -413,37 +404,25 @@ STR_SORT_BY_INTRO_DATE                                          :Datum početka
 STR_SORT_BY_RUNNING_COST                                        :Trošak uporabe
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :Snaga/trošak uporabe
 STR_SORT_BY_CARGO_CAPACITY                                      :Nosivost tereta
+
 STR_NO_WAITING_CARGO                                            :{BLACK}Nijedna vrsta tereta ne čeka
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}Odaberi sva sredstva
 STR_SELECT_ALL_TYPES                                            :{BLACK}Odaberi sve vrste tereta (uključujući i teret koji ne čeka)
-STR_AVAILABLE_TRAINS                                            :{BLACK}Dostupni vlakovi
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Dostupna vozila
-STR_AVAILABLE_SHIPS                                             :{BLACK}Dostupni brodovi
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Dostupni zrakoplovi
 STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Pogledaj popis dostupnih dizajna motora za ovu vrstu vozila.
 STR_MANAGE_LIST                                                 :{BLACK}Uredi popis
 STR_MANAGE_LIST_TIP                                             :{BLACK}Pošalji upute svim vozilima na ovom popisu
 STR_REPLACE_VEHICLES                                            :Zamjeni vozila
+STR_SEND_FOR_SERVICING                                          :Pošalji na servis
+
+STR_AVAILABLE_TRAINS                                            :{BLACK}Dostupni vlakovi
+STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Dostupna vozila
+STR_AVAILABLE_SHIPS                                             :{BLACK}Dostupni brodovi
+STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Dostupni zrakoplovi
+
 STR_SEND_TRAIN_TO_DEPOT                                         :Pošalji u spremište
 STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Pošalji u spremište
 STR_SEND_SHIP_TO_DEPOT                                          :Pošalji u spremište
 STR_SEND_AIRCRAFT_TO_HANGAR                                     :Pošalji u hangar
-STR_SEND_FOR_SERVICING                                          :Pošalji na servis
-
-############ range for months starts
-STR_MONTH_ABBREV_JAN                                            :Sij
-STR_MONTH_ABBREV_FEB                                            :Velj
-STR_MONTH_ABBREV_MAR                                            :Ožu
-STR_MONTH_ABBREV_APR                                            :Tra
-STR_MONTH_ABBREV_MAY                                            :Svi
-STR_MONTH_ABBREV_JUN                                            :Lip
-STR_MONTH_ABBREV_JUL                                            :Srp
-STR_MONTH_ABBREV_AUG                                            :Kol
-STR_MONTH_ABBREV_SEP                                            :Ruj
-STR_MONTH_ABBREV_OCT                                            :Lis
-STR_MONTH_ABBREV_NOV                                            :Stu
-STR_MONTH_ABBREV_DEC                                            :Pro
-############ range for months ends
 
 STR_GRAPH_X_LABEL_MONTH                                         :{TINYFONT}{STRING}{} {STRING}
 STR_GRAPH_X_LABEL_MONTH_YEAR                                    :{TINYFONT}{STRING}{} {STRING}{}{NUM}
@@ -471,8 +450,6 @@ 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_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
@@ -519,7 +496,7 @@ STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Nijedan/Nitko/N
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Ime
 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                                          :1.
 STR_ORDINAL_NUMBER_2ND                                          :2.
 STR_ORDINAL_NUMBER_3RD                                          :3.
@@ -553,6 +530,34 @@ STR_ORDINAL_NUMBER_30TH                                         :30.
 STR_ORDINAL_NUMBER_31ST                                         :31.
 ############ range for days ends
 
+############ range for months starts
+STR_MONTH_ABBREV_JAN                                            :Sij
+STR_MONTH_ABBREV_FEB                                            :Velj
+STR_MONTH_ABBREV_MAR                                            :Ožu
+STR_MONTH_ABBREV_APR                                            :Tra
+STR_MONTH_ABBREV_MAY                                            :Svi
+STR_MONTH_ABBREV_JUN                                            :Lip
+STR_MONTH_ABBREV_JUL                                            :Srp
+STR_MONTH_ABBREV_AUG                                            :Kol
+STR_MONTH_ABBREV_SEP                                            :Ruj
+STR_MONTH_ABBREV_OCT                                            :Lis
+STR_MONTH_ABBREV_NOV                                            :Stu
+STR_MONTH_ABBREV_DEC                                            :Pro
+
+STR_MONTH_JAN                                                   :Siječanj
+STR_MONTH_FEB                                                   :Veljača
+STR_MONTH_MAR                                                   :Ožujak
+STR_MONTH_APR                                                   :Travanj
+STR_MONTH_MAY                                                   :Svibanj
+STR_MONTH_JUN                                                   :Lipanj
+STR_MONTH_JUL                                                   :Srpanj
+STR_MONTH_AUG                                                   :Kolovoz
+STR_MONTH_SEP                                                   :Rujan
+STR_MONTH_OCT                                                   :Listopad
+STR_MONTH_NOV                                                   :Studeni
+STR_MONTH_DEC                                                   :Prosinac
+############ range for months ends
+
 STR_GRAPH_Y_LABEL_NUMBER                                        :{TINYFONT}{COMMA}
 
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}Prihvaćeni teret: {LTBLUE}
@@ -642,12 +647,9 @@ 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_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_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
@@ -729,9 +731,7 @@ STR_OFF                                                         :Isključeno
 STR_SUMMARY                                                     :Sažetak
 STR_FULL                                                        :Puno
 STR_STATUSBAR_COMPANY_NAME                                      :{SILVER}- -  {COMPANY}  - -
-STR_BLACK_STRING                                                :{BLACK}{STRING}
 
-STR_JUST_CHECKMARK                                              :{CHECKMARK}
 ############ range for menu starts
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Postavke igre
 STR_SETTINGS_MENU_DIFFICULTY_SETTINGS                           :Postavke težine
@@ -823,9 +823,6 @@ STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY                             :Financiraj novu
 ############ range ends here
 
 STR_FUND_INDUSTRY_CAPTION                                       :{WHITE}Financiraj novu industriju
-STR_JUST_STRING                                                 :{STRING}
-STR_JUST_RAW_STRING                                             :{STRING}
-STR_JUST_INT                                                    :{NUM}
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_RAINFOREST                       :{WHITE}...može biti izgrađen samo u predjelima kišnih šuma
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT                           :{WHITE}...može biti izgrađen samo u pustinjskim područjima
 STR_STATUSBAR_PAUSED                                            :{YELLOW}* *  STANKA  *  *
@@ -839,9 +836,6 @@ 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_BLACK_6                                                     :{BLACK}6
-STR_BLACK_7                                                     :{BLACK}7
-
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Engleski (original)
 STR_TOWNNAME_FRENCH                                             :Francuski
@@ -919,19 +913,6 @@ STR_OPTIONS_BASE_GRF_TIP                                        :{BLACK}Odaberi
 
 STR_AUTOSAVE_FAILED                                             :{WHITE}Automatsko spremanje neuspješno
 
-STR_MONTH_JAN                                                   :Siječanj
-STR_MONTH_FEB                                                   :Veljača
-STR_MONTH_MAR                                                   :Ožujak
-STR_MONTH_APR                                                   :Travanj
-STR_MONTH_MAY                                                   :Svibanj
-STR_MONTH_JUN                                                   :Lipanj
-STR_MONTH_JUL                                                   :Srpanj
-STR_MONTH_AUG                                                   :Kolovoz
-STR_MONTH_SEP                                                   :Rujan
-STR_MONTH_OCT                                                   :Listopad
-STR_MONTH_NOV                                                   :Studeni
-STR_MONTH_DEC                                                   :Prosinac
-
 STR_HEADING_FOR_STATION                                         :{LTBLUE}Kreće se prema {STATION}
 STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}Kreće se prema {STATION}, {VELOCITY}
 STR_NO_ORDERS                                                   :{LTBLUE}Nema naredbi
@@ -947,8 +928,6 @@ STR_CRATES                                                      :sanduci
 STR_RES_OTHER                                                   :ostalo
 STR_NOTHING                                                     :
 
-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...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Kraj dijeljenih naredbi - -
@@ -1215,7 +1194,6 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Y veli�
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :onemogućeno
-STR_JUST_CURRENCY                                               :{CURRENCY}
 STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Promijeni vrijednost postavke
 
 STR_TEMPERATE_LANDSCAPE                                         :Blagi krajolik
@@ -1251,7 +1229,6 @@ STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}Odaberi
 
 STR_WAYPOINT_VIEWPORT                                           :{WHITE}{WAYPOINT}
 STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WHITE}{WAYPOINT}
-STR_WAYPOINT_NAME                                               :{WAYPOINT}
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Promijeni ime čvorišta
 
 STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}Nije moguće promijeniti ime čvorišta...
@@ -1318,11 +1295,6 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Imena in
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...preblizu drugoj industriji
 
-STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Prenamijeni vlak  za prijevoz neke druge vrste tereta
-STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Prenamijeni vlak
-STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Odaberi vrstu tereta koju će vlak prevoziti
-STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Prenamijeni vlak za prijevoz označene vrste tereta
-STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Nije moguće prenamijeniti vlak...
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Promijeni proizvodnju
 
 ############ network gui strings
@@ -1832,11 +1804,6 @@ STR_TOWN_BUILDING_NAME_TEPEES_1                                 :Indijanski šat
 STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1                           :Čajnik za stanovanje
 STR_TOWN_BUILDING_NAME_PIGGY_BANK_1                             :Kasica-Prasica
 
-STR_INDUSTRY_NAME                                               :{INDUSTRY}
-STR_TOWN_NAME                                                   :{TOWN}
-STR_FORMAT_INDUSTRY_NAME                                        :{TOWN} {STRING}
-STR_STATION_NAME                                                :{STATION}
-
 ##id 0x2800
 STR_LANDSCAPING_MENU_LANDSCAPING                                :Uređivanje krajolika
 STR_LANDSCAPING_MENU_PLANT_TREES                                :Posadi drveće
@@ -1891,6 +1858,12 @@ STR_CARGO_RATING_EXCELLENT                                      :Izvrsno
 STR_CARGO_RATING_OUTSTANDING                                    :Izvanredno
 ############ range for rating ends
 
+### station view strings
+STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Pokaži sve vlakove koji imaju ovu postaju u svom rasporedu
+STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Prikaži sva cestovna vozila koja imaju ovu postaju u svom rasporedu
+STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Prikaži sve zrakoplove koji imaju ovu postaju u svom rasporedu
+STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Prikaži sve brodove koji imaju ovu postaju u svom rasporedu
+
 STR_STATION_VIEW_CARGO_RATING                                   :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO                        :{WHITE}{STATION} više ne prihvaća {STRING.aku}
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO               :{WHITE}{STATION} više ne prihvaća {STRING.aku} ili {STRING.aku}
@@ -2134,6 +2107,7 @@ STR_SV_STNAME_AIRPORT                                           :Zračna luka {S
 STR_SV_STNAME_OILFIELD                                          :Naftno polje {STRING}
 STR_SV_STNAME_MINES                                             :Rudnici {STRING}
 STR_SV_STNAME_DOCKS                                             :Pristaništa {STRING}
+##id 0x6020
 STR_SV_STNAME_ANNEXE                                            :Aneks {STRING}
 STR_SV_STNAME_SIDINGS                                           :{STRING} Krak
 STR_SV_STNAME_BRANCH                                            :Ogranak {STRING}
@@ -2181,8 +2155,6 @@ STR_NUM_LOW                                                     :Nisko
 STR_NUM_NORMAL                                                  :Normalno
 STR_NUM_HIGH                                                    :Visoko
 STR_NUM_CUSTOM                                                  :Proizvoljno
-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
@@ -2216,7 +2188,6 @@ STR_CITY_APPROVAL_HOSTILE                                       :Agresivan
 
 ##id 0x7000
 STR_COMPANY_VIEW_CAPTION                                        :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
-STR_FORMAT_COMPANY_NUM                                          :(Tvrtka {COMMA})
 STR_COMPANY_VIEW_NEW_FACE_BUTTON                                :{BLACK}Novo lice
 STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON                           :{BLACK}Boja
 STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}Boja:
@@ -2249,7 +2220,6 @@ STR_FINANCES_TOTAL_CAPTION                                      :{WHITE}Ukupno:
 STR_COMPANY_NAME_COMPANY_NUM                                    :{COMPANY} {COMPANYNUM}
 STR_GRAPH_INCOME_CAPTION                                        :{WHITE}Grafikon prihoda
 STR_CURRCOMPACT                                                 :{CURRCOMPACT}
-STR_JUST_COMMA                                                  :{COMMA}
 STR_GRAPH_OPERATING_PROFIT_CAPTION                              :{WHITE}Grafikon operativne dobiti
 STR_FINANCES_BANK_BALANCE_TITLE                                 :{WHITE}Bankovna bilanca
 STR_FINANCES_LOAN_TITLE                                         :{WHITE}Zajam
@@ -2651,10 +2621,8 @@ STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE                          :jednotračna ž
 STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE                            :maglev lokomotiva
 
 ##id 0x8800
-STR_DEPOT_TRAIN_CAPTION                                         :{WHITE}Spremište vlakova grada {TOWN}a
 STR_NEWS_FIRST_TRAIN_ARRIVAL                                    :{BLACK}{BIGFONT}Građani slave . . .{}Prvi vlak je stigao na postaju {STATION}!
 STR_VEHICLE_DETAILS_CAPTION                                     :{WHITE}{VEHICLE} (Detalji)
-STR_ERROR_TRAIN_IN_THE_WAY                                      :{WHITE}Vlak na putu
 STR_ORDER                                                       :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 STR_ORDER_SELECTED                                              :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 STR_ORDER_NON_STOP                                              :{BLACK}Neprestano
@@ -2741,38 +2709,16 @@ STR_TIMETABLE_AND_TRAVEL_FOR                                    :i putovanja za
 STR_TIMETABLE_DAYS                                              :{COMMA} dan{P "" a a}
 STR_TIMETABLE_TICKS                                             :{COMMA} tik{P "" a ova}
 
-STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Kreće se prema spremištu vlakova grada {TOWN}a
-STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Kreće se prema spremištu vlakova grada {TOWN}a, {VELOCITY}
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Servisiranje u spremištu vlakova grada {TOWN}a
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Servisiranje u spremištu vlakova grada {TOWN}a, {VELOCITY}
-
 STR_INVALID_ORDER                                               :{RED} (Neispravna naredba)
 
 STR_UNKNOWN_STATION                                             :nepoznata postaja
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}Prazan
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} iz {STATION}
 STR_VEHICLE_DETAILS_CARGO_FROM_MULT                             :{LTBLUE}{CARGO} iz {STATION} (x{NUM})
-STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} čeka u željezničkom hangaru
-STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Nova vozila
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}Predugačak vlak
 STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}Vlakovi mogu biti izmjenjeni jedino kad su zaustavljeni u spremištu
-STR_VEHICLE_LIST_TRAIN_CAPTION                                  :{WHITE}{STRING} - {COMMA} vlak{P "" a ova}
 
-STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}Nova željeznička vozila
-STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}Nova električna pružna vozila
-STR_BUILD_VEHICLE_TRAIN_MONORAIL_CAPTION                        :{WHITE}Nova jednotračna željeznička vozila
-STR_BUILD_VEHICLE_TRAIN_MAGLEV_CAPTION                          :{WHITE}Nova maglev vozila
-STR_BUILD_VEHICLE_TRAIN_ALL_CAPTION                             :{WHITE}Pružna vozila
-
-STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_BUTTON                    :{BLACK}Izgradi vozilo
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Kloniraj vozilo
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Ovo će izgraditi kopiju cestovnog vozila. Control-clik će dijeliti naredbe
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Ovo će napraviti kopiju cestovnog vozila. Klikni na ovaj gumb i onda na cestovno vozilo unutar ili izvan spremišta. CTRL+klik će dijeliti naredbe
-STR_CLONE_TRAIN                                                 :{BLACK}Kloniraj vlak
-STR_CLONE_TRAIN_INFO                                            :{BLACK}Ovo će izgraditi kopiju vlaka uključujući sve vagone. Control-klik će dijeliti naredbe
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Ovo će napraviti kopiju vlaka uključujući sve vagone. Kliknite na ovaj gumb i onda na vlak unutar ili izvan spremišta. CTRL-klik će dijeliti naredbe
-STR_BUILD_VEHICLE_TRAIN_RENAME_BUTTON                           :{BLACK}Preimenuj
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Preskoči
 STR_ORDERS_DELETE_BUTTON                                        :{BLACK}Obriši
 STR_ORDERS_GO_TO_BUTTON                                         :{BLACK}Idi do
@@ -2788,14 +2734,12 @@ STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Prebaci
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Naredbe)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Kraj naredbi - -
 STR_SERVICE                                                     :{BLACK}Servis
-STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Nije moguće izgraditi željezničko vozilo...
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Izgrađen: {LTBLUE}{NUM}{BLACK} Vrijednost: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Vrijednost: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
 STR_VEHICLE_STATUS_LOADING_UNLOADING                            :{LTBLUE}Utovar / Istovar
 STR_VEHICLE_STATUS_LEAVING                                      :{LTBLUE}Odlazeći
 STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}Vlak mora biti zaustavljen unutar spremišta
-STR_ERROR_CAN_T_SEND_TRAIN_TO_DEPOT                             :{WHITE}Nije moguće poslati vlak u spremište...
 STR_ERROR_NO_MORE_SPACE_FOR_ORDERS                              :{WHITE}Nema mjesta za nove naredbe
 STR_ERROR_TOO_MANY_ORDERS                                       :{WHITE}Previše naredbi
 STR_ERROR_CAN_T_INSERT_NEW_ORDER                                :{WHITE}Nije moguće ubaciti novu naredbu...
@@ -2810,26 +2754,11 @@ STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE}vozilo k
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}Nije moguće ukloniti vozilo...
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}Stražnja lokomotiva će uvijek pratiti svog prednjeg dvojnika
 STR_CARGO_N_A                                                   :N/A{SKIP}
-STR_ERROR_CAN_T_SELL_TRAIN                                      :{WHITE}Nije moguće prodati željezničko vozilo
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}Ne može pronaći put do lokalnog spremišta
-STR_ERROR_CAN_T_STOP_START_TRAIN                                :{WHITE}Nije moguće zaustaviti/pokrenuti vlak...
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}Servisni interval: {LTBLUE}{COMMA}dana{BLACK}   Zadnji servis: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}Servisni interval: {LTBLUE}{COMMA}%{BLACK} Zadnji servis: {LTBLUE}{DATE_LONG}
-STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP                             :{BLACK}Vlakovi - klikni na vlak za informacije
-STR_DEPOT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Vlakovi - klikni na vlak za informacije, vuci vozilo kako bi dodao/oduzeo od vlaka
-STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP                            :{BLACK}Kupi novo željezničko vozilo
-STR_DEPOT_TRAIN_SELL_TOOLTIP                                    :{BLACK}Ovdje povuci vlak kako bi ga prodao
-STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}Centriraj glavni pogled na lokaciju spremišta vlakova
-STR_BUILD_VEHICLE_TRAIN_LIST_TOOLTIP                            :{BLACK}Popis izabranih vlakova - klikni na vlak za informacije
-STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_TOOLTIP                   :{BLACK}Izgradi označeni vlak
-STR_BUILD_VEHICLE_TRAIN_RENAME_TOOLTIP                          :{BLACK}Preimenuj vrstu vagona
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP                 :{BLACK}Trenutna radnja vlaka - klikni ovdje kako bi zaustavio/pokrenuo vlak
-STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP                           :{BLACK}Pokaži naredbe vlaka
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP                         :{BLACK}Centriraj glavni pogled na lokaciju vlaka
-STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP                    :{BLACK}Pošalji vlak u spremište. CTRL+klik će samo servisirati
 STR_VEHICLE_VIEW_TRAIN_IGNORE_SIGNAL_TOOLTIP                    :{BLACK}Natjeraj vlak da nastavi bez čekanja signala odobrenja
 STR_VEHICLE_VIEW_TRAIN_REVERSE_TOOLTIP                          :{BLACK}Promijeni smjer vlaka
-STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Pokaži detalje vlaka
 STR_VEHICLE_DETAILS_INCREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Povećaj servisni interval
 STR_VEHICLE_DETAILS_DECREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Smanji servisni interval
 STR_VEHICLE_DETAILS_TRAIN_CARGO_TOOLTIP                         :{BLACK}Pokaži detalje tereta koji se prevozi
@@ -2850,13 +2779,9 @@ STR_VEHICLE_STATUS_STOPPED                                      :{RED}Zaustavlje
 STR_ERROR_CAN_T_MAKE_TRAIN_PASS_SIGNAL                          :{WHITE}Nije moguće natjerati vlak da ignorira signale dok traje opasnost...
 STR_VEHICLE_STATUS_CRASHED                                      :{RED}Slupan!
 
-STR_QUERY_RENAME_TRAIN_CAPTION                                  :{WHITE}Imenuj vlak
-STR_ERROR_CAN_T_RENAME_TRAIN                                    :{WHITE}Nije moguće imenovati vlak...
-STR_VEHICLE_DETAILS_TRAIN_RENAME                                :{BLACK}Imenuj vlak
 STR_NEWS_TRAIN_CRASH                                            :{BLACK}{BIGFONT}Vlak se sudario!{}{COMMA} poginu{P o la lih} u eksploziji nakon sudara
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Nije moguće promijeniti smjer vlaka...
-STR_QUERY_RENAME_TRAIN_TYPE_CAPTION                             :{WHITE}Preimenuj vrstu vagona
-STR_ERROR_CAN_T_RENAME_TRAIN_TYPE                               :{WHITE}Nije moguće preimenovati vrstu vagona...
+STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Ne mogu okreniti vozila koja se sastoje od više jedinica
 STR_CLEAR_TIME                                                  :{BLACK}Obriši vrijeme
 STR_RESET_LATENESS                                              :{BLACK}Poništi Brojač Kašnjenja
 STR_CHANGE_WAYPOINT_NAME                                        :{BLACK}Promijeni ime čvorišta
@@ -2888,178 +2813,53 @@ STR_TIMETABLE_AUTOFILL                                          :{BLACK}Automats
 STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Automatski popuni raspored s vrijednostima iz sljedećeg putovanja (CTRL-klik kako bi pokušali spremiti i vremena čekanja)
 
 ##id 0x9000
-STR_ERROR_ROAD_VEHICLE_IN_THE_WAY                               :{WHITE}Cestovno vozilo na putu
-STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING} - {COMMA} cestovn{P o a ih} vozil{P o a a}
-STR_DEPOT_ROAD_VEHICLE_CAPTION                                  :{WHITE}Spremište cestovnih vozila grada {TOWN}a
-STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_BUTTON                      :{BLACK}Nova vozila
-STR_BUILD_VEHICLE_ROAD_VEHICLE_CAPTION                          :{WHITE}Nova cestovna vozila
-STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_BUTTON             :{BLACK}Izgradi vozilo
-STR_ERROR_CAN_T_BUILD_ROAD_VEHICLE                              :{WHITE}Nije moguće izgraditi cestovno vozilo...
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}...mora biti zaustavljen unutar spremišta cestovnih vozila
-STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}Nije moguće prodati cestovno vozilo...
-STR_ERROR_CAN_T_STOP_START_ROAD_VEHICLE                         :{WHITE}Nije moguće zaustaviti/pokrenuti cestovno vozilo...
-STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} čeka u radioni
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Kreće se prema cestovnom spremištu grada {TOWN}a
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Kreće se prema cestovnom spremištu grada {TOWN}a, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Servisiranje u cestovnom spremištu grada {TOWN}a
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Servisiranje u cestovnom spremištu grada {TOWN}a, {VELOCITY}
-STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Nije moguće poslati vozilo u spremište...
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Ne mogu pronaći lokalno spremište
-STR_VEHICLE_LIST_ROAD_VEHICLE_TOOLTIP                           :{BLACK}Cestovna vozila - klikni na vozilo za informacije
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP          :{BLACK}Trenutna radnja vozila - klikni ovdje kako bi zaustavio/pokrenuo vozilo
-STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP                    :{BLACK}Pokaži naredbe vozila
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP                  :{BLACK}Centriraj glavni pogled na lokaciju vozila
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}Pošalji vozilo u spremište. CTRL+klik će samo servisirati
 STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP                   :{BLACK}Natjeraj vozila da se okrene natrag
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Pokaži detalje cestovnog vozila
-STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Vozila - klikni na vozilo za informaciju
-STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}Izgradi novo cestovno vozilo
-STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}Povuci cestovno vozilo ovdje kako bi ga prodao
-STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}Centriraj glavni pogled na lokaciju spremišta cestovnih vozila
-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_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})
 
-STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Imenuj cestovno vozilo
-STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Nije moguće imenovati cestovno vozilo...
-STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Imenuj cestovno vozilo
 STR_NEWS_FIRST_BUS_ARRIVAL                                      :{BLACK}{BIGFONT}Građani slave . . .{}Prvi autobus je stigao na postaju {STATION}!
 STR_NEWS_FIRST_TRUCK_ARRIVAL                                    :{BLACK}{BIGFONT}Građani slave . . .{}Prvi kamion je stigao na postaju {STATION}!
 STR_NEWS_FIRST_PASSENGER_TRAM_ARRIVAL                           :{BLACK}{BIGFONT}Građani slave . . .{}Prvi putnički tramvaj je stigao na postaju {STATION}!
 STR_NEWS_FIRST_CARGO_TRAM_ARRIVAL                               :{BLACK}{BIGFONT}Građani slave . . .{}Prvi teretni tramvaj je stigao na postaju {STATION}!
 STR_NEWS_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Sudar cestovnog vozila!{}Vozač poginuo u eksploziji nakon sudara s vlakom
 STR_NEWS_ROAD_VEHICLE_CRASH                                     :{BLACK}{BIGFONT}Sudar cestovnog vozila!{}{COMMA} poginulih u eksploziji nakon sudara s vlakom
-STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Ne mogu okreniti vozila koja se sastoje od više jedinica
-STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Preimenuj
-STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Preimenuj vrstu cestovnog vozila
-STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Preimenuj vrstu cestovnog vozila
-STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Nije moguće preimenovati vrstu cestovnog vozila...
 
-STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Prenamijeni cestovno vozilo  za prijevoz neke druge vrste tereta
-STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Prenamijeni cestovno vozilo
-STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Prenamijeni cestovno vozilo  za prijevoz označene vrste tereta
-STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Nije moguće prenamijeniti cestovno vozilo...
-STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Odaberi vrstu tereta koje će cestovno vozilo prevoziti
 
 ##id 0x9800
 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :Izgradnja plovnih kanala
 STR_WATERWAYS_TOOLBAR_CAPTION                                   :{WHITE}Izgradnja plovnih kanala
 STR_WATERWAYS_TOOLBAR_CAPTION_SE                                :{WHITE}Plovni kanali
 STR_ERROR_CAN_T_BUILD_DOCK_HERE                                 :{WHITE}Ovdje nije moguće izgraditi pristanište...
-STR_DEPOT_SHIP_CAPTION                                          :{WHITE} Spremište brodova grada {TOWN}a
-STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON                              :{BLACK}Novi brodovi
-STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - {COMMA} brod{P "" a ova}
-STR_BUILD_VEHICLE_SHIP_CAPTION                                  :{WHITE}Novi brodovi
-STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON                     :{BLACK}Izgradi brod
-STR_CLONE_SHIP                                                  :{BLACK}Kloniraj brod
-STR_CLONE_SHIP_INFO                                             :{BLACK}Ovo će izgradi kopiju broda. Control-klik će dijeliti naredbe
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Ovo će napraviti kopiju broda. Klikni na ovaj gumb i onda na brod unutar ili izvan spremišta. CTRL+klik će dijeliti naredbe
 STR_ERROR_SHIP_MUST_BE_STOPPED_IN_DEPOT                         :{WHITE}Brod mora biti zaustavljen u spremištu
-STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}Nije moguće prodati brod...
-STR_ERROR_CAN_T_BUILD_SHIP                                      :{WHITE}Nije moguće izgraditi brod...
-STR_ERROR_SHIP_IN_THE_WAY                                       :{WHITE}Smeta brod
-STR_ERROR_CAN_T_STOP_START_SHIP                                 :{WHITE}Nije moguće pokrenuti/zaustaviti brod...
-STR_ERROR_CAN_T_SEND_SHIP_TO_DEPOT                              :{WHITE}Nije moguće poslati brod u spremište...
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Kreće se prema spremištu brodova grada {TOWN}a
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Kreće se prema spremištu brodova grada {TOWN}a, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Servisiranje u spremištu brodova grada {TOWN}a
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Servisiranje u spremištu brodova grada {TOWN}a, {VELOCITY}
-STR_NEWS_SHIP_IS_WAITING                                        :{WHITE}{VEHICLE} čeka u brodogradilištu
 STR_WATERWAYS_TOOLBAR_BUILD_DOCK_TOOLTIP                        :{BLACK}Izgradi brodsko pristanište
 STR_WATERWAYS_TOOLBAR_BUILD_DEPOT_TOOLTIP                       :{BLACK}Izgradi spremište brodova (za izgradnju i servisiranje brodova)
-STR_DEPOT_SHIP_LIST_TOOLTIP                                     :{BLACK}Brodovi - klikni na brod za informacije
-STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}Izgradi novi brod
-STR_DEPOT_SHIP_SELL_TOOLTIP                                     :{BLACK}Povuci brod ovdje kako bi ga prodao
-STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}Centriraj glavni pogled na lokaciju spremišta brodova
-STR_VEHICLE_LIST_SHIP_TOOLTIP                                   :{BLACK}Brodovi - klikni na brod za informacije
-STR_BUILD_VEHICLE_SHIP_LIST_TOOLTIP                             :{BLACK}Popis izabranih brodova - klikni na brod za informacije
-STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP                    :{BLACK}Izgradi označeni brod
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP                  :{BLACK}Trenutna radnja broda - klikni ovdje kako bi zaustavio/pokrenuo brod
-STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Pokaži naredbe broda
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP                          :{BLACK}Centriraj glavni pogled na lokaciju broda
-STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}Pošalji brod u spremište. CTRL+klik će samo servisirati
-STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Pokaži detalje broda
-STR_VEHICLE_DETAILS_SHIP_RENAME                                 :{BLACK}Imenuj brod
 
-STR_QUERY_RENAME_SHIP_CAPTION                                   :{WHITE}Imenuj brod
-STR_ERROR_CAN_T_RENAME_SHIP                                     :{WHITE}Nije moguće imenovati brod...
 STR_NEWS_FIRST_SHIP_ARRIVAL                                     :{BLACK}{BIGFONT}Građani slave . . .{}Prvi brod je stigao na pristanište {STATION}!
 STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}Smjesti plutaču koja može biti korištena kao pokazatelj puta
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}Nije moguće staviti plutaču ovdje...
 STR_BUILD_AQUEDUCT                                              :{BLACK}Izgradi akvadukt
 STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}Ovdje nije moguće izgraditi akvadukt...
-STR_BUILD_VEHICLE_SHIP_RENAME_BUTTON                            :{BLACK}Preimenuj
-STR_BUILD_VEHICLE_SHIP_RENAME_TOOLTIP                           :{BLACK}Preimenuj vrstu broda
-STR_QUERY_RENAME_SHIP_TYPE_CAPTION                              :{WHITE}Preimenuj vrstu broda
-STR_ERROR_CAN_T_RENAME_SHIP_TYPE                                :{WHITE}Nije moguće preimenovati vrstu broda...
-STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}Prenamijeni teretni brod za prijevoz neke druge vrste tereta
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (Prenamijeni)
-STR_REFIT_SHIP_REFIT_BUTTON                                     :{BLACK}Prenamijeni brod
-STR_REFIT_SHIP_LIST_TOOLTIP                                     :{BLACK}Odaberi vrstu tereta za prijevoz brodom
-STR_REFIT_SHIP_REFIT_TOOLTIP                                    :{BLACK}Prenamijeni brod za prijevoz označene vrste tereta
 STR_REFIT_TITLE                                                 :{GOLD}Odaberi vrstu tereta za prijevoz:
 STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}Nova nosivost: {GOLD}{CARGO}{}{BLACK}Cijena prenamjene: {GOLD}{CURRENCY}
-STR_ERROR_CAN_T_REFIT_SHIP                                      :{WHITE}Nije moguće prenamijeniti brod...
 STR_REFITTABLE                                                  :(prenamjenjiv)
 
 ##id 0xA000
 STR_TOOLBAR_AIRCRAFT_CAPTION                                    :{WHITE}Zračne luke
 STR_ERROR_CAN_T_BUILD_AIRPORT_HERE                              :{WHITE}Ovdje nije moguće izgraditi zračnu luku...
-STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}{STATION} Zrakoplovni hangar
-STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON                          :{BLACK}Novi zrakoplov
-STR_CLONE_AIRCRAFT                                              :{BLACK}Kloniraj zrakoplov
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Ovo će izgraditi kopiju zrakoplova. Control-klik će dijeliti naredbe
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Ovo će napraviti kopiju zrakoplova. Klikni ovaj gumb i onda na zrakoplov unutar ili izvan hangara. Control+klik će dijeliti naredbe
-STR_BUILD_VEHICLE_AIRCRAFT_CAPTION                              :{WHITE}Novi zrakoplov
-STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON                 :{BLACK}Izgradi zrakoplov
-STR_ERROR_CAN_T_BUILD_AIRCRAFT                                  :{WHITE}Nije moguće izgraditi zrakoplov...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} zrakoplova
-STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR                         :{WHITE}Nije moguće poslati zrakoplov u hangar
-STR_HEADING_FOR_HANGAR                                          :{ORANGE}Putuje prema hangaru {STATION}
-STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Putuje prema hangaru {STATION}, {VELOCITY}
-STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Servisiranje u hangaru {STATION}
-STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Servisiranje u hangaru {STATION}, {VELOCITY}
-STR_NEWS_AIRCRAFT_IS_WAITING                                    :{WHITE}{VEHICLE} čeka u zrakoplovnom hangaru
-STR_ERROR_AIRCRAFT_IN_THE_WAY                                   :{WHITE}Smeta zrakoplov
-STR_ERROR_CAN_T_STOP_START_AIRCRAFT                             :{WHITE}Nije moguće zaustaviti/pokrenuti zrakoplov...
 STR_ERROR_AIRCRAFT_IS_IN_FLIGHT                                 :{WHITE}Zrakoplov je u letu
 STR_ERROR_AIRCRAFT_MUST_BE_STOPPED                              :{WHITE}Zrakoplov mora biti zaustavljen u hangaru
-STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}Nije moguće prodati zrakoplov...
 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION                          :Izgradnja zračne luke
 STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Izgradi zračnu luku
-STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP                               :{BLACK}Zrakoplov - klikni na zrakoplov za informacije
-STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Zrakoplov - klikni na zrakoplov za informacije
-STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}Izgradi novi zrakoplov
-STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}Povuci zrakoplov ovdje kako bi ga prodao
-STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Centriraj glavni pogled na lokaciju hangara
-STR_BUILD_VEHICLE_AIRCRAFT_LIST_TOOLTIP                         :{BLACK}Popis izabranih zrakoplova - klikni na zrakoplov za informacije
-STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_TOOLTIP                :{BLACK}Izgradi označeni zrakoplov
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP              :{BLACK}Trenutna radnja zrakoplova - klikni ovdje kako bi zaustavio/pokrenuo zrakoplov
-STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Pokaži naredbe zrakoplova
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP                      :{BLACK} Centrirajte glavni prozor na lokaciju zrakoplova
-STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}Pošalji zrakoplov u hangar. CTRL+klik će samo servisirati
-STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Pokaži detalje zrakoplova
 
-STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}Imenuj zrakoplov
-STR_ERROR_CAN_T_RENAME_AIRCRAFT                                 :{WHITE}Nije moguće imenovati zrakoplov...
-STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}Imenuj zrakoplov
 STR_NEWS_FIRST_AIRCRAFT_ARRIVAL                                 :{BLACK}{BIGFONT}Građani slave . . .{}Prvi zrakoplov je stigao u zračnu luku {STATION}!
 STR_NEWS_AIRCRAFT_CRASH                                         :{BLACK}{BIGFONT}Pad zrakoplova!{}{COMMA} poginulih u eksploziji na {STATION}
 STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Avionska nesreća{}Avion je ostao bez goriva, {COMMA} poginulo u nesreći
 STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
-STR_BUILD_VEHICLE_AIRCRAFT_RENAME_BUTTON                        :{BLACK}Preimenuj
-STR_BUILD_VEHICLE_AIRCRAFT_RENAME_TOOLTIP                       :{BLACK}Preimenuj vrstu zrakoplova
-STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION                          :{WHITE}Preimenuj vrstu zrakoplova
-STR_ERROR_CAN_T_RENAME_AIRCRAFT_TYPE                            :{WHITE}Nije moguće preimenovati vrstu zrakoplova...
-STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Prenamijeni zrakoplov za prijevoz neke druge vrste tereta
-STR_REFIT_AIRCRAFT_REFIT_BUTTON                                 :{BLACK}Prenamijeni zrakoplov
-STR_REFIT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Odaberi vrstu tereta koju će zrakoplov prevoziti
-STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}Prenamijeni zrakoplov za prijevoz označene vrste tereta
-STR_ERROR_CAN_T_REFIT_AIRCRAFT                                  :{WHITE}Nije moguće prenamijeniti zrakoplov...
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Raspored)
 
@@ -3202,15 +3002,225 @@ STR_LORRY                                                       :{BLACK}{LORRY}
 STR_PLANE                                                       :{BLACK}{PLANE}
 STR_SHIP                                                        :{BLACK}{SHIP}
 
+############ Vehicle lists
+STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP                             :{BLACK}Vlakovi - klikni na vlak za informacije
+STR_VEHICLE_LIST_ROAD_VEHICLE_TOOLTIP                           :{BLACK}Cestovna vozila - klikni na vozilo za informacije
+STR_VEHICLE_LIST_SHIP_TOOLTIP                                   :{BLACK}Brodovi - klikni na brod za informacije
+STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP                               :{BLACK}Zrakoplov - klikni na zrakoplov za informacije
 
-STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Pokaži sve vlakove koji imaju ovu postaju u svom rasporedu
-STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Prikaži sva cestovna vozila koja imaju ovu postaju u svom rasporedu
-STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Prikaži sve zrakoplove koji imaju ovu postaju u svom rasporedu
-STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Prikaži sve brodove koji imaju ovu postaju u svom rasporedu
+STR_VEHICLE_LIST_TRAIN_CAPTION                                  :{WHITE}{STRING} - {COMMA} vlak{P "" a ova}
+STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING} - {COMMA} cestovn{P o a ih} vozil{P o a a}
+STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - {COMMA} brod{P "" a ova}
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} zrakoplova
 
 STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}Dijeljene naredbe za {COMMA} vozil{P o a a}
 STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Pokaži sva vozila koja dijele ovaj raspored.
 
+STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} čeka u željezničkom hangaru
+STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} čeka u radioni
+STR_NEWS_SHIP_IS_WAITING                                        :{WHITE}{VEHICLE} čeka u brodogradilištu
+STR_NEWS_AIRCRAFT_IS_WAITING                                    :{WHITE}{VEHICLE} čeka u zrakoplovnom hangaru
+
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Prenamijeni vlak
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Prenamijeni cestovno vozilo
+STR_REFIT_SHIP_REFIT_BUTTON                                     :{BLACK}Prenamijeni brod
+STR_REFIT_AIRCRAFT_REFIT_BUTTON                                 :{BLACK}Prenamijeni zrakoplov
+
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Prenamijeni vlak za prijevoz označene vrste tereta
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Prenamijeni cestovno vozilo  za prijevoz označene vrste tereta
+STR_REFIT_SHIP_REFIT_TOOLTIP                                    :{BLACK}Prenamijeni brod za prijevoz označene vrste tereta
+STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}Prenamijeni zrakoplov za prijevoz označene vrste tereta
+
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Odaberi vrstu tereta koju će vlak prevoziti
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Odaberi vrstu tereta koje će cestovno vozilo prevoziti
+STR_REFIT_SHIP_LIST_TOOLTIP                                     :{BLACK}Odaberi vrstu tereta za prijevoz brodom
+STR_REFIT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Odaberi vrstu tereta koju će zrakoplov prevoziti
+
+STR_DEPOT_TRAIN_CAPTION                                         :{WHITE}Spremište vlakova grada {TOWN}a
+STR_DEPOT_ROAD_VEHICLE_CAPTION                                  :{WHITE}Spremište cestovnih vozila grada {TOWN}a
+STR_DEPOT_SHIP_CAPTION                                          :{WHITE} Spremište brodova grada {TOWN}a
+STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}{STATION} Zrakoplovni hangar
+
+STR_VEHICLE_DETAILS_TRAIN_RENAME                                :{BLACK}Imenuj vlak
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Imenuj cestovno vozilo
+STR_VEHICLE_DETAILS_SHIP_RENAME                                 :{BLACK}Imenuj brod
+STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}Imenuj zrakoplov
+
+STR_QUERY_RENAME_TRAIN_CAPTION                                  :{WHITE}Imenuj vlak
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Imenuj cestovno vozilo
+STR_QUERY_RENAME_SHIP_CAPTION                                   :{WHITE}Imenuj brod
+STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}Imenuj zrakoplov
+
+STR_ERROR_TRAIN_IN_THE_WAY                                      :{WHITE}Vlak na putu
+STR_ERROR_ROAD_VEHICLE_IN_THE_WAY                               :{WHITE}Cestovno vozilo na putu
+STR_ERROR_SHIP_IN_THE_WAY                                       :{WHITE}Smeta brod
+STR_ERROR_AIRCRAFT_IN_THE_WAY                                   :{WHITE}Smeta zrakoplov
+
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Nije moguće prenamijeniti vlak...
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Nije moguće prenamijeniti cestovno vozilo...
+STR_ERROR_CAN_T_REFIT_SHIP                                      :{WHITE}Nije moguće prenamijeniti brod...
+STR_ERROR_CAN_T_REFIT_AIRCRAFT                                  :{WHITE}Nije moguće prenamijeniti zrakoplov...
+
+STR_ERROR_CAN_T_RENAME_TRAIN                                    :{WHITE}Nije moguće imenovati vlak...
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Nije moguće imenovati cestovno vozilo...
+STR_ERROR_CAN_T_RENAME_SHIP                                     :{WHITE}Nije moguće imenovati brod...
+STR_ERROR_CAN_T_RENAME_AIRCRAFT                                 :{WHITE}Nije moguće imenovati zrakoplov...
+
+STR_ERROR_CAN_T_STOP_START_TRAIN                                :{WHITE}Nije moguće zaustaviti/pokrenuti vlak...
+STR_ERROR_CAN_T_STOP_START_ROAD_VEHICLE                         :{WHITE}Nije moguće zaustaviti/pokrenuti cestovno vozilo...
+STR_ERROR_CAN_T_STOP_START_SHIP                                 :{WHITE}Nije moguće pokrenuti/zaustaviti brod...
+STR_ERROR_CAN_T_STOP_START_AIRCRAFT                             :{WHITE}Nije moguće zaustaviti/pokrenuti zrakoplov...
+
+STR_ERROR_CAN_T_SEND_TRAIN_TO_DEPOT                             :{WHITE}Nije moguće poslati vlak u spremište...
+STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Nije moguće poslati vozilo u spremište...
+STR_ERROR_CAN_T_SEND_SHIP_TO_DEPOT                              :{WHITE}Nije moguće poslati brod u spremište...
+STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR                         :{WHITE}Nije moguće poslati zrakoplov u hangar
+
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Nije moguće izgraditi željezničko vozilo...
+STR_ERROR_CAN_T_BUILD_ROAD_VEHICLE                              :{WHITE}Nije moguće izgraditi cestovno vozilo...
+STR_ERROR_CAN_T_BUILD_SHIP                                      :{WHITE}Nije moguće izgraditi brod...
+STR_ERROR_CAN_T_BUILD_AIRCRAFT                                  :{WHITE}Nije moguće izgraditi zrakoplov...
+
+STR_ERROR_CAN_T_RENAME_TRAIN_TYPE                               :{WHITE}Nije moguće preimenovati vrstu vagona...
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Nije moguće preimenovati vrstu cestovnog vozila...
+STR_ERROR_CAN_T_RENAME_SHIP_TYPE                                :{WHITE}Nije moguće preimenovati vrstu broda...
+STR_ERROR_CAN_T_RENAME_AIRCRAFT_TYPE                            :{WHITE}Nije moguće preimenovati vrstu zrakoplova...
+
+STR_ERROR_CAN_T_SELL_TRAIN                                      :{WHITE}Nije moguće prodati željezničko vozilo
+STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}Nije moguće prodati cestovno vozilo...
+STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}Nije moguće prodati brod...
+STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}Nije moguće prodati zrakoplov...
+
+STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP                 :{BLACK}Trenutna radnja vlaka - klikni ovdje kako bi zaustavio/pokrenuo vlak
+STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP          :{BLACK}Trenutna radnja vozila - klikni ovdje kako bi zaustavio/pokrenuo vozilo
+STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP                  :{BLACK}Trenutna radnja broda - klikni ovdje kako bi zaustavio/pokrenuo brod
+STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP              :{BLACK}Trenutna radnja zrakoplova - klikni ovdje kako bi zaustavio/pokrenuo zrakoplov
+
+STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP                           :{BLACK}Pokaži naredbe vlaka
+STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP                    :{BLACK}Pokaži naredbe vozila
+STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Pokaži naredbe broda
+STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Pokaži naredbe zrakoplova
+
+STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP                         :{BLACK}Centriraj glavni pogled na lokaciju vlaka
+STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP                  :{BLACK}Centriraj glavni pogled na lokaciju vozila
+STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP                          :{BLACK}Centriraj glavni pogled na lokaciju broda
+STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP                      :{BLACK} Centrirajte glavni prozor na lokaciju zrakoplova
+
+STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP                    :{BLACK}Pošalji vlak u spremište. CTRL+klik će samo servisirati
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}Pošalji vozilo u spremište. CTRL+klik će samo servisirati
+STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}Pošalji brod u spremište. CTRL+klik će samo servisirati
+STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}Pošalji zrakoplov u hangar. CTRL+klik će samo servisirati
+
+STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Pokaži detalje vlaka
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Pokaži detalje cestovnog vozila
+STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Pokaži detalje broda
+STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Pokaži detalje zrakoplova
+
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Prenamijeni vlak  za prijevoz neke druge vrste tereta
+STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Prenamijeni cestovno vozilo  za prijevoz neke druge vrste tereta
+STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}Prenamijeni teretni brod za prijevoz neke druge vrste tereta
+STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Prenamijeni zrakoplov za prijevoz neke druge vrste tereta
+
+STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Kreće se prema spremištu vlakova grada {TOWN}a
+STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Kreće se prema spremištu vlakova grada {TOWN}a, {VELOCITY}
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Kreće se prema cestovnom spremištu grada {TOWN}a
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Kreće se prema cestovnom spremištu grada {TOWN}a, {VELOCITY}
+STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Kreće se prema spremištu brodova grada {TOWN}a
+STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Kreće se prema spremištu brodova grada {TOWN}a, {VELOCITY}
+STR_HEADING_FOR_HANGAR                                          :{ORANGE}Putuje prema hangaru {STATION}
+STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Putuje prema hangaru {STATION}, {VELOCITY}
+
+STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Servisiranje u spremištu vlakova grada {TOWN}a
+STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Servisiranje u spremištu vlakova grada {TOWN}a, {VELOCITY}
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Servisiranje u cestovnom spremištu grada {TOWN}a
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Servisiranje u cestovnom spremištu grada {TOWN}a, {VELOCITY}
+STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Servisiranje u spremištu brodova grada {TOWN}a
+STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Servisiranje u spremištu brodova grada {TOWN}a, {VELOCITY}
+STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Servisiranje u hangaru {STATION}
+STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Servisiranje u hangaru {STATION}, {VELOCITY}
+
+
+STR_CLONE_TRAIN                                                 :{BLACK}Kloniraj vlak
+STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Kloniraj vozilo
+STR_CLONE_SHIP                                                  :{BLACK}Kloniraj brod
+STR_CLONE_AIRCRAFT                                              :{BLACK}Kloniraj zrakoplov
+
+STR_CLONE_TRAIN_INFO                                            :{BLACK}Ovo će izgraditi kopiju vlaka uključujući sve vagone. Control-klik će dijeliti naredbe
+STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Ovo će izgraditi kopiju cestovnog vozila. Control-clik će dijeliti naredbe
+STR_CLONE_SHIP_INFO                                             :{BLACK}Ovo će izgradi kopiju broda. Control-klik će dijeliti naredbe
+STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Ovo će izgraditi kopiju zrakoplova. Control-klik će dijeliti naredbe
+
+STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Ovo će napraviti kopiju vlaka uključujući sve vagone. Kliknite na ovaj gumb i onda na vlak unutar ili izvan spremišta. CTRL-klik će dijeliti naredbe
+STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Ovo će napraviti kopiju cestovnog vozila. Klikni na ovaj gumb i onda na cestovno vozilo unutar ili izvan spremišta. CTRL+klik će dijeliti naredbe
+STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Ovo će napraviti kopiju broda. Klikni na ovaj gumb i onda na brod unutar ili izvan spremišta. CTRL+klik će dijeliti naredbe
+STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Ovo će napraviti kopiju zrakoplova. Klikni ovaj gumb i onda na zrakoplov unutar ili izvan hangara. Control+klik će dijeliti naredbe
+
+STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}Nova željeznička vozila
+STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}Nova električna pružna vozila
+STR_BUILD_VEHICLE_TRAIN_MONORAIL_CAPTION                        :{WHITE}Nova jednotračna željeznička vozila
+STR_BUILD_VEHICLE_TRAIN_MAGLEV_CAPTION                          :{WHITE}Nova maglev vozila
+
+STR_BUILD_VEHICLE_TRAIN_ALL_CAPTION                             :{WHITE}Pružna vozila
+STR_BUILD_VEHICLE_ROAD_VEHICLE_CAPTION                          :{WHITE}Nova cestovna vozila
+STR_BUILD_VEHICLE_SHIP_CAPTION                                  :{WHITE}Novi brodovi
+STR_BUILD_VEHICLE_AIRCRAFT_CAPTION                              :{WHITE}Novi zrakoplov
+
+STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_BUTTON                    :{BLACK}Izgradi vozilo
+STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_BUTTON             :{BLACK}Izgradi vozilo
+STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON                     :{BLACK}Izgradi brod
+STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON                 :{BLACK}Izgradi zrakoplov
+
+STR_BUILD_VEHICLE_TRAIN_LIST_TOOLTIP                            :{BLACK}Popis izabranih vlakova - klikni na vlak za informacije
+STR_BUILD_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP                     :{BLACK}Popis izabranih cestovnih vozila - klikni na vozilo za informacije
+STR_BUILD_VEHICLE_SHIP_LIST_TOOLTIP                             :{BLACK}Popis izabranih brodova - klikni na brod za informacije
+STR_BUILD_VEHICLE_AIRCRAFT_LIST_TOOLTIP                         :{BLACK}Popis izabranih zrakoplova - klikni na zrakoplov za informacije
+
+STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_TOOLTIP                   :{BLACK}Izgradi označeni vlak
+STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_TOOLTIP            :{BLACK}Izgradi označeno cestovno vozilo
+STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP                    :{BLACK}Izgradi označeni brod
+STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_TOOLTIP                :{BLACK}Izgradi označeni zrakoplov
+
+STR_BUILD_VEHICLE_TRAIN_RENAME_BUTTON                           :{BLACK}Preimenuj
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Preimenuj
+STR_BUILD_VEHICLE_SHIP_RENAME_BUTTON                            :{BLACK}Preimenuj
+STR_BUILD_VEHICLE_AIRCRAFT_RENAME_BUTTON                        :{BLACK}Preimenuj
+
+STR_BUILD_VEHICLE_TRAIN_RENAME_TOOLTIP                          :{BLACK}Preimenuj vrstu vagona
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Preimenuj vrstu cestovnog vozila
+STR_BUILD_VEHICLE_SHIP_RENAME_TOOLTIP                           :{BLACK}Preimenuj vrstu broda
+STR_BUILD_VEHICLE_AIRCRAFT_RENAME_TOOLTIP                       :{BLACK}Preimenuj vrstu zrakoplova
+
+STR_QUERY_RENAME_TRAIN_TYPE_CAPTION                             :{WHITE}Preimenuj vrstu vagona
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Preimenuj vrstu cestovnog vozila
+STR_QUERY_RENAME_SHIP_TYPE_CAPTION                              :{WHITE}Preimenuj vrstu broda
+STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION                          :{WHITE}Preimenuj vrstu zrakoplova
+
+STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Nova vozila
+STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_BUTTON                      :{BLACK}Nova vozila
+STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON                              :{BLACK}Novi brodovi
+STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON                          :{BLACK}Novi zrakoplov
+
+STR_DEPOT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Vlakovi - klikni na vlak za informacije, vuci vozilo kako bi dodao/oduzeo od vlaka
+STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Vozila - klikni na vozilo za informaciju
+STR_DEPOT_SHIP_LIST_TOOLTIP                                     :{BLACK}Brodovi - klikni na brod za informacije
+STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Zrakoplov - klikni na zrakoplov za informacije
+
+STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP                            :{BLACK}Kupi novo željezničko vozilo
+STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}Izgradi novo cestovno vozilo
+STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}Izgradi novi brod
+STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}Izgradi novi zrakoplov
+
+STR_DEPOT_TRAIN_SELL_TOOLTIP                                    :{BLACK}Ovdje povuci vlak kako bi ga prodao
+STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}Povuci cestovno vozilo ovdje kako bi ga prodao
+STR_DEPOT_SHIP_SELL_TOOLTIP                                     :{BLACK}Povuci brod ovdje kako bi ga prodao
+STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}Povuci zrakoplov ovdje kako bi ga prodao
+
+STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}Centriraj glavni pogled na lokaciju spremišta vlakova
+STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}Centriraj glavni pogled na lokaciju spremišta cestovnih vozila
+STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}Centriraj glavni pogled na lokaciju spremišta brodova
+STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Centriraj glavni pogled na lokaciju hangara
+
+
 ### depot strings
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}Upravo se spremaš prodati sva vozila u spremištu. Jesi li siguran?
 STR_DEPOT_WRONG_DEPOT_TYPE                                      :Pogrešna vrsta spremišta
@@ -3230,7 +3240,6 @@ STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TIP                          :{BLACK}Automats
 STR_DEPOT_AUTOREPLACE_SHIP_TIP                                  :{BLACK}Automatski zamijeni sve brodove u spremištu
 STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP                              :{BLACK}Automatski zamijeni sve zrakoplove u spremištu
 
-
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Zamijeni {STRING}
 STR_REPLACE_VEHICLES_START                                      :{BLACK}Počni zamijenjivati vozila
 STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Prestani zamijenjivati vozila
@@ -3246,6 +3255,7 @@ STR_REPLACE_REMOVE_WAGON                                        :{BLACK}Uklanjan
 STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Ukoliko bi zamjena lokomotive učinla vlak dužim, neka automatska zamjena zadrži istu dužinu vlaka tako da ukloni suvišne vagone (počevši od naprijed).
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}Zamjenjujem:{ORANGE}{SKIP}{SKIP}{STRING}
 STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}Prebaci između prozora za izmjenu lokomotiva i vagona
+
 STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Vozilo nije dostupno
 STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Vozilo nije dostupno
 STR_SHIP_NOT_AVAILABLE                                          :{WHITE}Brod nije dostupan
@@ -3395,17 +3405,6 @@ STR_MEASURE_AREA                                                :{BLACK}Područj
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Dužina:{NUM}{}Visinska razlika:{NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Područje:{NUM}x{NUM}Visinska razlika:{NUM} m
 
-############ Date formatting
-STR_FORMAT_DATE_TINY                                            :{STRING}-{STRING}-{NUM}
-STR_FORMAT_DATE_SHORT                                           :{STRING} {NUM}
-STR_FORMAT_DATE_LONG                                            :{STRING} {STRING} {NUM}
-STR_FORMAT_DATE_ISO                                             :{2:NUM}-{1:STRING}-{0:STRING}
-
-STR_JUST_DATE_TINY                                              :{DATE_TINY}
-STR_JUST_DATE_LONG                                              :{DATE_LONG}
-STR_JUST_DATE_ISO                                               :{DATE_ISO}
-########
-
 STR_FEEDER_CARGO_VALUE                                          :{BLACK}Prebaci novac: {LTBLUE}{CURRENCY}
 STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD                            :{WHITE}...ovo je gradska cesta
 STR_DRIVE_THROUGH_ERROR_DIRECTION                               :{WHITE}...cesta je orijentirana u krivom smjeru
@@ -3430,7 +3429,6 @@ STR_PERCENT_UP_DOWN_SMALL                                       :{TINYFONT}{WHIT
 STR_PERCENT_UP_DOWN                                             :{WHITE}{NUM}%{UPARROW}{DOWNARROW}
 
 ##### Mass Order
-STR_FORMAT_GROUP_NAME                                           :Groupa {COMMA}
 STR_GROUP_TINY_NAME                                             :{TINYFONT}{GROUP}
 STR_GROUP_ALL_TRAINS                                            :Svi vlakovi
 STR_GROUP_ALL_ROAD_VEHICLES                                     :Sva cestovna vozila
@@ -3459,12 +3457,62 @@ STR_GROUP_DELETE_TIP                                            :{BLACK}Obriši
 STR_GROUP_RENAME_TIP                                            :{BLACK}Preimenuj odabranu grupu
 STR_GROUP_REPLACE_PROTECTION_TIP                                :{BLACK}Klikni kako bi zaštitio ovu grupu od globalne automatske zamjene
 
+#### String control codes and their formatting
 STR_COMPANY_NAME                                                :{COMPANY}
 STR_ENGINE_NAME                                                 :{ENGINE}
 STR_GROUP_NAME                                                  :{GROUP}
+STR_INDUSTRY_NAME                                               :{INDUSTRY}
 STR_PRESIDENT_NAME                                              :{PRESIDENTNAME}
 STR_SIGN_NAME                                                   :{SIGN}
+STR_STATION_NAME                                                :{STATION}
+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_LONG                                              :{DATE_LONG}
+STR_JUST_DATE_ISO                                               :{DATE_ISO}
+STR_JUST_STRING                                                 :{STRING}
+STR_JUST_RAW_STRING                                             :{STRING}
+
+STR_FORMAT_DATE_TINY                                            :{STRING}-{STRING}-{NUM}
+STR_FORMAT_DATE_SHORT                                           :{STRING} {NUM}
+STR_FORMAT_DATE_LONG                                            :{STRING} {STRING} {NUM}
+STR_FORMAT_DATE_ISO                                             :{2:NUM}-{1:STRING}-{0:STRING}
+
+STR_FORMAT_COMPANY_NUM                                          :(Tvrtka {COMMA})
+STR_FORMAT_GROUP_NAME                                           :Groupa {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}Ime mora biti jedinstveno
 
diff --git a/src/lang/czech.txt b/src/lang/czech.txt
index 0e8bfe098..14034117b 100644
--- a/src/lang/czech.txt
+++ b/src/lang/czech.txt
@@ -222,8 +222,6 @@ STR_ABBREV_PLASTIC                                              :{TINYFONT}PL
 STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}LI
 STR_ABBREV_NONE                                                 :{TINYFONT}NIC
 STR_ABBREV_ALL                                                  :{TINYFONT}VŠE
-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
@@ -235,17 +233,11 @@ STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Původn�
 STR_ABOUT_VERSION                                               :{BLACK}OpenTTD verze {REV}
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 Tým OpenTTD
 
-STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
-STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_QUIT_CAPTION                                                :{WHITE}Konec
 STR_YES                                                         :{BLACK}Ano
 STR_NO                                                          :{BLACK}Ne
 STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Opravdu chceš opustit tuto hru a odejít do {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                                                :nic
 STR_COLOUR_DARK_BLUE                                            :Tmavomodrá
 STR_COLOUR_PALE_GREEN                                           :Světlezelená
@@ -264,8 +256,6 @@ STR_COLOUR_BROWN                                                :Hnědá
 STR_COLOUR_GREY                                                 :Šedá
 STR_COLOUR_WHITE                                                :Bílá
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}Příliš mnoho vozidel ve hře
-STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
-STR_RED_COMMA                                                   :{RED}{COMMA}
 STR_BUTTON_LOCATION                                             :{BLACK}Umístění
 STR_SMALLMAP_TYPE_CONTOURS                                      :Profil
 STR_SMALLMAP_TYPE_VEHICLES                                      :Dopravní prostředky
@@ -391,12 +381,13 @@ STR_SORT_CRITERIA_TIP                                           :{BLACK}Vyber, p
 STR_FILTER_CRITERIA_TIP                                         :{BLACK}Vyber třídící podmínku
 STR_SORT_BY                                                     :{BLACK}Řadit podle
 
+### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}Populace
+STR_SORT_BY_NAME                                                :{BLACK}Podle jména
+STR_SORT_BY_DATE                                                :{BLACK}Podle data
 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_DATE                                                :{BLACK}Podle data
 STR_SORT_BY_NUMBER                                              :čísla
 STR_SORT_BY_PROFIT_LAST_YEAR                                    :hrubého zisku vloni
 STR_SORT_BY_PROFIT_THIS_YEAR                                    :hrubého zisku letos
@@ -419,6 +410,7 @@ STR_SORT_BY_INTRO_DATE                                          :data uvedení n
 STR_SORT_BY_RUNNING_COST                                        :provozních nákladů
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :výkonu/provozních nákladů
 STR_SORT_BY_CARGO_CAPACITY                                      :přepravní kapacity
+
 STR_NO_WAITING_CARGO                                            :{BLACK}Nečeká žádná komodita jakéhokoli druhu
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}Označit všechny druhy stanic
 STR_SELECT_ALL_TYPES                                            :{BLACK}Označit všechny druhy komodit (včetne žádného čekajícího nákladu)
@@ -438,21 +430,6 @@ STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Poslat do depa
 STR_SEND_SHIP_TO_DEPOT                                          :Poslat do depa
 STR_SEND_AIRCRAFT_TO_HANGAR                                     :Poslat do hangáru
 
-############ range for months starts
-STR_MONTH_ABBREV_JAN                                            :led
-STR_MONTH_ABBREV_FEB                                            :úno
-STR_MONTH_ABBREV_MAR                                            :bře
-STR_MONTH_ABBREV_APR                                            :dub
-STR_MONTH_ABBREV_MAY                                            :kvě
-STR_MONTH_ABBREV_JUN                                            :čer
-STR_MONTH_ABBREV_JUL                                            :čnc
-STR_MONTH_ABBREV_AUG                                            :srp
-STR_MONTH_ABBREV_SEP                                            :zář
-STR_MONTH_ABBREV_OCT                                            :říj
-STR_MONTH_ABBREV_NOV                                            :lis
-STR_MONTH_ABBREV_DEC                                            :pro
-############ 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}{STRING}-
@@ -479,8 +456,6 @@ 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_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
@@ -527,7 +502,7 @@ STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Nic
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Jméno
 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                                          :1.
 STR_ORDINAL_NUMBER_2ND                                          :2.
 STR_ORDINAL_NUMBER_3RD                                          :3.
@@ -561,6 +536,34 @@ STR_ORDINAL_NUMBER_30TH                                         :30.
 STR_ORDINAL_NUMBER_31ST                                         :31.
 ############ range for days ends
 
+############ range for months starts
+STR_MONTH_ABBREV_JAN                                            :led
+STR_MONTH_ABBREV_FEB                                            :úno
+STR_MONTH_ABBREV_MAR                                            :bře
+STR_MONTH_ABBREV_APR                                            :dub
+STR_MONTH_ABBREV_MAY                                            :kvě
+STR_MONTH_ABBREV_JUN                                            :čer
+STR_MONTH_ABBREV_JUL                                            :čnc
+STR_MONTH_ABBREV_AUG                                            :srp
+STR_MONTH_ABBREV_SEP                                            :zář
+STR_MONTH_ABBREV_OCT                                            :říj
+STR_MONTH_ABBREV_NOV                                            :lis
+STR_MONTH_ABBREV_DEC                                            :pro
+
+STR_MONTH_JAN                                                   :Leden
+STR_MONTH_FEB                                                   :Únor
+STR_MONTH_MAR                                                   :Březen
+STR_MONTH_APR                                                   :Duben
+STR_MONTH_MAY                                                   :Květen
+STR_MONTH_JUN                                                   :Červen
+STR_MONTH_JUL                                                   :Červenec
+STR_MONTH_AUG                                                   :Srpen
+STR_MONTH_SEP                                                   :Září
+STR_MONTH_OCT                                                   :Říjen
+STR_MONTH_NOV                                                   :Listopad
+STR_MONTH_DEC                                                   :Prosinec
+############ range for months ends
+
 STR_GRAPH_Y_LABEL_NUMBER                                        :{TINYFONT}{COMMA}
 
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}Přijímané zboží: {LTBLUE}
@@ -650,12 +653,9 @@ 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_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_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
@@ -737,9 +737,7 @@ STR_OFF                                                         :Vypnuto
 STR_SUMMARY                                                     :Shrnutí
 STR_FULL                                                        :Plná
 STR_STATUSBAR_COMPANY_NAME                                      :{SILVER}- -  {COMPANY}  - -
-STR_BLACK_STRING                                                :{BLACK}{STRING}
 
-STR_JUST_CHECKMARK                                              :{CHECKMARK}
 ############ range for menu starts
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Možnosti hry
 STR_SETTINGS_MENU_DIFFICULTY_SETTINGS                           :Nastavení obtížnosti
@@ -844,9 +842,6 @@ 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_BLACK_6                                                     :{BLACK}6
-STR_BLACK_7                                                     :{BLACK}7
-
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Anglická (původní)
 STR_TOWNNAME_FRENCH                                             :Francouzská
@@ -926,19 +921,6 @@ STR_OPTIONS_BASE_GRF_DESCRIPTION_TIP                            :{BLACK}Další
 
 STR_AUTOSAVE_FAILED                                             :{WHITE}Automatické uložení selhalo
 
-STR_MONTH_JAN                                                   :Leden
-STR_MONTH_FEB                                                   :Únor
-STR_MONTH_MAR                                                   :Březen
-STR_MONTH_APR                                                   :Duben
-STR_MONTH_MAY                                                   :Květen
-STR_MONTH_JUN                                                   :Červen
-STR_MONTH_JUL                                                   :Červenec
-STR_MONTH_AUG                                                   :Srpen
-STR_MONTH_SEP                                                   :Září
-STR_MONTH_OCT                                                   :Říjen
-STR_MONTH_NOV                                                   :Listopad
-STR_MONTH_DEC                                                   :Prosinec
-
 STR_HEADING_FOR_STATION                                         :{LTBLUE}Míří do {STATION}
 STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}Míří do {STATION}, {VELOCITY}
 STR_NO_ORDERS                                                   :{LTBLUE}Bez příkazů
@@ -953,8 +935,6 @@ STR_CRATES                                                      :krabic
 STR_RES_OTHER                                                   :Jiné
 STR_NOTHING                                                     :
 
-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ů...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Konec sdílených příkazů - -
@@ -1226,7 +1206,6 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Výška
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :vypnuto
-STR_JUST_CURRENCY                                               :{CURRENCY}
 STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Změnit hodnotu nastavení
 
 STR_TEMPERATE_LANDSCAPE                                         :krajina mírného pásma
@@ -2192,8 +2171,6 @@ STR_NUM_LOW                                                     :nízké
 STR_NUM_NORMAL                                                  :střední
 STR_NUM_HIGH                                                    :vysoké
 STR_NUM_CUSTOM                                                  :vlastní
-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í
@@ -2879,7 +2856,6 @@ 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_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})
@@ -3544,7 +3520,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}
@@ -3562,6 +3541,31 @@ STR_FORMAT_COMPANY_NUM                                          :(společnost {C
 STR_FORMAT_GROUP_NAME                                           :Skupina {COMMA}
 STR_FORMAT_INDUSTRY_NAME                                        :{1:STRING} {0:TOWN}
 
+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}Jméno musí být unikátní
 
 #### Improved sign GUI
diff --git a/src/lang/danish.txt b/src/lang/danish.txt
index 876a2a1c5..34f8db300 100644
--- a/src/lang/danish.txt
+++ b/src/lang/danish.txt
@@ -154,8 +154,6 @@ STR_ABBREV_PLASTIC                                              :{TINYFONT}PL
 STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}SV
 STR_ABBREV_NONE                                                 :{TINYFONT}INT
 STR_ABBREV_ALL                                                  :{TINYFONT}ALT
-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
@@ -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 OpenTTD teamet
 
-STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
-STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_QUIT_CAPTION                                                :{WHITE}Afslut
 STR_YES                                                         :{BLACK}Ja
 STR_NO                                                          :{BLACK}Nej
 STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Er du sikker på, at du vil forlade dette spil og returnere til {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                                                :Intet
 STR_COLOUR_DARK_BLUE                                            :Mørkeblå
 STR_COLOUR_PALE_GREEN                                           :Bleggrøn
@@ -196,8 +188,6 @@ STR_COLOUR_BROWN                                                :Brun
 STR_COLOUR_GREY                                                 :Grå
 STR_COLOUR_WHITE                                                :Hvid
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}For mange køretøjer i spillet
-STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
-STR_RED_COMMA                                                   :{RED}{COMMA}
 STR_BUTTON_LOCATION                                             :{BLACK}Lokalitet
 STR_SMALLMAP_TYPE_CONTOURS                                      :Konturer
 STR_SMALLMAP_TYPE_VEHICLES                                      :Køretøjer
@@ -323,12 +313,13 @@ STR_SORT_CRITERIA_TIP                                           :{BLACK}Vælg so
 STR_FILTER_CRITERIA_TIP                                         :{BLACK}Vælg filtreringskriterier
 STR_SORT_BY                                                     :{BLACK}Sortér på
 
+### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}Indbyggertal
+STR_SORT_BY_NAME                                                :{BLACK}Navn
+STR_SORT_BY_DATE                                                :{BLACK}Dato
 STR_SORT_BY_PRODUCTION                                          :Produktion
 STR_SORT_BY_TYPE                                                :Type
 STR_SORT_BY_TRANSPORTED                                         :Transporteret
-STR_SORT_BY_NAME                                                :{BLACK}Navn
-STR_SORT_BY_DATE                                                :{BLACK}Dato
 STR_SORT_BY_NUMBER                                              :Nummer
 STR_SORT_BY_PROFIT_LAST_YEAR                                    :Afkast sidste år
 STR_SORT_BY_PROFIT_THIS_YEAR                                    :Afkast i år
@@ -351,37 +342,25 @@ STR_SORT_BY_INTRO_DATE                                          :Introduktionsda
 STR_SORT_BY_RUNNING_COST                                        :Driftsomkostning
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :Drivmiddel/omkostninger
 STR_SORT_BY_CARGO_CAPACITY                                      :Lasteevne
+
 STR_NO_WAITING_CARGO                                            :{BLACK}Der venter ingen fragt af nogen type
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}Vælg alle faciliteter
 STR_SELECT_ALL_TYPES                                            :{BLACK}Vælg alle lasttyper (inklusiv fragttyper, der ikke venter)
-STR_AVAILABLE_TRAINS                                            :{BLACK}Tilgængelige tog
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Tilgæn. vejkøretøjer
-STR_AVAILABLE_SHIPS                                             :{BLACK}Tilgængelige skibe
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Tilgængelige fly
 STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Se liste over tilgængelige designs for denne køretøjstype.
 STR_MANAGE_LIST                                                 :{BLACK}Administrer liste
 STR_MANAGE_LIST_TIP                                             :{BLACK}Send instruktioner til alle køretøjer i denne liste
 STR_REPLACE_VEHICLES                                            :Udskift køretøjer
+STR_SEND_FOR_SERVICING                                          :Send til eftersyn
+
+STR_AVAILABLE_TRAINS                                            :{BLACK}Tilgængelige tog
+STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Tilgæn. vejkøretøjer
+STR_AVAILABLE_SHIPS                                             :{BLACK}Tilgængelige skibe
+STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Tilgængelige fly
+
 STR_SEND_TRAIN_TO_DEPOT                                         :Send til remise
 STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Send til værksted
 STR_SEND_SHIP_TO_DEPOT                                          :Send til skibsdok
 STR_SEND_AIRCRAFT_TO_HANGAR                                     :Send til hangar
-STR_SEND_FOR_SERVICING                                          :Send til eftersyn
-
-############ 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                                            :maj
-STR_MONTH_ABBREV_JUN                                            :jun
-STR_MONTH_ABBREV_JUL                                            :jul
-STR_MONTH_ABBREV_AUG                                            :aug
-STR_MONTH_ABBREV_SEP                                            :sep
-STR_MONTH_ABBREV_OCT                                            :okt
-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}
@@ -409,8 +388,6 @@ 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_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
@@ -457,7 +434,7 @@ STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Ingen
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Navn
 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                                          :1.
 STR_ORDINAL_NUMBER_2ND                                          :2.
 STR_ORDINAL_NUMBER_3RD                                          :3.
@@ -491,6 +468,34 @@ STR_ORDINAL_NUMBER_30TH                                         :30.
 STR_ORDINAL_NUMBER_31ST                                         :31.
 ############ 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                                            :maj
+STR_MONTH_ABBREV_JUN                                            :jun
+STR_MONTH_ABBREV_JUL                                            :jul
+STR_MONTH_ABBREV_AUG                                            :aug
+STR_MONTH_ABBREV_SEP                                            :sep
+STR_MONTH_ABBREV_OCT                                            :okt
+STR_MONTH_ABBREV_NOV                                            :nov
+STR_MONTH_ABBREV_DEC                                            :dec
+
+STR_MONTH_JAN                                                   :januar
+STR_MONTH_FEB                                                   :februar
+STR_MONTH_MAR                                                   :marts
+STR_MONTH_APR                                                   :april
+STR_MONTH_MAY                                                   :maj
+STR_MONTH_JUN                                                   :juni
+STR_MONTH_JUL                                                   :juli
+STR_MONTH_AUG                                                   :august
+STR_MONTH_SEP                                                   :september
+STR_MONTH_OCT                                                   :oktober
+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}Accepteret last: {LTBLUE}
@@ -580,12 +585,9 @@ 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_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_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
@@ -667,9 +669,7 @@ STR_OFF                                                         :Fra
 STR_SUMMARY                                                     :Kortfattet
 STR_FULL                                                        :Fuld
 STR_STATUSBAR_COMPANY_NAME                                      :{SILVER}- -  {COMPANY}  - -
-STR_BLACK_STRING                                                :{BLACK}{STRING}
 
-STR_JUST_CHECKMARK                                              :{CHECKMARK}
 ############ range for menu starts
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Spilvalg
 STR_SETTINGS_MENU_DIFFICULTY_SETTINGS                           :Sværhedsgrad
@@ -774,9 +774,6 @@ 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_BLACK_6                                                     :{BLACK}6
-STR_BLACK_7                                                     :{BLACK}7
-
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Engelske
 STR_TOWNNAME_FRENCH                                             :Franske
@@ -856,19 +853,6 @@ STR_OPTIONS_BASE_GRF_DESCRIPTION_TIP                            :{BLACK}Yderlige
 
 STR_AUTOSAVE_FAILED                                             :{WHITE}Fejl under autogem
 
-STR_MONTH_JAN                                                   :januar
-STR_MONTH_FEB                                                   :februar
-STR_MONTH_MAR                                                   :marts
-STR_MONTH_APR                                                   :april
-STR_MONTH_MAY                                                   :maj
-STR_MONTH_JUN                                                   :juni
-STR_MONTH_JUL                                                   :juli
-STR_MONTH_AUG                                                   :august
-STR_MONTH_SEP                                                   :september
-STR_MONTH_OCT                                                   :oktober
-STR_MONTH_NOV                                                   :november
-STR_MONTH_DEC                                                   :december
-
 STR_HEADING_FOR_STATION                                         :{LTBLUE}Retning mod {STATION}
 STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}Retning mod {STATION}, {VELOCITY}
 STR_NO_ORDERS                                                   :{LTBLUE}Ingen ordrer
@@ -883,8 +867,6 @@ STR_CRATES                                                      :kasser
 STR_RES_OTHER                                                   :andet
 STR_NOTHING                                                     :
 
-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...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Slut på delt ordreliste - -
@@ -1156,7 +1138,6 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Y-stør
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :deaktiveret
-STR_JUST_CURRENCY                                               :{CURRENCY}
 STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Skift indstillingsværdi
 
 STR_TEMPERATE_LANDSCAPE                                         :Tempereret klima
@@ -1258,11 +1239,6 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Industri
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...for tæt på en anden industribygning
 
-STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Ombyg toget til at køre med en anden lasttype
-STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Ombyg toget
-STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Vælg den lasttype toget skal kører med
-STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Ombyg toget til at køre med den markerede lasttype
-STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Kan ikke ombygge toget...
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Skift produktion
 
 ############ network gui strings
@@ -2075,6 +2051,7 @@ STR_SV_STNAME_AIRPORT                                           :{STRING} Luftha
 STR_SV_STNAME_OILFIELD                                          :{STRING} Oliefelt
 STR_SV_STNAME_MINES                                             :{STRING} Miner
 STR_SV_STNAME_DOCKS                                             :{STRING} Havn
+##id 0x6020
 STR_SV_STNAME_ANNEXE                                            :{STRING} Forstad
 STR_SV_STNAME_SIDINGS                                           :{STRING} Sidespor
 STR_SV_STNAME_BRANCH                                            :{STRING} Torv
@@ -2122,8 +2099,6 @@ STR_NUM_LOW                                                     :Lav
 STR_NUM_NORMAL                                                  :Normal
 STR_NUM_HIGH                                                    :Høj
 STR_NUM_CUSTOM                                                  :Brugerdefineret
-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
@@ -2591,10 +2566,8 @@ STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE                          :monoraillokomot
 STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE                            :magnetskinnelokomotiv
 
 ##id 0x8800
-STR_DEPOT_TRAIN_CAPTION                                         :{WHITE}{TOWN} remise
 STR_NEWS_FIRST_TRAIN_ARRIVAL                                    :{BLACK}{BIGFONT}Indbyggerne fester . . .{}Første tog ankommer til {STATION}!
 STR_VEHICLE_DETAILS_CAPTION                                     :{WHITE}{VEHICLE} (Detaljer)
-STR_ERROR_TRAIN_IN_THE_WAY                                      :{WHITE}Tog i vejen
 STR_ORDER                                                       :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 STR_ORDER_SELECTED                                              :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 STR_ORDER_NON_STOP                                              :{BLACK}Uden stop
@@ -2684,37 +2657,16 @@ STR_TIMETABLE_AND_TRAVEL_FOR                                    :og rejs i {STRI
 STR_TIMETABLE_DAYS                                              :{COMMA} dag{P "" e}
 STR_TIMETABLE_TICKS                                             :{COMMA} tik
 
-STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Kører til {TOWN} remise
-STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Kører til {TOWN} remise, {VELOCITY}
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Service i {TOWN} remise
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Service i {TOWN} remise, {VELOCITY}
-
 STR_INVALID_ORDER                                               :{RED} (Ugyldig Order)
 
 STR_UNKNOWN_STATION                                             :ukendt station
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}Tom
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} fra {STATION}
 STR_VEHICLE_DETAILS_CARGO_FROM_MULT                             :{LTBLUE}{CARGO} fra {STATION} (x{NUM})
-STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} venter i remisen
-STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Nye køretøjer
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}Toget er for langt
 STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}Tog kan kun ændres når de er stoppet i en remise
 
-STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}Nye jernbanekøretøjer
-STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}Nyt elektrisk lokomotiv
-STR_BUILD_VEHICLE_TRAIN_MONORAIL_CAPTION                        :{WHITE}Nye monorailkøretøjer
-STR_BUILD_VEHICLE_TRAIN_MAGLEV_CAPTION                          :{WHITE}Nye magnetskinnekøretøjer
-STR_BUILD_VEHICLE_TRAIN_ALL_CAPTION                             :{WHITE}Jernbanekøretøjer
-
-STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_BUTTON                    :{BLACK}Byg køretøj
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Klon køretøj
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Dette vil bygge en kopi af vejkøretøjet. CTRL-klik vil dele ordrer
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Dette vil bygge en kopi af køretøjet. Klik på denne knap, så på et køretøj indeni eller udenfor værkstedet. CTRL-klik vil dele ordrer
-STR_CLONE_TRAIN                                                 :{BLACK}Klon tog
-STR_CLONE_TRAIN_INFO                                            :{BLACK}Dette vil bygge en kopi af toget inklusiv alle vogne. CTRL-klik vil dele ordrer
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Dette vil bygge en kopi af toget inklusiv alle vogne. Klik på denne knap, så på et tog indeni eller udenfor remisen. CTRL-klik vil dele ordrer
-STR_BUILD_VEHICLE_TRAIN_RENAME_BUTTON                           :{BLACK}Omdøb
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Spring over
 STR_ORDERS_DELETE_BUTTON                                        :{BLACK}Slet
 STR_ORDERS_GO_TO_BUTTON                                         :{BLACK}Gå til
@@ -2730,14 +2682,12 @@ STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Skift ti
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Ordrer)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Slut på ordrer - -
 STR_SERVICE                                                     :{BLACK}Service
-STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Kan ikke bygge jernbanekøretøj...
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Bygget: {LTBLUE}{NUM}{BLACK} Værdi: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Værdi: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
 STR_VEHICLE_STATUS_LOADING_UNLOADING                            :{LTBLUE}Læsser / Aflæsser
 STR_VEHICLE_STATUS_LEAVING                                      :{LTBLUE}Forlader
 STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}Toget skal være stoppet inde i en remise
-STR_ERROR_CAN_T_SEND_TRAIN_TO_DEPOT                             :{WHITE}Kan ikke sende toget til remise...
 STR_ERROR_NO_MORE_SPACE_FOR_ORDERS                              :{WHITE}Ikke mere plads til ordrer
 STR_ERROR_TOO_MANY_ORDERS                                       :{WHITE}For mange ordrer
 STR_ERROR_CAN_T_INSERT_NEW_ORDER                                :{WHITE}Kan ikke indsætte ny ordre...
@@ -2752,25 +2702,11 @@ STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE}et køre
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}Kan ikke flytte køretøjet...
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}Det bagerste lokomotiv vil altid følge dets forende
 STR_CARGO_N_A                                                   :N/A{SKIP}
-STR_ERROR_CAN_T_SELL_TRAIN                                      :{WHITE}Kan ikke sælge jernbanekøretøjet...
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}Kan ikke finde en route til et lokalt depot
-STR_ERROR_CAN_T_STOP_START_TRAIN                                :{WHITE}Kan ikke stoppe/starte toget...
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}Serviceinterval: {LTBLUE}{COMMA}dage{BLACK}   Sidste service: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}Serviceinterval: {LTBLUE}{COMMA}%{BLACK}   Sidste service: {LTBLUE}{DATE_LONG}
-STR_DEPOT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Tog - klik på et tog for information., træk vogn/lokomotiv for at fjerne/tilføje det til toget
-STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP                            :{BLACK}Byg nyt tog/togvogn
-STR_DEPOT_TRAIN_SELL_TOOLTIP                                    :{BLACK}Træk tog/togvogn her hen for at sælge
-STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}Centrer skærmen over remisens lokalitet
-STR_BUILD_VEHICLE_TRAIN_LIST_TOOLTIP                            :{BLACK}Togvalgsliste - klik på et køretøj for mere information
-STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_TOOLTIP                   :{BLACK}Byg det markerede lokomotiv/togvogn
-STR_BUILD_VEHICLE_TRAIN_RENAME_TOOLTIP                          :{BLACK}Omdøb tog-/togvognstypen
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP                 :{BLACK}Nuværende opførsel - klik her for at starte/stoppe toget
-STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP                           :{BLACK}Vis togets ordrer
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP                         :{BLACK}Centrer skærmen over togets lokalitet
-STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP                    :{BLACK}Send toget til remise. CTRL+klik vil kun servicere
 STR_VEHICLE_VIEW_TRAIN_IGNORE_SIGNAL_TOOLTIP                    :{BLACK}Tving toget til at fortsætte uden at vente på at signalet skifter til grønt
 STR_VEHICLE_VIEW_TRAIN_REVERSE_TOOLTIP                          :{BLACK}Vend retningen af toget
-STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Vis detaljer om toget
 STR_VEHICLE_DETAILS_INCREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Forøg serviceintervallet
 STR_VEHICLE_DETAILS_DECREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Sænk serviceintervallet
 STR_VEHICLE_DETAILS_TRAIN_CARGO_TOOLTIP                         :{BLACK}Vis detaljer omkring den last der medbringes
@@ -2804,15 +2740,10 @@ STR_VEHICLE_STATUS_STOPPED                                      :{RED}Stoppet
 STR_ERROR_CAN_T_MAKE_TRAIN_PASS_SIGNAL                          :{WHITE}Kan ikke få toget til at passere signalet...
 STR_VEHICLE_STATUS_CRASHED                                      :{RED}Forulykket!
 
-STR_QUERY_RENAME_TRAIN_CAPTION                                  :{WHITE}Giv toget et navn
-STR_ERROR_CAN_T_RENAME_TRAIN                                    :{WHITE}Kan ikke give toget navn...
-STR_VEHICLE_DETAILS_TRAIN_RENAME                                :{BLACK}Giv toget et navn
 STR_NEWS_TRAIN_CRASH                                            :{BLACK}{BIGFONT}Tog forulykket!{}{COMMA} døde i flammerne efter kollision
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Kan ikke vende retningen af toget...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE                  :{WHITE}Kan ikke vende køretøjet om...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Kan ikke vende et køretøj, der består af flere enheder
-STR_QUERY_RENAME_TRAIN_TYPE_CAPTION                             :{WHITE}Omdøb tog-/togvognstypen
-STR_ERROR_CAN_T_RENAME_TRAIN_TYPE                               :{WHITE}Kan ikke omdøbe tog-/togvognstypen...
 STR_CLEAR_TIME                                                  :{BLACK}Nulstil tid
 STR_RESET_LATENESS                                              :{BLACK}Nulstil forsinkelse
 STR_CHANGE_WAYPOINT_NAME                                        :{BLACK}Omdøb kontrolsted
@@ -2844,43 +2775,14 @@ STR_TIMETABLE_AUTOFILL                                          :{BLACK}Auto-udf
 STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Udfyld automatisk tidsplanen med tider for den næste tur (CTRL-klik for at forsøge at bevare ventetider)
 
 ##id 0x9000
-STR_ERROR_ROAD_VEHICLE_IN_THE_WAY                               :{WHITE}Køretøj i vejen
-STR_DEPOT_ROAD_VEHICLE_CAPTION                                  :{WHITE}{TOWN} værksted
-STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_BUTTON                      :{BLACK}Nye køretøjer
-STR_BUILD_VEHICLE_ROAD_VEHICLE_CAPTION                          :{WHITE}Nye køretøjer
-STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_BUTTON             :{BLACK}Byg køretøj
-STR_ERROR_CAN_T_BUILD_ROAD_VEHICLE                              :{WHITE}Kan ikke bygge køretøj...
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}...skal være stoppet inde i et værksted først
-STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}Kan ikke sælge køretøj...
-STR_ERROR_CAN_T_STOP_START_ROAD_VEHICLE                         :{WHITE}Kan ikke stoppe/starte køretøj...
-STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} venter på værkstedet
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Kører til {TOWN} værksted
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Kører til {TOWN} værksted, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Service på {TOWN} værksted
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Service på {TOWN} værksted, {VELOCITY}
-STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Kan ikke sende køretøj til værksted...
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Kan ikke finde lokalt værksted
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP          :{BLACK}Nuværende opførsel - klik her for at stoppe/starte køretøjet
-STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP                    :{BLACK}Vis køretøjets ordrer
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP                  :{BLACK}Centrer skærmen over køretøjets lokalitet
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}Send køretøjet til værksted. CTRL+klik vil kun servicere
 STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP                   :{BLACK}Tving køretøjet til at vende
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Vis køretøjets detaljer
-STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Køretøjer - klik på et køretøj for mere information
-STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}Byg nyt køretøj
-STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}Træk køretøjet herhen for at sælge
-STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}Centrer skærmen over værkstedets lokalitet
-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_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})
 
-STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Giv køretøjet et navn
-STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Kan ikke give køretøjet et navn...
-STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Giv køretøjet et navn
 STR_NEWS_FIRST_BUS_ARRIVAL                                      :{BLACK}{BIGFONT}Indbyggerne fester . . .{}Første bus ankommer til {STATION}!
 STR_NEWS_FIRST_TRUCK_ARRIVAL                                    :{BLACK}{BIGFONT}Indbyggerne fester . . .{}Første lastbil ankommer til {STATION}!
 STR_NEWS_FIRST_PASSENGER_TRAM_ARRIVAL                           :{BLACK}{BIGFONT}Indbyggerne fester . . .{}Første passager-sporvogn ankommer til {STATION}!
@@ -2888,128 +2790,39 @@ STR_NEWS_FIRST_CARGO_TRAM_ARRIVAL                               :{BLACK}{BIGFONT
 STR_NEWS_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Lastbil forulykket!{}Chauffør dør i flammerne efter sammenstød med tog
 STR_NEWS_ROAD_VEHICLE_CRASH                                     :{BLACK}{BIGFONT}Bus forulykket!{}{COMMA} dør i flammerne efter kollision med et tog
 STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}Tillader ikke køretøjer at vende om...
-STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Omdøb
-STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Omdøb køretøjstypen
-STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Omdøb køretøjstypen
-STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Kan ikke omdøbe køretøjstypen...
 
-STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Ombyg vejkøretøj til at laste en anden type last
-STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Ombyg lastbil
-STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Ombyg vejkøretøjet til at laste den markerede type last
-STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Kan ikke ombygge vejkøretøj
-STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Vælg lasttype som lastbilen skal transportere
 
 ##id 0x9800
 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :Bygning af vandveje
 STR_WATERWAYS_TOOLBAR_CAPTION                                   :{WHITE}Bygning af vandveje
 STR_WATERWAYS_TOOLBAR_CAPTION_SE                                :{WHITE}Vandveje
 STR_ERROR_CAN_T_BUILD_DOCK_HERE                                 :{WHITE}Kan ikke bygge en havn her...
-STR_DEPOT_SHIP_CAPTION                                          :{WHITE}{TOWN} skibsdok
-STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON                              :{BLACK}Nye skibe
-STR_BUILD_VEHICLE_SHIP_CAPTION                                  :{WHITE}Nye skibe
-STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON                     :{BLACK}Byg skib
-STR_CLONE_SHIP                                                  :{BLACK}Klon skib
-STR_CLONE_SHIP_INFO                                             :{BLACK}Dette vil bygge en kopi af skibet. CTRL-klik vil dele ordrer
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Dette vil bygge en kopi af skibet. Klik på denne knap så, på et skib indeni eller udenfor dokken. CTRL-klik vil dele ordrer
 STR_ERROR_SHIP_MUST_BE_STOPPED_IN_DEPOT                         :{WHITE}Skibet skal være stoppet i dok
-STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}Kan ikke sælge skibet...
-STR_ERROR_CAN_T_BUILD_SHIP                                      :{WHITE}Kan ikke bygge skibet...
-STR_ERROR_SHIP_IN_THE_WAY                                       :{WHITE}Der er et skib i vejen
-STR_ERROR_CAN_T_STOP_START_SHIP                                 :{WHITE}Kan ikke stoppe/starte skibet...
-STR_ERROR_CAN_T_SEND_SHIP_TO_DEPOT                              :{WHITE}Kan ikke sende skibet til dok...
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Sejler til {TOWN} skibsdok
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Sejler til {TOWN} skibsdok, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Service i {TOWN} skibsdok
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Service i {TOWN} skibsdok, {VELOCITY}
-STR_NEWS_SHIP_IS_WAITING                                        :{WHITE}{VEHICLE} venter i skibsdokken
 STR_WATERWAYS_TOOLBAR_BUILD_DOCK_TOOLTIP                        :{BLACK}Byg havn
 STR_WATERWAYS_TOOLBAR_BUILD_DEPOT_TOOLTIP                       :{BLACK}Byg skibsdok (til bygning og servicering af skibe)
-STR_DEPOT_SHIP_LIST_TOOLTIP                                     :{BLACK}Skibe - klik på et skib for information
-STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}Byg nyt skib
-STR_DEPOT_SHIP_SELL_TOOLTIP                                     :{BLACK}Træk det her for at sælge det
-STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}Centrer skærmen over skibsdokkens lokalitet
-STR_BUILD_VEHICLE_SHIP_LIST_TOOLTIP                             :{BLACK}Skibstypeliste - klik på skibstype for information
-STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP                    :{BLACK}Byg det markerede skib
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP                  :{BLACK}Nuværende opførsel - klik her for at starte/stoppe skibet
-STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Vis skibets ordrer
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP                          :{BLACK}Centrer skærmen over skibets lokalitet
-STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}Send skibet til dok. CTRL+klik vil kun servicere
-STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Vis detaljer omkring skibet
-STR_VEHICLE_DETAILS_SHIP_RENAME                                 :{BLACK}Giv skibet et navn
 
-STR_QUERY_RENAME_SHIP_CAPTION                                   :{WHITE}Giv skibet et navn
-STR_ERROR_CAN_T_RENAME_SHIP                                     :{WHITE}Kan ikke give skibet et navn...
 STR_NEWS_FIRST_SHIP_ARRIVAL                                     :{BLACK}{BIGFONT}Indbyggerne fester . . .{}Første skib ankommer til {STATION}!
 STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}Positionsbøje, kan bruges som yderligere navigationspunkt
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}Kan ikke placere en bøje her...
 STR_BUILD_AQUEDUCT                                              :{BLACK}Byg akvædukt
 STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}Kan ikke bygge akvædukt her...
-STR_BUILD_VEHICLE_SHIP_RENAME_BUTTON                            :{BLACK}Omdøb
-STR_BUILD_VEHICLE_SHIP_RENAME_TOOLTIP                           :{BLACK}Omdøb skibstypen
-STR_QUERY_RENAME_SHIP_TYPE_CAPTION                              :{WHITE}Omdøb skibstypen
-STR_ERROR_CAN_T_RENAME_SHIP_TYPE                                :{WHITE}Kan ikke omdøbe skibstypen...
-STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}Ombyg skibet til at sejle med en anden slags last
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (Ombyg)
-STR_REFIT_SHIP_REFIT_BUTTON                                     :{BLACK}Ombyg skibet
-STR_REFIT_SHIP_LIST_TOOLTIP                                     :{BLACK}Vælg den slags last skibet skal sejle med
-STR_REFIT_SHIP_REFIT_TOOLTIP                                    :{BLACK}Ombyg skibet til den markerede slags last
 STR_REFIT_TITLE                                                 :{GOLD}Vælg den lasttype der skal transporteres:
 STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}Ny kapacitet: {GOLD}{CARGO}{}{BLACK}Pris for ombyggelse: {GOLD}{CURRENCY}
-STR_ERROR_CAN_T_REFIT_SHIP                                      :{WHITE}Kan ikke ombygge skib...
 STR_REFITTABLE                                                  :(kan ombygges)
 
 ##id 0xA000
 STR_TOOLBAR_AIRCRAFT_CAPTION                                    :{WHITE}Lufthavne
 STR_ERROR_CAN_T_BUILD_AIRPORT_HERE                              :{WHITE}Kan ikke bygge en lufthavn her...
-STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}{STATION} flyhangar
-STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON                          :{BLACK}Nyt fly
-STR_CLONE_AIRCRAFT                                              :{BLACK}Klon fly
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Dette vil bygge en kopi af et fly. CTRL-klik vil dele ordrer
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Dette vil bygge en kopi af et fly. Klik på denne knap, så på et fly indeni eller udenfor hangaren. CTRL-klik vil dele ordrer
-STR_BUILD_VEHICLE_AIRCRAFT_CAPTION                              :{WHITE}Nyt fly
-STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON                 :{BLACK}Byg et fly
-STR_ERROR_CAN_T_BUILD_AIRCRAFT                                  :{WHITE}Kan ikke bygge fly...
-STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR                         :{WHITE}Kan ikke sende flyet til en hangar...
-STR_HEADING_FOR_HANGAR                                          :{ORANGE}Flyver til {STATION} hangar
-STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Flyver til {STATION} hangar, {VELOCITY}
-STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Service i {STATION} hangar
-STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Service i {STATION} hangar, {VELOCITY}
-STR_NEWS_AIRCRAFT_IS_WAITING                                    :{WHITE}{VEHICLE} venter i hangaren
-STR_ERROR_AIRCRAFT_IN_THE_WAY                                   :{WHITE}Fly i vejen
-STR_ERROR_CAN_T_STOP_START_AIRCRAFT                             :{WHITE}Kan ikke stoppe/starte fly...
 STR_ERROR_AIRCRAFT_IS_IN_FLIGHT                                 :{WHITE}Flyet er i luften
 STR_ERROR_AIRCRAFT_MUST_BE_STOPPED                              :{WHITE}Flyet skal være stoppet i en hangar
-STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}Kan ikke sælge flyet...
 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION                          :Lufthavnskonstruktion
 STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Byg en lufthavn
-STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Fly - klik på et fly for information
-STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}Byg nyt fly
-STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}Træk fly her hen for at sælge
-STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Centrer skærmen over hangarens lokalitet
-STR_BUILD_VEHICLE_AIRCRAFT_LIST_TOOLTIP                         :{BLACK}Flytypeliste - klik på en flytype for mere information
-STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_TOOLTIP                :{BLACK}Byg det markerede fly
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP              :{BLACK}Nuværende opførsel - klik her for at starte/stoppe flyet
-STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Vis flyets ordrer
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP                      :{BLACK}Centrer skærmen over flyets lokalitet
-STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}Send flyet til en hangar. CTRL+klik vil kun servicere
-STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Vis detaljet omkring flyet
 
-STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}Navngiv flyet
-STR_ERROR_CAN_T_RENAME_AIRCRAFT                                 :{WHITE}Kan ikke navngive flyet...
-STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}Navngiv flyet
 STR_NEWS_FIRST_AIRCRAFT_ARRIVAL                                 :{BLACK}{BIGFONT}Indbyggerne fester . . .{}Første fly ankommer til {STATION}!
 STR_NEWS_AIRCRAFT_CRASH                                         :{BLACK}{BIGFONT}Flystyrt!{}{COMMA} dør i flammerne ved {STATION}
 STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Flystyrt!{}Fly løb tør for brændstof, {COMMA} døde i ildhelvede!
 STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
-STR_BUILD_VEHICLE_AIRCRAFT_RENAME_BUTTON                        :{BLACK}Omdøb
-STR_BUILD_VEHICLE_AIRCRAFT_RENAME_TOOLTIP                       :{BLACK}Ømdøb flytypen
-STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION                          :{WHITE}Ømdøb flytypen
-STR_ERROR_CAN_T_RENAME_AIRCRAFT_TYPE                            :{WHITE}Kan ikke omdøbe flytypen...
-STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Ombyg flyet til at flyve med en anden slags last
-STR_REFIT_AIRCRAFT_REFIT_BUTTON                                 :{BLACK}Ombyg fly
-STR_REFIT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Vælg den type last flyet skal flyve med
-STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}Ombyg flyet til at flyve med den markerede slags last
-STR_ERROR_CAN_T_REFIT_AIRCRAFT                                  :{WHITE}Kan ikke ombygge fly...
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Køreplan)
 
@@ -3177,6 +2990,211 @@ STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING}
 STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}Delte ordrer af {COMMA} transportmid{P del ler}
 STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Vis alle transportmidler, der deler denne ruteplan
 
+STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} venter i remisen
+STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} venter på værkstedet
+STR_NEWS_SHIP_IS_WAITING                                        :{WHITE}{VEHICLE} venter i skibsdokken
+STR_NEWS_AIRCRAFT_IS_WAITING                                    :{WHITE}{VEHICLE} venter i hangaren
+
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Ombyg toget
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Ombyg lastbil
+STR_REFIT_SHIP_REFIT_BUTTON                                     :{BLACK}Ombyg skibet
+STR_REFIT_AIRCRAFT_REFIT_BUTTON                                 :{BLACK}Ombyg fly
+
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Ombyg toget til at køre med den markerede lasttype
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Ombyg vejkøretøjet til at laste den markerede type last
+STR_REFIT_SHIP_REFIT_TOOLTIP                                    :{BLACK}Ombyg skibet til den markerede slags last
+STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}Ombyg flyet til at flyve med den markerede slags last
+
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Vælg den lasttype toget skal kører med
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Vælg lasttype som lastbilen skal transportere
+STR_REFIT_SHIP_LIST_TOOLTIP                                     :{BLACK}Vælg den slags last skibet skal sejle med
+STR_REFIT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Vælg den type last flyet skal flyve med
+
+STR_DEPOT_TRAIN_CAPTION                                         :{WHITE}{TOWN} remise
+STR_DEPOT_ROAD_VEHICLE_CAPTION                                  :{WHITE}{TOWN} værksted
+STR_DEPOT_SHIP_CAPTION                                          :{WHITE}{TOWN} skibsdok
+STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}{STATION} flyhangar
+
+STR_VEHICLE_DETAILS_TRAIN_RENAME                                :{BLACK}Giv toget et navn
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Giv køretøjet et navn
+STR_VEHICLE_DETAILS_SHIP_RENAME                                 :{BLACK}Giv skibet et navn
+STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}Navngiv flyet
+
+STR_QUERY_RENAME_TRAIN_CAPTION                                  :{WHITE}Giv toget et navn
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Giv køretøjet et navn
+STR_QUERY_RENAME_SHIP_CAPTION                                   :{WHITE}Giv skibet et navn
+STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}Navngiv flyet
+
+STR_ERROR_TRAIN_IN_THE_WAY                                      :{WHITE}Tog i vejen
+STR_ERROR_ROAD_VEHICLE_IN_THE_WAY                               :{WHITE}Køretøj i vejen
+STR_ERROR_SHIP_IN_THE_WAY                                       :{WHITE}Der er et skib i vejen
+STR_ERROR_AIRCRAFT_IN_THE_WAY                                   :{WHITE}Fly i vejen
+
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Kan ikke ombygge toget...
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Kan ikke ombygge vejkøretøj
+STR_ERROR_CAN_T_REFIT_SHIP                                      :{WHITE}Kan ikke ombygge skib...
+STR_ERROR_CAN_T_REFIT_AIRCRAFT                                  :{WHITE}Kan ikke ombygge fly...
+
+STR_ERROR_CAN_T_RENAME_TRAIN                                    :{WHITE}Kan ikke give toget navn...
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Kan ikke give køretøjet et navn...
+STR_ERROR_CAN_T_RENAME_SHIP                                     :{WHITE}Kan ikke give skibet et navn...
+STR_ERROR_CAN_T_RENAME_AIRCRAFT                                 :{WHITE}Kan ikke navngive flyet...
+
+STR_ERROR_CAN_T_STOP_START_TRAIN                                :{WHITE}Kan ikke stoppe/starte toget...
+STR_ERROR_CAN_T_STOP_START_ROAD_VEHICLE                         :{WHITE}Kan ikke stoppe/starte køretøj...
+STR_ERROR_CAN_T_STOP_START_SHIP                                 :{WHITE}Kan ikke stoppe/starte skibet...
+STR_ERROR_CAN_T_STOP_START_AIRCRAFT                             :{WHITE}Kan ikke stoppe/starte fly...
+
+STR_ERROR_CAN_T_SEND_TRAIN_TO_DEPOT                             :{WHITE}Kan ikke sende toget til remise...
+STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Kan ikke sende køretøj til værksted...
+STR_ERROR_CAN_T_SEND_SHIP_TO_DEPOT                              :{WHITE}Kan ikke sende skibet til dok...
+STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR                         :{WHITE}Kan ikke sende flyet til en hangar...
+
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Kan ikke bygge jernbanekøretøj...
+STR_ERROR_CAN_T_BUILD_ROAD_VEHICLE                              :{WHITE}Kan ikke bygge køretøj...
+STR_ERROR_CAN_T_BUILD_SHIP                                      :{WHITE}Kan ikke bygge skibet...
+STR_ERROR_CAN_T_BUILD_AIRCRAFT                                  :{WHITE}Kan ikke bygge fly...
+
+STR_ERROR_CAN_T_RENAME_TRAIN_TYPE                               :{WHITE}Kan ikke omdøbe tog-/togvognstypen...
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Kan ikke omdøbe køretøjstypen...
+STR_ERROR_CAN_T_RENAME_SHIP_TYPE                                :{WHITE}Kan ikke omdøbe skibstypen...
+STR_ERROR_CAN_T_RENAME_AIRCRAFT_TYPE                            :{WHITE}Kan ikke omdøbe flytypen...
+
+STR_ERROR_CAN_T_SELL_TRAIN                                      :{WHITE}Kan ikke sælge jernbanekøretøjet...
+STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}Kan ikke sælge køretøj...
+STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}Kan ikke sælge skibet...
+STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}Kan ikke sælge flyet...
+
+STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP                 :{BLACK}Nuværende opførsel - klik her for at starte/stoppe toget
+STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP          :{BLACK}Nuværende opførsel - klik her for at stoppe/starte køretøjet
+STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP                  :{BLACK}Nuværende opførsel - klik her for at starte/stoppe skibet
+STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP              :{BLACK}Nuværende opførsel - klik her for at starte/stoppe flyet
+
+STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP                           :{BLACK}Vis togets ordrer
+STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP                    :{BLACK}Vis køretøjets ordrer
+STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Vis skibets ordrer
+STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Vis flyets ordrer
+
+STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP                         :{BLACK}Centrer skærmen over togets lokalitet
+STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP                  :{BLACK}Centrer skærmen over køretøjets lokalitet
+STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP                          :{BLACK}Centrer skærmen over skibets lokalitet
+STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP                      :{BLACK}Centrer skærmen over flyets lokalitet
+
+STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP                    :{BLACK}Send toget til remise. CTRL+klik vil kun servicere
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}Send køretøjet til værksted. CTRL+klik vil kun servicere
+STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}Send skibet til dok. CTRL+klik vil kun servicere
+STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}Send flyet til en hangar. CTRL+klik vil kun servicere
+
+STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Vis detaljer om toget
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Vis køretøjets detaljer
+STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Vis detaljer omkring skibet
+STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Vis detaljet omkring flyet
+
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Ombyg toget til at køre med en anden lasttype
+STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Ombyg vejkøretøj til at laste en anden type last
+STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}Ombyg skibet til at sejle med en anden slags last
+STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Ombyg flyet til at flyve med en anden slags last
+
+STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Kører til {TOWN} remise
+STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Kører til {TOWN} remise, {VELOCITY}
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Kører til {TOWN} værksted
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Kører til {TOWN} værksted, {VELOCITY}
+STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Sejler til {TOWN} skibsdok
+STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Sejler til {TOWN} skibsdok, {VELOCITY}
+STR_HEADING_FOR_HANGAR                                          :{ORANGE}Flyver til {STATION} hangar
+STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Flyver til {STATION} hangar, {VELOCITY}
+
+STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Service i {TOWN} remise
+STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Service i {TOWN} remise, {VELOCITY}
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Service på {TOWN} værksted
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Service på {TOWN} værksted, {VELOCITY}
+STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Service i {TOWN} skibsdok
+STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Service i {TOWN} skibsdok, {VELOCITY}
+STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Service i {STATION} hangar
+STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Service i {STATION} hangar, {VELOCITY}
+
+
+STR_CLONE_TRAIN                                                 :{BLACK}Klon tog
+STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Klon køretøj
+STR_CLONE_SHIP                                                  :{BLACK}Klon skib
+STR_CLONE_AIRCRAFT                                              :{BLACK}Klon fly
+
+STR_CLONE_TRAIN_INFO                                            :{BLACK}Dette vil bygge en kopi af toget inklusiv alle vogne. CTRL-klik vil dele ordrer
+STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Dette vil bygge en kopi af vejkøretøjet. CTRL-klik vil dele ordrer
+STR_CLONE_SHIP_INFO                                             :{BLACK}Dette vil bygge en kopi af skibet. CTRL-klik vil dele ordrer
+STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Dette vil bygge en kopi af et fly. CTRL-klik vil dele ordrer
+
+STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Dette vil bygge en kopi af toget inklusiv alle vogne. Klik på denne knap, så på et tog indeni eller udenfor remisen. CTRL-klik vil dele ordrer
+STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Dette vil bygge en kopi af køretøjet. Klik på denne knap, så på et køretøj indeni eller udenfor værkstedet. CTRL-klik vil dele ordrer
+STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Dette vil bygge en kopi af skibet. Klik på denne knap så, på et skib indeni eller udenfor dokken. CTRL-klik vil dele ordrer
+STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Dette vil bygge en kopi af et fly. Klik på denne knap, så på et fly indeni eller udenfor hangaren. CTRL-klik vil dele ordrer
+
+STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}Nye jernbanekøretøjer
+STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}Nyt elektrisk lokomotiv
+STR_BUILD_VEHICLE_TRAIN_MONORAIL_CAPTION                        :{WHITE}Nye monorailkøretøjer
+STR_BUILD_VEHICLE_TRAIN_MAGLEV_CAPTION                          :{WHITE}Nye magnetskinnekøretøjer
+
+STR_BUILD_VEHICLE_TRAIN_ALL_CAPTION                             :{WHITE}Jernbanekøretøjer
+STR_BUILD_VEHICLE_ROAD_VEHICLE_CAPTION                          :{WHITE}Nye køretøjer
+STR_BUILD_VEHICLE_SHIP_CAPTION                                  :{WHITE}Nye skibe
+STR_BUILD_VEHICLE_AIRCRAFT_CAPTION                              :{WHITE}Nyt fly
+
+STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_BUTTON                    :{BLACK}Byg køretøj
+STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_BUTTON             :{BLACK}Byg køretøj
+STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON                     :{BLACK}Byg skib
+STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON                 :{BLACK}Byg et fly
+
+STR_BUILD_VEHICLE_TRAIN_LIST_TOOLTIP                            :{BLACK}Togvalgsliste - klik på et køretøj for mere information
+STR_BUILD_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP                     :{BLACK}Liste over køretøjstyper - klik på køretøj for information
+STR_BUILD_VEHICLE_SHIP_LIST_TOOLTIP                             :{BLACK}Skibstypeliste - klik på skibstype for information
+STR_BUILD_VEHICLE_AIRCRAFT_LIST_TOOLTIP                         :{BLACK}Flytypeliste - klik på en flytype for mere information
+
+STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_TOOLTIP                   :{BLACK}Byg det markerede lokomotiv/togvogn
+STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_TOOLTIP            :{BLACK}Byg det markerede køretøj
+STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP                    :{BLACK}Byg det markerede skib
+STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_TOOLTIP                :{BLACK}Byg det markerede fly
+
+STR_BUILD_VEHICLE_TRAIN_RENAME_BUTTON                           :{BLACK}Omdøb
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Omdøb
+STR_BUILD_VEHICLE_SHIP_RENAME_BUTTON                            :{BLACK}Omdøb
+STR_BUILD_VEHICLE_AIRCRAFT_RENAME_BUTTON                        :{BLACK}Omdøb
+
+STR_BUILD_VEHICLE_TRAIN_RENAME_TOOLTIP                          :{BLACK}Omdøb tog-/togvognstypen
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Omdøb køretøjstypen
+STR_BUILD_VEHICLE_SHIP_RENAME_TOOLTIP                           :{BLACK}Omdøb skibstypen
+STR_BUILD_VEHICLE_AIRCRAFT_RENAME_TOOLTIP                       :{BLACK}Ømdøb flytypen
+
+STR_QUERY_RENAME_TRAIN_TYPE_CAPTION                             :{WHITE}Omdøb tog-/togvognstypen
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Omdøb køretøjstypen
+STR_QUERY_RENAME_SHIP_TYPE_CAPTION                              :{WHITE}Omdøb skibstypen
+STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION                          :{WHITE}Ømdøb flytypen
+
+STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Nye køretøjer
+STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_BUTTON                      :{BLACK}Nye køretøjer
+STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON                              :{BLACK}Nye skibe
+STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON                          :{BLACK}Nyt fly
+
+STR_DEPOT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Tog - klik på et tog for information., træk vogn/lokomotiv for at fjerne/tilføje det til toget
+STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Køretøjer - klik på et køretøj for mere information
+STR_DEPOT_SHIP_LIST_TOOLTIP                                     :{BLACK}Skibe - klik på et skib for information
+STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Fly - klik på et fly for information
+
+STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP                            :{BLACK}Byg nyt tog/togvogn
+STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}Byg nyt køretøj
+STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}Byg nyt skib
+STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}Byg nyt fly
+
+STR_DEPOT_TRAIN_SELL_TOOLTIP                                    :{BLACK}Træk tog/togvogn her hen for at sælge
+STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}Træk køretøjet herhen for at sælge
+STR_DEPOT_SHIP_SELL_TOOLTIP                                     :{BLACK}Træk det her for at sælge det
+STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}Træk fly her hen for at sælge
+
+STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}Centrer skærmen over remisens lokalitet
+STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}Centrer skærmen over værkstedets lokalitet
+STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}Centrer skærmen over skibsdokkens lokalitet
+STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Centrer skærmen over hangarens lokalitet
+
+
 ### depot strings
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}Du er ved at sælge alle køretøjer i depotet. Er du sikker?
 STR_DEPOT_WRONG_DEPOT_TYPE                                      :Forkert depottype
@@ -3211,6 +3229,7 @@ STR_REPLACE_REMOVE_WAGON                                        :{BLACK}Fjern vo
 STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Få autoudskift til at bevare længden af tog ved at fjerne vogne (startende fra fronten), hvis autoudskiftningen gør toget længere.
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}Udskifter: {ORANGE}{SKIP}{SKIP}{STRING}
 STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}Skift imellem lokomotiv- og vogn-udskiftningsvindue
+
 STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Tog er ikke tilgængeligt
 STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Vejkøretøj er ikke tilgængeligt
 STR_SHIP_NOT_AVAILABLE                                          :{WHITE}Skib er ikke tilgængeligt
@@ -3425,7 +3444,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}
@@ -3443,6 +3465,31 @@ STR_FORMAT_COMPANY_NUM                                          :(Firma {COMMA})
 STR_FORMAT_GROUP_NAME                                           :Gruppe {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}Navnet skal være unikt
 
 #### Improved sign GUI
diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt
index 99e64e4bd..35ee17f0e 100644
--- a/src/lang/dutch.txt
+++ b/src/lang/dutch.txt
@@ -154,8 +154,6 @@ STR_ABBREV_PLASTIC                                              :{TINYFONT}PL
 STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}FR
 STR_ABBREV_NONE                                                 :{TINYFONT}NEE
 STR_ABBREV_ALL                                                  :{TINYFONT}ALLES
-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
@@ -167,17 +165,11 @@ STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Originel
 STR_ABOUT_VERSION                                               :{BLACK}OpenTTD versie {REV}
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 Het OpenTTD team
 
-STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
-STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_QUIT_CAPTION                                                :{WHITE}Afsluiten
 STR_YES                                                         :{BLACK}Ja
 STR_NO                                                          :{BLACK}Nee
 STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Weet je zeker dat je dit spel wilt verlaten en terug wilt keren naar {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                                                :Niets
 STR_COLOUR_DARK_BLUE                                            :Donkerblauw
 STR_COLOUR_PALE_GREEN                                           :Lichtgroen
@@ -196,8 +188,6 @@ STR_COLOUR_BROWN                                                :Bruin
 STR_COLOUR_GREY                                                 :Grijs
 STR_COLOUR_WHITE                                                :Wit
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}Te veel voertuigen in het spel
-STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
-STR_RED_COMMA                                                   :{RED}{COMMA}
 STR_BUTTON_LOCATION                                             :{BLACK}Locatie
 STR_SMALLMAP_TYPE_CONTOURS                                      :Contouren
 STR_SMALLMAP_TYPE_VEHICLES                                      :Voertuigen
@@ -323,12 +313,13 @@ STR_SORT_CRITERIA_TIP                                           :{BLACK}Selectee
 STR_FILTER_CRITERIA_TIP                                         :{BLACK}Kies filter criteria
 STR_SORT_BY                                                     :{BLACK}Sorteer op
 
+### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}Inwoners
+STR_SORT_BY_NAME                                                :{BLACK}Naam
+STR_SORT_BY_DATE                                                :{BLACK}Datum
 STR_SORT_BY_PRODUCTION                                          :Productie
 STR_SORT_BY_TYPE                                                :Soort
 STR_SORT_BY_TRANSPORTED                                         :Vervoerd
-STR_SORT_BY_NAME                                                :{BLACK}Naam
-STR_SORT_BY_DATE                                                :{BLACK}Datum
 STR_SORT_BY_NUMBER                                              :Nummer
 STR_SORT_BY_PROFIT_LAST_YEAR                                    :Winst vorig jaar
 STR_SORT_BY_PROFIT_THIS_YEAR                                    :Winst dit jaar
@@ -351,6 +342,7 @@ STR_SORT_BY_INTRO_DATE                                          :Introductie Dat
 STR_SORT_BY_RUNNING_COST                                        :Operatie kosten
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :Kracht/Operatie kosten
 STR_SORT_BY_CARGO_CAPACITY                                      :Vracht capaciteit
+
 STR_NO_WAITING_CARGO                                            :{BLACK}Er wacht geen vracht van enig type
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}Kies alle faciliteiten
 STR_SELECT_ALL_TYPES                                            :{BLACK}Kies alle vrachttypen (inclusief niet wachtende vracht)
@@ -370,21 +362,6 @@ STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Stuur naar depo
 STR_SEND_SHIP_TO_DEPOT                                          :Stuur naar depot
 STR_SEND_AIRCRAFT_TO_HANGAR                                     :Stuur naar hangar
 
-############ range for months starts
-STR_MONTH_ABBREV_JAN                                            :Jan
-STR_MONTH_ABBREV_FEB                                            :Feb
-STR_MONTH_ABBREV_MAR                                            :Mrt
-STR_MONTH_ABBREV_APR                                            :Apr
-STR_MONTH_ABBREV_MAY                                            :Mei
-STR_MONTH_ABBREV_JUN                                            :Jun
-STR_MONTH_ABBREV_JUL                                            :Jul
-STR_MONTH_ABBREV_AUG                                            :Aug
-STR_MONTH_ABBREV_SEP                                            :Sep
-STR_MONTH_ABBREV_OCT                                            :Okt
-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}{STRING}-
@@ -411,8 +388,6 @@ 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_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
@@ -459,7 +434,7 @@ STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Geen
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Naam
 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                                          :1
 STR_ORDINAL_NUMBER_2ND                                          :2
 STR_ORDINAL_NUMBER_3RD                                          :3
@@ -493,6 +468,34 @@ STR_ORDINAL_NUMBER_30TH                                         :30
 STR_ORDINAL_NUMBER_31ST                                         :31
 ############ range for days ends
 
+############ range for months starts
+STR_MONTH_ABBREV_JAN                                            :Jan
+STR_MONTH_ABBREV_FEB                                            :Feb
+STR_MONTH_ABBREV_MAR                                            :Mrt
+STR_MONTH_ABBREV_APR                                            :Apr
+STR_MONTH_ABBREV_MAY                                            :Mei
+STR_MONTH_ABBREV_JUN                                            :Jun
+STR_MONTH_ABBREV_JUL                                            :Jul
+STR_MONTH_ABBREV_AUG                                            :Aug
+STR_MONTH_ABBREV_SEP                                            :Sep
+STR_MONTH_ABBREV_OCT                                            :Okt
+STR_MONTH_ABBREV_NOV                                            :Nov
+STR_MONTH_ABBREV_DEC                                            :Dec
+
+STR_MONTH_JAN                                                   :Januari
+STR_MONTH_FEB                                                   :Februari
+STR_MONTH_MAR                                                   :Maart
+STR_MONTH_APR                                                   :April
+STR_MONTH_MAY                                                   :Mei
+STR_MONTH_JUN                                                   :Juni
+STR_MONTH_JUL                                                   :Juli
+STR_MONTH_AUG                                                   :Augustus
+STR_MONTH_SEP                                                   :September
+STR_MONTH_OCT                                                   :Oktober
+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}Geaccepteerde goederen: {LTBLUE}
@@ -582,12 +585,9 @@ 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_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_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
@@ -669,9 +669,7 @@ STR_OFF                                                         :Uit
 STR_SUMMARY                                                     :Kort
 STR_FULL                                                        :Volledig
 STR_STATUSBAR_COMPANY_NAME                                      :{SILVER}- -  {COMPANY}  - -
-STR_BLACK_STRING                                                :{BLACK}{STRING}
 
-STR_JUST_CHECKMARK                                              :{CHECKMARK}
 ############ range for menu starts
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Spelopties
 STR_SETTINGS_MENU_DIFFICULTY_SETTINGS                           :Moeilijkheidsgraad
@@ -776,9 +774,6 @@ 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_BLACK_6                                                     :{BLACK}6
-STR_BLACK_7                                                     :{BLACK}7
-
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Engels (Origineel)
 STR_TOWNNAME_FRENCH                                             :Frans
@@ -858,19 +853,6 @@ STR_OPTIONS_BASE_GRF_DESCRIPTION_TIP                            :{BLACK}Aanvulle
 
 STR_AUTOSAVE_FAILED                                             :{WHITE}Automatisch opslaan mislukt
 
-STR_MONTH_JAN                                                   :Januari
-STR_MONTH_FEB                                                   :Februari
-STR_MONTH_MAR                                                   :Maart
-STR_MONTH_APR                                                   :April
-STR_MONTH_MAY                                                   :Mei
-STR_MONTH_JUN                                                   :Juni
-STR_MONTH_JUL                                                   :Juli
-STR_MONTH_AUG                                                   :Augustus
-STR_MONTH_SEP                                                   :September
-STR_MONTH_OCT                                                   :Oktober
-STR_MONTH_NOV                                                   :November
-STR_MONTH_DEC                                                   :December
-
 STR_HEADING_FOR_STATION                                         :{LTBLUE}Op weg naar {STATION}
 STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}Op weg naar {STATION}, {VELOCITY}
 STR_NO_ORDERS                                                   :{LTBLUE}Geen orders
@@ -885,8 +867,6 @@ STR_CRATES                                                      :kratten
 STR_RES_OTHER                                                   :anders
 STR_NOTHING                                                     :
 
-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...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Einde gedeelde orders - -
@@ -1158,7 +1138,6 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Y-groot
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :uitgeschakeld
-STR_JUST_CURRENCY                                               :{CURRENCY}
 STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Verander waarde
 
 STR_TEMPERATE_LANDSCAPE                                         :gematigd landschap
@@ -2124,8 +2103,6 @@ STR_NUM_LOW                                                     :Laag
 STR_NUM_NORMAL                                                  :Normaal
 STR_NUM_HIGH                                                    :Hoog
 STR_NUM_CUSTOM                                                  :Aangepast
-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
@@ -2806,7 +2783,6 @@ 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_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})
@@ -3147,15 +3123,15 @@ STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Kloon vo
 STR_CLONE_SHIP                                                  :{BLACK}Kloon Schip
 STR_CLONE_AIRCRAFT                                              :{BLACK}Kloon Vliegtuig
 
-STR_CLONE_TRAIN_INFO                                            :{BLACK}Hierdoor wordt een kopie gebouw van deze trein inclusief wagons. Ctrl+klik deelt de orders
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Hierdoor wordt een kopie gebouw van dit voertuig. Ctrl+klik deelt de orders
-STR_CLONE_SHIP_INFO                                             :{BLACK}Hierdoor wordt een kopie gebouw van dit schip. Ctrl+klik deelt de orders
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Hierdoor wordt een kopie gebouw van dit vliegtuig. Ctrl+klik deelt de orders
+STR_CLONE_TRAIN_INFO                                            :{BLACK}Hierdoor wordt een kopie gebouwd van deze trein inclusief wagons. Ctrl+klik deelt de orders
+STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Hierdoor wordt een kopie gebouwd van dit voertuig. Ctrl+klik deelt de orders
+STR_CLONE_SHIP_INFO                                             :{BLACK}Hierdoor wordt een kopie gebouwd van dit schip. Ctrl+klik deelt de orders
+STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Hierdoor wordt een kopie gebouwd van dit vliegtuig. Ctrl+klik deelt de orders
 
 STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Hierdoor wordt een kopie gebouwd van een trein inclusief wagons. Klik op deze knop en dan op een trein binnen of buiten het depot. Ctrl+klik deelt de orders
 STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Hierdoor wordt een kopie gebouwd van een wegvoertuig. Klik op deze knop en dan op een wegvoertuig binnen of buiten het depot. Ctrl+klik deelt de orders
 STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Hierdoor wordt een kopie gebouwd van een schip. Klik op deze knop en dan op een schip binnen of buiten het depot. Ctrl+klik deelt de orders
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Hierdoor wordt een kopie gebouw van een vliegtuig. Klik op deze knop en dan op een vliegtuig binnen of buiten de hangar. Ctrl+klik deelt de orders
+STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Hierdoor wordt een kopie gebouwd van een vliegtuig. Klik op deze knop en dan op een vliegtuig binnen of buiten de hangar. Ctrl+klik deelt de orders
 
 STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}Nieuwe spoorvoertuigen
 STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}Nieuwe elektrische spoorvoertuigen
@@ -3472,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}
@@ -3490,6 +3469,31 @@ STR_FORMAT_COMPANY_NUM                                          :(Bedrijf {COMMA
 STR_FORMAT_GROUP_NAME                                           :Groep {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}Naam moet uniek zijn
 
 #### Improved sign GUI
diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt
index 32b3842bd..8da0436c9 100644
--- a/src/lang/english_US.txt
+++ b/src/lang/english_US.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_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
@@ -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 quit 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                                                 :Gray
 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,12 +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_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
@@ -351,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)
@@ -370,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}{STRING}-
@@ -411,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_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
@@ -459,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
@@ -493,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}
@@ -582,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_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_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
@@ -669,9 +669,7 @@ STR_OFF                                                         :Off
 STR_SUMMARY                                                     :Summary
 STR_FULL                                                        :Full
 STR_STATUSBAR_COMPANY_NAME                                      :{SILVER}- -  {COMPANY}  - -
-STR_BLACK_STRING                                                :{BLACK}{STRING}
 
-STR_JUST_CHECKMARK                                              :{CHECKMARK}
 ############ range for menu starts
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Game options
 STR_SETTINGS_MENU_DIFFICULTY_SETTINGS                           :Difficulty settings
@@ -776,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' program
 
-STR_BLACK_6                                                     :{BLACK}6
-STR_BLACK_7                                                     :{BLACK}7
-
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :English (Original)
 STR_TOWNNAME_FRENCH                                             :French
@@ -858,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
@@ -885,8 +867,6 @@ STR_CRATES                                                      :crates
 STR_RES_OTHER                                                   :other
 STR_NOTHING                                                     :
 
-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...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - End of Shared Orders - -
@@ -1158,7 +1138,6 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Y-size
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :disabled
-STR_JUST_CURRENCY                                               :{CURRENCY}
 STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Change setting value
 
 STR_TEMPERATE_LANDSCAPE                                         :Temperate landscape
@@ -2124,8 +2103,6 @@ STR_NUM_LOW                                                     :Low
 STR_NUM_NORMAL                                                  :Normal
 STR_NUM_HIGH                                                    :High
 STR_NUM_CUSTOM                                                  :Custom
-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
@@ -2806,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_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})
@@ -3472,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}
@@ -3490,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/esperanto.txt b/src/lang/esperanto.txt
index 7d6c89ded..37108817e 100644
--- a/src/lang/esperanto.txt
+++ b/src/lang/esperanto.txt
@@ -155,8 +155,6 @@ STR_ABBREV_PLASTIC                                              :{TINYFONT}PL
 STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}AT
 STR_ABBREV_NONE                                                 :{TINYFONT}NE
 STR_ABBREV_ALL                                                  :{TINYFONT}ĈIU
-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
@@ -168,17 +166,11 @@ STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Origina
 STR_ABOUT_VERSION                                               :{BLACK}OpenTTD-versio {REV}
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 La teamo de OpenTTD
 
-STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
-STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_QUIT_CAPTION                                                :{WHITE}Fermi
 STR_YES                                                         :{BLACK}Jes
 STR_NO                                                          :{BLACK}Ne
 STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Ĉu vi vere volas fermi la ludon kaj reiri al {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                                                :Nenio
 STR_COLOUR_DARK_BLUE                                            :Malhelblua
 STR_COLOUR_PALE_GREEN                                           :Palverda
@@ -197,8 +189,6 @@ STR_COLOUR_BROWN                                                :Bruna
 STR_COLOUR_GREY                                                 :Griza
 STR_COLOUR_WHITE                                                :Blanka
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}Tro da veturiloj en la ludo
-STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
-STR_RED_COMMA                                                   :{RED}{COMMA}
 STR_BUTTON_LOCATION                                             :{BLACK}Loko
 STR_SMALLMAP_TYPE_CONTOURS                                      :Konturoj
 STR_SMALLMAP_TYPE_VEHICLES                                      :Veturiloj
@@ -324,12 +314,13 @@ STR_SORT_CRITERIA_TIP                                           :{BLACK}Elektu o
 STR_FILTER_CRITERIA_TIP                                         :{BLACK}Selektu kriteriojn por filtrado
 STR_SORT_BY                                                     :{BLACK}Ordigu laŭ
 
+### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}Enloĝantaro
+STR_SORT_BY_NAME                                                :{BLACK}Nomo
+STR_SORT_BY_DATE                                                :{BLACK}Dato
 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_DATE                                                :{BLACK}Dato
 STR_SORT_BY_NUMBER                                              :Numero
 STR_SORT_BY_PROFIT_LAST_YEAR                                    :Gajno lastjara
 STR_SORT_BY_PROFIT_THIS_YEAR                                    :Gajno ĉi-jara
@@ -352,37 +343,25 @@ STR_SORT_BY_INTRO_DATE                                          :Enkonduka dato
 STR_SORT_BY_RUNNING_COST                                        :Irkosto
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :Potenco/Irkosto
 STR_SORT_BY_CARGO_CAPACITY                                      :Ŝarĝkapablo
+
 STR_NO_WAITING_CARGO                                            :{BLACK}Nenia ŝarĝo atendas
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}Elektu ĉiujn konstruaĵojn
 STR_SELECT_ALL_TYPES                                            :{BLACK}Elektu ĉiujn ŝarĝotipojn (inkluzive de ne atendanta ŝarĝo)
-STR_AVAILABLE_TRAINS                                            :{BLACK}Haveblaj Trajnoj
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Haveblaj Veturiloj
-STR_AVAILABLE_SHIPS                                             :{BLACK}Haveblaj Ŝipoj
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Haveblaj Aviadiloj
 STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Vidu liston da ĉiuj haveblaj maŝinoj por ĉi tiu veturilspeco.
 STR_MANAGE_LIST                                                 :{BLACK}Manaĝu liston
 STR_MANAGE_LIST_TIP                                             :{BLACK}Sendu instrukciojn al ĉiuj veturiloj en la listo
 STR_REPLACE_VEHICLES                                            :Anstataŭu veturilojn
+STR_SEND_FOR_SERVICING                                          :Sendu por Prizorgo
+
+STR_AVAILABLE_TRAINS                                            :{BLACK}Haveblaj Trajnoj
+STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Haveblaj Veturiloj
+STR_AVAILABLE_SHIPS                                             :{BLACK}Haveblaj Ŝipoj
+STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Haveblaj Aviadiloj
+
 STR_SEND_TRAIN_TO_DEPOT                                         :Sendu al Deponejo
 STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Sendu al Deponejo
 STR_SEND_SHIP_TO_DEPOT                                          :Sendu al Deponejo
 STR_SEND_AIRCRAFT_TO_HANGAR                                     :Sendu al Hangaro
-STR_SEND_FOR_SERVICING                                          :Sendu por Prizorgo
-
-############ 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                                            :Maj
-STR_MONTH_ABBREV_JUN                                            :Jun
-STR_MONTH_ABBREV_JUL                                            :Jul
-STR_MONTH_ABBREV_AUG                                            :Aug
-STR_MONTH_ABBREV_SEP                                            :Sep
-STR_MONTH_ABBREV_OCT                                            :Okt
-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}
@@ -410,8 +389,6 @@ 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_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
@@ -458,7 +435,7 @@ STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Neniu
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Nomo
 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                                          :1a de
 STR_ORDINAL_NUMBER_2ND                                          :2a de
 STR_ORDINAL_NUMBER_3RD                                          :3a de
@@ -492,6 +469,34 @@ STR_ORDINAL_NUMBER_30TH                                         :30a de
 STR_ORDINAL_NUMBER_31ST                                         :31a de
 ############ 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                                            :Maj
+STR_MONTH_ABBREV_JUN                                            :Jun
+STR_MONTH_ABBREV_JUL                                            :Jul
+STR_MONTH_ABBREV_AUG                                            :Aug
+STR_MONTH_ABBREV_SEP                                            :Sep
+STR_MONTH_ABBREV_OCT                                            :Okt
+STR_MONTH_ABBREV_NOV                                            :Nov
+STR_MONTH_ABBREV_DEC                                            :Dec
+
+STR_MONTH_JAN                                                   :Januaro
+STR_MONTH_FEB                                                   :Februaro
+STR_MONTH_MAR                                                   :Marto
+STR_MONTH_APR                                                   :Aprilo
+STR_MONTH_MAY                                                   :Majo
+STR_MONTH_JUN                                                   :Junio
+STR_MONTH_JUL                                                   :Julio
+STR_MONTH_AUG                                                   :Aŭgusto
+STR_MONTH_SEP                                                   :Septembro
+STR_MONTH_OCT                                                   :Oktobro
+STR_MONTH_NOV                                                   :Novembro
+STR_MONTH_DEC                                                   :Decembro
+############ range for months ends
+
 STR_GRAPH_Y_LABEL_NUMBER                                        :{TINYFONT}{COMMA}
 
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}Ŝarĝo akceptata: {LTBLUE}
@@ -581,12 +586,9 @@ 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_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_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
@@ -668,9 +670,7 @@ STR_OFF                                                         :Ne
 STR_SUMMARY                                                     :Resume
 STR_FULL                                                        :Plene
 STR_STATUSBAR_COMPANY_NAME                                      :{SILVER}- -  {COMPANY}  - -
-STR_BLACK_STRING                                                :{BLACK}{STRING}
 
-STR_JUST_CHECKMARK                                              :{CHECKMARK}
 ############ range for menu starts
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Ludaj opcioj
 STR_SETTINGS_MENU_DIFFICULTY_SETTINGS                           :Malfacilec-agordoj
@@ -775,9 +775,6 @@ 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_BLACK_6                                                     :{BLACK}6
-STR_BLACK_7                                                     :{BLACK}7
-
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Angle (Origine)
 STR_TOWNNAME_FRENCH                                             :France
@@ -857,19 +854,6 @@ STR_OPTIONS_BASE_GRF_DESCRIPTION_TIP                            :{BLACK}Aldonaj
 
 STR_AUTOSAVE_FAILED                                             :{WHITE}Fiaskis aŭtomate konservi
 
-STR_MONTH_JAN                                                   :Januaro
-STR_MONTH_FEB                                                   :Februaro
-STR_MONTH_MAR                                                   :Marto
-STR_MONTH_APR                                                   :Aprilo
-STR_MONTH_MAY                                                   :Majo
-STR_MONTH_JUN                                                   :Junio
-STR_MONTH_JUL                                                   :Julio
-STR_MONTH_AUG                                                   :Aŭgusto
-STR_MONTH_SEP                                                   :Septembro
-STR_MONTH_OCT                                                   :Oktobro
-STR_MONTH_NOV                                                   :Novembro
-STR_MONTH_DEC                                                   :Decembro
-
 STR_HEADING_FOR_STATION                                         :{LTBLUE}Irante al {STATION}
 STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}Irante al {STATION}, {VELOCITY}
 STR_NO_ORDERS                                                   :{LTBLUE}Sen ordenoj
@@ -884,8 +868,6 @@ STR_CRATES                                                      :kestoj
 STR_RES_OTHER                                                   :alia
 STR_NOTHING                                                     :
 
-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...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Fino de Dividitaj Ordenoj - -
@@ -1157,7 +1139,6 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Y-grand
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :malaktiva
-STR_JUST_CURRENCY                                               :{CURRENCY}
 STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Ŝanĝu agord-valoron
 
 STR_TEMPERATE_LANDSCAPE                                         :Modera landaspekto
@@ -1259,11 +1240,6 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Industri
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...tro proksime al alia industrio
 
-STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Transformu trajnon por ke ĝi portu alian ŝarĝon
-STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Transformu trajnon
-STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Elektu ŝarĝospecon portotan de la trajno
-STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Transformu trajnon por porti la elektitan ŝarĝotipon
-STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Ne povas transformi la trajnon...
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Ŝanĝu produktadon
 
 ############ network gui strings
@@ -2057,8 +2033,6 @@ STR_NUM_LOW                                                     :Malalte
 STR_NUM_NORMAL                                                  :Normale
 STR_NUM_HIGH                                                    :Alte
 STR_NUM_CUSTOM                                                  :Ŝanĝitaj
-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
@@ -2515,10 +2489,8 @@ STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE                          :unurellokomotiv
 STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE                            :magleva lokomotivo
 
 ##id 0x8800
-STR_DEPOT_TRAIN_CAPTION                                         :{WHITE}{TOWN} Trajndeponejo
 STR_NEWS_FIRST_TRAIN_ARRIVAL                                    :{BLACK}{BIGFONT}Enloĝantoj festas . . .{}Unua trajno alvenas ĉe {STATION}!
 STR_VEHICLE_DETAILS_CAPTION                                     :{WHITE}{VEHICLE} (Detaloj)
-STR_ERROR_TRAIN_IN_THE_WAY                                      :{WHITE}Trajno okupas la lokon
 STR_GO_TO_STATION                                               :{STRING} {STATION} {STRING}
 
 STR_GO_TO_DEPOT                                                 :{STRING} {TOWN} {STRING}
@@ -2528,35 +2500,15 @@ STR_GO_TO_NEAREST_DEPOT                                         :{STRING} {STRIN
 STR_ORDER_CONDITIONAL_UNCONDITIONALLY                           :Ĉiam
 
 
-STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Irante al {TOWN} Trajndeponejo
-STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Irante al {TOWN} Trajndeponejo, {VELOCITY}
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Prizorgo ĉe {TOWN} Trajndeponejo
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Prizorgo ĉe {TOWN} Trajndeponejo, {VELOCITY}
-
 STR_INVALID_ORDER                                               :{RED} (Nevalida Ordeno)
 
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}Malplena
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} de {STATION}
 STR_VEHICLE_DETAILS_CARGO_FROM_MULT                             :{LTBLUE}{CARGO} de {STATION} (x{NUM})
-STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Novaj Veturiloj
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}Trajno tro longas
 STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}Trajno nut povas esti adaptataj kiam halte en deponejo
 
-STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}Novaj Relaj Veturiloj
-STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}Novaj Elektraj Relaj Veturiloj
-STR_BUILD_VEHICLE_TRAIN_MONORAIL_CAPTION                        :{WHITE}Novaj Unurelaj Veturiloj
-STR_BUILD_VEHICLE_TRAIN_MAGLEV_CAPTION                          :{WHITE}Novaj Maglevaj Veturiloj
-STR_BUILD_VEHICLE_TRAIN_ALL_CAPTION                             :{WHITE}Vojveturiloj
-
-STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_BUTTON                    :{BLACK}Kreu Veturilon
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Klonu Veturilon
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Ĉi tiel konstruu kopion de la vojveturilo. CTRL+klako dividos la ordenojn
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Ĉi tio konstruas kopion de la vojveturilo. Alklaku ĉi tiun butenon kaj poste veturilon en aŭ ekster deponejo. CTRL+klako dividos la ordenojn
-STR_CLONE_TRAIN                                                 :{BLACK}Klonu Trajnon
-STR_CLONE_TRAIN_INFO                                            :{BLACK}Ĉi tiel konstruu kopion de la trajno kun ĉiuj vagonoj. CTRL+klako dividos la ordenojn
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Ĉi tio konstruas kopion de la trajno kun ĉiuj vagonoj. Alklaku ĉi tiun butenon kaj poste trajnon en aŭ ekster deponejo. CTRL+klako dividos la ordenojn
-STR_BUILD_VEHICLE_TRAIN_RENAME_BUTTON                           :{BLACK}Renomu
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Plusaltu
 STR_ORDERS_DELETE_BUTTON                                        :{BLACK}Forviŝu
 STR_ORDERS_GO_TO_BUTTON                                         :{BLACK}Iru al
@@ -2566,13 +2518,11 @@ STR_REFIT_ORDER                                                 :(Transformu al
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Ordenoj)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Fino de Ordenoj - -
 STR_SERVICE                                                     :{BLACK}Prizorgo
-STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Ne povas krei relan veturilon...
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Kreite: {LTBLUE}{NUM}{BLACK} Valoro: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Valoro: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
 STR_VEHICLE_STATUS_LOADING_UNLOADING                            :{LTBLUE}Ŝarĝante / Deŝarĝante
 STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}Trajno estu halta en deponejo
-STR_ERROR_CAN_T_SEND_TRAIN_TO_DEPOT                             :{WHITE}Ne povas sendi trajnon al deponejo...
 STR_ERROR_NO_MORE_SPACE_FOR_ORDERS                              :{WHITE}Ne plu spaco por ordenoj
 STR_ERROR_TOO_MANY_ORDERS                                       :{WHITE}Tro da ordenoj
 STR_ERROR_CAN_T_INSERT_NEW_ORDER                                :{WHITE}Ne povas enigi novan ordenon...
@@ -2581,25 +2531,11 @@ STR_ERROR_CAN_T_MODIFY_THIS_ORDER                               :{WHITE}Ne povas
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}Ne povas movi veturilon
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}La malantaŭa maŝino ĉiam sekvos la antaŭan
 STR_CARGO_N_A                                                   :N/A{SKIP}
-STR_ERROR_CAN_T_SELL_TRAIN                                      :{WHITE}Ne povas vendi relan veturilon...
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}Ne eblas trovi lokan deponejon
-STR_ERROR_CAN_T_STOP_START_TRAIN                                :{WHITE}Ne povas haltigi/starti trajnon...
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}Prizorga intervalo: {LTBLUE}{COMMA}tagoj{BLACK}   Lasta prizorgo: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}Prizorga intervalo: {LTBLUE}{COMMA}%{BLACK}   Lasta prizorgo: {LTBLUE}{DATE_LONG}
-STR_DEPOT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Trajnoj - alklaku trajnon por scii pli, tiru veturilon por aldoni aŭ forigi de trajno
-STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP                            :{BLACK}Kreu novan trajnan veturilon
-STR_DEPOT_TRAIN_SELL_TOOLTIP                                    :{BLACK}Tiru trajnan veturilon ĉi tien por vendi
-STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}Centre vidu la trajndeponejon en la ĉefvido
-STR_BUILD_VEHICLE_TRAIN_LIST_TOOLTIP                            :{BLACK}Trajnveturila elektolisto - alklaku veturilon por informoj
-STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_TOOLTIP                   :{BLACK}Kreu la elektitan trajnan veturilon
-STR_BUILD_VEHICLE_TRAIN_RENAME_TOOLTIP                          :{BLACK}Renomu trajnveturilan tipon
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP                 :{BLACK}Nuna trajna ago - klaku por haltigi/starti la trajnon
-STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP                           :{BLACK}Montru trajnajn ordenojn
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP                         :{BLACK}Centre vidu trajnan lokon en la ĉefvido
-STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP                    :{BLACK}Sendu trajnon al deponejo. CTRL+klako nur prizorgos
 STR_VEHICLE_VIEW_TRAIN_IGNORE_SIGNAL_TOOLTIP                    :{BLACK}Igu trajnon iri malgraŭ signalo
 STR_VEHICLE_VIEW_TRAIN_REVERSE_TOOLTIP                          :{BLACK}Inversigu trajnan direkton
-STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Montru trajnajn detalojn
 STR_VEHICLE_DETAILS_INCREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Pliigu prizorgintervalon
 STR_VEHICLE_DETAILS_DECREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Malpliigu prizorgintervalon
 STR_VEHICLE_DETAILS_TRAIN_CARGO_TOOLTIP                         :{BLACK}Montru detalojn de portata ŝarĝo
@@ -2615,15 +2551,10 @@ STR_VEHICLE_STATUS_STOPPED                                      :{RED}Haltis
 STR_ERROR_CAN_T_MAKE_TRAIN_PASS_SIGNAL                          :{WHITE}Ne povas igi trajnon transiri signalon je danĝero...
 STR_VEHICLE_STATUS_CRASHED                                      :{RED}Kraŝis!
 
-STR_QUERY_RENAME_TRAIN_CAPTION                                  :{WHITE}Nomu trajnon
-STR_ERROR_CAN_T_RENAME_TRAIN                                    :{WHITE}Ne povas nomi trajnon...
-STR_VEHICLE_DETAILS_TRAIN_RENAME                                :{BLACK}Nomu trajnon
 STR_NEWS_TRAIN_CRASH                                            :{BLACK}{BIGFONT}Trajna Kraŝo!{}{COMMA} mortis pro fajro post kolizio
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Ne povas inversigi direkton de trajno...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE                  :{WHITE}Ne povas inversigi direkton de veturilo...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Ne povas turni veturilojn konsistantaj el pluraj unuoj
-STR_QUERY_RENAME_TRAIN_TYPE_CAPTION                             :{WHITE}Renomu trajnan veturiltipon
-STR_ERROR_CAN_T_RENAME_TRAIN_TYPE                               :{WHITE}Ne povas renomi trajnan veturiltipon...
 
 STR_TRAIN_STOPPING                                              :{RED}Haltiĝas
 STR_TRAIN_STOPPING_VEL                                          :{RED}Haltiĝas, {VELOCITY}
@@ -2639,162 +2570,47 @@ STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                         :{BLACK}Nova {ST
 STR_TIMETABLE_CHANGE_TIME                                       :{BLACK}Ŝanĝu tempon
 
 ##id 0x9000
-STR_ERROR_ROAD_VEHICLE_IN_THE_WAY                               :{WHITE}Vojveturilo okupas la lokon
-STR_DEPOT_ROAD_VEHICLE_CAPTION                                  :{WHITE}{TOWN} Vojveturila Deponejo
-STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_BUTTON                      :{BLACK}Novaj Veturiloj
-STR_BUILD_VEHICLE_ROAD_VEHICLE_CAPTION                          :{WHITE}Novaj Vojveturiloj
-STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_BUTTON             :{BLACK}Kreu Veturilon
-STR_ERROR_CAN_T_BUILD_ROAD_VEHICLE                              :{WHITE}Ne povas krei vojveturilon
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}...devas esti haltigata en vojveturila deponejo
-STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}Ne povas vendi vojveturilon...
-STR_ERROR_CAN_T_STOP_START_ROAD_VEHICLE                         :{WHITE}Ne povas haltigi/starti vojveturilon...
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Irante al {TOWN} Voja Deponejo
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Irante al {TOWN} Voja Deponejo, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Prizorgo ĉe {TOWN} Voja Deponejo
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Prizorgo ĉe {TOWN} Voja Deponejo, {VELOCITY}
-STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Ne povas sendi veturilon al deponejo...
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Ne eblas trovi lokan deponejon
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP          :{BLACK}Nuna veturila ago - klaku ĉi tie por haltigi/starti veturilon
-STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP                    :{BLACK}Montru veturilajn ordenojn
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP                  :{BLACK}Centre vidu la veturilon en la ĉefvido
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}Sendu veturilon al deponejo. CTRL+klako nur prizorgos
 STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP                   :{BLACK}Igu veturilon ĉirkaŭturni
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Montru vojveturilajn detalojn
-STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Veturiloj - alklaku veturilojn por informoj
-STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}Kreu novan vojveturilon
-STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}Tiru vojveturilon ĉi tien por vendi
-STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}Centre vidu vojveturilan deponejon en la ĉefvido
-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_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})
 
-STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Nomu vojveturilon
-STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Ne povas nomi vojveturilon...
-STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Nomu vojveturilon
 STR_NEWS_FIRST_BUS_ARRIVAL                                      :{BLACK}{BIGFONT}Enloĝantoj festas . . .{}Unua buso alvenas en {STATION}!
 STR_NEWS_FIRST_TRUCK_ARRIVAL                                    :{BLACK}{BIGFONT}Enloĝantoj festas . . .{}Unua ŝarĝaŭto alvenas en {STATION}!
 STR_NEWS_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Vojveturila kraŝo!{}Veturanto mortas pro fajro post kolizio kun trajno
 STR_NEWS_ROAD_VEHICLE_CRASH                                     :{BLACK}{BIGFONT}Vojveturila Kraŝo!{}{COMMA} mortas pro fajro post kolizio kun trajno
 STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}Ne povas turnigi vojveturilon...
-STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Renomu
-STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Renomu vojveturilan tipon
-STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Renomu vojveturilan tipon
-STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Ne povas renomi vojveturilan tipon...
 
-STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Transformu vojveturilon por porti alian ŝarĝon
-STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Transformu vojveturilon
-STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Transformu vojveturilon por porti elektitan ŝarĝon
-STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Ne povas transformi vojveturilon...
-STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Elektu portotan ŝarĝon de la vojveturilo
 
 ##id 0x9800
 STR_ERROR_CAN_T_BUILD_DOCK_HERE                                 :{WHITE}Ne povas konstrui havenon ĉi tie...
-STR_DEPOT_SHIP_CAPTION                                          :{WHITE}{TOWN} Ŝipdeponejo
-STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON                              :{BLACK}Novaj Ŝipoj
-STR_BUILD_VEHICLE_SHIP_CAPTION                                  :{WHITE}Novaj Ŝipoj
-STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON                     :{BLACK}Kreu Ŝipon
-STR_CLONE_SHIP                                                  :{BLACK}Klonu Ŝipon
-STR_CLONE_SHIP_INFO                                             :{BLACK}Ĉi tiel konstruu kopion de la ŝipo. CTRL+klako dividos la ordenojn
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Ĉi tio konstruas kopion de la ŝipo. Alklaku ĉi tiun butenon kaj poste ŝipon en aŭ ekster deponejo. CTRL+klako dividos la ordenojn
 STR_ERROR_SHIP_MUST_BE_STOPPED_IN_DEPOT                         :{WHITE}Ŝipo devas halti en deponejo
-STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}Ne povas vendi ŝipon...
-STR_ERROR_CAN_T_BUILD_SHIP                                      :{WHITE}Ne povas krei ŝipon...
-STR_ERROR_SHIP_IN_THE_WAY                                       :{WHITE}Ŝipo okupas la lokon
-STR_ERROR_CAN_T_STOP_START_SHIP                                 :{WHITE}Ne povas haltigi/starti ŝipon...
-STR_ERROR_CAN_T_SEND_SHIP_TO_DEPOT                              :{WHITE}Ne povas sendi ŝipon al deponejo...
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Irante al {TOWN} Ŝipdeponejo
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Irante al {TOWN} Ŝipdeponejo, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Prizorgo ĉe {TOWN} Ŝipdeponejo
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Prizorgo ĉe {TOWN} Ŝipdeponejo, {VELOCITY}
 STR_WATERWAYS_TOOLBAR_BUILD_DOCK_TOOLTIP                        :{BLACK}Konstruu havenon
 STR_WATERWAYS_TOOLBAR_BUILD_DEPOT_TOOLTIP                       :{BLACK}Konstruu ŝipdeponejon (por krei kaj prizorgi ŝipojn)
-STR_DEPOT_SHIP_LIST_TOOLTIP                                     :{BLACK}Ŝipoj - alklaku ŝipon por informoj
-STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}Kreu novan ŝipon
-STR_DEPOT_SHIP_SELL_TOOLTIP                                     :{BLACK}Tiru ŝipon ĉi tien por vendi
-STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}Centre vidu ŝipdeponejon en ĉefvido
-STR_BUILD_VEHICLE_SHIP_LIST_TOOLTIP                             :{BLACK}Ŝipelekta listo - alklaku ŝipon por informoj
-STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP                    :{BLACK}Kreu elektitan ŝipon
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP                  :{BLACK}Nuna ŝipa ago - klaku ĉi tie por haltigi/starti ŝipon
-STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Montru ŝipajn ordenojn
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP                          :{BLACK}Centre vidu ŝipon en ĉefvido
-STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}Sendu ŝipon al deponejo. CTRL+klako nur prizorgos
-STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Montru ŝipajn detalojn
-STR_VEHICLE_DETAILS_SHIP_RENAME                                 :{BLACK}Nomu ŝipon
 
-STR_QUERY_RENAME_SHIP_CAPTION                                   :{WHITE}Nomu ŝipon
-STR_ERROR_CAN_T_RENAME_SHIP                                     :{WHITE}Ne povas nomi ŝipon...
 STR_NEWS_FIRST_SHIP_ARRIVAL                                     :{BLACK}{BIGFONT}Enloĝantoj festas . . .{}Unua ŝipo alvenas en {STATION}!
 STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}Metu buon kiu povas esti uzata kiel trairejo
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}Ne povas meti buon ĉi tie...
-STR_BUILD_VEHICLE_SHIP_RENAME_BUTTON                            :{BLACK}Renomu
-STR_BUILD_VEHICLE_SHIP_RENAME_TOOLTIP                           :{BLACK}Renomu ŝiptipon
-STR_QUERY_RENAME_SHIP_TYPE_CAPTION                              :{WHITE}Renomu ŝiptipon
-STR_ERROR_CAN_T_RENAME_SHIP_TYPE                                :{WHITE}Ne povas renomi ŝiptipon...
-STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}Transformu ŝarĝŝipon por porti alian ŝarĝon
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (Transformu)
-STR_REFIT_SHIP_REFIT_BUTTON                                     :{BLACK}Transformu ŝipon
-STR_REFIT_SHIP_LIST_TOOLTIP                                     :{BLACK}Elektu portotan ŝarĝotipon
-STR_REFIT_SHIP_REFIT_TOOLTIP                                    :{BLACK}Transformu ŝipon por porti elektitan ŝarĝotipon
 STR_REFIT_TITLE                                                 :{GOLD}Elektu ŝarĝotipon por porti:
 STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}Nova kapablo: {GOLD}{CARGO}{}{BLACK}Transformkosto: {GOLD}{CURRENCY}
-STR_ERROR_CAN_T_REFIT_SHIP                                      :{WHITE}Ne povas transformi ŝipon...
 STR_REFITTABLE                                                  :(transformebla)
 
 ##id 0xA000
 STR_TOOLBAR_AIRCRAFT_CAPTION                                    :{WHITE}Flughavenoj
 STR_ERROR_CAN_T_BUILD_AIRPORT_HERE                              :{WHITE}Ne povas konstrui flughavenon ĉi tie...
-STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}{STATION} Hangaro
-STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON                          :{BLACK}Novaj Aviadiloj
-STR_CLONE_AIRCRAFT                                              :{BLACK}Klonu aviadilon
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Ĉi tio konstruas kopion de la aviadilo. CTRL+klako dividos la ordenojn
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Ĉi tio konstruas kopion de la aviadilo. Alklaku ĉi tiun butenon kaj poste aviadilon en aŭ ekster hangaro. CTRL+klako dividos la ordenojn
-STR_BUILD_VEHICLE_AIRCRAFT_CAPTION                              :{WHITE}Novaj Aviadiloj
-STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON                 :{BLACK}Kreu Aviadilon
-STR_ERROR_CAN_T_BUILD_AIRCRAFT                                  :{WHITE}Ne povas krei aviadilon...
-STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR                         :{WHITE}Ne povas sendi aviadilon al hangaro...
-STR_HEADING_FOR_HANGAR                                          :{ORANGE}Irante al {STATION} Hangaro
-STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Irante al {STATION} Hangaro, {VELOCITY}
-STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Prizorgo ĉe {STATION} Hangaro
-STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Prizorgo ĉe {STATION} Hangaro, {VELOCITY}
-STR_ERROR_AIRCRAFT_IN_THE_WAY                                   :{WHITE}Aviadilo okupas la lokon
-STR_ERROR_CAN_T_STOP_START_AIRCRAFT                             :{WHITE}Ne povas haltigi/starti aviadilon...
 STR_ERROR_AIRCRAFT_IS_IN_FLIGHT                                 :{WHITE}Aviadilo flugas
 STR_ERROR_AIRCRAFT_MUST_BE_STOPPED                              :{WHITE}Aviadilo devas esti haltigata en la hangaro
-STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}Ne povas vendi aviadilon...
 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION                          :Flughavena konstruado
 STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Kreu flughavenon
-STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Aviadiloj - alklaku aviadilon por informoj
-STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}Kreu novan aviadilon
-STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}DTiru aviadilon ĉi tien por vendi
-STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Centre vidu hangaron en la ĉefvido
-STR_BUILD_VEHICLE_AIRCRAFT_LIST_TOOLTIP                         :{BLACK}Aviadilelekta listo - alklaku aviadilon por informoj
-STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_TOOLTIP                :{BLACK}Kreu la elektitan aviadilon
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP              :{BLACK}Nuna aviadila ago - klaku ĉi tie por haltigi/starti aviadilon
-STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Montru aviadilajn ordenojn
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP                      :{BLACK}Centre vidu aviadilon en la ĉefvido
-STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}Sendu aviadilon al hangaro. CTRL+klako nur prizorgos
-STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Montru aviadilajn detalojn
 
-STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}Nomu aviadilon
-STR_ERROR_CAN_T_RENAME_AIRCRAFT                                 :{WHITE}Ne povas nomi aviadilon...
-STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}Nomu aviadilon
 STR_NEWS_FIRST_AIRCRAFT_ARRIVAL                                 :{BLACK}{BIGFONT}Enloĝantoj festas . . .{}Unua aviadilo alvenas en {STATION}!
 STR_NEWS_AIRCRAFT_CRASH                                         :{BLACK}{BIGFONT}Aviadilo Kraŝas!{}{COMMA} mortas pro fajro en {STATION}
 STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Aviadila Kraŝo!{}Aviadilo ne havis sufiĉan brulaĵon, {COMMA} mortas pro fajro!
 STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
-STR_BUILD_VEHICLE_AIRCRAFT_RENAME_BUTTON                        :{BLACK}Renomu
-STR_BUILD_VEHICLE_AIRCRAFT_RENAME_TOOLTIP                       :{BLACK}Renomu aviadiltipon
-STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION                          :{WHITE}Renomu aviadiltipon
-STR_ERROR_CAN_T_RENAME_AIRCRAFT_TYPE                            :{WHITE}Ne povas renomi aviadiltipon...
-STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Transformu aviadilon por porti alian ŝarĝotipon
-STR_REFIT_AIRCRAFT_REFIT_BUTTON                                 :{BLACK}Transformu aviadilon
-STR_REFIT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Elektu portotan ŝarĝon de aviadilo
-STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}Transformu aviadilon por porti elektitan ŝarĝotipon
-STR_ERROR_CAN_T_REFIT_AIRCRAFT                                  :{WHITE}Ne povas reformi aviadilon...
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Timetable)
 
@@ -2923,6 +2739,207 @@ STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING}
 STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}Kunhavaj ordonoj de {COMMA} Veturilo{P "" j}
 STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Montru ĉiujn veturilojn kiuj dividas ĉi tiun planon
 
+
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Transformu trajnon
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Transformu vojveturilon
+STR_REFIT_SHIP_REFIT_BUTTON                                     :{BLACK}Transformu ŝipon
+STR_REFIT_AIRCRAFT_REFIT_BUTTON                                 :{BLACK}Transformu aviadilon
+
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Transformu trajnon por porti la elektitan ŝarĝotipon
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Transformu vojveturilon por porti elektitan ŝarĝon
+STR_REFIT_SHIP_REFIT_TOOLTIP                                    :{BLACK}Transformu ŝipon por porti elektitan ŝarĝotipon
+STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}Transformu aviadilon por porti elektitan ŝarĝotipon
+
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Elektu ŝarĝospecon portotan de la trajno
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Elektu portotan ŝarĝon de la vojveturilo
+STR_REFIT_SHIP_LIST_TOOLTIP                                     :{BLACK}Elektu portotan ŝarĝotipon
+STR_REFIT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Elektu portotan ŝarĝon de aviadilo
+
+STR_DEPOT_TRAIN_CAPTION                                         :{WHITE}{TOWN} Trajndeponejo
+STR_DEPOT_ROAD_VEHICLE_CAPTION                                  :{WHITE}{TOWN} Vojveturila Deponejo
+STR_DEPOT_SHIP_CAPTION                                          :{WHITE}{TOWN} Ŝipdeponejo
+STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}{STATION} Hangaro
+
+STR_VEHICLE_DETAILS_TRAIN_RENAME                                :{BLACK}Nomu trajnon
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Nomu vojveturilon
+STR_VEHICLE_DETAILS_SHIP_RENAME                                 :{BLACK}Nomu ŝipon
+STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}Nomu aviadilon
+
+STR_QUERY_RENAME_TRAIN_CAPTION                                  :{WHITE}Nomu trajnon
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Nomu vojveturilon
+STR_QUERY_RENAME_SHIP_CAPTION                                   :{WHITE}Nomu ŝipon
+STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}Nomu aviadilon
+
+STR_ERROR_TRAIN_IN_THE_WAY                                      :{WHITE}Trajno okupas la lokon
+STR_ERROR_ROAD_VEHICLE_IN_THE_WAY                               :{WHITE}Vojveturilo okupas la lokon
+STR_ERROR_SHIP_IN_THE_WAY                                       :{WHITE}Ŝipo okupas la lokon
+STR_ERROR_AIRCRAFT_IN_THE_WAY                                   :{WHITE}Aviadilo okupas la lokon
+
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Ne povas transformi la trajnon...
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Ne povas transformi vojveturilon...
+STR_ERROR_CAN_T_REFIT_SHIP                                      :{WHITE}Ne povas transformi ŝipon...
+STR_ERROR_CAN_T_REFIT_AIRCRAFT                                  :{WHITE}Ne povas reformi aviadilon...
+
+STR_ERROR_CAN_T_RENAME_TRAIN                                    :{WHITE}Ne povas nomi trajnon...
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Ne povas nomi vojveturilon...
+STR_ERROR_CAN_T_RENAME_SHIP                                     :{WHITE}Ne povas nomi ŝipon...
+STR_ERROR_CAN_T_RENAME_AIRCRAFT                                 :{WHITE}Ne povas nomi aviadilon...
+
+STR_ERROR_CAN_T_STOP_START_TRAIN                                :{WHITE}Ne povas haltigi/starti trajnon...
+STR_ERROR_CAN_T_STOP_START_ROAD_VEHICLE                         :{WHITE}Ne povas haltigi/starti vojveturilon...
+STR_ERROR_CAN_T_STOP_START_SHIP                                 :{WHITE}Ne povas haltigi/starti ŝipon...
+STR_ERROR_CAN_T_STOP_START_AIRCRAFT                             :{WHITE}Ne povas haltigi/starti aviadilon...
+
+STR_ERROR_CAN_T_SEND_TRAIN_TO_DEPOT                             :{WHITE}Ne povas sendi trajnon al deponejo...
+STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Ne povas sendi veturilon al deponejo...
+STR_ERROR_CAN_T_SEND_SHIP_TO_DEPOT                              :{WHITE}Ne povas sendi ŝipon al deponejo...
+STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR                         :{WHITE}Ne povas sendi aviadilon al hangaro...
+
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Ne povas krei relan veturilon...
+STR_ERROR_CAN_T_BUILD_ROAD_VEHICLE                              :{WHITE}Ne povas krei vojveturilon
+STR_ERROR_CAN_T_BUILD_SHIP                                      :{WHITE}Ne povas krei ŝipon...
+STR_ERROR_CAN_T_BUILD_AIRCRAFT                                  :{WHITE}Ne povas krei aviadilon...
+
+STR_ERROR_CAN_T_RENAME_TRAIN_TYPE                               :{WHITE}Ne povas renomi trajnan veturiltipon...
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Ne povas renomi vojveturilan tipon...
+STR_ERROR_CAN_T_RENAME_SHIP_TYPE                                :{WHITE}Ne povas renomi ŝiptipon...
+STR_ERROR_CAN_T_RENAME_AIRCRAFT_TYPE                            :{WHITE}Ne povas renomi aviadiltipon...
+
+STR_ERROR_CAN_T_SELL_TRAIN                                      :{WHITE}Ne povas vendi relan veturilon...
+STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}Ne povas vendi vojveturilon...
+STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}Ne povas vendi ŝipon...
+STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}Ne povas vendi aviadilon...
+
+STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP                 :{BLACK}Nuna trajna ago - klaku por haltigi/starti la trajnon
+STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP          :{BLACK}Nuna veturila ago - klaku ĉi tie por haltigi/starti veturilon
+STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP                  :{BLACK}Nuna ŝipa ago - klaku ĉi tie por haltigi/starti ŝipon
+STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP              :{BLACK}Nuna aviadila ago - klaku ĉi tie por haltigi/starti aviadilon
+
+STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP                           :{BLACK}Montru trajnajn ordenojn
+STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP                    :{BLACK}Montru veturilajn ordenojn
+STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Montru ŝipajn ordenojn
+STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Montru aviadilajn ordenojn
+
+STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP                         :{BLACK}Centre vidu trajnan lokon en la ĉefvido
+STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP                  :{BLACK}Centre vidu la veturilon en la ĉefvido
+STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP                          :{BLACK}Centre vidu ŝipon en ĉefvido
+STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP                      :{BLACK}Centre vidu aviadilon en la ĉefvido
+
+STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP                    :{BLACK}Sendu trajnon al deponejo. CTRL+klako nur prizorgos
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}Sendu veturilon al deponejo. CTRL+klako nur prizorgos
+STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}Sendu ŝipon al deponejo. CTRL+klako nur prizorgos
+STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}Sendu aviadilon al hangaro. CTRL+klako nur prizorgos
+
+STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Montru trajnajn detalojn
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Montru vojveturilajn detalojn
+STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Montru ŝipajn detalojn
+STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Montru aviadilajn detalojn
+
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Transformu trajnon por ke ĝi portu alian ŝarĝon
+STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Transformu vojveturilon por porti alian ŝarĝon
+STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}Transformu ŝarĝŝipon por porti alian ŝarĝon
+STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Transformu aviadilon por porti alian ŝarĝotipon
+
+STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Irante al {TOWN} Trajndeponejo
+STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Irante al {TOWN} Trajndeponejo, {VELOCITY}
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Irante al {TOWN} Voja Deponejo
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Irante al {TOWN} Voja Deponejo, {VELOCITY}
+STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Irante al {TOWN} Ŝipdeponejo
+STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Irante al {TOWN} Ŝipdeponejo, {VELOCITY}
+STR_HEADING_FOR_HANGAR                                          :{ORANGE}Irante al {STATION} Hangaro
+STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Irante al {STATION} Hangaro, {VELOCITY}
+
+STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Prizorgo ĉe {TOWN} Trajndeponejo
+STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Prizorgo ĉe {TOWN} Trajndeponejo, {VELOCITY}
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Prizorgo ĉe {TOWN} Voja Deponejo
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Prizorgo ĉe {TOWN} Voja Deponejo, {VELOCITY}
+STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Prizorgo ĉe {TOWN} Ŝipdeponejo
+STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Prizorgo ĉe {TOWN} Ŝipdeponejo, {VELOCITY}
+STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Prizorgo ĉe {STATION} Hangaro
+STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Prizorgo ĉe {STATION} Hangaro, {VELOCITY}
+
+
+STR_CLONE_TRAIN                                                 :{BLACK}Klonu Trajnon
+STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Klonu Veturilon
+STR_CLONE_SHIP                                                  :{BLACK}Klonu Ŝipon
+STR_CLONE_AIRCRAFT                                              :{BLACK}Klonu aviadilon
+
+STR_CLONE_TRAIN_INFO                                            :{BLACK}Ĉi tiel konstruu kopion de la trajno kun ĉiuj vagonoj. CTRL+klako dividos la ordenojn
+STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Ĉi tiel konstruu kopion de la vojveturilo. CTRL+klako dividos la ordenojn
+STR_CLONE_SHIP_INFO                                             :{BLACK}Ĉi tiel konstruu kopion de la ŝipo. CTRL+klako dividos la ordenojn
+STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Ĉi tio konstruas kopion de la aviadilo. CTRL+klako dividos la ordenojn
+
+STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Ĉi tio konstruas kopion de la trajno kun ĉiuj vagonoj. Alklaku ĉi tiun butenon kaj poste trajnon en aŭ ekster deponejo. CTRL+klako dividos la ordenojn
+STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Ĉi tio konstruas kopion de la vojveturilo. Alklaku ĉi tiun butenon kaj poste veturilon en aŭ ekster deponejo. CTRL+klako dividos la ordenojn
+STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Ĉi tio konstruas kopion de la ŝipo. Alklaku ĉi tiun butenon kaj poste ŝipon en aŭ ekster deponejo. CTRL+klako dividos la ordenojn
+STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Ĉi tio konstruas kopion de la aviadilo. Alklaku ĉi tiun butenon kaj poste aviadilon en aŭ ekster hangaro. CTRL+klako dividos la ordenojn
+
+STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}Novaj Relaj Veturiloj
+STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}Novaj Elektraj Relaj Veturiloj
+STR_BUILD_VEHICLE_TRAIN_MONORAIL_CAPTION                        :{WHITE}Novaj Unurelaj Veturiloj
+STR_BUILD_VEHICLE_TRAIN_MAGLEV_CAPTION                          :{WHITE}Novaj Maglevaj Veturiloj
+
+STR_BUILD_VEHICLE_TRAIN_ALL_CAPTION                             :{WHITE}Vojveturiloj
+STR_BUILD_VEHICLE_ROAD_VEHICLE_CAPTION                          :{WHITE}Novaj Vojveturiloj
+STR_BUILD_VEHICLE_SHIP_CAPTION                                  :{WHITE}Novaj Ŝipoj
+STR_BUILD_VEHICLE_AIRCRAFT_CAPTION                              :{WHITE}Novaj Aviadiloj
+
+STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_BUTTON                    :{BLACK}Kreu Veturilon
+STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_BUTTON             :{BLACK}Kreu Veturilon
+STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON                     :{BLACK}Kreu Ŝipon
+STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON                 :{BLACK}Kreu Aviadilon
+
+STR_BUILD_VEHICLE_TRAIN_LIST_TOOLTIP                            :{BLACK}Trajnveturila elektolisto - alklaku veturilon por informoj
+STR_BUILD_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP                     :{BLACK}Vojveturilelektan liston - alklaku veturilon por informoj
+STR_BUILD_VEHICLE_SHIP_LIST_TOOLTIP                             :{BLACK}Ŝipelekta listo - alklaku ŝipon por informoj
+STR_BUILD_VEHICLE_AIRCRAFT_LIST_TOOLTIP                         :{BLACK}Aviadilelekta listo - alklaku aviadilon por informoj
+
+STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_TOOLTIP                   :{BLACK}Kreu la elektitan trajnan veturilon
+STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_TOOLTIP            :{BLACK}Kreu la elektitan vojveturilon
+STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP                    :{BLACK}Kreu elektitan ŝipon
+STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_TOOLTIP                :{BLACK}Kreu la elektitan aviadilon
+
+STR_BUILD_VEHICLE_TRAIN_RENAME_BUTTON                           :{BLACK}Renomu
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Renomu
+STR_BUILD_VEHICLE_SHIP_RENAME_BUTTON                            :{BLACK}Renomu
+STR_BUILD_VEHICLE_AIRCRAFT_RENAME_BUTTON                        :{BLACK}Renomu
+
+STR_BUILD_VEHICLE_TRAIN_RENAME_TOOLTIP                          :{BLACK}Renomu trajnveturilan tipon
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Renomu vojveturilan tipon
+STR_BUILD_VEHICLE_SHIP_RENAME_TOOLTIP                           :{BLACK}Renomu ŝiptipon
+STR_BUILD_VEHICLE_AIRCRAFT_RENAME_TOOLTIP                       :{BLACK}Renomu aviadiltipon
+
+STR_QUERY_RENAME_TRAIN_TYPE_CAPTION                             :{WHITE}Renomu trajnan veturiltipon
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Renomu vojveturilan tipon
+STR_QUERY_RENAME_SHIP_TYPE_CAPTION                              :{WHITE}Renomu ŝiptipon
+STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION                          :{WHITE}Renomu aviadiltipon
+
+STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Novaj Veturiloj
+STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_BUTTON                      :{BLACK}Novaj Veturiloj
+STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON                              :{BLACK}Novaj Ŝipoj
+STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON                          :{BLACK}Novaj Aviadiloj
+
+STR_DEPOT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Trajnoj - alklaku trajnon por scii pli, tiru veturilon por aldoni aŭ forigi de trajno
+STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Veturiloj - alklaku veturilojn por informoj
+STR_DEPOT_SHIP_LIST_TOOLTIP                                     :{BLACK}Ŝipoj - alklaku ŝipon por informoj
+STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Aviadiloj - alklaku aviadilon por informoj
+
+STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP                            :{BLACK}Kreu novan trajnan veturilon
+STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}Kreu novan vojveturilon
+STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}Kreu novan ŝipon
+STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}Kreu novan aviadilon
+
+STR_DEPOT_TRAIN_SELL_TOOLTIP                                    :{BLACK}Tiru trajnan veturilon ĉi tien por vendi
+STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}Tiru vojveturilon ĉi tien por vendi
+STR_DEPOT_SHIP_SELL_TOOLTIP                                     :{BLACK}Tiru ŝipon ĉi tien por vendi
+STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}DTiru aviadilon ĉi tien por vendi
+
+STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}Centre vidu la trajndeponejon en la ĉefvido
+STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}Centre vidu vojveturilan deponejon en la ĉefvido
+STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}Centre vidu ŝipdeponejon en ĉefvido
+STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Centre vidu hangaron en la ĉefvido
+
+
 ### depot strings
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}Vi volas vendi ĉiujn veturilojn en la deponejo. Ĉu vi certas?
 
@@ -2956,6 +2973,7 @@ STR_REPLACE_REMOVE_WAGON                                        :{BLACK}Vagonfor
 STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Ĉe aŭtomata anstataŭigo tenu saman longecon de la trajno per forigo de vagonoj (defronte), se per nova maŝino la trajno plilongiĝas
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}Anstataŭante: {ORANGE}{SKIP}{SKIP}{STRING}
 STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}Ŝaltu inter maŝina kaj vagona anstataŭigo
+
 STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Trajno ne haveblas
 STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Veturilo ne haveblas
 STR_SHIP_NOT_AVAILABLE                                          :{WHITE}Ŝipo ne haveblas
@@ -3140,7 +3158,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_STRING                                                 :{STRING}
 STR_JUST_RAW_STRING                                             :{STRING}
@@ -3152,6 +3173,31 @@ STR_FORMAT_DATE_LONG                                            :{STRING} {STRIN
 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}Nomo devas esti ununura
 
 #### Improved sign GUI
diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt
index ad2e74532..bcaa3d0d2 100644
--- a/src/lang/estonian.txt
+++ b/src/lang/estonian.txt
@@ -211,8 +211,6 @@ STR_ABBREV_PLASTIC                                              :{TINYFONT}PL
 STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}FZ
 STR_ABBREV_NONE                                                 :{TINYFONT}EI
 STR_ABBREV_ALL                                                  :{TINYFONT}KÕIK
-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
@@ -224,17 +222,11 @@ STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Algne au
 STR_ABOUT_VERSION                                               :{BLACK}OpenTTD osa {REV}
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 OpenTTD meeskond
 
-STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
-STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_QUIT_CAPTION                                                :{WHITE}Mängust väljumine
 STR_YES                                                         :{BLACK}Jah
 STR_NO                                                          :{BLACK}Ei
 STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Kas soovite OpenTTD sulgeda ja minna tagasi süsteemi {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                                                :Mitte midagi
 STR_COLOUR_DARK_BLUE                                            :Tumesinine
 STR_COLOUR_PALE_GREEN                                           :Kahvaturoheline
@@ -253,8 +245,6 @@ STR_COLOUR_BROWN                                                :Pruun
 STR_COLOUR_GREY                                                 :Hall
 STR_COLOUR_WHITE                                                :Valge
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}Mängus on liiga palju veovahendeid
-STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
-STR_RED_COMMA                                                   :{RED}{COMMA}
 STR_BUTTON_LOCATION                                             :{BLACK}Asukoht
 STR_SMALLMAP_TYPE_CONTOURS                                      :maastik
 STR_SMALLMAP_TYPE_VEHICLES                                      :sõidukid
@@ -380,12 +370,13 @@ STR_SORT_CRITERIA_TIP                                           :{BLACK}Sorteeri
 STR_FILTER_CRITERIA_TIP                                         :{BLACK}Vali sõelumisalused
 STR_SORT_BY                                                     :{BLACK}Sorteeri:
 
+### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}Rahvaarv
+STR_SORT_BY_NAME                                                :{BLACK}Nimi
+STR_SORT_BY_DATE                                                :{BLACK}Daatum
 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_DATE                                                :{BLACK}Daatum
 STR_SORT_BY_NUMBER                                              :Number
 STR_SORT_BY_PROFIT_LAST_YEAR                                    :Eelmise aasta kasum
 STR_SORT_BY_PROFIT_THIS_YEAR                                    :Selle aasta kasum
@@ -408,37 +399,25 @@ STR_SORT_BY_INTRO_DATE                                          :Esitluskuupäev
 STR_SORT_BY_RUNNING_COST                                        :Käituskulud
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :Võimsus- ja käituskulud
 STR_SORT_BY_CARGO_CAPACITY                                      :Kandevõime
+
 STR_NO_WAITING_CARGO                                            :{BLACK}Veoseid pole ootamas
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}Vali kõik tööstused
 STR_SELECT_ALL_TYPES                                            :{BLACK}Vali kõik kaubatüüpid (ka mitteoodatav kaup)
-STR_AVAILABLE_TRAINS                                            :{BLACK}Saadaval rongid
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Saadaval sõidukid
-STR_AVAILABLE_SHIPS                                             :{BLACK}Saadaval laevad
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Saadaval õhusõidukid
 STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Vaata nimekirja seda tüüpi veovahenditest
 STR_MANAGE_LIST                                                 :{BLACK}Halda nimekirja
 STR_MANAGE_LIST_TIP                                             :{BLACK}Saada juhised kõikidele selles nimekirjas olevatele veovahenditele
 STR_REPLACE_VEHICLES                                            :Asenda veovahendeid
+STR_SEND_FOR_SERVICING                                          :Saada hooldusesse
+
+STR_AVAILABLE_TRAINS                                            :{BLACK}Saadaval rongid
+STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Saadaval sõidukid
+STR_AVAILABLE_SHIPS                                             :{BLACK}Saadaval laevad
+STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Saadaval õhusõidukid
+
 STR_SEND_TRAIN_TO_DEPOT                                         :Saada depoose
 STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Saada depoose
 STR_SEND_SHIP_TO_DEPOT                                          :Saada depoose
 STR_SEND_AIRCRAFT_TO_HANGAR                                     :Saada angaari
-STR_SEND_FOR_SERVICING                                          :Saada hooldusesse
-
-############ range for months starts
-STR_MONTH_ABBREV_JAN                                            :jaan
-STR_MONTH_ABBREV_FEB                                            :veebr
-STR_MONTH_ABBREV_MAR                                            :märts
-STR_MONTH_ABBREV_APR                                            :apr
-STR_MONTH_ABBREV_MAY                                            :mai
-STR_MONTH_ABBREV_JUN                                            :juuni
-STR_MONTH_ABBREV_JUL                                            :juuli
-STR_MONTH_ABBREV_AUG                                            :aug
-STR_MONTH_ABBREV_SEP                                            :sept
-STR_MONTH_ABBREV_OCT                                            :okt
-STR_MONTH_ABBREV_NOV                                            :nov
-STR_MONTH_ABBREV_DEC                                            :dets
-############ range for months ends
 
 STR_GRAPH_X_LABEL_MONTH                                         :{TINYFONT}{STRING}{} {STRING}
 STR_GRAPH_X_LABEL_MONTH_YEAR                                    :{TINYFONT}{STRING}{} {STRING}{}{NUM}
@@ -466,8 +445,6 @@ 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_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.
@@ -514,7 +491,7 @@ STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :puudub
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Nimi
 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                                          :1.
 STR_ORDINAL_NUMBER_2ND                                          :2.
 STR_ORDINAL_NUMBER_3RD                                          :3.
@@ -548,6 +525,34 @@ STR_ORDINAL_NUMBER_30TH                                         :30.
 STR_ORDINAL_NUMBER_31ST                                         :31.
 ############ range for days ends
 
+############ range for months starts
+STR_MONTH_ABBREV_JAN                                            :jaan
+STR_MONTH_ABBREV_FEB                                            :veebr
+STR_MONTH_ABBREV_MAR                                            :märts
+STR_MONTH_ABBREV_APR                                            :apr
+STR_MONTH_ABBREV_MAY                                            :mai
+STR_MONTH_ABBREV_JUN                                            :juuni
+STR_MONTH_ABBREV_JUL                                            :juuli
+STR_MONTH_ABBREV_AUG                                            :aug
+STR_MONTH_ABBREV_SEP                                            :sept
+STR_MONTH_ABBREV_OCT                                            :okt
+STR_MONTH_ABBREV_NOV                                            :nov
+STR_MONTH_ABBREV_DEC                                            :dets
+
+STR_MONTH_JAN                                                   :Jaanuar
+STR_MONTH_FEB                                                   :Veebruar
+STR_MONTH_MAR                                                   :Märts
+STR_MONTH_APR                                                   :Aprill
+STR_MONTH_MAY                                                   :Mai
+STR_MONTH_JUN                                                   :Juuni
+STR_MONTH_JUL                                                   :Juuli
+STR_MONTH_AUG                                                   :August
+STR_MONTH_SEP                                                   :September
+STR_MONTH_OCT                                                   :Oktoober
+STR_MONTH_NOV                                                   :November
+STR_MONTH_DEC                                                   :Detsember
+############ range for months ends
+
 STR_GRAPH_Y_LABEL_NUMBER                                        :{TINYFONT}{COMMA}
 
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}Vastuvõetavad veosed: {LTBLUE}
@@ -637,12 +642,9 @@ 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_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_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
@@ -724,9 +726,7 @@ STR_OFF                                                         :Väljas
 STR_SUMMARY                                                     :Lühike
 STR_FULL                                                        :Täielik
 STR_STATUSBAR_COMPANY_NAME                                      :{SILVER}- -  {COMPANY}  - -
-STR_BLACK_STRING                                                :{BLACK}{STRING}
 
-STR_JUST_CHECKMARK                                              :{CHECKMARK}
 ############ range for menu starts
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Mängu valikud
 STR_SETTINGS_MENU_DIFFICULTY_SETTINGS                           :Raskusastme seadistused
@@ -818,9 +818,6 @@ STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY                             :Uue tööstuse
 ############ range ends here
 
 STR_FUND_INDUSTRY_CAPTION                                       :{WHITE}Uue tööstuse rahastamine
-STR_JUST_STRING                                                 :{STRING}
-STR_JUST_RAW_STRING                                             :{STRING}
-STR_JUST_INT                                                    :{NUM}
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_RAINFOREST                       :{WHITE}...saab ehitada ainult vihmametsadesse
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT                           :{WHITE}...saab ehitada ainult kõrbesse
 STR_STATUSBAR_PAUSED                                            :{YELLOW}* *  SEISATUS  *  *
@@ -834,9 +831,6 @@ 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_BLACK_6                                                     :{BLACK}6
-STR_BLACK_7                                                     :{BLACK}7
-
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Inglise (originaalne)
 STR_TOWNNAME_FRENCH                                             :Prantsusmaa
@@ -916,19 +910,6 @@ STR_OPTIONS_BASE_GRF_DESCRIPTION_TIP                            :{BLACK}Lisaandm
 
 STR_AUTOSAVE_FAILED                                             :{WHITE}Automaatne salvestus nurjus
 
-STR_MONTH_JAN                                                   :Jaanuar
-STR_MONTH_FEB                                                   :Veebruar
-STR_MONTH_MAR                                                   :Märts
-STR_MONTH_APR                                                   :Aprill
-STR_MONTH_MAY                                                   :Mai
-STR_MONTH_JUN                                                   :Juuni
-STR_MONTH_JUL                                                   :Juuli
-STR_MONTH_AUG                                                   :August
-STR_MONTH_SEP                                                   :September
-STR_MONTH_OCT                                                   :Oktoober
-STR_MONTH_NOV                                                   :November
-STR_MONTH_DEC                                                   :Detsember
-
 STR_HEADING_FOR_STATION                                         :{LTBLUE}Siht: {STATION}
 STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}Siht: {STATION}, {VELOCITY}
 STR_NO_ORDERS                                                   :{LTBLUE}Sihita
@@ -943,8 +924,6 @@ STR_CRATES                                                      :kasti
 STR_RES_OTHER                                                   :muu
 STR_NOTHING                                                     :
 
-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...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Jagatud sihtpunktide lõpp - -
@@ -1216,7 +1195,6 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Kaardi
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :väljas
-STR_JUST_CURRENCY                                               :{CURRENCY}
 STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Muuda seadete väärtusi
 
 STR_TEMPERATE_LANDSCAPE                                         :Parasvöötme maastik
@@ -1252,7 +1230,6 @@ STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}Vali mel
 
 STR_WAYPOINT_VIEWPORT                                           :{WHITE}{WAYPOINT}
 STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WHITE}{WAYPOINT}
-STR_WAYPOINT_NAME                                               :{WAYPOINT}
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Muuda meldepunkti nime
 
 STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}Meldepunkti nime ei saa muuta...
@@ -1319,11 +1296,6 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Tööstu
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...liiga lähedal mõnele teisele tööstusele
 
-STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Rongi seadistamine mõne teise laadungi vedamiseks
-STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Seadista ümber
-STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Vali rongi veetav veoseliik
-STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Rongi ümberseadistamine valitud laadungi vedamiseks
-STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Ei ole võimalik ümber seadistada...
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Tootlikuse muutmine
 
 ############ network gui strings
@@ -1833,11 +1805,6 @@ STR_TOWN_BUILDING_NAME_TEPEES_1                                 :Tipid
 STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1                           :Teekannu maja
 STR_TOWN_BUILDING_NAME_PIGGY_BANK_1                             :Krossu pank
 
-STR_INDUSTRY_NAME                                               :{INDUSTRY}
-STR_TOWN_NAME                                                   :{TOWN}
-STR_FORMAT_INDUSTRY_NAME                                        :{TOWN} {STRING}
-STR_STATION_NAME                                                :{STATION}
-
 ##id 0x2800
 STR_LANDSCAPING_MENU_LANDSCAPING                                :Maapinna kujundamine
 STR_LANDSCAPING_MENU_PLANT_TREES                                :Puude istutamine
@@ -1892,6 +1859,12 @@ STR_CARGO_RATING_EXCELLENT                                      :Suurepärane
 STR_CARGO_RATING_OUTSTANDING                                    :Suurepärane
 ############ range for rating ends
 
+### station view strings
+STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Näita kõiki ronge, mille sõidugraafik sisaldab seda rongijaama
+STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Näita kõiki mootorsõidukeid, mille sõidugraafik sisaldab seda jaama
+STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Näita kõiki lennukeid, mille sõidugraafik sisaldab seda lennujaama
+STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Näita kõiki laevu, mille sõidugraafik sisaldab seda sadamat
+
 STR_STATION_VIEW_CARGO_RATING                                   :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO                        :{WHITE}Jaam {STATION} ei võta enam vastu veost {STRING}
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO               :{WHITE}Jaam {STATION} ei võta enam vastu veoseid {STRING}, ega {STRING}
@@ -2135,6 +2108,7 @@ STR_SV_STNAME_AIRPORT                                           :{STRING} lennuv
 STR_SV_STNAME_OILFIELD                                          :{STRING} naftaväli
 STR_SV_STNAME_MINES                                             :{STRING} kaevandused
 STR_SV_STNAME_DOCKS                                             :{STRING} dokid
+##id 0x6020
 STR_SV_STNAME_ANNEXE                                            :{STRING} juurdeehitis
 STR_SV_STNAME_SIDINGS                                           :{STRING} hargnemine
 STR_SV_STNAME_BRANCH                                            :{STRING} filiaal
@@ -2182,8 +2156,6 @@ STR_NUM_LOW                                                     :Madal
 STR_NUM_NORMAL                                                  :Harilik
 STR_NUM_HIGH                                                    :Kõrge
 STR_NUM_CUSTOM                                                  :Omatehtud
-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
@@ -2217,7 +2189,6 @@ STR_CITY_APPROVAL_HOSTILE                                       :Vaenulik
 
 ##id 0x7000
 STR_COMPANY_VIEW_CAPTION                                        :{WHITE}{COMPANY}{BLACK}{COMPANYNUM}
-STR_FORMAT_COMPANY_NUM                                          :(Ettevõte {COMMA})
 STR_COMPANY_VIEW_NEW_FACE_BUTTON                                :{BLACK}Uus nägu
 STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON                           :{BLACK}Värvivalik
 STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}Värvivalik:
@@ -2250,7 +2221,6 @@ STR_FINANCES_TOTAL_CAPTION                                      :{WHITE}Kokku:
 STR_COMPANY_NAME_COMPANY_NUM                                    :{COMPANY} {COMPANYNUM}
 STR_GRAPH_INCOME_CAPTION                                        :{WHITE}Tulugraafik
 STR_CURRCOMPACT                                                 :{CURRCOMPACT}
-STR_JUST_COMMA                                                  :{COMMA}
 STR_GRAPH_OPERATING_PROFIT_CAPTION                              :{WHITE}Opereerimiskasumi graafik
 STR_FINANCES_BANK_BALANCE_TITLE                                 :{WHITE}Kontojääk
 STR_FINANCES_LOAN_TITLE                                         :{WHITE}Laen
@@ -2653,10 +2623,8 @@ STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE                          :monorelssvedur
 STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE                            :magnethõljukvedur
 
 ##id 0x8800
-STR_DEPOT_TRAIN_CAPTION                                         :{WHITE}Linna {TOWN} rongidepoo
 STR_NEWS_FIRST_TRAIN_ARRIVAL                                    :{BLACK}{BIGFONT}Rahvas rõõmustab. . .{}{STATION} jaama saabus esimene rong!
 STR_VEHICLE_DETAILS_CAPTION                                     :{WHITE}{VEHICLE} (täpsustused)
-STR_ERROR_TRAIN_IN_THE_WAY                                      :{WHITE}Rong on ees
 STR_ORDER                                                       :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 STR_ORDER_SELECTED                                              :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 STR_ORDER_NON_STOP                                              :{BLACK}Peatusteta
@@ -2746,38 +2714,16 @@ STR_TIMETABLE_AND_TRAVEL_FOR                                    :ja sõida {STRI
 STR_TIMETABLE_DAYS                                              :{COMMA} päev{P "" a}
 STR_TIMETABLE_TICKS                                             :{COMMA} tiks{P "" u}
 
-STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Suundub linna {TOWN} rongidepoosse
-STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Suundub linna {TOWN} rongidepoosse, {VELOCITY}
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Hooldus linna {TOWN} raudteedepoos
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Hooldus linna {TOWN} raudteedepoos, {VELOCITY}
-
 STR_INVALID_ORDER                                               :{RED} (Ebasobiv järjekord)
 
 STR_UNKNOWN_STATION                                             :tundmatu jaam
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}Tühi
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} jaamast {STATION}
 STR_VEHICLE_DETAILS_CARGO_FROM_MULT                             :{LTBLUE}{CARGO} jaamast {STATION} (x{NUM})
-STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} ootab depoos
-STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Uus rong
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}Rong on liiga pikk
 STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}Ainult depoos peatunud ronge saab muuta
-STR_VEHICLE_LIST_TRAIN_CAPTION                                  :{WHITE}{STRING} - {COMMA} rong{P "" i}
 
-STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}Uued rööbassõidukid
-STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}Uus elektriraudteesõiduk
-STR_BUILD_VEHICLE_TRAIN_MONORAIL_CAPTION                        :{WHITE}Uus monorelsssõiduk
-STR_BUILD_VEHICLE_TRAIN_MAGLEV_CAPTION                          :{WHITE}Uus magnethõljuksõiduk
-STR_BUILD_VEHICLE_TRAIN_ALL_CAPTION                             :{WHITE}Rööbassõidukid
-
-STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_BUTTON                    :{BLACK}Ehita sõiduk
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Kloonimine
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}See paljundab mootorsõidukit. CTRL-klõps jagab sihtpunkte
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}See paljundab mootorsõidukit. Klõpsa seda nuppu, ning seejärel mootorsõidukil depoos või sellest väljas. CTRL-klõps jagab sihtpunkte
-STR_CLONE_TRAIN                                                 :{BLACK}Klooni rong
-STR_CLONE_TRAIN_INFO                                            :{BLACK}See ehitab koopia rongist koos kõikide vagunitega. CTRL-klikk jagab sihtpunkte
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}See ehitab koopia rongist koos kõikide vagunitega. Vajuta sellele nuppule, ning seejärel rongile depoo sees või väljas. CTRL-klikk jagab sihtpunkte
-STR_BUILD_VEHICLE_TRAIN_RENAME_BUTTON                           :{BLACK}Nimevahetus
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Jäta vahele
 STR_ORDERS_DELETE_BUTTON                                        :{BLACK}Kustuta
 STR_ORDERS_GO_TO_BUTTON                                         :{BLACK}Mine
@@ -2793,14 +2739,12 @@ STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Lülita
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (käsud)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Sihtpunktide lõpp - -
 STR_SERVICE                                                     :{BLACK}Hooldus
-STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Rööbassõidukit ei saa ehitada...
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Ehitatud: {LTBLUE}{NUM}{BLACK} Väärtus: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Väärtus: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
 STR_VEHICLE_STATUS_LOADING_UNLOADING                            :{LTBLUE}Veose ümberlaadimine
 STR_VEHICLE_STATUS_LEAVING                                      :{LTBLUE}Lahkub
 STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}Rong peab olema depoos peatatud
-STR_ERROR_CAN_T_SEND_TRAIN_TO_DEPOT                             :{WHITE}Rongi ei saa depoosse saata...
 STR_ERROR_NO_MORE_SPACE_FOR_ORDERS                              :{WHITE}Pole ruumi käskudeks
 STR_ERROR_TOO_MANY_ORDERS                                       :{WHITE}Liiga palju käske
 STR_ERROR_CAN_T_INSERT_NEW_ORDER                                :{WHITE}Ei saa lisada uut käsku...
@@ -2815,26 +2759,11 @@ STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE}seda kä
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}Transpordivahendit ei saa liigutada...
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}Tagumine vedur järgneb alati eesmisele
 STR_CARGO_N_A                                                   :N/A{SKIP}
-STR_ERROR_CAN_T_SELL_TRAIN                                      :{WHITE}Rööbassõidukit ei saa müüa...
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}Ei leia teed kohalikku depoosse
-STR_ERROR_CAN_T_STOP_START_TRAIN                                :{WHITE}Ei saa peatada/startida rongi...
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}Hooldusvahemik: {LTBLUE}{COMMA} päeva{BLACK}  Viimati hooldatud: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}Hooldusvahemik: {LTBLUE}{COMMA}%{BLACK}   Viimati hooldatud: {LTBLUE}{DATE_LONG}
-STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP                             :{BLACK}Rongid - vajuta rongile info jaoks
-STR_DEPOT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Rongid - et andmeid saada, vajuta rongile; liiguta vagunit, et seda rongile lisada või sellelt eemaldada
-STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP                            :{BLACK}Osta uus rongi veok
-STR_DEPOT_TRAIN_SELL_TOOLTIP                                    :{BLACK}Tiri rongi veok siia et müüa
-STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}Keskenda põhivaade rongidepoo kohale
-STR_BUILD_VEHICLE_TRAIN_LIST_TOOLTIP                            :{BLACK}Nimekiri raudteesõidukitest - andmete saamiseks klõpsa raudteesõidukile
-STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_TOOLTIP                   :{BLACK}Ehita valitud raudteesõiduk
-STR_BUILD_VEHICLE_TRAIN_RENAME_TOOLTIP                          :{BLACK}Muuda raudteesõiduki tüübinime
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP                 :{BLACK}Praegune rongi tegevus - vajuta siia et peatada/käivitada rong
-STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP                           :{BLACK}Näita rongi sihtpunkte
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP                         :{BLACK}Vaate viimine rongi asukohale
-STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP                    :{BLACK}Saada rong depoosse
 STR_VEHICLE_VIEW_TRAIN_IGNORE_SIGNAL_TOOLTIP                    :{BLACK}Sunni rongi signaale eirama
 STR_VEHICLE_VIEW_TRAIN_REVERSE_TOOLTIP                          :{BLACK}Pööra rong ümber
-STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Näita rongi täpsustusi
 STR_VEHICLE_DETAILS_INCREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Suurenda hooldusvahemiku
 STR_VEHICLE_DETAILS_DECREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Vähenda hooldusvahemiku
 STR_VEHICLE_DETAILS_TRAIN_CARGO_TOOLTIP                         :{BLACK}Näita täpsustusi viidud kauba kohta
@@ -2868,13 +2797,9 @@ STR_VEHICLE_STATUS_STOPPED                                      :{RED}Peatatud
 STR_ERROR_CAN_T_MAKE_TRAIN_PASS_SIGNAL                          :{WHITE}Rongi ei saa ohu korral sundida signaale eirama...
 STR_VEHICLE_STATUS_CRASHED                                      :{RED}Kokkupõrge!
 
-STR_QUERY_RENAME_TRAIN_CAPTION                                  :{WHITE}Anna rongile nimi
-STR_ERROR_CAN_T_RENAME_TRAIN                                    :{WHITE}Ei saa nimetada rongi...
-STR_VEHICLE_DETAILS_TRAIN_RENAME                                :{BLACK}Rongi nimi
 STR_NEWS_TRAIN_CRASH                                            :{BLACK}{BIGFONT}RONGIKOKKUPÕRGE!{}{COMMA} surid tules peale kokkusõitmist
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Ei saa rongi ümber pöörata.
-STR_QUERY_RENAME_TRAIN_TYPE_CAPTION                             :{WHITE}Vaheta rongivaguni tüübinime
-STR_ERROR_CAN_T_RENAME_TRAIN_TYPE                               :{WHITE}Raudteesõiduki tüübinime ei saa vahetada...
+STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Mitmest osast koosnevaid veovahendeid ei saa ümber pöörata
 STR_CLEAR_TIME                                                  :{BLACK}Tühista aeg
 STR_RESET_LATENESS                                              :{BLACK}Tühista hilinemisloendur
 STR_CHANGE_WAYPOINT_NAME                                        :{BLACK}Muuda meldepunkti nime
@@ -2906,178 +2831,53 @@ STR_TIMETABLE_AUTOFILL                                          :{BLACK}Täida i
 STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Täida liiniplaan järgmise sõidu andmetega (Ctrl+klõps säilitamaks ooteaegu)
 
 ##id 0x9000
-STR_ERROR_ROAD_VEHICLE_IN_THE_WAY                               :{WHITE}Mootorsõiduk takistab teed
-STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING} - {COMMA} mootorsõiduk{P "" it}
-STR_DEPOT_ROAD_VEHICLE_CAPTION                                  :{WHITE}Linna {TOWN} mootorsõidukidepoo
-STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_BUTTON                      :{BLACK}Ostmine
-STR_BUILD_VEHICLE_ROAD_VEHICLE_CAPTION                          :{WHITE}Uued mootorsõidukid
-STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_BUTTON             :{BLACK}Ehita veovahend
-STR_ERROR_CAN_T_BUILD_ROAD_VEHICLE                              :{WHITE}Mootorsõidukit ei saa ehitada...
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}...peab garaaþis olema
-STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}Ei saa veokit müüa...
-STR_ERROR_CAN_T_STOP_START_ROAD_VEHICLE                         :{WHITE}Ei saa veokit peatada, ega startida...
-STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} ootab depoos
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Suundub {TOWN} garaaþi
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Suundub {TOWN} garaaþi, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Hooldus linna {TOWN} depoos
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Hooldus linna {TOWN} depoos, {VELOCITY}
-STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Ei saa veokit garaaži saata
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Ei leia kohalikku garaaži üles
-STR_VEHICLE_LIST_ROAD_VEHICLE_TOOLTIP                           :{BLACK}Veokid - info saamiseks vajuta veokile
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP          :{BLACK}Transpordivahendi praegune tegevus - selle peatamiseks või startimiseks klõpsa siia
-STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP                    :{BLACK}Näita veovahendi sihtpunkte
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP                  :{BLACK}Keskenda vaade veovahendile
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}Saada sõiduk garaaži. CTRL+klõps, et ainult teenindada.
 STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP                   :{BLACK}Sunni veovahendit ümber pöörama
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Näita mootorsõiduki täpsustusi
-STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Veovahendid - andmete saamiseks klõpsa veovahendile
-STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}Ehita uus mootorsõiduk
-STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}Et müüa, tiri sõiduk siia
-STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}Vii vaade garaaþi asukohale
-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_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})
 
-STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Nimeta mootorsõiduk ümber
-STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Ei saa maanteveokit ümber nimetada...
-STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Nimeta mootorsõidukit
 STR_NEWS_FIRST_BUS_ARRIVAL                                      :{BLACK}{BIGFONT}Rahvas rõõmustab . . .{}{STATION} jaama saabus esimene buss!
 STR_NEWS_FIRST_TRUCK_ARRIVAL                                    :{BLACK}{BIGFONT}Rahvas rõõmustab . . .{} esimene veok saabus {STATION} jaama!
 STR_NEWS_FIRST_PASSENGER_TRAM_ARRIVAL                           :{BLACK}{BIGFONT}Kodanikud tähistavad . . .{}Esimene reisitramm saabus trammijaama {STATION}!
 STR_NEWS_FIRST_CARGO_TRAM_ARRIVAL                               :{BLACK}{BIGFONT}Kodanikud tähistavad . . .{}Esimene kaubatramm saabus trammijaama {STATION}!
 STR_NEWS_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Rongikokkupõrge!{}Juht suri peale õnnetust tules
 STR_NEWS_ROAD_VEHICLE_CRASH                                     :{BLACK}{BIGFONT}Mootorsõiduki kokkupõrge rongiga!{}{COMMA} inimest suri õnnetuses
-STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Mitmest osast koosnevaid veovahendeid ei saa ümber pöörata
-STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Nimevahetus
-STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Muuda mootorsõiduki tüübinime
-STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Vaheta mootorsõiduki tüübinime
-STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Mootorsõiduki tüübinime ei saa vahetada...
 
-STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Seadista mootorsõidukit kandmaks teist tüüpi veost
-STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Muuda mootorsõiduki seadistust
-STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Seadista mootorsõidukit kandma valitud veotüüpi
-STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Mootorsõiduki seadistust ei saa ümber muuta
-STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Vali maanteesõiduki veetav veoseliik
 
 ##id 0x9800
 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :Veeteede ehitamine
 STR_WATERWAYS_TOOLBAR_CAPTION                                   :{WHITE}Veeteede ehitamine
 STR_WATERWAYS_TOOLBAR_CAPTION_SE                                :{WHITE}Veeteed
 STR_ERROR_CAN_T_BUILD_DOCK_HERE                                 :{WHITE}Dokki ei saa siia ehitada...
-STR_DEPOT_SHIP_CAPTION                                          :{WHITE}{TOWN} Laevaremonditehas
-STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON                              :{BLACK}Uus laev
-STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - {COMMA} laev{P "" a}
-STR_BUILD_VEHICLE_SHIP_CAPTION                                  :{WHITE}Uued laevad
-STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON                     :{BLACK}Ehita laev
-STR_CLONE_SHIP                                                  :{BLACK}Klooni laev
-STR_CLONE_SHIP_INFO                                             :{BLACK}See ehitab koopia laevast. CTRL-klikk jagab sihtpunkte
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}See ehitab koopia laevast. Vajuta sellele nuppule, ning seejärel laevale laevaremonditehase sees või väljas. Sihtpunkte jagab CTRL-klikk.
 STR_ERROR_SHIP_MUST_BE_STOPPED_IN_DEPOT                         :{WHITE}Laev peab olema sadamas peatatud
-STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}Ei saa laeva müüa
-STR_ERROR_CAN_T_BUILD_SHIP                                      :{WHITE}Ei saa laeva ehitada...
-STR_ERROR_SHIP_IN_THE_WAY                                       :{WHITE}Laev on ees
-STR_ERROR_CAN_T_STOP_START_SHIP                                 :{WHITE}Ei saa peatada/käivitada laeva...
-STR_ERROR_CAN_T_SEND_SHIP_TO_DEPOT                              :{WHITE}Ei saa laeva angaari saata...
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Suundub linna {TOWN} laevaremonditehasesse.
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Suundub linna {TOWN} laevaremonditehasesse, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Hooldus linna {TOWN} laevaremonditehases.
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Hooldus linna {TOWN} laevaremonditehases, {VELOCITY}
-STR_NEWS_SHIP_IS_WAITING                                        :{WHITE}{VEHICLE} ootab depoos
 STR_WATERWAYS_TOOLBAR_BUILD_DOCK_TOOLTIP                        :{BLACK}Ehita laevadokk
 STR_WATERWAYS_TOOLBAR_BUILD_DEPOT_TOOLTIP                       :{BLACK}Ehita laevaremonditehas (laevade ehitamiseks ja hoolduseks)
-STR_DEPOT_SHIP_LIST_TOOLTIP                                     :{BLACK}Laevad - info saamiseks klõpsa laevale
-STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}Ehita uus laev
-STR_DEPOT_SHIP_SELL_TOOLTIP                                     :{BLACK}Müügiks tiri laev siia
-STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}Vii pea vaade paadikuuri juurde
-STR_VEHICLE_LIST_SHIP_TOOLTIP                                   :{BLACK}Laevad - info saamiseks klõpsa laevale
-STR_BUILD_VEHICLE_SHIP_LIST_TOOLTIP                             :{BLACK}Laevade nimekiri - info saamiseks klõps laevale
-STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP                    :{BLACK}Ehita valitud laev
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP                  :{BLACK}Praegune laeva tegevus - vajuta siia, et peatada/käivitada laeva
-STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Näita laeva sihtpunkte
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP                          :{BLACK}Vii vaade laeva asukohale
-STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}Saada laev angaari. CTRL+klikk ainult teenindab.
-STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Näita laeva täpsustusi
-STR_VEHICLE_DETAILS_SHIP_RENAME                                 :{BLACK}Anna laevale nimi
 
-STR_QUERY_RENAME_SHIP_CAPTION                                   :{WHITE}Anna laevale nimi
-STR_ERROR_CAN_T_RENAME_SHIP                                     :{WHITE}Ei saa laeva ümber nimetada...
 STR_NEWS_FIRST_SHIP_ARRIVAL                                     :{BLACK}{BIGFONT}Rahvas rõõmustab . . .{}{STATION} terminali saabus esimene laev!
 STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}Raja teemärgisena kasutatav poi
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}Poid ei saa siia asetada...
 STR_BUILD_AQUEDUCT                                              :{BLACK}Ehita veejuhe
 STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}Siia ei saa veejuhet ehitada...
-STR_BUILD_VEHICLE_SHIP_RENAME_BUTTON                            :{BLACK}Nimevahetus
-STR_BUILD_VEHICLE_SHIP_RENAME_TOOLTIP                           :{BLACK}Laeva tüübinime muutmine
-STR_QUERY_RENAME_SHIP_TYPE_CAPTION                              :{WHITE}Laeva tüübinime vahetamine
-STR_ERROR_CAN_T_RENAME_SHIP_TYPE                                :{WHITE}Laeva tüübinime ei saa vahetada...
-STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}Seadista kaubalaev teisele veosele
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (Seadista ümber)
-STR_REFIT_SHIP_REFIT_BUTTON                                     :{BLACK}Seadista laev ümber
-STR_REFIT_SHIP_LIST_TOOLTIP                                     :{BLACK}Vali kaubalaeva veetav veoseliik
-STR_REFIT_SHIP_REFIT_TOOLTIP                                    :{BLACK}Seadista laev ümber valitud kaubatüübi jaoks
 STR_REFIT_TITLE                                                 :{GOLD}Vali veetav veoseliik:
 STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}Uus kandevõime: {GOLD}{CARGO}{}{BLACK}Laeva ümberseadistamise hind: {GOLD}{CURRENCY}
-STR_ERROR_CAN_T_REFIT_SHIP                                      :{WHITE}Ei saa laeva ümber seadistada...
 STR_REFITTABLE                                                  :(ümberseadistatav)
 
 ##id 0xA000
 STR_TOOLBAR_AIRCRAFT_CAPTION                                    :{WHITE}Lennuväljad
 STR_ERROR_CAN_T_BUILD_AIRPORT_HERE                              :{WHITE}Siia ei saa lennuvälja rajada...
-STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}{STATION} Lennujaama angaar
-STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON                          :{BLACK}Uus lennuk
-STR_CLONE_AIRCRAFT                                              :{BLACK}Klooni lennuk
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}See paljundab õhusõidukit. CTRL-klikk jagab sihtpunkte
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}See paljundab õhusõidukit. Vajuta sellele nuppule, ning seejärel lennukile angaari sees või väljas. CTRL-klikk jagab sihtpunkte
-STR_BUILD_VEHICLE_AIRCRAFT_CAPTION                              :{WHITE}Uus lennuk
-STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON                 :{BLACK}Ehita lennuk
-STR_ERROR_CAN_T_BUILD_AIRCRAFT                                  :{WHITE}Ei saa ehitada lennukit...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} lennuk{P "" it}
-STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR                         :{WHITE}Ei saa lennukit angaari saata...
-STR_HEADING_FOR_HANGAR                                          :{ORANGE}Suundub {STATION} Angaari
-STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Suundub {STATION} angaari, {VELOCITY}
-STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Hooldus linna {STATION} angaaris
-STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Hooldus linna {STATION} angaaris, {VELOCITY}
-STR_NEWS_AIRCRAFT_IS_WAITING                                    :{WHITE}{VEHICLE} ootab lennukiangaaris
-STR_ERROR_AIRCRAFT_IN_THE_WAY                                   :{WHITE}Lennuk on teel
-STR_ERROR_CAN_T_STOP_START_AIRCRAFT                             :{WHITE}Ei saa lennukit peatada/käivitada...
 STR_ERROR_AIRCRAFT_IS_IN_FLIGHT                                 :{WHITE}Lennuk on õhus
 STR_ERROR_AIRCRAFT_MUST_BE_STOPPED                              :{WHITE}Lennuk peab olema peatatud angaari sees
-STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}Ei saa lennukit müüa...
 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION                          :Lennuväljade ehitamine
 STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Ehita lennuväli
-STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP                               :{BLACK}Lennuk - info saamiseks vajuta lennukile
-STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Lennuk - info saamiseks vajuta lennukile
-STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}Ehita uus lennuk
-STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}Müümiseks tiri lennuk siia
-STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Vii vaade angaarile
-STR_BUILD_VEHICLE_AIRCRAFT_LIST_TOOLTIP                         :{BLACK}Lennukite nimekiri - info saamiseks vajuta lennukile
-STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_TOOLTIP                :{BLACK}Ehita valitud lennuk
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP              :{BLACK}Praegune lennuki tegevus - vajuta siia et käivitada või peatada lennukit
-STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Näita lennuki sihtpunke
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP                      :{BLACK}Vii peavaade lennukile
-STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}Saada lennuk angaari
-STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Näita lennuki täpsustusi
 
-STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}Anna lennukile nimi
-STR_ERROR_CAN_T_RENAME_AIRCRAFT                                 :{WHITE}Ei saa lennukile nime anda
-STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}Nimeta lennuk ümber
 STR_NEWS_FIRST_AIRCRAFT_ARRIVAL                                 :{BLACK}{BIGFONT}Rahvas rõõmustab . . .{}{STATION} terminali saabus esimene lennuk!
 STR_NEWS_AIRCRAFT_CRASH                                         :{BLACK}{BIGFONT}Lennuõnnetus!{}{COMMA} surid tules {STATION}s
 STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Lennuõnnetus!{}Lennukil lõppes kütus, {COMMA} surid tules!
 STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
-STR_BUILD_VEHICLE_AIRCRAFT_RENAME_BUTTON                        :{BLACK}Nimevahetus
-STR_BUILD_VEHICLE_AIRCRAFT_RENAME_TOOLTIP                       :{BLACK}Lennuki tüübinime muutmine
-STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION                          :{WHITE}Lennuki tüübinime vahetamine
-STR_ERROR_CAN_T_RENAME_AIRCRAFT_TYPE                            :{WHITE}Lennuki tüübinime ei saa vahetada...
-STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Seadista lennuk teistsuguse kauba kandmiseks ümber
-STR_REFIT_AIRCRAFT_REFIT_BUTTON                                 :{BLACK}Seadista lennuk ümber
-STR_REFIT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Vali lennuki veetav veoseliik
-STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}Seadista lennuk ümber, et kanda valitud kaubatüüpi
-STR_ERROR_CAN_T_REFIT_AIRCRAFT                                  :{WHITE}Ei saa lennukit ümber seadistada...
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Sõiduplaan)
 
@@ -3231,15 +3031,225 @@ STR_LORRY                                                       :{BLACK}{LORRY}
 STR_PLANE                                                       :{BLACK}{PLANE}
 STR_SHIP                                                        :{BLACK}{SHIP}
 
+############ Vehicle lists
+STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP                             :{BLACK}Rongid - vajuta rongile info jaoks
+STR_VEHICLE_LIST_ROAD_VEHICLE_TOOLTIP                           :{BLACK}Veokid - info saamiseks vajuta veokile
+STR_VEHICLE_LIST_SHIP_TOOLTIP                                   :{BLACK}Laevad - info saamiseks klõpsa laevale
+STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP                               :{BLACK}Lennuk - info saamiseks vajuta lennukile
 
-STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Näita kõiki ronge, mille sõidugraafik sisaldab seda rongijaama
-STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Näita kõiki mootorsõidukeid, mille sõidugraafik sisaldab seda jaama
-STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Näita kõiki lennukeid, mille sõidugraafik sisaldab seda lennujaama
-STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Näita kõiki laevu, mille sõidugraafik sisaldab seda sadamat
+STR_VEHICLE_LIST_TRAIN_CAPTION                                  :{WHITE}{STRING} - {COMMA} rong{P "" i}
+STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING} - {COMMA} mootorsõiduk{P "" it}
+STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - {COMMA} laev{P "" a}
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} lennuk{P "" it}
 
 STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}{COMMA} sõiduki vahel jagatud sõidugraafik
 STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Näita kõiki sama sõidugraafikuga mootorsõidukeid
 
+STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} ootab depoos
+STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} ootab depoos
+STR_NEWS_SHIP_IS_WAITING                                        :{WHITE}{VEHICLE} ootab depoos
+STR_NEWS_AIRCRAFT_IS_WAITING                                    :{WHITE}{VEHICLE} ootab lennukiangaaris
+
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Seadista ümber
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Muuda mootorsõiduki seadistust
+STR_REFIT_SHIP_REFIT_BUTTON                                     :{BLACK}Seadista laev ümber
+STR_REFIT_AIRCRAFT_REFIT_BUTTON                                 :{BLACK}Seadista lennuk ümber
+
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Rongi ümberseadistamine valitud laadungi vedamiseks
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Seadista mootorsõidukit kandma valitud veotüüpi
+STR_REFIT_SHIP_REFIT_TOOLTIP                                    :{BLACK}Seadista laev ümber valitud kaubatüübi jaoks
+STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}Seadista lennuk ümber, et kanda valitud kaubatüüpi
+
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Vali rongi veetav veoseliik
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Vali maanteesõiduki veetav veoseliik
+STR_REFIT_SHIP_LIST_TOOLTIP                                     :{BLACK}Vali kaubalaeva veetav veoseliik
+STR_REFIT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Vali lennuki veetav veoseliik
+
+STR_DEPOT_TRAIN_CAPTION                                         :{WHITE}Linna {TOWN} rongidepoo
+STR_DEPOT_ROAD_VEHICLE_CAPTION                                  :{WHITE}Linna {TOWN} mootorsõidukidepoo
+STR_DEPOT_SHIP_CAPTION                                          :{WHITE}{TOWN} Laevaremonditehas
+STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}{STATION} Lennujaama angaar
+
+STR_VEHICLE_DETAILS_TRAIN_RENAME                                :{BLACK}Rongi nimi
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Nimeta mootorsõidukit
+STR_VEHICLE_DETAILS_SHIP_RENAME                                 :{BLACK}Anna laevale nimi
+STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}Nimeta lennuk ümber
+
+STR_QUERY_RENAME_TRAIN_CAPTION                                  :{WHITE}Anna rongile nimi
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Nimeta mootorsõiduk ümber
+STR_QUERY_RENAME_SHIP_CAPTION                                   :{WHITE}Anna laevale nimi
+STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}Anna lennukile nimi
+
+STR_ERROR_TRAIN_IN_THE_WAY                                      :{WHITE}Rong on ees
+STR_ERROR_ROAD_VEHICLE_IN_THE_WAY                               :{WHITE}Mootorsõiduk takistab teed
+STR_ERROR_SHIP_IN_THE_WAY                                       :{WHITE}Laev on ees
+STR_ERROR_AIRCRAFT_IN_THE_WAY                                   :{WHITE}Lennuk on teel
+
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Ei ole võimalik ümber seadistada...
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Mootorsõiduki seadistust ei saa ümber muuta
+STR_ERROR_CAN_T_REFIT_SHIP                                      :{WHITE}Ei saa laeva ümber seadistada...
+STR_ERROR_CAN_T_REFIT_AIRCRAFT                                  :{WHITE}Ei saa lennukit ümber seadistada...
+
+STR_ERROR_CAN_T_RENAME_TRAIN                                    :{WHITE}Ei saa nimetada rongi...
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Ei saa maanteveokit ümber nimetada...
+STR_ERROR_CAN_T_RENAME_SHIP                                     :{WHITE}Ei saa laeva ümber nimetada...
+STR_ERROR_CAN_T_RENAME_AIRCRAFT                                 :{WHITE}Ei saa lennukile nime anda
+
+STR_ERROR_CAN_T_STOP_START_TRAIN                                :{WHITE}Ei saa peatada/startida rongi...
+STR_ERROR_CAN_T_STOP_START_ROAD_VEHICLE                         :{WHITE}Ei saa veokit peatada, ega startida...
+STR_ERROR_CAN_T_STOP_START_SHIP                                 :{WHITE}Ei saa peatada/käivitada laeva...
+STR_ERROR_CAN_T_STOP_START_AIRCRAFT                             :{WHITE}Ei saa lennukit peatada/käivitada...
+
+STR_ERROR_CAN_T_SEND_TRAIN_TO_DEPOT                             :{WHITE}Rongi ei saa depoosse saata...
+STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Ei saa veokit garaaži saata
+STR_ERROR_CAN_T_SEND_SHIP_TO_DEPOT                              :{WHITE}Ei saa laeva angaari saata...
+STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR                         :{WHITE}Ei saa lennukit angaari saata...
+
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Rööbassõidukit ei saa ehitada...
+STR_ERROR_CAN_T_BUILD_ROAD_VEHICLE                              :{WHITE}Mootorsõidukit ei saa ehitada...
+STR_ERROR_CAN_T_BUILD_SHIP                                      :{WHITE}Ei saa laeva ehitada...
+STR_ERROR_CAN_T_BUILD_AIRCRAFT                                  :{WHITE}Ei saa ehitada lennukit...
+
+STR_ERROR_CAN_T_RENAME_TRAIN_TYPE                               :{WHITE}Raudteesõiduki tüübinime ei saa vahetada...
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Mootorsõiduki tüübinime ei saa vahetada...
+STR_ERROR_CAN_T_RENAME_SHIP_TYPE                                :{WHITE}Laeva tüübinime ei saa vahetada...
+STR_ERROR_CAN_T_RENAME_AIRCRAFT_TYPE                            :{WHITE}Lennuki tüübinime ei saa vahetada...
+
+STR_ERROR_CAN_T_SELL_TRAIN                                      :{WHITE}Rööbassõidukit ei saa müüa...
+STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}Ei saa veokit müüa...
+STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}Ei saa laeva müüa
+STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}Ei saa lennukit müüa...
+
+STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP                 :{BLACK}Praegune rongi tegevus - vajuta siia et peatada/käivitada rong
+STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP          :{BLACK}Transpordivahendi praegune tegevus - selle peatamiseks või startimiseks klõpsa siia
+STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP                  :{BLACK}Praegune laeva tegevus - vajuta siia, et peatada/käivitada laeva
+STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP              :{BLACK}Praegune lennuki tegevus - vajuta siia et käivitada või peatada lennukit
+
+STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP                           :{BLACK}Näita rongi sihtpunkte
+STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP                    :{BLACK}Näita veovahendi sihtpunkte
+STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Näita laeva sihtpunkte
+STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Näita lennuki sihtpunke
+
+STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP                         :{BLACK}Vaate viimine rongi asukohale
+STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP                  :{BLACK}Keskenda vaade veovahendile
+STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP                          :{BLACK}Vii vaade laeva asukohale
+STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP                      :{BLACK}Vii peavaade lennukile
+
+STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP                    :{BLACK}Saada rong depoosse
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}Saada sõiduk garaaži. CTRL+klõps, et ainult teenindada.
+STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}Saada laev angaari. CTRL+klikk ainult teenindab.
+STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}Saada lennuk angaari
+
+STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Näita rongi täpsustusi
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Näita mootorsõiduki täpsustusi
+STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Näita laeva täpsustusi
+STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Näita lennuki täpsustusi
+
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Rongi seadistamine mõne teise laadungi vedamiseks
+STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Seadista mootorsõidukit kandmaks teist tüüpi veost
+STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}Seadista kaubalaev teisele veosele
+STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Seadista lennuk teistsuguse kauba kandmiseks ümber
+
+STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Suundub linna {TOWN} rongidepoosse
+STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Suundub linna {TOWN} rongidepoosse, {VELOCITY}
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Suundub {TOWN} garaaþi
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Suundub {TOWN} garaaþi, {VELOCITY}
+STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Suundub linna {TOWN} laevaremonditehasesse.
+STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Suundub linna {TOWN} laevaremonditehasesse, {VELOCITY}
+STR_HEADING_FOR_HANGAR                                          :{ORANGE}Suundub {STATION} Angaari
+STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Suundub {STATION} angaari, {VELOCITY}
+
+STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Hooldus linna {TOWN} raudteedepoos
+STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Hooldus linna {TOWN} raudteedepoos, {VELOCITY}
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Hooldus linna {TOWN} depoos
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Hooldus linna {TOWN} depoos, {VELOCITY}
+STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Hooldus linna {TOWN} laevaremonditehases.
+STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Hooldus linna {TOWN} laevaremonditehases, {VELOCITY}
+STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Hooldus linna {STATION} angaaris
+STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Hooldus linna {STATION} angaaris, {VELOCITY}
+
+
+STR_CLONE_TRAIN                                                 :{BLACK}Klooni rong
+STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Kloonimine
+STR_CLONE_SHIP                                                  :{BLACK}Klooni laev
+STR_CLONE_AIRCRAFT                                              :{BLACK}Klooni lennuk
+
+STR_CLONE_TRAIN_INFO                                            :{BLACK}See ehitab koopia rongist koos kõikide vagunitega. CTRL-klikk jagab sihtpunkte
+STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}See paljundab mootorsõidukit. CTRL-klõps jagab sihtpunkte
+STR_CLONE_SHIP_INFO                                             :{BLACK}See ehitab koopia laevast. CTRL-klikk jagab sihtpunkte
+STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}See paljundab õhusõidukit. CTRL-klikk jagab sihtpunkte
+
+STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}See ehitab koopia rongist koos kõikide vagunitega. Vajuta sellele nuppule, ning seejärel rongile depoo sees või väljas. CTRL-klikk jagab sihtpunkte
+STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}See paljundab mootorsõidukit. Klõpsa seda nuppu, ning seejärel mootorsõidukil depoos või sellest väljas. CTRL-klõps jagab sihtpunkte
+STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}See ehitab koopia laevast. Vajuta sellele nuppule, ning seejärel laevale laevaremonditehase sees või väljas. Sihtpunkte jagab CTRL-klikk.
+STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}See paljundab õhusõidukit. Vajuta sellele nuppule, ning seejärel lennukile angaari sees või väljas. CTRL-klikk jagab sihtpunkte
+
+STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}Uued rööbassõidukid
+STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}Uus elektriraudteesõiduk
+STR_BUILD_VEHICLE_TRAIN_MONORAIL_CAPTION                        :{WHITE}Uus monorelsssõiduk
+STR_BUILD_VEHICLE_TRAIN_MAGLEV_CAPTION                          :{WHITE}Uus magnethõljuksõiduk
+
+STR_BUILD_VEHICLE_TRAIN_ALL_CAPTION                             :{WHITE}Rööbassõidukid
+STR_BUILD_VEHICLE_ROAD_VEHICLE_CAPTION                          :{WHITE}Uued mootorsõidukid
+STR_BUILD_VEHICLE_SHIP_CAPTION                                  :{WHITE}Uued laevad
+STR_BUILD_VEHICLE_AIRCRAFT_CAPTION                              :{WHITE}Uus lennuk
+
+STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_BUTTON                    :{BLACK}Ehita sõiduk
+STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_BUTTON             :{BLACK}Ehita veovahend
+STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON                     :{BLACK}Ehita laev
+STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON                 :{BLACK}Ehita lennuk
+
+STR_BUILD_VEHICLE_TRAIN_LIST_TOOLTIP                            :{BLACK}Nimekiri raudteesõidukitest - andmete saamiseks klõpsa raudteesõidukile
+STR_BUILD_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP                     :{BLACK}Mootorsõidukite nimekiri - andmete saamiseks klõpsa sõidukile
+STR_BUILD_VEHICLE_SHIP_LIST_TOOLTIP                             :{BLACK}Laevade nimekiri - info saamiseks klõps laevale
+STR_BUILD_VEHICLE_AIRCRAFT_LIST_TOOLTIP                         :{BLACK}Lennukite nimekiri - info saamiseks vajuta lennukile
+
+STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_TOOLTIP                   :{BLACK}Ehita valitud raudteesõiduk
+STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_TOOLTIP            :{BLACK}Ehita valitud mootorsõiduk
+STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP                    :{BLACK}Ehita valitud laev
+STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_TOOLTIP                :{BLACK}Ehita valitud lennuk
+
+STR_BUILD_VEHICLE_TRAIN_RENAME_BUTTON                           :{BLACK}Nimevahetus
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Nimevahetus
+STR_BUILD_VEHICLE_SHIP_RENAME_BUTTON                            :{BLACK}Nimevahetus
+STR_BUILD_VEHICLE_AIRCRAFT_RENAME_BUTTON                        :{BLACK}Nimevahetus
+
+STR_BUILD_VEHICLE_TRAIN_RENAME_TOOLTIP                          :{BLACK}Muuda raudteesõiduki tüübinime
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Muuda mootorsõiduki tüübinime
+STR_BUILD_VEHICLE_SHIP_RENAME_TOOLTIP                           :{BLACK}Laeva tüübinime muutmine
+STR_BUILD_VEHICLE_AIRCRAFT_RENAME_TOOLTIP                       :{BLACK}Lennuki tüübinime muutmine
+
+STR_QUERY_RENAME_TRAIN_TYPE_CAPTION                             :{WHITE}Vaheta rongivaguni tüübinime
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Vaheta mootorsõiduki tüübinime
+STR_QUERY_RENAME_SHIP_TYPE_CAPTION                              :{WHITE}Laeva tüübinime vahetamine
+STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION                          :{WHITE}Lennuki tüübinime vahetamine
+
+STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Uus rong
+STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_BUTTON                      :{BLACK}Ostmine
+STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON                              :{BLACK}Uus laev
+STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON                          :{BLACK}Uus lennuk
+
+STR_DEPOT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Rongid - et andmeid saada, vajuta rongile; liiguta vagunit, et seda rongile lisada või sellelt eemaldada
+STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Veovahendid - andmete saamiseks klõpsa veovahendile
+STR_DEPOT_SHIP_LIST_TOOLTIP                                     :{BLACK}Laevad - info saamiseks klõpsa laevale
+STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Lennuk - info saamiseks vajuta lennukile
+
+STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP                            :{BLACK}Osta uus rongi veok
+STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}Ehita uus mootorsõiduk
+STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}Ehita uus laev
+STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}Ehita uus lennuk
+
+STR_DEPOT_TRAIN_SELL_TOOLTIP                                    :{BLACK}Tiri rongi veok siia et müüa
+STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}Et müüa, tiri sõiduk siia
+STR_DEPOT_SHIP_SELL_TOOLTIP                                     :{BLACK}Müügiks tiri laev siia
+STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}Müümiseks tiri lennuk siia
+
+STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}Keskenda põhivaade rongidepoo kohale
+STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}Vii vaade garaaþi asukohale
+STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}Vii pea vaade paadikuuri juurde
+STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Vii vaade angaarile
+
+
 ### depot strings
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}Sa oled müümas kõiki depoos asuvaid masinaid. Kas sa oled kindel?
 STR_DEPOT_WRONG_DEPOT_TYPE                                      :Vale depootüüp
@@ -3259,7 +3269,6 @@ STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TIP                          :{BLACK}Asenda k
 STR_DEPOT_AUTOREPLACE_SHIP_TIP                                  :{BLACK}Asenda kõik laevad depoos ise
 STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP                              :{BLACK}Asenda kõik lennumasinad angaaris ise
 
-
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Asenda {STRING}
 STR_REPLACE_VEHICLES_START                                      :{BLACK}Alusta veovahendite asendamist
 STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Lõpeta veovahendite asendamine
@@ -3275,6 +3284,7 @@ STR_REPLACE_REMOVE_WAGON                                        :{BLACK}Vagunite
 STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Sunni automaatset asendust hoidma rongi pikkust selleks (eest alustades) veeremit eemaldades, juhul kui uus vagun muudaks rongi pikemaks.
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}Asendamisel: {ORANGE}{SKIP}{SKIP}{STRING}
 STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}Vaheta aken mootori ja vaguni asendamise aknate vahel
+
 STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Sõiduk pole saadaval
 STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Sõiduk pole saadaval
 STR_SHIP_NOT_AVAILABLE                                          :{WHITE}Laev pole saadaval
@@ -3425,17 +3435,6 @@ STR_MEASURE_AREA                                                :{BLACK}Pindala:
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Pikkus: {NUM}{}Kõrguserinevus: {NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Pindala: {NUM} x {NUM}{}Kõrguste erinevus: {NUM} m
 
-############ Date formatting
-STR_FORMAT_DATE_TINY                                            :{STRING}-{STRING}-{NUM}
-STR_FORMAT_DATE_SHORT                                           :{STRING} {NUM}
-STR_FORMAT_DATE_LONG                                            :{STRING} {STRING} {NUM}
-STR_FORMAT_DATE_ISO                                             :{2:NUM}-{1:STRING}-{0:STRING}
-
-STR_JUST_DATE_TINY                                              :{DATE_TINY}
-STR_JUST_DATE_LONG                                              :{DATE_LONG}
-STR_JUST_DATE_ISO                                               :{DATE_ISO}
-########
-
 STR_FEEDER_CARGO_VALUE                                          :{BLACK}Ülekantud tulu: {LTBLUE}{CURRENCY}
 STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD                            :{WHITE}...see tee on omatud linna poolt
 STR_DRIVE_THROUGH_ERROR_DIRECTION                               :{WHITE}...tee on vales suunas
@@ -3460,7 +3459,6 @@ STR_PERCENT_UP_DOWN_SMALL                                       :{TINYFONT}{WHIT
 STR_PERCENT_UP_DOWN                                             :{WHITE}{NUM}%{UPARROW}{DOWNARROW}
 
 ##### Mass Order
-STR_FORMAT_GROUP_NAME                                           :Rühm {COMMA}
 STR_GROUP_TINY_NAME                                             :{TINYFONT}{GROUP}
 STR_GROUP_ALL_TRAINS                                            :Kõik raudteeveerem
 STR_GROUP_ALL_ROAD_VEHICLES                                     :Kõik mootorsõidukid
@@ -3489,12 +3487,62 @@ STR_GROUP_DELETE_TIP                                            :{BLACK}Eemalda
 STR_GROUP_RENAME_TIP                                            :{BLACK}Valitud rühma nime vahetamine
 STR_GROUP_REPLACE_PROTECTION_TIP                                :{BLACK}Klõpsa, et seda rühma üldise automaatse asenduse eest kaitsta
 
+#### String control codes and their formatting
 STR_COMPANY_NAME                                                :{COMPANY}
 STR_ENGINE_NAME                                                 :{ENGINE}
 STR_GROUP_NAME                                                  :{GROUP}
+STR_INDUSTRY_NAME                                               :{INDUSTRY}
 STR_PRESIDENT_NAME                                              :{PRESIDENTNAME}
 STR_SIGN_NAME                                                   :{SIGN}
+STR_STATION_NAME                                                :{STATION}
+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_LONG                                              :{DATE_LONG}
+STR_JUST_DATE_ISO                                               :{DATE_ISO}
+STR_JUST_STRING                                                 :{STRING}
+STR_JUST_RAW_STRING                                             :{STRING}
+
+STR_FORMAT_DATE_TINY                                            :{STRING}-{STRING}-{NUM}
+STR_FORMAT_DATE_SHORT                                           :{STRING} {NUM}
+STR_FORMAT_DATE_LONG                                            :{STRING} {STRING} {NUM}
+STR_FORMAT_DATE_ISO                                             :{2:NUM}-{1:STRING}-{0:STRING}
+
+STR_FORMAT_COMPANY_NUM                                          :(Ettevõte {COMMA})
+STR_FORMAT_GROUP_NAME                                           :Rühm {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}Nime ei tohi korduda
 
diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt
index 482a1fb95..2cce8e3fe 100644
--- a/src/lang/finnish.txt
+++ b/src/lang/finnish.txt
@@ -154,8 +154,6 @@ STR_ABBREV_PLASTIC                                              :{TINYFONT}MV
 STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}SJ
 STR_ABBREV_NONE                                                 :{TINYFONT}EI
 STR_ABBREV_ALL                                                  :{TINYFONT}KAIKKI
-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
@@ -167,17 +165,11 @@ STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Alkuper�
 STR_ABOUT_VERSION                                               :{BLACK}OpenTTD-versio {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}Sulje
 STR_YES                                                         :{BLACK}Kyllä
 STR_NO                                                          :{BLACK}Ei
 STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Lopetetaanko peli ja palataan {STRING}-järjestelmään?
-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                                                :Ei mitään
 STR_COLOUR_DARK_BLUE                                            :Tummansininen
 STR_COLOUR_PALE_GREEN                                           :Vaaleanvihreä
@@ -196,8 +188,6 @@ STR_COLOUR_BROWN                                                :Ruskea
 STR_COLOUR_GREY                                                 :Harmaa
 STR_COLOUR_WHITE                                                :Valkoinen
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}Liian monta ajoneuvoa pelissä.
-STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
-STR_RED_COMMA                                                   :{RED}{COMMA}
 STR_BUTTON_LOCATION                                             :{BLACK}Sijainti
 STR_SMALLMAP_TYPE_CONTOURS                                      :Korkeuserot
 STR_SMALLMAP_TYPE_VEHICLES                                      :Liikennevälineet
@@ -323,12 +313,13 @@ STR_SORT_CRITERIA_TIP                                           :{BLACK}Valitse
 STR_FILTER_CRITERIA_TIP                                         :{BLACK}Valitse suodatuskriteerit
 STR_SORT_BY                                                     :{BLACK}Lajittele
 
+### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}Asukasluku
+STR_SORT_BY_NAME                                                :{BLACK}Nimi
+STR_SORT_BY_DATE                                                :{BLACK}Päiväys
 STR_SORT_BY_PRODUCTION                                          :Tuotto
 STR_SORT_BY_TYPE                                                :Tyyppi
 STR_SORT_BY_TRANSPORTED                                         :Kuljetettu
-STR_SORT_BY_NAME                                                :{BLACK}Nimi
-STR_SORT_BY_DATE                                                :{BLACK}Päiväys
 STR_SORT_BY_NUMBER                                              :Numero
 STR_SORT_BY_PROFIT_LAST_YEAR                                    :Tuottoa viime vuonna
 STR_SORT_BY_PROFIT_THIS_YEAR                                    :Tuottoa tänä vuonna
@@ -351,37 +342,25 @@ STR_SORT_BY_INTRO_DATE                                          :Julkaisupäivä
 STR_SORT_BY_RUNNING_COST                                        :Käyttökustannukset
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :Teho-hyötysuhde
 STR_SORT_BY_CARGO_CAPACITY                                      :Rahtikapasiteetti
+
 STR_NO_WAITING_CARGO                                            :{BLACK}Minkäänlaista lastia ei ole odottamassa
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}Valitse kaikki laitteet
 STR_SELECT_ALL_TYPES                                            :{BLACK}Valitse kaikki lastityypit (myös odottava lasti)
-STR_AVAILABLE_TRAINS                                            :{BLACK}Käytett. Junat
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Käytett. Ajoneuvot
-STR_AVAILABLE_SHIPS                                             :{BLACK}Käytett. Laivat
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Käytett. Ilma-alukset
 STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Näytä lista saatavilla olevista moottorityypeistä tälle ajoneuvotyypille.
 STR_MANAGE_LIST                                                 :{BLACK}Muokkaa listaa
 STR_MANAGE_LIST_TIP                                             :{BLACK}Ohjaa kaikkia listan ajoneuvoja
 STR_REPLACE_VEHICLES                                            :Korvaa liikenneväl.
+STR_SEND_FOR_SERVICING                                          :Lähetä huoltoon
+
+STR_AVAILABLE_TRAINS                                            :{BLACK}Käytett. Junat
+STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Käytett. Ajoneuvot
+STR_AVAILABLE_SHIPS                                             :{BLACK}Käytett. Laivat
+STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Käytett. Ilma-alukset
+
 STR_SEND_TRAIN_TO_DEPOT                                         :Lähetä varikolle
 STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Lähetä varikolle
 STR_SEND_SHIP_TO_DEPOT                                          :Lähetä varikolle
 STR_SEND_AIRCRAFT_TO_HANGAR                                     :Lähetä varikolle
-STR_SEND_FOR_SERVICING                                          :Lähetä huoltoon
-
-############ range for months starts
-STR_MONTH_ABBREV_JAN                                            :01.
-STR_MONTH_ABBREV_FEB                                            :02.
-STR_MONTH_ABBREV_MAR                                            :03.
-STR_MONTH_ABBREV_APR                                            :04.
-STR_MONTH_ABBREV_MAY                                            :05.
-STR_MONTH_ABBREV_JUN                                            :06.
-STR_MONTH_ABBREV_JUL                                            :07.
-STR_MONTH_ABBREV_AUG                                            :08.
-STR_MONTH_ABBREV_SEP                                            :09.
-STR_MONTH_ABBREV_OCT                                            :10.
-STR_MONTH_ABBREV_NOV                                            :11.
-STR_MONTH_ABBREV_DEC                                            :12.
-############ range for months ends
 
 STR_GRAPH_X_LABEL_MONTH                                         :{TINYFONT}{STRING}{} {STRING}
 STR_GRAPH_X_LABEL_MONTH_YEAR                                    :{TINYFONT}{STRING}{} {STRING}{}{NUM}
@@ -409,8 +388,6 @@ 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_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
@@ -457,7 +434,7 @@ STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Ei mitään
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Nimi
 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                                          :1.
 STR_ORDINAL_NUMBER_2ND                                          :2.
 STR_ORDINAL_NUMBER_3RD                                          :3.
@@ -491,6 +468,34 @@ STR_ORDINAL_NUMBER_30TH                                         :30.
 STR_ORDINAL_NUMBER_31ST                                         :31.
 ############ range for days ends
 
+############ range for months starts
+STR_MONTH_ABBREV_JAN                                            :01.
+STR_MONTH_ABBREV_FEB                                            :02.
+STR_MONTH_ABBREV_MAR                                            :03.
+STR_MONTH_ABBREV_APR                                            :04.
+STR_MONTH_ABBREV_MAY                                            :05.
+STR_MONTH_ABBREV_JUN                                            :06.
+STR_MONTH_ABBREV_JUL                                            :07.
+STR_MONTH_ABBREV_AUG                                            :08.
+STR_MONTH_ABBREV_SEP                                            :09.
+STR_MONTH_ABBREV_OCT                                            :10.
+STR_MONTH_ABBREV_NOV                                            :11.
+STR_MONTH_ABBREV_DEC                                            :12.
+
+STR_MONTH_JAN                                                   :Tammikuu
+STR_MONTH_FEB                                                   :Helmikuu
+STR_MONTH_MAR                                                   :Maaliskuu
+STR_MONTH_APR                                                   :Huhtikuu
+STR_MONTH_MAY                                                   :Toukokuu
+STR_MONTH_JUN                                                   :Kesäkuu
+STR_MONTH_JUL                                                   :Heinäkuu
+STR_MONTH_AUG                                                   :Elokuu
+STR_MONTH_SEP                                                   :Syyskuu
+STR_MONTH_OCT                                                   :Lokakuu
+STR_MONTH_NOV                                                   :Marraskuu
+STR_MONTH_DEC                                                   :Joulukuu
+############ range for months ends
+
 STR_GRAPH_Y_LABEL_NUMBER                                        :{TINYFONT}{COMMA}
 
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}Vastaanottaa rahtia: {LTBLUE}
@@ -580,12 +585,9 @@ 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_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_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
@@ -667,9 +669,7 @@ STR_OFF                                                         :Pois
 STR_SUMMARY                                                     :Tiivistelmä
 STR_FULL                                                        :Täysi
 STR_STATUSBAR_COMPANY_NAME                                      :{SILVER}- -  {COMPANY}  - -
-STR_BLACK_STRING                                                :{BLACK}{STRING}
 
-STR_JUST_CHECKMARK                                              :{CHECKMARK}
 ############ range for menu starts
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Pelin asetukset
 STR_SETTINGS_MENU_DIFFICULTY_SETTINGS                           :Vaikeusasetukset
@@ -774,9 +774,6 @@ 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_BLACK_6                                                     :{BLACK}6
-STR_BLACK_7                                                     :{BLACK}7
-
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Englantilainen
 STR_TOWNNAME_FRENCH                                             :Ranskalainen
@@ -856,19 +853,6 @@ STR_OPTIONS_BASE_GRF_DESCRIPTION_TIP                            :{BLACK}Lisätie
 
 STR_AUTOSAVE_FAILED                                             :{WHITE}Automaattitallennus epäonnistui.
 
-STR_MONTH_JAN                                                   :Tammikuu
-STR_MONTH_FEB                                                   :Helmikuu
-STR_MONTH_MAR                                                   :Maaliskuu
-STR_MONTH_APR                                                   :Huhtikuu
-STR_MONTH_MAY                                                   :Toukokuu
-STR_MONTH_JUN                                                   :Kesäkuu
-STR_MONTH_JUL                                                   :Heinäkuu
-STR_MONTH_AUG                                                   :Elokuu
-STR_MONTH_SEP                                                   :Syyskuu
-STR_MONTH_OCT                                                   :Lokakuu
-STR_MONTH_NOV                                                   :Marraskuu
-STR_MONTH_DEC                                                   :Joulukuu
-
 STR_HEADING_FOR_STATION                                         :{LTBLUE}Suuntana {STATION}
 STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}Suuntana {STATION}, {VELOCITY}
 STR_NO_ORDERS                                                   :{LTBLUE}Ei pysähdyksiä
@@ -883,8 +867,6 @@ STR_CRATES                                                      :laatikkoa
 STR_RES_OTHER                                                   :muut
 STR_NOTHING                                                     :
 
-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...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - jaetun aikataulun loppu - -
@@ -1156,7 +1138,6 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Kartan
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :pois käytöstä
-STR_JUST_CURRENCY                                               :{CURRENCY}
 STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Muuta asetusarvo
 
 STR_TEMPERATE_LANDSCAPE                                         :lauhkea maasto
@@ -1260,11 +1241,6 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Teollisu
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...liian lähellä toista teollisuutta.
 
-STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Sovita juna kuljettamaan erityyppistä rahtia.
-STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Sovita juna
-STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Valitse junan rahtityyppi
-STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Sovita juna kuljettamaan valittua rahtityyppiä.
-STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Junaa ei voi sovittaa...
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Aloita tuotanto
 
 ############ network gui strings
@@ -2127,8 +2103,6 @@ STR_NUM_LOW                                                     :Matala
 STR_NUM_NORMAL                                                  :Normaali
 STR_NUM_HIGH                                                    :Korkea
 STR_NUM_CUSTOM                                                  :Oma
-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
@@ -2596,10 +2570,8 @@ STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE                          :yksiraiteisen v
 STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE                            :maglev-veturin
 
 ##id 0x8800
-STR_DEPOT_TRAIN_CAPTION                                         :{WHITE}{TOWN}: veturitalli
 STR_NEWS_FIRST_TRAIN_ARRIVAL                                    :{BLACK}{BIGFONT}Kaupunkilaiset juhlivat . . .{}Ensimmäinen juna saapuu asemalle {STATION}!
 STR_VEHICLE_DETAILS_CAPTION                                     :{WHITE}{VEHICLE} (yksityiskohdat)
-STR_ERROR_TRAIN_IN_THE_WAY                                      :{WHITE}Juna on tiellä.
 STR_ORDER                                                       :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 STR_ORDER_SELECTED                                              :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 STR_ORDER_NON_STOP                                              :{BLACK}Nonstop
@@ -2689,37 +2661,16 @@ STR_TIMETABLE_AND_TRAVEL_FOR                                    :ja kulje {STRIN
 STR_TIMETABLE_DAYS                                              :{COMMA} päivä{P "" ä}
 STR_TIMETABLE_TICKS                                             :{COMMA} tunti{P "" a}
 
-STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Suuntana veturitalli ({TOWN})
-STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Suuntana veturitalli ({TOWN}), {VELOCITY}
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Huolto {TOWN} Varikko
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Huolto{TOWN} Varikko, {VELOCITY}
-
 STR_INVALID_ORDER                                               :{RED} (virheellinen käsky)
 
 STR_UNKNOWN_STATION                                             :tuntematon asema
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}Tyhjä
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} asemalta {STATION}
 STR_VEHICLE_DETAILS_CARGO_FROM_MULT                             :{LTBLUE}{CARGO} asemalta {STATION} (x{NUM})
-STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} odottaa varikolla
-STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Uusia liikennevälineitä
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}Juna on liian pitkä.
 STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}Junia voi muunnella vain, kun ne ovat pysähdyksissä veturitallilla.
 
-STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}Uusi juna
-STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}Uusi sähköjuna
-STR_BUILD_VEHICLE_TRAIN_MONORAIL_CAPTION                        :{WHITE}Uusi yksiraidejuna
-STR_BUILD_VEHICLE_TRAIN_MAGLEV_CAPTION                          :{WHITE}Uusi MagLev-juna
-STR_BUILD_VEHICLE_TRAIN_ALL_CAPTION                             :{WHITE}Ratakulkuneuvot
-
-STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_BUTTON                    :{BLACK}Rakenna yksikkö
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Kloonaa ajoneuvo
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Tämä tekee kopion ajoneuvosta. Klikkaaminen Ctrl painettuna jakaa komennot
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Tämä rakentaa kopion ajoneuvosta. Paina tätä nappia ja sen jälkeen ajoneuvoa varikon sisä- tai ulkopuolella. Klikkaus Ctrl painettuna jakaa komennot
-STR_CLONE_TRAIN                                                 :{BLACK}Kloonaa juna
-STR_CLONE_TRAIN_INFO                                            :{BLACK}Tämä rakentaa kopion junasta ja kaikista sen vaunuista. Klikkaus Ctrl painettuna jakaa komennot
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Tämä rakentaa kopion junasta ja kaikista sen vaunuista. Paina tätä nappia ja sen jälkeen junaa varikon sisä- tai ulkopuolella. Klikkaus Ctrl painettuna jakaa komennot
-STR_BUILD_VEHICLE_TRAIN_RENAME_BUTTON                           :{BLACK}Nimeä
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Ohita
 STR_ORDERS_DELETE_BUTTON                                        :{BLACK}Poista
 STR_ORDERS_GO_TO_BUTTON                                         :{BLACK}Mene
@@ -2735,14 +2686,12 @@ STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Vaihda m
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (aikataulu)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - aikataulun loppu - -
 STR_SERVICE                                                     :{BLACK}Huolto
-STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Yksikköä ei voi rakentaa...
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Rakennettu: {LTBLUE}{NUM}{BLACK} Arvo: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Arvo: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
 STR_VEHICLE_STATUS_LOADING_UNLOADING                            :{LTBLUE}Lastataan/puretaan
 STR_VEHICLE_STATUS_LEAVING                                      :{LTBLUE}Poistuu
 STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}Juna täytyy pysäyttää veturitallin sisällä
-STR_ERROR_CAN_T_SEND_TRAIN_TO_DEPOT                             :{WHITE}Junan lähettäminen veturitalliin ei onnistu...
 STR_ERROR_NO_MORE_SPACE_FOR_ORDERS                              :{WHITE}Ei enää tilaa pysähdyksille.
 STR_ERROR_TOO_MANY_ORDERS                                       :{WHITE}Liian monta pysähdystä.
 STR_ERROR_CAN_T_INSERT_NEW_ORDER                                :{WHITE}Uutta pysähdystä ei voi lisätä...
@@ -2757,25 +2706,11 @@ STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE}kulkuneu
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}Liikennevälinettä ei voi poistaa...
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}Moottorivaunun takaosa seuraa aina etuosaansa
 STR_CARGO_N_A                                                   :-{SKIP}
-STR_ERROR_CAN_T_SELL_TRAIN                                      :{WHITE}Yksikköä ei voi myydä...
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}Reittiä paikalliselle veturitallille ei löydy.
-STR_ERROR_CAN_T_STOP_START_TRAIN                                :{WHITE}Junaa ei voi pysäyttää/lähettää...
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}Huoltoväli: {LTBLUE}{COMMA} päivää{BLACK}   Viimeisin huolto: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}Huoltoväli: {LTBLUE}{COMMA}%{BLACK}   Viime huolto: {LTBLUE}{DATE_LONG}
-STR_DEPOT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Junat - napsauta junaa saadaksesi tietoja, vedä vaunu lisätäksesi/poistaaksesi junasta.
-STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP                            :{BLACK}Rakenna uusi yksikkö.
-STR_DEPOT_TRAIN_SELL_TOOLTIP                                    :{BLACK}Vedä yksikkö tähän myydäksesi sen.
-STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}Keskitä näkymä veturitallin sijaintiin.
-STR_BUILD_VEHICLE_TRAIN_LIST_TOOLTIP                            :{BLACK}Yksikön valintalista - napsauta kohteita saadaksesi tietoja.
-STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_TOOLTIP                   :{BLACK}Rakenna valittu yksikkö.
-STR_BUILD_VEHICLE_TRAIN_RENAME_TOOLTIP                          :{BLACK}Nimeä yksikön tyyppi uudelleen.
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP                 :{BLACK}Valitun junan toiminnot - napsauta tässä pysäyttääksesi/lähettääksesi.
-STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP                           :{BLACK}Näytä junan aikataulu.
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP                         :{BLACK}Keskitä näkymä junan sijaintiin.
-STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP                    :{BLACK}Lähetä juna veturitalliin.
 STR_VEHICLE_VIEW_TRAIN_IGNORE_SIGNAL_TOOLTIP                    :{BLACK}Anna junalle lupa ohittaa punainen opastin.
 STR_VEHICLE_VIEW_TRAIN_REVERSE_TOOLTIP                          :{BLACK}Käännä junan suunta.
-STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Näytä junan tiedot.
 STR_VEHICLE_DETAILS_INCREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Kasvata huoltoväliä.
 STR_VEHICLE_DETAILS_DECREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Pienennä huoltoväliä.
 STR_VEHICLE_DETAILS_TRAIN_CARGO_TOOLTIP                         :{BLACK}Näytä kuljetettavan rahdin tiedot.
@@ -2809,15 +2744,10 @@ STR_VEHICLE_STATUS_STOPPED                                      :{RED}Pysäytett
 STR_ERROR_CAN_T_MAKE_TRAIN_PASS_SIGNAL                          :{WHITE}Junaa ei voi pakottaa jatkamaan opastimen ohi vaaratilanteessa...
 STR_VEHICLE_STATUS_CRASHED                                      :{RED}Kolaroitu!
 
-STR_QUERY_RENAME_TRAIN_CAPTION                                  :{WHITE}Nimeä juna
-STR_ERROR_CAN_T_RENAME_TRAIN                                    :{WHITE}Junaa ei voi nimetä...
-STR_VEHICLE_DETAILS_TRAIN_RENAME                                :{BLACK}Nimeä juna
 STR_NEWS_TRAIN_CRASH                                            :{BLACK}{BIGFONT}Junakolari!{}{COMMA} kuolee törmäyksen jälkeisessä tulipallossa.
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Junan suuntaa ei voi kääntää...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE                  :{WHITE}Kulkuneuvoa ei voida kääntää...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Ei voi kääntää moniosaista ajoneuvoa
-STR_QUERY_RENAME_TRAIN_TYPE_CAPTION                             :{WHITE}Nimeä juna(vaunu)n tyyppi uudelleen.
-STR_ERROR_CAN_T_RENAME_TRAIN_TYPE                               :{WHITE}Juna(vaunu)n tyyppiä ei voi uudelleennimetä...
 STR_CLEAR_TIME                                                  :{BLACK}Nollaa aika
 STR_RESET_LATENESS                                              :{BLACK}Nollaa myöhästymislaskuri
 STR_CHANGE_WAYPOINT_NAME                                        :{BLACK}Muuta reittipisteen nimeä
@@ -2849,43 +2779,14 @@ STR_TIMETABLE_AUTOFILL                                          :{BLACK}Automaat
 STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Täytä aikataulu automaattisesti seuraavan matkan arvoilla (Ctrl+Click: yritä säilyttää odotusajat)
 
 ##id 0x9000
-STR_ERROR_ROAD_VEHICLE_IN_THE_WAY                               :{WHITE}Ajoneuvo tiellä.
-STR_DEPOT_ROAD_VEHICLE_CAPTION                                  :{WHITE}{TOWN} huoltoasema
-STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_BUTTON                      :{BLACK}Uusia ajoneuvoja
-STR_BUILD_VEHICLE_ROAD_VEHICLE_CAPTION                          :{WHITE}Uusia ajoneuvoja
-STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_BUTTON             :{BLACK}Rakenna ajoneuvo
-STR_ERROR_CAN_T_BUILD_ROAD_VEHICLE                              :{WHITE}Ajoneuvoa ei voi rakentaa...
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}...sen pitää olla pysähtyneenä huoltoasemalle.
-STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}Ajoneuvoa ei voi myydä...
-STR_ERROR_CAN_T_STOP_START_ROAD_VEHICLE                         :{WHITE}Ajoneuvoa ei voi pysäyttää/laitta liikkeelle...
-STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} odottaa varikolla
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Suuntana huoltoasema, {TOWN}.
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Suuntana huoltoasema, {TOWN}, {VELOCITY}.
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Huolto {TOWN} Varikko
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Huolto {TOWN} Varikko, {VELOCITY}
-STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Ajoneuvon lähettäminen huoltoasemalle ei onnistu...
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Paikallista huoltoasemaa ei löydy.
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP          :{BLACK}Nykyisen ajoneuvon toiminnot - napsauta tässä pysäyttääksesi/laittaaksesi liikkeelle.
-STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP                    :{BLACK}Näytä ajoneuvon aikataulu.
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP                  :{BLACK}Keskitä näkymä ajoneuvon sijaintiin.
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}Lähetä ajoneuvo huoltoasemalle.
 STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP                   :{BLACK}Pakota ajoneuvo kääntymään ympäri.
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Näytä ajoneuvon tiedot.
-STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Ajoneuvot - napsauta ajoneuvoa saadaksesi tietoja.
-STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}Rakenna uusi ajoneuvo.
-STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}Vedä ajoneuvo tähän myydäksesi sen.
-STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}Keskitä päänäkymä huoltoaseman sijaintiin.
-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_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})
 
-STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Nimeä ajoneuvo
-STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Ajoneuvoa ei voi nimetä...
-STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Nimeä ajoneuvo
 STR_NEWS_FIRST_BUS_ARRIVAL                                      :{BLACK}{BIGFONT}Kaupunkilaiset juhlivat . . .{}Ensimmäinen linja-auto saapuu asemalle {STATION}!
 STR_NEWS_FIRST_TRUCK_ARRIVAL                                    :{BLACK}{BIGFONT}Kaupunkilaiset juhlivat . . .{}Ensimmäinen kuorma-auto saapuu asemalle {STATION}!
 STR_NEWS_FIRST_PASSENGER_TRAM_ARRIVAL                           :{BLACK}{BIGFONT}Kaupunkilaiset juhlivat . . .{}Ensimmäinen raitiovaunu saapuu asemalle {STATION}!
@@ -2893,128 +2794,39 @@ STR_NEWS_FIRST_CARGO_TRAM_ARRIVAL                               :{BLACK}{BIGFONT
 STR_NEWS_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Ajoneuvokolari!{}Kuljettaja kuolee junaan törmäyksen jälkeisessä tulipallossa
 STR_NEWS_ROAD_VEHICLE_CRASH                                     :{BLACK}{BIGFONT}Ajoneuvokolari!{}{COMMA} kuolee junaan törmäyksen jälkeisessä tulipallossa
 STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}Ajoneuvoa ei voida kääntää...
-STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Nimeä
-STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Nimeä ajoneuvon tyyppi uudelleen
-STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Nimeä ajoneuvon tyyppi uudelleen
-STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Ajoneuvotyyppiä ei voi uudelleennimetä...
 
-STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Muuta ajoneuvo rahtaamaan muuta rahtityyppiä.
-STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Korjaa ajoneuvo.
-STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Muuta ajoneuvo rahtaamaan korostettua rahtityyppiä.
-STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Ajoneuvoa ei voida korjata.
-STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Valitse ajoneuvolla ajettava rahti
 
 ##id 0x9800
 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :Vesireittien rakentaminen
 STR_WATERWAYS_TOOLBAR_CAPTION                                   :{WHITE}Vesireittien rakentaminen
 STR_WATERWAYS_TOOLBAR_CAPTION_SE                                :{WHITE}Vesireitit
 STR_ERROR_CAN_T_BUILD_DOCK_HERE                                 :{WHITE}Satamaa ei voi rakentaa tähän...
-STR_DEPOT_SHIP_CAPTION                                          :{WHITE}{TOWN}, telakka
-STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON                              :{BLACK}Uusia laivoja
-STR_BUILD_VEHICLE_SHIP_CAPTION                                  :{WHITE}Uusia laivoja
-STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON                     :{BLACK}Rakenna laiva
-STR_CLONE_SHIP                                                  :{BLACK}Kloonaa laiva
-STR_CLONE_SHIP_INFO                                             :{BLACK}Tämä rakentaa kopion laivasta. Ctrl+Click jakaa komennot
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Tämä rakentaa kopion laivasta. Paina tätä nappia ja sen jälkeen laivaa telakan sisä- tai ulkopuolella. Ctrl+Click jakaa komennot
 STR_ERROR_SHIP_MUST_BE_STOPPED_IN_DEPOT                         :{WHITE}Laivan pitää olla pysähdyksissä telakalla.
-STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}Laivaa ei voi myydä...
-STR_ERROR_CAN_T_BUILD_SHIP                                      :{WHITE}Laivaa ei voi rakentaa...
-STR_ERROR_SHIP_IN_THE_WAY                                       :{WHITE}Laiva on tiellä.
-STR_ERROR_CAN_T_STOP_START_SHIP                                 :{WHITE}Laivaa ei voi pysäyttää/laittaa liikkeelle...
-STR_ERROR_CAN_T_SEND_SHIP_TO_DEPOT                              :{WHITE}Laivaa ei voi lähettää telakalle...
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Suuntana telakka, {TOWN}
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Suuntana telakka, {TOWN}, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Huolto {TOWN} Telakka
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Huolto {TOWN} Telakka, {VELOCITY}
-STR_NEWS_SHIP_IS_WAITING                                        :{WHITE}{VEHICLE} odottaa varikolla
 STR_WATERWAYS_TOOLBAR_BUILD_DOCK_TOOLTIP                        :{BLACK}Rakenna satama
 STR_WATERWAYS_TOOLBAR_BUILD_DEPOT_TOOLTIP                       :{BLACK}Rakenna telakka (laivojen rakentamista ja huoltamista varten).
-STR_DEPOT_SHIP_LIST_TOOLTIP                                     :{BLACK}Laivat - napsauta laivaa saadaksesi tietoja.
-STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}Rakenna uusi laiva
-STR_DEPOT_SHIP_SELL_TOOLTIP                                     :{BLACK}Vedä laiva tähän myydäksesi sen.
-STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}Keskitä näkymä telakan sijaintiin.
-STR_BUILD_VEHICLE_SHIP_LIST_TOOLTIP                             :{BLACK}Laivan valintalista - napsauta laivaa saadaksesi tietoja.
-STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP                    :{BLACK}Rakenna valittu laiva
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP                  :{BLACK}Nykyisen laivat toiminnot - napsauta tässä pysäyttääksesi/laittaaksesi liikkeelle.
-STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Näytä laivan aikataulu.
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP                          :{BLACK}Keskitä näkymä laivan sijaintiin.
-STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}Lähetä laiva telakalle.
-STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Näytä laivan tiedot.
-STR_VEHICLE_DETAILS_SHIP_RENAME                                 :{BLACK}Nimeä laiva
 
-STR_QUERY_RENAME_SHIP_CAPTION                                   :{WHITE}Nimeä laiva
-STR_ERROR_CAN_T_RENAME_SHIP                                     :{WHITE}Laivaa ei voi nimetä...
 STR_NEWS_FIRST_SHIP_ARRIVAL                                     :{BLACK}{BIGFONT}Kaupunkilaiset juhlivat . . .{}Ensimmäinen laiva saapuu asemalle {STATION}!
 STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}Sijoita poiju; sitä voidaan käyttää ylimääräisenä opasteena.
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}Poijua ei voi sijoittaa tähän...
 STR_BUILD_AQUEDUCT                                              :{BLACK}Rakenna akvedukti
 STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}Tähän ei voi rakentaa akveduktia...
-STR_BUILD_VEHICLE_SHIP_RENAME_BUTTON                            :{BLACK}Nimeä
-STR_BUILD_VEHICLE_SHIP_RENAME_TOOLTIP                           :{BLACK}Nimeä laivatyyppi uudelleen.
-STR_QUERY_RENAME_SHIP_TYPE_CAPTION                              :{WHITE}Nimeä laivatyyppi uudelleen.
-STR_ERROR_CAN_T_RENAME_SHIP_TYPE                                :{WHITE}Laivatyyppin uudelleennimeäminen ei onnistu...
-STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}Sovita rahtilaiva eri rahtityypille.
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (sovita)
-STR_REFIT_SHIP_REFIT_BUTTON                                     :{BLACK}Sovita laiva
-STR_REFIT_SHIP_LIST_TOOLTIP                                     :{BLACK}Valitse laivan kuljettama rahtityyppi.
-STR_REFIT_SHIP_REFIT_TOOLTIP                                    :{BLACK}Sovita laiva korostetulle rahtityypille.
 STR_REFIT_TITLE                                                 :{GOLD}Valitse kuljetettava rahtityyppi:
 STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}Uusi kapasiteetti: {GOLD}{CARGO}{}{BLACK}Sovituksen kustannus: {GOLD}{CURRENCY}
-STR_ERROR_CAN_T_REFIT_SHIP                                      :{WHITE}Laivaa ei voi sovittaa...
 STR_REFITTABLE                                                  :(sovitettava)
 
 ##id 0xA000
 STR_TOOLBAR_AIRCRAFT_CAPTION                                    :{WHITE}Lentokentät
 STR_ERROR_CAN_T_BUILD_AIRPORT_HERE                              :{WHITE}Lentokenttää ei voi rakentaa...
-STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}Lentokonehalli, {STATION}
-STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON                          :{BLACK}Uusi lentokone
-STR_CLONE_AIRCRAFT                                              :{BLACK}Kloonaa lentokone
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Tämä rakentaa kopion lentokoneesta. Ctrl+Click jakaa komennot
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Tämä rakentaa kopion lentokoneesta. Paina tätä nappia ja sen jälkeen lentokonetta lentokonehallin sisä- tai ulkopuolella. Ctrl+Click jakaa komennot
-STR_BUILD_VEHICLE_AIRCRAFT_CAPTION                              :{WHITE}Uusi lentokone
-STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON                 :{BLACK}Rakenna lentokone
-STR_ERROR_CAN_T_BUILD_AIRCRAFT                                  :{WHITE}Lentokonetta ei voi rakentaa...
-STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR                         :{WHITE}Lentokonetta ei voi lähettää lentokonehalliin...
-STR_HEADING_FOR_HANGAR                                          :{ORANGE}Suuntana lentokonehalli, {STATION}
-STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Suuntana lentokonehalli, {STATION}, {VELOCITY}
-STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Huolto {STATION} Halli
-STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Huolto {STATION} Halli, {VELOCITY}
-STR_NEWS_AIRCRAFT_IS_WAITING                                    :{WHITE}{VEHICLE} odottaa lentokonehallissa
-STR_ERROR_AIRCRAFT_IN_THE_WAY                                   :{WHITE}Lentokone on tiellä.
-STR_ERROR_CAN_T_STOP_START_AIRCRAFT                             :{WHITE}Lentokonetta ei voi pysäyttää/laittaa liikkeelle...
 STR_ERROR_AIRCRAFT_IS_IN_FLIGHT                                 :{WHITE}Lentokone on lennossa.
 STR_ERROR_AIRCRAFT_MUST_BE_STOPPED                              :{WHITE}Lentokoneen pitää olla pysähdyksissä lentokonehallissa.
-STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}Lentokonetta ei voi myydä...
 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION                          :Lentokentän rakentaminen
 STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Rakenna lentokenttä
-STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Lentokoneet - napsauta lentokonetta saadaksesi tietoja.
-STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}Rakenna uusi lentokone
-STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}Vedä lentokone tähän myydäksesi sen.
-STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Keskitä näkymä lentokonehallin sijaintiin.
-STR_BUILD_VEHICLE_AIRCRAFT_LIST_TOOLTIP                         :{BLACK}Lentokonevalintalista - napsauta lentokonetta saadaksesi tietoja.
-STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_TOOLTIP                :{BLACK}Rakenna korostettu lentokone
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP              :{BLACK}Nykyisen lentokoneen toiminnot - napsauta tässä pysäyttääksesi/laittaaksesi liikkeelle.
-STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Näytä lentokoneen aikataulu.
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP                      :{BLACK}Keskitä näkymä lentokoneen sijaintiin.
-STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}Lähetä lentokone lentokonehalliin.
-STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Näytä lentokoneen tiedot.
 
-STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}Nimeä lentokone
-STR_ERROR_CAN_T_RENAME_AIRCRAFT                                 :{WHITE}Lentokonetta ei voi nimetä...
-STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}Nimeä lentokone
 STR_NEWS_FIRST_AIRCRAFT_ARRIVAL                                 :{BLACK}{BIGFONT}Kaupunkilaiset juhlivat . . .{}Ensimmäinen lentokone saapuu asemalle {STATION}!
 STR_NEWS_AIRCRAFT_CRASH                                         :{BLACK}{BIGFONT}Lento-onnettomuus!{}{COMMA} kuolee tulipallossa asemalla {STATION}.
 STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Lento-onnettomuus!{}Lentokoneelta loppui polttoaine, {COMMA} kuolee tulipallossa!
 STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
-STR_BUILD_VEHICLE_AIRCRAFT_RENAME_BUTTON                        :{BLACK}Nimeä
-STR_BUILD_VEHICLE_AIRCRAFT_RENAME_TOOLTIP                       :{BLACK}Nimeä lentokonetyyppi uudelleen.
-STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION                          :{WHITE}Nimeä lentokonetyyppi uudelleen.
-STR_ERROR_CAN_T_RENAME_AIRCRAFT_TYPE                            :{WHITE}Lentokonetyyppiä ei voi uudelleennimetä...
-STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Sovita lentokone eri rahtityypille.
-STR_REFIT_AIRCRAFT_REFIT_BUTTON                                 :{BLACK}Sovita lentokone
-STR_REFIT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Valitse kuljetettavan rahdin tyyppi.
-STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}Sovita lentokone kuljettamaan valittua rahtityyppiä.
-STR_ERROR_CAN_T_REFIT_AIRCRAFT                                  :{WHITE}Lentokonetta ei voi sovittaa...
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (aikataulu)
 
@@ -3182,6 +2994,211 @@ STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING}
 STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}{COMMA} ajoneuvon jaettu aikataulu
 STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Näytä kaikki ajoneuvot, joilla on sama aikataulu
 
+STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} odottaa varikolla
+STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} odottaa varikolla
+STR_NEWS_SHIP_IS_WAITING                                        :{WHITE}{VEHICLE} odottaa varikolla
+STR_NEWS_AIRCRAFT_IS_WAITING                                    :{WHITE}{VEHICLE} odottaa lentokonehallissa
+
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Sovita juna
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Korjaa ajoneuvo.
+STR_REFIT_SHIP_REFIT_BUTTON                                     :{BLACK}Sovita laiva
+STR_REFIT_AIRCRAFT_REFIT_BUTTON                                 :{BLACK}Sovita lentokone
+
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Sovita juna kuljettamaan valittua rahtityyppiä.
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Muuta ajoneuvo rahtaamaan korostettua rahtityyppiä.
+STR_REFIT_SHIP_REFIT_TOOLTIP                                    :{BLACK}Sovita laiva korostetulle rahtityypille.
+STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}Sovita lentokone kuljettamaan valittua rahtityyppiä.
+
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Valitse junan rahtityyppi
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Valitse ajoneuvolla ajettava rahti
+STR_REFIT_SHIP_LIST_TOOLTIP                                     :{BLACK}Valitse laivan kuljettama rahtityyppi.
+STR_REFIT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Valitse kuljetettavan rahdin tyyppi.
+
+STR_DEPOT_TRAIN_CAPTION                                         :{WHITE}{TOWN}: veturitalli
+STR_DEPOT_ROAD_VEHICLE_CAPTION                                  :{WHITE}{TOWN} huoltoasema
+STR_DEPOT_SHIP_CAPTION                                          :{WHITE}{TOWN}, telakka
+STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}Lentokonehalli, {STATION}
+
+STR_VEHICLE_DETAILS_TRAIN_RENAME                                :{BLACK}Nimeä juna
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Nimeä ajoneuvo
+STR_VEHICLE_DETAILS_SHIP_RENAME                                 :{BLACK}Nimeä laiva
+STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}Nimeä lentokone
+
+STR_QUERY_RENAME_TRAIN_CAPTION                                  :{WHITE}Nimeä juna
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Nimeä ajoneuvo
+STR_QUERY_RENAME_SHIP_CAPTION                                   :{WHITE}Nimeä laiva
+STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}Nimeä lentokone
+
+STR_ERROR_TRAIN_IN_THE_WAY                                      :{WHITE}Juna on tiellä.
+STR_ERROR_ROAD_VEHICLE_IN_THE_WAY                               :{WHITE}Ajoneuvo tiellä.
+STR_ERROR_SHIP_IN_THE_WAY                                       :{WHITE}Laiva on tiellä.
+STR_ERROR_AIRCRAFT_IN_THE_WAY                                   :{WHITE}Lentokone on tiellä.
+
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Junaa ei voi sovittaa...
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Ajoneuvoa ei voida korjata.
+STR_ERROR_CAN_T_REFIT_SHIP                                      :{WHITE}Laivaa ei voi sovittaa...
+STR_ERROR_CAN_T_REFIT_AIRCRAFT                                  :{WHITE}Lentokonetta ei voi sovittaa...
+
+STR_ERROR_CAN_T_RENAME_TRAIN                                    :{WHITE}Junaa ei voi nimetä...
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Ajoneuvoa ei voi nimetä...
+STR_ERROR_CAN_T_RENAME_SHIP                                     :{WHITE}Laivaa ei voi nimetä...
+STR_ERROR_CAN_T_RENAME_AIRCRAFT                                 :{WHITE}Lentokonetta ei voi nimetä...
+
+STR_ERROR_CAN_T_STOP_START_TRAIN                                :{WHITE}Junaa ei voi pysäyttää/lähettää...
+STR_ERROR_CAN_T_STOP_START_ROAD_VEHICLE                         :{WHITE}Ajoneuvoa ei voi pysäyttää/laitta liikkeelle...
+STR_ERROR_CAN_T_STOP_START_SHIP                                 :{WHITE}Laivaa ei voi pysäyttää/laittaa liikkeelle...
+STR_ERROR_CAN_T_STOP_START_AIRCRAFT                             :{WHITE}Lentokonetta ei voi pysäyttää/laittaa liikkeelle...
+
+STR_ERROR_CAN_T_SEND_TRAIN_TO_DEPOT                             :{WHITE}Junan lähettäminen veturitalliin ei onnistu...
+STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Ajoneuvon lähettäminen huoltoasemalle ei onnistu...
+STR_ERROR_CAN_T_SEND_SHIP_TO_DEPOT                              :{WHITE}Laivaa ei voi lähettää telakalle...
+STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR                         :{WHITE}Lentokonetta ei voi lähettää lentokonehalliin...
+
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Yksikköä ei voi rakentaa...
+STR_ERROR_CAN_T_BUILD_ROAD_VEHICLE                              :{WHITE}Ajoneuvoa ei voi rakentaa...
+STR_ERROR_CAN_T_BUILD_SHIP                                      :{WHITE}Laivaa ei voi rakentaa...
+STR_ERROR_CAN_T_BUILD_AIRCRAFT                                  :{WHITE}Lentokonetta ei voi rakentaa...
+
+STR_ERROR_CAN_T_RENAME_TRAIN_TYPE                               :{WHITE}Juna(vaunu)n tyyppiä ei voi uudelleennimetä...
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Ajoneuvotyyppiä ei voi uudelleennimetä...
+STR_ERROR_CAN_T_RENAME_SHIP_TYPE                                :{WHITE}Laivatyyppin uudelleennimeäminen ei onnistu...
+STR_ERROR_CAN_T_RENAME_AIRCRAFT_TYPE                            :{WHITE}Lentokonetyyppiä ei voi uudelleennimetä...
+
+STR_ERROR_CAN_T_SELL_TRAIN                                      :{WHITE}Yksikköä ei voi myydä...
+STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}Ajoneuvoa ei voi myydä...
+STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}Laivaa ei voi myydä...
+STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}Lentokonetta ei voi myydä...
+
+STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP                 :{BLACK}Valitun junan toiminnot - napsauta tässä pysäyttääksesi/lähettääksesi.
+STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP          :{BLACK}Nykyisen ajoneuvon toiminnot - napsauta tässä pysäyttääksesi/laittaaksesi liikkeelle.
+STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP                  :{BLACK}Nykyisen laivat toiminnot - napsauta tässä pysäyttääksesi/laittaaksesi liikkeelle.
+STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP              :{BLACK}Nykyisen lentokoneen toiminnot - napsauta tässä pysäyttääksesi/laittaaksesi liikkeelle.
+
+STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP                           :{BLACK}Näytä junan aikataulu.
+STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP                    :{BLACK}Näytä ajoneuvon aikataulu.
+STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Näytä laivan aikataulu.
+STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Näytä lentokoneen aikataulu.
+
+STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP                         :{BLACK}Keskitä näkymä junan sijaintiin.
+STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP                  :{BLACK}Keskitä näkymä ajoneuvon sijaintiin.
+STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP                          :{BLACK}Keskitä näkymä laivan sijaintiin.
+STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP                      :{BLACK}Keskitä näkymä lentokoneen sijaintiin.
+
+STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP                    :{BLACK}Lähetä juna veturitalliin.
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}Lähetä ajoneuvo huoltoasemalle.
+STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}Lähetä laiva telakalle.
+STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}Lähetä lentokone lentokonehalliin.
+
+STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Näytä junan tiedot.
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Näytä ajoneuvon tiedot.
+STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Näytä laivan tiedot.
+STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Näytä lentokoneen tiedot.
+
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Sovita juna kuljettamaan erityyppistä rahtia.
+STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Muuta ajoneuvo rahtaamaan muuta rahtityyppiä.
+STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}Sovita rahtilaiva eri rahtityypille.
+STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Sovita lentokone eri rahtityypille.
+
+STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Suuntana veturitalli ({TOWN})
+STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Suuntana veturitalli ({TOWN}), {VELOCITY}
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Suuntana huoltoasema, {TOWN}.
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Suuntana huoltoasema, {TOWN}, {VELOCITY}.
+STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Suuntana telakka, {TOWN}
+STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Suuntana telakka, {TOWN}, {VELOCITY}
+STR_HEADING_FOR_HANGAR                                          :{ORANGE}Suuntana lentokonehalli, {STATION}
+STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Suuntana lentokonehalli, {STATION}, {VELOCITY}
+
+STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Huolto {TOWN} Varikko
+STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Huolto{TOWN} Varikko, {VELOCITY}
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Huolto {TOWN} Varikko
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Huolto {TOWN} Varikko, {VELOCITY}
+STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Huolto {TOWN} Telakka
+STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Huolto {TOWN} Telakka, {VELOCITY}
+STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Huolto {STATION} Halli
+STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Huolto {STATION} Halli, {VELOCITY}
+
+
+STR_CLONE_TRAIN                                                 :{BLACK}Kloonaa juna
+STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Kloonaa ajoneuvo
+STR_CLONE_SHIP                                                  :{BLACK}Kloonaa laiva
+STR_CLONE_AIRCRAFT                                              :{BLACK}Kloonaa lentokone
+
+STR_CLONE_TRAIN_INFO                                            :{BLACK}Tämä rakentaa kopion junasta ja kaikista sen vaunuista. Klikkaus Ctrl painettuna jakaa komennot
+STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Tämä tekee kopion ajoneuvosta. Klikkaaminen Ctrl painettuna jakaa komennot
+STR_CLONE_SHIP_INFO                                             :{BLACK}Tämä rakentaa kopion laivasta. Ctrl+Click jakaa komennot
+STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Tämä rakentaa kopion lentokoneesta. Ctrl+Click jakaa komennot
+
+STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Tämä rakentaa kopion junasta ja kaikista sen vaunuista. Paina tätä nappia ja sen jälkeen junaa varikon sisä- tai ulkopuolella. Klikkaus Ctrl painettuna jakaa komennot
+STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Tämä rakentaa kopion ajoneuvosta. Paina tätä nappia ja sen jälkeen ajoneuvoa varikon sisä- tai ulkopuolella. Klikkaus Ctrl painettuna jakaa komennot
+STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Tämä rakentaa kopion laivasta. Paina tätä nappia ja sen jälkeen laivaa telakan sisä- tai ulkopuolella. Ctrl+Click jakaa komennot
+STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Tämä rakentaa kopion lentokoneesta. Paina tätä nappia ja sen jälkeen lentokonetta lentokonehallin sisä- tai ulkopuolella. Ctrl+Click jakaa komennot
+
+STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}Uusi juna
+STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}Uusi sähköjuna
+STR_BUILD_VEHICLE_TRAIN_MONORAIL_CAPTION                        :{WHITE}Uusi yksiraidejuna
+STR_BUILD_VEHICLE_TRAIN_MAGLEV_CAPTION                          :{WHITE}Uusi MagLev-juna
+
+STR_BUILD_VEHICLE_TRAIN_ALL_CAPTION                             :{WHITE}Ratakulkuneuvot
+STR_BUILD_VEHICLE_ROAD_VEHICLE_CAPTION                          :{WHITE}Uusia ajoneuvoja
+STR_BUILD_VEHICLE_SHIP_CAPTION                                  :{WHITE}Uusia laivoja
+STR_BUILD_VEHICLE_AIRCRAFT_CAPTION                              :{WHITE}Uusi lentokone
+
+STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_BUTTON                    :{BLACK}Rakenna yksikkö
+STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_BUTTON             :{BLACK}Rakenna ajoneuvo
+STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON                     :{BLACK}Rakenna laiva
+STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON                 :{BLACK}Rakenna lentokone
+
+STR_BUILD_VEHICLE_TRAIN_LIST_TOOLTIP                            :{BLACK}Yksikön valintalista - napsauta kohteita saadaksesi tietoja.
+STR_BUILD_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP                     :{BLACK}Ajoneuvon valintalista - napsauta ajoneuvoa saadaksesi tietoja.
+STR_BUILD_VEHICLE_SHIP_LIST_TOOLTIP                             :{BLACK}Laivan valintalista - napsauta laivaa saadaksesi tietoja.
+STR_BUILD_VEHICLE_AIRCRAFT_LIST_TOOLTIP                         :{BLACK}Lentokonevalintalista - napsauta lentokonetta saadaksesi tietoja.
+
+STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_TOOLTIP                   :{BLACK}Rakenna valittu yksikkö.
+STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_TOOLTIP            :{BLACK}Rakenna valittu ajoneuvo.
+STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP                    :{BLACK}Rakenna valittu laiva
+STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_TOOLTIP                :{BLACK}Rakenna korostettu lentokone
+
+STR_BUILD_VEHICLE_TRAIN_RENAME_BUTTON                           :{BLACK}Nimeä
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Nimeä
+STR_BUILD_VEHICLE_SHIP_RENAME_BUTTON                            :{BLACK}Nimeä
+STR_BUILD_VEHICLE_AIRCRAFT_RENAME_BUTTON                        :{BLACK}Nimeä
+
+STR_BUILD_VEHICLE_TRAIN_RENAME_TOOLTIP                          :{BLACK}Nimeä yksikön tyyppi uudelleen.
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Nimeä ajoneuvon tyyppi uudelleen
+STR_BUILD_VEHICLE_SHIP_RENAME_TOOLTIP                           :{BLACK}Nimeä laivatyyppi uudelleen.
+STR_BUILD_VEHICLE_AIRCRAFT_RENAME_TOOLTIP                       :{BLACK}Nimeä lentokonetyyppi uudelleen.
+
+STR_QUERY_RENAME_TRAIN_TYPE_CAPTION                             :{WHITE}Nimeä juna(vaunu)n tyyppi uudelleen.
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Nimeä ajoneuvon tyyppi uudelleen
+STR_QUERY_RENAME_SHIP_TYPE_CAPTION                              :{WHITE}Nimeä laivatyyppi uudelleen.
+STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION                          :{WHITE}Nimeä lentokonetyyppi uudelleen.
+
+STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Uusia liikennevälineitä
+STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_BUTTON                      :{BLACK}Uusia ajoneuvoja
+STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON                              :{BLACK}Uusia laivoja
+STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON                          :{BLACK}Uusi lentokone
+
+STR_DEPOT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Junat - napsauta junaa saadaksesi tietoja, vedä vaunu lisätäksesi/poistaaksesi junasta.
+STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Ajoneuvot - napsauta ajoneuvoa saadaksesi tietoja.
+STR_DEPOT_SHIP_LIST_TOOLTIP                                     :{BLACK}Laivat - napsauta laivaa saadaksesi tietoja.
+STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Lentokoneet - napsauta lentokonetta saadaksesi tietoja.
+
+STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP                            :{BLACK}Rakenna uusi yksikkö.
+STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}Rakenna uusi ajoneuvo.
+STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}Rakenna uusi laiva
+STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}Rakenna uusi lentokone
+
+STR_DEPOT_TRAIN_SELL_TOOLTIP                                    :{BLACK}Vedä yksikkö tähän myydäksesi sen.
+STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}Vedä ajoneuvo tähän myydäksesi sen.
+STR_DEPOT_SHIP_SELL_TOOLTIP                                     :{BLACK}Vedä laiva tähän myydäksesi sen.
+STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}Vedä lentokone tähän myydäksesi sen.
+
+STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}Keskitä näkymä veturitallin sijaintiin.
+STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}Keskitä päänäkymä huoltoaseman sijaintiin.
+STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}Keskitä näkymä telakan sijaintiin.
+STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Keskitä näkymä lentokonehallin sijaintiin.
+
+
 ### depot strings
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}Olet myymässä kaikki varikon ajoneuvot. Oletko varma?
 STR_DEPOT_WRONG_DEPOT_TYPE                                      :Väärä varikkotyyppi
@@ -3216,6 +3233,7 @@ STR_REPLACE_REMOVE_WAGON                                        :{BLACK}Vaunun p
 STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Automaattikorvaus pitäköön junan vakiopituisena poistamalla vaunuja (edestä) jos veturi pidentäisi junaa.
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}Korvataan: {ORANGE}{SKIP}{SKIP}{STRING}
 STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}Vaihda toiseen korvausikkunaan
+
 STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Juna tai vaunu ei ole saatavilla
 STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Ajoneuvo ei ole saatavilla
 STR_SHIP_NOT_AVAILABLE                                          :{WHITE}Laiva ei ole saatavilla
@@ -3430,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}
@@ -3448,6 +3469,31 @@ STR_FORMAT_COMPANY_NUM                                          :(Yhtiö {COMMA}
 STR_FORMAT_GROUP_NAME                                           :Ryhmä {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}Nimen täytyy olla uniikki
 
 #### Improved sign GUI
diff --git a/src/lang/french.txt b/src/lang/french.txt
index 6c6ef1fe8..e73abe3c6 100644
--- a/src/lang/french.txt
+++ b/src/lang/french.txt
@@ -155,8 +155,6 @@ STR_ABBREV_PLASTIC                                              :{TINYFONT}PL
 STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}GZ
 STR_ABBREV_NONE                                                 :{TINYFONT}NO
 STR_ABBREV_ALL                                                  :{TINYFONT}ALL
-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
@@ -168,17 +166,11 @@ STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Copyrigh
 STR_ABOUT_VERSION                                               :{BLACK}OpenTTD version {REV}
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 L'équipe OpenTTD
 
-STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
-STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_QUIT_CAPTION                                                :{WHITE}Quitter
 STR_YES                                                         :{BLACK}Oui
 STR_NO                                                          :{BLACK}Non
 STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Êtes vous sur de vouloir quitter OpenTTD et retourner à {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                                                :Rien
 STR_COLOUR_DARK_BLUE                                            :Bleu foncé
 STR_COLOUR_PALE_GREEN                                           :Vert pâle
@@ -197,8 +189,6 @@ STR_COLOUR_BROWN                                                :Marron
 STR_COLOUR_GREY                                                 :Gris
 STR_COLOUR_WHITE                                                :Blanc
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}Trop de véhicules en jeu
-STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
-STR_RED_COMMA                                                   :{RED}{COMMA}
 STR_BUTTON_LOCATION                                             :{BLACK}Emplacement
 STR_SMALLMAP_TYPE_CONTOURS                                      :Relief
 STR_SMALLMAP_TYPE_VEHICLES                                      :Véhicules
@@ -324,12 +314,13 @@ STR_SORT_CRITERIA_TIP                                           :{BLACK}Choisir
 STR_FILTER_CRITERIA_TIP                                         :{BLACK}Choisir le critère de filtrage
 STR_SORT_BY                                                     :{BLACK}Trier par
 
+### 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}Nom
+STR_SORT_BY_DATE                                                :{BLACK}Date
 STR_SORT_BY_PRODUCTION                                          :Production
 STR_SORT_BY_TYPE                                                :Type
 STR_SORT_BY_TRANSPORTED                                         :Transporté
-STR_SORT_BY_NAME                                                :{BLACK}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
 STR_SORT_BY_PROFIT_THIS_YEAR                                    :Profit cette année
@@ -352,6 +343,7 @@ STR_SORT_BY_INTRO_DATE                                          :Date d'introduc
 STR_SORT_BY_RUNNING_COST                                        :Coût d'entretien
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :Puissance/Coût d'entretien
 STR_SORT_BY_CARGO_CAPACITY                                      :Capacité
+
 STR_NO_WAITING_CARGO                                            :{BLACK}Pas de marchandises en attente
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}Tous les types de station
 STR_SELECT_ALL_TYPES                                            :{BLACK}Tous les types de marchandise (y compris pas en attente)
@@ -371,21 +363,6 @@ STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Envoyer au dép
 STR_SEND_SHIP_TO_DEPOT                                          :Envoyer au dépôt
 STR_SEND_AIRCRAFT_TO_HANGAR                                     :Envoyer au hangar
 
-############ range for months starts
-STR_MONTH_ABBREV_JAN                                            :Jan
-STR_MONTH_ABBREV_FEB                                            :Fév
-STR_MONTH_ABBREV_MAR                                            :Mar
-STR_MONTH_ABBREV_APR                                            :Avr
-STR_MONTH_ABBREV_MAY                                            :Mai
-STR_MONTH_ABBREV_JUN                                            :Jun
-STR_MONTH_ABBREV_JUL                                            :Jul
-STR_MONTH_ABBREV_AUG                                            :Aut
-STR_MONTH_ABBREV_SEP                                            :Sep
-STR_MONTH_ABBREV_OCT                                            :Oct
-STR_MONTH_ABBREV_NOV                                            :Nov
-STR_MONTH_ABBREV_DEC                                            :Déc
-############ 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}{STRING}-
@@ -412,8 +389,6 @@ 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_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
@@ -460,7 +435,7 @@ STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Aucun
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Nom
 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                                          :1er
 STR_ORDINAL_NUMBER_2ND                                          :2
 STR_ORDINAL_NUMBER_3RD                                          :3
@@ -494,6 +469,34 @@ STR_ORDINAL_NUMBER_30TH                                         :30
 STR_ORDINAL_NUMBER_31ST                                         :31
 ############ range for days ends
 
+############ range for months starts
+STR_MONTH_ABBREV_JAN                                            :Jan
+STR_MONTH_ABBREV_FEB                                            :Fév
+STR_MONTH_ABBREV_MAR                                            :Mar
+STR_MONTH_ABBREV_APR                                            :Avr
+STR_MONTH_ABBREV_MAY                                            :Mai
+STR_MONTH_ABBREV_JUN                                            :Jun
+STR_MONTH_ABBREV_JUL                                            :Jul
+STR_MONTH_ABBREV_AUG                                            :Aut
+STR_MONTH_ABBREV_SEP                                            :Sep
+STR_MONTH_ABBREV_OCT                                            :Oct
+STR_MONTH_ABBREV_NOV                                            :Nov
+STR_MONTH_ABBREV_DEC                                            :Déc
+
+STR_MONTH_JAN                                                   :Janvier
+STR_MONTH_FEB                                                   :Février
+STR_MONTH_MAR                                                   :Mars
+STR_MONTH_APR                                                   :Avril
+STR_MONTH_MAY                                                   :Mai
+STR_MONTH_JUN                                                   :Juin
+STR_MONTH_JUL                                                   :Juillet
+STR_MONTH_AUG                                                   :Août
+STR_MONTH_SEP                                                   :Septembre
+STR_MONTH_OCT                                                   :Octobre
+STR_MONTH_NOV                                                   :Novembre
+STR_MONTH_DEC                                                   :Décembre
+############ range for months ends
+
 STR_GRAPH_Y_LABEL_NUMBER                                        :{TINYFONT}{COMMA}
 
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}Cargaison acceptée: {LTBLUE}
@@ -583,12 +586,9 @@ 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_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_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
@@ -670,9 +670,7 @@ STR_OFF                                                         :Aucun
 STR_SUMMARY                                                     :Sommaire
 STR_FULL                                                        :Complet
 STR_STATUSBAR_COMPANY_NAME                                      :{SILVER}- -  {COMPANY}  - -
-STR_BLACK_STRING                                                :{BLACK}{STRING}
 
-STR_JUST_CHECKMARK                                              :{CHECKMARK}
 ############ range for menu starts
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Options du Jeu
 STR_SETTINGS_MENU_DIFFICULTY_SETTINGS                           :Niveau de Difficulté
@@ -777,9 +775,6 @@ 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_BLACK_6                                                     :{BLACK}6
-STR_BLACK_7                                                     :{BLACK}7
-
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Anglais (Originaux)
 STR_TOWNNAME_FRENCH                                             :Français
@@ -859,19 +854,6 @@ STR_OPTIONS_BASE_GRF_DESCRIPTION_TIP                            :{BLACK}Informat
 
 STR_AUTOSAVE_FAILED                                             :{WHITE}Enregistrement automatique échoué
 
-STR_MONTH_JAN                                                   :Janvier
-STR_MONTH_FEB                                                   :Février
-STR_MONTH_MAR                                                   :Mars
-STR_MONTH_APR                                                   :Avril
-STR_MONTH_MAY                                                   :Mai
-STR_MONTH_JUN                                                   :Juin
-STR_MONTH_JUL                                                   :Juillet
-STR_MONTH_AUG                                                   :Août
-STR_MONTH_SEP                                                   :Septembre
-STR_MONTH_OCT                                                   :Octobre
-STR_MONTH_NOV                                                   :Novembre
-STR_MONTH_DEC                                                   :Décembre
-
 STR_HEADING_FOR_STATION                                         :{LTBLUE}En route pour {STATION}
 STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}En route pour {STATION}, {VELOCITY}
 STR_NO_ORDERS                                                   :{LTBLUE}Aucun ordre
@@ -886,8 +868,6 @@ STR_CRATES                                                      :caisses
 STR_RES_OTHER                                                   :autre
 STR_NOTHING                                                     :
 
-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...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Fin des ordres partagés - -
@@ -1159,7 +1139,6 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Taille
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :inactif
-STR_JUST_CURRENCY                                               :{CURRENCY}
 STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Changer valeur du paramètre
 
 STR_TEMPERATE_LANDSCAPE                                         :environnement 'Tempéré'
@@ -2125,8 +2104,6 @@ STR_NUM_LOW                                                     :Bas
 STR_NUM_NORMAL                                                  :Normal
 STR_NUM_HIGH                                                    :Élevé
 STR_NUM_CUSTOM                                                  :Personnalisé
-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
@@ -2807,7 +2784,6 @@ 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_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})
@@ -3473,7 +3449,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}
@@ -3491,6 +3470,31 @@ STR_FORMAT_COMPANY_NUM                                          :(Compagnie {COM
 STR_FORMAT_GROUP_NAME                                           :Groupe {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}Le nom doit être unique
 
 #### Improved sign GUI
diff --git a/src/lang/galician.txt b/src/lang/galician.txt
index ad44b32dc..a806aef50 100644
--- a/src/lang/galician.txt
+++ b/src/lang/galician.txt
@@ -155,8 +155,6 @@ STR_ABBREV_PLASTIC                                              :{TINYFONT}PL
 STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}BE
 STR_ABBREV_NONE                                                 :{TINYFONT}NON
 STR_ABBREV_ALL                                                  :{TINYFONT}TODO
-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
@@ -168,17 +166,11 @@ STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Copyrigh
 STR_ABOUT_VERSION                                               :{BLACK}OpenTTD versión {REV}
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 O Equipo de OpenTTD
 
-STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
-STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_QUIT_CAPTION                                                :{WHITE}Saír
 STR_YES                                                         :{BLACK}Si
 STR_NO                                                          :{BLACK}Non
 STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}¿Estás seguro de querer saír e volver a {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                                                :Nada
 STR_COLOUR_DARK_BLUE                                            :Azul Escuro
 STR_COLOUR_PALE_GREEN                                           :Verde Claro
@@ -197,8 +189,6 @@ STR_COLOUR_BROWN                                                :Marrón
 STR_COLOUR_GREY                                                 :Gris
 STR_COLOUR_WHITE                                                :Branco
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}Hay demasiados vehículos na partida
-STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
-STR_RED_COMMA                                                   :{RED}{COMMA}
 STR_BUTTON_LOCATION                                             :{BLACK}Situación
 STR_SMALLMAP_TYPE_CONTOURS                                      :Contorno
 STR_SMALLMAP_TYPE_VEHICLES                                      :Vehículos
@@ -324,12 +314,13 @@ STR_SORT_CRITERIA_TIP                                           :{BLACK}Seleccio
 STR_FILTER_CRITERIA_TIP                                         :{BLACK}Selecciona o criterio de filtrado
 STR_SORT_BY                                                     :{BLACK}Ordear por
 
+### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}Poboación
+STR_SORT_BY_NAME                                                :{BLACK}Nome
+STR_SORT_BY_DATE                                                :{BLACK}Data
 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_DATE                                                :{BLACK}Data
 STR_SORT_BY_NUMBER                                              :Número
 STR_SORT_BY_PROFIT_LAST_YEAR                                    :Beneficio último ano
 STR_SORT_BY_PROFIT_THIS_YEAR                                    :Beneficio este ano
@@ -350,37 +341,25 @@ STR_SORT_BY_INTRO_DATE                                          :Data de Present
 STR_SORT_BY_RUNNING_COST                                        :Custo Mantemento
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :Potencia/Custo Mantemento
 STR_SORT_BY_CARGO_CAPACITY                                      :Capacidade De Carga
+
 STR_NO_WAITING_CARGO                                            :{BLACK}Non queda ningún tipo de carga en espera
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}Seleccionar tódolos edificios
 STR_SELECT_ALL_TYPES                                            :{BLACK}Seleccionar tódolos tipos de carga (incluso os que non están a esperar)
-STR_AVAILABLE_TRAINS                                            :{BLACK}Trens Dispoñibles
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Vehículos Dispoñibles
-STR_AVAILABLE_SHIPS                                             :{BLACK}Barcos Dispoñibles
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Aeronaves Dispoñibles
 STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Ve-la lista das máquinas dispoñibles para este tipo de vehículo.
 STR_MANAGE_LIST                                                 :{BLACK}Xestionar lista
 STR_MANAGE_LIST_TIP                                             :{BLACK}Envia-las instruccións a tódolos vehículos desta lista
 STR_REPLACE_VEHICLES                                            :Reemplazar Vehículos
+STR_SEND_FOR_SERVICING                                          :Enviar para Servizo
+
+STR_AVAILABLE_TRAINS                                            :{BLACK}Trens Dispoñibles
+STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Vehículos Dispoñibles
+STR_AVAILABLE_SHIPS                                             :{BLACK}Barcos Dispoñibles
+STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Aeronaves Dispoñibles
+
 STR_SEND_TRAIN_TO_DEPOT                                         :Enviar ó Depósito
 STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Enviar ó Depósito
 STR_SEND_SHIP_TO_DEPOT                                          :Enviar ó Depósito
 STR_SEND_AIRCRAFT_TO_HANGAR                                     :Enviar ó Hangar
-STR_SEND_FOR_SERVICING                                          :Enviar para Servizo
-
-############ range for months starts
-STR_MONTH_ABBREV_JAN                                            :Xan
-STR_MONTH_ABBREV_FEB                                            :Feb
-STR_MONTH_ABBREV_MAR                                            :Mar
-STR_MONTH_ABBREV_APR                                            :Abr
-STR_MONTH_ABBREV_MAY                                            :Mai
-STR_MONTH_ABBREV_JUN                                            :Xuñ
-STR_MONTH_ABBREV_JUL                                            :Xul
-STR_MONTH_ABBREV_AUG                                            :Ago
-STR_MONTH_ABBREV_SEP                                            :Set
-STR_MONTH_ABBREV_OCT                                            :Out
-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}
@@ -408,8 +387,6 @@ 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_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
@@ -455,7 +432,7 @@ STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Ningún
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Nome
 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                                          :1º
 STR_ORDINAL_NUMBER_2ND                                          :2º
 STR_ORDINAL_NUMBER_3RD                                          :3º
@@ -489,6 +466,34 @@ STR_ORDINAL_NUMBER_30TH                                         :30º
 STR_ORDINAL_NUMBER_31ST                                         :31º
 ############ range for days ends
 
+############ range for months starts
+STR_MONTH_ABBREV_JAN                                            :Xan
+STR_MONTH_ABBREV_FEB                                            :Feb
+STR_MONTH_ABBREV_MAR                                            :Mar
+STR_MONTH_ABBREV_APR                                            :Abr
+STR_MONTH_ABBREV_MAY                                            :Mai
+STR_MONTH_ABBREV_JUN                                            :Xuñ
+STR_MONTH_ABBREV_JUL                                            :Xul
+STR_MONTH_ABBREV_AUG                                            :Ago
+STR_MONTH_ABBREV_SEP                                            :Set
+STR_MONTH_ABBREV_OCT                                            :Out
+STR_MONTH_ABBREV_NOV                                            :Nov
+STR_MONTH_ABBREV_DEC                                            :Dec
+
+STR_MONTH_JAN                                                   :Xaneiro
+STR_MONTH_FEB                                                   :Febreiro
+STR_MONTH_MAR                                                   :Marzo
+STR_MONTH_APR                                                   :Abril
+STR_MONTH_MAY                                                   :Maio
+STR_MONTH_JUN                                                   :Xuño
+STR_MONTH_JUL                                                   :Xullo
+STR_MONTH_AUG                                                   :Agosto
+STR_MONTH_SEP                                                   :Setembro
+STR_MONTH_OCT                                                   :Outubro
+STR_MONTH_NOV                                                   :Novembro
+STR_MONTH_DEC                                                   :Decembro
+############ range for months ends
+
 STR_GRAPH_Y_LABEL_NUMBER                                        :{TINYFONT}{COMMA}
 
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}Carga aceptada: {LTBLUE}
@@ -578,12 +583,9 @@ 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_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_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
@@ -663,9 +665,7 @@ STR_OFF                                                         :Apagado
 STR_SUMMARY                                                     :Sumario
 STR_FULL                                                        :Completo
 STR_STATUSBAR_COMPANY_NAME                                      :{SILVER}- -  {COMPANY}  - -
-STR_BLACK_STRING                                                :{BLACK}{STRING}
 
-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
@@ -770,9 +770,6 @@ 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_BLACK_6                                                     :{BLACK}6
-STR_BLACK_7                                                     :{BLACK}7
-
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Inglés (Orixinal)
 STR_TOWNNAME_FRENCH                                             :Francés
@@ -852,19 +849,6 @@ STR_OPTIONS_BASE_GRF_DESCRIPTION_TIP                            :{BLACK}Informac
 
 STR_AUTOSAVE_FAILED                                             :{WHITE}Autograbado fallido
 
-STR_MONTH_JAN                                                   :Xaneiro
-STR_MONTH_FEB                                                   :Febreiro
-STR_MONTH_MAR                                                   :Marzo
-STR_MONTH_APR                                                   :Abril
-STR_MONTH_MAY                                                   :Maio
-STR_MONTH_JUN                                                   :Xuño
-STR_MONTH_JUL                                                   :Xullo
-STR_MONTH_AUG                                                   :Agosto
-STR_MONTH_SEP                                                   :Setembro
-STR_MONTH_OCT                                                   :Outubro
-STR_MONTH_NOV                                                   :Novembro
-STR_MONTH_DEC                                                   :Decembro
-
 STR_HEADING_FOR_STATION                                         :{LTBLUE}Diríxese a {STATION}
 STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}Diríxese a {STATION}, {VELOCITY}
 STR_NO_ORDERS                                                   :{LTBLUE}Sen ordes
@@ -879,8 +863,6 @@ STR_CRATES                                                      :caixóns
 STR_RES_OTHER                                                   :outro
 STR_NOTHING                                                     :
 
-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...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Fin das ordes compartidas - -
@@ -1134,7 +1116,6 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Tamaño
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :deshabilitado
-STR_JUST_CURRENCY                                               :{CURRENCY}
 STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Cambia-lo valor
 
 STR_TEMPERATE_LANDSCAPE                                         :Escenario temperado
@@ -1235,11 +1216,6 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Nomes da
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...demasiado cerca doutra industria
 
-STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Reaxusta-lo tren para un tipo de carga diferente
-STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Reaxustar tren
-STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Selecciona o tipo de carga que levará o tren
-STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Reaxusta-lo tren para o tipo de carga seleccionado
-STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}No se pode reaxusta-lo tren...
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Cambiar producción
 
 ############ network gui strings
@@ -2046,6 +2022,7 @@ STR_SV_STNAME_AIRPORT                                           :Aeroporto de {S
 STR_SV_STNAME_OILFIELD                                          :{STRING} Campo de petróleo
 STR_SV_STNAME_MINES                                             :{STRING} Minas
 STR_SV_STNAME_DOCKS                                             :Peirao de {STRING}
+##id 0x6020
 STR_SV_STNAME_ANNEXE                                            :{STRING} Anexo
 STR_SV_STNAME_SIDINGS                                           :{STRING} Apartadeiro
 STR_SV_STNAME_BRANCH                                            :{STRING} Rama
@@ -2093,8 +2070,6 @@ STR_NUM_LOW                                                     :Baixo
 STR_NUM_NORMAL                                                  :Normal
 STR_NUM_HIGH                                                    :Alto
 STR_NUM_CUSTOM                                                  :Persoalizado
-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
@@ -2561,10 +2536,8 @@ STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE                          :locomotora de m
 STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE                            :locomotora de maglev
 
 ##id 0x8800
-STR_DEPOT_TRAIN_CAPTION                                         :{WHITE}Depósito de Tren de {TOWN}
 STR_NEWS_FIRST_TRAIN_ARRIVAL                                    :{BLACK}{BIGFONT}Celebración cidadá . . .{}Chega o primeiro tren a {STATION}!
 STR_VEHICLE_DETAILS_CAPTION                                     :{WHITE}{VEHICLE} (Detalles)
-STR_ERROR_TRAIN_IN_THE_WAY                                      :{WHITE}Hai un tren no camiño
 STR_ORDER                                                       :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 STR_ORDER_SELECTED                                              :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 STR_ORDER_NON_STOP                                              :{BLACK}Sen parar
@@ -2651,36 +2624,16 @@ STR_TIMETABLE_AND_TRAVEL_FOR                                    :e viaxar durant
 STR_TIMETABLE_DAYS                                              :{COMMA} día{P "" s}
 STR_TIMETABLE_TICKS                                             :{COMMA} tick{P "" s}
 
-STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}En camiño ó Depósito de {TOWN}
-STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}En camiño ó Depósito de {TOWN}, {VELOCITY}
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Servizo no Depósito de {TOWN}
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Servizo no Depósito de {TOWN}, {VELOCITY}
-
 STR_INVALID_ORDER                                               :{RED} (Orde Inválida)
 
 STR_UNKNOWN_STATION                                             :estación descoñecida
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}Valeiro
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} de {STATION}
 STR_VEHICLE_DETAILS_CARGO_FROM_MULT                             :{LTBLUE}{CARGO} desde {STATION} (x{NUM})
-STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Novos Vehículos
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}O tren é demasiado longo
 STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}Os trens só se poden alterar cando estean parados nun depósito
 
-STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}Novos Vehículos de Ferrocarril
-STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}Novos Vehículos Eléctricos de Raíles
-STR_BUILD_VEHICLE_TRAIN_MONORAIL_CAPTION                        :{WHITE}Novos Vehículos de Monorraíl
-STR_BUILD_VEHICLE_TRAIN_MAGLEV_CAPTION                          :{WHITE}Novos Vehículos de Maglev
-STR_BUILD_VEHICLE_TRAIN_ALL_CAPTION                             :{WHITE}Vehículos de Ferrocaril
-
-STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_BUTTON                    :{BLACK}Construír Vehículo
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Clonar Vehículo
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Esto construirá unha copia do vehículo. CTRL+Click compartirá as ordes
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Esto construirá unha copia do vehículo. Pincha neste botón e despois nun vehículo dentro ou fóra do depósito. CTRL+Click compartirá as ordes
-STR_CLONE_TRAIN                                                 :{BLACK}Clonar Tren
-STR_CLONE_TRAIN_INFO                                            :{BLACK}Esto construirá unha copia do tren incluídos os vagóns. CTRL+Click compartirá as ordes
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Esto construirá unha copia do tren incluídos os vagóns. Pincha neste botón e despois nun tren dentro ou fóra do depósito. CTRL+Click compartirá as ordes
-STR_BUILD_VEHICLE_TRAIN_RENAME_BUTTON                           :{BLACK}Renomear
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Saltar
 STR_ORDERS_DELETE_BUTTON                                        :{BLACK}Borrar
 STR_ORDERS_GO_TO_BUTTON                                         :{BLACK}Ir a
@@ -2696,14 +2649,12 @@ STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Cambiar
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Ordes)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Fin das Ordes - -
 STR_SERVICE                                                     :{BLACK}Servizo
-STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}No se pode construí-lo vehículo de ferrocarril...
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Construído: {LTBLUE}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Valor: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
 STR_VEHICLE_STATUS_LOADING_UNLOADING                            :{LTBLUE}Cargando / Descargando
 STR_VEHICLE_STATUS_LEAVING                                      :{LTBLUE}Saíndo
 STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}O tren debe estar parado nun depósito
-STR_ERROR_CAN_T_SEND_TRAIN_TO_DEPOT                             :{WHITE}No se pode envia-lo tren o depósito...
 STR_ERROR_NO_MORE_SPACE_FOR_ORDERS                              :{WHITE}Non hai espacio para máis ordes
 STR_ERROR_TOO_MANY_ORDERS                                       :{WHITE}Demasiadas ordes
 STR_ERROR_CAN_T_INSERT_NEW_ORDER                                :{WHITE}No se pode inserta-la nova orde...
@@ -2717,25 +2668,11 @@ STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE}un vehí
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}No se pode move-lo vehículo...
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}A máquina traseira sempre seguirá a dianteira
 STR_CARGO_N_A                                                   :N/D{SKIP}
-STR_ERROR_CAN_T_SELL_TRAIN                                      :{WHITE}Non se pode vende-lo vehículo de ferrocarril...
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}No se pode atopar unha ruta a un depósito local
-STR_ERROR_CAN_T_STOP_START_TRAIN                                :{WHITE}No se pode parar/iniciar o tren...
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}Intervalo de Servizo: {LTBLUE}{COMMA}days{BLACK}   Último Servizo: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}Intervalo servizo: {LTBLUE}{COMMA}%{BLACK}   Últ. Servizo: {LTBLUE}{DATE_LONG}
-STR_DEPOT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Trens - pincha nun tren para información, arrastra o vehículo para engadilo/quitalo do tren
-STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP                            :{BLACK}Construír novo vehículo de ferrocarril
-STR_DEPOT_TRAIN_SELL_TOOLTIP                                    :{BLACK}Arrastra un vehículo do tren aquí para vendelo
-STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}Centra-la vista principal na situación do depósito de trens
-STR_BUILD_VEHICLE_TRAIN_LIST_TOOLTIP                            :{BLACK}Lista de selección de vehículos para trens - pincha nun vehículo para máis información
-STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_TOOLTIP                   :{BLACK}Construí-lo vehículo de ferrocarril seleccionado
-STR_BUILD_VEHICLE_TRAIN_RENAME_TOOLTIP                          :{BLACK}Renomea-lo tipo de vehículo de ferrocarril
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP                 :{BLACK}Tarefa actual do tren - pincha aquí para parar/arrancar o tren
-STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP                           :{BLACK}Mostra-las ordes do tren
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP                         :{BLACK}Centra-al vista principal la situación do tren
-STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP                    :{BLACK}Enviar tren ó depósito
 STR_VEHICLE_VIEW_TRAIN_IGNORE_SIGNAL_TOOLTIP                    :{BLACK}Obliga-lo tren a continuar sen esperar a que o sinal o indique
 STR_VEHICLE_VIEW_TRAIN_REVERSE_TOOLTIP                          :{BLACK}Invertí-lo sentido do tren
-STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Mostra-los detalles do tren
 STR_VEHICLE_DETAILS_INCREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Incrementa-lo intervalo dos servizos
 STR_VEHICLE_DETAILS_DECREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Disminuí-lo intervalo dos servizos
 STR_VEHICLE_DETAILS_TRAIN_CARGO_TOOLTIP                         :{BLACK}Mostra-los detalles das mercadorías transportadas
@@ -2769,15 +2706,10 @@ STR_VEHICLE_STATUS_STOPPED                                      :{RED}Parado
 STR_ERROR_CAN_T_MAKE_TRAIN_PASS_SIGNAL                          :{WHITE}Non se pode face-lo tren pasar unha sinal de perigo...
 STR_VEHICLE_STATUS_CRASHED                                      :{RED}¡Estrelado!
 
-STR_QUERY_RENAME_TRAIN_CAPTION                                  :{WHITE}Renomear tren
-STR_ERROR_CAN_T_RENAME_TRAIN                                    :{WHITE}No se pode renomea-lo tren...
-STR_VEHICLE_DETAILS_TRAIN_RENAME                                :{BLACK}Renomear tren
 STR_NEWS_TRAIN_CRASH                                            :{BLACK}{BIGFONT}¡Accidente Ferroviario!{}{COMMA} mortos na explosión trala colisión
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}No se pode cambia-lo sentido do tren...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE                  :{WHITE}Non se pode inverti-la dirección do vehículo...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Non se poden xira-los vehículos consistentes de múltiples unidades
-STR_QUERY_RENAME_TRAIN_TYPE_CAPTION                             :{WHITE}Renomea-lo tipo de vehículo de ferrocarril
-STR_ERROR_CAN_T_RENAME_TRAIN_TYPE                               :{WHITE}Non se pode renomea-lo tipo de vehículo de ferrocarril...
 STR_CLEAR_TIME                                                  :{BLACK}Borrar Tempo
 STR_RESET_LATENESS                                              :{BLACK}Reiniciar Contador de Retraso
 STR_CHANGE_WAYPOINT_NAME                                        :{BLACK}Cambia lo nome do punto de ruta
@@ -2809,43 +2741,14 @@ STR_TIMETABLE_AUTOFILL                                          :{BLACK}Autoench
 STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Enche-lo horario automáticamente cos valores da seguinte viaxe (CTRL+Click para intentar mante-los tempos de espera)
 
 ##id 0x9000
-STR_ERROR_ROAD_VEHICLE_IN_THE_WAY                               :{WHITE}Haí un vehículo de estrada no camiño
-STR_DEPOT_ROAD_VEHICLE_CAPTION                                  :{WHITE}Depósito de Vehículos de Estrada de {TOWN}
-STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_BUTTON                      :{BLACK}Novos Vehículos
-STR_BUILD_VEHICLE_ROAD_VEHICLE_CAPTION                          :{WHITE}Novos Vehículos de Estrada
-STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_BUTTON             :{BLACK}Construír Vehículo
-STR_ERROR_CAN_T_BUILD_ROAD_VEHICLE                              :{WHITE}No se pode construí-lo vehículo de estrada...
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}...debe estar parado dentro dun depósito de vehículos de estrada
-STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}Non se pode vende-lo vehículo de estrada...
-STR_ERROR_CAN_T_STOP_START_ROAD_VEHICLE                         :{WHITE}No se pode parar/arrancar o vehículo de estrada...
-STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} está a esperar no depósito
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Diríxese o depósito de {TOWN}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Diríxese o depósito de {TOWN}, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Servizo no Depósito de {TOWN}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Servizo no Depósito de {TOWN}, {VELOCITY}
-STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Non se pode envia-lo vehículo ó depósito de estrada...
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}No se pode atopar unha ruta ó depósito local
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP          :{BLACK}Tarefa actual do vehículo - pincha aquí para parar/arrancar o vehículo
-STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP                    :{BLACK}Mostra-las ordes do vehículo
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP                  :{BLACK}Centra-la vista principal na situación do vehículo
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}Envia-lo vehículo ó depósito
 STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP                   :{BLACK}Forza-lo vehículo a da-la volta
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Mostra-los detalles do vehículo de estrada
-STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Vehículos - pincha nun vehículo para máis información
-STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}Construír vehículo de estrada
-STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}Arrastra un vehículo de estrada aquí para vendelo
-STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}Centra-la vista principal na situación do depósito de vehículos de estrada
-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_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})
 
-STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Renomear vehículo de estrada
-STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Non se pode renomea-lo vehículo de estrada...
-STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Renomear vehículo de estrada
 STR_NEWS_FIRST_BUS_ARRIVAL                                      :{BLACK}{BIGFONT}Celebración cidadá . . .{}¡Chega o primeiro autobús a {STATION}!
 STR_NEWS_FIRST_TRUCK_ARRIVAL                                    :{BLACK}{BIGFONT}Celebración cidadá . . .{}¡Chega o primeiro camión a {STATION}!
 STR_NEWS_FIRST_PASSENGER_TRAM_ARRIVAL                           :{BLACK}{BIGFONT}Celebración cidadá . . .{}¡Chega o primeiro tranvía de pasaxeiros a {STATION}!
@@ -2853,128 +2756,39 @@ STR_NEWS_FIRST_CARGO_TRAM_ARRIVAL                               :{BLACK}{BIGFONT
 STR_NEWS_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}¡Accidente de Tráfico!{}O conductor morre na explosión producida tra-la colisión cun tren
 STR_NEWS_ROAD_VEHICLE_CRASH                                     :{BLACK}{BIGFONT}¡Accidente de Tráfico!{}{COMMA} mortos na explosión producida tra-la colisión cun tren
 STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}Non se pode xira-lo vehículo...
-STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Renomear
-STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Renomea-lo tipo de vehículo de estrada
-STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Renomea-lo tipo de vehículo de estrada
-STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Non se pode renomea-lo tipo de vehículo de estrada...
 
-STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Reaxustar vehículo para levar un tipo diferente de carga
-STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Reaxustar vehículo
-STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Reaxustar vehículo para levar o tipo de carga seleccionado
-STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Non se pode reaxusta-lo vehículo
-STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Selecciona o tipo de carga que levará este vehículo de estrada
 
 ##id 0x9800
 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :Construción de canais
 STR_WATERWAYS_TOOLBAR_CAPTION                                   :{WHITE}Construción de canais
 STR_WATERWAYS_TOOLBAR_CAPTION_SE                                :{WHITE}Canais
 STR_ERROR_CAN_T_BUILD_DOCK_HERE                                 :{WHITE}Non se pode construí-lo peirao aí...
-STR_DEPOT_SHIP_CAPTION                                          :{WHITE}Depósito de Barcos de {TOWN}
-STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON                              :{BLACK}Novos Barcos
-STR_BUILD_VEHICLE_SHIP_CAPTION                                  :{WHITE}Novos Barcos
-STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON                     :{BLACK}Construír Barco
-STR_CLONE_SHIP                                                  :{BLACK}Clonar Barco
-STR_CLONE_SHIP_INFO                                             :{BLACK}Esto construirá unha copia do barco. CTRL+Click compartirá as ordes
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Esto construíra unha copia do barco. Pincha neste botón e despois nun barco dentro ou fóra do depósito. CTRL+Click compartirá as ordes
 STR_ERROR_SHIP_MUST_BE_STOPPED_IN_DEPOT                         :{WHITE}O barco debe estar parado no depósito
-STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}No se pode vende-lo barco...
-STR_ERROR_CAN_T_BUILD_SHIP                                      :{WHITE}Non se construí-lo barco...
-STR_ERROR_SHIP_IN_THE_WAY                                       :{WHITE}Hay un barco no camiño
-STR_ERROR_CAN_T_STOP_START_SHIP                                 :{WHITE}Non se pode parar/arrancar o barco...
-STR_ERROR_CAN_T_SEND_SHIP_TO_DEPOT                              :{WHITE}Non se pode envia-lo barco o depósito...
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Diríxese o Depósito de Barcos de {TOWN}
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Diríxese o Depósito de Barcos de {TOWN}, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Servizo no Depósito de Barcos de {TOWN}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Servizo no Depósito de Barcos de {TOWN}, {VELOCITY}
-STR_NEWS_SHIP_IS_WAITING                                        :{WHITE}{VEHICLE} está a esperar no depósito
 STR_WATERWAYS_TOOLBAR_BUILD_DOCK_TOOLTIP                        :{BLACK}Construír peirao para barcos
 STR_WATERWAYS_TOOLBAR_BUILD_DEPOT_TOOLTIP                       :{BLACK}Construír depósito para barcos (para construír e dar servizo ós barcos)
-STR_DEPOT_SHIP_LIST_TOOLTIP                                     :{BLACK}Barcos - pincha nun barco para máis información
-STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}Costruír novo barco
-STR_DEPOT_SHIP_SELL_TOOLTIP                                     :{BLACK}Arrastra o barco aquí para vendelo
-STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}Centra-la vista principal na situación do depósito de barcos
-STR_BUILD_VEHICLE_SHIP_LIST_TOOLTIP                             :{BLACK}Lista de selección de barcos - pincha nun barco para máis información
-STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP                    :{BLACK}Construí-lo barco seleccionado
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP                  :{BLACK}Tarefa actual do barco - pincha aquí para parar/arrancar o barco
-STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Mostra-las ordes do barco
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP                          :{BLACK}Centra-la vista principal na situación do barco
-STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}Envia-lo barco o depósito
-STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Mostra-los detalles do barco
-STR_VEHICLE_DETAILS_SHIP_RENAME                                 :{BLACK}Renomear barco
 
-STR_QUERY_RENAME_SHIP_CAPTION                                   :{WHITE}Renomear barco
-STR_ERROR_CAN_T_RENAME_SHIP                                     :{WHITE}Non se pode renomea-lo barco
 STR_NEWS_FIRST_SHIP_ARRIVAL                                     :{BLACK}{BIGFONT}Celebración cidadá . . .{}¡Chega o primeiro barco a {STATION}!
 STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}Boia de posición, pódese utilizar para marcar puntos de ruta adicionais
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}Non se pode coloca-la boia aquí...
 STR_BUILD_AQUEDUCT                                              :{BLACK}Construír acueducto
 STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}Non se pode construír un acueducto aquí...
-STR_BUILD_VEHICLE_SHIP_RENAME_BUTTON                            :{BLACK}Renomear
-STR_BUILD_VEHICLE_SHIP_RENAME_TOOLTIP                           :{BLACK}Renomear tipo de barco
-STR_QUERY_RENAME_SHIP_TYPE_CAPTION                              :{WHITE}Renomear tipo de barco
-STR_ERROR_CAN_T_RENAME_SHIP_TYPE                                :{WHITE}Non se pode renomear-lo tipo de barco...
-STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}Reaxusta-lo barco para levar un tipo diferente de mercadoría
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (Reaxustar)
-STR_REFIT_SHIP_REFIT_BUTTON                                     :{BLACK}Reaxustar barco
-STR_REFIT_SHIP_LIST_TOOLTIP                                     :{BLACK}Selecciona o tipo de mercadoría que vai levar
-STR_REFIT_SHIP_REFIT_TOOLTIP                                    :{BLACK}Reaxusta-lo barco para leva-lo tipo de mercacdoría seleccionada
 STR_REFIT_TITLE                                                 :{GOLD}Selecciona-lo tipo de carga a levar:
 STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}Nova Capacidade: {GOLD}{CARGO}{}{BLACK}Custo do reaxuste: {GOLD}{CURRENCY}
-STR_ERROR_CAN_T_REFIT_SHIP                                      :{WHITE}Non se pode reaxusta-lo barco...
 STR_REFITTABLE                                                  :(reax.)
 
 ##id 0xA000
 STR_TOOLBAR_AIRCRAFT_CAPTION                                    :{WHITE}Aeroportos
 STR_ERROR_CAN_T_BUILD_AIRPORT_HERE                              :{WHITE}Non se pode construí-lo aeroporto aí...
-STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}Hangar de Aeronaves de {STATION}
-STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON                          :{BLACK}Nova Aeronave
-STR_CLONE_AIRCRAFT                                              :{BLACK}Clonar Aeronave
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Esto construirá una copia do avión. CTRL+Click compartirá as ordes
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Esto construirá unha copia do avión. Pincha neste botón e nun avión que estea dentro ou fóra do hangar. CTRL+Click compartirá as ordes
-STR_BUILD_VEHICLE_AIRCRAFT_CAPTION                              :{WHITE}Nova Aeronave
-STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON                 :{BLACK}Construír Aeronave
-STR_ERROR_CAN_T_BUILD_AIRCRAFT                                  :{WHITE}Non se pode construí-lo avíon...
-STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR                         :{WHITE}Non se pode envia-lo avión ó hangar...
-STR_HEADING_FOR_HANGAR                                          :{ORANGE}Diríxese ó hangar de {STATION}
-STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Diríxese ó hangar de {STATION}, {VELOCITY}
-STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Servizo no Hangar de {STATION}
-STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Servizo no Hangar de {STATION}, {VELOCITY}
-STR_NEWS_AIRCRAFT_IS_WAITING                                    :{WHITE}{VEHICLE} está a esperar no hangar de avións
-STR_ERROR_AIRCRAFT_IN_THE_WAY                                   :{WHITE}Aeronave no camiño
-STR_ERROR_CAN_T_STOP_START_AIRCRAFT                             :{WHITE}Non se pode parar/arrincar o avión...
 STR_ERROR_AIRCRAFT_IS_IN_FLIGHT                                 :{WHITE}O avión está voando
 STR_ERROR_AIRCRAFT_MUST_BE_STOPPED                              :{WHITE}O avión debe estar parado no hangar
-STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}Non se pode vende-lo avión...
 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION                          :Construción de Aeroporto
 STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Construír aeroporto
-STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Avións - pincha no avión para máis información
-STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}Construír novo avión
-STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}Arrastra o avión aquí para vendelo
-STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Centra-la vista principal na situación do hangar
-STR_BUILD_VEHICLE_AIRCRAFT_LIST_TOOLTIP                         :{BLACK}Lista de selección de avións - pincha nun avión para máis información
-STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_TOOLTIP                :{BLACK}Construí-lo avión seleccionado
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP              :{BLACK}Tarefa actual do avión - pincha aquí para parar/arrincar o avión
-STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Mostra-las ordes do avión
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP                      :{BLACK}Centra-la vista principal na situación do avión
-STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}Envia-lo avión ó hangar
-STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Mostra-los detalles do avión
 
-STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}Cambia-lo nome do avión
-STR_ERROR_CAN_T_RENAME_AIRCRAFT                                 :{WHITE}Non se pode renomea-lo avión...
-STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}Cambia-lo nome do avión
 STR_NEWS_FIRST_AIRCRAFT_ARRIVAL                                 :{BLACK}{BIGFONT}Celebración cidadá . . .{}¡Chega o primeiro avión a {STATION}!
 STR_NEWS_AIRCRAFT_CRASH                                         :{BLACK}{BIGFONT}¡Accidente Aéreo!{}{COMMA} mortos na bola de lume en {STATION}
 STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}¡Accidente de Avión!¡O avión {} quedou sen combustible, hai {COMMA} mortos na explosión!
 STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
-STR_BUILD_VEHICLE_AIRCRAFT_RENAME_BUTTON                        :{BLACK}Renomear
-STR_BUILD_VEHICLE_AIRCRAFT_RENAME_TOOLTIP                       :{BLACK}Renomea-lo tipo de avión
-STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION                          :{WHITE}Renomea-lo tipo de avión
-STR_ERROR_CAN_T_RENAME_AIRCRAFT_TYPE                            :{WHITE}Non se pode renomea-lo tipo de avión...
-STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Reaxusta-lo avión para levar un tipo distinto de carga
-STR_REFIT_AIRCRAFT_REFIT_BUTTON                                 :{BLACK}Reaxustar avión
-STR_REFIT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Selecciona o tipo de carga que levará
-STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}Reaxusta-lo avión para levar o tipo de carga seleccionada
-STR_ERROR_CAN_T_REFIT_AIRCRAFT                                  :{WHITE}Non se pode reaxusta-lo avión...
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Horario)
 
@@ -3140,6 +2954,210 @@ STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING}
 STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}Ordes compartidas de {COMMA} Vehículo{P "" s}
 STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Mostrar tódolos vehículos que comparten esta planificación
 
+STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} está a esperar no depósito
+STR_NEWS_SHIP_IS_WAITING                                        :{WHITE}{VEHICLE} está a esperar no depósito
+STR_NEWS_AIRCRAFT_IS_WAITING                                    :{WHITE}{VEHICLE} está a esperar no hangar de avións
+
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Reaxustar tren
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Reaxustar vehículo
+STR_REFIT_SHIP_REFIT_BUTTON                                     :{BLACK}Reaxustar barco
+STR_REFIT_AIRCRAFT_REFIT_BUTTON                                 :{BLACK}Reaxustar avión
+
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Reaxusta-lo tren para o tipo de carga seleccionado
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Reaxustar vehículo para levar o tipo de carga seleccionado
+STR_REFIT_SHIP_REFIT_TOOLTIP                                    :{BLACK}Reaxusta-lo barco para leva-lo tipo de mercacdoría seleccionada
+STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}Reaxusta-lo avión para levar o tipo de carga seleccionada
+
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Selecciona o tipo de carga que levará o tren
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Selecciona o tipo de carga que levará este vehículo de estrada
+STR_REFIT_SHIP_LIST_TOOLTIP                                     :{BLACK}Selecciona o tipo de mercadoría que vai levar
+STR_REFIT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Selecciona o tipo de carga que levará
+
+STR_DEPOT_TRAIN_CAPTION                                         :{WHITE}Depósito de Tren de {TOWN}
+STR_DEPOT_ROAD_VEHICLE_CAPTION                                  :{WHITE}Depósito de Vehículos de Estrada de {TOWN}
+STR_DEPOT_SHIP_CAPTION                                          :{WHITE}Depósito de Barcos de {TOWN}
+STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}Hangar de Aeronaves de {STATION}
+
+STR_VEHICLE_DETAILS_TRAIN_RENAME                                :{BLACK}Renomear tren
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Renomear vehículo de estrada
+STR_VEHICLE_DETAILS_SHIP_RENAME                                 :{BLACK}Renomear barco
+STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}Cambia-lo nome do avión
+
+STR_QUERY_RENAME_TRAIN_CAPTION                                  :{WHITE}Renomear tren
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Renomear vehículo de estrada
+STR_QUERY_RENAME_SHIP_CAPTION                                   :{WHITE}Renomear barco
+STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}Cambia-lo nome do avión
+
+STR_ERROR_TRAIN_IN_THE_WAY                                      :{WHITE}Hai un tren no camiño
+STR_ERROR_ROAD_VEHICLE_IN_THE_WAY                               :{WHITE}Haí un vehículo de estrada no camiño
+STR_ERROR_SHIP_IN_THE_WAY                                       :{WHITE}Hay un barco no camiño
+STR_ERROR_AIRCRAFT_IN_THE_WAY                                   :{WHITE}Aeronave no camiño
+
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}No se pode reaxusta-lo tren...
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Non se pode reaxusta-lo vehículo
+STR_ERROR_CAN_T_REFIT_SHIP                                      :{WHITE}Non se pode reaxusta-lo barco...
+STR_ERROR_CAN_T_REFIT_AIRCRAFT                                  :{WHITE}Non se pode reaxusta-lo avión...
+
+STR_ERROR_CAN_T_RENAME_TRAIN                                    :{WHITE}No se pode renomea-lo tren...
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Non se pode renomea-lo vehículo de estrada...
+STR_ERROR_CAN_T_RENAME_SHIP                                     :{WHITE}Non se pode renomea-lo barco
+STR_ERROR_CAN_T_RENAME_AIRCRAFT                                 :{WHITE}Non se pode renomea-lo avión...
+
+STR_ERROR_CAN_T_STOP_START_TRAIN                                :{WHITE}No se pode parar/iniciar o tren...
+STR_ERROR_CAN_T_STOP_START_ROAD_VEHICLE                         :{WHITE}No se pode parar/arrancar o vehículo de estrada...
+STR_ERROR_CAN_T_STOP_START_SHIP                                 :{WHITE}Non se pode parar/arrancar o barco...
+STR_ERROR_CAN_T_STOP_START_AIRCRAFT                             :{WHITE}Non se pode parar/arrincar o avión...
+
+STR_ERROR_CAN_T_SEND_TRAIN_TO_DEPOT                             :{WHITE}No se pode envia-lo tren o depósito...
+STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Non se pode envia-lo vehículo ó depósito de estrada...
+STR_ERROR_CAN_T_SEND_SHIP_TO_DEPOT                              :{WHITE}Non se pode envia-lo barco o depósito...
+STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR                         :{WHITE}Non se pode envia-lo avión ó hangar...
+
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}No se pode construí-lo vehículo de ferrocarril...
+STR_ERROR_CAN_T_BUILD_ROAD_VEHICLE                              :{WHITE}No se pode construí-lo vehículo de estrada...
+STR_ERROR_CAN_T_BUILD_SHIP                                      :{WHITE}Non se construí-lo barco...
+STR_ERROR_CAN_T_BUILD_AIRCRAFT                                  :{WHITE}Non se pode construí-lo avíon...
+
+STR_ERROR_CAN_T_RENAME_TRAIN_TYPE                               :{WHITE}Non se pode renomea-lo tipo de vehículo de ferrocarril...
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Non se pode renomea-lo tipo de vehículo de estrada...
+STR_ERROR_CAN_T_RENAME_SHIP_TYPE                                :{WHITE}Non se pode renomear-lo tipo de barco...
+STR_ERROR_CAN_T_RENAME_AIRCRAFT_TYPE                            :{WHITE}Non se pode renomea-lo tipo de avión...
+
+STR_ERROR_CAN_T_SELL_TRAIN                                      :{WHITE}Non se pode vende-lo vehículo de ferrocarril...
+STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}Non se pode vende-lo vehículo de estrada...
+STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}No se pode vende-lo barco...
+STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}Non se pode vende-lo avión...
+
+STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP                 :{BLACK}Tarefa actual do tren - pincha aquí para parar/arrancar o tren
+STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP          :{BLACK}Tarefa actual do vehículo - pincha aquí para parar/arrancar o vehículo
+STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP                  :{BLACK}Tarefa actual do barco - pincha aquí para parar/arrancar o barco
+STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP              :{BLACK}Tarefa actual do avión - pincha aquí para parar/arrincar o avión
+
+STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP                           :{BLACK}Mostra-las ordes do tren
+STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP                    :{BLACK}Mostra-las ordes do vehículo
+STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Mostra-las ordes do barco
+STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Mostra-las ordes do avión
+
+STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP                         :{BLACK}Centra-al vista principal la situación do tren
+STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP                  :{BLACK}Centra-la vista principal na situación do vehículo
+STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP                          :{BLACK}Centra-la vista principal na situación do barco
+STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP                      :{BLACK}Centra-la vista principal na situación do avión
+
+STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP                    :{BLACK}Enviar tren ó depósito
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}Envia-lo vehículo ó depósito
+STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}Envia-lo barco o depósito
+STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}Envia-lo avión ó hangar
+
+STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Mostra-los detalles do tren
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Mostra-los detalles do vehículo de estrada
+STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Mostra-los detalles do barco
+STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Mostra-los detalles do avión
+
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Reaxusta-lo tren para un tipo de carga diferente
+STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Reaxustar vehículo para levar un tipo diferente de carga
+STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}Reaxusta-lo barco para levar un tipo diferente de mercadoría
+STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Reaxusta-lo avión para levar un tipo distinto de carga
+
+STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}En camiño ó Depósito de {TOWN}
+STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}En camiño ó Depósito de {TOWN}, {VELOCITY}
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Diríxese o depósito de {TOWN}
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Diríxese o depósito de {TOWN}, {VELOCITY}
+STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Diríxese o Depósito de Barcos de {TOWN}
+STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Diríxese o Depósito de Barcos de {TOWN}, {VELOCITY}
+STR_HEADING_FOR_HANGAR                                          :{ORANGE}Diríxese ó hangar de {STATION}
+STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Diríxese ó hangar de {STATION}, {VELOCITY}
+
+STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Servizo no Depósito de {TOWN}
+STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Servizo no Depósito de {TOWN}, {VELOCITY}
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Servizo no Depósito de {TOWN}
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Servizo no Depósito de {TOWN}, {VELOCITY}
+STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Servizo no Depósito de Barcos de {TOWN}
+STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Servizo no Depósito de Barcos de {TOWN}, {VELOCITY}
+STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Servizo no Hangar de {STATION}
+STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Servizo no Hangar de {STATION}, {VELOCITY}
+
+
+STR_CLONE_TRAIN                                                 :{BLACK}Clonar Tren
+STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Clonar Vehículo
+STR_CLONE_SHIP                                                  :{BLACK}Clonar Barco
+STR_CLONE_AIRCRAFT                                              :{BLACK}Clonar Aeronave
+
+STR_CLONE_TRAIN_INFO                                            :{BLACK}Esto construirá unha copia do tren incluídos os vagóns. CTRL+Click compartirá as ordes
+STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Esto construirá unha copia do vehículo. CTRL+Click compartirá as ordes
+STR_CLONE_SHIP_INFO                                             :{BLACK}Esto construirá unha copia do barco. CTRL+Click compartirá as ordes
+STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Esto construirá una copia do avión. CTRL+Click compartirá as ordes
+
+STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Esto construirá unha copia do tren incluídos os vagóns. Pincha neste botón e despois nun tren dentro ou fóra do depósito. CTRL+Click compartirá as ordes
+STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Esto construirá unha copia do vehículo. Pincha neste botón e despois nun vehículo dentro ou fóra do depósito. CTRL+Click compartirá as ordes
+STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Esto construíra unha copia do barco. Pincha neste botón e despois nun barco dentro ou fóra do depósito. CTRL+Click compartirá as ordes
+STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Esto construirá unha copia do avión. Pincha neste botón e nun avión que estea dentro ou fóra do hangar. CTRL+Click compartirá as ordes
+
+STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}Novos Vehículos de Ferrocarril
+STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}Novos Vehículos Eléctricos de Raíles
+STR_BUILD_VEHICLE_TRAIN_MONORAIL_CAPTION                        :{WHITE}Novos Vehículos de Monorraíl
+STR_BUILD_VEHICLE_TRAIN_MAGLEV_CAPTION                          :{WHITE}Novos Vehículos de Maglev
+
+STR_BUILD_VEHICLE_TRAIN_ALL_CAPTION                             :{WHITE}Vehículos de Ferrocaril
+STR_BUILD_VEHICLE_ROAD_VEHICLE_CAPTION                          :{WHITE}Novos Vehículos de Estrada
+STR_BUILD_VEHICLE_SHIP_CAPTION                                  :{WHITE}Novos Barcos
+STR_BUILD_VEHICLE_AIRCRAFT_CAPTION                              :{WHITE}Nova Aeronave
+
+STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_BUTTON                    :{BLACK}Construír Vehículo
+STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_BUTTON             :{BLACK}Construír Vehículo
+STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON                     :{BLACK}Construír Barco
+STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON                 :{BLACK}Construír Aeronave
+
+STR_BUILD_VEHICLE_TRAIN_LIST_TOOLTIP                            :{BLACK}Lista de selección de vehículos para trens - pincha nun vehículo para máis información
+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_SHIP_LIST_TOOLTIP                             :{BLACK}Lista de selección de barcos - pincha nun barco para máis información
+STR_BUILD_VEHICLE_AIRCRAFT_LIST_TOOLTIP                         :{BLACK}Lista de selección de avións - pincha nun avión para máis información
+
+STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_TOOLTIP                   :{BLACK}Construí-lo vehículo de ferrocarril seleccionado
+STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_TOOLTIP            :{BLACK}Construí-lo vehículo de estrada seleccionado
+STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP                    :{BLACK}Construí-lo barco seleccionado
+STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_TOOLTIP                :{BLACK}Construí-lo avión seleccionado
+
+STR_BUILD_VEHICLE_TRAIN_RENAME_BUTTON                           :{BLACK}Renomear
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Renomear
+STR_BUILD_VEHICLE_SHIP_RENAME_BUTTON                            :{BLACK}Renomear
+STR_BUILD_VEHICLE_AIRCRAFT_RENAME_BUTTON                        :{BLACK}Renomear
+
+STR_BUILD_VEHICLE_TRAIN_RENAME_TOOLTIP                          :{BLACK}Renomea-lo tipo de vehículo de ferrocarril
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Renomea-lo tipo de vehículo de estrada
+STR_BUILD_VEHICLE_SHIP_RENAME_TOOLTIP                           :{BLACK}Renomear tipo de barco
+STR_BUILD_VEHICLE_AIRCRAFT_RENAME_TOOLTIP                       :{BLACK}Renomea-lo tipo de avión
+
+STR_QUERY_RENAME_TRAIN_TYPE_CAPTION                             :{WHITE}Renomea-lo tipo de vehículo de ferrocarril
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Renomea-lo tipo de vehículo de estrada
+STR_QUERY_RENAME_SHIP_TYPE_CAPTION                              :{WHITE}Renomear tipo de barco
+STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION                          :{WHITE}Renomea-lo tipo de avión
+
+STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Novos Vehículos
+STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_BUTTON                      :{BLACK}Novos Vehículos
+STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON                              :{BLACK}Novos Barcos
+STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON                          :{BLACK}Nova Aeronave
+
+STR_DEPOT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Trens - pincha nun tren para información, arrastra o vehículo para engadilo/quitalo do tren
+STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Vehículos - pincha nun vehículo para máis información
+STR_DEPOT_SHIP_LIST_TOOLTIP                                     :{BLACK}Barcos - pincha nun barco para máis información
+STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Avións - pincha no avión para máis información
+
+STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP                            :{BLACK}Construír novo vehículo de ferrocarril
+STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}Construír vehículo de estrada
+STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}Costruír novo barco
+STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}Construír novo avión
+
+STR_DEPOT_TRAIN_SELL_TOOLTIP                                    :{BLACK}Arrastra un vehículo do tren aquí para vendelo
+STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}Arrastra un vehículo de estrada aquí para vendelo
+STR_DEPOT_SHIP_SELL_TOOLTIP                                     :{BLACK}Arrastra o barco aquí para vendelo
+STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}Arrastra o avión aquí para vendelo
+
+STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}Centra-la vista principal na situación do depósito de trens
+STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}Centra-la vista principal na situación do depósito de vehículos de estrada
+STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}Centra-la vista principal na situación do depósito de barcos
+STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Centra-la vista principal na situación do hangar
+
+
 ### depot strings
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}Vas vender tódolos vehículos do depósito. ¿Estás seguro?
 STR_DEPOT_WRONG_DEPOT_TYPE                                      :Tipo de depósito erróneo
@@ -3174,6 +3192,7 @@ STR_REPLACE_REMOVE_WAGON                                        :{BLACK}Eliminar
 STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Facer que a autosubstitución manteña a lonxitude do tren quitando vagóns (empezando polo principio), se ó substituír a máquina o tren é máis longo.
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}Substituíndo: {ORANGE}{SKIP}{SKIP}{STRING}
 STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}Cambia entre as fiestras de substitución de máquinas e vagóns
+
 STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}O vehículo non está dispoñible
 STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}O vehículo non está dispoñible
 STR_SHIP_NOT_AVAILABLE                                          :{WHITE}O barco non está dispoñible
@@ -3388,7 +3407,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_LONG                                              :{DATE_LONG}
@@ -3405,6 +3427,31 @@ STR_FORMAT_COMPANY_NUM                                          :(Compañía {CO
 STR_FORMAT_GROUP_NAME                                           :Grupo {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}O nome debe ser único
 
 #### Improved sign GUI
diff --git a/src/lang/german.txt b/src/lang/german.txt
index aedea4c29..1b3e9bc3d 100644
--- a/src/lang/german.txt
+++ b/src/lang/german.txt
@@ -155,8 +155,6 @@ STR_ABBREV_PLASTIC                                              :{TINYFONT}PL
 STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}LI
 STR_ABBREV_NONE                                                 :{TINYFONT}KEINE
 STR_ABBREV_ALL                                                  :{TINYFONT}ALLE
-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
@@ -168,17 +166,11 @@ STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Ursprün
 STR_ABOUT_VERSION                                               :{BLACK}OpenTTD Version {REV}
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 OpenTTD-Team
 
-STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
-STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_QUIT_CAPTION                                                :{WHITE}Verlassen
 STR_YES                                                         :{BLACK}Ja
 STR_NO                                                          :{BLACK}Nein
 STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}OpenTTD wirklich beenden und zu {}{STRING} zurückkehren?
-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                                                :Nichts
 STR_COLOUR_DARK_BLUE                                            :Dunkelblau
 STR_COLOUR_PALE_GREEN                                           :Hellgrün
@@ -197,8 +189,6 @@ STR_COLOUR_BROWN                                                :Braun
 STR_COLOUR_GREY                                                 :Grau
 STR_COLOUR_WHITE                                                :Weiß
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}Zu viele Fahrzeuge im Spiel
-STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
-STR_RED_COMMA                                                   :{RED}{COMMA}
 STR_BUTTON_LOCATION                                             :{BLACK}Standort
 STR_SMALLMAP_TYPE_CONTOURS                                      :Höhenrelief
 STR_SMALLMAP_TYPE_VEHICLES                                      :Fahrzeuge
@@ -324,12 +314,13 @@ STR_SORT_CRITERIA_TIP                                           :{BLACK}Sortierk
 STR_FILTER_CRITERIA_TIP                                         :{BLACK}Filterkriterien auswählen
 STR_SORT_BY                                                     :{BLACK}Sortieren
 
+### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}Bevölkerung
+STR_SORT_BY_NAME                                                :{BLACK}Name
+STR_SORT_BY_DATE                                                :{BLACK}Datum
 STR_SORT_BY_PRODUCTION                                          :Produktion
 STR_SORT_BY_TYPE                                                :Typ
 STR_SORT_BY_TRANSPORTED                                         :Transportiert
-STR_SORT_BY_NAME                                                :{BLACK}Name
-STR_SORT_BY_DATE                                                :{BLACK}Datum
 STR_SORT_BY_NUMBER                                              :Nummer
 STR_SORT_BY_PROFIT_LAST_YEAR                                    :Gewinn im letzten Jahr
 STR_SORT_BY_PROFIT_THIS_YEAR                                    :Gewinn in diesem Jahr
@@ -352,6 +343,7 @@ STR_SORT_BY_INTRO_DATE                                          :Einführungsdat
 STR_SORT_BY_RUNNING_COST                                        :Betriebskosten
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :Leistung/Betriebskosten
 STR_SORT_BY_CARGO_CAPACITY                                      :Frachtkapazität
+
 STR_NO_WAITING_CARGO                                            :{BLACK}Keine Fracht im Wartezustand
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}Alle Anlagen auswählen
 STR_SELECT_ALL_TYPES                                            :{BLACK}Alle Frachtarten auswählen (einschließlich keine Fracht)
@@ -371,21 +363,6 @@ STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Ins Depot schic
 STR_SEND_SHIP_TO_DEPOT                                          :In die Werft schicken
 STR_SEND_AIRCRAFT_TO_HANGAR                                     :In den Hangar schicken
 
-############ range for months starts
-STR_MONTH_ABBREV_JAN                                            :Jan
-STR_MONTH_ABBREV_FEB                                            :Feb
-STR_MONTH_ABBREV_MAR                                            :Mär
-STR_MONTH_ABBREV_APR                                            :Apr
-STR_MONTH_ABBREV_MAY                                            :Mai
-STR_MONTH_ABBREV_JUN                                            :Jun
-STR_MONTH_ABBREV_JUL                                            :Jul
-STR_MONTH_ABBREV_AUG                                            :Aug
-STR_MONTH_ABBREV_SEP                                            :Sep
-STR_MONTH_ABBREV_OCT                                            :Okt
-STR_MONTH_ABBREV_NOV                                            :Nov
-STR_MONTH_ABBREV_DEC                                            :Dez
-############ 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}{STRING}-
@@ -412,8 +389,6 @@ 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_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
@@ -460,7 +435,7 @@ STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Keine
 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                                          :1.
 STR_ORDINAL_NUMBER_2ND                                          :2.
 STR_ORDINAL_NUMBER_3RD                                          :3.
@@ -494,6 +469,34 @@ STR_ORDINAL_NUMBER_30TH                                         :30.
 STR_ORDINAL_NUMBER_31ST                                         :31.
 ############ range for days ends
 
+############ range for months starts
+STR_MONTH_ABBREV_JAN                                            :Jan
+STR_MONTH_ABBREV_FEB                                            :Feb
+STR_MONTH_ABBREV_MAR                                            :Mär
+STR_MONTH_ABBREV_APR                                            :Apr
+STR_MONTH_ABBREV_MAY                                            :Mai
+STR_MONTH_ABBREV_JUN                                            :Jun
+STR_MONTH_ABBREV_JUL                                            :Jul
+STR_MONTH_ABBREV_AUG                                            :Aug
+STR_MONTH_ABBREV_SEP                                            :Sep
+STR_MONTH_ABBREV_OCT                                            :Okt
+STR_MONTH_ABBREV_NOV                                            :Nov
+STR_MONTH_ABBREV_DEC                                            :Dez
+
+STR_MONTH_JAN                                                   :Januar
+STR_MONTH_FEB                                                   :Februar
+STR_MONTH_MAR                                                   :März
+STR_MONTH_APR                                                   :April
+STR_MONTH_MAY                                                   :Mai
+STR_MONTH_JUN                                                   :Juni
+STR_MONTH_JUL                                                   :Juli
+STR_MONTH_AUG                                                   :August
+STR_MONTH_SEP                                                   :September
+STR_MONTH_OCT                                                   :Oktober
+STR_MONTH_NOV                                                   :November
+STR_MONTH_DEC                                                   :Dezember
+############ range for months ends
+
 STR_GRAPH_Y_LABEL_NUMBER                                        :{TINYFONT}{COMMA}
 
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}Akzeptierte Fracht: {LTBLUE}
@@ -583,12 +586,9 @@ 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_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_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
@@ -670,9 +670,7 @@ STR_OFF                                                         :Aus
 STR_SUMMARY                                                     :Ticker
 STR_FULL                                                        :Zeitung
 STR_STATUSBAR_COMPANY_NAME                                      :{SILVER}- -  {COMPANY}  - -
-STR_BLACK_STRING                                                :{BLACK}{STRING}
 
-STR_JUST_CHECKMARK                                              :{CHECKMARK}
 ############ range for menu starts
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Spieleinstellungen
 STR_SETTINGS_MENU_DIFFICULTY_SETTINGS                           :Schwierigkeitsgrad
@@ -777,9 +775,6 @@ 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_BLACK_6                                                     :{BLACK}6
-STR_BLACK_7                                                     :{BLACK}7
-
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Englisch
 STR_TOWNNAME_FRENCH                                             :Französisch
@@ -859,19 +854,6 @@ STR_OPTIONS_BASE_GRF_DESCRIPTION_TIP                            :{BLACK}Zusatzin
 
 STR_AUTOSAVE_FAILED                                             :{WHITE}Autosicherung fehlgeschlagen
 
-STR_MONTH_JAN                                                   :Januar
-STR_MONTH_FEB                                                   :Februar
-STR_MONTH_MAR                                                   :März
-STR_MONTH_APR                                                   :April
-STR_MONTH_MAY                                                   :Mai
-STR_MONTH_JUN                                                   :Juni
-STR_MONTH_JUL                                                   :Juli
-STR_MONTH_AUG                                                   :August
-STR_MONTH_SEP                                                   :September
-STR_MONTH_OCT                                                   :Oktober
-STR_MONTH_NOV                                                   :November
-STR_MONTH_DEC                                                   :Dezember
-
 STR_HEADING_FOR_STATION                                         :{LTBLUE}Unterwegs nach {STATION}
 STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}Unterwegs nach {STATION}, {VELOCITY}
 STR_NO_ORDERS                                                   :{LTBLUE}Keine Aufträge
@@ -886,8 +868,6 @@ STR_CRATES                                                      :Kisten
 STR_RES_OTHER                                                   :Andere
 STR_NOTHING                                                     :
 
-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...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Ende des gemeinsam genutzten Fahrplans - -
@@ -1159,7 +1139,6 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Y-Abmes
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :ausgeschaltet
-STR_JUST_CURRENCY                                               :{CURRENCY}
 STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Wert der Einstellung ändern
 
 STR_TEMPERATE_LANDSCAPE                                         :Gemäßigt
@@ -2125,8 +2104,6 @@ STR_NUM_LOW                                                     :Niedrig
 STR_NUM_NORMAL                                                  :Normal
 STR_NUM_HIGH                                                    :Hoch
 STR_NUM_CUSTOM                                                  :Eigene
-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
@@ -2807,7 +2784,6 @@ 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_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})
@@ -3473,7 +3449,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}
@@ -3491,6 +3470,31 @@ STR_FORMAT_COMPANY_NUM                                          :(Firma {COMMA})
 STR_FORMAT_GROUP_NAME                                           :Gruppe {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 bereits vergeben
 
 #### Improved sign GUI
diff --git a/src/lang/hebrew.txt b/src/lang/hebrew.txt
index c4e58d273..3833ebbb3 100644
--- a/src/lang/hebrew.txt
+++ b/src/lang/hebrew.txt
@@ -155,8 +155,6 @@ STR_ABBREV_PLASTIC                                              :{TINYFONT}פל
 STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}ממ
 STR_ABBREV_NONE                                                 :{TINYFONT}כל
 STR_ABBREV_ALL                                                  :{TINYFONT}הכל
-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}הודעה
@@ -168,17 +166,11 @@ STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}כל ה�
 STR_ABOUT_VERSION                                               :{BLACK}{REV} גירסה , OpenTTD
 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}צא
 STR_YES                                                         :{BLACK}כן
 STR_NO                                                          :{BLACK}לא
 STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}?{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                                                :כלום
 STR_COLOUR_DARK_BLUE                                            :כחול כהה
 STR_COLOUR_PALE_GREEN                                           :ירוק חיוור
@@ -197,8 +189,6 @@ STR_COLOUR_BROWN                                                :חום
 STR_COLOUR_GREY                                                 :אפור
 STR_COLOUR_WHITE                                                :לבן
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}יותר מידי כלי תעבורה במשחק
-STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
-STR_RED_COMMA                                                   :{RED}{COMMA}
 STR_BUTTON_LOCATION                                             :{BLACK}מיקום
 STR_SMALLMAP_TYPE_CONTOURS                                      :קווי מיתאר
 STR_SMALLMAP_TYPE_VEHICLES                                      :כלי תעבורה
@@ -323,12 +313,13 @@ STR_SORT_ORDER_TIP                                              :{BLACK}(בחר(
 STR_SORT_CRITERIA_TIP                                           :{BLACK}בחר\י קרטריון מיון
 STR_SORT_BY                                                     :{BLACK}מיון לפי
 
+### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}אכלוסיה
+STR_SORT_BY_NAME                                                :{BLACK}שם
+STR_SORT_BY_DATE                                                :{BLACK}תאריך
 STR_SORT_BY_PRODUCTION                                          :ייצור
 STR_SORT_BY_TYPE                                                :סוג
 STR_SORT_BY_TRANSPORTED                                         :סחורה שנשלחה
-STR_SORT_BY_NAME                                                :{BLACK}שם
-STR_SORT_BY_DATE                                                :{BLACK}תאריך
 STR_SORT_BY_NUMBER                                              :מספר
 STR_SORT_BY_PROFIT_LAST_YEAR                                    :רווח שנה שעברה
 STR_SORT_BY_PROFIT_THIS_YEAR                                    :רווח השנה
@@ -349,37 +340,25 @@ STR_SORT_BY_INTRO_DATE                                          :תאריך הת
 STR_SORT_BY_RUNNING_COST                                        :עלות הפעלה
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :כח/עלות הפעלה
 STR_SORT_BY_CARGO_CAPACITY                                      :קיבולת סחורה
+
 STR_NO_WAITING_CARGO                                            :{BLACK}שום סחורה לא מחכה
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}בחר את כל המתקנים
 STR_SELECT_ALL_TYPES                                            :{BLACK}(ברח את כל סוגי הסחורה (כולל סחורה שלא מחכה
-STR_AVAILABLE_TRAINS                                            :{BLACK}רכבות זמינות
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}רכבים זמינים
-STR_AVAILABLE_SHIPS                                             :{BLACK}כלי שייט זמינות
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}כלי טייס זמינים
 STR_AVAILABLE_ENGINES_TIP                                       :{BLACK} ראה רשימה של קטרים זמינים לסוג כלי הרכב הזה
 STR_MANAGE_LIST                                                 :{BLACK}נהל רשימה
 STR_MANAGE_LIST_TIP                                             :{BLACK}שלח הוראות לכל כלי הרכב ברשימה זו
 STR_REPLACE_VEHICLES                                            :החלף כלי רכב
+STR_SEND_FOR_SERVICING                                          :שלח לטיפול
+
+STR_AVAILABLE_TRAINS                                            :{BLACK}רכבות זמינות
+STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}רכבים זמינים
+STR_AVAILABLE_SHIPS                                             :{BLACK}כלי שייט זמינות
+STR_AVAILABLE_AIRCRAFT                                          :{BLACK}כלי טייס זמינים
+
 STR_SEND_TRAIN_TO_DEPOT                                         :שלח רכבת למוסך
 STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :שלח כלי רכב למוסך
 STR_SEND_SHIP_TO_DEPOT                                          :שלח אוניה למוסך
 STR_SEND_AIRCRAFT_TO_HANGAR                                     :שלך כלי תעופה להנגר
-STR_SEND_FOR_SERVICING                                          :שלח לטיפול
-
-############ range for months starts
-STR_MONTH_ABBREV_JAN                                            :ינואר
-STR_MONTH_ABBREV_FEB                                            :פברואר
-STR_MONTH_ABBREV_MAR                                            :מרץ
-STR_MONTH_ABBREV_APR                                            :אפריל
-STR_MONTH_ABBREV_MAY                                            :מאי
-STR_MONTH_ABBREV_JUN                                            :יוני
-STR_MONTH_ABBREV_JUL                                            :יולי
-STR_MONTH_ABBREV_AUG                                            :אוגוסט
-STR_MONTH_ABBREV_SEP                                            :ספטמבר
-STR_MONTH_ABBREV_OCT                                            :אוקטובר
-STR_MONTH_ABBREV_NOV                                            :נובמבר
-STR_MONTH_ABBREV_DEC                                            :דצמבר
-############ range for months ends
 
 STR_GRAPH_X_LABEL_MONTH                                         :{TINYFONT}{STRING}{} {STRING}
 STR_GRAPH_X_LABEL_MONTH_YEAR                                    :{TINYFONT}{STRING}{} {STRING}{}{NUM}
@@ -407,8 +386,6 @@ 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_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}כותרת החלון - גרור להזזה
@@ -455,7 +432,7 @@ STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :אין
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}שם
 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                                          :1
 STR_ORDINAL_NUMBER_2ND                                          :2
 STR_ORDINAL_NUMBER_3RD                                          :3
@@ -489,6 +466,34 @@ STR_ORDINAL_NUMBER_30TH                                         :30
 STR_ORDINAL_NUMBER_31ST                                         :31
 ############ range for days ends
 
+############ range for months starts
+STR_MONTH_ABBREV_JAN                                            :ינואר
+STR_MONTH_ABBREV_FEB                                            :פברואר
+STR_MONTH_ABBREV_MAR                                            :מרץ
+STR_MONTH_ABBREV_APR                                            :אפריל
+STR_MONTH_ABBREV_MAY                                            :מאי
+STR_MONTH_ABBREV_JUN                                            :יוני
+STR_MONTH_ABBREV_JUL                                            :יולי
+STR_MONTH_ABBREV_AUG                                            :אוגוסט
+STR_MONTH_ABBREV_SEP                                            :ספטמבר
+STR_MONTH_ABBREV_OCT                                            :אוקטובר
+STR_MONTH_ABBREV_NOV                                            :נובמבר
+STR_MONTH_ABBREV_DEC                                            :דצמבר
+
+STR_MONTH_JAN                                                   :ינואר
+STR_MONTH_FEB                                                   :פברואר
+STR_MONTH_MAR                                                   :מרץ
+STR_MONTH_APR                                                   :אפריל
+STR_MONTH_MAY                                                   :מאי
+STR_MONTH_JUN                                                   :יוני
+STR_MONTH_JUL                                                   :יולי
+STR_MONTH_AUG                                                   :אוגוסט
+STR_MONTH_SEP                                                   :ספטמבר
+STR_MONTH_OCT                                                   :אוקטובר
+STR_MONTH_NOV                                                   :נובמבר
+STR_MONTH_DEC                                                   :דצמבר
+############ range for months ends
+
 STR_GRAPH_Y_LABEL_NUMBER                                        :{TINYFONT}{COMMA}
 
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK} :מקבל {LTBLUE}
@@ -578,12 +583,9 @@ 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_COMMA                                                  :{BLUE}{COMMA}
 STR_SCENEDIT_TOOLBAR_OPENTTD                                    :{YELLOW}OpenTTD
 STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR                            :{YELLOW}עורך הסצנריו
 STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION                   :{WHITE}יצירת טופוגרפיה
-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}צור קרקע אקראית
@@ -659,9 +661,7 @@ STR_OFF                                                         :כבוי
 STR_SUMMARY                                                     :תמצית
 STR_FULL                                                        :מלא
 STR_STATUSBAR_COMPANY_NAME                                      :{SILVER}- -  {COMPANY}  - -
-STR_BLACK_STRING                                                :{BLACK}{STRING}
 
-STR_JUST_CHECKMARK                                              :{CHECKMARK}
 ############ range for menu starts
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :אפשרויות המשחק
 STR_SETTINGS_MENU_DIFFICULTY_SETTINGS                           :הגדרות קושי
@@ -753,9 +753,6 @@ STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY                             :ממן תעשי
 ############ range ends here
 
 STR_FUND_INDUSTRY_CAPTION                                       :{WHITE}ממן תעשיה חדשה
-STR_JUST_STRING                                                 :{STRING}
-STR_JUST_RAW_STRING                                             :{STRING}
-STR_JUST_INT                                                    :{NUM}
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_RAINFOREST                       :{WHITE}...יכול להבנות רק ליד אזורי יערות הגשם
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT                           :{WHITE}...יכול להבנות רק ליד אזורי מדבר
 STR_STATUSBAR_PAUSED                                            :{YELLOW}* *  המשחק מושהה  *  *
@@ -769,9 +766,6 @@ STR_STATUSBAR_SAVING_GAME                                       :{RED}*  *  שו
 STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}!שמירה מתבצעת,{} אנא המתן עד לסיום השמירה
 STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE                       :{BLACK}בחר בתוכנית מנגינה בסגנון קליל
 
-STR_BLACK_6                                                     :{BLACK}6
-STR_BLACK_7                                                     :{BLACK}7
-
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :אנגלית
 STR_TOWNNAME_FRENCH                                             :צרפתית
@@ -849,19 +843,6 @@ STR_OPTIONS_BASE_GRF_TIP                                        :{BLACK}בחר �
 
 STR_AUTOSAVE_FAILED                                             :{WHITE}שמירה אוטומטית נכשלה
 
-STR_MONTH_JAN                                                   :ינואר
-STR_MONTH_FEB                                                   :פברואר
-STR_MONTH_MAR                                                   :מרץ
-STR_MONTH_APR                                                   :אפריל
-STR_MONTH_MAY                                                   :מאי
-STR_MONTH_JUN                                                   :יוני
-STR_MONTH_JUL                                                   :יולי
-STR_MONTH_AUG                                                   :אוגוסט
-STR_MONTH_SEP                                                   :ספטמבר
-STR_MONTH_OCT                                                   :אוקטובר
-STR_MONTH_NOV                                                   :נובמבר
-STR_MONTH_DEC                                                   :דצמבר
-
 STR_HEADING_FOR_STATION                                         :{LTBLUE}פונה אל {STATION}
 STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}פונה אל {STATION}, {VELOCITY}
 STR_NO_ORDERS                                                   :{LTBLUE}אין הוראות
@@ -876,8 +857,6 @@ STR_CRATES                                                      :ארגזים
 STR_RES_OTHER                                                   :אחר
 STR_NOTHING                                                     :
 
-STR_TINY_RIGHT_ARROW                                            :{TINYFONT}{RIGHTARROW}
-
 STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}לא ניתן לצמד יעדים...
 STR_CANT_COPY_ORDER_LIST                                        :{WHITE}לא ניתן להעתיק יעדים...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - סוף של הוראות משותפות - -
@@ -1140,7 +1119,6 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Y-גו�
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :מבוטל
-STR_JUST_CURRENCY                                               :{CURRENCY}
 STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}שנה ערך
 
 STR_TEMPERATE_LANDSCAPE                                         :אקלים ממוזג
@@ -1176,7 +1154,6 @@ STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}בחר �
 
 STR_WAYPOINT_VIEWPORT                                           :{WHITE}{WAYPOINT}
 STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WHITE}{WAYPOINT}
-STR_WAYPOINT_NAME                                               :{WAYPOINT}
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}ערוך שם נקודת ציון
 
 STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}שינוי שם היעד נכשל...
@@ -1242,11 +1219,6 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}רשימ
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}קרוב מידי לתעשיה אחרת
 
-STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}התאם את הרכבת לנשיאת משא שונה
-STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}התאם רכבת
-STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}בחר את סוג המשא עבור הרכבת
-STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}התאם את הרכבת לנשיאת המשא שנבחר
-STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}...לא ניתן להתאים את הרכבת
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}שנה תפוקה
 
 ############ network gui strings
@@ -1752,11 +1724,6 @@ STR_TOWN_BUILDING_NAME_TEPEES_1                                 :טיפי
 STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1                           :בית-ספל
 STR_TOWN_BUILDING_NAME_PIGGY_BANK_1                             :בנק דן-חסכן
 
-STR_INDUSTRY_NAME                                               :{INDUSTRY}
-STR_TOWN_NAME                                                   :{TOWN}
-STR_FORMAT_INDUSTRY_NAME                                        :{TOWN} {STRING}
-STR_STATION_NAME                                                :{STATION}
-
 ##id 0x2800
 STR_LANDSCAPING_MENU_LANDSCAPING                                :עיצוב פני השטח
 STR_LANDSCAPING_MENU_PLANT_TREES                                :טע עצים
@@ -1811,6 +1778,12 @@ STR_CARGO_RATING_EXCELLENT                                      :מצויין
 STR_CARGO_RATING_OUTSTANDING                                    :מדהים
 ############ range for rating ends
 
+### station view strings
+STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}הצג את כל הרכבות העוברות דרך תחנה זו
+STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}הצג את כל הרכבים העוברים דרך תחנה זו
+STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}הצג את כל כלי הטייס העוברים דרך תחנה זו
+STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}הצג את כל כלי השייט העוברים דרך תחנה זו
+
 STR_STATION_VIEW_CARGO_RATING                                   :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO                        :{WHITE}{1:STRING} לא מקבלת יותר {NBSP}{0:STATION}
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO               :{WHITE} {2:STRING} או {NBSP}{1:STRING}  לא מקבלת יותר {NBSP}{0:STATION}
@@ -2054,6 +2027,7 @@ STR_SV_STNAME_AIRPORT                                           :{STRING} נמל
 STR_SV_STNAME_OILFIELD                                          :{STRING} שדה הנפט
 STR_SV_STNAME_MINES                                             :{STRING} מכרות
 STR_SV_STNAME_DOCKS                                             :{STRING} רציפי
+##id 0x6020
 STR_SV_STNAME_ANNEXE                                            :{STRING} תחנת מפגש
 STR_SV_STNAME_SIDINGS                                           :{STRING} תחנת מסיעי
 STR_SV_STNAME_BRANCH                                            :{STRING} תחנת מובילי
@@ -2101,8 +2075,6 @@ STR_NUM_LOW                                                     :נמוך
 STR_NUM_NORMAL                                                  :רגיל
 STR_NUM_HIGH                                                    :גבוה
 STR_NUM_CUSTOM                                                  :אחר
-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                                             :בינוני
@@ -2136,7 +2108,6 @@ STR_CITY_APPROVAL_HOSTILE                                       :עויין
 
 ##id 0x7000
 STR_COMPANY_VIEW_CAPTION                                        :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
-STR_FORMAT_COMPANY_NUM                                          :({COMMA} חברה)
 STR_COMPANY_VIEW_NEW_FACE_BUTTON                                :{BLACK}פנים חדשות
 STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON                           :{BLACK}הגדרות צבע
 STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}:הגדרות צבע
@@ -2169,7 +2140,6 @@ STR_FINANCES_TOTAL_CAPTION                                      :{WHITE}:סה”
 STR_COMPANY_NAME_COMPANY_NUM                                    :{COMPANY} {COMPANYNUM}
 STR_GRAPH_INCOME_CAPTION                                        :{WHITE}גרף הכנסות
 STR_CURRCOMPACT                                                 :{CURRCOMPACT}
-STR_JUST_COMMA                                                  :{COMMA}
 STR_GRAPH_OPERATING_PROFIT_CAPTION                              :{WHITE}גרף רווח תפעולי
 STR_FINANCES_BANK_BALANCE_TITLE                                 :{WHITE}חשבון הבנק
 STR_FINANCES_LOAN_TITLE                                         :{WHITE}הלוואה
@@ -2571,10 +2541,8 @@ STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE                          :קטר חד-פ�
 STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE                            :קטר פס מגנטי
 
 ##id 0x8800
-STR_DEPOT_TRAIN_CAPTION                                         :{WHITE}{TOWN} מוסך רכבת
 STR_NEWS_FIRST_TRAIN_ARRIVAL                                    :{BLACK}{BIGFONT}!{STATION} התושבים חוגגים... {}רכבת ראשונה הגיעה ל
 STR_VEHICLE_DETAILS_CAPTION                                     :{WHITE}(פרטים){VEHICLE}
-STR_ERROR_TRAIN_IN_THE_WAY                                      :{WHITE}רכבת חוסמת את המעבר
 STR_ORDER                                                       :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 STR_ORDER_SELECTED                                              :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 STR_ORDER_NON_STOP                                              :{BLACK}ללא עצירה
@@ -2661,38 +2629,16 @@ STR_TIMETABLE_AND_TRAVEL_FOR                                    :{STRING} וער
 STR_TIMETABLE_DAYS                                              :ימים {COMMA}
 STR_TIMETABLE_TICKS                                             :פעימות {COMMA}
 
-STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}{TOWN} בדרך אל המוסך ב
-STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}{1:VELOCITY}במהירות {NBSP}{0:TOWN} בדרך אל המוסך ב
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}{TOWN} בדרך לטיפול במוסך
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}{1:VELOCITY}במהירות {NBSP}{0:TOWN} בדרך לטיפול במוסך
-
 STR_INVALID_ORDER                                               :{RED}(יעד שגוי)
 
 STR_UNKNOWN_STATION                                             :תחנה לא ידועה
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}ריקה
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{1:STATION} מ {NBSP}{0:CARGO}
 STR_VEHICLE_DETAILS_CARGO_FROM_MULT                             :{LTBLUE}(x{2:NUM}){1:STATION} מ {NBSP}{0:CARGO}
-STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}ממתין/ממתינה במוסך {VEHICLE}
-STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}כלים חדשים
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}רכבת ארוכה מידי
 STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}ניתן לשנות את הרכבת בעת עצירה במוסך בלבד
-STR_VEHICLE_LIST_TRAIN_CAPTION                                  :{WHITE}רכבות{NBSP} {1:COMMA} - {0:STRING}
 
-STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}רכבות חדשות
-STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}רכבות חשמליות חדשות
-STR_BUILD_VEHICLE_TRAIN_MONORAIL_CAPTION                        ::{WHITE}רכבות חד-פס חדשות
-STR_BUILD_VEHICLE_TRAIN_MAGLEV_CAPTION                          :{WHITE}רכבות פס מגנטי חדשות
-STR_BUILD_VEHICLE_TRAIN_ALL_CAPTION                             :{WHITE}רכבות זמינות
-
-STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_BUTTON                    :{BLACK}בנה רכבת
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}שכפל רכב
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}.פעולה זו תיצור עותק נוסף של כלי הרכב
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK} .פעולה זו תיצור עותק נוסף של כלי הרכב
-STR_CLONE_TRAIN                                                 :{BLACK}שכפל רכבת
-STR_CLONE_TRAIN_INFO                                            :{BLACK}פעולה זו תיצור עותק נוסף של הרכבת וכל קרונותיה
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}פעולה זו תיצור עותק נוסף של הרכבת וכל קרונותיה
-STR_BUILD_VEHICLE_TRAIN_RENAME_BUTTON                           :{BLACK}שנה שם
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}דלג
 STR_ORDERS_DELETE_BUTTON                                        :{BLACK}מחק
 STR_ORDERS_GO_TO_BUTTON                                         :{BLACK}עבור אל
@@ -2708,14 +2654,12 @@ STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}עבור
 STR_ORDERS_CAPTION                                              :{WHITE} (יעדים) {VEHICLE}
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - סוף רשימת היעדים - -
 STR_SERVICE                                                     :{BLACK}טיפול
-STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}...לא ניתן לבנות רכבת
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{2:CURRENCY}{BLACK}  :ערך {LTBLUE}{1:NUM}{BLACK}  :נבנה {LTBLUE}{0:ENGINE}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{1:CURRENCY}{BLACK} :שווי {LTBLUE}{0:ENGINE}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
 STR_VEHICLE_STATUS_LOADING_UNLOADING                            :{LTBLUE}טעינה / פריקה
 STR_VEHICLE_STATUS_LEAVING                                      :{LTBLUE} עוזב/ת
 STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}הרכבת צריכה להיות בעצירה במוסך
-STR_ERROR_CAN_T_SEND_TRAIN_TO_DEPOT                             :{WHITE}לא ניתן לשלוח רכבת למוסך
 STR_ERROR_NO_MORE_SPACE_FOR_ORDERS                              :{WHITE}לא נותר מקום יעדים נוספים
 STR_ERROR_TOO_MANY_ORDERS                                       :{WHITE}יותר מדי יעדים
 STR_ERROR_CAN_T_INSERT_NEW_ORDER                                :{WHITE}...לא ניתן להוסיף יעד
@@ -2730,26 +2674,11 @@ STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE} הכל�
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}...לא ניתן להזיז את כלי הרכב
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}הקטר האחורי עוקב תמיד אחר הקטר הקידמי
 STR_CARGO_N_A                                                   :N/A{SKIP}
-STR_ERROR_CAN_T_SELL_TRAIN                                      :{WHITE}לא ניתן למכור את הרכבת
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}לא מוצא נתיב למוסך מקומי
-STR_ERROR_CAN_T_STOP_START_TRAIN                                :{WHITE}לא ניתן לעצור/להמשיך בנסיעה
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{LTBLUE}{1:DATE_LONG} :טיפול אחרוןֿ {BLACK}{LTBLUE}{0:COMMA}% {BLACK} :מרווח בין טיפולים
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{LTBLUE}{1:DATE_LONG} :טיפול אחרוןֿ {BLACK}{LTBLUE}{0:COMMA}% {BLACK} :מרווח בין טיפולים
-STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP                             :{BLACK}רכבות - בחר רכבת לצפייה במידע
-STR_DEPOT_TRAIN_LIST_TOOLTIP                                    :{BLACK}רכבות - בחר רכבת לקבלת מידע, גרור קרון להוספתו/הסרתו מהרכבת
-STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP                            :{BLACK}בניית קרון חדש
-STR_DEPOT_TRAIN_SELL_TOOLTIP                                    :{BLACK}גרור קרון/קטר לכאן כדי למכור אותו
-STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}מקד את החלון הראשי על מיקום תחנת הטיפולים
-STR_BUILD_VEHICLE_TRAIN_LIST_TOOLTIP                            :{BLACK} בחירת קרונות - לחץ על קרון לקבלת מידע
-STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_TOOLTIP                   :{BLACK}בנה את קרון הרכבת שנבחר
-STR_BUILD_VEHICLE_TRAIN_RENAME_TOOLTIP                          :{BLACK}שנה את שם סוג הקרון
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP                 :{BLACK}פעולה נוכחית - לחץ כאן כדי לעצור/להמשיך בנסיעה
-STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP                           :{BLACK}הצג את רשימת היעדים של הרכבת
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP                         :{BLACK}מקד את התצוגה על מיקום הרכבת
-STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP                    :{BLACK}.שלח את הרכבת למוסך
 STR_VEHICLE_VIEW_TRAIN_IGNORE_SIGNAL_TOOLTIP                    :{BLACK}הכרח את הרכבת להמשיך מבלי להמתין לרמזור
 STR_VEHICLE_VIEW_TRAIN_REVERSE_TOOLTIP                          :{BLACK}שנה את כיוון הנסיעה של הרכבת
-STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}הצג את נתוני הרכבת
 STR_VEHICLE_DETAILS_INCREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}הארך את המרווח בין טיפולים
 STR_VEHICLE_DETAILS_DECREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}קצר את המרווח בין טיפולים
 STR_VEHICLE_DETAILS_TRAIN_CARGO_TOOLTIP                         :{BLACK}הצג פרטי המשא
@@ -2770,13 +2699,9 @@ STR_VEHICLE_STATUS_STOPPED                                      :{RED}נעצרה
 STR_ERROR_CAN_T_MAKE_TRAIN_PASS_SIGNAL                          :{WHITE}לא ניתן להכריח את הרכבת לעבור ברמזור בעת סכנה
 STR_VEHICLE_STATUS_CRASHED                                      :{RED}!התרסק/הֿ
 
-STR_QUERY_RENAME_TRAIN_CAPTION                                  :{WHITE}תן שם לרכבת
-STR_ERROR_CAN_T_RENAME_TRAIN                                    :{WHITE}לא ניתן לתת שם לרכבת
-STR_VEHICLE_DETAILS_TRAIN_RENAME                                :{BLACK}תן שם לרכבת
 STR_NEWS_TRAIN_CRASH                                            :{BLACK}{BIGFONT} !התנגשות רכבות {}{NBSP} נספו בפיצוץ כתוצאה מהתאונה {COMMA}
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}לא ניתן לשנות את כיוון  הנסיעה של הרכבת
-STR_QUERY_RENAME_TRAIN_TYPE_CAPTION                             :{WHITE}שנה את שם סוג קרון הרכבת
-STR_ERROR_CAN_T_RENAME_TRAIN_TYPE                               :{WHITE}לא ניתן לשנות את שם סוג הקרון
+STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}.לא ניתן לסובב כלי רכב מורכבים
 STR_CLEAR_TIME                                                  :{BLACK}אפס זמן
 STR_RESET_LATENESS                                              :{BLACK}אפס מונה איחורים
 STR_CHANGE_WAYPOINT_NAME                                        :{BLACK}שנה שם נקודת ציון
@@ -2808,178 +2733,53 @@ STR_TIMETABLE_AUTOFILL                                          :{BLACK}מילו
 STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK} מלא את הטבלה אוטומטית על פי הזמנים שנדרשו להשלמת המסע הקודם
 
 ##id 0x9000
-STR_ERROR_ROAD_VEHICLE_IN_THE_WAY                               :{WHITE}כלי רכב חוסם את הדרך
-STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}כלי רכב {NBSP}{1:COMMA} - {0:STRING}
-STR_DEPOT_ROAD_VEHICLE_CAPTION                                  :{WHITE}{TOWN} מוסך כלי רכב
-STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_BUTTON                      :{BLACK}כלי רכב חדשים
-STR_BUILD_VEHICLE_ROAD_VEHICLE_CAPTION                          :{WHITE}כלי רכב חדשים
-STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_BUTTON             :{BLACK}בנה כלי רכב
-STR_ERROR_CAN_T_BUILD_ROAD_VEHICLE                              :{WHITE}לא ניתן לבנות כלי רכב...
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}...חייב לעצור בתוך מוסך לכלי רכב
-STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}...לא ניתן למכור כלי רכב
-STR_ERROR_CAN_T_STOP_START_ROAD_VEHICLE                         :{WHITE}...לא ניתן לעצור/להמשיך בנסיעה
-STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} ממתין במוסך כלי הרכב
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}{TOWN} בדרך אל מוסך הרכבים ב
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE} {1:VELOCITY}  במהירות , {NBSP}{0:TOWN} בדרך אל מוסך הרכבים ב
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE} {TOWN} טיפול במוסך ב
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE} {1:VELOCITY}  במהירות ,{NBSP} {0:TOWN} טיפול במוסך הרכבים ב
-STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}...לא ניתן לשלוח את כלי הרכב למוסך
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}לא ניתן לאתר מוסך כלי רכב מקומי
-STR_VEHICLE_LIST_ROAD_VEHICLE_TOOLTIP                           :{BLACK}כלי רכב - לחץ על כלי רכב למידע
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP          :{BLACK}מצב כלי הרכב- לחץ כאן לעצירה/המשך נסיעה
-STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP                    :{BLACK}הצג את רשימת היעדים
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP                  :{BLACK}מקד את התצוגה על מיקומו של כלי הרכב
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}.שלח את כלי הרכב למוסך
 STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP                   :{BLACK}הכרח את כלי הרכב להסתובב
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}הצג את פרטי כלי הרכב
-STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}כלי רכב - לחץ על כלי רכב למידע
-STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}בנה כלי רכב חדש
-STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}גרור כלי רכב לכאן על מנת למכור אותו
-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_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})
 
-STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}תן שם לכלי הרכב
-STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}...לא ניתן לשנות את שם כלי הרכב
-STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}תן שם לכלי הרכב
 STR_NEWS_FIRST_BUS_ARRIVAL                                      ::{BLACK}{BIGFONT}!{STATION} התושבים חוגגים... {}אוטובוס ראשון הגיעה ל
 STR_NEWS_FIRST_TRUCK_ARRIVAL                                    ::{BLACK}{BIGFONT}!{STATION} התושבים חוגגים... {}משאית ראשונה הגיעה ל
 STR_NEWS_FIRST_PASSENGER_TRAM_ARRIVAL                           :{BLACK}{BIGFONT}!{STATION} התושבים חוגגים... {}חשמלית נוסעים ראשונה הגיעה ל
 STR_NEWS_FIRST_CARGO_TRAM_ARRIVAL                               :{BLACK}{BIGFONT}!{STATION} התושבים חוגגים... {}חשמלית משא ראשונה הגיעה ל
 STR_NEWS_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}תאונת כלי רכב!{}נהג נהרג לאחר התנגשות ברכבת
 STR_NEWS_ROAD_VEHICLE_CRASH                                     :{BLACK}{BIGFONT}תאונת כלי רכב!{}{NBSP}נהרגו לאחר התנגשות עם רכבת {COMMA}
-STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}.לא ניתן לסובב כלי רכב מורכבים
-STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}שנה שם
-STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}שנה את שם סוג כלי הרכב
-STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}שנה את שם סוג כלי הרכב
-STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}לא ניתן לשנות את שם סוג כלי הרכב
 
-STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}התאם כלי רכב לנשיאת מטען חדש
-STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}התאם כלי רכב
-STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}התאם את כלי הרכב לנשיאת המטען שנבחר
-STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}... לא ניתן להתאים את כלי הרכב
-STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}בחר את סוג המטען לנשיאה
 
 ##id 0x9800
 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :בניית נתיבי מים
 STR_WATERWAYS_TOOLBAR_CAPTION                                   :{WHITE}בניית נתיבי מים
 STR_WATERWAYS_TOOLBAR_CAPTION_SE                                :{WHITE}נתיבי מים
 STR_ERROR_CAN_T_BUILD_DOCK_HERE                                 :{WHITE}...לא ניתן לבנות מזח במשבצת זו
-STR_DEPOT_SHIP_CAPTION                                          :{WHITE}{TOWN} מבדוק כלי שייט
-STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON                              :{BLACK}כלי שייט חדש
-STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}כלי שייט {NBSP}{1:COMMA} - {0:STRING}
-STR_BUILD_VEHICLE_SHIP_CAPTION                                  :{WHITE}כלי שייט חדשים
-STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON                     :{BLACK}בנה כלי שייט
-STR_CLONE_SHIP                                                  :{BLACK}שכפל כלי שייט
-STR_CLONE_SHIP_INFO                                             :{BLACK}פעולה זו תיצור עותק של כלי השייט
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}פעולה זו תיצור עותק של כלי השייט
 STR_ERROR_SHIP_MUST_BE_STOPPED_IN_DEPOT                         :{WHITE}כלי השייט חייב להמצא בעצירה במבדוק
-STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}לא ניתן למכור כלי שייט זה
-STR_ERROR_CAN_T_BUILD_SHIP                                      :{WHITE}לא ניתן לבנות כלי שייט זה
-STR_ERROR_SHIP_IN_THE_WAY                                       :{WHITE}כלי שייט חוסם את הדרך
-STR_ERROR_CAN_T_STOP_START_SHIP                                 :{WHITE}לא ניתן לעצור/להפעיל את כלי השייט
-STR_ERROR_CAN_T_SEND_SHIP_TO_DEPOT                              :{WHITE} לא ניתן לשלוח את כלי השייט למבדוק
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE} {TOWN} בדרך אל המבדוק ב
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}{1:VELOCITY} מהירות ,  {NBSP}{0:TOWN} בדרך אל המבדוק ב
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}{TOWN} טיפול במבדוק
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}{1:VELOCITY} מהירות , {NBSP}{0:TOWN} טיפול במבדוק
-STR_NEWS_SHIP_IS_WAITING                                        :{WHITE}ממתינה במבדוק {VEHICLE}
 STR_WATERWAYS_TOOLBAR_BUILD_DOCK_TOOLTIP                        :{BLACK}בניית רציף לכלי שייט
 STR_WATERWAYS_TOOLBAR_BUILD_DEPOT_TOOLTIP                       :{BLACK}(בניית מבדוק אוניות (לבניה וטיפול בכלי שייט
-STR_DEPOT_SHIP_LIST_TOOLTIP                                     :{BLACK}כלי שייט – בחר כלי לצפיה במידע
-STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}בנה כלי שייט חדש
-STR_DEPOT_SHIP_SELL_TOOLTIP                                     :{BLACK}גרור כלי שייט לכאן על מנת למכרו
-STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}מקד את התצוגה הראשית על מבדוק הספינות
-STR_VEHICLE_LIST_SHIP_TOOLTIP                                   :{BLACK}כלי שייט – בחר כלי לצפיה במידע
-STR_BUILD_VEHICLE_SHIP_LIST_TOOLTIP                             :{BLACK}כלי שייט – בחר כלי לצפיה במידע
-STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP                    :{BLACK}בנה את כלי השייט שנבחר
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP                  :{BLACK}עצור/הפעל כלי שייט
-STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}הצג את יעדי כלי השייט
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP                          :{BLACK}מקד את התצוגה הראשית על כלי השייט
-STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}שלח את כלי השייט למבדוק
-STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}הצג פרטי כלי שייט
-STR_VEHICLE_DETAILS_SHIP_RENAME                                 :{BLACK}תן שם לכלי השייט
 
-STR_QUERY_RENAME_SHIP_CAPTION                                   :{WHITE}תן שם לכלי השייט
-STR_ERROR_CAN_T_RENAME_SHIP                                     :{WHITE}לא ניתן לתת שם לכלי שייט זה
 STR_NEWS_FIRST_SHIP_ARRIVAL                                     :{BLACK}{BIGFONT}!{STATION} התושבים חוגגים... {}ספינה ראשונה הגיעה ל
 STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}מקם מצוף שיכול לשמש כנקודת ציון לכלי שייט
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}לא ניתן למקם מצוף במשבצת זו
 STR_BUILD_AQUEDUCT                                              :{BLACK}בנה אקוודוקט
 STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}...לא ניתן לבנות אקוודוקט באתר זה
-STR_BUILD_VEHICLE_SHIP_RENAME_BUTTON                            :{BLACK}החלף שם
-STR_BUILD_VEHICLE_SHIP_RENAME_TOOLTIP                           :{BLACK}החלף שם סוג כלי השייט
-STR_QUERY_RENAME_SHIP_TYPE_CAPTION                              :{WHITE}החלף שם סוג כלי השייט
-STR_ERROR_CAN_T_RENAME_SHIP_TYPE                                :{WHITE}  לא ניתן להחליף את שם הסוג של כלי השייט
-STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}התאם כלי שייט לנשיאת מטען נתון
 STR_REFIT_CAPTION                                               :{WHITE}(התאם) {VEHICLE}
-STR_REFIT_SHIP_REFIT_BUTTON                                     :{BLACK}התאם כלי שייט
-STR_REFIT_SHIP_LIST_TOOLTIP                                     :{BLACK}בחר את סוג המטען עבור כלי שייט זה
-STR_REFIT_SHIP_REFIT_TOOLTIP                                    :{BLACK}}התאם את כלי השייט לנשיאת המטען שנבחר
 STR_REFIT_TITLE                                                 :{GOLD}בחר את סוג המטען עבור כלי שייט זה
 STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{GOLD}{1:CURRENCY}{BLACK} :עלות ההתאמה {}{GOLD}{0:CARGO}{BLACK} :קיבולת
-STR_ERROR_CAN_T_REFIT_SHIP                                      :{WHITE}לא ניתן להתאים את כלי השייט לנשיאת מטען זה
 STR_REFITTABLE                                                  :(ניתן להתאמה)
 
 ##id 0xA000
 STR_TOOLBAR_AIRCRAFT_CAPTION                                    :{WHITE}שדות תעופה
 STR_ERROR_CAN_T_BUILD_AIRPORT_HERE                              :{WHITE}לא ניתן לבנות שדה תעופה באתר זה
-STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}{STATION} סככת מטוסים
-STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON                          :{BLACK}כלי טייס חדש
-STR_CLONE_AIRCRAFT                                              :{BLACK}שכפל כלי טייס
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}פעולה זו תיצור עותק של כלי הטייס
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}פעולה זו תיצור עותק של כלי הטייס
-STR_BUILD_VEHICLE_AIRCRAFT_CAPTION                              :{WHITE}כלי טייס חדש
-STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON                 :{BLACK}בנה כלי טייס
-STR_ERROR_CAN_T_BUILD_AIRCRAFT                                  :{WHITE}לא ניתן לבנות כלי טייס
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               ::{WHITE}כלי טייס {NBSP}{1:COMMA} - {0:STRING}
-STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR                         :{WHITE}...לא ניתן לשלוח את כלי הטייס לסככת המטוסים
-STR_HEADING_FOR_HANGAR                                          :{ORANGE} {STATION} בדרך אל סככת המטוסים ב
-STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}{1:VELOCITY} מהירות ,  {NBSP}{0:STATION} בדרך אל סככת המטוסים ב
-STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}{STATION} טיפול בסככת המטוסים
-STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}{1:VELOCITY} מהירות , {NBSP}{0:STATION} טיפול בסככת המטוסים
-STR_NEWS_AIRCRAFT_IS_WAITING                                    :{WHITE} ממתין בסככת המטוסים {VEHICLE}
-STR_ERROR_AIRCRAFT_IN_THE_WAY                                   :{WHITE}כלי טייס חוסם את הדרך
-STR_ERROR_CAN_T_STOP_START_AIRCRAFT                             :{WHITE}לא ניתן לעצור/להפעיל את כלי הטייס
 STR_ERROR_AIRCRAFT_IS_IN_FLIGHT                                 :{WHITE}נמצא בטיסה
 STR_ERROR_AIRCRAFT_MUST_BE_STOPPED                              :{WHITE}המטוס צריך להמצא בעצירה בסככת מטוסים
-STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}לא ניתן למכור את כלי הטייס
 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION                          :בניית שדה תעופה
 STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}בנה שדה תעופה
-STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP                               :{BLACK}כלי טייס – לחץ על כלי לצפיה במידע
-STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}כלי טייס – לחץ על כלי לצפיה במידע
-STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}בנה כלי טייס חדש
-STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}גרור כלי טייס לכאן על מנת למכרו
-STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}מקד את התצוגה הראשית על סככת המטוסים
-STR_BUILD_VEHICLE_AIRCRAFT_LIST_TOOLTIP                         :{BLACK}כלי טייס – בחר כלי לצפיה במידע
-STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_TOOLTIP                :{BLACK}בנה את כלי הטייס שנבחר
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP              :{BLACK}עצור/הפעל כלי טייס
-STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}הצג את יעדי כלי הטייס
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP                      :{BLACK}מקד את התצוגה הראשית על כלי הטייס
-STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}Sשלח את כלי הטייס לסככת המטוסים
-STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}הצג פרטי כלי טייס
 
-STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}תן שם לכלי הטייס
-STR_ERROR_CAN_T_RENAME_AIRCRAFT                                 :{WHITE}לא ניתן לתת שם לכלי טייס זה
-STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}תן שם לכלי הטייס
 STR_NEWS_FIRST_AIRCRAFT_ARRIVAL                                 :{BLACK}{BIGFONT}!{STATION} התושבים חוגגים... {}מטוס ראשון הגיע ל
 STR_NEWS_AIRCRAFT_CRASH                                         :{BLACK}{BIGFONT} !התרסקות מטוס {}{NBSP}{1:STATION} נספו בפיצוץ בשדה התעופה {NBSP}{0:COMMA}
 STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}!התרסקות מטוס{} {NBSP}נספו בפיצוץ {COMMA} ,הדלק אזל במהלך הטיסה
 STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
-STR_BUILD_VEHICLE_AIRCRAFT_RENAME_BUTTON                        :{BLACK}החלף שם
-STR_BUILD_VEHICLE_AIRCRAFT_RENAME_TOOLTIP                       :{BLACK}החלף שם סוג כלי הטיס
-STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION                          :{WHITE}החלף שם סוג כלי הטיס
-STR_ERROR_CAN_T_RENAME_AIRCRAFT_TYPE                            :{WHITE}לא ניתן להחליף את שם הסוג של כלי הטייס
-STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}התאם כלי טייס לנשיאת מטען נתון
-STR_REFIT_AIRCRAFT_REFIT_BUTTON                                 :{BLACK}התאם כלי טייס
-STR_REFIT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}בחר את סוג המטען עבור כלי טייס זה
-STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}התאם את כלי הטייס לנשיאת המטען שנבחר
-STR_ERROR_CAN_T_REFIT_AIRCRAFT                                  :{WHITE}לא ניתן להתאים את כלי הטייס לנשיאת מטען זה
 
 STR_TIMETABLE_TITLE                                             :{WHITE} (לוח זמנים){VEHICLE}
 
@@ -3117,15 +2917,225 @@ STR_LORRY                                                       :{BLACK}{LORRY}
 STR_PLANE                                                       :{BLACK}{PLANE}
 STR_SHIP                                                        :{BLACK}{SHIP}
 
+############ Vehicle lists
+STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP                             :{BLACK}רכבות - בחר רכבת לצפייה במידע
+STR_VEHICLE_LIST_ROAD_VEHICLE_TOOLTIP                           :{BLACK}כלי רכב - לחץ על כלי רכב למידע
+STR_VEHICLE_LIST_SHIP_TOOLTIP                                   :{BLACK}כלי שייט – בחר כלי לצפיה במידע
+STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP                               :{BLACK}כלי טייס – לחץ על כלי לצפיה במידע
 
-STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}הצג את כל הרכבות העוברות דרך תחנה זו
-STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}הצג את כל הרכבים העוברים דרך תחנה זו
-STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}הצג את כל כלי הטייס העוברים דרך תחנה זו
-STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}הצג את כל כלי השייט העוברים דרך תחנה זו
+STR_VEHICLE_LIST_TRAIN_CAPTION                                  :{WHITE}רכבות{NBSP} {1:COMMA} - {0:STRING}
+STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}כלי רכב {NBSP}{1:COMMA} - {0:STRING}
+STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}כלי שייט {NBSP}{1:COMMA} - {0:STRING}
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               ::{WHITE}כלי טייס {NBSP}{1:COMMA} - {0:STRING}
 
 STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}רכבים עם יעדים מצומדים {COMMA}
 STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}הצג את כל הרכבים אשר עבורם יעד זה הוא מצומד
 
+STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}ממתין/ממתינה במוסך {VEHICLE}
+STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} ממתין במוסך כלי הרכב
+STR_NEWS_SHIP_IS_WAITING                                        :{WHITE}ממתינה במבדוק {VEHICLE}
+STR_NEWS_AIRCRAFT_IS_WAITING                                    :{WHITE} ממתין בסככת המטוסים {VEHICLE}
+
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}התאם רכבת
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}התאם כלי רכב
+STR_REFIT_SHIP_REFIT_BUTTON                                     :{BLACK}התאם כלי שייט
+STR_REFIT_AIRCRAFT_REFIT_BUTTON                                 :{BLACK}התאם כלי טייס
+
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}התאם את הרכבת לנשיאת המשא שנבחר
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}התאם את כלי הרכב לנשיאת המטען שנבחר
+STR_REFIT_SHIP_REFIT_TOOLTIP                                    :{BLACK}}התאם את כלי השייט לנשיאת המטען שנבחר
+STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}התאם את כלי הטייס לנשיאת המטען שנבחר
+
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}בחר את סוג המשא עבור הרכבת
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}בחר את סוג המטען לנשיאה
+STR_REFIT_SHIP_LIST_TOOLTIP                                     :{BLACK}בחר את סוג המטען עבור כלי שייט זה
+STR_REFIT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}בחר את סוג המטען עבור כלי טייס זה
+
+STR_DEPOT_TRAIN_CAPTION                                         :{WHITE}{TOWN} מוסך רכבת
+STR_DEPOT_ROAD_VEHICLE_CAPTION                                  :{WHITE}{TOWN} מוסך כלי רכב
+STR_DEPOT_SHIP_CAPTION                                          :{WHITE}{TOWN} מבדוק כלי שייט
+STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}{STATION} סככת מטוסים
+
+STR_VEHICLE_DETAILS_TRAIN_RENAME                                :{BLACK}תן שם לרכבת
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}תן שם לכלי הרכב
+STR_VEHICLE_DETAILS_SHIP_RENAME                                 :{BLACK}תן שם לכלי השייט
+STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}תן שם לכלי הטייס
+
+STR_QUERY_RENAME_TRAIN_CAPTION                                  :{WHITE}תן שם לרכבת
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}תן שם לכלי הרכב
+STR_QUERY_RENAME_SHIP_CAPTION                                   :{WHITE}תן שם לכלי השייט
+STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}תן שם לכלי הטייס
+
+STR_ERROR_TRAIN_IN_THE_WAY                                      :{WHITE}רכבת חוסמת את המעבר
+STR_ERROR_ROAD_VEHICLE_IN_THE_WAY                               :{WHITE}כלי רכב חוסם את הדרך
+STR_ERROR_SHIP_IN_THE_WAY                                       :{WHITE}כלי שייט חוסם את הדרך
+STR_ERROR_AIRCRAFT_IN_THE_WAY                                   :{WHITE}כלי טייס חוסם את הדרך
+
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}...לא ניתן להתאים את הרכבת
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}... לא ניתן להתאים את כלי הרכב
+STR_ERROR_CAN_T_REFIT_SHIP                                      :{WHITE}לא ניתן להתאים את כלי השייט לנשיאת מטען זה
+STR_ERROR_CAN_T_REFIT_AIRCRAFT                                  :{WHITE}לא ניתן להתאים את כלי הטייס לנשיאת מטען זה
+
+STR_ERROR_CAN_T_RENAME_TRAIN                                    :{WHITE}לא ניתן לתת שם לרכבת
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}...לא ניתן לשנות את שם כלי הרכב
+STR_ERROR_CAN_T_RENAME_SHIP                                     :{WHITE}לא ניתן לתת שם לכלי שייט זה
+STR_ERROR_CAN_T_RENAME_AIRCRAFT                                 :{WHITE}לא ניתן לתת שם לכלי טייס זה
+
+STR_ERROR_CAN_T_STOP_START_TRAIN                                :{WHITE}לא ניתן לעצור/להמשיך בנסיעה
+STR_ERROR_CAN_T_STOP_START_ROAD_VEHICLE                         :{WHITE}...לא ניתן לעצור/להמשיך בנסיעה
+STR_ERROR_CAN_T_STOP_START_SHIP                                 :{WHITE}לא ניתן לעצור/להפעיל את כלי השייט
+STR_ERROR_CAN_T_STOP_START_AIRCRAFT                             :{WHITE}לא ניתן לעצור/להפעיל את כלי הטייס
+
+STR_ERROR_CAN_T_SEND_TRAIN_TO_DEPOT                             :{WHITE}לא ניתן לשלוח רכבת למוסך
+STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}...לא ניתן לשלוח את כלי הרכב למוסך
+STR_ERROR_CAN_T_SEND_SHIP_TO_DEPOT                              :{WHITE} לא ניתן לשלוח את כלי השייט למבדוק
+STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR                         :{WHITE}...לא ניתן לשלוח את כלי הטייס לסככת המטוסים
+
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}...לא ניתן לבנות רכבת
+STR_ERROR_CAN_T_BUILD_ROAD_VEHICLE                              :{WHITE}לא ניתן לבנות כלי רכב...
+STR_ERROR_CAN_T_BUILD_SHIP                                      :{WHITE}לא ניתן לבנות כלי שייט זה
+STR_ERROR_CAN_T_BUILD_AIRCRAFT                                  :{WHITE}לא ניתן לבנות כלי טייס
+
+STR_ERROR_CAN_T_RENAME_TRAIN_TYPE                               :{WHITE}לא ניתן לשנות את שם סוג הקרון
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}לא ניתן לשנות את שם סוג כלי הרכב
+STR_ERROR_CAN_T_RENAME_SHIP_TYPE                                :{WHITE}  לא ניתן להחליף את שם הסוג של כלי השייט
+STR_ERROR_CAN_T_RENAME_AIRCRAFT_TYPE                            :{WHITE}לא ניתן להחליף את שם הסוג של כלי הטייס
+
+STR_ERROR_CAN_T_SELL_TRAIN                                      :{WHITE}לא ניתן למכור את הרכבת
+STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}...לא ניתן למכור כלי רכב
+STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}לא ניתן למכור כלי שייט זה
+STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}לא ניתן למכור את כלי הטייס
+
+STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP                 :{BLACK}פעולה נוכחית - לחץ כאן כדי לעצור/להמשיך בנסיעה
+STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP          :{BLACK}מצב כלי הרכב- לחץ כאן לעצירה/המשך נסיעה
+STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP                  :{BLACK}עצור/הפעל כלי שייט
+STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP              :{BLACK}עצור/הפעל כלי טייס
+
+STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP                           :{BLACK}הצג את רשימת היעדים של הרכבת
+STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP                    :{BLACK}הצג את רשימת היעדים
+STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}הצג את יעדי כלי השייט
+STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}הצג את יעדי כלי הטייס
+
+STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP                         :{BLACK}מקד את התצוגה על מיקום הרכבת
+STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP                  :{BLACK}מקד את התצוגה על מיקומו של כלי הרכב
+STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP                          :{BLACK}מקד את התצוגה הראשית על כלי השייט
+STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP                      :{BLACK}מקד את התצוגה הראשית על כלי הטייס
+
+STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP                    :{BLACK}.שלח את הרכבת למוסך
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}.שלח את כלי הרכב למוסך
+STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}שלח את כלי השייט למבדוק
+STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}Sשלח את כלי הטייס לסככת המטוסים
+
+STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}הצג את נתוני הרכבת
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}הצג את פרטי כלי הרכב
+STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}הצג פרטי כלי שייט
+STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}הצג פרטי כלי טייס
+
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}התאם את הרכבת לנשיאת משא שונה
+STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}התאם כלי רכב לנשיאת מטען חדש
+STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}התאם כלי שייט לנשיאת מטען נתון
+STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}התאם כלי טייס לנשיאת מטען נתון
+
+STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}{TOWN} בדרך אל המוסך ב
+STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}{1:VELOCITY}במהירות {NBSP}{0:TOWN} בדרך אל המוסך ב
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}{TOWN} בדרך אל מוסך הרכבים ב
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE} {1:VELOCITY}  במהירות , {NBSP}{0:TOWN} בדרך אל מוסך הרכבים ב
+STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE} {TOWN} בדרך אל המבדוק ב
+STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}{1:VELOCITY} מהירות ,  {NBSP}{0:TOWN} בדרך אל המבדוק ב
+STR_HEADING_FOR_HANGAR                                          :{ORANGE} {STATION} בדרך אל סככת המטוסים ב
+STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}{1:VELOCITY} מהירות ,  {NBSP}{0:STATION} בדרך אל סככת המטוסים ב
+
+STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}{TOWN} בדרך לטיפול במוסך
+STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}{1:VELOCITY}במהירות {NBSP}{0:TOWN} בדרך לטיפול במוסך
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE} {TOWN} טיפול במוסך ב
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE} {1:VELOCITY}  במהירות ,{NBSP} {0:TOWN} טיפול במוסך הרכבים ב
+STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}{TOWN} טיפול במבדוק
+STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}{1:VELOCITY} מהירות , {NBSP}{0:TOWN} טיפול במבדוק
+STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}{STATION} טיפול בסככת המטוסים
+STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}{1:VELOCITY} מהירות , {NBSP}{0:STATION} טיפול בסככת המטוסים
+
+
+STR_CLONE_TRAIN                                                 :{BLACK}שכפל רכבת
+STR_CLONE_ROAD_VEHICLE                                          :{BLACK}שכפל רכב
+STR_CLONE_SHIP                                                  :{BLACK}שכפל כלי שייט
+STR_CLONE_AIRCRAFT                                              :{BLACK}שכפל כלי טייס
+
+STR_CLONE_TRAIN_INFO                                            :{BLACK}פעולה זו תיצור עותק נוסף של הרכבת וכל קרונותיה
+STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}.פעולה זו תיצור עותק נוסף של כלי הרכב
+STR_CLONE_SHIP_INFO                                             :{BLACK}פעולה זו תיצור עותק של כלי השייט
+STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}פעולה זו תיצור עותק של כלי הטייס
+
+STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}פעולה זו תיצור עותק נוסף של הרכבת וכל קרונותיה
+STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK} .פעולה זו תיצור עותק נוסף של כלי הרכב
+STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}פעולה זו תיצור עותק של כלי השייט
+STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}פעולה זו תיצור עותק של כלי הטייס
+
+STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}רכבות חדשות
+STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}רכבות חשמליות חדשות
+STR_BUILD_VEHICLE_TRAIN_MONORAIL_CAPTION                        ::{WHITE}רכבות חד-פס חדשות
+STR_BUILD_VEHICLE_TRAIN_MAGLEV_CAPTION                          :{WHITE}רכבות פס מגנטי חדשות
+
+STR_BUILD_VEHICLE_TRAIN_ALL_CAPTION                             :{WHITE}רכבות זמינות
+STR_BUILD_VEHICLE_ROAD_VEHICLE_CAPTION                          :{WHITE}כלי רכב חדשים
+STR_BUILD_VEHICLE_SHIP_CAPTION                                  :{WHITE}כלי שייט חדשים
+STR_BUILD_VEHICLE_AIRCRAFT_CAPTION                              :{WHITE}כלי טייס חדש
+
+STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_BUTTON                    :{BLACK}בנה רכבת
+STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_BUTTON             :{BLACK}בנה כלי רכב
+STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON                     :{BLACK}בנה כלי שייט
+STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON                 :{BLACK}בנה כלי טייס
+
+STR_BUILD_VEHICLE_TRAIN_LIST_TOOLTIP                            :{BLACK} בחירת קרונות - לחץ על קרון לקבלת מידע
+STR_BUILD_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP                     :{BLACK}רשימת כלי הרכב - בחר כלי רכב למידע
+STR_BUILD_VEHICLE_SHIP_LIST_TOOLTIP                             :{BLACK}כלי שייט – בחר כלי לצפיה במידע
+STR_BUILD_VEHICLE_AIRCRAFT_LIST_TOOLTIP                         :{BLACK}כלי טייס – בחר כלי לצפיה במידע
+
+STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_TOOLTIP                   :{BLACK}בנה את קרון הרכבת שנבחר
+STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_TOOLTIP            :{BLACK}בנה כלי רכב מהסוג שנבחר
+STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP                    :{BLACK}בנה את כלי השייט שנבחר
+STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_TOOLTIP                :{BLACK}בנה את כלי הטייס שנבחר
+
+STR_BUILD_VEHICLE_TRAIN_RENAME_BUTTON                           :{BLACK}שנה שם
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}שנה שם
+STR_BUILD_VEHICLE_SHIP_RENAME_BUTTON                            :{BLACK}החלף שם
+STR_BUILD_VEHICLE_AIRCRAFT_RENAME_BUTTON                        :{BLACK}החלף שם
+
+STR_BUILD_VEHICLE_TRAIN_RENAME_TOOLTIP                          :{BLACK}שנה את שם סוג הקרון
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}שנה את שם סוג כלי הרכב
+STR_BUILD_VEHICLE_SHIP_RENAME_TOOLTIP                           :{BLACK}החלף שם סוג כלי השייט
+STR_BUILD_VEHICLE_AIRCRAFT_RENAME_TOOLTIP                       :{BLACK}החלף שם סוג כלי הטיס
+
+STR_QUERY_RENAME_TRAIN_TYPE_CAPTION                             :{WHITE}שנה את שם סוג קרון הרכבת
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}שנה את שם סוג כלי הרכב
+STR_QUERY_RENAME_SHIP_TYPE_CAPTION                              :{WHITE}החלף שם סוג כלי השייט
+STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION                          :{WHITE}החלף שם סוג כלי הטיס
+
+STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}כלים חדשים
+STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_BUTTON                      :{BLACK}כלי רכב חדשים
+STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON                              :{BLACK}כלי שייט חדש
+STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON                          :{BLACK}כלי טייס חדש
+
+STR_DEPOT_TRAIN_LIST_TOOLTIP                                    :{BLACK}רכבות - בחר רכבת לקבלת מידע, גרור קרון להוספתו/הסרתו מהרכבת
+STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}כלי רכב - לחץ על כלי רכב למידע
+STR_DEPOT_SHIP_LIST_TOOLTIP                                     :{BLACK}כלי שייט – בחר כלי לצפיה במידע
+STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}כלי טייס – לחץ על כלי לצפיה במידע
+
+STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP                            :{BLACK}בניית קרון חדש
+STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}בנה כלי רכב חדש
+STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}בנה כלי שייט חדש
+STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}בנה כלי טייס חדש
+
+STR_DEPOT_TRAIN_SELL_TOOLTIP                                    :{BLACK}גרור קרון/קטר לכאן כדי למכור אותו
+STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}גרור כלי רכב לכאן על מנת למכור אותו
+STR_DEPOT_SHIP_SELL_TOOLTIP                                     :{BLACK}גרור כלי שייט לכאן על מנת למכרו
+STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}גרור כלי טייס לכאן על מנת למכרו
+
+STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}מקד את החלון הראשי על מיקום תחנת הטיפולים
+STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}מקד את התצוגה הראשית על מיקום מוסך כלי הרכב
+STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}מקד את התצוגה הראשית על מבדוק הספינות
+STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}מקד את התצוגה הראשית על סככת המטוסים
+
+
 ### depot strings
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}?אתה עומד למכור את כל כלי הרכב במוסך. להמשיך
 STR_DEPOT_WRONG_DEPOT_TYPE                                      :סוג מוסך שגוי
@@ -3145,7 +3155,6 @@ STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TIP                          :{BLACK}החלף
 STR_DEPOT_AUTOREPLACE_SHIP_TIP                                  :{BLACK}החלף אוטומטית את כל כלי השייט שבמבדוק
 STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP                              :{BLACK}החלף אוטומאטית את כל כלי הטייס שבסככה
 
-
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}{STRING} החלף
 STR_REPLACE_VEHICLES_START                                      :{BLACK}החל בהחלפת הכלים
 STR_REPLACE_VEHICLES_STOP                                       :{BLACK}הפסק את החלפת הכלים
@@ -3160,6 +3169,7 @@ STR_REPLACE_HELP_REPLACE_INFO_TAB                               :{BLACK} מצי�
 STR_REPLACE_REMOVE_WAGON                                        :{ORANGE}{SKIP}{STRING}{BLACK} : הסרת קרונות
 STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}הסר קרונות מהסוף על מנת לשמור על האורך המקורי של הרכבת
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{ORANGE}{SKIP}{SKIP}{STRING}{BLACK} : מחליף
+
 STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}קטר לא זמין
 STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}רכב לא זמין
 STR_SHIP_NOT_AVAILABLE                                          :{WHITE}כלי שייט לא זמין
@@ -3309,17 +3319,6 @@ STR_MEASURE_AREA                                                :{BLACK}{NUM} x
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}  {NUM}  :אורך {}   {NBSP}'מ {NUM} :הפרש גובה
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}  {NUM} x {NUM} :שטח {}   {NBSP}'מ {NUM} :הפרש גובה
 
-############ Date formatting
-STR_FORMAT_DATE_TINY                                            :{STRING}-{STRING}-{NUM}
-STR_FORMAT_DATE_SHORT                                           :{STRING} {NUM}
-STR_FORMAT_DATE_LONG                                            :{STRING} {STRING} {NUM}
-STR_FORMAT_DATE_ISO                                             :{2:NUM}-{1:STRING}-{0:STRING}
-
-STR_JUST_DATE_TINY                                              :{DATE_TINY}
-STR_JUST_DATE_LONG                                              :{DATE_LONG}
-STR_JUST_DATE_ISO                                               :{DATE_ISO}
-########
-
 STR_FEEDER_CARGO_VALUE                                          :{BLACK}Transfer Credits: {LTBLUE}{CURRENCY}
 STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD                            :{WHITE}...כביש זה בבעלות עירונית
 STR_DRIVE_THROUGH_ERROR_DIRECTION                               :{WHITE}הכביש פונה לכיוון לא נכון...
@@ -3344,7 +3343,6 @@ STR_PERCENT_UP_DOWN_SMALL                                       :{TINYFONT}{WHIT
 STR_PERCENT_UP_DOWN                                             :{WHITE}{NUM}%{UPARROW}{DOWNARROW}
 
 ##### Mass Order
-STR_FORMAT_GROUP_NAME                                           :{COMMA} קבוצה
 STR_GROUP_TINY_NAME                                             :{TINYFONT}{GROUP}
 STR_GROUP_ALL_TRAINS                                            :כל הרכבות
 STR_GROUP_ALL_ROAD_VEHICLES                                     :כל הרכבים
@@ -3373,12 +3371,62 @@ STR_GROUP_DELETE_TIP                                            :{BLACK}מחק �
 STR_GROUP_RENAME_TIP                                            :{BLACK}שנה את שם הקבוצה
 STR_GROUP_REPLACE_PROTECTION_TIP                                :{BLACK}לחץ על מנת להגן על הכלים בקבוצה בפני החלפה אוטומטית
 
+#### String control codes and their formatting
 STR_COMPANY_NAME                                                :{COMPANY}
 STR_ENGINE_NAME                                                 :{ENGINE}
 STR_GROUP_NAME                                                  :{GROUP}
+STR_INDUSTRY_NAME                                               :{INDUSTRY}
 STR_PRESIDENT_NAME                                              :{PRESIDENTNAME}
 STR_SIGN_NAME                                                   :{SIGN}
+STR_STATION_NAME                                                :{STATION}
+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_LONG                                              :{DATE_LONG}
+STR_JUST_DATE_ISO                                               :{DATE_ISO}
+STR_JUST_STRING                                                 :{STRING}
+STR_JUST_RAW_STRING                                             :{STRING}
+
+STR_FORMAT_DATE_TINY                                            :{STRING}-{STRING}-{NUM}
+STR_FORMAT_DATE_SHORT                                           :{STRING} {NUM}
+STR_FORMAT_DATE_LONG                                            :{STRING} {STRING} {NUM}
+STR_FORMAT_DATE_ISO                                             :{2:NUM}-{1:STRING}-{0:STRING}
+
+STR_FORMAT_COMPANY_NUM                                          :({COMMA} חברה)
+STR_FORMAT_GROUP_NAME                                           :{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}השם חייב להיות ייחודי
 
diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt
index 24325b707..56cdc4792 100644
--- a/src/lang/hungarian.txt
+++ b/src/lang/hungarian.txt
@@ -187,8 +187,6 @@ STR_ABBREV_PLASTIC                                              :{TINYFONT}MA
 STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}SS
 STR_ABBREV_NONE                                                 :{TINYFONT}SÁ
 STR_ABBREV_ALL                                                  :{TINYFONT}ÖS
-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
@@ -200,17 +198,11 @@ STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Copyrigh
 STR_ABOUT_VERSION                                               :{BLACK}OpenTTD version {REV}
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 Az OpenTTD csapat
 
-STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
-STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_QUIT_CAPTION                                                :{WHITE}Kilépés
 STR_YES                                                         :{BLACK}Igen
 STR_NO                                                          :{BLACK}Nem
 STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Biztosan bezárod ezt a programot és kilépsz a {STRING}ba ?
-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                                                :semmi
 STR_COLOUR_DARK_BLUE                                            :Sötétkék
 STR_COLOUR_PALE_GREEN                                           :Halványzöld
@@ -229,8 +221,6 @@ STR_COLOUR_BROWN                                                :Barna
 STR_COLOUR_GREY                                                 :Szürke
 STR_COLOUR_WHITE                                                :Fehér
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}Túl sok jármű van a játékban
-STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
-STR_RED_COMMA                                                   :{RED}{COMMA}
 STR_BUTTON_LOCATION                                             :{BLACK}Megnéz
 STR_SMALLMAP_TYPE_CONTOURS                                      :Domborzat
 STR_SMALLMAP_TYPE_VEHICLES                                      :Járművek
@@ -357,12 +347,13 @@ STR_SORT_CRITERIA_TIP                                           :{BLACK}Sorbaren
 STR_FILTER_CRITERIA_TIP                                         :{BLACK}Szűrési feltétel kiválasztása
 STR_SORT_BY                                                     :{BLACK}Rendezés
 
+### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}Lakosság
+STR_SORT_BY_NAME                                                :{BLACK}Név
+STR_SORT_BY_DATE                                                :{BLACK}Dátum
 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_DATE                                                :{BLACK}Dátum
 STR_SORT_BY_NUMBER                                              :Szám
 STR_SORT_BY_PROFIT_LAST_YEAR                                    :Tavalyi profit
 STR_SORT_BY_PROFIT_THIS_YEAR                                    :Idei profit
@@ -385,6 +376,7 @@ STR_SORT_BY_INTRO_DATE                                          :Bevezetési dá
 STR_SORT_BY_RUNNING_COST                                        :Üzemeltetési k.
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :Telj./Üzemeltetési k.
 STR_SORT_BY_CARGO_CAPACITY                                      :Teherkapacitás
+
 STR_NO_WAITING_CARGO                                            :{BLACK}Semmilyen áru nem várakozik
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}Minden szállítóegység kiválasztása
 STR_SELECT_ALL_TYPES                                            :{BLACK}Minden rakománytípus mutatása (beleértve ha nincs várakozó rakomány)
@@ -404,21 +396,6 @@ STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Elküldi garáz
 STR_SEND_SHIP_TO_DEPOT                                          :Elküldi dokkba
 STR_SEND_AIRCRAFT_TO_HANGAR                                     :Elküldi hangárba
 
-############ range for months starts
-STR_MONTH_ABBREV_JAN                                            :jan.
-STR_MONTH_ABBREV_FEB                                            :febr.
-STR_MONTH_ABBREV_MAR                                            :márc.
-STR_MONTH_ABBREV_APR                                            :ápr.
-STR_MONTH_ABBREV_MAY                                            :máj.
-STR_MONTH_ABBREV_JUN                                            :jún.
-STR_MONTH_ABBREV_JUL                                            :júl.
-STR_MONTH_ABBREV_AUG                                            :aug.
-STR_MONTH_ABBREV_SEP                                            :szept.
-STR_MONTH_ABBREV_OCT                                            :okt.
-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}{STRING}-
@@ -445,8 +422,6 @@ 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_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
@@ -493,7 +468,7 @@ STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Nincs
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Név
 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                                          :1.
 STR_ORDINAL_NUMBER_2ND                                          :2.
 STR_ORDINAL_NUMBER_3RD                                          :3.
@@ -527,6 +502,34 @@ STR_ORDINAL_NUMBER_30TH                                         :30.
 STR_ORDINAL_NUMBER_31ST                                         :31.
 ############ range for days ends
 
+############ range for months starts
+STR_MONTH_ABBREV_JAN                                            :jan.
+STR_MONTH_ABBREV_FEB                                            :febr.
+STR_MONTH_ABBREV_MAR                                            :márc.
+STR_MONTH_ABBREV_APR                                            :ápr.
+STR_MONTH_ABBREV_MAY                                            :máj.
+STR_MONTH_ABBREV_JUN                                            :jún.
+STR_MONTH_ABBREV_JUL                                            :júl.
+STR_MONTH_ABBREV_AUG                                            :aug.
+STR_MONTH_ABBREV_SEP                                            :szept.
+STR_MONTH_ABBREV_OCT                                            :okt.
+STR_MONTH_ABBREV_NOV                                            :nov.
+STR_MONTH_ABBREV_DEC                                            :dec.
+
+STR_MONTH_JAN                                                   :január
+STR_MONTH_FEB                                                   :február
+STR_MONTH_MAR                                                   :március
+STR_MONTH_APR                                                   :április
+STR_MONTH_MAY                                                   :május
+STR_MONTH_JUN                                                   :június
+STR_MONTH_JUL                                                   :július
+STR_MONTH_AUG                                                   :augusztus
+STR_MONTH_SEP                                                   :szeptember
+STR_MONTH_OCT                                                   :október
+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}Elfogad: {LTBLUE}
@@ -616,12 +619,9 @@ 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_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_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
@@ -703,9 +703,7 @@ STR_OFF                                                         :Ki
 STR_SUMMARY                                                     :Kivonat
 STR_FULL                                                        :Teljes
 STR_STATUSBAR_COMPANY_NAME                                      :{SILVER}- -  {COMPANY}  - -
-STR_BLACK_STRING                                                :{BLACK}{STRING}
 
-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
@@ -810,9 +808,6 @@ 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_BLACK_6                                                     :{BLACK}6
-STR_BLACK_7                                                     :{BLACK}7
-
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Angol (Eredeti)
 STR_TOWNNAME_FRENCH                                             :Francia
@@ -892,19 +887,6 @@ STR_OPTIONS_BASE_GRF_DESCRIPTION_TIP                            :{BLACK}Kiegész
 
 STR_AUTOSAVE_FAILED                                             :{WHITE}Automatikus mentés sikertelen
 
-STR_MONTH_JAN                                                   :január
-STR_MONTH_FEB                                                   :február
-STR_MONTH_MAR                                                   :március
-STR_MONTH_APR                                                   :április
-STR_MONTH_MAY                                                   :május
-STR_MONTH_JUN                                                   :június
-STR_MONTH_JUL                                                   :július
-STR_MONTH_AUG                                                   :augusztus
-STR_MONTH_SEP                                                   :szeptember
-STR_MONTH_OCT                                                   :október
-STR_MONTH_NOV                                                   :november
-STR_MONTH_DEC                                                   :december
-
 STR_HEADING_FOR_STATION                                         :{LTBLUE}{STATION} állomás felé
 STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}{STATION} állomás felé, {VELOCITY}
 STR_NO_ORDERS                                                   :{LTBLUE}Nincs menetrend
@@ -919,8 +901,6 @@ STR_CRATES                                                      :láda
 STR_RES_OTHER                                                   :egyéb
 STR_NOTHING                                                     :
 
-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...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Megosztott menetrend vége - -
@@ -1192,7 +1172,6 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}ÉNY-DK
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :kikapcsolva
-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
@@ -2195,8 +2174,6 @@ STR_NUM_LOW                                                     :Kevés
 STR_NUM_NORMAL                                                  :Normál
 STR_NUM_HIGH                                                    :Sok
 STR_NUM_CUSTOM                                                  :Saját
-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
@@ -2877,7 +2854,6 @@ 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_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})
@@ -3543,7 +3519,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}
@@ -3561,6 +3540,31 @@ STR_FORMAT_COMPANY_NUM                                          :({COMMA}. váll
 STR_FORMAT_GROUP_NAME                                           :{COMMA} csoport
 STR_FORMAT_INDUSTRY_NAME                                        :{TOWN}i {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}A névnek egyedinek kell lennie
 
 #### Improved sign GUI
diff --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt
index bca309710..c3d298a4b 100644
--- a/src/lang/icelandic.txt
+++ b/src/lang/icelandic.txt
@@ -155,8 +155,6 @@ STR_ABBREV_PLASTIC                                              :{TINYFONT}PL
 STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}FZ
 STR_ABBREV_NONE                                                 :{TINYFONT}EKKERT
 STR_ABBREV_ALL                                                  :{TINYFONT}ALLT
-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ð
@@ -168,17 +166,11 @@ STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Upphafle
 STR_ABOUT_VERSION                                               :{BLACK}OpenTTD útgáfa {REV}
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 OpenTTD hópurinn
 
-STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
-STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_QUIT_CAPTION                                                :{WHITE}Hætta
 STR_YES                                                         :{BLACK}Já
 STR_NO                                                          :{BLACK}Nei
 STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Ertu viss um að þú viljir hætta í OpenTTD og fara aftur í {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                                                :Ekkert
 STR_COLOUR_DARK_BLUE                                            :Dökkblár
 STR_COLOUR_PALE_GREEN                                           :Fölgrænn
@@ -197,8 +189,6 @@ STR_COLOUR_BROWN                                                :Brúnn
 STR_COLOUR_GREY                                                 :Grár
 STR_COLOUR_WHITE                                                :Hvítur
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}Of mörg farartæki í leiknum
-STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
-STR_RED_COMMA                                                   :{RED}{COMMA}
 STR_BUTTON_LOCATION                                             :{BLACK}Staður
 STR_SMALLMAP_TYPE_CONTOURS                                      :Útlínur
 STR_SMALLMAP_TYPE_VEHICLES                                      :Farartæki
@@ -324,12 +314,13 @@ STR_SORT_CRITERIA_TIP                                           :{BLACK}Velja up
 STR_FILTER_CRITERIA_TIP                                         :{BLACK}Veldu hvers kyns farartæki þú vilt kaupa
 STR_SORT_BY                                                     :{BLACK}Flokka eftir
 
+### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}Fólksfjöldi
+STR_SORT_BY_NAME                                                :{BLACK}Nafn
+STR_SORT_BY_DATE                                                :{BLACK}Dagsetning
 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_DATE                                                :{BLACK}Dagsetning
 STR_SORT_BY_NUMBER                                              :Númer
 STR_SORT_BY_PROFIT_LAST_YEAR                                    :Hagnaður síðasta árs
 STR_SORT_BY_PROFIT_THIS_YEAR                                    :Hagnaður þessa árs
@@ -352,37 +343,25 @@ STR_SORT_BY_INTRO_DATE                                          :Árgerð
 STR_SORT_BY_RUNNING_COST                                        :Rekstrarkostnaður
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :Afl/Rekstrarkostnaður
 STR_SORT_BY_CARGO_CAPACITY                                      :Burðargeta
+
 STR_NO_WAITING_CARGO                                            :{BLACK}Enginn farmur bíður
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}Velja allar gerðir
 STR_SELECT_ALL_TYPES                                            :{BLACK}Velja allar tegundir farms (einnig þær sem ekki bíða)
-STR_AVAILABLE_TRAINS                                            :{BLACK}Lestaúrval
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Bifreiðaúrval
-STR_AVAILABLE_SHIPS                                             :{BLACK}Skipaúrval
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Flugvélaúrval
 STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Skoða úrval
 STR_MANAGE_LIST                                                 :{BLACK}Stýra lista
 STR_MANAGE_LIST_TIP                                             :{BLACK}Senda boð til allra farartækja á listanum
 STR_REPLACE_VEHICLES                                            :Skipta út vögnum
+STR_SEND_FOR_SERVICING                                          :Senda í skoðun
+
+STR_AVAILABLE_TRAINS                                            :{BLACK}Lestaúrval
+STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Bifreiðaúrval
+STR_AVAILABLE_SHIPS                                             :{BLACK}Skipaúrval
+STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Flugvélaúrval
+
 STR_SEND_TRAIN_TO_DEPOT                                         :Senda í skýli
 STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Senda í skýli
 STR_SEND_SHIP_TO_DEPOT                                          :Senda í slipp
 STR_SEND_AIRCRAFT_TO_HANGAR                                     :Senda í skýli
-STR_SEND_FOR_SERVICING                                          :Senda í skoðun
-
-############ 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                                            :Maí
-STR_MONTH_ABBREV_JUN                                            :Jún
-STR_MONTH_ABBREV_JUL                                            :Júl
-STR_MONTH_ABBREV_AUG                                            :Ágú
-STR_MONTH_ABBREV_SEP                                            :Sep
-STR_MONTH_ABBREV_OCT                                            :Okt
-STR_MONTH_ABBREV_NOV                                            :Nóv
-STR_MONTH_ABBREV_DEC                                            :Des
-############ range for months ends
 
 STR_GRAPH_X_LABEL_MONTH                                         :{TINYFONT}{STRING}{} {STRING}
 STR_GRAPH_X_LABEL_MONTH_YEAR                                    :{TINYFONT}{STRING}{} {STRING}{}{NUM}
@@ -410,8 +389,6 @@ 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_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
@@ -458,7 +435,7 @@ STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Enginn
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Nafn
 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                                          :1.
 STR_ORDINAL_NUMBER_2ND                                          :2.
 STR_ORDINAL_NUMBER_3RD                                          :3
@@ -492,6 +469,34 @@ STR_ORDINAL_NUMBER_30TH                                         :30.
 STR_ORDINAL_NUMBER_31ST                                         :31.
 ############ 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                                            :Maí
+STR_MONTH_ABBREV_JUN                                            :Jún
+STR_MONTH_ABBREV_JUL                                            :Júl
+STR_MONTH_ABBREV_AUG                                            :Ágú
+STR_MONTH_ABBREV_SEP                                            :Sep
+STR_MONTH_ABBREV_OCT                                            :Okt
+STR_MONTH_ABBREV_NOV                                            :Nóv
+STR_MONTH_ABBREV_DEC                                            :Des
+
+STR_MONTH_JAN                                                   :Janúar
+STR_MONTH_FEB                                                   :Febrúar
+STR_MONTH_MAR                                                   :Mars
+STR_MONTH_APR                                                   :Apríl
+STR_MONTH_MAY                                                   :Maí
+STR_MONTH_JUN                                                   :Júní
+STR_MONTH_JUL                                                   :Júlí
+STR_MONTH_AUG                                                   :Ágúst
+STR_MONTH_SEP                                                   :September
+STR_MONTH_OCT                                                   :Október
+STR_MONTH_NOV                                                   :Nóvember
+STR_MONTH_DEC                                                   :Desember
+############ range for months ends
+
 STR_GRAPH_Y_LABEL_NUMBER                                        :{TINYFONT}{COMMA}
 
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}Tekið á móti: {LTBLUE}
@@ -581,12 +586,9 @@ 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_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_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
@@ -668,9 +670,7 @@ STR_OFF                                                         :Af
 STR_SUMMARY                                                     :Úrtak
 STR_FULL                                                        :Allt
 STR_STATUSBAR_COMPANY_NAME                                      :{SILVER}- -  {COMPANY}  - -
-STR_BLACK_STRING                                                :{BLACK}{STRING}
 
-STR_JUST_CHECKMARK                                              :{CHECKMARK}
 ############ range for menu starts
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Stillingar
 STR_SETTINGS_MENU_DIFFICULTY_SETTINGS                           :Erfiðleikastig
@@ -762,9 +762,6 @@ STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY                             :Fjármagna nýj
 ############ range ends here
 
 STR_FUND_INDUSTRY_CAPTION                                       :{WHITE}Fjármagna nýjan iðnað
-STR_JUST_STRING                                                 :{STRING}
-STR_JUST_RAW_STRING                                             :{STRING}
-STR_JUST_INT                                                    :{NUM}
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_RAINFOREST                       :{WHITE}...aðeins hægt að byggja á regnskógasvæðum
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT                           :{WHITE}...aðeins hægt að byggja í eyðimörk
 STR_STATUSBAR_PAUSED                                            :{YELLOW}* *  STÖÐVAÐUR  *  *
@@ -778,9 +775,6 @@ 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_BLACK_6                                                     :{BLACK}6
-STR_BLACK_7                                                     :{BLACK}7
-
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Ensk (Upphafleg)
 STR_TOWNNAME_FRENCH                                             :Frönsk
@@ -860,19 +854,6 @@ STR_OPTIONS_BASE_GRF_DESCRIPTION_TIP                            :{BLACK}Frekari
 
 STR_AUTOSAVE_FAILED                                             :{WHITE}Sjálfvirk vistun mistókst
 
-STR_MONTH_JAN                                                   :Janúar
-STR_MONTH_FEB                                                   :Febrúar
-STR_MONTH_MAR                                                   :Mars
-STR_MONTH_APR                                                   :Apríl
-STR_MONTH_MAY                                                   :Maí
-STR_MONTH_JUN                                                   :Júní
-STR_MONTH_JUL                                                   :Júlí
-STR_MONTH_AUG                                                   :Ágúst
-STR_MONTH_SEP                                                   :September
-STR_MONTH_OCT                                                   :Október
-STR_MONTH_NOV                                                   :Nóvember
-STR_MONTH_DEC                                                   :Desember
-
 STR_HEADING_FOR_STATION                                         :{LTBLUE}Á leið til {STATION}
 STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}Á leið til {STATION}, {VELOCITY}
 STR_NO_ORDERS                                                   :{LTBLUE}Engar skipanir
@@ -887,8 +868,6 @@ STR_CRATES                                                      :kassar
 STR_RES_OTHER                                                   :annað
 STR_NOTHING                                                     :
 
-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...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Endi sameiginlegra skipana - -
@@ -1160,7 +1139,6 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Breidd
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :óvirkt
-STR_JUST_CURRENCY                                               :{CURRENCY}
 STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Breyta gildi stillingar
 
 STR_TEMPERATE_LANDSCAPE                                         :Temprað landslag
@@ -1196,7 +1174,6 @@ STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}Velja te
 
 STR_WAYPOINT_VIEWPORT                                           :{WHITE}{WAYPOINT}
 STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WHITE}{WAYPOINT}
-STR_WAYPOINT_NAME                                               :{WAYPOINT}
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Breyta nafni millistöðvar
 
 STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}Get ekki breytt nafni millistöðvar...
@@ -1263,11 +1240,6 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Iðnaða
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...of nálægt öðrum iðnaði
 
-STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Breyta lest svo hún flytji annan farm
-STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Breyta lest
-STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Veldu hvernig farm lestin á að flytja
-STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Breyta lest svo hún flytji valinn farm
-STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Get ekki breytt lest...
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Breyta framleiðslu
 
 ############ network gui strings
@@ -1777,11 +1749,6 @@ STR_TOWN_BUILDING_NAME_TEPEES_1                                 :Indíánatjald
 STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1                           :Teketilshús
 STR_TOWN_BUILDING_NAME_PIGGY_BANK_1                             :Svínabanki
 
-STR_INDUSTRY_NAME                                               :{INDUSTRY}
-STR_TOWN_NAME                                                   :{TOWN}
-STR_FORMAT_INDUSTRY_NAME                                        :{TOWN} {STRING}
-STR_STATION_NAME                                                :{STATION}
-
 ##id 0x2800
 STR_LANDSCAPING_MENU_LANDSCAPING                                :Mótun lands
 STR_LANDSCAPING_MENU_PLANT_TREES                                :Gróðursetja tré
@@ -1836,6 +1803,12 @@ STR_CARGO_RATING_EXCELLENT                                      :Frábær
 STR_CARGO_RATING_OUTSTANDING                                    :Framúrskarandi
 ############ range for rating ends
 
+### station view strings
+STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Sýna allar lestir sem hafa þessa stöð á áætlun
+STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Sýna allar bifreiðir sem hafa þessa stöð á áætlun
+STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Sýna allar flugvélar sem hafa þessa stöð á áætlun
+STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Sýna öll skip sem hafa þessa stöð á áætlun
+
 STR_STATION_VIEW_CARGO_RATING                                   :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO                        :{WHITE}{STATION} tekur ekki lengur við {STRING}
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO               :{WHITE}{STATION} tekur ekki lengur við {STRING} eða {STRING}
@@ -2079,6 +2052,7 @@ STR_SV_STNAME_AIRPORT                                           :{STRING} Flugv�
 STR_SV_STNAME_OILFIELD                                          :{STRING} Olíulendi
 STR_SV_STNAME_MINES                                             :{STRING} Náma
 STR_SV_STNAME_DOCKS                                             :{STRING} Höfn
+##id 0x6020
 STR_SV_STNAME_ANNEXE                                            :{STRING} Annáll
 STR_SV_STNAME_SIDINGS                                           :{STRING} Hliðrun
 STR_SV_STNAME_BRANCH                                            :{STRING} Grein
@@ -2126,8 +2100,6 @@ STR_NUM_LOW                                                     :Fáir
 STR_NUM_NORMAL                                                  :Miðlungs
 STR_NUM_HIGH                                                    :Margir
 STR_NUM_CUSTOM                                                  :Sérstillt
-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
@@ -2161,7 +2133,6 @@ STR_CITY_APPROVAL_HOSTILE                                       :Fjandsamleg
 
 ##id 0x7000
 STR_COMPANY_VIEW_CAPTION                                        :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
-STR_FORMAT_COMPANY_NUM                                          :(Fyrirtæki {COMMA})
 STR_COMPANY_VIEW_NEW_FACE_BUTTON                                :{BLACK}Nýtt Andlit
 STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON                           :{BLACK}Litaskema
 STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}Litaskema:
@@ -2194,7 +2165,6 @@ STR_FINANCES_TOTAL_CAPTION                                      :{WHITE}Summa:
 STR_COMPANY_NAME_COMPANY_NUM                                    :{COMPANY} {COMPANYNUM}
 STR_GRAPH_INCOME_CAPTION                                        :{WHITE}Tekjulínurit
 STR_CURRCOMPACT                                                 :{CURRCOMPACT}
-STR_JUST_COMMA                                                  :{COMMA}
 STR_GRAPH_OPERATING_PROFIT_CAPTION                              :{WHITE}Resktrartekju línurit
 STR_FINANCES_BANK_BALANCE_TITLE                                 :{WHITE}Bankainnistæða
 STR_FINANCES_LOAN_TITLE                                         :{WHITE}Lán
@@ -2597,10 +2567,8 @@ STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE                          :einteinungslest
 STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE                            :segul lest
 
 ##id 0x8800
-STR_DEPOT_TRAIN_CAPTION                                         :{WHITE}{TOWN} lestaskýli
 STR_NEWS_FIRST_TRAIN_ARRIVAL                                    :{BLACK}{BIGFONT}Bæjarbúar fagna . . .{}Fyrsta lest kemur við á {STATION}!
 STR_VEHICLE_DETAILS_CAPTION                                     :{WHITE}{VEHICLE} (Upplýsingar)
-STR_ERROR_TRAIN_IN_THE_WAY                                      :{WHITE}Lest fyrir
 STR_ORDER                                                       :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 STR_ORDER_SELECTED                                              :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 STR_ORDER_NON_STOP                                              :{BLACK}Hraðleið
@@ -2690,38 +2658,16 @@ STR_TIMETABLE_AND_TRAVEL_FOR                                    :og ferðast í
 STR_TIMETABLE_DAYS                                              :{COMMA} dag{P "" a}
 STR_TIMETABLE_TICKS                                             :{COMMA} sl{P ag ög}
 
-STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Á leið í {TOWN} lestaskýli
-STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Á leið í {TOWN} lestaskýli, {VELOCITY}
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Viðhald í {TOWN} lestaskýli
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Viðhald í {TOWN} lestaskýli, {VELOCITY}
-
 STR_INVALID_ORDER                                               :{RED} (Ógild Skipun)
 
 STR_UNKNOWN_STATION                                             :óþekkt stöð
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}Tómt
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} frá {STATION}
 STR_VEHICLE_DETAILS_CARGO_FROM_MULT                             :{LTBLUE}{CARGO} frá {STATION} (x{NUM})
-STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} bíður í þjónustumiðstöð
-STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Kaupa lest
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}Lestin er of löng
 STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}Aðeins er hægt að eiga við lestir þegar þær bíða í skýli
-STR_VEHICLE_LIST_TRAIN_CAPTION                                  :{WHITE}{STRING} - {COMMA} Lestir
 
-STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}Lestaúrval
-STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}Nýjir rafdrifnir lestarvagnar
-STR_BUILD_VEHICLE_TRAIN_MONORAIL_CAPTION                        :{WHITE}Nýir einteingungsvagnar
-STR_BUILD_VEHICLE_TRAIN_MAGLEV_CAPTION                          :{WHITE}Nýir segullestarvagnar
-STR_BUILD_VEHICLE_TRAIN_ALL_CAPTION                             :{WHITE}Járnbrautarlestir
-
-STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_BUTTON                    :{BLACK}Kaupa vagn
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Afrita bifreið
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Þetta býr til aðra eins bifreið. Control smelltu til að deila áætlun
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Þetta býr til aðra bifreið sem er eins og sú sem þú velur, hvort heldur sem er innan eða utan skýlisins. Smelltu á takkann og svo á bifreiðina. Control smelltu til að deila áætlun
-STR_CLONE_TRAIN                                                 :{BLACK}Afrita lest
-STR_CLONE_TRAIN_INFO                                            :{BLACK}Þetta býr til aðra eins lest að tengivögnunum meðtöldum. Control smelltu til að deila áætlun
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Þetta býr til aðra lest að tengivögnunum meðtöldum sem er eins og sú sem þú velur, hvort heldur sem er innan eða utan skýlisins. Smelltu á takkann og svo á lestina. Control smelltu til að deila áætlun
-STR_BUILD_VEHICLE_TRAIN_RENAME_BUTTON                           :{BLACK}Endurnefna
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Sleppa
 STR_ORDERS_DELETE_BUTTON                                        :{BLACK}Eyða
 STR_ORDERS_GO_TO_BUTTON                                         :{BLACK}Fara að
@@ -2737,14 +2683,12 @@ STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Skipta y
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Skipanir)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Endi skipana - -
 STR_SERVICE                                                     :{BLACK}Skoðun
-STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Get ekki byggt lest...
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Framleitt: {LTBLUE}{NUM}{BLACK} Virði: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Virði: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
 STR_VEHICLE_STATUS_LOADING_UNLOADING                            :{LTBLUE}Fermandi / Affermandi
 STR_VEHICLE_STATUS_LEAVING                                      :{LTBLUE}Yfirgefur
 STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}Lest þarf að vera stöðvuð í skýli
-STR_ERROR_CAN_T_SEND_TRAIN_TO_DEPOT                             :{WHITE}Get ekki sent lest í skýli...
 STR_ERROR_NO_MORE_SPACE_FOR_ORDERS                              :{WHITE}Ekki pláss fyrir fleiri skipanir
 STR_ERROR_TOO_MANY_ORDERS                                       :{WHITE}Of margar skipanir
 STR_ERROR_CAN_T_INSERT_NEW_ORDER                                :{WHITE}Get ekki bætt við nýrri skipun...
@@ -2759,26 +2703,11 @@ STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE}farartæ
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}Get ekki fært farartæki...
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}Aftari dráttarvagn fylgir alltaf fremri hluta
 STR_CARGO_N_A                                                   :N/A{SKIP}
-STR_ERROR_CAN_T_SELL_TRAIN                                      :{WHITE}Get ekki selt lest...
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}Get ekki fundið leit til staðbundins skýlis
-STR_ERROR_CAN_T_STOP_START_TRAIN                                :{WHITE}Get ekki ræst/stöðva lest...
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}Skoðanamillibil: {LTBLUE}{COMMA}dagar{BLACK}   Seinasta skoðun: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}Skoðanamillibil: {LTBLUE}{COMMA}%{BLACK}   Seinasta skoðun: {LTBLUE}{DATE_LONG}
-STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP                             :{BLACK}Lestir - smelltu á lest fyrir nánari upplýsingar
-STR_DEPOT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Lestir - ýttu á lest fyrir uppl., dragðu farartæki til að bæta við/fjarlægja úr lest
-STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP                            :{BLACK}Kaupa nýja lest
-STR_DEPOT_TRAIN_SELL_TOOLTIP                                    :{BLACK}Dragðu lestarvagn hingað til að selja hann
-STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}Miðstilla sjónarhorn á staðsetningu lestarskýlis
-STR_BUILD_VEHICLE_TRAIN_LIST_TOOLTIP                            :{BLACK}Lestarlisti - smelltu á farartæki fyrir meiri upplýsingar
-STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_TOOLTIP                   :{BLACK}Kaupa valinn lestarvagn
-STR_BUILD_VEHICLE_TRAIN_RENAME_TOOLTIP                          :{BLACK}Endurnefna lestarvagnstegund
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP                 :{BLACK}Núverandi aðgerð lestar - smelltu hér til að stöðva/ræsa lestina
-STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP                           :{BLACK}Sýna lestarskipanir
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP                         :{BLACK}Miðstilla sjónarhorn á staðsetningu lestar
-STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP                    :{BLACK}Senda lest í skýli
 STR_VEHICLE_VIEW_TRAIN_IGNORE_SIGNAL_TOOLTIP                    :{BLACK}Neyða lest til að halda áfram án þess að bíða eftir réttu ljósi
 STR_VEHICLE_VIEW_TRAIN_REVERSE_TOOLTIP                          :{BLACK}Breyta stefnu lestar
-STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Sýna nánari upplýsingar um lest
 STR_VEHICLE_DETAILS_INCREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Lengja skoðanamillibil
 STR_VEHICLE_DETAILS_DECREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Stytta skoðanamillibil
 STR_VEHICLE_DETAILS_TRAIN_CARGO_TOOLTIP                         :{BLACK}Sýna nánari upplýsingar um núverandi farm
@@ -2812,15 +2741,10 @@ STR_VEHICLE_STATUS_STOPPED                                      :{RED}Stöðvað
 STR_ERROR_CAN_T_MAKE_TRAIN_PASS_SIGNAL                          :{WHITE}Get ekki látið lest fara framhjá hættumerki...
 STR_VEHICLE_STATUS_CRASHED                                      :{RED}Árekstur!
 
-STR_QUERY_RENAME_TRAIN_CAPTION                                  :{WHITE}Skírðu lestina
-STR_ERROR_CAN_T_RENAME_TRAIN                                    :{WHITE}Get ekki skírt lest...
-STR_VEHICLE_DETAILS_TRAIN_RENAME                                :{BLACK}Skýrðu lestina
 STR_NEWS_TRAIN_CRASH                                            :{BLACK}{BIGFONT}Lestarslys!{}{COMMA} deyja í sprengingu eftir árekstur
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Get ekki snúið lest við...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE                  :{WHITE}Get ekki snúið lestinni við...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Get ekki snúið vögnum sem tilheyra vagnapari
-STR_QUERY_RENAME_TRAIN_TYPE_CAPTION                             :{WHITE}Endurskíra lestargerð
-STR_ERROR_CAN_T_RENAME_TRAIN_TYPE                               :{WHITE}Get ekki endurskírt lestargerð...
 STR_CLEAR_TIME                                                  :{BLACK}Hreinsa tíma
 STR_RESET_LATENESS                                              :{BLACK}Endurstilla seinkunnarteljara
 STR_CHANGE_WAYPOINT_NAME                                        :{BLACK}Breyta nafni á vegleiðara
@@ -2852,45 +2776,14 @@ STR_TIMETABLE_AUTOFILL                                          :{BLACK}Skrifa s
 STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Bæta áfangastöðum næstu ferðar sjálfvirkt við áætlunina (Ctrl+smelltu til að reyna að halda biðtímum)
 
 ##id 0x9000
-STR_ERROR_ROAD_VEHICLE_IN_THE_WAY                               :{WHITE}Bíll fyrir
-STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING} - {COMMA} Bílar
-STR_DEPOT_ROAD_VEHICLE_CAPTION                                  :{WHITE}{TOWN} bifreiðaskýli
-STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_BUTTON                      :{BLACK}Kaupa bifreið
-STR_BUILD_VEHICLE_ROAD_VEHICLE_CAPTION                          :{WHITE}Bifreiðaúrval
-STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_BUTTON             :{BLACK}Kaupa bifreið
-STR_ERROR_CAN_T_BUILD_ROAD_VEHICLE                              :{WHITE}Get ekki byggt bíl...
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}...verður að stöðvast í bifreiðaskýli
-STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}Get ekki selt bifreið...
-STR_ERROR_CAN_T_STOP_START_ROAD_VEHICLE                         :{WHITE}Get ekki stöðvað/ræst bifreið...
-STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} bíður í þjónustumiðstöð
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Á leið í {TOWN} bifreiðaskýli
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Á leið í {TOWN} bifreiðaskýli, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Viðhald í {TOWN} bifreiðaskýli
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Viðhald í {TOWN} bifreiðaskýli, {VELOCITY}
-STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Get ekki sent bifreið í skýli...
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Finnur ekkert nálægt skýli
-STR_VEHICLE_LIST_ROAD_VEHICLE_TOOLTIP                           :{BLACK}Bifreið - smelltu á bifreið fyrir nánari upplýsingar
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP          :{BLACK}Núverandi aðgerð bifreiðar - smelltu hér til að stöðva/ræsa bifreið
-STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP                    :{BLACK}Sýna skipanir bifreiðar
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP                  :{BLACK}Miðja aðalsjónarhornið á bifreið
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}Senda bifreið í skýli
 STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP                   :{BLACK}Þvinga bifreið til að snúa við
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Sýna upplýsingar um bifreið
-STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Bifreið - smelltu á bifreið fyrir nánari upplýsingar
-STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}Kaupa nýja bifreið
-STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}Dragðu bifreið hingað til að selja hana
-STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}Miðja aðalsjónarhorn á bifreiðaskýli
-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_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})
 
-STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Nefna bifreið
-STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Get ekki nefnt bifreið...
-STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Nefna bifreið
 STR_NEWS_FIRST_BUS_ARRIVAL                                      :{BLACK}{BIGFONT}Bæjarbúar fagna . . .{}Fyrsti strætisvagn kemur við á {STATION}!
 STR_NEWS_FIRST_TRUCK_ARRIVAL                                    :{BLACK}{BIGFONT}Bæjarbúar fagna . . .{}Fyrsti vörubíll kemur við á {STATION}!
 STR_NEWS_FIRST_PASSENGER_TRAM_ARRIVAL                           :{BLACK}{BIGFONT}Bæjarbúar fagna . . .{}Fyrsti farþegasporvagn kemur við á {STATION}!
@@ -2898,132 +2791,39 @@ STR_NEWS_FIRST_CARGO_TRAM_ARRIVAL                               :{BLACK}{BIGFONT
 STR_NEWS_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Bílslys!{}Bílstjóri deyr í sprengingu eftir árekstur við lest
 STR_NEWS_ROAD_VEHICLE_CRASH                                     :{BLACK}{BIGFONT}Bílslys!{}{COMMA} deyja í sprengingu eftir árekstur við lest
 STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}Get ekki snúið bifreiðinni við...
-STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Endurnefna
-STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Endurnefna tegund bifreiðar
-STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Endurnefna tegund bifreiðar
-STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE} Get ekki endurnefnat tegund bifreiðar...
 
-STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Breyta bifreið svo hún flytji annan farm
-STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Breyta bifreið
-STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Breyta bifreið svo hún flytji valinn farm
-STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Get ekki breytt bifreið...
-STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Veldu tegund farms sem bifreið mun flytja
 
 ##id 0x9800
 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :Vatnaframkvæmdir
 STR_WATERWAYS_TOOLBAR_CAPTION                                   :{WHITE}Vatnaframkvæmdir
 STR_WATERWAYS_TOOLBAR_CAPTION_SE                                :{WHITE}Skipaskurður
 STR_ERROR_CAN_T_BUILD_DOCK_HERE                                 :{WHITE}Get ekki byggt bryggju hér...
-STR_DEPOT_SHIP_CAPTION                                          :{WHITE}{TOWN} slippur
-STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON                              :{BLACK}Kaupa skip
-STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - {COMMA} Skip
-STR_BUILD_VEHICLE_SHIP_CAPTION                                  :{WHITE}Skipaúrval
-STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON                     :{BLACK}Kaupa skip
-STR_CLONE_SHIP                                                  :{BLACK}Afrita skip
-STR_CLONE_SHIP_INFO                                             :{BLACK}Þetta býr til annað eins skip. Control smelltu til að deila áætlun
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Þetta býr til annað skip sem er eins og það sem þú velur, hvort heldur sem er innan eða utan skýlisins. Smelltu á takkann og svo á skipið. Control smelltu til að deila áætlun
 STR_ERROR_SHIP_MUST_BE_STOPPED_IN_DEPOT                         :{WHITE}Skip verður að vera stöðvað í skýli
-STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}Get ekki selt skip...
-STR_ERROR_CAN_T_BUILD_SHIP                                      :{WHITE}Get ekki smíðað skip...
-STR_ERROR_SHIP_IN_THE_WAY                                       :{WHITE}Skip er fyrir
-STR_ERROR_CAN_T_STOP_START_SHIP                                 :{WHITE}Get ekki stöðvað/ræst skip...
-STR_ERROR_CAN_T_SEND_SHIP_TO_DEPOT                              :{WHITE}Get ekki sent skip í slipp...
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Á leið í {TOWN} slipp
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Á leið í {TOWN} slipp, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Viðhald í {TOWN} slippi
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Viðhald í {TOWN} slippi, {VELOCITY}
-STR_NEWS_SHIP_IS_WAITING                                        :{WHITE}{VEHICLE} bíður í þjónustumiðstöð
 STR_WATERWAYS_TOOLBAR_BUILD_DOCK_TOOLTIP                        :{BLACK}Byggja bryggju
 STR_WATERWAYS_TOOLBAR_BUILD_DEPOT_TOOLTIP                       :{BLACK}Reisa slipp (til að smíða og viðhalda skipum)
-STR_DEPOT_SHIP_LIST_TOOLTIP                                     :{BLACK}Skip - smelltu á skip fyrir nánari upplýsingar
-STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}Kaupa nýtt skip
-STR_DEPOT_SHIP_SELL_TOOLTIP                                     :{BLACK}Dragðu skip hingað til að selja það
-STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}Miðja aðalsjónarhorn á slipp
-STR_VEHICLE_LIST_SHIP_TOOLTIP                                   :{BLACK}Skip - smelltu fyrir nánari upplýsingar
-STR_BUILD_VEHICLE_SHIP_LIST_TOOLTIP                             :{BLACK}Skipalisti - smelltu á skip fyrir nánari upplýsingar
-STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP                    :{BLACK}Kaupa valið skip
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP                  :{BLACK}Núverandi aðgerð skips - smelltu hér til að stöðva/ræsa skipið
-STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Sýna skipanir skips
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP                          :{BLACK}Miðja aðalsjónarhorn á staðsetningu skips
-STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}Senda skipið í slipp
-STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Sýna nánari upplýsingar um skip
-STR_VEHICLE_DETAILS_SHIP_RENAME                                 :{BLACK}Nefna skip
 
-STR_QUERY_RENAME_SHIP_CAPTION                                   :{WHITE}Nefna skip
-STR_ERROR_CAN_T_RENAME_SHIP                                     :{WHITE}Get ekki nefnt skip...
 STR_NEWS_FIRST_SHIP_ARRIVAL                                     :{BLACK}{BIGFONT}Bæjarbúar fagna . . .{}Fyrsta skip kemur við á {STATION}!
 STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}Setja niður bauju sem hægt er að nota sem leiðarvísi fyrir skip
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}Get ekki sett bauju hér...
 STR_BUILD_AQUEDUCT                                              :{BLACK}Byggja vatnsleyðslu
 STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}Ekki hægt að byggja vatnsleyðslu hér...
-STR_BUILD_VEHICLE_SHIP_RENAME_BUTTON                            :{BLACK}Endurnefna
-STR_BUILD_VEHICLE_SHIP_RENAME_TOOLTIP                           :{BLACK}Endurnefna skipategund
-STR_QUERY_RENAME_SHIP_TYPE_CAPTION                              :{WHITE}Endurnefna skipategund
-STR_ERROR_CAN_T_RENAME_SHIP_TYPE                                :{WHITE}Get ekki endurnefnt skipategund...
-STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}Breyta vöruflutningaskipum svo þau flytji annan farm
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (Breyta)
-STR_REFIT_SHIP_REFIT_BUTTON                                     :{BLACK}Breyta skipi
-STR_REFIT_SHIP_LIST_TOOLTIP                                     :{BLACK}Veldu hvernig farm skipið á að flytja
-STR_REFIT_SHIP_REFIT_TOOLTIP                                    :{BLACK}Breyta skipi svo það flytji valinn farm
 STR_REFIT_TITLE                                                 :{GOLD}Veldu farm sem á að flytja:
 STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}Ný burðargeta: {GOLD}{CARGO}{}{BLACK}Breytingarkostnaður: {GOLD}{CURRENCY}
-STR_ERROR_CAN_T_REFIT_SHIP                                      :{WHITE}Get ekki breytt skipi...
 STR_REFITTABLE                                                  :(breytanlegt)
 
 ##id 0xA000
 STR_TOOLBAR_AIRCRAFT_CAPTION                                    :{WHITE}Flugvellir
 STR_ERROR_CAN_T_BUILD_AIRPORT_HERE                              :{WHITE}Get ekki byggt flugvöll hér...
-STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}{STATION} flugskýli
-STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON                          :{BLACK}Kaupa flugvél
-STR_CLONE_AIRCRAFT                                              :{BLACK}Afrita flugvél
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Þetta býr til aðra eins flugvél. Control smelltu til að deila áætlun
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Þetta býr til aðra flugvél sem er eins og sú sem þú velur, hvort heldur sem er innan eða utan skýlisins. Smelltu á takkann og svo á flugvélina. Control smelltu til að deila áætlun
-STR_BUILD_VEHICLE_AIRCRAFT_CAPTION                              :{WHITE}Flugvélaúrval
-STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON                 :{BLACK}Kaupa flugvél
-STR_ERROR_CAN_T_BUILD_AIRCRAFT                                  :{WHITE}Get ekki smíðað flugvél...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} Flugvél
-STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR                         :{WHITE}Get ekki sent flugvél í flugskýli...
-STR_HEADING_FOR_HANGAR                                          :{ORANGE}Á leið í {STATION} flugskýli
-STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Á leið í {STATION} flugskýli, {VELOCITY}
-STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Viðhald í {STATION} flugskýli
-STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Viðhald í {STATION} flugskýli, {VELOCITY}
-STR_NEWS_AIRCRAFT_IS_WAITING                                    :{WHITE}{VEHICLE} bíður í flugskýlinu
-STR_ERROR_AIRCRAFT_IN_THE_WAY                                   :{WHITE}Flugvél er fyrir
-STR_ERROR_CAN_T_STOP_START_AIRCRAFT                             :{WHITE}Get ekki stöðvað/ræst flugvél...
 STR_ERROR_AIRCRAFT_IS_IN_FLIGHT                                 :{WHITE}flugvélin er á flugi
 STR_ERROR_AIRCRAFT_MUST_BE_STOPPED                              :{WHITE}Flugvélin verður að vera stöðvuð í flugskýli
-STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}Get ekki selt flugvélina...
 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION                          :Flugvallarframkvæmdir
 STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Byggja flugvöll
-STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP                               :{BLACK}Flugvélar - smelltu á flugvél fyrir nánari upplýsingar
-STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Flugvélar - smelltu á flugvél fyrir nánari upplýsingar
-STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}Kaupa nýja flugvél
-STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}Dragðu flugvél hingað til að selja hana
-STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Miðja aðalsjónarhorn á flugskýli
-STR_BUILD_VEHICLE_AIRCRAFT_LIST_TOOLTIP                         :{BLACK}Flugvélalisti - smelltu á flugvél fyrir nánari upplýsingar
-STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_TOOLTIP                :{BLACK}Kaupa valda flugvél
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP              :{BLACK}Núverandi aðgerð - smelltu hér til að stöðva/ræsa flugvél
-STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Sýna skipanir flugvélar
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP                      :{BLACK}Miðja aðalsjónarhorn á flugvélina
-STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}Senda flugvélina i flugskýli
-STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Sýna nánari upplýsingar um skip
 
-STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}Nefna flugvélina
-STR_ERROR_CAN_T_RENAME_AIRCRAFT                                 :{WHITE}Get ekki nefnt flugvélina...
-STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}Nefna flugvélina
 STR_NEWS_FIRST_AIRCRAFT_ARRIVAL                                 :{BLACK}{BIGFONT}Bæjarbúar fagna . . .{}Fyrsta flugvél kemur við á {STATION}!
 STR_NEWS_AIRCRAFT_CRASH                                         :{BLACK}{BIGFONT}Flugslys!{}{COMMA} deyja í sprengingu á {STATION}
 STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Flugslys!{}Flugvél varð eldsneytislaus, {COMMA} deyja í sprengingu!
 STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
-STR_BUILD_VEHICLE_AIRCRAFT_RENAME_BUTTON                        :{BLACK}Endurnefna
-STR_BUILD_VEHICLE_AIRCRAFT_RENAME_TOOLTIP                       :{BLACK}Endurnefna tegund flugvélar
-STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION                          :{WHITE}Endurnefna tegund flugvélar
-STR_ERROR_CAN_T_RENAME_AIRCRAFT_TYPE                            :{WHITE}Get ekki endurnefnt tegund flugvélarinnar...
-STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Breyta flugvél svo hún flytji annan farm
-STR_REFIT_AIRCRAFT_REFIT_BUTTON                                 :{BLACK}Breyta flugvél
-STR_REFIT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Veldu farm sem flugvél á að flytja
-STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}Breyta flugvél svo hún flytji valinn farm
-STR_ERROR_CAN_T_REFIT_AIRCRAFT                                  :{WHITE}Get ekki breytt flugvél...
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Áætlun)
 
@@ -3177,15 +2977,225 @@ STR_LORRY                                                       :{BLACK}{LORRY}
 STR_PLANE                                                       :{BLACK}{PLANE}
 STR_SHIP                                                        :{BLACK}{SHIP}
 
+############ Vehicle lists
+STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP                             :{BLACK}Lestir - smelltu á lest fyrir nánari upplýsingar
+STR_VEHICLE_LIST_ROAD_VEHICLE_TOOLTIP                           :{BLACK}Bifreið - smelltu á bifreið fyrir nánari upplýsingar
+STR_VEHICLE_LIST_SHIP_TOOLTIP                                   :{BLACK}Skip - smelltu fyrir nánari upplýsingar
+STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP                               :{BLACK}Flugvélar - smelltu á flugvél fyrir nánari upplýsingar
 
-STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Sýna allar lestir sem hafa þessa stöð á áætlun
-STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Sýna allar bifreiðir sem hafa þessa stöð á áætlun
-STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Sýna allar flugvélar sem hafa þessa stöð á áætlun
-STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Sýna öll skip sem hafa þessa stöð á áætlun
+STR_VEHICLE_LIST_TRAIN_CAPTION                                  :{WHITE}{STRING} - {COMMA} Lestir
+STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING} - {COMMA} Bílar
+STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - {COMMA} Skip
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} Flugvél
 
 STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}Samnýttar skipanir {COMMA} {P farartækis farartækja}
 STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Sýna öll farartæki sem deila þessari áætlun
 
+STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} bíður í þjónustumiðstöð
+STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} bíður í þjónustumiðstöð
+STR_NEWS_SHIP_IS_WAITING                                        :{WHITE}{VEHICLE} bíður í þjónustumiðstöð
+STR_NEWS_AIRCRAFT_IS_WAITING                                    :{WHITE}{VEHICLE} bíður í flugskýlinu
+
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Breyta lest
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Breyta bifreið
+STR_REFIT_SHIP_REFIT_BUTTON                                     :{BLACK}Breyta skipi
+STR_REFIT_AIRCRAFT_REFIT_BUTTON                                 :{BLACK}Breyta flugvél
+
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Breyta lest svo hún flytji valinn farm
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Breyta bifreið svo hún flytji valinn farm
+STR_REFIT_SHIP_REFIT_TOOLTIP                                    :{BLACK}Breyta skipi svo það flytji valinn farm
+STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}Breyta flugvél svo hún flytji valinn farm
+
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Veldu hvernig farm lestin á að flytja
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Veldu tegund farms sem bifreið mun flytja
+STR_REFIT_SHIP_LIST_TOOLTIP                                     :{BLACK}Veldu hvernig farm skipið á að flytja
+STR_REFIT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Veldu farm sem flugvél á að flytja
+
+STR_DEPOT_TRAIN_CAPTION                                         :{WHITE}{TOWN} lestaskýli
+STR_DEPOT_ROAD_VEHICLE_CAPTION                                  :{WHITE}{TOWN} bifreiðaskýli
+STR_DEPOT_SHIP_CAPTION                                          :{WHITE}{TOWN} slippur
+STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}{STATION} flugskýli
+
+STR_VEHICLE_DETAILS_TRAIN_RENAME                                :{BLACK}Skýrðu lestina
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Nefna bifreið
+STR_VEHICLE_DETAILS_SHIP_RENAME                                 :{BLACK}Nefna skip
+STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}Nefna flugvélina
+
+STR_QUERY_RENAME_TRAIN_CAPTION                                  :{WHITE}Skírðu lestina
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Nefna bifreið
+STR_QUERY_RENAME_SHIP_CAPTION                                   :{WHITE}Nefna skip
+STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}Nefna flugvélina
+
+STR_ERROR_TRAIN_IN_THE_WAY                                      :{WHITE}Lest fyrir
+STR_ERROR_ROAD_VEHICLE_IN_THE_WAY                               :{WHITE}Bíll fyrir
+STR_ERROR_SHIP_IN_THE_WAY                                       :{WHITE}Skip er fyrir
+STR_ERROR_AIRCRAFT_IN_THE_WAY                                   :{WHITE}Flugvél er fyrir
+
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Get ekki breytt lest...
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Get ekki breytt bifreið...
+STR_ERROR_CAN_T_REFIT_SHIP                                      :{WHITE}Get ekki breytt skipi...
+STR_ERROR_CAN_T_REFIT_AIRCRAFT                                  :{WHITE}Get ekki breytt flugvél...
+
+STR_ERROR_CAN_T_RENAME_TRAIN                                    :{WHITE}Get ekki skírt lest...
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Get ekki nefnt bifreið...
+STR_ERROR_CAN_T_RENAME_SHIP                                     :{WHITE}Get ekki nefnt skip...
+STR_ERROR_CAN_T_RENAME_AIRCRAFT                                 :{WHITE}Get ekki nefnt flugvélina...
+
+STR_ERROR_CAN_T_STOP_START_TRAIN                                :{WHITE}Get ekki ræst/stöðva lest...
+STR_ERROR_CAN_T_STOP_START_ROAD_VEHICLE                         :{WHITE}Get ekki stöðvað/ræst bifreið...
+STR_ERROR_CAN_T_STOP_START_SHIP                                 :{WHITE}Get ekki stöðvað/ræst skip...
+STR_ERROR_CAN_T_STOP_START_AIRCRAFT                             :{WHITE}Get ekki stöðvað/ræst flugvél...
+
+STR_ERROR_CAN_T_SEND_TRAIN_TO_DEPOT                             :{WHITE}Get ekki sent lest í skýli...
+STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Get ekki sent bifreið í skýli...
+STR_ERROR_CAN_T_SEND_SHIP_TO_DEPOT                              :{WHITE}Get ekki sent skip í slipp...
+STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR                         :{WHITE}Get ekki sent flugvél í flugskýli...
+
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Get ekki byggt lest...
+STR_ERROR_CAN_T_BUILD_ROAD_VEHICLE                              :{WHITE}Get ekki byggt bíl...
+STR_ERROR_CAN_T_BUILD_SHIP                                      :{WHITE}Get ekki smíðað skip...
+STR_ERROR_CAN_T_BUILD_AIRCRAFT                                  :{WHITE}Get ekki smíðað flugvél...
+
+STR_ERROR_CAN_T_RENAME_TRAIN_TYPE                               :{WHITE}Get ekki endurskírt lestargerð...
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE} Get ekki endurnefnat tegund bifreiðar...
+STR_ERROR_CAN_T_RENAME_SHIP_TYPE                                :{WHITE}Get ekki endurnefnt skipategund...
+STR_ERROR_CAN_T_RENAME_AIRCRAFT_TYPE                            :{WHITE}Get ekki endurnefnt tegund flugvélarinnar...
+
+STR_ERROR_CAN_T_SELL_TRAIN                                      :{WHITE}Get ekki selt lest...
+STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}Get ekki selt bifreið...
+STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}Get ekki selt skip...
+STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}Get ekki selt flugvélina...
+
+STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP                 :{BLACK}Núverandi aðgerð lestar - smelltu hér til að stöðva/ræsa lestina
+STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP          :{BLACK}Núverandi aðgerð bifreiðar - smelltu hér til að stöðva/ræsa bifreið
+STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP                  :{BLACK}Núverandi aðgerð skips - smelltu hér til að stöðva/ræsa skipið
+STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP              :{BLACK}Núverandi aðgerð - smelltu hér til að stöðva/ræsa flugvél
+
+STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP                           :{BLACK}Sýna lestarskipanir
+STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP                    :{BLACK}Sýna skipanir bifreiðar
+STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Sýna skipanir skips
+STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Sýna skipanir flugvélar
+
+STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP                         :{BLACK}Miðstilla sjónarhorn á staðsetningu lestar
+STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP                  :{BLACK}Miðja aðalsjónarhornið á bifreið
+STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP                          :{BLACK}Miðja aðalsjónarhorn á staðsetningu skips
+STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP                      :{BLACK}Miðja aðalsjónarhorn á flugvélina
+
+STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP                    :{BLACK}Senda lest í skýli
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}Senda bifreið í skýli
+STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}Senda skipið í slipp
+STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}Senda flugvélina i flugskýli
+
+STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Sýna nánari upplýsingar um lest
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Sýna upplýsingar um bifreið
+STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Sýna nánari upplýsingar um skip
+STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Sýna nánari upplýsingar um skip
+
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Breyta lest svo hún flytji annan farm
+STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Breyta bifreið svo hún flytji annan farm
+STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}Breyta vöruflutningaskipum svo þau flytji annan farm
+STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Breyta flugvél svo hún flytji annan farm
+
+STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Á leið í {TOWN} lestaskýli
+STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Á leið í {TOWN} lestaskýli, {VELOCITY}
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Á leið í {TOWN} bifreiðaskýli
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Á leið í {TOWN} bifreiðaskýli, {VELOCITY}
+STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Á leið í {TOWN} slipp
+STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Á leið í {TOWN} slipp, {VELOCITY}
+STR_HEADING_FOR_HANGAR                                          :{ORANGE}Á leið í {STATION} flugskýli
+STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Á leið í {STATION} flugskýli, {VELOCITY}
+
+STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Viðhald í {TOWN} lestaskýli
+STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Viðhald í {TOWN} lestaskýli, {VELOCITY}
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Viðhald í {TOWN} bifreiðaskýli
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Viðhald í {TOWN} bifreiðaskýli, {VELOCITY}
+STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Viðhald í {TOWN} slippi
+STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Viðhald í {TOWN} slippi, {VELOCITY}
+STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Viðhald í {STATION} flugskýli
+STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Viðhald í {STATION} flugskýli, {VELOCITY}
+
+
+STR_CLONE_TRAIN                                                 :{BLACK}Afrita lest
+STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Afrita bifreið
+STR_CLONE_SHIP                                                  :{BLACK}Afrita skip
+STR_CLONE_AIRCRAFT                                              :{BLACK}Afrita flugvél
+
+STR_CLONE_TRAIN_INFO                                            :{BLACK}Þetta býr til aðra eins lest að tengivögnunum meðtöldum. Control smelltu til að deila áætlun
+STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Þetta býr til aðra eins bifreið. Control smelltu til að deila áætlun
+STR_CLONE_SHIP_INFO                                             :{BLACK}Þetta býr til annað eins skip. Control smelltu til að deila áætlun
+STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Þetta býr til aðra eins flugvél. Control smelltu til að deila áætlun
+
+STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Þetta býr til aðra lest að tengivögnunum meðtöldum sem er eins og sú sem þú velur, hvort heldur sem er innan eða utan skýlisins. Smelltu á takkann og svo á lestina. Control smelltu til að deila áætlun
+STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Þetta býr til aðra bifreið sem er eins og sú sem þú velur, hvort heldur sem er innan eða utan skýlisins. Smelltu á takkann og svo á bifreiðina. Control smelltu til að deila áætlun
+STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Þetta býr til annað skip sem er eins og það sem þú velur, hvort heldur sem er innan eða utan skýlisins. Smelltu á takkann og svo á skipið. Control smelltu til að deila áætlun
+STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Þetta býr til aðra flugvél sem er eins og sú sem þú velur, hvort heldur sem er innan eða utan skýlisins. Smelltu á takkann og svo á flugvélina. Control smelltu til að deila áætlun
+
+STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}Lestaúrval
+STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}Nýjir rafdrifnir lestarvagnar
+STR_BUILD_VEHICLE_TRAIN_MONORAIL_CAPTION                        :{WHITE}Nýir einteingungsvagnar
+STR_BUILD_VEHICLE_TRAIN_MAGLEV_CAPTION                          :{WHITE}Nýir segullestarvagnar
+
+STR_BUILD_VEHICLE_TRAIN_ALL_CAPTION                             :{WHITE}Járnbrautarlestir
+STR_BUILD_VEHICLE_ROAD_VEHICLE_CAPTION                          :{WHITE}Bifreiðaúrval
+STR_BUILD_VEHICLE_SHIP_CAPTION                                  :{WHITE}Skipaúrval
+STR_BUILD_VEHICLE_AIRCRAFT_CAPTION                              :{WHITE}Flugvélaúrval
+
+STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_BUTTON                    :{BLACK}Kaupa vagn
+STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_BUTTON             :{BLACK}Kaupa bifreið
+STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON                     :{BLACK}Kaupa skip
+STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON                 :{BLACK}Kaupa flugvél
+
+STR_BUILD_VEHICLE_TRAIN_LIST_TOOLTIP                            :{BLACK}Lestarlisti - smelltu á farartæki fyrir meiri upplýsingar
+STR_BUILD_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP                     :{BLACK}Bifreiðalisti - ýttu á bifreið fyrir nánari upplýsingar
+STR_BUILD_VEHICLE_SHIP_LIST_TOOLTIP                             :{BLACK}Skipalisti - smelltu á skip fyrir nánari upplýsingar
+STR_BUILD_VEHICLE_AIRCRAFT_LIST_TOOLTIP                         :{BLACK}Flugvélalisti - smelltu á flugvél fyrir nánari upplýsingar
+
+STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_TOOLTIP                   :{BLACK}Kaupa valinn lestarvagn
+STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_TOOLTIP            :{BLACK}Kaupa valda bifreið
+STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP                    :{BLACK}Kaupa valið skip
+STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_TOOLTIP                :{BLACK}Kaupa valda flugvél
+
+STR_BUILD_VEHICLE_TRAIN_RENAME_BUTTON                           :{BLACK}Endurnefna
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Endurnefna
+STR_BUILD_VEHICLE_SHIP_RENAME_BUTTON                            :{BLACK}Endurnefna
+STR_BUILD_VEHICLE_AIRCRAFT_RENAME_BUTTON                        :{BLACK}Endurnefna
+
+STR_BUILD_VEHICLE_TRAIN_RENAME_TOOLTIP                          :{BLACK}Endurnefna lestarvagnstegund
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Endurnefna tegund bifreiðar
+STR_BUILD_VEHICLE_SHIP_RENAME_TOOLTIP                           :{BLACK}Endurnefna skipategund
+STR_BUILD_VEHICLE_AIRCRAFT_RENAME_TOOLTIP                       :{BLACK}Endurnefna tegund flugvélar
+
+STR_QUERY_RENAME_TRAIN_TYPE_CAPTION                             :{WHITE}Endurskíra lestargerð
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Endurnefna tegund bifreiðar
+STR_QUERY_RENAME_SHIP_TYPE_CAPTION                              :{WHITE}Endurnefna skipategund
+STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION                          :{WHITE}Endurnefna tegund flugvélar
+
+STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Kaupa lest
+STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_BUTTON                      :{BLACK}Kaupa bifreið
+STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON                              :{BLACK}Kaupa skip
+STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON                          :{BLACK}Kaupa flugvél
+
+STR_DEPOT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Lestir - ýttu á lest fyrir uppl., dragðu farartæki til að bæta við/fjarlægja úr lest
+STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Bifreið - smelltu á bifreið fyrir nánari upplýsingar
+STR_DEPOT_SHIP_LIST_TOOLTIP                                     :{BLACK}Skip - smelltu á skip fyrir nánari upplýsingar
+STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Flugvélar - smelltu á flugvél fyrir nánari upplýsingar
+
+STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP                            :{BLACK}Kaupa nýja lest
+STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}Kaupa nýja bifreið
+STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}Kaupa nýtt skip
+STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}Kaupa nýja flugvél
+
+STR_DEPOT_TRAIN_SELL_TOOLTIP                                    :{BLACK}Dragðu lestarvagn hingað til að selja hann
+STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}Dragðu bifreið hingað til að selja hana
+STR_DEPOT_SHIP_SELL_TOOLTIP                                     :{BLACK}Dragðu skip hingað til að selja það
+STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}Dragðu flugvél hingað til að selja hana
+
+STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}Miðstilla sjónarhorn á staðsetningu lestarskýlis
+STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}Miðja aðalsjónarhorn á bifreiðaskýli
+STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}Miðja aðalsjónarhorn á slipp
+STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Miðja aðalsjónarhorn á flugskýli
+
+
 ### depot strings
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}Þú ert í þann mund að selja öll farartækin. Viltu halda áfram?
 STR_DEPOT_WRONG_DEPOT_TYPE                                      :Röng tegund skýlis
@@ -3205,7 +3215,6 @@ STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TIP                          :{BLACK}Skipta �
 STR_DEPOT_AUTOREPLACE_SHIP_TIP                                  :{BLACK}Skipta öllum skipum í slippnum sjálfvirkt út
 STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP                              :{BLACK}Skipta öllum flugvélum í skýlinu sjálfvirkt út
 
-
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Endurnýja {STRING}
 STR_REPLACE_VEHICLES_START                                      :{BLACK}Hefja skipti
 STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Stöðva skipti
@@ -3221,6 +3230,7 @@ STR_REPLACE_REMOVE_WAGON                                        :{BLACK}Selja le
 STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Heldur lengd lestar með því að fjarlægja vagna (framan frá) ef útskipting dráttarvagna myndi lengja hana.
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}Skipti út: {ORANGE}{SKIP}{SKIP}{STRING}
 STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}Skipta á milli útskiptiglugga dráttar- og flutningavagna
+
 STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Lestarvagn er ekki fáanlegur
 STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Bifreið er ekki fáanleg
 STR_SHIP_NOT_AVAILABLE                                          :{WHITE}Skip er ekki fáanlegt
@@ -3371,17 +3381,6 @@ STR_MEASURE_AREA                                                :{BLACK}Svæði:
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Lengd: {NUM}{}Hæðarmunur {NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Svæði: {NUM} x {NUM}{}Hæðarmunur: {NUM} m
 
-############ Date formatting
-STR_FORMAT_DATE_TINY                                            :{STRING}-{STRING}-{NUM}
-STR_FORMAT_DATE_SHORT                                           :{STRING} {NUM}
-STR_FORMAT_DATE_LONG                                            :{STRING} {STRING} {NUM}
-STR_FORMAT_DATE_ISO                                             :{2:NUM}-{1:STRING}-{0:STRING}
-
-STR_JUST_DATE_TINY                                              :{DATE_TINY}
-STR_JUST_DATE_LONG                                              :{DATE_LONG}
-STR_JUST_DATE_ISO                                               :{DATE_ISO}
-########
-
 STR_FEEDER_CARGO_VALUE                                          :{BLACK}Millifæra gjaldeyri: {LTBLUE}{CURRENCY}
 STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD                            :{WHITE}...vegurinn er í eigu bæjar
 STR_DRIVE_THROUGH_ERROR_DIRECTION                               :{WHITE}...vegurinn snýr í ranga átt
@@ -3406,7 +3405,6 @@ STR_PERCENT_UP_DOWN_SMALL                                       :{TINYFONT}{WHIT
 STR_PERCENT_UP_DOWN                                             :{WHITE}{NUM}%{UPARROW}{DOWNARROW}
 
 ##### Mass Order
-STR_FORMAT_GROUP_NAME                                           :Hópur {COMMA}
 STR_GROUP_TINY_NAME                                             :{TINYFONT}{GROUP}
 STR_GROUP_ALL_TRAINS                                            :Allar lestir
 STR_GROUP_ALL_ROAD_VEHICLES                                     :Allar bifreiðir
@@ -3435,12 +3433,62 @@ STR_GROUP_DELETE_TIP                                            :{BLACK}Eyða v�
 STR_GROUP_RENAME_TIP                                            :{BLACK}Endurnefna valinn hóp
 STR_GROUP_REPLACE_PROTECTION_TIP                                :{BLACK}Smelltu til að halda þessum hóp frá sjálfvirkri uppfærslu
 
+#### String control codes and their formatting
 STR_COMPANY_NAME                                                :{COMPANY}
 STR_ENGINE_NAME                                                 :{ENGINE}
 STR_GROUP_NAME                                                  :{GROUP}
+STR_INDUSTRY_NAME                                               :{INDUSTRY}
 STR_PRESIDENT_NAME                                              :{PRESIDENTNAME}
 STR_SIGN_NAME                                                   :{SIGN}
+STR_STATION_NAME                                                :{STATION}
+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_LONG                                              :{DATE_LONG}
+STR_JUST_DATE_ISO                                               :{DATE_ISO}
+STR_JUST_STRING                                                 :{STRING}
+STR_JUST_RAW_STRING                                             :{STRING}
+
+STR_FORMAT_DATE_TINY                                            :{STRING}-{STRING}-{NUM}
+STR_FORMAT_DATE_SHORT                                           :{STRING} {NUM}
+STR_FORMAT_DATE_LONG                                            :{STRING} {STRING} {NUM}
+STR_FORMAT_DATE_ISO                                             :{2:NUM}-{1:STRING}-{0:STRING}
+
+STR_FORMAT_COMPANY_NUM                                          :(Fyrirtæki {COMMA})
+STR_FORMAT_GROUP_NAME                                           :Hópur {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}Nafnið verður að vera sérstætt
 
diff --git a/src/lang/indonesian.txt b/src/lang/indonesian.txt
index af2011975..65a9c17c4 100644
--- a/src/lang/indonesian.txt
+++ b/src/lang/indonesian.txt
@@ -154,8 +154,6 @@ STR_ABBREV_PLASTIC                                              :{TINYFONT}PL
 STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}MB
 STR_ABBREV_NONE                                                 :{TINYFONT}TANPA
 STR_ABBREV_ALL                                                  :{TINYFONT}SMA
-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
@@ -167,17 +165,11 @@ STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Hak Cipt
 STR_ABOUT_VERSION                                               :{BLACK}OpenTTD versi {REV}
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 Tim OpenTTD
 
-STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
-STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_QUIT_CAPTION                                                :{WHITE}Keluar
 STR_YES                                                         :{BLACK}Ya
 STR_NO                                                          :{BLACK}Tidak
 STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Anda yakin ingin keluar dari OpenTTD dan kembali ke {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                                                :Tidak ada
 STR_COLOUR_DARK_BLUE                                            :Biru tua
 STR_COLOUR_PALE_GREEN                                           :Hijau pucat
@@ -196,8 +188,6 @@ STR_COLOUR_BROWN                                                :Coklat
 STR_COLOUR_GREY                                                 :Abu-abu
 STR_COLOUR_WHITE                                                :Putih
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}Terlalu banyak kendaraan dalam permainan
-STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
-STR_RED_COMMA                                                   :{RED}{COMMA}
 STR_BUTTON_LOCATION                                             :{BLACK}Lokasi
 STR_SMALLMAP_TYPE_CONTOURS                                      :Kontur
 STR_SMALLMAP_TYPE_VEHICLES                                      :Kendaraan
@@ -323,12 +313,13 @@ STR_SORT_CRITERIA_TIP                                           :{BLACK}Pilih kr
 STR_FILTER_CRITERIA_TIP                                         :{BLACK}Pilih kriteria
 STR_SORT_BY                                                     :{BLACK}Urutkan
 
+### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}Populasi
+STR_SORT_BY_NAME                                                :{BLACK}Nama
+STR_SORT_BY_DATE                                                :{BLACK}Tanggal
 STR_SORT_BY_PRODUCTION                                          :Produksi
 STR_SORT_BY_TYPE                                                :Jenis
 STR_SORT_BY_TRANSPORTED                                         :Terkirim
-STR_SORT_BY_NAME                                                :{BLACK}Nama
-STR_SORT_BY_DATE                                                :{BLACK}Tanggal
 STR_SORT_BY_NUMBER                                              :Nomer
 STR_SORT_BY_PROFIT_LAST_YEAR                                    :Keuntungan tahun lalu
 STR_SORT_BY_PROFIT_THIS_YEAR                                    :Keuntungan Tahun Ini
@@ -351,6 +342,7 @@ STR_SORT_BY_INTRO_DATE                                          :Tanggal Peluncu
 STR_SORT_BY_RUNNING_COST                                        :Biaya Operasional
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :Daya/Biaya Ops.
 STR_SORT_BY_CARGO_CAPACITY                                      :Kapasitas kargo
+
 STR_NO_WAITING_CARGO                                            :{BLACK}Tidak ada barang yang sedang menunggu
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}Pilih semua fasilitas
 STR_SELECT_ALL_TYPES                                            :{BLACK}Pilih semua jenis kargo (termasuk kargo tanpa jeda)
@@ -370,21 +362,6 @@ STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Kirim ke depo
 STR_SEND_SHIP_TO_DEPOT                                          :Kirim ke Galangan
 STR_SEND_AIRCRAFT_TO_HANGAR                                     :Kirim ke 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                                            :Mei
-STR_MONTH_ABBREV_JUN                                            :Jun
-STR_MONTH_ABBREV_JUL                                            :Jul
-STR_MONTH_ABBREV_AUG                                            :Agt
-STR_MONTH_ABBREV_SEP                                            :Sep
-STR_MONTH_ABBREV_OCT                                            :Okt
-STR_MONTH_ABBREV_NOV                                            :Nop
-STR_MONTH_ABBREV_DEC                                            :Des
-############ 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}{STRING}-
@@ -411,8 +388,6 @@ 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_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
@@ -459,7 +434,7 @@ STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Kosong
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Nama
 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                                          :1
 STR_ORDINAL_NUMBER_2ND                                          :2
 STR_ORDINAL_NUMBER_3RD                                          :3
@@ -493,6 +468,34 @@ STR_ORDINAL_NUMBER_30TH                                         :30
 STR_ORDINAL_NUMBER_31ST                                         :31
 ############ 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                                            :Mei
+STR_MONTH_ABBREV_JUN                                            :Jun
+STR_MONTH_ABBREV_JUL                                            :Jul
+STR_MONTH_ABBREV_AUG                                            :Agt
+STR_MONTH_ABBREV_SEP                                            :Sep
+STR_MONTH_ABBREV_OCT                                            :Okt
+STR_MONTH_ABBREV_NOV                                            :Nop
+STR_MONTH_ABBREV_DEC                                            :Des
+
+STR_MONTH_JAN                                                   :Januari
+STR_MONTH_FEB                                                   :Februari
+STR_MONTH_MAR                                                   :Maret
+STR_MONTH_APR                                                   :April
+STR_MONTH_MAY                                                   :Mei
+STR_MONTH_JUN                                                   :Juni
+STR_MONTH_JUL                                                   :Juli
+STR_MONTH_AUG                                                   :Agustus
+STR_MONTH_SEP                                                   :September
+STR_MONTH_OCT                                                   :Oktober
+STR_MONTH_NOV                                                   :November
+STR_MONTH_DEC                                                   :Desember
+############ range for months ends
+
 STR_GRAPH_Y_LABEL_NUMBER                                        :{TINYFONT}{COMMA}
 
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}Muatan diterima: {LTBLUE}
@@ -582,12 +585,9 @@ 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_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_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
@@ -669,9 +669,7 @@ STR_OFF                                                         :Mati
 STR_SUMMARY                                                     :Ringkasan
 STR_FULL                                                        :Penuh
 STR_STATUSBAR_COMPANY_NAME                                      :{SILVER}- -  {COMPANY}  - -
-STR_BLACK_STRING                                                :{BLACK}{STRING}
 
-STR_JUST_CHECKMARK                                              :{CHECKMARK}
 ############ range for menu starts
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Pengaturan permainan
 STR_SETTINGS_MENU_DIFFICULTY_SETTINGS                           :Pengaturan tingkat kesulitan
@@ -776,9 +774,6 @@ 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_BLACK_6                                                     :{BLACK}6
-STR_BLACK_7                                                     :{BLACK}7
-
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Inggris (Orisinil)
 STR_TOWNNAME_FRENCH                                             :Perancis
@@ -858,19 +853,6 @@ STR_OPTIONS_BASE_GRF_DESCRIPTION_TIP                            :{BLACK}Informas
 
 STR_AUTOSAVE_FAILED                                             :{WHITE}Simpan otomatis gagal
 
-STR_MONTH_JAN                                                   :Januari
-STR_MONTH_FEB                                                   :Februari
-STR_MONTH_MAR                                                   :Maret
-STR_MONTH_APR                                                   :April
-STR_MONTH_MAY                                                   :Mei
-STR_MONTH_JUN                                                   :Juni
-STR_MONTH_JUL                                                   :Juli
-STR_MONTH_AUG                                                   :Agustus
-STR_MONTH_SEP                                                   :September
-STR_MONTH_OCT                                                   :Oktober
-STR_MONTH_NOV                                                   :November
-STR_MONTH_DEC                                                   :Desember
-
 STR_HEADING_FOR_STATION                                         :{LTBLUE}Menuju ke {STATION}
 STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}Menuju ke {STATION}, {VELOCITY}
 STR_NO_ORDERS                                                   :{LTBLUE}Belum ada perintah
@@ -885,8 +867,6 @@ STR_CRATES                                                      :peti
 STR_RES_OTHER                                                   :lainnya
 STR_NOTHING                                                     :
 
-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...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Akhir Perintah Bersama - -
@@ -1158,7 +1138,6 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Ukuran
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :Non-aktifkan
-STR_JUST_CURRENCY                                               :{CURRENCY}
 STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Ganti nilai tetapan
 
 STR_TEMPERATE_LANDSCAPE                                         :Lansekap 'sederhana'
@@ -2124,8 +2103,6 @@ STR_NUM_LOW                                                     :Sedikit
 STR_NUM_NORMAL                                                  :Normal
 STR_NUM_HIGH                                                    :Padat
 STR_NUM_CUSTOM                                                  :Bebas
-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
@@ -2806,7 +2783,6 @@ 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_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})
@@ -3472,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}
@@ -3490,6 +3469,31 @@ STR_FORMAT_COMPANY_NUM                                          :(Perusahaan {CO
 STR_FORMAT_GROUP_NAME                                           :Kelompok {COMMA}
 STR_FORMAT_INDUSTRY_NAME                                        :{1:STRING} {0:TOWN}
 
+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}Nama haruslah unik
 
 #### Improved sign GUI
diff --git a/src/lang/italian.txt b/src/lang/italian.txt
index 2bb6b2d53..2339fbd40 100644
--- a/src/lang/italian.txt
+++ b/src/lang/italian.txt
@@ -156,8 +156,6 @@ STR_ABBREV_PLASTIC                                              :{TINYFONT}PL
 STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}BF
 STR_ABBREV_NONE                                                 :{TINYFONT}NO
 STR_ABBREV_ALL                                                  :{TINYFONT}TUT
-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
@@ -169,17 +167,11 @@ STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Copyrigh
 STR_ABOUT_VERSION                                               :{BLACK}OpenTTD versione {REV}
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 Il team OpenTTD
 
-STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
-STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_QUIT_CAPTION                                                :{WHITE}Esci
 STR_YES                                                         :{BLACK}Sì
 STR_NO                                                          :{BLACK}No
 STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Si è sicuri di voler uscire da OpenTTD e tornare a {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                                                :Nulla
 STR_COLOUR_DARK_BLUE                                            :Blu scuro
 STR_COLOUR_PALE_GREEN                                           :Verde chiaro
@@ -198,8 +190,6 @@ STR_COLOUR_BROWN                                                :Marrone
 STR_COLOUR_GREY                                                 :Grigio
 STR_COLOUR_WHITE                                                :Bianco
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}Troppi veicoli nel gioco
-STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
-STR_RED_COMMA                                                   :{RED}{COMMA}
 STR_BUTTON_LOCATION                                             :{BLACK}Posizione
 STR_SMALLMAP_TYPE_CONTOURS                                      :Territorio
 STR_SMALLMAP_TYPE_VEHICLES                                      :Veicoli
@@ -325,12 +315,13 @@ STR_SORT_CRITERIA_TIP                                           :{BLACK}Selezion
 STR_FILTER_CRITERIA_TIP                                         :{BLACK}Seleziona il criterio di filtraggio
 STR_SORT_BY                                                     :{BLACK}Ordina per
 
+### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}Popolazione
+STR_SORT_BY_NAME                                                :{BLACK}Nome
+STR_SORT_BY_DATE                                                :{BLACK}Data
 STR_SORT_BY_PRODUCTION                                          :Produzione
 STR_SORT_BY_TYPE                                                :Tipo
 STR_SORT_BY_TRANSPORTED                                         :Trasportato
-STR_SORT_BY_NAME                                                :{BLACK}Nome
-STR_SORT_BY_DATE                                                :{BLACK}Data
 STR_SORT_BY_NUMBER                                              :Numero
 STR_SORT_BY_PROFIT_LAST_YEAR                                    :Profitto dell'anno scorso
 STR_SORT_BY_PROFIT_THIS_YEAR                                    :Profitto di quest'anno
@@ -353,6 +344,7 @@ STR_SORT_BY_INTRO_DATE                                          :Data introduzio
 STR_SORT_BY_RUNNING_COST                                        :Costo d'esercizio
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :Potenza / Costo d'esercizio
 STR_SORT_BY_CARGO_CAPACITY                                      :Capacità di carico
+
 STR_NO_WAITING_CARGO                                            :{BLACK}Non c'è nessun tipo di merce in attesa
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}Seleziona tuti i fabbricati
 STR_SELECT_ALL_TYPES                                            :{BLACK}Seleziona tutti i tipi di merce (comprese le merci non in attesa)
@@ -372,21 +364,6 @@ STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Manda al deposi
 STR_SEND_SHIP_TO_DEPOT                                          :Manda al deposito
 STR_SEND_AIRCRAFT_TO_HANGAR                                     :Manda all'hangar
 
-############ range for months starts
-STR_MONTH_ABBREV_JAN                                            :Gen
-STR_MONTH_ABBREV_FEB                                            :Feb
-STR_MONTH_ABBREV_MAR                                            :Mar
-STR_MONTH_ABBREV_APR                                            :Apr
-STR_MONTH_ABBREV_MAY                                            :Mag
-STR_MONTH_ABBREV_JUN                                            :Giu
-STR_MONTH_ABBREV_JUL                                            :Lug
-STR_MONTH_ABBREV_AUG                                            :Ago
-STR_MONTH_ABBREV_SEP                                            :Set
-STR_MONTH_ABBREV_OCT                                            :Ott
-STR_MONTH_ABBREV_NOV                                            :Nov
-STR_MONTH_ABBREV_DEC                                            :Dic
-############ 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}{STRING}-
@@ -413,8 +390,6 @@ 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_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
@@ -461,7 +436,7 @@ STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Nessuno
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Nome
 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                                          :1
 STR_ORDINAL_NUMBER_2ND                                          :2
 STR_ORDINAL_NUMBER_3RD                                          :3
@@ -495,6 +470,34 @@ STR_ORDINAL_NUMBER_30TH                                         :30
 STR_ORDINAL_NUMBER_31ST                                         :31
 ############ range for days ends
 
+############ range for months starts
+STR_MONTH_ABBREV_JAN                                            :Gen
+STR_MONTH_ABBREV_FEB                                            :Feb
+STR_MONTH_ABBREV_MAR                                            :Mar
+STR_MONTH_ABBREV_APR                                            :Apr
+STR_MONTH_ABBREV_MAY                                            :Mag
+STR_MONTH_ABBREV_JUN                                            :Giu
+STR_MONTH_ABBREV_JUL                                            :Lug
+STR_MONTH_ABBREV_AUG                                            :Ago
+STR_MONTH_ABBREV_SEP                                            :Set
+STR_MONTH_ABBREV_OCT                                            :Ott
+STR_MONTH_ABBREV_NOV                                            :Nov
+STR_MONTH_ABBREV_DEC                                            :Dic
+
+STR_MONTH_JAN                                                   :Gennaio
+STR_MONTH_FEB                                                   :Febbraio
+STR_MONTH_MAR                                                   :Marzo
+STR_MONTH_APR                                                   :Aprile
+STR_MONTH_MAY                                                   :Maggio
+STR_MONTH_JUN                                                   :Giugno
+STR_MONTH_JUL                                                   :Luglio
+STR_MONTH_AUG                                                   :Agosto
+STR_MONTH_SEP                                                   :Settembre
+STR_MONTH_OCT                                                   :Ottobre
+STR_MONTH_NOV                                                   :Novembre
+STR_MONTH_DEC                                                   :Dicembre
+############ range for months ends
+
 STR_GRAPH_Y_LABEL_NUMBER                                        :{TINYFONT}{COMMA}
 
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}Merce accettata: {LTBLUE}
@@ -584,12 +587,9 @@ 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_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_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
@@ -671,9 +671,7 @@ STR_OFF                                                         :No
 STR_SUMMARY                                                     :Sommario
 STR_FULL                                                        :Completo
 STR_STATUSBAR_COMPANY_NAME                                      :{SILVER}- -  {COMPANY}  - -
-STR_BLACK_STRING                                                :{BLACK}{STRING}
 
-STR_JUST_CHECKMARK                                              :{CHECKMARK}
 ############ range for menu starts
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Opzioni gioco
 STR_SETTINGS_MENU_DIFFICULTY_SETTINGS                           :Impostazioni difficoltà
@@ -778,9 +776,6 @@ 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_BLACK_6                                                     :{BLACK}6
-STR_BLACK_7                                                     :{BLACK}7
-
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Inglesi (originali)
 STR_TOWNNAME_FRENCH                                             :Francesi
@@ -860,19 +855,6 @@ STR_OPTIONS_BASE_GRF_DESCRIPTION_TIP                            :{BLACK}Informaz
 
 STR_AUTOSAVE_FAILED                                             :{WHITE}Salvataggio automatico fallito
 
-STR_MONTH_JAN                                                   :Gennaio
-STR_MONTH_FEB                                                   :Febbraio
-STR_MONTH_MAR                                                   :Marzo
-STR_MONTH_APR                                                   :Aprile
-STR_MONTH_MAY                                                   :Maggio
-STR_MONTH_JUN                                                   :Giugno
-STR_MONTH_JUL                                                   :Luglio
-STR_MONTH_AUG                                                   :Agosto
-STR_MONTH_SEP                                                   :Settembre
-STR_MONTH_OCT                                                   :Ottobre
-STR_MONTH_NOV                                                   :Novembre
-STR_MONTH_DEC                                                   :Dicembre
-
 STR_HEADING_FOR_STATION                                         :{LTBLUE}Diretto a {STATION}
 STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}Diretto a {STATION}, {VELOCITY}
 STR_NO_ORDERS                                                   :{LTBLUE}Nessun ordine
@@ -887,8 +869,6 @@ STR_CRATES                                                      :casse
 STR_RES_OTHER                                                   :Altra
 STR_NOTHING                                                     :
 
-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...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Fine degli ordini condivisi - -
@@ -1160,7 +1140,6 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Dimensi
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :disabilitato
-STR_JUST_CURRENCY                                               :{CURRENCY}
 STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Cambia impostazione
 
 STR_TEMPERATE_LANDSCAPE                                         :Paesaggio 'temperato'
@@ -2126,8 +2105,6 @@ STR_NUM_LOW                                                     :Basso
 STR_NUM_NORMAL                                                  :Normale
 STR_NUM_HIGH                                                    :Alto
 STR_NUM_CUSTOM                                                  :Personalizzati
-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
@@ -2808,7 +2785,6 @@ 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_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})
@@ -3474,7 +3450,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 +3471,31 @@ STR_FORMAT_COMPANY_NUM                                          :(Compagnia {COM
 STR_FORMAT_GROUP_NAME                                           :Gruppo {COMMA}
 STR_FORMAT_INDUSTRY_NAME                                        :{1:STRING} di {0:TOWN}
 
+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}Il nome deve essere univoco
 
 #### Improved sign GUI
diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt
index 73eab73a6..0a4418fd5 100644
--- a/src/lang/japanese.txt
+++ b/src/lang/japanese.txt
@@ -154,8 +154,6 @@ STR_ABBREV_PLASTIC                                              :{TINYFONT}プ
 STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}ソ
 STR_ABBREV_NONE                                                 :{TINYFONT}無
 STR_ABBREV_ALL                                                  :{TINYFONT}全
-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}メッセージ
@@ -167,17 +165,11 @@ STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}オリ�
 STR_ABOUT_VERSION                                               :{BLACK}OpenTTD バージョン {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}終了
 STR_YES                                                         :{BLACK}はい
 STR_NO                                                          :{BLACK}いいえ
 STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}このゲームを終了して、{}{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                                                :なし
 STR_COLOUR_DARK_BLUE                                            :紺青色
 STR_COLOUR_PALE_GREEN                                           :薄緑色
@@ -196,8 +188,6 @@ STR_COLOUR_BROWN                                                :茶色
 STR_COLOUR_GREY                                                 :灰色
 STR_COLOUR_WHITE                                                :白色
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}ゲームの車両数の制限を超えています
-STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
-STR_RED_COMMA                                                   :{RED}{COMMA}
 STR_BUTTON_LOCATION                                             :{BLACK}見つける
 STR_SMALLMAP_TYPE_CONTOURS                                      :地形
 STR_SMALLMAP_TYPE_VEHICLES                                      :車両
@@ -322,12 +312,13 @@ STR_SORT_ORDER_TIP                                              :{BLACK}並べ�
 STR_SORT_CRITERIA_TIP                                           :{BLACK}並べ替えの基準を選択
 STR_SORT_BY                                                     :{BLACK}並べ替え
 
+### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}人口
+STR_SORT_BY_NAME                                                :{BLACK}名前
+STR_SORT_BY_DATE                                                :{BLACK}日付
 STR_SORT_BY_PRODUCTION                                          :生産量
 STR_SORT_BY_TYPE                                                :種類
 STR_SORT_BY_TRANSPORTED                                         :運送済み
-STR_SORT_BY_NAME                                                :{BLACK}名前
-STR_SORT_BY_DATE                                                :{BLACK}日付
 STR_SORT_BY_NUMBER                                              :番号
 STR_SORT_BY_PROFIT_LAST_YEAR                                    :昨年の損益
 STR_SORT_BY_PROFIT_THIS_YEAR                                    :今年の損益
@@ -348,37 +339,25 @@ STR_SORT_BY_INTRO_DATE                                          :登場日付
 STR_SORT_BY_RUNNING_COST                                        :運転費
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :出力／運転費
 STR_SORT_BY_CARGO_CAPACITY                                      :貨物容量
+
 STR_NO_WAITING_CARGO                                            :{BLACK}到着待ちの貨物がありません
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}すべての駅を選択
 STR_SELECT_ALL_TYPES                                            :{BLACK}すべての貨物種類を選択（到着待たぬ貨物も含む）
-STR_AVAILABLE_TRAINS                                            :{BLACK}購入可能な列車
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}購入可能な道路車両
-STR_AVAILABLE_SHIPS                                             :{BLACK}購入可能な船舶
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}購入可能な飛行機
 STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}この車両種類のデザインのリストを表示します
 STR_MANAGE_LIST                                                 :{BLACK}リストを管理
 STR_MANAGE_LIST_TIP                                             :{BLACK}リスト内のすべての車両へこの指令を送信
 STR_REPLACE_VEHICLES                                            :車両を交換
+STR_SEND_FOR_SERVICING                                          :修理へ回送
+
+STR_AVAILABLE_TRAINS                                            :{BLACK}購入可能な列車
+STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}購入可能な道路車両
+STR_AVAILABLE_SHIPS                                             :{BLACK}購入可能な船舶
+STR_AVAILABLE_AIRCRAFT                                          :{BLACK}購入可能な飛行機
+
 STR_SEND_TRAIN_TO_DEPOT                                         :電車庫へ回送
 STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :車庫へ回送
 STR_SEND_SHIP_TO_DEPOT                                          :造船所へ回送
 STR_SEND_AIRCRAFT_TO_HANGAR                                     :格納庫へ回送
-STR_SEND_FOR_SERVICING                                          :修理へ回送
-
-############ range for months starts
-STR_MONTH_ABBREV_JAN                                            :1月
-STR_MONTH_ABBREV_FEB                                            :2月
-STR_MONTH_ABBREV_MAR                                            :3月
-STR_MONTH_ABBREV_APR                                            :4月
-STR_MONTH_ABBREV_MAY                                            :5月
-STR_MONTH_ABBREV_JUN                                            :6月
-STR_MONTH_ABBREV_JUL                                            :7月
-STR_MONTH_ABBREV_AUG                                            :8月
-STR_MONTH_ABBREV_SEP                                            :9月
-STR_MONTH_ABBREV_OCT                                            :10月
-STR_MONTH_ABBREV_NOV                                            :11月
-STR_MONTH_ABBREV_DEC                                            :12月
-############ range for months ends
 
 STR_GRAPH_X_LABEL_MONTH                                         :{TINYFONT}{STRING}{} {STRING}
 STR_GRAPH_X_LABEL_MONTH_YEAR                                    :{TINYFONT}{STRING}{} {STRING}{}{NUM}
@@ -406,8 +385,6 @@ 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_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}ウィンドウのタイトル - ウィンドウを動かすには、クリックしてドラッグします
@@ -453,7 +430,7 @@ STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :なし
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}名称
 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                                          :1日
 STR_ORDINAL_NUMBER_2ND                                          :2日
 STR_ORDINAL_NUMBER_3RD                                          :3日
@@ -487,6 +464,34 @@ STR_ORDINAL_NUMBER_30TH                                         :30日
 STR_ORDINAL_NUMBER_31ST                                         :31日
 ############ range for days ends
 
+############ range for months starts
+STR_MONTH_ABBREV_JAN                                            :1月
+STR_MONTH_ABBREV_FEB                                            :2月
+STR_MONTH_ABBREV_MAR                                            :3月
+STR_MONTH_ABBREV_APR                                            :4月
+STR_MONTH_ABBREV_MAY                                            :5月
+STR_MONTH_ABBREV_JUN                                            :6月
+STR_MONTH_ABBREV_JUL                                            :7月
+STR_MONTH_ABBREV_AUG                                            :8月
+STR_MONTH_ABBREV_SEP                                            :9月
+STR_MONTH_ABBREV_OCT                                            :10月
+STR_MONTH_ABBREV_NOV                                            :11月
+STR_MONTH_ABBREV_DEC                                            :12月
+
+STR_MONTH_JAN                                                   :1月
+STR_MONTH_FEB                                                   :2月
+STR_MONTH_MAR                                                   :3月
+STR_MONTH_APR                                                   :4月
+STR_MONTH_MAY                                                   :5月
+STR_MONTH_JUN                                                   :6月
+STR_MONTH_JUL                                                   :７月
+STR_MONTH_AUG                                                   :8月
+STR_MONTH_SEP                                                   :9月
+STR_MONTH_OCT                                                   :10月
+STR_MONTH_NOV                                                   :11月
+STR_MONTH_DEC                                                   :12月
+############ range for months ends
+
 STR_GRAPH_Y_LABEL_NUMBER                                        :{TINYFONT}{COMMA}
 
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}受入れる貨物：{LTBLUE}
@@ -576,12 +581,9 @@ 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_COMMA                                                  :{BLUE}{COMMA}
 STR_SCENEDIT_TOOLBAR_OPENTTD                                    :{YELLOW}OpenTTD
 STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR                            :{YELLOW}シナリオエディタ
 STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION                   :{WHITE}地形の作成
-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}ランダムな地形を作成します
@@ -663,9 +665,7 @@ STR_OFF                                                         :切
 STR_SUMMARY                                                     :概要
 STR_FULL                                                        :完全
 STR_STATUSBAR_COMPANY_NAME                                      :{SILVER}- -  {COMPANY}  - -
-STR_BLACK_STRING                                                :{BLACK}{STRING}
 
-STR_JUST_CHECKMARK                                              :{CHECKMARK}
 ############ range for menu starts
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :ゲームの基本設定
 STR_SETTINGS_MENU_DIFFICULTY_SETTINGS                           :難易度の設定
@@ -757,9 +757,6 @@ STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY                             :新規産業の
 ############ range ends here
 
 STR_FUND_INDUSTRY_CAPTION                                       :{WHITE}新規産業の建設を出資
-STR_JUST_STRING                                                 :{STRING}
-STR_JUST_RAW_STRING                                             :{STRING}
-STR_JUST_INT                                                    :{NUM}
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_RAINFOREST                       :{WHITE}...雨林地域のみに建設できます
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT                           :{WHITE}...砂漠地域のみに建設できます
 STR_STATUSBAR_PAUSED                                            :{YELLOW}＊＊ポーズ＊＊
@@ -773,9 +770,6 @@ STR_STATUSBAR_SAVING_GAME                                       :{RED}＊＊ゲ�
 STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}ゲームを保存しています{}完了してからしばらくお待ちください！
 STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE                       :{BLACK}'Ezy Street 式の音楽'のプレイリストを選択します
 
-STR_BLACK_6                                                     :{BLACK}6
-STR_BLACK_7                                                     :{BLACK}7
-
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :イギリス
 STR_TOWNNAME_FRENCH                                             :フランス
@@ -854,19 +848,6 @@ STR_OPTIONS_BASE_GRF_DESCRIPTION_TIP                            :{BLACK}ベー�
 
 STR_AUTOSAVE_FAILED                                             :{WHITE}自動保存に失敗しました
 
-STR_MONTH_JAN                                                   :1月
-STR_MONTH_FEB                                                   :2月
-STR_MONTH_MAR                                                   :3月
-STR_MONTH_APR                                                   :4月
-STR_MONTH_MAY                                                   :5月
-STR_MONTH_JUN                                                   :6月
-STR_MONTH_JUL                                                   :７月
-STR_MONTH_AUG                                                   :8月
-STR_MONTH_SEP                                                   :9月
-STR_MONTH_OCT                                                   :10月
-STR_MONTH_NOV                                                   :11月
-STR_MONTH_DEC                                                   :12月
-
 STR_HEADING_FOR_STATION                                         :{LTBLUE}{STATION}へ行く
 STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}{STATION}へ行く、{VELOCITY}
 STR_NO_ORDERS                                                   :{LTBLUE}指令なし
@@ -881,8 +862,6 @@ STR_CRATES                                                      :箱
 STR_RES_OTHER                                                   :その他
 STR_NOTHING                                                     :
 
-STR_TINY_RIGHT_ARROW                                            :{TINYFONT}{RIGHTARROW}
-
 STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}指令リストを共有できません...
 STR_CANT_COPY_ORDER_LIST                                        :{WHITE}指令リストをコピーできません...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - 共有指令の終了- -
@@ -1137,7 +1116,6 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}地図�
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :切
-STR_JUST_CURRENCY                                               :{CURRENCY}
 STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}設定を変更します
 
 STR_TEMPERATE_LANDSCAPE                                         :温帯国
@@ -1173,7 +1151,6 @@ STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}通過�
 
 STR_WAYPOINT_VIEWPORT                                           :{WHITE}{WAYPOINT}
 STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WHITE}{WAYPOINT}
-STR_WAYPOINT_NAME                                               :{WAYPOINT}
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}通過点名を変更
 
 STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}通過点名を変更できません...
@@ -1239,11 +1216,6 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}産業�
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...他の産業に近すぎます。
 
-STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}他の貨物種類を運送するに列車を再装備
-STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}列車を再装備
-STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}列車が運送する貨物を選択
-STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}選択した貨物種類に再装備
-STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}列車が再装備できません...
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}生産量を変更
 
 ############ network gui strings
@@ -1753,11 +1725,6 @@ STR_TOWN_BUILDING_NAME_TEPEES_1                                 :テント
 STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1                           :茶瓶小屋
 STR_TOWN_BUILDING_NAME_PIGGY_BANK_1                             :ブタ型貯金箱
 
-STR_INDUSTRY_NAME                                               :{INDUSTRY}
-STR_TOWN_NAME                                                   :{TOWN}
-STR_FORMAT_INDUSTRY_NAME                                        :{TOWN}{STRING}
-STR_STATION_NAME                                                :{STATION}
-
 ##id 0x2800
 STR_LANDSCAPING_MENU_LANDSCAPING                                :地形
 STR_LANDSCAPING_MENU_PLANT_TREES                                :木を植林
@@ -1812,6 +1779,12 @@ STR_CARGO_RATING_EXCELLENT                                      :すばらしい
 STR_CARGO_RATING_OUTSTANDING                                    :最高
 ############ range for rating ends
 
+### station view strings
+STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}この駅が指令リストに入っているすべての列車を表示します
+STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}このバス停／荷役所が指令リストに入っているすべての道路車両を表示します
+STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}この空港が指令リストに入っているすべての飛行機を表示します
+STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}この埠頭が指令リストに入っているすべての船舶を表示します
+
 STR_STATION_VIEW_CARGO_RATING                                   :{WHITE}{STRING}：{YELLOW}{STRING}（{COMMA}％）
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO                        :{WHITE}{STATION}は今後{STRING}を受入れません
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO               :{WHITE}{STATION}は今後{STRING}と{STRING}を受入れません
@@ -2055,6 +2028,7 @@ STR_SV_STNAME_AIRPORT                                           :{STRING}空港
 STR_SV_STNAME_OILFIELD                                          :{STRING}油田
 STR_SV_STNAME_MINES                                             :{STRING}山
 STR_SV_STNAME_DOCKS                                             :{STRING}埠頭
+##id 0x6020
 STR_SV_STNAME_ANNEXE                                            :新{STRING}
 STR_SV_STNAME_SIDINGS                                           :{STRING}里
 STR_SV_STNAME_BRANCH                                            :{STRING}寺
@@ -2102,8 +2076,6 @@ STR_NUM_LOW                                                     :低い
 STR_NUM_NORMAL                                                  :通常
 STR_NUM_HIGH                                                    :高い
 STR_NUM_CUSTOM                                                  :カスタム
-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                                             :中位
@@ -2137,7 +2109,6 @@ STR_CITY_APPROVAL_HOSTILE                                       :対立
 
 ##id 0x7000
 STR_COMPANY_VIEW_CAPTION                                        :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
-STR_FORMAT_COMPANY_NUM                                          :（会社 {COMMA}）
 STR_COMPANY_VIEW_NEW_FACE_BUTTON                                :{BLACK}新規顔
 STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON                           :{BLACK}カラースキーム
 STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}カラースキーム：
@@ -2170,7 +2141,6 @@ STR_FINANCES_TOTAL_CAPTION                                      :{WHITE}合計�
 STR_COMPANY_NAME_COMPANY_NUM                                    :{COMPANY} {COMPANYNUM}
 STR_GRAPH_INCOME_CAPTION                                        :{WHITE}損益グラフ
 STR_CURRCOMPACT                                                 :{CURRCOMPACT}
-STR_JUST_COMMA                                                  :{COMMA}
 STR_GRAPH_OPERATING_PROFIT_CAPTION                              :{WHITE}営業利益グラフ
 STR_FINANCES_BANK_BALANCE_TITLE                                 :{WHITE}残額
 STR_FINANCES_LOAN_TITLE                                         :{WHITE}借入金
@@ -2572,10 +2542,8 @@ STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE                          :モノレール
 STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE                            :磁気浮上式鉄道車両
 
 ##id 0x8800
-STR_DEPOT_TRAIN_CAPTION                                         :{WHITE}{TOWN}電車庫
 STR_NEWS_FIRST_TRAIN_ARRIVAL                                    :{BLACK}{BIGFONT}町民の祝賀{}初列車が{STATION}駅に到着！
 STR_VEHICLE_DETAILS_CAPTION                                     :{WHITE}{VEHICLE}（詳細）
-STR_ERROR_TRAIN_IN_THE_WAY                                      :{WHITE}列車があります
 STR_ORDER                                                       :{SETX 10}{COMMA}：{SETX 30}{STRING} {STRING}
 STR_ORDER_SELECTED                                              :{RIGHTARROW}{SETX 10}{COMMA}：{SETX 30}{STRING} {STRING}
 STR_ORDER_NON_STOP                                              :{BLACK}直行便
@@ -2653,38 +2621,16 @@ STR_TIMETABLE_STAY_FOR                                          :{STRING}停車
 STR_TIMETABLE_DAYS                                              :{COMMA}日間
 STR_TIMETABLE_TICKS                                             :{COMMA}ティック
 
-STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}{TOWN}電車庫へ行く
-STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}{TOWN}電車庫へ行く、{VELOCITY}
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}{TOWN}電車庫で修理
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}{TOWN}電車庫で修理、{VELOCITY}
-
 STR_INVALID_ORDER                                               :{RED}（不正な指令）
 
 STR_UNKNOWN_STATION                                             :不明な駅
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}空
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO}（原点：{STATION}）
 STR_VEHICLE_DETAILS_CARGO_FROM_MULT                             :{LTBLUE}{CARGO}（原点：{STATION}）（x{NUM}）
-STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} は電車庫内に停車しています
-STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}新規車両
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}列車が長過ぎます
 STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}列車の変更は鉄道車庫内でのみ行えます
-STR_VEHICLE_LIST_TRAIN_CAPTION                                  :{WHITE}{STRING} - 列車{COMMA}本
 
-STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}新規鉄道車両
-STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}新規電動鉄道車両
-STR_BUILD_VEHICLE_TRAIN_MONORAIL_CAPTION                        :{WHITE}新規モノレール車両
-STR_BUILD_VEHICLE_TRAIN_MAGLEV_CAPTION                          :{WHITE}新規磁気浮上式鉄道車両
-STR_BUILD_VEHICLE_TRAIN_ALL_CAPTION                             :{WHITE}鉄道車両
-
-STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_BUTTON                    :{BLACK}車両を購入
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}道路車両をクローン
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}道路車両を複製します。Control+クリックすると、指令を共有します。
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}道路車両を複製します。このボタンをクリックして、他の車両をクリックします。車庫内でも車庫外でもかまいません。Control+クリックすると、指令を共有します。
-STR_CLONE_TRAIN                                                 :{BLACK}列車をクローン
-STR_CLONE_TRAIN_INFO                                            :{BLACK}すべての車両を含めて、この列車を複製します。Control+クリックすると、指令を共有します。
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}すべての車両を含めて、この列車を複製します。このボタンをクリックして、他の列車をクリックします。も電車庫内でも電車庫外でもかまいません。Control+クリックすると、指令を共有します。
-STR_BUILD_VEHICLE_TRAIN_RENAME_BUTTON                           :{BLACK}名称を変更
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}スキップ
 STR_ORDERS_DELETE_BUTTON                                        :{BLACK}削除
 STR_ORDERS_GO_TO_BUTTON                                         :{BLACK}駅を選択
@@ -2699,14 +2645,12 @@ STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}指令�
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE}（指令）
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - 指令終了 - -
 STR_SERVICE                                                     :{BLACK}修理
-STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}鉄道車両が購入できません...
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}　購入日付：{LTBLUE}{NUM}{BLACK}　価値：{LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}　価値：{LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
 STR_VEHICLE_STATUS_LOADING_UNLOADING                            :{LTBLUE}積み降ろし中
 STR_VEHICLE_STATUS_LEAVING                                      :{LTBLUE}出発中
 STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}列車は車庫に止めなければなりません
-STR_ERROR_CAN_T_SEND_TRAIN_TO_DEPOT                             :{WHITE}列車を電車庫へ回送できません...
 STR_ERROR_NO_MORE_SPACE_FOR_ORDERS                              :{WHITE}これ以上の指令を追加できません
 STR_ERROR_TOO_MANY_ORDERS                                       :{WHITE}指令が多すぎます
 STR_ERROR_CAN_T_INSERT_NEW_ORDER                                :{WHITE}新規指令を挿入できません...
@@ -2721,26 +2665,11 @@ STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE}命令�
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}この車輌を移動できません...
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}ダブルヘッドの場合、後部の機関車は常に前部の機関車について行きます
 STR_CARGO_N_A                                                   :N/A{SKIP}
-STR_ERROR_CAN_T_SELL_TRAIN                                      :{WHITE}鉄道車両を販売できません...
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}電車庫への経路が見つかりません
-STR_ERROR_CAN_T_STOP_START_TRAIN                                :{WHITE}列車が開始／停止できません...
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}補修間隔：{LTBLUE}{COMMA}日間{BLACK}  最新の補修：{LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}修理の間隔：{LTBLUE}{COMMA}％{BLACK}　最終の修理：{LTBLUE}{DATE_LONG}
-STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP                             :{BLACK}列車 - 情報を見るには列車をクリックします
-STR_DEPOT_TRAIN_LIST_TOOLTIP                                    :{BLACK}列車 - 情報を見るには列車をクリックします。車両を追加／取り除くにはドラッグします。
-STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP                            :{BLACK}新規鉄道車両を購入
-STR_DEPOT_TRAIN_SELL_TOOLTIP                                    :{BLACK}車両を売却するには、ここへドラッグします
-STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}メイン画面を鉄道車庫の場所に移動します
-STR_BUILD_VEHICLE_TRAIN_LIST_TOOLTIP                            :{BLACK}列車のリスト - 情報を見るには列車をクリックします
-STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_TOOLTIP                   :{BLACK}選択した車両を購入
-STR_BUILD_VEHICLE_TRAIN_RENAME_TOOLTIP                          :{BLACK}鉄道車両の名称を変更
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP                 :{BLACK}列車の現在の動作 - 始動／停止するにはここにクリックします
-STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP                           :{BLACK}列車の指令を表示します
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP                         :{BLACK}メイン画面を列車の場所に移動します
-STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP                    :{BLACK}列車を電車庫へ回送します。Control+クリックすすると、補修のみします。
 STR_VEHICLE_VIEW_TRAIN_IGNORE_SIGNAL_TOOLTIP                    :{BLACK}列車の続行を強制します(信号を無視します)
 STR_VEHICLE_VIEW_TRAIN_REVERSE_TOOLTIP                          :{BLACK}列車を逆転させます
-STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}列車の情報を表示します
 STR_VEHICLE_DETAILS_INCREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}補修間隔を増やす
 STR_VEHICLE_DETAILS_DECREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}補修間隔を減らす
 STR_VEHICLE_DETAILS_TRAIN_CARGO_TOOLTIP                         :{BLACK}運送している貨物の情報を表示します
@@ -2774,13 +2703,9 @@ STR_VEHICLE_STATUS_STOPPED                                      :{RED}停止中
 STR_ERROR_CAN_T_MAKE_TRAIN_PASS_SIGNAL                          :{WHITE}信号を無視して列車を進行させることができません...
 STR_VEHICLE_STATUS_CRASHED                                      :{RED}事故！
 
-STR_QUERY_RENAME_TRAIN_CAPTION                                  :{WHITE}列車に名前を付ける
-STR_ERROR_CAN_T_RENAME_TRAIN                                    :{WHITE}列車に名前を付けられません...
-STR_VEHICLE_DETAILS_TRAIN_RENAME                                :{BLACK}列車に名前を付ける
 STR_NEWS_TRAIN_CRASH                                            :{BLACK}{BIGFONT}列車事故！{}{COMMA}人が死亡
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}列車を逆転できません...
-STR_QUERY_RENAME_TRAIN_TYPE_CAPTION                             :{WHITE}鉄道車両の名称を変更
-STR_ERROR_CAN_T_RENAME_TRAIN_TYPE                               :{WHITE}鉄道車両の名称を変更できません...
+STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}多数の部分を含む車両が逆転できません
 STR_CLEAR_TIME                                                  :{BLACK}時間を消去
 STR_RESET_LATENESS                                              :{BLACK}遅刻回数をリセット
 STR_CHANGE_WAYPOINT_NAME                                        :{BLACK}通過点の名前を変更する
@@ -2811,177 +2736,52 @@ STR_TIMETABLE_TOTAL_TIME_INCOMPLETE                             :{BLACK}この�
 STR_TIMETABLE_AUTOFILL                                          :{BLACK}自動時刻
 
 ##id 0x9000
-STR_ERROR_ROAD_VEHICLE_IN_THE_WAY                               :{WHITE}道路車両があります
-STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING} - 道路車両{COMMA}両
-STR_DEPOT_ROAD_VEHICLE_CAPTION                                  :{WHITE}{TOWN}車庫
-STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_BUTTON                      :{BLACK}新規車両
-STR_BUILD_VEHICLE_ROAD_VEHICLE_CAPTION                          :{WHITE}新規道路車両
-STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_BUTTON             :{BLACK}車両を購入
-STR_ERROR_CAN_T_BUILD_ROAD_VEHICLE                              :{WHITE}道路車両が購入できません...
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}...車庫内に停止しなければなりません
-STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}道路車両を売却できません...
-STR_ERROR_CAN_T_STOP_START_ROAD_VEHICLE                         :{WHITE}道路車両を始動／停止できません...
-STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} は車庫で待機しています
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}{TOWN}車庫へ回送
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}{TOWN}車庫へ回送、{VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}{TOWN}車庫で修理
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}{TOWN}車庫で修理、{VELOCITY}
-STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}車両を車庫へ回送できません...
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}付近に車庫が見つかりません
-STR_VEHICLE_LIST_ROAD_VEHICLE_TOOLTIP                           :{BLACK}道路車両 - クリックして情報を表示します
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP          :{BLACK}車両の現在の動作 - 開始／停止するにはクリックします
-STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP                    :{BLACK}車両の指令を表示します
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP                  :{BLACK}主の画面を車両の場所に移動します
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}車両を車庫へ改装します。Control+クリックすると修理しか行いません。
 STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP                   :{BLACK}車両を逆転します
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}車両の情報を表示します
-STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}車両 - クリックして情報を表示します
-STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}新規道路車両を購入
-STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}販売するには道路車両をここへドラッグします
-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_JUST_CARGO                                                  :{CARGO}
 STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
 
-STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}道路車両を名付ける
-STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}道路車両が名付けません...
-STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}道路車両を名付ける
 STR_NEWS_FIRST_BUS_ARRIVAL                                      :{BLACK}{BIGFONT}町民の祝賀！{}初バスが{STATION}バス停に到着！
 STR_NEWS_FIRST_TRUCK_ARRIVAL                                    :{BLACK}{BIGFONT}町民の祝賀！{}初トラックが{STATION}荷役所に到着！
 STR_NEWS_FIRST_PASSENGER_TRAM_ARRIVAL                           :{BLACK}{BIGFONT}町民の祝賀{}初乗客用路面電車が{STATION}駅に到着！
 STR_NEWS_FIRST_CARGO_TRAM_ARRIVAL                               :{BLACK}{BIGFONT}町民の祝賀{}初貨物用路面電車が{STATION}駅に到着！
 STR_NEWS_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}交通事故！{}列車に衝突、運転者が死亡
 STR_NEWS_ROAD_VEHICLE_CRASH                                     :{BLACK}{BIGFONT}交通事故！{}列車に衝突、{COMMA}人が死亡
-STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}多数の部分を含む車両が逆転できません
-STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}名称変更
-STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}道路車両の名称を変更
-STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}道路車両の名称を変更
-STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}道路車両の名称を変更できません...
 
-STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}他の貨物の種類を運送するに道路車両を再装備します
-STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}道路車両を再装備
-STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}選択した貨物種類を運送するに道路車両を再装備します
-STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}道路車両が再装備できません...
-STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}運送する貨物種類を選択します
 
 ##id 0x9800
 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :水路を建設
 STR_WATERWAYS_TOOLBAR_CAPTION                                   :{WHITE}水路を建設
 STR_WATERWAYS_TOOLBAR_CAPTION_SE                                :{WHITE}水路
 STR_ERROR_CAN_T_BUILD_DOCK_HERE                                 :{WHITE}ここに埠頭を建設できません...
-STR_DEPOT_SHIP_CAPTION                                          :{WHITE}{TOWN}造船所
-STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON                              :{BLACK}新規船舶
-STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - 船舶{COMMA}隻
-STR_BUILD_VEHICLE_SHIP_CAPTION                                  :{WHITE}新規船舶
-STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON                     :{BLACK}船舶を購入
-STR_CLONE_SHIP                                                  :{BLACK}船舶をクローン
-STR_CLONE_SHIP_INFO                                             :{BLACK}船舶を複製します。Control+クリックすると、指令を共有します
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}船舶を複製します。このボタンをクリックして、造船所内および造船所外の船舶をクリックします。Control+クリックすると、指令を共有します
 STR_ERROR_SHIP_MUST_BE_STOPPED_IN_DEPOT                         :{WHITE}船舶は造船所内で停止しなければなりません
-STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}船舶が販売できません...
-STR_ERROR_CAN_T_BUILD_SHIP                                      :{WHITE}船舶が購入できません...
-STR_ERROR_SHIP_IN_THE_WAY                                       :{WHITE}船舶があります
-STR_ERROR_CAN_T_STOP_START_SHIP                                 :{WHITE}船舶を始動／停止できません...
-STR_ERROR_CAN_T_SEND_SHIP_TO_DEPOT                              :{WHITE}船舶を造船所へ回送できません...
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}{TOWN}造船所へ回送
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}{TOWN}造船所へ回送、{VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}{TOWN}造船所で修理
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}{TOWN}造船所で修理、{VELOCITY}
-STR_NEWS_SHIP_IS_WAITING                                        :{WHITE}{VEHICLE} は造船所で待機しています。
 STR_WATERWAYS_TOOLBAR_BUILD_DOCK_TOOLTIP                        :{BLACK}埠頭を建設します
 STR_WATERWAYS_TOOLBAR_BUILD_DEPOT_TOOLTIP                       :{BLACK}造船所を建設します（船舶の購入、修理などのため）
-STR_DEPOT_SHIP_LIST_TOOLTIP                                     :{BLACK}船舶のリスト - 情報を見るには船舶をクリックします
-STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}新規船舶を購入
-STR_DEPOT_SHIP_SELL_TOOLTIP                                     :{BLACK}販売するには船舶をここへドラッグします
-STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}メイン画面を造船所の場所に移動します
-STR_VEHICLE_LIST_SHIP_TOOLTIP                                   :{BLACK}船舶のリスト - 情報を見るには船舶をクリックします
-STR_BUILD_VEHICLE_SHIP_LIST_TOOLTIP                             :{BLACK}船舶のリスト - 情報を見るには船舶をクリックします
-STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP                    :{BLACK}選択した船舶を購入
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP                  :{BLACK}船舶の現在の動作 - 始動／停止するにはここへクリックします
-STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}船舶の指令を表示
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP                          :{BLACK}主の画面を船舶の場所に移動します
-STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}船舶を造船所へ回送します。Contorl+クリックすると修理のみをします
-STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}船舶の情報を表示
-STR_VEHICLE_DETAILS_SHIP_RENAME                                 :{BLACK}船舶を名付ける
 
-STR_QUERY_RENAME_SHIP_CAPTION                                   :{WHITE}船舶を名付ける
-STR_ERROR_CAN_T_RENAME_SHIP                                     :{WHITE}船舶が名付けられません...
 STR_NEWS_FIRST_SHIP_ARRIVAL                                     :{BLACK}{BIGFONT}町民の祝賀！{}初船舶が{STATION}に到着！
 STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}通過点として使えるブイを設置します
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}ここにブイを設置できません
 STR_BUILD_AQUEDUCT                                              :{BLACK}水路橋を建設
 STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}ここに水路橋を建設できません...
-STR_BUILD_VEHICLE_SHIP_RENAME_BUTTON                            :{BLACK}名称を変更
-STR_BUILD_VEHICLE_SHIP_RENAME_TOOLTIP                           :{BLACK}船舶名を変更
-STR_QUERY_RENAME_SHIP_TYPE_CAPTION                              :{WHITE}船舶の名称を変更
-STR_ERROR_CAN_T_RENAME_SHIP_TYPE                                :{WHITE}船舶の名称が変更できません...
-STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}他の種類の貨物を運送する為に貨物船を改装します
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE}(改装)
-STR_REFIT_SHIP_REFIT_BUTTON                                     :{BLACK}船舶を改装
-STR_REFIT_SHIP_LIST_TOOLTIP                                     :{BLACK}運送する貨物種類を選択します
-STR_REFIT_SHIP_REFIT_TOOLTIP                                    :{BLACK}選択した種類の貨物を運送する為に船舶を改装します
 STR_REFIT_TITLE                                                 :{GOLD}運送する貨物の種類を選択：
 STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}改装後の積載量：{GOLD}{CARGO}{}{BLACK}改装費用：{GOLD}{CURRENCY}
-STR_ERROR_CAN_T_REFIT_SHIP                                      :{WHITE}船舶を改装できません...
 STR_REFITTABLE                                                  :(改装可能)
 
 ##id 0xA000
 STR_TOOLBAR_AIRCRAFT_CAPTION                                    :{WHITE}空港
 STR_ERROR_CAN_T_BUILD_AIRPORT_HERE                              :{WHITE}ここに空港を建設できません...
-STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}{STATION}格納庫
-STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON                          :{BLACK}新規飛行機
-STR_CLONE_AIRCRAFT                                              :{BLACK}飛行機をクローン
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}飛行機を複製します。Control+クリックすると、指令リストを共有します。
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}飛行機を複製します。このボタンをクリックして、格納庫内および格納庫外の飛行機をクリックします。Control+クリックすると、指令リストを共有します。
-STR_BUILD_VEHICLE_AIRCRAFT_CAPTION                              :{WHITE}新規飛行機
-STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON                 :{BLACK}飛行機を購入
-STR_ERROR_CAN_T_BUILD_AIRCRAFT                                  :{WHITE}飛行機を購入できません...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - 飛行機{COMMA}台
-STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR                         :{WHITE}飛行機を格納庫へ回送できません...
-STR_HEADING_FOR_HANGAR                                          :{ORANGE}{STATION}格納庫へ行く
-STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}{STATION}格納庫へ行く、{VELOCITY}
-STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}{STATION}格納庫で修理
-STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}{STATION}格納庫で修理、{VELOCITY}
-STR_NEWS_AIRCRAFT_IS_WAITING                                    :{WHITE}{VEHICLE} は格納庫の中に待機しています。
-STR_ERROR_AIRCRAFT_IN_THE_WAY                                   :{WHITE}飛行機があります
-STR_ERROR_CAN_T_STOP_START_AIRCRAFT                             :{WHITE}飛行機が始動／停止できません...
 STR_ERROR_AIRCRAFT_IS_IN_FLIGHT                                 :{WHITE}飛行中です
 STR_ERROR_AIRCRAFT_MUST_BE_STOPPED                              :{WHITE}飛行機を格納庫内で停止しなければなりません
-STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}飛行機を売却できません...
 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION                          :空港の建設
 STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}空港を建設
-STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP                               :{BLACK}飛行機 - 情報を見るには飛行機をクリックします
-STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}飛行機 - 情報を見るには飛行機をクリックします
-STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}新規飛行機を購入
-STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}売却するには飛行機をここへドラッグします
-STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}メイン画面を格納庫の場所に移動します
-STR_BUILD_VEHICLE_AIRCRAFT_LIST_TOOLTIP                         :{BLACK}飛行機のリスト - 情報を見るには飛行機をクリックします
-STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_TOOLTIP                :{BLACK}選択した飛行機を購入
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP              :{BLACK}飛行機の現在の動作 - 始動／停止するにはここへクリックします
-STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}飛行機の指令を表示
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP                      :{BLACK}メイン画面を飛行機の場所に移動します
-STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}飛行機を格納庫へ回送します。Control+クリックすると修理のみします
-STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}飛行機の情報を表示
 
-STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}飛行機を名付ける
-STR_ERROR_CAN_T_RENAME_AIRCRAFT                                 :{WHITE}飛行機を名付けられません...
-STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}飛行機を名付ける
 STR_NEWS_FIRST_AIRCRAFT_ARRIVAL                                 :{BLACK}{BIGFONT}町民の祝賀！{}初飛行機が{STATION}に到着！
 STR_NEWS_AIRCRAFT_CRASH                                         :{BLACK}{BIGFONT}墜落事故！{}{COMMA}人が{STATION}で死亡
 STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}墜落事故！{}燃料切れ、{COMMA}人が死亡
 STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
-STR_BUILD_VEHICLE_AIRCRAFT_RENAME_BUTTON                        :{BLACK}名称を変更
-STR_BUILD_VEHICLE_AIRCRAFT_RENAME_TOOLTIP                       :{BLACK}飛行機の名称を変更
-STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION                          :{WHITE}飛行機の名称を変更
-STR_ERROR_CAN_T_RENAME_AIRCRAFT_TYPE                            :{WHITE}飛行機の名称を変更できません...
-STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}他の種類の貨物を運送する為に飛行機を改装
-STR_REFIT_AIRCRAFT_REFIT_BUTTON                                 :{BLACK}飛行機を改装
-STR_REFIT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}運送する貨物の種類を選択します
-STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}選択した種類の貨物を運送するために飛行機を改装
-STR_ERROR_CAN_T_REFIT_AIRCRAFT                                  :{WHITE}飛行機を改装できません...
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE}（時刻表）
 
@@ -3125,15 +2925,225 @@ STR_LORRY                                                       :{BLACK}{LORRY}
 STR_PLANE                                                       :{BLACK}{PLANE}
 STR_SHIP                                                        :{BLACK}{SHIP}
 
+############ Vehicle lists
+STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP                             :{BLACK}列車 - 情報を見るには列車をクリックします
+STR_VEHICLE_LIST_ROAD_VEHICLE_TOOLTIP                           :{BLACK}道路車両 - クリックして情報を表示します
+STR_VEHICLE_LIST_SHIP_TOOLTIP                                   :{BLACK}船舶のリスト - 情報を見るには船舶をクリックします
+STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP                               :{BLACK}飛行機 - 情報を見るには飛行機をクリックします
 
-STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}この駅が指令リストに入っているすべての列車を表示します
-STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}このバス停／荷役所が指令リストに入っているすべての道路車両を表示します
-STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}この空港が指令リストに入っているすべての飛行機を表示します
-STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}この埠頭が指令リストに入っているすべての船舶を表示します
+STR_VEHICLE_LIST_TRAIN_CAPTION                                  :{WHITE}{STRING} - 列車{COMMA}本
+STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING} - 道路車両{COMMA}両
+STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - 船舶{COMMA}隻
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - 飛行機{COMMA}台
 
 STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}{COMMA}台の車両の共有指令
 STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}この指令リストを共有しているすべての車両を表示します
 
+STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} は電車庫内に停車しています
+STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} は車庫で待機しています
+STR_NEWS_SHIP_IS_WAITING                                        :{WHITE}{VEHICLE} は造船所で待機しています。
+STR_NEWS_AIRCRAFT_IS_WAITING                                    :{WHITE}{VEHICLE} は格納庫の中に待機しています。
+
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}列車を再装備
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}道路車両を再装備
+STR_REFIT_SHIP_REFIT_BUTTON                                     :{BLACK}船舶を改装
+STR_REFIT_AIRCRAFT_REFIT_BUTTON                                 :{BLACK}飛行機を改装
+
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}選択した貨物種類に再装備
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}選択した貨物種類を運送するに道路車両を再装備します
+STR_REFIT_SHIP_REFIT_TOOLTIP                                    :{BLACK}選択した種類の貨物を運送する為に船舶を改装します
+STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}選択した種類の貨物を運送するために飛行機を改装
+
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}列車が運送する貨物を選択
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}運送する貨物種類を選択します
+STR_REFIT_SHIP_LIST_TOOLTIP                                     :{BLACK}運送する貨物種類を選択します
+STR_REFIT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}運送する貨物の種類を選択します
+
+STR_DEPOT_TRAIN_CAPTION                                         :{WHITE}{TOWN}電車庫
+STR_DEPOT_ROAD_VEHICLE_CAPTION                                  :{WHITE}{TOWN}車庫
+STR_DEPOT_SHIP_CAPTION                                          :{WHITE}{TOWN}造船所
+STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}{STATION}格納庫
+
+STR_VEHICLE_DETAILS_TRAIN_RENAME                                :{BLACK}列車に名前を付ける
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}道路車両を名付ける
+STR_VEHICLE_DETAILS_SHIP_RENAME                                 :{BLACK}船舶を名付ける
+STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}飛行機を名付ける
+
+STR_QUERY_RENAME_TRAIN_CAPTION                                  :{WHITE}列車に名前を付ける
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}道路車両を名付ける
+STR_QUERY_RENAME_SHIP_CAPTION                                   :{WHITE}船舶を名付ける
+STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}飛行機を名付ける
+
+STR_ERROR_TRAIN_IN_THE_WAY                                      :{WHITE}列車があります
+STR_ERROR_ROAD_VEHICLE_IN_THE_WAY                               :{WHITE}道路車両があります
+STR_ERROR_SHIP_IN_THE_WAY                                       :{WHITE}船舶があります
+STR_ERROR_AIRCRAFT_IN_THE_WAY                                   :{WHITE}飛行機があります
+
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}列車が再装備できません...
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}道路車両が再装備できません...
+STR_ERROR_CAN_T_REFIT_SHIP                                      :{WHITE}船舶を改装できません...
+STR_ERROR_CAN_T_REFIT_AIRCRAFT                                  :{WHITE}飛行機を改装できません...
+
+STR_ERROR_CAN_T_RENAME_TRAIN                                    :{WHITE}列車に名前を付けられません...
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}道路車両が名付けません...
+STR_ERROR_CAN_T_RENAME_SHIP                                     :{WHITE}船舶が名付けられません...
+STR_ERROR_CAN_T_RENAME_AIRCRAFT                                 :{WHITE}飛行機を名付けられません...
+
+STR_ERROR_CAN_T_STOP_START_TRAIN                                :{WHITE}列車が開始／停止できません...
+STR_ERROR_CAN_T_STOP_START_ROAD_VEHICLE                         :{WHITE}道路車両を始動／停止できません...
+STR_ERROR_CAN_T_STOP_START_SHIP                                 :{WHITE}船舶を始動／停止できません...
+STR_ERROR_CAN_T_STOP_START_AIRCRAFT                             :{WHITE}飛行機が始動／停止できません...
+
+STR_ERROR_CAN_T_SEND_TRAIN_TO_DEPOT                             :{WHITE}列車を電車庫へ回送できません...
+STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}車両を車庫へ回送できません...
+STR_ERROR_CAN_T_SEND_SHIP_TO_DEPOT                              :{WHITE}船舶を造船所へ回送できません...
+STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR                         :{WHITE}飛行機を格納庫へ回送できません...
+
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}鉄道車両が購入できません...
+STR_ERROR_CAN_T_BUILD_ROAD_VEHICLE                              :{WHITE}道路車両が購入できません...
+STR_ERROR_CAN_T_BUILD_SHIP                                      :{WHITE}船舶が購入できません...
+STR_ERROR_CAN_T_BUILD_AIRCRAFT                                  :{WHITE}飛行機を購入できません...
+
+STR_ERROR_CAN_T_RENAME_TRAIN_TYPE                               :{WHITE}鉄道車両の名称を変更できません...
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}道路車両の名称を変更できません...
+STR_ERROR_CAN_T_RENAME_SHIP_TYPE                                :{WHITE}船舶の名称が変更できません...
+STR_ERROR_CAN_T_RENAME_AIRCRAFT_TYPE                            :{WHITE}飛行機の名称を変更できません...
+
+STR_ERROR_CAN_T_SELL_TRAIN                                      :{WHITE}鉄道車両を販売できません...
+STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}道路車両を売却できません...
+STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}船舶が販売できません...
+STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}飛行機を売却できません...
+
+STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP                 :{BLACK}列車の現在の動作 - 始動／停止するにはここにクリックします
+STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP          :{BLACK}車両の現在の動作 - 開始／停止するにはクリックします
+STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP                  :{BLACK}船舶の現在の動作 - 始動／停止するにはここへクリックします
+STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP              :{BLACK}飛行機の現在の動作 - 始動／停止するにはここへクリックします
+
+STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP                           :{BLACK}列車の指令を表示します
+STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP                    :{BLACK}車両の指令を表示します
+STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}船舶の指令を表示
+STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}飛行機の指令を表示
+
+STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP                         :{BLACK}メイン画面を列車の場所に移動します
+STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP                  :{BLACK}主の画面を車両の場所に移動します
+STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP                          :{BLACK}主の画面を船舶の場所に移動します
+STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP                      :{BLACK}メイン画面を飛行機の場所に移動します
+
+STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP                    :{BLACK}列車を電車庫へ回送します。Control+クリックすすると、補修のみします。
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}車両を車庫へ改装します。Control+クリックすると修理しか行いません。
+STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}船舶を造船所へ回送します。Contorl+クリックすると修理のみをします
+STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}飛行機を格納庫へ回送します。Control+クリックすると修理のみします
+
+STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}列車の情報を表示します
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}車両の情報を表示します
+STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}船舶の情報を表示
+STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}飛行機の情報を表示
+
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}他の貨物種類を運送するに列車を再装備
+STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}他の貨物の種類を運送するに道路車両を再装備します
+STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}他の種類の貨物を運送する為に貨物船を改装します
+STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}他の種類の貨物を運送する為に飛行機を改装
+
+STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}{TOWN}電車庫へ行く
+STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}{TOWN}電車庫へ行く、{VELOCITY}
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}{TOWN}車庫へ回送
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}{TOWN}車庫へ回送、{VELOCITY}
+STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}{TOWN}造船所へ回送
+STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}{TOWN}造船所へ回送、{VELOCITY}
+STR_HEADING_FOR_HANGAR                                          :{ORANGE}{STATION}格納庫へ行く
+STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}{STATION}格納庫へ行く、{VELOCITY}
+
+STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}{TOWN}電車庫で修理
+STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}{TOWN}電車庫で修理、{VELOCITY}
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}{TOWN}車庫で修理
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}{TOWN}車庫で修理、{VELOCITY}
+STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}{TOWN}造船所で修理
+STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}{TOWN}造船所で修理、{VELOCITY}
+STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}{STATION}格納庫で修理
+STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}{STATION}格納庫で修理、{VELOCITY}
+
+
+STR_CLONE_TRAIN                                                 :{BLACK}列車をクローン
+STR_CLONE_ROAD_VEHICLE                                          :{BLACK}道路車両をクローン
+STR_CLONE_SHIP                                                  :{BLACK}船舶をクローン
+STR_CLONE_AIRCRAFT                                              :{BLACK}飛行機をクローン
+
+STR_CLONE_TRAIN_INFO                                            :{BLACK}すべての車両を含めて、この列車を複製します。Control+クリックすると、指令を共有します。
+STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}道路車両を複製します。Control+クリックすると、指令を共有します。
+STR_CLONE_SHIP_INFO                                             :{BLACK}船舶を複製します。Control+クリックすると、指令を共有します
+STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}飛行機を複製します。Control+クリックすると、指令リストを共有します。
+
+STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}すべての車両を含めて、この列車を複製します。このボタンをクリックして、他の列車をクリックします。も電車庫内でも電車庫外でもかまいません。Control+クリックすると、指令を共有します。
+STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}道路車両を複製します。このボタンをクリックして、他の車両をクリックします。車庫内でも車庫外でもかまいません。Control+クリックすると、指令を共有します。
+STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}船舶を複製します。このボタンをクリックして、造船所内および造船所外の船舶をクリックします。Control+クリックすると、指令を共有します
+STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}飛行機を複製します。このボタンをクリックして、格納庫内および格納庫外の飛行機をクリックします。Control+クリックすると、指令リストを共有します。
+
+STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}新規鉄道車両
+STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}新規電動鉄道車両
+STR_BUILD_VEHICLE_TRAIN_MONORAIL_CAPTION                        :{WHITE}新規モノレール車両
+STR_BUILD_VEHICLE_TRAIN_MAGLEV_CAPTION                          :{WHITE}新規磁気浮上式鉄道車両
+
+STR_BUILD_VEHICLE_TRAIN_ALL_CAPTION                             :{WHITE}鉄道車両
+STR_BUILD_VEHICLE_ROAD_VEHICLE_CAPTION                          :{WHITE}新規道路車両
+STR_BUILD_VEHICLE_SHIP_CAPTION                                  :{WHITE}新規船舶
+STR_BUILD_VEHICLE_AIRCRAFT_CAPTION                              :{WHITE}新規飛行機
+
+STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_BUTTON                    :{BLACK}車両を購入
+STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_BUTTON             :{BLACK}車両を購入
+STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON                     :{BLACK}船舶を購入
+STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON                 :{BLACK}飛行機を購入
+
+STR_BUILD_VEHICLE_TRAIN_LIST_TOOLTIP                            :{BLACK}列車のリスト - 情報を見るには列車をクリックします
+STR_BUILD_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP                     :{BLACK}道路車両のリスト - 情報を見るには車両をクリックします
+STR_BUILD_VEHICLE_SHIP_LIST_TOOLTIP                             :{BLACK}船舶のリスト - 情報を見るには船舶をクリックします
+STR_BUILD_VEHICLE_AIRCRAFT_LIST_TOOLTIP                         :{BLACK}飛行機のリスト - 情報を見るには飛行機をクリックします
+
+STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_TOOLTIP                   :{BLACK}選択した車両を購入
+STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_TOOLTIP            :{BLACK}選択した道路車両を購入します
+STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP                    :{BLACK}選択した船舶を購入
+STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_TOOLTIP                :{BLACK}選択した飛行機を購入
+
+STR_BUILD_VEHICLE_TRAIN_RENAME_BUTTON                           :{BLACK}名称を変更
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}名称変更
+STR_BUILD_VEHICLE_SHIP_RENAME_BUTTON                            :{BLACK}名称を変更
+STR_BUILD_VEHICLE_AIRCRAFT_RENAME_BUTTON                        :{BLACK}名称を変更
+
+STR_BUILD_VEHICLE_TRAIN_RENAME_TOOLTIP                          :{BLACK}鉄道車両の名称を変更
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}道路車両の名称を変更
+STR_BUILD_VEHICLE_SHIP_RENAME_TOOLTIP                           :{BLACK}船舶名を変更
+STR_BUILD_VEHICLE_AIRCRAFT_RENAME_TOOLTIP                       :{BLACK}飛行機の名称を変更
+
+STR_QUERY_RENAME_TRAIN_TYPE_CAPTION                             :{WHITE}鉄道車両の名称を変更
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}道路車両の名称を変更
+STR_QUERY_RENAME_SHIP_TYPE_CAPTION                              :{WHITE}船舶の名称を変更
+STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION                          :{WHITE}飛行機の名称を変更
+
+STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}新規車両
+STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_BUTTON                      :{BLACK}新規車両
+STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON                              :{BLACK}新規船舶
+STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON                          :{BLACK}新規飛行機
+
+STR_DEPOT_TRAIN_LIST_TOOLTIP                                    :{BLACK}列車 - 情報を見るには列車をクリックします。車両を追加／取り除くにはドラッグします。
+STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}車両 - クリックして情報を表示します
+STR_DEPOT_SHIP_LIST_TOOLTIP                                     :{BLACK}船舶のリスト - 情報を見るには船舶をクリックします
+STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}飛行機 - 情報を見るには飛行機をクリックします
+
+STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP                            :{BLACK}新規鉄道車両を購入
+STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}新規道路車両を購入
+STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}新規船舶を購入
+STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}新規飛行機を購入
+
+STR_DEPOT_TRAIN_SELL_TOOLTIP                                    :{BLACK}車両を売却するには、ここへドラッグします
+STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}販売するには道路車両をここへドラッグします
+STR_DEPOT_SHIP_SELL_TOOLTIP                                     :{BLACK}販売するには船舶をここへドラッグします
+STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}売却するには飛行機をここへドラッグします
+
+STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}メイン画面を鉄道車庫の場所に移動します
+STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}主の画面を車庫の場所に移動します
+STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}メイン画面を造船所の場所に移動します
+STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}メイン画面を格納庫の場所に移動します
+
+
 ### depot strings
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}車庫／格納庫／造船所内のすべての車両を売却します。続けてもよろしいですか？
 STR_DEPOT_WRONG_DEPOT_TYPE                                      :鉄道車庫の種類が一致していません
@@ -3153,7 +3163,6 @@ STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TIP                          :{BLACK}車庫�
 STR_DEPOT_AUTOREPLACE_SHIP_TIP                                  :{BLACK}造船所内のすべての船舶を自動交換します
 STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP                              :{BLACK}格納庫内のすべての飛行機を自動交換します
 
-
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}{STRING}を交換
 STR_REPLACE_VEHICLES_START                                      :{BLACK}車両の交換を開始
 STR_REPLACE_VEHICLES_STOP                                       :{BLACK}車両の交換を停止
@@ -3169,6 +3178,7 @@ STR_REPLACE_REMOVE_WAGON                                        :{BLACK}列車�
 STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}自動交換によって列車の長さが長くなる場合は、列車の長さを保守するには客車／貨車を取り除くことができます。列車の先頭から開始します。
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}交換：{ORANGE}{SKIP}{SKIP}{STRING}
 STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}機関車／貨車のウィンドウに切り替えます。
+
 STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}車を買えません
 STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}車を買えません
 STR_SHIP_NOT_AVAILABLE                                          :{WHITE}船を買えません
@@ -3317,17 +3327,6 @@ STR_MEASURE_AREA                                                :{BLACK}地域�
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}長さ：{NUM}{}高さの違い：{NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}地域：{NUM} x {NUM}{}高さの違い：{NUM} m
 
-############ Date formatting
-STR_FORMAT_DATE_TINY                                            :{2:NUM}-{1:STRING}-{0:STRING}
-STR_FORMAT_DATE_SHORT                                           :{1:NUM}年{0:STRING}
-STR_FORMAT_DATE_LONG                                            :{2:NUM}年{1:STRING}{0:STRING}
-STR_FORMAT_DATE_ISO                                             :{2:NUM}-{1:STRING}-{0:STRING}
-
-STR_JUST_DATE_TINY                                              :{DATE_TINY}
-STR_JUST_DATE_LONG                                              :{DATE_LONG}
-STR_JUST_DATE_ISO                                               :{DATE_ISO}
-########
-
 STR_FEEDER_CARGO_VALUE                                          :{BLACK}振り替えクレジット: {LTBLUE}{CURRENCY}
 STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD                            :{WHITE}...これは町の道です。
 STR_DRIVE_THROUGH_ERROR_DIRECTION                               :{WHITE}...道の方向が違います。
@@ -3352,7 +3351,6 @@ STR_PERCENT_UP_DOWN_SMALL                                       :{TINYFONT}{WHIT
 STR_PERCENT_UP_DOWN                                             :{WHITE}{NUM}%{UPARROW}{DOWNARROW}
 
 ##### Mass Order
-STR_FORMAT_GROUP_NAME                                           :グループ {COMMA}
 STR_GROUP_TINY_NAME                                             :{TINYFONT}{GROUP}
 STR_GROUP_ALL_TRAINS                                            :すべての列車
 STR_GROUP_ALL_ROAD_VEHICLES                                     :すべての道路車両
@@ -3381,12 +3379,62 @@ STR_GROUP_DELETE_TIP                                            :{BLACK}選択�
 STR_GROUP_RENAME_TIP                                            :{BLACK}選択したグループの名称を変更します
 STR_GROUP_REPLACE_PROTECTION_TIP                                :{BLACK}このグループ内の車両を自動交換しません
 
+#### String control codes and their formatting
 STR_COMPANY_NAME                                                :{COMPANY}
 STR_ENGINE_NAME                                                 :{ENGINE}
 STR_GROUP_NAME                                                  :{GROUP}
+STR_INDUSTRY_NAME                                               :{INDUSTRY}
 STR_PRESIDENT_NAME                                              :{PRESIDENTNAME}
 STR_SIGN_NAME                                                   :{SIGN}
+STR_STATION_NAME                                                :{STATION}
+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_LONG                                              :{DATE_LONG}
+STR_JUST_DATE_ISO                                               :{DATE_ISO}
+STR_JUST_STRING                                                 :{STRING}
+STR_JUST_RAW_STRING                                             :{STRING}
+
+STR_FORMAT_DATE_TINY                                            :{2:NUM}-{1:STRING}-{0:STRING}
+STR_FORMAT_DATE_SHORT                                           :{1:NUM}年{0:STRING}
+STR_FORMAT_DATE_LONG                                            :{2:NUM}年{1:STRING}{0:STRING}
+STR_FORMAT_DATE_ISO                                             :{2:NUM}-{1:STRING}-{0:STRING}
+
+STR_FORMAT_COMPANY_NUM                                          :（会社 {COMMA}）
+STR_FORMAT_GROUP_NAME                                           :グループ {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}名前は唯一でなければなりません
 
diff --git a/src/lang/korean.txt b/src/lang/korean.txt
index 72dd89533..4d5786582 100644
--- a/src/lang/korean.txt
+++ b/src/lang/korean.txt
@@ -155,8 +155,6 @@ STR_ABBREV_PLASTIC                                              :{TINYFONT}PL
 STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}FZ
 STR_ABBREV_NONE                                                 :{TINYFONT}NO
 STR_ABBREV_ALL                                                  :{TINYFONT}ALL
-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}알림
@@ -168,17 +166,11 @@ STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Original
 STR_ABOUT_VERSION                                               :{BLACK}OpenTTD 버전 {REV}
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 OpenTTD 개발팀
 
-STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
-STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_QUIT_CAPTION                                                :{WHITE}종료
 STR_YES                                                         :{BLACK}예
 STR_NO                                                          :{BLACK}아니요
 STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}정말 이 게임을 끝내고 {STRING}{G 0 "으" ""}로 돌아가시겠습니까?
-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                                                :없음
 STR_COLOUR_DARK_BLUE                                            :짙은 파랑
 STR_COLOUR_PALE_GREEN                                           :엷은 녹색
@@ -197,8 +189,6 @@ STR_COLOUR_BROWN                                                :갈색
 STR_COLOUR_GREY                                                 :회색
 STR_COLOUR_WHITE                                                :흰색
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}게임에 차량이 너무 많습니다!
-STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
-STR_RED_COMMA                                                   :{RED}{COMMA}
 STR_BUTTON_LOCATION                                             :{BLACK}위치
 STR_SMALLMAP_TYPE_CONTOURS                                      :고도
 STR_SMALLMAP_TYPE_VEHICLES                                      :차량
@@ -324,12 +314,13 @@ STR_SORT_CRITERIA_TIP                                           :{BLACK}정렬 �
 STR_FILTER_CRITERIA_TIP                                         :{BLACK}필터링 기준 선택
 STR_SORT_BY                                                     :{BLACK}정렬
 
+### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}인구
+STR_SORT_BY_NAME                                                :{BLACK}이름
+STR_SORT_BY_DATE                                                :{BLACK}날짜
 STR_SORT_BY_PRODUCTION                                          :생산
 STR_SORT_BY_TYPE                                                :종류
 STR_SORT_BY_TRANSPORTED                                         :수송량
-STR_SORT_BY_NAME                                                :{BLACK}이름
-STR_SORT_BY_DATE                                                :{BLACK}날짜
 STR_SORT_BY_NUMBER                                              :번호
 STR_SORT_BY_PROFIT_LAST_YEAR                                    :작년 수익
 STR_SORT_BY_PROFIT_THIS_YEAR                                    :올해 수익
@@ -352,37 +343,25 @@ STR_SORT_BY_INTRO_DATE                                          :도입 날짜
 STR_SORT_BY_RUNNING_COST                                        :운행비용
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :힘/운행비용
 STR_SORT_BY_CARGO_CAPACITY                                      :화물 수송량
+
 STR_NO_WAITING_CARGO                                            :{BLACK}대기 중인 화물이 없습니다.
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}모든 시설 선택
 STR_SELECT_ALL_TYPES                                            :{BLACK}모든 종류의 화물을 선택 (대기하지 않는 화물 포함)
-STR_AVAILABLE_TRAINS                                            :{BLACK}사용 가능 열차
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}사용 가능 자동차
-STR_AVAILABLE_SHIPS                                             :{BLACK}사용 가능 선박
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}사용 가능 항공기
 STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}이 차량 타입에 사용할 수 있는 기관차의 목록 보기
 STR_MANAGE_LIST                                                 :{BLACK}관리
 STR_MANAGE_LIST_TIP                                             :{BLACK}이 목록에 있는 모든 열차에게 지시
 STR_REPLACE_VEHICLES                                            :차량 교체
+STR_SEND_FOR_SERVICING                                          :점검하러 보냄
+
+STR_AVAILABLE_TRAINS                                            :{BLACK}사용 가능 열차
+STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}사용 가능 자동차
+STR_AVAILABLE_SHIPS                                             :{BLACK}사용 가능 선박
+STR_AVAILABLE_AIRCRAFT                                          :{BLACK}사용 가능 항공기
+
 STR_SEND_TRAIN_TO_DEPOT                                         :차량기지로 보내기
 STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :차고로 보내기
 STR_SEND_SHIP_TO_DEPOT                                          :정박소로 보내기
 STR_SEND_AIRCRAFT_TO_HANGAR                                     :격납고로 보내기
-STR_SEND_FOR_SERVICING                                          :점검하러 보냄
-
-############ range for months starts
-STR_MONTH_ABBREV_JAN                                            :1
-STR_MONTH_ABBREV_FEB                                            :2
-STR_MONTH_ABBREV_MAR                                            :3
-STR_MONTH_ABBREV_APR                                            :4
-STR_MONTH_ABBREV_MAY                                            :5
-STR_MONTH_ABBREV_JUN                                            :6
-STR_MONTH_ABBREV_JUL                                            :7
-STR_MONTH_ABBREV_AUG                                            :8
-STR_MONTH_ABBREV_SEP                                            :9
-STR_MONTH_ABBREV_OCT                                            :10
-STR_MONTH_ABBREV_NOV                                            :11
-STR_MONTH_ABBREV_DEC                                            :12
-############ range for months ends
 
 STR_GRAPH_X_LABEL_MONTH                                         :{TINYFONT}{STRING}{} {STRING}
 STR_GRAPH_X_LABEL_MONTH_YEAR                                    :{TINYFONT}{STRING}{} {STRING}{}{NUM}
@@ -410,8 +389,6 @@ 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_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}창 제목 - 창을 움직이려면 여기를 드래그하세요
@@ -458,7 +435,7 @@ STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :없음
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}이름
 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                                          :1
 STR_ORDINAL_NUMBER_2ND                                          :2
 STR_ORDINAL_NUMBER_3RD                                          :3
@@ -492,6 +469,34 @@ STR_ORDINAL_NUMBER_30TH                                         :30
 STR_ORDINAL_NUMBER_31ST                                         :31
 ############ range for days ends
 
+############ range for months starts
+STR_MONTH_ABBREV_JAN                                            :1
+STR_MONTH_ABBREV_FEB                                            :2
+STR_MONTH_ABBREV_MAR                                            :3
+STR_MONTH_ABBREV_APR                                            :4
+STR_MONTH_ABBREV_MAY                                            :5
+STR_MONTH_ABBREV_JUN                                            :6
+STR_MONTH_ABBREV_JUL                                            :7
+STR_MONTH_ABBREV_AUG                                            :8
+STR_MONTH_ABBREV_SEP                                            :9
+STR_MONTH_ABBREV_OCT                                            :10
+STR_MONTH_ABBREV_NOV                                            :11
+STR_MONTH_ABBREV_DEC                                            :12
+
+STR_MONTH_JAN                                                   :{G=m}1월
+STR_MONTH_FEB                                                   :{G=m}2월
+STR_MONTH_MAR                                                   :{G=m}3월
+STR_MONTH_APR                                                   :{G=m}4월
+STR_MONTH_MAY                                                   :{G=m}5월
+STR_MONTH_JUN                                                   :{G=m}6월
+STR_MONTH_JUL                                                   :{G=m}7월
+STR_MONTH_AUG                                                   :{G=m}8월
+STR_MONTH_SEP                                                   :{G=m}9월
+STR_MONTH_OCT                                                   :{G=m}10월
+STR_MONTH_NOV                                                   :{G=m}11월
+STR_MONTH_DEC                                                   :{G=m}12월
+############ range for months ends
+
 STR_GRAPH_Y_LABEL_NUMBER                                        :{TINYFONT}{COMMA}
 
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}화물 인수: {LTBLUE}
@@ -581,12 +586,9 @@ 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_COMMA                                                  :{BLUE}{COMMA}
 STR_SCENEDIT_TOOLBAR_OPENTTD                                    :{YELLOW}OpenTTD
 STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR                            :{YELLOW}시나리오 에디터
 STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION                   :{WHITE}지형 만들기
-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}무작위로 지형 만들기
@@ -668,9 +670,7 @@ STR_OFF                                                         :끄기
 STR_SUMMARY                                                     :요약
 STR_FULL                                                        :전체
 STR_STATUSBAR_COMPANY_NAME                                      :{SILVER}- -  {COMPANY}  - -
-STR_BLACK_STRING                                                :{BLACK}{STRING}
 
-STR_JUST_CHECKMARK                                              :{CHECKMARK}
 ############ range for menu starts
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :게임 옵션
 STR_SETTINGS_MENU_DIFFICULTY_SETTINGS                           :난이도 설정
@@ -775,9 +775,6 @@ STR_STATUSBAR_SAVING_GAME                                       :{RED}*  *  게�
 STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}저장중입니다,{}끝날때까지 기다려주세요
 STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE                       :{BLACK}'Ezy Street 스타일 음악' 프로그램을 선택합니다
 
-STR_BLACK_6                                                     :{G=m}{BLACK}6
-STR_BLACK_7                                                     :{G=m}{BLACK}7
-
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :영국 식 (기본)
 STR_TOWNNAME_FRENCH                                             :프랑스 식
@@ -857,19 +854,6 @@ STR_OPTIONS_BASE_GRF_DESCRIPTION_TIP                            :{BLACK}기본 �
 
 STR_AUTOSAVE_FAILED                                             :{WHITE}자동 저장 실패
 
-STR_MONTH_JAN                                                   :{G=m}1월
-STR_MONTH_FEB                                                   :{G=m}2월
-STR_MONTH_MAR                                                   :{G=m}3월
-STR_MONTH_APR                                                   :{G=m}4월
-STR_MONTH_MAY                                                   :{G=m}5월
-STR_MONTH_JUN                                                   :{G=m}6월
-STR_MONTH_JUL                                                   :{G=m}7월
-STR_MONTH_AUG                                                   :{G=m}8월
-STR_MONTH_SEP                                                   :{G=m}9월
-STR_MONTH_OCT                                                   :{G=m}10월
-STR_MONTH_NOV                                                   :{G=m}11월
-STR_MONTH_DEC                                                   :{G=m}12월
-
 STR_HEADING_FOR_STATION                                         :{LTBLUE}{STATION}{G 0 "으" ""}로 향하는 중
 STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}{STATION}{G 0 "으" ""}로 향하는 중 ({VELOCITY})
 STR_NO_ORDERS                                                   :{LTBLUE}경로 없음
@@ -884,8 +868,6 @@ STR_CRATES                                                      :{G=f}상자
 STR_RES_OTHER                                                   :{G=f}기타
 STR_NOTHING                                                     :
 
-STR_TINY_RIGHT_ARROW                                            :{TINYFONT}{RIGHTARROW}
-
 STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}경로를 공유할 수 없습니다...
 STR_CANT_COPY_ORDER_LIST                                        :{WHITE}경로를 복사할 수 없습니다...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - 공유된 경로의 끝 - -
@@ -1157,7 +1139,6 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}맵의
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :사용불가
-STR_JUST_CURRENCY                                               :{CURRENCY}
 STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}설정값 변경
 
 STR_TEMPERATE_LANDSCAPE                                         :온대 기후
@@ -1259,11 +1240,6 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}산업�
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...다른 산업시설과 너무 가깝습니다.
 
-STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}다른 종류의 화물을 실을 수 있도록 열차를 개조
-STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}열차 개조
-STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}열차가 수송할 화물의 종류를 선택하세요
-STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}선택된 화물을 수송하도록 열차를 개조
-STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}열차를 개조할 수 없습니다...
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}생산량 변경
 
 ############ network gui strings
@@ -2076,6 +2052,7 @@ STR_SV_STNAME_AIRPORT                                           :{STRING}
 STR_SV_STNAME_OILFIELD                                          :{STRING} 유전
 STR_SV_STNAME_MINES                                             :{STRING} 광산
 STR_SV_STNAME_DOCKS                                             :{STRING}항
+##id 0x6020
 STR_SV_STNAME_ANNEXE                                            :{STRING} 별관
 STR_SV_STNAME_SIDINGS                                           :{STRING} 측선
 STR_SV_STNAME_BRANCH                                            :{STRING} 지선
@@ -2123,8 +2100,6 @@ STR_NUM_LOW                                                     :낮음
 STR_NUM_NORMAL                                                  :보통
 STR_NUM_HIGH                                                    :높음
 STR_NUM_CUSTOM                                                  :사용자
-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                                             :보통
@@ -2592,10 +2567,8 @@ STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE                          :모노레일 �
 STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE                            :자기부상열차
 
 ##id 0x8800
-STR_DEPOT_TRAIN_CAPTION                                         :{WHITE}{TOWN} 차량기지
 STR_NEWS_FIRST_TRAIN_ARRIVAL                                    :{BLACK}{BIGFONT}{STATION}에 처음으로 기차가 도착했습니다!{}사람들이 환호성을 지릅니다!
 STR_VEHICLE_DETAILS_CAPTION                                     :{WHITE}{VEHICLE} (상세정보)
-STR_ERROR_TRAIN_IN_THE_WAY                                      :{WHITE}중간에 기차가 있습니다
 STR_ORDER                                                       :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 STR_ORDER_SELECTED                                              :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 STR_ORDER_NON_STOP                                              :{BLACK}통과 설정
@@ -2685,37 +2658,16 @@ STR_TIMETABLE_AND_TRAVEL_FOR                                    :그리고 {STRI
 STR_TIMETABLE_DAYS                                              :{COMMA} 일
 STR_TIMETABLE_TICKS                                             :{COMMA} 틱
 
-STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}{TOWN} 차량기지로 가는 중
-STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}{TOWN} 차량기지로 가는 중 ({VELOCITY})
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}{TOWN} 차량기지로 점검하러 가는중
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}{TOWN} 차량기지로 점검하러 가는 중 ({VELOCITY})
-
 STR_INVALID_ORDER                                               :{RED} (잘못된 경로)
 
 STR_UNKNOWN_STATION                                             :알수없는 정거장
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}비어있음
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} (출발지: {STATION})
 STR_VEHICLE_DETAILS_CARGO_FROM_MULT                             :{LTBLUE}{CARGO} (출발지: {STATION}) (x{NUM})
-STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE}{P "이" "가"} 차량기지 안에서 대기 중입니다
-STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}새 열차
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}열차가 너무 깁니다!
 STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}차량기지 내에서 정지한 경우에만 개조할 수 있습니다
 
-STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}새 기차
-STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}새 전기 기차
-STR_BUILD_VEHICLE_TRAIN_MONORAIL_CAPTION                        :{WHITE}새 모노레일
-STR_BUILD_VEHICLE_TRAIN_MAGLEV_CAPTION                          :{WHITE}새 자기부상열차
-STR_BUILD_VEHICLE_TRAIN_ALL_CAPTION                             :{WHITE}기차
-
-STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_BUTTON                    :{BLACK}차량 만들기
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}차량 복제
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}이 버튼은 자동차를 복제할 것입니다. CTRL+클릭하시면 경로도 같이 공유됩니다.
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}이 버튼은 자동차를 복제할 것입니다. 이 버튼을 클릭하고 차고 안/밖에 있는 차량을 클릭하십시오. CTRL+클릭하면 경로도 같이 공유됩니다.
-STR_CLONE_TRAIN                                                 :{BLACK}기차 복제
-STR_CLONE_TRAIN_INFO                                            :{BLACK}이 버튼은 객차/화물차를 포함한 열차 전체를 복제할 것입니다. CTRL+클릭하면 경로도 같이 공유됩니다.
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}이 버튼은 객차/화물차를 포함한 열차 전체를 복제할 것입니다. 이 버튼을 클릭하고 차고 안/밖에 있는 차량을 클릭하십시오. CTRL+클릭하면 경로도 같이 공유됩니다.
-STR_BUILD_VEHICLE_TRAIN_RENAME_BUTTON                           :{BLACK}이름
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}건너뛰기
 STR_ORDERS_DELETE_BUTTON                                        :{BLACK}삭제
 STR_ORDERS_GO_TO_BUTTON                                         :{BLACK}행선지
@@ -2731,14 +2683,12 @@ STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}순서 �
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (경로)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - 경로의 끝 - -
 STR_SERVICE                                                     :{BLACK}점검
-STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}기차를 만들 수 없습니다...
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   생산: {LTBLUE}{NUM}{BLACK} 가격: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   가격: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
 STR_VEHICLE_STATUS_LOADING_UNLOADING                            :{LTBLUE}싣는중 / 내리는중
 STR_VEHICLE_STATUS_LEAVING                                      :{LTBLUE}떠남
 STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}차량기지 안에 정지해있어야 합니다!
-STR_ERROR_CAN_T_SEND_TRAIN_TO_DEPOT                             :{WHITE}기차를 기지로 보낼 수 없습니다...
 STR_ERROR_NO_MORE_SPACE_FOR_ORDERS                              :{WHITE}더이상 경로를 지정할 공간이 없습니다
 STR_ERROR_TOO_MANY_ORDERS                                       :{WHITE}경로가 너무 많습니다!
 STR_ERROR_CAN_T_INSERT_NEW_ORDER                                :{WHITE}새 경로를 삽입할 수 없습니다...
@@ -2753,25 +2703,11 @@ STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE}경로�
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}차량을 옮길 수 없습니다...
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}뒷쪽 기관차는 앞쪽것을 항상 따라다닐 것입니다.
 STR_CARGO_N_A                                                   :없음{SKIP}
-STR_ERROR_CAN_T_SELL_TRAIN                                      :{WHITE}기차를 팔 수 없습니다...
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}근처에 있는 차량기지로 가는 길을 찾을 수 없습니다
-STR_ERROR_CAN_T_STOP_START_TRAIN                                :{WHITE}기차를 운행/정지시킬 수 없습니다...
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}점검 간격: {LTBLUE}{COMMA}일마다{BLACK}   최근 점검: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}점검 간격: {LTBLUE}{COMMA}%{BLACK}   최근 점검: {LTBLUE}{DATE_LONG}
-STR_DEPOT_TRAIN_LIST_TOOLTIP                                    :{BLACK}열차 - 열차 정보를 보려면 클릭, 차량을 드래그해서 추가하거나 삭제하세요
-STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP                            :{BLACK}새 기차 만들기
-STR_DEPOT_TRAIN_SELL_TOOLTIP                                    :{BLACK}기관차/객차/화물차 한량만 제거하려면 여기로 드래그하세요
-STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}차량기지가 있는 곳으로 이동
-STR_BUILD_VEHICLE_TRAIN_LIST_TOOLTIP                            :{BLACK}기차 선택 목록 - 차량 정보를 보려면 클릭
-STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_TOOLTIP                   :{BLACK}선택된 차량 생산
-STR_BUILD_VEHICLE_TRAIN_RENAME_TOOLTIP                          :{BLACK}차량 타입의 이름을 다시 지정
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP                 :{BLACK}현재 열차 행동 - 열차를 운행/정지시키려면 클릭
-STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP                           :{BLACK}열차 경로설정창 띄우기
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP                         :{BLACK}이 열차가 있는 곳으로 이동
-STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP                    :{BLACK}기차를 차량기지로 보냅니다. (CTRL+클릭시 점검만 하러 보냄)
 STR_VEHICLE_VIEW_TRAIN_IGNORE_SIGNAL_TOOLTIP                    :{BLACK}신호를 무시하고 열차를 진행시킵니다.
 STR_VEHICLE_VIEW_TRAIN_REVERSE_TOOLTIP                          :{BLACK}열차를 회차시킵니다.
-STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}열차 상세정보 보기
 STR_VEHICLE_DETAILS_INCREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}점검 주기 증가시키기
 STR_VEHICLE_DETAILS_DECREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}점검 주기 감소시키기
 STR_VEHICLE_DETAILS_TRAIN_CARGO_TOOLTIP                         :{BLACK}현재 싣고있는 화물 정보를 보여줌
@@ -2805,15 +2741,10 @@ STR_VEHICLE_STATUS_STOPPED                                      :{RED}정지함
 STR_ERROR_CAN_T_MAKE_TRAIN_PASS_SIGNAL                          :{WHITE}너무 위험해서 신호를 무시할 수 없습니다...
 STR_VEHICLE_STATUS_CRASHED                                      :{RED}충돌!!
 
-STR_QUERY_RENAME_TRAIN_CAPTION                                  :{WHITE}열차 이름 지정
-STR_ERROR_CAN_T_RENAME_TRAIN                                    :{WHITE}열차 이름을 지정할 수 없습니다...
-STR_VEHICLE_DETAILS_TRAIN_RENAME                                :{BLACK}열차 이름 지정
 STR_NEWS_TRAIN_CRASH                                            :{BLACK}{BIGFONT}열차 충돌 사고!{}충돌로 인한 폭발로 {COMMA}명의 사망자가 발생하였습니다!
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}열차를 회차시킬 수 없습니다...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE                  :{WHITE}차량의 방향을 뒤집을 수 없습니다...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}여러 대가 연결된 차량은 뒤집을 수 없습니다...
-STR_QUERY_RENAME_TRAIN_TYPE_CAPTION                             :{WHITE}열차 차량 타입 이름 재지정
-STR_ERROR_CAN_T_RENAME_TRAIN_TYPE                               :{WHITE}차량 타입의 이름을 다시 지정할 수 없습니다...
 STR_CLEAR_TIME                                                  :{BLACK}시간 초기화
 STR_RESET_LATENESS                                              :{BLACK}지연 카운터 초기화
 STR_CHANGE_WAYPOINT_NAME                                        :{BLACK}웨이포인트 이름 변경
@@ -2845,43 +2776,14 @@ STR_TIMETABLE_AUTOFILL                                          :{BLACK}자동�
 STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}다음 여행에서 얻어진 값으로 시간표를 자동으로 채웁니다 (CTRL-클릭하여 대기 시간을 유지합니다)
 
 ##id 0x9000
-STR_ERROR_ROAD_VEHICLE_IN_THE_WAY                               :{WHITE}중간에 자동차가 있습니다.
-STR_DEPOT_ROAD_VEHICLE_CAPTION                                  :{WHITE}{TOWN} 차고
-STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_BUTTON                      :{BLACK}새 차량
-STR_BUILD_VEHICLE_ROAD_VEHICLE_CAPTION                          :{WHITE}새 자동차
-STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_BUTTON             :{BLACK}차량 만들기
-STR_ERROR_CAN_T_BUILD_ROAD_VEHICLE                              :{WHITE}자동차를 만들 수 없습니다...
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}...차고 안에서 정지해있어야 합니다!
-STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}자동차를 팔 수 없습니다...
-STR_ERROR_CAN_T_STOP_START_ROAD_VEHICLE                         :{WHITE}자동차를 운행/정지시킬 수 없습니다...
-STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE}{P "이" "가"} 차고에서 대기 중입니다
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}{TOWN} 차고로 가는 중
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}{TOWN} 차고로 가는 중 ({VELOCITY})
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}{TOWN} 차고로 점검하러 가는중
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}{TOWN} 차고로 점검하러 가는중 ({VELOCITY})
-STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}차량을 차고로 보낼 수 없습니다...
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}인접한 차고를 찾을 수 없습니다
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP          :{BLACK}현재 차량 행동 - 운행/정지시키려면 클릭하세요
-STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP                    :{BLACK}차량 경로 보이기
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP                  :{BLACK}이 차량이 있는 곳으로 이동
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}차량을 차고로 보냅니다. CTRL+클릭하면 점검만 합니다.
 STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP                   :{BLACK}차량을 U턴시킵니다.
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}자동차 상세정보 보이기
-STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}차량 - 차량 정보를 보려면 클릭
-STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}새 자동차 만들기
-STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}자동차를 팔려면 여기로 드래그하세요
-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_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})
 
-STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}자동차 이름 지정
-STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}자동차의 이름을 지정할 수 없습니다...
-STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}자동차 이름 지정
 STR_NEWS_FIRST_BUS_ARRIVAL                                      :{BLACK}{BIGFONT}첫 버스가 {STATION} 정류장에 도착했습니다!{}시민들이 환호하고 있습니다!
 STR_NEWS_FIRST_TRUCK_ARRIVAL                                    :{BLACK}{BIGFONT}첫 트럭이 {STATION} 정류장에 도착했습니다!{}시민들이 환호하고 있습니다!
 STR_NEWS_FIRST_PASSENGER_TRAM_ARRIVAL                           :{BLACK}{BIGFONT}{STATION}에 처음으로 승객 전차가 도착했습니다!{}사람들이 환호성을 지릅니다!
@@ -2889,128 +2791,39 @@ STR_NEWS_FIRST_CARGO_TRAM_ARRIVAL                               :{BLACK}{BIGFONT
 STR_NEWS_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}자동차 충돌!{}열차와의 충돌로 운전사가 사망했습니다!
 STR_NEWS_ROAD_VEHICLE_CRASH                                     :{BLACK}{BIGFONT}자동차 충돌!{}열차와의 충돌로 {COMMA}명이 사망했습니다!
 STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}자동차를 U턴시킬 수 없습니다...
-STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}이름 지정
-STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}자동차 타입의 이름 지정
-STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}자동차 타입의 이름 지정
-STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}자동차 타입의 이름을 지정할 수 없습니다...
 
-STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}자동차가 다른 종류의 화물을 싣도록 개조
-STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}자동차 개조
-STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}선택한 화물을 싣도록 자동차를 개조
-STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}자동차를 개조할 수 없습니다...
-STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}자동차가 수송할 화물의 종류를 선택하십시오.
 
 ##id 0x9800
 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :항만 건설
 STR_WATERWAYS_TOOLBAR_CAPTION                                   :{WHITE}항만 건설
 STR_WATERWAYS_TOOLBAR_CAPTION_SE                                :{WHITE}항만
 STR_ERROR_CAN_T_BUILD_DOCK_HERE                                 :{WHITE}여기에 항구를 건설할 수 없습니다...
-STR_DEPOT_SHIP_CAPTION                                          :{WHITE}{TOWN} 정박소
-STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON                              :{BLACK}새 선박
-STR_BUILD_VEHICLE_SHIP_CAPTION                                  :{WHITE}새 선박
-STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON                     :{BLACK}선박 만들기
-STR_CLONE_SHIP                                                  :{BLACK}선박 복제
-STR_CLONE_SHIP_INFO                                             :{BLACK}이 버튼은 선박을 복제할 것입니다. CTRL+클릭은 경로를 같이 공유합니다.
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}이 버튼을 누르고 복제를 원하는 선박을 클릭하십시오. CTRL+클릭은 경로를 같이 공유합니다.
 STR_ERROR_SHIP_MUST_BE_STOPPED_IN_DEPOT                         :{WHITE}정박소 내에서 정지해있어야 합니다!
-STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}선박을 팔 수 없습니다...
-STR_ERROR_CAN_T_BUILD_SHIP                                      :{WHITE}선박을 만들 수 없습니다...
-STR_ERROR_SHIP_IN_THE_WAY                                       :{WHITE}중간에 선박이 있습니다
-STR_ERROR_CAN_T_STOP_START_SHIP                                 :{WHITE}선박을 운행/중지시킬 수 없습니다...
-STR_ERROR_CAN_T_SEND_SHIP_TO_DEPOT                              :{WHITE}선박을 정박소로 보낼 수 없습니다...
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}{TOWN} 정박소로 가는 중
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}{TOWN} 정박소로 가는 중 ({VELOCITY})
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}{TOWN} 정박소로 점검하러 가는 중
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}{TOWN} 정박소로 점검하러 가는 중 ({VELOCITY})
-STR_NEWS_SHIP_IS_WAITING                                        :{WHITE}{VEHICLE}{P "이" "가"} 정박소 안에서 대기 중입니다
 STR_WATERWAYS_TOOLBAR_BUILD_DOCK_TOOLTIP                        :{BLACK}항구 건설
 STR_WATERWAYS_TOOLBAR_BUILD_DEPOT_TOOLTIP                       :{BLACK}정박소 만들기 (선박 제작 및 점검용)
-STR_DEPOT_SHIP_LIST_TOOLTIP                                     :{BLACK}선박 - 선박의 정보를 보려면 클릭하세요
-STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}새 선박을 만듭니다
-STR_DEPOT_SHIP_SELL_TOOLTIP                                     :{BLACK}선박을 팔려면 여기로 드래그하세요
-STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}이 정박소가 잇는 위치로 이동합니다
-STR_BUILD_VEHICLE_SHIP_LIST_TOOLTIP                             :{BLACK}선박 선택 목록 - 선박의 정보를 보려면 클릭하세요
-STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP                    :{BLACK}선택한 선박 만들기
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP                  :{BLACK}현재 선박 행동 - 선박을 운행/중지시키려면 클릭하세요
-STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}선박의 경로 보여주기
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP                          :{BLACK}이 선박이 있는 곳으로 이동합니다
-STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}선박을 정박소로 보냅니다. CTRL+클릭하면 점검만 합니다.
-STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}선박 상세정보 보기
-STR_VEHICLE_DETAILS_SHIP_RENAME                                 :{BLACK}선박 이름 지정
 
-STR_QUERY_RENAME_SHIP_CAPTION                                   :{WHITE}선박 이름 지정
-STR_ERROR_CAN_T_RENAME_SHIP                                     :{WHITE}선박의 이름을 바꿀 수 없습니다...
 STR_NEWS_FIRST_SHIP_ARRIVAL                                     :{BLACK}{BIGFONT}첫 선박이 {STATION}에 도착했습니다!{}시민들이 환호하고 있습니다!
 STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}웨이포인트로 사용할 부이를 설치합니다.
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}여기에 부이를 설치할 수 없습니다...
 STR_BUILD_AQUEDUCT                                              :{BLACK}수도교 짓기
 STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}여기에 수도교를 지을 수 없습니다...
-STR_BUILD_VEHICLE_SHIP_RENAME_BUTTON                            :{BLACK}이름 지정
-STR_BUILD_VEHICLE_SHIP_RENAME_TOOLTIP                           :{BLACK}선박 타입의 이름 지정
-STR_QUERY_RENAME_SHIP_TYPE_CAPTION                              :{WHITE}선박 타입의 이름 지정
-STR_ERROR_CAN_T_RENAME_SHIP_TYPE                                :{WHITE}선박 타입의 이름을 재지정할 수 없습니다...
-STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}이 선박이 다른 종류의 화물을 싣도록 개조
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (개조)
-STR_REFIT_SHIP_REFIT_BUTTON                                     :{BLACK}선박 개조
-STR_REFIT_SHIP_LIST_TOOLTIP                                     :{BLACK}선박이 운반할 화물의 종류를 선택하십시오
-STR_REFIT_SHIP_REFIT_TOOLTIP                                    :{BLACK}선택한 화물을 운반하도록 선박을 개조
 STR_REFIT_TITLE                                                 :{GOLD}수송할 화물 선택:
 STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}새 수송량: {GOLD}{CARGO}{}{BLACK}개조 가격: {GOLD}{CURRENCY}
-STR_ERROR_CAN_T_REFIT_SHIP                                      :{WHITE}선박을 개조할 수 없습니다...
 STR_REFITTABLE                                                  :(개조 가능)
 
 ##id 0xA000
 STR_TOOLBAR_AIRCRAFT_CAPTION                                    :{WHITE}공항
 STR_ERROR_CAN_T_BUILD_AIRPORT_HERE                              :{WHITE}여기에 공항을 만들 수 없습니다...
-STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}{STATION}공항 격납고
-STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON                          :{BLACK}새 항공기
-STR_CLONE_AIRCRAFT                                              :{BLACK}항공기 복제
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}이 버튼은 항공기를 복제할 것입니다. CTRL+클릭은 경로를 같이 공유합니다.
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}이 버튼을 누르고 복제를 원하는 항공기를 클릭하십시오. CTRL+클릭은 경로를 같이 공유합니다.
-STR_BUILD_VEHICLE_AIRCRAFT_CAPTION                              :{WHITE}새 항공기
-STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON                 :{BLACK}항공기 만들기
-STR_ERROR_CAN_T_BUILD_AIRCRAFT                                  :{WHITE}항공기를 만들 수 없습니다...
-STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR                         :{WHITE}항공기를 격납고로 보낼 수 없습니다...
-STR_HEADING_FOR_HANGAR                                          :{ORANGE}{STATION}공항 격납고로 가는 중
-STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}{STATION}공항 격납고로 가는 중 ({VELOCITY})
-STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}{STATION}공항 격납고로 점검하러 가는 중
-STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}{STATION}공항 격납고로 점검하러 가는 중 ({VELOCITY})
-STR_NEWS_AIRCRAFT_IS_WAITING                                    :{WHITE}{VEHICLE}{P "이" "가"} 격납고 안에서 대기 중입니다
-STR_ERROR_AIRCRAFT_IN_THE_WAY                                   :{WHITE}중간에 항공기가 있습니다
-STR_ERROR_CAN_T_STOP_START_AIRCRAFT                             :{WHITE}항공기를 운행/중지시킬 수 없습니다...
 STR_ERROR_AIRCRAFT_IS_IN_FLIGHT                                 :{WHITE}항공기가 운항중입니다
 STR_ERROR_AIRCRAFT_MUST_BE_STOPPED                              :{WHITE}격납고 내에서 정지해있어야합니다
-STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}항공기를 팔 수 없습니다...
 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION                          :공항 건설
 STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}공항 건설
-STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}항공기 - 항공기 정보를 보려면 클릭하세요
-STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}새 항공기
-STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}항공기를 팔려면 여기로 드래그하세요
-STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}이 격납고가 있는 공항으로 이동
-STR_BUILD_VEHICLE_AIRCRAFT_LIST_TOOLTIP                         :{BLACK}항공기 선택 목록 - 항공기 정보를 보려면 클릭하세요
-STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_TOOLTIP                :{BLACK}선택한 항공기 만들기
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP              :{BLACK}현재 항공기 행동 - 항공기를 운행/중지시키려면 여기를 클릭하세요
-STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}항공기 경로를 보여줍니다
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP                      :{BLACK}이 항공기가 있는 곳으로 이동
-STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}항공기를 격납고로 보냅니다. CTRL+클릭하면 점검만 합니다
-STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}항공기 상세정보 보기
 
-STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}항공기 이름 지정
-STR_ERROR_CAN_T_RENAME_AIRCRAFT                                 :{WHITE}항공기의 이름을 지정할 수 없습니다...
-STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}항공기 이름 지정
 STR_NEWS_FIRST_AIRCRAFT_ARRIVAL                                 :{BLACK}{BIGFONT}첫 항공기가 {STATION}공항에 도착했습니다!{}시민들이 환호하고 있습니다!
 STR_NEWS_AIRCRAFT_CRASH                                         :{BLACK}{BIGFONT}항공기 충돌사고 발생!{}{COMMA}명이 {STATION}공항에서 사망하였습니다!
 STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}항공기 추락사고 발생!{}연료 부족으로 인하여 {COMMA}명이 사망하였습니다!
 STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
-STR_BUILD_VEHICLE_AIRCRAFT_RENAME_BUTTON                        :{BLACK}이름 지정
-STR_BUILD_VEHICLE_AIRCRAFT_RENAME_TOOLTIP                       :{BLACK}항공기 타입의 이름 지정
-STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION                          :{WHITE}항공기 타입의 이름 지정
-STR_ERROR_CAN_T_RENAME_AIRCRAFT_TYPE                            :{WHITE}항공기 타입의 이름을 지정할 수 없습니다...
-STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}이 항공기가 다른 종류의 화물을 싣도록 개조
-STR_REFIT_AIRCRAFT_REFIT_BUTTON                                 :{BLACK}항공기 개조
-STR_REFIT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}이 항공기가 수송할 화물의 종류를 선택하십시오
-STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}선택한 화물을 싣도록 항공기를 개조합니다
-STR_ERROR_CAN_T_REFIT_AIRCRAFT                                  :{WHITE}항공기를 개조할 수 없습니다...
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (시간표)
 
@@ -3178,6 +2991,211 @@ STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING}
 STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}{COMMA} 차량의 공유된 경로 목록
 STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}이 경로를 공유하고 있는 모든 차량을 표시합니다.
 
+STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE}{P "이" "가"} 차량기지 안에서 대기 중입니다
+STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE}{P "이" "가"} 차고에서 대기 중입니다
+STR_NEWS_SHIP_IS_WAITING                                        :{WHITE}{VEHICLE}{P "이" "가"} 정박소 안에서 대기 중입니다
+STR_NEWS_AIRCRAFT_IS_WAITING                                    :{WHITE}{VEHICLE}{P "이" "가"} 격납고 안에서 대기 중입니다
+
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}열차 개조
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}자동차 개조
+STR_REFIT_SHIP_REFIT_BUTTON                                     :{BLACK}선박 개조
+STR_REFIT_AIRCRAFT_REFIT_BUTTON                                 :{BLACK}항공기 개조
+
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}선택된 화물을 수송하도록 열차를 개조
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}선택한 화물을 싣도록 자동차를 개조
+STR_REFIT_SHIP_REFIT_TOOLTIP                                    :{BLACK}선택한 화물을 운반하도록 선박을 개조
+STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}선택한 화물을 싣도록 항공기를 개조합니다
+
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}열차가 수송할 화물의 종류를 선택하세요
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}자동차가 수송할 화물의 종류를 선택하십시오.
+STR_REFIT_SHIP_LIST_TOOLTIP                                     :{BLACK}선박이 운반할 화물의 종류를 선택하십시오
+STR_REFIT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}이 항공기가 수송할 화물의 종류를 선택하십시오
+
+STR_DEPOT_TRAIN_CAPTION                                         :{WHITE}{TOWN} 차량기지
+STR_DEPOT_ROAD_VEHICLE_CAPTION                                  :{WHITE}{TOWN} 차고
+STR_DEPOT_SHIP_CAPTION                                          :{WHITE}{TOWN} 정박소
+STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}{STATION}공항 격납고
+
+STR_VEHICLE_DETAILS_TRAIN_RENAME                                :{BLACK}열차 이름 지정
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}자동차 이름 지정
+STR_VEHICLE_DETAILS_SHIP_RENAME                                 :{BLACK}선박 이름 지정
+STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}항공기 이름 지정
+
+STR_QUERY_RENAME_TRAIN_CAPTION                                  :{WHITE}열차 이름 지정
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}자동차 이름 지정
+STR_QUERY_RENAME_SHIP_CAPTION                                   :{WHITE}선박 이름 지정
+STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}항공기 이름 지정
+
+STR_ERROR_TRAIN_IN_THE_WAY                                      :{WHITE}중간에 기차가 있습니다
+STR_ERROR_ROAD_VEHICLE_IN_THE_WAY                               :{WHITE}중간에 자동차가 있습니다.
+STR_ERROR_SHIP_IN_THE_WAY                                       :{WHITE}중간에 선박이 있습니다
+STR_ERROR_AIRCRAFT_IN_THE_WAY                                   :{WHITE}중간에 항공기가 있습니다
+
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}열차를 개조할 수 없습니다...
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}자동차를 개조할 수 없습니다...
+STR_ERROR_CAN_T_REFIT_SHIP                                      :{WHITE}선박을 개조할 수 없습니다...
+STR_ERROR_CAN_T_REFIT_AIRCRAFT                                  :{WHITE}항공기를 개조할 수 없습니다...
+
+STR_ERROR_CAN_T_RENAME_TRAIN                                    :{WHITE}열차 이름을 지정할 수 없습니다...
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}자동차의 이름을 지정할 수 없습니다...
+STR_ERROR_CAN_T_RENAME_SHIP                                     :{WHITE}선박의 이름을 바꿀 수 없습니다...
+STR_ERROR_CAN_T_RENAME_AIRCRAFT                                 :{WHITE}항공기의 이름을 지정할 수 없습니다...
+
+STR_ERROR_CAN_T_STOP_START_TRAIN                                :{WHITE}기차를 운행/정지시킬 수 없습니다...
+STR_ERROR_CAN_T_STOP_START_ROAD_VEHICLE                         :{WHITE}자동차를 운행/정지시킬 수 없습니다...
+STR_ERROR_CAN_T_STOP_START_SHIP                                 :{WHITE}선박을 운행/중지시킬 수 없습니다...
+STR_ERROR_CAN_T_STOP_START_AIRCRAFT                             :{WHITE}항공기를 운행/중지시킬 수 없습니다...
+
+STR_ERROR_CAN_T_SEND_TRAIN_TO_DEPOT                             :{WHITE}기차를 기지로 보낼 수 없습니다...
+STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}차량을 차고로 보낼 수 없습니다...
+STR_ERROR_CAN_T_SEND_SHIP_TO_DEPOT                              :{WHITE}선박을 정박소로 보낼 수 없습니다...
+STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR                         :{WHITE}항공기를 격납고로 보낼 수 없습니다...
+
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}기차를 만들 수 없습니다...
+STR_ERROR_CAN_T_BUILD_ROAD_VEHICLE                              :{WHITE}자동차를 만들 수 없습니다...
+STR_ERROR_CAN_T_BUILD_SHIP                                      :{WHITE}선박을 만들 수 없습니다...
+STR_ERROR_CAN_T_BUILD_AIRCRAFT                                  :{WHITE}항공기를 만들 수 없습니다...
+
+STR_ERROR_CAN_T_RENAME_TRAIN_TYPE                               :{WHITE}차량 타입의 이름을 다시 지정할 수 없습니다...
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}자동차 타입의 이름을 지정할 수 없습니다...
+STR_ERROR_CAN_T_RENAME_SHIP_TYPE                                :{WHITE}선박 타입의 이름을 재지정할 수 없습니다...
+STR_ERROR_CAN_T_RENAME_AIRCRAFT_TYPE                            :{WHITE}항공기 타입의 이름을 지정할 수 없습니다...
+
+STR_ERROR_CAN_T_SELL_TRAIN                                      :{WHITE}기차를 팔 수 없습니다...
+STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}자동차를 팔 수 없습니다...
+STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}선박을 팔 수 없습니다...
+STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}항공기를 팔 수 없습니다...
+
+STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP                 :{BLACK}현재 열차 행동 - 열차를 운행/정지시키려면 클릭
+STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP          :{BLACK}현재 차량 행동 - 운행/정지시키려면 클릭하세요
+STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP                  :{BLACK}현재 선박 행동 - 선박을 운행/중지시키려면 클릭하세요
+STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP              :{BLACK}현재 항공기 행동 - 항공기를 운행/중지시키려면 여기를 클릭하세요
+
+STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP                           :{BLACK}열차 경로설정창 띄우기
+STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP                    :{BLACK}차량 경로 보이기
+STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}선박의 경로 보여주기
+STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}항공기 경로를 보여줍니다
+
+STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP                         :{BLACK}이 열차가 있는 곳으로 이동
+STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP                  :{BLACK}이 차량이 있는 곳으로 이동
+STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP                          :{BLACK}이 선박이 있는 곳으로 이동합니다
+STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP                      :{BLACK}이 항공기가 있는 곳으로 이동
+
+STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP                    :{BLACK}기차를 차량기지로 보냅니다. (CTRL+클릭시 점검만 하러 보냄)
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}차량을 차고로 보냅니다. CTRL+클릭하면 점검만 합니다.
+STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}선박을 정박소로 보냅니다. CTRL+클릭하면 점검만 합니다.
+STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}항공기를 격납고로 보냅니다. CTRL+클릭하면 점검만 합니다
+
+STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}열차 상세정보 보기
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}자동차 상세정보 보이기
+STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}선박 상세정보 보기
+STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}항공기 상세정보 보기
+
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}다른 종류의 화물을 실을 수 있도록 열차를 개조
+STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}자동차가 다른 종류의 화물을 싣도록 개조
+STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}이 선박이 다른 종류의 화물을 싣도록 개조
+STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}이 항공기가 다른 종류의 화물을 싣도록 개조
+
+STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}{TOWN} 차량기지로 가는 중
+STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}{TOWN} 차량기지로 가는 중 ({VELOCITY})
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}{TOWN} 차고로 가는 중
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}{TOWN} 차고로 가는 중 ({VELOCITY})
+STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}{TOWN} 정박소로 가는 중
+STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}{TOWN} 정박소로 가는 중 ({VELOCITY})
+STR_HEADING_FOR_HANGAR                                          :{ORANGE}{STATION}공항 격납고로 가는 중
+STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}{STATION}공항 격납고로 가는 중 ({VELOCITY})
+
+STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}{TOWN} 차량기지로 점검하러 가는중
+STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}{TOWN} 차량기지로 점검하러 가는 중 ({VELOCITY})
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}{TOWN} 차고로 점검하러 가는중
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}{TOWN} 차고로 점검하러 가는중 ({VELOCITY})
+STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}{TOWN} 정박소로 점검하러 가는 중
+STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}{TOWN} 정박소로 점검하러 가는 중 ({VELOCITY})
+STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}{STATION}공항 격납고로 점검하러 가는 중
+STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}{STATION}공항 격납고로 점검하러 가는 중 ({VELOCITY})
+
+
+STR_CLONE_TRAIN                                                 :{BLACK}기차 복제
+STR_CLONE_ROAD_VEHICLE                                          :{BLACK}차량 복제
+STR_CLONE_SHIP                                                  :{BLACK}선박 복제
+STR_CLONE_AIRCRAFT                                              :{BLACK}항공기 복제
+
+STR_CLONE_TRAIN_INFO                                            :{BLACK}이 버튼은 객차/화물차를 포함한 열차 전체를 복제할 것입니다. CTRL+클릭하면 경로도 같이 공유됩니다.
+STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}이 버튼은 자동차를 복제할 것입니다. CTRL+클릭하시면 경로도 같이 공유됩니다.
+STR_CLONE_SHIP_INFO                                             :{BLACK}이 버튼은 선박을 복제할 것입니다. CTRL+클릭은 경로를 같이 공유합니다.
+STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}이 버튼은 항공기를 복제할 것입니다. CTRL+클릭은 경로를 같이 공유합니다.
+
+STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}이 버튼은 객차/화물차를 포함한 열차 전체를 복제할 것입니다. 이 버튼을 클릭하고 차고 안/밖에 있는 차량을 클릭하십시오. CTRL+클릭하면 경로도 같이 공유됩니다.
+STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}이 버튼은 자동차를 복제할 것입니다. 이 버튼을 클릭하고 차고 안/밖에 있는 차량을 클릭하십시오. CTRL+클릭하면 경로도 같이 공유됩니다.
+STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}이 버튼을 누르고 복제를 원하는 선박을 클릭하십시오. CTRL+클릭은 경로를 같이 공유합니다.
+STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}이 버튼을 누르고 복제를 원하는 항공기를 클릭하십시오. CTRL+클릭은 경로를 같이 공유합니다.
+
+STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}새 기차
+STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}새 전기 기차
+STR_BUILD_VEHICLE_TRAIN_MONORAIL_CAPTION                        :{WHITE}새 모노레일
+STR_BUILD_VEHICLE_TRAIN_MAGLEV_CAPTION                          :{WHITE}새 자기부상열차
+
+STR_BUILD_VEHICLE_TRAIN_ALL_CAPTION                             :{WHITE}기차
+STR_BUILD_VEHICLE_ROAD_VEHICLE_CAPTION                          :{WHITE}새 자동차
+STR_BUILD_VEHICLE_SHIP_CAPTION                                  :{WHITE}새 선박
+STR_BUILD_VEHICLE_AIRCRAFT_CAPTION                              :{WHITE}새 항공기
+
+STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_BUTTON                    :{BLACK}차량 만들기
+STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_BUTTON             :{BLACK}차량 만들기
+STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON                     :{BLACK}선박 만들기
+STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON                 :{BLACK}항공기 만들기
+
+STR_BUILD_VEHICLE_TRAIN_LIST_TOOLTIP                            :{BLACK}기차 선택 목록 - 차량 정보를 보려면 클릭
+STR_BUILD_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP                     :{BLACK}자동차 선택 목록 - 차량 정보를 보려면 클릭
+STR_BUILD_VEHICLE_SHIP_LIST_TOOLTIP                             :{BLACK}선박 선택 목록 - 선박의 정보를 보려면 클릭하세요
+STR_BUILD_VEHICLE_AIRCRAFT_LIST_TOOLTIP                         :{BLACK}항공기 선택 목록 - 항공기 정보를 보려면 클릭하세요
+
+STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_TOOLTIP                   :{BLACK}선택된 차량 생산
+STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_TOOLTIP            :{BLACK}선택한 자동차 만들기
+STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP                    :{BLACK}선택한 선박 만들기
+STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_TOOLTIP                :{BLACK}선택한 항공기 만들기
+
+STR_BUILD_VEHICLE_TRAIN_RENAME_BUTTON                           :{BLACK}이름
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}이름 지정
+STR_BUILD_VEHICLE_SHIP_RENAME_BUTTON                            :{BLACK}이름 지정
+STR_BUILD_VEHICLE_AIRCRAFT_RENAME_BUTTON                        :{BLACK}이름 지정
+
+STR_BUILD_VEHICLE_TRAIN_RENAME_TOOLTIP                          :{BLACK}차량 타입의 이름을 다시 지정
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}자동차 타입의 이름 지정
+STR_BUILD_VEHICLE_SHIP_RENAME_TOOLTIP                           :{BLACK}선박 타입의 이름 지정
+STR_BUILD_VEHICLE_AIRCRAFT_RENAME_TOOLTIP                       :{BLACK}항공기 타입의 이름 지정
+
+STR_QUERY_RENAME_TRAIN_TYPE_CAPTION                             :{WHITE}열차 차량 타입 이름 재지정
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}자동차 타입의 이름 지정
+STR_QUERY_RENAME_SHIP_TYPE_CAPTION                              :{WHITE}선박 타입의 이름 지정
+STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION                          :{WHITE}항공기 타입의 이름 지정
+
+STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}새 열차
+STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_BUTTON                      :{BLACK}새 차량
+STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON                              :{BLACK}새 선박
+STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON                          :{BLACK}새 항공기
+
+STR_DEPOT_TRAIN_LIST_TOOLTIP                                    :{BLACK}열차 - 열차 정보를 보려면 클릭, 차량을 드래그해서 추가하거나 삭제하세요
+STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}차량 - 차량 정보를 보려면 클릭
+STR_DEPOT_SHIP_LIST_TOOLTIP                                     :{BLACK}선박 - 선박의 정보를 보려면 클릭하세요
+STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}항공기 - 항공기 정보를 보려면 클릭하세요
+
+STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP                            :{BLACK}새 기차 만들기
+STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}새 자동차 만들기
+STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}새 선박을 만듭니다
+STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}새 항공기
+
+STR_DEPOT_TRAIN_SELL_TOOLTIP                                    :{BLACK}기관차/객차/화물차 한량만 제거하려면 여기로 드래그하세요
+STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}자동차를 팔려면 여기로 드래그하세요
+STR_DEPOT_SHIP_SELL_TOOLTIP                                     :{BLACK}선박을 팔려면 여기로 드래그하세요
+STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}항공기를 팔려면 여기로 드래그하세요
+
+STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}차량기지가 있는 곳으로 이동
+STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}이 차고가 있는 곳으로 이동
+STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}이 정박소가 잇는 위치로 이동합니다
+STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}이 격납고가 있는 공항으로 이동
+
+
 ### depot strings
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}이 안에 있는 모든 차량을 판매하려고 합니다. 정말 판매하시겠습니까?
 STR_DEPOT_WRONG_DEPOT_TYPE                                      :잘못된 차량기지 종류
@@ -3212,6 +3230,7 @@ STR_REPLACE_REMOVE_WAGON                                        :{BLACK}화물�
 STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}자동교체시에 열차가 기존보다 길어지면 화물차를 제거함으로써 교체시 달라지는 열차의 길이를 같게 조정합니다 (앞쪽부터 시작됨)
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}교체중: {ORANGE}{SKIP}{SKIP}{STRING}
 STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}기관차/화물차 교체 창을 번갈아 띄웁니다
+
 STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}열차는 불가능합니다
 STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}차량은 불가능합니다
 STR_SHIP_NOT_AVAILABLE                                          :{WHITE}선박은 불가능합니다
@@ -3426,7 +3445,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}
@@ -3444,6 +3466,31 @@ STR_FORMAT_COMPANY_NUM                                          :(회사 {COMMA}
 STR_FORMAT_GROUP_NAME                                           :그룹 {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                                                     :{G=m}{BLACK}6
+STR_BLACK_7                                                     :{G=m}{BLACK}7
+
 STR_NAME_MUST_BE_UNIQUE                                         :{WHITE}이름은 유일해야 합니다
 
 #### Improved sign GUI
diff --git a/src/lang/latvian.txt b/src/lang/latvian.txt
index 1d067571d..17325624e 100644
--- a/src/lang/latvian.txt
+++ b/src/lang/latvian.txt
@@ -156,8 +156,6 @@ STR_ABBREV_PLASTIC                                              :{TINYFONT}PL
 STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}BU
 STR_ABBREV_NONE                                                 :{TINYFONT}NAV
 STR_ABBREV_ALL                                                  :{TINYFONT}VISI
-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
@@ -169,17 +167,11 @@ STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Orģinā
 STR_ABOUT_VERSION                                               :{BLACK}OpenTTD versija {REV}
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 OpenTTD grupa
 
-STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
-STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_QUIT_CAPTION                                                :{WHITE}Iziet
 STR_YES                                                         :{BLACK}Jā
 STR_NO                                                          :{BLACK}Nē
 STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Vai Tu tiešām gribi pamest šo spēli un atgriezties uz {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                                                :Nekā
 STR_COLOUR_DARK_BLUE                                            :Tumši zils
 STR_COLOUR_PALE_GREEN                                           :Gaiši zaļš
@@ -198,8 +190,6 @@ STR_COLOUR_BROWN                                                :Brūns
 STR_COLOUR_GREY                                                 :Pelēks
 STR_COLOUR_WHITE                                                :Balts
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}Spēlē ir pārāk daudz transporta līdzekļu
-STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
-STR_RED_COMMA                                                   :{RED}{COMMA}
 STR_BUTTON_LOCATION                                             :{BLACK}Izvietojums
 STR_SMALLMAP_TYPE_CONTOURS                                      :Kontūras
 STR_SMALLMAP_TYPE_VEHICLES                                      :Transporta līdzekļi
@@ -324,12 +314,13 @@ STR_SORT_ORDER_TIP                                              :{BLACK}Izvēlie
 STR_SORT_CRITERIA_TIP                                           :{BLACK}Izvēlieties kārtošanas kritēriju
 STR_SORT_BY                                                     :{BLACK}Kārtot pēc
 
+### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}Iedzīvotāju skaita
+STR_SORT_BY_NAME                                                :{BLACK}Vārda
+STR_SORT_BY_DATE                                                :{BLACK}Datuma
 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_DATE                                                :{BLACK}Datuma
 STR_SORT_BY_NUMBER                                              :Numura
 STR_SORT_BY_PROFIT_LAST_YEAR                                    :Ienākumiem pērn
 STR_SORT_BY_PROFIT_THIS_YEAR                                    :Ienākumiem šogad
@@ -350,37 +341,25 @@ STR_SORT_BY_INTRO_DATE                                          :Ieviešanas dat
 STR_SORT_BY_RUNNING_COST                                        :Lietošanas izmaksas
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :Jaudas/lietošanas izmaksas
 STR_SORT_BY_CARGO_CAPACITY                                      :Kravnesība
+
 STR_NO_WAITING_CARGO                                            :{BLACK}Neviena veida krava negaida
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}Izvēlēties visu aprīkojumu
 STR_SELECT_ALL_TYPES                                            :{BLACK}Izvēlēties visus kravas veidus (ieskaitot, kas negaida)
-STR_AVAILABLE_TRAINS                                            :{BLACK}Pieejamie vilcieni
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Pieejamie transportlīdzekļi
-STR_AVAILABLE_SHIPS                                             :{BLACK}Pieejamie kuģi
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Pieejamie lidaparāti
 STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Apskatīties visus vilcējus, kas pieejami šim transportlīdzekļu veidam.
 STR_MANAGE_LIST                                                 :{BLACK}Labot sarakstu
 STR_MANAGE_LIST_TIP                                             :{BLACK}Dot norādījumus visiem transportlīdzekļiem, kas ir šajā sarakstā
 STR_REPLACE_VEHICLES                                            :Nomainīt transportlīdzekļus
+STR_SEND_FOR_SERVICING                                          :Sūtīt uz apkopi
+
+STR_AVAILABLE_TRAINS                                            :{BLACK}Pieejamie vilcieni
+STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Pieejamie transportlīdzekļi
+STR_AVAILABLE_SHIPS                                             :{BLACK}Pieejamie kuģi
+STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Pieejamie lidaparāti
+
 STR_SEND_TRAIN_TO_DEPOT                                         :Sūtīt uz depo
 STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Sūtīt uz depo
 STR_SEND_SHIP_TO_DEPOT                                          :Sūtīt uz depo
 STR_SEND_AIRCRAFT_TO_HANGAR                                     :Sūtīt uz angāru
-STR_SEND_FOR_SERVICING                                          :Sūtīt uz apkopi
-
-############ 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                                            :Mai
-STR_MONTH_ABBREV_JUN                                            :Jūn
-STR_MONTH_ABBREV_JUL                                            :Jūl
-STR_MONTH_ABBREV_AUG                                            :Aug
-STR_MONTH_ABBREV_SEP                                            :Sep
-STR_MONTH_ABBREV_OCT                                            :Okt
-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}
@@ -408,8 +387,6 @@ 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_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
@@ -456,7 +433,7 @@ STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Neviens/neviena
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Vārds
 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                                          :1.
 STR_ORDINAL_NUMBER_2ND                                          :2.
 STR_ORDINAL_NUMBER_3RD                                          :3.
@@ -490,6 +467,34 @@ STR_ORDINAL_NUMBER_30TH                                         :30.
 STR_ORDINAL_NUMBER_31ST                                         :31.
 ############ 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                                            :Mai
+STR_MONTH_ABBREV_JUN                                            :Jūn
+STR_MONTH_ABBREV_JUL                                            :Jūl
+STR_MONTH_ABBREV_AUG                                            :Aug
+STR_MONTH_ABBREV_SEP                                            :Sep
+STR_MONTH_ABBREV_OCT                                            :Okt
+STR_MONTH_ABBREV_NOV                                            :Nov
+STR_MONTH_ABBREV_DEC                                            :Dec
+
+STR_MONTH_JAN                                                   :Janvāris
+STR_MONTH_FEB                                                   :Februāris
+STR_MONTH_MAR                                                   :Marts
+STR_MONTH_APR                                                   :Aprīlis
+STR_MONTH_MAY                                                   :Maijs
+STR_MONTH_JUN                                                   :Jūnijs
+STR_MONTH_JUL                                                   :Jūlijs
+STR_MONTH_AUG                                                   :Augusts
+STR_MONTH_SEP                                                   :Septembris
+STR_MONTH_OCT                                                   :Oktobris
+STR_MONTH_NOV                                                   :Novembris
+STR_MONTH_DEC                                                   :Decembris
+############ range for months ends
+
 STR_GRAPH_Y_LABEL_NUMBER                                        :{TINYFONT}{COMMA}
 
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}Pieņem kravu: {LTBLUE}
@@ -579,12 +584,9 @@ 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_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_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
@@ -665,9 +667,7 @@ STR_OFF                                                         :Nav
 STR_SUMMARY                                                     :Kopsavilkums
 STR_FULL                                                        :Pilns
 STR_STATUSBAR_COMPANY_NAME                                      :{SILVER}- -  {COMPANY}  - -
-STR_BLACK_STRING                                                :{BLACK}{STRING}
 
-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
@@ -759,9 +759,6 @@ STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY                             :Finansēt jaunu
 ############ range ends here
 
 STR_FUND_INDUSTRY_CAPTION                                       :{WHITE}Finansēt jaunu industriālo objektu
-STR_JUST_STRING                                                 :{STRING}
-STR_JUST_RAW_STRING                                             :{STRING}
-STR_JUST_INT                                                    :{NUM}
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_RAINFOREST                       :{WHITE}...var celt tikai mežu apgabalos
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT                           :{WHITE}...var celt tikai tuksnešainos apgabalos
 STR_STATUSBAR_PAUSED                                            :{YELLOW}* *  PAUZE  *  *
@@ -775,9 +772,6 @@ 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_BLACK_6                                                     :{BLACK}6
-STR_BLACK_7                                                     :{BLACK}7
-
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Angļu (oriģinālie)
 STR_TOWNNAME_FRENCH                                             :Franču
@@ -855,19 +849,6 @@ STR_OPTIONS_BASE_GRF_TIP                                        :{BLACK}Uzslēgt
 
 STR_AUTOSAVE_FAILED                                             :{WHITE}Automātiskā saglabāšana neizdevās
 
-STR_MONTH_JAN                                                   :Janvāris
-STR_MONTH_FEB                                                   :Februāris
-STR_MONTH_MAR                                                   :Marts
-STR_MONTH_APR                                                   :Aprīlis
-STR_MONTH_MAY                                                   :Maijs
-STR_MONTH_JUN                                                   :Jūnijs
-STR_MONTH_JUL                                                   :Jūlijs
-STR_MONTH_AUG                                                   :Augusts
-STR_MONTH_SEP                                                   :Septembris
-STR_MONTH_OCT                                                   :Oktobris
-STR_MONTH_NOV                                                   :Novembris
-STR_MONTH_DEC                                                   :Decembris
-
 STR_HEADING_FOR_STATION                                         :{LTBLUE}Dodas uz {STATION}
 STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}Dodas uz {STATION}, {VELOCITY}
 STR_NO_ORDERS                                                   :{LTBLUE}Nav rīkojumu
@@ -882,8 +863,6 @@ STR_CRATES                                                      :kastes
 STR_RES_OTHER                                                   :cita
 STR_NOTHING                                                     :
 
-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...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Dalīto rīkojumu beigas - -
@@ -1150,7 +1129,6 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Kartes
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :atspējots
-STR_JUST_CURRENCY                                               :{CURRENCY}
 STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Mainīt iestatījuma vērtību
 
 STR_TEMPERATE_LANDSCAPE                                         :Mērenais klimats
@@ -1186,7 +1164,6 @@ STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}Izvēlat
 
 STR_WAYPOINT_VIEWPORT                                           :{WHITE}{WAYPOINT}
 STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WHITE}{WAYPOINT}
-STR_WAYPOINT_NAME                                               :{WAYPOINT}
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Labot kontrolpunkta nosaukumu
 
 STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}Nevar pārsaukt kontrolpunktu...
@@ -1253,11 +1230,6 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}IRūpnī
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...pārāk tuvu citai rūpnīcai
 
-STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Pielāgot vilcienu citas kravas pārvadāšanai
-STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Pārbūvēt vilcienu
-STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Izvēlaties kravas veidu, ko pārvadāt ar vilcienu
-STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Pārbūvēt vilcienu izceltā kravas veida pārvadāšanai
-STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Nevar pārbūvēt vilcienu...
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Mainīt produkciju
 
 ############ network gui strings
@@ -1766,11 +1738,6 @@ STR_TOWN_BUILDING_NAME_TEPEES_1                                 :Vigvams
 STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1                           :Tējkannas namiņš
 STR_TOWN_BUILDING_NAME_PIGGY_BANK_1                             :Cūciņas banka
 
-STR_INDUSTRY_NAME                                               :{INDUSTRY}
-STR_TOWN_NAME                                                   :{TOWN}
-STR_FORMAT_INDUSTRY_NAME                                        :{TOWN} {STRING}
-STR_STATION_NAME                                                :{STATION}
-
 ##id 0x2800
 STR_LANDSCAPING_MENU_LANDSCAPING                                :Reljefa veidošana
 STR_LANDSCAPING_MENU_PLANT_TREES                                :Stādīt kokus
@@ -1825,6 +1792,12 @@ STR_CARGO_RATING_EXCELLENT                                      :Lielisks
 STR_CARGO_RATING_OUTSTANDING                                    :Izcils
 ############ range for rating ends
 
+### station view strings
+STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Rādīt vilcienus, kuru rīkojumu sarakstos ir šī stacija
+STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Rādīt mašīnas, kuru rīkojumu sarakstos ir šī stacija
+STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Rādīt lidaparātus, kuru rīkojumu sarakstos ir šī stacija
+STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Rādīt kuģus, kuru rīkojumu sarakstos ir šī stacija
+
 STR_STATION_VIEW_CARGO_RATING                                   :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO                        :{WHITE}{STATION} vairs nepieņem {STRING}
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO               :{WHITE}{STATION} vairs nepieņem {STRING} vai {STRING}
@@ -2068,6 +2041,7 @@ STR_SV_STNAME_AIRPORT                                           :{STRING} Lidost
 STR_SV_STNAME_OILFIELD                                          :{STRING} Naftas lauks
 STR_SV_STNAME_MINES                                             :{STRING} Raktuves
 STR_SV_STNAME_DOCKS                                             :{STRING} Doki
+##id 0x6020
 STR_SV_STNAME_ANNEXE                                            :{STRING} Piebūve
 STR_SV_STNAME_SIDINGS                                           :{STRING} Rezerves ceļš
 STR_SV_STNAME_BRANCH                                            :{STRING} Atzars
@@ -2115,8 +2089,6 @@ STR_NUM_LOW                                                     :Zems
 STR_NUM_NORMAL                                                  :Normāls
 STR_NUM_HIGH                                                    :Augsts
 STR_NUM_CUSTOM                                                  :Speciālie
-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
@@ -2150,7 +2122,6 @@ STR_CITY_APPROVAL_HOSTILE                                       :Naidīgs
 
 ##id 0x7000
 STR_COMPANY_VIEW_CAPTION                                        :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
-STR_FORMAT_COMPANY_NUM                                          :(Uzņēmums {COMMA})
 STR_COMPANY_VIEW_NEW_FACE_BUTTON                                :{BLACK}Jauna seja
 STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON                           :{BLACK}Krāsu sidentitāte
 STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}Krāsu identitāte
@@ -2183,7 +2154,6 @@ STR_FINANCES_TOTAL_CAPTION                                      :{WHITE}Kopā:
 STR_COMPANY_NAME_COMPANY_NUM                                    :{COMPANY} {COMPANYNUM}
 STR_GRAPH_INCOME_CAPTION                                        :{WHITE}Ienākumu grafiks
 STR_CURRCOMPACT                                                 :{CURRCOMPACT}
-STR_JUST_COMMA                                                  :{COMMA}
 STR_GRAPH_OPERATING_PROFIT_CAPTION                              :{WHITE}Darbības peļņas grafiks
 STR_FINANCES_BANK_BALANCE_TITLE                                 :{WHITE}Bankas bilance
 STR_FINANCES_LOAN_TITLE                                         :{WHITE}Aizdevums
@@ -2585,10 +2555,8 @@ STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE                          :viensliežu lok
 STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE                            :magnētiskā lokomotīve
 
 ##id 0x8800
-STR_DEPOT_TRAIN_CAPTION                                         :{WHITE}{TOWN} Vilcienu depo
 STR_NEWS_FIRST_TRAIN_ARRIVAL                                    :{BLACK}{BIGFONT}Iedzīvotāji svin svētkus . . .{}Pirmais vilciens ierodas {STATION}!
 STR_VEHICLE_DETAILS_CAPTION                                     :{WHITE}{VEHICLE} (Sīkāka informācija)
-STR_ERROR_TRAIN_IN_THE_WAY                                      :{WHITE}Vilciens ceļā
 STR_ORDER                                                       :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 STR_ORDER_SELECTED                                              :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 STR_ORDER_NON_STOP                                              :{BLACK}Nestāties
@@ -2675,38 +2643,16 @@ STR_TIMETABLE_AND_TRAVEL_FOR                                    :un braukt līdz
 STR_TIMETABLE_DAYS                                              :{COMMA} dien{P a as u}
 STR_TIMETABLE_TICKS                                             :{COMMA} tikšķ{P is i u}
 
-STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Dodas uz {TOWN} vilcienu depo
-STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Dodas uz {TOWN} vilcienu depo, {VELOCITY}
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Apkope {TOWN} vilcienu depo
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Apkope {TOWN} vilcienu depo, {VELOCITY}
-
 STR_INVALID_ORDER                                               :{RED} (Nederīgs rīkojums)
 
 STR_UNKNOWN_STATION                                             :nezināma stacija
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}Tukšs
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} no {STATION}
 STR_VEHICLE_DETAILS_CARGO_FROM_MULT                             :{LTBLUE}{CARGO} no {STATION} (x{NUM})
-STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} gaida depo
-STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Jauni transportlīdzekļi
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}Vilciens ir pārāk garš
 STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}Vilcienus ir iespējams pārveidot tikai tad, kad tie ir apstādināti depo
-STR_VEHICLE_LIST_TRAIN_CAPTION                                  :{WHITE}{STRING} - {COMMA} Vilcien{P s i a}
 
-STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}Jauni vilcieni
-STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}Jauni Elektriskā Dzelzceļa Satiksmes Līdzekļi
-STR_BUILD_VEHICLE_TRAIN_MONORAIL_CAPTION                        :{WHITE}Jauni vilcieni
-STR_BUILD_VEHICLE_TRAIN_MAGLEV_CAPTION                          :{WHITE}Jauni vilcieni
-STR_BUILD_VEHICLE_TRAIN_ALL_CAPTION                             :{WHITE}Vilcieni
-
-STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_BUTTON                    :{BLACK}Būvēt Satiksmes Līdzekli
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Klonēt Satiksmes Līdzekli
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Šis uzbūvēs autotransporta kopiju, Izmantojot CTRL+klik, autotransporti dalīsies ar rīkojumiem
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Šis uzbūvēs autotransporta kopiju, Klik uz pogas un pēc tam uz autotransporta. Izmantojot CTRL+klik, autotransporti dalīsies ar rīkojumiem
-STR_CLONE_TRAIN                                                 :{BLACK}Kopēt vilcienu
-STR_CLONE_TRAIN_INFO                                            :{BLACK}Šis uzbūvēs vilciena kopiju ar visiem vagoniem. Izmantojot CTRL+klik, vilcieni dalīsies ar rīkojumiem
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Šis uzbūvēs vilciena kopiju ar visiem vagoniem. Klik uz šīs pogas un pēc tam uz vilciena. Izmantojot CTRL+klik, vilcieni dalīsies ar rīkojumiem
-STR_BUILD_VEHICLE_TRAIN_RENAME_BUTTON                           :{BLACK}Pārsaukt
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Izlaist
 STR_ORDERS_DELETE_BUTTON                                        :{BLACK}Izdzēst
 STR_ORDERS_GO_TO_BUTTON                                         :{BLACK}Doties uz
@@ -2722,14 +2668,12 @@ STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Pārslē
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Rīkojumi)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Rīkojumu beigas - -
 STR_SERVICE                                                     :{BLACK}Serviss
-STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Vilcienu nevar uzbūvēt...
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}  Uzbūvēts: {LTBLUE}{NUM}{BLACK} Vērtība: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Vērtība: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
 STR_VEHICLE_STATUS_LOADING_UNLOADING                            :{LTBLUE}Iekraušana / Izkraušana
 STR_VEHICLE_STATUS_LEAVING                                      :{LTBLUE}Aizbrauc
 STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}Vilciens ja'apsta'dina kad tas ierodas depo
-STR_ERROR_CAN_T_SEND_TRAIN_TO_DEPOT                             :{WHITE}Nevar aizsūtīt vilcienu uz depo...
 STR_ERROR_NO_MORE_SPACE_FOR_ORDERS                              :{WHITE}Pietrūkst vieta rīkojumiem
 STR_ERROR_TOO_MANY_ORDERS                                       :{WHITE} Pārāk daudz rīkojumu
 STR_ERROR_CAN_T_INSERT_NEW_ORDER                                :{WHITE}Nevar ielikt jaunu rīkojumu...
@@ -2744,26 +2688,11 @@ STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE}transpor
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}Transporta līdzekli nevar pārvietot...
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}Aizmugures dzinējs vienmēr sekos priekšējam dzinējam
 STR_CARGO_N_A                                                   :Nav info{SKIP}
-STR_ERROR_CAN_T_SELL_TRAIN                                      :{WHITE}Vilcienu nevar pārdot...
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}Nevar atrast ceļu uz vietējo depo
-STR_ERROR_CAN_T_STOP_START_TRAIN                                :{WHITE}Nevar apturēt/startēt vilcienu...
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}Apkopes intervāls: {LTBLUE}{COMMA}dienas{BLACK}   Pēdējā apkope: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}Apkopes intervāls: {LTBLUE}{COMMA}%{BLACK}   Pēdējā apkope: {LTBLUE}{DATE_LONG}
-STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP                             :{BLACK}Vilcieni - klik uz vilciena priekš informācijas
-STR_DEPOT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Vilcieni - klik uz vilciena priekš informācijas, velc vagonu, lai pievienotu/atvienotu vilcienam
-STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP                            :{BLACK}Būvēt jaunu vilciena vagonu
-STR_DEPOT_TRAIN_SELL_TOOLTIP                                    :{BLACK}Velc vagonu šeit, lai to pārdotu
-STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}Centrēt galveno skatu uz vilciena depo atrašanās vietu
-STR_BUILD_VEHICLE_TRAIN_LIST_TOOLTIP                            :{BLACK}Vilciena vagonu atlasīšanas saraksts - klik uz vagonu priekš informācijas
-STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_TOOLTIP                   :{BLACK}Būvēt atzīmēto vilciena vagonu
-STR_BUILD_VEHICLE_TRAIN_RENAME_TOOLTIP                          :{BLACK}Pārsaukt vilciena vagona tipu
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP                 :{BLACK}Pašreizējā vilciena darbība - klik šeit, lai apstādinātu/palaistu vilcienu
-STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP                           :{BLACK}Parādīt vilciena rīkojumus
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP                         :{BLACK}Centrēt galveno skatu uz vilciena atrašanās vietu
-STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP                    :{BLACK}Sūtīt vilcienu uz depo. Ctrl+klik - tikai apkope
 STR_VEHICLE_VIEW_TRAIN_IGNORE_SIGNAL_TOOLTIP                    :{BLACK}Piespiest vilcienu ignorēt signālu
 STR_VEHICLE_VIEW_TRAIN_REVERSE_TOOLTIP                          :{BLACK}Apgriezt vilcienu
-STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Rādīt vilciena informāciju
 STR_VEHICLE_DETAILS_INCREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Palielināt apkopes intervālu
 STR_VEHICLE_DETAILS_DECREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Samazināt apkopes intervālu
 STR_VEHICLE_DETAILS_TRAIN_CARGO_TOOLTIP                         :{BLACK}Rādīt informāciju par pārvadājamo kravu
@@ -2784,13 +2713,9 @@ STR_VEHICLE_STATUS_STOPPED                                      :{RED}Apstādin�
 STR_ERROR_CAN_T_MAKE_TRAIN_PASS_SIGNAL                          :{WHITE}Vilciens nevar šķērsot signālu briesmās...
 STR_VEHICLE_STATUS_CRASHED                                      :{RED}Cietis avārijā!
 
-STR_QUERY_RENAME_TRAIN_CAPTION                                  :{WHITE}Nosaukt vilcienu
-STR_ERROR_CAN_T_RENAME_TRAIN                                    :{WHITE}Nevar nosaukt vilcienu...
-STR_VEHICLE_DETAILS_TRAIN_RENAME                                :{BLACK}Nosaukt vilcienu
 STR_NEWS_TRAIN_CRASH                                            :{BLACK}{BIGFONT}Vilciena avārija!{}{COMMA} mirušie
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Vilcienu nevar apgriezt...
-STR_QUERY_RENAME_TRAIN_TYPE_CAPTION                             :{WHITE}Pārsaukt vilciena vagona tipu
-STR_ERROR_CAN_T_RENAME_TRAIN_TYPE                               :{WHITE}Nevar pārsaukt vilciena vagona tipu...
+STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Nevar pagriezt transportlīdzekļus, kas sastāv no vairākām daļām
 STR_CLEAR_TIME                                                  :{BLACK}Notīrīt laiku
 STR_RESET_LATENESS                                              :{BLACK}Nomest kavējuma skaitītāju
 STR_CHANGE_WAYPOINT_NAME                                        :{BLACK}Pārsaukt kontrolpunktu
@@ -2822,178 +2747,53 @@ STR_TIMETABLE_AUTOFILL                                          :{BLACK}Auto-aiz
 STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Aizpildīt sarakstu automātiski ar vērtībām no nākošā ceļojuma (CTRL-click lai mēģinātu paturēt gaidīšanas laikus)
 
 ##id 0x9000
-STR_ERROR_ROAD_VEHICLE_IN_THE_WAY                               :{WHITE}Ceļu transportl. ceļā
-STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING} - {COMMA} Ceļu transportlīdzek{P lis ļi ļa}
-STR_DEPOT_ROAD_VEHICLE_CAPTION                                  :{WHITE}{TOWN} Autotransporta depo
-STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_BUTTON                      :{BLACK}Jauni transporta līdzekļi
-STR_BUILD_VEHICLE_ROAD_VEHICLE_CAPTION                          :{WHITE}Jauni transportl.
-STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_BUTTON             :{BLACK}Būvēt transportl.
-STR_ERROR_CAN_T_BUILD_ROAD_VEHICLE                              :{WHITE}Nevar uzbūvēt transportl. ...
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}...jābūt apstādinātam depo iekšpusē
-STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}Transportl. nevar pārdot...
-STR_ERROR_CAN_T_STOP_START_ROAD_VEHICLE                         :{WHITE}Transportl. nevar apstādināt/palaist...
-STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} gaida depo
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Dodas uz {TOWN} depo
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Dodas uz {TOWN} depo, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Apkope {TOWN} depo
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Apkope {TOWN} depo, {VELOCITY}
-STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Nevar aizsūtīt uz depo
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Nevar atrast vietējo depo
-STR_VEHICLE_LIST_ROAD_VEHICLE_TOOLTIP                           :{BLACK}Transportlīdzekļi - klik uz tā priekš informācijas
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP          :{BLACK}Transportl. pašreizējā darbība - klik šeit, lai apstādinātu/palaistu to
-STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP                    :{BLACK}Rādīt transportl. rīkojumus
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP                  :{BLACK}Centrēt galveno skatu uz transportl.
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}Sūtīt transportl. uz depo. Ctrl+klik tikai apkope
 STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP                   :{BLACK}Piespiest transportl. apgriezties
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Rādīt transportl. informāciju
-STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Transportlīdzekļi - klik uz tā, priekš informācijas
-STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}Būvēt jaunu transportl.
-STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}Velc transportl. šeit ,lai to pārdotu
-STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}Centrēt galveno skatu uz transportl. depo
-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_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})
 
-STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Nosaukt transportl.
-STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Nevar nosaukt transportl. ...
-STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Nosaukt transportl.
 STR_NEWS_FIRST_BUS_ARRIVAL                                      :{BLACK}{BIGFONT}Pilsētnieki svin . . .{}Pirmais autobuss ierodas {STATION}!
 STR_NEWS_FIRST_TRUCK_ARRIVAL                                    :{BLACK}{BIGFONT}Pilsētnieki svin . . .{}Pirmā kravas automašīna ierodas {STATION}!
 STR_NEWS_FIRST_PASSENGER_TRAM_ARRIVAL                           :{BLACK}{BIGFONT}Pilsoņi līksmo . . .{}Pirmais pasažieru tramvajs ierodas {STATION}!
 STR_NEWS_FIRST_CARGO_TRAM_ARRIVAL                               :{BLACK}{BIGFONT}Pilsoņi līksmo . . .{}Pirmais kravas tramvajs ierodas {STATION}!
 STR_NEWS_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Autotransporta avārija!{}Vadītājs mirst uzreiz pēc sadursmes ar vilcienu.
 STR_NEWS_ROAD_VEHICLE_CRASH                                     :{BLACK}{BIGFONT}Autotransporta avārija!{}{COMMA} mirst pēc sadursmes ar vilcienu
-STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Nevar pagriezt transportlīdzekļus, kas sastāv no vairākām daļām
-STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Pārsaukt
-STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Pārsaukt transportl. tipu
-STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Pārsaukt transportl. tipu
-STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Nevar pārsaukt transportl. tipu...
 
-STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Nomainīt ceļu transportlīdzekļa kravas veidu
-STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Pārbūvēt ceļu transportlīdzekli
-STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Nomainīt ceļu transportlīdzekļa kravas veidu uz izvēlēto
-STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Nav iespējams pārbūvēt ceļu transportlīdzekli
-STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Izvēlies kravas tipu mašīnai
 
 ##id 0x9800
 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :Ūdensceļu celtniecība
 STR_WATERWAYS_TOOLBAR_CAPTION                                   :{WHITE}Ūdensceļu celtniecība
 STR_WATERWAYS_TOOLBAR_CAPTION_SE                                :{WHITE}Ūdensceļi
 STR_ERROR_CAN_T_BUILD_DOCK_HERE                                 :{WHITE}Nevar uzbūvēt ostu šeit
-STR_DEPOT_SHIP_CAPTION                                          :{WHITE}{TOWN} Kuģu depo
-STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON                              :{BLACK}Jauni kuģi
-STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - {COMMA} Kuģ{P is i u}
-STR_BUILD_VEHICLE_SHIP_CAPTION                                  :{WHITE}Jauni kuģi
-STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON                     :{BLACK}Uzbūvēt kuģi
-STR_CLONE_SHIP                                                  :{BLACK}Klonēt kuģi
-STR_CLONE_SHIP_INFO                                             :{BLACK}Šis uzbūvēs kuģa kopiju, Izmantojot CTRL+klik, kuģi dalīsies ar rīkojumiem
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Šis uzbūvēs kuģa kopiju, Klik uz pogas un pēc tam uz kuģa. Izmantojot CTRL+klik, kuģi dalīsies ar rīkojumiem
 STR_ERROR_SHIP_MUST_BE_STOPPED_IN_DEPOT                         :{WHITE}Kuģim jābūt apstādinātam depo
-STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}Nevar pārdot kuģi...
-STR_ERROR_CAN_T_BUILD_SHIP                                      :{WHITE}Nevar uzbūvēt kuģi...
-STR_ERROR_SHIP_IN_THE_WAY                                       :{WHITE}Kuģis ir ceļā
-STR_ERROR_CAN_T_STOP_START_SHIP                                 :{WHITE}Nevar apstādināt/palaist kuģi...
-STR_ERROR_CAN_T_SEND_SHIP_TO_DEPOT                              :{WHITE}Kuģi nevar aizsūtīt uz depo...
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Dodas uz {TOWN} kuģu depo
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Dodas uz {TOWN} kuģu depo, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Apkope {TOWN} kuģu depo
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Apkope {TOWN} kuģu depo, {VELOCITY}
-STR_NEWS_SHIP_IS_WAITING                                        :{WHITE}{VEHICLE} gaida depo
 STR_WATERWAYS_TOOLBAR_BUILD_DOCK_TOOLTIP                        :{BLACK}Būvēt kuģu piestātni
 STR_WATERWAYS_TOOLBAR_BUILD_DEPOT_TOOLTIP                       :{BLACK}Būvēt kuģu depo (kuģu būvēšanai un apkopei)
-STR_DEPOT_SHIP_LIST_TOOLTIP                                     :{BLACK}Kuģi - uzspied uz kuģa priekš informācijas
-STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}Uzbūvēt jaunu kuģi
-STR_DEPOT_SHIP_SELL_TOOLTIP                                     :{BLACK}Velc kuģi šeit, lai to pārdotu
-STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}Centrēt galveno skatu uz kuģa depo
-STR_VEHICLE_LIST_SHIP_TOOLTIP                                   :{BLACK}Kuģi - uzspied uz kuģa priekš informācijas
-STR_BUILD_VEHICLE_SHIP_LIST_TOOLTIP                             :{BLACK}Kuģu izvēles saraksts - klik uz tā, priekš informācijas
-STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP                    :{BLACK}Būvēt atzīmēto kuģi
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP                  :{BLACK}Pašreizējā kuģa darbība - klik šeit, lai to apstādinātu/palaistu
-STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Rādīt kuģa rīkojumus
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP                          :{BLACK}Centrēt skatu uz kuģi
-STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}Sūtīt kuģi uz depo. Ctrl+klik tikai apkope
-STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Rādīt kuģa info
-STR_VEHICLE_DETAILS_SHIP_RENAME                                 :{BLACK}Nosaukt kuģi
 
-STR_QUERY_RENAME_SHIP_CAPTION                                   :{WHITE}Nosaukt kuģi
-STR_ERROR_CAN_T_RENAME_SHIP                                     :{WHITE}Nevar pārsaukt kuģi...
 STR_NEWS_FIRST_SHIP_ARRIVAL                                     :{BLACK}{BIGFONT}Pilsētnieki svin . . .{}Pirmais kuģis ierodas {STATION}!
 STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}Izvieto boju, kura var kalpot kā ceļa rādītājs
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}Šeit nevar novietot boju...
 STR_BUILD_AQUEDUCT                                              :{BLACK}Būvēt akveduktu
 STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}Šeit nevar uzbūvēt akveduktu...
-STR_BUILD_VEHICLE_SHIP_RENAME_BUTTON                            :{BLACK}Pārsaukt
-STR_BUILD_VEHICLE_SHIP_RENAME_TOOLTIP                           :{BLACK}Pārsaukt kuģa tipu
-STR_QUERY_RENAME_SHIP_TYPE_CAPTION                              :{WHITE}Pārsaukt kuģa tipu
-STR_ERROR_CAN_T_RENAME_SHIP_TYPE                                :{WHITE}Nevar pārsaukt kuģa tipu...
-STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}Pārveidot kravas kuģi, lai varētu pārvietot citu kravas tipu
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (Pārbūvēt)
-STR_REFIT_SHIP_REFIT_BUTTON                                     :{BLACK}Pārveidot kuģi
-STR_REFIT_SHIP_LIST_TOOLTIP                                     :{BLACK}Izvēlies kravas tipu
-STR_REFIT_SHIP_REFIT_TOOLTIP                                    :{BLACK}Pārveidot kuģi, lai varētu pārvietot atzīmēto kravas tipu
 STR_REFIT_TITLE                                                 :{GOLD}Izvēlies kravas tipu, ko vest:
 STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}Jaunā ietilpība: {GOLD}{CARGO}{}{BLACK}Pārveidošanas izmaksas: {GOLD}{CURRENCY}
-STR_ERROR_CAN_T_REFIT_SHIP                                      :{WHITE}Nevar pārveidot kuģi...
 STR_REFITTABLE                                                  :(pārveidojams)
 
 ##id 0xA000
 STR_TOOLBAR_AIRCRAFT_CAPTION                                    :{WHITE}Lidostas
 STR_ERROR_CAN_T_BUILD_AIRPORT_HERE                              :{WHITE}Šeit nevar būvēt lidostu...
-STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}{STATION} Lidaparātu angārs
-STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON                          :{BLACK}Jauns lidaparāts
-STR_CLONE_AIRCRAFT                                              :{BLACK}Klonēt lidaparātu
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Šis uzbūvēs lidaparāta kopiju, Izmantojot CTRL+klik, lidaparāti dalīsies ar rīkojumiem
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Šis uzbūvēs lidaparāta kopiju, Klik uz pogas un pēc tam uz lidaparāta. Izmantojot CTRL+klik, lidaparāti dalīsies ar rīkojumiem
-STR_BUILD_VEHICLE_AIRCRAFT_CAPTION                              :{WHITE}Jauns lidaparāts
-STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON                 :{BLACK}Būvēt lidaparātu
-STR_ERROR_CAN_T_BUILD_AIRCRAFT                                  :{WHITE}Nevar būvēt lidaparātu...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} Lidaparāts
-STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR                         :{WHITE}Lidaparātu nevar aizsūtīt uz angāru...
-STR_HEADING_FOR_HANGAR                                          :{ORANGE}Dodas uz {STATION} angāru
-STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Ietur kursu uz {STATION} Angārs, {VELOCITY}
-STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Apkope {STATION} angārā
-STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Apkope {STATION} angārā, {VELOCITY}
-STR_NEWS_AIRCRAFT_IS_WAITING                                    :{WHITE}{VEHICLE} gaida aviācijas angārā
-STR_ERROR_AIRCRAFT_IN_THE_WAY                                   :{WHITE}Lidaparāts ceļā
-STR_ERROR_CAN_T_STOP_START_AIRCRAFT                             :{WHITE}Nav iespējams apturēt/palaist lidaparātu...
 STR_ERROR_AIRCRAFT_IS_IN_FLIGHT                                 :{WHITE}Lidaparāts pašreiz lido
 STR_ERROR_AIRCRAFT_MUST_BE_STOPPED                              :{WHITE}Lidaparātu var apturēt angārā
-STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}Nav iespējams pārdot lidaparātu...
 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION                          :Lidostas būve
 STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Būvēt lidostu
-STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP                               :{BLACK}Lidaparāts - klikot uz lidaparāta, lai iegūtu info
-STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Lidaparāts - klikot uz lidaparāta, lai iegūtu info
-STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}Būvēt jaunu lidaparātu
-STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}Pārvilkt lidaparātu uz šejieni, lai to pārdotu
-STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Centrēt galveno skatu uz angāru
-STR_BUILD_VEHICLE_AIRCRAFT_LIST_TOOLTIP                         :{BLACK}Lidaparātu izvēles saraksts - klikot, lai iegūtu info
-STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_TOOLTIP                :{BLACK}Būvēt izvēlēto lidaparātu
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP              :{BLACK}Tekošā lidaparāta darbība - klikot šeit, lai apturētu/palaistu lidaparātu
-STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Parādīt lidaparāta komandas
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP                      :{BLACK}Centrēt galveno skatu uz lidaparātu
-STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}Sūtīt lidaparātu un angāru. CTRL + klik veiks tikai apkopi
-STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Pārādīt lidaparāta informāciju
 
-STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}Nosaukt lidaparātu
-STR_ERROR_CAN_T_RENAME_AIRCRAFT                                 :{WHITE}Nevar nosaukt lidaparātu...
-STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}Nosaukt lidaparātu
 STR_NEWS_FIRST_AIRCRAFT_ARRIVAL                                 :{BLACK}{BIGFONT}Iedzīvotāji svin svētkus . . .{}Pirmais lidaparāts ierodas {STATION}!
 STR_NEWS_AIRCRAFT_CRASH                                         :{BLACK}{BIGFONT}Lidmašīna nogāzusies!{}{COMMA} iet bojā ugunī {STATION}
 STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Lidaparāta avārija!{}Lidaparātam pietrūka degviela, {COMMA} miruši!
 STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
-STR_BUILD_VEHICLE_AIRCRAFT_RENAME_BUTTON                        :{BLACK}Pārsaukt
-STR_BUILD_VEHICLE_AIRCRAFT_RENAME_TOOLTIP                       :{BLACK}Pārsaukt lidaparāta veidu
-STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION                          :{WHITE}Pārsaukt lidaparāta veidu
-STR_ERROR_CAN_T_RENAME_AIRCRAFT_TYPE                            :{WHITE}Nevar pārsaukt lidaparāta veidu...
-STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Pārbūvēt lidaparātu citam kravas veidam
-STR_REFIT_AIRCRAFT_REFIT_BUTTON                                 :{BLACK}Pārbūvēt lidaparātu
-STR_REFIT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Izvēlieties kādu kravas veidu lidaparāts pārvadās
-STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}Pārbūvēt lidaparātu, lai pārvadātu izvēlēto kravas veidu
-STR_ERROR_CAN_T_REFIT_AIRCRAFT                                  :{WHITE}Nav iespējams pārbūvēt lidaparātu...
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Laiku saraksts)
 
@@ -3135,15 +2935,225 @@ STR_LORRY                                                       :{BLACK}{LORRY}
 STR_PLANE                                                       :{BLACK}{PLANE}
 STR_SHIP                                                        :{BLACK}{SHIP}
 
+############ Vehicle lists
+STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP                             :{BLACK}Vilcieni - klik uz vilciena priekš informācijas
+STR_VEHICLE_LIST_ROAD_VEHICLE_TOOLTIP                           :{BLACK}Transportlīdzekļi - klik uz tā priekš informācijas
+STR_VEHICLE_LIST_SHIP_TOOLTIP                                   :{BLACK}Kuģi - uzspied uz kuģa priekš informācijas
+STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP                               :{BLACK}Lidaparāts - klikot uz lidaparāta, lai iegūtu info
 
-STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Rādīt vilcienus, kuru rīkojumu sarakstos ir šī stacija
-STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Rādīt mašīnas, kuru rīkojumu sarakstos ir šī stacija
-STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Rādīt lidaparātus, kuru rīkojumu sarakstos ir šī stacija
-STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Rādīt kuģus, kuru rīkojumu sarakstos ir šī stacija
+STR_VEHICLE_LIST_TRAIN_CAPTION                                  :{WHITE}{STRING} - {COMMA} Vilcien{P s i a}
+STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING} - {COMMA} Ceļu transportlīdzek{P lis ļi ļa}
+STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - {COMMA} Kuģ{P is i u}
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} Lidaparāts
 
 STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}Dalītie uzdevumi {COMMA} transportlīdzek{P lim ļiem ļiem}
 STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Rādīt visus ar šo plānu saistītos transportlīdzekļus
 
+STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} gaida depo
+STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} gaida depo
+STR_NEWS_SHIP_IS_WAITING                                        :{WHITE}{VEHICLE} gaida depo
+STR_NEWS_AIRCRAFT_IS_WAITING                                    :{WHITE}{VEHICLE} gaida aviācijas angārā
+
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Pārbūvēt vilcienu
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Pārbūvēt ceļu transportlīdzekli
+STR_REFIT_SHIP_REFIT_BUTTON                                     :{BLACK}Pārveidot kuģi
+STR_REFIT_AIRCRAFT_REFIT_BUTTON                                 :{BLACK}Pārbūvēt lidaparātu
+
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Pārbūvēt vilcienu izceltā kravas veida pārvadāšanai
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Nomainīt ceļu transportlīdzekļa kravas veidu uz izvēlēto
+STR_REFIT_SHIP_REFIT_TOOLTIP                                    :{BLACK}Pārveidot kuģi, lai varētu pārvietot atzīmēto kravas tipu
+STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}Pārbūvēt lidaparātu, lai pārvadātu izvēlēto kravas veidu
+
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Izvēlaties kravas veidu, ko pārvadāt ar vilcienu
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Izvēlies kravas tipu mašīnai
+STR_REFIT_SHIP_LIST_TOOLTIP                                     :{BLACK}Izvēlies kravas tipu
+STR_REFIT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Izvēlieties kādu kravas veidu lidaparāts pārvadās
+
+STR_DEPOT_TRAIN_CAPTION                                         :{WHITE}{TOWN} Vilcienu depo
+STR_DEPOT_ROAD_VEHICLE_CAPTION                                  :{WHITE}{TOWN} Autotransporta depo
+STR_DEPOT_SHIP_CAPTION                                          :{WHITE}{TOWN} Kuģu depo
+STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}{STATION} Lidaparātu angārs
+
+STR_VEHICLE_DETAILS_TRAIN_RENAME                                :{BLACK}Nosaukt vilcienu
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Nosaukt transportl.
+STR_VEHICLE_DETAILS_SHIP_RENAME                                 :{BLACK}Nosaukt kuģi
+STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}Nosaukt lidaparātu
+
+STR_QUERY_RENAME_TRAIN_CAPTION                                  :{WHITE}Nosaukt vilcienu
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Nosaukt transportl.
+STR_QUERY_RENAME_SHIP_CAPTION                                   :{WHITE}Nosaukt kuģi
+STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}Nosaukt lidaparātu
+
+STR_ERROR_TRAIN_IN_THE_WAY                                      :{WHITE}Vilciens ceļā
+STR_ERROR_ROAD_VEHICLE_IN_THE_WAY                               :{WHITE}Ceļu transportl. ceļā
+STR_ERROR_SHIP_IN_THE_WAY                                       :{WHITE}Kuģis ir ceļā
+STR_ERROR_AIRCRAFT_IN_THE_WAY                                   :{WHITE}Lidaparāts ceļā
+
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Nevar pārbūvēt vilcienu...
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Nav iespējams pārbūvēt ceļu transportlīdzekli
+STR_ERROR_CAN_T_REFIT_SHIP                                      :{WHITE}Nevar pārveidot kuģi...
+STR_ERROR_CAN_T_REFIT_AIRCRAFT                                  :{WHITE}Nav iespējams pārbūvēt lidaparātu...
+
+STR_ERROR_CAN_T_RENAME_TRAIN                                    :{WHITE}Nevar nosaukt vilcienu...
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Nevar nosaukt transportl. ...
+STR_ERROR_CAN_T_RENAME_SHIP                                     :{WHITE}Nevar pārsaukt kuģi...
+STR_ERROR_CAN_T_RENAME_AIRCRAFT                                 :{WHITE}Nevar nosaukt lidaparātu...
+
+STR_ERROR_CAN_T_STOP_START_TRAIN                                :{WHITE}Nevar apturēt/startēt vilcienu...
+STR_ERROR_CAN_T_STOP_START_ROAD_VEHICLE                         :{WHITE}Transportl. nevar apstādināt/palaist...
+STR_ERROR_CAN_T_STOP_START_SHIP                                 :{WHITE}Nevar apstādināt/palaist kuģi...
+STR_ERROR_CAN_T_STOP_START_AIRCRAFT                             :{WHITE}Nav iespējams apturēt/palaist lidaparātu...
+
+STR_ERROR_CAN_T_SEND_TRAIN_TO_DEPOT                             :{WHITE}Nevar aizsūtīt vilcienu uz depo...
+STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Nevar aizsūtīt uz depo
+STR_ERROR_CAN_T_SEND_SHIP_TO_DEPOT                              :{WHITE}Kuģi nevar aizsūtīt uz depo...
+STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR                         :{WHITE}Lidaparātu nevar aizsūtīt uz angāru...
+
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Vilcienu nevar uzbūvēt...
+STR_ERROR_CAN_T_BUILD_ROAD_VEHICLE                              :{WHITE}Nevar uzbūvēt transportl. ...
+STR_ERROR_CAN_T_BUILD_SHIP                                      :{WHITE}Nevar uzbūvēt kuģi...
+STR_ERROR_CAN_T_BUILD_AIRCRAFT                                  :{WHITE}Nevar būvēt lidaparātu...
+
+STR_ERROR_CAN_T_RENAME_TRAIN_TYPE                               :{WHITE}Nevar pārsaukt vilciena vagona tipu...
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Nevar pārsaukt transportl. tipu...
+STR_ERROR_CAN_T_RENAME_SHIP_TYPE                                :{WHITE}Nevar pārsaukt kuģa tipu...
+STR_ERROR_CAN_T_RENAME_AIRCRAFT_TYPE                            :{WHITE}Nevar pārsaukt lidaparāta veidu...
+
+STR_ERROR_CAN_T_SELL_TRAIN                                      :{WHITE}Vilcienu nevar pārdot...
+STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}Transportl. nevar pārdot...
+STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}Nevar pārdot kuģi...
+STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}Nav iespējams pārdot lidaparātu...
+
+STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP                 :{BLACK}Pašreizējā vilciena darbība - klik šeit, lai apstādinātu/palaistu vilcienu
+STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP          :{BLACK}Transportl. pašreizējā darbība - klik šeit, lai apstādinātu/palaistu to
+STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP                  :{BLACK}Pašreizējā kuģa darbība - klik šeit, lai to apstādinātu/palaistu
+STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP              :{BLACK}Tekošā lidaparāta darbība - klikot šeit, lai apturētu/palaistu lidaparātu
+
+STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP                           :{BLACK}Parādīt vilciena rīkojumus
+STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP                    :{BLACK}Rādīt transportl. rīkojumus
+STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Rādīt kuģa rīkojumus
+STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Parādīt lidaparāta komandas
+
+STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP                         :{BLACK}Centrēt galveno skatu uz vilciena atrašanās vietu
+STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP                  :{BLACK}Centrēt galveno skatu uz transportl.
+STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP                          :{BLACK}Centrēt skatu uz kuģi
+STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP                      :{BLACK}Centrēt galveno skatu uz lidaparātu
+
+STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP                    :{BLACK}Sūtīt vilcienu uz depo. Ctrl+klik - tikai apkope
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}Sūtīt transportl. uz depo. Ctrl+klik tikai apkope
+STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}Sūtīt kuģi uz depo. Ctrl+klik tikai apkope
+STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}Sūtīt lidaparātu un angāru. CTRL + klik veiks tikai apkopi
+
+STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Rādīt vilciena informāciju
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Rādīt transportl. informāciju
+STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Rādīt kuģa info
+STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Pārādīt lidaparāta informāciju
+
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Pielāgot vilcienu citas kravas pārvadāšanai
+STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Nomainīt ceļu transportlīdzekļa kravas veidu
+STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}Pārveidot kravas kuģi, lai varētu pārvietot citu kravas tipu
+STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Pārbūvēt lidaparātu citam kravas veidam
+
+STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Dodas uz {TOWN} vilcienu depo
+STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Dodas uz {TOWN} vilcienu depo, {VELOCITY}
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Dodas uz {TOWN} depo
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Dodas uz {TOWN} depo, {VELOCITY}
+STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Dodas uz {TOWN} kuģu depo
+STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Dodas uz {TOWN} kuģu depo, {VELOCITY}
+STR_HEADING_FOR_HANGAR                                          :{ORANGE}Dodas uz {STATION} angāru
+STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Ietur kursu uz {STATION} Angārs, {VELOCITY}
+
+STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Apkope {TOWN} vilcienu depo
+STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Apkope {TOWN} vilcienu depo, {VELOCITY}
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Apkope {TOWN} depo
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Apkope {TOWN} depo, {VELOCITY}
+STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Apkope {TOWN} kuģu depo
+STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Apkope {TOWN} kuģu depo, {VELOCITY}
+STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Apkope {STATION} angārā
+STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Apkope {STATION} angārā, {VELOCITY}
+
+
+STR_CLONE_TRAIN                                                 :{BLACK}Kopēt vilcienu
+STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Klonēt Satiksmes Līdzekli
+STR_CLONE_SHIP                                                  :{BLACK}Klonēt kuģi
+STR_CLONE_AIRCRAFT                                              :{BLACK}Klonēt lidaparātu
+
+STR_CLONE_TRAIN_INFO                                            :{BLACK}Šis uzbūvēs vilciena kopiju ar visiem vagoniem. Izmantojot CTRL+klik, vilcieni dalīsies ar rīkojumiem
+STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Šis uzbūvēs autotransporta kopiju, Izmantojot CTRL+klik, autotransporti dalīsies ar rīkojumiem
+STR_CLONE_SHIP_INFO                                             :{BLACK}Šis uzbūvēs kuģa kopiju, Izmantojot CTRL+klik, kuģi dalīsies ar rīkojumiem
+STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Šis uzbūvēs lidaparāta kopiju, Izmantojot CTRL+klik, lidaparāti dalīsies ar rīkojumiem
+
+STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Šis uzbūvēs vilciena kopiju ar visiem vagoniem. Klik uz šīs pogas un pēc tam uz vilciena. Izmantojot CTRL+klik, vilcieni dalīsies ar rīkojumiem
+STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Šis uzbūvēs autotransporta kopiju, Klik uz pogas un pēc tam uz autotransporta. Izmantojot CTRL+klik, autotransporti dalīsies ar rīkojumiem
+STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Šis uzbūvēs kuģa kopiju, Klik uz pogas un pēc tam uz kuģa. Izmantojot CTRL+klik, kuģi dalīsies ar rīkojumiem
+STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Šis uzbūvēs lidaparāta kopiju, Klik uz pogas un pēc tam uz lidaparāta. Izmantojot CTRL+klik, lidaparāti dalīsies ar rīkojumiem
+
+STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}Jauni vilcieni
+STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}Jauni Elektriskā Dzelzceļa Satiksmes Līdzekļi
+STR_BUILD_VEHICLE_TRAIN_MONORAIL_CAPTION                        :{WHITE}Jauni vilcieni
+STR_BUILD_VEHICLE_TRAIN_MAGLEV_CAPTION                          :{WHITE}Jauni vilcieni
+
+STR_BUILD_VEHICLE_TRAIN_ALL_CAPTION                             :{WHITE}Vilcieni
+STR_BUILD_VEHICLE_ROAD_VEHICLE_CAPTION                          :{WHITE}Jauni transportl.
+STR_BUILD_VEHICLE_SHIP_CAPTION                                  :{WHITE}Jauni kuģi
+STR_BUILD_VEHICLE_AIRCRAFT_CAPTION                              :{WHITE}Jauns lidaparāts
+
+STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_BUTTON                    :{BLACK}Būvēt Satiksmes Līdzekli
+STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_BUTTON             :{BLACK}Būvēt transportl.
+STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON                     :{BLACK}Uzbūvēt kuģi
+STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON                 :{BLACK}Būvēt lidaparātu
+
+STR_BUILD_VEHICLE_TRAIN_LIST_TOOLTIP                            :{BLACK}Vilciena vagonu atlasīšanas saraksts - klik uz vagonu priekš informācijas
+STR_BUILD_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP                     :{BLACK}Transportl. izvēles saraksts - klik uz tā, priekš informācijas
+STR_BUILD_VEHICLE_SHIP_LIST_TOOLTIP                             :{BLACK}Kuģu izvēles saraksts - klik uz tā, priekš informācijas
+STR_BUILD_VEHICLE_AIRCRAFT_LIST_TOOLTIP                         :{BLACK}Lidaparātu izvēles saraksts - klikot, lai iegūtu info
+
+STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_TOOLTIP                   :{BLACK}Būvēt atzīmēto vilciena vagonu
+STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_TOOLTIP            :{BLACK}Būvēt atzīmēto transportl.
+STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP                    :{BLACK}Būvēt atzīmēto kuģi
+STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_TOOLTIP                :{BLACK}Būvēt izvēlēto lidaparātu
+
+STR_BUILD_VEHICLE_TRAIN_RENAME_BUTTON                           :{BLACK}Pārsaukt
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Pārsaukt
+STR_BUILD_VEHICLE_SHIP_RENAME_BUTTON                            :{BLACK}Pārsaukt
+STR_BUILD_VEHICLE_AIRCRAFT_RENAME_BUTTON                        :{BLACK}Pārsaukt
+
+STR_BUILD_VEHICLE_TRAIN_RENAME_TOOLTIP                          :{BLACK}Pārsaukt vilciena vagona tipu
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Pārsaukt transportl. tipu
+STR_BUILD_VEHICLE_SHIP_RENAME_TOOLTIP                           :{BLACK}Pārsaukt kuģa tipu
+STR_BUILD_VEHICLE_AIRCRAFT_RENAME_TOOLTIP                       :{BLACK}Pārsaukt lidaparāta veidu
+
+STR_QUERY_RENAME_TRAIN_TYPE_CAPTION                             :{WHITE}Pārsaukt vilciena vagona tipu
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Pārsaukt transportl. tipu
+STR_QUERY_RENAME_SHIP_TYPE_CAPTION                              :{WHITE}Pārsaukt kuģa tipu
+STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION                          :{WHITE}Pārsaukt lidaparāta veidu
+
+STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Jauni transportlīdzekļi
+STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_BUTTON                      :{BLACK}Jauni transporta līdzekļi
+STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON                              :{BLACK}Jauni kuģi
+STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON                          :{BLACK}Jauns lidaparāts
+
+STR_DEPOT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Vilcieni - klik uz vilciena priekš informācijas, velc vagonu, lai pievienotu/atvienotu vilcienam
+STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Transportlīdzekļi - klik uz tā, priekš informācijas
+STR_DEPOT_SHIP_LIST_TOOLTIP                                     :{BLACK}Kuģi - uzspied uz kuģa priekš informācijas
+STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Lidaparāts - klikot uz lidaparāta, lai iegūtu info
+
+STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP                            :{BLACK}Būvēt jaunu vilciena vagonu
+STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}Būvēt jaunu transportl.
+STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}Uzbūvēt jaunu kuģi
+STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}Būvēt jaunu lidaparātu
+
+STR_DEPOT_TRAIN_SELL_TOOLTIP                                    :{BLACK}Velc vagonu šeit, lai to pārdotu
+STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}Velc transportl. šeit ,lai to pārdotu
+STR_DEPOT_SHIP_SELL_TOOLTIP                                     :{BLACK}Velc kuģi šeit, lai to pārdotu
+STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}Pārvilkt lidaparātu uz šejieni, lai to pārdotu
+
+STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}Centrēt galveno skatu uz vilciena depo atrašanās vietu
+STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}Centrēt galveno skatu uz transportl. depo
+STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}Centrēt galveno skatu uz kuģa depo
+STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Centrēt galveno skatu uz angāru
+
+
 ### depot strings
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}Tu grasies pārdot visus transportus, kas atrodas depo. Vai tu esi drošs?
 STR_DEPOT_WRONG_DEPOT_TYPE                                      :Nepareiz depo veids
@@ -3163,7 +3173,6 @@ STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TIP                          :{BLACK}Automāt
 STR_DEPOT_AUTOREPLACE_SHIP_TIP                                  :{BLACK}Automātiski nomainīt visus kuģus depo
 STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP                              :{BLACK}Automātiski nomainīt visus lidaparātus angārā
 
-
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Nomainīt {STRING}
 STR_REPLACE_VEHICLES_START                                      :{BLACK}Sākt transportlīdzekļu nomaiņu
 STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Pārtraukt transportlīdzekļu nomaiņu
@@ -3179,6 +3188,7 @@ STR_REPLACE_REMOVE_WAGON                                        :{BLACK}Vagona n
 STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Auto-aizvietošana saglabās vilciena garumu, aizvācot vagonus (sākot no priekšas), ja mainot lokomatīvi, tas kļūtu garāks.
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}Aizvietošana: {ORANGE}{SKIP}{SKIP}{STRING}
 STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}Parslēgties starp dzinēja un vagona aizvietošanas logiem
+
 STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Tranportl. nav pieejams
 STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Mašīna nav pieejama
 STR_SHIP_NOT_AVAILABLE                                          :{WHITE}Kuģis nav pieejams
@@ -3328,17 +3338,6 @@ STR_MEASURE_AREA                                                :{BLACK}Lauks: {
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Garums: {NUM}{}Augstuma atšķirība: {NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Lauks: {NUM} x {NUM}{}Augstuma atšķirība: {NUM} m
 
-############ Date formatting
-STR_FORMAT_DATE_TINY                                            :{STRING}-{STRING}-{NUM}
-STR_FORMAT_DATE_SHORT                                           :{STRING} {NUM}
-STR_FORMAT_DATE_LONG                                            :{STRING} {STRING} {NUM}
-STR_FORMAT_DATE_ISO                                             :{2:NUM}-{1:STRING}-{0:STRING}
-
-STR_JUST_DATE_TINY                                              :{DATE_TINY}
-STR_JUST_DATE_LONG                                              :{DATE_LONG}
-STR_JUST_DATE_ISO                                               :{DATE_ISO}
-########
-
 STR_FEEDER_CARGO_VALUE                                          :{BLACK}Transfer Credits: {LTBLUE}{CURRENCY}
 STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD                            :{WHITE}...šis ceļš pieder pilsētai
 STR_DRIVE_THROUGH_ERROR_DIRECTION                               :{WHITE}...ceļš novietots nepareizā virzienā
@@ -3363,7 +3362,6 @@ STR_PERCENT_UP_DOWN_SMALL                                       :{TINYFONT}{WHIT
 STR_PERCENT_UP_DOWN                                             :{WHITE}{NUM}%{UPARROW}{DOWNARROW}
 
 ##### Mass Order
-STR_FORMAT_GROUP_NAME                                           :Grupa {COMMA}
 STR_GROUP_TINY_NAME                                             :{TINYFONT}{GROUP}
 STR_GROUP_ALL_TRAINS                                            :Visi vilcieni
 STR_GROUP_ALL_ROAD_VEHICLES                                     :Visi transportlīdzekļi
@@ -3392,12 +3390,62 @@ STR_GROUP_DELETE_TIP                                            :{BLACK}Dzēst i
 STR_GROUP_RENAME_TIP                                            :{BLACK}Pārsaukt izvēlēto grupu
 STR_GROUP_REPLACE_PROTECTION_TIP                                :{BLACK}Klik, lai aizsargātu šo grupu no vispārējas autoaizstāšanas
 
+#### String control codes and their formatting
 STR_COMPANY_NAME                                                :{COMPANY}
 STR_ENGINE_NAME                                                 :{ENGINE}
 STR_GROUP_NAME                                                  :{GROUP}
+STR_INDUSTRY_NAME                                               :{INDUSTRY}
 STR_PRESIDENT_NAME                                              :{PRESIDENTNAME}
 STR_SIGN_NAME                                                   :{SIGN}
+STR_STATION_NAME                                                :{STATION}
+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_LONG                                              :{DATE_LONG}
+STR_JUST_DATE_ISO                                               :{DATE_ISO}
+STR_JUST_STRING                                                 :{STRING}
+STR_JUST_RAW_STRING                                             :{STRING}
+
+STR_FORMAT_DATE_TINY                                            :{STRING}-{STRING}-{NUM}
+STR_FORMAT_DATE_SHORT                                           :{STRING} {NUM}
+STR_FORMAT_DATE_LONG                                            :{STRING} {STRING} {NUM}
+STR_FORMAT_DATE_ISO                                             :{2:NUM}-{1:STRING}-{0:STRING}
+
+STR_FORMAT_COMPANY_NUM                                          :(Uzņēmums {COMMA})
+STR_FORMAT_GROUP_NAME                                           :Grupa {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}Vārdam jābūt unikālam
 
diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt
index e1886fa71..aa97dd1de 100644
--- a/src/lang/lithuanian.txt
+++ b/src/lang/lithuanian.txt
@@ -188,8 +188,6 @@ STR_ABBREV_PLASTIC                                              :{TINYFONT}PM
 STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}GG
 STR_ABBREV_NONE                                                 :{TINYFONT}-
 STR_ABBREV_ALL                                                  :{TINYFONT}VISI
-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ė
@@ -201,17 +199,11 @@ STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Pradinė
 STR_ABOUT_VERSION                                               :{BLACK}OpenTTD versija {REV}
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 OpenTTD komanda
 
-STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
-STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_QUIT_CAPTION                                                :{WHITE}Baigti
 STR_YES                                                         :{BLACK}Taip
 STR_NO                                                          :{BLACK}Ne
 STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Ar jūs tikrai norite nutraukti žaidimą ir grižti į {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                                                :Nieko
 STR_COLOUR_DARK_BLUE                                            :Tamsiai mėlyna
 STR_COLOUR_PALE_GREEN                                           :Pilkšvai žalia
@@ -230,8 +222,6 @@ STR_COLOUR_BROWN                                                :Ruda
 STR_COLOUR_GREY                                                 :Pilka
 STR_COLOUR_WHITE                                                :Balta
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}Per daug transporto priemonių žaidime
-STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
-STR_RED_COMMA                                                   :{RED}{COMMA}
 STR_BUTTON_LOCATION                                             :{BLACK}Vieta
 STR_SMALLMAP_TYPE_CONTOURS                                      :Kontūrai
 STR_SMALLMAP_TYPE_VEHICLES                                      :Transporto priemonės
@@ -356,12 +346,13 @@ STR_SORT_ORDER_TIP                                              :{BLACK}Pasirink
 STR_SORT_CRITERIA_TIP                                           :{BLACK}Pasirink rikiavimo kriteriju
 STR_SORT_BY                                                     :{BLACK}Rikiuoti pagal
 
+### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}Populiaciją
+STR_SORT_BY_NAME                                                :{BLACK}Vardą
+STR_SORT_BY_DATE                                                :{BLACK}Datą
 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_DATE                                                :{BLACK}Datą
 STR_SORT_BY_NUMBER                                              :Kiekį
 STR_SORT_BY_PROFIT_LAST_YEAR                                    :Pernai metų pelną
 STR_SORT_BY_PROFIT_THIS_YEAR                                    :Šių metų pelną
@@ -382,37 +373,25 @@ STR_SORT_BY_INTRO_DATE                                          :Atsiradimo dat�
 STR_SORT_BY_RUNNING_COST                                        :Eksplotacijos išlaidas
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :Galią/Eksplotacijos išlaidas
 STR_SORT_BY_CARGO_CAPACITY                                      :Vagono talpą
+
 STR_NO_WAITING_CARGO                                            :{BLACK}Jokių krovinių nėra pakrovimui
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}Pažymėti visus pastatus
 STR_SELECT_ALL_TYPES                                            :{BLACK}Pažymėti visus krovinio tipus (įskaitant nelaukiančius krovinių)
-STR_AVAILABLE_TRAINS                                            :{BLACK}Galimi traukiniai
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Galimi automobiliai
-STR_AVAILABLE_SHIPS                                             :{BLACK}Galimi laivai
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Galimi lėktuvai
 STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Peržiūrėti galimų variklių sąrašą tinkamų šiai transporto priemonei.
 STR_MANAGE_LIST                                                 :{BLACK}Tvarkyti sąrašą
 STR_MANAGE_LIST_TIP                                             :{BLACK}Siųsti nurodymus visoms šio sąrašo tr. priemonėms
 STR_REPLACE_VEHICLES                                            :Keisti tr. priemones
+STR_SEND_FOR_SERVICING                                          :Siųsti techninės apžiūros
+
+STR_AVAILABLE_TRAINS                                            :{BLACK}Galimi traukiniai
+STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Galimi automobiliai
+STR_AVAILABLE_SHIPS                                             :{BLACK}Galimi laivai
+STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Galimi lėktuvai
+
 STR_SEND_TRAIN_TO_DEPOT                                         :Siųsti į depą
 STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Siųsti į depą
 STR_SEND_SHIP_TO_DEPOT                                          :Siųsti į depą
 STR_SEND_AIRCRAFT_TO_HANGAR                                     :Siųsti į angarą
-STR_SEND_FOR_SERVICING                                          :Siųsti techninės apžiūros
-
-############ range for months starts
-STR_MONTH_ABBREV_JAN                                            :Sau
-STR_MONTH_ABBREV_FEB                                            :Vas
-STR_MONTH_ABBREV_MAR                                            :Kov
-STR_MONTH_ABBREV_APR                                            :Bal
-STR_MONTH_ABBREV_MAY                                            :Geg
-STR_MONTH_ABBREV_JUN                                            :Bir
-STR_MONTH_ABBREV_JUL                                            :Liep
-STR_MONTH_ABBREV_AUG                                            :Rugp
-STR_MONTH_ABBREV_SEP                                            :Rug
-STR_MONTH_ABBREV_OCT                                            :Spa
-STR_MONTH_ABBREV_NOV                                            :Lap
-STR_MONTH_ABBREV_DEC                                            :Gruo
-############ range for months ends
 
 STR_GRAPH_X_LABEL_MONTH                                         :{TINYFONT}{STRING}{} {STRING}
 STR_GRAPH_X_LABEL_MONTH_YEAR                                    :{TINYFONT}{STRING}{} {STRING}{}{NUM}
@@ -440,8 +419,6 @@ 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_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ą
@@ -488,7 +465,7 @@ STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Nėra
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Vardas
 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                                          :1
 STR_ORDINAL_NUMBER_2ND                                          :2
 STR_ORDINAL_NUMBER_3RD                                          :3
@@ -522,6 +499,34 @@ STR_ORDINAL_NUMBER_30TH                                         :30
 STR_ORDINAL_NUMBER_31ST                                         :31
 ############ range for days ends
 
+############ range for months starts
+STR_MONTH_ABBREV_JAN                                            :Sau
+STR_MONTH_ABBREV_FEB                                            :Vas
+STR_MONTH_ABBREV_MAR                                            :Kov
+STR_MONTH_ABBREV_APR                                            :Bal
+STR_MONTH_ABBREV_MAY                                            :Geg
+STR_MONTH_ABBREV_JUN                                            :Bir
+STR_MONTH_ABBREV_JUL                                            :Liep
+STR_MONTH_ABBREV_AUG                                            :Rugp
+STR_MONTH_ABBREV_SEP                                            :Rug
+STR_MONTH_ABBREV_OCT                                            :Spa
+STR_MONTH_ABBREV_NOV                                            :Lap
+STR_MONTH_ABBREV_DEC                                            :Gruo
+
+STR_MONTH_JAN                                                   :Sausis
+STR_MONTH_FEB                                                   :Vasaris
+STR_MONTH_MAR                                                   :Kovas
+STR_MONTH_APR                                                   :Balandis
+STR_MONTH_MAY                                                   :Gegužė
+STR_MONTH_JUN                                                   :Birželis
+STR_MONTH_JUL                                                   :Liepa
+STR_MONTH_AUG                                                   :Rugpjūtis
+STR_MONTH_SEP                                                   :Rugsėjis
+STR_MONTH_OCT                                                   :Spalis
+STR_MONTH_NOV                                                   :Lapkritis
+STR_MONTH_DEC                                                   :Gruodis
+############ range for months ends
+
 STR_GRAPH_Y_LABEL_NUMBER                                        :{TINYFONT}{COMMA}
 
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}Krovinys priimtas: {LTBLUE}
@@ -611,12 +616,9 @@ 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_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_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ą
@@ -698,9 +700,7 @@ STR_OFF                                                         :Isjungta
 STR_SUMMARY                                                     :Santrauka
 STR_FULL                                                        :Pilnas
 STR_STATUSBAR_COMPANY_NAME                                      :{SILVER}- -  {COMPANY}  - -
-STR_BLACK_STRING                                                :{BLACK}{STRING}
 
-STR_JUST_CHECKMARK                                              :{CHECKMARK}
 ############ range for menu starts
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Žaidimo nustatymai
 STR_SETTINGS_MENU_DIFFICULTY_SETTINGS                           :Sunkumo lygio nustatymai
@@ -792,9 +792,6 @@ STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY                             :Finansuoti nauj
 ############ range ends here
 
 STR_FUND_INDUSTRY_CAPTION                                       :{WHITE}Finansuoti naują pramonės įmonę
-STR_JUST_STRING                                                 :{STRING}
-STR_JUST_RAW_STRING                                             :{STRING}
-STR_JUST_INT                                                    :{NUM}
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_RAINFOREST                       :{WHITE}...gali būti statomas tik drėgnose miškingose teritorijose
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT                           :{WHITE}...gali būti statomas tik dykumose
 STR_STATUSBAR_PAUSED                                            :{YELLOW}* *   SUSTABDYTA   * *
@@ -808,9 +805,6 @@ 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_BLACK_6                                                     :{BLACK}6
-STR_BLACK_7                                                     :{BLACK}7
-
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Anglų (Oginalus)
 STR_TOWNNAME_FRENCH                                             :Prancūzų
@@ -887,19 +881,6 @@ STR_OPTIONS_BASE_GRF_TIP                                        :{BLACK}Pasirink
 
 STR_AUTOSAVE_FAILED                                             :{WHITE}Automatinis išsaugojimas nepavyko
 
-STR_MONTH_JAN                                                   :Sausis
-STR_MONTH_FEB                                                   :Vasaris
-STR_MONTH_MAR                                                   :Kovas
-STR_MONTH_APR                                                   :Balandis
-STR_MONTH_MAY                                                   :Gegužė
-STR_MONTH_JUN                                                   :Birželis
-STR_MONTH_JUL                                                   :Liepa
-STR_MONTH_AUG                                                   :Rugpjūtis
-STR_MONTH_SEP                                                   :Rugsėjis
-STR_MONTH_OCT                                                   :Spalis
-STR_MONTH_NOV                                                   :Lapkritis
-STR_MONTH_DEC                                                   :Gruodis
-
 STR_HEADING_FOR_STATION                                         :{LTBLUE}Laukiama {STATION}
 STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}Važiuojama į {STATION}, {VELOCITY}
 STR_NO_ORDERS                                                   :{LTBLUE}Neturi užduočių
@@ -914,8 +895,6 @@ STR_CRATES                                                      :dežių
 STR_RES_OTHER                                                   :Kita
 STR_NOTHING                                                     :
 
-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...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Bendrų užduočių pabaiga - -
@@ -1171,7 +1150,6 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Zemelap
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :išjungta
-STR_JUST_CURRENCY                                               :{CURRENCY}
 STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Keisti reikšmes
 
 STR_TEMPERATE_LANDSCAPE                                         :Normalus klimatas
@@ -1207,7 +1185,6 @@ STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}Pasirink
 
 STR_WAYPOINT_VIEWPORT                                           :{WHITE}{WAYPOINT}
 STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WHITE}{WAYPOINT}
-STR_WAYPOINT_NAME                                               :{WAYPOINT}
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Redaguoti punkto vardą
 
 STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}Neįmanoma pakeisti punkto vardo...
@@ -1273,11 +1250,6 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Pramonė
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...per arti kitos gamyklos
 
-STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Įsteigti traukinį, kuris rūpinsis prioritetiniais kroviniais
-STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Įsteigti traukinį
-STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Pasirink prioritetinį krovinio tipą, kuriuo rūpinsis traukinys
-STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Įsteigti traukinį prioritetinių krovinių pervežimui
-STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Negalima įsteigti traukinio...
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Keisti produkciją
 
 ############ network gui strings
@@ -1782,11 +1754,6 @@ STR_TOWN_BUILDING_NAME_TEPEES_1                                 :Vigvamai
 STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1                           :Arbatos namai
 STR_TOWN_BUILDING_NAME_PIGGY_BANK_1                             :Paršiukų bankas
 
-STR_INDUSTRY_NAME                                               :{INDUSTRY}
-STR_TOWN_NAME                                                   :{TOWN}
-STR_FORMAT_INDUSTRY_NAME                                        :{TOWN} {STRING}
-STR_STATION_NAME                                                :{STATION}
-
 ##id 0x2800
 STR_LANDSCAPING_MENU_LANDSCAPING                                :Reljefinimas
 STR_LANDSCAPING_MENU_PLANT_TREES                                :Sodinti medžius
@@ -1841,6 +1808,12 @@ STR_CARGO_RATING_EXCELLENT                                      :Puikus
 STR_CARGO_RATING_OUTSTANDING                                    :Nuostabus
 ############ range for rating ends
 
+### station view strings
+STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Rodyti visus traukinius, kuriu uzduotuse yra itraukta si stotele
+STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Rodyti visus automobilius, kuriu uzduotyse yra pamineta si stotele
+STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Rodyti visus lektuvus, kuriu uzduotyse yra pamineta si stotele
+STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Rodyti visus laivus, kuriu uzduotyse yra pamineta si stotele
+
 STR_STATION_VIEW_CARGO_RATING                                   :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO                        :{WHITE}{STATION} nebepriima {STRING}
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO               :{WHITE}{STATION} nebepriima {STRING} arba {STRING}
@@ -2084,6 +2057,7 @@ STR_SV_STNAME_AIRPORT                                           :{STRING} oro uo
 STR_SV_STNAME_OILFIELD                                          :{STRING} Naftos Platforma
 STR_SV_STNAME_MINES                                             :{STRING} Kasyklos
 STR_SV_STNAME_DOCKS                                             :{STRING} Dokai
+##id 0x6020
 STR_SV_STNAME_ANNEXE                                            :{STRING} Kreivoji
 STR_SV_STNAME_SIDINGS                                           :{STRING} Apylanka
 STR_SV_STNAME_BRANCH                                            :{STRING} Atsaka
@@ -2131,8 +2105,6 @@ STR_NUM_LOW                                                     :Žemas
 STR_NUM_NORMAL                                                  :Vidutinis
 STR_NUM_HIGH                                                    :Aukštas
 STR_NUM_CUSTOM                                                  :Tinkintas
-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
@@ -2166,7 +2138,6 @@ STR_CITY_APPROVAL_HOSTILE                                       :Priešiškas
 
 ##id 0x7000
 STR_COMPANY_VIEW_CAPTION                                        :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
-STR_FORMAT_COMPANY_NUM                                          :(Kompanija {COMMA})
 STR_COMPANY_VIEW_NEW_FACE_BUTTON                                :{BLACK}Naujas veidas
 STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON                           :{BLACK}Spalva
 STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}Spalva:
@@ -2199,7 +2170,6 @@ STR_FINANCES_TOTAL_CAPTION                                      :{WHITE}Viso:
 STR_COMPANY_NAME_COMPANY_NUM                                    :{COMPANY} {COMPANYNUM}
 STR_GRAPH_INCOME_CAPTION                                        :{WHITE}Pajamų diagrama
 STR_CURRCOMPACT                                                 :{CURRCOMPACT}
-STR_JUST_COMMA                                                  :{COMMA}
 STR_GRAPH_OPERATING_PROFIT_CAPTION                              :{WHITE}Įprastinės veiklos pelno diagrama
 STR_FINANCES_BANK_BALANCE_TITLE                                 :{WHITE}Sąskaitos balansas
 STR_FINANCES_LOAN_TITLE                                         :{WHITE}Paskola
@@ -2601,10 +2571,8 @@ STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE                          :vienbegis lokom
 STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE                            :„Maglev“ lokomotyvas
 
 ##id 0x8800
-STR_DEPOT_TRAIN_CAPTION                                         :{WHITE}{TOWN} Traukinių depas
 STR_NEWS_FIRST_TRAIN_ARRIVAL                                    :{BLACK}{BIGFONT}Gyventojai džiūgauja. . .{}Pirmas traukinys atvažiavo į {STATION}!
 STR_VEHICLE_DETAILS_CAPTION                                     :{WHITE}{VEHICLE} (Detales)
-STR_ERROR_TRAIN_IN_THE_WAY                                      :{WHITE}Traukinys kelyje
 STR_ORDER                                                       :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 STR_ORDER_SELECTED                                              :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 STR_ORDER_NON_STOP                                              :{BLACK}Nesustoti
@@ -2678,38 +2646,16 @@ STR_CONDITIONAL_TRUE_FALSE                                      :Pereiti į užs
 
 STR_TIMETABLE_NO_TRAVEL                                         :{SETX 30}Nėra kelionių
 
-STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Kursas i {TOWN} depa
-STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Kursas i {TOWN} depa, {VELOCITY}
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Servisas {TOWN} Traukiniu Depe
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Servisas {TOWN} Traukiniu Depe, {VELOCITY}
-
 STR_INVALID_ORDER                                               :{RED} (Neteisinga tvarka)
 
 STR_UNKNOWN_STATION                                             :Nežinoma stotis
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}Tuscias
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} is {STATION}
 STR_VEHICLE_DETAILS_CARGO_FROM_MULT                             :{LTBLUE}{CARGO} iš {STATION} (x{NUM})
-STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} laukia depe
-STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Naujos tr. priemones
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}Traukinys per ilgas
 STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}Sukeisti traukinius galima tiktai sustabdytus depe
-STR_VEHICLE_LIST_TRAIN_CAPTION                                  :{WHITE}{STRING} - {COMMA} traukiniai
 
-STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}Nauji Traukiniai
-STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}Nauji Elektriniai Traukiniai
-STR_BUILD_VEHICLE_TRAIN_MONORAIL_CAPTION                        :{WHITE}Nauji Vienbegiai Traukiniai
-STR_BUILD_VEHICLE_TRAIN_MAGLEV_CAPTION                          :{WHITE}Nauji „Maglev“ traukiniai
-STR_BUILD_VEHICLE_TRAIN_ALL_CAPTION                             :{WHITE}Traukiniai
-
-STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_BUTTON                    :{BLACK}Pirkti
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Kopijuoti automobilį
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Tai pagamins automobilio kopiją. Spragtelėjus laikant VALD (CTRL) nukopijuojami nurodymai
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Tai pagamins automobilio kopiją. Spragtelkite šį mygtuką, o tada automobilį esantį garaže arba už jo ribų. Spragtelėjus laikant VALD (CTRL) nukopijuojami nurodymai
-STR_CLONE_TRAIN                                                 :{BLACK}Kopijuoti traukinį
-STR_CLONE_TRAIN_INFO                                            :{BLACK}Tai pagamins traukinio kopiją su visais vagonais. Spragtelėjus laikant VALD (CTRL) nukopijuojami nurodymai
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Tai pagamins traukinio kopiją su visais vagonais. Spragtelkite šį mygtuką, o tada traukinį esantį depe arba už jo ribų. Spragtelėjus laikant VALD (CTRL) nukopijuojami nurodymai
-STR_BUILD_VEHICLE_TRAIN_RENAME_BUTTON                           :{BLACK}Pervardinti
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Praleisti
 STR_ORDERS_DELETE_BUTTON                                        :{BLACK}Istrinti
 STR_ORDERS_GO_TO_BUTTON                                         :{BLACK}Vaziuoti
@@ -2724,14 +2670,12 @@ STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Pereiti
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Uzduotys)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Uzduociu pabaiga- -
 STR_SERVICE                                                     :{BLACK}Remontas
-STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Gelezinkelio transporto priemones nupirkti negalima...
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Pastatyta: {LTBLUE}{NUM}{BLACK} Verte: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Verte: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
 STR_VEHICLE_STATUS_LOADING_UNLOADING                            :{LTBLUE}Pasikrauna / Issikrauna
 STR_VEHICLE_STATUS_LEAVING                                      :{LTBLUE}Paliekant
 STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}Traukinys turi buti sustabdytas depe
-STR_ERROR_CAN_T_SEND_TRAIN_TO_DEPOT                             :{WHITE}Traukinio pasiusti i depa negalima...
 STR_ERROR_NO_MORE_SPACE_FOR_ORDERS                              :{WHITE}Truksta vietos uzduotims
 STR_ERROR_TOO_MANY_ORDERS                                       :{WHITE}Per daug uzduociu
 STR_ERROR_CAN_T_INSERT_NEW_ORDER                                :{WHITE}Negali iterpti naujos uzduoties...
@@ -2746,26 +2690,11 @@ STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE}automobi
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}Transporto priemones perkelti negalima...
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}Galinis variklis visada seks is paskos priekio
 STR_CARGO_N_A                                                   :N/A{SKIP}
-STR_ERROR_CAN_T_SELL_TRAIN                                      :{WHITE}Priemones negalima parduoti...
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}Neranda kelio iki artimiausio garazo
-STR_ERROR_CAN_T_STOP_START_TRAIN                                :{WHITE}Traukinio sustabdyti/paleisti negalima...
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}Remonto intervalas: {LTBLUE}{COMMA}dienos{BLACK}   Paskutinis remontas: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}Remonto intervalas: {LTBLUE}{COMMA}%{BLACK}   Paskutinis remontas: {LTBLUE}{DATE_LONG}
-STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP                             :{BLACK}Traukiniai - spausk ant traukinio, jei nori detalesnes informacijos
-STR_DEPOT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Traukiniai - paspausk ant traukinio jei nori detalesnes informacijos, tempk vagona, jei nori ji prikabinti/pasalinti nuo traukinio
-STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP                            :{BLACK}Isigyti nauja gelezinkelio transporto priemone
-STR_DEPOT_TRAIN_SELL_TOOLTIP                                    :{BLACK}Nutempk transporto priemone cia, jei nori ja parduoti
-STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}Parodyti traukiniu depa ekrano centre
-STR_BUILD_VEHICLE_TRAIN_LIST_TOOLTIP                            :{BLACK}Transporto priemoniu pasirinkimo sarasas - paspausk ant priemones, kad gautum daugiau informacijos
-STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_TOOLTIP                   :{BLACK}Isigyti pazymeta transporto priemone
-STR_BUILD_VEHICLE_TRAIN_RENAME_TOOLTIP                          :{BLACK}Pervardinti traukinio tipa
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP                 :{BLACK}Dabartine traukinio uzduotis - paspausk cia, jei nori sustabdyti.paleisti traukini
-STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP                           :{BLACK}Parodyti traukinio uzduotis
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP                         :{BLACK}Parodyti traukini ekrano centre
-STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP                    :{BLACK}Siusti traukini i depa
 STR_VEHICLE_VIEW_TRAIN_IGNORE_SIGNAL_TOOLTIP                    :{BLACK}Priversti traukini vaziuoti nelaukiant signalo leidimo
 STR_VEHICLE_VIEW_TRAIN_REVERSE_TOOLTIP                          :{BLACK}Pakeisti traukinio vaziavimo krypti
-STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Rodyti detalia traukinio informacija
 STR_VEHICLE_DETAILS_INCREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Didinti intervala tarp remontu
 STR_VEHICLE_DETAILS_DECREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Mazinti intervala tarp remontu
 STR_VEHICLE_DETAILS_TRAIN_CARGO_TOOLTIP                         :{BLACK}Rodyti detalia kroviniu informacija
@@ -2783,13 +2712,9 @@ STR_VEHICLE_STATUS_STOPPED                                      :{RED}Sustabdyta
 STR_ERROR_CAN_T_MAKE_TRAIN_PASS_SIGNAL                          :{WHITE}Neimanoma priversti traukinio vaziuoti nesaugiai...
 STR_VEHICLE_STATUS_CRASHED                                      :{RED}Avarija!
 
-STR_QUERY_RENAME_TRAIN_CAPTION                                  :{WHITE}Traukinio vardas
-STR_ERROR_CAN_T_RENAME_TRAIN                                    :{WHITE}Negali pakeisti traukinio vardo...
-STR_VEHICLE_DETAILS_TRAIN_RENAME                                :{BLACK}Traukinio vardas
 STR_NEWS_TRAIN_CRASH                                            :{BLACK}{BIGFONT}Traukinio avarija!{}{COMMA} zuvo liepsnose po katastrofos
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Traukinio vaziavimo krypties pakeisti negalima...
-STR_QUERY_RENAME_TRAIN_TYPE_CAPTION                             :{WHITE}Pervardinti traukinio tipa
-STR_ERROR_CAN_T_RENAME_TRAIN_TYPE                               :{WHITE}Neimanoma pervardinti traukinio tipo...
+STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}negalima pajudinti automobiliu sudarytu is keliu vienetu
 STR_CLEAR_TIME                                                  :{BLACK}Ištrinti laiką
 STR_RESET_LATENESS                                              :{BLACK}Paleisti vėlavimo skaitiklį
 STR_CHANGE_WAYPOINT_NAME                                        :{BLACK}Keisti waypoint pavadinimą
@@ -2820,177 +2745,52 @@ STR_TIMETABLE_TOTAL_TIME_INCOMPLETE                             :{BLACK}Šis mar
 STR_TIMETABLE_AUTOFILL                                          :{BLACK}Auto užpildymas
 
 ##id 0x9000
-STR_ERROR_ROAD_VEHICLE_IN_THE_WAY                               :{WHITE}Automobilis kelyje
-STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING} - {COMMA} Automobiliai
-STR_DEPOT_ROAD_VEHICLE_CAPTION                                  :{WHITE}{TOWN} Automobiliu garazas
-STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_BUTTON                      :{BLACK}Naujos tr. priemones
-STR_BUILD_VEHICLE_ROAD_VEHICLE_CAPTION                          :{WHITE}Nauji automobiliai
-STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_BUTTON             :{BLACK}Isigyti priemone
-STR_ERROR_CAN_T_BUILD_ROAD_VEHICLE                              :{WHITE}Automobilio isigyti negalima...
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}...automobilis turi buti sustabdytas garaze
-STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}Automobilio parduoti negalima...
-STR_ERROR_CAN_T_STOP_START_ROAD_VEHICLE                         :{WHITE}Automobilio sustabdyti/paleisti negalima...
-STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} laukia depe
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Uzduotis: {TOWN} garazas
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Uzduotis: {TOWN} garazas, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Servisas{TOWN} Masinu Depe
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Servisas {TOWN} Masinu Depe, {VELOCITY}
-STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Negalima rasti automobilio garazo...
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Negalima rasti garazo
-STR_VEHICLE_LIST_ROAD_VEHICLE_TOOLTIP                           :{BLACK}Automobiliai - paspausk ant automobilio, jei nori detalesnes informacijos
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP          :{BLACK}Automobilio uzduotis - spustelk cia, jei nori sustabdyti/paleisti automobili
-STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP                    :{BLACK}Rodyti automobilio uzduotis
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP                  :{BLACK}Rodyti automobili ekrano centre
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}Siusti automobili i artimiausia garaza
 STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP                   :{BLACK}Apgrezti automobili
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Rodyti detalia automobilio informacija
-STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Automobiliai - paspausk ant automobilio, jei nori detalesnes informacijos
-STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}Isigyti nauja automobili
-STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}Nutempk automobili cia, jei nori ji parduoti
-STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}Rodyti automobiliu garaza ekrano centre
-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_JUST_CARGO                                                  :{CARGO}
 STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
 
-STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Pavadinti automobili
-STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Automobilio pavadinti nepavyko...
-STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Pavadinti automobili
 STR_NEWS_FIRST_BUS_ARRIVAL                                      :{BLACK}{BIGFONT}Gyventojai džiūgauja. . .{}Pirmas autobusas atvyko į {STATION}!
 STR_NEWS_FIRST_TRUCK_ARRIVAL                                    :{BLACK}{BIGFONT}Gyventojai džiūgauja. . .{}Pirmas sunkvežimis atvyko į {STATION}!
 STR_NEWS_FIRST_PASSENGER_TRAM_ARRIVAL                           :{BLACK}{BIGFONT}Miestelėnai švenčia . . .{}Pirmas Tramvajus atvyko į {STATION}!
 STR_NEWS_FIRST_CARGO_TRAM_ARRIVAL                               :{BLACK}{BIGFONT}Miestelėnai švenčia . . .{}Pirmas krovininis tramvajus atvyko į {STATION}!
 STR_NEWS_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Automobilio avarija!{}Automobilio vairuotojas zuvo po susidurimo su traukiniu
 STR_NEWS_ROAD_VEHICLE_CRASH                                     :{BLACK}{BIGFONT}Automobilio avarija!{}Žuvo {COMMA} keleiv(P is iai ių) automobiliui susidūrus su traukiniu
-STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}negalima pajudinti automobiliu sudarytu is keliu vienetu
-STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Pervardinti
-STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Pervardinti automobiliu tipa
-STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Pervardinti automobiliu tipa
-STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Negali pervardinti automobliu tipo...
 
-STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Perkomplektuoti transporto priemone kad galetu vezti kitoki krovinio tipa
-STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Perkomplektuoti
-STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Perkomplektuoti transporto priemone kad galetu vezti pazymeta krovinio tipa
-STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Neimanoma perkomplektuoti...
-STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Nurodykite šios transporto priemonės pervežamą krovinių tipą
 
 ##id 0x9800
 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :Kanalų konstrukcija
 STR_WATERWAYS_TOOLBAR_CAPTION                                   :{WHITE}Kanalų konstrukcija
 STR_WATERWAYS_TOOLBAR_CAPTION_SE                                :{WHITE}Kanalai
 STR_ERROR_CAN_T_BUILD_DOCK_HERE                                 :{WHITE}Neimanoma pastatyti uosto cia...
-STR_DEPOT_SHIP_CAPTION                                          :{WHITE}{TOWN} Laivu depas
-STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON                              :{BLACK}Naujas laivas
-STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - {COMMA} Laivai
-STR_BUILD_VEHICLE_SHIP_CAPTION                                  :{WHITE}Nauji laivai
-STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON                     :{BLACK}Nupirkti Laiva
-STR_CLONE_SHIP                                                  :{BLACK}Kopijuoti laivą
-STR_CLONE_SHIP_INFO                                             :{BLACK}Tai pagamins laivo kopiją. Spragtelėjus laikant VALD (CTRL) nukopijuojami nurodymai
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Tai pagamins laivo kopiją. Spragtelkite šį mygtuką, o tada traukinį esantį depe arba už jo ribų. Spragtelėjus laikant VALD (CTRL) nukopijuojami nurodymai
 STR_ERROR_SHIP_MUST_BE_STOPPED_IN_DEPOT                         :{WHITE}Laivas turi buti sustabdytas garaze
-STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}Laivo parduoti negalima...
-STR_ERROR_CAN_T_BUILD_SHIP                                      :{WHITE}Laivo isigyti negalima...
-STR_ERROR_SHIP_IN_THE_WAY                                       :{WHITE}Laivas kelyje
-STR_ERROR_CAN_T_STOP_START_SHIP                                 :{WHITE}Sustabdyti/paleisti laivo negalima...
-STR_ERROR_CAN_T_SEND_SHIP_TO_DEPOT                              :{WHITE}Nusiusti i laivu depa negalima...
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Kursas: {TOWN} laivu depas
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Kursas: {TOWN} laivu depas, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Servisas{TOWN} Laivu Depe
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Servisas {TOWN} Laivu Depe, {VELOCITY}
-STR_NEWS_SHIP_IS_WAITING                                        :{WHITE}{VEHICLE} laukia doke
 STR_WATERWAYS_TOOLBAR_BUILD_DOCK_TOOLTIP                        :{BLACK}Statyti laivu doka
 STR_WATERWAYS_TOOLBAR_BUILD_DEPOT_TOOLTIP                       :{BLACK}Statyti laivu depa (nauju laivu isigijimui, remontui)
-STR_DEPOT_SHIP_LIST_TOOLTIP                                     :{BLACK}Laivai - paspausk ant laivo, jei nori daugiau informacijos
-STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}Statyti nauja laiva
-STR_DEPOT_SHIP_SELL_TOOLTIP                                     :{BLACK}Nutempk laiva cia, jei nori ji parduoti
-STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}Rodyti laivu depa ekrano centre
-STR_VEHICLE_LIST_SHIP_TOOLTIP                                   :{BLACK}Laivai - paspausk ant laivo, jei nori daugiau informacijos
-STR_BUILD_VEHICLE_SHIP_LIST_TOOLTIP                             :{BLACK}Laivu sarasas - paspausk ant laivo, jei nori detalesnes informacijos
-STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP                    :{BLACK}Statyti pazymeta laiva
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP                  :{BLACK}Dabartine laivo uzduotis - paspausk cia, jei nori sustabdyti/paleisti laiva
-STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Rodyti laivo uzduotis
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP                          :{BLACK}Rodyti laiva ekrano centre
-STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}Nukreipti laiva i depa
-STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Rodyti laivo informacija
-STR_VEHICLE_DETAILS_SHIP_RENAME                                 :{BLACK}Laivo vardas
 
-STR_QUERY_RENAME_SHIP_CAPTION                                   :{WHITE}Laivo vardas
-STR_ERROR_CAN_T_RENAME_SHIP                                     :{WHITE}Negalima pervardyti laivo...
 STR_NEWS_FIRST_SHIP_ARRIVAL                                     :{BLACK}{BIGFONT}Zmones dziaugiasi...{}Pirmas laivas atvyko i {STATION}!
 STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}Statyti pludura, kuris bus naudojamas kaip tarpine stotele
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}Negalima cia statyti pluduro...
 STR_BUILD_AQUEDUCT                                              :{BLACK}Statyti akveduką
 STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}Čia akveduko nepastatysite...
-STR_BUILD_VEHICLE_SHIP_RENAME_BUTTON                            :{BLACK}Pervardinti
-STR_BUILD_VEHICLE_SHIP_RENAME_TOOLTIP                           :{BLACK}Pakeisti laivo tipa
-STR_QUERY_RENAME_SHIP_TYPE_CAPTION                              :{WHITE}Pakeisti laivo varda
-STR_ERROR_CAN_T_RENAME_SHIP_TYPE                                :{WHITE}Laivo vardo pakeisti negalima...
-STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}Perorientuoti laivo pervezamo krovinio tipa
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (Perorientuoti)
-STR_REFIT_SHIP_REFIT_BUTTON                                     :{BLACK}Perorientuoti laiva
-STR_REFIT_SHIP_LIST_TOOLTIP                                     :{BLACK}Pasirink krovinio tipa, kuri laivas tures 'sergeti'
-STR_REFIT_SHIP_REFIT_TOOLTIP                                    :{BLACK}Pakeisti pervezamo krovinio tipa
 STR_REFIT_TITLE                                                 :{GOLD}Pasirink 'sergimo' krovinio tipa:
 STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}Nauja talpa: {GOLD}{CARGO}{}{BLACK}Remonto kaina: {GOLD}{CURRENCY}
-STR_ERROR_CAN_T_REFIT_SHIP                                      :{WHITE}Negalima perorientuotilaivo...
 STR_REFITTABLE                                                  :(perorientuotinas)
 
 ##id 0xA000
 STR_TOOLBAR_AIRCRAFT_CAPTION                                    :{WHITE}Oro uostai
 STR_ERROR_CAN_T_BUILD_AIRPORT_HERE                              :{WHITE}Negalima cia statyti oro uosto...
-STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}{STATION} Lektuvu angaras
-STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON                          :{BLACK}Naujas lektuvas
-STR_CLONE_AIRCRAFT                                              :{BLACK}Kopijuoti lėktuvą
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Tai pagamins lėktuvo kopiją. Spragtelėjus laikant VALD (CTRL) nukopijuojami nurodymai
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Tai pagamins lėktuvo kopiją. Spragtelkite šį mygtuką, o tada traukinį esantį angare arba už jo ribų. Spragtelėjus laikant VALD (CTRL) nukopijuojami nurodymai
-STR_BUILD_VEHICLE_AIRCRAFT_CAPTION                              :{WHITE}Naujas lektuvas
-STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON                 :{BLACK}Isigyti lektuva
-STR_ERROR_CAN_T_BUILD_AIRCRAFT                                  :{WHITE}Negalima isigyti lektuvo...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} Lektuvai
-STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR                         :{WHITE}Negalima lektuvo nusiusti i angara...
-STR_HEADING_FOR_HANGAR                                          :{ORANGE}Kursas: {STATION} angaras
-STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Kursas: {STATION} angarasangar, {VELOCITY}
-STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Sevisas {STATION} Angare
-STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Servisas{STATION} Angare, {VELOCITY}
-STR_NEWS_AIRCRAFT_IS_WAITING                                    :{WHITE}{VEHICLE} laukia angare
-STR_ERROR_AIRCRAFT_IN_THE_WAY                                   :{WHITE}Oro uostai
-STR_ERROR_CAN_T_STOP_START_AIRCRAFT                             :{WHITE}Negalima cia statyti oro uosto...
 STR_ERROR_AIRCRAFT_IS_IN_FLIGHT                                 :{WHITE}Lektuvas dabar skrenda
 STR_ERROR_AIRCRAFT_MUST_BE_STOPPED                              :{WHITE}Lektuvas turi buti sustabdytas angare
-STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}Negalima parduoti lektuvo...
 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION                          :Oro uostu konstr.
 STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Statyti opo uosta
-STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP                               :{BLACK}Lektuvas - spauskite ant lektuvo informacijai
-STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Lektuvas - paspausk ant lektuvo, jei nori daugiau informacijos
-STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}Statyti nauja lektuva
-STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}Nutempk lektuva cia, jei nori parduoti
-STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Rodyti lektuvu angara ekrano centre
-STR_BUILD_VEHICLE_AIRCRAFT_LIST_TOOLTIP                         :{BLACK}Lektuvu sarasas - paspausk ant lektuvo, jei nori daugiau informacijos
-STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_TOOLTIP                :{BLACK}Statyti pazymeta lektuva
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP              :{BLACK}Dabartine lektuvo uzduotis - spausk cia, jei nori sustabryti.paleisti lektuva
-STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Rodyti lektuvo uzduotis
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP                      :{BLACK}Rodyti lektuva ektrano centre
-STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}Siusti lektuva i angara
-STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Rodyti lektuvo informacija
 
-STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}Pervardinti lektuva
-STR_ERROR_CAN_T_RENAME_AIRCRAFT                                 :{WHITE}Negalima pervardinti lektuvo...
-STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}Pervardinti lektuva
 STR_NEWS_FIRST_AIRCRAFT_ARRIVAL                                 :{BLACK}{BIGFONT}Gyventojai dziugauja. . .{}Pirmas lektuvas atvyko i {STATION}!
 STR_NEWS_AIRCRAFT_CRASH                                         :{BLACK}{BIGFONT}Lektuvo katastrofa!{}Prie {1:STATION} liepsnose žuvo {0:COMMA} keleiv{P is iai ių}
 STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Lėktuvo katastrofa!{}Lėktuvas pritrūko degalų, {COMMA} nukrito ant žemės!
 STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
-STR_BUILD_VEHICLE_AIRCRAFT_RENAME_BUTTON                        :{BLACK}Pervardinti
-STR_BUILD_VEHICLE_AIRCRAFT_RENAME_TOOLTIP                       :{BLACK}Pakeisti lektuvo varda
-STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION                          :{WHITE}Pakeisti lektuvo varda
-STR_ERROR_CAN_T_RENAME_AIRCRAFT_TYPE                            :{WHITE}Negalima pakeisti lektuvo vardo...
-STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Pakeisti lektuvo pervezamu kroviniu tipa
-STR_REFIT_AIRCRAFT_REFIT_BUTTON                                 :{BLACK}Keisti krovinio tipa
-STR_REFIT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Pasirink nauja krovinio tipa
-STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}Pakeisti lektuvo pervezamo krovinio tipa pazymetu
-STR_ERROR_CAN_T_REFIT_AIRCRAFT                                  :{WHITE}Negalima pakeisti krovinio tipo...
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Tvarkaraštis)
 
@@ -3128,15 +2928,225 @@ STR_LORRY                                                       :{BLACK}{LORRY}
 STR_PLANE                                                       :{BLACK}{PLANE}
 STR_SHIP                                                        :{BLACK}{SHIP}
 
+############ Vehicle lists
+STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP                             :{BLACK}Traukiniai - spausk ant traukinio, jei nori detalesnes informacijos
+STR_VEHICLE_LIST_ROAD_VEHICLE_TOOLTIP                           :{BLACK}Automobiliai - paspausk ant automobilio, jei nori detalesnes informacijos
+STR_VEHICLE_LIST_SHIP_TOOLTIP                                   :{BLACK}Laivai - paspausk ant laivo, jei nori daugiau informacijos
+STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP                               :{BLACK}Lektuvas - spauskite ant lektuvo informacijai
 
-STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Rodyti visus traukinius, kuriu uzduotuse yra itraukta si stotele
-STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Rodyti visus automobilius, kuriu uzduotyse yra pamineta si stotele
-STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Rodyti visus lektuvus, kuriu uzduotyse yra pamineta si stotele
-STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Rodyti visus laivus, kuriu uzduotyse yra pamineta si stotele
+STR_VEHICLE_LIST_TRAIN_CAPTION                                  :{WHITE}{STRING} - {COMMA} traukiniai
+STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING} - {COMMA} Automobiliai
+STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - {COMMA} Laivai
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} Lektuvai
 
 STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}Nurodymais dalijasi {COMMA} tr. priemon{P ė ės ių}
 STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Parodyti visas tr. priemones, kurios dalijasi šiais nurodymais
 
+STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} laukia depe
+STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} laukia depe
+STR_NEWS_SHIP_IS_WAITING                                        :{WHITE}{VEHICLE} laukia doke
+STR_NEWS_AIRCRAFT_IS_WAITING                                    :{WHITE}{VEHICLE} laukia angare
+
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Įsteigti traukinį
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Perkomplektuoti
+STR_REFIT_SHIP_REFIT_BUTTON                                     :{BLACK}Perorientuoti laiva
+STR_REFIT_AIRCRAFT_REFIT_BUTTON                                 :{BLACK}Keisti krovinio tipa
+
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Įsteigti traukinį prioritetinių krovinių pervežimui
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Perkomplektuoti transporto priemone kad galetu vezti pazymeta krovinio tipa
+STR_REFIT_SHIP_REFIT_TOOLTIP                                    :{BLACK}Pakeisti pervezamo krovinio tipa
+STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}Pakeisti lektuvo pervezamo krovinio tipa pazymetu
+
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Pasirink prioritetinį krovinio tipą, kuriuo rūpinsis traukinys
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Nurodykite šios transporto priemonės pervežamą krovinių tipą
+STR_REFIT_SHIP_LIST_TOOLTIP                                     :{BLACK}Pasirink krovinio tipa, kuri laivas tures 'sergeti'
+STR_REFIT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Pasirink nauja krovinio tipa
+
+STR_DEPOT_TRAIN_CAPTION                                         :{WHITE}{TOWN} Traukinių depas
+STR_DEPOT_ROAD_VEHICLE_CAPTION                                  :{WHITE}{TOWN} Automobiliu garazas
+STR_DEPOT_SHIP_CAPTION                                          :{WHITE}{TOWN} Laivu depas
+STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}{STATION} Lektuvu angaras
+
+STR_VEHICLE_DETAILS_TRAIN_RENAME                                :{BLACK}Traukinio vardas
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Pavadinti automobili
+STR_VEHICLE_DETAILS_SHIP_RENAME                                 :{BLACK}Laivo vardas
+STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}Pervardinti lektuva
+
+STR_QUERY_RENAME_TRAIN_CAPTION                                  :{WHITE}Traukinio vardas
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Pavadinti automobili
+STR_QUERY_RENAME_SHIP_CAPTION                                   :{WHITE}Laivo vardas
+STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}Pervardinti lektuva
+
+STR_ERROR_TRAIN_IN_THE_WAY                                      :{WHITE}Traukinys kelyje
+STR_ERROR_ROAD_VEHICLE_IN_THE_WAY                               :{WHITE}Automobilis kelyje
+STR_ERROR_SHIP_IN_THE_WAY                                       :{WHITE}Laivas kelyje
+STR_ERROR_AIRCRAFT_IN_THE_WAY                                   :{WHITE}Oro uostai
+
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Negalima įsteigti traukinio...
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Neimanoma perkomplektuoti...
+STR_ERROR_CAN_T_REFIT_SHIP                                      :{WHITE}Negalima perorientuotilaivo...
+STR_ERROR_CAN_T_REFIT_AIRCRAFT                                  :{WHITE}Negalima pakeisti krovinio tipo...
+
+STR_ERROR_CAN_T_RENAME_TRAIN                                    :{WHITE}Negali pakeisti traukinio vardo...
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Automobilio pavadinti nepavyko...
+STR_ERROR_CAN_T_RENAME_SHIP                                     :{WHITE}Negalima pervardyti laivo...
+STR_ERROR_CAN_T_RENAME_AIRCRAFT                                 :{WHITE}Negalima pervardinti lektuvo...
+
+STR_ERROR_CAN_T_STOP_START_TRAIN                                :{WHITE}Traukinio sustabdyti/paleisti negalima...
+STR_ERROR_CAN_T_STOP_START_ROAD_VEHICLE                         :{WHITE}Automobilio sustabdyti/paleisti negalima...
+STR_ERROR_CAN_T_STOP_START_SHIP                                 :{WHITE}Sustabdyti/paleisti laivo negalima...
+STR_ERROR_CAN_T_STOP_START_AIRCRAFT                             :{WHITE}Negalima cia statyti oro uosto...
+
+STR_ERROR_CAN_T_SEND_TRAIN_TO_DEPOT                             :{WHITE}Traukinio pasiusti i depa negalima...
+STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Negalima rasti automobilio garazo...
+STR_ERROR_CAN_T_SEND_SHIP_TO_DEPOT                              :{WHITE}Nusiusti i laivu depa negalima...
+STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR                         :{WHITE}Negalima lektuvo nusiusti i angara...
+
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Gelezinkelio transporto priemones nupirkti negalima...
+STR_ERROR_CAN_T_BUILD_ROAD_VEHICLE                              :{WHITE}Automobilio isigyti negalima...
+STR_ERROR_CAN_T_BUILD_SHIP                                      :{WHITE}Laivo isigyti negalima...
+STR_ERROR_CAN_T_BUILD_AIRCRAFT                                  :{WHITE}Negalima isigyti lektuvo...
+
+STR_ERROR_CAN_T_RENAME_TRAIN_TYPE                               :{WHITE}Neimanoma pervardinti traukinio tipo...
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Negali pervardinti automobliu tipo...
+STR_ERROR_CAN_T_RENAME_SHIP_TYPE                                :{WHITE}Laivo vardo pakeisti negalima...
+STR_ERROR_CAN_T_RENAME_AIRCRAFT_TYPE                            :{WHITE}Negalima pakeisti lektuvo vardo...
+
+STR_ERROR_CAN_T_SELL_TRAIN                                      :{WHITE}Priemones negalima parduoti...
+STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}Automobilio parduoti negalima...
+STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}Laivo parduoti negalima...
+STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}Negalima parduoti lektuvo...
+
+STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP                 :{BLACK}Dabartine traukinio uzduotis - paspausk cia, jei nori sustabdyti.paleisti traukini
+STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP          :{BLACK}Automobilio uzduotis - spustelk cia, jei nori sustabdyti/paleisti automobili
+STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP                  :{BLACK}Dabartine laivo uzduotis - paspausk cia, jei nori sustabdyti/paleisti laiva
+STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP              :{BLACK}Dabartine lektuvo uzduotis - spausk cia, jei nori sustabryti.paleisti lektuva
+
+STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP                           :{BLACK}Parodyti traukinio uzduotis
+STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP                    :{BLACK}Rodyti automobilio uzduotis
+STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Rodyti laivo uzduotis
+STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Rodyti lektuvo uzduotis
+
+STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP                         :{BLACK}Parodyti traukini ekrano centre
+STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP                  :{BLACK}Rodyti automobili ekrano centre
+STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP                          :{BLACK}Rodyti laiva ekrano centre
+STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP                      :{BLACK}Rodyti lektuva ektrano centre
+
+STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP                    :{BLACK}Siusti traukini i depa
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}Siusti automobili i artimiausia garaza
+STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}Nukreipti laiva i depa
+STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}Siusti lektuva i angara
+
+STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Rodyti detalia traukinio informacija
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Rodyti detalia automobilio informacija
+STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Rodyti laivo informacija
+STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Rodyti lektuvo informacija
+
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Įsteigti traukinį, kuris rūpinsis prioritetiniais kroviniais
+STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Perkomplektuoti transporto priemone kad galetu vezti kitoki krovinio tipa
+STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}Perorientuoti laivo pervezamo krovinio tipa
+STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Pakeisti lektuvo pervezamu kroviniu tipa
+
+STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Kursas i {TOWN} depa
+STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Kursas i {TOWN} depa, {VELOCITY}
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Uzduotis: {TOWN} garazas
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Uzduotis: {TOWN} garazas, {VELOCITY}
+STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Kursas: {TOWN} laivu depas
+STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Kursas: {TOWN} laivu depas, {VELOCITY}
+STR_HEADING_FOR_HANGAR                                          :{ORANGE}Kursas: {STATION} angaras
+STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Kursas: {STATION} angarasangar, {VELOCITY}
+
+STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Servisas {TOWN} Traukiniu Depe
+STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Servisas {TOWN} Traukiniu Depe, {VELOCITY}
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Servisas{TOWN} Masinu Depe
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Servisas {TOWN} Masinu Depe, {VELOCITY}
+STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Servisas{TOWN} Laivu Depe
+STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Servisas {TOWN} Laivu Depe, {VELOCITY}
+STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Sevisas {STATION} Angare
+STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Servisas{STATION} Angare, {VELOCITY}
+
+
+STR_CLONE_TRAIN                                                 :{BLACK}Kopijuoti traukinį
+STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Kopijuoti automobilį
+STR_CLONE_SHIP                                                  :{BLACK}Kopijuoti laivą
+STR_CLONE_AIRCRAFT                                              :{BLACK}Kopijuoti lėktuvą
+
+STR_CLONE_TRAIN_INFO                                            :{BLACK}Tai pagamins traukinio kopiją su visais vagonais. Spragtelėjus laikant VALD (CTRL) nukopijuojami nurodymai
+STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Tai pagamins automobilio kopiją. Spragtelėjus laikant VALD (CTRL) nukopijuojami nurodymai
+STR_CLONE_SHIP_INFO                                             :{BLACK}Tai pagamins laivo kopiją. Spragtelėjus laikant VALD (CTRL) nukopijuojami nurodymai
+STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Tai pagamins lėktuvo kopiją. Spragtelėjus laikant VALD (CTRL) nukopijuojami nurodymai
+
+STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Tai pagamins traukinio kopiją su visais vagonais. Spragtelkite šį mygtuką, o tada traukinį esantį depe arba už jo ribų. Spragtelėjus laikant VALD (CTRL) nukopijuojami nurodymai
+STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Tai pagamins automobilio kopiją. Spragtelkite šį mygtuką, o tada automobilį esantį garaže arba už jo ribų. Spragtelėjus laikant VALD (CTRL) nukopijuojami nurodymai
+STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Tai pagamins laivo kopiją. Spragtelkite šį mygtuką, o tada traukinį esantį depe arba už jo ribų. Spragtelėjus laikant VALD (CTRL) nukopijuojami nurodymai
+STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Tai pagamins lėktuvo kopiją. Spragtelkite šį mygtuką, o tada traukinį esantį angare arba už jo ribų. Spragtelėjus laikant VALD (CTRL) nukopijuojami nurodymai
+
+STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}Nauji Traukiniai
+STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}Nauji Elektriniai Traukiniai
+STR_BUILD_VEHICLE_TRAIN_MONORAIL_CAPTION                        :{WHITE}Nauji Vienbegiai Traukiniai
+STR_BUILD_VEHICLE_TRAIN_MAGLEV_CAPTION                          :{WHITE}Nauji „Maglev“ traukiniai
+
+STR_BUILD_VEHICLE_TRAIN_ALL_CAPTION                             :{WHITE}Traukiniai
+STR_BUILD_VEHICLE_ROAD_VEHICLE_CAPTION                          :{WHITE}Nauji automobiliai
+STR_BUILD_VEHICLE_SHIP_CAPTION                                  :{WHITE}Nauji laivai
+STR_BUILD_VEHICLE_AIRCRAFT_CAPTION                              :{WHITE}Naujas lektuvas
+
+STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_BUTTON                    :{BLACK}Pirkti
+STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_BUTTON             :{BLACK}Isigyti priemone
+STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON                     :{BLACK}Nupirkti Laiva
+STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON                 :{BLACK}Isigyti lektuva
+
+STR_BUILD_VEHICLE_TRAIN_LIST_TOOLTIP                            :{BLACK}Transporto priemoniu pasirinkimo sarasas - paspausk ant priemones, kad gautum daugiau informacijos
+STR_BUILD_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP                     :{BLACK}Automobiliu pasirinkimo sarasas - paspausk ant automobilio jei nori detalesnes informacijos
+STR_BUILD_VEHICLE_SHIP_LIST_TOOLTIP                             :{BLACK}Laivu sarasas - paspausk ant laivo, jei nori detalesnes informacijos
+STR_BUILD_VEHICLE_AIRCRAFT_LIST_TOOLTIP                         :{BLACK}Lektuvu sarasas - paspausk ant lektuvo, jei nori daugiau informacijos
+
+STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_TOOLTIP                   :{BLACK}Isigyti pazymeta transporto priemone
+STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_TOOLTIP            :{BLACK}Isigyti pazymeta automobili
+STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP                    :{BLACK}Statyti pazymeta laiva
+STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_TOOLTIP                :{BLACK}Statyti pazymeta lektuva
+
+STR_BUILD_VEHICLE_TRAIN_RENAME_BUTTON                           :{BLACK}Pervardinti
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Pervardinti
+STR_BUILD_VEHICLE_SHIP_RENAME_BUTTON                            :{BLACK}Pervardinti
+STR_BUILD_VEHICLE_AIRCRAFT_RENAME_BUTTON                        :{BLACK}Pervardinti
+
+STR_BUILD_VEHICLE_TRAIN_RENAME_TOOLTIP                          :{BLACK}Pervardinti traukinio tipa
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Pervardinti automobiliu tipa
+STR_BUILD_VEHICLE_SHIP_RENAME_TOOLTIP                           :{BLACK}Pakeisti laivo tipa
+STR_BUILD_VEHICLE_AIRCRAFT_RENAME_TOOLTIP                       :{BLACK}Pakeisti lektuvo varda
+
+STR_QUERY_RENAME_TRAIN_TYPE_CAPTION                             :{WHITE}Pervardinti traukinio tipa
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Pervardinti automobiliu tipa
+STR_QUERY_RENAME_SHIP_TYPE_CAPTION                              :{WHITE}Pakeisti laivo varda
+STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION                          :{WHITE}Pakeisti lektuvo varda
+
+STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Naujos tr. priemones
+STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_BUTTON                      :{BLACK}Naujos tr. priemones
+STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON                              :{BLACK}Naujas laivas
+STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON                          :{BLACK}Naujas lektuvas
+
+STR_DEPOT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Traukiniai - paspausk ant traukinio jei nori detalesnes informacijos, tempk vagona, jei nori ji prikabinti/pasalinti nuo traukinio
+STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Automobiliai - paspausk ant automobilio, jei nori detalesnes informacijos
+STR_DEPOT_SHIP_LIST_TOOLTIP                                     :{BLACK}Laivai - paspausk ant laivo, jei nori daugiau informacijos
+STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Lektuvas - paspausk ant lektuvo, jei nori daugiau informacijos
+
+STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP                            :{BLACK}Isigyti nauja gelezinkelio transporto priemone
+STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}Isigyti nauja automobili
+STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}Statyti nauja laiva
+STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}Statyti nauja lektuva
+
+STR_DEPOT_TRAIN_SELL_TOOLTIP                                    :{BLACK}Nutempk transporto priemone cia, jei nori ja parduoti
+STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}Nutempk automobili cia, jei nori ji parduoti
+STR_DEPOT_SHIP_SELL_TOOLTIP                                     :{BLACK}Nutempk laiva cia, jei nori ji parduoti
+STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}Nutempk lektuva cia, jei nori parduoti
+
+STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}Parodyti traukiniu depa ekrano centre
+STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}Rodyti automobiliu garaza ekrano centre
+STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}Rodyti laivu depa ekrano centre
+STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Rodyti lektuvu angara ekrano centre
+
+
 ### depot strings
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}Ar tikrai norite parduoti visas tr. priemones esančias šiame depe?
 STR_DEPOT_WRONG_DEPOT_TYPE                                      :Netinkamas depo tipas
@@ -3156,7 +3166,6 @@ STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TIP                          :{BLACK}Pakeisti
 STR_DEPOT_AUTOREPLACE_SHIP_TIP                                  :{BLACK}Pakeisti visus laivus depe
 STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP                              :{BLACK}Pakeisti visus lėktuvus angare
 
-
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Keisti tr. priemones {STRING}
 STR_REPLACE_VEHICLES_START                                      :{BLACK}Pradeti tr. priemonių keitimą
 STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Stabdyti tr. priemonių keitimą
@@ -3172,6 +3181,7 @@ STR_REPLACE_REMOVE_WAGON                                        :{BLACK}Vagono p
 STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Pakeitimo metu išlaikyti traukinio ilgį atjungiant vagonus (pradedant juo priekio), jeigu pakeitus garvežį traukinys pailgėtų.
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}Keicima: {ORANGE}{SKIP}{SKIP}{STRING}
 STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}Pereidinėti tarp garvežių ir vagonų pakeitimo langų
+
 STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Transporto priemonė negalima
 STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Transporto priemonė negalima
 STR_SHIP_NOT_AVAILABLE                                          :{WHITE}Laivas negalimas
@@ -3317,15 +3327,6 @@ STR_MEASURE_AREA                                                :{BLACK}Sritis:
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Atstumas: {NUM}{}Aukščių skirtumas: {NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Sritis: {NUM} x {NUM}{}Aukščių skirtumas: {NUM} m
 
-############ Date formatting
-STR_FORMAT_DATE_SHORT                                           :{STRING} {NUM}
-STR_FORMAT_DATE_LONG                                            :{STRING} {STRING} {NUM}
-
-STR_JUST_DATE_TINY                                              :{DATE_TINY}
-STR_JUST_DATE_LONG                                              :{DATE_LONG}
-STR_JUST_DATE_ISO                                               :{DATE_ISO}
-########
-
 STR_FEEDER_CARGO_VALUE                                          :{BLACK}Pervesti Kreditus: {LTBLUE}{CURRENCY}
 
 STR_TRANSPARENCY_TOOLB                                          :{WHITE}Permatomumo nustatymai
@@ -3344,7 +3345,6 @@ STR_PERCENT_UP_DOWN_SMALL                                       :{TINYFONT}{WHIT
 STR_PERCENT_UP_DOWN                                             :{WHITE}{NUM}%{UPARROW}{DOWNARROW}
 
 ##### Mass Order
-STR_FORMAT_GROUP_NAME                                           :Grupė {COMMA}
 STR_GROUP_TINY_NAME                                             :{TINYFONT}{GROUP}
 STR_GROUP_ALL_TRAINS                                            :Visi traukiniai
 STR_GROUP_ALL_ROAD_VEHICLES                                     :Visi automobiliai
@@ -3373,12 +3373,60 @@ STR_GROUP_DELETE_TIP                                            :{BLACK}Pašalin
 STR_GROUP_RENAME_TIP                                            :{BLACK}Pervadinti pasirinktą grupę
 STR_GROUP_REPLACE_PROTECTION_TIP                                :{BLACK}Paspauskite čia, kad apsaugoti grupę nuo bendro auto-pakeitimo
 
+#### String control codes and their formatting
 STR_COMPANY_NAME                                                :{COMPANY}
 STR_ENGINE_NAME                                                 :{ENGINE}
 STR_GROUP_NAME                                                  :{GROUP}
+STR_INDUSTRY_NAME                                               :{INDUSTRY}
 STR_PRESIDENT_NAME                                              :{PRESIDENTNAME}
 STR_SIGN_NAME                                                   :{SIGN}
+STR_STATION_NAME                                                :{STATION}
+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_LONG                                              :{DATE_LONG}
+STR_JUST_DATE_ISO                                               :{DATE_ISO}
+STR_JUST_STRING                                                 :{STRING}
+STR_JUST_RAW_STRING                                             :{STRING}
+
+STR_FORMAT_DATE_SHORT                                           :{STRING} {NUM}
+STR_FORMAT_DATE_LONG                                            :{STRING} {STRING} {NUM}
+
+STR_FORMAT_COMPANY_NUM                                          :(Kompanija {COMMA})
+STR_FORMAT_GROUP_NAME                                           :Grupė {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}Vardas turi būti unikalus
 
diff --git a/src/lang/luxembourgish.txt b/src/lang/luxembourgish.txt
index 1133055eb..cebd92b7a 100644
--- a/src/lang/luxembourgish.txt
+++ b/src/lang/luxembourgish.txt
@@ -154,8 +154,6 @@ STR_ABBREV_PLASTIC                                              :{TINYFONT}PL
 STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}KG
 STR_ABBREV_NONE                                                 :{TINYFONT}NO
 STR_ABBREV_ALL                                                  :{TINYFONT}ALL
-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
@@ -167,17 +165,11 @@ STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Original
 STR_ABOUT_VERSION                                               :{BLACK}OpenTTD Versioun {REV}
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 D'OpenTTD team
 
-STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
-STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_QUIT_CAPTION                                                :{WHITE}Eraus
 STR_YES                                                         :{BLACK}Jo
 STR_NO                                                          :{BLACK}Nee
 STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Sidd der slcher dass dir aus dem OpenTTD eraus wëllt , an op {STRING} zeréck?
-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                                                :Näischt
 STR_COLOUR_DARK_BLUE                                            :Donkelblo
 STR_COLOUR_PALE_GREEN                                           :Bleechgréng
@@ -196,8 +188,6 @@ STR_COLOUR_BROWN                                                :Brong
 STR_COLOUR_GREY                                                 :Gro
 STR_COLOUR_WHITE                                                :Wäiss
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}Ze vill Gefierer am Spill
-STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
-STR_RED_COMMA                                                   :{RED}{COMMA}
 STR_BUTTON_LOCATION                                             :{BLACK}Plaz
 STR_SMALLMAP_TYPE_CONTOURS                                      :Konturen
 STR_SMALLMAP_TYPE_VEHICLES                                      :Gefierer
@@ -323,12 +313,13 @@ STR_SORT_CRITERIA_TIP                                           :{BLACK}Argument
 STR_FILTER_CRITERIA_TIP                                         :{BLACK}Filterkritère wielen
 STR_SORT_BY                                                     :{BLACK}Sortéier no
 
+### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}Bevölkerung
+STR_SORT_BY_NAME                                                :{BLACK}Numm
+STR_SORT_BY_DATE                                                :{BLACK}Datum
 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_DATE                                                :{BLACK}Datum
 STR_SORT_BY_NUMBER                                              :Nummer
 STR_SORT_BY_PROFIT_LAST_YEAR                                    :Profit am leschten Joer
 STR_SORT_BY_PROFIT_THIS_YEAR                                    :Profit dëst Joer
@@ -351,37 +342,25 @@ STR_SORT_BY_INTRO_DATE                                          :Aféirungsdatum
 STR_SORT_BY_RUNNING_COST                                        :Betriebskäschten
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :Kraaft/Betriebskäschten
 STR_SORT_BY_CARGO_CAPACITY                                      :Luedungskapazitéit
+
 STR_NO_WAITING_CARGO                                            :{BLACK}Kéng Luedung
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}Selectéier all d'Fabriken
 STR_SELECT_ALL_TYPES                                            :{BLACK}Wielt all Luedungstyp (ouni Luedung déi waart)
-STR_AVAILABLE_TRAINS                                            :{BLACK}Verfügbar Zich
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Verfügbar Gefierer
-STR_AVAILABLE_SHIPS                                             :{BLACK}Verfügbar Schëffer
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Verfügbar Fligern
 STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Lëscht vun allen Maschinen fir dësen Typ weisen.
 STR_MANAGE_LIST                                                 :{BLACK}Verwaltungslëscht
 STR_MANAGE_LIST_TIP                                             :{BLACK}Scheckt d'Instructiounen un all Gefierer an der Lëscht
 STR_REPLACE_VEHICLES                                            :Gefierer ersetzen
+STR_SEND_FOR_SERVICING                                          :An d'Revisioun schécken
+
+STR_AVAILABLE_TRAINS                                            :{BLACK}Verfügbar Zich
+STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Verfügbar Gefierer
+STR_AVAILABLE_SHIPS                                             :{BLACK}Verfügbar Schëffer
+STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Verfügbar Fligern
+
 STR_SEND_TRAIN_TO_DEPOT                                         :An den Depot schécken
 STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :An den Depot schécken
 STR_SEND_SHIP_TO_DEPOT                                          :An den Depot schécken
 STR_SEND_AIRCRAFT_TO_HANGAR                                     :An den Hangar schécken
-STR_SEND_FOR_SERVICING                                          :An d'Revisioun schécken
-
-############ range for months starts
-STR_MONTH_ABBREV_JAN                                            :Jan
-STR_MONTH_ABBREV_FEB                                            :Feb
-STR_MONTH_ABBREV_MAR                                            :Mär
-STR_MONTH_ABBREV_APR                                            :Abr
-STR_MONTH_ABBREV_MAY                                            :Mee
-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                                            :Dez
-############ range for months ends
 
 STR_GRAPH_X_LABEL_MONTH                                         :{TINYFONT}{STRING}{} {STRING}
 STR_GRAPH_X_LABEL_MONTH_YEAR                                    :{TINYFONT}{STRING}{} {STRING}{}{NUM}
@@ -409,8 +388,6 @@ 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_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
@@ -457,7 +434,7 @@ STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Keng
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Numm
 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                                          :1ten
 STR_ORDINAL_NUMBER_2ND                                          :2ten
 STR_ORDINAL_NUMBER_3RD                                          :3ten
@@ -491,6 +468,34 @@ STR_ORDINAL_NUMBER_30TH                                         :30ten
 STR_ORDINAL_NUMBER_31ST                                         :31ten
 ############ range for days ends
 
+############ range for months starts
+STR_MONTH_ABBREV_JAN                                            :Jan
+STR_MONTH_ABBREV_FEB                                            :Feb
+STR_MONTH_ABBREV_MAR                                            :Mär
+STR_MONTH_ABBREV_APR                                            :Abr
+STR_MONTH_ABBREV_MAY                                            :Mee
+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                                            :Dez
+
+STR_MONTH_JAN                                                   :Januar
+STR_MONTH_FEB                                                   :Febuar
+STR_MONTH_MAR                                                   :März
+STR_MONTH_APR                                                   :Abrëll
+STR_MONTH_MAY                                                   :Mee
+STR_MONTH_JUN                                                   :Juni
+STR_MONTH_JUL                                                   :Juli
+STR_MONTH_AUG                                                   :August
+STR_MONTH_SEP                                                   :September
+STR_MONTH_OCT                                                   :Oktober
+STR_MONTH_NOV                                                   :November
+STR_MONTH_DEC                                                   :Dezember
+############ range for months ends
+
 STR_GRAPH_Y_LABEL_NUMBER                                        :{TINYFONT}{COMMA}
 
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}Akzeptéiert Luedung: {LTBLUE}
@@ -580,12 +585,9 @@ 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_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_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
@@ -667,9 +669,7 @@ STR_OFF                                                         :Aus
 STR_SUMMARY                                                     :Resumé
 STR_FULL                                                        :Ganz
 STR_STATUSBAR_COMPANY_NAME                                      :{SILVER}- -  {COMPANY}  - -
-STR_BLACK_STRING                                                :{BLACK}{STRING}
 
-STR_JUST_CHECKMARK                                              :{CHECKMARK}
 ############ range for menu starts
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Spilloptiounen
 STR_SETTINGS_MENU_DIFFICULTY_SETTINGS                           :Schwieregkeetsastellungen
@@ -761,9 +761,6 @@ STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY                             :Finanzéiert en
 ############ range ends here
 
 STR_FUND_INDUSTRY_CAPTION                                       :{WHITE}Nei Industrie finanzéiert
-STR_JUST_STRING                                                 :{STRING}
-STR_JUST_RAW_STRING                                             :{STRING}
-STR_JUST_INT                                                    :{NUM}
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_RAINFOREST                       :{WHITE}...kann nëmmen am Regenwaldgebit gebaut ginn
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT                           :{WHITE}...kann nëmmen an der Wüst gebaut ginn
 STR_STATUSBAR_PAUSED                                            :{YELLOW}* *  PAUSÉIERT  *  *
@@ -777,9 +774,6 @@ 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_BLACK_6                                                     :{BLACK}6
-STR_BLACK_7                                                     :{BLACK}7
-
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Englësch (Original)
 STR_TOWNNAME_FRENCH                                             :Franséisch
@@ -859,19 +853,6 @@ STR_OPTIONS_BASE_GRF_DESCRIPTION_TIP                            :{BLACK}Méi Inf
 
 STR_AUTOSAVE_FAILED                                             :{WHITE}Fehler beim Autospäicheren
 
-STR_MONTH_JAN                                                   :Januar
-STR_MONTH_FEB                                                   :Febuar
-STR_MONTH_MAR                                                   :März
-STR_MONTH_APR                                                   :Abrëll
-STR_MONTH_MAY                                                   :Mee
-STR_MONTH_JUN                                                   :Juni
-STR_MONTH_JUL                                                   :Juli
-STR_MONTH_AUG                                                   :August
-STR_MONTH_SEP                                                   :September
-STR_MONTH_OCT                                                   :Oktober
-STR_MONTH_NOV                                                   :November
-STR_MONTH_DEC                                                   :Dezember
-
 STR_HEADING_FOR_STATION                                         :{LTBLUE}Um Wee fir {STATION}
 STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}Um wee fir {STATION}, {VELOCITY}
 STR_NO_ORDERS                                                   :{LTBLUE}Keng Opträg
@@ -886,8 +867,6 @@ STR_CRATES                                                      :Këschten
 STR_RES_OTHER                                                   :Aaneres
 STR_NOTHING                                                     :
 
-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...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Enn vun der Optragslëscht - -
@@ -1157,7 +1136,6 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Y-Gréi
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :ausgeschalt
-STR_JUST_CURRENCY                                               :{CURRENCY}
 STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Astellung änneren
 
 STR_TEMPERATE_LANDSCAPE                                         :Temperéiert Landschaft
@@ -1193,7 +1171,6 @@ STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}Wielt de
 
 STR_WAYPOINT_VIEWPORT                                           :{WHITE}{WAYPOINT}
 STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WHITE}{WAYPOINT}
-STR_WAYPOINT_NAME                                               :{WAYPOINT}
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Weepunktnumm
 
 STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}Kann den Weepunktnumm net änneren...
@@ -1260,11 +1237,6 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Fabriken
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...ze Noo bei enger aanerer Fabrik
 
-STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Den Zuch upassen fir aaner Luedungen ze transportéieren
-STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Zuch upassen
-STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Selectéiert d'Luedung déi transportéiert soll ginn
-STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Passt den Zuch un fir den ugewielten Luedungstyp
-STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Kann den Zuch net unpassen...
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}D'Produktioun änneren
 
 ############ network gui strings
@@ -1774,11 +1746,6 @@ STR_TOWN_BUILDING_NAME_TEPEES_1                                 :Tipien
 STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1                           :Téikaan-Haus
 STR_TOWN_BUILDING_NAME_PIGGY_BANK_1                             :Spuerschwäin-Bank
 
-STR_INDUSTRY_NAME                                               :{INDUSTRY}
-STR_TOWN_NAME                                                   :{TOWN}
-STR_FORMAT_INDUSTRY_NAME                                        :{TOWN} {STRING}
-STR_STATION_NAME                                                :{STATION}
-
 ##id 0x2800
 STR_LANDSCAPING_MENU_LANDSCAPING                                :Landschaftsbau
 STR_LANDSCAPING_MENU_PLANT_TREES                                :Beem planzen
@@ -1833,6 +1800,12 @@ STR_CARGO_RATING_EXCELLENT                                      :Exzellent
 STR_CARGO_RATING_OUTSTANDING                                    :Perfekt
 ############ range for rating ends
 
+### station view strings
+STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Weis all Zich déi des Statioun an hierem Zaitplang hun
+STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Weis all Stroossengefierter déi des Statioun an hierem Zaitplang hun
+STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Weis all Fliger den des Statioun an sengem Zaitplang huet
+STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Weis all Schëffer déi des Statioun an hierem Zaitplang hun
+
 STR_STATION_VIEW_CARGO_RATING                                   :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO                        :{WHITE}{STATION} acceptéiert {STRING} net méi
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO               :{WHITE}{STATION} acceptéiert {STRING} oder {STRING} net méi
@@ -2076,6 +2049,7 @@ STR_SV_STNAME_AIRPORT                                           :{STRING}er Flug
 STR_SV_STNAME_OILFIELD                                          :{STRING}er Uelegfeld
 STR_SV_STNAME_MINES                                             :{STRING}er Minnen
 STR_SV_STNAME_DOCKS                                             :{STRING} Hafen
+##id 0x6020
 STR_SV_STNAME_ANNEXE                                            :{STRING} Annexe
 STR_SV_STNAME_SIDINGS                                           :{STRING}er Oofstellplaatz
 STR_SV_STNAME_BRANCH                                            :{STRING}er Oofzweigung
@@ -2123,8 +2097,6 @@ STR_NUM_LOW                                                     :Wéineg
 STR_NUM_NORMAL                                                  :Normal
 STR_NUM_HIGH                                                    :Vill
 STR_NUM_CUSTOM                                                  :Benotzerdéfineiert
-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
@@ -2158,7 +2130,6 @@ STR_CITY_APPROVAL_HOSTILE                                       :Ofleenend
 
 ##id 0x7000
 STR_COMPANY_VIEW_CAPTION                                        :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
-STR_FORMAT_COMPANY_NUM                                          :(Company {COMMA})
 STR_COMPANY_VIEW_NEW_FACE_BUTTON                                :{BLACK}Neit Gesiicht
 STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON                           :{BLACK}Faarw Schema
 STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}Faarw Schema:
@@ -2191,7 +2162,6 @@ STR_FINANCES_TOTAL_CAPTION                                      :{WHITE}Total:
 STR_COMPANY_NAME_COMPANY_NUM                                    :{COMPANY} {COMPANYNUM}
 STR_GRAPH_INCOME_CAPTION                                        :{WHITE}Grafik: Ankommen
 STR_CURRCOMPACT                                                 :{CURRCOMPACT}
-STR_JUST_COMMA                                                  :{COMMA}
 STR_GRAPH_OPERATING_PROFIT_CAPTION                              :{WHITE}Grafik: Betriibsgewënn
 STR_FINANCES_BANK_BALANCE_TITLE                                 :{WHITE}Kontostand
 STR_FINANCES_LOAN_TITLE                                         :{WHITE}Kredit
@@ -2594,10 +2564,8 @@ STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE                          :Monorail Lokomo
 STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE                            :Magnéitbunnlokomotiv
 
 ##id 0x8800
-STR_DEPOT_TRAIN_CAPTION                                         :{WHITE}{TOWN} Zuchdepot
 STR_NEWS_FIRST_TRAIN_ARRIVAL                                    :{BLACK}{BIGFONT}Biirger feieren . . .{}Éischten Zuch kënnt bei {STATION} un!
 STR_VEHICLE_DETAILS_CAPTION                                     :{WHITE}{VEHICLE} (Details)
-STR_ERROR_TRAIN_IN_THE_WAY                                      :{WHITE}Zuch am Wee
 STR_ORDER                                                       :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 STR_ORDER_SELECTED                                              :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 STR_ORDER_NON_STOP                                              :{BLACK}Non-stop
@@ -2687,38 +2655,16 @@ STR_TIMETABLE_AND_TRAVEL_FOR                                    :an ënnerwee op
 STR_TIMETABLE_DAYS                                              :{COMMA} D{P ag eeg}
 STR_TIMETABLE_TICKS                                             :{COMMA} Intervall{P "" en}
 
-STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Ënnerwee fir {TOWN} Zuchdepot
-STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Ënnerwee fir {TOWN} Zuchdepot, {VELOCITY}
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Revisioun am {TOWN} Zuchdepot
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Revisioun am {TOWN} Zuchdepot, {VELOCITY}
-
 STR_INVALID_ORDER                                               :{RED} (ongültegen Optrag)
 
 STR_UNKNOWN_STATION                                             :onbekannt Statioun
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}Eidel
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} vun {STATION}
 STR_VEHICLE_DETAILS_CARGO_FROM_MULT                             :{LTBLUE}{CARGO} vun {STATION} (x{NUM})
-STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} waart am Depot
-STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Nei Gefierer
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}Zuch ze laang
 STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}Zich kënnen nëmmen an engem Depot verännert ginn
-STR_VEHICLE_LIST_TRAIN_CAPTION                                  :{WHITE}{STRING} - {COMMA} Z{P uch ich}
 
-STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}Nei Zich
-STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}Nei Elektrozich
-STR_BUILD_VEHICLE_TRAIN_MONORAIL_CAPTION                        :{WHITE}Nei Monorailgefierer
-STR_BUILD_VEHICLE_TRAIN_MAGLEV_CAPTION                          :{WHITE}Nei Magnéitbunngefierer
-STR_BUILD_VEHICLE_TRAIN_ALL_CAPTION                             :{WHITE}Zich
-
-STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_BUTTON                    :{BLACK}Gefiert bauen
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Gefiert klonen
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Baut eng Kopie vum Stroossengefiert. CTRL+Klick kopéiert och d'Opträg
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Baut eng Kopie vum Stroossengefiert. CTRL+Klick kopéiert och d'Opträg
-STR_CLONE_TRAIN                                                 :{BLACK}Zuch klonen
-STR_CLONE_TRAIN_INFO                                            :{BLACK}Dëst baut eng Kopie vun engem Zuch mat all den Wagonen. CTRL+Klick kopéiert och d'Opträg
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Dëst baut eng Kopie vun engem Zuch mat all den Wagonen.  Klickt op dësen Knäppchen an dann op en Zuch am Depot oder baussen.
-STR_BUILD_VEHICLE_TRAIN_RENAME_BUTTON                           :{BLACK}Ëmbenennen
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Iwersprangen
 STR_ORDERS_DELETE_BUTTON                                        :{BLACK}Leschen
 STR_ORDERS_GO_TO_BUTTON                                         :{BLACK}Géi op
@@ -2734,14 +2680,12 @@ STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Wiesselt
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Opträg)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Enn vun den Opträg - -
 STR_SERVICE                                                     :{BLACK}Revisioun
-STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Kann den Zuch net bauen...
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Gebaut: {LTBLUE}{NUM}{BLACK} Wert: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Wert: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
 STR_VEHICLE_STATUS_LOADING_UNLOADING                            :{LTBLUE}Lueden / Entlueden
 STR_VEHICLE_STATUS_LEAVING                                      :{LTBLUE}Verloossen
 STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}Zuch muss am Depot sinn
-STR_ERROR_CAN_T_SEND_TRAIN_TO_DEPOT                             :{WHITE}Kann den Zuch net an den Depot schécken...
 STR_ERROR_NO_MORE_SPACE_FOR_ORDERS                              :{WHITE}Keng Plaz méi fir Opträg
 STR_ERROR_TOO_MANY_ORDERS                                       :{WHITE}Ze vill Opträg
 STR_ERROR_CAN_T_INSERT_NEW_ORDER                                :{WHITE}Kann keen neien Optrag bäisetzen...
@@ -2756,26 +2700,11 @@ STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE}en Gefie
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}Kann d'Gefiert net réckelen...
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}D'hënnescht Maschinn geet ëmmer der viischter no.
 STR_CARGO_N_A                                                   :N/A{SKIP}
-STR_ERROR_CAN_T_SELL_TRAIN                                      :{WHITE}Kann den Zuch net verkafen...
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}Kann den Wee an den Depot net fannen
-STR_ERROR_CAN_T_STOP_START_TRAIN                                :{WHITE}Kann den Zuch net starten/stopen...
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}Revisiounsintervall: {LTBLUE}{COMMA}Deeg{BLACK}   Lescht Revisioun: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}Revisiounsintervall: {LTBLUE}{COMMA}%{BLACK}  Lescht Revisioun: {LTBLUE}{DATE_LONG}
-STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP                             :{BLACK}Zich - klickt op den Zuch fir Informatiounen
-STR_DEPOT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Zich - klickt op den Zuch fir info., zitt d'Gefiert fir en unzehänken/wechzehuelen
-STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP                            :{BLACK}Baut neen Zuch
-STR_DEPOT_TRAIN_SELL_TOOLTIP                                    :{BLACK}Zitt den Zuch heihin fir en ze verkafen
-STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}Zentréiert d'Usiicht op den Depot
-STR_BUILD_VEHICLE_TRAIN_LIST_TOOLTIP                            :{BLACK}Zuchlëscht - klickt op en Zuch fir Informatiounen
-STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_TOOLTIP                   :{BLACK}Baut den ungewielten Zuch
-STR_BUILD_VEHICLE_TRAIN_RENAME_TOOLTIP                          :{BLACK}Gefierttyp ëmbenennen
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP                 :{BLACK}Momentan Aktioun - klickt hei fir den Zuch ze stopen/starten
-STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP                           :{BLACK}Weist d'Opträg vum Zuch
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP                         :{BLACK}Zentréiert d'Usiicht op den Zuch
-STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP                    :{BLACK}Schéckt den Zuch an den Depot. CTRL+Klick fir nëmmen Revisoun
 STR_VEHICLE_VIEW_TRAIN_IGNORE_SIGNAL_TOOLTIP                    :{BLACK}Forcéiert den Zuch durch d'Signal ze fueren
 STR_VEHICLE_VIEW_TRAIN_REVERSE_TOOLTIP                          :{BLACK}Richtung vum Zuch wiesselen
-STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Weist d'Detailer vum Zuch
 STR_VEHICLE_DETAILS_INCREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Revisiounsintervall erhéichen
 STR_VEHICLE_DETAILS_DECREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Revisiounsintervall erofsetzen
 STR_VEHICLE_DETAILS_TRAIN_CARGO_TOOLTIP                         :{BLACK}Weist d'Detailer vun der Luedung
@@ -2809,13 +2738,9 @@ STR_VEHICLE_STATUS_STOPPED                                      :{RED}Gestoppt
 STR_ERROR_CAN_T_MAKE_TRAIN_PASS_SIGNAL                          :{WHITE}Kann den Zuch net bei Gefohr lanscht d'Signal schecken...
 STR_VEHICLE_STATUS_CRASHED                                      :{RED}Accident!
 
-STR_QUERY_RENAME_TRAIN_CAPTION                                  :{WHITE}Zuch benennen
-STR_ERROR_CAN_T_RENAME_TRAIN                                    :{WHITE}Kann den Zuch net benennen...
-STR_VEHICLE_DETAILS_TRAIN_RENAME                                :{BLACK}Zuch benennen
 STR_NEWS_TRAIN_CRASH                                            :{BLACK}{BIGFONT}Zuch Accident!{}{COMMA} stiewen an der Explosioun nom Accident
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Kann d'Richtung vum Zuch net änneren...
-STR_QUERY_RENAME_TRAIN_TYPE_CAPTION                             :{WHITE}Zuchgefierttyp ëmbenennen
-STR_ERROR_CAN_T_RENAME_TRAIN_TYPE                               :{WHITE}Kann den Zuchgefierttyp net ëmbenennen...
+STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Kann keng Gefierer aus e puer Unitéiten emdréinen
 STR_CLEAR_TIME                                                  :{BLACK}Zäit läschen
 STR_RESET_LATENESS                                              :{BLACK}Verspeidungszieler zerécksetzen
 STR_CHANGE_WAYPOINT_NAME                                        :{BLACK}Weepunkt Numm änneren
@@ -2847,178 +2772,53 @@ STR_TIMETABLE_AUTOFILL                                          :{BLACK}Autofël
 STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Fëll den Zaitplang automatesch mat den Werter vum nächsten Trajet (Ctrl+Klick fir Warrdzaiten probéiren bäizehalen)
 
 ##id 0x9000
-STR_ERROR_ROAD_VEHICLE_IN_THE_WAY                               :{WHITE}Stroossengefiert am Wee
-STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING} - {COMMA} Gefier{P t er}
-STR_DEPOT_ROAD_VEHICLE_CAPTION                                  :{WHITE}{TOWN} Stroossendepot
-STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_BUTTON                      :{BLACK}Nei Gefierer
-STR_BUILD_VEHICLE_ROAD_VEHICLE_CAPTION                          :{WHITE}Nei Stroossengefierer
-STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_BUTTON             :{BLACK}Gefiert bauen
-STR_ERROR_CAN_T_BUILD_ROAD_VEHICLE                              :{WHITE}Kann d'Stroossengefiert hei net bauen...
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}...muss an engem Depot stoen
-STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}Kann d'Stroossengefiert net verkafen...
-STR_ERROR_CAN_T_STOP_START_ROAD_VEHICLE                         :{WHITE}Kann d'Stroossengefiert net stoppen/starten...
-STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} waart am Depot
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Um Wee fir {TOWN} Stroossendepot
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Um Wee fir {TOWN} Stroossendepot, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Revisioun am {TOWN} Stroossendepot
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Revisioun am {TOWN} Stroossendepot, {VELOCITY}
-STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Kann d'Gefiert net an den Depot schécken...
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Kann den Depot net fannen
-STR_VEHICLE_LIST_ROAD_VEHICLE_TOOLTIP                           :{BLACK}Stroossengefierer - klickt op en Gefiert fir Informatiounen
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP          :{BLACK}Momentan Aktioun - klickt hei fir d'Gefiert ze stoppen/starten
-STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP                    :{BLACK}Weist d'Opträg vum Gefiehrt
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP                  :{BLACK}Zentréiert d'Unsiicht op d'Gefiehrt
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}Schéckt d'Gefiert an den Depot. CTRL+Klick fir nëmmen Revisoun
 STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP                   :{BLACK}Forcéiert d'Gefiert fir ze dréien
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Weist Stroosengefiert Detailer
-STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Gefierer - klickt op en Gefier fir Informatiounen
-STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}Neit Stroossengefier bauen
-STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}Zitt d'Stroossengefier heihin fir et ze verkafen
-STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}Zentréiert d'Usiicht op den Depot
-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_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})
 
-STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Stroossengefiert benennen
-STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Kann d'Stroossengefiert net benennen...
-STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Stroossengefiert benennen
 STR_NEWS_FIRST_BUS_ARRIVAL                                      :{BLACK}{BIGFONT}Biirger feieren . . .{}Éischten Bus kënnt bei {STATION} un!
 STR_NEWS_FIRST_TRUCK_ARRIVAL                                    :{BLACK}{BIGFONT}Biirger feieren . . .{}Eischten Camion kënnt bei {STATION} un!
 STR_NEWS_FIRST_PASSENGER_TRAM_ARRIVAL                           :{BLACK}{BIGFONT}Biirger feieren . . .{}Eischten Tram kënnt bei  {STATION} un!
 STR_NEWS_FIRST_CARGO_TRAM_ARRIVAL                               :{BLACK}{BIGFONT}Biirger feieren . . .{}Eischten Wueren-Tram kënnt bei  {STATION} un!
 STR_NEWS_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Stroossengefiert onfall!{}Fuerer stieft an der Explosioun no Onfall mam Zuch
 STR_NEWS_ROAD_VEHICLE_CRASH                                     :{BLACK}{BIGFONT}Stroossengefiertaccident!{}{COMMA} stiewen an der Explosioun no Onfall mam Zuch
-STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Kann keng Gefierer aus e puer Unitéiten emdréinen
-STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Ëmbenennen
-STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Gefierttyp ëmbenennen
-STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Gefiertentyp ëmbenennen
-STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Kann den Gefierttyp net ëmbenennen...
 
-STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Stroossengefiert ëmbauen fir eng aner Wuer ze transportéiren
-STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Stroossengefiert ëmbauen
-STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Stroosengefiert embauen fir gewielten Wuer ze transportéiren
-STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Kann Stroossengefiert net ëmbauen...
-STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Wielt den Typ vun Wueren fir Stroossengefiert
 
 ##id 0x9800
 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :Waasserstroossen bauen
 STR_WATERWAYS_TOOLBAR_CAPTION                                   :{WHITE}Waasserstroosen bauen
 STR_WATERWAYS_TOOLBAR_CAPTION_SE                                :{WHITE}Waasserstroosen
 STR_ERROR_CAN_T_BUILD_DOCK_HERE                                 :{WHITE}Kann den Dock hei net bauen...
-STR_DEPOT_SHIP_CAPTION                                          :{WHITE}{TOWN} Schëffdepot
-STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON                              :{BLACK}Nei Schëffer
-STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - {COMMA} Schëff{P "" er}
-STR_BUILD_VEHICLE_SHIP_CAPTION                                  :{WHITE}Nei Schëffer
-STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON                     :{BLACK}Schëff bauen
-STR_CLONE_SHIP                                                  :{BLACK}Schëff klonen
-STR_CLONE_SHIP_INFO                                             :{BLACK}Dëst baut eng Kopie vum Schëff. CTRL+Klick kopéiert och d'Opträg
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Dsst baut eng Kopie vum Schëff. Klickt op dësen Knäppchen an dann op en Schëff am Depot oder baussen.
 STR_ERROR_SHIP_MUST_BE_STOPPED_IN_DEPOT                         :{WHITE}Schëff muss am Depot stoen
-STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}Kann Schëff net verkafen...
-STR_ERROR_CAN_T_BUILD_SHIP                                      :{WHITE}Kann Schëff net bauen...
-STR_ERROR_SHIP_IN_THE_WAY                                       :{WHITE}Schëff am Wee
-STR_ERROR_CAN_T_STOP_START_SHIP                                 :{WHITE}Kann d'Schëff net stoppen/starten...
-STR_ERROR_CAN_T_SEND_SHIP_TO_DEPOT                              :{WHITE}Kann d'Schëff net an den Depot schécken...
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Um Wee fir {TOWN} Schëffdepot
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Um Wee fir {TOWN} Schëffdepot, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Revisioun am {TOWN} Schëffdepot
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Revisioun am {TOWN} Schëffdepot, {VELOCITY}
-STR_NEWS_SHIP_IS_WAITING                                        :{WHITE}{VEHICLE} waart am Depot
 STR_WATERWAYS_TOOLBAR_BUILD_DOCK_TOOLTIP                        :{BLACK}Schëffdock bauen
 STR_WATERWAYS_TOOLBAR_BUILD_DEPOT_TOOLTIP                       :{BLACK}Schëffdepot bauen (fir Schëffer ze bauen an ze warten)
-STR_DEPOT_SHIP_LIST_TOOLTIP                                     :{BLACK}Schëffer - klickt op d'Schëff fir Informatiounen
-STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}Neit Schëff bauen
-STR_DEPOT_SHIP_SELL_TOOLTIP                                     :{BLACK}Zitt Schëff heihin fir et ze verkafen
-STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}Zentréiert d'Usiicht op den Depot
-STR_VEHICLE_LIST_SHIP_TOOLTIP                                   :{BLACK}Schëffer - Klickt op d'Schëff fir Informatiounen
-STR_BUILD_VEHICLE_SHIP_LIST_TOOLTIP                             :{BLACK}Schëffslëscht - Klickt op d'Schëff fir Informatiounen
-STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP                    :{BLACK}Baut dat ungewielten Schëff
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP                  :{BLACK}Momentan Aktioun - Klickt hei fir d'Schëff ze stoppen/starten
-STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Weist d'Opträg vum Schëff
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP                          :{BLACK}Zentréiert d'Usiicht op d'Schëff
-STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}Schéck d'Schëff an den Depot. CTRL+Klick fir nëmmen Revisoun
-STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Weist Schëffdetailer
-STR_VEHICLE_DETAILS_SHIP_RENAME                                 :{BLACK}Schëff benennen
 
-STR_QUERY_RENAME_SHIP_CAPTION                                   :{WHITE}Schëff benennen
-STR_ERROR_CAN_T_RENAME_SHIP                                     :{WHITE}Kann d'Schëff net benennen...
 STR_NEWS_FIRST_SHIP_ARRIVAL                                     :{BLACK}{BIGFONT}Biirger feieren . . .{}Éischt Schëff kënnt bei {STATION} un!
 STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}Plazéiert eng Boje, déi als Weepunkt kann benotzt ginn
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}Kann Boje net hei plazéieren...
 STR_BUILD_AQUEDUCT                                              :{BLACK}Aquadukt bauen
 STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}Kann den Aquadukt héi net bauen...
-STR_BUILD_VEHICLE_SHIP_RENAME_BUTTON                            :{BLACK}Ëmbenennen
-STR_BUILD_VEHICLE_SHIP_RENAME_TOOLTIP                           :{BLACK}Schëffstyp ëmbenennen
-STR_QUERY_RENAME_SHIP_TYPE_CAPTION                              :{WHITE}Schëffstyp ëmbenennen
-STR_ERROR_CAN_T_RENAME_SHIP_TYPE                                :{WHITE}Kann den Schëffstyp net ëmbenennen...
-STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}Schëffslager ëmbauen fir aaner Luedungen ze transportéieren
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (Refit)
-STR_REFIT_SHIP_REFIT_BUTTON                                     :{BLACK}Schëff ëmbauen
-STR_REFIT_SHIP_LIST_TOOLTIP                                     :{BLACK}Selèctéiert den Luedungstyp fir d'Schëff
-STR_REFIT_SHIP_REFIT_TOOLTIP                                    :{BLACK}Schëff op dei ugewielten Luedung ëmbauen
 STR_REFIT_TITLE                                                 :{GOLD}Wielt den Luedungstyp:
 STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}Nei Kapazitéit: {GOLD}{CARGO}{}{BLACK}Käschten fir ëmzebauen: {GOLD}{CURRENCY}
-STR_ERROR_CAN_T_REFIT_SHIP                                      :{WHITE}Kann d'Schëff net ëmbauen...
 STR_REFITTABLE                                                  :(ëmbaubar)
 
 ##id 0xA000
 STR_TOOLBAR_AIRCRAFT_CAPTION                                    :{WHITE}Fluchhäfen
 STR_ERROR_CAN_T_BUILD_AIRPORT_HERE                              :{WHITE}Kann den Fluchhafen hei net bauen...
-STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}{STATION} Fligerhangar
-STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON                          :{BLACK}Neien Fliger
-STR_CLONE_AIRCRAFT                                              :{BLACK}Fliger klonen
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Dëst baut eng Kopie vum Fliger. CTRL+Klick kopéiert och d'Opträg
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Dëst baut eng Kopie vun engem Fliger. Klickt op dësen Knäppchen, an dann op en Fliger am Hangar oder baussen.
-STR_BUILD_VEHICLE_AIRCRAFT_CAPTION                              :{WHITE}Neien Fliger
-STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON                 :{BLACK}Fliger bauen
-STR_ERROR_CAN_T_BUILD_AIRCRAFT                                  :{WHITE}Kann den Fliger net bauen...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} Fliger
-STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR                         :{WHITE}Kann den Fliger net an den Hangar schécken...
-STR_HEADING_FOR_HANGAR                                          :{ORANGE}Um Wee fir {STATION} Hangar
-STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Um Wee fir {STATION} Hangar, {VELOCITY}
-STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Revisioun am {STATION} Hangar
-STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Revisioun am {STATION} Hangar, {VELOCITY}
-STR_NEWS_AIRCRAFT_IS_WAITING                                    :{WHITE}{VEHICLE} waart am Hangar
-STR_ERROR_AIRCRAFT_IN_THE_WAY                                   :{WHITE}Fliger am Wee
-STR_ERROR_CAN_T_STOP_START_AIRCRAFT                             :{WHITE}Kann den Fliger net stoppen/starten...
 STR_ERROR_AIRCRAFT_IS_IN_FLIGHT                                 :{WHITE}Fliger ass um Fluch
 STR_ERROR_AIRCRAFT_MUST_BE_STOPPED                              :{WHITE}Fliger muss am Hangar sinn
-STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}Kann dën Fliger net verkafen...
 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION                          :Fluchhafenbau
 STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Fluchhafen bauen
-STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP                               :{BLACK}Fliger - Klickt op den Fliger fir Informatiounen
-STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Fliger - Klickt op den Fliger fir Informatiounen
-STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}Neien Fliger bauen
-STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}Zitt den Fliger heihin fir en ze verkafen
-STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Zentréiert d'Usiicht op den Hangar
-STR_BUILD_VEHICLE_AIRCRAFT_LIST_TOOLTIP                         :{BLACK}Fligerlëscht - Klickt op den Fliger fir Informatiounen
-STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_TOOLTIP                :{BLACK}Baut den ungewielten Fliger
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP              :{BLACK}Momentan Aktioun - Klickt hei fir den Fliger ze stoppen/starten
-STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Weist d'Opträg vum Fliger
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP                      :{BLACK}Zentréiert d'Usiicht op den Fliger
-STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}Schéckt den Fliger an den Hangar. CTRL+Click fir nëmmen Wartung
-STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Weist d'Fligerdetailer
 
-STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}Fliger benennen
-STR_ERROR_CAN_T_RENAME_AIRCRAFT                                 :{WHITE}Kann den Fliger net benennen...
-STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}Fliger benennen
 STR_NEWS_FIRST_AIRCRAFT_ARRIVAL                                 :{BLACK}{BIGFONT}Biirger feieren . . .{}Éischten Fliger kënnt bei {STATION} un!
 STR_NEWS_AIRCRAFT_CRASH                                         :{BLACK}{BIGFONT}Fligeraccident!{}{COMMA} stiewen an der Explosioun bei {STATION}
 STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Fligeraccident!{}Fliger haat keen Bensin méi, {COMMA} stiewen an Explosioun!
 STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
-STR_BUILD_VEHICLE_AIRCRAFT_RENAME_BUTTON                        :{BLACK}Ëmbenennen
-STR_BUILD_VEHICLE_AIRCRAFT_RENAME_TOOLTIP                       :{BLACK}Fligertyp ëmbenennen
-STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION                          :{WHITE}Fligertyp ëmbenennen
-STR_ERROR_CAN_T_RENAME_AIRCRAFT_TYPE                            :{WHITE}Kann den Fligertyp net ëmbenennen...
-STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Fliger ëmbauen fir aaner Wueren ze transportéieren
-STR_REFIT_AIRCRAFT_REFIT_BUTTON                                 :{BLACK}Fliger ëmbauen
-STR_REFIT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Wielt den Luedungstyp aus
-STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}Baut den Fliger fir den ugewieltenen Luedungstyp ëm
-STR_ERROR_CAN_T_REFIT_AIRCRAFT                                  :{WHITE}Kann den Fliger net ëmbauen...
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Zäitplang)
 
@@ -3172,15 +2972,225 @@ STR_LORRY                                                       :{BLACK}{LORRY}
 STR_PLANE                                                       :{BLACK}{PLANE}
 STR_SHIP                                                        :{BLACK}{SHIP}
 
+############ Vehicle lists
+STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP                             :{BLACK}Zich - klickt op den Zuch fir Informatiounen
+STR_VEHICLE_LIST_ROAD_VEHICLE_TOOLTIP                           :{BLACK}Stroossengefierer - klickt op en Gefiert fir Informatiounen
+STR_VEHICLE_LIST_SHIP_TOOLTIP                                   :{BLACK}Schëffer - Klickt op d'Schëff fir Informatiounen
+STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP                               :{BLACK}Fliger - Klickt op den Fliger fir Informatiounen
 
-STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Weis all Zich déi des Statioun an hierem Zaitplang hun
-STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Weis all Stroossengefierter déi des Statioun an hierem Zaitplang hun
-STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Weis all Fliger den des Statioun an sengem Zaitplang huet
-STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Weis all Schëffer déi des Statioun an hierem Zaitplang hun
+STR_VEHICLE_LIST_TRAIN_CAPTION                                  :{WHITE}{STRING} - {COMMA} Z{P uch ich}
+STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING} - {COMMA} Gefier{P t er}
+STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - {COMMA} Schëff{P "" er}
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} Fliger
 
 STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}Gedeelten Ueder vun {COMMA} Gefier{P t er}
 STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Weis all Gefierer déi dësen Plang deelen
 
+STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} waart am Depot
+STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} waart am Depot
+STR_NEWS_SHIP_IS_WAITING                                        :{WHITE}{VEHICLE} waart am Depot
+STR_NEWS_AIRCRAFT_IS_WAITING                                    :{WHITE}{VEHICLE} waart am Hangar
+
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Zuch upassen
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Stroossengefiert ëmbauen
+STR_REFIT_SHIP_REFIT_BUTTON                                     :{BLACK}Schëff ëmbauen
+STR_REFIT_AIRCRAFT_REFIT_BUTTON                                 :{BLACK}Fliger ëmbauen
+
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Passt den Zuch un fir den ugewielten Luedungstyp
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Stroosengefiert embauen fir gewielten Wuer ze transportéiren
+STR_REFIT_SHIP_REFIT_TOOLTIP                                    :{BLACK}Schëff op dei ugewielten Luedung ëmbauen
+STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}Baut den Fliger fir den ugewieltenen Luedungstyp ëm
+
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Selectéiert d'Luedung déi transportéiert soll ginn
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Wielt den Typ vun Wueren fir Stroossengefiert
+STR_REFIT_SHIP_LIST_TOOLTIP                                     :{BLACK}Selèctéiert den Luedungstyp fir d'Schëff
+STR_REFIT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Wielt den Luedungstyp aus
+
+STR_DEPOT_TRAIN_CAPTION                                         :{WHITE}{TOWN} Zuchdepot
+STR_DEPOT_ROAD_VEHICLE_CAPTION                                  :{WHITE}{TOWN} Stroossendepot
+STR_DEPOT_SHIP_CAPTION                                          :{WHITE}{TOWN} Schëffdepot
+STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}{STATION} Fligerhangar
+
+STR_VEHICLE_DETAILS_TRAIN_RENAME                                :{BLACK}Zuch benennen
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Stroossengefiert benennen
+STR_VEHICLE_DETAILS_SHIP_RENAME                                 :{BLACK}Schëff benennen
+STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}Fliger benennen
+
+STR_QUERY_RENAME_TRAIN_CAPTION                                  :{WHITE}Zuch benennen
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Stroossengefiert benennen
+STR_QUERY_RENAME_SHIP_CAPTION                                   :{WHITE}Schëff benennen
+STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}Fliger benennen
+
+STR_ERROR_TRAIN_IN_THE_WAY                                      :{WHITE}Zuch am Wee
+STR_ERROR_ROAD_VEHICLE_IN_THE_WAY                               :{WHITE}Stroossengefiert am Wee
+STR_ERROR_SHIP_IN_THE_WAY                                       :{WHITE}Schëff am Wee
+STR_ERROR_AIRCRAFT_IN_THE_WAY                                   :{WHITE}Fliger am Wee
+
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Kann den Zuch net unpassen...
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Kann Stroossengefiert net ëmbauen...
+STR_ERROR_CAN_T_REFIT_SHIP                                      :{WHITE}Kann d'Schëff net ëmbauen...
+STR_ERROR_CAN_T_REFIT_AIRCRAFT                                  :{WHITE}Kann den Fliger net ëmbauen...
+
+STR_ERROR_CAN_T_RENAME_TRAIN                                    :{WHITE}Kann den Zuch net benennen...
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Kann d'Stroossengefiert net benennen...
+STR_ERROR_CAN_T_RENAME_SHIP                                     :{WHITE}Kann d'Schëff net benennen...
+STR_ERROR_CAN_T_RENAME_AIRCRAFT                                 :{WHITE}Kann den Fliger net benennen...
+
+STR_ERROR_CAN_T_STOP_START_TRAIN                                :{WHITE}Kann den Zuch net starten/stopen...
+STR_ERROR_CAN_T_STOP_START_ROAD_VEHICLE                         :{WHITE}Kann d'Stroossengefiert net stoppen/starten...
+STR_ERROR_CAN_T_STOP_START_SHIP                                 :{WHITE}Kann d'Schëff net stoppen/starten...
+STR_ERROR_CAN_T_STOP_START_AIRCRAFT                             :{WHITE}Kann den Fliger net stoppen/starten...
+
+STR_ERROR_CAN_T_SEND_TRAIN_TO_DEPOT                             :{WHITE}Kann den Zuch net an den Depot schécken...
+STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Kann d'Gefiert net an den Depot schécken...
+STR_ERROR_CAN_T_SEND_SHIP_TO_DEPOT                              :{WHITE}Kann d'Schëff net an den Depot schécken...
+STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR                         :{WHITE}Kann den Fliger net an den Hangar schécken...
+
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Kann den Zuch net bauen...
+STR_ERROR_CAN_T_BUILD_ROAD_VEHICLE                              :{WHITE}Kann d'Stroossengefiert hei net bauen...
+STR_ERROR_CAN_T_BUILD_SHIP                                      :{WHITE}Kann Schëff net bauen...
+STR_ERROR_CAN_T_BUILD_AIRCRAFT                                  :{WHITE}Kann den Fliger net bauen...
+
+STR_ERROR_CAN_T_RENAME_TRAIN_TYPE                               :{WHITE}Kann den Zuchgefierttyp net ëmbenennen...
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Kann den Gefierttyp net ëmbenennen...
+STR_ERROR_CAN_T_RENAME_SHIP_TYPE                                :{WHITE}Kann den Schëffstyp net ëmbenennen...
+STR_ERROR_CAN_T_RENAME_AIRCRAFT_TYPE                            :{WHITE}Kann den Fligertyp net ëmbenennen...
+
+STR_ERROR_CAN_T_SELL_TRAIN                                      :{WHITE}Kann den Zuch net verkafen...
+STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}Kann d'Stroossengefiert net verkafen...
+STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}Kann Schëff net verkafen...
+STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}Kann dën Fliger net verkafen...
+
+STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP                 :{BLACK}Momentan Aktioun - klickt hei fir den Zuch ze stopen/starten
+STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP          :{BLACK}Momentan Aktioun - klickt hei fir d'Gefiert ze stoppen/starten
+STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP                  :{BLACK}Momentan Aktioun - Klickt hei fir d'Schëff ze stoppen/starten
+STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP              :{BLACK}Momentan Aktioun - Klickt hei fir den Fliger ze stoppen/starten
+
+STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP                           :{BLACK}Weist d'Opträg vum Zuch
+STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP                    :{BLACK}Weist d'Opträg vum Gefiehrt
+STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Weist d'Opträg vum Schëff
+STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Weist d'Opträg vum Fliger
+
+STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP                         :{BLACK}Zentréiert d'Usiicht op den Zuch
+STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP                  :{BLACK}Zentréiert d'Unsiicht op d'Gefiehrt
+STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP                          :{BLACK}Zentréiert d'Usiicht op d'Schëff
+STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP                      :{BLACK}Zentréiert d'Usiicht op den Fliger
+
+STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP                    :{BLACK}Schéckt den Zuch an den Depot. CTRL+Klick fir nëmmen Revisoun
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}Schéckt d'Gefiert an den Depot. CTRL+Klick fir nëmmen Revisoun
+STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}Schéck d'Schëff an den Depot. CTRL+Klick fir nëmmen Revisoun
+STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}Schéckt den Fliger an den Hangar. CTRL+Click fir nëmmen Wartung
+
+STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Weist d'Detailer vum Zuch
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Weist Stroosengefiert Detailer
+STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Weist Schëffdetailer
+STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Weist d'Fligerdetailer
+
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Den Zuch upassen fir aaner Luedungen ze transportéieren
+STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Stroossengefiert ëmbauen fir eng aner Wuer ze transportéiren
+STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}Schëffslager ëmbauen fir aaner Luedungen ze transportéieren
+STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Fliger ëmbauen fir aaner Wueren ze transportéieren
+
+STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Ënnerwee fir {TOWN} Zuchdepot
+STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Ënnerwee fir {TOWN} Zuchdepot, {VELOCITY}
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Um Wee fir {TOWN} Stroossendepot
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Um Wee fir {TOWN} Stroossendepot, {VELOCITY}
+STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Um Wee fir {TOWN} Schëffdepot
+STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Um Wee fir {TOWN} Schëffdepot, {VELOCITY}
+STR_HEADING_FOR_HANGAR                                          :{ORANGE}Um Wee fir {STATION} Hangar
+STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Um Wee fir {STATION} Hangar, {VELOCITY}
+
+STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Revisioun am {TOWN} Zuchdepot
+STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Revisioun am {TOWN} Zuchdepot, {VELOCITY}
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Revisioun am {TOWN} Stroossendepot
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Revisioun am {TOWN} Stroossendepot, {VELOCITY}
+STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Revisioun am {TOWN} Schëffdepot
+STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Revisioun am {TOWN} Schëffdepot, {VELOCITY}
+STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Revisioun am {STATION} Hangar
+STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Revisioun am {STATION} Hangar, {VELOCITY}
+
+
+STR_CLONE_TRAIN                                                 :{BLACK}Zuch klonen
+STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Gefiert klonen
+STR_CLONE_SHIP                                                  :{BLACK}Schëff klonen
+STR_CLONE_AIRCRAFT                                              :{BLACK}Fliger klonen
+
+STR_CLONE_TRAIN_INFO                                            :{BLACK}Dëst baut eng Kopie vun engem Zuch mat all den Wagonen. CTRL+Klick kopéiert och d'Opträg
+STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Baut eng Kopie vum Stroossengefiert. CTRL+Klick kopéiert och d'Opträg
+STR_CLONE_SHIP_INFO                                             :{BLACK}Dëst baut eng Kopie vum Schëff. CTRL+Klick kopéiert och d'Opträg
+STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Dëst baut eng Kopie vum Fliger. CTRL+Klick kopéiert och d'Opträg
+
+STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Dëst baut eng Kopie vun engem Zuch mat all den Wagonen.  Klickt op dësen Knäppchen an dann op en Zuch am Depot oder baussen.
+STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Baut eng Kopie vum Stroossengefiert. CTRL+Klick kopéiert och d'Opträg
+STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Dsst baut eng Kopie vum Schëff. Klickt op dësen Knäppchen an dann op en Schëff am Depot oder baussen.
+STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Dëst baut eng Kopie vun engem Fliger. Klickt op dësen Knäppchen, an dann op en Fliger am Hangar oder baussen.
+
+STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}Nei Zich
+STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}Nei Elektrozich
+STR_BUILD_VEHICLE_TRAIN_MONORAIL_CAPTION                        :{WHITE}Nei Monorailgefierer
+STR_BUILD_VEHICLE_TRAIN_MAGLEV_CAPTION                          :{WHITE}Nei Magnéitbunngefierer
+
+STR_BUILD_VEHICLE_TRAIN_ALL_CAPTION                             :{WHITE}Zich
+STR_BUILD_VEHICLE_ROAD_VEHICLE_CAPTION                          :{WHITE}Nei Stroossengefierer
+STR_BUILD_VEHICLE_SHIP_CAPTION                                  :{WHITE}Nei Schëffer
+STR_BUILD_VEHICLE_AIRCRAFT_CAPTION                              :{WHITE}Neien Fliger
+
+STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_BUTTON                    :{BLACK}Gefiert bauen
+STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_BUTTON             :{BLACK}Gefiert bauen
+STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON                     :{BLACK}Schëff bauen
+STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON                 :{BLACK}Fliger bauen
+
+STR_BUILD_VEHICLE_TRAIN_LIST_TOOLTIP                            :{BLACK}Zuchlëscht - klickt op en Zuch fir Informatiounen
+STR_BUILD_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP                     :{BLACK}Stroossengefiert Lëscht - klickt op en Gefiert fir Informatiounen
+STR_BUILD_VEHICLE_SHIP_LIST_TOOLTIP                             :{BLACK}Schëffslëscht - Klickt op d'Schëff fir Informatiounen
+STR_BUILD_VEHICLE_AIRCRAFT_LIST_TOOLTIP                         :{BLACK}Fligerlëscht - Klickt op den Fliger fir Informatiounen
+
+STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_TOOLTIP                   :{BLACK}Baut den ungewielten Zuch
+STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_TOOLTIP            :{BLACK}Baut dat ungewieltent Stroossengefiert
+STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP                    :{BLACK}Baut dat ungewielten Schëff
+STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_TOOLTIP                :{BLACK}Baut den ungewielten Fliger
+
+STR_BUILD_VEHICLE_TRAIN_RENAME_BUTTON                           :{BLACK}Ëmbenennen
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Ëmbenennen
+STR_BUILD_VEHICLE_SHIP_RENAME_BUTTON                            :{BLACK}Ëmbenennen
+STR_BUILD_VEHICLE_AIRCRAFT_RENAME_BUTTON                        :{BLACK}Ëmbenennen
+
+STR_BUILD_VEHICLE_TRAIN_RENAME_TOOLTIP                          :{BLACK}Gefierttyp ëmbenennen
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Gefierttyp ëmbenennen
+STR_BUILD_VEHICLE_SHIP_RENAME_TOOLTIP                           :{BLACK}Schëffstyp ëmbenennen
+STR_BUILD_VEHICLE_AIRCRAFT_RENAME_TOOLTIP                       :{BLACK}Fligertyp ëmbenennen
+
+STR_QUERY_RENAME_TRAIN_TYPE_CAPTION                             :{WHITE}Zuchgefierttyp ëmbenennen
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Gefiertentyp ëmbenennen
+STR_QUERY_RENAME_SHIP_TYPE_CAPTION                              :{WHITE}Schëffstyp ëmbenennen
+STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION                          :{WHITE}Fligertyp ëmbenennen
+
+STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Nei Gefierer
+STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_BUTTON                      :{BLACK}Nei Gefierer
+STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON                              :{BLACK}Nei Schëffer
+STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON                          :{BLACK}Neien Fliger
+
+STR_DEPOT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Zich - klickt op den Zuch fir info., zitt d'Gefiert fir en unzehänken/wechzehuelen
+STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Gefierer - klickt op en Gefier fir Informatiounen
+STR_DEPOT_SHIP_LIST_TOOLTIP                                     :{BLACK}Schëffer - klickt op d'Schëff fir Informatiounen
+STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Fliger - Klickt op den Fliger fir Informatiounen
+
+STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP                            :{BLACK}Baut neen Zuch
+STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}Neit Stroossengefier bauen
+STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}Neit Schëff bauen
+STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}Neien Fliger bauen
+
+STR_DEPOT_TRAIN_SELL_TOOLTIP                                    :{BLACK}Zitt den Zuch heihin fir en ze verkafen
+STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}Zitt d'Stroossengefier heihin fir et ze verkafen
+STR_DEPOT_SHIP_SELL_TOOLTIP                                     :{BLACK}Zitt Schëff heihin fir et ze verkafen
+STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}Zitt den Fliger heihin fir en ze verkafen
+
+STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}Zentréiert d'Usiicht op den Depot
+STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}Zentréiert d'Usiicht op den Depot
+STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}Zentréiert d'Usiicht op den Depot
+STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Zentréiert d'Usiicht op den Hangar
+
+
 ### depot strings
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}Dier verkaft grad all Gefierer am Depot. Sidder sécher ?
 STR_DEPOT_WRONG_DEPOT_TYPE                                      :Falschen Depot-Typ
@@ -3200,7 +3210,6 @@ STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TIP                          :{BLACK}All Gefi
 STR_DEPOT_AUTOREPLACE_SHIP_TIP                                  :{BLACK}All Schëffer am Depot automatesch ersetzen
 STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP                              :{BLACK}All Fliger am Hangar automatesch ersetzen
 
-
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Remplacéier{STRING}
 STR_REPLACE_VEHICLES_START                                      :{BLACK}Start Gefierterremplacement
 STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Stop Gefierterremplacement
@@ -3216,6 +3225,7 @@ STR_REPLACE_REMOVE_WAGON                                        :{BLACK}Wagon ra
 STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Mecht dass den Autoremplacement d'Lengt vum Zuch behält, andems en Wagonen (vun lénks un) wechhëllt, wann d'Lok den Zuch ze laang mecht.
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}Remplacéiren: {ORANGE}{SKIP}{SKIP}{STRING}
 STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}Wiessel tëscht Maschin- an Wagonremplac. Fënster
+
 STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Gefiert net verfügbar
 STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Stroossengefiert net verfügbar
 STR_SHIP_NOT_AVAILABLE                                          :{WHITE}Schëff net verfügbar
@@ -3365,17 +3375,6 @@ STR_MEASURE_AREA                                                :{BLACK}Areal: {
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Längt: {NUM}{}Héichtenënnerscheed: {NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Areal: {NUM} x {NUM}{}Héichtenënnerscheed: {NUM} m
 
-############ Date formatting
-STR_FORMAT_DATE_TINY                                            :{STRING}-{STRING}-{NUM}
-STR_FORMAT_DATE_SHORT                                           :{STRING} {NUM}
-STR_FORMAT_DATE_LONG                                            :{STRING} {STRING} {NUM}
-STR_FORMAT_DATE_ISO                                             :{2:NUM}-{1:STRING}-{0:STRING}
-
-STR_JUST_DATE_TINY                                              :{DATE_TINY}
-STR_JUST_DATE_LONG                                              :{DATE_LONG}
-STR_JUST_DATE_ISO                                               :{DATE_ISO}
-########
-
 STR_FEEDER_CARGO_VALUE                                          :{BLACK}Transfer Suen: {LTBLUE}{CURRENCY}
 STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD                            :{WHITE}...d'Strooss ass am Besëtz vun der Stad
 STR_DRIVE_THROUGH_ERROR_DIRECTION                               :{WHITE}...Strooss geet an dei falsch Richtung
@@ -3400,7 +3399,6 @@ STR_PERCENT_UP_DOWN_SMALL                                       :{TINYFONT}{WHIT
 STR_PERCENT_UP_DOWN                                             :{WHITE}{NUM}%{UPARROW}{DOWNARROW}
 
 ##### Mass Order
-STR_FORMAT_GROUP_NAME                                           :Grupp {COMMA}
 STR_GROUP_TINY_NAME                                             :{TINYFONT}{GROUP}
 STR_GROUP_ALL_TRAINS                                            :All Zich
 STR_GROUP_ALL_ROAD_VEHICLES                                     :All Stroossengefierer
@@ -3429,12 +3427,62 @@ STR_GROUP_DELETE_TIP                                            :{BLACK}Déi ung
 STR_GROUP_RENAME_TIP                                            :{BLACK}Déi ungewielten Grupp ëmbenennen
 STR_GROUP_REPLACE_PROTECTION_TIP                                :{BLACK}Klickt fir déi Grupp vum globalen "Autoersetzen" auszeschléissen
 
+#### String control codes and their formatting
 STR_COMPANY_NAME                                                :{COMPANY}
 STR_ENGINE_NAME                                                 :{ENGINE}
 STR_GROUP_NAME                                                  :{GROUP}
+STR_INDUSTRY_NAME                                               :{INDUSTRY}
 STR_PRESIDENT_NAME                                              :{PRESIDENTNAME}
 STR_SIGN_NAME                                                   :{SIGN}
+STR_STATION_NAME                                                :{STATION}
+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_LONG                                              :{DATE_LONG}
+STR_JUST_DATE_ISO                                               :{DATE_ISO}
+STR_JUST_STRING                                                 :{STRING}
+STR_JUST_RAW_STRING                                             :{STRING}
+
+STR_FORMAT_DATE_TINY                                            :{STRING}-{STRING}-{NUM}
+STR_FORMAT_DATE_SHORT                                           :{STRING} {NUM}
+STR_FORMAT_DATE_LONG                                            :{STRING} {STRING} {NUM}
+STR_FORMAT_DATE_ISO                                             :{2:NUM}-{1:STRING}-{0:STRING}
+
+STR_FORMAT_COMPANY_NUM                                          :(Company {COMMA})
+STR_FORMAT_GROUP_NAME                                           :Grupp {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}Numm muss eenzegartëg sinn
 
diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt
index 789bfbc06..3bdc709f5 100644
--- a/src/lang/norwegian_bokmal.txt
+++ b/src/lang/norwegian_bokmal.txt
@@ -154,8 +154,6 @@ STR_ABBREV_PLASTIC                                              :{TINYFONT}PL
 STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}MV
 STR_ABBREV_NONE                                                 :{TINYFONT}NE
 STR_ABBREV_ALL                                                  :{TINYFONT}ALL
-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
@@ -167,17 +165,11 @@ STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Opprinne
 STR_ABOUT_VERSION                                               :{BLACK}OpenTTD versjon {REV}
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 OpenTTD-teamet
 
-STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
-STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_QUIT_CAPTION                                                :{WHITE}Avslutt
 STR_YES                                                         :{BLACK}Ja
 STR_NO                                                          :{BLACK}Nei
 STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Er du sikker på at du vil avslutte og gå tilbake til {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                                                :Ingenting
 STR_COLOUR_DARK_BLUE                                            :Mørkeblå
 STR_COLOUR_PALE_GREEN                                           :Lysegrønn
@@ -196,8 +188,6 @@ STR_COLOUR_BROWN                                                :Brun
 STR_COLOUR_GREY                                                 :Grå
 STR_COLOUR_WHITE                                                :Hvit
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}For mange kjøretøy i spillet
-STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
-STR_RED_COMMA                                                   :{RED}{COMMA}
 STR_BUTTON_LOCATION                                             :{BLACK}Sted
 STR_SMALLMAP_TYPE_CONTOURS                                      :Konturer
 STR_SMALLMAP_TYPE_VEHICLES                                      :Kjøretøy
@@ -323,12 +313,13 @@ STR_SORT_CRITERIA_TIP                                           :{BLACK}Velg sor
 STR_FILTER_CRITERIA_TIP                                         :{BLACK}Velg filtreringskriterier
 STR_SORT_BY                                                     :{BLACK}Sorter etter
 
+### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}Folketall
+STR_SORT_BY_NAME                                                :{BLACK}Navn
+STR_SORT_BY_DATE                                                :{BLACK}Dato
 STR_SORT_BY_PRODUCTION                                          :Produksjon
 STR_SORT_BY_TYPE                                                :Type
 STR_SORT_BY_TRANSPORTED                                         :Transportert
-STR_SORT_BY_NAME                                                :{BLACK}Navn
-STR_SORT_BY_DATE                                                :{BLACK}Dato
 STR_SORT_BY_NUMBER                                              :Nummer
 STR_SORT_BY_PROFIT_LAST_YEAR                                    :Fortjeneste i fjor
 STR_SORT_BY_PROFIT_THIS_YEAR                                    :Fortjeneste i år
@@ -351,6 +342,7 @@ STR_SORT_BY_INTRO_DATE                                          :Introduksjonsda
 STR_SORT_BY_RUNNING_COST                                        :Driftskostnad
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :Kraft/Driftskostnad
 STR_SORT_BY_CARGO_CAPACITY                                      :Lastkapasitet
+
 STR_NO_WAITING_CARGO                                            :{BLACK}Ingen last venter
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}Velg alle anlegg
 STR_SELECT_ALL_TYPES                                            :{BLACK}Velg alle lasttyper (inkludert last som ikke venter)
@@ -370,21 +362,6 @@ STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Send til depoet
 STR_SEND_SHIP_TO_DEPOT                                          :Send til depoet
 STR_SEND_AIRCRAFT_TO_HANGAR                                     :Send til 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                                            :Mai
-STR_MONTH_ABBREV_JUN                                            :Jun
-STR_MONTH_ABBREV_JUL                                            :Jul
-STR_MONTH_ABBREV_AUG                                            :Aug
-STR_MONTH_ABBREV_SEP                                            :Sep
-STR_MONTH_ABBREV_OCT                                            :Okt
-STR_MONTH_ABBREV_NOV                                            :Nov
-STR_MONTH_ABBREV_DEC                                            :Des
-############ 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}{STRING}-
@@ -411,8 +388,6 @@ 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_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
@@ -459,7 +434,7 @@ STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Ingen
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Navn
 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                                          :1.
 STR_ORDINAL_NUMBER_2ND                                          :2.
 STR_ORDINAL_NUMBER_3RD                                          :3.
@@ -493,6 +468,34 @@ STR_ORDINAL_NUMBER_30TH                                         :30.
 STR_ORDINAL_NUMBER_31ST                                         :31.
 ############ 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                                            :Mai
+STR_MONTH_ABBREV_JUN                                            :Jun
+STR_MONTH_ABBREV_JUL                                            :Jul
+STR_MONTH_ABBREV_AUG                                            :Aug
+STR_MONTH_ABBREV_SEP                                            :Sep
+STR_MONTH_ABBREV_OCT                                            :Okt
+STR_MONTH_ABBREV_NOV                                            :Nov
+STR_MONTH_ABBREV_DEC                                            :Des
+
+STR_MONTH_JAN                                                   :januar
+STR_MONTH_FEB                                                   :februar
+STR_MONTH_MAR                                                   :mars
+STR_MONTH_APR                                                   :april
+STR_MONTH_MAY                                                   :mai
+STR_MONTH_JUN                                                   :juni
+STR_MONTH_JUL                                                   :juli
+STR_MONTH_AUG                                                   :august
+STR_MONTH_SEP                                                   :september
+STR_MONTH_OCT                                                   :oktober
+STR_MONTH_NOV                                                   :november
+STR_MONTH_DEC                                                   :desember
+############ range for months ends
+
 STR_GRAPH_Y_LABEL_NUMBER                                        :{TINYFONT}{COMMA}
 
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}Godtatte varer: {LTBLUE}
@@ -582,12 +585,9 @@ 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_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_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
@@ -669,9 +669,7 @@ STR_OFF                                                         :Av
 STR_SUMMARY                                                     :Sammendrag
 STR_FULL                                                        :Fullt
 STR_STATUSBAR_COMPANY_NAME                                      :{SILVER}- -  {COMPANY}  - -
-STR_BLACK_STRING                                                :{BLACK}{STRING}
 
-STR_JUST_CHECKMARK                                              :{CHECKMARK}
 ############ range for menu starts
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Spillinnstillinger
 STR_SETTINGS_MENU_DIFFICULTY_SETTINGS                           :Vanskelighetsgrad
@@ -776,9 +774,6 @@ 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_BLACK_6                                                     :{BLACK}6
-STR_BLACK_7                                                     :{BLACK}7
-
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Engelsk (Original)
 STR_TOWNNAME_FRENCH                                             :Fransk
@@ -858,19 +853,6 @@ STR_OPTIONS_BASE_GRF_DESCRIPTION_TIP                            :{BLACK}Tilleggs
 
 STR_AUTOSAVE_FAILED                                             :{WHITE}Autolagring feilet
 
-STR_MONTH_JAN                                                   :januar
-STR_MONTH_FEB                                                   :februar
-STR_MONTH_MAR                                                   :mars
-STR_MONTH_APR                                                   :april
-STR_MONTH_MAY                                                   :mai
-STR_MONTH_JUN                                                   :juni
-STR_MONTH_JUL                                                   :juli
-STR_MONTH_AUG                                                   :august
-STR_MONTH_SEP                                                   :september
-STR_MONTH_OCT                                                   :oktober
-STR_MONTH_NOV                                                   :november
-STR_MONTH_DEC                                                   :desember
-
 STR_HEADING_FOR_STATION                                         :{LTBLUE}På vei til {STATION}
 STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}På vei til {STATION}, {VELOCITY}
 STR_NO_ORDERS                                                   :{LTBLUE}Ingen ordre
@@ -885,8 +867,6 @@ STR_CRATES                                                      :kasser
 STR_RES_OTHER                                                   :annet
 STR_NOTHING                                                     :
 
-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...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Slutt på delte ordre - -
@@ -1158,7 +1138,6 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Y-stør
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :slått av
-STR_JUST_CURRENCY                                               :{CURRENCY}
 STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Endre innstillingsverdi
 
 STR_TEMPERATE_LANDSCAPE                                         :Temperert landskap
@@ -2124,8 +2103,6 @@ STR_NUM_LOW                                                     :Lite
 STR_NUM_NORMAL                                                  :Normal
 STR_NUM_HIGH                                                    :Høyt
 STR_NUM_CUSTOM                                                  :Egendefinert
-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
@@ -2806,7 +2783,6 @@ 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_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})
@@ -3472,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}
@@ -3490,6 +3469,31 @@ STR_FORMAT_COMPANY_NUM                                          :(Firma {COMMA})
 STR_FORMAT_GROUP_NAME                                           :Gruppe {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}Navn må være unikt
 
 #### Improved sign GUI
@@ -3607,6 +3611,7 @@ STR_AI_AUTHOR                                                   :{BLACK}Forfatte
 STR_AI_VERSION                                                  :{BLACK}Versjon {NUM}
 STR_AI_URL                                                      :{BLACK}URL: {STRING}
 STR_AI_PLEASE_REPORT_CRASH                                      :{WHITE}En av AIene krasjet. Vennligst rapporter dette til forfatteren av AIen med en skjermdump av AI-feilsøkingsvinduet.
+STR_AI_NO_AI_FOUND                                              :Ingen brukbare AI ble funnet.{}Denne AIen er en plassholder og vil ikke gjøre noe.{}Du kan laste ned flere AIer ved hjelp av 'Online Content' systemet.
 ########
 
 ############ town controlled noise level
diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt
index 36d087850..35bd5aa4b 100644
--- a/src/lang/norwegian_nynorsk.txt
+++ b/src/lang/norwegian_nynorsk.txt
@@ -155,8 +155,6 @@ STR_ABBREV_PLASTIC                                              :{TINYFONT}PL
 STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}MV
 STR_ABBREV_NONE                                                 :{TINYFONT}IN
 STR_ABBREV_ALL                                                  :{TINYFONT}ALL
-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
@@ -168,17 +166,11 @@ STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Opphavel
 STR_ABOUT_VERSION                                               :{BLACK}OpenTTD versjon {REV}
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 OpenTTD-teamet
 
-STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
-STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_QUIT_CAPTION                                                :{WHITE}Avslutt
 STR_YES                                                         :{BLACK}Ja
 STR_NO                                                          :{BLACK}Nei
 STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Er du sikker på at du vil avslutte OpenTTD og gå attende til {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                                                :Ingenting
 STR_COLOUR_DARK_BLUE                                            :Mørkeblå
 STR_COLOUR_PALE_GREEN                                           :Lysegrøn
@@ -197,8 +189,6 @@ STR_COLOUR_BROWN                                                :Brun
 STR_COLOUR_GREY                                                 :Grå
 STR_COLOUR_WHITE                                                :Kvit
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}For mange køyretøy i spelet
-STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
-STR_RED_COMMA                                                   :{RED}{COMMA}
 STR_BUTTON_LOCATION                                             :{BLACK}Stad
 STR_SMALLMAP_TYPE_CONTOURS                                      :Konturar
 STR_SMALLMAP_TYPE_VEHICLES                                      :Køyretøy
@@ -323,12 +313,13 @@ STR_SORT_ORDER_TIP                                              :{BLACK}Vel sort
 STR_SORT_CRITERIA_TIP                                           :{BLACK}Vel sorteringskriterie
 STR_SORT_BY                                                     :{BLACK}Sorter etter
 
+### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}Innbyggjartal
+STR_SORT_BY_NAME                                                :{BLACK}Namn
+STR_SORT_BY_DATE                                                :{BLACK}Dato
 STR_SORT_BY_PRODUCTION                                          :Produksjon
 STR_SORT_BY_TYPE                                                :Type
 STR_SORT_BY_TRANSPORTED                                         :Transportert
-STR_SORT_BY_NAME                                                :{BLACK}Namn
-STR_SORT_BY_DATE                                                :{BLACK}Dato
 STR_SORT_BY_NUMBER                                              :Nummer
 STR_SORT_BY_PROFIT_LAST_YEAR                                    :Forteneste i fjor
 STR_SORT_BY_PROFIT_THIS_YEAR                                    :Forteneste i år
@@ -349,37 +340,25 @@ STR_SORT_BY_INTRO_DATE                                          :Introduksjonsda
 STR_SORT_BY_RUNNING_COST                                        :Driftskostnad
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :Kraft/Driftskostnad
 STR_SORT_BY_CARGO_CAPACITY                                      :Lastekapasitet
+
 STR_NO_WAITING_CARGO                                            :{BLACK}Inga last ventar
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}Vel alle anlegga
 STR_SELECT_ALL_TYPES                                            :{BLACK}Vel alle lasttypar (inkludert last som ikkje ventar)
-STR_AVAILABLE_TRAINS                                            :{BLACK}Tilgjengelege tog
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Tilgjengelege køyretøy
-STR_AVAILABLE_SHIPS                                             :{BLACK}Tilgjengelege skip
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Tilgjengelege fly
 STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Sjå ei liste over mogelege maskindesign for dette køyretøyet.
 STR_MANAGE_LIST                                                 :{BLACK}Behandle liste
 STR_MANAGE_LIST_TIP                                             :{BLACK}Send instruksjonar til alle køyretøy i denne lista
 STR_REPLACE_VEHICLES                                            :Bytt ut køyretøy
+STR_SEND_FOR_SERVICING                                          :Send til vedlikehald
+
+STR_AVAILABLE_TRAINS                                            :{BLACK}Tilgjengelege tog
+STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Tilgjengelege køyretøy
+STR_AVAILABLE_SHIPS                                             :{BLACK}Tilgjengelege skip
+STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Tilgjengelege fly
+
 STR_SEND_TRAIN_TO_DEPOT                                         :Send til depot
 STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Send til depot
 STR_SEND_SHIP_TO_DEPOT                                          :Send til depot
 STR_SEND_AIRCRAFT_TO_HANGAR                                     :Send til hangar
-STR_SEND_FOR_SERVICING                                          :Send til vedlikehald
-
-############ 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                                            :mai
-STR_MONTH_ABBREV_JUN                                            :jun
-STR_MONTH_ABBREV_JUL                                            :jul
-STR_MONTH_ABBREV_AUG                                            :aug
-STR_MONTH_ABBREV_SEP                                            :sep
-STR_MONTH_ABBREV_OCT                                            :okt
-STR_MONTH_ABBREV_NOV                                            :nov
-STR_MONTH_ABBREV_DEC                                            :des
-############ range for months ends
 
 STR_GRAPH_X_LABEL_MONTH                                         :{TINYFONT}{STRING}{} {STRING}
 STR_GRAPH_X_LABEL_MONTH_YEAR                                    :{TINYFONT}{STRING}{} {STRING}{}{NUM}
@@ -407,8 +386,6 @@ 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_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
@@ -455,7 +432,7 @@ STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Ingen
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Namn
 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                                          :1.
 STR_ORDINAL_NUMBER_2ND                                          :2.
 STR_ORDINAL_NUMBER_3RD                                          :3.
@@ -489,6 +466,34 @@ STR_ORDINAL_NUMBER_30TH                                         :30.
 STR_ORDINAL_NUMBER_31ST                                         :31.
 ############ 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                                            :mai
+STR_MONTH_ABBREV_JUN                                            :jun
+STR_MONTH_ABBREV_JUL                                            :jul
+STR_MONTH_ABBREV_AUG                                            :aug
+STR_MONTH_ABBREV_SEP                                            :sep
+STR_MONTH_ABBREV_OCT                                            :okt
+STR_MONTH_ABBREV_NOV                                            :nov
+STR_MONTH_ABBREV_DEC                                            :des
+
+STR_MONTH_JAN                                                   :januar
+STR_MONTH_FEB                                                   :februar
+STR_MONTH_MAR                                                   :mars
+STR_MONTH_APR                                                   :april
+STR_MONTH_MAY                                                   :mai
+STR_MONTH_JUN                                                   :juni
+STR_MONTH_JUL                                                   :juli
+STR_MONTH_AUG                                                   :august
+STR_MONTH_SEP                                                   :september
+STR_MONTH_OCT                                                   :oktober
+STR_MONTH_NOV                                                   :november
+STR_MONTH_DEC                                                   :desember
+############ range for months ends
+
 STR_GRAPH_Y_LABEL_NUMBER                                        :{TINYFONT}{COMMA}
 
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}Godtekne varer: {LTBLUE}
@@ -578,12 +583,9 @@ 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_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_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
@@ -665,9 +667,7 @@ STR_OFF                                                         :Av
 STR_SUMMARY                                                     :Samandrag
 STR_FULL                                                        :Fullt
 STR_STATUSBAR_COMPANY_NAME                                      :{SILVER}- -  {COMPANY}  - -
-STR_BLACK_STRING                                                :{BLACK}{STRING}
 
-STR_JUST_CHECKMARK                                              :{CHECKMARK}
 ############ range for menu starts
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Spelinstillingar
 STR_SETTINGS_MENU_DIFFICULTY_SETTINGS                           :Vanskegrad
@@ -759,9 +759,6 @@ STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY                             :Finansier ny in
 ############ range ends here
 
 STR_FUND_INDUSTRY_CAPTION                                       :{WHITE}Finansier ny industri
-STR_JUST_STRING                                                 :{STRING}
-STR_JUST_RAW_STRING                                             :{STRING}
-STR_JUST_INT                                                    :{NUM}
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_RAINFOREST                       :{WHITE}...kan berre byggjast i regnskogområde
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT                           :{WHITE}...kan berre byggjast i ørkenområde
 STR_STATUSBAR_PAUSED                                            :{YELLOW}* *  PAUSE  *  *
@@ -775,9 +772,6 @@ 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_BLACK_6                                                     :{BLACK}6
-STR_BLACK_7                                                     :{BLACK}7
-
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Engelsk
 STR_TOWNNAME_FRENCH                                             :Fransk
@@ -855,19 +849,6 @@ STR_OPTIONS_BASE_GRF_TIP                                        :{BLACK}Vel basi
 
 STR_AUTOSAVE_FAILED                                             :{WHITE}Autolagring gjekk gale
 
-STR_MONTH_JAN                                                   :januar
-STR_MONTH_FEB                                                   :februar
-STR_MONTH_MAR                                                   :mars
-STR_MONTH_APR                                                   :april
-STR_MONTH_MAY                                                   :mai
-STR_MONTH_JUN                                                   :juni
-STR_MONTH_JUL                                                   :juli
-STR_MONTH_AUG                                                   :august
-STR_MONTH_SEP                                                   :september
-STR_MONTH_OCT                                                   :oktober
-STR_MONTH_NOV                                                   :november
-STR_MONTH_DEC                                                   :desember
-
 STR_HEADING_FOR_STATION                                         :{LTBLUE}På veg til {STATION}
 STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}På veg til {STATION}, {VELOCITY}
 STR_NO_ORDERS                                                   :{LTBLUE}Ingen ordre
@@ -882,8 +863,6 @@ STR_CRATES                                                      :kasser
 STR_RES_OTHER                                                   :anna
 STR_NOTHING                                                     :
 
-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...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Slutt på delte ordrar - -
@@ -1150,7 +1129,6 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Y-storl
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :slått av
-STR_JUST_CURRENCY                                               :{CURRENCY}
 STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Endre innstillingsverdi
 
 STR_TEMPERATE_LANDSCAPE                                         :Temperert landskap
@@ -1186,7 +1164,6 @@ STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}Vel kont
 
 STR_WAYPOINT_VIEWPORT                                           :{WHITE}{WAYPOINT}
 STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WHITE}{WAYPOINT}
-STR_WAYPOINT_NAME                                               :{WAYPOINT}
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Endre namn på kontrollpunkt
 
 STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}Kan ikkje endre namnet til kontrollpunktet...
@@ -1253,11 +1230,6 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Industri
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...for nær ein annan industri
 
-STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Bygg om eit lokomotiv til å ta ein annan type last
-STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Bygg om lokomotivet
-STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Vel kva type last lokomotivet skal ta
-STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Bygg om lokomotivet til å frakte den valde varetypen
-STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Kan ikkje byggje om lokomotiv...
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Endre produksjon
 
 ############ network gui strings
@@ -1767,11 +1739,6 @@ STR_TOWN_BUILDING_NAME_TEPEES_1                                 :Indianertelt
 STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1                           :Tekjelehus
 STR_TOWN_BUILDING_NAME_PIGGY_BANK_1                             :Sparebøsse
 
-STR_INDUSTRY_NAME                                               :{INDUSTRY}
-STR_TOWN_NAME                                                   :{TOWN}
-STR_FORMAT_INDUSTRY_NAME                                        :{TOWN} {STRING}
-STR_STATION_NAME                                                :{STATION}
-
 ##id 0x2800
 STR_LANDSCAPING_MENU_LANDSCAPING                                :Landskapsverktøy
 STR_LANDSCAPING_MENU_PLANT_TREES                                :Plant tre
@@ -1826,6 +1793,12 @@ STR_CARGO_RATING_EXCELLENT                                      :Utmerkt
 STR_CARGO_RATING_OUTSTANDING                                    :Framifrå
 ############ range for rating ends
 
+### station view strings
+STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Vis alle tog som har denne stasjonen på timeplanen sin
+STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Vis alle køyretøy som har denne stasjonen på timeplanen sin
+STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Vis alle fly som har denne stasjonen på timeplanen sin
+STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Vis alle skip som har denne stasjonen på timeplanen sin
+
 STR_STATION_VIEW_CARGO_RATING                                   :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO                        :{WHITE}{STATION} godtek ikkje lenger {STRING}
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO               :{WHITE}{STATION} godtek ikkje lenger {STRING} eller {STRING}
@@ -2069,6 +2042,7 @@ STR_SV_STNAME_AIRPORT                                           :{STRING} flypla
 STR_SV_STNAME_OILFIELD                                          :{STRING} oljefelt
 STR_SV_STNAME_MINES                                             :{STRING} gruvestasjon
 STR_SV_STNAME_DOCKS                                             :{STRING} hamn
+##id 0x6020
 STR_SV_STNAME_ANNEXE                                            :{STRING} anneks
 STR_SV_STNAME_SIDINGS                                           :{STRING}vegen
 STR_SV_STNAME_BRANCH                                            :{STRING} grein
@@ -2116,8 +2090,6 @@ STR_NUM_LOW                                                     :Lite
 STR_NUM_NORMAL                                                  :Normal
 STR_NUM_HIGH                                                    :Høgt
 STR_NUM_CUSTOM                                                  :Eigendefinert
-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
@@ -2151,7 +2123,6 @@ STR_CITY_APPROVAL_HOSTILE                                       :Fiendsleg
 
 ##id 0x7000
 STR_COMPANY_VIEW_CAPTION                                        :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
-STR_FORMAT_COMPANY_NUM                                          :(Firma {COMMA})
 STR_COMPANY_VIEW_NEW_FACE_BUTTON                                :{BLACK}Nytt andlet
 STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON                           :{BLACK}Firmafarge
 STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}Firmafarge:
@@ -2184,7 +2155,6 @@ STR_FINANCES_TOTAL_CAPTION                                      :{WHITE}Totalt:
 STR_COMPANY_NAME_COMPANY_NUM                                    :{COMPANY} {COMPANYNUM}
 STR_GRAPH_INCOME_CAPTION                                        :{WHITE}Graf over inntekter
 STR_CURRCOMPACT                                                 :{CURRCOMPACT}
-STR_JUST_COMMA                                                  :{COMMA}
 STR_GRAPH_OPERATING_PROFIT_CAPTION                              :{WHITE}Graf over overskot
 STR_FINANCES_BANK_BALANCE_TITLE                                 :{WHITE}Saldo
 STR_FINANCES_LOAN_TITLE                                         :{WHITE}Lån
@@ -2586,10 +2556,8 @@ STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE                          :monorail-lokomo
 STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE                            :maglev-lokomotiv
 
 ##id 0x8800
-STR_DEPOT_TRAIN_CAPTION                                         :{WHITE}{TOWN} togstall
 STR_NEWS_FIRST_TRAIN_ARRIVAL                                    :{BLACK}{BIGFONT}Innbyggjarane jublar . . .{}Første tog kjem til {STATION}!
 STR_VEHICLE_DETAILS_CAPTION                                     :{WHITE}{VEHICLE} (Detaljar)
-STR_ERROR_TRAIN_IN_THE_WAY                                      :{WHITE}Tog i vegen
 STR_ORDER                                                       :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 STR_ORDER_SELECTED                                              :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 STR_ORDER_NON_STOP                                              :{BLACK}Utan stopp
@@ -2676,38 +2644,16 @@ STR_TIMETABLE_AND_TRAVEL_FOR                                    :og reis for {ST
 STR_TIMETABLE_DAYS                                              :{COMMA} dag{P "" ar}
 STR_TIMETABLE_TICKS                                             :{COMMA} Tjukk{P "" s}
 
-STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Er på veg til {TOWN} togstall
-STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Er på veg til {TOWN} togstall, {VELOCITY}
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Vedlikehald ved {TOWN} togstall
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Vedlikehald ved {TOWN} togstall, {VELOCITY}
-
 STR_INVALID_ORDER                                               :{RED} (Ugyldig ordre)
 
 STR_UNKNOWN_STATION                                             :ukjend stasjon
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}Tom
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} frå {STATION}
 STR_VEHICLE_DETAILS_CARGO_FROM_MULT                             :{LTBLUE}{CARGO} frå {STATION} (x{NUM})
-STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} ventar i depoet
-STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Nye tog/vogner
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}Toget er for langt
 STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}Tog kan berre endrast når dei står stille i togstallen
-STR_VEHICLE_LIST_TRAIN_CAPTION                                  :{WHITE}{STRING} - {COMMA} tog
 
-STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}Nye tog/vogner for jernbane
-STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}Nytt elektrisk tog
-STR_BUILD_VEHICLE_TRAIN_MONORAIL_CAPTION                        :{WHITE}Nye tog/vogner for monorail
-STR_BUILD_VEHICLE_TRAIN_MAGLEV_CAPTION                          :{WHITE}Nye tog/vogner for maglev
-STR_BUILD_VEHICLE_TRAIN_ALL_CAPTION                             :{WHITE}Skinnekjøretøy
-
-STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_BUTTON                    :{BLACK}Kjøp tog/vogner
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Klon eit køyretøy
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Dette vil lage ein kopi av eit kjøretøy. CTRL-klikk deler ordrane
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Dette vil lage ein kopi av eit køyretøy. Klikk denne knappen og etter det på eit anna køyretøy. CTRL-klikk deler ordrane
-STR_CLONE_TRAIN                                                 :{BLACK}Klon tog
-STR_CLONE_TRAIN_INFO                                            :{BLACK}Dette vil lage ein kopi av eit lokomotiv inkludert alle vognene. CTRL-klikk deler ordrane
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Dette vil lage ein kopi av eit lokomotiv inkludert alle vognene. Trykk på denne knappen og etter det på eit anna tog. CTRL-klikk deler ordrane
-STR_BUILD_VEHICLE_TRAIN_RENAME_BUTTON                           :{BLACK}Gje nytt namn
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Hopp over
 STR_ORDERS_DELETE_BUTTON                                        :{BLACK}Slett
 STR_ORDERS_GO_TO_BUTTON                                         :{BLACK}Køyr til
@@ -2723,14 +2669,12 @@ STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Bytt til
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Ordre)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Slutt på ordre - -
 STR_SERVICE                                                     :{BLACK}Vedlikehald
-STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Kan ikkje byggje jernbanekøyretøy...
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Bygd: {LTBLUE}{NUM}{BLACK} Verdi: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Verdi: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
 STR_VEHICLE_STATUS_LOADING_UNLOADING                            :{LTBLUE}Lastar på/av
 STR_VEHICLE_STATUS_LEAVING                                      :{LTBLUE}Reiser
 STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}Toget må vere stoppa i togstallen
-STR_ERROR_CAN_T_SEND_TRAIN_TO_DEPOT                             :{WHITE}Kan ikkje sende tog til togstall...
 STR_ERROR_NO_MORE_SPACE_FOR_ORDERS                              :{WHITE}Ikkje plass til fleire ordrar
 STR_ERROR_TOO_MANY_ORDERS                                       :{WHITE}For mange ordrar
 STR_ERROR_CAN_T_INSERT_NEW_ORDER                                :{WHITE}Kan ikkje setje inn ny ordre...
@@ -2745,26 +2689,11 @@ STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE}eit kjø
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}Kan ikkje flytte køyretøy...
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}Bakmaskinen vil alltid følgje det fremste motstykket
 STR_CARGO_N_A                                                   :N/A{SKIP}
-STR_ERROR_CAN_T_SELL_TRAIN                                      :{WHITE}Kan ikkje selje jernbanekøyretøy...
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}Kan ikkje finne ein togstall i nærleiken
-STR_ERROR_CAN_T_STOP_START_TRAIN                                :{WHITE}Kan ikkje stoppe/starte tog...
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}Vedlikehaldsintervall: {LTBLUE}{COMMA}dagar{BLACK}   Førre vedlikehald: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}Vedlikehaldsintervall: {LTBLUE}{COMMA} %{BLACK}   Førre vedlikehald: {LTBLUE}{DATE_LONG}
-STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP                             :{BLACK}Tog - trykk på tog for meir informasjon
-STR_DEPOT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Tog - trykk på tog for meir info. Dra vogn for å leggje til/fjerne frå tog
-STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP                            :{BLACK}Bygg nytt tog (vogn)
-STR_DEPOT_TRAIN_SELL_TOOLTIP                                    :{BLACK}Dra tog (vogn) her for å selje
-STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}Vis staden togstallen ligg på
-STR_BUILD_VEHICLE_TRAIN_LIST_TOOLTIP                            :{BLACK}Liste over tog/vogner - trykk på tog/vogn for meir informasjon
-STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_TOOLTIP                   :{BLACK}Bygg den valde farkosten
-STR_BUILD_VEHICLE_TRAIN_RENAME_TOOLTIP                          :{BLACK}Endre namnet til den valde farkosten
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP                 :{BLACK}Gjeldande togstatus - trykk her for å stoppe/starte tog
-STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP                           :{BLACK}Vis ordrane til toget
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP                         :{BLACK}Vis toget sin gjeldande posisjon
-STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP                    :{BLACK}Send toget til ein togstall. CTRL-klikk for å berre utføre vedlikehald
 STR_VEHICLE_VIEW_TRAIN_IGNORE_SIGNAL_TOOLTIP                    :{BLACK}Tving toget til å køyre på raudt lys
 STR_VEHICLE_VIEW_TRAIN_REVERSE_TOOLTIP                          :{BLACK}Byt køyreretning
-STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Vis detaljar om toget
 STR_VEHICLE_DETAILS_INCREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Auk intervall for vedlikehald av tog
 STR_VEHICLE_DETAILS_DECREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Minsk intervall for vedlikehald av tog
 STR_VEHICLE_DETAILS_TRAIN_CARGO_TOOLTIP                         :{BLACK}Vis detaljar om innhaldet i vognene
@@ -2785,13 +2714,9 @@ STR_VEHICLE_STATUS_STOPPED                                      :{RED}Stoppa
 STR_ERROR_CAN_T_MAKE_TRAIN_PASS_SIGNAL                          :{WHITE}Kan ikkje tvinge tog til å køyre på raudt lys ved fare...
 STR_VEHICLE_STATUS_CRASHED                                      :{RED}Krasja!
 
-STR_QUERY_RENAME_TRAIN_CAPTION                                  :{WHITE}Namngje tog
-STR_ERROR_CAN_T_RENAME_TRAIN                                    :{WHITE}Kan ikkje namngje tog...
-STR_VEHICLE_DETAILS_TRAIN_RENAME                                :{BLACK}Namngje tog
 STR_NEWS_TRAIN_CRASH                                            :{BLACK}{BIGFONT}Togkrasj!{}{COMMA} døyr i kollisjonen
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Kan ikkje snu toget...
-STR_QUERY_RENAME_TRAIN_TYPE_CAPTION                             :{WHITE}Gje tog/vogn nytt namn
-STR_ERROR_CAN_T_RENAME_TRAIN_TYPE                               :{WHITE}Kan ikkje gje tog/vogn nytt namn...
+STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Kan ikkje snu køyretøy som er samansette av fleire delar
 STR_CLEAR_TIME                                                  :{BLACK}Fjern Tid
 STR_RESET_LATENESS                                              :{BLACK}Still attende teljaren for forseining
 STR_CHANGE_WAYPOINT_NAME                                        :{BLACK}Endre namnet på waypoint
@@ -2823,178 +2748,53 @@ STR_TIMETABLE_AUTOFILL                                          :{BLACK}Automati
 STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Fyll timeplanen automatisk med verdiar frå neste reise (CTRL-klikk for å prøve å halde ventetider)
 
 ##id 0x9000
-STR_ERROR_ROAD_VEHICLE_IN_THE_WAY                               :{WHITE}Køyretøy i vegen
-STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING} - {COMMA} køyretøy
-STR_DEPOT_ROAD_VEHICLE_CAPTION                                  :{WHITE}{TOWN} Garasje
-STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_BUTTON                      :{BLACK}Nye køyretøy
-STR_BUILD_VEHICLE_ROAD_VEHICLE_CAPTION                          :{WHITE}Nye køyretøy
-STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_BUTTON             :{BLACK}Kjøp køyretøy
-STR_ERROR_CAN_T_BUILD_ROAD_VEHICLE                              :{WHITE}Kan ikkje kjøpe køyretøy...
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}...må verte stoppa i ein garasje
-STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}Kan ikkje selje køyretøy...
-STR_ERROR_CAN_T_STOP_START_ROAD_VEHICLE                         :{WHITE}Kan ikkje starte/stoppe køyretøy...
-STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} ventar i depoet
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Er på veg til {TOWN} garasje
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Er på veg til {TOWN} garasje, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Vedlikehald ved {TOWN} garasje
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Vedlikehald ved {TOWN} garasje, {VELOCITY}
-STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Kan ikkje sende køyretøy til garasje...
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Kan ikkje finne ein garasje i nærleiken
-STR_VEHICLE_LIST_ROAD_VEHICLE_TOOLTIP                           :{BLACK}Køyretøy - trykk på køyretøy for informasjon
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP          :{BLACK}Gjeldande køyretøystatus - trykk her for å stoppa/starta køyretøy
-STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP                    :{BLACK}Vis ordrelista til køyretøyet
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP                  :{BLACK}Vis køyretøyet sin gjeldande posisjon
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}Send køyretøyet til ein garasje
 STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP                   :{BLACK}Bytt køyreretning
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Vis detaljar om køyretøyet
-STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Køyretøyliste - trykk på køyretøy for meir informasjon
-STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}Bygg nytt køyretøy
-STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}Dra køyretøy hit for å selje det
-STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}Vis kvar garasjen ligg
-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_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})
 
-STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Namngje køyretøy
-STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Kan ikkje namngje køyretøy...
-STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Namngje køyretøy
 STR_NEWS_FIRST_BUS_ARRIVAL                                      :{BLACK}{BIGFONT}Innbyggjarane jublar . . .{}Første buss kjem til {STATION}!
 STR_NEWS_FIRST_TRUCK_ARRIVAL                                    :{BLACK}{BIGFONT}Innbyggjarane jublar . . .{}Første lastebil kjem til {STATION}!
 STR_NEWS_FIRST_PASSENGER_TRAM_ARRIVAL                           :{BLACK}{BIGFONT}Innbygjarane feirer . . .{}Første passasjertrikk kjem til{STATION}!
 STR_NEWS_FIRST_CARGO_TRAM_ARRIVAL                               :{BLACK}{BIGFONT}Innbygjarane feirer . . .{}Første fraktetrikk kjem til {STATION}!
 STR_NEWS_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Kollisjon!{}Sjåfør døyr etter kollisjon med tog
 STR_NEWS_ROAD_VEHICLE_CRASH                                     :{BLACK}{BIGFONT}Kollisjon!{}{COMMA} døyr etter kollisjon med tog
-STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Kan ikkje snu køyretøy som er samansette av fleire delar
-STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Endre namn
-STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Endre namnet til køyretøytypen
-STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Endre namnet til køyretøytypen
-STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Kan ikkje endre namnet til køyretøytypen...
 
-STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Bygg om køyretøyet til å ta ein annan type last
-STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Bygg om bil
-STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Bygg om køyretøyet til å ta den valde lasta
-STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Kan ikkje byggje om bil...
-STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Vel ein type varer som køyretøyet skal lastast med
 
 ##id 0x9800
 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :Konstruksjon av kanalar
 STR_WATERWAYS_TOOLBAR_CAPTION                                   :{WHITE}Konstruksjon av kanalar
 STR_WATERWAYS_TOOLBAR_CAPTION_SE                                :{WHITE}Kanalar
 STR_ERROR_CAN_T_BUILD_DOCK_HERE                                 :{WHITE}Kan ikkje byggje hamn her...
-STR_DEPOT_SHIP_CAPTION                                          :{WHITE}{TOWN} skipsdepot
-STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON                              :{BLACK}Nye skip
-STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - {COMMA} skip
-STR_BUILD_VEHICLE_SHIP_CAPTION                                  :{WHITE}Nye skip
-STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON                     :{BLACK}Bygg skip
-STR_CLONE_SHIP                                                  :{BLACK}Klon skip
-STR_CLONE_SHIP_INFO                                             :{BLACK}Dette vil laga ein kopi av eit skip. CTRL-klikk deler ordrane
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Dette vil laga ein kopi av eit skip. Trykk på denne knappen og etter det på eit anna skip. CTRL-klikk deler ordrane
 STR_ERROR_SHIP_MUST_BE_STOPPED_IN_DEPOT                         :{WHITE}Må vere stoppa i depotet
-STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}Kan ikkje selje skip...
-STR_ERROR_CAN_T_BUILD_SHIP                                      :{WHITE}Kan ikkje byggje skip...
-STR_ERROR_SHIP_IN_THE_WAY                                       :{WHITE}Det er eit skip i vegen
-STR_ERROR_CAN_T_STOP_START_SHIP                                 :{WHITE}Kan ikkje starte/stoppe skip...
-STR_ERROR_CAN_T_SEND_SHIP_TO_DEPOT                              :{WHITE}Kan ikkje sende skip til depotet...
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Er på veg til {TOWN} skipsdepot
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Er på veg mot {TOWN} skipsdepot, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Vedlikehald ved {TOWN} skipsdepot
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Vedlikehald ved {TOWN} skipsdepot, {VELOCITY}
-STR_NEWS_SHIP_IS_WAITING                                        :{WHITE}{VEHICLE} ventar i depoet
 STR_WATERWAYS_TOOLBAR_BUILD_DOCK_TOOLTIP                        :{BLACK}Bygg hamn
 STR_WATERWAYS_TOOLBAR_BUILD_DEPOT_TOOLTIP                       :{BLACK}Bygg skipsdepot (trengst for bygging og vedlikehald av skip)
-STR_DEPOT_SHIP_LIST_TOOLTIP                                     :{BLACK}Skip - trykk på skip for meir informasjon
-STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}Bygg nytt skip
-STR_DEPOT_SHIP_SELL_TOOLTIP                                     :{BLACK}Dra skip her for å selje det
-STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}Vis kvar depotet ligg
-STR_VEHICLE_LIST_SHIP_TOOLTIP                                   :{BLACK}Skip - trykk på skip for meir informasjon
-STR_BUILD_VEHICLE_SHIP_LIST_TOOLTIP                             :{BLACK}Skipsliste - trykk på skip for meir informasjon
-STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP                    :{BLACK}Bygg det valde skipet
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP                  :{BLACK}Gjeldende skipsstatus - trykk her for å stoppe/starte skip
-STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Vis ordrane til skipet
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP                          :{BLACK}Vis skipet sin gjeldande posisjon
-STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}Send skipet til depotet. CTRL-klikk for å berre sende til vedlikehald
-STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Vis detaljar om skipet
-STR_VEHICLE_DETAILS_SHIP_RENAME                                 :{BLACK}Namngje skip
 
-STR_QUERY_RENAME_SHIP_CAPTION                                   :{WHITE}Namngje skip
-STR_ERROR_CAN_T_RENAME_SHIP                                     :{WHITE}Kan ikkje namngje skip...
 STR_NEWS_FIRST_SHIP_ARRIVAL                                     :{BLACK}{BIGFONT}Innbyggjarane jublar . . .{}Første skip kjem til {STATION}!
 STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}Plasser bøye, kan brukast til å lage kontrollpunkt
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}Kan ikkje plassere bøye her...
 STR_BUILD_AQUEDUCT                                              :{BLACK}Bygg kanal
 STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}Kan ikkje bygge kanal her...
-STR_BUILD_VEHICLE_SHIP_RENAME_BUTTON                            :{BLACK}Endre namn
-STR_BUILD_VEHICLE_SHIP_RENAME_TOOLTIP                           :{BLACK}Endre namnet til skipstypen
-STR_QUERY_RENAME_SHIP_TYPE_CAPTION                              :{WHITE}Endre namnet til skipstypen
-STR_ERROR_CAN_T_RENAME_SHIP_TYPE                                :{WHITE}Kan ikkje endre namnet til skipstypen...
-STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}Bygg om et konteinarskip til å ta ein annan type last
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (bygg om)
-STR_REFIT_SHIP_REFIT_BUTTON                                     :{BLACK}Bygg om skip
-STR_REFIT_SHIP_LIST_TOOLTIP                                     :{BLACK}Vel kva last skipet skal ta
-STR_REFIT_SHIP_REFIT_TOOLTIP                                    :{BLACK}Bygg om skip til å frakte den valde varetypen
 STR_REFIT_TITLE                                                 :{GOLD}Vel varetype:
 STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}Ny kapasitet: {GOLD}{CARGO}{}{BLACK}Ombyggingskostnader: {GOLD}{CURRENCY}
-STR_ERROR_CAN_T_REFIT_SHIP                                      :{WHITE}Kan ikkje bygge om skip...
 STR_REFITTABLE                                                  :(ombyggbart)
 
 ##id 0xA000
 STR_TOOLBAR_AIRCRAFT_CAPTION                                    :{WHITE}Flyplassar
 STR_ERROR_CAN_T_BUILD_AIRPORT_HERE                              :{WHITE}Kan ikkje bygge flyplass her...
-STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}{STATION} hangar
-STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON                          :{BLACK}Nytt fly
-STR_CLONE_AIRCRAFT                                              :{BLACK}Klon fly
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Dette vil lage ein kopi av eit fly. CTRL-klikk deler ordrane
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Dette vil lage ein kopi av eit fly. Trykk denne knappen og etter det på eit anna fly. CTRL-klikk deler ordrane
-STR_BUILD_VEHICLE_AIRCRAFT_CAPTION                              :{WHITE}Nytt fly
-STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON                 :{BLACK}Bygg fly
-STR_ERROR_CAN_T_BUILD_AIRCRAFT                                  :{WHITE}Kan ikkje byggje fly...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} fly
-STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR                         :{WHITE}Kan ikkje sende fly til hangar...
-STR_HEADING_FOR_HANGAR                                          :{ORANGE}Er på veg til {STATION} hangar
-STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Er på veg til {STATION} hangar, {VELOCITY}
-STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Vedlikehald ved {STATION} hangar
-STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Vedlikehald ved {STATION} hangar, {VELOCITY}
-STR_NEWS_AIRCRAFT_IS_WAITING                                    :{WHITE}{VEHICLE} ventar i flyhangaret
-STR_ERROR_AIRCRAFT_IN_THE_WAY                                   :{WHITE}Det er eit fly i vegen
-STR_ERROR_CAN_T_STOP_START_AIRCRAFT                             :{WHITE}Kan ikkje stoppe/starte flyet...
 STR_ERROR_AIRCRAFT_IS_IN_FLIGHT                                 :{WHITE}Flyet er i lufta
 STR_ERROR_AIRCRAFT_MUST_BE_STOPPED                              :{WHITE}Må stå i ein hangar
-STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}Kan ikkje selje fly...
 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION                          :Bygg flyplass
 STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Bygg flyplass
-STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP                               :{BLACK}Fly - trykk på fly for meir informasjon
-STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Fly - trykk på flyet for meir informasjon
-STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}Bygg nytt fly
-STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}Dra fly her for å selje
-STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Vis kvar hangaren ligg
-STR_BUILD_VEHICLE_AIRCRAFT_LIST_TOOLTIP                         :{BLACK}Flyliste - trykk på fly for meir informasjon
-STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_TOOLTIP                :{BLACK}Bygg det valde flyet
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP              :{BLACK}Gjeldande flystatus - trykk her for å stoppe/starte fly
-STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Vis ordrane til flyet
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP                      :{BLACK}Vis flyet sin gjeldande posisjon
-STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}Send fly til hangar. CTRL-klikk for å berre utføre vedlikehald
-STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Vis detaljar om flyet
 
-STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}Namngje fly
-STR_ERROR_CAN_T_RENAME_AIRCRAFT                                 :{WHITE}Kan ikkje namngje fly...
-STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}Namngje fly
 STR_NEWS_FIRST_AIRCRAFT_ARRIVAL                                 :{BLACK}{BIGFONT}Innbyggjarane jublar . . .{}Første fly kjem til {STATION}!
 STR_NEWS_AIRCRAFT_CRASH                                         :{BLACK}{BIGFONT}Flykrasj!{}{COMMA} døyr ved {STATION}
 STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Flystyrt!{}Fly gjekk tom for drivstoff, {COMMA} døydde i eksplosjon!
 STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
-STR_BUILD_VEHICLE_AIRCRAFT_RENAME_BUTTON                        :{BLACK}Endre namn
-STR_BUILD_VEHICLE_AIRCRAFT_RENAME_TOOLTIP                       :{BLACK}Endre namn til flytype
-STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION                          :{WHITE}Endre namn til flytype
-STR_ERROR_CAN_T_RENAME_AIRCRAFT_TYPE                            :{WHITE}Kan ikkje endre namn...
-STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Bygg om eit fly til å ta ein annan type last
-STR_REFIT_AIRCRAFT_REFIT_BUTTON                                 :{BLACK}Bygg om fly
-STR_REFIT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Vel kva last flyet skal ta
-STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}Bygg om flyet til å frakte den valde varetypen
-STR_ERROR_CAN_T_REFIT_AIRCRAFT                                  :{WHITE}Kan ikkje byggje om flyet...
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Rutetabell)
 
@@ -3137,15 +2937,225 @@ STR_LORRY                                                       :{BLACK}{LORRY}
 STR_PLANE                                                       :{BLACK}{PLANE}
 STR_SHIP                                                        :{BLACK}{SHIP}
 
+############ Vehicle lists
+STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP                             :{BLACK}Tog - trykk på tog for meir informasjon
+STR_VEHICLE_LIST_ROAD_VEHICLE_TOOLTIP                           :{BLACK}Køyretøy - trykk på køyretøy for informasjon
+STR_VEHICLE_LIST_SHIP_TOOLTIP                                   :{BLACK}Skip - trykk på skip for meir informasjon
+STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP                               :{BLACK}Fly - trykk på fly for meir informasjon
 
-STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Vis alle tog som har denne stasjonen på timeplanen sin
-STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Vis alle køyretøy som har denne stasjonen på timeplanen sin
-STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Vis alle fly som har denne stasjonen på timeplanen sin
-STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Vis alle skip som har denne stasjonen på timeplanen sin
+STR_VEHICLE_LIST_TRAIN_CAPTION                                  :{WHITE}{STRING} - {COMMA} tog
+STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING} - {COMMA} køyretøy
+STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - {COMMA} skip
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} fly
 
 STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}Delte ordre av {COMMA} køyretøy
 STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Vis alle køyretøy som har same ruteplan
 
+STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} ventar i depoet
+STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} ventar i depoet
+STR_NEWS_SHIP_IS_WAITING                                        :{WHITE}{VEHICLE} ventar i depoet
+STR_NEWS_AIRCRAFT_IS_WAITING                                    :{WHITE}{VEHICLE} ventar i flyhangaret
+
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Bygg om lokomotivet
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Bygg om bil
+STR_REFIT_SHIP_REFIT_BUTTON                                     :{BLACK}Bygg om skip
+STR_REFIT_AIRCRAFT_REFIT_BUTTON                                 :{BLACK}Bygg om fly
+
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Bygg om lokomotivet til å frakte den valde varetypen
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Bygg om køyretøyet til å ta den valde lasta
+STR_REFIT_SHIP_REFIT_TOOLTIP                                    :{BLACK}Bygg om skip til å frakte den valde varetypen
+STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}Bygg om flyet til å frakte den valde varetypen
+
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Vel kva type last lokomotivet skal ta
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Vel ein type varer som køyretøyet skal lastast med
+STR_REFIT_SHIP_LIST_TOOLTIP                                     :{BLACK}Vel kva last skipet skal ta
+STR_REFIT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Vel kva last flyet skal ta
+
+STR_DEPOT_TRAIN_CAPTION                                         :{WHITE}{TOWN} togstall
+STR_DEPOT_ROAD_VEHICLE_CAPTION                                  :{WHITE}{TOWN} Garasje
+STR_DEPOT_SHIP_CAPTION                                          :{WHITE}{TOWN} skipsdepot
+STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}{STATION} hangar
+
+STR_VEHICLE_DETAILS_TRAIN_RENAME                                :{BLACK}Namngje tog
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Namngje køyretøy
+STR_VEHICLE_DETAILS_SHIP_RENAME                                 :{BLACK}Namngje skip
+STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}Namngje fly
+
+STR_QUERY_RENAME_TRAIN_CAPTION                                  :{WHITE}Namngje tog
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Namngje køyretøy
+STR_QUERY_RENAME_SHIP_CAPTION                                   :{WHITE}Namngje skip
+STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}Namngje fly
+
+STR_ERROR_TRAIN_IN_THE_WAY                                      :{WHITE}Tog i vegen
+STR_ERROR_ROAD_VEHICLE_IN_THE_WAY                               :{WHITE}Køyretøy i vegen
+STR_ERROR_SHIP_IN_THE_WAY                                       :{WHITE}Det er eit skip i vegen
+STR_ERROR_AIRCRAFT_IN_THE_WAY                                   :{WHITE}Det er eit fly i vegen
+
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Kan ikkje byggje om lokomotiv...
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Kan ikkje byggje om bil...
+STR_ERROR_CAN_T_REFIT_SHIP                                      :{WHITE}Kan ikkje bygge om skip...
+STR_ERROR_CAN_T_REFIT_AIRCRAFT                                  :{WHITE}Kan ikkje byggje om flyet...
+
+STR_ERROR_CAN_T_RENAME_TRAIN                                    :{WHITE}Kan ikkje namngje tog...
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Kan ikkje namngje køyretøy...
+STR_ERROR_CAN_T_RENAME_SHIP                                     :{WHITE}Kan ikkje namngje skip...
+STR_ERROR_CAN_T_RENAME_AIRCRAFT                                 :{WHITE}Kan ikkje namngje fly...
+
+STR_ERROR_CAN_T_STOP_START_TRAIN                                :{WHITE}Kan ikkje stoppe/starte tog...
+STR_ERROR_CAN_T_STOP_START_ROAD_VEHICLE                         :{WHITE}Kan ikkje starte/stoppe køyretøy...
+STR_ERROR_CAN_T_STOP_START_SHIP                                 :{WHITE}Kan ikkje starte/stoppe skip...
+STR_ERROR_CAN_T_STOP_START_AIRCRAFT                             :{WHITE}Kan ikkje stoppe/starte flyet...
+
+STR_ERROR_CAN_T_SEND_TRAIN_TO_DEPOT                             :{WHITE}Kan ikkje sende tog til togstall...
+STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Kan ikkje sende køyretøy til garasje...
+STR_ERROR_CAN_T_SEND_SHIP_TO_DEPOT                              :{WHITE}Kan ikkje sende skip til depotet...
+STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR                         :{WHITE}Kan ikkje sende fly til hangar...
+
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Kan ikkje byggje jernbanekøyretøy...
+STR_ERROR_CAN_T_BUILD_ROAD_VEHICLE                              :{WHITE}Kan ikkje kjøpe køyretøy...
+STR_ERROR_CAN_T_BUILD_SHIP                                      :{WHITE}Kan ikkje byggje skip...
+STR_ERROR_CAN_T_BUILD_AIRCRAFT                                  :{WHITE}Kan ikkje byggje fly...
+
+STR_ERROR_CAN_T_RENAME_TRAIN_TYPE                               :{WHITE}Kan ikkje gje tog/vogn nytt namn...
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Kan ikkje endre namnet til køyretøytypen...
+STR_ERROR_CAN_T_RENAME_SHIP_TYPE                                :{WHITE}Kan ikkje endre namnet til skipstypen...
+STR_ERROR_CAN_T_RENAME_AIRCRAFT_TYPE                            :{WHITE}Kan ikkje endre namn...
+
+STR_ERROR_CAN_T_SELL_TRAIN                                      :{WHITE}Kan ikkje selje jernbanekøyretøy...
+STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}Kan ikkje selje køyretøy...
+STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}Kan ikkje selje skip...
+STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}Kan ikkje selje fly...
+
+STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP                 :{BLACK}Gjeldande togstatus - trykk her for å stoppe/starte tog
+STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP          :{BLACK}Gjeldande køyretøystatus - trykk her for å stoppa/starta køyretøy
+STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP                  :{BLACK}Gjeldende skipsstatus - trykk her for å stoppe/starte skip
+STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP              :{BLACK}Gjeldande flystatus - trykk her for å stoppe/starte fly
+
+STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP                           :{BLACK}Vis ordrane til toget
+STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP                    :{BLACK}Vis ordrelista til køyretøyet
+STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Vis ordrane til skipet
+STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Vis ordrane til flyet
+
+STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP                         :{BLACK}Vis toget sin gjeldande posisjon
+STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP                  :{BLACK}Vis køyretøyet sin gjeldande posisjon
+STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP                          :{BLACK}Vis skipet sin gjeldande posisjon
+STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP                      :{BLACK}Vis flyet sin gjeldande posisjon
+
+STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP                    :{BLACK}Send toget til ein togstall. CTRL-klikk for å berre utføre vedlikehald
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}Send køyretøyet til ein garasje
+STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}Send skipet til depotet. CTRL-klikk for å berre sende til vedlikehald
+STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}Send fly til hangar. CTRL-klikk for å berre utføre vedlikehald
+
+STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Vis detaljar om toget
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Vis detaljar om køyretøyet
+STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Vis detaljar om skipet
+STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Vis detaljar om flyet
+
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Bygg om eit lokomotiv til å ta ein annan type last
+STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Bygg om køyretøyet til å ta ein annan type last
+STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}Bygg om et konteinarskip til å ta ein annan type last
+STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Bygg om eit fly til å ta ein annan type last
+
+STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Er på veg til {TOWN} togstall
+STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Er på veg til {TOWN} togstall, {VELOCITY}
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Er på veg til {TOWN} garasje
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Er på veg til {TOWN} garasje, {VELOCITY}
+STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Er på veg til {TOWN} skipsdepot
+STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Er på veg mot {TOWN} skipsdepot, {VELOCITY}
+STR_HEADING_FOR_HANGAR                                          :{ORANGE}Er på veg til {STATION} hangar
+STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Er på veg til {STATION} hangar, {VELOCITY}
+
+STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Vedlikehald ved {TOWN} togstall
+STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Vedlikehald ved {TOWN} togstall, {VELOCITY}
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Vedlikehald ved {TOWN} garasje
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Vedlikehald ved {TOWN} garasje, {VELOCITY}
+STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Vedlikehald ved {TOWN} skipsdepot
+STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Vedlikehald ved {TOWN} skipsdepot, {VELOCITY}
+STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Vedlikehald ved {STATION} hangar
+STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Vedlikehald ved {STATION} hangar, {VELOCITY}
+
+
+STR_CLONE_TRAIN                                                 :{BLACK}Klon tog
+STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Klon eit køyretøy
+STR_CLONE_SHIP                                                  :{BLACK}Klon skip
+STR_CLONE_AIRCRAFT                                              :{BLACK}Klon fly
+
+STR_CLONE_TRAIN_INFO                                            :{BLACK}Dette vil lage ein kopi av eit lokomotiv inkludert alle vognene. CTRL-klikk deler ordrane
+STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Dette vil lage ein kopi av eit kjøretøy. CTRL-klikk deler ordrane
+STR_CLONE_SHIP_INFO                                             :{BLACK}Dette vil laga ein kopi av eit skip. CTRL-klikk deler ordrane
+STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Dette vil lage ein kopi av eit fly. CTRL-klikk deler ordrane
+
+STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Dette vil lage ein kopi av eit lokomotiv inkludert alle vognene. Trykk på denne knappen og etter det på eit anna tog. CTRL-klikk deler ordrane
+STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Dette vil lage ein kopi av eit køyretøy. Klikk denne knappen og etter det på eit anna køyretøy. CTRL-klikk deler ordrane
+STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Dette vil laga ein kopi av eit skip. Trykk på denne knappen og etter det på eit anna skip. CTRL-klikk deler ordrane
+STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Dette vil lage ein kopi av eit fly. Trykk denne knappen og etter det på eit anna fly. CTRL-klikk deler ordrane
+
+STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}Nye tog/vogner for jernbane
+STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}Nytt elektrisk tog
+STR_BUILD_VEHICLE_TRAIN_MONORAIL_CAPTION                        :{WHITE}Nye tog/vogner for monorail
+STR_BUILD_VEHICLE_TRAIN_MAGLEV_CAPTION                          :{WHITE}Nye tog/vogner for maglev
+
+STR_BUILD_VEHICLE_TRAIN_ALL_CAPTION                             :{WHITE}Skinnekjøretøy
+STR_BUILD_VEHICLE_ROAD_VEHICLE_CAPTION                          :{WHITE}Nye køyretøy
+STR_BUILD_VEHICLE_SHIP_CAPTION                                  :{WHITE}Nye skip
+STR_BUILD_VEHICLE_AIRCRAFT_CAPTION                              :{WHITE}Nytt fly
+
+STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_BUTTON                    :{BLACK}Kjøp tog/vogner
+STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_BUTTON             :{BLACK}Kjøp køyretøy
+STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON                     :{BLACK}Bygg skip
+STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON                 :{BLACK}Bygg fly
+
+STR_BUILD_VEHICLE_TRAIN_LIST_TOOLTIP                            :{BLACK}Liste over tog/vogner - trykk på tog/vogn for meir informasjon
+STR_BUILD_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP                     :{BLACK}Køyretøyliste - trykk på køyretøy for meir informasjon
+STR_BUILD_VEHICLE_SHIP_LIST_TOOLTIP                             :{BLACK}Skipsliste - trykk på skip for meir informasjon
+STR_BUILD_VEHICLE_AIRCRAFT_LIST_TOOLTIP                         :{BLACK}Flyliste - trykk på fly for meir informasjon
+
+STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_TOOLTIP                   :{BLACK}Bygg den valde farkosten
+STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_TOOLTIP            :{BLACK}Bygg det valde køyretøyet
+STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP                    :{BLACK}Bygg det valde skipet
+STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_TOOLTIP                :{BLACK}Bygg det valde flyet
+
+STR_BUILD_VEHICLE_TRAIN_RENAME_BUTTON                           :{BLACK}Gje nytt namn
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Endre namn
+STR_BUILD_VEHICLE_SHIP_RENAME_BUTTON                            :{BLACK}Endre namn
+STR_BUILD_VEHICLE_AIRCRAFT_RENAME_BUTTON                        :{BLACK}Endre namn
+
+STR_BUILD_VEHICLE_TRAIN_RENAME_TOOLTIP                          :{BLACK}Endre namnet til den valde farkosten
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Endre namnet til køyretøytypen
+STR_BUILD_VEHICLE_SHIP_RENAME_TOOLTIP                           :{BLACK}Endre namnet til skipstypen
+STR_BUILD_VEHICLE_AIRCRAFT_RENAME_TOOLTIP                       :{BLACK}Endre namn til flytype
+
+STR_QUERY_RENAME_TRAIN_TYPE_CAPTION                             :{WHITE}Gje tog/vogn nytt namn
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Endre namnet til køyretøytypen
+STR_QUERY_RENAME_SHIP_TYPE_CAPTION                              :{WHITE}Endre namnet til skipstypen
+STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION                          :{WHITE}Endre namn til flytype
+
+STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Nye tog/vogner
+STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_BUTTON                      :{BLACK}Nye køyretøy
+STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON                              :{BLACK}Nye skip
+STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON                          :{BLACK}Nytt fly
+
+STR_DEPOT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Tog - trykk på tog for meir info. Dra vogn for å leggje til/fjerne frå tog
+STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Køyretøyliste - trykk på køyretøy for meir informasjon
+STR_DEPOT_SHIP_LIST_TOOLTIP                                     :{BLACK}Skip - trykk på skip for meir informasjon
+STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Fly - trykk på flyet for meir informasjon
+
+STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP                            :{BLACK}Bygg nytt tog (vogn)
+STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}Bygg nytt køyretøy
+STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}Bygg nytt skip
+STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}Bygg nytt fly
+
+STR_DEPOT_TRAIN_SELL_TOOLTIP                                    :{BLACK}Dra tog (vogn) her for å selje
+STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}Dra køyretøy hit for å selje det
+STR_DEPOT_SHIP_SELL_TOOLTIP                                     :{BLACK}Dra skip her for å selje det
+STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}Dra fly her for å selje
+
+STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}Vis staden togstallen ligg på
+STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}Vis kvar garasjen ligg
+STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}Vis kvar depotet ligg
+STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Vis kvar hangaren ligg
+
+
 ### depot strings
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}Du er i ferd med å selje alle køyretøya i depotet. Er du sikker?
 STR_DEPOT_WRONG_DEPOT_TYPE                                      :Gal type depot
@@ -3165,7 +3175,6 @@ STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TIP                          :{BLACK}Autoerst
 STR_DEPOT_AUTOREPLACE_SHIP_TIP                                  :{BLACK}Autoerstatt alle skipa i depotet
 STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP                              :{BLACK}Autoerstatt alle flya i hangaren
 
-
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Erstatt {STRING}
 STR_REPLACE_VEHICLES_START                                      :{BLACK}Byrje utskiftinga av køyretøy
 STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Stopp utskiftinga av køyretøy
@@ -3181,6 +3190,7 @@ STR_REPLACE_REMOVE_WAGON                                        :{BLACK}Vognfjer
 STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Lat den automatiske utskiftinga behalde lengda på toget ved å fjerne vogner (frå første vogn), dersom utskiftinga gjer toget lenger.
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}Erstatter: {ORANGE}{SKIP}{SKIP}{STRING}
 STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}Skift mellom tog- og vognvindauget
+
 STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Køyretøyet er ikkje tilgjengeleg
 STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Køyretøyet er ikkje tilgjengeleg
 STR_SHIP_NOT_AVAILABLE                                          :{WHITE}Skipet er ikkje tilgjengeleg
@@ -3330,17 +3340,6 @@ STR_MEASURE_AREA                                                :{BLACK}Område:
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Lengd: {NUM}{}Høgdeskilnad: {NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Område: {NUM} x {NUM}{}Høgdeskilnad: {NUM} m
 
-############ Date formatting
-STR_FORMAT_DATE_TINY                                            :{STRING}-{STRING}-{NUM}
-STR_FORMAT_DATE_SHORT                                           :{STRING} {NUM}
-STR_FORMAT_DATE_LONG                                            :{STRING} {STRING} {NUM}
-STR_FORMAT_DATE_ISO                                             :{2:NUM}-{1:STRING}-{0:STRING}
-
-STR_JUST_DATE_TINY                                              :{DATE_TINY}
-STR_JUST_DATE_LONG                                              :{DATE_LONG}
-STR_JUST_DATE_ISO                                               :{DATE_ISO}
-########
-
 STR_FEEDER_CARGO_VALUE                                          :{BLACK}Overfør kreditt: {LTBLUE}{CURRENCY}
 STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD                            :{WHITE}...denne vegen eigast av ein by
 STR_DRIVE_THROUGH_ERROR_DIRECTION                               :{WHITE}...vegen peiker feil veg
@@ -3365,7 +3364,6 @@ STR_PERCENT_UP_DOWN_SMALL                                       :{TINYFONT}{WHIT
 STR_PERCENT_UP_DOWN                                             :{WHITE}{NUM}%{UPARROW}{DOWNARROW}
 
 ##### Mass Order
-STR_FORMAT_GROUP_NAME                                           :Gruppe {COMMA}
 STR_GROUP_TINY_NAME                                             :{TINYFONT}{GROUP}
 STR_GROUP_ALL_TRAINS                                            :Alle tog
 STR_GROUP_ALL_ROAD_VEHICLES                                     :Alle køyretøty
@@ -3394,12 +3392,62 @@ STR_GROUP_DELETE_TIP                                            :{BLACK}Slett de
 STR_GROUP_RENAME_TIP                                            :{BLACK}Gje den valde gruppa nytt namn
 STR_GROUP_REPLACE_PROTECTION_TIP                                :{BLACK}Klikk for å beskytte denne gruppa frå å global automatisk erstatning
 
+#### String control codes and their formatting
 STR_COMPANY_NAME                                                :{COMPANY}
 STR_ENGINE_NAME                                                 :{ENGINE}
 STR_GROUP_NAME                                                  :{GROUP}
+STR_INDUSTRY_NAME                                               :{INDUSTRY}
 STR_PRESIDENT_NAME                                              :{PRESIDENTNAME}
 STR_SIGN_NAME                                                   :{SIGN}
+STR_STATION_NAME                                                :{STATION}
+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_LONG                                              :{DATE_LONG}
+STR_JUST_DATE_ISO                                               :{DATE_ISO}
+STR_JUST_STRING                                                 :{STRING}
+STR_JUST_RAW_STRING                                             :{STRING}
+
+STR_FORMAT_DATE_TINY                                            :{STRING}-{STRING}-{NUM}
+STR_FORMAT_DATE_SHORT                                           :{STRING} {NUM}
+STR_FORMAT_DATE_LONG                                            :{STRING} {STRING} {NUM}
+STR_FORMAT_DATE_ISO                                             :{2:NUM}-{1:STRING}-{0:STRING}
+
+STR_FORMAT_COMPANY_NUM                                          :(Firma {COMMA})
+STR_FORMAT_GROUP_NAME                                           :Gruppe {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}Namnet må vera unikt
 
diff --git a/src/lang/polish.txt b/src/lang/polish.txt
index 59b2e4c27..d9cf800a6 100644
--- a/src/lang/polish.txt
+++ b/src/lang/polish.txt
@@ -527,8 +527,6 @@ STR_ABBREV_PLASTIC                                              :{TINYFONT}PL
 STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}FZ
 STR_ABBREV_NONE                                                 :{TINYFONT}0
 STR_ABBREV_ALL                                                  :{TINYFONT}+
-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ść
@@ -540,17 +538,11 @@ STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Prawa Au
 STR_ABOUT_VERSION                                               :{BLACK}OpenTTD wersja {REV}
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 Zespół OpenTTD
 
-STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
-STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_QUIT_CAPTION                                                :{WHITE}Wyjście
 STR_YES                                                         :{BLACK}Tak
 STR_NO                                                          :{BLACK}Nie
 STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Jesteś pewien, że chcesz zakończyć tę grę i wrócić do {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                                                :Nic
 STR_COLOUR_DARK_BLUE                                            :Ciemnoniebieski
 STR_COLOUR_PALE_GREEN                                           :Bladozielony
@@ -569,8 +561,6 @@ STR_COLOUR_BROWN                                                :Brązowy
 STR_COLOUR_GREY                                                 :Szary
 STR_COLOUR_WHITE                                                :Biały
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}Za dużo pojazdów w grze
-STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
-STR_RED_COMMA                                                   :{RED}{COMMA}
 STR_BUTTON_LOCATION                                             :{BLACK}Położenie
 STR_SMALLMAP_TYPE_CONTOURS                                      :Ukształtowanie
 STR_SMALLMAP_TYPE_VEHICLES                                      :Pojazdy
@@ -697,12 +687,13 @@ STR_SORT_CRITERIA_TIP                                           :{BLACK}Wybierz
 STR_FILTER_CRITERIA_TIP                                         :{BLACK}Wybierz kryteria filtrowania
 STR_SORT_BY                                                     :{BLACK}Sortuj wg
 
+### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}Populacja
+STR_SORT_BY_NAME                                                :{BLACK}Nazwa
+STR_SORT_BY_DATE                                                :{BLACK}Data
 STR_SORT_BY_PRODUCTION                                          :Produkcja
 STR_SORT_BY_TYPE                                                :Typ
 STR_SORT_BY_TRANSPORTED                                         :Przetransportowano
-STR_SORT_BY_NAME                                                :{BLACK}Nazwa
-STR_SORT_BY_DATE                                                :{BLACK}Data
 STR_SORT_BY_NUMBER                                              :Numer
 STR_SORT_BY_PROFIT_LAST_YEAR                                    :Zysk w ostatnim roku
 STR_SORT_BY_PROFIT_THIS_YEAR                                    :Zysk w tym roku
@@ -723,37 +714,25 @@ STR_SORT_BY_INTRO_DATE                                          :Data wprowadzen
 STR_SORT_BY_RUNNING_COST                                        :Koszty użytkowania
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :Moc/Koszty użytkowania
 STR_SORT_BY_CARGO_CAPACITY                                      :Pojemność
+
 STR_NO_WAITING_CARGO                                            :{BLACK}Nie ma żadnego czekającego ładunku
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}Zaznacz wszystkie typy stacji
 STR_SELECT_ALL_TYPES                                            :{BLACK}Zaznacz wszystkie typy ładunku (oraz brak czekającego ładunku)
-STR_AVAILABLE_TRAINS                                            :{BLACK}Dostępne lokomotywy
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Dostępne pojazdy
-STR_AVAILABLE_SHIPS                                             :{BLACK}Dostępne statki
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Dostępny samolot
 STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Zobacz listę dostępnych projektów silników dla tego typu pojazdów.
 STR_MANAGE_LIST                                                 :{BLACK}Zarządzaj listą
 STR_MANAGE_LIST_TIP                                             :{BLACK}Wyślij instrukcje wszystkim pojazdom na tej liĹ›cie
 STR_REPLACE_VEHICLES                                            :Zastąp pojazdy
+STR_SEND_FOR_SERVICING                                          :Wyślij do Serwisu
+
+STR_AVAILABLE_TRAINS                                            :{BLACK}Dostępne lokomotywy
+STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Dostępne pojazdy
+STR_AVAILABLE_SHIPS                                             :{BLACK}Dostępne statki
+STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Dostępny samolot
+
 STR_SEND_TRAIN_TO_DEPOT                                         :Wyślij do Zajezdni
 STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Wyślij do Zajezdni
 STR_SEND_SHIP_TO_DEPOT                                          :Wyślij do Stoczni
 STR_SEND_AIRCRAFT_TO_HANGAR                                     :Wyślij do Hangaru
-STR_SEND_FOR_SERVICING                                          :Wyślij do Serwisu
-
-############ range for months starts
-STR_MONTH_ABBREV_JAN                                            :Sty
-STR_MONTH_ABBREV_FEB                                            :Lut
-STR_MONTH_ABBREV_MAR                                            :Mar
-STR_MONTH_ABBREV_APR                                            :Kwi
-STR_MONTH_ABBREV_MAY                                            :Maj
-STR_MONTH_ABBREV_JUN                                            :Cze
-STR_MONTH_ABBREV_JUL                                            :Lip
-STR_MONTH_ABBREV_AUG                                            :Sie
-STR_MONTH_ABBREV_SEP                                            :Wrz
-STR_MONTH_ABBREV_OCT                                            :Paź
-STR_MONTH_ABBREV_NOV                                            :Lis
-STR_MONTH_ABBREV_DEC                                            :Gru
-############ range for months ends
 
 STR_GRAPH_X_LABEL_MONTH                                         :{TINYFONT}{STRING}{} {STRING}
 STR_GRAPH_X_LABEL_MONTH_YEAR                                    :{TINYFONT}{STRING}{} {STRING}{}{NUM}
@@ -781,8 +760,6 @@ 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_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
@@ -829,7 +806,7 @@ STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Brak
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Nazwa
 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                                          :1szy
 STR_ORDINAL_NUMBER_2ND                                          :2gi
 STR_ORDINAL_NUMBER_3RD                                          :3ci
@@ -863,6 +840,34 @@ STR_ORDINAL_NUMBER_30TH                                         :30ty
 STR_ORDINAL_NUMBER_31ST                                         :31szy
 ############ range for days ends
 
+############ range for months starts
+STR_MONTH_ABBREV_JAN                                            :Sty
+STR_MONTH_ABBREV_FEB                                            :Lut
+STR_MONTH_ABBREV_MAR                                            :Mar
+STR_MONTH_ABBREV_APR                                            :Kwi
+STR_MONTH_ABBREV_MAY                                            :Maj
+STR_MONTH_ABBREV_JUN                                            :Cze
+STR_MONTH_ABBREV_JUL                                            :Lip
+STR_MONTH_ABBREV_AUG                                            :Sie
+STR_MONTH_ABBREV_SEP                                            :Wrz
+STR_MONTH_ABBREV_OCT                                            :Paź
+STR_MONTH_ABBREV_NOV                                            :Lis
+STR_MONTH_ABBREV_DEC                                            :Gru
+
+STR_MONTH_JAN                                                   :Styczeń
+STR_MONTH_FEB                                                   :Luty
+STR_MONTH_MAR                                                   :Marzec
+STR_MONTH_APR                                                   :Kwiecień
+STR_MONTH_MAY                                                   :Maj
+STR_MONTH_JUN                                                   :Czerwiec
+STR_MONTH_JUL                                                   :Lipiec
+STR_MONTH_AUG                                                   :Sierpień
+STR_MONTH_SEP                                                   :Wrzesień
+STR_MONTH_OCT                                                   :Październik
+STR_MONTH_NOV                                                   :Listopad
+STR_MONTH_DEC                                                   :Grudzień
+############ range for months ends
+
 STR_GRAPH_Y_LABEL_NUMBER                                        :{TINYFONT}{COMMA}
 
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}Akceptowany ładunek: {LTBLUE}
@@ -952,12 +957,9 @@ 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_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_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
@@ -1039,9 +1041,7 @@ STR_OFF                                                         :Wyłączone
 STR_SUMMARY                                                     :Sumaryczne
 STR_FULL                                                        :Pełne
 STR_STATUSBAR_COMPANY_NAME                                      :{SILVER}- -  {COMPANY}  - -
-STR_BLACK_STRING                                                :{BLACK}{STRING}
 
-STR_JUST_CHECKMARK                                              :{CHECKMARK}
 ############ range for menu starts
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Opcje gry
 STR_SETTINGS_MENU_DIFFICULTY_SETTINGS                           :Ustawienia trudności
@@ -1133,9 +1133,6 @@ STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY                             :Ufunduj nowe pr
 ############ range ends here
 
 STR_FUND_INDUSTRY_CAPTION                                       :{WHITE}Ufunduj nowe przedsięb.
-STR_JUST_STRING                                                 :{STRING}
-STR_JUST_RAW_STRING                                             :{STRING}
-STR_JUST_INT                                                    :{NUM}
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_RAINFOREST                       :{WHITE}...może być wybudowane tylko w lasach deszczowych
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT                           :{WHITE}...może być wybudowane tylko na pustyni
 STR_STATUSBAR_PAUSED                                            :{YELLOW}* *  PAUZA  *  *
@@ -1149,9 +1146,6 @@ 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_BLACK_6                                                     :{BLACK}6
-STR_BLACK_7                                                     :{BLACK}7
-
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Angielskie (Oryginalne)
 STR_TOWNNAME_FRENCH                                             :Francuskie
@@ -1229,19 +1223,6 @@ STR_OPTIONS_BASE_GRF_TIP                                        :{BLACK}Wybierz
 
 STR_AUTOSAVE_FAILED                                             :{WHITE}Błąd autozapisu
 
-STR_MONTH_JAN                                                   :Styczeń
-STR_MONTH_FEB                                                   :Luty
-STR_MONTH_MAR                                                   :Marzec
-STR_MONTH_APR                                                   :Kwiecień
-STR_MONTH_MAY                                                   :Maj
-STR_MONTH_JUN                                                   :Czerwiec
-STR_MONTH_JUL                                                   :Lipiec
-STR_MONTH_AUG                                                   :Sierpień
-STR_MONTH_SEP                                                   :Wrzesień
-STR_MONTH_OCT                                                   :Październik
-STR_MONTH_NOV                                                   :Listopad
-STR_MONTH_DEC                                                   :Grudzień
-
 STR_HEADING_FOR_STATION                                         :{LTBLUE}Zmierza do {STATION}
 STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}Zmierza do {STATION}, {VELOCITY}
 STR_NO_ORDERS                                                   :{LTBLUE}Bez poleceń
@@ -1262,8 +1243,6 @@ STR_CRATES                                                      :skrzyń
 STR_RES_OTHER                                                   :inna
 STR_NOTHING                                                     :
 
-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ń...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Koniec współdzielonych poleceń - -
@@ -1532,7 +1511,6 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Rozmiar
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :niedostępne
-STR_JUST_CURRENCY                                               :{CURRENCY}
 STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Zmiana wartości
 
 STR_TEMPERATE_LANDSCAPE                                         :Krajobraz umiarkowany
@@ -1568,7 +1546,6 @@ STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}Wybierz
 
 STR_WAYPOINT_VIEWPORT                                           :{WHITE}{WAYPOINT}
 STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WHITE}{WAYPOINT}
-STR_WAYPOINT_NAME                                               :{WAYPOINT}
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Edytuj nazwę pkt. kontrolnego
 
 STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}Nie można zmienić nazwy punktu orientacyjnego...
@@ -1635,11 +1612,6 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Nazwy za
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...zbyt blisko innego przedsiębiorstwa
 
-STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Przebudowa pociągu do przewozu innego typu ładunku
-STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Przebudowa pociągu
-STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Wybierz jaki ładunek ma przewozić pociąg
-STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Przebuduj pociąg do przewozu zaznaczonego typu ładunku
-STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Nie można przebudować pociągu...
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Zmiana produkcji
 
 ############ network gui strings
@@ -2149,11 +2121,6 @@ STR_TOWN_BUILDING_NAME_TEPEES_1                                 :Tipi
 STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1                           :Dom-Czajniczek
 STR_TOWN_BUILDING_NAME_PIGGY_BANK_1                             :Świnka-skarbonka
 
-STR_INDUSTRY_NAME                                               :{INDUSTRY}
-STR_TOWN_NAME                                                   :{TOWN}
-STR_FORMAT_INDUSTRY_NAME                                        :{TOWN} {STRING}
-STR_STATION_NAME                                                :{STATION}
-
 ##id 0x2800
 STR_LANDSCAPING_MENU_LANDSCAPING                                :Krajobraz
 STR_LANDSCAPING_MENU_PLANT_TREES                                :Posadź drzewa
@@ -2208,6 +2175,12 @@ STR_CARGO_RATING_EXCELLENT                                      :Wyśmienite
 STR_CARGO_RATING_OUTSTANDING                                    :Niezrównane
 ############ range for rating ends
 
+### station view strings
+STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Pokazuje wszystkie pociągi, które mają tę stację w swoim rozkładzie
+STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Pokazuje wszystkie samochody, ktore mają tę stację w swoim rozkladzie
+STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Pokazuje wszystkie samoloty, ktore mają tę stację w swoim rozkladzie
+STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Pokazuje wszystkie statki, ktore mają tę stację w swoim rozkladzie
+
 STR_STATION_VIEW_CARGO_RATING                                   :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO                        :{WHITE}{STATION} już nie akceptuje {STRING.d}
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO               :{WHITE}{STATION} już nie akceptuje {STRING.d} ani {STRING.d}
@@ -2487,6 +2460,7 @@ STR_SV_STNAME_AIRPORT                                           :Lotnisko {STRIN
 STR_SV_STNAME_OILFIELD                                          :{STRING} Platforma Wiertnicza
 STR_SV_STNAME_MINES                                             :{STRING} Kopalnia
 STR_SV_STNAME_DOCKS                                             :{STRING} Port
+##id 0x6020
 STR_SV_STNAME_ANNEXE                                            :{STRING} Pawilon
 STR_SV_STNAME_SIDINGS                                           :{STRING} Bocznica
 STR_SV_STNAME_BRANCH                                            :{STRING} Rozjazd
@@ -2534,8 +2508,6 @@ STR_NUM_LOW                                                     :Mało
 STR_NUM_NORMAL                                                  :Średnio
 STR_NUM_HIGH                                                    :Dużo
 STR_NUM_CUSTOM                                                  :Własne
-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
@@ -2569,7 +2541,6 @@ STR_CITY_APPROVAL_HOSTILE                                       :Wrogie
 
 ##id 0x7000
 STR_COMPANY_VIEW_CAPTION                                        :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
-STR_FORMAT_COMPANY_NUM                                          :(Firma {COMMA})
 STR_COMPANY_VIEW_NEW_FACE_BUTTON                                :{BLACK}Nowa Twarz
 STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON                           :{BLACK}Schemat kolorów
 STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}Schemat kolorów:
@@ -2602,7 +2573,6 @@ STR_FINANCES_TOTAL_CAPTION                                      :{WHITE}Łączni
 STR_COMPANY_NAME_COMPANY_NUM                                    :{COMPANY} {COMPANYNUM}
 STR_GRAPH_INCOME_CAPTION                                        :{WHITE}Wykres przychodów
 STR_CURRCOMPACT                                                 :{CURRCOMPACT}
-STR_JUST_COMMA                                                  :{COMMA}
 STR_GRAPH_OPERATING_PROFIT_CAPTION                              :{WHITE}Wykres obrotów
 STR_FINANCES_BANK_BALANCE_TITLE                                 :{WHITE}Bilans bankowy
 STR_FINANCES_LOAN_TITLE                                         :{WHITE}Pożyczka
@@ -3010,10 +2980,8 @@ STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE                            :{G=f}lokomotywa
 STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE.b                          :{G=f}lokomotywę MagLev
 
 ##id 0x8800
-STR_DEPOT_TRAIN_CAPTION                                         :{WHITE}Zajezdnia w {TOWN}
 STR_NEWS_FIRST_TRAIN_ARRIVAL                                    :{BLACK}{BIGFONT}Mieszkańcy świętują . . .{}Pierwszy pociąg przybył do {STATION}!
 STR_VEHICLE_DETAILS_CAPTION                                     :{WHITE}{VEHICLE} (Szczegóły)
-STR_ERROR_TRAIN_IN_THE_WAY                                      :{WHITE}Pociąg na drodze
 STR_ORDER                                                       :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 STR_ORDER_SELECTED                                              :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 STR_ORDER_NON_STOP                                              :{BLACK}Non-stop
@@ -3103,38 +3071,16 @@ STR_TIMETABLE_AND_TRAVEL_FOR                                    :i podróżuje d
 STR_TIMETABLE_DAYS                                              :{COMMA} d{P zień ni ni}
 STR_TIMETABLE_TICKS                                             :{COMMA} tick{P "" i ów}
 
-STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Zmierza do zajezdni w {TOWN}
-STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Zmierza do zajezdni w {TOWN}, {VELOCITY}
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Serwisuj w Zajezdni w {TOWN}
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Serwisuj w Zajezdni w {TOWN}, {VELOCITY}
-
 STR_INVALID_ORDER                                               :{RED} (Błędne polecenie)
 
 STR_UNKNOWN_STATION                                             :Nieznana stacja
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}Pusty
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} z {STATION}
 STR_VEHICLE_DETAILS_CARGO_FROM_MULT                             :{LTBLUE}{CARGO} z {STATION} (x{NUM})
-STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} czeka w zajezdni
-STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Nowe pojazdy
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}Pociąg jest zbyt długi
 STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}Pociąg może być modyfikowany tylko gdy jest zatrzymany w zajezdni
-STR_VEHICLE_LIST_TRAIN_CAPTION                                  :{WHITE}{STRING} - {COMMA} Pociąg{P "" i ów}
 
-STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}Nowe pociągi
-STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}Nowe elektryczne pojazdy szynowe
-STR_BUILD_VEHICLE_TRAIN_MONORAIL_CAPTION                        :{WHITE}Nowe pociągi jednoszynowe
-STR_BUILD_VEHICLE_TRAIN_MAGLEV_CAPTION                          :{WHITE}Nowe pociągi MagLev
-STR_BUILD_VEHICLE_TRAIN_ALL_CAPTION                             :{WHITE}Pojazdy szynowe
-
-STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_BUTTON                    :{BLACK}Zbuduj pojazd
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Klonuj pojazd
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Spowoduje zbudowanie kopii pojazdu. CTRL+klik spowoduje współdzielenie poleceń
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Spowoduje zbudowanie kopii pojazdu. Kliknij na przycisk a następnie na pojazd wewnątrz lub na zewnątrz zajezdni. CTRL+klik spowoduje współdzielenie poleceń
-STR_CLONE_TRAIN                                                 :{BLACK}Klonuj pociąg
-STR_CLONE_TRAIN_INFO                                            :{BLACK}Spowoduje wybudowanie kopii pociągu wraz ze wszystkimi wagonami. CTRL+klik spowoduje współdzielenie poleceń
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Spowoduje wybudowanie kopii pociągu wraz z wszystkimi wagonami. Kliknij na przycisk a następnie na pociąg wewnątrz lub na zewnątrz zajezdni. CTRL+klik spowoduje współdzielenie poleceń
-STR_BUILD_VEHICLE_TRAIN_RENAME_BUTTON                           :{BLACK}Zmień nazwę
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Pomiń
 STR_ORDERS_DELETE_BUTTON                                        :{BLACK}Usuń
 STR_ORDERS_GO_TO_BUTTON                                         :{BLACK}Idź do
@@ -3150,14 +3096,12 @@ STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Przełą
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Polecenia)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Koniec poleceń - -
 STR_SERVICE                                                     :{BLACK}Serwis
-STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Nie można wybudować lokomotywy...
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Budowa: {LTBLUE}{NUM}{BLACK} Wartość: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Wartość: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
 STR_VEHICLE_STATUS_LOADING_UNLOADING                            :{LTBLUE}Załadunek / Wyładunek
 STR_VEHICLE_STATUS_LEAVING                                      :{LTBLUE}Opuszcza
 STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}Pociąg musi być zatrzymany w zajezdni
-STR_ERROR_CAN_T_SEND_TRAIN_TO_DEPOT                             :{WHITE}Nie można wysłać pociągu do zajezdni...
 STR_ERROR_NO_MORE_SPACE_FOR_ORDERS                              :{WHITE}Brak miejsca na polecenia
 STR_ERROR_TOO_MANY_ORDERS                                       :{WHITE}Zbyt wiele poleceń
 STR_ERROR_CAN_T_INSERT_NEW_ORDER                                :{WHITE}Nie można wstawić polecenia...
@@ -3172,26 +3116,11 @@ STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE}pojazd d
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}Nie można ruszyć pojazdem...
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}Tylna lokomotywa zawsze porusza się razem z przednią
 STR_CARGO_N_A                                                   :N/D{SKIP}
-STR_ERROR_CAN_T_SELL_TRAIN                                      :{WHITE}Nie można sprzedać lokomotywy...
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}Nie można znaleźć drogi do zajezdni.
-STR_ERROR_CAN_T_STOP_START_TRAIN                                :{WHITE}Nie można zatrzymać/ruszyć pociagu...
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}Okres między serwisowaniem: {LTBLUE}{COMMA}dni{BLACK}   Ostatni serwis: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}Okres między serwisowaniem: {LTBLUE}{COMMA}%{BLACK}   Ostatni serwis: {LTBLUE}{DATE_LONG}
-STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP                             :{BLACK}Pociągi - klik na pojeździe aby uzyskać informacje
-STR_DEPOT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Pociągi - klik na pociągu po info, przeciągnij pojazd/wagon aby dodać
-STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP                            :{BLACK}Buduj nowy pociąg
-STR_DEPOT_TRAIN_SELL_TOOLTIP                                    :{BLACK}Przeciągnij tutaj pociąg aby go sprzedać
-STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}Centrowanie głównego okna na pozycji zajezdni
-STR_BUILD_VEHICLE_TRAIN_LIST_TOOLTIP                            :{BLACK}Lista wyboru pociągów - kliknij na pojeździe, aby uzyskać informacje
-STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_TOOLTIP                   :{BLACK}Zbuduj podświetlony pociąg
-STR_BUILD_VEHICLE_TRAIN_RENAME_TOOLTIP                          :{BLACK}Zmiana nazwy typu pociągu
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP                 :{BLACK}Obecny stan pociągu - klik tutaj aby zatrzymać/ruszyć pociąg
-STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP                           :{BLACK}Pokaż polecenia dla pociągu
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP                         :{BLACK}Centrowanie głównego okna na pozycji pociągu
-STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP                    :{BLACK}Wyślij pociąg do zajezdni
 STR_VEHICLE_VIEW_TRAIN_IGNORE_SIGNAL_TOOLTIP                    :{BLACK}Wymuszony start pociągu bez czekania na sygnał
 STR_VEHICLE_VIEW_TRAIN_REVERSE_TOOLTIP                          :{BLACK}Odwróć kierunek jazdy pociągu
-STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Pokaż szczegóły pociągu
 STR_VEHICLE_DETAILS_INCREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Zwiększ okres między serwisowaniem
 STR_VEHICLE_DETAILS_DECREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Zmniejsz okres między serwisowaniem
 STR_VEHICLE_DETAILS_TRAIN_CARGO_TOOLTIP                         :{BLACK}Pokaż szczegóły przewożonych ładunków
@@ -3225,15 +3154,10 @@ STR_VEHICLE_STATUS_STOPPED                                      :{RED}Zatrzymany
 STR_ERROR_CAN_T_MAKE_TRAIN_PASS_SIGNAL                          :{WHITE}Nie można przepościć pociągu za sygnał, niebezpieczeństwo...
 STR_VEHICLE_STATUS_CRASHED                                      :{RED}Wypadek!
 
-STR_QUERY_RENAME_TRAIN_CAPTION                                  :{WHITE}Nazwa pociągu
-STR_ERROR_CAN_T_RENAME_TRAIN                                    :{WHITE}Nie można zmienić nazwy pociągu...
-STR_VEHICLE_DETAILS_TRAIN_RENAME                                :{BLACK}Nazwa pociągu
 STR_NEWS_TRAIN_CRASH                                            :{BLACK}{BIGFONT}Wypadek kolejowy!{}{COMMA} ofiar{P a y ""} w kolizji
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Nie można odwrócić kierunku jazdy pociągu...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE                  :{WHITE}Nie można zawrócić pociągu...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Nie można obracać pociągów z podwójnymi lokomotywami
-STR_QUERY_RENAME_TRAIN_TYPE_CAPTION                             :{WHITE}Zmiana nazwy typu pociągu
-STR_ERROR_CAN_T_RENAME_TRAIN_TYPE                               :{WHITE}Nie można zmienić nazwy typu pojazdu...
 STR_CLEAR_TIME                                                  :{BLACK}Usuń czas
 STR_RESET_LATENESS                                              :{BLACK}Wyzeruj spóźnienia
 STR_CHANGE_WAYPOINT_NAME                                        :{BLACK}Zmień nazwę punktu orientacyjnego
@@ -3265,45 +3189,14 @@ STR_TIMETABLE_AUTOFILL                                          :{BLACK}Autofill
 STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Wypełnij rozkład jazdy automatycznie wartościami z następnego wyjazdu (CTRL-klik by spróbować utrzymać czasy oczekiwania))
 
 ##id 0x9000
-STR_ERROR_ROAD_VEHICLE_IN_THE_WAY                               :{WHITE}Samochód na drodze
-STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING} - {COMMA} Samoch{P ód ody odów}
-STR_DEPOT_ROAD_VEHICLE_CAPTION                                  :{WHITE} Zajezdnia samochodowa w {TOWN}
-STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_BUTTON                      :{BLACK}Nowe pojazdy
-STR_BUILD_VEHICLE_ROAD_VEHICLE_CAPTION                          :{WHITE}Nowy pojazd drogowy
-STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_BUTTON             :{BLACK}Zbuduj pojazd
-STR_ERROR_CAN_T_BUILD_ROAD_VEHICLE                              :{WHITE}Nie można zbudować samochodu...
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}...musi być zatrzymany w zajezdni samochodowej
-STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}Nie można sprzedać samochodu...
-STR_ERROR_CAN_T_STOP_START_ROAD_VEHICLE                         :{WHITE}Nie można zatrzymać/ruszyć samochodu...
-STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} czeka w zajezdni
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Zmierza do zajezdni sam. w {TOWN}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Zmierza do zajezdni sam. w {TOWN}, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Serwisuj w Zajezdni w {TOWN}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Serwisuj w Zajezdni w {TOWN}, {VELOCITY}
-STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Nie można wysłać samochodu do zajezdni...
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Nie można znaleźć zajezdni
-STR_VEHICLE_LIST_ROAD_VEHICLE_TOOLTIP                           :{BLACK}Samochody - klik na pojeździe po więcej informacji
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP          :{BLACK}Obecny stan pojazdu - klik tutaj aby zatrzymać/ruszyć pojazd
-STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP                    :{BLACK}Pokaż polecenia pojazdu
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP                  :{BLACK}Centruj główne okno na pozycji pojazdu
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}Wyślij pojazd do zajezdni
 STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP                   :{BLACK}Zmuś pojazd do zawrócenia
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Pokaż detale samochodu
-STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Pojazdy - klik na pojeździe po więcej informacji
-STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}Zbuduj nowy samochód
-STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}Przeciągnij tutaj samochód aby go sprzedać
-STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}Centruj główne okno na pozycji zajezdni samochodowej
-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_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})
 
-STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Nazwij samochód
-STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Nie można nazwać samochodu...
-STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Nazwij samochód
 STR_NEWS_FIRST_BUS_ARRIVAL                                      :{BLACK}{BIGFONT}Mieszkańcy świętują . . .{}Pierwszy autobus przybył do {STATION}!
 STR_NEWS_FIRST_TRUCK_ARRIVAL                                    :{BLACK}{BIGFONT}Mieszkańcy świętują . . .{}Pierwsza ciężarówka przybyła do {STATION}!
 STR_NEWS_FIRST_PASSENGER_TRAM_ARRIVAL                           :{BLACK}{BIGFONT}Mieszkańcy świętują . . .{}Pierwszy tramwaj pasażerski przybył do {STATION}!
@@ -3311,132 +3204,39 @@ STR_NEWS_FIRST_CARGO_TRAM_ARRIVAL                               :{BLACK}{BIGFONT
 STR_NEWS_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Wypadek samochodowy!{}Kierowca zginął w zderzeniu z pociągiem
 STR_NEWS_ROAD_VEHICLE_CRASH                                     :{BLACK}{BIGFONT}Wypadek samochodowy!{}{COMMA} ofiar{P a y ""} zderzenia z pociągiem
 STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}Nie można zawrócić pojazdu...
-STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Zmień nazwę
-STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Zmień nazwę typu samochodu
-STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Zmień nazwę typu samochodu
-STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Nie można zmienić nazwy typu samochodu...
 
-STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Przebudowa samochodu do przewozu innego typu ładunku
-STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Przebudowa samochodu
-STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Przebuduj samochód do przewozu zaznaczonego typu ładunku
-STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Nie można przebudować samochodu...
-STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Wybierz ładunek jaki ma przewozić ten samochód
 
 ##id 0x9800
 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :Konstrukcja kanału wodnego
 STR_WATERWAYS_TOOLBAR_CAPTION                                   :{WHITE}Konstrukcja kanału wodnego
 STR_WATERWAYS_TOOLBAR_CAPTION_SE                                :{WHITE}Kanał wodny
 STR_ERROR_CAN_T_BUILD_DOCK_HERE                                 :{WHITE}Nie można tutaj wybudować portu...
-STR_DEPOT_SHIP_CAPTION                                          :{WHITE}Stocznia w {TOWN}
-STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON                              :{BLACK}Nowe statki
-STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - {COMMA} Stat{P ek ki ów}
-STR_BUILD_VEHICLE_SHIP_CAPTION                                  :{WHITE}Nowe statki
-STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON                     :{BLACK}Budowa statku
-STR_CLONE_SHIP                                                  :{BLACK}Klonuj statek
-STR_CLONE_SHIP_INFO                                             :{BLACK}Spowoduje wybudowanie kopii statku. Control+klik spowoduje współdzielenie poleceń
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Spowoduje wybudowanie kopii statku. Kliknij na przycisk a następnie na statek wewnątrz lub na zewnątrz stoczni. Control+klik spowoduje współdzielenie poleceń
 STR_ERROR_SHIP_MUST_BE_STOPPED_IN_DEPOT                         :{WHITE}Statek musi być zatrzymany w stoczni
-STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}Nie można sprzedać statku...
-STR_ERROR_CAN_T_BUILD_SHIP                                      :{WHITE}Nie można wybudować statku...
-STR_ERROR_SHIP_IN_THE_WAY                                       :{WHITE}Statek na drodze
-STR_ERROR_CAN_T_STOP_START_SHIP                                 :{WHITE}Nie można zatrzymać/ruszyć statku...
-STR_ERROR_CAN_T_SEND_SHIP_TO_DEPOT                              :{WHITE}Nie można wysłać statku do stoczni...
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Zmierza do stoczni w {TOWN}
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Zmierza do stoczni w {TOWN}, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Serwisuj w Stoczni w {TOWN}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Serwisuj w Stoczni w {TOWN}, {VELOCITY}
-STR_NEWS_SHIP_IS_WAITING                                        :{WHITE}{VEHICLE} czeka w zajezdni
 STR_WATERWAYS_TOOLBAR_BUILD_DOCK_TOOLTIP                        :{BLACK}Budowa portu
 STR_WATERWAYS_TOOLBAR_BUILD_DEPOT_TOOLTIP                       :{BLACK}Budowa stoczni (do budowy i serwisowania statków)
-STR_DEPOT_SHIP_LIST_TOOLTIP                                     :{BLACK}Statki - kliknij aby uzyskać informacje o statku
-STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}Budowa nowego statku
-STR_DEPOT_SHIP_SELL_TOOLTIP                                     :{BLACK}Przeciągnij tutaj statek aby go sprzedać
-STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}Centruj główne okno na pozycji stoczni
-STR_VEHICLE_LIST_SHIP_TOOLTIP                                   :{BLACK}Statki - kliknij aby uzyskać informacje o statku
-STR_BUILD_VEHICLE_SHIP_LIST_TOOLTIP                             :{BLACK}Lista wyboru statków - kliknij na statku, aby uzyskać informacje
-STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP                    :{BLACK}Zbuduj podświetlony statek
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP                  :{BLACK}Obecny stan statku - klik aby zatrzymać/ruszyć statek
-STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Pokaż polecenia statku
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP                          :{BLACK}Centruj główne okno na pozycji statku
-STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}Wyślij statek do stoczni
-STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Pokaż szczegóły statku
-STR_VEHICLE_DETAILS_SHIP_RENAME                                 :{BLACK}Nazwa statku
 
-STR_QUERY_RENAME_SHIP_CAPTION                                   :{WHITE}Nazwa statku
-STR_ERROR_CAN_T_RENAME_SHIP                                     :{WHITE}Nie można zmienić nazwy statku...
 STR_NEWS_FIRST_SHIP_ARRIVAL                                     :{BLACK}{BIGFONT}Mieszkańcy świętują . . .{}Pierwszy statek przybył do {STATION}!
 STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}Ustaw boję, która może być użyta jako punkt kontrolny
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}Nie można tutaj ustawić boi...
 STR_BUILD_AQUEDUCT                                              :{BLACK}Zbuduj akwedukt
 STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}Nie można zbudować tutaj akweduktu...
-STR_BUILD_VEHICLE_SHIP_RENAME_BUTTON                            :{BLACK}Zmień nazwę
-STR_BUILD_VEHICLE_SHIP_RENAME_TOOLTIP                           :{BLACK}Zmień nazwę typu statku
-STR_QUERY_RENAME_SHIP_TYPE_CAPTION                              :{WHITE}Zmień nazwę typu statku
-STR_ERROR_CAN_T_RENAME_SHIP_TYPE                                :{WHITE}Nie można zmienić nazwy typu statku...
-STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}Przebudowa statku do przewozu innego typu ładunku
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (Przebudowa)
-STR_REFIT_SHIP_REFIT_BUTTON                                     :{BLACK}Przebudowa statku
-STR_REFIT_SHIP_LIST_TOOLTIP                                     :{BLACK}Wybierz jaki ładunek ma przewozić statek
-STR_REFIT_SHIP_REFIT_TOOLTIP                                    :{BLACK}Przebuduj statek do przewozu zaznaczonego typu ładunku
 STR_REFIT_TITLE                                                 :{GOLD}Wybierz typ ładunku do przewozu:
 STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}Nowa pojemność: {GOLD}{CARGO}{}{BLACK}Koszt przebudowy: {GOLD}{CURRENCY}
-STR_ERROR_CAN_T_REFIT_SHIP                                      :{WHITE}Nie można przebudować statku...
 STR_REFITTABLE                                                  :(przebudowalny)
 
 ##id 0xA000
 STR_TOOLBAR_AIRCRAFT_CAPTION                                    :{WHITE}Lotniska
 STR_ERROR_CAN_T_BUILD_AIRPORT_HERE                              :{WHITE}Nie można tutaj wybudować lotniska...
-STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}Hangar na {STATION}
-STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON                          :{BLACK}Nowy samolot
-STR_CLONE_AIRCRAFT                                              :{BLACK}Klonuj samolot
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Spowoduje wybudowanie kopii samolotu. Control+klik spowoduje współdzielenie poleceń
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Spowoduje wybudowanie kopii samolotu. Kliknij na przycisk a następnie na samolot wewnątrz lub na zewnątrz hangaru. Control+klik spowoduje współdzielenie poleceń
-STR_BUILD_VEHICLE_AIRCRAFT_CAPTION                              :{WHITE}Nowy samolot
-STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON                 :{BLACK}Budowa samolotu
-STR_ERROR_CAN_T_BUILD_AIRCRAFT                                  :{WHITE}Nie można zbudować samolotu...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} Samolot
-STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR                         :{WHITE}Nie można wysłać samolotu do hangaru...
-STR_HEADING_FOR_HANGAR                                          :{ORANGE}Zmierza do hangaru w {STATION}
-STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Zmierza do hangaru w {STATION}, {VELOCITY}
-STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Serwisuj w Hangarze na {STATION}
-STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Serwisuj w Hangarze na {STATION}, {VELOCITY}
-STR_NEWS_AIRCRAFT_IS_WAITING                                    :{WHITE}{VEHICLE} czeka w hangarze
-STR_ERROR_AIRCRAFT_IN_THE_WAY                                   :{WHITE}Samolot jest na drodze
-STR_ERROR_CAN_T_STOP_START_AIRCRAFT                             :{WHITE}Nie można zatrzymać/ruszyć samolotu
 STR_ERROR_AIRCRAFT_IS_IN_FLIGHT                                 :{WHITE}Samolot jest w locie
 STR_ERROR_AIRCRAFT_MUST_BE_STOPPED                              :{WHITE}Samolot musi być zatrzymany w hangarze
-STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}Nie można sprzedać samolotu...
 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION                          :Konstrukcje lotnicze
 STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Budowa lotniska
-STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP                               :{BLACK}Samolot - klik na samolocie aby uzyskać informacje
-STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Samolot - klik na samolocie aby uzyskać informacje
-STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}Budowa nowego samolotu
-STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}Przeciągnij tutaj samolot aby go sprzedać
-STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Centruj główne okno na pozycji hangaru
-STR_BUILD_VEHICLE_AIRCRAFT_LIST_TOOLTIP                         :{BLACK}Lista wyboru samolotów - kliknij na samolocie, aby uzyskać informacje
-STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_TOOLTIP                :{BLACK}Zbuduj podświetlony samolot
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP              :{BLACK}Obecny stan samolotu - klik aby zatrzymać/ruszyć samolot
-STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Pokaż polecenia samolotu
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP                      :{BLACK}Centruj główne okno na pozycji samolotu
-STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}Wyślij samolot do hangaru
-STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Pokaż szczegóły samolotu
 
-STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}Nazwa samolotu
-STR_ERROR_CAN_T_RENAME_AIRCRAFT                                 :{WHITE}Nie można zmienić nazwy samolotu...
-STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}Nazwa samolotu
 STR_NEWS_FIRST_AIRCRAFT_ARRIVAL                                 :{BLACK}{BIGFONT}Mieszkańcy świętują . . .{}Pierwszy samolot przyleciał na {STATION}!
 STR_NEWS_AIRCRAFT_CRASH                                         :{BLACK}{BIGFONT}Katastrofa lotnicza!{}{COMMA} ofiar{P a y ""} na {STATION}
 STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Wypadek lotniczy!{}Samolot rozbił się z powodu braku paliwa, zginęł{P 0 a y o} {COMMA} os{P oba oby ób}!
 STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
-STR_BUILD_VEHICLE_AIRCRAFT_RENAME_BUTTON                        :{BLACK}Zmień nazwę
-STR_BUILD_VEHICLE_AIRCRAFT_RENAME_TOOLTIP                       :{BLACK}Zmień nazwę typu samolotu
-STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION                          :{WHITE}Zmień nazwę typu samolotu
-STR_ERROR_CAN_T_RENAME_AIRCRAFT_TYPE                            :{WHITE}Nie można zmienić nazwy typu samolotu...
-STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Przebudowa samolotu do przewozu innego typu ładunku
-STR_REFIT_AIRCRAFT_REFIT_BUTTON                                 :{BLACK}Przebudowa samolotu
-STR_REFIT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Wybierz jaki ładunek ma przenosić samolot
-STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}Przebuduj samolot do przewozu zaznaczonego typu ładunku
-STR_ERROR_CAN_T_REFIT_AIRCRAFT                                  :{WHITE}Nie można przebudować samolotu...
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Rozkład jazdy)
 
@@ -3588,15 +3388,225 @@ STR_LORRY                                                       :{BLACK}{LORRY}
 STR_PLANE                                                       :{BLACK}{PLANE}
 STR_SHIP                                                        :{BLACK}{SHIP}
 
+############ Vehicle lists
+STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP                             :{BLACK}Pociągi - klik na pojeździe aby uzyskać informacje
+STR_VEHICLE_LIST_ROAD_VEHICLE_TOOLTIP                           :{BLACK}Samochody - klik na pojeździe po więcej informacji
+STR_VEHICLE_LIST_SHIP_TOOLTIP                                   :{BLACK}Statki - kliknij aby uzyskać informacje o statku
+STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP                               :{BLACK}Samolot - klik na samolocie aby uzyskać informacje
 
-STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Pokazuje wszystkie pociągi, które mają tę stację w swoim rozkładzie
-STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Pokazuje wszystkie samochody, ktore mają tę stację w swoim rozkladzie
-STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Pokazuje wszystkie samoloty, ktore mają tę stację w swoim rozkladzie
-STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Pokazuje wszystkie statki, ktore mają tę stację w swoim rozkladzie
+STR_VEHICLE_LIST_TRAIN_CAPTION                                  :{WHITE}{STRING} - {COMMA} Pociąg{P "" i ów}
+STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING} - {COMMA} Samoch{P ód ody odów}
+STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - {COMMA} Stat{P ek ki ów}
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} Samolot
 
 STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}Wspoldzielone polecenia {COMMA} pojazd{P u ow ow}
 STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Pokaż wszystkie pojazdy współdzielące te polecenia
 
+STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} czeka w zajezdni
+STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} czeka w zajezdni
+STR_NEWS_SHIP_IS_WAITING                                        :{WHITE}{VEHICLE} czeka w zajezdni
+STR_NEWS_AIRCRAFT_IS_WAITING                                    :{WHITE}{VEHICLE} czeka w hangarze
+
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Przebudowa pociągu
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Przebudowa samochodu
+STR_REFIT_SHIP_REFIT_BUTTON                                     :{BLACK}Przebudowa statku
+STR_REFIT_AIRCRAFT_REFIT_BUTTON                                 :{BLACK}Przebudowa samolotu
+
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Przebuduj pociąg do przewozu zaznaczonego typu ładunku
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Przebuduj samochód do przewozu zaznaczonego typu ładunku
+STR_REFIT_SHIP_REFIT_TOOLTIP                                    :{BLACK}Przebuduj statek do przewozu zaznaczonego typu ładunku
+STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}Przebuduj samolot do przewozu zaznaczonego typu ładunku
+
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Wybierz jaki ładunek ma przewozić pociąg
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Wybierz ładunek jaki ma przewozić ten samochód
+STR_REFIT_SHIP_LIST_TOOLTIP                                     :{BLACK}Wybierz jaki ładunek ma przewozić statek
+STR_REFIT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Wybierz jaki ładunek ma przenosić samolot
+
+STR_DEPOT_TRAIN_CAPTION                                         :{WHITE}Zajezdnia w {TOWN}
+STR_DEPOT_ROAD_VEHICLE_CAPTION                                  :{WHITE} Zajezdnia samochodowa w {TOWN}
+STR_DEPOT_SHIP_CAPTION                                          :{WHITE}Stocznia w {TOWN}
+STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}Hangar na {STATION}
+
+STR_VEHICLE_DETAILS_TRAIN_RENAME                                :{BLACK}Nazwa pociągu
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Nazwij samochód
+STR_VEHICLE_DETAILS_SHIP_RENAME                                 :{BLACK}Nazwa statku
+STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}Nazwa samolotu
+
+STR_QUERY_RENAME_TRAIN_CAPTION                                  :{WHITE}Nazwa pociągu
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Nazwij samochód
+STR_QUERY_RENAME_SHIP_CAPTION                                   :{WHITE}Nazwa statku
+STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}Nazwa samolotu
+
+STR_ERROR_TRAIN_IN_THE_WAY                                      :{WHITE}Pociąg na drodze
+STR_ERROR_ROAD_VEHICLE_IN_THE_WAY                               :{WHITE}Samochód na drodze
+STR_ERROR_SHIP_IN_THE_WAY                                       :{WHITE}Statek na drodze
+STR_ERROR_AIRCRAFT_IN_THE_WAY                                   :{WHITE}Samolot jest na drodze
+
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Nie można przebudować pociągu...
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Nie można przebudować samochodu...
+STR_ERROR_CAN_T_REFIT_SHIP                                      :{WHITE}Nie można przebudować statku...
+STR_ERROR_CAN_T_REFIT_AIRCRAFT                                  :{WHITE}Nie można przebudować samolotu...
+
+STR_ERROR_CAN_T_RENAME_TRAIN                                    :{WHITE}Nie można zmienić nazwy pociągu...
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Nie można nazwać samochodu...
+STR_ERROR_CAN_T_RENAME_SHIP                                     :{WHITE}Nie można zmienić nazwy statku...
+STR_ERROR_CAN_T_RENAME_AIRCRAFT                                 :{WHITE}Nie można zmienić nazwy samolotu...
+
+STR_ERROR_CAN_T_STOP_START_TRAIN                                :{WHITE}Nie można zatrzymać/ruszyć pociagu...
+STR_ERROR_CAN_T_STOP_START_ROAD_VEHICLE                         :{WHITE}Nie można zatrzymać/ruszyć samochodu...
+STR_ERROR_CAN_T_STOP_START_SHIP                                 :{WHITE}Nie można zatrzymać/ruszyć statku...
+STR_ERROR_CAN_T_STOP_START_AIRCRAFT                             :{WHITE}Nie można zatrzymać/ruszyć samolotu
+
+STR_ERROR_CAN_T_SEND_TRAIN_TO_DEPOT                             :{WHITE}Nie można wysłać pociągu do zajezdni...
+STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Nie można wysłać samochodu do zajezdni...
+STR_ERROR_CAN_T_SEND_SHIP_TO_DEPOT                              :{WHITE}Nie można wysłać statku do stoczni...
+STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR                         :{WHITE}Nie można wysłać samolotu do hangaru...
+
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Nie można wybudować lokomotywy...
+STR_ERROR_CAN_T_BUILD_ROAD_VEHICLE                              :{WHITE}Nie można zbudować samochodu...
+STR_ERROR_CAN_T_BUILD_SHIP                                      :{WHITE}Nie można wybudować statku...
+STR_ERROR_CAN_T_BUILD_AIRCRAFT                                  :{WHITE}Nie można zbudować samolotu...
+
+STR_ERROR_CAN_T_RENAME_TRAIN_TYPE                               :{WHITE}Nie można zmienić nazwy typu pojazdu...
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Nie można zmienić nazwy typu samochodu...
+STR_ERROR_CAN_T_RENAME_SHIP_TYPE                                :{WHITE}Nie można zmienić nazwy typu statku...
+STR_ERROR_CAN_T_RENAME_AIRCRAFT_TYPE                            :{WHITE}Nie można zmienić nazwy typu samolotu...
+
+STR_ERROR_CAN_T_SELL_TRAIN                                      :{WHITE}Nie można sprzedać lokomotywy...
+STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}Nie można sprzedać samochodu...
+STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}Nie można sprzedać statku...
+STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}Nie można sprzedać samolotu...
+
+STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP                 :{BLACK}Obecny stan pociągu - klik tutaj aby zatrzymać/ruszyć pociąg
+STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP          :{BLACK}Obecny stan pojazdu - klik tutaj aby zatrzymać/ruszyć pojazd
+STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP                  :{BLACK}Obecny stan statku - klik aby zatrzymać/ruszyć statek
+STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP              :{BLACK}Obecny stan samolotu - klik aby zatrzymać/ruszyć samolot
+
+STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP                           :{BLACK}Pokaż polecenia dla pociągu
+STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP                    :{BLACK}Pokaż polecenia pojazdu
+STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Pokaż polecenia statku
+STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Pokaż polecenia samolotu
+
+STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP                         :{BLACK}Centrowanie głównego okna na pozycji pociągu
+STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP                  :{BLACK}Centruj główne okno na pozycji pojazdu
+STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP                          :{BLACK}Centruj główne okno na pozycji statku
+STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP                      :{BLACK}Centruj główne okno na pozycji samolotu
+
+STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP                    :{BLACK}Wyślij pociąg do zajezdni
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}Wyślij pojazd do zajezdni
+STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}Wyślij statek do stoczni
+STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}Wyślij samolot do hangaru
+
+STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Pokaż szczegóły pociągu
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Pokaż detale samochodu
+STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Pokaż szczegóły statku
+STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Pokaż szczegóły samolotu
+
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Przebudowa pociągu do przewozu innego typu ładunku
+STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Przebudowa samochodu do przewozu innego typu ładunku
+STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}Przebudowa statku do przewozu innego typu ładunku
+STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Przebudowa samolotu do przewozu innego typu ładunku
+
+STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Zmierza do zajezdni w {TOWN}
+STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Zmierza do zajezdni w {TOWN}, {VELOCITY}
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Zmierza do zajezdni sam. w {TOWN}
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Zmierza do zajezdni sam. w {TOWN}, {VELOCITY}
+STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Zmierza do stoczni w {TOWN}
+STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Zmierza do stoczni w {TOWN}, {VELOCITY}
+STR_HEADING_FOR_HANGAR                                          :{ORANGE}Zmierza do hangaru w {STATION}
+STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Zmierza do hangaru w {STATION}, {VELOCITY}
+
+STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Serwisuj w Zajezdni w {TOWN}
+STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Serwisuj w Zajezdni w {TOWN}, {VELOCITY}
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Serwisuj w Zajezdni w {TOWN}
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Serwisuj w Zajezdni w {TOWN}, {VELOCITY}
+STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Serwisuj w Stoczni w {TOWN}
+STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Serwisuj w Stoczni w {TOWN}, {VELOCITY}
+STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Serwisuj w Hangarze na {STATION}
+STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Serwisuj w Hangarze na {STATION}, {VELOCITY}
+
+
+STR_CLONE_TRAIN                                                 :{BLACK}Klonuj pociąg
+STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Klonuj pojazd
+STR_CLONE_SHIP                                                  :{BLACK}Klonuj statek
+STR_CLONE_AIRCRAFT                                              :{BLACK}Klonuj samolot
+
+STR_CLONE_TRAIN_INFO                                            :{BLACK}Spowoduje wybudowanie kopii pociągu wraz ze wszystkimi wagonami. CTRL+klik spowoduje współdzielenie poleceń
+STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Spowoduje zbudowanie kopii pojazdu. CTRL+klik spowoduje współdzielenie poleceń
+STR_CLONE_SHIP_INFO                                             :{BLACK}Spowoduje wybudowanie kopii statku. Control+klik spowoduje współdzielenie poleceń
+STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Spowoduje wybudowanie kopii samolotu. Control+klik spowoduje współdzielenie poleceń
+
+STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Spowoduje wybudowanie kopii pociągu wraz z wszystkimi wagonami. Kliknij na przycisk a następnie na pociąg wewnątrz lub na zewnątrz zajezdni. CTRL+klik spowoduje współdzielenie poleceń
+STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Spowoduje zbudowanie kopii pojazdu. Kliknij na przycisk a następnie na pojazd wewnątrz lub na zewnątrz zajezdni. CTRL+klik spowoduje współdzielenie poleceń
+STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Spowoduje wybudowanie kopii statku. Kliknij na przycisk a następnie na statek wewnątrz lub na zewnątrz stoczni. Control+klik spowoduje współdzielenie poleceń
+STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Spowoduje wybudowanie kopii samolotu. Kliknij na przycisk a następnie na samolot wewnątrz lub na zewnątrz hangaru. Control+klik spowoduje współdzielenie poleceń
+
+STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}Nowe pociągi
+STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}Nowe elektryczne pojazdy szynowe
+STR_BUILD_VEHICLE_TRAIN_MONORAIL_CAPTION                        :{WHITE}Nowe pociągi jednoszynowe
+STR_BUILD_VEHICLE_TRAIN_MAGLEV_CAPTION                          :{WHITE}Nowe pociągi MagLev
+
+STR_BUILD_VEHICLE_TRAIN_ALL_CAPTION                             :{WHITE}Pojazdy szynowe
+STR_BUILD_VEHICLE_ROAD_VEHICLE_CAPTION                          :{WHITE}Nowy pojazd drogowy
+STR_BUILD_VEHICLE_SHIP_CAPTION                                  :{WHITE}Nowe statki
+STR_BUILD_VEHICLE_AIRCRAFT_CAPTION                              :{WHITE}Nowy samolot
+
+STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_BUTTON                    :{BLACK}Zbuduj pojazd
+STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_BUTTON             :{BLACK}Zbuduj pojazd
+STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON                     :{BLACK}Budowa statku
+STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON                 :{BLACK}Budowa samolotu
+
+STR_BUILD_VEHICLE_TRAIN_LIST_TOOLTIP                            :{BLACK}Lista wyboru pociągów - kliknij na pojeździe, aby uzyskać informacje
+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_SHIP_LIST_TOOLTIP                             :{BLACK}Lista wyboru statków - kliknij na statku, aby uzyskać informacje
+STR_BUILD_VEHICLE_AIRCRAFT_LIST_TOOLTIP                         :{BLACK}Lista wyboru samolotów - kliknij na samolocie, aby uzyskać informacje
+
+STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_TOOLTIP                   :{BLACK}Zbuduj podświetlony pociąg
+STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_TOOLTIP            :{BLACK}Zbuduj podświetlony pojazd drogowy
+STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP                    :{BLACK}Zbuduj podświetlony statek
+STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_TOOLTIP                :{BLACK}Zbuduj podświetlony samolot
+
+STR_BUILD_VEHICLE_TRAIN_RENAME_BUTTON                           :{BLACK}Zmień nazwę
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Zmień nazwę
+STR_BUILD_VEHICLE_SHIP_RENAME_BUTTON                            :{BLACK}Zmień nazwę
+STR_BUILD_VEHICLE_AIRCRAFT_RENAME_BUTTON                        :{BLACK}Zmień nazwę
+
+STR_BUILD_VEHICLE_TRAIN_RENAME_TOOLTIP                          :{BLACK}Zmiana nazwy typu pociągu
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Zmień nazwę typu samochodu
+STR_BUILD_VEHICLE_SHIP_RENAME_TOOLTIP                           :{BLACK}Zmień nazwę typu statku
+STR_BUILD_VEHICLE_AIRCRAFT_RENAME_TOOLTIP                       :{BLACK}Zmień nazwę typu samolotu
+
+STR_QUERY_RENAME_TRAIN_TYPE_CAPTION                             :{WHITE}Zmiana nazwy typu pociągu
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Zmień nazwę typu samochodu
+STR_QUERY_RENAME_SHIP_TYPE_CAPTION                              :{WHITE}Zmień nazwę typu statku
+STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION                          :{WHITE}Zmień nazwę typu samolotu
+
+STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Nowe pojazdy
+STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_BUTTON                      :{BLACK}Nowe pojazdy
+STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON                              :{BLACK}Nowe statki
+STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON                          :{BLACK}Nowy samolot
+
+STR_DEPOT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Pociągi - klik na pociągu po info, przeciągnij pojazd/wagon aby dodać
+STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Pojazdy - klik na pojeździe po więcej informacji
+STR_DEPOT_SHIP_LIST_TOOLTIP                                     :{BLACK}Statki - kliknij aby uzyskać informacje o statku
+STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Samolot - klik na samolocie aby uzyskać informacje
+
+STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP                            :{BLACK}Buduj nowy pociąg
+STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}Zbuduj nowy samochód
+STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}Budowa nowego statku
+STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}Budowa nowego samolotu
+
+STR_DEPOT_TRAIN_SELL_TOOLTIP                                    :{BLACK}Przeciągnij tutaj pociąg aby go sprzedać
+STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}Przeciągnij tutaj samochód aby go sprzedać
+STR_DEPOT_SHIP_SELL_TOOLTIP                                     :{BLACK}Przeciągnij tutaj statek aby go sprzedać
+STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}Przeciągnij tutaj samolot aby go sprzedać
+
+STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}Centrowanie głównego okna na pozycji zajezdni
+STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}Centruj główne okno na pozycji zajezdni samochodowej
+STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}Centruj główne okno na pozycji stoczni
+STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Centruj główne okno na pozycji hangaru
+
+
 ### depot strings
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}Sprzedasz wszystkie pojazdy z zajezdni. Jesteś pewien?
 STR_DEPOT_WRONG_DEPOT_TYPE                                      :Zły typ zajezdni
@@ -3616,7 +3626,6 @@ STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TIP                          :{BLACK}Zamień
 STR_DEPOT_AUTOREPLACE_SHIP_TIP                                  :{BLACK}Zamień wszystkie statki w stoczni
 STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP                              :{BLACK}Zamień wszystkie samoloty w hangarze
 
-
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Zastąp {STRING}
 STR_REPLACE_VEHICLES_START                                      :{BLACK}Rozpocznij zastępowanie
 STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Zatrzymaj zastępowanie
@@ -3632,6 +3641,7 @@ STR_REPLACE_REMOVE_WAGON                                        :{BLACK}Usunięc
 STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Autowymiana zachowuje długość pociągu poprzez usuwanie wagonów (począwszy od początku), jeśli wymiana lokomotywy spowoduje wydłużenie pociągu.
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}Zastępowanie: {ORANGE}{SKIP}{SKIP}{STRING}
 STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}Przejdź pomiędzy oknami zamiany lokomotyw i wagonów
+
 STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Pojazd nie jest dostępny
 STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Pojazd nie jest dostępny
 STR_SHIP_NOT_AVAILABLE                                          :{WHITE}Statek nie jest dostępny
@@ -3782,17 +3792,6 @@ STR_MEASURE_AREA                                                :{BLACK}Obszar:
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Długość: {NUM}{}Różnica wysokości: {NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Obszar: {NUM} x {NUM}{}Różnica wysokości: {NUM} m
 
-############ Date formatting
-STR_FORMAT_DATE_TINY                                            :{STRING}-{STRING}-{NUM}
-STR_FORMAT_DATE_SHORT                                           :{STRING} {NUM}
-STR_FORMAT_DATE_LONG                                            :{STRING} {STRING} {NUM}
-STR_FORMAT_DATE_ISO                                             :{2:NUM}-{1:STRING}-{0:STRING}
-
-STR_JUST_DATE_TINY                                              :{DATE_TINY}
-STR_JUST_DATE_LONG                                              :{DATE_LONG}
-STR_JUST_DATE_ISO                                               :{DATE_ISO}
-########
-
 STR_FEEDER_CARGO_VALUE                                          :{BLACK}Wartość transferu: {LTBLUE}{CURRENCY}
 STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD                            :{WHITE}...ta droga należy do miasta
 STR_DRIVE_THROUGH_ERROR_DIRECTION                               :{WHITE}...droga jest zorientowana w złym kierunku
@@ -3817,7 +3816,6 @@ STR_PERCENT_UP_DOWN_SMALL                                       :{TINYFONT}{WHIT
 STR_PERCENT_UP_DOWN                                             :{WHITE}{NUM}%{UPARROW}{DOWNARROW}
 
 ##### Mass Order
-STR_FORMAT_GROUP_NAME                                           :Grupa {COMMA}
 STR_GROUP_TINY_NAME                                             :{TINYFONT}{GROUP}
 STR_GROUP_ALL_TRAINS                                            :Wszystkie pociągi
 STR_GROUP_ALL_ROAD_VEHICLES                                     :Wszystkie samochody
@@ -3846,12 +3844,62 @@ STR_GROUP_DELETE_TIP                                            :{BLACK}Usuń za
 STR_GROUP_RENAME_TIP                                            :{BLACK}Zmień nazwę zaznaczonej grupy
 STR_GROUP_REPLACE_PROTECTION_TIP                                :{BLACK}Kliknij, aby ochronić tę grupę przed globalną zamianą pojazdów
 
+#### String control codes and their formatting
 STR_COMPANY_NAME                                                :{COMPANY}
 STR_ENGINE_NAME                                                 :{ENGINE}
 STR_GROUP_NAME                                                  :{GROUP}
+STR_INDUSTRY_NAME                                               :{INDUSTRY}
 STR_PRESIDENT_NAME                                              :{PRESIDENTNAME}
 STR_SIGN_NAME                                                   :{SIGN}
+STR_STATION_NAME                                                :{STATION}
+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_LONG                                              :{DATE_LONG}
+STR_JUST_DATE_ISO                                               :{DATE_ISO}
+STR_JUST_STRING                                                 :{STRING}
+STR_JUST_RAW_STRING                                             :{STRING}
+
+STR_FORMAT_DATE_TINY                                            :{STRING}-{STRING}-{NUM}
+STR_FORMAT_DATE_SHORT                                           :{STRING} {NUM}
+STR_FORMAT_DATE_LONG                                            :{STRING} {STRING} {NUM}
+STR_FORMAT_DATE_ISO                                             :{2:NUM}-{1:STRING}-{0:STRING}
+
+STR_FORMAT_COMPANY_NUM                                          :(Firma {COMMA})
+STR_FORMAT_GROUP_NAME                                           :Grupa {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}Nazwa nie może się powtarzać
 
diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt
index bb86c09ce..f8fd07fd7 100644
--- a/src/lang/portuguese.txt
+++ b/src/lang/portuguese.txt
@@ -154,8 +154,6 @@ STR_ABBREV_PLASTIC                                              :{TINYFONT}PL
 STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}BG
 STR_ABBREV_NONE                                                 :{TINYFONT}NÃO
 STR_ABBREV_ALL                                                  :{TINYFONT}TUDO
-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
@@ -167,17 +165,11 @@ STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Copyrigh
 STR_ABOUT_VERSION                                               :{BLACK}OpenTTD versão {REV}
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 A equipa do OpenTTD
 
-STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
-STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_QUIT_CAPTION                                                :{WHITE}Sair
 STR_YES                                                         :{BLACK}Sim
 STR_NO                                                          :{BLACK}Não
 STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Tem a certeza que deseja abandonar este jogo e voltar ao {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                                                :Nada
 STR_COLOUR_DARK_BLUE                                            :Azul Escuro
 STR_COLOUR_PALE_GREEN                                           :Verde Claro
@@ -196,8 +188,6 @@ STR_COLOUR_BROWN                                                :Castanho
 STR_COLOUR_GREY                                                 :Cinzento
 STR_COLOUR_WHITE                                                :Branco
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}Existem muitos veículos em jogo
-STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
-STR_RED_COMMA                                                   :{RED}{COMMA}
 STR_BUTTON_LOCATION                                             :{BLACK}Localização
 STR_SMALLMAP_TYPE_CONTOURS                                      :Contornos
 STR_SMALLMAP_TYPE_VEHICLES                                      :Veículos
@@ -323,12 +313,13 @@ STR_SORT_CRITERIA_TIP                                           :{BLACK}Seleccio
 STR_FILTER_CRITERIA_TIP                                         :{BLACK}Seleccione o critério de filtragem/procura
 STR_SORT_BY                                                     :{BLACK}Ordenar por
 
+### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}População
+STR_SORT_BY_NAME                                                :{BLACK}Nome
+STR_SORT_BY_DATE                                                :{BLACK}Data
 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_DATE                                                :{BLACK}Data
 STR_SORT_BY_NUMBER                                              :Número
 STR_SORT_BY_PROFIT_LAST_YEAR                                    :Lucros do último ano
 STR_SORT_BY_PROFIT_THIS_YEAR                                    :Lucros deste ano
@@ -351,37 +342,25 @@ STR_SORT_BY_INTRO_DATE                                          :Data de Introdu
 STR_SORT_BY_RUNNING_COST                                        :Custo de circulação
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :Potência/Custo de circulação
 STR_SORT_BY_CARGO_CAPACITY                                      :Capacidade de Carga
+
 STR_NO_WAITING_CARGO                                            :{BLACK}Nenhuma carga em espera
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}Seleccionar todas as acções
 STR_SELECT_ALL_TYPES                                            :{BLACK}Seleccionar todos os tipos de carga (incluindo carga sem espera)
-STR_AVAILABLE_TRAINS                                            :{BLACK}Comboios Disponíveis
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Veículos Disponíveis
-STR_AVAILABLE_SHIPS                                             :{BLACK}Barcos Disponíveis
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Aviões Disponíveis
 STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Ver lista de designs disponíveis de locomotivas para este tipo de veículo.
 STR_MANAGE_LIST                                                 :{BLACK}Gerir lista
 STR_MANAGE_LIST_TIP                                             :{BLACK}Enviar instruções a todos os veículos desta lista
 STR_REPLACE_VEHICLES                                            :Substituir Veículos
+STR_SEND_FOR_SERVICING                                          :Enviar para Serviço
+
+STR_AVAILABLE_TRAINS                                            :{BLACK}Comboios Disponíveis
+STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Veículos Disponíveis
+STR_AVAILABLE_SHIPS                                             :{BLACK}Barcos Disponíveis
+STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Aviões Disponíveis
+
 STR_SEND_TRAIN_TO_DEPOT                                         :Enviar para Depósito
 STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Enviar para Depósito
 STR_SEND_SHIP_TO_DEPOT                                          :Enviar para Depósito
 STR_SEND_AIRCRAFT_TO_HANGAR                                     :Enviar para Hangar
-STR_SEND_FOR_SERVICING                                          :Enviar para Serviço
-
-############ range for months starts
-STR_MONTH_ABBREV_JAN                                            :Jan
-STR_MONTH_ABBREV_FEB                                            :Fev
-STR_MONTH_ABBREV_MAR                                            :Mar
-STR_MONTH_ABBREV_APR                                            :Abr
-STR_MONTH_ABBREV_MAY                                            :Mai
-STR_MONTH_ABBREV_JUN                                            :Jun
-STR_MONTH_ABBREV_JUL                                            :Jul
-STR_MONTH_ABBREV_AUG                                            :Ago
-STR_MONTH_ABBREV_SEP                                            :Set
-STR_MONTH_ABBREV_OCT                                            :Out
-STR_MONTH_ABBREV_NOV                                            :Nov
-STR_MONTH_ABBREV_DEC                                            :Dez
-############ range for months ends
 
 STR_GRAPH_X_LABEL_MONTH                                         :{TINYFONT}{STRING}{} {STRING}
 STR_GRAPH_X_LABEL_MONTH_YEAR                                    :{TINYFONT}{STRING}{} {STRING}{}{NUM}
@@ -409,8 +388,6 @@ 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_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
@@ -457,7 +434,7 @@ STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Nenhum
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Nome
 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                                          :1
 STR_ORDINAL_NUMBER_2ND                                          :2
 STR_ORDINAL_NUMBER_3RD                                          :3
@@ -491,6 +468,34 @@ STR_ORDINAL_NUMBER_30TH                                         :30
 STR_ORDINAL_NUMBER_31ST                                         :31
 ############ range for days ends
 
+############ range for months starts
+STR_MONTH_ABBREV_JAN                                            :Jan
+STR_MONTH_ABBREV_FEB                                            :Fev
+STR_MONTH_ABBREV_MAR                                            :Mar
+STR_MONTH_ABBREV_APR                                            :Abr
+STR_MONTH_ABBREV_MAY                                            :Mai
+STR_MONTH_ABBREV_JUN                                            :Jun
+STR_MONTH_ABBREV_JUL                                            :Jul
+STR_MONTH_ABBREV_AUG                                            :Ago
+STR_MONTH_ABBREV_SEP                                            :Set
+STR_MONTH_ABBREV_OCT                                            :Out
+STR_MONTH_ABBREV_NOV                                            :Nov
+STR_MONTH_ABBREV_DEC                                            :Dez
+
+STR_MONTH_JAN                                                   :Janeiro
+STR_MONTH_FEB                                                   :Fevereiro
+STR_MONTH_MAR                                                   :Março
+STR_MONTH_APR                                                   :Abril
+STR_MONTH_MAY                                                   :Maio
+STR_MONTH_JUN                                                   :Junho
+STR_MONTH_JUL                                                   :Julho
+STR_MONTH_AUG                                                   :Agosto
+STR_MONTH_SEP                                                   :Setembro
+STR_MONTH_OCT                                                   :Outubro
+STR_MONTH_NOV                                                   :Novembro
+STR_MONTH_DEC                                                   :Dezembro
+############ range for months ends
+
 STR_GRAPH_Y_LABEL_NUMBER                                        :{TINYFONT}{COMMA}
 
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}Carga aceite: {LTBLUE}
@@ -580,12 +585,9 @@ 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_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_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
@@ -667,9 +669,7 @@ STR_OFF                                                         :Desligado
 STR_SUMMARY                                                     :Resumo
 STR_FULL                                                        :Completo
 STR_STATUSBAR_COMPANY_NAME                                      :{SILVER}- -  {COMPANY}  - -
-STR_BLACK_STRING                                                :{BLACK}{STRING}
 
-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
@@ -761,9 +761,6 @@ STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY                             :Financiar nova
 ############ range ends here
 
 STR_FUND_INDUSTRY_CAPTION                                       :{WHITE}Financiar nova indústria
-STR_JUST_STRING                                                 :{STRING}
-STR_JUST_RAW_STRING                                             :{STRING}
-STR_JUST_INT                                                    :{NUM}
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_RAINFOREST                       :{WHITE}...só se pode construir em zonas de floresta
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT                           :{WHITE}...só se pode construir em zonas de deserto
 STR_STATUSBAR_PAUSED                                            :{YELLOW}* *  EM PAUSA  *  *
@@ -777,9 +774,6 @@ 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_BLACK_6                                                     :{BLACK}6
-STR_BLACK_7                                                     :{BLACK}7
-
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Inglês
 STR_TOWNNAME_FRENCH                                             :Francês
@@ -859,19 +853,6 @@ STR_OPTIONS_BASE_GRF_DESCRIPTION_TIP                            :{BLACK}Informa�
 
 STR_AUTOSAVE_FAILED                                             :{WHITE}Falha ao guardar automaticamente
 
-STR_MONTH_JAN                                                   :Janeiro
-STR_MONTH_FEB                                                   :Fevereiro
-STR_MONTH_MAR                                                   :Março
-STR_MONTH_APR                                                   :Abril
-STR_MONTH_MAY                                                   :Maio
-STR_MONTH_JUN                                                   :Junho
-STR_MONTH_JUL                                                   :Julho
-STR_MONTH_AUG                                                   :Agosto
-STR_MONTH_SEP                                                   :Setembro
-STR_MONTH_OCT                                                   :Outubro
-STR_MONTH_NOV                                                   :Novembro
-STR_MONTH_DEC                                                   :Dezembro
-
 STR_HEADING_FOR_STATION                                         :{LTBLUE}Dirige-se para {STATION}
 STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}Dirige-se a {STATION}, {VELOCITY}
 STR_NO_ORDERS                                                   :{LTBLUE}Sem ordens
@@ -886,8 +867,6 @@ STR_CRATES                                                      :caixas
 STR_RES_OTHER                                                   :outros
 STR_NOTHING                                                     :
 
-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...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Fim de Ordens Partilhadas - -
@@ -1159,7 +1138,6 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Y-taman
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :desactivado
-STR_JUST_CURRENCY                                               :{CURRENCY}
 STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Alterar valor
 
 STR_TEMPERATE_LANDSCAPE                                         :Terreno temperado
@@ -1195,7 +1173,6 @@ STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}Seleccio
 
 STR_WAYPOINT_VIEWPORT                                           :{WHITE}{WAYPOINT}
 STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WHITE}{WAYPOINT}
-STR_WAYPOINT_NAME                                               :{WAYPOINT}
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Editar nome do ponto de passagem
 
 STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}Não é possível alterar o nome do ponto de passagem...
@@ -1262,11 +1239,6 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Nomes de
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...muito perto de outra indústria
 
-STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Converter comboio para um tipo de carga diferente
-STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Converter comboio
-STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Seleccionar tipo de carga do comboio
-STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Converter comboio para transportar a carga seleccionada
-STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Não é possível converter comboio...
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Modificar produção
 
 ############ network gui strings
@@ -1776,11 +1748,6 @@ STR_TOWN_BUILDING_NAME_TEPEES_1                                 :Tepees
 STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1                           :Casa-bule
 STR_TOWN_BUILDING_NAME_PIGGY_BANK_1                             :Mealheiro
 
-STR_INDUSTRY_NAME                                               :{INDUSTRY}
-STR_TOWN_NAME                                                   :{TOWN}
-STR_FORMAT_INDUSTRY_NAME                                        :{1:STRING} de {0:TOWN}
-STR_STATION_NAME                                                :{STATION}
-
 ##id 0x2800
 STR_LANDSCAPING_MENU_LANDSCAPING                                :Paisagem
 STR_LANDSCAPING_MENU_PLANT_TREES                                :Plantar árvores
@@ -1835,6 +1802,12 @@ STR_CARGO_RATING_EXCELLENT                                      :Excelente
 STR_CARGO_RATING_OUTSTANDING                                    :Proeminente
 ############ range for rating ends
 
+### station view strings
+STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Mostrar todos os comboios que têm esta estação nas ordens de serviço
+STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Mostrar todos os veículos de estrada que têm esta estação nas ordens de serviço
+STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Mostrar todos os aviões que têm esta estação nas ordens de serviço
+STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Mostrar todos os navios de cujo itinerário esta estação faz parte
+
 STR_STATION_VIEW_CARGO_RATING                                   :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO                        :{WHITE}{STATION} não aceita mais {STRING}
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO               :{WHITE}{STATION} não aceita mais {STRING} ou {STRING}
@@ -2078,6 +2051,7 @@ STR_SV_STNAME_AIRPORT                                           :Aeroporto de {S
 STR_SV_STNAME_OILFIELD                                          :Petrolífera de {STRING}
 STR_SV_STNAME_MINES                                             :Minas de {STRING}
 STR_SV_STNAME_DOCKS                                             :Docas de {STRING}
+##id 0x6020
 STR_SV_STNAME_ANNEXE                                            :{STRING} Anexo
 STR_SV_STNAME_SIDINGS                                           :Desvio de {STRING}
 STR_SV_STNAME_BRANCH                                            :Ramal de {STRING}
@@ -2125,8 +2099,6 @@ STR_NUM_LOW                                                     :Baixo
 STR_NUM_NORMAL                                                  :Normal
 STR_NUM_HIGH                                                    :Alto
 STR_NUM_CUSTOM                                                  :Personalizado
-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
@@ -2160,7 +2132,6 @@ STR_CITY_APPROVAL_HOSTILE                                       :Hostil
 
 ##id 0x7000
 STR_COMPANY_VIEW_CAPTION                                        :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
-STR_FORMAT_COMPANY_NUM                                          :(Empresa {COMMA})
 STR_COMPANY_VIEW_NEW_FACE_BUTTON                                :{BLACK}Nova Cara
 STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON                           :{BLACK}Cores
 STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}Cores:
@@ -2193,7 +2164,6 @@ STR_FINANCES_TOTAL_CAPTION                                      :{WHITE}Total:
 STR_COMPANY_NAME_COMPANY_NUM                                    :{COMPANY} {COMPANYNUM}
 STR_GRAPH_INCOME_CAPTION                                        :{WHITE}Gráfico de Rendimentos
 STR_CURRCOMPACT                                                 :{CURRCOMPACT}
-STR_JUST_COMMA                                                  :{COMMA}
 STR_GRAPH_OPERATING_PROFIT_CAPTION                              :{WHITE}Gráfico de Benefícios Operativos
 STR_FINANCES_BANK_BALANCE_TITLE                                 :{WHITE}Balanço Bancário
 STR_FINANCES_LOAN_TITLE                                         :{WHITE}Empréstimo
@@ -2596,10 +2566,8 @@ STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE                          :locomotiva mono
 STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE                            :locomotiva maglev
 
 ##id 0x8800
-STR_DEPOT_TRAIN_CAPTION                                         :{WHITE}{TOWN} Depósito Ferroviário
 STR_NEWS_FIRST_TRAIN_ARRIVAL                                    :{BLACK}{BIGFONT}Cidadãos celebram . . .{}Primeiro comboio chega a {STATION}!
 STR_VEHICLE_DETAILS_CAPTION                                     :{WHITE}{VEHICLE} (Detalhes)
-STR_ERROR_TRAIN_IN_THE_WAY                                      :{WHITE}Comboio no caminho
 STR_ORDER                                                       :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 STR_ORDER_SELECTED                                              :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 STR_ORDER_NON_STOP                                              :{BLACK}Sem paragens
@@ -2689,38 +2657,16 @@ STR_TIMETABLE_AND_TRAVEL_FOR                                    :e viaja para {S
 STR_TIMETABLE_DAYS                                              :{COMMA} dia{P "" s}
 STR_TIMETABLE_TICKS                                             :{COMMA} tic{P "" s}
 
-STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Dirige-se ao depósito de {TOWN}
-STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Dirige-se ao depósito de {TOWN}, {VELOCITY}
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Serviço no depósito de {TOWN}
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Serviço no depósito de {TOWN}, {VELOCITY}
-
 STR_INVALID_ORDER                                               :{RED} (Ordem Inválida)
 
 STR_UNKNOWN_STATION                                             :estação desconhecida
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}Vazio
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} de {STATION}
 STR_VEHICLE_DETAILS_CARGO_FROM_MULT                             :{LTBLUE}{CARGO} de {STATION} (x{NUM})
-STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} está a aguardar no depósito
-STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Novos Veículos
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}Comboio muito longo
 STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}Os comboios só podem ser alterados quando parados num depósito
-STR_VEHICLE_LIST_TRAIN_CAPTION                                  :{WHITE}{STRING} - {COMMA} Comboios
 
-STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}Novos Veículos Ferroviários
-STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}Novos comboios para carris electrificados
-STR_BUILD_VEHICLE_TRAIN_MONORAIL_CAPTION                        :{WHITE}Novos Veículos Monocarril
-STR_BUILD_VEHICLE_TRAIN_MAGLEV_CAPTION                          :{WHITE}Novos Veículos Maglev
-STR_BUILD_VEHICLE_TRAIN_ALL_CAPTION                             :{WHITE}Veículos sobre carris
-
-STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_BUTTON                    :{BLACK}Construir Veículo
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Clonar Veículo
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Esta acção criará uma cópia do veículo. Pressione Ctrl enquanto clica, para partilhar as ordens
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Esta acção criará uma cópia de um veículo. Clique neste botão e, de seguida, num veículo que se encontre dentro ou fora do depósito. Pressione Ctrl enquanto clica para partilhar as ordens
-STR_CLONE_TRAIN                                                 :{BLACK}Clonar Comboio
-STR_CLONE_TRAIN_INFO                                            :{BLACK}Esta acção criará uma cópia do comboio, incluindo as carruagens. Pressione Ctrl enquanto clica para partilhar as ordens
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Esta acção criará uma cópia de um comboio, incluindo as carruagens. Clique neste botão e, de seguida, num comboio que se encontre dentro ou fora do depósito. Pressione Ctrl enquanto clica para partilhar as ordens
-STR_BUILD_VEHICLE_TRAIN_RENAME_BUTTON                           :{BLACK}Renomear
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Saltar
 STR_ORDERS_DELETE_BUTTON                                        :{BLACK}Eliminar
 STR_ORDERS_GO_TO_BUTTON                                         :{BLACK}Ir Para
@@ -2736,14 +2682,12 @@ STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Mudar pa
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Ordens)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Fim de Ordens - -
 STR_SERVICE                                                     :{BLACK}Manutenção
-STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Não é possível construir veículo ferroviário...
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Construído: {LTBLUE}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Valor: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
 STR_VEHICLE_STATUS_LOADING_UNLOADING                            :{LTBLUE}A carregar / descarregar
 STR_VEHICLE_STATUS_LEAVING                                      :{LTBLUE}Saindo
 STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}Comboio tem que estar parado dentro do depósito
-STR_ERROR_CAN_T_SEND_TRAIN_TO_DEPOT                             :{WHITE}Não é possível mandar o comboio para o depósito...
 STR_ERROR_NO_MORE_SPACE_FOR_ORDERS                              :{WHITE}Não há espaço para mais ordens
 STR_ERROR_TOO_MANY_ORDERS                                       :{WHITE}Demasiadas ordens
 STR_ERROR_CAN_T_INSERT_NEW_ORDER                                :{WHITE}Não é possível inserir nova ordem...
@@ -2758,26 +2702,11 @@ STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE}um veicu
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}Não é possível mover veículo...
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}A locomotiva traseira seguirá sempre a sua parceira frontal
 STR_CARGO_N_A                                                   :N/D{SKIP}
-STR_ERROR_CAN_T_SELL_TRAIN                                      :{WHITE}Não é possível vender veículo ferroviário...
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}Não é possível encontrar rota para o depósito local
-STR_ERROR_CAN_T_STOP_START_TRAIN                                :{WHITE}Não é possível iniciar/parar comboio...
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}Intervalo de serviço: {LTBLUE}{COMMA}dias{BLACK}   Último serviço: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}Intervalo de serviço: {LTBLUE}{COMMA}%{BLACK}   Último serviço: {LTBLUE}{DATE_LONG}
-STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP                             :{BLACK}Comboios - clique num comboio para informações
-STR_DEPOT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Comboios - clique num comboio para informações, arraste um veículo para o adicionar/remover ao comboio
-STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP                            :{BLACK}Construir novo veículo ferroviário
-STR_DEPOT_TRAIN_SELL_TOOLTIP                                    :{BLACK}Arraste o veículo ferroviário para aqui para o vender
-STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}Centrar visualização na localização de um depósito ferroviário
-STR_BUILD_VEHICLE_TRAIN_LIST_TOOLTIP                            :{BLACK}Lista de veículos ferroviários - clique num veículo para informações
-STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_TOOLTIP                   :{BLACK}Construir o veículo ferroviário seleccionado
-STR_BUILD_VEHICLE_TRAIN_RENAME_TOOLTIP                          :{BLACK}Renomear tipo de veículo ferroviário
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP                 :{BLACK}Tarefa actual do comboio - clique aqui para iniciar/parar comboio
-STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP                           :{BLACK}Mostrar ordens do comboio
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP                         :{BLACK}Centrar visualização na localização do comboio
-STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP                    :{BLACK}Mandar comboio para o depósito
 STR_VEHICLE_VIEW_TRAIN_IGNORE_SIGNAL_TOOLTIP                    :{BLACK}Forçar comboio a prosseguir sem esperar pelo sinal
 STR_VEHICLE_VIEW_TRAIN_REVERSE_TOOLTIP                          :{BLACK}Inverter direcção do comboio
-STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Mostrar detalhes do comboio
 STR_VEHICLE_DETAILS_INCREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Aumentar intervalo de serviço
 STR_VEHICLE_DETAILS_DECREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Diminuir intervalo de serviço
 STR_VEHICLE_DETAILS_TRAIN_CARGO_TOOLTIP                         :{BLACK}Mostrar detalhes da carga transportada
@@ -2811,15 +2740,10 @@ STR_VEHICLE_STATUS_STOPPED                                      :{RED}Parado
 STR_ERROR_CAN_T_MAKE_TRAIN_PASS_SIGNAL                          :{WHITE}Não é possível fazer o comboio passar o sinal de perigo...
 STR_VEHICLE_STATUS_CRASHED                                      :{RED}Acidentado!
 
-STR_QUERY_RENAME_TRAIN_CAPTION                                  :{WHITE}Renomear comboio
-STR_ERROR_CAN_T_RENAME_TRAIN                                    :{WHITE}Não é possível renomear comboio...
-STR_VEHICLE_DETAILS_TRAIN_RENAME                                :{BLACK}Renomear comboio
 STR_NEWS_TRAIN_CRASH                                            :{BLACK}{BIGFONT}Acidente Ferroviário!{}{COMMA} mortos numa explosão após a colisão
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Não é possível inverter a direcção do comboio...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE                  :{WHITE}Impossível inverter a direcção do veículo...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Não é possível virar comboios compostos por unidades múltiplas
-STR_QUERY_RENAME_TRAIN_TYPE_CAPTION                             :{WHITE}Renomear tipo de veículo ferroviário
-STR_ERROR_CAN_T_RENAME_TRAIN_TYPE                               :{WHITE}Não é possível renomear tipo de veículo ferroviário...
 STR_CLEAR_TIME                                                  :{BLACK}Apagar Tempo
 STR_RESET_LATENESS                                              :{BLACK}Apagar Contad. Atraso
 STR_CHANGE_WAYPOINT_NAME                                        :{BLACK}Mudar o nome do ponto de passagem
@@ -2851,45 +2775,14 @@ STR_TIMETABLE_AUTOFILL                                          :{BLACK}Auto pr.
 STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Preencher o horário automáticamente com os valores da próxima viagem (CTRL-click para tentar manter os tempos de espera)
 
 ##id 0x9000
-STR_ERROR_ROAD_VEHICLE_IN_THE_WAY                               :{WHITE}Veículo de estrada no caminho
-STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING} - {COMMA} Veículos de Estrada
-STR_DEPOT_ROAD_VEHICLE_CAPTION                                  :{WHITE}{TOWN} Depósito de Veículos de Estrada
-STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_BUTTON                      :{BLACK}Novos Veículos
-STR_BUILD_VEHICLE_ROAD_VEHICLE_CAPTION                          :{WHITE}Novos Veículos de Estrada
-STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_BUTTON             :{BLACK}Construir Veículo
-STR_ERROR_CAN_T_BUILD_ROAD_VEHICLE                              :{WHITE}Não é possível construir veículo de estrada...
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}...deve estar parado num depósito de veículos de estrada
-STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}Não é possível vender veículo de estrada...
-STR_ERROR_CAN_T_STOP_START_ROAD_VEHICLE                         :{WHITE}Não é possível iniciar/parar veículo de estrada...
-STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} está a aguardar no depósito
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Dirige-se ao depósito de {TOWN}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Dirige-se ao depósito de {TOWN}, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Serviço no depósito de {TOWN}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Serviço no depósito de {TOWN}, {VELOCITY}
-STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Não é possível mandar o veículo para o depósito...
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Não é possível encontrar o depósito local
-STR_VEHICLE_LIST_ROAD_VEHICLE_TOOLTIP                           :{BLACK}Veículos de estrada - clique num veículo para informações
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP          :{BLACK}Tarefa actual do veículo - clique aqui para iniciar/parar veículo
-STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP                    :{BLACK}Mostrar ordens do veículo
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP                  :{BLACK}Centrar visualização na localização do veículo
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}Mandar veículo para o depósito
 STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP                   :{BLACK}Forçar veículo a dar a volta
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Mostrar detalhes do veículo de estrada
-STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Veículos - clique num veículo para informações
-STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}Construir novo veículo de estrada
-STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}Arraste o veículo de estrada para aqui para o vender
-STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}Centrar visualização na localização do depósito de veículos de estrada
-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_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})
 
-STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Renomear veículo de estrada
-STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Não é possível renomear veículo de estrada...
-STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Renomear veículo de estrada
 STR_NEWS_FIRST_BUS_ARRIVAL                                      :{BLACK}{BIGFONT}Cidadãos celebram . . .{}Primeiro autocarro chega a {STATION}!
 STR_NEWS_FIRST_TRUCK_ARRIVAL                                    :{BLACK}{BIGFONT}Cidadãos celebram . . .{}Primeiro camião chega a {STATION}!
 STR_NEWS_FIRST_PASSENGER_TRAM_ARRIVAL                           :{BLACK}{BIGFONT}Cidadãos celebram . . .{}Primeiro eléctrico de passageiros chega a {STATION}!
@@ -2897,132 +2790,39 @@ STR_NEWS_FIRST_CARGO_TRAM_ARRIVAL                               :{BLACK}{BIGFONT
 STR_NEWS_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Acidente de Veículo de Estrada!{}Condutor morre na explosão após a colisão com um comboio
 STR_NEWS_ROAD_VEHICLE_CRASH                                     :{BLACK}{BIGFONT}Acidente de Veículo de Estrada!{}{COMMA} morrem na explosão após a colisão com um comboio
 STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}Impossível fazer o veículo dar a volta...
-STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Renomear
-STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Renomear tipo de veículo de estrada
-STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Renomear tipo de veículo de estrada
-STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Não é possível renomear tipo de veículo de estrada...
 
-STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Reconverter veículo para transportar outro tipo de carga
-STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Reconverter veículo
-STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Reconverter veículo para transportar o tipo de carga seleccionado
-STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Não é possível reconverter veículo
-STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Seleccione o tipo de carga para o veículo
 
 ##id 0x9800
 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :Construção de canais
 STR_WATERWAYS_TOOLBAR_CAPTION                                   :{WHITE}Construção de canais
 STR_WATERWAYS_TOOLBAR_CAPTION_SE                                :{WHITE}Canais
 STR_ERROR_CAN_T_BUILD_DOCK_HERE                                 :{WHITE}Não é possível construir doca aqui...
-STR_DEPOT_SHIP_CAPTION                                          :{WHITE}{TOWN} Depósito Naval
-STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON                              :{BLACK}Novos Barcos
-STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - {COMMA} Barcos
-STR_BUILD_VEHICLE_SHIP_CAPTION                                  :{WHITE}Novos Barcos
-STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON                     :{BLACK}Construir Barco
-STR_CLONE_SHIP                                                  :{BLACK}Clonar Navio
-STR_CLONE_SHIP_INFO                                             :{BLACK}Esta acção criará uma cópia do navio. Pressione Ctrl enquanto clica, para partilhar as ordens
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Esta acção criará uma cópia de um navio. Clique neste botão e, de seguida, num navio que se encontre dentro ou fora do depósito. Pressione Ctrl enquanto clica para partilhar as ordens
 STR_ERROR_SHIP_MUST_BE_STOPPED_IN_DEPOT                         :{WHITE}O barco deverá estar parado no depósito
-STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}Não é possível vender barco...
-STR_ERROR_CAN_T_BUILD_SHIP                                      :{WHITE}Não é possível construir barco...
-STR_ERROR_SHIP_IN_THE_WAY                                       :{WHITE}Barco no caminho
-STR_ERROR_CAN_T_STOP_START_SHIP                                 :{WHITE}Não é possível iniciar/parar barco...
-STR_ERROR_CAN_T_SEND_SHIP_TO_DEPOT                              :{WHITE}Não é possível mandar barco para o depósito...
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Dirige-se ao depósito de {TOWN}
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Dirige-se ao depósito de {TOWN}, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Serviço no depósito de {TOWN}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Serviço no depósito de {TOWN}, {VELOCITY}
-STR_NEWS_SHIP_IS_WAITING                                        :{WHITE}{VEHICLE} está a aguardar no depósito
 STR_WATERWAYS_TOOLBAR_BUILD_DOCK_TOOLTIP                        :{BLACK}Construir doca naval
 STR_WATERWAYS_TOOLBAR_BUILD_DEPOT_TOOLTIP                       :{BLACK}Construir depósito (para criação e manutenção de barcos)
-STR_DEPOT_SHIP_LIST_TOOLTIP                                     :{BLACK}Barcos - clique num barco para informações
-STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}Construir novo barco
-STR_DEPOT_SHIP_SELL_TOOLTIP                                     :{BLACK}Arraste o barco para aqui para o vender
-STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}Centrar visualização na localização do depósito naval
-STR_VEHICLE_LIST_SHIP_TOOLTIP                                   :{BLACK}Barcos - clique num barco para informações
-STR_BUILD_VEHICLE_SHIP_LIST_TOOLTIP                             :{BLACK}Lista de barcos - clique num barco para informações
-STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP                    :{BLACK}Construir barco seleccionado
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP                  :{BLACK}Tarefa actual do barco - clique aqui para iniciar/parar barco
-STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Mostrar ordens do barco
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP                          :{BLACK}Centrar visualização na localização do barco
-STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}Mandar barco para o depósito
-STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Mostrar detalhes do barco
-STR_VEHICLE_DETAILS_SHIP_RENAME                                 :{BLACK}Renomear barco
 
-STR_QUERY_RENAME_SHIP_CAPTION                                   :{WHITE}Renomear barco
-STR_ERROR_CAN_T_RENAME_SHIP                                     :{WHITE}Não é possível renomear barco...
 STR_NEWS_FIRST_SHIP_ARRIVAL                                     :{BLACK}{BIGFONT}Cidadãos celebram . . .{}Primeiro barco chega a {STATION}!
 STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}Bóia de posição, que pode ser usada para marcar pontos de rota adicionais
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}Não é possível posicionar bóia aqui...
 STR_BUILD_AQUEDUCT                                              :{BLACK}Contruir canal
 STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}Não é possível contruir o canal aqui...
-STR_BUILD_VEHICLE_SHIP_RENAME_BUTTON                            :{BLACK}Renomear
-STR_BUILD_VEHICLE_SHIP_RENAME_TOOLTIP                           :{BLACK}Renomear tipo de barco
-STR_QUERY_RENAME_SHIP_TYPE_CAPTION                              :{WHITE}Renomear tipo de barco
-STR_ERROR_CAN_T_RENAME_SHIP_TYPE                                :{WHITE}Não é possível renomear tipo de barco...
-STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}Adaptar barco de mercadorias para um tipo de carga diferente
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (Adaptar)
-STR_REFIT_SHIP_REFIT_BUTTON                                     :{BLACK}Adaptar barco
-STR_REFIT_SHIP_LIST_TOOLTIP                                     :{BLACK}Seleccionar tipo de carga do barco
-STR_REFIT_SHIP_REFIT_TOOLTIP                                    :{BLACK}Adaptar barco para transportar a carga seleccionada
 STR_REFIT_TITLE                                                 :{GOLD}Seleccionar tipo de carga:
 STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}Nova capacidade: {GOLD}{CARGO}{}{BLACK}Custo da adaptação: {GOLD}{CURRENCY}
-STR_ERROR_CAN_T_REFIT_SHIP                                      :{WHITE}Não é possível adaptar barco...
 STR_REFITTABLE                                                  :(adaptável)
 
 ##id 0xA000
 STR_TOOLBAR_AIRCRAFT_CAPTION                                    :{WHITE}Aeroportos
 STR_ERROR_CAN_T_BUILD_AIRPORT_HERE                              :{WHITE}Não é possível construir aeroporto aqui...
-STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}{STATION} Hangar
-STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON                          :{BLACK}Nova Aeronave
-STR_CLONE_AIRCRAFT                                              :{BLACK}Clonar Aeronave
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Esta acção criará uma cópia da aeronave. Pressione Ctrl enquanto clica, para partilhar as ordens
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Esta acção criará uma cópia de uma aeronave. Clique neste botão e, de seguida, numa aeronave que se encontre dentro ou fora do hangar. Pressione Ctrl enquanto clica para partilhar as ordens
-STR_BUILD_VEHICLE_AIRCRAFT_CAPTION                              :{WHITE}Nova Aeronave
-STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON                 :{BLACK}Construir Aeronave
-STR_ERROR_CAN_T_BUILD_AIRCRAFT                                  :{WHITE}Não é possível construir aeronave...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} Aeronaves
-STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR                         :{WHITE}Não é possível mandar aeronave para o hangar...
-STR_HEADING_FOR_HANGAR                                          :{ORANGE}Dirige-se ao hangar de {STATION}
-STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Dirige-se ao hangar de {STATION}, {VELOCITY}
-STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Serviço no hangar de {STATION}
-STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Serviço no hangar de {STATION}, {VELOCITY}
-STR_NEWS_AIRCRAFT_IS_WAITING                                    :{WHITE}{VEHICLE} está a aguardar no hangar
-STR_ERROR_AIRCRAFT_IN_THE_WAY                                   :{WHITE}Aeronave no caminho
-STR_ERROR_CAN_T_STOP_START_AIRCRAFT                             :{WHITE}Não é possível iniciar/parar aeronave...
 STR_ERROR_AIRCRAFT_IS_IN_FLIGHT                                 :{WHITE}Aeronave está em voo
 STR_ERROR_AIRCRAFT_MUST_BE_STOPPED                              :{WHITE}A aeronave deverá estar parada no hangar
-STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}Não é possível vender aeronave...
 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION                          :Construir aeroporto
 STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Construir aeroporto
-STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP                               :{BLACK}Aeronave - clique na aeronave para informações
-STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Aeronave - clique na aeronave para informações
-STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}Construir nova aeronave
-STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}Arraste a aeronave para aqui para a vender
-STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Centrar visualização na localização do hangar
-STR_BUILD_VEHICLE_AIRCRAFT_LIST_TOOLTIP                         :{BLACK}Lista de aeronaves - clique na aeronave para informações
-STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_TOOLTIP                :{BLACK}Construir aeronave seleccionada
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP              :{BLACK}Tarefa actual da aeronave - clique aqui para iniciar/parar a aeronave
-STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Mostrar ordens da aeronave
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP                      :{BLACK}Centrar visualização na localização da aeronave
-STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}Mandar aeronave para o hangar
-STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Mostrar detalhes da aeronave
 
-STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}Renomear aeronave
-STR_ERROR_CAN_T_RENAME_AIRCRAFT                                 :{WHITE}Não é possível renomear aeronave...
-STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}Renomear aeronave
 STR_NEWS_FIRST_AIRCRAFT_ARRIVAL                                 :{BLACK}{BIGFONT}Cidadãos celebram . . .{}Primeira aeronave chega a {STATION}!
 STR_NEWS_AIRCRAFT_CRASH                                         :{BLACK}{BIGFONT}Acidente de Avião!{}{COMMA} morrem na explosão em {STATION}
 STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Desastre de Avião!{}Avião ficou sem combustivél, {COMMA} morreram em incêndiol!
 STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
-STR_BUILD_VEHICLE_AIRCRAFT_RENAME_BUTTON                        :{BLACK}Renomear
-STR_BUILD_VEHICLE_AIRCRAFT_RENAME_TOOLTIP                       :{BLACK}Renomear tipo de aeronave
-STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION                          :{WHITE}Renomear tipo de aeronave
-STR_ERROR_CAN_T_RENAME_AIRCRAFT_TYPE                            :{WHITE}Não é possível renomear tipo de aeronave...
-STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Adaptar aeronave para um tipo de carga diferente
-STR_REFIT_AIRCRAFT_REFIT_BUTTON                                 :{BLACK}Adaptar aeronave
-STR_REFIT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Seleccionar tipo de carga da aeronave
-STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}Converter aeronave para transportar a carga seleccionada
-STR_ERROR_CAN_T_REFIT_AIRCRAFT                                  :{WHITE}Não é possível converter aeronave...
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Horário)
 
@@ -3176,15 +2976,225 @@ STR_LORRY                                                       :{BLACK}{LORRY}
 STR_PLANE                                                       :{BLACK}{PLANE}
 STR_SHIP                                                        :{BLACK}{SHIP}
 
+############ Vehicle lists
+STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP                             :{BLACK}Comboios - clique num comboio para informações
+STR_VEHICLE_LIST_ROAD_VEHICLE_TOOLTIP                           :{BLACK}Veículos de estrada - clique num veículo para informações
+STR_VEHICLE_LIST_SHIP_TOOLTIP                                   :{BLACK}Barcos - clique num barco para informações
+STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP                               :{BLACK}Aeronave - clique na aeronave para informações
 
-STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Mostrar todos os comboios que têm esta estação nas ordens de serviço
-STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Mostrar todos os veículos de estrada que têm esta estação nas ordens de serviço
-STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Mostrar todos os aviões que têm esta estação nas ordens de serviço
-STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Mostrar todos os navios de cujo itinerário esta estação faz parte
+STR_VEHICLE_LIST_TRAIN_CAPTION                                  :{WHITE}{STRING} - {COMMA} Comboios
+STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING} - {COMMA} Veículos de Estrada
+STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - {COMMA} Barcos
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} Aeronaves
 
 STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}Ordens partilhadas de {COMMA} veículo{P "" s}
 STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Mostra todos os veículos que seguem este mesmo trajecto
 
+STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} está a aguardar no depósito
+STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} está a aguardar no depósito
+STR_NEWS_SHIP_IS_WAITING                                        :{WHITE}{VEHICLE} está a aguardar no depósito
+STR_NEWS_AIRCRAFT_IS_WAITING                                    :{WHITE}{VEHICLE} está a aguardar no hangar
+
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Converter comboio
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Reconverter veículo
+STR_REFIT_SHIP_REFIT_BUTTON                                     :{BLACK}Adaptar barco
+STR_REFIT_AIRCRAFT_REFIT_BUTTON                                 :{BLACK}Adaptar aeronave
+
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Converter comboio para transportar a carga seleccionada
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Reconverter veículo para transportar o tipo de carga seleccionado
+STR_REFIT_SHIP_REFIT_TOOLTIP                                    :{BLACK}Adaptar barco para transportar a carga seleccionada
+STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}Converter aeronave para transportar a carga seleccionada
+
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Seleccionar tipo de carga do comboio
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Seleccione o tipo de carga para o veículo
+STR_REFIT_SHIP_LIST_TOOLTIP                                     :{BLACK}Seleccionar tipo de carga do barco
+STR_REFIT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Seleccionar tipo de carga da aeronave
+
+STR_DEPOT_TRAIN_CAPTION                                         :{WHITE}{TOWN} Depósito Ferroviário
+STR_DEPOT_ROAD_VEHICLE_CAPTION                                  :{WHITE}{TOWN} Depósito de Veículos de Estrada
+STR_DEPOT_SHIP_CAPTION                                          :{WHITE}{TOWN} Depósito Naval
+STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}{STATION} Hangar
+
+STR_VEHICLE_DETAILS_TRAIN_RENAME                                :{BLACK}Renomear comboio
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Renomear veículo de estrada
+STR_VEHICLE_DETAILS_SHIP_RENAME                                 :{BLACK}Renomear barco
+STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}Renomear aeronave
+
+STR_QUERY_RENAME_TRAIN_CAPTION                                  :{WHITE}Renomear comboio
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Renomear veículo de estrada
+STR_QUERY_RENAME_SHIP_CAPTION                                   :{WHITE}Renomear barco
+STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}Renomear aeronave
+
+STR_ERROR_TRAIN_IN_THE_WAY                                      :{WHITE}Comboio no caminho
+STR_ERROR_ROAD_VEHICLE_IN_THE_WAY                               :{WHITE}Veículo de estrada no caminho
+STR_ERROR_SHIP_IN_THE_WAY                                       :{WHITE}Barco no caminho
+STR_ERROR_AIRCRAFT_IN_THE_WAY                                   :{WHITE}Aeronave no caminho
+
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Não é possível converter comboio...
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Não é possível reconverter veículo
+STR_ERROR_CAN_T_REFIT_SHIP                                      :{WHITE}Não é possível adaptar barco...
+STR_ERROR_CAN_T_REFIT_AIRCRAFT                                  :{WHITE}Não é possível converter aeronave...
+
+STR_ERROR_CAN_T_RENAME_TRAIN                                    :{WHITE}Não é possível renomear comboio...
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Não é possível renomear veículo de estrada...
+STR_ERROR_CAN_T_RENAME_SHIP                                     :{WHITE}Não é possível renomear barco...
+STR_ERROR_CAN_T_RENAME_AIRCRAFT                                 :{WHITE}Não é possível renomear aeronave...
+
+STR_ERROR_CAN_T_STOP_START_TRAIN                                :{WHITE}Não é possível iniciar/parar comboio...
+STR_ERROR_CAN_T_STOP_START_ROAD_VEHICLE                         :{WHITE}Não é possível iniciar/parar veículo de estrada...
+STR_ERROR_CAN_T_STOP_START_SHIP                                 :{WHITE}Não é possível iniciar/parar barco...
+STR_ERROR_CAN_T_STOP_START_AIRCRAFT                             :{WHITE}Não é possível iniciar/parar aeronave...
+
+STR_ERROR_CAN_T_SEND_TRAIN_TO_DEPOT                             :{WHITE}Não é possível mandar o comboio para o depósito...
+STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Não é possível mandar o veículo para o depósito...
+STR_ERROR_CAN_T_SEND_SHIP_TO_DEPOT                              :{WHITE}Não é possível mandar barco para o depósito...
+STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR                         :{WHITE}Não é possível mandar aeronave para o hangar...
+
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Não é possível construir veículo ferroviário...
+STR_ERROR_CAN_T_BUILD_ROAD_VEHICLE                              :{WHITE}Não é possível construir veículo de estrada...
+STR_ERROR_CAN_T_BUILD_SHIP                                      :{WHITE}Não é possível construir barco...
+STR_ERROR_CAN_T_BUILD_AIRCRAFT                                  :{WHITE}Não é possível construir aeronave...
+
+STR_ERROR_CAN_T_RENAME_TRAIN_TYPE                               :{WHITE}Não é possível renomear tipo de veículo ferroviário...
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Não é possível renomear tipo de veículo de estrada...
+STR_ERROR_CAN_T_RENAME_SHIP_TYPE                                :{WHITE}Não é possível renomear tipo de barco...
+STR_ERROR_CAN_T_RENAME_AIRCRAFT_TYPE                            :{WHITE}Não é possível renomear tipo de aeronave...
+
+STR_ERROR_CAN_T_SELL_TRAIN                                      :{WHITE}Não é possível vender veículo ferroviário...
+STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}Não é possível vender veículo de estrada...
+STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}Não é possível vender barco...
+STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}Não é possível vender aeronave...
+
+STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP                 :{BLACK}Tarefa actual do comboio - clique aqui para iniciar/parar comboio
+STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP          :{BLACK}Tarefa actual do veículo - clique aqui para iniciar/parar veículo
+STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP                  :{BLACK}Tarefa actual do barco - clique aqui para iniciar/parar barco
+STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP              :{BLACK}Tarefa actual da aeronave - clique aqui para iniciar/parar a aeronave
+
+STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP                           :{BLACK}Mostrar ordens do comboio
+STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP                    :{BLACK}Mostrar ordens do veículo
+STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Mostrar ordens do barco
+STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Mostrar ordens da aeronave
+
+STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP                         :{BLACK}Centrar visualização na localização do comboio
+STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP                  :{BLACK}Centrar visualização na localização do veículo
+STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP                          :{BLACK}Centrar visualização na localização do barco
+STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP                      :{BLACK}Centrar visualização na localização da aeronave
+
+STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP                    :{BLACK}Mandar comboio para o depósito
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}Mandar veículo para o depósito
+STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}Mandar barco para o depósito
+STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}Mandar aeronave para o hangar
+
+STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Mostrar detalhes do comboio
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Mostrar detalhes do veículo de estrada
+STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Mostrar detalhes do barco
+STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Mostrar detalhes da aeronave
+
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Converter comboio para um tipo de carga diferente
+STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Reconverter veículo para transportar outro tipo de carga
+STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}Adaptar barco de mercadorias para um tipo de carga diferente
+STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Adaptar aeronave para um tipo de carga diferente
+
+STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Dirige-se ao depósito de {TOWN}
+STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Dirige-se ao depósito de {TOWN}, {VELOCITY}
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Dirige-se ao depósito de {TOWN}
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Dirige-se ao depósito de {TOWN}, {VELOCITY}
+STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Dirige-se ao depósito de {TOWN}
+STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Dirige-se ao depósito de {TOWN}, {VELOCITY}
+STR_HEADING_FOR_HANGAR                                          :{ORANGE}Dirige-se ao hangar de {STATION}
+STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Dirige-se ao hangar de {STATION}, {VELOCITY}
+
+STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Serviço no depósito de {TOWN}
+STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Serviço no depósito de {TOWN}, {VELOCITY}
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Serviço no depósito de {TOWN}
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Serviço no depósito de {TOWN}, {VELOCITY}
+STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Serviço no depósito de {TOWN}
+STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Serviço no depósito de {TOWN}, {VELOCITY}
+STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Serviço no hangar de {STATION}
+STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Serviço no hangar de {STATION}, {VELOCITY}
+
+
+STR_CLONE_TRAIN                                                 :{BLACK}Clonar Comboio
+STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Clonar Veículo
+STR_CLONE_SHIP                                                  :{BLACK}Clonar Navio
+STR_CLONE_AIRCRAFT                                              :{BLACK}Clonar Aeronave
+
+STR_CLONE_TRAIN_INFO                                            :{BLACK}Esta acção criará uma cópia do comboio, incluindo as carruagens. Pressione Ctrl enquanto clica para partilhar as ordens
+STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Esta acção criará uma cópia do veículo. Pressione Ctrl enquanto clica, para partilhar as ordens
+STR_CLONE_SHIP_INFO                                             :{BLACK}Esta acção criará uma cópia do navio. Pressione Ctrl enquanto clica, para partilhar as ordens
+STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Esta acção criará uma cópia da aeronave. Pressione Ctrl enquanto clica, para partilhar as ordens
+
+STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Esta acção criará uma cópia de um comboio, incluindo as carruagens. Clique neste botão e, de seguida, num comboio que se encontre dentro ou fora do depósito. Pressione Ctrl enquanto clica para partilhar as ordens
+STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Esta acção criará uma cópia de um veículo. Clique neste botão e, de seguida, num veículo que se encontre dentro ou fora do depósito. Pressione Ctrl enquanto clica para partilhar as ordens
+STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Esta acção criará uma cópia de um navio. Clique neste botão e, de seguida, num navio que se encontre dentro ou fora do depósito. Pressione Ctrl enquanto clica para partilhar as ordens
+STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Esta acção criará uma cópia de uma aeronave. Clique neste botão e, de seguida, numa aeronave que se encontre dentro ou fora do hangar. Pressione Ctrl enquanto clica para partilhar as ordens
+
+STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}Novos Veículos Ferroviários
+STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}Novos comboios para carris electrificados
+STR_BUILD_VEHICLE_TRAIN_MONORAIL_CAPTION                        :{WHITE}Novos Veículos Monocarril
+STR_BUILD_VEHICLE_TRAIN_MAGLEV_CAPTION                          :{WHITE}Novos Veículos Maglev
+
+STR_BUILD_VEHICLE_TRAIN_ALL_CAPTION                             :{WHITE}Veículos sobre carris
+STR_BUILD_VEHICLE_ROAD_VEHICLE_CAPTION                          :{WHITE}Novos Veículos de Estrada
+STR_BUILD_VEHICLE_SHIP_CAPTION                                  :{WHITE}Novos Barcos
+STR_BUILD_VEHICLE_AIRCRAFT_CAPTION                              :{WHITE}Nova Aeronave
+
+STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_BUTTON                    :{BLACK}Construir Veículo
+STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_BUTTON             :{BLACK}Construir Veículo
+STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON                     :{BLACK}Construir Barco
+STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON                 :{BLACK}Construir Aeronave
+
+STR_BUILD_VEHICLE_TRAIN_LIST_TOOLTIP                            :{BLACK}Lista de veículos ferroviários - clique num veículo para informações
+STR_BUILD_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP                     :{BLACK}Lista de veículos de estrada - clique num veículo para informações
+STR_BUILD_VEHICLE_SHIP_LIST_TOOLTIP                             :{BLACK}Lista de barcos - clique num barco para informações
+STR_BUILD_VEHICLE_AIRCRAFT_LIST_TOOLTIP                         :{BLACK}Lista de aeronaves - clique na aeronave para informações
+
+STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_TOOLTIP                   :{BLACK}Construir o veículo ferroviário seleccionado
+STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_TOOLTIP            :{BLACK}Construir o veículo de estrada seleccionado
+STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP                    :{BLACK}Construir barco seleccionado
+STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_TOOLTIP                :{BLACK}Construir aeronave seleccionada
+
+STR_BUILD_VEHICLE_TRAIN_RENAME_BUTTON                           :{BLACK}Renomear
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Renomear
+STR_BUILD_VEHICLE_SHIP_RENAME_BUTTON                            :{BLACK}Renomear
+STR_BUILD_VEHICLE_AIRCRAFT_RENAME_BUTTON                        :{BLACK}Renomear
+
+STR_BUILD_VEHICLE_TRAIN_RENAME_TOOLTIP                          :{BLACK}Renomear tipo de veículo ferroviário
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Renomear tipo de veículo de estrada
+STR_BUILD_VEHICLE_SHIP_RENAME_TOOLTIP                           :{BLACK}Renomear tipo de barco
+STR_BUILD_VEHICLE_AIRCRAFT_RENAME_TOOLTIP                       :{BLACK}Renomear tipo de aeronave
+
+STR_QUERY_RENAME_TRAIN_TYPE_CAPTION                             :{WHITE}Renomear tipo de veículo ferroviário
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Renomear tipo de veículo de estrada
+STR_QUERY_RENAME_SHIP_TYPE_CAPTION                              :{WHITE}Renomear tipo de barco
+STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION                          :{WHITE}Renomear tipo de aeronave
+
+STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Novos Veículos
+STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_BUTTON                      :{BLACK}Novos Veículos
+STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON                              :{BLACK}Novos Barcos
+STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON                          :{BLACK}Nova Aeronave
+
+STR_DEPOT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Comboios - clique num comboio para informações, arraste um veículo para o adicionar/remover ao comboio
+STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Veículos - clique num veículo para informações
+STR_DEPOT_SHIP_LIST_TOOLTIP                                     :{BLACK}Barcos - clique num barco para informações
+STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Aeronave - clique na aeronave para informações
+
+STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP                            :{BLACK}Construir novo veículo ferroviário
+STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}Construir novo veículo de estrada
+STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}Construir novo barco
+STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}Construir nova aeronave
+
+STR_DEPOT_TRAIN_SELL_TOOLTIP                                    :{BLACK}Arraste o veículo ferroviário para aqui para o vender
+STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}Arraste o veículo de estrada para aqui para o vender
+STR_DEPOT_SHIP_SELL_TOOLTIP                                     :{BLACK}Arraste o barco para aqui para o vender
+STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}Arraste a aeronave para aqui para a vender
+
+STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}Centrar visualização na localização de um depósito ferroviário
+STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}Centrar visualização na localização do depósito de veículos de estrada
+STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}Centrar visualização na localização do depósito naval
+STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Centrar visualização na localização do hangar
+
+
 ### depot strings
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}Está prestes a vender todos os veículos no depósito. Tem a certeza?
 STR_DEPOT_WRONG_DEPOT_TYPE                                      :Tipo de depósito errado
@@ -3204,7 +3214,6 @@ STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TIP                          :{BLACK}Autosubs
 STR_DEPOT_AUTOREPLACE_SHIP_TIP                                  :{BLACK}Autosubstituir todos os barcos no depósito
 STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP                              :{BLACK}Autosubstituir todas as aeronaves no depósito
 
-
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Substituir {STRING}
 STR_REPLACE_VEHICLES_START                                      :{BLACK}Iniciar Subst. de Veículos
 STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Parar Subst. de Veículos
@@ -3220,6 +3229,7 @@ STR_REPLACE_REMOVE_WAGON                                        :{BLACK}Remover
 STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Forçar a substituição automática a manter o comprimento do comboio, removendo vagões (do início), nas situações em que a substituição da locomotiva resultar num comboio maior.
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}Trocando: {ORANGE}{SKIP}{SKIP}{STRING}
 STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}Alternar entre a janela de substituição de locomotivas e a janela de substituição de vagões
+
 STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Veículo não está disponível
 STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Veículo não está disponível
 STR_SHIP_NOT_AVAILABLE                                          :{WHITE}Barco não está disponível
@@ -3370,17 +3380,6 @@ STR_MEASURE_AREA                                                :{BLACK}Área: {
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Comprimento: {NUM}{}Diferença de altura: {NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Área: {NUM} x {NUM}{}Diferença de altura: {NUM} m
 
-############ Date formatting
-STR_FORMAT_DATE_TINY                                            :{STRING}-{STRING}-{NUM}
-STR_FORMAT_DATE_SHORT                                           :{STRING} {NUM}
-STR_FORMAT_DATE_LONG                                            :{STRING} {STRING} {NUM}
-STR_FORMAT_DATE_ISO                                             :{2:NUM}-{1:STRING}-{0:STRING}
-
-STR_JUST_DATE_TINY                                              :{DATE_TINY}
-STR_JUST_DATE_LONG                                              :{DATE_LONG}
-STR_JUST_DATE_ISO                                               :{DATE_ISO}
-########
-
 STR_FEEDER_CARGO_VALUE                                          :{BLACK}Créditos de Transferência: {LTBLUE}{CURRENCY}
 STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD                            :{WHITE}...esta estrada é detida pela cidade
 STR_DRIVE_THROUGH_ERROR_DIRECTION                               :{WHITE}...estrada orientada na direcção incorrecta
@@ -3405,7 +3404,6 @@ STR_PERCENT_UP_DOWN_SMALL                                       :{TINYFONT}{WHIT
 STR_PERCENT_UP_DOWN                                             :{WHITE}{NUM}%{UPARROW}{DOWNARROW}
 
 ##### Mass Order
-STR_FORMAT_GROUP_NAME                                           :Grupo {COMMA}
 STR_GROUP_TINY_NAME                                             :{TINYFONT}{GROUP}
 STR_GROUP_ALL_TRAINS                                            :Todos os Comboios
 STR_GROUP_ALL_ROAD_VEHICLES                                     :Todos os veículos de estrada
@@ -3434,12 +3432,62 @@ STR_GROUP_DELETE_TIP                                            :{BLACK}Remover
 STR_GROUP_RENAME_TIP                                            :{BLACK}Mudar o nome do grupo seleccionado
 STR_GROUP_REPLACE_PROTECTION_TIP                                :{BLACK}Clique para proteger este grupo da autosubstituição global
 
+#### String control codes and their formatting
 STR_COMPANY_NAME                                                :{COMPANY}
 STR_ENGINE_NAME                                                 :{ENGINE}
 STR_GROUP_NAME                                                  :{GROUP}
+STR_INDUSTRY_NAME                                               :{INDUSTRY}
 STR_PRESIDENT_NAME                                              :{PRESIDENTNAME}
 STR_SIGN_NAME                                                   :{SIGN}
+STR_STATION_NAME                                                :{STATION}
+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_LONG                                              :{DATE_LONG}
+STR_JUST_DATE_ISO                                               :{DATE_ISO}
+STR_JUST_STRING                                                 :{STRING}
+STR_JUST_RAW_STRING                                             :{STRING}
+
+STR_FORMAT_DATE_TINY                                            :{STRING}-{STRING}-{NUM}
+STR_FORMAT_DATE_SHORT                                           :{STRING} {NUM}
+STR_FORMAT_DATE_LONG                                            :{STRING} {STRING} {NUM}
+STR_FORMAT_DATE_ISO                                             :{2:NUM}-{1:STRING}-{0:STRING}
+
+STR_FORMAT_COMPANY_NUM                                          :(Empresa {COMMA})
+STR_FORMAT_GROUP_NAME                                           :Grupo {COMMA}
+STR_FORMAT_INDUSTRY_NAME                                        :{1:STRING} de {0:TOWN}
+
+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}Nome deve ser único
 
diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt
index 8d9d80b34..b842a432f 100644
--- a/src/lang/romanian.txt
+++ b/src/lang/romanian.txt
@@ -154,8 +154,6 @@ STR_ABBREV_PLASTIC                                              :{TINYFONT}PL
 STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}SC
 STR_ABBREV_NONE                                                 :{TINYFONT}NU
 STR_ABBREV_ALL                                                  :{TINYFONT}TOT
-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
@@ -167,17 +165,11 @@ STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Copyrigh
 STR_ABOUT_VERSION                                               :{BLACK}OpenTTD versiunea {REV}
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 Echipa OpenTTD
 
-STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
-STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_QUIT_CAPTION                                                :{WHITE}Ieşire din joc
 STR_YES                                                         :{BLACK}Da
 STR_NO                                                          :{BLACK}Nu
 STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Eşti sigur că vrei să abandonezi jocul curent şi să revii în {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                                                :nimic
 STR_COLOUR_DARK_BLUE                                            :Albastru închis
 STR_COLOUR_PALE_GREEN                                           :Verde pal
@@ -196,8 +188,6 @@ STR_COLOUR_BROWN                                                :Maro
 STR_COLOUR_GREY                                                 :Gri
 STR_COLOUR_WHITE                                                :Alb
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}Prea multe vehicule în joc
-STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
-STR_RED_COMMA                                                   :{RED}{COMMA}
 STR_BUTTON_LOCATION                                             :{BLACK}Locatie
 STR_SMALLMAP_TYPE_CONTOURS                                      :Relief
 STR_SMALLMAP_TYPE_VEHICLES                                      :Vehicule
@@ -323,12 +313,13 @@ STR_SORT_CRITERIA_TIP                                           :{BLACK}Alege cr
 STR_FILTER_CRITERIA_TIP                                         :{BLACK}Selectează criteriul de filtrare
 STR_SORT_BY                                                     :{BLACK}Ordonează
 
+### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}Populatia
+STR_SORT_BY_NAME                                                :{BLACK}Nume
+STR_SORT_BY_DATE                                                :{BLACK}Datã
 STR_SORT_BY_PRODUCTION                                          :Productie
 STR_SORT_BY_TYPE                                                :Tip
 STR_SORT_BY_TRANSPORTED                                         :Transportat
-STR_SORT_BY_NAME                                                :{BLACK}Nume
-STR_SORT_BY_DATE                                                :{BLACK}Datã
 STR_SORT_BY_NUMBER                                              :Numar
 STR_SORT_BY_PROFIT_LAST_YEAR                                    :Profit anul trecut
 STR_SORT_BY_PROFIT_THIS_YEAR                                    :Profit anul acesta
@@ -351,6 +342,7 @@ STR_SORT_BY_INTRO_DATE                                          :Data lansarii
 STR_SORT_BY_RUNNING_COST                                        :Cost exploatare
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :Cost exploatare/putere
 STR_SORT_BY_CARGO_CAPACITY                                      :Capacitate incarcatura
+
 STR_NO_WAITING_CARGO                                            :{BLACK}Nu este nici un fel de încărcătură în aşteptare
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}Alege toate facilităţile
 STR_SELECT_ALL_TYPES                                            :{BLACK}Alege toate tipurile de încãrcãturi (inclusiv încãrcãturile care nu sunt în asteptare)
@@ -370,21 +362,6 @@ STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Trimite la depo
 STR_SEND_SHIP_TO_DEPOT                                          :Trimite la depou
 STR_SEND_AIRCRAFT_TO_HANGAR                                     :Trimite la hangar
 
-############ range for months starts
-STR_MONTH_ABBREV_JAN                                            :Ian
-STR_MONTH_ABBREV_FEB                                            :Feb
-STR_MONTH_ABBREV_MAR                                            :Mar
-STR_MONTH_ABBREV_APR                                            :Apr
-STR_MONTH_ABBREV_MAY                                            :Mai
-STR_MONTH_ABBREV_JUN                                            :Iun
-STR_MONTH_ABBREV_JUL                                            :Iul
-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}{STRING}-
@@ -411,8 +388,6 @@ 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_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
@@ -459,7 +434,7 @@ STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :nici una
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Nume
 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                                          :1
 STR_ORDINAL_NUMBER_2ND                                          :2
 STR_ORDINAL_NUMBER_3RD                                          :3
@@ -493,6 +468,34 @@ STR_ORDINAL_NUMBER_30TH                                         :30
 STR_ORDINAL_NUMBER_31ST                                         :31
 ############ range for days ends
 
+############ range for months starts
+STR_MONTH_ABBREV_JAN                                            :Ian
+STR_MONTH_ABBREV_FEB                                            :Feb
+STR_MONTH_ABBREV_MAR                                            :Mar
+STR_MONTH_ABBREV_APR                                            :Apr
+STR_MONTH_ABBREV_MAY                                            :Mai
+STR_MONTH_ABBREV_JUN                                            :Iun
+STR_MONTH_ABBREV_JUL                                            :Iul
+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                                                   :ianuarie
+STR_MONTH_FEB                                                   :februarie
+STR_MONTH_MAR                                                   :martie
+STR_MONTH_APR                                                   :aprilie
+STR_MONTH_MAY                                                   :mai
+STR_MONTH_JUN                                                   :iunie
+STR_MONTH_JUL                                                   :iulie
+STR_MONTH_AUG                                                   :august
+STR_MONTH_SEP                                                   :septembrie
+STR_MONTH_OCT                                                   :octombrie
+STR_MONTH_NOV                                                   :noiembrie
+STR_MONTH_DEC                                                   :decembrie
+############ range for months ends
+
 STR_GRAPH_Y_LABEL_NUMBER                                        :{TINYFONT}{COMMA}
 
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}Încărcături acceptate: {LTBLUE}
@@ -582,12 +585,9 @@ 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_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_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
@@ -669,9 +669,7 @@ STR_OFF                                                         :Oprit
 STR_SUMMARY                                                     :Pe scurt
 STR_FULL                                                        :Pe larg
 STR_STATUSBAR_COMPANY_NAME                                      :{SILVER}- -  {COMPANY}  - -
-STR_BLACK_STRING                                                :{BLACK}{STRING}
 
-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
@@ -776,9 +774,6 @@ 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_BLACK_6                                                     :{BLACK}6
-STR_BLACK_7                                                     :{BLACK}7
-
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Engleza (Original)
 STR_TOWNNAME_FRENCH                                             :Franceza
@@ -858,19 +853,6 @@ STR_OPTIONS_BASE_GRF_DESCRIPTION_TIP                            :{BLACK}Informa�
 
 STR_AUTOSAVE_FAILED                                             :{WHITE}Auto-salvarea a esuat
 
-STR_MONTH_JAN                                                   :ianuarie
-STR_MONTH_FEB                                                   :februarie
-STR_MONTH_MAR                                                   :martie
-STR_MONTH_APR                                                   :aprilie
-STR_MONTH_MAY                                                   :mai
-STR_MONTH_JUN                                                   :iunie
-STR_MONTH_JUL                                                   :iulie
-STR_MONTH_AUG                                                   :august
-STR_MONTH_SEP                                                   :septembrie
-STR_MONTH_OCT                                                   :octombrie
-STR_MONTH_NOV                                                   :noiembrie
-STR_MONTH_DEC                                                   :decembrie
-
 STR_HEADING_FOR_STATION                                         :{LTBLUE}Spre {STATION}
 STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}Spre {STATION}, {VELOCITY}
 STR_NO_ORDERS                                                   :{LTBLUE}Fără comenzi
@@ -885,8 +867,6 @@ STR_CRATES                                                      :pachete
 STR_RES_OTHER                                                   :(alta/nespecificată)
 STR_NOTHING                                                     :
 
-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...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Sfârşitul comenzilor sincronizate - -
@@ -1158,7 +1138,6 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Marimea
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :dezactivat
-STR_JUST_CURRENCY                                               :{CURRENCY}
 STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Schimbă valoarea setării
 
 STR_TEMPERATE_LANDSCAPE                                         :peisajul temperat
@@ -2124,8 +2103,6 @@ STR_NUM_LOW                                                     :scăzut
 STR_NUM_NORMAL                                                  :normal
 STR_NUM_HIGH                                                    :ridicat
 STR_NUM_CUSTOM                                                  :Propriu
-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
@@ -2806,7 +2783,6 @@ 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_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})
@@ -3472,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}
@@ -3490,6 +3469,31 @@ STR_FORMAT_COMPANY_NUM                                          :(Companie {COMM
 STR_FORMAT_GROUP_NAME                                           :Grup {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}Numele trebuie să fie unic
 
 #### Improved sign GUI
@@ -3607,6 +3611,7 @@ STR_AI_AUTHOR                                                   :{BLACK}Autor: {
 STR_AI_VERSION                                                  :{BLACK}Versiune: {NUM}
 STR_AI_URL                                                      :{BLACK}URL: {STRING}
 STR_AI_PLEASE_REPORT_CRASH                                      :{WHITE}O Inteligentă Artificială s-a oprit în mod eronat. Raportează această problemă autorului împreună cu o captură de ecran a ferestrei Depanare IA
+STR_AI_NO_AI_FOUND                                              :Nici o IA potrivită a fost găsită{}Această IA este nefuncţională.{}Poţi descărca IA-uri folsind opţiunea "Resurse online" din meniul principal.
 ########
 
 ############ town controlled noise level
diff --git a/src/lang/russian.txt b/src/lang/russian.txt
index 28b9d1df6..48959e431 100644
--- a/src/lang/russian.txt
+++ b/src/lang/russian.txt
@@ -280,8 +280,6 @@ STR_ABBREV_PLASTIC                                              :{TINYFONT}ПЛ
 STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}ГЗ
 STR_ABBREV_NONE                                                 :{TINYFONT}НЕТ
 STR_ABBREV_ALL                                                  :{TINYFONT}Все
-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}Сообщение
@@ -293,17 +291,11 @@ STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Ориг
 STR_ABOUT_VERSION                                               :{BLACK}OpenTTD v{REV}
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 Команда разработчиков OpenTTD
 
-STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
-STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_QUIT_CAPTION                                                :{WHITE}Выход
 STR_YES                                                         :{BLACK}Да
 STR_NO                                                          :{BLACK}Нет
 STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Вы уверены, что хотите прервать игру и вернуться в {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                                                :Ничего
 STR_COLOUR_DARK_BLUE                                            :Тёмно-синий
 STR_COLOUR_PALE_GREEN                                           :Светло-зелёный
@@ -322,8 +314,6 @@ STR_COLOUR_BROWN                                                :Коричне�
 STR_COLOUR_GREY                                                 :Серый
 STR_COLOUR_WHITE                                                :Белый
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}Слишком много транспорта в игре
-STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
-STR_RED_COMMA                                                   :{RED}{COMMA}
 STR_BUTTON_LOCATION                                             :{BLACK}Обзор
 STR_SMALLMAP_TYPE_CONTOURS                                      :Рельеф
 STR_SMALLMAP_TYPE_VEHICLES                                      :Транспорт
@@ -449,12 +439,13 @@ STR_SORT_CRITERIA_TIP                                           :{BLACK}Смен
 STR_FILTER_CRITERIA_TIP                                         :{BLACK}Выберите фильтр
 STR_SORT_BY                                                     :{BLACK}Сортировка
 
+### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}Население
+STR_SORT_BY_NAME                                                :{BLACK}Имя
+STR_SORT_BY_DATE                                                :{BLACK}Дата
 STR_SORT_BY_PRODUCTION                                          :Продукция
 STR_SORT_BY_TYPE                                                :Тип
 STR_SORT_BY_TRANSPORTED                                         :Вывоз
-STR_SORT_BY_NAME                                                :{BLACK}Имя
-STR_SORT_BY_DATE                                                :{BLACK}Дата
 STR_SORT_BY_NUMBER                                              :Номер
 STR_SORT_BY_PROFIT_LAST_YEAR                                    :Прибыль в прошлом году
 STR_SORT_BY_PROFIT_THIS_YEAR                                    :Прибыль в этом году
@@ -477,6 +468,7 @@ STR_SORT_BY_INTRO_DATE                                          :Время на
 STR_SORT_BY_RUNNING_COST                                        :Стоимость обслуживания
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :Мощность/стоимость обслуж.
 STR_SORT_BY_CARGO_CAPACITY                                      :Вместимость
+
 STR_NO_WAITING_CARGO                                            :{BLACK}На станции нет грузов, ожидающих погрузки
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}Показать все станции
 STR_SELECT_ALL_TYPES                                            :{BLACK}Выбрать все типы грузов
@@ -496,33 +488,6 @@ STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Послать
 STR_SEND_SHIP_TO_DEPOT                                          :Послать в док
 STR_SEND_AIRCRAFT_TO_HANGAR                                     :Послать в ангар
 
-############ range for months starts
-STR_MONTH_ABBREV_JAN                                            :Янв
-STR_MONTH_ABBREV_JAN.gen                                        :янв
-STR_MONTH_ABBREV_FEB                                            :Фев
-STR_MONTH_ABBREV_FEB.gen                                        :фев
-STR_MONTH_ABBREV_MAR                                            :Мар
-STR_MONTH_ABBREV_MAR.gen                                        :мар
-STR_MONTH_ABBREV_APR                                            :Апр
-STR_MONTH_ABBREV_APR.gen                                        :апр
-STR_MONTH_ABBREV_MAY                                            :Май
-STR_MONTH_ABBREV_MAY.gen                                        :мая
-STR_MONTH_ABBREV_JUN                                            :Июн
-STR_MONTH_ABBREV_JUN.gen                                        :июн
-STR_MONTH_ABBREV_JUL                                            :Июл
-STR_MONTH_ABBREV_JUL.gen                                        :июл
-STR_MONTH_ABBREV_AUG                                            :Авг
-STR_MONTH_ABBREV_AUG.gen                                        :авг
-STR_MONTH_ABBREV_SEP                                            :Сен
-STR_MONTH_ABBREV_SEP.gen                                        :сен
-STR_MONTH_ABBREV_OCT                                            :Окт
-STR_MONTH_ABBREV_OCT.gen                                        :окт
-STR_MONTH_ABBREV_NOV                                            :Ноя
-STR_MONTH_ABBREV_NOV.gen                                        :ноя
-STR_MONTH_ABBREV_DEC                                            :Дек
-STR_MONTH_ABBREV_DEC.gen                                        :дек
-############ 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}{STRING}-
@@ -549,8 +514,6 @@ 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_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}Заголовок окна - для перемещения окна тащить за него
@@ -601,7 +564,7 @@ STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Нет
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Имя
 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                                          :1-е
 STR_ORDINAL_NUMBER_2ND                                          :2-е
 STR_ORDINAL_NUMBER_3RD                                          :3-е
@@ -635,6 +598,46 @@ STR_ORDINAL_NUMBER_30TH                                         :30-е
 STR_ORDINAL_NUMBER_31ST                                         :31-е
 ############ range for days ends
 
+############ range for months starts
+STR_MONTH_ABBREV_JAN                                            :Янв
+STR_MONTH_ABBREV_JAN.gen                                        :янв
+STR_MONTH_ABBREV_FEB                                            :Фев
+STR_MONTH_ABBREV_FEB.gen                                        :фев
+STR_MONTH_ABBREV_MAR                                            :Мар
+STR_MONTH_ABBREV_MAR.gen                                        :мар
+STR_MONTH_ABBREV_APR                                            :Апр
+STR_MONTH_ABBREV_APR.gen                                        :апр
+STR_MONTH_ABBREV_MAY                                            :Май
+STR_MONTH_ABBREV_MAY.gen                                        :мая
+STR_MONTH_ABBREV_JUN                                            :Июн
+STR_MONTH_ABBREV_JUN.gen                                        :июн
+STR_MONTH_ABBREV_JUL                                            :Июл
+STR_MONTH_ABBREV_JUL.gen                                        :июл
+STR_MONTH_ABBREV_AUG                                            :Авг
+STR_MONTH_ABBREV_AUG.gen                                        :авг
+STR_MONTH_ABBREV_SEP                                            :Сен
+STR_MONTH_ABBREV_SEP.gen                                        :сен
+STR_MONTH_ABBREV_OCT                                            :Окт
+STR_MONTH_ABBREV_OCT.gen                                        :окт
+STR_MONTH_ABBREV_NOV                                            :Ноя
+STR_MONTH_ABBREV_NOV.gen                                        :ноя
+STR_MONTH_ABBREV_DEC                                            :Дек
+STR_MONTH_ABBREV_DEC.gen                                        :дек
+
+STR_MONTH_JAN                                                   :Январь
+STR_MONTH_FEB                                                   :Февраль
+STR_MONTH_MAR                                                   :Март
+STR_MONTH_APR                                                   :Апрель
+STR_MONTH_MAY                                                   :Май
+STR_MONTH_JUN                                                   :Июнь
+STR_MONTH_JUL                                                   :Июль
+STR_MONTH_AUG                                                   :Август
+STR_MONTH_SEP                                                   :Сентябрь
+STR_MONTH_OCT                                                   :Октябрь
+STR_MONTH_NOV                                                   :Ноябрь
+STR_MONTH_DEC                                                   :Декабрь
+############ range for months ends
+
 STR_GRAPH_Y_LABEL_NUMBER                                        :{TINYFONT}{COMMA}
 
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}Принимает: {LTBLUE}
@@ -731,12 +734,9 @@ 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_COMMA                                                  :{BLUE}{COMMA}
 STR_SCENEDIT_TOOLBAR_OPENTTD                                    :{YELLOW}OpenTTD
 STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR                            :{YELLOW}Редактор сценариев
 STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION                   :{WHITE}Генератор карты
-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}Создать случайную карту
@@ -818,9 +818,7 @@ STR_OFF                                                         :Выкл
 STR_SUMMARY                                                     :Кратко
 STR_FULL                                                        :Полно
 STR_STATUSBAR_COMPANY_NAME                                      :{SILVER}- -  {COMPANY}  - -
-STR_BLACK_STRING                                                :{BLACK}{STRING}
 
-STR_JUST_CHECKMARK                                              :{CHECKMARK}
 ############ range for menu starts
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Настройки игры
 STR_SETTINGS_MENU_DIFFICULTY_SETTINGS                           :Настройки сложности
@@ -925,9 +923,6 @@ STR_STATUSBAR_SAVING_GAME                                       :{RED}*  *  СО
 STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Идёт сохранение,{}пожалуйста, дождитесь завершения!
 STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE                       :{BLACK}Выбрать музыкальную программу
 
-STR_BLACK_6                                                     :{BLACK}6
-STR_BLACK_7                                                     :{BLACK}7
-
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Английские
 STR_TOWNNAME_FRENCH                                             :Французские
@@ -1007,19 +1002,6 @@ STR_OPTIONS_BASE_GRF_DESCRIPTION_TIP                            :{BLACK}Допо
 
 STR_AUTOSAVE_FAILED                                             :{WHITE}Ошибка автосохранения
 
-STR_MONTH_JAN                                                   :Январь
-STR_MONTH_FEB                                                   :Февраль
-STR_MONTH_MAR                                                   :Март
-STR_MONTH_APR                                                   :Апрель
-STR_MONTH_MAY                                                   :Май
-STR_MONTH_JUN                                                   :Июнь
-STR_MONTH_JUL                                                   :Июль
-STR_MONTH_AUG                                                   :Август
-STR_MONTH_SEP                                                   :Сентябрь
-STR_MONTH_OCT                                                   :Октябрь
-STR_MONTH_NOV                                                   :Ноябрь
-STR_MONTH_DEC                                                   :Декабрь
-
 STR_HEADING_FOR_STATION                                         :{LTBLUE}Идёт к {STATION}
 STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}Идёт к {STATION}; {VELOCITY}
 STR_NO_ORDERS                                                   :{LTBLUE}Нет заданий
@@ -1034,8 +1016,6 @@ STR_CRATES                                                      :мешков
 STR_RES_OTHER                                                   :Другое
 STR_NOTHING                                                     :
 
-STR_TINY_RIGHT_ARROW                                            :{TINYFONT}{RIGHTARROW}
-
 STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}Невозможно использовать общий список заданий
 STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Невозможно скопировать список заданий
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Конец общих заданий - -
@@ -1307,7 +1287,6 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Вер�
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :отключено
-STR_JUST_CURRENCY                                               :{CURRENCY}
 STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Изменить значение
 
 STR_TEMPERATE_LANDSCAPE                                         :Умеренный ландшафт
@@ -2277,8 +2256,6 @@ STR_NUM_LOW                                                     :Малое
 STR_NUM_NORMAL                                                  :Среднее
 STR_NUM_HIGH                                                    :Большое
 STR_NUM_CUSTOM                                                  :Указанное
-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                                             :Средняя
@@ -2969,7 +2946,6 @@ 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_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})
@@ -3635,7 +3611,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}
@@ -3653,6 +3632,31 @@ STR_FORMAT_COMPANY_NUM                                          :(Компани
 STR_FORMAT_GROUP_NAME                                           :Группа {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}Имя должно быть уникальным
 
 #### Improved sign GUI
diff --git a/src/lang/serbian.txt b/src/lang/serbian.txt
index e959047d5..03ec998a2 100644
--- a/src/lang/serbian.txt
+++ b/src/lang/serbian.txt
@@ -329,8 +329,6 @@ STR_ABBREV_PLASTIC                                              :{TINYFONT}PL
 STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}FZ
 STR_ABBREV_NONE                                                 :{TINYFONT}NO
 STR_ABBREV_ALL                                                  :{TINYFONT}ALL
-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
@@ -342,17 +340,11 @@ STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Original
 STR_ABOUT_VERSION                                               :{BLACK}OpenTTD verzija {REV}
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2006 OpenTTD tim
 
-STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
-STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_QUIT_CAPTION                                                :{WHITE}Izađi
 STR_YES                                                         :{BLACK}Da
 STR_NO                                                          :{BLACK}Ne
 STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Da li ste sigurni da želite da napustite OpenTTD i vratite se u {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                                                :Ništa
 STR_COLOUR_DARK_BLUE                                            :Tamno plava
 STR_COLOUR_PALE_GREEN                                           :Bledo zelena
@@ -371,8 +363,6 @@ STR_COLOUR_BROWN                                                :Braon
 STR_COLOUR_GREY                                                 :Siva
 STR_COLOUR_WHITE                                                :Bela
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}Previše je vozila u igri
-STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
-STR_RED_COMMA                                                   :{RED}{COMMA}
 STR_BUTTON_LOCATION                                             :{BLACK}Mesto
 STR_SMALLMAP_TYPE_CONTOURS                                      :Konture
 STR_SMALLMAP_TYPE_VEHICLES                                      :Vozila
@@ -498,12 +488,13 @@ STR_SORT_CRITERIA_TIP                                           :{BLACK}Odaberit
 STR_FILTER_CRITERIA_TIP                                         :{BLACK}Izaberite način filtriranja
 STR_SORT_BY                                                     :{BLACK}Sortiraj po
 
+### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}Naseljenost
+STR_SORT_BY_NAME                                                :{BLACK}Ime
+STR_SORT_BY_DATE                                                :{BLACK}Datumu
 STR_SORT_BY_PRODUCTION                                          :Proizvodnji
 STR_SORT_BY_TYPE                                                :Vrsti
 STR_SORT_BY_TRANSPORTED                                         :Transportovano
-STR_SORT_BY_NAME                                                :{BLACK}Ime
-STR_SORT_BY_DATE                                                :{BLACK}Datumu
 STR_SORT_BY_NUMBER                                              :Broju
 STR_SORT_BY_PROFIT_LAST_YEAR                                    :Zaradi prošle godine
 STR_SORT_BY_PROFIT_THIS_YEAR                                    :Zaradi ove godine
@@ -526,37 +517,25 @@ STR_SORT_BY_INTRO_DATE                                          :Datum proizvodn
 STR_SORT_BY_RUNNING_COST                                        :Troškovi održavanja
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :Snaga/Troškovi održavanja
 STR_SORT_BY_CARGO_CAPACITY                                      :Kapacitet tovara
+
 STR_NO_WAITING_CARGO                                            :{BLACK}Nijedna vrsta tovara nije na čekanju
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}Odaberi sve objekte
 STR_SELECT_ALL_TYPES                                            :{BLACK}Odaberi sve vrste tovara (uključujući i one bez tovara)
-STR_AVAILABLE_TRAINS                                            :{BLACK}Dostupni Vozovi
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Dostupna Drumska Vozila
-STR_AVAILABLE_SHIPS                                             :{BLACK}Dostupni Brodovi
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Dostupne Letelice
 STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Pogledajte listu raspoloživih mašina za ovu vrstu vozila.
 STR_MANAGE_LIST                                                 :{BLACK}Upravljanje
 STR_MANAGE_LIST_TIP                                             :{BLACK}Pošaljite naredbu svim vozilima na ovoj listi
 STR_REPLACE_VEHICLES                                            :Obnovi vozila
+STR_SEND_FOR_SERVICING                                          :Pošalji na Servisiranje
+
+STR_AVAILABLE_TRAINS                                            :{BLACK}Dostupni Vozovi
+STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Dostupna Drumska Vozila
+STR_AVAILABLE_SHIPS                                             :{BLACK}Dostupni Brodovi
+STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Dostupne Letelice
+
 STR_SEND_TRAIN_TO_DEPOT                                         :Pošalji u Depo
 STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Pošalji u Depo
 STR_SEND_SHIP_TO_DEPOT                                          :Pošalji u Depo
 STR_SEND_AIRCRAFT_TO_HANGAR                                     :Pošalji u Hangar
-STR_SEND_FOR_SERVICING                                          :Pošalji na Servisiranje
-
-############ 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                                            :Maj
-STR_MONTH_ABBREV_JUN                                            :Jun
-STR_MONTH_ABBREV_JUL                                            :Jul
-STR_MONTH_ABBREV_AUG                                            :Avg
-STR_MONTH_ABBREV_SEP                                            :Sep
-STR_MONTH_ABBREV_OCT                                            :Okt
-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}
@@ -584,8 +563,6 @@ 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_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
@@ -642,7 +619,7 @@ STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Nema
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Ime
 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                                          :1.
 STR_ORDINAL_NUMBER_2ND                                          :2.
 STR_ORDINAL_NUMBER_3RD                                          :3.
@@ -676,6 +653,34 @@ STR_ORDINAL_NUMBER_30TH                                         :30.
 STR_ORDINAL_NUMBER_31ST                                         :31.
 ############ 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                                            :Maj
+STR_MONTH_ABBREV_JUN                                            :Jun
+STR_MONTH_ABBREV_JUL                                            :Jul
+STR_MONTH_ABBREV_AUG                                            :Avg
+STR_MONTH_ABBREV_SEP                                            :Sep
+STR_MONTH_ABBREV_OCT                                            :Okt
+STR_MONTH_ABBREV_NOV                                            :Nov
+STR_MONTH_ABBREV_DEC                                            :Dec
+
+STR_MONTH_JAN                                                   :Januar
+STR_MONTH_FEB                                                   :Februar
+STR_MONTH_MAR                                                   :Mart
+STR_MONTH_APR                                                   :April
+STR_MONTH_MAY                                                   :Maj
+STR_MONTH_JUN                                                   :Jun
+STR_MONTH_JUL                                                   :Jul
+STR_MONTH_AUG                                                   :Avgust
+STR_MONTH_SEP                                                   :Septembar
+STR_MONTH_OCT                                                   :Oktobar
+STR_MONTH_NOV                                                   :Novembar
+STR_MONTH_DEC                                                   :Decembar
+############ range for months ends
+
 STR_GRAPH_Y_LABEL_NUMBER                                        :{TINYFONT}{COMMA}
 
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}Tovar prihvaćen: {LTBLUE}
@@ -772,12 +777,9 @@ 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_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_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
@@ -859,9 +861,7 @@ STR_OFF                                                         :Undress
 STR_SUMMARY                                                     :kratak pregled
 STR_FULL                                                        :Puni
 STR_STATUSBAR_COMPANY_NAME                                      :{SILVER}- -  {COMPANY}  - -
-STR_BLACK_STRING                                                :{BLACK}{STRING}
 
-STR_JUST_CHECKMARK                                              :{CHECKMARK}
 ############ range for menu starts
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Opcije
 STR_SETTINGS_MENU_DIFFICULTY_SETTINGS                           :Podešavanje težine
@@ -966,9 +966,6 @@ 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_BLACK_6                                                     :{BLACK}6
-STR_BLACK_7                                                     :{BLACK}7
-
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Engleska (Originalna)
 STR_TOWNNAME_FRENCH                                             :Francuska
@@ -1048,19 +1045,6 @@ STR_OPTIONS_BASE_GRF_DESCRIPTION_TIP                            :{BLACK}Dodatne
 
 STR_AUTOSAVE_FAILED                                             :{WHITE}Neuspešno automatsko čuvanje
 
-STR_MONTH_JAN                                                   :Januar
-STR_MONTH_FEB                                                   :Februar
-STR_MONTH_MAR                                                   :Mart
-STR_MONTH_APR                                                   :April
-STR_MONTH_MAY                                                   :Maj
-STR_MONTH_JUN                                                   :Jun
-STR_MONTH_JUL                                                   :Jul
-STR_MONTH_AUG                                                   :Avgust
-STR_MONTH_SEP                                                   :Septembar
-STR_MONTH_OCT                                                   :Oktobar
-STR_MONTH_NOV                                                   :Novembar
-STR_MONTH_DEC                                                   :Decembar
-
 STR_HEADING_FOR_STATION                                         :{LTBLUE}Ide ka {STATION}
 STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}Ide ka {STATION}, {VELOCITY}
 STR_NO_ORDERS                                                   :{LTBLUE}Nema naredbi
@@ -1075,8 +1059,6 @@ STR_CRATES                                                      :sanduka
 STR_RES_OTHER                                                   :drugo
 STR_NOTHING                                                     :
 
-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...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Kraj Zajedničkih Naredbi - -
@@ -1348,7 +1330,6 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Y-veli�
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :isključeno
-STR_JUST_CURRENCY                                               :{CURRENCY}
 STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Promena vrednosti
 
 STR_TEMPERATE_LANDSCAPE                                         :Umereni klimatski pojas
@@ -1450,11 +1431,6 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Imena fa
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...previše blizu druge fabrike
 
-STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Prepravlja voz kako bi prevozio drugu vrstu tereta
-STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Prepavi voz
-STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Označite vrstu tovara za prepravljanje voza
-STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Prepravlja voz za prevoz označene vrste tovara
-STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Voz se ne može prepraviti...
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Promena proizvodnje
 
 ############ network gui strings
@@ -2263,6 +2239,7 @@ STR_SV_STNAME_AIRPORT                                           :{STRING} Aerodr
 STR_SV_STNAME_OILFIELD                                          :{STRING} Naftna polja
 STR_SV_STNAME_MINES                                             :{STRING} Rudnici
 STR_SV_STNAME_DOCKS                                             :{STRING} Pristaništa
+##id 0x6020
 STR_SV_STNAME_ANNEXE                                            :{STRING} Dodatna
 STR_SV_STNAME_SIDINGS                                           :{STRING} Skretnica
 STR_SV_STNAME_BRANCH                                            :{STRING} Grana
@@ -2310,8 +2287,6 @@ STR_NUM_LOW                                                     :niski
 STR_NUM_NORMAL                                                  :normalni
 STR_NUM_HIGH                                                    :visoki
 STR_NUM_CUSTOM                                                  :Prilagođen
-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
@@ -2635,10 +2610,8 @@ STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE                          :jednopružno ž
 STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE                            :megnetno žel. vučno vozilo
 
 ##id 0x8800
-STR_DEPOT_TRAIN_CAPTION                                         :{WHITE}{TOWN} Železnički Depo
 STR_NEWS_FIRST_TRAIN_ARRIVAL                                    :{BLACK}{BIGFONT}Narod slavi . . .{}Prvi voz stiže na stanicu {STATION}!
 STR_VEHICLE_DETAILS_CAPTION                                     :{WHITE}{VEHICLE} (Opširnije)
-STR_ERROR_TRAIN_IN_THE_WAY                                      :{WHITE}Voz se tu upravo nalazi
 STR_ORDER                                                       :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 STR_ORDER_SELECTED                                              :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 STR_ORDER_NON_STOP                                              :{BLACK}Direktno
@@ -2728,37 +2701,16 @@ STR_TIMETABLE_AND_TRAVEL_FOR                                    :i putuj {STRING
 STR_TIMETABLE_DAYS                                              :{COMMA} dan{P "" a a}
 STR_TIMETABLE_TICKS                                             :{COMMA} utkucaj{P "" a a}
 
-STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Ide za {TOWN} Železnički Depo
-STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Ide za {TOWN} Železnički Depo, {VELOCITY}
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Servisiranje u {TOWN} Železničkom Depou
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Servisiranje u {TOWN} Železničkom Depou, {VELOCITY}
-
 STR_INVALID_ORDER                                               :{RED} (Neispravna Naredba)
 
 STR_UNKNOWN_STATION                                             :nepoznata stanica
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}Prazno
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} sa {STATION}
 STR_VEHICLE_DETAILS_CARGO_FROM_MULT                             :{LTBLUE}{CARGO} sa {STATION} (x{NUM})
-STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} čeka u depou
-STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Nova Vozila
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}Voz je predugačak
 STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}Vozovi se mogu izmeniti samo kada su zaustavljeni u depou
 
-STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}Nova Železnička Vozila
-STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}Nova Železnička Električna Vozila
-STR_BUILD_VEHICLE_TRAIN_MONORAIL_CAPTION                        :{WHITE}Nova Jenodšinska Vozila
-STR_BUILD_VEHICLE_TRAIN_MAGLEV_CAPTION                          :{WHITE}Nova Maglev Vozila
-STR_BUILD_VEHICLE_TRAIN_ALL_CAPTION                             :{WHITE}Šinska Vozila
-
-STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_BUTTON                    :{BLACK}Kupi Vozilo
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Kopiraj Vozilo
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Ovim ćete kupiti isto drumsko vozilo. Sa Ctrl+Klik će imati zajedničke naredbe
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Ovim ćete kupiti isto drumsko vozilo. Kliknite na dugme i potom na drumsko vozilo koje je u ili van depoa. Sa Ctrl+Klik će imati zajedničke naredbe
-STR_CLONE_TRAIN                                                 :{BLACK}Kopiraj Voz
-STR_CLONE_TRAIN_INFO                                            :{BLACK}Ovim ćete kupiti istu kompoziciju. Sa Ctrl+Klik će imati zajedničke naredbe
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Ovim ćete kupiti istu kompoziciju. Kliknite na dugme i potom na voz koji je u ili van depoa. Sa Ctrl+Klik će imati zajedničke naredbe
-STR_BUILD_VEHICLE_TRAIN_RENAME_BUTTON                           :{BLACK}Preimenuj
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Preskoči
 STR_ORDERS_DELETE_BUTTON                                        :{BLACK}Izbriši
 STR_ORDERS_GO_TO_BUTTON                                         :{BLACK}Idi do
@@ -2774,14 +2726,12 @@ STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Prelazi
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Naredbe)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Kraj Naredbi - -
 STR_SERVICE                                                     :{BLACK}Servis
-STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Nemoguća kupovina šinskog vozila...
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Kupljen: {LTBLUE}{NUM}{BLACK} Vrednost: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Vrednost: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
 STR_VEHICLE_STATUS_LOADING_UNLOADING                            :{LTBLUE}Utovarivanje / Iztovarivanje
 STR_VEHICLE_STATUS_LEAVING                                      :{LTBLUE}Kreće
 STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}Voz se mora zaustaviti u nekom depou
-STR_ERROR_CAN_T_SEND_TRAIN_TO_DEPOT                             :{WHITE}Voz ne može da ode u depo...
 STR_ERROR_NO_MORE_SPACE_FOR_ORDERS                              :{WHITE}Nema više mesta za naredbe
 STR_ERROR_TOO_MANY_ORDERS                                       :{WHITE}Previše naredbi
 STR_ERROR_CAN_T_INSERT_NEW_ORDER                                :{WHITE}Ne može se dodati nova naredba...
@@ -2796,25 +2746,11 @@ STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE}vozilo k
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}Ne može se ukloniti vozilo...
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}Zadnja lokomotiva u kompoziciji uvek prati prednju
 STR_CARGO_N_A                                                   :Nepoznato{SKIP}
-STR_ERROR_CAN_T_SELL_TRAIN                                      :{WHITE}Ne može se prodati šinsko vozilo...
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}Nepostoji putanja do lokalnog depoa
-STR_ERROR_CAN_T_STOP_START_TRAIN                                :{WHITE}Ne može se pokrenuti/zaustaviti voz...
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}Period servisiranja: {LTBLUE}{COMMA}dana{BLACK}   Poslednji servis: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}Period servisiranja: {LTBLUE}{COMMA}%{BLACK}   Poslednji servis: {LTBLUE}{DATE_LONG}
-STR_DEPOT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Vozovi - kliknite na voz za podatke, prevucite vozilo da bi dodali/sklonili iz kompozicije
-STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP                            :{BLACK}Kupite nova šinska vozila
-STR_DEPOT_TRAIN_SELL_TOOLTIP                                    :{BLACK}Ovde prevucite šinsko vozilo kako biste ga prodali
-STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}Prebacite se na lokaciju železničkog depoa
-STR_BUILD_VEHICLE_TRAIN_LIST_TOOLTIP                            :{BLACK}Spisak probranih šinskih vozila - kliknite na vozilo za više podataka
-STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_TOOLTIP                   :{BLACK}Kupite označeno šinsko vozilo
-STR_BUILD_VEHICLE_TRAIN_RENAME_TOOLTIP                          :{BLACK}Preimenujte vrstu šinskog vozila
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP                 :{BLACK}Trenutno stanje voza - kliknite ovde za zaustavljanje/pokretanje voza
-STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP                           :{BLACK}Prikazuje naredbe vozu
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP                         :{BLACK}Prebacite se na lokaciju voza
-STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP                    :{BLACK}Pošaljite voz u depo. Sa Ctrl+Klik će otići samo na servis
 STR_VEHICLE_VIEW_TRAIN_IGNORE_SIGNAL_TOOLTIP                    :{BLACK}Voz će krenuti bez čekanja na signal za slobodan kolosek
 STR_VEHICLE_VIEW_TRAIN_REVERSE_TOOLTIP                          :{BLACK}Promena smera kretanja voza
-STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Prikazuje podatke o vozu
 STR_VEHICLE_DETAILS_INCREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Povećava period servisiranja
 STR_VEHICLE_DETAILS_DECREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Smanjuje period servisiranja
 STR_VEHICLE_DETAILS_TRAIN_CARGO_TOOLTIP                         :{BLACK}Prikazuje podatke o tovaru koji se prevozi
@@ -2848,15 +2784,10 @@ STR_VEHICLE_STATUS_STOPPED                                      :{RED}Zaustavlje
 STR_ERROR_CAN_T_MAKE_TRAIN_PASS_SIGNAL                          :{WHITE}Nemoguć je prolaz voza na signal opasnosti...
 STR_VEHICLE_STATUS_CRASHED                                      :{RED}Havarisan!
 
-STR_QUERY_RENAME_TRAIN_CAPTION                                  :{WHITE}Naziv voza
-STR_ERROR_CAN_T_RENAME_TRAIN                                    :{WHITE}Nemoguće nazvati voz...
-STR_VEHICLE_DETAILS_TRAIN_RENAME                                :{BLACK}Naziv voza
 STR_NEWS_TRAIN_CRASH                                            :{BLACK}{BIGFONT}Sudar Vozova!{}{COMMA} {P "" su je} poginu{P o la lo} u eksploziji nakon sudara
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Nije moguće obrnuti smer kretanja voza...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE                  :{WHITE}Voz ne može da promeni smer...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Ne može se okrenuti vozilo od više delova
-STR_QUERY_RENAME_TRAIN_TYPE_CAPTION                             :{WHITE}Promena naziva vrste šinskog vozila
-STR_ERROR_CAN_T_RENAME_TRAIN_TYPE                               :{WHITE}Nemoguća promena naziva vrste šinskog vozila...
 STR_CLEAR_TIME                                                  :{BLACK}Ukloni Vreme
 STR_RESET_LATENESS                                              :{BLACK}Poništi Merač Kašnjenja
 STR_CHANGE_WAYPOINT_NAME                                        :{BLACK}Promena naziva čvorišta
@@ -2888,43 +2819,14 @@ STR_TIMETABLE_AUTOFILL                                          :{BLACK}Merenje
 STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Popunjava raspored sa vrednostima iz sledećeg putovanja (Ctrl+Klik za zadržavanje vremena čekanja)
 
 ##id 0x9000
-STR_ERROR_ROAD_VEHICLE_IN_THE_WAY                               :{WHITE}Drumsko vozilo na putu
-STR_DEPOT_ROAD_VEHICLE_CAPTION                                  :{WHITE}{TOWN} Depo Drumskih Vozila
-STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_BUTTON                      :{BLACK}Nova Vozila
-STR_BUILD_VEHICLE_ROAD_VEHICLE_CAPTION                          :{WHITE}Nova Drumska Vozila
-STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_BUTTON             :{BLACK}Kupi Vozilo
-STR_ERROR_CAN_T_BUILD_ROAD_VEHICLE                              :{WHITE}Ne može se kupiti drumsko vozilo...
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}...mora se zaustaviti unutar depoa za drumska vozila
-STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}Nemoguća prodaja drumskog vozila...
-STR_ERROR_CAN_T_STOP_START_ROAD_VEHICLE                         :{WHITE}Ne može se pokrenuti/zaustaviti drumsko vozilo...
-STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} čeka u depou
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Ide ka {TOWN} Drumskom Depou
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Ide ka {TOWN} Drumskom Depou, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Servisiranje u {TOWN} Drumskom Depou
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Servisiranje u {TOWN} Drumskom Depou, {VELOCITY}
-STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Vozilo ne može da ode u depo...
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Neuspešan pronalazak lokalnog depoa
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP          :{BLACK}Trenutno stanje vozila - kliknite ovde za zaustavljanje/pokretanje vozila
-STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP                    :{BLACK}Prikazuje naredbe vozilu
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP                  :{BLACK}Prebacite se na lokaciju vozila
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}Pošaljite vozilo u depo. Sa Ctrl+Klik će otići samo na servis
 STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP                   :{BLACK}Naterajte vozilo da okrene
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Prikazuje detalje drumskog vozila
-STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Vozila - kliknite na vozilo za podatke
-STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}Kupi novo drumsko vozilo
-STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}Ovde prevucite drumsko vozilo kako biste ga prodali
-STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}Prebacite se na lokaciju drumskog depoa
-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_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})
 
-STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Naziv drumskog vozila
-STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Ne može se promeniti naziv vozila...
-STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Naziv drumskog vozila
 STR_NEWS_FIRST_BUS_ARRIVAL                                      :{BLACK}{BIGFONT}Narod slavi . . .{}Prvi autobus stiže na stanicu {STATION}!
 STR_NEWS_FIRST_TRUCK_ARRIVAL                                    :{BLACK}{BIGFONT}Narod slavi . . .{}Prvi kamion stiže na stanicu {STATION}!
 STR_NEWS_FIRST_PASSENGER_TRAM_ARRIVAL                           :{BLACK}{BIGFONT}Narod slavi . . .{}Prvi tramvaj stiže na stanicu {STATION}!
@@ -2932,96 +2834,31 @@ STR_NEWS_FIRST_CARGO_TRAM_ARRIVAL                               :{BLACK}{BIGFONT
 STR_NEWS_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Saobraćajna nesreća!{}Vozač je poginuo u eksploziji nakon sudara sa vozom
 STR_NEWS_ROAD_VEHICLE_CRASH                                     :{BLACK}{BIGFONT}Saobraćajna nesreća!{}{COMMA} {P "" je su} poginu{P o la lo} u eksploziji nakon sudara sa vozom
 STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}Drumsko vozilo ne može da se okrene...
-STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Promena naziva
-STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Promenite naziv vrste drumskog vozila
-STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Naziv vrste drumskog vozila
-STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Nemoguća promena naziva vrste drumskog vozila...
 
-STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Prepravite drumsko vozilo kako bi prevozio drugu vrstu tovara
-STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Prepravi drumsko vozilo
-STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Prepravlja drumsko vozilo za prevoz označene vrste tovara
-STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Nemoguće prepravljanje drumskog vozila...
-STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Označite vrstu tovara za prepravljanje drumskog vozila
 
 ##id 0x9800
 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :Izgradnja plovnih kanala
 STR_WATERWAYS_TOOLBAR_CAPTION                                   :{WHITE}Izgradnja plovnih kanala
 STR_WATERWAYS_TOOLBAR_CAPTION_SE                                :{WHITE}Plovni kanali
 STR_ERROR_CAN_T_BUILD_DOCK_HERE                                 :{WHITE}Izgradnja pristaništa ovde nije moguća...
-STR_DEPOT_SHIP_CAPTION                                          :{WHITE}{TOWN} Depo Plovila
-STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON                              :{BLACK}Novi Brodovi
-STR_BUILD_VEHICLE_SHIP_CAPTION                                  :{WHITE}Novi Brodovi
-STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON                     :{BLACK}Kupi Brod
-STR_CLONE_SHIP                                                  :{BLACK}Kopiraj Brod
-STR_CLONE_SHIP_INFO                                             :{BLACK}Ovim ćete kupiti isti brod. Sa Ctrl+Klik će imati zajedničke naredbe
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Ovim ćete kupiti isti brod. Kliknite na dugme i potom na brod koji je u ili van depoa. Sa Ctrl+Klik će imati zajedničke naredbe
 STR_ERROR_SHIP_MUST_BE_STOPPED_IN_DEPOT                         :{WHITE}Brod mora biti zaustavljen u depou
-STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}Brod se ne može prodati...
-STR_ERROR_CAN_T_BUILD_SHIP                                      :{WHITE}Brod se ne može kupiti...
-STR_ERROR_SHIP_IN_THE_WAY                                       :{WHITE}Brod se tu upravo nalazi
-STR_ERROR_CAN_T_STOP_START_SHIP                                 :{WHITE}Ne može se pokrenuti/zaustaviti brod...
-STR_ERROR_CAN_T_SEND_SHIP_TO_DEPOT                              :{WHITE}Brod ne može da ode u depo...
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Ide za {TOWN} Brodski Depo
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Ide za {TOWN} Brodski Depo, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Servisiranje u {TOWN} Brodskom Depou
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Servisiranje u {TOWN} Brodskom Depou, {VELOCITY}
-STR_NEWS_SHIP_IS_WAITING                                        :{WHITE}{VEHICLE} čeka u depou
 STR_WATERWAYS_TOOLBAR_BUILD_DOCK_TOOLTIP                        :{BLACK}Gradi pristanište
 STR_WATERWAYS_TOOLBAR_BUILD_DEPOT_TOOLTIP                       :{BLACK}Gradi brodski depo (za kupovinu i servisiranje brodova)
-STR_DEPOT_SHIP_LIST_TOOLTIP                                     :{BLACK}Brodovi - kliknite na brod za podatke
-STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}Kupovina novog broda
-STR_DEPOT_SHIP_SELL_TOOLTIP                                     :{BLACK}Ovde prevucite brod kako biste ga prodali
-STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}Prebacite se na lokaciju broda
-STR_BUILD_VEHICLE_SHIP_LIST_TOOLTIP                             :{BLACK}Spisak probranih brodova - kliknite na brod za više podataka
-STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP                    :{BLACK}Kupite označeni brod
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP                  :{BLACK}Trenutno stanje broda - kliknite ovde za zaustavljanje/pokretanje broda
-STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Prikazuje naredbe brodu
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP                          :{BLACK}Prebacite se na lokaciju broda
-STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}Pošaljite brod u depo. Sa Ctrl+Klik će otići samo na servis
-STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Prikazuje podatke o brodu
-STR_VEHICLE_DETAILS_SHIP_RENAME                                 :{BLACK}Naziv broda
 
-STR_QUERY_RENAME_SHIP_CAPTION                                   :{WHITE}Naziv broda
-STR_ERROR_CAN_T_RENAME_SHIP                                     :{WHITE}Ne može se promeniti naziv broda...
 STR_NEWS_FIRST_SHIP_ARRIVAL                                     :{BLACK}{BIGFONT}Narod slavi . . .{}Prvi brod stiže na stanicu {STATION}!
 STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}Postavite bovu kako bi služila kao putokaz
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}Bova se ovde ne može postaviti...
 STR_BUILD_AQUEDUCT                                              :{BLACK}Izgradite akvadukt
 STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}Akvadukt se ovde ne može izgraditi...
-STR_BUILD_VEHICLE_SHIP_RENAME_BUTTON                            :{BLACK}Preimenuj
-STR_BUILD_VEHICLE_SHIP_RENAME_TOOLTIP                           :{BLACK}Promenite naziv vrste broda
-STR_QUERY_RENAME_SHIP_TYPE_CAPTION                              :{WHITE}Promena naziva vrste broda
-STR_ERROR_CAN_T_RENAME_SHIP_TYPE                                :{WHITE}Nemoguća promena naziva vrste broda...
-STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}Prepravite brod kako bi prevozio drugu vrstu tereta
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (Prepravljanje)
-STR_REFIT_SHIP_REFIT_BUTTON                                     :{BLACK}Prepravi brod
-STR_REFIT_SHIP_LIST_TOOLTIP                                     :{BLACK}Označite vrstu tovara za prepravljanje broda
-STR_REFIT_SHIP_REFIT_TOOLTIP                                    :{BLACK}Prepravlja brod za prevoz označene vrste tovara
 STR_REFIT_TITLE                                                 :{GOLD}Izaberite vrstu tereta za prevoz:
 STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}Nova nosivost: {GOLD}{CARGO}{}{BLACK}Cena prepravke: {GOLD}{CURRENCY}
-STR_ERROR_CAN_T_REFIT_SHIP                                      :{WHITE}Brod se ne može prepraviti...
 STR_REFITTABLE                                                  :(prepravljiv)
 
 ##id 0xA000
 STR_TOOLBAR_AIRCRAFT_CAPTION                                    :{WHITE}Aerodromi
 STR_ERROR_CAN_T_BUILD_AIRPORT_HERE                              :{WHITE}Aerodrom se ovde ne može izgraditi...
-STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}{STATION} Hangar
-STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON                          :{BLACK}Nova Letilica
-STR_CLONE_AIRCRAFT                                              :{BLACK}Kopiraj Letilicu
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Ovim ćete kupiti istu letilicu. Sa Ctrl+Klik će imati zajedničke naredbe
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Ovim ćete kupiti istu letilicu. Kliknite na dugme i potom na letilicu koje je u ili van depoa. Sa Ctrl+Klik će imati zajedničke naredbe
-STR_BUILD_VEHICLE_AIRCRAFT_CAPTION                              :{WHITE}Nove Letilice
-STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON                 :{BLACK}Napraviti Letelicu
-STR_ERROR_CAN_T_BUILD_AIRCRAFT                                  :{WHITE}Letelice se ne može napraviti
 
-STR_BUILD_VEHICLE_AIRCRAFT_RENAME_TOOLTIP                       :{BLACK}Promenite naziv vrste letilice
-STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION                          :{WHITE}Promena naziva vrste letilice
-STR_ERROR_CAN_T_RENAME_AIRCRAFT_TYPE                            :{WHITE}Nemoguća promena naziva vrste letilice...
-STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Prepravite letilicu kako bi prevozila drugu vrstu tereta
-STR_REFIT_AIRCRAFT_REFIT_BUTTON                                 :{BLACK}Prepravi letilicu
-STR_REFIT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Odaberite vrstu tereta koju će letilica prevoziti
-STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}Prepravite letilicu kako bi prevozila označenu vrstu tereta
-STR_ERROR_CAN_T_REFIT_AIRCRAFT                                  :{WHITE}Nemoguće je prepraviti letilicu...
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Raspored)
 
@@ -3181,6 +3018,187 @@ STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING}
 STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} Leteluca
 
 
+STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} čeka u depou
+STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} čeka u depou
+STR_NEWS_SHIP_IS_WAITING                                        :{WHITE}{VEHICLE} čeka u depou
+
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Prepavi voz
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Prepravi drumsko vozilo
+STR_REFIT_SHIP_REFIT_BUTTON                                     :{BLACK}Prepravi brod
+STR_REFIT_AIRCRAFT_REFIT_BUTTON                                 :{BLACK}Prepravi letilicu
+
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Prepravlja voz za prevoz označene vrste tovara
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Prepravlja drumsko vozilo za prevoz označene vrste tovara
+STR_REFIT_SHIP_REFIT_TOOLTIP                                    :{BLACK}Prepravlja brod za prevoz označene vrste tovara
+STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}Prepravite letilicu kako bi prevozila označenu vrstu tereta
+
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Označite vrstu tovara za prepravljanje voza
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Označite vrstu tovara za prepravljanje drumskog vozila
+STR_REFIT_SHIP_LIST_TOOLTIP                                     :{BLACK}Označite vrstu tovara za prepravljanje broda
+STR_REFIT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Odaberite vrstu tereta koju će letilica prevoziti
+
+STR_DEPOT_TRAIN_CAPTION                                         :{WHITE}{TOWN} Železnički Depo
+STR_DEPOT_ROAD_VEHICLE_CAPTION                                  :{WHITE}{TOWN} Depo Drumskih Vozila
+STR_DEPOT_SHIP_CAPTION                                          :{WHITE}{TOWN} Depo Plovila
+STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}{STATION} Hangar
+
+STR_VEHICLE_DETAILS_TRAIN_RENAME                                :{BLACK}Naziv voza
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Naziv drumskog vozila
+STR_VEHICLE_DETAILS_SHIP_RENAME                                 :{BLACK}Naziv broda
+
+STR_QUERY_RENAME_TRAIN_CAPTION                                  :{WHITE}Naziv voza
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Naziv drumskog vozila
+STR_QUERY_RENAME_SHIP_CAPTION                                   :{WHITE}Naziv broda
+
+STR_ERROR_TRAIN_IN_THE_WAY                                      :{WHITE}Voz se tu upravo nalazi
+STR_ERROR_ROAD_VEHICLE_IN_THE_WAY                               :{WHITE}Drumsko vozilo na putu
+STR_ERROR_SHIP_IN_THE_WAY                                       :{WHITE}Brod se tu upravo nalazi
+
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Voz se ne može prepraviti...
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Nemoguće prepravljanje drumskog vozila...
+STR_ERROR_CAN_T_REFIT_SHIP                                      :{WHITE}Brod se ne može prepraviti...
+STR_ERROR_CAN_T_REFIT_AIRCRAFT                                  :{WHITE}Nemoguće je prepraviti letilicu...
+
+STR_ERROR_CAN_T_RENAME_TRAIN                                    :{WHITE}Nemoguće nazvati voz...
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Ne može se promeniti naziv vozila...
+STR_ERROR_CAN_T_RENAME_SHIP                                     :{WHITE}Ne može se promeniti naziv broda...
+
+STR_ERROR_CAN_T_STOP_START_TRAIN                                :{WHITE}Ne može se pokrenuti/zaustaviti voz...
+STR_ERROR_CAN_T_STOP_START_ROAD_VEHICLE                         :{WHITE}Ne može se pokrenuti/zaustaviti drumsko vozilo...
+STR_ERROR_CAN_T_STOP_START_SHIP                                 :{WHITE}Ne može se pokrenuti/zaustaviti brod...
+
+STR_ERROR_CAN_T_SEND_TRAIN_TO_DEPOT                             :{WHITE}Voz ne može da ode u depo...
+STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Vozilo ne može da ode u depo...
+STR_ERROR_CAN_T_SEND_SHIP_TO_DEPOT                              :{WHITE}Brod ne može da ode u depo...
+
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Nemoguća kupovina šinskog vozila...
+STR_ERROR_CAN_T_BUILD_ROAD_VEHICLE                              :{WHITE}Ne može se kupiti drumsko vozilo...
+STR_ERROR_CAN_T_BUILD_SHIP                                      :{WHITE}Brod se ne može kupiti...
+STR_ERROR_CAN_T_BUILD_AIRCRAFT                                  :{WHITE}Letelice se ne može napraviti
+
+STR_ERROR_CAN_T_RENAME_TRAIN_TYPE                               :{WHITE}Nemoguća promena naziva vrste šinskog vozila...
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Nemoguća promena naziva vrste drumskog vozila...
+STR_ERROR_CAN_T_RENAME_SHIP_TYPE                                :{WHITE}Nemoguća promena naziva vrste broda...
+STR_ERROR_CAN_T_RENAME_AIRCRAFT_TYPE                            :{WHITE}Nemoguća promena naziva vrste letilice...
+
+STR_ERROR_CAN_T_SELL_TRAIN                                      :{WHITE}Ne može se prodati šinsko vozilo...
+STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}Nemoguća prodaja drumskog vozila...
+STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}Brod se ne može prodati...
+
+STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP                 :{BLACK}Trenutno stanje voza - kliknite ovde za zaustavljanje/pokretanje voza
+STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP          :{BLACK}Trenutno stanje vozila - kliknite ovde za zaustavljanje/pokretanje vozila
+STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP                  :{BLACK}Trenutno stanje broda - kliknite ovde za zaustavljanje/pokretanje broda
+
+STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP                           :{BLACK}Prikazuje naredbe vozu
+STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP                    :{BLACK}Prikazuje naredbe vozilu
+STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Prikazuje naredbe brodu
+
+STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP                         :{BLACK}Prebacite se na lokaciju voza
+STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP                  :{BLACK}Prebacite se na lokaciju vozila
+STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP                          :{BLACK}Prebacite se na lokaciju broda
+
+STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP                    :{BLACK}Pošaljite voz u depo. Sa Ctrl+Klik će otići samo na servis
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}Pošaljite vozilo u depo. Sa Ctrl+Klik će otići samo na servis
+STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}Pošaljite brod u depo. Sa Ctrl+Klik će otići samo na servis
+
+STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Prikazuje podatke o vozu
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Prikazuje detalje drumskog vozila
+STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Prikazuje podatke o brodu
+
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Prepravlja voz kako bi prevozio drugu vrstu tereta
+STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Prepravite drumsko vozilo kako bi prevozio drugu vrstu tovara
+STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}Prepravite brod kako bi prevozio drugu vrstu tereta
+STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Prepravite letilicu kako bi prevozila drugu vrstu tereta
+
+STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Ide za {TOWN} Železnički Depo
+STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Ide za {TOWN} Železnički Depo, {VELOCITY}
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Ide ka {TOWN} Drumskom Depou
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Ide ka {TOWN} Drumskom Depou, {VELOCITY}
+STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Ide za {TOWN} Brodski Depo
+STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Ide za {TOWN} Brodski Depo, {VELOCITY}
+
+STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Servisiranje u {TOWN} Železničkom Depou
+STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Servisiranje u {TOWN} Železničkom Depou, {VELOCITY}
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Servisiranje u {TOWN} Drumskom Depou
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Servisiranje u {TOWN} Drumskom Depou, {VELOCITY}
+STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Servisiranje u {TOWN} Brodskom Depou
+STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Servisiranje u {TOWN} Brodskom Depou, {VELOCITY}
+
+
+STR_CLONE_TRAIN                                                 :{BLACK}Kopiraj Voz
+STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Kopiraj Vozilo
+STR_CLONE_SHIP                                                  :{BLACK}Kopiraj Brod
+STR_CLONE_AIRCRAFT                                              :{BLACK}Kopiraj Letilicu
+
+STR_CLONE_TRAIN_INFO                                            :{BLACK}Ovim ćete kupiti istu kompoziciju. Sa Ctrl+Klik će imati zajedničke naredbe
+STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Ovim ćete kupiti isto drumsko vozilo. Sa Ctrl+Klik će imati zajedničke naredbe
+STR_CLONE_SHIP_INFO                                             :{BLACK}Ovim ćete kupiti isti brod. Sa Ctrl+Klik će imati zajedničke naredbe
+STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Ovim ćete kupiti istu letilicu. Sa Ctrl+Klik će imati zajedničke naredbe
+
+STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Ovim ćete kupiti istu kompoziciju. Kliknite na dugme i potom na voz koji je u ili van depoa. Sa Ctrl+Klik će imati zajedničke naredbe
+STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Ovim ćete kupiti isto drumsko vozilo. Kliknite na dugme i potom na drumsko vozilo koje je u ili van depoa. Sa Ctrl+Klik će imati zajedničke naredbe
+STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Ovim ćete kupiti isti brod. Kliknite na dugme i potom na brod koji je u ili van depoa. Sa Ctrl+Klik će imati zajedničke naredbe
+STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Ovim ćete kupiti istu letilicu. Kliknite na dugme i potom na letilicu koje je u ili van depoa. Sa Ctrl+Klik će imati zajedničke naredbe
+
+STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}Nova Železnička Vozila
+STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}Nova Železnička Električna Vozila
+STR_BUILD_VEHICLE_TRAIN_MONORAIL_CAPTION                        :{WHITE}Nova Jenodšinska Vozila
+STR_BUILD_VEHICLE_TRAIN_MAGLEV_CAPTION                          :{WHITE}Nova Maglev Vozila
+
+STR_BUILD_VEHICLE_TRAIN_ALL_CAPTION                             :{WHITE}Šinska Vozila
+STR_BUILD_VEHICLE_ROAD_VEHICLE_CAPTION                          :{WHITE}Nova Drumska Vozila
+STR_BUILD_VEHICLE_SHIP_CAPTION                                  :{WHITE}Novi Brodovi
+STR_BUILD_VEHICLE_AIRCRAFT_CAPTION                              :{WHITE}Nove Letilice
+
+STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_BUTTON                    :{BLACK}Kupi Vozilo
+STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_BUTTON             :{BLACK}Kupi Vozilo
+STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON                     :{BLACK}Kupi Brod
+STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON                 :{BLACK}Napraviti Letelicu
+
+STR_BUILD_VEHICLE_TRAIN_LIST_TOOLTIP                            :{BLACK}Spisak probranih šinskih vozila - kliknite na vozilo za više podataka
+STR_BUILD_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP                     :{BLACK}Spisak probranih drumskih vozila - kliknite na vozilo za više podataka
+STR_BUILD_VEHICLE_SHIP_LIST_TOOLTIP                             :{BLACK}Spisak probranih brodova - kliknite na brod za više podataka
+
+STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_TOOLTIP                   :{BLACK}Kupite označeno šinsko vozilo
+STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_TOOLTIP            :{BLACK}Kupite označeno drumsko vozilo
+STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP                    :{BLACK}Kupite označeni brod
+
+STR_BUILD_VEHICLE_TRAIN_RENAME_BUTTON                           :{BLACK}Preimenuj
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Promena naziva
+STR_BUILD_VEHICLE_SHIP_RENAME_BUTTON                            :{BLACK}Preimenuj
+
+STR_BUILD_VEHICLE_TRAIN_RENAME_TOOLTIP                          :{BLACK}Preimenujte vrstu šinskog vozila
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Promenite naziv vrste drumskog vozila
+STR_BUILD_VEHICLE_SHIP_RENAME_TOOLTIP                           :{BLACK}Promenite naziv vrste broda
+STR_BUILD_VEHICLE_AIRCRAFT_RENAME_TOOLTIP                       :{BLACK}Promenite naziv vrste letilice
+
+STR_QUERY_RENAME_TRAIN_TYPE_CAPTION                             :{WHITE}Promena naziva vrste šinskog vozila
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Naziv vrste drumskog vozila
+STR_QUERY_RENAME_SHIP_TYPE_CAPTION                              :{WHITE}Promena naziva vrste broda
+STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION                          :{WHITE}Promena naziva vrste letilice
+
+STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Nova Vozila
+STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_BUTTON                      :{BLACK}Nova Vozila
+STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON                              :{BLACK}Novi Brodovi
+STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON                          :{BLACK}Nova Letilica
+
+STR_DEPOT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Vozovi - kliknite na voz za podatke, prevucite vozilo da bi dodali/sklonili iz kompozicije
+STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Vozila - kliknite na vozilo za podatke
+STR_DEPOT_SHIP_LIST_TOOLTIP                                     :{BLACK}Brodovi - kliknite na brod za podatke
+
+STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP                            :{BLACK}Kupite nova šinska vozila
+STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}Kupi novo drumsko vozilo
+STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}Kupovina novog broda
+
+STR_DEPOT_TRAIN_SELL_TOOLTIP                                    :{BLACK}Ovde prevucite šinsko vozilo kako biste ga prodali
+STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}Ovde prevucite drumsko vozilo kako biste ga prodali
+STR_DEPOT_SHIP_SELL_TOOLTIP                                     :{BLACK}Ovde prevucite brod kako biste ga prodali
+
+STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}Prebacite se na lokaciju železničkog depoa
+STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}Prebacite se na lokaciju drumskog depoa
+STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}Prebacite se na lokaciju broda
+
+
 ### depot strings
 
 
@@ -3193,6 +3211,7 @@ STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING}
 
 
 
+
 ############ Lists rail types
 
 
@@ -3327,7 +3346,10 @@ STR_STATION_NAME                                                :{STATION}
 STR_TOWN_NAME                                                   :{TOWN}
 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}
@@ -3345,6 +3367,31 @@ STR_FORMAT_COMPANY_NUM                                          :(Kompanija {COM
 STR_FORMAT_GROUP_NAME                                           :Grupa {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
+
 
 #### Improved sign GUI
 
diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt
index 92779d067..86ab901cf 100644
--- a/src/lang/simplified_chinese.txt
+++ b/src/lang/simplified_chinese.txt
@@ -154,8 +154,6 @@ STR_ABBREV_PLASTIC                                              :{TINYFONT}塑
 STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}跳
 STR_ABBREV_NONE                                                 :{TINYFONT}无
 STR_ABBREV_ALL                                                  :{TINYFONT}全
-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}消息
@@ -167,17 +165,11 @@ STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}原始�
 STR_ABOUT_VERSION                                               :{BLACK}OpenTTD 版本 {REV}
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 OpenTTD 团队
 
-STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
-STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_QUIT_CAPTION                                                :{WHITE}退出
 STR_YES                                                         :{BLACK}是
 STR_NO                                                          :{BLACK}否
 STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}你确定要放弃当前游戏并{}退出到 {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                                                :无
 STR_COLOUR_DARK_BLUE                                            :深蓝色
 STR_COLOUR_PALE_GREEN                                           :浅绿色
@@ -196,8 +188,6 @@ STR_COLOUR_BROWN                                                :棕　色
 STR_COLOUR_GREY                                                 :浅灰色
 STR_COLOUR_WHITE                                                :白　色
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}游戏中的车辆过多
-STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
-STR_RED_COMMA                                                   :{RED}{COMMA}
 STR_BUTTON_LOCATION                                             :{BLACK}定位
 STR_SMALLMAP_TYPE_CONTOURS                                      :地形
 STR_SMALLMAP_TYPE_VEHICLES                                      :车辆
@@ -323,12 +313,13 @@ STR_SORT_CRITERIA_TIP                                           :{BLACK}选择�
 STR_FILTER_CRITERIA_TIP                                         :{BLACK}选择过滤标准
 STR_SORT_BY                                                     :{BLACK}排序
 
+### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}人口
+STR_SORT_BY_NAME                                                :{BLACK}名称
+STR_SORT_BY_DATE                                                :{BLACK}日期
 STR_SORT_BY_PRODUCTION                                          :产量
 STR_SORT_BY_TYPE                                                :类型
 STR_SORT_BY_TRANSPORTED                                         :已运输
-STR_SORT_BY_NAME                                                :{BLACK}名称
-STR_SORT_BY_DATE                                                :{BLACK}日期
 STR_SORT_BY_NUMBER                                              :序号
 STR_SORT_BY_PROFIT_LAST_YEAR                                    :去年利润
 STR_SORT_BY_PROFIT_THIS_YEAR                                    :今年利润
@@ -351,37 +342,25 @@ STR_SORT_BY_INTRO_DATE                                          :设计日期
 STR_SORT_BY_RUNNING_COST                                        :运行费用
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :功率/运行费用 比值
 STR_SORT_BY_CARGO_CAPACITY                                      :运载能力
+
 STR_NO_WAITING_CARGO                                            :{BLACK}选择无等待货物车站
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}选择全部运输工具种类
 STR_SELECT_ALL_TYPES                                            :{BLACK}选择所有货物类型{}（包括不在等待列表中的）
-STR_AVAILABLE_TRAINS                                            :{BLACK}可用的列车
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}可用的汽车
-STR_AVAILABLE_SHIPS                                             :{BLACK}可用的船只
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}可用的飞机
 STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}查看此运输工具类型的{}全部可选购列表
 STR_MANAGE_LIST                                                 :{BLACK}管理列表
 STR_MANAGE_LIST_TIP                                             :{BLACK}向所有在此列表中的运输工具发出指令
 STR_REPLACE_VEHICLES                                            :替换车辆/飞机/船只
+STR_SEND_FOR_SERVICING                                          :进行保养
+
+STR_AVAILABLE_TRAINS                                            :{BLACK}可用的列车
+STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}可用的汽车
+STR_AVAILABLE_SHIPS                                             :{BLACK}可用的船只
+STR_AVAILABLE_AIRCRAFT                                          :{BLACK}可用的飞机
+
 STR_SEND_TRAIN_TO_DEPOT                                         :前往列车车库
 STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :前往汽车车库
 STR_SEND_SHIP_TO_DEPOT                                          :前往船坞
 STR_SEND_AIRCRAFT_TO_HANGAR                                     :前往机库
-STR_SEND_FOR_SERVICING                                          :进行保养
-
-############ range for months starts
-STR_MONTH_ABBREV_JAN                                            :1月
-STR_MONTH_ABBREV_FEB                                            :2月
-STR_MONTH_ABBREV_MAR                                            :3月
-STR_MONTH_ABBREV_APR                                            :4月
-STR_MONTH_ABBREV_MAY                                            :5月
-STR_MONTH_ABBREV_JUN                                            :6月
-STR_MONTH_ABBREV_JUL                                            :7月
-STR_MONTH_ABBREV_AUG                                            :8月
-STR_MONTH_ABBREV_SEP                                            :9月
-STR_MONTH_ABBREV_OCT                                            :10月
-STR_MONTH_ABBREV_NOV                                            :11月
-STR_MONTH_ABBREV_DEC                                            :12月
-############ range for months ends
 
 STR_GRAPH_X_LABEL_MONTH                                         :{TINYFONT}{STRING}{} {STRING}
 STR_GRAPH_X_LABEL_MONTH_YEAR                                    :{TINYFONT}{STRING}{} {STRING}{}{NUM}
@@ -409,8 +388,6 @@ 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_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}窗口标题 - 拖动这里可以移动该窗口
@@ -457,7 +434,7 @@ STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :没有
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}名称
 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                                          :1号
 STR_ORDINAL_NUMBER_2ND                                          :2号
 STR_ORDINAL_NUMBER_3RD                                          :3号
@@ -491,6 +468,34 @@ STR_ORDINAL_NUMBER_30TH                                         :30号
 STR_ORDINAL_NUMBER_31ST                                         :31号
 ############ range for days ends
 
+############ range for months starts
+STR_MONTH_ABBREV_JAN                                            :1月
+STR_MONTH_ABBREV_FEB                                            :2月
+STR_MONTH_ABBREV_MAR                                            :3月
+STR_MONTH_ABBREV_APR                                            :4月
+STR_MONTH_ABBREV_MAY                                            :5月
+STR_MONTH_ABBREV_JUN                                            :6月
+STR_MONTH_ABBREV_JUL                                            :7月
+STR_MONTH_ABBREV_AUG                                            :8月
+STR_MONTH_ABBREV_SEP                                            :9月
+STR_MONTH_ABBREV_OCT                                            :10月
+STR_MONTH_ABBREV_NOV                                            :11月
+STR_MONTH_ABBREV_DEC                                            :12月
+
+STR_MONTH_JAN                                                   :1月
+STR_MONTH_FEB                                                   :2月
+STR_MONTH_MAR                                                   :3月
+STR_MONTH_APR                                                   :4月
+STR_MONTH_MAY                                                   :5月
+STR_MONTH_JUN                                                   :6月
+STR_MONTH_JUL                                                   :7月
+STR_MONTH_AUG                                                   :8月
+STR_MONTH_SEP                                                   :9月
+STR_MONTH_OCT                                                   :10月
+STR_MONTH_NOV                                                   :11月
+STR_MONTH_DEC                                                   :12月
+############ range for months ends
+
 STR_GRAPH_Y_LABEL_NUMBER                                        :{TINYFONT}{COMMA}
 
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}接受货物：{LTBLUE}
@@ -580,12 +585,9 @@ 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_COMMA                                                  :{BLUE}{COMMA}
 STR_SCENEDIT_TOOLBAR_OPENTTD                                    :{YELLOW}OpenTTD
 STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR                            :{YELLOW}场景编辑器
 STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION                   :{WHITE}生成土地
-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}随机生成土地
@@ -667,9 +669,7 @@ STR_OFF                                                         :关闭
 STR_SUMMARY                                                     :摘要
 STR_FULL                                                        :完全
 STR_STATUSBAR_COMPANY_NAME                                      :{SILVER}- -  {COMPANY}  - -
-STR_BLACK_STRING                                                :{BLACK}{STRING}
 
-STR_JUST_CHECKMARK                                              :{CHECKMARK}
 ############ range for menu starts
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :游戏选项
 STR_SETTINGS_MENU_DIFFICULTY_SETTINGS                           :难度设定
@@ -774,9 +774,6 @@ STR_STATUSBAR_SAVING_GAME                                       :{RED}*  *  保�
 STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}保存仍在继续{}请耐心等待……
 STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE                       :{BLACK}选择'Ezy街头'风格的音乐列表
 
-STR_BLACK_6                                                     :{BLACK}6
-STR_BLACK_7                                                     :{BLACK}7
-
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :英国 (原始的)
 STR_TOWNNAME_FRENCH                                             :法国
@@ -856,19 +853,6 @@ STR_OPTIONS_BASE_GRF_DESCRIPTION_TIP                            :{BLACK}关于�
 
 STR_AUTOSAVE_FAILED                                             :{WHITE}自动保存失败
 
-STR_MONTH_JAN                                                   :1月
-STR_MONTH_FEB                                                   :2月
-STR_MONTH_MAR                                                   :3月
-STR_MONTH_APR                                                   :4月
-STR_MONTH_MAY                                                   :5月
-STR_MONTH_JUN                                                   :6月
-STR_MONTH_JUL                                                   :7月
-STR_MONTH_AUG                                                   :8月
-STR_MONTH_SEP                                                   :9月
-STR_MONTH_OCT                                                   :10月
-STR_MONTH_NOV                                                   :11月
-STR_MONTH_DEC                                                   :12月
-
 STR_HEADING_FOR_STATION                                         :{LTBLUE}正在前往 {STATION}
 STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}正在前往 {STATION}，{VELOCITY}
 STR_NO_ORDERS                                                   :{LTBLUE}没有目标
@@ -883,8 +867,6 @@ STR_CRATES                                                      :件
 STR_RES_OTHER                                                   :其他
 STR_NOTHING                                                     :
 
-STR_TINY_RIGHT_ARROW                                            :{TINYFONT}{RIGHTARROW}
-
 STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}不能共享调度计划……
 STR_CANT_COPY_ORDER_LIST                                        :{WHITE}不能复制调度计划……
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - 共享调度计划结束 - -
@@ -1156,7 +1138,6 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}地图�
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :禁用
-STR_JUST_CURRENCY                                               :{CURRENCY}
 STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}改变设置值
 
 STR_TEMPERATE_LANDSCAPE                                         :温带景观
@@ -1258,11 +1239,6 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}工业�
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}距离另一工业设施过近……
 
-STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}改装列车以装载另一类型的货物
-STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}改装列车
-STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}选择希望列车装载的货物类型
-STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}让列车装载高亮选定的货物
-STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}不能改造列车……
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}改变产量
 
 ############ network gui strings
@@ -2075,6 +2051,7 @@ STR_SV_STNAME_AIRPORT                                           :{STRING} 机场
 STR_SV_STNAME_OILFIELD                                          :{STRING} 油田
 STR_SV_STNAME_MINES                                             :{STRING} 矿
 STR_SV_STNAME_DOCKS                                             :{STRING} 码头
+##id 0x6020
 STR_SV_STNAME_ANNEXE                                            :{STRING} 村
 STR_SV_STNAME_SIDINGS                                           :{STRING} 坝
 STR_SV_STNAME_BRANCH                                            :{STRING} 岔口
@@ -2122,8 +2099,6 @@ STR_NUM_LOW                                                     :低
 STR_NUM_NORMAL                                                  :一般
 STR_NUM_HIGH                                                    :高
 STR_NUM_CUSTOM                                                  :自定义
-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                                             :适中
@@ -2591,10 +2566,8 @@ STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE                          :单轨机车
 STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE                            :磁悬浮机车
 
 ##id 0x8800
-STR_DEPOT_TRAIN_CAPTION                                         :{WHITE}{TOWN} 列车车库
 STR_NEWS_FIRST_TRAIN_ARRIVAL                                    :{BLACK}{BIGFONT}市民举行庆祝仪式……{}第一列火车抵达 {STATION}！
 STR_VEHICLE_DETAILS_CAPTION                                     :{WHITE}{VEHICLE} (详细信息)
-STR_ERROR_TRAIN_IN_THE_WAY                                      :{WHITE}指定位置有列车
 STR_ORDER                                                       :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 STR_ORDER_SELECTED                                              :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 STR_ORDER_NON_STOP                                              :{BLACK}不停车
@@ -2684,37 +2657,16 @@ STR_TIMETABLE_AND_TRAVEL_FOR                                    :并行驶{STRIN
 STR_TIMETABLE_DAYS                                              :{COMMA} 天
 STR_TIMETABLE_TICKS                                             :{COMMA} 个时间标记
 
-STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}正在前往 {TOWN} 车库
-STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}正在前往 {TOWN} 车库，{VELOCITY}
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}在 {TOWN} 车库保养
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}在 {TOWN} 车库保养，{VELOCITY}
-
 STR_INVALID_ORDER                                               :{RED} (非法的调度计划)
 
 STR_UNKNOWN_STATION                                             :未知车站（目的地）
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}空
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} (来自 {STATION})
 STR_VEHICLE_DETAILS_CARGO_FROM_MULT                             :{LTBLUE}{CARGO} (来自 {STATION} (x{NUM}))
-STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} 正在车库待命
-STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}购买列车
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}列车过长
 STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}只有列车停在车库中时才能更改挂车
 
-STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}购买普通列车
-STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}购买电气化列车
-STR_BUILD_VEHICLE_TRAIN_MONORAIL_CAPTION                        :{WHITE}购买单轨列车
-STR_BUILD_VEHICLE_TRAIN_MAGLEV_CAPTION                          :{WHITE}购买磁悬浮列车
-STR_BUILD_VEHICLE_TRAIN_ALL_CAPTION                             :{WHITE}列车
-
-STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_BUTTON                    :{BLACK}购买
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}克隆汽车
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}复制这辆汽车{}Ctrl+单击 可以同时共享调度计划
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}复制汽车 按此按钮后{}点击一辆在车库内或外面的汽车即可{}Ctrl+单击 可以同时共享调度计划
-STR_CLONE_TRAIN                                                 :{BLACK}克隆列车
-STR_CLONE_TRAIN_INFO                                            :{BLACK}复制这列火车{}Ctrl+单击 可以同时共享调度计划
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}复制列车 按此按钮后{}点击一辆在车库内或外面的列车即可{}Ctrl+单击 可以同时共享调度计划
-STR_BUILD_VEHICLE_TRAIN_RENAME_BUTTON                           :{BLACK}重命名
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}跳过
 STR_ORDERS_DELETE_BUTTON                                        :{BLACK}删除
 STR_ORDERS_GO_TO_BUTTON                                         :{BLACK}前往
@@ -2730,14 +2682,12 @@ STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}切换�
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (调度计划)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}-- 调度计划结束 --
 STR_SERVICE                                                     :{BLACK}保养
-STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}不能购买列车……
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   建造年份：{LTBLUE}{NUM}{BLACK} 价值：{LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   价值：{LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
 STR_VEHICLE_STATUS_LOADING_UNLOADING                            :{LTBLUE}装载/卸货
 STR_VEHICLE_STATUS_LEAVING                                      :{LTBLUE}发车
 STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}列车必须停在一个车库中
-STR_ERROR_CAN_T_SEND_TRAIN_TO_DEPOT                             :{WHITE}不能命令列车前往车库……
 STR_ERROR_NO_MORE_SPACE_FOR_ORDERS                              :{WHITE}没有多余的调度计划的位置了……
 STR_ERROR_TOO_MANY_ORDERS                                       :{WHITE}调度计划过多……
 STR_ERROR_CAN_T_INSERT_NEW_ORDER                                :{WHITE}不能插入新的调度计划……
@@ -2752,25 +2702,11 @@ STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE}一个�
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}不能移动这项调度计划……
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}尾部的列车机车必须和头部的一起协作……
 STR_CARGO_N_A                                                   :N/A{SKIP}
-STR_ERROR_CAN_T_SELL_TRAIN                                      :{WHITE}不能出售列车……
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}找不到附近的车库……
-STR_ERROR_CAN_T_STOP_START_TRAIN                                :{WHITE}不能 启动/停止 列车！
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}保养周期：{LTBLUE}{COMMA}天{BLACK}   上次保养：{LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}保养周期：{LTBLUE}{COMMA}%{BLACK}   上次保养：{LTBLUE}{DATE_LONG}
-STR_DEPOT_TRAIN_LIST_TOOLTIP                                    :{BLACK}列车 - 点击可以查看列车详细信息{}拖动可以 增加/减少 车厢
-STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP                            :{BLACK}购买新的列车
-STR_DEPOT_TRAIN_SELL_TOOLTIP                                    :{BLACK}将列车拖到这里以出售
-STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}将屏幕中心移动到列车库所在的位置
-STR_BUILD_VEHICLE_TRAIN_LIST_TOOLTIP                            :{BLACK}列车选择列表 - 点击可以查看详细信息
-STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_TOOLTIP                   :{BLACK}购买选定的列车
-STR_BUILD_VEHICLE_TRAIN_RENAME_TOOLTIP                          :{BLACK}重命名列车型号
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP                 :{BLACK}当前列车状态{}点击可以 启动/停止 列车
-STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP                           :{BLACK}显示列车的调度计划
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP                         :{BLACK}将视点移动到列车的位置
-STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP                    :{BLACK}命令列车返回车库
 STR_VEHICLE_VIEW_TRAIN_IGNORE_SIGNAL_TOOLTIP                    :{BLACK}命令列车强行通过信号
 STR_VEHICLE_VIEW_TRAIN_REVERSE_TOOLTIP                          :{BLACK}命令列车调头
-STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}显示列车的详细信息
 STR_VEHICLE_DETAILS_INCREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}增大检修间隔
 STR_VEHICLE_DETAILS_DECREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}缩小检修间隔
 STR_VEHICLE_DETAILS_TRAIN_CARGO_TOOLTIP                         :{BLACK}显示运载货物的详情
@@ -2804,15 +2740,10 @@ STR_VEHICLE_STATUS_STOPPED                                      :{RED}停运
 STR_ERROR_CAN_T_MAKE_TRAIN_PASS_SIGNAL                          :{WHITE}不能让列车冒险通过信号...
 STR_VEHICLE_STATUS_CRASHED                                      :{RED}撞毁!
 
-STR_QUERY_RENAME_TRAIN_CAPTION                                  :{WHITE}给列车命名
-STR_ERROR_CAN_T_RENAME_TRAIN                                    :{WHITE}不能给列车命名...
-STR_VEHICLE_DETAILS_TRAIN_RENAME                                :{BLACK}给列车命名
 STR_NEWS_TRAIN_CRASH                                            :{BLACK}{BIGFONT}列车相撞!{}{COMMA} 人在爆炸中丧生
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}不能命令列车调头...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE                  :{WHITE}无法调转车辆方向...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}不能命令多节的汽车掉头
-STR_QUERY_RENAME_TRAIN_TYPE_CAPTION                             :{WHITE}重命名车辆的类型
-STR_ERROR_CAN_T_RENAME_TRAIN_TYPE                               :{WHITE}不能重命名车辆的类型...
 STR_CLEAR_TIME                                                  :{BLACK}清除时间
 STR_RESET_LATENESS                                              :{BLACK}清除晚点计数器
 STR_CHANGE_WAYPOINT_NAME                                        :{BLACK}修改路点名
@@ -2844,43 +2775,14 @@ STR_TIMETABLE_AUTOFILL                                          :{BLACK}自动�
 STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}根据下一次运行的时间自动填充时间表{}(CRTL+单击 可保持等候时间)
 
 ##id 0x9000
-STR_ERROR_ROAD_VEHICLE_IN_THE_WAY                               :{WHITE}指定的位置有汽车
-STR_DEPOT_ROAD_VEHICLE_CAPTION                                  :{WHITE}{TOWN} 车库
-STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_BUTTON                      :{BLACK}购买汽车
-STR_BUILD_VEHICLE_ROAD_VEHICLE_CAPTION                          :{WHITE}购买汽车
-STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_BUTTON             :{BLACK}购买汽车
-STR_ERROR_CAN_T_BUILD_ROAD_VEHICLE                              :{WHITE}不能购买汽车...
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}...必须完全停在一个车库中
-STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}不能出售汽车...
-STR_ERROR_CAN_T_STOP_START_ROAD_VEHICLE                         :{WHITE}不能 停止/启动 汽车...
-STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} 正在车库待命
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}正在前往 {TOWN} 车库
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}正在前往 {TOWN} 车库，{VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}正在 {TOWN} 车库保养
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}正在 {TOWN} 车库保养，{VELOCITY}
-STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}不能命令该汽车前往车库...
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}在附近找不到车库
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP          :{BLACK}当前车辆的状态{}单击这里可以 停止/启动 车辆
-STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP                    :{BLACK}显示车辆的调度指令
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP                  :{BLACK}将屏幕中心移动到汽车所在的位置
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}命令汽车前往车库{}Ctrl+单击 时汽车只进行保养
 STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP                   :{BLACK}强制汽车掉头
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}显示汽车的详细信息
-STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}汽车 - 点击可以查看详细信息
-STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}购买
-STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}将汽车拖到这里以出售
-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_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})
 
-STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}命名汽车
-STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}不能命名汽车……
-STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}命名汽车
 STR_NEWS_FIRST_BUS_ARRIVAL                                      :{BLACK}{BIGFONT}市民举行庆祝仪式……{}第一辆巴士抵达 {STATION}！
 STR_NEWS_FIRST_TRUCK_ARRIVAL                                    :{BLACK}{BIGFONT}市民举行庆祝仪式……{}第一辆货车抵达 {STATION}！
 STR_NEWS_FIRST_PASSENGER_TRAM_ARRIVAL                           :{BLACK}{BIGFONT}市民欢庆~. . .{}首辆客运电车抵达 {STATION}!
@@ -2888,128 +2790,39 @@ STR_NEWS_FIRST_CARGO_TRAM_ARRIVAL                               :{BLACK}{BIGFONT
 STR_NEWS_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}汽车事故！{}汽车与火车相撞，司机在事故中丧生！
 STR_NEWS_ROAD_VEHICLE_CRASH                                     :{BLACK}{BIGFONT}汽车事故！{}汽车与火车相撞，{COMMA} 人在事故中丧生！
 STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}车辆无法调头...
-STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}重命名
-STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}重命名汽车型号
-STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}重命名汽车型号
-STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}不能重命名汽车型号……
 
-STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}改装汽车以运载其他货物
-STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}改装汽车
-STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}改装汽车以运输选择的货物类型
-STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}不能改装汽车……
-STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}选择要运输的货物类型：
 
 ##id 0x9800
 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :水运建设
 STR_WATERWAYS_TOOLBAR_CAPTION                                   :{WHITE}水运建设
 STR_WATERWAYS_TOOLBAR_CAPTION_SE                                :{WHITE}水运
 STR_ERROR_CAN_T_BUILD_DOCK_HERE                                 :{WHITE}不能在这里新建码头……
-STR_DEPOT_SHIP_CAPTION                                          :{WHITE}{TOWN} 船坞
-STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON                              :{BLACK}购买船只
-STR_BUILD_VEHICLE_SHIP_CAPTION                                  :{WHITE}购买船只
-STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON                     :{BLACK}购买船只
-STR_CLONE_SHIP                                                  :{BLACK}克隆船只
-STR_CLONE_SHIP_INFO                                             :{BLACK}复制当前选定的船只{}Ctrl+单击 可以同时共享调度计划
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}复制船只，按此按钮后点击一个在船坞内或外面的船只即可。Ctrl+单击可以同时共享调度计划。
 STR_ERROR_SHIP_MUST_BE_STOPPED_IN_DEPOT                         :{WHITE}船只必须停靠在船坞内。
-STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}不能出售船只……
-STR_ERROR_CAN_T_BUILD_SHIP                                      :{WHITE}不能建造船只……
-STR_ERROR_SHIP_IN_THE_WAY                                       :{WHITE}前方有另一艘船只……
-STR_ERROR_CAN_T_STOP_START_SHIP                                 :{WHITE}不能 停止/启动 船只……
-STR_ERROR_CAN_T_SEND_SHIP_TO_DEPOT                              :{WHITE}不能命令船只前往船坞……
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}正在前往 {TOWN} 船坞
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}正在前往 {TOWN} 船坞，{VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}正在 {TOWN} 船坞保养
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}正在 {TOWN} 船坞保养，{VELOCITY}
-STR_NEWS_SHIP_IS_WAITING                                        :{WHITE}{VEHICLE} 正在船坞待命
 STR_WATERWAYS_TOOLBAR_BUILD_DOCK_TOOLTIP                        :{BLACK}建造码头
 STR_WATERWAYS_TOOLBAR_BUILD_DEPOT_TOOLTIP                       :{BLACK}建造船坞 (可以购买或保养船只)
-STR_DEPOT_SHIP_LIST_TOOLTIP                                     :{BLACK}船只 - 点击可以查看详细信息
-STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}购买新船只
-STR_DEPOT_SHIP_SELL_TOOLTIP                                     :{BLACK}将船只拖到这里以出售
-STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}将屏幕中心移动到当前船坞的位置
-STR_BUILD_VEHICLE_SHIP_LIST_TOOLTIP                             :{BLACK}船只列表 - 点击可以查看详细信息
-STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP                    :{BLACK}购买选定的船只
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP                  :{BLACK}船只当前的状态{}点击可以 启动/停止 船只
-STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}显示船只的调度计划
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP                          :{BLACK}将屏幕中心移动到船只所在的位置
-STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}命令船只前往船坞{}Ctrl+单击 时船只只进行保养
-STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}显示船只的详情
-STR_VEHICLE_DETAILS_SHIP_RENAME                                 :{BLACK}命名船只
 
-STR_QUERY_RENAME_SHIP_CAPTION                                   :{WHITE}命名船只
-STR_ERROR_CAN_T_RENAME_SHIP                                     :{WHITE}不能命名船只
 STR_NEWS_FIRST_SHIP_ARRIVAL                                     :{BLACK}{BIGFONT}市民举行庆祝仪式……{}第一艘船抵达 {STATION}！
 STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}放置一个浮标
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}不能将浮标放置在这里。
 STR_BUILD_AQUEDUCT                                              :{BLACK}建设水渠
 STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}无法在此建设水渠……
-STR_BUILD_VEHICLE_SHIP_RENAME_BUTTON                            :{BLACK}重命名
-STR_BUILD_VEHICLE_SHIP_RENAME_TOOLTIP                           :{BLACK}重命名船只型号
-STR_QUERY_RENAME_SHIP_TYPE_CAPTION                              :{WHITE}重命名船只型号
-STR_ERROR_CAN_T_RENAME_SHIP_TYPE                                :{WHITE}不能重命名船只型号……
-STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}改装船只以装载其他货物
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (改装)
-STR_REFIT_SHIP_REFIT_BUTTON                                     :{BLACK}改装船只
-STR_REFIT_SHIP_LIST_TOOLTIP                                     :{BLACK}选择希望船只装载的货物类型
-STR_REFIT_SHIP_REFIT_TOOLTIP                                    :{BLACK}改装船只以运输选择的货物类型
 STR_REFIT_TITLE                                                 :{GOLD}选择要运输的货物类型：
 STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}新的装载能力：{GOLD}{CARGO}{}{BLACK}改装费用：{GOLD}{CURRENCY}
-STR_ERROR_CAN_T_REFIT_SHIP                                      :{WHITE}不能改装船只……
 STR_REFITTABLE                                                  :(可改装)
 
 ##id 0xA000
 STR_TOOLBAR_AIRCRAFT_CAPTION                                    :{WHITE}机场
 STR_ERROR_CAN_T_BUILD_AIRPORT_HERE                              :{WHITE}不能在这里兴建机场……
-STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}{STATION} 机库
-STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON                          :{BLACK}购买飞机
-STR_CLONE_AIRCRAFT                                              :{BLACK}克隆飞机
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}复制当前选定的飞机{}Ctrl+单击 可以同时共享调度计划
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK} 复制飞机 按此按钮后 {}点击一个在机库内或外面的飞机即可{}Ctrl+单击 可以同时共享调度计划
-STR_BUILD_VEHICLE_AIRCRAFT_CAPTION                              :{WHITE}购买飞机
-STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON                 :{BLACK}购买
-STR_ERROR_CAN_T_BUILD_AIRCRAFT                                  :{WHITE}不能购买飞机……
-STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR                         :{WHITE}不能命令飞机返回机库……
-STR_HEADING_FOR_HANGAR                                          :{ORANGE}正在前往 {STATION} 的机库
-STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}正在前往 {STATION} 的机库，{VELOCITY}
-STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}正在 {STATION} 的机库保养
-STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}正在 {STATION} 的机库保养，{VELOCITY}
-STR_NEWS_AIRCRAFT_IS_WAITING                                    :{WHITE}{VEHICLE} 正在机库待命
-STR_ERROR_AIRCRAFT_IN_THE_WAY                                   :{WHITE}指定位置有飞机
-STR_ERROR_CAN_T_STOP_START_AIRCRAFT                             :{WHITE}不能 启动/停止 飞机
 STR_ERROR_AIRCRAFT_IS_IN_FLIGHT                                 :{WHITE}飞机正在飞行
 STR_ERROR_AIRCRAFT_MUST_BE_STOPPED                              :{WHITE}飞机必须在机库中停止
-STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}不能出售飞机……
 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION                          :机场建设
 STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}新建机场
-STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}飞机 - 点击可以查看详细信息
-STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}购买飞机
-STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}将飞机拖到这里以出售
-STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}将屏幕中心移动到当前机库的位置
-STR_BUILD_VEHICLE_AIRCRAFT_LIST_TOOLTIP                         :{BLACK}飞机列表 - 点击可以查看详细信息
-STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_TOOLTIP                :{BLACK}购买选定的飞机
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP              :{BLACK}飞机当前的状态{}点击可以 启动/停止 已降落的飞机
-STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}显示飞机的调度计划
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP                      :{BLACK}将屏幕中心移动到飞机所在的位置
-STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}命令飞机前往机库{}Ctrl+单击 时飞机只进行保养
-STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}显示飞机的详情
 
-STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}命名飞机
-STR_ERROR_CAN_T_RENAME_AIRCRAFT                                 :{WHITE}不能为飞机命名……
-STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}命名飞机
 STR_NEWS_FIRST_AIRCRAFT_ARRIVAL                                 :{BLACK}{BIGFONT}市民举行庆祝仪式……{}第一架飞机到达 {STATION} ！
 STR_NEWS_AIRCRAFT_CRASH                                         :{BLACK}{BIGFONT}飞机坠毁！{}{COMMA} 人在 {STATION} 的事故中罹难！
 STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}飞机坠毁！{}燃油不足，{COMMA} 人在事故中罹难！
 STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
-STR_BUILD_VEHICLE_AIRCRAFT_RENAME_BUTTON                        :{BLACK}重命名飞机
-STR_BUILD_VEHICLE_AIRCRAFT_RENAME_TOOLTIP                       :{BLACK}重命名飞机型号
-STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION                          :{WHITE}重命名飞机型号
-STR_ERROR_CAN_T_RENAME_AIRCRAFT_TYPE                            :{WHITE}不能重命名型号类型……
-STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}改装飞机装载货物的类型
-STR_REFIT_AIRCRAFT_REFIT_BUTTON                                 :{BLACK}改装飞机
-STR_REFIT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}选择希望飞机装载的货物类型
-STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}改装飞机以运输选择的货物类型
-STR_ERROR_CAN_T_REFIT_AIRCRAFT                                  :{WHITE}不能改装飞机……
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (时间表)
 
@@ -3177,6 +2990,211 @@ STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING}
 STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}与 {COMMA} 车辆/船只/飞机共享调度计划
 STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}显示所有共享此调度计划的{}车辆/船只/飞机
 
+STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} 正在车库待命
+STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} 正在车库待命
+STR_NEWS_SHIP_IS_WAITING                                        :{WHITE}{VEHICLE} 正在船坞待命
+STR_NEWS_AIRCRAFT_IS_WAITING                                    :{WHITE}{VEHICLE} 正在机库待命
+
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}改装列车
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}改装汽车
+STR_REFIT_SHIP_REFIT_BUTTON                                     :{BLACK}改装船只
+STR_REFIT_AIRCRAFT_REFIT_BUTTON                                 :{BLACK}改装飞机
+
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}让列车装载高亮选定的货物
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}改装汽车以运输选择的货物类型
+STR_REFIT_SHIP_REFIT_TOOLTIP                                    :{BLACK}改装船只以运输选择的货物类型
+STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}改装飞机以运输选择的货物类型
+
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}选择希望列车装载的货物类型
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}选择要运输的货物类型：
+STR_REFIT_SHIP_LIST_TOOLTIP                                     :{BLACK}选择希望船只装载的货物类型
+STR_REFIT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}选择希望飞机装载的货物类型
+
+STR_DEPOT_TRAIN_CAPTION                                         :{WHITE}{TOWN} 列车车库
+STR_DEPOT_ROAD_VEHICLE_CAPTION                                  :{WHITE}{TOWN} 车库
+STR_DEPOT_SHIP_CAPTION                                          :{WHITE}{TOWN} 船坞
+STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}{STATION} 机库
+
+STR_VEHICLE_DETAILS_TRAIN_RENAME                                :{BLACK}给列车命名
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}命名汽车
+STR_VEHICLE_DETAILS_SHIP_RENAME                                 :{BLACK}命名船只
+STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}命名飞机
+
+STR_QUERY_RENAME_TRAIN_CAPTION                                  :{WHITE}给列车命名
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}命名汽车
+STR_QUERY_RENAME_SHIP_CAPTION                                   :{WHITE}命名船只
+STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}命名飞机
+
+STR_ERROR_TRAIN_IN_THE_WAY                                      :{WHITE}指定位置有列车
+STR_ERROR_ROAD_VEHICLE_IN_THE_WAY                               :{WHITE}指定的位置有汽车
+STR_ERROR_SHIP_IN_THE_WAY                                       :{WHITE}前方有另一艘船只……
+STR_ERROR_AIRCRAFT_IN_THE_WAY                                   :{WHITE}指定位置有飞机
+
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}不能改造列车……
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}不能改装汽车……
+STR_ERROR_CAN_T_REFIT_SHIP                                      :{WHITE}不能改装船只……
+STR_ERROR_CAN_T_REFIT_AIRCRAFT                                  :{WHITE}不能改装飞机……
+
+STR_ERROR_CAN_T_RENAME_TRAIN                                    :{WHITE}不能给列车命名...
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}不能命名汽车……
+STR_ERROR_CAN_T_RENAME_SHIP                                     :{WHITE}不能命名船只
+STR_ERROR_CAN_T_RENAME_AIRCRAFT                                 :{WHITE}不能为飞机命名……
+
+STR_ERROR_CAN_T_STOP_START_TRAIN                                :{WHITE}不能 启动/停止 列车！
+STR_ERROR_CAN_T_STOP_START_ROAD_VEHICLE                         :{WHITE}不能 停止/启动 汽车...
+STR_ERROR_CAN_T_STOP_START_SHIP                                 :{WHITE}不能 停止/启动 船只……
+STR_ERROR_CAN_T_STOP_START_AIRCRAFT                             :{WHITE}不能 启动/停止 飞机
+
+STR_ERROR_CAN_T_SEND_TRAIN_TO_DEPOT                             :{WHITE}不能命令列车前往车库……
+STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}不能命令该汽车前往车库...
+STR_ERROR_CAN_T_SEND_SHIP_TO_DEPOT                              :{WHITE}不能命令船只前往船坞……
+STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR                         :{WHITE}不能命令飞机返回机库……
+
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}不能购买列车……
+STR_ERROR_CAN_T_BUILD_ROAD_VEHICLE                              :{WHITE}不能购买汽车...
+STR_ERROR_CAN_T_BUILD_SHIP                                      :{WHITE}不能建造船只……
+STR_ERROR_CAN_T_BUILD_AIRCRAFT                                  :{WHITE}不能购买飞机……
+
+STR_ERROR_CAN_T_RENAME_TRAIN_TYPE                               :{WHITE}不能重命名车辆的类型...
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}不能重命名汽车型号……
+STR_ERROR_CAN_T_RENAME_SHIP_TYPE                                :{WHITE}不能重命名船只型号……
+STR_ERROR_CAN_T_RENAME_AIRCRAFT_TYPE                            :{WHITE}不能重命名型号类型……
+
+STR_ERROR_CAN_T_SELL_TRAIN                                      :{WHITE}不能出售列车……
+STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}不能出售汽车...
+STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}不能出售船只……
+STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}不能出售飞机……
+
+STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP                 :{BLACK}当前列车状态{}点击可以 启动/停止 列车
+STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP          :{BLACK}当前车辆的状态{}单击这里可以 停止/启动 车辆
+STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP                  :{BLACK}船只当前的状态{}点击可以 启动/停止 船只
+STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP              :{BLACK}飞机当前的状态{}点击可以 启动/停止 已降落的飞机
+
+STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP                           :{BLACK}显示列车的调度计划
+STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP                    :{BLACK}显示车辆的调度指令
+STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}显示船只的调度计划
+STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}显示飞机的调度计划
+
+STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP                         :{BLACK}将视点移动到列车的位置
+STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP                  :{BLACK}将屏幕中心移动到汽车所在的位置
+STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP                          :{BLACK}将屏幕中心移动到船只所在的位置
+STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP                      :{BLACK}将屏幕中心移动到飞机所在的位置
+
+STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP                    :{BLACK}命令列车返回车库
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}命令汽车前往车库{}Ctrl+单击 时汽车只进行保养
+STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}命令船只前往船坞{}Ctrl+单击 时船只只进行保养
+STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}命令飞机前往机库{}Ctrl+单击 时飞机只进行保养
+
+STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}显示列车的详细信息
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}显示汽车的详细信息
+STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}显示船只的详情
+STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}显示飞机的详情
+
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}改装列车以装载另一类型的货物
+STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}改装汽车以运载其他货物
+STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}改装船只以装载其他货物
+STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}改装飞机装载货物的类型
+
+STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}正在前往 {TOWN} 车库
+STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}正在前往 {TOWN} 车库，{VELOCITY}
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}正在前往 {TOWN} 车库
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}正在前往 {TOWN} 车库，{VELOCITY}
+STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}正在前往 {TOWN} 船坞
+STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}正在前往 {TOWN} 船坞，{VELOCITY}
+STR_HEADING_FOR_HANGAR                                          :{ORANGE}正在前往 {STATION} 的机库
+STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}正在前往 {STATION} 的机库，{VELOCITY}
+
+STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}在 {TOWN} 车库保养
+STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}在 {TOWN} 车库保养，{VELOCITY}
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}正在 {TOWN} 车库保养
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}正在 {TOWN} 车库保养，{VELOCITY}
+STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}正在 {TOWN} 船坞保养
+STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}正在 {TOWN} 船坞保养，{VELOCITY}
+STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}正在 {STATION} 的机库保养
+STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}正在 {STATION} 的机库保养，{VELOCITY}
+
+
+STR_CLONE_TRAIN                                                 :{BLACK}克隆列车
+STR_CLONE_ROAD_VEHICLE                                          :{BLACK}克隆汽车
+STR_CLONE_SHIP                                                  :{BLACK}克隆船只
+STR_CLONE_AIRCRAFT                                              :{BLACK}克隆飞机
+
+STR_CLONE_TRAIN_INFO                                            :{BLACK}复制这列火车{}Ctrl+单击 可以同时共享调度计划
+STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}复制这辆汽车{}Ctrl+单击 可以同时共享调度计划
+STR_CLONE_SHIP_INFO                                             :{BLACK}复制当前选定的船只{}Ctrl+单击 可以同时共享调度计划
+STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}复制当前选定的飞机{}Ctrl+单击 可以同时共享调度计划
+
+STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}复制列车 按此按钮后{}点击一辆在车库内或外面的列车即可{}Ctrl+单击 可以同时共享调度计划
+STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}复制汽车 按此按钮后{}点击一辆在车库内或外面的汽车即可{}Ctrl+单击 可以同时共享调度计划
+STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}复制船只，按此按钮后点击一个在船坞内或外面的船只即可。Ctrl+单击可以同时共享调度计划。
+STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK} 复制飞机 按此按钮后 {}点击一个在机库内或外面的飞机即可{}Ctrl+单击 可以同时共享调度计划
+
+STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}购买普通列车
+STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}购买电气化列车
+STR_BUILD_VEHICLE_TRAIN_MONORAIL_CAPTION                        :{WHITE}购买单轨列车
+STR_BUILD_VEHICLE_TRAIN_MAGLEV_CAPTION                          :{WHITE}购买磁悬浮列车
+
+STR_BUILD_VEHICLE_TRAIN_ALL_CAPTION                             :{WHITE}列车
+STR_BUILD_VEHICLE_ROAD_VEHICLE_CAPTION                          :{WHITE}购买汽车
+STR_BUILD_VEHICLE_SHIP_CAPTION                                  :{WHITE}购买船只
+STR_BUILD_VEHICLE_AIRCRAFT_CAPTION                              :{WHITE}购买飞机
+
+STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_BUTTON                    :{BLACK}购买
+STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_BUTTON             :{BLACK}购买汽车
+STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON                     :{BLACK}购买船只
+STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON                 :{BLACK}购买
+
+STR_BUILD_VEHICLE_TRAIN_LIST_TOOLTIP                            :{BLACK}列车选择列表 - 点击可以查看详细信息
+STR_BUILD_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP                     :{BLACK}汽车列表 - 点击可以查看详细信息
+STR_BUILD_VEHICLE_SHIP_LIST_TOOLTIP                             :{BLACK}船只列表 - 点击可以查看详细信息
+STR_BUILD_VEHICLE_AIRCRAFT_LIST_TOOLTIP                         :{BLACK}飞机列表 - 点击可以查看详细信息
+
+STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_TOOLTIP                   :{BLACK}购买选定的列车
+STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_TOOLTIP            :{BLACK}购买选定的汽车
+STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP                    :{BLACK}购买选定的船只
+STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_TOOLTIP                :{BLACK}购买选定的飞机
+
+STR_BUILD_VEHICLE_TRAIN_RENAME_BUTTON                           :{BLACK}重命名
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}重命名
+STR_BUILD_VEHICLE_SHIP_RENAME_BUTTON                            :{BLACK}重命名
+STR_BUILD_VEHICLE_AIRCRAFT_RENAME_BUTTON                        :{BLACK}重命名飞机
+
+STR_BUILD_VEHICLE_TRAIN_RENAME_TOOLTIP                          :{BLACK}重命名列车型号
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}重命名汽车型号
+STR_BUILD_VEHICLE_SHIP_RENAME_TOOLTIP                           :{BLACK}重命名船只型号
+STR_BUILD_VEHICLE_AIRCRAFT_RENAME_TOOLTIP                       :{BLACK}重命名飞机型号
+
+STR_QUERY_RENAME_TRAIN_TYPE_CAPTION                             :{WHITE}重命名车辆的类型
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}重命名汽车型号
+STR_QUERY_RENAME_SHIP_TYPE_CAPTION                              :{WHITE}重命名船只型号
+STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION                          :{WHITE}重命名飞机型号
+
+STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}购买列车
+STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_BUTTON                      :{BLACK}购买汽车
+STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON                              :{BLACK}购买船只
+STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON                          :{BLACK}购买飞机
+
+STR_DEPOT_TRAIN_LIST_TOOLTIP                                    :{BLACK}列车 - 点击可以查看列车详细信息{}拖动可以 增加/减少 车厢
+STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}汽车 - 点击可以查看详细信息
+STR_DEPOT_SHIP_LIST_TOOLTIP                                     :{BLACK}船只 - 点击可以查看详细信息
+STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}飞机 - 点击可以查看详细信息
+
+STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP                            :{BLACK}购买新的列车
+STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}购买
+STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}购买新船只
+STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}购买飞机
+
+STR_DEPOT_TRAIN_SELL_TOOLTIP                                    :{BLACK}将列车拖到这里以出售
+STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}将汽车拖到这里以出售
+STR_DEPOT_SHIP_SELL_TOOLTIP                                     :{BLACK}将船只拖到这里以出售
+STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}将飞机拖到这里以出售
+
+STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}将屏幕中心移动到列车库所在的位置
+STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}将屏幕中心移动到车库所在的位置
+STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}将屏幕中心移动到当前船坞的位置
+STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}将屏幕中心移动到当前机库的位置
+
+
 ### depot strings
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}你将要出售车库中的所有车辆，确定吗？
 STR_DEPOT_WRONG_DEPOT_TYPE                                      :车库类型错误
@@ -3211,6 +3229,7 @@ STR_REPLACE_REMOVE_WAGON                                        :{BLACK}清理�
 STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}当车辆升级可能造成列车变长时{}自动去掉若干挂车以保证列车长度不变
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}替换项目： {ORANGE}{SKIP}{SKIP}{STRING}
 STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}可以切换 机车/挂车 替换项目
+
 STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}列车不可用
 STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}车辆不可用
 STR_SHIP_NOT_AVAILABLE                                          :{WHITE}船只不可用
@@ -3425,7 +3444,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}
@@ -3443,6 +3465,31 @@ STR_FORMAT_COMPANY_NUM                                          :(公司 {COMMA}
 STR_FORMAT_GROUP_NAME                                           :组 {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}名称重复!请重新命名.
 
 #### Improved sign GUI
diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt
index c3d615811..41a2db076 100644
--- a/src/lang/slovak.txt
+++ b/src/lang/slovak.txt
@@ -218,8 +218,6 @@ STR_ABBREV_PLASTIC                                              :{TINYFONT}ZU
 STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}SU
 STR_ABBREV_NONE                                                 :{TINYFONT}NIC
 STR_ABBREV_ALL                                                  :{TINYFONT}VS.
-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
@@ -231,17 +229,11 @@ STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Povodný
 STR_ABOUT_VERSION                                               :{BLACK}OpenTTD verzia {REV}
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 team OpenTTD
 
-STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
-STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_QUIT_CAPTION                                                :{WHITE}Koniec
 STR_YES                                                         :{BLACK}Áno
 STR_NO                                                          :{BLACK}Nie
 STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Si si istý že chces ukoncit hru a vrátit sa do {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                                                :Nic
 STR_COLOUR_DARK_BLUE                                            :Tmavomodrá
 STR_COLOUR_PALE_GREEN                                           :Svetlozelená
@@ -260,8 +252,6 @@ STR_COLOUR_BROWN                                                :Hnedá
 STR_COLOUR_GREY                                                 :Sedá
 STR_COLOUR_WHITE                                                :Biela
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}V hre je prílis vela dopravných prostriedkov
-STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
-STR_RED_COMMA                                                   :{RED}{COMMA}
 STR_BUTTON_LOCATION                                             :{BLACK}Poloha
 STR_SMALLMAP_TYPE_CONTOURS                                      :Vrstevnice
 STR_SMALLMAP_TYPE_CONTOURS.g                                    :vrstevnic
@@ -390,12 +380,13 @@ STR_SORT_CRITERIA_TIP                                           :{BLACK}Vyber kr
 STR_FILTER_CRITERIA_TIP                                         :{BLACK}Vybrať kritériá filtrovania
 STR_SORT_BY                                                     :{BLACK}Usporiadat
 
+### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}Populacia
+STR_SORT_BY_NAME                                                :{BLACK}Nazov
+STR_SORT_BY_DATE                                                :{BLACK}Datum
 STR_SORT_BY_PRODUCTION                                          :Produkcia
 STR_SORT_BY_TYPE                                                :Typ
 STR_SORT_BY_TRANSPORTED                                         :Prepravene
-STR_SORT_BY_NAME                                                :{BLACK}Nazov
-STR_SORT_BY_DATE                                                :{BLACK}Datum
 STR_SORT_BY_NUMBER                                              :Cislo
 STR_SORT_BY_PROFIT_LAST_YEAR                                    :Zisk v poslednom roku
 STR_SORT_BY_PROFIT_THIS_YEAR                                    :Zisk v tomto roku
@@ -418,37 +409,25 @@ STR_SORT_BY_INTRO_DATE                                          :Uvedenie na trh
 STR_SORT_BY_RUNNING_COST                                        :Náklady na prevádzku
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :Výkon/Náklady na prevádzku
 STR_SORT_BY_CARGO_CAPACITY                                      :Kapacita nákladu
+
 STR_NO_WAITING_CARGO                                            :{BLACK}Necaka ziadny typ nakladu
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}Oznacit vsetky moznosti
 STR_SELECT_ALL_TYPES                                            :{BLACK}Oznacit vsetky druhy nakladu (vratane druhu, kt. necaka na prepravu)
-STR_AVAILABLE_TRAINS                                            :{BLACK}Dostupné vlaky
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Dostupné vozidlá
-STR_AVAILABLE_SHIPS                                             :{BLACK}Dostupné lode
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Dostupné lietadlá
 STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Zobrazit zoznam dostupných dizajnov rušňov pre tento typ.
 STR_MANAGE_LIST                                                 :{BLACK}Možnosti
 STR_MANAGE_LIST_TIP                                             :{BLACK}Zadat príkazy všetkým vozidlám v zozname
 STR_REPLACE_VEHICLES                                            :Vymena vozidiel
+STR_SEND_FOR_SERVICING                                          :Vykonat servis
+
+STR_AVAILABLE_TRAINS                                            :{BLACK}Dostupné vlaky
+STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Dostupné vozidlá
+STR_AVAILABLE_SHIPS                                             :{BLACK}Dostupné lode
+STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Dostupné lietadlá
+
 STR_SEND_TRAIN_TO_DEPOT                                         :Poslat do depa
 STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Poslat do garáže
 STR_SEND_SHIP_TO_DEPOT                                          :Poslat do lodenice
 STR_SEND_AIRCRAFT_TO_HANGAR                                     :Poslat do hangáru
-STR_SEND_FOR_SERVICING                                          :Vykonat servis
-
-############ 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                                            :Máj
-STR_MONTH_ABBREV_JUN                                            :Jún
-STR_MONTH_ABBREV_JUL                                            :Júl
-STR_MONTH_ABBREV_AUG                                            :Aug
-STR_MONTH_ABBREV_SEP                                            :Sep
-STR_MONTH_ABBREV_OCT                                            :Okt
-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}
@@ -476,8 +455,6 @@ 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_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
@@ -524,7 +501,7 @@ STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Neznáme
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Meno
 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                                          :1.
 STR_ORDINAL_NUMBER_2ND                                          :2.
 STR_ORDINAL_NUMBER_3RD                                          :3.
@@ -558,6 +535,34 @@ STR_ORDINAL_NUMBER_30TH                                         :30.
 STR_ORDINAL_NUMBER_31ST                                         :31.
 ############ 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                                            :Máj
+STR_MONTH_ABBREV_JUN                                            :Jún
+STR_MONTH_ABBREV_JUL                                            :Júl
+STR_MONTH_ABBREV_AUG                                            :Aug
+STR_MONTH_ABBREV_SEP                                            :Sep
+STR_MONTH_ABBREV_OCT                                            :Okt
+STR_MONTH_ABBREV_NOV                                            :Nov
+STR_MONTH_ABBREV_DEC                                            :Dec
+
+STR_MONTH_JAN                                                   :Januar
+STR_MONTH_FEB                                                   :Februar
+STR_MONTH_MAR                                                   :Marec
+STR_MONTH_APR                                                   :April
+STR_MONTH_MAY                                                   :Máj
+STR_MONTH_JUN                                                   :Jún
+STR_MONTH_JUL                                                   :Júl
+STR_MONTH_AUG                                                   :August
+STR_MONTH_SEP                                                   :September
+STR_MONTH_OCT                                                   :Oktober
+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}Prijíma náklad: {LTBLUE}
@@ -647,12 +652,9 @@ 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_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_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
@@ -734,9 +736,7 @@ STR_OFF                                                         :Vypnute
 STR_SUMMARY                                                     :Obsah
 STR_FULL                                                        :Plne
 STR_STATUSBAR_COMPANY_NAME                                      :{SILVER}- -  {COMPANY}  - -
-STR_BLACK_STRING                                                :{BLACK}{STRING}
 
-STR_JUST_CHECKMARK                                              :{CHECKMARK}
 ############ range for menu starts
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Nastavenia hry
 STR_SETTINGS_MENU_DIFFICULTY_SETTINGS                           :Nastavenia obtiaznosti
@@ -828,9 +828,6 @@ STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY                             :Financovat novy
 ############ range ends here
 
 STR_FUND_INDUSTRY_CAPTION                                       :{WHITE}Financovat novy priemysel
-STR_JUST_STRING                                                 :{STRING}
-STR_JUST_RAW_STRING                                             :{STRING}
-STR_JUST_INT                                                    :{NUM}
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_RAINFOREST                       :{WHITE}... moze byt postavene len v dazdovom pralese
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT                           :{WHITE}... moze byt postavene len v pusti
 STR_STATUSBAR_PAUSED                                            :{YELLOW}* *  ZASTAVENE  *  *
@@ -844,9 +841,6 @@ 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_BLACK_6                                                     :{BLACK}6
-STR_BLACK_7                                                     :{BLACK}7
-
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Anglicke
 STR_TOWNNAME_FRENCH                                             :Francuzke
@@ -926,19 +920,6 @@ STR_OPTIONS_BASE_GRF_DESCRIPTION_TIP                            :{BLACK}Dodatoč
 
 STR_AUTOSAVE_FAILED                                             :{WHITE}Autoulozenie zlyhalo
 
-STR_MONTH_JAN                                                   :Januar
-STR_MONTH_FEB                                                   :Februar
-STR_MONTH_MAR                                                   :Marec
-STR_MONTH_APR                                                   :April
-STR_MONTH_MAY                                                   :Máj
-STR_MONTH_JUN                                                   :Jún
-STR_MONTH_JUL                                                   :Júl
-STR_MONTH_AUG                                                   :August
-STR_MONTH_SEP                                                   :September
-STR_MONTH_OCT                                                   :Oktober
-STR_MONTH_NOV                                                   :November
-STR_MONTH_DEC                                                   :December
-
 STR_HEADING_FOR_STATION                                         :{LTBLUE}Smeruje do {STATION}
 STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}Smeruje do {STATION}, {VELOCITY}
 STR_NO_ORDERS                                                   :{LTBLUE}Bez urcenia
@@ -953,8 +934,6 @@ STR_CRATES                                                      :debien
 STR_RES_OTHER                                                   :iné
 STR_NOTHING                                                     :
 
-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 ...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Koniec zdielanych prikazov - -
@@ -1226,7 +1205,6 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Y-rozme
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :zakazane
-STR_JUST_CURRENCY                                               :{CURRENCY}
 STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Zmenit hodnotu nastavenia
 
 STR_TEMPERATE_LANDSCAPE                                         :krajina mierneho pasma
@@ -1262,7 +1240,6 @@ STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}Vyber ty
 
 STR_WAYPOINT_VIEWPORT                                           :{WHITE}{WAYPOINT}
 STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WHITE}{WAYPOINT}
-STR_WAYPOINT_NAME                                               :{WAYPOINT}
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Upravit nazvy smerovych bodov
 
 STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}Nazov smeroveho bodu sa neda zmenit ...
@@ -1329,11 +1306,6 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Názvy p
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}... prilis blizko ineho priemyslu
 
-STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Prestavat vlak na prepravu ineho nakladu
-STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Prestavat vlak
-STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Vybrat typ prepravovaneho nakladu
-STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Prestavat vlak na prepravu vybraneho nakladu
-STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Nemozno prestavat vlak ...
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Zmenit produkciu
 
 ############ network gui strings
@@ -1843,11 +1815,6 @@ STR_TOWN_BUILDING_NAME_TEPEES_1                                 :Vigvam
 STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1                           :Kaviaren
 STR_TOWN_BUILDING_NAME_PIGGY_BANK_1                             :Mala Banka
 
-STR_INDUSTRY_NAME                                               :{INDUSTRY}
-STR_TOWN_NAME                                                   :{TOWN}
-STR_FORMAT_INDUSTRY_NAME                                        :{1:STRING} {0:TOWN}
-STR_STATION_NAME                                                :{STATION}
-
 ##id 0x2800
 STR_LANDSCAPING_MENU_LANDSCAPING                                :Uprava terenu
 STR_LANDSCAPING_MENU_PLANT_TREES                                :Vysadba stromov
@@ -1902,6 +1869,12 @@ STR_CARGO_RATING_EXCELLENT                                      :Vyborne
 STR_CARGO_RATING_OUTSTANDING                                    :Perfektne
 ############ range for rating ends
 
+### station view strings
+STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Zobrazit vsetky vlaky, ktore maju tuto stanicu v cestovnom poriadku
+STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Zobrazit vsetky auta, ktore maju tuto stanicu v cestovnom poriadku
+STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Zobrazit vsetky lietadla, ktore maju tuto stanicu v cestovnom poriadku
+STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Zobrazit vsetky lode, ktore maju tuto stanicu v cestovnom poriadku
+
 STR_STATION_VIEW_CARGO_RATING                                   :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO                        :{WHITE}{STATION} uz neprijima {STRING}
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO               :{WHITE}{STATION} uz neprijima {STRING} alebo {STRING}
@@ -2145,6 +2118,7 @@ STR_SV_STNAME_AIRPORT                                           :{STRING} Letisk
 STR_SV_STNAME_OILFIELD                                          :{STRING} Vrtna plosina
 STR_SV_STNAME_MINES                                             :{STRING} Bane
 STR_SV_STNAME_DOCKS                                             :{STRING} Pristav
+##id 0x6020
 STR_SV_STNAME_ANNEXE                                            :{STRING} Zastavka
 STR_SV_STNAME_SIDINGS                                           :{STRING} Vidiek
 STR_SV_STNAME_BRANCH                                            :{STRING} Konecna
@@ -2192,8 +2166,6 @@ STR_NUM_LOW                                                     :Nízky
 STR_NUM_NORMAL                                                  :Normálny
 STR_NUM_HIGH                                                    :Vysoký
 STR_NUM_CUSTOM                                                  :Vlastne
-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
@@ -2227,7 +2199,6 @@ STR_CITY_APPROVAL_HOSTILE                                       :Odmietavy
 
 ##id 0x7000
 STR_COMPANY_VIEW_CAPTION                                        :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
-STR_FORMAT_COMPANY_NUM                                          :(Spoločnosť {COMMA})
 STR_COMPANY_VIEW_NEW_FACE_BUTTON                                :{BLACK}Nová tvár
 STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON                           :{BLACK}Farebna schema
 STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}Farebna schema:
@@ -2260,7 +2231,6 @@ STR_FINANCES_TOTAL_CAPTION                                      :{WHITE}Spolu:
 STR_COMPANY_NAME_COMPANY_NUM                                    :{COMPANY} {COMPANYNUM}
 STR_GRAPH_INCOME_CAPTION                                        :{WHITE}Graf príjmov
 STR_CURRCOMPACT                                                 :{CURRCOMPACT}
-STR_JUST_COMMA                                                  :{COMMA}
 STR_GRAPH_OPERATING_PROFIT_CAPTION                              :{WHITE}Graf prevadzkoveho zisku
 STR_FINANCES_BANK_BALANCE_TITLE                                 :{WHITE}Zostatok v banke
 STR_FINANCES_LOAN_TITLE                                         :{WHITE}Uver
@@ -2663,10 +2633,8 @@ STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE                          :jednokolajova l
 STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE                            :magneticka lokomotiva
 
 ##id 0x8800
-STR_DEPOT_TRAIN_CAPTION                                         :{WHITE}{TOWN} Depo
 STR_NEWS_FIRST_TRAIN_ARRIVAL                                    :{BLACK}{BIGFONT}Mesto oslavuje . . .{}Prvy vlak dorazil do stanice {STATION}!
 STR_VEHICLE_DETAILS_CAPTION                                     :{WHITE}{VEHICLE} (Detaily)
-STR_ERROR_TRAIN_IN_THE_WAY                                      :{WHITE}Vlak v ceste
 STR_ORDER                                                       :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 STR_ORDER_SELECTED                                              :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 STR_ORDER_NON_STOP                                              :{BLACK}Non-stop
@@ -2756,38 +2724,16 @@ STR_TIMETABLE_AND_TRAVEL_FOR                                    :a cestuj {STRIN
 STR_TIMETABLE_DAYS                                              :{COMMA} d{P en ni ní}
 STR_TIMETABLE_TICKS                                             :{COMMA} tik{P "" y ov}
 
-STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Smeruje do {TOWN} depa
-STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Smeruje do {TOWN} depa, {VELOCITY}
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Servis v depe {TOWN}
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Servis v depe {TOWN}, {VELOCITY}
-
 STR_INVALID_ORDER                                               :{RED} (Neplatny prikaz)
 
 STR_UNKNOWN_STATION                                             :neznáma stanica
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}Prazdny
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} z {STATION}
 STR_VEHICLE_DETAILS_CARGO_FROM_MULT                             :{LTBLUE}{CARGO} z {STATION} (x{NUM})
-STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} čaká v depe
-STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Nove vozidla
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}Vlak je prilis dlhy
 STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}Vlaky sa daju nahradit len v depe
-STR_VEHICLE_LIST_TRAIN_CAPTION                                  :{WHITE}{STRING} - {COMMA} Vlak{P "" y ov}
 
-STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}Nove vlaky
-STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}Nové elektrické lokomotívy a vagóny
-STR_BUILD_VEHICLE_TRAIN_MONORAIL_CAPTION                        :{WHITE}Nove jednokolajove vlaky
-STR_BUILD_VEHICLE_TRAIN_MAGLEV_CAPTION                          :{WHITE}Nove magneticke vlaky
-STR_BUILD_VEHICLE_TRAIN_ALL_CAPTION                             :{WHITE}Železnicne vozidlá
-
-STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_BUTTON                    :{BLACK}Zakupit vozidlo
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Klonovat vozidlo
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Vytvori kopiu cestneho vozidla. Stlacenim Control budu prikazy zdielane
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Vytvori kopiu cestneho vozidla. Klikni na toto tlacidlo a potom na vozidlo v garazi alebo mimo nej. Stlacenim Control budu prikazy zdielane
-STR_CLONE_TRAIN                                                 :{BLACK}Klonovat vlak
-STR_CLONE_TRAIN_INFO                                            :{BLACK}Vytvori kopiu vlaku vratane voznov. Stlacenim Control budu prikazy zdielane
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Vytvori kopiu vlaku vratane voznov. Klikni na toto tlacidlo a potom na vlak v depe alebo mimo neho. Stlacenim Control budu prikazy zdielane
-STR_BUILD_VEHICLE_TRAIN_RENAME_BUTTON                           :{BLACK}Premenovat
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Preskocit
 STR_ORDERS_DELETE_BUTTON                                        :{BLACK}Vynechat
 STR_ORDERS_GO_TO_BUTTON                                         :{BLACK}Choď do
@@ -2803,14 +2749,12 @@ STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Prepnút
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Prikazy)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Koniec prikazov - -
 STR_SERVICE                                                     :{BLACK}Oprava
-STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Nemozno kupit vlak...
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Vyrobene: {LTBLUE}{NUM}{BLACK} Hodnota: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Hodnota: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
 STR_VEHICLE_STATUS_LOADING_UNLOADING                            :{LTBLUE}Naklada/Vyklada
 STR_VEHICLE_STATUS_LEAVING                                      :{LTBLUE}Opúšta
 STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}Vlak musi byt zastaveny v depe
-STR_ERROR_CAN_T_SEND_TRAIN_TO_DEPOT                             :{WHITE}Vlak sa neda poslat do depa...
 STR_ERROR_NO_MORE_SPACE_FOR_ORDERS                              :{WHITE}Nemozno zadat dalsie prikazy
 STR_ERROR_TOO_MANY_ORDERS                                       :{WHITE}Prilis vela prikazov
 STR_ERROR_CAN_T_INSERT_NEW_ORDER                                :{WHITE}Nemozno vlozit novy prikaz...
@@ -2825,26 +2769,11 @@ STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE}vozidlo
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}Nemozno posuvat vozdlo ...
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}Zadný stroj vždy doprevádza svoj druhý stroj vpredu
 STR_CARGO_N_A                                                   :Nie je{SKIP}
-STR_ERROR_CAN_T_SELL_TRAIN                                      :{WHITE}Nemozno predat automobil ...
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}Nemoze najst cestu do depa
-STR_ERROR_CAN_T_STOP_START_TRAIN                                :{WHITE}Nemozno zastavit/spustit vlak ...
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}Servisny interval: {LTBLUE}{COMMA}dni{BLACK}   Posledny servis: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}Servisny interval: {LTBLUE}{COMMA}%{BLACK}   Posledny servis: {LTBLUE}{DATE_LONG}
-STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP                             :{BLACK}Vlaky - kliknut na vlak pre informacie
-STR_DEPOT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Vlaky - kliknut na vlak pre informacie, potiahni pre zmenu pozicie
-STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP                            :{BLACK}Kupit novy vlak
-STR_DEPOT_TRAIN_SELL_TOOLTIP                                    :{BLACK}Pre predaj vlaku ho potiahni sem
-STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}Vycentrovat pohlad na poziciu depa
-STR_BUILD_VEHICLE_TRAIN_LIST_TOOLTIP                            :{BLACK}Vyber vlakov - kliknut na vlak pre informacie
-STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_TOOLTIP                   :{BLACK}Kupit vybrany vlak
-STR_BUILD_VEHICLE_TRAIN_RENAME_TOOLTIP                          :{BLACK}Premenovat vlak
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP                 :{BLACK}Aktualna cinnost vlaku - kliknut pre zastavenie/spustenie
-STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP                           :{BLACK}Zobrazit cestovne prikazy vlakov
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP                         :{BLACK}Vycentrovat pohlad na poziciu vlaku
-STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP                    :{BLACK}Poslat vlak do depa
 STR_VEHICLE_VIEW_TRAIN_IGNORE_SIGNAL_TOOLTIP                    :{BLACK}Poslat vlak na cervenu
 STR_VEHICLE_VIEW_TRAIN_REVERSE_TOOLTIP                          :{BLACK}Obratit vlak
-STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Zobrazit detaily o vlaku
 STR_VEHICLE_DETAILS_INCREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Predlzit servisny interval
 STR_VEHICLE_DETAILS_DECREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Skratit servisny interval
 STR_VEHICLE_DETAILS_TRAIN_CARGO_TOOLTIP                         :{BLACK}Zobrazit detaily o prevezenom naklade
@@ -2878,14 +2807,9 @@ STR_VEHICLE_STATUS_STOPPED                                      :{RED}Zastavene
 STR_ERROR_CAN_T_MAKE_TRAIN_PASS_SIGNAL                          :{WHITE}Nemozno pustit vlak na cervenu ked hrozi nebezpecenstvo...
 STR_VEHICLE_STATUS_CRASHED                                      :{RED}Znicene!
 
-STR_QUERY_RENAME_TRAIN_CAPTION                                  :{WHITE}Pomenovat vlak
-STR_ERROR_CAN_T_RENAME_TRAIN                                    :{WHITE}Vlak nemozno pomenovat ...
-STR_VEHICLE_DETAILS_TRAIN_RENAME                                :{BLACK}Pomenovat vlak
 STR_NEWS_TRAIN_CRASH                                            :{BLACK}{BIGFONT}Vlakove nestastie!{}{COMMA} mrtv{P i i ych} pri poziari po kolizii
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Nemozno zmenit smer vlaku ...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Nie je mozne otacat vozidla zlozené z viacerych jednotiek
-STR_QUERY_RENAME_TRAIN_TYPE_CAPTION                             :{WHITE}Premenovat typ vlaku
-STR_ERROR_CAN_T_RENAME_TRAIN_TYPE                               :{WHITE}Typ vlaku nemoze byt premenovany ...
 STR_CLEAR_TIME                                                  :{BLACK}Vymazat cas
 STR_RESET_LATENESS                                              :{BLACK}Reset meskania
 STR_CHANGE_WAYPOINT_NAME                                        :{BLACK}Zmeniť meno smerového bodu
@@ -2917,177 +2841,53 @@ STR_TIMETABLE_AUTOFILL                                          :{BLACK}Vyplnit
 STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Naplň časový plán automaticky s hodnotami z nasledujúcej trasy (CTRL-klik - pokúsiť sa udržať čakacie doby)
 
 ##id 0x9000
-STR_ERROR_ROAD_VEHICLE_IN_THE_WAY                               :{WHITE}Automobil v ceste
-STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING} - {COMMA} Automobil{P "" y ov}
-STR_DEPOT_ROAD_VEHICLE_CAPTION                                  :{WHITE}{TOWN} Garaz
-STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_BUTTON                      :{BLACK}Nove vozidla
-STR_BUILD_VEHICLE_ROAD_VEHICLE_CAPTION                          :{WHITE}Nove automobily
-STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_BUTTON             :{BLACK}Zakupit vozidlo
-STR_ERROR_CAN_T_BUILD_ROAD_VEHICLE                              :{WHITE}Nie je mozne zakupit automobil ...
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}... musi byt zastaveny v garazi
-STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}Nemozno predat automobil ...
-STR_ERROR_CAN_T_STOP_START_ROAD_VEHICLE                         :{WHITE}Nemozno zastavit/spustit automobil ...
-STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} čaká v depe
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Smeruje do {TOWN} garaze
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}smeruje do {TOWN} garaze, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Servis v garazi {TOWN}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Servis v garazi {TOWN}, {VELOCITY}
-STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Nemozno poslat automobil do garaze ...
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Nemozno najst miestnu garaz
-STR_VEHICLE_LIST_ROAD_VEHICLE_TOOLTIP                           :{BLACK}Automobily - kliknut pre detaily
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP          :{BLACK}Aktualna cinnost vozidla - kliknut pre zastavenie/spustenie
-STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP                    :{BLACK}Zobrazit cestovne prikazy
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP                  :{BLACK}Vycentrovat pohlad na vozidlo
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}Poslat vozidlo do depa
 STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP                   :{BLACK}Otocit vozidlo
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Zobrazit detaily o automobile
-STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Vozidla - kliknut pre detaily
-STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}Zakupit novy automobil
-STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}Potiahni sem pre predaj automobilu
-STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}Centrovat pohlad na poziciu garaze
-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_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})
 
-STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Pomenovat automobil
-STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Nemozno pomenovat automobil ...
-STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Pomenovat automobil
 STR_NEWS_FIRST_BUS_ARRIVAL                                      :{BLACK}{BIGFONT}Mesto oslavuje . . .{}Prvy autobus dorazil do {STATION}!
 STR_NEWS_FIRST_TRUCK_ARRIVAL                                    :{BLACK}{BIGFONT}Mesto oslavuje . . .{}Prvy automobil dorazil do {STATION}!
 STR_NEWS_FIRST_PASSENGER_TRAM_ARRIVAL                           :{BLACK}{BIGFONT}Mesto oslavuje . . .{}Prvá elektricka dorazila do stanice {STATION}!
 STR_NEWS_FIRST_CARGO_TRAM_ARRIVAL                               :{BLACK}{BIGFONT}Mesto oslavuje . . .{}Prvá nákladná elektricka dorazila do stanice {STATION}!
 STR_NEWS_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Dopravna nehoda!{}Vodic zahynul po kolizii s vlakom
 STR_NEWS_ROAD_VEHICLE_CRASH                                     :{BLACK}{BIGFONT}Dopravna nehoda!{}{COMMA} mrtvych po kolizii s vlakom
-STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Premenovat
-STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Premenovat typ automobilu
-STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Premenovat typ automobilu
-STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Nemozno premenovat typ automobilu ...
 
-STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Prestavat vozidlo na prepravu ineho druhu nakladu
-STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Prestavat vozidlo
-STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Prestavat vozidlo na prepravu vyznaceneho druhu nakladu
-STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Prestavba vozidla nie je mozna ...
-STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Vyberte požadovaný typ nákladu pre cestné vozidlo
 
 ##id 0x9800
 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :Waterways construction
 STR_WATERWAYS_TOOLBAR_CAPTION                                   :{WHITE}Výstavba vodných ciest
 STR_WATERWAYS_TOOLBAR_CAPTION_SE                                :{WHITE}Vodné cesty
 STR_ERROR_CAN_T_BUILD_DOCK_HERE                                 :{WHITE}Tu nemozno postavit pristav ...
-STR_DEPOT_SHIP_CAPTION                                          :{WHITE}{TOWN} Lodenica
-STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON                              :{BLACK}Nove lode
-STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - {COMMA} Lod{P "" e i}
-STR_BUILD_VEHICLE_SHIP_CAPTION                                  :{WHITE}Nove lode
-STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON                     :{BLACK}Vyrobit lod
-STR_CLONE_SHIP                                                  :{BLACK}Klonovat lod
-STR_CLONE_SHIP_INFO                                             :{BLACK}Vytvori kopiu lode. Stlacenim Control budu prikazy zdielane
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Vytvori kopiu lode. Klikni na toto tlacidlo a potom na lod v depe alebo mimo neho. Stlacenim Control budu prikazy zdielane
 STR_ERROR_SHIP_MUST_BE_STOPPED_IN_DEPOT                         :{WHITE}Lod musi byt zastavena v lodenici
-STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}Nemozno predat lod ...
-STR_ERROR_CAN_T_BUILD_SHIP                                      :{WHITE}Nemozno vyrobit lod...
-STR_ERROR_SHIP_IN_THE_WAY                                       :{WHITE}Lod v ceste
-STR_ERROR_CAN_T_STOP_START_SHIP                                 :{WHITE}Nemozno zastavit/spustit lod ...
-STR_ERROR_CAN_T_SEND_SHIP_TO_DEPOT                              :{WHITE}Nemozno poslat lod do lodenice ...
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Smeruje do {TOWN} lodenice
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Smeruje do {TOWN} lodenice, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Servis v lodenici {TOWN}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Servis v lodenici {TOWN}, {VELOCITY}
-STR_NEWS_SHIP_IS_WAITING                                        :{WHITE}{VEHICLE} čaká v depe
 STR_WATERWAYS_TOOLBAR_BUILD_DOCK_TOOLTIP                        :{BLACK}Postavit lodenicu
 STR_WATERWAYS_TOOLBAR_BUILD_DEPOT_TOOLTIP                       :{BLACK}Postavit lodenicu (pre vyrobu a opravy lodi)
-STR_DEPOT_SHIP_LIST_TOOLTIP                                     :{BLACK}Lode - kliknut pre informacie
-STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}Vyrobit novu lod
-STR_DEPOT_SHIP_SELL_TOOLTIP                                     :{BLACK}Potiahnut lod sem, na predaj
-STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}Vycentrovat pohlad na lodenicu
-STR_VEHICLE_LIST_SHIP_TOOLTIP                                   :{BLACK}Lode - kliknut pre informacie
-STR_BUILD_VEHICLE_SHIP_LIST_TOOLTIP                             :{BLACK}Vyber lodi - kliknut pre informacie
-STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP                    :{BLACK}Vyrobit vybranu lod
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP                  :{BLACK}Atualna cinnost lode - klini pre zastavenie/spustenie
-STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Zobrazit cestovne prikazy lodi
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP                          :{BLACK}Vycentrovat pohlad na lod
-STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}Poslat lod do lodenice
-STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Zobrazit detaily o lodi
-STR_VEHICLE_DETAILS_SHIP_RENAME                                 :{BLACK}Pomenovat lod
 
-STR_QUERY_RENAME_SHIP_CAPTION                                   :{WHITE}Pomenovat lod
-STR_ERROR_CAN_T_RENAME_SHIP                                     :{WHITE}Nemozno pomenovat lod ...
 STR_NEWS_FIRST_SHIP_ARRIVAL                                     :{BLACK}{BIGFONT}Mesto oslavuje . . .{}Prva lod dorazila do {STATION}!
 STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}Postavit boju pouzitelnu pre vyznacenie trasy
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}Tu nemozno postavit boju ...
 STR_BUILD_AQUEDUCT                                              :{BLACK}Postavit akvadukt
 STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}Tu nie je možné postavit akvadukt ...
-STR_BUILD_VEHICLE_SHIP_RENAME_BUTTON                            :{BLACK}Premenovat
-STR_BUILD_VEHICLE_SHIP_RENAME_TOOLTIP                           :{BLACK}Premenovat typ lode
-STR_QUERY_RENAME_SHIP_TYPE_CAPTION                              :{WHITE}Premenovat typ lode
-STR_ERROR_CAN_T_RENAME_SHIP_TYPE                                :{WHITE}Nemozno premenovat typ lode ...
-STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}Prestavat lod na iny typ nakladu
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (Prestavat)
-STR_REFIT_SHIP_REFIT_BUTTON                                     :{BLACK}Prestavat lod
-STR_REFIT_SHIP_LIST_TOOLTIP                                     :{BLACK}Vybrat typ nakladu pre lod
-STR_REFIT_SHIP_REFIT_TOOLTIP                                    :{BLACK}Prestavat lod na vybrany typ nakladu
 STR_REFIT_TITLE                                                 :{GOLD}Vyber typ nakladu:
 STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}Nová kapacita: {GOLD}{CARGO}{}{BLACK}Cena prestavby: {GOLD}{CURRENCY}
-STR_ERROR_CAN_T_REFIT_SHIP                                      :{WHITE}Nemozno prestavat lod...
 STR_REFITTABLE                                                  :(mozna prestavba)
 
 ##id 0xA000
 STR_TOOLBAR_AIRCRAFT_CAPTION                                    :{WHITE}Letiska
 STR_ERROR_CAN_T_BUILD_AIRPORT_HERE                              :{WHITE}Tu sa letisko neda postavit ...
-STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}{STATION} Hangar
-STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON                          :{BLACK}Nove Lietadlo
-STR_CLONE_AIRCRAFT                                              :{BLACK}Klonovat lietadlo
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Vytvori kopiu lietadla. Stlacenim Control budu prikazy zdielane
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Vytvori kopiu lietadla. Klikni na toto tlacidlo a potom na lietadlo v hangari alebo mimo neho. Stlacenim Control budu prikazy zdielane
-STR_BUILD_VEHICLE_AIRCRAFT_CAPTION                              :{WHITE}Nove Lietadlo
-STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON                 :{BLACK}Vyrobit lietadlo
-STR_ERROR_CAN_T_BUILD_AIRCRAFT                                  :{WHITE}Nemozno vyrobit lietadlo...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} Lietad{P lo la iel}
-STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR                         :{WHITE}Nemozno poslat lietadlo do hangaru ...
-STR_HEADING_FOR_HANGAR                                          :{ORANGE}Smeruje do {STATION} hangaru
-STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Smeruje do {STATION} hangaru, {VELOCITY}
-STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Servis v hangari {STATION}
-STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Servis v hangari {STATION}, {VELOCITY}
-STR_NEWS_AIRCRAFT_IS_WAITING                                    :{WHITE}{VEHICLE} čaká v leteckom hangári
-STR_ERROR_AIRCRAFT_IN_THE_WAY                                   :{WHITE}Lietadlo v ceste
-STR_ERROR_CAN_T_STOP_START_AIRCRAFT                             :{WHITE}Nemozno zastavit/spustit lietadlo ...
 STR_ERROR_AIRCRAFT_IS_IN_FLIGHT                                 :{WHITE}Lietadlo je vo vzduchu
 STR_ERROR_AIRCRAFT_MUST_BE_STOPPED                              :{WHITE}Lietadlo musi byt zastavene v hangari
-STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}Nie je mozne predat lietadlo ...
 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION                          :Výstavba letiska
 STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Postavit letisko
-STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP                               :{BLACK}Lietadlo - kliknut pre informacie
-STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Lietadlo - kliknut pre informacie
-STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}Vyrobit nove lietadlo
-STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}Potiahni lietadlo sem pre predaj
-STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Vycentrovat pohlad na hangar
-STR_BUILD_VEHICLE_AIRCRAFT_LIST_TOOLTIP                         :{BLACK}Vyber lietadiel - kliknut pre vyber
-STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_TOOLTIP                :{BLACK}Vyrobit vybrane lietadlo
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP              :{BLACK}Aktualna cinnost lietadla - klini pre zastavenie/spustenie
-STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Zobrazit cestovne prikazy lietadla
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP                      :{BLACK}Vycentrovat pohlad na lietadlo
-STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}Poslat lietadlo do hangaru
-STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Zobrazit detaily o lietadle
 
-STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}Pomenovat lietadlo
-STR_ERROR_CAN_T_RENAME_AIRCRAFT                                 :{WHITE}Nie je mozne pomenovat lietadlo ...
-STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}Pomenovat lietadlo
 STR_NEWS_FIRST_AIRCRAFT_ARRIVAL                                 :{BLACK}{BIGFONT}Mesto oslavuje . . .{}Prve lietadlo pristalo na {STATION}!
 STR_NEWS_AIRCRAFT_CRASH                                         :{BLACK}{BIGFONT}Letecke nestastie!{}{COMMA} mrtv{P y i ych} po poziari na {STATION}
 STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Letecke nestastie!{}Lietadlu doslo palivo, {COMMA} mrtvych pri poziari!
 STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
-STR_BUILD_VEHICLE_AIRCRAFT_RENAME_BUTTON                        :{BLACK}Premenovat
-STR_BUILD_VEHICLE_AIRCRAFT_RENAME_TOOLTIP                       :{BLACK}Premenovat typ lietadla
-STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION                          :{WHITE}Premenovat typ lietadla
-STR_ERROR_CAN_T_RENAME_AIRCRAFT_TYPE                            :{WHITE}Nie je mozne premenovat typ lietadla ...
-STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Prestavat lietadlo na iny typ nakladu
-STR_REFIT_AIRCRAFT_REFIT_BUTTON                                 :{BLACK}Prestavat lietadlo
-STR_REFIT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Vyber novy typ nakladu
-STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}Prestavat lietadlo na novy typ nakladu
-STR_ERROR_CAN_T_REFIT_AIRCRAFT                                  :{WHITE}Nie je mozne prestavat na novy typ nakladu ...
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Cestovný poriadok)
 
@@ -3241,15 +3041,225 @@ STR_LORRY                                                       :{BLACK}{LORRY}
 STR_PLANE                                                       :{BLACK}{PLANE}
 STR_SHIP                                                        :{BLACK}{SHIP}
 
+############ Vehicle lists
+STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP                             :{BLACK}Vlaky - kliknut na vlak pre informacie
+STR_VEHICLE_LIST_ROAD_VEHICLE_TOOLTIP                           :{BLACK}Automobily - kliknut pre detaily
+STR_VEHICLE_LIST_SHIP_TOOLTIP                                   :{BLACK}Lode - kliknut pre informacie
+STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP                               :{BLACK}Lietadlo - kliknut pre informacie
 
-STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Zobrazit vsetky vlaky, ktore maju tuto stanicu v cestovnom poriadku
-STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Zobrazit vsetky auta, ktore maju tuto stanicu v cestovnom poriadku
-STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Zobrazit vsetky lietadla, ktore maju tuto stanicu v cestovnom poriadku
-STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Zobrazit vsetky lode, ktore maju tuto stanicu v cestovnom poriadku
+STR_VEHICLE_LIST_TRAIN_CAPTION                                  :{WHITE}{STRING} - {COMMA} Vlak{P "" y ov}
+STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING} - {COMMA} Automobil{P "" y ov}
+STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - {COMMA} Lod{P "" e i}
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} Lietad{P lo la iel}
 
 STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}Zdielane prikazy  {COMMA} vozid{P la iel iel}
 STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Zobrazit vsetky vozidla s rovnakym zoznamom prikazov
 
+STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} čaká v depe
+STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} čaká v depe
+STR_NEWS_SHIP_IS_WAITING                                        :{WHITE}{VEHICLE} čaká v depe
+STR_NEWS_AIRCRAFT_IS_WAITING                                    :{WHITE}{VEHICLE} čaká v leteckom hangári
+
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Prestavat vlak
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Prestavat vozidlo
+STR_REFIT_SHIP_REFIT_BUTTON                                     :{BLACK}Prestavat lod
+STR_REFIT_AIRCRAFT_REFIT_BUTTON                                 :{BLACK}Prestavat lietadlo
+
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Prestavat vlak na prepravu vybraneho nakladu
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Prestavat vozidlo na prepravu vyznaceneho druhu nakladu
+STR_REFIT_SHIP_REFIT_TOOLTIP                                    :{BLACK}Prestavat lod na vybrany typ nakladu
+STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}Prestavat lietadlo na novy typ nakladu
+
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Vybrat typ prepravovaneho nakladu
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Vyberte požadovaný typ nákladu pre cestné vozidlo
+STR_REFIT_SHIP_LIST_TOOLTIP                                     :{BLACK}Vybrat typ nakladu pre lod
+STR_REFIT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Vyber novy typ nakladu
+
+STR_DEPOT_TRAIN_CAPTION                                         :{WHITE}{TOWN} Depo
+STR_DEPOT_ROAD_VEHICLE_CAPTION                                  :{WHITE}{TOWN} Garaz
+STR_DEPOT_SHIP_CAPTION                                          :{WHITE}{TOWN} Lodenica
+STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}{STATION} Hangar
+
+STR_VEHICLE_DETAILS_TRAIN_RENAME                                :{BLACK}Pomenovat vlak
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Pomenovat automobil
+STR_VEHICLE_DETAILS_SHIP_RENAME                                 :{BLACK}Pomenovat lod
+STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}Pomenovat lietadlo
+
+STR_QUERY_RENAME_TRAIN_CAPTION                                  :{WHITE}Pomenovat vlak
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Pomenovat automobil
+STR_QUERY_RENAME_SHIP_CAPTION                                   :{WHITE}Pomenovat lod
+STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}Pomenovat lietadlo
+
+STR_ERROR_TRAIN_IN_THE_WAY                                      :{WHITE}Vlak v ceste
+STR_ERROR_ROAD_VEHICLE_IN_THE_WAY                               :{WHITE}Automobil v ceste
+STR_ERROR_SHIP_IN_THE_WAY                                       :{WHITE}Lod v ceste
+STR_ERROR_AIRCRAFT_IN_THE_WAY                                   :{WHITE}Lietadlo v ceste
+
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Nemozno prestavat vlak ...
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Prestavba vozidla nie je mozna ...
+STR_ERROR_CAN_T_REFIT_SHIP                                      :{WHITE}Nemozno prestavat lod...
+STR_ERROR_CAN_T_REFIT_AIRCRAFT                                  :{WHITE}Nie je mozne prestavat na novy typ nakladu ...
+
+STR_ERROR_CAN_T_RENAME_TRAIN                                    :{WHITE}Vlak nemozno pomenovat ...
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Nemozno pomenovat automobil ...
+STR_ERROR_CAN_T_RENAME_SHIP                                     :{WHITE}Nemozno pomenovat lod ...
+STR_ERROR_CAN_T_RENAME_AIRCRAFT                                 :{WHITE}Nie je mozne pomenovat lietadlo ...
+
+STR_ERROR_CAN_T_STOP_START_TRAIN                                :{WHITE}Nemozno zastavit/spustit vlak ...
+STR_ERROR_CAN_T_STOP_START_ROAD_VEHICLE                         :{WHITE}Nemozno zastavit/spustit automobil ...
+STR_ERROR_CAN_T_STOP_START_SHIP                                 :{WHITE}Nemozno zastavit/spustit lod ...
+STR_ERROR_CAN_T_STOP_START_AIRCRAFT                             :{WHITE}Nemozno zastavit/spustit lietadlo ...
+
+STR_ERROR_CAN_T_SEND_TRAIN_TO_DEPOT                             :{WHITE}Vlak sa neda poslat do depa...
+STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Nemozno poslat automobil do garaze ...
+STR_ERROR_CAN_T_SEND_SHIP_TO_DEPOT                              :{WHITE}Nemozno poslat lod do lodenice ...
+STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR                         :{WHITE}Nemozno poslat lietadlo do hangaru ...
+
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Nemozno kupit vlak...
+STR_ERROR_CAN_T_BUILD_ROAD_VEHICLE                              :{WHITE}Nie je mozne zakupit automobil ...
+STR_ERROR_CAN_T_BUILD_SHIP                                      :{WHITE}Nemozno vyrobit lod...
+STR_ERROR_CAN_T_BUILD_AIRCRAFT                                  :{WHITE}Nemozno vyrobit lietadlo...
+
+STR_ERROR_CAN_T_RENAME_TRAIN_TYPE                               :{WHITE}Typ vlaku nemoze byt premenovany ...
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Nemozno premenovat typ automobilu ...
+STR_ERROR_CAN_T_RENAME_SHIP_TYPE                                :{WHITE}Nemozno premenovat typ lode ...
+STR_ERROR_CAN_T_RENAME_AIRCRAFT_TYPE                            :{WHITE}Nie je mozne premenovat typ lietadla ...
+
+STR_ERROR_CAN_T_SELL_TRAIN                                      :{WHITE}Nemozno predat automobil ...
+STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}Nemozno predat automobil ...
+STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}Nemozno predat lod ...
+STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}Nie je mozne predat lietadlo ...
+
+STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP                 :{BLACK}Aktualna cinnost vlaku - kliknut pre zastavenie/spustenie
+STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP          :{BLACK}Aktualna cinnost vozidla - kliknut pre zastavenie/spustenie
+STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP                  :{BLACK}Atualna cinnost lode - klini pre zastavenie/spustenie
+STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP              :{BLACK}Aktualna cinnost lietadla - klini pre zastavenie/spustenie
+
+STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP                           :{BLACK}Zobrazit cestovne prikazy vlakov
+STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP                    :{BLACK}Zobrazit cestovne prikazy
+STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Zobrazit cestovne prikazy lodi
+STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Zobrazit cestovne prikazy lietadla
+
+STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP                         :{BLACK}Vycentrovat pohlad na poziciu vlaku
+STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP                  :{BLACK}Vycentrovat pohlad na vozidlo
+STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP                          :{BLACK}Vycentrovat pohlad na lod
+STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP                      :{BLACK}Vycentrovat pohlad na lietadlo
+
+STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP                    :{BLACK}Poslat vlak do depa
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}Poslat vozidlo do depa
+STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}Poslat lod do lodenice
+STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}Poslat lietadlo do hangaru
+
+STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Zobrazit detaily o vlaku
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Zobrazit detaily o automobile
+STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Zobrazit detaily o lodi
+STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Zobrazit detaily o lietadle
+
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Prestavat vlak na prepravu ineho nakladu
+STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Prestavat vozidlo na prepravu ineho druhu nakladu
+STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}Prestavat lod na iny typ nakladu
+STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Prestavat lietadlo na iny typ nakladu
+
+STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Smeruje do {TOWN} depa
+STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Smeruje do {TOWN} depa, {VELOCITY}
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Smeruje do {TOWN} garaze
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}smeruje do {TOWN} garaze, {VELOCITY}
+STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Smeruje do {TOWN} lodenice
+STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Smeruje do {TOWN} lodenice, {VELOCITY}
+STR_HEADING_FOR_HANGAR                                          :{ORANGE}Smeruje do {STATION} hangaru
+STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Smeruje do {STATION} hangaru, {VELOCITY}
+
+STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Servis v depe {TOWN}
+STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Servis v depe {TOWN}, {VELOCITY}
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Servis v garazi {TOWN}
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Servis v garazi {TOWN}, {VELOCITY}
+STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Servis v lodenici {TOWN}
+STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Servis v lodenici {TOWN}, {VELOCITY}
+STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Servis v hangari {STATION}
+STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Servis v hangari {STATION}, {VELOCITY}
+
+
+STR_CLONE_TRAIN                                                 :{BLACK}Klonovat vlak
+STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Klonovat vozidlo
+STR_CLONE_SHIP                                                  :{BLACK}Klonovat lod
+STR_CLONE_AIRCRAFT                                              :{BLACK}Klonovat lietadlo
+
+STR_CLONE_TRAIN_INFO                                            :{BLACK}Vytvori kopiu vlaku vratane voznov. Stlacenim Control budu prikazy zdielane
+STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Vytvori kopiu cestneho vozidla. Stlacenim Control budu prikazy zdielane
+STR_CLONE_SHIP_INFO                                             :{BLACK}Vytvori kopiu lode. Stlacenim Control budu prikazy zdielane
+STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Vytvori kopiu lietadla. Stlacenim Control budu prikazy zdielane
+
+STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Vytvori kopiu vlaku vratane voznov. Klikni na toto tlacidlo a potom na vlak v depe alebo mimo neho. Stlacenim Control budu prikazy zdielane
+STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Vytvori kopiu cestneho vozidla. Klikni na toto tlacidlo a potom na vozidlo v garazi alebo mimo nej. Stlacenim Control budu prikazy zdielane
+STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Vytvori kopiu lode. Klikni na toto tlacidlo a potom na lod v depe alebo mimo neho. Stlacenim Control budu prikazy zdielane
+STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Vytvori kopiu lietadla. Klikni na toto tlacidlo a potom na lietadlo v hangari alebo mimo neho. Stlacenim Control budu prikazy zdielane
+
+STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}Nove vlaky
+STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}Nové elektrické lokomotívy a vagóny
+STR_BUILD_VEHICLE_TRAIN_MONORAIL_CAPTION                        :{WHITE}Nove jednokolajove vlaky
+STR_BUILD_VEHICLE_TRAIN_MAGLEV_CAPTION                          :{WHITE}Nove magneticke vlaky
+
+STR_BUILD_VEHICLE_TRAIN_ALL_CAPTION                             :{WHITE}Železnicne vozidlá
+STR_BUILD_VEHICLE_ROAD_VEHICLE_CAPTION                          :{WHITE}Nove automobily
+STR_BUILD_VEHICLE_SHIP_CAPTION                                  :{WHITE}Nove lode
+STR_BUILD_VEHICLE_AIRCRAFT_CAPTION                              :{WHITE}Nove Lietadlo
+
+STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_BUTTON                    :{BLACK}Zakupit vozidlo
+STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_BUTTON             :{BLACK}Zakupit vozidlo
+STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON                     :{BLACK}Vyrobit lod
+STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON                 :{BLACK}Vyrobit lietadlo
+
+STR_BUILD_VEHICLE_TRAIN_LIST_TOOLTIP                            :{BLACK}Vyber vlakov - kliknut na vlak pre informacie
+STR_BUILD_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP                     :{BLACK}Vyber vozidiel - kliknut pre detaily
+STR_BUILD_VEHICLE_SHIP_LIST_TOOLTIP                             :{BLACK}Vyber lodi - kliknut pre informacie
+STR_BUILD_VEHICLE_AIRCRAFT_LIST_TOOLTIP                         :{BLACK}Vyber lietadiel - kliknut pre vyber
+
+STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_TOOLTIP                   :{BLACK}Kupit vybrany vlak
+STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_TOOLTIP            :{BLACK}Zakupit vybrany automobil
+STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP                    :{BLACK}Vyrobit vybranu lod
+STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_TOOLTIP                :{BLACK}Vyrobit vybrane lietadlo
+
+STR_BUILD_VEHICLE_TRAIN_RENAME_BUTTON                           :{BLACK}Premenovat
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Premenovat
+STR_BUILD_VEHICLE_SHIP_RENAME_BUTTON                            :{BLACK}Premenovat
+STR_BUILD_VEHICLE_AIRCRAFT_RENAME_BUTTON                        :{BLACK}Premenovat
+
+STR_BUILD_VEHICLE_TRAIN_RENAME_TOOLTIP                          :{BLACK}Premenovat vlak
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Premenovat typ automobilu
+STR_BUILD_VEHICLE_SHIP_RENAME_TOOLTIP                           :{BLACK}Premenovat typ lode
+STR_BUILD_VEHICLE_AIRCRAFT_RENAME_TOOLTIP                       :{BLACK}Premenovat typ lietadla
+
+STR_QUERY_RENAME_TRAIN_TYPE_CAPTION                             :{WHITE}Premenovat typ vlaku
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Premenovat typ automobilu
+STR_QUERY_RENAME_SHIP_TYPE_CAPTION                              :{WHITE}Premenovat typ lode
+STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION                          :{WHITE}Premenovat typ lietadla
+
+STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Nove vozidla
+STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_BUTTON                      :{BLACK}Nove vozidla
+STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON                              :{BLACK}Nove lode
+STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON                          :{BLACK}Nove Lietadlo
+
+STR_DEPOT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Vlaky - kliknut na vlak pre informacie, potiahni pre zmenu pozicie
+STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Vozidla - kliknut pre detaily
+STR_DEPOT_SHIP_LIST_TOOLTIP                                     :{BLACK}Lode - kliknut pre informacie
+STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Lietadlo - kliknut pre informacie
+
+STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP                            :{BLACK}Kupit novy vlak
+STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}Zakupit novy automobil
+STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}Vyrobit novu lod
+STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}Vyrobit nove lietadlo
+
+STR_DEPOT_TRAIN_SELL_TOOLTIP                                    :{BLACK}Pre predaj vlaku ho potiahni sem
+STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}Potiahni sem pre predaj automobilu
+STR_DEPOT_SHIP_SELL_TOOLTIP                                     :{BLACK}Potiahnut lod sem, na predaj
+STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}Potiahni lietadlo sem pre predaj
+
+STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}Vycentrovat pohlad na poziciu depa
+STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}Centrovat pohlad na poziciu garaze
+STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}Vycentrovat pohlad na lodenicu
+STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Vycentrovat pohlad na hangar
+
+
 ### depot strings
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}Chystáte sa predat všetky vozidlá v depe. Ste si isý?
 STR_DEPOT_WRONG_DEPOT_TYPE                                      :Nesprávny typ depa
@@ -3269,7 +3279,6 @@ STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TIP                          :{BLACK}Automati
 STR_DEPOT_AUTOREPLACE_SHIP_TIP                                  :{BLACK}Automaticky nahradit všetky lode v lodenici
 STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP                              :{BLACK}Automaticky nahradit všetky lietadlá v hangári
 
-
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Vymena {STRING}
 STR_REPLACE_VEHICLES_START                                      :{BLACK}Zacat vymenu vozidiel
 STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Zastavit vymenu vozidiel
@@ -3285,6 +3294,7 @@ STR_REPLACE_REMOVE_WAGON                                        :{BLACK}Odstrane
 STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Funkcia automatickeho vylepsovania vlakov moze udrzovat rovnaku dlzku vlakov odstranovanim vagonov (od zaciatku vlakov), pokial by zmena rusna vlak predlzila.
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}Vymena: {ORANGE}{SKIP}{SKIP}{STRING}
 STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}Prepne medzi oknami na vymenu lokomotiv a vagonov
+
 STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Vozidlo nie je dostupné
 STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Vozidlo nie je dostupné
 STR_SHIP_NOT_AVAILABLE                                          :{WHITE}Lod nie je dostupná
@@ -3435,17 +3445,6 @@ STR_MEASURE_AREA                                                :{BLACK}Plocha:
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Dlžka: {NUM}{}Výškový rozdiel: {NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Plocha: {NUM} x {NUM}{}Výškový rozdiel: {NUM} m
 
-############ Date formatting
-STR_FORMAT_DATE_TINY                                            :{STRING}-{STRING}-{NUM}
-STR_FORMAT_DATE_SHORT                                           :{STRING} {NUM}
-STR_FORMAT_DATE_LONG                                            :{STRING} {STRING} {NUM}
-STR_FORMAT_DATE_ISO                                             :{2:NUM}-{1:STRING}-{0:STRING}
-
-STR_JUST_DATE_TINY                                              :{DATE_TINY}
-STR_JUST_DATE_LONG                                              :{DATE_LONG}
-STR_JUST_DATE_ISO                                               :{DATE_ISO}
-########
-
 STR_FEEDER_CARGO_VALUE                                          :{BLACK}Transfer kredity: {LTBLUE}{CURRENCY}
 STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD                            :{WHITE}... cesta vlastnená mestom
 STR_DRIVE_THROUGH_ERROR_DIRECTION                               :{WHITE}... nesprávna orientácia cesty
@@ -3470,7 +3469,6 @@ STR_PERCENT_UP_DOWN_SMALL                                       :{TINYFONT}{WHIT
 STR_PERCENT_UP_DOWN                                             :{WHITE}{NUM}%{UPARROW}{DOWNARROW}
 
 ##### Mass Order
-STR_FORMAT_GROUP_NAME                                           :Skupina {COMMA}
 STR_GROUP_TINY_NAME                                             :{TINYFONT}{GROUP}
 STR_GROUP_ALL_TRAINS                                            :Všetky vlaky
 STR_GROUP_ALL_ROAD_VEHICLES                                     :Všetky cestné vozidlá
@@ -3499,12 +3497,62 @@ STR_GROUP_DELETE_TIP                                            :{BLACK}Zrušit
 STR_GROUP_RENAME_TIP                                            :{BLACK}Premenovat vybranú skupinu
 STR_GROUP_REPLACE_PROTECTION_TIP                                :{BLACK}Kliknite pre znemoznenie automatického nahradzovania v skupine
 
+#### String control codes and their formatting
 STR_COMPANY_NAME                                                :{COMPANY}
 STR_ENGINE_NAME                                                 :{ENGINE}
 STR_GROUP_NAME                                                  :{GROUP}
+STR_INDUSTRY_NAME                                               :{INDUSTRY}
 STR_PRESIDENT_NAME                                              :{PRESIDENTNAME}
 STR_SIGN_NAME                                                   :{SIGN}
+STR_STATION_NAME                                                :{STATION}
+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_LONG                                              :{DATE_LONG}
+STR_JUST_DATE_ISO                                               :{DATE_ISO}
+STR_JUST_STRING                                                 :{STRING}
+STR_JUST_RAW_STRING                                             :{STRING}
+
+STR_FORMAT_DATE_TINY                                            :{STRING}-{STRING}-{NUM}
+STR_FORMAT_DATE_SHORT                                           :{STRING} {NUM}
+STR_FORMAT_DATE_LONG                                            :{STRING} {STRING} {NUM}
+STR_FORMAT_DATE_ISO                                             :{2:NUM}-{1:STRING}-{0:STRING}
+
+STR_FORMAT_COMPANY_NUM                                          :(Spoločnosť {COMMA})
+STR_FORMAT_GROUP_NAME                                           :Skupina {COMMA}
+STR_FORMAT_INDUSTRY_NAME                                        :{1:STRING} {0:TOWN}
+
+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}Meno musí byt jedinecné
 
diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt
index 56322b0ba..718cbbf38 100644
--- a/src/lang/slovenian.txt
+++ b/src/lang/slovenian.txt
@@ -196,8 +196,6 @@ STR_ABBREV_PLASTIC                                              :{TINYFONT}PL
 STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}GP
 STR_ABBREV_NONE                                                 :{TINYFONT}NO
 STR_ABBREV_ALL                                                  :{TINYFONT}VSE
-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
@@ -209,17 +207,11 @@ STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Prvotne
 STR_ABOUT_VERSION                                               :{BLACK}OpenTTD različica {REV}
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 ekipa OpenTTD
 
-STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
-STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_QUIT_CAPTION                                                :{WHITE}Izhod
 STR_YES                                                         :{BLACK}Da
 STR_NO                                                          :{BLACK}Ne
 STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Zagotovo želiš zapustiti igro in se vrniti v {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                                                :Nič
 STR_COLOUR_DARK_BLUE                                            :Temno modra
 STR_COLOUR_PALE_GREEN                                           :Svetlo zelena
@@ -238,8 +230,6 @@ STR_COLOUR_BROWN                                                :Rjava
 STR_COLOUR_GREY                                                 :Siva
 STR_COLOUR_WHITE                                                :Bela
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}Preveč vozil v igri
-STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
-STR_RED_COMMA                                                   :{RED}{COMMA}
 STR_BUTTON_LOCATION                                             :{BLACK}Lokacija
 STR_SMALLMAP_TYPE_CONTOURS                                      :Oblika
 STR_SMALLMAP_TYPE_VEHICLES                                      :Vozila
@@ -365,12 +355,13 @@ STR_SORT_CRITERIA_TIP                                           :{BLACK}Izberi k
 STR_FILTER_CRITERIA_TIP                                         :{BLACK}Izberi način filtriranja
 STR_SORT_BY                                                     :{BLACK}Sortiraj po
 
+### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}Prebivalstvo
+STR_SORT_BY_NAME                                                :{BLACK}Ime
+STR_SORT_BY_DATE                                                :{BLACK}Datum
 STR_SORT_BY_PRODUCTION                                          :Proizvodnja
 STR_SORT_BY_TYPE                                                :Tip
 STR_SORT_BY_TRANSPORTED                                         :Prepeljano
-STR_SORT_BY_NAME                                                :{BLACK}Ime
-STR_SORT_BY_DATE                                                :{BLACK}Datum
 STR_SORT_BY_NUMBER                                              :Število
 STR_SORT_BY_PROFIT_LAST_YEAR                                    :Dobiček v zadnjem letu
 STR_SORT_BY_PROFIT_THIS_YEAR                                    :Letošnji dobiček
@@ -393,37 +384,25 @@ STR_SORT_BY_INTRO_DATE                                          :Datum uvedbe
 STR_SORT_BY_RUNNING_COST                                        :Cena delovanja
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :Moč/Cena delovanja
 STR_SORT_BY_CARGO_CAPACITY                                      :Zmogljivost tovora
+
 STR_NO_WAITING_CARGO                                            :{BLACK}Noben tovor ne čaka
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}Izberi vse pripomočke
 STR_SELECT_ALL_TYPES                                            :{BLACK}Izberi vse vrste tovora (vključno s tovorom, ki ne čaka)
-STR_AVAILABLE_TRAINS                                            :{BLACK}Vlaki na voljo
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Vozila na voljo
-STR_AVAILABLE_SHIPS                                             :{BLACK}Ladje na voljo
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Letala na voljo
 STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Prikaži seznam motorjev na voljo za ta tip vozila.
 STR_MANAGE_LIST                                                 :{BLACK}Uredi seznam
 STR_MANAGE_LIST_TIP                                             :{BLACK}Pošlji navodila vsem vozilom na seznamu
 STR_REPLACE_VEHICLES                                            :Zamenjaj vozila
+STR_SEND_FOR_SERVICING                                          :Pošlji na servisiranje
+
+STR_AVAILABLE_TRAINS                                            :{BLACK}Vlaki na voljo
+STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Vozila na voljo
+STR_AVAILABLE_SHIPS                                             :{BLACK}Ladje na voljo
+STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Letala na voljo
+
 STR_SEND_TRAIN_TO_DEPOT                                         :Pošlji v garažo
 STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Pošlji v garažo
 STR_SEND_SHIP_TO_DEPOT                                          :Pošlji v garažo
 STR_SEND_AIRCRAFT_TO_HANGAR                                     :Pošlji v hangar
-STR_SEND_FOR_SERVICING                                          :Pošlji na servisiranje
-
-############ 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                                            :Maj
-STR_MONTH_ABBREV_JUN                                            :Jun
-STR_MONTH_ABBREV_JUL                                            :Jul
-STR_MONTH_ABBREV_AUG                                            :Avg
-STR_MONTH_ABBREV_SEP                                            :Sep
-STR_MONTH_ABBREV_OCT                                            :Okt
-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}
@@ -451,8 +430,6 @@ 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_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
@@ -499,7 +476,7 @@ STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Brez
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Ime
 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                                          :1.
 STR_ORDINAL_NUMBER_2ND                                          :2.
 STR_ORDINAL_NUMBER_3RD                                          :3.
@@ -533,6 +510,34 @@ STR_ORDINAL_NUMBER_30TH                                         :30.
 STR_ORDINAL_NUMBER_31ST                                         :31.
 ############ 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                                            :Maj
+STR_MONTH_ABBREV_JUN                                            :Jun
+STR_MONTH_ABBREV_JUL                                            :Jul
+STR_MONTH_ABBREV_AUG                                            :Avg
+STR_MONTH_ABBREV_SEP                                            :Sep
+STR_MONTH_ABBREV_OCT                                            :Okt
+STR_MONTH_ABBREV_NOV                                            :Nov
+STR_MONTH_ABBREV_DEC                                            :Dec
+
+STR_MONTH_JAN                                                   :Januar
+STR_MONTH_FEB                                                   :Februar
+STR_MONTH_MAR                                                   :Marec
+STR_MONTH_APR                                                   :April
+STR_MONTH_MAY                                                   :Maj
+STR_MONTH_JUN                                                   :Junij
+STR_MONTH_JUL                                                   :Julij
+STR_MONTH_AUG                                                   :Avgust
+STR_MONTH_SEP                                                   :September
+STR_MONTH_OCT                                                   :Oktober
+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}Sprejet tovor: {LTBLUE}
@@ -622,12 +627,9 @@ 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_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_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
@@ -709,9 +711,7 @@ STR_OFF                                                         :Izključeno
 STR_SUMMARY                                                     :Povzetek
 STR_FULL                                                        :Polno
 STR_STATUSBAR_COMPANY_NAME                                      :{SILVER}- -  {COMPANY}  - -
-STR_BLACK_STRING                                                :{BLACK}{STRING}
 
-STR_JUST_CHECKMARK                                              :{CHECKMARK}
 ############ range for menu starts
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Možnosti igre
 STR_SETTINGS_MENU_DIFFICULTY_SETTINGS                           :Nastavitve težavnosti
@@ -803,9 +803,6 @@ STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY                             :Financiraj novo
 ############ range ends here
 
 STR_FUND_INDUSTRY_CAPTION                                       :{WHITE}Odpri novo industrijo
-STR_JUST_STRING                                                 :{STRING}
-STR_JUST_RAW_STRING                                             :{STRING}
-STR_JUST_INT                                                    :{NUM}
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_RAINFOREST                       :{WHITE} ... gradnja mogoča samo v območju deževnega gozda
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT                           :{WHITE} ... gradnja mogoča samo v puščavi
 STR_STATUSBAR_PAUSED                                            :{YELLOW}* *  PAVZA  *  *
@@ -819,9 +816,6 @@ 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_BLACK_6                                                     :{BLACK}6
-STR_BLACK_7                                                     :{BLACK}7
-
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Angleška (Originalna)
 STR_TOWNNAME_FRENCH                                             :Francoska
@@ -901,19 +895,6 @@ STR_OPTIONS_BASE_GRF_DESCRIPTION_TIP                            :{BLACK}Dodatne
 
 STR_AUTOSAVE_FAILED                                             :{WHITE}Samodejno shranjevanje spodletelo
 
-STR_MONTH_JAN                                                   :Januar
-STR_MONTH_FEB                                                   :Februar
-STR_MONTH_MAR                                                   :Marec
-STR_MONTH_APR                                                   :April
-STR_MONTH_MAY                                                   :Maj
-STR_MONTH_JUN                                                   :Junij
-STR_MONTH_JUL                                                   :Julij
-STR_MONTH_AUG                                                   :Avgust
-STR_MONTH_SEP                                                   :September
-STR_MONTH_OCT                                                   :Oktober
-STR_MONTH_NOV                                                   :November
-STR_MONTH_DEC                                                   :December
-
 STR_HEADING_FOR_STATION                                         :{LTBLUE}Pelje proti {STATION}
 STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}Pelje proti {STATION}, {VELOCITY}
 STR_NO_ORDERS                                                   :{LTBLUE}Brez ukazov
@@ -928,8 +909,6 @@ STR_CRATES                                                      :palet
 STR_RES_OTHER                                                   :drugo
 STR_NOTHING                                                     :
 
-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 ...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Konec ukazov v skupni rabi - -
@@ -1201,7 +1180,6 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Y-velik
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :onemogočeno
-STR_JUST_CURRENCY                                               :{CURRENCY}
 STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Spremeni vrednost
 
 STR_TEMPERATE_LANDSCAPE                                         :Zmerno podnebje
@@ -1237,7 +1215,6 @@ STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}Izberi v
 
 STR_WAYPOINT_VIEWPORT                                           :{WHITE}{WAYPOINT}
 STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WHITE}{WAYPOINT}
-STR_WAYPOINT_NAME                                               :{WAYPOINT}
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Uredi ime točke poti
 
 STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}Ni mogoče preimenovati točke poti ...
@@ -1304,11 +1281,6 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Imena in
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...preblizu drugi industriji
 
-STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Predelaj vlak za tovor druge vrste
-STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Predelaj vlak
-STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Izberi predelavo za tip tovora
-STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Predelaj vlak za označen tip tovora
-STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Nemogoča predelava vlaka...
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Spremeni proizvodnjo
 
 ############ network gui strings
@@ -1819,11 +1791,6 @@ STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1                           :Čajnik-hiša
 STR_TOWN_BUILDING_NAME_PIGGY_BANK_1                             :Prašičkova banka
 STR_TOWN_BUILDING_NAME_PIGGY_BANK_1.r                           :Prašičkove banke
 
-STR_INDUSTRY_NAME                                               :{INDUSTRY}
-STR_TOWN_NAME                                                   :{TOWN}
-STR_FORMAT_INDUSTRY_NAME                                        :{TOWN} {STRING}
-STR_STATION_NAME                                                :{STATION}
-
 ##id 0x2800
 STR_LANDSCAPING_MENU_LANDSCAPING                                :Oblikovanje terena
 STR_LANDSCAPING_MENU_PLANT_TREES                                :Posadi drevesa
@@ -1878,6 +1845,12 @@ STR_CARGO_RATING_EXCELLENT                                      :Izvrstno
 STR_CARGO_RATING_OUTSTANDING                                    :Sijajno
 ############ range for rating ends
 
+### station view strings
+STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Prikaz vsah vlakov, ki imajo to postajo na urniku
+STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Prikaz vseh cestnih vozil, ki imajo to postajo na urniku
+STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Prikaz vseh letal, ki imajo to postajo na urniku
+STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Prikaz vseh ladij, ki imajo to postajo na urniku
+
 STR_STATION_VIEW_CARGO_RATING                                   :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO                        :{WHITE}{STATION} ne sprejema več {STRING.r}
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO               :{WHITE}{STATION} ne sprejema več {STRING.r} in {STRING.r}
@@ -2158,6 +2131,7 @@ STR_SV_STNAME_AIRPORT                                           :{STRING} Letali
 STR_SV_STNAME_OILFIELD                                          :{STRING} Naftna polja
 STR_SV_STNAME_MINES                                             :{STRING} Rudniška
 STR_SV_STNAME_DOCKS                                             :{STRING} Doki
+##id 0x6020
 STR_SV_STNAME_ANNEXE                                            :{STRING} Priključna
 STR_SV_STNAME_SIDINGS                                           :{STRING} Stranska
 STR_SV_STNAME_BRANCH                                            :{STRING} Razvodna
@@ -2205,8 +2179,6 @@ STR_NUM_LOW                                                     :Malo
 STR_NUM_NORMAL                                                  :Normalno
 STR_NUM_HIGH                                                    :Veliko
 STR_NUM_CUSTOM                                                  :Po meri
-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
@@ -2240,7 +2212,6 @@ STR_CITY_APPROVAL_HOSTILE                                       :Sovražno
 
 ##id 0x7000
 STR_COMPANY_VIEW_CAPTION                                        :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
-STR_FORMAT_COMPANY_NUM                                          :(Podjetje {COMMA})
 STR_COMPANY_VIEW_NEW_FACE_BUTTON                                :{BLACK}Nov obraz
 STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON                           :{BLACK}Barvna shema
 STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}Barvna shema:
@@ -2273,7 +2244,6 @@ STR_FINANCES_TOTAL_CAPTION                                      :{WHITE}Skupaj:
 STR_COMPANY_NAME_COMPANY_NUM                                    :{COMPANY} {COMPANYNUM}
 STR_GRAPH_INCOME_CAPTION                                        :{WHITE}Graf prihodkov
 STR_CURRCOMPACT                                                 :{CURRCOMPACT}
-STR_JUST_COMMA                                                  :{COMMA}
 STR_GRAPH_OPERATING_PROFIT_CAPTION                              :{WHITE}Graf čistega dobička
 STR_FINANCES_BANK_BALANCE_TITLE                                 :{WHITE}Bančno stanje
 STR_FINANCES_LOAN_TITLE                                         :{WHITE}Posojilo
@@ -2676,10 +2646,8 @@ STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE                          :enotirna lokomo
 STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE                            :magnetna lokomotiva
 
 ##id 0x8800
-STR_DEPOT_TRAIN_CAPTION                                         :{WHITE}{TOWN} Železniška garaža
 STR_NEWS_FIRST_TRAIN_ARRIVAL                                    :{BLACK}{BIGFONT}Prebivalci praznujejo . . .{}Prvi vlak je slovesno pripeljal{}na postajo {STATION}!
 STR_VEHICLE_DETAILS_CAPTION                                     :{WHITE}{VEHICLE} (Podrobnosti)
-STR_ERROR_TRAIN_IN_THE_WAY                                      :{WHITE}Vlak v napoto
 STR_ORDER                                                       :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 STR_ORDER_SELECTED                                              :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 STR_ORDER_NON_STOP                                              :{BLACK}Non-stop
@@ -2769,38 +2737,16 @@ STR_TIMETABLE_AND_TRAVEL_FOR                                    :s potovanjem za
 STR_TIMETABLE_DAYS                                              :{COMMA} d{P an neva i i}
 STR_TIMETABLE_TICKS                                             :{COMMA} pik{P a i e ""}
 
-STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Pelje v {TOWN} železniško garažo
-STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Pelje v {TOWN} železniško garažo, {VELOCITY}
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Na servis v {TOWN} železniško garažo
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Na servis v {TOWN} železniško garažo, {VELOCITY}
-
 STR_INVALID_ORDER                                               :{RED} (Neveljaven ukaz)
 
 STR_UNKNOWN_STATION                                             :neznana postaja
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}Prazen
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :Tovor {LTBLUE}{CARGO} iz postaje {STATION}
 STR_VEHICLE_DETAILS_CARGO_FROM_MULT                             :{LTBLUE}{CARGO} iz {STATION} (x{NUM})
-STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} čaka v garaži
-STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Nova vozila
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}Vlak je predolg
 STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}Vlaki so lahko spremenjeni šele, ko stojijo v garaži
-STR_VEHICLE_LIST_TRAIN_CAPTION                                  :{WHITE}{STRING} - {COMMA} Vlak{P "" a i ov}
 
-STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}Nova železniška vozila
-STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}Nova električna tirna vozila
-STR_BUILD_VEHICLE_TRAIN_MONORAIL_CAPTION                        :{WHITE}Nova enotirna vozila
-STR_BUILD_VEHICLE_TRAIN_MAGLEV_CAPTION                          :{WHITE}Nova magnetna vozila
-STR_BUILD_VEHICLE_TRAIN_ALL_CAPTION                             :{WHITE}Tirna vozila
-
-STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_BUTTON                    :{BLACK}Zgradi vozilo
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Kloniraj vozilo
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}To bo zgradilo kopijo vozila. CTRL+klik skopira tudi navodila
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}To bo zgradilo kopijo vozila. Klikni na ta gumb in nato na vozilo v ali zunaj garaže. CTRL+klik skopira tudi ukaze
-STR_CLONE_TRAIN                                                 :{BLACK}Kloniraj vlak
-STR_CLONE_TRAIN_INFO                                            :{BLACK}To bo zgradilo kopijo vlaka vključno z vsemi vagoni. CTRL+klik skopira tudi navodila
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}To bo zgradilo kopijo vlaka vključno z vsemi vagoni. Klikni na ta gumb in nato na vlak v ali zunaj garaže. CTRL+klik skopira tudi navodila
-STR_BUILD_VEHICLE_TRAIN_RENAME_BUTTON                           :{BLACK}Preimenuj
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Preskoči
 STR_ORDERS_DELETE_BUTTON                                        :{BLACK}Izbriši
 STR_ORDERS_GO_TO_BUTTON                                         :{BLACK}Pojdi do
@@ -2816,14 +2762,12 @@ STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Preklop
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Ukazi)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Konec ukazov - -
 STR_SERVICE                                                     :{BLACK}Servis
-STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Ni mogoče kupiti vozila ...
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Zgrajeno: {LTBLUE}{NUM}{BLACK} Vrednost: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Vrednost: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
 STR_VEHICLE_STATUS_LOADING_UNLOADING                            :{LTBLUE}Natovarjanje / Raztovarjanje
 STR_VEHICLE_STATUS_LEAVING                                      :{LTBLUE}Zapušča
 STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}Vlak mora biti ustavljen v garaži
-STR_ERROR_CAN_T_SEND_TRAIN_TO_DEPOT                             :{WHITE}Vlaka ni mogoče poslati v garažo ...
 STR_ERROR_NO_MORE_SPACE_FOR_ORDERS                              :{WHITE}Ni več prostora za ukaze
 STR_ERROR_TOO_MANY_ORDERS                                       :{WHITE}Preveč ukazov
 STR_ERROR_CAN_T_INSERT_NEW_ORDER                                :{WHITE}Ni mogoče vstaviti nov ukaz ...
@@ -2838,26 +2782,11 @@ STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE}vozilo,
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}Ni mogoče premakniti vozila ...
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}Zadnja lokomotiva vedno sledi prvi
 STR_CARGO_N_A                                                   :Ni na voljo{SKIP}
-STR_ERROR_CAN_T_SELL_TRAIN                                      :{WHITE}Vlaka ni mogoče prodati ...
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}Ni mogoče najti poti do najbližje garaže
-STR_ERROR_CAN_T_STOP_START_TRAIN                                :{WHITE}Ni mogoče ustaviti/zagnati vlaka ...
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}IObdobje servisiranja: {LTBLUE}{COMMA}dni{BLACK}   Zadnji servis: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}Obdobje servisiranja: {LTBLUE}{COMMA}%{BLACK}   Zadnji servis: {LTBLUE}{DATE_LONG}
-STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP                             :{BLACK}Vlaki - klikni na vlak za informacije
-STR_DEPOT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Vlaki - klikni na vlak za informacije, povleci vozilo za dodajanje/odstranjevanje iz vlaka
-STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP                            :{BLACK}Zgradi novo železniško vozilo
-STR_DEPOT_TRAIN_SELL_TOOLTIP                                    :{BLACK}Povleci železniško vozilo sem, če ga želiš prodati
-STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}Pogled na železniško garazo
-STR_BUILD_VEHICLE_TRAIN_LIST_TOOLTIP                            :{BLACK}Seznam železniških vozil - klikni na vozilo za informacije
-STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_TOOLTIP                   :{BLACK}Zgradi izbrano železniško vozilo
-STR_BUILD_VEHICLE_TRAIN_RENAME_TOOLTIP                          :{BLACK}Preimenuj železniško vozilo
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP                 :{BLACK}Trenutno železniško vozilo - klikni sem za izklop/zagon vozila
-STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP                           :{BLACK}Pokaži ukaze železniškega vozila
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP                         :{BLACK}Pogled na železniško vozilo
-STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP                    :{BLACK}Pošlji vlak v železniško garažo. CTRL+klik samo na servis
 STR_VEHICLE_VIEW_TRAIN_IGNORE_SIGNAL_TOOLTIP                    :{BLACK}Prisili vlak, naj nadaljuje brez čakanja semaforjev
 STR_VEHICLE_VIEW_TRAIN_REVERSE_TOOLTIP                          :{BLACK}Obrni smer vlaka
-STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Pokaži podrobnosti vlaka
 STR_VEHICLE_DETAILS_INCREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Podaljšaj čas med servisi
 STR_VEHICLE_DETAILS_DECREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Skrajšaj cas med servisi
 STR_VEHICLE_DETAILS_TRAIN_CARGO_TOOLTIP                         :{BLACK}Pokaži podrobnosti tovora na vlaku
@@ -2891,13 +2820,9 @@ STR_VEHICLE_STATUS_STOPPED                                      :{RED}Ustavljeno
 STR_ERROR_CAN_T_MAKE_TRAIN_PASS_SIGNAL                          :{WHITE}Ni mogoče, da vlak v nevarnosti pelje mimo semaforjev ...
 STR_VEHICLE_STATUS_CRASHED                                      :{RED}Uničen!
 
-STR_QUERY_RENAME_TRAIN_CAPTION                                  :{WHITE}Poimenuj vlak
-STR_ERROR_CAN_T_RENAME_TRAIN                                    :{WHITE}Ni mogoče poimenovati vlaka ...
-STR_VEHICLE_DETAILS_TRAIN_RENAME                                :{BLACK}Poimenuj vlak
 STR_NEWS_TRAIN_CRASH                                            :{BLACK}{BIGFONT}Železniška nesreča!{}{COMMA} ponesrečen{P ec ca ci cev} {P je sta so je} umrl{P "" a i o} v plamenih po trku
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Ni mogoče spremeniti smeri vlaka ...
-STR_QUERY_RENAME_TRAIN_TYPE_CAPTION                             :{WHITE}Preimenuj železniško vozilo
-STR_ERROR_CAN_T_RENAME_TRAIN_TYPE                               :{WHITE}Ni mogoče preimenovati železniškega vozila ...
+STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Ni moč obrniti vozil, sestavljenih iz večih enot
 STR_CLEAR_TIME                                                  :{BLACK}Počisti čas
 STR_RESET_LATENESS                                              :{BLACK}Resetiraj  Late Counter
 STR_CHANGE_WAYPOINT_NAME                                        :{BLACK}Spremeni ime točke poti
@@ -2929,178 +2854,53 @@ STR_TIMETABLE_AUTOFILL                                          :{BLACK}Samodejn
 STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Avtomatsko napolni časovno tabelo z vrednostmi iz naslednjega potovanja. (CTRL-klik za poskus vzdrževanja čakalnih dob)
 
 ##id 0x9000
-STR_ERROR_ROAD_VEHICLE_IN_THE_WAY                               :{WHITE}Cestno vozilo na poti
-STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING} - {COMMA} Cestn{P o i a ih} vozil{P o i a ""}
-STR_DEPOT_ROAD_VEHICLE_CAPTION                                  :{WHITE}{TOWN} Garaža za cestna vozila
-STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_BUTTON                      :{BLACK}Nova vozila
-STR_BUILD_VEHICLE_ROAD_VEHICLE_CAPTION                          :{WHITE}Nova cestna vozila
-STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_BUTTON             :{BLACK}Zgradi vozilo
-STR_ERROR_CAN_T_BUILD_ROAD_VEHICLE                              :{WHITE}Ni mogoče zgraditi cestnega vozila ...
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE} ... mora biti ustavljen v garaži
-STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}Ni mogoče prodati cestnega vozila...
-STR_ERROR_CAN_T_STOP_START_ROAD_VEHICLE                         :{WHITE}Ni mogoče ustaviti/zagnati cestnega vozila ...
-STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} čaka v garaži
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Pelje v {TOWN} cestno garažo
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Pelje v {TOWN} cestno garažo, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Na servisiranje v {TOWN} cestno garažo
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Na servisiranje v {TOWN} cestno garažo, {VELOCITY}
-STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Ni mogoče poslati vozila v garažo...
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Ni mogoče najti najbližje garaže
-STR_VEHICLE_LIST_ROAD_VEHICLE_TOOLTIP                           :{BLACK}Cestna vozila - kliknite na vozilo za informacije
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP          :{BLACK}Dejanja trenutnega vozila - kliknite za ustavitev/zagon vozila
-STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP                    :{BLACK}Pokaži navodila vozila
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP                  :{BLACK}Pogled na vozilo
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}Pošlji vozilo v garažo. CTRL+klik samo na servis
 STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP                   :{BLACK}Prisilno obrni vozilo
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Prikaži podrobnosti cestnega vozila
-STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Vozila - kliknite na vozilo za informacije
-STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}Zgradi novo cestno vozilo
-STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}Povleci cestno vozilo sem, če ga želiš prodati
-STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}Pogled na garažo
-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_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})
 
-STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Poimenuj cestno vozilo
-STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Ni mogoče poimenovati cestnega vozila ...
-STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Poimenuj cestno vozilo
 STR_NEWS_FIRST_BUS_ARRIVAL                                      :{BLACK}{BIGFONT}Prebivalci praznujejo . . .{}Prihod prvega avtobusa na postajo {STATION}!
 STR_NEWS_FIRST_TRUCK_ARRIVAL                                    :{BLACK}{BIGFONT}Prebivalci praznujejo . . .{}Prihod prvega tovornjaka na postajo {STATION}!
 STR_NEWS_FIRST_PASSENGER_TRAM_ARRIVAL                           :{BLACK}{BIGFONT}Meščani proslavljajo . . .{}Prvi potniški tramvaj je prispel na postajo {STATION}!
 STR_NEWS_FIRST_CARGO_TRAM_ARRIVAL                               :{BLACK}{BIGFONT}Proslava meščanov . . .{}Prvi tovorni tramvaj je pripeljal na postajo {STATION}!
 STR_NEWS_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Prometna nesreča!{}Voznik umrl v plamenih po trku z vlakom.
 STR_NEWS_ROAD_VEHICLE_CRASH                                     :{BLACK}{BIGFONT}Prometna nesreča!{}{COMMA} mrt{P ev va vi vih} v plamenih ob trku z vlakom.
-STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Ni moč obrniti vozil, sestavljenih iz večih enot
-STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Preimenuj
-STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Preimenuj cestno vozilo
-STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Preimenuj cestno vozilo
-STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Ni mogoče preimenovati cestnega vozila ...
 
-STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Predelaj vozilo za prevoz druge vrste tovora
-STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Predelaj cestno vozilo
-STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Predelaj cestno vozilo za prevoz označenega tipa tovora
-STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Ni možna predelava cestnega vozila
-STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Izberi tip tovora, ki ga bo vozilo prevažalo
 
 ##id 0x9800
 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :Gradnja vodnih poti
 STR_WATERWAYS_TOOLBAR_CAPTION                                   :{WHITE}Gradnja vodnih poti
 STR_WATERWAYS_TOOLBAR_CAPTION_SE                                :{WHITE}Vodne poti
 STR_ERROR_CAN_T_BUILD_DOCK_HERE                                 :{WHITE}Ni mogoče zgraditi pomola tukaj ...
-STR_DEPOT_SHIP_CAPTION                                          :{WHITE}{TOWN} Ladijska garaža
-STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON                              :{BLACK}Nove ladje
-STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - {COMMA} Lad{P ja ji je ij}
-STR_BUILD_VEHICLE_SHIP_CAPTION                                  :{WHITE}Nove ladje
-STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON                     :{BLACK}Zgradi ladjo
-STR_CLONE_SHIP                                                  :{BLACK}Kloniraj ladjo
-STR_CLONE_SHIP_INFO                                             :{BLACK}To bo zgradilo kopijo ladje. CTRL+klik skopira tudi navodila
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}To bo zgradilo kopijo ladje. Klikni na ta gumb in nato na ladjo v ali zunaj ladjedelnice. CTRL+klik skopira tudi ukaze
 STR_ERROR_SHIP_MUST_BE_STOPPED_IN_DEPOT                         :{WHITE}Ladja mora biti ustavljena in v garaži
-STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}Ni mogoče prodati ladje ...
-STR_ERROR_CAN_T_BUILD_SHIP                                      :{WHITE}Ni mogoče zgraditi ladje ...
-STR_ERROR_SHIP_IN_THE_WAY                                       :{WHITE}Ladja v napoto
-STR_ERROR_CAN_T_STOP_START_SHIP                                 :{WHITE}Ni mogoče ustaviti/zagnati ladje...
-STR_ERROR_CAN_T_SEND_SHIP_TO_DEPOT                              :{WHITE}Ni mogoče poslati ladje v garažo...
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Pelje v {TOWN} ladijsko garažo
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Pelje v {TOWN} ladijsko garažo, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Gre na servis v {TOWN} ladijsko garažo
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Gre na servis v {TOWN} ladijsko garažo, {VELOCITY}
-STR_NEWS_SHIP_IS_WAITING                                        :{WHITE}{VEHICLE} čaka v ladjedelnici
 STR_WATERWAYS_TOOLBAR_BUILD_DOCK_TOOLTIP                        :{BLACK}Zgradi ladijski dok
 STR_WATERWAYS_TOOLBAR_BUILD_DEPOT_TOOLTIP                       :{BLACK}Zgradi ladjedelnico (za izgradnjo in servisiranje ladij)
-STR_DEPOT_SHIP_LIST_TOOLTIP                                     :{BLACK}Ladje - klikni na ladjo za informacije
-STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}Zgradi novo ladjo
-STR_DEPOT_SHIP_SELL_TOOLTIP                                     :{BLACK}Povleci novo ladjo sem, če jo želiš prodati
-STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}Pogled na ladjedelnico
-STR_VEHICLE_LIST_SHIP_TOOLTIP                                   :{BLACK}Ladje - kliknite na ladjo za informacije
-STR_BUILD_VEHICLE_SHIP_LIST_TOOLTIP                             :{BLACK}Seznam ladij - kliknite na ladjo za informacije
-STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP                    :{BLACK}Zgradi izbrano ladjo
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP                  :{BLACK}Trenutna ladja - klikni sem za ustavitev/zagon ladje
-STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Prikaži ukaze ladje
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP                          :{BLACK}Pogled na ladjo
-STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}Pošlji ladjo v ladjedelnico. CTRL+klik samo na servis
-STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Prikaži podrobnosti ladje
-STR_VEHICLE_DETAILS_SHIP_RENAME                                 :{BLACK}Poimenuj ladjo
 
-STR_QUERY_RENAME_SHIP_CAPTION                                   :{WHITE}Poimenuj ladjo
-STR_ERROR_CAN_T_RENAME_SHIP                                     :{WHITE}Ni mogoče poimenovati ladje ...
 STR_NEWS_FIRST_SHIP_ARRIVAL                                     :{BLACK}{BIGFONT}Prebivalci praznujejo . . .{}Prva ladja prispela na postajo {STATION}!
 STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}Postavi bojo, ki je lahko uporabljena kot točka poti
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}Ni mogoče postaviti boje tukaj ...
 STR_BUILD_AQUEDUCT                                              :{BLACK}Gradnja vodovoda
 STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}Ni mogoča gradnja vodovoda tukaj...
-STR_BUILD_VEHICLE_SHIP_RENAME_BUTTON                            :{BLACK}Preimenuj
-STR_BUILD_VEHICLE_SHIP_RENAME_TOOLTIP                           :{BLACK}Preimenuj ladjo
-STR_QUERY_RENAME_SHIP_TYPE_CAPTION                              :{WHITE}Preimenuj ladjo
-STR_ERROR_CAN_T_RENAME_SHIP_TYPE                                :{WHITE}Ni mogoče preimenovati ladje ...
-STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}Predelaj ladjo, da bo lahko sprejela drug tovor
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (Predelaj)
-STR_REFIT_SHIP_REFIT_BUTTON                                     :{BLACK}Preuredi ladjo
-STR_REFIT_SHIP_LIST_TOOLTIP                                     :{BLACK}Izberi tip tovora
-STR_REFIT_SHIP_REFIT_TOOLTIP                                    :{BLACK}Preuredi tovorni prostor ladje za izbrani tovor
 STR_REFIT_TITLE                                                 :{GOLD}Izberi tip tovora:
 STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}Nova zmogljivost: {GOLD}{CARGO}{}{BLACK}Cena predelave: {GOLD}{CURRENCY}
-STR_ERROR_CAN_T_REFIT_SHIP                                      :{WHITE}Ni mogoče preurediti ladje ...
 STR_REFITTABLE                                                  :(spremenljivo)
 
 ##id 0xA000
 STR_TOOLBAR_AIRCRAFT_CAPTION                                    :{WHITE}Letališča
 STR_ERROR_CAN_T_BUILD_AIRPORT_HERE                              :{WHITE}Ni mogoče zgraditi letališča tukaj ...
-STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}{STATION} Hangar
-STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON                          :{BLACK}Novo letalo
-STR_CLONE_AIRCRAFT                                              :{BLACK}Kloniraj letalo
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}To bo zgradilo kopijo letala. CTRL+klik skopira tudi navodila
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}To bo zgradilo kopijo letala. Klikni na ta gumb in nato na letalo v ali zunaj hangarja. CTRL+klik skopira tudi ukaze
-STR_BUILD_VEHICLE_AIRCRAFT_CAPTION                              :{WHITE}Novo letalo
-STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON                 :{BLACK}Zgradi letalo
-STR_ERROR_CAN_T_BUILD_AIRCRAFT                                  :{WHITE}Ni mogoče zgraditi letala ...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} Letal{P o i a ""}
-STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR                         :{WHITE}Ni mogoče poslati letala v hangar ...
-STR_HEADING_FOR_HANGAR                                          :{ORANGE}Na poti v {STATION} hangar
-STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Na poti v {STATION} hangar, {VELOCITY}
-STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Gre na servis v {STATION} hangar
-STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Gre na servis v {STATION} hangar, {VELOCITY}
-STR_NEWS_AIRCRAFT_IS_WAITING                                    :{WHITE}{VEHICLE} čaka v letališkem hangarju
-STR_ERROR_AIRCRAFT_IN_THE_WAY                                   :{WHITE}Letalo v napoto
-STR_ERROR_CAN_T_STOP_START_AIRCRAFT                             :{WHITE}Ni mogoče ustaviti/zagnati letala ...
 STR_ERROR_AIRCRAFT_IS_IN_FLIGHT                                 :{WHITE}Letalo v letu
 STR_ERROR_AIRCRAFT_MUST_BE_STOPPED                              :{WHITE}Letalo mora biti ustavljeno v hangarju
-STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}Ni mogoče prodati letala ...
 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION                          :Gradnja letališča
 STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Zgradi letališče
-STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP                               :{BLACK}Letalo - kliknite na letalo za informacije
-STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Letalo - kliknite na letalo za informacije
-STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}Zgradi novo letalo
-STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}Povleci letalo sem, da ga prodaš
-STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Pogled na hangar
-STR_BUILD_VEHICLE_AIRCRAFT_LIST_TOOLTIP                         :{BLACK}Seznam letal - kliknite na letalo za informacije
-STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_TOOLTIP                :{BLACK}Zgradi izbrano letalo
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP              :{BLACK}Trenutno letalo - klikni sem za ustavitev/zagon letala
-STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Prikaži navodila letala
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP                      :{BLACK}Pogled na letalo
-STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}Pošlji letalo v hangar. CTRL+klik samo na servis
-STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Prikaži podrobnosti letala
 
-STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}Poimenuj letalo
-STR_ERROR_CAN_T_RENAME_AIRCRAFT                                 :{WHITE}Ni mogoče poimenovati letala ...
-STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}Poimenuj letalo
 STR_NEWS_FIRST_AIRCRAFT_ARRIVAL                                 :{BLACK}{BIGFONT}Prebivalci praznujejo . . .{}Prvo letalo pristalo na letališču {STATION}!
 STR_NEWS_AIRCRAFT_CRASH                                         :{BLACK}{BIGFONT}Letalska nesreča!{}{COMMA} mrt{P ev va vi vih} v plamenih na letališču {STATION}
 STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Letalska nesreča!{}Letalu je zmanjkalo goriva, v strmoglavljenju {COMMA} mrt {P ev va vi vih}l!
 STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
-STR_BUILD_VEHICLE_AIRCRAFT_RENAME_BUTTON                        :{BLACK}Preimenuj
-STR_BUILD_VEHICLE_AIRCRAFT_RENAME_TOOLTIP                       :{BLACK}Preimenuj letalo
-STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION                          :{WHITE}Preimenuj letalo
-STR_ERROR_CAN_T_RENAME_AIRCRAFT_TYPE                            :{WHITE}Ni mogoče preimenovati letala ...
-STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Predelaj tovorni prostor letala za drugačen tovor
-STR_REFIT_AIRCRAFT_REFIT_BUTTON                                 :{BLACK}Predelaj letalo
-STR_REFIT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Izberi tip tovora
-STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}Predelaj letalo za izbran tovor
-STR_ERROR_CAN_T_REFIT_AIRCRAFT                                  :{WHITE}Ni mogoča predelava letala ...
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Časovna tabela)
 
@@ -3254,15 +3054,225 @@ STR_LORRY                                                       :{BLACK}{LORRY}
 STR_PLANE                                                       :{BLACK}{PLANE}
 STR_SHIP                                                        :{BLACK}{SHIP}
 
+############ Vehicle lists
+STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP                             :{BLACK}Vlaki - klikni na vlak za informacije
+STR_VEHICLE_LIST_ROAD_VEHICLE_TOOLTIP                           :{BLACK}Cestna vozila - kliknite na vozilo za informacije
+STR_VEHICLE_LIST_SHIP_TOOLTIP                                   :{BLACK}Ladje - kliknite na ladjo za informacije
+STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP                               :{BLACK}Letalo - kliknite na letalo za informacije
 
-STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Prikaz vsah vlakov, ki imajo to postajo na urniku
-STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Prikaz vseh cestnih vozil, ki imajo to postajo na urniku
-STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Prikaz vseh letal, ki imajo to postajo na urniku
-STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Prikaz vseh ladij, ki imajo to postajo na urniku
+STR_VEHICLE_LIST_TRAIN_CAPTION                                  :{WHITE}{STRING} - {COMMA} Vlak{P "" a i ov}
+STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING} - {COMMA} Cestn{P o i a ih} vozil{P o i a ""}
+STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - {COMMA} Lad{P ja ji je ij}
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} Letal{P o i a ""}
 
 STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}Skupni ukazi za {COMMA} vozil{P o i a ""}
 STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Prikaz vseh vozil, ki si delijo ta urnik
 
+STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} čaka v garaži
+STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} čaka v garaži
+STR_NEWS_SHIP_IS_WAITING                                        :{WHITE}{VEHICLE} čaka v ladjedelnici
+STR_NEWS_AIRCRAFT_IS_WAITING                                    :{WHITE}{VEHICLE} čaka v letališkem hangarju
+
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Predelaj vlak
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Predelaj cestno vozilo
+STR_REFIT_SHIP_REFIT_BUTTON                                     :{BLACK}Preuredi ladjo
+STR_REFIT_AIRCRAFT_REFIT_BUTTON                                 :{BLACK}Predelaj letalo
+
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Predelaj vlak za označen tip tovora
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Predelaj cestno vozilo za prevoz označenega tipa tovora
+STR_REFIT_SHIP_REFIT_TOOLTIP                                    :{BLACK}Preuredi tovorni prostor ladje za izbrani tovor
+STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}Predelaj letalo za izbran tovor
+
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Izberi predelavo za tip tovora
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Izberi tip tovora, ki ga bo vozilo prevažalo
+STR_REFIT_SHIP_LIST_TOOLTIP                                     :{BLACK}Izberi tip tovora
+STR_REFIT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Izberi tip tovora
+
+STR_DEPOT_TRAIN_CAPTION                                         :{WHITE}{TOWN} Železniška garaža
+STR_DEPOT_ROAD_VEHICLE_CAPTION                                  :{WHITE}{TOWN} Garaža za cestna vozila
+STR_DEPOT_SHIP_CAPTION                                          :{WHITE}{TOWN} Ladijska garaža
+STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}{STATION} Hangar
+
+STR_VEHICLE_DETAILS_TRAIN_RENAME                                :{BLACK}Poimenuj vlak
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Poimenuj cestno vozilo
+STR_VEHICLE_DETAILS_SHIP_RENAME                                 :{BLACK}Poimenuj ladjo
+STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}Poimenuj letalo
+
+STR_QUERY_RENAME_TRAIN_CAPTION                                  :{WHITE}Poimenuj vlak
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Poimenuj cestno vozilo
+STR_QUERY_RENAME_SHIP_CAPTION                                   :{WHITE}Poimenuj ladjo
+STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}Poimenuj letalo
+
+STR_ERROR_TRAIN_IN_THE_WAY                                      :{WHITE}Vlak v napoto
+STR_ERROR_ROAD_VEHICLE_IN_THE_WAY                               :{WHITE}Cestno vozilo na poti
+STR_ERROR_SHIP_IN_THE_WAY                                       :{WHITE}Ladja v napoto
+STR_ERROR_AIRCRAFT_IN_THE_WAY                                   :{WHITE}Letalo v napoto
+
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Nemogoča predelava vlaka...
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Ni možna predelava cestnega vozila
+STR_ERROR_CAN_T_REFIT_SHIP                                      :{WHITE}Ni mogoče preurediti ladje ...
+STR_ERROR_CAN_T_REFIT_AIRCRAFT                                  :{WHITE}Ni mogoča predelava letala ...
+
+STR_ERROR_CAN_T_RENAME_TRAIN                                    :{WHITE}Ni mogoče poimenovati vlaka ...
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Ni mogoče poimenovati cestnega vozila ...
+STR_ERROR_CAN_T_RENAME_SHIP                                     :{WHITE}Ni mogoče poimenovati ladje ...
+STR_ERROR_CAN_T_RENAME_AIRCRAFT                                 :{WHITE}Ni mogoče poimenovati letala ...
+
+STR_ERROR_CAN_T_STOP_START_TRAIN                                :{WHITE}Ni mogoče ustaviti/zagnati vlaka ...
+STR_ERROR_CAN_T_STOP_START_ROAD_VEHICLE                         :{WHITE}Ni mogoče ustaviti/zagnati cestnega vozila ...
+STR_ERROR_CAN_T_STOP_START_SHIP                                 :{WHITE}Ni mogoče ustaviti/zagnati ladje...
+STR_ERROR_CAN_T_STOP_START_AIRCRAFT                             :{WHITE}Ni mogoče ustaviti/zagnati letala ...
+
+STR_ERROR_CAN_T_SEND_TRAIN_TO_DEPOT                             :{WHITE}Vlaka ni mogoče poslati v garažo ...
+STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Ni mogoče poslati vozila v garažo...
+STR_ERROR_CAN_T_SEND_SHIP_TO_DEPOT                              :{WHITE}Ni mogoče poslati ladje v garažo...
+STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR                         :{WHITE}Ni mogoče poslati letala v hangar ...
+
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Ni mogoče kupiti vozila ...
+STR_ERROR_CAN_T_BUILD_ROAD_VEHICLE                              :{WHITE}Ni mogoče zgraditi cestnega vozila ...
+STR_ERROR_CAN_T_BUILD_SHIP                                      :{WHITE}Ni mogoče zgraditi ladje ...
+STR_ERROR_CAN_T_BUILD_AIRCRAFT                                  :{WHITE}Ni mogoče zgraditi letala ...
+
+STR_ERROR_CAN_T_RENAME_TRAIN_TYPE                               :{WHITE}Ni mogoče preimenovati železniškega vozila ...
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Ni mogoče preimenovati cestnega vozila ...
+STR_ERROR_CAN_T_RENAME_SHIP_TYPE                                :{WHITE}Ni mogoče preimenovati ladje ...
+STR_ERROR_CAN_T_RENAME_AIRCRAFT_TYPE                            :{WHITE}Ni mogoče preimenovati letala ...
+
+STR_ERROR_CAN_T_SELL_TRAIN                                      :{WHITE}Vlaka ni mogoče prodati ...
+STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}Ni mogoče prodati cestnega vozila...
+STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}Ni mogoče prodati ladje ...
+STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}Ni mogoče prodati letala ...
+
+STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP                 :{BLACK}Trenutno železniško vozilo - klikni sem za izklop/zagon vozila
+STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP          :{BLACK}Dejanja trenutnega vozila - kliknite za ustavitev/zagon vozila
+STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP                  :{BLACK}Trenutna ladja - klikni sem za ustavitev/zagon ladje
+STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP              :{BLACK}Trenutno letalo - klikni sem za ustavitev/zagon letala
+
+STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP                           :{BLACK}Pokaži ukaze železniškega vozila
+STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP                    :{BLACK}Pokaži navodila vozila
+STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Prikaži ukaze ladje
+STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Prikaži navodila letala
+
+STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP                         :{BLACK}Pogled na železniško vozilo
+STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP                  :{BLACK}Pogled na vozilo
+STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP                          :{BLACK}Pogled na ladjo
+STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP                      :{BLACK}Pogled na letalo
+
+STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP                    :{BLACK}Pošlji vlak v železniško garažo. CTRL+klik samo na servis
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}Pošlji vozilo v garažo. CTRL+klik samo na servis
+STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}Pošlji ladjo v ladjedelnico. CTRL+klik samo na servis
+STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}Pošlji letalo v hangar. CTRL+klik samo na servis
+
+STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Pokaži podrobnosti vlaka
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Prikaži podrobnosti cestnega vozila
+STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Prikaži podrobnosti ladje
+STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Prikaži podrobnosti letala
+
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Predelaj vlak za tovor druge vrste
+STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Predelaj vozilo za prevoz druge vrste tovora
+STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}Predelaj ladjo, da bo lahko sprejela drug tovor
+STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Predelaj tovorni prostor letala za drugačen tovor
+
+STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Pelje v {TOWN} železniško garažo
+STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Pelje v {TOWN} železniško garažo, {VELOCITY}
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Pelje v {TOWN} cestno garažo
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Pelje v {TOWN} cestno garažo, {VELOCITY}
+STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Pelje v {TOWN} ladijsko garažo
+STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Pelje v {TOWN} ladijsko garažo, {VELOCITY}
+STR_HEADING_FOR_HANGAR                                          :{ORANGE}Na poti v {STATION} hangar
+STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Na poti v {STATION} hangar, {VELOCITY}
+
+STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Na servis v {TOWN} železniško garažo
+STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Na servis v {TOWN} železniško garažo, {VELOCITY}
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Na servisiranje v {TOWN} cestno garažo
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Na servisiranje v {TOWN} cestno garažo, {VELOCITY}
+STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Gre na servis v {TOWN} ladijsko garažo
+STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Gre na servis v {TOWN} ladijsko garažo, {VELOCITY}
+STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Gre na servis v {STATION} hangar
+STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Gre na servis v {STATION} hangar, {VELOCITY}
+
+
+STR_CLONE_TRAIN                                                 :{BLACK}Kloniraj vlak
+STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Kloniraj vozilo
+STR_CLONE_SHIP                                                  :{BLACK}Kloniraj ladjo
+STR_CLONE_AIRCRAFT                                              :{BLACK}Kloniraj letalo
+
+STR_CLONE_TRAIN_INFO                                            :{BLACK}To bo zgradilo kopijo vlaka vključno z vsemi vagoni. CTRL+klik skopira tudi navodila
+STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}To bo zgradilo kopijo vozila. CTRL+klik skopira tudi navodila
+STR_CLONE_SHIP_INFO                                             :{BLACK}To bo zgradilo kopijo ladje. CTRL+klik skopira tudi navodila
+STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}To bo zgradilo kopijo letala. CTRL+klik skopira tudi navodila
+
+STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}To bo zgradilo kopijo vlaka vključno z vsemi vagoni. Klikni na ta gumb in nato na vlak v ali zunaj garaže. CTRL+klik skopira tudi navodila
+STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}To bo zgradilo kopijo vozila. Klikni na ta gumb in nato na vozilo v ali zunaj garaže. CTRL+klik skopira tudi ukaze
+STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}To bo zgradilo kopijo ladje. Klikni na ta gumb in nato na ladjo v ali zunaj ladjedelnice. CTRL+klik skopira tudi ukaze
+STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}To bo zgradilo kopijo letala. Klikni na ta gumb in nato na letalo v ali zunaj hangarja. CTRL+klik skopira tudi ukaze
+
+STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}Nova železniška vozila
+STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}Nova električna tirna vozila
+STR_BUILD_VEHICLE_TRAIN_MONORAIL_CAPTION                        :{WHITE}Nova enotirna vozila
+STR_BUILD_VEHICLE_TRAIN_MAGLEV_CAPTION                          :{WHITE}Nova magnetna vozila
+
+STR_BUILD_VEHICLE_TRAIN_ALL_CAPTION                             :{WHITE}Tirna vozila
+STR_BUILD_VEHICLE_ROAD_VEHICLE_CAPTION                          :{WHITE}Nova cestna vozila
+STR_BUILD_VEHICLE_SHIP_CAPTION                                  :{WHITE}Nove ladje
+STR_BUILD_VEHICLE_AIRCRAFT_CAPTION                              :{WHITE}Novo letalo
+
+STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_BUTTON                    :{BLACK}Zgradi vozilo
+STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_BUTTON             :{BLACK}Zgradi vozilo
+STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON                     :{BLACK}Zgradi ladjo
+STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON                 :{BLACK}Zgradi letalo
+
+STR_BUILD_VEHICLE_TRAIN_LIST_TOOLTIP                            :{BLACK}Seznam železniških vozil - klikni na vozilo za informacije
+STR_BUILD_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP                     :{BLACK}Seznam cestnih vozil - klikni na vozilo za informacije
+STR_BUILD_VEHICLE_SHIP_LIST_TOOLTIP                             :{BLACK}Seznam ladij - kliknite na ladjo za informacije
+STR_BUILD_VEHICLE_AIRCRAFT_LIST_TOOLTIP                         :{BLACK}Seznam letal - kliknite na letalo za informacije
+
+STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_TOOLTIP                   :{BLACK}Zgradi izbrano železniško vozilo
+STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_TOOLTIP            :{BLACK}Zgradi izbrano cestno vozilo
+STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP                    :{BLACK}Zgradi izbrano ladjo
+STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_TOOLTIP                :{BLACK}Zgradi izbrano letalo
+
+STR_BUILD_VEHICLE_TRAIN_RENAME_BUTTON                           :{BLACK}Preimenuj
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Preimenuj
+STR_BUILD_VEHICLE_SHIP_RENAME_BUTTON                            :{BLACK}Preimenuj
+STR_BUILD_VEHICLE_AIRCRAFT_RENAME_BUTTON                        :{BLACK}Preimenuj
+
+STR_BUILD_VEHICLE_TRAIN_RENAME_TOOLTIP                          :{BLACK}Preimenuj železniško vozilo
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Preimenuj cestno vozilo
+STR_BUILD_VEHICLE_SHIP_RENAME_TOOLTIP                           :{BLACK}Preimenuj ladjo
+STR_BUILD_VEHICLE_AIRCRAFT_RENAME_TOOLTIP                       :{BLACK}Preimenuj letalo
+
+STR_QUERY_RENAME_TRAIN_TYPE_CAPTION                             :{WHITE}Preimenuj železniško vozilo
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Preimenuj cestno vozilo
+STR_QUERY_RENAME_SHIP_TYPE_CAPTION                              :{WHITE}Preimenuj ladjo
+STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION                          :{WHITE}Preimenuj letalo
+
+STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Nova vozila
+STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_BUTTON                      :{BLACK}Nova vozila
+STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON                              :{BLACK}Nove ladje
+STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON                          :{BLACK}Novo letalo
+
+STR_DEPOT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Vlaki - klikni na vlak za informacije, povleci vozilo za dodajanje/odstranjevanje iz vlaka
+STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Vozila - kliknite na vozilo za informacije
+STR_DEPOT_SHIP_LIST_TOOLTIP                                     :{BLACK}Ladje - klikni na ladjo za informacije
+STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Letalo - kliknite na letalo za informacije
+
+STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP                            :{BLACK}Zgradi novo železniško vozilo
+STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}Zgradi novo cestno vozilo
+STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}Zgradi novo ladjo
+STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}Zgradi novo letalo
+
+STR_DEPOT_TRAIN_SELL_TOOLTIP                                    :{BLACK}Povleci železniško vozilo sem, če ga želiš prodati
+STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}Povleci cestno vozilo sem, če ga želiš prodati
+STR_DEPOT_SHIP_SELL_TOOLTIP                                     :{BLACK}Povleci novo ladjo sem, če jo želiš prodati
+STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}Povleci letalo sem, da ga prodaš
+
+STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}Pogled na železniško garazo
+STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}Pogled na garažo
+STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}Pogled na ladjedelnico
+STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Pogled na hangar
+
+
 ### depot strings
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}Pripravljaš se na prodajo vseh vozil v garaži. Zagotovo?
 STR_DEPOT_WRONG_DEPOT_TYPE                                      :Napačna vrsta garaže
@@ -3282,7 +3292,6 @@ STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TIP                          :{BLACK}Avtomats
 STR_DEPOT_AUTOREPLACE_SHIP_TIP                                  :{BLACK}Avtomatsko zamenjaj vse ladje v garaži
 STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP                              :{BLACK}Samozamenjaj vsa letala v hangarju
 
-
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Zamenjaj {STRING}
 STR_REPLACE_VEHICLES_START                                      :{BLACK}Začni menjavo vozil
 STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Ustavi menjavo vozil
@@ -3298,6 +3307,7 @@ STR_REPLACE_REMOVE_WAGON                                        :{BLACK}Odstrani
 STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Dovoli samozamenjavi, da z odstranitvijo vagonov, začenši na začetku, ohrani isto dolžino vlaka, če bi ga menjava lokomotive podaljšala.
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}Zamenjuje: {ORANGE}{SKIP}{SKIP}{STRING}
 STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}Preklop med okni za menjavo lokomotiv in vagonov
+
 STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Vozilo ni na voljo
 STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Vozilo ni na voljo
 STR_SHIP_NOT_AVAILABLE                                          :{WHITE}Ladja ni na voljo
@@ -3448,17 +3458,6 @@ STR_MEASURE_AREA                                                :{BLACK}Območje
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Dolžina: {NUM}{}Višinska razlika: {NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Območje: {NUM} x {NUM}{}Višinska razlika: {NUM} m
 
-############ Date formatting
-STR_FORMAT_DATE_TINY                                            :{STRING}-{STRING}-{NUM}
-STR_FORMAT_DATE_SHORT                                           :{STRING} {NUM}
-STR_FORMAT_DATE_LONG                                            :{STRING} {STRING} {NUM}
-STR_FORMAT_DATE_ISO                                             :{2:NUM}-{1:STRING}-{0:STRING}
-
-STR_JUST_DATE_TINY                                              :{DATE_TINY}
-STR_JUST_DATE_LONG                                              :{DATE_LONG}
-STR_JUST_DATE_ISO                                               :{DATE_ISO}
-########
-
 STR_FEEDER_CARGO_VALUE                                          :{BLACK}Prenesi kredite: {LTBLUE}{CURRENCY}
 STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD                            :{WHITE}...ta cesta je last mesta
 STR_DRIVE_THROUGH_ERROR_DIRECTION                               :{WHITE}...cesta je obrnjena napačno
@@ -3483,7 +3482,6 @@ STR_PERCENT_UP_DOWN_SMALL                                       :{TINYFONT}{WHIT
 STR_PERCENT_UP_DOWN                                             :{WHITE}{NUM}%{UPARROW}{DOWNARROW}
 
 ##### Mass Order
-STR_FORMAT_GROUP_NAME                                           :Skupina {COMMA}
 STR_GROUP_TINY_NAME                                             :{TINYFONT}{GROUP}
 STR_GROUP_ALL_TRAINS                                            :Vsi vlaki
 STR_GROUP_ALL_ROAD_VEHICLES                                     :Vsa cestna vozila
@@ -3512,12 +3510,62 @@ STR_GROUP_DELETE_TIP                                            :{BLACK}Izbriši
 STR_GROUP_RENAME_TIP                                            :{BLACK}Preimenuj izbrano skupino
 STR_GROUP_REPLACE_PROTECTION_TIP                                :{BLACK}Klikni za zaščito skupine pred splošno samoobnovo
 
+#### String control codes and their formatting
 STR_COMPANY_NAME                                                :{COMPANY}
 STR_ENGINE_NAME                                                 :{ENGINE}
 STR_GROUP_NAME                                                  :{GROUP}
+STR_INDUSTRY_NAME                                               :{INDUSTRY}
 STR_PRESIDENT_NAME                                              :{PRESIDENTNAME}
 STR_SIGN_NAME                                                   :{SIGN}
+STR_STATION_NAME                                                :{STATION}
+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_LONG                                              :{DATE_LONG}
+STR_JUST_DATE_ISO                                               :{DATE_ISO}
+STR_JUST_STRING                                                 :{STRING}
+STR_JUST_RAW_STRING                                             :{STRING}
+
+STR_FORMAT_DATE_TINY                                            :{STRING}-{STRING}-{NUM}
+STR_FORMAT_DATE_SHORT                                           :{STRING} {NUM}
+STR_FORMAT_DATE_LONG                                            :{STRING} {STRING} {NUM}
+STR_FORMAT_DATE_ISO                                             :{2:NUM}-{1:STRING}-{0:STRING}
+
+STR_FORMAT_COMPANY_NUM                                          :(Podjetje {COMMA})
+STR_FORMAT_GROUP_NAME                                           :Skupina {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}Ime mora biti edinstveno
 
diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt
index 1106b636d..fe56e940b 100644
--- a/src/lang/spanish.txt
+++ b/src/lang/spanish.txt
@@ -155,8 +155,6 @@ STR_ABBREV_PLASTIC                                              :{TINYFONT}PL
 STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}FZ
 STR_ABBREV_NONE                                                 :{TINYFONT}NO
 STR_ABBREV_ALL                                                  :{TINYFONT}TODOS
-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
@@ -168,17 +166,11 @@ STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Copyrigh
 STR_ABOUT_VERSION                                               :{BLACK}OpenTTD versión {REV}
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 El equipo OpenTTD
 
-STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
-STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_QUIT_CAPTION                                                :{WHITE}Salir
 STR_YES                                                         :{BLACK}Si
 STR_NO                                                          :{BLACK}No
 STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}¿Está seguro de abandonar y regresar a {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                                                :Nada
 STR_COLOUR_DARK_BLUE                                            :Azul oscuro
 STR_COLOUR_PALE_GREEN                                           :Verde pálido
@@ -197,8 +189,6 @@ STR_COLOUR_BROWN                                                :Marrón
 STR_COLOUR_GREY                                                 :Gris
 STR_COLOUR_WHITE                                                :Blanco
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}Demasiados vehículos en juego
-STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
-STR_RED_COMMA                                                   :{RED}{COMMA}
 STR_BUTTON_LOCATION                                             :{BLACK}Sitio
 STR_SMALLMAP_TYPE_CONTOURS                                      :Contornos
 STR_SMALLMAP_TYPE_VEHICLES                                      :Vehículos
@@ -324,12 +314,13 @@ STR_SORT_CRITERIA_TIP                                           :{BLACK}Seleccio
 STR_FILTER_CRITERIA_TIP                                         :{BLACK}Selecciona criterio de filtro
 STR_SORT_BY                                                     :{BLACK}Ordenar por
 
+### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}Población
+STR_SORT_BY_NAME                                                :{BLACK}Nombre
+STR_SORT_BY_DATE                                                :{BLACK}Fecha
 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_DATE                                                :{BLACK}Fecha
 STR_SORT_BY_NUMBER                                              :Número
 STR_SORT_BY_PROFIT_LAST_YEAR                                    :Beneficio año pasado
 STR_SORT_BY_PROFIT_THIS_YEAR                                    :Beneficio año actual
@@ -352,6 +343,7 @@ STR_SORT_BY_INTRO_DATE                                          :Fecha Introducc
 STR_SORT_BY_RUNNING_COST                                        :Coste Operación
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :Potencia/Coste Operación
 STR_SORT_BY_CARGO_CAPACITY                                      :Capacidad de carga
+
 STR_NO_WAITING_CARGO                                            :{BLACK}Ningún tipo de carga está esperando
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}Seleccionar todas las facilidades
 STR_SELECT_ALL_TYPES                                            :{BLACK}Seleccionar todos los tipos de carga (incluidas las que no están en espera)
@@ -371,21 +363,6 @@ STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Enviar a Depós
 STR_SEND_SHIP_TO_DEPOT                                          :Enviar a Depósito
 STR_SEND_AIRCRAFT_TO_HANGAR                                     :Enviar al Hangar
 
-############ range for months starts
-STR_MONTH_ABBREV_JAN                                            :Ene
-STR_MONTH_ABBREV_FEB                                            :Feb
-STR_MONTH_ABBREV_MAR                                            :Mar
-STR_MONTH_ABBREV_APR                                            :Abr
-STR_MONTH_ABBREV_MAY                                            :May
-STR_MONTH_ABBREV_JUN                                            :Jun
-STR_MONTH_ABBREV_JUL                                            :Jul
-STR_MONTH_ABBREV_AUG                                            :Ago
-STR_MONTH_ABBREV_SEP                                            :Sep
-STR_MONTH_ABBREV_OCT                                            :Oct
-STR_MONTH_ABBREV_NOV                                            :Nov
-STR_MONTH_ABBREV_DEC                                            :Dic
-############ 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}{STRING}-
@@ -412,8 +389,6 @@ 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_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
@@ -460,7 +435,7 @@ STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Ninguna
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Nombre
 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                                          :1º
 STR_ORDINAL_NUMBER_2ND                                          :2º
 STR_ORDINAL_NUMBER_3RD                                          :3º
@@ -494,6 +469,34 @@ STR_ORDINAL_NUMBER_30TH                                         :30º
 STR_ORDINAL_NUMBER_31ST                                         :31º
 ############ range for days ends
 
+############ range for months starts
+STR_MONTH_ABBREV_JAN                                            :Ene
+STR_MONTH_ABBREV_FEB                                            :Feb
+STR_MONTH_ABBREV_MAR                                            :Mar
+STR_MONTH_ABBREV_APR                                            :Abr
+STR_MONTH_ABBREV_MAY                                            :May
+STR_MONTH_ABBREV_JUN                                            :Jun
+STR_MONTH_ABBREV_JUL                                            :Jul
+STR_MONTH_ABBREV_AUG                                            :Ago
+STR_MONTH_ABBREV_SEP                                            :Sep
+STR_MONTH_ABBREV_OCT                                            :Oct
+STR_MONTH_ABBREV_NOV                                            :Nov
+STR_MONTH_ABBREV_DEC                                            :Dic
+
+STR_MONTH_JAN                                                   :Enero
+STR_MONTH_FEB                                                   :Febrero
+STR_MONTH_MAR                                                   :Marzo
+STR_MONTH_APR                                                   :Abril
+STR_MONTH_MAY                                                   :Mayo
+STR_MONTH_JUN                                                   :Junio
+STR_MONTH_JUL                                                   :Julio
+STR_MONTH_AUG                                                   :Agosto
+STR_MONTH_SEP                                                   :Septiembre
+STR_MONTH_OCT                                                   :Octubre
+STR_MONTH_NOV                                                   :Noviembre
+STR_MONTH_DEC                                                   :Diciembre
+############ range for months ends
+
 STR_GRAPH_Y_LABEL_NUMBER                                        :{TINYFONT}{COMMA}
 
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}Carga aceptada: {LTBLUE}
@@ -583,12 +586,9 @@ 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_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_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
@@ -670,9 +670,7 @@ STR_OFF                                                         :Apagado
 STR_SUMMARY                                                     :Resumen
 STR_FULL                                                        :Completo
 STR_STATUSBAR_COMPANY_NAME                                      :{SILVER}- -  {COMPANY}  - -
-STR_BLACK_STRING                                                :{BLACK}{STRING}
 
-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
@@ -777,9 +775,6 @@ 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_BLACK_6                                                     :{BLACK}6
-STR_BLACK_7                                                     :{BLACK}7
-
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Inglés
 STR_TOWNNAME_FRENCH                                             :Francés
@@ -859,19 +854,6 @@ STR_OPTIONS_BASE_GRF_DESCRIPTION_TIP                            :{BLACK}Informac
 
 STR_AUTOSAVE_FAILED                                             :{WHITE}Error en Autoguardado
 
-STR_MONTH_JAN                                                   :Enero
-STR_MONTH_FEB                                                   :Febrero
-STR_MONTH_MAR                                                   :Marzo
-STR_MONTH_APR                                                   :Abril
-STR_MONTH_MAY                                                   :Mayo
-STR_MONTH_JUN                                                   :Junio
-STR_MONTH_JUL                                                   :Julio
-STR_MONTH_AUG                                                   :Agosto
-STR_MONTH_SEP                                                   :Septiembre
-STR_MONTH_OCT                                                   :Octubre
-STR_MONTH_NOV                                                   :Noviembre
-STR_MONTH_DEC                                                   :Diciembre
-
 STR_HEADING_FOR_STATION                                         :{LTBLUE}Hacia {STATION}
 STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}Hacia {STATION}, {VELOCITY}
 STR_NO_ORDERS                                                   :{LTBLUE}Sin órdenes
@@ -886,8 +868,6 @@ STR_CRATES                                                      :cajones
 STR_RES_OTHER                                                   :Otras
 STR_NOTHING                                                     :
 
-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...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Fin de órdenes compartidas - -
@@ -1159,7 +1139,6 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Tamaño
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :desactivado
-STR_JUST_CURRENCY                                               :{CURRENCY}
 STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Cambiar valor de la opción
 
 STR_TEMPERATE_LANDSCAPE                                         :Paisaje templado
@@ -2125,8 +2104,6 @@ STR_NUM_LOW                                                     :Baja
 STR_NUM_NORMAL                                                  :Normal
 STR_NUM_HIGH                                                    :Alta
 STR_NUM_CUSTOM                                                  :Personalizado
-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
@@ -2807,7 +2784,6 @@ 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_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})
@@ -3473,7 +3449,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}
@@ -3491,6 +3470,31 @@ STR_FORMAT_COMPANY_NUM                                          :(Empresa {COMMA
 STR_FORMAT_GROUP_NAME                                           :Grupo {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}El nombre debe ser único
 
 #### Improved sign GUI
@@ -3608,6 +3612,7 @@ STR_AI_AUTHOR                                                   :{BLACK}Autor: {
 STR_AI_VERSION                                                  :{BLACK}Versión: {NUM}
 STR_AI_URL                                                      :{BLACK}URL: {STRING}
 STR_AI_PLEASE_REPORT_CRASH                                      :{WHITE}Una de las AI ejecutadas ha fallado. Por favor, reporte el fallo al autor de la misma desde la ventana AI Debug.
+STR_AI_NO_AI_FOUND                                              :No se encontró IA para cargar.{}Esta IA por defecto no hará nada.{}Puedes descargar nuevas IAs mediante el sistema de Contenido Online.
 ########
 
 ############ town controlled noise level
diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt
index 8c0755766..db97f4583 100644
--- a/src/lang/swedish.txt
+++ b/src/lang/swedish.txt
@@ -154,8 +154,6 @@ STR_ABBREV_PLASTIC                                              :{TINYFONT}PL
 STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}LÄ
 STR_ABBREV_NONE                                                 :{TINYFONT}NEJ
 STR_ABBREV_ALL                                                  :{TINYFONT}ALLA
-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
@@ -167,17 +165,11 @@ STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Ursprung
 STR_ABOUT_VERSION                                               :{BLACK}OpenTTD version {REV}
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 OpenTTD-teamet
 
-STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
-STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_QUIT_CAPTION                                                :{WHITE}Avsluta
 STR_YES                                                         :{BLACK}Ja
 STR_NO                                                          :{BLACK}Nej
 STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Vill du verkligen avsluta spelet och återvända till {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                                                :Inget
 STR_COLOUR_DARK_BLUE                                            :Mörkblå
 STR_COLOUR_PALE_GREEN                                           :Mattgrön
@@ -196,8 +188,6 @@ STR_COLOUR_BROWN                                                :Brun
 STR_COLOUR_GREY                                                 :Grå
 STR_COLOUR_WHITE                                                :Vit
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}För många fordon i spelet
-STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
-STR_RED_COMMA                                                   :{RED}{COMMA}
 STR_BUTTON_LOCATION                                             :{BLACK}Plats
 STR_SMALLMAP_TYPE_CONTOURS                                      :Konturer
 STR_SMALLMAP_TYPE_VEHICLES                                      :Fordon
@@ -323,12 +313,13 @@ STR_SORT_CRITERIA_TIP                                           :{BLACK}Välj so
 STR_FILTER_CRITERIA_TIP                                         :{BLACK}Angre kriterier för filtrering
 STR_SORT_BY                                                     :{BLACK}Sortera efter
 
+### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}Befolkning
+STR_SORT_BY_NAME                                                :{BLACK}Namn
+STR_SORT_BY_DATE                                                :{BLACK}Datum
 STR_SORT_BY_PRODUCTION                                          :Produktion
 STR_SORT_BY_TYPE                                                :Typ
 STR_SORT_BY_TRANSPORTED                                         :Transporterat
-STR_SORT_BY_NAME                                                :{BLACK}Namn
-STR_SORT_BY_DATE                                                :{BLACK}Datum
 STR_SORT_BY_NUMBER                                              :Nummer
 STR_SORT_BY_PROFIT_LAST_YEAR                                    :Vinst förra året
 STR_SORT_BY_PROFIT_THIS_YEAR                                    :Vinst i år
@@ -351,6 +342,7 @@ STR_SORT_BY_INTRO_DATE                                          :Introduktionsda
 STR_SORT_BY_RUNNING_COST                                        :Driftkostnad
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :Kraft/Driftkostnad
 STR_SORT_BY_CARGO_CAPACITY                                      :Lastkapacitet
+
 STR_NO_WAITING_CARGO                                            :{BLACK}Ingen sorts last väntar
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}Markera alla inrättningar
 STR_SELECT_ALL_TYPES                                            :{BLACK}Välj alla last-typer (inklusive icke väntande last)
@@ -370,21 +362,6 @@ STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Skicka till Dep
 STR_SEND_SHIP_TO_DEPOT                                          :Skicka till Depå
 STR_SEND_AIRCRAFT_TO_HANGAR                                     :Skicka till 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                                            :maj
-STR_MONTH_ABBREV_JUN                                            :jun
-STR_MONTH_ABBREV_JUL                                            :jul
-STR_MONTH_ABBREV_AUG                                            :aug
-STR_MONTH_ABBREV_SEP                                            :sep
-STR_MONTH_ABBREV_OCT                                            :okt
-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}{STRING}-
@@ -411,8 +388,6 @@ 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_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
@@ -459,7 +434,7 @@ STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Ingen
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Namn
 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                                          :1
 STR_ORDINAL_NUMBER_2ND                                          :2
 STR_ORDINAL_NUMBER_3RD                                          :3
@@ -493,6 +468,34 @@ STR_ORDINAL_NUMBER_30TH                                         :30
 STR_ORDINAL_NUMBER_31ST                                         :31
 ############ 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                                            :maj
+STR_MONTH_ABBREV_JUN                                            :jun
+STR_MONTH_ABBREV_JUL                                            :jul
+STR_MONTH_ABBREV_AUG                                            :aug
+STR_MONTH_ABBREV_SEP                                            :sep
+STR_MONTH_ABBREV_OCT                                            :okt
+STR_MONTH_ABBREV_NOV                                            :nov
+STR_MONTH_ABBREV_DEC                                            :dec
+
+STR_MONTH_JAN                                                   :januari
+STR_MONTH_FEB                                                   :februari
+STR_MONTH_MAR                                                   :mars
+STR_MONTH_APR                                                   :april
+STR_MONTH_MAY                                                   :maj
+STR_MONTH_JUN                                                   :juni
+STR_MONTH_JUL                                                   :juli
+STR_MONTH_AUG                                                   :augusti
+STR_MONTH_SEP                                                   :september
+STR_MONTH_OCT                                                   :oktober
+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}Accepterat gods: {LTBLUE}
@@ -582,12 +585,9 @@ 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_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_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
@@ -669,9 +669,7 @@ STR_OFF                                                         :Av
 STR_SUMMARY                                                     :Summering
 STR_FULL                                                        :Full
 STR_STATUSBAR_COMPANY_NAME                                      :{SILVER}- -  {COMPANY}  - -
-STR_BLACK_STRING                                                :{BLACK}{STRING}
 
-STR_JUST_CHECKMARK                                              :{CHECKMARK}
 ############ range for menu starts
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Spelinställningar
 STR_SETTINGS_MENU_DIFFICULTY_SETTINGS                           :Svårighetsgrad
@@ -776,9 +774,6 @@ 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_BLACK_6                                                     :{BLACK}6
-STR_BLACK_7                                                     :{BLACK}7
-
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Engelska
 STR_TOWNNAME_FRENCH                                             :Franska
@@ -858,19 +853,6 @@ STR_OPTIONS_BASE_GRF_DESCRIPTION_TIP                            :{BLACK}Ytterlig
 
 STR_AUTOSAVE_FAILED                                             :{WHITE}Autosparning misslyckades
 
-STR_MONTH_JAN                                                   :januari
-STR_MONTH_FEB                                                   :februari
-STR_MONTH_MAR                                                   :mars
-STR_MONTH_APR                                                   :april
-STR_MONTH_MAY                                                   :maj
-STR_MONTH_JUN                                                   :juni
-STR_MONTH_JUL                                                   :juli
-STR_MONTH_AUG                                                   :augusti
-STR_MONTH_SEP                                                   :september
-STR_MONTH_OCT                                                   :oktober
-STR_MONTH_NOV                                                   :november
-STR_MONTH_DEC                                                   :december
-
 STR_HEADING_FOR_STATION                                         :{LTBLUE}På väg mot {STATION}
 STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}På väg mot {STATION}, {VELOCITY}
 STR_NO_ORDERS                                                   :{LTBLUE}Inga order
@@ -885,8 +867,6 @@ STR_CRATES                                                      :lådor
 STR_RES_OTHER                                                   :annan
 STR_NOTHING                                                     :
 
-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...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Slut på delade order - -
@@ -1158,7 +1138,6 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Y-storl
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :Avaktiverat
-STR_JUST_CURRENCY                                               :{CURRENCY}
 STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Ändra inställningsvärde
 
 STR_TEMPERATE_LANDSCAPE                                         :Tempererat landskap
@@ -2122,8 +2101,6 @@ STR_NUM_LOW                                                     :Låg
 STR_NUM_NORMAL                                                  :Normal
 STR_NUM_HIGH                                                    :Hög
 STR_NUM_CUSTOM                                                  :Egna
-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
@@ -2804,7 +2781,6 @@ 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_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})
@@ -3470,7 +3446,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_LONG                                              :{DATE_LONG}
@@ -3487,6 +3466,31 @@ STR_FORMAT_COMPANY_NUM                                          :(Företag {COMM
 STR_FORMAT_GROUP_NAME                                           :Grupp {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}Namnet måste vara unikt
 
 #### Improved sign GUI
diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt
index a6e39d10a..576a32363 100644
--- a/src/lang/traditional_chinese.txt
+++ b/src/lang/traditional_chinese.txt
@@ -154,8 +154,6 @@ STR_ABBREV_PLASTIC                                              :{TINYFONT}塑
 STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}汽
 STR_ABBREV_NONE                                                 :{TINYFONT}無
 STR_ABBREV_ALL                                                  :{TINYFONT}全
-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}訊息
@@ -167,17 +165,11 @@ STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}原著�
 STR_ABOUT_VERSION                                               :{BLACK}OpenTTD 版本 {REV}
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 OpenTTD 開發小組
 
-STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
-STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_QUIT_CAPTION                                                :{WHITE}離開
 STR_YES                                                         :{BLACK}是
 STR_NO                                                          :{BLACK}否
 STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}您確定要放棄進行中的遊戲{}返回 {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                                                :無
 STR_COLOUR_DARK_BLUE                                            :暗藍
 STR_COLOUR_PALE_GREEN                                           :淡綠
@@ -196,8 +188,6 @@ STR_COLOUR_BROWN                                                :棕
 STR_COLOUR_GREY                                                 :灰
 STR_COLOUR_WHITE                                                :白
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}遊戲中已有太多交通工具
-STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
-STR_RED_COMMA                                                   :{RED}{COMMA}
 STR_BUTTON_LOCATION                                             :{BLACK}位置
 STR_SMALLMAP_TYPE_CONTOURS                                      :地形
 STR_SMALLMAP_TYPE_VEHICLES                                      :交通工具
@@ -323,12 +313,13 @@ STR_SORT_CRITERIA_TIP                                           :{BLACK}選擇�
 STR_FILTER_CRITERIA_TIP                                         :{BLACK}選擇過濾條件
 STR_SORT_BY                                                     :{BLACK}排序依照
 
+### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}人口
+STR_SORT_BY_NAME                                                :{BLACK}名稱
+STR_SORT_BY_DATE                                                :{BLACK}日期
 STR_SORT_BY_PRODUCTION                                          :產量
 STR_SORT_BY_TYPE                                                :種類
 STR_SORT_BY_TRANSPORTED                                         :已運送
-STR_SORT_BY_NAME                                                :{BLACK}名稱
-STR_SORT_BY_DATE                                                :{BLACK}日期
 STR_SORT_BY_NUMBER                                              :編號
 STR_SORT_BY_PROFIT_LAST_YEAR                                    :去年盈利
 STR_SORT_BY_PROFIT_THIS_YEAR                                    :今年盈利
@@ -351,37 +342,25 @@ STR_SORT_BY_INTRO_DATE                                          :登場日期
 STR_SORT_BY_RUNNING_COST                                        :營運成本
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :功率／營運成本
 STR_SORT_BY_CARGO_CAPACITY                                      :載貨量
+
 STR_NO_WAITING_CARGO                                            :{BLACK}無任何貨物等候運送
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}選擇所有設施
 STR_SELECT_ALL_TYPES                                            :{BLACK}選擇所有貨物種類 (包含沒在等待的貨物)
-STR_AVAILABLE_TRAINS                                            :{BLACK}可用列車
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}可用車輛
-STR_AVAILABLE_SHIPS                                             :{BLACK}可用船舶
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}可用飛機
 STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}顯示此交通工具的所有設計
 STR_MANAGE_LIST                                                 :{BLACK}管理名單
 STR_MANAGE_LIST_TIP                                             :{BLACK}向清單所有車輛發出指示
 STR_REPLACE_VEHICLES                                            :替換交通工具
+STR_SEND_FOR_SERVICING                                          :送去維護
+
+STR_AVAILABLE_TRAINS                                            :{BLACK}可用列車
+STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}可用車輛
+STR_AVAILABLE_SHIPS                                             :{BLACK}可用船舶
+STR_AVAILABLE_AIRCRAFT                                          :{BLACK}可用飛機
+
 STR_SEND_TRAIN_TO_DEPOT                                         :送到機廠
 STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :送到車庫
 STR_SEND_SHIP_TO_DEPOT                                          :送到船塢
 STR_SEND_AIRCRAFT_TO_HANGAR                                     :送到機棚
-STR_SEND_FOR_SERVICING                                          :送去維護
-
-############ range for months starts
-STR_MONTH_ABBREV_JAN                                            :1
-STR_MONTH_ABBREV_FEB                                            :2
-STR_MONTH_ABBREV_MAR                                            :3
-STR_MONTH_ABBREV_APR                                            :4
-STR_MONTH_ABBREV_MAY                                            :5
-STR_MONTH_ABBREV_JUN                                            :6
-STR_MONTH_ABBREV_JUL                                            :7
-STR_MONTH_ABBREV_AUG                                            :8
-STR_MONTH_ABBREV_SEP                                            :9
-STR_MONTH_ABBREV_OCT                                            :10
-STR_MONTH_ABBREV_NOV                                            :11
-STR_MONTH_ABBREV_DEC                                            :12
-############ range for months ends
 
 STR_GRAPH_X_LABEL_MONTH                                         :{TINYFONT}{STRING}{} {STRING}
 STR_GRAPH_X_LABEL_MONTH_YEAR                                    :{TINYFONT}{STRING}{} {STRING}{}{NUM}
@@ -409,8 +388,6 @@ 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_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}視窗標題 - 點此拖曳可移動視窗
@@ -457,7 +434,7 @@ STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :無
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}名稱
 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                                          :1
 STR_ORDINAL_NUMBER_2ND                                          :2
 STR_ORDINAL_NUMBER_3RD                                          :3
@@ -491,6 +468,34 @@ STR_ORDINAL_NUMBER_30TH                                         :30
 STR_ORDINAL_NUMBER_31ST                                         :31
 ############ range for days ends
 
+############ range for months starts
+STR_MONTH_ABBREV_JAN                                            :1
+STR_MONTH_ABBREV_FEB                                            :2
+STR_MONTH_ABBREV_MAR                                            :3
+STR_MONTH_ABBREV_APR                                            :4
+STR_MONTH_ABBREV_MAY                                            :5
+STR_MONTH_ABBREV_JUN                                            :6
+STR_MONTH_ABBREV_JUL                                            :7
+STR_MONTH_ABBREV_AUG                                            :8
+STR_MONTH_ABBREV_SEP                                            :9
+STR_MONTH_ABBREV_OCT                                            :10
+STR_MONTH_ABBREV_NOV                                            :11
+STR_MONTH_ABBREV_DEC                                            :12
+
+STR_MONTH_JAN                                                   :一月
+STR_MONTH_FEB                                                   :二月
+STR_MONTH_MAR                                                   :三月
+STR_MONTH_APR                                                   :四月
+STR_MONTH_MAY                                                   :五月
+STR_MONTH_JUN                                                   :六月
+STR_MONTH_JUL                                                   :七月
+STR_MONTH_AUG                                                   :八月
+STR_MONTH_SEP                                                   :九月
+STR_MONTH_OCT                                                   :十月
+STR_MONTH_NOV                                                   :十一月
+STR_MONTH_DEC                                                   :十二月
+############ range for months ends
+
 STR_GRAPH_Y_LABEL_NUMBER                                        :{TINYFONT}{COMMA}
 
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}接收貨物：{LTBLUE}
@@ -580,12 +585,9 @@ 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_COMMA                                                  :{BLUE}{COMMA}
 STR_SCENEDIT_TOOLBAR_OPENTTD                                    :{YELLOW}OpenTTD
 STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR                            :{YELLOW}場景編輯器
 STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION                   :{WHITE}產生地形
-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}產生隨機地形
@@ -667,9 +669,7 @@ STR_OFF                                                         :關閉
 STR_SUMMARY                                                     :摘要
 STR_FULL                                                        :詳細
 STR_STATUSBAR_COMPANY_NAME                                      :{SILVER}- -  {COMPANY}  - -
-STR_BLACK_STRING                                                :{BLACK}{STRING}
 
-STR_JUST_CHECKMARK                                              :{CHECKMARK}
 ############ range for menu starts
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :遊戲選項
 STR_SETTINGS_MENU_DIFFICULTY_SETTINGS                           :難易設定
@@ -761,9 +761,6 @@ STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY                             :投資成立工
 ############ range ends here
 
 STR_FUND_INDUSTRY_CAPTION                                       :{WHITE}投資成立工廠
-STR_JUST_STRING                                                 :{STRING}
-STR_JUST_RAW_STRING                                             :{STRING}
-STR_JUST_INT                                                    :{NUM}
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_RAINFOREST                       :{WHITE}...只能建在雨林區
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT                           :{WHITE}...只能建在沙漠區
 STR_STATUSBAR_PAUSED                                            :{YELLOW}* *  遊戲暫停  *  *
@@ -777,9 +774,6 @@ STR_STATUSBAR_SAVING_GAME                                       :{RED}*  *  遊�
 STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}遊戲還在儲存中，{}請稍候！
 STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE                       :{BLACK}選擇「街頭音樂」播放清單
 
-STR_BLACK_6                                                     :{BLACK}6
-STR_BLACK_7                                                     :{BLACK}7
-
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :英國 (原版)
 STR_TOWNNAME_FRENCH                                             :法國
@@ -859,19 +853,6 @@ STR_OPTIONS_BASE_GRF_DESCRIPTION_TIP                            :{BLACK}關於�
 
 STR_AUTOSAVE_FAILED                                             :{WHITE}自動儲存失敗
 
-STR_MONTH_JAN                                                   :一月
-STR_MONTH_FEB                                                   :二月
-STR_MONTH_MAR                                                   :三月
-STR_MONTH_APR                                                   :四月
-STR_MONTH_MAY                                                   :五月
-STR_MONTH_JUN                                                   :六月
-STR_MONTH_JUL                                                   :七月
-STR_MONTH_AUG                                                   :八月
-STR_MONTH_SEP                                                   :九月
-STR_MONTH_OCT                                                   :十月
-STR_MONTH_NOV                                                   :十一月
-STR_MONTH_DEC                                                   :十二月
-
 STR_HEADING_FOR_STATION                                         :{LTBLUE}正前往：{STATION}
 STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}正前往：{STATION}，{VELOCITY}
 STR_NO_ORDERS                                                   :{LTBLUE}沒有指令
@@ -886,8 +867,6 @@ STR_CRATES                                                      :箱
 STR_RES_OTHER                                                   :其它
 STR_NOTHING                                                     :
 
-STR_TINY_RIGHT_ARROW                                            :{TINYFONT}{RIGHTARROW}
-
 STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}無法共享指令清單...
 STR_CANT_COPY_ORDER_LIST                                        :{WHITE}無法複製指令清單...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - 共享指令結束 - -
@@ -1159,7 +1138,6 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}地圖
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :關閉
-STR_JUST_CURRENCY                                               :{CURRENCY}
 STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}修改設定值
 
 STR_TEMPERATE_LANDSCAPE                                         :溫帶
@@ -1195,7 +1173,6 @@ STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}顯示�
 
 STR_WAYPOINT_VIEWPORT                                           :{WHITE}{WAYPOINT}
 STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WHITE}{WAYPOINT}
-STR_WAYPOINT_NAME                                               :{WAYPOINT}
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}編輯號誌站名稱
 
 STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}無法修改號誌站名稱...
@@ -1262,11 +1239,6 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}工業�
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...太接近另一個工業
 
-STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}改造列車以運輸不同的貨物種類
-STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}改造列車
-STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}選擇要運輸的貨物種類
-STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}改造列車以運輸選定的貨物種類
-STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}無法改造列車...
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}修改產量
 
 ############ network gui strings
@@ -1776,11 +1748,6 @@ STR_TOWN_BUILDING_NAME_TEPEES_1                                 :帳篷小屋
 STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1                           :茶壺屋
 STR_TOWN_BUILDING_NAME_PIGGY_BANK_1                             :撲滿
 
-STR_INDUSTRY_NAME                                               :{INDUSTRY}
-STR_TOWN_NAME                                                   :{TOWN}
-STR_FORMAT_INDUSTRY_NAME                                        :{TOWN} {STRING}
-STR_STATION_NAME                                                :{STATION}
-
 ##id 0x2800
 STR_LANDSCAPING_MENU_LANDSCAPING                                :地形
 STR_LANDSCAPING_MENU_PLANT_TREES                                :植樹
@@ -1835,6 +1802,12 @@ STR_CARGO_RATING_EXCELLENT                                      :極佳
 STR_CARGO_RATING_OUTSTANDING                                    :傑出
 ############ range for rating ends
 
+### station view strings
+STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}顯示所有指令內包含這個車站的列車
+STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}顯示所有指令内包含這個車站的車輛
+STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}顯示所有指令内包含這座機場的飛機
+STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}顯示所有指令内包含這個碼頭的船舶
+
 STR_STATION_VIEW_CARGO_RATING                                   :{WHITE}{STRING}：{YELLOW}{STRING} ({COMMA}%)
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO                        :{WHITE}{STATION} 不再接受 {STRING}
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO               :{WHITE}{STATION} 不再接受 {STRING} 或 {STRING}
@@ -2078,6 +2051,7 @@ STR_SV_STNAME_AIRPORT                                           :{STRING} 機場
 STR_SV_STNAME_OILFIELD                                          :{STRING} 油田
 STR_SV_STNAME_MINES                                             :{STRING} 礦場
 STR_SV_STNAME_DOCKS                                             :{STRING} 碼頭
+##id 0x6020
 STR_SV_STNAME_ANNEXE                                            :{STRING} 輔助站
 STR_SV_STNAME_SIDINGS                                           :{STRING} 側站
 STR_SV_STNAME_BRANCH                                            :{STRING} 分站
@@ -2125,8 +2099,6 @@ STR_NUM_LOW                                                     :低
 STR_NUM_NORMAL                                                  :普通
 STR_NUM_HIGH                                                    :高
 STR_NUM_CUSTOM                                                  :自訂
-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                                             :普通
@@ -2160,7 +2132,6 @@ STR_CITY_APPROVAL_HOSTILE                                       :抱敵意
 
 ##id 0x7000
 STR_COMPANY_VIEW_CAPTION                                        :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
-STR_FORMAT_COMPANY_NUM                                          :(公司 {COMMA})
 STR_COMPANY_VIEW_NEW_FACE_BUTTON                                :{BLACK}新臉孔
 STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON                           :{BLACK}配色
 STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}配色：
@@ -2193,7 +2164,6 @@ STR_FINANCES_TOTAL_CAPTION                                      :{WHITE}總計�
 STR_COMPANY_NAME_COMPANY_NUM                                    :{COMPANY} {COMPANYNUM}
 STR_GRAPH_INCOME_CAPTION                                        :{WHITE}收入圖表
 STR_CURRCOMPACT                                                 :{CURRCOMPACT}
-STR_JUST_COMMA                                                  :{COMMA}
 STR_GRAPH_OPERATING_PROFIT_CAPTION                              :{WHITE}營運損益圖表
 STR_FINANCES_BANK_BALANCE_TITLE                                 :{WHITE}銀行餘額
 STR_FINANCES_LOAN_TITLE                                         :{WHITE}貸款
@@ -2596,10 +2566,8 @@ STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE                          :單軌機車頭
 STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE                            :磁浮機車頭
 
 ##id 0x8800
-STR_DEPOT_TRAIN_CAPTION                                         :{WHITE}{TOWN} 鐵路機廠
 STR_NEWS_FIRST_TRAIN_ARRIVAL                                    :{BLACK}{BIGFONT}市民慶賀 . . .{}首輛列車抵達 {STATION}！
 STR_VEHICLE_DETAILS_CAPTION                                     :{WHITE}{VEHICLE} (詳細資料)
-STR_ERROR_TRAIN_IN_THE_WAY                                      :{WHITE}前方有列車
 STR_ORDER                                                       :{SETX 10}{COMMA}：{SETX 30}{STRING} {STRING}
 STR_ORDER_SELECTED                                              :{RIGHTARROW}{SETX 10}{COMMA}：{SETX 30}{STRING} {STRING}
 STR_ORDER_NON_STOP                                              :{BLACK}直達
@@ -2689,38 +2657,16 @@ STR_TIMETABLE_AND_TRAVEL_FOR                                    :並運行 {STRI
 STR_TIMETABLE_DAYS                                              :{COMMA} 日
 STR_TIMETABLE_TICKS                                             :{COMMA} tick
 
-STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}正前往 {TOWN} 機廠
-STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}正前往 {TOWN} 機廠，{VELOCITY}
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}正在 {TOWN} 機廠維護中
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}正在 {TOWN} 機廠維護中，{VELOCITY}
-
 STR_INVALID_ORDER                                               :{RED} (指令無效)
 
 STR_UNKNOWN_STATION                                             :未知車站
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}空
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} 來自 {STATION}
 STR_VEHICLE_DETAILS_CARGO_FROM_MULT                             :{LTBLUE}{CARGO} 來自 {STATION} (x{NUM})
-STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} 在車庫等待中
-STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}購買新交通工具
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}列車太長
 STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}列車只有在停放於機廠內的時候才能變動
-STR_VEHICLE_LIST_TRAIN_CAPTION                                  :{WHITE}{STRING} - 列車 {COMMA} 組
 
-STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}新購鐵路車輛
-STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}新電氣化列車
-STR_BUILD_VEHICLE_TRAIN_MONORAIL_CAPTION                        :{WHITE}新購單軌車輛
-STR_BUILD_VEHICLE_TRAIN_MAGLEV_CAPTION                          :{WHITE}新購磁浮車輛
-STR_BUILD_VEHICLE_TRAIN_ALL_CAPTION                             :{WHITE}列車
-
-STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_BUTTON                    :{BLACK}購買交通工具
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}複製車輛
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}這會將購買一部相同的車輛，按住 CTRL 點選還可共享指令
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}這會購買一部相同的車輛，按下按鈕之後再點選於車庫内或外的車輛，按住 CTRL 點選還可共享指令
-STR_CLONE_TRAIN                                                 :{BLACK}複製列車
-STR_CLONE_TRAIN_INFO                                            :{BLACK}這會購買一列相同的列車，包含所有車廂，按住 CTRL 點選還可共享指令
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}這會購買一列相同的列車，包含所有車廂，按下按鈕之後再點選機廠内外的其他列車。按住 CTRL 點選還可共享指令
-STR_BUILD_VEHICLE_TRAIN_RENAME_BUTTON                           :{BLACK}更名
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}跳過
 STR_ORDERS_DELETE_BUTTON                                        :{BLACK}刪除
 STR_ORDERS_GO_TO_BUTTON                                         :{BLACK}前往
@@ -2736,14 +2682,12 @@ STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}切到�
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (指令)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - 指令結束 - -
 STR_SERVICE                                                     :{BLACK}維護
-STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}無法購買鐵道車輛...
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   購於：{LTBLUE}{NUM}{BLACK} 價值：{LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   價值：{LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
 STR_VEHICLE_STATUS_LOADING_UNLOADING                            :{LTBLUE}正在裝卸客貨
 STR_VEHICLE_STATUS_LEAVING                                      :{LTBLUE}正在離開
 STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}列車必須停在機廠内
-STR_ERROR_CAN_T_SEND_TRAIN_TO_DEPOT                             :{WHITE}無法將列車送往機廠...
 STR_ERROR_NO_MORE_SPACE_FOR_ORDERS                              :{WHITE}無法新增指令
 STR_ERROR_TOO_MANY_ORDERS                                       :{WHITE}指令太多
 STR_ERROR_CAN_T_INSERT_NEW_ORDER                                :{WHITE}無法插入新指令...
@@ -2758,26 +2702,11 @@ STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE}一個�
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}無法移動車輛...
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}後端車頭一定要跟著前端車頭
 STR_CARGO_N_A                                                   :N/A{SKIP}
-STR_ERROR_CAN_T_SELL_TRAIN                                      :{WHITE}無法出售鐵道車輛...
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}找不到前往附近機廠的路徑
-STR_ERROR_CAN_T_STOP_START_TRAIN                                :{WHITE}無法停止／起動列車...
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}維護間隔：{LTBLUE}{COMMA} 天{BLACK}   上次維護：{LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}維護間隔：{LTBLUE}{COMMA}%{BLACK}   上次維護：{LTBLUE}{DATE_LONG}
-STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP                             :{BLACK}列車 - 點選列車檢視資訊
-STR_DEPOT_TRAIN_LIST_TOOLTIP                                    :{BLACK}列車 - 點選列車檢視資訊，拖放車廂可加掛／解聯
-STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP                            :{BLACK}購買新列車
-STR_DEPOT_TRAIN_SELL_TOOLTIP                                    :{BLACK}將列車拖到這裡即可出售
-STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}將鐵路機廠置於畫面中央
-STR_BUILD_VEHICLE_TRAIN_LIST_TOOLTIP                            :{BLACK}列車選單 - 點選列車檢視資訊
-STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_TOOLTIP                   :{BLACK}購買選定的列車
-STR_BUILD_VEHICLE_TRAIN_RENAME_TOOLTIP                          :{BLACK}修改列車的名稱
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP                 :{BLACK}列車目前的動作 - 按此可停止／起動列車
-STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP                           :{BLACK}顯示列車的指令
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP                         :{BLACK}將列車置於畫面中央
-STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP                    :{BLACK}將列車送回機廠，按住 CTRL 點選機廠則僅做維護
 STR_VEHICLE_VIEW_TRAIN_IGNORE_SIGNAL_TOOLTIP                    :{BLACK}強制列車前進，不等待號誌允許
 STR_VEHICLE_VIEW_TRAIN_REVERSE_TOOLTIP                          :{BLACK}倒轉列車方向
-STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}顯示列車詳細資料
 STR_VEHICLE_DETAILS_INCREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}延長維護間隔
 STR_VEHICLE_DETAILS_DECREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}縮短維護間隔
 STR_VEHICLE_DETAILS_TRAIN_CARGO_TOOLTIP                         :{BLACK}顯示載貨詳細資料
@@ -2811,15 +2740,10 @@ STR_VEHICLE_STATUS_STOPPED                                      :{RED}停止
 STR_ERROR_CAN_T_MAKE_TRAIN_PASS_SIGNAL                          :{WHITE}無法讓列車通過險阻號誌...
 STR_VEHICLE_STATUS_CRASHED                                      :{RED}撞毀！
 
-STR_QUERY_RENAME_TRAIN_CAPTION                                  :{WHITE}為列車命名
-STR_ERROR_CAN_T_RENAME_TRAIN                                    :{WHITE}無法為列車命名...
-STR_VEHICLE_DETAILS_TRAIN_RENAME                                :{BLACK}為列車命名
 STR_NEWS_TRAIN_CRASH                                            :{BLACK}{BIGFONT}列車事故！{}衝撞後 {COMMA} 人死在火球下
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}無法倒轉列車方向...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE                  :{WHITE}無法調轉車輛方向...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}無法迴轉由多節車廂組成的車輛
-STR_QUERY_RENAME_TRAIN_TYPE_CAPTION                             :{WHITE}重新命名列車類型
-STR_ERROR_CAN_T_RENAME_TRAIN_TYPE                               :{WHITE}無法修改列車類型名稱...
 STR_CLEAR_TIME                                                  :{BLACK}清除時刻表
 STR_RESET_LATENESS                                              :{BLACK}歸零誤點／慢分
 STR_CHANGE_WAYPOINT_NAME                                        :{BLACK}修改號誌站名稱
@@ -2851,45 +2775,14 @@ STR_TIMETABLE_AUTOFILL                                          :{BLACK}自動�
 STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}自動以下次運轉的時間編寫時刻表 (按住 CTRL 可保持等待時間)
 
 ##id 0x9000
-STR_ERROR_ROAD_VEHICLE_IN_THE_WAY                               :{WHITE}前方有汽車
-STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING} - 車輛 {COMMA} 部
-STR_DEPOT_ROAD_VEHICLE_CAPTION                                  :{WHITE}{TOWN} 車庫
-STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_BUTTON                      :{BLACK}購買新車輛
-STR_BUILD_VEHICLE_ROAD_VEHICLE_CAPTION                          :{WHITE}購置新車輛
-STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_BUTTON             :{BLACK}購買車輛
-STR_ERROR_CAN_T_BUILD_ROAD_VEHICLE                              :{WHITE}無法購置車輛
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}...必須停在車庫内
-STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}無法出售車輛...
-STR_ERROR_CAN_T_STOP_START_ROAD_VEHICLE                         :{WHITE}無法停止／起動車輛...
-STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} 正在車庫待命
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}正前往 {TOWN} 車庫
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}正前往 {TOWN} 車庫，{VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}在 {TOWN} 車庫維護中
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}在 {TOWN} 車庫維護中，{VELOCITY}
-STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}無法將車輛送至車庫...
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}找不到附近的車庫
-STR_VEHICLE_LIST_ROAD_VEHICLE_TOOLTIP                           :{BLACK}車輛 - 點選車輛檢視詳細資料
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP          :{BLACK}目前車輛動作 - 點選這裡可停止／起動車輛
-STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP                    :{BLACK}顯示車輛指令
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP                  :{BLACK}將車輛置於畫面中央
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}將車輛送到車庫，按住 CTRL 點選則只做維護
 STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP                   :{BLACK}強制車輛掉頭
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}顯示車輛詳細資訊
-STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}車輛 - 點選車輛顯示詳細資料
-STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}購置新車輛
-STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}將車輛拖到這裡即可出售
-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_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})
 
-STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}為車輛命名
-STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}無法為車輛命名...
-STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}為車輛命名
 STR_NEWS_FIRST_BUS_ARRIVAL                                      :{BLACK}{BIGFONT}市民慶賀 . . .{}首輛公車抵達 {STATION}！
 STR_NEWS_FIRST_TRUCK_ARRIVAL                                    :{BLACK}{BIGFONT}市民慶賀 . . .{}首輛貨車抵達 {STATION}！
 STR_NEWS_FIRST_PASSENGER_TRAM_ARRIVAL                           :{BLACK}{BIGFONT}市民慶賀 . . .{}首輛載客電車抵達 {STATION}！
@@ -2897,132 +2790,39 @@ STR_NEWS_FIRST_CARGO_TRAM_ARRIVAL                               :{BLACK}{BIGFONT
 STR_NEWS_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}車禍！{}駕駛在與列車對撞後罹難
 STR_NEWS_ROAD_VEHICLE_CRASH                                     :{BLACK}{BIGFONT}車禍！{}車輛在與列車對撞後，造成 {COMMA} 人罹難
 STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}無法讓車輛轉向...
-STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}更名
-STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}為車輛類型更名
-STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}為車輛類型更名
-STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}無法為車輛類型更名...
 
-STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}改裝車輛以運送不同的貨物種類
-STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}改裝車輛
-STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}改裝車輛以運送指定的貨物種類
-STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}無法改裝車輛...
-STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}選擇車輛要運送的貨物種類
 
 ##id 0x9800
 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :興建水道
 STR_WATERWAYS_TOOLBAR_CAPTION                                   :{WHITE}興建水道
 STR_WATERWAYS_TOOLBAR_CAPTION_SE                                :{WHITE}水道
 STR_ERROR_CAN_T_BUILD_DOCK_HERE                                 :{WHITE}無法在此興建碼頭...
-STR_DEPOT_SHIP_CAPTION                                          :{WHITE}{TOWN} 船塢
-STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON                              :{BLACK}購買船舶
-STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - 船舶 {COMMA} 艘
-STR_BUILD_VEHICLE_SHIP_CAPTION                                  :{WHITE}購買船舶
-STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON                     :{BLACK}購買船舶
-STR_CLONE_SHIP                                                  :{BLACK}複製船舶
-STR_CLONE_SHIP_INFO                                             :{BLACK}這會購買一艘相同的船舶，按住 CTRL 點選還可共享指令
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}這會購買一艘相同的船舶，按下按鈕之後再點選船塢内或外的船舶，按住 CTRL 點選還可共享指令
 STR_ERROR_SHIP_MUST_BE_STOPPED_IN_DEPOT                         :{WHITE}船舶必須停在船塢内
-STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}無法出售船舶...
-STR_ERROR_CAN_T_BUILD_SHIP                                      :{WHITE}無法購買船舶...
-STR_ERROR_SHIP_IN_THE_WAY                                       :{WHITE}前方有船舶
-STR_ERROR_CAN_T_STOP_START_SHIP                                 :{WHITE}無法停止／起動船舶...
-STR_ERROR_CAN_T_SEND_SHIP_TO_DEPOT                              :{WHITE}無法將船舶送到船塢...
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}正前往 {TOWN} 船塢
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}正前往 {TOWN} 船塢，{VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}正在 {TOWN} 船塢維護中
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}正在 {TOWN} 船塢維護中，{VELOCITY}
-STR_NEWS_SHIP_IS_WAITING                                        :{WHITE}{VEHICLE} 正在船塢待命
 STR_WATERWAYS_TOOLBAR_BUILD_DOCK_TOOLTIP                        :{BLACK}興建碼頭
 STR_WATERWAYS_TOOLBAR_BUILD_DEPOT_TOOLTIP                       :{BLACK}興建船塢 (用以購買／維護船舶)
-STR_DEPOT_SHIP_LIST_TOOLTIP                                     :{BLACK}船舶 - 點選船舶可看到詳細資料
-STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}購買新船舶
-STR_DEPOT_SHIP_SELL_TOOLTIP                                     :{BLACK}將船舶拖到這裡即可出售
-STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}將船塢置於畫面中央
-STR_VEHICLE_LIST_SHIP_TOOLTIP                                   :{BLACK}船舶 - 點選船舶顯示詳細資料
-STR_BUILD_VEHICLE_SHIP_LIST_TOOLTIP                             :{BLACK}船舶清單 - 點選船舶顯示詳細資料
-STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP                    :{BLACK}購買選定船舶
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP                  :{BLACK}目前船舶動作 - 按此可停止／起動船舶
-STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}顯示船舶指令
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP                          :{BLACK}將船舶置於畫面中央
-STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}將船舶送往船塢，按住 CTRL 點選則只做維護
-STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}顯示船舶詳細資料
-STR_VEHICLE_DETAILS_SHIP_RENAME                                 :{BLACK}命名船舶
 
-STR_QUERY_RENAME_SHIP_CAPTION                                   :{WHITE}命名船舶
-STR_ERROR_CAN_T_RENAME_SHIP                                     :{WHITE}無法命名船舶...
 STR_NEWS_FIRST_SHIP_ARRIVAL                                     :{BLACK}{BIGFONT}市民慶賀 . . .{}首艘船舶抵達 {STATION}！
 STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}放置浮標，可用作導航點
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}無法在此放置浮標...
 STR_BUILD_AQUEDUCT                                              :{BLACK}興建水道橋
 STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}無法興建水道橋...
-STR_BUILD_VEHICLE_SHIP_RENAME_BUTTON                            :{BLACK}更名
-STR_BUILD_VEHICLE_SHIP_RENAME_TOOLTIP                           :{BLACK}重新命名船舶類型
-STR_QUERY_RENAME_SHIP_TYPE_CAPTION                              :{WHITE}重新命名船舶類型
-STR_ERROR_CAN_T_RENAME_SHIP_TYPE                                :{WHITE}無法重新命名船舶類型
-STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}改裝貨船以便運送不同貨物
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (改裝)
-STR_REFIT_SHIP_REFIT_BUTTON                                     :{BLACK}改裝船舶
-STR_REFIT_SHIP_LIST_TOOLTIP                                     :{BLACK}選擇要讓船舶運送的貨物種類
-STR_REFIT_SHIP_REFIT_TOOLTIP                                    :{BLACK}改裝船舶以運送選定的貨物種類
 STR_REFIT_TITLE                                                 :{GOLD}選擇要運送的貨物種類：
 STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}新容量：{GOLD}{CARGO}{}{BLACK}改裝費用：{GOLD}{CURRENCY}
-STR_ERROR_CAN_T_REFIT_SHIP                                      :{WHITE}無法改裝船舶...
 STR_REFITTABLE                                                  :(可改裝)
 
 ##id 0xA000
 STR_TOOLBAR_AIRCRAFT_CAPTION                                    :{WHITE}機場
 STR_ERROR_CAN_T_BUILD_AIRPORT_HERE                              :{WHITE}無法在此興建機場...
-STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}{STATION} 機棚
-STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON                          :{BLACK}購買飛機
-STR_CLONE_AIRCRAFT                                              :{BLACK}複製飛機
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}這會購買一架相同的飛機，按住 CTRL 點選還可共享指令
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}這會購買一架相同的飛機，按下此鈕之後再點選機棚内或外的飛機，按住 CTRL 點選還可共享指令
-STR_BUILD_VEHICLE_AIRCRAFT_CAPTION                              :{WHITE}購買飛機
-STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON                 :{BLACK}購買飛機
-STR_ERROR_CAN_T_BUILD_AIRCRAFT                                  :{WHITE}無法購買飛機...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - 飛機 {COMMA} 架
-STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR                         :{WHITE}無法將飛機送回機棚...
-STR_HEADING_FOR_HANGAR                                          :{ORANGE}正前往 {STATION} 機棚
-STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}正前往 {STATION} 機棚，{VELOCITY}
-STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}在 {STATION} 機棚維護中
-STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}在 {STATION} 機棚維護中，{VELOCITY}
-STR_NEWS_AIRCRAFT_IS_WAITING                                    :{WHITE}{VEHICLE} 正在機庫待命
-STR_ERROR_AIRCRAFT_IN_THE_WAY                                   :{WHITE}前方有飛機
-STR_ERROR_CAN_T_STOP_START_AIRCRAFT                             :{WHITE}無法停止／起動飛機...
 STR_ERROR_AIRCRAFT_IS_IN_FLIGHT                                 :{WHITE}飛機正在飛行中
 STR_ERROR_AIRCRAFT_MUST_BE_STOPPED                              :{WHITE}飛機必須停在機棚内
-STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}無法出售飛機...
 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION                          :興建機場
 STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}興建機場
-STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP                               :{BLACK}飛機 - 點選飛機顯示詳細資料
-STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}飛機 - 點選飛機顯示詳細資料
-STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}購買新飛機
-STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}將飛機拖到這裡即可出售
-STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}將機棚置於畫面中央
-STR_BUILD_VEHICLE_AIRCRAFT_LIST_TOOLTIP                         :{BLACK}飛機清單 - 點選飛機檢視詳細資料
-STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_TOOLTIP                :{BLACK}購買選定的飛機
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP              :{BLACK}目前飛機動作 - 按此可停止／起動飛機
-STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}顯示飛機的指令
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP                      :{BLACK}將飛機置於畫面中央
-STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}將飛機送到機棚，按住 CTRL 點選則只做維護
-STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}顯示飛機詳細資料
 
-STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}命名飛機
-STR_ERROR_CAN_T_RENAME_AIRCRAFT                                 :{WHITE}無法命名飛機
-STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}命名飛機
 STR_NEWS_FIRST_AIRCRAFT_ARRIVAL                                 :{BLACK}{BIGFONT}市民慶賀 . . .{}首架飛機抵達 {STATION}！
 STR_NEWS_AIRCRAFT_CRASH                                         :{BLACK}{BIGFONT}空難！{}{COMMA} 名乘客與機組員不幸罹難於 {STATION}
 STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}空難！{}飛機燃油耗盡，{COMMA} 名乘客與機組員不幸罹難！
 STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
-STR_BUILD_VEHICLE_AIRCRAFT_RENAME_BUTTON                        :{BLACK}更名
-STR_BUILD_VEHICLE_AIRCRAFT_RENAME_TOOLTIP                       :{BLACK}重新命名飛機種類
-STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION                          :{WHITE}重新命名飛機種類
-STR_ERROR_CAN_T_RENAME_AIRCRAFT_TYPE                            :{WHITE}無法重新命名飛機種類...
-STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}改裝飛機以運送其他貨物
-STR_REFIT_AIRCRAFT_REFIT_BUTTON                                 :{BLACK}改裝飛機
-STR_REFIT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}選擇要讓飛機運送的貨物種類
-STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}改裝飛機以運送選定的貨物種類
-STR_ERROR_CAN_T_REFIT_AIRCRAFT                                  :{WHITE}無法改裝飛機...
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (時刻表)
 
@@ -3174,15 +2974,225 @@ STR_LORRY                                                       :{BLACK}{LORRY}
 STR_PLANE                                                       :{BLACK}{PLANE}
 STR_SHIP                                                        :{BLACK}{SHIP}
 
+############ Vehicle lists
+STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP                             :{BLACK}列車 - 點選列車檢視資訊
+STR_VEHICLE_LIST_ROAD_VEHICLE_TOOLTIP                           :{BLACK}車輛 - 點選車輛檢視詳細資料
+STR_VEHICLE_LIST_SHIP_TOOLTIP                                   :{BLACK}船舶 - 點選船舶顯示詳細資料
+STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP                               :{BLACK}飛機 - 點選飛機顯示詳細資料
 
-STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}顯示所有指令內包含這個車站的列車
-STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}顯示所有指令内包含這個車站的車輛
-STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}顯示所有指令内包含這座機場的飛機
-STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}顯示所有指令内包含這個碼頭的船舶
+STR_VEHICLE_LIST_TRAIN_CAPTION                                  :{WHITE}{STRING} - 列車 {COMMA} 組
+STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING} - 車輛 {COMMA} 部
+STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - 船舶 {COMMA} 艘
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - 飛機 {COMMA} 架
 
 STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}{COMMA} 組交通工具的共用指令
 STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}顯示所有共用這份指令的交通工具
 
+STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} 在車庫等待中
+STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} 正在車庫待命
+STR_NEWS_SHIP_IS_WAITING                                        :{WHITE}{VEHICLE} 正在船塢待命
+STR_NEWS_AIRCRAFT_IS_WAITING                                    :{WHITE}{VEHICLE} 正在機庫待命
+
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}改造列車
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}改裝車輛
+STR_REFIT_SHIP_REFIT_BUTTON                                     :{BLACK}改裝船舶
+STR_REFIT_AIRCRAFT_REFIT_BUTTON                                 :{BLACK}改裝飛機
+
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}改造列車以運輸選定的貨物種類
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}改裝車輛以運送指定的貨物種類
+STR_REFIT_SHIP_REFIT_TOOLTIP                                    :{BLACK}改裝船舶以運送選定的貨物種類
+STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}改裝飛機以運送選定的貨物種類
+
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}選擇要運輸的貨物種類
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}選擇車輛要運送的貨物種類
+STR_REFIT_SHIP_LIST_TOOLTIP                                     :{BLACK}選擇要讓船舶運送的貨物種類
+STR_REFIT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}選擇要讓飛機運送的貨物種類
+
+STR_DEPOT_TRAIN_CAPTION                                         :{WHITE}{TOWN} 鐵路機廠
+STR_DEPOT_ROAD_VEHICLE_CAPTION                                  :{WHITE}{TOWN} 車庫
+STR_DEPOT_SHIP_CAPTION                                          :{WHITE}{TOWN} 船塢
+STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}{STATION} 機棚
+
+STR_VEHICLE_DETAILS_TRAIN_RENAME                                :{BLACK}為列車命名
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}為車輛命名
+STR_VEHICLE_DETAILS_SHIP_RENAME                                 :{BLACK}命名船舶
+STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}命名飛機
+
+STR_QUERY_RENAME_TRAIN_CAPTION                                  :{WHITE}為列車命名
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}為車輛命名
+STR_QUERY_RENAME_SHIP_CAPTION                                   :{WHITE}命名船舶
+STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}命名飛機
+
+STR_ERROR_TRAIN_IN_THE_WAY                                      :{WHITE}前方有列車
+STR_ERROR_ROAD_VEHICLE_IN_THE_WAY                               :{WHITE}前方有汽車
+STR_ERROR_SHIP_IN_THE_WAY                                       :{WHITE}前方有船舶
+STR_ERROR_AIRCRAFT_IN_THE_WAY                                   :{WHITE}前方有飛機
+
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}無法改造列車...
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}無法改裝車輛...
+STR_ERROR_CAN_T_REFIT_SHIP                                      :{WHITE}無法改裝船舶...
+STR_ERROR_CAN_T_REFIT_AIRCRAFT                                  :{WHITE}無法改裝飛機...
+
+STR_ERROR_CAN_T_RENAME_TRAIN                                    :{WHITE}無法為列車命名...
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}無法為車輛命名...
+STR_ERROR_CAN_T_RENAME_SHIP                                     :{WHITE}無法命名船舶...
+STR_ERROR_CAN_T_RENAME_AIRCRAFT                                 :{WHITE}無法命名飛機
+
+STR_ERROR_CAN_T_STOP_START_TRAIN                                :{WHITE}無法停止／起動列車...
+STR_ERROR_CAN_T_STOP_START_ROAD_VEHICLE                         :{WHITE}無法停止／起動車輛...
+STR_ERROR_CAN_T_STOP_START_SHIP                                 :{WHITE}無法停止／起動船舶...
+STR_ERROR_CAN_T_STOP_START_AIRCRAFT                             :{WHITE}無法停止／起動飛機...
+
+STR_ERROR_CAN_T_SEND_TRAIN_TO_DEPOT                             :{WHITE}無法將列車送往機廠...
+STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}無法將車輛送至車庫...
+STR_ERROR_CAN_T_SEND_SHIP_TO_DEPOT                              :{WHITE}無法將船舶送到船塢...
+STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR                         :{WHITE}無法將飛機送回機棚...
+
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}無法購買鐵道車輛...
+STR_ERROR_CAN_T_BUILD_ROAD_VEHICLE                              :{WHITE}無法購置車輛
+STR_ERROR_CAN_T_BUILD_SHIP                                      :{WHITE}無法購買船舶...
+STR_ERROR_CAN_T_BUILD_AIRCRAFT                                  :{WHITE}無法購買飛機...
+
+STR_ERROR_CAN_T_RENAME_TRAIN_TYPE                               :{WHITE}無法修改列車類型名稱...
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}無法為車輛類型更名...
+STR_ERROR_CAN_T_RENAME_SHIP_TYPE                                :{WHITE}無法重新命名船舶類型
+STR_ERROR_CAN_T_RENAME_AIRCRAFT_TYPE                            :{WHITE}無法重新命名飛機種類...
+
+STR_ERROR_CAN_T_SELL_TRAIN                                      :{WHITE}無法出售鐵道車輛...
+STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}無法出售車輛...
+STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}無法出售船舶...
+STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}無法出售飛機...
+
+STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP                 :{BLACK}列車目前的動作 - 按此可停止／起動列車
+STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP          :{BLACK}目前車輛動作 - 點選這裡可停止／起動車輛
+STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP                  :{BLACK}目前船舶動作 - 按此可停止／起動船舶
+STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP              :{BLACK}目前飛機動作 - 按此可停止／起動飛機
+
+STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP                           :{BLACK}顯示列車的指令
+STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP                    :{BLACK}顯示車輛指令
+STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}顯示船舶指令
+STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}顯示飛機的指令
+
+STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP                         :{BLACK}將列車置於畫面中央
+STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP                  :{BLACK}將車輛置於畫面中央
+STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP                          :{BLACK}將船舶置於畫面中央
+STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP                      :{BLACK}將飛機置於畫面中央
+
+STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP                    :{BLACK}將列車送回機廠，按住 CTRL 點選機廠則僅做維護
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}將車輛送到車庫，按住 CTRL 點選則只做維護
+STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}將船舶送往船塢，按住 CTRL 點選則只做維護
+STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}將飛機送到機棚，按住 CTRL 點選則只做維護
+
+STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}顯示列車詳細資料
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}顯示車輛詳細資訊
+STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}顯示船舶詳細資料
+STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}顯示飛機詳細資料
+
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}改造列車以運輸不同的貨物種類
+STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}改裝車輛以運送不同的貨物種類
+STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}改裝貨船以便運送不同貨物
+STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}改裝飛機以運送其他貨物
+
+STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}正前往 {TOWN} 機廠
+STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}正前往 {TOWN} 機廠，{VELOCITY}
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}正前往 {TOWN} 車庫
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}正前往 {TOWN} 車庫，{VELOCITY}
+STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}正前往 {TOWN} 船塢
+STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}正前往 {TOWN} 船塢，{VELOCITY}
+STR_HEADING_FOR_HANGAR                                          :{ORANGE}正前往 {STATION} 機棚
+STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}正前往 {STATION} 機棚，{VELOCITY}
+
+STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}正在 {TOWN} 機廠維護中
+STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}正在 {TOWN} 機廠維護中，{VELOCITY}
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}在 {TOWN} 車庫維護中
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}在 {TOWN} 車庫維護中，{VELOCITY}
+STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}正在 {TOWN} 船塢維護中
+STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}正在 {TOWN} 船塢維護中，{VELOCITY}
+STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}在 {STATION} 機棚維護中
+STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}在 {STATION} 機棚維護中，{VELOCITY}
+
+
+STR_CLONE_TRAIN                                                 :{BLACK}複製列車
+STR_CLONE_ROAD_VEHICLE                                          :{BLACK}複製車輛
+STR_CLONE_SHIP                                                  :{BLACK}複製船舶
+STR_CLONE_AIRCRAFT                                              :{BLACK}複製飛機
+
+STR_CLONE_TRAIN_INFO                                            :{BLACK}這會購買一列相同的列車，包含所有車廂，按住 CTRL 點選還可共享指令
+STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}這會將購買一部相同的車輛，按住 CTRL 點選還可共享指令
+STR_CLONE_SHIP_INFO                                             :{BLACK}這會購買一艘相同的船舶，按住 CTRL 點選還可共享指令
+STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}這會購買一架相同的飛機，按住 CTRL 點選還可共享指令
+
+STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}這會購買一列相同的列車，包含所有車廂，按下按鈕之後再點選機廠内外的其他列車。按住 CTRL 點選還可共享指令
+STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}這會購買一部相同的車輛，按下按鈕之後再點選於車庫内或外的車輛，按住 CTRL 點選還可共享指令
+STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}這會購買一艘相同的船舶，按下按鈕之後再點選船塢内或外的船舶，按住 CTRL 點選還可共享指令
+STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}這會購買一架相同的飛機，按下此鈕之後再點選機棚内或外的飛機，按住 CTRL 點選還可共享指令
+
+STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}新購鐵路車輛
+STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}新電氣化列車
+STR_BUILD_VEHICLE_TRAIN_MONORAIL_CAPTION                        :{WHITE}新購單軌車輛
+STR_BUILD_VEHICLE_TRAIN_MAGLEV_CAPTION                          :{WHITE}新購磁浮車輛
+
+STR_BUILD_VEHICLE_TRAIN_ALL_CAPTION                             :{WHITE}列車
+STR_BUILD_VEHICLE_ROAD_VEHICLE_CAPTION                          :{WHITE}購置新車輛
+STR_BUILD_VEHICLE_SHIP_CAPTION                                  :{WHITE}購買船舶
+STR_BUILD_VEHICLE_AIRCRAFT_CAPTION                              :{WHITE}購買飛機
+
+STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_BUTTON                    :{BLACK}購買交通工具
+STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_BUTTON             :{BLACK}購買車輛
+STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON                     :{BLACK}購買船舶
+STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON                 :{BLACK}購買飛機
+
+STR_BUILD_VEHICLE_TRAIN_LIST_TOOLTIP                            :{BLACK}列車選單 - 點選列車檢視資訊
+STR_BUILD_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP                     :{BLACK}車輛清單 - 點選車輛可看到詳細資料
+STR_BUILD_VEHICLE_SHIP_LIST_TOOLTIP                             :{BLACK}船舶清單 - 點選船舶顯示詳細資料
+STR_BUILD_VEHICLE_AIRCRAFT_LIST_TOOLTIP                         :{BLACK}飛機清單 - 點選飛機檢視詳細資料
+
+STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_TOOLTIP                   :{BLACK}購買選定的列車
+STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_TOOLTIP            :{BLACK}購置選定的車輛
+STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP                    :{BLACK}購買選定船舶
+STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_TOOLTIP                :{BLACK}購買選定的飛機
+
+STR_BUILD_VEHICLE_TRAIN_RENAME_BUTTON                           :{BLACK}更名
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}更名
+STR_BUILD_VEHICLE_SHIP_RENAME_BUTTON                            :{BLACK}更名
+STR_BUILD_VEHICLE_AIRCRAFT_RENAME_BUTTON                        :{BLACK}更名
+
+STR_BUILD_VEHICLE_TRAIN_RENAME_TOOLTIP                          :{BLACK}修改列車的名稱
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}為車輛類型更名
+STR_BUILD_VEHICLE_SHIP_RENAME_TOOLTIP                           :{BLACK}重新命名船舶類型
+STR_BUILD_VEHICLE_AIRCRAFT_RENAME_TOOLTIP                       :{BLACK}重新命名飛機種類
+
+STR_QUERY_RENAME_TRAIN_TYPE_CAPTION                             :{WHITE}重新命名列車類型
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}為車輛類型更名
+STR_QUERY_RENAME_SHIP_TYPE_CAPTION                              :{WHITE}重新命名船舶類型
+STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION                          :{WHITE}重新命名飛機種類
+
+STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}購買新交通工具
+STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_BUTTON                      :{BLACK}購買新車輛
+STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON                              :{BLACK}購買船舶
+STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON                          :{BLACK}購買飛機
+
+STR_DEPOT_TRAIN_LIST_TOOLTIP                                    :{BLACK}列車 - 點選列車檢視資訊，拖放車廂可加掛／解聯
+STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}車輛 - 點選車輛顯示詳細資料
+STR_DEPOT_SHIP_LIST_TOOLTIP                                     :{BLACK}船舶 - 點選船舶可看到詳細資料
+STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}飛機 - 點選飛機顯示詳細資料
+
+STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP                            :{BLACK}購買新列車
+STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}購置新車輛
+STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}購買新船舶
+STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}購買新飛機
+
+STR_DEPOT_TRAIN_SELL_TOOLTIP                                    :{BLACK}將列車拖到這裡即可出售
+STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}將車輛拖到這裡即可出售
+STR_DEPOT_SHIP_SELL_TOOLTIP                                     :{BLACK}將船舶拖到這裡即可出售
+STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}將飛機拖到這裡即可出售
+
+STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}將鐵路機廠置於畫面中央
+STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}將車庫置於畫面中央
+STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}將船塢置於畫面中央
+STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}將機棚置於畫面中央
+
+
 ### depot strings
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}您正準備出售車庫内所有車輛。確定嗎？
 STR_DEPOT_WRONG_DEPOT_TYPE                                      :錯誤的機廠類型
@@ -3202,7 +3212,6 @@ STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TIP                          :{BLACK}自動�
 STR_DEPOT_AUTOREPLACE_SHIP_TIP                                  :{BLACK}自動替換所有船塢内船舶
 STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP                              :{BLACK}自動替換所有機棚内飛機
 
-
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}替換 {STRING}
 STR_REPLACE_VEHICLES_START                                      :{BLACK}開始替換交通工具
 STR_REPLACE_VEHICLES_STOP                                       :{BLACK}停止替換交通工具
@@ -3218,6 +3227,7 @@ STR_REPLACE_REMOVE_WAGON                                        :{BLACK}移除�
 STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}如果替換後的車廂較長的話，讓自動替換功能移除多餘的車廂 (從頭開始) 以便維持列車長度
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}替換：{ORANGE}{SKIP}{SKIP}{STRING}
 STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}在車頭及車廂替換畫面間切換。
+
 STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}交通工具已經停產
 STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}車輛已經停產
 STR_SHIP_NOT_AVAILABLE                                          :{WHITE}船舶已經停產
@@ -3368,17 +3378,6 @@ STR_MEASURE_AREA                                                :{BLACK}區域�
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}長度：{NUM}{}高度差：{NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}區域：{NUM} x {NUM}{}高度差：{NUM} m
 
-############ Date formatting
-STR_FORMAT_DATE_TINY                                            :{STRING}-{STRING}-{NUM}
-STR_FORMAT_DATE_SHORT                                           :{STRING} {NUM}
-STR_FORMAT_DATE_LONG                                            :{2:NUM} 年 {1:STRING} 月 {0:STRING} 日
-STR_FORMAT_DATE_ISO                                             :{2:NUM}-{1:STRING}-{0:STRING}
-
-STR_JUST_DATE_TINY                                              :{DATE_TINY}
-STR_JUST_DATE_LONG                                              :{DATE_LONG}
-STR_JUST_DATE_ISO                                               :{DATE_ISO}
-########
-
 STR_FEEDER_CARGO_VALUE                                          :{BLACK}轉運進帳：{LTBLUE}{CURRENCY}
 STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD                            :{WHITE}...此路段為市鎮所有
 STR_DRIVE_THROUGH_ERROR_DIRECTION                               :{WHITE}...此道路面向錯誤的方向
@@ -3403,7 +3402,6 @@ STR_PERCENT_UP_DOWN_SMALL                                       :{TINYFONT}{WHIT
 STR_PERCENT_UP_DOWN                                             :{WHITE}{NUM}%{UPARROW}{DOWNARROW}
 
 ##### Mass Order
-STR_FORMAT_GROUP_NAME                                           :群組 {COMMA}
 STR_GROUP_TINY_NAME                                             :{TINYFONT}{GROUP}
 STR_GROUP_ALL_TRAINS                                            :所有列車
 STR_GROUP_ALL_ROAD_VEHICLES                                     :所有車輛
@@ -3432,12 +3430,62 @@ STR_GROUP_DELETE_TIP                                            :{BLACK}移除�
 STR_GROUP_RENAME_TIP                                            :{BLACK}為群組重新命名
 STR_GROUP_REPLACE_PROTECTION_TIP                                :{BLACK}點選可保護此群組排除在全域自動替 換設定之外
 
+#### String control codes and their formatting
 STR_COMPANY_NAME                                                :{COMPANY}
 STR_ENGINE_NAME                                                 :{ENGINE}
 STR_GROUP_NAME                                                  :{GROUP}
+STR_INDUSTRY_NAME                                               :{INDUSTRY}
 STR_PRESIDENT_NAME                                              :{PRESIDENTNAME}
 STR_SIGN_NAME                                                   :{SIGN}
+STR_STATION_NAME                                                :{STATION}
+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_LONG                                              :{DATE_LONG}
+STR_JUST_DATE_ISO                                               :{DATE_ISO}
+STR_JUST_STRING                                                 :{STRING}
+STR_JUST_RAW_STRING                                             :{STRING}
+
+STR_FORMAT_DATE_TINY                                            :{STRING}-{STRING}-{NUM}
+STR_FORMAT_DATE_SHORT                                           :{STRING} {NUM}
+STR_FORMAT_DATE_LONG                                            :{2:NUM} 年 {1:STRING} 月 {0:STRING} 日
+STR_FORMAT_DATE_ISO                                             :{2:NUM}-{1:STRING}-{0:STRING}
+
+STR_FORMAT_COMPANY_NUM                                          :(公司 {COMMA})
+STR_FORMAT_GROUP_NAME                                           :群組 {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}名稱必須是唯一的
 
diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt
index 69897a243..4160cbcdf 100644
--- a/src/lang/turkish.txt
+++ b/src/lang/turkish.txt
@@ -154,8 +154,6 @@ STR_ABBREV_PLASTIC                                              :{TINYFONT}PL
 STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}İÇ
 STR_ABBREV_NONE                                                 :{TINYFONT}YOK
 STR_ABBREV_ALL                                                  :{TINYFONT}HEPSI
-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
@@ -167,17 +165,11 @@ STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Orijinal
 STR_ABOUT_VERSION                                               :{BLACK}OpenTTD sürüm {REV}
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 OpenTTD takımı
 
-STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
-STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_QUIT_CAPTION                                                :{WHITE}Çıkış
 STR_YES                                                         :{BLACK}Evet
 STR_NO                                                          :{BLACK}Hayır
 STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Oyundan çıkıp {STRING} sisteminize dönmek istediğinizden emin misiniz?
-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                                                :Hiçbir şey
 STR_COLOUR_DARK_BLUE                                            :Koyu Mavi
 STR_COLOUR_PALE_GREEN                                           :Soluk Yeşil
@@ -196,8 +188,6 @@ STR_COLOUR_BROWN                                                :Kahverengi
 STR_COLOUR_GREY                                                 :Gri
 STR_COLOUR_WHITE                                                :Beyaz
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}Oyunda çok fazla araç var
-STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
-STR_RED_COMMA                                                   :{RED}{COMMA}
 STR_BUTTON_LOCATION                                             :{BLACK}Göster
 STR_SMALLMAP_TYPE_CONTOURS                                      :Dış Hatlar
 STR_SMALLMAP_TYPE_VEHICLES                                      :Araçlar
@@ -323,12 +313,13 @@ STR_SORT_CRITERIA_TIP                                           :{BLACK}Sıralam
 STR_FILTER_CRITERIA_TIP                                         :{BLACK}Süzme kriterini seçin
 STR_SORT_BY                                                     :{BLACK}Sırala
 
+### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}Nüfus
+STR_SORT_BY_NAME                                                :{BLACK}İsim
+STR_SORT_BY_DATE                                                :{BLACK}Tarih
 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_DATE                                                :{BLACK}Tarih
 STR_SORT_BY_NUMBER                                              :Numara
 STR_SORT_BY_PROFIT_LAST_YEAR                                    :Geçen seneki kâr
 STR_SORT_BY_PROFIT_THIS_YEAR                                    :Bu seneki kâr
@@ -351,6 +342,7 @@ STR_SORT_BY_INTRO_DATE                                          :Piyasaya Giriş
 STR_SORT_BY_RUNNING_COST                                        :Bakım Gideri
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :Güç/Bakım Gideri
 STR_SORT_BY_CARGO_CAPACITY                                      :Kapasite
+
 STR_NO_WAITING_CARGO                                            :{BLACK}Hiç kargo yok
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}Tüm türleri seç
 STR_SELECT_ALL_TYPES                                            :{BLACK}Tüm kargo türlerini seç (hiç beklemeyenler dahil)
@@ -370,21 +362,6 @@ STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Garaja Gönder
 STR_SEND_SHIP_TO_DEPOT                                          :Tersaneye Gönder
 STR_SEND_AIRCRAFT_TO_HANGAR                                     :Hangara Gönder
 
-############ range for months starts
-STR_MONTH_ABBREV_JAN                                            :Oca
-STR_MONTH_ABBREV_FEB                                            :Şub
-STR_MONTH_ABBREV_MAR                                            :Mar
-STR_MONTH_ABBREV_APR                                            :Nis
-STR_MONTH_ABBREV_MAY                                            :May
-STR_MONTH_ABBREV_JUN                                            :Haz
-STR_MONTH_ABBREV_JUL                                            :Tem
-STR_MONTH_ABBREV_AUG                                            :Ağu
-STR_MONTH_ABBREV_SEP                                            :Eyl
-STR_MONTH_ABBREV_OCT                                            :Eki
-STR_MONTH_ABBREV_NOV                                            :Kas
-STR_MONTH_ABBREV_DEC                                            :Ara
-############ 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}{STRING}-
@@ -411,8 +388,6 @@ 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_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
@@ -459,7 +434,7 @@ STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Hiçbiri
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}İsim
 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                                          :1
 STR_ORDINAL_NUMBER_2ND                                          :2
 STR_ORDINAL_NUMBER_3RD                                          :3
@@ -493,6 +468,34 @@ STR_ORDINAL_NUMBER_30TH                                         :30
 STR_ORDINAL_NUMBER_31ST                                         :31
 ############ range for days ends
 
+############ range for months starts
+STR_MONTH_ABBREV_JAN                                            :Oca
+STR_MONTH_ABBREV_FEB                                            :Şub
+STR_MONTH_ABBREV_MAR                                            :Mar
+STR_MONTH_ABBREV_APR                                            :Nis
+STR_MONTH_ABBREV_MAY                                            :May
+STR_MONTH_ABBREV_JUN                                            :Haz
+STR_MONTH_ABBREV_JUL                                            :Tem
+STR_MONTH_ABBREV_AUG                                            :Ağu
+STR_MONTH_ABBREV_SEP                                            :Eyl
+STR_MONTH_ABBREV_OCT                                            :Eki
+STR_MONTH_ABBREV_NOV                                            :Kas
+STR_MONTH_ABBREV_DEC                                            :Ara
+
+STR_MONTH_JAN                                                   :Ocak
+STR_MONTH_FEB                                                   :Subat
+STR_MONTH_MAR                                                   :Mart
+STR_MONTH_APR                                                   :Nisan
+STR_MONTH_MAY                                                   :Mayis
+STR_MONTH_JUN                                                   :Haziran
+STR_MONTH_JUL                                                   :Temmuz
+STR_MONTH_AUG                                                   :Ağustos
+STR_MONTH_SEP                                                   :Eylül
+STR_MONTH_OCT                                                   :Ekim
+STR_MONTH_NOV                                                   :Kasım
+STR_MONTH_DEC                                                   :Aralik
+############ range for months ends
+
 STR_GRAPH_Y_LABEL_NUMBER                                        :{TINYFONT}{COMMA}
 
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}İstenen: {LTBLUE}
@@ -582,12 +585,9 @@ 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_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_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
@@ -669,9 +669,7 @@ STR_OFF                                                         :Kapalı
 STR_SUMMARY                                                     :Özet
 STR_FULL                                                        :Tam
 STR_STATUSBAR_COMPANY_NAME                                      :{SILVER}- -  {COMPANY}  - -
-STR_BLACK_STRING                                                :{BLACK}{STRING}
 
-STR_JUST_CHECKMARK                                              :{CHECKMARK}
 ############ range for menu starts
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Seçenekler
 STR_SETTINGS_MENU_DIFFICULTY_SETTINGS                           :Zorluk Ayarları
@@ -776,9 +774,6 @@ 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_BLACK_6                                                     :{BLACK}6
-STR_BLACK_7                                                     :{BLACK}7
-
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :İngilizce (Orjinal)
 STR_TOWNNAME_FRENCH                                             :Fransizca
@@ -858,19 +853,6 @@ STR_OPTIONS_BASE_GRF_DESCRIPTION_TIP                            :{BLACK}Temel gr
 
 STR_AUTOSAVE_FAILED                                             :{WHITE}Otokayıt başarısız
 
-STR_MONTH_JAN                                                   :Ocak
-STR_MONTH_FEB                                                   :Subat
-STR_MONTH_MAR                                                   :Mart
-STR_MONTH_APR                                                   :Nisan
-STR_MONTH_MAY                                                   :Mayis
-STR_MONTH_JUN                                                   :Haziran
-STR_MONTH_JUL                                                   :Temmuz
-STR_MONTH_AUG                                                   :Ağustos
-STR_MONTH_SEP                                                   :Eylül
-STR_MONTH_OCT                                                   :Ekim
-STR_MONTH_NOV                                                   :Kasım
-STR_MONTH_DEC                                                   :Aralik
-
 STR_HEADING_FOR_STATION                                         :{LTBLUE}Gidiyor {STATION}
 STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}Gidiyor {STATION}, {VELOCITY}
 STR_NO_ORDERS                                                   :{LTBLUE}Talimat yok
@@ -885,8 +867,6 @@ STR_CRATES                                                      :kasa
 STR_RES_OTHER                                                   :diğer
 STR_NOTHING                                                     :
 
-STR_TINY_RIGHT_ARROW                                            :{TINYFONT}{RIGHTARROW}
-
 STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}Talimat listesi paylasilamiyor...
 STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Talimat listesi kopyalanamiyor...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Paylaşılmış talimat sonu - -
@@ -1158,7 +1138,6 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Haritan
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :kapalı
-STR_JUST_CURRENCY                                               :{CURRENCY}
 STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Ayar değerini değiştir
 
 STR_TEMPERATE_LANDSCAPE                                         :Ilıman iklim
@@ -2124,8 +2103,6 @@ STR_NUM_LOW                                                     :Düşük
 STR_NUM_NORMAL                                                  :Normal
 STR_NUM_HIGH                                                    :Yüksek
 STR_NUM_CUSTOM                                                  :Özel
-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
@@ -2806,7 +2783,6 @@ 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_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})
@@ -3472,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}
@@ -3490,6 +3469,31 @@ STR_FORMAT_COMPANY_NUM                                          :(Company {COMMA
 STR_FORMAT_GROUP_NAME                                           :Grup {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}İsim daha önce kullanılmamış olmalı
 
 #### Improved sign GUI
diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt
index fd27ca537..b1ca5d0ad 100644
--- a/src/lang/ukrainian.txt
+++ b/src/lang/ukrainian.txt
@@ -279,8 +279,6 @@ STR_ABBREV_PLASTIC                                              :{TINYFONT}ПЛ
 STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}ГЗ
 STR_ABBREV_NONE                                                 :{TINYFONT}Ні
 STR_ABBREV_ALL                                                  :{TINYFONT}Все
-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}Повідомлення
@@ -292,17 +290,11 @@ STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Авто
 STR_ABOUT_VERSION                                               :{BLACK}OpenTTD версія {REV}
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 команда OpenTTD
 
-STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
-STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_QUIT_CAPTION                                                :{WHITE}Вийти
 STR_YES                                                         :{BLACK}Так
 STR_NO                                                          :{BLACK}Ні
 STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Ви дійсно бажаєте вийти до {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                                                :нічого
 STR_COLOUR_DARK_BLUE                                            :Темно-синій
 STR_COLOUR_PALE_GREEN                                           :Світло-зелений
@@ -321,8 +313,6 @@ STR_COLOUR_BROWN                                                :Коричне�
 STR_COLOUR_GREY                                                 :Сірий
 STR_COLOUR_WHITE                                                :Білий
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}Дуже багато транспорту у грі
-STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
-STR_RED_COMMA                                                   :{RED}{COMMA}
 STR_BUTTON_LOCATION                                             :{BLACK}Показати
 STR_SMALLMAP_TYPE_CONTOURS                                      :Границі
 STR_SMALLMAP_TYPE_VEHICLES                                      :Авто
@@ -448,12 +438,13 @@ STR_SORT_CRITERIA_TIP                                           :{BLACK}Вибе
 STR_FILTER_CRITERIA_TIP                                         :{BLACK}Оберіть критерій виборки
 STR_SORT_BY                                                     :{BLACK}Сортувати
 
+### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}за населенням
+STR_SORT_BY_NAME                                                :{BLACK}за назвою
+STR_SORT_BY_DATE                                                :{BLACK}за датою
 STR_SORT_BY_PRODUCTION                                          :за продуктивністю
 STR_SORT_BY_TYPE                                                :за типом
 STR_SORT_BY_TRANSPORTED                                         :за перевезенням
-STR_SORT_BY_NAME                                                :{BLACK}за назвою
-STR_SORT_BY_DATE                                                :{BLACK}за датою
 STR_SORT_BY_NUMBER                                              :за номером
 STR_SORT_BY_PROFIT_LAST_YEAR                                    :за прибутком минулого року
 STR_SORT_BY_PROFIT_THIS_YEAR                                    :за прибутком цього року
@@ -476,37 +467,25 @@ STR_SORT_BY_INTRO_DATE                                          :за датою
 STR_SORT_BY_RUNNING_COST                                        :за вартістю експлуатації
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :за потужністю/вартістю експлуатації
 STR_SORT_BY_CARGO_CAPACITY                                      :за місткістю
+
 STR_NO_WAITING_CARGO                                            :{BLACK}Звідси поки що нічого перевозити
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}Вибрати весь транспорт
 STR_SELECT_ALL_TYPES                                            :{BLACK}Вибрати всі типи вантажів
-STR_AVAILABLE_TRAINS                                            :{BLACK}Доступні поїзди
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Доступні автомобілі
-STR_AVAILABLE_SHIPS                                             :{BLACK}Доступні кораблі
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Доступні літаки
 STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Перелік доступного транспорту
 STR_MANAGE_LIST                                                 :{BLACK}Редагувати список
 STR_MANAGE_LIST_TIP                                             :{BLACK}Дати завдання всьому транспорту зі списку
 STR_REPLACE_VEHICLES                                            :Оновлення
+STR_SEND_FOR_SERVICING                                          :Відправити на техогляд
+
+STR_AVAILABLE_TRAINS                                            :{BLACK}Доступні поїзди
+STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Доступні автомобілі
+STR_AVAILABLE_SHIPS                                             :{BLACK}Доступні кораблі
+STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Доступні літаки
+
 STR_SEND_TRAIN_TO_DEPOT                                         :Відправити до депо
 STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Відправити до депо
 STR_SEND_SHIP_TO_DEPOT                                          :Відправити до депо
 STR_SEND_AIRCRAFT_TO_HANGAR                                     :Відправити в ангар
-STR_SEND_FOR_SERVICING                                          :Відправити на техогляд
-
-############ range for months starts
-STR_MONTH_ABBREV_JAN                                            :Січ
-STR_MONTH_ABBREV_FEB                                            :Лют
-STR_MONTH_ABBREV_MAR                                            :Бер
-STR_MONTH_ABBREV_APR                                            :Кві
-STR_MONTH_ABBREV_MAY                                            :Тра
-STR_MONTH_ABBREV_JUN                                            :Чер
-STR_MONTH_ABBREV_JUL                                            :Лип
-STR_MONTH_ABBREV_AUG                                            :Сер
-STR_MONTH_ABBREV_SEP                                            :Вер
-STR_MONTH_ABBREV_OCT                                            :Жов
-STR_MONTH_ABBREV_NOV                                            :Лис
-STR_MONTH_ABBREV_DEC                                            :Гру
-############ range for months ends
 
 STR_GRAPH_X_LABEL_MONTH                                         :{TINYFONT}{STRING}{} {STRING}
 STR_GRAPH_X_LABEL_MONTH_YEAR                                    :{TINYFONT}{STRING}{} {STRING}{}{NUM}
@@ -534,8 +513,6 @@ 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_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,7 +559,7 @@ STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :немає
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Назва
 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                                          :1
 STR_ORDINAL_NUMBER_2ND                                          :2
 STR_ORDINAL_NUMBER_3RD                                          :3
@@ -616,6 +593,34 @@ STR_ORDINAL_NUMBER_30TH                                         :30
 STR_ORDINAL_NUMBER_31ST                                         :31
 ############ range for days ends
 
+############ range for months starts
+STR_MONTH_ABBREV_JAN                                            :Січ
+STR_MONTH_ABBREV_FEB                                            :Лют
+STR_MONTH_ABBREV_MAR                                            :Бер
+STR_MONTH_ABBREV_APR                                            :Кві
+STR_MONTH_ABBREV_MAY                                            :Тра
+STR_MONTH_ABBREV_JUN                                            :Чер
+STR_MONTH_ABBREV_JUL                                            :Лип
+STR_MONTH_ABBREV_AUG                                            :Сер
+STR_MONTH_ABBREV_SEP                                            :Вер
+STR_MONTH_ABBREV_OCT                                            :Жов
+STR_MONTH_ABBREV_NOV                                            :Лис
+STR_MONTH_ABBREV_DEC                                            :Гру
+
+STR_MONTH_JAN                                                   :Січень
+STR_MONTH_FEB                                                   :Лютий
+STR_MONTH_MAR                                                   :Березень
+STR_MONTH_APR                                                   :Квітень
+STR_MONTH_MAY                                                   :Травень
+STR_MONTH_JUN                                                   :Червень
+STR_MONTH_JUL                                                   :Липень
+STR_MONTH_AUG                                                   :Серпень
+STR_MONTH_SEP                                                   :Вересень
+STR_MONTH_OCT                                                   :Жовтень
+STR_MONTH_NOV                                                   :Листопад
+STR_MONTH_DEC                                                   :Грудень
+############ range for months ends
+
 STR_GRAPH_Y_LABEL_NUMBER                                        :{TINYFONT}{COMMA}
 
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}Приймає: {LTBLUE}
@@ -705,12 +710,9 @@ 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_COMMA                                                  :{BLUE}{COMMA}
 STR_SCENEDIT_TOOLBAR_OPENTTD                                    :{YELLOW}OpenTTD
 STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR                            :{YELLOW}Редактор сценарію
 STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION                   :{WHITE}Створити ландшафт
-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}Створити випадкову ділянку
@@ -792,9 +794,7 @@ STR_OFF                                                         :Відкл.
 STR_SUMMARY                                                     :Коротко
 STR_FULL                                                        :Повністю
 STR_STATUSBAR_COMPANY_NAME                                      :{SILVER}- -  {COMPANY}  - -
-STR_BLACK_STRING                                                :{BLACK}{STRING}
 
-STR_JUST_CHECKMARK                                              :{CHECKMARK}
 ############ range for menu starts
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Налаштування гри
 STR_SETTINGS_MENU_DIFFICULTY_SETTINGS                           :Налаштування складності
@@ -899,9 +899,6 @@ STR_STATUSBAR_SAVING_GAME                                       :{RED}*  *  ЗБ
 STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Збереження...{}зачекайте, доки завершиться!
 STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE                       :{BLACK}Вибрати програму 'Дорожні теми'
 
-STR_BLACK_6                                                     :{BLACK}6
-STR_BLACK_7                                                     :{BLACK}7
-
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Англійські (оригінальні)
 STR_TOWNNAME_FRENCH                                             :Французькі
@@ -981,19 +978,6 @@ STR_OPTIONS_BASE_GRF_DESCRIPTION_TIP                            :{BLACK}Дода
 
 STR_AUTOSAVE_FAILED                                             :{WHITE}Помилка автозбереження
 
-STR_MONTH_JAN                                                   :Січень
-STR_MONTH_FEB                                                   :Лютий
-STR_MONTH_MAR                                                   :Березень
-STR_MONTH_APR                                                   :Квітень
-STR_MONTH_MAY                                                   :Травень
-STR_MONTH_JUN                                                   :Червень
-STR_MONTH_JUL                                                   :Липень
-STR_MONTH_AUG                                                   :Серпень
-STR_MONTH_SEP                                                   :Вересень
-STR_MONTH_OCT                                                   :Жовтень
-STR_MONTH_NOV                                                   :Листопад
-STR_MONTH_DEC                                                   :Грудень
-
 STR_HEADING_FOR_STATION                                         :{LTBLUE}Прямує до {STATION}
 STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}Прямує до {STATION}, {VELOCITY}
 STR_NO_ORDERS                                                   :{LTBLUE}Без завдань
@@ -1008,8 +992,6 @@ STR_CRATES                                                      :ЯщикИ
 STR_RES_OTHER                                                   :інша
 STR_NOTHING                                                     :
 
-STR_TINY_RIGHT_ARROW                                            :{TINYFONT}{RIGHTARROW}
-
 STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}Неможливо розділити список завдань...
 STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Неможливо скопіювати список завдань...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Кінець наказів - -
@@ -1281,7 +1263,6 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Y-ро�
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :вимкнено
-STR_JUST_CURRENCY                                               :{CURRENCY}
 STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Змініть значення
 
 STR_TEMPERATE_LANDSCAPE                                         :Помірний ландшафт
@@ -1383,11 +1364,6 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Назв
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...дуже близько до іншої промисловості
 
-STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Переобладнати поїзд для перевезення іншого виду вантажу
-STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Переобладнати
-STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Виберіть вид вантажу для перевезення
-STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Переобладнати поїзд для перевезення вибраного виду вантажу
-STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Неможливо переобладнати поїзд...
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Змінити виробництво
 
 ############ network gui strings
@@ -2285,8 +2261,6 @@ STR_NUM_LOW                                                     :мало
 STR_NUM_NORMAL                                                  :нормально
 STR_NUM_HIGH                                                    :багато
 STR_NUM_CUSTOM                                                  :Власні
-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                                             :середньо
@@ -2754,10 +2728,8 @@ STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE                          :монорел�
 STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE                            :поїзд на магнітній подушці
 
 ##id 0x8800
-STR_DEPOT_TRAIN_CAPTION                                         :{WHITE}{TOWN} Залізничне депо
 STR_NEWS_FIRST_TRAIN_ARRIVAL                                    :{BLACK}{BIGFONT}Жителі святкують . . .{}Перший поїзд з'явився на {STATION}!
 STR_VEHICLE_DETAILS_CAPTION                                     :{WHITE}{VEHICLE} (Детально)
-STR_ERROR_TRAIN_IN_THE_WAY                                      :{WHITE}Поїзд на шляху
 STR_ORDER                                                       :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 STR_ORDER_SELECTED                                              :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 STR_ORDER_NON_STOP                                              :{BLACK}Без зупинки
@@ -2847,37 +2819,16 @@ STR_TIMETABLE_AND_TRAVEL_FOR                                    :і прямув
 STR_TIMETABLE_DAYS                                              :{COMMA} д{P ень ні нів}
 STR_TIMETABLE_TICKS                                             :{COMMA} одиниц{P ю і ь}
 
-STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Прямує до {TOWN} депо
-STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Прямує до {TOWN} депо, {VELOCITY}
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Техогляд в {TOWN} депо
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Техогляд в {TOWN} депо, {VELOCITY}
-
 STR_INVALID_ORDER                                               :{RED} (Невірний наказ)
 
 STR_UNKNOWN_STATION                                             :невідома станція
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}порожній
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} з {STATION}
 STR_VEHICLE_DETAILS_CARGO_FROM_MULT                             :{LTBLUE}{CARGO} з {STATION} (x{NUM})
-STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} чакає в депо
-STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Новий транспорт
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}Поїзд дуже довгий
 STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}Поїзд можна змінювати тільки тоді, коли зупинений в депо
 
-STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}Новий залізничний транспорт
-STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}Новий електрозалізничний транспорт
-STR_BUILD_VEHICLE_TRAIN_MONORAIL_CAPTION                        :{WHITE}Новий монорельсовий транспорт
-STR_BUILD_VEHICLE_TRAIN_MAGLEV_CAPTION                          :{WHITE}Новий транспорт на магнітній подушці
-STR_BUILD_VEHICLE_TRAIN_ALL_CAPTION                             :{WHITE}Потяги
-
-STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_BUTTON                    :{BLACK}Будувати
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Клонувати
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Будувати копію авто. Утримуйте Ctrl для спільного завдання
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Будувати копію авто. Натисніть на цю кнопку і потім на авто в депо або ззовні. Утримуйте Ctrl для спільного завдання
-STR_CLONE_TRAIN                                                 :{BLACK}Клонувати
-STR_CLONE_TRAIN_INFO                                            :{BLACK}Будувати копію поїзда з усіма вагонами. Утримуйте Ctrl для спільного завдання
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Будувати копію поїзда з усіма вагонами. Натисніть на цю кнопку і потім на поїзд в депо або ззовні. Утримуйте Ctrl для спільного завдання
-STR_BUILD_VEHICLE_TRAIN_RENAME_BUTTON                           :{BLACK}Назва
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Пропуск
 STR_ORDERS_DELETE_BUTTON                                        :{BLACK}Видалити
 STR_ORDERS_GO_TO_BUTTON                                         :{BLACK}Прямувати
@@ -2893,14 +2844,12 @@ STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Пере
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Накази)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Кінець наказів - -
 STR_SERVICE                                                     :{BLACK}Техогляд
-STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Неможливо збудувати поїзд...
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Рік випуску: {LTBLUE}{NUM}{BLACK} Ціна: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Ціна: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
 STR_VEHICLE_STATUS_LOADING_UNLOADING                            :{LTBLUE}Завантажуюся/Розвантажуюся
 STR_VEHICLE_STATUS_LEAVING                                      :{LTBLUE}Відправляється
 STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}Поїзд повинен стояти в депо
-STR_ERROR_CAN_T_SEND_TRAIN_TO_DEPOT                             :{WHITE}Неможливо відправити поїзд в депо...
 STR_ERROR_NO_MORE_SPACE_FOR_ORDERS                              :{WHITE}Немає місця для наказів
 STR_ERROR_TOO_MANY_ORDERS                                       :{WHITE}Дуже багато наказів
 STR_ERROR_CAN_T_INSERT_NEW_ORDER                                :{WHITE}Неможливо додати наказ...
@@ -2915,25 +2864,11 @@ STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE}Тран
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}Неможливо перемістити транспорт...
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}задній потяг буде завжди йти за переднім
 STR_CARGO_N_A                                                   :немає{SKIP}
-STR_ERROR_CAN_T_SELL_TRAIN                                      :{WHITE}Не можна продати поїзд...
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}Неможливо знайти маршрут до місцевого депо
-STR_ERROR_CAN_T_STOP_START_TRAIN                                :{WHITE}Не можна зупинити/стартувати поїзд...
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}Інтервал техогляду: {LTBLUE}{COMMA} днів{BLACK}   Останній техогляд: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}Інтервал техогляду: {LTBLUE}{COMMA}%{BLACK}   Останній техогляд: {LTBLUE}{DATE_LONG}
-STR_DEPOT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Поїзди - клікніть на поїзді для інформації, перетягніть для додавання/вилучення
-STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP                            :{BLACK}Будувати новий поїзд
-STR_DEPOT_TRAIN_SELL_TOOLTIP                                    :{BLACK}Перетягніть поїзд сюди, щоб продати його
-STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}Показати депо в центрі головного екрану
-STR_BUILD_VEHICLE_TRAIN_LIST_TOOLTIP                            :{BLACK}Список поїздів - клікніть на поїзді для інформації
-STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_TOOLTIP                   :{BLACK}Будувати вибраний поїзд
-STR_BUILD_VEHICLE_TRAIN_RENAME_TOOLTIP                          :{BLACK}Перейменуйте тип транспорту
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP                 :{BLACK}Діяльність поїзда - клікніть тут для його запуску/зупинення
-STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP                           :{BLACK}Показати маршрут поїзда
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP                         :{BLACK}Показати поїзд в центрі головного екрану
-STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP                    :{BLACK}Направити поїзд у депо
 STR_VEHICLE_VIEW_TRAIN_IGNORE_SIGNAL_TOOLTIP                    :{BLACK}Ігнорувати червоне світло семафору!
 STR_VEHICLE_VIEW_TRAIN_REVERSE_TOOLTIP                          :{BLACK}Розвернути поїзд
-STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Показати детальну інформацію
 STR_VEHICLE_DETAILS_INCREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Збільшити період техогляду
 STR_VEHICLE_DETAILS_DECREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Зменшити період техогляду
 STR_VEHICLE_DETAILS_TRAIN_CARGO_TOOLTIP                         :{BLACK}Показати інформацію про вантаж
@@ -2967,15 +2902,10 @@ STR_VEHICLE_STATUS_STOPPED                                      :{RED}Зупин
 STR_ERROR_CAN_T_MAKE_TRAIN_PASS_SIGNAL                          :{WHITE}Неможливо проїхати сигнал - небезпечно...
 STR_VEHICLE_STATUS_CRASHED                                      :{RED}Аварія!
 
-STR_QUERY_RENAME_TRAIN_CAPTION                                  :{WHITE}Назвати поїзд
-STR_ERROR_CAN_T_RENAME_TRAIN                                    :{WHITE}Неможливо назвати поїзд...
-STR_VEHICLE_DETAILS_TRAIN_RENAME                                :{BLACK}Назвати поїзд
 STR_NEWS_TRAIN_CRASH                                            :{BLACK}{BIGFONT}Аварія!{}Поїзди зіткнулися.{}{COMMA} загинуло.
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Неможливо розвернути поїзд...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE                  :{WHITE}Не можна розвернути поїзд...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Неможливо розвернути довгий транспорт
-STR_QUERY_RENAME_TRAIN_TYPE_CAPTION                             :{WHITE}Перейменувати тип поїзду
-STR_ERROR_CAN_T_RENAME_TRAIN_TYPE                               :{WHITE}Неможливо перейменувати тип поїзду...
 STR_CLEAR_TIME                                                  :{BLACK}Очистити час
 STR_RESET_LATENESS                                              :{BLACK}Очистити лічильник запізнення
 STR_CHANGE_WAYPOINT_NAME                                        :{BLACK}Перейменувати точку маршруту
@@ -3007,43 +2937,14 @@ STR_TIMETABLE_AUTOFILL                                          :{BLACK}Авто
 STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Автоматично заповнити розклад значеннями з наступної поїздки (Ctrl+click - спробувати зберегти час очікування)
 
 ##id 0x9000
-STR_ERROR_ROAD_VEHICLE_IN_THE_WAY                               :{WHITE}На шляху авто
-STR_DEPOT_ROAD_VEHICLE_CAPTION                                  :{WHITE}{TOWN} Гараж
-STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_BUTTON                      :{BLACK}Новий транспорт
-STR_BUILD_VEHICLE_ROAD_VEHICLE_CAPTION                          :{WHITE}Нове авто
-STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_BUTTON             :{BLACK}Будувати
-STR_ERROR_CAN_T_BUILD_ROAD_VEHICLE                              :{WHITE}Неможливо будувати авто...
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}...авто повинно стояти в депо
-STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}Неможливо продати авто...
-STR_ERROR_CAN_T_STOP_START_ROAD_VEHICLE                         :{WHITE}Неможливо зупинити авто...
-STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} чакає в депо
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Прямує до {TOWN} дорожного депо
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Прямує до {TOWN} дорожного депо, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Техогляд в  {TOWN} дорожному депо
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Техогляд в  {TOWN} дорожному депо, {VELOCITY}
-STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Неможливо направити авто в депо...
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Неможливо знайти місцеве депо
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP          :{BLACK}Показує, яку дію виконує авто - натисніть для руху/зупинки авто
-STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP                    :{BLACK}Показати накази авто
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP                  :{BLACK}Показати авто в центрі екрану
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}Направити авто в депо
 STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP                   :{BLACK}Розвернути авто
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Показати авто детально
-STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Авто - натисніть на авто для інформації
-STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}Будувати новий автомобіль
-STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}Перетягніть автомобіль сюди, щоб продати
-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_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})
 
-STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Назвати авто
-STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Неможливо назвати авто...
-STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Назвати авто
 STR_NEWS_FIRST_BUS_ARRIVAL                                      :{BLACK}{BIGFONT}Жителі святкують . . .{}Перший автобус з'явився на {STATION}!
 STR_NEWS_FIRST_TRUCK_ARRIVAL                                    :{BLACK}{BIGFONT}Жителі святкують . . .{}Перша вантажівка з'явилася на {STATION}!
 STR_NEWS_FIRST_PASSENGER_TRAM_ARRIVAL                           :{BLACK}{BIGFONT}Жителі святкують . . .{}Перший пасажирський трамвай прибув на {STATION}!
@@ -3051,128 +2952,39 @@ STR_NEWS_FIRST_CARGO_TRAM_ARRIVAL                               :{BLACK}{BIGFONT
 STR_NEWS_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Аварія!{}Водій загинув при зіткненні авто з поїздом
 STR_NEWS_ROAD_VEHICLE_CRASH                                     :{BLACK}{BIGFONT}Аварія!{}{COMMA} загинуло при зіткненні авто з поїздом
 STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}Неможливо розвернути машину...
-STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Зміна назви
-STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Перейменувати тип авто
-STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Перейменувати тип авто
-STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Неможливо перейменувати тип авто...
 
-STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Переобладнати авто для перевезення інших вантажів
-STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Переобладнати авто
-STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Переобладнати авто для перевезення вибраного вантажу
-STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Неможливо переобладнати авто
-STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Оберіть тип вантажу для перевезення
 
 ##id 0x9800
 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :Будівництво водних шляхів
 STR_WATERWAYS_TOOLBAR_CAPTION                                   :{WHITE}Будівництво водних шляхів
 STR_WATERWAYS_TOOLBAR_CAPTION_SE                                :{WHITE}Водні шляхи
 STR_ERROR_CAN_T_BUILD_DOCK_HERE                                 :{WHITE}Неможливо будувати порт тут...
-STR_DEPOT_SHIP_CAPTION                                          :{WHITE}{TOWN} Док
-STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON                              :{BLACK}Нові кораблі
-STR_BUILD_VEHICLE_SHIP_CAPTION                                  :{WHITE}Нові кораблі
-STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON                     :{BLACK}Будувати корабель
-STR_CLONE_SHIP                                                  :{BLACK}Клонувати
-STR_CLONE_SHIP_INFO                                             :{BLACK}Будувати копію корабля. Утримуйте Ctrl для спільного завдання
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Будувати копію корабля. Натисніть на цю кнопку, і потім на корабель в депо або ззовні. Утримуйте Ctrl для спільного завдання
 STR_ERROR_SHIP_MUST_BE_STOPPED_IN_DEPOT                         :{WHITE}Корабль має стояти в доці
-STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}Неможливо продати корабель...
-STR_ERROR_CAN_T_BUILD_SHIP                                      :{WHITE}Неможливо будувати корабель...
-STR_ERROR_SHIP_IN_THE_WAY                                       :{WHITE}Корабель на шляху
-STR_ERROR_CAN_T_STOP_START_SHIP                                 :{WHITE}Неможливо зупинити корабель...
-STR_ERROR_CAN_T_SEND_SHIP_TO_DEPOT                              :{WHITE}Неможливо направити корабель в депо...
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Прямує до {TOWN} корабельного депо
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Прямує до {TOWN} корабельного депо, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Техогляд в {TOWN} корабельному депо
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Техогляд в {TOWN} корабельному депо, {VELOCITY}
-STR_NEWS_SHIP_IS_WAITING                                        :{WHITE}{VEHICLE} чакає в депо
 STR_WATERWAYS_TOOLBAR_BUILD_DOCK_TOOLTIP                        :{BLACK}Будувати док
 STR_WATERWAYS_TOOLBAR_BUILD_DEPOT_TOOLTIP                       :{BLACK}Будувати корабельне депо
-STR_DEPOT_SHIP_LIST_TOOLTIP                                     :{BLACK}Кораблі - натисніть для інформації
-STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}Будувати корабель
-STR_DEPOT_SHIP_SELL_TOOLTIP                                     :{BLACK}Перетягніть корабель сюди, щоб продати
-STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}Показати депо в центрі екрану
-STR_BUILD_VEHICLE_SHIP_LIST_TOOLTIP                             :{BLACK}Список вибору кораблів - натисніть на корабель для інформації
-STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP                    :{BLACK}Будувати вибраний корабель
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP                  :{BLACK}Показує, яку дію виконує корабель - натисніть для руху/зупинки корабля
-STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Показати накази корабля
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP                          :{BLACK}Показати корабель в центрі екрану
-STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}Направити корабель в депо
-STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Показати корабель детально
-STR_VEHICLE_DETAILS_SHIP_RENAME                                 :{BLACK}Назвати корабель
 
-STR_QUERY_RENAME_SHIP_CAPTION                                   :{WHITE}Назвати корабель
-STR_ERROR_CAN_T_RENAME_SHIP                                     :{WHITE}Неможливо назвати корабель...
 STR_NEWS_FIRST_SHIP_ARRIVAL                                     :{BLACK}{BIGFONT}Жителі святкують . . .{}Перший корабель з'явився на {STATION}!
 STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}Розмістити бакен, який можна використовувати як точку маршруту
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}Неможливо розмістити бакен тут...
 STR_BUILD_AQUEDUCT                                              :{BLACK}Побудувати акведук
 STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}Тут не можна побудувати акведук...
-STR_BUILD_VEHICLE_SHIP_RENAME_BUTTON                            :{BLACK}Зміна назви
-STR_BUILD_VEHICLE_SHIP_RENAME_TOOLTIP                           :{BLACK}Перейменувати тип корабля
-STR_QUERY_RENAME_SHIP_TYPE_CAPTION                              :{WHITE}Перейменувати тип корабля
-STR_ERROR_CAN_T_RENAME_SHIP_TYPE                                :{WHITE}Неможливо перейменувати тип корабля...
-STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}Переобладнати корабель для перевезення іншого виду вантажу
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (Переобладнання)
-STR_REFIT_SHIP_REFIT_BUTTON                                     :{BLACK}Переобладнати корабель
-STR_REFIT_SHIP_LIST_TOOLTIP                                     :{BLACK}Виберіть вид вантажу для переобладнання
-STR_REFIT_SHIP_REFIT_TOOLTIP                                    :{BLACK}Переобладнати корабель для перевезення вибраного виду вантажу
 STR_REFIT_TITLE                                                 :{GOLD}Виберіть вид вантажу для перевезення:-
 STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}Нова місткість: {GOLD}{CARGO}{}{BLACK}Вартість переобладнання: {GOLD}{CURRENCY}
-STR_ERROR_CAN_T_REFIT_SHIP                                      :{WHITE}Неможливо переобладнати корабель...
 STR_REFITTABLE                                                  :(змінюється)
 
 ##id 0xA000
 STR_TOOLBAR_AIRCRAFT_CAPTION                                    :{WHITE}Аеропорти
 STR_ERROR_CAN_T_BUILD_AIRPORT_HERE                              :{WHITE}Неможливо будувати аеропорт тут...
-STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}{STATION} ангар
-STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON                          :{BLACK}Новий літак
-STR_CLONE_AIRCRAFT                                              :{BLACK}Клонувати
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Будувати копію літака. Утримуйте Ctrl для спільного завдання
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Будувати копію літака. Натисніть на цю кнопку і потім на літак в ангарі або ззовні. Утримуйте Ctrl для спільного завдання
-STR_BUILD_VEHICLE_AIRCRAFT_CAPTION                              :{WHITE}Нові літаки
-STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON                 :{BLACK}Будувати
-STR_ERROR_CAN_T_BUILD_AIRCRAFT                                  :{WHITE}Неможливо будувати літак...
-STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR                         :{WHITE}Неможливо направити літак до ангару...
-STR_HEADING_FOR_HANGAR                                          :{ORANGE}Летить до {STATION} ангару
-STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Летить до {STATION} ангару, {VELOCITY}
-STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Техогляд в {STATION} ангарі
-STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Техогляд в {STATION} ангарі, {VELOCITY}
-STR_NEWS_AIRCRAFT_IS_WAITING                                    :{WHITE}{VEHICLE} чакає в ангарі
-STR_ERROR_AIRCRAFT_IN_THE_WAY                                   :{WHITE}Літак на шляху
-STR_ERROR_CAN_T_STOP_START_AIRCRAFT                             :{WHITE}Неможливо зупинити літак...
 STR_ERROR_AIRCRAFT_IS_IN_FLIGHT                                 :{WHITE}Літак у польоті
 STR_ERROR_AIRCRAFT_MUST_BE_STOPPED                              :{WHITE}Літак повинен стояти в ангарі
-STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}Неможливо продати літак...
 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION                          :Будувати аеропорт
 STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Будувати аеропорт
-STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Літаки - натисніть на літак для інформації
-STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}Будувати літак
-STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}Перетягніть літак сюди, щоб продати
-STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Показати ангар в центрі екрану
-STR_BUILD_VEHICLE_AIRCRAFT_LIST_TOOLTIP                         :{BLACK}Список вибору літаків - натисніть на літак для інформації
-STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_TOOLTIP                :{BLACK}Будувати вибраний літак
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP              :{BLACK}Показує, яку дію виконує літак - натисніть для руху/зупинки літака
-STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Показати накази літака
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP                      :{BLACK}Показати літак в центрі екрану
-STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}Направити літак в ангар
-STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Показати літак детально
 
-STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}Назвати літак
-STR_ERROR_CAN_T_RENAME_AIRCRAFT                                 :{WHITE}Неможливо назвати...
-STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}Назвати літак
 STR_NEWS_FIRST_AIRCRAFT_ARRIVAL                                 :{BLACK}{BIGFONT}Жителі святкують . . .{}Перший літак з'явився на {STATION}!
 STR_NEWS_AIRCRAFT_CRASH                                         :{BLACK}{BIGFONT}{}{COMMA} загиблих в авіакатастрофі! Літак розбився біля {STATION}
 STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Авіакатастрофа!{}В літака закінчилось пальне, {COMMA} людей загинуло!
 STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
-STR_BUILD_VEHICLE_AIRCRAFT_RENAME_BUTTON                        :{BLACK}Зміна назви
-STR_BUILD_VEHICLE_AIRCRAFT_RENAME_TOOLTIP                       :{BLACK}Перейменувати тип літака
-STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION                          :{WHITE}Перейменувати тип літака
-STR_ERROR_CAN_T_RENAME_AIRCRAFT_TYPE                            :{WHITE}Неможливо перейменувати тип літака...
-STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Переобладнати літак для перевезення іншого виду вантажу
-STR_REFIT_AIRCRAFT_REFIT_BUTTON                                 :{BLACK}Переобладнати літак
-STR_REFIT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Виберіть вид вантажу для переобладнання
-STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}Переобладнати літак для перевезення вибраного виду вантажу
-STR_ERROR_CAN_T_REFIT_AIRCRAFT                                  :{WHITE}Неможливо переобладнати літак...
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (розклад)
 
@@ -3340,6 +3152,211 @@ STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING}
 STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}Спільні маршрути {COMMA} трансп.засоб{P у iв ів}
 STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Показати транспорт з таким самим маршрутом
 
+STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} чакає в депо
+STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} чакає в депо
+STR_NEWS_SHIP_IS_WAITING                                        :{WHITE}{VEHICLE} чакає в депо
+STR_NEWS_AIRCRAFT_IS_WAITING                                    :{WHITE}{VEHICLE} чакає в ангарі
+
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Переобладнати
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Переобладнати авто
+STR_REFIT_SHIP_REFIT_BUTTON                                     :{BLACK}Переобладнати корабель
+STR_REFIT_AIRCRAFT_REFIT_BUTTON                                 :{BLACK}Переобладнати літак
+
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Переобладнати поїзд для перевезення вибраного виду вантажу
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Переобладнати авто для перевезення вибраного вантажу
+STR_REFIT_SHIP_REFIT_TOOLTIP                                    :{BLACK}Переобладнати корабель для перевезення вибраного виду вантажу
+STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}Переобладнати літак для перевезення вибраного виду вантажу
+
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Виберіть вид вантажу для перевезення
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Оберіть тип вантажу для перевезення
+STR_REFIT_SHIP_LIST_TOOLTIP                                     :{BLACK}Виберіть вид вантажу для переобладнання
+STR_REFIT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Виберіть вид вантажу для переобладнання
+
+STR_DEPOT_TRAIN_CAPTION                                         :{WHITE}{TOWN} Залізничне депо
+STR_DEPOT_ROAD_VEHICLE_CAPTION                                  :{WHITE}{TOWN} Гараж
+STR_DEPOT_SHIP_CAPTION                                          :{WHITE}{TOWN} Док
+STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}{STATION} ангар
+
+STR_VEHICLE_DETAILS_TRAIN_RENAME                                :{BLACK}Назвати поїзд
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Назвати авто
+STR_VEHICLE_DETAILS_SHIP_RENAME                                 :{BLACK}Назвати корабель
+STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}Назвати літак
+
+STR_QUERY_RENAME_TRAIN_CAPTION                                  :{WHITE}Назвати поїзд
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Назвати авто
+STR_QUERY_RENAME_SHIP_CAPTION                                   :{WHITE}Назвати корабель
+STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}Назвати літак
+
+STR_ERROR_TRAIN_IN_THE_WAY                                      :{WHITE}Поїзд на шляху
+STR_ERROR_ROAD_VEHICLE_IN_THE_WAY                               :{WHITE}На шляху авто
+STR_ERROR_SHIP_IN_THE_WAY                                       :{WHITE}Корабель на шляху
+STR_ERROR_AIRCRAFT_IN_THE_WAY                                   :{WHITE}Літак на шляху
+
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Неможливо переобладнати поїзд...
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Неможливо переобладнати авто
+STR_ERROR_CAN_T_REFIT_SHIP                                      :{WHITE}Неможливо переобладнати корабель...
+STR_ERROR_CAN_T_REFIT_AIRCRAFT                                  :{WHITE}Неможливо переобладнати літак...
+
+STR_ERROR_CAN_T_RENAME_TRAIN                                    :{WHITE}Неможливо назвати поїзд...
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Неможливо назвати авто...
+STR_ERROR_CAN_T_RENAME_SHIP                                     :{WHITE}Неможливо назвати корабель...
+STR_ERROR_CAN_T_RENAME_AIRCRAFT                                 :{WHITE}Неможливо назвати...
+
+STR_ERROR_CAN_T_STOP_START_TRAIN                                :{WHITE}Не можна зупинити/стартувати поїзд...
+STR_ERROR_CAN_T_STOP_START_ROAD_VEHICLE                         :{WHITE}Неможливо зупинити авто...
+STR_ERROR_CAN_T_STOP_START_SHIP                                 :{WHITE}Неможливо зупинити корабель...
+STR_ERROR_CAN_T_STOP_START_AIRCRAFT                             :{WHITE}Неможливо зупинити літак...
+
+STR_ERROR_CAN_T_SEND_TRAIN_TO_DEPOT                             :{WHITE}Неможливо відправити поїзд в депо...
+STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Неможливо направити авто в депо...
+STR_ERROR_CAN_T_SEND_SHIP_TO_DEPOT                              :{WHITE}Неможливо направити корабель в депо...
+STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR                         :{WHITE}Неможливо направити літак до ангару...
+
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Неможливо збудувати поїзд...
+STR_ERROR_CAN_T_BUILD_ROAD_VEHICLE                              :{WHITE}Неможливо будувати авто...
+STR_ERROR_CAN_T_BUILD_SHIP                                      :{WHITE}Неможливо будувати корабель...
+STR_ERROR_CAN_T_BUILD_AIRCRAFT                                  :{WHITE}Неможливо будувати літак...
+
+STR_ERROR_CAN_T_RENAME_TRAIN_TYPE                               :{WHITE}Неможливо перейменувати тип поїзду...
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Неможливо перейменувати тип авто...
+STR_ERROR_CAN_T_RENAME_SHIP_TYPE                                :{WHITE}Неможливо перейменувати тип корабля...
+STR_ERROR_CAN_T_RENAME_AIRCRAFT_TYPE                            :{WHITE}Неможливо перейменувати тип літака...
+
+STR_ERROR_CAN_T_SELL_TRAIN                                      :{WHITE}Не можна продати поїзд...
+STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}Неможливо продати авто...
+STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}Неможливо продати корабель...
+STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}Неможливо продати літак...
+
+STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP                 :{BLACK}Діяльність поїзда - клікніть тут для його запуску/зупинення
+STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP          :{BLACK}Показує, яку дію виконує авто - натисніть для руху/зупинки авто
+STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP                  :{BLACK}Показує, яку дію виконує корабель - натисніть для руху/зупинки корабля
+STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP              :{BLACK}Показує, яку дію виконує літак - натисніть для руху/зупинки літака
+
+STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP                           :{BLACK}Показати маршрут поїзда
+STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP                    :{BLACK}Показати накази авто
+STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Показати накази корабля
+STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Показати накази літака
+
+STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP                         :{BLACK}Показати поїзд в центрі головного екрану
+STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP                  :{BLACK}Показати авто в центрі екрану
+STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP                          :{BLACK}Показати корабель в центрі екрану
+STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP                      :{BLACK}Показати літак в центрі екрану
+
+STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP                    :{BLACK}Направити поїзд у депо
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}Направити авто в депо
+STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}Направити корабель в депо
+STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}Направити літак в ангар
+
+STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Показати детальну інформацію
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Показати авто детально
+STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Показати корабель детально
+STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Показати літак детально
+
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Переобладнати поїзд для перевезення іншого виду вантажу
+STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Переобладнати авто для перевезення інших вантажів
+STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}Переобладнати корабель для перевезення іншого виду вантажу
+STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Переобладнати літак для перевезення іншого виду вантажу
+
+STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Прямує до {TOWN} депо
+STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Прямує до {TOWN} депо, {VELOCITY}
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Прямує до {TOWN} дорожного депо
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Прямує до {TOWN} дорожного депо, {VELOCITY}
+STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Прямує до {TOWN} корабельного депо
+STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Прямує до {TOWN} корабельного депо, {VELOCITY}
+STR_HEADING_FOR_HANGAR                                          :{ORANGE}Летить до {STATION} ангару
+STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Летить до {STATION} ангару, {VELOCITY}
+
+STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Техогляд в {TOWN} депо
+STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Техогляд в {TOWN} депо, {VELOCITY}
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Техогляд в  {TOWN} дорожному депо
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Техогляд в  {TOWN} дорожному депо, {VELOCITY}
+STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Техогляд в {TOWN} корабельному депо
+STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Техогляд в {TOWN} корабельному депо, {VELOCITY}
+STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Техогляд в {STATION} ангарі
+STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Техогляд в {STATION} ангарі, {VELOCITY}
+
+
+STR_CLONE_TRAIN                                                 :{BLACK}Клонувати
+STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Клонувати
+STR_CLONE_SHIP                                                  :{BLACK}Клонувати
+STR_CLONE_AIRCRAFT                                              :{BLACK}Клонувати
+
+STR_CLONE_TRAIN_INFO                                            :{BLACK}Будувати копію поїзда з усіма вагонами. Утримуйте Ctrl для спільного завдання
+STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Будувати копію авто. Утримуйте Ctrl для спільного завдання
+STR_CLONE_SHIP_INFO                                             :{BLACK}Будувати копію корабля. Утримуйте Ctrl для спільного завдання
+STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Будувати копію літака. Утримуйте Ctrl для спільного завдання
+
+STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Будувати копію поїзда з усіма вагонами. Натисніть на цю кнопку і потім на поїзд в депо або ззовні. Утримуйте Ctrl для спільного завдання
+STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Будувати копію авто. Натисніть на цю кнопку і потім на авто в депо або ззовні. Утримуйте Ctrl для спільного завдання
+STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Будувати копію корабля. Натисніть на цю кнопку, і потім на корабель в депо або ззовні. Утримуйте Ctrl для спільного завдання
+STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Будувати копію літака. Натисніть на цю кнопку і потім на літак в ангарі або ззовні. Утримуйте Ctrl для спільного завдання
+
+STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}Новий залізничний транспорт
+STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}Новий електрозалізничний транспорт
+STR_BUILD_VEHICLE_TRAIN_MONORAIL_CAPTION                        :{WHITE}Новий монорельсовий транспорт
+STR_BUILD_VEHICLE_TRAIN_MAGLEV_CAPTION                          :{WHITE}Новий транспорт на магнітній подушці
+
+STR_BUILD_VEHICLE_TRAIN_ALL_CAPTION                             :{WHITE}Потяги
+STR_BUILD_VEHICLE_ROAD_VEHICLE_CAPTION                          :{WHITE}Нове авто
+STR_BUILD_VEHICLE_SHIP_CAPTION                                  :{WHITE}Нові кораблі
+STR_BUILD_VEHICLE_AIRCRAFT_CAPTION                              :{WHITE}Нові літаки
+
+STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_BUTTON                    :{BLACK}Будувати
+STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_BUTTON             :{BLACK}Будувати
+STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON                     :{BLACK}Будувати корабель
+STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON                 :{BLACK}Будувати
+
+STR_BUILD_VEHICLE_TRAIN_LIST_TOOLTIP                            :{BLACK}Список поїздів - клікніть на поїзді для інформації
+STR_BUILD_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP                     :{BLACK}Список авто - натисніть на авто для інформації
+STR_BUILD_VEHICLE_SHIP_LIST_TOOLTIP                             :{BLACK}Список вибору кораблів - натисніть на корабель для інформації
+STR_BUILD_VEHICLE_AIRCRAFT_LIST_TOOLTIP                         :{BLACK}Список вибору літаків - натисніть на літак для інформації
+
+STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_TOOLTIP                   :{BLACK}Будувати вибраний поїзд
+STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_TOOLTIP            :{BLACK}Будувати вибране авто
+STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP                    :{BLACK}Будувати вибраний корабель
+STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_TOOLTIP                :{BLACK}Будувати вибраний літак
+
+STR_BUILD_VEHICLE_TRAIN_RENAME_BUTTON                           :{BLACK}Назва
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Зміна назви
+STR_BUILD_VEHICLE_SHIP_RENAME_BUTTON                            :{BLACK}Зміна назви
+STR_BUILD_VEHICLE_AIRCRAFT_RENAME_BUTTON                        :{BLACK}Зміна назви
+
+STR_BUILD_VEHICLE_TRAIN_RENAME_TOOLTIP                          :{BLACK}Перейменуйте тип транспорту
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Перейменувати тип авто
+STR_BUILD_VEHICLE_SHIP_RENAME_TOOLTIP                           :{BLACK}Перейменувати тип корабля
+STR_BUILD_VEHICLE_AIRCRAFT_RENAME_TOOLTIP                       :{BLACK}Перейменувати тип літака
+
+STR_QUERY_RENAME_TRAIN_TYPE_CAPTION                             :{WHITE}Перейменувати тип поїзду
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Перейменувати тип авто
+STR_QUERY_RENAME_SHIP_TYPE_CAPTION                              :{WHITE}Перейменувати тип корабля
+STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION                          :{WHITE}Перейменувати тип літака
+
+STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Новий транспорт
+STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_BUTTON                      :{BLACK}Новий транспорт
+STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON                              :{BLACK}Нові кораблі
+STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON                          :{BLACK}Новий літак
+
+STR_DEPOT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Поїзди - клікніть на поїзді для інформації, перетягніть для додавання/вилучення
+STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Авто - натисніть на авто для інформації
+STR_DEPOT_SHIP_LIST_TOOLTIP                                     :{BLACK}Кораблі - натисніть для інформації
+STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Літаки - натисніть на літак для інформації
+
+STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP                            :{BLACK}Будувати новий поїзд
+STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}Будувати новий автомобіль
+STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}Будувати корабель
+STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}Будувати літак
+
+STR_DEPOT_TRAIN_SELL_TOOLTIP                                    :{BLACK}Перетягніть поїзд сюди, щоб продати його
+STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}Перетягніть автомобіль сюди, щоб продати
+STR_DEPOT_SHIP_SELL_TOOLTIP                                     :{BLACK}Перетягніть корабель сюди, щоб продати
+STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}Перетягніть літак сюди, щоб продати
+
+STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}Показати депо в центрі головного екрану
+STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}Показати автомобільне депо в центрі екрану
+STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}Показати депо в центрі екрану
+STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Показати ангар в центрі екрану
+
+
 ### depot strings
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}Ви впевнені, що хочете продати усі машини в депо?
 STR_DEPOT_WRONG_DEPOT_TYPE                                      :Неправильний тип депо
@@ -3374,6 +3391,7 @@ STR_REPLACE_REMOVE_WAGON                                        :{BLACK}Прод
 STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Дозволити автооновленню видаляти вагони, зберігаючи довжину потягу (починаючи спереду), якщо оновлення робить поїзд довшим.
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}Оновлення: {ORANGE}{SKIP}{SKIP}{STRING}
 STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}Переключення між вікнами заміни потягів та вагонів.
+
 STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Поїзд недоступний
 STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Автомобіль недоступний
 STR_SHIP_NOT_AVAILABLE                                          :{WHITE}Корабель недоступний
@@ -3588,7 +3606,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}
@@ -3606,6 +3627,31 @@ STR_FORMAT_COMPANY_NUM                                          :(Компані
 STR_FORMAT_GROUP_NAME                                           :Група {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}Назва має бути унікальною
 
 #### Improved sign GUI
diff --git a/src/lang/unfinished/frisian.txt b/src/lang/unfinished/frisian.txt
index c33ab5080..38045a8bf 100644
--- a/src/lang/unfinished/frisian.txt
+++ b/src/lang/unfinished/frisian.txt
@@ -101,8 +101,6 @@ STR_QUANTITY_FOOD                                               :{WEIGHT} ton it
 STR_QUANTITY_PAPER                                              :{WEIGHT} ton papier
 STR_QUANTITY_GOLD                                               :{COMMA} sekken goud
 STR_QUANTITY_WATER                                              :{VOLUME} wetter
-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
@@ -113,17 +111,11 @@ STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Orizjine
 STR_ABOUT_VERSION                                               :{BLACK}OpenTTD fersje {REV}
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 It OpenTTD team
 
-STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
-STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_QUIT_CAPTION                                                :{WHITE}Ofslúte
 STR_YES                                                         :{BLACK}Ja
 STR_NO                                                          :{BLACK}Nee
 STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Witte jo seker dat jo dit spul ôfslúte wolle en werom gean wolle nei {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                                                :Neat
 STR_COLOUR_DARK_BLUE                                            :Tsjuster Blauw
 STR_COLOUR_PALE_GREEN                                           :Fel Grien
@@ -142,8 +134,6 @@ STR_COLOUR_BROWN                                                :Brún
 STR_COLOUR_GREY                                                 :Griis
 STR_COLOUR_WHITE                                                :Wyt
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}Te folle fartugen yn it spul
-STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
-STR_RED_COMMA                                                   :{RED}{COMMA}
 STR_BUTTON_LOCATION                                             :{BLACK}Lokaasje
 STR_SMALLMAP_TYPE_CONTOURS                                      :Kontoeren
 STR_SMALLMAP_TYPE_VEHICLES                                      :Reauen
@@ -233,26 +223,15 @@ STR_FILE_MENU_QUIT_GAME                                         :Spul ferlitte
 STR_FILE_MENU_EXIT                                              :Ofslúte
 STR_ABANDON_GAME_CAPTION                                        :{WHITE}Ferlit Spul
 
+### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
+
+STR_SEND_FOR_SERVICING                                          :Stjoer foar ûnderhâldsbeurt
+
+
 STR_SEND_TRAIN_TO_DEPOT                                         :Stjoer nei depot
 STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Stjoer nei depot
 STR_SEND_SHIP_TO_DEPOT                                          :Stjoer nei depot
 STR_SEND_AIRCRAFT_TO_HANGAR                                     :Stjoer nei hangaar
-STR_SEND_FOR_SERVICING                                          :Stjoer foar ûnderhâldsbeurt
-
-############ range for months starts
-STR_MONTH_ABBREV_JAN                                            :Jan
-STR_MONTH_ABBREV_FEB                                            :Feb
-STR_MONTH_ABBREV_MAR                                            :Mrt
-STR_MONTH_ABBREV_APR                                            :Apr
-STR_MONTH_ABBREV_MAY                                            :Mai
-STR_MONTH_ABBREV_JUN                                            :Jun
-STR_MONTH_ABBREV_JUL                                            :Jul
-STR_MONTH_ABBREV_AUG                                            :Aug
-STR_MONTH_ABBREV_SEP                                            :Sep
-STR_MONTH_ABBREV_OCT                                            :Okt
-STR_MONTH_ABBREV_NOV                                            :Nov
-STR_MONTH_ABBREV_DEC                                            :Des
-############ range for months ends
 
 STR_GRAPH_X_LABEL_MONTH                                         :{TINYFONT}{STRING}{} {STRING}
 STR_GRAPH_X_LABEL_MONTH_YEAR                                    :{TINYFONT}{STRING}{} {STRING}{}{NUM}
@@ -280,8 +259,6 @@ 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_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
@@ -328,7 +305,7 @@ STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Neat
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Namme
 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                                          :1
 STR_ORDINAL_NUMBER_2ND                                          :2
 STR_ORDINAL_NUMBER_3RD                                          :3
@@ -362,6 +339,22 @@ STR_ORDINAL_NUMBER_30TH                                         :30
 STR_ORDINAL_NUMBER_31ST                                         :31
 ############ range for days ends
 
+############ range for months starts
+STR_MONTH_ABBREV_JAN                                            :Jan
+STR_MONTH_ABBREV_FEB                                            :Feb
+STR_MONTH_ABBREV_MAR                                            :Mrt
+STR_MONTH_ABBREV_APR                                            :Apr
+STR_MONTH_ABBREV_MAY                                            :Mai
+STR_MONTH_ABBREV_JUN                                            :Jun
+STR_MONTH_ABBREV_JUL                                            :Jul
+STR_MONTH_ABBREV_AUG                                            :Aug
+STR_MONTH_ABBREV_SEP                                            :Sep
+STR_MONTH_ABBREV_OCT                                            :Okt
+STR_MONTH_ABBREV_NOV                                            :Nov
+STR_MONTH_ABBREV_DEC                                            :Des
+
+############ range for months ends
+
 STR_GRAPH_Y_LABEL_NUMBER                                        :{TINYFONT}{COMMA}
 
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}Akseptearre fracht: {LTBLUE}
@@ -451,12 +444,9 @@ 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_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_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
@@ -534,7 +524,6 @@ STR_SELECT_LAYOUT_RANDOM                                        :{BLACK}Samar
 STR_NEWS_MESSAGE                                                :{STRING}  -  {STRING}
 STR_STATUSBAR_TOOLTIP_SHOW_LAST_NEWS                            :{BLACK}Lit lêste (neis)berjocht sjen
 STR_STATUSBAR_COMPANY_NAME                                      :{SILVER}- -  {COMPANY}  - -
-STR_BLACK_STRING                                                :{BLACK}{STRING}
 
 ############ range for menu starts
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Spul Opsjes
@@ -618,9 +607,6 @@ 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_BLACK_6                                                     :{BLACK}6
-STR_BLACK_7                                                     :{BLACK}7
-
 ############ start of townname region
 ############ end of townname region
 
@@ -636,8 +622,6 @@ STR_BLACK_7                                                     :{BLACK}7
 
 
 
-
-
 # Start of order review system.
 # DON'T ADD OR REMOVE LINES HERE
 # end of order system
@@ -902,7 +886,6 @@ STR_TOWN_BUILDING_NAME_TEPEES_1                                 :Tipi's
 STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1                           :Teepothûs
 STR_TOWN_BUILDING_NAME_PIGGY_BANK_1                             :Sparbaarch
 
-
 ##id 0x2800
 STR_LANDSCAPING_MENU_PLANT_TREES                                :Plantsje beammen
 STR_LANDSCAPING_MENU_PLACE_SIGN                                 :Set buordsje del
@@ -949,6 +932,8 @@ STR_CARGO_RATING_GOOD                                           :Goed
 STR_CARGO_RATING_VERY_GOOD                                      :Hiel Goed
 ############ range for rating ends
 
+### station view strings
+
 STR_STATION_VIEW_CARGO_RATING                                   :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO                        :{WHITE}{STATION} akseptearret gjin {STRING} mear
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO               :{WHITE}{STATION} akseptearret gjin {STRING} en {STRING} mear
@@ -1106,6 +1091,7 @@ STR_ERROR_YOU_ALREADY_OWN_IT                                    :{WHITE}...it is
 ############ These strings may never get a new id, or savegames will break!
 ##id 0x6000
 
+##id 0x6020
 
 ############ end of savegame specific region!
 
@@ -1142,8 +1128,6 @@ STR_NUM_LOW                                                     :Leech
 STR_NUM_NORMAL                                                  :Gewoan
 STR_NUM_HIGH                                                    :Heech
 STR_NUM_CUSTOM                                                  :Oars
-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
@@ -1173,7 +1157,6 @@ STR_DIFFICULTY_LEVEL_HIGH_SCORE_BUTTON                          :{BLACK}Lit hi-s
 
 ##id 0x7000
 STR_COMPANY_VIEW_CAPTION                                        :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
-STR_FORMAT_COMPANY_NUM                                          :(Bedriuw {COMMA})
 STR_COMPANY_VIEW_NEW_FACE_BUTTON                                :{BLACK}Nei Gesicht
 STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON                           :{BLACK}Kleurenskema
 STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}Kleurenskema:
@@ -1205,7 +1188,6 @@ STR_FINANCES_POSITIVE_INCOME                                    :{BLACK}+{CURREN
 STR_FINANCES_TOTAL_CAPTION                                      :{WHITE}Totaal:
 STR_COMPANY_NAME_COMPANY_NUM                                    :{COMPANY} {COMPANYNUM}
 STR_GRAPH_INCOME_CAPTION                                        :{WHITE}Ynkomstengrafyk
-STR_JUST_COMMA                                                  :{COMMA}
 STR_GRAPH_OPERATING_PROFIT_CAPTION                              :{WHITE}Winstgrafyk
 STR_FINANCES_BANK_BALANCE_TITLE                                 :{WHITE}Jild
 STR_FINANCES_LOAN_TITLE                                         :{WHITE}Liening
@@ -1422,8 +1404,6 @@ STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_PLASTIC_TRUCK               :Plestikwein
 
 
 
-
-
 ##id 0x9000
 
 
@@ -1454,6 +1434,48 @@ STR_PERFORMANCE_DETAIL_INT                                      :{BLACK}{NUM}
 
 
 
+############ Vehicle lists
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -1492,18 +1514,44 @@ STR_PERFORMANCE_DETAIL_INT                                      :{BLACK}{NUM}
 ############ Tooltip measurment
 
 
-############ Date formatting
 
-########
 
 
+##### Mass Order
 
 
-##### Mass Order
 
 
+#### String control codes and their formatting
+
+STR_JUST_COMMA                                                  :{COMMA}
+
+
+STR_FORMAT_COMPANY_NUM                                          :(Bedriuw {COMMA})
+
+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_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
 
 
 #### Improved sign GUI
diff --git a/src/lang/unfinished/greek.txt b/src/lang/unfinished/greek.txt
index 0f666e6e0..d68bc215a 100644
--- a/src/lang/unfinished/greek.txt
+++ b/src/lang/unfinished/greek.txt
@@ -155,8 +155,6 @@ STR_ABBREV_PLASTIC                                              :{TINYFONT}PL
 STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}FZ
 STR_ABBREV_NONE                                                 :{TINYFONT}NO
 STR_ABBREV_ALL                                                  :{TINYFONT}ALL
-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}Μήνυμα
@@ -168,17 +166,11 @@ STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Αρχι
 STR_ABOUT_VERSION                                               :{BLACK}OpenTTD έκδοση {REV}
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 Η ομάδα του OpenTTD
 
-STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
-STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_QUIT_CAPTION                                                :{WHITE}Έξοδος
 STR_YES                                                         :{BLACK}Ναι
 STR_NO                                                          :{BLACK}Όχι
 STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Είστε σίγουρος/η ότι θέλετε να παρατήσετε το παιχνίδι και να επιστρέψετε στο {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                                                :Τίποτα
 STR_COLOUR_DARK_BLUE                                            :Σκούρο Μπλε
 STR_COLOUR_PALE_GREEN                                           :Ανοικτό Πράσινο
@@ -197,8 +189,6 @@ STR_COLOUR_BROWN                                                :Καφέ
 STR_COLOUR_GREY                                                 :Γκρι
 STR_COLOUR_WHITE                                                :Λευκό
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}Πάρα πολλά οχήματα στο παιχνίδι
-STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
-STR_RED_COMMA                                                   :{RED}{COMMA}
 STR_BUTTON_LOCATION                                             :{BLACK}Τοποθεσία
 STR_SMALLMAP_TYPE_CONTOURS                                      :Περιγράμματα
 STR_SMALLMAP_TYPE_VEHICLES                                      :Οχήματα
@@ -324,12 +314,13 @@ STR_SORT_CRITERIA_TIP                                           :{BLACK}Επιλ
 STR_FILTER_CRITERIA_TIP                                         :{BLACK}Επιλέξτε κριτήρια φιλτραρίσματος
 STR_SORT_BY                                                     :{BLACK}Ταξινόμηση κατά
 
+### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}Πληθυσμός
+STR_SORT_BY_NAME                                                :{BLACK}Όνομα
+STR_SORT_BY_DATE                                                :{BLACK}Μέρα
 STR_SORT_BY_PRODUCTION                                          :Παραγωγή
 STR_SORT_BY_TYPE                                                :Τύπος
 STR_SORT_BY_TRANSPORTED                                         :Μεταφέρθηκαν
-STR_SORT_BY_NAME                                                :{BLACK}Όνομα
-STR_SORT_BY_DATE                                                :{BLACK}Μέρα
 STR_SORT_BY_NUMBER                                              :Αριθμός
 STR_SORT_BY_PROFIT_LAST_YEAR                                    :Κέρδος προηγούμενου χρόνου
 STR_SORT_BY_PROFIT_THIS_YEAR                                    :Κέρδος αυτού του χρόνου
@@ -352,37 +343,25 @@ STR_SORT_BY_INTRO_DATE                                          :Ημέρα Κυ
 STR_SORT_BY_RUNNING_COST                                        :Κόστος Συντήρησης
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :Δύναμη/Κόστος Συντήρησης
 STR_SORT_BY_CARGO_CAPACITY                                      :Χωρητικότητα Φορτίου
+
 STR_NO_WAITING_CARGO                                            :{BLACK}Κανένα εμπόρευμα κανενός τύπου δεν περιμένει
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}Επιλογή όλων των εγκαταστάσεων
 STR_SELECT_ALL_TYPES                                            :{BLACK}Επιλογή όλων των τύπων φορτίου (συμπεριλαμβανομένου φορτίου μη-αναμονής)
-STR_AVAILABLE_TRAINS                                            :{BLACK}Διαθέσιμα Τρένα
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Διαθέσιμα Οχήματα
-STR_AVAILABLE_SHIPS                                             :{BLACK}Διαθέσιμα Πλοία
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Διαθέσιμα Αεροσκάφη
 STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Προβολή λίστας διαθέσιμων σχεδίων μηχανών για τον τύπο οχήματος.
 STR_MANAGE_LIST                                                 :{BLACK}Διαχείριση λίστας
 STR_MANAGE_LIST_TIP                                             :{BLACK}Στείλε οδηγίες σε όλα τα οχήματα σε αυτή λίστα
 STR_REPLACE_VEHICLES                                            :Αντικατέστησε τα οχήματα
+STR_SEND_FOR_SERVICING                                          :Στείλε για επισκευή
+
+STR_AVAILABLE_TRAINS                                            :{BLACK}Διαθέσιμα Τρένα
+STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Διαθέσιμα Οχήματα
+STR_AVAILABLE_SHIPS                                             :{BLACK}Διαθέσιμα Πλοία
+STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Διαθέσιμα Αεροσκάφη
+
 STR_SEND_TRAIN_TO_DEPOT                                         :Στείλε στο υπόστεγο
 STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Στείλε στο υπόστεγο
 STR_SEND_SHIP_TO_DEPOT                                          :Στείλε στο υπόστεγο
 STR_SEND_AIRCRAFT_TO_HANGAR                                     :Στείλε στο υπόστεγο
-STR_SEND_FOR_SERVICING                                          :Στείλε για επισκευή
-
-############ range for months starts
-STR_MONTH_ABBREV_JAN                                            :Ιαν
-STR_MONTH_ABBREV_FEB                                            :Φεβ
-STR_MONTH_ABBREV_MAR                                            :Μαρ
-STR_MONTH_ABBREV_APR                                            :Απρ
-STR_MONTH_ABBREV_MAY                                            :Μαϊ
-STR_MONTH_ABBREV_JUN                                            :Ιουν
-STR_MONTH_ABBREV_JUL                                            :Ιουλ
-STR_MONTH_ABBREV_AUG                                            :Αυγ
-STR_MONTH_ABBREV_SEP                                            :Σεπ
-STR_MONTH_ABBREV_OCT                                            :Οκτ
-STR_MONTH_ABBREV_NOV                                            :Νοε
-STR_MONTH_ABBREV_DEC                                            :Δεκ
-############ range for months ends
 
 STR_GRAPH_X_LABEL_MONTH                                         :{TINYFONT}{STRING}{} {STRING}
 STR_GRAPH_X_LABEL_MONTH_YEAR                                    :{TINYFONT}{STRING}{} {STRING}{}{NUM}
@@ -410,8 +389,6 @@ 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_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}Τίτλος παραθύρου - σύρετε για να το μετακινήσετε
@@ -458,7 +435,7 @@ STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Κανένα
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Όνομα
 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                                          :1{G ος η ο}
 STR_ORDINAL_NUMBER_2ND                                          :2{G ος η ο}
 STR_ORDINAL_NUMBER_3RD                                          :3{G ος η ο}
@@ -492,6 +469,34 @@ STR_ORDINAL_NUMBER_30TH                                         :30{G ος η ο
 STR_ORDINAL_NUMBER_31ST                                         :31{G ος η ο}
 ############ range for days ends
 
+############ range for months starts
+STR_MONTH_ABBREV_JAN                                            :Ιαν
+STR_MONTH_ABBREV_FEB                                            :Φεβ
+STR_MONTH_ABBREV_MAR                                            :Μαρ
+STR_MONTH_ABBREV_APR                                            :Απρ
+STR_MONTH_ABBREV_MAY                                            :Μαϊ
+STR_MONTH_ABBREV_JUN                                            :Ιουν
+STR_MONTH_ABBREV_JUL                                            :Ιουλ
+STR_MONTH_ABBREV_AUG                                            :Αυγ
+STR_MONTH_ABBREV_SEP                                            :Σεπ
+STR_MONTH_ABBREV_OCT                                            :Οκτ
+STR_MONTH_ABBREV_NOV                                            :Νοε
+STR_MONTH_ABBREV_DEC                                            :Δεκ
+
+STR_MONTH_JAN                                                   :Ιανουάριος
+STR_MONTH_FEB                                                   :Φεβρουάριος
+STR_MONTH_MAR                                                   :Μάρτιος
+STR_MONTH_APR                                                   :Απρίλιος
+STR_MONTH_MAY                                                   :Μάιος
+STR_MONTH_JUN                                                   :Ιούνιος
+STR_MONTH_JUL                                                   :Ιούλιος
+STR_MONTH_AUG                                                   :Άυγουστος
+STR_MONTH_SEP                                                   :Σεπτέμβριος
+STR_MONTH_OCT                                                   :Οκτόβριος
+STR_MONTH_NOV                                                   :Νοέμβριος
+STR_MONTH_DEC                                                   :Δεκέμβριος
+############ range for months ends
+
 STR_GRAPH_Y_LABEL_NUMBER                                        :{TINYFONT}{COMMA}
 
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}Αποδεκτό Εμπόρευμα: {LTBLUE}
@@ -581,12 +586,9 @@ 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_COMMA                                                  :{BLUE}{COMMA}
 STR_SCENEDIT_TOOLBAR_OPENTTD                                    :{YELLOW}OpenTTD
 STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR                            :{YELLOW}Πρόγραμμα Επεξεργασίας Σεναρίου
 STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION                   :{WHITE}Δημιουργία Γης
-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}Δημιουργία τυχαίου εδάφους
@@ -668,9 +670,7 @@ STR_OFF                                                         :Κλειστό
 STR_SUMMARY                                                     :Περιγραφή
 STR_FULL                                                        :Ολόκληρο
 STR_STATUSBAR_COMPANY_NAME                                      :{SILVER}- -  {COMPANY}  - -
-STR_BLACK_STRING                                                :{BLACK}{STRING}
 
-STR_JUST_CHECKMARK                                              :{CHECKMARK}
 ############ range for menu starts
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Επιλογές παιχνιδιού
 STR_SETTINGS_MENU_DIFFICULTY_SETTINGS                           :Ρυθμίσεις δυσκολίας
@@ -762,9 +762,6 @@ STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY                             :Χρηματο�
 ############ range ends here
 
 STR_FUND_INDUSTRY_CAPTION                                       :{WHITE}Χρηματοδότηση νέας βιομηχανίας
-STR_JUST_STRING                                                 :{STRING}
-STR_JUST_RAW_STRING                                             :{STRING}
-STR_JUST_INT                                                    :{NUM}
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_RAINFOREST                       :{WHITE}...μπορεί να χτιστεί μόνο σε δασώδεις περιοχές
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT                           :{WHITE}...μπορεί να χτιστεί μόνο σε ερημικές περιοχές
 STR_STATUSBAR_PAUSED                                            :{YELLOW}* *  ΠΑΥΣΗ  *  *
@@ -778,9 +775,6 @@ STR_STATUSBAR_SAVING_GAME                                       :{RED}*  *  ΑΠ
 STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Η αποθήκευση είναι σε εξέλιξη,{}παρακαλώ περιμένετε να τελειώσει!
 STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE                       :{BLACK}Επιλογή προγράμματος 'Ezy Street στυλ μουσικής'
 
-STR_BLACK_6                                                     :{BLACK}6
-STR_BLACK_7                                                     :{BLACK}7
-
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Αγγλικά (Αυθεντικά)
 STR_TOWNNAME_FRENCH                                             :Γαλλικά
@@ -860,19 +854,6 @@ STR_OPTIONS_BASE_GRF_DESCRIPTION_TIP                            :{BLACK}Επιπ
 
 STR_AUTOSAVE_FAILED                                             :{WHITE}Το αυτόματο σώσιμο απέτυχε
 
-STR_MONTH_JAN                                                   :Ιανουάριος
-STR_MONTH_FEB                                                   :Φεβρουάριος
-STR_MONTH_MAR                                                   :Μάρτιος
-STR_MONTH_APR                                                   :Απρίλιος
-STR_MONTH_MAY                                                   :Μάιος
-STR_MONTH_JUN                                                   :Ιούνιος
-STR_MONTH_JUL                                                   :Ιούλιος
-STR_MONTH_AUG                                                   :Άυγουστος
-STR_MONTH_SEP                                                   :Σεπτέμβριος
-STR_MONTH_OCT                                                   :Οκτόβριος
-STR_MONTH_NOV                                                   :Νοέμβριος
-STR_MONTH_DEC                                                   :Δεκέμβριος
-
 STR_HEADING_FOR_STATION                                         :{LTBLUE}Πάει προς {STATION}
 STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}Πάει προς {STATION}, {VELOCITY}
 STR_NO_ORDERS                                                   :{LTBLUE}Δεν έχει οδηγίες
@@ -887,8 +868,6 @@ STR_CRATES                                                      :Κουτιά
 STR_RES_OTHER                                                   :άλλα
 STR_NOTHING                                                     :
 
-STR_TINY_RIGHT_ARROW                                            :{TINYFONT}{RIGHTARROW}
-
 STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}Αδύνατο να μοιραστεί η λίστα εντολών...
 STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Αδύνατο να αντιγραφεί η λίστα εντολών...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Τέλος Μοιρασμένων Οδηγιών - -
@@ -1145,7 +1124,6 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Y-μέ�
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :απενεργοποιημένο
-STR_JUST_CURRENCY                                               :{CURRENCY}
 STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Αλλαγή τιμής ρύθμισης
 
 STR_TEMPERATE_LANDSCAPE                                         :Συγκρατημένο τοπίο
@@ -1181,7 +1159,6 @@ STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}Επιλ
 
 STR_WAYPOINT_VIEWPORT                                           :{WHITE}{WAYPOINT}
 STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WHITE}{WAYPOINT}
-STR_WAYPOINT_NAME                                               :{WAYPOINT}
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Διαμόρφωση ονόματος σημείου πορείας
 
 STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}Αδύνατο να αλλαχτεί το όνομα του σημείου πορείας...
@@ -1243,11 +1220,6 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Ονόμ
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...πολύ κοντά σε άλλη βιομηχανία
 
-STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Αναπροσαρμογή τρένου για μεταφορά διαφορετικού φορτίου
-STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Αναπροσαρμογή τρένου
-STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Επιλογή τύπου φορτίου για να μεταφέρει το τρένο
-STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Διασκευή του τρένου ώστε να μεταφέρει το επιλεγμένο φορτίο
-STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Δεν γίνεται να αναπροσαρμοστεί το τρένο...
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Αλλαγή παραγωγής
 
 ############ network gui strings
@@ -1610,7 +1582,6 @@ STR_TOWN_BUILDING_NAME_TEPEES_1                                 :Σκηνές ι
 STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1                           :Σπίτι-Καφετιέρα
 STR_TOWN_BUILDING_NAME_PIGGY_BANK_1                             :Τράπεζα-κουμπαράς
 
-
 ##id 0x2800
 STR_LANDSCAPING_MENU_PLANT_TREES                                :Φύτευση δέντρων
 STR_LANDSCAPING_MENU_PLACE_SIGN                                 :Τοποθέτηση σηματοδότη
@@ -1663,6 +1634,8 @@ STR_CARGO_RATING_EXCELLENT                                      :Εξαιρετ�
 STR_CARGO_RATING_OUTSTANDING                                    :Καταπληκτική
 ############ range for rating ends
 
+### station view strings
+
 STR_STATION_VIEW_CARGO_RATING                                   :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO                        :{WHITE}Ο σταθμός {STATION} δεν δέχεται πια {STRING}
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO               :{WHITE}Ο σταθμός {STATION} δεν δέχεται πια {STRING} ούτε {STRING}
@@ -1854,6 +1827,7 @@ STR_ERROR_YOU_ALREADY_OWN_IT                                    :{WHITE}...εί�
 ############ These strings may never get a new id, or savegames will break!
 ##id 0x6000
 
+##id 0x6020
 STR_SV_STNAME_UPPER                                             :Άνω {STRING}
 STR_SV_STNAME_LOWER                                             :Κάτω {STRING}
 STR_SV_STNAME_HELIPORT                                          :{STRING} Ελικοδρόμιο
@@ -1897,8 +1871,6 @@ STR_NUM_LOW                                                     :Χαμηλό
 STR_NUM_NORMAL                                                  :Κανονικό
 STR_NUM_HIGH                                                    :Υψηλό
 STR_NUM_CUSTOM                                                  :Προσαρμοσμέν{G ος η ο}
-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                                             :Μέτριο
@@ -1931,7 +1903,6 @@ STR_CITY_APPROVAL_HOSTILE                                       :Εχθρικό
 
 ##id 0x7000
 STR_COMPANY_VIEW_CAPTION                                        :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
-STR_FORMAT_COMPANY_NUM                                          :(Εταιρία {COMMA})
 STR_COMPANY_VIEW_NEW_FACE_BUTTON                                :{BLACK}Νέο Πρόσωπο
 STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON                           :{BLACK}Χρωματισμός
 STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}Χρωματισμός:
@@ -1964,7 +1935,6 @@ STR_FINANCES_TOTAL_CAPTION                                      :{WHITE}Σύνο
 STR_COMPANY_NAME_COMPANY_NUM                                    :{COMPANY} {COMPANYNUM}
 STR_GRAPH_INCOME_CAPTION                                        :{WHITE}Γράφημα Εισοδήματος
 STR_CURRCOMPACT                                                 :{CURRCOMPACT}
-STR_JUST_COMMA                                                  :{COMMA}
 STR_GRAPH_OPERATING_PROFIT_CAPTION                              :{WHITE}Γράφημα Ενεργών Εσόδων
 STR_FINANCES_BANK_BALANCE_TITLE                                 :{WHITE}Ισολογισμός Τραπέζης
 STR_FINANCES_LOAN_TITLE                                         :{WHITE}Δάνειο
@@ -2166,8 +2136,6 @@ STR_VEHICLE_NAME_TRAIN_ENGINE_MONORAIL_WIZZOWOW_Z99             :Wizzowow Z99
 
 
 
-
-
 STR_ERROR_CAN_T_COPY_SHARE_ORDER                                :{WHITE}το όχημα δε μπορεί να πάει σε όλους τους σταθμούς
 STR_ERROR_CAN_T_ADD_ORDER                                       :{WHITE}Το όχημα δεν μπορεί να πάει σε αυτό τον σταθμό
 STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE}όχημα που μοιράζεται αυτή την εντολή δεν μπορεί να πάει σε αυτό τον σταθμό
@@ -2236,6 +2204,53 @@ STR_TOOLTIP_SET_CUSTOM_CURRENCY_TO_EURO                         :{BLACK}Θέστ
 STR_TOOLTIP_CUSTOM_CURRENCY_PREVIEW                             :{BLACK}10000 Λίρες (£) στο νόμισμά σας
 
 
+############ Vehicle lists
+
+
+
+
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Αναπροσαρμογή τρένου
+
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Διασκευή του τρένου ώστε να μεταφέρει το επιλεγμένο φορτίο
+
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Επιλογή τύπου φορτίου για να μεταφέρει το τρένο
+
+
+
+
+
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Δεν γίνεται να αναπροσαρμοστεί το τρένο...
+
+
+
+
+
+
+
+
+
+
+
+
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Αναπροσαρμογή τρένου για μεταφορά διαφορετικού φορτίου
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -2275,18 +2290,51 @@ STR_AIRCRAFT_NOT_AVAILABLE                                      :{WHITE}Αερο
 ############ Tooltip measurment
 
 
-############ Date formatting
 
-########
 
 
+##### Mass Order
+
 
 
-##### Mass Order
 
+#### String control codes and their formatting
+STR_WAYPOINT_NAME                                               :{WAYPOINT}
+
+STR_JUST_CHECKMARK                                              :{CHECKMARK}
+STR_JUST_COMMA                                                  :{COMMA}
+STR_JUST_CURRENCY                                               :{CURRENCY}
+STR_JUST_INT                                                    :{NUM}
+STR_JUST_STRING                                                 :{STRING}
+STR_JUST_RAW_STRING                                             :{STRING}
 
 
+STR_FORMAT_COMPANY_NUM                                          :(Εταιρία {COMMA})
 
+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
 
 
 #### Improved sign GUI
diff --git a/src/lang/unfinished/ido.txt b/src/lang/unfinished/ido.txt
index 3a2c09714..cc85c19dc 100644
--- a/src/lang/unfinished/ido.txt
+++ b/src/lang/unfinished/ido.txt
@@ -81,8 +81,6 @@ STR_CARGO_SINGULAR_TOFFEE                                       :Karamelo
 STR_CARGO_SINGULAR_BATTERY                                      :Baterio
 STR_CARGO_SINGULAR_PLASTIC                                      :Plastiko
 STR_CARGO_SINGULAR_FIZZY_DRINK                                  :Gasoza Drinkajo
-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
@@ -92,17 +90,11 @@ STR_ERROR_CAN_T_CLEAR_THIS_AREA                                 :{WHITE}Ne povas
 STR_ABOUT_VERSION                                               :{BLACK}OpenTTD versiono {REV}
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 La kruo OpenTTD
 
-STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
-STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_QUIT_CAPTION                                                :{WHITE}Livas
 STR_YES                                                         :{BLACK}Yes
 STR_NO                                                          :{BLACK}Ne
 STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Kad tu esas certa ke tu volas livar OpenTTD ed rivenar a {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                                                :Nulo
 STR_COLOUR_DARK_BLUE                                            :Obskur-blua
 STR_COLOUR_PALE_GREEN                                           :Pal-verda
@@ -121,8 +113,6 @@ STR_COLOUR_BROWN                                                :Bruna
 STR_COLOUR_GREY                                                 :Griza
 STR_COLOUR_WHITE                                                :Blanka
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}Tro multa vehili en la ludo
-STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
-STR_RED_COMMA                                                   :{RED}{COMMA}
 STR_BUTTON_LOCATION                                             :{BLACK}Loko
 STR_SMALLMAP_TYPE_CONTOURS                                      :Konturi
 STR_SMALLMAP_TYPE_VEHICLES                                      :Vehili
@@ -194,9 +184,10 @@ STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH                            :Livrita kargajo
 ############ range for menu ends
 
 
+### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
+
+
 
-############ range for months starts
-############ range for months ends
 
 STR_SMALLMAP_TOOLTIP_SHOW_TRANSPORT_ROUTES_ON                   :{BLACK}Montrar transport-voyi ad la mapo
 STR_SMALLMAP_TOOLTIP_SHOW_VEGETATION_ON_MAP                     :{BLACK}Montrar vejetado ad la mapo
@@ -212,9 +203,13 @@ STR_VEHICLE_ROAD_VEHICLE                                        :Voy-vehili
 STR_VEHICLE_SHIP                                                :Bateli
 STR_VEHICLE_AIRCRAFT                                            :Aeroplani
 
-############ range for days starts
+############ range for days starts (also used for the place in the highscore window)
 ############ range for days ends
 
+############ range for months starts
+
+############ range for months ends
+
 
 
 
@@ -239,7 +234,6 @@ STR_VEHICLE_AIRCRAFT                                            :Aeroplani
 
 
 
-
 ############ start of townname region
 ############ end of townname region
 
@@ -255,8 +249,6 @@ STR_VEHICLE_AIRCRAFT                                            :Aeroplani
 
 
 
-
-
 # Start of order review system.
 # DON'T ADD OR REMOVE LINES HERE
 # end of order system
@@ -367,7 +359,6 @@ STR_VEHICLE_AIRCRAFT                                            :Aeroplani
 
 ##id 0x2000
 
-
 ##id 0x2800
 
 ##id 0x3000
@@ -376,6 +367,8 @@ STR_VEHICLE_AIRCRAFT                                            :Aeroplani
 ############ range for rating starts
 ############ range for rating ends
 
+### station view strings
+
 
 
 ##id 0x3800
@@ -401,6 +394,7 @@ STR_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                            :Faro
 ############ These strings may never get a new id, or savegames will break!
 ##id 0x6000
 
+##id 0x6020
 
 ############ end of savegame specific region!
 
@@ -446,8 +440,6 @@ STR_COMPANY_VIEW_VEHICLES_TITLE                                 :{GOLD}Vehili:
 
 
 
-
-
 ##id 0x9000
 
 
@@ -478,6 +470,48 @@ STR_PERFORMANCE_DETAIL_INT                                      :{BLACK}{NUM}
 
 
 
+############ Vehicle lists
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -516,20 +550,34 @@ STR_PERFORMANCE_DETAIL_INT                                      :{BLACK}{NUM}
 ############ Tooltip measurment
 
 
-############ Date formatting
 
-########
 
 
+##### Mass Order
 
 
-##### Mass Order
 
 
+#### String control codes and their formatting
 
 
 
 
+STR_BLACK_COMMA                                                 :{BLACK}{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_1                                                     :{BLACK}1
+STR_BLACK_2                                                     :{BLACK}2
+STR_BLACK_3                                                     :{BLACK}3
+STR_BLACK_4                                                     :{BLACK}4
+STR_BLACK_5                                                     :{BLACK}5
+
+
 #### Improved sign GUI
 
 ########
diff --git a/src/lang/unfinished/macedonian.txt b/src/lang/unfinished/macedonian.txt
index 5cf5e6195..9f7db3e88 100644
--- a/src/lang/unfinished/macedonian.txt
+++ b/src/lang/unfinished/macedonian.txt
@@ -154,8 +154,6 @@ STR_ABBREV_PLASTIC                                              :{TINYFONT}ПЛ
 STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}ПП
 STR_ABBREV_NONE                                                 :{TINYFONT}НТ
 STR_ABBREV_ALL                                                  :{TINYFONT}Се`
-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}Порака
@@ -167,17 +165,11 @@ STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Ориг
 STR_ABOUT_VERSION                                               :{BLACK}OpenTTD верзија {REV}
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 OpenTTD тимот
 
-STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
-STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_QUIT_CAPTION                                                :{WHITE}Напушти
 STR_YES                                                         :{BLACK}Да
 STR_NO                                                          :{BLACK}Не
 STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Дали сте сигурни дека сакате да ја напуштите OpenTTD и да се вратите во {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                                                :Ништо
 STR_COLOUR_DARK_BLUE                                            :Темоно Сина
 STR_COLOUR_PALE_GREEN                                           :Матно Зелена
@@ -196,8 +188,6 @@ STR_COLOUR_BROWN                                                :Кафена
 STR_COLOUR_GREY                                                 :Сива
 STR_COLOUR_WHITE                                                :Бела
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}Има премногу возила во играта
-STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
-STR_RED_COMMA                                                   :{RED}{COMMA}
 STR_BUTTON_LOCATION                                             :{BLACK}Локација
 STR_SMALLMAP_TYPE_CONTOURS                                      :Контури
 STR_SMALLMAP_TYPE_VEHICLES                                      :Возила
@@ -320,12 +310,13 @@ STR_SORT_ORDER_TIP                                              :{BLACK}Избе
 STR_SORT_CRITERIA_TIP                                           :{BLACK}Изберете критериум за сортирање
 STR_SORT_BY                                                     :{BLACK}Сортирање според
 
+### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}Населеност
+STR_SORT_BY_NAME                                                :{BLACK}Име
+STR_SORT_BY_DATE                                                :{BLACK}Датум
 STR_SORT_BY_PRODUCTION                                          :Производство
 STR_SORT_BY_TYPE                                                :Тип
 STR_SORT_BY_TRANSPORTED                                         :Транспортирано
-STR_SORT_BY_NAME                                                :{BLACK}Име
-STR_SORT_BY_DATE                                                :{BLACK}Датум
 STR_SORT_BY_NUMBER                                              :Број
 STR_SORT_BY_PROFIT_LAST_YEAR                                    :Минатогодишен профит
 STR_SORT_BY_PROFIT_THIS_YEAR                                    :Годинашен профит
@@ -346,36 +337,24 @@ STR_SORT_BY_INTRO_DATE                                          :Датум на
 STR_SORT_BY_RUNNING_COST                                        :Потрошувачка
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :Моќност/Потрошувачка
 STR_SORT_BY_CARGO_CAPACITY                                      :Капацитет за товар
+
 STR_NO_WAITING_CARGO                                            :{BLACK}Не чека никаков товар
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}Избери ги сите објекти
 STR_SELECT_ALL_TYPES                                            :{BLACK}Избери ги сите видови товар (including no waiting cargo)
-STR_AVAILABLE_TRAINS                                            :{BLACK}Достапни Возови
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Достапни Возила
-STR_AVAILABLE_SHIPS                                             :{BLACK}Достапни Бродови
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Достапни Летала
 STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Преглед на листа на достапни мотори за овој вид на возило
 STR_MANAGE_LIST                                                 :{BLACK}Менаџирање на листа
 STR_MANAGE_LIST_TIP                                             :{BLACK}Испрати ги инструкциите на сите возила во листата
 STR_REPLACE_VEHICLES                                            :Замени ги возилата
+
+STR_AVAILABLE_TRAINS                                            :{BLACK}Достапни Возови
+STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Достапни Возила
+STR_AVAILABLE_SHIPS                                             :{BLACK}Достапни Бродови
+STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Достапни Летала
+
 STR_SEND_TRAIN_TO_DEPOT                                         :Испрати во Гаража
 STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Испрати во Гаража
 STR_SEND_SHIP_TO_DEPOT                                          :Испрати во Гаража
 
-############ range for months starts
-STR_MONTH_ABBREV_JAN                                            :Јан
-STR_MONTH_ABBREV_FEB                                            :Фев
-STR_MONTH_ABBREV_MAR                                            :Мар
-STR_MONTH_ABBREV_APR                                            :Апр
-STR_MONTH_ABBREV_MAY                                            :Мај
-STR_MONTH_ABBREV_JUN                                            :Јун
-STR_MONTH_ABBREV_JUL                                            :Јул
-STR_MONTH_ABBREV_AUG                                            :Авг
-STR_MONTH_ABBREV_SEP                                            :Сеп
-STR_MONTH_ABBREV_OCT                                            :Окт
-STR_MONTH_ABBREV_NOV                                            :Ное
-STR_MONTH_ABBREV_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}{STRING}-
@@ -402,8 +381,6 @@ 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_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}Наслов на прозорец - влечи тука за да го поместиш прозорецот
@@ -439,7 +416,7 @@ STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Ништо
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Име
 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                                          :1-в
 STR_ORDINAL_NUMBER_2ND                                          :2-ор
 STR_ORDINAL_NUMBER_3RD                                          :3-ет
@@ -473,6 +450,22 @@ STR_ORDINAL_NUMBER_30TH                                         :30-ти
 STR_ORDINAL_NUMBER_31ST                                         :31-ви
 ############ range for days ends
 
+############ range for months starts
+STR_MONTH_ABBREV_JAN                                            :Јан
+STR_MONTH_ABBREV_FEB                                            :Фев
+STR_MONTH_ABBREV_MAR                                            :Мар
+STR_MONTH_ABBREV_APR                                            :Апр
+STR_MONTH_ABBREV_MAY                                            :Мај
+STR_MONTH_ABBREV_JUN                                            :Јун
+STR_MONTH_ABBREV_JUL                                            :Јул
+STR_MONTH_ABBREV_AUG                                            :Авг
+STR_MONTH_ABBREV_SEP                                            :Сеп
+STR_MONTH_ABBREV_OCT                                            :Окт
+STR_MONTH_ABBREV_NOV                                            :Ное
+STR_MONTH_ABBREV_DEC                                            :Дек
+
+############ range for months ends
+
 STR_GRAPH_Y_LABEL_NUMBER                                        :{TINYFONT}{COMMA}
 
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}Прифатен товар: {LTBLUE}
@@ -550,12 +543,9 @@ 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_COMMA                                                  :{BLUE}{COMMA}
 STR_SCENEDIT_TOOLBAR_OPENTTD                                    :{YELLOW}OpenTTD
 STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR                            :{YELLOW}Сценарио Едитор
 STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION                   :{WHITE}Генерирање на терен
-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}Генерирај случаен терен
@@ -601,7 +591,6 @@ STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_1_MONTH                :Секој ме
 
 
 
-
 ############ start of townname region
 ############ end of townname region
 
@@ -615,12 +604,10 @@ STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_1_MONTH                :Секој ме
 STR_AUTOSAVE_FAILED                                             :{WHITE}Автоматското снимање неуспешно
 
 
-
 STR_BAGS                                                        :вреќи
 
 
 
-
 # Start of order review system.
 # DON'T ADD OR REMOVE LINES HERE
 # end of order system
@@ -746,7 +733,6 @@ STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_TUNNEL                   :{BLACK}Изгр
 
 ##id 0x2000
 
-
 ##id 0x2800
 
 ##id 0x3000
@@ -755,6 +741,8 @@ STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_TUNNEL                   :{BLACK}Изгр
 ############ range for rating starts
 ############ range for rating ends
 
+### station view strings
+
 
 
 ##id 0x3800
@@ -783,6 +771,7 @@ STR_BRIDGE_TUBULAR_SILICON                                      :Цилиндр�
 ############ These strings may never get a new id, or savegames will break!
 ##id 0x6000
 
+##id 0x6020
 
 ############ end of savegame specific region!
 
@@ -811,9 +800,6 @@ STR_AIRCRAFT                                                    :{WHITE}{COMMA}
 
 
 
-STR_BUILD_VEHICLE_TRAIN_ALL_CAPTION                             :{WHITE}Шински возила
-
-
 
 
 
@@ -821,65 +807,26 @@ STR_BUILD_VEHICLE_TRAIN_ALL_CAPTION                             :{WHITE}Шинс
 
 ##id 0x9000
 STR_ARTICULATED_RV_CAPACITY                                     :{BLACK}Капацитет: {LTBLUE}
-STR_JUST_CARGO                                                  :{CARGO}
 
 
 
 ##id 0x9800
 
 STR_BUILD_AQUEDUCT                                              :{BLACK}Изгради водовод
-STR_REFIT_SHIP_REFIT_BUTTON                                     :{BLACK}Пренамени брод
-STR_REFIT_SHIP_LIST_TOOLTIP                                     :{BLACK}Одбери тип на товар што ќе го носи бродот
-STR_REFIT_SHIP_REFIT_TOOLTIP                                    :{BLACK}Пренамени го бродот за да носи од одбележаниот тип на товар
 STR_REFIT_TITLE                                                 :{GOLD}Одбери тип на товар за носење:
 STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}Нов капацитет: {GOLD}{CARGO}{}{BLACK}Пренамената чини: {GOLD}{CURRENCY}
-STR_ERROR_CAN_T_REFIT_SHIP                                      :{WHITE}Не може да се пренамени бродот...
 
 ##id 0xA000
 STR_TOOLBAR_AIRCRAFT_CAPTION                                    :{WHITE}Аеродроми
 STR_ERROR_CAN_T_BUILD_AIRPORT_HERE                              :{WHITE}Не може да се изгради аеродром на оваа локација...
-STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}{STATION} Авионска гаража
-STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON                          :{BLACK}Нов авион
-STR_BUILD_VEHICLE_AIRCRAFT_CAPTION                              :{WHITE}Нов авион
-STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON                 :{BLACK}Направи авион
-STR_ERROR_CAN_T_BUILD_AIRCRAFT                                  :{WHITE}Не може да се направи авионот...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} Авион
-STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR                         :{WHITE}Не може да се прати авионот во гаража...
-STR_ERROR_AIRCRAFT_IN_THE_WAY                                   :{WHITE}Авион на патот
-STR_ERROR_CAN_T_STOP_START_AIRCRAFT                             :{WHITE}Не може да сопре/тргне авионот...
 STR_ERROR_AIRCRAFT_IS_IN_FLIGHT                                 :{WHITE}Авионот е во лет
 STR_ERROR_AIRCRAFT_MUST_BE_STOPPED                              :{WHITE}Авионот мора да се сопре во хангар
-STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}Не може да се продаде авионот...
 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION                          :Изградба на аеродром
 STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Изгради аеродром
-STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP                               :{BLACK}Авион - кликни на авионот за информации
-STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Авион - кликни на авионот за информации
-STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}Направи нов авион
-STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}Повлечи го авионот со глушецот овде за да го продадеш
-STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Позиционирај го хангарот на центар
-STR_BUILD_VEHICLE_AIRCRAFT_LIST_TOOLTIP                         :{BLACK}Листа за селекција од авиони - кликни на авионот за информации
-STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_TOOLTIP                :{BLACK}Направи авион од селектираниот тип
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP              :{BLACK}Моментална активност на авионот - кликни овде за стоп/старт на авионот
-STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Прикажи ги наредбите на авионот
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP                      :{BLACK}Прикажи го авионот на средина
-STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}Прати го авионот во хангар. CTRL+клик ќе го прати само на сервис
-STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Прикажи детали за авионот
 
-STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}Име на авионот
-STR_ERROR_CAN_T_RENAME_AIRCRAFT                                 :{WHITE}Не може да се именува авионот...
-STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}Име на авионот
 STR_NEWS_FIRST_AIRCRAFT_ARRIVAL                                 :{BLACK}{BIGFONT}Градска прослава . . .{}Првиот авион пристигна на {STATION}!
 STR_NEWS_AIRCRAFT_CRASH                                         :{BLACK}{BIGFONT}Авионска несреќа!{}{COMMA} загинати во пожарот на {STATION}
 STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
-STR_BUILD_VEHICLE_AIRCRAFT_RENAME_BUTTON                        :{BLACK}Преименувај
-STR_BUILD_VEHICLE_AIRCRAFT_RENAME_TOOLTIP                       :{BLACK}Преименувај го типот на авиони
-STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION                          :{WHITE}Преименувај го типот на авиони
-STR_ERROR_CAN_T_RENAME_AIRCRAFT_TYPE                            :{WHITE}Не може да се преименува типот на авиони...
-STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Пренамени авион за да може да пренесува друг вид на товар
-STR_REFIT_AIRCRAFT_REFIT_BUTTON                                 :{BLACK}Пренамени авион
-STR_REFIT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Одбери тип на товар за авионот
-STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}Пренамени го авионот за да носи од одбележаниот тип на товар
-STR_ERROR_CAN_T_REFIT_AIRCRAFT                                  :{WHITE}Не може да се пренамени авионот...
 
 
 ##id 0xB000
@@ -913,9 +860,90 @@ STR_BROKEN_VEHICLE_LENGTH                                       :{WHITE}Возо
 
 STR_BUS                                                         :{BLACK}{BUS}
 
+############ Vehicle lists
+STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP                               :{BLACK}Авион - кликни на авионот за информации
+
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} Авион
+
+
+
+STR_REFIT_SHIP_REFIT_BUTTON                                     :{BLACK}Пренамени брод
+STR_REFIT_AIRCRAFT_REFIT_BUTTON                                 :{BLACK}Пренамени авион
+
+STR_REFIT_SHIP_REFIT_TOOLTIP                                    :{BLACK}Пренамени го бродот за да носи од одбележаниот тип на товар
+STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}Пренамени го авионот за да носи од одбележаниот тип на товар
+
+STR_REFIT_SHIP_LIST_TOOLTIP                                     :{BLACK}Одбери тип на товар што ќе го носи бродот
+STR_REFIT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Одбери тип на товар за авионот
+
+STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}{STATION} Авионска гаража
+
+STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}Име на авионот
+
+STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}Име на авионот
+
+STR_ERROR_AIRCRAFT_IN_THE_WAY                                   :{WHITE}Авион на патот
+
+STR_ERROR_CAN_T_REFIT_SHIP                                      :{WHITE}Не може да се пренамени бродот...
+STR_ERROR_CAN_T_REFIT_AIRCRAFT                                  :{WHITE}Не може да се пренамени авионот...
+
+STR_ERROR_CAN_T_RENAME_AIRCRAFT                                 :{WHITE}Не може да се именува авионот...
+
+STR_ERROR_CAN_T_STOP_START_AIRCRAFT                             :{WHITE}Не може да сопре/тргне авионот...
+
+STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR                         :{WHITE}Не може да се прати авионот во гаража...
+
+STR_ERROR_CAN_T_BUILD_AIRCRAFT                                  :{WHITE}Не може да се направи авионот...
+
+STR_ERROR_CAN_T_RENAME_AIRCRAFT_TYPE                            :{WHITE}Не може да се преименува типот на авиони...
+
+STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}Не може да се продаде авионот...
+
+STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP              :{BLACK}Моментална активност на авионот - кликни овде за стоп/старт на авионот
+
+STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Прикажи ги наредбите на авионот
+
+STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP                      :{BLACK}Прикажи го авионот на средина
+
+STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}Прати го авионот во хангар. CTRL+клик ќе го прати само на сервис
+
+STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Прикажи детали за авионот
+
+STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Пренамени авион за да може да пренесува друг вид на товар
+
+
 
 
 
+
+
+
+STR_BUILD_VEHICLE_TRAIN_ALL_CAPTION                             :{WHITE}Шински возила
+STR_BUILD_VEHICLE_AIRCRAFT_CAPTION                              :{WHITE}Нов авион
+
+STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON                 :{BLACK}Направи авион
+
+STR_BUILD_VEHICLE_AIRCRAFT_LIST_TOOLTIP                         :{BLACK}Листа за селекција од авиони - кликни на авионот за информации
+
+STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_TOOLTIP                :{BLACK}Направи авион од селектираниот тип
+
+STR_BUILD_VEHICLE_AIRCRAFT_RENAME_BUTTON                        :{BLACK}Преименувај
+
+STR_BUILD_VEHICLE_AIRCRAFT_RENAME_TOOLTIP                       :{BLACK}Преименувај го типот на авиони
+
+STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION                          :{WHITE}Преименувај го типот на авиони
+
+STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON                          :{BLACK}Нов авион
+
+STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Авион - кликни на авионот за информации
+
+STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}Направи нов авион
+
+STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}Повлечи го авионот со глушецот овде за да го продадеш
+
+STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Позиционирај го хангарот на центар
+
+
 ### depot strings
 
 
@@ -952,18 +980,38 @@ STR_AIRCRAFT_NOT_AVAILABLE                                      :{WHITE}Авио
 ############ Tooltip measurment
 
 
-############ Date formatting
 
-########
 
 
+##### Mass Order
+
 
 
-##### Mass Order
 
+#### String control codes and their formatting
 
+STR_JUST_CARGO                                                  :{CARGO}
+
+
+
+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_SMALL_ARROW_UP                                        :{BLACK}{SMALLUPARROW}
+STR_BLACK_SMALL_ARROW_DOWN                                      :{BLACK}{SMALLDOWNARROW}
 
+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
 
 
 #### Improved sign GUI
diff --git a/src/lang/unfinished/malay.txt b/src/lang/unfinished/malay.txt
index 939d2ddfb..1cc8e3aff 100644
--- a/src/lang/unfinished/malay.txt
+++ b/src/lang/unfinished/malay.txt
@@ -135,8 +135,6 @@ STR_ABBREV_WATER                                                :{TINYFONT}AR
 STR_ABBREV_RUBBER                                               :{TINYFONT}GT
 STR_ABBREV_SUGAR                                                :{TINYFONT}GU
 STR_ABBREV_TOYS                                                 :{TINYFONT}MA
-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
@@ -148,17 +146,11 @@ STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Hakcipta
 STR_ABOUT_VERSION                                               :{BLACK}OpenTTD versi {REV}
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2008 The OpenTTD team
 
-STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
-STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_QUIT_CAPTION                                                :{WHITE}Keluar
 STR_YES                                                         :{BLACK}Ya
 STR_NO                                                          :{BLACK}Tidak
 STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Anda pasti mahu keluar dari OpenTTD dan kembali ke {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                                                :Tiada
 STR_COLOUR_DARK_BLUE                                            :Biru Gelap
 STR_COLOUR_PALE_GREEN                                           :Hijau Pucat
@@ -177,8 +169,6 @@ STR_COLOUR_BROWN                                                :Perang
 STR_COLOUR_GREY                                                 :Kelabu
 STR_COLOUR_WHITE                                                :Putih
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}Terlalu banyak kenderaan dalam permainan
-STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
-STR_RED_COMMA                                                   :{RED}{COMMA}
 STR_BUTTON_LOCATION                                             :{BLACK}Lokasi
 STR_SMALLMAP_TYPE_CONTOURS                                      :Bentuk
 STR_SMALLMAP_TYPE_VEHICLES                                      :Kenderaan
@@ -300,12 +290,13 @@ STR_SORT_CRITERIA_TIP                                           :{BLACK}Pilih kr
 STR_FILTER_CRITERIA_TIP                                         :{BLACK}Pilih kriteria tapisan
 STR_SORT_BY                                                     :{BLACK}Menyusun mengikuti
 
+### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}Bilangan Penduduk
+STR_SORT_BY_NAME                                                :{BLACK}Nama
+STR_SORT_BY_DATE                                                :{BLACK}Tarikh
 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_DATE                                                :{BLACK}Tarikh
 STR_SORT_BY_NUMBER                                              :Nombor
 STR_SORT_BY_PROFIT_LAST_YEAR                                    :Keuntungan tahun lepas
 STR_SORT_BY_PROFIT_THIS_YEAR                                    :Keuntungan tahunan
@@ -322,36 +313,24 @@ STR_SORT_BY_COST                                                :Kos
 STR_SORT_BY_POWER                                               :Tenaga
 STR_SORT_BY_INTRO_DATE                                          :Tarikh Pengenalan
 STR_SORT_BY_CARGO_CAPACITY                                      :Kapasiti Kargo
+
 STR_NO_WAITING_CARGO                                            :{BLACK}Tiada kargo menunggu
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}Pilih semua kemudahan
 STR_SELECT_ALL_TYPES                                            :{BLACK}Pilih semua kargo (termasuk kargo tiada menunggu)
+STR_MANAGE_LIST                                                 :{BLACK}Kendali senarai
+STR_MANAGE_LIST_TIP                                             :{BLACK}Hantar arahan pada semua kenderaan didalam senarai
+STR_REPLACE_VEHICLES                                            :Tukar kenderaan
+STR_SEND_FOR_SERVICING                                          :Hantar untuk servis
+
 STR_AVAILABLE_TRAINS                                            :{BLACK}Keretapi sedia ada
 STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Kenderaan sedia ada
 STR_AVAILABLE_SHIPS                                             :{BLACK}Kapal sedia ada
 STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Kapal terbang sedia ada
-STR_MANAGE_LIST                                                 :{BLACK}Kendali senarai
-STR_MANAGE_LIST_TIP                                             :{BLACK}Hantar arahan pada semua kenderaan didalam senarai
-STR_REPLACE_VEHICLES                                            :Tukar kenderaan
+
 STR_SEND_TRAIN_TO_DEPOT                                         :Hantar ke pangkalan
 STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Hantar ke pangkalan
 STR_SEND_SHIP_TO_DEPOT                                          :Hantar ke pangkalan
 STR_SEND_AIRCRAFT_TO_HANGAR                                     :Hantar ke bangsal Kapal Terbang
-STR_SEND_FOR_SERVICING                                          :Hantar untuk servis
-
-############ range for months starts
-STR_MONTH_ABBREV_JAN                                            :Jan
-STR_MONTH_ABBREV_FEB                                            :Feb
-STR_MONTH_ABBREV_MAR                                            :Mac
-STR_MONTH_ABBREV_APR                                            :Apr
-STR_MONTH_ABBREV_MAY                                            :Mei
-STR_MONTH_ABBREV_JUN                                            :Jun
-STR_MONTH_ABBREV_JUL                                            :Jul
-STR_MONTH_ABBREV_AUG                                            :Ogos
-STR_MONTH_ABBREV_SEP                                            :Sep
-STR_MONTH_ABBREV_OCT                                            :Okt
-STR_MONTH_ABBREV_NOV                                            :Nov
-STR_MONTH_ABBREV_DEC                                            :Dis
-############ range for months ends
 
 STR_GRAPH_X_LABEL_MONTH                                         :{TINYFONT}{STRING}{} {STRING}
 STR_GRAPH_X_LABEL_MONTH_YEAR                                    :{TINYFONT}{STRING}{} {STRING}{}{NUM}
@@ -379,8 +358,6 @@ 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_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
@@ -423,7 +400,7 @@ STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Tiada
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Nama
 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                                          :Pertama
 STR_ORDINAL_NUMBER_2ND                                          :Kedua
 STR_ORDINAL_NUMBER_3RD                                          :Ketiga
@@ -457,6 +434,34 @@ STR_ORDINAL_NUMBER_30TH                                         :30
 STR_ORDINAL_NUMBER_31ST                                         :31
 ############ range for days ends
 
+############ range for months starts
+STR_MONTH_ABBREV_JAN                                            :Jan
+STR_MONTH_ABBREV_FEB                                            :Feb
+STR_MONTH_ABBREV_MAR                                            :Mac
+STR_MONTH_ABBREV_APR                                            :Apr
+STR_MONTH_ABBREV_MAY                                            :Mei
+STR_MONTH_ABBREV_JUN                                            :Jun
+STR_MONTH_ABBREV_JUL                                            :Jul
+STR_MONTH_ABBREV_AUG                                            :Ogos
+STR_MONTH_ABBREV_SEP                                            :Sep
+STR_MONTH_ABBREV_OCT                                            :Okt
+STR_MONTH_ABBREV_NOV                                            :Nov
+STR_MONTH_ABBREV_DEC                                            :Dis
+
+STR_MONTH_JAN                                                   :Januari
+STR_MONTH_FEB                                                   :Februari
+STR_MONTH_MAR                                                   :Mac
+STR_MONTH_APR                                                   :April
+STR_MONTH_MAY                                                   :May
+STR_MONTH_JUN                                                   :Jun
+STR_MONTH_JUL                                                   :Julai
+STR_MONTH_AUG                                                   :Ogos
+STR_MONTH_SEP                                                   :September
+STR_MONTH_OCT                                                   :Oktober
+STR_MONTH_NOV                                                   :November
+STR_MONTH_DEC                                                   :Desember
+############ range for months ends
+
 STR_GRAPH_Y_LABEL_NUMBER                                        :{TINYFONT}{COMMA}
 
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}Kargo yang diterima: {LTBLUE}
@@ -539,12 +544,9 @@ 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_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_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
@@ -615,9 +617,7 @@ STR_STATUSBAR_TOOLTIP_SHOW_LAST_NEWS                            :{BLACK}Tunjukka
 STR_OFF                                                         :Padam
 STR_FULL                                                        :Penuh
 STR_STATUSBAR_COMPANY_NAME                                      :{SILVER}- -  {COMPANY}  - -
-STR_BLACK_STRING                                                :{BLACK}{STRING}
 
-STR_JUST_CHECKMARK                                              :{CHECKMARK}
 ############ range for menu starts
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Pilihan permainan
 STR_SETTINGS_MENU_DIFFICULTY_SETTINGS                           :Tetapan kesukaran
@@ -694,9 +694,6 @@ STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY                             :Biaya industri
 ############ range ends here
 
 STR_FUND_INDUSTRY_CAPTION                                       :{WHITE}Biaya industri baru
-STR_JUST_STRING                                                 :{STRING}
-STR_JUST_RAW_STRING                                             :{STRING}
-STR_JUST_INT                                                    :{NUM}
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_RAINFOREST                       :{WHITE}...hanya boleh dibina di kawasan hutan
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT                           :{WHITE}...hanya boleh dibina di kawasan gurun
 STR_STATUSBAR_PAUSED                                            :{YELLOW}* *  DIHENTIKAN  *  *
@@ -706,9 +703,6 @@ 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_BLACK_6                                                     :{BLACK}6
-STR_BLACK_7                                                     :{BLACK}7
-
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Inggeris (Original)
 STR_TOWNNAME_FRENCH                                             :French
@@ -758,19 +752,6 @@ STR_OPTIONS_BASE_GRF_STATUS                                     :{RED}{10:NUM} f
 STR_OPTIONS_BASE_GRF_DESCRIPTION_TIP                            :{BLACK}Maklumat tambahan tentang set grafik asas ini
 
 
-STR_MONTH_JAN                                                   :Januari
-STR_MONTH_FEB                                                   :Februari
-STR_MONTH_MAR                                                   :Mac
-STR_MONTH_APR                                                   :April
-STR_MONTH_MAY                                                   :May
-STR_MONTH_JUN                                                   :Jun
-STR_MONTH_JUL                                                   :Julai
-STR_MONTH_AUG                                                   :Ogos
-STR_MONTH_SEP                                                   :September
-STR_MONTH_OCT                                                   :Oktober
-STR_MONTH_NOV                                                   :November
-STR_MONTH_DEC                                                   :Desember
-
 STR_HEADING_FOR_STATION                                         :{LTBLUE}Menuju ke {STATION}
 STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}Menuju ke {STATION}, {VELOCITY}
 STR_NO_ORDERS                                                   :{LTBLUE}Tiada perintah
@@ -785,8 +766,6 @@ STR_CRATES                                                      :peti
 STR_RES_OTHER                                                   :lain
 STR_NOTHING                                                     :
 
-STR_TINY_RIGHT_ARROW                                            :{TINYFONT}{RIGHTARROW}
-
 
 STR_TRAIN_IS_STUCK                                              :{WHITE}{VEHICLE} tidak boleh mencari arah jalan untuk teruskan jalan
 STR_TRAIN_IS_LOST                                               :{WHITE}{VEHICLE} telah hilang jalan.
@@ -1092,7 +1071,6 @@ STR_SMALLMAP_TOWN                                               :{TINYFONT}{WHIT
 STR_TOWN_DIRECTORY_TOWN                                         :{ORANGE}{TOWN}{BLACK} ({COMMA})
 STR_TOWN_DESCRIPTION_UNDER_CONSTRUCTION                         :{STRING} (sedang dibina)
 
-
 ##id 0x2800
 STR_PLANT_TREE_CAPTION                                          :{WHITE}Pokok
 STR_ERROR_CAN_T_PLANT_TREE_HERE                                 :{WHITE}Tidak boleh menanam pokok di sini...
@@ -1117,6 +1095,8 @@ STR_STATION_VIEW_ACCEPTS_BUTTON                                 :{BLACK}Terima
 ############ range for rating starts
 ############ range for rating ends
 
+### station view strings
+
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO                        :{WHITE}{STATION} tidak lagi menerima {STRING}
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO               :{WHITE}{STATION} tidak lagi menerima {STRING} or {STRING}
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_DOCK                             :{WHITE}Terlalu rapat dengan perlabuhan lain
@@ -1172,6 +1152,7 @@ STR_SV_AIRCRAFT_NAME                                            :Pesawat Udara {
 
 STR_SV_STNAME                                                   :{STRING}
 STR_SV_STNAME_NORTH                                             :{STRING} Utara
+##id 0x6020
 
 ############ end of savegame specific region!
 
@@ -1218,8 +1199,6 @@ STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_POWERNAUT_DIESEL             :Powernaut Diese
 
 
 
-
-
 STR_TIMETABLE_STATUS_ON_TIME                                    :{BLACK}Kenderaan ini sedang berjalan mengikuti jadual
 STR_TIMETABLE_STATUS_LATE                                       :{BLACK}Kenderaan ini sedang berjalan {STRING} lewat
 STR_TIMETABLE_STATUS_EARLY                                      :{BLACK}Kenderaan ini sedang berjalan {STRING} awal
@@ -1236,8 +1215,6 @@ STR_TIMETABLE_TOTAL_TIME_INCOMPLETE                             :{BLACK}Jadual w
 ##id 0xA000
 STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Bina Lapangan Terbang
 
-STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}Nama kapal terbang
-STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}Nama kapal terbang
 
 
 ##id 0xB000
@@ -1269,16 +1246,60 @@ STR_TOOLTIP_SET_CUSTOM_CURRENCY_TO_EURO                         :{BLACK}Tetapkan
 STR_TOOLTIP_CUSTOM_CURRENCY_PREVIEW                             :{BLACK}Mata wang anda berbanding 10000 Pound (£)
 
 
+############ Vehicle lists
+
+
+
+
+
+
+
+
+STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}Nama kapal terbang
+
+STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}Nama kapal terbang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
-### depot strings
 
 
 
 
 
+
+
+
+
+
+
+### depot strings
+
+
+
+
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}Menggantikan: {ORANGE}{SKIP}{SKIP}{STRING}
+
 STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Kenderaan tidak boleh didapati sekarang
 STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Kenderaan tidak boleh didapati sekarang
 STR_SHIP_NOT_AVAILABLE                                          :{WHITE}Kapal tidak boleh didapati sekarang
@@ -1325,10 +1346,6 @@ STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Muatan:
 ############ Tooltip measurment
 
 
-############ Date formatting
-
-########
-
 
 
 
@@ -1338,6 +1355,37 @@ STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Muatan:
 
 STR_GROUPS_CLICK_ON_GROUP_FOR_TIP                               :{BLACK}Kumpulan - klik sebuah kumpulan untuk menaraikan semua kenderaan di dalam kumpulan
 
+#### String control codes and their formatting
+
+STR_JUST_CHECKMARK                                              :{CHECKMARK}
+STR_JUST_INT                                                    :{NUM}
+STR_JUST_STRING                                                 :{STRING}
+STR_JUST_RAW_STRING                                             :{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_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
 
 
 #### Improved sign GUI
diff --git a/src/lang/unfinished/persian.txt b/src/lang/unfinished/persian.txt
index 08f164cb9..c3201172d 100644
--- a/src/lang/unfinished/persian.txt
+++ b/src/lang/unfinished/persian.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}همه
-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}پیام
@@ -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}خروج
 STR_YES                                                         :{BLACK}بله
 STR_NO                                                          :{BLACK}خیر
 STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}آیا می‌خواهید از بازی خارج شوید و برگردید به{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                                                :هیچی
 STR_COLOUR_DARK_BLUE                                            :آبی تیره
 STR_COLOUR_PALE_GREEN                                           :سبز روشن
@@ -196,8 +188,6 @@ STR_COLOUR_BROWN                                                :قهوه‌ای
 STR_COLOUR_GREY                                                 :خاکستری
 STR_COLOUR_WHITE                                                :سفید
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}ماشین‌های زیادی در بازی هستند
-STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
-STR_RED_COMMA                                                   :{RED}{COMMA}
 STR_BUTTON_LOCATION                                             :{BLACK}مختصات
 STR_SMALLMAP_TYPE_CONTOURS                                      :حد فاصل ها
 STR_SMALLMAP_TYPE_VEHICLES                                      :وسایل نقلیه
@@ -323,12 +313,13 @@ STR_SORT_CRITERIA_TIP                                           :{BLACK}انتخ
 STR_FILTER_CRITERIA_TIP                                         :{BLACK}انتخاب معیار پایش
 STR_SORT_BY                                                     :{BLACK}مرتب کردن بر اساس
 
+### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}جمعیت
+STR_SORT_BY_NAME                                                :{BLACK}نام
+STR_SORT_BY_DATE                                                :{BLACK}تاریخ
 STR_SORT_BY_PRODUCTION                                          :تولید
 STR_SORT_BY_TYPE                                                :نوع
 STR_SORT_BY_TRANSPORTED                                         :منتقل شده
-STR_SORT_BY_NAME                                                :{BLACK}نام
-STR_SORT_BY_DATE                                                :{BLACK}تاریخ
 STR_SORT_BY_NUMBER                                              :تعداد
 STR_SORT_BY_PROFIT_LAST_YEAR                                    :سود در سال گذشته
 STR_SORT_BY_PROFIT_THIS_YEAR                                    :سود در سال جاری
@@ -351,6 +342,7 @@ STR_SORT_BY_INTRO_DATE                                          :تاریخ اح
 STR_SORT_BY_RUNNING_COST                                        :هزینه کارکرد
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :توان/هزینه کارکرد
 STR_SORT_BY_CARGO_CAPACITY                                      :ظرفیت محموله
+
 STR_NO_WAITING_CARGO                                            :{BLACK}هیچ نوع محموله در انتظار نیست
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}انتخاب تمامی تسهیلات
 STR_SELECT_ALL_TYPES                                            :{BLACK}انتخاب همه ی انواع محموله ها (شامل محموله های در انتظار)
@@ -370,21 +362,6 @@ STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :فرستادن
 STR_SEND_SHIP_TO_DEPOT                                          :فرستادن به مقر فنی
 STR_SEND_AIRCRAFT_TO_HANGAR                                     :فرستادن به آشیانه
 
-############ range for months starts
-STR_MONTH_ABBREV_JAN                                            :بهمن
-STR_MONTH_ABBREV_FEB                                            :اسفند
-STR_MONTH_ABBREV_MAR                                            :فروردین
-STR_MONTH_ABBREV_APR                                            :اردیبهشت
-STR_MONTH_ABBREV_MAY                                            :خرداد
-STR_MONTH_ABBREV_JUN                                            :تیر
-STR_MONTH_ABBREV_JUL                                            :مرداد
-STR_MONTH_ABBREV_AUG                                            :شهریور
-STR_MONTH_ABBREV_SEP                                            :مهر
-STR_MONTH_ABBREV_OCT                                            :آبان
-STR_MONTH_ABBREV_NOV                                            :آذر
-STR_MONTH_ABBREV_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}{STRING}-
@@ -411,8 +388,6 @@ 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_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}تخریب ساختمان و ... در بخشی از زمین
@@ -442,7 +417,7 @@ STR_LAND_AREA_INFORMATION_OWNER_N_A                             :0
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}نام
 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                                          :1
 STR_ORDINAL_NUMBER_2ND                                          :2
 STR_ORDINAL_NUMBER_3RD                                          :3
@@ -476,6 +451,22 @@ STR_ORDINAL_NUMBER_30TH                                         :30
 STR_ORDINAL_NUMBER_31ST                                         :31
 ############ range for days ends
 
+############ range for months starts
+STR_MONTH_ABBREV_JAN                                            :بهمن
+STR_MONTH_ABBREV_FEB                                            :اسفند
+STR_MONTH_ABBREV_MAR                                            :فروردین
+STR_MONTH_ABBREV_APR                                            :اردیبهشت
+STR_MONTH_ABBREV_MAY                                            :خرداد
+STR_MONTH_ABBREV_JUN                                            :تیر
+STR_MONTH_ABBREV_JUL                                            :مرداد
+STR_MONTH_ABBREV_AUG                                            :شهریور
+STR_MONTH_ABBREV_SEP                                            :مهر
+STR_MONTH_ABBREV_OCT                                            :آبان
+STR_MONTH_ABBREV_NOV                                            :آذر
+STR_MONTH_ABBREV_DEC                                            :دی
+
+############ range for months ends
+
 STR_GRAPH_Y_LABEL_NUMBER                                        :{TINYFONT}{COMMA}
 
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}محموله های دریافتی : {LTBLUE}
@@ -525,11 +516,8 @@ 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_COMMA                                                  :{BLUE}{COMMA}
 STR_SCENEDIT_TOOLBAR_OPENTTD                                    :{YELLOW}OpenTTD
 STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION                   :{WHITE}طراحی اتوماتیک سرزمین
-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}تمام تغییرات را بر گردان
@@ -576,7 +564,6 @@ STR_FOUND_TOWN_INITIAL_SIZE_TITLE                               :{YELLOW}اند�
 STR_NEWS_MESSAGE                                                :{STRING}  -  {STRING}
 STR_STATUSBAR_TOOLTIP_SHOW_LAST_NEWS                            :{BLACK} اخرین پیغام یا گزارش را نشان بده
 STR_STATUSBAR_COMPANY_NAME                                      :{SILVER}- -  {COMPANY}  - -
-STR_BLACK_STRING                                                :{BLACK}{STRING}
 
 ############ range for menu starts
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :تنظیمات بازی
@@ -650,8 +637,6 @@ STR_ERROR_SCREENSHOT_FAILED                                     :{WHITE}تصئی
 STR_TERRAFORM_TOOLTIP_PURCHASE_LAND                             :{BLACK}خرید زمین برای استفاده های بعدی
 STR_STATUSBAR_AUTOSAVE                                          :{RED}ذخیره اتوماتیک
 
-STR_BLACK_6                                                     :{BLACK}6
-
 ############ start of townname region
 ############ end of townname region
 
@@ -668,8 +653,6 @@ STR_OPTIONS_BASE_GRF_DESCRIPTION_TIP                            :{BLACK} اطل�
 
 
 
-
-
 # Start of order review system.
 # DON'T ADD OR REMOVE LINES HERE
 # end of order system
@@ -1718,6 +1701,27 @@ STR_FORMAT_COMPANY_NUM                                          :(شرکت {COMM
 STR_FORMAT_GROUP_NAME                                           :گروه {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_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
+
 
 #### Improved sign GUI
 
diff --git a/src/lang/unfinished/thai.txt b/src/lang/unfinished/thai.txt
index 48d2611d5..9d2aa4adf 100644
--- a/src/lang/unfinished/thai.txt
+++ b/src/lang/unfinished/thai.txt
@@ -154,8 +154,6 @@ STR_ABBREV_PLASTIC                                              :{TINYFONT}พ�
 STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}น้ำอัดลม
 STR_ABBREV_NONE                                                 :{TINYFONT}ว่าง
 STR_ABBREV_ALL                                                  :{TINYFONT}ทั้งหมด
-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}ข้อความ
@@ -167,17 +165,11 @@ STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}ลิ�
 STR_ABOUT_VERSION                                               :{BLACK}OpenTTD รุ่นที่ {REV}
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}ลิขสิทธิ์ OpenTTD {COPYRIGHT}2002-2008 ของ The OpenTTD team
 
-STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
-STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_QUIT_CAPTION                                                :{WHITE}ออกจากเกม
 STR_YES                                                         :{BLACK}ใช่
 STR_NO                                                          :{BLACK}ไม่
 STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}คุณแน่ใจว่าจะออกจากเกม OpenTTD แล้วกลับสู่ {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                                                :ไม่มีอะไร
 STR_COLOUR_DARK_BLUE                                            :สีกรมท่า
 STR_COLOUR_PALE_GREEN                                           :สีเขียวอ่อน
@@ -196,8 +188,6 @@ STR_COLOUR_BROWN                                                :สีน้ำ
 STR_COLOUR_GREY                                                 :สีเทา
 STR_COLOUR_WHITE                                                :สีขาว
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}ขณะนี้มียานยนต์มากเกินไปแล้วในเกม
-STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
-STR_RED_COMMA                                                   :{RED}{COMMA}
 STR_BUTTON_LOCATION                                             :{BLACK}ที่ตั้ง
 STR_SMALLMAP_TYPE_CONTOURS                                      :โครงร่าง
 STR_SMALLMAP_TYPE_VEHICLES                                      :ยานยนต์
@@ -318,10 +308,11 @@ STR_ABANDON_GAME_QUERY                                          :{YELLOW}แน�
 STR_ABANDON_GAME_CAPTION                                        :{WHITE}เลิกเล่น
 STR_SORT_BY                                                     :{BLACK}เรียงตาม
 
+### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}ประชากร
-STR_SORT_BY_TYPE                                                :ประเภท
 STR_SORT_BY_NAME                                                :{BLACK}ชื่อ
 STR_SORT_BY_DATE                                                :{BLACK}วันที่
+STR_SORT_BY_TYPE                                                :ประเภท
 STR_SORT_BY_PROFIT_LAST_YEAR                                    :กำไรปีที่แล้ว
 STR_SORT_BY_PROFIT_THIS_YEAR                                    :กำไรปีนี้
 STR_SORT_BY_AGE                                                 :อายุ
@@ -333,26 +324,14 @@ STR_SORT_BY_LIFE_TIME                                           :อายุก
 STR_SORT_BY_FACILITY                                            :ประเภทสถานี
 STR_SORT_BY_COST                                                :ราคา
 STR_SORT_BY_INTRO_DATE                                          :วันเปิดตัวจำหน่าย
+
+
+
 STR_SEND_TRAIN_TO_DEPOT                                         :ส่งเข้าอู่ซ่อมบำรุง
 STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :ส่งเข้าอู่ซ่อมรถ
 STR_SEND_SHIP_TO_DEPOT                                          :ส่งเข้าอู่ต่อเรือ
 STR_SEND_AIRCRAFT_TO_HANGAR                                     :ส่งเข้าโรงเก็บเครื่องบิน
 
-############ range for months starts
-STR_MONTH_ABBREV_JAN                                            :ม.ค.
-STR_MONTH_ABBREV_FEB                                            :ก.พ.
-STR_MONTH_ABBREV_MAR                                            :มี.ค.
-STR_MONTH_ABBREV_APR                                            :เม.ย.
-STR_MONTH_ABBREV_MAY                                            :พ.ค.
-STR_MONTH_ABBREV_JUN                                            :มิ.ย.
-STR_MONTH_ABBREV_JUL                                            :ก.ค.
-STR_MONTH_ABBREV_AUG                                            :ส.ค.
-STR_MONTH_ABBREV_SEP                                            :ก.ย.
-STR_MONTH_ABBREV_OCT                                            :ต.ค.
-STR_MONTH_ABBREV_NOV                                            :พ.ย.
-STR_MONTH_ABBREV_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}{STRING}-
@@ -379,8 +358,6 @@ 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_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}หัวของหน้าต่าง - คลิกค้างแล้วลากเพื่อเลื่อนหน้าต่าง
@@ -422,7 +399,7 @@ STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :ไม่มี
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}ชื่อ
 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                                          :อันดับที่ 1
 STR_ORDINAL_NUMBER_2ND                                          :อันดับที่ 2
 STR_ORDINAL_NUMBER_3RD                                          :อันดับที่ 3
@@ -456,6 +433,31 @@ STR_ORDINAL_NUMBER_30TH                                         :อันดั
 STR_ORDINAL_NUMBER_31ST                                         :อันดับที่ 31
 ############ range for days ends
 
+############ range for months starts
+STR_MONTH_ABBREV_JAN                                            :ม.ค.
+STR_MONTH_ABBREV_FEB                                            :ก.พ.
+STR_MONTH_ABBREV_MAR                                            :มี.ค.
+STR_MONTH_ABBREV_APR                                            :เม.ย.
+STR_MONTH_ABBREV_MAY                                            :พ.ค.
+STR_MONTH_ABBREV_JUN                                            :มิ.ย.
+STR_MONTH_ABBREV_JUL                                            :ก.ค.
+STR_MONTH_ABBREV_AUG                                            :ส.ค.
+STR_MONTH_ABBREV_SEP                                            :ก.ย.
+STR_MONTH_ABBREV_OCT                                            :ต.ค.
+STR_MONTH_ABBREV_NOV                                            :พ.ย.
+STR_MONTH_ABBREV_DEC                                            :ธ.ค.
+
+STR_MONTH_APR                                                   :เมษายน
+STR_MONTH_MAY                                                   :พฤษภาคม
+STR_MONTH_JUN                                                   :มิถุนายน
+STR_MONTH_JUL                                                   :กรกฎาคม
+STR_MONTH_AUG                                                   :สิงหาคม
+STR_MONTH_SEP                                                   :กันยายน
+STR_MONTH_OCT                                                   :ตุลาคม
+STR_MONTH_NOV                                                   :พฤศจิกายน
+STR_MONTH_DEC                                                   :ธันวาคม
+############ range for months ends
+
 STR_GRAPH_Y_LABEL_NUMBER                                        :{TINYFONT}{COMMA}
 
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}สินค้าที่รับ: {LTBLUE}
@@ -535,12 +537,9 @@ 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_COMMA                                                  :{BLUE}{COMMA}
 STR_SCENEDIT_TOOLBAR_OPENTTD                                    :{YELLOW}OpenTTD
 STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR                            :{YELLOW}โปรแกรมสร้างฉาก
 STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION                   :{WHITE}สร้างแผ่นดิน
-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}สร้างแผ่นดินแบบสุ่ม
@@ -607,9 +606,6 @@ STR_STATUSBAR_SAVING_GAME                                       :{RED}*  *  ก�
 STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}ขณะนี้กำลังบันทึก,{}โปรดรอจนกว่าจะเสร็จ!
 STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE                       :{BLACK}เลือกเพลงฟังรายการเพลง Ezy Street
 
-STR_BLACK_6                                                     :{BLACK}6
-STR_BLACK_7                                                     :{BLACK}7
-
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :อังกฤษ (ดั้งเดิม)
 STR_TOWNNAME_FRENCH                                             :ฝรั่งเศส
@@ -635,16 +631,6 @@ STR_TOWNNAME_ROMANIAN                                           :โรมาเ
 
 
 
-STR_MONTH_APR                                                   :เมษายน
-STR_MONTH_MAY                                                   :พฤษภาคม
-STR_MONTH_JUN                                                   :มิถุนายน
-STR_MONTH_JUL                                                   :กรกฎาคม
-STR_MONTH_AUG                                                   :สิงหาคม
-STR_MONTH_SEP                                                   :กันยายน
-STR_MONTH_OCT                                                   :ตุลาคม
-STR_MONTH_NOV                                                   :พฤศจิกายน
-STR_MONTH_DEC                                                   :ธันวาคม
-
 STR_HEADING_FOR_STATION                                         :{LTBLUE}มุ่งหน้าสู่ {STATION}
 STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}มุ่งหน้าสู่ {STATION}, {VELOCITY}
 STR_NO_ORDERS                                                   :{LTBLUE}ไม่มีสถานที่ที่ต้องไป
@@ -659,8 +645,6 @@ STR_CRATES                                                      :ลัง
 STR_RES_OTHER                                                   :อื่นๆ
 STR_NOTHING                                                     :
 
-STR_TINY_RIGHT_ARROW                                            :{TINYFONT}{RIGHTARROW}
-
 STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}ไม่สามารถใช้รายการสถานที่ร่วมกันได้
 STR_CANT_COPY_ORDER_LIST                                        :{WHITE}ไม่สามารถคัดลอกรายการสถานที่ได้
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - สิ้นสุดรายการที่ใช้ร่วมกัน - -
@@ -805,7 +789,6 @@ STR_SUBSIDIES_CAPTION                                           :{WHITE}เง�
 STR_SUBSIDIES_OFFERED_TITLE                                     :{BLACK}ให้เงินอุดหนุนสำหรับการบริการ:
 STR_SUBSIDIES_SUBSIDISED_TITLE                                  :{BLACK}การบริการได้เงินอุดหนุนเรียบร้อยแล้ว:
 
-
 ##id 0x2800
 
 ##id 0x3000
@@ -814,6 +797,8 @@ STR_SUBSIDIES_SUBSIDISED_TITLE                                  :{BLACK}กา�
 ############ range for rating starts
 ############ range for rating ends
 
+### station view strings
+
 
 
 ##id 0x3800
@@ -838,6 +823,7 @@ STR_SUBSIDIES_SUBSIDISED_TITLE                                  :{BLACK}กา�
 ############ These strings may never get a new id, or savegames will break!
 ##id 0x6000
 
+##id 0x6020
 
 ############ end of savegame specific region!
 
@@ -880,8 +866,6 @@ STR_VEHICLE_NAME_ROAD_VEHICLE_UHL_ARMORED_TRUCK                 :รถหุ้
 
 
 
-
-
 ##id 0x9000
 
 
@@ -912,6 +896,48 @@ STR_PERFORMANCE_DETAIL_INT                                      :{BLACK}{NUM}
 
 
 
+############ Vehicle lists
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -950,19 +976,41 @@ STR_PERFORMANCE_DETAIL_INT                                      :{BLACK}{NUM}
 ############ Tooltip measurment
 
 
-############ Date formatting
 
-########
 
 
+##### Mass Order
+
 
 
-##### Mass Order
 
+#### String control codes and their formatting
 
 
 
 
+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_SMALL_ARROW_UP                                        :{BLACK}{SMALLUPARROW}
+STR_BLACK_SMALL_ARROW_DOWN                                      :{BLACK}{SMALLDOWNARROW}
+STR_TINY_RIGHT_ARROW                                            :{TINYFONT}{RIGHTARROW}
+
+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
+
 
 #### Improved sign GUI
 
diff --git a/src/lang/unfinished/urdu.txt b/src/lang/unfinished/urdu.txt
index a58dd5368..f065eedee 100644
--- a/src/lang/unfinished/urdu.txt
+++ b/src/lang/unfinished/urdu.txt
@@ -95,16 +95,10 @@ STR_QUANTITY_COAL                                               :{WEIGHT} کوی
 STR_ERROR_CAN_T_DO_THIS                                         :{WHITE}یہ نہیں کر سکتا۔۔۔
 STR_ERROR_CAN_T_CLEAR_THIS_AREA                                 :{WHITE}یہ جگہ صاف نہیں کر سکتا۔۔۔
 
-STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
-STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_QUIT_CAPTION                                                :{WHITE}باہر نکلو
 STR_YES                                                         :{BLACK}ہاں
 STR_NO                                                          :{BLACK}نہیں
-STR_BLACK_1                                                     :{BLACK}۱
-STR_BLACK_2                                                     :{BLACK}۲
-STR_BLACK_3                                                     :{BLACK}۳
-STR_BLACK_4                                                     :{BLACK}۴
-STR_BLACK_5                                                     :{BLACK}۵
+
 STR_JUST_NOTHING                                                :کچھ نہیں
 STR_COLOUR_DARK_BLUE                                            :گہرا نیلا
 STR_COLOUR_PALE_GREEN                                           :ہلکا سبز
@@ -121,8 +115,6 @@ STR_COLOUR_BROWN                                                :بھورا
 STR_COLOUR_GREY                                                 :سلیٹی
 STR_COLOUR_WHITE                                                :سفید
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}کھیل میں بہت زیادہ سواریاں
-STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
-STR_RED_COMMA                                                   :{RED}{COMMA}
 STR_BUTTON_LOCATION                                             :{BLACK}جگہ
 STR_SMALLMAP_TYPE_VEHICLES                                      :سواریاں
 STR_SMALLMAP_TYPE_INDUSTRIES                                    :صنعتیں
@@ -172,27 +164,28 @@ STR_SORT_ORDER_TIP                                              :{BLACK} (ترت
 STR_SORT_CRITERIA_TIP                                           :{BLACK}ترتیب کا طریقہ منتخب کریں
 STR_SORT_BY                                                     :{BLACK}سے ترتیب دو
 
+### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}آبادی
+STR_SORT_BY_NAME                                                :{BLACK}نام
+STR_SORT_BY_DATE                                                :{BLACK}تاریخ
 STR_SORT_BY_PRODUCTION                                          :پیداوار
 STR_SORT_BY_TYPE                                                :طرز
 STR_SORT_BY_TRANSPORTED                                         :منتقل شدہ
-STR_SORT_BY_NAME                                                :{BLACK}نام
-STR_SORT_BY_DATE                                                :{BLACK}تاریخ
 STR_SORT_BY_NUMBER                                              :تعداد
 STR_SORT_BY_PROFIT_LAST_YEAR                                    :پچھلے سال کا منافع
 STR_SORT_BY_CARGO_CAPACITY                                      :سامان کی گنجایش
+
 STR_NO_WAITING_CARGO                                            :{BLACK}کسی قسم کا کویی سامان انتظار نہیں کر رہا ہے
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}تمام سہولتوں کا انتخاب کرو
 STR_SELECT_ALL_TYPES                                            :{BLACK}تمام قسم کا سامان کا انتخاب کرو  (بشمول غیر منتظر سامان کے)
+STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}اس قسم کی گاڑیوں کےلیے دستیاب انجنوں کی فہرست دیکھو
+STR_MANAGE_LIST                                                 :{BLACK}فہرست کا انتظام کرو
+
 STR_AVAILABLE_TRAINS                                            :{BLACK}دستیاب ریل گاڑیاں
 STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}دستیاب گاڑیاں
 STR_AVAILABLE_SHIPS                                             :{BLACK}دستیاب کشتیاں
 STR_AVAILABLE_AIRCRAFT                                          :{BLACK}دستیاب ہوایی جہاز
-STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}اس قسم کی گاڑیوں کےلیے دستیاب انجنوں کی فہرست دیکھو
-STR_MANAGE_LIST                                                 :{BLACK}فہرست کا انتظام کرو
 
-############ range for months starts
-############ range for months ends
 
 STR_TOOLBAR_TOOLTIP_DISPLAY_COMPANY_FINANCES                    :{BLACK}کمپنی کی مالیاتی معلومات دکھاو
 STR_TOOLBAR_TOOLTIP_DISPLAY_COMPANY_GENERAL                     :{BLACK}کمپنی کی عام معلومات دکھاو
@@ -208,8 +201,6 @@ 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_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}زمین کے ایک مربے پر عمارتیں وغیرہ گراو
@@ -220,9 +211,13 @@ STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND                    :{BLACK}زمین
 ############ range for service numbers ends
 
 
-############ range for days starts
+############ range for days starts (also used for the place in the highscore window)
 ############ range for days ends
 
+############ range for months starts
+
+############ range for months ends
+
 
 
 
@@ -247,7 +242,6 @@ STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND                    :{BLACK}زمین
 
 
 
-
 ############ start of townname region
 ############ end of townname region
 
@@ -263,8 +257,6 @@ STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND                    :{BLACK}زمین
 
 
 
-
-
 # Start of order review system.
 # DON'T ADD OR REMOVE LINES HERE
 # end of order system
@@ -375,7 +367,6 @@ STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND                    :{BLACK}زمین
 
 ##id 0x2000
 
-
 ##id 0x2800
 
 ##id 0x3000
@@ -384,6 +375,8 @@ STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND                    :{BLACK}زمین
 ############ range for rating starts
 ############ range for rating ends
 
+### station view strings
+
 
 
 ##id 0x3800
@@ -408,6 +401,7 @@ STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND                    :{BLACK}زمین
 ############ These strings may never get a new id, or savegames will break!
 ##id 0x6000
 
+##id 0x6020
 
 ############ end of savegame specific region!
 
@@ -440,8 +434,6 @@ STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND                    :{BLACK}زمین
 
 
 
-
-
 ##id 0x9000
 
 
@@ -471,6 +463,48 @@ STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND                    :{BLACK}زمین
 
 
 
+############ Vehicle lists
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -509,19 +543,33 @@ STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND                    :{BLACK}زمین
 ############ Tooltip measurment
 
 
-############ Date formatting
 
-########
 
 
+##### Mass Order
+
 
 
-##### Mass Order
 
+#### String control codes and their formatting
 
 
 
 
+STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
+STR_RED_COMMA                                                   :{RED}{COMMA}
+STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
+STR_SILVER_CROSS                                                :{SILVER}{CROSS}
+
+STR_BLACK_SMALL_ARROW_UP                                        :{BLACK}{SMALLUPARROW}
+STR_BLACK_SMALL_ARROW_DOWN                                      :{BLACK}{SMALLDOWNARROW}
+
+STR_BLACK_1                                                     :{BLACK}۱
+STR_BLACK_2                                                     :{BLACK}۲
+STR_BLACK_3                                                     :{BLACK}۳
+STR_BLACK_4                                                     :{BLACK}۴
+STR_BLACK_5                                                     :{BLACK}۵
+
 
 #### Improved sign GUI
 
diff --git a/src/lang/unfinished/vietnamese.txt b/src/lang/unfinished/vietnamese.txt
index a25ac9df8..908e58955 100644
--- a/src/lang/unfinished/vietnamese.txt
+++ b/src/lang/unfinished/vietnamese.txt
@@ -141,8 +141,6 @@ STR_ABBREV_PLASTIC                                              :{TINYFONT}Cd
 STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}Ug
 STR_ABBREV_NONE                                                 :{TINYFONT}K0
 STR_ABBREV_ALL                                                  :{TINYFONT}Tất
-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
@@ -152,17 +150,11 @@ STR_ERROR_CAN_T_DO_THIS                                         :{WHITE}Không t
 STR_ERROR_CAN_T_CLEAR_THIS_AREA                                 :{WHITE}Không thể dọn dẹp khu vực này....
 STR_ABOUT_VERSION                                               :{BLACK}OpenTTD phiên bản {REV}
 
-STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
-STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_QUIT_CAPTION                                                :{WHITE}Thoát
 STR_YES                                                         :{BLACK}Đồng ý
 STR_NO                                                          :{BLACK}Không đồng ý
 STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Bạn có chắc chắn muốn thoát khỏi OpenTTD và trở lại {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                                                :Không màu
 STR_COLOUR_DARK_BLUE                                            :Xanh da trời đậm
 STR_COLOUR_PALE_GREEN                                           :Xanh lá cây nhạt
@@ -181,8 +173,6 @@ STR_COLOUR_BROWN                                                :Nâu
 STR_COLOUR_GREY                                                 :Xám
 STR_COLOUR_WHITE                                                :Trắng
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}Quá nhiều phương tiện trong trò chơi
-STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
-STR_RED_COMMA                                                   :{RED}{COMMA}
 STR_BUTTON_LOCATION                                             :{BLACK}Vị trí
 STR_SMALLMAP_TYPE_CONTOURS                                      :Địa hình
 STR_SMALLMAP_TYPE_VEHICLES                                      :Phương tiện
@@ -294,12 +284,13 @@ STR_SORT_ORDER_TIP                                              :{BLACK}Chọn t
 STR_SORT_CRITERIA_TIP                                           :{BLACK}Chọn tiêu chí sắp xếp
 STR_SORT_BY                                                     :{BLACK}Sắp xếp bởi
 
+### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}Dân số
+STR_SORT_BY_NAME                                                :{BLACK}Tên
+STR_SORT_BY_DATE                                                :{BLACK}Ngày tháng
 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_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
 STR_SORT_BY_PROFIT_THIS_YEAR                                    :Lợi nhuận năm nay
@@ -318,35 +309,23 @@ STR_SORT_BY_INTRO_DATE                                          :Ngày giới th
 STR_SORT_BY_RUNNING_COST                                        :Chi phí chạy
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :Năng lượng/Chi phí chạy
 STR_SORT_BY_CARGO_CAPACITY                                      :Dung lượng toa xe
+
 STR_NO_WAITING_CARGO                                            :{BLACK}Không có bất kỳ loại toa xe nào đang chờ
 STR_SELECT_ALL_TYPES                                            :{BLACK}Chọn tất cả loại toa xe (including no waiting cargo)
-STR_AVAILABLE_TRAINS                                            :{BLACK}Tàu sẵn có
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Xe sẵn có
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Máy bay sẵn có
 STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Xam danh sách các động cơ thiết kế cho loại toa xe này.
 STR_MANAGE_LIST                                                 :{BLACK}Quản lý danh sách
 STR_MANAGE_LIST_TIP                                             :{BLACK}Gửi chỉ dẫn tới toàn bộ phương tiện trong danh sách
 STR_REPLACE_VEHICLES                                            :Thay phương tiện
+STR_SEND_FOR_SERVICING                                          :Gửi tới dịch vụ sửa chữa
+
+STR_AVAILABLE_TRAINS                                            :{BLACK}Tàu sẵn có
+STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Xe sẵn có
+STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Máy bay sẵn có
+
 STR_SEND_TRAIN_TO_DEPOT                                         :Gửi về xưởng
 STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Gửi về xưởng
 STR_SEND_SHIP_TO_DEPOT                                          :Gửi về xưởng
 STR_SEND_AIRCRAFT_TO_HANGAR                                     :Gửi về Hangar
-STR_SEND_FOR_SERVICING                                          :Gửi tới dịch vụ sửa chữa
-
-############ range for months starts
-STR_MONTH_ABBREV_JAN                                            :T1
-STR_MONTH_ABBREV_FEB                                            :T2
-STR_MONTH_ABBREV_MAR                                            :T3
-STR_MONTH_ABBREV_APR                                            :T4
-STR_MONTH_ABBREV_MAY                                            :T5
-STR_MONTH_ABBREV_JUN                                            :T6
-STR_MONTH_ABBREV_JUL                                            :T7
-STR_MONTH_ABBREV_AUG                                            :T8
-STR_MONTH_ABBREV_SEP                                            :T9
-STR_MONTH_ABBREV_OCT                                            :T10
-STR_MONTH_ABBREV_NOV                                            :T11
-STR_MONTH_ABBREV_DEC                                            :T12
-############ range for months ends
 
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Tạm dừng trò chơi
 STR_TOOLBAR_TOOLTIP_SAVE_GAME_ABANDON_GAME                      :{BLACK}Lưu, thoat trò chơi, thoát
@@ -369,9 +348,37 @@ STR_VEHICLE_IS_GETTING_VERY_OLD                                 :{WHITE}{VEHICLE
 STR_VEHICLE_IS_GETTING_VERY_OLD_AND                             :{WHITE}{VEHICLE} đang xuống cấp trầm trọng và cần được thay thế ngay lập tức
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Tên
 
-############ range for days starts
+############ range for days starts (also used for the place in the highscore window)
 ############ range for days ends
 
+############ range for months starts
+STR_MONTH_ABBREV_JAN                                            :T1
+STR_MONTH_ABBREV_FEB                                            :T2
+STR_MONTH_ABBREV_MAR                                            :T3
+STR_MONTH_ABBREV_APR                                            :T4
+STR_MONTH_ABBREV_MAY                                            :T5
+STR_MONTH_ABBREV_JUN                                            :T6
+STR_MONTH_ABBREV_JUL                                            :T7
+STR_MONTH_ABBREV_AUG                                            :T8
+STR_MONTH_ABBREV_SEP                                            :T9
+STR_MONTH_ABBREV_OCT                                            :T10
+STR_MONTH_ABBREV_NOV                                            :T11
+STR_MONTH_ABBREV_DEC                                            :T12
+
+STR_MONTH_JAN                                                   :Tháng Một
+STR_MONTH_FEB                                                   :Tháng Hai
+STR_MONTH_MAR                                                   :Tháng Ba
+STR_MONTH_APR                                                   :Tháng Tư
+STR_MONTH_MAY                                                   :Tháng Năm
+STR_MONTH_JUN                                                   :Tháng Sáu
+STR_MONTH_JUL                                                   :Tháng Bảy
+STR_MONTH_AUG                                                   :Tháng Tám
+STR_MONTH_SEP                                                   :Tháng Chín
+STR_MONTH_OCT                                                   :Tháng Mười
+STR_MONTH_NOV                                                   :Tháng Mười Một
+STR_MONTH_DEC                                                   :Tháng Mười Hai
+############ range for months ends
+
 
 
 STR_TOOLBAR_SOUND_MUSIC                                         :Âm thanh/aamm nhạc
@@ -427,8 +434,6 @@ STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS                            :{WHITE}...chỉ
 ############ range for menu starts
 ############ range ends here
 
-STR_JUST_RAW_STRING                                             :{STRING}
-
 
 
 
@@ -453,19 +458,6 @@ STR_OPTIONS_FULLSCREEN                                          :{BLACK}Toàn m�
 
 
 
-STR_MONTH_JAN                                                   :Tháng Một
-STR_MONTH_FEB                                                   :Tháng Hai
-STR_MONTH_MAR                                                   :Tháng Ba
-STR_MONTH_APR                                                   :Tháng Tư
-STR_MONTH_MAY                                                   :Tháng Năm
-STR_MONTH_JUN                                                   :Tháng Sáu
-STR_MONTH_JUL                                                   :Tháng Bảy
-STR_MONTH_AUG                                                   :Tháng Tám
-STR_MONTH_SEP                                                   :Tháng Chín
-STR_MONTH_OCT                                                   :Tháng Mười
-STR_MONTH_NOV                                                   :Tháng Mười Một
-STR_MONTH_DEC                                                   :Tháng Mười Hai
-
 
 STR_PASSENGERS                                                  :hành khách
 STR_BAGS                                                        :túi
@@ -477,7 +469,6 @@ STR_RES_OTHER                                                   :khác
 
 
 
-
 # Start of order review system.
 # DON'T ADD OR REMOVE LINES HERE
 # end of order system
@@ -588,7 +579,6 @@ STR_RES_OTHER                                                   :khác
 
 ##id 0x2000
 
-
 ##id 0x2800
 
 ##id 0x3000
@@ -597,6 +587,8 @@ STR_RES_OTHER                                                   :khác
 ############ range for rating starts
 ############ range for rating ends
 
+### station view strings
+
 
 
 ##id 0x3800
@@ -660,6 +652,7 @@ STR_NEWS_INDUSTRY_PRODUCTION_DECREASE_GENERAL                   :{BLACK}{BIGFONT
 ############ These strings may never get a new id, or savegames will break!
 ##id 0x6000
 
+##id 0x6020
 
 ############ end of savegame specific region!
 
@@ -692,8 +685,6 @@ STR_NEWS_INDUSTRY_PRODUCTION_DECREASE_GENERAL                   :{BLACK}{BIGFONT
 
 
 
-
-
 ##id 0x9000
 
 STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}Không thể làm xe quay lại được...
@@ -724,6 +715,48 @@ STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}Không t
 
 
 
+############ Vehicle lists
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -762,18 +795,33 @@ STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}Không t
 ############ Tooltip measurment
 
 
-############ Date formatting
 
-########
 
 
+##### Mass Order
+
 
 
-##### Mass Order
 
+#### String control codes and their formatting
+
+STR_JUST_RAW_STRING                                             :{STRING}
 
 
 
+STR_BLACK_COMMA                                                 :{BLACK}{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_1                                                     :{BLACK}1
+STR_BLACK_2                                                     :{BLACK}2
+STR_BLACK_3                                                     :{BLACK}3
+STR_BLACK_4                                                     :{BLACK}4
+STR_BLACK_5                                                     :{BLACK}5
 
 
 #### Improved sign GUI
diff --git a/src/lang/welsh.txt b/src/lang/welsh.txt
index 7c714d02d..8fc83eef2 100644
--- a/src/lang/welsh.txt
+++ b/src/lang/welsh.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_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
@@ -167,17 +165,11 @@ STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Hawlfrai
 STR_ABOUT_VERSION                                               :{BLACK}fersiwn OpenTTD {REV}
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 Y tîm OpenTTD
 
-STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
-STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_QUIT_CAPTION                                                :{WHITE}Gadael
 STR_YES                                                         :{BLACK}Iawn
 STR_NO                                                          :{BLACK}Na
 STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Ydych chi eisiau gadael y gêm a dychwelyd i {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                                                :Dim
 STR_COLOUR_DARK_BLUE                                            :Glas Tywyll
 STR_COLOUR_PALE_GREEN                                           :Gwyrdd Golau
@@ -196,8 +188,6 @@ STR_COLOUR_BROWN                                                :Frown
 STR_COLOUR_GREY                                                 :Llwyd
 STR_COLOUR_WHITE                                                :Gwyn
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}Mae gormod o gerbydau yn y gêm
-STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
-STR_RED_COMMA                                                   :{RED}{COMMA}
 STR_BUTTON_LOCATION                                             :{BLACK}Lleoliad
 STR_SMALLMAP_TYPE_CONTOURS                                      :Cyfuchlin
 STR_SMALLMAP_TYPE_VEHICLES                                      :Cerbydau
@@ -323,12 +313,13 @@ STR_SORT_CRITERIA_TIP                                           :{BLACK}Dewiswch
 STR_FILTER_CRITERIA_TIP                                         :{BLACK}dewis criteria hidlyr
 STR_SORT_BY                                                     :{BLACK}Trefnu yn ôl
 
+### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}Poblogaeth
+STR_SORT_BY_NAME                                                :{BLACK}Enw
+STR_SORT_BY_DATE                                                :{BLACK}Dyddiad
 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_DATE                                                :{BLACK}Dyddiad
 STR_SORT_BY_NUMBER                                              :Rhif
 STR_SORT_BY_PROFIT_LAST_YEAR                                    :Elw eleni
 STR_SORT_BY_PROFIT_THIS_YEAR                                    :Elw llynedd
@@ -351,37 +342,25 @@ STR_SORT_BY_INTRO_DATE                                          :Dyddiad Cyflwyn
 STR_SORT_BY_RUNNING_COST                                        :Côst Rhedeg
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :Côst Pŵer/Rhedeg
 STR_SORT_BY_CARGO_CAPACITY                                      :Gallu cludo Llwyth
+
 STR_NO_WAITING_CARGO                                            :{BLACK}Nid oes llwyth o unrhyw fath yn disgwyl
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}Dewis pob cyfleuster
 STR_SELECT_ALL_TYPES                                            :{BLACK}Dewis pob math llwyth (gan gynnwys llwythi dim aros)
-STR_AVAILABLE_TRAINS                                            :{BLACK}Trenau sydd ar gael
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Cerbydau sydd ar gael
-STR_AVAILABLE_SHIPS                                             :{BLACK}Llongau sydd ar gael
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Awyrennau sydd ar gael
 STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Gweld rhestr o'r cynlluniau modur sydd ar gael ar gyfer y math cerbyd hwn.
 STR_MANAGE_LIST                                                 :{BLACK}Golygu'r rhestr
 STR_MANAGE_LIST_TIP                                             :{BLACK}Anfon y cyfarwyddiadau at bob cerbyd yn y rhestr
 STR_REPLACE_VEHICLES                                            :Cyfnewid Cerbydau
+STR_SEND_FOR_SERVICING                                          :Gyrru i dderbyn Gwasanaeth
+
+STR_AVAILABLE_TRAINS                                            :{BLACK}Trenau sydd ar gael
+STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Cerbydau sydd ar gael
+STR_AVAILABLE_SHIPS                                             :{BLACK}Llongau sydd ar gael
+STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Awyrennau sydd ar gael
+
 STR_SEND_TRAIN_TO_DEPOT                                         :Gyrru i Ddepo
 STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Gyrru i Ddepo
 STR_SEND_SHIP_TO_DEPOT                                          :Gyrru i Ddepo
 STR_SEND_AIRCRAFT_TO_HANGAR                                     :Gyrru i Awyrendy
-STR_SEND_FOR_SERVICING                                          :Gyrru i dderbyn Gwasanaeth
-
-############ range for months starts
-STR_MONTH_ABBREV_JAN                                            :Ion
-STR_MONTH_ABBREV_FEB                                            :Chwe
-STR_MONTH_ABBREV_MAR                                            :Maw
-STR_MONTH_ABBREV_APR                                            :Ebr
-STR_MONTH_ABBREV_MAY                                            :Mai
-STR_MONTH_ABBREV_JUN                                            :Meh
-STR_MONTH_ABBREV_JUL                                            :Gor
-STR_MONTH_ABBREV_AUG                                            :Awst
-STR_MONTH_ABBREV_SEP                                            :Medi
-STR_MONTH_ABBREV_OCT                                            :Hyd
-STR_MONTH_ABBREV_NOV                                            :Tach
-STR_MONTH_ABBREV_DEC                                            :Rhag
-############ range for months ends
 
 STR_GRAPH_X_LABEL_MONTH                                         :{TINYFONT}{STRING}{} {STRING}
 STR_GRAPH_X_LABEL_MONTH_YEAR                                    :{TINYFONT}{STRING}{} {STRING}{}{NUM}
@@ -409,8 +388,6 @@ 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_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
@@ -457,7 +434,7 @@ STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Dim
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Enw
 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                                          :1af
 STR_ORDINAL_NUMBER_2ND                                          :2il
 STR_ORDINAL_NUMBER_3RD                                          :3ydd
@@ -491,6 +468,34 @@ STR_ORDINAL_NUMBER_30TH                                         :30fed
 STR_ORDINAL_NUMBER_31ST                                         :31fed
 ############ range for days ends
 
+############ range for months starts
+STR_MONTH_ABBREV_JAN                                            :Ion
+STR_MONTH_ABBREV_FEB                                            :Chwe
+STR_MONTH_ABBREV_MAR                                            :Maw
+STR_MONTH_ABBREV_APR                                            :Ebr
+STR_MONTH_ABBREV_MAY                                            :Mai
+STR_MONTH_ABBREV_JUN                                            :Meh
+STR_MONTH_ABBREV_JUL                                            :Gor
+STR_MONTH_ABBREV_AUG                                            :Awst
+STR_MONTH_ABBREV_SEP                                            :Medi
+STR_MONTH_ABBREV_OCT                                            :Hyd
+STR_MONTH_ABBREV_NOV                                            :Tach
+STR_MONTH_ABBREV_DEC                                            :Rhag
+
+STR_MONTH_JAN                                                   :Ionawr
+STR_MONTH_FEB                                                   :Chwefror
+STR_MONTH_MAR                                                   :Mawrth
+STR_MONTH_APR                                                   :Ebrill
+STR_MONTH_MAY                                                   :Mai
+STR_MONTH_JUN                                                   :Mehefin
+STR_MONTH_JUL                                                   :Gorffennaf
+STR_MONTH_AUG                                                   :Awst
+STR_MONTH_SEP                                                   :Medi
+STR_MONTH_OCT                                                   :Hydref
+STR_MONTH_NOV                                                   :Tachwedd
+STR_MONTH_DEC                                                   :Rhagfyr
+############ range for months ends
+
 STR_GRAPH_Y_LABEL_NUMBER                                        :{TINYFONT}{COMMA}
 
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}Llwythi sy'n cael eu derbyn: {LTBLUE}
@@ -580,12 +585,9 @@ 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_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_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
@@ -667,9 +669,7 @@ STR_OFF                                                         :I Ffwrdd
 STR_SUMMARY                                                     :Crynodeb
 STR_FULL                                                        :Llawn
 STR_STATUSBAR_COMPANY_NAME                                      :{SILVER}- -  {COMPANY}  - -
-STR_BLACK_STRING                                                :{BLACK}{STRING}
 
-STR_JUST_CHECKMARK                                              :{CHECKMARK}
 ############ range for menu starts
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Dewisiadau Ge^m
 STR_SETTINGS_MENU_DIFFICULTY_SETTINGS                           :Gosodiadau Anhawster
@@ -774,9 +774,6 @@ 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_BLACK_6                                                     :{BLACK}6
-STR_BLACK_7                                                     :{BLACK}7
-
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Saesneg (Gwreiddiol)
 STR_TOWNNAME_FRENCH                                             :Ffrangeg
@@ -856,19 +853,6 @@ STR_OPTIONS_BASE_GRF_DESCRIPTION_TIP                            :{BLACK}gwybodae
 
 STR_AUTOSAVE_FAILED                                             :{WHITE}Methodd yr Awtogadw
 
-STR_MONTH_JAN                                                   :Ionawr
-STR_MONTH_FEB                                                   :Chwefror
-STR_MONTH_MAR                                                   :Mawrth
-STR_MONTH_APR                                                   :Ebrill
-STR_MONTH_MAY                                                   :Mai
-STR_MONTH_JUN                                                   :Mehefin
-STR_MONTH_JUL                                                   :Gorffennaf
-STR_MONTH_AUG                                                   :Awst
-STR_MONTH_SEP                                                   :Medi
-STR_MONTH_OCT                                                   :Hydref
-STR_MONTH_NOV                                                   :Tachwedd
-STR_MONTH_DEC                                                   :Rhagfyr
-
 STR_HEADING_FOR_STATION                                         :{LTBLUE}Ar ei ffordd i {STATION}
 STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}Ar ei ffordd i {STATION}, {VELOCITY}
 STR_NO_ORDERS                                                   :{LTBLUE}Dim gorchmynion
@@ -883,8 +867,6 @@ STR_CRATES                                                      :crât
 STR_RES_OTHER                                                   :arall
 STR_NOTHING                                                     :
 
-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...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Diwedd y Gorchmynion sydd wedi'u Rhannu - -
@@ -1156,7 +1138,6 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Y-faint
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :analluogwyd
-STR_JUST_CURRENCY                                               :{CURRENCY}
 STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Newid gwerth gosodiad
 
 STR_TEMPERATE_LANDSCAPE                                         :Tirwedd Tymherus
@@ -1258,11 +1239,6 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Enwau di
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...rhy agos i ddiwydiant arall
 
-STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Ailffitio trên i gario llwyth o fath gwahanol
-STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Ailffitio trên
-STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Dewiswch fath o lwyth i'r trên ei gario
-STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Ailffitio'r trên i gario'r math o llwyth sydd wedi'i ddewis
-STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Methu ailffitio trên...
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Newid cynnyrch
 
 ############ network gui strings
@@ -2075,6 +2051,7 @@ STR_SV_STNAME_AIRPORT                                           :Maes Awyr {STRI
 STR_SV_STNAME_OILFIELD                                          :Maes Olew{STRING}
 STR_SV_STNAME_MINES                                             :Mwynglawdd {STRING}
 STR_SV_STNAME_DOCKS                                             :Dociau {STRING}
+##id 0x6020
 STR_SV_STNAME_ANNEXE                                            :{STRING} Rhandre
 STR_SV_STNAME_SIDINGS                                           :{STRING} Cilffordd
 STR_SV_STNAME_BRANCH                                            :{STRING} Cangen
@@ -2122,8 +2099,6 @@ STR_NUM_LOW                                                     :Isel
 STR_NUM_NORMAL                                                  :Arferol
 STR_NUM_HIGH                                                    :Anodd
 STR_NUM_CUSTOM                                                  :Addasedig
-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
@@ -2591,10 +2566,8 @@ STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE                          :trên monoreilf
 STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE                            :trên maglef
 
 ##id 0x8800
-STR_DEPOT_TRAIN_CAPTION                                         :{WHITE}Depo Trên {TOWN}
 STR_NEWS_FIRST_TRAIN_ARRIVAL                                    :{BLACK}{BIGFONT}Mae'r trigolion yn dathlu . . .{}Mae'r trên cyntaf wedi cyrraedd {STATION}!
 STR_VEHICLE_DETAILS_CAPTION                                     :{WHITE}{VEHICLE} (Manylion)
-STR_ERROR_TRAIN_IN_THE_WAY                                      :{WHITE}Trên yn y ffordd
 STR_ORDER                                                       :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 STR_ORDER_SELECTED                                              :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 STR_ORDER_NON_STOP                                              :{BLACK}Heb stop
@@ -2684,37 +2657,16 @@ STR_TIMETABLE_AND_TRAVEL_FOR                                    :a theithio am {
 STR_TIMETABLE_DAYS                                              :{COMMA} diwrnod{P "" au}
 STR_TIMETABLE_TICKS                                             :{COMMA} tic{P "" iau}
 
-STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Mynd am Ddepo Trên {TOWN}
-STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Mynd am Ddepo Trên {TOWN}, {VELOCITY}
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Gwasanaeth yn Nepo Trên {TOWN}
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Gwasanaeth yn Nepo Trên {TOWN}, {VELOCITY}
-
 STR_INVALID_ORDER                                               :{RED} (Gorchymyn Annilys)
 
 STR_UNKNOWN_STATION                                             :gorsaf anhysbys
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}Gwag
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} o {STATION}
 STR_VEHICLE_DETAILS_CARGO_FROM_MULT                             :{LTBLUE}{CARGO} o {STATION} (x{NUM})
-STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}Mae {VEHICLE} yn aros yn y depo
-STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Cerbyd Newydd
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}Mae'r Trên yn rhy hir
 STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}Gellir newid trenau yn unig pan fyddan nhw wedi stopio tu mewn i ddepo
 
-STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}Cerbydau Rheilffordd Newydd
-STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}Cerbydau Rheilffordd Trydan Newydd
-STR_BUILD_VEHICLE_TRAIN_MONORAIL_CAPTION                        :{WHITE}Cerbydau Monoreilffordd Newydd
-STR_BUILD_VEHICLE_TRAIN_MAGLEV_CAPTION                          :{WHITE}Cerbydau Maglef Newydd
-STR_BUILD_VEHICLE_TRAIN_ALL_CAPTION                             :{WHITE}Cerbydau Rheilffordd
-
-STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_BUTTON                    :{BLACK}Adeiladu Cerbyd
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Dyblygu Cerbyd
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Bydd hyn yn adeiladu copi o the cerbyd ffordd. Bydd Ctrl-clic yn rhannu'r gorchmynion
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Bydd hyn yn adeiladu copi o a cerbyd ffordd. Cliciwch ar y botwm hwn ac yna ar gerbyd ffordd sydd unai tu allan neu tu mewn y depo. Bydd Ctrl-clic yn rhannu'r gorchmynion.
-STR_CLONE_TRAIN                                                 :{BLACK}Dyblygu Trên
-STR_CLONE_TRAIN_INFO                                            :{BLACK}Bydd hyn yn adeiladu copi o'r trên gan gynnwys pob un o'i gerbydau. Bydd Ctrl-clic yn rhannu'r gorchmynion.
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Bydd hyn yn adeiladu copi o'r trên gan gynnwys pob cerbyd. Cliciwch ar y botwm hwn ac yna ar drên sydd unai tu allan neu tu mewn y depo. Bydd Ctrl-clic yn rhannu'r gorchmynion.
-STR_BUILD_VEHICLE_TRAIN_RENAME_BUTTON                           :{BLACK}Ailenwi
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Hepgor
 STR_ORDERS_DELETE_BUTTON                                        :{BLACK}Dileu
 STR_ORDERS_GO_TO_BUTTON                                         :{BLACK}Mynd i
@@ -2730,14 +2682,12 @@ STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Newid i'
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Gorchmynion)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Diwedd Gorchmynion - -
 STR_SERVICE                                                     :{BLACK}Gwasanaeth
-STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Methu adeiladu cerbyd rheilffordd...
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Adeiladwyd: {LTBLUE}{NUM}{BLACK} Gwerth: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Gwerth: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
 STR_VEHICLE_STATUS_LOADING_UNLOADING                            :{LTBLUE}Llwytho / Dadlwytho
 STR_VEHICLE_STATUS_LEAVING                                      :{LTBLUE}Gadael
 STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}Rhaid i'r trên fod wedi'i stopio mewn depo
-STR_ERROR_CAN_T_SEND_TRAIN_TO_DEPOT                             :{WHITE}Methu gyrru trên i depo...
 STR_ERROR_NO_MORE_SPACE_FOR_ORDERS                              :{WHITE}Dim mwy o le ar gyfer gorchmynion
 STR_ERROR_TOO_MANY_ORDERS                                       :{WHITE}Gormod o orchmynion
 STR_ERROR_CAN_T_INSERT_NEW_ORDER                                :{WHITE}Methu ychwanegu gorchymyn newydd...
@@ -2752,25 +2702,11 @@ STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE}ni all c
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}Methu symud y cerbyd...
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}Bydd yr injan ôl wastad yn dilyn ei gymar blaen
 STR_CARGO_N_A                                                   :N/A{SKIP}
-STR_ERROR_CAN_T_SELL_TRAIN                                      :{WHITE}Methu gwerthu cerbyd rheilffordd...
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}Methu dod o hyd i ffordd i'r depo lleol
-STR_ERROR_CAN_T_STOP_START_TRAIN                                :{WHITE}Methu cychwyn/stopio trên...
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}Bwlch rhwng gwasanaeth: {LTBLUE}{COMMA}days{BLACK}   Gwasanaeth diwethaf: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}bwlch rhwng gwasanaeth: {LTBLUE}{COMMA}%{BLACK}  Gwasanaeth diwethaf: {LTBLUE}{DATE_LONG}
-STR_DEPOT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Trenau - cliciwch ar y trên am wybodaeth, llusgwch gerbyd i'w ychwanegu neu i'w dynnu o'r trên
-STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP                            :{BLACK}Adeiladu cerbyd trên newydd
-STR_DEPOT_TRAIN_SELL_TOOLTIP                                    :{BLACK}Llusgwch gerbyd trên yma i'w werthu
-STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}Canoli'r prif olygfa ar leoliad y depo trên
-STR_BUILD_VEHICLE_TRAIN_LIST_TOOLTIP                            :{BLACK}Rhestr dewis trenau - cliciwch ar cerbyd am wybodaeth
-STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_TOOLTIP                   :{BLACK}Adeiladu'r cerbyd trên sydd wedi'i amlygu
-STR_BUILD_VEHICLE_TRAIN_RENAME_TOOLTIP                          :{BLACK}Ailenwi math y cerbyd trên
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP                 :{BLACK}Gweithred y trên sydd wedi'i ddewis - cliciwch yma gychwyn/stopio trên
-STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP                           :{BLACK}Dangos gorchmynion trên
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP                         :{BLACK}Canoli'r prif olygfa ar leoliad y trên
-STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP                    :{BLACK}Anfon trên i'r depo. Bydd CTRL+clic yn rhoi gwasanaeth iddo'n unig
 STR_VEHICLE_VIEW_TRAIN_IGNORE_SIGNAL_TOOLTIP                    :{BLACK}Gorfodi trên i barhau heb fod signal yn ei glirio
 STR_VEHICLE_VIEW_TRAIN_REVERSE_TOOLTIP                          :{BLACK}gwrthdroi cyfeiriad trên
-STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Dangos manylion trên
 STR_VEHICLE_DETAILS_INCREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Cynyddu'r bwlch rhwng gwasanaethu
 STR_VEHICLE_DETAILS_DECREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Gostwng y bwlch rhwng gwasanaethu
 STR_VEHICLE_DETAILS_TRAIN_CARGO_TOOLTIP                         :{BLACK}Dangos manylion y llwyth sy'n cael ei gludo
@@ -2804,15 +2740,10 @@ STR_VEHICLE_STATUS_STOPPED                                      :{RED}Wedi stopi
 STR_ERROR_CAN_T_MAKE_TRAIN_PASS_SIGNAL                          :{WHITE}Does dim modd gwneud i drên basio signal pan fo perygl...
 STR_VEHICLE_STATUS_CRASHED                                      :{RED}Wedi crashio!
 
-STR_QUERY_RENAME_TRAIN_CAPTION                                  :{WHITE}Enwi trên
-STR_ERROR_CAN_T_RENAME_TRAIN                                    :{WHITE}Methu enwi trên...
-STR_VEHICLE_DETAILS_TRAIN_RENAME                                :{BLACK}Enwi trên
 STR_NEWS_TRAIN_CRASH                                            :{BLACK}{BIGFONT}Trên wedi crashio!{}Bu {COMMA} farw yn y ddamwain
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Methu gwrthdroi cyfeiriad  trên...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE                  :{WHITE}ddim yn medru reversio'r cerbyd...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Methu troi cerbydau sy'n meddu ar sawl uned
-STR_QUERY_RENAME_TRAIN_TYPE_CAPTION                             :{WHITE}Ailenwi math y cerbyd trên
-STR_ERROR_CAN_T_RENAME_TRAIN_TYPE                               :{WHITE}Methu ailenwi math y cerbyd trên...
 STR_CLEAR_TIME                                                  :{BLACK}Clirio Amser
 STR_RESET_LATENESS                                              :{BLACK}Ailosod Mesurydd Hwyrni
 STR_CHANGE_WAYPOINT_NAME                                        :{BLACK}Newid enw pwynt llwybro
@@ -2844,43 +2775,14 @@ STR_TIMETABLE_AUTOFILL                                          :{BLACK}Awtolenw
 STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Llenwch yr amserlen yn awtomatig gyda gwerthoedd o'r daith nesaf (Ctrl+Clic er mwyn ceisio cadw amserau aros)
 
 ##id 0x9000
-STR_ERROR_ROAD_VEHICLE_IN_THE_WAY                               :{WHITE}Cerbyd ffordd yn y ffordd
-STR_DEPOT_ROAD_VEHICLE_CAPTION                                  :{WHITE}Depo Cerbydau Ffordd {TOWN}
-STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_BUTTON                      :{BLACK}Cerbyd Newydd
-STR_BUILD_VEHICLE_ROAD_VEHICLE_CAPTION                          :{WHITE}Cerbydau Ffordd Newydd
-STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_BUTTON             :{BLACK}Adeiladu Cerbyd
-STR_ERROR_CAN_T_BUILD_ROAD_VEHICLE                              :{WHITE}Methu adeiladu cerbyd...
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}...rhaid iddo fod wedi'i stopio mewn depo cerbyd ffordd
-STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}Methu gwerthu cerbyd ffordd...
-STR_ERROR_CAN_T_STOP_START_ROAD_VEHICLE                         :{WHITE}Methu stop/start cerbyd ffordd...
-STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}Mae {VEHICLE} yn aros yn y depo
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Mynd am Ddepo Ffordd {TOWN}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Mynd am Ddepo Ffordd {TOWN}, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Mynd am wasanaeth Ddepo Ffordd {TOWN}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Mynd am wasanaeth i Ddepo Ffordd {TOWN}, {VELOCITY}
-STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Methu gyrru cerbyd i'r depo...
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Methu dod o hyd i'r depo lleol
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP          :{BLACK}Gweithred gyfredol y cerbyd - cliciwch yma i gychwyn/stopio'r cerbyd
-STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP                    :{BLACK}Dangos gorchmynion cerbyd
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP                  :{BLACK}Canoli'r brif olygfa ar leoliad y cerbyd
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}Anfon cerbyd i'r depo. Bydd CTRL+clic yn rhoi gwasanaeth iddo'n unig
 STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP                   :{BLACK}Gorfodi cerbyd i droi rownd
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Dangos manylion cerbyd ffordd
-STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Cerbydau - cliciwch ar gerbyd am wybodaeth
-STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}Adeiladu cerbyd ffordd newydd
-STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}Llusgwch gerbyd ffordd to yma i'w werthu
-STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}Canoli'r brif olygfa ar leoliad y depo cerbyd ffordd
-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_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})
 
-STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Enwi cerbyd ffordd
-STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Methu enwi cerbyd ffordd...
-STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Enwi cerbyd ffordd
 STR_NEWS_FIRST_BUS_ARRIVAL                                      :{BLACK}{BIGFONT}Mae'r trigolion yn dathlu . . .{}Mae'r bws cyntaf wedi cyrraedd {STATION}!
 STR_NEWS_FIRST_TRUCK_ARRIVAL                                    :{BLACK}{BIGFONT}Mae'r trigolion yn dathlu . . .{}Mae'r lori gyntaf wedi cyrraedd {STATION}!
 STR_NEWS_FIRST_PASSENGER_TRAM_ARRIVAL                           :{BLACK}{BIGFONT}Mae'r trigolion yn dathlu . . .{} Mae'r tram teithwyr cyntaf wedi cyrraedd {STATION}!
@@ -2888,128 +2790,39 @@ STR_NEWS_FIRST_CARGO_TRAM_ARRIVAL                               :{BLACK}{BIGFONT
 STR_NEWS_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Damwain Cerbyd Ffordd!{}Bu gyrrwr farw mewn damwain â thrên
 STR_NEWS_ROAD_VEHICLE_CRASH                                     :{BLACK}{BIGFONT}Damwain Cerbyd Ffordd!{}Bu farw {COMMA} mewn damwain â thrên
 STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}ddim yn methu troi'r cerbyd...
-STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Ailenwi
-STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Ailenwi'r math cerbyd ffordd
-STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Ailenwi'r math cerbyd ffordd
-STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Methu ailenwi cerbyd ffordd...
 
-STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Ailffitio cerbyd ffordd i gario llwyth o fath gwahanol
-STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Ailffitio cerbyd ffordd
-STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Ailffitio cerbyd ffordd i gario'r llwyth sydd wedi'i amlygu
-STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Methu ailffitio cerbyd ffordd...
-STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Dewiswch y math o lwyth i'r cerbyd ffordd gario
 
 ##id 0x9800
 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :Adeiladu camlesi
 STR_WATERWAYS_TOOLBAR_CAPTION                                   :{WHITE}Adeiladu camlesi
 STR_WATERWAYS_TOOLBAR_CAPTION_SE                                :{WHITE}Camlesi
 STR_ERROR_CAN_T_BUILD_DOCK_HERE                                 :{WHITE}Methu adeiladu doc yma...
-STR_DEPOT_SHIP_CAPTION                                          :{WHITE}Depo Llong {TOWN}
-STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON                              :{BLACK}Llong Newydd
-STR_BUILD_VEHICLE_SHIP_CAPTION                                  :{WHITE}Llong  Newydd
-STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON                     :{BLACK}Adeiladu Llong
-STR_CLONE_SHIP                                                  :{BLACK}Dyblygu Llong
-STR_CLONE_SHIP_INFO                                             :{BLACK}Bydd hyn yn adeiladu copi o'r llong. Bydd Ctrl-clic yn rhannu'r gorchmynion
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Bydd hyn yn adeiladu copi o a llong. Cliciwch a y botwm hwn ac yna ar long tu mewn neu tu allan i'r depo. Bydd Ctrl-clic yn rhannu'r gorchmynion
 STR_ERROR_SHIP_MUST_BE_STOPPED_IN_DEPOT                         :{WHITE}Rhaid i'r llong fod wedi'i stopio mewn depo
-STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}Methu gwerthu llong...
-STR_ERROR_CAN_T_BUILD_SHIP                                      :{WHITE}Methu adeiladu llong...
-STR_ERROR_SHIP_IN_THE_WAY                                       :{WHITE}Llong yn y ffordd
-STR_ERROR_CAN_T_STOP_START_SHIP                                 :{WHITE}methu cychwyn/stopio llong...
-STR_ERROR_CAN_T_SEND_SHIP_TO_DEPOT                              :{WHITE}Methu gyrru llong i ddepo...
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Mynd am Ddepo Llong {TOWN}
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Mynd am Ddepo Llong{TOWN}, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Mynd am wasanaeth i Ddepo Llong {TOWN}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Mynd am wasanaeth i Depo Llong {TOWN}, {VELOCITY}
-STR_NEWS_SHIP_IS_WAITING                                        :{WHITE}Mae {VEHICLE} yn aros yn y depo
 STR_WATERWAYS_TOOLBAR_BUILD_DOCK_TOOLTIP                        :{BLACK}Adeiladu doc llongau
 STR_WATERWAYS_TOOLBAR_BUILD_DEPOT_TOOLTIP                       :{BLACK}Adeiladu depo llongau  (ar gyfer adeiladu a rhoi gwasanaeth i longau)
-STR_DEPOT_SHIP_LIST_TOOLTIP                                     :{BLACK}Llongau - cliciwch ar long am wybodaeth
-STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}Adeiladu llong newydd
-STR_DEPOT_SHIP_SELL_TOOLTIP                                     :{BLACK}Llusgwch long yma i'w gwerthu
-STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}Canoli'r brif olygfa ar leoliad depo'r llong
-STR_BUILD_VEHICLE_SHIP_LIST_TOOLTIP                             :{BLACK}Rhestr ddewis llongau - cliciwch ar long am wybodaeth
-STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP                    :{BLACK}Adeiladu'r llong sydd wedi'i hamlygu
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP                  :{BLACK}Gweithred y llong gyfredol - cliciwch yma i gychwyn/stopio llong
-STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Dangos gorchmynion llong
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP                          :{BLACK}Canoli'r brif olygfa ar leoliad y llong
-STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}Gyrru'r llong i ddepo. Bydd CTRL+clic yn rhoi gwasanaeth iddo'n unig
-STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Dangos manylion llong
-STR_VEHICLE_DETAILS_SHIP_RENAME                                 :{BLACK}Enwi llong
 
-STR_QUERY_RENAME_SHIP_CAPTION                                   :{WHITE}Enwi llong
-STR_ERROR_CAN_T_RENAME_SHIP                                     :{WHITE}Methu enwi llong...
 STR_NEWS_FIRST_SHIP_ARRIVAL                                     :{BLACK}{BIGFONT}Mae'r trigolion yn dathlu . . .{}Mae'r llong gyntaf wedi cyrraedd {STATION}!
 STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}Gosod bwi a ellir ei ddefnyddio fel pwynt llwybr
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}Methu gosod bwi yma...
 STR_BUILD_AQUEDUCT                                              :{BLACK}Adeiladu traphont
 STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}Methu adeiladu traphont yma...
-STR_BUILD_VEHICLE_SHIP_RENAME_BUTTON                            :{BLACK}Ailenwi
-STR_BUILD_VEHICLE_SHIP_RENAME_TOOLTIP                           :{BLACK}Ailenwi'r math llong
-STR_QUERY_RENAME_SHIP_TYPE_CAPTION                              :{WHITE}Ailenwi'r math llong
-STR_ERROR_CAN_T_RENAME_SHIP_TYPE                                :{WHITE}Methu ailenwi math llong...
-STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}Ailffitio cargo llong i gario llwyth o fath gwahanol
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (Ailffitio)
-STR_REFIT_SHIP_REFIT_BUTTON                                     :{BLACK}Ailffitio llong
-STR_REFIT_SHIP_LIST_TOOLTIP                                     :{BLACK}Dewiswch lwyth i'r llong ei gario
-STR_REFIT_SHIP_REFIT_TOOLTIP                                    :{BLACK}Ailffitio llong i gario'r llwyth sydd wedi'i amlygu
 STR_REFIT_TITLE                                                 :{GOLD}Dewiswch y math o lwyth i'w  gario:
 STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}bellach yn gallu cario: {GOLD}{CARGO}{}{BLACK}Côst o ailffitio: {GOLD}{CURRENCY}
-STR_ERROR_CAN_T_REFIT_SHIP                                      :{WHITE}Methu ailffitio llong...
 STR_REFITTABLE                                                  :(gallu ailffitio)
 
 ##id 0xA000
 STR_TOOLBAR_AIRCRAFT_CAPTION                                    :{WHITE}Meysydd Awyr
 STR_ERROR_CAN_T_BUILD_AIRPORT_HERE                              :{WHITE}Methu adeiladu maes awyr yma...
-STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}Awyrendy {STATION}
-STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON                          :{BLACK}Awyrennau Newydd
-STR_CLONE_AIRCRAFT                                              :{BLACK}Dyblygu Awyren
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Bydd hyn yn adeiladu copi o'r awyren. Bydd Ctrl-clic yn rhannu'r gorchmynion
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Bydd hyn yn adeiladu copi o awyren. Cliciwch ar y botwm hwn ac yna ar awyren sydd unai tu mewn neu tu allan i'r awyrendy. Bydd Ctrl-clic yn rhannu'r gorchmynion
-STR_BUILD_VEHICLE_AIRCRAFT_CAPTION                              :{WHITE}Awyrennau Newydd
-STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON                 :{BLACK}Adeiladu Awyrennau
-STR_ERROR_CAN_T_BUILD_AIRCRAFT                                  :{WHITE}Methu adeiladu awyren...
-STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR                         :{WHITE}Methu gyrru awyren i awyrendy...
-STR_HEADING_FOR_HANGAR                                          :{ORANGE}Mynd am Awyrendy {STATION}
-STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Mynd am Awyrendy {STATION}, {VELOCITY}
-STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Mynd am wasanaeth i Awyrendy {STATION}
-STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Mynd am wasanaeth i Awyrendy {STATION}, {VELOCITY}
-STR_NEWS_AIRCRAFT_IS_WAITING                                    :{WHITE}Mae {VEHICLE} yn aros yn yr awrendy
-STR_ERROR_AIRCRAFT_IN_THE_WAY                                   :{WHITE}Awyren yn y ffordd
-STR_ERROR_CAN_T_STOP_START_AIRCRAFT                             :{WHITE}Methu stopio/cychwyn awyren...
 STR_ERROR_AIRCRAFT_IS_IN_FLIGHT                                 :{WHITE}mae'r awyren yn hedfan
 STR_ERROR_AIRCRAFT_MUST_BE_STOPPED                              :{WHITE}Rhaid i awyrennau rhaid i awyrennau fod wedi'i stopio mewn awyrendy
-STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}methu gwerthu awyren...
 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION                          :Adeiladu Maes Awyr
 STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Adeiladu maes awyr
-STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Awyrennau - cliciwch ar awyren am wybodaeth
-STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}Adeiladu awyren newydd
-STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}Llusgwch awyren yma i'w gwerthu
-STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Canoli'r prif olygfa ar leoliad yr awyrendy
-STR_BUILD_VEHICLE_AIRCRAFT_LIST_TOOLTIP                         :{BLACK}Rhestr ddewis awyrennau - cliciwch ar awyren am wybodaeth
-STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_TOOLTIP                :{BLACK}Adeiladu'r awyren sydd wedi'i hamlygu
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP              :{BLACK}Gweithred gyfredol yr awyren - cliciwch yma i stopio/cychwyn awyren
-STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Dangos gorchmynion awyren
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP                      :{BLACK}Canoli'r prif olygfa ar leoliad yr awyren
-STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}Anfon awyren to awyrendy. Bydd CTRL+click yn rhoi gwasanaeth iddo'n unig
-STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Dangos manylion awyren
 
-STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}Enwi awyren
-STR_ERROR_CAN_T_RENAME_AIRCRAFT                                 :{WHITE}Methu enwi awyren...
-STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}Enwi awyren
 STR_NEWS_FIRST_AIRCRAFT_ARRIVAL                                 :{BLACK}{BIGFONT}Mae'r trigolion yn dathlu . . .{}Mae'r awyren gyntaf wedi cyrraedd {STATION}!
 STR_NEWS_AIRCRAFT_CRASH                                         :{BLACK}{BIGFONT}Damwain Awyren!{}Bu farw {COMMA} mewn tanchwa yn {STATION}
 STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Awyren wedi syrthio!{}Rhedodd yr awyren allan o danwydd, bu farw {COMMA} yn y ddamwain!
 STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
-STR_BUILD_VEHICLE_AIRCRAFT_RENAME_BUTTON                        :{BLACK}Ailenwi
-STR_BUILD_VEHICLE_AIRCRAFT_RENAME_TOOLTIP                       :{BLACK}Ailenwi'r math awyren
-STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION                          :{WHITE}Ailenwi'r math awyren
-STR_ERROR_CAN_T_RENAME_AIRCRAFT_TYPE                            :{WHITE}Methu ailenwi'r math awyren...
-STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Ailffitio awyren i gario llwyth o fath gwahanol
-STR_REFIT_AIRCRAFT_REFIT_BUTTON                                 :{BLACK}Ailffitio awyren
-STR_REFIT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Dewiswch y math o lwyth i'r awyren ei chario
-STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}Ailffitio awyren i gario'r math o lwyth sydd wedi'i amlygu
-STR_ERROR_CAN_T_REFIT_AIRCRAFT                                  :{WHITE}Methu ailffitio awyren...
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Amserlen)
 
@@ -3177,6 +2990,211 @@ STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING}
 STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}Rhestr wedi'i rhannu {COMMA} Cerbyd{P "" au}
 STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Dangos pob cerbydau sy'n rhannu'r amserlen hon
 
+STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}Mae {VEHICLE} yn aros yn y depo
+STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}Mae {VEHICLE} yn aros yn y depo
+STR_NEWS_SHIP_IS_WAITING                                        :{WHITE}Mae {VEHICLE} yn aros yn y depo
+STR_NEWS_AIRCRAFT_IS_WAITING                                    :{WHITE}Mae {VEHICLE} yn aros yn yr awrendy
+
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Ailffitio trên
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Ailffitio cerbyd ffordd
+STR_REFIT_SHIP_REFIT_BUTTON                                     :{BLACK}Ailffitio llong
+STR_REFIT_AIRCRAFT_REFIT_BUTTON                                 :{BLACK}Ailffitio awyren
+
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Ailffitio'r trên i gario'r math o llwyth sydd wedi'i ddewis
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Ailffitio cerbyd ffordd i gario'r llwyth sydd wedi'i amlygu
+STR_REFIT_SHIP_REFIT_TOOLTIP                                    :{BLACK}Ailffitio llong i gario'r llwyth sydd wedi'i amlygu
+STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}Ailffitio awyren i gario'r math o lwyth sydd wedi'i amlygu
+
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Dewiswch fath o lwyth i'r trên ei gario
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Dewiswch y math o lwyth i'r cerbyd ffordd gario
+STR_REFIT_SHIP_LIST_TOOLTIP                                     :{BLACK}Dewiswch lwyth i'r llong ei gario
+STR_REFIT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Dewiswch y math o lwyth i'r awyren ei chario
+
+STR_DEPOT_TRAIN_CAPTION                                         :{WHITE}Depo Trên {TOWN}
+STR_DEPOT_ROAD_VEHICLE_CAPTION                                  :{WHITE}Depo Cerbydau Ffordd {TOWN}
+STR_DEPOT_SHIP_CAPTION                                          :{WHITE}Depo Llong {TOWN}
+STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}Awyrendy {STATION}
+
+STR_VEHICLE_DETAILS_TRAIN_RENAME                                :{BLACK}Enwi trên
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Enwi cerbyd ffordd
+STR_VEHICLE_DETAILS_SHIP_RENAME                                 :{BLACK}Enwi llong
+STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}Enwi awyren
+
+STR_QUERY_RENAME_TRAIN_CAPTION                                  :{WHITE}Enwi trên
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Enwi cerbyd ffordd
+STR_QUERY_RENAME_SHIP_CAPTION                                   :{WHITE}Enwi llong
+STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}Enwi awyren
+
+STR_ERROR_TRAIN_IN_THE_WAY                                      :{WHITE}Trên yn y ffordd
+STR_ERROR_ROAD_VEHICLE_IN_THE_WAY                               :{WHITE}Cerbyd ffordd yn y ffordd
+STR_ERROR_SHIP_IN_THE_WAY                                       :{WHITE}Llong yn y ffordd
+STR_ERROR_AIRCRAFT_IN_THE_WAY                                   :{WHITE}Awyren yn y ffordd
+
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Methu ailffitio trên...
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Methu ailffitio cerbyd ffordd...
+STR_ERROR_CAN_T_REFIT_SHIP                                      :{WHITE}Methu ailffitio llong...
+STR_ERROR_CAN_T_REFIT_AIRCRAFT                                  :{WHITE}Methu ailffitio awyren...
+
+STR_ERROR_CAN_T_RENAME_TRAIN                                    :{WHITE}Methu enwi trên...
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Methu enwi cerbyd ffordd...
+STR_ERROR_CAN_T_RENAME_SHIP                                     :{WHITE}Methu enwi llong...
+STR_ERROR_CAN_T_RENAME_AIRCRAFT                                 :{WHITE}Methu enwi awyren...
+
+STR_ERROR_CAN_T_STOP_START_TRAIN                                :{WHITE}Methu cychwyn/stopio trên...
+STR_ERROR_CAN_T_STOP_START_ROAD_VEHICLE                         :{WHITE}Methu stop/start cerbyd ffordd...
+STR_ERROR_CAN_T_STOP_START_SHIP                                 :{WHITE}methu cychwyn/stopio llong...
+STR_ERROR_CAN_T_STOP_START_AIRCRAFT                             :{WHITE}Methu stopio/cychwyn awyren...
+
+STR_ERROR_CAN_T_SEND_TRAIN_TO_DEPOT                             :{WHITE}Methu gyrru trên i depo...
+STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Methu gyrru cerbyd i'r depo...
+STR_ERROR_CAN_T_SEND_SHIP_TO_DEPOT                              :{WHITE}Methu gyrru llong i ddepo...
+STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR                         :{WHITE}Methu gyrru awyren i awyrendy...
+
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Methu adeiladu cerbyd rheilffordd...
+STR_ERROR_CAN_T_BUILD_ROAD_VEHICLE                              :{WHITE}Methu adeiladu cerbyd...
+STR_ERROR_CAN_T_BUILD_SHIP                                      :{WHITE}Methu adeiladu llong...
+STR_ERROR_CAN_T_BUILD_AIRCRAFT                                  :{WHITE}Methu adeiladu awyren...
+
+STR_ERROR_CAN_T_RENAME_TRAIN_TYPE                               :{WHITE}Methu ailenwi math y cerbyd trên...
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Methu ailenwi cerbyd ffordd...
+STR_ERROR_CAN_T_RENAME_SHIP_TYPE                                :{WHITE}Methu ailenwi math llong...
+STR_ERROR_CAN_T_RENAME_AIRCRAFT_TYPE                            :{WHITE}Methu ailenwi'r math awyren...
+
+STR_ERROR_CAN_T_SELL_TRAIN                                      :{WHITE}Methu gwerthu cerbyd rheilffordd...
+STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}Methu gwerthu cerbyd ffordd...
+STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}Methu gwerthu llong...
+STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}methu gwerthu awyren...
+
+STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP                 :{BLACK}Gweithred y trên sydd wedi'i ddewis - cliciwch yma gychwyn/stopio trên
+STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP          :{BLACK}Gweithred gyfredol y cerbyd - cliciwch yma i gychwyn/stopio'r cerbyd
+STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP                  :{BLACK}Gweithred y llong gyfredol - cliciwch yma i gychwyn/stopio llong
+STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP              :{BLACK}Gweithred gyfredol yr awyren - cliciwch yma i stopio/cychwyn awyren
+
+STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP                           :{BLACK}Dangos gorchmynion trên
+STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP                    :{BLACK}Dangos gorchmynion cerbyd
+STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Dangos gorchmynion llong
+STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Dangos gorchmynion awyren
+
+STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP                         :{BLACK}Canoli'r prif olygfa ar leoliad y trên
+STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP                  :{BLACK}Canoli'r brif olygfa ar leoliad y cerbyd
+STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP                          :{BLACK}Canoli'r brif olygfa ar leoliad y llong
+STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP                      :{BLACK}Canoli'r prif olygfa ar leoliad yr awyren
+
+STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP                    :{BLACK}Anfon trên i'r depo. Bydd CTRL+clic yn rhoi gwasanaeth iddo'n unig
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}Anfon cerbyd i'r depo. Bydd CTRL+clic yn rhoi gwasanaeth iddo'n unig
+STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}Gyrru'r llong i ddepo. Bydd CTRL+clic yn rhoi gwasanaeth iddo'n unig
+STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}Anfon awyren to awyrendy. Bydd CTRL+click yn rhoi gwasanaeth iddo'n unig
+
+STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Dangos manylion trên
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Dangos manylion cerbyd ffordd
+STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Dangos manylion llong
+STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Dangos manylion awyren
+
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Ailffitio trên i gario llwyth o fath gwahanol
+STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Ailffitio cerbyd ffordd i gario llwyth o fath gwahanol
+STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}Ailffitio cargo llong i gario llwyth o fath gwahanol
+STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Ailffitio awyren i gario llwyth o fath gwahanol
+
+STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Mynd am Ddepo Trên {TOWN}
+STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Mynd am Ddepo Trên {TOWN}, {VELOCITY}
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Mynd am Ddepo Ffordd {TOWN}
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Mynd am Ddepo Ffordd {TOWN}, {VELOCITY}
+STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Mynd am Ddepo Llong {TOWN}
+STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Mynd am Ddepo Llong{TOWN}, {VELOCITY}
+STR_HEADING_FOR_HANGAR                                          :{ORANGE}Mynd am Awyrendy {STATION}
+STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Mynd am Awyrendy {STATION}, {VELOCITY}
+
+STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Gwasanaeth yn Nepo Trên {TOWN}
+STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Gwasanaeth yn Nepo Trên {TOWN}, {VELOCITY}
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Mynd am wasanaeth Ddepo Ffordd {TOWN}
+STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Mynd am wasanaeth i Ddepo Ffordd {TOWN}, {VELOCITY}
+STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Mynd am wasanaeth i Ddepo Llong {TOWN}
+STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Mynd am wasanaeth i Depo Llong {TOWN}, {VELOCITY}
+STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Mynd am wasanaeth i Awyrendy {STATION}
+STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Mynd am wasanaeth i Awyrendy {STATION}, {VELOCITY}
+
+
+STR_CLONE_TRAIN                                                 :{BLACK}Dyblygu Trên
+STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Dyblygu Cerbyd
+STR_CLONE_SHIP                                                  :{BLACK}Dyblygu Llong
+STR_CLONE_AIRCRAFT                                              :{BLACK}Dyblygu Awyren
+
+STR_CLONE_TRAIN_INFO                                            :{BLACK}Bydd hyn yn adeiladu copi o'r trên gan gynnwys pob un o'i gerbydau. Bydd Ctrl-clic yn rhannu'r gorchmynion.
+STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Bydd hyn yn adeiladu copi o the cerbyd ffordd. Bydd Ctrl-clic yn rhannu'r gorchmynion
+STR_CLONE_SHIP_INFO                                             :{BLACK}Bydd hyn yn adeiladu copi o'r llong. Bydd Ctrl-clic yn rhannu'r gorchmynion
+STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Bydd hyn yn adeiladu copi o'r awyren. Bydd Ctrl-clic yn rhannu'r gorchmynion
+
+STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Bydd hyn yn adeiladu copi o'r trên gan gynnwys pob cerbyd. Cliciwch ar y botwm hwn ac yna ar drên sydd unai tu allan neu tu mewn y depo. Bydd Ctrl-clic yn rhannu'r gorchmynion.
+STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Bydd hyn yn adeiladu copi o a cerbyd ffordd. Cliciwch ar y botwm hwn ac yna ar gerbyd ffordd sydd unai tu allan neu tu mewn y depo. Bydd Ctrl-clic yn rhannu'r gorchmynion.
+STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Bydd hyn yn adeiladu copi o a llong. Cliciwch a y botwm hwn ac yna ar long tu mewn neu tu allan i'r depo. Bydd Ctrl-clic yn rhannu'r gorchmynion
+STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Bydd hyn yn adeiladu copi o awyren. Cliciwch ar y botwm hwn ac yna ar awyren sydd unai tu mewn neu tu allan i'r awyrendy. Bydd Ctrl-clic yn rhannu'r gorchmynion
+
+STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}Cerbydau Rheilffordd Newydd
+STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}Cerbydau Rheilffordd Trydan Newydd
+STR_BUILD_VEHICLE_TRAIN_MONORAIL_CAPTION                        :{WHITE}Cerbydau Monoreilffordd Newydd
+STR_BUILD_VEHICLE_TRAIN_MAGLEV_CAPTION                          :{WHITE}Cerbydau Maglef Newydd
+
+STR_BUILD_VEHICLE_TRAIN_ALL_CAPTION                             :{WHITE}Cerbydau Rheilffordd
+STR_BUILD_VEHICLE_ROAD_VEHICLE_CAPTION                          :{WHITE}Cerbydau Ffordd Newydd
+STR_BUILD_VEHICLE_SHIP_CAPTION                                  :{WHITE}Llong  Newydd
+STR_BUILD_VEHICLE_AIRCRAFT_CAPTION                              :{WHITE}Awyrennau Newydd
+
+STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_BUTTON                    :{BLACK}Adeiladu Cerbyd
+STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_BUTTON             :{BLACK}Adeiladu Cerbyd
+STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON                     :{BLACK}Adeiladu Llong
+STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON                 :{BLACK}Adeiladu Awyrennau
+
+STR_BUILD_VEHICLE_TRAIN_LIST_TOOLTIP                            :{BLACK}Rhestr dewis trenau - cliciwch ar cerbyd am wybodaeth
+STR_BUILD_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP                     :{BLACK}Rhestr dewis cerbydau ffordd  - cliciwch ar gerbyd am wybodaeth
+STR_BUILD_VEHICLE_SHIP_LIST_TOOLTIP                             :{BLACK}Rhestr ddewis llongau - cliciwch ar long am wybodaeth
+STR_BUILD_VEHICLE_AIRCRAFT_LIST_TOOLTIP                         :{BLACK}Rhestr ddewis awyrennau - cliciwch ar awyren am wybodaeth
+
+STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_TOOLTIP                   :{BLACK}Adeiladu'r cerbyd trên sydd wedi'i amlygu
+STR_BUILD_VEHICLE_ROAD_VEHICLE_BUILD_VEHICLE_TOOLTIP            :{BLACK}Adeiladu'r cerbyd ffordd sydd wedi'i amlygu
+STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP                    :{BLACK}Adeiladu'r llong sydd wedi'i hamlygu
+STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_TOOLTIP                :{BLACK}Adeiladu'r awyren sydd wedi'i hamlygu
+
+STR_BUILD_VEHICLE_TRAIN_RENAME_BUTTON                           :{BLACK}Ailenwi
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Ailenwi
+STR_BUILD_VEHICLE_SHIP_RENAME_BUTTON                            :{BLACK}Ailenwi
+STR_BUILD_VEHICLE_AIRCRAFT_RENAME_BUTTON                        :{BLACK}Ailenwi
+
+STR_BUILD_VEHICLE_TRAIN_RENAME_TOOLTIP                          :{BLACK}Ailenwi math y cerbyd trên
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Ailenwi'r math cerbyd ffordd
+STR_BUILD_VEHICLE_SHIP_RENAME_TOOLTIP                           :{BLACK}Ailenwi'r math llong
+STR_BUILD_VEHICLE_AIRCRAFT_RENAME_TOOLTIP                       :{BLACK}Ailenwi'r math awyren
+
+STR_QUERY_RENAME_TRAIN_TYPE_CAPTION                             :{WHITE}Ailenwi math y cerbyd trên
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Ailenwi'r math cerbyd ffordd
+STR_QUERY_RENAME_SHIP_TYPE_CAPTION                              :{WHITE}Ailenwi'r math llong
+STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION                          :{WHITE}Ailenwi'r math awyren
+
+STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Cerbyd Newydd
+STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_BUTTON                      :{BLACK}Cerbyd Newydd
+STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON                              :{BLACK}Llong Newydd
+STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON                          :{BLACK}Awyrennau Newydd
+
+STR_DEPOT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Trenau - cliciwch ar y trên am wybodaeth, llusgwch gerbyd i'w ychwanegu neu i'w dynnu o'r trên
+STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Cerbydau - cliciwch ar gerbyd am wybodaeth
+STR_DEPOT_SHIP_LIST_TOOLTIP                                     :{BLACK}Llongau - cliciwch ar long am wybodaeth
+STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Awyrennau - cliciwch ar awyren am wybodaeth
+
+STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP                            :{BLACK}Adeiladu cerbyd trên newydd
+STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}Adeiladu cerbyd ffordd newydd
+STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}Adeiladu llong newydd
+STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}Adeiladu awyren newydd
+
+STR_DEPOT_TRAIN_SELL_TOOLTIP                                    :{BLACK}Llusgwch gerbyd trên yma i'w werthu
+STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}Llusgwch gerbyd ffordd to yma i'w werthu
+STR_DEPOT_SHIP_SELL_TOOLTIP                                     :{BLACK}Llusgwch long yma i'w gwerthu
+STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}Llusgwch awyren yma i'w gwerthu
+
+STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}Canoli'r prif olygfa ar leoliad y depo trên
+STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}Canoli'r brif olygfa ar leoliad y depo cerbyd ffordd
+STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}Canoli'r brif olygfa ar leoliad depo'r llong
+STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Canoli'r prif olygfa ar leoliad yr awyrendy
+
+
 ### depot strings
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}Rydych chi ar fin gwerthu pob cerbyd yn y depo. Ydych chi'n siwr?
 STR_DEPOT_WRONG_DEPOT_TYPE                                      :math depo anghywir
@@ -3211,6 +3229,7 @@ STR_REPLACE_REMOVE_WAGON                                        :{BLACK}Tynnu wa
 STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Gwneud i awtoddisodli gadw hyd y trên yr un peth drwy dynnu wagenni (gan ddechrau yn y blaen), os byddai disodli'r injan yn gwneud y trên yn hirach.
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}Disodli: {ORANGE}{SKIP}{SKIP}{STRING}
 STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}Newid rhwng y sgrin ddisodli wagenni a'r un injans.
+
 STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Nid yw'r cerbyd ar gael
 STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Nid yw'r cerbyd ar gael
 STR_SHIP_NOT_AVAILABLE                                          :{WHITE}Nid yw'r llong ar gael
@@ -3425,7 +3444,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}
@@ -3443,6 +3465,31 @@ STR_FORMAT_COMPANY_NUM                                          :(Cwmni {COMMA})
 STR_FORMAT_GROUP_NAME                                           :Grw^p {COMMA}
 STR_FORMAT_INDUSTRY_NAME                                        :{1:STRING} {0:TOWN}
 
+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}Rhaid i'r enw fod yn unigryw
 
 #### Improved sign GUI