(svn r17075) -Codechange: rename ~750 strings to be more uniform with their relatives

1 files changed, 184 insertions, 184 deletions

diff --git a/src/lang/unfinished/frisian.txt b/src/lang/unfinished/frisian.txt
index 5b262da1b..853ef1a45 100644
--- a/src/lang/unfinished/frisian.txt
+++ b/src/lang/unfinished/frisian.txt
@@ -198,26 +198,26 @@ STR_UNITS_VOLUME_LONG_SI                                        :{COMMA} m³
 STR_UNITS_FORCE_SI                                              :{COMMA} kN
 
 # Common window strings
-STR_SORT_ORDER_TIP                                              :{BLACK}Selektear skiftrjochting (oprinnend/ôfrinnend)
-STR_SORT_CRITERIA_TIP                                           :{BLACK}Selektear skiftnoarm
-STR_FILTER_CRITERIA_TIP                                         :{BLACK}Selekear filternoarm
-STR_SORT_BY                                                     :{BLACK}Skifte op
+STR_TOOLTIP_SORT_ORDER                                          :{BLACK}Selektear skiftrjochting (oprinnend/ôfrinnend)
+STR_TOOLTIP_SORT_CRITERIAP                                      :{BLACK}Selektear skiftnoarm
+STR_TOOLTIP_FILTER_CRITERIA                                     :{BLACK}Selekear filternoarm
+STR_BUTTON_SORT_BY                                              :{BLACK}Skifte op
 STR_BUTTON_LOCATION                                             :{BLACK}Lokaasje
-STR_QUERY_RENAME                                                :{BLACK}Omneame
+STR_BUTTON_RENAME                                               :{BLACK}Omneame
 
 STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Slút finster
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Finstertitel - hjirmei kinst it finster ferslepe
-STR_STICKY_BUTTON                                               :{BLACK}Skerm as net-slútber markeare mei de kaai 'Slút alle skermen'
-STR_RESIZE_BUTTON                                               :{BLACK}Klik en sleep om skermgrutte oan te passen
-STR_TOGGLE_LARGE_SMALL_WINDOW                                   :{BLACK}Wikselje tusken lytse/grutte skermgrutte
+STR_TOOLTIP_STICKY                                              :{BLACK}Skerm as net-slútber markeare mei de kaai 'Slút alle skermen'
+STR_TOOLTIP_RESIZE                                              :{BLACK}Klik en sleep om skermgrutte oan te passen
+STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}Wikselje tusken lytse/grutte skermgrutte
 STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Rolbalke - rollet de list op/del
 STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Rôlbalke - rôlje list links/rjochts
 STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}Brek gebouen ensfh. ôf op in stikje lân
 
 # Query window
-STR_DEFAULT                                                     :{BLACK}Standert
-STR_QUERY_CANCEL                                                :{BLACK}Annulearje
-STR_QUERY_OK                                                    :{BLACK}OK
+STR_BUTTON_DEFAULT                                              :{BLACK}Standert
+STR_BUTTON_CANCEL                                               :{BLACK}Annulearje
+STR_BUTTON_OK                                                   :{BLACK}OK
 
 # On screen keyboard window
 
@@ -288,7 +288,7 @@ STR_SCENEDIT_TOOLBAR_PLACE_SIGN                                 :{BLACK}Set in b
 ############ range for SE file menu starts
 STR_SCENEDIT_FILE_MENU_SAVE_SCENARIO                            :Sla scenario op
 STR_SCENEDIT_FILE_MENU_LOAD_SCENARIO                            :Laad scenario
-STR_MENU_LOAD_HEIGHTMAP                                         :Laad hichtekaart
+STR_SCENEDIT_FILE_MENU_LOAD_HEIGHTMAP                           :Laad hichtekaart
 STR_SCENEDIT_FILE_MENU_QUIT_EDITOR                              :Slút de lânskipsbouer
 STR_SCENEDIT_FILE_MENU_SEPARATOR                                :
 STR_SCENEDIT_FILE_MENU_QUIT                                     :Ôfslúte
@@ -453,7 +453,7 @@ STR_GRAPH_CARGO_PAYMENT_CARGO                                   :{TINYFONT}{BLAC
 
 # Graph key window
 STR_GRAPH_KEY_CAPTION                                           :{WHITE}Kaai foar bedriuwsgrafiken
-STR_GRAPH_KEY_COMPANY_SELECTION                                 :{BLACK}Klik hjir om te bedriuwstagong foar grafyk oan of út te sette
+STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP                         :{BLACK}Klik hjir om te bedriuwstagong foar grafyk oan of út te sette
 
 # Company league window
 STR_COMPANY_LEAGUE_TABLE_CAPTION                                :{WHITE}Bedriuwskompetysjetabel
@@ -597,7 +597,7 @@ STR_STATUSBAR_PAUSED                                            :{YELLOW}* *  PA
 STR_STATUSBAR_AUTOSAVE                                          :{RED}AUTOSAVE
 
 # News message history
-STR_NEWS_MESSAGE                                                :{STRING}  -  {STRING}
+STR_MESSAGE_NEWS_FORMAT                                         :{STRING}  -  {STRING}
 
 # Message settings window
 STR_NEWS_MESSAGE_CAPTION                                        :{WHITE}Berjocht
@@ -854,9 +854,9 @@ STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Slút 'O
 
 # Quit window
 STR_QUIT_CAPTION                                                :{WHITE}Ôfslúte
-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_YES                                                         :{BLACK}Ja
-STR_NO                                                          :{BLACK}Nee
+STR_QUIT_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_QUIT_YES                                                    :{BLACK}Ja
+STR_QUIT_NO                                                     :{BLACK}Nee
 
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :Windows
@@ -872,10 +872,10 @@ STR_OSNAME_SUNOS                                                :SunOS
 # Abandon game
 STR_ABANDON_GAME_CAPTION                                        :{WHITE}Ferlit Spul
 STR_ABANDON_GAME_QUERY                                          :{YELLOW}Wolsto echt dit lânskip slúte?
-STR_QUIT_SCENARIO_QUERY                                         :{YELLOW}Wolsto echt dit lânskip slúte?
+STR_ABANDOM_SCENARIO_QUERY                                      :{YELLOW}Wolsto echt dit lânskip slúte?
 
 # Cheat window
-STR_TOYLAND_LANDSCAPE                                           :Boartersguodlânskip
+STR_CHEAT_SWITCH_CLIMATE_TOYLAND_LANDSCAPE                      :Boartersguodlânskip
 
 # Livery window
 STR_LIVERY_CAPTION                                              :{WHITE}Nei Kleurenskema
@@ -895,46 +895,46 @@ STR_FACE_NEW_FACE_BUTTON                                        :{BLACK}Nei Gesi
 STR_FACE_NEW_FACE_TOOLTIP                                       :{BLACK}Meistje willekeurich nij gesicht
 
 # Network server list
-STR_NETWORK_CONNECTION                                          :{BLACK}Ferbining:
-STR_NETWORK_LAN                                                 :LAN
-STR_NETWORK_INTERNET                                            :Ynternet
-STR_NETWORK_PLAYER_NAME                                         :{BLACK}Namme fan spieler:
+STR_NETWORK_SERVER_LIST_CONNECTION                              :{BLACK}Ferbining:
+STR_NETWORK_SERVER_LIST_LAN                                     :LAN
+STR_NETWORK_SERVER_LIST_INTERNET                                :Ynternet
+STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}Namme fan spieler:
 
