summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortranslators <translators@openttd.org>2009-07-22 17:45:41 +0000
committertranslators <translators@openttd.org>2009-07-22 17:45:41 +0000
commit9aaec4d2f228a168c43ffc71ef12542717133ad5 (patch)
treecdb3c0ab172d6c6e93ed3040741a791d474bd867 /src
parent3bcfa7c52ad592ccfaf58ad499e78fd89aea6722 (diff)
downloadopenttd-9aaec4d2f228a168c43ffc71ef12542717133ad5.tar.xz
(svn r16918) -Update from WebTranslator v3.0:
catalan - 1 changes by arnaullv czech - 71 changes by SmatZ dutch - 8 changes by Yexo english_US - 5 changes by agenthh esperanto - 3 changes by LaPingvino finnish - 4 changes by jpx_ german - 4 changes by planetmaker norwegian_bokmal - 136 changes by CyberKenny persian - 127 changes by 100ra romanian - 1 changes by kkmic russian - 9 changes by Lone_Wolf, MajestiC spanish - 5 changes by Terkhen ukrainian - 1 changes by Madvin
Diffstat (limited to 'src')
-rw-r--r--src/lang/catalan.txt75
-rw-r--r--src/lang/czech.txt213
-rw-r--r--src/lang/dutch.txt13
-rw-r--r--src/lang/english_US.txt82
-rw-r--r--src/lang/esperanto.txt70
-rw-r--r--src/lang/finnish.txt5
-rw-r--r--src/lang/german.txt5
-rw-r--r--src/lang/norwegian_bokmal.txt331
-rw-r--r--src/lang/romanian.txt75
-rw-r--r--src/lang/russian.txt15
-rw-r--r--src/lang/spanish.txt79
-rw-r--r--src/lang/ukrainian.txt75
-rw-r--r--src/lang/unfinished/persian.txt167
13 files changed, 697 insertions, 508 deletions
diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt
index d606f04d5..72b4cb0fc 100644
--- a/src/lang/catalan.txt
+++ b/src/lang/catalan.txt
@@ -762,9 +762,6 @@ STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :Financia una no
############ range ends here
STR_FUND_INDUSTRY_CAPTION :{WHITE}Financia una 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}...només es pot construir en àrees de selva tropical
STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT :{WHITE}...només es pot construir en àrees de desert
STR_STATUSBAR_PAUSED :{YELLOW}* * EN PAUSA * *
@@ -1197,7 +1194,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}Edita nom de punt de control
STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}No es pot canviar el nom del punt de control...
@@ -1778,11 +1774,6 @@ STR_TOWN_BUILDING_NAME_TEPEES_1 :Tipis
STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1 :Casa-Tetera
STR_TOWN_BUILDING_NAME_PIGGY_BANK_1 :Banc-Guardiola Porquet
-STR_INDUSTRY_NAME :{INDUSTRY}
-STR_TOWN_NAME :{TOWN}
-STR_FORMAT_INDUSTRY_NAME :{TOWN} {STRING}
-STR_STATION_NAME :{STATION}
-
##id 0x2800
STR_LANDSCAPING_MENU_LANDSCAPING :Paisatges
STR_LANDSCAPING_MENU_PLANT_TREES :Planta arbres
@@ -1837,6 +1828,12 @@ STR_CARGO_RATING_EXCELLENT :Excel·lent
STR_CARGO_RATING_OUTSTANDING :Excepcional
############ range for rating ends
+### station view strings
+STR_SCHEDULED_TRAINS_TIP :{BLACK}Mostra tots els trens que tinguin aquesta estació en el seu itinerari
+STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Mostra tots els vehicles que tinguin aquesta estació en el seu itinerari
+STR_SCHEDULED_AIRCRAFT_TIP :{BLACK}Mostra tots els avions que tinguin aquest aeroport en el seu itinerari
+STR_SCHEDULED_SHIPS_TIP :{BLACK}Mostra tots els vaixells que tinguin aquest port en el seu itinerari
+
STR_STATION_VIEW_CARGO_RATING :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}{STATION} ja no accepta més {STRING}
STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION} ja no accepta més {STRING} o {STRING}
@@ -2080,6 +2077,7 @@ STR_SV_STNAME_AIRPORT :{STRING} Aeropo
STR_SV_STNAME_OILFIELD :{STRING} Camp de Petroli
STR_SV_STNAME_MINES :{STRING} Mines
STR_SV_STNAME_DOCKS :{STRING} Port
+##id 0x6020
STR_SV_STNAME_ANNEXE :{STRING} Annex
STR_SV_STNAME_SIDINGS :{STRING} Via Morta
STR_SV_STNAME_BRANCH :{STRING} Bifurcació
@@ -2162,7 +2160,6 @@ STR_CITY_APPROVAL_HOSTILE :Hostil
##id 0x7000
STR_COMPANY_VIEW_CAPTION :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
-STR_FORMAT_COMPANY_NUM :(Companyia {COMMA})
STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Nova Cara
STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON :{BLACK}Esquema de color
STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE :{GOLD}Esquema de color:
@@ -2195,7 +2192,6 @@ STR_FINANCES_TOTAL_CAPTION :{WHITE}Total:
STR_COMPANY_NAME_COMPANY_NUM :{COMPANY} {COMPANYNUM}
STR_GRAPH_INCOME_CAPTION :{WHITE}Gràfic d'Ingressos
STR_CURRCOMPACT :{CURRCOMPACT}
-STR_JUST_COMMA :{COMMA}
STR_GRAPH_OPERATING_PROFIT_CAPTION :{WHITE}Gràfic de Rendiment d'Operacions
STR_FINANCES_BANK_BALANCE_TITLE :{WHITE}Balanç del Banc
STR_FINANCES_LOAN_TITLE :{WHITE}Préstec
@@ -2707,7 +2703,6 @@ STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON :{BLACK}Nous Veh
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_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} Trens
STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION :{WHITE}Nous Trens
STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION :{WHITE}Nous Trens de Via Electrificada
@@ -2765,7 +2760,6 @@ STR_ERROR_UNABLE_TO_FIND_ROUTE_TO :{WHITE}Incapaç
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_VEHICLE_LIST_TRAIN_LIST_TOOLTIP :{BLACK}Trens - clica al tren per més informació
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
@@ -2854,7 +2848,6 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP :{BLACK}Omple au
##id 0x9000
STR_ERROR_ROAD_VEHICLE_IN_THE_WAY :{WHITE}Automòbil en camí
-STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} Vehicles
STR_DEPOT_ROAD_CAPTION :{WHITE}{TOWN} Cotxera de Vehicles
STR_DEPOT_ROAD_NEW_VEHICLES_BUTTON :{BLACK}Nous Vehicles
STR_BUILD_VEHICLE_ROAD_CAPTION :{WHITE}Nous Vehicles
@@ -2870,7 +2863,6 @@ STR_HEADING_FOR_ROAD_DEPOT_SERVICE :{LTBLUE}Revisi
STR_HEADING_FOR_ROAD_DEPOT_SERVICE_VEL :{LTBLUE}Revisió a la cotxera de {TOWN}, {VELOCITY}
STR_ERROR_CAN_T_SEND_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_LIST_ROAD_TOOLTIP :{BLACK}Automòbils - clica en un vehicle per més informació
STR_VEHICLE_VIEW_ROAD_STATE_START_STOP_TOOLTIP :{BLACK}Acció sobre el vehicle actual - clica aquí per parar/arrencar el vehicle
STR_VEHICLE_VIEW_ROAD_ORDERS_TOOLTIP :{BLACK}Mostra les ordres dels vehicles
STR_VEHICLE_VIEW_ROAD_LOCATION_TOOLTIP :{BLACK}Centra la pantalla principal a la situació del vehicle
@@ -2917,7 +2909,6 @@ STR_WATERWAYS_TOOLBAR_CAPTION_SE :{WHITE}Vies d'a
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_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} 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
@@ -2940,7 +2931,6 @@ STR_DEPOT_SHIP_LIST_TOOLTIP :{BLACK}Vaixells
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_VEHICLE_LIST_SHIP_TOOLTIP :{BLACK}Vaixells - clica en un vaixell 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_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
@@ -2982,7 +2972,6 @@ STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}Fa una c
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_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} Avions
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}
@@ -2996,7 +2985,6 @@ STR_ERROR_AIRCRAFT_MUST_BE_STOPPED :{WHITE}L'avió
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_VEHICLE_LIST_AIRCRAFT_TOOLTIP :{BLACK}Avió - clica sobre l'avió per més informació
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
@@ -3178,11 +3166,16 @@ STR_LORRY :{BLACK}{LORRY}
STR_PLANE :{BLACK}{PLANE}
STR_SHIP :{BLACK}{SHIP}
+############ Vehicle lists
+STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP :{BLACK}Trens - clica al tren per més informació
+STR_VEHICLE_LIST_ROAD_TOOLTIP :{BLACK}Automòbils - clica en un vehicle per més informació
+STR_VEHICLE_LIST_SHIP_TOOLTIP :{BLACK}Vaixells - clica en un vaixell per més informació
+STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP :{BLACK}Avió - clica sobre l'avió per més informació
-STR_SCHEDULED_TRAINS_TIP :{BLACK}Mostra tots els trens que tinguin aquesta estació en el seu itinerari
-STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Mostra tots els vehicles que tinguin aquesta estació en el seu itinerari
-STR_SCHEDULED_AIRCRAFT_TIP :{BLACK}Mostra tots els avions que tinguin aquest aeroport en el seu itinerari
-STR_SCHEDULED_SHIPS_TIP :{BLACK}Mostra tots els vaixells que tinguin aquest port en el seu itinerari
+STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} Trens
+STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} Vehicles
+STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} Vaixells
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} Avions
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
@@ -3206,7 +3199,6 @@ STR_DEPOT_AUTOREPLACE_ROADVEH_TIP :{BLACK}Autosubs
STR_DEPOT_AUTOREPLACE_SHIP_TIP :{BLACK}Autosubstitueix tots els vaixells de la drassana
STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP :{BLACK}Autosubstitueix tots els avions de l'hangar
-
STR_REPLACE_VEHICLES_WHITE :{WHITE}Substitueix {STRING}
STR_REPLACE_VEHICLES_START :{BLACK}Comença a substituir
STR_REPLACE_VEHICLES_STOP :{BLACK}Para de substituir
@@ -3372,17 +3364,6 @@ STR_MEASURE_AREA :{BLACK}Àrea: {
STR_MEASURE_LENGTH_HEIGHTDIFF :{BLACK}Llargada: {NUM}{}Diferència d'alçada: {NUM} m
STR_MEASURE_AREA_HEIGHTDIFF :{BLACK}Àrea: {NUM} x {NUM}{}Diferència d'alçada: {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 Crèdits: {LTBLUE}{CURRENCY}
STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD :{WHITE}...aquesta carretera es propietat del poble
STR_DRIVE_THROUGH_ERROR_DIRECTION :{WHITE}...sentit de la carretera en la direcció incorrecta
@@ -3407,7 +3388,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 :Tots els trens
STR_GROUP_ALL_ROADS :Tots els vehicles
@@ -3436,12 +3416,35 @@ STR_GROUP_DELETE_TIP :{BLACK}Elimina
STR_GROUP_RENAME_TIP :{BLACK}Canvia el nom del grup seleccionat
STR_GROUP_REPLACE_PROTECTION_TIP :{BLACK}Clica per protegir aquest grup de l'autosubstitueix 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_COMMA :{COMMA}
+STR_JUST_INT :{NUM}
+STR_JUST_DATE_TINY :{DATE_TINY}
+STR_JUST_DATE_SHORT :{DATE_SHORT}
+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 :(Companyia {COMMA})
+STR_FORMAT_GROUP_NAME :Grup {COMMA}
+STR_FORMAT_INDUSTRY_NAME :{TOWN} {STRING}
STR_NAME_MUST_BE_UNIQUE :{WHITE}El nom ha de ser únic
diff --git a/src/lang/czech.txt b/src/lang/czech.txt
index 8826f8753..e88161b9e 100644
--- a/src/lang/czech.txt
+++ b/src/lang/czech.txt
@@ -830,9 +830,6 @@ STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :Investovat do p
############ range ends here
STR_FUND_INDUSTRY_CAPTION :{WHITE}Investovat do průmyslu
-STR_JUST_STRING :{STRING}
-STR_JUST_RAW_STRING :{STRING}
-STR_JUST_INT :{NUM}
STR_ERROR_CAN_ONLY_BE_BUILT_IN_RAINFOREST :{WHITE}... může být budováno jen v pralesech
STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT :{WHITE}... může být budováno jen v poušti
STR_STATUSBAR_PAUSED :{YELLOW}* * PAUZA * *
@@ -1258,6 +1255,8 @@ STR_GO_NON_STOP_TO_WAYPOINT :Jet bez zastáv
STR_WAYPOINTNAME_CITY :Směrování {TOWN}
STR_WAYPOINTNAME_CITY_SERIAL :Směrování {TOWN} č. {COMMA}
+STR_BUOYNAME_CITY :Bójka {TOWN}
+STR_BUOYNAME_CITY_SERIAL :Bójka {TOWN} č. {COMMA}
STR_LANDINFO_WAYPOINT :Směrování
STR_WAYPOINT :{WHITE}Směrování
@@ -1265,7 +1264,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}Přejmenovat stavědlo
STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}Nemohu přejmenovat stavědlo...
@@ -1325,8 +1323,8 @@ STR_MESSAGES_DISABLE_ALL :{BLACK}Vypnout
STR_MESSAGES_ENABLE_ALL :{BLACK}Zapnout všechny
STR_INDUSTRYDIR_CAPTION :{WHITE}Průmysl
-STR_INDUSTRYDIR_ITEM :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA} % přepraveno)
-STR_INDUSTRYDIR_ITEM_TWO :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA} %/{COMMA} % přepraveno)
+STR_INDUSTRYDIR_ITEM :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% přepraveno)
+STR_INDUSTRYDIR_ITEM_TWO :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% přepraveno)
STR_INDUSTRYDIR_ITEM_NOPROD :{ORANGE}{INDUSTRY}
STR_INDUSTRYDIR_LIST_CAPTION :{BLACK}Názvy průmyslu - na průmysl se podíváš kliknutím na jeho jméno
@@ -1380,14 +1378,14 @@ STR_NETWORK_YEARS_CAPTION :{BLACK}Roků
STR_NETWORK_YEARS_CAPTION_TIP :{BLACK}Počet let,{}po které už hra běží
STR_NETWORK_GAME_INFO :{SILVER}INFO O HŘE
-STR_NETWORK_CLIENTS :{SILVER}Klientů: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
-STR_NETWORK_LANGUAGE :{SILVER}Jazyk: {WHITE}{STRING}
-STR_NETWORK_TILESET :{SILVER}Prostředí: {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE :{SILVER}Velikost mapy: {WHITE}{COMMA}x{COMMA}
-STR_NETWORK_SERVER_VERSION :{SILVER}Verze hry na serveru: {WHITE}{STRING}
-STR_NETWORK_SERVER_ADDRESS :{SILVER}Adresa serveru: {WHITE}{STRING}
-STR_NETWORK_START_DATE :{SILVER}Počáteční datum: {WHITE}{DATE_SHORT}
-STR_NETWORK_CURRENT_DATE :{SILVER}Současné datum: {WHITE}{DATE_SHORT}
+STR_NETWORK_CLIENTS :{SILVER}Klientů: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
+STR_NETWORK_LANGUAGE :{SILVER}Jazyk: {WHITE}{STRING}
+STR_NETWORK_TILESET :{SILVER}Prostředí: {WHITE}{STRING}
+STR_NETWORK_MAP_SIZE :{SILVER}Velikost mapy: {WHITE}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_VERSION :{SILVER}Verze hry na serveru: {WHITE}{STRING}
+STR_NETWORK_SERVER_ADDRESS :{SILVER}Adresa serveru: {WHITE}{STRING}
+STR_NETWORK_START_DATE :{SILVER}Počáteční datum: {WHITE}{DATE_SHORT}
+STR_NETWORK_CURRENT_DATE :{SILVER}Současné datum: {WHITE}{DATE_SHORT}
STR_NETWORK_PASSWORD :{SILVER}Chráněno heslem!
STR_NETWORK_SERVER_OFFLINE :{SILVER}SERVER JE OFFLINE
STR_NETWORK_SERVER_FULL :{SILVER}SERVER JE PLNÝ
@@ -1469,7 +1467,7 @@ STR_NETWORK_LANG_LATVIAN :lotyština
STR_NETWORK_GAME_LOBBY :{WHITE}Vstupní místnost do hry více hráčů
-STR_NETWORK_PREPARE_TO_JOIN :{BLACK}Připravuji se na vstoupení: {ORANGE}{STRING}
+STR_NETWORK_PREPARE_TO_JOIN :{BLACK}Připravuji se na vstoupení: {ORANGE}{STRING}
STR_NETWORK_COMPANY_LIST_TIP :{BLACK}Současný seznam všech společností v této hře. Buď můžeš do jedné vstoupit, nebo můžeš založit novou.
STR_NETWORK_NEW_COMPANY :{BLACK}Nová společnost
STR_NETWORK_NEW_COMPANY_TIP :{BLACK}Založit novou společnost
@@ -1482,16 +1480,16 @@ STR_NETWORK_REFRESH_TIP :{BLACK}Znovu na
STR_NETWORK_COMPANY_INFO :{SILVER}INFO O SPOLEČNOSTI
-STR_NETWORK_COMPANY_NAME :{SILVER}Jméno společnosti: {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR :{SILVER}Založeno: {WHITE}{NUM}
-STR_NETWORK_VALUE :{SILVER}Hodnota společnosti: {WHITE}{CURRENCY}
-STR_NETWORK_CURRENT_BALANCE :{SILVER}Stav na účtu: {WHITE}{CURRENCY}
-STR_NETWORK_LAST_YEARS_INCOME :{SILVER}Loňský hrubý zisk: {WHITE}{CURRENCY}
-STR_NETWORK_PERFORMANCE :{SILVER}Výkon: {WHITE}{NUM}
+STR_NETWORK_COMPANY_NAME :{SILVER}Jméno společnosti: {WHITE}{STRING}
+STR_NETWORK_INAUGURATION_YEAR :{SILVER}Založeno: {WHITE}{NUM}
+STR_NETWORK_VALUE :{SILVER}Hodnota společnosti: {WHITE}{CURRENCY}
+STR_NETWORK_CURRENT_BALANCE :{SILVER}Stav na účtu: {WHITE}{CURRENCY}
+STR_NETWORK_LAST_YEARS_INCOME :{SILVER}Loňský hrubý zisk: {WHITE}{CURRENCY}
+STR_NETWORK_PERFORMANCE :{SILVER}Výkon: {WHITE}{NUM}
-STR_NETWORK_VEHICLES :{SILVER}Vozidla: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_STATIONS :{SILVER}Stanice: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_PLAYERS :{SILVER}Hráči: {WHITE}{STRING}
+STR_NETWORK_VEHICLES :{SILVER}Vozidla: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_STATIONS :{SILVER}Stanice: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_PLAYERS :{SILVER}Hráči: {WHITE}{STRING}
STR_NETWORK_CONNECTING :{WHITE}Připojování...
@@ -1518,23 +1516,23 @@ STR_NETWORK_CLIENT_LIST :{WHITE}Seznam h
STR_NETWORK_COMPANY_LIST_SPECTATE :{WHITE}Pozorovat
STR_NETWORK_COMPANY_LIST_NEW_COMPANY :{WHITE}Nová společnost
-STR_NETWORK_ERR_NOTAVAILABLE :{WHITE} Žádná síťová zařízení nebyla nalezena (nebo je hra zkompilována bez ENABLE_NETWORK)
-STR_NETWORK_ERR_NOSERVER :{WHITE} Nenalezena žádná síťová hra
-STR_NETWORK_ERR_NOCONNECTION :{WHITE} Server neodpověděl na požadavek
-STR_NETWORK_ERR_NEWGRF_MISMATCH :{WHITE} Není možno se připojit kvůli rozdílným grafikám
-STR_NETWORK_ERR_DESYNC :{WHITE} Síť - synchronizace hry selhala
-STR_NETWORK_ERR_LOSTCONNECTION :{WHITE} Síť - spojení ztraceno
-STR_NETWORK_ERR_SAVEGAMEERROR :{WHITE} Nemohu nahrát uloženou hru ze serveru
-STR_NETWORK_ERR_SERVER_START :{WHITE} Nemohu spustit server
-STR_NETWORK_ERR_CLIENT_START :{WHITE} Nemohu se připojit
-STR_NETWORK_ERR_TIMEOUT :{WHITE} U spojení č. {NUM} byl překročen čekací limit
-STR_NETWORK_ERR_SERVER_ERROR :{WHITE} Vznikla chyba v protokolu a naše spojení je přerušeno
-STR_NETWORK_ERR_WRONG_REVISION :{WHITE} Revize hry tohoto klienta neodpovídá revizi hry na serveru
-STR_NETWORK_ERR_WRONG_PASSWORD :{WHITE} Špatné heslo
-STR_NETWORK_ERR_SERVER_FULL :{WHITE} Server je plný
-STR_NETWORK_ERR_SERVER_BANNED :{WHITE} Jsi blokován serverem
-STR_NETWORK_ERR_KICKED :{WHITE} Byl jsi vyhozen ze hry
-STR_NETWORK_ERR_CHEATER :{WHITE} Používání cheatů není na tomto serveru povoleno
+STR_NETWORK_ERR_NOTAVAILABLE :{WHITE}Žádná síťová zařízení nebyla nalezena (nebo je hra zkompilována bez ENABLE_NETWORK)
+STR_NETWORK_ERR_NOSERVER :{WHITE}Nenalezena žádná síťová hra
+STR_NETWORK_ERR_NOCONNECTION :{WHITE}Server neodpověděl na požadavek
+STR_NETWORK_ERR_NEWGRF_MISMATCH :{WHITE}Není možno se připojit kvůli rozdílným grafikám
+STR_NETWORK_ERR_DESYNC :{WHITE}Síť - synchronizace hry selhala
+STR_NETWORK_ERR_LOSTCONNECTION :{WHITE}Síť - spojení ztraceno
+STR_NETWORK_ERR_SAVEGAMEERROR :{WHITE}Nemohu nahrát uloženou hru ze serveru
+STR_NETWORK_ERR_SERVER_START :{WHITE}Nemohu spustit server
+STR_NETWORK_ERR_CLIENT_START :{WHITE}Nemohu se připojit
+STR_NETWORK_ERR_TIMEOUT :{WHITE}U spojení č. {NUM} byl překročen čekací limit
+STR_NETWORK_ERR_SERVER_ERROR :{WHITE}Vznikla chyba v protokolu a naše spojení je přerušeno
+STR_NETWORK_ERR_WRONG_REVISION :{WHITE}Revize hry tohoto klienta neodpovídá revizi hry na serveru
+STR_NETWORK_ERR_WRONG_PASSWORD :{WHITE}Špatné heslo
+STR_NETWORK_ERR_SERVER_FULL :{WHITE}Server je plný
+STR_NETWORK_ERR_SERVER_BANNED :{WHITE}Jsi blokován serverem
+STR_NETWORK_ERR_KICKED :{WHITE}Byl jsi vyhozen ze hry
+STR_NETWORK_ERR_CHEATER :{WHITE}Používání cheatů není na tomto serveru povoleno
############ Leave those lines in this order!!
STR_NETWORK_ERR_CLIENT_GENERAL :všeobecná chyba
@@ -1600,12 +1598,12 @@ STR_NETWORK_SEND :{BLACK}Poslat
##### PNG-MAP-Loader
-STR_PNGMAP_ERROR :{WHITE}Nelze nahrát krajinu z PNG...
+STR_PNGMAP_ERROR :{WHITE}Nebylo možné nahrát krajinu z PNG...
STR_PNGMAP_ERR_FILE_NOT_FOUND :{WHITE}... soubor nenalezen.
STR_PNGMAP_ERR_IMAGE_TYPE :{WHITE}... nelze převést formát obrázku. Je nutno použít 8- nebo 24bitové barvy.
STR_PNGMAP_ERR_MISC :{WHITE}... něco se prostě pokazilo. Škoda. (Asi poškozený nebo nestandardní soubor.)
-STR_BMPMAP_ERROR :{WHITE}Nešlo nahrát krajinu z BMP...
+STR_BMPMAP_ERROR :{WHITE}Nebylo možné nahrát krajinu z BMP...
STR_BMPMAP_ERR_IMAGE_TYPE :{WHITE}... nelze převést formát obrázku.
##id 0x0800
@@ -1829,14 +1827,14 @@ STR_LOCAL_AUTHORITY_ACTION_STATUE_OF_COMPANY :Postavit sochu
STR_LOCAL_AUTHORITY_ACTION_NEW_BUILDINGS :Dotovat nové budovy
STR_LOCAL_AUTHORITY_ACTION_EXCLUSIVE_TRANSPORT :Koupit výhradní právo k přepravě
STR_LOCAL_AUTHORITY_ACTION_BRIBE :Podplatit místní správu
-STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_SMALL_ADVERTISING :{WHITE}{STRING}{}{YELLOW} Zahájit malou reklamní kampaň, která přiláká více cestujících a nákladu.{} Cena: {CURRENCY}
-STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_MEDIUM_ADVERTISING :{WHITE}{STRING}{}{YELLOW} Zahájit středně velkou reklamní kampaň, která přiláká více cestujících a nákladu.{} Cena: {CURRENCY}
-STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_LARGE_ADVERTISING :{WHITE}{STRING}{}{YELLOW} Zahájit velkou reklamní kampaň, která přiláká více cestujících a nákladu.{} Cena: {CURRENCY}
-STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_ROAD_RECONSTRUCTION :{WHITE}{STRING}{}{YELLOW} Dotovat rekonstrukci místní silniční sítě. Způsobí problémy v dopravě po dobu 6 měsíců.{} Cena: {CURRENCY}
-STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_STATUE_OF_COMPANY :{WHITE}{STRING}{}{YELLOW} Postavit sochu vlastníka jako poctu tvé společnosti.{} Cena: {CURRENCY}
-STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_NEW_BUILDINGS :{WHITE}{STRING}{}{YELLOW} Dotovat stavbu nových obchodních budov ve městě.{} Cena: {CURRENCY}
-STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_EXCLUSIVE_TRANSPORT :{WHITE}{STRING}{}{YELLOW} Koupit výhradní práva k přepravě zboží z tohoto města po dobu jednoho roku. Místní správa dovolí cestujícím a nákladu používat pouze stanice tvé společnosti.{} Cena: {CURRENCY}
-STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE :{WHITE}{STRING}{}{YELLOW} Podplatit místní správu pro zvýšení hodnocení společnosti. Riziko trestu v případě přistižení.{} Cena: {CURRENCY}
+STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_SMALL_ADVERTISING :{WHITE}{STRING}{}{YELLOW}Zahájit malou reklamní kampaň, která přiláká více cestujících a nákladu.{}Cena: {CURRENCY}
+STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_MEDIUM_ADVERTISING :{WHITE}{STRING}{}{YELLOW}Zahájit středně velkou reklamní kampaň, která přiláká více cestujících a nákladu.{}Cena: {CURRENCY}
+STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_LARGE_ADVERTISING :{WHITE}{STRING}{}{YELLOW}Zahájit velkou reklamní kampaň, která přiláká více cestujících a nákladu.{}Cena: {CURRENCY}
+STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_ROAD_RECONSTRUCTION :{WHITE}{STRING}{}{YELLOW}Dotovat rekonstrukci místní silniční sítě. Způsobí problémy v dopravě po dobu 6 měsíců.{}Cena: {CURRENCY}
+STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_STATUE_OF_COMPANY :{WHITE}{STRING}{}{YELLOW}Postavit sochu vlastníka jako poctu tvé společnosti.{}Cena: {CURRENCY}
+STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_NEW_BUILDINGS :{WHITE}{STRING}{}{YELLOW}Dotovat stavbu nových obchodních budov ve městě.{}Cena: {CURRENCY}
+STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_EXCLUSIVE_TRANSPORT :{WHITE}{STRING}{}{YELLOW}Koupit roční výhradní práva k přepravě zboží z tohoto města po dobu jednoho roku. Místní správa dovolí cestujícím a nákladu používat pouze stanice tvé společnosti.{}Cena: {CURRENCY}
+STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE :{WHITE}{STRING}{}{YELLOW}Podplatit místní správu pro zvýšení hodnocení společnosti. Riziko trestu v případě přistižení.{}Cena: {CURRENCY}
STR_NEWS_ROAD_REBUILDING :{BIGFONT}{BLACK}{TOWN} zažívá dopravní chaos!{}{}Program přestavby ulic sponzorovaný {STRING} přináší motoristům 6 měsíců utrpení!
STR_SMALLMAP_TOWN :{TINYFONT}{WHITE}{TOWN}
STR_TOWN_DIRECTORY_TOWN :{ORANGE}{TOWN}{BLACK} ({COMMA})
@@ -1846,11 +1844,6 @@ STR_TOWN_BUILDING_NAME_TEPEES_1 :Teepee
STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1 :Dům konvička
STR_TOWN_BUILDING_NAME_PIGGY_BANK_1 :Banka prasátko
-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 :Úpravy krajiny
STR_LANDSCAPING_MENU_PLANT_TREES :Vysadit stromy
@@ -1905,6 +1898,12 @@ STR_CARGO_RATING_EXCELLENT :Vynikající
STR_CARGO_RATING_OUTSTANDING :Úžasné
############ range for rating ends
+### station view strings
+STR_SCHEDULED_TRAINS_TIP :{BLACK}Zobrazit všechny vlaky, které mají tuto stanici v jízdním řádu
+STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Zobrazit všechna silniční vozidla, která mají tuto stanici v jízdním řádu
+STR_SCHEDULED_AIRCRAFT_TIP :{BLACK}Zobrazit všechna letadla, která mají tuto stanici v jízdním řádu
+STR_SCHEDULED_SHIPS_TIP :{BLACK}Zobrazit všechny lodě, které mají tuto stanici v jízdním řádu
+
STR_STATION_VIEW_CARGO_RATING :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}{STATION} už dále nepřijímá {STRING.acc}
STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION} už dále nepřijímá {STRING.acc} nebo {STRING.acc}
@@ -1952,7 +1951,7 @@ STR_STATION_DESCRIPTION_BUOY :Bójka
STR_ERROR_BUOY_IN_THE_WAY :{WHITE}... bójka v cestě
STR_ERROR_STATION_TOO_SPREAD_OUT :{WHITE}... stanice je příliš rozlehlá
STR_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}... nejednolité stanice nejsou povoleny
-STR_USE_CTRL_TO_SELECT_MORE :{BLACK}Podržením CTRL můžeš označit více položek
+STR_USE_CTRL_TO_SELECT_MORE :{BLACK}Podržením Ctrl můžeš označit více položek
STR_UNDEFINED :(nedefinovaný řetězec)
STR_STAT_CLASS_DFLT :Původní stanice
@@ -2051,7 +2050,7 @@ STR_INDUSTRY_VIEW_PRODUCES_CARGO_CARGO :{BLACK}Produkuj
############ range for produces ends
STR_INDUSTRY_VIEW_PRODUCTION_LAST_MONTH_TITLE :{BLACK}Produkce minulý měsíc:
-STR_INDUSTRY_VIEW_TRANSPORTED :{YELLOW}{CARGO}{STRING}{BLACK} ({COMMA} % přepraveno)
+STR_INDUSTRY_VIEW_TRANSPORTED :{YELLOW}{CARGO}{STRING}{BLACK} ({COMMA}% přepraveno)
STR_INDUSTRY_VIEW_LOCATION_TOOLTIP :{BLACK}Nastavit pohled na průmysl
STR_NEWS_INDUSTRY_CONSTRUCTION :{BLACK}{BIGFONT}{STRING} se staví poblíž města {TOWN}!
STR_NEWS_INDUSTRY_PLANTED :{BLACK}{BIGFONT}Nový {STRING} se vysazuje poblíž města {TOWN}!
@@ -2148,6 +2147,9 @@ STR_SV_STNAME_AIRPORT :Letiště {STRI
STR_SV_STNAME_OILFIELD :Ropná plošina {STRING}
STR_SV_STNAME_MINES :{STRING} doly
STR_SV_STNAME_DOCKS :Přístav {STRING}
+STR_SV_STNAME_BUOY :{STRING}
+STR_SV_STNAME_WAYPOINT :{STRING}
+##id 0x6020
STR_SV_STNAME_ANNEXE :{STRING} přípojné
STR_SV_STNAME_SIDINGS :{STRING} odstavné
STR_SV_STNAME_BRANCH :{STRING} odbočka
@@ -2230,7 +2232,6 @@ STR_CITY_APPROVAL_HOSTILE :zaujatý
##id 0x7000
STR_COMPANY_VIEW_CAPTION :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
-STR_FORMAT_COMPANY_NUM :(společnost {COMMA})
STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Nový obličej
STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON :{BLACK}Barva
STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE :{GOLD}Barevné schéma:
@@ -2263,11 +2264,10 @@ STR_FINANCES_TOTAL_CAPTION :{WHITE}Celkem:
STR_COMPANY_NAME_COMPANY_NUM :{COMPANY} {COMPANYNUM}
STR_GRAPH_INCOME_CAPTION :{WHITE}Graf příjmu
STR_CURRCOMPACT :{CURRCOMPACT}
-STR_JUST_COMMA :{COMMA}
STR_GRAPH_OPERATING_PROFIT_CAPTION :{WHITE}Graf provozního zisku
STR_FINANCES_BANK_BALANCE_TITLE :{WHITE}Stav na účtu
STR_FINANCES_LOAN_TITLE :{WHITE}Půjčka
-STR_MAX_LOAN :{WHITE}Max. půjčka: {BLACK}{CURRENCY}
+STR_MAX_LOAN :{WHITE}Max. půjčka: {BLACK}{CURRENCY}
STR_FINANCES_TOTAL_CURRENCY :{BLACK}{CURRENCY}
STR_FINANCES_BORROW_BUTTON :{BLACK}Půjčit {SKIP}{SKIP}{CURRENCY}
STR_FINANCES_REPAY_BUTTON :{BLACK}Vrátit {SKIP}{SKIP}{CURRENCY}
@@ -2397,7 +2397,7 @@ STR_LIVERY_SHIP_TIP :{BLACK}Zobrazit
STR_LIVERY_AIRCRAFT_TIP :{BLACK}Zobrazit barevná schémata pro letadla
STR_LIVERY_PRIMARY_TIP :{BLACK}Vybrat primární barvu označeného schématu
STR_LIVERY_SECONDARY_TIP :{BLACK}Vybrat sekundární barvu označeného schématu
-STR_LIVERY_PANEL_TIP :{BLACK}Vyber, které barevné schéma chceš změnit (více označíš s CTRL). Schéma změníš kliknutím na tlačítko
+STR_LIVERY_PANEL_TIP :{BLACK}Vyber, které barevné schéma chceš změnit (více označíš s Ctrl). Schéma změníš kliknutím na tlačítko
##id 0x8000
STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_KIRBY_PAUL_TANK_STEAM :Kirby Paul Tank (parní)
@@ -2781,7 +2781,6 @@ STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON :{BLACK}Nová vo
STR_DEPOT_NO_ENGINE :{BLACK}-
STR_ERROR_TRAIN_TOO_LONG :{WHITE}Příliš dlouhý vlak
STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT :{WHITE}Vlaky lze měnit, jen když stojí v depu
-STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} vlak{P "" y ů}
STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION :{WHITE}Nové lokomotivy a vagony
STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION :{WHITE}Nové elektrické lokomotivy a vagony
@@ -2801,7 +2800,7 @@ STR_ORDERS_SKIP_BUTTON :{BLACK}Přesko
STR_ORDERS_DELETE_BUTTON :{BLACK}Smazat
STR_ORDERS_GO_TO_BUTTON :{BLACK}Jet do
STR_REFIT :{BLACK}Přestavět
-STR_REFIT_TIP :{BLACK}Vyber, na který druh nákladu přestavět. CTRL-klik odstraní přestavbu z příkazu.
+STR_REFIT_TIP :{BLACK}Vyber, na který druh nákladu přestavět. Ctrl+klik odstraní přestavbu z příkazu.
STR_REFIT_ORDER :(Přestavět na {STRING})
STR_REFIT_STOP_ORDER :(Přestavět na {STRING} a zastavit)
STR_STOP_ORDER :(Zastavit)
@@ -2839,7 +2838,6 @@ STR_ERROR_UNABLE_TO_FIND_ROUTE_TO :{WHITE}Nemohu n
STR_ERROR_CAN_T_STOP_START_TRAIN :{WHITE}Nemohu rozjet/zastavit vlak...
STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS :{BLACK}Interval servisů: {LTBLUE}{COMMA} d{P en ny ní}{BLACK} Naposledy v servisu: {LTBLUE}{DATE_LONG}
STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT :{BLACK}Interval servisů: {LTBLUE}{COMMA}%{BLACK} Naposledy v servisu: {LTBLUE}{DATE_LONG}
-STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP :{BLACK}Vlaky - klepni na vlak pro informace
STR_DEPOT_TRAIN_LIST_TOOLTIP :{BLACK}Vlaky - stiskni na vlaku pro info, přesuň vagon pro přidání či odebrání z vlaku
STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP :{BLACK}Koupit nový vagon/lokomotivu
STR_DEPOT_TRAIN_SELL_TOOLTIP :{BLACK}Přesuň sem vagon pro prodej
@@ -2892,6 +2890,7 @@ STR_ERROR_CAN_T_RENAME_TRAIN :{WHITE}Nelze po
STR_VEHICLE_DETAILS_TRAIN_RENAME :{BLACK}Pojmenovat vlak
STR_NEWS_TRAIN_CRASH :{BLACK}{BIGFONT}Železniční neštěstí!{}Při srážce {COMMA} {P člověk lidé lidí} přiš{P el li lo} o život v plamenech.
STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN :{WHITE}Nelze obrátit vlak...
+STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS :{WHITE}Nelze otáčet vozidla složená z více strojů
STR_QUERY_RENAME_TRAIN_TYPE_CAPTION :{WHITE}Přejmenovat typ železničního vozidla
STR_ERROR_CAN_T_RENAME_TRAIN_TYPE :{WHITE}Nemohu přejmenovat typ železničního vozidla...
STR_CLEAR_TIME :{BLACK}Smazat čas
@@ -2922,11 +2921,10 @@ STR_TIMETABLE_STATUS_EARLY :{BLACK}Vozidlo
STR_TIMETABLE_TOTAL_TIME :{BLACK}Tento jízdní řád bude trvat {STRING}
STR_TIMETABLE_TOTAL_TIME_INCOMPLETE :{BLACK}Tento jízdní řád bude trvat nejméně {STRING} (vozidla mimo jízdní řád)
STR_TIMETABLE_AUTOFILL :{BLACK}Automaticky
-STR_TIMETABLE_AUTOFILL_TOOLTIP :{BLACK}Automaticky vyplň rozvrh hodnotami z následující cesty (CTRL-klik pro vyčkávání nějaké doby)
+STR_TIMETABLE_AUTOFILL_TOOLTIP :{BLACK}Automaticky vyplň rozvrh hodnotami z následující cesty (Ctrl+klik pro zachování vyčḱavací doby)
##id 0x9000
STR_ERROR_ROAD_VEHICLE_IN_THE_WAY :{WHITE}Silniční vozidlo v cestě
-STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} silniční{P "" "" ch} vozid{P lo la el}
STR_DEPOT_ROAD_CAPTION :{WHITE}Garáže pro silniční vozidla {TOWN}
STR_DEPOT_ROAD_NEW_VEHICLES_BUTTON :{BLACK}Nová vozidla
STR_BUILD_VEHICLE_ROAD_CAPTION :{WHITE}Nová silniční vozidla
@@ -2942,7 +2940,6 @@ STR_HEADING_FOR_ROAD_DEPOT_SERVICE :{LTBLUE}Údržb
STR_HEADING_FOR_ROAD_DEPOT_SERVICE_VEL :{LTBLUE}Údržba v silničním depu {TOWN}, {VELOCITY}
STR_ERROR_CAN_T_SEND_VEHICLE_TO_DEPOT :{WHITE}Nemohu poslat silniční vozidlo do garáže...
STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT :{WHITE}Nemohu najít místní garáž
-STR_VEHICLE_LIST_ROAD_TOOLTIP :{BLACK}Silniční vozidla - stiskni vozidlo pro informace
STR_VEHICLE_VIEW_ROAD_STATE_START_STOP_TOOLTIP :{BLACK}Současná činnost silničního vozidla - vozidlo se zastaví nebo rozjede, když sem klikneš
STR_VEHICLE_VIEW_ROAD_ORDERS_TOOLTIP :{BLACK}Ukaž příkazy vozidla
STR_VEHICLE_VIEW_ROAD_LOCATION_TOOLTIP :{BLACK}Nastav pohled na vozidlo
@@ -2970,7 +2967,6 @@ STR_NEWS_FIRST_ROAD_PASSENGER_TRAM_ARRIVAL :{BLACK}{BIGFONT
STR_NEWS_FIRST_ROAD_CARGO_TRAM_ARRIVAL :{BLACK}{BIGFONT}Obyvatelé oslavují...{}První nákladní tramvaj přijíždí do {STATION}!
STR_NEWS_ROAD_CRASH_DRIVER :{BLACK}{BIGFONT}Dopravní nehoda!{}Řidič zahynul v plamenech při srážce s vlakem
STR_NEWS_ROAD_CRASH :{BLACK}{BIGFONT}Dopravní nehoda!{}{COMMA} {P člověk lidé lidí} zahynul{P "" i o} v plamenech při srážce s vlakem
-STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS :{WHITE}Nelze otáčet vozidla složená z více strojů
STR_BUILD_VEHICLE_ROAD_RENAME_BUTTON :{BLACK}Přejmenovat
STR_BUILD_VEHICLE_ROAD_RENAME_TOOLTIP :{BLACK}Přejmenovat typ silničního vozidla
STR_QUERY_RENAME_ROAD_TYPE_CAPTION :{WHITE}Přejmenovat typ silničního vozidla
@@ -2989,7 +2985,6 @@ STR_WATERWAYS_TOOLBAR_CAPTION_SE :{WHITE}Vodní k
STR_ERROR_CAN_T_BUILD_DOCK_HERE :{WHITE}Zde nelze postavit přístav...
STR_DEPOT_SHIP_CAPTION :{WHITE}Lodní depo {TOWN}
STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON :{BLACK}Nové lodě
-STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} lo{P ď dě dí}
STR_BUILD_VEHICLE_SHIP_CAPTION :{WHITE}Nové lodě
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON :{BLACK}Koupit loď
STR_CLONE_SHIP :{BLACK}Klonovat loď
@@ -3012,7 +3007,6 @@ STR_DEPOT_SHIP_LIST_TOOLTIP :{BLACK}Lodě -
STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP :{BLACK}Koupit novou loď
STR_DEPOT_SHIP_SELL_TOOLTIP :{BLACK}Zde se dá loď prodat (přetáhnutím)
STR_DEPOT_SHIP_LOCATION_TOOLTIP :{BLACK}Nastavit pohled na lodní depo
-STR_VEHICLE_LIST_SHIP_TOOLTIP :{BLACK}Lodě - informace získáš klepnutím na jméno lodi
STR_BUILD_VEHICLE_SHIP_LIST_TOOLTIP :{BLACK}Seznam lodí - informace získáš klepnutím na jméno lodi
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP :{BLACK}Koupit označenou loď
STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Činnost lodi - na rozjetí nebo zastavení lodi klepni sem
@@ -3054,7 +3048,6 @@ STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}Vytvoř
STR_BUILD_VEHICLE_AIRCRAFT_CAPTION :{WHITE}Nové letadlo
STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON :{BLACK}Koupit letadlo
STR_ERROR_CAN_T_BUILD_AIRCRAFT :{WHITE}Nelze koupit letadlo...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} letad{P lo la el}
STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR :{WHITE}Nelze poslat letadlo do hangáru...
STR_HEADING_FOR_HANGAR :{ORANGE}Jedu do hangáru {STATION}
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Jedu do hangáru {STATION}, {VELOCITY}
@@ -3068,7 +3061,6 @@ STR_ERROR_AIRCRAFT_MUST_BE_STOPPED :{WHITE}Letadlo
STR_ERROR_CAN_T_SELL_AIRCRAFT :{WHITE}Nelze prodat letadlo...
STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :Stavba letiště
STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP :{BLACK}Postavit letiště
-STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP :{BLACK}Letadlo - klepni na letadlo pro informace
STR_DEPOT_AIRCRAFT_LIST_TOOLTIP :{BLACK}Letadlo - klepni na letadlo pro informace
STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP :{BLACK}Koupit nové letadlo
STR_DEPOT_AIRCRAFT_SELL_TOOLTIP :{BLACK}Přesuň sem letadlo k prodeji
@@ -3250,11 +3242,16 @@ STR_LORRY :{BLACK}{LORRY}
STR_PLANE :{BLACK}{PLANE}
STR_SHIP :{BLACK}{SHIP}
+############ Vehicle lists
+STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP :{BLACK}Vlaky - klepni na vlak pro informace
+STR_VEHICLE_LIST_ROAD_TOOLTIP :{BLACK}Silniční vozidla - stiskni vozidlo pro informace
+STR_VEHICLE_LIST_SHIP_TOOLTIP :{BLACK}Lodě - informace získáš klepnutím na jméno lodi
+STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP :{BLACK}Letadlo - klepni na letadlo pro informace
-STR_SCHEDULED_TRAINS_TIP :{BLACK}Zobrazit všechny vlaky, které mají tuto stanici v jízdním řádu
-STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Zobrazit všechna silniční vozidla, která mají tuto stanici v jízdním řádu
-STR_SCHEDULED_AIRCRAFT_TIP :{BLACK}Zobrazit všechna letadla, která mají tuto stanici v jízdním řádu
-STR_SCHEDULED_SHIPS_TIP :{BLACK}Zobrazit všechny lodě, které mají tuto stanici v jízdním řádu
+STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} vlak{P "" y ů}
+STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} silniční{P "" "" ch} vozid{P lo la el}
+STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} lo{P ď dě dí}
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} letad{P lo la el}
STR_VEH_WITH_SHARED_ORDERS_LIST :{WHITE}Sdílené příkazy {COMMA} vozid{P lo la el}
STR_VEH_WITH_SHARED_ORDERS_LIST_TIP :{BLACK}Zobrazit všechny prostředky se stejným jízdním řádem
@@ -3278,7 +3275,6 @@ STR_DEPOT_AUTOREPLACE_ROADVEH_TIP :{BLACK}Nechat a
STR_DEPOT_AUTOREPLACE_SHIP_TIP :{BLACK}Nechat automaticky vyměňovat všechny lodě přítomné v depu
STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP :{BLACK}Nechat automaticky vyměňovat všechna letadla a vrtulníky přítomné v hangáru
-
STR_REPLACE_VEHICLES_WHITE :{WHITE}Vyměňování {STRING}
STR_REPLACE_VEHICLES_START :{BLACK}Zapnout vyměňování
STR_REPLACE_VEHICLES_STOP :{BLACK}Vypnout vyměňování
@@ -3332,14 +3328,14 @@ STR_MAGLEV_VEHICLES :Lokomotivy Magl
STR_TINY_BLACK :{BLACK}{TINYFONT}{COMMA}
STR_PURCHASE_INFO_COST_WEIGHT :{BLACK}Cena: {GOLD}{CURRENCY}{BLACK} Hmotnost: {GOLD}{WEIGHT_S}
-STR_PURCHASE_INFO_SPEED_POWER :{BLACK}Rychlost: {GOLD}{VELOCITY}{BLACK} Výkon: {GOLD}{POWER}
+STR_PURCHASE_INFO_SPEED_POWER :{BLACK}Rychlost: {GOLD}{VELOCITY}{BLACK} Výkon: {GOLD}{POWER}
STR_PURCHASE_INFO_SPEED :{BLACK}Rychlost: {GOLD}{VELOCITY}
STR_PURCHASE_INFO_RUNNINGCOST :{BLACK}Provozní cena: {GOLD}{CURRENCY} ročně
STR_PURCHASE_INFO_CAPACITY :{BLACK}Kapacita: {GOLD}{CARGO} {STRING}
STR_PURCHASE_INFO_DESIGNED_LIFE :{BLACK}Vyvinuto: {GOLD}{NUM}{BLACK} Životnost: {GOLD}{COMMA} {P rok roky let}
-STR_PURCHASE_INFO_RELIABILITY :{BLACK}Max. spolehlivost: {GOLD}{COMMA} %
+STR_PURCHASE_INFO_RELIABILITY :{BLACK}Max. spolehlivost: {GOLD}{COMMA}%
STR_PURCHASE_INFO_COST :{BLACK}Cena: {GOLD}{CURRENCY}
-STR_PURCHASE_INFO_WEIGHT_CWEIGHT :{BLACK}Hmotnost: {GOLD}{WEIGHT_S} ({WEIGHT_S})
+STR_PURCHASE_INFO_WEIGHT_CWEIGHT :{BLACK}Hmotnost: {GOLD}{WEIGHT_S} ({WEIGHT_S})
STR_PURCHASE_INFO_COST_SPEED :{BLACK}Cena: {GOLD}{CURRENCY}{BLACK} Rychlost: {GOLD}{VELOCITY}
STR_PURCHASE_INFO_AIRCRAFT_CAPACITY :{BLACK}Kapacita: {GOLD}{CARGO}, {CARGO}
STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT :{BLACK}Poháněné vagony: {GOLD}+{POWER}{BLACK} Hmotnost: {GOLD}+{WEIGHT_S}
@@ -3444,31 +3440,20 @@ STR_MEASURE_AREA :{BLACK}Oblast:
STR_MEASURE_LENGTH_HEIGHTDIFF :{BLACK}Délka: {NUM}{}Výškový rozdíl: {NUM} m
STR_MEASURE_AREA_HEIGHTDIFF :{BLACK}Oblast: {NUM} x {NUM}{}Výškový rozdíl: {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}Podíl za převoz: {LTBLUE}{CURRENCY}
STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD :{WHITE}... tato silnice je ve vlastnictví obce
STR_DRIVE_THROUGH_ERROR_DIRECTION :{WHITE}... silnice je otočena jiným směrem
STR_TRANSPARENCY_TOOLB :{WHITE}Nastavení průhlednosti
-STR_TRANSPARENT_SIGNS_DESC :{BLACK}Změna průhlednosti jmen stanic. Nastavení se zamkne CTRL+kliknutím.
-STR_TRANSPARENT_TREES_DESC :{BLACK}Změna průhlednosti stromů. Nastavení se zamkne CTRL+kliknutím.
-STR_TRANSPARENT_HOUSES_DESC :{BLACK}Změna průhlednosti domů. Nastavení se zamkne CTRL+kliknutím.
-STR_TRANSPARENT_INDUSTRIES_DESC :{BLACK}Změna průhlednosti továren. Nastavení se zamkne CTRL+kliknutím.
-STR_TRANSPARENT_BUILDINGS_DESC :{BLACK}Změna průhlednosti postavitelných objektů, jako stanic, dep a stavědel. Nastavení se zamkne kliknutím s CTRL.
-STR_TRANSPARENT_BRIDGES_DESC :{BLACK}Změna průhlednosti mostů. Nastavení se zamkne CTRL+kliknutím.
-STR_TRANSPARENT_STRUCTURES_DESC :{BLACK}Změna průhlednosti staveb jako majáků, vysílačů a doplňků (v budoucnosti). Nastavení se zamkne CTRL+kliknutím.
-STR_TRANSPARENT_CATENARY_DESC :{BLACK}Změna průhlednosti elektrifikace. Nastavení se zamkne CTRL+kliknutím.
-STR_TRANSPARENT_LOADING_DESC :{BLACK}Přepnout průhlednost pro ukazatele naložení. Nastavení se zamkne CTRL+kliknutím.
+STR_TRANSPARENT_SIGNS_DESC :{BLACK}Změna průhlednosti jmen stanic. Nastavení se zamkne Ctrl+kliknutím.
+STR_TRANSPARENT_TREES_DESC :{BLACK}Změna průhlednosti stromů. Nastavení se zamkne Ctrl+kliknutím.
+STR_TRANSPARENT_HOUSES_DESC :{BLACK}Změna průhlednosti domů. Nastavení se zamkne Ctrl+kliknutím.
+STR_TRANSPARENT_INDUSTRIES_DESC :{BLACK}Změna průhlednosti továren. Nastavení se zamkne Ctrl+kliknutím.
+STR_TRANSPARENT_BUILDINGS_DESC :{BLACK}Změna průhlednosti postavitelných objektů, jako stanic, dep a směrování. Nastavení se zamkne Ctrl+kliknutím.
+STR_TRANSPARENT_BRIDGES_DESC :{BLACK}Změna průhlednosti mostů. Nastavení se zamkne Ctrl+kliknutím.
+STR_TRANSPARENT_STRUCTURES_DESC :{BLACK}Změna průhlednosti staveb jako majáků a vysílačů. Nastavení se zamkne Ctrl+kliknutím.
+STR_TRANSPARENT_CATENARY_DESC :{BLACK}Změna průhlednosti elektrifikace. Nastavení se zamkne Ctrl+kliknutím.
+STR_TRANSPARENT_LOADING_DESC :{BLACK}Přepnout zobrazení ukazatelů naložení. Nastavení se zamkne Ctrl+kliknutím.
STR_TRANSPARENT_INVISIBLE_DESC :{BLACK}Objekty budou neviditelné, ne průhledné
STR_PERCENT_UP_SMALL :{TINYFONT}{WHITE}{NUM}%{UPARROW}
@@ -3479,7 +3464,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šechny vlaky
STR_GROUP_ALL_ROADS :Všechna silniční vozidla
@@ -3508,12 +3492,35 @@ STR_GROUP_DELETE_TIP :{BLACK}Vymazat
STR_GROUP_RENAME_TIP :{BLACK}Přejmenovat vybranou skupinu
STR_GROUP_REPLACE_PROTECTION_TIP :{BLACK}Kliknutím nebude na tuto skupinu mít vliv automatická výměna vozidel
+#### 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_COMMA :{COMMA}
+STR_JUST_INT :{NUM}
+STR_JUST_DATE_TINY :{DATE_TINY}
+STR_JUST_DATE_SHORT :{DATE_SHORT}
+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 :(společnost {COMMA})
+STR_FORMAT_GROUP_NAME :Skupina {COMMA}
+STR_FORMAT_INDUSTRY_NAME :{1:STRING} {0:TOWN}
STR_NAME_MUST_BE_UNIQUE :{WHITE}Jméno musí být unikátní
@@ -3592,7 +3599,7 @@ STR_BUILD_SIGNAL_ELECTRIC_EXIT_TIP :{BLACK}Výjezdo
STR_BUILD_SIGNAL_ELECTRIC_COMBO_TIP :{BLACK}Cestové návěstidlo (elektrické){}Cestové (kombinované) návěstidlo slouží zároveň jako vjezdové a odjezdové. Tím je možné postavit velké "řetězce" návěstidel.
STR_BUILD_SIGNAL_ELECTRIC_PBS_TIP :{BLACK}Dokonalejší (PBS) návěstidlo (elektrické){}Dokonalejší návěstidlo umožňuje vjet několika vlakům najednou do stejného úseku trati, pokud jsou schopny rezervovat si cestu až do bezpečného místa na zastavení. Dokonalejší návěstidla se dají projet zezadu.
STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TIP :{BLACK}Dokonalejší (PBS) jednosměrné návěstidlo (elektrické){}Dokonalejší návěstidlo umožňuje vjet několika vlakům najednou do stejného úseku trati, pokud jsou schopny rezervovat si cestu až do bezpečného místa na zastavení. Jednosměrná návěstidla se nedají projet zezadu.
-STR_SIGNAL_CONVERT_TIP :{BLACK}Přeměna návěstidel{}Když je přeměna zapnuta, návěstidlo se změní kliknutím. Kliknutím s CTRL se přepne mezi variantami návěstidla.
+STR_SIGNAL_CONVERT_TIP :{BLACK}Přeměna návěstidel{}Když je přeměna zapnuta, návěstidlo se změní kliknutím. Kliknutím s Ctrl se přepne mezi variantami návěstidla.
STR_DRAG_SIGNALS_DENSITY_TIP :{BLACK}Rozestup při stavbě návěstidel tažením
STR_DRAG_SIGNALS_DENSITY_DECREASE_TIP :{BLACK}Snížit rozestup mezi návěstidly
STR_DRAG_SIGNALS_DENSITY_INCREASE_TIP :{BLACK}Zvýšit rozestup mezi návěstidly
diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt
index cec741f34..f5af0f5aa 100644
--- a/src/lang/dutch.txt
+++ b/src/lang/dutch.txt
@@ -1039,7 +1039,7 @@ STR_CONFIG_SETTING_TIMETABLE_ALLOW :{LTBLUE}Activee
STR_CONFIG_SETTING_TIMETABLE_IN_TICKS :{LTBLUE}Toon dienstregeling in tikken ipv in dagen: {ORANGE}{STRING}
STR_CONFIG_SETTING_QUICKGOTO :{LTBLUE}Snel voertuig orders maken: {ORANGE}{STRING}
STR_CONFIG_SETTING_DEFAULT_RAIL_TYPE :{LTBLUE}Standaard spoorsoort (bij nieuw of opgeslagen spel): {ORANGE}{STRING}
-STR_CONFIG_SETTING_DEFAULT_RAIL_TYPE_RAIL :Normaal spoor
+STR_CONFIG_SETTING_DEFAULT_RAIL_TYPE_RAIL :Normaal spoor
STR_CONFIG_SETTING_DEFAULT_RAIL_TYPE_ELRAIL :Elektrisch spoor
STR_CONFIG_SETTING_DEFAULT_RAIL_TYPE_MONORAIL :Monorail
STR_CONFIG_SETTING_DEFAULT_RAIL_TYPE_MAGLEV :Maglev
@@ -1185,8 +1185,10 @@ STR_HEADING_FOR_WAYPOINT_VEL :{LTBLUE}Op weg
STR_GO_TO_WAYPOINT :Ga via {WAYPOINT}
STR_GO_NON_STOP_TO_WAYPOINT :Ga non-stop via {WAYPOINT}
-STR_WAYPOINTNAME_CITY :Controlepost {TOWN}
-STR_WAYPOINTNAME_CITY_SERIAL :Controlepost {TOWN} #{COMMA}
+STR_WAYPOINTNAME_CITY :{TOWN} Controlepost
+STR_WAYPOINTNAME_CITY_SERIAL :{TOWN} Controlepost #{COMMA}
+STR_BUOYNAME_CITY :{TOWN} Boei
+STR_BUOYNAME_CITY_SERIAL :{TOWN} Boei #{COMMA}
STR_LANDINFO_WAYPOINT :Controlepost
STR_WAYPOINT :{WHITE}Controlepost
@@ -2077,6 +2079,9 @@ STR_SV_STNAME_AIRPORT :{STRING} Vliegv
STR_SV_STNAME_OILFIELD :{STRING} Olieveld
STR_SV_STNAME_MINES :{STRING} Mijnen
STR_SV_STNAME_DOCKS :{STRING} Haven
+STR_SV_STNAME_BUOY :{STRING}
+STR_SV_STNAME_WAYPOINT :{STRING}
+##id 0x6020
STR_SV_STNAME_ANNEXE :{STRING} Bijbouw
STR_SV_STNAME_SIDINGS :{STRING} Zijspoor
STR_SV_STNAME_BRANCH :{STRING} Aftakking
@@ -2796,7 +2801,7 @@ STR_VEHICLE_INFO_MAX_SPEED :{BLACK}Max. sne
STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED :{BLACK}Gewicht: {LTBLUE}{WEIGHT_S} {BLACK}Kracht: {LTBLUE}{POWER}{BLACK} Max. snelheid: {LTBLUE}{VELOCITY}
STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED_MAX_TE :{BLACK}Gewicht: {LTBLUE}{WEIGHT_S} {BLACK}Kracht: {LTBLUE}{POWER}{BLACK} Max. snelheid: {LTBLUE}{VELOCITY} {BLACK}Max. T.K.: {LTBLUE}{FORCE}
STR_VEHICLE_INFO_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Winst dit jaar: {LTBLUE}{CURRENCY} (vorig jaar: {CURRENCY})
-STR_VEHICLE_INFO_RELIABILITY_BREAKDOWNS :{BLACK}Betrouwbaarheid: {LTBLUE}{COMMA}% {BLACK}Aantal keren motorpech sinds vorig jaar: {LTBLUE}{COMMA}
+STR_VEHICLE_INFO_RELIABILITY_BREAKDOWNS :{BLACK}Betrouwbaarheid: {LTBLUE}{COMMA}% {BLACK}Aantal keren motorpech sinds vorig jaar: {LTBLUE}{COMMA}
STR_VEHICLE_INFO_BUILT_VALUE :{LTBLUE}{ENGINE} {BLACK}Gebouwd: {LTBLUE}{NUM}{BLACK} Waarde: {LTBLUE}{CURRENCY}
STR_VEHICLE_INFO_CAPACITY :{BLACK}Capaciteit: {LTBLUE}{CARGO}{SKIP}{SKIP}{STRING}
STR_VEHICLE_INFO_CAPACITY_MULT :{BLACK}Capaciteit: {LTBLUE}{CARGO}{SKIP}{SKIP}{STRING} (x{NUM})
diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt
index 666714eb8..5c8a7c002 100644
--- a/src/lang/english_US.txt
+++ b/src/lang/english_US.txt
@@ -762,9 +762,6 @@ STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :Fund new indust
############ range ends here
STR_FUND_INDUSTRY_CAPTION :{WHITE}Fund new industry
-STR_JUST_STRING :{STRING}
-STR_JUST_RAW_STRING :{STRING}
-STR_JUST_INT :{NUM}
STR_ERROR_CAN_ONLY_BE_BUILT_IN_RAINFOREST :{WHITE}...can only be built in rainforest areas
STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT :{WHITE}...can only be built in desert areas
STR_STATUSBAR_PAUSED :{YELLOW}* * PAUSED * *
@@ -963,6 +960,7 @@ STR_CONFIG_SETTING_ADJACENT_STATIONS :{LTBLUE}Allow b
STR_CONFIG_SETTING_DYNAMIC_ENGINES :{LTBLUE}Enable multiple NewGRF engine sets: {ORANGE}{STRING}
STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES :{WHITE}Changing this setting is not possible when there are vehicles.
+STR_CONFIG_SETTING_NEVER_EXPIRE_AIRPORTS :{LTBLUE}Airports never expire: {ORANGE}{STRING}
STR_CONFIG_SETTING_WARN_LOST_TRAIN :{LTBLUE}Warn if train is lost: {ORANGE}{STRING}
STR_CONFIG_SETTING_ORDER_REVIEW :{LTBLUE}Review vehicles' orders: {ORANGE}{STRING}
@@ -1196,7 +1194,6 @@ STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Select w
STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT}
STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT}
-STR_WAYPOINT_NAME :{WAYPOINT}
STR_EDIT_WAYPOINT_NAME :{WHITE}Edit waypoint name
STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}Can't change waypoint name...
@@ -1343,7 +1340,7 @@ STR_NETWORK_INTERNET :Internet
STR_NETWORK_LAN_INTERNET :LAN / Internet
STR_NETWORK_INTERNET_ADVERTISE :Internet (advertize)
STR_NETWORK_CLIENTS_SELECT :{BLACK}{SKIP}{SKIP}{NUM} client{P "" s}
-STR_NETWORK_NUMBER_OF_CLIENTS :{BLACK}Maximum allowed clients:
+STR_NETWORK_NUMBER_OF_CLIENTS :{BLACK}Max clients:
STR_NETWORK_NUMBER_OF_CLIENTS_TIP :{BLACK}Choose a maximum number of clients. Not all slots need to be filled.
STR_NETWORK_COMPANIES_SELECT :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} compan{P y ies}
STR_NETWORK_NUMBER_OF_COMPANIES :{BLACK}Max companies:
@@ -1777,11 +1774,6 @@ STR_TOWN_BUILDING_NAME_TEPEES_1 :Tepees
STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1 :Teapot-House
STR_TOWN_BUILDING_NAME_PIGGY_BANK_1 :Piggy-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 :Landscaping
STR_LANDSCAPING_MENU_PLANT_TREES :Plant trees
@@ -1836,6 +1828,12 @@ STR_CARGO_RATING_EXCELLENT :Excellent
STR_CARGO_RATING_OUTSTANDING :Outstanding
############ range for rating ends
+### station view strings
+STR_SCHEDULED_TRAINS_TIP :{BLACK}Show all trains which have this station on their schedule
+STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Show all road vehicles which have this station on their schedule
+STR_SCHEDULED_AIRCRAFT_TIP :{BLACK}Show all aircraft which have this station on their schedule
+STR_SCHEDULED_SHIPS_TIP :{BLACK}Show all ships which have this station on their schedule
+
STR_STATION_VIEW_CARGO_RATING :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}{STATION} no longer accepts {STRING}
STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION} no longer accepts {STRING} or {STRING}
@@ -2079,6 +2077,7 @@ STR_SV_STNAME_AIRPORT :{STRING} Airpor
STR_SV_STNAME_OILFIELD :{STRING} Oilfield
STR_SV_STNAME_MINES :{STRING} Mines
STR_SV_STNAME_DOCKS :{STRING} Docks
+##id 0x6020
STR_SV_STNAME_ANNEXE :{STRING} Annexe
STR_SV_STNAME_SIDINGS :{STRING} Sidings
STR_SV_STNAME_BRANCH :{STRING} Branch
@@ -2161,7 +2160,6 @@ STR_CITY_APPROVAL_HOSTILE :Hostile
##id 0x7000
STR_COMPANY_VIEW_CAPTION :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
-STR_FORMAT_COMPANY_NUM :(Company {COMMA})
STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}New Face
STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON :{BLACK}Color Scheme
STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE :{GOLD}Color Scheme:
@@ -2194,7 +2192,6 @@ STR_FINANCES_TOTAL_CAPTION :{WHITE}Total:
STR_COMPANY_NAME_COMPANY_NUM :{COMPANY} {COMPANYNUM}
STR_GRAPH_INCOME_CAPTION :{WHITE}Income Graph
STR_CURRCOMPACT :{CURRCOMPACT}
-STR_JUST_COMMA :{COMMA}
STR_GRAPH_OPERATING_PROFIT_CAPTION :{WHITE}Operating Profit Graph
STR_FINANCES_BANK_BALANCE_TITLE :{WHITE}Bank Balance
STR_FINANCES_LOAN_TITLE :{WHITE}Loan
@@ -2706,7 +2703,6 @@ STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON :{BLACK}New Vehi
STR_DEPOT_NO_ENGINE :{BLACK}-
STR_ERROR_TRAIN_TOO_LONG :{WHITE}Train too long
STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT :{WHITE}Trains can only be altered when stopped inside a depot
-STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} Train{P "" s}
STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION :{WHITE}New Rail Vehicles
STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION :{WHITE}New Electric Rail Vehicles
@@ -2764,7 +2760,6 @@ STR_ERROR_UNABLE_TO_FIND_ROUTE_TO :{WHITE}Unable t
STR_ERROR_CAN_T_STOP_START_TRAIN :{WHITE}Can't stop/start train...
STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS :{BLACK}Servicing interval: {LTBLUE}{COMMA}days{BLACK} Last service: {LTBLUE}{DATE_LONG}
STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT :{BLACK}Servicing interval: {LTBLUE}{COMMA}%{BLACK} Last service: {LTBLUE}{DATE_LONG}
-STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP :{BLACK}Trains - click on train for information
STR_DEPOT_TRAIN_LIST_TOOLTIP :{BLACK}Trains - click on train for info., drag vehicle to add/remove from train
STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP :{BLACK}Build new train vehicle
STR_DEPOT_TRAIN_SELL_TOOLTIP :{BLACK}Drag train vehicle to here to sell it
@@ -2817,6 +2812,8 @@ STR_ERROR_CAN_T_RENAME_TRAIN :{WHITE}Can't na
STR_VEHICLE_DETAILS_TRAIN_RENAME :{BLACK}Name train
STR_NEWS_TRAIN_CRASH :{BLACK}{BIGFONT}Train Crash!{}{COMMA} die in fireball after collision
STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN :{WHITE}Can't reverse direction of train...
+STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE :{WHITE}Can't reverse direction of vehicle...
+STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS :{WHITE}Can't turn vehicles consisting of multiple units
STR_QUERY_RENAME_TRAIN_TYPE_CAPTION :{WHITE}Rename train vehicle type
STR_ERROR_CAN_T_RENAME_TRAIN_TYPE :{WHITE}Can't rename train vehicle type...
STR_CLEAR_TIME :{BLACK}Clear Time
@@ -2851,7 +2848,6 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP :{BLACK}Fill the
##id 0x9000
STR_ERROR_ROAD_VEHICLE_IN_THE_WAY :{WHITE}Road vehicle in the way
-STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} Road Vehicle{P "" s}
STR_DEPOT_ROAD_CAPTION :{WHITE}{TOWN} Road Vehicle Depot
STR_DEPOT_ROAD_NEW_VEHICLES_BUTTON :{BLACK}New Vehicles
STR_BUILD_VEHICLE_ROAD_CAPTION :{WHITE}New Road Vehicles
@@ -2867,7 +2863,6 @@ STR_HEADING_FOR_ROAD_DEPOT_SERVICE :{LTBLUE}Service
STR_HEADING_FOR_ROAD_DEPOT_SERVICE_VEL :{LTBLUE}Service at {TOWN} Road Depot, {VELOCITY}
STR_ERROR_CAN_T_SEND_VEHICLE_TO_DEPOT :{WHITE}Can't send vehicle to depot...
STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT :{WHITE}Unable to find local depot
-STR_VEHICLE_LIST_ROAD_TOOLTIP :{BLACK}Road vehicles - click on vehicle for information
STR_VEHICLE_VIEW_ROAD_STATE_START_STOP_TOOLTIP :{BLACK}Current vehicle action - click here to stop/start vehicle
STR_VEHICLE_VIEW_ROAD_ORDERS_TOOLTIP :{BLACK}Show vehicle's orders
STR_VEHICLE_VIEW_ROAD_LOCATION_TOOLTIP :{BLACK}Center main view on vehicle's location
@@ -2895,7 +2890,7 @@ STR_NEWS_FIRST_ROAD_PASSENGER_TRAM_ARRIVAL :{BLACK}{BIGFONT
STR_NEWS_FIRST_ROAD_CARGO_TRAM_ARRIVAL :{BLACK}{BIGFONT}Citizens celebrate . . .{}First freight streetcar arrives at {STATION}!
STR_NEWS_ROAD_CRASH_DRIVER :{BLACK}{BIGFONT}Road Vehicle Crash!{}Driver dies in fireball after collision with train
STR_NEWS_ROAD_CRASH :{BLACK}{BIGFONT}Road Vehicle Crash!{}{COMMA} die in fireball after collision with train
-STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS :{WHITE}Can't turn vehicles consisting of multiple units
+STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN :{WHITE}Can't make road vehicle turn around...
STR_BUILD_VEHICLE_ROAD_RENAME_BUTTON :{BLACK}Rename
STR_BUILD_VEHICLE_ROAD_RENAME_TOOLTIP :{BLACK}Rename road vehicle type
STR_QUERY_RENAME_ROAD_TYPE_CAPTION :{WHITE}Rename road vehicle type
@@ -2914,7 +2909,6 @@ STR_WATERWAYS_TOOLBAR_CAPTION_SE :{WHITE}Waterway
STR_ERROR_CAN_T_BUILD_DOCK_HERE :{WHITE}Can't build dock here...
STR_DEPOT_SHIP_CAPTION :{WHITE}{TOWN} Ship Depot
STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON :{BLACK}New Ships
-STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} Ship{P "" s}
STR_BUILD_VEHICLE_SHIP_CAPTION :{WHITE}New Ships
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON :{BLACK}Build Ship
STR_CLONE_SHIP :{BLACK}Clone Ship
@@ -2937,7 +2931,6 @@ STR_DEPOT_SHIP_LIST_TOOLTIP :{BLACK}Ships -
STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP :{BLACK}Build new ship
STR_DEPOT_SHIP_SELL_TOOLTIP :{BLACK}Drag ship to here to sell it
STR_DEPOT_SHIP_LOCATION_TOOLTIP :{BLACK}Center main view on ship depot location
-STR_VEHICLE_LIST_SHIP_TOOLTIP :{BLACK}Ships - click on ship for information
STR_BUILD_VEHICLE_SHIP_LIST_TOOLTIP :{BLACK}Ship selection list - click on ship for information
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP :{BLACK}Build the highlighted ship
STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Current ship action - click here to stop/start ship
@@ -2979,7 +2972,6 @@ STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}This wil
STR_BUILD_VEHICLE_AIRCRAFT_CAPTION :{WHITE}New Aircraft
STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON :{BLACK}Build Aircraft
STR_ERROR_CAN_T_BUILD_AIRCRAFT :{WHITE}Can't build aircraft...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} Aircraft
STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR :{WHITE}Can't send aircraft to hangar...
STR_HEADING_FOR_HANGAR :{ORANGE}Heading for {STATION} Hangar
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Heading for {STATION} Hangar, {VELOCITY}
@@ -2993,7 +2985,6 @@ STR_ERROR_AIRCRAFT_MUST_BE_STOPPED :{WHITE}Aircraft
STR_ERROR_CAN_T_SELL_AIRCRAFT :{WHITE}Can't sell aircraft...
STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :Airport construction
STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP :{BLACK}Build airport
-STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP :{BLACK}Aircraft - click on aircraft for information
STR_DEPOT_AIRCRAFT_LIST_TOOLTIP :{BLACK}Aircraft - click on aircraft for information
STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP :{BLACK}Build new aircraft
STR_DEPOT_AIRCRAFT_SELL_TOOLTIP :{BLACK}Drag aircraft to here to sell it
@@ -3175,11 +3166,16 @@ STR_LORRY :{BLACK}{LORRY}
STR_PLANE :{BLACK}{PLANE}
STR_SHIP :{BLACK}{SHIP}
+############ Vehicle lists
+STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP :{BLACK}Trains - click on train for information
+STR_VEHICLE_LIST_ROAD_TOOLTIP :{BLACK}Road vehicles - click on vehicle for information
+STR_VEHICLE_LIST_SHIP_TOOLTIP :{BLACK}Ships - click on ship for information
+STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP :{BLACK}Aircraft - click on aircraft for information
-STR_SCHEDULED_TRAINS_TIP :{BLACK}Show all trains which have this station on their schedule
-STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Show all road vehicles which have this station on their schedule
-STR_SCHEDULED_AIRCRAFT_TIP :{BLACK}Show all aircraft which have this station on their schedule
-STR_SCHEDULED_SHIPS_TIP :{BLACK}Show all ships which have this station on their schedule
+STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} Train{P "" s}
+STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} Road Vehicle{P "" s}
+STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} Ship{P "" s}
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} Aircraft
STR_VEH_WITH_SHARED_ORDERS_LIST :{WHITE}Shared orders of {COMMA} Vehicle{P "" s}
STR_VEH_WITH_SHARED_ORDERS_LIST_TIP :{BLACK}Show all vehicles which have the same schedule
@@ -3203,7 +3199,6 @@ STR_DEPOT_AUTOREPLACE_ROADVEH_TIP :{BLACK}Autorepl
STR_DEPOT_AUTOREPLACE_SHIP_TIP :{BLACK}Autoreplace all ships in the depot
STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP :{BLACK}Autoreplace all aircraft in the hangar
-
STR_REPLACE_VEHICLES_WHITE :{WHITE}Replace {STRING}
STR_REPLACE_VEHICLES_START :{BLACK}Start Replacing Vehicles
STR_REPLACE_VEHICLES_STOP :{BLACK}Stop Replacing Vehicles
@@ -3369,17 +3364,6 @@ STR_MEASURE_AREA :{BLACK}Area: {N
STR_MEASURE_LENGTH_HEIGHTDIFF :{BLACK}Length: {NUM}{}Height difference: {NUM} m
STR_MEASURE_AREA_HEIGHTDIFF :{BLACK}Area: {NUM} x {NUM}{}Height difference: {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}...this is a town owned road
STR_DRIVE_THROUGH_ERROR_DIRECTION :{WHITE}...road facing in the wrong direction
@@ -3404,7 +3388,6 @@ STR_PERCENT_UP_DOWN_SMALL :{TINYFONT}{WHIT
STR_PERCENT_UP_DOWN :{WHITE}{NUM}%{UPARROW}{DOWNARROW}
##### Mass Order
-STR_FORMAT_GROUP_NAME :Group {COMMA}
STR_GROUP_TINY_NAME :{TINYFONT}{GROUP}
STR_GROUP_ALL_TRAINS :All trains
STR_GROUP_ALL_ROADS :All road vehicles
@@ -3433,12 +3416,35 @@ STR_GROUP_DELETE_TIP :{BLACK}Delete t
STR_GROUP_RENAME_TIP :{BLACK}Rename the selected group
STR_GROUP_REPLACE_PROTECTION_TIP :{BLACK}Click to protect this group from global autoreplace
+#### 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_COMMA :{COMMA}
+STR_JUST_INT :{NUM}
+STR_JUST_DATE_TINY :{DATE_TINY}
+STR_JUST_DATE_SHORT :{DATE_SHORT}
+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 :Group {COMMA}
+STR_FORMAT_INDUSTRY_NAME :{TOWN} {STRING}
STR_NAME_MUST_BE_UNIQUE :{WHITE}Name must be unique
diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt
index aad4de283..0c01acbe0 100644
--- a/src/lang/esperanto.txt
+++ b/src/lang/esperanto.txt
@@ -763,9 +763,6 @@ STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :Fondu novan ind
############ range ends here
STR_FUND_INDUSTRY_CAPTION :{WHITE}Fondu novan industrion
-STR_JUST_STRING :{STRING}
-STR_JUST_RAW_STRING :{STRING}
-STR_JUST_INT :{NUM}
STR_ERROR_CAN_ONLY_BE_BUILT_IN_RAINFOREST :{WHITE}...nur konstruebla en praarbaraj regionoj
STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT :{WHITE}...nur konstruebla en dezertaj regionoj
STR_STATUSBAR_PAUSED :{YELLOW}* * PAŬZO * *
@@ -1198,7 +1195,6 @@ STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Elektu t
STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT}
STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT}
-STR_WAYPOINT_NAME :{WAYPOINT}
STR_EDIT_WAYPOINT_NAME :{WHITE}Ŝanĝu trairejan nomon
STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}Ne povas ŝanĝi trairejan nomon...
@@ -1600,7 +1596,7 @@ STR_BUILD_DEPOT_TRAIN_ORIENTATION :{BLACK}Elektu d
STR_RAILROAD_TRACK :Reloj
STR_RAILROAD_TRAIN_DEPOT :Trajndeponejo
STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}...regiono estas posedata de alia kompanio
-STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS :Reloj kun normalaj signaloj
+STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS :Reloj kun bloko-signaloj
STR_RAILROAD_TRACK_WITH_PRESIGNALS :Reloj kun antaŭ-signaloj
STR_RAILROAD_TRACK_WITH_EXITSIGNALS :Reloj kun elir-signaloj
STR_RAILROAD_TRACK_WITH_COMBOSIGNALS :Reloj kun kombin-signaloj
@@ -1717,8 +1713,8 @@ STR_LOCAL_AUTHORITY_ACTION_STATUE_OF_COMPANY :Konstruu statuo
STR_LOCAL_AUTHORITY_ACTION_NEW_BUILDINGS :Fondu novajn konstruaĵojn
STR_LOCAL_AUTHORITY_ACTION_EXCLUSIVE_TRANSPORT :Aĉetu ekskluzivan transportrajton
STR_LOCAL_AUTHORITY_ACTION_BRIBE :Subaĉetu la lokajn estrojn
-STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_SMALL_ADVERTISING :{WHITE}{STRING}{}{YELLOW} Komencu malgrandan lokan reklamadon, por altiri pli da pasaĝeroj kaj ŝarĝoj al viaj transportservoj.{} Kosto: {CURRENCY}
-STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_MEDIUM_ADVERTISING :{WHITE}{STRING}{}{YELLOW} Komencu mezgrandan lokan reklamadon, por altiri pli da pasaĝeroj kaj ŝarĝoj al viaj transportservoj.{} Kosto: {CURRENCY}
+STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_SMALL_ADVERTISING :{WHITE}{STRING}{}{YELLOW}Komencu malgrandan lokan reklamadon, por altiri pli da pasaĝeroj kaj ŝarĝoj al viaj transportservoj.{}Kosto: {CURRENCY}
+STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_MEDIUM_ADVERTISING :{WHITE}{STRING}{}{YELLOW}Komencu mezgrandan lokan reklamadon, por altiri pli da pasaĝeroj kaj ŝarĝoj al viaj transportservoj.{}Kosto: {CURRENCY}
STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_LARGE_ADVERTISING :{WHITE}{STRING}{}{YELLOW} Komencu grandan lokan reklamadon, por altiri pli da pasaĝeroj kaj ŝarĝoj al viaj transportservoj.{} Kosto: {CURRENCY}
STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_ROAD_RECONSTRUCTION :{WHITE}{STRING}{}{YELLOW} Fondu rekonstruadon de la urba voja reto. Kaŭzos konsiderindan ĝenon al la trafiko por ĝis 6 monatoj.{} Kosto: {CURRENCY}
STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_STATUE_OF_COMPANY :{WHITE}{STRING}{}{YELLOW} Konstruu statuon honore al via kompanio.{} Kosto: {CURRENCY}
@@ -1734,11 +1730,6 @@ STR_TOWN_BUILDING_NAME_TEPEES_1 :Tipioj
STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1 :Tekruĉa Domo
STR_TOWN_BUILDING_NAME_PIGGY_BANK_1 :Porko-Banko
-STR_INDUSTRY_NAME :{INDUSTRY}
-STR_TOWN_NAME :{TOWN}
-STR_FORMAT_INDUSTRY_NAME :{TOWN} {STRING}
-STR_STATION_NAME :{STATION}
-
##id 0x2800
STR_LANDSCAPING_MENU_LANDSCAPING :Landaspektigi
STR_LANDSCAPING_MENU_PLANT_TREES :Plantu arbojn
@@ -1791,6 +1782,12 @@ STR_CARGO_RATING_EXCELLENT :Bonege
STR_CARGO_RATING_OUTSTANDING :Elstare bonege
############ range for rating ends
+### station view strings
+STR_SCHEDULED_TRAINS_TIP :{BLACK}Montru ĉiujn trajnojn kun ĉi tiu stacio en la plano
+STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Montru ĉiujnvojveturilojn kun ĉi tiu stacio en la plano
+STR_SCHEDULED_AIRCRAFT_TIP :{BLACK}Montru ĉiujn aviadilojn kun ĉi tiu stacio en la plano
+STR_SCHEDULED_SHIPS_TIP :{BLACK}Montru ĉiujn ŝipojn kun ĉi tiu stacio en la plano
+
STR_STATION_VIEW_CARGO_RATING :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}{STATION} ne plu akceptas {STRING.n}
STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION} ne plu akceptas {STRING.n} aŭ {STRING.n}
@@ -2014,6 +2011,7 @@ STR_SV_STNAME_AIRPORT :Flughaveno de {
STR_SV_STNAME_OILFIELD :Olefonto de {STRING}
STR_SV_STNAME_MINES :Minejo de {STRING}
STR_SV_STNAME_DOCKS :Haveno de {STRING}
+##id 0x6020
STR_SV_STNAME_ANNEXE :Ekstera {STRING}
STR_SV_STNAME_SIDINGS :Flanka {STRING}
STR_SV_STNAME_BRANCH :Branĉa {STRING}
@@ -2128,7 +2126,6 @@ STR_FINANCES_TOTAL_CAPTION :{WHITE}Entute:
STR_COMPANY_NAME_COMPANY_NUM :{COMPANY} {COMPANYNUM}
STR_GRAPH_INCOME_CAPTION :{WHITE}Enspeza Grafiko
STR_CURRCOMPACT :{CURRCOMPACT}
-STR_JUST_COMMA :{COMMA}
STR_GRAPH_OPERATING_PROFIT_CAPTION :{WHITE}Gajna Grafiko
STR_FINANCES_BANK_BALANCE_TITLE :{WHITE}Banka Balanco
STR_FINANCES_LOAN_TITLE :{WHITE}Prunto
@@ -2547,7 +2544,6 @@ STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON :{BLACK}Novaj Ve
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_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} Trajno{P "" j}
STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION :{WHITE}Novaj Relaj Veturiloj
STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION :{WHITE}Novaj Elektraj Relaj Veturiloj
@@ -2592,7 +2588,6 @@ STR_ERROR_UNABLE_TO_FIND_ROUTE_TO :{WHITE}Ne eblas
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_VEHICLE_LIST_TRAIN_LIST_TOOLTIP :{BLACK}Trajnoj - alklaku trajnon por pliaj informoj
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
@@ -2647,7 +2642,6 @@ STR_TIMETABLE_CHANGE_TIME :{BLACK}Ŝanĝu
##id 0x9000
STR_ERROR_ROAD_VEHICLE_IN_THE_WAY :{WHITE}Vojveturilo okupas la lokon
-STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} Vojveturilo{P "" j}
STR_DEPOT_ROAD_CAPTION :{WHITE}{TOWN} Vojveturila Deponejo
STR_DEPOT_ROAD_NEW_VEHICLES_BUTTON :{BLACK}Novaj Veturiloj
STR_BUILD_VEHICLE_ROAD_CAPTION :{WHITE}Novaj Vojveturiloj
@@ -2662,7 +2656,6 @@ STR_HEADING_FOR_ROAD_DEPOT_SERVICE :{LTBLUE}Prizorg
STR_HEADING_FOR_ROAD_DEPOT_SERVICE_VEL :{LTBLUE}Prizorgo ĉe {TOWN} Voja Deponejo, {VELOCITY}
STR_ERROR_CAN_T_SEND_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_LIST_ROAD_TOOLTIP :{BLACK}Vojveturiloj - alklaku veturilon por informoj
STR_VEHICLE_VIEW_ROAD_STATE_START_STOP_TOOLTIP :{BLACK}Nuna veturila ago - klaku ĉi tie por haltigi/starti veturilon
STR_VEHICLE_VIEW_ROAD_ORDERS_TOOLTIP :{BLACK}Montru veturilajn ordenojn
STR_VEHICLE_VIEW_ROAD_LOCATION_TOOLTIP :{BLACK}Centre vidu la veturilon en la ĉefvido
@@ -2704,7 +2697,6 @@ STR_ROAD_SELECT_TYPE_OF_CARGO_FOR :{BLACK}Elektu p
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_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} Ŝipo{P "" j}
STR_BUILD_VEHICLE_SHIP_CAPTION :{WHITE}Novaj Ŝipoj
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON :{BLACK}Kreu Ŝipon
STR_CLONE_SHIP :{BLACK}Klonu Ŝipon
@@ -2726,7 +2718,6 @@ STR_DEPOT_SHIP_LIST_TOOLTIP :{BLACK}Ŝipoj -
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_VEHICLE_LIST_SHIP_TOOLTIP :{BLACK}Ŝipoj - alklaku ŝipon por informoj
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
@@ -2766,7 +2757,6 @@ STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}Ĉi tio
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_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} Aviadiloj
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}
@@ -2779,7 +2769,6 @@ STR_ERROR_AIRCRAFT_MUST_BE_STOPPED :{WHITE}Aviadilo
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_VEHICLE_LIST_AIRCRAFT_TOOLTIP :{BLACK}Aviadiloj - alklaku aviadilon por informoj
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
@@ -2922,11 +2911,16 @@ STR_LORRY :{BLACK}{LORRY}
STR_PLANE :{BLACK}{PLANE}
STR_SHIP :{BLACK}{SHIP}
+############ Vehicle lists
+STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP :{BLACK}Trajnoj - alklaku trajnon por pliaj informoj
+STR_VEHICLE_LIST_ROAD_TOOLTIP :{BLACK}Vojveturiloj - alklaku veturilon por informoj
+STR_VEHICLE_LIST_SHIP_TOOLTIP :{BLACK}Ŝipoj - alklaku ŝipon por informoj
+STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP :{BLACK}Aviadiloj - alklaku aviadilon por informoj
-STR_SCHEDULED_TRAINS_TIP :{BLACK}Montru ĉiujn trajnojn kun ĉi tiu stacio en la plano
-STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Montru ĉiujnvojveturilojn kun ĉi tiu stacio en la plano
-STR_SCHEDULED_AIRCRAFT_TIP :{BLACK}Montru ĉiujn aviadilojn kun ĉi tiu stacio en la plano
-STR_SCHEDULED_SHIPS_TIP :{BLACK}Montru ĉiujn ŝipojn kun ĉi tiu stacio en la plano
+STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} Trajno{P "" j}
+STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} Vojveturilo{P "" j}
+STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} Ŝipo{P "" j}
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} Aviadiloj
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
@@ -2949,7 +2943,6 @@ STR_DEPOT_AUTOREPLACE_ROADVEH_TIP :{BLACK}Aŭtomat
STR_DEPOT_AUTOREPLACE_SHIP_TIP :{BLACK}Aŭtomate anstataŭu ĉiujn ŝipojn en la deponejo
STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP :{BLACK}Aŭtomate anstataŭu ĉiujn aviadilojn en la hangaro
-
STR_REPLACE_VEHICLES_WHITE :{WHITE}Anstataŭu {STRING.n}
STR_REPLACE_VEHICLES_START :{BLACK}Komencu Anstataŭi
STR_REPLACE_VEHICLES_STOP :{BLACK}Ĉesu Anstataŭi
@@ -3102,13 +3095,6 @@ STR_MEASURE_AREA :{BLACK}Regiono:
STR_MEASURE_LENGTH_HEIGHTDIFF :{BLACK}Longo: {NUM}{}Altecdiferenco: {NUM} m
STR_MEASURE_AREA_HEIGHTDIFF :{BLACK}Regiono: {NUM} x {NUM}{}Altecdiferenco: {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_FEEDER_CARGO_VALUE :{BLACK}Transigaj Kreditoj: {LTBLUE}{CURRENCY}
STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD :{WHITE}...ĉi tiun vojon posedas la urbo
STR_DRIVE_THROUGH_ERROR_DIRECTION :{WHITE}...vojo direktiĝas malĝuste
@@ -3130,7 +3116,6 @@ STR_PERCENT_UP_DOWN_SMALL :{TINYFONT}{WHIT
STR_PERCENT_UP_DOWN :{WHITE}{NUM}%{UPARROW}{DOWNARROW}
##### Mass Order
-STR_FORMAT_GROUP_NAME :Group {COMMA}
STR_GROUP_TINY_NAME :{TINYFONT}{GROUP}
STR_GROUP_ALL_TRAINS :Ĉiuj trajnoj
STR_GROUP_ALL_SHIPS :Ĉiuj ŝipoj
@@ -3145,12 +3130,29 @@ STR_GROUP_CREATE_TIP :{BLACK}Klaku po
STR_GROUP_DELETE_TIP :{BLACK}Viŝu la selektitan grupon
STR_GROUP_RENAME_TIP :{BLACK}Renomu la sektitan grupon
+#### 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_COMMA :{COMMA}
+STR_JUST_INT :{NUM}
+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_GROUP_NAME :Group {COMMA}
+STR_FORMAT_INDUSTRY_NAME :{TOWN} {STRING}
STR_NAME_MUST_BE_UNIQUE :{WHITE}Nomo devas esti ununura
diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt
index b9fe36f98..512986c63 100644
--- a/src/lang/finnish.txt
+++ b/src/lang/finnish.txt
@@ -1187,6 +1187,8 @@ STR_GO_NON_STOP_TO_WAYPOINT :Mene pysäht. p
STR_WAYPOINTNAME_CITY :Reittipiste: {TOWN}
STR_WAYPOINTNAME_CITY_SERIAL :Reittipiste: {TOWN} #{COMMA}
+STR_BUOYNAME_CITY :{TOWN} Poiju
+STR_BUOYNAME_CITY_SERIAL :{TOWN} Poiju #{COMMA}
STR_LANDINFO_WAYPOINT :Reittipiste
STR_WAYPOINT :{WHITE}Reittipiste
@@ -2077,6 +2079,9 @@ STR_SV_STNAME_AIRPORT :{STRING}, lento
STR_SV_STNAME_OILFIELD :{STRING}, öljykenttä
STR_SV_STNAME_MINES :{STRING}, kaivokset
STR_SV_STNAME_DOCKS :{STRING}, satama
+STR_SV_STNAME_BUOY :{STRING}
+STR_SV_STNAME_WAYPOINT :{STRING}
+##id 0x6020
STR_SV_STNAME_ANNEXE :{STRING}, sivuasema
STR_SV_STNAME_SIDINGS :{STRING}, sivuraide
STR_SV_STNAME_BRANCH :{STRING}, haarautuma
diff --git a/src/lang/german.txt b/src/lang/german.txt
index 0de5b6a4d..6806ae597 100644
--- a/src/lang/german.txt
+++ b/src/lang/german.txt
@@ -1188,6 +1188,8 @@ STR_GO_NON_STOP_TO_WAYPOINT :Fahre ohne Halt
STR_WAYPOINTNAME_CITY :Wegpunkt {TOWN}
STR_WAYPOINTNAME_CITY_SERIAL :Wegpunkt {TOWN} #{COMMA}
+STR_BUOYNAME_CITY :{TOWN} Boje
+STR_BUOYNAME_CITY_SERIAL :{TOWN} Boje #{COMMA}
STR_LANDINFO_WAYPOINT :Wegpunkt
STR_WAYPOINT :{WHITE}Wegpunkt
@@ -2078,6 +2080,9 @@ STR_SV_STNAME_AIRPORT :{STRING} Flugha
STR_SV_STNAME_OILFIELD :{STRING} Ölfeld
STR_SV_STNAME_MINES :{STRING} Mine
STR_SV_STNAME_DOCKS :{STRING} Hafen
+STR_SV_STNAME_BUOY :{STRING}
+STR_SV_STNAME_WAYPOINT :{STRING}
+##id 0x6020
STR_SV_STNAME_ANNEXE :{STRING} Anbau
STR_SV_STNAME_SIDINGS :{STRING} Nebengleis
STR_SV_STNAME_BRANCH :{STRING} Zweig
diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt
index 7090c3e7e..2458791c3 100644
--- a/src/lang/norwegian_bokmal.txt
+++ b/src/lang/norwegian_bokmal.txt
@@ -323,7 +323,7 @@ STR_SORT_CRITERIA_TIP :{BLACK}Velg sor
STR_FILTER_CRITERIA_TIP :{BLACK}Velg filtreringskriterier
STR_SORT_BY :{BLACK}Sorter etter
-STR_SORT_BY_POPULATION :{BLACK}Innbyggertall
+STR_SORT_BY_POPULATION :{BLACK}Folketall
STR_SORT_BY_PRODUCTION :Produksjon
STR_SORT_BY_TYPE :Type
STR_SORT_BY_TRANSPORTED :Transportert
@@ -331,7 +331,7 @@ STR_SORT_BY_NAME :{BLACK}Navn
STR_SORT_BY_DROPDOWN_NAME :Navn
STR_SORT_BY_DATE :{BLACK}Dato
STR_SORT_BY_NUMBER :Nummer
-STR_SORT_BY_PROFIT_LAST_YEAR :Fortjeneste forrige år
+STR_SORT_BY_PROFIT_LAST_YEAR :Fortjeneste i fjor
STR_SORT_BY_PROFIT_THIS_YEAR :Fortjeneste i år
STR_SORT_BY_AGE :Alder
STR_SORT_BY_RELIABILITY :Pålitelighet
@@ -433,8 +433,8 @@ STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF :{BLACK}Skru av/
STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR :{TINYFONT}{BLACK}Fortjeneste i år: {CURRENCY} (sist år: {CURRENCY})
############ range for service numbers starts
-STR_AGE :{COMMA} år ({COMMA})
-STR_AGE_RED :{RED}{COMMA} år ({COMMA})
+STR_AGE :{COMMA} år{P "" s} ({COMMA})
+STR_AGE_RED :{RED}{COMMA} år{P "" s} ({COMMA})
############ range for service numbers ends
STR_VEHICLE_TRAIN :Tog
@@ -564,8 +564,8 @@ STR_NEWS_MESSAGE_TYPE_NEW_VEHICLES :{YELLOW}Nye kj
STR_NEWS_MESSAGE_TYPE_CHANGES_OF_CARGO_ACCEPTANCE :{YELLOW}Endringer i godtatte varer
STR_NEWS_MESSAGE_TYPE_SUBSIDIES :{YELLOW}Subsidier
STR_NEWS_MESSAGE_TYPE_GENERAL_INFORMATION :{YELLOW}Generell informasjon
-STR_MESSAGES_ALL :{YELLOW}Innstilling for alle meldingstyper (på/av/sammendrag)
-STR_MESSAGE_SOUND :{YELLOW}Spill av lyd for nyhetssammendrag
+STR_MESSAGES_ALL :{YELLOW}Innstilling for alle meldinger: Av / Sammendrag/ Fullstendig
+STR_MESSAGE_SOUND :{YELLOW}Spill av en lyd ved nyhetssammendrag
STR_ERROR_TOO_FAR_FROM_PREVIOUS_DESTINATION :{WHITE}...for langt i fra forrige destinasjon
STR_HIGHSCORE_TOP_COMPANIES_WHO_REACHED :{BIGFONT}{BLACK}Beste firma som nådde {NUM}{}({STRING} Nivå)
STR_HIGHSCORE_TOP_COMPANIES_NETWORK_GAME :{BIGFONT}{BLACK}Firmarangering i {NUM}
@@ -624,7 +624,7 @@ STR_TERRAFORM_TOOLTIP_PLACE_ROCKY_AREAS_ON_LANDSCAPE :{BLACK}Plasser
STR_TERRAFORM_TOOLTIP_PLACE_LIGHTHOUSE :{BLACK}Plasser fyrtårn
STR_TERRAFORM_TOOLTIP_PLACE_TRANSMITTER :{BLACK}Plasser radiosender
STR_TERRAFORM_TOOLTIP_DEFINE_DESERT_AREA :{BLACK}Definer ørkenområde.{}Trykk og hold inne CTRL for å fjerne den
-STR_CREATE_LAKE :{BLACK}Definer vannområde.{}Lag en kanal, untatt hvis CTRL holdes nede på havnivå, hvor områdene vil fylles istedenfor
+STR_CREATE_LAKE :{BLACK}Definer vannområde.{}Lag en kanal, unntatt hvis CTRL holdes nede på havnivå, hvorpå området rundt vil fylles istedenfor
STR_CREATE_RIVER :{BLACK}Plasser elver.
STR_TOWN_VIEW_DELETE_BUTTON :{BLACK}Slett
STR_TOWN_VIEW_DELETE_TOOLTIP :{BLACK}Slett denne byen fullstendig
@@ -712,8 +712,8 @@ STR_TOWN_MENU_TOWN_DIRECTORY :Byoversikt
STR_TOWN_POPULATION :{BLACK}Verdensbefolkning: {COMMA}
STR_EXTRA_VIEW_PORT_TITLE :{WHITE}Vindu {COMMA}
STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN :{BLACK}Kopier til vindu
-STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT :{BLACK}Kopier stedet til den globale synsvinkelen til dette vinduet
-STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW :{BLACK}Kopier fra vindu
+STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT :{BLACK}Kopier gjeldende visning til dette vinduet
+STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW :{BLACK}Lim inn fra vindu
STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TT :{BLACK}Kopier stedet til dette vinduet til den globale synsvinkelen
STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME :{BLACK}Valutaenhet
@@ -762,9 +762,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 kun bygges i regnskogområder
STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT :{WHITE}...kan kun bygges i ørkenområder
STR_STATUSBAR_PAUSED :{YELLOW}* * PAUSE * *
@@ -775,14 +772,14 @@ STR_ERROR_SCREENSHOT_FAILED :{WHITE}Skjermdu
STR_TERRAFORM_TOOLTIP_PURCHASE_LAND :{BLACK}Kjøp land for fremtidig bruk
STR_STATUSBAR_AUTOSAVE :{RED}AUTOLAGRING
STR_STATUSBAR_SAVING_GAME :{RED}* * LAGRER SPILL * *
-STR_SAVE_STILL_IN_PROGRESS :{WHITE}Lagring foregår enda,{}vennligst vent til det er ferdig!
+STR_SAVE_STILL_IN_PROGRESS :{WHITE}Lagring pågår enda,{}vennligst vent til det er ferdig!
STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE :{BLACK}Velg 'Ezy style music'-program
STR_6 :{BLACK}6
STR_7 :{BLACK}7
############ start of townname region
-STR_TOWNNAME_ORIGINAL_ENGLISH :Engelsk
+STR_TOWNNAME_ORIGINAL_ENGLISH :Engelsk (Original)
STR_TOWNNAME_FRENCH :Fransk
STR_TOWNNAME_GERMAN :Tysk
STR_TOWNNAME_ADDITIONAL_ENGLISH :Engelsk (utvidet)
@@ -795,7 +792,7 @@ STR_TOWNNAME_POLISH :Polsk
STR_TOWNNAME_SLOVAK :Slovakisk
STR_TOWNNAME_NORWEGIAN :Norsk
STR_TOWNNAME_HUNGARIAN :Ungarsk
-STR_TOWNNAME_AUSTRIAN :Østerriksk
+STR_TOWNNAME_AUSTRIAN :Tysk (Østerrike)
STR_TOWNNAME_ROMANIAN :Rumensk
STR_TOWNNAME_CZECH :Tsjekkisk
STR_TOWNNAME_SWISS :Sveitsisk
@@ -841,7 +838,7 @@ STR_OPTIONS_LANG_CBO :{BLACK}{SKIP}{S
STR_OPTIONS_LANG_TIP :{BLACK}Velg språk som skal brukes
STR_OPTIONS_FULLSCREEN :{BLACK}Fullskjerm
-STR_OPTIONS_FULLSCREEN_TIP :{BLACK}Kryss av i denne boksen for å spille OpenTTD i fullskjermmodus
+STR_OPTIONS_FULLSCREEN_TIP :{BLACK}Trykk på denne knappen for å spille OpenTTD i fullskjermmodus
STR_FULLSCREEN_FAILED :{WHITE}Fullskjerm modus mislykkes
STR_OPTIONS_RES :{BLACK}Skjermoppløsning
@@ -850,7 +847,7 @@ STR_OPTIONS_RES_TIP :{BLACK}Velg skj
STR_OPTIONS_SCREENSHOT_FORMAT :{BLACK}Filformat for skjermdump
STR_OPTIONS_SCREENSHOT_FORMAT_CBO :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_OPTIONS_SCREENSHOT_FORMAT_TIP :{BLACK}Velg hvilket format skjermdumpet skal lagers i
+STR_OPTIONS_SCREENSHOT_FORMAT_TIP :{BLACK}Velg hvilket format skjermdumpen skal lagres i
STR_OPTIONS_BASE_GRF :{BLACK}Grafikksett
STR_OPTIONS_BASE_GRF_CBO :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
@@ -889,7 +886,7 @@ STR_NOTHING :
STR_SMALL_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
-STR_CANT_SHARE_ORDER_LIST :{WHITE}Kan ikke dele ordre liste...
+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 - -
@@ -970,7 +967,7 @@ STR_CONFIG_SETTING_ORDER_REVIEW :{LTBLUE}Inspise
STR_CONFIG_SETTING_ORDER_REVIEW_OFF :nei
STR_CONFIG_SETTING_ORDER_REVIEW_EXDEPOT :ja, men ekskluder stoppede kjøretøy
STR_CONFIG_SETTING_ORDER_REVIEW_ON :av alle kjøretøy
-STR_CONFIG_SETTING_WARN_INCOME_LESS :{LTBLUE}Advar hvis et kjøretøys profitt er negative: {ORANGE}{STRING}
+STR_CONFIG_SETTING_WARN_INCOME_LESS :{LTBLUE}Advar hvis profitten til et kjøretøy er negativ: {ORANGE}{STRING}
STR_CONFIG_SETTING_NEVER_EXPIRE_VEHICLES :{LTBLUE}Kjøretøy utgår aldri: {ORANGE}{STRING}
STR_CONFIG_SETTING_AUTORENEW_VEHICLE :{LTBLUE}Bytt automatisk ut kjøretøy når det blir gammelt: {ORANGE}{STRING}
STR_CONFIG_SETTING_AUTORENEW_MONTHS :{LTBLUE}Autoforny når kjøretøy er {ORANGE}{STRING}{LTBLUE}{NBSP}måneder før/etter maks alder
@@ -1024,7 +1021,7 @@ STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_OFF :Av
STR_CONFIG_SETTING_LEFT_MOUSE_BTN_SCROLLING :{LTBLUE}Venstre-klikk scrolling: {ORANGE}{STRING}
-STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES :{LTBLUE}Bruk {ORANGE}{STRING}{LTBLUE} datoformatet i navn til lagringsfil
+STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES :{LTBLUE}Bruk {ORANGE}{STRING}{LTBLUE} datoformatet i lagringsfilnavn
STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_LONG :lang (31. Des 2008)
STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_SHORT :kort (31-12-2008)
STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_ISO :ISO (2008-12-31)
@@ -1167,37 +1164,38 @@ STR_CONFIG_SETTING_QUERY_CAPT :{WHITE}Endre in
STR_TEMPERATE_LANDSCAPE :Temperert landskap
STR_SUB_ARCTIC_LANDSCAPE :subarktisk landskap
STR_SUB_TROPICAL_LANDSCAPE :subtropisk landskap
-STR_TOYLAND_LANDSCAPE :lekeland landskap
+STR_TOYLAND_LANDSCAPE :Lekeland landskap
-STR_CHEATS :{WHITE}Juks
+STR_CHEATS :{WHITE}Juksekoder
STR_CHEATS_TIP :{BLACK}Avkrysningsbokser indikerer at du har brukt denne juksekoden tidligere.
STR_CHEATS_WARNING :{BLACK}Advarsel! Vær klar over at du er i ferd med å bedra dine motstandere og at straffen for slike handlinger er evig tid i skjærsilden.
STR_CHEAT_MONEY :{LTBLUE}Øk pengebeholdningen med {CURRENCY}
STR_CHEAT_CHANGE_COMPANY :{LTBLUE}Spiller som firma: {ORANGE}{COMMA}
-STR_CHEAT_EXTRA_DYNAMITE :{LTBLUE}Magisk bulldoser (fjern industrier, ufjernbare ting): {ORANGE}{STRING}
-STR_CHEAT_CROSSINGTUNNELS :{LTBLUE}Tuneller kan krysse hverandre: {ORANGE}{STRING}
+STR_CHEAT_EXTRA_DYNAMITE :{LTBLUE}Magisk bulldoser (fjern industrier, andre uflyttbare ting): {ORANGE}{STRING}
+STR_CHEAT_CROSSINGTUNNELS :{LTBLUE}Tunneler kan krysse hverandre: {ORANGE}{STRING}
STR_CHEAT_BUILD_IN_PAUSE :{LTBLUE}Tillat bygging i pausemodus: {ORANGE}{STRING}
-STR_CHEAT_NO_JETCRASH :{LTBLUE}Jetfly vil ikke krasje (hele tiden) på små flyplasser: {ORANGE} {STRING}
-STR_CHEAT_SWITCH_CLIMATE :{LTBLUE}Bytt klima: {ORANGE} {STRING}
-STR_CHEAT_CHANGE_DATE :{LTBLUE}Bytt dato: {ORANGE} {DATE_SHORT}
+STR_CHEAT_NO_JETCRASH :{LTBLUE}Jetfly vil ikke krasje (regelmessig) på små flyplasser: {ORANGE} {STRING}
+STR_CHEAT_SWITCH_CLIMATE :{LTBLUE}Endre klima: {ORANGE} {STRING}
+STR_CHEAT_CHANGE_DATE :{LTBLUE}Endre dato: {ORANGE} {DATE_SHORT}
STR_CHEAT_SETUP_PROD :{LTBLUE}Tillat endring av produksjonsmengder: {ORANGE}{STRING}
STR_HEADING_FOR_WAYPOINT :{LTBLUE}Har kurs mot {WAYPOINT}
STR_HEADING_FOR_WAYPOINT_VEL :{LTBLUE}Har kurs mot {WAYPOINT}, {VELOCITY}
STR_GO_TO_WAYPOINT :Kjør via {WAYPOINT}
-STR_GO_NON_STOP_TO_WAYPOINT :Gå uten stopp via {WAYPOINT}
+STR_GO_NON_STOP_TO_WAYPOINT :Kjør non-stop via {WAYPOINT}
-STR_WAYPOINTNAME_CITY :{TOWN} kontrollpunkt
-STR_WAYPOINTNAME_CITY_SERIAL :{TOWN} kontrollpunkt nr. {COMMA}
+STR_WAYPOINTNAME_CITY :{TOWN} Kontrollpunkt
+STR_WAYPOINTNAME_CITY_SERIAL :{TOWN} Kontrollpunkt # {COMMA}
+STR_BUOYNAME_CITY :{TOWN} Bøye
+STR_BUOYNAME_CITY_SERIAL :{TOWN} Bøye #{COMMA}
STR_LANDINFO_WAYPOINT :Kontrollpunkt
STR_WAYPOINT :{WHITE}Kontrollpunkt
-STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Velg kontrollpunkttype
+STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Velg type kontrollpunkt
STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT}
STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT}
-STR_WAYPOINT_NAME :{WAYPOINT}
STR_EDIT_WAYPOINT_NAME :{WHITE}Endre navn på kontrollpunkt...
STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}Kan ikke endre navnet til kontrollpunktet...
@@ -1217,8 +1215,8 @@ STR_RANDOM_INDUSTRIES_TIP :{BLACK}Dekk kar
STR_CAN_T_GENERATE_INDUSTRIES :{WHITE}Kan ikke generere industrier...
STR_LANDSCAPING_TOOLBAR_TIP :{BLACK}Åpne verktøylinjen for å heve/senke land, plante trær, osv.
-STR_LANDSCAPING_TOOLBAR :{WHITE}Landskaping
-STR_LEVEL_LAND_TOOLTIP :{BLACK}Utjevn land
+STR_LANDSCAPING_TOOLBAR :{WHITE}Landskapsarbeid
+STR_LEVEL_LAND_TOOLTIP :{BLACK}Jevn ut land
STR_TREES_RANDOM_TYPE :{BLACK}Trær av tilfeldig type
@@ -1235,7 +1233,7 @@ STR_LANDINFO_LOCK :Sluse
STR_CANT_PLACE_RIVERS :{WHITE}Kan ikke plassere elver her...
STR_LANDINFO_RIVER :Elv
-STR_BUOY_IS_IN_USE :{WHITE}...bøye er i bruk!
+STR_BUOY_IS_IN_USE :{WHITE}...bøyen er i bruk!
STR_LANDINFO_COORDS :{BLACK}Koordinater: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
@@ -1250,23 +1248,23 @@ STR_STATION_DRAG_DROP :{BLACK}Bygg sta
STR_SELECT_STATION_CLASS_TIP :{BLACK}Velg en stasjonstypen å vise
STR_SELECT_STATION_TYPE_TIP :{BLACK}Velg stasjonen du vil bygge
-STR_FAST_FORWARD :{BLACK}Hurtig tid
-STR_MESSAGE_HISTORY :{WHITE}Tidligere meldinger
-STR_MESSAGE_HISTORY_TIP :{BLACK}En liste over nylige nyhetsmeldinger
+STR_FAST_FORWARD :{BLACK}Spol fremover
+STR_MESSAGE_HISTORY :{WHITE}Meldingshistorikk
+STR_MESSAGE_HISTORY_TIP :{BLACK}En liste over de siste nyhetsmeldingene
STR_MESSAGES_DISABLE_ALL :{BLACK}Deaktiver alle
STR_MESSAGES_ENABLE_ALL :{BLACK}Aktiver alle
STR_INDUSTRYDIR_CAPTION :{WHITE}Industrier
-STR_INDUSTRYDIR_ITEM :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}{NBSP}% transportert)
-STR_INDUSTRYDIR_ITEM_TWO :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}{NBSP}%/{COMMA}{NBSP}% transportert)
+STR_INDUSTRYDIR_ITEM :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% transportert)
+STR_INDUSTRYDIR_ITEM_TWO :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% transportert)
STR_INDUSTRYDIR_ITEM_NOPROD :{ORANGE}{INDUSTRY}
STR_INDUSTRYDIR_LIST_CAPTION :{BLACK}Industri navn - klikk på navn for å sentrere sikt over industri
STR_INDUSTRY_TOO_CLOSE :{WHITE}...for nært en annen industri
-STR_RAIL_REFIT_VEHICLE_TO_CARRY :{BLACK}Bygg om et lokomotiv til å ta en annen type last
+STR_RAIL_REFIT_VEHICLE_TO_CARRY :{BLACK}Bygg om lokomotivet til å frakte en annen varetype
STR_RAIL_REFIT_VEHICLE :{BLACK}Bygg om lokomotivet
-STR_RAIL_SELECT_TYPE_OF_CARGO_FOR :{BLACK}Velg hvilken last lokomotivet skal ta
+STR_RAIL_SELECT_TYPE_OF_CARGO_FOR :{BLACK}Velg hvilken vare lokomotivet skal frakte
STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED :{BLACK}Bygg om lokomotivet til å frakte den valgte varetypen
STR_RAIL_CAN_T_REFIT_VEHICLE :{WHITE}Kan ikke bygge om lokomotiv...
STR_CONFIG_GAME_PRODUCTION :{WHITE}Endre produksjon
@@ -1287,14 +1285,14 @@ STR_NETWORK_START_SERVER_TIP :{BLACK}Start en
STR_NETWORK_GAME_NAME :{BLACK}Navn
STR_NETWORK_GAME_NAME_TIP :{BLACK}Navn på spillet
STR_NETWORK_INFO_ICONS_TIP :{BLACK}Språk, tjenerversjon, etc.
-STR_NETWORK_CLICK_GAME_TO_SELECT :{BLACK}Klikk på et spill på listen for å velge det
+STR_NETWORK_CLICK_GAME_TO_SELECT :{BLACK}Klikk på et spill i listen for å velge det
STR_NETWORK_LAST_JOINED_SERVER :{BLACK}Serveren du ble med forrige gang:
STR_NETWORK_CLICK_TO_SELECT_LAST :{BLACK}Klikk for å velge serveren du spilte på forrige gang
-STR_NETWORK_FIND_SERVER :{BLACK}Finn server
+STR_NETWORK_FIND_SERVER :{BLACK}Finn tjenere
STR_NETWORK_FIND_SERVER_TIP :{BLACK}Søk på nettverket etter en server
STR_NETWORK_ADD_SERVER :{BLACK}Legg til tjener
-STR_NETWORK_ADD_SERVER_TIP :{BLACK}Legger til en tjener i listen over tjenere som alltid vil bli skjekket for aktive spill.
+STR_NETWORK_ADD_SERVER_TIP :{BLACK}Legger til en tjener som vil bli sjekket for aktive spill.
STR_NETWORK_ENTER_IP :{BLACK}Skriv inn IP-adressen til serveren
STR_NETWORK_GENERAL_ONLINE :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
@@ -1312,32 +1310,32 @@ STR_NETWORK_YEARS_CAPTION :{BLACK}År
STR_NETWORK_YEARS_CAPTION_TIP :{BLACK}Nummer av år {}spillet er pågående
STR_NETWORK_GAME_INFO :{SILVER}SPILLOVERSIKT
-STR_NETWORK_CLIENTS :{SILVER}Klienter: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
-STR_NETWORK_LANGUAGE :{SILVER}Språk: {WHITE}{STRING}
-STR_NETWORK_TILESET :{SILVER}Brikkesett: {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE :{SILVER}Kartstørrelse: {WHITE}{COMMA}x{COMMA}
-STR_NETWORK_SERVER_VERSION :{SILVER}Tjenerversjon: {WHITE}{STRING}
-STR_NETWORK_SERVER_ADDRESS :{SILVER}Server addresse: {WHITE}{STRING}
-STR_NETWORK_START_DATE :{SILVER}Startet: {WHITE}{DATE_SHORT}
-STR_NETWORK_CURRENT_DATE :{SILVER}Nettverksdato: {WHITE}{DATE_SHORT}
+STR_NETWORK_CLIENTS :{SILVER}Klienter: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
+STR_NETWORK_LANGUAGE :{SILVER}Språk: {WHITE}{STRING}
+STR_NETWORK_TILESET :{SILVER}Brikkesett: {WHITE}{STRING}
+STR_NETWORK_MAP_SIZE :{SILVER}Kartstørrelse: {WHITE}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_VERSION :{SILVER}Tjenerversjon: {WHITE}{STRING}
+STR_NETWORK_SERVER_ADDRESS :{SILVER}Tjeneradresse: {WHITE}{STRING}
+STR_NETWORK_START_DATE :{SILVER}Startdato: {WHITE}{DATE_SHORT}
+STR_NETWORK_CURRENT_DATE :{SILVER}Nettverksdato: {WHITE}{DATE_SHORT}
STR_NETWORK_PASSWORD :{SILVER}Passordbeskyttet!
-STR_NETWORK_SERVER_OFFLINE :{SILVER}TJENEREN ER KOBLET AV
+STR_NETWORK_SERVER_OFFLINE :{SILVER}TJENEREN ER FRAKOBLET
STR_NETWORK_SERVER_FULL :{SILVER}TJENEREN ER FULL
-STR_NETWORK_VERSION_MISMATCH :{SILVER}DU HAR EN ANNEN VERSJON EN TJENEREN
+STR_NETWORK_VERSION_MISMATCH :{SILVER}DU HAR EN ANNEN VERSJON ENN TJENEREN
STR_NETWORK_GRF_MISMATCH :{SILVER}NEWGRF MATCHER IKKE
-STR_NETWORK_JOIN_GAME :{BLACK}Bli med på spill
+STR_NETWORK_JOIN_GAME :{BLACK}Bli med i spill
STR_NETWORK_START_GAME_WINDOW :{WHITE}Start et nytt flerspillerspill
STR_NETWORK_NEW_GAME_NAME :{BLACK}Spillnavn:
-STR_NETWORK_NEW_GAME_NAME_TIP :{BLACK}Spillnavnet vil bli vist til andre spillere i flerspillermenyen
+STR_NETWORK_NEW_GAME_NAME_TIP :{BLACK}Spillnavnet er det som vises til andre spillere i listen over spill
STR_NETWORK_NEW_GAME_NAME_OSKTITLE :{BLACK}Skriv et navn for nettverks spillet
STR_NETWORK_SET_PASSWORD :{BLACK}Sett passord
STR_NETWORK_PASSWORD_TIP :{BLACK}Beskytt ditt spill med et passord hvis du ikke vil at hvem som helst skal bli med på det
STR_NETWORK_SELECT_MAP :{BLACK}Velg et kart:
-STR_NETWORK_SELECT_MAP_TIP :{BLACK}Hvilket kart vil du spille?
+STR_NETWORK_SELECT_MAP_TIP :{BLACK}Hvilket kart vil du spille på?
STR_NETWORK_LAN_INTERNET_COMBO :{BLACK}{SKIP}{STRING}
STR_NETWORK_LAN :LAN
STR_NETWORK_INTERNET :Internett
@@ -1345,23 +1343,23 @@ STR_NETWORK_LAN_INTERNET :LAN / Internett
STR_NETWORK_INTERNET_ADVERTISE :Internett (annonser)
STR_NETWORK_CLIENTS_SELECT :{BLACK}{SKIP}{SKIP}{NUM} klient{P "" er}
STR_NETWORK_NUMBER_OF_CLIENTS :{BLACK}Maksimalt antall tillatte klienter
-STR_NETWORK_NUMBER_OF_CLIENTS_TIP :{BLACK}Velg maksimalt antall klienter. Alle plassene trenger ikke bli tatt.
+STR_NETWORK_NUMBER_OF_CLIENTS_TIP :{BLACK}Velg maksimalt antall klienter. Ikke alle plassene trenger å bli tatt
STR_NETWORK_COMPANIES_SELECT :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} firma{P "" er}
STR_NETWORK_NUMBER_OF_COMPANIES :{BLACK}Maks. antall firmaer:
STR_NETWORK_NUMBER_OF_COMPANIES_TIP :{BLACK}Begrens tjeneren til et bestemt antall firmaer
STR_NETWORK_SPECTATORS_SELECT :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} tilskuer{P "" e}
STR_NETWORK_NUMBER_OF_SPECTATORS :{BLACK}Maks antall tilskuere
STR_NETWORK_NUMBER_OF_SPECTATORS_TIP :{BLACK}Begrens tjeneren til et bestemt antall tilskuere
-STR_NETWORK_LANGUAGE_SPOKEN :{BLACK}Språk snakket på tjeneren:
+STR_NETWORK_LANGUAGE_SPOKEN :{BLACK}Språk de snakker på tjeneren:
STR_NETWORK_LANGUAGE_TIP :{BLACK}Andre spillere skal kunne vite hvilket språk man snakker på denne tjeneren.
STR_NETWORK_LANGUAGE_COMBO :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
STR_NETWORK_START_GAME :{BLACK}Start spill
-STR_NETWORK_START_GAME_TIP :{BLACK}Start et nytt nettverksspill fra en tilfeldig bane, eller scenario
+STR_NETWORK_START_GAME_TIP :{BLACK}Start et nytt nettverksspill på et tilfeldig kart, eller scenario
STR_NETWORK_LOAD_GAME :{BLACK}Last spill
-STR_NETWORK_LOAD_GAME_TIP :{BLACK}Fortsette et tidligere lagret flerspillere spill (vær sikker på å koble til som den korrekte spilleren)
+STR_NETWORK_LOAD_GAME_TIP :{BLACK}Fortsett et tidligere lagret flerspiller spill (pass på å koble til som den korrekte spilleren)
############ Leave those lines in this order!!
-STR_NETWORK_LANG_ANY :Hva som helst
+STR_NETWORK_LANG_ANY :Hvilket som helst
STR_NETWORK_LANG_ENGLISH :Engelsk
STR_NETWORK_LANG_GERMAN :Tysk
STR_NETWORK_LANG_FRENCH :Fransk
@@ -1399,36 +1397,36 @@ STR_NETWORK_LANG_GREEK :Gresk
STR_NETWORK_LANG_LATVIAN :Latvisk
############ End of leave-in-this-order
-STR_NETWORK_GAME_LOBBY :{WHITE}Flerspillere spill lobby
+STR_NETWORK_GAME_LOBBY :{WHITE}Flerspiller lobby
-STR_NETWORK_PREPARE_TO_JOIN :{BLACK}Prøver å koble til: {ORANGE}{STRING}
+STR_NETWORK_PREPARE_TO_JOIN :{BLACK}Prøver å koble til: {ORANGE}{STRING}
STR_NETWORK_COMPANY_LIST_TIP :{BLACK}En liste over firma i spillet. Du kan enten bli med i et eller starte et nytt.
STR_NETWORK_NEW_COMPANY :{BLACK}Nytt firma
STR_NETWORK_NEW_COMPANY_TIP :{BLACK}Start et nytt firma
STR_NETWORK_SPECTATE_GAME :{BLACK}Se på spill
STR_NETWORK_SPECTATE_GAME_TIP :{BLACK}Vær tilskuer til spillet
STR_NETWORK_JOIN_COMPANY :{BLACK}Bli med i firmaet
-STR_NETWORK_JOIN_COMPANY_TIP :{BLACK}Hjelp å styre dette firmaet
+STR_NETWORK_JOIN_COMPANY_TIP :{BLACK}Hjelp til med å styre dette firmaet
STR_NETWORK_REFRESH :{BLACK}Oppdater tjener
STR_NETWORK_REFRESH_TIP :{BLACK}Oppdater tjenerinfo
STR_NETWORK_COMPANY_INFO :{SILVER}FIRMAOVERSIKT
-STR_NETWORK_COMPANY_NAME :{SILVER}Firmanavn: {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR :{SILVER}Innviet: {WHITE}{NUM}
-STR_NETWORK_VALUE :{SILVER}Firmaverdi: {WHITE}{CURRENCY}
-STR_NETWORK_CURRENT_BALANCE :{SILVER}Balanse nå: {WHITE}{CURRENCY}
-STR_NETWORK_LAST_YEARS_INCOME :{SILVER}Inntekt i fjor: {WHITE}{CURRENCY}
-STR_NETWORK_PERFORMANCE :{SILVER}Nettverksytelse: {WHITE}{NUM}
+STR_NETWORK_COMPANY_NAME :{SILVER}Firmanavn: {WHITE}{STRING}
+STR_NETWORK_INAUGURATION_YEAR :{SILVER}Innviet: {WHITE}{NUM}
+STR_NETWORK_VALUE :{SILVER}Firmaverdi: {WHITE}{CURRENCY}
+STR_NETWORK_CURRENT_BALANCE :{SILVER}Balanse nå: {WHITE}{CURRENCY}
+STR_NETWORK_LAST_YEARS_INCOME :{SILVER}Inntekt i fjor: {WHITE}{CURRENCY}
+STR_NETWORK_PERFORMANCE :{SILVER}Nettverksytelse: {WHITE}{NUM}
-STR_NETWORK_VEHICLES :{SILVER}Kjøretøy: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_STATIONS :{SILVER}Stasjoner: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_PLAYERS :{SILVER}Spillere: {WHITE}{STRING}
+STR_NETWORK_VEHICLES :{SILVER}Kjøretøy: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_STATIONS :{SILVER}Stasjoner: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_PLAYERS :{SILVER}Spillere: {WHITE}{STRING}
-STR_NETWORK_CONNECTING :{WHITE}Kobler på...
+STR_NETWORK_CONNECTING :{WHITE}Kobler til...
############ Leave those lines in this order!!
-STR_NETWORK_CONNECTING_1 :{BLACK}(1/6) Kobler på..
+STR_NETWORK_CONNECTING_1 :{BLACK}(1/6) Kobler til..
STR_NETWORK_CONNECTING_2 :{BLACK}(2/6) Autoriserer..
STR_NETWORK_CONNECTING_3 :{BLACK}(3/6) Venter..
STR_NETWORK_CONNECTING_4 :{BLACK}(4/6) Laster ned kart..
@@ -1450,38 +1448,38 @@ STR_NETWORK_CLIENT_LIST :{WHITE}Liste ov
STR_NETWORK_COMPANY_LIST_SPECTATE :{WHITE}Vær tilskuer
STR_NETWORK_COMPANY_LIST_NEW_COMPANY :{WHITE}Nytt firma
-STR_NETWORK_ERR_NOTAVAILABLE :{WHITE} Ingen nettverksadapter funnet eller kompilert uten ENABLE_NETWORK
-STR_NETWORK_ERR_NOSERVER :{WHITE} Kunne ikke finne noen nettverksspill
-STR_NETWORK_ERR_NOCONNECTION :{WHITE} Tjeneren svarte ikke på forespørselen
-STR_NETWORK_ERR_NEWGRF_MISMATCH :{WHITE} Kunne ikke koble til på grunn av en NewGRF som ikke stemmer
-STR_NETWORK_ERR_DESYNC :{WHITE} Nettverksspill synkronisering feilet.
-STR_NETWORK_ERR_LOSTCONNECTION :{WHITE} Nettverksspill tilkobling mistet
-STR_NETWORK_ERR_SAVEGAMEERROR :{WHITE} Kunne ikke laste server-lagret spill
-STR_NETWORK_ERR_SERVER_START :{WHITE} Klarte ikke å starte tjeneren.
-STR_NETWORK_ERR_CLIENT_START :{WHITE} Klarte ikke å opprette forbindelse.
-STR_NETWORK_ERR_TIMEOUT :{WHITE} Tilkobling nr. {NUM} ble tidsavbrutt.
-STR_NETWORK_ERR_SERVER_ERROR :{WHITE} Det skjedde en protokoll-feil, så forbindelsen er brutt
-STR_NETWORK_ERR_WRONG_REVISION :{WHITE} Klientversjonen er ikke den samme som tjenerversjonen.
-STR_NETWORK_ERR_WRONG_PASSWORD :{WHITE} Feil passord.
-STR_NETWORK_ERR_SERVER_FULL :{WHITE} Tjeneren er full
-STR_NETWORK_ERR_SERVER_BANNED :{WHITE} Du er bannlyst fra denne tjeneren
-STR_NETWORK_ERR_KICKED :{WHITE} Du ble sparket ut av tjeneren
-STR_NETWORK_ERR_CHEATER :{WHITE} Juksing er forbudt på denne serveren
+STR_NETWORK_ERR_NOTAVAILABLE :{WHITE}Ingen nettverksadaptere funnet eller kompilert uten ENABLE_NETWORK
+STR_NETWORK_ERR_NOSERVER :{WHITE}Kunne ikke finne noen nettverksspill
+STR_NETWORK_ERR_NOCONNECTION :{WHITE}Tjeneren svarte ikke på forespørselen
+STR_NETWORK_ERR_NEWGRF_MISMATCH :{WHITE}Kunne ikke koble til på grunn av ulike versjoner på en NewGRF
+STR_NETWORK_ERR_DESYNC :{WHITE}Synkronisering av nettverksspill feilet.
+STR_NETWORK_ERR_LOSTCONNECTION :{WHITE}Mistet tilkobling til nettverksspill
+STR_NETWORK_ERR_SAVEGAMEERROR :{WHITE}Kunne ikke laste lagret spill
+STR_NETWORK_ERR_SERVER_START :{WHITE}Kunne ikke starte tjeneren
+STR_NETWORK_ERR_CLIENT_START :{WHITE}Kunne ikke opprette forbindelse
+STR_NETWORK_ERR_TIMEOUT :{WHITE}Tilkobling #{NUM} ble tidsavbrutt
+STR_NETWORK_ERR_SERVER_ERROR :{WHITE}Forbindelsen ble brutt på grunn av en protokollfeil
+STR_NETWORK_ERR_WRONG_REVISION :{WHITE}Klientversjonen er ikke den samme som tjenerversjonen
+STR_NETWORK_ERR_WRONG_PASSWORD :{WHITE}Feil passord
+STR_NETWORK_ERR_SERVER_FULL :{WHITE}Tjeneren er full
+STR_NETWORK_ERR_SERVER_BANNED :{WHITE}Du er bannlyst fra denne tjeneren
+STR_NETWORK_ERR_KICKED :{WHITE}Du ble kastet ut av spillet
+STR_NETWORK_ERR_CHEATER :{WHITE}Juksing er ikke tillatt på denne tjeneren
############ Leave those lines in this order!!
STR_NETWORK_ERR_CLIENT_GENERAL :generell feil
STR_NETWORK_ERR_CLIENT_DESYNC :synkroniseringsfeil
-STR_NETWORK_ERR_CLIENT_SAVEGAME :klarte ikke å åpne kartet
+STR_NETWORK_ERR_CLIENT_SAVEGAME :kunne ikke åpne kartet
STR_NETWORK_ERR_CLIENT_CONNECTION_LOST :forbindelsen ble brutt
STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR :protokollfeil
STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH :NewGRF stemmer ikke
STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED :ikke autorisert
STR_NETWORK_ERR_CLIENT_NOT_EXPECTED :mottok merkelig pakke
STR_NETWORK_ERR_CLIENT_WRONG_REVISION :feil versjon
-STR_NETWORK_ERR_CLIENT_NAME_IN_USE :navnet er brukt av noen andre
-STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD :feil passord til spillet
+STR_NETWORK_ERR_CLIENT_NAME_IN_USE :navnet er allerede i bruk
+STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD :feil passord
STR_NETWORK_ERR_CLIENT_COMPANY_MISMATCH :feil firma-id i DoCommand
-STR_NETWORK_ERR_CLIENT_KICKED :sparket ut av tjeneren
+STR_NETWORK_ERR_CLIENT_KICKED :kastet ut av tjeneren
STR_NETWORK_ERR_CLIENT_CHEATER :prøvde å jukse
STR_NETWORK_ERR_CLIENT_SERVER_FULL :serveren er full
############ End of leave-in-this-order
@@ -1512,9 +1510,9 @@ STR_NETWORK_CHAT_ALL_CAPTION :[Alle] :
STR_NETWORK_CHAT_ALL :[Alle] {STRING}: {WHITE}{STRING}
STR_NETWORK_CHAT_OSKTITLE :{BLACK}Skriv inn text for netverk samtale
STR_NETWORK_SERVER_SHUTDOWN :{WHITE} Tjeneren avsluttet spillet
-STR_NETWORK_SERVER_REBOOT :{WHITE} Tjeneren starter på nytt...{}Vennligst vent
+STR_NETWORK_SERVER_REBOOT :{WHITE} Tjeneren starter på nytt...{}Vennligst vent...
-STR_NETWORK_SERVER :Server
+STR_NETWORK_SERVER :Tjener
STR_NETWORK_CLIENT :Klient
STR_NETWORK_SPECTATORS :Tilskuere
@@ -1532,12 +1530,12 @@ STR_NETWORK_SEND :{BLACK}Send
##### PNG-MAP-Loader
-STR_PNGMAP_ERROR :{WHITE}Kan ikke laste landskapet fra PNG...
+STR_PNGMAP_ERROR :{WHITE}Kunne ikke laste landskapet fra PNG...
STR_PNGMAP_ERR_FILE_NOT_FOUND :{WHITE}...fant ingen fil.
STR_PNGMAP_ERR_IMAGE_TYPE :{WHITE}...kunne ikke konvertere bildetypen. Et 8- eller 24-bits bilde trengs.
STR_PNGMAP_ERR_MISC :{WHITE}...noe gikk akkurat galt. Beklager. (Sannsynligvis en ødelagt fil.)
-STR_BMPMAP_ERROR :{WHITE}Kan ikke laste landskap fra BMP...
+STR_BMPMAP_ERROR :{WHITE}Kunne ikke laste landskapet fra BMP...
STR_BMPMAP_ERR_IMAGE_TYPE :{WHITE}...kan ikke konvertere bildetype.
##id 0x0800
@@ -1599,27 +1597,27 @@ STR_BUILD_DEPOT_TRAIN_ORIENTATION :{BLACK}Velg tog
STR_RAILROAD_TRACK :Jernbanespor
STR_RAILROAD_TRAIN_DEPOT :Togstall
STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}...felt eies av et annet firma
-STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS :Jernbanespor med normale signaler
-STR_RAILROAD_TRACK_WITH_PRESIGNALS :Jernbanespor med for-signaler
-STR_RAILROAD_TRACK_WITH_EXITSIGNALS :Jernbanespor med forlat-signaler
+STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS :Jernbanespor med blokk-signaler
+STR_RAILROAD_TRACK_WITH_PRESIGNALS :Jernbanespor med inngangs-signaler
+STR_RAILROAD_TRACK_WITH_EXITSIGNALS :Jernbanespor med utgangs-signaler
STR_RAILROAD_TRACK_WITH_COMBOSIGNALS :Jernbanespor med kombosignaler
STR_RAILROAD_TRACK_WITH_PBSSIGNALS :Jernbane skinner med avanserte signaler
STR_RAILROAD_TRACK_WITH_NOENTRYSIGNALS :Jernbane skinner med enveis avanserte signaler
-STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS :Togbane med normale og pre-signaler
-STR_RAILROAD_TRACK_WITH_NORMAL_EXITSIGNALS :Togbane med normale og utgangs-signaler
-STR_RAILROAD_TRACK_WITH_NORMAL_COMBOSIGNALS :Jernbanespor med normale og kombosignaler
-STR_RAILROAD_TRACK_WITH_NORMAL_PBSSIGNALS :Jernbane skinner med normal og avanserte signaler
-STR_RAILROAD_TRACK_WITH_NORMAL_NOENTRYSIGNALS :Jernbane skinner med normal og enveis avanserte signaler
+STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS :Jernbane med normale og inngangs-signaler
+STR_RAILROAD_TRACK_WITH_NORMAL_EXITSIGNALS :Jernbane med normale og utgangs-signaler
+STR_RAILROAD_TRACK_WITH_NORMAL_COMBOSIGNALS :Jernbanespor med normale og kombo-signaler
+STR_RAILROAD_TRACK_WITH_NORMAL_PBSSIGNALS :Jernbanespor med normale og avanserte signaler
+STR_RAILROAD_TRACK_WITH_NORMAL_NOENTRYSIGNALS :Jernbanespor med normal og enveis avanserte signaler
STR_RAILROAD_TRACK_WITH_PRE_EXITSIGNALS :Togbane med pre- og utgangs-signaler
STR_RAILROAD_TRACK_WITH_PRE_COMBOSIGNALS :Jernbanespor med pre- og kombosignaler
-STR_RAILROAD_TRACK_WITH_PRE_PBSSIGNALS :Jernbane skinner med før- og avanserte signaler
-STR_RAILROAD_TRACK_WITH_PRE_NOENTRYSIGNALS :Jernbane skinner med før- og enveis avanserte signaler
+STR_RAILROAD_TRACK_WITH_PRE_PBSSIGNALS :Jernbanespor med inngangs- og avanserte signaler
+STR_RAILROAD_TRACK_WITH_PRE_NOENTRYSIGNALS :Jernbanespor med inngangs- og enveis avanserte signaler
STR_RAILROAD_TRACK_WITH_EXIT_COMBOSIGNALS :Jernbanespor med utgangs- og kombosignaler
-STR_RAILROAD_TRACK_WITH_EXIT_PBSSIGNALS :Jernbane skinner med slutt- og avanserte signaler
-STR_RAILROAD_TRACK_WITH_EXIT_NOENTRYSIGNALS :Jernbane skinner med slutt- og enveis avanserte signaler
-STR_RAILROAD_TRACK_WITH_COMBO_PBSSIGNALS :Jernbane skinner med kombo- og avansert signaler
-STR_RAILROAD_TRACK_WITH_COMBO_NOENTRYSIGNALS :Jernbane skinner med kombo- og enveis avanserte signaler
-STR_RAILROAD_TRACK_WITH_PBS_NOENTRYSIGNALS :Jernbane skinner med avanserte og enveis avanserte signaler
+STR_RAILROAD_TRACK_WITH_EXIT_PBSSIGNALS :Jernbanespor med utgangs- og avanserte signaler
+STR_RAILROAD_TRACK_WITH_EXIT_NOENTRYSIGNALS :Jernbanespor med utgangs- og enveis avanserte signaler
+STR_RAILROAD_TRACK_WITH_COMBO_PBSSIGNALS :Jernbanespor med kombo- og avanserte signaler
+STR_RAILROAD_TRACK_WITH_COMBO_NOENTRYSIGNALS :Jernbanespor med kombo- og enveis avanserte signaler
+STR_RAILROAD_TRACK_WITH_PBS_NOENTRYSIGNALS :Jernbanespor med avanserte og enveis avanserte signaler
STR_MUST_REMOVE_RAILWAY_STATION_FIRST :{WHITE}Må fjerne togbanestasjon først
STR_CREATE_SPLITTED_STATION :{YELLOW}Bygg separat stasjon
STR_SELECT_STATION_TO_JOIN :{BLACK}Slå sammen stasjonene
@@ -1761,12 +1759,12 @@ STR_LOCAL_AUTHORITY_ACTION_STATUE_OF_COMPANY :Bygg statue av
STR_LOCAL_AUTHORITY_ACTION_NEW_BUILDINGS :Finansier nye bygninger
STR_LOCAL_AUTHORITY_ACTION_EXCLUSIVE_TRANSPORT :Kjøp eksklusive transportrettigheter
STR_LOCAL_AUTHORITY_ACTION_BRIBE :Bestikk bystyret
-STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_SMALL_ADVERTISING :{WHITE}{STRING}{}{YELLOW} Start en liten lokal reklamekampanje for å tiltrekke deg flere passasjerer og mer varer til dine transporttjenester.{} Koster: {CURRENCY}
-STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_MEDIUM_ADVERTISING :{WHITE}{STRING}{}{YELLOW} Start en middels stor lokal reklamekampanje for å tiltrekke deg flere passasjerer og mer varer til dine transporttjenester.{} Koster: {CURRENCY}
-STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_LARGE_ADVERTISING :{WHITE}{STRING}{}{YELLOW} Start en stor lokal reklamekampanje for å tiltrekke deg flere passasjerer og mer varer til dine transporttjenester.{} Koster: {CURRENCY}
-STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_ROAD_RECONSTRUCTION :{WHITE}{STRING}{}{YELLOW} Finansier ombygging av det lokale veinettet. Fører til veiproblemer i seks måneder.{} Koster: {CURRENCY}
-STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_STATUE_OF_COMPANY :{WHITE}{STRING}{}{YELLOW} Bygg en statue for å ære firmaet.{} Koster: {CURRENCY}
-STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_NEW_BUILDINGS :{WHITE}{STRING}{}{YELLOW} Finasier byggingen av nye forretningsbygninger i byen .{} Koster: {CURRENCY}
+STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_SMALL_ADVERTISING :{WHITE}{STRING}{}{YELLOW}Start en liten lokal reklamekampanje for å tiltrekke deg flere passasjerer og mer varer til dine transporttjenester.{}Kostnad: {CURRENCY}
+STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_MEDIUM_ADVERTISING :{WHITE}{STRING}{}{YELLOW}Start en middels stor lokal reklamekampanje for å tiltrekke deg flere passasjerer og mer varer til dine transporttjenester.{}Kostnad: {CURRENCY}
+STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_LARGE_ADVERTISING :{WHITE}{STRING}{}{YELLOW}Start en stor lokal reklamekampanje for å tiltrekke deg flere passasjerer og mer varer til dine transporttjenester.{}Kostnad: {CURRENCY}
+STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_ROAD_RECONSTRUCTION :{WHITE}{STRING}{}{YELLOW}Finansier ombygging av det lokale veinettet. Fører til betydelige forstyrrelser i opptil seks måneder.{}Kostnad: {CURRENCY}
+STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_STATUE_OF_COMPANY :{WHITE}{STRING}{}{YELLOW}Bygg en statue for å ære firmaet.{}Kostnad: {CURRENCY}
+STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_NEW_BUILDINGS :{WHITE}{STRING}{}{YELLOW}Finansier byggingen av nye kommersielle bygninger i byen .{}Kostnad: {CURRENCY}
STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_EXCLUSIVE_TRANSPORT :{WHITE}{STRING}{}{YELLOW} Kjøp et års ekslusive transportrettigheter i byen. Bystyret vil kun tillate passasjerer og varer å bruke dine transporttjenester.{} Koster: {CURRENCY}
STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE :{WHITE}{STRING}{}{YELLOW} Bestikk bystyret til å forbedre vurderingen av firmaet, men du riskerer å bli bøtlagt hvis du blir oppdaget.{} Koster: {CURRENCY}
STR_NEWS_ROAD_REBUILDING :{BIGFONT}{BLACK}Traffkkaos i {TOWN}!{}{}Ombygging av veien, finasiert av {STRING}, fører med seg seks måneders veiproblemer.
@@ -1778,11 +1776,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 trær
@@ -1837,6 +1830,12 @@ STR_CARGO_RATING_EXCELLENT :Utmerket
STR_CARGO_RATING_OUTSTANDING :Fremragende
############ range for rating ends
+### station view strings
+STR_SCHEDULED_TRAINS_TIP :{BLACK}Vis alle tog som har denne stasjonen på deres timeplan
+STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Vis alle kjøretøy som har denne stasjonen på deres timeplan
+STR_SCHEDULED_AIRCRAFT_TIP :{BLACK}Vis alle fly som har denne stasjonen på deres timeplan
+STR_SCHEDULED_SHIPS_TIP :{BLACK}Vis alle skip som har denne stasjonen på deres timeplan
+
STR_STATION_VIEW_CARGO_RATING :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}{NBSP}%)
STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}{STATION} godtar ikke lenger {STRING}
STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION} godtar ikke lenger {STRING} eller {STRING}
@@ -2080,6 +2079,9 @@ STR_SV_STNAME_AIRPORT :{STRING} flypla
STR_SV_STNAME_OILFIELD :{STRING} oljefelt
STR_SV_STNAME_MINES :{STRING} gruvestasjon
STR_SV_STNAME_DOCKS :{STRING} havn
+STR_SV_STNAME_BUOY :{STRING}
+STR_SV_STNAME_WAYPOINT :{STRING}
+##id 0x6020
STR_SV_STNAME_ANNEXE :{STRING} anneks
STR_SV_STNAME_SIDINGS :{STRING}veien
STR_SV_STNAME_BRANCH :{STRING} gren
@@ -2162,7 +2164,6 @@ STR_CITY_APPROVAL_HOSTILE :Fientlig
##id 0x7000
STR_COMPANY_VIEW_CAPTION :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
-STR_FORMAT_COMPANY_NUM :(Firma {COMMA})
STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Nytt ansikt
STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON :{BLACK}Firmafarge
STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE :{GOLD}Firmafarge:
@@ -2195,7 +2196,6 @@ STR_FINANCES_TOTAL_CAPTION :{WHITE}Totalt:
STR_COMPANY_NAME_COMPANY_NUM :{COMPANY} {COMPANYNUM}
STR_GRAPH_INCOME_CAPTION :{WHITE}Inntektsgraf
STR_CURRCOMPACT :{CURRCOMPACT}
-STR_JUST_COMMA :{COMMA}
STR_GRAPH_OPERATING_PROFIT_CAPTION :{WHITE}Overskuddsgraf
STR_FINANCES_BANK_BALANCE_TITLE :{WHITE}Saldo
STR_FINANCES_LOAN_TITLE :{WHITE}Lån
@@ -2707,7 +2707,6 @@ STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON :{BLACK}Nye tog/
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 endres når det 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
@@ -2765,7 +2764,6 @@ STR_ERROR_UNABLE_TO_FIND_ROUTE_TO :{WHITE}Kan ikke
STR_ERROR_CAN_T_STOP_START_TRAIN :{WHITE}Kan ikke stoppe/starte tog...
STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS :{BLACK}Vedlikeholdsintervall: {LTBLUE}{COMMA}{NBSP}dager{BLACK} Forrige vedlikehold: {LTBLUE}{DATE_LONG}
STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT :{BLACK}Vedlikeholdsintervall: {LTBLUE}{COMMA}{NBSP}%{BLACK} Forrige vedlikehold: {LTBLUE}{DATE_LONG}
-STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP :{BLACK}Tog - trykk på tog for mer informasjon
STR_DEPOT_TRAIN_LIST_TOOLTIP :{BLACK}Tog - trykk på tog for mer info. Dra vogn for å legge til/fjerne fra tog
STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP :{BLACK}Bygg nytt tog (vogn)
STR_DEPOT_TRAIN_SELL_TOOLTIP :{BLACK}Dra tog (vogn) her for å selge
@@ -2803,12 +2801,12 @@ STR_VEHICLE_INFO_MAX_SPEED :{BLACK}Maksfart
STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED :{BLACK}Vekt: {LTBLUE}{WEIGHT_S} {BLACK}Kraft: {LTBLUE}{POWER}{BLACK} Maksfart: {LTBLUE}{VELOCITY}
STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED_MAX_TE :{BLACK}Vekt: {LTBLUE}{WEIGHT_S} {BLACK}Kraft: {LTBLUE}{POWER}{BLACK} Maksfart: {LTBLUE}{VELOCITY} {BLACK}Max. T.E.: {LTBLUE}{FORCE}
STR_VEHICLE_INFO_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Profitt i år: {LTBLUE}{CURRENCY} (sist år: {CURRENCY})
-STR_VEHICLE_INFO_RELIABILITY_BREAKDOWNS :{BLACK}Pålitelighet: {LTBLUE}{COMMA}% {BLACK}Motorstopp siden siste service: {LTBLUE}{COMMA}
+STR_VEHICLE_INFO_RELIABILITY_BREAKDOWNS :{BLACK}Pålitelighet: {LTBLUE}{COMMA}% {BLACK}Havarier siden siste service: {LTBLUE}{COMMA}
STR_VEHICLE_INFO_BUILT_VALUE :{LTBLUE}{ENGINE} {BLACK}Bygget: {LTBLUE}{NUM}{BLACK} Verdi: {LTBLUE}{CURRENCY}
STR_VEHICLE_INFO_CAPACITY :{BLACK}Kapasitet: {LTBLUE}{CARGO}{SKIP}{SKIP}{STRING}
STR_VEHICLE_INFO_CAPACITY_MULT :{BLACK}Kapasitet: {LTBLUE}{CARGO}{SKIP}{SKIP}{STRING} (x{NUM})
STR_VEHICLE_INFO_CAPACITY_CAPACITY :{BLACK}Kapasitet: {LTBLUE}{CARGO}, {CARGO}{STRING}
-STR_VEHICLE_STATUS_BROKEN_DOWN :{RED}Motorstopp
+STR_VEHICLE_STATUS_BROKEN_DOWN :{RED}Havarert
STR_VEHICLE_STATUS_STOPPED :{RED}Stoppet
STR_ERROR_CAN_T_MAKE_TRAIN_PASS_SIGNAL :{WHITE}Kan ikke tvinge tog til å kjøre på rødt lys ved fare...
STR_VEHICLE_STATUS_CRASHED :{RED}Krasjet
@@ -2854,7 +2852,6 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP :{BLACK}Fyll ut
##id 0x9000
STR_ERROR_ROAD_VEHICLE_IN_THE_WAY :{WHITE}Kjøretøy i veien
-STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} kjøretøy
STR_DEPOT_ROAD_CAPTION :{WHITE}{TOWN} Garasje
STR_DEPOT_ROAD_NEW_VEHICLES_BUTTON :{BLACK}Nye kjøretøy
STR_BUILD_VEHICLE_ROAD_CAPTION :{WHITE}Nye kjøretøy
@@ -2870,7 +2867,6 @@ STR_HEADING_FOR_ROAD_DEPOT_SERVICE :{LTBLUE}Vedlike
STR_HEADING_FOR_ROAD_DEPOT_SERVICE_VEL :{LTBLUE}Vedlikehold ved {TOWN} garasje, {VELOCITY}
STR_ERROR_CAN_T_SEND_VEHICLE_TO_DEPOT :{WHITE}Kan ikke sende kjøretøy til garasje...
STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT :{WHITE}Kan ikke finne en garasje i nærheten
-STR_VEHICLE_LIST_ROAD_TOOLTIP :{BLACK}Kjøretøy - trykk på kjøretøy for informasjon
STR_VEHICLE_VIEW_ROAD_STATE_START_STOP_TOOLTIP :{BLACK}Gjeldende kjøretøystatus - trykk her for å stoppe/starte kjøretøy
STR_VEHICLE_VIEW_ROAD_ORDERS_TOOLTIP :{BLACK}Vis kjøretøyets ordreliste
STR_VEHICLE_VIEW_ROAD_LOCATION_TOOLTIP :{BLACK}Vis kjøretøyets gjeldende posisjon
@@ -2917,7 +2913,6 @@ STR_WATERWAYS_TOOLBAR_CAPTION_SE :{WHITE}Kanal
STR_ERROR_CAN_T_BUILD_DOCK_HERE :{WHITE}Kan ikke bygge havn 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
@@ -2940,7 +2935,6 @@ STR_DEPOT_SHIP_LIST_TOOLTIP :{BLACK}Skip - t
STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP :{BLACK}Bygg nytt skip
STR_DEPOT_SHIP_SELL_TOOLTIP :{BLACK}Dra skip hit for å selge det
STR_DEPOT_SHIP_LOCATION_TOOLTIP :{BLACK}Vis hvor depotet ligger
-STR_VEHICLE_LIST_SHIP_TOOLTIP :{BLACK}Skip - trykk på skip for mer informasjon
STR_BUILD_VEHICLE_SHIP_LIST_TOOLTIP :{BLACK}Skipsliste - trykk på skip for mer informasjon
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP :{BLACK}Bygg det valgte skipet
STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Gjeldende skipsstatus - trykk her for å stoppe/starte skip
@@ -2982,7 +2976,6 @@ STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}Dette vi
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 ikke bygge fly...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} fly
STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR :{WHITE}Kan ikke sende fly til hangar...
STR_HEADING_FOR_HANGAR :{ORANGE}Er på vei til {STATION} hangar
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Er på vei til {STATION} hangar, {VELOCITY}
@@ -2996,7 +2989,6 @@ STR_ERROR_AIRCRAFT_MUST_BE_STOPPED :{WHITE}Må stå
STR_ERROR_CAN_T_SELL_AIRCRAFT :{WHITE}Kan ikke selge 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 mer informasjon
STR_DEPOT_AIRCRAFT_LIST_TOOLTIP :{BLACK}Fly - trykk på fly for mer informasjon
STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP :{BLACK}Bygg nytt fly
STR_DEPOT_AIRCRAFT_SELL_TOOLTIP :{BLACK}Dra fly hit for å selge
@@ -3178,11 +3170,16 @@ 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 mer informasjon
+STR_VEHICLE_LIST_ROAD_TOOLTIP :{BLACK}Kjøretøy - trykk på kjøretøy for informasjon
+STR_VEHICLE_LIST_SHIP_TOOLTIP :{BLACK}Skip - trykk på skip for mer informasjon
+STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP :{BLACK}Fly - trykk på fly for mer informasjon
-STR_SCHEDULED_TRAINS_TIP :{BLACK}Vis alle tog som har denne stasjonen på deres timeplan
-STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Vis alle kjøretøy som har denne stasjonen på deres timeplan
-STR_SCHEDULED_AIRCRAFT_TIP :{BLACK}Vis alle fly som har denne stasjonen på deres timeplan
-STR_SCHEDULED_SHIPS_TIP :{BLACK}Vis alle skip som har denne stasjonen på deres timeplan
+STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} Tog
+STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} kjøretø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} kjøretøy
STR_VEH_WITH_SHARED_ORDERS_LIST_TIP :{BLACK}Vis alle kjøretøy som har samme ruteplan
@@ -3206,7 +3203,6 @@ STR_DEPOT_AUTOREPLACE_ROADVEH_TIP :{BLACK}Autoerst
STR_DEPOT_AUTOREPLACE_SHIP_TIP :{BLACK}Autoerstatt all skip i depotet
STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP :{BLACK}Autoerstatt alle fly i hangaren
-
STR_REPLACE_VEHICLES_WHITE :{WHITE}Erstatte {STRING}
STR_REPLACE_VEHICLES_START :{BLACK}Begynn å bytte ut kjøretøy
STR_REPLACE_VEHICLES_STOP :{BLACK}Slutt å bytte ut kjøretøy
@@ -3372,17 +3368,6 @@ STR_MEASURE_AREA :{BLACK}Område:
STR_MEASURE_LENGTH_HEIGHTDIFF :{BLACK}Lengde: {NUM}{}Høydeforskjell: {NUM} m
STR_MEASURE_AREA_HEIGHTDIFF :{BLACK}Område: {NUM} x {NUM}{}Høydeforskjell: {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 veien er eid av en by
STR_DRIVE_THROUGH_ERROR_DIRECTION :{WHITE}...veien vender mot feil retning
@@ -3407,7 +3392,6 @@ STR_PERCENT_UP_DOWN_SMALL :{TINYFONT}{WHIT
STR_PERCENT_UP_DOWN :{WHITE}{NUM}{NBSP}%{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_ROADS :Alle kjøretøyer
@@ -3436,12 +3420,35 @@ STR_GROUP_DELETE_TIP :{BLACK}Fjern de
STR_GROUP_RENAME_TIP :{BLACK}Gi nytt navn på den valgte gruppen
STR_GROUP_REPLACE_PROTECTION_TIP :{BLACK}Klikk for å beskytte denne gruppa fra global autoerstatting
+#### 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_COMMA :{COMMA}
+STR_JUST_INT :{NUM}
+STR_JUST_DATE_TINY :{DATE_TINY}
+STR_JUST_DATE_SHORT :{DATE_SHORT}
+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_NAME_MUST_BE_UNIQUE :{WHITE}Navn må være unikt
@@ -3544,6 +3551,8 @@ STR_AI_CHANGE :{BLACK}Velg AI
STR_AI_CONFIGURE :{BLACK}Konfigurer
STR_AI_CHANGE_TIP :{BLACK}Last enda en AI
STR_AI_CONFIGURE_TIP :{BLACK}Konfigurer AI-parameterene
+STR_AI_LIST_TIP :{BLACK}Alle AIer som blir lastet i neste spill
+STR_AI_LIST_CAPTION :{WHITE}Tilgjengelige AIer
STR_AI_AILIST_TIP :{BLACK}Klikk for å velge en AI
STR_AI_ACCEPT :{BLACK}Godta
STR_AI_ACCEPT_TIP :{BLACK}Velg merket AI
@@ -3551,9 +3560,13 @@ STR_AI_CANCEL :{BLACK}Avbryt
STR_AI_CANCEL_TIP :{BLACK}Ikke endre AI
STR_AI_CLOSE :{BLACK}Lukk
STR_AI_RESET :{BLACK}Tilbakestill
+STR_AI_HUMAN_PLAYER :Menneskelig spiller
STR_AI_RANDOM_AI :Tilfeldig AI
STR_AI_SETTINGS_CAPTION :{WHITE}AI-parametere
+STR_AI_AUTHOR :{BLACK}Forfatter: {STRING}
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.
########
############ town controlled noise level
@@ -3582,6 +3595,8 @@ STR_CONTENT_SELECT_UPDATES_CAPTION :{BLACK}Velg opp
STR_CONTENT_SELECT_UPDATES_CAPTION_TIP :{BLACK}Merk alt innhold som en en oppgradering av eksisterende innhold
STR_CONTENT_UNSELECT_ALL_CAPTION :{BLACK}Velg bort alt
STR_CONTENT_UNSELECT_ALL_CAPTION_TIP :{BLACK}Merk alt innhold som ikke skal lastes ned
+STR_CONTENT_FILTER_OSKTITLE :{BLACK}Skriv inn filterstreng
+STR_CONTENT_FILTER_TIP :{BLACK}Skriv inn et søkeord for å filtrere listen med
STR_CONTENT_FILTER_TITLE :{BLACK}Merke-/navnefilter:
STR_CONTENT_DOWNLOAD_CAPTION :{BLACK}Last ned
STR_CONTENT_DOWNLOAD_CAPTION_TIP :{BLACK}Start nedlastningen av det merkede innholdet
@@ -3589,6 +3604,7 @@ STR_CONTENT_TOTAL_DOWNLOAD_SIZE :{SILVER}Total s
STR_CONTENT_DETAIL_TITLE :{SILVER}INNHOLDSINFORMASJON
STR_CONTENT_DETAIL_SUBTITLE_UNSELECTED :{SILVER}Du har ikke valgt at dette skal lastes ned
STR_CONTENT_DETAIL_SUBTITLE_SELECTED :{SILVER}Du har valgt at dette skal lastes ned
+STR_CONTENT_DETAIL_SUBTITLE_AUTOSELECTED :{SILVER}Denne avhengigheten er valgt til å bli lastet ned
STR_CONTENT_DETAIL_SUBTITLE_ALREADY_HERE :{SILVER}Dette har du fra før av
STR_CONTENT_DETAIL_SUBTITLE_DOES_NOT_EXIST :{SILVER}Dette innholdet er ukjent og kan ikke lastes ned i OpenTTD
STR_CONTENT_DETAIL_UPDATE :{SILVER}Dette er en erstatning for en eksisterende {STRING}
@@ -3603,6 +3619,7 @@ STR_CONTENT_DETAIL_DEPENDENCIES :{SILVER}Avhengi
STR_CONTENT_DETAIL_TAGS :{SILVER}Merker: {WHITE}{STRING}
STR_CONTENT_DOWNLOAD_TITLE :{WHITE}Laster ned innhold...
+STR_CONTENT_DOWNLOAD_INITIALISE :{WHITE}Spør etter filer...
STR_CONTENT_DOWNLOAD_FILE :{WHITE}Laster ned {STRING} ({NUM} av {NUM})
STR_CONTENT_DOWNLOAD_COMPLETE :{WHITE}Nedlastning fullført
STR_CONTENT_DOWNLOAD_PROGRESS_SIZE :{WHITE}{BYTES} av {BYTES} lastet ned ({NUM} %)
diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt
index d500ae778..1e64f565b 100644
--- a/src/lang/romanian.txt
+++ b/src/lang/romanian.txt
@@ -762,9 +762,6 @@ STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :Obiectiv indust
############ range ends here
STR_FUND_INDUSTRY_CAPTION :{WHITE}Construieşte un nou obiectiv industrial
-STR_JUST_STRING :{STRING}
-STR_JUST_RAW_STRING :{STRING}
-STR_JUST_INT :{NUM}
STR_ERROR_CAN_ONLY_BE_BUILT_IN_RAINFOREST :{WHITE}...se poate construi doar in padurile ecuatoriale
STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT :{WHITE}...se poate construi doar în zonele de deşert
STR_STATUSBAR_PAUSED :{YELLOW}* * PAUZĂ (F1) * *
@@ -1197,7 +1194,6 @@ STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Alege ti
STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT}
STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT}
-STR_WAYPOINT_NAME :{WAYPOINT}
STR_EDIT_WAYPOINT_NAME :{WHITE}Editează numele haltei
STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}Nu pot schimba numele haltei...
@@ -1778,11 +1774,6 @@ STR_TOWN_BUILDING_NAME_TEPEES_1 :Corturi
STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1 :Casă-ceainic
STR_TOWN_BUILDING_NAME_PIGGY_BANK_1 :Puşculiţă
-STR_INDUSTRY_NAME :{INDUSTRY}
-STR_TOWN_NAME :{TOWN}
-STR_FORMAT_INDUSTRY_NAME :{TOWN} {STRING}
-STR_STATION_NAME :{STATION}
-
##id 0x2800
STR_LANDSCAPING_MENU_LANDSCAPING :Modificare peisaj
STR_LANDSCAPING_MENU_PLANT_TREES :Plantează arbori
@@ -1837,6 +1828,12 @@ STR_CARGO_RATING_EXCELLENT :Excelent
STR_CARGO_RATING_OUTSTANDING :Fantastic
############ range for rating ends
+### station view strings
+STR_SCHEDULED_TRAINS_TIP :{BLACK}Afiseaza toate trenurile care opresc in aceasta statie
+STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Afiseaza toate autovehiculele care opresc in aceasta statie
+STR_SCHEDULED_AIRCRAFT_TIP :{BLACK}Afiseaza toate aeronavele care opresc in aceasta statie
+STR_SCHEDULED_SHIPS_TIP :{BLACK}Afiseaza toate navele care opresc in aceasta statie
+
STR_STATION_VIEW_CARGO_RATING :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}{STATION} nu mai acceptă {STRING}
STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION} nu mai acceptă {STRING} sau {STRING}
@@ -2080,6 +2077,7 @@ STR_SV_STNAME_AIRPORT :Aeroportul {STR
STR_SV_STNAME_OILFIELD :Platforma {STRING}
STR_SV_STNAME_MINES :Minele {STRING}
STR_SV_STNAME_DOCKS :Portul {STRING}
+##id 0x6020
STR_SV_STNAME_ANNEXE :Anexa {STRING}
STR_SV_STNAME_SIDINGS :{STRING} Belvedere
STR_SV_STNAME_BRANCH :Ramura {STRING}
@@ -2162,7 +2160,6 @@ STR_CITY_APPROVAL_HOSTILE :ostilă
##id 0x7000
STR_COMPANY_VIEW_CAPTION :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
-STR_FORMAT_COMPANY_NUM :(Companie {COMMA})
STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Schimbă poza
STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON :{BLACK}Schemă culori
STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE :{GOLD}Schemă culori:
@@ -2195,7 +2192,6 @@ STR_FINANCES_TOTAL_CAPTION :{WHITE}Total:
STR_COMPANY_NAME_COMPANY_NUM :{COMPANY} {COMPANYNUM}
STR_GRAPH_INCOME_CAPTION :{WHITE}Graficul veniturilor
STR_CURRCOMPACT :{CURRCOMPACT}
-STR_JUST_COMMA :{COMMA}
STR_GRAPH_OPERATING_PROFIT_CAPTION :{WHITE}Graficul profitului din operare
STR_FINANCES_BANK_BALANCE_TITLE :{WHITE}Balanţă curentă
STR_FINANCES_LOAN_TITLE :{WHITE}Credite
@@ -2707,7 +2703,6 @@ STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON :{BLACK}Vehicule
STR_DEPOT_NO_ENGINE :{BLACK}-
STR_ERROR_TRAIN_TOO_LONG :{WHITE}Tren prea lung
STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT :{WHITE}Trenurile pot fi modificate doar când staţionează într-un depou
-STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} Tren{P "" uri}
STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION :{WHITE}Noi vehicule feroviare
STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION :{WHITE}Noi Vehicule Electrice pe Sine
@@ -2765,7 +2760,6 @@ STR_ERROR_UNABLE_TO_FIND_ROUTE_TO :{WHITE}Nu se po
STR_ERROR_CAN_T_STOP_START_TRAIN :{WHITE}Nu se poate opri/porni trenul...
STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS :{BLACK}Intervalul pentru întreţinere: {LTBLUE}{COMMA}zile{BLACK} Ultima întreţinere: {LTBLUE}{DATE_LONG}
STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT :{BLACK}Intervalul de service: {LTBLUE}{COMMA}%{BLACK} Ultimul service: {LTBLUE}{DATE_LONG}
-STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP :{BLACK}Trenuri - apasă aici pentru informaţii despre trenuri
STR_DEPOT_TRAIN_LIST_TOOLTIP :{BLACK}Trenuri - clic pe tren pentru informaţii, mută vehiculele pentru adăugare-scoatere din tren
STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP :{BLACK}Construieşte un nou vehicul feroviar
STR_DEPOT_TRAIN_SELL_TOOLTIP :{BLACK}Mută un vehicul aici pentru a-l vinde
@@ -2854,7 +2848,6 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP :{BLACK}Complete
##id 0x9000
STR_ERROR_ROAD_VEHICLE_IN_THE_WAY :{WHITE}Autovehicul in cale
-STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} Autovehicule{P "" s}
STR_DEPOT_ROAD_CAPTION :{WHITE}Autobaza {TOWN}
STR_DEPOT_ROAD_NEW_VEHICLES_BUTTON :{BLACK}Autovehicule noi
STR_BUILD_VEHICLE_ROAD_CAPTION :{WHITE}Autovehicule noi
@@ -2870,7 +2863,6 @@ STR_HEADING_FOR_ROAD_DEPOT_SERVICE :{LTBLUE}Service
STR_HEADING_FOR_ROAD_DEPOT_SERVICE_VEL :{LTBLUE}Service la Autobaza {TOWN}, {VELOCITY}
STR_ERROR_CAN_T_SEND_VEHICLE_TO_DEPOT :{WHITE}Nu pot trimite autovehiculul la autobază...
STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT :{WHITE}Nu pot găsi o autobază apropiată
-STR_VEHICLE_LIST_ROAD_TOOLTIP :{BLACK}Autovehicule - clic pe vehicul pentru informatii
STR_VEHICLE_VIEW_ROAD_STATE_START_STOP_TOOLTIP :{BLACK}Comanda curentă a autovehiculului - clic aici pentru a opri/porni autovehiculul
STR_VEHICLE_VIEW_ROAD_ORDERS_TOOLTIP :{BLACK}Afişează comenzile autovehiculului
STR_VEHICLE_VIEW_ROAD_LOCATION_TOOLTIP :{BLACK}Centrează imaginea pe locaţia curentă a autovehiculului
@@ -2917,7 +2909,6 @@ STR_WATERWAYS_TOOLBAR_CAPTION_SE :{WHITE}Rute acv
STR_ERROR_CAN_T_BUILD_DOCK_HERE :{WHITE}Nu pot construi port aici...
STR_DEPOT_SHIP_CAPTION :{WHITE}Şantierul Naval {TOWN}
STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON :{BLACK}Nave noi
-STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} Nav{P ă e}
STR_BUILD_VEHICLE_SHIP_CAPTION :{WHITE}Nave noi
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON :{BLACK}Construieşte navă
STR_CLONE_SHIP :{BLACK}Clonare navă
@@ -2940,7 +2931,6 @@ STR_DEPOT_SHIP_LIST_TOOLTIP :{BLACK}Nave - c
STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP :{BLACK}Construieşte o navă nouă
STR_DEPOT_SHIP_SELL_TOOLTIP :{BLACK}Trage nava aici pentru a o vinde
STR_DEPOT_SHIP_LOCATION_TOOLTIP :{BLACK}Centrează imaginea pe locaţia şantierului
-STR_VEHICLE_LIST_SHIP_TOOLTIP :{BLACK}Nave - click pe navă pentru informaţii
STR_BUILD_VEHICLE_SHIP_LIST_TOOLTIP :{BLACK}Listă de selecţie a navelor - click pe o navă pentru informaţii
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP :{BLACK}Construieşte nava selectată
STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Comanda curentă a navei - clic aici pentru a opri/porni nava
@@ -2982,7 +2972,6 @@ STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}Acest bu
STR_BUILD_VEHICLE_AIRCRAFT_CAPTION :{WHITE}Aeronavă nouă
STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON :{BLACK}Cumpără aeronavă
STR_ERROR_CAN_T_BUILD_AIRCRAFT :{WHITE}Nu se poate cumpăra aeronava...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} Aeronave
STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR :{WHITE}Nu se poate trimite aeronava la hangar...
STR_HEADING_FOR_HANGAR :{ORANGE}Merge la Hangarul {STATION}
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Merge la Hangarul {STATION}, {VELOCITY}
@@ -2996,7 +2985,6 @@ STR_ERROR_AIRCRAFT_MUST_BE_STOPPED :{WHITE}Aeronava
STR_ERROR_CAN_T_SELL_AIRCRAFT :{WHITE}Nu se poate vinde aeronava...
STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :Construire aeroport
STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP :{BLACK}Construieşte aeroport
-STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP :{BLACK}Aeronavă - clic pe aeronavă pentru informaţii
STR_DEPOT_AIRCRAFT_LIST_TOOLTIP :{BLACK}Aeronavă - clic pe aeronavă pentru informaţii
STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP :{BLACK}Cumpără o aeronavă
STR_DEPOT_AIRCRAFT_SELL_TOOLTIP :{BLACK}Trage aeronava aici pentru a o vinde
@@ -3178,11 +3166,16 @@ STR_LORRY :{BLACK}{LORRY}
STR_PLANE :{BLACK}{PLANE}
STR_SHIP :{BLACK}{SHIP}
+############ Vehicle lists
+STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP :{BLACK}Trenuri - apasă aici pentru informaţii despre trenuri
+STR_VEHICLE_LIST_ROAD_TOOLTIP :{BLACK}Autovehicule - clic pe vehicul pentru informatii
+STR_VEHICLE_LIST_SHIP_TOOLTIP :{BLACK}Nave - click pe navă pentru informaţii
+STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP :{BLACK}Aeronavă - clic pe aeronavă pentru informaţii
-STR_SCHEDULED_TRAINS_TIP :{BLACK}Afiseaza toate trenurile care opresc in aceasta statie
-STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Afiseaza toate autovehiculele care opresc in aceasta statie
-STR_SCHEDULED_AIRCRAFT_TIP :{BLACK}Afiseaza toate aeronavele care opresc in aceasta statie
-STR_SCHEDULED_SHIPS_TIP :{BLACK}Afiseaza toate navele care opresc in aceasta statie
+STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} Tren{P "" uri}
+STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} Autovehicule{P "" s}
+STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} Nav{P ă e}
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} Aeronave
STR_VEH_WITH_SHARED_ORDERS_LIST :{WHITE}Comenzi sincronizate pentru {COMMA} vehicul{P "" e}
STR_VEH_WITH_SHARED_ORDERS_LIST_TIP :{BLACK}Arata toate vehiculele care se incadreaza in acest program
@@ -3206,7 +3199,6 @@ STR_DEPOT_AUTOREPLACE_ROADVEH_TIP :{BLACK}înlocui
STR_DEPOT_AUTOREPLACE_SHIP_TIP :{BLACK}înlocuieşte automat toate vasele din depou
STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP :{BLACK}înlocuieşte automat toate aeronavele din hangar
-
STR_REPLACE_VEHICLES_WHITE :{WHITE}Înlocuieste {STRING}
STR_REPLACE_VEHICLES_START :{BLACK}Incepere inlocuire vehicule
STR_REPLACE_VEHICLES_STOP :{BLACK}Oprire inlocuire vehicule
@@ -3372,17 +3364,6 @@ STR_MEASURE_AREA :{BLACK}Suprafa
STR_MEASURE_LENGTH_HEIGHTDIFF :{BLACK}Lungime: {NUM}{}Diferenţa de înălţime: {NUM} m
STR_MEASURE_AREA_HEIGHTDIFF :{BLACK}Suprafaţa: {NUM} x {NUM}{}Diferenţa de înălţime: {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}Transfera Credit: {LTBLUE}{CURRENCY}
STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD :{WHITE}...drum in proprietatea orasului
STR_DRIVE_THROUGH_ERROR_DIRECTION :{WHITE}...drum orientat in directia gresita
@@ -3407,7 +3388,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 :Toate trenurile
STR_GROUP_ALL_ROADS :Toate autovehiculele
@@ -3436,12 +3416,35 @@ STR_GROUP_DELETE_TIP :{BLACK}Şterge
STR_GROUP_RENAME_TIP :{BLACK}Redenumeste grupul selectat
STR_GROUP_REPLACE_PROTECTION_TIP :{BLACK}Click aici pentru a proteja acest grup de la inlocuirile automate globale
+#### 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_COMMA :{COMMA}
+STR_JUST_INT :{NUM}
+STR_JUST_DATE_TINY :{DATE_TINY}
+STR_JUST_DATE_SHORT :{DATE_SHORT}
+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 :(Companie {COMMA})
+STR_FORMAT_GROUP_NAME :Grup {COMMA}
+STR_FORMAT_INDUSTRY_NAME :{TOWN} {STRING}
STR_NAME_MUST_BE_UNIQUE :{WHITE}Numele trebuie să fie unic
diff --git a/src/lang/russian.txt b/src/lang/russian.txt
index 95204a8fd..05ab982fc 100644
--- a/src/lang/russian.txt
+++ b/src/lang/russian.txt
@@ -280,7 +280,7 @@ STR_ABBREV_PLASTIC :{TINYFONT}ПЛ
STR_ABBREV_FIZZY_DRINKS :{TINYFONT}ГЗ
STR_ABBREV_NONE :{TINYFONT}НЕТ
STR_ABBREV_ALL :{TINYFONT}Все
-STR_DATE_SHORT_WHITE :{WHITE}{DATE_SHORT} г.
+STR_DATE_SHORT_WHITE :{WHITE}{DATE_SHORT}
STR_DATE_LONG_WHITE :{WHITE}{DATE_LONG}
STR_SMALLMAP_CAPTION :{WHITE}Карта - {STRING}
STR_GAME_OPTIONS_CAPTION :{WHITE}Настройки игры
@@ -308,7 +308,7 @@ STR_JUST_NOTHING :Ничего
STR_COLOUR_DARK_BLUE :Тёмно-синий
STR_COLOUR_PALE_GREEN :Светло-зелёный
STR_COLOUR_PINK :Розовый
-STR_COLOUR_YELLOW :Желтый
+STR_COLOUR_YELLOW :Жёлтый
STR_COLOUR_RED :Красный
STR_COLOUR_LIGHT_BLUE :Светло-синий
STR_COLOUR_GREEN :Зелёный
@@ -1336,6 +1336,8 @@ STR_GO_NON_STOP_TO_WAYPOINT :Ехать че
STR_WAYPOINTNAME_CITY :Точка пути {TOWN}
STR_WAYPOINTNAME_CITY_SERIAL :Точка пути {TOWN} #{COMMA}
+STR_BUOYNAME_CITY :Буй {TOWN}
+STR_BUOYNAME_CITY_SERIAL :Буй {TOWN} #{COMMA}
STR_LANDINFO_WAYPOINT :Точка пути
STR_WAYPOINT :{WHITE}Точка пути
@@ -1880,7 +1882,7 @@ STR_NEWS_SERVICE_SUBSIDY_AWARDED_HALF :{BLACK}{BIGFONT
STR_NEWS_SERVICE_SUBSIDY_AWARDED_DOUBLE :{BLACK}{BIGFONT}Компания «{STRING}» получает субсидию!{}{}Перевозка {STRING.gen} по маршруту {STATION} - {STATION} будет оплачиваться в двойном размере в течение года!
STR_NEWS_SERVICE_SUBSIDY_AWARDED_TRIPLE :{BLACK}{BIGFONT}Компания «{STRING}» получает субсидию!{}{}Перевозка {STRING.gen} по маршруту {STATION} - {STATION} будет оплачиваться в тройном размере в течение года!
STR_NEWS_SERVICE_SUBSIDY_AWARDED_QUADRUPLE :{BLACK}{BIGFONT}Компания «{STRING}» получает субсидию!{}{}Перевозка {STRING.gen} по маршруту {STATION} - {STATION} будет оплачиваться в четырёхкратном размере в течение года!
-STR_ERROR_LOCAL_AUTHORITY_REFUSES_AIRPORT :{WHITE}{TOWN} местная власть запрещает постройку другого аэропорта в городе
+STR_ERROR_LOCAL_AUTHORITY_REFUSES_AIRPORT :{WHITE}Администрация г.{NBSP}{TOWN} запрещает постройку ещё одного аэропорта в городе
STR_LOCAL_AUTHORITY_REFUSES_NOISE :{WHITE}Администрация г.{NBSP}{TOWN} не разрешает строительство аэропорта из-за высокого уровня шума.
STR_TOWN_BUILDING_NAME_COTTAGES_1 :Коттеджи
STR_TOWN_BUILDING_NAME_HOUSES_1 :Дома
@@ -2226,6 +2228,9 @@ STR_SV_STNAME_AIRPORT :Аэропор
STR_SV_STNAME_OILFIELD :Нефтяная вышка {STRING}
STR_SV_STNAME_MINES :Шахты {STRING}
STR_SV_STNAME_DOCKS :Пристань {STRING}
+STR_SV_STNAME_BUOY :{STRING}
+STR_SV_STNAME_WAYPOINT :{STRING}
+##id 0x6020
STR_SV_STNAME_ANNEXE :{STRING}-дополнительная
STR_SV_STNAME_SIDINGS :{STRING}-запасная
STR_SV_STNAME_BRANCH :{STRING}-ветка
@@ -3181,7 +3186,7 @@ STR_TIMETABLE_TITLE :{WHITE}{VEHICLE
##id 0xB000
STR_NEWS_DISASTER_ZEPPELIN :{BLACK}{BIGFONT}Крушение дирижабля в {STATION}!
STR_NEWS_DISASTER_SMALL_UFO :{BLACK}{BIGFONT}Автомобиль уничтожен при столкновении с НЛО!
-STR_NEWS_DISASTER_AIRPLANE_OIL_REFINERY :{BLACK}{BIGFONT}Взрыв нефтеперегонного завода вблизи {TOWN}!
+STR_NEWS_DISASTER_AIRPLANE_OIL_REFINERY :{BLACK}{BIGFONT}Взрыв нефтеперегонного завода вблизи г.{NBSP}{TOWN}!
STR_NEWS_DISASTER_HELICOPTER_FACTORY :{BLACK}{BIGFONT}Взрыв завода при подозрительных обстоятельствах вблизи {TOWN}!
STR_NEWS_DISASTER_BIG_UFO :{BLACK}{BIGFONT}НЛО приземлилось возле г.{NBSP}{TOWN}!
STR_NEWS_DISASTER_COAL_MINE_SUBSIDENCE :{BLACK}{BIGFONT}Обвал на угольной шахте вызывает оползень около {TOWN}!
@@ -3249,7 +3254,7 @@ STR_NEWGRF_ERROR_LOAD_BEFORE :{SKIP}{STRING}
STR_NEWGRF_ERROR_LOAD_AFTER :{SKIP}{STRING} должен быть загружен после {STRING}.
STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER :{SKIP}{STRING} требует OpenTTD версии {STRING} или выше.
STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE :файл GRF, который им переводится.
-STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED :Слишком много загружено новой графики
+STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED :Загружено слишком много новой графики
STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC :Загрузка {STRING} в качестве статического NewGRF с {STRING} Может вызвать ошибку синхронизации.
STR_NEWGRF_ERROR_UNEXPECTED_SPRITE :Неверный спрайт.
STR_NEWGRF_ERROR_UNKNOWN_PROPERTY :Неизвестное свойство для Action 0.
diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt
index d79dd9c2a..4d81cb065 100644
--- a/src/lang/spanish.txt
+++ b/src/lang/spanish.txt
@@ -763,9 +763,6 @@ STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :Fundar nueva in
############ range ends here
STR_FUND_INDUSTRY_CAPTION :{WHITE}Fundar nueva industria
-STR_JUST_STRING :{STRING}
-STR_JUST_RAW_STRING :{STRING}
-STR_JUST_INT :{NUM}
STR_ERROR_CAN_ONLY_BE_BUILT_IN_RAINFOREST :{WHITE}...sólo se puede construir en áreas de selva
STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT :{WHITE}...sólo se puede construir en áreas desérticas
STR_STATUSBAR_PAUSED :{YELLOW}* * PAUSADO * *
@@ -1191,6 +1188,8 @@ STR_GO_NON_STOP_TO_WAYPOINT :Ir directo via
STR_WAYPOINTNAME_CITY :Punto de paso {TOWN}
STR_WAYPOINTNAME_CITY_SERIAL :Punto de paso {TOWN} #{COMMA}
+STR_BUOYNAME_CITY :Boya {TOWN}
+STR_BUOYNAME_CITY_SERIAL :Boya {TOWN} #{COMMA}
STR_LANDINFO_WAYPOINT :Punto de paso
STR_WAYPOINT :{WHITE}Punto de paso
@@ -1198,7 +1197,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 nombre del punto de paso
STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}No se puede cambiar el nombre del punto de paso...
@@ -1779,11 +1777,6 @@ STR_TOWN_BUILDING_NAME_TEPEES_1 :Tipis
STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1 :Casa de Té
STR_TOWN_BUILDING_NAME_PIGGY_BANK_1 :Banco Cerdito
-STR_INDUSTRY_NAME :{INDUSTRY}
-STR_TOWN_NAME :{TOWN}
-STR_FORMAT_INDUSTRY_NAME :{TOWN}, {STRING}
-STR_STATION_NAME :{STATION}
-
##id 0x2800
STR_LANDSCAPING_MENU_LANDSCAPING :Paisaje
STR_LANDSCAPING_MENU_PLANT_TREES :Plantar árboles
@@ -1838,6 +1831,12 @@ STR_CARGO_RATING_EXCELLENT :Excelente
STR_CARGO_RATING_OUTSTANDING :Excepcional
############ range for rating ends
+### station view strings
+STR_SCHEDULED_TRAINS_TIP :{BLACK}Mostrar todos los trenes que tienen esta estación en su horario
+STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Mostrar todos los vehículos de carretera que tienen esta estación en su horario
+STR_SCHEDULED_AIRCRAFT_TIP :{BLACK}Mostrar todos las aeronaves que tienen esta estación en su horario
+STR_SCHEDULED_SHIPS_TIP :{BLACK}Mostrar todos los barcos que tienen esta estación en su horario
+
STR_STATION_VIEW_CARGO_RATING :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}{STATION} ya no acepta {STRING}
STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION} ya no acepta {STRING} ni {STRING}
@@ -2081,6 +2080,9 @@ STR_SV_STNAME_AIRPORT :Aeropuerto de {
STR_SV_STNAME_OILFIELD :Campo petrolífero de {STRING}
STR_SV_STNAME_MINES :Minas de {STRING}
STR_SV_STNAME_DOCKS :Muelles de {STRING}
+STR_SV_STNAME_BUOY :{STRING}
+STR_SV_STNAME_WAYPOINT :{STRING}
+##id 0x6020
STR_SV_STNAME_ANNEXE :{STRING} Anexo
STR_SV_STNAME_SIDINGS :Proximidades de {STRING}
STR_SV_STNAME_BRANCH :Ramal de {STRING}
@@ -2163,7 +2165,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}Nueva Cara
STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON :{BLACK}Esquema de Color
STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE :{GOLD}Esquema de Color:
@@ -2196,7 +2197,6 @@ STR_FINANCES_TOTAL_CAPTION :{WHITE}Total:
STR_COMPANY_NAME_COMPANY_NUM :{COMPANY} {COMPANYNUM}
STR_GRAPH_INCOME_CAPTION :{WHITE}Gráfico de Ingresos
STR_CURRCOMPACT :{CURRCOMPACT}
-STR_JUST_COMMA :{COMMA}
STR_GRAPH_OPERATING_PROFIT_CAPTION :{WHITE}Gráfico de Beneficio Operativo
STR_FINANCES_BANK_BALANCE_TITLE :{WHITE}Saldo en Banco
STR_FINANCES_LOAN_TITLE :{WHITE}Préstamo
@@ -2708,7 +2708,6 @@ STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON :{BLACK}Nuevos V
STR_DEPOT_NO_ENGINE :{BLACK}-
STR_ERROR_TRAIN_TOO_LONG :{WHITE}Tren demasiado largo
STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT :{WHITE}Los trenes únicamente puede ser modificados en el interior de los depósitos
-STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} Trenes
STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION :{WHITE}Nuevos vehículos de raíl
STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION :{WHITE}Nuevo Vehículo Eléctrico de Railes
@@ -2766,7 +2765,6 @@ STR_ERROR_UNABLE_TO_FIND_ROUTE_TO :{WHITE}No se pu
STR_ERROR_CAN_T_STOP_START_TRAIN :{WHITE}No se puede parar/arrancar tren...
STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS :{BLACK}Intervalo de despacho: {LTBLUE}{COMMA}días{BLACK} Último servicio: {LTBLUE}{DATE_LONG}
STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT :{BLACK}Intervalo de despacho: {LTBLUE}{COMMA}%{BLACK} Último servicio: {LTBLUE}{DATE_LONG}
-STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP :{BLACK}Trenes - click en tren para información
STR_DEPOT_TRAIN_LIST_TOOLTIP :{BLACK}Trenes - click en tren para info., arrastrar vehículo para añadir/retirar del tren
STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP :{BLACK}Construir nuevo vehículo de tren
STR_DEPOT_TRAIN_SELL_TOOLTIP :{BLACK}Arrastrar aquí vehículo para venderlo
@@ -2855,7 +2853,6 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP :{BLACK}Rellena
##id 0x9000
STR_ERROR_ROAD_VEHICLE_IN_THE_WAY :{WHITE}Vehículo de carretera en camino
-STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} Vehículos de Carretera
STR_DEPOT_ROAD_CAPTION :{WHITE}{TOWN} Depósito de vehículos
STR_DEPOT_ROAD_NEW_VEHICLES_BUTTON :{BLACK}Nuevos vehículos
STR_BUILD_VEHICLE_ROAD_CAPTION :{WHITE}Nuevos vehículos
@@ -2871,7 +2868,6 @@ STR_HEADING_FOR_ROAD_DEPOT_SERVICE :{LTBLUE}Dirigie
STR_HEADING_FOR_ROAD_DEPOT_SERVICE_VEL :{LTBLUE}Servicio en el depósito de {TOWN}, {VELOCITY}
STR_ERROR_CAN_T_SEND_VEHICLE_TO_DEPOT :{WHITE}No se puede enviar vehículo al depósito...
STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT :{WHITE}No se puede encontrar ruta al depósito
-STR_VEHICLE_LIST_ROAD_TOOLTIP :{BLACK}Vehículos de carretera - click en vehículo para información
STR_VEHICLE_VIEW_ROAD_STATE_START_STOP_TOOLTIP :{BLACK}Acción actual del vehículo - click aquí para detener/arrancar vehículo
STR_VEHICLE_VIEW_ROAD_ORDERS_TOOLTIP :{BLACK}Ver órdenes del vehículo
STR_VEHICLE_VIEW_ROAD_LOCATION_TOOLTIP :{BLACK}Centrar vista en posición del vehículo
@@ -2918,7 +2914,6 @@ STR_WATERWAYS_TOOLBAR_CAPTION_SE :{WHITE}Canales
STR_ERROR_CAN_T_BUILD_DOCK_HERE :{WHITE}No se pueden construir muelles aquí...
STR_DEPOT_SHIP_CAPTION :{WHITE}Astillero de {TOWN}
STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON :{BLACK}Nuevos barcos
-STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} Barcos
STR_BUILD_VEHICLE_SHIP_CAPTION :{WHITE}Nuevos barcos
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON :{BLACK}Construir barco
STR_CLONE_SHIP :{BLACK}Clonar barco
@@ -2941,7 +2936,6 @@ STR_DEPOT_SHIP_LIST_TOOLTIP :{BLACK}Barcos -
STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP :{BLACK}Construir nuevo barco
STR_DEPOT_SHIP_SELL_TOOLTIP :{BLACK}Arrastra barco aquí para venderlo
STR_DEPOT_SHIP_LOCATION_TOOLTIP :{BLACK}Centrar vista en posición del astillero
-STR_VEHICLE_LIST_SHIP_TOOLTIP :{BLACK}Barcos - click en barco para información
STR_BUILD_VEHICLE_SHIP_LIST_TOOLTIP :{BLACK}Lista de selección de barcos - click en barco para información
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP :{BLACK}Construir el barco resaltado
STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Acción actual del barco - click aquí para detener/arrancar barco
@@ -2983,7 +2977,6 @@ STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}Esto con
STR_BUILD_VEHICLE_AIRCRAFT_CAPTION :{WHITE}Nueva Aeronave
STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON :{BLACK}Construir aeronave
STR_ERROR_CAN_T_BUILD_AIRCRAFT :{WHITE}No se puede construir aeronave...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} Aeronave
STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR :{WHITE}No se puede enviar la aeronave al hangar
STR_HEADING_FOR_HANGAR :{ORANGE}Ir al hangar de {STATION}
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Ir al hangar de {STATION}, {VELOCITY}
@@ -2997,7 +2990,6 @@ STR_ERROR_AIRCRAFT_MUST_BE_STOPPED :{WHITE}La aeron
STR_ERROR_CAN_T_SELL_AIRCRAFT :{WHITE}No se puede vender la aeronave...
STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :Construir aeropuerto
STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP :{BLACK}Construir aeropuerto
-STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP :{BLACK}La aeronave - click en la aeronave para información
STR_DEPOT_AIRCRAFT_LIST_TOOLTIP :{BLACK}Aeronave - click en la aeronave para información
STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP :{BLACK}Construir aeronave
STR_DEPOT_AIRCRAFT_SELL_TOOLTIP :{BLACK}Arrastra aeronave aquí para venderla
@@ -3179,11 +3171,16 @@ STR_LORRY :{BLACK}{LORRY}
STR_PLANE :{BLACK}{PLANE}
STR_SHIP :{BLACK}{SHIP}
+############ Vehicle lists
+STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP :{BLACK}Trenes - click en tren para información
+STR_VEHICLE_LIST_ROAD_TOOLTIP :{BLACK}Vehículos de carretera - click en vehículo para información
+STR_VEHICLE_LIST_SHIP_TOOLTIP :{BLACK}Barcos - click en barco para información
+STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP :{BLACK}La aeronave - click en la aeronave para información
-STR_SCHEDULED_TRAINS_TIP :{BLACK}Mostrar todos los trenes que tienen esta estación en su horario
-STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Mostrar todos los vehículos de carretera que tienen esta estación en su horario
-STR_SCHEDULED_AIRCRAFT_TIP :{BLACK}Mostrar todos las aeronaves que tienen esta estación en su horario
-STR_SCHEDULED_SHIPS_TIP :{BLACK}Mostrar todos los barcos que tienen esta estación en su horario
+STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} Trenes
+STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} Vehículos de Carretera
+STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} Barcos
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} Aeronave
STR_VEH_WITH_SHARED_ORDERS_LIST :{WHITE}Ordenes compartidas de {COMMA} Vehículo{P "" s}
STR_VEH_WITH_SHARED_ORDERS_LIST_TIP :{BLACK}Ver todos los vehículos con el mismo calendario
@@ -3207,7 +3204,6 @@ STR_DEPOT_AUTOREPLACE_ROADVEH_TIP :{BLACK}Cambia a
STR_DEPOT_AUTOREPLACE_SHIP_TIP :{BLACK}Cambia automáticamente todos los barcos del depósito
STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP :{BLACK}Cambia automáticamente todas las aeronaves del hangar
-
STR_REPLACE_VEHICLES_WHITE :{WHITE}Reemplazar {STRING}
STR_REPLACE_VEHICLES_START :{BLACK}Empezar a reemplazar vehículos
STR_REPLACE_VEHICLES_STOP :{BLACK}Parar de reemplazar vehículos
@@ -3373,17 +3369,6 @@ STR_MEASURE_AREA :{BLACK}Área: {
STR_MEASURE_LENGTH_HEIGHTDIFF :{BLACK}Longitud: {NUM}{}Diferencia altura: {NUM} m
STR_MEASURE_AREA_HEIGHTDIFF :{BLACK}Área: {NUM} x {NUM}{}Diferencia 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 Créditos: {LTBLUE}{CURRENCY}
STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD :{WHITE}...esta es una carretera propiedad de una ciudad
STR_DRIVE_THROUGH_ERROR_DIRECTION :{WHITE}...revestimientos del camino en la dirección incorrecta
@@ -3408,7 +3393,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 los trenes
STR_GROUP_ALL_ROADS :Todos los vehículos de carretera
@@ -3437,12 +3421,35 @@ STR_GROUP_DELETE_TIP :{BLACK}Borrar e
STR_GROUP_RENAME_TIP :{BLACK}Renombrar el grupo seleccionado
STR_GROUP_REPLACE_PROTECTION_TIP :{BLACK}Pulsa para proteger este grupo del auto reemplazado 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_COMMA :{COMMA}
+STR_JUST_INT :{NUM}
+STR_JUST_DATE_TINY :{DATE_TINY}
+STR_JUST_DATE_SHORT :{DATE_SHORT}
+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 :{TOWN}, {STRING}
STR_NAME_MUST_BE_UNIQUE :{WHITE}El nombre debe ser único
diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt
index f636e82b0..9acb9a64e 100644
--- a/src/lang/ukrainian.txt
+++ b/src/lang/ukrainian.txt
@@ -887,9 +887,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}* * ПАУЗА * *
@@ -1322,7 +1319,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}Не можна перейменувати точку маршруту...
@@ -1903,11 +1899,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 :Посадити дерево
@@ -1962,6 +1953,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}
@@ -2242,6 +2239,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} Відділення
@@ -2324,7 +2322,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}Схема кольорів:
@@ -2357,7 +2354,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}Позика
@@ -2869,7 +2865,6 @@ 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}Новий електрозалізничний транспорт
@@ -2927,7 +2922,6 @@ 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}Перетягніть поїзд сюди, щоб продати його
@@ -3016,7 +3010,6 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP :{BLACK}Авто
##id 0x9000
STR_ERROR_ROAD_VEHICLE_IN_THE_WAY :{WHITE}На шляху авто
-STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} автомобіл{P ь і ів}
STR_DEPOT_ROAD_CAPTION :{WHITE}{TOWN} Гараж
STR_DEPOT_ROAD_NEW_VEHICLES_BUTTON :{BLACK}Новий транспорт
STR_BUILD_VEHICLE_ROAD_CAPTION :{WHITE}Нове авто
@@ -3032,7 +3025,6 @@ STR_HEADING_FOR_ROAD_DEPOT_SERVICE :{LTBLUE}Тех
STR_HEADING_FOR_ROAD_DEPOT_SERVICE_VEL :{LTBLUE}Техогляд в {TOWN} дорожному депо, {VELOCITY}
STR_ERROR_CAN_T_SEND_VEHICLE_TO_DEPOT :{WHITE}Неможливо направити авто в депо...
STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT :{WHITE}Неможливо знайти місцеве депо
-STR_VEHICLE_LIST_ROAD_TOOLTIP :{BLACK}Авто - натисніть на авто для інформації
STR_VEHICLE_VIEW_ROAD_STATE_START_STOP_TOOLTIP :{BLACK}Показує, яку дію виконує авто - натисніть для руху/зупинки авто
STR_VEHICLE_VIEW_ROAD_ORDERS_TOOLTIP :{BLACK}Показати накази авто
STR_VEHICLE_VIEW_ROAD_LOCATION_TOOLTIP :{BLACK}Показати авто в центрі екрану
@@ -3079,7 +3071,6 @@ 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}Клонувати
@@ -3102,7 +3093,6 @@ 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}Показує, яку дію виконує корабель - натисніть для руху/зупинки корабля
@@ -3144,7 +3134,6 @@ 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} літак{P "" и ів}
STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR :{WHITE}Неможливо направити літак до ангару...
STR_HEADING_FOR_HANGAR :{ORANGE}Летить до {STATION} ангару
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Летить до {STATION} ангару, {VELOCITY}
@@ -3158,7 +3147,6 @@ 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}Перетягніть літак сюди, щоб продати
@@ -3340,11 +3328,16 @@ 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_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_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} автомобіл{P ь і ів}
+STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} кораб{P ель лі лів}
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} літак{P "" и ів}
STR_VEH_WITH_SHARED_ORDERS_LIST :{WHITE}Спільні маршрути {COMMA} трансп.засоб{P у iв ів}
STR_VEH_WITH_SHARED_ORDERS_LIST_TIP :{BLACK}Показати транспорт з таким самим маршрутом
@@ -3368,7 +3361,6 @@ STR_DEPOT_AUTOREPLACE_ROADVEH_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}Зупинити оновлення
@@ -3534,17 +3526,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}...дорога не в тому напрямку
@@ -3569,7 +3550,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_ROADS :Усі автомобілі
@@ -3598,12 +3578,35 @@ 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_COMMA :{COMMA}
+STR_JUST_INT :{NUM}
+STR_JUST_DATE_TINY :{DATE_TINY}
+STR_JUST_DATE_SHORT :{DATE_SHORT}
+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_NAME_MUST_BE_UNIQUE :{WHITE}Назва має бути унікальною
diff --git a/src/lang/unfinished/persian.txt b/src/lang/unfinished/persian.txt
index 1c8fb77f9..f8de01b18 100644
--- a/src/lang/unfinished/persian.txt
+++ b/src/lang/unfinished/persian.txt
@@ -276,6 +276,7 @@ STR_COMPANY_SOMEONE :یک نفر{SKI
STR_UNITS_IMPERIAL :شاهنشاهی
STR_UNITS_METRIC :متری
+STR_UNITS_SI :SI
STR_UNITS_VELOCITY_IMPERIAL :{COMMA} مایل در ساعت
STR_UNITS_VELOCITY_METRIC :{COMMA} کیلومتر/ساعت
@@ -319,7 +320,54 @@ STR_ABANDON_GAME_QUERY :{YELLOW}آیا
STR_ABANDON_GAME_CAPTION :{WHITE}رها کردن بازی
STR_SORT_ORDER_TIP :{BLACK}انتخاب طرز مرتب کردن (نزولی/صعودی)
STR_SORT_CRITERIA_TIP :{BLACK}انتخاب معیار مرتب کردن
-
+STR_FILTER_CRITERIA_TIP :{BLACK}انتخاب معیار پایش
+STR_SORT_BY :{BLACK}مرتب کردن بر اساس
+
+STR_SORT_BY_POPULATION :{BLACK}جمعیت
+STR_SORT_BY_PRODUCTION :تولید
+STR_SORT_BY_TYPE :نوع
+STR_SORT_BY_TRANSPORTED :منتقل شده
+STR_SORT_BY_NAME :{BLACK}نام
+STR_SORT_BY_DROPDOWN_NAME :نام
+STR_SORT_BY_DATE :{BLACK}تاریخ
+STR_SORT_BY_NUMBER :تعداد
+STR_SORT_BY_PROFIT_LAST_YEAR :سود در سال گذشته
+STR_SORT_BY_PROFIT_THIS_YEAR :سود در سال جاری
+STR_SORT_BY_AGE :سن
+STR_SORT_BY_RELIABILITY :قابلیت اعتماد
+STR_SORT_BY_TOTAL_CAPACITY_PER_CARGOTYPE :بر حسب ظرفیت کل هر محموله
+STR_SORT_BY_MAX_SPEED :سرعت حداکثر
+STR_SORT_BY_MODEL :مدل
+STR_SORT_BY_VALUE :قیمت
+STR_SORT_BY_LENGTH :طول
+STR_SORT_BY_LIFE_TIME :عمر مفید باقی مانده
+STR_SORT_BY_FACILITY :نوع ایستگاه
+STR_SORT_BY_WAITING :ارزش محموله ی درانتظار
+STR_SORT_BY_RATING_MAX :حداکثر نرخ محموله
+STR_SORT_BY_RATING_MIN :کمترین نرخ محموله
+STR_ENGINE_SORT_ENGINE_ID :شناسه موتور
+STR_ENGINE_SORT_COST :قیمت
+STR_ENGINE_SORT_POWER :توان
+STR_ENGINE_SORT_INTRO_DATE :تاریخ احداث
+STR_ENGINE_SORT_RUNNING_COST :هزینه کارکرد
+STR_ENGINE_SORT_POWER_VS_RUNNING_COST :توان/هزینه کارکرد
+STR_ENGINE_SORT_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_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 :بهمن
@@ -336,9 +384,12 @@ 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}-
STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}متوقف کردن بازی
STR_TOOLBAR_TOOLTIP_SAVE_GAME_ABANDON_GAME :{BLACK}ذخیره بازی، ترک بازی، خروج از بازی
-STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_STATIONS :{BLACK}لیست ایستگاه های شرکت ها را نشان می دهد
+STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_STATIONS :{BLACK}نمایش لیست ایستگاه های شرکت
STR_TOOLBAR_TOOLTIP_DISPLAY_MAP :{BLACK}نقشه، پنجره اضافی یا لیست علامت ها را نشان می دهد
STR_TOOLBAR_TOOLTIP_DISPLAY_MAP_TOWN_DIRECTORY :{BLACK}نقشه، لیست شهر ها را نشان می دهد
STR_TOOLBAR_TOOLTIP_DISPLAY_TOWN_DIRECTORY :{BLACK}لیست شهرها را نشان می دهد
@@ -346,12 +397,12 @@ STR_TOOLBAR_TOOLTIP_DISPLAY_COMPANY_FINANCES :{BLACK}اطلا
STR_TOOLBAR_TOOLTIP_DISPLAY_COMPANY_GENERAL :{BLACK}توضیحات کلی راجع به شرکت را نشان می دهد
STR_TOOLBAR_TOOLTIP_DISPLAY_GRAPHS :{BLACK}نمودار ها را نشان می دهد
STR_TOOLBAR_TOOLTIP_DISPLAY_COMPANY_LEAGUE :{BLACK}جدول رده بندی شرکت ها را نشان می دهد
-STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_TRAINS :{BLACK}لیست قطار های شرکت ها را نشان می دهد
-STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_ROAD_VEHICLES :{BLACK}لیست ماشین های شرکت را نشان می دهد
-STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_SHIPS :{BLACK}لیست کشتی های شرکت را نشان می دهد
-STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_AIRCRAFT :{BLACK}لیست هواپیماهای شرکت را نشان می دهد
-STR_TOOLBAR_TOOLTIP_ZOOM_THE_VIEW_IN :{BLACK}تصویر را بزرگ می کند
-STR_TOOLBAR_TOOLTIP_ZOOM_THE_VIEW_OUT :{BLACK}تصویر را کوچک می کند
+STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_TRAINS :{BLACK}نمایش لیست قطار های شرکت
+STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_ROAD_VEHICLES :{BLACK}نمایش لیست ماشین های شرکت
+STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_SHIPS :{BLACK}نمایش لیست کشتی های شرکت
+STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_AIRCRAFT :{BLACK}نمایش لیست هواپیماهای شرکت
+STR_TOOLBAR_TOOLTIP_ZOOM_THE_VIEW_IN :{BLACK}نمایش نواحی کوچکتر
+STR_TOOLBAR_TOOLTIP_ZOOM_THE_VIEW_OUT :{BLACK}نمایش نواحی بزرگتر
STR_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TRACK :{BLACK}ساخت راه آهن
STR_TOOLBAR_TOOLTIP_BUILD_ROADS :{BLACK}ساخت جاده
STR_TOOLBAR_TOOLTIP_BUILD_SHIP_DOCKS :{BLACK}ساخت اسکله
@@ -835,7 +886,6 @@ STR_TOWN_DESCRIPTION_UNDER_CONSTRUCTION :{STRING} (در
STR_TOWN_BUILDING_NAME_IGLOO_1 :ایگلو
STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1 :خانه-قوری
-
##id 0x2800
STR_LANDSCAPING_MENU_PLANT_TREES :کاشتن درخت
STR_LANDSCAPING_MENU_PLACE_SIGN :قرار دادن علامت
@@ -884,6 +934,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} قبول نمی کند
@@ -1028,6 +1080,7 @@ STR_ERROR_YOU_ALREADY_OWN_IT :{WHITE} قبل
############ These strings may never get a new id, or savegames will break!
##id 0x6000
+##id 0x6020
############ end of savegame specific region!
@@ -1360,7 +1413,6 @@ STR_VEHICLE_DETAILS_CARGO_FROM :{LTBLUE}{CARGO}
STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON :{BLACK}وسیله ی جدید
STR_DEPOT_NO_ENGINE :{BLACK}-
STR_ERROR_TRAIN_TOO_LONG :{WHITE}قطار بسیار طولانی شده
-STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} قطار{P "" s}
STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION :{WHITE}قطار جدید
STR_BUILD_VEHICLE_TRAIN_MONORAIL_CAPTION :{WHITE}قطار جدید مونوریل
@@ -1390,7 +1442,6 @@ STR_ERROR_CAN_T_SELL_RAILROAD_VEHICLE :{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_LIST_TRAIN_LIST_TOOLTIP :{BLACK}قطارها-برای اطلاعات بیشتر روی قطار کلیک کنید
STR_DEPOT_TRAIN_LIST_TOOLTIP :{BLACK}قطارها-برای اطلاعات بیشتر روی قطار کلیک کنید. وسیله را بکشید تا آن را از قطار خارج/وارد کنید
STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP :{BLACK}ساخت قطار جدید
STR_DEPOT_TRAIN_SELL_TOOLTIP :{BLACK}قطار را برای فروش به اینجا بکشید
@@ -1426,7 +1477,8 @@ 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_ERROR_CAN_T_RENAME_TRAIN_TYPE :{WHITE}نمی شود نوع قطار ها را تغییر نام داد...
+STR_CLEAR_TIME :{BLACK}پاک کردن زمان
@@ -1434,7 +1486,6 @@ STR_ERROR_CAN_T_RENAME_TRAIN_TYPE :{WHITE}نمی
##id 0x9000
STR_ERROR_ROAD_VEHICLE_IN_THE_WAY :{WHITE}ماشین در جاده است
-STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} ماشین{P "" s}
STR_DEPOT_ROAD_NEW_VEHICLES_BUTTON :{BLACK}وسایل نقلیه ی جدید
STR_BUILD_VEHICLE_ROAD_CAPTION :{WHITE}ماشین های جدید
STR_BUILD_VEHICLE_ROAD_BUILD_VEHICLE_BUTTON :{BLACK}ساخت وسیله نقلیه
@@ -1462,7 +1513,6 @@ 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}عمل فعلی کشتی - برای شروع/توقف کشتی اینجا کلیک کنید
@@ -1499,7 +1549,6 @@ 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_NEWS_AIRCRAFT_IS_WAITING :{WHITE}{VEHICLE}در آشیانه در حال انتظار است
STR_ERROR_AIRCRAFT_IN_THE_WAY :{WHITE}هواپیما در راه است
@@ -1509,7 +1558,6 @@ 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}برای فروش هواپیما آن را به اینجا بکش
@@ -1558,7 +1606,14 @@ STR_PERFORMANCE_DETAIL_INT :{BLACK}{NUM}
+############ Vehicle lists
+STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP :{BLACK}قطارها-برای اطلاعات بیشتر روی قطار کلیک کنید
+STR_VEHICLE_LIST_SHIP_TOOLTIP :{BLACK}کشتی ها - برای اطلاعات بیشتر روی کشتی کلیک کنید
+STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP :{BLACK}هواپیما - برای اطلاعات بیشتر روی هواپیما کلیک کنید
+STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} قطار{P "" s}
+STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} ماشین{P "" s}
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} هواپیما
### depot strings
@@ -1566,7 +1621,6 @@ STR_PERFORMANCE_DETAIL_INT :{BLACK}{NUM}
-
STR_AIRCRAFT_NOT_AVAILABLE :{WHITE}هواپیما در دسترس نیست
@@ -1597,18 +1651,30 @@ STR_AIRCRAFT_NOT_AVAILABLE :{WHITE}هواپ
############ Tooltip measurment
-############ Date formatting
-########
+##### Mass Order
+
-##### Mass Order
+#### String control codes and their formatting
+STR_INDUSTRY_NAME :{INDUSTRY}
+STR_STATION_NAME :{STATION}
+STR_TOWN_NAME :{TOWN}
+STR_WAYPOINT_NAME :{WAYPOINT}
+STR_JUST_DATE_SHORT :{DATE_SHORT}
+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}
#### Improved sign GUI
@@ -1650,15 +1716,70 @@ STR_AI_RESET :{BLACK}بازن
STR_AI_HUMAN_PLAYER :بازیکن آدمیزاد
STR_AI_RANDOM_AI :انتخاب هوش مصنوعی به صورت اتفاقی
STR_AI_SETTINGS_CAPTION :{WHITE}پارامترهای هوش مصنوعی
+STR_AI_VERSION :{BLACK}نسخه: {NUM}
+STR_AI_URL :{BLACK}آدرس اینترنتی: {STRING}
########
############ town controlled noise level
########
############ Downloading of content from the central server
-
-
-
+STR_CONTENT_NO_ZLIB :{WHITE}نرم افزار OpenTTD بدون استفاده از پشتیبانی "zlib" ساخته شده است
+STR_CONTENT_NO_ZLIB_SUB :{WHITE}... امکان دانلود این محتوی وجود ندارد!
+STR_CONTENT_TYPE_BASE_GRAPHICS :گرافیک پایه
+STR_CONTENT_TYPE_NEWGRF :NewGRF
+STR_CONTENT_TYPE_AI :هوش مصنوعی
+STR_CONTENT_TYPE_AI_LIBRARY :مجموعه ماخذ AI
+STR_CONTENT_TYPE_SCENARIO :سناریو
+STR_CONTENT_TYPE_HEIGHTMAP :نقشه
+STR_CONTENT_TITLE :{WHITE} در حال دانلود
+STR_CONTENT_TYPE_CAPTION :{BLACK}نوع
+STR_CONTENT_TYPE_CAPTION_TIP :{BLACK}نوع محتوی
+STR_CONTENT_NAME_CAPTION :{BLACK}نام
+STR_CONTENT_NAME_CAPTION_TIP :{BLACK}نام محتوی
+STR_CONTENT_MATRIX_TIP :{BLACK}برای مشاهده ی جزئیات روی خط کلیک کنید {}برای اتنخاب برای دانلود روی چک باکس کلیک کنید
+STR_CONTENT_SELECT_ALL_CAPTION :{BLACK}انتخاب تمامی موارد
+STR_CONTENT_SELECT_ALL_CAPTION_TIP :{BLACK}علامت گذاری تمامی موارد را برای دانلود
+STR_CONTENT_SELECT_UPDATES_CAPTION :{BLACK}انتخاب موارد ارتقاع
+STR_CONTENT_SELECT_UPDATES_CAPTION_TIP :{BLACK} علامت گذاری برای دانلود ِ تمام مواردی که برای ارتقاع محتوی موجود لازم می باشد
+STR_CONTENT_UNSELECT_ALL_CAPTION :{BLACK}پاک کردن تمام انتخاب ها
+STR_CONTENT_UNSELECT_ALL_CAPTION_TIP :{BLACK}علامت گذاری تمامی موارد را برای عدم دانلود
+STR_CONTENT_FILTER_OSKTITLE :{BLACK}وارد کردن رشته پایش
+STR_CONTENT_FILTER_TIP :{BLACK}وارد کردن واژه کلیدی برای پایش لیست
+STR_CONTENT_FILTER_TITLE :{BLACK}برچسب/پایش بر اساس نام
+STR_CONTENT_DOWNLOAD_CAPTION :{BLACK}دانلود
+STR_CONTENT_DOWNLOAD_CAPTION_TIP :{BLACK}شروع به دانلود موارد انتخاب شده
+STR_CONTENT_TOTAL_DOWNLOAD_SIZE :{SILVER}حجم کل دانلود: {WHITE}{BYTES}
+STR_CONTENT_DETAIL_TITLE :{SILVER}اطلاعات محتوی
+STR_CONTENT_DETAIL_SUBTITLE_UNSELECTED :{SILVER} شما این گزینه را برای دانلود انتخاب نکرده اید
+STR_CONTENT_DETAIL_SUBTITLE_SELECTED :{SILVER}شما این گزینه را برای دانلود انتخاب کرده اید
+STR_CONTENT_DETAIL_SUBTITLE_AUTOSELECTED :{SILVER}این پیوست برای دانلود انتخاب شده است
+STR_CONTENT_DETAIL_SUBTITLE_ALREADY_HERE :{SILVER}شما این را از قبل داشته اید
+STR_CONTENT_DETAIL_SUBTITLE_DOES_NOT_EXIST :{SILVER}این محتوی ناشناخته است و قابلیت دانلود در OpenTTD را ندارد
+STR_CONTENT_DETAIL_UPDATE :{SILVER}این مورد جایگزینی برای گزینه ی موجود است {STRING}
+STR_CONTENT_DETAIL_NAME :{SILVER}نام:{WHITE}{STRING}
+STR_CONTENT_DETAIL_VERSION :{SILVER}نسخه: {WHITE}{STRING}
+STR_CONTENT_DETAIL_DESCRIPTION :{SILVER}شرح: {WHITE}{STRING}
+STR_CONTENT_DETAIL_URL :{SILVER}آدرس اینترنتی: {WHITE}{STRING}
+STR_CONTENT_DETAIL_TYPE :{SILVER}نوع: {WHITE}{STRING}
+STR_CONTENT_DETAIL_FILESIZE :{SILVER}جحم دانلود: {BYTES}{WHITE}
+STR_CONTENT_DETAIL_SELECTED_BECAUSE_OF :{SILVER}دلیل انتخاب: {STRING}{WHITE}
+STR_CONTENT_DETAIL_DEPENDENCIES :{SILVER}وابستگی ها: {WHITE}{STRING}
+STR_CONTENT_DETAIL_TAGS :{SILVER}برچسب ها: {WHITE}{STRING}
+
+STR_CONTENT_DOWNLOAD_TITLE :{WHITE}در حال دانلود...
+STR_CONTENT_DOWNLOAD_INITIALISE :{WHITE}در حال درخواست فایل...
+STR_CONTENT_DOWNLOAD_FILE :{WHITE}دانلود شده {STRING} ({NUM} of {NUM})
+STR_CONTENT_DOWNLOAD_COMPLETE :{WHITE}اتمام دانلود
+STR_CONTENT_DOWNLOAD_PROGRESS_SIZE :{WHITE}{BYTES} از {BYTES} دانلود شده ({NUM} %)
+
+STR_CONTENT_ERROR_COULD_NOT_CONNECT :{WHITE}امکان برقراری ارتباط با سرور ممکن نیست...
+STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD :{WHITE}دانلود ناموفق بود...
+STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_CONNECTION_LOST :{WHITE}... ارتباط از بین رفت
+STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_FILE_NOT_WRITABLE :{WHITE}... فایل قابلیت درج ندارد
+STR_CONTENT_ERROR_COULD_NOT_EXTRACT :{WHITE}بازگشایی فایل دانلود شده ممکن نیست
+
+STR_CONTENT_INTRO_BUTTON :{BLACK}چک کردن محتوی آنلاین
STR_CONTENT_INTRO_BUTTON_TIP :{BLACK}بررسی وجود مجموعه ها و به روز رسانی های جدید در اینترنت
STR_CONTENT_INTRO_MISSING_BUTTON :{BLACK}یافتن مجموعه ای که کم است در اینترنت
STR_CONTENT_INTRO_MISSING_BUTTON_TIP :{BLACK} بررسی اینکه آیا مجموعه ای که کم است در اینترنت یافت می شود یا نه
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-11-27 09:26:19 +0000