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

catalan - 23 changes by juanjo
simplified_chinese - 50 changes by siu238X
traditional_chinese - 82 changes by siu238X
english_US - 49 changes by Supercheese
norwegian_bokmal - 2 changes by cuthbert
russian - 47 changes by Lone_Wolf
slovak - 1 changes by Milsa

7 files changed, 259 insertions, 214 deletions

diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt
index 1fdd9f855..4096ca7a1 100644
--- a/src/lang/catalan.txt
+++ b/src/lang/catalan.txt
@@ -96,30 +96,30 @@ STR_CARGO_SINGULAR_FIZZY_DRINK                                  :{G=Femenin}Begu
 
 # Quantity of cargo
 STR_QUANTITY_NOTHING                                            :
-STR_QUANTITY_PASSENGERS                                         :{G=Masculin}{COMMA} passatger{P "" s}
+STR_QUANTITY_PASSENGERS                                         :{G=Masculin}{COMMA}{NBSP}passatger{P "" s}
 STR_QUANTITY_COAL                                               :{WEIGHT_LONG} de carbó
-STR_QUANTITY_MAIL                                               :{COMMA} sac{P "" s} de correu
+STR_QUANTITY_MAIL                                               :{COMMA}{NBSP}sac{P "" s} de correu
 STR_QUANTITY_OIL                                                :{VOLUME_LONG} de petroli
-STR_QUANTITY_LIVESTOCK                                          :{COMMA} cap{P "" s} de bestiar
-STR_QUANTITY_GOODS                                              :{COMMA} palet{P "" s} de mercaderies
+STR_QUANTITY_LIVESTOCK                                          :{COMMA}{NBSP}cap{P "" s} de bestiar
+STR_QUANTITY_GOODS                                              :{COMMA}{NBSP}palet{P "" s} de mercaderies
 STR_QUANTITY_GRAIN                                              :{WEIGHT_LONG} de gra
 STR_QUANTITY_WOOD                                               :{WEIGHT_LONG} de fusta
 STR_QUANTITY_IRON_ORE                                           :{WEIGHT_LONG} de mineral de ferro
 STR_QUANTITY_STEEL                                              :{WEIGHT_LONG} d'acer
-STR_QUANTITY_VALUABLES                                          :{G=Masculin}{COMMA} sac{P "" s} de valors
+STR_QUANTITY_VALUABLES                                          :{G=Masculin}{COMMA}{NBSP}sac{P "" s} de valors
 STR_QUANTITY_COPPER_ORE                                         :{WEIGHT_LONG} de mineral de coure
 STR_QUANTITY_MAIZE                                              :{WEIGHT_LONG} de blat de moro
 STR_QUANTITY_FRUIT                                              :{WEIGHT_LONG} de fruita
-STR_QUANTITY_DIAMONDS                                           :{COMMA} boss{P a es} de diamants
+STR_QUANTITY_DIAMONDS                                           :{COMMA}{NBSP}boss{P a es} de diamants
 STR_QUANTITY_FOOD                                               :{WEIGHT_LONG} de queviures
 STR_QUANTITY_PAPER                                              :{WEIGHT_LONG} de paper
-STR_QUANTITY_GOLD                                               :{G=Femenin}{COMMA} sa{P ca ques} d'or
+STR_QUANTITY_GOLD                                               :{G=Femenin}{COMMA}{NBSP}sa{P ca ques} d'or
 STR_QUANTITY_WATER                                              :{VOLUME_LONG} d'aigua
 STR_QUANTITY_WHEAT                                              :{WEIGHT_LONG} de blat
 STR_QUANTITY_RUBBER                                             :{VOLUME_LONG} de cautxú
 STR_QUANTITY_SUGAR                                              :{WEIGHT_LONG} de sucre
-STR_QUANTITY_TOYS                                               :{COMMA} joguin{P a es}
-STR_QUANTITY_SWEETS                                             :{G=Femenin}{COMMA} boss{P a es} de dolços
+STR_QUANTITY_TOYS                                               :{COMMA}{NBSP}joguin{P a es}
+STR_QUANTITY_SWEETS                                             :{G=Femenin}{COMMA}{NBSP}boss{P a es} de dolços
 STR_QUANTITY_COLA                                               :{VOLUME_LONG} de refrescs
 STR_QUANTITY_CANDYFLOSS                                         :{WEIGHT_LONG} de cotó de sucre
 STR_QUANTITY_BUBBLES                                            :{COMMA} bomboll{P a es}
@@ -166,12 +166,12 @@ STR_ABBREV_NONE                                                 :{TINY_FONT}NO
 STR_ABBREV_ALL                                                  :{TINY_FONT}TOT
 
 # 'Mode' of transport for cargoes
-STR_PASSENGERS                                                  :{G=Masculin}{COMMA} passatger{P "" s}
-STR_BAGS                                                        :{G=Masculin}{COMMA} sac{P "" s}
-STR_TONS                                                        :{G=Femenin}{COMMA} ton{P a es}
-STR_LITERS                                                      :{G=Masculin}{COMMA} litre{P "" s}
-STR_ITEMS                                                       :{G=Masculin}{COMMA} cap{P "" s}
-STR_CRATES                                                      :{G=Masculin}{COMMA} palet{P "" s}
+STR_PASSENGERS                                                  :{G=Masculin}{COMMA}{NBSP}passatger{P "" s}
+STR_BAGS                                                        :{G=Masculin}{COMMA}{NBSP}sac{P "" s}
+STR_TONS                                                        :{G=Femenin}{COMMA}{NBSP}ton{P a es}
+STR_LITERS                                                      :{G=Masculin}{COMMA}{NBSP}litre{P "" s}
+STR_ITEMS                                                       :{G=Masculin}{COMMA}{NBSP}cap{P "" s}
+STR_CRATES                                                      :{G=Masculin}{COMMA}{NBSP}palet{P "" s}
 
 # Colours, do not shuffle
 STR_COLOUR_DARK_BLUE                                            :{G=Masculin}Blau Fosc
@@ -1445,7 +1445,7 @@ STR_CONFIG_SETTING_SERVINT_ISPERCENT                            :Els intervals d
 STR_CONFIG_SETTING_SERVINT_ISPERCENT_HELPTEXT                   :Escull si les revisions dels vehicles depenen del temps passat des de la darrera revisió o de la caiguda d'un cert percentatge de la fiabilitat màxima
 STR_CONFIG_SETTING_SERVINT_TRAINS                               :Interval per defecte de servei per als trens: {STRING}
 STR_CONFIG_SETTING_SERVINT_TRAINS_HELPTEXT                      :Estableix l'interval de revisió predeterminat pels nous ferrocarrils, si no hi ha un interval de revisió explícit pel vehicle
-STR_CONFIG_SETTING_SERVINT_VALUE                                :{COMMA} di{P 0 a es}/%
+STR_CONFIG_SETTING_SERVINT_VALUE                                :{COMMA}{NBSP}di{P 0 a es}/%
 STR_CONFIG_SETTING_SERVINT_DISABLED                             :Desactivat
 STR_CONFIG_SETTING_SERVINT_ROAD_VEHICLES                        :Interval per defecte de servei per als vehicles: {STRING}
 STR_CONFIG_SETTING_SERVINT_ROAD_VEHICLES_HELPTEXT               :Estableix l'interval de revisió predeterminat pels nous vehicles de caretera, si no hi ha un interval de revisió explícit pel vehicle
@@ -1585,9 +1585,9 @@ STR_CONFIG_SETTING_LARGER_TOWNS_DISABLED                        :Cap
 STR_CONFIG_SETTING_CITY_SIZE_MULTIPLIER                         :Multiplicador de mida inicial de ciutats: {STRING}
 STR_CONFIG_SETTING_CITY_SIZE_MULTIPLIER_HELPTEXT                :La grandària mitjana de les ciutats en relació als pobles a l'inici de la partida
 
-STR_CONFIG_SETTING_LINKGRAPH_INTERVAL                           :Actualitza el graf de distribució cada {STRING} di{P 0 a es}
+STR_CONFIG_SETTING_LINKGRAPH_INTERVAL                           :Actualitza el graf de distribució cada {STRING}{NBSP}di{P 0 a es}
 STR_CONFIG_SETTING_LINKGRAPH_INTERVAL_HELPTEXT                  :Temps entre recàlculs successius del graf de distribució. Cada recàlcul calcula els plans per un component del graf. Això significa que un valor X per aquest paràmetre no implica que tot el graf serà actualitzat cada X dies. Només alguns components ho seran. Com més curt el valor, més temps de processador es requerirà per calcular-ho. Com més llarg, més temps passarà fins que la distribució de càrregues comenci en noves rutes.
-STR_CONFIG_SETTING_LINKGRAPH_TIME                               :Empra {STRING} di{P 0 a es} per al recàlcul del graf de distribució
+STR_CONFIG_SETTING_LINKGRAPH_TIME                               :Empra {STRING}{NBSP}di{P 0 a es} per al recàlcul del graf de distribució
 STR_CONFIG_SETTING_LINKGRAPH_TIME_HELPTEXT                      :Temps dedicat a cada recàlcul d'un component del graf de connexions. Quan un recàlcul s'inicia, el programa crea un fil que pot executar-se durant aquest nombre de dies. Com més curt el valor, més probable que el fil no hagi acabat quan s'espera. Aleshores el programa s'atura fins que el fil acaba ("ralentització"). Com més llarg el valor, més temps requereix l'actualització de la distribució quan les rutes canvien.
 STR_CONFIG_SETTING_DISTRIBUTION_MANUAL                          :manual
 STR_CONFIG_SETTING_DISTRIBUTION_ASYMMETRIC                      :asimètric
@@ -2962,8 +2962,8 @@ STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED_WINTER              :{ORANGE}{STRING
 STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_DELIVERED_GENERAL            :{ORANGE}{STRING}{GREEN} entregat
 STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED                     :{ORANGE}{CARGO_TINY} / {CARGO_LONG}{RED} (encara requerit)
 STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_DELIVERED                    :{ORANGE}{CARGO_TINY} / {CARGO_LONG}{GREEN} (entregat)
-STR_TOWN_VIEW_TOWN_GROWS_EVERY                                  :{BLACK}La població creix cada {ORANGE}{COMMA}{BLACK} di{P a es}
-STR_TOWN_VIEW_TOWN_GROWS_EVERY_FUNDED                           :{BLACK}La població creix cada {ORANGE}{COMMA}{BLACK} di{P a es} (finançat)
+STR_TOWN_VIEW_TOWN_GROWS_EVERY                                  :{BLACK}La població creix cada {ORANGE}{COMMA}{BLACK}{NBSP}di{P a es}
+STR_TOWN_VIEW_TOWN_GROWS_EVERY_FUNDED                           :{BLACK}La població creix cada {ORANGE}{COMMA}{BLACK}{NBSP}di{P a es} (finançant edificis nous)
 STR_TOWN_VIEW_TOWN_GROW_STOPPED                                 :{BLACK}La població {RED}no {BLACK} està creixent
 STR_TOWN_VIEW_NOISE_IN_TOWN                                     :{BLACK}Límit de soroll a la ciutat: {ORANGE}{COMMA}{BLACK}  màx: {ORANGE}{COMMA}
 STR_TOWN_VIEW_CENTER_TOOLTIP                                    :{BLACK}Centra la vista principal a la població. Ctrl+Clic obre una nova vista al lloc de la població
@@ -3619,7 +3619,7 @@ STR_VEHICLE_INFO_CAPACITY_CAPACITY                              :{BLACK}Capacita
 
 STR_VEHICLE_INFO_FEEDER_CARGO_VALUE                             :{BLACK}Transferir Crèdits: {LTBLUE}{CURRENCY_LONG}
 
-STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}Interval de les revisions: {LTBLUE}{COMMA} dies{BLACK}   Darrera revisió: {LTBLUE}{DATE_LONG}
+STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}Interval de les revisions: {LTBLUE}{COMMA}{NBSP}dies{BLACK}   Darrera revisió: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}Interval de les revisions: {LTBLUE}{COMMA}%{BLACK}   Darrera revisió: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_INCREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Augmenta l'interval de les revisions en 10. Ctrl+Clic augmenta l'interval de les revisions en 5
 STR_VEHICLE_DETAILS_DECREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Disminueix l'interval de les revisions en 10. Ctrl+Clic disminueix l'interval de les revisions en 5