-STR_NETWORK_GAME_NAME                                           :{BLACK}Namme
-STR_NETWORK_GAME_NAME_TIP                                       :{BLACK}Namme fan dit spul
-STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
-STR_NETWORK_MAP_SIZE_SHORT                                      :{BLACK}{COMMA}x{COMMA}
-STR_NETWORK_MAP_SIZE_CAPTION                                    :{BLACK}Lângrutte
-STR_NETWORK_DATE_CAPTION                                        :{BLACK}Datum
-STR_NETWORK_YEARS_CAPTION                                       :{BLACK}Jieren
+STR_NETWORK_SERVER_LIST_GAME_NAME                               :{BLACK}Namme
+STR_NETWORK_SERVER_LIST_GAME_NAME_TOOLTIP                       :{BLACK}Namme fan dit spul
+STR_NETWORK_SERVER_LIST_GENERAL_ONLINE                          :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
+STR_NETWORK_SERVER_LIST_MAP_SIZE_SHORT                          :{BLACK}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION                        :{BLACK}Lângrutte
+STR_NETWORK_SERVER_LIST_DATE_CAPTION                            :{BLACK}Datum
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION                           :{BLACK}Jieren
 
 
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Lângrutte: {WHITE}{COMMA}x{COMMA}
-STR_NETWORK_SERVER_VERSION                                      :{SILVER}Tsjinnerferzje: {WHITE}{STRING}
-STR_NETWORK_START_DATE                                          :{SILVER}Start datum: {WHITE}{DATE_SHORT}
-STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}SERVER NET BESKIKBER
-STR_NETWORK_VERSION_MISMATCH                                    :{SILVER}FERKEARDE FERZJE
+STR_NETWORK_SERVER_LIST_MAP_SIZE                                :{SILVER}Lângrutte: {WHITE}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_SERVER_VERSION                          :{SILVER}Tsjinnerferzje: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_START_DATE                              :{SILVER}Start datum: {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_SERVER_OFFLINE                          :{SILVER}SERVER NET BESKIKBER
+STR_NETWORK_SERVER_LIST_VERSION_MISMATCH                        :{SILVER}FERKEARDE FERZJE
 
 
-STR_NETWORK_ADD_SERVER                                          :{BLACK}Tsjinner tafoegje
-STR_NETWORK_START_SERVER                                        :{BLACK}Start tsjinner
-STR_NETWORK_START_SERVER_TIP                                    :{BLACK}Start dien eigen tsjinner
+STR_NETWORK_SERVER_LIST_ADD_SERVER                              :{BLACK}Tsjinner tafoegje
+STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Start tsjinner
+STR_NETWORK_SERVER_LIST_START_SERVER_TOOLTIP                    :{BLACK}Start dien eigen tsjinner
 
 
 # Start new multiplayer server
-STR_NETWORK_START_GAME_WINDOW                                   :{WHITE}Start in spul foar multispilers
+STR_NETWORK_START_SERVER_CAPTION                                :{WHITE}Start in spul foar multispilers
 
-STR_NETWORK_NEW_GAME_NAME                                       :{BLACK}Spulnamme:
-STR_NETWORK_SELECT_MAP                                          :{BLACK}Selektear in lân:
+STR_NETWORK_START_SERVER_NEW_GAME_NAME                          :{BLACK}Spulnamme:
+STR_NETWORK_START_SERVER_SELECT_MAP                             :{BLACK}Selektear in lân:
 
-STR_NETWORK_LAN_INTERNET_COMBO                                  :{BLACK}{SKIP}{STRING}
-STR_NETWORK_LAN_INTERNET                                        :LAN / Ynternet
-STR_NETWORK_SPECTATORS_SELECT                                   :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} taskôger{P "" s}
-STR_NETWORK_NUMBER_OF_SPECTATORS                                :{BLACK}Maksimaal tal taskôgers:
-STR_NETWORK_LANGUAGE_COMBO                                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
+STR_NETWORK_START_SERVER_LAN_INTERNET_COMBO                     :{BLACK}{SKIP}{STRING}
+STR_NETWORK_START_SERVER_LAN_INTERNET                           :LAN / Ynternet
+STR_NETWORK_START_SERVER_SPECTATORS_SELECT                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} taskôger{P "" s}
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS                   :{BLACK}Maksimaal tal taskôgers:
+STR_NETWORK_START_SERVER_LANGUAGE_COMBO                         :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
 
-STR_NETWORK_START_GAME                                          :{BLACK}Start Spul
-STR_NETWORK_LOAD_GAME                                           :{BLACK}Laad Spul
+STR_NETWORK_START_SERVER_START_GAME                             :{BLACK}Start Spul
+STR_NETWORK_START_SERVER_LOAD_GAME                              :{BLACK}Laad Spul
 
 
 # Network game languages
@@ -944,15 +944,15 @@ STR_NETWORK_LOAD_GAME                                           :{BLACK}Laad Spu
 # Network game lobby
 
 
