summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/lang/danish.txt153
-rw-r--r--src/lang/french.txt74
-rw-r--r--src/lang/galician.txt111
-rw-r--r--src/lang/german.txt74
-rw-r--r--src/lang/russian.txt98
-rw-r--r--src/lang/serbian.txt67
6 files changed, 315 insertions, 262 deletions
diff --git a/src/lang/danish.txt b/src/lang/danish.txt
index 608ca8d81..1933a35d3 100644
--- a/src/lang/danish.txt
+++ b/src/lang/danish.txt
@@ -624,7 +624,7 @@ STR_TERRAFORM_TOOLTIP_PLACE_ROCKY_AREAS_ON_LANDSCAPE :{BLACK}Placér
STR_TERRAFORM_TOOLTIP_PLACE_LIGHTHOUSE :{BLACK}Placér fyrtårn
STR_TERRAFORM_TOOLTIP_PLACE_TRANSMITTER :{BLACK}Placér sender
STR_TERRAFORM_TOOLTIP_DEFINE_DESERT_AREA :{BLACK}Definer ørkenområde.{}Hold CTRL nede for at fjerne det
-STR_CREATE_LAKE :{BLACK}Definer vandområde.{}Lav en kanal, med mindre CTRL-tasten holdes ved havniveau, hvorved omgivelserne oversvømmes i stedet
+STR_CREATE_LAKE :{BLACK}Definer vandområde.{}Lav en kanal, med mindre CTRL-tasten bruges ved havniveau, da omgivelserne i stedet vil blive oversvømmet
STR_CREATE_RIVER :{BLACK}Placér floder.
STR_TOWN_VIEW_DELETE_BUTTON :{BLACK}Slet
STR_TOWN_VIEW_DELETE_TOOLTIP :{BLACK}Slet denne by fuldstændigt
@@ -762,9 +762,6 @@ STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :Finansiér ny i
############ range ends here
STR_FUND_INDUSTRY_CAPTION :{WHITE}Finansiér 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 regnskovsområder
STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT :{WHITE}...kan kun bygges i ørkenområder
STR_STATUSBAR_PAUSED :{YELLOW}* * PAUSE * *
@@ -806,7 +803,7 @@ STR_TOWNNAME_CATALAN :Catalanske
############ end of townname region
STR_CURR_GBP :Pund (£)
-STR_CURR_USD :Dollar ($)
+STR_CURR_USD :Dollars ($)
STR_CURR_EUR :Euro (€)
STR_CURR_YEN :Yen (¥)
STR_CURR_ATS :Østrisk Shilling (ATS)
@@ -1197,7 +1194,6 @@ STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Vælg ud
STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT}
STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT}
-STR_WAYPOINT_NAME :{WAYPOINT}
STR_EDIT_WAYPOINT_NAME :{WHITE}Omdøb kontrolsted
STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}Kan ikke omdøbe kontrolsted...
@@ -1312,14 +1308,14 @@ STR_NETWORK_YEARS_CAPTION :{BLACK}År
STR_NETWORK_YEARS_CAPTION_TIP :{BLACK}Antallet af år{}spillet varer
STR_NETWORK_GAME_INFO :{SILVER}SPIL INFO
-STR_NETWORK_CLIENTS :{SILVER}Klienter: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
-STR_NETWORK_LANGUAGE :{SILVER}Sprog: {WHITE}{STRING}
-STR_NETWORK_TILESET :{SILVER}Klima: {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE :{SILVER}Størrelse: {WHITE}{COMMA}x{COMMA}
-STR_NETWORK_SERVER_VERSION :{SILVER}Server version: {WHITE}{STRING}
-STR_NETWORK_SERVER_ADDRESS :{SILVER}Serveradresse: {WHITE}{STRING}
-STR_NETWORK_START_DATE :{SILVER}Start dato: {WHITE}{DATE_SHORT}
-STR_NETWORK_CURRENT_DATE :{SILVER}Nuværende dato: {WHITE}{DATE_SHORT}
+STR_NETWORK_CLIENTS :{SILVER}Klienter: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
+STR_NETWORK_LANGUAGE :{SILVER}Sprog: {WHITE}{STRING}
+STR_NETWORK_TILESET :{SILVER}Klima: {WHITE}{STRING}
+STR_NETWORK_MAP_SIZE :{SILVER}Størrelse: {WHITE}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_VERSION :{SILVER}Server version: {WHITE}{STRING}
+STR_NETWORK_SERVER_ADDRESS :{SILVER}Serveradresse: {WHITE}{STRING}
+STR_NETWORK_START_DATE :{SILVER}Start dato: {WHITE}{DATE_SHORT}
+STR_NETWORK_CURRENT_DATE :{SILVER}Nuværende dato: {WHITE}{DATE_SHORT}
STR_NETWORK_PASSWORD :{SILVER}Beskyttet af kodeord!
STR_NETWORK_SERVER_OFFLINE :{SILVER}SERVEREN ER OFFLINE
STR_NETWORK_SERVER_FULL :{SILVER}SERVEREN ER FULD
@@ -1401,7 +1397,7 @@ STR_NETWORK_LANG_LATVIAN :Lettisk
STR_NETWORK_GAME_LOBBY :{WHITE}Netværksspils lobby
-STR_NETWORK_PREPARE_TO_JOIN :{BLACK}Forbereder tilslutning: {ORANGE}{STRING}
+STR_NETWORK_PREPARE_TO_JOIN :{BLACK}Forbereder tilslutning: {ORANGE}{STRING}
STR_NETWORK_COMPANY_LIST_TIP :{BLACK}En liste over alle selskaber i spillet lige nu. Du kan enten tilslutte dig et eller starte et nyt, hvis der er plads til flere selskaber
STR_NETWORK_NEW_COMPANY :{BLACK}Nyt selskab
STR_NETWORK_NEW_COMPANY_TIP :{BLACK}Opret et nyt selskab
@@ -1414,16 +1410,16 @@ STR_NETWORK_REFRESH_TIP :{BLACK}Genopfri
STR_NETWORK_COMPANY_INFO :{SILVER}SELSKABSINFO
-STR_NETWORK_COMPANY_NAME :{SILVER}Selskabsnavn: {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR :{SILVER}Grundlagt: {WHITE}{NUM}
-STR_NETWORK_VALUE :{SILVER}Virksomhedens værdi: {WHITE}{CURRENCY}
-STR_NETWORK_CURRENT_BALANCE :{SILVER}Nuværende beholdning: {WHITE}{CURRENCY}
-STR_NETWORK_LAST_YEARS_INCOME :{SILVER}Sidste års indtægt: {WHITE}{CURRENCY}
-STR_NETWORK_PERFORMANCE :{SILVER}Præstation: {WHITE}{NUM}
+STR_NETWORK_COMPANY_NAME :{SILVER}Selskabsnavn: {WHITE}{STRING}
+STR_NETWORK_INAUGURATION_YEAR :{SILVER}Grundlagt: {WHITE}{NUM}
+STR_NETWORK_VALUE :{SILVER}Virksomhedens værdi: {WHITE}{CURRENCY}
+STR_NETWORK_CURRENT_BALANCE :{SILVER}Nuværende beholdning: {WHITE}{CURRENCY}
+STR_NETWORK_LAST_YEARS_INCOME :{SILVER}Sidste års indtægt: {WHITE}{CURRENCY}
+STR_NETWORK_PERFORMANCE :{SILVER}Præstation: {WHITE}{NUM}
-STR_NETWORK_VEHICLES :{SILVER}Køretøjer: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_STATIONS :{SILVER}Stationer: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_PLAYERS :{SILVER}Spillere: {WHITE}{STRING}
+STR_NETWORK_VEHICLES :{SILVER}Køretøjer: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_STATIONS :{SILVER}Stationer: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_PLAYERS :{SILVER}Spillere: {WHITE}{STRING}
STR_NETWORK_CONNECTING :{WHITE}Tilslutter...
@@ -1451,22 +1447,22 @@ STR_NETWORK_COMPANY_LIST_SPECTATE :{WHITE}Tilslut
STR_NETWORK_COMPANY_LIST_NEW_COMPANY :{WHITE}Nyt firma
STR_NETWORK_ERR_NOTAVAILABLE :{WHITE} Ingen netværksheder fundet eller kompilet uden ENABLE_NETWORK
-STR_NETWORK_ERR_NOSERVER :{WHITE} Kunne ikke finde nogen netværksspil
-STR_NETWORK_ERR_NOCONNECTION :{WHITE} Serveren besvarede ikke denne forspørgsel
-STR_NETWORK_ERR_NEWGRF_MISMATCH :{WHITE} Kunne ikke tilslutte grundet NewGRF ulighed
-STR_NETWORK_ERR_DESYNC :{WHITE} Netværks synkroniseringsfejl
-STR_NETWORK_ERR_LOSTCONNECTION :{WHITE} Netværksforbindelse mistet
-STR_NETWORK_ERR_SAVEGAMEERROR :{WHITE} Kunne ikke hente gemt spil
-STR_NETWORK_ERR_SERVER_START :{WHITE} Kunne ikke starte serveren
-STR_NETWORK_ERR_CLIENT_START :{WHITE} Kunne ikke forbinde
-STR_NETWORK_ERR_TIMEOUT :{WHITE} Forbindelsen #{NUM} svarer ikke
-STR_NETWORK_ERR_SERVER_ERROR :{WHITE} Der opstod en protokol-fejl og forbindelse blev lukket
-STR_NETWORK_ERR_WRONG_REVISION :{WHITE} Revisionen af denne klient passer ikke sammen med serverens revision
-STR_NETWORK_ERR_WRONG_PASSWORD :{WHITE} Forkert kodeord
-STR_NETWORK_ERR_SERVER_FULL :{WHITE} Serveren er fuld
-STR_NETWORK_ERR_SERVER_BANNED :{WHITE} Du har forbud mod at bruge denne server
-STR_NETWORK_ERR_KICKED :{WHITE} Du blev smidt ud af spillet
-STR_NETWORK_ERR_CHEATER :{WHITE} Snyderi er ikke tilladt på denne server
+STR_NETWORK_ERR_NOSERVER :{WHITE}Kunne ikke finde nogen netværksspil
+STR_NETWORK_ERR_NOCONNECTION :{WHITE}Serveren besvarede ikke denne forspørgsel
+STR_NETWORK_ERR_NEWGRF_MISMATCH :{WHITE}Kunne ikke tilslutte grundet NewGRF ulighed
+STR_NETWORK_ERR_DESYNC :{WHITE}Netværks synkroniseringsfejl
+STR_NETWORK_ERR_LOSTCONNECTION :{WHITE}Netværksforbindelse mistet
+STR_NETWORK_ERR_SAVEGAMEERROR :{WHITE}Kunne ikke hente gemt spil
+STR_NETWORK_ERR_SERVER_START :{WHITE}Kunne ikke starte serveren
+STR_NETWORK_ERR_CLIENT_START :{WHITE}Kunne ikke forbinde
+STR_NETWORK_ERR_TIMEOUT :{WHITE}Forbindelsen #{NUM} svarer ikke
+STR_NETWORK_ERR_SERVER_ERROR :{WHITE}Der opstod en protokol-fejl og forbindelse blev lukket
+STR_NETWORK_ERR_WRONG_REVISION :{WHITE}Revisionen af denne klient passer ikke sammen med serverens revision
+STR_NETWORK_ERR_WRONG_PASSWORD :{WHITE}Forkert kodeord
+STR_NETWORK_ERR_SERVER_FULL :{WHITE}Serveren er fuld
+STR_NETWORK_ERR_SERVER_BANNED :{WHITE}Du har forbud mod at bruge denne server
+STR_NETWORK_ERR_KICKED :{WHITE}Du blev smidt ud af spillet
+STR_NETWORK_ERR_CHEATER :{WHITE}Snyderi er ikke tilladt på denne server
############ Leave those lines in this order!!
STR_NETWORK_ERR_CLIENT_GENERAL :generel fejl
@@ -1479,7 +1475,7 @@ STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED :ikke autorisere
STR_NETWORK_ERR_CLIENT_NOT_EXPECTED :modtog en underlig pakke
STR_NETWORK_ERR_CLIENT_WRONG_REVISION :forkert revision
STR_NETWORK_ERR_CLIENT_NAME_IN_USE :navnet er allerede i brug
-STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD :forkert spil password
+STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD :forkert spil kodeord
STR_NETWORK_ERR_CLIENT_COMPANY_MISMATCH :forkert firma-id i DoCommand
STR_NETWORK_ERR_CLIENT_KICKED :smidt ud af serveren
STR_NETWORK_ERR_CLIENT_CHEATER :prøvede at snyde
@@ -1532,7 +1528,7 @@ STR_NETWORK_SEND :{BLACK}Send
##### PNG-MAP-Loader
-STR_PNGMAP_ERROR :{WHITE}Kan ikke hente billedet fra PNG...
+STR_PNGMAP_ERROR :{WHITE}Kan ikke hente landskab fra PNG...
STR_PNGMAP_ERR_FILE_NOT_FOUND :{WHITE}...filen blev ikke fundet.
STR_PNGMAP_ERR_IMAGE_TYPE :{WHITE}...kan ikke konvertere billedtype. Der skal bruges 8 eller 24-bit PNG.
STR_PNGMAP_ERR_MISC :{WHITE}...noget gik galt. Undskyld (Måske en ødelagt fil)
@@ -1778,11 +1774,6 @@ STR_TOWN_BUILDING_NAME_TEPEES_1 :Tipi
STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1 :Tepottehus
STR_TOWN_BUILDING_NAME_PIGGY_BANK_1 :Sparegris
-STR_INDUSTRY_NAME :{INDUSTRY}
-STR_TOWN_NAME :{TOWN}
-STR_FORMAT_INDUSTRY_NAME :{TOWN} {STRING}
-STR_STATION_NAME :{STATION}
-
##id 0x2800
STR_LANDSCAPING_MENU_LANDSCAPING :Landskabsværktøjer
STR_LANDSCAPING_MENU_PLANT_TREES :Plant træer
@@ -1837,6 +1828,12 @@ STR_CARGO_RATING_EXCELLENT :Fortrinlig
STR_CARGO_RATING_OUTSTANDING :Enestående
############ range for rating ends
+### station view strings
+STR_SCHEDULED_TRAINS_TIP :{BLACK}Vis alle toge, som har denne station i deres ruteplan
+STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Vis alle køretøjer, som har denne station i deres ruteplan
+STR_SCHEDULED_AIRCRAFT_TIP :{BLACK}Vis alle fly, som har denne lufthavn i deres ruteplan
+STR_SCHEDULED_SHIPS_TIP :{BLACK}Vis alle skibe, som har denne station i deres ruteplan
+
STR_STATION_VIEW_CARGO_RATING :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}{STATION} accepterer ikke længere {STRING}
STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION} accepterer ikke længere {STRING} eller {STRING}
@@ -2171,7 +2168,6 @@ STR_CITY_APPROVAL_HOSTILE :Fjendtlig
##id 0x7000
STR_COMPANY_VIEW_CAPTION :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
-STR_FORMAT_COMPANY_NUM :(Firma {COMMA})
STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Nyt ansigt
STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON :{BLACK}Farvetema
STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE :{GOLD}Farvetema:
@@ -2204,7 +2200,6 @@ STR_FINANCES_TOTAL_CAPTION :{WHITE}Total:
STR_COMPANY_NAME_COMPANY_NUM :{COMPANY} {COMPANYNUM}
STR_GRAPH_INCOME_CAPTION :{WHITE}Graf over indkomst
STR_CURRCOMPACT :{CURRCOMPACT}
-STR_JUST_COMMA :{COMMA}
STR_GRAPH_OPERATING_PROFIT_CAPTION :{WHITE}Graf over afkast
STR_FINANCES_BANK_BALANCE_TITLE :{WHITE}Bank balance
STR_FINANCES_LOAN_TITLE :{WHITE}Lån
@@ -2716,7 +2711,6 @@ STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON :{BLACK}Nye kør
STR_DEPOT_NO_ENGINE :{BLACK}-
STR_ERROR_TRAIN_TOO_LONG :{WHITE}Toget er for langt
STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT :{WHITE}Tog kan kun ændres når de er stoppet i en remise
-STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} Tog
STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION :{WHITE}Nye jernbanekøretøjer
STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION :{WHITE}Nyt elektrisk lokomotiv
@@ -2774,7 +2768,6 @@ STR_ERROR_UNABLE_TO_FIND_ROUTE_TO :{WHITE}Kan ikke
STR_ERROR_CAN_T_STOP_START_TRAIN :{WHITE}Kan ikke stoppe/starte toget...
STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS :{BLACK}Serviceinterval: {LTBLUE}{COMMA}dage{BLACK} Sidste service: {LTBLUE}{DATE_LONG}
STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT :{BLACK}Serviceinterval: {LTBLUE}{COMMA}%{BLACK} Sidste service: {LTBLUE}{DATE_LONG}
-STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP :{BLACK}Tog - klik på et tog for information
STR_DEPOT_TRAIN_LIST_TOOLTIP :{BLACK}Tog - klik på et tog for information., træk vogn/lokomotiv for at fjerne/tilføje det til toget
STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP :{BLACK}Byg nyt tog/togvogn
STR_DEPOT_TRAIN_SELL_TOOLTIP :{BLACK}Træk tog/togvogn her hen for at sælge
@@ -2827,6 +2820,8 @@ STR_ERROR_CAN_T_RENAME_TRAIN :{WHITE}Kan ikke
STR_VEHICLE_DETAILS_TRAIN_RENAME :{BLACK}Giv toget et navn
STR_NEWS_TRAIN_CRASH :{BLACK}{BIGFONT}Tog forulykket!{}{COMMA} døde i flammerne efter kollision
STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN :{WHITE}Kan ikke vende retningen af toget...
+STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE :{WHITE}Kan ikke vende køretøjet om...
+STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS :{WHITE}Kan ikke vende et køretøj, der består af flere enheder
STR_QUERY_RENAME_TRAIN_TYPE_CAPTION :{WHITE}Omdøb tog-/togvognstypen
STR_ERROR_CAN_T_RENAME_TRAIN_TYPE :{WHITE}Kan ikke omdøbe tog-/togvognstypen...
STR_CLEAR_TIME :{BLACK}Nulstil tid
@@ -2861,7 +2856,6 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP :{BLACK}Udfyld a
##id 0x9000
STR_ERROR_ROAD_VEHICLE_IN_THE_WAY :{WHITE}Køretøj i vejen
-STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} Køretøj{P "" er}
STR_DEPOT_ROAD_CAPTION :{WHITE}{TOWN} værksted
STR_DEPOT_ROAD_NEW_VEHICLES_BUTTON :{BLACK}Nye køretøjer
STR_BUILD_VEHICLE_ROAD_CAPTION :{WHITE}Nye køretøjer
@@ -2877,7 +2871,6 @@ STR_HEADING_FOR_ROAD_DEPOT_SERVICE :{LTBLUE}Service
STR_HEADING_FOR_ROAD_DEPOT_SERVICE_VEL :{LTBLUE}Service på {TOWN} værksted, {VELOCITY}
STR_ERROR_CAN_T_SEND_VEHICLE_TO_DEPOT :{WHITE}Kan ikke sende køretøj til værksted...
STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT :{WHITE}Kan ikke finde lokalt værksted
-STR_VEHICLE_LIST_ROAD_TOOLTIP :{BLACK}Køretøjer - klik på et køretøj for information
STR_VEHICLE_VIEW_ROAD_STATE_START_STOP_TOOLTIP :{BLACK}Nuværende opførsel - klik her for at stoppe/starte køretøjet
STR_VEHICLE_VIEW_ROAD_ORDERS_TOOLTIP :{BLACK}Vis køretøjets ordrer
STR_VEHICLE_VIEW_ROAD_LOCATION_TOOLTIP :{BLACK}Centrer skærmen over køretøjets lokalitet
@@ -2905,7 +2898,7 @@ STR_NEWS_FIRST_ROAD_PASSENGER_TRAM_ARRIVAL :{BLACK}{BIGFONT
STR_NEWS_FIRST_ROAD_CARGO_TRAM_ARRIVAL :{BLACK}{BIGFONT}Indbyggerne fester . . .{}Første fragt-sporvogn ankommer til {STATION}!
STR_NEWS_ROAD_CRASH_DRIVER :{BLACK}{BIGFONT}Lastbil forulykket!{}Chauffør dør i flammerne efter sammenstød med tog
STR_NEWS_ROAD_CRASH :{BLACK}{BIGFONT}Bus forulykket!{}{COMMA} dør i flammerne efter kollision med et tog
-STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS :{WHITE}Kan ikke vende et køretøj, der består af flere enheder
+STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN :{WHITE}Tillader ikke køretøjer at vende om...
STR_BUILD_VEHICLE_ROAD_RENAME_BUTTON :{BLACK}Omdøb
STR_BUILD_VEHICLE_ROAD_RENAME_TOOLTIP :{BLACK}Omdøb køretøjstypen
STR_QUERY_RENAME_ROAD_TYPE_CAPTION :{WHITE}Omdøb køretøjstypen
@@ -2924,7 +2917,6 @@ STR_WATERWAYS_TOOLBAR_CAPTION_SE :{WHITE}Vandveje
STR_ERROR_CAN_T_BUILD_DOCK_HERE :{WHITE}Kan ikke bygge en havn her...
STR_DEPOT_SHIP_CAPTION :{WHITE}{TOWN} skibsdok
STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON :{BLACK}Nye skibe
-STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} Skibe
STR_BUILD_VEHICLE_SHIP_CAPTION :{WHITE}Nye skibe
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON :{BLACK}Byg skib
STR_CLONE_SHIP :{BLACK}Klon skib
@@ -2947,7 +2939,6 @@ STR_DEPOT_SHIP_LIST_TOOLTIP :{BLACK}Skibe -
STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP :{BLACK}Byg nyt skib
STR_DEPOT_SHIP_SELL_TOOLTIP :{BLACK}Træk det her for at sælge det
STR_DEPOT_SHIP_LOCATION_TOOLTIP :{BLACK}Centrer skærmen over skibsdokkens lokalitet
-STR_VEHICLE_LIST_SHIP_TOOLTIP :{BLACK}Skibe - klik på et skib for information
STR_BUILD_VEHICLE_SHIP_LIST_TOOLTIP :{BLACK}Skibstypeliste - klik på skibstype for information
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP :{BLACK}Byg det markerede skib
STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Nuværende opførsel - klik her for at starte/stoppe skibet
@@ -2989,7 +2980,6 @@ STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}Dette vi
STR_BUILD_VEHICLE_AIRCRAFT_CAPTION :{WHITE}Nyt fly
STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON :{BLACK}Byg et fly
STR_ERROR_CAN_T_BUILD_AIRCRAFT :{WHITE}Kan ikke bygge fly...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} Fly
STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR :{WHITE}Kan ikke sende flyet til en hangar...
STR_HEADING_FOR_HANGAR :{ORANGE}Flyver til {STATION} hangar
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Flyver til {STATION} hangar, {VELOCITY}
@@ -3003,7 +2993,6 @@ STR_ERROR_AIRCRAFT_MUST_BE_STOPPED :{WHITE}Flyet sk
STR_ERROR_CAN_T_SELL_AIRCRAFT :{WHITE}Kan ikke sælge flyet...
STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :Lufthavnskonstruktion
STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP :{BLACK}Byg en lufthavn
-STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP :{BLACK}Fly - klik på et fly for information
STR_DEPOT_AIRCRAFT_LIST_TOOLTIP :{BLACK}Fly - klik på et fly for information
STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP :{BLACK}Byg nyt fly
STR_DEPOT_AIRCRAFT_SELL_TOOLTIP :{BLACK}Træk fly her hen for at sælge
@@ -3185,11 +3174,16 @@ STR_LORRY :{BLACK}{LORRY}
STR_PLANE :{BLACK}{PLANE}
STR_SHIP :{BLACK}{SHIP}
+############ Vehicle lists
+STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP :{BLACK}Tog - klik på et tog for information
+STR_VEHICLE_LIST_ROAD_TOOLTIP :{BLACK}Køretøjer - klik på et køretøj for information
+STR_VEHICLE_LIST_SHIP_TOOLTIP :{BLACK}Skibe - klik på et skib for information
+STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP :{BLACK}Fly - klik på et fly for information
-STR_SCHEDULED_TRAINS_TIP :{BLACK}Vis alle toge, som har denne station i deres ruteplan
-STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Vis alle køretøjer, som har denne station i deres ruteplan
-STR_SCHEDULED_AIRCRAFT_TIP :{BLACK}Vis alle fly, som har denne lufthavn i deres ruteplan
-STR_SCHEDULED_SHIPS_TIP :{BLACK}Vis alle skibe, som har denne station i deres ruteplan
+STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} Tog
+STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} Køretøj{P "" er}
+STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} Skibe
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} Fly
STR_VEH_WITH_SHARED_ORDERS_LIST :{WHITE}Delte ordrer af {COMMA} transportmid{P del ler}
STR_VEH_WITH_SHARED_ORDERS_LIST_TIP :{BLACK}Vis alle transportmidler, der deler denne ruteplan
@@ -3213,7 +3207,6 @@ STR_DEPOT_AUTOREPLACE_ROADVEH_TIP :{BLACK}Udskift
STR_DEPOT_AUTOREPLACE_SHIP_TIP :{BLACK}Udskift automatisk alle skibe i dokken
STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP :{BLACK}Udskift automatisk alle fly i hangaren
-
STR_REPLACE_VEHICLES_WHITE :{WHITE}Udskift {STRING}
STR_REPLACE_VEHICLES_START :{BLACK}Start udskiftning
STR_REPLACE_VEHICLES_STOP :{BLACK}Stop udskiftning
@@ -3379,17 +3372,6 @@ STR_MEASURE_AREA :{BLACK}Areal: {
STR_MEASURE_LENGTH_HEIGHTDIFF :{BLACK}Længde: {NUM}{}Højdeforskel: {NUM} m
STR_MEASURE_AREA_HEIGHTDIFF :{BLACK}Areal: {NUM} x {NUM}{}Højdeforskel: {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}Værdi af overført gods: {LTBLUE}{CURRENCY}
STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD :{WHITE}...denne vej er ejet af en by
STR_DRIVE_THROUGH_ERROR_DIRECTION :{WHITE}...vejen peger i den forkerte retning
@@ -3414,7 +3396,6 @@ STR_PERCENT_UP_DOWN_SMALL :{TINYFONT}{WHIT
STR_PERCENT_UP_DOWN :{WHITE}{NUM}%{UPARROW}{DOWNARROW}
##### Mass Order
-STR_FORMAT_GROUP_NAME :Gruppe {COMMA}
STR_GROUP_TINY_NAME :{TINYFONT}{GROUP}
STR_GROUP_ALL_TRAINS :Alle toge
STR_GROUP_ALL_ROADS :Alle vejkøretøjer
@@ -3443,12 +3424,34 @@ STR_GROUP_DELETE_TIP :{BLACK}Slet den
STR_GROUP_RENAME_TIP :{BLACK}Omdøb den valgte gruppe
STR_GROUP_REPLACE_PROTECTION_TIP :{BLACK}Klik for at beskytte denne gruppe mod global auto-udskiftning
+#### 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_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}Navnet skal være unikt
diff --git a/src/lang/french.txt b/src/lang/french.txt
index d7f457b6c..a47c57884 100644
--- a/src/lang/french.txt
+++ b/src/lang/french.txt
@@ -763,9 +763,6 @@ STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :Financer une no
############ range ends here
STR_FUND_INDUSTRY_CAPTION :{WHITE}Financer une nouvelle industrie
-STR_JUST_STRING :{STRING}
-STR_JUST_RAW_STRING :{STRING}
-STR_JUST_INT :{NUM}
STR_ERROR_CAN_ONLY_BE_BUILT_IN_RAINFOREST :{WHITE}...peut seulement être construit en forêt tropicale
STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT :{WHITE}...peut seulement être construit dans les endroits désertiques
STR_STATUSBAR_PAUSED :{YELLOW}* * SUSPENDU * *
@@ -1198,7 +1195,6 @@ STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Choisir
STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT}
STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT}
-STR_WAYPOINT_NAME :{WAYPOINT}
STR_EDIT_WAYPOINT_NAME :{WHITE}Modifier nom du point de contrôle
STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}Impossible de modifier le nom du point de contrôle...
@@ -1779,11 +1775,6 @@ STR_TOWN_BUILDING_NAME_TEPEES_1 :Tipis
STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1 :Salon de thé
STR_TOWN_BUILDING_NAME_PIGGY_BANK_1 :Tirelire
-STR_INDUSTRY_NAME :{INDUSTRY}
-STR_TOWN_NAME :{TOWN}
-STR_FORMAT_INDUSTRY_NAME :{TOWN} {STRING}
-STR_STATION_NAME :{STATION}
-
##id 0x2800
STR_LANDSCAPING_MENU_LANDSCAPING :Modification du paysage
STR_LANDSCAPING_MENU_PLANT_TREES :Planter des arbres
@@ -1838,6 +1829,12 @@ STR_CARGO_RATING_EXCELLENT :Excellent
STR_CARGO_RATING_OUTSTANDING :Exceptionnel
############ range for rating ends
+### station view strings
+STR_SCHEDULED_TRAINS_TIP :{BLACK}Afficher les trains ayant cette station dans leurs ordres
+STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Afficher les véhicules routiers ayant cette station dans leurs ordres
+STR_SCHEDULED_AIRCRAFT_TIP :{BLACK}Afficher les aéronefs ayant cette station dans leurs ordres
+STR_SCHEDULED_SHIPS_TIP :{BLACK}Afficher les navires ayant cette station dans leurs ordres
+
STR_STATION_VIEW_CARGO_RATING :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}{STATION} n'accepte plus: {STRING}
STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION} n'accepte plus: {STRING} ou {STRING}
@@ -2172,7 +2169,6 @@ STR_CITY_APPROVAL_HOSTILE :Hostile
##id 0x7000
STR_COMPANY_VIEW_CAPTION :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
-STR_FORMAT_COMPANY_NUM :(Compagnie {COMMA})
STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Nouveau visage
STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON :{BLACK}Couleur
STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE :{GOLD}Couleur:
@@ -2205,7 +2201,6 @@ STR_FINANCES_TOTAL_CAPTION :{WHITE}Total:
STR_COMPANY_NAME_COMPANY_NUM :{COMPANY} {COMPANYNUM}
STR_GRAPH_INCOME_CAPTION :{WHITE}Graphique du Revenu
STR_CURRCOMPACT :{CURRCOMPACT}
-STR_JUST_COMMA :{COMMA}
STR_GRAPH_OPERATING_PROFIT_CAPTION :{WHITE}Graphique du profit d'opération
STR_FINANCES_BANK_BALANCE_TITLE :{WHITE}Equilibre bancaire
STR_FINANCES_LOAN_TITLE :{WHITE}Emprunt
@@ -2717,7 +2712,6 @@ STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON :{BLACK}Nouveaux
STR_DEPOT_NO_ENGINE :{BLACK}-
STR_ERROR_TRAIN_TOO_LONG :{WHITE}Train trop long
STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT :{WHITE}Les trains peuvent être manipulés qu'une fois stoppés au dépôt
-STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} Train{P "" s}
STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION :{WHITE}Nouveaux véhicules ferroviaires
STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION :{WHITE}Nouveaux véhicules ferroviaires électriques
@@ -2775,7 +2769,6 @@ STR_ERROR_UNABLE_TO_FIND_ROUTE_TO :{WHITE}Impossib
STR_ERROR_CAN_T_STOP_START_TRAIN :{WHITE}Impossible de démarrer/stopper le train...
STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS :{BLACK}Intervalle d'entretien: {LTBLUE}{COMMA}jours{BLACK} , dernier le : {LTBLUE}{DATE_LONG}
STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT :{BLACK}Intervalle d'entretien: {LTBLUE}{COMMA}%{BLACK} , dernier le : {LTBLUE}{DATE_LONG}
-STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP :{BLACK}Trains - Cliquer sur un train pour obtenir des informations
STR_DEPOT_TRAIN_LIST_TOOLTIP :{BLACK}Trains - Cliquer sur un train pour obtenir des informations, glisser le wagon pour l'ajouter/le supprimer du train
STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP :{BLACK}Construire un nouveau train/wagon
STR_DEPOT_TRAIN_SELL_TOOLTIP :{BLACK}Glisser le véhicule ici pour le vendre
@@ -2864,7 +2857,6 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP :{BLACK}Remplit
##id 0x9000
STR_ERROR_ROAD_VEHICLE_IN_THE_WAY :{WHITE}Véhicule Routier présent
-STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} Véhicule{P "" s} routier{P "" s}
STR_DEPOT_ROAD_CAPTION :{WHITE}Dépôt routier de {TOWN}
STR_DEPOT_ROAD_NEW_VEHICLES_BUTTON :{BLACK}Nouveaux Véhicules
STR_BUILD_VEHICLE_ROAD_CAPTION :{WHITE}Nouveaux véhicules
@@ -2880,7 +2872,6 @@ STR_HEADING_FOR_ROAD_DEPOT_SERVICE :{LTBLUE}Entreti
STR_HEADING_FOR_ROAD_DEPOT_SERVICE_VEL :{LTBLUE}Entretien au dépôt de {TOWN}, {VELOCITY}
STR_ERROR_CAN_T_SEND_VEHICLE_TO_DEPOT :{WHITE}Impossible d'envoyer le véhicule au dépôt...
STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT :{WHITE}Impossible de trouver le dépôt
-STR_VEHICLE_LIST_ROAD_TOOLTIP :{BLACK}Véhicules - Cliquer sur un véhicule pour obtenir des informations
STR_VEHICLE_VIEW_ROAD_STATE_START_STOP_TOOLTIP :{BLACK}Comportement courant du véhicule - cliquer pour le démarrer/l'arrêter
STR_VEHICLE_VIEW_ROAD_ORDERS_TOOLTIP :{BLACK}Afficher les ordres du véhicule routier
STR_VEHICLE_VIEW_ROAD_LOCATION_TOOLTIP :{BLACK}Centre la vue sur le véhicule
@@ -2927,7 +2918,6 @@ STR_WATERWAYS_TOOLBAR_CAPTION_SE :{WHITE}Voies na
STR_ERROR_CAN_T_BUILD_DOCK_HERE :{WHITE}Impossible de construire port ici...
STR_DEPOT_SHIP_CAPTION :{WHITE}{TOWN} Dépôt naval
STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON :{BLACK}Nouveaux navires
-STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} Navire{P "" s}
STR_BUILD_VEHICLE_SHIP_CAPTION :{WHITE}Nouveaux navires
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON :{BLACK}Construire navire
STR_CLONE_SHIP :{BLACK}Copier Navire
@@ -2950,7 +2940,6 @@ STR_DEPOT_SHIP_LIST_TOOLTIP :{BLACK}Navires
STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP :{BLACK}Construire nouveau navire
STR_DEPOT_SHIP_SELL_TOOLTIP :{BLACK}Glisse le navire jusqu'ici pour le vendre
STR_DEPOT_SHIP_LOCATION_TOOLTIP :{BLACK}Centrer la vue sur emplacement du dépôt naval
-STR_VEHICLE_LIST_SHIP_TOOLTIP :{BLACK}Navires - cliquer sur un navire pour informations
STR_BUILD_VEHICLE_SHIP_LIST_TOOLTIP :{BLACK}Liste de sélection de navire - cliquer sur un navire pour informations
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP :{BLACK}Construire le navire surligné
STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Action courante du navire - cliquer pour le démarrer/l'arrêter
@@ -2992,7 +2981,6 @@ STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}Effectue
STR_BUILD_VEHICLE_AIRCRAFT_CAPTION :{WHITE}Nouvel Aéronef
STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON :{BLACK}Construire aéronef
STR_ERROR_CAN_T_BUILD_AIRCRAFT :{WHITE}Impossible de construire l'aéronef...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} Aéronef{P "" s}
STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR :{WHITE}Impossible d'envoyer l'aéronef au hangar...
STR_HEADING_FOR_HANGAR :{ORANGE}En route pour le hangar de {STATION}
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}En route pour le hangar de {STATION}, {VELOCITY}
@@ -3006,7 +2994,6 @@ STR_ERROR_AIRCRAFT_MUST_BE_STOPPED :{WHITE}L'aéron
STR_ERROR_CAN_T_SELL_AIRCRAFT :{WHITE}Impossible de vendre l'aéronef...
STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :Construction d'aéroport
STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP :{BLACK}Construire un aéroport
-STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP :{BLACK}Aéronef - cliquer sur l'aéronef pour informations
STR_DEPOT_AIRCRAFT_LIST_TOOLTIP :{BLACK}Aéronef - cliquer sur l'aéronef pour informations
STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP :{BLACK}Construire nouvel aéronef
STR_DEPOT_AIRCRAFT_SELL_TOOLTIP :{BLACK}Glisser l'aéronef jusqu'ici ici pour le vendre
@@ -3188,11 +3175,16 @@ STR_LORRY :{BLACK}{LORRY}
STR_PLANE :{BLACK}{PLANE}
STR_SHIP :{BLACK}{SHIP}
+############ Vehicle lists
+STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP :{BLACK}Trains - Cliquer sur un train pour obtenir des informations
+STR_VEHICLE_LIST_ROAD_TOOLTIP :{BLACK}Véhicules - Cliquer sur un véhicule pour obtenir des informations
+STR_VEHICLE_LIST_SHIP_TOOLTIP :{BLACK}Navires - cliquer sur un navire pour informations
+STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP :{BLACK}Aéronef - cliquer sur l'aéronef pour informations
-STR_SCHEDULED_TRAINS_TIP :{BLACK}Afficher les trains ayant cette station dans leurs ordres
-STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Afficher les véhicules routiers ayant cette station dans leurs ordres
-STR_SCHEDULED_AIRCRAFT_TIP :{BLACK}Afficher les aéronefs ayant cette station dans leurs ordres
-STR_SCHEDULED_SHIPS_TIP :{BLACK}Afficher les navires ayant cette station dans leurs ordres
+STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} Train{P "" s}
+STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} Véhicule{P "" s} routier{P "" s}
+STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} Navire{P "" s}
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} Aéronef{P "" s}
STR_VEH_WITH_SHARED_ORDERS_LIST :{WHITE}Ordres partagés de {COMMA} véhicule{P "" s}
STR_VEH_WITH_SHARED_ORDERS_LIST_TIP :{BLACK}Afficher tous les véhicules partageant ce programme
@@ -3216,7 +3208,6 @@ STR_DEPOT_AUTOREPLACE_ROADVEH_TIP :{BLACK}Autoremp
STR_DEPOT_AUTOREPLACE_SHIP_TIP :{BLACK}Autoremplacer tous les navires du dépôt
STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP :{BLACK}Autoremplacer tous les aéronefs du hangar
-
STR_REPLACE_VEHICLES_WHITE :{WHITE}Remplacer {STRING}
STR_REPLACE_VEHICLES_START :{BLACK}Démarrer le remplacement
STR_REPLACE_VEHICLES_STOP :{BLACK}Stopper le remplacement
@@ -3382,17 +3373,6 @@ STR_MEASURE_AREA :{BLACK}Région:
STR_MEASURE_LENGTH_HEIGHTDIFF :{BLACK}Longueur: {NUM}{}Ecart d'altitude: {NUM} m
STR_MEASURE_AREA_HEIGHTDIFF :{BLACK}Région: {NUM} x {NUM}{}Ecart d'altitude: {NUM} m
-############ Date formatting
-STR_FORMAT_DATE_TINY :{STRING}/{STRING}/{NUM}
-STR_FORMAT_DATE_SHORT :{STRING} {NUM}
-STR_FORMAT_DATE_LONG :{STRING} {STRING} {NUM}
-STR_FORMAT_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING}
-
-STR_JUST_DATE_TINY :{DATE_TINY}
-STR_JUST_DATE_LONG :{DATE_LONG}
-STR_JUST_DATE_ISO :{DATE_ISO}
-########
-
STR_FEEDER_CARGO_VALUE :{BLACK}Crédits de transfert: {LTBLUE}{CURRENCY}
STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD :{WHITE}...cette route appartient à une ville
STR_DRIVE_THROUGH_ERROR_DIRECTION :{WHITE}...mauvaise orientation de la route
@@ -3417,7 +3397,6 @@ STR_PERCENT_UP_DOWN_SMALL :{TINYFONT}{WHIT
STR_PERCENT_UP_DOWN :{WHITE}{NUM}%{UPARROW}{DOWNARROW}
##### Mass Order
-STR_FORMAT_GROUP_NAME :Groupe {COMMA}
STR_GROUP_TINY_NAME :{TINYFONT}{GROUP}
STR_GROUP_ALL_TRAINS :Tous les trains
STR_GROUP_ALL_ROADS :Tous les véhicules routiers
@@ -3446,12 +3425,35 @@ STR_GROUP_DELETE_TIP :{BLACK}Supprime
STR_GROUP_RENAME_TIP :{BLACK}Renommer le groupe sélectionné
STR_GROUP_REPLACE_PROTECTION_TIP :{BLACK}Cliquer pour protéger ce groupe contre l'auto-remplacement 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 :(Compagnie {COMMA})
+STR_FORMAT_GROUP_NAME :Groupe {COMMA}
+STR_FORMAT_INDUSTRY_NAME :{TOWN} {STRING}
STR_NAME_MUST_BE_UNIQUE :{WHITE}Le nom doit être unique
diff --git a/src/lang/galician.txt b/src/lang/galician.txt
index ebaf5a22a..0c8aae3ed 100644
--- a/src/lang/galician.txt
+++ b/src/lang/galician.txt
@@ -687,6 +687,7 @@ STR_SETTINGS_MENU_TRANSPARENT_SIGNS :{SETX 12}Sinais
STR_ABOUT_MENU_LAND_BLOCK_INFO :Información de área de terreo
STR_ABOUT_MENU_SEPARATOR :
STR_ABOUT_MENU_TOGGLE_CONSOLE :Des/Activar Consola
+STR_ABOUT_MENU_AI_DEBUG :Depuración IA
STR_ABOUT_MENU_SCREENSHOT :Captura de Pantalla (Ctrl-S)
STR_ABOUT_MENU_GIANT_SCREENSHOT :Capt.Pant. Xigante (Ctrl-G)
STR_ABOUT_MENU_ABOUT_OPENTTD :Acerca de 'OpenTTD'
@@ -757,9 +758,6 @@ STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :Fundar unha nov
############ range ends here
STR_FUND_INDUSTRY_CAPTION :{WHITE}Fundar unha nova industria
-STR_JUST_STRING :{STRING}
-STR_JUST_RAW_STRING :{STRING}
-STR_JUST_INT :{NUM}
STR_ERROR_CAN_ONLY_BE_BUILT_IN_RAINFOREST :{WHITE}...só se pode construír en zonas de selva tropical
STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT :{WHITE}...só se pode construír en zonas desérticas
STR_STATUSBAR_PAUSED :{YELLOW}* * EN PAUSA * *
@@ -847,8 +845,11 @@ STR_OPTIONS_SCREENSHOT_FORMAT :{BLACK}Formato
STR_OPTIONS_SCREENSHOT_FORMAT_CBO :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
STR_OPTIONS_SCREENSHOT_FORMAT_TIP :{BLACK}Selecciona o formato a utilizar nas capturas de pantalla
+STR_OPTIONS_BASE_GRF :{BLACK}Conxunto básico de gráficos
STR_OPTIONS_BASE_GRF_CBO :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
+STR_OPTIONS_BASE_GRF_TIP :{BLACK}Selecciona o conxunto de gráficos básico a usar
STR_OPTIONS_BASE_GRF_STATUS :{RED} {10:NUM} arquivo{P "" s} inexistente{P "" s}/erróneo{P "" s}
+STR_OPTIONS_BASE_GRF_DESCRIPTION_TIP :{BLACK}Información adicional sobre o conxunto de gráficos básico
STR_AUTOSAVE_FAILED :{WHITE}Autograbado fallido
@@ -898,6 +899,7 @@ STR_VEHICLE_HAS_DUPLICATE_ENTRY :{WHITE}{VEHICLE
STR_VEHICLE_HAS_INVALID_ENTRY :{WHITE}{VEHICLE} ten unha estación inválida nas súas ordes
# end of order system
+STR_TRAIN_TOO_LONG_AFTER_REPLACEMENT :{WHITE}{VEHICLE} é demasiado longo despois do reemprazo
STR_AUTOREPLACE_NOTHING_TO_DO :{WHITE}Non se aplicaron as regras de autosubstitución/renovación
STR_AUTOREPLACE_MONEY_LIMIT :(límite de diñeiro)
@@ -947,7 +949,9 @@ STR_CONFIG_SETTING_PLANE_SPEED :{LTBLUE}Factor
STR_CONFIG_SETTING_STOP_ON_TOWN_ROAD :{LTBLUE}Permiti-la construción de estacións pasantes nas rúas das cidades: {ORANGE}{STRING}
STR_CONFIG_SETTING_ADJACENT_STATIONS :{LTBLUE}Permiti-la construción de estacións contiguas: {ORANGE}{STRING}
STR_CONFIG_SETTING_DYNAMIC_ENGINES :{LTBLUE}Activar motor para múltiples NewGRF: {ORANGE}{STRING}
+STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES :{WHITE}Non é posible cambiar esta opción cando hai vehículos.
+STR_CONFIG_SETTING_NEVER_EXPIRE_AIRPORTS :{LTBLUE}Os aeroportos nunca caducan: {ORANGE}{STRING}
STR_CONFIG_SETTING_WARN_LOST_TRAIN :{LTBLUE}Avisar se un tren se perde: {ORANGE}{STRING}
STR_CONFIG_SETTING_ORDER_REVIEW :{LTBLUE}Revisa-las ordes do vehículo: {ORANGE}{STRING}
@@ -980,6 +984,7 @@ STR_CONFIG_SETTING_HEIGHTMAP_ROTATION :{LTBLUE}Rotaci
STR_CONFIG_SETTING_HEIGHTMAP_ROTATION_COUNTER_CLOCKWISE :Esquerda
STR_CONFIG_SETTING_HEIGHTMAP_ROTATION_CLOCKWISE :Dereita
STR_CONFIG_SETTING_SE_FLAT_WORLD_HEIGHT :{LTBLUE}Nivel de altitude dun escenario chairo: {ORANGE}{STRING}
+STR_CONFIG_SETTING_ENABLE_FREEFORM_EDGES :{LTBLUE}Activa-la terraformación nos bordes do mapa: {ORANGE}{STRING}
STR_CONFIG_SETTING_STATION_SPREAD :{LTBLUE}Extensión Max. Estación: {ORANGE}{STRING} {RED}Aviso: Valores altos reducen rendemento
STR_CONFIG_SETTING_SERVICEATHELIPAD :{LTBLUE}Face-lo servizo ós helicópteros no heliporto automáticam.: {ORANGE}{STRING}
@@ -1003,7 +1008,11 @@ STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_COMMAND :Tecla Command
STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_CONTROL :Tecla Control
STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_OFF :Apagado
+STR_CONFIG_SETTING_LEFT_MOUSE_BTN_SCROLLING :{LTBLUE}Desprazamento con click esquerdo: {ORANGE}{STRING}
+STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_LONG :longo (31 Dec 2008)
+STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_SHORT :corto (31-12-2008)
+STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_ISO :ISO (2008-12-31)
STR_CONFIG_SETTING_PAUSE_ON_NEW_GAME :{LTBLUE}Pausar automáticamente ó comezo dunha nova partida: {ORANGE}{STRING}
STR_CONFIG_SETTING_ADVANCED_VEHICLE_LISTS :{LTBLUE}Usa-la lista avanzada de vehículos: {ORANGE}{STRING}
@@ -1037,6 +1046,7 @@ STR_CONFIG_SETTING_AI_BUILDS_ROADVEH :{LTBLUE}Deshabi
STR_CONFIG_SETTING_AI_BUILDS_AIRCRAFT :{LTBLUE}Deshabilita-los avións para o ordenador: {ORANGE}{STRING}
STR_CONFIG_SETTING_AI_BUILDS_SHIPS :{LTBLUE}Deshabilita-los barcos para o ordenador: {ORANGE}{STRING}
+STR_CONFIG_SETTING_AI_IN_MULTIPLAYER :{LTBLUE}Permitir IA en multixogador: {ORANGE}{STRING}
STR_CONFIG_SETTING_SERVINT_ISPERCENT :{LTBLUE}Intervalos de servizo en porcentaxes: {ORANGE}{STRING}
STR_CONFIG_SETTING_SERVINT_TRAINS :{LTBLUE}Intervalo de servizo para os trens: {ORANGE}{STRING} días/%
@@ -1067,6 +1077,7 @@ STR_CONFIG_SETTING_CYCLE_SIGNAL_NORMAL :Só normais
STR_CONFIG_SETTING_CYCLE_SIGNAL_PBS :Só avanzadas
STR_CONFIG_SETTING_CYCLE_SIGNAL_ALL :Todas
+STR_CONFIG_SETTING_TOWN_LAYOUT :{LTBLUE}Distribución das estradas en novas cidades: {ORANGE}{STRING}
STR_CONFIG_SETTING_TOWN_LAYOUT_DEFAULT :defecto
STR_CONFIG_SETTING_TOWN_LAYOUT_BETTER_ROADS :mellores estradas
STR_CONFIG_SETTING_TOWN_LAYOUT_2X2_GRID :Reixa 2x2
@@ -1097,8 +1108,11 @@ STR_CONFIG_SETTING_VEHICLES :{ORANGE}Vehícu
STR_CONFIG_SETTING_STATIONS :{ORANGE}Estacións
STR_CONFIG_SETTING_ECONOMY :{ORANGE}Economía
STR_CONFIG_SETTING_AI :{ORANGE}Competidores
+STR_CONFIG_SETTING_DISPLAY_OPTIONS :{ORANGE}Mostrar opcións
+STR_CONFIG_SETTING_INTERACTION :{ORANGE}Interacción
STR_CONFIG_SETTING_CONSTRUCTION_SIGNALS :{ORANGE}Sinais
STR_CONFIG_SETTING_AI_NPC :{ORANGE}Xogadores do ordenador
+STR_CONFIG_SETTING_VEHICLES_AUTORENEW :{ORANGE}Autorenovar
STR_CONFIG_SETTING_VEHICLES_TRAINS :{ORANGE}Trens
STR_CONFIG_SETTING_ECONOMY_TOWNS :{ORANGE}Cidades
STR_CONFIG_SETTING_ECONOMY_INDUSTRIES :{ORANGE}Industrias
@@ -1158,7 +1172,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-lo nome do punto de control
STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}Non se pode cambia-lo nome do punto de control...
@@ -1407,10 +1420,11 @@ STR_NETWORK_GIVE_MONEY_CAPTION :{WHITE}Introduc
STR_NETWORK_NEED_GAME_PASSWORD_CAPTION :{WHITE}O servidor está protexido. Introduce clave
STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION :{WHITE}A compañía está protexida. Introduce clave
STR_NETWORK_CLIENT_LIST :{WHITE}Lista de Clientes
+STR_NETWORK_COMPANY_LIST_SPECTATE :{WHITE}Observar
STR_NETWORK_COMPANY_LIST_NEW_COMPANY :{WHITE}Nova Compañía
STR_NETWORK_ERR_NOTAVAILABLE :{WHITE} Non se atoparon dispositivos de rede ou compilouse sen ENABLE_NETWORK
-STR_NETWORK_ERR_NOSERVER :{WHITE} Non se atoparon xogos en rede
+STR_NETWORK_ERR_NOSERVER :{WHITE}Non se atoparon xogos en rede
STR_NETWORK_ERR_NOCONNECTION :{WHITE} O servidor non respondeu á solicitude
STR_NETWORK_ERR_NEWGRF_MISMATCH :{WHITE}Non se pode conectar debido a un problema cos NewGRF
STR_NETWORK_ERR_DESYNC :{WHITE}Sincronización da partida en rede fallida
@@ -1446,7 +1460,21 @@ STR_NETWORK_ERR_CLIENT_SERVER_FULL :servidor cheo
############ End of leave-in-this-order
STR_NETWORK_SERVER_MESSAGE :*** {2:STRING}
############ Leave those lines in this order!!
+STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_PLAYERS :Partida en pausa (non hai suficientes xogadores)
+STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Partida funcionando (hai suficientes xogadores)
+STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Partida en pausa (cliente conectando)
+STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Partida funcionando (cliente conectado)
+STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL :Partida funcionando (o cliente non pudio conectar)
############ End of leave-in-this-order
+STR_NETWORK_CLIENT_LEAVING :saíndo
+STR_NETWORK_CLIENT_JOINED :*** {STRING} uniuse á partida
+STR_NETWORK_CLIENT_COMPANY_JOIN :*** {STRING} uniuse a compañía #{2:NUM}
+STR_NETWORK_CLIENT_COMPANY_SPECTATE :*** {STRING} uniuse ós espectadores
+STR_NETWORK_CLIENT_COMPANY_NEW :*** {STRING} comezou unha nova compañía (#{2:NUM})
+STR_NETWORK_CLIENT_LEFT :*** {STRING} saiu da partida ({2:STRING})
+STR_NETWORK_NAME_CHANGE :*** {STRING} cambiou o seu nome a {STRING}
+STR_NETWORK_GIVE_MONEY :*** {STRING} deu a túa companía {2:CURRENCY}
+STR_NETWORK_GAVE_MONEY_AWAY :*** Diches a {1:STRING} {2:CURRENCY}
STR_NETWORK_CHAT_COMPANY_CAPTION :[Equipo] :
STR_NETWORK_CHAT_COMPANY :[Equipo] {STRING}: {WHITE}{STRING}
STR_NETWORK_CHAT_TO_COMPANY :[Equipo] A {STRING}: {WHITE}{STRING}
@@ -1566,6 +1594,8 @@ STR_RAILROAD_TRACK_WITH_COMBO_PBSSIGNALS :Vía de tren co
STR_RAILROAD_TRACK_WITH_COMBO_NOENTRYSIGNALS :Vía de tren con sinais combo e de ruta dun sentido
STR_RAILROAD_TRACK_WITH_PBS_NOENTRYSIGNALS :Vía de tren con sinais de ruta e de ruta dun sentido
STR_MUST_REMOVE_RAILWAY_STATION_FIRST :{WHITE}debes quita-la estación de tren primeiro
+STR_CREATE_SPLITTED_STATION :{YELLOW}Construír unha estación separada
+STR_SELECT_STATION_TO_JOIN :{BLACK}Unir estación
@@ -1717,11 +1747,6 @@ STR_TOWN_BUILDING_NAME_TEPEES_1 :Tipis
STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1 :Casa Tetera
STR_TOWN_BUILDING_NAME_PIGGY_BANK_1 :Banco Porquiño
-STR_INDUSTRY_NAME :{INDUSTRY}
-STR_TOWN_NAME :{TOWN}
-STR_FORMAT_INDUSTRY_NAME :{TOWN}: {STRING}
-STR_STATION_NAME :{STATION}
-
##id 0x2800
STR_LANDSCAPING_MENU_LANDSCAPING :Modifica-lo terreo
STR_LANDSCAPING_MENU_PLANT_TREES :Plantar árbores
@@ -1775,6 +1800,12 @@ STR_CARGO_RATING_EXCELLENT :Excelente
STR_CARGO_RATING_OUTSTANDING :Excepcional
############ range for rating ends
+### station view strings
+STR_SCHEDULED_TRAINS_TIP :{BLACK}Mostrar tódolos trens que teñen esta estación nas súas ordes
+STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Mostrar tódolos vehículos de estrada que teñen esta estación nas súas ordes
+STR_SCHEDULED_AIRCRAFT_TIP :{BLACK}Mostrar tódolos avións que teñen esta estación nas súas ordes
+STR_SCHEDULED_SHIPS_TIP :{BLACK}Mostrar tódolos barcos que teñen esta estación nas súas ordes
+
STR_STATION_VIEW_CARGO_RATING :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}{STATION} xa non acepta {STRING}
STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION} xa non acepta {STRING} ou {STRING}
@@ -1846,6 +1877,7 @@ STR_SAVELOAD_LOAD_CAPTION :{WHITE}Cargar P
STR_SAVELOAD_SAVE_BUTTON :{BLACK}Grabar
STR_SAVELOAD_DELETE_BUTTON :{BLACK}Borrar
STR_DEFAULT_SAVEGAME_NAME :{COMPANY}, {STRING}
+STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME :Espectador, {SKIP}{STRING}
STR_SAVELOAD_BYTES_FREE :{BLACK}{BYTES} libre{P "" s}
STR_ERROR_UNABLE_TO_READ_DRIVE :{BLACK}No se pode lee-la unidade
STR_ERROR_GAME_SAVE_FAILED :{WHITE}Grabación da partida fallida{}{STRING}
@@ -1856,6 +1888,7 @@ STR_GAME_SAVELOAD_ERROR_BROKEN_SAVEGAME :Partida grabada
STR_GAME_SAVELOAD_ERROR_TOO_NEW_SAVEGAME :A partida grabouse cunha versión máis nova do xogo
STR_GAME_SAVELOAD_ERROR_FILE_NOT_READABLE :Ficheiro ilexible
STR_GAME_SAVELOAD_ERROR_FILE_NOT_WRITEABLE :Non se pode escribir no ficheiro
+STR_GAME_SAVELOAD_ERROR_DATA_INTEGRITY_CHECK_FAILED :Fallou a comprobación de integridade dos datos
STR_SAVELOAD_LIST_TOOLTIP :{BLACK}Lista de unidades, directorios e arquivos de partida
STR_SAVELOAD_EDITBOX_TOOLTIP :{BLACK}Nome seleccionado actualmente para o arquivo
STR_SAVELOAD_DELETE_TOOLTIP :{BLACK}Borra-lo arquivo que está seleccionado
@@ -2106,7 +2139,6 @@ STR_CITY_APPROVAL_HOSTILE :Hostil
##id 0x7000
STR_COMPANY_VIEW_CAPTION :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
-STR_FORMAT_COMPANY_NUM :(Compañía {COMMA})
STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Nova Cara
STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON :{BLACK}Esquema de Cor
STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE :{GOLD}Esquema de Cor:
@@ -2139,7 +2171,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áfica de Beneficios Operativos
STR_FINANCES_BANK_BALANCE_TITLE :{WHITE}Balance do Banco
STR_FINANCES_LOAN_TITLE :{WHITE}Préstamo
@@ -2646,7 +2677,6 @@ STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON :{BLACK}Novos Ve
STR_DEPOT_NO_ENGINE :{BLACK}-
STR_ERROR_TRAIN_TOO_LONG :{WHITE}O tren é demasiado longo
STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT :{WHITE}Os trens só se poden alterar cando estean parados nun depósito
-STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} Tren{P "" s}
STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION :{WHITE}Novos Vehículos de Ferrocarril
STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION :{WHITE}Novos Vehículos Eléctricos de Raíles
@@ -2703,7 +2733,6 @@ STR_ERROR_UNABLE_TO_FIND_ROUTE_TO :{WHITE}No se po
STR_ERROR_CAN_T_STOP_START_TRAIN :{WHITE}No se pode parar/iniciar o tren...
STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS :{BLACK}Intervalo de Servizo: {LTBLUE}{COMMA}days{BLACK} Último Servizo: {LTBLUE}{DATE_LONG}
STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT :{BLACK}Intervalo servizo: {LTBLUE}{COMMA}%{BLACK} Últ. Servizo: {LTBLUE}{DATE_LONG}
-STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP :{BLACK}Trens - pincha nun tren para información
STR_DEPOT_TRAIN_LIST_TOOLTIP :{BLACK}Trens - pincha nun tren para información, arrastra o vehículo para engadilo/quitalo do tren
STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP :{BLACK}Construír novo vehículo de ferrocarril
STR_DEPOT_TRAIN_SELL_TOOLTIP :{BLACK}Arrastra un vehículo do tren aquí para vendelo
@@ -2792,7 +2821,6 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP :{BLACK}Enche-lo
##id 0x9000
STR_ERROR_ROAD_VEHICLE_IN_THE_WAY :{WHITE}Haí un vehículo de estrada no camiño
-STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} Vehículo{P "" s} de Estrada
STR_DEPOT_ROAD_CAPTION :{WHITE}Depósito de Vehículos de Estrada de {TOWN}
STR_DEPOT_ROAD_NEW_VEHICLES_BUTTON :{BLACK}Novos Vehículos
STR_BUILD_VEHICLE_ROAD_CAPTION :{WHITE}Novos Vehículos de Estrada
@@ -2808,7 +2836,6 @@ STR_HEADING_FOR_ROAD_DEPOT_SERVICE :{LTBLUE}Servizo
STR_HEADING_FOR_ROAD_DEPOT_SERVICE_VEL :{LTBLUE}Servizo no Depósito de {TOWN}, {VELOCITY}
STR_ERROR_CAN_T_SEND_VEHICLE_TO_DEPOT :{WHITE}Non se pode envia-lo vehículo ó depósito de estrada...
STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT :{WHITE}No se pode atopar unha ruta ó depósito local
-STR_VEHICLE_LIST_ROAD_TOOLTIP :{BLACK}Vehículos de estrada - pincha nun vehículo para máis información
STR_VEHICLE_VIEW_ROAD_STATE_START_STOP_TOOLTIP :{BLACK}Tarefa actual do vehículo - pincha aquí para parar/arrancar o vehículo
STR_VEHICLE_VIEW_ROAD_ORDERS_TOOLTIP :{BLACK}Mostra-las ordes do vehículo
STR_VEHICLE_VIEW_ROAD_LOCATION_TOOLTIP :{BLACK}Centra-la vista principal na situación do vehículo
@@ -2855,7 +2882,6 @@ STR_WATERWAYS_TOOLBAR_CAPTION_SE :{WHITE}Canais
STR_ERROR_CAN_T_BUILD_DOCK_HERE :{WHITE}Non se pode construí-lo peirao aí...
STR_DEPOT_SHIP_CAPTION :{WHITE}Depósito de Barcos de {TOWN}
STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON :{BLACK}Novos Barcos
-STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} Barco{P "" s}
STR_BUILD_VEHICLE_SHIP_CAPTION :{WHITE}Novos Barcos
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON :{BLACK}Construír Barco
STR_CLONE_SHIP :{BLACK}Clonar Barco
@@ -2878,7 +2904,6 @@ STR_DEPOT_SHIP_LIST_TOOLTIP :{BLACK}Barcos -
STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP :{BLACK}Costruír novo barco
STR_DEPOT_SHIP_SELL_TOOLTIP :{BLACK}Arrastra o barco aquí para vendelo
STR_DEPOT_SHIP_LOCATION_TOOLTIP :{BLACK}Centra-la vista principal na situación do depósito de barcos
-STR_VEHICLE_LIST_SHIP_TOOLTIP :{BLACK}Barcos - pincha no barco para máis información
STR_BUILD_VEHICLE_SHIP_LIST_TOOLTIP :{BLACK}Lista de selección de barcos - pincha nun barco para máis información
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP :{BLACK}Construí-lo barco seleccionado
STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Tarefa actual do barco - pincha aquí para parar/arrancar o barco
@@ -2920,7 +2945,6 @@ STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}Esto con
STR_BUILD_VEHICLE_AIRCRAFT_CAPTION :{WHITE}Nova Aeronave
STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON :{BLACK}Construír Aeronave
STR_ERROR_CAN_T_BUILD_AIRCRAFT :{WHITE}Non se pode construí-lo avíon...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} Aeronave
STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR :{WHITE}Non se pode envia-lo avión ó hangar...
STR_HEADING_FOR_HANGAR :{ORANGE}Diríxese ó hangar de {STATION}
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Diríxese ó hangar de {STATION}, {VELOCITY}
@@ -2934,7 +2958,6 @@ STR_ERROR_AIRCRAFT_MUST_BE_STOPPED :{WHITE}O avión
STR_ERROR_CAN_T_SELL_AIRCRAFT :{WHITE}Non se pode vende-lo avión...
STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :Construción de Aeroporto
STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP :{BLACK}Construír aeroporto
-STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP :{BLACK}Avións - pincha no avión para máis información
STR_DEPOT_AIRCRAFT_LIST_TOOLTIP :{BLACK}Avións - pincha no avión para máis información
STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP :{BLACK}Construír novo avión
STR_DEPOT_AIRCRAFT_SELL_TOOLTIP :{BLACK}Arrastra o avión aquí para vendelo
@@ -3114,11 +3137,16 @@ STR_LORRY :{BLACK}{LORRY}
STR_PLANE :{BLACK}{PLANE}
STR_SHIP :{BLACK}{SHIP}
+############ Vehicle lists
+STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP :{BLACK}Trens - pincha nun tren para información
+STR_VEHICLE_LIST_ROAD_TOOLTIP :{BLACK}Vehículos de estrada - pincha nun vehículo para máis información
+STR_VEHICLE_LIST_SHIP_TOOLTIP :{BLACK}Barcos - pincha no barco para máis información
+STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP :{BLACK}Avións - pincha no avión para máis información
-STR_SCHEDULED_TRAINS_TIP :{BLACK}Mostrar tódolos trens que teñen esta estación nas súas ordes
-STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Mostrar tódolos vehículos de estrada que teñen esta estación nas súas ordes
-STR_SCHEDULED_AIRCRAFT_TIP :{BLACK}Mostrar tódolos avións que teñen esta estación nas súas ordes
-STR_SCHEDULED_SHIPS_TIP :{BLACK}Mostrar tódolos barcos que teñen esta estación nas súas ordes
+STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} Tren{P "" s}
+STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} Vehículo{P "" s} de Estrada
+STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} Barco{P "" s}
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} Aeronave
STR_VEH_WITH_SHARED_ORDERS_LIST :{WHITE}Ordes compartidas de {COMMA} Vehículo{P "" s}
STR_VEH_WITH_SHARED_ORDERS_LIST_TIP :{BLACK}Mostrar tódolos vehículos que comparten esta planificación
@@ -3142,7 +3170,6 @@ STR_DEPOT_AUTOREPLACE_ROADVEH_TIP :{BLACK}Autosubs
STR_DEPOT_AUTOREPLACE_SHIP_TIP :{BLACK}Autosubstituír tódolos barcos no depósito
STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP :{BLACK}Autosubstituír tódolos avións no hangar
-
STR_REPLACE_VEHICLES_WHITE :{WHITE}Substituír {STRING}
STR_REPLACE_VEHICLES_START :{BLACK}Comezar a Substituír Vehículos
STR_REPLACE_VEHICLES_STOP :{BLACK}Parar de Substituír Vehículos
@@ -3308,17 +3335,6 @@ STR_MEASURE_AREA :{BLACK}Área: {
STR_MEASURE_LENGTH_HEIGHTDIFF :{BLACK}Lonxitude: {NUM}{}Diferencia de altura: {NUM} m
STR_MEASURE_AREA_HEIGHTDIFF :{BLACK}Área: {NUM} x {NUM}{}Diferencia de altura: {NUM} m
-############ Date formatting
-STR_FORMAT_DATE_TINY :{STRING}-{STRING}-{NUM}
-STR_FORMAT_DATE_SHORT :{STRING} {NUM}
-STR_FORMAT_DATE_LONG :{STRING} {STRING} {NUM}
-STR_FORMAT_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING}
-
-STR_JUST_DATE_TINY :{DATE_TINY}
-STR_JUST_DATE_LONG :{DATE_LONG}
-STR_JUST_DATE_ISO :{DATE_ISO}
-########
-
STR_FEEDER_CARGO_VALUE :{BLACK}Transferir Créditos: {LTBLUE}{CURRENCY}
STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD :{WHITE}...esta rúa pertenece á cidade
STR_DRIVE_THROUGH_ERROR_DIRECTION :{WHITE}...a estrada vai na dirección incorrecta
@@ -3343,7 +3359,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 :Tódolos trens
STR_GROUP_ALL_ROADS :Tódolos vehículos de estrada
@@ -3372,12 +3387,34 @@ STR_GROUP_DELETE_TIP :{BLACK}Borrar o
STR_GROUP_RENAME_TIP :{BLACK}Renomear o grupo seleccionado
STR_GROUP_REPLACE_PROTECTION_TIP :{BLACK}Pincha para protexer a este grupo da autosubstitución 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_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 :(Compañía {COMMA})
+STR_FORMAT_GROUP_NAME :Grupo {COMMA}
+STR_FORMAT_INDUSTRY_NAME :{TOWN}: {STRING}
STR_NAME_MUST_BE_UNIQUE :{WHITE}O nome debe ser único
diff --git a/src/lang/german.txt b/src/lang/german.txt
index b14cdad7d..ba8548809 100644
--- a/src/lang/german.txt
+++ b/src/lang/german.txt
@@ -763,9 +763,6 @@ STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :Neue Industrie
############ range ends here
STR_FUND_INDUSTRY_CAPTION :{WHITE}Neue Industrie finanzieren
-STR_JUST_STRING :{STRING}
-STR_JUST_RAW_STRING :{STRING}
-STR_JUST_INT :{NUM}
STR_ERROR_CAN_ONLY_BE_BUILT_IN_RAINFOREST :{WHITE}...kann nur im Regenwaldgebiet errichtet werden
STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT :{WHITE}...kann nur im Wüstengebiet errichtet werden
STR_STATUSBAR_PAUSED :{YELLOW}* * ANGEHALTEN * *
@@ -1198,7 +1195,6 @@ STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Wegpunkt
STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT}
STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT}
-STR_WAYPOINT_NAME :{WAYPOINT}
STR_EDIT_WAYPOINT_NAME :{WHITE}Namen des Wegpunkts ändern
STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}Wegpunktname kann nicht geändert werden...
@@ -1779,11 +1775,6 @@ STR_TOWN_BUILDING_NAME_TEPEES_1 :Zelt
STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1 :Teekannenhaus
STR_TOWN_BUILDING_NAME_PIGGY_BANK_1 :Sparschwein
-STR_INDUSTRY_NAME :{INDUSTRY}
-STR_TOWN_NAME :{TOWN}
-STR_FORMAT_INDUSTRY_NAME :{TOWN} {STRING}
-STR_STATION_NAME :{STATION}
-
##id 0x2800
STR_LANDSCAPING_MENU_LANDSCAPING :Landschaftsbau
STR_LANDSCAPING_MENU_PLANT_TREES :Bäume pflanzen
@@ -1838,6 +1829,12 @@ STR_CARGO_RATING_EXCELLENT :Ausgezeichnet
STR_CARGO_RATING_OUTSTANDING :Hervorragend
############ range for rating ends
+### station view strings
+STR_SCHEDULED_TRAINS_TIP :{BLACK}Alle Züge, die diesen Bahnhof anfahren, anzeigen
+STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Alle Fahrzeuge, die diese Station anfahren, anzeigen
+STR_SCHEDULED_AIRCRAFT_TIP :{BLACK}Alle Flugzeuge, die diesen Flughafen anfliegen, anzeigen
+STR_SCHEDULED_SHIPS_TIP :{BLACK}Alle Schiffe, die diesen Hafen ansteuern, anzeigen
+
STR_STATION_VIEW_CARGO_RATING :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}{STATION} akzeptiert kein{G "en" "e" "" "e"} {STRING} mehr
STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION} akzeptiert kein{G "en" "e" "" "e"} {STRING} und kein{G "en" "e" "" "e"} {STRING} mehr
@@ -2172,7 +2169,6 @@ STR_CITY_APPROVAL_HOSTILE :Gering
##id 0x7000
STR_COMPANY_VIEW_CAPTION :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
-STR_FORMAT_COMPANY_NUM :(Firma {COMMA})
STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Neues Gesicht
STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON :{BLACK}Farbschema
STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE :{GOLD}Farbschema
@@ -2205,7 +2201,6 @@ STR_FINANCES_TOTAL_CAPTION :{WHITE}Gesamt:
STR_COMPANY_NAME_COMPANY_NUM :{COMPANY} {COMPANYNUM}
STR_GRAPH_INCOME_CAPTION :{WHITE}Einkommensdiagramm
STR_CURRCOMPACT :{CURRCOMPACT}
-STR_JUST_COMMA :{COMMA}
STR_GRAPH_OPERATING_PROFIT_CAPTION :{WHITE}Betriebsgewinndiagramm
STR_FINANCES_BANK_BALANCE_TITLE :{WHITE}Kontostand
STR_FINANCES_LOAN_TITLE :{WHITE}Kredit
@@ -2717,7 +2712,6 @@ STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON :{BLACK}Neue Fah
STR_DEPOT_NO_ENGINE :{BLACK}-
STR_ERROR_TRAIN_TOO_LONG :{WHITE}Zug zu lang
STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT :{WHITE}Züge können nur verändert werden, wenn sie im Depot halten
-STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} Z{P ug üge}
STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION :{WHITE}Neues Schienenfahrzeug
STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION :{WHITE}Neue E-Loks
@@ -2775,7 +2769,6 @@ STR_ERROR_UNABLE_TO_FIND_ROUTE_TO :{WHITE}Weg zum
STR_ERROR_CAN_T_STOP_START_TRAIN :{WHITE}Zug kann nicht angehalten {} oder losgeschickt werden ...
STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS :{BLACK}Wartungsintervall: {LTBLUE}{COMMA}Tag{P "" e} {BLACK} Letzte Wartung: {LTBLUE}{DATE_LONG}
STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT :{BLACK}Wartungsintervall: {LTBLUE}{COMMA}%{BLACK} Letzte Wartung: {LTBLUE}{DATE_LONG}
-STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP :{BLACK}Züge - für Einzelheiten auf den jeweiligen Zug klicken
STR_DEPOT_TRAIN_LIST_TOOLTIP :{BLACK}Züge - für Einzelheiten auf den Zug klicken; Waggon ziehen, um ihn an-/abzukoppeln
STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP :{BLACK}Neues Schienenfahrzeug kaufen
STR_DEPOT_TRAIN_SELL_TOOLTIP :{BLACK}Schienenfahrzeug hierher ziehen, um es zu verkaufen
@@ -2864,7 +2857,6 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP :{BLACK}Zeiten a
##id 0x9000
STR_ERROR_ROAD_VEHICLE_IN_THE_WAY :{WHITE}Fahrzeug ist im Weg
-STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} Fahrzeug{P "" e}
STR_DEPOT_ROAD_CAPTION :{WHITE}{TOWN} Fahrzeugdepot
STR_DEPOT_ROAD_NEW_VEHICLES_BUTTON :{BLACK}Neue Fahrzeuge
STR_BUILD_VEHICLE_ROAD_CAPTION :{WHITE}Neue Fahrzeuge
@@ -2880,7 +2872,6 @@ STR_HEADING_FOR_ROAD_DEPOT_SERVICE :{LTBLUE}Wartung
STR_HEADING_FOR_ROAD_DEPOT_SERVICE_VEL :{LTBLUE}Wartung im Fahrzeugdepot {TOWN}, {VELOCITY}
STR_ERROR_CAN_T_SEND_VEHICLE_TO_DEPOT :{WHITE}Fahrzeug kann nicht ins Depot geschickt werden...
STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT :{WHITE}Fahrzeugdepot unauffindbar
-STR_VEHICLE_LIST_ROAD_TOOLTIP :{BLACK}Straßenfahrzeuge - für Einzelheiten auf das Fahrzeug klicken
STR_VEHICLE_VIEW_ROAD_STATE_START_STOP_TOOLTIP :{BLACK}Laufende Fahrzeugbewegung - Klick zum Anhalten bzw. Losschicken
STR_VEHICLE_VIEW_ROAD_ORDERS_TOOLTIP :{BLACK}Aufträge für das Fahrzeug anzeigen
STR_VEHICLE_VIEW_ROAD_LOCATION_TOOLTIP :{BLACK}Hauptansicht zum Fahrzeug scrollen
@@ -2927,7 +2918,6 @@ STR_WATERWAYS_TOOLBAR_CAPTION_SE :{WHITE}Wasserwe
STR_ERROR_CAN_T_BUILD_DOCK_HERE :{WHITE}Hafen kann hier nicht gebaut werden...
STR_DEPOT_SHIP_CAPTION :{WHITE}{TOWN} Werft
STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON :{BLACK}Neue Schiffe
-STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} Schiff{P "" e}
STR_BUILD_VEHICLE_SHIP_CAPTION :{WHITE}Neue Schiffe
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON :{BLACK}Schiff kaufen
STR_CLONE_SHIP :{BLACK}Schiff kopieren
@@ -2950,7 +2940,6 @@ STR_DEPOT_SHIP_LIST_TOOLTIP :{BLACK}Schiffe
STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP :{BLACK}Neues Schiff kaufen
STR_DEPOT_SHIP_SELL_TOOLTIP :{BLACK}Ziehe Schiff hierher, um es zu verkaufen
STR_DEPOT_SHIP_LOCATION_TOOLTIP :{BLACK}Hauptansicht zur Werft scrollen
-STR_VEHICLE_LIST_SHIP_TOOLTIP :{BLACK}Schiffe - für Einzelheiten auf das Schiff klicken
STR_BUILD_VEHICLE_SHIP_LIST_TOOLTIP :{BLACK}Schiffauswahliste - für Einzelheiten auf das Schiff klicken
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP :{BLACK}Ausgewähltes Schiff kaufen
STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Laufende Schiffsbewegung - Klicke hier, um das Schiff anzuhalten / zu starten
@@ -2992,7 +2981,6 @@ STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}Baut ein
STR_BUILD_VEHICLE_AIRCRAFT_CAPTION :{WHITE}Neue Flugzeuge
STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON :{BLACK}Flugzeug kaufen
STR_ERROR_CAN_T_BUILD_AIRCRAFT :{WHITE}Flugzeug kann nicht gebaut werden...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} Flugzeug{P "" e}
STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR :{WHITE}Flugzeug kann nicht in den Hangar geschickt werden...
STR_HEADING_FOR_HANGAR :{ORANGE}Unterwegs zu {STATION} Hangar
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Unterwegs zu {STATION} Hangar, {VELOCITY}
@@ -3006,7 +2994,6 @@ STR_ERROR_AIRCRAFT_MUST_BE_STOPPED :{WHITE}Flugzeug
STR_ERROR_CAN_T_SELL_AIRCRAFT :{WHITE}Flugzeug kann nicht verkauft werden...
STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :Flughafenbau
STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP :{BLACK}Flughafen bauen
-STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP :{BLACK}Flugzeuge - für Einzelheiten auf das Flugzeug klicken
STR_DEPOT_AIRCRAFT_LIST_TOOLTIP :{BLACK}Flugzeuge - für Einzelheiten auf das Flugzeug klicken
STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP :{BLACK}Neues Flugzeug kaufen
STR_DEPOT_AIRCRAFT_SELL_TOOLTIP :{BLACK}Zum Verkauf des Flugzeuges hierher ziehen
@@ -3188,11 +3175,16 @@ STR_LORRY :{BLACK}{LORRY}
STR_PLANE :{BLACK}{PLANE}
STR_SHIP :{BLACK}{SHIP}
+############ Vehicle lists
+STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP :{BLACK}Züge - für Einzelheiten auf den jeweiligen Zug klicken
+STR_VEHICLE_LIST_ROAD_TOOLTIP :{BLACK}Straßenfahrzeuge - für Einzelheiten auf das Fahrzeug klicken
+STR_VEHICLE_LIST_SHIP_TOOLTIP :{BLACK}Schiffe - für Einzelheiten auf das Schiff klicken
+STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP :{BLACK}Flugzeuge - für Einzelheiten auf das Flugzeug klicken
-STR_SCHEDULED_TRAINS_TIP :{BLACK}Alle Züge, die diesen Bahnhof anfahren, anzeigen
-STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Alle Fahrzeuge, die diese Station anfahren, anzeigen
-STR_SCHEDULED_AIRCRAFT_TIP :{BLACK}Alle Flugzeuge, die diesen Flughafen anfliegen, anzeigen
-STR_SCHEDULED_SHIPS_TIP :{BLACK}Alle Schiffe, die diesen Hafen ansteuern, anzeigen
+STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} Z{P ug üge}
+STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} Fahrzeug{P "" e}
+STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} Schiff{P "" e}
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} Flugzeug{P "" e}
STR_VEH_WITH_SHARED_ORDERS_LIST :{WHITE}Gemeinsamer Fahrplan von {COMMA} Fahrzeug{P "" en}
STR_VEH_WITH_SHARED_ORDERS_LIST_TIP :{BLACK}Alle Fahrzeuge mit demselben Fahrplan anzeigen
@@ -3216,7 +3208,6 @@ STR_DEPOT_AUTOREPLACE_ROADVEH_TIP :{BLACK}Alle Fah
STR_DEPOT_AUTOREPLACE_SHIP_TIP :{BLACK}Alle Schiffe in der Werft automatisch ersetzen
STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP :{BLACK}Alle Flugzeuge im Hangar automatisch ersetzen
-
STR_REPLACE_VEHICLES_WHITE :{WHITE}{STRING} ersetzen
STR_REPLACE_VEHICLES_START :{BLACK}Fahrzeugersetzung an
STR_REPLACE_VEHICLES_STOP :{BLACK}Fahrzeugersetzung aus
@@ -3382,17 +3373,6 @@ STR_MEASURE_AREA :{BLACK}Gebiet:
STR_MEASURE_LENGTH_HEIGHTDIFF :{BLACK}Länge: {NUM}{}Höhenunterschied: {NUM} m
STR_MEASURE_AREA_HEIGHTDIFF :{BLACK}Gebiet: {NUM} × {NUM}{}Höhenunterschied: {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-Einnahmen: {LTBLUE}{CURRENCY}
STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD :{WHITE}...diese Straße ist in kommunaler Trägerschaft
STR_DRIVE_THROUGH_ERROR_DIRECTION :{WHITE}...Straße verläuft in die falsche Richtung
@@ -3417,7 +3397,6 @@ STR_PERCENT_UP_DOWN_SMALL :{TINYFONT}{WHIT
STR_PERCENT_UP_DOWN :{WHITE}{NUM}%{UPARROW}{DOWNARROW}
##### Mass Order
-STR_FORMAT_GROUP_NAME :Gruppe {COMMA}
STR_GROUP_TINY_NAME :{TINYFONT}{GROUP}
STR_GROUP_ALL_TRAINS :Alle Züge
STR_GROUP_ALL_ROADS :Alle Straßenfahrzeuge
@@ -3446,12 +3425,35 @@ STR_GROUP_DELETE_TIP :{BLACK}Ausgewä
STR_GROUP_RENAME_TIP :{BLACK}Ausgewählte Gruppe umbenennen
STR_GROUP_REPLACE_PROTECTION_TIP :{BLACK}Diese Gruppe von der automatischen Fahrzeugersetzung ausschließen
+#### 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}Name bereits vergeben
diff --git a/src/lang/russian.txt b/src/lang/russian.txt
index e44f99fe2..b86c25bae 100644
--- a/src/lang/russian.txt
+++ b/src/lang/russian.txt
@@ -911,9 +911,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}* * ПАУЗА * *
@@ -1346,7 +1343,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}Невозможно переименовать точку пути...
@@ -1927,11 +1923,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 :Высадка деревьев
@@ -1986,6 +1977,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.acc}
STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION} больше не принимает {STRING.acc} и {STRING.acc}
@@ -2328,7 +2325,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}Цвет:
@@ -2339,7 +2335,7 @@ STR_QUERY_COMPANY_NAME_CAPTION :Компани
STR_QUERY_PRESIDENT_S_NAME_CAPTION :Имя директора
STR_ERROR_CAN_T_CHANGE_COMPANY_NAME :{WHITE}Невозможно изменить название компании...
STR_ERROR_CAN_T_CHANGE_PRESIDENT :{WHITE}Невозможно изменить имя директора...
-STR_FINANCES_CAPTION :{WHITE}{COMPANY} Денежные средства {BLACK}{COMPANYNUM}
+STR_FINANCES_CAPTION :{WHITE}Финансы - {COMPANY} {BLACK}{COMPANYNUM}
STR_FINANCES_EXPENDITURE_INCOME_TITLE :{WHITE}Расход/доход
STR_FINANCES_YEAR :{WHITE}{NUM}
STR_FINANCES_SECTION_CONSTRUCTION :{GOLD}Строительство
@@ -2361,7 +2357,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}Ссуда
@@ -2688,7 +2683,7 @@ STR_VEHICLE_NAME_ROAD_MIGHTYMOVER_TOY_VAN :Грузови
STR_VEHICLE_NAME_ROAD_POWERNAUGHT_TOY_VAN :Грузовик Powernaught (игрушки)
STR_VEHICLE_NAME_ROAD_WIZZOWOW_TOY_VAN :Грузовик Wizzowow (игрушки)
STR_VEHICLE_NAME_ROAD_MIGHTYMOVER_CANDY_TRUCK :Грузовик MightyMover (конфеты)
-STR_VEHICLE_NAME_ROAD_POWERNAUGHT_CANDY_TRUCK :Powernaught Грузовик (конфеты)
+STR_VEHICLE_NAME_ROAD_POWERNAUGHT_CANDY_TRUCK :Грузовик Powernaught (конфеты)
STR_VEHICLE_NAME_ROAD_WIZZOWOW_CANDY_TRUCK :Грузовик Wizzowow (конфеты)
STR_VEHICLE_NAME_ROAD_MIGHTYMOVER_BATTERY_TRUCK :Грузовик MightyMover (батарейки)
STR_VEHICLE_NAME_ROAD_POWERNAUGHT_BATTERY_TRUCK :Грузовик Powernaught (батарейки)
@@ -2879,7 +2874,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}Новый электропоезд
@@ -2937,7 +2931,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}Перетащите сюда транспорт, чтобы продать его
@@ -3026,7 +3019,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}Новая машина
@@ -3042,7 +3034,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}Показать автомобиль в главном окне
@@ -3089,7 +3080,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}Копировать
@@ -3112,7 +3102,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}Текущее действие корабля; кликните для его остановки/запуска
@@ -3154,7 +3143,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}
@@ -3168,7 +3156,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}Перетащите сюда транспорт, чтобы продать его
@@ -3350,11 +3337,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} ед. транспорта
STR_VEH_WITH_SHARED_ORDERS_LIST_TIP :{BLACK}Показать весь транспорт с общими заданиями
@@ -3378,7 +3370,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.gen}
STR_REPLACE_VEHICLES_START :{BLACK}Начать замену
STR_REPLACE_VEHICLES_STOP :{BLACK}Прекратить замену
@@ -3544,17 +3535,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.gen} {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}...неверное направление дороги
@@ -3579,7 +3559,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 :Весь автотранспорт
@@ -3608,12 +3587,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.gen} {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}Имя должно быть уникальным
@@ -3742,12 +3744,18 @@ STR_STATION_NOISE :{BLACK}Прои
############ 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 :Библиотека ИИ
-STR_CONTENT_TYPE_SCENARIO :Сценарии
-STR_CONTENT_TYPE_HEIGHTMAP :Высотные карты
+STR_CONTENT_TYPE_BASE_GRAPHICS :{G=f}Базовая графика
+STR_CONTENT_TYPE_BASE_GRAPHICS.acc :{G=m}набор базовой графики
+STR_CONTENT_TYPE_NEWGRF :{G=m}NewGRF
+STR_CONTENT_TYPE_NEWGRF.acc :{G=m}NewGRF
+STR_CONTENT_TYPE_AI :{G=m}ИИ
+STR_CONTENT_TYPE_AI.acc :{G=m}ИИ
+STR_CONTENT_TYPE_AI_LIBRARY :{G=f}Библиотека ИИ
+STR_CONTENT_TYPE_AI_LIBRARY.acc :{G=f}библиотеку ИИ
+STR_CONTENT_TYPE_SCENARIO :{G=m}Сценарий
+STR_CONTENT_TYPE_SCENARIO.acc :{G=m}сценарий
+STR_CONTENT_TYPE_HEIGHTMAP :{G=f}Карта высот
+STR_CONTENT_TYPE_HEIGHTMAP.acc :{G=f}карту высот
STR_CONTENT_TITLE :{WHITE}Загрузка контента
STR_CONTENT_TYPE_CAPTION :{BLACK}Тип
STR_CONTENT_TYPE_CAPTION_TIP :{BLACK}Тип контента
@@ -3772,7 +3780,7 @@ 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_UPDATE :{SILVER}Он заменит уже имеющ{G ий ую ее ие}ся {STRING.acc}
STR_CONTENT_DETAIL_NAME :{SILVER}Наименование: {WHITE}{STRING}
STR_CONTENT_DETAIL_VERSION :{SILVER}Версия: {WHITE}{STRING}
STR_CONTENT_DETAIL_DESCRIPTION :{SILVER}Описание: {WHITE}{STRING}
diff --git a/src/lang/serbian.txt b/src/lang/serbian.txt
index 4e1e41eea..9f231ee04 100644
--- a/src/lang/serbian.txt
+++ b/src/lang/serbian.txt
@@ -920,9 +920,6 @@ STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :Finansiranje iz
############ range ends here
STR_FUND_INDUSTRY_CAPTION :{WHITE}Finansiranje izgradnje nove industrije
-STR_JUST_STRING :{STRING}
-STR_JUST_RAW_STRING :{STRING}
-STR_JUST_INT :{NUM}
STR_ERROR_CAN_ONLY_BE_BUILT_IN_RAINFOREST :{WHITE}...gradnja je dozvoljena samo u područjima pod tropskim šumama
STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT :{WHITE}...gradnja je dozvoljena samo u pustinjskim oblastima
STR_STATUSBAR_PAUSED :{YELLOW}* * PAUZA * *
@@ -1328,8 +1325,8 @@ STR_SUB_TROPICAL_LANDSCAPE :Suptropski klim
STR_TOYLAND_LANDSCAPE :Zemlja igračaka
STR_CHEATS :{WHITE}Varanja
-STR_CHEATS_TIP :{BLACK}Štiklirano polje označava da ste i renije koristili ovu opciju
-STR_CHEATS_WARNING :{BLACK}Upozorenje! Upravo ćete revariti vaše saradnike. Imajte na umu da će takav loš postupak biti trajno upamćen.
+STR_CHEATS_TIP :{BLACK}Štiklirano polje označava da ste i ranije koristili ovu opciju
+STR_CHEATS_WARNING :{BLACK}Upozorenje! Upravo ćete prevariti vaše saradnike. Imajte na umu da će takav loš postupak biti trajno upamćen.
STR_CHEAT_MONEY :{LTBLUE}Dodati još {CURRENCY}
STR_CHEAT_CHANGE_COMPANY :{LTBLUE}Upravljanje kompanijom: {ORANGE}{COMMA}
STR_CHEAT_EXTRA_DYNAMITE :{LTBLUE}Magični buldožer (uklonite industrije, nepokretnosti): {ORANGE}{STRING}
@@ -1355,7 +1352,6 @@ STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Odaberit
STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT}
STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT}
-STR_WAYPOINT_NAME :{WAYPOINT}
STR_EDIT_WAYPOINT_NAME :{WHITE}Promena naziva čvorišta
STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}Neuspešana promena naziva čvorišta...
@@ -1936,11 +1932,6 @@ STR_TOWN_BUILDING_NAME_TEPEES_1 :Vigvami
STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1 :Čajnik-kuća
STR_TOWN_BUILDING_NAME_PIGGY_BANK_1 :Kasica-prasica
-STR_INDUSTRY_NAME :{INDUSTRY}
-STR_TOWN_NAME :{TOWN}
-STR_FORMAT_INDUSTRY_NAME :{TOWN} {STRING}
-STR_STATION_NAME :{STATION}
-
##id 0x2800
STR_LANDSCAPING_MENU_LANDSCAPING :Oblikovanje reljefa
STR_LANDSCAPING_MENU_PLANT_TREES :Posadi drvo
@@ -1995,6 +1986,8 @@ STR_CARGO_RATING_EXCELLENT :odlično
STR_CARGO_RATING_OUTSTANDING :izvanredno
############ 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} više ne prihvata {STRING}
STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION} više ne prihvata ni {STRING} ni {STRING}
@@ -2329,7 +2322,6 @@ STR_CITY_APPROVAL_HOSTILE :Neprijateljski
##id 0x7000
STR_COMPANY_VIEW_CAPTION :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
-STR_FORMAT_COMPANY_NUM :(Kompanija {COMMA})
STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Novo lice
STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON :{BLACK}Šema boja
STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE :{GOLD}Šema boja:
@@ -2362,7 +2354,6 @@ STR_FINANCES_TOTAL_CAPTION :{WHITE}Ukupno:
STR_COMPANY_NAME_COMPANY_NUM :{COMPANY} {COMPANYNUM}
STR_GRAPH_INCOME_CAPTION :{WHITE}Grafikon prihoda
STR_CURRCOMPACT :{CURRCOMPACT}
-STR_JUST_COMMA :{COMMA}
STR_GRAPH_OPERATING_PROFIT_CAPTION :{WHITE}Grafikon operativnog profita
STR_FINANCES_BANK_BALANCE_TITLE :{WHITE}Stanje na računu
STR_FINANCES_LOAN_TITLE :{WHITE}Zajam
@@ -2729,7 +2720,6 @@ STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON :{BLACK}Nova Voz
STR_DEPOT_NO_ENGINE :{BLACK}-
STR_ERROR_TRAIN_TOO_LONG :{WHITE}Voz je predugačak
STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT :{WHITE}Vozovi se mogu izmeniti samo kada su zaustavljeni u depou
-STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} Voz{P "" a ova}
STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION :{WHITE}Nova Železnička Vozila
STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION :{WHITE}Nova Železnička Električna Vozila
@@ -2787,7 +2777,6 @@ STR_ERROR_UNABLE_TO_FIND_ROUTE_TO :{WHITE}Nepostoj
STR_ERROR_CAN_T_STOP_START_TRAIN :{WHITE}Ne može se pokrenuti/zaustaviti voz...
STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS :{BLACK}Period servisiranja: {LTBLUE}{COMMA}dana{BLACK} Poslednji servis: {LTBLUE}{DATE_LONG}
STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT :{BLACK}Period servisiranja: {LTBLUE}{COMMA}%{BLACK} Poslednji servis: {LTBLUE}{DATE_LONG}
-STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP :{BLACK}Vozovi - kliknite na voz za podatke
STR_DEPOT_TRAIN_LIST_TOOLTIP :{BLACK}Vozovi - kliknite na voz za podatke, prevucite vozilo da bi dodali/sklonili iz kompozicije
STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP :{BLACK}Kupite nova šinska vozila
STR_DEPOT_TRAIN_SELL_TOOLTIP :{BLACK}Ovde prevucite šinsko vozilo kako biste ga prodali
@@ -2876,7 +2865,6 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP :{BLACK}Popunjav
##id 0x9000
STR_ERROR_ROAD_VEHICLE_IN_THE_WAY :{WHITE}Drumsko vozilo na putu
-STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} Drumsk{P o a ih} Vozil{P o a a}
STR_DEPOT_ROAD_CAPTION :{WHITE}{TOWN} Depo Drumskih Vozila
STR_DEPOT_ROAD_NEW_VEHICLES_BUTTON :{BLACK}Nova Vozila
STR_BUILD_VEHICLE_ROAD_CAPTION :{WHITE}Nova Drumska Vozila
@@ -2892,7 +2880,6 @@ STR_HEADING_FOR_ROAD_DEPOT_SERVICE :{LTBLUE}Servisi
STR_HEADING_FOR_ROAD_DEPOT_SERVICE_VEL :{LTBLUE}Servisiranje u {TOWN} Drumskom Depou, {VELOCITY}
STR_ERROR_CAN_T_SEND_VEHICLE_TO_DEPOT :{WHITE}Vozilo ne može da ode u depo...
STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT :{WHITE}Neuspešan pronalazak lokalnog depoa
-STR_VEHICLE_LIST_ROAD_TOOLTIP :{BLACK}Drumska vozila - kliknite na vozilo za podatke
STR_VEHICLE_VIEW_ROAD_STATE_START_STOP_TOOLTIP :{BLACK}Trenutno stanje vozila - kliknite ovde za zaustavljanje/pokretanje vozila
STR_VEHICLE_VIEW_ROAD_ORDERS_TOOLTIP :{BLACK}Prikazuje naredbe vozilu
STR_VEHICLE_VIEW_ROAD_LOCATION_TOOLTIP :{BLACK}Prebacite se na lokaciju vozila
@@ -2939,7 +2926,6 @@ STR_WATERWAYS_TOOLBAR_CAPTION_SE :{WHITE}Plovni k
STR_ERROR_CAN_T_BUILD_DOCK_HERE :{WHITE}Izgradnja pristaništa ovde nije moguća...
STR_DEPOT_SHIP_CAPTION :{WHITE}{TOWN} Depo Plovila
STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON :{BLACK}Novi Brodovi
-STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} Brod{P "" a ova}
STR_BUILD_VEHICLE_SHIP_CAPTION :{WHITE}Novi Brodovi
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON :{BLACK}Kupi Brod
STR_CLONE_SHIP :{BLACK}Kopiraj Brod
@@ -2962,7 +2948,6 @@ STR_DEPOT_SHIP_LIST_TOOLTIP :{BLACK}Brodovi
STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP :{BLACK}Kupovina novog broda
STR_DEPOT_SHIP_SELL_TOOLTIP :{BLACK}Ovde prevucite brod kako biste ga prodali
STR_DEPOT_SHIP_LOCATION_TOOLTIP :{BLACK}Prebacite se na lokaciju broda
-STR_VEHICLE_LIST_SHIP_TOOLTIP :{BLACK}Brodovi - kliknite na brod za podatke
STR_BUILD_VEHICLE_SHIP_LIST_TOOLTIP :{BLACK}Spisak probranih brodova - kliknite na brod za više podataka
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP :{BLACK}Kupite označeni brod
STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Trenutno stanje broda - kliknite ovde za zaustavljanje/pokretanje broda
@@ -3004,7 +2989,6 @@ STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}Ovim će
STR_BUILD_VEHICLE_AIRCRAFT_CAPTION :{WHITE}Nove Letilice
STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON :{BLACK}Napraviti Letelicu
STR_ERROR_CAN_T_BUILD_AIRCRAFT :{WHITE}Letelice se ne može napraviti
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} Leteluca
STR_BUILD_VEHICLE_AIRCRAFT_RENAME_TOOLTIP :{BLACK}Promenite naziv vrste letilice
STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION :{WHITE}Promena naziva vrste letilice
@@ -3162,7 +3146,15 @@ STR_TOOLTIP_SET_CUSTOM_CURRENCY_TO_EURO :{BLACK}Odredite
STR_TOOLTIP_CUSTOM_CURRENCY_PREVIEW :{BLACK}10000 funti (£) u vašoj moneti
+############ Vehicle lists
+STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP :{BLACK}Vozovi - kliknite na voz za podatke
+STR_VEHICLE_LIST_ROAD_TOOLTIP :{BLACK}Drumska vozila - kliknite na vozilo za podatke
+STR_VEHICLE_LIST_SHIP_TOOLTIP :{BLACK}Brodovi - kliknite na brod za podatke
+STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} Voz{P "" a ova}
+STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} Drumsk{P o a ih} Vozil{P o a a}
+STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} Brod{P "" a ova}
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} Leteluca
### depot strings
@@ -3177,7 +3169,6 @@ STR_TOOLTIP_CUSTOM_CURRENCY_PREVIEW :{BLACK}10000 fu
-
############ Lists rail types
@@ -3269,17 +3260,6 @@ STR_MEASURE_AREA :{BLACK}Područj
STR_MEASURE_LENGTH_HEIGHTDIFF :{BLACK}Dužina: {NUM}{}Visinska razlika: {NUM} m
STR_MEASURE_AREA_HEIGHTDIFF :{BLACK}Područje: {NUM} x {NUM}{}Visinska razlika: {NUM} m
-############ Date formatting
-STR_FORMAT_DATE_TINY :{STRING}-{STRING}-{NUM}
-STR_FORMAT_DATE_SHORT :{STRING} {NUM}
-STR_FORMAT_DATE_LONG :{STRING} {STRING} {NUM}
-STR_FORMAT_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING}
-
-STR_JUST_DATE_TINY :{DATE_TINY}
-STR_JUST_DATE_LONG :{DATE_LONG}
-STR_JUST_DATE_ISO :{DATE_ISO}
-########
-
STR_FEEDER_CARGO_VALUE :{BLACK}Zarada od transfera: {LTBLUE}{CURRENCY}
STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD :{WHITE}...ova ulica je u vlasništvu naselja
STR_DRIVE_THROUGH_ERROR_DIRECTION :{WHITE}...ulica je okrenuta u drugom pravcu
@@ -3304,7 +3284,6 @@ STR_PERCENT_UP_DOWN_SMALL :{TINYFONT}{WHIT
STR_PERCENT_UP_DOWN :{WHITE}{NUM}%{UPARROW}{DOWNARROW}
##### Mass Order
-STR_FORMAT_GROUP_NAME :Grupa {COMMA}
STR_GROUP_TINY_NAME :{TINYFONT}{GROUP}
STR_GROUP_ALL_TRAINS :Svi vozovi
STR_GROUP_ALL_ROADS :Sva drumska vozila
@@ -3318,6 +3297,28 @@ STR_GROUP_DEFAULT_AIRCRAFTS :Negrupisane let
+#### String control codes and their formatting
+STR_INDUSTRY_NAME :{INDUSTRY}
+STR_STATION_NAME :{STATION}
+STR_TOWN_NAME :{TOWN}
+STR_WAYPOINT_NAME :{WAYPOINT}
+
+STR_JUST_COMMA :{COMMA}
+STR_JUST_INT :{NUM}
+STR_JUST_DATE_TINY :{DATE_TINY}
+STR_JUST_DATE_LONG :{DATE_LONG}
+STR_JUST_DATE_ISO :{DATE_ISO}
+STR_JUST_STRING :{STRING}
+STR_JUST_RAW_STRING :{STRING}
+
+STR_FORMAT_DATE_TINY :{STRING}-{STRING}-{NUM}
+STR_FORMAT_DATE_SHORT :{STRING} {NUM}
+STR_FORMAT_DATE_LONG :{STRING} {STRING} {NUM}
+STR_FORMAT_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING}
+
+STR_FORMAT_COMPANY_NUM :(Kompanija {COMMA})
+STR_FORMAT_GROUP_NAME :Grupa {COMMA}
+STR_FORMAT_INDUSTRY_NAME :{TOWN} {STRING}
#### Improved sign GUI