@@ -3855,8 +3855,8 @@ STR_TIMETABLE_STAY_FOR_ESTIMATED                                :(quedar-s'hi du
 STR_TIMETABLE_AND_TRAVEL_FOR_ESTIMATED                          :(viatja durant {STRING}, sense horari)
 STR_TIMETABLE_STAY_FOR                                          :i estigues {STRING}
 STR_TIMETABLE_AND_TRAVEL_FOR                                    :i viatge per {STRING}
-STR_TIMETABLE_DAYS                                              :{COMMA} di{P a es}
-STR_TIMETABLE_TICKS                                             :{COMMA} mar{P ca ques}
+STR_TIMETABLE_DAYS                                              :{COMMA}{NBSP}di{P a es}
+STR_TIMETABLE_TICKS                                             :{COMMA}{NBSP}mar{P ca ques}
 
 STR_TIMETABLE_TOTAL_TIME                                        :{BLACK}L'horari tardarà {STRING} a complir-se
 STR_TIMETABLE_TOTAL_TIME_INCOMPLETE                             :{BLACK}L'horari tardarà almenys {STRING} a complir-se (no tot està planificat)
diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt
index 97b4ab5e2..66d0d1e2f 100644
--- a/src/lang/english_US.txt
+++ b/src/lang/english_US.txt
@@ -95,30 +95,30 @@ STR_CARGO_SINGULAR_FIZZY_DRINK                                  :Fizzy Drink
 
 # Quantity of cargo
 STR_QUANTITY_NOTHING                                            :
-STR_QUANTITY_PASSENGERS                                         :{COMMA} passenger{P "" s}
+STR_QUANTITY_PASSENGERS                                         :{COMMA}{NBSP}passenger{P "" s}
 STR_QUANTITY_COAL                                               :{WEIGHT_LONG} of coal
-STR_QUANTITY_MAIL                                               :{COMMA} bag{P "" s} of mail
+STR_QUANTITY_MAIL                                               :{COMMA}{NBSP}bag{P "" s} of mail
 STR_QUANTITY_OIL                                                :{VOLUME_LONG} of oil
-STR_QUANTITY_LIVESTOCK                                          :{COMMA} item{P "" s} of livestock
-STR_QUANTITY_GOODS                                              :{COMMA} crate{P "" s} of goods
+STR_QUANTITY_LIVESTOCK                                          :{COMMA}{NBSP}item{P "" s} of livestock
+STR_QUANTITY_GOODS                                              :{COMMA}{NBSP}crate{P "" s} of goods
 STR_QUANTITY_GRAIN                                              :{WEIGHT_LONG} of grain
 STR_QUANTITY_WOOD                                               :{WEIGHT_LONG} of wood
 STR_QUANTITY_IRON_ORE                                           :{WEIGHT_LONG} of iron ore
 STR_QUANTITY_STEEL                                              :{WEIGHT_LONG} of steel
-STR_QUANTITY_VALUABLES                                          :{COMMA} bag{P "" s} of valuables
+STR_QUANTITY_VALUABLES                                          :{COMMA}{NBSP}bag{P "" s} of valuables
 STR_QUANTITY_COPPER_ORE                                         :{WEIGHT_LONG} of copper ore
 STR_QUANTITY_MAIZE                                              :{WEIGHT_LONG} of maize
 STR_QUANTITY_FRUIT                                              :{WEIGHT_LONG} of fruit
-STR_QUANTITY_DIAMONDS                                           :{COMMA} bag{P "" s} of diamonds
+STR_QUANTITY_DIAMONDS                                           :{COMMA}{NBSP}bag{P "" s} of diamonds
 STR_QUANTITY_FOOD                                               :{WEIGHT_LONG} of food
 STR_QUANTITY_PAPER                                              :{WEIGHT_LONG} of paper
-STR_QUANTITY_GOLD                                               :{COMMA} bag{P "" s} of gold
+STR_QUANTITY_GOLD                                               :{COMMA}{NBSP}bag{P "" s} of gold
 STR_QUANTITY_WATER                                              :{VOLUME_LONG} of water
 STR_QUANTITY_WHEAT                                              :{WEIGHT_LONG} of wheat
 STR_QUANTITY_RUBBER                                             :{VOLUME_LONG} of rubber
 STR_QUANTITY_SUGAR                                              :{WEIGHT_LONG} of sugar
-STR_QUANTITY_TOYS                                               :{COMMA} toy{P "" s}
-STR_QUANTITY_SWEETS                                             :{COMMA} bag{P "" s} of candy
+STR_QUANTITY_TOYS                                               :{COMMA}{NBSP}toy{P "" s}
+STR_QUANTITY_SWEETS                                             :{COMMA}{NBSP}bag{P "" s} of candy
 STR_QUANTITY_COLA                                               :{VOLUME_LONG} of cola
 STR_QUANTITY_CANDYFLOSS                                         :{WEIGHT_LONG} of cotton candy
 STR_QUANTITY_BUBBLES                                            :{COMMA} bubble{P "" s}
@@ -165,12 +165,12 @@ STR_ABBREV_NONE                                                 :{TINY_FONT}NO
 STR_ABBREV_ALL                                                  :{TINY_FONT}ALL
 
 # 'Mode' of transport for cargoes
-STR_PASSENGERS                                                  :{COMMA} passenger{P "" s}
-STR_BAGS                                                        :{COMMA} bag{P "" s}
-STR_TONS                                                        :{COMMA} tonne{P "" s}
-STR_LITERS                                                      :{COMMA} liter{P "" s}
-STR_ITEMS                                                       :{COMMA} item{P "" s}
-STR_CRATES                                                      :{COMMA} crate{P "" s}
+STR_PASSENGERS                                                  :{COMMA}{NBSP}passenger{P "" s}
+STR_BAGS                                                        :{COMMA}{NBSP}bag{P "" s}
+STR_TONS                                                        :{COMMA}{NBSP}tonne{P "" s}
+STR_LITERS                                                      :{COMMA}{NBSP}liter{P "" s}
+STR_ITEMS                                                       :{COMMA}{NBSP}item{P "" s}
+STR_CRATES                                                      :{COMMA}{NBSP}crate{P "" s}
 
 # Colours, do not shuffle
 STR_COLOUR_DARK_BLUE                                            :Dark Blue
@@ -191,37 +191,37 @@ STR_COLOUR_GREY                                                 :Gray
 STR_COLOUR_WHITE                                                :White
 
 # Units used in OpenTTD
-STR_UNITS_VELOCITY_IMPERIAL                                     :{COMMA} mph
-STR_UNITS_VELOCITY_METRIC                                       :{COMMA} km/h
-STR_UNITS_VELOCITY_SI                                           :{COMMA} m/s
+STR_UNITS_VELOCITY_IMPERIAL                                     :{COMMA}{NBSP}mph
+STR_UNITS_VELOCITY_METRIC                                       :{COMMA}{NBSP}km/h
+STR_UNITS_VELOCITY_SI                                           :{COMMA}{NBSP}m/s
 
-STR_UNITS_POWER_IMPERIAL                                        :{COMMA}hp
-STR_UNITS_POWER_METRIC                                          :{COMMA}hp
-STR_UNITS_POWER_SI                                              :{COMMA}kW
+STR_UNITS_POWER_IMPERIAL                                        :{COMMA}{NBSP}hp
+STR_UNITS_POWER_METRIC                                          :{COMMA}{NBSP}hp
+STR_UNITS_POWER_SI                                              :{COMMA}{NBSP}kW
 
-STR_UNITS_WEIGHT_SHORT_IMPERIAL                                 :{COMMA}t
-STR_UNITS_WEIGHT_SHORT_METRIC                                   :{COMMA}t
-STR_UNITS_WEIGHT_SHORT_SI                                       :{COMMA}kg
+STR_UNITS_WEIGHT_SHORT_IMPERIAL                                 :{COMMA}{NBSP}t
+STR_UNITS_WEIGHT_SHORT_METRIC                                   :{COMMA}{NBSP}t
+STR_UNITS_WEIGHT_SHORT_SI                                       :{COMMA}{NBSP}kg
 
-STR_UNITS_WEIGHT_LONG_IMPERIAL                                  :{COMMA} ton{P "" s}
-STR_UNITS_WEIGHT_LONG_METRIC                                    :{COMMA} tonne{P "" s}
-STR_UNITS_WEIGHT_LONG_SI                                        :{COMMA} kg
+STR_UNITS_WEIGHT_LONG_IMPERIAL                                  :{COMMA}{NBSP}ton{P "" s}
+STR_UNITS_WEIGHT_LONG_METRIC                                    :{COMMA}{NBSP}tonne{P "" s}
+STR_UNITS_WEIGHT_LONG_SI                                        :{COMMA}{NBSP}kg
 
-STR_UNITS_VOLUME_SHORT_IMPERIAL                                 :{COMMA}gal
-STR_UNITS_VOLUME_SHORT_METRIC                                   :{COMMA}l
-STR_UNITS_VOLUME_SHORT_SI                                       :{COMMA}m³
+STR_UNITS_VOLUME_SHORT_IMPERIAL                                 :{COMMA}{NBSP}gal
+STR_UNITS_VOLUME_SHORT_METRIC                                   :{COMMA}{NBSP}l
+STR_UNITS_VOLUME_SHORT_SI                                       :{COMMA}{NBSP}m³
 
-STR_UNITS_VOLUME_LONG_IMPERIAL                                  :{COMMA} gallon{P "" s}
-STR_UNITS_VOLUME_LONG_METRIC                                    :{COMMA} liter{P "" s}
-STR_UNITS_VOLUME_LONG_SI                                        :{COMMA} m³
+STR_UNITS_VOLUME_LONG_IMPERIAL                                  :{COMMA}{NBSP}gallon{P "" s}
+STR_UNITS_VOLUME_LONG_METRIC                                    :{COMMA}{NBSP}litre{P "" s}
+STR_UNITS_VOLUME_LONG_SI                                        :{COMMA}{NBSP}m³
 
-STR_UNITS_FORCE_IMPERIAL                                        :{COMMA} lbf
-STR_UNITS_FORCE_METRIC                                          :{COMMA} kgf
-STR_UNITS_FORCE_SI                                              :{COMMA} kN
+STR_UNITS_FORCE_IMPERIAL                                        :{COMMA}{NBSP}lbf
+STR_UNITS_FORCE_METRIC                                          :{COMMA}{NBSP}kgf
+STR_UNITS_FORCE_SI                                              :{COMMA}{NBSP}kN
 
-STR_UNITS_HEIGHT_IMPERIAL                                       :{COMMA} ft
-STR_UNITS_HEIGHT_METRIC                                         :{COMMA} m
-STR_UNITS_HEIGHT_SI                                             :{COMMA} m
+STR_UNITS_HEIGHT_IMPERIAL                                       :{COMMA}{NBSP}ft
+STR_UNITS_HEIGHT_METRIC                                         :{COMMA}{NBSP}m
+STR_UNITS_HEIGHT_SI                                             :{COMMA}{NBSP}m
 
 # Common window strings
 STR_LIST_FILTER_TITLE                                           :{BLACK}Filter string:
@@ -1444,7 +1444,7 @@ STR_CONFIG_SETTING_SERVINT_ISPERCENT                            :Maintenance int
 STR_CONFIG_SETTING_SERVINT_ISPERCENT_HELPTEXT                   :Choose whether maintenance of vehicles is triggered by the time passed since last maintenance or by reliability dropping by a certain percentage of the maximum reliability
 STR_CONFIG_SETTING_SERVINT_TRAINS                               :Default maintenance interval for trains: {STRING}
 STR_CONFIG_SETTING_SERVINT_TRAINS_HELPTEXT                      :Set the default maintenance interval for new rail vehicles, if no explicit maintenance interval is set for the vehicle
-STR_CONFIG_SETTING_SERVINT_VALUE                                :{COMMA} day{P 0 "" s}/%
+STR_CONFIG_SETTING_SERVINT_VALUE                                :{COMMA}{NBSP}day{P 0 "" s}/%
 STR_CONFIG_SETTING_SERVINT_DISABLED                             :Disabled
 STR_CONFIG_SETTING_SERVINT_ROAD_VEHICLES                        :Default maintenance interval for road vehicles: {STRING}
 STR_CONFIG_SETTING_SERVINT_ROAD_VEHICLES_HELPTEXT               :Set the default maintenance interval for new road vehicles, if no explicit maintenance interval is set for the vehicle
@@ -1584,9 +1584,9 @@ STR_CONFIG_SETTING_LARGER_TOWNS_DISABLED                        :None
 STR_CONFIG_SETTING_CITY_SIZE_MULTIPLIER                         :Initial city size multiplier: {STRING}
 STR_CONFIG_SETTING_CITY_SIZE_MULTIPLIER_HELPTEXT                :Average size of cities relative to normal towns at start of the game
 
-STR_CONFIG_SETTING_LINKGRAPH_INTERVAL                           :Update distribution graph every {STRING} day{P 0:2 "" s}
+STR_CONFIG_SETTING_LINKGRAPH_INTERVAL                           :Update distribution graph every {STRING}{NBSP}day{P 0:2 "" s}
 STR_CONFIG_SETTING_LINKGRAPH_INTERVAL_HELPTEXT                  :Time between subsequent recalculations of the link graph. Each recalculation calculates the plans for one component of the graph. That means that a value X for this setting does not mean the whole graph will be updated every X days. Only some component will. The shorter you set it the more CPU time will be necessary to calculate it. The longer you set it the longer it will take until the cargo distribution starts on new routes.
-STR_CONFIG_SETTING_LINKGRAPH_TIME                               :Take {STRING} day{P 0:2 "" s} for recalculation of distribution graph
+STR_CONFIG_SETTING_LINKGRAPH_TIME                               :Take {STRING}{NBSP}day{P 0:2 "" s} for recalculation of distribution graph
 STR_CONFIG_SETTING_LINKGRAPH_TIME_HELPTEXT                      :Time taken for each recalculation of a link graph component. When a recalculation is started, a thread is spawned which is allowed to run for this number of days. The shorter you set this the more likely it is that the thread is not finished when it's supposed to. Then the game stops until it is ("lag"). The longer you set it the longer it takes for the distribution to be updated when routes change.
 STR_CONFIG_SETTING_DISTRIBUTION_MANUAL                          :manual
 STR_CONFIG_SETTING_DISTRIBUTION_ASYMMETRIC                      :asymmetric
@@ -2961,8 +2961,8 @@ STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED_WINTER              :{ORANGE}{STRING
 STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_DELIVERED_GENERAL            :{ORANGE}{STRING}{GREEN} delivered
 STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED                     :{ORANGE}{CARGO_TINY} / {CARGO_LONG}{RED} (still required)
 STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_DELIVERED                    :{ORANGE}{CARGO_TINY} / {CARGO_LONG}{GREEN} (delivered)
-STR_TOWN_VIEW_TOWN_GROWS_EVERY                                  :{BLACK}Town grows every {ORANGE}{COMMA}{BLACK} day{P "" s}
-STR_TOWN_VIEW_TOWN_GROWS_EVERY_FUNDED                           :{BLACK}Town grows every {ORANGE}{COMMA}{BLACK} day{P "" s} (funded)
+STR_TOWN_VIEW_TOWN_GROWS_EVERY                                  :{BLACK}Town grows every {ORANGE}{COMMA}{BLACK}{NBSP}day{P "" s}
+STR_TOWN_VIEW_TOWN_GROWS_EVERY_FUNDED                           :{BLACK}Town grows every {ORANGE}{COMMA}{BLACK}{NBSP}day{P "" s} (funded)
 STR_TOWN_VIEW_TOWN_GROW_STOPPED                                 :{BLACK}Town is {RED}not{BLACK} growing
 STR_TOWN_VIEW_NOISE_IN_TOWN                                     :{BLACK}Noise limit in town: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
 STR_TOWN_VIEW_CENTER_TOOLTIP                                    :{BLACK}Center the main view on town location. Ctrl+Click opens a new viewport on town location
@@ -3618,7 +3618,7 @@ STR_VEHICLE_INFO_CAPACITY_CAPACITY                              :{BLACK}Capacity
 
 STR_VEHICLE_INFO_FEEDER_CARGO_VALUE                             :{BLACK}Transfer Credits: {LTBLUE}{CURRENCY_LONG}
 
-STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}Maintenance interval: {LTBLUE}{COMMA}days{BLACK}   Last maintenance: {LTBLUE}{DATE_LONG}
+STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}Maintenance interval: {LTBLUE}{COMMA}{NBSP}days{BLACK}   Last maintenance: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}Maintenance interval: {LTBLUE}{COMMA}%{BLACK}   Last maintenance: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_INCREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Increase maintenance interval by 10. Ctrl+Click increases maintenance interval by 5
 STR_VEHICLE_DETAILS_DECREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Decrease maintenance interval by 10. Ctrl+Click decreases maintenance interval by 5