-STR_NETWORK_PERFORMANCE                                         :{SILVER}Prestaasje: {WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_PERFORMANCE                              :{SILVER}Prestaasje: {WHITE}{NUM}
 
-STR_NETWORK_VEHICLES                                            :{SILVER}Auto's: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Stasjons: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_PLAYERS                                             :{SILVER}Spilers: {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_VEHICLES                                 :{SILVER}Auto's: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_STATIONS                                 :{SILVER}Stasjons: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_PLAYERS                                  :{SILVER}Spilers: {WHITE}{STRING}
 
 
 # Network connecting window
-STR_NETWORK_CONNECTING                                          :{WHITE}Ferbyning meitsje...
+STR_NETWORK_CONNECTING_CAPTION                                  :{WHITE}Ferbyning meitsje...
 
 ############ Leave those lines in this order!!
 STR_NETWORK_CONNECTING_1                                        :{BLACK}(1/6) Ferbyning meitsje...
@@ -985,20 +985,20 @@ STR_NETWORK_CHAT_TO_COMPANY                                     :[Team] Oan {STR
 STR_NETWORK_CHAT_CLIENT                                         :[Privee] {STRING}: {WHITE}{STRING}
 
 # Network messages
-STR_NETWORK_ERR_SERVER_START                                    :{WHITE}Koe de tsjinner net starte
-STR_NETWORK_ERR_CLIENT_START                                    :{WHITE}Koe gjin ferbyning meitsje
+STR_NETWORK_ERROR_SERVER_START                                  :{WHITE}Koe de tsjinner net starte
+STR_NETWORK_ERROR_CLIENT_START                                  :{WHITE}Koe gjin ferbyning meitsje
 
 ############ Leave those lines in this order!!
-STR_NETWORK_ERR_CLIENT_GENERAL                                  :algemiene flater
-STR_NETWORK_ERR_CLIENT_SAVEGAME                                 :koe it lân net lade
+STR_NETWORK_ERROR_CLIENT_GENERAL                                :algemiene flater
+STR_NETWORK_ERROR_CLIENT_SAVEGAME                               :koe it lân net lade
 ############ End of leave-in-this-order
 
 # Network related errors
 STR_NETWORK_SERVER_MESSAGE                                      :*** {2:STRING}
 ############ Leave those lines in this order!!
 ############ End of leave-in-this-order
-STR_NETWORK_CLIENT_COMPANY_SPECTATE                             :*** {STRING} is in neie taskôger
-STR_NETWORK_NAME_CHANGE                                         :*** {STRING} hat syn/har namme oanpast nei {STRING}
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_SPECTATE                     :*** {STRING} is in neie taskôger
+STR_NETWORK_MESSAGE_NAME_CHANGE                                 :*** {STRING} hat syn/har namme oanpast nei {STRING}
 
 # Content downloading window
 STR_CONTENT_TYPE_CAPTION                                        :{BLACK}Type
@@ -1038,8 +1038,8 @@ STR_STATION_BUILD_SUPPLIES_CARGO                                :{BLACK}Levert:
 
 # Join station window
 
-STR_SELECT_WAYPOINT_TO_JOIN                                     :{BLACK}Kontrôlepost gearfoegje
-STR_CREATE_SPLITTED_WAYPOINT                                    :{YELLOW}In apart kontrôlepost bouwe
+STR_JOIN_WAYPOINT_CAPTION                                       :{BLACK}Kontrôlepost gearfoegje
+STR_JOIN_WAYPOINT_CREATE_SPLITTED_WAYPOINT                      :{YELLOW}In apart kontrôlepost bouwe
 
 # Rail construction toolbar
 STR_RAIL_TOOLBAR_RAILROAD_CONSTRUCTION_CAPTION                  :{WHITE}Spoarwei Konstruksje
@@ -1060,8 +1060,8 @@ STR_BUILD_DEPOT_TRAIN_ORIENTATION_CAPTION                       :{WHITE}Treindep
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP                       :{BLACK}Selektearje treindepot rjochting
 
 # Rail waypoint construction window
-STR_WAYPOINT                                                    :{WHITE}Kontrôlepost
-STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}Selectear type kontrôlepost
+STR_WAYPOINT_CAPTION                                            :{WHITE}Kontrôlepost
+STR_WAYPOINT_GRAPHICS_TOOLTIP                                   :{BLACK}Selectear type kontrôlepost
 
 # Rail station construction window
 STR_STATION_BUILD_RAIL_CAPTION                                  :{WHITE}Treinstasjon Seleksje
@@ -1072,15 +1072,15 @@ STR_STATION_BUILD_PLATFORM_LENGTH                               :{BLACK}Stasjon
 STR_STATION_BUILD_PLATFORM_LENGTH_TOOLTIP                       :{BLACK}Selektear lengte fan treinstasjon
 
 
-STR_STAT_CLASS_WAYP                                             :Kontrôleposten
+STR_STATION_CLASS_WAYP                                          :Kontrôleposten
 
 # Signal window
 
 # Bridge selection window
 STR_SELECT_RAIL_BRIDGE_CAPTION                                  :{WHITE}Selektear Spoarbrêge
 STR_SELECT_ROAD_BRIDGE_CAPTION                                  :{WHITE}Selektear brêge
-STR_BUILD_BRIDGE_SELECTION_TOOLTIP                              :{BLACK}Brêge seleksje - klik op de brêge dyst boue wolst
-STR_BUILD_BRIDGE_INFO                                           :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
+STR_SELECT_BRIDGE_SELECTION_TOOLTIP                             :{BLACK}Brêge seleksje - klik op de brêge dyst boue wolst
+STR_SELECT_BRIDGE_INFO                                          :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
 STR_BRIDGE_NAME_SUSPENSION_STEEL                                :Hingbrêge, Stiel
 STR_BRIDGE_NAME_GIRDER_STEEL                                    :Brêge mei balken, Stiel
 STR_BRIDGE_NAME_CANTILEVER_STEEL                                :Fakwurkbrêge, Stiel
@@ -1102,13 +1102,13 @@ STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_ROAD           :{BLACK}Wikselje
 
 # Road depot construction window
 STR_BUILD_DEPOT_ROAD_ORIENTATION_CAPTION                        :{WHITE}Autodepot rjochting
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_ROAD_VEHICLE_DEPOT              :{BLACK}Kies rjochting foar autodepot
+STR_BUILD_DEPOT_ROAD_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Kies rjochting foar autodepot
 
 # Road vehicle station construction window
 
 # Waterways toolbar (last two for SE only)
-STR_CREATE_LAKE                                                 :{BLACK}Tsjut wettergebied oan.{}Meitsje in kanaal, of ast' Ctrl op seenivo yndrukst, dan oerstreamt it gebied deromhinne
-STR_CREATE_RIVER                                                :{BLACK}Rivier pleatse.
+STR_WATERWAYS_TOOLBAR_CREATE_LAKE_TOOLTIP                       :{BLACK}Tsjut wettergebied oan.{}Meitsje in kanaal, of ast' Ctrl op seenivo yndrukst, dan oerstreamt it gebied deromhinne
+STR_WATERWAYS_TOOLBAR_CREATE_RIVER_TOOLTIP                      :{BLACK}Rivier pleatse.
 
 # Ship depot construction window
 
@@ -1124,9 +1124,9 @@ STR_STATION_BUILD_AIRPORT_CAPTION                               :{WHITE}Fleanfji
 
 
 # Landscaping toolbar
-STR_TERRAFORM_TOOLTIP_LOWER_A_CORNER_OF_LAND                    :{BLACK}Ferleech in hoekje lân
-STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND                    :{BLACK}Ferheech in hoekje lân
-STR_TERRAFORM_TOOLTIP_PURCHASE_LAND                             :{BLACK}Keapje lân om letter te brûken
+STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND                  :{BLACK}Ferleech in hoekje lân
+STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND                  :{BLACK}Ferheech in hoekje lân
+STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND                           :{BLACK}Keapje lân om letter te brûken
 
 # Tree planting window (last two for SE only)
 STR_PLANT_TREE_CAPTION                                          :{WHITE}Beammen
@@ -1144,7 +1144,7 @@ STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA                :{BLACK}Fergruts
 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
 STR_TERRAFORM_RESET_LANDSCAPE                                   :{BLACK}Set it lânskip werom
-STR_RESET_LANDSCAPE_TOOLTIP                                     :{BLACK}Alle spilerbesittings fan'e kaart fuortsmite
+STR_TERRAFORM_RESET_LANDSCAPE_TOOLTIP                           :{BLACK}Alle spilerbesittings fan'e kaart fuortsmite
 
 STR_QUERY_RESET_LANDSCAPE_CAPTION                               :{WHITE}Lânskip weromsette
 STR_RESET_LANDSCAPE_CONFIRMATION_TEXT                           :{WHITE}Bisto der wis fan alle spilerbesittings fuort te smiten?
@@ -1160,28 +1160,28 @@ STR_FOUND_TOWN_INITIAL_SIZE_TITLE                               :{YELLOW}Grutte
 STR_FOUND_TOWN_INITIAL_SIZE_SMALL_BUTTON                        :{BLACK}Lyts
 STR_FOUND_TOWN_INITIAL_SIZE_MEDIUM_BUTTON                       :{BLACK}Middel
 STR_FOUND_TOWN_INITIAL_SIZE_LARGE_BUTTON                        :{BLACK}Grut
-STR_SELECT_TOWN_SIZE_RANDOM                                     :{BLACK}Samar in getal
+STR_FOUND_TOWN_SIZE_RANDOM                                      :{BLACK}Samar in getal
 STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Selektear de grutte fan 'e stêd
 STR_FOUND_TOWN_CITY                                             :{BLACK}Stêd
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Stêden groeien flugger as doarpen{}Ôfhinklik fan ynstellings binne se grutter at se makke wurde
 
-STR_TOWN_ROAD_LAYOUT                                            :{YELLOW}Strjittenpatroan
-STR_SELECT_TOWN_ROAD_LAYOUT                                     :{BLACK}Selektear strjittenpatroan foar dit plak
-STR_SELECT_LAYOUT_ORIGINAL                                      :{BLACK}Orizjiniel
-STR_SELECT_LAYOUT_BETTER_ROADS                                  :{BLACK}Bettere diken
-STR_SELECT_LAYOUT_2X2_GRID                                      :{BLACK}2x2 raster
-STR_SELECT_LAYOUT_3X3_GRID                                      :{BLACK}3x3 raster
-STR_SELECT_LAYOUT_RANDOM                                        :{BLACK}Samar
+STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Strjittenpatroan
+STR_FOUND_TOWN_SELECT_TOWN_ROAD_LAYOUT                          :{BLACK}Selektear strjittenpatroan foar dit plak
+STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Orizjiniel
+STR_FOUND_TOWN_SELECT_LAYOUT_BETTER_ROADS                       :{BLACK}Bettere diken
+STR_FOUND_TOWN_SELECT_LAYOUT_2X2_GRID                           :{BLACK}2x2 raster
+STR_FOUND_TOWN_SELECT_LAYOUT_3X3_GRID                           :{BLACK}3x3 raster
+STR_FOUND_TOWN_SELECT_LAYOUT_RANDOM                             :{BLACK}Samar
 
 # Fund new industry window
 STR_FUND_INDUSTRY_CAPTION                                       :{WHITE}Betelje nije yndustry
-STR_INDUSTRY_BUILD_COST                                         :{BLACK}Kostet: {YELLOW}{CURRENCY}
+STR_FUND_INDUSTRY_INDUSTRY_BUILD_COST                           :{BLACK}Kostet: {YELLOW}{CURRENCY}
 
 # Land area window
 STR_LAND_AREA_INFORMATION_CAPTION                               :{WHITE}Lân Gebiet Ynformaasje
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A                     :{BLACK}Kosten om leech te meitsjen: {LTBLUE}N/B
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR                         :{BLACK}Kosten om leech te meitsjen: {RED}{CURRENCY}
-STR_REVENUE_WHEN_CLEARED                                        :{BLACK}Netto omset: {LTBLUE}{CURRENCY}
+STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED                  :{BLACK}Netto omset: {LTBLUE}{CURRENCY}
 STR_LAND_AREA_INFORMATION_OWNER_N_A                             :N/B
 STR_LAND_AREA_INFORMATION_OWNER                                 :{BLACK}Eigner: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_ROAD_OWNER                            :{BLACK}Dykeigener: {LTBLUE}{STRING}
@@ -1193,65 +1193,65 @@ STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}Akseptea
 STR_LAND_AREA_INFORMATION_CARGO_EIGHTS                          :({COMMA}/8 {STRING})
 
 # Description of land area of different tiles
