summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/lang/danish.txt9
-rw-r--r--src/lang/dutch.txt74
-rw-r--r--src/lang/finnish.txt106
-rw-r--r--src/lang/hungarian.txt74
-rw-r--r--src/lang/italian.txt74
-rw-r--r--src/lang/korean.txt74
-rw-r--r--src/lang/russian.txt18
-rw-r--r--src/lang/serbian.txt144
-rw-r--r--src/lang/simplified_chinese.txt76
-rw-r--r--src/lang/welsh.txt99
10 files changed, 411 insertions, 337 deletions
diff --git a/src/lang/danish.txt b/src/lang/danish.txt
index 1933a35d3..e15be932b 100644
--- a/src/lang/danish.txt
+++ b/src/lang/danish.txt
@@ -891,7 +891,7 @@ STR_CANT_COPY_ORDER_LIST :{WHITE}Kan ikke
STR_END_OF_SHARED_ORDERS :{SETX 10}- - Slut på delt ordreliste - -
STR_TRAIN_IS_STUCK :{WHITE}{VEHICLE} kan ikke finde en rute at fortsætte ad.
-STR_TRAIN_IS_LOST :{WHITE}{VEHICLE} er gået tabt.
+STR_TRAIN_IS_LOST :{WHITE}{VEHICLE} er faret vild.
STR_VEHICLE_IS_UNPROFITABLE :{WHITE}{VEHICLE}s indtjening sidste år var {CURRENCY}
STR_EURO_INTRODUCE :{BLACK}{BIGFONT}Europæisk fællesvaluta!{}{}Euroen er introduceret som eneste betalingsmiddel i dit land!
@@ -1595,10 +1595,10 @@ STR_BUILD_DEPOT_TRAIN_ORIENTATION :{BLACK}Vælg or
STR_RAILROAD_TRACK :Jernbaneskinner
STR_RAILROAD_TRAIN_DEPOT :Remise
STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}...området ejes af et andet selskab
-STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS :Jernbane med almindelige signaler
+STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS :Jernbane med blok signaler
STR_RAILROAD_TRACK_WITH_PRESIGNALS :Jernbane med præ-signaler
STR_RAILROAD_TRACK_WITH_EXITSIGNALS :Jernbane med exit-signaler
-STR_RAILROAD_TRACK_WITH_COMBOSIGNALS :Jernbaneskinne med kombi-signaler
+STR_RAILROAD_TRACK_WITH_COMBOSIGNALS :Jernbane med kombi-signaler
STR_RAILROAD_TRACK_WITH_PBSSIGNALS :Jernbane med avancerede signaler
STR_RAILROAD_TRACK_WITH_NOENTRYSIGNALS :Jernbane med ensrettede avancerede signaler
STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS :Jernbanespor med normale og præ-signaler
@@ -2730,7 +2730,7 @@ STR_ORDERS_SKIP_BUTTON :{BLACK}Spring o
STR_ORDERS_DELETE_BUTTON :{BLACK}Slet
STR_ORDERS_GO_TO_BUTTON :{BLACK}Gå til
STR_REFIT :{BLACK}Ombyg
-STR_REFIT_TIP :{BLACK}Vælg hvilken lasttype der skal ombygges til i denne ordre. CTRL-klik for at fjerne ombygningsinstruktion
+STR_REFIT_TIP :{BLACK}Vælg hvilken lasttype, der skal ombygges til i denne ordre. CTRL-klik for at fjerne ombygningsinstruktion
STR_REFIT_ORDER :(Ombyg til {STRING})
STR_REFIT_STOP_ORDER :(Ombyg til {STRING} og stop)
STR_STOP_ORDER :(Stop)
@@ -3439,6 +3439,7 @@ 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}
diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt
index 43e86d82d..8cc0015aa 100644
--- a/src/lang/dutch.txt
+++ b/src/lang/dutch.txt
@@ -762,9 +762,6 @@ STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :Subsidieer nieu
############ range ends here
STR_FUND_INDUSTRY_CAPTION :{WHITE}Betaal nieuwe industrie
-STR_JUST_STRING :{STRING}
-STR_JUST_RAW_STRING :{STRING}
-STR_JUST_INT :{NUM}
STR_ERROR_CAN_ONLY_BE_BUILT_IN_RAINFOREST :{WHITE}...kan alleen in het regenwoud gebouwd worden
STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT :{WHITE}...kan alleen in woestijngebieden gebouwd worden
STR_STATUSBAR_PAUSED :{YELLOW}* * GEPAUZEERD * *
@@ -1197,7 +1194,6 @@ STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Selectee
STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT}
STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT}
-STR_WAYPOINT_NAME :{WAYPOINT}
STR_EDIT_WAYPOINT_NAME :{WHITE}Naam controlepost aanpassen
STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}Kan naam controlepost niet aanpassen...
@@ -1778,11 +1774,6 @@ STR_TOWN_BUILDING_NAME_TEPEES_1 :Tepees
STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1 :Theepothuis
STR_TOWN_BUILDING_NAME_PIGGY_BANK_1 :Varkensbank
-STR_INDUSTRY_NAME :{INDUSTRY}
-STR_TOWN_NAME :{TOWN}
-STR_FORMAT_INDUSTRY_NAME :{TOWN} {STRING}
-STR_STATION_NAME :{STATION}
-
##id 0x2800
STR_LANDSCAPING_MENU_LANDSCAPING :Terreinvorming
STR_LANDSCAPING_MENU_PLANT_TREES :Plant bomen
@@ -1837,6 +1828,12 @@ STR_CARGO_RATING_EXCELLENT :Geweldig
STR_CARGO_RATING_OUTSTANDING :Uitstekend
############ range for rating ends
+### station view strings
+STR_SCHEDULED_TRAINS_TIP :{BLACK}Geef alle treinen weer die dit station in hun opdrachtenlijst hebben
+STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Geef alle wagens weer die dit station in hun opdrachtenlijst hebben
+STR_SCHEDULED_AIRCRAFT_TIP :{BLACK}Geef alle vliegtuigen weer die dit station in hun opdrachtenlijst hebben
+STR_SCHEDULED_SHIPS_TIP :{BLACK}Geef alle schepen weer die dit station in hun opdrachtenlijst hebben
+
STR_STATION_VIEW_CARGO_RATING :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}{STATION} accepteert niet langer {STRING}
STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION} accepteert niet langer {STRING} en {STRING}
@@ -2171,7 +2168,6 @@ STR_CITY_APPROVAL_HOSTILE :Negatief
##id 0x7000
STR_COMPANY_VIEW_CAPTION :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
-STR_FORMAT_COMPANY_NUM :(Bedrijf {COMMA})
STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Nieuw gezicht
STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON :{BLACK}Kleurenschema
STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE :{GOLD}Kleurenschema:
@@ -2204,7 +2200,6 @@ STR_FINANCES_TOTAL_CAPTION :{WHITE}Totaal:
STR_COMPANY_NAME_COMPANY_NUM :{COMPANY} {COMPANYNUM}
STR_GRAPH_INCOME_CAPTION :{WHITE}Inkomstengrafiek
STR_CURRCOMPACT :{CURRCOMPACT}
-STR_JUST_COMMA :{COMMA}
STR_GRAPH_OPERATING_PROFIT_CAPTION :{WHITE}Bedrijfswinst Grafiek
STR_FINANCES_BANK_BALANCE_TITLE :{WHITE}Banksaldo
STR_FINANCES_LOAN_TITLE :{WHITE}Lening
@@ -2716,7 +2711,6 @@ STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON :{BLACK}Nieuwe v
STR_DEPOT_NO_ENGINE :{BLACK}-
STR_ERROR_TRAIN_TOO_LONG :{WHITE}Trein te lang
STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT :{WHITE}Treinen kunnen alleen aangepast worden wanneer ze gestopt zijn binnen een depot
-STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} Treinen
STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION :{WHITE}Nieuwe spoorvoertuigen
STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION :{WHITE}Nieuwe elektrische spoorvoertuigen
@@ -2774,7 +2768,6 @@ STR_ERROR_UNABLE_TO_FIND_ROUTE_TO :{WHITE}Kan geen
STR_ERROR_CAN_T_STOP_START_TRAIN :{WHITE}Kan trein niet starten of stoppen...
STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS :{BLACK}Reparatie-interval: {LTBLUE}{COMMA}dagen{BLACK} Laatste reparatie: {LTBLUE}{DATE_LONG}
STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT :{BLACK}Service interval: {LTBLUE}{COMMA}%{BLACK} Laatste service: {LTBLUE}{DATE_LONG}
-STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP :{BLACK}Treinen - klik op een trein voor informatie
STR_DEPOT_TRAIN_LIST_TOOLTIP :{BLACK}Treinen - klik op trein voor info., sleep voertuig om toe toevoegen/verwijderen van trein
STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP :{BLACK}Bouw nieuw treinonderdeel
STR_DEPOT_TRAIN_SELL_TOOLTIP :{BLACK}Sleep treinonderdeel hier om het te verkopen
@@ -2863,7 +2856,6 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP :{BLACK}Vul de d
##id 0x9000
STR_ERROR_ROAD_VEHICLE_IN_THE_WAY :{WHITE}Wegvoertuig in de weg
-STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} Wegvoertuigen
STR_DEPOT_ROAD_CAPTION :{WHITE}{TOWN} Bouw wegvoertuigdepot
STR_DEPOT_ROAD_NEW_VEHICLES_BUTTON :{BLACK}Nieuwe voertuigen
STR_BUILD_VEHICLE_ROAD_CAPTION :{WHITE}Nieuwe Wegvoertuigen
@@ -2879,7 +2871,6 @@ STR_HEADING_FOR_ROAD_DEPOT_SERVICE :{LTBLUE}Onderho
STR_HEADING_FOR_ROAD_DEPOT_SERVICE_VEL :{LTBLUE}Onderhoud bij {TOWN} Weg Depot, {VELOCITY}
STR_ERROR_CAN_T_SEND_VEHICLE_TO_DEPOT :{WHITE}Kan voertuig niet naar depot sturen...
STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT :{WHITE}Kan geen lokaal depot vinden
-STR_VEHICLE_LIST_ROAD_TOOLTIP :{BLACK}Wegvoertuigen - klik op een voertuig voor informatie
STR_VEHICLE_VIEW_ROAD_STATE_START_STOP_TOOLTIP :{BLACK}Huidige actie van voertuig - klik hier om voertuig te starten of te stoppen
STR_VEHICLE_VIEW_ROAD_ORDERS_TOOLTIP :{BLACK}Laat orders van voertuig zien
STR_VEHICLE_VIEW_ROAD_LOCATION_TOOLTIP :{BLACK}Centreer hoofdscherm op de locatie van het voertuig
@@ -2926,7 +2917,6 @@ STR_WATERWAYS_TOOLBAR_CAPTION_SE :{WHITE}Kanalen
STR_ERROR_CAN_T_BUILD_DOCK_HERE :{WHITE}Kan hier geen haven bouwen...
STR_DEPOT_SHIP_CAPTION :{WHITE}{TOWN} Scheepswerf
STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON :{BLACK}Nieuwe schepen
-STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} Schepen
STR_BUILD_VEHICLE_SHIP_CAPTION :{WHITE}Nieuwe schepen
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON :{BLACK}Bouw schip
STR_CLONE_SHIP :{BLACK}Kloon Schip
@@ -2949,7 +2939,6 @@ STR_DEPOT_SHIP_LIST_TOOLTIP :{BLACK}Schepen
STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP :{BLACK}Bouw nieuw schip
STR_DEPOT_SHIP_SELL_TOOLTIP :{BLACK}Sleep schip hierheen om het te verkopen
STR_DEPOT_SHIP_LOCATION_TOOLTIP :{BLACK}Centreer hoofdbeeld op de locatie van het schipdepot
-STR_VEHICLE_LIST_SHIP_TOOLTIP :{BLACK}Schepen - klik op een schip voor informatie
STR_BUILD_VEHICLE_SHIP_LIST_TOOLTIP :{BLACK}Schepenlijst - klik op een schip voor informatie
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP :{BLACK}Bouw het geselecteerde schip
STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Actie van dit schip - klik hier om het te starten of te stoppen
@@ -2991,7 +2980,6 @@ STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}Hierdoor
STR_BUILD_VEHICLE_AIRCRAFT_CAPTION :{WHITE}Nieuw Vliegtuig
STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON :{BLACK}Bouw Vliegtuig
STR_ERROR_CAN_T_BUILD_AIRCRAFT :{WHITE}Kan vliegtuig niet bouwen...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} Vliegtuigen
STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR :{WHITE}Kan vliegtuig niet naar hangar sturen...
STR_HEADING_FOR_HANGAR :{ORANGE}Op weg naar {STATION} Hangar
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Op weg naar {STATION} Hangar, {VELOCITY}
@@ -3005,7 +2993,6 @@ STR_ERROR_AIRCRAFT_MUST_BE_STOPPED :{WHITE}Vliegtui
STR_ERROR_CAN_T_SELL_AIRCRAFT :{WHITE}Kan vliegtuig niet verkopen...
STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :Vliegveldbouw
STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP :{BLACK}Bouw vliegveld
-STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP :{BLACK}Vliegtuig - klik op vliegtuig voor informatie
STR_DEPOT_AIRCRAFT_LIST_TOOLTIP :{BLACK}Vliegtuig - klik op vliegtuig voor informatie
STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP :{BLACK}Bouw nieuw vliegtuig
STR_DEPOT_AIRCRAFT_SELL_TOOLTIP :{BLACK}Sleep vliegtuig hierheen om het te verkopen
@@ -3187,11 +3174,16 @@ STR_LORRY :{BLACK}{LORRY}
STR_PLANE :{BLACK}{PLANE}
STR_SHIP :{BLACK}{SHIP}
+############ Vehicle lists
+STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP :{BLACK}Treinen - klik op een trein voor informatie
+STR_VEHICLE_LIST_ROAD_TOOLTIP :{BLACK}Wegvoertuigen - klik op een voertuig voor informatie
+STR_VEHICLE_LIST_SHIP_TOOLTIP :{BLACK}Schepen - klik op een schip voor informatie
+STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP :{BLACK}Vliegtuig - klik op vliegtuig voor informatie
-STR_SCHEDULED_TRAINS_TIP :{BLACK}Geef alle treinen weer die dit station in hun opdrachtenlijst hebben
-STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Geef alle wagens weer die dit station in hun opdrachtenlijst hebben
-STR_SCHEDULED_AIRCRAFT_TIP :{BLACK}Geef alle vliegtuigen weer die dit station in hun opdrachtenlijst hebben
-STR_SCHEDULED_SHIPS_TIP :{BLACK}Geef alle schepen weer die dit station in hun opdrachtenlijst hebben
+STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} Treinen
+STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} Wegvoertuigen
+STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} Schepen
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} Vliegtuigen
STR_VEH_WITH_SHARED_ORDERS_LIST :{WHITE}Gedeelde orders van {COMMA} voertuig{P "" en}
STR_VEH_WITH_SHARED_ORDERS_LIST_TIP :{BLACK}Toon alle voertuigen met deze zelfde orders
@@ -3215,7 +3207,6 @@ STR_DEPOT_AUTOREPLACE_ROADVEH_TIP :{BLACK}Vervang
STR_DEPOT_AUTOREPLACE_SHIP_TIP :{BLACK}Vervang automatisch alle schepen in het depot
STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP :{BLACK}Vervang automatisch alle vliegtuigen in de hangar
-
STR_REPLACE_VEHICLES_WHITE :{WHITE}Vervang {STRING}
STR_REPLACE_VEHICLES_START :{BLACK}Start het Vervangen
STR_REPLACE_VEHICLES_STOP :{BLACK}Stop het Vervangen
@@ -3381,17 +3372,6 @@ STR_MEASURE_AREA :{BLACK}Gebied:
STR_MEASURE_LENGTH_HEIGHTDIFF :{BLACK}Lengte: {NUM}{}Hoogte verschil: {NUM} m
STR_MEASURE_AREA_HEIGHTDIFF :{BLACK}Gebied: {NUM} x {NUM}{}Hoogte verschil: {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}Geldoverdracht: {LTBLUE}{CURRENCY}
STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD :{WHITE}...deze weg is van een stad
STR_DRIVE_THROUGH_ERROR_DIRECTION :{WHITE}...weg is in de verkeerde richting
@@ -3416,7 +3396,6 @@ STR_PERCENT_UP_DOWN_SMALL :{TINYFONT}{WHIT
STR_PERCENT_UP_DOWN :{WHITE}{NUM}%{UPARROW}{DOWNARROW}
##### Mass Order
-STR_FORMAT_GROUP_NAME :Groep {COMMA}
STR_GROUP_TINY_NAME :{TINYFONT}{GROUP}
STR_GROUP_ALL_TRAINS :Alle treinen
STR_GROUP_ALL_ROADS :Alle voertuigen
@@ -3445,12 +3424,35 @@ STR_GROUP_DELETE_TIP :{BLACK}Verwijde
STR_GROUP_RENAME_TIP :{BLACK}Hernoem de geselecteerde groep
STR_GROUP_REPLACE_PROTECTION_TIP :{BLACK}Klik om deze groep te beschermen tegen globaal automatisch vervangen
+#### 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 :(Bedrijf {COMMA})
+STR_FORMAT_GROUP_NAME :Groep {COMMA}
+STR_FORMAT_INDUSTRY_NAME :{TOWN} {STRING}
STR_NAME_MUST_BE_UNIQUE :{WHITE}Naam moet uniek zijn
diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt
index 4c7c23e25..f3a918b8c 100644
--- a/src/lang/finnish.txt
+++ b/src/lang/finnish.txt
@@ -311,7 +311,7 @@ STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Yhtiökilpataul
STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Suoritearviointi
############ range for menu ends
-STR_ABOUT_OPENTTD :{WHITE}Tietoa OpenTTD:stä
+STR_ABOUT_OPENTTD :{WHITE}Tietoja OpenTTD:stä
STR_FILE_MENU_SAVE_GAME :Tallenna peli
STR_FILE_MENU_LOAD_GAME :Lataa peli
STR_FILE_MENU_QUIT_GAME :Lopeta peli
@@ -355,19 +355,19 @@ STR_ENGINE_SORT_CARGO_CAPACITY :Rahtikapasiteet
STR_NO_WAITING_CARGO :{BLACK}Minkäänlaista lastia ei ole odottamassa
STR_SELECT_ALL_FACILITIES :{BLACK}Valitse kaikki laitteet
STR_SELECT_ALL_TYPES :{BLACK}Valitse kaikki lastityypit (myös odottava lasti)
-STR_AVAILABLE_TRAINS :{BLACK}Käytettävissä olevat junat
-STR_AVAILABLE_ROAD_VEHICLES :{BLACK}Käytettävissä olevat ajoneuvot
-STR_AVAILABLE_SHIPS :{BLACK}Käytettävissä olevat laivat
-STR_AVAILABLE_AIRCRAFT :{BLACK}Käytettävissä olevat ilma-alukset
+STR_AVAILABLE_TRAINS :{BLACK}Käytett. Junat
+STR_AVAILABLE_ROAD_VEHICLES :{BLACK}Käytett. Ajoneuvot
+STR_AVAILABLE_SHIPS :{BLACK}Käytett. Laivat
+STR_AVAILABLE_AIRCRAFT :{BLACK}Käytett. Ilma-alukset
STR_AVAILABLE_ENGINES_TIP :{BLACK}Näytä lista saatavilla olevista moottorityypeistä tälle ajoneuvotyypille.
STR_MANAGE_LIST :{BLACK}Muokkaa listaa
STR_MANAGE_LIST_TIP :{BLACK}Ohjaa kaikkia listan ajoneuvoja
-STR_REPLACE_VEHICLES :Korvaa liikennevälineitä
+STR_REPLACE_VEHICLES :Korvaa liikenneväl.
STR_SEND_TRAIN_TO_DEPOT :Lähetä varikolle
STR_SEND_ROAD_VEHICLE_TO_DEPOT :Lähetä varikolle
STR_SEND_SHIP_TO_DEPOT :Lähetä varikolle
STR_SEND_AIRCRAFT_TO_HANGAR :Lähetä varikolle
-STR_SEND_FOR_SERVICING :Lähetä huollettavaksi
+STR_SEND_FOR_SERVICING :Lähetä huoltoon
############ range for months starts
STR_MONTH_ABBREV_JAN :01.
@@ -694,7 +694,7 @@ STR_ABOUT_MENU_TOGGLE_CONSOLE :Konsoli
STR_ABOUT_MENU_AI_DEBUG :Tekoälyn virheenjäljitys
STR_ABOUT_MENU_SCREENSHOT :Kuvakaappaus (Ctrl-S)
STR_ABOUT_MENU_GIANT_SCREENSHOT :Valtava kuvakaapp. (Ctrl-G)
-STR_ABOUT_MENU_ABOUT_OPENTTD :Tietoja "OpenTTD":stä
+STR_ABOUT_MENU_ABOUT_OPENTTD :Tietoja 'OpenTTD':stä
############ range ends here
STR_STATION_BUILD_COVERAGE_OFF :{BLACK}pois
@@ -762,9 +762,6 @@ STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :Rakenna uutta t
############ range ends here
STR_FUND_INDUSTRY_CAPTION :{WHITE}Rakenna uutta teollisuutta
-STR_JUST_STRING :{STRING}
-STR_JUST_RAW_STRING :{STRING}
-STR_JUST_INT :{NUM}
STR_ERROR_CAN_ONLY_BE_BUILT_IN_RAINFOREST :{WHITE}...voidaan rakentaa vain sademetsäalueisiin.
STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT :{WHITE}...voidaan rakentaa vain aavikkoalueisiin.
STR_STATUSBAR_PAUSED :{YELLOW}* * TAUKO * *
@@ -900,10 +897,10 @@ STR_EURO_INTRODUCE :{BLACK}{BIGFONT
# Start of order review system.
# DON'T ADD OR REMOVE LINES HERE
-STR_VEHICLE_HAS_TOO_FEW_ORDERS :Kulkuneuvon {WHITE}{VEHICLE} aikataulussa on liian vähän käskyjä
-STR_VEHICLE_HAS_VOID_ORDER :Kulkuneuvon {WHITE}{VEHICLE} aikataulussa on epäkelpo käsky
+STR_VEHICLE_HAS_TOO_FEW_ORDERS :{WHITE}Kulkuneuvon {VEHICLE} aikataulussa on liian vähän käskyjä
+STR_VEHICLE_HAS_VOID_ORDER :{WHITE}Kulkuneuvon {VEHICLE} aikataulussa on epäkelpo käsky
STR_VEHICLE_HAS_DUPLICATE_ENTRY :{WHITE}Ajoneuvolla {VEHICLE} on toistuvia määräyksiä
-STR_VEHICLE_HAS_INVALID_ENTRY :Kulkuneuvon {WHITE}{VEHICLE} aikataulussa on virheellinen asema
+STR_VEHICLE_HAS_INVALID_ENTRY :{WHITE}Kulkuneuvon {VEHICLE} aikataulussa on virheellinen asema
# end of order system
STR_VEHICLE_AUTORENEW_FAILED :{WHITE}Automaattinen korvaus epäonnistui ajoneuvolle {VEHICLE}{}{STRING}
@@ -1197,7 +1194,6 @@ STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Valitse
STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT}
STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT}
-STR_WAYPOINT_NAME :{WAYPOINT}
STR_EDIT_WAYPOINT_NAME :{WHITE}Muokkaa reittipisteen nimeä
STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}Reittipisteen nimeä ei voi muuttaa...
@@ -1778,11 +1774,6 @@ STR_TOWN_BUILDING_NAME_TEPEES_1 :Tiipiitä
STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1 :Teesalonki
STR_TOWN_BUILDING_NAME_PIGGY_BANK_1 :Säästöpossu
-STR_INDUSTRY_NAME :{INDUSTRY}
-STR_TOWN_NAME :{TOWN}
-STR_FORMAT_INDUSTRY_NAME :{TOWN} ({STRING})
-STR_STATION_NAME :{STATION}
-
##id 0x2800
STR_LANDSCAPING_MENU_LANDSCAPING :Maastonmuokkaus
STR_LANDSCAPING_MENU_PLANT_TREES :Istuta puita
@@ -1837,6 +1828,12 @@ STR_CARGO_RATING_EXCELLENT :Mainio
STR_CARGO_RATING_OUTSTANDING :Loistava
############ range for rating ends
+### station view strings
+STR_SCHEDULED_TRAINS_TIP :{BLACK}Näytä kaikki junat, joilla on asema aikataulussaan.
+STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Näytä kaikki autot, joilla on asema aikataulussaan.
+STR_SCHEDULED_AIRCRAFT_TIP :{BLACK}Näytä kaikki lentokoneet, joilla on asema aikataulussaan.
+STR_SCHEDULED_SHIPS_TIP :{BLACK}Näytä kaikki laivat, joilla on asema aikataulussaan.
+
STR_STATION_VIEW_CARGO_RATING :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}{NBSP}%)
STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}{STATION} ei ota enää vastaan {STRING}.
STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION} ei ota enää vastaan {STRING} tai {STRING}.
@@ -2171,7 +2168,6 @@ STR_CITY_APPROVAL_HOSTILE :Vihamielinen
##id 0x7000
STR_COMPANY_VIEW_CAPTION :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
-STR_FORMAT_COMPANY_NUM :(Yhtiö {COMMA})
STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Uudet kasvot
STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON :{BLACK}Väriteema
STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE :{GOLD}Väriteema:
@@ -2204,7 +2200,6 @@ STR_FINANCES_TOTAL_CAPTION :{WHITE}Yhteens
STR_COMPANY_NAME_COMPANY_NUM :{COMPANY} {COMPANYNUM}
STR_GRAPH_INCOME_CAPTION :{WHITE}Tulokuvaaja
STR_CURRCOMPACT :{CURRCOMPACT}
-STR_JUST_COMMA :{COMMA}
STR_GRAPH_OPERATING_PROFIT_CAPTION :{WHITE}Käyttökatekuvaaja
STR_FINANCES_BANK_BALANCE_TITLE :{WHITE}Tilin saldo
STR_FINANCES_LOAN_TITLE :{WHITE}Laina
@@ -2226,7 +2221,7 @@ STR_FINANCES_BORROW_TOOLTIP :{BLACK}Ota lis
STR_FINANCES_REPAY_TOOLTIP :{BLACK}Lyhennä lainaa.
STR_COMPANY_VIEW_PRESIDENT_MANAGER_TITLE :{WHITE}{PRESIDENTNAME}{}{GOLD}(pääjohtaja)
STR_COMPANY_VIEW_INAUGURATED_TITLE :{GOLD}Avattu: {WHITE}{NUM}
-STR_COMPANY_VIEW_VEHICLES_TITLE :{GOLD}Liikennevälineet:
+STR_COMPANY_VIEW_VEHICLES_TITLE :{GOLD}Liikenneväl.:
STR_TRAINS :{WHITE}{COMMA} juna{P "" a}
STR_ROAD_VEHICLES :{WHITE}{COMMA} ajoneuvo{P "" a}
STR_AIRCRAFT :{WHITE}{COMMA} lentokone{P "" tta}
@@ -2716,7 +2711,6 @@ STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON :{BLACK}Uusia li
STR_DEPOT_NO_ENGINE :{BLACK}-
STR_ERROR_TRAIN_TOO_LONG :{WHITE}Juna on liian pitkä.
STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT :{WHITE}Junia voi muunnella vain, kun ne ovat pysähdyksissä veturitallilla.
-STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} junaa
STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION :{WHITE}Uusi juna
STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION :{WHITE}Uusi sähköjuna
@@ -2774,7 +2768,6 @@ STR_ERROR_UNABLE_TO_FIND_ROUTE_TO :{WHITE}Reittiä
STR_ERROR_CAN_T_STOP_START_TRAIN :{WHITE}Junaa ei voi pysäyttää/lähettää...
STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS :{BLACK}Huoltoväli: {LTBLUE}{COMMA} päivää{BLACK} Viimeisin huolto: {LTBLUE}{DATE_LONG}
STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT :{BLACK}Huoltoväli: {LTBLUE}{COMMA}%{BLACK} Viime huolto: {LTBLUE}{DATE_LONG}
-STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP :{BLACK}Junat - napsauta junaa saadaksesi tietoja.
STR_DEPOT_TRAIN_LIST_TOOLTIP :{BLACK}Junat - napsauta junaa saadaksesi tietoja, vedä vaunu lisätäksesi/poistaaksesi junasta.
STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP :{BLACK}Rakenna uusi yksikkö.
STR_DEPOT_TRAIN_SELL_TOOLTIP :{BLACK}Vedä yksikkö tähän myydäksesi sen.
@@ -2863,7 +2856,6 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP :{BLACK}Täytä
##id 0x9000
STR_ERROR_ROAD_VEHICLE_IN_THE_WAY :{WHITE}Ajoneuvo tiellä.
-STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} ajoneuvoa
STR_DEPOT_ROAD_CAPTION :{WHITE}{TOWN} huoltoasema
STR_DEPOT_ROAD_NEW_VEHICLES_BUTTON :{BLACK}Uusia ajoneuvoja
STR_BUILD_VEHICLE_ROAD_CAPTION :{WHITE}Uusia ajoneuvoja
@@ -2879,7 +2871,6 @@ STR_HEADING_FOR_ROAD_DEPOT_SERVICE :{LTBLUE}Huolto
STR_HEADING_FOR_ROAD_DEPOT_SERVICE_VEL :{LTBLUE}Huolto {TOWN} Varikko, {VELOCITY}
STR_ERROR_CAN_T_SEND_VEHICLE_TO_DEPOT :{WHITE}Ajoneuvon lähettäminen huoltoasemalle ei onnistu...
STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT :{WHITE}Paikallista huoltoasemaa ei löydy.
-STR_VEHICLE_LIST_ROAD_TOOLTIP :{BLACK}Ajoneuvot - napsauta ajoneuvoja saadaksesi tietoja.
STR_VEHICLE_VIEW_ROAD_STATE_START_STOP_TOOLTIP :{BLACK}Nykyisen ajoneuvon toiminnot - napsauta tässä pysäyttääksesi/laittaaksesi liikkeelle.
STR_VEHICLE_VIEW_ROAD_ORDERS_TOOLTIP :{BLACK}Näytä ajoneuvon aikataulu.
STR_VEHICLE_VIEW_ROAD_LOCATION_TOOLTIP :{BLACK}Keskitä näkymä ajoneuvon sijaintiin.
@@ -2926,7 +2917,6 @@ STR_WATERWAYS_TOOLBAR_CAPTION_SE :{WHITE}Vesireit
STR_ERROR_CAN_T_BUILD_DOCK_HERE :{WHITE}Satamaa ei voi rakentaa tähän...
STR_DEPOT_SHIP_CAPTION :{WHITE}{TOWN}, telakka
STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON :{BLACK}Uusia laivoja
-STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} laivaa
STR_BUILD_VEHICLE_SHIP_CAPTION :{WHITE}Uusia laivoja
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON :{BLACK}Rakenna laiva
STR_CLONE_SHIP :{BLACK}Kloonaa laiva
@@ -2949,7 +2939,6 @@ STR_DEPOT_SHIP_LIST_TOOLTIP :{BLACK}Laivat -
STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP :{BLACK}Rakenna uusi laiva
STR_DEPOT_SHIP_SELL_TOOLTIP :{BLACK}Vedä laiva tähän myydäksesi sen.
STR_DEPOT_SHIP_LOCATION_TOOLTIP :{BLACK}Keskitä näkymä telakan sijaintiin.
-STR_VEHICLE_LIST_SHIP_TOOLTIP :{BLACK}Laivat - napsauta laivaa saadaksesi tietoja.
STR_BUILD_VEHICLE_SHIP_LIST_TOOLTIP :{BLACK}Laivan valintalista - napsauta laivaa saadaksesi tietoja.
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP :{BLACK}Rakenna valittu laiva
STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Nykyisen laivat toiminnot - napsauta tässä pysäyttääksesi/laittaaksesi liikkeelle.
@@ -2991,7 +2980,6 @@ STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}Tämä r
STR_BUILD_VEHICLE_AIRCRAFT_CAPTION :{WHITE}Uusi lentokone
STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON :{BLACK}Rakenna lentokone
STR_ERROR_CAN_T_BUILD_AIRCRAFT :{WHITE}Lentokonetta ei voi rakentaa...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} lentokonetta
STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR :{WHITE}Lentokonetta ei voi lähettää lentokonehalliin...
STR_HEADING_FOR_HANGAR :{ORANGE}Suuntana lentokonehalli, {STATION}
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Suuntana lentokonehalli, {STATION}, {VELOCITY}
@@ -3005,7 +2993,6 @@ STR_ERROR_AIRCRAFT_MUST_BE_STOPPED :{WHITE}Lentokon
STR_ERROR_CAN_T_SELL_AIRCRAFT :{WHITE}Lentokonetta ei voi myydä...
STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :Lentokentän rakentaminen
STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP :{BLACK}Rakenna lentokenttä
-STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP :{BLACK}Lentokoneet - napsauta lentokonetta saadaksesi tietoja.
STR_DEPOT_AIRCRAFT_LIST_TOOLTIP :{BLACK}Lentokoneet - napsauta lentokonetta saadaksesi tietoja.
STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP :{BLACK}Rakenna uusi lentokone
STR_DEPOT_AIRCRAFT_SELL_TOOLTIP :{BLACK}Vedä lentokone tähän myydäksesi sen.
@@ -3061,9 +3048,9 @@ STR_PERFORMANCE_DETAIL_AMOUNT_INT :{BLACK}({COMMA}
STR_PERFORMANCE_DETAIL_PERCENT :{WHITE}{NUM}%
STR_PERFORMANCE_DETAIL_INT :{BLACK}{NUM}
############ Those following lines need to be in this order!!
-STR_PERFORMANCE_DETAIL_VEHICLES :{BLACK}Liikennevälineitä:
+STR_PERFORMANCE_DETAIL_VEHICLES :{BLACK}Liikenneväl.:
STR_PERFORMANCE_DETAIL_STATIONS :{BLACK}Asemia:
-STR_PERFORMANCE_DETAIL_MIN_PROFIT :{BLACK}Vähimmäistuotto:
+STR_PERFORMANCE_DETAIL_MIN_PROFIT :{BLACK}Väh. tuotto:
STR_PERFORMANCE_DETAIL_MIN_INCOME :{BLACK}Vähimmäistulo:
STR_PERFORMANCE_DETAIL_MAX_INCOME :{BLACK}Enimmäistulo:
STR_PERFORMANCE_DETAIL_DELIVERED :{BLACK}Kuljetettu:
@@ -3187,11 +3174,16 @@ STR_LORRY :{BLACK}{LORRY}
STR_PLANE :{BLACK}{PLANE}
STR_SHIP :{BLACK}{SHIP}
+############ Vehicle lists
+STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP :{BLACK}Junat - napsauta junaa saadaksesi tietoja.
+STR_VEHICLE_LIST_ROAD_TOOLTIP :{BLACK}Ajoneuvot - napsauta ajoneuvoja saadaksesi tietoja.
+STR_VEHICLE_LIST_SHIP_TOOLTIP :{BLACK}Laivat - napsauta laivaa saadaksesi tietoja.
+STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP :{BLACK}Lentokoneet - napsauta lentokonetta saadaksesi tietoja.
-STR_SCHEDULED_TRAINS_TIP :{BLACK}Näytä kaikki junat, joilla on asema aikataulussaan.
-STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Näytä kaikki autot, joilla on asema aikataulussaan.
-STR_SCHEDULED_AIRCRAFT_TIP :{BLACK}Näytä kaikki lentokoneet, joilla on asema aikataulussaan.
-STR_SCHEDULED_SHIPS_TIP :{BLACK}Näytä kaikki laivat, joilla on asema aikataulussaan.
+STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} junaa
+STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} ajoneuvoa
+STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} laivaa
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} lentokonetta
STR_VEH_WITH_SHARED_ORDERS_LIST :{WHITE}{COMMA} ajoneuvon jaettu aikataulu
STR_VEH_WITH_SHARED_ORDERS_LIST_TIP :{BLACK}Näytä kaikki ajoneuvot, joilla on sama aikataulu
@@ -3215,10 +3207,9 @@ STR_DEPOT_AUTOREPLACE_ROADVEH_TIP :{BLACK}Korvaa k
STR_DEPOT_AUTOREPLACE_SHIP_TIP :{BLACK}Korvaa kaikki telakalla olevat laivat automaattisesti
STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP :{BLACK}Korvaa kaikki hallissa olevat lento-alukset automaattisesti
-
STR_REPLACE_VEHICLES_WHITE :{WHITE}Korvaa {STRING}
-STR_REPLACE_VEHICLES_START :{BLACK}Aloita ajoneuvojen korvaaminen
-STR_REPLACE_VEHICLES_STOP :{BLACK}Lopeta ajoneuvojen korvaaminen
+STR_REPLACE_VEHICLES_START :{BLACK}Aloita ajoneuvojen korv.
+STR_REPLACE_VEHICLES_STOP :{BLACK}Lopeta ajoneuvojen korv.
STR_NOT_REPLACING :{BLACK}Ei korvata
STR_NOT_REPLACING_VEHICLE_SELECTED :{BLACK}Ei liikennevälinettä valittuna
STR_REPLACE_HELP_LEFT_ARRAY :{BLACK}Valitse korvattava veturityyppi.
@@ -3381,17 +3372,6 @@ STR_MEASURE_AREA :{BLACK}Pinta-al
STR_MEASURE_LENGTH_HEIGHTDIFF :{BLACK}Pituus: {NUM}{}Korkeusero: {NUM} m
STR_MEASURE_AREA_HEIGHTDIFF :{BLACK}Pinta-ala: {NUM} x {NUM}{}Korkeusero: {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}Siirrä rahaa: {LTBLUE}{CURRENCY}
STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD :{WHITE}...kaupunki omistaa tien
STR_DRIVE_THROUGH_ERROR_DIRECTION :{WHITE}...tie on väärin päin
@@ -3416,7 +3396,6 @@ STR_PERCENT_UP_DOWN_SMALL :{TINYFONT}{WHIT
STR_PERCENT_UP_DOWN :{WHITE}{NUM}%{UPARROW}{DOWNARROW}
##### Mass Order
-STR_FORMAT_GROUP_NAME :Ryhmä {COMMA}
STR_GROUP_TINY_NAME :{TINYFONT}{GROUP}
STR_GROUP_ALL_TRAINS :Kaikki junat
STR_GROUP_ALL_ROADS :Kaikki autot
@@ -3445,12 +3424,35 @@ STR_GROUP_DELETE_TIP :{BLACK}Poista v
STR_GROUP_RENAME_TIP :{BLACK}Nimeä valittu ryhmä
STR_GROUP_REPLACE_PROTECTION_TIP :{BLACK}Poista ryhmä automaattisesti korvattavien joukosta
+#### 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 :(Yhtiö {COMMA})
+STR_FORMAT_GROUP_NAME :Ryhmä {COMMA}
+STR_FORMAT_INDUSTRY_NAME :{TOWN} ({STRING})
STR_NAME_MUST_BE_UNIQUE :{WHITE}Nimen täytyy olla uniikki
diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt
index 3d99b9f81..fe381c91b 100644
--- a/src/lang/hungarian.txt
+++ b/src/lang/hungarian.txt
@@ -796,9 +796,6 @@ STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :Új gazdasági
############ range ends here
STR_FUND_INDUSTRY_CAPTION :{WHITE}Új gazdasági épület
-STR_JUST_STRING :{STRING}
-STR_JUST_RAW_STRING :{STRING}
-STR_JUST_INT :{NUM}
STR_ERROR_CAN_ONLY_BE_BUILT_IN_RAINFOREST :{WHITE}...csak esőerdőben építhető
STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT :{WHITE}...csak sivatagban építhető
STR_STATUSBAR_PAUSED :{YELLOW}* * SZÜNET * *
@@ -1231,7 +1228,6 @@ STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Válassz
STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT}
STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT}
-STR_WAYPOINT_NAME :{WAYPOINT}
STR_EDIT_WAYPOINT_NAME :{WHITE}Ellenőrző pont nevének módosítása
STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}Nem lehet megváltoztatni az ellenőrző pont nevét...
@@ -1812,11 +1808,6 @@ STR_TOWN_BUILDING_NAME_TEPEES_1 :Indiánsátor
STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1 :Teáskanna-ház
STR_TOWN_BUILDING_NAME_PIGGY_BANK_1 :Malacpersely
-STR_INDUSTRY_NAME :{INDUSTRY}
-STR_TOWN_NAME :{TOWN}
-STR_FORMAT_INDUSTRY_NAME :{TOWN}i {STRING}
-STR_STATION_NAME :{STATION}
-
##id 0x2800
STR_LANDSCAPING_MENU_LANDSCAPING :Tájrendezés
STR_LANDSCAPING_MENU_PLANT_TREES :Faültetés
@@ -1871,6 +1862,12 @@ STR_CARGO_RATING_EXCELLENT :kiváló
STR_CARGO_RATING_OUTSTANDING :kimagasló
############ range for rating ends
+### station view strings
+STR_SCHEDULED_TRAINS_TIP :{BLACK}Kilistázza az összes vonatot, aminek a menetrendjében szerepel ez az állomás
+STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Kilistázza az összes közúti járművet, aminek a menetrendjében szerepel ez az állomás
+STR_SCHEDULED_AIRCRAFT_TIP :{BLACK}Kilistázza az összes repülőt, aminek a menetrendjében szerepel ez az állomás
+STR_SCHEDULED_SHIPS_TIP :{BLACK}Kilistázza az összes hajót, aminek a menetrendjében szerepel ez az állomás
+
STR_STATION_VIEW_CARGO_RATING :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}{STATION} többé nem fogad el {STRING}
STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION} többé nem fogad el {STRING} és {STRING}
@@ -2242,7 +2239,6 @@ STR_CITY_APPROVAL_HOSTILE :Ellenséges
##id 0x7000
STR_COMPANY_VIEW_CAPTION :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
-STR_FORMAT_COMPANY_NUM :({COMMA}. vállalat)
STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Új arc
STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON :{BLACK}Színséma
STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE :{GOLD}Színséma:
@@ -2275,7 +2271,6 @@ STR_FINANCES_TOTAL_CAPTION :{WHITE}Összese
STR_COMPANY_NAME_COMPANY_NUM :{COMPANY} {COMPANYNUM}
STR_GRAPH_INCOME_CAPTION :{WHITE}Jövedelem grafikon
STR_CURRCOMPACT :{CURRCOMPACT}
-STR_JUST_COMMA :{COMMA}
STR_GRAPH_OPERATING_PROFIT_CAPTION :{WHITE}Működési nyereség grafikon
STR_FINANCES_BANK_BALANCE_TITLE :{WHITE}Banki egyenleg
STR_FINANCES_LOAN_TITLE :{WHITE}Kölcsön
@@ -2787,7 +2782,6 @@ STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON :{BLACK}Új jár
STR_DEPOT_NO_ENGINE :{BLACK}-
STR_ERROR_TRAIN_TOO_LONG :{WHITE}Túl hosszú a vonat
STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT :{WHITE}Csak a járműtelepen álló vonatokat lehet megváltoztatni
-STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} vonatai - {COMMA}
STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION :{WHITE}Új vasúti járművek
STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION :{WHITE}Új vasúti járművek
@@ -2845,7 +2839,6 @@ STR_ERROR_UNABLE_TO_FIND_ROUTE_TO :{WHITE}Nem tal
STR_ERROR_CAN_T_STOP_START_TRAIN :{WHITE}Nem indíthatod el/ állíthatod meg a vonatot...
STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS :{BLACK}Javítási időköz: {LTBLUE}{COMMA} nap{BLACK} Utolsó javítás: {LTBLUE}{DATE_LONG}
STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT :{BLACK}Szervíz-intervallum: {LTBLUE}{COMMA}%{BLACK} Utolsó szervíz: {LTBLUE}{DATE_LONG}
-STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP :{BLACK}Vonatok - kattints egy vonatra az adataihoz
STR_DEPOT_TRAIN_LIST_TOOLTIP :{BLACK}Vonatok - kattints egy vonatra az adataihoz, húzással áthelyezheted a járműveket
STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP :{BLACK}Új vasúti jármű vásárlása
STR_DEPOT_TRAIN_SELL_TOOLTIP :{BLACK}Dobj ide egy járművet az eladásához
@@ -2934,7 +2927,6 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP :{BLACK}Menetren
##id 0x9000
STR_ERROR_ROAD_VEHICLE_IN_THE_WAY :{WHITE}Közúti jármű van az útban
-STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} közúti járművei - {COMMA}
STR_DEPOT_ROAD_CAPTION :{WHITE}{TOWN}i garázs
STR_DEPOT_ROAD_NEW_VEHICLES_BUTTON :{BLACK}Új járművek
STR_BUILD_VEHICLE_ROAD_CAPTION :{WHITE}Új közúti járművek
@@ -2950,7 +2942,6 @@ STR_HEADING_FOR_ROAD_DEPOT_SERVICE :{LTBLUE}Javít
STR_HEADING_FOR_ROAD_DEPOT_SERVICE_VEL :{LTBLUE}Javítás {TOWN} garázsában, {VELOCITY}
STR_ERROR_CAN_T_SEND_VEHICLE_TO_DEPOT :{WHITE}Nem küldheted a járművet a garázsba...
STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT :{WHITE}Nem találom a helyi garázst
-STR_VEHICLE_LIST_ROAD_TOOLTIP :{BLACK}Közúti járművek - kattints egy járműre az adataihoz
STR_VEHICLE_VIEW_ROAD_STATE_START_STOP_TOOLTIP :{BLACK}Aktuális járműesemény - kattints ide a jármű elindításához/ megállításához
STR_VEHICLE_VIEW_ROAD_ORDERS_TOOLTIP :{BLACK}A jármű menetrendjének megmutatása
STR_VEHICLE_VIEW_ROAD_LOCATION_TOOLTIP :{BLACK}A fő nézetet a járműre állítja
@@ -2997,7 +2988,6 @@ STR_WATERWAYS_TOOLBAR_CAPTION_SE :{WHITE}Vízi ut
STR_ERROR_CAN_T_BUILD_DOCK_HERE :{WHITE}Nem építhetsz ide kikötőt...
STR_DEPOT_SHIP_CAPTION :{WHITE}{TOWN}i dokk
STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON :{BLACK}Új hajók
-STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} hajói - {COMMA}
STR_BUILD_VEHICLE_SHIP_CAPTION :{WHITE}Új hajók
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON :{BLACK}Megvesz
STR_CLONE_SHIP :{BLACK}Hajó másolása
@@ -3020,7 +3010,6 @@ STR_DEPOT_SHIP_LIST_TOOLTIP :{BLACK}Hajók -
STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP :{BLACK}Új hajó vásárlása
STR_DEPOT_SHIP_SELL_TOOLTIP :{BLACK}Dobj ide egy hajót az eladásához
STR_DEPOT_SHIP_LOCATION_TOOLTIP :{BLACK}A fő nézetet a dokkra állítja
-STR_VEHICLE_LIST_SHIP_TOOLTIP :{BLACK}Hajók - kattints egy hajóra az adataihoz
STR_BUILD_VEHICLE_SHIP_LIST_TOOLTIP :{BLACK}Hajó kiválasztása - kattints egy hajóra az adataihoz
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP :{BLACK}A kijelölt hajó megvétele
STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Aktuális hajóesemény - kattints ide a hajó elindításhoz/megállításhoz
@@ -3062,7 +3051,6 @@ STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}Ide katt
STR_BUILD_VEHICLE_AIRCRAFT_CAPTION :{WHITE}Új repülőgépek
STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON :{BLACK}Megvesz
STR_ERROR_CAN_T_BUILD_AIRCRAFT :{WHITE}Nem veheted meg a repülőgépet...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} repülőgépei - {COMMA}
STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR :{WHITE}Nem küldheted a repülőgépet a hangárba...
STR_HEADING_FOR_HANGAR :{ORANGE}Úton {STATION} hangárjába
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Úton {STATION} hangárjába, {VELOCITY}
@@ -3076,7 +3064,6 @@ STR_ERROR_AIRCRAFT_MUST_BE_STOPPED :{WHITE}A hangá
STR_ERROR_CAN_T_SELL_AIRCRAFT :{WHITE}Nem adhatod el a repülőgépet...
STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :Repülőtér építése
STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP :{BLACK}Repülőtér építése
-STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP :{BLACK}Repülőgépek - kattints egy repülőgépre az adataihoz
STR_DEPOT_AIRCRAFT_LIST_TOOLTIP :{BLACK}Repülőgépek - kattints egy repülőgépre az adataihoz
STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP :{BLACK}Új repülőgépek vásárlása
STR_DEPOT_AIRCRAFT_SELL_TOOLTIP :{BLACK}Dobj ide egy repülőgépet az eladásához
@@ -3258,11 +3245,16 @@ STR_LORRY :{BLACK}{LORRY}
STR_PLANE :{BLACK}{PLANE}
STR_SHIP :{BLACK}{SHIP}
+############ Vehicle lists
+STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP :{BLACK}Vonatok - kattints egy vonatra az adataihoz
+STR_VEHICLE_LIST_ROAD_TOOLTIP :{BLACK}Közúti járművek - kattints egy járműre az adataihoz
+STR_VEHICLE_LIST_SHIP_TOOLTIP :{BLACK}Hajók - kattints egy hajóra az adataihoz
+STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP :{BLACK}Repülőgépek - kattints egy repülőgépre az adataihoz
-STR_SCHEDULED_TRAINS_TIP :{BLACK}Kilistázza az összes vonatot, aminek a menetrendjében szerepel ez az állomás
-STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Kilistázza az összes közúti járművet, aminek a menetrendjében szerepel ez az állomás
-STR_SCHEDULED_AIRCRAFT_TIP :{BLACK}Kilistázza az összes repülőt, aminek a menetrendjében szerepel ez az állomás
-STR_SCHEDULED_SHIPS_TIP :{BLACK}Kilistázza az összes hajót, aminek a menetrendjében szerepel ez az állomás
+STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} vonatai - {COMMA}
+STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} közúti járművei - {COMMA}
+STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} hajói - {COMMA}
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} repülőgépei - {COMMA}
STR_VEH_WITH_SHARED_ORDERS_LIST :{WHITE}{COMMA} jármű megosztott menetrendje
STR_VEH_WITH_SHARED_ORDERS_LIST_TIP :{BLACK}Megmutatja az összes járművet, amik megosztják ezt a menetrendet
@@ -3286,7 +3278,6 @@ STR_DEPOT_AUTOREPLACE_ROADVEH_TIP :{BLACK}A garáz
STR_DEPOT_AUTOREPLACE_SHIP_TIP :{BLACK}A dokkban lévő összes hajó automatikus cseréje
STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP :{BLACK}A hangárban lévő összes repülő automatikus cseréje
-
STR_REPLACE_VEHICLES_WHITE :{WHITE}Lecserél {STRING}
STR_REPLACE_VEHICLES_START :{BLACK}Járműcsere elkezdése
STR_REPLACE_VEHICLES_STOP :{BLACK}Járműcsere befejezése
@@ -3452,17 +3443,6 @@ STR_MEASURE_AREA :{BLACK}Terület
STR_MEASURE_LENGTH_HEIGHTDIFF :{BLACK}Távolság: {NUM}{}Magasságkülönbség: {NUM} m
STR_MEASURE_AREA_HEIGHTDIFF :{BLACK}Terület: {NUM} x {NUM}{}Magasságkülönbség: {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}Szállítási díj: {LTBLUE}{CURRENCY}
STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD :{WHITE}...ez egy városi tulajdonú út
STR_DRIVE_THROUGH_ERROR_DIRECTION :{WHITE}...az út másik irányba vezet
@@ -3487,7 +3467,6 @@ STR_PERCENT_UP_DOWN_SMALL :{TINYFONT}{WHIT
STR_PERCENT_UP_DOWN :{WHITE}{NUM}%{UPARROW}{DOWNARROW}
##### Mass Order
-STR_FORMAT_GROUP_NAME :{COMMA} csoport
STR_GROUP_TINY_NAME :{TINYFONT}{GROUP}
STR_GROUP_ALL_TRAINS :Összes vonat
STR_GROUP_ALL_ROADS :Összes közúti jármű
@@ -3516,12 +3495,35 @@ STR_GROUP_DELETE_TIP :{BLACK}Kijelöl
STR_GROUP_RENAME_TIP :{BLACK}Kijelölt csoport átnevezése
STR_GROUP_REPLACE_PROTECTION_TIP :{BLACK}Csoport automata csere alóli mentességének beállításához katt.ide
+#### 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}. vállalat)
+STR_FORMAT_GROUP_NAME :{COMMA} csoport
+STR_FORMAT_INDUSTRY_NAME :{TOWN}i {STRING}
STR_NAME_MUST_BE_UNIQUE :{WHITE}A névnek egyedinek kell lennie
diff --git a/src/lang/italian.txt b/src/lang/italian.txt
index 6ea9cc8e3..9f5384884 100644
--- a/src/lang/italian.txt
+++ b/src/lang/italian.txt
@@ -764,9 +764,6 @@ STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :Finanzia nuova
############ range ends here
STR_FUND_INDUSTRY_CAPTION :{WHITE}Finanzia nuova industria
-STR_JUST_STRING :{STRING}
-STR_JUST_RAW_STRING :{STRING}
-STR_JUST_INT :{NUM}
STR_ERROR_CAN_ONLY_BE_BUILT_IN_RAINFOREST :{WHITE}...può essere costruita solo nella foresta pluviale
STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT :{WHITE}...può essere costruita solo in aree desertiche
STR_STATUSBAR_PAUSED :{YELLOW}* * IN PAUSA * *
@@ -1199,7 +1196,6 @@ STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Selezion
STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT}
STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT}
-STR_WAYPOINT_NAME :{WAYPOINT}
STR_EDIT_WAYPOINT_NAME :{WHITE}Rinomina il waypoint
STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}Impossibile rinominare il waypoint...
@@ -1780,11 +1776,6 @@ STR_TOWN_BUILDING_NAME_TEPEES_1 :Tepee
STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1 :Casa-teiera
STR_TOWN_BUILDING_NAME_PIGGY_BANK_1 :Banca-porcellino
-STR_INDUSTRY_NAME :{INDUSTRY}
-STR_TOWN_NAME :{TOWN}
-STR_FORMAT_INDUSTRY_NAME :{1:STRING} di {0:TOWN}
-STR_STATION_NAME :{STATION}
-
##id 0x2800
STR_LANDSCAPING_MENU_LANDSCAPING :Modellazione terreno
STR_LANDSCAPING_MENU_PLANT_TREES :Pianta alberi
@@ -1839,6 +1830,12 @@ STR_CARGO_RATING_EXCELLENT :Eccellente
STR_CARGO_RATING_OUTSTANDING :Eccezionale
############ range for rating ends
+### station view strings
+STR_SCHEDULED_TRAINS_TIP :{BLACK}Mostra tutti i treni che hanno questa stazione pianificata
+STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Mostra tutti gli automezzi che hanno questa stazione pianificata
+STR_SCHEDULED_AIRCRAFT_TIP :{BLACK}Mostra tutti gli aeromobili che hanno questa stazione pianificata
+STR_SCHEDULED_SHIPS_TIP :{BLACK}Mostra tutte le navi che hanno questa stazione pianificata
+
STR_STATION_VIEW_CARGO_RATING :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}{STATION} non accetta più {STRING}
STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION} non accetta più {STRING} né {STRING}
@@ -2173,7 +2170,6 @@ STR_CITY_APPROVAL_HOSTILE :Ostile
##id 0x7000
STR_COMPANY_VIEW_CAPTION :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
-STR_FORMAT_COMPANY_NUM :(Compagnia {COMMA})
STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Nuova faccia
STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON :{BLACK}Colori compagnia
STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE :{GOLD}Schema colori:
@@ -2206,7 +2202,6 @@ STR_FINANCES_TOTAL_CAPTION :{WHITE}Totale:
STR_COMPANY_NAME_COMPANY_NUM :{COMPANY} {COMPANYNUM}
STR_GRAPH_INCOME_CAPTION :{WHITE}Grafico incassi
STR_CURRCOMPACT :{CURRCOMPACT}
-STR_JUST_COMMA :{COMMA}
STR_GRAPH_OPERATING_PROFIT_CAPTION :{WHITE}Grafico profitto operativo
STR_FINANCES_BANK_BALANCE_TITLE :{WHITE}Saldo bancario
STR_FINANCES_LOAN_TITLE :{WHITE}Prestito
@@ -2718,7 +2713,6 @@ STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON :{BLACK}Nuovi ve
STR_DEPOT_NO_ENGINE :{BLACK}-
STR_ERROR_TRAIN_TOO_LONG :{WHITE}Treno troppo lungo
STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT :{WHITE}Un treno può essere modificato solo quando è fermo in un deposito
-STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} tren{P 2 o i}
STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION :{WHITE}Nuovi veicoli ferroviari
STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION :{WHITE}Nuovi veicoli ferroviari elettrici
@@ -2776,7 +2770,6 @@ STR_ERROR_UNABLE_TO_FIND_ROUTE_TO :{WHITE}Impossib
STR_ERROR_CAN_T_STOP_START_TRAIN :{WHITE}Impossibile fermare/avviare il treno...
STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS :{BLACK}Manutenzione ogni: {LTBLUE}{COMMA} giorni{BLACK} Ultima volta: {LTBLUE}{DATE_LONG}
STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT :{BLACK}Intervallo manutenzione: {LTBLUE}{COMMA}%{BLACK} Ultima il: {LTBLUE}{DATE_LONG}
-STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP :{BLACK}Treni - fare clic su un treno per informazioni
STR_DEPOT_TRAIN_LIST_TOOLTIP :{BLACK}Treni - fare clic su un treno per informazioni, trascinare i veicoli per aggiungerli/rimuoverli dal treno
STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP :{BLACK}Costruisce un nuovo veicolo ferroviario
STR_DEPOT_TRAIN_SELL_TOOLTIP :{BLACK}Trascianre qui un veicolo ferroviario per venderlo
@@ -2865,7 +2858,6 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP :{BLACK}Riempie
##id 0x9000
STR_ERROR_ROAD_VEHICLE_IN_THE_WAY :{WHITE}Automezzo di mezzo
-STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} automezz{P 2 o i}
STR_DEPOT_ROAD_CAPTION :{WHITE}Deposito automezzi di {TOWN}
STR_DEPOT_ROAD_NEW_VEHICLES_BUTTON :{BLACK}Nuovi veicoli
STR_BUILD_VEHICLE_ROAD_CAPTION :{WHITE}Nuovi automezzi
@@ -2881,7 +2873,6 @@ STR_HEADING_FOR_ROAD_DEPOT_SERVICE :{LTBLUE}Manuten
STR_HEADING_FOR_ROAD_DEPOT_SERVICE_VEL :{LTBLUE}Manutenzione al Deposito di {TOWN}, {VELOCITY}
STR_ERROR_CAN_T_SEND_VEHICLE_TO_DEPOT :{WHITE}Impossibile mandare l'automezzo al deposito...
STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT :{WHITE}Impossibile trovare il deposito più vicino
-STR_VEHICLE_LIST_ROAD_TOOLTIP :{BLACK}Automezzi - fare clic su un veicolo per informazioni
STR_VEHICLE_VIEW_ROAD_STATE_START_STOP_TOOLTIP :{BLACK}Azione corrente del veicolo - fare clic qui per fermarlo/avviarlo
STR_VEHICLE_VIEW_ROAD_ORDERS_TOOLTIP :{BLACK}Mostra gli ordini del veicolo
STR_VEHICLE_VIEW_ROAD_LOCATION_TOOLTIP :{BLACK}Centra la visuale principale sulla posizione dell'automezzo
@@ -2928,7 +2919,6 @@ STR_WATERWAYS_TOOLBAR_CAPTION_SE :{WHITE}Trasport
STR_ERROR_CAN_T_BUILD_DOCK_HERE :{WHITE}Impossibile costruire il molo qui...
STR_DEPOT_SHIP_CAPTION :{WHITE}Deposito navale di {TOWN}
STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON :{BLACK}Nuove navi
-STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} nav{P 2 e i}
STR_BUILD_VEHICLE_SHIP_CAPTION :{WHITE}Nuove navi
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON :{BLACK}Costruisci nave
STR_CLONE_SHIP :{BLACK}Clona nave
@@ -2951,7 +2941,6 @@ STR_DEPOT_SHIP_LIST_TOOLTIP :{BLACK}Navi - f
STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP :{BLACK}Costruisce una nuova nave
STR_DEPOT_SHIP_SELL_TOOLTIP :{BLACK}Trascinare qui una nave per venderla
STR_DEPOT_SHIP_LOCATION_TOOLTIP :{BLACK}Centra la visuale principale sulla posizione del deposito navale
-STR_VEHICLE_LIST_SHIP_TOOLTIP :{BLACK}Navi - fare clic su una nave per informazioni
STR_BUILD_VEHICLE_SHIP_LIST_TOOLTIP :{BLACK}Elenco selezione navi - fare clic su una nave per informazioni
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP :{BLACK}Costruisce la nave selezionata
STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Azione corrente della nave - fare clic qui per fermarla/avviarla
@@ -2993,7 +2982,6 @@ STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}Costruis
STR_BUILD_VEHICLE_AIRCRAFT_CAPTION :{WHITE}Nuovo aeromobile
STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON :{BLACK}Costruisci aeromobile
STR_ERROR_CAN_T_BUILD_AIRCRAFT :{WHITE}Impossibile costruire l'aeromobile...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} aeromobil{P 2 e i}
STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR :{WHITE}Impossibile mandare l'aeromobile all'hangar...
STR_HEADING_FOR_HANGAR :{ORANGE}Diretto all'Hangar di {STATION}
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Diretto all'Hangar di {STATION}, {VELOCITY}
@@ -3007,7 +2995,6 @@ STR_ERROR_AIRCRAFT_MUST_BE_STOPPED :{WHITE}L'aeromo
STR_ERROR_CAN_T_SELL_AIRCRAFT :{WHITE}Impossibile vendere l'aeromobile...
STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :Costruzione aeroporto
STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP :{BLACK}Costruisce un aeroporto
-STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP :{BLACK}Aeromobili - fare clic su un aeromobile per informazioni
STR_DEPOT_AIRCRAFT_LIST_TOOLTIP :{BLACK}Aereomobili - fare clic su un aeromobile per informazioni
STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP :{BLACK}Costruisce un nuovo aeromobile
STR_DEPOT_AIRCRAFT_SELL_TOOLTIP :{BLACK}Trascianre qui un aeromobile per venderlo
@@ -3189,11 +3176,16 @@ STR_LORRY :{BLACK}{LORRY}
STR_PLANE :{BLACK}{PLANE}
STR_SHIP :{BLACK}{SHIP}
+############ Vehicle lists
+STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP :{BLACK}Treni - fare clic su un treno per informazioni
+STR_VEHICLE_LIST_ROAD_TOOLTIP :{BLACK}Automezzi - fare clic su un veicolo per informazioni
+STR_VEHICLE_LIST_SHIP_TOOLTIP :{BLACK}Navi - fare clic su una nave per informazioni
+STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP :{BLACK}Aeromobili - fare clic su un aeromobile per informazioni
-STR_SCHEDULED_TRAINS_TIP :{BLACK}Mostra tutti i treni che hanno questa stazione pianificata
-STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Mostra tutti gli automezzi che hanno questa stazione pianificata
-STR_SCHEDULED_AIRCRAFT_TIP :{BLACK}Mostra tutti gli aeromobili che hanno questa stazione pianificata
-STR_SCHEDULED_SHIPS_TIP :{BLACK}Mostra tutte le navi che hanno questa stazione pianificata
+STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} tren{P 2 o i}
+STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} automezz{P 2 o i}
+STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} nav{P 2 e i}
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} aeromobil{P 2 e i}
STR_VEH_WITH_SHARED_ORDERS_LIST :{WHITE}Ordini condivisi da {COMMA} veicol{P o i}
STR_VEH_WITH_SHARED_ORDERS_LIST_TIP :{BLACK}Mostra tutti i veicoli che condividono questa lista ordini
@@ -3217,7 +3209,6 @@ STR_DEPOT_AUTOREPLACE_ROADVEH_TIP :{BLACK}Rimpiazz
STR_DEPOT_AUTOREPLACE_SHIP_TIP :{BLACK}Rimpiazza automaticamente tutte le navi nel deposito
STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP :{BLACK}Rimpiazza automaticamente tutti gli aeromobili nell'hangar
-
STR_REPLACE_VEHICLES_WHITE :{WHITE}Rimpiazza {STRING}
STR_REPLACE_VEHICLES_START :{BLACK}Inizia rimpiazzamento
STR_REPLACE_VEHICLES_STOP :{BLACK}Interrompi rimpiazzamento
@@ -3383,17 +3374,6 @@ STR_MEASURE_AREA :{BLACK}Area: {N
STR_MEASURE_LENGTH_HEIGHTDIFF :{BLACK}Lunghezza: {NUM}{}Differenza in altezza: {NUM} m
STR_MEASURE_AREA_HEIGHTDIFF :{BLACK}Area: {NUM} x {NUM}{}Differenza in altezza: {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}Crediti di trasferimento: {LTBLUE}{CURRENCY}
STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD :{WHITE}...questa è una strada di proprietà della città
STR_DRIVE_THROUGH_ERROR_DIRECTION :{WHITE}...strada rivolta nella direzione sbagliata
@@ -3418,7 +3398,6 @@ STR_PERCENT_UP_DOWN_SMALL :{TINYFONT}{WHIT
STR_PERCENT_UP_DOWN :{WHITE}{NUM}%{UPARROW}{DOWNARROW}
##### Mass Order
-STR_FORMAT_GROUP_NAME :Gruppo {COMMA}
STR_GROUP_TINY_NAME :{TINYFONT}{GROUP}
STR_GROUP_ALL_TRAINS :Tutti i treni
STR_GROUP_ALL_ROADS :Tutti gli automezzi
@@ -3447,12 +3426,35 @@ STR_GROUP_DELETE_TIP :{BLACK}Elimina
STR_GROUP_RENAME_TIP :{BLACK}Rinomina il gruppo selezionato
STR_GROUP_REPLACE_PROTECTION_TIP :{BLACK}Fare clic per proteggere questo gruppo dal rimpiazzo automatico
+#### 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 :(Compagnia {COMMA})
+STR_FORMAT_GROUP_NAME :Gruppo {COMMA}
+STR_FORMAT_INDUSTRY_NAME :{1:STRING} di {0:TOWN}
STR_NAME_MUST_BE_UNIQUE :{WHITE}Il nome deve essere univoco
diff --git a/src/lang/korean.txt b/src/lang/korean.txt
index 70e8f1821..94ae3d86f 100644
--- a/src/lang/korean.txt
+++ b/src/lang/korean.txt
@@ -763,9 +763,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}* * 일시정지 * *
@@ -1198,7 +1195,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}웨이포인트 이름을 변경할 수 없습니다...
@@ -1779,11 +1775,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 :나무 심기
@@ -1838,6 +1829,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}{G 1 "을" "를"} 받지 않습니다.
STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION}에서 더 이상 {STRING}/{STRING}{G 2 "을" "를"} 받지 않습니다.
@@ -2172,7 +2169,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}색상:
@@ -2205,7 +2201,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}대출
@@ -2717,7 +2712,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}대의 열차
STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION :{WHITE}새 기차
STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION :{WHITE}새 전기 기차
@@ -2775,7 +2769,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}기관차/객차/화물차 한량만 제거하려면 여기로 드래그하세요
@@ -2864,7 +2857,6 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP :{BLACK}다음
##id 0x9000
STR_ERROR_ROAD_VEHICLE_IN_THE_WAY :{WHITE}중간에 자동차가 있습니다.
-STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA}대의 자동차
STR_DEPOT_ROAD_CAPTION :{WHITE}{TOWN} 차고
STR_DEPOT_ROAD_NEW_VEHICLES_BUTTON :{BLACK}새 차량
STR_BUILD_VEHICLE_ROAD_CAPTION :{WHITE}새 자동차
@@ -2880,7 +2872,6 @@ STR_HEADING_FOR_ROAD_DEPOT_SERVICE :{LTBLUE}{TOWN}
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}이 차량이 있는 곳으로 이동
@@ -2927,7 +2918,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}대의 선박
STR_BUILD_VEHICLE_SHIP_CAPTION :{WHITE}새 선박
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON :{BLACK}선박 만들기
STR_CLONE_SHIP :{BLACK}선박 복제
@@ -2950,7 +2940,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}현재 선박 행동 - 선박을 운행/중지시키려면 클릭하세요
@@ -2992,7 +2981,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}대의 항공기
STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR :{WHITE}항공기를 격납고로 보낼 수 없습니다...
STR_HEADING_FOR_HANGAR :{ORANGE}{STATION}공항 격납고로 가는 중
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}{STATION}공항 격납고로 가는 중 ({VELOCITY})
@@ -3006,7 +2994,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}항공기를 팔려면 여기로 드래그하세요
@@ -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}열차 - 열차 정보를 보려면 클릭
+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}대의 열차
+STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA}대의 자동차
+STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA}대의 선박
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA}대의 항공기
STR_VEH_WITH_SHARED_ORDERS_LIST :{WHITE}{COMMA} 차량의 공유된 경로 목록
STR_VEH_WITH_SHARED_ORDERS_LIST_TIP :{BLACK}이 경로를 공유하고 있는 모든 차량을 표시합니다.
@@ -3216,7 +3208,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}차량 교체 중지
@@ -3382,17 +3373,6 @@ STR_MEASURE_AREA :{BLACK}넓이:
STR_MEASURE_LENGTH_HEIGHTDIFF :{BLACK}길이: {NUM}{}고도차: {NUM} m
STR_MEASURE_AREA_HEIGHTDIFF :{BLACK}넓이: {NUM} x {NUM}{}고도차: {NUM} m
-############ Date formatting
-STR_FORMAT_DATE_TINY :{2:NUM}.{1:STRING}.{0:STRING}
-STR_FORMAT_DATE_SHORT :{1:NUM}년 {0:STRING}
-STR_FORMAT_DATE_LONG :{2:NUM}년 {1:STRING}월 {0:STRING}일
-STR_FORMAT_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING}
-
-STR_JUST_DATE_TINY :{DATE_TINY}
-STR_JUST_DATE_LONG :{DATE_LONG}
-STR_JUST_DATE_ISO :{DATE_ISO}
-########
-
STR_FEEDER_CARGO_VALUE :{BLACK}환승 단위: {LTBLUE}{CURRENCY}
STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD :{WHITE}...여기는 도시 소유의 도로 입니다
STR_DRIVE_THROUGH_ERROR_DIRECTION :{WHITE}...도로가 잘못된 방향을 향하고 있습니다
@@ -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 :그룹 {COMMA}
STR_GROUP_TINY_NAME :{TINYFONT}{GROUP}
STR_GROUP_ALL_TRAINS :모든 기차
STR_GROUP_ALL_ROADS :모든 차량
@@ -3446,12 +3425,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 :{2:NUM}.{1:STRING}.{0:STRING}
+STR_FORMAT_DATE_SHORT :{1:NUM}년 {0:STRING}
+STR_FORMAT_DATE_LONG :{2:NUM}년 {1:STRING}월 {0:STRING}일
+STR_FORMAT_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING}
+
+STR_FORMAT_COMPANY_NUM :(회사 {COMMA})
+STR_FORMAT_GROUP_NAME :그룹 {COMMA}
+STR_FORMAT_INDUSTRY_NAME :{TOWN} {STRING}
STR_NAME_MUST_BE_UNIQUE :{WHITE}이름은 유일해야 합니다
diff --git a/src/lang/russian.txt b/src/lang/russian.txt
index b86c25bae..420fa6b82 100644
--- a/src/lang/russian.txt
+++ b/src/lang/russian.txt
@@ -2342,13 +2342,13 @@ STR_FINANCES_SECTION_CONSTRUCTION :{GOLD}Стро
STR_FINANCES_SECTION_NEW_VEHICLES :{GOLD}Новая техника
STR_FINANCES_SECTION_TRAIN_RUNNING_COSTS :{GOLD}Обслуживание ж/д
STR_FINANCES_SECTION_ROAD_VEH_RUNNING_COSTS :{GOLD}Обслуживание авто
-STR_FINANCES_SECTION_AIRCRAFT_RUNNING_COSTS :{GOLD}Обслуживание авиа
-STR_FINANCES_SECTION_SHIP_RUNNING_COSTS :{GOLD}Обслуживание кораблей
+STR_FINANCES_SECTION_AIRCRAFT_RUNNING_COSTS :{GOLD}Обслуж. авиатранспорта
+STR_FINANCES_SECTION_SHIP_RUNNING_COSTS :{GOLD}Обслуж. кораблей
STR_FINANCES_SECTION_PROPERTY_MAINTENANCE :{GOLD}Обслуж. собственности
STR_FINANCES_SECTION_TRAIN_INCOME :{GOLD}Доход от ж/д
-STR_FINANCES_SECTION_ROAD_VEHICLES_INCOME :{GOLD}Доход от автотранспорта
+STR_FINANCES_SECTION_ROAD_VEHICLES_INCOME :{GOLD}Доход от авто
STR_FINANCES_SECTION_AIRCRAFT_INCOME :{GOLD}Доход от авиации
-STR_FINANCES_SECTION_SHIP_INCOME :{GOLD}Доход от водного транспорта
+STR_FINANCES_SECTION_SHIP_INCOME :{GOLD}Доход от кораблей
STR_FINANCES_SECTION_LOAN_INTEREST :{GOLD}Проценты по займу
STR_FINANCES_SECTION_OTHER :{GOLD}Прочие расходы
STR_FINANCES_NEGATIVE_INCOME :{BLACK}-{CURRENCY}
@@ -2670,9 +2670,9 @@ STR_VEHICLE_NAME_ROAD_RMT_RUBBER_TRUCK :Грузови
STR_VEHICLE_NAME_ROAD_MIGHTYMOVER_SUGAR_TRUCK :Грузовик MightyMover (сахар)
STR_VEHICLE_NAME_ROAD_POWERNAUGHT_SUGAR_TRUCK :Грузовик Powernaught (сахар)
STR_VEHICLE_NAME_ROAD_WIZZOWOW_SUGAR_TRUCK :Грузовик Wizzowow (сахар)
-STR_VEHICLE_NAME_ROAD_MIGHTYMOVER_COLA_TRUCK :Грузовик MightyMover (кола)
-STR_VEHICLE_NAME_ROAD_POWERNAUGHT_COLA_TRUCK :Грузовик Powernaught (кола)
-STR_VEHICLE_NAME_ROAD_WIZZOWOW_COLA_TRUCK :Грузовик Wizzowow (кола)
+STR_VEHICLE_NAME_ROAD_MIGHTYMOVER_COLA_TRUCK :Цистерна MightyMover (кола)
+STR_VEHICLE_NAME_ROAD_POWERNAUGHT_COLA_TRUCK :Цистерна Powernaught (кола)
+STR_VEHICLE_NAME_ROAD_WIZZOWOW_COLA_TRUCK :Цистерна Wizzowow (кола)
STR_VEHICLE_NAME_ROAD_MIGHTYMOVER_COTTON_CANDY :Грузовик MightyMover (сах. вата)
STR_VEHICLE_NAME_ROAD_POWERNAUGHT_COTTON_CANDY :Грузовик Powernaught (сах. вата)
STR_VEHICLE_NAME_ROAD_WIZZOWOW_COTTON_CANDY_TRUCK :Грузовик Wizzowow (сах. вата)
@@ -3524,8 +3524,8 @@ STR_HELIDEPOT :{BLACK}Верт
STR_HELISTATION :{BLACK}Вертолётная станция
STR_SMALL_AIRPORTS :{BLACK}Малые аэропорты
-STR_LARGE_AIRPORTS :{BLACK}Большие аэропорты
-STR_HUB_AIRPORTS :{BLACK}Базовые аэропорты
+STR_LARGE_AIRPORTS :{BLACK}Средние аэропорты
+STR_HUB_AIRPORTS :{BLACK}Большие аэропорты
STR_HELIPORTS :{BLACK}Вертолётные площадки
############ Tooltip measurment
diff --git a/src/lang/serbian.txt b/src/lang/serbian.txt
index 9f231ee04..a14214dc1 100644
--- a/src/lang/serbian.txt
+++ b/src/lang/serbian.txt
@@ -51,7 +51,7 @@ STR_CARGO_PLURAL_GOODS :roba
STR_CARGO_PLURAL_GOODS.aku :robu
STR_CARGO_PLURAL_GRAIN :žito
STR_CARGO_PLURAL_GRAIN.aku :žito
-STR_CARGO_PLURAL_WOOD :drvna građa
+STR_CARGO_PLURAL_WOOD :drvena građa
STR_CARGO_PLURAL_WOOD.aku :drvnu građu
STR_CARGO_PLURAL_IRON_ORE :ruda gvožđa
STR_CARGO_PLURAL_IRON_ORE.aku :rudu gvožđa
@@ -137,7 +137,7 @@ STR_CARGO_PLURAL_PLASTIC :plastika
STR_CARGO_PLURAL_PLASTIC.big :Plastika
STR_CARGO_PLURAL_PLASTIC.gen :plastike
STR_CARGO_PLURAL_PLASTIC.aku :plastiku
-STR_CARGO_PLURAL_FIZZY_DRINKS :Gazirana Pića
+STR_CARGO_PLURAL_FIZZY_DRINKS :Gazirana Pić‡a
STR_CARGO_PLURAL_FIZZY_DRINKS.aku :gazirana pića
STR_CARGO_SINGULAR_NOTHING :
STR_CARGO_SINGULAR_PASSENGER :putnik
@@ -168,7 +168,7 @@ STR_CARGO_SINGULAR_GRAIN :žito
STR_CARGO_SINGULAR_GRAIN.big :Žito
STR_CARGO_SINGULAR_GRAIN.gen :žita
STR_CARGO_SINGULAR_GRAIN.aku :žito
-STR_CARGO_SINGULAR_WOOD :drvna građa
+STR_CARGO_SINGULAR_WOOD :drvena građa
STR_CARGO_SINGULAR_WOOD.big :Drvna građa
STR_CARGO_SINGULAR_WOOD.gen :drvne građe
STR_CARGO_SINGULAR_WOOD.aku :drvnu građu
@@ -193,6 +193,7 @@ STR_CARGO_SINGULAR_MAIZE.big :Kukuruz
STR_CARGO_SINGULAR_MAIZE.gen :kukuruza
STR_CARGO_SINGULAR_MAIZE.aku :kukuruz
STR_CARGO_SINGULAR_FRUIT :Voće
+STR_CARGO_SINGULAR_FRUIT.big :Voće
STR_CARGO_SINGULAR_FRUIT.aku :voće
STR_CARGO_SINGULAR_DIAMOND :dijamant
STR_CARGO_SINGULAR_DIAMOND.big :Dijamant
@@ -264,13 +265,13 @@ STR_CARGO_SINGULAR_FIZZY_DRINK.gen :gaziranog pića
STR_CARGO_SINGULAR_FIZZY_DRINK.aku :gazirano piće
STR_QUANTITY_NOTHING :
STR_QUANTITY_PASSENGERS :{COMMA} putnik{P "" a a}
-STR_QUANTITY_COAL :{WEIGHT} nad ugalj
+STR_QUANTITY_COAL :{WEIGHT} uglja
STR_QUANTITY_MAIL :{COMMA} džak{P "" a ova} pošte
-STR_QUANTITY_OIL :{VOLUME} nad ulje
+STR_QUANTITY_OIL :{VOLUME} ulja
STR_QUANTITY_LIVESTOCK :{COMMA} grl{P o a a} stoke
STR_QUANTITY_GOODS :{COMMA} sanduk{P "" a a} robe
-STR_QUANTITY_GRAIN :{WEIGHT} nad zrno
-STR_QUANTITY_WOOD :{WEIGHT} of drvo
+STR_QUANTITY_GRAIN :{WEIGHT} žitarica
+STR_QUANTITY_WOOD :{WEIGHT} drva
STR_QUANTITY_IRON_ORE :{WEIGHT} železne rude
STR_QUANTITY_STEEL :{WEIGHT} čelika
STR_QUANTITY_VALUABLES :{COMMA} džak{P "" a ova} dragocenosti
@@ -279,22 +280,55 @@ STR_QUANTITY_MAIZE :{WEIGHT} kukuru
STR_QUANTITY_FRUIT :{WEIGHT} voća
STR_QUANTITY_DIAMONDS :{COMMA} džak{P "" a ova} dijamanata
STR_QUANTITY_FOOD :{WEIGHT} hrane
-STR_QUANTITY_PAPER :{WEIGHT} nad papir
+STR_QUANTITY_PAPER :{WEIGHT} papira
STR_QUANTITY_GOLD :{COMMA} džak{P "" a ova} zlata
-STR_QUANTITY_WATER :{VOLUME} nad voda
-STR_QUANTITY_WHEAT :{WEIGHT} nad pšenica
-STR_QUANTITY_RUBBER :{VOLUME} nad guma
-STR_QUANTITY_SUGAR :{WEIGHT} nad zasladiti
+STR_QUANTITY_WATER :{VOLUME} vode
+STR_QUANTITY_WHEAT :{WEIGHT} pšenice
+STR_QUANTITY_RUBBER :{VOLUME} gume
+STR_QUANTITY_SUGAR :{WEIGHT} šećera
STR_QUANTITY_TOYS :{COMMA} igrač{P ka ke aka}
STR_QUANTITY_SWEETS :{COMMA} džak{P "" a ova} slatkiša
-STR_QUANTITY_COLA :{VOLUME} nad kola
-STR_QUANTITY_CANDYFLOSS :{WEIGHT} nad candyfloss
-STR_QUANTITY_BUBBLES :{COMMA} mehur{P "" a ova}
-STR_QUANTITY_TOFFEE :{WEIGHT} nad karamela
+STR_QUANTITY_COLA :{VOLUME} kole
+STR_QUANTITY_CANDYFLOSS :{WEIGHT} šećerne vune
+STR_QUANTITY_BUBBLES :{COMMA} balon{P "" a a}
+STR_QUANTITY_TOFFEE :{WEIGHT} karamele
STR_QUANTITY_BATTERIES :{COMMA} baterij{P a e a}
-STR_QUANTITY_PLASTIC :{VOLUME} nad plastika
+STR_QUANTITY_PLASTIC :{VOLUME} plastike
STR_QUANTITY_FIZZY_DRINKS :{COMMA} gaziran{P o a a} pić{P 0 e a a}
STR_ABBREV_NOTHING :
+STR_ABBREV_PASSENGERS :{TINYFONT}PS
+STR_ABBREV_COAL :{TINYFONT}CL
+STR_ABBREV_MAIL :{TINYFONT}ML
+STR_ABBREV_OIL :{TINYFONT}OL
+STR_ABBREV_LIVESTOCK :{TINYFONT}LV
+STR_ABBREV_GOODS :{TINYFONT}GD
+STR_ABBREV_GRAIN :{TINYFONT}GR
+STR_ABBREV_WOOD :{TINYFONT}WD
+STR_ABBREV_IRON_ORE :{TINYFONT}OR
+STR_ABBREV_STEEL :{TINYFONT}ST
+STR_ABBREV_VALUABLES :{TINYFONT}VL
+STR_ABBREV_COPPER_ORE :{TINYFONT}CO
+STR_ABBREV_MAIZE :{TINYFONT}MZ
+STR_ABBREV_FRUIT :{TINYFONT}FT
+STR_ABBREV_DIAMONDS :{TINYFONT}DM
+STR_ABBREV_FOOD :{TINYFONT}FD
+STR_ABBREV_PAPER :{TINYFONT}PR
+STR_ABBREV_GOLD :{TINYFONT}GD
+STR_ABBREV_WATER :{TINYFONT}WR
+STR_ABBREV_WHEAT :{TINYFONT}WH
+STR_ABBREV_RUBBER :{TINYFONT}RB
+STR_ABBREV_SUGAR :{TINYFONT}SG
+STR_ABBREV_TOYS :{TINYFONT}TY
+STR_ABBREV_SWEETS :{TINYFONT}SW
+STR_ABBREV_COLA :{TINYFONT}CL
+STR_ABBREV_CANDYFLOSS :{TINYFONT}CF
+STR_ABBREV_BUBBLES :{TINYFONT}BU
+STR_ABBREV_TOFFEE :{TINYFONT}TF
+STR_ABBREV_BATTERIES :{TINYFONT}BA
+STR_ABBREV_PLASTIC :{TINYFONT}PL
+STR_ABBREV_FIZZY_DRINKS :{TINYFONT}FZ
+STR_ABBREV_NONE :{TINYFONT}NO
+STR_ABBREV_ALL :{TINYFONT}ALL
STR_DATE_SHORT_WHITE :{WHITE}{DATE_SHORT}
STR_DATE_LONG_WHITE :{WHITE}{DATE_LONG}
STR_SMALLMAP_CAPTION :{WHITE}Mapa - {STRING}
@@ -304,13 +338,13 @@ STR_ERROR_MESSAGE_CAPTION_OTHER_COMPANY :{YELLOW}{STRING
STR_POPUP_CAUTION_CAPTION :{WHITE}Oprez!
STR_ERROR_CAN_T_DO_THIS :{WHITE}Neizvodljivo...
STR_ERROR_CAN_T_CLEAR_THIS_AREA :{WHITE}Područje ne može biti očišćeno...
-STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Original copyright {COPYRIGHT} 1995 Chris Sawyer, All rights reserved
+STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Originalni kopirajt {COPYRIGHT} 1995 Chris Sawyer, Sva prava zadržana
STR_ABOUT_VERSION :{BLACK}OpenTTD verzija {REV}
STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2006 OpenTTD tim
STR_BLACK_CROSS :{BLACK}{CROSS}
STR_SILVER_CROSS :{SILVER}{CROSS}
-STR_QUIT_CAPTION :{WHITE}Napusti
+STR_QUIT_CAPTION :{WHITE}Izađi
STR_YES :{BLACK}Da
STR_NO :{BLACK}Ne
STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Da li ste sigurni da želite da napustite OpenTTD i vratite se u {STRING}?
@@ -331,7 +365,7 @@ STR_COLOUR_DARK_GREEN :Tamno zelena
STR_COLOUR_BLUE :Plava
STR_COLOUR_CREAM :Krem
STR_COLOUR_MAUVE :Lavanda
-STR_COLOUR_PURPLE :Purpurna
+STR_COLOUR_PURPLE :Ljubičasta
STR_COLOUR_ORANGE :Narandžasta
STR_COLOUR_BROWN :Braon
STR_COLOUR_GREY :Siva
@@ -381,7 +415,7 @@ STR_SMALLMAP_LEGENDA_DESERT :{BLACK}{TINYFON
STR_SMALLMAP_LEGENDA_SNOW :{BLACK}{TINYFONT}Sneg
STR_NEWS_MESSAGE_CAPTION :{WHITE}Poruka
STR_QUERY_CAPTION :{WHITE}{STRING}
-STR_DEFAULT :{BLACK}Propust
+STR_DEFAULT :{BLACK}Prvobitno
STR_QUERY_CANCEL :{BLACK}Otkaži
STR_QUERY_OK :{BLACK}OK
STR_QUERY_RENAME :{BLACK}Preimenuj
@@ -400,16 +434,16 @@ STR_ERROR_OWNED_BY :{WHITE}...je u
STR_VEHICLE_DETAIL_TAB_CARGO :{BLACK}Tovar
STR_VEHICLE_DETAIL_TAB_INFORMATION :{BLACK}Informacija
STR_VEHICLE_DETAIL_TAB_CAPACITIES :{BLACK}Kapaciteti
-STR_VEHICLE_DETAIL_TAB_TOTAL_CARGO :{BLACK}Zbir Tovar
-STR_TOTAL_CAPACITY_TEXT :{BLACK}Zbir tovar kapacitet nad ova trenirati:
+STR_VEHICLE_DETAIL_TAB_TOTAL_CARGO :{BLACK}Ukupni tovar
+STR_TOTAL_CAPACITY_TEXT :{BLACK}Ukupan kapacitet ovog voza:
STR_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
STR_TOTAL_CAPACITY_MULT :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
STR_INTRO_NEW_GAME :{BLACK}Nova igra
STR_INTRO_LOAD_GAME :{BLACK}Učitaj igru
-STR_INTRO_MULTIPLAYER :{BLACK}Mreža igra
-STR_INTRO_SCENARIO_EDITOR :{BLACK}Scenarij Urednik
+STR_INTRO_MULTIPLAYER :{BLACK}Mrežna igra
+STR_INTRO_SCENARIO_EDITOR :{BLACK}Editor scenarija
-STR_MAPSIZE :{BLACK}Karta veličina:
+STR_MAPSIZE :{BLACK}Veličina mapa:
STR_BY :{BLACK}*
STR_INTRO_GAME_OPTIONS :{BLACK}Opcije
@@ -420,7 +454,7 @@ STR_UNITS_METRIC :Metrički
STR_UNITS_SI :SI
STR_UNITS_VELOCITY_IMPERIAL :{COMMA} milja na sat
-STR_UNITS_VELOCITY_METRIC :{COMMA} kilometar na sat
+STR_UNITS_VELOCITY_METRIC :{COMMA} km/h
STR_UNITS_VELOCITY_SI :{COMMA} m/s
STR_UNITS_POWER_IMPERIAL :{COMMA}ks
@@ -436,7 +470,7 @@ STR_UNITS_WEIGHT_LONG_SI :{COMMA} kg
STR_UNITS_VOLUME_SHORT_METRIC :{COMMA}l
STR_UNITS_VOLUME_SHORT_SI :{COMMA}m³
-STR_UNITS_VOLUME_LONG_METRIC :{COMMA} lit{P ra re ara}
+STR_UNITS_VOLUME_LONG_METRIC :{COMMA} lit{P ar ra ara}
STR_UNITS_VOLUME_LONG_SI :{COMMA} m³
STR_UNITS_FORCE_SI :{COMMA} kN
@@ -449,7 +483,7 @@ STR_GRAPH_MENU_PERFORMANCE_HISTORY_GRAPH :Grafikon istori
STR_GRAPH_MENU_COMPANY_VALUE_GRAPH :Grafikon vrednosti kompanije
STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Stope naplate tovara
STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Tabela lige kompanija
-STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Detaljan pergled poslovanja
+STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Detaljan pregled poslovanja
############ range for menu ends
STR_ABOUT_OPENTTD :{WHITE}O OpenTTD-u
@@ -465,25 +499,25 @@ STR_FILTER_CRITERIA_TIP :{BLACK}Izaberit
STR_SORT_BY :{BLACK}Sortiraj po
STR_SORT_BY_POPULATION :{BLACK}Naseljenost
-STR_SORT_BY_PRODUCTION :Proizvodnja
-STR_SORT_BY_TYPE :Vrsta
+STR_SORT_BY_PRODUCTION :Proizvodnji
+STR_SORT_BY_TYPE :Vrsti
STR_SORT_BY_TRANSPORTED :Transportovano
STR_SORT_BY_NAME :{BLACK}Ime
-STR_SORT_BY_DROPDOWN_NAME :Ime
-STR_SORT_BY_DATE :{BLACK}Datum
-STR_SORT_BY_NUMBER :Broj
-STR_SORT_BY_PROFIT_LAST_YEAR :Zarada prošle godine
-STR_SORT_BY_PROFIT_THIS_YEAR :Zarada ove godine
-STR_SORT_BY_AGE :Starost
-STR_SORT_BY_RELIABILITY :Pouzdanost
-STR_SORT_BY_TOTAL_CAPACITY_PER_CARGOTYPE :Ukupna nosivost po vrsti tovara
+STR_SORT_BY_DROPDOWN_NAME :Imenu
+STR_SORT_BY_DATE :{BLACK}Datumu
+STR_SORT_BY_NUMBER :Broju
+STR_SORT_BY_PROFIT_LAST_YEAR :Zaradi prošle godine
+STR_SORT_BY_PROFIT_THIS_YEAR :Zaradi ove godine
+STR_SORT_BY_AGE :Starosti
+STR_SORT_BY_RELIABILITY :Pouzdanosti
+STR_SORT_BY_TOTAL_CAPACITY_PER_CARGOTYPE :Ukupnoj nosivosti po vrsti tovara
STR_SORT_BY_MAX_SPEED :Nejvećoj brzini
-STR_SORT_BY_MODEL :Model
-STR_SORT_BY_VALUE :Vrednost
-STR_SORT_BY_LENGTH :Dužina
-STR_SORT_BY_LIFE_TIME :Preostao životni vek
-STR_SORT_BY_FACILITY :Vrsta stanice
-STR_SORT_BY_WAITING :Vrednost tovara na čekanju
+STR_SORT_BY_MODEL :Modelu
+STR_SORT_BY_VALUE :Vrednosti
+STR_SORT_BY_LENGTH :Dužini
+STR_SORT_BY_LIFE_TIME :Preostalom životnom veku
+STR_SORT_BY_FACILITY :Vrsti stanice
+STR_SORT_BY_WAITING :Vrednosti tovara na čekanju
STR_SORT_BY_RATING_MAX :Najvišoj oceni tereta
STR_SORT_BY_RATING_MIN :Najnižoj oceni tereta
STR_ENGINE_SORT_ENGINE_ID :ID mašine (standardno)
@@ -798,7 +832,7 @@ STR_SAVELOAD_SAVE_SCENARIO :{WHITE}Sačuvaj
STR_INTRO_PLAY_SCENARIO :{BLACK}Igraj scenario
STR_INTRO_PLAY_HEIGHTMAP :{BLACK}Igra Visina
STR_INTRO_PLAY_HEIGHTMAP_TOOLTIP :{BLACK}Start jedan nov igra , pomoću jedan visina ace krajolik
-STR_QUIT_SCENARIO_QUERY :{YELLOW}Biti te siguran te oskudica za slobodan današji scenarij?
+STR_QUIT_SCENARIO_QUERY :{YELLOW}Da li ste sigurni da želite da izađete iz ovog scenarija?
STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS_WITH_POPULATION_OF_1200 :{WHITE}...dozvoljeno izgraditi samo u naseljima sa populacijom od najmanje 1200
STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD :{BLACK}Pomeranje datuma početka za jednu godinu unazad
STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_FORWARD :{BLACK}Pomeranje datuma početka za jednu godinu unapred
@@ -1915,14 +1949,14 @@ STR_LOCAL_AUTHORITY_ACTION_STATUE_OF_COMPANY :Izgradnja statu
STR_LOCAL_AUTHORITY_ACTION_NEW_BUILDINGS :Finansiranje novih zgrada
STR_LOCAL_AUTHORITY_ACTION_EXCLUSIVE_TRANSPORT :Kupovina ekskluzivnih prava na transport
STR_LOCAL_AUTHORITY_ACTION_BRIBE :Podmićivanje lokalne vlasti
-STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_SMALL_ADVERTISING :{WHITE}{STRING}{}{YELLOW} Ulaganje u manju reklamnu kampanju će doneti kompaniji više putnika i robe iz ovog naselja.{} Trošak: {CURRENCY}
-STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_MEDIUM_ADVERTISING :{WHITE}{STRING}{}{YELLOW} Ulaganje u reklamnu kampanju srednjeg budžeta će doneti kompaniji više putnika i robe iz ovog naselja.{} Trošak: {CURRENCY}
-STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_LARGE_ADVERTISING :{WHITE}{STRING}{}{YELLOW} Ulaganje u veliku reklamnu kampanju će doneti kompaniji više putnika i robe iz ovog naselja.{} Trošak: {CURRENCY}
-STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_ROAD_RECONSTRUCTION :{WHITE}{STRING}{}{YELLOW} Finansiranje rekonstrukcije lokalne mreže puteva. Može prouzrokovati kolaps u drumskom saobraćaju u trajanju do 6 meseci.{} Trošak: {CURRENCY}
+STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_SMALL_ADVERTISING :{WHITE}{STRING}{}{YELLOW} Ulaganje u malu reklamnu kampanju će doneti kompaniji više putnika i robe iz ovog naselja.{} Trošak: {CURRENCY}
+STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_MEDIUM_ADVERTISING :{WHITE}{STRING}{}{YELLOW} Ulaganje u reklamnu kampanju srednje veličine će doneti kompaniji više putnika i robe iz ovog naselja.{} Trošak: {CURRENCY}
+STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_LARGE_ADVERTISING :{WHITE}{STRING}{}{YELLOW} Ulaganje u veliku reklamnu kampanju će doneti kompaniji više putnika i robe iz ovog naselja.{} Trošak: {CURRENCY}
+STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_ROAD_RECONSTRUCTION :{WHITE}{STRING}{}{YELLOW} Finansiranje rekonstrukcije lokalne mreže puteva. Može prouzrokovati kolaps u drumskom saobraćaju u trajanju do 6 meseci.{} Trošak: {CURRENCY}
STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_STATUE_OF_COMPANY :{WHITE}{STRING}{}{YELLOW} Otkrivanje spomenika kompanije.{} Trošak: {CURRENCY}
STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_NEW_BUILDINGS :{WHITE}{STRING}{}{YELLOW} Finansiranje izgradnje novih komercijalnih objekata u naselju.{} Trošak: {CURRENCY}
-STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_EXCLUSIVE_TRANSPORT :{WHITE}{STRING}{}{YELLOW} Kupovina ekskluzivnih transportnih prava od lokalne vlasti, osigurava da će lokalni korisnici transporta koristiti isključivo usluge kompanije. Prava ističu nakon godinu dana.{} Trošak: {CURRENCY}
-STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE :{WHITE}{STRING}{}{YELLOW} Krumpiranje lokalne vlasti kako bi porastao rejting vaše kompanije, uz rizik velike štete ukoliko se otkrije.{} Cena: {CURRENCY}
+STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_EXCLUSIVE_TRANSPORT :{WHITE}{STRING}{}{YELLOW} Kupovina ekskluzivnih transportnih prava od lokalne vlasti na godinu dana, osigurava da će lokalni korisnici transporta koristiti isključivo usluge vaše kompanije.{} Trošak: {CURRENCY}
+STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE :{WHITE}{STRING}{}{YELLOW} Davanje mita lokalnoj vlasti kako bi porastao rejting vaše kompanije, uz rizik velike štete ukoliko se otkrije.{} Cena: {CURRENCY}
STR_NEWS_ROAD_REBUILDING :{BIGFONT}{BLACK}{TOWN} - haos na ulicama!{}{}Program rekonstrukcije puteva sponzorisan od strane kompanije {STRING} donosi vozačima 6 meseci agonije!
STR_SMALLMAP_TOWN :{TINYFONT}{WHITE}{TOWN}
STR_TOWN_DIRECTORY_TOWN :{ORANGE}{TOWN}{BLACK} ({COMMA})
@@ -2574,6 +2608,7 @@ STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_TOY_VAN :Vagon za Igrač
STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_BATTERY_TRUCK :Vagon za Baterije
STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_FIZZY_DRINK_TRUCK :Vagon za Bezalkoholna Pića
STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_PLASTIC_TRUCK :Vagon za Plastiku
+STR_VEHICLE_NAME_TRAIN_ENGINE_MAGLEV_LEV1_LEVIATHAN_ELECTRIC :Lev1 'Leviathan' (Electric)
STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_PASSENGER_CAR :Putnička Kola
STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_MAIL_VAN :Poštanski Vagon
STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_COAL_CAR :Vagon za Ugalj
@@ -3175,10 +3210,10 @@ STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING}
############ End of list of rail types
-STR_PURCHASE_INFO_SPEED_POWER :{BLACK}Brzina: {GOLD}{VELOCITY}{BLACK} Snaga: {GOLD}{POWER}
+STR_PURCHASE_INFO_SPEED_POWER :{BLACK}Brzina: {GOLD}{VELOCITY}{BLACK} Snaga: {GOLD}{POWER}
STR_PURCHASE_INFO_SPEED :{BLACK}Brzina: {GOLD}{VELOCITY}
STR_PURCHASE_INFO_RUNNINGCOST :{BLACK}Cena odrzavanja: {GOLD}{CURRENCY}/yr
-STR_PURCHASE_INFO_WEIGHT_CWEIGHT :{BLACK}Tezina: {GOLD}{WEIGHT_S} ({WEIGHT_S})
+STR_PURCHASE_INFO_WEIGHT_CWEIGHT :{BLACK}Težina: {GOLD}{WEIGHT_S} ({WEIGHT_S})
########### For showing numbers in widgets
@@ -3306,6 +3341,7 @@ 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}
diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt
index 210aa659f..659638a29 100644
--- a/src/lang/simplified_chinese.txt
+++ b/src/lang/simplified_chinese.txt
@@ -762,9 +762,6 @@ STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :新建工业设
############ range ends here
STR_FUND_INDUSTRY_CAPTION :{WHITE}建设新的工业设施
-STR_JUST_STRING :{STRING}
-STR_JUST_RAW_STRING :{STRING}
-STR_JUST_INT :{NUM}
STR_ERROR_CAN_ONLY_BE_BUILT_IN_RAINFOREST :{WHITE}只能在雨林中建设……
STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT :{WHITE}只能在沙漠中建设……
STR_STATUSBAR_PAUSED :{YELLOW}* * 暂停中 * *
@@ -842,7 +839,7 @@ STR_OPTIONS_LANG_TIP :{BLACK}选择
STR_OPTIONS_FULLSCREEN :{BLACK}全屏幕
STR_OPTIONS_FULLSCREEN_TIP :{BLACK}选择此项可以在全屏幕模式下进行 OpenTTD 游戏
-STR_FULLSCREEN_FAILED :{WHITE}无法切换到全屏模式
+STR_FULLSCREEN_FAILED :{WHITE}无法切换到全屏模式{}尝试使用不同的分辨率
STR_OPTIONS_RES :{BLACK}屏幕分辨率
STR_OPTIONS_RES_CBO :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
@@ -1197,7 +1194,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}不能更改路点名称……
@@ -1778,11 +1774,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 :植树
@@ -1837,6 +1828,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}
@@ -2171,7 +2168,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}色彩方案:
@@ -2204,7 +2200,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}已贷款额
@@ -2716,7 +2711,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} 列 火车
STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION :{WHITE}购买普通列车
STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION :{WHITE}购买电气化列车
@@ -2774,7 +2768,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}将列车拖到这里以出售
@@ -2863,7 +2856,6 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP :{BLACK}根据
##id 0x9000
STR_ERROR_ROAD_VEHICLE_IN_THE_WAY :{WHITE}指定的位置有汽车
-STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} 辆 汽车
STR_DEPOT_ROAD_CAPTION :{WHITE}{TOWN} 车库
STR_DEPOT_ROAD_NEW_VEHICLES_BUTTON :{BLACK}购买汽车
STR_BUILD_VEHICLE_ROAD_CAPTION :{WHITE}购买汽车
@@ -2879,7 +2871,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}将屏幕中心移动到汽车所在的位置
@@ -2926,7 +2917,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} 艘 船只
STR_BUILD_VEHICLE_SHIP_CAPTION :{WHITE}购买船只
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON :{BLACK}购买船只
STR_CLONE_SHIP :{BLACK}克隆船只
@@ -2949,7 +2939,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}船只当前的状态{}点击可以 启动/停止 船只
@@ -2991,7 +2980,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} 架 飞机
STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR :{WHITE}不能命令飞机返回机库……
STR_HEADING_FOR_HANGAR :{ORANGE}正在前往 {STATION} 的机库
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}正在前往 {STATION} 的机库,{VELOCITY}
@@ -3005,7 +2993,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}将飞机拖到这里以出售
@@ -3187,11 +3174,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} 列 火车
+STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} 辆 汽车
+STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} 艘 船只
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} 架 飞机
STR_VEH_WITH_SHARED_ORDERS_LIST :{WHITE}与 {COMMA} 车辆/船只/飞机共享调度计划
STR_VEH_WITH_SHARED_ORDERS_LIST_TIP :{BLACK}显示所有共享此调度计划的{}车辆/船只/飞机
@@ -3215,7 +3207,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}停止更新
@@ -3381,17 +3372,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}道路方向不对
@@ -3416,7 +3396,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 :全部汽车
@@ -3445,12 +3424,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/welsh.txt b/src/lang/welsh.txt
index d0c099d14..8c36d3b57 100644
--- a/src/lang/welsh.txt
+++ b/src/lang/welsh.txt
@@ -762,9 +762,6 @@ STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :Ariannu diwydia
############ range ends here
STR_FUND_INDUSTRY_CAPTION :{WHITE}Ariannu diwydiant newydd
-STR_JUST_STRING :{STRING}
-STR_JUST_RAW_STRING :{STRING}
-STR_JUST_INT :{NUM}
STR_ERROR_CAN_ONLY_BE_BUILT_IN_RAINFOREST :{WHITE}...gellir ei adeiladu'n unig mewn ardal o goedwigoedd glaw
STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT :{WHITE}...gellir ei adeiladu'n unig mewn ardaloedd o anialwch
STR_STATUSBAR_PAUSED :{YELLOW}* * WEDI'I OEDI * *
@@ -855,6 +852,8 @@ STR_OPTIONS_SCREENSHOT_FORMAT_TIP :{BLACK}Dewiswch
STR_OPTIONS_BASE_GRF :{BLACK}Set Raffeg Sylfaenol
STR_OPTIONS_BASE_GRF_CBO :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
STR_OPTIONS_BASE_GRF_TIP :{BLACK}Dewiswch y set raffeg sylfaenol i'w defnyddio
+STR_OPTIONS_BASE_GRF_STATUS :{RED}{10:NUM} ar goll/corrupted file{P "" iau}
+STR_OPTIONS_BASE_GRF_DESCRIPTION_TIP :{BLACK}gwybodaeth ychwanegol am y set sall graffeg
STR_AUTOSAVE_FAILED :{WHITE}Methodd yr Awtogadw
@@ -961,6 +960,7 @@ STR_CONFIG_SETTING_ADJACENT_STATIONS :{LTBLUE}Caniat
STR_CONFIG_SETTING_DYNAMIC_ENGINES :{LTBLUE}Galluogi defnyddio mwy nag un o setiau injian NewGRF: {ORANGE}{STRING}
STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES :{WHITE}Nid yw hi'n bosib newid y gosodiadau pan mae cerbydau'n bodoli.
+STR_CONFIG_SETTING_NEVER_EXPIRE_AIRPORTS :{LTBLUE}Maes awyr ddim yn dibennu: {ORANGE}{STRING}
STR_CONFIG_SETTING_WARN_LOST_TRAIN :{LTBLUE}Rhybuddio os yw'r trên ar goll: {ORANGE}{STRING}
STR_CONFIG_SETTING_ORDER_REVIEW :{LTBLUE}Adolygu gorchmynion y cerbyd: {ORANGE}{STRING}
@@ -1194,7 +1194,6 @@ STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Dewiswch
STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT}
STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT}
-STR_WAYPOINT_NAME :{WAYPOINT}
STR_EDIT_WAYPOINT_NAME :{WHITE}Golygu enw Pwynt Llwybr
STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}Does dim modd newid enw Pwynt Llwybr...
@@ -1775,11 +1774,6 @@ STR_TOWN_BUILDING_NAME_TEPEES_1 :Tipi
STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1 :Tŷ Tebot
STR_TOWN_BUILDING_NAME_PIGGY_BANK_1 :Cadwmigei
-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 :Tirweddu
STR_LANDSCAPING_MENU_PLANT_TREES :Plannu coed
@@ -1834,6 +1828,12 @@ STR_CARGO_RATING_EXCELLENT :Gwych
STR_CARGO_RATING_OUTSTANDING :Rhagorol
############ range for rating ends
+### station view strings
+STR_SCHEDULED_TRAINS_TIP :{BLACK}Dangos pob trên sydd â'r orsaf hon yn eu hamserlen
+STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Dangos pob cerbyd ffordd sydd â'r orsaf hon yn eu hamserlen
+STR_SCHEDULED_AIRCRAFT_TIP :{BLACK}Dangos pob awyren sydd â'r orsaf hon yn eu hamserlen
+STR_SCHEDULED_SHIPS_TIP :{BLACK}Dangos pob llong sydd â'r orsaf hon yn eu hamserlen
+
STR_STATION_VIEW_CARGO_RATING :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}Nid yw {STATION} bellach yn derbyn {STRING}
STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}Nid yw {STATION} bellach yn derbyn {STRING} na {STRING}
@@ -2168,7 +2168,6 @@ STR_CITY_APPROVAL_HOSTILE :Gwrthwynebus
##id 0x7000
STR_COMPANY_VIEW_CAPTION :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
-STR_FORMAT_COMPANY_NUM :(Cwmni {COMMA})
STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Gwyneb Newydd
STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON :{BLACK}Cynllun Lliw
STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE :{GOLD}Cynllun Lliw:
@@ -2201,7 +2200,6 @@ STR_FINANCES_TOTAL_CAPTION :{WHITE}Cyfanswm
STR_COMPANY_NAME_COMPANY_NUM :{COMPANY}{COMPANYNUM}
STR_GRAPH_INCOME_CAPTION :{WHITE}Graff Incwm
STR_CURRCOMPACT :{CURRCOMPACT}
-STR_JUST_COMMA :{COMMA}
STR_GRAPH_OPERATING_PROFIT_CAPTION :{WHITE}Graff Elw Gweithredu
STR_FINANCES_BANK_BALANCE_TITLE :{WHITE}Balans Banc
STR_FINANCES_LOAN_TITLE :{WHITE}Benthyciad
@@ -2713,7 +2711,6 @@ STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON :{BLACK}Cerbyd N
STR_DEPOT_NO_ENGINE :{BLACK}-
STR_ERROR_TRAIN_TOO_LONG :{WHITE}Mae'r Trên yn rhy hir
STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT :{WHITE}Gellir newid trenau yn unig pan fyddan nhw wedi stopio tu mewn i ddepo
-STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} Tr{P "ên" au}
STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION :{WHITE}Cerbydau Rheilffordd Newydd
STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION :{WHITE}Cerbydau Rheilffordd Trydan Newydd
@@ -2771,7 +2768,6 @@ STR_ERROR_UNABLE_TO_FIND_ROUTE_TO :{WHITE}Methu do
STR_ERROR_CAN_T_STOP_START_TRAIN :{WHITE}Methu cychwyn/stopio trên...
STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS :{BLACK}Bwlch rhwng gwasanaeth: {LTBLUE}{COMMA}days{BLACK} Gwasanaeth diwethaf: {LTBLUE}{DATE_LONG}
STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT :{BLACK}bwlch rhwng gwasanaeth: {LTBLUE}{COMMA}%{BLACK} Gwasanaeth diwethaf: {LTBLUE}{DATE_LONG}
-STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP :{BLACK}Trenau - cliciwch ar trên i gael gwybodaeth
STR_DEPOT_TRAIN_LIST_TOOLTIP :{BLACK}Trenau - cliciwch ar y trên am wybodaeth, llusgwch gerbyd i'w ychwanegu neu i'w dynnu o'r trên
STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP :{BLACK}Adeiladu cerbyd trên newydd
STR_DEPOT_TRAIN_SELL_TOOLTIP :{BLACK}Llusgwch gerbyd trên yma i'w werthu
@@ -2805,11 +2801,16 @@ STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER :{BLACK}Côst: {
STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST :{BLACK}Côst: {CURRENCY} Cyflym. Max: {VELOCITY}{}Cynhwysedd: {CARGO}, {CARGO}{}Côst Rhedfa: {CURRENCY}/yr
STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_RUNCOST :{BLACK}Côst: {CURRENCY} Cyflym. Max: {VELOCITY}{}Cynhwysedd: {CARGO}{}Cost Rhedfa: {CURRENCY}/bl
STR_VEHICLE_INFO_AGE_RUNNING_COST_YR :{BLACK}Oed: {LTBLUE}{STRING}{BLACK} Cost Rhedfa: {LTBLUE}{CURRENCY}/bl.
+STR_VEHICLE_INFO_MAX_SPEED :{BLACK}cyflymder uchaf: {LTBLUE}{VELOCITY}
STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED :{BLACK}Pwys: {LTBLUE}{WEIGHT_S} {BLACK}Pŵer: {LTBLUE}{POWER}{BLACK} Cyflym. Max: {LTBLUE}{VELOCITY}
STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED_MAX_TE :{BLACK}Pwys: {LTBLUE}{WEIGHT_S} {BLACK}Pŵer: {LTBLUE}{POWER}{BLACK} Cyflym. Max: {LTBLUE}{VELOCITY} {BLACK}Max. T.E.: {LTBLUE}{FORCE}
STR_VEHICLE_INFO_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Profit this year: {LTBLUE}{CURRENCY} (last year: {CURRENCY})
STR_VEHICLE_INFO_RELIABILITY_BREAKDOWNS :{BLACK}Dibynadwy: {LTBLUE}{COMMA}% {BLACK}Toriadau es gwasanaeth olaf: {LTBLUE}{COMMA}
STR_VEHICLE_INFO_BUILT_VALUE :{LTBLUE}{ENGINE} {BLACK}Codi: {LTBLUE}{NUM}{BLACK} Pris: {LTBLUE}{CURRENCY}
+STR_VEHICLE_INFO_CAPACITY :{BLACK}Cynhwysedd: {LTBLUE}{CARGO}{SKIP}{SKIP}{STRING}
+STR_VEHICLE_INFO_CAPACITY_MULT :{BLACK}Cynhwysedd: {LTBLUE}{CARGO}{SKIP}{SKIP}{STRING} (x{NUM})
+STR_VEHICLE_INFO_CAPACITY_CAPACITY :{BLACK}Cynhwysedd: {LTBLUE}{CARGO}, {CARGO}{STRING}
+STR_VEHICLE_STATUS_BROKEN_DOWN :{RED}Torri lawr
STR_VEHICLE_STATUS_STOPPED :{RED}Wedi stopio
STR_ERROR_CAN_T_MAKE_TRAIN_PASS_SIGNAL :{WHITE}Does dim modd gwneud i drên basio signal pan fo perygl...
STR_VEHICLE_STATUS_CRASHED :{RED}Wedi crashio!
@@ -2819,6 +2820,8 @@ STR_ERROR_CAN_T_RENAME_TRAIN :{WHITE}Methu en
STR_VEHICLE_DETAILS_TRAIN_RENAME :{BLACK}Enwi trên
STR_NEWS_TRAIN_CRASH :{BLACK}{BIGFONT}Trên wedi crashio!{}Bu {COMMA} farw yn y ddamwain
STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN :{WHITE}Methu gwrthdroi cyfeiriad trên...
+STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE :{WHITE}ddim yn medru reversio'r cerbyd...
+STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS :{WHITE}Methu troi cerbydau sy'n meddu ar sawl uned
STR_QUERY_RENAME_TRAIN_TYPE_CAPTION :{WHITE}Ailenwi math y cerbyd trên
STR_ERROR_CAN_T_RENAME_TRAIN_TYPE :{WHITE}Methu ailenwi math y cerbyd trên...
STR_CLEAR_TIME :{BLACK}Clirio Amser
@@ -2853,7 +2856,6 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP :{BLACK}Llenwch
##id 0x9000
STR_ERROR_ROAD_VEHICLE_IN_THE_WAY :{WHITE}Cerbyd ffordd yn y ffordd
-STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} Cerbyd{P "" au} Ffordd
STR_DEPOT_ROAD_CAPTION :{WHITE}Depo Cerbydau Ffordd {TOWN}
STR_DEPOT_ROAD_NEW_VEHICLES_BUTTON :{BLACK}Cerbyd Newydd
STR_BUILD_VEHICLE_ROAD_CAPTION :{WHITE}Cerbydau Ffordd Newydd
@@ -2869,7 +2871,6 @@ STR_HEADING_FOR_ROAD_DEPOT_SERVICE :{LTBLUE}Mynd am
STR_HEADING_FOR_ROAD_DEPOT_SERVICE_VEL :{LTBLUE}Mynd am wasanaeth i Ddepo Ffordd {TOWN}, {VELOCITY}
STR_ERROR_CAN_T_SEND_VEHICLE_TO_DEPOT :{WHITE}Methu gyrru cerbyd i'r depo...
STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT :{WHITE}Methu dod o hyd i'r depo lleol
-STR_VEHICLE_LIST_ROAD_TOOLTIP :{BLACK}Cerbydau Ffordd - cliciwch ar cerbyd am wybodaeth
STR_VEHICLE_VIEW_ROAD_STATE_START_STOP_TOOLTIP :{BLACK}Gweithred gyfredol y cerbyd - cliciwch yma i gychwyn/stopio'r cerbyd
STR_VEHICLE_VIEW_ROAD_ORDERS_TOOLTIP :{BLACK}Dangos gorchmynion cerbyd
STR_VEHICLE_VIEW_ROAD_LOCATION_TOOLTIP :{BLACK}Canoli'r brif olygfa ar leoliad y cerbyd
@@ -2897,7 +2898,7 @@ STR_NEWS_FIRST_ROAD_PASSENGER_TRAM_ARRIVAL :{BLACK}{BIGFONT
STR_NEWS_FIRST_ROAD_CARGO_TRAM_ARRIVAL :{BLACK}{BIGFONT}Mae'r trigolion yn dathlu . . .{} Mae'r tram nwyddau cyntaf wedi cyrraedd {STATION}!
STR_NEWS_ROAD_CRASH_DRIVER :{BLACK}{BIGFONT}Damwain Cerbyd Ffordd!{}Bu gyrrwr farw mewn damwain â thrên
STR_NEWS_ROAD_CRASH :{BLACK}{BIGFONT}Damwain Cerbyd Ffordd!{}Bu farw {COMMA} mewn damwain â thrên
-STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS :{WHITE}Methu troi cerbydau sy'n meddu ar sawl uned
+STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN :{WHITE}ddim yn methu troi'r cerbyd...
STR_BUILD_VEHICLE_ROAD_RENAME_BUTTON :{BLACK}Ailenwi
STR_BUILD_VEHICLE_ROAD_RENAME_TOOLTIP :{BLACK}Ailenwi'r math cerbyd ffordd
STR_QUERY_RENAME_ROAD_TYPE_CAPTION :{WHITE}Ailenwi'r math cerbyd ffordd
@@ -2916,7 +2917,6 @@ STR_WATERWAYS_TOOLBAR_CAPTION_SE :{WHITE}Camlesi
STR_ERROR_CAN_T_BUILD_DOCK_HERE :{WHITE}Methu adeiladu doc yma...
STR_DEPOT_SHIP_CAPTION :{WHITE}Depo Llong {TOWN}
STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON :{BLACK}Llong Newydd
-STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} Llong{P "" au}
STR_BUILD_VEHICLE_SHIP_CAPTION :{WHITE}Llong Newydd
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON :{BLACK}Adeiladu Llong
STR_CLONE_SHIP :{BLACK}Dyblygu Llong
@@ -2939,7 +2939,6 @@ STR_DEPOT_SHIP_LIST_TOOLTIP :{BLACK}Llongau
STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP :{BLACK}Adeiladu llong newydd
STR_DEPOT_SHIP_SELL_TOOLTIP :{BLACK}Llusgwch long yma i'w gwerthu
STR_DEPOT_SHIP_LOCATION_TOOLTIP :{BLACK}Canoli'r brif olygfa ar leoliad depo'r llong
-STR_VEHICLE_LIST_SHIP_TOOLTIP :{BLACK}Llongau - cliciwch ar long am wybodaeth
STR_BUILD_VEHICLE_SHIP_LIST_TOOLTIP :{BLACK}Rhestr ddewis llongau - cliciwch ar long am wybodaeth
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP :{BLACK}Adeiladu'r llong sydd wedi'i hamlygu
STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Gweithred y llong gyfredol - cliciwch yma i gychwyn/stopio llong
@@ -2981,7 +2980,6 @@ STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}Bydd hyn
STR_BUILD_VEHICLE_AIRCRAFT_CAPTION :{WHITE}Awyrennau Newydd
STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON :{BLACK}Adeiladu Awyrennau
STR_ERROR_CAN_T_BUILD_AIRCRAFT :{WHITE}Methu adeiladu awyren...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} Awyrennau
STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR :{WHITE}Methu gyrru awyren i awyrendy...
STR_HEADING_FOR_HANGAR :{ORANGE}Mynd am Awyrendy {STATION}
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Mynd am Awyrendy {STATION}, {VELOCITY}
@@ -2995,7 +2993,6 @@ STR_ERROR_AIRCRAFT_MUST_BE_STOPPED :{WHITE}Rhaid i
STR_ERROR_CAN_T_SELL_AIRCRAFT :{WHITE}methu gwerthu awyren...
STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :Adeiladu Maes Awyr
STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP :{BLACK}Adeiladu maes awyr
-STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP :{BLACK}Awyrennau - cliciwch ar awyren am wybodaeth
STR_DEPOT_AIRCRAFT_LIST_TOOLTIP :{BLACK}Awyrennau - cliciwch ar awyren am wybodaeth
STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP :{BLACK}Adeiladu awyren newydd
STR_DEPOT_AIRCRAFT_SELL_TOOLTIP :{BLACK}Llusgwch awyren yma i'w gwerthu
@@ -3147,6 +3144,7 @@ STR_BROKEN_VEHICLE_LENGTH :{WHITE}Mae gan
STR_NEWGRF_BUGGY :{WHITE}Mae NewGRF '{0:STRING}' yn darparu gwybodaeth anghywir.
STR_NEWGRF_BUGGY_ARTICULATED_CARGO :{WHITE}Mae'r wybodaeth cargo/ailffitio ar gyfer '{1:ENGINE}' yn wahanol i'r rhestr brynu wedi'r adeiladu. Gall hyn beri i awtoadnewyddy/-ddisodli fethu ag ailfitio'n gywir.
+STR_NEWGRF_BUGGY_ENDLESS_PRODUCTION_CALLBACK :{WHITE}'{1:STRING}' creu lwp anorffen yn y production callback.
STR_LOADGAME_REMOVED_TRAMS :{WHITE}Cafodd y gêm ei gadw mewn fersiwn heb dram. Cafodd y tramiau eu dileu.
@@ -3159,6 +3157,16 @@ STR_CURRENCY_SWITCH_TO_EURO :{LTBLUE}Newid i
STR_CURRENCY_SWITCH_TO_EURO_NEVER :{LTBLUE}Newid i'r Ewro: {ORANGE}byth
STR_CURRENCY_PREVIEW :{LTBLUE}Rhagolwg: {ORANGE}{6:CURRENCY}
STR_CURRENCY_CHANGE_PARAMETER :{BLACK}Newid paramedrau arian cyfaddas
+STR_TOOLTIP_DECREASE_EXCHANGE_RATE :{BLACK}Llehad yr swm o eich arian cyfred am un Punt (£)
+STR_TOOLTIP_INCREASE_EXCHANGE_RATE :{BLACK}amlhau yr swm o eich arian cyfred am un Punt (£)
+STR_TOOLTIP_SET_EXCHANGE_RATE :{BLACK}newid y raddfa gyfnewid o eich arian cyfred i un Punt (£)
+STR_TOOLTIP_SET_CUSTOM_CURRENCY_SEPARATOR :{BLACK}Creu yr ysgar i eich arian Cyfred
+STR_TOOLTIP_SET_CUSTOM_CURRENCY_PREFIX :{BLACK}Creu yr rhagddodiad i eich arian Cyfred
+STR_TOOLTIP_SET_CUSTOM_CURRENCY_SUFFIX :{BLACK}Creu yr olddodiad i eich arian Cyfred
+STR_TOOLTIP_DECREASE_CUSTOM_CURRENCY_TO_EURO :{BLACK}Newid i'r Ewro yn gynnar.
+STR_TOOLTIP_INCREASE_CUSTOM_CURRENCY_TO_EURO :{BLACK}Newid i'r Ewro yn hwyrach
+STR_TOOLTIP_SET_CUSTOM_CURRENCY_TO_EURO :{BLACK}Set yr blwyddyn i newid i'r Ewro
+STR_TOOLTIP_CUSTOM_CURRENCY_PREVIEW :{BLACK}10000 Punt (£) yn eich arian cyfaddas
STR_TRAIN :{BLACK}{TRAIN}
STR_BUS :{BLACK}{BUS}
@@ -3166,11 +3174,16 @@ STR_LORRY :{BLACK}{LORRY}
STR_PLANE :{BLACK}{PLANE}
STR_SHIP :{BLACK}{SHIP}
+############ Vehicle lists
+STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP :{BLACK}Trenau - cliciwch ar trên i gael gwybodaeth
+STR_VEHICLE_LIST_ROAD_TOOLTIP :{BLACK}Cerbydau Ffordd - cliciwch ar cerbyd am wybodaeth
+STR_VEHICLE_LIST_SHIP_TOOLTIP :{BLACK}Llongau - cliciwch ar long am wybodaeth
+STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP :{BLACK}Awyrennau - cliciwch ar awyren am wybodaeth
-STR_SCHEDULED_TRAINS_TIP :{BLACK}Dangos pob trên sydd â'r orsaf hon yn eu hamserlen
-STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Dangos pob cerbyd ffordd sydd â'r orsaf hon yn eu hamserlen
-STR_SCHEDULED_AIRCRAFT_TIP :{BLACK}Dangos pob awyren sydd â'r orsaf hon yn eu hamserlen
-STR_SCHEDULED_SHIPS_TIP :{BLACK}Dangos pob llong sydd â'r orsaf hon yn eu hamserlen
+STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} Tr{P "ên" au}
+STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} Cerbyd{P "" au} Ffordd
+STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} Llong{P "" au}
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} Awyrennau
STR_VEH_WITH_SHARED_ORDERS_LIST :{WHITE}Rhestr wedi'i rhannu {COMMA} Cerbyd{P "" au}
STR_VEH_WITH_SHARED_ORDERS_LIST_TIP :{BLACK}Dangos pob cerbydau sy'n rhannu'r amserlen hon
@@ -3194,7 +3207,6 @@ STR_DEPOT_AUTOREPLACE_ROADVEH_TIP :{BLACK}Awtoddis
STR_DEPOT_AUTOREPLACE_SHIP_TIP :{BLACK}Awtoddisodli pob llong yn y depo
STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP :{BLACK}Awtoddisodli pob awyren yn yr awyrendy
-
STR_REPLACE_VEHICLES_WHITE :{WHITE}Disodli {STRING}
STR_REPLACE_VEHICLES_START :{BLACK}Dechrau Disodli Cerbydau
STR_REPLACE_VEHICLES_STOP :{BLACK}Dechrau Disodli Cerbydau
@@ -3257,6 +3269,7 @@ STR_PURCHASE_INFO_RELIABILITY :{BLACK}Dibynadw
STR_PURCHASE_INFO_COST :{BLACK}Côst: {GOLD}{CURRENCY}
STR_PURCHASE_INFO_WEIGHT_CWEIGHT :{BLACK}Pwysau: {GOLD}{WEIGHT_S} ({WEIGHT_S})
STR_PURCHASE_INFO_COST_SPEED :{BLACK}Côst: {GOLD}{CURRENCY}{BLACK} Cyflymder: {GOLD}{VELOCITY}
+STR_PURCHASE_INFO_AIRCRAFT_CAPACITY :{BLACK}Gallu cludo: {GOLD}{CARGO}, {CARGO}
STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT :{BLACK}Pwered Wagons: {GOLD}+{POWER}{BLACK} Pwysau: {GOLD}+{WEIGHT_S}
STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Modd ei ailffitio i: {GOLD}
STR_PURCHASE_INFO_ALL_TYPES :Pob math o lwyth
@@ -3359,17 +3372,6 @@ STR_MEASURE_AREA :{BLACK}Ardal: {
STR_MEASURE_LENGTH_HEIGHTDIFF :{BLACK}Hyd: {NUM}{}Gwahaniaeth uchder: {NUM} m
STR_MEASURE_AREA_HEIGHTDIFF :{BLACK}Ardal: {NUM} x {NUM}{}Gwahaniaeth uchder: {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}Credydau Trosi: {LTBLUE}{CURRENCY}
STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD :{WHITE}...mae'r ffordd hon yn eiddo i dref
STR_DRIVE_THROUGH_ERROR_DIRECTION :{WHITE}...mae'r ffordd yn gorwedd yn y cyfeiriad anghywir
@@ -3394,7 +3396,6 @@ STR_PERCENT_UP_DOWN_SMALL :{TINYFONT}{WHIT
STR_PERCENT_UP_DOWN :{WHITE}{NUM}%{UPARROW}{DOWNARROW}
##### Mass Order
-STR_FORMAT_GROUP_NAME :Grw^p {COMMA}
STR_GROUP_TINY_NAME :{TINYFONT}{GROUP}
STR_GROUP_ALL_TRAINS :Pob trên
STR_GROUP_ALL_ROADS :Pob cerbyd ffordd
@@ -3423,12 +3424,35 @@ STR_GROUP_DELETE_TIP :{BLACK}Dileu'r
STR_GROUP_RENAME_TIP :{BLACK}Ailenwi'r grw^p a ddewiswyd
STR_GROUP_REPLACE_PROTECTION_TIP :{BLACK}Cliciwch i amddiffyn y grw^p rhag awtoddisodli gêm-eang
+#### 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 :(Cwmni {COMMA})
+STR_FORMAT_GROUP_NAME :Grw^p {COMMA}
+STR_FORMAT_INDUSTRY_NAME :{1:STRING} {0:TOWN}
STR_NAME_MUST_BE_UNIQUE :{WHITE}Rhaid i'r enw fod yn unigryw
@@ -3545,6 +3569,7 @@ STR_AI_RANDOM_AI :AI ar hap
STR_AI_SETTINGS_CAPTION :{WHITE}Paramedrau AI
STR_AI_AUTHOR :{BLACK}Awdur: {STRING}
STR_AI_VERSION :{BLACK}Fersiwn: {NUM}
+STR_AI_URL :{BLACK}URL: {STRING}
STR_AI_PLEASE_REPORT_CRASH :{WHITE}Mae un o'r AIau a oedd yn rhedeg wedi crashio. Gyrrwch adroddiad am hyn i awdur yr AI ynghyd á llun sgrin o'r Ffenestr Ddadfygio.
########