@@ -3854,8 +3854,8 @@ STR_TIMETABLE_STAY_FOR_ESTIMATED                                :(stay for {STRI
 STR_TIMETABLE_AND_TRAVEL_FOR_ESTIMATED                          :(travel for {STRING}, not timetabled)
 STR_TIMETABLE_STAY_FOR                                          :and stay for {STRING}
 STR_TIMETABLE_AND_TRAVEL_FOR                                    :and travel for {STRING}
-STR_TIMETABLE_DAYS                                              :{COMMA} day{P "" s}
-STR_TIMETABLE_TICKS                                             :{COMMA} tick{P "" s}
+STR_TIMETABLE_DAYS                                              :{COMMA}{NBSP}day{P "" s}
+STR_TIMETABLE_TICKS                                             :{COMMA}{NBSP}tick{P "" s}
 
 STR_TIMETABLE_TOTAL_TIME                                        :{BLACK}This timetable will take {STRING} to complete
 STR_TIMETABLE_TOTAL_TIME_INCOMPLETE                             :{BLACK}This timetable will take at least {STRING} to complete (not all timetabled)
@@ -4143,6 +4143,9 @@ STR_ERROR_FOREST_CAN_ONLY_BE_PLANTED                            :{WHITE}... fore
 STR_ERROR_CAN_ONLY_BE_BUILT_ABOVE_SNOW_LINE                     :{WHITE}... can only be built above the snow-line
 STR_ERROR_CAN_ONLY_BE_BUILT_BELOW_SNOW_LINE                     :{WHITE}... can only be built below the snow-line
 
+STR_ERROR_NO_SUITABLE_PLACES_FOR_INDUSTRIES                     :{WHITE}There were no suitable places for '{STRING}' industries
+STR_ERROR_NO_SUITABLE_PLACES_FOR_INDUSTRIES_EXPLANATION         :{WHITE}Change the map generation parameters to get a better map
+
 # Station construction related errors
 STR_ERROR_CAN_T_BUILD_RAILROAD_STATION                          :{WHITE}Can't build railroad station here...
 STR_ERROR_CAN_T_BUILD_BUS_STATION                               :{WHITE}Can't build bus station...
diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt
index 8b76352aa..32c33f250 100644
--- a/src/lang/norwegian_bokmal.txt
+++ b/src/lang/norwegian_bokmal.txt
@@ -4148,6 +4148,9 @@ STR_ERROR_FOREST_CAN_ONLY_BE_PLANTED                            :{WHITE}... skog
 STR_ERROR_CAN_ONLY_BE_BUILT_ABOVE_SNOW_LINE                     :{WHITE}... kan kun bygges over snøgrensen
 STR_ERROR_CAN_ONLY_BE_BUILT_BELOW_SNOW_LINE                     :{WHITE}... kan kun bygges under snøgrensen
 
+STR_ERROR_NO_SUITABLE_PLACES_FOR_INDUSTRIES                     :{WHITE}Det var ingen egnede steder for '{STRING}' bransjer
+STR_ERROR_NO_SUITABLE_PLACES_FOR_INDUSTRIES_EXPLANATION         :{WHITE}Endre parametrene for kart-generering for å få et bedre kart
+
 # Station construction related errors
 STR_ERROR_CAN_T_BUILD_RAILROAD_STATION                          :{WHITE}Kan ikke bygge jernbanestasjon her...
 STR_ERROR_CAN_T_BUILD_BUS_STATION                               :{WHITE}Kan ikke bygge busstasjon...
diff --git a/src/lang/russian.txt b/src/lang/russian.txt
index 1d01aac11..1f9a5e933 100644
--- a/src/lang/russian.txt
+++ b/src/lang/russian.txt
@@ -221,30 +221,30 @@ STR_CARGO_SINGULAR_FIZZY_DRINK.acc                              :газиров�
 
 # Quantity of cargo
 STR_QUANTITY_NOTHING                                            :
-STR_QUANTITY_PASSENGERS                                         :{COMMA} пассажир{P "" а ов}
+STR_QUANTITY_PASSENGERS                                         :{COMMA}{NBSP}пассажир{P "" а ов}
 STR_QUANTITY_COAL                                               :{WEIGHT_LONG} угля
-STR_QUANTITY_MAIL                                               :{COMMA} меш{P ок ка ков} почты
+STR_QUANTITY_MAIL                                               :{COMMA}{NBSP}меш{P ок ка ков} почты
 STR_QUANTITY_OIL                                                :{VOLUME_LONG} нефти
-STR_QUANTITY_LIVESTOCK                                          :{COMMA} голов{P а ы ""} домашнего скота
-STR_QUANTITY_GOODS                                              :{COMMA} ящик{P "" а ов} товаров
+STR_QUANTITY_LIVESTOCK                                          :{COMMA}{NBSP}голов{P а ы ""} домашнего скота
+STR_QUANTITY_GOODS                                              :{COMMA}{NBSP}ящик{P "" а ов} товаров
 STR_QUANTITY_GRAIN                                              :{WEIGHT_LONG} зерна
 STR_QUANTITY_WOOD                                               :{WEIGHT_LONG} древесины
 STR_QUANTITY_IRON_ORE                                           :{WEIGHT_LONG} железной руды
 STR_QUANTITY_STEEL                                              :{WEIGHT_LONG} стали
-STR_QUANTITY_VALUABLES                                          :{COMMA} меш{P ок ка ков} драгоценностей
+STR_QUANTITY_VALUABLES                                          :{COMMA}{NBSP}меш{P ок ка ков} драгоценностей
 STR_QUANTITY_COPPER_ORE                                         :{WEIGHT_LONG} медной руды
 STR_QUANTITY_MAIZE                                              :{WEIGHT_LONG} кукурузы
 STR_QUANTITY_FRUIT                                              :{WEIGHT_LONG} фруктов
-STR_QUANTITY_DIAMONDS                                           :{COMMA} меш{P ок ка ков} алмазов
+STR_QUANTITY_DIAMONDS                                           :{COMMA}{NBSP}меш{P ок ка ков} алмазов
 STR_QUANTITY_FOOD                                               :{WEIGHT_LONG} продуктов
 STR_QUANTITY_PAPER                                              :{WEIGHT_LONG} бумаги
-STR_QUANTITY_GOLD                                               :{COMMA} меш{P ок ка ков} золота
+STR_QUANTITY_GOLD                                               :{COMMA}{NBSP}меш{P ок ка ков} золота
 STR_QUANTITY_WATER                                              :{VOLUME_LONG} воды
 STR_QUANTITY_WHEAT                                              :{WEIGHT_LONG} пшеницы
 STR_QUANTITY_RUBBER                                             :{VOLUME_LONG} каучука
 STR_QUANTITY_SUGAR                                              :{WEIGHT_LONG} сахара
-STR_QUANTITY_TOYS                                               :{COMMA} игруш{P ка ки ек}
-STR_QUANTITY_SWEETS                                             :{COMMA} короб{P ка ки ок} конфет
+STR_QUANTITY_TOYS                                               :{COMMA}{NBSP}игруш{P ка ки ек}
+STR_QUANTITY_SWEETS                                             :{COMMA}{NBSP}короб{P ка ки ок} конфет
 STR_QUANTITY_COLA                                               :{VOLUME_LONG} колы
 STR_QUANTITY_CANDYFLOSS                                         :{WEIGHT_LONG} сахарной ваты
 STR_QUANTITY_BUBBLES                                            :{COMMA} пузыр{P ёк ька ьков}
@@ -291,12 +291,12 @@ STR_ABBREV_NONE                                                 :{TINY_FONT}НЕ
 STR_ABBREV_ALL                                                  :{TINY_FONT}Все
 
 # 'Mode' of transport for cargoes
-STR_PASSENGERS                                                  :{COMMA} пассажир{P "" а ов}
-STR_BAGS                                                        :{COMMA} меш{P ок ка ков}
-STR_TONS                                                        :{COMMA} тонн{P а ы ""}
-STR_LITERS                                                      :{COMMA} литр{P "" а ов}
-STR_ITEMS                                                       :{COMMA} штук{P а и ""}
-STR_CRATES                                                      :{COMMA} ящик{P "" а ов}
+STR_PASSENGERS                                                  :{COMMA}{NBSP}пассажир{P "" а ов}
+STR_BAGS                                                        :{COMMA}{NBSP}меш{P ок ка ков}
+STR_TONS                                                        :{COMMA}{NBSP}тонн{P а ы ""}
+STR_LITERS                                                      :{COMMA}{NBSP}литр{P "" а ов}
+STR_ITEMS                                                       :{COMMA}{NBSP}штук{P а и ""}
+STR_CRATES                                                      :{COMMA}{NBSP}ящик{P "" а ов}
 
 # Colours, do not shuffle
 STR_COLOUR_DARK_BLUE                                            :Тёмно-синий
@@ -317,37 +317,37 @@ STR_COLOUR_GREY                                                 :Серый
 STR_COLOUR_WHITE                                                :Белый
 
 # Units used in OpenTTD
-STR_UNITS_VELOCITY_IMPERIAL                                     :{COMMA} мил{P я и ь}/ч
-STR_UNITS_VELOCITY_METRIC                                       :{COMMA} км/ч
-STR_UNITS_VELOCITY_SI                                           :{COMMA} м/с
+STR_UNITS_VELOCITY_IMPERIAL                                     :{COMMA}{NBSP}мил{P я и ь}/ч
+STR_UNITS_VELOCITY_METRIC                                       :{COMMA}{NBSP}км/ч
+STR_UNITS_VELOCITY_SI                                           :{COMMA}{NBSP}м/с
 
-STR_UNITS_POWER_IMPERIAL                                        :{COMMA} лс
-STR_UNITS_POWER_METRIC                                          :{COMMA} лс
-STR_UNITS_POWER_SI                                              :{COMMA} кВт
+STR_UNITS_POWER_IMPERIAL                                        :{COMMA}{NBSP}лс
+STR_UNITS_POWER_METRIC                                          :{COMMA}{NBSP}лс
+STR_UNITS_POWER_SI                                              :{COMMA}{NBSP}кВт
 
-STR_UNITS_WEIGHT_SHORT_IMPERIAL                                 :{COMMA} т
-STR_UNITS_WEIGHT_SHORT_METRIC                                   :{COMMA} т
-STR_UNITS_WEIGHT_SHORT_SI                                       :{COMMA} кг
+STR_UNITS_WEIGHT_SHORT_IMPERIAL                                 :{COMMA}{NBSP}т
+STR_UNITS_WEIGHT_SHORT_METRIC                                   :{COMMA}{NBSP}т
+STR_UNITS_WEIGHT_SHORT_SI                                       :{COMMA}{NBSP}кг
 
-STR_UNITS_WEIGHT_LONG_IMPERIAL                                  :{COMMA} тонн{P а ы ""}
-STR_UNITS_WEIGHT_LONG_METRIC                                    :{COMMA} тонн{P а ы ""}
-STR_UNITS_WEIGHT_LONG_SI                                        :{COMMA} кг
+STR_UNITS_WEIGHT_LONG_IMPERIAL                                  :{COMMA}{NBSP}тонн{P а ы ""}
+STR_UNITS_WEIGHT_LONG_METRIC                                    :{COMMA}{NBSP}тонн{P а ы ""}
+STR_UNITS_WEIGHT_LONG_SI                                        :{COMMA}{NBSP}кг
 
-STR_UNITS_VOLUME_SHORT_IMPERIAL                                 :{COMMA} гал.
-STR_UNITS_VOLUME_SHORT_METRIC                                   :{COMMA} л
-STR_UNITS_VOLUME_SHORT_SI                                       :{COMMA} м³
+STR_UNITS_VOLUME_SHORT_IMPERIAL                                 :{COMMA}{NBSP}гал.
+STR_UNITS_VOLUME_SHORT_METRIC                                   :{COMMA}{NBSP}л
+STR_UNITS_VOLUME_SHORT_SI                                       :{COMMA}{NBSP}м³
 
-STR_UNITS_VOLUME_LONG_IMPERIAL                                  :{COMMA} галлон{P "" а ов}
-STR_UNITS_VOLUME_LONG_METRIC                                    :{COMMA} литр{P "" а ов}
-STR_UNITS_VOLUME_LONG_SI                                        :{COMMA} м³
+STR_UNITS_VOLUME_LONG_IMPERIAL                                  :{COMMA}{NBSP}галлон{P "" а ов}
+STR_UNITS_VOLUME_LONG_METRIC                                    :{COMMA}{NBSP}литр{P "" а ов}
+STR_UNITS_VOLUME_LONG_SI                                        :{COMMA}{NBSP}м³
 
-STR_UNITS_FORCE_IMPERIAL                                        :{COMMA} фунт{P "" а ов}-силы
-STR_UNITS_FORCE_METRIC                                          :{COMMA} кгс
-STR_UNITS_FORCE_SI                                              :{COMMA} кН
+STR_UNITS_FORCE_IMPERIAL                                        :{COMMA}{NBSP}фунт{P "" а ов}-силы
+STR_UNITS_FORCE_METRIC                                          :{COMMA}{NBSP}кгс
+STR_UNITS_FORCE_SI                                              :{COMMA}{NBSP}кН
 
-STR_UNITS_HEIGHT_IMPERIAL                                       :{COMMA} фут{P "" а ов}
-STR_UNITS_HEIGHT_METRIC                                         :{COMMA} м
-STR_UNITS_HEIGHT_SI                                             :{COMMA} м
+STR_UNITS_HEIGHT_IMPERIAL                                       :{COMMA}{NBSP}фут{P "" а ов}
+STR_UNITS_HEIGHT_METRIC                                         :{COMMA}{NBSP}м
+STR_UNITS_HEIGHT_SI                                             :{COMMA}{NBSP}м
 
 # Common window strings
 STR_LIST_FILTER_TITLE                                           :{BLACK}Фильтр:
@@ -1596,7 +1596,7 @@ STR_CONFIG_SETTING_SERVINT_ISPERCENT                            :Интерва�
 STR_CONFIG_SETTING_SERVINT_ISPERCENT_HELPTEXT                   :Выберите, должно ли техническое обслуживание транспорта выполняться через определённые промежутки времени, либо при снижении надёжности транспортного средства на определённый процент от максимума
 STR_CONFIG_SETTING_SERVINT_TRAINS                               :Интервал обслуживания по умолчанию для поездов: {STRING}
 STR_CONFIG_SETTING_SERVINT_TRAINS_HELPTEXT                      :Настройка периодичности тех. обслуживания для новых поездов
-STR_CONFIG_SETTING_SERVINT_VALUE                                :{COMMA} д{P ень ня ней}/%
+STR_CONFIG_SETTING_SERVINT_VALUE                                :{COMMA}{NBSP}д{P ень ня ней}/%
 STR_CONFIG_SETTING_SERVINT_DISABLED                             :отключен
 STR_CONFIG_SETTING_SERVINT_ROAD_VEHICLES                        :Интервал обслуживания по умолчанию для автотранспорта: {STRING}
 STR_CONFIG_SETTING_SERVINT_ROAD_VEHICLES_HELPTEXT               :Настройка периодичности тех. обслуживания для новых автомобилей
@@ -1736,9 +1736,9 @@ STR_CONFIG_SETTING_LARGER_TOWNS_DISABLED                        :нет
 STR_CONFIG_SETTING_CITY_SIZE_MULTIPLIER                         :Стартовый множитель размера мегаполисов: {STRING}
 STR_CONFIG_SETTING_CITY_SIZE_MULTIPLIER_HELPTEXT                :Средний размер мегаполисов по сравнению с остальными городами в начале игры
 
-STR_CONFIG_SETTING_LINKGRAPH_INTERVAL                           :Обновлять граф распределения раз в {STRING} д{P 0:2 ень ня ней}
+STR_CONFIG_SETTING_LINKGRAPH_INTERVAL                           :Обновлять граф распределения раз в {STRING}{NBSP}д{P 0:2 ень ня ней}
 STR_CONFIG_SETTING_LINKGRAPH_INTERVAL_HELPTEXT                  :Период перерасчёта графов распределения. В каждом цикле рассчитывается не граф полностью, а только один из его компонентов. Чем меньше это значение, тем больше будет нагрузка на процессор. Чем больше значение, тем больше времени пройдёт перед началом расчёта графов для новых маршрутов.
-STR_CONFIG_SETTING_LINKGRAPH_TIME                               :Пересчитывать граф распределения раз в {STRING} д{P 0:2 ень ня ней}
+STR_CONFIG_SETTING_LINKGRAPH_TIME                               :Пересчитывать граф распределения раз в {STRING}{NBSP}д{P 0:2 ень ня ней}
 STR_CONFIG_SETTING_LINKGRAPH_TIME_HELPTEXT                      :Время, отведённое для перерасчёта компонентов графа. Расчёт запускается отдельным потоком и продолжается в течение указанного количества игровых дней. Если значение будет слишком маленьким, то, возможно, расчёт не успеет завершиться, и игра будет ждать завершения (это приведёт к задержкам). При больших значениях графы распределения будут медленнее обновляться при изменениях маршрутов.
 STR_CONFIG_SETTING_DISTRIBUTION_MANUAL                          :вручную
 STR_CONFIG_SETTING_DISTRIBUTION_ASYMMETRIC                      :несимметричное
@@ -3141,8 +3141,8 @@ STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED_WINTER              :{ORANGE}{STRING
 STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_DELIVERED_GENERAL            :{ORANGE}{STRING}{GREEN} доставлено
 STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED                     :{ORANGE}{CARGO_TINY} / {CARGO_LONG}{RED} (недостаточно)
 STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_DELIVERED                    :{ORANGE}{CARGO_TINY} / {CARGO_LONG}{GREEN} (достаточно)
-STR_TOWN_VIEW_TOWN_GROWS_EVERY                                  :{BLACK}Город растёт раз в {ORANGE}{COMMA}{BLACK} д{P ень ня ней}
-STR_TOWN_VIEW_TOWN_GROWS_EVERY_FUNDED                           :{BLACK}Город растёт раз в {ORANGE}{COMMA}{BLACK} д{P ень ня ней} (профинансировано)
+STR_TOWN_VIEW_TOWN_GROWS_EVERY                                  :{BLACK}Город растёт раз в {ORANGE}{COMMA}{BLACK}{NBSP}д{P ень ня ней}
+STR_TOWN_VIEW_TOWN_GROWS_EVERY_FUNDED                           :{BLACK}Город растёт раз в {ORANGE}{COMMA}{BLACK}{NBSP}д{P ень ня ней} (профинансировано)
 STR_TOWN_VIEW_TOWN_GROW_STOPPED                                 :{BLACK}Город {RED}не{BLACK} развивается
 STR_TOWN_VIEW_NOISE_IN_TOWN                                     :{BLACK}Уровень шума в городе: {ORANGE}{COMMA}{BLACK}  макс: {ORANGE}{COMMA}
 STR_TOWN_VIEW_CENTER_TOOLTIP                                    :{BLACK}Показать город в основном окне. Ctrl+щелчок - показать в дополнительном окне.
@@ -3808,7 +3808,7 @@ STR_VEHICLE_INFO_CAPACITY_CAPACITY                              :{BLACK}Ёмко
 
 STR_VEHICLE_INFO_FEEDER_CARGO_VALUE                             :{BLACK}Выручка перевозки: {LTBLUE}{CURRENCY_LONG}
 
-STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}Осмотр каждые {LTBLUE}{COMMA} дней{BLACK}   Последний раз: {LTBLUE}{DATE_LONG}
+STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}Осмотр каждые {LTBLUE}{COMMA}{NBSP}дней{BLACK}   Последний раз: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}Осмотр каждые {LTBLUE}{COMMA}%{BLACK}   Последний раз: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_INCREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Увеличить интервал обслуживания на 10. Ctrl+щелчок увеличивает интервал обслуживания на 5.
 STR_VEHICLE_DETAILS_DECREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Уменьшить интервал обслуживания на 10. Ctrl+щелчок уменьшает интервал обслуживания на 5.