-STR_CLEAR_LAND_DESCRIPTION_ROCKS                                :Rotsen
-STR_CLEAR_LAND_DESCRIPTION_ROUGH_LAND                           :Rûch lân
-STR_CLEAR_LAND_DESCRIPTION_BARE_LAND                            :Leech lân
-STR_CLEAR_LAND_DESCRIPTION_GRASS                                :Gers
-STR_CLEAR_LAND_DESCRIPTION_FIELDS                               :Fjilden
-STR_CLEAR_LAND_DESCRIPTION_SNOW_COVERED_LAND                    :Snie
-STR_CLEAR_LAND_DESCRIPTION_DESERT                               :Woastine
-
-STR_RAILROAD_TRACK                                              :Spoarwei
-STR_RAILROAD_TRAIN_DEPOT                                        :Treindepot
-
-STR_ROAD_DESCRIPTION_ROAD                                       :Wei
-STR_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                     :Wei mei strjitteljochten
-STR_ROAD_DESCRIPTION_TREE_LINED_ROAD                            :Wei mei beammen oan 'e siden
-STR_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                         :Autodepot
-STR_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING                   :Dyk/spoar krusing
+STR_LAI_CLEAR_DESCRIPTION_ROCKS                                 :Rotsen
+STR_LAI_CLEAR_DESCRIPTION_ROUGH_LAND                            :Rûch lân
+STR_LAI_CLEAR_DESCRIPTION_BARE_LAND                             :Leech lân
+STR_LAI_CLEAR_DESCRIPTION_GRASS                                 :Gers
+STR_LAI_CLEAR_DESCRIPTION_FIELDS                                :Fjilden
+STR_LAI_CLEAR_DESCRIPTION_SNOW_COVERED_LAND                     :Snie
+STR_LAI_CLEAR_DESCRIPTION_DESERT                                :Woastine
+
+STR_LAI_RAIL_DESCRIPTION_TRACK                                  :Spoarwei
+STR_LAI_RAIL_DESCRIPTION_TRAIN_DEPOT                            :Treindepot
+
+STR_LAI_ROAD_DESCRIPTION_ROAD                                   :Wei
+STR_LAI_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                 :Wei mei strjitteljochten
+STR_LAI_ROAD_DESCRIPTION_TREE_LINED_ROAD                        :Wei mei beammen oan 'e siden
+STR_LAI_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                     :Autodepot
+STR_LAI_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING               :Dyk/spoar krusing
 
 # Houses come directly from their building names
-STR_TOWN_DESCRIPTION_UNDER_CONSTRUCTION                         :{STRING} (yn oanbou)
+STR_LAI_TOWN_INDUSTRY_DESCRIPTION_UNDER_CONSTRUCTION            :{STRING} (yn oanbou)
 
-STR_TREE_NAME_TREES                                             :Beammen
-STR_TREE_NAME_RAINFOREST                                        :Reinwâld
-STR_TREE_NAME_CACTUS_PLANTS                                     :Kaktussen
+STR_LAI_TREE_NAME_TREES                                         :Beammen
+STR_LAI_TREE_NAME_RAINFOREST                                    :Reinwâld
+STR_LAI_TREE_NAME_CACTUS_PLANTS                                 :Kaktussen
 
-STR_STATION_DESCRIPTION_RAILROAD_STATION                        :Treinstasjon
-STR_STATION_DESCRIPTION_AIRPORT                                 :Fleanfjild
-STR_STATION_DESCRIPTION_BUS_STATION                             :Bushalte
-STR_STATION_DESCRIPTION_SHIP_DOCK                               :Haven
-STR_STATION_DESCRIPTION_BUOY                                    :Boei
-STR_LANDINFO_WAYPOINT                                           :Kontrôlepost
+STR_LAI_STATION_DESCRIPTION_RAILROAD_STATION                    :Treinstasjon
+STR_LAI_STATION_DESCRIPTION_AIRPORT                             :Fleanfjild
+STR_LAI_STATION_DESCRIPTION_BUS_STATION                         :Bushalte
+STR_LAI_STATION_DESCRIPTION_SHIP_DOCK                           :Haven
+STR_LAI_STATION_DESCRIPTION_BUOY                                :Boei
+STR_LAI_STATION_DESCRIPTION_WAYPOINT                            :Kontrôlepost
 
-STR_WATER_DESCRIPTION_WATER                                     :Wetter
+STR_LAI_WATER_DESCRIPTION_WATER                                 :Wetter
 
 # Industries come directly from their industry names
 
-STR_TUNNEL_DESCRIPTION_RAILROAD                                 :Spoartunnel
-STR_TUNNEL_DESCRIPTION_ROAD                                     :Tunnel
+STR_LAI_TUNNEL_DESCRIPTION_RAILROAD                             :Spoartunnel
+STR_LAI_TUNNEL_DESCRIPTION_ROAD                                 :Tunnel
 
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                    :Stielen spoarfakwurkbrêge
-STR_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                       :Stielen brêge mei balken
-STR_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                    :Stielen spoarfakwurkbrêge
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE                 :Fersterke betonnen spoarhingbrêge
-STR_BRIDGE_DESCRIPTION_RAIL_WOODEN                              :Houten spoarbrêge
-STR_BRIDGE_DESCRIPTION_RAIL_CONCRETE                            :Betonnen spoarbrêge
-STR_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                       :Buis Spoarbrêge
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                :Stielen spoarfakwurkbrêge
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                   :Stielen brêge mei balken
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                :Stielen spoarfakwurkbrêge
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE             :Fersterke betonnen spoarhingbrêge
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_WOODEN                          :Houten spoarbrêge
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CONCRETE                        :Betonnen spoarbrêge
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                   :Buis Spoarbrêge
 
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                    :Stielen hingbrêge
-STR_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                        :Stielen brêge mei balken
-STR_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                    :Stielen fakwurkbrêge
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE                 :Fersterke betonnen hingbrêge
-STR_BRIDGE_DESCRIPTION_ROAD_WOODEN                              :Houten brêge
-STR_BRIDGE_DESCRIPTION_ROAD_CONCRETE                            :Betonnen brêge
-STR_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                       :Buis Brêge
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                :Stielen hingbrêge
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                    :Stielen brêge mei balken
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                :Stielen fakwurkbrêge
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE             :Fersterke betonnen hingbrêge
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_WOODEN                          :Houten brêge
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CONCRETE                        :Betonnen brêge
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                   :Buis Brêge
 
 
-STR_UNMOVABLE_DESCRIPTION_TRANSMITTER                           :Sendmast
-STR_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                            :Fjoertoer
-STR_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS                  :Haadkantoar Bedriuw
-STR_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                    :Lân fan bedriuw
+STR_LAI_UNMOVABLE_DESCRIPTION_TRANSMITTER                       :Sendmast
+STR_LAI_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                        :Fjoertoer
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS              :Haadkantoar Bedriuw
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                :Lân fan bedriuw
 
 # About OpenTTD window
 STR_ABOUT_OPENTTD                                               :{WHITE}Oer OpenTTD