@@ -4044,8 +4044,8 @@ STR_TIMETABLE_STAY_FOR_ESTIMATED                                :(ждать {ST
 STR_TIMETABLE_AND_TRAVEL_FOR_ESTIMATED                          :(в пути {STRING}, график не составлен)
 STR_TIMETABLE_STAY_FOR                                          :и ждать {STRING}
 STR_TIMETABLE_AND_TRAVEL_FOR                                    :и идти в {STRING}
-STR_TIMETABLE_DAYS                                              :{COMMA} д{P ень ня ней}
-STR_TIMETABLE_TICKS                                             :{COMMA} тик{P "" а ов}
+STR_TIMETABLE_DAYS                                              :{COMMA}{NBSP}д{P ень ня ней}
+STR_TIMETABLE_TICKS                                             :{COMMA}{NBSP}тик{P "" а ов}
 
 STR_TIMETABLE_TOTAL_TIME                                        :{BLACK}Весь маршрут займёт {STRING}
 STR_TIMETABLE_TOTAL_TIME_INCOMPLETE                             :{BLACK}Движение по маршруту займёт {STRING} (не всё учтено)
diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt
index e0bb74410..6c5c8c9d9 100644
--- a/src/lang/simplified_chinese.txt
+++ b/src/lang/simplified_chinese.txt
@@ -95,30 +95,30 @@ STR_CARGO_SINGULAR_FIZZY_DRINK                                  :汽水
 
 # Quantity of cargo
 STR_QUANTITY_NOTHING                                            :
-STR_QUANTITY_PASSENGERS                                         :{COMMA} 位旅客
+STR_QUANTITY_PASSENGERS                                         :{COMMA}{NBSP}位旅客
 STR_QUANTITY_COAL                                               :{WEIGHT_LONG} 煤炭
-STR_QUANTITY_MAIL                                               :{COMMA} 包邮件
+STR_QUANTITY_MAIL                                               :{COMMA}{NBSP}包邮件
 STR_QUANTITY_OIL                                                :{VOLUME_LONG} 原油
-STR_QUANTITY_LIVESTOCK                                          :{COMMA} 头牲畜
-STR_QUANTITY_GOODS                                              :{COMMA} 件货物
+STR_QUANTITY_LIVESTOCK                                          :{COMMA}{NBSP}头牲畜
+STR_QUANTITY_GOODS                                              :{COMMA}{NBSP}件货物
 STR_QUANTITY_GRAIN                                              :{WEIGHT_LONG} 谷物
 STR_QUANTITY_WOOD                                               :{WEIGHT_LONG} 木材
 STR_QUANTITY_IRON_ORE                                           :{WEIGHT_LONG} 铁矿石
 STR_QUANTITY_STEEL                                              :{WEIGHT_LONG} 钢材
-STR_QUANTITY_VALUABLES                                          :{COMMA} 包贵重品
+STR_QUANTITY_VALUABLES                                          :{COMMA}{NBSP}包贵重品
 STR_QUANTITY_COPPER_ORE                                         :{WEIGHT_LONG} 铜矿石
 STR_QUANTITY_MAIZE                                              :{WEIGHT_LONG} 玉米
 STR_QUANTITY_FRUIT                                              :{WEIGHT_LONG} 水果
-STR_QUANTITY_DIAMONDS                                           :{COMMA} 包钻石
+STR_QUANTITY_DIAMONDS                                           :{COMMA}{NBSP}包钻石
 STR_QUANTITY_FOOD                                               :{WEIGHT_LONG} 食品
 STR_QUANTITY_PAPER                                              :{WEIGHT_LONG} 纸张
-STR_QUANTITY_GOLD                                               :{COMMA} 包黄金
+STR_QUANTITY_GOLD                                               :{COMMA}{NBSP}包黄金
 STR_QUANTITY_WATER                                              :{VOLUME_LONG} 饮用水
 STR_QUANTITY_WHEAT                                              :{WEIGHT_LONG} 小麦
 STR_QUANTITY_RUBBER                                             :{VOLUME_LONG} 橡胶
 STR_QUANTITY_SUGAR                                              :{WEIGHT_LONG} 蔗糖
-STR_QUANTITY_TOYS                                               :{COMMA} 件玩具
-STR_QUANTITY_SWEETS                                             :{COMMA} 包糖果
+STR_QUANTITY_TOYS                                               :{COMMA}{NBSP}件玩具
+STR_QUANTITY_SWEETS                                             :{COMMA}{NBSP}包糖果
 STR_QUANTITY_COLA                                               :{VOLUME_LONG} 可乐
 STR_QUANTITY_CANDYFLOSS                                         :{WEIGHT_LONG} 棉花糖
 STR_QUANTITY_BUBBLES                                            :{COMMA} 个泡泡
@@ -165,12 +165,12 @@ STR_ABBREV_NONE                                                 :{TINY_FONT}无
 STR_ABBREV_ALL                                                  :{TINY_FONT}全
 
 # 'Mode' of transport for cargoes
-STR_PASSENGERS                                                  :{COMMA} 旅客
-STR_BAGS                                                        :{COMMA} 包
-STR_TONS                                                        :{COMMA} 英吨
-STR_LITERS                                                      :{COMMA} 升
-STR_ITEMS                                                       :{COMMA} 件
-STR_CRATES                                                      :{COMMA} 件
+STR_PASSENGERS                                                  :{COMMA}{NBSP}旅客
+STR_BAGS                                                        :{COMMA}{NBSP}包
+STR_TONS                                                        :{COMMA}{NBSP}英吨
+STR_LITERS                                                      :{COMMA}{NBSP}升
+STR_ITEMS                                                       :{COMMA}{NBSP}头
+STR_CRATES                                                      :{COMMA}{NBSP}件
 
 # Colours, do not shuffle
 STR_COLOUR_DARK_BLUE                                            :深蓝色
@@ -191,37 +191,37 @@ STR_COLOUR_GREY                                                 :浅灰色
 STR_COLOUR_WHITE                                                :白　色
 
 # Units used in OpenTTD
-STR_UNITS_VELOCITY_IMPERIAL                                     :{COMMA} 英里/小时
-STR_UNITS_VELOCITY_METRIC                                       :{COMMA} 千米/小时
-STR_UNITS_VELOCITY_SI                                           :{COMMA} 米/秒
+STR_UNITS_VELOCITY_IMPERIAL                                     :{COMMA}{NBSP}英里/小时
+STR_UNITS_VELOCITY_METRIC                                       :{COMMA}{NBSP}千米/小时
+STR_UNITS_VELOCITY_SI                                           :{COMMA}{NBSP}米/秒
 
-STR_UNITS_POWER_IMPERIAL                                        :{COMMA}马力
-STR_UNITS_POWER_METRIC                                          :{COMMA}马力
-STR_UNITS_POWER_SI                                              :{COMMA}千瓦
+STR_UNITS_POWER_IMPERIAL                                        :{COMMA}{NBSP}匹马力
+STR_UNITS_POWER_METRIC                                          :{COMMA}{NBSP}匹马力
+STR_UNITS_POWER_SI                                              :{COMMA}{NBSP}千瓦
 
-STR_UNITS_WEIGHT_SHORT_IMPERIAL                                 :{COMMA}英吨
-STR_UNITS_WEIGHT_SHORT_METRIC                                   :{COMMA}吨
-STR_UNITS_WEIGHT_SHORT_SI                                       :{COMMA}千克
+STR_UNITS_WEIGHT_SHORT_IMPERIAL                                 :{COMMA}{NBSP}英吨
+STR_UNITS_WEIGHT_SHORT_METRIC                                   :{COMMA}{NBSP}吨
+STR_UNITS_WEIGHT_SHORT_SI                                       :{COMMA}{NBSP}千克
 
-STR_UNITS_WEIGHT_LONG_IMPERIAL                                  :{COMMA}英吨
-STR_UNITS_WEIGHT_LONG_METRIC                                    :{COMMA} 吨
-STR_UNITS_WEIGHT_LONG_SI                                        :{COMMA}千克
+STR_UNITS_WEIGHT_LONG_IMPERIAL                                  :{COMMA}{NBSP}英吨
+STR_UNITS_WEIGHT_LONG_METRIC                                    :{COMMA}{NBSP}吨
+STR_UNITS_WEIGHT_LONG_SI                                        :{COMMA}{NBSP}千克
 
-STR_UNITS_VOLUME_SHORT_IMPERIAL                                 :{COMMA}加仑
-STR_UNITS_VOLUME_SHORT_METRIC                                   :{COMMA}升
-STR_UNITS_VOLUME_SHORT_SI                                       :{COMMA}立方米
+STR_UNITS_VOLUME_SHORT_IMPERIAL                                 :{COMMA}{NBSP}加仑
+STR_UNITS_VOLUME_SHORT_METRIC                                   :{COMMA}{NBSP}升
+STR_UNITS_VOLUME_SHORT_SI                                       :{COMMA}{NBSP}立方米
 
-STR_UNITS_VOLUME_LONG_IMPERIAL                                  :{COMMA}加仑
-STR_UNITS_VOLUME_LONG_METRIC                                    :{COMMA}升
-STR_UNITS_VOLUME_LONG_SI                                        :{COMMA}立方米
+STR_UNITS_VOLUME_LONG_IMPERIAL                                  :{COMMA}{NBSP}加仑
+STR_UNITS_VOLUME_LONG_METRIC                                    :{COMMA}{NBSP}升
+STR_UNITS_VOLUME_LONG_SI                                        :{COMMA}{NBSP}立方米
 
-STR_UNITS_FORCE_IMPERIAL                                        :{COMMA}磅力
-STR_UNITS_FORCE_METRIC                                          :{COMMA}千克力
-STR_UNITS_FORCE_SI                                              :{COMMA}千牛
+STR_UNITS_FORCE_IMPERIAL                                        :{COMMA}{NBSP}磅力
+STR_UNITS_FORCE_METRIC                                          :{COMMA}{NBSP}千克力
+STR_UNITS_FORCE_SI                                              :{COMMA}{NBSP}千牛
 
-STR_UNITS_HEIGHT_IMPERIAL                                       :{COMMA}英尺
-STR_UNITS_HEIGHT_METRIC                                         :{COMMA}米
-STR_UNITS_HEIGHT_SI                                             :{COMMA}米
+STR_UNITS_HEIGHT_IMPERIAL                                       :{COMMA}{NBSP}英尺
+STR_UNITS_HEIGHT_METRIC                                         :{COMMA}{NBSP}米
+STR_UNITS_HEIGHT_SI                                             :{COMMA}{NBSP}米
 
 # Common window strings
 STR_LIST_FILTER_TITLE                                           :{BLACK}过滤字串:
@@ -1444,7 +1444,7 @@ STR_CONFIG_SETTING_SERVINT_ISPERCENT                            :保养周期(�
 STR_CONFIG_SETTING_SERVINT_ISPERCENT_HELPTEXT                   :选择触发车辆保养的条件，距离上一次保养的时间或者与最高可靠性的百分比
 STR_CONFIG_SETTING_SERVINT_TRAINS                               :火车默认保养周期：{STRING}
 STR_CONFIG_SETTING_SERVINT_TRAINS_HELPTEXT                      :如果没有为火车直接指定保养周期，设定默认火车保养周期
-STR_CONFIG_SETTING_SERVINT_VALUE                                :{COMMA}天(%)
+STR_CONFIG_SETTING_SERVINT_VALUE                                :{COMMA}{NBSP}天/%
 STR_CONFIG_SETTING_SERVINT_DISABLED                             :关闭
 STR_CONFIG_SETTING_SERVINT_ROAD_VEHICLES                        :汽车默认保养周期：{STRING}
 STR_CONFIG_SETTING_SERVINT_ROAD_VEHICLES_HELPTEXT               :如果没有为汽车指定保养周期，设定汽车的默认保养周期
@@ -1584,9 +1584,9 @@ STR_CONFIG_SETTING_LARGER_TOWNS_DISABLED                        :没有
 STR_CONFIG_SETTING_CITY_SIZE_MULTIPLIER                         :初始城市规模因子：{STRING}
 STR_CONFIG_SETTING_CITY_SIZE_MULTIPLIER_HELPTEXT                :游戏开局时，城市的平均规模相对于普通城镇的比值
 
-STR_CONFIG_SETTING_LINKGRAPH_INTERVAL                           :每 {STRING} 天更新一次统计图
+STR_CONFIG_SETTING_LINKGRAPH_INTERVAL                           :每 {STRING}{NBSP}天刷新一次分配图
 STR_CONFIG_SETTING_LINKGRAPH_INTERVAL_HELPTEXT                  :指定每次计算货物分配图之间的时间。由于每次重新计算只会处理一个货物分配图元件，因此本设定不代表“每若干日重新计算整个货物分配图”。{}如果此设定赋值越小，則系统需要使用更多处理器时间计算货物分配图。相反，如果此设定赋值越大，則货物被派往新路线所需的时间越长。
-STR_CONFIG_SETTING_LINKGRAPH_TIME                               :每次刷新货物分配图持续 {STRING} 天
+STR_CONFIG_SETTING_LINKGRAPH_TIME                               :容许系统用 {STRING}{NBSP}天时间刷新货物分配图
 STR_CONFIG_SETTING_LINKGRAPH_TIME_HELPTEXT                      :當刷新货物分配图时，系统會衍生一条线程。本设定的值即为线程的持续时间。{}这设定赋值越小，线程越有可能在应当停止的时候还未完成，游戏会暂停运作至线程完成工作。相反，这设定赋值越大，則货物分配功能需要较长时间反映线路网変动的影晌。
 STR_CONFIG_SETTING_DISTRIBUTION_MANUAL                          :手动
 STR_CONFIG_SETTING_DISTRIBUTION_ASYMMETRIC                      :不对称
@@ -2961,8 +2961,8 @@ STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED_WINTER              :{ORANGE}{STRING
 STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_DELIVERED_GENERAL            :{ORANGE}{STRING}已运输 {GREEN}
 STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED                     :{ORANGE}已运输：{CARGO_TINY} /{RED}总需求： {CARGO_LONG}
 STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_DELIVERED                    :{ORANGE}{CARGO_TINY} / {CARGO_LONG}{GREEN} (已运输)
-STR_TOWN_VIEW_TOWN_GROWS_EVERY                                  :{BLACK}城镇每 {ORANGE}{COMMA}{BLACK} 天成长一次
-STR_TOWN_VIEW_TOWN_GROWS_EVERY_FUNDED                           :{BLACK}城镇每 {ORANGE}{COMMA}{BLACK} 天成长一次(加速中)
+STR_TOWN_VIEW_TOWN_GROWS_EVERY                                  :{BLACK}城镇每 {ORANGE}{COMMA}{BLACK}{NBSP}天成长一次
+STR_TOWN_VIEW_TOWN_GROWS_EVERY_FUNDED                           :{BLACK}城镇每 {ORANGE}{COMMA}{BLACK}{NBSP}天成长一次 (正接受资助)
 STR_TOWN_VIEW_TOWN_GROW_STOPPED                                 :{BLACK} 城镇发展正在 {RED}停滞 {BLACK}！
 STR_TOWN_VIEW_NOISE_IN_TOWN                                     :{BLACK}当前城镇噪音: {ORANGE}{COMMA}{BLACK}  最大: {ORANGE}{COMMA}
 STR_TOWN_VIEW_CENTER_TOOLTIP                                    :{BLACK}将屏幕中心移动到城镇所在的位置. 单击的同时按住Ctrl会在新视点中显示城镇位置
@@ -3618,7 +3618,7 @@ STR_VEHICLE_INFO_CAPACITY_CAPACITY                              :{BLACK}运载�
 
 STR_VEHICLE_INFO_FEEDER_CARGO_VALUE                             :{BLACK}转运成本： {LTBLUE}{CURRENCY_LONG}
 
-STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}保养周期：{LTBLUE}{COMMA}天{BLACK}   上次保养：{LTBLUE}{DATE_LONG}
+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_DETAILS_INCREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}增大检修时间间隔,以10为单位进行调整. 按住Ctrl同时点击则以5为单位进行调整
 STR_VEHICLE_DETAILS_DECREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}减少检修时间间隔,以10为单位进行调整. 按住Ctrl同时点击则以5为单位进行调整
@@ -3854,8 +3854,8 @@ STR_TIMETABLE_STAY_FOR_ESTIMATED                                :(停靠 {STRING
 STR_TIMETABLE_AND_TRAVEL_FOR_ESTIMATED                          :(驶往 {STRING}, 无时间表)
 STR_TIMETABLE_STAY_FOR                                          :并且停留 {STRING}
 STR_TIMETABLE_AND_TRAVEL_FOR                                    :并行驶{STRING}
-STR_TIMETABLE_DAYS                                              :{COMMA} 天
-STR_TIMETABLE_TICKS                                             :{COMMA} 个时间标记
+STR_TIMETABLE_DAYS                                              :{COMMA}{NBSP}天
+STR_TIMETABLE_TICKS                                             :{COMMA}{NBSP}个时间标记
 
 STR_TIMETABLE_TOTAL_TIME                                        :{BLACK}该时间表需要 {STRING} 完成
 STR_TIMETABLE_TOTAL_TIME_INCOMPLETE                             :{BLACK}该时间表至少需要 {STRING} 完成（并非全部计划的时间）
@@ -4119,7 +4119,7 @@ STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP_SUB                          :{WHITE}太靠�
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN                             :{WHITE}太靠近另一个城镇了
 STR_ERROR_TOO_MANY_TOWNS                                        :{WHITE}城镇太多了
 STR_ERROR_NO_SPACE_FOR_TOWN                                     :{WHITE}地图上没有多余的地方了
-STR_ERROR_TOWN_EXPAND_WARN_NO_ROADS                             :{WHITE}这个城镇不会修建道路{}请在在"高级设置->经济->城镇"处{}设置允许城镇建设道路
+STR_ERROR_TOWN_EXPAND_WARN_NO_ROADS                             :{WHITE}这个城镇不会修建道路{}您可以在"高级设置->环境->城镇"进行设定{}允许城镇建设道路
 STR_ERROR_ROAD_WORKS_IN_PROGRESS                                :{WHITE}正在进行道路工程
 STR_ERROR_TOWN_CAN_T_DELETE                                     :{WHITE}无法删除城镇...{}城镇范围内还有车站、车库或无法移除的区块
 STR_ERROR_STATUE_NO_SUITABLE_PLACE                              :{WHITE}... 城市中心没有合适的地方放置公司塑像
@@ -4143,6 +4143,9 @@ STR_ERROR_FOREST_CAN_ONLY_BE_PLANTED                            :{WHITE}林场�
 STR_ERROR_CAN_ONLY_BE_BUILT_ABOVE_SNOW_LINE                     :{WHITE}... 只能在雪线以上建造
 STR_ERROR_CAN_ONLY_BE_BUILT_BELOW_SNOW_LINE                     :{WHITE}... 只能在雪线以下建造
 
+STR_ERROR_NO_SUITABLE_PLACES_FOR_INDUSTRIES                     :{WHITE}没有合适的地方建设 “{STRING}” 工业设施
+STR_ERROR_NO_SUITABLE_PLACES_FOR_INDUSTRIES_EXPLANATION         :{WHITE}请更改参数以生成较好的场景
+
 # Station construction related errors
 STR_ERROR_CAN_T_BUILD_RAILROAD_STATION                          :{WHITE}不能在这里建设火车站……
 STR_ERROR_CAN_T_BUILD_BUS_STATION                               :{WHITE}不能建设公共汽车站
diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt
index 214dc580d..d5925b000 100644
--- a/src/lang/slovak.txt
+++ b/src/lang/slovak.txt
@@ -3914,7 +3914,7 @@ STR_TIMETABLE_NO_TRAVEL                                         :Necestuj
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Cestovanie (automaticky; nastavené po ďalšom zadaní objednávky)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Cesta (neurcený cas)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Cestovanie (bez cestovného plánu) s najviac {2:VELOCITY}
-STR_TIMETABLE_TRAVEL_FOR                                        :Cesta do {STRING}
+STR_TIMETABLE_TRAVEL_FOR                                        :Cesta {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Cestovanie na {STRING} s {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Cesta ({STRING}, nerozvrhnuté)
 STR_TIMETABLE_TRAVEL_FOR_SPEED_ESTIMATED                        :Cesta (for {STRING}, nerozvrhnuté) pri najviac {VELOCITY}
@@ -4211,6 +4211,7 @@ STR_ERROR_FOREST_CAN_ONLY_BE_PLANTED                            :{WHITE}... les
 STR_ERROR_CAN_ONLY_BE_BUILT_ABOVE_SNOW_LINE                     :{WHITE}... môže byť postavené len nad čiarou snehu
 STR_ERROR_CAN_ONLY_BE_BUILT_BELOW_SNOW_LINE                     :{WHITE}... môže byť postavené len pod čiarou snehu
 
+
 # Station construction related errors
 STR_ERROR_CAN_T_BUILD_RAILROAD_STATION                          :{WHITE}Nemôžeš tu postaviť železničnú stanicu...
 STR_ERROR_CAN_T_BUILD_BUS_STATION                               :{WHITE}Nemôžeš tu postaviť autobusovú zastávku...
diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt
index d3b552a3e..b4a9a206c 100644
--- a/src/lang/traditional_chinese.txt
+++ b/src/lang/traditional_chinese.txt
@@ -95,30 +95,30 @@ STR_CARGO_SINGULAR_FIZZY_DRINK                                  :汽水
 
 # Quantity of cargo
 STR_QUANTITY_NOTHING                                            :
-STR_QUANTITY_PASSENGERS                                         :{COMMA} 名乘客
+STR_QUANTITY_PASSENGERS                                         :{COMMA}{NBSP}名乘客
 STR_QUANTITY_COAL                                               :{WEIGHT_LONG} 煤碳
-STR_QUANTITY_MAIL                                               :{COMMA} 包郵件
+STR_QUANTITY_MAIL                                               :{COMMA}{NBSP}包郵件
 STR_QUANTITY_OIL                                                :{VOLUME_LONG} 石油
-STR_QUANTITY_LIVESTOCK                                          :{COMMA} 頭牲畜
-STR_QUANTITY_GOODS                                              :{COMMA} 箱商品
+STR_QUANTITY_LIVESTOCK                                          :{COMMA}{NBSP}頭牲畜
+STR_QUANTITY_GOODS                                              :{COMMA}{NBSP}箱商品
 STR_QUANTITY_GRAIN                                              :{WEIGHT_LONG} 穀物
 STR_QUANTITY_WOOD                                               :{WEIGHT_LONG} 木材
 STR_QUANTITY_IRON_ORE                                           :{WEIGHT_LONG} 鐵礦
 STR_QUANTITY_STEEL                                              :{WEIGHT_LONG} 鋼鐵
-STR_QUANTITY_VALUABLES                                          :{COMMA} 包貴重物品
+STR_QUANTITY_VALUABLES                                          :{COMMA}{NBSP}包貴重物品
 STR_QUANTITY_COPPER_ORE                                         :{WEIGHT_LONG} 銅礦
 STR_QUANTITY_MAIZE                                              :{WEIGHT_LONG} 玉米
 STR_QUANTITY_FRUIT                                              :{WEIGHT_LONG} 水果
-STR_QUANTITY_DIAMONDS                                           :{COMMA} 包鑽石
+STR_QUANTITY_DIAMONDS                                           :{COMMA}{NBSP}包鑽石
 STR_QUANTITY_FOOD                                               :{WEIGHT_LONG} 食物
 STR_QUANTITY_PAPER                                              :{WEIGHT_LONG} 紙張
-STR_QUANTITY_GOLD                                               :{COMMA} 包黃金
+STR_QUANTITY_GOLD                                               :{COMMA}{NBSP}包黃金
 STR_QUANTITY_WATER                                              :{VOLUME_LONG} 淡水
 STR_QUANTITY_WHEAT                                              :{WEIGHT_LONG} 小麥
 STR_QUANTITY_RUBBER                                             :{VOLUME_LONG} 橡膠
 STR_QUANTITY_SUGAR                                              :{WEIGHT_LONG} 砂糖
-STR_QUANTITY_TOYS                                               :{COMMA} 件玩具
-STR_QUANTITY_SWEETS                                             :{COMMA} 包甜點
+STR_QUANTITY_TOYS                                               :{COMMA}{NBSP}件玩具
+STR_QUANTITY_SWEETS                                             :{COMMA}{NBSP}包糖果
 STR_QUANTITY_COLA                                               :{VOLUME_LONG} 可樂
 STR_QUANTITY_CANDYFLOSS                                         :{WEIGHT_LONG} 棉花糖
 STR_QUANTITY_BUBBLES                                            :{COMMA} 個泡泡
@@ -165,12 +165,12 @@ STR_ABBREV_NONE                                                 :{TINY_FONT}無
 STR_ABBREV_ALL                                                  :{TINY_FONT}全
 
 # 'Mode' of transport for cargoes
-STR_PASSENGERS                                                  :{COMMA} 乘客
-STR_BAGS                                                        :{COMMA} 包
-STR_TONS                                                        :{COMMA} 噸
-STR_LITERS                                                      :{COMMA} 公升
-STR_ITEMS                                                       :{COMMA} 件
-STR_CRATES                                                      :{COMMA} 箱
+STR_PASSENGERS                                                  :{COMMA}{NBSP}名乘客
+STR_BAGS                                                        :{COMMA}{NBSP}包
+STR_TONS                                                        :{COMMA}{NBSP}噸
+STR_LITERS                                                      :{COMMA}{NBSP}公升
+STR_ITEMS                                                       :{COMMA}{NBSP}頭
+STR_CRATES                                                      :{COMMA}{NBSP}箱
 
 # Colours, do not shuffle
 STR_COLOUR_DARK_BLUE                                            :暗藍
@@ -191,37 +191,37 @@ STR_COLOUR_GREY                                                 :灰
 STR_COLOUR_WHITE                                                :白
 
 # Units used in OpenTTD
-STR_UNITS_VELOCITY_IMPERIAL                                     :{COMMA} 英里/小時
-STR_UNITS_VELOCITY_METRIC                                       :{COMMA} 公里/小時
-STR_UNITS_VELOCITY_SI                                           :{COMMA} 米/秒
+STR_UNITS_VELOCITY_IMPERIAL                                     :{COMMA}{NBSP}英里/小時
+STR_UNITS_VELOCITY_METRIC                                       :{COMMA}{NBSP}公里/小時
+STR_UNITS_VELOCITY_SI                                           :{COMMA}{NBSP}米/秒
 
-STR_UNITS_POWER_IMPERIAL                                        :{COMMA}匹
-STR_UNITS_POWER_METRIC                                          :{COMMA}匹
-STR_UNITS_POWER_SI                                              :{COMMA}千瓦
+STR_UNITS_POWER_IMPERIAL                                        :{COMMA}{NBSP}匹
+STR_UNITS_POWER_METRIC                                          :{COMMA}{NBSP}匹
+STR_UNITS_POWER_SI                                              :{COMMA}{NBSP}千瓦
 
-STR_UNITS_WEIGHT_SHORT_IMPERIAL                                 :{COMMA} 短噸
-STR_UNITS_WEIGHT_SHORT_METRIC                                   :{COMMA}噸
-STR_UNITS_WEIGHT_SHORT_SI                                       :{COMMA}kg
+STR_UNITS_WEIGHT_SHORT_IMPERIAL                                 :{COMMA}{NBSP}短噸
+STR_UNITS_WEIGHT_SHORT_METRIC                                   :{COMMA}{NBSP}噸
+STR_UNITS_WEIGHT_SHORT_SI                                       :{COMMA}{NBSP}公斤
 
-STR_UNITS_WEIGHT_LONG_IMPERIAL                                  :{COMMA} 短噸
-STR_UNITS_WEIGHT_LONG_METRIC                                    :{COMMA}公噸
-STR_UNITS_WEIGHT_LONG_SI                                        :{COMMA} 千克
+STR_UNITS_WEIGHT_LONG_IMPERIAL                                  :{COMMA}{NBSP}短噸
+STR_UNITS_WEIGHT_LONG_METRIC                                    :{COMMA}{NBSP}公噸
+STR_UNITS_WEIGHT_LONG_SI                                        :{COMMA}{NBSP}公斤
 
-STR_UNITS_VOLUME_SHORT_IMPERIAL                                 :{COMMA} 加侖
-STR_UNITS_VOLUME_SHORT_METRIC                                   :{COMMA}升
-STR_UNITS_VOLUME_SHORT_SI                                       :{COMMA}米³
+STR_UNITS_VOLUME_SHORT_IMPERIAL                                 :{COMMA}{NBSP}加侖
+STR_UNITS_VOLUME_SHORT_METRIC                                   :{COMMA}{NBSP}升
+STR_UNITS_VOLUME_SHORT_SI                                       :{COMMA}{NBSP}米³
 
-STR_UNITS_VOLUME_LONG_IMPERIAL                                  :{COMMA} 加侖
-STR_UNITS_VOLUME_LONG_METRIC                                    :{COMMA} 公升
-STR_UNITS_VOLUME_LONG_SI                                        :{COMMA} 立方米
+STR_UNITS_VOLUME_LONG_IMPERIAL                                  :{COMMA}{NBSP}加侖
+STR_UNITS_VOLUME_LONG_METRIC                                    :{COMMA}{NBSP}公升
+STR_UNITS_VOLUME_LONG_SI                                        :{COMMA}{NBSP}立方米
 
-STR_UNITS_FORCE_IMPERIAL                                        :{COMMA} 磅力
-STR_UNITS_FORCE_METRIC                                          :{COMMA} 公斤力
-STR_UNITS_FORCE_SI                                              :{COMMA} kN
+STR_UNITS_FORCE_IMPERIAL                                        :{COMMA}{NBSP}磅力
+STR_UNITS_FORCE_METRIC                                          :{COMMA}{NBSP}公斤力
+STR_UNITS_FORCE_SI                                              :{COMMA}{NBSP}千牛頓
 
-STR_UNITS_HEIGHT_IMPERIAL                                       :{COMMA} 英呎
-STR_UNITS_HEIGHT_METRIC                                         :{COMMA} 米
-STR_UNITS_HEIGHT_SI                                             :{COMMA} 公尺
+STR_UNITS_HEIGHT_IMPERIAL                                       :{COMMA}{NBSP}英呎
+STR_UNITS_HEIGHT_METRIC                                         :{COMMA}{NBSP}米
+STR_UNITS_HEIGHT_SI                                             :{COMMA}{NBSP}公尺
 
 # Common window strings
 STR_LIST_FILTER_TITLE                                           :{BLACK}篩選字串：
@@ -1268,21 +1268,32 @@ STR_CONFIG_SETTING_POPULATION_IN_LABEL_HELPTEXT                 :在地圖的市
 STR_CONFIG_SETTING_GRAPH_LINE_THICKNESS                         :圖像上的線條之粗細值： {STRING}
 STR_CONFIG_SETTING_GRAPH_LINE_THICKNESS_HELPTEXT                :設定圖像上的線條之粗細值。較幼細的線條能較準確地顯示數值，而較粗大的線較容易看到和分辨
 
+STR_CONFIG_SETTING_LANDSCAPE                                    :場景：{STRING}
+STR_CONFIG_SETTING_LANDSCAPE_HELPTEXT                           :此設定決定基本的遊戲場景、可供運輸的貨物種類，以及城鎮發展的條件。然而，NewGRF 及遊戲腳本可提供更加細緻的設定
 STR_CONFIG_SETTING_LAND_GENERATOR                               :地形產生器：{STRING}
+STR_CONFIG_SETTING_LAND_GENERATOR_HELPTEXT                      :「原版」地圖產生器根據所使用的基本圖形集來產生固定的地形。TerraGenesis 則是一個建基於 Perlin 噪音原理的地形產生程序，支援較為細緻的地形設定
 STR_CONFIG_SETTING_LAND_GENERATOR_ORIGINAL                      :原版
 STR_CONFIG_SETTING_LAND_GENERATOR_TERRA_GENESIS                 :TerraGenesis
-STR_CONFIG_SETTING_INDUSTRY_DENSITY                             :工業密度: {STRING}
+STR_CONFIG_SETTING_TERRAIN_TYPE                                 :地形種類：{STRING}
+STR_CONFIG_SETTING_TERRAIN_TYPE_HELPTEXT                        :(只適用於 TerraGenesis) 此設定控制產生的地圖是平坦還是峰巒起伏
+STR_CONFIG_SETTING_INDUSTRY_DENSITY                             :工業設施密度: {STRING}
+STR_CONFIG_SETTING_INDUSTRY_DENSITY_HELPTEXT                    :此設定控制工業設定出現的密度。遊戲進行時，系統仍會根據此設定來決定工業設施的數量
 STR_CONFIG_SETTING_OIL_REF_EDGE_DISTANCE                        :煉油廠與地圖邊緣之最遠距離： {STRING}
 STR_CONFIG_SETTING_OIL_REF_EDGE_DISTANCE_HELPTEXT               :僅於地圖邊緣建造煉油廠，在島嶼型地圖中它們將處於海邊
 STR_CONFIG_SETTING_SNOWLINE_HEIGHT                              :雪線高度：{STRING}
+STR_CONFIG_SETTING_SNOWLINE_HEIGHT_HELPTEXT                     :此設定控制在「寒帶」地圖中雪地開始出現的高度。除了外觀的不同外，雪地也會影響工業設施的分佈以及市鎮成長的條件
 STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN                         :地形起伏度 (只適用於 TerraGenesis)：{STRING}
+STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_HELPTEXT                :(只適用於 TerraGenesis) 此設定控制地圖上的山丘密度。「平滑」的地形會包含較少而且相互距離較遠的山丘；較粗糙的地形會包含密集的山丘，但可能會使地圖顯得重複
 STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_VERY_SMOOTH             :非常平滑
 STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_SMOOTH                  :平滑
 STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_ROUGH                   :高低不平
 STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_VERY_ROUGH              :非常粗糙
+STR_CONFIG_SETTING_VARIETY                                      :地形起伏分佈：{STRING}
+STR_CONFIG_SETTING_VARIETY_HELPTEXT                             :(只適用於 TerraGenesis) 此設定控制地圖是否同時包含多山及平坦的地帶。由於此設定只會使地圖的部份區域變得平坦，請把其他地形設定設為「高山」
 STR_CONFIG_SETTING_RIVER_AMOUNT                                 :河流數量: {STRING}
 STR_CONFIG_SETTING_RIVER_AMOUNT_HELPTEXT                        :選擇欲產生的河流數量
 STR_CONFIG_SETTING_TREE_PLACER                                  :樹木分佈演算法：{STRING}
+STR_CONFIG_SETTING_TREE_PLACER_HELPTEXT                         :選擇地圖上樹木的分布方式：如選擇「原版」設定，系統會把樹木均勻地散佈在地圖上；如選擇「改進版」，系統會在地圖上產生若干樹林
 STR_CONFIG_SETTING_TREE_PLACER_NONE                             :無
 STR_CONFIG_SETTING_TREE_PLACER_ORIGINAL                         :原版
 STR_CONFIG_SETTING_TREE_PLACER_IMPROVED                         :改進版
@@ -1433,7 +1444,7 @@ STR_CONFIG_SETTING_SERVINT_ISPERCENT                            :維護間隔以
 STR_CONFIG_SETTING_SERVINT_ISPERCENT_HELPTEXT                   :選擇啟動運輸工具自動前往維修設施進行維護的條件：要麼以上次進行維修的時距決定，要麼以可靠度下降的百分比（相對於其最大可靠度而言）決定
 STR_CONFIG_SETTING_SERVINT_TRAINS                               :預設的列車維護作業時距： {STRING}
 STR_CONFIG_SETTING_SERVINT_TRAINS_HELPTEXT                      :設定預設的列車維護作業時距。所有沒有指定維護作業時距的列車都會使用這個預設值
-STR_CONFIG_SETTING_SERVINT_VALUE                                :{COMMA} 日/%
+STR_CONFIG_SETTING_SERVINT_VALUE                                :{COMMA}{NBSP}日/%
 STR_CONFIG_SETTING_SERVINT_DISABLED                             :停用
 STR_CONFIG_SETTING_SERVINT_ROAD_VEHICLES                        :預設的公路車輛維護作業時距： {STRING}
 STR_CONFIG_SETTING_SERVINT_ROAD_VEHICLES_HELPTEXT               :設定預設的公路車輛維護作業時距。所有沒有指定維護作業時距的公路車輛都會使用這個預設值
@@ -1575,7 +1586,7 @@ STR_CONFIG_SETTING_CITY_SIZE_MULTIPLIER_HELPTEXT                :設定遊戲開
 
 STR_CONFIG_SETTING_LINKGRAPH_INTERVAL                           :每{STRING}日更新貨物分配圖
 STR_CONFIG_SETTING_LINKGRAPH_INTERVAL_HELPTEXT                  :指定每次計算貨物分配圖之間的時間。由於每次重新計算只會處理一個貨物分配圖元件，因此本設定不代表「每若干日重新計算整個貨物分配圖」。{}如果此設定賦值越小，則系統需要使用更多處理器時間計算貨物分配圖。相反，如果此設定賦值越大，則貨物被派往新路線所需的時間越長。
-STR_CONFIG_SETTING_LINKGRAPH_TIME                               :每次更新貨物分配圖持續 {STRING} 天
+STR_CONFIG_SETTING_LINKGRAPH_TIME                               :用 {STRING}{NBSP}天更新貨物分配圖
 STR_CONFIG_SETTING_LINKGRAPH_TIME_HELPTEXT                      :當更新貨物分配圖時，系統會衍生一條執行緒。本設定的值即為執行緒的持續時間。{}這設定賦值越小，執行緒越有可能在應當停止的時候仍未完成運算，遊戲會暫停運行至執行緒完成工作。相反，這設定賦值越大，則貨物分配功能需要較長時間反映路線網絡變動的影響。
 STR_CONFIG_SETTING_DISTRIBUTION_MANUAL                          :手動
 STR_CONFIG_SETTING_DISTRIBUTION_ASYMMETRIC                      :不對稱
@@ -1634,11 +1645,23 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_METRIC             :米制（米）
 STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_SI                 :國際單位（米）
 
 STR_CONFIG_SETTING_LOCALISATION                                 :{ORANGE}本地化
+STR_CONFIG_SETTING_GRAPHICS                                     :{ORANGE}圖形
 STR_CONFIG_SETTING_SOUND                                        :{ORANGE}音效
 STR_CONFIG_SETTING_INTERFACE                                    :{ORANGE}介面
+STR_CONFIG_SETTING_INTERFACE_GENERAL                            :{ORANGE}基本顯示
+STR_CONFIG_SETTING_INTERFACE_VIEWPORTS                          :{ORANGE}顯示設定
 STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION                       :{ORANGE}建造
+STR_CONFIG_SETTING_ADVISORS                                     :{ORANGE}訊息提示
+STR_CONFIG_SETTING_COMPANY                                      :{ORANGE}預設的基建及運具選項
+STR_CONFIG_SETTING_ACCOUNTING                                   :{ORANGE}財務
 STR_CONFIG_SETTING_VEHICLES                                     :{ORANGE}運輸工具
+STR_CONFIG_SETTING_VEHICLES_PHYSICS                             :{ORANGE}物理
 STR_CONFIG_SETTING_VEHICLES_ROUTING                             :{ORANGE}路線
+STR_CONFIG_SETTING_LIMITATIONS                                  :{ORANGE}遊戲限制
+STR_CONFIG_SETTING_ACCIDENTS                                    :{ORANGE}災難／事故
+STR_CONFIG_SETTING_GENWORLD                                     :{ORANGE}地圖的產生
+STR_CONFIG_SETTING_ENVIRONMENT                                  :{ORANGE}環境
+STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES                      :{ORANGE}地方政府
 STR_CONFIG_SETTING_ENVIRONMENT_TOWNS                            :{ORANGE}市鎮
 STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES                       :{ORANGE}工業
 STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST                        :{ORANGE}貨物分配
@@ -2788,7 +2811,9 @@ STR_NEWGRF_SETTINGS_INCOMPATIBLE                                :{RED}與此版�
 
 # NewGRF save preset window
 STR_SAVE_PRESET_CAPTION                                         :{WHITE}儲存設定值
+STR_SAVE_PRESET_LIST_TOOLTIP                                    :{BLACK}現有的預設值名稱。點選一個預設值名稱，它會被複製到下方的輸入欄
 STR_SAVE_PRESET_TITLE                                           :{BLACK}輸入預設值名稱
+STR_SAVE_PRESET_EDITBOX_TOOLTIP                                 :{BLACK}預設值會儲存成現時選定的名稱
 STR_SAVE_PRESET_CANCEL                                          :{BLACK}取消
 STR_SAVE_PRESET_CANCEL_TOOLTIP                                  :{BLACK}請勿修改預設值
 STR_SAVE_PRESET_SAVE                                            :{BLACK}存檔
@@ -2936,8 +2961,8 @@ STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED_WINTER              :{ORANGE}{STRING
 STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_DELIVERED_GENERAL            :{ORANGE}{STRING}{GREEN} 已運送
 STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED                     :{ORANGE}{CARGO_TINY} / {CARGO_LONG}{RED} (仍然需要)
 STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_DELIVERED                    :{ORANGE}{CARGO_TINY} / {CARGO_LONG}{GREEN}（已運送）
-STR_TOWN_VIEW_TOWN_GROWS_EVERY                                  :{BLACK}該市鎮每隔 {ORANGE}{COMMA}{BLACK} 天擴張一次
-STR_TOWN_VIEW_TOWN_GROWS_EVERY_FUNDED                           :{BLACK}該市鎮每隔 {ORANGE}{COMMA}{BLACK} 天擴張一次 (有資金協助)
+STR_TOWN_VIEW_TOWN_GROWS_EVERY                                  :{BLACK}該市鎮每隔 {ORANGE}{COMMA}{BLACK}{NBSP}天擴張一次
+STR_TOWN_VIEW_TOWN_GROWS_EVERY_FUNDED                           :{BLACK}該市鎮每隔 {ORANGE}{COMMA}{BLACK}{NBSP}天擴張一次 (正接受資助)
 STR_TOWN_VIEW_TOWN_GROW_STOPPED                                 :{BLACK}市鎮{RED}不在{BLACK}成長
 STR_TOWN_VIEW_NOISE_IN_TOWN                                     :{BLACK}市鎮噪音限制：{ORANGE}{COMMA}{BLACK}  最大：{ORANGE}{COMMA}
 STR_TOWN_VIEW_CENTER_TOOLTIP                                    :{BLACK}將市鎮置於畫面中央。按住 Ctrl 點選可於市鎮位置開啟新視窗視野
@@ -3300,6 +3325,8 @@ STR_GROUP_DELETE_TOOLTIP                                        :{BLACK}移除�
 STR_GROUP_RENAME_TOOLTIP                                        :{BLACK}重新命名群組
 STR_GROUP_REPLACE_PROTECTION_TOOLTIP                            :{BLACK}點選可保護此群組排除在全域自動替換設定之外
 
+STR_QUERY_GROUP_DELETE_CAPTION                                  :{WHITE}刪除群組
+STR_GROUP_DELETE_QUERY_TEXT                                     :{WHITE}您是否決定刪除此群組及其所有子群組？
 
 STR_GROUP_ADD_SHARED_VEHICLE                                    :加入共享指令的運具
 STR_GROUP_REMOVE_ALL_VEHICLES                                   :移去所有運具
@@ -3591,7 +3618,7 @@ STR_VEHICLE_INFO_CAPACITY_CAPACITY                              :{BLACK}容量�
 
 STR_VEHICLE_INFO_FEEDER_CARGO_VALUE                             :{BLACK}轉運潛在收入：{LTBLUE}{CURRENCY_LONG}
 
-STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}維護間隔：{LTBLUE}{COMMA} 天{BLACK}   上次維護：{LTBLUE}{DATE_LONG}
+STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}每隔 {LTBLUE}{COMMA}{NBSP}天進行維護{BLACK}   上次維護日期：{LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}維護間隔：{LTBLUE}{COMMA}%{BLACK}   上次維護：{LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_INCREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}以 10 為單位延長維護間隔。 按住 Ctrl 點選可以 5 為單位
 STR_VEHICLE_DETAILS_DECREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}以 10 為單位縮短維護間隔。 按住 Ctrl 點選可以 5 為單位
@@ -3821,10 +3848,14 @@ STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :運行中 (未�
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :以不超過 {2:VELOCITY} 的速度運行 (未指定時間)
 STR_TIMETABLE_TRAVEL_FOR                                        :運行需時 {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :以不超過 {1:VELOCITY} 的速度運行 {0:STRING}
+STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :運行 {STRING} (未指定時間)
+STR_TIMETABLE_TRAVEL_FOR_SPEED_ESTIMATED                        :運行 {STRING} (速度不超過 {VELOCITY}，未指定時間)
+STR_TIMETABLE_STAY_FOR_ESTIMATED                                :等待 {STRING} (未指定時間)
+STR_TIMETABLE_AND_TRAVEL_FOR_ESTIMATED                          :(運行 {STRING} ，未指定時間)
 STR_TIMETABLE_STAY_FOR                                          :並等待 {STRING}
 STR_TIMETABLE_AND_TRAVEL_FOR                                    :並運行 {STRING}
-STR_TIMETABLE_DAYS                                              :{COMMA} 日
-STR_TIMETABLE_TICKS                                             :{COMMA} tick
+STR_TIMETABLE_DAYS                                              :{COMMA}{NBSP}日
+STR_TIMETABLE_TICKS                                             :{COMMA}{NBSP}個時間標記
 
 STR_TIMETABLE_TOTAL_TIME                                        :{BLACK}此時刻表跑完全程需時 {STRING}
 STR_TIMETABLE_TOTAL_TIME_INCOMPLETE                             :{BLACK}此時刻表跑完全程至少需時 {STRING} (此表尚未完成)
@@ -4088,7 +4119,7 @@ STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP_SUB                          :{WHITE}... 太�
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN                             :{WHITE}... 太接近另一個市鎮
 STR_ERROR_TOO_MANY_TOWNS                                        :{WHITE}... 已有太多市鎮
 STR_ERROR_NO_SPACE_FOR_TOWN                                     :{WHITE}... 地圖沒有足夠空間
-STR_ERROR_TOWN_EXPAND_WARN_NO_ROADS                             :{WHITE}此市鎮不會自動興建道路。你可以到 [進階設定] -> [經濟] -> [市鎮] 中啟用 [市鎮可以興建道路] 選項。
+STR_ERROR_TOWN_EXPAND_WARN_NO_ROADS                             :{WHITE}此市鎮不會自動興建道路。你可以到 [進階設定] -> [環境] -> [市鎮] 中啟用 [市鎮可以興建道路] 選項。
 STR_ERROR_ROAD_WORKS_IN_PROGRESS                                :{WHITE}道路施工中
 STR_ERROR_TOWN_CAN_T_DELETE                                     :{WHITE}無法刪除此市鎮...{}市鎮範圍內還有車站或機廠或無法移除的區塊
 STR_ERROR_STATUE_NO_SUITABLE_PLACE                              :{WHITE}... 市中心沒有適合的空間建造雕像
@@ -4112,6 +4143,9 @@ STR_ERROR_FOREST_CAN_ONLY_BE_PLANTED                            :{WHITE}... 森�
 STR_ERROR_CAN_ONLY_BE_BUILT_ABOVE_SNOW_LINE                     :{WHITE}... 只能在雪線以上建造
 STR_ERROR_CAN_ONLY_BE_BUILT_BELOW_SNOW_LINE                     :{WHITE}... 只能在雪線以下建造
 
+STR_ERROR_NO_SUITABLE_PLACES_FOR_INDUSTRIES                     :{WHITE}無適當地點興建「{STRING}」工業
+STR_ERROR_NO_SUITABLE_PLACES_FOR_INDUSTRIES_EXPLANATION         :{WHITE}請更改參數以產生較佳的地圖
+
 # Station construction related errors
 STR_ERROR_CAN_T_BUILD_RAILROAD_STATION                          :{WHITE}無法在此興建火車站...
 STR_ERROR_CAN_T_BUILD_BUS_STATION                               :{WHITE}無法興建公車站...
@@ -4274,6 +4308,7 @@ STR_ERROR_YOU_ALREADY_OWN_IT                                    :{WHITE}... 您�
 STR_ERROR_GROUP_CAN_T_CREATE                                    :{WHITE}無法建立群組...
 STR_ERROR_GROUP_CAN_T_DELETE                                    :{WHITE}無法移除群組...
 STR_ERROR_GROUP_CAN_T_RENAME                                    :{WHITE}無法修改群組名稱...
+STR_ERROR_GROUP_CAN_T_SET_PARENT                                :{WHITE}無法指定母群組
 STR_ERROR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                       :{WHITE}無法從此群組移去所有運輸工具...
 STR_ERROR_GROUP_CAN_T_ADD_VEHICLE                               :{WHITE}無法加入該運輸工具到此群組...
 STR_ERROR_GROUP_CAN_T_ADD_SHARED_VEHICLE                        :{WHITE}無法加入共享指令的運輸工具到此群組...