@@ -1264,7 +1264,7 @@ STR_SAVELOAD_SAVE_CAPTION                                       :{WHITE}Spul Ops
 STR_SAVELOAD_LOAD_CAPTION                                       :{WHITE}Spul Lade
 STR_SAVELOAD_SAVE_SCENARIO                                      :{WHITE}Sla Scenario op
 STR_SAVELOAD_LOAD_SCENARIO                                      :{WHITE}Laad Scenario
-STR_LOAD_HEIGHTMAP                                              :{WHITE}Laad Hichtemap
+STR_SAVELOAD_LOAD_HEIGHTMAP                                     :{WHITE}Laad Hichtemap
 STR_SAVELOAD_HOME_BUTTON                                        :{BLACK}Hjir klikke om nei standert opslach- en laadtriemtafel te gean
 STR_SAVELOAD_LIST_TOOLTIP                                       :{BLACK}List fan skiven, mappen en bestânen
 STR_SAVELOAD_DELETE_BUTTON                                      :{BLACK}Fuortsmite
@@ -1272,8 +1272,8 @@ STR_SAVELOAD_SAVE_BUTTON                                        :{BLACK}Opslaan
 
 
 # World generation
-STR_MAPSIZE                                                     :{BLACK}Lângrutte:
-STR_BY                                                          :{BLACK}*
+STR_MAPGEN_MAPSIZE                                              :{BLACK}Lângrutte:
+STR_MAPGEN_BY                                                   :{BLACK}*
 
 # Strings for map borders at game generation
 
@@ -1296,7 +1296,7 @@ STR_BY                                                          :{BLACK}*
 # NewGRF (self) generated warnings/errors
 
 # NewGRF related 'general' warnings
-STR_POPUP_CAUTION_CAPTION                                       :{WHITE}Warskôging!
+STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Warskôging!
 
 
 
@@ -1359,7 +1359,7 @@ STR_SUBSIDIES_OFFERED_FROM_TO                                   :{ORANGE}{STRING
 STR_SUBSIDIES_NONE                                              :{ORANGE}Gjin
 STR_SUBSIDIES_SUBSIDISED_TITLE                                  :{BLACK}Tsjinsten dy't al subsydzje krije:
 STR_SUBSIDIES_SUBSIDISED_FROM_TO                                :{ORANGE}{STRING} fan {STATION} nei {STATION}{YELLOW} ({COMPANY}{YELLOW}, oant {DATE_SHORT})
-STR_SUBSIDY_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                  :{BLACK}Klik om te sentrearen op yndusty/stêd
+STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Klik om te sentrearen op yndusty/stêd
 
 # Station list window
 STR_STATION_LIST_STATION                                        :{YELLOW}{STATION} {STATIONFEATURES}
@@ -1388,13 +1388,13 @@ STR_CARGO_RATING_VERY_GOOD                                      :Hiel Goed
 STR_STATION_VIEW_CENTER_TOOLTIP                                 :{BLACK}Sintrearje it byld op de lokaasje fan dit stasjon
 
 
-STR_QUERY_RENAME_STATION_CAPTION                                :Jou stasjon in oare namme
+STR_STATION_VIEW_RENAME_STATION_CAPTION                         :Jou stasjon in oare namme
 
 # Waypoint/buoy view window
 STR_WAYPOINT_VIEW_CENTER_TOOLTIP                                :{BLACK}Sintrearje it byld op de lokaasje fan dizze kontrôlepost
-STR_CHANGE_WAYPOINT_NAME                                        :{BLACK}Namme fan kontrôlepost oanpasse
+STR_WAYPOINT_VIEW_CHANGE_WAYPOINT_NAME                          :{BLACK}Namme fan kontrôlepost oanpasse
 STR_BUOY_VIEW_CENTER_TOOLTIP                                    :{BLACK}Sintrearje it byld op de lokaasje fan dizze boei
-STR_CHANGE_BUOY_NAME                                            :{BLACK}Namme fan boei oanpasse
+STR_BUOY_VIEW_CHANGE_BUOY_NAME                                  :{BLACK}Namme fan boei oanpasse
 
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Namme fan kontrôlepost oanpasse
 
@@ -1455,8 +1455,8 @@ STR_COMPANY_VIEW_SELL_SHARE_BUTTON                              :{BLACK}Ferkeapj
 STR_COMPANY_VIEW_BUY_SHARE_TOOLTIP                              :{BLACK}Keapje 25% oandielen fan dit bedriuw
 STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP                             :{BLACK}Ferkeapje 25% oandielen fan dit bedriuw
 
-STR_QUERY_COMPANY_NAME_CAPTION                                  :Bedriuwsnamme
-STR_QUERY_PRESIDENT_S_NAME_CAPTION                              :Namme fan Direkteur
+STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION                     :Bedriuwsnamme
+STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :Namme fan Direkteur
 
 STR_BUY_COMPANY_MESSAGE                                         :{WHITE}Wy sykje in transportbedriuw om ús bedriuw oer te nimmen.{}{}Wolsto {COMPANY} foar {CURRENCY} keapje?
 
@@ -1486,12 +1486,12 @@ STR_INDUSTRY_VIEW_PRODUCES_CARGO_CARGO                          :{BLACK}Produsea
 STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR                     :{TINYFONT}{BLACK}Fertsjinste dit jier: {CURRENCY} (ferline jier: {CURRENCY})
 
 
-STR_SEND_FOR_SERVICING                                          :Stjoer foar ûnderhâldsbeurt
+STR_VEHICLE_LIST_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_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT                            :Stjoer nei depot
+STR_VEHICLE_LIST_SEND_ROAD_VEHICLE_TO_DEPOT                     :Stjoer nei depot
+STR_VEHICLE_LIST_SEND_SHIP_TO_DEPOT                             :Stjoer nei depot
+STR_VEHICLE_LIST_SEND_AIRCRAFT_TO_HANGAR                        :Stjoer nei hangaar
 
 
 
@@ -1532,10 +1532,10 @@ STR_SEND_AIRCRAFT_TO_HANGAR                                     :Stjoer nei hang
 
 
 # Autoreplace window
-STR_VEHICLE_TRAIN                                               :Trein
-STR_VEHICLE_ROAD_VEHICLE                                        :Auto
-STR_VEHICLE_SHIP                                                :Skip
-STR_VEHICLE_AIRCRAFT                                            :Fleanmasine
+STR_REPLACE_VEHICLE_TRAIN                                       :Trein
+STR_REPLACE_VEHICLE_ROAD_VEHICLE                                :Auto
+STR_REPLACE_VEHICLE_SHIP                                        :Skip
+STR_REPLACE_VEHICLE_AIRCRAFT                                    :Fleanmasine
 
 
 
@@ -1556,8 +1556,8 @@ STR_VEHICLE_AIRCRAFT                                            :Fleanmasine
 # Messages in the start stop button in the vehicle view
 
 
-STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}Ûnderweis nei {WAYPOINT}
-STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}Ûnderweis nei {WAYPOINT}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT                         :{LTBLUE}Ûnderweis nei {WAYPOINT}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT_VEL                     :{LTBLUE}Ûnderweis nei {WAYPOINT}, {VELOCITY}
 
 
 
@@ -1566,8 +1566,8 @@ STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Namme
 
 
 # The next two need to stay in this order
-STR_AGE                                                         :{COMMA} jier{P "" ren} ({COMMA})
-STR_AGE_RED                                                     :{RED}{COMMA} jier{P "" ren} ({COMMA})
+STR_VEHICLE_INFO_AGE                                            :{COMMA} jier{P "" ren} ({COMMA})
+STR_VEHICLE_INFO_AGE_RED                                        :{RED}{COMMA} jier{P "" ren} ({COMMA})
 
 
 
@@ -1577,9 +1577,9 @@ STR_AGE_RED                                                     :{RED}{COMMA} ji
 
 # Extra buttons for train details windows
 
-STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Totale kapasiteit fan dizze trein:
-STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
-STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_TEXT                   :{BLACK}Totale kapasiteit fan dizze trein:
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY                        :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT                   :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 
 
 STR_VEHICLE_DETAIL_TAB_CARGO                                    :{BLACK}Fracht
@@ -1611,8 +1611,8 @@ STR_VEHICLE_DETAIL_TAB_TOTAL_CARGO                              :{BLACK}Totale F
 
 
 # String parts to build the order string
-STR_GO_TO_WAYPOINT                                              :Lâns {WAYPOINT}
-STR_GO_NON_STOP_TO_WAYPOINT                                     :Oanienwei lâns {WAYPOINT}
+STR_ORDER_GO_TO_WAYPOINT                                        :Lâns {WAYPOINT}
+STR_ORDER_GO_NON_STOP_TO_WAYPOINT                               :Oanienwei lâns {WAYPOINT}
 
 
 
@@ -1634,21 +1634,21 @@ STR_GO_NON_STOP_TO_WAYPOINT                                     :Oanienwei lâns
 
 # AI debug window
 
-STR_AI_NO_AI_FOUND                                              :Gjin geskikte compjûterspiler fûn.{}Disse compjûterspiler is in dummy en docht neat.{}Jo kinne compjûterspilers delhelje fan 'Online Inhâld' ôf.
+STR_ERROR_AI_NO_AI_FOUND                                        :Gjin geskikte compjûterspiler fûn.{}Disse compjûterspiler is in dummy en docht neat.{}Jo kinne compjûterspilers delhelje fan 'Online Inhâld' ôf.
 
 # AI configuration window
 
 
 # Available AIs window
 
-STR_AI_VERSION                                                  :{BLACK}Ferzje: {NUM}
-STR_AI_URL                                                      :{BLACK}URL: {STRING}
+STR_AI_LIST_VERSION                                             :{BLACK}Ferzje: {NUM}
+STR_AI_LIST_URL                                                 :{BLACK}URL: {STRING}
 
-STR_AI_ACCEPT                                                   :{BLACK}Akseptearje
-STR_AI_CANCEL                                                   :{BLACK}Annulearje
+STR_AI_LIST_ACCEPT                                              :{BLACK}Akseptearje
+STR_AI_LIST_CANCEL                                              :{BLACK}Annulearje
 
 # AI Parameters
-STR_AI_CLOSE                                                    :{BLACK}Slúte
+STR_AI_SETTINGS_CLOSE                                           :{BLACK}Slúte
 
 # Vehicle loading indicators
 
@@ -1692,7 +1692,7 @@ STR_ERROR_SITE_UNSUITABLE                                       :{WHITE}...terre
 STR_ERROR_ALREADY_BUILT                                         :{WHITE}...is al bout
 STR_ERROR_OWNED_BY                                              :{WHITE}...is fan {STRING}
 STR_ERROR_AREA_IS_OWNED_BY_ANOTHER                              :{WHITE}...gebiet is fan in oar bedriuw
-STR_OBJECT_IN_THE_WAY                                           :{WHITE}{STRING} yn it paad
+STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY                           :{WHITE}{STRING} yn it paad
 
 # Local authority errors
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS                 :{WHITE}{TOWN} gemiente stiet dit net ta
@@ -1720,13 +1720,13 @@ STR_ERROR_CAN_T_BUY_25_SHARE_IN_THIS                            :{WHITE}Kin net
 STR_ERROR_CAN_T_SELL_25_SHARE_IN                                :{WHITE}Kin net 25% oandielen fan dit bedriuw ferkeapje...
 
 # Town related errors
-STR_CANNOT_GENERATE_TOWN                                        :{WHITE}Kin gjin stêd bouwe
+STR_ERROR_CAN_T_GENERATE_TOWN                                   :{WHITE}Kin gjin stêd bouwe
 STR_ERROR_CAN_T_RENAME_TOWN                                     :{WHITE}Kin de namme net feroarje...
 STR_ERROR_CAN_T_BUILD_TOWN_HERE                                 :{WHITE}Kin hjir gjin stêd boue...
 STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP_SUB                          :{WHITE}...te ticht by de râne fan 'e map
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN                             :{WHITE}...te ticht by in oare stêd
 STR_ERROR_TOO_MANY_TOWNS                                        :{WHITE}...te folle stêden
-STR_NO_SPACE_FOR_TOWN                                           :{WHITE}...der is gjin romte mear op'e kaart
+STR_ERROR_NO_SPACE_FOR_TOWN                                     :{WHITE}...der is gjin romte mear op'e kaart
 
 # Industry related errors
 STR_ERROR_CAN_T_BUILD_HERE                                      :{WHITE}Kin hjir gjin {STRING} boue...
@@ -1768,11 +1768,11 @@ STR_ERROR_MUST_DEMOLISH_AIRPORT_FIRST                           :{WHITE}Fleanfji
 STR_ERROR_WAYPOINT_ADJOINS_MORE_THAN_ONE_EXISTING               :{WHITE}Foeget mear dan ien kontrôlepost gear
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_WAYPOINT                         :{WHITE}Te ticht by in oar kontrôlepost
 
-STR_CANT_BUILD_TRAIN_WAYPOINT                                   :{WHITE}Kin jirre gjin kontrôlepost bouwe...
-STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}Kin de namme fan it kontrôlepost net oanpasse...
+STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT                            :{WHITE}Kin jirre gjin kontrôlepost bouwe...
+STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME                            :{WHITE}Kin de namme fan it kontrôlepost net oanpasse...
 
-STR_CANT_REMOVE_TRAIN_WAYPOINT                                  :{WHITE}Kin kontrôlepost jirre net fuorthelje...
-STR_MUST_REMOVE_RAILWAYPOINT_FIRST                              :{WHITE}Kontrôlepost op it spoar earst ferwiderje
+STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT                           :{WHITE}Kin kontrôlepost jirre net fuorthelje...
+STR_ERROR_MUST_REMOVE_RAILWAYPOINT_FIRST                        :{WHITE}Kontrôlepost op it spoar earst ferwiderje
 STR_ERROR_BUOY_IN_THE_WAY                                       :{WHITE}...boei yn it paad
 
 # Depot related errors
@@ -1811,7 +1811,7 @@ STR_ERROR_CAN_T_PLANT_TREE_HERE                                 :{WHITE}Kin hjir
 # Bridge related errors
 STR_ERROR_CAN_T_BUILD_BRIDGE_HERE                               :{WHITE}Kin hjir gjin brêge boue...
 STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST                            :{WHITE}Brêge moat earst fuorthelle wurde
-STR_ERROR_CANNOT_START_AND_END_ON                               :{WHITE}Begjin en ein kin net op itselde plak wêze
+STR_ERROR_CAN_T_START_AND_END_ON                                :{WHITE}Begjin en ein kin net op itselde plak wêze
 STR_ERROR_START_AND_END_MUST_BE_IN                              :{WHITE}Begjin en ein moatte op ien lijn wêze
 STR_ERROR_ENDS_OF_BRIDGE_MUST_BOTH                              :{WHITE}...beide úteinden fan'e brêge moatte op lân lizze
 
@@ -2135,24 +2135,24 @@ STR_FORMAT_DATE_SHORT                                           :{STRING} {NUM}
 STR_FORMAT_DATE_LONG                                            :{STRING} {STRING} {NUM}
 STR_FORMAT_DATE_ISO                                             :{2:NUM}-{1:STRING}-{0:STRING}
 
-STR_BUOYNAME_CITY                                               :{TOWN} Boei
-STR_BUOYNAME_CITY_SERIAL                                        :{TOWN} Boei #{COMMA}
+STR_FORMAT_BUOY_NAME                                            :{TOWN} Boei
+STR_FORMAT_BUOY_NAME_SERIAL                                     :{TOWN} Boei #{COMMA}
 STR_FORMAT_COMPANY_NUM                                          :(Bedriuw {COMMA})
-STR_WAYPOINTNAME_CITY                                           :{TOWN} Kontrôlepost
-STR_WAYPOINTNAME_CITY_SERIAL                                    :{TOWN} Kontrôlepost #{COMMA}
+STR_FORMAT_WAYPOINT_NAME                                        :{TOWN} Kontrôlepost
+STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :{TOWN} Kontrôlepost #{COMMA}
 
-STR_SIGN_DEFAULT                                                :Buordsje
+STR_DEFAULT_SIGN_NAME                                           :Buordsje
 STR_COMPANY_SOMEONE                                             :immen{SKIP}{SKIP}
 
 
 # Viewport strings
 
-STR_SIGN_SMALL_BLACK                                            :{TINYFONT}{BLACK}{SIGN}
+STR_VIEWPORT_SIGN_SMALL_BLACK                                   :{TINYFONT}{BLACK}{SIGN}
 
-STR_STATION_SIGN                                                :{STATION} {STATIONFEATURES}
+STR_VIEWPORT_STATION                                            :{STATION} {STATIONFEATURES}
 
-STR_WAYPOINT_VIEWPORT                                           :{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WAYPOINT}
+STR_VIEWPORT_WAYPOINT                                           :{WAYPOINT}
+STR_VIEWPORT_WAYPOINT_TINY                                      :{TINYFONT}{WAYPOINT}
 
 # Simple strings to get specific types of data
 STR_COMPANY_NAME                                                :{COMPANY}
@@ -2191,11 +2191,11 @@ STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_WHITE_DATE_SHORT                                            :{WHITE}{DATE_SHORT}
 STR_WHITE_DATE_LONG                                             :{WHITE}{DATE_LONG}
 STR_DATE_LONG_SMALL                                             :{TINYFONT}{BLACK}{DATE_LONG}
-STR_SIGN_WHITE                                                  :{WHITE}{SIGN}
+STR_WHITE_SIGN                                                  :{WHITE}{SIGN}
 STR_BLACK_STRING                                                :{BLACK}{STRING}
 STR_BLACK_RAW_STRING                                            :{BLACK}{STRING}
-STR_QUERY_CAPTION                                               :{WHITE}{STRING}
-STR_VEHICLE_NAME_SMALL                                          :{TINYFONT}{BLACK}{VEHICLE}
+STR_WHITE_STRINGN                                               :{WHITE}{STRING}
+STR_TINY_BLACK_VEHICLE                                          :{TINYFONT}{BLACK}{VEHICLE}
 
 STR_BLACK_SMALL_ARROW_UP                                        :{BLACK}{SMALLUPARROW}
 STR_BLACK_SMALL_ARROW_DOWN                                      :{BLACK}{SMALLDOWNARROW}