(svn r2566) Rename COMMA{8,16,32} to just COMMA, because it's the same anyway
authortron
Thu, 14 Jul 2005 15:10:20 +0000
changeset 2057 ea22eec10527
parent 2056 82409767ec35
child 2058 f7bd32c8732e
(svn r2566) Rename COMMA{8,16,32} to just COMMA, because it's the same anyway
lang/american.txt
lang/brazilian_portuguese.txt
lang/catalan.txt
lang/czech.txt
lang/danish.txt
lang/dutch.txt
lang/english.txt
lang/finnish.txt
lang/french.txt
lang/galician.txt
lang/german.txt
lang/hungarian.txt
lang/icelandic.txt
lang/italian.txt
lang/latvian.txt
lang/lithuanian.txt
lang/norwegian.txt
lang/polish.txt
lang/portuguese.txt
lang/romanian.txt
lang/slovak.txt
lang/spanish.txt
lang/swedish.txt
strgen/strgen.c
strings.c
--- a/lang/american.txt	Thu Jul 14 09:53:52 2005 +0000
+++ b/lang/american.txt	Thu Jul 14 15:10:20 2005 +0000
@@ -82,69 +82,69 @@
 STR_004C_PLASTIC                                                :Plastic
 STR_004D_FIZZY_DRINK                                            :Fizzy Drink
 STR_004E                                                        :
-STR_004F_PASSENGER                                              :{COMMA16} passenger
-STR_0050_TON_OF_COAL                                            :{COMMA16} ton of coal
-STR_0051_BAG_OF_MAIL                                            :{COMMA16} bag of mail
+STR_004F_PASSENGER                                              :{COMMA} passenger
+STR_0050_TON_OF_COAL                                            :{COMMA} ton of coal
+STR_0051_BAG_OF_MAIL                                            :{COMMA} bag of mail
 STR_0052_OF_OIL                                                 :{VOLUME} of oil
-STR_0053_ITEM_OF_LIVESTOCK                                      :{COMMA16} item of livestock
-STR_0054_CRATE_OF_GOODS                                         :{COMMA16} crate of goods
-STR_0055_TON_OF_GRAIN                                           :{COMMA16} ton of grain
-STR_0056_TON_OF_WOOD                                            :{COMMA16} ton of wood
-STR_0057_TON_OF_IRON_ORE                                        :{COMMA16} ton of iron ore
-STR_0058_TON_OF_STEEL                                           :{COMMA16} ton of steel
-STR_0059_BAG_OF_VALUABLES                                       :{COMMA16} bag of valuables
-STR_005A_TON_OF_COPPER_ORE                                      :{COMMA16} ton of copper ore
-STR_005B_TON_OF_MAIZE                                           :{COMMA16} ton of maize
-STR_005C_TON_OF_FRUIT                                           :{COMMA16} ton of fruit
-STR_005D_BAG_OF_DIAMONDS                                        :{COMMA16} bag of diamonds
-STR_005E_TON_OF_FOOD                                            :{COMMA16} ton of food
-STR_005F_TON_OF_PAPER                                           :{COMMA16} ton of paper
-STR_0060_BAG_OF_GOLD                                            :{COMMA16} bag of gold
+STR_0053_ITEM_OF_LIVESTOCK                                      :{COMMA} item of livestock
+STR_0054_CRATE_OF_GOODS                                         :{COMMA} crate of goods
+STR_0055_TON_OF_GRAIN                                           :{COMMA} ton of grain
+STR_0056_TON_OF_WOOD                                            :{COMMA} ton of wood
+STR_0057_TON_OF_IRON_ORE                                        :{COMMA} ton of iron ore
+STR_0058_TON_OF_STEEL                                           :{COMMA} ton of steel
+STR_0059_BAG_OF_VALUABLES                                       :{COMMA} bag of valuables
+STR_005A_TON_OF_COPPER_ORE                                      :{COMMA} ton of copper ore
+STR_005B_TON_OF_MAIZE                                           :{COMMA} ton of maize
+STR_005C_TON_OF_FRUIT                                           :{COMMA} ton of fruit
+STR_005D_BAG_OF_DIAMONDS                                        :{COMMA} bag of diamonds
+STR_005E_TON_OF_FOOD                                            :{COMMA} ton of food
+STR_005F_TON_OF_PAPER                                           :{COMMA} ton of paper
+STR_0060_BAG_OF_GOLD                                            :{COMMA} bag of gold
 STR_0061_OF_WATER                                               :{VOLUME} of water
-STR_0062_TON_OF_WHEAT                                           :{COMMA16} ton of wheat
+STR_0062_TON_OF_WHEAT                                           :{COMMA} ton of wheat
 STR_0063_OF_RUBBER                                              :{VOLUME} of rubber
-STR_0064_TON_OF_SUGAR                                           :{COMMA16} ton of sugar
-STR_0065_TOY                                                    :{COMMA16} toy
-STR_0066_BAG_OF_CANDY                                           :{COMMA16} bag of candy
+STR_0064_TON_OF_SUGAR                                           :{COMMA} ton of sugar
+STR_0065_TOY                                                    :{COMMA} toy
+STR_0066_BAG_OF_CANDY                                           :{COMMA} bag of candy
 STR_0067_OF_COLA                                                :{VOLUME} of cola
-STR_0068_TON_OF_COTTON_CANDY                                    :{COMMA16} ton of cotton candy
-STR_0069_BUBBLE                                                 :{COMMA16} bubble
-STR_006A_TON_OF_TOFFEE                                          :{COMMA16} ton of toffee
-STR_006B_BATTERY                                                :{COMMA16} battery
+STR_0068_TON_OF_COTTON_CANDY                                    :{COMMA} ton of cotton candy
+STR_0069_BUBBLE                                                 :{COMMA} bubble
+STR_006A_TON_OF_TOFFEE                                          :{COMMA} ton of toffee
+STR_006B_BATTERY                                                :{COMMA} battery
 STR_006C_OF_PLASTIC                                             :{VOLUME} of plastic
-STR_006D_FIZZY_DRINK                                            :{COMMA16} fizzy drink
+STR_006D_FIZZY_DRINK                                            :{COMMA} fizzy drink
 STR_006E                                                        :
-STR_006F_PASSENGERS                                             :{COMMA16} passengers
-STR_0070_TONS_OF_COAL                                           :{COMMA16} tons of coal
-STR_0071_BAGS_OF_MAIL                                           :{COMMA16} bags of mail
+STR_006F_PASSENGERS                                             :{COMMA} passengers
+STR_0070_TONS_OF_COAL                                           :{COMMA} tons of coal
+STR_0071_BAGS_OF_MAIL                                           :{COMMA} bags of mail
 STR_0072_OF_OIL                                                 :{VOLUME} of oil
-STR_0073_ITEMS_OF_LIVESTOCK                                     :{COMMA16} items of livestock
-STR_0074_CRATES_OF_GOODS                                        :{COMMA16} crates of goods
-STR_0075_TONS_OF_GRAIN                                          :{COMMA16} tons of grain
-STR_0076_TONS_OF_WOOD                                           :{COMMA16} tons of wood
-STR_0077_TONS_OF_IRON_ORE                                       :{COMMA16} tons of iron ore
-STR_0078_TONS_OF_STEEL                                          :{COMMA16} tons of steel
-STR_0079_BAGS_OF_VALUABLES                                      :{COMMA16} bags of valuables
-STR_007A_TONS_OF_COPPER_ORE                                     :{COMMA16} tons of copper ore
-STR_007B_TONS_OF_MAIZE                                          :{COMMA16} tons of maize
-STR_007C_TONS_OF_FRUIT                                          :{COMMA16} tons of fruit
-STR_007D_BAGS_OF_DIAMONDS                                       :{COMMA16} bags of diamonds
-STR_007E_TONS_OF_FOOD                                           :{COMMA16} tons of food
-STR_007F_TONS_OF_PAPER                                          :{COMMA16} tons of paper
-STR_0080_BAGS_OF_GOLD                                           :{COMMA16} bags of gold
+STR_0073_ITEMS_OF_LIVESTOCK                                     :{COMMA} items of livestock
+STR_0074_CRATES_OF_GOODS                                        :{COMMA} crates of goods
+STR_0075_TONS_OF_GRAIN                                          :{COMMA} tons of grain
+STR_0076_TONS_OF_WOOD                                           :{COMMA} tons of wood
+STR_0077_TONS_OF_IRON_ORE                                       :{COMMA} tons of iron ore
+STR_0078_TONS_OF_STEEL                                          :{COMMA} tons of steel
+STR_0079_BAGS_OF_VALUABLES                                      :{COMMA} bags of valuables
+STR_007A_TONS_OF_COPPER_ORE                                     :{COMMA} tons of copper ore
+STR_007B_TONS_OF_MAIZE                                          :{COMMA} tons of maize
+STR_007C_TONS_OF_FRUIT                                          :{COMMA} tons of fruit
+STR_007D_BAGS_OF_DIAMONDS                                       :{COMMA} bags of diamonds
+STR_007E_TONS_OF_FOOD                                           :{COMMA} tons of food
+STR_007F_TONS_OF_PAPER                                          :{COMMA} tons of paper
+STR_0080_BAGS_OF_GOLD                                           :{COMMA} bags of gold
 STR_0081_OF_WATER                                               :{VOLUME} of water
-STR_0082_TONS_OF_WHEAT                                          :{COMMA16} tons of wheat
+STR_0082_TONS_OF_WHEAT                                          :{COMMA} tons of wheat
 STR_0083_OF_RUBBER                                              :{VOLUME} of rubber
-STR_0084_TONS_OF_SUGAR                                          :{COMMA16} tons of sugar
-STR_0085_TOYS                                                   :{COMMA16} toys
-STR_0086_BAGS_OF_CANDY                                          :{COMMA16} bags of candy
+STR_0084_TONS_OF_SUGAR                                          :{COMMA} tons of sugar
+STR_0085_TOYS                                                   :{COMMA} toys
+STR_0086_BAGS_OF_CANDY                                          :{COMMA} bags of candy
 STR_0087_OF_COLA                                                :{VOLUME} of cola
-STR_0088_TONS_OF_COTTON_CANDY                                   :{COMMA16} tons of cotton candy
-STR_0089_BUBBLES                                                :{COMMA16} bubbles
-STR_008A_TONS_OF_TOFFEE                                         :{COMMA16} tons of toffee
-STR_008B_BATTERIES                                              :{COMMA16} batteries
+STR_0088_TONS_OF_COTTON_CANDY                                   :{COMMA} tons of cotton candy
+STR_0089_BUBBLES                                                :{COMMA} bubbles
+STR_008A_TONS_OF_TOFFEE                                         :{COMMA} tons of toffee
+STR_008B_BATTERIES                                              :{COMMA} batteries
 STR_008C_OF_PLASTIC                                             :{VOLUME} of plastic
-STR_008D_FIZZY_DRINKS                                           :{COMMA16} fizzy drinks
+STR_008D_FIZZY_DRINKS                                           :{COMMA} fizzy drinks
 STR_008E                                                        :
 STR_008F_PS                                                     :{TINYFONT}PS
 STR_0090_CL                                                     :{TINYFONT}CL
@@ -219,8 +219,8 @@
 STR_00DF_GREY                                                   :Grey
 STR_00E0_WHITE                                                  :White
 STR_00E1_TOO_MANY_VEHICLES_IN_GAME                              :{WHITE}Too many vehicles in game
-STR_00E2                                                        :{BLACK}{COMMA16}
-STR_00E3                                                        :{RED}{COMMA16}
+STR_00E2                                                        :{BLACK}{COMMA}
+STR_00E3                                                        :{RED}{COMMA}
 STR_00E4_LOCATION                                               :{BLACK}Location
 STR_00E5_CONTOURS                                               :Contours
 STR_00E6_VEHICLES                                               :Vehicles
@@ -441,18 +441,18 @@
 STR_0198_PROFIT_THIS_YEAR_LAST_YEAR                             :{TINYFONT}{BLACK}Profit this year: {CURRENCY} (last year: {CURRENCY})
 
 ############ range for service numbers starts
-STR_0199_YEAR                                                   :{COMMA16} year ({COMMA16})
-STR_019A_YEARS                                                  :{COMMA16} years ({COMMA16})
-STR_019B_YEARS                                                  :{RED}{COMMA16} years ({COMMA16})
+STR_0199_YEAR                                                   :{COMMA} year ({COMMA})
+STR_019A_YEARS                                                  :{COMMA} years ({COMMA})
+STR_019B_YEARS                                                  :{RED}{COMMA} years ({COMMA})
 ############ range for service numbers ends
 
 STR_019C_ROAD_VEHICLE                                           :Road vehicle
 STR_019D_AIRCRAFT                                               :Aircraft
 STR_019E_SHIP                                                   :Ship
 STR_019F_TRAIN                                                  :Train
-STR_01A0_IS_GETTING_OLD                                         :{WHITE}{STRING} {COMMA16} is getting old
-STR_01A1_IS_GETTING_VERY_OLD                                    :{WHITE}{STRING} {COMMA16} is getting very old
-STR_01A2_IS_GETTING_VERY_OLD_AND                                :{WHITE}{STRING} {COMMA16} is getting very old and urgently needs replacing
+STR_01A0_IS_GETTING_OLD                                         :{WHITE}{STRING} {COMMA} is getting old
+STR_01A1_IS_GETTING_VERY_OLD                                    :{WHITE}{STRING} {COMMA} is getting very old
+STR_01A2_IS_GETTING_VERY_OLD_AND                                :{WHITE}{STRING} {COMMA} is getting very old and urgently needs replacing
 STR_01A3_LAND_AREA_INFORMATION                                  :{WHITE}Land Area Information
 STR_01A4_COST_TO_CLEAR_N_A                                      :{BLACK}Cost to clear: {LTBLUE}N/A
 STR_01A5_COST_TO_CLEAR                                          :{BLACK}Cost to clear: {LTBLUE}{CURRENCY}
@@ -497,7 +497,7 @@
 STR_01CA_31ST                                                   :31st
 ############ range for days	ends
 
-STR_01CB                                                        :{TINYFONT}{COMMA16}
+STR_01CB                                                        :{TINYFONT}{COMMA}
 STR_01CC_TOGGLE_LARGE_SMALL_MAP                                 :{BLACK}Toggle large/small map size
 STR_01CD_SELECT_TUTORIAL_DEMONSTRATION                          :{WHITE}Select Tutorial/Demonstration
 
@@ -509,7 +509,7 @@
 STR_CARGO_ACCEPTED_5                                            :{BLACK}Cargo accepted: {LTBLUE}{STRING}, {STRING}, {STRING}, {STRING}, {STRING}
 ############ range for cargo acecpted ends
 
-STR_01D1_8                                                      :({COMMA8}/8 {STRING})
+STR_01D1_8                                                      :({COMMA}/8 {STRING})
 STR_01D2_JAZZ_JUKEBOX                                           :{WHITE}Jazz Jukebox
 STR_01D3_SOUND_MUSIC                                            :Sound/music
 STR_01D4_SHOW_SOUND_MUSIC_WINDOW                                :{BLACK}Show sound/music window
@@ -528,16 +528,16 @@
 STR_01E1_START_PLAYING_MUSIC                                    :{BLACK}Start playing music
 STR_01E2_DRAG_SLIDERS_TO_SET_MUSIC                              :{BLACK}Drag sliders to set music and sound effect volumes
 STR_01E3                                                        :{DKGREEN}{TINYFONT}--
-STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA8}
-STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA8}
+STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA}
+STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA}
 STR_01E6                                                        :{DKGREEN}{TINYFONT}------
 STR_01E7                                                        :{DKGREEN}{TINYFONT}"{STRING}"
 STR_01E8_TRACK_XTITLE                                           :{BLACK}{TINYFONT}Track{SETX 88}Title
 STR_01E9_SHUFFLE                                                :{TINYFONT}Shuffle
 STR_01EA_PROGRAM                                                :{TINYFONT}{BLACK}Program
 STR_01EB_MUSIC_PROGRAM_SELECTION                                :{WHITE}Music Program Selection
-STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA16} "{STRING}"
-STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA16}   "{STRING}"
+STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} "{STRING}"
+STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA}   "{STRING}"
 STR_01EE_TRACK_INDEX                                            :{TINYFONT}{BLACK}Track Index
 STR_01EF_PROGRAM                                                :{TINYFONT}{BLACK}Program - '{STRING}'
 STR_01F0_CLEAR                                                  :{TINYFONT}{BLACK}Clear
@@ -577,7 +577,7 @@
 STR_0210_TOO_FAR_FROM_PREVIOUS_DESTINATIO                       :{WHITE}...too far from previous destination
 STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Top companies who reached {NUMU16}{}({STRING} Level)
 STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Company League Table in {NUMU16}
-STR_0212                                                        :{BIGFONT}{COMMA16}.
+STR_0212                                                        :{BIGFONT}{COMMA}.
 STR_0213_BUSINESSMAN                                            :Businessman
 STR_0214_ENTREPRENEUR                                           :Entrepreneur
 STR_0215_INDUSTRIALIST                                          :Industrialist
@@ -586,12 +586,12 @@
 STR_0218_MOGUL                                                  :Mogul
 STR_0219_TYCOON_OF_THE_CENTURY                                  :Tycoon of the Century
 STR_HIGHSCORE_NAME                                              :{BIGFONT}{STRING}, {STRING}
-STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA16})
+STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA})
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{STRING} achieves '{STRING}' status!
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{STRING} of {STRING} achieves '{STRING}' status!
 STR_021D                                                        :{BLACK}
 STR_021E                                                        :{WHITE}
-STR_021F                                                        :{BLUE}{COMMA16}
+STR_021F                                                        :{BLUE}{COMMA}
 STR_0220_CREATE_SCENARIO                                        :{BLACK}Create Scenario
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Scenario Editor
@@ -786,8 +786,8 @@
 STR_EXTRA_VIEW_PORT                                             :Extra viewport
 STR_SIGN_LIST                                                   :Sign list
 STR_02DF_TOWN_DIRECTORY                                         :Town directory
-STR_TOWN_POPULATION                                             :{BLACK}World population: {COMMA32}
-STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Viewport {COMMA16}
+STR_TOWN_POPULATION                                             :{BLACK}World population: {COMMA}
+STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Viewport {COMMA}
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN                                :{BLACK}Copy to viewport
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT                             :{BLACK}Copy the location of the global view to this viewport
 STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW                                :{BLACK}Paste from viewport
@@ -959,34 +959,34 @@
 STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Can't copy order list...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - End of Shared Orders - -
 
-STR_TRAIN_IS_LOST                                               :{WHITE}Train {COMMA16} is lost.
-STR_TRAIN_IS_UNPROFITABLE                                       :{WHITE}Train {COMMA16}'s profit last year was {CURRENCY}
+STR_TRAIN_IS_LOST                                               :{WHITE}Train {COMMA} is lost.
+STR_TRAIN_IS_UNPROFITABLE                                       :{WHITE}Train {COMMA}'s profit last year was {CURRENCY}
 STR_EURO_INTRODUCE                                              :{BLACK}{BIGFONT}European Monetary Union!{}{}The Euro is introduced as the sole currency for everyday transactions in your country!
 
 # Start of order review system.
 # DON'T ADD OR REMOVE LINES HERE
-STR_TRAIN_HAS_TOO_FEW_ORDERS                                    :{WHITE}Train {COMMA16} has too few orders in the schedule
-STR_TRAIN_HAS_VOID_ORDER                                        :{WHITE}Train {COMMA16} has a void order
-STR_TRAIN_HAS_DUPLICATE_ENTRY                                   :{WHITE}Train {COMMA16} has duplicate orders
-STR_TRAIN_HAS_INVALID_ENTRY                                     :{WHITE}Train {COMMA16} has an invalid station in the orders
-STR_ROADVEHICLE_HAS_TOO_FEW_ORDERS                              :{WHITE}Road Vehicle {COMMA16} has too few orders in the schedule
-STR_ROADVEHICLE_HAS_VOID_ORDER                                  :{WHITE}Road Vehicle {COMMA16} has void order
-STR_ROADVEHICLE_HAS_DUPLICATE_ENTRY                             :{WHITE}Road Vehicle {COMMA16} has duplicate orders
-STR_ROADVEHICLE_HAS_INVALID_ENTRY                               :{WHITE}Road Vehicle {COMMA16} has an invalid station in the orders
-STR_SHIP_HAS_TOO_FEW_ORDERS                                     :{WHITE}Ship {COMMA16} has too few orders in the schedule
-STR_SHIP_HAS_VOID_ORDER                                         :{WHITE}Ship {COMMA16} has void order
-STR_SHIP_HAS_DUPLICATE_ENTRY                                    :{WHITE}Ship {COMMA16} has duplicate orders
-STR_SHIP_HAS_INVALID_ENTRY                                      :{WHITE}Ship {COMMA16} has an invalid station in the orders
-STR_AIRCRAFT_HAS_TOO_FEW_ORDERS                                 :{WHITE}Aircraft {COMMA16} has too few orders in the schedule
-STR_AIRCRAFT_HAS_VOID_ORDER                                     :{WHITE}Aircraft {COMMA16} has void order
-STR_AIRCRAFT_HAS_DUPLICATE_ENTRY                                :{WHITE}Aircraft {COMMA16} has duplicate orders
-STR_AIRCRAFT_HAS_INVALID_ENTRY                                  :{WHITE}Aircraft {COMMA16} has an invalid station in the orders
+STR_TRAIN_HAS_TOO_FEW_ORDERS                                    :{WHITE}Train {COMMA} has too few orders in the schedule
+STR_TRAIN_HAS_VOID_ORDER                                        :{WHITE}Train {COMMA} has a void order
+STR_TRAIN_HAS_DUPLICATE_ENTRY                                   :{WHITE}Train {COMMA} has duplicate orders
+STR_TRAIN_HAS_INVALID_ENTRY                                     :{WHITE}Train {COMMA} has an invalid station in the orders
+STR_ROADVEHICLE_HAS_TOO_FEW_ORDERS                              :{WHITE}Road Vehicle {COMMA} has too few orders in the schedule
+STR_ROADVEHICLE_HAS_VOID_ORDER                                  :{WHITE}Road Vehicle {COMMA} has void order
+STR_ROADVEHICLE_HAS_DUPLICATE_ENTRY                             :{WHITE}Road Vehicle {COMMA} has duplicate orders
+STR_ROADVEHICLE_HAS_INVALID_ENTRY                               :{WHITE}Road Vehicle {COMMA} has an invalid station in the orders
+STR_SHIP_HAS_TOO_FEW_ORDERS                                     :{WHITE}Ship {COMMA} has too few orders in the schedule
+STR_SHIP_HAS_VOID_ORDER                                         :{WHITE}Ship {COMMA} has void order
+STR_SHIP_HAS_DUPLICATE_ENTRY                                    :{WHITE}Ship {COMMA} has duplicate orders
+STR_SHIP_HAS_INVALID_ENTRY                                      :{WHITE}Ship {COMMA} has an invalid station in the orders
+STR_AIRCRAFT_HAS_TOO_FEW_ORDERS                                 :{WHITE}Aircraft {COMMA} has too few orders in the schedule
+STR_AIRCRAFT_HAS_VOID_ORDER                                     :{WHITE}Aircraft {COMMA} has void order
+STR_AIRCRAFT_HAS_DUPLICATE_ENTRY                                :{WHITE}Aircraft {COMMA} has duplicate orders
+STR_AIRCRAFT_HAS_INVALID_ENTRY                                  :{WHITE}Aircraft {COMMA} has an invalid station in the orders
 # end of order system
 
-STR_TRAIN_AUTORENEW_FAILED                                      :{WHITE}Autorenew failed on train {COMMA16} (money limit)
-STR_ROADVEHICLE_AUTORENEW_FAILED                                :{WHITE}Autorenew failed on road vehicle {COMMA16} (money limit)
-STR_SHIP_AUTORENEW_FAILED                                       :{WHITE}Autorenew failed on ship {COMMA16} (money limit)
-STR_AIRCRAFT_AUTORENEW_FAILED                                   :{WHITE}Autorenew failed on aircraft {COMMA16} (money limit)
+STR_TRAIN_AUTORENEW_FAILED                                      :{WHITE}Autorenew failed on train {COMMA} (money limit)
+STR_ROADVEHICLE_AUTORENEW_FAILED                                :{WHITE}Autorenew failed on road vehicle {COMMA} (money limit)
+STR_SHIP_AUTORENEW_FAILED                                       :{WHITE}Autorenew failed on ship {COMMA} (money limit)
+STR_AIRCRAFT_AUTORENEW_FAILED                                   :{WHITE}Autorenew failed on aircraft {COMMA} (money limit)
 
 STR_CONFIG_PATCHES                                              :{BLACK}Configure Patches
 STR_CONFIG_PATCHES_TIP                                          :{BLACK}Configure the patches
@@ -1101,7 +1101,7 @@
 STR_CHEATS_TIP                                                  :{BLACK}Checkboxes indicate if you have used this cheat before
 STR_CHEATS_WARNING                                              :{BLACK}Warning! You are about to betray your fellow competitors. Keep in mind that such a disgrace will be remembered for eternity.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Increase money by {CURRENCY64}
-STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Playing as player: {ORANGE}{COMMA16}
+STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Playing as player: {ORANGE}{COMMA}
 STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Magic bulldozer (remove industries, unmovables): {ORANGE}{STRING}
 STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Tunnels may cross each other: {ORANGE}{STRING}
 STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Build while in pause mode: {ORANGE}{STRING}
@@ -1117,7 +1117,7 @@
 STR_GO_NON_STOP_TO_WAYPOINT                                     :Go non-stop via {WAYPOINT}
 
 STR_WAYPOINTNAME_CITY                                           :Waypoint {TOWN}
-STR_WAYPOINTNAME_CITY_SERIAL                                    :Waypoint {TOWN} #{COMMA16}
+STR_WAYPOINTNAME_CITY_SERIAL                                    :Waypoint {TOWN} #{COMMA}
 STR_LANDINFO_WAYPOINT                                           :Waypoint
 
 STR_WAYPOINT                                                    :{WHITE}Waypoint
@@ -1200,8 +1200,8 @@
 STR_CONSTRUCT_SUGAR_MINE_TIP                                    :{BLACK}Construct Sugar Mine
 
 STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Industries
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}){YELLOW} ({COMMA16}% transported)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}/{STRING}){YELLOW} ({COMMA16}%/{COMMA16}% transported)
+STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}){YELLOW} ({COMMA}% transported)
+STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}/{STRING}){YELLOW} ({COMMA}%/{COMMA}% transported)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{TOWN} {STRING}
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...too close to another industry
@@ -1241,15 +1241,15 @@
 STR_NETWORK_ADD_SERVER_TIP                                      :{BLACK}Adds a server to the list which will always be checked for running games.
 STR_NETWORK_ENTER_IP                                            :{BLACK}Enter the IP address of the server
 
-STR_NETWORK_CLIENTS_ONLINE                                      :{BLACK}{COMMA16}/{COMMA16}
+STR_NETWORK_CLIENTS_ONLINE                                      :{BLACK}{COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Clients
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Clients online / clients max
 STR_NETWORK_GAME_INFO                                           :{SILVER}GAME INFO
 STR_ORANGE                                                      :{ORANGE}{STRING}
-STR_NETWORK_CLIENTS                                             :{SILVER}Clients:  {WHITE}{COMMA8} / {COMMA8}
+STR_NETWORK_CLIENTS                                             :{SILVER}Clients:  {WHITE}{COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}Language:  {WHITE}{STRING}
 STR_NETWORK_TILESET                                             :{SILVER}Tileset:  {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Map size:  {WHITE}{COMMA16}x{COMMA16}
+STR_NETWORK_MAP_SIZE                                            :{SILVER}Map size:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Server version:  {WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Server address:  {WHITE}{STRING} : {NUMU16}
 STR_NETWORK_START_DATE                                          :{SILVER}Start date:  {WHITE}{DATE_SHORT}
@@ -1511,21 +1511,21 @@
 
 ##id 0x2000
 STR_2000_TOWNS                                                  :{WHITE}Towns
-STR_TOWN_LABEL_POP                                              :{WHITE}{STRING} ({COMMA32})
+STR_TOWN_LABEL_POP                                              :{WHITE}{STRING} ({COMMA})
 STR_2001                                                        :{WHITE}{STRING}
 STR_2002                                                        :{TINYFONT}{BLACK}{STRING}
 STR_2003                                                        :{TINYFONT}{WHITE}{STRING}
 STR_2004_BUILDING_MUST_BE_DEMOLISHED                            :{WHITE}Building must be demolished first
 STR_2005                                                        :{WHITE}{TOWN}
-STR_2006_POPULATION                                             :{BLACK}Population: {ORANGE}{COMMA32}{BLACK}  Houses: {ORANGE}{COMMA32}
+STR_2006_POPULATION                                             :{BLACK}Population: {ORANGE}{COMMA}{BLACK}  Houses: {ORANGE}{COMMA}
 STR_2007_RENAME_TOWN                                            :Rename Town
 STR_2008_CAN_T_RENAME_TOWN                                      :{WHITE}Can't rename town...
 STR_2009_LOCAL_AUTHORITY_REFUSES                                :{WHITE}{TOWN} local authority refuses to allow this
 STR_200A_TOWN_NAMES_CLICK_ON_NAME                               :{BLACK}Town names - click on name to center main view on town
 STR_200B_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Center the main view on town location
 STR_200C_CHANGE_TOWN_NAME                                       :{BLACK}Change town name
-STR_200D_PASSENGERS_LAST_MONTH_MAX                              :{BLACK}Passengers last month: {ORANGE}{COMMA32}{BLACK}  max: {ORANGE}{COMMA32}
-STR_200E_MAIL_LAST_MONTH_MAX                                    :{BLACK}Mail last month: {ORANGE}{COMMA32}{BLACK}  max: {ORANGE}{COMMA32}
+STR_200D_PASSENGERS_LAST_MONTH_MAX                              :{BLACK}Passengers last month: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
+STR_200E_MAIL_LAST_MONTH_MAX                                    :{BLACK}Mail last month: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
 STR_200F_TALL_OFFICE_BLOCK                                      :Tall office block
 STR_2010_OFFICE_BLOCK                                           :Office block
 STR_2011_SMALL_BLOCK_OF_FLATS                                   :Small block of apartments
@@ -1599,7 +1599,7 @@
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Bribe the local authority to increase your rating, at the risk of a severe penalty if caught.{}  Cost: {CURRENCY}
 STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Traffic chaos in {TOWN}!{}{}Road rebuilding programme funded by {STRING} brings 6 months of misery to motorists!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
-STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA32})
+STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA})
 STR_2058_UNDER_CONSTRUCTION                                     :{STRING} (under construction)
 STR_2059_IGLOO                                                  :Igloo
 STR_205A_TEPEES                                                 :Tepees
@@ -1661,7 +1661,7 @@
 STR_303C_OUTSTANDING                                            :Outstanding
 ############ range for rating ends
 
-STR_303D                                                        :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA8}%)
+STR_303D                                                        :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_303E_NO_LONGER_ACCEPTS                                      :{WHITE}{STATION} no longer accepts {STRING}
 STR_303F_NO_LONGER_ACCEPTS_OR                                   :{WHITE}{STATION} no longer accepts {STRING} or {STRING}
 STR_3040_NOW_ACCEPTS                                            :{WHITE}{STATION} now accepts {STRING}
@@ -1672,7 +1672,7 @@
 STR_3045_TOO_CLOSE_TO_ANOTHER_TRUCK                             :{WHITE}Too close to another truck station
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Must demolish bus station first
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Must demolish truck station first
-STR_3048_STATIONS                                               :{WHITE}{STRING} - {COMMA16} Stations
+STR_3048_STATIONS                                               :{WHITE}{STRING} - {COMMA} Stations
 STR_3049_0                                                      :{YELLOW}{STATION} {STRINL 0x30D1}
 STR_304A_NONE                                                   :{YELLOW}- None -
 STR_304B_SITE_UNSUITABLE                                        :{WHITE}...site unsuitable
@@ -1728,7 +1728,7 @@
 STR_4002_SAVE                                                   :{BLACK}Save
 STR_4003_DELETE                                                 :{BLACK}Delete
 STR_4004                                                        :{STRING}, {DATE_LONG}
-STR_4005_BYTES_FREE                                             :{BLACK}{COMMA32} megabytes free
+STR_4005_BYTES_FREE                                             :{BLACK}{COMMA} megabytes free
 STR_4006_UNABLE_TO_READ_DRIVE                                   :{BLACK}Unable to read drive
 STR_4007_GAME_SAVE_FAILED                                       :{WHITE}Game Save Failed
 STR_4008_UNABLE_TO_DELETE_FILE                                  :{WHITE}Unable to delete file
@@ -1789,7 +1789,7 @@
 ############ range for requires	ends
 
 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Production last month:
-STR_482B_TRANSPORTED                                            :{YELLOW}{STRING}{BLACK} ({COMMA16}% transported)
+STR_482B_TRANSPORTED                                            :{YELLOW}{STRING}{BLACK} ({COMMA}% transported)
 STR_482C_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Center the main view on industry location
 STR_482D_NEW_UNDER_CONSTRUCTION                                 :{BLACK}{BIGFONT}New {STRING} under construction near {TOWN}!
 STR_482E_NEW_BEING_PLANTED_NEAR                                 :{BLACK}{BIGFONT}New {STRING} being planted near {TOWN}!
@@ -1806,8 +1806,8 @@
 STR_4839_PRODUCTION_DOWN_BY_50                                  :{BLACK}{BIGFONT}{TOWN} {STRING} production down by 50%
 STR_483A_INSECT_INFESTATION_CAUSES                              :{BLACK}{BIGFONT}Insect infestation causes havoc at {TOWN} {STRING}!{}Production down by 50%
 STR_483B_CAN_ONLY_BE_POSITIONED                                 :{WHITE}...can only be positioned near edges of map
-STR_INDUSTRY_PROD_GOUP                                          :{BLACK}{BIGFONT}{STRING} production at {TOWN} {STRING} goes up by {COMMA16}%!
-STR_INDUSTRY_PROD_GODOWN                                        :{BLACK}{BIGFONT}{STRING} production at {TOWN} {STRING} goes down by {COMMA16}%!
+STR_INDUSTRY_PROD_GOUP                                          :{BLACK}{BIGFONT}{STRING} production at {TOWN} {STRING} goes up by {COMMA}%!
+STR_INDUSTRY_PROD_GODOWN                                        :{BLACK}{BIGFONT}{STRING} production at {TOWN} {STRING} goes down by {COMMA}%!
 
 ##id 0x5000
 STR_5000_TRAIN_IN_TUNNEL                                        :{WHITE}Train in tunnel
@@ -1870,10 +1870,10 @@
 ##id 0x6000
 STR_SV_EMPTY                                                    :
 STR_SV_UNNAMED                                                  :Unnamed{SKIP}
-STR_SV_TRAIN_NAME                                               :Train {COMMA16}
-STR_SV_ROADVEH_NAME                                             :Road Vehicle {COMMA16}
-STR_SV_SHIP_NAME                                                :Ship {COMMA16}
-STR_SV_AIRCRAFT_NAME                                            :Aircraft {COMMA16}
+STR_SV_TRAIN_NAME                                               :Train {COMMA}
+STR_SV_ROADVEH_NAME                                             :Road Vehicle {COMMA}
+STR_SV_SHIP_NAME                                                :Ship {COMMA}
+STR_SV_AIRCRAFT_NAME                                            :Aircraft {COMMA}
 
 STR_SV_STNAME                                                   :{STRING}
 STR_SV_STNAME_NORTH                                             :{STRING} North
@@ -1923,12 +1923,12 @@
 ############ range for difficulty levels ends
 
 ############ range for difficulty settings starts
-STR_6805_MAXIMUM_NO_COMPETITORS                                 :{LTBLUE}Maximum no. competitors: {ORANGE}{COMMA16}
+STR_6805_MAXIMUM_NO_COMPETITORS                                 :{LTBLUE}Maximum no. competitors: {ORANGE}{COMMA}
 STR_6806_COMPETITOR_START_TIME                                  :{LTBLUE}Competitor start time: {ORANGE}{STRING}
 STR_6807_NO_OF_TOWNS                                            :{LTBLUE}No. of towns: {ORANGE}{STRING}
 STR_6808_NO_OF_INDUSTRIES                                       :{LTBLUE}No. of industries: {ORANGE}{STRING}
 STR_6809_MAXIMUM_INITIAL_LOAN_000                               :{LTBLUE}Maximum initial loan: {ORANGE}{CURRENCY}
-STR_680A_INITIAL_INTEREST_RATE                                  :{LTBLUE}Initial interest rate: {ORANGE}{COMMA16}%
+STR_680A_INITIAL_INTEREST_RATE                                  :{LTBLUE}Initial interest rate: {ORANGE}{COMMA}%
 STR_680B_VEHICLE_RUNNING_COSTS                                  :{LTBLUE}Vehicle running costs: {ORANGE}{STRING}
 STR_680C_CONSTRUCTION_SPEED_OF_COMPETITOR                       :{LTBLUE}Construction speed of competitors: {ORANGE}{STRING}
 STR_680D_INTELLIGENCE_OF_COMPETITORS                            :{LTBLUE}Intelligence of competitors: {ORANGE}{STRING}
@@ -1987,7 +1987,7 @@
 ##id 0x7000
 STR_7000                                                        :
 STR_7001                                                        :{WHITE}{STRING} {BLACK}{STRING}
-STR_7002_PLAYER                                                 :(Player {COMMA16})
+STR_7002_PLAYER                                                 :(Player {COMMA})
 STR_7004_NEW_FACE                                               :{BLACK}New Face
 STR_7005_COLOR_SCHEME                                           :{BLACK}Color Scheme
 STR_7006_COLOR_SCHEME                                           :{GOLD}Color Scheme:
@@ -2021,7 +2021,7 @@
 STR_7022_INCOME_GRAPH                                           :{WHITE}Income Graph
 STR_CURRCOMPACT32                                               :{CURRCOMPACT}
 STR_CURRCOMPACT64                                               :{CURRCOMPACT64}
-STR_7024                                                        :{COMMA32}
+STR_7024                                                        :{COMMA}
 STR_7025_OPERATING_PROFIT_GRAPH                                 :{WHITE}Operating Profit Graph
 STR_7026_BANK_BALANCE                                           :{WHITE}Bank Balance
 STR_7027_LOAN                                                   :{WHITE}Loan
@@ -2045,14 +2045,14 @@
 STR_7037_PRESIDENT                                              :{WHITE}{STRING}{}{GOLD}(President)
 STR_7038_INAUGURATED                                            :{GOLD}Inaugurated: {WHITE}{NUMU16}
 STR_7039_VEHICLES                                               :{GOLD}Vehicles:
-STR_703A_TRAIN                                                  :{WHITE}{COMMA16} train
-STR_703B_TRAINS                                                 :{WHITE}{COMMA16} trains
-STR_703C_ROAD_VEHICLE                                           :{WHITE}{COMMA16} road vehicle
-STR_703D_ROAD_VEHICLES                                          :{WHITE}{COMMA16} road vehicles
-STR_703E_AIRCRAFT                                               :{WHITE}{COMMA16} aircraft
-STR_703F_AIRCRAFT                                               :{WHITE}{COMMA16} aircraft
-STR_7040_SHIP                                                   :{WHITE}{COMMA16} ship
-STR_7041_SHIPS                                                  :{WHITE}{COMMA16} ships
+STR_703A_TRAIN                                                  :{WHITE}{COMMA} train
+STR_703B_TRAINS                                                 :{WHITE}{COMMA} trains
+STR_703C_ROAD_VEHICLE                                           :{WHITE}{COMMA} road vehicle
+STR_703D_ROAD_VEHICLES                                          :{WHITE}{COMMA} road vehicles
+STR_703E_AIRCRAFT                                               :{WHITE}{COMMA} aircraft
+STR_703F_AIRCRAFT                                               :{WHITE}{COMMA} aircraft
+STR_7040_SHIP                                                   :{WHITE}{COMMA} ship
+STR_7041_SHIPS                                                  :{WHITE}{COMMA} ships
 STR_7042_NONE                                                   :{WHITE}None
 STR_7043_FACE_SELECTION                                         :{WHITE}Face Selection
 STR_7044_MALE                                                   :{BLACK}Male
@@ -2117,8 +2117,8 @@
 STR_707A_SELL_25_SHARE_IN_THIS_COMPANY                          :{BLACK}Sell 25% share in this company
 STR_707B_CAN_T_BUY_25_SHARE_IN_THIS                             :{WHITE}Can't buy 25% share in this company...
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}Can't sell 25% share in this company...
-STR_707D_OWNED_BY                                               :{WHITE}({COMMA16}% owned by {STRING})
-STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA16}% owned by {STRING}{}   {COMMA16}% owned by {STRING})
+STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% owned by {STRING})
+STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}% owned by {STRING}{}   {COMMA}% owned by {STRING})
 STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{STRING} has been taken over by {STRING}!
 STR_7080_PROTECTED                                              :{WHITE}This company does not trade shares yet...
 
@@ -2393,8 +2393,8 @@
 STR_8801_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Citizens celebrate . . .{}First train arrives at {STATION}!
 STR_8802_DETAILS                                                :{WHITE}{STRING} (Details)
 STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}Train in the way
-STR_8804                                                        :{SETX 10}{COMMA8}: {STRING}
-STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA8}: {STRING}
+STR_8804                                                        :{SETX 10}{COMMA}: {STRING}
+STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING}
 STR_8806_GO_TO                                                  :Go to {STATION}
 STR_SERVICE_AT_TRAIN_DEPOT                                      :Service at {TOWN} Train Depot
 STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT                             :Go non-stop to {TOWN} Train Depot
@@ -2408,13 +2408,13 @@
 STR_UNKNOWN_DESTINATION                                         :unknown destination
 STR_8812_EMPTY                                                  :{LTBLUE}Empty
 STR_8813_FROM                                                   :{LTBLUE}{CARGO} from {STATION}
-STR_8814_TRAIN_IS_WAITING_IN_DEPOT                              :{WHITE}Train {COMMA16} is waiting in depot
+STR_8814_TRAIN_IS_WAITING_IN_DEPOT                              :{WHITE}Train {COMMA} is waiting in depot
 STR_8815_NEW_VEHICLES                                           :{BLACK}New Vehicles
 STR_8816                                                        :{BLACK}-
 STR_8818_INFORMATION                                            :{BLACK}Information
 STR_8819_TRAIN_TOO_LONG                                         :{WHITE}Train too long
 STR_881A_TRAINS_CAN_ONLY_BE_ALTERED                             :{WHITE}Trains can only be altered when stopped inside a depot
-STR_881B_TRAINS                                                 :{WHITE}{STRING} - {COMMA16} Trains
+STR_881B_TRAINS                                                 :{WHITE}{STRING} - {COMMA} Trains
 STR_881C_NEW_RAIL_VEHICLES                                      :{WHITE}New Rail Vehicles
 STR_881D_NEW_MONORAIL_VEHICLES                                  :{WHITE}New Monorail Vehicles
 STR_881E_NEW_MAGLEV_VEHICLES                                    :{WHITE}New Maglev Vehicles
@@ -2448,8 +2448,8 @@
 STR_8839_CAN_T_SELL_RAILROAD_VEHICLE                            :{WHITE}Can't sell railroad vehicle...
 STR_883A_UNABLE_TO_FIND_ROUTE_TO                                :{WHITE}Unable to find route to local depot
 STR_883B_CAN_T_STOP_START_TRAIN                                 :{WHITE}Can't stop/start train...
-STR_883C_SERVICING_INTERVAL_DAYS                                :{BLACK}Servicing interval: {LTBLUE}{COMMA16}days{BLACK}   Last service: {LTBLUE}{DATE_LONG}
-STR_SERVICING_INTERVAL_PERCENT                                  :{BLACK}Servicing interval: {LTBLUE}{COMMA16}%{BLACK}   Last service: {LTBLUE}{DATE_LONG}
+STR_883C_SERVICING_INTERVAL_DAYS                                :{BLACK}Servicing interval: {LTBLUE}{COMMA}days{BLACK}   Last service: {LTBLUE}{DATE_LONG}
+STR_SERVICING_INTERVAL_PERCENT                                  :{BLACK}Servicing interval: {LTBLUE}{COMMA}%{BLACK}   Last service: {LTBLUE}{DATE_LONG}
 STR_883D_TRAINS_CLICK_ON_TRAIN_FOR                              :{BLACK}Trains - click on train for information
 STR_883E_BUILD_NEW_TRAINS_REQUIRES                              :{BLACK}Build new trains (requires train depot)
 STR_883F_TRAINS_CLICK_ON_TRAIN_FOR                              :{BLACK}Trains - click on train for info., drag vehicle to add/remove from train
@@ -2482,12 +2482,12 @@
 STR_SERVICE_HINT                                                :{BLACK}Skip this order unless a service is needed
 STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}New {STRING} now available!
 STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
-STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Cost: {CURRENCY} Weight: {COMMA16}t{}Speed: {VELOCITY}  Power: {COMMA16}hp{}Running Cost: {CURRENCY}/yr{}Capacity: {STRING}
+STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Cost: {CURRENCY} Weight: {COMMA}t{}Speed: {VELOCITY}  Power: {COMMA}hp{}Running Cost: {CURRENCY}/yr{}Capacity: {STRING}
 STR_885C_BROKEN_DOWN                                            :{RED}Broken down
 STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Age: {LTBLUE}{STRING}{BLACK}   Running Cost: {LTBLUE}{CURRENCY}/yr
-STR_885E_WEIGHT_T_POWER_HP_MAX_SPEED                            :{BLACK}Weight: {LTBLUE}{COMMA16}t  {BLACK}Power: {LTBLUE}{COMMA32}hp{BLACK} Max. speed: {LTBLUE}{VELOCITY}
+STR_885E_WEIGHT_T_POWER_HP_MAX_SPEED                            :{BLACK}Weight: {LTBLUE}{COMMA}t  {BLACK}Power: {LTBLUE}{COMMA}hp{BLACK} Max. speed: {LTBLUE}{VELOCITY}
 STR_885F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Profit this year: {LTBLUE}{CURRENCY}  (last year: {CURRENCY})
-STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Reliability: {LTBLUE}{COMMA8}%  {BLACK}Breakdowns since last service: {LTBLUE}{COMMA16}
+STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Reliability: {LTBLUE}{COMMA}%  {BLACK}Breakdowns since last service: {LTBLUE}{COMMA}
 STR_8861_STOPPED                                                :{RED}Stopped
 STR_8862_CAN_T_MAKE_TRAIN_PASS_SIGNAL                           :{WHITE}Can't make train pass signal at danger...
 STR_8863_CRASHED                                                :{RED}Crashed!
@@ -2495,7 +2495,7 @@
 STR_8865_NAME_TRAIN                                             :{WHITE}Name train
 STR_8866_CAN_T_NAME_TRAIN                                       :{WHITE}Can't name train...
 STR_8867_NAME_TRAIN                                             :{BLACK}Name train
-STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Train Crash!{}{COMMA16} die in fireball after collision
+STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Train Crash!{}{COMMA} die in fireball after collision
 STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}Can't reverse direction of train...
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Rename train vehicle type
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Can't rename train vehicle type...
@@ -2505,7 +2505,7 @@
 
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Road vehicle in the way
-STR_9001_ROAD_VEHICLES                                          :{WHITE}{STRING} - {COMMA16} Road Vehicles
+STR_9001_ROAD_VEHICLES                                          :{WHITE}{STRING} - {COMMA} Road Vehicles
 STR_9002                                                        :{WHITE}{STRING}
 STR_9003_ROAD_VEHICLE_DEPOT                                     :{WHITE}{TOWN} Road Vehicle Depot
 STR_9004_NEW_VEHICLES                                           :{BLACK}New Vehicles
@@ -2519,13 +2519,13 @@
 STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Age: {LTBLUE}{STRING}{BLACK}   Running Cost: {LTBLUE}{CURRENCY}/yr
 STR_900E_MAX_SPEED                                              :{BLACK}Max. speed: {LTBLUE}{VELOCITY}
 STR_900F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Profit this year: {LTBLUE}{CURRENCY}  (last year: {CURRENCY})
-STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Reliability: {LTBLUE}{COMMA8}%  {BLACK}Breakdowns since last service: {LTBLUE}{COMMA16}
+STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Reliability: {LTBLUE}{COMMA}%  {BLACK}Breakdowns since last service: {LTBLUE}{COMMA}
 STR_9011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Built: {LTBLUE}{NUMU16}{BLACK} Value: {LTBLUE}{CURRENCY}
 STR_9012_CAPACITY                                               :{BLACK}Capacity: {LTBLUE}{STRING}
 STR_9013_MUST_BE_STOPPED_INSIDE                                 :{WHITE}...must be stopped inside a road vehicle depot
 STR_9014_CAN_T_SELL_ROAD_VEHICLE                                :{WHITE}Can't sell road vehicle...
 STR_9015_CAN_T_STOP_START_ROAD_VEHICLE                          :{WHITE}Can't stop/start road vehicle...
-STR_9016_ROAD_VEHICLE_IS_WAITING                                :{WHITE}Road Vehicle {COMMA16} is waiting in depot
+STR_9016_ROAD_VEHICLE_IS_WAITING                                :{WHITE}Road Vehicle {COMMA} is waiting in depot
 STR_HEADING_FOR_ROAD_DEPOT                                      :{LTBLUE}Heading for {TOWN} Road Depot
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{LTBLUE}Heading for {TOWN} Road Depot, {VELOCITY}
 STR_9018_CAN_T_SEND_VEHICLE_TO_DEPOT                            :{WHITE}Can't send vehicle to depot...
@@ -2554,7 +2554,7 @@
 STR_902F_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Citizens celebrate . . .{}First bus arrives at {STATION}!
 STR_9030_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Citizens celebrate . . .{}First truck arrives at {STATION}!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Road Vehicle Crash!{}Driver dies in fireball after collision with train
-STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Road Vehicle Crash!{}{COMMA16} die in fireball after collision with train
+STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Road Vehicle Crash!{}{COMMA} die in fireball after collision with train
 STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}Can't make vehicle turn around...
 STR_9034_RENAME                                                 :{BLACK}Rename
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Rename road vehicle type
@@ -2569,7 +2569,7 @@
 STR_9802_CAN_T_BUILD_DOCK_HERE                                  :{WHITE}Can't build dock here...
 STR_9803_SHIP_DEPOT                                             :{WHITE}{TOWN} Ship Depot
 STR_9804_NEW_SHIPS                                              :{BLACK}New Ships
-STR_9805_SHIPS                                                  :{WHITE}{STRING} - {COMMA16} Ships
+STR_9805_SHIPS                                                  :{WHITE}{STRING} - {COMMA} Ships
 STR_9806_CAN_T_BUILD_SHIPS                                      :{WHITE}Can't build ships...
 STR_9807_MUST_BUILD_SHIP_DEPOT_FIRST                            :{WHITE}Must build ship depot first
 STR_9808_NEW_SHIPS                                              :{WHITE}New Ships
@@ -2584,7 +2584,7 @@
 STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Age: {LTBLUE}{STRING}{BLACK}   Running Cost: {LTBLUE}{CURRENCY}/yr
 STR_9813_MAX_SPEED                                              :{BLACK}Max. speed: {LTBLUE}{VELOCITY}
 STR_9814_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Profit this year: {LTBLUE}{CURRENCY}  (last year: {CURRENCY})
-STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Reliability: {LTBLUE}{COMMA8}%  {BLACK}Breakdowns since last service: {LTBLUE}{COMMA16}
+STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Reliability: {LTBLUE}{COMMA}%  {BLACK}Breakdowns since last service: {LTBLUE}{COMMA}
 STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Built: {LTBLUE}{NUMU16}{BLACK} Value: {LTBLUE}{CURRENCY}
 STR_9817_CAPACITY                                               :{BLACK}Capacity: {LTBLUE}{STRING}
 STR_9818_CAN_T_STOP_START_SHIP                                  :{WHITE}Can't stop/start ship...
@@ -2592,7 +2592,7 @@
 STR_981A_UNABLE_TO_FIND_LOCAL_DEPOT                             :{WHITE}Unable to find local depot
 STR_HEADING_FOR_SHIP_DEPOT                                      :{LTBLUE}Heading for {TOWN} Ship Depot
 STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{LTBLUE}Heading for {TOWN} Ship Depot, {VELOCITY}
-STR_981C_SHIP_IS_WAITING_IN_DEPOT                               :{WHITE}Ship {COMMA16} is waiting in depot
+STR_981C_SHIP_IS_WAITING_IN_DEPOT                               :{WHITE}Ship {COMMA} is waiting in depot
 STR_981D_BUILD_SHIP_DOCK                                        :{BLACK}Build ship dock
 STR_981E_BUILD_SHIP_DEPOT_FOR_BUILDING                          :{BLACK}Build ship depot (for building and servicing ships)
 STR_981F_SHIPS_CLICK_ON_SHIP_FOR                                :{BLACK}Ships - click on ship for information
@@ -2643,19 +2643,19 @@
 STR_A005_NEW_AIRCRAFT                                           :{WHITE}New Aircraft
 STR_A006_BUILD_AIRCRAFT                                         :{BLACK}Build Aircraft
 STR_A008_CAN_T_BUILD_AIRCRAFT                                   :{WHITE}Can't build aircraft...
-STR_A009_AIRCRAFT                                               :{WHITE}{STRING} - {COMMA16} Aircraft
+STR_A009_AIRCRAFT                                               :{WHITE}{STRING} - {COMMA} Aircraft
 STR_A00A                                                        :{WHITE}{STRING}
 STR_A00B_ORDERS                                                 :{WHITE}{STRING} (Orders)
 STR_A00C_DETAILS                                                :{WHITE}{STRING} (Details)
 STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Age: {LTBLUE}{STRING}{BLACK}   Running Cost: {LTBLUE}{CURRENCY}/yr
 STR_A00E_MAX_SPEED                                              :{BLACK}Max. speed: {LTBLUE}{VELOCITY}
 STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Profit this year: {LTBLUE}{CURRENCY}  (last year: {CURRENCY})
-STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Reliability: {LTBLUE}{COMMA8}%  {BLACK}Breakdowns since last service: {LTBLUE}{COMMA16}
+STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Reliability: {LTBLUE}{COMMA}%  {BLACK}Breakdowns since last service: {LTBLUE}{COMMA}
 STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Built: {LTBLUE}{NUMU16}{BLACK} Value: {LTBLUE}{CURRENCY}
 STR_A012_CAN_T_SEND_AIRCRAFT_TO                                 :{WHITE}Can't send aircraft to hangar...
 STR_HEADING_FOR_HANGAR                                          :{LTBLUE}Heading for {STATION} Hangar
 STR_HEADING_FOR_HANGAR_VEL                                      :{LTBLUE}Heading for {STATION} Hangar, {VELOCITY}
-STR_A014_AIRCRAFT_IS_WAITING_IN                                 :{WHITE}Aircraft {COMMA16} is waiting in the aircraft hangar
+STR_A014_AIRCRAFT_IS_WAITING_IN                                 :{WHITE}Aircraft {COMMA} is waiting in the aircraft hangar
 STR_A015_AIRCRAFT_IN_THE_WAY                                    :{WHITE}Aircraft in the way
 STR_A016_CAN_T_STOP_START_AIRCRAFT                              :{WHITE}Can't stop/start aircraft...
 STR_A017_AIRCRAFT_IS_IN_FLIGHT                                  :{WHITE}Aircraft is in flight
@@ -2681,14 +2681,14 @@
 STR_A02B_SHOW_AIRCRAFT_DETAILS                                  :{BLACK}Show aircraft details
 STR_A02C_NEW_AIRCRAFT_NOW_AVAILABLE                             :{BLACK}{BIGFONT}New aircraft now available!
 STR_A02D                                                        :{BLACK}{BIGFONT}{STRING}
-STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Cost: {CURRENCY} Max. Speed: {VELOCITY}{}Capacity: {COMMA16} passengers, {COMMA16} bags of mail{}Running Cost: {CURRENCY}/yr
+STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Cost: {CURRENCY} Max. Speed: {VELOCITY}{}Capacity: {COMMA} passengers, {COMMA} bags of mail{}Running Cost: {CURRENCY}/yr
 
 STR_A030_NAME_AIRCRAFT                                          :{WHITE}Name aircraft
 STR_A031_CAN_T_NAME_AIRCRAFT                                    :{WHITE}Can't name aircraft...
 STR_A032_NAME_AIRCRAFT                                          :{BLACK}Name aircraft
 STR_A033_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Citizens celebrate . . .{}First aircraft arrives at {STATION}!
-STR_A034_PLANE_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Plane Crash!{}{COMMA16} die in fireball at {STATION}
-STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Plane Crash!{}Aircraft ran out of fuel, {COMMA16} die in fireball!
+STR_A034_PLANE_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Plane Crash!{}{COMMA} die in fireball at {STATION}
+STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Plane Crash!{}Aircraft ran out of fuel, {COMMA} die in fireball!
 STR_A035_DESTINATIONS                                           :{TINYFONT}{BLACK}Destinations:
 STR_A036                                                        :{TINYFONT}{BLACK}{STATION}
 STR_A037_RENAME                                                 :{BLACK}Rename
@@ -2714,7 +2714,7 @@
 STR_B003_FACTORY_DESTROYED_IN_SUSPICIOUS                        :{BLACK}{BIGFONT}Factory destroyed in suspicious circumstances near {TOWN}!
 STR_B004_UFO_LANDS_NEAR                                         :{BLACK}{BIGFONT}'UFO' lands near {TOWN}!
 STR_B005_COAL_MINE_SUBSIDENCE_LEAVES                            :{BLACK}{BIGFONT}Coal mine subsidence leaves trail of destruction near {TOWN}!
-STR_B006_FLOOD_VEHICLE_DESTROYED                                :{BLACK}{BIGFONT}Floods!{}At least {COMMA16} presumed missing or dead after deadly floods!
+STR_B006_FLOOD_VEHICLE_DESTROYED                                :{BLACK}{BIGFONT}Floods!{}At least {COMMA} presumed missing or dead after deadly floods!
 
 STR_BRIBE_FAILED                                                :{WHITE}Your attempted bribery has been
 STR_BRIBE_FAILED_2                                              :{WHITE}discovered by a regional investigator
@@ -2724,7 +2724,7 @@
 STR_PERFORMANCE_DETAIL                                          :{WHITE}Detail performance rating
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Detail
 STR_PERFORMANCE_DETAIL_AMOUNT_CURRENCY                          :{BLACK}({CURRCOMPACT}/{CURRCOMPACT})
-STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA32}/{COMMA32})
+STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA}/{COMMA})
 STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{INT32}%
 SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{INT32}
 ############ Those following lines need to be in this order!!
@@ -2759,7 +2759,7 @@
 STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID:
 
 STR_CURRENCY_WINDOW                                             :{WHITE}Custom currency
-STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Exchange rate: {ORANGE}{CURRENCY} = {POUNDSIGN} {COMMA16}
+STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Exchange rate: {ORANGE}{CURRENCY} = {POUNDSIGN} {COMMA}
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Separator:
 STR_CURRENCY_PREFIX                                             :{LTBLUE}Prefix:
 STR_CURRENCY_SUFFIX                                             :{LTBLUE}Suffix:
@@ -2773,10 +2773,10 @@
 STR_PLANE                                                       :{BLACK}{PLANE}
 STR_SHIP                                                        :{BLACK}{SHIP}
 
-STR_SCHEDULED_TRAINS                                            :{WHITE}{STATION} - {COMMA16} Trains
-STR_SCHEDULED_ROAD_VEHICLES                                     :{WHITE}{STATION} - {COMMA16} Road Vehicles
-STR_SCHEDULED_AIRCRAFT                                          :{WHITE}{STATION} - {COMMA16} Aircraft
-STR_SCHEDULED_SHIPS                                             :{WHITE}{STATION} - {COMMA16} Ships
+STR_SCHEDULED_TRAINS                                            :{WHITE}{STATION} - {COMMA} Trains
+STR_SCHEDULED_ROAD_VEHICLES                                     :{WHITE}{STATION} - {COMMA} Road Vehicles
+STR_SCHEDULED_AIRCRAFT                                          :{WHITE}{STATION} - {COMMA} Aircraft
+STR_SCHEDULED_SHIPS                                             :{WHITE}{STATION} - {COMMA} Ships
 
 STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Show all trains which have this station on their schedule
 STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Show all road vehicles which have this station on their schedule
@@ -2798,7 +2798,7 @@
 STR_REPLACE_HELP                                                :{BLACK}This allows you to replace one engine type with another type, when trains of the original type enter a depot
 
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
-STR_SIGN_LIST_CAPTION                                           :{WHITE}Sign List - {COMMA16} Signs
+STR_SIGN_LIST_CAPTION                                           :{WHITE}Sign List - {COMMA} Signs
 
 ############ Lists rail types
 
@@ -2808,16 +2808,16 @@
 
 ############ End of list of rail types
 
-STR_TINY_BLACK                                                  :{BLACK}{TINYFONT}{COMMA16}
+STR_TINY_BLACK                                                  :{BLACK}{TINYFONT}{COMMA}
 
-STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Cost: {GOLD}{CURRENCY}{BLACK} Weight: {GOLD}{COMMA16}t
-STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Speed: {GOLD}{VELOCITY}{BLACK}   Power: {GOLD}{COMMA32}hp
+STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Cost: {GOLD}{CURRENCY}{BLACK} Weight: {GOLD}{COMMA}t
+STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Speed: {GOLD}{VELOCITY}{BLACK}   Power: {GOLD}{COMMA}hp
 STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}Running Cost: {GOLD}{CURRENCY}/yr
 STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Capacity: {GOLD}{STRING} {STRING}
-STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Designed: {GOLD}{NUMU16}{BLACK} Life: {GOLD}{COMMA16} years
-STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Max. Reliability: {GOLD}{COMMA8}%
+STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Designed: {GOLD}{NUMU16}{BLACK} Life: {GOLD}{COMMA} years
+STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Max. Reliability: {GOLD}{COMMA}%
 STR_PURCHASE_INFO_COST                                          :{BLACK}Cost: {GOLD}{CURRENCY}
-STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Weight: {GOLD}{COMMA16}t  ({COMMA16}t)
+STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Weight: {GOLD}{COMMA}t  ({COMMA}t)
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Cost: {GOLD}{CURRENCY}{BLACK} Speed: {GOLD}{VELOCITY}
-STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Capacity: {GOLD}{COMMA16} passengers, {COMMA16} bags of mail
-STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Powered Wagons: {GOLD}+{COMMA16}hp{BLACK} Weight: {GOLD}+{COMMA8}t
+STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Capacity: {GOLD}{COMMA} passengers, {COMMA} bags of mail
+STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Powered Wagons: {GOLD}+{COMMA}hp{BLACK} Weight: {GOLD}+{COMMA}t
--- a/lang/brazilian_portuguese.txt	Thu Jul 14 09:53:52 2005 +0000
+++ b/lang/brazilian_portuguese.txt	Thu Jul 14 15:10:20 2005 +0000
@@ -82,69 +82,69 @@
 STR_004C_PLASTIC                                                :Plástico
 STR_004D_FIZZY_DRINK                                            :Bebidas Gasosas
 STR_004E                                                        :
-STR_004F_PASSENGER                                              :{COMMA16} passageiro
-STR_0050_TON_OF_COAL                                            :{COMMA16} tonelada de carvão
-STR_0051_BAG_OF_MAIL                                            :{COMMA16} saco de correspondências
+STR_004F_PASSENGER                                              :{COMMA} passageiro
+STR_0050_TON_OF_COAL                                            :{COMMA} tonelada de carvão
+STR_0051_BAG_OF_MAIL                                            :{COMMA} saco de correspondências
 STR_0052_OF_OIL                                                 :{VOLUME} de petróleo
-STR_0053_ITEM_OF_LIVESTOCK                                      :{COMMA16} insumo de gado
-STR_0054_CRATE_OF_GOODS                                         :{COMMA16} caixas de bens
-STR_0055_TON_OF_GRAIN                                           :{COMMA16} tonelada de cereais
-STR_0056_TON_OF_WOOD                                            :{COMMA16} tonelada de madeira
-STR_0057_TON_OF_IRON_ORE                                        :{COMMA16} tonelada de minério de ferro
-STR_0058_TON_OF_STEEL                                           :{COMMA16} tonelada de aço
-STR_0059_BAG_OF_VALUABLES                                       :{COMMA16} saco de valores
-STR_005A_TON_OF_COPPER_ORE                                      :{COMMA16} tonelada de minério de cobre
-STR_005B_TON_OF_MAIZE                                           :{COMMA16} tonelada de milho
-STR_005C_TON_OF_FRUIT                                           :{COMMA16} tonelada de fruta
-STR_005D_BAG_OF_DIAMONDS                                        :{COMMA16} saco de diamantes
-STR_005E_TON_OF_FOOD                                            :{COMMA16} tonelada de comida
-STR_005F_TON_OF_PAPER                                           :{COMMA16} tonelada de papel
-STR_0060_BAG_OF_GOLD                                            :{COMMA16} saco de ouro
+STR_0053_ITEM_OF_LIVESTOCK                                      :{COMMA} insumo de gado
+STR_0054_CRATE_OF_GOODS                                         :{COMMA} caixas de bens
+STR_0055_TON_OF_GRAIN                                           :{COMMA} tonelada de cereais
+STR_0056_TON_OF_WOOD                                            :{COMMA} tonelada de madeira
+STR_0057_TON_OF_IRON_ORE                                        :{COMMA} tonelada de minério de ferro
+STR_0058_TON_OF_STEEL                                           :{COMMA} tonelada de aço
+STR_0059_BAG_OF_VALUABLES                                       :{COMMA} saco de valores
+STR_005A_TON_OF_COPPER_ORE                                      :{COMMA} tonelada de minério de cobre
+STR_005B_TON_OF_MAIZE                                           :{COMMA} tonelada de milho
+STR_005C_TON_OF_FRUIT                                           :{COMMA} tonelada de fruta
+STR_005D_BAG_OF_DIAMONDS                                        :{COMMA} saco de diamantes
+STR_005E_TON_OF_FOOD                                            :{COMMA} tonelada de comida
+STR_005F_TON_OF_PAPER                                           :{COMMA} tonelada de papel
+STR_0060_BAG_OF_GOLD                                            :{COMMA} saco de ouro
 STR_0061_OF_WATER                                               :{VOLUME} de água
-STR_0062_TON_OF_WHEAT                                           :{COMMA16} tonelada de trigo
+STR_0062_TON_OF_WHEAT                                           :{COMMA} tonelada de trigo
 STR_0063_OF_RUBBER                                              :{VOLUME} de borracha
-STR_0064_TON_OF_SUGAR                                           :{COMMA16} tonelada de açúcar
-STR_0065_TOY                                                    :{COMMA16} brinquedo
-STR_0066_BAG_OF_CANDY                                           :{COMMA16} saco de doces
+STR_0064_TON_OF_SUGAR                                           :{COMMA} tonelada de açúcar
+STR_0065_TOY                                                    :{COMMA} brinquedo
+STR_0066_BAG_OF_CANDY                                           :{COMMA} saco de doces
 STR_0067_OF_COLA                                                :{VOLUME} de cola
-STR_0068_TON_OF_COTTON_CANDY                                    :{COMMA16} tonelada de algodão doce
-STR_0069_BUBBLE                                                 :{COMMA16} bolha
-STR_006A_TON_OF_TOFFEE                                          :{COMMA16} tonelada de caramelo
-STR_006B_BATTERY                                                :{COMMA16} bateria
+STR_0068_TON_OF_COTTON_CANDY                                    :{COMMA} tonelada de algodão doce
+STR_0069_BUBBLE                                                 :{COMMA} bolha
+STR_006A_TON_OF_TOFFEE                                          :{COMMA} tonelada de caramelo
+STR_006B_BATTERY                                                :{COMMA} bateria
 STR_006C_OF_PLASTIC                                             :{VOLUME} de plástico
-STR_006D_FIZZY_DRINK                                            :{COMMA16} Bebida Gasosa
+STR_006D_FIZZY_DRINK                                            :{COMMA} Bebida Gasosa
 STR_006E                                                        :
-STR_006F_PASSENGERS                                             :{COMMA16} passageiros
-STR_0070_TONS_OF_COAL                                           :{COMMA16} toneladas de carvão
-STR_0071_BAGS_OF_MAIL                                           :{COMMA16} sacos de correspondência
+STR_006F_PASSENGERS                                             :{COMMA} passageiros
+STR_0070_TONS_OF_COAL                                           :{COMMA} toneladas de carvão
+STR_0071_BAGS_OF_MAIL                                           :{COMMA} sacos de correspondência
 STR_0072_OF_OIL                                                 :{VOLUME} de petróleo
-STR_0073_ITEMS_OF_LIVESTOCK                                     :{COMMA16} insumos de gado
-STR_0074_CRATES_OF_GOODS                                        :{COMMA16} caixas de bens
-STR_0075_TONS_OF_GRAIN                                          :{COMMA16} toneladas de cereais
-STR_0076_TONS_OF_WOOD                                           :{COMMA16} toneladas de madeira
-STR_0077_TONS_OF_IRON_ORE                                       :{COMMA16} toneladas de minério de ferro
-STR_0078_TONS_OF_STEEL                                          :{COMMA16} toneladas de aço
-STR_0079_BAGS_OF_VALUABLES                                      :{COMMA16} sacos de valores
-STR_007A_TONS_OF_COPPER_ORE                                     :{COMMA16} toneladas de minério de cobre
-STR_007B_TONS_OF_MAIZE                                          :{COMMA16} toneladas de milho
-STR_007C_TONS_OF_FRUIT                                          :{COMMA16} toneladas de fruta
-STR_007D_BAGS_OF_DIAMONDS                                       :{COMMA16} sacos de diamantes
-STR_007E_TONS_OF_FOOD                                           :{COMMA16} toneladas de comida
-STR_007F_TONS_OF_PAPER                                          :{COMMA16} toneladas de papel
-STR_0080_BAGS_OF_GOLD                                           :{COMMA16} sacos de ouro
+STR_0073_ITEMS_OF_LIVESTOCK                                     :{COMMA} insumos de gado
+STR_0074_CRATES_OF_GOODS                                        :{COMMA} caixas de bens
+STR_0075_TONS_OF_GRAIN                                          :{COMMA} toneladas de cereais
+STR_0076_TONS_OF_WOOD                                           :{COMMA} toneladas de madeira
+STR_0077_TONS_OF_IRON_ORE                                       :{COMMA} toneladas de minério de ferro
+STR_0078_TONS_OF_STEEL                                          :{COMMA} toneladas de aço
+STR_0079_BAGS_OF_VALUABLES                                      :{COMMA} sacos de valores
+STR_007A_TONS_OF_COPPER_ORE                                     :{COMMA} toneladas de minério de cobre
+STR_007B_TONS_OF_MAIZE                                          :{COMMA} toneladas de milho
+STR_007C_TONS_OF_FRUIT                                          :{COMMA} toneladas de fruta
+STR_007D_BAGS_OF_DIAMONDS                                       :{COMMA} sacos de diamantes
+STR_007E_TONS_OF_FOOD                                           :{COMMA} toneladas de comida
+STR_007F_TONS_OF_PAPER                                          :{COMMA} toneladas de papel
+STR_0080_BAGS_OF_GOLD                                           :{COMMA} sacos de ouro
 STR_0081_OF_WATER                                               :{VOLUME} de água
-STR_0082_TONS_OF_WHEAT                                          :{COMMA16} toneladas de trigo
+STR_0082_TONS_OF_WHEAT                                          :{COMMA} toneladas de trigo
 STR_0083_OF_RUBBER                                              :{VOLUME} de borracha
-STR_0084_TONS_OF_SUGAR                                          :{COMMA16} toneladas de açúcar
-STR_0085_TOYS                                                   :{COMMA16} brinquedos
-STR_0086_BAGS_OF_CANDY                                          :{COMMA16} sacos de doces
+STR_0084_TONS_OF_SUGAR                                          :{COMMA} toneladas de açúcar
+STR_0085_TOYS                                                   :{COMMA} brinquedos
+STR_0086_BAGS_OF_CANDY                                          :{COMMA} sacos de doces
 STR_0087_OF_COLA                                                :{VOLUME} de cola
-STR_0088_TONS_OF_COTTON_CANDY                                   :{COMMA16} toneladas de algodão doce
-STR_0089_BUBBLES                                                :{COMMA16} bolhas
-STR_008A_TONS_OF_TOFFEE                                         :{COMMA16} toneladas de caramelo
-STR_008B_BATTERIES                                              :{COMMA16} baterias
+STR_0088_TONS_OF_COTTON_CANDY                                   :{COMMA} toneladas de algodão doce
+STR_0089_BUBBLES                                                :{COMMA} bolhas
+STR_008A_TONS_OF_TOFFEE                                         :{COMMA} toneladas de caramelo
+STR_008B_BATTERIES                                              :{COMMA} baterias
 STR_008C_OF_PLASTIC                                             :{VOLUME} de plástico
-STR_008D_FIZZY_DRINKS                                           :{COMMA16} bebidas gasosas
+STR_008D_FIZZY_DRINKS                                           :{COMMA} bebidas gasosas
 STR_008E                                                        :
 STR_008F_PS                                                     :{TINYFONT}PS
 STR_0090_CL                                                     :{TINYFONT}CL
@@ -219,8 +219,8 @@
 STR_00DF_GREY                                                   :Cinza
 STR_00E0_WHITE                                                  :Branco
 STR_00E1_TOO_MANY_VEHICLES_IN_GAME                              :{WHITE}Existem muitos veículos em jogo
-STR_00E2                                                        :{BLACK}{COMMA16}
-STR_00E3                                                        :{RED}{COMMA16}
+STR_00E2                                                        :{BLACK}{COMMA}
+STR_00E3                                                        :{RED}{COMMA}
 STR_00E4_LOCATION                                               :{BLACK}Localização
 STR_00E5_CONTOURS                                               :Contornos
 STR_00E6_VEHICLES                                               :Veículos
@@ -441,18 +441,18 @@
 STR_0198_PROFIT_THIS_YEAR_LAST_YEAR                             :{TINYFONT}{BLACK}Lucro deste ano: {CURRENCY} (ano passado: {CURRENCY})
 
 ############ range for service numbers starts
-STR_0199_YEAR                                                   :{COMMA16} ano ({COMMA16})
-STR_019A_YEARS                                                  :{COMMA16} anos ({COMMA16})
-STR_019B_YEARS                                                  :{RED}{COMMA16} anos ({COMMA16})
+STR_0199_YEAR                                                   :{COMMA} ano ({COMMA})
+STR_019A_YEARS                                                  :{COMMA} anos ({COMMA})
+STR_019B_YEARS                                                  :{RED}{COMMA} anos ({COMMA})
 ############ range for service numbers ends
 
 STR_019C_ROAD_VEHICLE                                           :Veículo de estrada
 STR_019D_AIRCRAFT                                               :Aeronave
 STR_019E_SHIP                                                   :Barco
 STR_019F_TRAIN                                                  :Trem
-STR_01A0_IS_GETTING_OLD                                         :{WHITE}{STRING} {COMMA16} está a ficando velho
-STR_01A1_IS_GETTING_VERY_OLD                                    :{WHITE}{STRING} {COMMA16} está ficando muito velho
-STR_01A2_IS_GETTING_VERY_OLD_AND                                :{WHITE}{STRING} {COMMA16} está ficando muito velho e necessita ser substituído urgentemente
+STR_01A0_IS_GETTING_OLD                                         :{WHITE}{STRING} {COMMA} está a ficando velho
+STR_01A1_IS_GETTING_VERY_OLD                                    :{WHITE}{STRING} {COMMA} está ficando muito velho
+STR_01A2_IS_GETTING_VERY_OLD_AND                                :{WHITE}{STRING} {COMMA} está ficando muito velho e necessita ser substituído urgentemente
 STR_01A3_LAND_AREA_INFORMATION                                  :{WHITE}Informações do Terreno
 STR_01A4_COST_TO_CLEAR_N_A                                      :{BLACK}Custo para limpar: {LTBLUE}N/D
 STR_01A5_COST_TO_CLEAR                                          :{BLACK}Custo para limpar: {LTBLUE}{CURRENCY}
@@ -497,7 +497,7 @@
 STR_01CA_31ST                                                   :31
 ############ range for days	ends
 
-STR_01CB                                                        :{TINYFONT}{COMMA16}
+STR_01CB                                                        :{TINYFONT}{COMMA}
 STR_01CC_TOGGLE_LARGE_SMALL_MAP                                 :{BLACK}Mostrar mapa grande/pequeno
 STR_01CD_SELECT_TUTORIAL_DEMONSTRATION                          :{WHITE}Selecionar Tutorial/Demonstração
 
@@ -509,7 +509,7 @@
 STR_CARGO_ACCEPTED_5                                            :{BLACK}Carga aceita: {LTBLUE}{STRING}, {STRING}, {STRING}, {STRING}, {STRING}
 ############ range for cargo acecpted ends
 
-STR_01D1_8                                                      :({COMMA8}/8 {STRING})
+STR_01D1_8                                                      :({COMMA}/8 {STRING})
 STR_01D2_JAZZ_JUKEBOX                                           :{WHITE}Jazz Jukebox
 STR_01D3_SOUND_MUSIC                                            :Som/música
 STR_01D4_SHOW_SOUND_MUSIC_WINDOW                                :{BLACK}Mostrar janela som/música
@@ -528,16 +528,16 @@
 STR_01E1_START_PLAYING_MUSIC                                    :{BLACK}Iniciar reprodução de música
 STR_01E2_DRAG_SLIDERS_TO_SET_MUSIC                              :{BLACK}Arraste os cursores para ajustar o volume da música e efeitos sonoros
 STR_01E3                                                        :{DKGREEN}{TINYFONT}--
-STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA8}
-STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA8}
+STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA}
+STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA}
 STR_01E6                                                        :{DKGREEN}{TINYFONT}------
 STR_01E7                                                        :{DKGREEN}{TINYFONT}'{STRING}'
 STR_01E8_TRACK_XTITLE                                           :{BLACK}{TINYFONT}Faixa{SETX 88}Título
 STR_01E9_SHUFFLE                                                :{TINYFONT}Embaralhar
 STR_01EA_PROGRAM                                                :{TINYFONT}{BLACK}Programa
 STR_01EB_MUSIC_PROGRAM_SELECTION                                :{WHITE}Programação Musical
-STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA16} '{STRING}'
-STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA16}   '{STRING}'
+STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} '{STRING}'
+STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA}   '{STRING}'
 STR_01EE_TRACK_INDEX                                            :{TINYFONT}{BLACK}Índice de faixas
 STR_01EF_PROGRAM                                                :{TINYFONT}{BLACK}Programa - '{STRING}'
 STR_01F0_CLEAR                                                  :{TINYFONT}{BLACK}Limpar
@@ -577,7 +577,7 @@
 STR_0210_TOO_FAR_FROM_PREVIOUS_DESTINATIO                       :{WHITE}...Muito distante do destino anterior
 STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Top de companhias que chegaram a {NUMU16}{}({STRING} Nivél)
 STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Tabela da Liga de Companhias em {NUMU16}
-STR_0212                                                        :{BIGFONT}{COMMA16}.
+STR_0212                                                        :{BIGFONT}{COMMA}.
 STR_0213_BUSINESSMAN                                            :Negociante
 STR_0214_ENTREPRENEUR                                           :Empresário
 STR_0215_INDUSTRIALIST                                          :Industrial
@@ -586,12 +586,12 @@
 STR_0218_MOGUL                                                  :Grande magnata
 STR_0219_TYCOON_OF_THE_CENTURY                                  :Magnata do século
 STR_HIGHSCORE_NAME                                              :{BIGFONT}{STRING}, {STRING}
-STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA16})
+STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA})
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{STRING} conquista '{STRING}' desempenho!
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{STRING} de {STRING} conquista '{STRING}' desempenho!
 STR_021D                                                        :{BLACK}
 STR_021E                                                        :{WHITE}
-STR_021F                                                        :{BLUE}{COMMA16}
+STR_021F                                                        :{BLUE}{COMMA}
 STR_0220_CREATE_SCENARIO                                        :{BLACK}Criar Cenário
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Editor de Cenário
@@ -788,8 +788,8 @@
 STR_EXTRA_VIEW_PORT                                             :Visualizador extra
 STR_SIGN_LIST                                                   :Lista de sinais
 STR_02DF_TOWN_DIRECTORY                                         :Lista de cidades
-STR_TOWN_POPULATION                                             :{BLACK}População Mundial: {COMMA32}
-STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Visualizador {COMMA16}
+STR_TOWN_POPULATION                                             :{BLACK}População Mundial: {COMMA}
+STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Visualizador {COMMA}
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN                                :{BLACK}Copiar para o visualizador
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT                             :{BLACK}Copiar a localização do visualizador global para este visualizador
 STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW                                :{BLACK}Colar do visualizador
@@ -961,34 +961,34 @@
 STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Não é possível copiar a lista de ordens...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Fim de Ordens Compartilhadas - -
 
-STR_TRAIN_IS_LOST                                               :{WHITE}O trem {COMMA16} está perdido.
-STR_TRAIN_IS_UNPROFITABLE                                       :{WHITE}O lucro do trem {COMMA16} no último ano foi de {CURRENCY}
+STR_TRAIN_IS_LOST                                               :{WHITE}O trem {COMMA} está perdido.
+STR_TRAIN_IS_UNPROFITABLE                                       :{WHITE}O lucro do trem {COMMA} no último ano foi de {CURRENCY}
 STR_EURO_INTRODUCE                                              :{BLACK}{BIGFONT}União Monetária Europeia!{}{}O Euro é introduzido como moeda única para todas as transações no seu país!
 
 # Start of order review system.
 # DON'T ADD OR REMOVE LINES HERE
-STR_TRAIN_HAS_TOO_FEW_ORDERS                                    :{WHITE}O trem {COMMA16} tem muito poucas ordens definidas
-STR_TRAIN_HAS_VOID_ORDER                                        :{WHITE}O trem {COMMA16} tem uma ordem inválida
-STR_TRAIN_HAS_DUPLICATE_ENTRY                                   :{WHITE}O trem {COMMA16} tem ordens duplicadas
-STR_TRAIN_HAS_INVALID_ENTRY                                     :{WHITE}O trem {COMMA16} tem uma estação inválida nas suas ordens
-STR_ROADVEHICLE_HAS_TOO_FEW_ORDERS                              :{WHITE}O veículo de estrada {COMMA16} tem muito poucas ordens definidas
-STR_ROADVEHICLE_HAS_VOID_ORDER                                  :{WHITE}O veículo de estrada {COMMA16} tem uma ordem inválida
-STR_ROADVEHICLE_HAS_DUPLICATE_ENTRY                             :{WHITE}O veículo de estrada {COMMA16} tem ordens duplicadas
-STR_ROADVEHICLE_HAS_INVALID_ENTRY                               :{WHITE}O veículo de estrada {COMMA16} tem uma estação inválida nas suas ordens
-STR_SHIP_HAS_TOO_FEW_ORDERS                                     :{WHITE}O barco {COMMA16} tem muito poucas ordens definidas
-STR_SHIP_HAS_VOID_ORDER                                         :{WHITE}O barco {COMMA16} tem uma ordem inválida
-STR_SHIP_HAS_DUPLICATE_ENTRY                                    :{WHITE}O barco {COMMA16} tem ordens duplicadas
-STR_SHIP_HAS_INVALID_ENTRY                                      :{WHITE}O barco {COMMA16} tem uma estação inválida nas suas ordens
-STR_AIRCRAFT_HAS_TOO_FEW_ORDERS                                 :{WHITE}A aeronave {COMMA16} tem muito poucas ordens definidas
-STR_AIRCRAFT_HAS_VOID_ORDER                                     :{WHITE}A aeronave {COMMA16} tem uma ordem inválida
-STR_AIRCRAFT_HAS_DUPLICATE_ENTRY                                :{WHITE}A aeronave {COMMA16} tem ordens duplicadas
-STR_AIRCRAFT_HAS_INVALID_ENTRY                                  :{WHITE}A aeronave {COMMA16} tem uma estação inválida nas suas ordens
+STR_TRAIN_HAS_TOO_FEW_ORDERS                                    :{WHITE}O trem {COMMA} tem muito poucas ordens definidas
+STR_TRAIN_HAS_VOID_ORDER                                        :{WHITE}O trem {COMMA} tem uma ordem inválida
+STR_TRAIN_HAS_DUPLICATE_ENTRY                                   :{WHITE}O trem {COMMA} tem ordens duplicadas
+STR_TRAIN_HAS_INVALID_ENTRY                                     :{WHITE}O trem {COMMA} tem uma estação inválida nas suas ordens
+STR_ROADVEHICLE_HAS_TOO_FEW_ORDERS                              :{WHITE}O veículo de estrada {COMMA} tem muito poucas ordens definidas
+STR_ROADVEHICLE_HAS_VOID_ORDER                                  :{WHITE}O veículo de estrada {COMMA} tem uma ordem inválida
+STR_ROADVEHICLE_HAS_DUPLICATE_ENTRY                             :{WHITE}O veículo de estrada {COMMA} tem ordens duplicadas
+STR_ROADVEHICLE_HAS_INVALID_ENTRY                               :{WHITE}O veículo de estrada {COMMA} tem uma estação inválida nas suas ordens
+STR_SHIP_HAS_TOO_FEW_ORDERS                                     :{WHITE}O barco {COMMA} tem muito poucas ordens definidas
+STR_SHIP_HAS_VOID_ORDER                                         :{WHITE}O barco {COMMA} tem uma ordem inválida
+STR_SHIP_HAS_DUPLICATE_ENTRY                                    :{WHITE}O barco {COMMA} tem ordens duplicadas
+STR_SHIP_HAS_INVALID_ENTRY                                      :{WHITE}O barco {COMMA} tem uma estação inválida nas suas ordens
+STR_AIRCRAFT_HAS_TOO_FEW_ORDERS                                 :{WHITE}A aeronave {COMMA} tem muito poucas ordens definidas
+STR_AIRCRAFT_HAS_VOID_ORDER                                     :{WHITE}A aeronave {COMMA} tem uma ordem inválida
+STR_AIRCRAFT_HAS_DUPLICATE_ENTRY                                :{WHITE}A aeronave {COMMA} tem ordens duplicadas
+STR_AIRCRAFT_HAS_INVALID_ENTRY                                  :{WHITE}A aeronave {COMMA} tem uma estação inválida nas suas ordens
 # end of order system
 
-STR_TRAIN_AUTORENEW_FAILED                                      :{WHITE}A auto-renovação do trem {COMMA16} falhou (limite de dinheiro)
-STR_ROADVEHICLE_AUTORENEW_FAILED                                :{WHITE}A auto-renovação do veículo de estrada {COMMA16} falhou (limite de dinheiro)
-STR_SHIP_AUTORENEW_FAILED                                       :{WHITE}A auto-renovação do barco {COMMA16} falhou (limite de dinheiro)
-STR_AIRCRAFT_AUTORENEW_FAILED                                   :{WHITE}A auto-renovação da aeronave {COMMA16} falhou (limite de dinheiro)
+STR_TRAIN_AUTORENEW_FAILED                                      :{WHITE}A auto-renovação do trem {COMMA} falhou (limite de dinheiro)
+STR_ROADVEHICLE_AUTORENEW_FAILED                                :{WHITE}A auto-renovação do veículo de estrada {COMMA} falhou (limite de dinheiro)
+STR_SHIP_AUTORENEW_FAILED                                       :{WHITE}A auto-renovação do barco {COMMA} falhou (limite de dinheiro)
+STR_AIRCRAFT_AUTORENEW_FAILED                                   :{WHITE}A auto-renovação da aeronave {COMMA} falhou (limite de dinheiro)
 
 STR_CONFIG_PATCHES                                              :{BLACK}Configurar Correções
 STR_CONFIG_PATCHES_TIP                                          :{BLACK}Configurar as correções
@@ -1104,7 +1104,7 @@
 STR_CHEATS_TIP                                                  :{BLACK}As caixas de verificação indicam se esta trapaça já foi usada antes
 STR_CHEATS_WARNING                                              :{BLACK}Atenção! Você está prestes a trair os seus oponentes. Saiba que isto ficará registrado para sempre.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Aumentar dinheiro em {CURRENCY64}
-STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Jogar pelo jogador: {ORANGE}{COMMA16}
+STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Jogar pelo jogador: {ORANGE}{COMMA}
 STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Bulldozer mágico (destrói indústrias, etc.): {ORANGE}{STRING}
 STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Os túneis poderão cruzar-se: {ORANGE}{STRING}
 STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Permitir construção quando em pausa: {ORANGE}{STRING}
@@ -1120,7 +1120,7 @@
 STR_GO_NON_STOP_TO_WAYPOINT                                     :Ir sem parar via {WAYPOINT}
 
 STR_WAYPOINTNAME_CITY                                           :Ponto de controle {TOWN}
-STR_WAYPOINTNAME_CITY_SERIAL                                    :Ponto de controle {TOWN} #{COMMA16}
+STR_WAYPOINTNAME_CITY_SERIAL                                    :Ponto de controle {TOWN} #{COMMA}
 STR_LANDINFO_WAYPOINT                                           :Ponto de controle
 
 STR_WAYPOINT                                                    :{WHITE}Ponto de controle
@@ -1203,8 +1203,8 @@
 STR_CONSTRUCT_SUGAR_MINE_TIP                                    :{BLACK}Construir Mina de Açúcar
 
 STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Indústrias
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}){YELLOW} ({COMMA16}% transportado)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}/{STRING}){YELLOW} ({COMMA16}%/{COMMA16}% transportado)
+STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}){YELLOW} ({COMMA}% transportado)
+STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}/{STRING}){YELLOW} ({COMMA}%/{COMMA}% transportado)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{TOWN} {STRING}
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...muito perto de outra indústria
@@ -1244,15 +1244,15 @@
 STR_NETWORK_ADD_SERVER_TIP                                      :{BLACK}Adiciona um servidor à lista que será sempre verificada se existem jogos ocorrendo.
 STR_NETWORK_ENTER_IP                                            :{BLACK}Introduza o endereço IP do servidor
 
-STR_NETWORK_CLIENTS_ONLINE                                      :{BLACK}{COMMA16}/{COMMA16}
+STR_NETWORK_CLIENTS_ONLINE                                      :{BLACK}{COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Clientes
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Clientes ligados / max. clientes
 STR_NETWORK_GAME_INFO                                           :{SILVER}INFORMAÇÃO DE JOGO
 STR_ORANGE                                                      :{ORANGE}{STRING}
-STR_NETWORK_CLIENTS                                             :{SILVER}Clientes:  {WHITE}{COMMA8} / {COMMA8}
+STR_NETWORK_CLIENTS                                             :{SILVER}Clientes:  {WHITE}{COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}Idioma:  {WHITE}{STRING}
 STR_NETWORK_TILESET                                             :{SILVER}Tileset:  {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Tamanho do Mapa:  {WHITE}{COMMA16}x{COMMA16}
+STR_NETWORK_MAP_SIZE                                            :{SILVER}Tamanho do Mapa:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Versão do servidor:  {WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Endereço do servidor:  {WHITE}{STRING} : {NUMU16}
 STR_NETWORK_START_DATE                                          :{SILVER}Data de inicio:  {WHITE}{DATE_SHORT}
@@ -1517,21 +1517,21 @@
 
 ##id 0x2000
 STR_2000_TOWNS                                                  :{WHITE}Cidades
-STR_TOWN_LABEL_POP                                              :{WHITE}{STRING} ({COMMA32})
+STR_TOWN_LABEL_POP                                              :{WHITE}{STRING} ({COMMA})
 STR_2001                                                        :{WHITE}{STRING}
 STR_2002                                                        :{TINYFONT}{BLACK}{STRING}
 STR_2003                                                        :{TINYFONT}{WHITE}{STRING}
 STR_2004_BUILDING_MUST_BE_DEMOLISHED                            :{WHITE}O edifício deve ser demolido primeiro
 STR_2005                                                        :{WHITE}{TOWN}
-STR_2006_POPULATION                                             :{BLACK}População: {ORANGE}{COMMA32}{BLACK}  Casas: {ORANGE}{COMMA32}
+STR_2006_POPULATION                                             :{BLACK}População: {ORANGE}{COMMA}{BLACK}  Casas: {ORANGE}{COMMA}
 STR_2007_RENAME_TOWN                                            :Renomear Cidade
 STR_2008_CAN_T_RENAME_TOWN                                      :{WHITE}Não é possível renomear cidade...
 STR_2009_LOCAL_AUTHORITY_REFUSES                                :{WHITE}A autoridade local de {TOWN} não autoriza
 STR_200A_TOWN_NAMES_CLICK_ON_NAME                               :{BLACK}Nomes das cidades - clique no nome para centralizar a visualização na cidade
 STR_200B_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Centralizar visualização na cidade
 STR_200C_CHANGE_TOWN_NAME                                       :{BLACK}Alterar o nome da cidade
-STR_200D_PASSENGERS_LAST_MONTH_MAX                              :{BLACK}Passageiros no mês passado: {ORANGE}{COMMA32}{BLACK}  máx: {ORANGE}{COMMA32}
-STR_200E_MAIL_LAST_MONTH_MAX                                    :{BLACK}Correspondências no mês passado: {ORANGE}{COMMA32}{BLACK}  máx: {ORANGE}{COMMA32}
+STR_200D_PASSENGERS_LAST_MONTH_MAX                              :{BLACK}Passageiros no mês passado: {ORANGE}{COMMA}{BLACK}  máx: {ORANGE}{COMMA}
+STR_200E_MAIL_LAST_MONTH_MAX                                    :{BLACK}Correspondências no mês passado: {ORANGE}{COMMA}{BLACK}  máx: {ORANGE}{COMMA}
 STR_200F_TALL_OFFICE_BLOCK                                      :Edifício alto de escritórios
 STR_2010_OFFICE_BLOCK                                           :Edifício de escritórios
 STR_2011_SMALL_BLOCK_OF_FLATS                                   :Edifício de apartamentos grande
@@ -1605,7 +1605,7 @@
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Subornar a autoridade local para aumentar a sua avaliação, correndo o  risco de uma penalidade severa se apanhado.{}  Custo: {CURRENCY}
 STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Tráfego caótico em {TOWN}!{}{}Programa de reconstrução de estradas financiado por {STRING} provoca 6 meses de miséria aos condutores!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
-STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA32})
+STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA})
 STR_2058_UNDER_CONSTRUCTION                                     :{STRING} (em construção)
 STR_2059_IGLOO                                                  :Iglú
 STR_205A_TEPEES                                                 :Tepees
@@ -1667,7 +1667,7 @@
 STR_303C_OUTSTANDING                                            :Proeminente
 ############ range for rating ends
 
-STR_303D                                                        :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA8}%)
+STR_303D                                                        :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_303E_NO_LONGER_ACCEPTS                                      :{WHITE}{STATION} não aceita mais {STRING}
 STR_303F_NO_LONGER_ACCEPTS_OR                                   :{WHITE}{STATION} não aceita mais {STRING} ou {STRING}
 STR_3040_NOW_ACCEPTS                                            :{WHITE}{STATION} agora aceita {STRING}
@@ -1678,7 +1678,7 @@
 STR_3045_TOO_CLOSE_TO_ANOTHER_TRUCK                             :{WHITE}Muito perto de outro local de carga
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Precisa de demolir o ponto de ônibus primeiro
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Precisa de demolir o local de carga primeiro
-STR_3048_STATIONS                                               :{WHITE}{STRING} - {COMMA16} Estações
+STR_3048_STATIONS                                               :{WHITE}{STRING} - {COMMA} Estações
 STR_3049_0                                                      :{YELLOW}{STATION} {STRINL 0x30D1}
 STR_304A_NONE                                                   :{YELLOW}- Nenhuma -
 STR_304B_SITE_UNSUITABLE                                        :{WHITE}...local inadequado
@@ -1735,7 +1735,7 @@
 STR_4002_SAVE                                                   :{BLACK}Salvar
 STR_4003_DELETE                                                 :{BLACK}Apagar
 STR_4004                                                        :{STRING}, {DATE_LONG}
-STR_4005_BYTES_FREE                                             :{BLACK}{COMMA32} megabytes livres
+STR_4005_BYTES_FREE                                             :{BLACK}{COMMA} megabytes livres
 STR_4006_UNABLE_TO_READ_DRIVE                                   :{BLACK}Não é possível ler unidade
 STR_4007_GAME_SAVE_FAILED                                       :{WHITE}Falha ao Salvar Jogo
 STR_4008_UNABLE_TO_DELETE_FILE                                  :{WHITE}Não é possível apagar o arquivo
@@ -1796,7 +1796,7 @@
 ############ range for requires	ends
 
 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Produção no mês passado:
-STR_482B_TRANSPORTED                                            :{YELLOW}{STRING}{BLACK} ({COMMA16}% transportado)
+STR_482B_TRANSPORTED                                            :{YELLOW}{STRING}{BLACK} ({COMMA}% transportado)
 STR_482C_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Centralizar visualização na localização da indústria
 STR_482D_NEW_UNDER_CONSTRUCTION                                 :{BLACK}{BIGFONT}Nova {STRING} em construção em {TOWN}!
 STR_482E_NEW_BEING_PLANTED_NEAR                                 :{BLACK}{BIGFONT}Nova {STRING} sendo plantada em {TOWN}!
@@ -1813,8 +1813,8 @@
 STR_4839_PRODUCTION_DOWN_BY_50                                  :{BLACK}{BIGFONT}Em {TOWN}, {STRING} diminui produção em 50%
 STR_483A_INSECT_INFESTATION_CAUSES                              :{BLACK}{BIGFONT}Em {TOWN} praga de insetos causa problemas na {STRING}!{}Produção diminui 50%
 STR_483B_CAN_ONLY_BE_POSITIONED                                 :{WHITE}...só pode ser colocado perto das bordas do mapa
-STR_INDUSTRY_PROD_GOUP                                          :{BLACK}{BIGFONT}A produção de {STRING} em {TOWN} {STRING} aumenta {COMMA16}%!
-STR_INDUSTRY_PROD_GODOWN                                        :{BLACK}{BIGFONT}A produção de {STRING} em {TOWN} {STRING} diminui {COMMA16}%!
+STR_INDUSTRY_PROD_GOUP                                          :{BLACK}{BIGFONT}A produção de {STRING} em {TOWN} {STRING} aumenta {COMMA}%!
+STR_INDUSTRY_PROD_GODOWN                                        :{BLACK}{BIGFONT}A produção de {STRING} em {TOWN} {STRING} diminui {COMMA}%!
 
 ##id 0x5000
 STR_5000_TRAIN_IN_TUNNEL                                        :{WHITE}Há um trem no túnel
@@ -1877,10 +1877,10 @@
 ##id 0x6000
 STR_SV_EMPTY                                                    :
 STR_SV_UNNAMED                                                  :Sem nome{SKIP}
-STR_SV_TRAIN_NAME                                               :Trem {COMMA16}
-STR_SV_ROADVEH_NAME                                             :Veículo de Estrada {COMMA16}
-STR_SV_SHIP_NAME                                                :Barco {COMMA16}
-STR_SV_AIRCRAFT_NAME                                            :Aeronave {COMMA16}
+STR_SV_TRAIN_NAME                                               :Trem {COMMA}
+STR_SV_ROADVEH_NAME                                             :Veículo de Estrada {COMMA}
+STR_SV_SHIP_NAME                                                :Barco {COMMA}
+STR_SV_AIRCRAFT_NAME                                            :Aeronave {COMMA}
 
 STR_SV_STNAME                                                   :{STRING}
 STR_SV_STNAME_NORTH                                             :{STRING} Norte
@@ -1930,12 +1930,12 @@
 ############ range for difficulty levels ends
 
 ############ range for difficulty settings starts
-STR_6805_MAXIMUM_NO_COMPETITORS                                 :{LTBLUE}Número máximo de oponentes: {ORANGE}{COMMA16}
+STR_6805_MAXIMUM_NO_COMPETITORS                                 :{LTBLUE}Número máximo de oponentes: {ORANGE}{COMMA}
 STR_6806_COMPETITOR_START_TIME                                  :{LTBLUE}Data de início dos oponentes: {ORANGE}{STRING}
 STR_6807_NO_OF_TOWNS                                            :{LTBLUE}Quantidade de cidades: {ORANGE}{STRING}
 STR_6808_NO_OF_INDUSTRIES                                       :{LTBLUE}Quantidade de indústrias: {ORANGE}{STRING}
 STR_6809_MAXIMUM_INITIAL_LOAN_000                               :{LTBLUE}Empréstimo máximo inicial: {ORANGE}{CURRENCY}
-STR_680A_INITIAL_INTEREST_RATE                                  :{LTBLUE}Taxa de juros inicial: {ORANGE}{COMMA16}%
+STR_680A_INITIAL_INTEREST_RATE                                  :{LTBLUE}Taxa de juros inicial: {ORANGE}{COMMA}%
 STR_680B_VEHICLE_RUNNING_COSTS                                  :{LTBLUE}Custos de circulação dos veículos: {ORANGE}{STRING}
 STR_680C_CONSTRUCTION_SPEED_OF_COMPETITOR                       :{LTBLUE}Velocidade de construção dos oponentes: {ORANGE}{STRING}
 STR_680D_INTELLIGENCE_OF_COMPETITORS                            :{LTBLUE}Inteligência dos oponentes: {ORANGE}{STRING}
@@ -1994,7 +1994,7 @@
 ##id 0x7000
 STR_7000                                                        :
 STR_7001                                                        :{WHITE}{STRING} {BLACK}{STRING}
-STR_7002_PLAYER                                                 :(Jogador {COMMA16})
+STR_7002_PLAYER                                                 :(Jogador {COMMA})
 STR_7004_NEW_FACE                                               :{BLACK}Novo Rosto
 STR_7005_COLOR_SCHEME                                           :{BLACK}Cores
 STR_7006_COLOR_SCHEME                                           :{GOLD}Cores:
@@ -2028,7 +2028,7 @@
 STR_7022_INCOME_GRAPH                                           :{WHITE}Gráfico de Rendimentos
 STR_CURRCOMPACT32                                               :{CURRCOMPACT}
 STR_CURRCOMPACT64                                               :{CURRCOMPACT64}
-STR_7024                                                        :{COMMA32}
+STR_7024                                                        :{COMMA}
 STR_7025_OPERATING_PROFIT_GRAPH                                 :{WHITE}Gráfico de Lucros Operacionais
 STR_7026_BANK_BALANCE                                           :{WHITE}Balanço Bancário
 STR_7027_LOAN                                                   :{WHITE}Empréstimo
@@ -2052,14 +2052,14 @@
 STR_7037_PRESIDENT                                              :{WHITE}{STRING}{}{GOLD}(Presidente)
 STR_7038_INAUGURATED                                            :{GOLD}Inaugurado: {WHITE}{NUMU16}
 STR_7039_VEHICLES                                               :{GOLD}Veículos:
-STR_703A_TRAIN                                                  :{WHITE}{COMMA16} trem
-STR_703B_TRAINS                                                 :{WHITE}{COMMA16} trens
-STR_703C_ROAD_VEHICLE                                           :{WHITE}{COMMA16} veículo de estrada
-STR_703D_ROAD_VEHICLES                                          :{WHITE}{COMMA16} veículos de estrada
-STR_703E_AIRCRAFT                                               :{WHITE}{COMMA16} aeronave
-STR_703F_AIRCRAFT                                               :{WHITE}{COMMA16} aeronaves
-STR_7040_SHIP                                                   :{WHITE}{COMMA16} barco
-STR_7041_SHIPS                                                  :{WHITE}{COMMA16} barcos
+STR_703A_TRAIN                                                  :{WHITE}{COMMA} trem
+STR_703B_TRAINS                                                 :{WHITE}{COMMA} trens
+STR_703C_ROAD_VEHICLE                                           :{WHITE}{COMMA} veículo de estrada
+STR_703D_ROAD_VEHICLES                                          :{WHITE}{COMMA} veículos de estrada
+STR_703E_AIRCRAFT                                               :{WHITE}{COMMA} aeronave
+STR_703F_AIRCRAFT                                               :{WHITE}{COMMA} aeronaves
+STR_7040_SHIP                                                   :{WHITE}{COMMA} barco
+STR_7041_SHIPS                                                  :{WHITE}{COMMA} barcos
 STR_7042_NONE                                                   :{WHITE}Nenhum
 STR_7043_FACE_SELECTION                                         :{WHITE}Seleção de Rosto
 STR_7044_MALE                                                   :{BLACK}Masculino
@@ -2124,8 +2124,8 @@
 STR_707A_SELL_25_SHARE_IN_THIS_COMPANY                          :{BLACK}Vender 25% de ações desta empresa
 STR_707B_CAN_T_BUY_25_SHARE_IN_THIS                             :{WHITE}Não é possível comprar 25% de ações desta empresa...
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}Não é possível vender 25% de ações desta empresa...
-STR_707D_OWNED_BY                                               :{WHITE}({COMMA16}% propriedade de {STRING})
-STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA16}% propriedade de {STRING}{}   {COMMA16}% propriedade de {STRING})
+STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% propriedade de {STRING})
+STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}% propriedade de {STRING}{}   {COMMA}% propriedade de {STRING})
 STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{STRING} foi comprada por {STRING}!
 STR_7080_PROTECTED                                              :{WHITE}Esta empresa ainda não troca ações...
 
@@ -2400,8 +2400,8 @@
 STR_8801_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Cidadãos celebram . . .{}Primeiro comboio chega a {STATION}!
 STR_8802_DETAILS                                                :{WHITE}{STRING} (Detalhes)
 STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}Comboio no caminho
-STR_8804                                                        :{SETX 10}{COMMA8}: {STRING}
-STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA8}: {STRING}
+STR_8804                                                        :{SETX 10}{COMMA}: {STRING}
+STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING}
 STR_8806_GO_TO                                                  :Ir para {STATION}
 STR_8807_GO_TO_TRANSFER                                         :Ir para {STATION} (Transferir e carregar)
 STR_8808_GO_TO_UNLOAD                                           :Ir para {STATION} (Descarregar)
@@ -2427,13 +2427,13 @@
 STR_UNKNOWN_DESTINATION                                         :destino desconhecido
 STR_8812_EMPTY                                                  :{LTBLUE}Vazio
 STR_8813_FROM                                                   :{LTBLUE}{CARGO} de {STATION}
-STR_8814_TRAIN_IS_WAITING_IN_DEPOT                              :{WHITE}Comboio {COMMA16} está aguardando no depósito
+STR_8814_TRAIN_IS_WAITING_IN_DEPOT                              :{WHITE}Comboio {COMMA} está aguardando no depósito
 STR_8815_NEW_VEHICLES                                           :{BLACK}Novos Veículos
 STR_8816                                                        :{BLACK}-
 STR_8818_INFORMATION                                            :{BLACK}Informação
 STR_8819_TRAIN_TOO_LONG                                         :{WHITE}Trem muito longo
 STR_881A_TRAINS_CAN_ONLY_BE_ALTERED                             :{WHITE}Os trens só podem ser alterados quando parados num depósito
-STR_881B_TRAINS                                                 :{WHITE}{STRING} - {COMMA16} Trens
+STR_881B_TRAINS                                                 :{WHITE}{STRING} - {COMMA} Trens
 STR_881C_NEW_RAIL_VEHICLES                                      :{WHITE}Novos Veículos Ferroviários
 STR_881D_NEW_MONORAIL_VEHICLES                                  :{WHITE}Novos Veículos Ferroviários(Monotrilho)
 STR_881E_NEW_MAGLEV_VEHICLES                                    :{WHITE}Novos Veículos Ferroviários(Trem-Bala)
@@ -2467,8 +2467,8 @@
 STR_8839_CAN_T_SELL_RAILROAD_VEHICLE                            :{WHITE}Não é possível vender veículo ferroviário...
 STR_883A_UNABLE_TO_FIND_ROUTE_TO                                :{WHITE}Não é possível encontrar rota para o depósito local
 STR_883B_CAN_T_STOP_START_TRAIN                                 :{WHITE}Não é possível iniciar/parar o trem...
-STR_883C_SERVICING_INTERVAL_DAYS                                :{BLACK}Intervalo de serviço: {LTBLUE}{COMMA16}dias{BLACK}   Último serviço: {LTBLUE}{DATE_LONG}
-STR_SERVICING_INTERVAL_PERCENT                                  :{BLACK}Intervalo de serviço: {LTBLUE}{COMMA16}%{BLACK}   Último serviço: {LTBLUE}{DATE_LONG}
+STR_883C_SERVICING_INTERVAL_DAYS                                :{BLACK}Intervalo de serviço: {LTBLUE}{COMMA}dias{BLACK}   Último serviço: {LTBLUE}{DATE_LONG}
+STR_SERVICING_INTERVAL_PERCENT                                  :{BLACK}Intervalo de serviço: {LTBLUE}{COMMA}%{BLACK}   Último serviço: {LTBLUE}{DATE_LONG}
 STR_883D_TRAINS_CLICK_ON_TRAIN_FOR                              :{BLACK}Trens - clique num comboio para informações
 STR_883E_BUILD_NEW_TRAINS_REQUIRES                              :{BLACK}Construir novos trens (necessita depósito de trens)
 STR_883F_TRAINS_CLICK_ON_TRAIN_FOR                              :{BLACK}Trens - clique num trem para informações, arraste um veículo o adicionar ao tren ou remover
@@ -2501,12 +2501,12 @@
 STR_SERVICE_HINT                                                :{BLACK}Saltar esta ordem a menos que seja necessário manutenção
 STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}Novo {STRING} disponível!
 STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
-STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Custo: {CURRENCY} Peso: {COMMA16}t{}Velocidade: {VELOCITY}  Potência: {COMMA16}hp{}Custo de circulação: {CURRENCY}/ano{}Capacidade: {STRING}
+STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Custo: {CURRENCY} Peso: {COMMA}t{}Velocidade: {VELOCITY}  Potência: {COMMA}hp{}Custo de circulação: {CURRENCY}/ano{}Capacidade: {STRING}
 STR_885C_BROKEN_DOWN                                            :{RED}Avariado
 STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Idade: {LTBLUE}{STRING}{BLACK}   Custo de circulação: {LTBLUE}{CURRENCY}/ano
-STR_885E_WEIGHT_T_POWER_HP_MAX_SPEED                            :{BLACK}Peso: {LTBLUE}{COMMA16}t  {BLACK}Potência: {LTBLUE}{COMMA32}hp{BLACK} Velocidade Máx.: {LTBLUE}{VELOCITY}
+STR_885E_WEIGHT_T_POWER_HP_MAX_SPEED                            :{BLACK}Peso: {LTBLUE}{COMMA}t  {BLACK}Potência: {LTBLUE}{COMMA}hp{BLACK} Velocidade Máx.: {LTBLUE}{VELOCITY}
 STR_885F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Lucros deste ano: {LTBLUE}{CURRENCY}  (último ano: {CURRENCY})
-STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Fiabilidade: {LTBLUE}{COMMA8}%  {BLACK}Avarias desde a última manutenção: {LTBLUE}{COMMA16}
+STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Fiabilidade: {LTBLUE}{COMMA}%  {BLACK}Avarias desde a última manutenção: {LTBLUE}{COMMA}
 STR_8861_STOPPED                                                :{RED}Parado
 STR_8862_CAN_T_MAKE_TRAIN_PASS_SIGNAL                           :{WHITE}Não é possível fazer o comboio passar o sinal de perigo...
 STR_8863_CRASHED                                                :{RED}Acidentado!
@@ -2514,7 +2514,7 @@
 STR_8865_NAME_TRAIN                                             :{WHITE}Renomear comboio
 STR_8866_CAN_T_NAME_TRAIN                                       :{WHITE}Não é possível renomear comboio...
 STR_8867_NAME_TRAIN                                             :{BLACK}Renomear comboio
-STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Acidente Ferroviário!{}{COMMA16} mortos numa explosão após a colisão
+STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Acidente Ferroviário!{}{COMMA} mortos numa explosão após a colisão
 STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}Não é possível inverter a direcção do comboio...
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Renomear tipo de veículo ferroviário
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Não é possível renomear tipo de veículo ferroviário...
@@ -2526,7 +2526,7 @@
 
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Veículo de estrada no caminho
-STR_9001_ROAD_VEHICLES                                          :{WHITE}{STRING} - {COMMA16} Veículos de Estrada
+STR_9001_ROAD_VEHICLES                                          :{WHITE}{STRING} - {COMMA} Veículos de Estrada
 STR_9002                                                        :{WHITE}{STRING}
 STR_9003_ROAD_VEHICLE_DEPOT                                     :{WHITE}{TOWN} Depósito de Veículos de Estrada
 STR_9004_NEW_VEHICLES                                           :{BLACK}Novos Veículos
@@ -2540,13 +2540,13 @@
 STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Idade: {LTBLUE}{STRING}{BLACK}   Custo de circulação: {LTBLUE}{CURRENCY}/ano
 STR_900E_MAX_SPEED                                              :{BLACK}Velocidade Máx.: {LTBLUE}{VELOCITY}
 STR_900F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Lucros deste ano: {LTBLUE}{CURRENCY}  (último ano: {CURRENCY})
-STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Fiabilidade: {LTBLUE}{COMMA8}%  {BLACK}Avarias desde a última manutenção: {LTBLUE}{COMMA16}
+STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Fiabilidade: {LTBLUE}{COMMA}%  {BLACK}Avarias desde a última manutenção: {LTBLUE}{COMMA}
 STR_9011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Construído: {LTBLUE}{NUMU16}{BLACK} Valor: {LTBLUE}{CURRENCY}
 STR_9012_CAPACITY                                               :{BLACK}Capacidade: {LTBLUE}{STRING}
 STR_9013_MUST_BE_STOPPED_INSIDE                                 :{WHITE}...deve estar parado num depósito de veículos de estrada
 STR_9014_CAN_T_SELL_ROAD_VEHICLE                                :{WHITE}Não é possível vender veículo de estrada...
 STR_9015_CAN_T_STOP_START_ROAD_VEHICLE                          :{WHITE}Não é possível iniciar/parar veículo de estrada...
-STR_9016_ROAD_VEHICLE_IS_WAITING                                :{WHITE}Veículo de Estrada {COMMA16} está a aguardar no depósito
+STR_9016_ROAD_VEHICLE_IS_WAITING                                :{WHITE}Veículo de Estrada {COMMA} está a aguardar no depósito
 STR_HEADING_FOR_ROAD_DEPOT                                      :{LTBLUE}Dirige-se ao depósito de {TOWN}
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{LTBLUE}Dirige-se ao depósito de {TOWN}, {VELOCITY}
 STR_9018_CAN_T_SEND_VEHICLE_TO_DEPOT                            :{WHITE}Não é possível mandar o veículo para o depósito...
@@ -2575,7 +2575,7 @@
 STR_902F_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Cidadãos celebram . . .{}Primeiro autocarro chega a {STATION}!
 STR_9030_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Cidadãos celebram . . .{}Primeiro camião chega a {STATION}!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Acidente de Veículo de Estrada!{}Condutor morre na explosão após a colisão com um comboio
-STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Acidente de Veículo de Estrada!{}{COMMA16} morrem na explosão após a colisão com um comboio
+STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Acidente de Veículo de Estrada!{}{COMMA} morrem na explosão após a colisão com um comboio
 STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}Não é possível fazer o veículo dar a volta...
 STR_9034_RENAME                                                 :{BLACK}Renomear
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Renomear tipo de veículo de estrada
@@ -2590,7 +2590,7 @@
 STR_9802_CAN_T_BUILD_DOCK_HERE                                  :{WHITE}Não é possível construir doca aqui...
 STR_9803_SHIP_DEPOT                                             :{WHITE}{TOWN} Depósito Naval
 STR_9804_NEW_SHIPS                                              :{BLACK}Novos Barcos
-STR_9805_SHIPS                                                  :{WHITE}{STRING} - {COMMA16} Barcos
+STR_9805_SHIPS                                                  :{WHITE}{STRING} - {COMMA} Barcos
 STR_9806_CAN_T_BUILD_SHIPS                                      :{WHITE}Não é possível construir barcos...
 STR_9807_MUST_BUILD_SHIP_DEPOT_FIRST                            :{WHITE}É necessário construir depósito naval primeiro
 STR_9808_NEW_SHIPS                                              :{WHITE}Novos Barcos
@@ -2605,7 +2605,7 @@
 STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Idade: {LTBLUE}{STRING}{BLACK}   Custo de circulação: {LTBLUE}{CURRENCY}/ano
 STR_9813_MAX_SPEED                                              :{BLACK}Velocidade Máx.: {LTBLUE}{VELOCITY}
 STR_9814_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Lucros deste ano: {LTBLUE}{CURRENCY}  (último ano: {CURRENCY})
-STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Fiabilidade: {LTBLUE}{COMMA8}%  {BLACK}Avarias desde a última manutenção: {LTBLUE}{COMMA16}
+STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Fiabilidade: {LTBLUE}{COMMA}%  {BLACK}Avarias desde a última manutenção: {LTBLUE}{COMMA}
 STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Construído: {LTBLUE}{NUMU16}{BLACK} Valor: {LTBLUE}{CURRENCY}
 STR_9817_CAPACITY                                               :{BLACK}Capacidade: {LTBLUE}{STRING}
 STR_9818_CAN_T_STOP_START_SHIP                                  :{WHITE}Não é possível iniciar/parar barco...
@@ -2613,7 +2613,7 @@
 STR_981A_UNABLE_TO_FIND_LOCAL_DEPOT                             :{WHITE}Não é possível encontrar depósito local
 STR_HEADING_FOR_SHIP_DEPOT                                      :{LTBLUE}Dirige-se ao depósito de {TOWN}
 STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{LTBLUE}Dirige-se ao depósito {TOWN}, {VELOCITY}
-STR_981C_SHIP_IS_WAITING_IN_DEPOT                               :{WHITE}Barco {COMMA16} está a aguardar no depósito
+STR_981C_SHIP_IS_WAITING_IN_DEPOT                               :{WHITE}Barco {COMMA} está a aguardar no depósito
 STR_981D_BUILD_SHIP_DOCK                                        :{BLACK}Construir doca naval
 STR_981E_BUILD_SHIP_DEPOT_FOR_BUILDING                          :{BLACK}Construir depósito (para criação e manutenção de barcos)
 STR_981F_SHIPS_CLICK_ON_SHIP_FOR                                :{BLACK}Barcos - clique num barco para informações
@@ -2664,19 +2664,19 @@
 STR_A005_NEW_AIRCRAFT                                           :{WHITE}Nova Aeronave
 STR_A006_BUILD_AIRCRAFT                                         :{BLACK}Construir Aeronave
 STR_A008_CAN_T_BUILD_AIRCRAFT                                   :{WHITE}Não é possível construir aeronave...
-STR_A009_AIRCRAFT                                               :{WHITE}{STRING} - {COMMA16} Aeronaves
+STR_A009_AIRCRAFT                                               :{WHITE}{STRING} - {COMMA} Aeronaves
 STR_A00A                                                        :{WHITE}{STRING}
 STR_A00B_ORDERS                                                 :{WHITE}{STRING} (Ordens)
 STR_A00C_DETAILS                                                :{WHITE}{STRING} (Detalhes)
 STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Idade: {LTBLUE}{STRING}{BLACK}   Custo de circulação: {LTBLUE}{CURRENCY}/ano
 STR_A00E_MAX_SPEED                                              :{BLACK}Velocidade Máx.: {LTBLUE}{VELOCITY}
 STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Lucros deste ano: {LTBLUE}{CURRENCY}  (último ano: {CURRENCY})
-STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Fiabilidade: {LTBLUE}{COMMA8}%  {BLACK}Avarias desde a última manutenção: {LTBLUE}{COMMA16}
+STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Fiabilidade: {LTBLUE}{COMMA}%  {BLACK}Avarias desde a última manutenção: {LTBLUE}{COMMA}
 STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Construído: {LTBLUE}{NUMU16}{BLACK} Valor: {LTBLUE}{CURRENCY}
 STR_A012_CAN_T_SEND_AIRCRAFT_TO                                 :{WHITE}Não é possível mandar aeronave para o hangar...
 STR_HEADING_FOR_HANGAR                                          :{LTBLUE}Dirige-se ao hangar de {STATION}
 STR_HEADING_FOR_HANGAR_VEL                                      :{LTBLUE}Dirige-se ao hangar de {STATION}, {VELOCITY}
-STR_A014_AIRCRAFT_IS_WAITING_IN                                 :{WHITE}Aeronave {COMMA16} está a aguardar no hangar
+STR_A014_AIRCRAFT_IS_WAITING_IN                                 :{WHITE}Aeronave {COMMA} está a aguardar no hangar
 STR_A015_AIRCRAFT_IN_THE_WAY                                    :{WHITE}Aeronave no caminho
 STR_A016_CAN_T_STOP_START_AIRCRAFT                              :{WHITE}Não é possível iniciar/parar aeronave...
 STR_A017_AIRCRAFT_IS_IN_FLIGHT                                  :{WHITE}Aeronave está em voo
@@ -2702,14 +2702,14 @@
 STR_A02B_SHOW_AIRCRAFT_DETAILS                                  :{BLACK}Mostrar detalhes da aeronave
 STR_A02C_NEW_AIRCRAFT_NOW_AVAILABLE                             :{BLACK}{BIGFONT}Nova aeronave disponível!
 STR_A02D                                                        :{BLACK}{BIGFONT}{STRING}
-STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Custo: {CURRENCY} Velocidade Máx.: {VELOCITY}{}Capacidade: {COMMA16} passageiros, {COMMA16} sacos de correio{}Custo de circulação: {CURRENCY}/ano
+STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Custo: {CURRENCY} Velocidade Máx.: {VELOCITY}{}Capacidade: {COMMA} passageiros, {COMMA} sacos de correio{}Custo de circulação: {CURRENCY}/ano
 
 STR_A030_NAME_AIRCRAFT                                          :{WHITE}Renomear aeronave
 STR_A031_CAN_T_NAME_AIRCRAFT                                    :{WHITE}Não é possível renomear aeronave...
 STR_A032_NAME_AIRCRAFT                                          :{BLACK}Renomear aeronave
 STR_A033_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Cidadãos celebram . . .{}Primeira aeronave chega a {STATION}!
-STR_A034_PLANE_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Acidente de Avião!{}{COMMA16} morrem na explosão em {STATION}
-STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Desastre de Avião!{}Avião ficou sem combustivél, {COMMA16} morreram em incêndiol!
+STR_A034_PLANE_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Acidente de Avião!{}{COMMA} morrem na explosão em {STATION}
+STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Desastre de Avião!{}Avião ficou sem combustivél, {COMMA} morreram em incêndiol!
 STR_A035_DESTINATIONS                                           :{TINYFONT}{BLACK}Destinos:
 STR_A036                                                        :{TINYFONT}{BLACK}{STATION}
 STR_A037_RENAME                                                 :{BLACK}Renomear
@@ -2735,7 +2735,7 @@
 STR_B003_FACTORY_DESTROYED_IN_SUSPICIOUS                        :{BLACK}{BIGFONT}Fábrica destruída em circunstâncias suspeitas em {TOWN}!
 STR_B004_UFO_LANDS_NEAR                                         :{BLACK}{BIGFONT}OVNI pousa em {TOWN}!
 STR_B005_COAL_MINE_SUBSIDENCE_LEAVES                            :{BLACK}{BIGFONT}Afundamento de mina de carvão deixa um rasto de destruição em {TOWN}!
-STR_B006_FLOOD_VEHICLE_DESTROYED                                :{BLACK}{BIGFONT}Inundações!{}Pelo menos {COMMA16} perdidos ou mortos após terríveis inundações!
+STR_B006_FLOOD_VEHICLE_DESTROYED                                :{BLACK}{BIGFONT}Inundações!{}Pelo menos {COMMA} perdidos ou mortos após terríveis inundações!
 
 STR_BRIBE_FAILED                                                :{WHITE}A sua tentativa de suborno foi
 STR_BRIBE_FAILED_2                                              :{WHITE}descoberta por um investigador regional
@@ -2745,7 +2745,7 @@
 STR_PERFORMANCE_DETAIL                                          :{WHITE}Detalhes de rendimentos
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Detalhes
 STR_PERFORMANCE_DETAIL_AMOUNT_CURRENCY                          :{BLACK}({CURRCOMPACT}/{CURRCOMPACT})
-STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA32}/{COMMA32})
+STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA}/{COMMA})
 STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{INT32}%
 SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{INT32}
 ############ Those following lines need to be in this order!!
@@ -2780,7 +2780,7 @@
 STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID:
 
 STR_CURRENCY_WINDOW                                             :{WHITE}Moeda Modificada
-STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Taxa de troca: {ORANGE}{CURRENCY} = {POUNDSIGN} {COMMA16}
+STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Taxa de troca: {ORANGE}{CURRENCY} = {POUNDSIGN} {COMMA}
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Separador:
 STR_CURRENCY_PREFIX                                             :{LTBLUE}Prefixo:
 STR_CURRENCY_SUFFIX                                             :{LTBLUE}Sufixo:
@@ -2794,10 +2794,10 @@
 STR_PLANE                                                       :{BLACK}{PLANE}
 STR_SHIP                                                        :{BLACK}{SHIP}
 
-STR_SCHEDULED_TRAINS                                            :{WHITE}{STATION} - {COMMA16} Comboios
-STR_SCHEDULED_ROAD_VEHICLES                                     :{WHITE}{STATION} - {COMMA16} Veiculos de Estrada
-STR_SCHEDULED_AIRCRAFT                                          :{WHITE}{STATION} - {COMMA16} Aviões
-STR_SCHEDULED_SHIPS                                             :{WHITE}{STATION} - {COMMA16} Barcos
+STR_SCHEDULED_TRAINS                                            :{WHITE}{STATION} - {COMMA} Comboios
+STR_SCHEDULED_ROAD_VEHICLES                                     :{WHITE}{STATION} - {COMMA} Veiculos de Estrada
+STR_SCHEDULED_AIRCRAFT                                          :{WHITE}{STATION} - {COMMA} Aviões
+STR_SCHEDULED_SHIPS                                             :{WHITE}{STATION} - {COMMA} Barcos
 
 STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Mostrar todos os comboios que têm esta estação nas ordens de serviço
 STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Mostrar todos os veiculos de estrada que têm esta estação nas ordens de serviço
@@ -2819,7 +2819,7 @@
 STR_REPLACE_HELP                                                :{BLACK}Permite a substiuição de um tipo de motor por outro, quando comboios do tipo original entram num depósito
 
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
-STR_SIGN_LIST_CAPTION                                           :{WHITE}Lista de sinais - {COMMA16} Sinais
+STR_SIGN_LIST_CAPTION                                           :{WHITE}Lista de sinais - {COMMA} Sinais
 
 ############ Lists rail types
 
@@ -2829,16 +2829,16 @@
 
 ############ End of list of rail types
 
-STR_TINY_BLACK                                                  :{BLACK}{TINYFONT}{COMMA16}
+STR_TINY_BLACK                                                  :{BLACK}{TINYFONT}{COMMA}
 
-STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Custo: {GOLD}{CURRENCY}{BLACK} Peso: {GOLD}{COMMA16}t
-STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Velocidade: {GOLD}{VELOCITY}{BLACK}   Potência: {GOLD}{COMMA32}hp
+STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Custo: {GOLD}{CURRENCY}{BLACK} Peso: {GOLD}{COMMA}t
+STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Velocidade: {GOLD}{VELOCITY}{BLACK}   Potência: {GOLD}{COMMA}hp
 STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}Manutenção: {GOLD}{CURRENCY}/ano
 STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Capacidade: {GOLD}{STRING} {STRING}
-STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Desenvolvida: {GOLD}{NUMU16}{BLACK} Vida: {GOLD}{COMMA16} anos
-STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Confiabilidade Max.: {GOLD}{COMMA8}%
+STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Desenvolvida: {GOLD}{NUMU16}{BLACK} Vida: {GOLD}{COMMA} anos
+STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Confiabilidade Max.: {GOLD}{COMMA}%
 STR_PURCHASE_INFO_COST                                          :{BLACK}Custo: {GOLD}{CURRENCY}
-STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Peso: {GOLD}{COMMA16}t  ({COMMA16}t)
+STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Peso: {GOLD}{COMMA}t  ({COMMA}t)
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Custo: {GOLD}{CURRENCY}{BLACK} Velocidade: {GOLD}{VELOCITY}
-STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Capacidade: {GOLD}{COMMA16} passageiros, {COMMA16} malas de correspondência
-STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Vagões energizados: {GOLD}+{COMMA16}hp{BLACK} Peso: {GOLD}+{COMMA8}t
+STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Capacidade: {GOLD}{COMMA} passageiros, {COMMA} malas de correspondência
+STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Vagões energizados: {GOLD}+{COMMA}hp{BLACK} Peso: {GOLD}+{COMMA}t
--- a/lang/catalan.txt	Thu Jul 14 09:53:52 2005 +0000
+++ b/lang/catalan.txt	Thu Jul 14 15:10:20 2005 +0000
@@ -82,69 +82,69 @@
 STR_004C_PLASTIC                                                :Plàstic
 STR_004D_FIZZY_DRINK                                            :Beguda Gasosa
 STR_004E                                                        :
-STR_004F_PASSENGER                                              :{COMMA16} passatger
-STR_0050_TON_OF_COAL                                            :{COMMA16} tona de carbó
-STR_0051_BAG_OF_MAIL                                            :{COMMA16} saca de correu
+STR_004F_PASSENGER                                              :{COMMA} passatger
+STR_0050_TON_OF_COAL                                            :{COMMA} tona de carbó
+STR_0051_BAG_OF_MAIL                                            :{COMMA} saca de correu
 STR_0052_OF_OIL                                                 :{VOLUME} de petroli
-STR_0053_ITEM_OF_LIVESTOCK                                      :{COMMA16} cap de bestiar
-STR_0054_CRATE_OF_GOODS                                         :{COMMA16} palet de mercaderies
-STR_0055_TON_OF_GRAIN                                           :{COMMA16} tona de gra
-STR_0056_TON_OF_WOOD                                            :{COMMA16} tona de fusta
-STR_0057_TON_OF_IRON_ORE                                        :{COMMA16} tona de mineral de ferro
-STR_0058_TON_OF_STEEL                                           :{COMMA16} tona d'acer
-STR_0059_BAG_OF_VALUABLES                                       :{COMMA16} saca de valors
-STR_005A_TON_OF_COPPER_ORE                                      :{COMMA16} tona de mineral de coure
-STR_005B_TON_OF_MAIZE                                           :{COMMA16} tona de blat de moro
-STR_005C_TON_OF_FRUIT                                           :{COMMA16} tona de fruita
-STR_005D_BAG_OF_DIAMONDS                                        :{COMMA16} bossa de diamants
-STR_005E_TON_OF_FOOD                                            :{COMMA16} tona de queviures
-STR_005F_TON_OF_PAPER                                           :{COMMA16} tona de paper
-STR_0060_BAG_OF_GOLD                                            :{COMMA16} sac d'or
+STR_0053_ITEM_OF_LIVESTOCK                                      :{COMMA} cap de bestiar
+STR_0054_CRATE_OF_GOODS                                         :{COMMA} palet de mercaderies
+STR_0055_TON_OF_GRAIN                                           :{COMMA} tona de gra
+STR_0056_TON_OF_WOOD                                            :{COMMA} tona de fusta
+STR_0057_TON_OF_IRON_ORE                                        :{COMMA} tona de mineral de ferro
+STR_0058_TON_OF_STEEL                                           :{COMMA} tona d'acer
+STR_0059_BAG_OF_VALUABLES                                       :{COMMA} saca de valors
+STR_005A_TON_OF_COPPER_ORE                                      :{COMMA} tona de mineral de coure
+STR_005B_TON_OF_MAIZE                                           :{COMMA} tona de blat de moro
+STR_005C_TON_OF_FRUIT                                           :{COMMA} tona de fruita
+STR_005D_BAG_OF_DIAMONDS                                        :{COMMA} bossa de diamants
+STR_005E_TON_OF_FOOD                                            :{COMMA} tona de queviures
+STR_005F_TON_OF_PAPER                                           :{COMMA} tona de paper
+STR_0060_BAG_OF_GOLD                                            :{COMMA} sac d'or
 STR_0061_OF_WATER                                               :{VOLUME} d'aigua
-STR_0062_TON_OF_WHEAT                                           :{COMMA16} tona de blat
+STR_0062_TON_OF_WHEAT                                           :{COMMA} tona de blat
 STR_0063_OF_RUBBER                                              :{VOLUME} de cautxú
-STR_0064_TON_OF_SUGAR                                           :{COMMA16} tona de sucre
-STR_0065_TOY                                                    :{COMMA16} joguina
-STR_0066_BAG_OF_CANDY                                           :{COMMA16} bossa de dolços
+STR_0064_TON_OF_SUGAR                                           :{COMMA} tona de sucre
+STR_0065_TOY                                                    :{COMMA} joguina
+STR_0066_BAG_OF_CANDY                                           :{COMMA} bossa de dolços
 STR_0067_OF_COLA                                                :{VOLUME} de refrescs
-STR_0068_TON_OF_COTTON_CANDY                                    :{COMMA16} tona de cotó de sucre
-STR_0069_BUBBLE                                                 :{COMMA16} bombolla
-STR_006A_TON_OF_TOFFEE                                          :{COMMA16} tona de caramel
-STR_006B_BATTERY                                                :{COMMA16} pila
+STR_0068_TON_OF_COTTON_CANDY                                    :{COMMA} tona de cotó de sucre
+STR_0069_BUBBLE                                                 :{COMMA} bombolla
+STR_006A_TON_OF_TOFFEE                                          :{COMMA} tona de caramel
+STR_006B_BATTERY                                                :{COMMA} pila
 STR_006C_OF_PLASTIC                                             :{VOLUME} de plàstic
-STR_006D_FIZZY_DRINK                                            :{COMMA16} beguda gasosa
+STR_006D_FIZZY_DRINK                                            :{COMMA} beguda gasosa
 STR_006E                                                        :
-STR_006F_PASSENGERS                                             :{COMMA16} passatgers
-STR_0070_TONS_OF_COAL                                           :{COMMA16} tones de carbó
-STR_0071_BAGS_OF_MAIL                                           :{COMMA16} saques de correu
+STR_006F_PASSENGERS                                             :{COMMA} passatgers
+STR_0070_TONS_OF_COAL                                           :{COMMA} tones de carbó
+STR_0071_BAGS_OF_MAIL                                           :{COMMA} saques de correu
 STR_0072_OF_OIL                                                 :{VOLUME} de petroli
-STR_0073_ITEMS_OF_LIVESTOCK                                     :{COMMA16} caps de bestiar
-STR_0074_CRATES_OF_GOODS                                        :{COMMA16} palets de mercaderíes
-STR_0075_TONS_OF_GRAIN                                          :{COMMA16} tones de gra
-STR_0076_TONS_OF_WOOD                                           :{COMMA16} tones de fusta
-STR_0077_TONS_OF_IRON_ORE                                       :{COMMA16} tones de mineral de ferro
-STR_0078_TONS_OF_STEEL                                          :{COMMA16} tones d'acer
-STR_0079_BAGS_OF_VALUABLES                                      :{COMMA16} saques de valors
-STR_007A_TONS_OF_COPPER_ORE                                     :{COMMA16} tones de mineral de coure
-STR_007B_TONS_OF_MAIZE                                          :{COMMA16} tones de blat de moro
-STR_007C_TONS_OF_FRUIT                                          :{COMMA16} tones de fruita
-STR_007D_BAGS_OF_DIAMONDS                                       :{COMMA16} saques de diamants
-STR_007E_TONS_OF_FOOD                                           :{COMMA16} tones de queviures
-STR_007F_TONS_OF_PAPER                                          :{COMMA16} tones de paper
-STR_0080_BAGS_OF_GOLD                                           :{COMMA16} sacs d'or
+STR_0073_ITEMS_OF_LIVESTOCK                                     :{COMMA} caps de bestiar
+STR_0074_CRATES_OF_GOODS                                        :{COMMA} palets de mercaderíes
+STR_0075_TONS_OF_GRAIN                                          :{COMMA} tones de gra
+STR_0076_TONS_OF_WOOD                                           :{COMMA} tones de fusta
+STR_0077_TONS_OF_IRON_ORE                                       :{COMMA} tones de mineral de ferro
+STR_0078_TONS_OF_STEEL                                          :{COMMA} tones d'acer
+STR_0079_BAGS_OF_VALUABLES                                      :{COMMA} saques de valors
+STR_007A_TONS_OF_COPPER_ORE                                     :{COMMA} tones de mineral de coure
+STR_007B_TONS_OF_MAIZE                                          :{COMMA} tones de blat de moro
+STR_007C_TONS_OF_FRUIT                                          :{COMMA} tones de fruita
+STR_007D_BAGS_OF_DIAMONDS                                       :{COMMA} saques de diamants
+STR_007E_TONS_OF_FOOD                                           :{COMMA} tones de queviures
+STR_007F_TONS_OF_PAPER                                          :{COMMA} tones de paper
+STR_0080_BAGS_OF_GOLD                                           :{COMMA} sacs d'or
 STR_0081_OF_WATER                                               :{VOLUME} d'aigua
-STR_0082_TONS_OF_WHEAT                                          :{COMMA16} tones de blat
+STR_0082_TONS_OF_WHEAT                                          :{COMMA} tones de blat
 STR_0083_OF_RUBBER                                              :{VOLUME} de cautxú
-STR_0084_TONS_OF_SUGAR                                          :{COMMA16} tones de sucre
-STR_0085_TOYS                                                   :{COMMA16} joguines
-STR_0086_BAGS_OF_CANDY                                          :{COMMA16} bosses de dolços
+STR_0084_TONS_OF_SUGAR                                          :{COMMA} tones de sucre
+STR_0085_TOYS                                                   :{COMMA} joguines
+STR_0086_BAGS_OF_CANDY                                          :{COMMA} bosses de dolços
 STR_0087_OF_COLA                                                :{VOLUME} de refrescs
-STR_0088_TONS_OF_COTTON_CANDY                                   :{COMMA16} tones de cotó de sucre
-STR_0089_BUBBLES                                                :{COMMA16} bombolles
-STR_008A_TONS_OF_TOFFEE                                         :{COMMA16} tones de caramels
-STR_008B_BATTERIES                                              :{COMMA16} piles
+STR_0088_TONS_OF_COTTON_CANDY                                   :{COMMA} tones de cotó de sucre
+STR_0089_BUBBLES                                                :{COMMA} bombolles
+STR_008A_TONS_OF_TOFFEE                                         :{COMMA} tones de caramels
+STR_008B_BATTERIES                                              :{COMMA} piles
 STR_008C_OF_PLASTIC                                             :{VOLUME} de plàstic
-STR_008D_FIZZY_DRINKS                                           :{COMMA16} begudes gasoses
+STR_008D_FIZZY_DRINKS                                           :{COMMA} begudes gasoses
 STR_008E                                                        :
 STR_008F_PS                                                     :{TINYFONT}PS
 STR_0090_CL                                                     :{TINYFONT}CB
@@ -219,8 +219,8 @@
 STR_00DF_GREY                                                   :Gris
 STR_00E0_WHITE                                                  :Blanc
 STR_00E1_TOO_MANY_VEHICLES_IN_GAME                              :{WHITE}Massa vehicles en joc
-STR_00E2                                                        :{BLACK}{COMMA16}
-STR_00E3                                                        :{RED}{COMMA16}
+STR_00E2                                                        :{BLACK}{COMMA}
+STR_00E3                                                        :{RED}{COMMA}
 STR_00E4_LOCATION                                               :{BLACK}Situació
 STR_00E5_CONTOURS                                               :Límits
 STR_00E6_VEHICLES                                               :Vehicles
@@ -441,18 +441,18 @@
 STR_0198_PROFIT_THIS_YEAR_LAST_YEAR                             :{TINYFONT}{BLACK}Benefici enguany: {CURRENCY} (darrer any: {CURRENCY})
 
 ############ range for service numbers starts
-STR_0199_YEAR                                                   :{COMMA16} any ({COMMA16})
-STR_019A_YEARS                                                  :{COMMA16} anys ({COMMA16})
-STR_019B_YEARS                                                  :{RED}{COMMA16} anys ({COMMA16})
+STR_0199_YEAR                                                   :{COMMA} any ({COMMA})
+STR_019A_YEARS                                                  :{COMMA} anys ({COMMA})
+STR_019B_YEARS                                                  :{RED}{COMMA} anys ({COMMA})
 ############ range for service numbers ends
 
 STR_019C_ROAD_VEHICLE                                           :Vehicle
 STR_019D_AIRCRAFT                                               :Aeronau
 STR_019E_SHIP                                                   :Vaixell
 STR_019F_TRAIN                                                  :Tren
-STR_01A0_IS_GETTING_OLD                                         :{WHITE}{STRING} {COMMA16} s'està envellint
-STR_01A1_IS_GETTING_VERY_OLD                                    :{WHITE}{STRING} {COMMA16} s'està envellint molt
-STR_01A2_IS_GETTING_VERY_OLD_AND                                :{WHITE}{STRING} {COMMA16} s'està envellint molt i necessita substitució urgent
+STR_01A0_IS_GETTING_OLD                                         :{WHITE}{STRING} {COMMA} s'està envellint
+STR_01A1_IS_GETTING_VERY_OLD                                    :{WHITE}{STRING} {COMMA} s'està envellint molt
+STR_01A2_IS_GETTING_VERY_OLD_AND                                :{WHITE}{STRING} {COMMA} s'està envellint molt i necessita substitució urgent
 STR_01A3_LAND_AREA_INFORMATION                                  :{WHITE}Informació del terreny
 STR_01A4_COST_TO_CLEAR_N_A                                      :{BLACK}Cost de neteja: {LTBLUE}N/A
 STR_01A5_COST_TO_CLEAR                                          :{BLACK}Cost de neteja: {LTBLUE}{CURRENCY}
@@ -497,7 +497,7 @@
 STR_01CA_31ST                                                   :31
 ############ range for days	ends
 
-STR_01CB                                                        :{TINYFONT}{COMMA16}
+STR_01CB                                                        :{TINYFONT}{COMMA}
 STR_01CC_TOGGLE_LARGE_SMALL_MAP                                 :{BLACK}Intercanviar mida gran/petita del mapa
 STR_01CD_SELECT_TUTORIAL_DEMONSTRATION                          :{WHITE}Seleccionar Tutorial/Demostració
 
@@ -509,7 +509,7 @@
 STR_CARGO_ACCEPTED_5                                            :{BLACK}Càrrega acceptada: {LTBLUE}{STRING}, {STRING}, {STRING}, {STRING}, {STRING}
 ############ range for cargo acecpted ends
 
-STR_01D1_8                                                      :({COMMA8}/8 {STRING})
+STR_01D1_8                                                      :({COMMA}/8 {STRING})
 STR_01D2_JAZZ_JUKEBOX                                           :{WHITE}Jukebox de Jazz
 STR_01D3_SOUND_MUSIC                                            :Só/música
 STR_01D4_SHOW_SOUND_MUSIC_WINDOW                                :{BLACK}Mostrar finestra de só/música
@@ -528,16 +528,16 @@
 STR_01E1_START_PLAYING_MUSIC                                    :{BLACK}Engegar la música
 STR_01E2_DRAG_SLIDERS_TO_SET_MUSIC                              :{BLACK}Arrosega els controls per establir el volum de la música i els efectes de só
 STR_01E3                                                        :{DKGREEN}{TINYFONT}--
-STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA8}
-STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA8}
+STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA}
+STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA}
 STR_01E6                                                        :{DKGREEN}{TINYFONT}------
 STR_01E7                                                        :{DKGREEN}{TINYFONT}"{STRING}"
 STR_01E8_TRACK_XTITLE                                           :{BLACK}{TINYFONT}Pista{SETX 88}Títol
 STR_01E9_SHUFFLE                                                :{TINYFONT}Aleatori
 STR_01EA_PROGRAM                                                :{TINYFONT}{BLACK}Programa
 STR_01EB_MUSIC_PROGRAM_SELECTION                                :{WHITE}Selecció del Programa de Música
-STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA16} "{STRING}"
-STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA16}   "{STRING}"
+STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} "{STRING}"
+STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA}   "{STRING}"
 STR_01EE_TRACK_INDEX                                            :{TINYFONT}{BLACK}Index de Pista
 STR_01EF_PROGRAM                                                :{TINYFONT}{BLACK}Programa - '{STRING}'
 STR_01F0_CLEAR                                                  :{TINYFONT}{BLACK}Esborra
@@ -577,7 +577,7 @@
 STR_0210_TOO_FAR_FROM_PREVIOUS_DESTINATIO                       :{WHITE}...massa lluny del destí previ
 STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Principals Empreses en asolir el Nivell {NUMU16}{}({STRING} )
 STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Taula de Lliga d'Empreses a {NUMU16}
-STR_0212                                                        :{BIGFONT}{COMMA16}.
+STR_0212                                                        :{BIGFONT}{COMMA}.
 STR_0213_BUSINESSMAN                                            :Empresari
 STR_0214_ENTREPRENEUR                                           :Emprenedor
 STR_0215_INDUSTRIALIST                                          :Industrial
@@ -586,12 +586,12 @@
 STR_0218_MOGUL                                                  :Gran Magnate
 STR_0219_TYCOON_OF_THE_CENTURY                                  :Magnate del Segle
 STR_HIGHSCORE_NAME                                              :{BIGFONT}{STRING}, {STRING}
-STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA16})
+STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA})
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{STRING} asoleix l'estat '{STRING}' !
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{STRING} de {STRING} asoleix l'estat '{STRING}' !
 STR_021D                                                        :{BLACK}
 STR_021E                                                        :{WHITE}
-STR_021F                                                        :{BLUE}{COMMA16}
+STR_021F                                                        :{BLUE}{COMMA}
 STR_0220_CREATE_SCENARIO                                        :{BLACK}Crear Escenari
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Editor d'Escenaris
@@ -788,8 +788,8 @@
 STR_EXTRA_VIEW_PORT                                             :Extra viewport
 STR_SIGN_LIST                                                   :Llista de senyals
 STR_02DF_TOWN_DIRECTORY                                         :Directori de Poblacions
-STR_TOWN_POPULATION                                             :{BLACK}Població mundial: {COMMA32}
-STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Viewport {COMMA16}
+STR_TOWN_POPULATION                                             :{BLACK}Població mundial: {COMMA}
+STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Viewport {COMMA}
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN                                :{BLACK}Copy to viewport
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT                             :{BLACK}Copy the location of the global view to this viewport
 STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW                                :{BLACK}Paste from viewport
@@ -961,34 +961,34 @@
 STR_CANT_COPY_ORDER_LIST                                        :{WHITE}No es pot copiar la llista d'ordres...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Fi d'Ordres Compartides - -
 
-STR_TRAIN_IS_LOST                                               :{WHITE}El tren {COMMA16} s'ha perdut.
-STR_TRAIN_IS_UNPROFITABLE                                       :{WHITE}El benefici del tren {COMMA16} el darrer any ha estat de {CURRENCY}
+STR_TRAIN_IS_LOST                                               :{WHITE}El tren {COMMA} s'ha perdut.
+STR_TRAIN_IS_UNPROFITABLE                                       :{WHITE}El benefici del tren {COMMA} el darrer any ha estat de {CURRENCY}
 STR_EURO_INTRODUCE                                              :{BLACK}{BIGFONT}Unió Monetària Europea!{}{}S'introdueix l'Euro com a moneda única per les transaccions diàries del teu país!
 
 # Start of order review system.
 # DON'T ADD OR REMOVE LINES HERE
-STR_TRAIN_HAS_TOO_FEW_ORDERS                                    :{WHITE}Tren {COMMA16} té massa poques ordres a la planificació
-STR_TRAIN_HAS_VOID_ORDER                                        :{WHITE}Tren {COMMA16} té una ordre buida
-STR_TRAIN_HAS_DUPLICATE_ENTRY                                   :{WHITE}Tren {COMMA16} té ordres duplicades
-STR_TRAIN_HAS_INVALID_ENTRY                                     :{WHITE}Tren {COMMA16} té una estació incorrecta en les ordres
-STR_ROADVEHICLE_HAS_TOO_FEW_ORDERS                              :{WHITE}Vehicle Rodat {COMMA16} té massa poques ordres a la planificació
-STR_ROADVEHICLE_HAS_VOID_ORDER                                  :{WHITE}Vehicle Rodat {COMMA16} té una ordre buida
-STR_ROADVEHICLE_HAS_DUPLICATE_ENTRY                             :{WHITE}Vehicle Rodat {COMMA16} té ordres duplicades
-STR_ROADVEHICLE_HAS_INVALID_ENTRY                               :{WHITE}Vehicle Rodat {COMMA16} té una estació incorrecta en les ordres
-STR_SHIP_HAS_TOO_FEW_ORDERS                                     :{WHITE}Vaixell {COMMA16} té massa poques ordres a la planificació
-STR_SHIP_HAS_VOID_ORDER                                         :{WHITE}Vaixell {COMMA16} té una ordre buida
-STR_SHIP_HAS_DUPLICATE_ENTRY                                    :{WHITE}Vaixell {COMMA16} té ordres duplicades
-STR_SHIP_HAS_INVALID_ENTRY                                      :{WHITE}Vaixell {COMMA16} té una estació incorrecta en les ordres
-STR_AIRCRAFT_HAS_TOO_FEW_ORDERS                                 :{WHITE}Aeronau {COMMA16} té massa poques ordres a la planificació
-STR_AIRCRAFT_HAS_VOID_ORDER                                     :{WHITE}Aeronau {COMMA16} té una ordre buida
-STR_AIRCRAFT_HAS_DUPLICATE_ENTRY                                :{WHITE}Aeronau {COMMA16} has duplicate orders
-STR_AIRCRAFT_HAS_INVALID_ENTRY                                  :{WHITE}Aeronau {COMMA16} té una estació incorrecta en les ordres
+STR_TRAIN_HAS_TOO_FEW_ORDERS                                    :{WHITE}Tren {COMMA} té massa poques ordres a la planificació
+STR_TRAIN_HAS_VOID_ORDER                                        :{WHITE}Tren {COMMA} té una ordre buida
+STR_TRAIN_HAS_DUPLICATE_ENTRY                                   :{WHITE}Tren {COMMA} té ordres duplicades
+STR_TRAIN_HAS_INVALID_ENTRY                                     :{WHITE}Tren {COMMA} té una estació incorrecta en les ordres
+STR_ROADVEHICLE_HAS_TOO_FEW_ORDERS                              :{WHITE}Vehicle Rodat {COMMA} té massa poques ordres a la planificació
+STR_ROADVEHICLE_HAS_VOID_ORDER                                  :{WHITE}Vehicle Rodat {COMMA} té una ordre buida
+STR_ROADVEHICLE_HAS_DUPLICATE_ENTRY                             :{WHITE}Vehicle Rodat {COMMA} té ordres duplicades
+STR_ROADVEHICLE_HAS_INVALID_ENTRY                               :{WHITE}Vehicle Rodat {COMMA} té una estació incorrecta en les ordres
+STR_SHIP_HAS_TOO_FEW_ORDERS                                     :{WHITE}Vaixell {COMMA} té massa poques ordres a la planificació
+STR_SHIP_HAS_VOID_ORDER                                         :{WHITE}Vaixell {COMMA} té una ordre buida
+STR_SHIP_HAS_DUPLICATE_ENTRY                                    :{WHITE}Vaixell {COMMA} té ordres duplicades
+STR_SHIP_HAS_INVALID_ENTRY                                      :{WHITE}Vaixell {COMMA} té una estació incorrecta en les ordres
+STR_AIRCRAFT_HAS_TOO_FEW_ORDERS                                 :{WHITE}Aeronau {COMMA} té massa poques ordres a la planificació
+STR_AIRCRAFT_HAS_VOID_ORDER                                     :{WHITE}Aeronau {COMMA} té una ordre buida
+STR_AIRCRAFT_HAS_DUPLICATE_ENTRY                                :{WHITE}Aeronau {COMMA} has duplicate orders
+STR_AIRCRAFT_HAS_INVALID_ENTRY                                  :{WHITE}Aeronau {COMMA} té una estació incorrecta en les ordres
 # end of order system
 
-STR_TRAIN_AUTORENEW_FAILED                                      :{WHITE}Autorenovació ha fallat al tren {COMMA16} (límit de diners)
-STR_ROADVEHICLE_AUTORENEW_FAILED                                :{WHITE}Autorenovació ha fallat al vehicle rodat {COMMA16} (límit de diners)
-STR_SHIP_AUTORENEW_FAILED                                       :{WHITE}Autorenovació ha fallat al vaixell {COMMA16} (límit de diners)
-STR_AIRCRAFT_AUTORENEW_FAILED                                   :{WHITE}Autorenovació ha fallat a l'aeronau {COMMA16} (límit de diners)
+STR_TRAIN_AUTORENEW_FAILED                                      :{WHITE}Autorenovació ha fallat al tren {COMMA} (límit de diners)
+STR_ROADVEHICLE_AUTORENEW_FAILED                                :{WHITE}Autorenovació ha fallat al vehicle rodat {COMMA} (límit de diners)
+STR_SHIP_AUTORENEW_FAILED                                       :{WHITE}Autorenovació ha fallat al vaixell {COMMA} (límit de diners)
+STR_AIRCRAFT_AUTORENEW_FAILED                                   :{WHITE}Autorenovació ha fallat a l'aeronau {COMMA} (límit de diners)
 
 STR_CONFIG_PATCHES                                              :{BLACK}Configurar Pegats
 STR_CONFIG_PATCHES_TIP                                          :{BLACK}Configurar els pegats
@@ -1104,7 +1104,7 @@
 STR_CHEATS_TIP                                                  :{BLACK}Els quadres marcats indiquen que ja has fet servir aquesta trampa
 STR_CHEATS_WARNING                                              :{BLACK}Atenció! Estàs a punt d'enredar als teus companys competidors. Pensa que una cosa així serà recordada per tota la eternitat!.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Incrementar diners en {CURRENCY64}
-STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Jugar com el jugador: {ORANGE}{COMMA16}
+STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Jugar com el jugador: {ORANGE}{COMMA}
 STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Eruga màgica (treu indústries, inamovibles): {ORANGE}{STRING}
 STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Els tunels es poden creuar: {ORANGE}{STRING}
 STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Construir mentre el joc està en pausa: {ORANGE}{STRING}
@@ -1120,7 +1120,7 @@
 STR_GO_NON_STOP_TO_WAYPOINT                                     :Anar sense parades via {WAYPOINT}
 
 STR_WAYPOINTNAME_CITY                                           :Punt de Control {TOWN}
-STR_WAYPOINTNAME_CITY_SERIAL                                    :Punt de Control {TOWN} #{COMMA16}
+STR_WAYPOINTNAME_CITY_SERIAL                                    :Punt de Control {TOWN} #{COMMA}
 STR_LANDINFO_WAYPOINT                                           :Punt de Control
 
 STR_WAYPOINT                                                    :{WHITE}Punt de control
@@ -1203,8 +1203,8 @@
 STR_CONSTRUCT_SUGAR_MINE_TIP                                    :{BLACK}Construir Mina de Sucre
 
 STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Indústries
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}){YELLOW} ({COMMA16}% transportat)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}/{STRING}){YELLOW} ({COMMA16}%/{COMMA16}% transportat)
+STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}){YELLOW} ({COMMA}% transportat)
+STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}/{STRING}){YELLOW} ({COMMA}%/{COMMA}% transportat)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{TOWN} {STRING}
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...massa a prop d'altres indústries
@@ -1244,15 +1244,15 @@
 STR_NETWORK_ADD_SERVER_TIP                                      :{BLACK}Afegeix un servidor a la llista que sempre es comprovarà per a jocs iniciats.
 STR_NETWORK_ENTER_IP                                            :{BLACK}Entra l'adreça IP del servidor
 
-STR_NETWORK_CLIENTS_ONLINE                                      :{BLACK}{COMMA16}/{COMMA16}
+STR_NETWORK_CLIENTS_ONLINE                                      :{BLACK}{COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Clients
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Clients en línia / clients màxim
 STR_NETWORK_GAME_INFO                                           :{SILVER}INFORMACIÓ DEL JOC
 STR_ORANGE                                                      :{ORANGE}{STRING}
-STR_NETWORK_CLIENTS                                             :{SILVER}Clients:  {WHITE}{COMMA8} / {COMMA8}
+STR_NETWORK_CLIENTS                                             :{SILVER}Clients:  {WHITE}{COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}Idioma:  {WHITE}{STRING}
 STR_NETWORK_TILESET                                             :{SILVER}Tileset:  {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Tamany del mapa:  {WHITE}{COMMA16}x{COMMA16}
+STR_NETWORK_MAP_SIZE                                            :{SILVER}Tamany del mapa:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Versió del servidor:  {WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Adreça del servidor:  {WHITE}{STRING} : {NUMU16}
 STR_NETWORK_START_DATE                                          :{SILVER}Data inicial:  {WHITE}{DATE_SHORT}
@@ -1517,21 +1517,21 @@
 
 ##id 0x2000
 STR_2000_TOWNS                                                  :{WHITE}Poblacions
-STR_TOWN_LABEL_POP                                              :{WHITE}{STRING} ({COMMA32})
+STR_TOWN_LABEL_POP                                              :{WHITE}{STRING} ({COMMA})
 STR_2001                                                        :{WHITE}{STRING}
 STR_2002                                                        :{TINYFONT}{BLACK}{STRING}
 STR_2003                                                        :{TINYFONT}{WHITE}{STRING}
 STR_2004_BUILDING_MUST_BE_DEMOLISHED                            :{WHITE}L'edifici s'ha d'enderrocar primer
 STR_2005                                                        :{WHITE}{TOWN}
-STR_2006_POPULATION                                             :{BLACK}Població: {ORANGE}{COMMA32}{BLACK}  Cases: {ORANGE}{COMMA32}
+STR_2006_POPULATION                                             :{BLACK}Població: {ORANGE}{COMMA}{BLACK}  Cases: {ORANGE}{COMMA}
 STR_2007_RENAME_TOWN                                            :Reanomena Població
 STR_2008_CAN_T_RENAME_TOWN                                      :{WHITE}No es pot reanomenar la població...
 STR_2009_LOCAL_AUTHORITY_REFUSES                                :{WHITE}{TOWN} les autoritats locals rebutgen fer aixó
 STR_200A_TOWN_NAMES_CLICK_ON_NAME                               :{BLACK}Noms de Població - clica al nom per centrar la pantalla principal a la població
 STR_200B_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Centra la pantalla principal a la població
 STR_200C_CHANGE_TOWN_NAME                                       :{BLACK}Canvía el nom de la població
-STR_200D_PASSENGERS_LAST_MONTH_MAX                              :{BLACK}Passatgers el darrer mes: {ORANGE}{COMMA32}{BLACK}  max: {ORANGE}{COMMA32}
-STR_200E_MAIL_LAST_MONTH_MAX                                    :{BLACK}Correu el darrer mes: {ORANGE}{COMMA32}{BLACK}  max: {ORANGE}{COMMA32}
+STR_200D_PASSENGERS_LAST_MONTH_MAX                              :{BLACK}Passatgers el darrer mes: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
+STR_200E_MAIL_LAST_MONTH_MAX                                    :{BLACK}Correu el darrer mes: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
 STR_200F_TALL_OFFICE_BLOCK                                      :Bloc d'oficines alt
 STR_2010_OFFICE_BLOCK                                           :Bloc d'oficines
 STR_2011_SMALL_BLOCK_OF_FLATS                                   :Petit bloc d'apartaments
@@ -1605,7 +1605,7 @@
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Subornar les autoritats locals per incrementar el teu rati, a risc de greus penalitzacions si et pesquen!!.{}  Cost: {CURRENCY}
 STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Caos de trànsit en  {TOWN}!{}{}El programa de rehabilitació dels carrers patrocinat per {STRING} porta 6 mesos de misèria als motoristes!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
-STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA32})
+STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA})
 STR_2058_UNDER_CONSTRUCTION                                     :{STRING} (en construcció)
 STR_2059_IGLOO                                                  :Iglú
 STR_205A_TEPEES                                                 :Tipis
@@ -1667,7 +1667,7 @@
 STR_303C_OUTSTANDING                                            :Excepcional
 ############ range for rating ends
 
-STR_303D                                                        :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA8}%)
+STR_303D                                                        :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_303E_NO_LONGER_ACCEPTS                                      :{WHITE}{STATION} ja no accepta més {STRING}
 STR_303F_NO_LONGER_ACCEPTS_OR                                   :{WHITE}{STATION} ja no accepta més {STRING} o {STRING}
 STR_3040_NOW_ACCEPTS                                            :{WHITE}{STATION} ara accepta {STRING}
@@ -1678,7 +1678,7 @@
 STR_3045_TOO_CLOSE_TO_ANOTHER_TRUCK                             :{WHITE}Massa a prop d'un altre estació de mercaderíes
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Primer has d'enderrocar la parada d'autobus
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Primer has d'enderrocar l'estació de mercaderíes
-STR_3048_STATIONS                                               :{WHITE}{STRING} - {COMMA16} Estacions/Parades
+STR_3048_STATIONS                                               :{WHITE}{STRING} - {COMMA} Estacions/Parades
 STR_3049_0                                                      :{YELLOW}{STATION} {STRINL 0x30D1}
 STR_304A_NONE                                                   :{YELLOW}- Cap -
 STR_304B_SITE_UNSUITABLE                                        :{WHITE}...lloc inadequat
@@ -1735,7 +1735,7 @@
 STR_4002_SAVE                                                   :{BLACK}Desar
 STR_4003_DELETE                                                 :{BLACK}Esborrar
 STR_4004                                                        :{STRING}, {DATE_LONG}
-STR_4005_BYTES_FREE                                             :{BLACK}{COMMA32} megabytes lliures
+STR_4005_BYTES_FREE                                             :{BLACK}{COMMA} megabytes lliures
 STR_4006_UNABLE_TO_READ_DRIVE                                   :{BLACK}Imposible llegir unitat de disc
 STR_4007_GAME_SAVE_FAILED                                       :{WHITE}Desat del Joc erroni
 STR_4008_UNABLE_TO_DELETE_FILE                                  :{WHITE}Imposible esborrar arxiu
@@ -1796,7 +1796,7 @@
 ############ range for requires	ends
 
 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Producció del darrer mes:
-STR_482B_TRANSPORTED                                            :{YELLOW}{STRING}{BLACK} ({COMMA16}% transportat)
+STR_482B_TRANSPORTED                                            :{YELLOW}{STRING}{BLACK} ({COMMA}% transportat)
 STR_482C_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Centrar la pantalla principal en la situació de l'indústria
 STR_482D_NEW_UNDER_CONSTRUCTION                                 :{BLACK}{BIGFONT}Nou/nova {STRING} en construcció a prop de {TOWN}!
 STR_482E_NEW_BEING_PLANTED_NEAR                                 :{BLACK}{BIGFONT}Nou/nova {STRING} s'està plantant a prop de {TOWN}!
@@ -1813,8 +1813,8 @@
 STR_4839_PRODUCTION_DOWN_BY_50                                  :{BLACK}{BIGFONT}{TOWN} {STRING} la producció es redueix d'un 50%
 STR_483A_INSECT_INFESTATION_CAUSES                              :{BLACK}{BIGFONT}Una plaga d'insectes provoca el caos a {TOWN} {STRING}!{}La producció es redueix d'un 50%
 STR_483B_CAN_ONLY_BE_POSITIONED                                 :{WHITE}...només es pot situar a prop dels límits del mapa
-STR_INDUSTRY_PROD_GOUP                                          :{BLACK}{BIGFONT}{STRING} la producció a {TOWN} {STRING} creix d'un {COMMA16}%!
-STR_INDUSTRY_PROD_GODOWN                                        :{BLACK}{BIGFONT}{STRING} la producció a {TOWN} {STRING} es redueix d'un {COMMA16}%!
+STR_INDUSTRY_PROD_GOUP                                          :{BLACK}{BIGFONT}{STRING} la producció a {TOWN} {STRING} creix d'un {COMMA}%!
+STR_INDUSTRY_PROD_GODOWN                                        :{BLACK}{BIGFONT}{STRING} la producció a {TOWN} {STRING} es redueix d'un {COMMA}%!
 
 ##id 0x5000
 STR_5000_TRAIN_IN_TUNNEL                                        :{WHITE}Tren dins del tunel
@@ -1877,10 +1877,10 @@
 ##id 0x6000
 STR_SV_EMPTY                                                    :
 STR_SV_UNNAMED                                                  :Sense Nom{SKIP}
-STR_SV_TRAIN_NAME                                               :Tren {COMMA16}
-STR_SV_ROADVEH_NAME                                             :Vehicle Rodat {COMMA16}
-STR_SV_SHIP_NAME                                                :Vaixell {COMMA16}
-STR_SV_AIRCRAFT_NAME                                            :Aeronau {COMMA16}
+STR_SV_TRAIN_NAME                                               :Tren {COMMA}
+STR_SV_ROADVEH_NAME                                             :Vehicle Rodat {COMMA}
+STR_SV_SHIP_NAME                                                :Vaixell {COMMA}
+STR_SV_AIRCRAFT_NAME                                            :Aeronau {COMMA}
 
 STR_SV_STNAME                                                   :{STRING}
 STR_SV_STNAME_NORTH                                             :{STRING} Nort
@@ -1930,12 +1930,12 @@
 ############ range for difficulty levels ends
 
 ############ range for difficulty settings starts
-STR_6805_MAXIMUM_NO_COMPETITORS                                 :{LTBLUE}Màxim num. competidors: {ORANGE}{COMMA16}
+STR_6805_MAXIMUM_NO_COMPETITORS                                 :{LTBLUE}Màxim num. competidors: {ORANGE}{COMMA}
 STR_6806_COMPETITOR_START_TIME                                  :{LTBLUE}Moment inici Competidors: {ORANGE}{STRING}
 STR_6807_NO_OF_TOWNS                                            :{LTBLUE}Num. de poblacions: {ORANGE}{STRING}
 STR_6808_NO_OF_INDUSTRIES                                       :{LTBLUE}Num. d'indústries: {ORANGE}{STRING}
 STR_6809_MAXIMUM_INITIAL_LOAN_000                               :{LTBLUE}Màxim prèstec inicial: {ORANGE}{CURRENCY}
-STR_680A_INITIAL_INTEREST_RATE                                  :{LTBLUE}Interès inicial: {ORANGE}{COMMA16}%
+STR_680A_INITIAL_INTEREST_RATE                                  :{LTBLUE}Interès inicial: {ORANGE}{COMMA}%
 STR_680B_VEHICLE_RUNNING_COSTS                                  :{LTBLUE}Cost de circulació de Vehicles: {ORANGE}{STRING}
 STR_680C_CONSTRUCTION_SPEED_OF_COMPETITOR                       :{LTBLUE}Velocitat de Construcció dels competidors: {ORANGE}{STRING}
 STR_680D_INTELLIGENCE_OF_COMPETITORS                            :{LTBLUE}Intel.ligència dels competidors: {ORANGE}{STRING}
@@ -1994,7 +1994,7 @@
 ##id 0x7000
 STR_7000                                                        :
 STR_7001                                                        :{WHITE}{STRING} {BLACK}{STRING}
-STR_7002_PLAYER                                                 :(Jugador {COMMA16})
+STR_7002_PLAYER                                                 :(Jugador {COMMA})
 STR_7004_NEW_FACE                                               :{BLACK}Nova Cara
 STR_7005_COLOR_SCHEME                                           :{BLACK}Esquema de Colors
 STR_7006_COLOR_SCHEME                                           :{GOLD}Esquema de Colors:
@@ -2028,7 +2028,7 @@
 STR_7022_INCOME_GRAPH                                           :{WHITE}Gràfic d'Ingresos
 STR_CURRCOMPACT32                                               :{CURRCOMPACT}
 STR_CURRCOMPACT64                                               :{CURRCOMPACT64}
-STR_7024                                                        :{COMMA32}
+STR_7024                                                        :{COMMA}
 STR_7025_OPERATING_PROFIT_GRAPH                                 :{WHITE}Gràfic de Rendiment d'Operacions
 STR_7026_BANK_BALANCE                                           :{WHITE}Balanç del Banc
 STR_7027_LOAN                                                   :{WHITE}Prèstec
@@ -2052,14 +2052,14 @@
 STR_7037_PRESIDENT                                              :{WHITE}{STRING}{}{GOLD}(President)
 STR_7038_INAUGURATED                                            :{GOLD}Inaugurat: {WHITE}{NUMU16}
 STR_7039_VEHICLES                                               :{GOLD}Vehicles:
-STR_703A_TRAIN                                                  :{WHITE}{COMMA16} tren
-STR_703B_TRAINS                                                 :{WHITE}{COMMA16} trens
-STR_703C_ROAD_VEHICLE                                           :{WHITE}{COMMA16} vehicle rodat
-STR_703D_ROAD_VEHICLES                                          :{WHITE}{COMMA16} vehicles rodats
-STR_703E_AIRCRAFT                                               :{WHITE}{COMMA16} aeronau
-STR_703F_AIRCRAFT                                               :{WHITE}{COMMA16} aeronaus
-STR_7040_SHIP                                                   :{WHITE}{COMMA16} vaixell
-STR_7041_SHIPS                                                  :{WHITE}{COMMA16} vaixells
+STR_703A_TRAIN                                                  :{WHITE}{COMMA} tren
+STR_703B_TRAINS                                                 :{WHITE}{COMMA} trens
+STR_703C_ROAD_VEHICLE                                           :{WHITE}{COMMA} vehicle rodat
+STR_703D_ROAD_VEHICLES                                          :{WHITE}{COMMA} vehicles rodats
+STR_703E_AIRCRAFT                                               :{WHITE}{COMMA} aeronau
+STR_703F_AIRCRAFT                                               :{WHITE}{COMMA} aeronaus
+STR_7040_SHIP                                                   :{WHITE}{COMMA} vaixell
+STR_7041_SHIPS                                                  :{WHITE}{COMMA} vaixells
 STR_7042_NONE                                                   :{WHITE}Cap
 STR_7043_FACE_SELECTION                                         :{WHITE}Selecció de cares
 STR_7044_MALE                                                   :{BLACK}Home
@@ -2124,8 +2124,8 @@
 STR_707A_SELL_25_SHARE_IN_THIS_COMPANY                          :{BLACK}Vendre el 25% de participació en aquesta empresa
 STR_707B_CAN_T_BUY_25_SHARE_IN_THIS                             :{WHITE}No pots comprar el 25% de participació en aquesta empresa...
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}No pots vendre el 25% de participació en aquesta empresa...
-STR_707D_OWNED_BY                                               :{WHITE}({COMMA16}% propietat de {STRING})
-STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA16}% propietat de {STRING}{}   {COMMA16}% propietat de {STRING})
+STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% propietat de {STRING})
+STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}% propietat de {STRING}{}   {COMMA}% propietat de {STRING})
 STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{STRING} ha estat absorbida per {STRING}!
 STR_7080_PROTECTED                                              :{WHITE}Aquesta Empresa ja no negocía participacions...
 
@@ -2400,8 +2400,8 @@
 STR_8801_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Celebració popular . . .{} Arribada del 1er. tren a {STATION}!
 STR_8802_DETAILS                                                :{WHITE}{STRING} (Detalls)
 STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}Tren en el camí
-STR_8804                                                        :{SETX 10}{COMMA8}: {STRING}
-STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA8}: {STRING}
+STR_8804                                                        :{SETX 10}{COMMA}: {STRING}
+STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING}
 STR_8806_GO_TO                                                  :Anar a {STATION}
 STR_8807_GO_TO_TRANSFER                                         :Ves a {STATION} (Transferir i agafar càrrega)
 STR_8808_GO_TO_UNLOAD                                           :Ves a {STATION} (Descarregar)
@@ -2427,13 +2427,13 @@
 STR_UNKNOWN_DESTINATION                                         :destí desconegut
 STR_8812_EMPTY                                                  :{LTBLUE}Buit
 STR_8813_FROM                                                   :{LTBLUE}{CARGO} procedent de {STATION}
-STR_8814_TRAIN_IS_WAITING_IN_DEPOT                              :{WHITE}Tren {COMMA16} en espera en cotxeres
+STR_8814_TRAIN_IS_WAITING_IN_DEPOT                              :{WHITE}Tren {COMMA} en espera en cotxeres
 STR_8815_NEW_VEHICLES                                           :{BLACK}Nous Vehicles
 STR_8816                                                        :{BLACK}-
 STR_8818_INFORMATION                                            :{BLACK}Informació
 STR_8819_TRAIN_TOO_LONG                                         :{WHITE}Tren massa llarg
 STR_881A_TRAINS_CAN_ONLY_BE_ALTERED                             :{WHITE}Els trens només es poden modificar quan s'han parat dintre d'una cotxera
-STR_881B_TRAINS                                                 :{WHITE}{STRING} - {COMMA16} Trens
+STR_881B_TRAINS                                                 :{WHITE}{STRING} - {COMMA} Trens
 STR_881C_NEW_RAIL_VEHICLES                                      :{WHITE}Nous Vehicles
 STR_881D_NEW_MONORAIL_VEHICLES                                  :{WHITE}Nous Vehicles Monorail
 STR_881E_NEW_MAGLEV_VEHICLES                                    :{WHITE}Nous Vehicles Maglev
@@ -2467,8 +2467,8 @@
 STR_8839_CAN_T_SELL_RAILROAD_VEHICLE                            :{WHITE}No es pot vendre el vehicle...
 STR_883A_UNABLE_TO_FIND_ROUTE_TO                                :{WHITE}Incapaç de trobar el camí a la cotxera local
 STR_883B_CAN_T_STOP_START_TRAIN                                 :{WHITE}No es pot parar/arrencar el tren...
-STR_883C_SERVICING_INTERVAL_DAYS                                :{BLACK}Interval de manteniment: {LTBLUE}{COMMA16}díes{BLACK}   Darrer manteniment: {LTBLUE}{DATE_LONG}
-STR_SERVICING_INTERVAL_PERCENT                                  :{BLACK}Interval de manteniment: {LTBLUE}{COMMA16}%{BLACK}   Darrer manteniment: {LTBLUE}{DATE_LONG}
+STR_883C_SERVICING_INTERVAL_DAYS                                :{BLACK}Interval de manteniment: {LTBLUE}{COMMA}díes{BLACK}   Darrer manteniment: {LTBLUE}{DATE_LONG}
+STR_SERVICING_INTERVAL_PERCENT                                  :{BLACK}Interval de manteniment: {LTBLUE}{COMMA}%{BLACK}   Darrer manteniment: {LTBLUE}{DATE_LONG}
 STR_883D_TRAINS_CLICK_ON_TRAIN_FOR                              :{BLACK}Trens - clica al tren per informació
 STR_883E_BUILD_NEW_TRAINS_REQUIRES                              :{BLACK}Construir nous trens (es necessita cotxera)
 STR_883F_TRAINS_CLICK_ON_TRAIN_FOR                              :{BLACK}Trens - clica al tren per info., arrastra el vehicle per afegir/treure del tren
@@ -2501,12 +2501,12 @@
 STR_SERVICE_HINT                                                :{BLACK}Saltar l'ordre a menys que es necessiti manteniment
 STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}Nou {STRING} disponible ara!
 STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
-STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Cost: {CURRENCY} Pes: {COMMA16}t{}Velocitat: {VELOCITY}  Potència: {COMMA16}hp{}Cost de circulació: {CURRENCY}/any{}Capacitat: {STRING}
+STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Cost: {CURRENCY} Pes: {COMMA}t{}Velocitat: {VELOCITY}  Potència: {COMMA}hp{}Cost de circulació: {CURRENCY}/any{}Capacitat: {STRING}
 STR_885C_BROKEN_DOWN                                            :{RED}Averiat
 STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Edat: {LTBLUE}{STRING}{BLACK}   Cost de Circulació: {LTBLUE}{CURRENCY}/any
-STR_885E_WEIGHT_T_POWER_HP_MAX_SPEED                            :{BLACK}Pes: {LTBLUE}{COMMA16}t  {BLACK}Potència: {LTBLUE}{COMMA32}hp{BLACK} Vel. Max.: {LTBLUE}{VELOCITY}
+STR_885E_WEIGHT_T_POWER_HP_MAX_SPEED                            :{BLACK}Pes: {LTBLUE}{COMMA}t  {BLACK}Potència: {LTBLUE}{COMMA}hp{BLACK} Vel. Max.: {LTBLUE}{VELOCITY}
 STR_885F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Benefici enguany: {LTBLUE}{CURRENCY}  (darrer any: {CURRENCY})
-STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Rendibilitat: {LTBLUE}{COMMA8}%  {BLACK}Averíes des de l'ultim manteniment: {LTBLUE}{COMMA16}
+STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Rendibilitat: {LTBLUE}{COMMA}%  {BLACK}Averíes des de l'ultim manteniment: {LTBLUE}{COMMA}
 STR_8861_STOPPED                                                :{RED}Parat
 STR_8862_CAN_T_MAKE_TRAIN_PASS_SIGNAL                           :{WHITE}No pots fer que un tren passi d'una senyal amb perill...
 STR_8863_CRASHED                                                :{RED}Accident!
@@ -2514,7 +2514,7 @@
 STR_8865_NAME_TRAIN                                             :{WHITE}Anomenar tren
 STR_8866_CAN_T_NAME_TRAIN                                       :{WHITE}No es pot anomenar el tren...
 STR_8867_NAME_TRAIN                                             :{BLACK}Anomenar tren
-STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Tren accidentat!{}{COMMA16} moren en una bola de foc després de la colisió
+STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Tren accidentat!{}{COMMA} moren en una bola de foc després de la colisió
 STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}No es pot invertir la direcció del tren...
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Reanomenar el tipus d'element del tren
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}No es pot reanomenar el tipus d'element del tren...
@@ -2526,7 +2526,7 @@
 
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Vehicle rodat en el camí
-STR_9001_ROAD_VEHICLES                                          :{WHITE}{STRING} - {COMMA16} Vehicles Rodats
+STR_9001_ROAD_VEHICLES                                          :{WHITE}{STRING} - {COMMA} Vehicles Rodats
 STR_9002                                                        :{WHITE}{STRING}
 STR_9003_ROAD_VEHICLE_DEPOT                                     :{WHITE}{TOWN} Cotxera de Vehicles Rodats
 STR_9004_NEW_VEHICLES                                           :{BLACK}Nous Vehicles
@@ -2540,13 +2540,13 @@
 STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Edat: {LTBLUE}{STRING}{BLACK}   Cost de circulació: {LTBLUE}{CURRENCY}/any
 STR_900E_MAX_SPEED                                              :{BLACK}Vel. Max.: {LTBLUE}{VELOCITY}
 STR_900F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Benefici enguany: {LTBLUE}{CURRENCY}  (darrer any: {CURRENCY})
-STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Rendibilitat: {LTBLUE}{COMMA8}%  {BLACK}Averíes des del darrer manteniment: {LTBLUE}{COMMA16}
+STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Rendibilitat: {LTBLUE}{COMMA}%  {BLACK}Averíes des del darrer manteniment: {LTBLUE}{COMMA}
 STR_9011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Construit: {LTBLUE}{NUMU16}{BLACK} Valor: {LTBLUE}{CURRENCY}
 STR_9012_CAPACITY                                               :{BLACK}Capacitat: {LTBLUE}{STRING}
 STR_9013_MUST_BE_STOPPED_INSIDE                                 :{WHITE}...s'ha de parar dintre d'una cotxera
 STR_9014_CAN_T_SELL_ROAD_VEHICLE                                :{WHITE}No pots vendre el vehicle rodat...
 STR_9015_CAN_T_STOP_START_ROAD_VEHICLE                          :{WHITE}No es pot parar/arrencar el vehicle rodat...
-STR_9016_ROAD_VEHICLE_IS_WAITING                                :{WHITE}Vehicle Rodat {COMMA16} esperant en cotxera
+STR_9016_ROAD_VEHICLE_IS_WAITING                                :{WHITE}Vehicle Rodat {COMMA} esperant en cotxera
 STR_HEADING_FOR_ROAD_DEPOT                                      :{LTBLUE}Cap a la cotxera de {TOWN}.
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{LTBLUE}Cap a la cotxera de {TOWN}, a {VELOCITY}
 STR_9018_CAN_T_SEND_VEHICLE_TO_DEPOT                            :{WHITE}No es pot enviar el vehicle a cotxera...
@@ -2575,7 +2575,7 @@
 STR_902F_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Celebració popular . . .{}Primer autobus arriba a {STATION}!
 STR_9030_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Celebració popular . . .{}Primer camion arriba a {STATION}!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Accident de Vehicle Rodat!{}El conductor mor en una bola de foc després de la colisió amb un tren
-STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Accident de Vehicle Rodat!{}{COMMA16} moren en una bola de foc després d'una colisió amb un tren
+STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Accident de Vehicle Rodat!{}{COMMA} moren en una bola de foc després d'una colisió amb un tren
 STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}No es pot fer que el vehicle torni...
 STR_9034_RENAME                                                 :{BLACK}Reanomenar
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Reanomena tipus de vehicle rodat
@@ -2590,7 +2590,7 @@
 STR_9802_CAN_T_BUILD_DOCK_HERE                                  :{WHITE}No es pot construir el port aqui...
 STR_9803_SHIP_DEPOT                                             :{WHITE}{TOWN} Drassana
 STR_9804_NEW_SHIPS                                              :{BLACK}Nous Vaixells
-STR_9805_SHIPS                                                  :{WHITE}{STRING} - {COMMA16} Vaixells
+STR_9805_SHIPS                                                  :{WHITE}{STRING} - {COMMA} Vaixells
 STR_9806_CAN_T_BUILD_SHIPS                                      :{WHITE}No es poden construir vaixells...
 STR_9807_MUST_BUILD_SHIP_DEPOT_FIRST                            :{WHITE}Primer has de construir una drassana
 STR_9808_NEW_SHIPS                                              :{WHITE}Nous Vaixells
@@ -2605,7 +2605,7 @@
 STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Edat: {LTBLUE}{STRING}{BLACK}   Cost de Circulació: {LTBLUE}{CURRENCY}/any
 STR_9813_MAX_SPEED                                              :{BLACK}Max. velocitat: {LTBLUE}{VELOCITY}
 STR_9814_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Benefici enguany: {LTBLUE}{CURRENCY}  (darrer any: {CURRENCY})
-STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Rendibilitat: {LTBLUE}{COMMA8}%  {BLACK}Averíes des de l'últim manteniment: {LTBLUE}{COMMA16}
+STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Rendibilitat: {LTBLUE}{COMMA}%  {BLACK}Averíes des de l'últim manteniment: {LTBLUE}{COMMA}
 STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Construit: {LTBLUE}{NUMU16}{BLACK} Valor: {LTBLUE}{CURRENCY}
 STR_9817_CAPACITY                                               :{BLACK}Capacitat: {LTBLUE}{STRING}
 STR_9818_CAN_T_STOP_START_SHIP                                  :{WHITE}No es pot parar/arrencar el vaixell...
@@ -2613,7 +2613,7 @@
 STR_981A_UNABLE_TO_FIND_LOCAL_DEPOT                             :{WHITE}Incapaç de trobar drassana local
 STR_HEADING_FOR_SHIP_DEPOT                                      :{LTBLUE}Cap a la drassana de {TOWN}.
 STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{LTBLUE}Cap a la drassana de{TOWN}, a {VELOCITY}
-STR_981C_SHIP_IS_WAITING_IN_DEPOT                               :{WHITE}Vaixell {COMMA16} esperant en drassana
+STR_981C_SHIP_IS_WAITING_IN_DEPOT                               :{WHITE}Vaixell {COMMA} esperant en drassana
 STR_981D_BUILD_SHIP_DOCK                                        :{BLACK}Construir port
 STR_981E_BUILD_SHIP_DEPOT_FOR_BUILDING                          :{BLACK}Construir drassana (per construir i mantindre vaixells)
 STR_981F_SHIPS_CLICK_ON_SHIP_FOR                                :{BLACK}Vaixells - clica en un vaixell per informació
@@ -2664,19 +2664,19 @@
 STR_A005_NEW_AIRCRAFT                                           :{WHITE}Nova Aeronau
 STR_A006_BUILD_AIRCRAFT                                         :{BLACK}Construir Aeronau
 STR_A008_CAN_T_BUILD_AIRCRAFT                                   :{WHITE}No es pot construir l'aeronau...
-STR_A009_AIRCRAFT                                               :{WHITE}{STRING} - {COMMA16} Aeronaus
+STR_A009_AIRCRAFT                                               :{WHITE}{STRING} - {COMMA} Aeronaus
 STR_A00A                                                        :{WHITE}{STRING}
 STR_A00B_ORDERS                                                 :{WHITE}{STRING} (Ordres)
 STR_A00C_DETAILS                                                :{WHITE}{STRING} (Detalls)
 STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Edat: {LTBLUE}{STRING}{BLACK}   Cost de Circulació: {LTBLUE}{CURRENCY}/any
 STR_A00E_MAX_SPEED                                              :{BLACK}Max. velocitat: {LTBLUE}{VELOCITY}
 STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Benefici enguany: {LTBLUE}{CURRENCY}  (darrer any: {CURRENCY})
-STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Rendibilitat: {LTBLUE}{COMMA8}%  {BLACK}Averíes des de l'últim manteniment: {LTBLUE}{COMMA16}
+STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Rendibilitat: {LTBLUE}{COMMA}%  {BLACK}Averíes des de l'últim manteniment: {LTBLUE}{COMMA}
 STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Construit: {LTBLUE}{NUMU16}{BLACK} Valor: {LTBLUE}{CURRENCY}
 STR_A012_CAN_T_SEND_AIRCRAFT_TO                                 :{WHITE}No es pot enviar l'aronau a l'hangar...
 STR_HEADING_FOR_HANGAR                                          :{LTBLUE}Cap a l'hangar de {STATION}.
 STR_HEADING_FOR_HANGAR_VEL                                      :{LTBLUE}Cap a l'hangar de {STATION}, a {VELOCITY}
-STR_A014_AIRCRAFT_IS_WAITING_IN                                 :{WHITE}L' aeronau {COMMA16} esperant a l'hangar
+STR_A014_AIRCRAFT_IS_WAITING_IN                                 :{WHITE}L' aeronau {COMMA} esperant a l'hangar
 STR_A015_AIRCRAFT_IN_THE_WAY                                    :{WHITE}Aeronau en el camí
 STR_A016_CAN_T_STOP_START_AIRCRAFT                              :{WHITE}No es pot parar/arrencar l' aeronau...
 STR_A017_AIRCRAFT_IS_IN_FLIGHT                                  :{WHITE}Aeronau en vol
@@ -2702,14 +2702,14 @@
 STR_A02B_SHOW_AIRCRAFT_DETAILS                                  :{BLACK}Mostrar detalls de l'aeronau
 STR_A02C_NEW_AIRCRAFT_NOW_AVAILABLE                             :{BLACK}{BIGFONT}Nova aeronau disponible ara!
 STR_A02D                                                        :{BLACK}{BIGFONT}{STRING}
-STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Cost: {CURRENCY} Max. Velocitat: {VELOCITY}{}Capacitat: {COMMA16} passatgers, {COMMA16} saques de correu{}Cost de Circulació: {CURRENCY}/any
+STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Cost: {CURRENCY} Max. Velocitat: {VELOCITY}{}Capacitat: {COMMA} passatgers, {COMMA} saques de correu{}Cost de Circulació: {CURRENCY}/any
 
 STR_A030_NAME_AIRCRAFT                                          :{WHITE}Anomenar aeronaus
 STR_A031_CAN_T_NAME_AIRCRAFT                                    :{WHITE}No es pot anomenar aeronaus...
 STR_A032_NAME_AIRCRAFT                                          :{BLACK}Anomenar aeronaus
 STR_A033_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Celebració popular . . .{}La primera aeronau arriba a {STATION}!
-STR_A034_PLANE_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Accident d'avió!{}{COMMA16} moren en una bola de foc a {STATION}
-STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Accident d'aviació!{}Aeronau sense combustible, {COMMA16} morts en una bola de foc!
+STR_A034_PLANE_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Accident d'avió!{}{COMMA} moren en una bola de foc a {STATION}
+STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Accident d'aviació!{}Aeronau sense combustible, {COMMA} morts en una bola de foc!
 STR_A035_DESTINATIONS                                           :{TINYFONT}{BLACK}Destinacions:
 STR_A036                                                        :{TINYFONT}{BLACK}{STATION}
 STR_A037_RENAME                                                 :{BLACK}Reanomena
@@ -2735,7 +2735,7 @@
 STR_B003_FACTORY_DESTROYED_IN_SUSPICIOUS                        :{BLACK}{BIGFONT}Fàbrica destruida en extranyes circunstàncies prop de {TOWN}!
 STR_B004_UFO_LANDS_NEAR                                         :{BLACK}{BIGFONT}'OVNI' aterra prop de {TOWN}!
 STR_B005_COAL_MINE_SUBSIDENCE_LEAVES                            :{BLACK}{BIGFONT}L' enfonsament d'una mina de carbó deixa un rastre de destrucció prop de {TOWN}!
-STR_B006_FLOOD_VEHICLE_DESTROYED                                :{BLACK}{BIGFONT}Inundacions!{}Al menys {COMMA16} presuntament desapareguts o morts després de mortals inundacions!
+STR_B006_FLOOD_VEHICLE_DESTROYED                                :{BLACK}{BIGFONT}Inundacions!{}Al menys {COMMA} presuntament desapareguts o morts després de mortals inundacions!
 
 STR_BRIBE_FAILED                                                :{WHITE}El teu intent de suborn ha estat
 STR_BRIBE_FAILED_2                                              :{WHITE}descobert per un investigador regional
@@ -2745,7 +2745,7 @@
 STR_PERFORMANCE_DETAIL                                          :{WHITE}Detall de ratis de rendiment
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Detall
 STR_PERFORMANCE_DETAIL_AMOUNT_CURRENCY                          :{BLACK}({CURRCOMPACT}/{CURRCOMPACT})
-STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA32}/{COMMA32})
+STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA}/{COMMA})
 STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{INT32}%
 SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{INT32}
 ############ Those following lines need to be in this order!!
@@ -2780,7 +2780,7 @@
 STR_NEWGRF_GRF_ID                                               :{BLACK}Id de GRF:
 
 STR_CURRENCY_WINDOW                                             :{WHITE}Moneda personalitzada
-STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Canvi de moneda: {ORANGE}{CURRENCY} = {POUNDSIGN} {COMMA16}
+STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Canvi de moneda: {ORANGE}{CURRENCY} = {POUNDSIGN} {COMMA}
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Separador:
 STR_CURRENCY_PREFIX                                             :{LTBLUE}Prefix:
 STR_CURRENCY_SUFFIX                                             :{LTBLUE}Sufix:
@@ -2794,10 +2794,10 @@
 STR_PLANE                                                       :{BLACK}{PLANE}
 STR_SHIP                                                        :{BLACK}{SHIP}
 
-STR_SCHEDULED_TRAINS                                            :{WHITE}{STATION} - {COMMA16} Trens
-STR_SCHEDULED_ROAD_VEHICLES                                     :{WHITE}{STATION} - {COMMA16} Vehicles
-STR_SCHEDULED_AIRCRAFT                                          :{WHITE}{STATION} - {COMMA16} Aeronaus
-STR_SCHEDULED_SHIPS                                             :{WHITE}{STATION} - {COMMA16} Vaixells
+STR_SCHEDULED_TRAINS                                            :{WHITE}{STATION} - {COMMA} Trens
+STR_SCHEDULED_ROAD_VEHICLES                                     :{WHITE}{STATION} - {COMMA} Vehicles
+STR_SCHEDULED_AIRCRAFT                                          :{WHITE}{STATION} - {COMMA} Aeronaus
+STR_SCHEDULED_SHIPS                                             :{WHITE}{STATION} - {COMMA} Vaixells
 
 STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Mostra tots els trens que tinguin aquesta estació al seu itinerari
 STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Mostra tots els vehicles que tinguin aquesta estació al seu itinerari
@@ -2819,7 +2819,7 @@
 STR_REPLACE_HELP                                                :{BLACK}Et permet reemplaçar un tipus de motor amb un altre, quan els trens del tipus original entrin a cotxeres
 
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
-STR_SIGN_LIST_CAPTION                                           :{WHITE}Llista de senyals - {COMMA16} Senyals
+STR_SIGN_LIST_CAPTION                                           :{WHITE}Llista de senyals - {COMMA} Senyals
 
 ############ Lists rail types
 
@@ -2829,16 +2829,16 @@
 
 ############ End of list of rail types
 
-STR_TINY_BLACK                                                  :{BLACK}{TINYFONT}{COMMA16}
+STR_TINY_BLACK                                                  :{BLACK}{TINYFONT}{COMMA}
 
-STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Cost: {GOLD}{CURRENCY}{BLACK} Pes: {GOLD}{COMMA16}t
-STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Velocitat: {GOLD}{VELOCITY}{BLACK}   Potència: {GOLD}{COMMA32}hp
+STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Cost: {GOLD}{CURRENCY}{BLACK} Pes: {GOLD}{COMMA}t
+STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Velocitat: {GOLD}{VELOCITY}{BLACK}   Potència: {GOLD}{COMMA}hp
 STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}Cost d'utilització: {GOLD}{CURRENCY}/any
 STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Capacitat: {GOLD}{STRING} {STRING}
-STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Dissenyat: {GOLD}{NUMU16}{BLACK} Vida: {GOLD}{COMMA16} anys
-STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Max. Rendiment: {GOLD}{COMMA8}%
+STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Dissenyat: {GOLD}{NUMU16}{BLACK} Vida: {GOLD}{COMMA} anys
+STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Max. Rendiment: {GOLD}{COMMA}%
 STR_PURCHASE_INFO_COST                                          :{BLACK}Cost: {GOLD}{CURRENCY}
-STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Pes: {GOLD}{COMMA16}t  ({COMMA16}t)
+STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Pes: {GOLD}{COMMA}t  ({COMMA}t)
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Cost: {GOLD}{CURRENCY}{BLACK} Velocitat: {GOLD}{VELOCITY}
-STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Capacitat: {GOLD}{COMMA16} passatgers, {COMMA16} saques de correu
-STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Vagons Automotrius: {GOLD}+{COMMA16}hp{BLACK} Pes: {GOLD}+{COMMA8}t
+STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Capacitat: {GOLD}{COMMA} passatgers, {COMMA} saques de correu
+STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Vagons Automotrius: {GOLD}+{COMMA}hp{BLACK} Pes: {GOLD}+{COMMA}t
--- a/lang/czech.txt	Thu Jul 14 09:53:52 2005 +0000
+++ b/lang/czech.txt	Thu Jul 14 15:10:20 2005 +0000
@@ -82,69 +82,69 @@
 STR_004C_PLASTIC                                                :plastu
 STR_004D_FIZZY_DRINK                                            :limonád
 STR_004E                                                        :
-STR_004F_PASSENGER                                              :{COMMA16} cestující
-STR_0050_TON_OF_COAL                                            :{COMMA16} tuna uhlí
-STR_0051_BAG_OF_MAIL                                            :{COMMA16} balík posty
+STR_004F_PASSENGER                                              :{COMMA} cestující
+STR_0050_TON_OF_COAL                                            :{COMMA} tuna uhlí
+STR_0051_BAG_OF_MAIL                                            :{COMMA} balík posty
 STR_0052_OF_OIL                                                 :{VOLUME} ropy
-STR_0053_ITEM_OF_LIVESTOCK                                      :{COMMA16} kus dobytka
-STR_0054_CRATE_OF_GOODS                                         :{COMMA16} krabice zbozi
-STR_0055_TON_OF_GRAIN                                           :{COMMA16} tuna zrní
-STR_0056_TON_OF_WOOD                                            :{COMMA16} tuna dreva
-STR_0057_TON_OF_IRON_ORE                                        :{COMMA16} tuna zelezne rudy
-STR_0058_TON_OF_STEEL                                           :{COMMA16} tuna oceli
-STR_0059_BAG_OF_VALUABLES                                       :{COMMA16} balík cenin
-STR_005A_TON_OF_COPPER_ORE                                      :{COMMA16} tuna medene rudy
-STR_005B_TON_OF_MAIZE                                           :{COMMA16} tuna kukurice
-STR_005C_TON_OF_FRUIT                                           :{COMMA16} tuna ovoce
-STR_005D_BAG_OF_DIAMONDS                                        :{COMMA16} pytel diamantu
-STR_005E_TON_OF_FOOD                                            :{COMMA16} tuna jídla
-STR_005F_TON_OF_PAPER                                           :{COMMA16} tuna papíru
-STR_0060_BAG_OF_GOLD                                            :{COMMA16} balík zlata
+STR_0053_ITEM_OF_LIVESTOCK                                      :{COMMA} kus dobytka
+STR_0054_CRATE_OF_GOODS                                         :{COMMA} krabice zbozi
+STR_0055_TON_OF_GRAIN                                           :{COMMA} tuna zrní
+STR_0056_TON_OF_WOOD                                            :{COMMA} tuna dreva
+STR_0057_TON_OF_IRON_ORE                                        :{COMMA} tuna zelezne rudy
+STR_0058_TON_OF_STEEL                                           :{COMMA} tuna oceli
+STR_0059_BAG_OF_VALUABLES                                       :{COMMA} balík cenin
+STR_005A_TON_OF_COPPER_ORE                                      :{COMMA} tuna medene rudy
+STR_005B_TON_OF_MAIZE                                           :{COMMA} tuna kukurice
+STR_005C_TON_OF_FRUIT                                           :{COMMA} tuna ovoce
+STR_005D_BAG_OF_DIAMONDS                                        :{COMMA} pytel diamantu
+STR_005E_TON_OF_FOOD                                            :{COMMA} tuna jídla
+STR_005F_TON_OF_PAPER                                           :{COMMA} tuna papíru
+STR_0060_BAG_OF_GOLD                                            :{COMMA} balík zlata
 STR_0061_OF_WATER                                               :{VOLUME} vody
-STR_0062_TON_OF_WHEAT                                           :{COMMA16} tuna kukurice
+STR_0062_TON_OF_WHEAT                                           :{COMMA} tuna kukurice
 STR_0063_OF_RUBBER                                              :{VOLUME} kaucuku
-STR_0064_TON_OF_SUGAR                                           :{COMMA16} tuna cukru
-STR_0065_TOY                                                    :{COMMA16} hracka
-STR_0066_BAG_OF_CANDY                                           :{COMMA16} pytel bonbonu
+STR_0064_TON_OF_SUGAR                                           :{COMMA} tuna cukru
+STR_0065_TOY                                                    :{COMMA} hracka
+STR_0066_BAG_OF_CANDY                                           :{COMMA} pytel bonbonu
 STR_0067_OF_COLA                                                :{VOLUME} coly
-STR_0068_TON_OF_COTTON_CANDY                                    :{COMMA16} tuna cukrové vaty
-STR_0069_BUBBLE                                                 :{COMMA16} bublin
-STR_006A_TON_OF_TOFFEE                                          :{COMMA16} tuna karamelu
-STR_006B_BATTERY                                                :{COMMA16} baterie
+STR_0068_TON_OF_COTTON_CANDY                                    :{COMMA} tuna cukrové vaty
+STR_0069_BUBBLE                                                 :{COMMA} bublin
+STR_006A_TON_OF_TOFFEE                                          :{COMMA} tuna karamelu
+STR_006B_BATTERY                                                :{COMMA} baterie
 STR_006C_OF_PLASTIC                                             :{VOLUME} plastu
-STR_006D_FIZZY_DRINK                                            :{COMMA16} limonád
+STR_006D_FIZZY_DRINK                                            :{COMMA} limonád
 STR_006E                                                        :
-STR_006F_PASSENGERS                                             :{COMMA16} cestujících
-STR_0070_TONS_OF_COAL                                           :{COMMA16} tun uhlí
-STR_0071_BAGS_OF_MAIL                                           :{COMMA16} baliku posty
+STR_006F_PASSENGERS                                             :{COMMA} cestujících
+STR_0070_TONS_OF_COAL                                           :{COMMA} tun uhlí
+STR_0071_BAGS_OF_MAIL                                           :{COMMA} baliku posty
 STR_0072_OF_OIL                                                 :{VOLUME} ropy
-STR_0073_ITEMS_OF_LIVESTOCK                                     :{COMMA16} kusu dobytka
-STR_0074_CRATES_OF_GOODS                                        :{COMMA16} krabic zbozi
-STR_0075_TONS_OF_GRAIN                                          :{COMMA16} tun zrní
-STR_0076_TONS_OF_WOOD                                           :{COMMA16} tun dreva
-STR_0077_TONS_OF_IRON_ORE                                       :{COMMA16} tun zelezne rudy
-STR_0078_TONS_OF_STEEL                                          :{COMMA16} tun oceli
-STR_0079_BAGS_OF_VALUABLES                                      :{COMMA16} baliku cenin
-STR_007A_TONS_OF_COPPER_ORE                                     :{COMMA16} tun medene rudy
-STR_007B_TONS_OF_MAIZE                                          :{COMMA16} tun kukurice
-STR_007C_TONS_OF_FRUIT                                          :{COMMA16} tun ovoce
-STR_007D_BAGS_OF_DIAMONDS                                       :{COMMA16} baliku diamantu
-STR_007E_TONS_OF_FOOD                                           :{COMMA16} tun jídla
-STR_007F_TONS_OF_PAPER                                          :{COMMA16} tun papíru
-STR_0080_BAGS_OF_GOLD                                           :{COMMA16} baliku zlata
+STR_0073_ITEMS_OF_LIVESTOCK                                     :{COMMA} kusu dobytka
+STR_0074_CRATES_OF_GOODS                                        :{COMMA} krabic zbozi
+STR_0075_TONS_OF_GRAIN                                          :{COMMA} tun zrní
+STR_0076_TONS_OF_WOOD                                           :{COMMA} tun dreva
+STR_0077_TONS_OF_IRON_ORE                                       :{COMMA} tun zelezne rudy
+STR_0078_TONS_OF_STEEL                                          :{COMMA} tun oceli
+STR_0079_BAGS_OF_VALUABLES                                      :{COMMA} baliku cenin
+STR_007A_TONS_OF_COPPER_ORE                                     :{COMMA} tun medene rudy
+STR_007B_TONS_OF_MAIZE                                          :{COMMA} tun kukurice
+STR_007C_TONS_OF_FRUIT                                          :{COMMA} tun ovoce
+STR_007D_BAGS_OF_DIAMONDS                                       :{COMMA} baliku diamantu
+STR_007E_TONS_OF_FOOD                                           :{COMMA} tun jídla
+STR_007F_TONS_OF_PAPER                                          :{COMMA} tun papíru
+STR_0080_BAGS_OF_GOLD                                           :{COMMA} baliku zlata
 STR_0081_OF_WATER                                               :{VOLUME} vody
-STR_0082_TONS_OF_WHEAT                                          :{COMMA16} tun psenice
+STR_0082_TONS_OF_WHEAT                                          :{COMMA} tun psenice
 STR_0083_OF_RUBBER                                              :{VOLUME} kaucuku
-STR_0084_TONS_OF_SUGAR                                          :{COMMA16} tun cukru
-STR_0085_TOYS                                                   :{COMMA16} hracek
-STR_0086_BAGS_OF_CANDY                                          :{COMMA16} pytlu bonbonu
+STR_0084_TONS_OF_SUGAR                                          :{COMMA} tun cukru
+STR_0085_TOYS                                                   :{COMMA} hracek
+STR_0086_BAGS_OF_CANDY                                          :{COMMA} pytlu bonbonu
 STR_0087_OF_COLA                                                :{VOLUME} coly
-STR_0088_TONS_OF_COTTON_CANDY                                   :{COMMA16} tun cukrové vaty
-STR_0089_BUBBLES                                                :{COMMA16} bublin
-STR_008A_TONS_OF_TOFFEE                                         :{COMMA16} tun karamelu
-STR_008B_BATTERIES                                              :{COMMA16} baterií
+STR_0088_TONS_OF_COTTON_CANDY                                   :{COMMA} tun cukrové vaty
+STR_0089_BUBBLES                                                :{COMMA} bublin
+STR_008A_TONS_OF_TOFFEE                                         :{COMMA} tun karamelu
+STR_008B_BATTERIES                                              :{COMMA} baterií
 STR_008C_OF_PLASTIC                                             :{VOLUME} plastu
-STR_008D_FIZZY_DRINKS                                           :{COMMA16} limonád
+STR_008D_FIZZY_DRINKS                                           :{COMMA} limonád
 STR_008E                                                        :
 STR_008F_PS                                                     :{TINYFONT}CS
 STR_0090_CL                                                     :{TINYFONT}UH
@@ -219,8 +219,8 @@
 STR_00DF_GREY                                                   :Seda
 STR_00E0_WHITE                                                  :Bílá
 STR_00E1_TOO_MANY_VEHICLES_IN_GAME                              :{WHITE}Prilis mnoho vozidel ve hre
-STR_00E2                                                        :{BLACK}{COMMA16}
-STR_00E3                                                        :{RED}{COMMA16}
+STR_00E2                                                        :{BLACK}{COMMA}
+STR_00E3                                                        :{RED}{COMMA}
 STR_00E4_LOCATION                                               :{BLACK}Umisteni
 STR_00E5_CONTOURS                                               :Profil
 STR_00E6_VEHICLES                                               :Dopravní prostredky
@@ -441,18 +441,18 @@
 STR_0198_PROFIT_THIS_YEAR_LAST_YEAR                             :{TINYFONT}{BLACK}Zisk tento rok: {CURRENCY} (minulý rok: {CURRENCY})
 
 ############ range for service numbers starts
-STR_0199_YEAR                                                   :{COMMA16} rok ({COMMA16})
-STR_019A_YEARS                                                  :{COMMA16} let ({COMMA16})
-STR_019B_YEARS                                                  :{RED}{COMMA16} let ({COMMA16})
+STR_0199_YEAR                                                   :{COMMA} rok ({COMMA})
+STR_019A_YEARS                                                  :{COMMA} let ({COMMA})
+STR_019B_YEARS                                                  :{RED}{COMMA} let ({COMMA})
 ############ range for service numbers ends
 
 STR_019C_ROAD_VEHICLE                                           :Silnicni vozidlo
 STR_019D_AIRCRAFT                                               :Letadlo
 STR_019E_SHIP                                                   :Lod
 STR_019F_TRAIN                                                  :Vlak
-STR_01A0_IS_GETTING_OLD                                         :{WHITE}{STRING} {COMMA16} je stare
-STR_01A1_IS_GETTING_VERY_OLD                                    :{WHITE}{STRING} {COMMA16} je velmi stare
-STR_01A2_IS_GETTING_VERY_OLD_AND                                :{WHITE}{STRING} {COMMA16} je velmi stare a potrebuje nahradit
+STR_01A0_IS_GETTING_OLD                                         :{WHITE}{STRING} {COMMA} je stare
+STR_01A1_IS_GETTING_VERY_OLD                                    :{WHITE}{STRING} {COMMA} je velmi stare
+STR_01A2_IS_GETTING_VERY_OLD_AND                                :{WHITE}{STRING} {COMMA} je velmi stare a potrebuje nahradit
 STR_01A3_LAND_AREA_INFORMATION                                  :{WHITE}Informace o uzemi
 STR_01A4_COST_TO_CLEAR_N_A                                      :{BLACK}Cena za vycisteni: {LTBLUE}N/A
 STR_01A5_COST_TO_CLEAR                                          :{BLACK}Cena za vycisteni: {LTBLUE}{CURRENCY}
@@ -497,7 +497,7 @@
 STR_01CA_31ST                                                   :31.
 ############ range for days	ends
 
-STR_01CB                                                        :{TINYFONT}{COMMA16}
+STR_01CB                                                        :{TINYFONT}{COMMA}
 STR_01CC_TOGGLE_LARGE_SMALL_MAP                                 :{BLACK}Prepnout velkou/malou mapu
 STR_01CD_SELECT_TUTORIAL_DEMONSTRATION                          :{WHITE}Zvolit Tutorial/Ukazka
 
@@ -509,7 +509,7 @@
 STR_CARGO_ACCEPTED_5                                            :{BLACK}Prijimane zbozi: {LTBLUE}{STRING}, {STRING}, {STRING}, {STRING}, {STRING}
 ############ range for cargo acecpted ends
 
-STR_01D1_8                                                      :({COMMA8}/8 {STRING})
+STR_01D1_8                                                      :({COMMA}/8 {STRING})
 STR_01D2_JAZZ_JUKEBOX                                           :{WHITE}Jukebox
 STR_01D3_SOUND_MUSIC                                            :Zvuk/Hudba
 STR_01D4_SHOW_SOUND_MUSIC_WINDOW                                :{BLACK}Ukázat zvukove/hudebni okno
@@ -528,16 +528,16 @@
 STR_01E1_START_PLAYING_MUSIC                                    :{BLACK}Zacit prehravat hudbu
 STR_01E2_DRAG_SLIDERS_TO_SET_MUSIC                              :{BLACK}Tahej posouvatka pro nastaveni hlasitosti hudby a zvukovych efektu
 STR_01E3                                                        :{DKGREEN}{TINYFONT}--
-STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA8}
-STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA8}
+STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA}
+STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA}
 STR_01E6                                                        :{DKGREEN}{TINYFONT}------
 STR_01E7                                                        :{DKGREEN}{TINYFONT}"{STRING}"
 STR_01E8_TRACK_XTITLE                                           :{BLACK}{TINYFONT}Skladba{SETX 88}Název
 STR_01E9_SHUFFLE                                                :{TINYFONT}Nahodne
 STR_01EA_PROGRAM                                                :{TINYFONT}{BLACK}Program
 STR_01EB_MUSIC_PROGRAM_SELECTION                                :{WHITE}Volba programu hudby
-STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA16} "{STRING}"
-STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA16}   "{STRING}"
+STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} "{STRING}"
+STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA}   "{STRING}"
 STR_01EE_TRACK_INDEX                                            :{TINYFONT}{BLACK}Index skladeb
 STR_01EF_PROGRAM                                                :{TINYFONT}{BLACK}Program - '{STRING}'
 STR_01F0_CLEAR                                                  :{TINYFONT}{BLACK}Vymazat
@@ -577,7 +577,7 @@
 STR_0210_TOO_FAR_FROM_PREVIOUS_DESTINATIO                       :{WHITE}...prilis daleko od predchazejiciho cile
 STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Nejlepsi spolecnosti, které dosáhly {NUMU16}{}({STRING} uroven)
 STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Tabulka spolecnosti v roce {NUMU16}
-STR_0212                                                        :{BIGFONT}{COMMA16}.
+STR_0212                                                        :{BIGFONT}{COMMA}.
 STR_0213_BUSINESSMAN                                            :Obchodník
 STR_0214_ENTREPRENEUR                                           :Manazer
 STR_0215_INDUSTRIALIST                                          :Továrník
@@ -586,12 +586,12 @@
 STR_0218_MOGUL                                                  :Velemagnát
 STR_0219_TYCOON_OF_THE_CENTURY                                  :Magnát století
 STR_HIGHSCORE_NAME                                              :{BIGFONT}{STRING}, {STRING}
-STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA16})
+STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA})
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{STRING} získal oznaceni '{STRING}'!
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{STRING} z {STRING} získal oznaceni '{STRING}' status!
 STR_021D                                                        :{BLACK}
 STR_021E                                                        :{WHITE}
-STR_021F                                                        :{BLUE}{COMMA16}
+STR_021F                                                        :{BLUE}{COMMA}
 STR_0220_CREATE_SCENARIO                                        :{BLACK}Vytvorit mapu
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Editor mapy
@@ -788,8 +788,8 @@
 STR_EXTRA_VIEW_PORT                                             :Dalsi pohled
 STR_SIGN_LIST                                                   :Seznam popisku
 STR_02DF_TOWN_DIRECTORY                                         :Seznam mest
-STR_TOWN_POPULATION                                             :{BLACK}Populace sveta: {COMMA32}
-STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Pohled {COMMA16}
+STR_TOWN_POPULATION                                             :{BLACK}Populace sveta: {COMMA}
+STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Pohled {COMMA}
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN                                :{BLACK}Nastavit jako pohled
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT                             :{BLACK}Nastavit soucasne zorné pole jako pohled
 STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW                                :{BLACK}Prejit na pohled
@@ -961,34 +961,34 @@
 STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Nemohu kopírovat seznam prikazu...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Konec sdílených prikazu - -
 
-STR_TRAIN_IS_LOST                                               :{WHITE}Vlak {COMMA16} je ztracen.
-STR_TRAIN_IS_UNPROFITABLE                                       :{WHITE}Zisk vlaku {COMMA16} za posledni rok byl {CURRENCY}
+STR_TRAIN_IS_LOST                                               :{WHITE}Vlak {COMMA} je ztracen.
+STR_TRAIN_IS_UNPROFITABLE                                       :{WHITE}Zisk vlaku {COMMA} za posledni rok byl {CURRENCY}
 STR_EURO_INTRODUCE                                              :{BLACK}{BIGFONT}Evropská menova unie{}{}Euro se v této zemi stalo jedinou menou pro kazdodenni obchodní transakce!
 
 # Start of order review system.
 # DON'T ADD OR REMOVE LINES HERE
-STR_TRAIN_HAS_TOO_FEW_ORDERS                                    :{WHITE}Vlak {COMMA16} má prilis málo prikazu
-STR_TRAIN_HAS_VOID_ORDER                                        :{WHITE}Vlak {COMMA16} nemá zadne prikazy
-STR_TRAIN_HAS_DUPLICATE_ENTRY                                   :{WHITE}Vlak {COMMA16} má zdvojené prikazy
-STR_TRAIN_HAS_INVALID_ENTRY                                     :{WHITE}Vlak {COMMA16} má v prikazech neplatnou stanici
-STR_ROADVEHICLE_HAS_TOO_FEW_ORDERS                              :{WHITE}Silnicni vozidlo {COMMA16} má prilis málo prikazu
-STR_ROADVEHICLE_HAS_VOID_ORDER                                  :{WHITE}Silnicni vozidlo {COMMA16} nemá zadne prikazy
-STR_ROADVEHICLE_HAS_DUPLICATE_ENTRY                             :{WHITE}Silnicni vozidlo {COMMA16} má zdvojené prikazy
-STR_ROADVEHICLE_HAS_INVALID_ENTRY                               :{WHITE}Silnicni vozidlo {COMMA16} má v prikazech neplatnou stanici
-STR_SHIP_HAS_TOO_FEW_ORDERS                                     :{WHITE}Lod {COMMA16} má prilis málo prikazu
-STR_SHIP_HAS_VOID_ORDER                                         :{WHITE}Lod {COMMA16} nemá zadne prikazy
-STR_SHIP_HAS_DUPLICATE_ENTRY                                    :{WHITE}Lod {COMMA16} má zdvojené prikazy
-STR_SHIP_HAS_INVALID_ENTRY                                      :{WHITE}Lod {COMMA16} má v prikazech neplatnou stanici
-STR_AIRCRAFT_HAS_TOO_FEW_ORDERS                                 :{WHITE}Letadlo {COMMA16} má prilis málo prikazu
-STR_AIRCRAFT_HAS_VOID_ORDER                                     :{WHITE}Letadlo {COMMA16} nemá zadne prikazy
-STR_AIRCRAFT_HAS_DUPLICATE_ENTRY                                :{WHITE}Letadlo {COMMA16} má zdvojené prikazy
-STR_AIRCRAFT_HAS_INVALID_ENTRY                                  :{WHITE}Letadlo {COMMA16} má v prikazech neplatnou stanici
+STR_TRAIN_HAS_TOO_FEW_ORDERS                                    :{WHITE}Vlak {COMMA} má prilis málo prikazu
+STR_TRAIN_HAS_VOID_ORDER                                        :{WHITE}Vlak {COMMA} nemá zadne prikazy
+STR_TRAIN_HAS_DUPLICATE_ENTRY                                   :{WHITE}Vlak {COMMA} má zdvojené prikazy
+STR_TRAIN_HAS_INVALID_ENTRY                                     :{WHITE}Vlak {COMMA} má v prikazech neplatnou stanici
+STR_ROADVEHICLE_HAS_TOO_FEW_ORDERS                              :{WHITE}Silnicni vozidlo {COMMA} má prilis málo prikazu
+STR_ROADVEHICLE_HAS_VOID_ORDER                                  :{WHITE}Silnicni vozidlo {COMMA} nemá zadne prikazy
+STR_ROADVEHICLE_HAS_DUPLICATE_ENTRY                             :{WHITE}Silnicni vozidlo {COMMA} má zdvojené prikazy
+STR_ROADVEHICLE_HAS_INVALID_ENTRY                               :{WHITE}Silnicni vozidlo {COMMA} má v prikazech neplatnou stanici
+STR_SHIP_HAS_TOO_FEW_ORDERS                                     :{WHITE}Lod {COMMA} má prilis málo prikazu
+STR_SHIP_HAS_VOID_ORDER                                         :{WHITE}Lod {COMMA} nemá zadne prikazy
+STR_SHIP_HAS_DUPLICATE_ENTRY                                    :{WHITE}Lod {COMMA} má zdvojené prikazy
+STR_SHIP_HAS_INVALID_ENTRY                                      :{WHITE}Lod {COMMA} má v prikazech neplatnou stanici
+STR_AIRCRAFT_HAS_TOO_FEW_ORDERS                                 :{WHITE}Letadlo {COMMA} má prilis málo prikazu
+STR_AIRCRAFT_HAS_VOID_ORDER                                     :{WHITE}Letadlo {COMMA} nemá zadne prikazy
+STR_AIRCRAFT_HAS_DUPLICATE_ENTRY                                :{WHITE}Letadlo {COMMA} má zdvojené prikazy
+STR_AIRCRAFT_HAS_INVALID_ENTRY                                  :{WHITE}Letadlo {COMMA} má v prikazech neplatnou stanici
 # end of order system
 
-STR_TRAIN_AUTORENEW_FAILED                                      :{WHITE}Obnovení vlaku {COMMA16} selhalo (financni limit)
-STR_ROADVEHICLE_AUTORENEW_FAILED                                :{WHITE}Obnovení silnicniho vozidla {COMMA16} selhalo (financni limit)
-STR_SHIP_AUTORENEW_FAILED                                       :{WHITE}Obnovení lodi {COMMA16} selhalo (financni limit)
-STR_AIRCRAFT_AUTORENEW_FAILED                                   :{WHITE}Obnovení letadla {COMMA16} selhalo (financni limit)
+STR_TRAIN_AUTORENEW_FAILED                                      :{WHITE}Obnovení vlaku {COMMA} selhalo (financni limit)
+STR_ROADVEHICLE_AUTORENEW_FAILED                                :{WHITE}Obnovení silnicniho vozidla {COMMA} selhalo (financni limit)
+STR_SHIP_AUTORENEW_FAILED                                       :{WHITE}Obnovení lodi {COMMA} selhalo (financni limit)
+STR_AIRCRAFT_AUTORENEW_FAILED                                   :{WHITE}Obnovení letadla {COMMA} selhalo (financni limit)
 
 STR_CONFIG_PATCHES                                              :{BLACK}Nastavit patche
 STR_CONFIG_PATCHES_TIP                                          :{BLACK}Nastavit patche
@@ -1103,7 +1103,7 @@
 STR_CHEATS_TIP                                                  :{BLACK}Zaskrtavaci policka indikuji jestli jsi tento cheat jiz pouzil.
 STR_CHEATS_WARNING                                              :{BLACK}Varování! Chystas se podvést ostatní hrace. Pamatuj si, ze tento podlý cin nebude nikdy zapomenut!
 STR_CHEAT_MONEY                                                 :{LTBLUE}Navysit peníze o {CURRENCY64}
-STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Hrajes jako hrac: {ORANGE}{COMMA16}
+STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Hrajes jako hrac: {ORANGE}{COMMA}
 STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Magický buldozer (odstraní prumysl a neodstranitelné predmety): {ORANGE}{STRING}
 STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Tunely se mohou krizit: {ORANGE}{STRING}
 STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Povolit staveni v pauze: {ORANGE}{STRING}
@@ -1119,7 +1119,7 @@
 STR_GO_NON_STOP_TO_WAYPOINT                                     :Jet bez zastávky pres {WAYPOINT}
 
 STR_WAYPOINTNAME_CITY                                           :Kontrolní bod {TOWN}
-STR_WAYPOINTNAME_CITY_SERIAL                                    :Kontrolní bod {TOWN} #{COMMA16}
+STR_WAYPOINTNAME_CITY_SERIAL                                    :Kontrolní bod {TOWN} #{COMMA}
 STR_LANDINFO_WAYPOINT                                           :Kontrolní bod
 
 STR_WAYPOINT                                                    :{WHITE}Kontrolní bod
@@ -1202,8 +1202,8 @@
 STR_CONSTRUCT_SUGAR_MINE_TIP                                    :{BLACK}Vyhloubit cukrový dul
 
 STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Prumysl
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}){YELLOW} ({COMMA16}% prepraveno)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}/{STRING}){YELLOW} ({COMMA16}%/{COMMA16}% prepraveno)
+STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}){YELLOW} ({COMMA}% prepraveno)
+STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}/{STRING}){YELLOW} ({COMMA}%/{COMMA}% prepraveno)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{TOWN} {STRING}
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...prilis blízko k jinému prumyslu
@@ -1243,15 +1243,15 @@
 STR_NETWORK_ADD_SERVER_TIP                                      :{BLACK}Prida server do seznamu, ve kterém se budou hledat bezici hry.
 STR_NETWORK_ENTER_IP                                            :{BLACK}Vloz IP adresu serveru
 
-STR_NETWORK_CLIENTS_ONLINE                                      :{BLACK}{COMMA16}/{COMMA16}
+STR_NETWORK_CLIENTS_ONLINE                                      :{BLACK}{COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Hracu
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Hracu online / maximalne
 STR_NETWORK_GAME_INFO                                           :{SILVER}INFO O HRE
 STR_ORANGE                                                      :{ORANGE}{STRING}
-STR_NETWORK_CLIENTS                                             :{SILVER}Klientu:  {WHITE}{COMMA8} / {COMMA8}
+STR_NETWORK_CLIENTS                                             :{SILVER}Klientu:  {WHITE}{COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}Jazyk:  {WHITE}{STRING}
 STR_NETWORK_TILESET                                             :{SILVER}Prostredi:  {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Velikost mapy:  {WHITE}{COMMA16}x{COMMA16}
+STR_NETWORK_MAP_SIZE                                            :{SILVER}Velikost mapy:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Verze hry na serveru:  {WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Adresa serveru:  {WHITE}{STRING} : {NUMU16}
 STR_NETWORK_START_DATE                                          :{SILVER}Pocatecni datum:  {WHITE}{DATE_SHORT}
@@ -1515,21 +1515,21 @@
 
 ##id 0x2000
 STR_2000_TOWNS                                                  :{WHITE}Mesta
-STR_TOWN_LABEL_POP                                              :{WHITE}{STRING} ({COMMA32})
+STR_TOWN_LABEL_POP                                              :{WHITE}{STRING} ({COMMA})
 STR_2001                                                        :{WHITE}{STRING}
 STR_2002                                                        :{TINYFONT}{BLACK}{STRING}
 STR_2003                                                        :{TINYFONT}{WHITE}{STRING}
 STR_2004_BUILDING_MUST_BE_DEMOLISHED                            :{WHITE}Budova musi byt nejprve znicena
 STR_2005                                                        :{WHITE}{TOWN}
-STR_2006_POPULATION                                             :{BLACK}Populace: {ORANGE}{COMMA32}{BLACK} Domu: {ORANGE}{COMMA32}
+STR_2006_POPULATION                                             :{BLACK}Populace: {ORANGE}{COMMA}{BLACK} Domu: {ORANGE}{COMMA}
 STR_2007_RENAME_TOWN                                            :Prejmenovat mesto
 STR_2008_CAN_T_RENAME_TOWN                                      :{WHITE}Nemohu prejmenovat mesto:
 STR_2009_LOCAL_AUTHORITY_REFUSES                                :{WHITE}Místní správa mesta {TOWN} odmita vydat povoleni.
 STR_200A_TOWN_NAMES_CLICK_ON_NAME                               :{BLACK}Jména mest - stiskni na jmenu mesta pro pohled na mesto
 STR_200B_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Umistit pohled na mesto
 STR_200C_CHANGE_TOWN_NAME                                       :{BLACK}Zmenit jméno mesta
-STR_200D_PASSENGERS_LAST_MONTH_MAX                              :{BLACK}Cestující minulý mesic: {ORANGE}{COMMA32}{BLACK}  max: {ORANGE}{COMMA32}
-STR_200E_MAIL_LAST_MONTH_MAX                                    :{BLACK}Posta minulý mesic: {ORANGE}{COMMA32}{BLACK}  max: {ORANGE}{COMMA32}
+STR_200D_PASSENGERS_LAST_MONTH_MAX                              :{BLACK}Cestující minulý mesic: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
+STR_200E_MAIL_LAST_MONTH_MAX                                    :{BLACK}Posta minulý mesic: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
 STR_200F_TALL_OFFICE_BLOCK                                      :Vysoký kancelarsky blok
 STR_2010_OFFICE_BLOCK                                           :Kancelarsky blok
 STR_2011_SMALL_BLOCK_OF_FLATS                                   :Malé bytovky
@@ -1603,7 +1603,7 @@
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Podplatit místní správu pro zvyseni hodnocení spolecnosti. Riziko trestu v pripade pristizeni.{}  Cena: {CURRENCY}
 STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Dopravni chaos v {TOWN}!{}{}Program prestavby ulic sponzorovaný {STRING} prinasi motoristum 6 mesicu utrpení!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
-STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA32})
+STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA})
 STR_2058_UNDER_CONSTRUCTION                                     :{STRING} (ve vystavbe)
 STR_2059_IGLOO                                                  :Iglu
 STR_205A_TEPEES                                                 :Teepee
@@ -1665,7 +1665,7 @@
 STR_303C_OUTSTANDING                                            :Uzasne
 ############ range for rating ends
 
-STR_303D                                                        :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA8}%)
+STR_303D                                                        :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_303E_NO_LONGER_ACCEPTS                                      :{WHITE}{STATION} uz více neprijima {STRING}
 STR_303F_NO_LONGER_ACCEPTS_OR                                   :{WHITE}{STATION} uz více neprijima {STRING} nebo {STRING}
 STR_3040_NOW_ACCEPTS                                            :{WHITE}{STATION} nyní prijima {STRING}
@@ -1676,7 +1676,7 @@
 STR_3045_TOO_CLOSE_TO_ANOTHER_TRUCK                             :{WHITE}Prilis blizko k jiné nákladové rampe
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Musis nejprve znicit autobusovou zastávku
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Musis nejprve znicit nákladovou rampu
-STR_3048_STATIONS                                               :{WHITE}{STRING} - {COMMA16} stanic
+STR_3048_STATIONS                                               :{WHITE}{STRING} - {COMMA} stanic
 STR_3049_0                                                      :{YELLOW}{STATION} {STRINL 0x30D1}
 STR_304A_NONE                                                   :{YELLOW}- Nic -
 STR_304B_SITE_UNSUITABLE                                        :{WHITE}...nepouzitelne místo
@@ -1733,7 +1733,7 @@
 STR_4002_SAVE                                                   :{BLACK}Ulozit
 STR_4003_DELETE                                                 :{BLACK}Smazat
 STR_4004                                                        :{STRING}, {DATE_LONG}
-STR_4005_BYTES_FREE                                             :{BLACK}{COMMA32} MB volných
+STR_4005_BYTES_FREE                                             :{BLACK}{COMMA} MB volných
 STR_4006_UNABLE_TO_READ_DRIVE                                   :{BLACK}Nemohu cist jednotku
 STR_4007_GAME_SAVE_FAILED                                       :{WHITE}Ulozeni hry selhalo
 STR_4008_UNABLE_TO_DELETE_FILE                                  :{WHITE}Nemohu smazat soubor
@@ -1794,7 +1794,7 @@
 ############ range for requires	ends
 
 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Produkce minulý mesic:
-STR_482B_TRANSPORTED                                            :{YELLOW}{STRING}{BLACK} ({COMMA16}% prepraveno)
+STR_482B_TRANSPORTED                                            :{YELLOW}{STRING}{BLACK} ({COMMA}% prepraveno)
 STR_482C_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Nastavit pohled na prumysl
 STR_482D_NEW_UNDER_CONSTRUCTION                                 :{BLACK}{BIGFONT}{STRING} v konstrukci pobliz mesta {TOWN}!
 STR_482E_NEW_BEING_PLANTED_NEAR                                 :{BLACK}{BIGFONT}Nový {STRING} je vysazen pobliz mesta {TOWN}!
@@ -1811,8 +1811,8 @@
 STR_4839_PRODUCTION_DOWN_BY_50                                  :{BLACK}{BIGFONT}{TOWN} {STRING} produkce poklesla o 50%
 STR_483A_INSECT_INFESTATION_CAUSES                              :{BLACK}{BIGFONT}Zamoreni skudci v {TOWN} {STRING}!{}Produkce poklesla o 50%
 STR_483B_CAN_ONLY_BE_POSITIONED                                 :{WHITE}...muze byt umisteno pouze pobliz okraju mapy
-STR_INDUSTRY_PROD_GOUP                                          :{BLACK}{BIGFONT}Produkce {STRING} v {TOWN} {STRING} vzrostla o {COMMA16}%!
-STR_INDUSTRY_PROD_GODOWN                                        :{BLACK}{BIGFONT}Produkce {STRING} v {TOWN} {STRING} poklesla o {COMMA16}%!
+STR_INDUSTRY_PROD_GOUP                                          :{BLACK}{BIGFONT}Produkce {STRING} v {TOWN} {STRING} vzrostla o {COMMA}%!
+STR_INDUSTRY_PROD_GODOWN                                        :{BLACK}{BIGFONT}Produkce {STRING} v {TOWN} {STRING} poklesla o {COMMA}%!
 
 ##id 0x5000
 STR_5000_TRAIN_IN_TUNNEL                                        :{WHITE}Vlak v tunelu
@@ -1875,10 +1875,10 @@
 ##id 0x6000
 STR_SV_EMPTY                                                    :
 STR_SV_UNNAMED                                                  :Beze jména{SKIP}
-STR_SV_TRAIN_NAME                                               :Vlak {COMMA16}
-STR_SV_ROADVEH_NAME                                             :Silnicni vozidlo {COMMA16}
-STR_SV_SHIP_NAME                                                :Lod {COMMA16}
-STR_SV_AIRCRAFT_NAME                                            :Letadlo {COMMA16}
+STR_SV_TRAIN_NAME                                               :Vlak {COMMA}
+STR_SV_ROADVEH_NAME                                             :Silnicni vozidlo {COMMA}
+STR_SV_SHIP_NAME                                                :Lod {COMMA}
+STR_SV_AIRCRAFT_NAME                                            :Letadlo {COMMA}
 
 STR_SV_STNAME                                                   :{STRING}
 STR_SV_STNAME_NORTH                                             :{STRING} sever
@@ -1928,12 +1928,12 @@
 ############ range for difficulty levels ends
 
 ############ range for difficulty settings starts
-STR_6805_MAXIMUM_NO_COMPETITORS                                 :{LTBLUE}Maximalni pocet protivniku: {ORANGE}{COMMA16}
+STR_6805_MAXIMUM_NO_COMPETITORS                                 :{LTBLUE}Maximalni pocet protivniku: {ORANGE}{COMMA}
 STR_6806_COMPETITOR_START_TIME                                  :{LTBLUE}Cas startu protivniku: {ORANGE}{STRING}
 STR_6807_NO_OF_TOWNS                                            :{LTBLUE}Mnozstvi mest: {ORANGE}{STRING}
 STR_6808_NO_OF_INDUSTRIES                                       :{LTBLUE}Mnozstvi prumyslu: {ORANGE}{STRING}
 STR_6809_MAXIMUM_INITIAL_LOAN_000                               :{LTBLUE}Maximalni pocatecni dluh: {ORANGE}{CURRENCY}
-STR_680A_INITIAL_INTEREST_RATE                                  :{LTBLUE}Pocatecni urokova sazba: {ORANGE}{COMMA16}%
+STR_680A_INITIAL_INTEREST_RATE                                  :{LTBLUE}Pocatecni urokova sazba: {ORANGE}{COMMA}%
 STR_680B_VEHICLE_RUNNING_COSTS                                  :{LTBLUE}Cena provozu vozidel: {ORANGE}{STRING}
 STR_680C_CONSTRUCTION_SPEED_OF_COMPETITOR                       :{LTBLUE}Rychlost výstavby protivniku: {ORANGE}{STRING}
 STR_680D_INTELLIGENCE_OF_COMPETITORS                            :{LTBLUE}Inteligence protivniku: {ORANGE}{STRING}
@@ -1992,7 +1992,7 @@
 ##id 0x7000
 STR_7000                                                        :
 STR_7001                                                        :{WHITE}{STRING} {BLACK}{STRING}
-STR_7002_PLAYER                                                 :(hrac {COMMA16})
+STR_7002_PLAYER                                                 :(hrac {COMMA})
 STR_7004_NEW_FACE                                               :{BLACK}Nový oblicej
 STR_7005_COLOR_SCHEME                                           :{BLACK}Barva
 STR_7006_COLOR_SCHEME                                           :{GOLD}Barevné schéma:
@@ -2026,7 +2026,7 @@
 STR_7022_INCOME_GRAPH                                           :{WHITE}Graf prijmu
 STR_CURRCOMPACT32                                               :{CURRCOMPACT}
 STR_CURRCOMPACT64                                               :{CURRCOMPACT64}
-STR_7024                                                        :{COMMA32}
+STR_7024                                                        :{COMMA}
 STR_7025_OPERATING_PROFIT_GRAPH                                 :{WHITE}Graf provozního zisku
 STR_7026_BANK_BALANCE                                           :{WHITE}Stav na uctu
 STR_7027_LOAN                                                   :{WHITE}Pujcka
@@ -2050,14 +2050,14 @@
 STR_7037_PRESIDENT                                              :{WHITE}{STRING}{}{GOLD}(Prezident)
 STR_7038_INAUGURATED                                            :{GOLD}Zalozeno: {WHITE}{NUMU16}
 STR_7039_VEHICLES                                               :{GOLD}Vozidla:
-STR_703A_TRAIN                                                  :{WHITE}{COMMA16} vlak
-STR_703B_TRAINS                                                 :{WHITE}{COMMA16} vlaku
-STR_703C_ROAD_VEHICLE                                           :{WHITE}{COMMA16} silnicni vozidlo
-STR_703D_ROAD_VEHICLES                                          :{WHITE}{COMMA16} silnicnich vozidel
-STR_703E_AIRCRAFT                                               :{WHITE}{COMMA16} letadlo
-STR_703F_AIRCRAFT                                               :{WHITE}{COMMA16} letadel
-STR_7040_SHIP                                                   :{WHITE}{COMMA16} lod
-STR_7041_SHIPS                                                  :{WHITE}{COMMA16} lodí
+STR_703A_TRAIN                                                  :{WHITE}{COMMA} vlak
+STR_703B_TRAINS                                                 :{WHITE}{COMMA} vlaku
+STR_703C_ROAD_VEHICLE                                           :{WHITE}{COMMA} silnicni vozidlo
+STR_703D_ROAD_VEHICLES                                          :{WHITE}{COMMA} silnicnich vozidel
+STR_703E_AIRCRAFT                                               :{WHITE}{COMMA} letadlo
+STR_703F_AIRCRAFT                                               :{WHITE}{COMMA} letadel
+STR_7040_SHIP                                                   :{WHITE}{COMMA} lod
+STR_7041_SHIPS                                                  :{WHITE}{COMMA} lodí
 STR_7042_NONE                                                   :{WHITE}Nic
 STR_7043_FACE_SELECTION                                         :{WHITE}Volba tvare
 STR_7044_MALE                                                   :{BLACK}Muzske
@@ -2122,8 +2122,8 @@
 STR_707A_SELL_25_SHARE_IN_THIS_COMPANY                          :{BLACK}Prodat 25% podíl v této spolecnosti
 STR_707B_CAN_T_BUY_25_SHARE_IN_THIS                             :{WHITE}Nemohu koupit 25% podíl v této spolecnosti...
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}Nemohu prodat 25% podíl v této spolecnosti...
-STR_707D_OWNED_BY                                               :{WHITE}({COMMA16}% vlastneno {STRING})
-STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA16}% vlastneno {STRING}{}   {COMMA16}% vlastneno {STRING})
+STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% vlastneno {STRING})
+STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}% vlastneno {STRING}{}   {COMMA}% vlastneno {STRING})
 STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{STRING} byla prevzata {STRING}!
 STR_7080_PROTECTED                                              :{WHITE}Tato spolecnost zatím neobchoduje s akciemi...
 
@@ -2398,8 +2398,8 @@
 STR_8801_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Obyvatelé oslavují...{}První vlak dorazil do {STATION}!
 STR_8802_DETAILS                                                :{WHITE}{STRING} (Detaily)
 STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}V ceste je vlak
-STR_8804                                                        :{SETX 10}{COMMA8}: {STRING}
-STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA8}: {STRING}
+STR_8804                                                        :{SETX 10}{COMMA}: {STRING}
+STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING}
 STR_8806_GO_TO                                                  :Jet do {STATION}
 STR_8807_GO_TO_TRANSFER                                         :Jet do {STATION} (prelozit a nalozit jiný náklad)
 STR_8808_GO_TO_UNLOAD                                           :Jet do {STATION} (vylozit)
@@ -2425,13 +2425,13 @@
 STR_UNKNOWN_DESTINATION                                         :neznámý cíl
 STR_8812_EMPTY                                                  :{LTBLUE}Prázdný
 STR_8813_FROM                                                   :{LTBLUE}{CARGO} z {STATION}
-STR_8814_TRAIN_IS_WAITING_IN_DEPOT                              :{WHITE}Vlak {COMMA16} ceka v depu
+STR_8814_TRAIN_IS_WAITING_IN_DEPOT                              :{WHITE}Vlak {COMMA} ceka v depu
 STR_8815_NEW_VEHICLES                                           :{BLACK}Nová vozidla
 STR_8816                                                        :{BLACK}-
 STR_8818_INFORMATION                                            :{BLACK}Informace
 STR_8819_TRAIN_TOO_LONG                                         :{WHITE}Prilis dlouhý vlak
 STR_881A_TRAINS_CAN_ONLY_BE_ALTERED                             :{WHITE}Vlaky lze menit, jen kdyz stojí uvnitr depa
-STR_881B_TRAINS                                                 :{WHITE}{STRING} - {COMMA16} vlaku
+STR_881B_TRAINS                                                 :{WHITE}{STRING} - {COMMA} vlaku
 STR_881C_NEW_RAIL_VEHICLES                                      :{WHITE}Nové lokomotivy a vagony
 STR_881D_NEW_MONORAIL_VEHICLES                                  :{WHITE}Nové lokomotivy a vagony pro monorail
 STR_881E_NEW_MAGLEV_VEHICLES                                    :{WHITE}Nové lokomotivy a vagony pro maglev
@@ -2465,8 +2465,8 @@
 STR_8839_CAN_T_SELL_RAILROAD_VEHICLE                            :{WHITE}Nemohu prodat vagon/lokomotivu...
 STR_883A_UNABLE_TO_FIND_ROUTE_TO                                :{WHITE}Nemohu najít cestu do místního depa...
 STR_883B_CAN_T_STOP_START_TRAIN                                 :{WHITE}Nemohu rozjet/zastavit vlak...
-STR_883C_SERVICING_INTERVAL_DAYS                                :{BLACK}Interval servisu: {LTBLUE}{COMMA16}dní{BLACK}   Naposledy v servisu: {LTBLUE}{DATE_LONG}
-STR_SERVICING_INTERVAL_PERCENT                                  :{BLACK}Interval servisu: {LTBLUE}{COMMA16}%{BLACK}   Naposledy v servisu: {LTBLUE}{DATE_LONG}
+STR_883C_SERVICING_INTERVAL_DAYS                                :{BLACK}Interval servisu: {LTBLUE}{COMMA}dní{BLACK}   Naposledy v servisu: {LTBLUE}{DATE_LONG}
+STR_SERVICING_INTERVAL_PERCENT                                  :{BLACK}Interval servisu: {LTBLUE}{COMMA}%{BLACK}   Naposledy v servisu: {LTBLUE}{DATE_LONG}
 STR_883D_TRAINS_CLICK_ON_TRAIN_FOR                              :{BLACK}Vlaky - klepni na vlak pro informace
 STR_883E_BUILD_NEW_TRAINS_REQUIRES                              :{BLACK}Kupovat nové vlaky (vyzaduje zeleznicni depo)
 STR_883F_TRAINS_CLICK_ON_TRAIN_FOR                              :{BLACK}Vlaky - stiskni na vlaku pro info, presun vagon pro pridani ci odebrani z vlaku
@@ -2499,12 +2499,12 @@
 STR_SERVICE_HINT                                                :{BLACK}Preskoc tento cil pokud neni potreba pravidelna udrzba
 STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}Dalsi {STRING} je k dispozici!
 STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
-STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Cena: {CURRENCY} Hmotnost: {COMMA16}t{}Rychlost: {VELOCITY}  Výkon: {COMMA16} koní{}Cena provozu: {CURRENCY} rocne{}Kapacita: {STRING}
+STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Cena: {CURRENCY} Hmotnost: {COMMA}t{}Rychlost: {VELOCITY}  Výkon: {COMMA} koní{}Cena provozu: {CURRENCY} rocne{}Kapacita: {STRING}
 STR_885C_BROKEN_DOWN                                            :{RED}Porucha
 STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Stari: {LTBLUE}{STRING}{BLACK}   Cena provozu: {LTBLUE}{CURRENCY} rocne
-STR_885E_WEIGHT_T_POWER_HP_MAX_SPEED                            :{BLACK}Hmotnost: {LTBLUE}{COMMA16}t  {BLACK}Výkon: {LTBLUE}{COMMA32} koní{BLACK} Max. rychlost: {LTBLUE}{VELOCITY}
+STR_885E_WEIGHT_T_POWER_HP_MAX_SPEED                            :{BLACK}Hmotnost: {LTBLUE}{COMMA}t  {BLACK}Výkon: {LTBLUE}{COMMA} koní{BLACK} Max. rychlost: {LTBLUE}{VELOCITY}
 STR_885F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Prijem tento rok: {LTBLUE}{CURRENCY}  (minulý rok: {CURRENCY})
-STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Spolehlivost: {LTBLUE}{COMMA8}%  {BLACK}Poruch od posledního servisu: {LTBLUE}{COMMA16}
+STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Spolehlivost: {LTBLUE}{COMMA}%  {BLACK}Poruch od posledního servisu: {LTBLUE}{COMMA}
 STR_8861_STOPPED                                                :{RED}Zastaveno
 STR_8862_CAN_T_MAKE_TRAIN_PASS_SIGNAL                           :{WHITE}Nemohu vlak nechat projet semafory v nebezpeci...
 STR_8863_CRASHED                                                :{RED}Nehoda!
@@ -2512,7 +2512,7 @@
 STR_8865_NAME_TRAIN                                             :{WHITE}Pojmenovat vlak
 STR_8866_CAN_T_NAME_TRAIN                                       :{WHITE}Nelze pojmenovat vlak...
 STR_8867_NAME_TRAIN                                             :{BLACK}Pojmenovat vlak
-STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Zaleznicni nestesti!{}{COMMA16} lidi zemrelo po srazce v plamenech
+STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Zaleznicni nestesti!{}{COMMA} lidi zemrelo po srazce v plamenech
 STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}Nemohu zmenit smer vlaku...
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Prejmenovat typ zeleznicniho vozidla
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Nemohu prejmenovat typ zeleznicniho vozidla...
@@ -2524,7 +2524,7 @@
 
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Silnicni vozidlo v ceste
-STR_9001_ROAD_VEHICLES                                          :{WHITE}{STRING} - {COMMA16} silnicnich vozidel
+STR_9001_ROAD_VEHICLES                                          :{WHITE}{STRING} - {COMMA} silnicnich vozidel
 STR_9002                                                        :{WHITE}{STRING}
 STR_9003_ROAD_VEHICLE_DEPOT                                     :{WHITE}Garaze pro silnicni vozidla {TOWN}
 STR_9004_NEW_VEHICLES                                           :{BLACK}Nová silnicni vozidla
@@ -2538,13 +2538,13 @@
 STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Stari: {LTBLUE}{STRING}{BLACK}   Cena provozu: {LTBLUE}{CURRENCY} rocne
 STR_900E_MAX_SPEED                                              :{BLACK}Max. rychlost: {LTBLUE}{VELOCITY}
 STR_900F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Prijem tento rok: {LTBLUE}{CURRENCY}  (minulý rok): {CURRENCY})
-STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Spolehlivost: {LTBLUE}{COMMA8}%  {BLACK}Poruch od posledního servisu: {LTBLUE}{COMMA16}
+STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Spolehlivost: {LTBLUE}{COMMA}%  {BLACK}Poruch od posledního servisu: {LTBLUE}{COMMA}
 STR_9011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Koupen: {LTBLUE}{NUMU16}{BLACK} Cena: {LTBLUE}{CURRENCY}
 STR_9012_CAPACITY                                               :{BLACK}Kapacita: {LTBLUE}{STRING}
 STR_9013_MUST_BE_STOPPED_INSIDE                                 :{WHITE}...musi byt zastaven v garazi
 STR_9014_CAN_T_SELL_ROAD_VEHICLE                                :{WHITE}Nemohu prodat silnicni vozidlo...
 STR_9015_CAN_T_STOP_START_ROAD_VEHICLE                          :{WHITE}Nemohu zastavit/rozjet silnicni vozidlo...
-STR_9016_ROAD_VEHICLE_IS_WAITING                                :{WHITE}Silnicni vozidlo {COMMA16} ceka v garazi
+STR_9016_ROAD_VEHICLE_IS_WAITING                                :{WHITE}Silnicni vozidlo {COMMA} ceka v garazi
 STR_HEADING_FOR_ROAD_DEPOT                                      :{LTBLUE}Mirim do garaze {TOWN}
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{LTBLUE}Mirim do garaze {TOWN} , {VELOCITY}
 STR_9018_CAN_T_SEND_VEHICLE_TO_DEPOT                            :{WHITE}Nemohu poslat silnicni vozidlo do garaze...
@@ -2573,7 +2573,7 @@
 STR_902F_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Obyvatelé oslavují...{}První autobus prijel do {STATION}!
 STR_9030_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Obyvatelé oslavují...{}První nákladní vozidlo prijelo do {STATION}!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Dopravní nehoda!{}Ridic zahynul v plamenech pri srazce s vlakem
-STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Dopravní nehoda!{}{COMMA16} lidí zahynulo v plamenech pri srazce s vlakem
+STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Dopravní nehoda!{}{COMMA} lidí zahynulo v plamenech pri srazce s vlakem
 STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}Nelze otocit vozidlo...
 STR_9034_RENAME                                                 :{BLACK}Prejmenovat
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Prejmenovat typ silnicniho vozidla
@@ -2588,7 +2588,7 @@
 STR_9802_CAN_T_BUILD_DOCK_HERE                                  :{WHITE}Zde nelze postavit pristav...
 STR_9803_SHIP_DEPOT                                             :{WHITE}Lodní depo {TOWN}
 STR_9804_NEW_SHIPS                                              :{BLACK}Nové lode
-STR_9805_SHIPS                                                  :{WHITE}{STRING} - {COMMA16} lodí
+STR_9805_SHIPS                                                  :{WHITE}{STRING} - {COMMA} lodí
 STR_9806_CAN_T_BUILD_SHIPS                                      :{WHITE}Nemohu koupit lod...
 STR_9807_MUST_BUILD_SHIP_DEPOT_FIRST                            :{WHITE}Nejprve musis postavit lodní depo
 STR_9808_NEW_SHIPS                                              :{WHITE}Nové lode
@@ -2603,7 +2603,7 @@
 STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Stari: {LTBLUE}{STRING}{BLACK}   Cena provozu: {LTBLUE}{CURRENCY} rocne
 STR_9813_MAX_SPEED                                              :{BLACK}Max. rychlost: {LTBLUE}{VELOCITY}
 STR_9814_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Prijem tento rok: {LTBLUE}{CURRENCY}  (minulý rok: {CURRENCY})
-STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Spolehlivost: {LTBLUE}{COMMA8}%  {BLACK}Poruch od posledního servisu: {LTBLUE}{COMMA16}
+STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Spolehlivost: {LTBLUE}{COMMA}%  {BLACK}Poruch od posledního servisu: {LTBLUE}{COMMA}
 STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Koupeno: {LTBLUE}{NUMU16}{BLACK} Cena: {LTBLUE}{CURRENCY}
 STR_9817_CAPACITY                                               :{BLACK}Kapacita: {LTBLUE}{STRING}
 STR_9818_CAN_T_STOP_START_SHIP                                  :{WHITE}Nelze rozjet/zastavit lod...
@@ -2611,7 +2611,7 @@
 STR_981A_UNABLE_TO_FIND_LOCAL_DEPOT                             :{WHITE}Nemohu najít místní depo
 STR_HEADING_FOR_SHIP_DEPOT                                      :{LTBLUE}Jedu do depa {TOWN}
 STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{LTBLUE}Jedu do depa {TOWN}, {VELOCITY}
-STR_981C_SHIP_IS_WAITING_IN_DEPOT                               :{WHITE}Lod {COMMA16} ceka v depu
+STR_981C_SHIP_IS_WAITING_IN_DEPOT                               :{WHITE}Lod {COMMA} ceka v depu
 STR_981D_BUILD_SHIP_DOCK                                        :{BLACK}Postavit pristavní molo
 STR_981E_BUILD_SHIP_DEPOT_FOR_BUILDING                          :{BLACK}Postavit lodní depo (na nákup a servis lodí)
 STR_981F_SHIPS_CLICK_ON_SHIP_FOR                                :{BLACK}Lode - informace ziskas klepnutím na jméno lodi
@@ -2662,19 +2662,19 @@
 STR_A005_NEW_AIRCRAFT                                           :{WHITE}Nové letadlo
 STR_A006_BUILD_AIRCRAFT                                         :{BLACK}Koupit letadlo
 STR_A008_CAN_T_BUILD_AIRCRAFT                                   :{WHITE}Nelze koupit letadlo...
-STR_A009_AIRCRAFT                                               :{WHITE}{STRING} - {COMMA16} letadel a helikoptér
+STR_A009_AIRCRAFT                                               :{WHITE}{STRING} - {COMMA} letadel a helikoptér
 STR_A00A                                                        :{WHITE}{STRING}
 STR_A00B_ORDERS                                                 :{WHITE}{STRING} (Prikazy)
 STR_A00C_DETAILS                                                :{WHITE}{STRING} (Detaily)
 STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Stari: {LTBLUE}{STRING}{BLACK}   Cena provozu: {LTBLUE}{CURRENCY} rocne
 STR_A00E_MAX_SPEED                                              :{BLACK}Max. rychlost: {LTBLUE}{VELOCITY}
 STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Prijem tento rok: {LTBLUE}{CURRENCY}  (minulý rok: {CURRENCY})
-STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Spolehlivost: {LTBLUE}{COMMA8}%  {BLACK}Poruch od posledního servisu: {LTBLUE}{COMMA16}
+STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Spolehlivost: {LTBLUE}{COMMA}%  {BLACK}Poruch od posledního servisu: {LTBLUE}{COMMA}
 STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Koupeno: {LTBLUE}{NUMU16}{BLACK} Cena: {LTBLUE}{CURRENCY}
 STR_A012_CAN_T_SEND_AIRCRAFT_TO                                 :{WHITE}Nelze poslat letadlo do hangáru...
 STR_HEADING_FOR_HANGAR                                          :{LTBLUE}Jedu do hangáru {STATION}
 STR_HEADING_FOR_HANGAR_VEL                                      :{LTBLUE}Jedu do hangáru {STATION}, {VELOCITY}
-STR_A014_AIRCRAFT_IS_WAITING_IN                                 :{WHITE}Letadlo {COMMA16} ceka v hangáru
+STR_A014_AIRCRAFT_IS_WAITING_IN                                 :{WHITE}Letadlo {COMMA} ceka v hangáru
 STR_A015_AIRCRAFT_IN_THE_WAY                                    :{WHITE}Letadlo v ceste
 STR_A016_CAN_T_STOP_START_AIRCRAFT                              :{WHITE}Nemohu rozjet/zastavit letadlo...
 STR_A017_AIRCRAFT_IS_IN_FLIGHT                                  :{WHITE}Letadlo letí
@@ -2700,14 +2700,14 @@
 STR_A02B_SHOW_AIRCRAFT_DETAILS                                  :{BLACK}Ukázat detaily letadla
 STR_A02C_NEW_AIRCRAFT_NOW_AVAILABLE                             :{BLACK}{BIGFONT}Nové letadlo je k dispozici!
 STR_A02D                                                        :{BLACK}{BIGFONT}{STRING}
-STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Cena: {CURRENCY} Max. rychlost: {VELOCITY}{}Kapacita: {COMMA16} cestujících, {COMMA16} baliku posty{}Cena provozu: {CURRENCY} rocne
+STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Cena: {CURRENCY} Max. rychlost: {VELOCITY}{}Kapacita: {COMMA} cestujících, {COMMA} baliku posty{}Cena provozu: {CURRENCY} rocne
 
 STR_A030_NAME_AIRCRAFT                                          :{WHITE}Prejmenovat letadlo
 STR_A031_CAN_T_NAME_AIRCRAFT                                    :{WHITE}Nelze prejmenovat letadlo
 STR_A032_NAME_AIRCRAFT                                          :{BLACK}Prejmenovat letadlo
 STR_A033_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Obyvatelé oslavují...{}První letadlo pristalo v {STATION}!
-STR_A034_PLANE_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Pád letadla!{}{COMMA16} zahynulo v plamenech v {STATION}.
-STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Letecká havárie!{}Kvuli vycerpani paliva zemrelo {COMMA16} lidí v ohnivém pekle!
+STR_A034_PLANE_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Pád letadla!{}{COMMA} zahynulo v plamenech v {STATION}.
+STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Letecká havárie!{}Kvuli vycerpani paliva zemrelo {COMMA} lidí v ohnivém pekle!
 STR_A035_DESTINATIONS                                           :{TINYFONT}{BLACK}Cíle:
 STR_A036                                                        :{TINYFONT}{BLACK}{STATION}
 STR_A037_RENAME                                                 :{BLACK}Prejmenovat
@@ -2733,7 +2733,7 @@
 STR_B003_FACTORY_DESTROYED_IN_SUSPICIOUS                        :{BLACK}{BIGFONT}Za podezrelych okolností byla znicena továrna u {TOWN}!
 STR_B004_UFO_LANDS_NEAR                                         :{BLACK}{BIGFONT}UFO pristalo pobliz {TOWN}!
 STR_B005_COAL_MINE_SUBSIDENCE_LEAVES                            :{BLACK}{BIGFONT}Pokles terénu u uhelného dolu {TOWN} zpusobil velké skody!
-STR_B006_FLOOD_VEHICLE_DESTROYED                                :{BLACK}{BIGFONT}Záplavy!{}Po straslivych záplavách je odhadem {COMMA16} lidí pohresovanych nebo mrtvých!
+STR_B006_FLOOD_VEHICLE_DESTROYED                                :{BLACK}{BIGFONT}Záplavy!{}Po straslivych záplavách je odhadem {COMMA} lidí pohresovanych nebo mrtvých!
 
 STR_BRIBE_FAILED                                                :{WHITE}Tvuj pokus o úplatek byl
 STR_BRIBE_FAILED_2                                              :{WHITE}odhalen místním vysetrovatelem.
@@ -2743,7 +2743,7 @@
 STR_PERFORMANCE_DETAIL                                          :{WHITE}Podrobné hodnocení výkonu
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Podrobne
 STR_PERFORMANCE_DETAIL_AMOUNT_CURRENCY                          :{BLACK}({CURRCOMPACT}/{CURRCOMPACT})
-STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA32}/{COMMA32})
+STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA}/{COMMA})
 STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{INT32}%
 SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{INT32}
 ############ Those following lines need to be in this order!!
@@ -2778,7 +2778,7 @@
 STR_NEWGRF_GRF_ID                                               :{BLACK}ID GRF:
 
 STR_CURRENCY_WINDOW                                             :{WHITE}Vlastní mena
-STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Kurz meny: {ORANGE}{CURRENCY} = {POUNDSIGN} {COMMA16}
+STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Kurz meny: {ORANGE}{CURRENCY} = {POUNDSIGN} {COMMA}
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Oddelovac:
 STR_CURRENCY_PREFIX                                             :{LTBLUE}Predpona:
 STR_CURRENCY_SUFFIX                                             :{LTBLUE}Pripona:
@@ -2792,10 +2792,10 @@
 STR_PLANE                                                       :{BLACK}{PLANE}
 STR_SHIP                                                        :{BLACK}{SHIP}
 
-STR_SCHEDULED_TRAINS                                            :{WHITE}{STATION} - {COMMA16} vlaku
-STR_SCHEDULED_ROAD_VEHICLES                                     :{WHITE}{STATION} - {COMMA16} silnicnich vozidel
-STR_SCHEDULED_AIRCRAFT                                          :{WHITE}{STATION} - {COMMA16} letadel
-STR_SCHEDULED_SHIPS                                             :{WHITE}{STATION} - {COMMA16} lodi
+STR_SCHEDULED_TRAINS                                            :{WHITE}{STATION} - {COMMA} vlaku
+STR_SCHEDULED_ROAD_VEHICLES                                     :{WHITE}{STATION} - {COMMA} silnicnich vozidel
+STR_SCHEDULED_AIRCRAFT                                          :{WHITE}{STATION} - {COMMA} letadel
+STR_SCHEDULED_SHIPS                                             :{WHITE}{STATION} - {COMMA} lodi
 
 STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Zobrazit vsechny vlaky, které mají tuto stanici v jízdním radu
 STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Zobrazit vsechna silnicni vozidla, která mají tuto stanici v jízdním radu
@@ -2817,7 +2817,7 @@
 STR_REPLACE_HELP                                                :{BLACK}Tato moznost hry ti umoznuje vybrat typ lokomotivy, který nechá vymenit za jiný. To se bude automaticky provadet, kdyz lokomotiva zajede do depa.
 
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
-STR_SIGN_LIST_CAPTION                                           :{WHITE}Seznam popisku - {COMMA16} popisku
+STR_SIGN_LIST_CAPTION                                           :{WHITE}Seznam popisku - {COMMA} popisku
 
 ############ Lists rail types
 
@@ -2827,16 +2827,16 @@
 
 ############ End of list of rail types
 
-STR_TINY_BLACK                                                  :{BLACK}{TINYFONT}{COMMA16}
+STR_TINY_BLACK                                                  :{BLACK}{TINYFONT}{COMMA}
 
-STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Cena: {GOLD}{CURRENCY}{BLACK} Hmotnost: {GOLD}{COMMA16} t
-STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Rychlost: {GOLD}{VELOCITY}{BLACK}   Výkon: {GOLD}{COMMA32} hp
+STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Cena: {GOLD}{CURRENCY}{BLACK} Hmotnost: {GOLD}{COMMA} t
+STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Rychlost: {GOLD}{VELOCITY}{BLACK}   Výkon: {GOLD}{COMMA} hp
 STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}Provozní cena: {GOLD}{CURRENCY} rocne
 STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Kapacita: {GOLD}{STRING} {STRING}
-STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Vyvinuto: {GOLD}{NUMU16}{BLACK} Zivotnost: {GOLD}{COMMA16} let
-STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Max. spolehlivost: {GOLD}{COMMA8}%
+STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Vyvinuto: {GOLD}{NUMU16}{BLACK} Zivotnost: {GOLD}{COMMA} let
+STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Max. spolehlivost: {GOLD}{COMMA}%
 STR_PURCHASE_INFO_COST                                          :{BLACK}Cena: {GOLD}{CURRENCY}
-STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Hmotnost: {GOLD}{COMMA16} t  ({COMMA16} t)
+STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Hmotnost: {GOLD}{COMMA} t  ({COMMA} t)
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Cena: {GOLD}{CURRENCY}{BLACK} Rychlost: {GOLD}{VELOCITY}
-STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Kapacita: {GOLD}{COMMA16} cestujících, {COMMA16} baliku posty
-STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Pohanene vagony: {GOLD}+{COMMA16} hp{BLACK} Hmotnost: {GOLD}+{COMMA8} t
+STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Kapacita: {GOLD}{COMMA} cestujících, {COMMA} baliku posty
+STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Pohanene vagony: {GOLD}+{COMMA} hp{BLACK} Hmotnost: {GOLD}+{COMMA} t
--- a/lang/danish.txt	Thu Jul 14 09:53:52 2005 +0000
+++ b/lang/danish.txt	Thu Jul 14 15:10:20 2005 +0000
@@ -82,69 +82,69 @@
 STR_004C_PLASTIC                                                :Plastik
 STR_004D_FIZZY_DRINK                                            :Brusende Drink
 STR_004E                                                        :
-STR_004F_PASSENGER                                              :{COMMA16} passager
-STR_0050_TON_OF_COAL                                            :{COMMA16} ton kul
-STR_0051_BAG_OF_MAIL                                            :{COMMA16} sæk post
+STR_004F_PASSENGER                                              :{COMMA} passager
+STR_0050_TON_OF_COAL                                            :{COMMA} ton kul
+STR_0051_BAG_OF_MAIL                                            :{COMMA} sæk post
 STR_0052_OF_OIL                                                 :{VOLUME} olie
-STR_0053_ITEM_OF_LIVESTOCK                                      :{COMMA16} stk. kvæg
-STR_0054_CRATE_OF_GOODS                                         :{COMMA16} kasse gods
-STR_0055_TON_OF_GRAIN                                           :{COMMA16} ton korn
-STR_0056_TON_OF_WOOD                                            :{COMMA16} ton træ
-STR_0057_TON_OF_IRON_ORE                                        :{COMMA16} ton jernmalm
-STR_0058_TON_OF_STEEL                                           :{COMMA16} ton stål
-STR_0059_BAG_OF_VALUABLES                                       :{COMMA16} sæk værdigendstande
-STR_005A_TON_OF_COPPER_ORE                                      :{COMMA16} tons kobbermalm
-STR_005B_TON_OF_MAIZE                                           :{COMMA16} ton majs
-STR_005C_TON_OF_FRUIT                                           :{COMMA16} ton frugt
-STR_005D_BAG_OF_DIAMONDS                                        :{COMMA16} sæk diamanter
-STR_005E_TON_OF_FOOD                                            :{COMMA16} ton mad
-STR_005F_TON_OF_PAPER                                           :{COMMA16} ton papir
-STR_0060_BAG_OF_GOLD                                            :{COMMA16} sæk guld
+STR_0053_ITEM_OF_LIVESTOCK                                      :{COMMA} stk. kvæg
+STR_0054_CRATE_OF_GOODS                                         :{COMMA} kasse gods
+STR_0055_TON_OF_GRAIN                                           :{COMMA} ton korn
+STR_0056_TON_OF_WOOD                                            :{COMMA} ton træ
+STR_0057_TON_OF_IRON_ORE                                        :{COMMA} ton jernmalm
+STR_0058_TON_OF_STEEL                                           :{COMMA} ton stål
+STR_0059_BAG_OF_VALUABLES                                       :{COMMA} sæk værdigendstande
+STR_005A_TON_OF_COPPER_ORE                                      :{COMMA} tons kobbermalm
+STR_005B_TON_OF_MAIZE                                           :{COMMA} ton majs
+STR_005C_TON_OF_FRUIT                                           :{COMMA} ton frugt
+STR_005D_BAG_OF_DIAMONDS                                        :{COMMA} sæk diamanter
+STR_005E_TON_OF_FOOD                                            :{COMMA} ton mad
+STR_005F_TON_OF_PAPER                                           :{COMMA} ton papir
+STR_0060_BAG_OF_GOLD                                            :{COMMA} sæk guld
 STR_0061_OF_WATER                                               :{VOLUME} vand
-STR_0062_TON_OF_WHEAT                                           :{COMMA16} ton hvede
+STR_0062_TON_OF_WHEAT                                           :{COMMA} ton hvede
 STR_0063_OF_RUBBER                                              :{VOLUME} gummi
-STR_0064_TON_OF_SUGAR                                           :{COMMA16} ton sukker
-STR_0065_TOY                                                    :{COMMA16} legetøj
-STR_0066_BAG_OF_CANDY                                           :{COMMA16} sæk slik
+STR_0064_TON_OF_SUGAR                                           :{COMMA} ton sukker
+STR_0065_TOY                                                    :{COMMA} legetøj
+STR_0066_BAG_OF_CANDY                                           :{COMMA} sæk slik
 STR_0067_OF_COLA                                                :{VOLUME} cola
-STR_0068_TON_OF_COTTON_CANDY                                    :{COMMA16} ton candyfloss
-STR_0069_BUBBLE                                                 :{COMMA16} boble
-STR_006A_TON_OF_TOFFEE                                          :{COMMA16} ton karamel
-STR_006B_BATTERY                                                :{COMMA16} batteri
+STR_0068_TON_OF_COTTON_CANDY                                    :{COMMA} ton candyfloss
+STR_0069_BUBBLE                                                 :{COMMA} boble
+STR_006A_TON_OF_TOFFEE                                          :{COMMA} ton karamel
+STR_006B_BATTERY                                                :{COMMA} batteri
 STR_006C_OF_PLASTIC                                             :{VOLUME} plastik
-STR_006D_FIZZY_DRINK                                            :{COMMA16} sodavand
+STR_006D_FIZZY_DRINK                                            :{COMMA} sodavand
 STR_006E                                                        :
-STR_006F_PASSENGERS                                             :{COMMA16} passagerer
-STR_0070_TONS_OF_COAL                                           :{COMMA16} tons kul
-STR_0071_BAGS_OF_MAIL                                           :{COMMA16} sække post
+STR_006F_PASSENGERS                                             :{COMMA} passagerer
+STR_0070_TONS_OF_COAL                                           :{COMMA} tons kul
+STR_0071_BAGS_OF_MAIL                                           :{COMMA} sække post
 STR_0072_OF_OIL                                                 :{VOLUME} olie
-STR_0073_ITEMS_OF_LIVESTOCK                                     :{COMMA16} stk. kvæg
-STR_0074_CRATES_OF_GOODS                                        :{COMMA16} kasser gods
-STR_0075_TONS_OF_GRAIN                                          :{COMMA16} tons korn
-STR_0076_TONS_OF_WOOD                                           :{COMMA16} tons træ
-STR_0077_TONS_OF_IRON_ORE                                       :{COMMA16} tons jernmalm
-STR_0078_TONS_OF_STEEL                                          :{COMMA16} tons stål
-STR_0079_BAGS_OF_VALUABLES                                      :{COMMA16} sække værdigendstande
-STR_007A_TONS_OF_COPPER_ORE                                     :{COMMA16} tons kobbermalm
-STR_007B_TONS_OF_MAIZE                                          :{COMMA16} tons majs
-STR_007C_TONS_OF_FRUIT                                          :{COMMA16} tons frugt
-STR_007D_BAGS_OF_DIAMONDS                                       :{COMMA16} sække diamanter
-STR_007E_TONS_OF_FOOD                                           :{COMMA16} tons mad
-STR_007F_TONS_OF_PAPER                                          :{COMMA16} tons papir
-STR_0080_BAGS_OF_GOLD                                           :{COMMA16} sække guld
+STR_0073_ITEMS_OF_LIVESTOCK                                     :{COMMA} stk. kvæg
+STR_0074_CRATES_OF_GOODS                                        :{COMMA} kasser gods
+STR_0075_TONS_OF_GRAIN                                          :{COMMA} tons korn
+STR_0076_TONS_OF_WOOD                                           :{COMMA} tons træ
+STR_0077_TONS_OF_IRON_ORE                                       :{COMMA} tons jernmalm
+STR_0078_TONS_OF_STEEL                                          :{COMMA} tons stål
+STR_0079_BAGS_OF_VALUABLES                                      :{COMMA} sække værdigendstande
+STR_007A_TONS_OF_COPPER_ORE                                     :{COMMA} tons kobbermalm
+STR_007B_TONS_OF_MAIZE                                          :{COMMA} tons majs
+STR_007C_TONS_OF_FRUIT                                          :{COMMA} tons frugt
+STR_007D_BAGS_OF_DIAMONDS                                       :{COMMA} sække diamanter
+STR_007E_TONS_OF_FOOD                                           :{COMMA} tons mad
+STR_007F_TONS_OF_PAPER                                          :{COMMA} tons papir
+STR_0080_BAGS_OF_GOLD                                           :{COMMA} sække guld
 STR_0081_OF_WATER                                               :{VOLUME} vand
-STR_0082_TONS_OF_WHEAT                                          :{COMMA16} tons hvede
+STR_0082_TONS_OF_WHEAT                                          :{COMMA} tons hvede
 STR_0083_OF_RUBBER                                              :{VOLUME} gummi
-STR_0084_TONS_OF_SUGAR                                          :{COMMA16} tons sukker
-STR_0085_TOYS                                                   :{COMMA16} legetøj
-STR_0086_BAGS_OF_CANDY                                          :{COMMA16} sække slik
+STR_0084_TONS_OF_SUGAR                                          :{COMMA} tons sukker
+STR_0085_TOYS                                                   :{COMMA} legetøj
+STR_0086_BAGS_OF_CANDY                                          :{COMMA} sække slik
 STR_0087_OF_COLA                                                :{VOLUME} cola
-STR_0088_TONS_OF_COTTON_CANDY                                   :{COMMA16} tons candyfloss
-STR_0089_BUBBLES                                                :{COMMA16} bobler
-STR_008A_TONS_OF_TOFFEE                                         :{COMMA16} tons karamel
-STR_008B_BATTERIES                                              :{COMMA16} batterier
+STR_0088_TONS_OF_COTTON_CANDY                                   :{COMMA} tons candyfloss
+STR_0089_BUBBLES                                                :{COMMA} bobler
+STR_008A_TONS_OF_TOFFEE                                         :{COMMA} tons karamel
+STR_008B_BATTERIES                                              :{COMMA} batterier
 STR_008C_OF_PLASTIC                                             :{VOLUME} plastik
-STR_008D_FIZZY_DRINKS                                           :{COMMA16} sodavand
+STR_008D_FIZZY_DRINKS                                           :{COMMA} sodavand
 STR_008E                                                        :
 STR_008F_PS                                                     :{TINYFONT}PS
 STR_0090_CL                                                     :{TINYFONT}CL
@@ -219,8 +219,8 @@
 STR_00DF_GREY                                                   :Grå
 STR_00E0_WHITE                                                  :Hvid
 STR_00E1_TOO_MANY_VEHICLES_IN_GAME                              :{WHITE}For mange køretøjer i spillet
-STR_00E2                                                        :{BLACK}{COMMA16}
-STR_00E3                                                        :{RED}{COMMA16}
+STR_00E2                                                        :{BLACK}{COMMA}
+STR_00E3                                                        :{RED}{COMMA}
 STR_00E4_LOCATION                                               :{BLACK}Placering
 STR_00E5_CONTOURS                                               :Konturer
 STR_00E6_VEHICLES                                               :Køretøjer
@@ -441,18 +441,18 @@
 STR_0198_PROFIT_THIS_YEAR_LAST_YEAR                             :{TINYFONT}{BLACK}Dette års profit: {CURRENCY} (sidste år: {CURRENCY})
 
 ############ range for service numbers starts
-STR_0199_YEAR                                                   :{COMMA16} år ({COMMA16})
-STR_019A_YEARS                                                  :{COMMA16} år ({COMMA16})
-STR_019B_YEARS                                                  :{RED}{COMMA16} år ({COMMA16})
+STR_0199_YEAR                                                   :{COMMA} år ({COMMA})
+STR_019A_YEARS                                                  :{COMMA} år ({COMMA})
+STR_019B_YEARS                                                  :{RED}{COMMA} år ({COMMA})
 ############ range for service numbers ends
 
 STR_019C_ROAD_VEHICLE                                           :Vejkøretøj
 STR_019D_AIRCRAFT                                               :Fly
 STR_019E_SHIP                                                   :Skibe
 STR_019F_TRAIN                                                  :Tog
-STR_01A0_IS_GETTING_OLD                                         :{WHITE}{STRING} {COMMA16} er ved at være for gammel
-STR_01A1_IS_GETTING_VERY_OLD                                    :{WHITE}{STRING} {COMMA16} er alt for gammel
-STR_01A2_IS_GETTING_VERY_OLD_AND                                :{WHITE}{STRING} {COMMA16} er alt for gammel og burde blive udskiftet straks
+STR_01A0_IS_GETTING_OLD                                         :{WHITE}{STRING} {COMMA} er ved at være for gammel
+STR_01A1_IS_GETTING_VERY_OLD                                    :{WHITE}{STRING} {COMMA} er alt for gammel
+STR_01A2_IS_GETTING_VERY_OLD_AND                                :{WHITE}{STRING} {COMMA} er alt for gammel og burde blive udskiftet straks
 STR_01A3_LAND_AREA_INFORMATION                                  :{WHITE}Land område information
 STR_01A4_COST_TO_CLEAR_N_A                                      :{BLACK}Pris for at rydde: {LTBLUE}N/A
 STR_01A5_COST_TO_CLEAR                                          :{BLACK}Pris for at rydde: {LTBLUE}{CURRENCY}
@@ -497,7 +497,7 @@
 STR_01CA_31ST                                                   :31.
 ############ range for days	ends
 
-STR_01CB                                                        :{TINYFONT}{COMMA16}
+STR_01CB                                                        :{TINYFONT}{COMMA}
 STR_01CC_TOGGLE_LARGE_SMALL_MAP                                 :{BLACK}Skift mellem stor/lille kort størrelse
 STR_01CD_SELECT_TUTORIAL_DEMONSTRATION                          :{WHITE}Vælg Tutorial/Demonstration
 
@@ -509,7 +509,7 @@
 STR_CARGO_ACCEPTED_5                                            :{BLACK}Accepteret last: {LTBLUE}{STRING}, {STRING}, {STRING}, {STRING}, {STRING}
 ############ range for cargo acecpted ends
 
-STR_01D1_8                                                      :({COMMA8}/8 {STRING})
+STR_01D1_8                                                      :({COMMA}/8 {STRING})
 STR_01D2_JAZZ_JUKEBOX                                           :{WHITE}Jazz Jukebox
 STR_01D3_SOUND_MUSIC                                            :Lyd/Musik
 STR_01D4_SHOW_SOUND_MUSIC_WINDOW                                :{BLACK}Vis lyd/musik vindue
@@ -528,16 +528,16 @@
 STR_01E1_START_PLAYING_MUSIC                                    :{BLACK}Start musikken
 STR_01E2_DRAG_SLIDERS_TO_SET_MUSIC                              :{BLACK}Flyt slideren for at justere musik og effekt lydstyrken
 STR_01E3                                                        :{DKGREEN}{TINYFONT}--
-STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA8}
-STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA8}
+STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA}
+STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA}
 STR_01E6                                                        :{DKGREEN}{TINYFONT}------
 STR_01E7                                                        :{DKGREEN}{TINYFONT}"{STRING}"
 STR_01E8_TRACK_XTITLE                                           :{BLACK}{TINYFONT}Nummer{SETX 88}Titel
 STR_01E9_SHUFFLE                                                :{TINYFONT}Bland
 STR_01EA_PROGRAM                                                :{TINYFONT}{BLACK}Programmer
 STR_01EB_MUSIC_PROGRAM_SELECTION                                :{WHITE}Musik Program Valg
-STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA16} "{STRING}"
-STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA16}   "{STRING}"
+STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} "{STRING}"
+STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA}   "{STRING}"
 STR_01EE_TRACK_INDEX                                            :{TINYFONT}{BLACK}Nummer Index
 STR_01EF_PROGRAM                                                :{TINYFONT}{BLACK}Program - '{STRING}'
 STR_01F0_CLEAR                                                  :{TINYFONT}{BLACK}Ryd
@@ -577,7 +577,7 @@
 STR_0210_TOO_FAR_FROM_PREVIOUS_DESTINATIO                       :{WHITE}...for langt fra forrige destination
 STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Bedste virksomheder, som har nået {NUMU16}{}({STRING} Niveau)
 STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Selskabsoversigt i {NUMU16}
-STR_0212                                                        :{BIGFONT}{COMMA16}.
+STR_0212                                                        :{BIGFONT}{COMMA}.
 STR_0213_BUSINESSMAN                                            :Forretningsmand
 STR_0214_ENTREPRENEUR                                           :Entreprenør
 STR_0215_INDUSTRIALIST                                          :Industrialist
@@ -586,12 +586,12 @@
 STR_0218_MOGUL                                                  :Mogul
 STR_0219_TYCOON_OF_THE_CENTURY                                  :Århundredes Matador
 STR_HIGHSCORE_NAME                                              :{BIGFONT}{STRING}, {STRING}
-STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA16})
+STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA})
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{STRING} får '{STRING}' status!
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{STRING} fra {STRING} får '{STRING}' status!
 STR_021D                                                        :{BLACK}
 STR_021E                                                        :{WHITE}
-STR_021F                                                        :{BLUE}{COMMA16}
+STR_021F                                                        :{BLUE}{COMMA}
 STR_0220_CREATE_SCENARIO                                        :{BLACK}Lav et scenarie
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Scenarieeditor
@@ -788,8 +788,8 @@
 STR_EXTRA_VIEW_PORT                                             :Flere lokalitetsvinduer
 STR_SIGN_LIST                                                   :Liste over skilte
 STR_02DF_TOWN_DIRECTORY                                         :Byoversigt
-STR_TOWN_POPULATION                                             :{BLACK}Verdens befolkning: {COMMA32}
-STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Lokalitetsvinduer {COMMA16}
+STR_TOWN_POPULATION                                             :{BLACK}Verdens befolkning: {COMMA}
+STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Lokalitetsvinduer {COMMA}
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN                                :{BLACK}Gå til lokalitetsvindue
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT                             :{BLACK}Hent lokalitet fra global visning
 STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW                                :{BLACK}Hent fra lokalitetsvindue
@@ -961,34 +961,34 @@
 STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Kan ikke kopiere ordreliste...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Slut på delt ordreliste - -
 
-STR_TRAIN_IS_LOST                                               :{WHITE}Tog {COMMA16} er faret vild.
-STR_TRAIN_IS_UNPROFITABLE                                       :{WHITE}Tog {COMMA16}'s profit sidste år var {CURRENCY}
+STR_TRAIN_IS_LOST                                               :{WHITE}Tog {COMMA} er faret vild.
+STR_TRAIN_IS_UNPROFITABLE                                       :{WHITE}Tog {COMMA}'s profit sidste år var {CURRENCY}
 STR_EURO_INTRODUCE                                              :{BLACK}{BIGFONT}Europæisk fællesvaluta!{}{}Euroen er introduceret som eneste betalingsmiddel it dit land!
 
 # Start of order review system.
 # DON'T ADD OR REMOVE LINES HERE
-STR_TRAIN_HAS_TOO_FEW_ORDERS                                    :{WHITE}Tog {COMMA16} har for få ordre i sin køreplan
-STR_TRAIN_HAS_VOID_ORDER                                        :{WHITE}Tog {COMMA16} har en ugyldig ordre
-STR_TRAIN_HAS_DUPLICATE_ENTRY                                   :{WHITE}Tog {COMMA16} har dobbelt ordre
-STR_TRAIN_HAS_INVALID_ENTRY                                     :{WHITE}Tog {COMMA16} har en ugyldig station i sin køreplan
-STR_ROADVEHICLE_HAS_TOO_FEW_ORDERS                              :{WHITE}Lastbil {COMMA16} har for få ordre i sin køreplan
-STR_ROADVEHICLE_HAS_VOID_ORDER                                  :{WHITE}Lastbil {COMMA16} har en ugyldig ordre
-STR_ROADVEHICLE_HAS_DUPLICATE_ENTRY                             :{WHITE}Lastbil {COMMA16} har dobbelt ordre
-STR_ROADVEHICLE_HAS_INVALID_ENTRY                               :{WHITE}Lastbil {COMMA16} har en ugyldig station i sin køreplan
-STR_SHIP_HAS_TOO_FEW_ORDERS                                     :{WHITE}Skib {COMMA16} har for få ordre i sin sejlplan
-STR_SHIP_HAS_VOID_ORDER                                         :{WHITE}Skib {COMMA16} har en ugyldig ordre
-STR_SHIP_HAS_DUPLICATE_ENTRY                                    :{WHITE}Skib {COMMA16} har dobbelt ordre
-STR_SHIP_HAS_INVALID_ENTRY                                      :{WHITE}Skib {COMMA16} har en ugyldig havn i sin sejlplan
-STR_AIRCRAFT_HAS_TOO_FEW_ORDERS                                 :{WHITE}Fly {COMMA16} har for få ordre i sin flyveplan
-STR_AIRCRAFT_HAS_VOID_ORDER                                     :{WHITE}Fly {COMMA16} har en ugyldig ordre
-STR_AIRCRAFT_HAS_DUPLICATE_ENTRY                                :{WHITE}Fly {COMMA16} har dobbelt ordre
-STR_AIRCRAFT_HAS_INVALID_ENTRY                                  :{WHITE}Fly {COMMA16} har en ugyldig station i sin flyveplan
+STR_TRAIN_HAS_TOO_FEW_ORDERS                                    :{WHITE}Tog {COMMA} har for få ordre i sin køreplan
+STR_TRAIN_HAS_VOID_ORDER                                        :{WHITE}Tog {COMMA} har en ugyldig ordre
+STR_TRAIN_HAS_DUPLICATE_ENTRY                                   :{WHITE}Tog {COMMA} har dobbelt ordre
+STR_TRAIN_HAS_INVALID_ENTRY                                     :{WHITE}Tog {COMMA} har en ugyldig station i sin køreplan
+STR_ROADVEHICLE_HAS_TOO_FEW_ORDERS                              :{WHITE}Lastbil {COMMA} har for få ordre i sin køreplan
+STR_ROADVEHICLE_HAS_VOID_ORDER                                  :{WHITE}Lastbil {COMMA} har en ugyldig ordre
+STR_ROADVEHICLE_HAS_DUPLICATE_ENTRY                             :{WHITE}Lastbil {COMMA} har dobbelt ordre
+STR_ROADVEHICLE_HAS_INVALID_ENTRY                               :{WHITE}Lastbil {COMMA} har en ugyldig station i sin køreplan
+STR_SHIP_HAS_TOO_FEW_ORDERS                                     :{WHITE}Skib {COMMA} har for få ordre i sin sejlplan
+STR_SHIP_HAS_VOID_ORDER                                         :{WHITE}Skib {COMMA} har en ugyldig ordre
+STR_SHIP_HAS_DUPLICATE_ENTRY                                    :{WHITE}Skib {COMMA} har dobbelt ordre
+STR_SHIP_HAS_INVALID_ENTRY                                      :{WHITE}Skib {COMMA} har en ugyldig havn i sin sejlplan
+STR_AIRCRAFT_HAS_TOO_FEW_ORDERS                                 :{WHITE}Fly {COMMA} har for få ordre i sin flyveplan
+STR_AIRCRAFT_HAS_VOID_ORDER                                     :{WHITE}Fly {COMMA} har en ugyldig ordre
+STR_AIRCRAFT_HAS_DUPLICATE_ENTRY                                :{WHITE}Fly {COMMA} har dobbelt ordre
+STR_AIRCRAFT_HAS_INVALID_ENTRY                                  :{WHITE}Fly {COMMA} har en ugyldig station i sin flyveplan
 # end of order system
 
-STR_TRAIN_AUTORENEW_FAILED                                      :{WHITE}Automatisk fornyelse mislykkedes på tog {COMMA16} (ikke penge nok)
-STR_ROADVEHICLE_AUTORENEW_FAILED                                :{WHITE}Automatisk fornyelse mislykkedes på lastbil {COMMA16} (ikke penge nok)
-STR_SHIP_AUTORENEW_FAILED                                       :{WHITE}Automatisk fornyelse mislykkedes på skib {COMMA16} (ikke penge nok)
-STR_AIRCRAFT_AUTORENEW_FAILED                                   :{WHITE}Automatisk fornyelse mislykkedes på fly {COMMA16} (ikke penge nok)
+STR_TRAIN_AUTORENEW_FAILED                                      :{WHITE}Automatisk fornyelse mislykkedes på tog {COMMA} (ikke penge nok)
+STR_ROADVEHICLE_AUTORENEW_FAILED                                :{WHITE}Automatisk fornyelse mislykkedes på lastbil {COMMA} (ikke penge nok)
+STR_SHIP_AUTORENEW_FAILED                                       :{WHITE}Automatisk fornyelse mislykkedes på skib {COMMA} (ikke penge nok)
+STR_AIRCRAFT_AUTORENEW_FAILED                                   :{WHITE}Automatisk fornyelse mislykkedes på fly {COMMA} (ikke penge nok)
 
 STR_CONFIG_PATCHES                                              :{BLACK}Indstil Patches
 STR_CONFIG_PATCHES_TIP                                          :{BLACK}Indstil Patchesne
@@ -1103,7 +1103,7 @@
 STR_CHEATS_TIP                                                  :{BLACK}Checkboxes viser om du bruger denne snydefunktion before
 STR_CHEATS_WARNING                                              :{BLACK}Advarsel! Du er ved at forråde dine modstandere. Husk at dette vil blive husket i al evighed.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Forøg kassebeholdning med {CURRENCY64}
-STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Spil som spiller: {ORANGE}{COMMA16}
+STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Spil som spiller: {ORANGE}{COMMA}
 STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Magisk bulldozer (nedriv ting, som normalt ikke kan fjernes): {ORANGE}{STRING}
 STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Tunneler kan krydse hinanden: {ORANGE}{STRING}
 STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Tillad at bygge mens pause er aktiveret: {ORANGE}{STRING}
@@ -1119,7 +1119,7 @@
 STR_GO_NON_STOP_TO_WAYPOINT                                     :Kør uden stop via {WAYPOINT}
 
 STR_WAYPOINTNAME_CITY                                           :Kontrolsted {TOWN}
-STR_WAYPOINTNAME_CITY_SERIAL                                    :Kontrolsted {TOWN} #{COMMA16}
+STR_WAYPOINTNAME_CITY_SERIAL                                    :Kontrolsted {TOWN} #{COMMA}
 STR_LANDINFO_WAYPOINT                                           :Kontrolsted
 
 STR_WAYPOINT                                                    :{WHITE}Kontrolsted
@@ -1202,8 +1202,8 @@
 STR_CONSTRUCT_SUGAR_MINE_TIP                                    :{BLACK}Byg Sukkermine
 
 STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Industrier
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}){YELLOW} ({COMMA16}% transporteret)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}/{STRING}){YELLOW} ({COMMA16}%/{COMMA16}% transported)
+STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}){YELLOW} ({COMMA}% transporteret)
+STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}/{STRING}){YELLOW} ({COMMA}%/{COMMA}% transported)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{TOWN} {STRING}
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...for tæt på en anden industribygning
@@ -1243,15 +1243,15 @@
 STR_NETWORK_ADD_SERVER_TIP                                      :{BLACK}Tilføj en server til listen, som altid vil blive checket for om den kører et spil
 STR_NETWORK_ENTER_IP                                            :{BLACK}Skriv adressen på en server
 
-STR_NETWORK_CLIENTS_ONLINE                                      :{BLACK}{COMMA16}/{COMMA16}
+STR_NETWORK_CLIENTS_ONLINE                                      :{BLACK}{COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Klienter
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Klienter online / max klienter
 STR_NETWORK_GAME_INFO                                           :{SILVER}SPIL INFO
 STR_ORANGE                                                      :{ORANGE}{STRING}
-STR_NETWORK_CLIENTS                                             :{SILVER}Klienter:  {WHITE}{COMMA8} / {COMMA8}
+STR_NETWORK_CLIENTS                                             :{SILVER}Klienter:  {WHITE}{COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}Sprog:  {WHITE}{STRING}
 STR_NETWORK_TILESET                                             :{SILVER}Klima:  {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Størrelse:  {WHITE}{COMMA16}x{COMMA16}
+STR_NETWORK_MAP_SIZE                                            :{SILVER}Størrelse:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Server version:  {WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Serveradresse:  {WHITE}{STRING} : {NUMU16}
 STR_NETWORK_START_DATE                                          :{SILVER}Start dato:  {WHITE}{DATE_SHORT}
@@ -1513,21 +1513,21 @@
 
 ##id 0x2000
 STR_2000_TOWNS                                                  :{WHITE}Byer
-STR_TOWN_LABEL_POP                                              :{WHITE}{STRING} ({COMMA32})
+STR_TOWN_LABEL_POP                                              :{WHITE}{STRING} ({COMMA})
 STR_2001                                                        :{WHITE}{STRING}
 STR_2002                                                        :{TINYFONT}{BLACK}{STRING}
 STR_2003                                                        :{TINYFONT}{WHITE}{STRING}
 STR_2004_BUILDING_MUST_BE_DEMOLISHED                            :{WHITE}Det er nødvendigt at nedrive bygningen først
 STR_2005                                                        :{WHITE}{TOWN}
-STR_2006_POPULATION                                             :{BLACK}Indbyggere: {ORANGE}{COMMA32}{BLACK}  Huse: {ORANGE}{COMMA32}
+STR_2006_POPULATION                                             :{BLACK}Indbyggere: {ORANGE}{COMMA}{BLACK}  Huse: {ORANGE}{COMMA}
 STR_2007_RENAME_TOWN                                            :Omdøb Byen
 STR_2008_CAN_T_RENAME_TOWN                                      :{WHITE}Kan ikke omdøbe byen...
 STR_2009_LOCAL_AUTHORITY_REFUSES                                :{WHITE}{TOWN} de lokale myndigheder nægter at tillade dette
 STR_200A_TOWN_NAMES_CLICK_ON_NAME                               :{BLACK}Bynavne - klik på et navn for at centrere skærmen over byen
 STR_200B_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Centrer skærmen over byens placering
 STR_200C_CHANGE_TOWN_NAME                                       :{BLACK}Ændrer navnet på byen
-STR_200D_PASSENGERS_LAST_MONTH_MAX                              :{BLACK}Passagere sidste måned: {ORANGE}{COMMA32}{BLACK}  max: {ORANGE}{COMMA32}
-STR_200E_MAIL_LAST_MONTH_MAX                                    :{BLACK}Post sidste måned: {ORANGE}{COMMA32}{BLACK}  max: {ORANGE}{COMMA32}
+STR_200D_PASSENGERS_LAST_MONTH_MAX                              :{BLACK}Passagere sidste måned: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
+STR_200E_MAIL_LAST_MONTH_MAX                                    :{BLACK}Post sidste måned: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
 STR_200F_TALL_OFFICE_BLOCK                                      :Høj kontorbygning
 STR_2010_OFFICE_BLOCK                                           :Kontorbygning
 STR_2011_SMALL_BLOCK_OF_FLATS                                   :Lille lejlighedskomplex
@@ -1601,7 +1601,7 @@
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Bestik de lokale myndigheder til at høve din bedømmelse, med sandsynlighed for en stor straf hvis det bliver opdaget.{}  Pris: {CURRENCY}
 STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Trafikkaos i byen {TOWN}!{}{}Vejfornyelse betalt af {STRING} bringer 6 måneders kaos for trafikken!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
-STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA32})
+STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA})
 STR_2058_UNDER_CONSTRUCTION                                     :{STRING} (under konstruktion)
 STR_2059_IGLOO                                                  :Iglo
 STR_205A_TEPEES                                                 :Tipi
@@ -1663,7 +1663,7 @@
 STR_303C_OUTSTANDING                                            :Enestående
 ############ range for rating ends
 
-STR_303D                                                        :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA8}%)
+STR_303D                                                        :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_303E_NO_LONGER_ACCEPTS                                      :{WHITE}{STATION} accepterer ikke længere {STRING}
 STR_303F_NO_LONGER_ACCEPTS_OR                                   :{WHITE}{STATION} accepterer ikke længere {STRING} eller {STRING}
 STR_3040_NOW_ACCEPTS                                            :{WHITE}{STATION} accepterer nu {STRING}
@@ -1674,7 +1674,7 @@
 STR_3045_TOO_CLOSE_TO_ANOTHER_TRUCK                             :{WHITE}For tæt på en anden lastbilslasteplads
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Det er nødvendigt at rive rutebilsstationen ned først
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Det er nødvendigt at rive lastbilslastepladsen ned først
-STR_3048_STATIONS                                               :{WHITE}{STRING} - {COMMA16} Stationer
+STR_3048_STATIONS                                               :{WHITE}{STRING} - {COMMA} Stationer
 STR_3049_0                                                      :{YELLOW}{STATION} {STRINL 0x30D1}
 STR_304A_NONE                                                   :{YELLOW}- Ingen -
 STR_304B_SITE_UNSUITABLE                                        :{WHITE}...placeringen er uegnet
@@ -1730,7 +1730,7 @@
 STR_4002_SAVE                                                   :{BLACK}Gem
 STR_4003_DELETE                                                 :{BLACK}Slet
 STR_4004                                                        :{STRING}, {DATE_LONG}
-STR_4005_BYTES_FREE                                             :{BLACK}{COMMA32} megabytes fri
+STR_4005_BYTES_FREE                                             :{BLACK}{COMMA} megabytes fri
 STR_4006_UNABLE_TO_READ_DRIVE                                   :{BLACK}Kan ikke læse drevet
 STR_4007_GAME_SAVE_FAILED                                       :{WHITE}Fejl under gemning af spil
 STR_4008_UNABLE_TO_DELETE_FILE                                  :{WHITE}Kan ikke slette fil
@@ -1791,7 +1791,7 @@
 ############ range for requires	ends
 
 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Produktion sidste måned:
-STR_482B_TRANSPORTED                                            :{YELLOW}{STRING}{BLACK} ({COMMA16}% transporteret)
+STR_482B_TRANSPORTED                                            :{YELLOW}{STRING}{BLACK} ({COMMA}% transporteret)
 STR_482C_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Centrer skærmen over placeringen af industrien
 STR_482D_NEW_UNDER_CONSTRUCTION                                 :{BLACK}{BIGFONT}Ny {STRING} under konstruktion tæt på {TOWN}!
 STR_482E_NEW_BEING_PLANTED_NEAR                                 :{BLACK}{BIGFONT}Ny {STRING} bliver plantet tæt på {TOWN}!
@@ -1808,8 +1808,8 @@
 STR_4839_PRODUCTION_DOWN_BY_50                                  :{BLACK}{BIGFONT}{TOWN} {STRING} produktion er faldet med 50%
 STR_483A_INSECT_INFESTATION_CAUSES                              :{BLACK}{BIGFONT}Insekter foresager kaos ved {TOWN} {STRING}!{}Produktionen er faldet med 50%
 STR_483B_CAN_ONLY_BE_POSITIONED                                 :{WHITE}...kan kun placeres nær kanten af kortet
-STR_INDUSTRY_PROD_GOUP                                          :{BLACK}{BIGFONT}{STRING} produktionen på {TOWN} {STRING} vokser med {COMMA16}%!
-STR_INDUSTRY_PROD_GODOWN                                        :{BLACK}{BIGFONT}{STRING} produktionen på {TOWN} {STRING} sænkes med {COMMA16}%!
+STR_INDUSTRY_PROD_GOUP                                          :{BLACK}{BIGFONT}{STRING} produktionen på {TOWN} {STRING} vokser med {COMMA}%!
+STR_INDUSTRY_PROD_GODOWN                                        :{BLACK}{BIGFONT}{STRING} produktionen på {TOWN} {STRING} sænkes med {COMMA}%!
 
 ##id 0x5000
 STR_5000_TRAIN_IN_TUNNEL                                        :{WHITE}Der er et tog i tunnelen
@@ -1872,10 +1872,10 @@
 ##id 0x6000
 STR_SV_EMPTY                                                    :
 STR_SV_UNNAMED                                                  :Ikke navngivet{SKIP}
-STR_SV_TRAIN_NAME                                               :Tog {COMMA16}
-STR_SV_ROADVEH_NAME                                             :Lastbil {COMMA16}
-STR_SV_SHIP_NAME                                                :Skib {COMMA16}
-STR_SV_AIRCRAFT_NAME                                            :Fly {COMMA16}
+STR_SV_TRAIN_NAME                                               :Tog {COMMA}
+STR_SV_ROADVEH_NAME                                             :Lastbil {COMMA}
+STR_SV_SHIP_NAME                                                :Skib {COMMA}
+STR_SV_AIRCRAFT_NAME                                            :Fly {COMMA}
 
 STR_SV_STNAME                                                   :{STRING}
 STR_SV_STNAME_NORTH                                             :{STRING} Nord
@@ -1925,12 +1925,12 @@
 ############ range for difficulty levels ends
 
 ############ range for difficulty settings starts
-STR_6805_MAXIMUM_NO_COMPETITORS                                 :{LTBLUE}Maksimalt antal modstandere: {ORANGE}{COMMA16}
+STR_6805_MAXIMUM_NO_COMPETITORS                                 :{LTBLUE}Maksimalt antal modstandere: {ORANGE}{COMMA}
 STR_6806_COMPETITOR_START_TIME                                  :{LTBLUE}Modstandernes starttidspunkt: {ORANGE}{STRING}
 STR_6807_NO_OF_TOWNS                                            :{LTBLUE}Antal byer: {ORANGE}{STRING}
 STR_6808_NO_OF_INDUSTRIES                                       :{LTBLUE}Antal industrier: {ORANGE}{STRING}
 STR_6809_MAXIMUM_INITIAL_LOAN_000                               :{LTBLUE}Maksimalt startlån: {ORANGE}{CURRENCY}
-STR_680A_INITIAL_INTEREST_RATE                                  :{LTBLUE}Startrenten: {ORANGE}{COMMA16}%
+STR_680A_INITIAL_INTEREST_RATE                                  :{LTBLUE}Startrenten: {ORANGE}{COMMA}%
 STR_680B_VEHICLE_RUNNING_COSTS                                  :{LTBLUE}Køretøjers kørselsomkostning: {ORANGE}{STRING}
 STR_680C_CONSTRUCTION_SPEED_OF_COMPETITOR                       :{LTBLUE}Byggehastighed for modstandere: {ORANGE}{STRING}
 STR_680D_INTELLIGENCE_OF_COMPETITORS                            :{LTBLUE}Modstandernes inteligens: {ORANGE}{STRING}
@@ -1989,7 +1989,7 @@
 ##id 0x7000
 STR_7000                                                        :
 STR_7001                                                        :{WHITE}{STRING} {BLACK}{STRING}
-STR_7002_PLAYER                                                 :(Spiller {COMMA16})
+STR_7002_PLAYER                                                 :(Spiller {COMMA})
 STR_7004_NEW_FACE                                               :{BLACK}Nyt Ansigt
 STR_7005_COLOR_SCHEME                                           :{BLACK}Farvetema
 STR_7006_COLOR_SCHEME                                           :{GOLD}Farvetema:
@@ -2023,7 +2023,7 @@
 STR_7022_INCOME_GRAPH                                           :{WHITE}Indkomst Graf
 STR_CURRCOMPACT32                                               :{CURRCOMPACT}
 STR_CURRCOMPACT64                                               :{CURRCOMPACT64}
-STR_7024                                                        :{COMMA32}
+STR_7024                                                        :{COMMA}
 STR_7025_OPERATING_PROFIT_GRAPH                                 :{WHITE}Profit Garf
 STR_7026_BANK_BALANCE                                           :{WHITE}Bank Balance
 STR_7027_LOAN                                                   :{WHITE}Lån
@@ -2047,14 +2047,14 @@
 STR_7037_PRESIDENT                                              :{WHITE}{STRING}{}{GOLD}(Direktør)
 STR_7038_INAUGURATED                                            :{GOLD}Inaugurated: {WHITE}{NUMU16}
 STR_7039_VEHICLES                                               :{GOLD}Køretøjer:
-STR_703A_TRAIN                                                  :{WHITE}{COMMA16} tog
-STR_703B_TRAINS                                                 :{WHITE}{COMMA16} tog
-STR_703C_ROAD_VEHICLE                                           :{WHITE}{COMMA16} lastbil
-STR_703D_ROAD_VEHICLES                                          :{WHITE}{COMMA16} lastbiler
-STR_703E_AIRCRAFT                                               :{WHITE}{COMMA16} fly
-STR_703F_AIRCRAFT                                               :{WHITE}{COMMA16} fly
-STR_7040_SHIP                                                   :{WHITE}{COMMA16} skib
-STR_7041_SHIPS                                                  :{WHITE}{COMMA16} skibe
+STR_703A_TRAIN                                                  :{WHITE}{COMMA} tog
+STR_703B_TRAINS                                                 :{WHITE}{COMMA} tog
+STR_703C_ROAD_VEHICLE                                           :{WHITE}{COMMA} lastbil
+STR_703D_ROAD_VEHICLES                                          :{WHITE}{COMMA} lastbiler
+STR_703E_AIRCRAFT                                               :{WHITE}{COMMA} fly
+STR_703F_AIRCRAFT                                               :{WHITE}{COMMA} fly
+STR_7040_SHIP                                                   :{WHITE}{COMMA} skib
+STR_7041_SHIPS                                                  :{WHITE}{COMMA} skibe
 STR_7042_NONE                                                   :{WHITE}Ingen
 STR_7043_FACE_SELECTION                                         :{WHITE}Ansigtsvalg
 STR_7044_MALE                                                   :{BLACK}Mand
@@ -2119,8 +2119,8 @@
 STR_707A_SELL_25_SHARE_IN_THIS_COMPANY                          :{BLACK}Sælg 25% aktier i dette firma
 STR_707B_CAN_T_BUY_25_SHARE_IN_THIS                             :{WHITE}Kan ikke købe 25% aktier i dette firma...
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}Kan ikke sælge 25% aktier i dette firma...
-STR_707D_OWNED_BY                                               :{WHITE}({COMMA16}% ejes af {STRING})
-STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA16}% ejes af {STRING}{}   {COMMA16}% ejes af {STRING})
+STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% ejes af {STRING})
+STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}% ejes af {STRING}{}   {COMMA}% ejes af {STRING})
 STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{STRING} er blevet overtaget af {STRING}!
 STR_7080_PROTECTED                                              :{WHITE}Dette selskab sælger ikke aktier endnu...
 
@@ -2395,8 +2395,8 @@
 STR_8801_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Indbyggerene fester . . .{}Første tog ankommer til {STATION}!
 STR_8802_DETAILS                                                :{WHITE}{STRING} (Detaljer)
 STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}Tog i vejen
-STR_8804                                                        :{SETX 10}{COMMA8}: {STRING}
-STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA8}: {STRING}
+STR_8804                                                        :{SETX 10}{COMMA}: {STRING}
+STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING}
 STR_8806_GO_TO                                                  :Gå til {STATION}
 STR_SERVICE_AT_TRAIN_DEPOT                                      :Service i {TOWN} depot
 STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT                             :Gå uden stop til {TOWN} depot
@@ -2410,13 +2410,13 @@
 STR_UNKNOWN_DESTINATION                                         :ukendt destination
 STR_8812_EMPTY                                                  :{LTBLUE}Tom
 STR_8813_FROM                                                   :{LTBLUE}{CARGO} fra {STATION}
-STR_8814_TRAIN_IS_WAITING_IN_DEPOT                              :{WHITE}Tog {COMMA16} Venter i depot
+STR_8814_TRAIN_IS_WAITING_IN_DEPOT                              :{WHITE}Tog {COMMA} Venter i depot
 STR_8815_NEW_VEHICLES                                           :{BLACK}Nye køretøjer
 STR_8816                                                        :{BLACK}-
 STR_8818_INFORMATION                                            :{BLACK}Information
 STR_8819_TRAIN_TOO_LONG                                         :{WHITE}Toget er for langt
 STR_881A_TRAINS_CAN_ONLY_BE_ALTERED                             :{WHITE}Tog kan kun ændres når de er stoppet i et depot
-STR_881B_TRAINS                                                 :{WHITE}{STRING} - {COMMA16} Tog
+STR_881B_TRAINS                                                 :{WHITE}{STRING} - {COMMA} Tog
 STR_881C_NEW_RAIL_VEHICLES                                      :{WHITE}Nye Jernbanekøretøjer
 STR_881D_NEW_MONORAIL_VEHICLES                                  :{WHITE}Nye Monorailkøretøjer
 STR_881E_NEW_MAGLEV_VEHICLES                                    :{WHITE}Nye Magnetskinne køretøjer
@@ -2450,8 +2450,8 @@
 STR_8839_CAN_T_SELL_RAILROAD_VEHICLE                            :{WHITE}Kan ikke sælge jernbanekøretøjet...
 STR_883A_UNABLE_TO_FIND_ROUTE_TO                                :{WHITE}Kan ikke finde en route til et lokalt depot
 STR_883B_CAN_T_STOP_START_TRAIN                                 :{WHITE}Kan ikke stoppe/starte toget...
-STR_883C_SERVICING_INTERVAL_DAYS                                :{BLACK}Serviceinterval: {LTBLUE}{COMMA16}dage{BLACK}   Sidste Service: {LTBLUE}{DATE_LONG}
-STR_SERVICING_INTERVAL_PERCENT                                  :{BLACK}Serviceinterval: {LTBLUE}{COMMA16}%{BLACK}   Sidste Service: {LTBLUE}{DATE_LONG}
+STR_883C_SERVICING_INTERVAL_DAYS                                :{BLACK}Serviceinterval: {LTBLUE}{COMMA}dage{BLACK}   Sidste Service: {LTBLUE}{DATE_LONG}
+STR_SERVICING_INTERVAL_PERCENT                                  :{BLACK}Serviceinterval: {LTBLUE}{COMMA}%{BLACK}   Sidste Service: {LTBLUE}{DATE_LONG}
 STR_883D_TRAINS_CLICK_ON_TRAIN_FOR                              :{BLACK}Tog - klik på et tog for information
 STR_883E_BUILD_NEW_TRAINS_REQUIRES                              :{BLACK}Byg nye tog (kræver et depot)
 STR_883F_TRAINS_CLICK_ON_TRAIN_FOR                              :{BLACK}Tog - klik på et tog for information., træk vogn/lokomotiv for at fjerne/tilføje det til toget
@@ -2484,12 +2484,12 @@
 STR_SERVICE_HINT                                                :{BLACK}Spring denne ordre over hvis der ikke er behov for service
 STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}Ny {STRING} tilgængelig nu!
 STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
-STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Pris: {CURRENCY} Vægt: {COMMA16}t{}Hastighed: {VELOCITY}  Styrke: {COMMA16}hp{}Kørselsomkostning: {CURRENCY}/år{}Kapacitet: {STRING}
+STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Pris: {CURRENCY} Vægt: {COMMA}t{}Hastighed: {VELOCITY}  Styrke: {COMMA}hp{}Kørselsomkostning: {CURRENCY}/år{}Kapacitet: {STRING}
 STR_885C_BROKEN_DOWN                                            :{RED}Gået i stykker
 STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Alder: {LTBLUE}{STRING}{BLACK}   Kørselsomkostning: {LTBLUE}{CURRENCY}/år
-STR_885E_WEIGHT_T_POWER_HP_MAX_SPEED                            :{BLACK}Vægt: {LTBLUE}{COMMA16}t  {BLACK}Styrke: {LTBLUE}{COMMA32}hp{BLACK} Maks hastighed: {LTBLUE}{VELOCITY}
+STR_885E_WEIGHT_T_POWER_HP_MAX_SPEED                            :{BLACK}Vægt: {LTBLUE}{COMMA}t  {BLACK}Styrke: {LTBLUE}{COMMA}hp{BLACK} Maks hastighed: {LTBLUE}{VELOCITY}
 STR_885F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Dette års profit: {LTBLUE}{CURRENCY}  (sidste år: {CURRENCY})
-STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Pålidelighed {LTBLUE}{COMMA8}%  {BLACK}nedbrud siden sidste service: {LTBLUE}{COMMA16}
+STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Pålidelighed {LTBLUE}{COMMA}%  {BLACK}nedbrud siden sidste service: {LTBLUE}{COMMA}
 STR_8861_STOPPED                                                :{RED}Stoppet
 STR_8862_CAN_T_MAKE_TRAIN_PASS_SIGNAL                           :{WHITE}Kan ikke få toget til at passere signalet...
 STR_8863_CRASHED                                                :{RED}Forulykket!
@@ -2497,7 +2497,7 @@
 STR_8865_NAME_TRAIN                                             :{WHITE}Giv toget et navn
 STR_8866_CAN_T_NAME_TRAIN                                       :{WHITE}Kan ikke give toget navn...
 STR_8867_NAME_TRAIN                                             :{BLACK}Giv toget et navn
-STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Tog forulykket!{}{COMMA16} døde i flammerne efter kollision
+STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Tog forulykket!{}{COMMA} døde i flammerne efter kollision
 STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}Kan ikke vende retningen af toget...
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Omdøb tog-/togvognstypen
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Kan ikke omdøbe tog-/togvognstypen...
@@ -2507,7 +2507,7 @@
 
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Lastbil i vejen
-STR_9001_ROAD_VEHICLES                                          :{WHITE}{STRING} - {COMMA16} Lastbiler
+STR_9001_ROAD_VEHICLES                                          :{WHITE}{STRING} - {COMMA} Lastbiler
 STR_9002                                                        :{WHITE}{STRING}
 STR_9003_ROAD_VEHICLE_DEPOT                                     :{WHITE}{TOWN} Lastbilsdepot
 STR_9004_NEW_VEHICLES                                           :{BLACK}Nye køretøjer
@@ -2521,13 +2521,13 @@
 STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Alder: {LTBLUE}{STRING}{BLACK}   Kørselsomkostning: {LTBLUE}{CURRENCY}/år
 STR_900E_MAX_SPEED                                              :{BLACK}Maks hastighed: {LTBLUE}{VELOCITY}
 STR_900F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Dette års profit: {LTBLUE}{CURRENCY}  (sidste år: {CURRENCY})
-STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Pålidelighed: {LTBLUE}{COMMA8}%  {BLACK}Nedbrud siden sidste service: {LTBLUE}{COMMA16}
+STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Pålidelighed: {LTBLUE}{COMMA}%  {BLACK}Nedbrud siden sidste service: {LTBLUE}{COMMA}
 STR_9011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Bygget: {LTBLUE}{NUMU16}{BLACK} Værdi: {LTBLUE}{CURRENCY}
 STR_9012_CAPACITY                                               :{BLACK}Kapacitet: {LTBLUE}{STRING}
 STR_9013_MUST_BE_STOPPED_INSIDE                                 :{WHITE}...skal være stoppet inde i et depot først
 STR_9014_CAN_T_SELL_ROAD_VEHICLE                                :{WHITE}Kan ikke sælge lastbil...
 STR_9015_CAN_T_STOP_START_ROAD_VEHICLE                          :{WHITE}Kan ikke stoppe/starte lastbil...
-STR_9016_ROAD_VEHICLE_IS_WAITING                                :{WHITE}Lastbil {COMMA16} venter i depot
+STR_9016_ROAD_VEHICLE_IS_WAITING                                :{WHITE}Lastbil {COMMA} venter i depot
 STR_HEADING_FOR_ROAD_DEPOT                                      :{LTBLUE}Retning mod {TOWN} Lastbilsdepot
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{LTBLUE}Retning mod {TOWN} Lastbilsdepot, {VELOCITY}
 STR_9018_CAN_T_SEND_VEHICLE_TO_DEPOT                            :{WHITE}Kan ikke sende køretøj i depot...
@@ -2556,7 +2556,7 @@
 STR_902F_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Indbyggerne fester . . .{}Første bus ankommer til {STATION}!
 STR_9030_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Indbyggerne fester . . .{}Første lastbil ankommer til {STATION}!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Lastbil forulykket!{}Chaufføren død i flammerne efter at være kollideret med et tog!
-STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Bus forulykket!{}{COMMA16} dør i flammerne efter kollision med et tog
+STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Bus forulykket!{}{COMMA} dør i flammerne efter kollision med et tog
 STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}Kan ikke få køretøjet til at vende...
 STR_9034_RENAME                                                 :{BLACK}Omdøb
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Omdøb lastbilstypen
@@ -2571,7 +2571,7 @@
 STR_9802_CAN_T_BUILD_DOCK_HERE                                  :{WHITE}Kan ikke bygge en havn her...
 STR_9803_SHIP_DEPOT                                             :{WHITE}{TOWN} Skibsdepot
 STR_9804_NEW_SHIPS                                              :{BLACK}Nye skibe
-STR_9805_SHIPS                                                  :{WHITE}{STRING} - {COMMA16} Skibe
+STR_9805_SHIPS                                                  :{WHITE}{STRING} - {COMMA} Skibe
 STR_9806_CAN_T_BUILD_SHIPS                                      :{WHITE}Kan ikke bygge skibe...
 STR_9807_MUST_BUILD_SHIP_DEPOT_FIRST                            :{WHITE}Det er nødvendigt at bygge et skibsdepot først
 STR_9808_NEW_SHIPS                                              :{WHITE}Nye skibe
@@ -2586,7 +2586,7 @@
 STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Alder: {LTBLUE}{STRING}{BLACK}   Kørselsomkostning: {LTBLUE}{CURRENCY}/år
 STR_9813_MAX_SPEED                                              :{BLACK}Maks hastighed: {LTBLUE}{VELOCITY}
 STR_9814_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Dette års profit: {LTBLUE}{CURRENCY}  (sidste år: {CURRENCY})
-STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Pålidelighed: {LTBLUE}{COMMA8}%  {BLACK}Nedbrud siden sidste service: {LTBLUE}{COMMA16}
+STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Pålidelighed: {LTBLUE}{COMMA}%  {BLACK}Nedbrud siden sidste service: {LTBLUE}{COMMA}
 STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Bygget: {LTBLUE}{NUMU16}{BLACK} Værdi: {LTBLUE}{CURRENCY}
 STR_9817_CAPACITY                                               :{BLACK}Kapacitet: {LTBLUE}{STRING}
 STR_9818_CAN_T_STOP_START_SHIP                                  :{WHITE}Kan ikke stoppe/starte skibet...
@@ -2594,7 +2594,7 @@
 STR_981A_UNABLE_TO_FIND_LOCAL_DEPOT                             :{WHITE}Kan ikke finde lokalt depot
 STR_HEADING_FOR_SHIP_DEPOT                                      :{LTBLUE}Retning mod {TOWN} Skibsdepot
 STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{LTBLUE}Retning mod {TOWN} Skibsdepot, {VELOCITY}
-STR_981C_SHIP_IS_WAITING_IN_DEPOT                               :{WHITE}Skib {COMMA16} venter i depot
+STR_981C_SHIP_IS_WAITING_IN_DEPOT                               :{WHITE}Skib {COMMA} venter i depot
 STR_981D_BUILD_SHIP_DOCK                                        :{BLACK}Byg havn
 STR_981E_BUILD_SHIP_DEPOT_FOR_BUILDING                          :{BLACK}Byg skibsdepot (til bygning og servicering af skibe)
 STR_981F_SHIPS_CLICK_ON_SHIP_FOR                                :{BLACK}Skibe - klik på et skib for information
@@ -2645,19 +2645,19 @@
 STR_A005_NEW_AIRCRAFT                                           :{WHITE}Nyt fly
 STR_A006_BUILD_AIRCRAFT                                         :{BLACK}Byg et fly
 STR_A008_CAN_T_BUILD_AIRCRAFT                                   :{WHITE}Kan ikke bygge fly...
-STR_A009_AIRCRAFT                                               :{WHITE}{STRING} - {COMMA16} Fly
+STR_A009_AIRCRAFT                                               :{WHITE}{STRING} - {COMMA} Fly
 STR_A00A                                                        :{WHITE}{STRING}
 STR_A00B_ORDERS                                                 :{WHITE}{STRING} (Ordre)
 STR_A00C_DETAILS                                                :{WHITE}{STRING} (Detaljer)
 STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Alder: {LTBLUE}{STRING}{BLACK}   Kørselsomkostning: {LTBLUE}{CURRENCY}/år
 STR_A00E_MAX_SPEED                                              :{BLACK}Maks hastighed: {LTBLUE}{VELOCITY}
 STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Dette års profit: {LTBLUE}{CURRENCY}  (sidste år: {CURRENCY})
-STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Pålidelighed: {LTBLUE}{COMMA8}%  {BLACK}Nedbrud siden sidste service: {LTBLUE}{COMMA16}
+STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Pålidelighed: {LTBLUE}{COMMA}%  {BLACK}Nedbrud siden sidste service: {LTBLUE}{COMMA}
 STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Bygget: {LTBLUE}{NUMU16}{BLACK} Værdi: {LTBLUE}{CURRENCY}
 STR_A012_CAN_T_SEND_AIRCRAFT_TO                                 :{WHITE}Kan ikke sende flyet til en hangar...
 STR_HEADING_FOR_HANGAR                                          :{LTBLUE}Retning mod {STATION} Hangar
 STR_HEADING_FOR_HANGAR_VEL                                      :{LTBLUE}Retning mod {STATION} Hangar, {VELOCITY}
-STR_A014_AIRCRAFT_IS_WAITING_IN                                 :{WHITE}Fly {COMMA16} venter i flyhangar
+STR_A014_AIRCRAFT_IS_WAITING_IN                                 :{WHITE}Fly {COMMA} venter i flyhangar
 STR_A015_AIRCRAFT_IN_THE_WAY                                    :{WHITE}Fly i vejen
 STR_A016_CAN_T_STOP_START_AIRCRAFT                              :{WHITE}Kan ikke stoppe/starte fly...
 STR_A017_AIRCRAFT_IS_IN_FLIGHT                                  :{WHITE}Flyet er i luften
@@ -2683,14 +2683,14 @@
 STR_A02B_SHOW_AIRCRAFT_DETAILS                                  :{BLACK}Vis detaljet omkring flyet
 STR_A02C_NEW_AIRCRAFT_NOW_AVAILABLE                             :{BLACK}{BIGFONT}Nyt fly tilgængeligt!
 STR_A02D                                                        :{BLACK}{BIGFONT}{STRING}
-STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Pris: {CURRENCY} Maks hastighed: {VELOCITY}{}Kapacitet: {COMMA16} passagerer, {COMMA16} sække post{}Kørselsomkostning: {CURRENCY}/år
+STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Pris: {CURRENCY} Maks hastighed: {VELOCITY}{}Kapacitet: {COMMA} passagerer, {COMMA} sække post{}Kørselsomkostning: {CURRENCY}/år
 
 STR_A030_NAME_AIRCRAFT                                          :{WHITE}Navngiv flyet
 STR_A031_CAN_T_NAME_AIRCRAFT                                    :{WHITE}Kan ikke navngive flyet...
 STR_A032_NAME_AIRCRAFT                                          :{BLACK}Navngiv fluet
 STR_A033_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Indbyggerene fester . . .{}Første fly ankommer til{STATION}!
-STR_A034_PLANE_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Flystyrt!{}{COMMA16} dør i flammerne ved {STATION}
-STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Flystyrt!{}Fly løb tør for brændstof, {COMMA16} døde i ildhelvede!
+STR_A034_PLANE_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Flystyrt!{}{COMMA} dør i flammerne ved {STATION}
+STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Flystyrt!{}Fly løb tør for brændstof, {COMMA} døde i ildhelvede!
 STR_A035_DESTINATIONS                                           :{TINYFONT}{BLACK}Destinationer:
 STR_A036                                                        :{TINYFONT}{BLACK}{STATION}
 STR_A037_RENAME                                                 :{BLACK}Omdøb
@@ -2716,7 +2716,7 @@
 STR_B003_FACTORY_DESTROYED_IN_SUSPICIOUS                        :{BLACK}{BIGFONT}Fabrik ødelagt under mystiske omstændigheder ved {TOWN}!
 STR_B004_UFO_LANDS_NEAR                                         :{BLACK}{BIGFONT}En UFO lander tæt på {TOWN}!
 STR_B005_COAL_MINE_SUBSIDENCE_LEAVES                            :{BLACK}{BIGFONT}Sammenstyrtning af kulmine efterlader et spor af katastrofe ved {TOWN}!
-STR_B006_FLOOD_VEHICLE_DESTROYED                                :{BLACK}{BIGFONT}Oversvømmelse!{}Mindst {COMMA16} antaget savnet eller omkommet efter pludslig oversvømmelse!
+STR_B006_FLOOD_VEHICLE_DESTROYED                                :{BLACK}{BIGFONT}Oversvømmelse!{}Mindst {COMMA} antaget savnet eller omkommet efter pludslig oversvømmelse!
 
 STR_BRIBE_FAILED                                                :{WHITE}Dit forsøg på bestikkelse er blevet
 STR_BRIBE_FAILED_2                                              :{WHITE}opdaget af en inspektør.
@@ -2726,7 +2726,7 @@
 STR_PERFORMANCE_DETAIL                                          :{WHITE}Præstations oversigt
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Detailer
 STR_PERFORMANCE_DETAIL_AMOUNT_CURRENCY                          :{BLACK}({CURRCOMPACT}/{CURRCOMPACT})
-STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA32}/{COMMA32})
+STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA}/{COMMA})
 STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{INT32}%
 SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{INT32}
 ############ Those following lines need to be in this order!!
@@ -2761,7 +2761,7 @@
 STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID:
 
 STR_CURRENCY_WINDOW                                             :{WHITE}Brugerdefineret møntfod
-STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Kurs: {ORANGE}{CURRENCY} = {POUNDSIGN} {COMMA16}
+STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Kurs: {ORANGE}{CURRENCY} = {POUNDSIGN} {COMMA}
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Tilskuer:
 STR_CURRENCY_PREFIX                                             :{LTBLUE}Præfiks:
 STR_CURRENCY_SUFFIX                                             :{LTBLUE}Endetillæg:
@@ -2775,10 +2775,10 @@
 STR_PLANE                                                       :{BLACK}{PLANE}
 STR_SHIP                                                        :{BLACK}{SHIP}
 
-STR_SCHEDULED_TRAINS                                            :{WHITE}{STATION} - {COMMA16} Tog
-STR_SCHEDULED_ROAD_VEHICLES                                     :{WHITE}{STATION} - {COMMA16} Køretøjer
-STR_SCHEDULED_AIRCRAFT                                          :{WHITE}{STATION} - {COMMA16} Fly
-STR_SCHEDULED_SHIPS                                             :{WHITE}{STATION} - {COMMA16} Skibe
+STR_SCHEDULED_TRAINS                                            :{WHITE}{STATION} - {COMMA} Tog
+STR_SCHEDULED_ROAD_VEHICLES                                     :{WHITE}{STATION} - {COMMA} Køretøjer
+STR_SCHEDULED_AIRCRAFT                                          :{WHITE}{STATION} - {COMMA} Fly
+STR_SCHEDULED_SHIPS                                             :{WHITE}{STATION} - {COMMA} Skibe
 
 STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Vis alle tog, som har denne station i deres køreplan
 STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Vis alle køretøjer, som har denne station i deres køreplan
@@ -2800,7 +2800,7 @@
 STR_REPLACE_HELP                                                :{BLACK}Dette giver dig mulighed for at udskifte en køretøjstype med en anden, når et køretøj af den oprindelige type kører i depot
 
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
-STR_SIGN_LIST_CAPTION                                           :{WHITE}Liste of skilte - {COMMA16} Skilte
+STR_SIGN_LIST_CAPTION                                           :{WHITE}Liste of skilte - {COMMA} Skilte
 
 ############ Lists rail types
 
@@ -2810,14 +2810,14 @@
 
 ############ End of list of rail types
 
-STR_TINY_BLACK                                                  :{BLACK}{TINYFONT}{COMMA16}
+STR_TINY_BLACK                                                  :{BLACK}{TINYFONT}{COMMA}
 
-STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Pris: {GOLD}{CURRENCY}{BLACK} Vægt: {GOLD}{COMMA16}t
-STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Hastighed: {GOLD}{VELOCITY}{BLACK}   Styrke: {GOLD}{COMMA32}hp
+STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Pris: {GOLD}{CURRENCY}{BLACK} Vægt: {GOLD}{COMMA}t
+STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Hastighed: {GOLD}{VELOCITY}{BLACK}   Styrke: {GOLD}{COMMA}hp
 STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}Kørselsudgift: {GOLD}{CURRENCY}/år
 STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Lasteevne: {GOLD}{STRING} {STRING}
-STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Max. Pålidelighed: {GOLD}{COMMA8}%
+STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Max. Pålidelighed: {GOLD}{COMMA}%
 STR_PURCHASE_INFO_COST                                          :{BLACK}Pris: {GOLD}{CURRENCY}
-STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Vægt: {GOLD}{COMMA16}t  ({COMMA16}t)
+STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Vægt: {GOLD}{COMMA}t  ({COMMA}t)
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Pris: {GOLD}{CURRENCY}{BLACK} Hastighed: {GOLD}{VELOCITY}
-STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Lasteevne: {GOLD}{COMMA16} passagerer, {COMMA16} sække post
+STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Lasteevne: {GOLD}{COMMA} passagerer, {COMMA} sække post
--- a/lang/dutch.txt	Thu Jul 14 09:53:52 2005 +0000
+++ b/lang/dutch.txt	Thu Jul 14 15:10:20 2005 +0000
@@ -82,69 +82,69 @@
 STR_004C_PLASTIC                                                :Plastic
 STR_004D_FIZZY_DRINK                                            :Frisdrank
 STR_004E                                                        :
-STR_004F_PASSENGER                                              :{COMMA16} passagier
-STR_0050_TON_OF_COAL                                            :{COMMA16} ton kolen
-STR_0051_BAG_OF_MAIL                                            :{COMMA16} zak post
+STR_004F_PASSENGER                                              :{COMMA} passagier
+STR_0050_TON_OF_COAL                                            :{COMMA} ton kolen
+STR_0051_BAG_OF_MAIL                                            :{COMMA} zak post
 STR_0052_OF_OIL                                                 :{VOLUME} olie
-STR_0053_ITEM_OF_LIVESTOCK                                      :{COMMA16} stuk vee
-STR_0054_CRATE_OF_GOODS                                         :{COMMA16} pallet goederen
-STR_0055_TON_OF_GRAIN                                           :{COMMA16} ton graan
-STR_0056_TON_OF_WOOD                                            :{COMMA16} ton hout
-STR_0057_TON_OF_IRON_ORE                                        :{COMMA16} ton ijzererts
-STR_0058_TON_OF_STEEL                                           :{COMMA16} ton staal
-STR_0059_BAG_OF_VALUABLES                                       :{COMMA16} zak kostbaarheden
-STR_005A_TON_OF_COPPER_ORE                                      :{COMMA16} ton kopererts
-STR_005B_TON_OF_MAIZE                                           :{COMMA16} ton maïs
-STR_005C_TON_OF_FRUIT                                           :{COMMA16} ton fruit
-STR_005D_BAG_OF_DIAMONDS                                        :{COMMA16} zak diamanten
-STR_005E_TON_OF_FOOD                                            :{COMMA16} ton voedsel
-STR_005F_TON_OF_PAPER                                           :{COMMA16} ton papier
-STR_0060_BAG_OF_GOLD                                            :{COMMA16} zak goud
+STR_0053_ITEM_OF_LIVESTOCK                                      :{COMMA} stuk vee
+STR_0054_CRATE_OF_GOODS                                         :{COMMA} pallet goederen
+STR_0055_TON_OF_GRAIN                                           :{COMMA} ton graan
+STR_0056_TON_OF_WOOD                                            :{COMMA} ton hout
+STR_0057_TON_OF_IRON_ORE                                        :{COMMA} ton ijzererts
+STR_0058_TON_OF_STEEL                                           :{COMMA} ton staal
+STR_0059_BAG_OF_VALUABLES                                       :{COMMA} zak kostbaarheden
+STR_005A_TON_OF_COPPER_ORE                                      :{COMMA} ton kopererts
+STR_005B_TON_OF_MAIZE                                           :{COMMA} ton maïs
+STR_005C_TON_OF_FRUIT                                           :{COMMA} ton fruit
+STR_005D_BAG_OF_DIAMONDS                                        :{COMMA} zak diamanten
+STR_005E_TON_OF_FOOD                                            :{COMMA} ton voedsel
+STR_005F_TON_OF_PAPER                                           :{COMMA} ton papier
+STR_0060_BAG_OF_GOLD                                            :{COMMA} zak goud
 STR_0061_OF_WATER                                               :{VOLUME} water
-STR_0062_TON_OF_WHEAT                                           :{COMMA16} ton tarwe
+STR_0062_TON_OF_WHEAT                                           :{COMMA} ton tarwe
 STR_0063_OF_RUBBER                                              :{VOLUME} rubber
-STR_0064_TON_OF_SUGAR                                           :{COMMA16} ton suiker
-STR_0065_TOY                                                    :{COMMA16} speelgoed
-STR_0066_BAG_OF_CANDY                                           :{COMMA16} zak snoep
+STR_0064_TON_OF_SUGAR                                           :{COMMA} ton suiker
+STR_0065_TOY                                                    :{COMMA} speelgoed
+STR_0066_BAG_OF_CANDY                                           :{COMMA} zak snoep
 STR_0067_OF_COLA                                                :{VOLUME} cola
-STR_0068_TON_OF_COTTON_CANDY                                    :{COMMA16} ton suikerspinnen
-STR_0069_BUBBLE                                                 :{COMMA16} bel
-STR_006A_TON_OF_TOFFEE                                          :{COMMA16} ton toffee
-STR_006B_BATTERY                                                :{COMMA16} batterij
+STR_0068_TON_OF_COTTON_CANDY                                    :{COMMA} ton suikerspinnen
+STR_0069_BUBBLE                                                 :{COMMA} bel
+STR_006A_TON_OF_TOFFEE                                          :{COMMA} ton toffee
+STR_006B_BATTERY                                                :{COMMA} batterij
 STR_006C_OF_PLASTIC                                             :{VOLUME} plastic
-STR_006D_FIZZY_DRINK                                            :{COMMA16} blikje frisdrank
+STR_006D_FIZZY_DRINK                                            :{COMMA} blikje frisdrank
 STR_006E                                                        :
-STR_006F_PASSENGERS                                             :{COMMA16} passagiers
-STR_0070_TONS_OF_COAL                                           :{COMMA16} ton kolen
-STR_0071_BAGS_OF_MAIL                                           :{COMMA16} zakken post
+STR_006F_PASSENGERS                                             :{COMMA} passagiers
+STR_0070_TONS_OF_COAL                                           :{COMMA} ton kolen
+STR_0071_BAGS_OF_MAIL                                           :{COMMA} zakken post
 STR_0072_OF_OIL                                                 :{VOLUME} olie
-STR_0073_ITEMS_OF_LIVESTOCK                                     :{COMMA16} stuks vee
-STR_0074_CRATES_OF_GOODS                                        :{COMMA16} pallets goederen
-STR_0075_TONS_OF_GRAIN                                          :{COMMA16} ton graan
-STR_0076_TONS_OF_WOOD                                           :{COMMA16} ton hout
-STR_0077_TONS_OF_IRON_ORE                                       :{COMMA16} ton ijzererts
-STR_0078_TONS_OF_STEEL                                          :{COMMA16} ton staal
-STR_0079_BAGS_OF_VALUABLES                                      :{COMMA16} zakken kostbaarheden
-STR_007A_TONS_OF_COPPER_ORE                                     :{COMMA16} ton kopererts
-STR_007B_TONS_OF_MAIZE                                          :{COMMA16} ton maïs
-STR_007C_TONS_OF_FRUIT                                          :{COMMA16} ton fruit
-STR_007D_BAGS_OF_DIAMONDS                                       :{COMMA16} zakken diamanten
-STR_007E_TONS_OF_FOOD                                           :{COMMA16} ton voedsel
-STR_007F_TONS_OF_PAPER                                          :{COMMA16} ton papier
-STR_0080_BAGS_OF_GOLD                                           :{COMMA16} zakken goud
+STR_0073_ITEMS_OF_LIVESTOCK                                     :{COMMA} stuks vee
+STR_0074_CRATES_OF_GOODS                                        :{COMMA} pallets goederen
+STR_0075_TONS_OF_GRAIN                                          :{COMMA} ton graan
+STR_0076_TONS_OF_WOOD                                           :{COMMA} ton hout
+STR_0077_TONS_OF_IRON_ORE                                       :{COMMA} ton ijzererts
+STR_0078_TONS_OF_STEEL                                          :{COMMA} ton staal
+STR_0079_BAGS_OF_VALUABLES                                      :{COMMA} zakken kostbaarheden
+STR_007A_TONS_OF_COPPER_ORE                                     :{COMMA} ton kopererts
+STR_007B_TONS_OF_MAIZE                                          :{COMMA} ton maïs
+STR_007C_TONS_OF_FRUIT                                          :{COMMA} ton fruit
+STR_007D_BAGS_OF_DIAMONDS                                       :{COMMA} zakken diamanten
+STR_007E_TONS_OF_FOOD                                           :{COMMA} ton voedsel
+STR_007F_TONS_OF_PAPER                                          :{COMMA} ton papier
+STR_0080_BAGS_OF_GOLD                                           :{COMMA} zakken goud
 STR_0081_OF_WATER                                               :{VOLUME} water
-STR_0082_TONS_OF_WHEAT                                          :{COMMA16} ton tarwe
+STR_0082_TONS_OF_WHEAT                                          :{COMMA} ton tarwe
 STR_0083_OF_RUBBER                                              :{VOLUME} rubber
-STR_0084_TONS_OF_SUGAR                                          :{COMMA16} ton suiker
-STR_0085_TOYS                                                   :{COMMA16} speelgoed
-STR_0086_BAGS_OF_CANDY                                          :{COMMA16} zakken snoep
+STR_0084_TONS_OF_SUGAR                                          :{COMMA} ton suiker
+STR_0085_TOYS                                                   :{COMMA} speelgoed
+STR_0086_BAGS_OF_CANDY                                          :{COMMA} zakken snoep
 STR_0087_OF_COLA                                                :{VOLUME} cola
-STR_0088_TONS_OF_COTTON_CANDY                                   :{COMMA16} ton suikerspinnen
-STR_0089_BUBBLES                                                :{COMMA16} bellen
-STR_008A_TONS_OF_TOFFEE                                         :{COMMA16} ton toffee
-STR_008B_BATTERIES                                              :{COMMA16} batterijen
+STR_0088_TONS_OF_COTTON_CANDY                                   :{COMMA} ton suikerspinnen
+STR_0089_BUBBLES                                                :{COMMA} bellen
+STR_008A_TONS_OF_TOFFEE                                         :{COMMA} ton toffee
+STR_008B_BATTERIES                                              :{COMMA} batterijen
 STR_008C_OF_PLASTIC                                             :{VOLUME} plastic
-STR_008D_FIZZY_DRINKS                                           :{COMMA16} blikjes frisdrank
+STR_008D_FIZZY_DRINKS                                           :{COMMA} blikjes frisdrank
 STR_008E                                                        :
 STR_008F_PS                                                     :{TINYFONT}PS
 STR_0090_CL                                                     :{TINYFONT}KL
@@ -219,8 +219,8 @@
 STR_00DF_GREY                                                   :Grijs
 STR_00E0_WHITE                                                  :Wit
 STR_00E1_TOO_MANY_VEHICLES_IN_GAME                              :{WHITE}Te veel voertuigen in het spel
-STR_00E2                                                        :{BLACK}{COMMA16}
-STR_00E3                                                        :{RED}{COMMA16}
+STR_00E2                                                        :{BLACK}{COMMA}
+STR_00E3                                                        :{RED}{COMMA}
 STR_00E4_LOCATION                                               :{BLACK}Locatie
 STR_00E5_CONTOURS                                               :Contouren
 STR_00E6_VEHICLES                                               :Voertuigen
@@ -441,18 +441,18 @@
 STR_0198_PROFIT_THIS_YEAR_LAST_YEAR                             :{TINYFONT}{BLACK}Winst dit jaar: {CURRENCY} (vorig jaar: {CURRENCY})
 
 ############ range for service numbers starts
-STR_0199_YEAR                                                   :{COMMA16} jaar ({COMMA16})
-STR_019A_YEARS                                                  :{COMMA16} jaren ({COMMA16})
-STR_019B_YEARS                                                  :{RED}{COMMA16} jaren ({COMMA16})
+STR_0199_YEAR                                                   :{COMMA} jaar ({COMMA})
+STR_019A_YEARS                                                  :{COMMA} jaren ({COMMA})
+STR_019B_YEARS                                                  :{RED}{COMMA} jaren ({COMMA})
 ############ range for service numbers ends
 
 STR_019C_ROAD_VEHICLE                                           :Voertuig
 STR_019D_AIRCRAFT                                               :Vliegtuig
 STR_019E_SHIP                                                   :Schip
 STR_019F_TRAIN                                                  :Trein
-STR_01A0_IS_GETTING_OLD                                         :{WHITE}{STRING} {COMMA16} wordt oud
-STR_01A1_IS_GETTING_VERY_OLD                                    :{WHITE}{STRING} {COMMA16} wordt erg oud
-STR_01A2_IS_GETTING_VERY_OLD_AND                                :{WHITE}{STRING} {COMMA16} wordt erg oud en is aan vervanging toe
+STR_01A0_IS_GETTING_OLD                                         :{WHITE}{STRING} {COMMA} wordt oud
+STR_01A1_IS_GETTING_VERY_OLD                                    :{WHITE}{STRING} {COMMA} wordt erg oud
+STR_01A2_IS_GETTING_VERY_OLD_AND                                :{WHITE}{STRING} {COMMA} wordt erg oud en is aan vervanging toe
 STR_01A3_LAND_AREA_INFORMATION                                  :{WHITE}Landinformatie
 STR_01A4_COST_TO_CLEAR_N_A                                      :{BLACK}Sloopkosten: {LTBLUE}niet mogelijk
 STR_01A5_COST_TO_CLEAR                                          :{BLACK}Sloopkosten: {LTBLUE}{CURRENCY}
@@ -497,7 +497,7 @@
 STR_01CA_31ST                                                   :31
 ############ range for days	ends
 
-STR_01CB                                                        :{TINYFONT}{COMMA16}
+STR_01CB                                                        :{TINYFONT}{COMMA}
 STR_01CC_TOGGLE_LARGE_SMALL_MAP                                 :{BLACK}Maakt kaart groter/kleiner
 STR_01CD_SELECT_TUTORIAL_DEMONSTRATION                          :{WHITE}Kies uitleg/demonstratie
 
@@ -509,7 +509,7 @@
 STR_CARGO_ACCEPTED_5                                            :{BLACK}Accepteert: {LTBLUE}{STRING}, {STRING}, {STRING}, {STRING}, {STRING}
 ############ range for cargo acecpted ends
 
-STR_01D1_8                                                      :({COMMA8}/8 {STRING})
+STR_01D1_8                                                      :({COMMA}/8 {STRING})
 STR_01D2_JAZZ_JUKEBOX                                           :{WHITE}Jazz jukebox
 STR_01D3_SOUND_MUSIC                                            :Geluid/muziek
 STR_01D4_SHOW_SOUND_MUSIC_WINDOW                                :{BLACK}Toon geluid/muziek scherm
@@ -528,16 +528,16 @@
 STR_01E1_START_PLAYING_MUSIC                                    :{BLACK}Start muziek
 STR_01E2_DRAG_SLIDERS_TO_SET_MUSIC                              :{BLACK}Gebruik de schuifbalken om het volume aan te passen
 STR_01E3                                                        :{DKGREEN}{TINYFONT}--
-STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA8}
-STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA8}
+STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA}
+STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA}
 STR_01E6                                                        :{DKGREEN}{TINYFONT}------
 STR_01E7                                                        :{DKGREEN}{TINYFONT}"{STRING}"
 STR_01E8_TRACK_XTITLE                                           :{BLACK}{TINYFONT}Nummer{SETX 88}Titel
 STR_01E9_SHUFFLE                                                :{TINYFONT}Shuffle
 STR_01EA_PROGRAM                                                :{TINYFONT}{BLACK}Programma
 STR_01EB_MUSIC_PROGRAM_SELECTION                                :{WHITE}Muziekprogrammakeuze
-STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA16} "{STRING}"
-STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA16}   "{STRING}"
+STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} "{STRING}"
+STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA}   "{STRING}"
 STR_01EE_TRACK_INDEX                                            :{TINYFONT}{BLACK}Nummer index
 STR_01EF_PROGRAM                                                :{TINYFONT}{BLACK}Programma - '{STRING}'
 STR_01F0_CLEAR                                                  :{TINYFONT}{BLACK}Leeg
@@ -577,7 +577,7 @@
 STR_0210_TOO_FAR_FROM_PREVIOUS_DESTINATIO                       :{WHITE}...te ver van vorige bestemming
 STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Top bedrijven die {NUMU16} bereikt hebben{}({STRING} Niveau)
 STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Bedrijfswedstrijdtabel in {NUMU16}
-STR_0212                                                        :{BIGFONT}{COMMA16}.
+STR_0212                                                        :{BIGFONT}{COMMA}.
 STR_0213_BUSINESSMAN                                            :Zakenman
 STR_0214_ENTREPRENEUR                                           :Entrepreneur
 STR_0215_INDUSTRIALIST                                          :Industrialist
@@ -586,12 +586,12 @@
 STR_0218_MOGUL                                                  :Mogul
 STR_0219_TYCOON_OF_THE_CENTURY                                  :Tycoon van de Eeuw
 STR_HIGHSCORE_NAME                                              :{BIGFONT}{STRING}, {STRING}
-STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA16})
+STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA})
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{STRING} bereikt '{STRING}' status!
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{STRING} van {STRING} bereikt '{STRING}' status!
 STR_021D                                                        :{BLACK}
 STR_021E                                                        :{WHITE}
-STR_021F                                                        :{BLUE}{COMMA16}
+STR_021F                                                        :{BLUE}{COMMA}
 STR_0220_CREATE_SCENARIO                                        :{BLACK}Maak scenario
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Scenario editor
@@ -788,8 +788,8 @@
 STR_EXTRA_VIEW_PORT                                             :Extra kijkvenster
 STR_SIGN_LIST                                                   :Bordjes lijst
 STR_02DF_TOWN_DIRECTORY                                         :Stedenlijst
-STR_TOWN_POPULATION                                             :{BLACK}Wereld populatie: {COMMA32}
-STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Kijkvenster {COMMA16}
+STR_TOWN_POPULATION                                             :{BLACK}Wereld populatie: {COMMA}
+STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Kijkvenster {COMMA}
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN                                :{BLACK}Kopieer naar kijkvenster
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT                             :{BLACK}Kopieer de lokatie van het algemene scherm naar dit kijkvenster
 STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW                                :{BLACK}Plak van kijkvenster
@@ -961,34 +961,34 @@
 STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Kan orderlijst niet kopieren...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Einde gedeelde orders - -
 
-STR_TRAIN_IS_LOST                                               :{WHITE}Trein {COMMA16} is verdwaald.
-STR_TRAIN_IS_UNPROFITABLE                                       :{WHITE}Winst van trein {COMMA16} was vorig jaar {CURRENCY}
+STR_TRAIN_IS_LOST                                               :{WHITE}Trein {COMMA} is verdwaald.
+STR_TRAIN_IS_UNPROFITABLE                                       :{WHITE}Winst van trein {COMMA} was vorig jaar {CURRENCY}
 STR_EURO_INTRODUCE                                              :{BLACK}{BIGFONT}Europese Monetaire Unie!{}{}De Euro is geïntroduceerd als de enige munt voor alledaagse transacties in jouw land!
 
 # Start of order review system.
 # DON'T ADD OR REMOVE LINES HERE
-STR_TRAIN_HAS_TOO_FEW_ORDERS                                    :{WHITE}Trein {COMMA16} heeft te weinig opdrachten
-STR_TRAIN_HAS_VOID_ORDER                                        :{WHITE}Trein {COMMA16} heeft een lege opdracht
-STR_TRAIN_HAS_DUPLICATE_ENTRY                                   :{WHITE}Trein {COMMA16} heeft dubbele orders
-STR_TRAIN_HAS_INVALID_ENTRY                                     :{WHITE}Trein {COMMA16} heeft een ongeldig station in de orders
-STR_ROADVEHICLE_HAS_TOO_FEW_ORDERS                              :{WHITE}Wegvoertuig {COMMA16} heeft te weinig orders in de orderlijst
-STR_ROADVEHICLE_HAS_VOID_ORDER                                  :{WHITE}Wegvoertuig {COMMA16} heeft lege order
-STR_ROADVEHICLE_HAS_DUPLICATE_ENTRY                             :{WHITE}Wegvoertuig {COMMA16} heeft dubbele orders
-STR_ROADVEHICLE_HAS_INVALID_ENTRY                               :{WHITE}Wegvoertuig {COMMA16} heeft een ongeldig station in de orders
-STR_SHIP_HAS_TOO_FEW_ORDERS                                     :{WHITE}Schip {COMMA16} heeft te weinig order is orderlijst
-STR_SHIP_HAS_VOID_ORDER                                         :{WHITE}Schip {COMMA16} heeft lege order
-STR_SHIP_HAS_DUPLICATE_ENTRY                                    :{WHITE}Schip {COMMA16} heeft dubbele orders
-STR_SHIP_HAS_INVALID_ENTRY                                      :{WHITE}Schip {COMMA16} heeft een ongeldig station in de orders
-STR_AIRCRAFT_HAS_TOO_FEW_ORDERS                                 :{WHITE}Vliegtuig {COMMA16} heeft te weinig orders in orderlijst
-STR_AIRCRAFT_HAS_VOID_ORDER                                     :{WHITE}Vliegtuig {COMMA16} heeft lege order
-STR_AIRCRAFT_HAS_DUPLICATE_ENTRY                                :{WHITE}Vliegtuig {COMMA16} heeft dubbele orders
-STR_AIRCRAFT_HAS_INVALID_ENTRY                                  :{WHITE}Vliegtuig {COMMA16} heeft een ongeldig station in de orders
+STR_TRAIN_HAS_TOO_FEW_ORDERS                                    :{WHITE}Trein {COMMA} heeft te weinig opdrachten
+STR_TRAIN_HAS_VOID_ORDER                                        :{WHITE}Trein {COMMA} heeft een lege opdracht
+STR_TRAIN_HAS_DUPLICATE_ENTRY                                   :{WHITE}Trein {COMMA} heeft dubbele orders
+STR_TRAIN_HAS_INVALID_ENTRY                                     :{WHITE}Trein {COMMA} heeft een ongeldig station in de orders
+STR_ROADVEHICLE_HAS_TOO_FEW_ORDERS                              :{WHITE}Wegvoertuig {COMMA} heeft te weinig orders in de orderlijst
+STR_ROADVEHICLE_HAS_VOID_ORDER                                  :{WHITE}Wegvoertuig {COMMA} heeft lege order
+STR_ROADVEHICLE_HAS_DUPLICATE_ENTRY                             :{WHITE}Wegvoertuig {COMMA} heeft dubbele orders
+STR_ROADVEHICLE_HAS_INVALID_ENTRY                               :{WHITE}Wegvoertuig {COMMA} heeft een ongeldig station in de orders
+STR_SHIP_HAS_TOO_FEW_ORDERS                                     :{WHITE}Schip {COMMA} heeft te weinig order is orderlijst
+STR_SHIP_HAS_VOID_ORDER                                         :{WHITE}Schip {COMMA} heeft lege order
+STR_SHIP_HAS_DUPLICATE_ENTRY                                    :{WHITE}Schip {COMMA} heeft dubbele orders
+STR_SHIP_HAS_INVALID_ENTRY                                      :{WHITE}Schip {COMMA} heeft een ongeldig station in de orders
+STR_AIRCRAFT_HAS_TOO_FEW_ORDERS                                 :{WHITE}Vliegtuig {COMMA} heeft te weinig orders in orderlijst
+STR_AIRCRAFT_HAS_VOID_ORDER                                     :{WHITE}Vliegtuig {COMMA} heeft lege order
+STR_AIRCRAFT_HAS_DUPLICATE_ENTRY                                :{WHITE}Vliegtuig {COMMA} heeft dubbele orders
+STR_AIRCRAFT_HAS_INVALID_ENTRY                                  :{WHITE}Vliegtuig {COMMA} heeft een ongeldig station in de orders
 # end of order system
 
-STR_TRAIN_AUTORENEW_FAILED                                      :{WHITE}Automatisch vernieuwen mislukt bij trein {COMMA16} (onvoldoende geld)
-STR_ROADVEHICLE_AUTORENEW_FAILED                                :{WHITE}Automatisch vernieuwen mislukt bij voertuig {COMMA16} (onvoldoende geld)
-STR_SHIP_AUTORENEW_FAILED                                       :{WHITE}Automatisch vernieuwen mislukt bij schip {COMMA16} (onvoldoende geld)
-STR_AIRCRAFT_AUTORENEW_FAILED                                   :{WHITE}Automatisch vernieuwen mislukt bij vliegtuig {COMMA16} (onvoldoende geld)
+STR_TRAIN_AUTORENEW_FAILED                                      :{WHITE}Automatisch vernieuwen mislukt bij trein {COMMA} (onvoldoende geld)
+STR_ROADVEHICLE_AUTORENEW_FAILED                                :{WHITE}Automatisch vernieuwen mislukt bij voertuig {COMMA} (onvoldoende geld)
+STR_SHIP_AUTORENEW_FAILED                                       :{WHITE}Automatisch vernieuwen mislukt bij schip {COMMA} (onvoldoende geld)
+STR_AIRCRAFT_AUTORENEW_FAILED                                   :{WHITE}Automatisch vernieuwen mislukt bij vliegtuig {COMMA} (onvoldoende geld)
 
 STR_CONFIG_PATCHES                                              :{BLACK}Kies Patches
 STR_CONFIG_PATCHES_TIP                                          :{BLACK}Kies welke patches je wilt gebruiken
@@ -1104,7 +1104,7 @@
 STR_CHEATS_TIP                                                  :{BLACK}Keuzevakjes geven aan of je deze cheat al ooit gebruikt hebt.
 STR_CHEATS_WARNING                                              :{BLACK}Waarschuwing! Je staat op het punt je concurrenten te verraden. Denk eraan dat zo'n schande eeuwig onthouden wordt.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Verhoog geld met {CURRENCY64}
-STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Spelend als speler: {ORANGE}{COMMA16}
+STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Spelend als speler: {ORANGE}{COMMA}
 STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Magische bulldozer (industrieën en andere onverplaatsbare objecten verwijderen): {ORANGE}{STRING}
 STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Tunnels mogen elkaar kruisen: {ORANGE}{STRING}
 STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Bouwen in gepauzeerde toestand: {ORANGE}{STRING}
@@ -1120,7 +1120,7 @@
 STR_GO_NON_STOP_TO_WAYPOINT                                     :Ga non-stop via {WAYPOINT}
 
 STR_WAYPOINTNAME_CITY                                           :Tussenstop {TOWN}
-STR_WAYPOINTNAME_CITY_SERIAL                                    :Tussenstop {TOWN} #{COMMA16}
+STR_WAYPOINTNAME_CITY_SERIAL                                    :Tussenstop {TOWN} #{COMMA}
 STR_LANDINFO_WAYPOINT                                           :Controlepost
 
 STR_WAYPOINT                                                    :{WHITE}Controlepost
@@ -1203,8 +1203,8 @@
 STR_CONSTRUCT_SUGAR_MINE_TIP                                    :{BLACK}Graaf suikermijn
 
 STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Industrielijst
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}){YELLOW} ({COMMA16}% vervoerd)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}/{STRING}){YELLOW} ({COMMA16}%/{COMMA16}% vervoerd)
+STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}){YELLOW} ({COMMA}% vervoerd)
+STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}/{STRING}){YELLOW} ({COMMA}%/{COMMA}% vervoerd)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{TOWN} {STRING}
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...te dicht bij een andere industrie
@@ -1244,15 +1244,15 @@
 STR_NETWORK_ADD_SERVER_TIP                                      :{BLACK}Voegt een server toe aan de lijst die altijd gecontroleerd zal worden op draaiende spellen.
 STR_NETWORK_ENTER_IP                                            :{BLACK}IP adres van de server invoeren
 
-STR_NETWORK_CLIENTS_ONLINE                                      :{BLACK}{COMMA16}/{COMMA16}
+STR_NETWORK_CLIENTS_ONLINE                                      :{BLACK}{COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Spelers
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Spelers online / spelers maximaal
 STR_NETWORK_GAME_INFO                                           :{SILVER}SPEL INFORMATIE
 STR_ORANGE                                                      :{ORANGE}{STRING}
-STR_NETWORK_CLIENTS                                             :{SILVER}Spelers:  {WHITE}{COMMA8} / {COMMA8}
+STR_NETWORK_CLIENTS                                             :{SILVER}Spelers:  {WHITE}{COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}Taal:  {WHITE}{STRING}
 STR_NETWORK_TILESET                                             :{SILVER}Klimaat:  {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Kaartgrootte:  {WHITE}{COMMA16}x{COMMA16}
+STR_NETWORK_MAP_SIZE                                            :{SILVER}Kaartgrootte:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Server versie:  {WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Server adres:  {WHITE}{STRING} : {NUMU16}
 STR_NETWORK_START_DATE                                          :{SILVER}Start datum:  {WHITE}{DATE_SHORT}
@@ -1517,21 +1517,21 @@
 
 ##id 0x2000
 STR_2000_TOWNS                                                  :{WHITE}Steden
-STR_TOWN_LABEL_POP                                              :{WHITE}{STRING} ({COMMA32})
+STR_TOWN_LABEL_POP                                              :{WHITE}{STRING} ({COMMA})
 STR_2001                                                        :{WHITE}{STRING}
 STR_2002                                                        :{TINYFONT}{BLACK}{STRING}
 STR_2003                                                        :{TINYFONT}{WHITE}{STRING}
 STR_2004_BUILDING_MUST_BE_DEMOLISHED                            :{WHITE}Gebouw moet eerst gesloopt worden
 STR_2005                                                        :{WHITE}{TOWN}
-STR_2006_POPULATION                                             :{BLACK}Bevolking: {ORANGE}{COMMA32}{BLACK}  Huizen: {ORANGE}{COMMA32}
+STR_2006_POPULATION                                             :{BLACK}Bevolking: {ORANGE}{COMMA}{BLACK}  Huizen: {ORANGE}{COMMA}
 STR_2007_RENAME_TOWN                                            :Hernoem stad
 STR_2008_CAN_T_RENAME_TOWN                                      :{WHITE}Kan stad niet hernoemen...
 STR_2009_LOCAL_AUTHORITY_REFUSES                                :{WHITE}De gemeenteraad van {TOWN} staat dit niet toe
 STR_200A_TOWN_NAMES_CLICK_ON_NAME                               :{BLACK}Plaatsnamen - klik op naam om het hoofdbeeld te centreren op de stad
 STR_200B_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Centreer de hoofdbeeld op de lokatie van de stad
 STR_200C_CHANGE_TOWN_NAME                                       :{BLACK}Hernoem stad
-STR_200D_PASSENGERS_LAST_MONTH_MAX                              :{BLACK}Passagiers afelopen maand: {ORANGE}{COMMA32}{BLACK}  max: {ORANGE}{COMMA32}
-STR_200E_MAIL_LAST_MONTH_MAX                                    :{BLACK}Post afgelopen maand: {ORANGE}{COMMA32}{BLACK}  max: {ORANGE}{COMMA32}
+STR_200D_PASSENGERS_LAST_MONTH_MAX                              :{BLACK}Passagiers afelopen maand: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
+STR_200E_MAIL_LAST_MONTH_MAX                                    :{BLACK}Post afgelopen maand: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
 STR_200F_TALL_OFFICE_BLOCK                                      :Hoog kantoorgebouw
 STR_2010_OFFICE_BLOCK                                           :Kantoorgebouw
 STR_2011_SMALL_BLOCK_OF_FLATS                                   :Klein flatgebouw
@@ -1605,7 +1605,7 @@
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Koop het plaatselijk gezag om om je rang te verhogen, met het gevaar van een strenge sanctie, wanneer gepakt.{}  Kosten: {CURRENCY}
 STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Verkeerschaos in {TOWN}!{}{}Wegreparatie betaald door {STRING} zorgt voor 6 maanden van irritatie bij weggebruikers!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
-STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA32})
+STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA})
 STR_2058_UNDER_CONSTRUCTION                                     :{STRING} (in aanbouw)
 STR_2059_IGLOO                                                  :Iglo
 STR_205A_TEPEES                                                 :Tepees
@@ -1667,7 +1667,7 @@
 STR_303C_OUTSTANDING                                            :Uitstekend
 ############ range for rating ends
 
-STR_303D                                                        :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA8}%)
+STR_303D                                                        :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_303E_NO_LONGER_ACCEPTS                                      :{WHITE}{STATION} accepteert niet langer {STRING}
 STR_303F_NO_LONGER_ACCEPTS_OR                                   :{WHITE}{STATION} accepteert niet langer {STRING} en {STRING}
 STR_3040_NOW_ACCEPTS                                            :{WHITE}{STATION} accepteert voortaan {STRING}
@@ -1678,7 +1678,7 @@
 STR_3045_TOO_CLOSE_TO_ANOTHER_TRUCK                             :{WHITE}Te dicht bij een ander vrachtwagenstation
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Verwijder eerst bushalte
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Verwijder eerst vrachtwagenstation
-STR_3048_STATIONS                                               :{WHITE}{STRING} - {COMMA16} Stations
+STR_3048_STATIONS                                               :{WHITE}{STRING} - {COMMA} Stations
 STR_3049_0                                                      :{YELLOW}{STATION} {STRINL 0x30D1}
 STR_304A_NONE                                                   :{YELLOW}- Geen -
 STR_304B_SITE_UNSUITABLE                                        :{WHITE}...plaats ongeschikt
@@ -1735,7 +1735,7 @@
 STR_4002_SAVE                                                   :{BLACK}Opslaan
 STR_4003_DELETE                                                 :{BLACK}Verwijderen
 STR_4004                                                        :{STRING}, {DATE_LONG}
-STR_4005_BYTES_FREE                                             :{BLACK}{COMMA32} megabytes vrij
+STR_4005_BYTES_FREE                                             :{BLACK}{COMMA} megabytes vrij
 STR_4006_UNABLE_TO_READ_DRIVE                                   :{BLACK}Kan niet lezen van schijf
 STR_4007_GAME_SAVE_FAILED                                       :{WHITE}Opslaan Spel Mislukt
 STR_4008_UNABLE_TO_DELETE_FILE                                  :{WHITE}Kan bestand niet verwijderen
@@ -1796,7 +1796,7 @@
 ############ range for requires	ends
 
 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Productie vorige maand:
-STR_482B_TRANSPORTED                                            :{YELLOW}{STRING}{BLACK} ({COMMA16}% getransporteerd)
+STR_482B_TRANSPORTED                                            :{YELLOW}{STRING}{BLACK} ({COMMA}% getransporteerd)
 STR_482C_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Centreer het hoofdbeeld op de locatie van de industrie
 STR_482D_NEW_UNDER_CONSTRUCTION                                 :{BLACK}{BIGFONT}Nieuw {STRING} in aanbouw bij {TOWN}!
 STR_482E_NEW_BEING_PLANTED_NEAR                                 :{BLACK}{BIGFONT}Nieuw {STRING} in aanplant bij {TOWN}!
@@ -1813,8 +1813,8 @@
 STR_4839_PRODUCTION_DOWN_BY_50                                  :{BLACK}{BIGFONT}Productie van {TOWN} {STRING} verlaagd met 50%
 STR_483A_INSECT_INFESTATION_CAUSES                              :{BLACK}{BIGFONT}Insectenplaag zorgt voor ravage bij {TOWN} {STRING}!{}Productie gezakt met 50%
 STR_483B_CAN_ONLY_BE_POSITIONED                                 :{WHITE}...kan alleen aan de rand van de kaart geplaatst worden
-STR_INDUSTRY_PROD_GOUP                                          :{BLACK}{BIGFONT}{STRING} productie van {TOWN} {STRING} stijgt met {COMMA16}%!
-STR_INDUSTRY_PROD_GODOWN                                        :{BLACK}{BIGFONT}{STRING} productie van {TOWN} {STRING} daalt met {COMMA16}%!
+STR_INDUSTRY_PROD_GOUP                                          :{BLACK}{BIGFONT}{STRING} productie van {TOWN} {STRING} stijgt met {COMMA}%!
+STR_INDUSTRY_PROD_GODOWN                                        :{BLACK}{BIGFONT}{STRING} productie van {TOWN} {STRING} daalt met {COMMA}%!
 
 ##id 0x5000
 STR_5000_TRAIN_IN_TUNNEL                                        :{WHITE}Trein in tunnel
@@ -1877,10 +1877,10 @@
 ##id 0x6000
 STR_SV_EMPTY                                                    :
 STR_SV_UNNAMED                                                  :Geen naam{SKIP}
-STR_SV_TRAIN_NAME                                               :Trein {COMMA16}
-STR_SV_ROADVEH_NAME                                             :Automobiel {COMMA16}
-STR_SV_SHIP_NAME                                                :Schip {COMMA16}
-STR_SV_AIRCRAFT_NAME                                            :Vliegtuig {COMMA16}
+STR_SV_TRAIN_NAME                                               :Trein {COMMA}
+STR_SV_ROADVEH_NAME                                             :Automobiel {COMMA}
+STR_SV_SHIP_NAME                                                :Schip {COMMA}
+STR_SV_AIRCRAFT_NAME                                            :Vliegtuig {COMMA}
 
 STR_SV_STNAME                                                   :{STRING}
 STR_SV_STNAME_NORTH                                             :{STRING} Noord
@@ -1930,12 +1930,12 @@
 ############ range for difficulty levels ends
 
 ############ range for difficulty settings starts
-STR_6805_MAXIMUM_NO_COMPETITORS                                 :{LTBLUE}Maximaal aantal tegenstanders: {ORANGE}{COMMA16}
+STR_6805_MAXIMUM_NO_COMPETITORS                                 :{LTBLUE}Maximaal aantal tegenstanders: {ORANGE}{COMMA}
 STR_6806_COMPETITOR_START_TIME                                  :{LTBLUE}Starttijd van tegenstanders: {ORANGE}{STRING}
 STR_6807_NO_OF_TOWNS                                            :{LTBLUE}Aantal steden: {ORANGE}{STRING}
 STR_6808_NO_OF_INDUSTRIES                                       :{LTBLUE}Aantal industrieën: {ORANGE}{STRING}
 STR_6809_MAXIMUM_INITIAL_LOAN_000                               :{LTBLUE}Maximale lening: {ORANGE}{CURRENCY}
-STR_680A_INITIAL_INTEREST_RATE                                  :{LTBLUE}Startrente: {ORANGE}{COMMA16}%
+STR_680A_INITIAL_INTEREST_RATE                                  :{LTBLUE}Startrente: {ORANGE}{COMMA}%
 STR_680B_VEHICLE_RUNNING_COSTS                                  :{LTBLUE}Brandstofkosten: {ORANGE}{STRING}
 STR_680C_CONSTRUCTION_SPEED_OF_COMPETITOR                       :{LTBLUE}Bouwsnelheid van tegenstanders: {ORANGE}{STRING}
 STR_680D_INTELLIGENCE_OF_COMPETITORS                            :{LTBLUE}Intelligentie van tegenstanders: {ORANGE}{STRING}
@@ -1994,7 +1994,7 @@
 ##id 0x7000
 STR_7000                                                        :
 STR_7001                                                        :{WHITE}{STRING} {BLACK}{STRING}
-STR_7002_PLAYER                                                 :(Speler {COMMA16})
+STR_7002_PLAYER                                                 :(Speler {COMMA})
 STR_7004_NEW_FACE                                               :{BLACK}Nieuw gezicht
 STR_7005_COLOR_SCHEME                                           :{BLACK}Kleurenschema
 STR_7006_COLOR_SCHEME                                           :{GOLD}Kleurenschema:
@@ -2028,7 +2028,7 @@
 STR_7022_INCOME_GRAPH                                           :{WHITE}Inkomstengrafiek
 STR_CURRCOMPACT32                                               :{CURRCOMPACT}
 STR_CURRCOMPACT64                                               :{CURRCOMPACT64}
-STR_7024                                                        :{COMMA32}
+STR_7024                                                        :{COMMA}
 STR_7025_OPERATING_PROFIT_GRAPH                                 :{WHITE}Bedrijfswinst Grafiek
 STR_7026_BANK_BALANCE                                           :{WHITE}Bank Saldo
 STR_7027_LOAN                                                   :{WHITE}Lening
@@ -2052,14 +2052,14 @@
 STR_7037_PRESIDENT                                              :{WHITE}{STRING}{}{GOLD}(Directeur)
 STR_7038_INAUGURATED                                            :{GOLD}Gesticht: {WHITE}{NUMU16}
 STR_7039_VEHICLES                                               :{GOLD}Voertuigen:
-STR_703A_TRAIN                                                  :{WHITE}{COMMA16} trein
-STR_703B_TRAINS                                                 :{WHITE}{COMMA16} treinen
-STR_703C_ROAD_VEHICLE                                           :{WHITE}{COMMA16} wegvoertuig
-STR_703D_ROAD_VEHICLES                                          :{WHITE}{COMMA16} wegvoertuigen
-STR_703E_AIRCRAFT                                               :{WHITE}{COMMA16} vliegtuig
-STR_703F_AIRCRAFT                                               :{WHITE}{COMMA16} vliegtuigen
-STR_7040_SHIP                                                   :{WHITE}{COMMA16} schip
-STR_7041_SHIPS                                                  :{WHITE}{COMMA16} schepen
+STR_703A_TRAIN                                                  :{WHITE}{COMMA} trein
+STR_703B_TRAINS                                                 :{WHITE}{COMMA} treinen
+STR_703C_ROAD_VEHICLE                                           :{WHITE}{COMMA} wegvoertuig
+STR_703D_ROAD_VEHICLES                                          :{WHITE}{COMMA} wegvoertuigen
+STR_703E_AIRCRAFT                                               :{WHITE}{COMMA} vliegtuig
+STR_703F_AIRCRAFT                                               :{WHITE}{COMMA} vliegtuigen
+STR_7040_SHIP                                                   :{WHITE}{COMMA} schip
+STR_7041_SHIPS                                                  :{WHITE}{COMMA} schepen
 STR_7042_NONE                                                   :{WHITE}Geen
 STR_7043_FACE_SELECTION                                         :{WHITE}Gezichtsselectie
 STR_7044_MALE                                                   :{BLACK}Mannelijk
@@ -2124,8 +2124,8 @@
 STR_707A_SELL_25_SHARE_IN_THIS_COMPANY                          :{BLACK}Verkoop een aandeel van 25% in dit bedrijf
 STR_707B_CAN_T_BUY_25_SHARE_IN_THIS                             :{WHITE}Kan geen 25% aandeel in dit bedrijf kopen...
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}Kan geen 25% aandeel in dit bedrijf verkopen...
-STR_707D_OWNED_BY                                               :{WHITE}({COMMA16}% eigendom van {STRING})
-STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA16}% eigendom van {STRING}{}   {COMMA16}% eigendom van {STRING})
+STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% eigendom van {STRING})
+STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}% eigendom van {STRING}{}   {COMMA}% eigendom van {STRING})
 STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{STRING} is overgenomen door {STRING}!
 STR_7080_PROTECTED                                              :{WHITE}Dit bedrijf verhandelt nog geen aandelen...
 
@@ -2400,8 +2400,8 @@
 STR_8801_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Inwoners feesten... {}Eerste trein arriveert in {STATION}!
 STR_8802_DETAILS                                                :{WHITE}{STRING} (Details)
 STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}Trein in de weg
-STR_8804                                                        :{SETX 10}{COMMA8}: {STRING}
-STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA8}: {STRING}
+STR_8804                                                        :{SETX 10}{COMMA}: {STRING}
+STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING}
 STR_8806_GO_TO                                                  :Ga naar {STATION}
 STR_8807_GO_TO_TRANSFER                                         :Ga naar {STATION} (Overladen en neem goederen)
 STR_8808_GO_TO_UNLOAD                                           :Ga naar {STATION} (Uit laden)
@@ -2427,13 +2427,13 @@
 STR_UNKNOWN_DESTINATION                                         :onbekende bestemming
 STR_8812_EMPTY                                                  :{LTBLUE}Leeg
 STR_8813_FROM                                                   :{LTBLUE}{CARGO} van {STATION}
-STR_8814_TRAIN_IS_WAITING_IN_DEPOT                              :{WHITE}Trein {COMMA16} wacht in depot
+STR_8814_TRAIN_IS_WAITING_IN_DEPOT                              :{WHITE}Trein {COMMA} wacht in depot
 STR_8815_NEW_VEHICLES                                           :{BLACK}Nieuwe voertuigen
 STR_8816                                                        :{BLACK}-
 STR_8818_INFORMATION                                            :{BLACK}Informatie
 STR_8819_TRAIN_TOO_LONG                                         :{WHITE}Trein te lang
 STR_881A_TRAINS_CAN_ONLY_BE_ALTERED                             :{WHITE}Treinen kunnen alleen aangepast worden wanneer ze gestopt zijn binnen een depot
-STR_881B_TRAINS                                                 :{WHITE}{STRING} - {COMMA16} Treinen
+STR_881B_TRAINS                                                 :{WHITE}{STRING} - {COMMA} Treinen
 STR_881C_NEW_RAIL_VEHICLES                                      :{WHITE}Nieuwe spoorvoertuigen
 STR_881D_NEW_MONORAIL_VEHICLES                                  :{WHITE}Nieuwe monorailvoertuigen
 STR_881E_NEW_MAGLEV_VEHICLES                                    :{WHITE}Nieuwe maglevvoertuigen
@@ -2467,8 +2467,8 @@
 STR_8839_CAN_T_SELL_RAILROAD_VEHICLE                            :{WHITE}Kan treinonderdeel niet verkopen
 STR_883A_UNABLE_TO_FIND_ROUTE_TO                                :{WHITE}Kan geen route naar lokale depot vinden
 STR_883B_CAN_T_STOP_START_TRAIN                                 :{WHITE}Kan trein niet starten of stoppen...
-STR_883C_SERVICING_INTERVAL_DAYS                                :{BLACK}Reparatieinterval: {LTBLUE}{COMMA16}dagen{BLACK}   Laatste reparatie: {LTBLUE}{DATE_LONG}
-STR_SERVICING_INTERVAL_PERCENT                                  :{BLACK}Service interval: {LTBLUE}{COMMA16}%{BLACK}   Laatste service: {LTBLUE}{DATE_LONG}
+STR_883C_SERVICING_INTERVAL_DAYS                                :{BLACK}Reparatieinterval: {LTBLUE}{COMMA}dagen{BLACK}   Laatste reparatie: {LTBLUE}{DATE_LONG}
+STR_SERVICING_INTERVAL_PERCENT                                  :{BLACK}Service interval: {LTBLUE}{COMMA}%{BLACK}   Laatste service: {LTBLUE}{DATE_LONG}
 STR_883D_TRAINS_CLICK_ON_TRAIN_FOR                              :{BLACK}Treinen - klik op een trein voor informatie
 STR_883E_BUILD_NEW_TRAINS_REQUIRES                              :{BLACK}Bouwt nieuwe treinen (treindepot nodig)
 STR_883F_TRAINS_CLICK_ON_TRAIN_FOR                              :{BLACK}Treinen - klik op trein voor info., sleep voertuig om toe tevoegen/verwijderen van trein
@@ -2501,12 +2501,12 @@
 STR_SERVICE_HINT                                                :{BLACK}Sla deze order over tenzij een reparatie nodig is
 STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}Nieuwe {STRING} nu beschikbaar!
 STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
-STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Prijs: {CURRENCY} Gewicht: {COMMA16}t{}Snelheid: {VELOCITY}  Kracht: {COMMA16}pk{}Brandstofprijs: {CURRENCY}/jr{}Capaciteit: {STRING}
+STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Prijs: {CURRENCY} Gewicht: {COMMA}t{}Snelheid: {VELOCITY}  Kracht: {COMMA}pk{}Brandstofprijs: {CURRENCY}/jr{}Capaciteit: {STRING}
 STR_885C_BROKEN_DOWN                                            :{RED}Kapot
 STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Leeftijd: {LTBLUE}{STRING}{BLACK}   Brandstofkosten: {LTBLUE}{CURRENCY}/jr
-STR_885E_WEIGHT_T_POWER_HP_MAX_SPEED                            :{BLACK}Gewicht: {LTBLUE}{COMMA16}t  {BLACK}Kracht: {LTBLUE}{COMMA32}pk{BLACK} Max. snelheid: {LTBLUE}{VELOCITY}
+STR_885E_WEIGHT_T_POWER_HP_MAX_SPEED                            :{BLACK}Gewicht: {LTBLUE}{COMMA}t  {BLACK}Kracht: {LTBLUE}{COMMA}pk{BLACK} Max. snelheid: {LTBLUE}{VELOCITY}
 STR_885F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Winst dit jaar: {LTBLUE}{CURRENCY}  (vorig jaar: {CURRENCY})
-STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Betrouwbaarheid: {LTBLUE}{COMMA8}%  {BLACK}Pechgevallen sinds laatste reparatie: {LTBLUE}{COMMA16}
+STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Betrouwbaarheid: {LTBLUE}{COMMA}%  {BLACK}Pechgevallen sinds laatste reparatie: {LTBLUE}{COMMA}
 STR_8861_STOPPED                                                :{RED}Gestopt
 STR_8862_CAN_T_MAKE_TRAIN_PASS_SIGNAL                           :{WHITE}Kan trein niet het signaal laten passeren bij gevaar...
 STR_8863_CRASHED                                                :{RED}Gecrashed!
@@ -2514,7 +2514,7 @@
 STR_8865_NAME_TRAIN                                             :{WHITE}Hernoem trein
 STR_8866_CAN_T_NAME_TRAIN                                       :{WHITE}Kan trein niet zo noemen...
 STR_8867_NAME_TRAIN                                             :{BLACK}Trein benaming
-STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Trein Ongeluk!{}{COMMA16} gedood in een vuurbal na de botsing
+STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Trein Ongeluk!{}{COMMA} gedood in een vuurbal na de botsing
 STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}Kan de richting van de trein niet omdraaien...
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Hernoem trein voertuig type
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Kan het trein voertuig type niet hernoemen...
@@ -2526,7 +2526,7 @@
 
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Wegvoertuig in de weg
-STR_9001_ROAD_VEHICLES                                          :{WHITE}{STRING} - {COMMA16} Wegvoertuigen
+STR_9001_ROAD_VEHICLES                                          :{WHITE}{STRING} - {COMMA} Wegvoertuigen
 STR_9002                                                        :{WHITE}{STRING}
 STR_9003_ROAD_VEHICLE_DEPOT                                     :{WHITE}{TOWN} Bouw wegvoertuigdepot
 STR_9004_NEW_VEHICLES                                           :{BLACK}Nieuwe voertuigen
@@ -2540,13 +2540,13 @@
 STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Leeftijd: {LTBLUE}{STRING}{BLACK}   Brandstofkosten: {LTBLUE}{CURRENCY}/jr
 STR_900E_MAX_SPEED                                              :{BLACK}Max. snelheid: {LTBLUE}{VELOCITY}
 STR_900F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Winst dit jaar: {LTBLUE}{CURRENCY}  (vorig jaar: {CURRENCY})
-STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Betrouwbaarheid: {LTBLUE}{COMMA8}%  {BLACK}Pechgevallen sinds laatste reparaties: {LTBLUE}{COMMA16}
+STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Betrouwbaarheid: {LTBLUE}{COMMA}%  {BLACK}Pechgevallen sinds laatste reparaties: {LTBLUE}{COMMA}
 STR_9011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Gebouwd: {LTBLUE}{NUMU16}{BLACK} Waarde: {LTBLUE}{CURRENCY}
 STR_9012_CAPACITY                                               :{BLACK}Capaciteit: {LTBLUE}{STRING}
 STR_9013_MUST_BE_STOPPED_INSIDE                                 :{WHITE}...moet gestopt zijn binnen een wegvoertuig depot
 STR_9014_CAN_T_SELL_ROAD_VEHICLE                                :{WHITE}Kan dit wegvoertuig niet verkopen...
 STR_9015_CAN_T_STOP_START_ROAD_VEHICLE                          :{WHITE}Kan wegvoertuig niet starten of stoppen...
-STR_9016_ROAD_VEHICLE_IS_WAITING                                :{WHITE}Wegvoertuig {COMMA16} wacht in depot
+STR_9016_ROAD_VEHICLE_IS_WAITING                                :{WHITE}Wegvoertuig {COMMA} wacht in depot
 STR_HEADING_FOR_ROAD_DEPOT                                      :{LTBLUE}Op weg naar {TOWN} Weg Depot
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{LTBLUE}Op weg naar {TOWN} Weg Depot, {VELOCITY}
 STR_9018_CAN_T_SEND_VEHICLE_TO_DEPOT                            :{WHITE}Kan voertuig niet naar depot sturen...
@@ -2575,7 +2575,7 @@
 STR_902F_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Inwoners feesten...{}Eerste bus arriveert in {STATION}!
 STR_9030_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Inwoners feesten...{}Eerste vrachtwagen arriveert in {STATION}!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Wegvoertuig gebotst!{}Bestuurder verongelukt door treinbotsing
-STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Wegvoertuig gebotst!{}{COMMA16} verongelukt door treinbotsing
+STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Wegvoertuig gebotst!{}{COMMA} verongelukt door treinbotsing
 STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}Kan voertuig niet omdraaien...
 STR_9034_RENAME                                                 :{BLACK}Hernoem
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Hernoem wegvoertuigtype
@@ -2590,7 +2590,7 @@
 STR_9802_CAN_T_BUILD_DOCK_HERE                                  :{WHITE}Kan hier geen dok bouwen...
 STR_9803_SHIP_DEPOT                                             :{WHITE}{TOWN} Scheepswerf
 STR_9804_NEW_SHIPS                                              :{BLACK}Nieuwe schepen
-STR_9805_SHIPS                                                  :{WHITE}{STRING} - {COMMA16} Schepen
+STR_9805_SHIPS                                                  :{WHITE}{STRING} - {COMMA} Schepen
 STR_9806_CAN_T_BUILD_SHIPS                                      :{WHITE}Kan geen schip bouwen...
 STR_9807_MUST_BUILD_SHIP_DEPOT_FIRST                            :{WHITE}Bouw eerst een scheepswerf
 STR_9808_NEW_SHIPS                                              :{WHITE}Nieuwe schepen
@@ -2605,7 +2605,7 @@
 STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Leeftijd: {LTBLUE}{STRING}{BLACK}   Brandstofkosten: {LTBLUE}{CURRENCY}/jr
 STR_9813_MAX_SPEED                                              :{BLACK}Max. snelheid: {LTBLUE}{VELOCITY}
 STR_9814_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Winst dit jaar: {LTBLUE}{CURRENCY}  (vorig jaar: {CURRENCY})
-STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Betrouwbaarheid: {LTBLUE}{COMMA8}%  {BLACK}Pechgevallen sinds laatste reparatie: {LTBLUE}{COMMA16}
+STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Betrouwbaarheid: {LTBLUE}{COMMA}%  {BLACK}Pechgevallen sinds laatste reparatie: {LTBLUE}{COMMA}
 STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Gebouwd: {LTBLUE}{NUMU16}{BLACK} Waarde: {LTBLUE}{CURRENCY}
 STR_9817_CAPACITY                                               :{BLACK}Capaciteit: {LTBLUE}{STRING}
 STR_9818_CAN_T_STOP_START_SHIP                                  :{WHITE}Kan schip niet starten of stoppen...
@@ -2613,7 +2613,7 @@
 STR_981A_UNABLE_TO_FIND_LOCAL_DEPOT                             :{WHITE}Kan lokaal depot niet vinden
 STR_HEADING_FOR_SHIP_DEPOT                                      :{LTBLUE}Op weg naar {TOWN} Scheepswerf
 STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{LTBLUE}Op weg naar {TOWN} Scheepswerf, {VELOCITY}
-STR_981C_SHIP_IS_WAITING_IN_DEPOT                               :{WHITE}Schip {COMMA16} wacht in depot
+STR_981C_SHIP_IS_WAITING_IN_DEPOT                               :{WHITE}Schip {COMMA} wacht in depot
 STR_981D_BUILD_SHIP_DOCK                                        :{BLACK}Bouw haven
 STR_981E_BUILD_SHIP_DEPOT_FOR_BUILDING                          :{BLACK}Bouw scheepswerf (om schepen te bouwen en te repareren)
 STR_981F_SHIPS_CLICK_ON_SHIP_FOR                                :{BLACK}Schepen - klik op schip voor informatie
@@ -2664,19 +2664,19 @@
 STR_A005_NEW_AIRCRAFT                                           :{WHITE}Nieuw Vliegtuig
 STR_A006_BUILD_AIRCRAFT                                         :{BLACK}Bouw Vliegtuig
 STR_A008_CAN_T_BUILD_AIRCRAFT                                   :{WHITE}Kan vliegtuig niet bouwen...
-STR_A009_AIRCRAFT                                               :{WHITE}{STRING} - {COMMA16} Vliegtuigen
+STR_A009_AIRCRAFT                                               :{WHITE}{STRING} - {COMMA} Vliegtuigen
 STR_A00A                                                        :{WHITE}{STRING}
 STR_A00B_ORDERS                                                 :{WHITE}{STRING} (Orders)
 STR_A00C_DETAILS                                                :{WHITE}{STRING} (Details)
 STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Leeftijd: {LTBLUE}{STRING}{BLACK}   Brandstofkosten: {LTBLUE}{CURRENCY}/jr
 STR_A00E_MAX_SPEED                                              :{BLACK}Max. snelheid: {LTBLUE}{VELOCITY}
 STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Winst dit jaar: {LTBLUE}{CURRENCY}  (vorig jaar: {CURRENCY})
-STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Betrouwbaarheid: {LTBLUE}{COMMA8}%  {BLACK}Pechgevallen sinds laatste reparatie: {LTBLUE}{COMMA16}
+STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Betrouwbaarheid: {LTBLUE}{COMMA}%  {BLACK}Pechgevallen sinds laatste reparatie: {LTBLUE}{COMMA}
 STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Bouwdatum: {LTBLUE}{NUMU16}{BLACK} Waarde: {LTBLUE}{CURRENCY}
 STR_A012_CAN_T_SEND_AIRCRAFT_TO                                 :{WHITE}Kan vliegtuig niet naar hangar sturen...
 STR_HEADING_FOR_HANGAR                                          :{LTBLUE}Op weg naar {STATION} Hangar
 STR_HEADING_FOR_HANGAR_VEL                                      :{LTBLUE}Op weg naar {STATION} Hangar, {VELOCITY}
-STR_A014_AIRCRAFT_IS_WAITING_IN                                 :{WHITE}Vliegtuig {COMMA16} wacht in de vliegtuig hangar
+STR_A014_AIRCRAFT_IS_WAITING_IN                                 :{WHITE}Vliegtuig {COMMA} wacht in de vliegtuig hangar
 STR_A015_AIRCRAFT_IN_THE_WAY                                    :{WHITE}Vliegtuig in de weg
 STR_A016_CAN_T_STOP_START_AIRCRAFT                              :{WHITE}Kan vliegtuig niet stoppen/starten...
 STR_A017_AIRCRAFT_IS_IN_FLIGHT                                  :{WHITE}Vliegutig is in the lucht
@@ -2702,14 +2702,14 @@
 STR_A02B_SHOW_AIRCRAFT_DETAILS                                  :{BLACK}Laat vliegtuigdetails zien
 STR_A02C_NEW_AIRCRAFT_NOW_AVAILABLE                             :{BLACK}{BIGFONT}Nieuw vliegtuig nu beschikbaar!
 STR_A02D                                                        :{BLACK}{BIGFONT}{STRING}
-STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Prijs: {CURRENCY} Max. snelheid: {VELOCITY}{}Capaciteit: {COMMA16} passagiers, {COMMA16} zakken post{}Brandstofkosten: {CURRENCY}/jr
+STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Prijs: {CURRENCY} Max. snelheid: {VELOCITY}{}Capaciteit: {COMMA} passagiers, {COMMA} zakken post{}Brandstofkosten: {CURRENCY}/jr
 
 STR_A030_NAME_AIRCRAFT                                          :{WHITE}Hernoem vliegtuig
 STR_A031_CAN_T_NAME_AIRCRAFT                                    :{WHITE}Kan vliegtuig niet hernoemen...
 STR_A032_NAME_AIRCRAFT                                          :{BLACK}Hernoem vliegtuig
 STR_A033_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Inwoners feesten...{}Eerste vliegtuig arriveert in {STATION}!
-STR_A034_PLANE_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Vliegtuig neergestort!{}{COMMA16} sterven in een vuurbal bij {STATION}
-STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Vliegtuig Neergestort!{}Vliegtuig had brandstoftekort, {COMMA16} komen om in explosie!
+STR_A034_PLANE_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Vliegtuig neergestort!{}{COMMA} sterven in een vuurbal bij {STATION}
+STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Vliegtuig Neergestort!{}Vliegtuig had brandstoftekort, {COMMA} komen om in explosie!
 STR_A035_DESTINATIONS                                           :{TINYFONT}{BLACK}Doelen:
 STR_A036                                                        :{TINYFONT}{BLACK}{STATION}
 STR_A037_RENAME                                                 :{BLACK}Hernoem
@@ -2735,7 +2735,7 @@
 STR_B003_FACTORY_DESTROYED_IN_SUSPICIOUS                        :{BLACK}{BIGFONT}Fabriek in de buurt van {TOWN} is vernietigd onder verdachte omstandigheden!
 STR_B004_UFO_LANDS_NEAR                                         :{BLACK}{BIGFONT}'UFO' landt in de buurt van {TOWN}!
 STR_B005_COAL_MINE_SUBSIDENCE_LEAVES                            :{BLACK}{BIGFONT}Instorting van kolenmijn laat spoor van vernietiging achter in de buurt van {TOWN}!
-STR_B006_FLOOD_VEHICLE_DESTROYED                                :{BLACK}{BIGFONT}Overstromingen!{}Minstens {COMMA16} zijn vermist of dood na overstromingen!
+STR_B006_FLOOD_VEHICLE_DESTROYED                                :{BLACK}{BIGFONT}Overstromingen!{}Minstens {COMMA} zijn vermist of dood na overstromingen!
 
 STR_BRIBE_FAILED                                                :{WHITE}Je poging tot omkopen is
 STR_BRIBE_FAILED_2                                              :{WHITE}ondekt door regionale onderzoekers
@@ -2745,7 +2745,7 @@
 STR_PERFORMANCE_DETAIL                                          :{WHITE}Detail van de prestatiewaarde
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Detail
 STR_PERFORMANCE_DETAIL_AMOUNT_CURRENCY                          :{BLACK}({CURRCOMPACT}/{CURRCOMPACT})
-STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA32}/{COMMA32})
+STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA}/{COMMA})
 STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{INT32}%
 SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{INT32}
 ############ Those following lines need to be in this order!!
@@ -2780,7 +2780,7 @@
 STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID:
 
 STR_CURRENCY_WINDOW                                             :{WHITE}Aangepaste valuta
-STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Wisselkoers: {ORANGE}{CURRENCY} = {POUNDSIGN} {COMMA16}
+STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Wisselkoers: {ORANGE}{CURRENCY} = {POUNDSIGN} {COMMA}
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Scheidingsteken:
 STR_CURRENCY_PREFIX                                             :{LTBLUE}Voorvoegsel:
 STR_CURRENCY_SUFFIX                                             :{LTBLUE}Achtervoegsel:
@@ -2794,10 +2794,10 @@
 STR_PLANE                                                       :{BLACK}{PLANE}
 STR_SHIP                                                        :{BLACK}{SHIP}
 
-STR_SCHEDULED_TRAINS                                            :{WHITE}{STATION} - {COMMA16} Treinen
-STR_SCHEDULED_ROAD_VEHICLES                                     :{WHITE}{STATION} - {COMMA16} Wegvoertuigen
-STR_SCHEDULED_AIRCRAFT                                          :{WHITE}{STATION} - {COMMA16} Vliegtuigen
-STR_SCHEDULED_SHIPS                                             :{WHITE}{STATION} - {COMMA16} Schepen
+STR_SCHEDULED_TRAINS                                            :{WHITE}{STATION} - {COMMA} Treinen
+STR_SCHEDULED_ROAD_VEHICLES                                     :{WHITE}{STATION} - {COMMA} Wegvoertuigen
+STR_SCHEDULED_AIRCRAFT                                          :{WHITE}{STATION} - {COMMA} Vliegtuigen
+STR_SCHEDULED_SHIPS                                             :{WHITE}{STATION} - {COMMA} Schepen
 
 STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Geef alle treinen weer die dit station in hun opdrachtenlijst hebben
 STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Geef alle wegvoertuigen weer die dit station in hun opdrachtenlijst hebben
@@ -2819,7 +2819,7 @@
 STR_REPLACE_HELP                                                :{BLACK}Deze optie stelt je in staat om een type locomotief te selecteren en die te vervangen door een andere. Dit zal automatisch gebeuren zodra de voertuigen een depot inrijden
 
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
-STR_SIGN_LIST_CAPTION                                           :{WHITE}Bordjes lijst - {COMMA16} Bordjes
+STR_SIGN_LIST_CAPTION                                           :{WHITE}Bordjes lijst - {COMMA} Bordjes
 
 ############ Lists rail types
 
@@ -2829,16 +2829,16 @@
 
 ############ End of list of rail types
 
-STR_TINY_BLACK                                                  :{BLACK}{TINYFONT}{COMMA16}
+STR_TINY_BLACK                                                  :{BLACK}{TINYFONT}{COMMA}
 
-STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Kosten: {GOLD}{CURRENCY}{BLACK} Gewicht: {GOLD}{COMMA16}t
-STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Snelheid: {GOLD}{VELOCITY}{BLACK}   Kracht: {GOLD}{COMMA32}pk
+STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Kosten: {GOLD}{CURRENCY}{BLACK} Gewicht: {GOLD}{COMMA}t
+STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Snelheid: {GOLD}{VELOCITY}{BLACK}   Kracht: {GOLD}{COMMA}pk
 STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}Onderhoudskosten: {GOLD}{CURRENCY}/jr
 STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Capaciteit: {GOLD}{STRING} {STRING}
-STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Ontworpen: {GOLD}{NUMU16}{BLACK} Levensduur: {GOLD}{COMMA16} jaar
-STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Max. Betrouwbaarheid: {GOLD}{COMMA8}%
+STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Ontworpen: {GOLD}{NUMU16}{BLACK} Levensduur: {GOLD}{COMMA} jaar
+STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Max. Betrouwbaarheid: {GOLD}{COMMA}%
 STR_PURCHASE_INFO_COST                                          :{BLACK}Kosten: {GOLD}{CURRENCY}
-STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Gewicht: {GOLD}{COMMA16}t  ({COMMA16}t)
+STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Gewicht: {GOLD}{COMMA}t  ({COMMA}t)
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Kosten: {GOLD}{CURRENCY}{BLACK} Snelheid: {GOLD}{VELOCITY}
-STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Capaciteit: {GOLD}{COMMA16} passagiers, {COMMA16} zakken post
-STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Aangedreven wagons: {GOLD}+{COMMA16}pk{BLACK} Gewicht: {GOLD}+{COMMA8}t
+STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Capaciteit: {GOLD}{COMMA} passagiers, {COMMA} zakken post
+STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Aangedreven wagons: {GOLD}+{COMMA}pk{BLACK} Gewicht: {GOLD}+{COMMA}t
--- a/lang/english.txt	Thu Jul 14 09:53:52 2005 +0000
+++ b/lang/english.txt	Thu Jul 14 15:10:20 2005 +0000
@@ -82,69 +82,69 @@
 STR_004C_PLASTIC                                                :Plastic
 STR_004D_FIZZY_DRINK                                            :Fizzy Drink
 STR_004E                                                        :
-STR_004F_PASSENGER                                              :{COMMA16} passenger
-STR_0050_TON_OF_COAL                                            :{COMMA16} tonne of coal
-STR_0051_BAG_OF_MAIL                                            :{COMMA16} bag of mail
+STR_004F_PASSENGER                                              :{COMMA} passenger
+STR_0050_TON_OF_COAL                                            :{COMMA} tonne of coal
+STR_0051_BAG_OF_MAIL                                            :{COMMA} bag of mail
 STR_0052_OF_OIL                                                 :{VOLUME} of oil
-STR_0053_ITEM_OF_LIVESTOCK                                      :{COMMA16} item of livestock
-STR_0054_CRATE_OF_GOODS                                         :{COMMA16} crate of goods
-STR_0055_TON_OF_GRAIN                                           :{COMMA16} tonne of grain
-STR_0056_TON_OF_WOOD                                            :{COMMA16} tonne of wood
-STR_0057_TON_OF_IRON_ORE                                        :{COMMA16} tonne of iron ore
-STR_0058_TON_OF_STEEL                                           :{COMMA16} tonne of steel
-STR_0059_BAG_OF_VALUABLES                                       :{COMMA16} bag of valuables
-STR_005A_TON_OF_COPPER_ORE                                      :{COMMA16} tonne of copper ore
-STR_005B_TON_OF_MAIZE                                           :{COMMA16} tonne of maize
-STR_005C_TON_OF_FRUIT                                           :{COMMA16} tonne of fruit
-STR_005D_BAG_OF_DIAMONDS                                        :{COMMA16} bag of diamonds
-STR_005E_TON_OF_FOOD                                            :{COMMA16} tonne of food
-STR_005F_TON_OF_PAPER                                           :{COMMA16} tonne of paper
-STR_0060_BAG_OF_GOLD                                            :{COMMA16} bag of gold
+STR_0053_ITEM_OF_LIVESTOCK                                      :{COMMA} item of livestock
+STR_0054_CRATE_OF_GOODS                                         :{COMMA} crate of goods
+STR_0055_TON_OF_GRAIN                                           :{COMMA} tonne of grain
+STR_0056_TON_OF_WOOD                                            :{COMMA} tonne of wood
+STR_0057_TON_OF_IRON_ORE                                        :{COMMA} tonne of iron ore
+STR_0058_TON_OF_STEEL                                           :{COMMA} tonne of steel
+STR_0059_BAG_OF_VALUABLES                                       :{COMMA} bag of valuables
+STR_005A_TON_OF_COPPER_ORE                                      :{COMMA} tonne of copper ore
+STR_005B_TON_OF_MAIZE                                           :{COMMA} tonne of maize
+STR_005C_TON_OF_FRUIT                                           :{COMMA} tonne of fruit
+STR_005D_BAG_OF_DIAMONDS                                        :{COMMA} bag of diamonds
+STR_005E_TON_OF_FOOD                                            :{COMMA} tonne of food
+STR_005F_TON_OF_PAPER                                           :{COMMA} tonne of paper
+STR_0060_BAG_OF_GOLD                                            :{COMMA} bag of gold
 STR_0061_OF_WATER                                               :{VOLUME} of water
-STR_0062_TON_OF_WHEAT                                           :{COMMA16} tonne of wheat
+STR_0062_TON_OF_WHEAT                                           :{COMMA} tonne of wheat
 STR_0063_OF_RUBBER                                              :{VOLUME} of rubber
-STR_0064_TON_OF_SUGAR                                           :{COMMA16} tonne of sugar
-STR_0065_TOY                                                    :{COMMA16} toy
-STR_0066_BAG_OF_CANDY                                           :{COMMA16} bag of sweets
+STR_0064_TON_OF_SUGAR                                           :{COMMA} tonne of sugar
+STR_0065_TOY                                                    :{COMMA} toy
+STR_0066_BAG_OF_CANDY                                           :{COMMA} bag of sweets
 STR_0067_OF_COLA                                                :{VOLUME} of cola
-STR_0068_TON_OF_COTTON_CANDY                                    :{COMMA16} tonne of candyfloss
-STR_0069_BUBBLE                                                 :{COMMA16} bubble
-STR_006A_TON_OF_TOFFEE                                          :{COMMA16} tonne of toffee
-STR_006B_BATTERY                                                :{COMMA16} battery
+STR_0068_TON_OF_COTTON_CANDY                                    :{COMMA} tonne of candyfloss
+STR_0069_BUBBLE                                                 :{COMMA} bubble
+STR_006A_TON_OF_TOFFEE                                          :{COMMA} tonne of toffee
+STR_006B_BATTERY                                                :{COMMA} battery
 STR_006C_OF_PLASTIC                                             :{VOLUME} of plastic
-STR_006D_FIZZY_DRINK                                            :{COMMA16} fizzy drink
+STR_006D_FIZZY_DRINK                                            :{COMMA} fizzy drink
 STR_006E                                                        :
-STR_006F_PASSENGERS                                             :{COMMA16} passengers
-STR_0070_TONS_OF_COAL                                           :{COMMA16} tonnes of coal
-STR_0071_BAGS_OF_MAIL                                           :{COMMA16} bags of mail
+STR_006F_PASSENGERS                                             :{COMMA} passengers
+STR_0070_TONS_OF_COAL                                           :{COMMA} tonnes of coal
+STR_0071_BAGS_OF_MAIL                                           :{COMMA} bags of mail
 STR_0072_OF_OIL                                                 :{VOLUME} of oil
-STR_0073_ITEMS_OF_LIVESTOCK                                     :{COMMA16} items of livestock
-STR_0074_CRATES_OF_GOODS                                        :{COMMA16} crates of goods
-STR_0075_TONS_OF_GRAIN                                          :{COMMA16} tonnes of grain
-STR_0076_TONS_OF_WOOD                                           :{COMMA16} tonnes of wood
-STR_0077_TONS_OF_IRON_ORE                                       :{COMMA16} tonnes of iron ore
-STR_0078_TONS_OF_STEEL                                          :{COMMA16} tonnes of steel
-STR_0079_BAGS_OF_VALUABLES                                      :{COMMA16} bags of valuables
-STR_007A_TONS_OF_COPPER_ORE                                     :{COMMA16} tonnes of copper ore
-STR_007B_TONS_OF_MAIZE                                          :{COMMA16} tonnes of maize
-STR_007C_TONS_OF_FRUIT                                          :{COMMA16} tonnes of fruit
-STR_007D_BAGS_OF_DIAMONDS                                       :{COMMA16} bags of diamonds
-STR_007E_TONS_OF_FOOD                                           :{COMMA16} tonnes of food
-STR_007F_TONS_OF_PAPER                                          :{COMMA16} tonnes of paper
-STR_0080_BAGS_OF_GOLD                                           :{COMMA16} bags of gold
+STR_0073_ITEMS_OF_LIVESTOCK                                     :{COMMA} items of livestock
+STR_0074_CRATES_OF_GOODS                                        :{COMMA} crates of goods
+STR_0075_TONS_OF_GRAIN                                          :{COMMA} tonnes of grain
+STR_0076_TONS_OF_WOOD                                           :{COMMA} tonnes of wood
+STR_0077_TONS_OF_IRON_ORE                                       :{COMMA} tonnes of iron ore
+STR_0078_TONS_OF_STEEL                                          :{COMMA} tonnes of steel
+STR_0079_BAGS_OF_VALUABLES                                      :{COMMA} bags of valuables
+STR_007A_TONS_OF_COPPER_ORE                                     :{COMMA} tonnes of copper ore
+STR_007B_TONS_OF_MAIZE                                          :{COMMA} tonnes of maize
+STR_007C_TONS_OF_FRUIT                                          :{COMMA} tonnes of fruit
+STR_007D_BAGS_OF_DIAMONDS                                       :{COMMA} bags of diamonds
+STR_007E_TONS_OF_FOOD                                           :{COMMA} tonnes of food
+STR_007F_TONS_OF_PAPER                                          :{COMMA} tonnes of paper
+STR_0080_BAGS_OF_GOLD                                           :{COMMA} bags of gold
 STR_0081_OF_WATER                                               :{VOLUME} of water
-STR_0082_TONS_OF_WHEAT                                          :{COMMA16} tonnes of wheat
+STR_0082_TONS_OF_WHEAT                                          :{COMMA} tonnes of wheat
 STR_0083_OF_RUBBER                                              :{VOLUME} of rubber
-STR_0084_TONS_OF_SUGAR                                          :{COMMA16} tonnes of sugar
-STR_0085_TOYS                                                   :{COMMA16} toys
-STR_0086_BAGS_OF_CANDY                                          :{COMMA16} bags of sweets
+STR_0084_TONS_OF_SUGAR                                          :{COMMA} tonnes of sugar
+STR_0085_TOYS                                                   :{COMMA} toys
+STR_0086_BAGS_OF_CANDY                                          :{COMMA} bags of sweets
 STR_0087_OF_COLA                                                :{VOLUME} of cola
-STR_0088_TONS_OF_COTTON_CANDY                                   :{COMMA16} tonnes of candyfloss
-STR_0089_BUBBLES                                                :{COMMA16} bubbles
-STR_008A_TONS_OF_TOFFEE                                         :{COMMA16} tonnes of toffee
-STR_008B_BATTERIES                                              :{COMMA16} batteries
+STR_0088_TONS_OF_COTTON_CANDY                                   :{COMMA} tonnes of candyfloss
+STR_0089_BUBBLES                                                :{COMMA} bubbles
+STR_008A_TONS_OF_TOFFEE                                         :{COMMA} tonnes of toffee
+STR_008B_BATTERIES                                              :{COMMA} batteries
 STR_008C_OF_PLASTIC                                             :{VOLUME} of plastic
-STR_008D_FIZZY_DRINKS                                           :{COMMA16} fizzy drinks
+STR_008D_FIZZY_DRINKS                                           :{COMMA} fizzy drinks
 STR_008E                                                        :
 STR_008F_PS                                                     :{TINYFONT}PS
 STR_0090_CL                                                     :{TINYFONT}CL
@@ -219,8 +219,8 @@
 STR_00DF_GREY                                                   :Grey
 STR_00E0_WHITE                                                  :White
 STR_00E1_TOO_MANY_VEHICLES_IN_GAME                              :{WHITE}Too many vehicles in game
-STR_00E2                                                        :{BLACK}{COMMA16}
-STR_00E3                                                        :{RED}{COMMA16}
+STR_00E2                                                        :{BLACK}{COMMA}
+STR_00E3                                                        :{RED}{COMMA}
 STR_00E4_LOCATION                                               :{BLACK}Location
 STR_00E5_CONTOURS                                               :Contours
 STR_00E6_VEHICLES                                               :Vehicles
@@ -441,18 +441,18 @@
 STR_0198_PROFIT_THIS_YEAR_LAST_YEAR                             :{TINYFONT}{BLACK}Profit this year: {CURRENCY} (last year: {CURRENCY})
 
 ############ range for service numbers starts
-STR_0199_YEAR                                                   :{COMMA16} year ({COMMA16})
-STR_019A_YEARS                                                  :{COMMA16} years ({COMMA16})
-STR_019B_YEARS                                                  :{RED}{COMMA16} years ({COMMA16})
+STR_0199_YEAR                                                   :{COMMA} year ({COMMA})
+STR_019A_YEARS                                                  :{COMMA} years ({COMMA})
+STR_019B_YEARS                                                  :{RED}{COMMA} years ({COMMA})
 ############ range for service numbers ends
 
 STR_019C_ROAD_VEHICLE                                           :Road vehicle
 STR_019D_AIRCRAFT                                               :Aircraft
 STR_019E_SHIP                                                   :Ship
 STR_019F_TRAIN                                                  :Train
-STR_01A0_IS_GETTING_OLD                                         :{WHITE}{STRING} {COMMA16} is getting old
-STR_01A1_IS_GETTING_VERY_OLD                                    :{WHITE}{STRING} {COMMA16} is getting very old
-STR_01A2_IS_GETTING_VERY_OLD_AND                                :{WHITE}{STRING} {COMMA16} is getting very old and urgently needs replacing
+STR_01A0_IS_GETTING_OLD                                         :{WHITE}{STRING} {COMMA} is getting old
+STR_01A1_IS_GETTING_VERY_OLD                                    :{WHITE}{STRING} {COMMA} is getting very old
+STR_01A2_IS_GETTING_VERY_OLD_AND                                :{WHITE}{STRING} {COMMA} is getting very old and urgently needs replacing
 STR_01A3_LAND_AREA_INFORMATION                                  :{WHITE}Land Area Information
 STR_01A4_COST_TO_CLEAR_N_A                                      :{BLACK}Cost to clear: {LTBLUE}N/A
 STR_01A5_COST_TO_CLEAR                                          :{BLACK}Cost to clear: {LTBLUE}{CURRENCY}
@@ -497,7 +497,7 @@
 STR_01CA_31ST                                                   :31st
 ############ range for days	ends
 
-STR_01CB                                                        :{TINYFONT}{COMMA16}
+STR_01CB                                                        :{TINYFONT}{COMMA}
 STR_01CC_TOGGLE_LARGE_SMALL_MAP                                 :{BLACK}Toggle large/medium/small map size
 STR_01CD_SELECT_TUTORIAL_DEMONSTRATION                          :{WHITE}Select Tutorial/Demonstration
 
@@ -509,7 +509,7 @@
 STR_CARGO_ACCEPTED_5                                            :{BLACK}Cargo accepted: {LTBLUE}{STRING}, {STRING}, {STRING}, {STRING}, {STRING}
 ############ range for cargo acecpted ends
 
-STR_01D1_8                                                      :({COMMA8}/8 {STRING})
+STR_01D1_8                                                      :({COMMA}/8 {STRING})
 STR_01D2_JAZZ_JUKEBOX                                           :{WHITE}Jazz Jukebox
 STR_01D3_SOUND_MUSIC                                            :Sound/music
 STR_01D4_SHOW_SOUND_MUSIC_WINDOW                                :{BLACK}Show sound/music window
@@ -528,16 +528,16 @@
 STR_01E1_START_PLAYING_MUSIC                                    :{BLACK}Start playing music
 STR_01E2_DRAG_SLIDERS_TO_SET_MUSIC                              :{BLACK}Drag sliders to set music and sound effect volumes
 STR_01E3                                                        :{DKGREEN}{TINYFONT}--
-STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA8}
-STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA8}
+STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA}
+STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA}
 STR_01E6                                                        :{DKGREEN}{TINYFONT}------
 STR_01E7                                                        :{DKGREEN}{TINYFONT}"{STRING}"
 STR_01E8_TRACK_XTITLE                                           :{BLACK}{TINYFONT}Track{SETX 88}Title
 STR_01E9_SHUFFLE                                                :{TINYFONT}Shuffle
 STR_01EA_PROGRAM                                                :{TINYFONT}{BLACK}Programme
 STR_01EB_MUSIC_PROGRAM_SELECTION                                :{WHITE}Music Programme Selection
-STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA16} "{STRING}"
-STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA16}   "{STRING}"
+STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} "{STRING}"
+STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA}   "{STRING}"
 STR_01EE_TRACK_INDEX                                            :{TINYFONT}{BLACK}Track Index
 STR_01EF_PROGRAM                                                :{TINYFONT}{BLACK}Programme - '{STRING}'
 STR_01F0_CLEAR                                                  :{TINYFONT}{BLACK}Clear
@@ -577,7 +577,7 @@
 STR_0210_TOO_FAR_FROM_PREVIOUS_DESTINATIO                       :{WHITE}...too far from previous destination
 STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Top companies who reached {NUMU16}{}({STRING} Level)
 STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Company League Table in {NUMU16}
-STR_0212                                                        :{BIGFONT}{COMMA16}.
+STR_0212                                                        :{BIGFONT}{COMMA}.
 STR_0213_BUSINESSMAN                                            :Businessman
 STR_0214_ENTREPRENEUR                                           :Entrepreneur
 STR_0215_INDUSTRIALIST                                          :Industrialist
@@ -586,12 +586,12 @@
 STR_0218_MOGUL                                                  :Mogul
 STR_0219_TYCOON_OF_THE_CENTURY                                  :Tycoon of the Century
 STR_HIGHSCORE_NAME                                              :{BIGFONT}{STRING}, {STRING}
-STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA16})
+STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA})
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{STRING} achieves '{STRING}' status!
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{STRING} of {STRING} achieves '{STRING}' status!
 STR_021D                                                        :{BLACK}
 STR_021E                                                        :{WHITE}
-STR_021F                                                        :{BLUE}{COMMA16}
+STR_021F                                                        :{BLUE}{COMMA}
 STR_0220_CREATE_SCENARIO                                        :{BLACK}Create Scenario
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Scenario Editor
@@ -788,8 +788,8 @@
 STR_EXTRA_VIEW_PORT                                             :Extra viewport
 STR_SIGN_LIST                                                   :Sign list
 STR_02DF_TOWN_DIRECTORY                                         :Town directory
-STR_TOWN_POPULATION                                             :{BLACK}World population: {COMMA32}
-STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Viewport {COMMA16}
+STR_TOWN_POPULATION                                             :{BLACK}World population: {COMMA}
+STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Viewport {COMMA}
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN                                :{BLACK}Copy to viewport
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT                             :{BLACK}Copy the location of the global view to this viewport
 STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW                                :{BLACK}Paste from viewport
@@ -961,34 +961,34 @@
 STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Can't copy order list...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - End of Shared Orders - -
 
-STR_TRAIN_IS_LOST                                               :{WHITE}Train {COMMA16} is lost.
-STR_TRAIN_IS_UNPROFITABLE                                       :{WHITE}Train {COMMA16}'s profit last year was {CURRENCY}
+STR_TRAIN_IS_LOST                                               :{WHITE}Train {COMMA} is lost.
+STR_TRAIN_IS_UNPROFITABLE                                       :{WHITE}Train {COMMA}'s profit last year was {CURRENCY}
 STR_EURO_INTRODUCE                                              :{BLACK}{BIGFONT}European Monetary Union!{}{}The Euro is introduced as the sole currency for everyday transactions in your country!
 
 # Start of order review system.
 # DON'T ADD OR REMOVE LINES HERE
-STR_TRAIN_HAS_TOO_FEW_ORDERS                                    :{WHITE}Train {COMMA16} has too few orders in the schedule
-STR_TRAIN_HAS_VOID_ORDER                                        :{WHITE}Train {COMMA16} has a void order
-STR_TRAIN_HAS_DUPLICATE_ENTRY                                   :{WHITE}Train {COMMA16} has duplicate orders
-STR_TRAIN_HAS_INVALID_ENTRY                                     :{WHITE}Train {COMMA16} has an invalid station in its orders
-STR_ROADVEHICLE_HAS_TOO_FEW_ORDERS                              :{WHITE}Road Vehicle {COMMA16} has too few orders in the schedule
-STR_ROADVEHICLE_HAS_VOID_ORDER                                  :{WHITE}Road Vehicle {COMMA16} has a void order
-STR_ROADVEHICLE_HAS_DUPLICATE_ENTRY                             :{WHITE}Road Vehicle {COMMA16} has duplicate orders
-STR_ROADVEHICLE_HAS_INVALID_ENTRY                               :{WHITE}Road Vehicle {COMMA16} has an invalid station in its orders
-STR_SHIP_HAS_TOO_FEW_ORDERS                                     :{WHITE}Ship {COMMA16} has too few orders in the schedule
-STR_SHIP_HAS_VOID_ORDER                                         :{WHITE}Ship {COMMA16} has a void order
-STR_SHIP_HAS_DUPLICATE_ENTRY                                    :{WHITE}Ship {COMMA16} has duplicate orders
-STR_SHIP_HAS_INVALID_ENTRY                                      :{WHITE}Ship {COMMA16} has an invalid station in its orders
-STR_AIRCRAFT_HAS_TOO_FEW_ORDERS                                 :{WHITE}Aircraft {COMMA16} has too few orders in the schedule
-STR_AIRCRAFT_HAS_VOID_ORDER                                     :{WHITE}Aircraft {COMMA16} has a void order
-STR_AIRCRAFT_HAS_DUPLICATE_ENTRY                                :{WHITE}Aircraft {COMMA16} has duplicate orders
-STR_AIRCRAFT_HAS_INVALID_ENTRY                                  :{WHITE}Aircraft {COMMA16} has an invalid station in its orders
+STR_TRAIN_HAS_TOO_FEW_ORDERS                                    :{WHITE}Train {COMMA} has too few orders in the schedule
+STR_TRAIN_HAS_VOID_ORDER                                        :{WHITE}Train {COMMA} has a void order
+STR_TRAIN_HAS_DUPLICATE_ENTRY                                   :{WHITE}Train {COMMA} has duplicate orders
+STR_TRAIN_HAS_INVALID_ENTRY                                     :{WHITE}Train {COMMA} has an invalid station in its orders
+STR_ROADVEHICLE_HAS_TOO_FEW_ORDERS                              :{WHITE}Road Vehicle {COMMA} has too few orders in the schedule
+STR_ROADVEHICLE_HAS_VOID_ORDER                                  :{WHITE}Road Vehicle {COMMA} has a void order
+STR_ROADVEHICLE_HAS_DUPLICATE_ENTRY                             :{WHITE}Road Vehicle {COMMA} has duplicate orders
+STR_ROADVEHICLE_HAS_INVALID_ENTRY                               :{WHITE}Road Vehicle {COMMA} has an invalid station in its orders
+STR_SHIP_HAS_TOO_FEW_ORDERS                                     :{WHITE}Ship {COMMA} has too few orders in the schedule
+STR_SHIP_HAS_VOID_ORDER                                         :{WHITE}Ship {COMMA} has a void order
+STR_SHIP_HAS_DUPLICATE_ENTRY                                    :{WHITE}Ship {COMMA} has duplicate orders
+STR_SHIP_HAS_INVALID_ENTRY                                      :{WHITE}Ship {COMMA} has an invalid station in its orders
+STR_AIRCRAFT_HAS_TOO_FEW_ORDERS                                 :{WHITE}Aircraft {COMMA} has too few orders in the schedule
+STR_AIRCRAFT_HAS_VOID_ORDER                                     :{WHITE}Aircraft {COMMA} has a void order
+STR_AIRCRAFT_HAS_DUPLICATE_ENTRY                                :{WHITE}Aircraft {COMMA} has duplicate orders
+STR_AIRCRAFT_HAS_INVALID_ENTRY                                  :{WHITE}Aircraft {COMMA} has an invalid station in its orders
 # end of order system
 
-STR_TRAIN_AUTORENEW_FAILED                                      :{WHITE}Autorenew failed on train {COMMA16} (money limit)
-STR_ROADVEHICLE_AUTORENEW_FAILED                                :{WHITE}Autorenew failed on road vehicle {COMMA16} (money limit)
-STR_SHIP_AUTORENEW_FAILED                                       :{WHITE}Autorenew failed on ship {COMMA16} (money limit)
-STR_AIRCRAFT_AUTORENEW_FAILED                                   :{WHITE}Autorenew failed on aircraft {COMMA16} (money limit)
+STR_TRAIN_AUTORENEW_FAILED                                      :{WHITE}Autorenew failed on train {COMMA} (money limit)
+STR_ROADVEHICLE_AUTORENEW_FAILED                                :{WHITE}Autorenew failed on road vehicle {COMMA} (money limit)
+STR_SHIP_AUTORENEW_FAILED                                       :{WHITE}Autorenew failed on ship {COMMA} (money limit)
+STR_AIRCRAFT_AUTORENEW_FAILED                                   :{WHITE}Autorenew failed on aircraft {COMMA} (money limit)
 
 STR_CONFIG_PATCHES                                              :{BLACK}Configure Patches
 STR_CONFIG_PATCHES_TIP                                          :{BLACK}Configure the patches
@@ -1104,7 +1104,7 @@
 STR_CHEATS_TIP                                                  :{BLACK}Checkboxes indicate if you have used this cheat before
 STR_CHEATS_WARNING                                              :{BLACK}Warning! You are about to betray your fellow competitors. Keep in mind that such a disgrace will be remembered for eternity.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Increase money by {CURRENCY64}
-STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Playing as player: {ORANGE}{COMMA16}
+STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Playing as player: {ORANGE}{COMMA}
 STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Magic bulldozer (remove industries, unmovables): {ORANGE}{STRING}
 STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Tunnels may cross each other: {ORANGE}{STRING}
 STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Build while in pause mode: {ORANGE}{STRING}
@@ -1120,7 +1120,7 @@
 STR_GO_NON_STOP_TO_WAYPOINT                                     :Go non-stop via {WAYPOINT}
 
 STR_WAYPOINTNAME_CITY                                           :Waypoint {TOWN}
-STR_WAYPOINTNAME_CITY_SERIAL                                    :Waypoint {TOWN} #{COMMA16}
+STR_WAYPOINTNAME_CITY_SERIAL                                    :Waypoint {TOWN} #{COMMA}
 STR_LANDINFO_WAYPOINT                                           :Waypoint
 
 STR_WAYPOINT                                                    :{WHITE}Waypoint
@@ -1203,8 +1203,8 @@
 STR_CONSTRUCT_SUGAR_MINE_TIP                                    :{BLACK}Construct Sugar Mine
 
 STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Industries
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}){YELLOW} ({COMMA16}% transported)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}/{STRING}){YELLOW} ({COMMA16}%/{COMMA16}% transported)
+STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}){YELLOW} ({COMMA}% transported)
+STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}/{STRING}){YELLOW} ({COMMA}%/{COMMA}% transported)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{TOWN} {STRING}
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...too close to another industry
@@ -1244,15 +1244,15 @@
 STR_NETWORK_ADD_SERVER_TIP                                      :{BLACK}Adds a server to the list which will always be checked for running games.
 STR_NETWORK_ENTER_IP                                            :{BLACK}Enter the address of the host
 
-STR_NETWORK_CLIENTS_ONLINE                                      :{BLACK}{COMMA16}/{COMMA16}
+STR_NETWORK_CLIENTS_ONLINE                                      :{BLACK}{COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Clients
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Clients online / clients max
 STR_NETWORK_GAME_INFO                                           :{SILVER}GAME INFO
 STR_ORANGE                                                      :{ORANGE}{STRING}
-STR_NETWORK_CLIENTS                                             :{SILVER}Clients:  {WHITE}{COMMA8} / {COMMA8}
+STR_NETWORK_CLIENTS                                             :{SILVER}Clients:  {WHITE}{COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}Language:  {WHITE}{STRING}
 STR_NETWORK_TILESET                                             :{SILVER}Tileset:  {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Map size:  {WHITE}{COMMA16}x{COMMA16}
+STR_NETWORK_MAP_SIZE                                            :{SILVER}Map size:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Server version:  {WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Server address:  {WHITE}{STRING} : {NUMU16}
 STR_NETWORK_START_DATE                                          :{SILVER}Start date:  {WHITE}{DATE_SHORT}
@@ -1517,21 +1517,21 @@
 
 ##id 0x2000
 STR_2000_TOWNS                                                  :{WHITE}Towns
-STR_TOWN_LABEL_POP                                              :{WHITE}{STRING} ({COMMA32})
+STR_TOWN_LABEL_POP                                              :{WHITE}{STRING} ({COMMA})
 STR_2001                                                        :{WHITE}{STRING}
 STR_2002                                                        :{TINYFONT}{BLACK}{STRING}
 STR_2003                                                        :{TINYFONT}{WHITE}{STRING}
 STR_2004_BUILDING_MUST_BE_DEMOLISHED                            :{WHITE}Building must be demolished first
 STR_2005                                                        :{WHITE}{TOWN}
-STR_2006_POPULATION                                             :{BLACK}Population: {ORANGE}{COMMA32}{BLACK}  Houses: {ORANGE}{COMMA32}
+STR_2006_POPULATION                                             :{BLACK}Population: {ORANGE}{COMMA}{BLACK}  Houses: {ORANGE}{COMMA}
 STR_2007_RENAME_TOWN                                            :Rename Town
 STR_2008_CAN_T_RENAME_TOWN                                      :{WHITE}Can't rename town...
 STR_2009_LOCAL_AUTHORITY_REFUSES                                :{WHITE}{TOWN} local authority refuses to allow this
 STR_200A_TOWN_NAMES_CLICK_ON_NAME                               :{BLACK}Town names - click on name to centre view on town
 STR_200B_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Centre the main view on town location
 STR_200C_CHANGE_TOWN_NAME                                       :{BLACK}Change town name
-STR_200D_PASSENGERS_LAST_MONTH_MAX                              :{BLACK}Passengers last month: {ORANGE}{COMMA32}{BLACK}  max: {ORANGE}{COMMA32}
-STR_200E_MAIL_LAST_MONTH_MAX                                    :{BLACK}Mail last month: {ORANGE}{COMMA32}{BLACK}  max: {ORANGE}{COMMA32}
+STR_200D_PASSENGERS_LAST_MONTH_MAX                              :{BLACK}Passengers last month: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
+STR_200E_MAIL_LAST_MONTH_MAX                                    :{BLACK}Mail last month: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
 STR_200F_TALL_OFFICE_BLOCK                                      :Tall office block
 STR_2010_OFFICE_BLOCK                                           :Office block
 STR_2011_SMALL_BLOCK_OF_FLATS                                   :Small block of flats
@@ -1605,7 +1605,7 @@
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Bribe the local authority to increase your rating, at the risk of a severe penalty if caught.{}  Cost: {CURRENCY}
 STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Traffic chaos in {TOWN}!{}{}Road rebuilding programme funded by {STRING} brings 6 months of misery to motorists!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
-STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA32})
+STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA})
 STR_2058_UNDER_CONSTRUCTION                                     :{STRING} (under construction)
 STR_2059_IGLOO                                                  :Igloo
 STR_205A_TEPEES                                                 :Tepees
@@ -1667,7 +1667,7 @@
 STR_303C_OUTSTANDING                                            :Outstanding
 ############ range for rating ends
 
-STR_303D                                                        :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA8}%)
+STR_303D                                                        :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_303E_NO_LONGER_ACCEPTS                                      :{WHITE}{STATION} no longer accepts {STRING}
 STR_303F_NO_LONGER_ACCEPTS_OR                                   :{WHITE}{STATION} no longer accepts {STRING} or {STRING}
 STR_3040_NOW_ACCEPTS                                            :{WHITE}{STATION} now accepts {STRING}
@@ -1678,7 +1678,7 @@
 STR_3045_TOO_CLOSE_TO_ANOTHER_TRUCK                             :{WHITE}Too close to another lorry station
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Must demolish bus station first
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Must demolish lorry station first
-STR_3048_STATIONS                                               :{WHITE}{STRING} - {COMMA16} Stations
+STR_3048_STATIONS                                               :{WHITE}{STRING} - {COMMA} Stations
 STR_3049_0                                                      :{YELLOW}{STATION} {STRINL 0x30D1}
 STR_304A_NONE                                                   :{YELLOW}- None -
 STR_304B_SITE_UNSUITABLE                                        :{WHITE}...site unsuitable
@@ -1735,7 +1735,7 @@
 STR_4002_SAVE                                                   :{BLACK}Save
 STR_4003_DELETE                                                 :{BLACK}Delete
 STR_4004                                                        :{STRING}, {DATE_LONG}
-STR_4005_BYTES_FREE                                             :{BLACK}{COMMA32} megabytes free
+STR_4005_BYTES_FREE                                             :{BLACK}{COMMA} megabytes free
 STR_4006_UNABLE_TO_READ_DRIVE                                   :{BLACK}Unable to read drive
 STR_4007_GAME_SAVE_FAILED                                       :{WHITE}Game Save Failed
 STR_4008_UNABLE_TO_DELETE_FILE                                  :{WHITE}Unable to delete file
@@ -1796,7 +1796,7 @@
 ############ range for requires	ends
 
 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Production last month:
-STR_482B_TRANSPORTED                                            :{YELLOW}{STRING}{BLACK} ({COMMA16}% transported)
+STR_482B_TRANSPORTED                                            :{YELLOW}{STRING}{BLACK} ({COMMA}% transported)
 STR_482C_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Centre the main view on industry location
 STR_482D_NEW_UNDER_CONSTRUCTION                                 :{BLACK}{BIGFONT}New {STRING} under construction near {TOWN}!
 STR_482E_NEW_BEING_PLANTED_NEAR                                 :{BLACK}{BIGFONT}New {STRING} being planted near {TOWN}!
@@ -1813,8 +1813,8 @@
 STR_4839_PRODUCTION_DOWN_BY_50                                  :{BLACK}{BIGFONT}{TOWN} {STRING} production down by 50%
 STR_483A_INSECT_INFESTATION_CAUSES                              :{BLACK}{BIGFONT}Insect infestation causes havoc at {TOWN} {STRING}!{}Production down by 50%
 STR_483B_CAN_ONLY_BE_POSITIONED                                 :{WHITE}...can only be positioned near edges of map
-STR_INDUSTRY_PROD_GOUP                                          :{BLACK}{BIGFONT}{STRING} production at {TOWN} {STRING} increases {COMMA16}%!
-STR_INDUSTRY_PROD_GODOWN                                        :{BLACK}{BIGFONT}{STRING} production at {TOWN} {STRING} decreases {COMMA16}%!
+STR_INDUSTRY_PROD_GOUP                                          :{BLACK}{BIGFONT}{STRING} production at {TOWN} {STRING} increases {COMMA}%!
+STR_INDUSTRY_PROD_GODOWN                                        :{BLACK}{BIGFONT}{STRING} production at {TOWN} {STRING} decreases {COMMA}%!
 
 ##id 0x5000
 STR_5000_TRAIN_IN_TUNNEL                                        :{WHITE}Train in tunnel
@@ -1877,10 +1877,10 @@
 ##id 0x6000
 STR_SV_EMPTY                                                    :
 STR_SV_UNNAMED                                                  :Unnamed{SKIP}
-STR_SV_TRAIN_NAME                                               :Train {COMMA16}
-STR_SV_ROADVEH_NAME                                             :Road Vehicle {COMMA16}
-STR_SV_SHIP_NAME                                                :Ship {COMMA16}
-STR_SV_AIRCRAFT_NAME                                            :Aircraft {COMMA16}
+STR_SV_TRAIN_NAME                                               :Train {COMMA}
+STR_SV_ROADVEH_NAME                                             :Road Vehicle {COMMA}
+STR_SV_SHIP_NAME                                                :Ship {COMMA}
+STR_SV_AIRCRAFT_NAME                                            :Aircraft {COMMA}
 
 STR_SV_STNAME                                                   :{STRING}
 STR_SV_STNAME_NORTH                                             :{STRING} North
@@ -1930,12 +1930,12 @@
 ############ range for difficulty levels ends
 
 ############ range for difficulty settings starts
-STR_6805_MAXIMUM_NO_COMPETITORS                                 :{LTBLUE}Maximum no. competitors: {ORANGE}{COMMA16}
+STR_6805_MAXIMUM_NO_COMPETITORS                                 :{LTBLUE}Maximum no. competitors: {ORANGE}{COMMA}
 STR_6806_COMPETITOR_START_TIME                                  :{LTBLUE}Competitor start time: {ORANGE}{STRING}
 STR_6807_NO_OF_TOWNS                                            :{LTBLUE}No. of towns: {ORANGE}{STRING}
 STR_6808_NO_OF_INDUSTRIES                                       :{LTBLUE}No. of industries: {ORANGE}{STRING}
 STR_6809_MAXIMUM_INITIAL_LOAN_000                               :{LTBLUE}Maximum initial loan: {ORANGE}{CURRENCY}
-STR_680A_INITIAL_INTEREST_RATE                                  :{LTBLUE}Initial interest rate: {ORANGE}{COMMA16}%
+STR_680A_INITIAL_INTEREST_RATE                                  :{LTBLUE}Initial interest rate: {ORANGE}{COMMA}%
 STR_680B_VEHICLE_RUNNING_COSTS                                  :{LTBLUE}Vehicle running costs: {ORANGE}{STRING}
 STR_680C_CONSTRUCTION_SPEED_OF_COMPETITOR                       :{LTBLUE}Construction speed of competitors: {ORANGE}{STRING}
 STR_680D_INTELLIGENCE_OF_COMPETITORS                            :{LTBLUE}Intelligence of competitors: {ORANGE}{STRING}
@@ -1994,7 +1994,7 @@
 ##id 0x7000
 STR_7000                                                        :
 STR_7001                                                        :{WHITE}{STRING} {BLACK}{STRING}
-STR_7002_PLAYER                                                 :(Player {COMMA16})
+STR_7002_PLAYER                                                 :(Player {COMMA})
 STR_7004_NEW_FACE                                               :{BLACK}New Face
 STR_7005_COLOR_SCHEME                                           :{BLACK}Colour Scheme
 STR_7006_COLOR_SCHEME                                           :{GOLD}Colour Scheme:
@@ -2028,7 +2028,7 @@
 STR_7022_INCOME_GRAPH                                           :{WHITE}Income Graph
 STR_CURRCOMPACT32                                               :{CURRCOMPACT}
 STR_CURRCOMPACT64                                               :{CURRCOMPACT64}
-STR_7024                                                        :{COMMA32}
+STR_7024                                                        :{COMMA}
 STR_7025_OPERATING_PROFIT_GRAPH                                 :{WHITE}Operating Profit Graph
 STR_7026_BANK_BALANCE                                           :{WHITE}Bank Balance
 STR_7027_LOAN                                                   :{WHITE}Loan
@@ -2052,14 +2052,14 @@
 STR_7037_PRESIDENT                                              :{WHITE}{STRING}{}{GOLD}(Manager)
 STR_7038_INAUGURATED                                            :{GOLD}Inaugurated: {WHITE}{NUMU16}
 STR_7039_VEHICLES                                               :{GOLD}Vehicles:
-STR_703A_TRAIN                                                  :{WHITE}{COMMA16} train
-STR_703B_TRAINS                                                 :{WHITE}{COMMA16} trains
-STR_703C_ROAD_VEHICLE                                           :{WHITE}{COMMA16} road vehicle
-STR_703D_ROAD_VEHICLES                                          :{WHITE}{COMMA16} road vehicles
-STR_703E_AIRCRAFT                                               :{WHITE}{COMMA16} aircraft
-STR_703F_AIRCRAFT                                               :{WHITE}{COMMA16} aircraft
-STR_7040_SHIP                                                   :{WHITE}{COMMA16} ship
-STR_7041_SHIPS                                                  :{WHITE}{COMMA16} ships
+STR_703A_TRAIN                                                  :{WHITE}{COMMA} train
+STR_703B_TRAINS                                                 :{WHITE}{COMMA} trains
+STR_703C_ROAD_VEHICLE                                           :{WHITE}{COMMA} road vehicle
+STR_703D_ROAD_VEHICLES                                          :{WHITE}{COMMA} road vehicles
+STR_703E_AIRCRAFT                                               :{WHITE}{COMMA} aircraft
+STR_703F_AIRCRAFT                                               :{WHITE}{COMMA} aircraft
+STR_7040_SHIP                                                   :{WHITE}{COMMA} ship
+STR_7041_SHIPS                                                  :{WHITE}{COMMA} ships
 STR_7042_NONE                                                   :{WHITE}None
 STR_7043_FACE_SELECTION                                         :{WHITE}Face Selection
 STR_7044_MALE                                                   :{BLACK}Male
@@ -2124,8 +2124,8 @@
 STR_707A_SELL_25_SHARE_IN_THIS_COMPANY                          :{BLACK}Sell 25% share in this company
 STR_707B_CAN_T_BUY_25_SHARE_IN_THIS                             :{WHITE}Can't buy 25% share in this company...
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}Can't sell 25% share in this company...
-STR_707D_OWNED_BY                                               :{WHITE}({COMMA16}% owned by {STRING})
-STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA16}% owned by {STRING}{}   {COMMA16}% owned by {STRING})
+STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% owned by {STRING})
+STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}% owned by {STRING}{}   {COMMA}% owned by {STRING})
 STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{STRING} has been taken over by {STRING}!
 STR_7080_PROTECTED                                              :{WHITE}This company is not old enough to trade shares yet...
 
@@ -2400,8 +2400,8 @@
 STR_8801_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Citizens celebrate . . .{}First train arrives at {STATION}!
 STR_8802_DETAILS                                                :{WHITE}{STRING} (Details)
 STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}Train in the way
-STR_8804                                                        :{SETX 10}{COMMA8}: {STRING}
-STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA8}: {STRING}
+STR_8804                                                        :{SETX 10}{COMMA}: {STRING}
+STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING}
 STR_8806_GO_TO                                                  :Go to {STATION}
 STR_8807_GO_TO_TRANSFER                                         :Go to {STATION} (Transfer and take cargo)
 STR_8808_GO_TO_UNLOAD                                           :Go to {STATION} (Unload)
@@ -2427,13 +2427,13 @@
 STR_UNKNOWN_DESTINATION                                         :unknown destination
 STR_8812_EMPTY                                                  :{LTBLUE}Empty
 STR_8813_FROM                                                   :{LTBLUE}{CARGO} from {STATION}
-STR_8814_TRAIN_IS_WAITING_IN_DEPOT                              :{WHITE}Train {COMMA16} is waiting in depot
+STR_8814_TRAIN_IS_WAITING_IN_DEPOT                              :{WHITE}Train {COMMA} is waiting in depot
 STR_8815_NEW_VEHICLES                                           :{BLACK}New Vehicles
 STR_8816                                                        :{BLACK}-
 STR_8818_INFORMATION                                            :{BLACK}Information
 STR_8819_TRAIN_TOO_LONG                                         :{WHITE}Train too long
 STR_881A_TRAINS_CAN_ONLY_BE_ALTERED                             :{WHITE}Trains can only be altered when stopped inside a depot
-STR_881B_TRAINS                                                 :{WHITE}{STRING} - {COMMA16} Trains
+STR_881B_TRAINS                                                 :{WHITE}{STRING} - {COMMA} Trains
 STR_881C_NEW_RAIL_VEHICLES                                      :{WHITE}New Rail Vehicles
 STR_881D_NEW_MONORAIL_VEHICLES                                  :{WHITE}New Monorail Vehicles
 STR_881E_NEW_MAGLEV_VEHICLES                                    :{WHITE}New Maglev Vehicles
@@ -2467,8 +2467,8 @@
 STR_8839_CAN_T_SELL_RAILROAD_VEHICLE                            :{WHITE}Can't sell railway vehicle...
 STR_883A_UNABLE_TO_FIND_ROUTE_TO                                :{WHITE}Unable to find route to local depot
 STR_883B_CAN_T_STOP_START_TRAIN                                 :{WHITE}Can't stop/start train...
-STR_883C_SERVICING_INTERVAL_DAYS                                :{BLACK}Servicing interval: {LTBLUE}{COMMA16}days{BLACK}   Last service: {LTBLUE}{DATE_LONG}
-STR_SERVICING_INTERVAL_PERCENT                                  :{BLACK}Servicing interval: {LTBLUE}{COMMA16}%{BLACK}   Last service: {LTBLUE}{DATE_LONG}
+STR_883C_SERVICING_INTERVAL_DAYS                                :{BLACK}Servicing interval: {LTBLUE}{COMMA}days{BLACK}   Last service: {LTBLUE}{DATE_LONG}
+STR_SERVICING_INTERVAL_PERCENT                                  :{BLACK}Servicing interval: {LTBLUE}{COMMA}%{BLACK}   Last service: {LTBLUE}{DATE_LONG}
 STR_883D_TRAINS_CLICK_ON_TRAIN_FOR                              :{BLACK}Trains - click on train for information
 STR_883E_BUILD_NEW_TRAINS_REQUIRES                              :{BLACK}Build new trains (requires train depot)
 STR_883F_TRAINS_CLICK_ON_TRAIN_FOR                              :{BLACK}Trains - click on train for info., drag vehicle to add/remove from train
@@ -2501,12 +2501,12 @@
 STR_SERVICE_HINT                                                :{BLACK}Skip this order unless a service is needed
 STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}New {STRING} now available!
 STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
-STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Cost: {CURRENCY} Weight: {COMMA16}t{}Speed: {VELOCITY}  Power: {COMMA16}hp{}Running Cost: {CURRENCY}/yr{}Capacity: {STRING}
+STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Cost: {CURRENCY} Weight: {COMMA}t{}Speed: {VELOCITY}  Power: {COMMA}hp{}Running Cost: {CURRENCY}/yr{}Capacity: {STRING}
 STR_885C_BROKEN_DOWN                                            :{RED}Broken down
 STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Age: {LTBLUE}{STRING}{BLACK}   Running Cost: {LTBLUE}{CURRENCY}/yr
-STR_885E_WEIGHT_T_POWER_HP_MAX_SPEED                            :{BLACK}Weight: {LTBLUE}{COMMA16}t  {BLACK}Power: {LTBLUE}{COMMA32}hp{BLACK} Max. speed: {LTBLUE}{VELOCITY}
+STR_885E_WEIGHT_T_POWER_HP_MAX_SPEED                            :{BLACK}Weight: {LTBLUE}{COMMA}t  {BLACK}Power: {LTBLUE}{COMMA}hp{BLACK} Max. speed: {LTBLUE}{VELOCITY}
 STR_885F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Profit this year: {LTBLUE}{CURRENCY}  (last year: {CURRENCY})
-STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Reliability: {LTBLUE}{COMMA8}%  {BLACK}Breakdowns since last service: {LTBLUE}{COMMA16}
+STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Reliability: {LTBLUE}{COMMA}%  {BLACK}Breakdowns since last service: {LTBLUE}{COMMA}
 STR_8861_STOPPED                                                :{RED}Stopped
 STR_8862_CAN_T_MAKE_TRAIN_PASS_SIGNAL                           :{WHITE}Can't make train pass signal at danger...
 STR_8863_CRASHED                                                :{RED}Crashed!
@@ -2514,7 +2514,7 @@
 STR_8865_NAME_TRAIN                                             :{WHITE}Name train
 STR_8866_CAN_T_NAME_TRAIN                                       :{WHITE}Can't name train...
 STR_8867_NAME_TRAIN                                             :{BLACK}Name train
-STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Train Crash!{}{COMMA16} die in fireball after collision
+STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Train Crash!{}{COMMA} die in fireball after collision
 STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}Can't reverse direction of train...
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Rename train vehicle type
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Can't rename train vehicle type...
@@ -2526,7 +2526,7 @@
 
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Road vehicle in the way
-STR_9001_ROAD_VEHICLES                                          :{WHITE}{STRING} - {COMMA16} Road Vehicles
+STR_9001_ROAD_VEHICLES                                          :{WHITE}{STRING} - {COMMA} Road Vehicles
 STR_9002                                                        :{WHITE}{STRING}
 STR_9003_ROAD_VEHICLE_DEPOT                                     :{WHITE}{TOWN} Road Vehicle Depot
 STR_9004_NEW_VEHICLES                                           :{BLACK}New Vehicles
@@ -2540,13 +2540,13 @@
 STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Age: {LTBLUE}{STRING}{BLACK}   Running Cost: {LTBLUE}{CURRENCY}/yr
 STR_900E_MAX_SPEED                                              :{BLACK}Max. speed: {LTBLUE}{VELOCITY}
 STR_900F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Profit this year: {LTBLUE}{CURRENCY}  (last year: {CURRENCY})
-STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Reliability: {LTBLUE}{COMMA8}%  {BLACK}Breakdowns since last service: {LTBLUE}{COMMA16}
+STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Reliability: {LTBLUE}{COMMA}%  {BLACK}Breakdowns since last service: {LTBLUE}{COMMA}
 STR_9011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Built: {LTBLUE}{NUMU16}{BLACK} Value: {LTBLUE}{CURRENCY}
 STR_9012_CAPACITY                                               :{BLACK}Capacity: {LTBLUE}{STRING}
 STR_9013_MUST_BE_STOPPED_INSIDE                                 :{WHITE}...must be stopped inside a road vehicle depot
 STR_9014_CAN_T_SELL_ROAD_VEHICLE                                :{WHITE}Can't sell road vehicle...
 STR_9015_CAN_T_STOP_START_ROAD_VEHICLE                          :{WHITE}Can't stop/start road vehicle...
-STR_9016_ROAD_VEHICLE_IS_WAITING                                :{WHITE}Road vehicle {COMMA16} is waiting in depot
+STR_9016_ROAD_VEHICLE_IS_WAITING                                :{WHITE}Road vehicle {COMMA} is waiting in depot
 STR_HEADING_FOR_ROAD_DEPOT                                      :{LTBLUE}Heading for {TOWN} Road Depot
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{LTBLUE}Heading for {TOWN} Road Depot, {VELOCITY}
 STR_9018_CAN_T_SEND_VEHICLE_TO_DEPOT                            :{WHITE}Can't send vehicle to depot...
@@ -2575,7 +2575,7 @@
 STR_902F_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Citizens celebrate . . .{}First bus arrives at {STATION}!
 STR_9030_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Citizens celebrate . . .{}First truck arrives at {STATION}!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Road Vehicle Crash!{}Driver dies in fireball after collision with train
-STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Road Vehicle Crash!{}{COMMA16} die in fireball after collision with train
+STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Road Vehicle Crash!{}{COMMA} die in fireball after collision with train
 STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}Can't make vehicle turn around...
 STR_9034_RENAME                                                 :{BLACK}Rename
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Rename road vehicle type
@@ -2590,7 +2590,7 @@
 STR_9802_CAN_T_BUILD_DOCK_HERE                                  :{WHITE}Can't build dock here...
 STR_9803_SHIP_DEPOT                                             :{WHITE}{TOWN} Ship Depot
 STR_9804_NEW_SHIPS                                              :{BLACK}New Ships
-STR_9805_SHIPS                                                  :{WHITE}{STRING} - {COMMA16} Ships
+STR_9805_SHIPS                                                  :{WHITE}{STRING} - {COMMA} Ships
 STR_9806_CAN_T_BUILD_SHIPS                                      :{WHITE}Can't build ships...
 STR_9807_MUST_BUILD_SHIP_DEPOT_FIRST                            :{WHITE}Must build ship depot first
 STR_9808_NEW_SHIPS                                              :{WHITE}New Ships
@@ -2605,7 +2605,7 @@
 STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Age: {LTBLUE}{STRING}{BLACK}   Running Cost: {LTBLUE}{CURRENCY}/yr
 STR_9813_MAX_SPEED                                              :{BLACK}Max. speed: {LTBLUE}{VELOCITY}
 STR_9814_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Profit this year: {LTBLUE}{CURRENCY}  (last year: {CURRENCY})
-STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Reliability: {LTBLUE}{COMMA8}%  {BLACK}Breakdowns since last service: {LTBLUE}{COMMA16}
+STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Reliability: {LTBLUE}{COMMA}%  {BLACK}Breakdowns since last service: {LTBLUE}{COMMA}
 STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Built: {LTBLUE}{NUMU16}{BLACK} Value: {LTBLUE}{CURRENCY}
 STR_9817_CAPACITY                                               :{BLACK}Capacity: {LTBLUE}{STRING}
 STR_9818_CAN_T_STOP_START_SHIP                                  :{WHITE}Can't stop/start ship...
@@ -2613,7 +2613,7 @@
 STR_981A_UNABLE_TO_FIND_LOCAL_DEPOT                             :{WHITE}Unable to find local depot
 STR_HEADING_FOR_SHIP_DEPOT                                      :{LTBLUE}Heading for {TOWN} Ship Depot
 STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{LTBLUE}Heading for {TOWN} Ship Depot, {VELOCITY}
-STR_981C_SHIP_IS_WAITING_IN_DEPOT                               :{WHITE}Ship {COMMA16} is waiting in depot
+STR_981C_SHIP_IS_WAITING_IN_DEPOT                               :{WHITE}Ship {COMMA} is waiting in depot
 STR_981D_BUILD_SHIP_DOCK                                        :{BLACK}Build ship dock
 STR_981E_BUILD_SHIP_DEPOT_FOR_BUILDING                          :{BLACK}Build ship depot (for building and servicing ships)
 STR_981F_SHIPS_CLICK_ON_SHIP_FOR                                :{BLACK}Ships - click on ship for information
@@ -2664,19 +2664,19 @@
 STR_A005_NEW_AIRCRAFT                                           :{WHITE}New Aircraft
 STR_A006_BUILD_AIRCRAFT                                         :{BLACK}Build Aircraft
 STR_A008_CAN_T_BUILD_AIRCRAFT                                   :{WHITE}Can't build aircraft...
-STR_A009_AIRCRAFT                                               :{WHITE}{STRING} - {COMMA16} Aircraft
+STR_A009_AIRCRAFT                                               :{WHITE}{STRING} - {COMMA} Aircraft
 STR_A00A                                                        :{WHITE}{STRING}
 STR_A00B_ORDERS                                                 :{WHITE}{STRING} (Orders)
 STR_A00C_DETAILS                                                :{WHITE}{STRING} (Details)
 STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Age: {LTBLUE}{STRING}{BLACK}   Running Cost: {LTBLUE}{CURRENCY}/yr
 STR_A00E_MAX_SPEED                                              :{BLACK}Max. speed: {LTBLUE}{VELOCITY}
 STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Profit this year: {LTBLUE}{CURRENCY}  (last year: {CURRENCY})
-STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Reliability: {LTBLUE}{COMMA8}%  {BLACK}Breakdowns since last service: {LTBLUE}{COMMA16}
+STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Reliability: {LTBLUE}{COMMA}%  {BLACK}Breakdowns since last service: {LTBLUE}{COMMA}
 STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Built: {LTBLUE}{NUMU16}{BLACK} Value: {LTBLUE}{CURRENCY}
 STR_A012_CAN_T_SEND_AIRCRAFT_TO                                 :{WHITE}Can't send aircraft to hangar...
 STR_HEADING_FOR_HANGAR                                          :{LTBLUE}Heading for {STATION} Hangar
 STR_HEADING_FOR_HANGAR_VEL                                      :{LTBLUE}Heading for {STATION} Hangar, {VELOCITY}
-STR_A014_AIRCRAFT_IS_WAITING_IN                                 :{WHITE}Aircraft {COMMA16} is waiting in the aircraft hangar
+STR_A014_AIRCRAFT_IS_WAITING_IN                                 :{WHITE}Aircraft {COMMA} is waiting in the aircraft hangar
 STR_A015_AIRCRAFT_IN_THE_WAY                                    :{WHITE}Aircraft in the way
 STR_A016_CAN_T_STOP_START_AIRCRAFT                              :{WHITE}Can't stop/start aircraft...
 STR_A017_AIRCRAFT_IS_IN_FLIGHT                                  :{WHITE}Aircraft is in flight
@@ -2702,14 +2702,14 @@
 STR_A02B_SHOW_AIRCRAFT_DETAILS                                  :{BLACK}Show aircraft details
 STR_A02C_NEW_AIRCRAFT_NOW_AVAILABLE                             :{BLACK}{BIGFONT}New aircraft now available!
 STR_A02D                                                        :{BLACK}{BIGFONT}{STRING}
-STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Cost: {CURRENCY} Max. Speed: {VELOCITY}{}Capacity: {COMMA16} passengers, {COMMA16} bags of mail{}Running Cost: {CURRENCY}/yr
+STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Cost: {CURRENCY} Max. Speed: {VELOCITY}{}Capacity: {COMMA} passengers, {COMMA} bags of mail{}Running Cost: {CURRENCY}/yr
 
 STR_A030_NAME_AIRCRAFT                                          :{WHITE}Name aircraft
 STR_A031_CAN_T_NAME_AIRCRAFT                                    :{WHITE}Can't name aircraft...
 STR_A032_NAME_AIRCRAFT                                          :{BLACK}Name aircraft
 STR_A033_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Citizens celebrate . . .{}First aircraft arrives at {STATION}!
-STR_A034_PLANE_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Plane Crash!{}{COMMA16} die in fireball at {STATION}
-STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Plane Crash!{}Aircraft ran out of fuel, {COMMA16} die in fireball!
+STR_A034_PLANE_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Plane Crash!{}{COMMA} die in fireball at {STATION}
+STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Plane Crash!{}Aircraft ran out of fuel, {COMMA} die in fireball!
 STR_A035_DESTINATIONS                                           :{TINYFONT}{BLACK}Destinations:
 STR_A036                                                        :{TINYFONT}{BLACK}{STATION}
 STR_A037_RENAME                                                 :{BLACK}Rename
@@ -2735,7 +2735,7 @@
 STR_B003_FACTORY_DESTROYED_IN_SUSPICIOUS                        :{BLACK}{BIGFONT}Factory destroyed in suspicious circumstances near {TOWN}!
 STR_B004_UFO_LANDS_NEAR                                         :{BLACK}{BIGFONT}'UFO' lands near {TOWN}!
 STR_B005_COAL_MINE_SUBSIDENCE_LEAVES                            :{BLACK}{BIGFONT}Coal mine subsidence leaves trail of destruction near {TOWN}!
-STR_B006_FLOOD_VEHICLE_DESTROYED                                :{BLACK}{BIGFONT}Floods!{}At least {COMMA16} missing, presumed dead after significant flooding!
+STR_B006_FLOOD_VEHICLE_DESTROYED                                :{BLACK}{BIGFONT}Floods!{}At least {COMMA} missing, presumed dead after significant flooding!
 
 STR_BRIBE_FAILED                                                :{WHITE}Your attempted bribe has been
 STR_BRIBE_FAILED_2                                              :{WHITE}discovered by a regional investigator
@@ -2745,7 +2745,7 @@
 STR_PERFORMANCE_DETAIL                                          :{WHITE}Detailed performance rating
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Detail
 STR_PERFORMANCE_DETAIL_AMOUNT_CURRENCY                          :{BLACK}({CURRCOMPACT}/{CURRCOMPACT})
-STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA32}/{COMMA32})
+STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA}/{COMMA})
 STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{INT32}%
 SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{INT32}
 ############ Those following lines need to be in this order!!
@@ -2780,7 +2780,7 @@
 STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID:
 
 STR_CURRENCY_WINDOW                                             :{WHITE}Custom currency
-STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Exchange rate: {ORANGE}{CURRENCY} = {POUNDSIGN} {COMMA16}
+STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Exchange rate: {ORANGE}{CURRENCY} = {POUNDSIGN} {COMMA}
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Separator:
 STR_CURRENCY_PREFIX                                             :{LTBLUE}Prefix:
 STR_CURRENCY_SUFFIX                                             :{LTBLUE}Suffix:
@@ -2794,10 +2794,10 @@
 STR_PLANE                                                       :{BLACK}{PLANE}
 STR_SHIP                                                        :{BLACK}{SHIP}
 
-STR_SCHEDULED_TRAINS                                            :{WHITE}{STATION} - {COMMA16} Trains
-STR_SCHEDULED_ROAD_VEHICLES                                     :{WHITE}{STATION} - {COMMA16} Road Vehicles
-STR_SCHEDULED_AIRCRAFT                                          :{WHITE}{STATION} - {COMMA16} Aircraft
-STR_SCHEDULED_SHIPS                                             :{WHITE}{STATION} - {COMMA16} Ships
+STR_SCHEDULED_TRAINS                                            :{WHITE}{STATION} - {COMMA} Trains
+STR_SCHEDULED_ROAD_VEHICLES                                     :{WHITE}{STATION} - {COMMA} Road Vehicles
+STR_SCHEDULED_AIRCRAFT                                          :{WHITE}{STATION} - {COMMA} Aircraft
+STR_SCHEDULED_SHIPS                                             :{WHITE}{STATION} - {COMMA} Ships
 
 STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Show all trains which have this station on their schedule
 STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Show all road vehicles which have this station on their schedule
@@ -2819,7 +2819,7 @@
 STR_REPLACE_HELP                                                :{BLACK}This allows you to replace one engine type with another type, when trains of the original type enter a depot
 
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
-STR_SIGN_LIST_CAPTION                                           :{WHITE}Sign List - {COMMA16} Signs
+STR_SIGN_LIST_CAPTION                                           :{WHITE}Sign List - {COMMA} Signs
 
 ############ Lists rail types
 
@@ -2829,16 +2829,16 @@
 
 ############ End of list of rail types
 
-STR_TINY_BLACK                                                  :{BLACK}{TINYFONT}{COMMA16}
+STR_TINY_BLACK                                                  :{BLACK}{TINYFONT}{COMMA}
 
-STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Cost: {GOLD}{CURRENCY}{BLACK} Weight: {GOLD}{COMMA16}t
-STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Speed: {GOLD}{VELOCITY}{BLACK}   Power: {GOLD}{COMMA32}hp
+STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Cost: {GOLD}{CURRENCY}{BLACK} Weight: {GOLD}{COMMA}t
+STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Speed: {GOLD}{VELOCITY}{BLACK}   Power: {GOLD}{COMMA}hp
 STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}Running Cost: {GOLD}{CURRENCY}/yr
 STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Capacity: {GOLD}{STRING} {STRING}
-STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Designed: {GOLD}{NUMU16}{BLACK} Life: {GOLD}{COMMA16} years
-STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Max. Reliability: {GOLD}{COMMA8}%
+STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Designed: {GOLD}{NUMU16}{BLACK} Life: {GOLD}{COMMA} years
+STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Max. Reliability: {GOLD}{COMMA}%
 STR_PURCHASE_INFO_COST                                          :{BLACK}Cost: {GOLD}{CURRENCY}
-STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Weight: {GOLD}{COMMA16}t  ({COMMA16}t)
+STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Weight: {GOLD}{COMMA}t  ({COMMA}t)
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Cost: {GOLD}{CURRENCY}{BLACK} Speed: {GOLD}{VELOCITY}
-STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Capacity: {GOLD}{COMMA16} passengers, {COMMA16} bags of mail
-STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Powered Wagons: {GOLD}+{COMMA16}hp{BLACK} Weight: {GOLD}+{COMMA8}t
+STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Capacity: {GOLD}{COMMA} passengers, {COMMA} bags of mail
+STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Powered Wagons: {GOLD}+{COMMA}hp{BLACK} Weight: {GOLD}+{COMMA}t
--- a/lang/finnish.txt	Thu Jul 14 09:53:52 2005 +0000
+++ b/lang/finnish.txt	Thu Jul 14 15:10:20 2005 +0000
@@ -82,69 +82,69 @@
 STR_004C_PLASTIC                                                :Muovi
 STR_004D_FIZZY_DRINK                                            :Sihijuoma
 STR_004E                                                        :
-STR_004F_PASSENGER                                              :{COMMA16} matkustaja
-STR_0050_TON_OF_COAL                                            :{COMMA16} tonni kivihiiltä
-STR_0051_BAG_OF_MAIL                                            :{COMMA16} säkki postia
+STR_004F_PASSENGER                                              :{COMMA} matkustaja
+STR_0050_TON_OF_COAL                                            :{COMMA} tonni kivihiiltä
+STR_0051_BAG_OF_MAIL                                            :{COMMA} säkki postia
 STR_0052_OF_OIL                                                 :{VOLUME} öljyä
-STR_0053_ITEM_OF_LIVESTOCK                                      :{COMMA16} erä karjaa
-STR_0054_CRATE_OF_GOODS                                         :{COMMA16} laatikko tavaraa
-STR_0055_TON_OF_GRAIN                                           :{COMMA16} tonni viljaa
-STR_0056_TON_OF_WOOD                                            :{COMMA16} tonni puutavaraa
-STR_0057_TON_OF_IRON_ORE                                        :{COMMA16} tonni rautamalmia
-STR_0058_TON_OF_STEEL                                           :{COMMA16} tonni terästä
-STR_0059_BAG_OF_VALUABLES                                       :{COMMA16} säkki arvotavaraa
-STR_005A_TON_OF_COPPER_ORE                                      :{COMMA16} tonni kuparimalmia
-STR_005B_TON_OF_MAIZE                                           :{COMMA16} tonni maissia
-STR_005C_TON_OF_FRUIT                                           :{COMMA16} tonni hedelmiä
-STR_005D_BAG_OF_DIAMONDS                                        :{COMMA16} säkki timantteja
-STR_005E_TON_OF_FOOD                                            :{COMMA16} tonni ruokaa
-STR_005F_TON_OF_PAPER                                           :{COMMA16} tonni paperia
-STR_0060_BAG_OF_GOLD                                            :{COMMA16} säkki kultaa
+STR_0053_ITEM_OF_LIVESTOCK                                      :{COMMA} erä karjaa
+STR_0054_CRATE_OF_GOODS                                         :{COMMA} laatikko tavaraa
+STR_0055_TON_OF_GRAIN                                           :{COMMA} tonni viljaa
+STR_0056_TON_OF_WOOD                                            :{COMMA} tonni puutavaraa
+STR_0057_TON_OF_IRON_ORE                                        :{COMMA} tonni rautamalmia
+STR_0058_TON_OF_STEEL                                           :{COMMA} tonni terästä
+STR_0059_BAG_OF_VALUABLES                                       :{COMMA} säkki arvotavaraa
+STR_005A_TON_OF_COPPER_ORE                                      :{COMMA} tonni kuparimalmia
+STR_005B_TON_OF_MAIZE                                           :{COMMA} tonni maissia
+STR_005C_TON_OF_FRUIT                                           :{COMMA} tonni hedelmiä
+STR_005D_BAG_OF_DIAMONDS                                        :{COMMA} säkki timantteja
+STR_005E_TON_OF_FOOD                                            :{COMMA} tonni ruokaa
+STR_005F_TON_OF_PAPER                                           :{COMMA} tonni paperia
+STR_0060_BAG_OF_GOLD                                            :{COMMA} säkki kultaa
 STR_0061_OF_WATER                                               :{VOLUME} vettä
-STR_0062_TON_OF_WHEAT                                           :{COMMA16} tonni vehnää
+STR_0062_TON_OF_WHEAT                                           :{COMMA} tonni vehnää
 STR_0063_OF_RUBBER                                              :{VOLUME} kumia
-STR_0064_TON_OF_SUGAR                                           :{COMMA16} tonni sokeria
-STR_0065_TOY                                                    :{COMMA16} lelu
-STR_0066_BAG_OF_CANDY                                           :{COMMA16} säkki karkkia
+STR_0064_TON_OF_SUGAR                                           :{COMMA} tonni sokeria
+STR_0065_TOY                                                    :{COMMA} lelu
+STR_0066_BAG_OF_CANDY                                           :{COMMA} säkki karkkia
 STR_0067_OF_COLA                                                :{VOLUME} limsaa
-STR_0068_TON_OF_COTTON_CANDY                                    :{COMMA16} tonni hattaraa
-STR_0069_BUBBLE                                                 :{COMMA16} kupla
-STR_006A_TON_OF_TOFFEE                                          :{COMMA16} tonni toffeeta
-STR_006B_BATTERY                                                :{COMMA16} patteri
+STR_0068_TON_OF_COTTON_CANDY                                    :{COMMA} tonni hattaraa
+STR_0069_BUBBLE                                                 :{COMMA} kupla
+STR_006A_TON_OF_TOFFEE                                          :{COMMA} tonni toffeeta
+STR_006B_BATTERY                                                :{COMMA} patteri
 STR_006C_OF_PLASTIC                                             :{VOLUME} muovia
-STR_006D_FIZZY_DRINK                                            :{COMMA16} sihijuoma
+STR_006D_FIZZY_DRINK                                            :{COMMA} sihijuoma
 STR_006E                                                        :
-STR_006F_PASSENGERS                                             :{COMMA16} matkustajaa
-STR_0070_TONS_OF_COAL                                           :{COMMA16} tonnia kivihiiltä
-STR_0071_BAGS_OF_MAIL                                           :{COMMA16} säkkiä postia
+STR_006F_PASSENGERS                                             :{COMMA} matkustajaa
+STR_0070_TONS_OF_COAL                                           :{COMMA} tonnia kivihiiltä
+STR_0071_BAGS_OF_MAIL                                           :{COMMA} säkkiä postia
 STR_0072_OF_OIL                                                 :{VOLUME} öljyä
-STR_0073_ITEMS_OF_LIVESTOCK                                     :{COMMA16} erää karjaa
-STR_0074_CRATES_OF_GOODS                                        :{COMMA16} laatikkoa tavaroita
-STR_0075_TONS_OF_GRAIN                                          :{COMMA16} tonnia viljaa
-STR_0076_TONS_OF_WOOD                                           :{COMMA16} tonnia puutavaraa
-STR_0077_TONS_OF_IRON_ORE                                       :{COMMA16} tonnia rautamalmia
-STR_0078_TONS_OF_STEEL                                          :{COMMA16} tonnia terästä
-STR_0079_BAGS_OF_VALUABLES                                      :{COMMA16} säkkiä arvotavaroita
-STR_007A_TONS_OF_COPPER_ORE                                     :{COMMA16} tonnia kuparimalmia
-STR_007B_TONS_OF_MAIZE                                          :{COMMA16} tonnia maissia
-STR_007C_TONS_OF_FRUIT                                          :{COMMA16} tonnia hedelmiä
-STR_007D_BAGS_OF_DIAMONDS                                       :{COMMA16} säkkiä timantteja
-STR_007E_TONS_OF_FOOD                                           :{COMMA16} tonnia ruokaa
-STR_007F_TONS_OF_PAPER                                          :{COMMA16} tonnia paperia
-STR_0080_BAGS_OF_GOLD                                           :{COMMA16} säkkiä kultaa
+STR_0073_ITEMS_OF_LIVESTOCK                                     :{COMMA} erää karjaa
+STR_0074_CRATES_OF_GOODS                                        :{COMMA} laatikkoa tavaroita
+STR_0075_TONS_OF_GRAIN                                          :{COMMA} tonnia viljaa
+STR_0076_TONS_OF_WOOD                                           :{COMMA} tonnia puutavaraa
+STR_0077_TONS_OF_IRON_ORE                                       :{COMMA} tonnia rautamalmia
+STR_0078_TONS_OF_STEEL                                          :{COMMA} tonnia terästä
+STR_0079_BAGS_OF_VALUABLES                                      :{COMMA} säkkiä arvotavaroita
+STR_007A_TONS_OF_COPPER_ORE                                     :{COMMA} tonnia kuparimalmia
+STR_007B_TONS_OF_MAIZE                                          :{COMMA} tonnia maissia
+STR_007C_TONS_OF_FRUIT                                          :{COMMA} tonnia hedelmiä
+STR_007D_BAGS_OF_DIAMONDS                                       :{COMMA} säkkiä timantteja
+STR_007E_TONS_OF_FOOD                                           :{COMMA} tonnia ruokaa
+STR_007F_TONS_OF_PAPER                                          :{COMMA} tonnia paperia
+STR_0080_BAGS_OF_GOLD                                           :{COMMA} säkkiä kultaa
 STR_0081_OF_WATER                                               :{VOLUME} vettä
-STR_0082_TONS_OF_WHEAT                                          :{COMMA16} tonnia vehnää
+STR_0082_TONS_OF_WHEAT                                          :{COMMA} tonnia vehnää
 STR_0083_OF_RUBBER                                              :{VOLUME} kumia
-STR_0084_TONS_OF_SUGAR                                          :{COMMA16} tonnia sokeria
-STR_0085_TOYS                                                   :{COMMA16} lelua
-STR_0086_BAGS_OF_CANDY                                          :{COMMA16} tonnia karkkia
+STR_0084_TONS_OF_SUGAR                                          :{COMMA} tonnia sokeria
+STR_0085_TOYS                                                   :{COMMA} lelua
+STR_0086_BAGS_OF_CANDY                                          :{COMMA} tonnia karkkia
 STR_0087_OF_COLA                                                :{VOLUME} limsaa
-STR_0088_TONS_OF_COTTON_CANDY                                   :{COMMA16} tonnia hattaraa
-STR_0089_BUBBLES                                                :{COMMA16} kuplaa
-STR_008A_TONS_OF_TOFFEE                                         :{COMMA16} tonnia toffeeta
-STR_008B_BATTERIES                                              :{COMMA16} patteria
+STR_0088_TONS_OF_COTTON_CANDY                                   :{COMMA} tonnia hattaraa
+STR_0089_BUBBLES                                                :{COMMA} kuplaa
+STR_008A_TONS_OF_TOFFEE                                         :{COMMA} tonnia toffeeta
+STR_008B_BATTERIES                                              :{COMMA} patteria
 STR_008C_OF_PLASTIC                                             :{VOLUME} muovia
-STR_008D_FIZZY_DRINKS                                           :{COMMA16} sihijuomaa
+STR_008D_FIZZY_DRINKS                                           :{COMMA} sihijuomaa
 STR_008E                                                        :
 STR_008F_PS                                                     :{TINYFONT}MA
 STR_0090_CL                                                     :{TINYFONT}HL
@@ -219,8 +219,8 @@
 STR_00DF_GREY                                                   :Harmaa
 STR_00E0_WHITE                                                  :Valkoinen
 STR_00E1_TOO_MANY_VEHICLES_IN_GAME                              :{WHITE}Liian monta ajoneuvoa pelissä.
-STR_00E2                                                        :{BLACK}{COMMA16}
-STR_00E3                                                        :{RED}{COMMA16}
+STR_00E2                                                        :{BLACK}{COMMA}
+STR_00E3                                                        :{RED}{COMMA}
 STR_00E4_LOCATION                                               :{BLACK}Sijainti
 STR_00E5_CONTOURS                                               :Korkeuskäyrät
 STR_00E6_VEHICLES                                               :Liikennevälineet
@@ -441,18 +441,18 @@
 STR_0198_PROFIT_THIS_YEAR_LAST_YEAR                             :{TINYFONT}{BLACK}Voittoa tänä vuonna: {CURRENCY} (viime vuonna: {CURRENCY}).
 
 ############ range for service numbers starts
-STR_0199_YEAR                                                   :{COMMA16} vuosi ({COMMA16})
-STR_019A_YEARS                                                  :{COMMA16} vuotta ({COMMA16})
-STR_019B_YEARS                                                  :{RED}{COMMA16} vuotta ({COMMA16})
+STR_0199_YEAR                                                   :{COMMA} vuosi ({COMMA})
+STR_019A_YEARS                                                  :{COMMA} vuotta ({COMMA})
+STR_019B_YEARS                                                  :{RED}{COMMA} vuotta ({COMMA})
 ############ range for service numbers ends
 
 STR_019C_ROAD_VEHICLE                                           :Ajoneuvo
 STR_019D_AIRCRAFT                                               :Lentokone
 STR_019E_SHIP                                                   :Laiva
 STR_019F_TRAIN                                                  :Juna
-STR_01A0_IS_GETTING_OLD                                         :{WHITE}{STRING} {COMMA16} vanhenee.
-STR_01A1_IS_GETTING_VERY_OLD                                    :{WHITE}{STRING} {COMMA16} on kohta todella vanha.
-STR_01A2_IS_GETTING_VERY_OLD_AND                                :{WHITE}{STRING} {COMMA16} on kohta todella vanha ja pitää pikaisesti korvata.
+STR_01A0_IS_GETTING_OLD                                         :{WHITE}{STRING} {COMMA} vanhenee.
+STR_01A1_IS_GETTING_VERY_OLD                                    :{WHITE}{STRING} {COMMA} on kohta todella vanha.
+STR_01A2_IS_GETTING_VERY_OLD_AND                                :{WHITE}{STRING} {COMMA} on kohta todella vanha ja pitää pikaisesti korvata.
 STR_01A3_LAND_AREA_INFORMATION                                  :{WHITE}Maa-aluetiedot
 STR_01A4_COST_TO_CLEAR_N_A                                      :{BLACK}Puhdistuksen kulu: {LTBLUE}N/A
 STR_01A5_COST_TO_CLEAR                                          :{BLACK}Puhdistuksen kulu: {LTBLUE}{CURRENCY}
@@ -497,7 +497,7 @@
 STR_01CA_31ST                                                   :31.
 ############ range for days	ends
 
-STR_01CB                                                        :{TINYFONT}{COMMA16}
+STR_01CB                                                        :{TINYFONT}{COMMA}
 STR_01CC_TOGGLE_LARGE_SMALL_MAP                                 :{BLACK}Suuri/pieni karttakoko
 STR_01CD_SELECT_TUTORIAL_DEMONSTRATION                          :{WHITE}Valitse pikaohje/esitys.
 
@@ -509,7 +509,7 @@
 STR_CARGO_ACCEPTED_5                                            :{BLACK}Vastaanottaa rahtia: {LTBLUE}{STRING}, {STRING}, {STRING}, {STRING}, {STRING}
 ############ range for cargo acecpted ends
 
-STR_01D1_8                                                      :({COMMA8}/8 {STRING})
+STR_01D1_8                                                      :({COMMA}/8 {STRING})
 STR_01D2_JAZZ_JUKEBOX                                           :{WHITE}Jazz-jukeboksi
 STR_01D3_SOUND_MUSIC                                            :Ääni/musiikki
 STR_01D4_SHOW_SOUND_MUSIC_WINDOW                                :{BLACK}Näytä ääniasetukset.
@@ -528,16 +528,16 @@
 STR_01E1_START_PLAYING_MUSIC                                    :{BLACK}Aloita musiikin soittaminen.
 STR_01E2_DRAG_SLIDERS_TO_SET_MUSIC                              :{BLACK}Aseta liukusäätimiä vetämällä sopiva äänenvoimakkuus musiikille ja äänitehosteille.
 STR_01E3                                                        :{DKGREEN}{TINYFONT}--
-STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA8}
-STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA8}
+STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA}
+STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA}
 STR_01E6                                                        :{DKGREEN}{TINYFONT}------
 STR_01E7                                                        :{DKGREEN}{TINYFONT}"{STRING}"
 STR_01E8_TRACK_XTITLE                                           :{BLACK}{TINYFONT}Raita{SETX 88}Nimike
 STR_01E9_SHUFFLE                                                :{TINYFONT}Sekoita
 STR_01EA_PROGRAM                                                :{TINYFONT}{BLACK}Ohjelmoi
 STR_01EB_MUSIC_PROGRAM_SELECTION                                :{WHITE}Musiikkiohjelman valinta
-STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA16} "{STRING}"
-STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA16}   "{STRING}"
+STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} "{STRING}"
+STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA}   "{STRING}"
 STR_01EE_TRACK_INDEX                                            :{TINYFONT}{BLACK}Raitaindeksi
 STR_01EF_PROGRAM                                                :{TINYFONT}{BLACK}Ohjelma - '{STRING}'
 STR_01F0_CLEAR                                                  :{TINYFONT}{BLACK}Tyhjää
@@ -577,7 +577,7 @@
 STR_0210_TOO_FAR_FROM_PREVIOUS_DESTINATIO                       :{WHITE}...liian kaukana edellisestä määränpäästä
 STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Parhaat yhtiöt, jotka saavuttivat vuoden {NUMU16}{}(taso: {STRING})
 STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Yhtiökilpailutaulukko vuonna {NUMU16}
-STR_0212                                                        :{BIGFONT}{COMMA16}.
+STR_0212                                                        :{BIGFONT}{COMMA}.
 STR_0213_BUSINESSMAN                                            :Liikemies
 STR_0214_ENTREPRENEUR                                           :Yrittäjä
 STR_0215_INDUSTRIALIST                                          :Teollisuusmies
@@ -586,12 +586,12 @@
 STR_0218_MOGUL                                                  :Moguli
 STR_0219_TYCOON_OF_THE_CENTURY                                  :Vuosisadan pohatta
 STR_HIGHSCORE_NAME                                              :{BIGFONT}{STRING}, {STRING}
-STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA16})
+STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA})
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{STRING} saavuttaa arvon '{STRING}'!
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{STRING} yhtiöstä {STRING} saavuttaa arvon '{STRING}'!
 STR_021D                                                        :{BLACK}
 STR_021E                                                        :{WHITE}
-STR_021F                                                        :{BLUE}{COMMA16}
+STR_021F                                                        :{BLUE}{COMMA}
 STR_0220_CREATE_SCENARIO                                        :{BLACK}Luo skenaario
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Skenaariomuokkain
@@ -788,8 +788,8 @@
 STR_EXTRA_VIEW_PORT                                             :Lisänäkymä
 STR_SIGN_LIST                                                   :Kylttilista
 STR_02DF_TOWN_DIRECTORY                                         :Kaupunkihakemisto
-STR_TOWN_POPULATION                                             :{BLACK}Maailman asukasluku: {COMMA32}
-STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Näkymä {COMMA16}
+STR_TOWN_POPULATION                                             :{BLACK}Maailman asukasluku: {COMMA}
+STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Näkymä {COMMA}
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN                                :{BLACK}Kopioi näkymään
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT                             :{BLACK}Kopioi päänäkymän sijainti tähän näkymään
 STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW                                :{BLACK}Liitä näkymästä
@@ -961,34 +961,34 @@
 STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Aikataulua ei voi kopioida...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - jaetun aikataulun loppu - -
 
-STR_TRAIN_IS_LOST                                               :{WHITE}Juna {COMMA16} on eksynyt.
-STR_TRAIN_IS_UNPROFITABLE                                       :{WHITE}Junan {COMMA16} tuotto viime vuonna oli {CURRENCY}.
+STR_TRAIN_IS_LOST                                               :{WHITE}Juna {COMMA} on eksynyt.
+STR_TRAIN_IS_UNPROFITABLE                                       :{WHITE}Junan {COMMA} tuotto viime vuonna oli {CURRENCY}.
 STR_EURO_INTRODUCE                                              :{BLACK}{BIGFONT}European Monetary Union, EMU!{}{}Euron on tarkoitus olla maan ainoa tarvittava valuutta jokapäiväisiin liiketapahtumiin!
 
 # Start of order review system.
 # DON'T ADD OR REMOVE LINES HERE
-STR_TRAIN_HAS_TOO_FEW_ORDERS                                    :{WHITE}Junan {COMMA16} aikataulussa on liian vähän pysähdyksiä.
-STR_TRAIN_HAS_VOID_ORDER                                        :{WHITE}Junan {COMMA16} aikataulussa on epäkelpo pysähdys.
-STR_TRAIN_HAS_DUPLICATE_ENTRY                                   :{WHITE}Junan {COMMA16} määräyksissä on kaksi kertaa sama kohta.
-STR_TRAIN_HAS_INVALID_ENTRY                                     :{WHITE}Junan {COMMA16} käskyissä on laiton asema.
-STR_ROADVEHICLE_HAS_TOO_FEW_ORDERS                              :{WHITE}Ajoneuvon {COMMA16} aikataulussa on liian vähän pysähdyksiä.
-STR_ROADVEHICLE_HAS_VOID_ORDER                                  :{WHITE}Ajoneuvon {COMMA16} aikataulussa on epäkelpo pysähdys.
-STR_ROADVEHICLE_HAS_DUPLICATE_ENTRY                             :{WHITE}Ajoneuvon {COMMA16} määräyksissä on kaksi kertaa sama kohta.
-STR_ROADVEHICLE_HAS_INVALID_ENTRY                               :{WHITE}Ajoneuvon {COMMA16} käskyissä on laiton asema.
-STR_SHIP_HAS_TOO_FEW_ORDERS                                     :{WHITE}Laivan {COMMA16} aikataulussa on liian vähän pysähdyksiä.
-STR_SHIP_HAS_VOID_ORDER                                         :{WHITE}Laivan {COMMA16} aikataulussa on epäkelpo pysähdys.
-STR_SHIP_HAS_DUPLICATE_ENTRY                                    :{WHITE}Laivan {COMMA16} määräyksissä on kaksi kertaa sama kohta.
-STR_SHIP_HAS_INVALID_ENTRY                                      :{WHITE}Laivan {COMMA16} käskyissä on laiton asema.
-STR_AIRCRAFT_HAS_TOO_FEW_ORDERS                                 :{WHITE}Lentokoneen {COMMA16} aikataulussa on liian vähän pysähdyksiä.
-STR_AIRCRAFT_HAS_VOID_ORDER                                     :{WHITE}Lentokoneen {COMMA16} aikataulussa on epäkelpo pysähdys.
-STR_AIRCRAFT_HAS_DUPLICATE_ENTRY                                :{WHITE}Lentokoneen {COMMA16} määräyksissä on kaksi kertaa sama kohta.
-STR_AIRCRAFT_HAS_INVALID_ENTRY                                  :{WHITE}Lentokoneen {COMMA16} käskyissä on laiton asema.
+STR_TRAIN_HAS_TOO_FEW_ORDERS                                    :{WHITE}Junan {COMMA} aikataulussa on liian vähän pysähdyksiä.
+STR_TRAIN_HAS_VOID_ORDER                                        :{WHITE}Junan {COMMA} aikataulussa on epäkelpo pysähdys.
+STR_TRAIN_HAS_DUPLICATE_ENTRY                                   :{WHITE}Junan {COMMA} määräyksissä on kaksi kertaa sama kohta.
+STR_TRAIN_HAS_INVALID_ENTRY                                     :{WHITE}Junan {COMMA} käskyissä on laiton asema.
+STR_ROADVEHICLE_HAS_TOO_FEW_ORDERS                              :{WHITE}Ajoneuvon {COMMA} aikataulussa on liian vähän pysähdyksiä.
+STR_ROADVEHICLE_HAS_VOID_ORDER                                  :{WHITE}Ajoneuvon {COMMA} aikataulussa on epäkelpo pysähdys.
+STR_ROADVEHICLE_HAS_DUPLICATE_ENTRY                             :{WHITE}Ajoneuvon {COMMA} määräyksissä on kaksi kertaa sama kohta.
+STR_ROADVEHICLE_HAS_INVALID_ENTRY                               :{WHITE}Ajoneuvon {COMMA} käskyissä on laiton asema.
+STR_SHIP_HAS_TOO_FEW_ORDERS                                     :{WHITE}Laivan {COMMA} aikataulussa on liian vähän pysähdyksiä.
+STR_SHIP_HAS_VOID_ORDER                                         :{WHITE}Laivan {COMMA} aikataulussa on epäkelpo pysähdys.
+STR_SHIP_HAS_DUPLICATE_ENTRY                                    :{WHITE}Laivan {COMMA} määräyksissä on kaksi kertaa sama kohta.
+STR_SHIP_HAS_INVALID_ENTRY                                      :{WHITE}Laivan {COMMA} käskyissä on laiton asema.
+STR_AIRCRAFT_HAS_TOO_FEW_ORDERS                                 :{WHITE}Lentokoneen {COMMA} aikataulussa on liian vähän pysähdyksiä.
+STR_AIRCRAFT_HAS_VOID_ORDER                                     :{WHITE}Lentokoneen {COMMA} aikataulussa on epäkelpo pysähdys.
+STR_AIRCRAFT_HAS_DUPLICATE_ENTRY                                :{WHITE}Lentokoneen {COMMA} määräyksissä on kaksi kertaa sama kohta.
+STR_AIRCRAFT_HAS_INVALID_ENTRY                                  :{WHITE}Lentokoneen {COMMA} käskyissä on laiton asema.
 # end of order system
 
-STR_TRAIN_AUTORENEW_FAILED                                      :{WHITE}Junan {COMMA16} itseuudistus epäonnistui (rahoitusraja).
-STR_ROADVEHICLE_AUTORENEW_FAILED                                :{WHITE}Ajoneuvon {COMMA16} itseuudistus epäonnistui (rahoitusraja).
-STR_SHIP_AUTORENEW_FAILED                                       :{WHITE}Laivan {COMMA16} itseuudistus epäonnistui (rahoitusraja).
-STR_AIRCRAFT_AUTORENEW_FAILED                                   :{WHITE}Lentokoneen {COMMA16} itseuudistus epäonnistui (rahoitusraja).
+STR_TRAIN_AUTORENEW_FAILED                                      :{WHITE}Junan {COMMA} itseuudistus epäonnistui (rahoitusraja).
+STR_ROADVEHICLE_AUTORENEW_FAILED                                :{WHITE}Ajoneuvon {COMMA} itseuudistus epäonnistui (rahoitusraja).
+STR_SHIP_AUTORENEW_FAILED                                       :{WHITE}Laivan {COMMA} itseuudistus epäonnistui (rahoitusraja).
+STR_AIRCRAFT_AUTORENEW_FAILED                                   :{WHITE}Lentokoneen {COMMA} itseuudistus epäonnistui (rahoitusraja).
 
 STR_CONFIG_PATCHES                                              :{BLACK}Muokkaa paikkauksia
 STR_CONFIG_PATCHES_TIP                                          :{BLACK}Muokkaa paikkauksia.
@@ -1104,7 +1104,7 @@
 STR_CHEATS_TIP                                                  :{BLACK}Valintaruudut osoittavat, oletko käyttänyt huijausta aiemmin.
 STR_CHEATS_WARNING                                              :{BLACK}Varoitus! Olet juuri pettämässä kanssakilpailijoitasi. Pidä mielessä, että tällainen häväistys pidetään mielessä ikuisuuden ajan.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Anna lisää rahaa: {CURRENCY64}
-STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Pelaa pelaajana: {ORANGE}{COMMA16}
+STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Pelaa pelaajana: {ORANGE}{COMMA}
 STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Taikapuskutraktori (siirrä teollisuutta yms.): {ORANGE}{STRING}
 STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Tunnelit voivat mennä ristiin: {ORANGE}{STRING}
 STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Rakenna tauon aikana: {ORANGE}{STRING}
@@ -1120,7 +1120,7 @@
 STR_GO_NON_STOP_TO_WAYPOINT                                     :Mene pysäht. pisteen {WAYPOINT} kautta
 
 STR_WAYPOINTNAME_CITY                                           :Reittipiste: {TOWN}
-STR_WAYPOINTNAME_CITY_SERIAL                                    :Reittipiste: {TOWN} #{COMMA16}
+STR_WAYPOINTNAME_CITY_SERIAL                                    :Reittipiste: {TOWN} #{COMMA}
 STR_LANDINFO_WAYPOINT                                           :Reittipiste
 
 STR_WAYPOINT                                                    :{WHITE}Reittipiste
@@ -1203,8 +1203,8 @@
 STR_CONSTRUCT_SUGAR_MINE_TIP                                    :{BLACK}Rakenna sokerikaivos.
 
 STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Teollisuusala
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}){YELLOW} ({COMMA16}% kuljetettu)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}/{STRING}){YELLOW} ({COMMA16}%/{COMMA16}% kuljetettu)
+STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}){YELLOW} ({COMMA}% kuljetettu)
+STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}/{STRING}){YELLOW} ({COMMA}%/{COMMA}% kuljetettu)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{TOWN} {STRING}
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...liian lähellä toista teollisuutta.
@@ -1244,15 +1244,15 @@
 STR_NETWORK_ADD_SERVER_TIP                                      :{BLACK}Lisää palvelin listaan, joka käydään läpi aina uusia pelejä haettaessa.
 STR_NETWORK_ENTER_IP                                            :{BLACK}Syötä palvelimen IP-osoite
 
-STR_NETWORK_CLIENTS_ONLINE                                      :{BLACK}{COMMA16}/{COMMA16}
+STR_NETWORK_CLIENTS_ONLINE                                      :{BLACK}{COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Pelaajia
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Pelaajia pelissä/enintään.
 STR_NETWORK_GAME_INFO                                           :{SILVER}PELITIEDOT
 STR_ORANGE                                                      :{ORANGE}{STRING}
-STR_NETWORK_CLIENTS                                             :{SILVER}Pelaajat:  {WHITE}{COMMA8} / {COMMA8}
+STR_NETWORK_CLIENTS                                             :{SILVER}Pelaajat:  {WHITE}{COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}Kieli:  {WHITE}{STRING}
 STR_NETWORK_TILESET                                             :{SILVER}Ruudusto:  {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Kartan koko:  {WHITE}{COMMA16}x{COMMA16}
+STR_NETWORK_MAP_SIZE                                            :{SILVER}Kartan koko:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Palvelimen versio:  {WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Palvelimen osoite:  {WHITE}{STRING} : {NUMU16}
 STR_NETWORK_START_DATE                                          :{SILVER}Aloitusvuosi:  {WHITE}{DATE_SHORT}
@@ -1517,21 +1517,21 @@
 
 ##id 0x2000
 STR_2000_TOWNS                                                  :{WHITE}Kaupungit
-STR_TOWN_LABEL_POP                                              :{WHITE}{STRING} ({COMMA32})
+STR_TOWN_LABEL_POP                                              :{WHITE}{STRING} ({COMMA})
 STR_2001                                                        :{WHITE}{STRING}
 STR_2002                                                        :{TINYFONT}{BLACK}{STRING}
 STR_2003                                                        :{TINYFONT}{WHITE}{STRING}
 STR_2004_BUILDING_MUST_BE_DEMOLISHED                            :{WHITE}Rakennus täytyy tuhota ensin.
 STR_2005                                                        :{WHITE}{TOWN}
-STR_2006_POPULATION                                             :{BLACK}Asukasluku: {ORANGE}{COMMA32}{BLACK}  Taloja: {ORANGE}{COMMA32}
+STR_2006_POPULATION                                             :{BLACK}Asukasluku: {ORANGE}{COMMA}{BLACK}  Taloja: {ORANGE}{COMMA}
 STR_2007_RENAME_TOWN                                            :Nimeä kaupunki
 STR_2008_CAN_T_RENAME_TOWN                                      :{WHITE}Kaupunkia ei voi uudelleennimetä...
 STR_2009_LOCAL_AUTHORITY_REFUSES                                :{WHITE}{TOWN}: paikallisviranomaiset kieltäytyvät.
 STR_200A_TOWN_NAMES_CLICK_ON_NAME                               :{BLACK}Kaupunkien nimet - napsauta nimeä keskittääksesi päänäkymän kaupunkiin.
 STR_200B_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Keskitä päänäkymä kaupungin sijaintiin.
 STR_200C_CHANGE_TOWN_NAME                                       :{BLACK}Vaihda kaupungin nimeä.
-STR_200D_PASSENGERS_LAST_MONTH_MAX                              :{BLACK}Matkustajia viime kuussa: {ORANGE}{COMMA32}{BLACK}  max: {ORANGE}{COMMA32}
-STR_200E_MAIL_LAST_MONTH_MAX                                    :{BLACK}Postia viime kuussa: {ORANGE}{COMMA32}{BLACK}  max: {ORANGE}{COMMA32}
+STR_200D_PASSENGERS_LAST_MONTH_MAX                              :{BLACK}Matkustajia viime kuussa: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
+STR_200E_MAIL_LAST_MONTH_MAX                                    :{BLACK}Postia viime kuussa: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
 STR_200F_TALL_OFFICE_BLOCK                                      :Korkea toimistorakennus
 STR_2010_OFFICE_BLOCK                                           :Tomistorakennus
 STR_2011_SMALL_BLOCK_OF_FLATS                                   :Pienasuntokortteli
@@ -1605,7 +1605,7 @@
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Lahjo viranomaisia lisätäksesi arviotasi; rangaistus voi olla kuitenkin suuri, jos jäät kiinni.{}  Kulu: {CURRENCY}
 STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}{TOWN}: liikenne on kaaoksessa!{}{}{STRING} rahoittaa katujen kunnostuksen; autoilijoille odotettavissa kuusi kuukautta kurjuutta!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
-STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA32})
+STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA})
 STR_2058_UNDER_CONSTRUCTION                                     :{STRING} (rakennetaan)
 STR_2059_IGLOO                                                  :Iglu
 STR_205A_TEPEES                                                 :Tiipiitä
@@ -1667,7 +1667,7 @@
 STR_303C_OUTSTANDING                                            :Loistava
 ############ range for rating ends
 
-STR_303D                                                        :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA8}%)
+STR_303D                                                        :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_303E_NO_LONGER_ACCEPTS                                      :{WHITE}Asema {STATION} ei enää ota vastaan {STRING}.
 STR_303F_NO_LONGER_ACCEPTS_OR                                   :{WHITE}Asema {STATION} ei enää ota vastaan {STRING} tai {STRING}.
 STR_3040_NOW_ACCEPTS                                            :{WHITE}Asema {STATION} ottaa vastaan {STRING}.
@@ -1678,7 +1678,7 @@
 STR_3045_TOO_CLOSE_TO_ANOTHER_TRUCK                             :{WHITE}Liian lähellä toista lastauslaituria.
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Linja-autoasema pitää tuhota ensin.
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Lastauslaituri pitää tuhota ensin.
-STR_3048_STATIONS                                               :{WHITE}{STRING} - {COMMA16} asemaa
+STR_3048_STATIONS                                               :{WHITE}{STRING} - {COMMA} asemaa
 STR_3049_0                                                      :{YELLOW}{STATION} {STRINL 0x30D1}
 STR_304A_NONE                                                   :{YELLOW}- Ei mitään -
 STR_304B_SITE_UNSUITABLE                                        :{WHITE}...paikka sopimaton.
@@ -1735,7 +1735,7 @@
 STR_4002_SAVE                                                   :{BLACK}Tallenna
 STR_4003_DELETE                                                 :{BLACK}Poista
 STR_4004                                                        :{STRING}, {DATE_LONG}
-STR_4005_BYTES_FREE                                             :{BLACK}{COMMA32} megatavua vapaana
+STR_4005_BYTES_FREE                                             :{BLACK}{COMMA} megatavua vapaana
 STR_4006_UNABLE_TO_READ_DRIVE                                   :{BLACK}Asemaa ei voi lukea.
 STR_4007_GAME_SAVE_FAILED                                       :{WHITE}Tallennus epäonnistui.
 STR_4008_UNABLE_TO_DELETE_FILE                                  :{WHITE}Tiedostoa ei voi poistaa.
@@ -1796,7 +1796,7 @@
 ############ range for requires	ends
 
 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Tuotto viime kuussa:
-STR_482B_TRANSPORTED                                            :{YELLOW}{STRING}{BLACK} ({COMMA16}% kuljetettu)
+STR_482B_TRANSPORTED                                            :{YELLOW}{STRING}{BLACK} ({COMMA}% kuljetettu)
 STR_482C_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Keskitä päänäkymä teollisuuden sijaintiin.
 STR_482D_NEW_UNDER_CONSTRUCTION                                 :{BLACK}{BIGFONT}Uusi {STRING} rakennetaan kaupungin {TOWN} lähistölle!
 STR_482E_NEW_BEING_PLANTED_NEAR                                 :{BLACK}{BIGFONT}Uusi {STRING} istutetaan kaupungin {TOWN} lähistölle!
@@ -1813,8 +1813,8 @@
 STR_4839_PRODUCTION_DOWN_BY_50                                  :{BLACK}{BIGFONT}{TOWN} ({STRING}): tuotanto vähenee 50%:lla.
 STR_483A_INSECT_INFESTATION_CAUSES                              :{BLACK}{BIGFONT}{TOWN} ({STRING}): hyönteisparvet aiheuttavat tuhoa!{}Tuotanto vähenee 50%:lla.
 STR_483B_CAN_ONLY_BE_POSITIONED                                 :{WHITE}...voidaan asettaa vain kartan reunoille.
-STR_INDUSTRY_PROD_GOUP                                          :{BLACK}{BIGFONT}{STRING} tuottaa {TOWN}, {STRING} {COMMA16}% entistä enemmän!
-STR_INDUSTRY_PROD_GODOWN                                        :{BLACK}{BIGFONT}{STRING} tuottaa {TOWN}, {STRING} {COMMA16}% entistä vähemmän!
+STR_INDUSTRY_PROD_GOUP                                          :{BLACK}{BIGFONT}{STRING} tuottaa {TOWN}, {STRING} {COMMA}% entistä enemmän!
+STR_INDUSTRY_PROD_GODOWN                                        :{BLACK}{BIGFONT}{STRING} tuottaa {TOWN}, {STRING} {COMMA}% entistä vähemmän!
 
 ##id 0x5000
 STR_5000_TRAIN_IN_TUNNEL                                        :{WHITE}Juna on tunnelissa.
@@ -1877,10 +1877,10 @@
 ##id 0x6000
 STR_SV_EMPTY                                                    :
 STR_SV_UNNAMED                                                  :Nimetön{SKIP}
-STR_SV_TRAIN_NAME                                               :Juna {COMMA16}
-STR_SV_ROADVEH_NAME                                             :Ajoneuvo {COMMA16}
-STR_SV_SHIP_NAME                                                :Laiva {COMMA16}
-STR_SV_AIRCRAFT_NAME                                            :Lentokone {COMMA16}
+STR_SV_TRAIN_NAME                                               :Juna {COMMA}
+STR_SV_ROADVEH_NAME                                             :Ajoneuvo {COMMA}
+STR_SV_SHIP_NAME                                                :Laiva {COMMA}
+STR_SV_AIRCRAFT_NAME                                            :Lentokone {COMMA}
 
 STR_SV_STNAME                                                   :{STRING}
 STR_SV_STNAME_NORTH                                             :Pohjois-{STRING}
@@ -1930,12 +1930,12 @@
 ############ range for difficulty levels ends
 
 ############ range for difficulty settings starts
-STR_6805_MAXIMUM_NO_COMPETITORS                                 :{LTBLUE}Vastustajien enimmäismäärä: {ORANGE}{COMMA16}
+STR_6805_MAXIMUM_NO_COMPETITORS                                 :{LTBLUE}Vastustajien enimmäismäärä: {ORANGE}{COMMA}
 STR_6806_COMPETITOR_START_TIME                                  :{LTBLUE}Vastustajien aloitusaika: {ORANGE}{STRING}
 STR_6807_NO_OF_TOWNS                                            :{LTBLUE}Kaupunkien määrä: {ORANGE}{STRING}
 STR_6808_NO_OF_INDUSTRIES                                       :{LTBLUE}Teollisuuden määrä: {ORANGE}{STRING}
 STR_6809_MAXIMUM_INITIAL_LOAN_000                               :{LTBLUE}Lainan enimmäismäärä alussa: {ORANGE}{CURRENCY}
-STR_680A_INITIAL_INTEREST_RATE                                  :{LTBLUE}Korko alussa: {ORANGE}{COMMA16}%
+STR_680A_INITIAL_INTEREST_RATE                                  :{LTBLUE}Korko alussa: {ORANGE}{COMMA}%
 STR_680B_VEHICLE_RUNNING_COSTS                                  :{LTBLUE}Ajoneuvojen käyttökustannukset: {ORANGE}{STRING}
 STR_680C_CONSTRUCTION_SPEED_OF_COMPETITOR                       :{LTBLUE}Vastustajien rakennusnopeus: {ORANGE}{STRING}
 STR_680D_INTELLIGENCE_OF_COMPETITORS                            :{LTBLUE}Vastustajien älykkyys: {ORANGE}{STRING}
@@ -1994,7 +1994,7 @@
 ##id 0x7000
 STR_7000                                                        :
 STR_7001                                                        :{WHITE}{STRING} {BLACK}{STRING}
-STR_7002_PLAYER                                                 :(Pelaaja {COMMA16})
+STR_7002_PLAYER                                                 :(Pelaaja {COMMA})
 STR_7004_NEW_FACE                                               :{BLACK}Uudet kasvot
 STR_7005_COLOR_SCHEME                                           :{BLACK}Väriteema
 STR_7006_COLOR_SCHEME                                           :{GOLD}Väriteema:
@@ -2028,7 +2028,7 @@
 STR_7022_INCOME_GRAPH                                           :{WHITE}Tulokuvaaja
 STR_CURRCOMPACT32                                               :{CURRCOMPACT}
 STR_CURRCOMPACT64                                               :{CURRCOMPACT64}
-STR_7024                                                        :{COMMA32}
+STR_7024                                                        :{COMMA}
 STR_7025_OPERATING_PROFIT_GRAPH                                 :{WHITE}Tuottokuvaaja
 STR_7026_BANK_BALANCE                                           :{WHITE}Tilin saldo
 STR_7027_LOAN                                                   :{WHITE}Laina
@@ -2052,14 +2052,14 @@
 STR_7037_PRESIDENT                                              :{WHITE}{STRING}{}{GOLD}(pääjohtaja)
 STR_7038_INAUGURATED                                            :{GOLD}Avattu: {WHITE}{NUMU16}
 STR_7039_VEHICLES                                               :{GOLD}Liikennevälineet:
-STR_703A_TRAIN                                                  :{WHITE}{COMMA16} juna
-STR_703B_TRAINS                                                 :{WHITE}{COMMA16} junaa
-STR_703C_ROAD_VEHICLE                                           :{WHITE}{COMMA16} ajoneuvo
-STR_703D_ROAD_VEHICLES                                          :{WHITE}{COMMA16} ajoneuvoa
-STR_703E_AIRCRAFT                                               :{WHITE}{COMMA16} lentokone
-STR_703F_AIRCRAFT                                               :{WHITE}{COMMA16} lentokonetta
-STR_7040_SHIP                                                   :{WHITE}{COMMA16} laiva
-STR_7041_SHIPS                                                  :{WHITE}{COMMA16} laivaa
+STR_703A_TRAIN                                                  :{WHITE}{COMMA} juna
+STR_703B_TRAINS                                                 :{WHITE}{COMMA} junaa
+STR_703C_ROAD_VEHICLE                                           :{WHITE}{COMMA} ajoneuvo
+STR_703D_ROAD_VEHICLES                                          :{WHITE}{COMMA} ajoneuvoa
+STR_703E_AIRCRAFT                                               :{WHITE}{COMMA} lentokone
+STR_703F_AIRCRAFT                                               :{WHITE}{COMMA} lentokonetta
+STR_7040_SHIP                                                   :{WHITE}{COMMA} laiva
+STR_7041_SHIPS                                                  :{WHITE}{COMMA} laivaa
 STR_7042_NONE                                                   :{WHITE}Ei mitään
 STR_7043_FACE_SELECTION                                         :{WHITE}Kasvojen valinta
 STR_7044_MALE                                                   :{BLACK}Mies
@@ -2124,8 +2124,8 @@
 STR_707A_SELL_25_SHARE_IN_THIS_COMPANY                          :{BLACK}Myy 25%:n osuus tästä yhtiöstä
 STR_707B_CAN_T_BUY_25_SHARE_IN_THIS                             :{WHITE}Tästä yhtiöstä ei voi ostaa 25%:n osuutta...
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}Tästä yhtiöstä ei voi myydä 25%:n osuutta...
-STR_707D_OWNED_BY                                               :{WHITE}({COMMA16}%:n omistus: {STRING})
-STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA16}%:n omistus: {STRING}{}   {COMMA16}%:n omistus {STRING})
+STR_707D_OWNED_BY                                               :{WHITE}({COMMA}%:n omistus: {STRING})
+STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}%:n omistus: {STRING}{}   {COMMA}%:n omistus {STRING})
 STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}Yhtiön {STRING} on ottanut haltuun {STRING}!
 STR_7080_PROTECTED                                              :{WHITE}Tällä yhtiöllä ei ole vielä osakkeita...
 
@@ -2400,8 +2400,8 @@
 STR_8801_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Kaupungilaiset juhlivat . . .{}Ensimmäinen juna saapuu asemalle ({STATION})!
 STR_8802_DETAILS                                                :{WHITE}{STRING} (yksityiskohdat)
 STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}Juna matkalla
-STR_8804                                                        :{SETX 10}{COMMA8}: {STRING}
-STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA8}: {STRING}
+STR_8804                                                        :{SETX 10}{COMMA}: {STRING}
+STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING}
 STR_8806_GO_TO                                                  :Asemalle {STATION}
 STR_8807_GO_TO_TRANSFER                                         :Mene asemalle {STATION} (Siirrä ja ota rahti)
 STR_8808_GO_TO_UNLOAD                                           :Mene asemalle {STATION} (Pura rahti)
@@ -2427,13 +2427,13 @@
 STR_UNKNOWN_DESTINATION                                         :tuntematon päämäärä
 STR_8812_EMPTY                                                  :{LTBLUE}Tyhjä
 STR_8813_FROM                                                   :{LTBLUE}{CARGO} asemalta {STATION}
-STR_8814_TRAIN_IS_WAITING_IN_DEPOT                              :{WHITE}Juna {COMMA16} odottaa veturitallilla
+STR_8814_TRAIN_IS_WAITING_IN_DEPOT                              :{WHITE}Juna {COMMA} odottaa veturitallilla
 STR_8815_NEW_VEHICLES                                           :{BLACK}Uusia liikennevälineitä
 STR_8816                                                        :{BLACK}-
 STR_8818_INFORMATION                                            :{BLACK}Tietoja
 STR_8819_TRAIN_TOO_LONG                                         :{WHITE}Juna on liian pitkä.
 STR_881A_TRAINS_CAN_ONLY_BE_ALTERED                             :{WHITE}Junia voi muunnella vain, kun ne ovat pysähdyksissä veturitallilla.
-STR_881B_TRAINS                                                 :{WHITE}{STRING} - {COMMA16} junaa
+STR_881B_TRAINS                                                 :{WHITE}{STRING} - {COMMA} junaa
 STR_881C_NEW_RAIL_VEHICLES                                      :{WHITE}Uusi juna
 STR_881D_NEW_MONORAIL_VEHICLES                                  :{WHITE}Uusi yksiraidejuna
 STR_881E_NEW_MAGLEV_VEHICLES                                    :{WHITE}Uusi MagLev-juna
@@ -2467,8 +2467,8 @@
 STR_8839_CAN_T_SELL_RAILROAD_VEHICLE                            :{WHITE}Yksikköä ei voi myydä...
 STR_883A_UNABLE_TO_FIND_ROUTE_TO                                :{WHITE}Reittiä paikalliselle veturitallille ei löydy.
 STR_883B_CAN_T_STOP_START_TRAIN                                 :{WHITE}Junaa ei voi pysäyttää/laittaa liikkeelle...
-STR_883C_SERVICING_INTERVAL_DAYS                                :{BLACK}Huoltoväli: {LTBLUE}{COMMA16} päivää{BLACK}   Viimeisin huolto: {LTBLUE}{DATE_LONG}
-STR_SERVICING_INTERVAL_PERCENT                                  :{BLACK}Huoltoväli: {LTBLUE}{COMMA16}%{BLACK}   Viime huolto: {LTBLUE}{DATE_LONG}
+STR_883C_SERVICING_INTERVAL_DAYS                                :{BLACK}Huoltoväli: {LTBLUE}{COMMA} päivää{BLACK}   Viimeisin huolto: {LTBLUE}{DATE_LONG}
+STR_SERVICING_INTERVAL_PERCENT                                  :{BLACK}Huoltoväli: {LTBLUE}{COMMA}%{BLACK}   Viime huolto: {LTBLUE}{DATE_LONG}
 STR_883D_TRAINS_CLICK_ON_TRAIN_FOR                              :{BLACK}Junat - napsauta junaa saadaksesi tietoja.
 STR_883E_BUILD_NEW_TRAINS_REQUIRES                              :{BLACK}Rakenna uusia junia (tarvitaan veturitalli).
 STR_883F_TRAINS_CLICK_ON_TRAIN_FOR                              :{BLACK}Junat - napsauta junaa saadaksesi tietoja, vedä vaunu lisätäksesi/poistaaksesi junasta.
@@ -2501,12 +2501,12 @@
 STR_SERVICE_HINT                                                :{BLACK}Ohita tämä määräys, ellei palvelua tarvita.
 STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}Uusi {STRING} saatavilla!
 STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
-STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Kulu: {CURRENCY} Paino: {COMMA16}t{}Nopeus: {VELOCITY}  Teho: {COMMA16}hv{}Käyttökustannukset: {CURRENCY}/vuosi{}Kapasiteetti: {STRING}
+STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Kulu: {CURRENCY} Paino: {COMMA}t{}Nopeus: {VELOCITY}  Teho: {COMMA}hv{}Käyttökustannukset: {CURRENCY}/vuosi{}Kapasiteetti: {STRING}
 STR_885C_BROKEN_DOWN                                            :{RED}Rikki
 STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Ikä: {LTBLUE}{STRING}{BLACK}   Käyttökustannukset: {LTBLUE}{CURRENCY}/vuosi
-STR_885E_WEIGHT_T_POWER_HP_MAX_SPEED                            :{BLACK}Paino: {LTBLUE}{COMMA16}t  {BLACK}Teho: {LTBLUE}{COMMA32}hv{BLACK} Huippunopeus: {LTBLUE}{VELOCITY}
+STR_885E_WEIGHT_T_POWER_HP_MAX_SPEED                            :{BLACK}Paino: {LTBLUE}{COMMA}t  {BLACK}Teho: {LTBLUE}{COMMA}hv{BLACK} Huippunopeus: {LTBLUE}{VELOCITY}
 STR_885F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Tuotto tänä vuonna: {LTBLUE}{CURRENCY}  (viime vuonna: {CURRENCY})
-STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Luotettavuus: {LTBLUE}{COMMA8}%  {BLACK}Hajoamisia viime huollon jälkeen: {LTBLUE}{COMMA16}
+STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Luotettavuus: {LTBLUE}{COMMA}%  {BLACK}Hajoamisia viime huollon jälkeen: {LTBLUE}{COMMA}
 STR_8861_STOPPED                                                :{RED}Pysäytetty
 STR_8862_CAN_T_MAKE_TRAIN_PASS_SIGNAL                           :{WHITE}Junaa ei voi pakottaa jatkamaan opastimen ohi vaaratilanteessa...
 STR_8863_CRASHED                                                :{RED}Kolaroitu!
@@ -2514,7 +2514,7 @@
 STR_8865_NAME_TRAIN                                             :{WHITE}Nimeä juna
 STR_8866_CAN_T_NAME_TRAIN                                       :{WHITE}Junaa ei voi nimetä...
 STR_8867_NAME_TRAIN                                             :{BLACK}Nimeä juna
-STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Junakolari!{}{COMMA16} kuolee törmäyksenjälkeisessä tulipallossa.
+STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Junakolari!{}{COMMA} kuolee törmäyksenjälkeisessä tulipallossa.
 STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}Junan suuntaa ei voi kääntää...
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Nimeä juna(vaunu)n tyyppi uudelleen.
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Juna(vaunu)n tyyppiä ei voi uudelleennimetä...
@@ -2526,7 +2526,7 @@
 
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Ajoneuvo tiellä.
-STR_9001_ROAD_VEHICLES                                          :{WHITE}{STRING} - {COMMA16} ajoneuvoa
+STR_9001_ROAD_VEHICLES                                          :{WHITE}{STRING} - {COMMA} ajoneuvoa
 STR_9002                                                        :{WHITE}{STRING}
 STR_9003_ROAD_VEHICLE_DEPOT                                     :{WHITE}{TOWN} huoltoasema
 STR_9004_NEW_VEHICLES                                           :{BLACK}Uusia ajoneuvoja
@@ -2540,13 +2540,13 @@
 STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Ikä: {LTBLUE}{STRING}{BLACK}   Käyttökustanukset: {LTBLUE}{CURRENCY}/vuosi
 STR_900E_MAX_SPEED                                              :{BLACK}Huippunopeus: {LTBLUE}{VELOCITY}
 STR_900F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Tuottoa tänä vuonna: {LTBLUE}{CURRENCY}  (viime vuonna: {CURRENCY})
-STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Toimintavarmuus: {LTBLUE}{COMMA8}%  {BLACK}Hajoamisia viime huollon jälkeen: {LTBLUE}{COMMA16}
+STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Toimintavarmuus: {LTBLUE}{COMMA}%  {BLACK}Hajoamisia viime huollon jälkeen: {LTBLUE}{COMMA}
 STR_9011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Rakennettu: {LTBLUE}{NUMU16}{BLACK} Arvo: {LTBLUE}{CURRENCY}
 STR_9012_CAPACITY                                               :{BLACK}Kapasiteetti: {LTBLUE}{STRING}
 STR_9013_MUST_BE_STOPPED_INSIDE                                 :{WHITE}...sen pitää olla pysähtyneenä huoltoasemalle.
 STR_9014_CAN_T_SELL_ROAD_VEHICLE                                :{WHITE}Ajoneuvoa ei voi myydä...
 STR_9015_CAN_T_STOP_START_ROAD_VEHICLE                          :{WHITE}Ajoneuvoa ei voi pysäyttää/laitta liikkeelle...
-STR_9016_ROAD_VEHICLE_IS_WAITING                                :{WHITE}Ajoneuvo {COMMA16} odottaa huoltoasemalla.
+STR_9016_ROAD_VEHICLE_IS_WAITING                                :{WHITE}Ajoneuvo {COMMA} odottaa huoltoasemalla.
 STR_HEADING_FOR_ROAD_DEPOT                                      :{LTBLUE}Suuntana huoltoasema, {TOWN}.
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{LTBLUE}Suuntana huoltoasema, {TOWN}, {VELOCITY}.
 STR_9018_CAN_T_SEND_VEHICLE_TO_DEPOT                            :{WHITE}Ajoneuvon lähettäminen huoltoasemalle ei onnistu...
@@ -2575,7 +2575,7 @@
 STR_902F_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Kaupunkilaiset juhlivat . . .{}Ensimmäinen linja-auto saapuu asemalle {STATION}!
 STR_9030_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Kaupunkilaiset juhlivat . . .{}Ensimmäinen kuorma-auto saapuu asemalle {STATION}!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Ajoneuvokolari!{}Kuljettaja kuolee junaan törmäyksen jälkeisessä tulipallossa
-STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Ajoneuvokolari!{}{COMMA16} kuolee junaan törmäyksen jälkeisessä tulipallossa
+STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Ajoneuvokolari!{}{COMMA} kuolee junaan törmäyksen jälkeisessä tulipallossa
 STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}Ajoneuvoa ei voi pakottaa kääntymään ympäri...
 STR_9034_RENAME                                                 :{BLACK}Nimeä
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Nimeä ajoneuvon tyyppi uudelleen
@@ -2590,7 +2590,7 @@
 STR_9802_CAN_T_BUILD_DOCK_HERE                                  :{WHITE}Satamaa ei voi rakentaa tähän...
 STR_9803_SHIP_DEPOT                                             :{WHITE}{TOWN}, telakka
 STR_9804_NEW_SHIPS                                              :{BLACK}Uusia laivoja
-STR_9805_SHIPS                                                  :{WHITE}{STRING} - {COMMA16} laivaa
+STR_9805_SHIPS                                                  :{WHITE}{STRING} - {COMMA} laivaa
 STR_9806_CAN_T_BUILD_SHIPS                                      :{WHITE}Laivoja ei voi rakentaa...
 STR_9807_MUST_BUILD_SHIP_DEPOT_FIRST                            :{WHITE}Telakka pitää rakentaa ensin.
 STR_9808_NEW_SHIPS                                              :{WHITE}Uusia laivoja
@@ -2605,7 +2605,7 @@
 STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Ikä: {LTBLUE}{STRING}{BLACK}   Käyttökustannukset: {LTBLUE}{CURRENCY}/vuosi
 STR_9813_MAX_SPEED                                              :{BLACK}Huippunopeus: {LTBLUE}{VELOCITY}
 STR_9814_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Tuottoa tänä vuonna: {LTBLUE}{CURRENCY}  (viime vuonna: {CURRENCY})
-STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Toimintavarmuus: {LTBLUE}{COMMA8}%  {BLACK}Hajoamisia viime huollon jälkeen: {LTBLUE}{COMMA16}
+STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Toimintavarmuus: {LTBLUE}{COMMA}%  {BLACK}Hajoamisia viime huollon jälkeen: {LTBLUE}{COMMA}
 STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Rakennettu: {LTBLUE}{NUMU16}{BLACK} Arvo: {LTBLUE}{CURRENCY}
 STR_9817_CAPACITY                                               :{BLACK}Kapasiteetti: {LTBLUE}{STRING}
 STR_9818_CAN_T_STOP_START_SHIP                                  :{WHITE}Laivaa ei voi pysäyttää/laittaa liikkeelle...
@@ -2613,7 +2613,7 @@
 STR_981A_UNABLE_TO_FIND_LOCAL_DEPOT                             :{WHITE}Paikallista telakkaa ei löydy
 STR_HEADING_FOR_SHIP_DEPOT                                      :{LTBLUE}Suuntana telakka, {TOWN}
 STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{LTBLUE}Suuntana telakka, {TOWN}, {VELOCITY}
-STR_981C_SHIP_IS_WAITING_IN_DEPOT                               :{WHITE}Laiva {COMMA16} odottaa telakalla.
+STR_981C_SHIP_IS_WAITING_IN_DEPOT                               :{WHITE}Laiva {COMMA} odottaa telakalla.
 STR_981D_BUILD_SHIP_DOCK                                        :{BLACK}Rakenna satama
 STR_981E_BUILD_SHIP_DEPOT_FOR_BUILDING                          :{BLACK}Rakenna telakka (laivojen rakentamista ja huoltamista varten).
 STR_981F_SHIPS_CLICK_ON_SHIP_FOR                                :{BLACK}Laivat - napsauta laivaa saadaksesi tietoja.
@@ -2664,19 +2664,19 @@
 STR_A005_NEW_AIRCRAFT                                           :{WHITE}Uusi lentokone
 STR_A006_BUILD_AIRCRAFT                                         :{BLACK}Rakenna lentokone
 STR_A008_CAN_T_BUILD_AIRCRAFT                                   :{WHITE}Lentokonetta ei voi rakentaa...
-STR_A009_AIRCRAFT                                               :{WHITE}{STRING} - {COMMA16} lentokonetta
+STR_A009_AIRCRAFT                                               :{WHITE}{STRING} - {COMMA} lentokonetta
 STR_A00A                                                        :{WHITE}{STRING}
 STR_A00B_ORDERS                                                 :{WHITE}{STRING} (aikataulu)
 STR_A00C_DETAILS                                                :{WHITE}{STRING} (tiedot)
 STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Ikä: {LTBLUE}{STRING}{BLACK}   Käyttökustannuket: {LTBLUE}{CURRENCY}/vuosi
 STR_A00E_MAX_SPEED                                              :{BLACK}Huippunopeus: {LTBLUE}{VELOCITY}
 STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Tuotto tänä vuonna: {LTBLUE}{CURRENCY}  (viime vuonna: {CURRENCY})
-STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Luotettavuus: {LTBLUE}{COMMA8}%  {BLACK}Hajoamisia viime huollon jälkeen: {LTBLUE}{COMMA16}
+STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Luotettavuus: {LTBLUE}{COMMA}%  {BLACK}Hajoamisia viime huollon jälkeen: {LTBLUE}{COMMA}
 STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Rakennettu: {LTBLUE}{NUMU16}{BLACK} Arvo: {LTBLUE}{CURRENCY}
 STR_A012_CAN_T_SEND_AIRCRAFT_TO                                 :{WHITE}Lentokonetta ei voi lähettää lentokonehalliin...
 STR_HEADING_FOR_HANGAR                                          :{LTBLUE}Suuntana lentokonehalli, {STATION}
 STR_HEADING_FOR_HANGAR_VEL                                      :{LTBLUE}Suuntana lentokonehalli, {STATION}, {VELOCITY}
-STR_A014_AIRCRAFT_IS_WAITING_IN                                 :{WHITE}Lentokone {COMMA16} odottaa lentokonehallissa.
+STR_A014_AIRCRAFT_IS_WAITING_IN                                 :{WHITE}Lentokone {COMMA} odottaa lentokonehallissa.
 STR_A015_AIRCRAFT_IN_THE_WAY                                    :{WHITE}Lentokone on tiellä.
 STR_A016_CAN_T_STOP_START_AIRCRAFT                              :{WHITE}Lentokonetta ei voi pysäyttää/laittaa liikkeelle...
 STR_A017_AIRCRAFT_IS_IN_FLIGHT                                  :{WHITE}Lentokone on lennossa.
@@ -2702,14 +2702,14 @@
 STR_A02B_SHOW_AIRCRAFT_DETAILS                                  :{BLACK}Näytä lentokoneen tiedot.
 STR_A02C_NEW_AIRCRAFT_NOW_AVAILABLE                             :{BLACK}{BIGFONT}Uusi lentokone saatavilla!
 STR_A02D                                                        :{BLACK}{BIGFONT}{STRING}
-STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Kulu: {CURRENCY} Huippunopeus: {VELOCITY}{}Kapasiteetti: {COMMA16} matkustajaa, {COMMA16} säkkiä postia{}Käyttökustannus: {CURRENCY}/vuosi
+STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Kulu: {CURRENCY} Huippunopeus: {VELOCITY}{}Kapasiteetti: {COMMA} matkustajaa, {COMMA} säkkiä postia{}Käyttökustannus: {CURRENCY}/vuosi
 
 STR_A030_NAME_AIRCRAFT                                          :{WHITE}Nimeä lentokone
 STR_A031_CAN_T_NAME_AIRCRAFT                                    :{WHITE}Lentokonetta ei voi nimetä...
 STR_A032_NAME_AIRCRAFT                                          :{BLACK}Nimeä lentokone
 STR_A033_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Kaupunkilaiset juhlivat . . .{}Ensimmäinen lentokone saapuu asemalle {STATION}!
-STR_A034_PLANE_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Lento-onnettomuus!{}{COMMA16} kuolee tulipallossa asemalla {STATION}.
-STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Lentokoneonnettomuus!{}Lentokoneelta loppui polttoaine, {COMMA16} kuolee tulipallossa!
+STR_A034_PLANE_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Lento-onnettomuus!{}{COMMA} kuolee tulipallossa asemalla {STATION}.
+STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Lentokoneonnettomuus!{}Lentokoneelta loppui polttoaine, {COMMA} kuolee tulipallossa!
 STR_A035_DESTINATIONS                                           :{TINYFONT}{BLACK}Kohteet:
 STR_A036                                                        :{TINYFONT}{BLACK}{STATION}
 STR_A037_RENAME                                                 :{BLACK}Nimeä
@@ -2735,7 +2735,7 @@
 STR_B003_FACTORY_DESTROYED_IN_SUSPICIOUS                        :{BLACK}{BIGFONT}{TOWN}: Tehdas tuhoutunut epäilyttävissä olosuhteissa!
 STR_B004_UFO_LANDS_NEAR                                         :{BLACK}{BIGFONT}{TOWN}: 'UFO' laskeutuu!
 STR_B005_COAL_MINE_SUBSIDENCE_LEAVES                            :{BLACK}{BIGFONT}{TOWN}: Hiilikaivoksen vajoaminen jättää tuhon jälkiä!
-STR_B006_FLOOD_VEHICLE_DESTROYED                                :{BLACK}{BIGFONT}Tulvia!{}Ainakin {COMMA16} oletettavasti kadoksissa tai kuollut tappavan tulvan jälkeen!
+STR_B006_FLOOD_VEHICLE_DESTROYED                                :{BLACK}{BIGFONT}Tulvia!{}Ainakin {COMMA} oletettavasti kadoksissa tai kuollut tappavan tulvan jälkeen!
 
 STR_BRIBE_FAILED                                                :{WHITE}Yleinen syyttäjä on saanut selville
 STR_BRIBE_FAILED_2                                              :{WHITE}lahjontayrityksesi.
@@ -2745,7 +2745,7 @@
 STR_PERFORMANCE_DETAIL                                          :{WHITE}Yksityiskohtainen suoritustehoarvio
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Yksityiskohta
 STR_PERFORMANCE_DETAIL_AMOUNT_CURRENCY                          :{BLACK}({CURRCOMPACT}/{CURRCOMPACT})
-STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA32}/{COMMA32})
+STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA}/{COMMA})
 STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{INT32}%
 SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{INT32}
 ############ Those following lines need to be in this order!!
@@ -2780,7 +2780,7 @@
 STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID:
 
 STR_CURRENCY_WINDOW                                             :{WHITE}Oma valuutta
-STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Vaihtokurssi: {ORANGE}{CURRENCY} = {POUNDSIGN} {COMMA16}
+STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Vaihtokurssi: {ORANGE}{CURRENCY} = {POUNDSIGN} {COMMA}
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Välimerkki:
 STR_CURRENCY_PREFIX                                             :{LTBLUE}Etuliite:
 STR_CURRENCY_SUFFIX                                             :{LTBLUE}Jälkiliite:
@@ -2794,10 +2794,10 @@
 STR_PLANE                                                       :{BLACK}{PLANE}
 STR_SHIP                                                        :{BLACK}{SHIP}
 
-STR_SCHEDULED_TRAINS                                            :{WHITE}{STATION} - {COMMA16} junaa
-STR_SCHEDULED_ROAD_VEHICLES                                     :{WHITE}{STATION} - {COMMA16} autoa
-STR_SCHEDULED_AIRCRAFT                                          :{WHITE}{STATION} - {COMMA16} lentokonetta
-STR_SCHEDULED_SHIPS                                             :{WHITE}{STATION} - {COMMA16} laivaa
+STR_SCHEDULED_TRAINS                                            :{WHITE}{STATION} - {COMMA} junaa
+STR_SCHEDULED_ROAD_VEHICLES                                     :{WHITE}{STATION} - {COMMA} autoa
+STR_SCHEDULED_AIRCRAFT                                          :{WHITE}{STATION} - {COMMA} lentokonetta
+STR_SCHEDULED_SHIPS                                             :{WHITE}{STATION} - {COMMA} laivaa
 
 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.
@@ -2819,7 +2819,7 @@
 STR_REPLACE_HELP                                                :{BLACK}Tällä voit korvata yhden veturityypin toisella, kun alkuperäisen tyypin junat menevät varikolle.
 
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
-STR_SIGN_LIST_CAPTION                                           :{WHITE}Kylttilista - {COMMA16} kylttiä
+STR_SIGN_LIST_CAPTION                                           :{WHITE}Kylttilista - {COMMA} kylttiä
 
 ############ Lists rail types
 
@@ -2829,16 +2829,16 @@
 
 ############ End of list of rail types
 
-STR_TINY_BLACK                                                  :{BLACK}{TINYFONT}{COMMA16}
+STR_TINY_BLACK                                                  :{BLACK}{TINYFONT}{COMMA}
 
-STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Kulu: {GOLD}{CURRENCY}{BLACK} Paino: {GOLD}{COMMA16}t
-STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Nopeus: {GOLD}{VELOCITY}{BLACK}   Teho: {GOLD}{COMMA32}hv
+STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Kulu: {GOLD}{CURRENCY}{BLACK} Paino: {GOLD}{COMMA}t
+STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Nopeus: {GOLD}{VELOCITY}{BLACK}   Teho: {GOLD}{COMMA}hv
 STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}Käyttökulu: {GOLD}{CURRENCY}/vuosi
 STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Kapasiteetti: {GOLD}{STRING} {STRING}
-STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Suunniteltu: {GOLD}{NUMU16}{BLACK} Elinikä: {GOLD}{COMMA16} vuotta
-STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Enimmäisluotettavuus: {GOLD}{COMMA8}%
+STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Suunniteltu: {GOLD}{NUMU16}{BLACK} Elinikä: {GOLD}{COMMA} vuotta
+STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Enimmäisluotettavuus: {GOLD}{COMMA}%
 STR_PURCHASE_INFO_COST                                          :{BLACK}Kulu: {GOLD}{CURRENCY}
-STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Paino: {GOLD}{COMMA16}t  ({COMMA16}t)
+STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Paino: {GOLD}{COMMA}t  ({COMMA}t)
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Kulu: {GOLD}{CURRENCY}{BLACK} Nopeus: {GOLD}{VELOCITY}
-STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Kapasiteetti: {GOLD}{COMMA16} matkustajaa, {COMMA16} säkkiä postia
-STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Moottoroidut vaunut: {GOLD}+{COMMA16}hv{BLACK} Paino: {GOLD}+{COMMA8}t
+STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Kapasiteetti: {GOLD}{COMMA} matkustajaa, {COMMA} säkkiä postia
+STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Moottoroidut vaunut: {GOLD}+{COMMA}hv{BLACK} Paino: {GOLD}+{COMMA}t
--- a/lang/french.txt	Thu Jul 14 09:53:52 2005 +0000
+++ b/lang/french.txt	Thu Jul 14 15:10:20 2005 +0000
@@ -82,69 +82,69 @@
 STR_004C_PLASTIC                                                :Plastique
 STR_004D_FIZZY_DRINK                                            :Boisson Gazeuse
 STR_004E                                                        :
-STR_004F_PASSENGER                                              :{COMMA16} passager
-STR_0050_TON_OF_COAL                                            :{COMMA16} tonne de charbon
-STR_0051_BAG_OF_MAIL                                            :{COMMA16} sac de courrier
+STR_004F_PASSENGER                                              :{COMMA} passager
+STR_0050_TON_OF_COAL                                            :{COMMA} tonne de charbon
+STR_0051_BAG_OF_MAIL                                            :{COMMA} sac de courrier
 STR_0052_OF_OIL                                                 :{VOLUME} de pétrole
-STR_0053_ITEM_OF_LIVESTOCK                                      :{COMMA16} tête de bétail
-STR_0054_CRATE_OF_GOODS                                         :{COMMA16} caisse de biens
-STR_0055_TON_OF_GRAIN                                           :{COMMA16} tonne de grain
-STR_0056_TON_OF_WOOD                                            :{COMMA16} tonne de bois
-STR_0057_TON_OF_IRON_ORE                                        :{COMMA16} tonne de fer
-STR_0058_TON_OF_STEEL                                           :{COMMA16} tonne d'acier
-STR_0059_BAG_OF_VALUABLES                                       :{COMMA16} sac d'objets de valeur
-STR_005A_TON_OF_COPPER_ORE                                      :{COMMA16} tonne de cuivre
-STR_005B_TON_OF_MAIZE                                           :{COMMA16} tonne de maïs
-STR_005C_TON_OF_FRUIT                                           :{COMMA16} tonne de fruits
-STR_005D_BAG_OF_DIAMONDS                                        :{COMMA16} sac de diamants
-STR_005E_TON_OF_FOOD                                            :{COMMA16} tonne de nourriture
-STR_005F_TON_OF_PAPER                                           :{COMMA16} tonne de papier
-STR_0060_BAG_OF_GOLD                                            :{COMMA16} sac d'or
+STR_0053_ITEM_OF_LIVESTOCK                                      :{COMMA} tête de bétail
+STR_0054_CRATE_OF_GOODS                                         :{COMMA} caisse de biens
+STR_0055_TON_OF_GRAIN                                           :{COMMA} tonne de grain
+STR_0056_TON_OF_WOOD                                            :{COMMA} tonne de bois
+STR_0057_TON_OF_IRON_ORE                                        :{COMMA} tonne de fer
+STR_0058_TON_OF_STEEL                                           :{COMMA} tonne d'acier
+STR_0059_BAG_OF_VALUABLES                                       :{COMMA} sac d'objets de valeur
+STR_005A_TON_OF_COPPER_ORE                                      :{COMMA} tonne de cuivre
+STR_005B_TON_OF_MAIZE                                           :{COMMA} tonne de maïs
+STR_005C_TON_OF_FRUIT                                           :{COMMA} tonne de fruits
+STR_005D_BAG_OF_DIAMONDS                                        :{COMMA} sac de diamants
+STR_005E_TON_OF_FOOD                                            :{COMMA} tonne de nourriture
+STR_005F_TON_OF_PAPER                                           :{COMMA} tonne de papier
+STR_0060_BAG_OF_GOLD                                            :{COMMA} sac d'or
 STR_0061_OF_WATER                                               :{VOLUME} d'eau
-STR_0062_TON_OF_WHEAT                                           :{COMMA16} tonne de blé
+STR_0062_TON_OF_WHEAT                                           :{COMMA} tonne de blé
 STR_0063_OF_RUBBER                                              :{VOLUME} de caoutchouc
-STR_0064_TON_OF_SUGAR                                           :{COMMA16} tonne de sucre
-STR_0065_TOY                                                    :{COMMA16} jouet
-STR_0066_BAG_OF_CANDY                                           :{COMMA16} sac de jouet
+STR_0064_TON_OF_SUGAR                                           :{COMMA} tonne de sucre
+STR_0065_TOY                                                    :{COMMA} jouet
+STR_0066_BAG_OF_CANDY                                           :{COMMA} sac de jouet
 STR_0067_OF_COLA                                                :{VOLUME} de cola
-STR_0068_TON_OF_COTTON_CANDY                                    :{COMMA16} tonne de barbe à papa
-STR_0069_BUBBLE                                                 :{COMMA16} bulle
-STR_006A_TON_OF_TOFFEE                                          :{COMMA16} tonne de caramel
-STR_006B_BATTERY                                                :{COMMA16} batterie
+STR_0068_TON_OF_COTTON_CANDY                                    :{COMMA} tonne de barbe à papa
+STR_0069_BUBBLE                                                 :{COMMA} bulle
+STR_006A_TON_OF_TOFFEE                                          :{COMMA} tonne de caramel
+STR_006B_BATTERY                                                :{COMMA} batterie
 STR_006C_OF_PLASTIC                                             :{VOLUME} de plastique
-STR_006D_FIZZY_DRINK                                            :{COMMA16} boisson gazeuse
+STR_006D_FIZZY_DRINK                                            :{COMMA} boisson gazeuse
 STR_006E                                                        :
-STR_006F_PASSENGERS                                             :{COMMA16} passagers
-STR_0070_TONS_OF_COAL                                           :{COMMA16} tonnes de charbon
-STR_0071_BAGS_OF_MAIL                                           :{COMMA16} sacs de courrier
+STR_006F_PASSENGERS                                             :{COMMA} passagers
+STR_0070_TONS_OF_COAL                                           :{COMMA} tonnes de charbon
+STR_0071_BAGS_OF_MAIL                                           :{COMMA} sacs de courrier
 STR_0072_OF_OIL                                                 :{VOLUME} de pétrole
-STR_0073_ITEMS_OF_LIVESTOCK                                     :{COMMA16} têtes de bétail
-STR_0074_CRATES_OF_GOODS                                        :{COMMA16} caisses de biens
-STR_0075_TONS_OF_GRAIN                                          :{COMMA16} tonnes de grain
-STR_0076_TONS_OF_WOOD                                           :{COMMA16} tonnes de bois
-STR_0077_TONS_OF_IRON_ORE                                       :{COMMA16} tonnes de fer
-STR_0078_TONS_OF_STEEL                                          :{COMMA16} tonnes d'acier
-STR_0079_BAGS_OF_VALUABLES                                      :{COMMA16} sacs d'objets de valeur
-STR_007A_TONS_OF_COPPER_ORE                                     :{COMMA16} tonnes de cuivre
-STR_007B_TONS_OF_MAIZE                                          :{COMMA16} tonnes de maïs
-STR_007C_TONS_OF_FRUIT                                          :{COMMA16} tonnes de fruits
-STR_007D_BAGS_OF_DIAMONDS                                       :{COMMA16} sacs de diamants
-STR_007E_TONS_OF_FOOD                                           :{COMMA16} tonnes de nourriture
-STR_007F_TONS_OF_PAPER                                          :{COMMA16} tonnes de papier
-STR_0080_BAGS_OF_GOLD                                           :{COMMA16} sacs d'or
+STR_0073_ITEMS_OF_LIVESTOCK                                     :{COMMA} têtes de bétail
+STR_0074_CRATES_OF_GOODS                                        :{COMMA} caisses de biens
+STR_0075_TONS_OF_GRAIN                                          :{COMMA} tonnes de grain
+STR_0076_TONS_OF_WOOD                                           :{COMMA} tonnes de bois
+STR_0077_TONS_OF_IRON_ORE                                       :{COMMA} tonnes de fer
+STR_0078_TONS_OF_STEEL                                          :{COMMA} tonnes d'acier
+STR_0079_BAGS_OF_VALUABLES                                      :{COMMA} sacs d'objets de valeur
+STR_007A_TONS_OF_COPPER_ORE                                     :{COMMA} tonnes de cuivre
+STR_007B_TONS_OF_MAIZE                                          :{COMMA} tonnes de maïs
+STR_007C_TONS_OF_FRUIT                                          :{COMMA} tonnes de fruits
+STR_007D_BAGS_OF_DIAMONDS                                       :{COMMA} sacs de diamants
+STR_007E_TONS_OF_FOOD                                           :{COMMA} tonnes de nourriture
+STR_007F_TONS_OF_PAPER                                          :{COMMA} tonnes de papier
+STR_0080_BAGS_OF_GOLD                                           :{COMMA} sacs d'or
 STR_0081_OF_WATER                                               :{VOLUME} d'eau
-STR_0082_TONS_OF_WHEAT                                          :{COMMA16} tonnes de blé
+STR_0082_TONS_OF_WHEAT                                          :{COMMA} tonnes de blé
 STR_0083_OF_RUBBER                                              :{VOLUME} de caoutchouc
-STR_0084_TONS_OF_SUGAR                                          :{COMMA16} tonnes de sucre
-STR_0085_TOYS                                                   :{COMMA16} jouets
-STR_0086_BAGS_OF_CANDY                                          :{COMMA16} sacs de sucreries
+STR_0084_TONS_OF_SUGAR                                          :{COMMA} tonnes de sucre
+STR_0085_TOYS                                                   :{COMMA} jouets
+STR_0086_BAGS_OF_CANDY                                          :{COMMA} sacs de sucreries
 STR_0087_OF_COLA                                                :{VOLUME} de cola
-STR_0088_TONS_OF_COTTON_CANDY                                   :{COMMA16} tonnes de barbe à papa
-STR_0089_BUBBLES                                                :{COMMA16} bulles
-STR_008A_TONS_OF_TOFFEE                                         :{COMMA16} tonnes de caramel
-STR_008B_BATTERIES                                              :{COMMA16} batteries
+STR_0088_TONS_OF_COTTON_CANDY                                   :{COMMA} tonnes de barbe à papa
+STR_0089_BUBBLES                                                :{COMMA} bulles
+STR_008A_TONS_OF_TOFFEE                                         :{COMMA} tonnes de caramel
+STR_008B_BATTERIES                                              :{COMMA} batteries
 STR_008C_OF_PLASTIC                                             :{VOLUME} de plastique
-STR_008D_FIZZY_DRINKS                                           :{COMMA16} boisson gazeuses
+STR_008D_FIZZY_DRINKS                                           :{COMMA} boisson gazeuses
 STR_008E                                                        :
 STR_008F_PS                                                     :{TINYFONT}PS
 STR_0090_CL                                                     :{TINYFONT}CL
@@ -219,8 +219,8 @@
 STR_00DF_GREY                                                   :Gris
 STR_00E0_WHITE                                                  :Blanc
 STR_00E1_TOO_MANY_VEHICLES_IN_GAME                              :{WHITE}Trop de véhicules en jeu
-STR_00E2                                                        :{BLACK}{COMMA16}
-STR_00E3                                                        :{RED}{COMMA16}
+STR_00E2                                                        :{BLACK}{COMMA}
+STR_00E3                                                        :{RED}{COMMA}
 STR_00E4_LOCATION                                               :{BLACK}Emplacement
 STR_00E5_CONTOURS                                               :Relief
 STR_00E6_VEHICLES                                               :Véhicules
@@ -441,18 +441,18 @@
 STR_0198_PROFIT_THIS_YEAR_LAST_YEAR                             :{TINYFONT}{BLACK}Profit cette année: {CURRENCY} (l'an dernier: {CURRENCY})
 
 ############ range for service numbers starts
-STR_0199_YEAR                                                   :{COMMA16} an ({COMMA16})
-STR_019A_YEARS                                                  :{COMMA16} années ({COMMA16})
-STR_019B_YEARS                                                  :{RED}{COMMA16} années ({COMMA16})
+STR_0199_YEAR                                                   :{COMMA} an ({COMMA})
+STR_019A_YEARS                                                  :{COMMA} années ({COMMA})
+STR_019B_YEARS                                                  :{RED}{COMMA} années ({COMMA})
 ############ range for service numbers ends
 
 STR_019C_ROAD_VEHICLE                                           :Véhicule routier
 STR_019D_AIRCRAFT                                               :Aéronef
 STR_019E_SHIP                                                   :Navire
 STR_019F_TRAIN                                                  :Train
-STR_01A0_IS_GETTING_OLD                                         :{WHITE}{STRING} {COMMA16} devient vieux
-STR_01A1_IS_GETTING_VERY_OLD                                    :{WHITE}{STRING} {COMMA16} devient très vieux
-STR_01A2_IS_GETTING_VERY_OLD_AND                                :{WHITE}{STRING} {COMMA16} devient très vieux et doit être remplacé d'urgence
+STR_01A0_IS_GETTING_OLD                                         :{WHITE}{STRING} {COMMA} devient vieux
+STR_01A1_IS_GETTING_VERY_OLD                                    :{WHITE}{STRING} {COMMA} devient très vieux
+STR_01A2_IS_GETTING_VERY_OLD_AND                                :{WHITE}{STRING} {COMMA} devient très vieux et doit être remplacé d'urgence
 STR_01A3_LAND_AREA_INFORMATION                                  :{WHITE}Information sur le Terrain
 STR_01A4_COST_TO_CLEAR_N_A                                      :{BLACK}Coût du balayage: {LTBLUE}N/D
 STR_01A5_COST_TO_CLEAR                                          :{BLACK}Coût du balayage: {LTBLUE}{CURRENCY}
@@ -497,7 +497,7 @@
 STR_01CA_31ST                                                   :31
 ############ range for days	ends
 
-STR_01CB                                                        :{TINYFONT}{COMMA16}
+STR_01CB                                                        :{TINYFONT}{COMMA}
 STR_01CC_TOGGLE_LARGE_SMALL_MAP                                 :{BLACK}Basculer entre la grande et la petite carte
 STR_01CD_SELECT_TUTORIAL_DEMONSTRATION                          :{WHITE}Choisir Didacticiel/Démonstration
 
@@ -509,7 +509,7 @@
 STR_CARGO_ACCEPTED_5                                            :{BLACK}Cargaison acceptée: {LTBLUE}{STRING}, {STRING}, {STRING}, {STRING}, {STRING}
 ############ range for cargo acecpted ends
 
-STR_01D1_8                                                      :({COMMA8}/8 {STRING})
+STR_01D1_8                                                      :({COMMA}/8 {STRING})
 STR_01D2_JAZZ_JUKEBOX                                           :{WHITE}Jukebox Jazz
 STR_01D3_SOUND_MUSIC                                            :Son/musique
 STR_01D4_SHOW_SOUND_MUSIC_WINDOW                                :{BLACK}Options son et musique
@@ -528,16 +528,16 @@
 STR_01E1_START_PLAYING_MUSIC                                    :{BLACK}Démarrer la musique
 STR_01E2_DRAG_SLIDERS_TO_SET_MUSIC                              :{BLACK}Glissez les curseurs pour changer le volume
 STR_01E3                                                        :{DKGREEN}{TINYFONT}--
-STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA8}
-STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA8}
+STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA}
+STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA}
 STR_01E6                                                        :{DKGREEN}{TINYFONT}------
 STR_01E7                                                        :{DKGREEN}{TINYFONT}"{STRING}"
 STR_01E8_TRACK_XTITLE                                           :{BLACK}{TINYFONT}Piste{SETX 88}Titre
 STR_01E9_SHUFFLE                                                :{TINYFONT}Aléatoire
 STR_01EA_PROGRAM                                                :{TINYFONT}{BLACK}Programme
 STR_01EB_MUSIC_PROGRAM_SELECTION                                :{WHITE}Selection du Programme Musical
-STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA16} "{STRING}"
-STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA16}   "{STRING}"
+STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} "{STRING}"
+STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA}   "{STRING}"
 STR_01EE_TRACK_INDEX                                            :{TINYFONT}{BLACK}Index de Piste
 STR_01EF_PROGRAM                                                :{TINYFONT}{BLACK}Programme - '{STRING}'
 STR_01F0_CLEAR                                                  :{TINYFONT}{BLACK}Balayer
@@ -577,7 +577,7 @@
 STR_0210_TOO_FAR_FROM_PREVIOUS_DESTINATIO                       :{WHITE}...trop loin de la destination précédente
 STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Meilleures compagnies, qui ont atteint {NUMU16}{}({STRING} niveau)
 STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Tableau du Championnat des compagnies en {NUMU16}
-STR_0212                                                        :{BIGFONT}{COMMA16}.
+STR_0212                                                        :{BIGFONT}{COMMA}.
 STR_0213_BUSINESSMAN                                            :Homme d'affaires
 STR_0214_ENTREPRENEUR                                           :Entrepreneur
 STR_0215_INDUSTRIALIST                                          :Industriel
@@ -586,12 +586,12 @@
 STR_0218_MOGUL                                                  :Mogul
 STR_0219_TYCOON_OF_THE_CENTURY                                  :Tycoon du Siècle
 STR_HIGHSCORE_NAME                                              :{BIGFONT}{STRING}, {STRING}
-STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA16})
+STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA})
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{STRING} atteint le niveau de '{STRING}' !
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{STRING} de {STRING} atteint le niveau de '{STRING}' !
 STR_021D                                                        :{BLACK}
 STR_021E                                                        :{WHITE}
-STR_021F                                                        :{BLUE}{COMMA16}
+STR_021F                                                        :{BLUE}{COMMA}
 STR_0220_CREATE_SCENARIO                                        :{BLACK}Créer Scénario
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Éditeur de Scénario
@@ -788,8 +788,8 @@
 STR_EXTRA_VIEW_PORT                                             :Vue supplémentaire
 STR_SIGN_LIST                                                   :Liste des panneaux
 STR_02DF_TOWN_DIRECTORY                                         :Annuaire des villes
-STR_TOWN_POPULATION                                             :{BLACK}Population mondiale : {COMMA32}
-STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Vue {COMMA16}
+STR_TOWN_POPULATION                                             :{BLACK}Population mondiale : {COMMA}
+STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Vue {COMMA}
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN                                :{BLACK}Copier vers la vue
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT                             :{BLACK}Copie l'emplacement de la vue globale vers cette vue
 STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW                                :{BLACK}Coller depuis la vue
@@ -961,34 +961,34 @@
 STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Impossible de copier les ordres...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Fin des ordres partagés - -
 
-STR_TRAIN_IS_LOST                                               :{WHITE}Train {COMMA16} est perdu.
-STR_TRAIN_IS_UNPROFITABLE                                       :{WHITE}Train {COMMA16} a eu un profit de {CURRENCY} l'an dernier
+STR_TRAIN_IS_LOST                                               :{WHITE}Train {COMMA} est perdu.
+STR_TRAIN_IS_UNPROFITABLE                                       :{WHITE}Train {COMMA} a eu un profit de {CURRENCY} l'an dernier
 STR_EURO_INTRODUCE                                              :{BLACK}{BIGFONT}Union Monétaire Européenne !{}{}L'Euro est introduit en tant que monnaie unique pour les transactions dans votre pays !
 
 # Start of order review system.
 # DON'T ADD OR REMOVE LINES HERE
-STR_TRAIN_HAS_TOO_FEW_ORDERS                                    :{WHITE}Train {COMMA16} a trop peu d'ordres dans son itinéraire
-STR_TRAIN_HAS_VOID_ORDER                                        :{WHITE}Train {COMMA16} a un ordre vide
-STR_TRAIN_HAS_DUPLICATE_ENTRY                                   :{WHITE}Train {COMMA16} a des ordres en double
-STR_TRAIN_HAS_INVALID_ENTRY                                     :{WHITE}Train {COMMA16} a une station invalide dans ses ordres
-STR_ROADVEHICLE_HAS_TOO_FEW_ORDERS                              :{WHITE}Véhicule {COMMA16} a trop peu d'ordres dans son itinéraire
-STR_ROADVEHICLE_HAS_VOID_ORDER                                  :{WHITE}Véhicule {COMMA16} a un ordre vide
-STR_ROADVEHICLE_HAS_DUPLICATE_ENTRY                             :{WHITE}Véhicule {COMMA16} a des ordres en double
-STR_ROADVEHICLE_HAS_INVALID_ENTRY                               :{WHITE}Véhicule {COMMA16} a une station invalide dans ses ordres
-STR_SHIP_HAS_TOO_FEW_ORDERS                                     :{WHITE}Navire {COMMA16} a trop peu d'ordres dans son itinéraire
-STR_SHIP_HAS_VOID_ORDER                                         :{WHITE}Navire {COMMA16} a un ordre vide
-STR_SHIP_HAS_DUPLICATE_ENTRY                                    :{WHITE}Navire {COMMA16} a des ordres en double
-STR_SHIP_HAS_INVALID_ENTRY                                      :{WHITE}Navire {COMMA16}  a une station invalide dans ses ordres
-STR_AIRCRAFT_HAS_TOO_FEW_ORDERS                                 :{WHITE}Aéronef {COMMA16} a trop peu d'ordres dans son itinéraire
-STR_AIRCRAFT_HAS_VOID_ORDER                                     :{WHITE}Aéronef {COMMA16} a un ordre vide
-STR_AIRCRAFT_HAS_DUPLICATE_ENTRY                                :{WHITE}Aéronef {COMMA16} a des ordres en double
-STR_AIRCRAFT_HAS_INVALID_ENTRY                                  :{WHITE}Aéronef {COMMA16} a une station invalide dans ses ordres
+STR_TRAIN_HAS_TOO_FEW_ORDERS                                    :{WHITE}Train {COMMA} a trop peu d'ordres dans son itinéraire
+STR_TRAIN_HAS_VOID_ORDER                                        :{WHITE}Train {COMMA} a un ordre vide
+STR_TRAIN_HAS_DUPLICATE_ENTRY                                   :{WHITE}Train {COMMA} a des ordres en double
+STR_TRAIN_HAS_INVALID_ENTRY                                     :{WHITE}Train {COMMA} a une station invalide dans ses ordres
+STR_ROADVEHICLE_HAS_TOO_FEW_ORDERS                              :{WHITE}Véhicule {COMMA} a trop peu d'ordres dans son itinéraire
+STR_ROADVEHICLE_HAS_VOID_ORDER                                  :{WHITE}Véhicule {COMMA} a un ordre vide
+STR_ROADVEHICLE_HAS_DUPLICATE_ENTRY                             :{WHITE}Véhicule {COMMA} a des ordres en double
+STR_ROADVEHICLE_HAS_INVALID_ENTRY                               :{WHITE}Véhicule {COMMA} a une station invalide dans ses ordres
+STR_SHIP_HAS_TOO_FEW_ORDERS                                     :{WHITE}Navire {COMMA} a trop peu d'ordres dans son itinéraire
+STR_SHIP_HAS_VOID_ORDER                                         :{WHITE}Navire {COMMA} a un ordre vide
+STR_SHIP_HAS_DUPLICATE_ENTRY                                    :{WHITE}Navire {COMMA} a des ordres en double
+STR_SHIP_HAS_INVALID_ENTRY                                      :{WHITE}Navire {COMMA}  a une station invalide dans ses ordres
+STR_AIRCRAFT_HAS_TOO_FEW_ORDERS                                 :{WHITE}Aéronef {COMMA} a trop peu d'ordres dans son itinéraire
+STR_AIRCRAFT_HAS_VOID_ORDER                                     :{WHITE}Aéronef {COMMA} a un ordre vide
+STR_AIRCRAFT_HAS_DUPLICATE_ENTRY                                :{WHITE}Aéronef {COMMA} a des ordres en double
+STR_AIRCRAFT_HAS_INVALID_ENTRY                                  :{WHITE}Aéronef {COMMA} a une station invalide dans ses ordres
 # end of order system
 
-STR_TRAIN_AUTORENEW_FAILED                                      :{WHITE}Le renouvellement automatique a échoué sur Train {COMMA16} (limite d'argent)
-STR_ROADVEHICLE_AUTORENEW_FAILED                                :{WHITE}Le renouvellement automatique a échoué sur  Véhicule {COMMA16} (limite d'argent)
-STR_SHIP_AUTORENEW_FAILED                                       :{WHITE}Le renouvellement automatique a échoué sur Navire {COMMA16} (limite d'argent)
-STR_AIRCRAFT_AUTORENEW_FAILED                                   :{WHITE}Le renouvellement automatique a échoué sur aéronef {COMMA16} (limite d'argent)
+STR_TRAIN_AUTORENEW_FAILED                                      :{WHITE}Le renouvellement automatique a échoué sur Train {COMMA} (limite d'argent)
+STR_ROADVEHICLE_AUTORENEW_FAILED                                :{WHITE}Le renouvellement automatique a échoué sur  Véhicule {COMMA} (limite d'argent)
+STR_SHIP_AUTORENEW_FAILED                                       :{WHITE}Le renouvellement automatique a échoué sur Navire {COMMA} (limite d'argent)
+STR_AIRCRAFT_AUTORENEW_FAILED                                   :{WHITE}Le renouvellement automatique a échoué sur aéronef {COMMA} (limite d'argent)
 
 STR_CONFIG_PATCHES                                              :{BLACK}Options Avancées
 STR_CONFIG_PATCHES_TIP                                          :{BLACK}Configurer les options avancées
@@ -1104,7 +1104,7 @@
 STR_CHEATS_TIP                                                  :{BLACK}Les cases à cocher indiquent que vous avez déjà utilisé cette triche auparavant
 STR_CHEATS_WARNING                                              :{BLACK}Attention ! Vous êtes sur le point de trahir vos adversaires. Gardez en tête qu'une telle honte sera gardée en mémoire pour l'éternité.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Augmenter l'argent de {CURRENCY64}
-STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Jouer en tant que joueur n°: {ORANGE}{COMMA16}
+STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Jouer en tant que joueur n°: {ORANGE}{COMMA}
 STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Bulldozer magique (enlèvement industries et objets fixes): {ORANGE}{STRING}
 STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Les tunnels peuvent se croiser: {ORANGE}{STRING}
 STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Construire pendant le mode pause: {ORANGE}{STRING}
@@ -1120,7 +1120,7 @@
 STR_GO_NON_STOP_TO_WAYPOINT                                     :Aller sans-arrêt via {WAYPOINT}
 
 STR_WAYPOINTNAME_CITY                                           :Point de contrôle {TOWN}
-STR_WAYPOINTNAME_CITY_SERIAL                                    :Point de contrôle {TOWN} #{COMMA16}
+STR_WAYPOINTNAME_CITY_SERIAL                                    :Point de contrôle {TOWN} #{COMMA}
 STR_LANDINFO_WAYPOINT                                           :Point de contrôle
 
 STR_WAYPOINT                                                    :{WHITE}Point de passage
@@ -1203,8 +1203,8 @@
 STR_CONSTRUCT_SUGAR_MINE_TIP                                    :{BLACK}Construire une mine de sucre
 
 STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Industries
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}){YELLOW} ({COMMA16}% transporté)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}/{STRING}){YELLOW} ({COMMA16}%/{COMMA16}% transporté)
+STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}){YELLOW} ({COMMA}% transporté)
+STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}/{STRING}){YELLOW} ({COMMA}%/{COMMA}% transporté)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{TOWN} {STRING}
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...trop proche d'une autre industrie
@@ -1244,15 +1244,15 @@
 STR_NETWORK_ADD_SERVER_TIP                                      :{BLACK}Ajouter à la liste un serveur où le jeu cherchera toujours des parties en cours.
 STR_NETWORK_ENTER_IP                                            :{BLACK}Entrez l'adresse IP du serveur
 
-STR_NETWORK_CLIENTS_ONLINE                                      :{BLACK}{COMMA16}/{COMMA16}
+STR_NETWORK_CLIENTS_ONLINE                                      :{BLACK}{COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Clients
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Clients en ligne / clients max
 STR_NETWORK_GAME_INFO                                           :{SILVER}INFO DE LA PARTIE
 STR_ORANGE                                                      :{ORANGE}{STRING}
-STR_NETWORK_CLIENTS                                             :{SILVER}Clients:  {WHITE}{COMMA8} / {COMMA8}
+STR_NETWORK_CLIENTS                                             :{SILVER}Clients:  {WHITE}{COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}Langue:  {WHITE}{STRING}
 STR_NETWORK_TILESET                                             :{SILVER}Terrain:  {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Taille de la carte :  {WHITE}{COMMA16}x{COMMA16}
+STR_NETWORK_MAP_SIZE                                            :{SILVER}Taille de la carte :  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Version du serveur :  {WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Adresse du serveur :  {WHITE}{STRING} : {NUMU16}
 STR_NETWORK_START_DATE                                          :{SILVER}Date de début :  {WHITE}{DATE_SHORT}
@@ -1517,21 +1517,21 @@
 
 ##id 0x2000
 STR_2000_TOWNS                                                  :{WHITE}Villes
-STR_TOWN_LABEL_POP                                              :{WHITE}{STRING} ({COMMA32})
+STR_TOWN_LABEL_POP                                              :{WHITE}{STRING} ({COMMA})
 STR_2001                                                        :{WHITE}{STRING}
 STR_2002                                                        :{TINYFONT}{BLACK}{STRING}
 STR_2003                                                        :{TINYFONT}{WHITE}{STRING}
 STR_2004_BUILDING_MUST_BE_DEMOLISHED                            :{WHITE}L'édifice doit d'abord être démolit
 STR_2005                                                        :{WHITE}{TOWN}
-STR_2006_POPULATION                                             :{BLACK}Population: {ORANGE}{COMMA32}{BLACK}  Maisons: {ORANGE}{COMMA32}
+STR_2006_POPULATION                                             :{BLACK}Population: {ORANGE}{COMMA}{BLACK}  Maisons: {ORANGE}{COMMA}
 STR_2007_RENAME_TOWN                                            :Renommer Ville
 STR_2008_CAN_T_RENAME_TOWN                                      :{WHITE}Impossible de renommer la ville...
 STR_2009_LOCAL_AUTHORITY_REFUSES                                :{WHITE}La municipalité de {TOWN} refuse cette opération
 STR_200A_TOWN_NAMES_CLICK_ON_NAME                               :{BLACK}Noms des villes - Cliquez sur un nom pour défiler à l'emplacement
 STR_200B_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Centrer la vue sur la ville
 STR_200C_CHANGE_TOWN_NAME                                       :{BLACK}Renommer la ville
-STR_200D_PASSENGERS_LAST_MONTH_MAX                              :{BLACK}Passagers le mois dernier : {ORANGE}{COMMA32}{BLACK}  max: {ORANGE}{COMMA32}
-STR_200E_MAIL_LAST_MONTH_MAX                                    :{BLACK}Courrier le mois dernier : {ORANGE}{COMMA32}{BLACK}  max: {ORANGE}{COMMA32}
+STR_200D_PASSENGERS_LAST_MONTH_MAX                              :{BLACK}Passagers le mois dernier : {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
+STR_200E_MAIL_LAST_MONTH_MAX                                    :{BLACK}Courrier le mois dernier : {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
 STR_200F_TALL_OFFICE_BLOCK                                      :Grand immeuble de bureaux
 STR_2010_OFFICE_BLOCK                                           :Immeuble de bureaux
 STR_2011_SMALL_BLOCK_OF_FLATS                                   :Petit immeuble résidentiel
@@ -1605,7 +1605,7 @@
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Corrompre la municipalité pour améliorer votre réputation. Risque de pénalisation si le pot-de-vin est dévoilé.{}  Coût: {CURRENCY}
 STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Problèmes de traffic à {TOWN}!{}{}La reconstruction des routes financée par {STRING} provoque 6 mois de problèmes aux automobilistes!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
-STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA32})
+STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA})
 STR_2058_UNDER_CONSTRUCTION                                     :{STRING} (en contruction)
 STR_2059_IGLOO                                                  :Iglou
 STR_205A_TEPEES                                                 :Tipis
@@ -1667,7 +1667,7 @@
 STR_303C_OUTSTANDING                                            :Exceptionnel
 ############ range for rating ends
 
-STR_303D                                                        :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA8}%)
+STR_303D                                                        :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_303E_NO_LONGER_ACCEPTS                                      :{WHITE}{STATION} n'accepte plus: {STRING}
 STR_303F_NO_LONGER_ACCEPTS_OR                                   :{WHITE}{STATION} n'accepte plus: {STRING} ou {STRING}
 STR_3040_NOW_ACCEPTS                                            :{WHITE}{STATION} accepte désormais: {STRING}
@@ -1678,7 +1678,7 @@
 STR_3045_TOO_CLOSE_TO_ANOTHER_TRUCK                             :{WHITE}Trop près d'une autre gare
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Détruisez d'abord l'arrêt d'autobus
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Détruisez d'abord la station
-STR_3048_STATIONS                                               :{WHITE}{STRING} - {COMMA16} Stations
+STR_3048_STATIONS                                               :{WHITE}{STRING} - {COMMA} Stations
 STR_3049_0                                                      :{YELLOW}{STATION} {STRINL 0x30D1}
 STR_304A_NONE                                                   :{YELLOW}- Aucun -
 STR_304B_SITE_UNSUITABLE                                        :{WHITE}...l'endroit ne convient pas
@@ -1735,7 +1735,7 @@
 STR_4002_SAVE                                                   :{BLACK}Sauvegarder
 STR_4003_DELETE                                                 :{BLACK}Supprimer
 STR_4004                                                        :{STRING}, {DATE_LONG}
-STR_4005_BYTES_FREE                                             :{BLACK}{COMMA32} Mo libres
+STR_4005_BYTES_FREE                                             :{BLACK}{COMMA} Mo libres
 STR_4006_UNABLE_TO_READ_DRIVE                                   :{BLACK}Impossible d'accéder au disque
 STR_4007_GAME_SAVE_FAILED                                       :{WHITE}La sauvegarde à échoué
 STR_4008_UNABLE_TO_DELETE_FILE                                  :{WHITE}Impossible de supprimer le fichier
@@ -1796,7 +1796,7 @@
 ############ range for requires	ends
 
 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Production le mois dernier:
-STR_482B_TRANSPORTED                                            :{YELLOW}{STRING}{BLACK} ({COMMA16}% transporté)
+STR_482B_TRANSPORTED                                            :{YELLOW}{STRING}{BLACK} ({COMMA}% transporté)
 STR_482C_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Centrer la vue sur l'industrie
 STR_482D_NEW_UNDER_CONSTRUCTION                                 :{BLACK}{BIGFONT}Un(e) nouveau(elle) {STRING} en construction près de {TOWN}!
 STR_482E_NEW_BEING_PLANTED_NEAR                                 :{BLACK}{BIGFONT}Un(e) nouveau(elle) {STRING} s'implante près de {TOWN}!
@@ -1813,8 +1813,8 @@
 STR_4839_PRODUCTION_DOWN_BY_50                                  :{BLACK}{BIGFONT}{TOWN} {STRING} : production en baisse de 50%
 STR_483A_INSECT_INFESTATION_CAUSES                              :{BLACK}{BIGFONT}Invasion d'insectes à {TOWN} {STRING}!{}Production en baisse de 50%
 STR_483B_CAN_ONLY_BE_POSITIONED                                 :{WHITE}...positionnement uniquement sur les bords de la carte
-STR_INDUSTRY_PROD_GOUP                                          :{BLACK}{BIGFONT}La production de {STRING} à {TOWN} {STRING} augmente de {COMMA16}%!
-STR_INDUSTRY_PROD_GODOWN                                        :{BLACK}{BIGFONT}La production de {STRING} à {TOWN} {STRING} diminue de {COMMA16}%!
+STR_INDUSTRY_PROD_GOUP                                          :{BLACK}{BIGFONT}La production de {STRING} à {TOWN} {STRING} augmente de {COMMA}%!
+STR_INDUSTRY_PROD_GODOWN                                        :{BLACK}{BIGFONT}La production de {STRING} à {TOWN} {STRING} diminue de {COMMA}%!
 
 ##id 0x5000
 STR_5000_TRAIN_IN_TUNNEL                                        :{WHITE}Train dans le tunnel
@@ -1877,10 +1877,10 @@
 ##id 0x6000
 STR_SV_EMPTY                                                    :
 STR_SV_UNNAMED                                                  :Non nommé{SKIP}
-STR_SV_TRAIN_NAME                                               :Train {COMMA16}
-STR_SV_ROADVEH_NAME                                             :Véhicule {COMMA16}
-STR_SV_SHIP_NAME                                                :Navire {COMMA16}
-STR_SV_AIRCRAFT_NAME                                            :Aéronef {COMMA16}
+STR_SV_TRAIN_NAME                                               :Train {COMMA}
+STR_SV_ROADVEH_NAME                                             :Véhicule {COMMA}
+STR_SV_SHIP_NAME                                                :Navire {COMMA}
+STR_SV_AIRCRAFT_NAME                                            :Aéronef {COMMA}
 
 STR_SV_STNAME                                                   :{STRING}
 STR_SV_STNAME_NORTH                                             :{STRING} Nord
@@ -1930,12 +1930,12 @@
 ############ range for difficulty levels ends
 
 ############ range for difficulty settings starts
-STR_6805_MAXIMUM_NO_COMPETITORS                                 :{LTBLUE}Nombre maximum de compétiteurs: {ORANGE}{COMMA16}
+STR_6805_MAXIMUM_NO_COMPETITORS                                 :{LTBLUE}Nombre maximum de compétiteurs: {ORANGE}{COMMA}
 STR_6806_COMPETITOR_START_TIME                                  :{LTBLUE}Arrivée des compétiteurs: {ORANGE}{STRING}
 STR_6807_NO_OF_TOWNS                                            :{LTBLUE}Nombre de villes: {ORANGE}{STRING}
 STR_6808_NO_OF_INDUSTRIES                                       :{LTBLUE}Nombre d'industries: {ORANGE}{STRING}
 STR_6809_MAXIMUM_INITIAL_LOAN_000                               :{LTBLUE}Prêt initial maximum: {ORANGE}{CURRENCY}
-STR_680A_INITIAL_INTEREST_RATE                                  :{LTBLUE}Taux d'interêt initial: {ORANGE}{COMMA16}%
+STR_680A_INITIAL_INTEREST_RATE                                  :{LTBLUE}Taux d'interêt initial: {ORANGE}{COMMA}%
 STR_680B_VEHICLE_RUNNING_COSTS                                  :{LTBLUE}Coûts d'entretien: {ORANGE}{STRING}
 STR_680C_CONSTRUCTION_SPEED_OF_COMPETITOR                       :{LTBLUE}Vitesse de développement des compétiteurs: {ORANGE}{STRING}
 STR_680D_INTELLIGENCE_OF_COMPETITORS                            :{LTBLUE}Intelligence des compétiteurs: {ORANGE}{STRING}
@@ -1994,7 +1994,7 @@
 ##id 0x7000
 STR_7000                                                        :
 STR_7001                                                        :{WHITE}{STRING} {BLACK}{STRING}
-STR_7002_PLAYER                                                 :(Joueur {COMMA16})
+STR_7002_PLAYER                                                 :(Joueur {COMMA})
 STR_7004_NEW_FACE                                               :{BLACK}Nouveau visage
 STR_7005_COLOR_SCHEME                                           :{BLACK}Couleur
 STR_7006_COLOR_SCHEME                                           :{GOLD}Couleur:
@@ -2028,7 +2028,7 @@
 STR_7022_INCOME_GRAPH                                           :{WHITE}Graphique du Revenu
 STR_CURRCOMPACT32                                               :{CURRCOMPACT}
 STR_CURRCOMPACT64                                               :{CURRCOMPACT64}
-STR_7024                                                        :{COMMA32}
+STR_7024                                                        :{COMMA}
 STR_7025_OPERATING_PROFIT_GRAPH                                 :{WHITE}Graphique du profit d'opération
 STR_7026_BANK_BALANCE                                           :{WHITE}Equilibre bancaire
 STR_7027_LOAN                                                   :{WHITE}Prêt
@@ -2052,14 +2052,14 @@
 STR_7037_PRESIDENT                                              :{WHITE}{STRING}{}{GOLD}(President)
 STR_7038_INAUGURATED                                            :{GOLD}Inauguré en: {WHITE}{NUMU16}
 STR_7039_VEHICLES                                               :{GOLD}Véhicules:
-STR_703A_TRAIN                                                  :{WHITE}{COMMA16} train
-STR_703B_TRAINS                                                 :{WHITE}{COMMA16} trains
-STR_703C_ROAD_VEHICLE                                           :{WHITE}{COMMA16} véhicule
-STR_703D_ROAD_VEHICLES                                          :{WHITE}{COMMA16} véhicules
-STR_703E_AIRCRAFT                                               :{WHITE}{COMMA16} aéronef
-STR_703F_AIRCRAFT                                               :{WHITE}{COMMA16} aéronefs
-STR_7040_SHIP                                                   :{WHITE}{COMMA16} navire
-STR_7041_SHIPS                                                  :{WHITE}{COMMA16} navires
+STR_703A_TRAIN                                                  :{WHITE}{COMMA} train
+STR_703B_TRAINS                                                 :{WHITE}{COMMA} trains
+STR_703C_ROAD_VEHICLE                                           :{WHITE}{COMMA} véhicule
+STR_703D_ROAD_VEHICLES                                          :{WHITE}{COMMA} véhicules
+STR_703E_AIRCRAFT                                               :{WHITE}{COMMA} aéronef
+STR_703F_AIRCRAFT                                               :{WHITE}{COMMA} aéronefs
+STR_7040_SHIP                                                   :{WHITE}{COMMA} navire
+STR_7041_SHIPS                                                  :{WHITE}{COMMA} navires
 STR_7042_NONE                                                   :{WHITE}Aucun
 STR_7043_FACE_SELECTION                                         :{WHITE}Sélection du visage
 STR_7044_MALE                                                   :{BLACK}Homme
@@ -2124,8 +2124,8 @@
 STR_707A_SELL_25_SHARE_IN_THIS_COMPANY                          :{BLACK}Vendre 25% de la compagnie
 STR_707B_CAN_T_BUY_25_SHARE_IN_THIS                             :{WHITE}Impossible d'acheter des parts...
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}Impossible de vendre des parts...
-STR_707D_OWNED_BY                                               :{WHITE}({COMMA16}% détenus par {STRING})
-STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA16}% détenus par {STRING}{}   {COMMA16}% détenus par {STRING})
+STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% détenus par {STRING})
+STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}% détenus par {STRING}{}   {COMMA}% détenus par {STRING})
 STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{STRING} a été rachetée par {STRING}!
 STR_7080_PROTECTED                                              :{WHITE}Cette compagnie ne vend pas d'actions pour le moment...
 
@@ -2400,8 +2400,8 @@
 STR_8801_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Les habitants célèbrent . . .{}Arrivée du premier train à {STATION}!
 STR_8802_DETAILS                                                :{WHITE}{STRING} (Détails)
 STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}Train présent
-STR_8804                                                        :{SETX 10}{COMMA8}: {STRING}
-STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA8}: {STRING}
+STR_8804                                                        :{SETX 10}{COMMA}: {STRING}
+STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING}
 STR_8806_GO_TO                                                  :Aller à {STATION}
 STR_8807_GO_TO_TRANSFER                                         :Aller à {STATION} (Transférer et charger)
 STR_8808_GO_TO_UNLOAD                                           :Aller à {STATION} (Décharger)
@@ -2427,13 +2427,13 @@
 STR_UNKNOWN_DESTINATION                                         :destination inconnue
 STR_8812_EMPTY                                                  :{LTBLUE}Vide
 STR_8813_FROM                                                   :{LTBLUE}{CARGO} de {STATION}
-STR_8814_TRAIN_IS_WAITING_IN_DEPOT                              :{WHITE}Le train {COMMA16} est en attente au dépôt
+STR_8814_TRAIN_IS_WAITING_IN_DEPOT                              :{WHITE}Le train {COMMA} est en attente au dépôt
 STR_8815_NEW_VEHICLES                                           :{BLACK}Nouveaux véhicules
 STR_8816                                                        :{BLACK}-
 STR_8818_INFORMATION                                            :{BLACK}Information
 STR_8819_TRAIN_TOO_LONG                                         :{WHITE}Train trop long
 STR_881A_TRAINS_CAN_ONLY_BE_ALTERED                             :{WHITE}Les trains peuvent être manipulés qu'une fois stoppés au dépôt
-STR_881B_TRAINS                                                 :{WHITE}{STRING} - {COMMA16} Trains
+STR_881B_TRAINS                                                 :{WHITE}{STRING} - {COMMA} Trains
 STR_881C_NEW_RAIL_VEHICLES                                      :{WHITE}Nouveaux véhicules ferroviaires
 STR_881D_NEW_MONORAIL_VEHICLES                                  :{WHITE}Nouveaux véhicules monorail
 STR_881E_NEW_MAGLEV_VEHICLES                                    :{WHITE}Nouveaux véhicules magnétiques
@@ -2467,8 +2467,8 @@
 STR_8839_CAN_T_SELL_RAILROAD_VEHICLE                            :{WHITE}Impossible de vendre le véhicule ferroviaire...
 STR_883A_UNABLE_TO_FIND_ROUTE_TO                                :{WHITE}Impossible de trouver la route jusqu'au dépôt
 STR_883B_CAN_T_STOP_START_TRAIN                                 :{WHITE}Impossible de démarrer/stopper le train...
-STR_883C_SERVICING_INTERVAL_DAYS                                :{BLACK}Intervalle d'entretien: {LTBLUE}{COMMA16}jours{BLACK}   , dernier le : {LTBLUE}{DATE_LONG}
-STR_SERVICING_INTERVAL_PERCENT                                  :{BLACK}Intervalle d'entretien: {LTBLUE}{COMMA16}%{BLACK}   , dernier le : {LTBLUE}{DATE_LONG}
+STR_883C_SERVICING_INTERVAL_DAYS                                :{BLACK}Intervalle d'entretien: {LTBLUE}{COMMA}jours{BLACK}   , dernier le : {LTBLUE}{DATE_LONG}
+STR_SERVICING_INTERVAL_PERCENT                                  :{BLACK}Intervalle d'entretien: {LTBLUE}{COMMA}%{BLACK}   , dernier le : {LTBLUE}{DATE_LONG}
 STR_883D_TRAINS_CLICK_ON_TRAIN_FOR                              :{BLACK}Trains - Cliquez sur un train pour obtenir des informations
 STR_883E_BUILD_NEW_TRAINS_REQUIRES                              :{BLACK}Contruire de nouveaux trains (nécessite un dépôt ferroviaire)
 STR_883F_TRAINS_CLICK_ON_TRAIN_FOR                              :{BLACK}Trains - Cliquez sur un train pour obtenir des informations, glissez le wagon pour l'ajouter/le supprimer du train
@@ -2501,12 +2501,12 @@
 STR_SERVICE_HINT                                                :{BLACK}Sauter cet ordre tant qu'aucun entretien n'est requis
 STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}Nouveau(elle) {STRING} disponible!
 STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
-STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Prix: {CURRENCY} Poids: {COMMA16}t{}Vitesse: {VELOCITY}  Puissance: {COMMA16}ch{}Coût d'entretien: {CURRENCY}/an{}Capacité: {STRING}
+STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Prix: {CURRENCY} Poids: {COMMA}t{}Vitesse: {VELOCITY}  Puissance: {COMMA}ch{}Coût d'entretien: {CURRENCY}/an{}Capacité: {STRING}
 STR_885C_BROKEN_DOWN                                            :{RED}En panne
 STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Âge: {LTBLUE}{STRING}{BLACK}   Coût d'entretien: {LTBLUE}{CURRENCY}/an
-STR_885E_WEIGHT_T_POWER_HP_MAX_SPEED                            :{BLACK}Poids: {LTBLUE}{COMMA16}t  {BLACK}Puissance: {LTBLUE}{COMMA32}ch{BLACK} Vitesse max.: {LTBLUE}{VELOCITY}
+STR_885E_WEIGHT_T_POWER_HP_MAX_SPEED                            :{BLACK}Poids: {LTBLUE}{COMMA}t  {BLACK}Puissance: {LTBLUE}{COMMA}ch{BLACK} Vitesse max.: {LTBLUE}{VELOCITY}
 STR_885F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Profit cette année: {LTBLUE}{CURRENCY}  (année précédente: {CURRENCY})
-STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Fiabilité: {LTBLUE}{COMMA8}%  {BLACK}Pannes depuis le dernier entretien: {LTBLUE}{COMMA16}
+STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Fiabilité: {LTBLUE}{COMMA}%  {BLACK}Pannes depuis le dernier entretien: {LTBLUE}{COMMA}
 STR_8861_STOPPED                                                :{RED}Stoppé
 STR_8862_CAN_T_MAKE_TRAIN_PASS_SIGNAL                           :{WHITE}Impossible de forcer le train à avancer sous le danger...
 STR_8863_CRASHED                                                :{RED}Crashé!
@@ -2514,7 +2514,7 @@
 STR_8865_NAME_TRAIN                                             :{WHITE}Renommer le train
 STR_8866_CAN_T_NAME_TRAIN                                       :{WHITE}Impossible de renommer le train...
 STR_8867_NAME_TRAIN                                             :{BLACK}Renommer le train
-STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Accident ferroviaire!{}{COMMA16} mort(s) brulé(s) vif(s) dans la collision
+STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Accident ferroviaire!{}{COMMA} mort(s) brulé(s) vif(s) dans la collision
 STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}Impossible de faire faire demi-tour...
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Renommer le type de train
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Impossible de renommer le type de train...
@@ -2526,7 +2526,7 @@
 
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Véhicule Routier présent
-STR_9001_ROAD_VEHICLES                                          :{WHITE}{STRING} - {COMMA16} Véhicules routiers
+STR_9001_ROAD_VEHICLES                                          :{WHITE}{STRING} - {COMMA} Véhicules routiers
 STR_9002                                                        :{WHITE}{STRING}
 STR_9003_ROAD_VEHICLE_DEPOT                                     :{WHITE}Dépôt routier de {TOWN}
 STR_9004_NEW_VEHICLES                                           :{BLACK}Nouveaux Véhicules
@@ -2540,13 +2540,13 @@
 STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Âge: {LTBLUE}{STRING}{BLACK}   Coût d'entretien: {LTBLUE}{CURRENCY}/an
 STR_900E_MAX_SPEED                                              :{BLACK}Vitesse max.: {LTBLUE}{VELOCITY}
 STR_900F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Profit de cette année: {LTBLUE}{CURRENCY}  (année dernière: {CURRENCY})
-STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Fiabilité: {LTBLUE}{COMMA8}%  {BLACK}Pannes depuis le dernier entretien: {LTBLUE}{COMMA16}
+STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Fiabilité: {LTBLUE}{COMMA}%  {BLACK}Pannes depuis le dernier entretien: {LTBLUE}{COMMA}
 STR_9011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Construit en: {LTBLUE}{NUMU16}{BLACK} Valeur: {LTBLUE}{CURRENCY}
 STR_9012_CAPACITY                                               :{BLACK}Capacité: {LTBLUE}{STRING}
 STR_9013_MUST_BE_STOPPED_INSIDE                                 :{WHITE}...doit être à l'arrêt dans un dépôt routier
 STR_9014_CAN_T_SELL_ROAD_VEHICLE                                :{WHITE}Impossible de vendre le véhicule...
 STR_9015_CAN_T_STOP_START_ROAD_VEHICLE                          :{WHITE}Impossible de démarrer/stopper le véhicule...
-STR_9016_ROAD_VEHICLE_IS_WAITING                                :{WHITE}Le véhicule {COMMA16} attend au dépôt
+STR_9016_ROAD_VEHICLE_IS_WAITING                                :{WHITE}Le véhicule {COMMA} attend au dépôt
 STR_HEADING_FOR_ROAD_DEPOT                                      :{LTBLUE}Roule vers le dépôt de {TOWN}
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{LTBLUE}Roule vers le dépôt de {TOWN}, {VELOCITY}
 STR_9018_CAN_T_SEND_VEHICLE_TO_DEPOT                            :{WHITE}Impossible d'envoyer le véhicule au dépôt...
@@ -2575,7 +2575,7 @@
 STR_902F_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Les habitants célèbrent . . .{}Le premier bus arrive à {STATION}!
 STR_9030_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Les habitants célèbrent . . .{}Le premier camion arrive à {STATION}!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Accident routier!{}Un automobiliste meurt brulé vif après collision avec un train
-STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Accident routier!{}{COMMA16} meurent brulés vifs après une collision avec un train
+STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Accident routier!{}{COMMA} meurent brulés vifs après une collision avec un train
 STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}Impossible de faire faire demi-tour au véhicule...
 STR_9034_RENAME                                                 :{BLACK}Renommer
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Renommer type de véhicule routier
@@ -2590,7 +2590,7 @@
 STR_9802_CAN_T_BUILD_DOCK_HERE                                  :{WHITE}Impossible de construire port ici...
 STR_9803_SHIP_DEPOT                                             :{WHITE}{TOWN} Dépôt naval
 STR_9804_NEW_SHIPS                                              :{BLACK}Nouveaux navires
-STR_9805_SHIPS                                                  :{WHITE}{STRING} - {COMMA16} Navires
+STR_9805_SHIPS                                                  :{WHITE}{STRING} - {COMMA} Navires
 STR_9806_CAN_T_BUILD_SHIPS                                      :{WHITE}Impossible de construire navire...
 STR_9807_MUST_BUILD_SHIP_DEPOT_FIRST                            :{WHITE}Doit d'abord construire un dépôt naval
 STR_9808_NEW_SHIPS                                              :{WHITE}Nouveaux navires
@@ -2605,7 +2605,7 @@
 STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Âge: {LTBLUE}{STRING}{BLACK}   Coût d'Opération: {LTBLUE}{CURRENCY}/an
 STR_9813_MAX_SPEED                                              :{BLACK}Vitesse max.: {LTBLUE}{VELOCITY}
 STR_9814_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Profit cette année: {LTBLUE}{CURRENCY}  (l'an dernier: {CURRENCY})
-STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Fiabilité: {LTBLUE}{COMMA8}%  {BLACK}Pannes depuis le dernier entretien: {LTBLUE}{COMMA16}
+STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Fiabilité: {LTBLUE}{COMMA}%  {BLACK}Pannes depuis le dernier entretien: {LTBLUE}{COMMA}
 STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Construit: {LTBLUE}{NUMU16}{BLACK} Valeur: {LTBLUE}{CURRENCY}
 STR_9817_CAPACITY                                               :{BLACK}Capacité: {LTBLUE}{STRING}
 STR_9818_CAN_T_STOP_START_SHIP                                  :{WHITE}Impossible d'arrêter/démarrer le navire...
@@ -2613,7 +2613,7 @@
 STR_981A_UNABLE_TO_FIND_LOCAL_DEPOT                             :{WHITE}Impossible de trouver dépôt local
 STR_HEADING_FOR_SHIP_DEPOT                                      :{LTBLUE}En route pour le dépôt naval de {TOWN}
 STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{LTBLUE}En route pour le dépôt naval de {TOWN}, {VELOCITY}
-STR_981C_SHIP_IS_WAITING_IN_DEPOT                               :{WHITE}Navire {COMMA16} est en attente au dépôt
+STR_981C_SHIP_IS_WAITING_IN_DEPOT                               :{WHITE}Navire {COMMA} est en attente au dépôt
 STR_981D_BUILD_SHIP_DOCK                                        :{BLACK}Construire un port
 STR_981E_BUILD_SHIP_DEPOT_FOR_BUILDING                          :{BLACK}Construire un dépôt naval (pour construire et entretenir les navires)
 STR_981F_SHIPS_CLICK_ON_SHIP_FOR                                :{BLACK}Navires - cliquez sur un navire pour informations
@@ -2664,19 +2664,19 @@
 STR_A005_NEW_AIRCRAFT                                           :{WHITE}Nouvel Aéronef
 STR_A006_BUILD_AIRCRAFT                                         :{BLACK}Construire aéronef
 STR_A008_CAN_T_BUILD_AIRCRAFT                                   :{WHITE}Impossible de construire l'aéronef...
-STR_A009_AIRCRAFT                                               :{WHITE}{STRING} - {COMMA16} Aéronef
+STR_A009_AIRCRAFT                                               :{WHITE}{STRING} - {COMMA} Aéronef
 STR_A00A                                                        :{WHITE}{STRING}
 STR_A00B_ORDERS                                                 :{WHITE}{STRING} (Ordres)
 STR_A00C_DETAILS                                                :{WHITE}{STRING} (Détails)
 STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Âge: {LTBLUE}{STRING}{BLACK}   Coût d'opération: {LTBLUE}{CURRENCY}/an
 STR_A00E_MAX_SPEED                                              :{BLACK}Vitesse max.: {LTBLUE}{VELOCITY}
 STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Profits cette année: {LTBLUE}{CURRENCY} (l'an dernier: {CURRENCY})
-STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Fiabilité: {LTBLUE}{COMMA8}%   {BLACK}Cafouillages depuis le dernier service: {LTBLUE}{COMMA16}
+STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Fiabilité: {LTBLUE}{COMMA}%   {BLACK}Cafouillages depuis le dernier service: {LTBLUE}{COMMA}
 STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Construit: {LTBLUE}{NUMU16}{BLACK} Valeur: {LTBLUE}{CURRENCY}
 STR_A012_CAN_T_SEND_AIRCRAFT_TO                                 :{WHITE}Impossible d'envoyer l'aéronef au hangar...
 STR_HEADING_FOR_HANGAR                                          :{LTBLUE}En route pour le hangar de {STATION}
 STR_HEADING_FOR_HANGAR_VEL                                      :{LTBLUE}En route pour le hangar de {STATION}, {VELOCITY}
-STR_A014_AIRCRAFT_IS_WAITING_IN                                 :{WHITE}Aéronef {COMMA16} est en attente au hangar
+STR_A014_AIRCRAFT_IS_WAITING_IN                                 :{WHITE}Aéronef {COMMA} est en attente au hangar
 STR_A015_AIRCRAFT_IN_THE_WAY                                    :{WHITE}Aéronef présent
 STR_A016_CAN_T_STOP_START_AIRCRAFT                              :{WHITE}Impossible d'arrêter/démarrer aéronef...
 STR_A017_AIRCRAFT_IS_IN_FLIGHT                                  :{WHITE}L'aéronef est en vol
@@ -2702,14 +2702,14 @@
 STR_A02B_SHOW_AIRCRAFT_DETAILS                                  :{BLACK}Afficher détails de l'aéronef
 STR_A02C_NEW_AIRCRAFT_NOW_AVAILABLE                             :{BLACK}{BIGFONT}Nouvel aéronef maintenant disponible!
 STR_A02D                                                        :{BLACK}{BIGFONT}{STRING}
-STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Coût: {CURRENCY}    Vitesse max.: {VELOCITY}{}Capacité: {COMMA16} passagers, {COMMA16} sacs de courrier{}Coût d'opération: {CURRENCY}/an
+STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Coût: {CURRENCY}    Vitesse max.: {VELOCITY}{}Capacité: {COMMA} passagers, {COMMA} sacs de courrier{}Coût d'opération: {CURRENCY}/an
 
 STR_A030_NAME_AIRCRAFT                                          :{WHITE}Nommer l'aéronef
 STR_A031_CAN_T_NAME_AIRCRAFT                                    :{WHITE}Impossible de nommer l'aéronef...
 STR_A032_NAME_AIRCRAFT                                          :{BLACK}Nommer l'aéronef
 STR_A033_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Les habitants célèbrent . . .{}Arrivée du premier aéronef à {STATION}!
-STR_A034_PLANE_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Écrasement d'un aéronef!{}{COMMA16} meurent brulés vifs à {STATION}
-STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Crash d'aéronef !{}L'aéronef n'avait plus de carburant, {COMMA16} meurent de manière horrible !
+STR_A034_PLANE_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Écrasement d'un aéronef!{}{COMMA} meurent brulés vifs à {STATION}
+STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Crash d'aéronef !{}L'aéronef n'avait plus de carburant, {COMMA} meurent de manière horrible !
 STR_A035_DESTINATIONS                                           :{TINYFONT}{BLACK}Destinations:
 STR_A036                                                        :{TINYFONT}{BLACK}{STATION}
 STR_A037_RENAME                                                 :{BLACK}Renommer
@@ -2735,7 +2735,7 @@
 STR_B003_FACTORY_DESTROYED_IN_SUSPICIOUS                        :{BLACK}{BIGFONT}Usine détruite dans des circonstances suspectes près de {TOWN}!
 STR_B004_UFO_LANDS_NEAR                                         :{BLACK}{BIGFONT}Un 'OVNI' attérit près de {TOWN}!
 STR_B005_COAL_MINE_SUBSIDENCE_LEAVES                            :{BLACK}{BIGFONT}Affaissement d'une veine de charbon entraîne la desctruction de la mine de {TOWN}!
-STR_B006_FLOOD_VEHICLE_DESTROYED                                :{BLACK}{BIGFONT}Inondations!{}Au moins {COMMA16} présumés manquants ou morts après des inondations meurtrières!
+STR_B006_FLOOD_VEHICLE_DESTROYED                                :{BLACK}{BIGFONT}Inondations!{}Au moins {COMMA} présumés manquants ou morts après des inondations meurtrières!
 
 STR_BRIBE_FAILED                                                :{WHITE}Votre tentative de corruption à été
 STR_BRIBE_FAILED_2                                              :{WHITE}révélée à la presse par un journaliste régional.
@@ -2745,7 +2745,7 @@
 STR_PERFORMANCE_DETAIL                                          :{WHITE}Détail de l'évaluation de la performance
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Détail
 STR_PERFORMANCE_DETAIL_AMOUNT_CURRENCY                          :{BLACK}({CURRCOMPACT}/{CURRCOMPACT})
-STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA32}/{COMMA32})
+STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA}/{COMMA})
 STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{INT32}%
 SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{INT32}
 ############ Those following lines need to be in this order!!
@@ -2780,7 +2780,7 @@
 STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID:
 
 STR_CURRENCY_WINDOW                                             :{WHITE}Devise personnalisée
-STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Taux de change : {ORANGE}{CURRENCY} = {POUNDSIGN} {COMMA16}
+STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Taux de change : {ORANGE}{CURRENCY} = {POUNDSIGN} {COMMA}
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Separateur :
 STR_CURRENCY_PREFIX                                             :{LTBLUE}Préfixe :
 STR_CURRENCY_SUFFIX                                             :{LTBLUE}Suffixe :
@@ -2794,10 +2794,10 @@
 STR_PLANE                                                       :{BLACK}{PLANE}
 STR_SHIP                                                        :{BLACK}{SHIP}
 
-STR_SCHEDULED_TRAINS                                            :{WHITE}{STATION} - {COMMA16} Trains
-STR_SCHEDULED_ROAD_VEHICLES                                     :{WHITE}{STATION} - {COMMA16} Véhicules routiers
-STR_SCHEDULED_AIRCRAFT                                          :{WHITE}{STATION} - {COMMA16} Aéronefs
-STR_SCHEDULED_SHIPS                                             :{WHITE}{STATION} - {COMMA16} Navires
+STR_SCHEDULED_TRAINS                                            :{WHITE}{STATION} - {COMMA} Trains
+STR_SCHEDULED_ROAD_VEHICLES                                     :{WHITE}{STATION} - {COMMA} Véhicules routiers
+STR_SCHEDULED_AIRCRAFT                                          :{WHITE}{STATION} - {COMMA} Aéronefs
+STR_SCHEDULED_SHIPS                                             :{WHITE}{STATION} - {COMMA} Navires
 
 STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Montre tous les trains qui ont cette station dans leur itinéraire
 STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Montre tous les véhicules routiers qui ont cette station dans leur itinéraire
@@ -2819,7 +2819,7 @@
 STR_REPLACE_HELP                                                :{BLACK}Cette caractéristique permet de choisir un type de locomotive et de le remplacer par un autre. Ceci sera fait automatiquement  quand le véhicule rentre dans un dépôt
 
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
-STR_SIGN_LIST_CAPTION                                           :{WHITE}Liste des panneaux - {COMMA16} panneaux
+STR_SIGN_LIST_CAPTION                                           :{WHITE}Liste des panneaux - {COMMA} panneaux
 
 ############ Lists rail types
 
@@ -2829,16 +2829,16 @@
 
 ############ End of list of rail types
 
-STR_TINY_BLACK                                                  :{BLACK}{TINYFONT}{COMMA16}
+STR_TINY_BLACK                                                  :{BLACK}{TINYFONT}{COMMA}
 
-STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Prix: {GOLD}{CURRENCY}{BLACK} Poids: {GOLD}{COMMA16}t
-STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Vitesse: {GOLD}{VELOCITY}{BLACK}   Puissance: {GOLD}{COMMA32}hp
+STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Prix: {GOLD}{CURRENCY}{BLACK} Poids: {GOLD}{COMMA}t
+STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Vitesse: {GOLD}{VELOCITY}{BLACK}   Puissance: {GOLD}{COMMA}hp
 STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}Coûts d'entretien: {GOLD}{CURRENCY}/an
 STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Capacité: {GOLD}{STRING} {STRING}
-STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Concu en: {GOLD}{NUMU16}{BLACK}Durée de vie: {GOLD}{COMMA16} ans
-STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Fiabilité Max.: {GOLD}{COMMA8}%
+STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Concu en: {GOLD}{NUMU16}{BLACK}Durée de vie: {GOLD}{COMMA} ans
+STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Fiabilité Max.: {GOLD}{COMMA}%
 STR_PURCHASE_INFO_COST                                          :{BLACK}Prix: {GOLD}{CURRENCY}
-STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Poids: {GOLD}{COMMA16}t  ({COMMA16}t)
+STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Poids: {GOLD}{COMMA}t  ({COMMA}t)
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Prix: {GOLD}{CURRENCY}{BLACK} Vitesse: {GOLD}{VELOCITY}
-STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Capacité: {GOLD}{COMMA16} passagers, {COMMA16} sacs de courrier
-STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Wagons Motorisés: {GOLD}+{COMMA16}hp{BLACK} Poids: {GOLD}+{COMMA8}t
+STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Capacité: {GOLD}{COMMA} passagers, {COMMA} sacs de courrier
+STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Wagons Motorisés: {GOLD}+{COMMA}hp{BLACK} Poids: {GOLD}+{COMMA}t
--- a/lang/galician.txt	Thu Jul 14 09:53:52 2005 +0000
+++ b/lang/galician.txt	Thu Jul 14 15:10:20 2005 +0000
@@ -82,69 +82,69 @@
 STR_004C_PLASTIC                                                :Plástico
 STR_004D_FIZZY_DRINK                                            :Bebida Gaseosa
 STR_004E                                                        :
-STR_004F_PASSENGER                                              :{COMMA16} pasaxeiro
-STR_0050_TON_OF_COAL                                            :{COMMA16} ton. de carbón
-STR_0051_BAG_OF_MAIL                                            :{COMMA16} saco de correo
+STR_004F_PASSENGER                                              :{COMMA} pasaxeiro
+STR_0050_TON_OF_COAL                                            :{COMMA} ton. de carbón
+STR_0051_BAG_OF_MAIL                                            :{COMMA} saco de correo
 STR_0052_OF_OIL                                                 :{VOLUME} de petróleo
-STR_0053_ITEM_OF_LIVESTOCK                                      :{COMMA16} item de gando
-STR_0054_CRATE_OF_GOODS                                         :{COMMA16} caixón de mercadorías
-STR_0055_TON_OF_GRAIN                                           :{COMMA16} ton. de gran
-STR_0056_TON_OF_WOOD                                            :{COMMA16} ton. de madeira
-STR_0057_TON_OF_IRON_ORE                                        :{COMMA16} ton. de hematita
-STR_0058_TON_OF_STEEL                                           :{COMMA16} ton. de aceiro
-STR_0059_BAG_OF_VALUABLES                                       :{COMMA16} saco de valores
-STR_005A_TON_OF_COPPER_ORE                                      :{COMMA16} ton. de mineral de cobre
-STR_005B_TON_OF_MAIZE                                           :{COMMA16} ton. de millo
-STR_005C_TON_OF_FRUIT                                           :{COMMA16} ton. de froita
-STR_005D_BAG_OF_DIAMONDS                                        :{COMMA16} saco de diamantes
-STR_005E_TON_OF_FOOD                                            :{COMMA16} ton. de comida
-STR_005F_TON_OF_PAPER                                           :{COMMA16} ton. de papel
-STR_0060_BAG_OF_GOLD                                            :{COMMA16} saco de ouro
+STR_0053_ITEM_OF_LIVESTOCK                                      :{COMMA} item de gando
+STR_0054_CRATE_OF_GOODS                                         :{COMMA} caixón de mercadorías
+STR_0055_TON_OF_GRAIN                                           :{COMMA} ton. de gran
+STR_0056_TON_OF_WOOD                                            :{COMMA} ton. de madeira
+STR_0057_TON_OF_IRON_ORE                                        :{COMMA} ton. de hematita
+STR_0058_TON_OF_STEEL                                           :{COMMA} ton. de aceiro
+STR_0059_BAG_OF_VALUABLES                                       :{COMMA} saco de valores
+STR_005A_TON_OF_COPPER_ORE                                      :{COMMA} ton. de mineral de cobre
+STR_005B_TON_OF_MAIZE                                           :{COMMA} ton. de millo
+STR_005C_TON_OF_FRUIT                                           :{COMMA} ton. de froita
+STR_005D_BAG_OF_DIAMONDS                                        :{COMMA} saco de diamantes
+STR_005E_TON_OF_FOOD                                            :{COMMA} ton. de comida
+STR_005F_TON_OF_PAPER                                           :{COMMA} ton. de papel
+STR_0060_BAG_OF_GOLD                                            :{COMMA} saco de ouro
 STR_0061_OF_WATER                                               :{VOLUME} de auga
-STR_0062_TON_OF_WHEAT                                           :{COMMA16} ton. de trigo
+STR_0062_TON_OF_WHEAT                                           :{COMMA} ton. de trigo
 STR_0063_OF_RUBBER                                              :{VOLUME} de caucho
-STR_0064_TON_OF_SUGAR                                           :{COMMA16} ton. de azucre
-STR_0065_TOY                                                    :{COMMA16} xoguete
-STR_0066_BAG_OF_CANDY                                           :{COMMA16} saco de caramelo
+STR_0064_TON_OF_SUGAR                                           :{COMMA} ton. de azucre
+STR_0065_TOY                                                    :{COMMA} xoguete
+STR_0066_BAG_OF_CANDY                                           :{COMMA} saco de caramelo
 STR_0067_OF_COLA                                                :{VOLUME} de cola
-STR_0068_TON_OF_COTTON_CANDY                                    :{COMMA16} ton. de algodón de azucre
-STR_0069_BUBBLE                                                 :{COMMA16} burbulla
-STR_006A_TON_OF_TOFFEE                                          :{COMMA16} ton. de toffee
-STR_006B_BATTERY                                                :{COMMA16} batería
+STR_0068_TON_OF_COTTON_CANDY                                    :{COMMA} ton. de algodón de azucre
+STR_0069_BUBBLE                                                 :{COMMA} burbulla
+STR_006A_TON_OF_TOFFEE                                          :{COMMA} ton. de toffee
+STR_006B_BATTERY                                                :{COMMA} batería
 STR_006C_OF_PLASTIC                                             :{VOLUME} de plástico
-STR_006D_FIZZY_DRINK                                            :{COMMA16} bebida gaseosa
+STR_006D_FIZZY_DRINK                                            :{COMMA} bebida gaseosa
 STR_006E                                                        :
-STR_006F_PASSENGERS                                             :{COMMA16} pasaxeiros
-STR_0070_TONS_OF_COAL                                           :{COMMA16} tons. de carbón
-STR_0071_BAGS_OF_MAIL                                           :{COMMA16} sacos de correo
+STR_006F_PASSENGERS                                             :{COMMA} pasaxeiros
+STR_0070_TONS_OF_COAL                                           :{COMMA} tons. de carbón
+STR_0071_BAGS_OF_MAIL                                           :{COMMA} sacos de correo
 STR_0072_OF_OIL                                                 :{VOLUME} de petróleo
-STR_0073_ITEMS_OF_LIVESTOCK                                     :{COMMA16} items de gando
-STR_0074_CRATES_OF_GOODS                                        :{COMMA16} caixóns de mercadorías
-STR_0075_TONS_OF_GRAIN                                          :{COMMA16} tons. de gran
-STR_0076_TONS_OF_WOOD                                           :{COMMA16} tons. de madeira
-STR_0077_TONS_OF_IRON_ORE                                       :{COMMA16} tons. de hematita
-STR_0078_TONS_OF_STEEL                                          :{COMMA16} tons. de aceiro
-STR_0079_BAGS_OF_VALUABLES                                      :{COMMA16} sacos de valores
-STR_007A_TONS_OF_COPPER_ORE                                     :{COMMA16} tons. de mineral de cobre
-STR_007B_TONS_OF_MAIZE                                          :{COMMA16} tons. de millo
-STR_007C_TONS_OF_FRUIT                                          :{COMMA16} tons. de froita
-STR_007D_BAGS_OF_DIAMONDS                                       :{COMMA16} sacos de diamantes
-STR_007E_TONS_OF_FOOD                                           :{COMMA16} tons. de comida
-STR_007F_TONS_OF_PAPER                                          :{COMMA16} tons. de papel
-STR_0080_BAGS_OF_GOLD                                           :{COMMA16} sacos de ouro
+STR_0073_ITEMS_OF_LIVESTOCK                                     :{COMMA} items de gando
+STR_0074_CRATES_OF_GOODS                                        :{COMMA} caixóns de mercadorías
+STR_0075_TONS_OF_GRAIN                                          :{COMMA} tons. de gran
+STR_0076_TONS_OF_WOOD                                           :{COMMA} tons. de madeira
+STR_0077_TONS_OF_IRON_ORE                                       :{COMMA} tons. de hematita
+STR_0078_TONS_OF_STEEL                                          :{COMMA} tons. de aceiro
+STR_0079_BAGS_OF_VALUABLES                                      :{COMMA} sacos de valores
+STR_007A_TONS_OF_COPPER_ORE                                     :{COMMA} tons. de mineral de cobre
+STR_007B_TONS_OF_MAIZE                                          :{COMMA} tons. de millo
+STR_007C_TONS_OF_FRUIT                                          :{COMMA} tons. de froita
+STR_007D_BAGS_OF_DIAMONDS                                       :{COMMA} sacos de diamantes
+STR_007E_TONS_OF_FOOD                                           :{COMMA} tons. de comida
+STR_007F_TONS_OF_PAPER                                          :{COMMA} tons. de papel
+STR_0080_BAGS_OF_GOLD                                           :{COMMA} sacos de ouro
 STR_0081_OF_WATER                                               :{VOLUME} de auga
-STR_0082_TONS_OF_WHEAT                                          :{COMMA16} tons. de trigo
+STR_0082_TONS_OF_WHEAT                                          :{COMMA} tons. de trigo
 STR_0083_OF_RUBBER                                              :{VOLUME} de caucho
-STR_0084_TONS_OF_SUGAR                                          :{COMMA16} tons. de azucre
-STR_0085_TOYS                                                   :{COMMA16} xoguetes
-STR_0086_BAGS_OF_CANDY                                          :{COMMA16} sacos de caramelo
+STR_0084_TONS_OF_SUGAR                                          :{COMMA} tons. de azucre
+STR_0085_TOYS                                                   :{COMMA} xoguetes
+STR_0086_BAGS_OF_CANDY                                          :{COMMA} sacos de caramelo
 STR_0087_OF_COLA                                                :{VOLUME} de cola
-STR_0088_TONS_OF_COTTON_CANDY                                   :{COMMA16} tons. de algodón de azucre
-STR_0089_BUBBLES                                                :{COMMA16} burbullas
-STR_008A_TONS_OF_TOFFEE                                         :{COMMA16} tons. de toffee
-STR_008B_BATTERIES                                              :{COMMA16} baterías
+STR_0088_TONS_OF_COTTON_CANDY                                   :{COMMA} tons. de algodón de azucre
+STR_0089_BUBBLES                                                :{COMMA} burbullas
+STR_008A_TONS_OF_TOFFEE                                         :{COMMA} tons. de toffee
+STR_008B_BATTERIES                                              :{COMMA} baterías
 STR_008C_OF_PLASTIC                                             :{VOLUME} de plástico
-STR_008D_FIZZY_DRINKS                                           :{COMMA16} bebidas gaseosas
+STR_008D_FIZZY_DRINKS                                           :{COMMA} bebidas gaseosas
 STR_008E                                                        :
 STR_008F_PS                                                     :{TINYFONT}PS
 STR_0090_CL                                                     :{TINYFONT}CL
@@ -219,8 +219,8 @@
 STR_00DF_GREY                                                   :Gris
 STR_00E0_WHITE                                                  :Branco
 STR_00E1_TOO_MANY_VEHICLES_IN_GAME                              :{WHITE}Hay demasiados vehículos na partida
-STR_00E2                                                        :{BLACK}{COMMA16}
-STR_00E3                                                        :{RED}{COMMA16}
+STR_00E2                                                        :{BLACK}{COMMA}
+STR_00E3                                                        :{RED}{COMMA}
 STR_00E4_LOCATION                                               :{BLACK}Situación
 STR_00E5_CONTOURS                                               :Contorno
 STR_00E6_VEHICLES                                               :Vehículos
@@ -441,18 +441,18 @@
 STR_0198_PROFIT_THIS_YEAR_LAST_YEAR                             :{TINYFONT}{BLACK}Beneficio este ano: {CURRENCY} (ano pasado: {CURRENCY})
 
 ############ range for service numbers starts
-STR_0199_YEAR                                                   :{COMMA16} ano ({COMMA16})
-STR_019A_YEARS                                                  :{COMMA16} anos ({COMMA16})
-STR_019B_YEARS                                                  :{RED}{COMMA16} anos ({COMMA16})
+STR_0199_YEAR                                                   :{COMMA} ano ({COMMA})
+STR_019A_YEARS                                                  :{COMMA} anos ({COMMA})
+STR_019B_YEARS                                                  :{RED}{COMMA} anos ({COMMA})
 ############ range for service numbers ends
 
 STR_019C_ROAD_VEHICLE                                           :Vehículo de estrada
 STR_019D_AIRCRAFT                                               :Aeronave
 STR_019E_SHIP                                                   :Barco
 STR_019F_TRAIN                                                  :Tren
-STR_01A0_IS_GETTING_OLD                                         :{WHITE}{STRING} {COMMA16} estase volvendo vello
-STR_01A1_IS_GETTING_VERY_OLD                                    :{WHITE}{STRING} {COMMA16} estase volvendo moi vello
-STR_01A2_IS_GETTING_VERY_OLD_AND                                :{WHITE}{STRING} {COMMA16} estase volvendo moi vello e debe ser substituído urxentemente
+STR_01A0_IS_GETTING_OLD                                         :{WHITE}{STRING} {COMMA} estase volvendo vello
+STR_01A1_IS_GETTING_VERY_OLD                                    :{WHITE}{STRING} {COMMA} estase volvendo moi vello
+STR_01A2_IS_GETTING_VERY_OLD_AND                                :{WHITE}{STRING} {COMMA} estase volvendo moi vello e debe ser substituído urxentemente
 STR_01A3_LAND_AREA_INFORMATION                                  :{WHITE}Información dunha área de terreo
 STR_01A4_COST_TO_CLEAR_N_A                                      :{BLACK}Coste de limpar: {LTBLUE}N/D
 STR_01A5_COST_TO_CLEAR                                          :{BLACK}Coste de limpar: {LTBLUE}{CURRENCY}
@@ -497,7 +497,7 @@
 STR_01CA_31ST                                                   :31º
 ############ range for days	ends
 
-STR_01CB                                                        :{TINYFONT}{COMMA16}
+STR_01CB                                                        :{TINYFONT}{COMMA}
 STR_01CC_TOGGLE_LARGE_SMALL_MAP                                 :{BLACK}Intercambiar tamaño do mapa grande/pequeno
 STR_01CD_SELECT_TUTORIAL_DEMONSTRATION                          :{WHITE}Seleccionar Tutorial/Demostración
 
@@ -509,7 +509,7 @@
 STR_CARGO_ACCEPTED_5                                            :{BLACK}Carga aceptada: {LTBLUE}{STRING}, {STRING}, {STRING}, {STRING}, {STRING}
 ############ range for cargo acecpted ends
 
-STR_01D1_8                                                      :({COMMA8}/8 {STRING})
+STR_01D1_8                                                      :({COMMA}/8 {STRING})
 STR_01D2_JAZZ_JUKEBOX                                           :{WHITE}Jazz Jukebox
 STR_01D3_SOUND_MUSIC                                            :Son/música
 STR_01D4_SHOW_SOUND_MUSIC_WINDOW                                :{BLACK}Amosa-la fiestra de son/música
@@ -528,16 +528,16 @@
 STR_01E1_START_PLAYING_MUSIC                                    :{BLACK}Comeza-la reproducción da música
 STR_01E2_DRAG_SLIDERS_TO_SET_MUSIC                              :{BLACK}Arrastra os deslizadores para configura-los volumes da música e dos efectos de son
 STR_01E3                                                        :{DKGREEN}{TINYFONT}--
-STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA8}
-STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA8}
+STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA}
+STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA}
 STR_01E6                                                        :{DKGREEN}{TINYFONT}------
 STR_01E7                                                        :{DKGREEN}{TINYFONT}"{STRING}"
 STR_01E8_TRACK_XTITLE                                           :{BLACK}{TINYFONT}Pista{SETX 88}Título
 STR_01E9_SHUFFLE                                                :{TINYFONT}Mezclar
 STR_01EA_PROGRAM                                                :{TINYFONT}{BLACK}Programa
 STR_01EB_MUSIC_PROGRAM_SELECTION                                :{WHITE}Selección do Programa de Música
-STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA16} "{STRING}"
-STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA16}   "{STRING}"
+STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} "{STRING}"
+STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA}   "{STRING}"
 STR_01EE_TRACK_INDEX                                            :{TINYFONT}{BLACK}Índice de Pistas
 STR_01EF_PROGRAM                                                :{TINYFONT}{BLACK}Programa - '{STRING}'
 STR_01F0_CLEAR                                                  :{TINYFONT}{BLACK}Limpar
@@ -576,7 +576,7 @@
 STR_0210_TOO_FAR_FROM_PREVIOUS_DESTINATIO                       :{WHITE}...Demasiado lonxe do destino anterior
 STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Mellores compañías que chegaron ó {NUMU16}{}(Nivel {STRING})
 STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Táboa da Liga de Compañías en {NUMU16}
-STR_0212                                                        :{BIGFONT}{COMMA16}.
+STR_0212                                                        :{BIGFONT}{COMMA}.
 STR_0213_BUSINESSMAN                                            :Home de negocios
 STR_0214_ENTREPRENEUR                                           :Empresario
 STR_0215_INDUSTRIALIST                                          :Industrial
@@ -585,12 +585,12 @@
 STR_0218_MOGUL                                                  :Mogul
 STR_0219_TYCOON_OF_THE_CENTURY                                  :Magnate da Centuria
 STR_HIGHSCORE_NAME                                              :{BIGFONT}{STRING}, {STRING}
-STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA16})
+STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA})
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}¡{STRING} logra o status de '{STRING}'!
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}¡{STRING} de {STRING} logra o status '{STRING}'!
 STR_021D                                                        :{BLACK}
 STR_021E                                                        :{WHITE}
-STR_021F                                                        :{BLUE}{COMMA16}
+STR_021F                                                        :{BLUE}{COMMA}
 STR_0220_CREATE_SCENARIO                                        :{BLACK}Crear Escenario
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Editor de Escenario
@@ -784,8 +784,8 @@
 STR_EXTRA_VIEW_PORT                                             :Extra viewport
 STR_SIGN_LIST                                                   :Lista de sinais
 STR_02DF_TOWN_DIRECTORY                                         :Directorio de cidades
-STR_TOWN_POPULATION                                             :{BLACK}Poboación mundial: {COMMA32}
-STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Vista {COMMA16}
+STR_TOWN_POPULATION                                             :{BLACK}Poboación mundial: {COMMA}
+STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Vista {COMMA}
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN                                :{BLACK}Copiar a vista
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT                             :{BLACK}Copia a sitaución da vista global nesta vista
 STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW                                :{BLACK}Paste from viewport
@@ -956,34 +956,34 @@
 STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Non se pode copia-la lista de ordes...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Fin das ordes compartidas - -
 
-STR_TRAIN_IS_LOST                                               :{WHITE}Perdiches o tren {COMMA16}.
-STR_TRAIN_IS_UNPROFITABLE                                       :{WHITE}O beneficio para o tren {COMMA16} o ano pasado foi de {CURRENCY}
+STR_TRAIN_IS_LOST                                               :{WHITE}Perdiches o tren {COMMA}.
+STR_TRAIN_IS_UNPROFITABLE                                       :{WHITE}O beneficio para o tren {COMMA} o ano pasado foi de {CURRENCY}
 STR_EURO_INTRODUCE                                              :{BLACK}{BIGFONT}¡Unión Monetaria Europea!{}{}¡O Euro introdúcese como a única moeda para as transaccións diarias no teu país!
 
 # Start of order review system.
 # DON'T ADD OR REMOVE LINES HERE
-STR_TRAIN_HAS_TOO_FEW_ORDERS                                    :{WHITE}O tren {COMMA16} ten moi poucas ordes no seu programa
-STR_TRAIN_HAS_VOID_ORDER                                        :{WHITE}O tren {COMMA16} ten unha orde inválida
-STR_TRAIN_HAS_DUPLICATE_ENTRY                                   :{WHITE}O tren {COMMA16} ten ordes duplicadas
-STR_TRAIN_HAS_INVALID_ENTRY                                     :{WHITE}O tren {COMMA16} ten unha estación non válida nas ordes
-STR_ROADVEHICLE_HAS_TOO_FEW_ORDERS                              :{WHITE}O vehículo de estrada {COMMA16} ten moi poucas ordes no seu programa
-STR_ROADVEHICLE_HAS_VOID_ORDER                                  :{WHITE}O vehículo de estrada {COMMA16} ten unha orde inválida
-STR_ROADVEHICLE_HAS_DUPLICATE_ENTRY                             :{WHITE}O vehículo de estrada {COMMA16} ten ordes duplicadas
-STR_ROADVEHICLE_HAS_INVALID_ENTRY                               :{WHITE}O vehículo de Estrada {COMMA16} ten unha estación non válida nas ordes
-STR_SHIP_HAS_TOO_FEW_ORDERS                                     :{WHITE}O barco {COMMA16} ten moi poucas ordes no seu programa
-STR_SHIP_HAS_VOID_ORDER                                         :{WHITE}O barco {COMMA16} ten unha orde inválida
-STR_SHIP_HAS_DUPLICATE_ENTRY                                    :{WHITE}O barco {COMMA16} ten ordes duplicadas
-STR_SHIP_HAS_INVALID_ENTRY                                      :{WHITE}O Barco {COMMA16} ten unha estación non válida nas ordes
-STR_AIRCRAFT_HAS_TOO_FEW_ORDERS                                 :{WHITE}A aeronave {COMMA16} ten moi poucas ordes no seu programa
-STR_AIRCRAFT_HAS_VOID_ORDER                                     :{WHITE}A aeronave {COMMA16} ten unha orde inválida
-STR_AIRCRAFT_HAS_DUPLICATE_ENTRY                                :{WHITE}A aeronave {COMMA16} ten ordes duplicadas
-STR_AIRCRAFT_HAS_INVALID_ENTRY                                  :{WHITE}A aeronave {COMMA16} ten unha estación non válida nas ordes
+STR_TRAIN_HAS_TOO_FEW_ORDERS                                    :{WHITE}O tren {COMMA} ten moi poucas ordes no seu programa
+STR_TRAIN_HAS_VOID_ORDER                                        :{WHITE}O tren {COMMA} ten unha orde inválida
+STR_TRAIN_HAS_DUPLICATE_ENTRY                                   :{WHITE}O tren {COMMA} ten ordes duplicadas
+STR_TRAIN_HAS_INVALID_ENTRY                                     :{WHITE}O tren {COMMA} ten unha estación non válida nas ordes
+STR_ROADVEHICLE_HAS_TOO_FEW_ORDERS                              :{WHITE}O vehículo de estrada {COMMA} ten moi poucas ordes no seu programa
+STR_ROADVEHICLE_HAS_VOID_ORDER                                  :{WHITE}O vehículo de estrada {COMMA} ten unha orde inválida
+STR_ROADVEHICLE_HAS_DUPLICATE_ENTRY                             :{WHITE}O vehículo de estrada {COMMA} ten ordes duplicadas
+STR_ROADVEHICLE_HAS_INVALID_ENTRY                               :{WHITE}O vehículo de Estrada {COMMA} ten unha estación non válida nas ordes
+STR_SHIP_HAS_TOO_FEW_ORDERS                                     :{WHITE}O barco {COMMA} ten moi poucas ordes no seu programa
+STR_SHIP_HAS_VOID_ORDER                                         :{WHITE}O barco {COMMA} ten unha orde inválida
+STR_SHIP_HAS_DUPLICATE_ENTRY                                    :{WHITE}O barco {COMMA} ten ordes duplicadas
+STR_SHIP_HAS_INVALID_ENTRY                                      :{WHITE}O Barco {COMMA} ten unha estación non válida nas ordes
+STR_AIRCRAFT_HAS_TOO_FEW_ORDERS                                 :{WHITE}A aeronave {COMMA} ten moi poucas ordes no seu programa
+STR_AIRCRAFT_HAS_VOID_ORDER                                     :{WHITE}A aeronave {COMMA} ten unha orde inválida
+STR_AIRCRAFT_HAS_DUPLICATE_ENTRY                                :{WHITE}A aeronave {COMMA} ten ordes duplicadas
+STR_AIRCRAFT_HAS_INVALID_ENTRY                                  :{WHITE}A aeronave {COMMA} ten unha estación non válida nas ordes
 # end of order system
 
-STR_TRAIN_AUTORENEW_FAILED                                      :{WHITE}Autorenovación fallida para o tren {COMMA16} (límite de diñeiro)
-STR_ROADVEHICLE_AUTORENEW_FAILED                                :{WHITE}Autorenovación fallida para o vehículo de estrada {COMMA16} (límite de diñeiro)
-STR_SHIP_AUTORENEW_FAILED                                       :{WHITE}Autorenovación fallida para o barco {COMMA16} (límite de diñeiro)
-STR_AIRCRAFT_AUTORENEW_FAILED                                   :{WHITE}Autorenovación fallida para a aeronave {COMMA16} (límite de diñeiro)
+STR_TRAIN_AUTORENEW_FAILED                                      :{WHITE}Autorenovación fallida para o tren {COMMA} (límite de diñeiro)
+STR_ROADVEHICLE_AUTORENEW_FAILED                                :{WHITE}Autorenovación fallida para o vehículo de estrada {COMMA} (límite de diñeiro)
+STR_SHIP_AUTORENEW_FAILED                                       :{WHITE}Autorenovación fallida para o barco {COMMA} (límite de diñeiro)
+STR_AIRCRAFT_AUTORENEW_FAILED                                   :{WHITE}Autorenovación fallida para a aeronave {COMMA} (límite de diñeiro)
 
 STR_CONFIG_PATCHES                                              :{BLACK}Configuración dos Parches
 STR_CONFIG_PATCHES_TIP                                          :{BLACK}Configura-los parches
@@ -1097,7 +1097,7 @@
 STR_CHEATS_TIP                                                  :{BLACK}As caixas de confirmación indican se usaches esta trampa antes
 STR_CHEATS_WARNING                                              :{BLACK}¡Advertencia! Estás a piques de traizoa-los teus oponentes. Ten en conta que unha desgracia coma esta se lembrará eternamente.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Incrementa-lo diñeiro en {CURRENCY64}
-STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Xogar coma xogador: {ORANGE}{COMMA16}
+STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Xogar coma xogador: {ORANGE}{COMMA}
 STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Escavadora máxica(Elimina industrias, non eliminables): {ORANGE}{STRING}
 STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Os tuneis poden cruzarse entre eles: {ORANGE}{STRING}
 STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Permiti-la construcción en modo pausa: {ORANGE}{STRING}
@@ -1112,7 +1112,7 @@
 STR_GO_NON_STOP_TO_WAYPOINT                                     :Ir sen parar vía {WAYPOINT}
 
 STR_WAYPOINTNAME_CITY                                           :Punto de Control {TOWN}
-STR_WAYPOINTNAME_CITY_SERIAL                                    :Punto de control {TOWN} #{COMMA16}
+STR_WAYPOINTNAME_CITY_SERIAL                                    :Punto de control {TOWN} #{COMMA}
 STR_LANDINFO_WAYPOINT                                           :Punto de control
 
 STR_WAYPOINT                                                    :{WHITE}Punto de ruta
@@ -1195,8 +1195,8 @@
 STR_CONSTRUCT_SUGAR_MINE_TIP                                    :{BLACK}Construír Mina de Azucre
 
 STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Industrias
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}){YELLOW} ({COMMA16}% transportado)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}/{STRING}){YELLOW} ({COMMA16}%/{COMMA16}% transportado)
+STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}){YELLOW} ({COMMA}% transportado)
+STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}/{STRING}){YELLOW} ({COMMA}%/{COMMA}% transportado)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{TOWN}: {STRING}
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...demasiado cerca doutra industria
@@ -1235,15 +1235,15 @@
 STR_NETWORK_ADD_SERVER_TIP                                      :{BLACK}Engade un servidor á lista que será comprobado sempre para buscar partidas.
 STR_NETWORK_ENTER_IP                                            :{BLACK}Introduce a dirección IP do servidor
 
-STR_NETWORK_CLIENTS_ONLINE                                      :{BLACK}{COMMA16}/{COMMA16}
+STR_NETWORK_CLIENTS_ONLINE                                      :{BLACK}{COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Clientes
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Clientes conectador / clients máximos
 STR_NETWORK_GAME_INFO                                           :{SILVER}INFORMACIÓN DA PARTIDA
 STR_ORANGE                                                      :{ORANGE}{STRING}
-STR_NETWORK_CLIENTS                                             :{SILVER}Clientes:  {WHITE}{COMMA8} / {COMMA8}
+STR_NETWORK_CLIENTS                                             :{SILVER}Clientes:  {WHITE}{COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}Idioma:  {WHITE}{STRING}
 STR_NETWORK_TILESET                                             :{SILVER}Set de Terreo:  {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Tamaño:  {WHITE}{COMMA16}x{COMMA16}
+STR_NETWORK_MAP_SIZE                                            :{SILVER}Tamaño:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Versión do servidor:  {WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Dirección do servidor:  {WHITE}{STRING} : {NUMU16}
 STR_NETWORK_START_DATE                                          :{SILVER}Data de comezo:  {WHITE}{DATE_SHORT}
@@ -1504,21 +1504,21 @@
 
 ##id 0x2000
 STR_2000_TOWNS                                                  :{WHITE}Cidades
-STR_TOWN_LABEL_POP                                              :{WHITE}{STRING} ({COMMA32})
+STR_TOWN_LABEL_POP                                              :{WHITE}{STRING} ({COMMA})
 STR_2001                                                        :{WHITE}{STRING}
 STR_2002                                                        :{TINYFONT}{BLACK}{STRING}
 STR_2003                                                        :{TINYFONT}{WHITE}{STRING}
 STR_2004_BUILDING_MUST_BE_DEMOLISHED                            :{WHITE}Debes demole-lo edificio primeiro
 STR_2005                                                        :{WHITE}{TOWN}
-STR_2006_POPULATION                                             :{BLACK}Poboación: {ORANGE}{COMMA32}{BLACK}  Casas: {ORANGE}{COMMA32}
+STR_2006_POPULATION                                             :{BLACK}Poboación: {ORANGE}{COMMA}{BLACK}  Casas: {ORANGE}{COMMA}
 STR_2007_RENAME_TOWN                                            :Renomear cidade
 STR_2008_CAN_T_RENAME_TOWN                                      :{WHITE}Non se pode renomea-la cidade...
 STR_2009_LOCAL_AUTHORITY_REFUSES                                :{WHITE}{TOWN}: a autoridade local négase a permitilo
 STR_200A_TOWN_NAMES_CLICK_ON_NAME                               :{BLACK}Nomes de cidades - pincha no nome para centra-la vista principal na cidade
 STR_200B_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Centra-la vista principal na situación da cidade
 STR_200C_CHANGE_TOWN_NAME                                       :{BLACK}Cambia-lo nome da cidade
-STR_200D_PASSENGERS_LAST_MONTH_MAX                              :{BLACK}Pasaxeiros último mes: {ORANGE}{COMMA32}{BLACK}  max: {ORANGE}{COMMA32}
-STR_200E_MAIL_LAST_MONTH_MAX                                    :{BLACK}Correo último mes: {ORANGE}{COMMA32}{BLACK}  max: {ORANGE}{COMMA32}
+STR_200D_PASSENGERS_LAST_MONTH_MAX                              :{BLACK}Pasaxeiros último mes: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
+STR_200E_MAIL_LAST_MONTH_MAX                                    :{BLACK}Correo último mes: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
 STR_200F_TALL_OFFICE_BLOCK                                      :Bloque alto de oficinas
 STR_2010_OFFICE_BLOCK                                           :Bloque de oficinas
 STR_2011_SMALL_BLOCK_OF_FLATS                                   :Bloque pequeno de apartamentos
@@ -1592,7 +1592,7 @@
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Suborna-la autoridade local para mellora-la túa puntuación, co risco dunha gran penalización se o descobren.{}  Cost: {CURRENCY}
 STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}¡Caos no tráfico de {TOWN}!{}{}¡O programa de reconstrucción das estradas subvencionado por {STRING} trae 6 meses de miseria para os motoristas!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
-STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA32})
+STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA})
 STR_2058_UNDER_CONSTRUCTION                                     :{STRING} (en construcción)
 STR_2059_IGLOO                                                  :Iglú
 STR_205A_TEPEES                                                 :Tipis
@@ -1654,7 +1654,7 @@
 STR_303C_OUTSTANDING                                            :Excepcional
 ############ range for rating ends
 
-STR_303D                                                        :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA8}%)
+STR_303D                                                        :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_303E_NO_LONGER_ACCEPTS                                      :{WHITE}{STATION} xa non acepta {STRING}
 STR_303F_NO_LONGER_ACCEPTS_OR                                   :{WHITE}{STATION} xa non acepta {STRING} ou {STRING}
 STR_3040_NOW_ACCEPTS                                            :{WHITE}{STATION} agora acepta {STRING}
@@ -1665,7 +1665,7 @@
 STR_3045_TOO_CLOSE_TO_ANOTHER_TRUCK                             :{WHITE}Demasiado cerca doutra estación de camións
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Debes demole-la estación de autobús primeiro
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Debes demole-la estación de camións primeiro
-STR_3048_STATIONS                                               :{WHITE}{STRING} - {COMMA16} Estacións
+STR_3048_STATIONS                                               :{WHITE}{STRING} - {COMMA} Estacións
 STR_3049_0                                                      :{YELLOW}{STATION} {STRINL 0x30D1}
 STR_304A_NONE                                                   :{YELLOW}- Ningún -
 STR_304B_SITE_UNSUITABLE                                        :{WHITE}...emprazamento inadecuado
@@ -1721,7 +1721,7 @@
 STR_4002_SAVE                                                   :{BLACK}Grabar
 STR_4003_DELETE                                                 :{BLACK}Borrar
 STR_4004                                                        :{STRING}, {DATE_LONG}
-STR_4005_BYTES_FREE                                             :{BLACK}{COMMA32} megabytes libres
+STR_4005_BYTES_FREE                                             :{BLACK}{COMMA} megabytes libres
 STR_4006_UNABLE_TO_READ_DRIVE                                   :{BLACK}No se pode lee-la unidade
 STR_4007_GAME_SAVE_FAILED                                       :{WHITE}Grabación da partida fallida
 STR_4008_UNABLE_TO_DELETE_FILE                                  :{WHITE}Non se pode borra-lo arquivo
@@ -1782,7 +1782,7 @@
 ############ range for requires	ends
 
 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Producción no último mes:
-STR_482B_TRANSPORTED                                            :{YELLOW}{STRING}{BLACK} ({COMMA16}% transportado)
+STR_482B_TRANSPORTED                                            :{YELLOW}{STRING}{BLACK} ({COMMA}% transportado)
 STR_482C_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Centra-la vista principal na situación da industria
 STR_482D_NEW_UNDER_CONSTRUCTION                                 :{BLACK}{BIGFONT}¡Nova {STRING} en construcción cerca de {TOWN}!
 STR_482E_NEW_BEING_PLANTED_NEAR                                 :{BLACK}{BIGFONT}¡Nova {STRING} cerca de {TOWN}!
@@ -1799,8 +1799,8 @@
 STR_4839_PRODUCTION_DOWN_BY_50                                  :{BLACK}{BIGFONT}¡{TOWN}: A producción de {STRING} redúcese nun 50%
 STR_483A_INSECT_INFESTATION_CAUSES                              :{BLACK}{BIGFONT}¡{TOWN}: Unha infestación de insectos causa desastre na {STRING}!{}A producción redúcese nun 50%
 STR_483B_CAN_ONLY_BE_POSITIONED                                 :{WHITE}...só se pode emprazar cerca dos bordes do mapa
-STR_INDUSTRY_PROD_GOUP                                          :{BLACK}{BIGFONT}¡A producción de {STRING} en {TOWN} {STRING} sube un {COMMA16}%!
-STR_INDUSTRY_PROD_GODOWN                                        :{BLACK}{BIGFONT}¡A producción de {STRING} en {TOWN} {STRING} baixa un {COMMA16}%!
+STR_INDUSTRY_PROD_GOUP                                          :{BLACK}{BIGFONT}¡A producción de {STRING} en {TOWN} {STRING} sube un {COMMA}%!
+STR_INDUSTRY_PROD_GODOWN                                        :{BLACK}{BIGFONT}¡A producción de {STRING} en {TOWN} {STRING} baixa un {COMMA}%!
 
 ##id 0x5000
 STR_5000_TRAIN_IN_TUNNEL                                        :{WHITE}Hai un tren no túnel
@@ -1863,10 +1863,10 @@
 ##id 0x6000
 STR_SV_EMPTY                                                    :
 STR_SV_UNNAMED                                                  :Sen Nome{SKIP}
-STR_SV_TRAIN_NAME                                               :Tren {COMMA16}
-STR_SV_ROADVEH_NAME                                             :Vehículo de estrada {COMMA16}
-STR_SV_SHIP_NAME                                                :Barco {COMMA16}
-STR_SV_AIRCRAFT_NAME                                            :Aeronave {COMMA16}
+STR_SV_TRAIN_NAME                                               :Tren {COMMA}
+STR_SV_ROADVEH_NAME                                             :Vehículo de estrada {COMMA}
+STR_SV_SHIP_NAME                                                :Barco {COMMA}
+STR_SV_AIRCRAFT_NAME                                            :Aeronave {COMMA}
 
 STR_SV_STNAME                                                   :{STRING}
 STR_SV_STNAME_NORTH                                             :{STRING} Norte
@@ -1916,12 +1916,12 @@
 ############ range for difficulty levels ends
 
 ############ range for difficulty settings starts
-STR_6805_MAXIMUM_NO_COMPETITORS                                 :{LTBLUE}Nº máximo de oponentes: {ORANGE}{COMMA16}
+STR_6805_MAXIMUM_NO_COMPETITORS                                 :{LTBLUE}Nº máximo de oponentes: {ORANGE}{COMMA}
 STR_6806_COMPETITOR_START_TIME                                  :{LTBLUE}Data de comezo dos oponentes: {ORANGE}{STRING}
 STR_6807_NO_OF_TOWNS                                            :{LTBLUE}Nº de cidades: {ORANGE}{STRING}
 STR_6808_NO_OF_INDUSTRIES                                       :{LTBLUE}Nº de industrias: {ORANGE}{STRING}
 STR_6809_MAXIMUM_INITIAL_LOAN_000                               :{LTBLUE}Crédito máximo inicial: {ORANGE}{CURRENCY}
-STR_680A_INITIAL_INTEREST_RATE                                  :{LTBLUE}Taxa de interés inicial: {ORANGE}{COMMA16}%
+STR_680A_INITIAL_INTEREST_RATE                                  :{LTBLUE}Taxa de interés inicial: {ORANGE}{COMMA}%
 STR_680B_VEHICLE_RUNNING_COSTS                                  :{LTBLUE}Coste de mantemento dos vehículos: {ORANGE}{STRING}
 STR_680C_CONSTRUCTION_SPEED_OF_COMPETITOR                       :{LTBLUE}Velocidade de construcción dos oponentes: {ORANGE}{STRING}
 STR_680D_INTELLIGENCE_OF_COMPETITORS                            :{LTBLUE}Intelixencia dos oponentes: {ORANGE}{STRING}
@@ -1980,7 +1980,7 @@
 ##id 0x7000
 STR_7000                                                        :
 STR_7001                                                        :{WHITE}{STRING} {BLACK}{STRING}
-STR_7002_PLAYER                                                 :(Xogador {COMMA16})
+STR_7002_PLAYER                                                 :(Xogador {COMMA})
 STR_7004_NEW_FACE                                               :{BLACK}Nova Cara
 STR_7005_COLOR_SCHEME                                           :{BLACK}Esquema de Cor
 STR_7006_COLOR_SCHEME                                           :{GOLD}Esquema de Cor:
@@ -2014,7 +2014,7 @@
 STR_7022_INCOME_GRAPH                                           :{WHITE}Gráfico de Ingresos
 STR_CURRCOMPACT32                                               :{CURRCOMPACT}
 STR_CURRCOMPACT64                                               :{CURRCOMPACT64}
-STR_7024                                                        :{COMMA32}
+STR_7024                                                        :{COMMA}
 STR_7025_OPERATING_PROFIT_GRAPH                                 :{WHITE}Gráfica de Beneficios Operativos
 STR_7026_BANK_BALANCE                                           :{WHITE}Balance do Banco
 STR_7027_LOAN                                                   :{WHITE}Préstamo
@@ -2037,14 +2037,14 @@
 STR_7037_PRESIDENT                                              :{WHITE}{STRING}{}{GOLD}(Presidente)
 STR_7038_INAUGURATED                                            :{GOLD}Inaugurado: {WHITE}{NUMU16}
 STR_7039_VEHICLES                                               :{GOLD}Vehículos:
-STR_703A_TRAIN                                                  :{WHITE}{COMMA16} tren
-STR_703B_TRAINS                                                 :{WHITE}{COMMA16} trens
-STR_703C_ROAD_VEHICLE                                           :{WHITE}{COMMA16} vehículo de estrada
-STR_703D_ROAD_VEHICLES                                          :{WHITE}{COMMA16} vehículos de estrada
-STR_703E_AIRCRAFT                                               :{WHITE}Aeronaves {COMMA16}
-STR_703F_AIRCRAFT                                               :{WHITE}Aeronaves {COMMA16}
-STR_7040_SHIP                                                   :{WHITE}{COMMA16} barco
-STR_7041_SHIPS                                                  :{WHITE}{COMMA16} barcos
+STR_703A_TRAIN                                                  :{WHITE}{COMMA} tren
+STR_703B_TRAINS                                                 :{WHITE}{COMMA} trens
+STR_703C_ROAD_VEHICLE                                           :{WHITE}{COMMA} vehículo de estrada
+STR_703D_ROAD_VEHICLES                                          :{WHITE}{COMMA} vehículos de estrada
+STR_703E_AIRCRAFT                                               :{WHITE}Aeronaves {COMMA}
+STR_703F_AIRCRAFT                                               :{WHITE}Aeronaves {COMMA}
+STR_7040_SHIP                                                   :{WHITE}{COMMA} barco
+STR_7041_SHIPS                                                  :{WHITE}{COMMA} barcos
 STR_7042_NONE                                                   :{WHITE}Ningún
 STR_7043_FACE_SELECTION                                         :{WHITE}Selecció de cara
 STR_7044_MALE                                                   :{BLACK}Home
@@ -2109,8 +2109,8 @@
 STR_707A_SELL_25_SHARE_IN_THIS_COMPANY                          :{BLACK}Vender un 25% das accións desta compañía
 STR_707B_CAN_T_BUY_25_SHARE_IN_THIS                             :{WHITE}Non se pode comprar un 25% das accións nesta compañía...
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}Non se pode vender un 25% das accións desta compañía...
-STR_707D_OWNED_BY                                               :{WHITE}({COMMA16}% propiedade de {STRING})
-STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA16}% propiedade de {STRING}{}   {COMMA16}% propiedade de {STRING})
+STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% propiedade de {STRING})
+STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}% propiedade de {STRING}{}   {COMMA}% propiedade de {STRING})
 STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{STRING} comprada por  {STRING}!
 STR_7080_PROTECTED                                              :{WHITE}Esta compañía todavía non comercia con accións...
 
@@ -2385,8 +2385,8 @@
 STR_8801_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Celebración cidadá . . .{}Chega o primeiro tren a {STATION}!
 STR_8802_DETAILS                                                :{WHITE}{STRING} (Detalles)
 STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}Hai un tren no camiño
-STR_8804                                                        :{SETX 10}{COMMA8}: {STRING}
-STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA8}: {STRING}
+STR_8804                                                        :{SETX 10}{COMMA}: {STRING}
+STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING}
 STR_8806_GO_TO                                                  :Ir a {STATION}
 STR_SERVICE_AT_TRAIN_DEPOT                                      :Face-lo servicio no Depósito de Trens de {TOWN}
 STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT                             :Ir sen paradas o Depósito de Trens de {TOWN}
@@ -2400,13 +2400,13 @@
 STR_UNKNOWN_DESTINATION                                         :destino descoñecido
 STR_8812_EMPTY                                                  :{LTBLUE}Valeiro
 STR_8813_FROM                                                   :{LTBLUE}{CARGO} de {STATION}
-STR_8814_TRAIN_IS_WAITING_IN_DEPOT                              :{WHITE}O tren {COMMA16} está a esperar no depósito
+STR_8814_TRAIN_IS_WAITING_IN_DEPOT                              :{WHITE}O tren {COMMA} está a esperar no depósito
 STR_8815_NEW_VEHICLES                                           :{BLACK}Novos Vehículos
 STR_8816                                                        :{BLACK}-
 STR_8818_INFORMATION                                            :{BLACK}Información
 STR_8819_TRAIN_TOO_LONG                                         :{WHITE}O tren é demasiado longo
 STR_881A_TRAINS_CAN_ONLY_BE_ALTERED                             :{WHITE}Os trens só se poden alterar cando estean parados nunha estación
-STR_881B_TRAINS                                                 :{WHITE}{STRING} - {COMMA16} Trens
+STR_881B_TRAINS                                                 :{WHITE}{STRING} - {COMMA} Trens
 STR_881C_NEW_RAIL_VEHICLES                                      :{WHITE}Novos Vehículos de Ferrocarril
 STR_881D_NEW_MONORAIL_VEHICLES                                  :{WHITE}Novos Vehículos de Monorraíl
 STR_881E_NEW_MAGLEV_VEHICLES                                    :{WHITE}Novos Vehículos de Maglev
@@ -2440,8 +2440,8 @@
 STR_8839_CAN_T_SELL_RAILROAD_VEHICLE                            :{WHITE}Non se pode vende-lo vehículo de ferrocarril...
 STR_883A_UNABLE_TO_FIND_ROUTE_TO                                :{WHITE}No se pode atopar unha ruta a un depósito local
 STR_883B_CAN_T_STOP_START_TRAIN                                 :{WHITE}No se pode para/arrinca-lo tren...
-STR_883C_SERVICING_INTERVAL_DAYS                                :{BLACK}Intervalo de Servicio: {LTBLUE}{COMMA16}days{BLACK}   Último Servicio: {LTBLUE}{DATE_LONG}
-STR_SERVICING_INTERVAL_PERCENT                                  :{BLACK}Intervalo servicio: {LTBLUE}{COMMA16}%{BLACK}   Ult. Servicio: {LTBLUE}{DATE_LONG}
+STR_883C_SERVICING_INTERVAL_DAYS                                :{BLACK}Intervalo de Servicio: {LTBLUE}{COMMA}days{BLACK}   Último Servicio: {LTBLUE}{DATE_LONG}
+STR_SERVICING_INTERVAL_PERCENT                                  :{BLACK}Intervalo servicio: {LTBLUE}{COMMA}%{BLACK}   Ult. Servicio: {LTBLUE}{DATE_LONG}
 STR_883D_TRAINS_CLICK_ON_TRAIN_FOR                              :{BLACK}Trens - pincha nun tren para información
 STR_883E_BUILD_NEW_TRAINS_REQUIRES                              :{BLACK}Construír novos trens (é necesarió un depósito)
 STR_883F_TRAINS_CLICK_ON_TRAIN_FOR                              :{BLACK}Trens - pincha nun tren para información, arrastra o vehículo para engadi/remove-lo do tren
@@ -2474,12 +2474,12 @@
 STR_SERVICE_HINT                                                :{BLACK}saltar esta orde a non ser que sexa necesario o servicio
 STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}¡Nov@ {STRING} dispoñible!
 STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
-STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Coste: {CURRENCY} Peso: {COMMA16}t{}Velocidade: {VELOCITY}  Potencia: {COMMA16}hp{}Coste de Mantemento: {CURRENCY}/ano{}Capacidade: {STRING}
+STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Coste: {CURRENCY} Peso: {COMMA}t{}Velocidade: {VELOCITY}  Potencia: {COMMA}hp{}Coste de Mantemento: {CURRENCY}/ano{}Capacidade: {STRING}
 STR_885C_BROKEN_DOWN                                            :{RED}Roto
 STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Idade: {LTBLUE}{STRING}{BLACK}   Coste de Mantemento: {LTBLUE}{CURRENCY}/ano
-STR_885E_WEIGHT_T_POWER_HP_MAX_SPEED                            :{BLACK}Peso: {LTBLUE}{COMMA16}t  {BLACK}Potencia: {LTBLUE}{COMMA32}cv{BLACK} Velocidade Máx.: {LTBLUE}{VELOCITY}
+STR_885E_WEIGHT_T_POWER_HP_MAX_SPEED                            :{BLACK}Peso: {LTBLUE}{COMMA}t  {BLACK}Potencia: {LTBLUE}{COMMA}cv{BLACK} Velocidade Máx.: {LTBLUE}{VELOCITY}
 STR_885F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Beneficios este ano: {LTBLUE}{CURRENCY}  (último ano: {CURRENCY})
-STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Fiabilidade: {LTBLUE}{COMMA8}%  {BLACK}Roturas dende o último servicio: {LTBLUE}{COMMA16}
+STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Fiabilidade: {LTBLUE}{COMMA}%  {BLACK}Roturas dende o último servicio: {LTBLUE}{COMMA}
 STR_8861_STOPPED                                                :{RED}Parado
 STR_8862_CAN_T_MAKE_TRAIN_PASS_SIGNAL                           :{WHITE}Non se pode face-lo tren pasar unha sinal de perigo...
 STR_8863_CRASHED                                                :{RED}¡Estrelado!
@@ -2487,7 +2487,7 @@
 STR_8865_NAME_TRAIN                                             :{WHITE}Renomear tren
 STR_8866_CAN_T_NAME_TRAIN                                       :{WHITE}No se pode renomea-lo tren...
 STR_8867_NAME_TRAIN                                             :{BLACK}Renomear tren
-STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}¡Accidente Ferroviario!{}{COMMA16} mortos na explosión trala colisión
+STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}¡Accidente Ferroviario!{}{COMMA} mortos na explosión trala colisión
 STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}No se pode cambia-lo sentido do tren...
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Renomea-lo tipo de vehículo de ferrocarril
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Non se pode renome-lo tipo de vehículo de ferrocarril...
@@ -2497,7 +2497,7 @@
 
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Haí un vehículo de estrada no camiño
-STR_9001_ROAD_VEHICLES                                          :{WHITE}{STRING} - {COMMA16} Vehículos de Estrada
+STR_9001_ROAD_VEHICLES                                          :{WHITE}{STRING} - {COMMA} Vehículos de Estrada
 STR_9002                                                        :{WHITE}{STRING}
 STR_9003_ROAD_VEHICLE_DEPOT                                     :{WHITE}Depósito de Vehículos de Estrada de {TOWN}
 STR_9004_NEW_VEHICLES                                           :{BLACK}Novos Vehículos
@@ -2511,13 +2511,13 @@
 STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Idade: {LTBLUE}{STRING}{BLACK}   Coste de Mantemento: {LTBLUE}{CURRENCY}/ano
 STR_900E_MAX_SPEED                                              :{BLACK}Velocidade Máx.: {LTBLUE}{VELOCITY}
 STR_900F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Beneficio este ano: {LTBLUE}{CURRENCY}  (último ano: {CURRENCY})
-STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Fiabilidade: {LTBLUE}{COMMA8}%  {BLACK}Roturas dende o último servicio: {LTBLUE}{COMMA16}
+STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Fiabilidade: {LTBLUE}{COMMA}%  {BLACK}Roturas dende o último servicio: {LTBLUE}{COMMA}
 STR_9011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Construído: {LTBLUE}{NUMU16}{BLACK} Valor: {LTBLUE}{CURRENCY}
 STR_9012_CAPACITY                                               :{BLACK}Capacidade: {LTBLUE}{STRING}
 STR_9013_MUST_BE_STOPPED_INSIDE                                 :{WHITE}...debe estar parado dentro dun depósito de vehículos de estrada
 STR_9014_CAN_T_SELL_ROAD_VEHICLE                                :{WHITE}Non se pode vende-lo vehículo de estrada...
 STR_9015_CAN_T_STOP_START_ROAD_VEHICLE                          :{WHITE}No se pode parar/arrincar o vehículo de estrada...
-STR_9016_ROAD_VEHICLE_IS_WAITING                                :{WHITE}O vehículo de estrada {COMMA16} está a esperar no depósito
+STR_9016_ROAD_VEHICLE_IS_WAITING                                :{WHITE}O vehículo de estrada {COMMA} está a esperar no depósito
 STR_HEADING_FOR_ROAD_DEPOT                                      :{LTBLUE}Diríxese o depósito de {TOWN}
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{LTBLUE}Diríxese o depósito de {TOWN}, {VELOCITY}
 STR_9018_CAN_T_SEND_VEHICLE_TO_DEPOT                            :{WHITE}Non se pode envia-lo vehículo ó depósito de estrada...
@@ -2546,7 +2546,7 @@
 STR_902F_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Celebración cidadá . . .{}¡Chega o primeiro autobús a {STATION}!
 STR_9030_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Celebración cidadá . . .{}¡Chega o primeiro camión a {STATION}!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}¡Accidente de Tráfico!{}O conductor morre na explosión producida tra-la colisión cun tren
-STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}¡Accidente de Tráfico!{}{COMMA16} morren na explosión producida tra-la colisión cun tren
+STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}¡Accidente de Tráfico!{}{COMMA} morren na explosión producida tra-la colisión cun tren
 STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}No se pode dacer que o vehículo de volta...
 STR_9034_RENAME                                                 :{BLACK}Renomear
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Renomea-lo tipo de vehículo de estrada
@@ -2561,7 +2561,7 @@
 STR_9802_CAN_T_BUILD_DOCK_HERE                                  :{WHITE}Non se pode construí-lo peirao aí...
 STR_9803_SHIP_DEPOT                                             :{WHITE}Depósito de Barcos de {TOWN}
 STR_9804_NEW_SHIPS                                              :{BLACK}Novos Barcos
-STR_9805_SHIPS                                                  :{WHITE}{STRING} - {COMMA16} Barcos
+STR_9805_SHIPS                                                  :{WHITE}{STRING} - {COMMA} Barcos
 STR_9806_CAN_T_BUILD_SHIPS                                      :{WHITE}No se pode construí-los barcos...
 STR_9807_MUST_BUILD_SHIP_DEPOT_FIRST                            :{WHITE}Debes construír un depósito de barcos primeiro
 STR_9808_NEW_SHIPS                                              :{WHITE}Novos Barcos
@@ -2576,7 +2576,7 @@
 STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Idade: {LTBLUE}{STRING}{BLACK}   Coste de Mantemento: {LTBLUE}{CURRENCY}/ano
 STR_9813_MAX_SPEED                                              :{BLACK}Velodidade Máx.: {LTBLUE}{VELOCITY}
 STR_9814_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Beneficio este ano: {LTBLUE}{CURRENCY}  (último ano: {CURRENCY})
-STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Fiabilidade: {LTBLUE}{COMMA8}%  {BLACK}Roturas dende o último servicio: {LTBLUE}{COMMA16}
+STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Fiabilidade: {LTBLUE}{COMMA}%  {BLACK}Roturas dende o último servicio: {LTBLUE}{COMMA}
 STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Construído: {LTBLUE}{NUMU16}{BLACK} Valor: {LTBLUE}{CURRENCY}
 STR_9817_CAPACITY                                               :{BLACK}Capacidade: {LTBLUE}{STRING}
 STR_9818_CAN_T_STOP_START_SHIP                                  :{WHITE}Non se pode parar/arrincar o barco...
@@ -2584,7 +2584,7 @@
 STR_981A_UNABLE_TO_FIND_LOCAL_DEPOT                             :{WHITE}No se pode atopar unha ruta ó depósito local
 STR_HEADING_FOR_SHIP_DEPOT                                      :{LTBLUE}Diríxese o Depósito de Barcos de {TOWN}
 STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{LTBLUE}Diríxese o Depósito de Barcos de {TOWN}, {VELOCITY}
-STR_981C_SHIP_IS_WAITING_IN_DEPOT                               :{WHITE}O barco {COMMA16} esta a esperar no depósito
+STR_981C_SHIP_IS_WAITING_IN_DEPOT                               :{WHITE}O barco {COMMA} esta a esperar no depósito
 STR_981D_BUILD_SHIP_DOCK                                        :{BLACK}Construír peirao para barcos
 STR_981E_BUILD_SHIP_DEPOT_FOR_BUILDING                          :{BLACK}Construír depósito para barcos (para construír e dar servicio os barcos)
 STR_981F_SHIPS_CLICK_ON_SHIP_FOR                                :{BLACK}Barcos - pincha nun barco para máis información
@@ -2635,19 +2635,19 @@
 STR_A005_NEW_AIRCRAFT                                           :{WHITE}Nova Aeronave
 STR_A006_BUILD_AIRCRAFT                                         :{BLACK}Construír Aeronave
 STR_A008_CAN_T_BUILD_AIRCRAFT                                   :{WHITE}Non se pode construí-lo avíon...
-STR_A009_AIRCRAFT                                               :{WHITE}{STRING} - {COMMA16} Aeronave
+STR_A009_AIRCRAFT                                               :{WHITE}{STRING} - {COMMA} Aeronave
 STR_A00A                                                        :{WHITE}{STRING}
 STR_A00B_ORDERS                                                 :{WHITE}{STRING} (Ordes)
 STR_A00C_DETAILS                                                :{WHITE}{STRING} (Detalles)
 STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Idade: {LTBLUE}{STRING}{BLACK}   Coste de Mantemento: {LTBLUE}{CURRENCY}/ano
 STR_A00E_MAX_SPEED                                              :{BLACK}Velocidade Máx.: {LTBLUE}{VELOCITY}
 STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Beneficio este ano: {LTBLUE}{CURRENCY}  (último ano: {CURRENCY})
-STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Fiabilidade: {LTBLUE}{COMMA8}%  {BLACK}Roturas dende o último serivicio: {LTBLUE}{COMMA16}
+STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Fiabilidade: {LTBLUE}{COMMA}%  {BLACK}Roturas dende o último serivicio: {LTBLUE}{COMMA}
 STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Construído: {LTBLUE}{NUMU16}{BLACK} Valor: {LTBLUE}{CURRENCY}
 STR_A012_CAN_T_SEND_AIRCRAFT_TO                                 :{WHITE}Non se pode envia-la aeronave ó hangar...
 STR_HEADING_FOR_HANGAR                                          :{LTBLUE}Diríxese ó hangar de {STATION}
 STR_HEADING_FOR_HANGAR_VEL                                      :{LTBLUE}Diríxese ó hangar de {STATION}, {VELOCITY}
-STR_A014_AIRCRAFT_IS_WAITING_IN                                 :{WHITE}A aeronave {COMMA16} está a esperar no hangar
+STR_A014_AIRCRAFT_IS_WAITING_IN                                 :{WHITE}A aeronave {COMMA} está a esperar no hangar
 STR_A015_AIRCRAFT_IN_THE_WAY                                    :{WHITE}Aeronave no camiño
 STR_A016_CAN_T_STOP_START_AIRCRAFT                              :{WHITE}Non se pode parar/arrincar a aeronave...
 STR_A017_AIRCRAFT_IS_IN_FLIGHT                                  :{WHITE}A aeronave esta voando
@@ -2673,14 +2673,14 @@
 STR_A02B_SHOW_AIRCRAFT_DETAILS                                  :{BLACK}Mostra-los detalles da aeronave
 STR_A02C_NEW_AIRCRAFT_NOW_AVAILABLE                             :{BLACK}{BIGFONT}¡Nova aeronave dispoñible!
 STR_A02D                                                        :{BLACK}{BIGFONT}{STRING}
-STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Coste: {CURRENCY} Velocidade Máx.: {VELOCITY}{}Capacidade: {COMMA16} pasaxeiros, {COMMA16} sacos de correo{}Coste de Mantemento: {CURRENCY}/ano
+STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Coste: {CURRENCY} Velocidade Máx.: {VELOCITY}{}Capacidade: {COMMA} pasaxeiros, {COMMA} sacos de correo{}Coste de Mantemento: {CURRENCY}/ano
 
 STR_A030_NAME_AIRCRAFT                                          :{WHITE}Renomear aeronave
 STR_A031_CAN_T_NAME_AIRCRAFT                                    :{WHITE}Non se pode renomea-la aeronave...
 STR_A032_NAME_AIRCRAFT                                          :{BLACK}Renomear aeronave
 STR_A033_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Celebración cidadá . . .{}¡Chega a primeira aeronave a {STATION}!
-STR_A034_PLANE_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Plane Crash!{}{COMMA16} die in fireball at {STATION}
-STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}¡Accidente de Aeronave!¡A aeronave {} quedou sen combustible, hai {COMMA16} mortos na explosión!
+STR_A034_PLANE_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Plane Crash!{}{COMMA} die in fireball at {STATION}
+STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}¡Accidente de Aeronave!¡A aeronave {} quedou sen combustible, hai {COMMA} mortos na explosión!
 STR_A035_DESTINATIONS                                           :{TINYFONT}{BLACK}Destinos:
 STR_A036                                                        :{TINYFONT}{BLACK}{STATION}
 STR_A037_RENAME                                                 :{BLACK}Renomear
@@ -2706,7 +2706,7 @@
 STR_B003_FACTORY_DESTROYED_IN_SUSPICIOUS                        :{BLACK}{BIGFONT}¡Factoría destruida en circunstancias sospeitosas cerca de {TOWN}!
 STR_B004_UFO_LANDS_NEAR                                         :{BLACK}{BIGFONT}¡Aterrizaxe dun 'OVNI cerca de {TOWN}!
 STR_B005_COAL_MINE_SUBSIDENCE_LEAVES                            :{BLACK}{BIGFONT}¡Afundimento dunha Mina de Carbón deixa un rastro de destrucción cerca de {TOWN}!
-STR_B006_FLOOD_VEHICLE_DESTROYED                                :{BLACK}{BIGFONT}¡Inundacións!{}¡Hay polo menos {COMMA16} desaparecidos, presuntamente mortos tras unha grande inundación!
+STR_B006_FLOOD_VEHICLE_DESTROYED                                :{BLACK}{BIGFONT}¡Inundacións!{}¡Hay polo menos {COMMA} desaparecidos, presuntamente mortos tras unha grande inundación!
 
 STR_BRIBE_FAILED                                                :{WHITE}O tento de suborno foi
 STR_BRIBE_FAILED_2                                              :{WHITE}descuberto por un investigador rexional.
@@ -2716,7 +2716,7 @@
 STR_PERFORMANCE_DETAIL                                          :{WHITE}Punt. rendemento detallada
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Detalle
 STR_PERFORMANCE_DETAIL_AMOUNT_CURRENCY                          :{BLACK}({CURRCOMPACT}/{CURRCOMPACT})
-STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA32}/{COMMA32})
+STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA}/{COMMA})
 STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{INT32}%
 SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{INT32}
 ############ Those following lines need to be in this order!!
@@ -2748,7 +2748,7 @@
 STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID:
 
 STR_CURRENCY_WINDOW                                             :{WHITE}Moeda persoalizada
-STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Taxa de cambio: {ORANGE}{CURRENCY} = {POUNDSIGN} {COMMA16}
+STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Taxa de cambio: {ORANGE}{CURRENCY} = {POUNDSIGN} {COMMA}
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Separador:
 STR_CURRENCY_PREFIX                                             :{LTBLUE}Prefixo:
 STR_CURRENCY_SUFFIX                                             :{LTBLUE}Sufixo:
@@ -2762,10 +2762,10 @@
 STR_PLANE                                                       :{BLACK}{PLANE}
 STR_SHIP                                                        :{BLACK}{SHIP}
 
-STR_SCHEDULED_TRAINS                                            :{WHITE}{STATION} - {COMMA16} Trens
-STR_SCHEDULED_ROAD_VEHICLES                                     :{WHITE}{STATION} - {COMMA16} Camións/Buses
-STR_SCHEDULED_AIRCRAFT                                          :{WHITE}{STATION} - {COMMA16} Aeronaves
-STR_SCHEDULED_SHIPS                                             :{WHITE}{STATION} - {COMMA16} Navíos
+STR_SCHEDULED_TRAINS                                            :{WHITE}{STATION} - {COMMA} Trens
+STR_SCHEDULED_ROAD_VEHICLES                                     :{WHITE}{STATION} - {COMMA} Camións/Buses
+STR_SCHEDULED_AIRCRAFT                                          :{WHITE}{STATION} - {COMMA} Aeronaves
+STR_SCHEDULED_SHIPS                                             :{WHITE}{STATION} - {COMMA} Navíos
 
 STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Mostrar tódolos trens que teñen esta estación nas súas ordes
 STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Mostrar tódolos vehículos de estrada que teñen esta estación nas súas ordes
@@ -2780,7 +2780,7 @@
 STR_REPLACE_HELP                                                :{BLACK}Permíteche reemplazar untipo de máquina cunha doutro tipo, cando trens do tipo orixinal entran nun depósito
 
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
-STR_SIGN_LIST_CAPTION                                           :{WHITE}Lista de Sinais - {COMMA16} Sinais
+STR_SIGN_LIST_CAPTION                                           :{WHITE}Lista de Sinais - {COMMA} Sinais
 
 ############ Lists rail types
 
@@ -2790,9 +2790,9 @@
 
 ############ End of list of rail types
 
-STR_TINY_BLACK                                                  :{BLACK}{TINYFONT}{COMMA16}
+STR_TINY_BLACK                                                  :{BLACK}{TINYFONT}{COMMA}
 
-STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Coste: {GOLD}{CURRENCY}{BLACK} Peso: {GOLD}{COMMA16}t
-STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Velocidade: {GOLD}{VELOCITY}{BLACK}  Potencia: {GOLD}{COMMA32}cv
+STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Coste: {GOLD}{CURRENCY}{BLACK} Peso: {GOLD}{COMMA}t
+STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Velocidade: {GOLD}{VELOCITY}{BLACK}  Potencia: {GOLD}{COMMA}cv
 STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}Mantemento: {GOLD}{CURRENCY}/ano
-STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Capacidade: {GOLD}{COMMA16} pasaxeiros, {COMMA16} sacos de correo
+STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Capacidade: {GOLD}{COMMA} pasaxeiros, {COMMA} sacos de correo
--- a/lang/german.txt	Thu Jul 14 09:53:52 2005 +0000
+++ b/lang/german.txt	Thu Jul 14 15:10:20 2005 +0000
@@ -82,69 +82,69 @@
 STR_004C_PLASTIC                                                :Plastik
 STR_004D_FIZZY_DRINK                                            :Limonade
 STR_004E                                                        :
-STR_004F_PASSENGER                                              :{COMMA16} Passagier
-STR_0050_TON_OF_COAL                                            :{COMMA16} Tonne Kohle
-STR_0051_BAG_OF_MAIL                                            :{COMMA16} Postsack
+STR_004F_PASSENGER                                              :{COMMA} Passagier
+STR_0050_TON_OF_COAL                                            :{COMMA} Tonne Kohle
+STR_0051_BAG_OF_MAIL                                            :{COMMA} Postsack
 STR_0052_OF_OIL                                                 :{VOLUME}  Öl
-STR_0053_ITEM_OF_LIVESTOCK                                      :{COMMA16} Stück Vieh
-STR_0054_CRATE_OF_GOODS                                         :{COMMA16} Warenkiste
-STR_0055_TON_OF_GRAIN                                           :{COMMA16} Tonne Getreide
-STR_0056_TON_OF_WOOD                                            :{COMMA16} Tonne Holz
-STR_0057_TON_OF_IRON_ORE                                        :{COMMA16} Tonne Eisenerz
-STR_0058_TON_OF_STEEL                                           :{COMMA16} Tonne Stahl
-STR_0059_BAG_OF_VALUABLES                                       :{COMMA16} Sack mit Wertsachen
-STR_005A_TON_OF_COPPER_ORE                                      :{COMMA16} Tonne Kupfererz
-STR_005B_TON_OF_MAIZE                                           :{COMMA16} Tonne Mais
-STR_005C_TON_OF_FRUIT                                           :{COMMA16} Tonne Früchte
-STR_005D_BAG_OF_DIAMONDS                                        :{COMMA16} Sack mit Diamanten
-STR_005E_TON_OF_FOOD                                            :{COMMA16} Tonne Nahrungsmittel
-STR_005F_TON_OF_PAPER                                           :{COMMA16} Tonne Papier
-STR_0060_BAG_OF_GOLD                                            :{COMMA16} Sack mit Gold
+STR_0053_ITEM_OF_LIVESTOCK                                      :{COMMA} Stück Vieh
+STR_0054_CRATE_OF_GOODS                                         :{COMMA} Warenkiste
+STR_0055_TON_OF_GRAIN                                           :{COMMA} Tonne Getreide
+STR_0056_TON_OF_WOOD                                            :{COMMA} Tonne Holz
+STR_0057_TON_OF_IRON_ORE                                        :{COMMA} Tonne Eisenerz
+STR_0058_TON_OF_STEEL                                           :{COMMA} Tonne Stahl
+STR_0059_BAG_OF_VALUABLES                                       :{COMMA} Sack mit Wertsachen
+STR_005A_TON_OF_COPPER_ORE                                      :{COMMA} Tonne Kupfererz
+STR_005B_TON_OF_MAIZE                                           :{COMMA} Tonne Mais
+STR_005C_TON_OF_FRUIT                                           :{COMMA} Tonne Früchte
+STR_005D_BAG_OF_DIAMONDS                                        :{COMMA} Sack mit Diamanten
+STR_005E_TON_OF_FOOD                                            :{COMMA} Tonne Nahrungsmittel
+STR_005F_TON_OF_PAPER                                           :{COMMA} Tonne Papier
+STR_0060_BAG_OF_GOLD                                            :{COMMA} Sack mit Gold
 STR_0061_OF_WATER                                               :{VOLUME}  Wasser
-STR_0062_TON_OF_WHEAT                                           :{COMMA16} Tonne Weizen
+STR_0062_TON_OF_WHEAT                                           :{COMMA} Tonne Weizen
 STR_0063_OF_RUBBER                                              :{VOLUME}  Kautschuk
-STR_0064_TON_OF_SUGAR                                           :{COMMA16} Tonne Zucker
-STR_0065_TOY                                                    :{COMMA16} Spielzeug
-STR_0066_BAG_OF_CANDY                                           :{COMMA16} Sack mit Bonbons
+STR_0064_TON_OF_SUGAR                                           :{COMMA} Tonne Zucker
+STR_0065_TOY                                                    :{COMMA} Spielzeug
+STR_0066_BAG_OF_CANDY                                           :{COMMA} Sack mit Bonbons
 STR_0067_OF_COLA                                                :{VOLUME}  Cola
-STR_0068_TON_OF_COTTON_CANDY                                    :{COMMA16} Tonne Zuckerwatte
-STR_0069_BUBBLE                                                 :{COMMA16} Luftblase
-STR_006A_TON_OF_TOFFEE                                          :{COMMA16} Tonne Karamell
-STR_006B_BATTERY                                                :{COMMA16} Batterie
+STR_0068_TON_OF_COTTON_CANDY                                    :{COMMA} Tonne Zuckerwatte
+STR_0069_BUBBLE                                                 :{COMMA} Luftblase
+STR_006A_TON_OF_TOFFEE                                          :{COMMA} Tonne Karamell
+STR_006B_BATTERY                                                :{COMMA} Batterie
 STR_006C_OF_PLASTIC                                             :{VOLUME}  Plastik
-STR_006D_FIZZY_DRINK                                            :{COMMA16} Limonade
+STR_006D_FIZZY_DRINK                                            :{COMMA} Limonade
 STR_006E                                                        :
-STR_006F_PASSENGERS                                             :{COMMA16} Passagiere
-STR_0070_TONS_OF_COAL                                           :{COMMA16} Tonnen Kohle
-STR_0071_BAGS_OF_MAIL                                           :{COMMA16} Postsäcke
+STR_006F_PASSENGERS                                             :{COMMA} Passagiere
+STR_0070_TONS_OF_COAL                                           :{COMMA} Tonnen Kohle
+STR_0071_BAGS_OF_MAIL                                           :{COMMA} Postsäcke
 STR_0072_OF_OIL                                                 :{VOLUME}  Öl
-STR_0073_ITEMS_OF_LIVESTOCK                                     :{COMMA16} Stück Vieh
-STR_0074_CRATES_OF_GOODS                                        :{COMMA16} Warenkisten
-STR_0075_TONS_OF_GRAIN                                          :{COMMA16} Tonnen Getreide
-STR_0076_TONS_OF_WOOD                                           :{COMMA16} Tonnen Holz
-STR_0077_TONS_OF_IRON_ORE                                       :{COMMA16} Tonnen Eisenerz
-STR_0078_TONS_OF_STEEL                                          :{COMMA16} Tonnen Stahl
-STR_0079_BAGS_OF_VALUABLES                                      :{COMMA16} Säcke mit Wertsachen
-STR_007A_TONS_OF_COPPER_ORE                                     :{COMMA16} Tonnen Kupfererz
-STR_007B_TONS_OF_MAIZE                                          :{COMMA16} Tonnen Mais
-STR_007C_TONS_OF_FRUIT                                          :{COMMA16} Tonnen Früchte
-STR_007D_BAGS_OF_DIAMONDS                                       :{COMMA16} Säcke mit Diamanten
-STR_007E_TONS_OF_FOOD                                           :{COMMA16} Tonnen Nahrungsmittel
-STR_007F_TONS_OF_PAPER                                          :{COMMA16} Tonnen Papier
-STR_0080_BAGS_OF_GOLD                                           :{COMMA16} Säcke mit Gold
+STR_0073_ITEMS_OF_LIVESTOCK                                     :{COMMA} Stück Vieh
+STR_0074_CRATES_OF_GOODS                                        :{COMMA} Warenkisten
+STR_0075_TONS_OF_GRAIN                                          :{COMMA} Tonnen Getreide
+STR_0076_TONS_OF_WOOD                                           :{COMMA} Tonnen Holz
+STR_0077_TONS_OF_IRON_ORE                                       :{COMMA} Tonnen Eisenerz
+STR_0078_TONS_OF_STEEL                                          :{COMMA} Tonnen Stahl
+STR_0079_BAGS_OF_VALUABLES                                      :{COMMA} Säcke mit Wertsachen
+STR_007A_TONS_OF_COPPER_ORE                                     :{COMMA} Tonnen Kupfererz
+STR_007B_TONS_OF_MAIZE                                          :{COMMA} Tonnen Mais
+STR_007C_TONS_OF_FRUIT                                          :{COMMA} Tonnen Früchte
+STR_007D_BAGS_OF_DIAMONDS                                       :{COMMA} Säcke mit Diamanten
+STR_007E_TONS_OF_FOOD                                           :{COMMA} Tonnen Nahrungsmittel
+STR_007F_TONS_OF_PAPER                                          :{COMMA} Tonnen Papier
+STR_0080_BAGS_OF_GOLD                                           :{COMMA} Säcke mit Gold
 STR_0081_OF_WATER                                               :{VOLUME}  Wasser
-STR_0082_TONS_OF_WHEAT                                          :{COMMA16} Tonnen Weizen
+STR_0082_TONS_OF_WHEAT                                          :{COMMA} Tonnen Weizen
 STR_0083_OF_RUBBER                                              :{VOLUME}  Kautschuk
-STR_0084_TONS_OF_SUGAR                                          :{COMMA16} Tonnen Zucker
-STR_0085_TOYS                                                   :{COMMA16} Spielwaren
-STR_0086_BAGS_OF_CANDY                                          :{COMMA16} Tonnen Bonbons
+STR_0084_TONS_OF_SUGAR                                          :{COMMA} Tonnen Zucker
+STR_0085_TOYS                                                   :{COMMA} Spielwaren
+STR_0086_BAGS_OF_CANDY                                          :{COMMA} Tonnen Bonbons
 STR_0087_OF_COLA                                                :{VOLUME}  Cola
-STR_0088_TONS_OF_COTTON_CANDY                                   :{COMMA16} Tonnen Zuckerwatte
-STR_0089_BUBBLES                                                :{COMMA16} Luftblasen
-STR_008A_TONS_OF_TOFFEE                                         :{COMMA16} Tonnen Karamell
-STR_008B_BATTERIES                                              :{COMMA16} Batterien
+STR_0088_TONS_OF_COTTON_CANDY                                   :{COMMA} Tonnen Zuckerwatte
+STR_0089_BUBBLES                                                :{COMMA} Luftblasen
+STR_008A_TONS_OF_TOFFEE                                         :{COMMA} Tonnen Karamell
+STR_008B_BATTERIES                                              :{COMMA} Batterien
 STR_008C_OF_PLASTIC                                             :{VOLUME}  Plastik
-STR_008D_FIZZY_DRINKS                                           :{COMMA16} Limonade
+STR_008D_FIZZY_DRINKS                                           :{COMMA} Limonade
 STR_008E                                                        :
 STR_008F_PS                                                     :{TINYFONT}PS
 STR_0090_CL                                                     :{TINYFONT}KL
@@ -219,8 +219,8 @@
 STR_00DF_GREY                                                   :Grau
 STR_00E0_WHITE                                                  :Weiß
 STR_00E1_TOO_MANY_VEHICLES_IN_GAME                              :{WHITE}Zu viele Fahrzeuge im Spiel
-STR_00E2                                                        :{BLACK}{COMMA16}
-STR_00E3                                                        :{RED}{COMMA16}
+STR_00E2                                                        :{BLACK}{COMMA}
+STR_00E3                                                        :{RED}{COMMA}
 STR_00E4_LOCATION                                               :{BLACK}Standort
 STR_00E5_CONTOURS                                               :Umrisse
 STR_00E6_VEHICLES                                               :Fahrzeuge
@@ -441,18 +441,18 @@
 STR_0198_PROFIT_THIS_YEAR_LAST_YEAR                             :{TINYFONT}{BLACK}Profit laufendes Jahr: {CURRENCY} (vorheriges Jahr: {CURRENCY})
 
 ############ range for service numbers starts
-STR_0199_YEAR                                                   :{COMMA16} Jahr ({COMMA16})
-STR_019A_YEARS                                                  :{COMMA16} Jahre ({COMMA16})
-STR_019B_YEARS                                                  :{RED}{COMMA16} Jahre ({COMMA16})
+STR_0199_YEAR                                                   :{COMMA} Jahr ({COMMA})
+STR_019A_YEARS                                                  :{COMMA} Jahre ({COMMA})
+STR_019B_YEARS                                                  :{RED}{COMMA} Jahre ({COMMA})
 ############ range for service numbers ends
 
 STR_019C_ROAD_VEHICLE                                           :Fahrzeug
 STR_019D_AIRCRAFT                                               :Flugzeug
 STR_019E_SHIP                                                   :Schiff
 STR_019F_TRAIN                                                  :Zug
-STR_01A0_IS_GETTING_OLD                                         :{WHITE}{STRING} {COMMA16} kommt in die Jahre
-STR_01A1_IS_GETTING_VERY_OLD                                    :{WHITE}{STRING} {COMMA16} ist veraltet
-STR_01A2_IS_GETTING_VERY_OLD_AND                                :{WHITE}{STRING} {COMMA16} ist völlig veraltet und sollte ersetzt werden
+STR_01A0_IS_GETTING_OLD                                         :{WHITE}{STRING} {COMMA} kommt in die Jahre
+STR_01A1_IS_GETTING_VERY_OLD                                    :{WHITE}{STRING} {COMMA} ist veraltet
+STR_01A2_IS_GETTING_VERY_OLD_AND                                :{WHITE}{STRING} {COMMA} ist völlig veraltet und sollte ersetzt werden
 STR_01A3_LAND_AREA_INFORMATION                                  :{WHITE}Gebietsinformation
 STR_01A4_COST_TO_CLEAR_N_A                                      :{BLACK}Kosten für die Räumung: {LTBLUE}N/A
 STR_01A5_COST_TO_CLEAR                                          :{BLACK}Kosten für die Räumung: {LTBLUE}{CURRENCY}
@@ -497,7 +497,7 @@
 STR_01CA_31ST                                                   :31.
 ############ range for days	ends
 
-STR_01CB                                                        :{TINYFONT}{COMMA16}
+STR_01CB                                                        :{TINYFONT}{COMMA}
 STR_01CC_TOGGLE_LARGE_SMALL_MAP                                 :{BLACK}Zwischen kleiner/großer Karte umschalten
 STR_01CD_SELECT_TUTORIAL_DEMONSTRATION                          :{WHITE}Einführung / Demonstration wählen
 
@@ -509,7 +509,7 @@
 STR_CARGO_ACCEPTED_5                                            :{BLACK}Akzeptierte Fracht: {LTBLUE}{STRING}, {STRING}, {STRING}, {STRING}, {STRING}
 ############ range for cargo acecpted ends
 
-STR_01D1_8                                                      :({COMMA8}/8 {STRING})
+STR_01D1_8                                                      :({COMMA}/8 {STRING})
 STR_01D2_JAZZ_JUKEBOX                                           :{WHITE}Musikbox
 STR_01D3_SOUND_MUSIC                                            :Sound / Musik
 STR_01D4_SHOW_SOUND_MUSIC_WINDOW                                :{BLACK}Zeige Sound- / Musikfenster
@@ -528,16 +528,16 @@
 STR_01E1_START_PLAYING_MUSIC                                    :{BLACK}Wiedergabe starten
 STR_01E2_DRAG_SLIDERS_TO_SET_MUSIC                              :{BLACK}Schieberegler für Musik- / Soundlautstärke
 STR_01E3                                                        :{DKGREEN}{TINYFONT}--
-STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA8}
-STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA8}
+STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA}
+STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA}
 STR_01E6                                                        :{DKGREEN}{TINYFONT}------
 STR_01E7                                                        :{DKGREEN}{TINYFONT}"{STRING}"
 STR_01E8_TRACK_XTITLE                                           :{BLACK}{TINYFONT}Track{SETX 88}Titel
 STR_01E9_SHUFFLE                                                :{TINYFONT}Mischen
 STR_01EA_PROGRAM                                                :{TINYFONT}{BLACK}Programm
 STR_01EB_MUSIC_PROGRAM_SELECTION                                :{WHITE}Musik-Programmauswahl
-STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA16} "{STRING}"
-STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA16}   "{STRING}"
+STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} "{STRING}"
+STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA}   "{STRING}"
 STR_01EE_TRACK_INDEX                                            :{TINYFONT}{BLACK}Track Inhalt
 STR_01EF_PROGRAM                                                :{TINYFONT}{BLACK}Programm - '{STRING}'
 STR_01F0_CLEAR                                                  :{TINYFONT}{BLACK}Bereinigen
@@ -577,7 +577,7 @@
 STR_0210_TOO_FAR_FROM_PREVIOUS_DESTINATIO                       :{WHITE}...zu weit vom vorherigen Bestimmungsort entfernt
 STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Beste Unternehmen, die {NUMU16} erreichten{}(Schwierigkeitsgrad {STRING})
 STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Firmentabelle in {NUMU16}
-STR_0212                                                        :{BIGFONT}{COMMA16}.
+STR_0212                                                        :{BIGFONT}{COMMA}.
 STR_0213_BUSINESSMAN                                            :Geschäftsmann
 STR_0214_ENTREPRENEUR                                           :Unternehmer
 STR_0215_INDUSTRIALIST                                          :Industrieller
@@ -586,12 +586,12 @@
 STR_0218_MOGUL                                                  :Mogul
 STR_0219_TYCOON_OF_THE_CENTURY                                  :Tycoon des Jahrhunderts
 STR_HIGHSCORE_NAME                                              :{BIGFONT}{STRING}, {STRING}
-STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA16})
+STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA})
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{STRING} erreicht '{STRING}' Status!
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{STRING} von {STRING} erreicht '{STRING}' Status!
 STR_021D                                                        :{BLACK}
 STR_021E                                                        :{WHITE}
-STR_021F                                                        :{BLUE}{COMMA16}
+STR_021F                                                        :{BLUE}{COMMA}
 STR_0220_CREATE_SCENARIO                                        :{BLACK}Szenario erstellen
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Szenario bearbeiten
@@ -788,8 +788,8 @@
 STR_EXTRA_VIEW_PORT                                             :Zusatzansicht
 STR_SIGN_LIST                                                   :Schilderliste
 STR_02DF_TOWN_DIRECTORY                                         :Städteverzeichnis
-STR_TOWN_POPULATION                                             :{BLACK}Weltbevölkerung: {COMMA32}
-STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Ansicht {COMMA16}
+STR_TOWN_POPULATION                                             :{BLACK}Weltbevölkerung: {COMMA}
+STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Ansicht {COMMA}
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN                                :{BLACK}In Zusatzansicht
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT                             :{BLACK}Kopieren der Position im Hauptfenster in diese Zusatzansicht
 STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW                                :{BLACK}Aus Zusatzansicht
@@ -961,34 +961,34 @@
 STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Kann Fahrplan nicht kopieren...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Ende des gemeinsamen Fahrplans - -
 
-STR_TRAIN_IS_LOST                                               :{WHITE}Zug {COMMA16} findet den Weg nicht.
-STR_TRAIN_IS_UNPROFITABLE                                       :{WHITE}Einkommen von Zug {COMMA16} war letztes Jahr {CURRENCY}
+STR_TRAIN_IS_LOST                                               :{WHITE}Zug {COMMA} findet den Weg nicht.
+STR_TRAIN_IS_UNPROFITABLE                                       :{WHITE}Einkommen von Zug {COMMA} war letztes Jahr {CURRENCY}
 STR_EURO_INTRODUCE                                              :{BLACK}{BIGFONT}Europäische Währungsunion!{}{}Der Euro wird einzige Währung für alltägliche Zahlungsvorgänge.
 
 # Start of order review system.
 # DON'T ADD OR REMOVE LINES HERE
-STR_TRAIN_HAS_TOO_FEW_ORDERS                                    :{WHITE}Zug {COMMA16} hat zu wenige Aufträge im Fahrplan
-STR_TRAIN_HAS_VOID_ORDER                                        :{WHITE}Zug {COMMA16} hat einen leeren Auftrag
-STR_TRAIN_HAS_DUPLICATE_ENTRY                                   :{WHITE}Zug {COMMA16} hat doppelte Aufträge
-STR_TRAIN_HAS_INVALID_ENTRY                                     :{WHITE}Zug {COMMA16} hat einen ungültigen Stationsnamen im Fahrplan
-STR_ROADVEHICLE_HAS_TOO_FEW_ORDERS                              :{WHITE}Fahrzeug {COMMA16} hat zu wenige Aufträge im Fahrplan
-STR_ROADVEHICLE_HAS_VOID_ORDER                                  :{WHITE}Fahrzeug {COMMA16} hat einen leeren Auftrag
-STR_ROADVEHICLE_HAS_DUPLICATE_ENTRY                             :{WHITE}Fahrzeug {COMMA16} hat doppelte Aufträge
-STR_ROADVEHICLE_HAS_INVALID_ENTRY                               :{WHITE}Fahrzeug {COMMA16} hat einen ungültigen Stationsnamen im Fahrplan
-STR_SHIP_HAS_TOO_FEW_ORDERS                                     :{WHITE}Schiff {COMMA16} hat zu wenige Aufträge im Fahrplan
-STR_SHIP_HAS_VOID_ORDER                                         :{WHITE}Schiff {COMMA16} hat einen leeren Auftrag
-STR_SHIP_HAS_DUPLICATE_ENTRY                                    :{WHITE}Schiff {COMMA16} hat doppelte Aufträge
-STR_SHIP_HAS_INVALID_ENTRY                                      :{WHITE}Schiff {COMMA16} hat einen ungültigen Stationsnamen im Fahrplan
-STR_AIRCRAFT_HAS_TOO_FEW_ORDERS                                 :{WHITE}Flugzeug {COMMA16} hat zu wenige Aufträge im Flugplan
-STR_AIRCRAFT_HAS_VOID_ORDER                                     :{WHITE}Flugzeug {COMMA16} hat einen leeren Auftrag
-STR_AIRCRAFT_HAS_DUPLICATE_ENTRY                                :{WHITE}Flugzeug {COMMA16} hat doppelte Aufträge
-STR_AIRCRAFT_HAS_INVALID_ENTRY                                  :{WHITE}Flugzeug {COMMA16} hat einen ungültigen Stationsnamen im Fahrplan
+STR_TRAIN_HAS_TOO_FEW_ORDERS                                    :{WHITE}Zug {COMMA} hat zu wenige Aufträge im Fahrplan
+STR_TRAIN_HAS_VOID_ORDER                                        :{WHITE}Zug {COMMA} hat einen leeren Auftrag
+STR_TRAIN_HAS_DUPLICATE_ENTRY                                   :{WHITE}Zug {COMMA} hat doppelte Aufträge
+STR_TRAIN_HAS_INVALID_ENTRY                                     :{WHITE}Zug {COMMA} hat einen ungültigen Stationsnamen im Fahrplan
+STR_ROADVEHICLE_HAS_TOO_FEW_ORDERS                              :{WHITE}Fahrzeug {COMMA} hat zu wenige Aufträge im Fahrplan
+STR_ROADVEHICLE_HAS_VOID_ORDER                                  :{WHITE}Fahrzeug {COMMA} hat einen leeren Auftrag
+STR_ROADVEHICLE_HAS_DUPLICATE_ENTRY                             :{WHITE}Fahrzeug {COMMA} hat doppelte Aufträge
+STR_ROADVEHICLE_HAS_INVALID_ENTRY                               :{WHITE}Fahrzeug {COMMA} hat einen ungültigen Stationsnamen im Fahrplan
+STR_SHIP_HAS_TOO_FEW_ORDERS                                     :{WHITE}Schiff {COMMA} hat zu wenige Aufträge im Fahrplan
+STR_SHIP_HAS_VOID_ORDER                                         :{WHITE}Schiff {COMMA} hat einen leeren Auftrag
+STR_SHIP_HAS_DUPLICATE_ENTRY                                    :{WHITE}Schiff {COMMA} hat doppelte Aufträge
+STR_SHIP_HAS_INVALID_ENTRY                                      :{WHITE}Schiff {COMMA} hat einen ungültigen Stationsnamen im Fahrplan
+STR_AIRCRAFT_HAS_TOO_FEW_ORDERS                                 :{WHITE}Flugzeug {COMMA} hat zu wenige Aufträge im Flugplan
+STR_AIRCRAFT_HAS_VOID_ORDER                                     :{WHITE}Flugzeug {COMMA} hat einen leeren Auftrag
+STR_AIRCRAFT_HAS_DUPLICATE_ENTRY                                :{WHITE}Flugzeug {COMMA} hat doppelte Aufträge
+STR_AIRCRAFT_HAS_INVALID_ENTRY                                  :{WHITE}Flugzeug {COMMA} hat einen ungültigen Stationsnamen im Fahrplan
 # end of order system
 
-STR_TRAIN_AUTORENEW_FAILED                                      :{WHITE}Zug {COMMA16} kann nicht erneuert werden (Geld fehlt)
-STR_ROADVEHICLE_AUTORENEW_FAILED                                :{WHITE}Fahrzeug {COMMA16} kann nicht erneuert werden (Geld fehlt)
-STR_SHIP_AUTORENEW_FAILED                                       :{WHITE}Schiff {COMMA16} kann nicht erneuert werden (Geld fehlt)
-STR_AIRCRAFT_AUTORENEW_FAILED                                   :{WHITE}Flugzeug {COMMA16} kann nicht erneuert werden (Geld fehlt)
+STR_TRAIN_AUTORENEW_FAILED                                      :{WHITE}Zug {COMMA} kann nicht erneuert werden (Geld fehlt)
+STR_ROADVEHICLE_AUTORENEW_FAILED                                :{WHITE}Fahrzeug {COMMA} kann nicht erneuert werden (Geld fehlt)
+STR_SHIP_AUTORENEW_FAILED                                       :{WHITE}Schiff {COMMA} kann nicht erneuert werden (Geld fehlt)
+STR_AIRCRAFT_AUTORENEW_FAILED                                   :{WHITE}Flugzeug {COMMA} kann nicht erneuert werden (Geld fehlt)
 
 STR_CONFIG_PATCHES                                              :{BLACK}Einstellungen der Patches
 STR_CONFIG_PATCHES_TIP                                          :{BLACK}Einstellungen der Patches
@@ -1104,7 +1104,7 @@
 STR_CHEATS_TIP                                                  :{BLACK}Kontrollfelder zeigen, ob du diesen Cheat schonmal benutzt hast.
 STR_CHEATS_WARNING                                              :{BLACK}Achtung! Du bist im Begriff, deine Mitspieler zu betrügen. Denke daran, dass dies niemals vergessen werden wird.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Kontostand um {CURRENCY64} erhöhen
-STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Folgenden Spieler steuern: {ORANGE}{COMMA16}
+STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Folgenden Spieler steuern: {ORANGE}{COMMA}
 STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Mächtigeres Abrisswerkzeug: {ORANGE}{STRING}
 STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Tunnel dürfen sich kreuzen {ORANGE}{STRING}
 STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Bauen im Pausenmodus: {ORANGE}{STRING}
@@ -1120,7 +1120,7 @@
 STR_GO_NON_STOP_TO_WAYPOINT                                     :Fahre ohne Halt über {WAYPOINT}
 
 STR_WAYPOINTNAME_CITY                                           :Wegpunkt {TOWN}
-STR_WAYPOINTNAME_CITY_SERIAL                                    :Wegpunkt {TOWN} #{COMMA16}
+STR_WAYPOINTNAME_CITY_SERIAL                                    :Wegpunkt {TOWN} #{COMMA}
 STR_LANDINFO_WAYPOINT                                           :Wegpunkt
 
 STR_WAYPOINT                                                    :{WHITE}Wegpunkt
@@ -1203,8 +1203,8 @@
 STR_CONSTRUCT_SUGAR_MINE_TIP                                    :{BLACK}Zuckermine errichten
 
 STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Industrien
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}){YELLOW} ({COMMA16}% transportiert)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}/{STRING}){YELLOW} ({COMMA16}%/{COMMA16}% transportiert)
+STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}){YELLOW} ({COMMA}% transportiert)
+STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}/{STRING}){YELLOW} ({COMMA}%/{COMMA}% transportiert)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{TOWN} {STRING}
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...zu nah an einer anderen Industrie
@@ -1244,15 +1244,15 @@
 STR_NETWORK_ADD_SERVER_TIP                                      :{BLACK}Fügt einen Server zu der Liste von Servern hinzu, die immer nach laufenden Spielen kontrolliert werden.
 STR_NETWORK_ENTER_IP                                            :{BLACK}IP Adresse des Servers eingeben
 
-STR_NETWORK_CLIENTS_ONLINE                                      :{BLACK}{COMMA16}/{COMMA16}
+STR_NETWORK_CLIENTS_ONLINE                                      :{BLACK}{COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Clienten
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Clienten online / Clienten max.
 STR_NETWORK_GAME_INFO                                           :{SILVER}GAME INFO
 STR_ORANGE                                                      :{ORANGE}{STRING}
-STR_NETWORK_CLIENTS                                             :{SILVER}Clienten:  {WHITE}{COMMA8} / {COMMA8}
+STR_NETWORK_CLIENTS                                             :{SILVER}Clienten:  {WHITE}{COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}Sprache:  {WHITE}{STRING}
 STR_NETWORK_TILESET                                             :{SILVER}Landschaft:  {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Kartengröße:  {WHITE}{COMMA16}x{COMMA16}
+STR_NETWORK_MAP_SIZE                                            :{SILVER}Kartengröße:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Serverversion:  {WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Server Adresse:  {WHITE}{STRING} : {NUMU16}
 STR_NETWORK_START_DATE                                          :{SILVER}Startdatum:  {WHITE}{DATE_SHORT}
@@ -1517,21 +1517,21 @@
 
 ##id 0x2000
 STR_2000_TOWNS                                                  :{WHITE}Städte
-STR_TOWN_LABEL_POP                                              :{WHITE}{STRING} ({COMMA32})
+STR_TOWN_LABEL_POP                                              :{WHITE}{STRING} ({COMMA})
 STR_2001                                                        :{WHITE}{STRING}
 STR_2002                                                        :{TINYFONT}{BLACK}{STRING}
 STR_2003                                                        :{TINYFONT}{WHITE}{STRING}
 STR_2004_BUILDING_MUST_BE_DEMOLISHED                            :{WHITE}Gebäude muss erst abgerissen werden
 STR_2005                                                        :{WHITE}{TOWN}
-STR_2006_POPULATION                                             :{BLACK}Bevölkerung: {ORANGE}{COMMA32}{BLACK}  Häuser: {ORANGE}{COMMA32}
+STR_2006_POPULATION                                             :{BLACK}Bevölkerung: {ORANGE}{COMMA}{BLACK}  Häuser: {ORANGE}{COMMA}
 STR_2007_RENAME_TOWN                                            :Stadt umbenennen
 STR_2008_CAN_T_RENAME_TOWN                                      :{WHITE}Die Stadt kann nicht umbenannt werden...
 STR_2009_LOCAL_AUTHORITY_REFUSES                                :{WHITE}{TOWN} Die Stadtverwaltung erteilt keine Genehmigung
 STR_200A_TOWN_NAMES_CLICK_ON_NAME                               :{BLACK}Städtenamen - klicke auf den Namen, um die Stadt anzuzeigen
 STR_200B_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Ansicht auf Stadt zentrieren
 STR_200C_CHANGE_TOWN_NAME                                       :{BLACK}Stadt umbenennen
-STR_200D_PASSENGERS_LAST_MONTH_MAX                              :{BLACK}Passagiere letzten Monat: {ORANGE}{COMMA32}{BLACK}  max: {ORANGE}{COMMA32}
-STR_200E_MAIL_LAST_MONTH_MAX                                    :{BLACK}Postsäcke letzten Monat: {ORANGE}{COMMA32}{BLACK}  max: {ORANGE}{COMMA32}
+STR_200D_PASSENGERS_LAST_MONTH_MAX                              :{BLACK}Passagiere letzten Monat: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
+STR_200E_MAIL_LAST_MONTH_MAX                                    :{BLACK}Postsäcke letzten Monat: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
 STR_200F_TALL_OFFICE_BLOCK                                      :Hohes Geschäftshaus
 STR_2010_OFFICE_BLOCK                                           :Geschäftshaus
 STR_2011_SMALL_BLOCK_OF_FLATS                                   :Kleines Wohnhaus
@@ -1605,7 +1605,7 @@
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW}Bestechen Sie die Stadtverwaltung, um Ihre Bewertung zu verbessern. Dabei riskieren Sie allerdings eine harte Strafe, falls Sie ertappt werden.{}Kosten: {CURRENCY}
 STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Verkehrschaos in {TOWN}!{}{}Straßensanierungsprogramm finanziert durch {STRING} wird 6 Monate lang Verzögerungen im Verkehr bewirken!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
-STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA32})
+STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA})
 STR_2058_UNDER_CONSTRUCTION                                     :{STRING} (in Bearbeitung)
 STR_2059_IGLOO                                                  :Iglu
 STR_205A_TEPEES                                                 :Zelt
@@ -1667,7 +1667,7 @@
 STR_303C_OUTSTANDING                                            :Hervorragend
 ############ range for rating ends
 
-STR_303D                                                        :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA8}%)
+STR_303D                                                        :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_303E_NO_LONGER_ACCEPTS                                      :{WHITE}{STATION} akzeptiert keine  {STRING} mehr
 STR_303F_NO_LONGER_ACCEPTS_OR                                   :{WHITE}{STATION} akzeptiert keine {STRING} oder {STRING} mehr
 STR_3040_NOW_ACCEPTS                                            :{WHITE}{STATION} akzeptiert jetzt {STRING}
@@ -1678,7 +1678,7 @@
 STR_3045_TOO_CLOSE_TO_ANOTHER_TRUCK                             :{WHITE}Zu dicht an einer anderen Lkw-Ladestation
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Der Busbahnhof muss erst abgerissen werden
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Der Lkw-Ladeplatz muss erst abgerissen werden
-STR_3048_STATIONS                                               :{WHITE}{STRING} - {COMMA16} Haltestellen
+STR_3048_STATIONS                                               :{WHITE}{STRING} - {COMMA} Haltestellen
 STR_3049_0                                                      :{YELLOW}{STATION} {STRINL 0x30D1}
 STR_304A_NONE                                                   :{YELLOW}- Keine -
 STR_304B_SITE_UNSUITABLE                                        :{WHITE}...Gelände ungeeignet
@@ -1735,7 +1735,7 @@
 STR_4002_SAVE                                                   :{BLACK}Speichern
 STR_4003_DELETE                                                 :{BLACK}Löschen
 STR_4004                                                        :{STRING}, {DATE_LONG}
-STR_4005_BYTES_FREE                                             :{BLACK}{COMMA32} Megabytes frei
+STR_4005_BYTES_FREE                                             :{BLACK}{COMMA} Megabytes frei
 STR_4006_UNABLE_TO_READ_DRIVE                                   :{BLACK}Kann vom Laufwerk nicht lesen
 STR_4007_GAME_SAVE_FAILED                                       :{WHITE}Spielspeicherung fehlgeschlagen
 STR_4008_UNABLE_TO_DELETE_FILE                                  :{WHITE}Datei kann nicht gelöscht werden
@@ -1796,7 +1796,7 @@
 ############ range for requires	ends
 
 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Produktion im letzten Monat:
-STR_482B_TRANSPORTED                                            :{YELLOW}{STRING}{BLACK} ({COMMA16}% befördert)
+STR_482B_TRANSPORTED                                            :{YELLOW}{STRING}{BLACK} ({COMMA}% befördert)
 STR_482C_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Zentriere die Ansicht auf das Industriegebiet
 STR_482D_NEW_UNDER_CONSTRUCTION                                 :{BLACK}{BIGFONT}Neue(r/s) {STRING} wird nahe {TOWN} gebaut!
 STR_482E_NEW_BEING_PLANTED_NEAR                                 :{BLACK}{BIGFONT}Neue(r) {STRING} wird nahe {TOWN} aufgeforstet!
@@ -1813,8 +1813,8 @@
 STR_4839_PRODUCTION_DOWN_BY_50                                  :{BLACK}{BIGFONT}{TOWN} {STRING} Produktion sinkt um 50%
 STR_483A_INSECT_INFESTATION_CAUSES                              :{BLACK}{BIGFONT}Insektenplage bei {TOWN} {STRING} verursacht Schaden!{}Produktion sinkt um 50%
 STR_483B_CAN_ONLY_BE_POSITIONED                                 :{WHITE}...kann nur in der Nähe des Kartenrandes errichtet werden
-STR_INDUSTRY_PROD_GOUP                                          :{BLACK}{BIGFONT}{STRING}produktion bei {TOWN} {STRING} erhöht sich um {COMMA16}%!
-STR_INDUSTRY_PROD_GODOWN                                        :{BLACK}{BIGFONT}{STRING}produktion bei {TOWN} {STRING} verringert sich um {COMMA16}%!
+STR_INDUSTRY_PROD_GOUP                                          :{BLACK}{BIGFONT}{STRING}produktion bei {TOWN} {STRING} erhöht sich um {COMMA}%!
+STR_INDUSTRY_PROD_GODOWN                                        :{BLACK}{BIGFONT}{STRING}produktion bei {TOWN} {STRING} verringert sich um {COMMA}%!
 
 ##id 0x5000
 STR_5000_TRAIN_IN_TUNNEL                                        :{WHITE}Zug im Tunnel
@@ -1877,10 +1877,10 @@
 ##id 0x6000
 STR_SV_EMPTY                                                    :
 STR_SV_UNNAMED                                                  :Unbenannt{SKIP}
-STR_SV_TRAIN_NAME                                               :Zug {COMMA16}
-STR_SV_ROADVEH_NAME                                             :Fahrzeug {COMMA16}
-STR_SV_SHIP_NAME                                                :Schiff {COMMA16}
-STR_SV_AIRCRAFT_NAME                                            :Flugzeug {COMMA16}
+STR_SV_TRAIN_NAME                                               :Zug {COMMA}
+STR_SV_ROADVEH_NAME                                             :Fahrzeug {COMMA}
+STR_SV_SHIP_NAME                                                :Schiff {COMMA}
+STR_SV_AIRCRAFT_NAME                                            :Flugzeug {COMMA}
 
 STR_SV_STNAME                                                   :{STRING}
 STR_SV_STNAME_NORTH                                             :{STRING} Nord
@@ -1930,12 +1930,12 @@
 ############ range for difficulty levels ends
 
 ############ range for difficulty settings starts
-STR_6805_MAXIMUM_NO_COMPETITORS                                 :{LTBLUE}Max. Gegenspielerzahl: {ORANGE}{COMMA16}
+STR_6805_MAXIMUM_NO_COMPETITORS                                 :{LTBLUE}Max. Gegenspielerzahl: {ORANGE}{COMMA}
 STR_6806_COMPETITOR_START_TIME                                  :{LTBLUE}Gegenspielerstartzeit: {ORANGE}{STRING}
 STR_6807_NO_OF_TOWNS                                            :{LTBLUE}Städteanzahl: {ORANGE}{STRING}
 STR_6808_NO_OF_INDUSTRIES                                       :{LTBLUE}Industriedichte: {ORANGE}{STRING}
 STR_6809_MAXIMUM_INITIAL_LOAN_000                               :{LTBLUE}Höhe des Anfangskredites: {ORANGE}{CURRENCY}
-STR_680A_INITIAL_INTEREST_RATE                                  :{LTBLUE}Kreditzinsen: {ORANGE}{COMMA16}%
+STR_680A_INITIAL_INTEREST_RATE                                  :{LTBLUE}Kreditzinsen: {ORANGE}{COMMA}%
 STR_680B_VEHICLE_RUNNING_COSTS                                  :{LTBLUE}Fahrzeugbetriebskosten: {ORANGE}{STRING}
 STR_680C_CONSTRUCTION_SPEED_OF_COMPETITOR                       :{LTBLUE}Baugeschwindigkeit der Gegenspieler: {ORANGE}{STRING}
 STR_680D_INTELLIGENCE_OF_COMPETITORS                            :{LTBLUE}Intelligenz der Gegenspieler: {ORANGE}{STRING}
@@ -1994,7 +1994,7 @@
 ##id 0x7000
 STR_7000                                                        :
 STR_7001                                                        :{WHITE}{STRING} {BLACK}{STRING}
-STR_7002_PLAYER                                                 :(Spieler {COMMA16})
+STR_7002_PLAYER                                                 :(Spieler {COMMA})
 STR_7004_NEW_FACE                                               :{BLACK}Neues Gesicht
 STR_7005_COLOR_SCHEME                                           :{BLACK}Farbauswahl
 STR_7006_COLOR_SCHEME                                           :{GOLD}Farbauswahl:
@@ -2028,7 +2028,7 @@
 STR_7022_INCOME_GRAPH                                           :{WHITE}Einkommensdiagramm
 STR_CURRCOMPACT32                                               :{CURRCOMPACT}
 STR_CURRCOMPACT64                                               :{CURRCOMPACT64}
-STR_7024                                                        :{COMMA32}
+STR_7024                                                        :{COMMA}
 STR_7025_OPERATING_PROFIT_GRAPH                                 :{WHITE}Betriebsgewinndiagramm
 STR_7026_BANK_BALANCE                                           :{WHITE}Kontostand
 STR_7027_LOAN                                                   :{WHITE}Kredit
@@ -2052,14 +2052,14 @@
 STR_7037_PRESIDENT                                              :{WHITE}{STRING}{}{GOLD}(Manager)
 STR_7038_INAUGURATED                                            :{GOLD}Gegründet: {WHITE}{NUMU16}
 STR_7039_VEHICLES                                               :{GOLD}Fahrzeuge:
-STR_703A_TRAIN                                                  :{WHITE}{COMMA16} Zug
-STR_703B_TRAINS                                                 :{WHITE}{COMMA16} Züge
-STR_703C_ROAD_VEHICLE                                           :{WHITE}{COMMA16} Fahrzeug
-STR_703D_ROAD_VEHICLES                                          :{WHITE}{COMMA16} Fahrzeuge
-STR_703E_AIRCRAFT                                               :{WHITE}{COMMA16} Flugzeug
-STR_703F_AIRCRAFT                                               :{WHITE}{COMMA16} Flugzeuge
-STR_7040_SHIP                                                   :{WHITE}{COMMA16} Schiff
-STR_7041_SHIPS                                                  :{WHITE}{COMMA16} Schiffe
+STR_703A_TRAIN                                                  :{WHITE}{COMMA} Zug
+STR_703B_TRAINS                                                 :{WHITE}{COMMA} Züge
+STR_703C_ROAD_VEHICLE                                           :{WHITE}{COMMA} Fahrzeug
+STR_703D_ROAD_VEHICLES                                          :{WHITE}{COMMA} Fahrzeuge
+STR_703E_AIRCRAFT                                               :{WHITE}{COMMA} Flugzeug
+STR_703F_AIRCRAFT                                               :{WHITE}{COMMA} Flugzeuge
+STR_7040_SHIP                                                   :{WHITE}{COMMA} Schiff
+STR_7041_SHIPS                                                  :{WHITE}{COMMA} Schiffe
 STR_7042_NONE                                                   :{WHITE}Keine
 STR_7043_FACE_SELECTION                                         :{WHITE}Gesicht auswählen
 STR_7044_MALE                                                   :{BLACK}Männlich
@@ -2124,8 +2124,8 @@
 STR_707A_SELL_25_SHARE_IN_THIS_COMPANY                          :{BLACK}Verkaufe 25% Anteil an dieser Firma
 STR_707B_CAN_T_BUY_25_SHARE_IN_THIS                             :{WHITE}Kann 25% Anteil an dieser Firma nicht kaufen...
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}Kann 25% Anteil an dieser Firma nicht verkaufen...
-STR_707D_OWNED_BY                                               :{WHITE}({COMMA16}% Eigentum von {STRING})
-STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA16}% Eigentum von {STRING}{}   {COMMA16}% Eigentum von {STRING})
+STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% Eigentum von {STRING})
+STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}% Eigentum von {STRING}{}   {COMMA}% Eigentum von {STRING})
 STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{STRING} wurde von {STRING} übernommen!
 STR_7080_PROTECTED                                              :{WHITE}Dieses Unternehmen handelt noch nicht mit Anteilen...
 
@@ -2400,8 +2400,8 @@
 STR_8801_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Die Stadt feiert . . .{}Der erste Zug erreicht {STATION}!
 STR_8802_DETAILS                                                :{WHITE}{STRING} (Details)
 STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}Zug ist im Weg
-STR_8804                                                        :{SETX 10}{COMMA8}: {STRING}
-STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA8}: {STRING}
+STR_8804                                                        :{SETX 10}{COMMA}: {STRING}
+STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING}
 STR_8806_GO_TO                                                  :Fahre nach {STATION}
 STR_8807_GO_TO_TRANSFER                                         :Fahre nach {STATION} (Umladen und beladen)
 STR_8808_GO_TO_UNLOAD                                           :Fahre nach {STATION} (Entladen)
@@ -2427,13 +2427,13 @@
 STR_UNKNOWN_DESTINATION                                         :unbekanntes Ziel
 STR_8812_EMPTY                                                  :{LTBLUE}Leer
 STR_8813_FROM                                                   :{LTBLUE}{CARGO} von {STATION}
-STR_8814_TRAIN_IS_WAITING_IN_DEPOT                              :{WHITE}Zug {COMMA16} wartet im Depot
+STR_8814_TRAIN_IS_WAITING_IN_DEPOT                              :{WHITE}Zug {COMMA} wartet im Depot
 STR_8815_NEW_VEHICLES                                           :{BLACK}Neue Fahrzeuge
 STR_8816                                                        :{BLACK}-
 STR_8818_INFORMATION                                            :{BLACK}Information
 STR_8819_TRAIN_TOO_LONG                                         :{WHITE}Zug zu lang
 STR_881A_TRAINS_CAN_ONLY_BE_ALTERED                             :{WHITE}Züge können nur verändert werden, wenn sie im Depot halten
-STR_881B_TRAINS                                                 :{WHITE}{STRING} - {COMMA16} Züge
+STR_881B_TRAINS                                                 :{WHITE}{STRING} - {COMMA} Züge
 STR_881C_NEW_RAIL_VEHICLES                                      :{WHITE}Neues Schienenfahrzeug
 STR_881D_NEW_MONORAIL_VEHICLES                                  :{WHITE}Neue Monorailzüge
 STR_881E_NEW_MAGLEV_VEHICLES                                    :{WHITE}Neue Magnetzüge
@@ -2467,8 +2467,8 @@
 STR_8839_CAN_T_SELL_RAILROAD_VEHICLE                            :{WHITE}Kann Schienenfahrzeug nicht verkaufen...
 STR_883A_UNABLE_TO_FIND_ROUTE_TO                                :{WHITE}Kann keinen weg zum Depot finden
 STR_883B_CAN_T_STOP_START_TRAIN                                 :{WHITE}Kann den Zug nicht anhalten/starten ...
-STR_883C_SERVICING_INTERVAL_DAYS                                :{BLACK}Wartungsintervall: {LTBLUE}{COMMA16}Tage {BLACK} Letzte Wartung: {LTBLUE}{DATE_LONG}
-STR_SERVICING_INTERVAL_PERCENT                                  :{BLACK}Wartungsintervall: {LTBLUE}{COMMA16}%{BLACK}   Letzte Wartung: {LTBLUE}{DATE_LONG}
+STR_883C_SERVICING_INTERVAL_DAYS                                :{BLACK}Wartungsintervall: {LTBLUE}{COMMA}Tage {BLACK} Letzte Wartung: {LTBLUE}{DATE_LONG}
+STR_SERVICING_INTERVAL_PERCENT                                  :{BLACK}Wartungsintervall: {LTBLUE}{COMMA}%{BLACK}   Letzte Wartung: {LTBLUE}{DATE_LONG}
 STR_883D_TRAINS_CLICK_ON_TRAIN_FOR                              :{BLACK}Züge - für Einzelheiten auf den jeweiligen Zug klicken
 STR_883E_BUILD_NEW_TRAINS_REQUIRES                              :{BLACK}Neue Züge bauen (setzt Zugdepot voraus)
 STR_883F_TRAINS_CLICK_ON_TRAIN_FOR                              :{BLACK}Züge - für Einzelheiten auf den Zug klicken; Waggon ziehen, um ihn an-/abzukoppeln
@@ -2501,12 +2501,12 @@
 STR_SERVICE_HINT                                                :{BLACK}Überspringe diesen Auftrag, sofern keine Wartung benötigt wird
 STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}Neue {STRING} ist jetzt verfügbar!
 STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
-STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Kosten: {CURRENCY}   Gewicht: {COMMA16}t{}Geschwindigk.: {VELOCITY} Leistung: {COMMA16} PS {}Betriebskosten: {CURRENCY}/Jahr{}Kapazität: {STRING}
+STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Kosten: {CURRENCY}   Gewicht: {COMMA}t{}Geschwindigk.: {VELOCITY} Leistung: {COMMA} PS {}Betriebskosten: {CURRENCY}/Jahr{}Kapazität: {STRING}
 STR_885C_BROKEN_DOWN                                            :{RED}Panne
 STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Alter: {LTBLUE}{STRING}{BLACK}  Betriebskosten: {LTBLUE}{CURRENCY}/Jahr
-STR_885E_WEIGHT_T_POWER_HP_MAX_SPEED                            :{BLACK}Gewicht: {LTBLUE}{COMMA16}t   {BLACK}Leistung: {LTBLUE}{COMMA32} PS {BLACK}   Max. Geschwindigk.: {LTBLUE}{VELOCITY}
+STR_885E_WEIGHT_T_POWER_HP_MAX_SPEED                            :{BLACK}Gewicht: {LTBLUE}{COMMA}t   {BLACK}Leistung: {LTBLUE}{COMMA} PS {BLACK}   Max. Geschwindigk.: {LTBLUE}{VELOCITY}
 STR_885F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Profit lfd. Jahr: {LTBLUE}{CURRENCY}  (letztes Jahr: {CURRENCY})
-STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Zuverlässigkeit: {LTBLUE}{COMMA8}% {BLACK}Ausfälle seit letzter Wartung: {LTBLUE}{COMMA16}
+STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Zuverlässigkeit: {LTBLUE}{COMMA}% {BLACK}Ausfälle seit letzter Wartung: {LTBLUE}{COMMA}
 STR_8861_STOPPED                                                :{RED}Angehalten
 STR_8862_CAN_T_MAKE_TRAIN_PASS_SIGNAL                           :{WHITE}Der Zug kann das Signal nicht ohne Gefahr passieren...
 STR_8863_CRASHED                                                :{RED}Zusammenstoß!
@@ -2514,7 +2514,7 @@
 STR_8865_NAME_TRAIN                                             :{WHITE}Name des Zuges
 STR_8866_CAN_T_NAME_TRAIN                                       :{WHITE}Kann den Zug nicht benennen...
 STR_8867_NAME_TRAIN                                             :{BLACK}Name des Zuges
-STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Zugunglück!{}{COMMA16} sterben in einem Feuerball nach Zusammenstoß
+STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Zugunglück!{}{COMMA} sterben in einem Feuerball nach Zusammenstoß
 STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}Die Zugbewegung kann nicht umgekehrt werden...
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Zugtyp umbenennen
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Zugtyp kann nicht umbenannt werden...
@@ -2526,7 +2526,7 @@
 
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Fahrzeug ist im Weg
-STR_9001_ROAD_VEHICLES                                          :{WHITE}{STRING} - {COMMA16} Fahrzeuge
+STR_9001_ROAD_VEHICLES                                          :{WHITE}{STRING} - {COMMA} Fahrzeuge
 STR_9002                                                        :{WHITE}{STRING}
 STR_9003_ROAD_VEHICLE_DEPOT                                     :{WHITE}{TOWN} Fahrzeugdepot
 STR_9004_NEW_VEHICLES                                           :{BLACK}Neue Fahrzeuge
@@ -2540,13 +2540,13 @@
 STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Alter: {LTBLUE}{STRING}{BLACK}  Betriebskosten: {LTBLUE}{CURRENCY}/Jahr
 STR_900E_MAX_SPEED                                              :{BLACK}Max. Geschwindigk.: {LTBLUE}{VELOCITY}
 STR_900F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Profit lfd. Jahr: {LTBLUE}{CURRENCY}  (letztes Jahr: {CURRENCY})
-STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Zuverlässigkeit: {LTBLUE}{COMMA8}% {BLACK}Pannen seit letzter Wartung: {LTBLUE}{COMMA16}
+STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Zuverlässigkeit: {LTBLUE}{COMMA}% {BLACK}Pannen seit letzter Wartung: {LTBLUE}{COMMA}
 STR_9011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}  Gebaut: {LTBLUE}{NUMU16}{BLACK} Wert: {LTBLUE}{CURRENCY}
 STR_9012_CAPACITY                                               :{BLACK}Kapazität: {LTBLUE}{STRING}
 STR_9013_MUST_BE_STOPPED_INSIDE                                 :{WHITE}...muss in einem Fahrzeugdepot angehalten werden
 STR_9014_CAN_T_SELL_ROAD_VEHICLE                                :{WHITE}Kann das Fahrzeug nicht verkaufen...
 STR_9015_CAN_T_STOP_START_ROAD_VEHICLE                          :{WHITE}Kann das Fahrzeug nicht anhalten/starten...
-STR_9016_ROAD_VEHICLE_IS_WAITING                                :{WHITE}Fahrzeug {COMMA16} wartet im Depot
+STR_9016_ROAD_VEHICLE_IS_WAITING                                :{WHITE}Fahrzeug {COMMA} wartet im Depot
 STR_HEADING_FOR_ROAD_DEPOT                                      :{LTBLUE}Unterwegs zu {TOWN} Fahrzeugdepot
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{LTBLUE}Unterwegs zu {TOWN} Fahrzeugdepot, {VELOCITY}
 STR_9018_CAN_T_SEND_VEHICLE_TO_DEPOT                            :{WHITE}Kann das Fahrzeug nicht zum Depot schicken...
@@ -2575,7 +2575,7 @@
 STR_902F_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Die Stadt feiert . . .{}Der erste Bus erreicht {STATION}!
 STR_9030_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Die Stadt feiert . . .{}Der erste Lkw erreicht {STATION}!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Fahrzeug verunglückt!{}Fahrer stirbt in einem Feuerball nach Zusammenstoß mit einem Zug
-STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Fahrzeug verunglückt!{}{COMMA16} sterben nach Zusammenstoß mit einem Zug im Feuerball
+STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Fahrzeug verunglückt!{}{COMMA} sterben nach Zusammenstoß mit einem Zug im Feuerball
 STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}Das Fahrzeug kann nicht gewendet werden...
 STR_9034_RENAME                                                 :{BLACK}Umbenennen
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Fahrzeug umbenennen
@@ -2590,7 +2590,7 @@
 STR_9802_CAN_T_BUILD_DOCK_HERE                                  :{WHITE}Kann den Hafen hier nicht bauen...
 STR_9803_SHIP_DEPOT                                             :{WHITE}{TOWN} Werft
 STR_9804_NEW_SHIPS                                              :{BLACK}Neue Schiffe
-STR_9805_SHIPS                                                  :{WHITE}{STRING} - {COMMA16} Schiffe
+STR_9805_SHIPS                                                  :{WHITE}{STRING} - {COMMA} Schiffe
 STR_9806_CAN_T_BUILD_SHIPS                                      :{WHITE}Kann das Schiff nicht bauen...
 STR_9807_MUST_BUILD_SHIP_DEPOT_FIRST                            :{WHITE}Erst muss eine Werft gebaut werden
 STR_9808_NEW_SHIPS                                              :{WHITE}Neue Schiffe
@@ -2605,7 +2605,7 @@
 STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Alter: {LTBLUE}{STRING}{BLACK}  Betriebskosten: {LTBLUE}{CURRENCY}/Jahr
 STR_9813_MAX_SPEED                                              :{BLACK}Max. Geschwindigk.: {LTBLUE}{VELOCITY}
 STR_9814_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Profit lfd. Jahr: {LTBLUE}{CURRENCY}  (letztes Jahr: {CURRENCY})
-STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Zuverlässigkeit: {LTBLUE}{COMMA8}% {BLACK}Pannen seit letzter Wartung: {LTBLUE}{COMMA16}
+STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Zuverlässigkeit: {LTBLUE}{COMMA}% {BLACK}Pannen seit letzter Wartung: {LTBLUE}{COMMA}
 STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK} Gebaut: {LTBLUE}{NUMU16}{BLACK}   Wert: {LTBLUE}{CURRENCY}
 STR_9817_CAPACITY                                               :{BLACK}Kapazität: {LTBLUE}{STRING}
 STR_9818_CAN_T_STOP_START_SHIP                                  :{WHITE}Kann das Schiff nicht anhalten/starten...
@@ -2613,7 +2613,7 @@
 STR_981A_UNABLE_TO_FIND_LOCAL_DEPOT                             :{WHITE}Kann keine Werft finden
 STR_HEADING_FOR_SHIP_DEPOT                                      :{LTBLUE}Unterwegs zu {TOWN} Werft
 STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{LTBLUE}Unterwegs zu {TOWN} Werft, {VELOCITY}
-STR_981C_SHIP_IS_WAITING_IN_DEPOT                               :{WHITE}Schiff {COMMA16} wartet in der Werft
+STR_981C_SHIP_IS_WAITING_IN_DEPOT                               :{WHITE}Schiff {COMMA} wartet in der Werft
 STR_981D_BUILD_SHIP_DOCK                                        :{BLACK}Hafen bauen
 STR_981E_BUILD_SHIP_DEPOT_FOR_BUILDING                          :{BLACK}Werft bauen (für den Bau und die Wartung von Schiffen)
 STR_981F_SHIPS_CLICK_ON_SHIP_FOR                                :{BLACK}Schiffe - für Einzelheiten auf das Schiff klicken
@@ -2664,19 +2664,19 @@
 STR_A005_NEW_AIRCRAFT                                           :{WHITE}Neues Flugzeug
 STR_A006_BUILD_AIRCRAFT                                         :{BLACK}Flugzeug bauen
 STR_A008_CAN_T_BUILD_AIRCRAFT                                   :{WHITE}Kann das Flugzeug nicht bauen...
-STR_A009_AIRCRAFT                                               :{WHITE}{STRING} - {COMMA16} Flugzeuge
+STR_A009_AIRCRAFT                                               :{WHITE}{STRING} - {COMMA} Flugzeuge
 STR_A00A                                                        :{WHITE}{STRING}
 STR_A00B_ORDERS                                                 :{WHITE}{STRING} (Aufträge)
 STR_A00C_DETAILS                                                :{WHITE}{STRING} (Einzelheiten)
 STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Alter: {LTBLUE}{STRING}{BLACK}  Betriebskosten: {LTBLUE}{CURRENCY}/Jahr
 STR_A00E_MAX_SPEED                                              :{BLACK}Max. Geschwindigk.: {LTBLUE}{VELOCITY}
 STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Profit lfd. Jahr: {LTBLUE}{CURRENCY}  (letztes Jahr: {CURRENCY})
-STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Zuverlässigkeit: {LTBLUE}{COMMA8}% {BLACK}Pannen seit letzter Wartung: {LTBLUE}{COMMA16}
+STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Zuverlässigkeit: {LTBLUE}{COMMA}% {BLACK}Pannen seit letzter Wartung: {LTBLUE}{COMMA}
 STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK} Gebaut: {LTBLUE}{NUMU16}{BLACK}   Wert: {LTBLUE}{CURRENCY}
 STR_A012_CAN_T_SEND_AIRCRAFT_TO                                 :{WHITE}Kann das Flugzeug nicht in den Hangar schicken...
 STR_HEADING_FOR_HANGAR                                          :{LTBLUE}Unterwegs zu {STATION} Hangar
 STR_HEADING_FOR_HANGAR_VEL                                      :{LTBLUE}Unterwegs zu {STATION} Hangar, {VELOCITY}
-STR_A014_AIRCRAFT_IS_WAITING_IN                                 :{WHITE}Flugzeug {COMMA16} wartet im Flugzeug Hangar
+STR_A014_AIRCRAFT_IS_WAITING_IN                                 :{WHITE}Flugzeug {COMMA} wartet im Flugzeug Hangar
 STR_A015_AIRCRAFT_IN_THE_WAY                                    :{WHITE}Flugzeug ist auf dem Weg
 STR_A016_CAN_T_STOP_START_AIRCRAFT                              :{WHITE}Kann das Flugzeug nicht anhalten/starten...
 STR_A017_AIRCRAFT_IS_IN_FLIGHT                                  :{WHITE}Das Flugzeug ist in der Luft
@@ -2702,14 +2702,14 @@
 STR_A02B_SHOW_AIRCRAFT_DETAILS                                  :{BLACK}Zeige Einzelheiten des Flugzeuges
 STR_A02C_NEW_AIRCRAFT_NOW_AVAILABLE                             :{BLACK}{BIGFONT}Neues Flugzeug ist jetzt verfügbar!
 STR_A02D                                                        :{BLACK}{BIGFONT}{STRING}
-STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Kosten: {CURRENCY}   Max. Geschwindigk.: {VELOCITY}{}Kapazität: {COMMA16} Passagiere, {COMMA16} Postsäcke{}Betriebskosten: {CURRENCY}/Jahr
+STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Kosten: {CURRENCY}   Max. Geschwindigk.: {VELOCITY}{}Kapazität: {COMMA} Passagiere, {COMMA} Postsäcke{}Betriebskosten: {CURRENCY}/Jahr
 
 STR_A030_NAME_AIRCRAFT                                          :{WHITE}Flugzeugname
 STR_A031_CAN_T_NAME_AIRCRAFT                                    :{WHITE}Kann Flugzeugname nicht vergeben...
 STR_A032_NAME_AIRCRAFT                                          :{BLACK}Flugzeugname
 STR_A033_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Die Stadt feiert . . .{}Erstes Flugzeug landet auf {STATION}!
-STR_A034_PLANE_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Flugzeugabsturz!{}{COMMA16} sterben in einem Feuerball auf {STATION}
-STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Flugzeugabsturz!{}Dem Flugzeug ging der Treibstoff aus, {COMMA16} sterben in einem Feuerball!
+STR_A034_PLANE_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Flugzeugabsturz!{}{COMMA} sterben in einem Feuerball auf {STATION}
+STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Flugzeugabsturz!{}Dem Flugzeug ging der Treibstoff aus, {COMMA} sterben in einem Feuerball!
 STR_A035_DESTINATIONS                                           :{TINYFONT}{BLACK}Bestimmungsort:
 STR_A036                                                        :{TINYFONT}{BLACK}{STATION}
 STR_A037_RENAME                                                 :{BLACK}Umbenennen
@@ -2735,7 +2735,7 @@
 STR_B003_FACTORY_DESTROYED_IN_SUSPICIOUS                        :{BLACK}{BIGFONT}Fabrik nahe {TOWN} durch mysteriöse Umstände zerstört!
 STR_B004_UFO_LANDS_NEAR                                         :{BLACK}{BIGFONT}'UFO' landet bei {TOWN}!
 STR_B005_COAL_MINE_SUBSIDENCE_LEAVES                            :{BLACK}{BIGFONT}Stolleneinbruch hinterläßt einen Pfad der Zerstörung bei {TOWN}!
-STR_B006_FLOOD_VEHICLE_DESTROYED                                :{BLACK}{BIGFONT}Hochwasser!{}Mindestens {COMMA16} Menschen vermisst oder tot nach schwerer Flut!
+STR_B006_FLOOD_VEHICLE_DESTROYED                                :{BLACK}{BIGFONT}Hochwasser!{}Mindestens {COMMA} Menschen vermisst oder tot nach schwerer Flut!
 
 STR_BRIBE_FAILED                                                :{WHITE}Ihr Bestechungsversuch wurde
 STR_BRIBE_FAILED_2                                              :{WHITE}von einem regionalen Untersuchungsbeamten aufgedeckt.
@@ -2745,7 +2745,7 @@
 STR_PERFORMANCE_DETAIL                                          :{WHITE}Leistungsaufschlüsselung
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Details
 STR_PERFORMANCE_DETAIL_AMOUNT_CURRENCY                          :{BLACK}({CURRCOMPACT}/{CURRCOMPACT})
-STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA32}/{COMMA32})
+STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA}/{COMMA})
 STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{INT32}%
 SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{INT32}
 ############ Those following lines need to be in this order!!
@@ -2780,7 +2780,7 @@
 STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID:
 
 STR_CURRENCY_WINDOW                                             :{WHITE}Eigene Währung
-STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Wechselkurs: {ORANGE}{CURRENCY} = {POUNDSIGN} {COMMA16}
+STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Wechselkurs: {ORANGE}{CURRENCY} = {POUNDSIGN} {COMMA}
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Trennsymbol:
 STR_CURRENCY_PREFIX                                             :{LTBLUE}Präfix:
 STR_CURRENCY_SUFFIX                                             :{LTBLUE}Suffix:
@@ -2794,10 +2794,10 @@
 STR_PLANE                                                       :{BLACK}{PLANE}
 STR_SHIP                                                        :{BLACK}{SHIP}
 
-STR_SCHEDULED_TRAINS                                            :{WHITE}{STATION} - {COMMA16} Züge
-STR_SCHEDULED_ROAD_VEHICLES                                     :{WHITE}{STATION} - {COMMA16} Straßenfahrzeuge
-STR_SCHEDULED_AIRCRAFT                                          :{WHITE}{STATION} - {COMMA16} Flugzeuge
-STR_SCHEDULED_SHIPS                                             :{WHITE}{STATION} - {COMMA16} Schiffe
+STR_SCHEDULED_TRAINS                                            :{WHITE}{STATION} - {COMMA} Züge
+STR_SCHEDULED_ROAD_VEHICLES                                     :{WHITE}{STATION} - {COMMA} Straßenfahrzeuge
+STR_SCHEDULED_AIRCRAFT                                          :{WHITE}{STATION} - {COMMA} Flugzeuge
+STR_SCHEDULED_SHIPS                                             :{WHITE}{STATION} - {COMMA} Schiffe
 
 STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Zeige alle Züge, die diesen Bahnhof anfahren
 STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Zeige alle Fahrzeuge, die diese Station anfahren
@@ -2819,7 +2819,7 @@
 STR_REPLACE_HELP                                                :{BLACK}Dieses Feature ermöglicht es, einen Fahrzeugtyp auszuwählen und ihn durch einen anderen ersetzen zu lassen. Dies geschieht automatisch, wenn das Fahrzeug regulär das Depot besucht.
 
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
-STR_SIGN_LIST_CAPTION                                           :{WHITE}Schilderliste - {COMMA16} Schild(er)
+STR_SIGN_LIST_CAPTION                                           :{WHITE}Schilderliste - {COMMA} Schild(er)
 
 ############ Lists rail types
 
@@ -2829,16 +2829,16 @@
 
 ############ End of list of rail types
 
-STR_TINY_BLACK                                                  :{BLACK}{TINYFONT}{COMMA16}
+STR_TINY_BLACK                                                  :{BLACK}{TINYFONT}{COMMA}
 
-STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Kosten: {GOLD}{CURRENCY}{BLACK} Gewicht: {GOLD}{COMMA16}t
-STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Geschwindigk.: {GOLD}{VELOCITY}{BLACK}   Leistung: {GOLD}{COMMA32}hp
+STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Kosten: {GOLD}{CURRENCY}{BLACK} Gewicht: {GOLD}{COMMA}t
+STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Geschwindigk.: {GOLD}{VELOCITY}{BLACK}   Leistung: {GOLD}{COMMA}hp
 STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}Betriebskosten: {GOLD}{CURRENCY}/Jahr
 STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Kapazität: {GOLD}{STRING} {STRING}
-STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Entwurf: {GOLD}{NUMU16}{BLACK} Lebensdauer: {GOLD}{COMMA16} Jahre
-STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Max. Zuverlässigkeit: {GOLD}{COMMA8}%
+STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Entwurf: {GOLD}{NUMU16}{BLACK} Lebensdauer: {GOLD}{COMMA} Jahre
+STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Max. Zuverlässigkeit: {GOLD}{COMMA}%
 STR_PURCHASE_INFO_COST                                          :{BLACK}Kosten: {GOLD}{CURRENCY}
-STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Gewicht: {GOLD}{COMMA16}t  ({COMMA16}t)
+STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Gewicht: {GOLD}{COMMA}t  ({COMMA}t)
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Kosten: {GOLD}{CURRENCY}{BLACK} Geschwindigk.: {GOLD}{VELOCITY}
-STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Kapazität: {GOLD}{COMMA16} Passagiere, {COMMA16} Postsäcke
-STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Angetriebene Waggons: {GOLD}+{COMMA16}PS{BLACK} Gewicht: {GOLD}+{COMMA8}t
+STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Kapazität: {GOLD}{COMMA} Passagiere, {COMMA} Postsäcke
+STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Angetriebene Waggons: {GOLD}+{COMMA}PS{BLACK} Gewicht: {GOLD}+{COMMA}t
--- a/lang/hungarian.txt	Thu Jul 14 09:53:52 2005 +0000
+++ b/lang/hungarian.txt	Thu Jul 14 15:10:20 2005 +0000
@@ -82,69 +82,69 @@
 STR_004C_PLASTIC                                                :mûanyag
 STR_004D_FIZZY_DRINK                                            :szénsavas ital
 STR_004E                                                        :
-STR_004F_PASSENGER                                              :{COMMA16} utas
-STR_0050_TON_OF_COAL                                            :{COMMA16} tonna szén
-STR_0051_BAG_OF_MAIL                                            :{COMMA16} csomag levél
+STR_004F_PASSENGER                                              :{COMMA} utas
+STR_0050_TON_OF_COAL                                            :{COMMA} tonna szén
+STR_0051_BAG_OF_MAIL                                            :{COMMA} csomag levél
 STR_0052_OF_OIL                                                 :{VOLUME} olaj
-STR_0053_ITEM_OF_LIVESTOCK                                      :{COMMA16} állat
-STR_0054_CRATE_OF_GOODS                                         :{COMMA16} láda áru
-STR_0055_TON_OF_GRAIN                                           :{COMMA16} tonna búza
-STR_0056_TON_OF_WOOD                                            :{COMMA16} tonna fa
-STR_0057_TON_OF_IRON_ORE                                        :{COMMA16} tonna vasérc
-STR_0058_TON_OF_STEEL                                           :{COMMA16} tonna acél
-STR_0059_BAG_OF_VALUABLES                                       :{COMMA16} csomag értéktárgy
-STR_005A_TON_OF_COPPER_ORE                                      :{COMMA16} tonna rézérc
-STR_005B_TON_OF_MAIZE                                           :{COMMA16} tonna kukorica
-STR_005C_TON_OF_FRUIT                                           :{COMMA16} tonna gyümölcs
-STR_005D_BAG_OF_DIAMONDS                                        :{COMMA16} zsák gyémánt
-STR_005E_TON_OF_FOOD                                            :{COMMA16} tonna étel
-STR_005F_TON_OF_PAPER                                           :{COMMA16} tonna papír
-STR_0060_BAG_OF_GOLD                                            :{COMMA16} zsák arany
+STR_0053_ITEM_OF_LIVESTOCK                                      :{COMMA} állat
+STR_0054_CRATE_OF_GOODS                                         :{COMMA} láda áru
+STR_0055_TON_OF_GRAIN                                           :{COMMA} tonna búza
+STR_0056_TON_OF_WOOD                                            :{COMMA} tonna fa
+STR_0057_TON_OF_IRON_ORE                                        :{COMMA} tonna vasérc
+STR_0058_TON_OF_STEEL                                           :{COMMA} tonna acél
+STR_0059_BAG_OF_VALUABLES                                       :{COMMA} csomag értéktárgy
+STR_005A_TON_OF_COPPER_ORE                                      :{COMMA} tonna rézérc
+STR_005B_TON_OF_MAIZE                                           :{COMMA} tonna kukorica
+STR_005C_TON_OF_FRUIT                                           :{COMMA} tonna gyümölcs
+STR_005D_BAG_OF_DIAMONDS                                        :{COMMA} zsák gyémánt
+STR_005E_TON_OF_FOOD                                            :{COMMA} tonna étel
+STR_005F_TON_OF_PAPER                                           :{COMMA} tonna papír
+STR_0060_BAG_OF_GOLD                                            :{COMMA} zsák arany
 STR_0061_OF_WATER                                               :{VOLUME} víz
-STR_0062_TON_OF_WHEAT                                           :{COMMA16} tonna búza
+STR_0062_TON_OF_WHEAT                                           :{COMMA} tonna búza
 STR_0063_OF_RUBBER                                              :{VOLUME} gumi
-STR_0064_TON_OF_SUGAR                                           :{COMMA16} tonna cukor
-STR_0065_TOY                                                    :{COMMA16} játék
-STR_0066_BAG_OF_CANDY                                           :{COMMA16} zsák cukorka
+STR_0064_TON_OF_SUGAR                                           :{COMMA} tonna cukor
+STR_0065_TOY                                                    :{COMMA} játék
+STR_0066_BAG_OF_CANDY                                           :{COMMA} zsák cukorka
 STR_0067_OF_COLA                                                :{VOLUME} kóla
-STR_0068_TON_OF_COTTON_CANDY                                    :{COMMA16} tonna vattacukor
-STR_0069_BUBBLE                                                 :{COMMA16} buborék
-STR_006A_TON_OF_TOFFEE                                          :{COMMA16} tonna tejkaramella
-STR_006B_BATTERY                                                :{COMMA16} elem
+STR_0068_TON_OF_COTTON_CANDY                                    :{COMMA} tonna vattacukor
+STR_0069_BUBBLE                                                 :{COMMA} buborék
+STR_006A_TON_OF_TOFFEE                                          :{COMMA} tonna tejkaramella
+STR_006B_BATTERY                                                :{COMMA} elem
 STR_006C_OF_PLASTIC                                             :{VOLUME} mûanyag
-STR_006D_FIZZY_DRINK                                            :{COMMA16} szénsavas ital
+STR_006D_FIZZY_DRINK                                            :{COMMA} szénsavas ital
 STR_006E                                                        :
-STR_006F_PASSENGERS                                             :{COMMA16} utas
-STR_0070_TONS_OF_COAL                                           :{COMMA16} tonna szén
-STR_0071_BAGS_OF_MAIL                                           :{COMMA16} csomag levél
+STR_006F_PASSENGERS                                             :{COMMA} utas
+STR_0070_TONS_OF_COAL                                           :{COMMA} tonna szén
+STR_0071_BAGS_OF_MAIL                                           :{COMMA} csomag levél
 STR_0072_OF_OIL                                                 :{VOLUME} olaj
-STR_0073_ITEMS_OF_LIVESTOCK                                     :{COMMA16} állat
-STR_0074_CRATES_OF_GOODS                                        :{COMMA16} láda áru
-STR_0075_TONS_OF_GRAIN                                          :{COMMA16} tonna búza
-STR_0076_TONS_OF_WOOD                                           :{COMMA16} tonna fa
-STR_0077_TONS_OF_IRON_ORE                                       :{COMMA16} tonna vasérc
-STR_0078_TONS_OF_STEEL                                          :{COMMA16} tonna acél
-STR_0079_BAGS_OF_VALUABLES                                      :{COMMA16} csomag értéktárgy
-STR_007A_TONS_OF_COPPER_ORE                                     :{COMMA16} tonna rézérc
-STR_007B_TONS_OF_MAIZE                                          :{COMMA16} tonna kukorica
-STR_007C_TONS_OF_FRUIT                                          :{COMMA16} tonna gyümölcs
-STR_007D_BAGS_OF_DIAMONDS                                       :{COMMA16} zsák gyémánt
-STR_007E_TONS_OF_FOOD                                           :{COMMA16} tonna étel
-STR_007F_TONS_OF_PAPER                                          :{COMMA16} tonna papír
-STR_0080_BAGS_OF_GOLD                                           :{COMMA16} zsák arany
+STR_0073_ITEMS_OF_LIVESTOCK                                     :{COMMA} állat
+STR_0074_CRATES_OF_GOODS                                        :{COMMA} láda áru
+STR_0075_TONS_OF_GRAIN                                          :{COMMA} tonna búza
+STR_0076_TONS_OF_WOOD                                           :{COMMA} tonna fa
+STR_0077_TONS_OF_IRON_ORE                                       :{COMMA} tonna vasérc
+STR_0078_TONS_OF_STEEL                                          :{COMMA} tonna acél
+STR_0079_BAGS_OF_VALUABLES                                      :{COMMA} csomag értéktárgy
+STR_007A_TONS_OF_COPPER_ORE                                     :{COMMA} tonna rézérc
+STR_007B_TONS_OF_MAIZE                                          :{COMMA} tonna kukorica
+STR_007C_TONS_OF_FRUIT                                          :{COMMA} tonna gyümölcs
+STR_007D_BAGS_OF_DIAMONDS                                       :{COMMA} zsák gyémánt
+STR_007E_TONS_OF_FOOD                                           :{COMMA} tonna étel
+STR_007F_TONS_OF_PAPER                                          :{COMMA} tonna papír
+STR_0080_BAGS_OF_GOLD                                           :{COMMA} zsák arany
 STR_0081_OF_WATER                                               :{VOLUME} víz
-STR_0082_TONS_OF_WHEAT                                          :{COMMA16} tonna búza
+STR_0082_TONS_OF_WHEAT                                          :{COMMA} tonna búza
 STR_0083_OF_RUBBER                                              :{VOLUME} gumi
-STR_0084_TONS_OF_SUGAR                                          :{COMMA16} tonna cukor
-STR_0085_TOYS                                                   :{COMMA16} játék
-STR_0086_BAGS_OF_CANDY                                          :{COMMA16} zsák cukorka
+STR_0084_TONS_OF_SUGAR                                          :{COMMA} tonna cukor
+STR_0085_TOYS                                                   :{COMMA} játék
+STR_0086_BAGS_OF_CANDY                                          :{COMMA} zsák cukorka
 STR_0087_OF_COLA                                                :{VOLUME} kóla
-STR_0088_TONS_OF_COTTON_CANDY                                   :{COMMA16} tonna vattacukor
-STR_0089_BUBBLES                                                :{COMMA16} buborék
-STR_008A_TONS_OF_TOFFEE                                         :{COMMA16} tonna tejkaramella
-STR_008B_BATTERIES                                              :{COMMA16} elem
+STR_0088_TONS_OF_COTTON_CANDY                                   :{COMMA} tonna vattacukor
+STR_0089_BUBBLES                                                :{COMMA} buborék
+STR_008A_TONS_OF_TOFFEE                                         :{COMMA} tonna tejkaramella
+STR_008B_BATTERIES                                              :{COMMA} elem
 STR_008C_OF_PLASTIC                                             :{VOLUME} mûanyag
-STR_008D_FIZZY_DRINKS                                           :{COMMA16} szénsavas ital
+STR_008D_FIZZY_DRINKS                                           :{COMMA} szénsavas ital
 STR_008E                                                        :
 STR_008F_PS                                                     :{TINYFONT}UT
 STR_0090_CL                                                     :{TINYFONT}SZ
@@ -219,8 +219,8 @@
 STR_00DF_GREY                                                   :Szürke
 STR_00E0_WHITE                                                  :Fehér
 STR_00E1_TOO_MANY_VEHICLES_IN_GAME                              :{WHITE}Túl sok jármû van a játékban
-STR_00E2                                                        :{BLACK}{COMMA16}
-STR_00E3                                                        :{RED}{COMMA16}
+STR_00E2                                                        :{BLACK}{COMMA}
+STR_00E3                                                        :{RED}{COMMA}
 STR_00E4_LOCATION                                               :{BLACK}Megnéz
 STR_00E5_CONTOURS                                               :Domborzat
 STR_00E6_VEHICLES                                               :Jármûvek
@@ -441,18 +441,18 @@
 STR_0198_PROFIT_THIS_YEAR_LAST_YEAR                             :{TINYFONT}{BLACK}Ezévi nyereség: {CURRENCY} (Tavalyi: {CURRENCY})
 
 ############ range for service numbers starts
-STR_0199_YEAR                                                   :{COMMA16} év ({COMMA16})
-STR_019A_YEARS                                                  :{COMMA16} év ({COMMA16})
-STR_019B_YEARS                                                  :{RED}{COMMA16} év ({COMMA16})
+STR_0199_YEAR                                                   :{COMMA} év ({COMMA})
+STR_019A_YEARS                                                  :{COMMA} év ({COMMA})
+STR_019B_YEARS                                                  :{RED}{COMMA} év ({COMMA})
 ############ range for service numbers ends
 
 STR_019C_ROAD_VEHICLE                                           :közúti jármû
 STR_019D_AIRCRAFT                                               :repülõgép
 STR_019E_SHIP                                                   :hajó
 STR_019F_TRAIN                                                  :vonat
-STR_01A0_IS_GETTING_OLD                                         :{WHITE}{STRING} {COMMA16} kezd elöregedni
-STR_01A1_IS_GETTING_VERY_OLD                                    :{WHITE}{STRING} {COMMA16} kezd nagyon elöregedni
-STR_01A2_IS_GETTING_VERY_OLD_AND                                :{WHITE}{STRING} {COMMA16} nagyon öreg és sürgõsen ki kell cserélni
+STR_01A0_IS_GETTING_OLD                                         :{WHITE}{STRING} {COMMA} kezd elöregedni
+STR_01A1_IS_GETTING_VERY_OLD                                    :{WHITE}{STRING} {COMMA} kezd nagyon elöregedni
+STR_01A2_IS_GETTING_VERY_OLD_AND                                :{WHITE}{STRING} {COMMA} nagyon öreg és sürgõsen ki kell cserélni
 STR_01A3_LAND_AREA_INFORMATION                                  :{WHITE}Terület-információ
 STR_01A4_COST_TO_CLEAR_N_A                                      :{BLACK}{LTBLUE}Nem lehet lerombolni
 STR_01A5_COST_TO_CLEAR                                          :{BLACK}A megtisztítás költsége: {LTBLUE}{CURRENCY}
@@ -497,7 +497,7 @@
 STR_01CA_31ST                                                   :31.
 ############ range for days	ends
 
-STR_01CB                                                        :{TINYFONT}{COMMA16}
+STR_01CB                                                        :{TINYFONT}{COMMA}
 STR_01CC_TOGGLE_LARGE_SMALL_MAP                                 :{BLACK}Váltás kis és nagy térkép között
 STR_01CD_SELECT_TUTORIAL_DEMONSTRATION                          :{WHITE}Válassz egy tanítást/demót
 
@@ -509,7 +509,7 @@
 STR_CARGO_ACCEPTED_5                                            :{BLACK}Elfogad: {LTBLUE}{STRING}, {STRING}, {STRING}, {STRING}, {STRING}
 ############ range for cargo acecpted ends
 
-STR_01D1_8                                                      :({COMMA8}/8 {STRING})
+STR_01D1_8                                                      :({COMMA}/8 {STRING})
 STR_01D2_JAZZ_JUKEBOX                                           :{WHITE}Jazz zenegép
 STR_01D3_SOUND_MUSIC                                            :Hang/zene
 STR_01D4_SHOW_SOUND_MUSIC_WINDOW                                :{BLACK}Hang/zene beállítás
@@ -528,16 +528,16 @@
 STR_01E1_START_PLAYING_MUSIC                                    :{BLACK}Zene elindítása
 STR_01E2_DRAG_SLIDERS_TO_SET_MUSIC                              :{BLACK}A csúszkákkal beállíthatod a zene és a hanghatások hangerejét
 STR_01E3                                                        :{DKGREEN}{TINYFONT}--
-STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA8}
-STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA8}
+STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA}
+STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA}
 STR_01E6                                                        :{DKGREEN}{TINYFONT}------
 STR_01E7                                                        :{DKGREEN}{TINYFONT}"{STRING}"
 STR_01E8_TRACK_XTITLE                                           :{BLACK}{TINYFONT}Szám{SETX 88}Cím
 STR_01E9_SHUFFLE                                                :{TINYFONT}Kever
 STR_01EA_PROGRAM                                                :{TINYFONT}{BLACK}Mûsor
 STR_01EB_MUSIC_PROGRAM_SELECTION                                :{WHITE}Zenei mûsor kiválasztása
-STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA16}   "{STRING}"
-STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA16}   "{STRING}"
+STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA}   "{STRING}"
+STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA}   "{STRING}"
 STR_01EE_TRACK_INDEX                                            :{TINYFONT}{BLACK}Számlista
 STR_01EF_PROGRAM                                                :{TINYFONT}{BLACK}"{STRING}" mûsora
 STR_01F0_CLEAR                                                  :{TINYFONT}{BLACK}Törlés
@@ -577,7 +577,7 @@
 STR_0210_TOO_FAR_FROM_PREVIOUS_DESTINATIO                       :{WHITE}...túl távol van az elõzõ céltól
 STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Legjobb cégek melyek elérték a {NUMU16}{}({STRING} Szintet)
 STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Cégdicsõség tábla {NUMU16}
-STR_0212                                                        :{BIGFONT}{COMMA16}.
+STR_0212                                                        :{BIGFONT}{COMMA}.
 STR_0213_BUSINESSMAN                                            :Üzletember
 STR_0214_ENTREPRENEUR                                           :Vállalkozó
 STR_0215_INDUSTRIALIST                                          :Iparos
@@ -586,12 +586,12 @@
 STR_0218_MOGUL                                                  :Fejes
 STR_0219_TYCOON_OF_THE_CENTURY                                  :Az évszázad iparmágnása
 STR_HIGHSCORE_NAME                                              :{BIGFONT}{STRING}, {STRING}
-STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA16})
+STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA})
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{STRING} elérte a '{STRING}' rangot!
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{STRING} - {STRING} elérte a '{STRING}' rangot!
 STR_021D                                                        :{BLACK}
 STR_021E                                                        :{WHITE}
-STR_021F                                                        :{BLUE}{COMMA16}
+STR_021F                                                        :{BLUE}{COMMA}
 STR_0220_CREATE_SCENARIO                                        :{BLACK}Saját pálya készítése
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}pályaszerkesztõ
@@ -788,8 +788,8 @@
 STR_EXTRA_VIEW_PORT                                             :Extra látkép
 STR_SIGN_LIST                                                   :Feliratok listája
 STR_02DF_TOWN_DIRECTORY                                         :Városlista
-STR_TOWN_POPULATION                                             :{BLACK}Világnépesség: {COMMA32}
-STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}{COMMA16}. látkép
+STR_TOWN_POPULATION                                             :{BLACK}Világnépesség: {COMMA}
+STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}{COMMA}. látkép
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN                                :{BLACK}Látkép aktualizálása
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT                             :{BLACK}Beállítja a globális látkép pozicióját erre a látképre
 STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW                                :{BLACK}Látkép visszatöltése
@@ -961,34 +961,34 @@
 STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Nem lehet másolni a menetrendet...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Megosztott menetrend vége - -
 
-STR_TRAIN_IS_LOST                                               :{WHITE}{COMMA16}. vonat eltévedt.
-STR_TRAIN_IS_UNPROFITABLE                                       :{WHITE}{COMMA16}. vonat profitja az elmúlt évben: {CURRENCY}
+STR_TRAIN_IS_LOST                                               :{WHITE}{COMMA}. vonat eltévedt.
+STR_TRAIN_IS_UNPROFITABLE                                       :{WHITE}{COMMA}. vonat profitja az elmúlt évben: {CURRENCY}
 STR_EURO_INTRODUCE                                              :{BLACK}{BIGFONT}Európai Pénzügyi Únió!{}{}Az Euro bevezetésre került mint egyedüli valuta a mindennapi pénzügyi tranzakciókra az országodban!
 
 # Start of order review system.
 # DON'T ADD OR REMOVE LINES HERE
-STR_TRAIN_HAS_TOO_FEW_ORDERS                                    :{WHITE}A(z) {COMMA16}. vonatnak túl rövid a menetrendje
-STR_TRAIN_HAS_VOID_ORDER                                        :{WHITE}A(z) {COMMA16}. vonatnak üres a menetrendje
-STR_TRAIN_HAS_DUPLICATE_ENTRY                                   :{WHITE}A(z) {COMMA16}. vonatnak duplikált utasításai vannak
-STR_TRAIN_HAS_INVALID_ENTRY                                     :{WHITE}A(z) {COMMA16}. vonatnak nemlétezõ állomás van a menetrendjében
-STR_ROADVEHICLE_HAS_TOO_FEW_ORDERS                              :{WHITE}A(z) {COMMA16}. közúti jármûnek túl kevés a teendõje
-STR_ROADVEHICLE_HAS_VOID_ORDER                                  :{WHITE}A(z) {COMMA16}. közúti jármûnek nincs teendõje
-STR_ROADVEHICLE_HAS_DUPLICATE_ENTRY                             :{WHITE}A(z) {COMMA16}. köyúti jármûnek duplikált utasításai vannak
-STR_ROADVEHICLE_HAS_INVALID_ENTRY                               :{WHITE}A(z) {COMMA16}. közúti jármûnek nemlétezõ állomás van a menetrendjében
-STR_SHIP_HAS_TOO_FEW_ORDERS                                     :{WHITE}A(z) {COMMA16}. hajónak túl rövid a menetrendje
-STR_SHIP_HAS_VOID_ORDER                                         :{WHITE}A(z) {COMMA16}. hajónak üres a menetrendje
-STR_SHIP_HAS_DUPLICATE_ENTRY                                    :{WHITE}A(z) {COMMA16}. hajónak duplikált utasításai vannak
-STR_SHIP_HAS_INVALID_ENTRY                                      :{WHITE}A(z) {COMMA16}. hajónak nemlétezõ állomás van a menetrendjében
-STR_AIRCRAFT_HAS_TOO_FEW_ORDERS                                 :{WHITE}A(z) {COMMA16}. repülõnek túl rövid a menetrendje
-STR_AIRCRAFT_HAS_VOID_ORDER                                     :{WHITE}A(z) {COMMA16}. repülõnek üres a menetrendje
-STR_AIRCRAFT_HAS_DUPLICATE_ENTRY                                :{WHITE}A(z) {COMMA16}. repülõnek duplikált utasitásai vannak
-STR_AIRCRAFT_HAS_INVALID_ENTRY                                  :{WHITE}A(z) {COMMA16}. repülõnek nemlétezõ állomás van a menetrendjében
+STR_TRAIN_HAS_TOO_FEW_ORDERS                                    :{WHITE}A(z) {COMMA}. vonatnak túl rövid a menetrendje
+STR_TRAIN_HAS_VOID_ORDER                                        :{WHITE}A(z) {COMMA}. vonatnak üres a menetrendje
+STR_TRAIN_HAS_DUPLICATE_ENTRY                                   :{WHITE}A(z) {COMMA}. vonatnak duplikált utasításai vannak
+STR_TRAIN_HAS_INVALID_ENTRY                                     :{WHITE}A(z) {COMMA}. vonatnak nemlétezõ állomás van a menetrendjében
+STR_ROADVEHICLE_HAS_TOO_FEW_ORDERS                              :{WHITE}A(z) {COMMA}. közúti jármûnek túl kevés a teendõje
+STR_ROADVEHICLE_HAS_VOID_ORDER                                  :{WHITE}A(z) {COMMA}. közúti jármûnek nincs teendõje
+STR_ROADVEHICLE_HAS_DUPLICATE_ENTRY                             :{WHITE}A(z) {COMMA}. köyúti jármûnek duplikált utasításai vannak
+STR_ROADVEHICLE_HAS_INVALID_ENTRY                               :{WHITE}A(z) {COMMA}. közúti jármûnek nemlétezõ állomás van a menetrendjében
+STR_SHIP_HAS_TOO_FEW_ORDERS                                     :{WHITE}A(z) {COMMA}. hajónak túl rövid a menetrendje
+STR_SHIP_HAS_VOID_ORDER                                         :{WHITE}A(z) {COMMA}. hajónak üres a menetrendje
+STR_SHIP_HAS_DUPLICATE_ENTRY                                    :{WHITE}A(z) {COMMA}. hajónak duplikált utasításai vannak
+STR_SHIP_HAS_INVALID_ENTRY                                      :{WHITE}A(z) {COMMA}. hajónak nemlétezõ állomás van a menetrendjében
+STR_AIRCRAFT_HAS_TOO_FEW_ORDERS                                 :{WHITE}A(z) {COMMA}. repülõnek túl rövid a menetrendje
+STR_AIRCRAFT_HAS_VOID_ORDER                                     :{WHITE}A(z) {COMMA}. repülõnek üres a menetrendje
+STR_AIRCRAFT_HAS_DUPLICATE_ENTRY                                :{WHITE}A(z) {COMMA}. repülõnek duplikált utasitásai vannak
+STR_AIRCRAFT_HAS_INVALID_ENTRY                                  :{WHITE}A(z) {COMMA}. repülõnek nemlétezõ állomás van a menetrendjében
 # end of order system
 
-STR_TRAIN_AUTORENEW_FAILED                                      :{WHITE}Autorenew sikertelen a(z) {COMMA16}. vonaton (pénzlimit)
-STR_ROADVEHICLE_AUTORENEW_FAILED                                :{WHITE}Autorenew sikertelen a(z) {COMMA16}. közúti jármûvön (pénzlimit)
-STR_SHIP_AUTORENEW_FAILED                                       :{WHITE}Autorenew sikertelen a(z) {COMMA16}. hajón (pénzlimit)
-STR_AIRCRAFT_AUTORENEW_FAILED                                   :{WHITE}Autorenew sikertelen a(z) {COMMA16}. repülõn (pénzlimit)
+STR_TRAIN_AUTORENEW_FAILED                                      :{WHITE}Autorenew sikertelen a(z) {COMMA}. vonaton (pénzlimit)
+STR_ROADVEHICLE_AUTORENEW_FAILED                                :{WHITE}Autorenew sikertelen a(z) {COMMA}. közúti jármûvön (pénzlimit)
+STR_SHIP_AUTORENEW_FAILED                                       :{WHITE}Autorenew sikertelen a(z) {COMMA}. hajón (pénzlimit)
+STR_AIRCRAFT_AUTORENEW_FAILED                                   :{WHITE}Autorenew sikertelen a(z) {COMMA}. repülõn (pénzlimit)
 
 STR_CONFIG_PATCHES                                              :{BLACK}Foltok beállítása
 STR_CONFIG_PATCHES_TIP                                          :{BLACK}Foltok beállítása
@@ -1104,7 +1104,7 @@
 STR_CHEATS_TIP                                                  :{BLACK}A kijelölõnégyzetek jelzik a csalások eddigi használtságát
 STR_CHEATS_WARNING                                              :{BLACK}Figyelem! Te épp a versenytársaidat készülöd elárulni. Sose felejtsd el, hogy egy ilyen szégyenletes tett sose merül feledésbe.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Tõkeemelés {CURRENCY64}
-STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Játszani mint játékos #{ORANGE}{COMMA16}
+STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Játszani mint játékos #{ORANGE}{COMMA}
 STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Csodabuldózer (lerombol gazdasági épületeket, stb): {ORANGE}{STRING}
 STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}A csatornák keresztezhessék egymást: {ORANGE}{STRING}
 STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Építés szünet módban: {ORANGE}{STRING}
@@ -1120,7 +1120,7 @@
 STR_GO_NON_STOP_TO_WAYPOINT                                     :Úton {WAYPOINT} ellenõrzõ ponton át
 
 STR_WAYPOINTNAME_CITY                                           :{TOWN}i ellenõrzõ pont
-STR_WAYPOINTNAME_CITY_SERIAL                                    :{TOWN}i {COMMA16}. ellenõrzõ pont
+STR_WAYPOINTNAME_CITY_SERIAL                                    :{TOWN}i {COMMA}. ellenõrzõ pont
 STR_LANDINFO_WAYPOINT                                           :Ellenõrzõ pont
 
 STR_WAYPOINT                                                    :{WHITE}Ellenõrzõ pont
@@ -1203,8 +1203,8 @@
 STR_CONSTRUCT_SUGAR_MINE_TIP                                    :{BLACK}Cukorbánya építése
 
 STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Gazdasági épületek
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}){YELLOW} ({COMMA16}% elszállítva)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}/{STRING}){YELLOW} ({COMMA16}%/{COMMA16}% elszállítva)
+STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}){YELLOW} ({COMMA}% elszállítva)
+STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}/{STRING}){YELLOW} ({COMMA}%/{COMMA}% elszállítva)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{TOWN} {STRING}
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...túl közel egy másik gazdasági épülethez
@@ -1244,15 +1244,15 @@
 STR_NETWORK_ADD_SERVER_TIP                                      :{BLACK}Hozzáadja a szervert a listához, így késõbb gyorsabban tudsz hozzá csatlakozni
 STR_NETWORK_ENTER_IP                                            :{BLACK}Írd be a szerver IP címét
 
-STR_NETWORK_CLIENTS_ONLINE                                      :{BLACK}{COMMA16}/{COMMA16}
+STR_NETWORK_CLIENTS_ONLINE                                      :{BLACK}{COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Kliens
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Kliens online / kliens max
 STR_NETWORK_GAME_INFO                                           :{SILVER}JÁTÉK INFÓ
 STR_ORANGE                                                      :{ORANGE}{STRING}
-STR_NETWORK_CLIENTS                                             :{SILVER}Kliens:  {WHITE}{COMMA8} / {COMMA8}
+STR_NETWORK_CLIENTS                                             :{SILVER}Kliens:  {WHITE}{COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}Nyelv:  {WHITE}{STRING}
 STR_NETWORK_TILESET                                             :{SILVER}Tájtípus:  {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}A pálya nagysága:  {WHITE}{COMMA16}x{COMMA16}
+STR_NETWORK_MAP_SIZE                                            :{SILVER}A pálya nagysága:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Szerver verzió:  {WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}A szerver címe:  {WHITE}{STRING} : {NUMU16}
 STR_NETWORK_START_DATE                                          :{SILVER}Kezdési dátum:  {WHITE}{DATE_SHORT}
@@ -1517,21 +1517,21 @@
 
 ##id 0x2000
 STR_2000_TOWNS                                                  :{WHITE}Városok
-STR_TOWN_LABEL_POP                                              :{WHITE}{STRING} ({COMMA32})
+STR_TOWN_LABEL_POP                                              :{WHITE}{STRING} ({COMMA})
 STR_2001                                                        :{WHITE}{STRING}
 STR_2002                                                        :{TINYFONT}{BLACK}{STRING}
 STR_2003                                                        :{TINYFONT}{WHITE}{STRING}
 STR_2004_BUILDING_MUST_BE_DEMOLISHED                            :{WHITE}Elõbb le kell rombolnod az épületet
 STR_2005                                                        :{WHITE}{TOWN}
-STR_2006_POPULATION                                             :{BLACK}Lakosság: {ORANGE}{COMMA32}{BLACK} Házak: {ORANGE}{COMMA32}
+STR_2006_POPULATION                                             :{BLACK}Lakosság: {ORANGE}{COMMA}{BLACK} Házak: {ORANGE}{COMMA}
 STR_2007_RENAME_TOWN                                            :Város átnevezése
 STR_2008_CAN_T_RENAME_TOWN                                      :{WHITE}Nem nevezheted át a várost...
 STR_2009_LOCAL_AUTHORITY_REFUSES                                :{WHITE}{TOWN} önkormányzata nem engedélyezi
 STR_200A_TOWN_NAMES_CLICK_ON_NAME                               :{BLACK}Városnevek - kattints egy névre a város megnézéséhez
 STR_200B_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}A fõ nézetet a városra állítja
 STR_200C_CHANGE_TOWN_NAME                                       :{BLACK}A város nevének megváltoztatása
-STR_200D_PASSENGERS_LAST_MONTH_MAX                              :{BLACK}Utasok az elõzõ hónapban: {ORANGE}{COMMA32}{BLACK}  max: {ORANGE}{COMMA32}
-STR_200E_MAIL_LAST_MONTH_MAX                                    :{BLACK}Levélcsomagok az elõzõ hónapban: {ORANGE}{COMMA32}{BLACK}  max: {ORANGE}{COMMA32}
+STR_200D_PASSENGERS_LAST_MONTH_MAX                              :{BLACK}Utasok az elõzõ hónapban: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
+STR_200E_MAIL_LAST_MONTH_MAX                                    :{BLACK}Levélcsomagok az elõzõ hónapban: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
 STR_200F_TALL_OFFICE_BLOCK                                      :Magas irodaház
 STR_2010_OFFICE_BLOCK                                           :Irodaház
 STR_2011_SMALL_BLOCK_OF_FLATS                                   :Kis bérház
@@ -1605,7 +1605,7 @@
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} A megítélésed növelése az önkormányzat megvesztegetésével, komoly büntetést kockáztatva, ha ez kiderül.{} Ára: {CURRENCY}
 STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Közlekedési zûrzavar {TOWN} városában!{}{}{STRING} által indított útjavítás keseríti meg hat hónapig az autóvezetõk életét!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
-STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA32})
+STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA})
 STR_2058_UNDER_CONSTRUCTION                                     :{STRING} (építés alatt)
 STR_2059_IGLOO                                                  :Jégkunyhó
 STR_205A_TEPEES                                                 :Indiánsátor
@@ -1667,7 +1667,7 @@
 STR_303C_OUTSTANDING                                            :kimagasló
 ############ range for rating ends
 
-STR_303D                                                        :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA8}%)
+STR_303D                                                        :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_303E_NO_LONGER_ACCEPTS                                      :{WHITE}{STATION} többé nem fogad el {STRING}
 STR_303F_NO_LONGER_ACCEPTS_OR                                   :{WHITE}{STATION} többé nem fogad el {STRING} és {STRING}
 STR_3040_NOW_ACCEPTS                                            :{WHITE}{STATION} most már elfogad {STRING}
@@ -1678,7 +1678,7 @@
 STR_3045_TOO_CLOSE_TO_ANOTHER_TRUCK                             :{WHITE}Túl közel van egy másik teherautó-rakodóhoz
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Elõbb le kell rombolnod a buszmegállót
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Elõbb le kell rombolnod a teherautó-rakodóhelyet
-STR_3048_STATIONS                                               :{WHITE}{STRING} állomásai - {COMMA16}
+STR_3048_STATIONS                                               :{WHITE}{STRING} állomásai - {COMMA}
 STR_3049_0                                                      :{YELLOW}{STATION} {STRINL 0x30D1}
 STR_304A_NONE                                                   :{YELLOW}- Nincs -
 STR_304B_SITE_UNSUITABLE                                        :{WHITE}...nem alkalmas rá a hely
@@ -1735,7 +1735,7 @@
 STR_4002_SAVE                                                   :{BLACK}Ment
 STR_4003_DELETE                                                 :{BLACK}Töröl
 STR_4004                                                        :{STRING}, {DATE_LONG}
-STR_4005_BYTES_FREE                                             :{BLACK}{COMMA32} megabájt szabad
+STR_4005_BYTES_FREE                                             :{BLACK}{COMMA} megabájt szabad
 STR_4006_UNABLE_TO_READ_DRIVE                                   :{BLACK}Nem olvasható a meghajtó
 STR_4007_GAME_SAVE_FAILED                                       :{WHITE}A mentés nem sikerült
 STR_4008_UNABLE_TO_DELETE_FILE                                  :{WHITE}Nem sikerült törölni a fájlt
@@ -1796,7 +1796,7 @@
 ############ range for requires	ends
 
 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Múlt havi termelés:
-STR_482B_TRANSPORTED                                            :{YELLOW}{STRING}{BLACK} ({COMMA16}% elszállítva)
+STR_482B_TRANSPORTED                                            :{YELLOW}{STRING}{BLACK} ({COMMA}% elszállítva)
 STR_482C_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}A fõ nézetet a gazdasági épületre állítja
 STR_482D_NEW_UNDER_CONSTRUCTION                                 :{BLACK}{BIGFONT}Új {STRING} épül {TOWN} közelében!
 STR_482E_NEW_BEING_PLANTED_NEAR                                 :{BLACK}{BIGFONT}Új {STRING} ültettek {TOWN} közelében!
@@ -1813,8 +1813,8 @@
 STR_4839_PRODUCTION_DOWN_BY_50                                  :{BLACK}{BIGFONT}{TOWN}i {STRING} termelése a felére csökkent
 STR_483A_INSECT_INFESTATION_CAUSES                              :{BLACK}{BIGFONT}Egy rovaráradat {TOWN}i {STRING} pusztulását okozta!{}A termelés a felére csökkent
 STR_483B_CAN_ONLY_BE_POSITIONED                                 :{WHITE}...csak a térkép széléhez közel építhetõ
-STR_INDUSTRY_PROD_GOUP                                          :{BLACK}{BIGFONT}{STRING} termelés nõtt! {TOWN}i {STRING} mostantól {COMMA16}%-al többet termel!
-STR_INDUSTRY_PROD_GODOWN                                        :{BLACK}{BIGFONT}{STRING} termelés csökkent! {TOWN} {STRING} mostantól {COMMA16}%-al kevesebbet termel!
+STR_INDUSTRY_PROD_GOUP                                          :{BLACK}{BIGFONT}{STRING} termelés nõtt! {TOWN}i {STRING} mostantól {COMMA}%-al többet termel!
+STR_INDUSTRY_PROD_GODOWN                                        :{BLACK}{BIGFONT}{STRING} termelés csökkent! {TOWN} {STRING} mostantól {COMMA}%-al kevesebbet termel!
 
 ##id 0x5000
 STR_5000_TRAIN_IN_TUNNEL                                        :{WHITE}Vonat van az alagútban
@@ -1877,10 +1877,10 @@
 ##id 0x6000
 STR_SV_EMPTY                                                    :
 STR_SV_UNNAMED                                                  :Névtelen{SKIP}
-STR_SV_TRAIN_NAME                                               :Vonat {COMMA16}
-STR_SV_ROADVEH_NAME                                             :Közúti jármû {COMMA16}
-STR_SV_SHIP_NAME                                                :Hajó {COMMA16}
-STR_SV_AIRCRAFT_NAME                                            :Repülõ {COMMA16}
+STR_SV_TRAIN_NAME                                               :Vonat {COMMA}
+STR_SV_ROADVEH_NAME                                             :Közúti jármû {COMMA}
+STR_SV_SHIP_NAME                                                :Hajó {COMMA}
+STR_SV_AIRCRAFT_NAME                                            :Repülõ {COMMA}
 
 STR_SV_STNAME                                                   :{STRING}
 STR_SV_STNAME_NORTH                                             :Észak-{STRING}
@@ -1930,12 +1930,12 @@
 ############ range for difficulty levels ends
 
 ############ range for difficulty settings starts
-STR_6805_MAXIMUM_NO_COMPETITORS                                 :{LTBLUE}Ellenfelek száma legfeljebb: {ORANGE}{COMMA16}
+STR_6805_MAXIMUM_NO_COMPETITORS                                 :{LTBLUE}Ellenfelek száma legfeljebb: {ORANGE}{COMMA}
 STR_6806_COMPETITOR_START_TIME                                  :{LTBLUE}Ellenfelek kezdésének ideje: {ORANGE}{STRING}
 STR_6807_NO_OF_TOWNS                                            :{LTBLUE}Városok száma: {ORANGE}{STRING}
 STR_6808_NO_OF_INDUSTRIES                                       :{LTBLUE}Gazdasági épületek száma: {ORANGE}{STRING}
 STR_6809_MAXIMUM_INITIAL_LOAN_000                               :{LTBLUE}Max. kezdeti kölcsön: {ORANGE}{CURRENCY}
-STR_680A_INITIAL_INTEREST_RATE                                  :{LTBLUE}Éves kamatláb: {ORANGE}{COMMA16}%
+STR_680A_INITIAL_INTEREST_RATE                                  :{LTBLUE}Éves kamatláb: {ORANGE}{COMMA}%
 STR_680B_VEHICLE_RUNNING_COSTS                                  :{LTBLUE}Jármû fenntartási költség: {ORANGE}{STRING}
 STR_680C_CONSTRUCTION_SPEED_OF_COMPETITOR                       :{LTBLUE}Ellenfelek építkezési sebessége: {ORANGE}{STRING}
 STR_680D_INTELLIGENCE_OF_COMPETITORS                            :{LTBLUE}Ellenfelek intelligenciája: {ORANGE}{STRING}
@@ -1994,7 +1994,7 @@
 ##id 0x7000
 STR_7000                                                        :
 STR_7001                                                        :{WHITE}{STRING} {BLACK}{STRING}
-STR_7002_PLAYER                                                 :({COMMA16}. játékos)
+STR_7002_PLAYER                                                 :({COMMA}. játékos)
 STR_7004_NEW_FACE                                               :{BLACK}Új arc
 STR_7005_COLOR_SCHEME                                           :{BLACK}Szín váltása
 STR_7006_COLOR_SCHEME                                           :{GOLD}Szín:
@@ -2028,7 +2028,7 @@
 STR_7022_INCOME_GRAPH                                           :{WHITE}Jövedelem grafikon
 STR_CURRCOMPACT32                                               :{CURRCOMPACT}
 STR_CURRCOMPACT64                                               :{CURRCOMPACT64}
-STR_7024                                                        :{COMMA32}
+STR_7024                                                        :{COMMA}
 STR_7025_OPERATING_PROFIT_GRAPH                                 :{WHITE}Mûködési nyereség grafikon
 STR_7026_BANK_BALANCE                                           :{WHITE}Banki egyenleg
 STR_7027_LOAN                                                   :{WHITE}Kölcsön
@@ -2052,14 +2052,14 @@
 STR_7037_PRESIDENT                                              :{WHITE}{STRING}{}{GOLD}(Elnök)
 STR_7038_INAUGURATED                                            :{GOLD}Alapítás éve: {WHITE}{NUMU16}
 STR_7039_VEHICLES                                               :{GOLD}Jármûvek:
-STR_703A_TRAIN                                                  :{WHITE}{COMMA16} vonat
-STR_703B_TRAINS                                                 :{WHITE}{COMMA16} vonat
-STR_703C_ROAD_VEHICLE                                           :{WHITE}{COMMA16} közúti jármû
-STR_703D_ROAD_VEHICLES                                          :{WHITE}{COMMA16} közúti jármû
-STR_703E_AIRCRAFT                                               :{WHITE}{COMMA16} repülõgép
-STR_703F_AIRCRAFT                                               :{WHITE}{COMMA16} repülõgép
-STR_7040_SHIP                                                   :{WHITE}{COMMA16} hajó
-STR_7041_SHIPS                                                  :{WHITE}{COMMA16} hajó
+STR_703A_TRAIN                                                  :{WHITE}{COMMA} vonat
+STR_703B_TRAINS                                                 :{WHITE}{COMMA} vonat
+STR_703C_ROAD_VEHICLE                                           :{WHITE}{COMMA} közúti jármû
+STR_703D_ROAD_VEHICLES                                          :{WHITE}{COMMA} közúti jármû
+STR_703E_AIRCRAFT                                               :{WHITE}{COMMA} repülõgép
+STR_703F_AIRCRAFT                                               :{WHITE}{COMMA} repülõgép
+STR_7040_SHIP                                                   :{WHITE}{COMMA} hajó
+STR_7041_SHIPS                                                  :{WHITE}{COMMA} hajó
 STR_7042_NONE                                                   :{WHITE}Nincs
 STR_7043_FACE_SELECTION                                         :{WHITE}Arcválasztás
 STR_7044_MALE                                                   :{BLACK}Férfi
@@ -2124,8 +2124,8 @@
 STR_707A_SELL_25_SHARE_IN_THIS_COMPANY                          :{BLACK}25% eladása ebbõl a cégbõl
 STR_707B_CAN_T_BUY_25_SHARE_IN_THIS                             :{WHITE}Nem vehetsz 25%-ot ebbõl a cégbõl...
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}Nem adhatsz el 25%-ot ebbõl a cégbõl...
-STR_707D_OWNED_BY                                               :{WHITE}({COMMA16}% {STRING} tulajdona)
-STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA16}% {STRING} tulajdona{}   {COMMA16}% {STRING} tulajdona)
+STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% {STRING} tulajdona)
+STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}% {STRING} tulajdona{}   {COMMA}% {STRING} tulajdona)
 STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{STRING} céget felvásárolta {STRING}!
 STR_7080_PROTECTED                                              :{WHITE}Ez a cég egyelõre még nem rendelkezik részvényekkel...
 
@@ -2400,8 +2400,8 @@
 STR_8801_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Az emberek ünnepelnek . . .{}Megérkezett az elsõ vonat {STATION} állomásra!
 STR_8802_DETAILS                                                :{WHITE}{STRING} adatai
 STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}Vonat van az útban
-STR_8804                                                        :{SETX 10}{COMMA8}: {STRING}
-STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA8}: {STRING}
+STR_8804                                                        :{SETX 10}{COMMA}: {STRING}
+STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING}
 STR_8806_GO_TO                                                  :Menj {STATION} állomásra
 STR_8807_GO_TO_TRANSFER                                         :Menj {STATION} (odaszállít és felvesz rakományt)
 STR_8808_GO_TO_UNLOAD                                           :Menj {STATION} (lepakol)
@@ -2427,13 +2427,13 @@
 STR_UNKNOWN_DESTINATION                                         :ismeretlen célpont
 STR_8812_EMPTY                                                  :{LTBLUE}Üres
 STR_8813_FROM                                                   :{LTBLUE}{CARGO} {STATION} állomásról
-STR_8814_TRAIN_IS_WAITING_IN_DEPOT                              :{WHITE}{COMMA16}. vonat a jármûtelepen várakozik
+STR_8814_TRAIN_IS_WAITING_IN_DEPOT                              :{WHITE}{COMMA}. vonat a jármûtelepen várakozik
 STR_8815_NEW_VEHICLES                                           :{BLACK}Új jármûvek
 STR_8816                                                        :{BLACK}-
 STR_8818_INFORMATION                                            :{BLACK}Információk
 STR_8819_TRAIN_TOO_LONG                                         :{WHITE}Túl hosszú a vonat
 STR_881A_TRAINS_CAN_ONLY_BE_ALTERED                             :{WHITE}Csak a jármûtelepen álló vonatokat lehet megváltoztatni
-STR_881B_TRAINS                                                 :{WHITE}{STRING} vonatai - {COMMA16}
+STR_881B_TRAINS                                                 :{WHITE}{STRING} vonatai - {COMMA}
 STR_881C_NEW_RAIL_VEHICLES                                      :{WHITE}Új vasúti jármûvek
 STR_881D_NEW_MONORAIL_VEHICLES                                  :{WHITE}Új egysínû jármûvek
 STR_881E_NEW_MAGLEV_VEHICLES                                    :{WHITE}Új MagLev jármûvek
@@ -2467,8 +2467,8 @@
 STR_8839_CAN_T_SELL_RAILROAD_VEHICLE                            :{WHITE}Nem adhatod el a vasúti jármûvet...
 STR_883A_UNABLE_TO_FIND_ROUTE_TO                                :{WHITE}Nem találok utat a helyi jármûtelepre
 STR_883B_CAN_T_STOP_START_TRAIN                                 :{WHITE}Nem indíthatod el/ állíthatod meg a vonatot...
-STR_883C_SERVICING_INTERVAL_DAYS                                :{BLACK}Javítási idõköz: {LTBLUE}{COMMA16} nap{BLACK}   Utolsó javítás: {LTBLUE}{DATE_LONG}
-STR_SERVICING_INTERVAL_PERCENT                                  :{BLACK}Szervíz-intervallum: {LTBLUE}{COMMA16}%{BLACK}   Utolsó szervíz: {LTBLUE}{DATE_LONG}
+STR_883C_SERVICING_INTERVAL_DAYS                                :{BLACK}Javítási idõköz: {LTBLUE}{COMMA} nap{BLACK}   Utolsó javítás: {LTBLUE}{DATE_LONG}
+STR_SERVICING_INTERVAL_PERCENT                                  :{BLACK}Szervíz-intervallum: {LTBLUE}{COMMA}%{BLACK}   Utolsó szervíz: {LTBLUE}{DATE_LONG}
 STR_883D_TRAINS_CLICK_ON_TRAIN_FOR                              :{BLACK}Vonatok - kattints egy vonatra az adataihoz
 STR_883E_BUILD_NEW_TRAINS_REQUIRES                              :{BLACK}Új vonatok vásárlása (jármûtelep szükséges hozzá)
 STR_883F_TRAINS_CLICK_ON_TRAIN_FOR                              :{BLACK}Vonatok - kattints egy vonatra az adataihoz, húzással áthelyezheted a jármûveket
@@ -2501,12 +2501,12 @@
 STR_SERVICE_HINT                                                :{BLACK}Célpont kihagyása, ha javítás szükséges
 STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}Új {STRING} használható!
 STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
-STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Ár: {CURRENCY}    Súly: {COMMA16}t{}Sebesség: {VELOCITY}    Teljesítmény: {COMMA16}le{}Mûködtetési költség: {CURRENCY}/év{}Kapacitás: {STRING}
+STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Ár: {CURRENCY}    Súly: {COMMA}t{}Sebesség: {VELOCITY}    Teljesítmény: {COMMA}le{}Mûködtetési költség: {CURRENCY}/év{}Kapacitás: {STRING}
 STR_885C_BROKEN_DOWN                                            :{RED}Lerobbant
 STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Kor: {LTBLUE}{STRING}{BLACK}   Mûködtetési költség: {LTBLUE}{CURRENCY}/év
-STR_885E_WEIGHT_T_POWER_HP_MAX_SPEED                            :{BLACK}Súly: {LTBLUE}{COMMA16}t   {BLACK}Teljesítmény: {LTBLUE}{COMMA32} le{BLACK}   Végsebesség: {LTBLUE} {VELOCITY}
+STR_885E_WEIGHT_T_POWER_HP_MAX_SPEED                            :{BLACK}Súly: {LTBLUE}{COMMA}t   {BLACK}Teljesítmény: {LTBLUE}{COMMA} le{BLACK}   Végsebesség: {LTBLUE} {VELOCITY}
 STR_885F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Ezévi haszon: {LTBLUE}{CURRENCY}  (tavalyi: {CURRENCY})
-STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Megbízhatóság: {LTBLUE}{COMMA8}%   {BLACK}Lerobbanások az utolsó javítás óta: {LTBLUE}{COMMA16}
+STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Megbízhatóság: {LTBLUE}{COMMA}%   {BLACK}Lerobbanások az utolsó javítás óta: {LTBLUE}{COMMA}
 STR_8861_STOPPED                                                :{RED}Áll
 STR_8862_CAN_T_MAKE_TRAIN_PASS_SIGNAL                           :{WHITE}Nem indíthatod el a vonatot veszélyben...
 STR_8863_CRASHED                                                :{RED}Balesetet szenvedett!
@@ -2514,7 +2514,7 @@
 STR_8865_NAME_TRAIN                                             :{WHITE}Vonat átnevezése
 STR_8866_CAN_T_NAME_TRAIN                                       :{WHITE}Nem nevezheted át a vonatot...
 STR_8867_NAME_TRAIN                                             :{BLACK}Vonat átnevezése
-STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Vonatbaleset!{}{COMMA16} ember halt meg az ütközésnél
+STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Vonatbaleset!{}{COMMA} ember halt meg az ütközésnél
 STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}Nem fordíthatod meg a vonatot...
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Márkanév megváltoztatása
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Nem változtathatod meg a márkanevet...
@@ -2526,7 +2526,7 @@
 
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Közúti jármû van az útban
-STR_9001_ROAD_VEHICLES                                          :{WHITE}{STRING} közúti jármûvei - {COMMA16}
+STR_9001_ROAD_VEHICLES                                          :{WHITE}{STRING} közúti jármûvei - {COMMA}
 STR_9002                                                        :{WHITE}{STRING}
 STR_9003_ROAD_VEHICLE_DEPOT                                     :{WHITE}{TOWN}i garázs
 STR_9004_NEW_VEHICLES                                           :{BLACK}Új jármûvek
@@ -2540,13 +2540,13 @@
 STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Kor: {LTBLUE}{STRING}{BLACK}   Mûködtetési költség: {LTBLUE}{CURRENCY}/év
 STR_900E_MAX_SPEED                                              :{BLACK}Végsebesség: {LTBLUE}{VELOCITY}
 STR_900F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Ezévi haszon: {LTBLUE}{CURRENCY}  (tavalyi: {CURRENCY})
-STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Megbízhatóság: {LTBLUE}{COMMA8}%   {BLACK}Lerobbanások az utolsó javítás óta: {LTBLUE}{COMMA16}
+STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Megbízhatóság: {LTBLUE}{COMMA}%   {BLACK}Lerobbanások az utolsó javítás óta: {LTBLUE}{COMMA}
 STR_9011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Vásárlás éve: {LTBLUE}{NUMU16}{BLACK}   Érték: {LTBLUE}{CURRENCY}
 STR_9012_CAPACITY                                               :{BLACK}Kapacitás: {LTBLUE}{STRING}
 STR_9013_MUST_BE_STOPPED_INSIDE                                 :{WHITE}...garázsban kellene állnia ehhez
 STR_9014_CAN_T_SELL_ROAD_VEHICLE                                :{WHITE}Nem adhatod el a közúti jármûvet...
 STR_9015_CAN_T_STOP_START_ROAD_VEHICLE                          :{WHITE}Nem indíthatod el/ állíthatod meg a közúti jármûvet...
-STR_9016_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{COMMA16}. közúti jármû a garázsban várakozik
+STR_9016_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{COMMA}. közúti jármû a garázsban várakozik
 STR_HEADING_FOR_ROAD_DEPOT                                      :{LTBLUE}Úton a {TOWN}i garázsba
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{LTBLUE}Úton a {TOWN}i garázsba, {VELOCITY}
 STR_9018_CAN_T_SEND_VEHICLE_TO_DEPOT                            :{WHITE}Nem küldheted a jármûvet a garázsba...
@@ -2575,7 +2575,7 @@
 STR_902F_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Az emberek ünnepelnek . . .{}Megérkezett az elsõ busz {STATION} állomásra!
 STR_9030_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Az emberek ünnepelnek . . .{}Megérkezett az elsõ teherautó {STATION} állomásra!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Közúti baleset!{}A vezetõ meghalt a vonattal való ütközéskor
-STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Közúti baleset!{}{COMMA16} ember meghalt a vonattal való ütközéskor
+STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Közúti baleset!{}{COMMA} ember meghalt a vonattal való ütközéskor
 STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}Nem fordíthatod vissza a jármûvet...
 STR_9034_RENAME                                                 :{BLACK}Átnevez
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}A közúti jármû márkanevének megváltoztatása
@@ -2590,7 +2590,7 @@
 STR_9802_CAN_T_BUILD_DOCK_HERE                                  :{WHITE}Nem építhetsz ide kikötõt...
 STR_9803_SHIP_DEPOT                                             :{WHITE}{TOWN}i dokk
 STR_9804_NEW_SHIPS                                              :{BLACK}Új hajók
-STR_9805_SHIPS                                                  :{WHITE}{STRING} hajói - {COMMA16}
+STR_9805_SHIPS                                                  :{WHITE}{STRING} hajói - {COMMA}
 STR_9806_CAN_T_BUILD_SHIPS                                      :{WHITE}Nem vehetsz hajókat...
 STR_9807_MUST_BUILD_SHIP_DEPOT_FIRST                            :{WHITE}Elõbb dokkot kell építened
 STR_9808_NEW_SHIPS                                              :{WHITE}Új hajók
@@ -2605,7 +2605,7 @@
 STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Kor: {LTBLUE}{STRING}{BLACK}   Mûködtetési költség: {LTBLUE}{CURRENCY}/év
 STR_9813_MAX_SPEED                                              :{BLACK}Végsebesség: {LTBLUE}{VELOCITY}
 STR_9814_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Ezévi haszon: {LTBLUE}{CURRENCY}  (tavalyi: {CURRENCY})
-STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Megbízhatóság: {LTBLUE}{COMMA8}%   {BLACK}Lerobbanások az utolsó javítás óta: {LTBLUE}{COMMA16}
+STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Megbízhatóság: {LTBLUE}{COMMA}%   {BLACK}Lerobbanások az utolsó javítás óta: {LTBLUE}{COMMA}
 STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Vásárlás éve: {LTBLUE}{NUMU16}{BLACK}   Érték: {LTBLUE}{CURRENCY}
 STR_9817_CAPACITY                                               :{BLACK}Kapacitás: {LTBLUE}{STRING}
 STR_9818_CAN_T_STOP_START_SHIP                                  :{WHITE}Nem indíthatod el/ állíthatod meg a hajót...
@@ -2613,7 +2613,7 @@
 STR_981A_UNABLE_TO_FIND_LOCAL_DEPOT                             :{WHITE}Nem találom a helyi dokkot
 STR_HEADING_FOR_SHIP_DEPOT                                      :{LTBLUE}Úton a {TOWN}i dokkba
 STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{LTBLUE}Úton a {TOWN}i dokkba, {VELOCITY}
-STR_981C_SHIP_IS_WAITING_IN_DEPOT                               :{WHITE}{COMMA16}. hajó a dokkban várakozik
+STR_981C_SHIP_IS_WAITING_IN_DEPOT                               :{WHITE}{COMMA}. hajó a dokkban várakozik
 STR_981D_BUILD_SHIP_DOCK                                        :{BLACK}Kikötõ építése
 STR_981E_BUILD_SHIP_DEPOT_FOR_BUILDING                          :{BLACK}Dokk építése (hajók vételére és karbantartására)
 STR_981F_SHIPS_CLICK_ON_SHIP_FOR                                :{BLACK}Hajók - kattints egy hajóra az adataihoz
@@ -2664,19 +2664,19 @@
 STR_A005_NEW_AIRCRAFT                                           :{WHITE}Új repülõgépek
 STR_A006_BUILD_AIRCRAFT                                         :{BLACK}Megvesz
 STR_A008_CAN_T_BUILD_AIRCRAFT                                   :{WHITE}Nem veheted meg a repülõgépet...
-STR_A009_AIRCRAFT                                               :{WHITE}{STRING} repülõgépei - {COMMA16}
+STR_A009_AIRCRAFT                                               :{WHITE}{STRING} repülõgépei - {COMMA}
 STR_A00A                                                        :{WHITE}{STRING}
 STR_A00B_ORDERS                                                 :{WHITE}{STRING} menetrendje
 STR_A00C_DETAILS                                                :{WHITE}{STRING} adatai
 STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Kor: {LTBLUE}{STRING}{BLACK}   Mûködtetési költség: {LTBLUE}{CURRENCY}/év
 STR_A00E_MAX_SPEED                                              :{BLACK}Végsebesség: {LTBLUE}{VELOCITY}
 STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Ezévi haszon: {LTBLUE}{CURRENCY}  (tavalyi: {CURRENCY})
-STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Megbízhatóság: {LTBLUE}{COMMA8}%   {BLACK}Lerobbanások az utolsó javítás óta: {LTBLUE}{COMMA16}
+STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Megbízhatóság: {LTBLUE}{COMMA}%   {BLACK}Lerobbanások az utolsó javítás óta: {LTBLUE}{COMMA}
 STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Vásárlás éve: {LTBLUE}{NUMU16}{BLACK}   Érték: {LTBLUE}{CURRENCY}
 STR_A012_CAN_T_SEND_AIRCRAFT_TO                                 :{WHITE}Nem küldheted a repülõgépet a hangárba...
 STR_HEADING_FOR_HANGAR                                          :{LTBLUE}Úton a {STATION} hangárjába
 STR_HEADING_FOR_HANGAR_VEL                                      :{LTBLUE}Úton a {STATION} hangárjába, {VELOCITY}
-STR_A014_AIRCRAFT_IS_WAITING_IN                                 :{WHITE}{COMMA16}. repülõgép a hangárban várakozik
+STR_A014_AIRCRAFT_IS_WAITING_IN                                 :{WHITE}{COMMA}. repülõgép a hangárban várakozik
 STR_A015_AIRCRAFT_IN_THE_WAY                                    :{WHITE}Repülõgép van az útban
 STR_A016_CAN_T_STOP_START_AIRCRAFT                              :{WHITE}Nem indíthatod el/ állíthatod meg a repülõgépet...
 STR_A017_AIRCRAFT_IS_IN_FLIGHT                                  :{WHITE}... a levegõben van
@@ -2702,14 +2702,14 @@
 STR_A02B_SHOW_AIRCRAFT_DETAILS                                  :{BLACK}A repülõgép adatai
 STR_A02C_NEW_AIRCRAFT_NOW_AVAILABLE                             :{BLACK}{BIGFONT}Új repülõgép használható!
 STR_A02D                                                        :{BLACK}{BIGFONT}{STRING}
-STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Ár: {CURRENCY}    Végsebesség: {VELOCITY}{}Kapacitás: {COMMA16} utas, {COMMA16} csomag levél{}Mûködtetési költség: {CURRENCY}/év
+STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Ár: {CURRENCY}    Végsebesség: {VELOCITY}{}Kapacitás: {COMMA} utas, {COMMA} csomag levél{}Mûködtetési költség: {CURRENCY}/év
 
 STR_A030_NAME_AIRCRAFT                                          :{WHITE}Repülõgép átnevezése
 STR_A031_CAN_T_NAME_AIRCRAFT                                    :{WHITE}Nem nevezheted át a repülõgépet...
 STR_A032_NAME_AIRCRAFT                                          :{BLACK}Repülõgép átnevezése
 STR_A033_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Az emberek ünnepelnek . . .{}Megérkezett az elsõ repülõgép {STATION} állomásra!
-STR_A034_PLANE_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Lezuhant egy repülõgép!{}{COMMA16} ember halt meg a zuhanás után {STATION} állomáson
-STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Repülõ baleset!{}A repülõnek elfogyott az üzemanyaga, {COMMA16} ember halt meg a zuhanásban!
+STR_A034_PLANE_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Lezuhant egy repülõgép!{}{COMMA} ember halt meg a zuhanás után {STATION} állomáson
+STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Repülõ baleset!{}A repülõnek elfogyott az üzemanyaga, {COMMA} ember halt meg a zuhanásban!
 STR_A035_DESTINATIONS                                           :{TINYFONT}{BLACK}Célpontok:
 STR_A036                                                        :{TINYFONT}{BLACK}{STATION}
 STR_A037_RENAME                                                 :{BLACK}Átnevez
@@ -2735,7 +2735,7 @@
 STR_B003_FACTORY_DESTROYED_IN_SUSPICIOUS                        :{BLACK}{BIGFONT}Gyanús körülmények között felrobbant egy gyár {TOWN} közelében!
 STR_B004_UFO_LANDS_NEAR                                         :{BLACK}{BIGFONT}'UFO' szállt le {TOWN} közelében!
 STR_B005_COAL_MINE_SUBSIDENCE_LEAVES                            :{BLACK}{BIGFONT}Egy szénbánya lesüllyedése földcsuszamlást okozott {TOWN} közelében!
-STR_B006_FLOOD_VEHICLE_DESTROYED                                :{BLACK}{BIGFONT}Áradás!{}Legalább {COMMA16} ember meghalt vagy eltünt a halálos áradás következtében!
+STR_B006_FLOOD_VEHICLE_DESTROYED                                :{BLACK}{BIGFONT}Áradás!{}Legalább {COMMA} ember meghalt vagy eltünt a halálos áradás következtében!
 
 STR_BRIBE_FAILED                                                :{WHITE}A megvesztegetési kísérleted
 STR_BRIBE_FAILED_2                                              :{WHITE}lefülelte egy helyi nyomozó!
@@ -2745,7 +2745,7 @@
 STR_PERFORMANCE_DETAIL                                          :{WHITE}Teljesítményértékelések részletezése
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Részletek
 STR_PERFORMANCE_DETAIL_AMOUNT_CURRENCY                          :{BLACK}({CURRCOMPACT}/{CURRCOMPACT})
-STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA32}/{COMMA32})
+STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA}/{COMMA})
 STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{INT32}%
 SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{INT32}
 ############ Those following lines need to be in this order!!
@@ -2780,7 +2780,7 @@
 STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID:
 
 STR_CURRENCY_WINDOW                                             :{WHITE}Saját pénznem
-STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Értékarány: {ORANGE}{CURRENCY} = {POUNDSIGN} {COMMA16}
+STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Értékarány: {ORANGE}{CURRENCY} = {POUNDSIGN} {COMMA}
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Elválasztó:
 STR_CURRENCY_PREFIX                                             :{LTBLUE}Elõtag:
 STR_CURRENCY_SUFFIX                                             :{LTBLUE}Elõtag:
@@ -2794,10 +2794,10 @@
 STR_PLANE                                                       :{BLACK}{PLANE}
 STR_SHIP                                                        :{BLACK}{SHIP}
 
-STR_SCHEDULED_TRAINS                                            :{WHITE}{STATION} - {COMMA16} Vonatok
-STR_SCHEDULED_ROAD_VEHICLES                                     :{WHITE}{STATION} - {COMMA16} Közúti jármûvek
-STR_SCHEDULED_AIRCRAFT                                          :{WHITE}{STATION} - {COMMA16} Repülõgépek
-STR_SCHEDULED_SHIPS                                             :{WHITE}{STATION} - {COMMA16} Hajók
+STR_SCHEDULED_TRAINS                                            :{WHITE}{STATION} - {COMMA} Vonatok
+STR_SCHEDULED_ROAD_VEHICLES                                     :{WHITE}{STATION} - {COMMA} Közúti jármûvek
+STR_SCHEDULED_AIRCRAFT                                          :{WHITE}{STATION} - {COMMA} Repülõgépek
+STR_SCHEDULED_SHIPS                                             :{WHITE}{STATION} - {COMMA} Hajók
 
 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
@@ -2819,7 +2819,7 @@
 STR_REPLACE_HELP                                                :{BLACK}Ez az opció lehetõve teszi, hogy kiválassz mozdonytípust és lecseréld másfajtára. Ez aztán automatikusan fog megtörténni, amikor a jármû karbantartásra a depóba megy
 
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
-STR_SIGN_LIST_CAPTION                                           :{WHITE}Feliratok listája ({COMMA16} db)
+STR_SIGN_LIST_CAPTION                                           :{WHITE}Feliratok listája ({COMMA} db)
 
 ############ Lists rail types
 
@@ -2829,16 +2829,16 @@
 
 ############ End of list of rail types
 
-STR_TINY_BLACK                                                  :{BLACK}{TINYFONT}{COMMA16}
+STR_TINY_BLACK                                                  :{BLACK}{TINYFONT}{COMMA}
 
-STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Ár: {GOLD}{CURRENCY}{BLACK} Súly: {GOLD}{COMMA16}t
-STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Sebesség: {GOLD}{VELOCITY}{BLACK} Telj.: {GOLD}{COMMA32} lóerõ
+STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Ár: {GOLD}{CURRENCY}{BLACK} Súly: {GOLD}{COMMA}t
+STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Sebesség: {GOLD}{VELOCITY}{BLACK} Telj.: {GOLD}{COMMA} lóerõ
 STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}Üzemeltetés: {GOLD}{CURRENCY}/év
 STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Kapacitás: {GOLD}{STRING} {STRING}
-STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Kifejlesztve: {GOLD}{NUMU16}{BLACK} Élettartam: {GOLD}{COMMA16} év
-STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Max. üzemképesség: {GOLD}{COMMA8}%
+STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Kifejlesztve: {GOLD}{NUMU16}{BLACK} Élettartam: {GOLD}{COMMA} év
+STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Max. üzemképesség: {GOLD}{COMMA}%
 STR_PURCHASE_INFO_COST                                          :{BLACK}Ár: {GOLD}{CURRENCY}
-STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Súly: {GOLD}{COMMA16}t  ({COMMA16}t)
+STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Súly: {GOLD}{COMMA}t  ({COMMA}t)
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Ár: {GOLD}{CURRENCY}{BLACK} Sebesség: {GOLD}{VELOCITY}
-STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Kapacitás: {GOLD}{COMMA16} utas, {COMMA16} csomag levél
-STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Meghajtott vagonok: {GOLD}+{COMMA16} lóerõ{BLACK} Súly: {GOLD}+{COMMA8}t
+STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Kapacitás: {GOLD}{COMMA} utas, {COMMA} csomag levél
+STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Meghajtott vagonok: {GOLD}+{COMMA} lóerõ{BLACK} Súly: {GOLD}+{COMMA}t
--- a/lang/icelandic.txt	Thu Jul 14 09:53:52 2005 +0000
+++ b/lang/icelandic.txt	Thu Jul 14 15:10:20 2005 +0000
@@ -82,69 +82,69 @@
 STR_004C_PLASTIC                                                :Plast
 STR_004D_FIZZY_DRINK                                            :Gosdrykkja
 STR_004E                                                        :
-STR_004F_PASSENGER                                              :{COMMA16} farþegi
-STR_0050_TON_OF_COAL                                            :{COMMA16} tonn af kolum
-STR_0051_BAG_OF_MAIL                                            :{COMMA16} pokar af pósti
+STR_004F_PASSENGER                                              :{COMMA} farþegi
+STR_0050_TON_OF_COAL                                            :{COMMA} tonn af kolum
+STR_0051_BAG_OF_MAIL                                            :{COMMA} pokar af pósti
 STR_0052_OF_OIL                                                 :{VOLUME} af olíu
-STR_0053_ITEM_OF_LIVESTOCK                                      :{COMMA16} nautgripur
-STR_0054_CRATE_OF_GOODS                                         :{COMMA16} kassi af vörum
-STR_0055_TON_OF_GRAIN                                           :{COMMA16} tonn af korni
-STR_0056_TON_OF_WOOD                                            :{COMMA16} tonn af timbri
-STR_0057_TON_OF_IRON_ORE                                        :{COMMA16} tonn af járngrýti
-STR_0058_TON_OF_STEEL                                           :{COMMA16} tonn af stáli
-STR_0059_BAG_OF_VALUABLES                                       :{COMMA16} poki af verðmætum
-STR_005A_TON_OF_COPPER_ORE                                      :{COMMA16} tonn af kopar
-STR_005B_TON_OF_MAIZE                                           :{COMMA16} tonn af maís
-STR_005C_TON_OF_FRUIT                                           :{COMMA16} tonn af ávöxtum
-STR_005D_BAG_OF_DIAMONDS                                        :{COMMA16} poki af demöntum
-STR_005E_TON_OF_FOOD                                            :{COMMA16} tonn af matvælum
-STR_005F_TON_OF_PAPER                                           :{COMMA16} tonn af pappír
-STR_0060_BAG_OF_GOLD                                            :{COMMA16} poki af gulli
+STR_0053_ITEM_OF_LIVESTOCK                                      :{COMMA} nautgripur
+STR_0054_CRATE_OF_GOODS                                         :{COMMA} kassi af vörum
+STR_0055_TON_OF_GRAIN                                           :{COMMA} tonn af korni
+STR_0056_TON_OF_WOOD                                            :{COMMA} tonn af timbri
+STR_0057_TON_OF_IRON_ORE                                        :{COMMA} tonn af járngrýti
+STR_0058_TON_OF_STEEL                                           :{COMMA} tonn af stáli
+STR_0059_BAG_OF_VALUABLES                                       :{COMMA} poki af verðmætum
+STR_005A_TON_OF_COPPER_ORE                                      :{COMMA} tonn af kopar
+STR_005B_TON_OF_MAIZE                                           :{COMMA} tonn af maís
+STR_005C_TON_OF_FRUIT                                           :{COMMA} tonn af ávöxtum
+STR_005D_BAG_OF_DIAMONDS                                        :{COMMA} poki af demöntum
+STR_005E_TON_OF_FOOD                                            :{COMMA} tonn af matvælum
+STR_005F_TON_OF_PAPER                                           :{COMMA} tonn af pappír
+STR_0060_BAG_OF_GOLD                                            :{COMMA} poki af gulli
 STR_0061_OF_WATER                                               :{VOLUME} af vatni
-STR_0062_TON_OF_WHEAT                                           :{COMMA16} tonn af hveiti
+STR_0062_TON_OF_WHEAT                                           :{COMMA} tonn af hveiti
 STR_0063_OF_RUBBER                                              :{VOLUME} af gúmmíi
-STR_0064_TON_OF_SUGAR                                           :{COMMA16} tonn af sykri
-STR_0065_TOY                                                    :{COMMA16} leikfang
-STR_0066_BAG_OF_CANDY                                           :{COMMA16} poki af sælgæti
+STR_0064_TON_OF_SUGAR                                           :{COMMA} tonn af sykri
+STR_0065_TOY                                                    :{COMMA} leikfang
+STR_0066_BAG_OF_CANDY                                           :{COMMA} poki af sælgæti
 STR_0067_OF_COLA                                                :{VOLUME} af kóladrykk
-STR_0068_TON_OF_COTTON_CANDY                                    :{COMMA16} tonn af sykurfrauði
-STR_0069_BUBBLE                                                 :{COMMA16} kúla
-STR_006A_TON_OF_TOFFEE                                          :{COMMA16} tonn af toffý
-STR_006B_BATTERY                                                :{COMMA16} rafhlaða
+STR_0068_TON_OF_COTTON_CANDY                                    :{COMMA} tonn af sykurfrauði
+STR_0069_BUBBLE                                                 :{COMMA} kúla
+STR_006A_TON_OF_TOFFEE                                          :{COMMA} tonn af toffý
+STR_006B_BATTERY                                                :{COMMA} rafhlaða
 STR_006C_OF_PLASTIC                                             :{VOLUME} af plasti
-STR_006D_FIZZY_DRINK                                            :{COMMA16} gosdrykkur
+STR_006D_FIZZY_DRINK                                            :{COMMA} gosdrykkur
 STR_006E                                                        :
-STR_006F_PASSENGERS                                             :{COMMA16} farþegar
-STR_0070_TONS_OF_COAL                                           :{COMMA16} tonn af kolum
-STR_0071_BAGS_OF_MAIL                                           :{COMMA16} pokar af pósti
+STR_006F_PASSENGERS                                             :{COMMA} farþegar
+STR_0070_TONS_OF_COAL                                           :{COMMA} tonn af kolum
+STR_0071_BAGS_OF_MAIL                                           :{COMMA} pokar af pósti
 STR_0072_OF_OIL                                                 :{VOLUME} af olíu
-STR_0073_ITEMS_OF_LIVESTOCK                                     :{COMMA16} nautgripir
-STR_0074_CRATES_OF_GOODS                                        :{COMMA16} kassar af vörum
-STR_0075_TONS_OF_GRAIN                                          :{COMMA16} tonn af korni
-STR_0076_TONS_OF_WOOD                                           :{COMMA16} tonn af timbri
-STR_0077_TONS_OF_IRON_ORE                                       :{COMMA16} tonn af járngrýti
-STR_0078_TONS_OF_STEEL                                          :{COMMA16} tonn af stáli
-STR_0079_BAGS_OF_VALUABLES                                      :{COMMA16} pokar af verðmætum
-STR_007A_TONS_OF_COPPER_ORE                                     :{COMMA16} tonn af kopar
-STR_007B_TONS_OF_MAIZE                                          :{COMMA16} tonn af maís
-STR_007C_TONS_OF_FRUIT                                          :{COMMA16} tonn af ávöxtum
-STR_007D_BAGS_OF_DIAMONDS                                       :{COMMA16} pokar af demöntum
-STR_007E_TONS_OF_FOOD                                           :{COMMA16} tonn af matvælum
-STR_007F_TONS_OF_PAPER                                          :{COMMA16} tonn af pappír
-STR_0080_BAGS_OF_GOLD                                           :{COMMA16} pokar af gulli
+STR_0073_ITEMS_OF_LIVESTOCK                                     :{COMMA} nautgripir
+STR_0074_CRATES_OF_GOODS                                        :{COMMA} kassar af vörum
+STR_0075_TONS_OF_GRAIN                                          :{COMMA} tonn af korni
+STR_0076_TONS_OF_WOOD                                           :{COMMA} tonn af timbri
+STR_0077_TONS_OF_IRON_ORE                                       :{COMMA} tonn af járngrýti
+STR_0078_TONS_OF_STEEL                                          :{COMMA} tonn af stáli
+STR_0079_BAGS_OF_VALUABLES                                      :{COMMA} pokar af verðmætum
+STR_007A_TONS_OF_COPPER_ORE                                     :{COMMA} tonn af kopar
+STR_007B_TONS_OF_MAIZE                                          :{COMMA} tonn af maís
+STR_007C_TONS_OF_FRUIT                                          :{COMMA} tonn af ávöxtum
+STR_007D_BAGS_OF_DIAMONDS                                       :{COMMA} pokar af demöntum
+STR_007E_TONS_OF_FOOD                                           :{COMMA} tonn af matvælum
+STR_007F_TONS_OF_PAPER                                          :{COMMA} tonn af pappír
+STR_0080_BAGS_OF_GOLD                                           :{COMMA} pokar af gulli
 STR_0081_OF_WATER                                               :{VOLUME} af vatni
-STR_0082_TONS_OF_WHEAT                                          :{COMMA16} tonn af hveiti
+STR_0082_TONS_OF_WHEAT                                          :{COMMA} tonn af hveiti
 STR_0083_OF_RUBBER                                              :{VOLUME} af gúmmíi
-STR_0084_TONS_OF_SUGAR                                          :{COMMA16} tonn af sykri
-STR_0085_TOYS                                                   :{COMMA16} leikföng
-STR_0086_BAGS_OF_CANDY                                          :{COMMA16} pokar af sælgæti
+STR_0084_TONS_OF_SUGAR                                          :{COMMA} tonn af sykri
+STR_0085_TOYS                                                   :{COMMA} leikföng
+STR_0086_BAGS_OF_CANDY                                          :{COMMA} pokar af sælgæti
 STR_0087_OF_COLA                                                :{VOLUME} af kóla
-STR_0088_TONS_OF_COTTON_CANDY                                   :{COMMA16} tonn af sykurfrauði
-STR_0089_BUBBLES                                                :{COMMA16} kúlur
-STR_008A_TONS_OF_TOFFEE                                         :{COMMA16} tonn af toffý
-STR_008B_BATTERIES                                              :{COMMA16} rafhlöður
+STR_0088_TONS_OF_COTTON_CANDY                                   :{COMMA} tonn af sykurfrauði
+STR_0089_BUBBLES                                                :{COMMA} kúlur
+STR_008A_TONS_OF_TOFFEE                                         :{COMMA} tonn af toffý
+STR_008B_BATTERIES                                              :{COMMA} rafhlöður
 STR_008C_OF_PLASTIC                                             :{VOLUME} af plasti
-STR_008D_FIZZY_DRINKS                                           :{COMMA16} gosdrykkir
+STR_008D_FIZZY_DRINKS                                           :{COMMA} gosdrykkir
 STR_008E                                                        :
 STR_008F_PS                                                     :{TINYFONT}PS
 STR_0090_CL                                                     :{TINYFONT}CL
@@ -219,8 +219,8 @@
 STR_00DF_GREY                                                   :Grár
 STR_00E0_WHITE                                                  :Hvítur
 STR_00E1_TOO_MANY_VEHICLES_IN_GAME                              :{WHITE}Of mörg farartæki í leiknum
-STR_00E2                                                        :{BLACK}{COMMA16}
-STR_00E3                                                        :{RED}{COMMA16}
+STR_00E2                                                        :{BLACK}{COMMA}
+STR_00E3                                                        :{RED}{COMMA}
 STR_00E4_LOCATION                                               :{BLACK}Staður
 STR_00E5_CONTOURS                                               :Útlínur
 STR_00E6_VEHICLES                                               :Farartæki
@@ -441,18 +441,18 @@
 STR_0198_PROFIT_THIS_YEAR_LAST_YEAR                             :{TINYFONT}{BLACK}Hagnaður þetta ár: {CURRENCY} (síðasta ár: {CURRENCY})
 
 ############ range for service numbers starts
-STR_0199_YEAR                                                   :{COMMA16} ár ({COMMA16})
-STR_019A_YEARS                                                  :{COMMA16} ár ({COMMA16})
-STR_019B_YEARS                                                  :{RED}{COMMA16} ár ({COMMA16})
+STR_0199_YEAR                                                   :{COMMA} ár ({COMMA})
+STR_019A_YEARS                                                  :{COMMA} ár ({COMMA})
+STR_019B_YEARS                                                  :{RED}{COMMA} ár ({COMMA})
 ############ range for service numbers ends
 
 STR_019C_ROAD_VEHICLE                                           :Bifreið
 STR_019D_AIRCRAFT                                               :Flugvél
 STR_019E_SHIP                                                   :Skip
 STR_019F_TRAIN                                                  :Lest
-STR_01A0_IS_GETTING_OLD                                         :{WHITE}{STRING} {COMMA16} er að eldast
-STR_01A1_IS_GETTING_VERY_OLD                                    :{WHITE}{STRING} {COMMA16} er að eldast um of
-STR_01A2_IS_GETTING_VERY_OLD_AND                                :{WHITE}{STRING} {COMMA16} er að eldast um of og þarfnast nauðsynlega endurnýjunar
+STR_01A0_IS_GETTING_OLD                                         :{WHITE}{STRING} {COMMA} er að eldast
+STR_01A1_IS_GETTING_VERY_OLD                                    :{WHITE}{STRING} {COMMA} er að eldast um of
+STR_01A2_IS_GETTING_VERY_OLD_AND                                :{WHITE}{STRING} {COMMA} er að eldast um of og þarfnast nauðsynlega endurnýjunar
 STR_01A3_LAND_AREA_INFORMATION                                  :{WHITE}Landsvæðisupplýsingar
 STR_01A4_COST_TO_CLEAR_N_A                                      :{BLACK}Kostnaður við hreinsun: {LTBLUE}N/A
 STR_01A5_COST_TO_CLEAR                                          :{BLACK}Kostnaður við hreinsun: {LTBLUE}{CURRENCY}
@@ -497,7 +497,7 @@
 STR_01CA_31ST                                                   :31.
 ############ range for days	ends
 
-STR_01CB                                                        :{TINYFONT}{COMMA16}
+STR_01CB                                                        :{TINYFONT}{COMMA}
 STR_01CC_TOGGLE_LARGE_SMALL_MAP                                 :{BLACK}Stór/lítil kortastærð
 STR_01CD_SELECT_TUTORIAL_DEMONSTRATION                          :{WHITE}Velja Leiðbeiningar/Sýnikennslu
 
@@ -509,7 +509,7 @@
 STR_CARGO_ACCEPTED_5                                            :{BLACK}Tekið á móti: {LTBLUE}{STRING}, {STRING}, {STRING}, {STRING}, {STRING}
 ############ range for cargo acecpted ends
 
-STR_01D1_8                                                      :({COMMA8}/8 {STRING})
+STR_01D1_8                                                      :({COMMA}/8 {STRING})
 STR_01D2_JAZZ_JUKEBOX                                           :{WHITE}Jazz glymskratti
 STR_01D3_SOUND_MUSIC                                            :Hljóð/tónlist
 STR_01D4_SHOW_SOUND_MUSIC_WINDOW                                :{BLACK}Sýna hljóð/tónlistar glugga
@@ -528,16 +528,16 @@
 STR_01E1_START_PLAYING_MUSIC                                    :{BLACK}Byrja að spila tónlist
 STR_01E2_DRAG_SLIDERS_TO_SET_MUSIC                              :{BLACK}Dragðu sleðana til að stilla hljóð/tónlistar styrkinn
 STR_01E3                                                        :{DKGREEN}{TINYFONT}--
-STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA8}
-STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA8}
+STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA}
+STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA}
 STR_01E6                                                        :{DKGREEN}{TINYFONT}------
 STR_01E7                                                        :{DKGREEN}{TINYFONT}"{STRING}"
 STR_01E8_TRACK_XTITLE                                           :{BLACK}{TINYFONT}Lag{SETX 88}Titill
 STR_01E9_SHUFFLE                                                :{TINYFONT}Stokka
 STR_01EA_PROGRAM                                                :{TINYFONT}{BLACK}Listar
 STR_01EB_MUSIC_PROGRAM_SELECTION                                :{WHITE}Lagalistar
-STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA16} "{STRING}"
-STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA16}   "{STRING}"
+STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} "{STRING}"
+STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA}   "{STRING}"
 STR_01EE_TRACK_INDEX                                            :{TINYFONT}{BLACK}Laganúmer
 STR_01EF_PROGRAM                                                :{TINYFONT}{BLACK}Listi - '{STRING}'
 STR_01F0_CLEAR                                                  :{TINYFONT}{BLACK}Hreinsa
@@ -577,7 +577,7 @@
 STR_0210_TOO_FAR_FROM_PREVIOUS_DESTINATIO                       :{WHITE}...of langt frá fyrri stað
 STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Efstu fyrirtæki sem náðu {NUMU16}{}({STRING} stig)
 STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Sambandstafla fyrirtækis í {NUMU16}
-STR_0212                                                        :{BIGFONT}{COMMA16}.
+STR_0212                                                        :{BIGFONT}{COMMA}.
 STR_0213_BUSINESSMAN                                            :Viðskiptamaður
 STR_0214_ENTREPRENEUR                                           :Athafnamaður
 STR_0215_INDUSTRIALIST                                          :Iðnjöfur
@@ -586,12 +586,12 @@
 STR_0218_MOGUL                                                  :Stórlax
 STR_0219_TYCOON_OF_THE_CENTURY                                  :Viðskiptajöfur aldarinnar
 STR_HIGHSCORE_NAME                                              :{BIGFONT}{STRING}, {STRING}
-STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA16})
+STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA})
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{STRING} öðlast '{STRING}' titil!
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{STRING} úr {STRING} öðlast '{STRING}' titil!
 STR_021D                                                        :{BLACK}
 STR_021E                                                        :{WHITE}
-STR_021F                                                        :{BLUE}{COMMA16}
+STR_021F                                                        :{BLUE}{COMMA}
 STR_0220_CREATE_SCENARIO                                        :{BLACK}Búa til kort
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Kortagerð
@@ -788,8 +788,8 @@
 STR_EXTRA_VIEW_PORT                                             :Auka sjónarhorn
 STR_SIGN_LIST                                                   :Skiltalisti
 STR_02DF_TOWN_DIRECTORY                                         :Bæjarmappa
-STR_TOWN_POPULATION                                             :{BLACK}Heildaríbúafjöldi: {COMMA32}
-STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Sjónarhorn {COMMA16}
+STR_TOWN_POPULATION                                             :{BLACK}Heildaríbúafjöldi: {COMMA}
+STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Sjónarhorn {COMMA}
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN                                :{BLACK}Afrita í sjónarhorn
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT                             :{BLACK}Afrita aðalsjónarhornið í sjónarhornsrammann
 STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW                                :{BLACK}Afrita frá sjónarhorni
@@ -961,34 +961,34 @@
 STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Get ekki afritað áætlun...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Endi sameiginlegra skipana - -
 
-STR_TRAIN_IS_LOST                                               :{WHITE}Lest {COMMA16} er týnd.
-STR_TRAIN_IS_UNPROFITABLE                                       :{WHITE}Hagnaður lestar {COMMA16} á síðasta ári var {CURRENCY}
+STR_TRAIN_IS_LOST                                               :{WHITE}Lest {COMMA} er týnd.
+STR_TRAIN_IS_UNPROFITABLE                                       :{WHITE}Hagnaður lestar {COMMA} á síðasta ári var {CURRENCY}
 STR_EURO_INTRODUCE                                              :{BLACK}{BIGFONT}Gjaldeyrissameining í Evrópu!{}{}Evran er nú eini gjaldeyririnn fyrir öll viðskipti í þínu landi!
 
 # Start of order review system.
 # DON'T ADD OR REMOVE LINES HERE
-STR_TRAIN_HAS_TOO_FEW_ORDERS                                    :{WHITE}Lest {COMMA16} hefur of fáar skipanir á áætluninni
-STR_TRAIN_HAS_VOID_ORDER                                        :{WHITE}Lest {COMMA16} hefur tóma skipun
-STR_TRAIN_HAS_DUPLICATE_ENTRY                                   :{WHITE}Lest {COMMA16} hefur tvöfaldar skipanir
-STR_TRAIN_HAS_INVALID_ENTRY                                     :{WHITE}Lest {COMMA16} hefur ógilda stöð í áætluninni
-STR_ROADVEHICLE_HAS_TOO_FEW_ORDERS                              :{WHITE}Bifreið {COMMA16} hefur of fáar skipanir á áætluninni
-STR_ROADVEHICLE_HAS_VOID_ORDER                                  :{WHITE}Bifreið {COMMA16} hefur tóma skipun
-STR_ROADVEHICLE_HAS_DUPLICATE_ENTRY                             :{WHITE}Bifreið {COMMA16} hefur tvöfaldar skipanir
-STR_ROADVEHICLE_HAS_INVALID_ENTRY                               :{WHITE}Bifreið {COMMA16} hefur ógilda stöð í áætluninni
-STR_SHIP_HAS_TOO_FEW_ORDERS                                     :{WHITE}Skip {COMMA16} hefur of fáar skipanir á áætluninni
-STR_SHIP_HAS_VOID_ORDER                                         :{WHITE}Skip {COMMA16} hefur tóma skipun
-STR_SHIP_HAS_DUPLICATE_ENTRY                                    :{WHITE}Skip {COMMA16} hefur tvöfaldar skipanir
-STR_SHIP_HAS_INVALID_ENTRY                                      :{WHITE}Skip {COMMA16} hefur ógilda stöð í áætluninni
-STR_AIRCRAFT_HAS_TOO_FEW_ORDERS                                 :{WHITE}Flugvél {COMMA16} hefur of fáar skipanir á áætluninni
-STR_AIRCRAFT_HAS_VOID_ORDER                                     :{WHITE}Flugvél {COMMA16} hefur tóma skipun
-STR_AIRCRAFT_HAS_DUPLICATE_ENTRY                                :{WHITE}Flugvél {COMMA16} hefur tvöfaldar skipanir
-STR_AIRCRAFT_HAS_INVALID_ENTRY                                  :{WHITE}Flugvél {COMMA16} hefur ógilda stöð í áætluninni
+STR_TRAIN_HAS_TOO_FEW_ORDERS                                    :{WHITE}Lest {COMMA} hefur of fáar skipanir á áætluninni
+STR_TRAIN_HAS_VOID_ORDER                                        :{WHITE}Lest {COMMA} hefur tóma skipun
+STR_TRAIN_HAS_DUPLICATE_ENTRY                                   :{WHITE}Lest {COMMA} hefur tvöfaldar skipanir
+STR_TRAIN_HAS_INVALID_ENTRY                                     :{WHITE}Lest {COMMA} hefur ógilda stöð í áætluninni
+STR_ROADVEHICLE_HAS_TOO_FEW_ORDERS                              :{WHITE}Bifreið {COMMA} hefur of fáar skipanir á áætluninni
+STR_ROADVEHICLE_HAS_VOID_ORDER                                  :{WHITE}Bifreið {COMMA} hefur tóma skipun
+STR_ROADVEHICLE_HAS_DUPLICATE_ENTRY                             :{WHITE}Bifreið {COMMA} hefur tvöfaldar skipanir
+STR_ROADVEHICLE_HAS_INVALID_ENTRY                               :{WHITE}Bifreið {COMMA} hefur ógilda stöð í áætluninni
+STR_SHIP_HAS_TOO_FEW_ORDERS                                     :{WHITE}Skip {COMMA} hefur of fáar skipanir á áætluninni
+STR_SHIP_HAS_VOID_ORDER                                         :{WHITE}Skip {COMMA} hefur tóma skipun
+STR_SHIP_HAS_DUPLICATE_ENTRY                                    :{WHITE}Skip {COMMA} hefur tvöfaldar skipanir
+STR_SHIP_HAS_INVALID_ENTRY                                      :{WHITE}Skip {COMMA} hefur ógilda stöð í áætluninni
+STR_AIRCRAFT_HAS_TOO_FEW_ORDERS                                 :{WHITE}Flugvél {COMMA} hefur of fáar skipanir á áætluninni
+STR_AIRCRAFT_HAS_VOID_ORDER                                     :{WHITE}Flugvél {COMMA} hefur tóma skipun
+STR_AIRCRAFT_HAS_DUPLICATE_ENTRY                                :{WHITE}Flugvél {COMMA} hefur tvöfaldar skipanir
+STR_AIRCRAFT_HAS_INVALID_ENTRY                                  :{WHITE}Flugvél {COMMA} hefur ógilda stöð í áætluninni
 # end of order system
 
-STR_TRAIN_AUTORENEW_FAILED                                      :{WHITE}Sjálfvirk uppfæring lestar {COMMA16} mistókst (takmarkað fjármagn)
-STR_ROADVEHICLE_AUTORENEW_FAILED                                :{WHITE}Sjálfvirk uppfæring bifreiðar {COMMA16} mistókst (takmarkað fjármagn)
-STR_SHIP_AUTORENEW_FAILED                                       :{WHITE}Sjálfvirk uppfæring skips {COMMA16} mistókst (takmarkað fjármagn)
-STR_AIRCRAFT_AUTORENEW_FAILED                                   :{WHITE}Sjálfvirk uppfæring flugvélar {COMMA16} mistókst (takmarkað fjármagn)
+STR_TRAIN_AUTORENEW_FAILED                                      :{WHITE}Sjálfvirk uppfæring lestar {COMMA} mistókst (takmarkað fjármagn)
+STR_ROADVEHICLE_AUTORENEW_FAILED                                :{WHITE}Sjálfvirk uppfæring bifreiðar {COMMA} mistókst (takmarkað fjármagn)
+STR_SHIP_AUTORENEW_FAILED                                       :{WHITE}Sjálfvirk uppfæring skips {COMMA} mistókst (takmarkað fjármagn)
+STR_AIRCRAFT_AUTORENEW_FAILED                                   :{WHITE}Sjálfvirk uppfæring flugvélar {COMMA} mistókst (takmarkað fjármagn)
 
 STR_CONFIG_PATCHES                                              :{BLACK}Auka stillingar
 STR_CONFIG_PATCHES_TIP                                          :{BLACK}Auka stillingar
@@ -1104,7 +1104,7 @@
 STR_CHEATS_TIP                                                  :{BLACK}Valreitur segir til um ef þú hefur notað þetta svindl áður
 STR_CHEATS_WARNING                                              :{BLACK}Aðvörun! Þú ert í þann mund að svíkja keppinauta þína. Hafðu í huga að þess lags svívirðing mun ætíð höfð í minnum.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Auka pening um {CURRENCY64}
-STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Spila sem leikmaður: {ORANGE}{COMMA16}
+STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Spila sem leikmaður: {ORANGE}{COMMA}
 STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Töfrajarðýta (eyða iðnaði og óeyðanlegu): {ORANGE}{STRING}
 STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Göng mega skerast: {ORANGE}{STRING}
 STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Byggja í bið: {ORANGE}{STRING}
@@ -1120,7 +1120,7 @@
 STR_GO_NON_STOP_TO_WAYPOINT                                     :Ekki stöðva á {WAYPOINT}
 
 STR_WAYPOINTNAME_CITY                                           :Millistöð {TOWN}
-STR_WAYPOINTNAME_CITY_SERIAL                                    :Millistöð {TOWN} #{COMMA16}
+STR_WAYPOINTNAME_CITY_SERIAL                                    :Millistöð {TOWN} #{COMMA}
 STR_LANDINFO_WAYPOINT                                           :Millistöð
 
 STR_WAYPOINT                                                    :{WHITE}Leiðarvísir
@@ -1203,8 +1203,8 @@
 STR_CONSTRUCT_SUGAR_MINE_TIP                                    :{BLACK}Grafa Sykurnámu
 
 STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Iðnaðir
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}){YELLOW} ({COMMA16}% flutt)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}/{STRING}){YELLOW} ({COMMA16}%/{COMMA16}% flutt)
+STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}){YELLOW} ({COMMA}% flutt)
+STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}/{STRING}){YELLOW} ({COMMA}%/{COMMA}% flutt)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{TOWN} {STRING}
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...of nálægt öðrum iðnaði
@@ -1244,15 +1244,15 @@
 STR_NETWORK_ADD_SERVER_TIP                                      :{BLACK}Bætir þjóni við listann sem mun alltaf sýna leiki í spilun
 STR_NETWORK_ENTER_IP                                            :{BLACK}Sláðu inn IP tölu þjónsins
 
-STR_NETWORK_CLIENTS_ONLINE                                      :{BLACK}{COMMA16}/{COMMA16}
+STR_NETWORK_CLIENTS_ONLINE                                      :{BLACK}{COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Notendur
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Tengdir notendur / hámarksfjöldi notenda
 STR_NETWORK_GAME_INFO                                           :{SILVER}UPPLÝSINGAR UM LEIK
 STR_ORANGE                                                      :{ORANGE}{STRING}
-STR_NETWORK_CLIENTS                                             :{SILVER}Notendur:  {WHITE}{COMMA8} / {COMMA8}
+STR_NETWORK_CLIENTS                                             :{SILVER}Notendur:  {WHITE}{COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}Tungumál:  {WHITE}{STRING}
 STR_NETWORK_TILESET                                             :{SILVER}Landslag:  {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Stærð:  {WHITE}{COMMA16}x{COMMA16}
+STR_NETWORK_MAP_SIZE                                            :{SILVER}Stærð:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Útgáfa þjóns:  {WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Veffang þjóns:  {WHITE}{STRING} : {NUMU16}
 STR_NETWORK_START_DATE                                          :{SILVER}Upphafsdagsetning:  {WHITE}{DATE_SHORT}
@@ -1517,21 +1517,21 @@
 
 ##id 0x2000
 STR_2000_TOWNS                                                  :{WHITE}Bæir
-STR_TOWN_LABEL_POP                                              :{WHITE}{STRING} ({COMMA32})
+STR_TOWN_LABEL_POP                                              :{WHITE}{STRING} ({COMMA})
 STR_2001                                                        :{WHITE}{STRING}
 STR_2002                                                        :{TINYFONT}{BLACK}{STRING}
 STR_2003                                                        :{TINYFONT}{WHITE}{STRING}
 STR_2004_BUILDING_MUST_BE_DEMOLISHED                            :{WHITE}Verður að eyða byggingu fyrst
 STR_2005                                                        :{WHITE}{TOWN}
-STR_2006_POPULATION                                             :{BLACK}Íbúafjöldi: {ORANGE}{COMMA32}{BLACK}  Hús: {ORANGE}{COMMA32}
+STR_2006_POPULATION                                             :{BLACK}Íbúafjöldi: {ORANGE}{COMMA}{BLACK}  Hús: {ORANGE}{COMMA}
 STR_2007_RENAME_TOWN                                            :Endurskíra bæ
 STR_2008_CAN_T_RENAME_TOWN                                      :{WHITE}Get ekki endurskírt bæ...
 STR_2009_LOCAL_AUTHORITY_REFUSES                                :{WHITE}{TOWN} bæjaryfirvöld leyfa þetta ekki
 STR_200A_TOWN_NAMES_CLICK_ON_NAME                               :{BLACK}Bæjarnöfn - ýttu á nafn til að færa sjónarhorn að viðkomandi bæ
 STR_200B_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Færa sjónarhorn á staðsetningu bæjar
 STR_200C_CHANGE_TOWN_NAME                                       :{BLACK}Breyta nafni bæjar
-STR_200D_PASSENGERS_LAST_MONTH_MAX                              :{BLACK}Farþegar síðasta mánaðar: {ORANGE}{COMMA32}{BLACK}  max: {ORANGE}{COMMA32}
-STR_200E_MAIL_LAST_MONTH_MAX                                    :{BLACK}Póstur síðasta mánaðar: {ORANGE}{COMMA32}{BLACK}  max: {ORANGE}{COMMA32}
+STR_200D_PASSENGERS_LAST_MONTH_MAX                              :{BLACK}Farþegar síðasta mánaðar: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
+STR_200E_MAIL_LAST_MONTH_MAX                                    :{BLACK}Póstur síðasta mánaðar: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
 STR_200F_TALL_OFFICE_BLOCK                                      :Há skrifstofubygging
 STR_2010_OFFICE_BLOCK                                           :Skrifstofubygging
 STR_2011_SMALL_BLOCK_OF_FLATS                                   :Lítil íbúðarbygging
@@ -1605,7 +1605,7 @@
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Múta bæjaryfirvöldum til að auka við fylgi þitt, með hættu á þungri refsingu komist það upp.{}  Kostnaður: {CURRENCY}
 STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Glundroði í umferð {TOWN}!{}{}Uppbygging vega kostuð af {STRING} veldur 6 mánaða vesæld meðal ökumanna!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
-STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA32})
+STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA})
 STR_2058_UNDER_CONSTRUCTION                                     :{STRING} (í byggingu)
 STR_2059_IGLOO                                                  :Snjóhús
 STR_205A_TEPEES                                                 :Indíánatjald
@@ -1667,7 +1667,7 @@
 STR_303C_OUTSTANDING                                            :Framúrskarandi
 ############ range for rating ends
 
-STR_303D                                                        :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA8}%)
+STR_303D                                                        :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_303E_NO_LONGER_ACCEPTS                                      :{WHITE}{STATION} tekur ekki lengur við {STRING}
 STR_303F_NO_LONGER_ACCEPTS_OR                                   :{WHITE}{STATION} tekur ekki lengur við {STRING} eða {STRING}
 STR_3040_NOW_ACCEPTS                                            :{WHITE}{STATION} tekur nú við {STRING}
@@ -1678,7 +1678,7 @@
 STR_3045_TOO_CLOSE_TO_ANOTHER_TRUCK                             :{WHITE}Of nálægt annarri póstvagnsstöð
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Verður að eyða strætisvagnastöðinni fyrst
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Verður að eyða póstvagnsstöðinni fyrst
-STR_3048_STATIONS                                               :{WHITE}{STRING} - {COMMA16} Stöðvar
+STR_3048_STATIONS                                               :{WHITE}{STRING} - {COMMA} Stöðvar
 STR_3049_0                                                      :{YELLOW}{STATION} {STRINL 0x30D1}
 STR_304A_NONE                                                   :{YELLOW}- Ekkert -
 STR_304B_SITE_UNSUITABLE                                        :{WHITE}...óhentug staðsetning
@@ -1735,7 +1735,7 @@
 STR_4002_SAVE                                                   :{BLACK}Vista
 STR_4003_DELETE                                                 :{BLACK}Eyða
 STR_4004                                                        :{STRING}, {DATE_LONG}
-STR_4005_BYTES_FREE                                             :{BLACK}{COMMA32} megabæti laus
+STR_4005_BYTES_FREE                                             :{BLACK}{COMMA} megabæti laus
 STR_4006_UNABLE_TO_READ_DRIVE                                   :{BLACK}Get ekki lesið af drifi
 STR_4007_GAME_SAVE_FAILED                                       :{WHITE}Vistun leiks mistókst
 STR_4008_UNABLE_TO_DELETE_FILE                                  :{WHITE}Get ekki eytt skrá
@@ -1796,7 +1796,7 @@
 ############ range for requires	ends
 
 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Framleiðsla síðasta mánaðar:
-STR_482B_TRANSPORTED                                            :{YELLOW}{STRING}{BLACK} ({COMMA16}% flutt)
+STR_482B_TRANSPORTED                                            :{YELLOW}{STRING}{BLACK} ({COMMA}% flutt)
 STR_482C_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Miðja aðalsjónarhorn á iðnað
 STR_482D_NEW_UNDER_CONSTRUCTION                                 :{BLACK}{BIGFONT}Ný {STRING} í byggingu við {TOWN}!
 STR_482E_NEW_BEING_PLANTED_NEAR                                 :{BLACK}{BIGFONT}Ný {STRING} er að rísa við {TOWN}!
@@ -1813,8 +1813,8 @@
 STR_4839_PRODUCTION_DOWN_BY_50                                  :{BLACK}{BIGFONT}50% samdráttur í framleiðslu hjá {TOWN} {STRING}
 STR_483A_INSECT_INFESTATION_CAUSES                              :{BLACK}{BIGFONT}Skordýraplága veldur tjóni á {TOWN} {STRING}!{}Framleiðsla minnkar um 50%
 STR_483B_CAN_ONLY_BE_POSITIONED                                 :{WHITE}...getur aðeins verið staðsett nálægt brún kortsins
-STR_INDUSTRY_PROD_GOUP                                          :{BLACK}{BIGFONT}{STRING}framleiðsla í {TOWN} {STRING} eykst um {COMMA16}%!
-STR_INDUSTRY_PROD_GODOWN                                        :{BLACK}{BIGFONT}{STRING}framleiðsla í {TOWN} {STRING} minnkar um {COMMA16}%!
+STR_INDUSTRY_PROD_GOUP                                          :{BLACK}{BIGFONT}{STRING}framleiðsla í {TOWN} {STRING} eykst um {COMMA}%!
+STR_INDUSTRY_PROD_GODOWN                                        :{BLACK}{BIGFONT}{STRING}framleiðsla í {TOWN} {STRING} minnkar um {COMMA}%!
 
 ##id 0x5000
 STR_5000_TRAIN_IN_TUNNEL                                        :{WHITE}Lest í göngunum
@@ -1877,10 +1877,10 @@
 ##id 0x6000
 STR_SV_EMPTY                                                    :
 STR_SV_UNNAMED                                                  :Ónefnt{SKIP}
-STR_SV_TRAIN_NAME                                               :Lest {COMMA16}
-STR_SV_ROADVEH_NAME                                             :Bifreið {COMMA16}
-STR_SV_SHIP_NAME                                                :Skip {COMMA16}
-STR_SV_AIRCRAFT_NAME                                            :Flugvél {COMMA16}
+STR_SV_TRAIN_NAME                                               :Lest {COMMA}
+STR_SV_ROADVEH_NAME                                             :Bifreið {COMMA}
+STR_SV_SHIP_NAME                                                :Skip {COMMA}
+STR_SV_AIRCRAFT_NAME                                            :Flugvél {COMMA}
 
 STR_SV_STNAME                                                   :{STRING}
 STR_SV_STNAME_NORTH                                             :{STRING} Norður
@@ -1930,12 +1930,12 @@
 ############ range for difficulty levels ends
 
 ############ range for difficulty settings starts
-STR_6805_MAXIMUM_NO_COMPETITORS                                 :{LTBLUE}Hámarksfjöldi keppinauta: {ORANGE}{COMMA16}
+STR_6805_MAXIMUM_NO_COMPETITORS                                 :{LTBLUE}Hámarksfjöldi keppinauta: {ORANGE}{COMMA}
 STR_6806_COMPETITOR_START_TIME                                  :{LTBLUE}Byrjunartími keppinauta: {ORANGE}{STRING}
 STR_6807_NO_OF_TOWNS                                            :{LTBLUE}Fjöldi bæja: {ORANGE}{STRING}
 STR_6808_NO_OF_INDUSTRIES                                       :{LTBLUE}Fjöldi iðnaða: {ORANGE}{STRING}
 STR_6809_MAXIMUM_INITIAL_LOAN_000                               :{LTBLUE}Hámarkslán í upphafi: {ORANGE}{CURRENCY}
-STR_680A_INITIAL_INTEREST_RATE                                  :{LTBLUE}Vextir í upphafi: {ORANGE}{COMMA16}%
+STR_680A_INITIAL_INTEREST_RATE                                  :{LTBLUE}Vextir í upphafi: {ORANGE}{COMMA}%
 STR_680B_VEHICLE_RUNNING_COSTS                                  :{LTBLUE}Rekstrarkostnaður farartækja: {ORANGE}{STRING}
 STR_680C_CONSTRUCTION_SPEED_OF_COMPETITOR                       :{LTBLUE}Byggingarhraði keppinauta: {ORANGE}{STRING}
 STR_680D_INTELLIGENCE_OF_COMPETITORS                            :{LTBLUE}Hæfni keppinauta: {ORANGE}{STRING}
@@ -1994,7 +1994,7 @@
 ##id 0x7000
 STR_7000                                                        :
 STR_7001                                                        :{WHITE}{STRING} {BLACK}{STRING}
-STR_7002_PLAYER                                                 :(Leikmaður {COMMA16})
+STR_7002_PLAYER                                                 :(Leikmaður {COMMA})
 STR_7004_NEW_FACE                                               :{BLACK}Nýtt Andlit
 STR_7005_COLOR_SCHEME                                           :{BLACK}Litaskema
 STR_7006_COLOR_SCHEME                                           :{GOLD}Litaskema:
@@ -2028,7 +2028,7 @@
 STR_7022_INCOME_GRAPH                                           :{WHITE}Tekjulínurit
 STR_CURRCOMPACT32                                               :{CURRCOMPACT}
 STR_CURRCOMPACT64                                               :{CURRCOMPACT64}
-STR_7024                                                        :{COMMA32}
+STR_7024                                                        :{COMMA}
 STR_7025_OPERATING_PROFIT_GRAPH                                 :{WHITE}Resktrartekju línurit
 STR_7026_BANK_BALANCE                                           :{WHITE}Bankainnistæða
 STR_7027_LOAN                                                   :{WHITE}Lán
@@ -2052,14 +2052,14 @@
 STR_7037_PRESIDENT                                              :{WHITE}{STRING}{}{GOLD}(Manager)
 STR_7038_INAUGURATED                                            :{GOLD}Hafið: {WHITE}{NUMU16}
 STR_7039_VEHICLES                                               :{GOLD}Farartæki:
-STR_703A_TRAIN                                                  :{WHITE}{COMMA16} lest
-STR_703B_TRAINS                                                 :{WHITE}{COMMA16} lestir
-STR_703C_ROAD_VEHICLE                                           :{WHITE}{COMMA16} bíll
-STR_703D_ROAD_VEHICLES                                          :{WHITE}{COMMA16} bílar
-STR_703E_AIRCRAFT                                               :{WHITE}{COMMA16} flugvél
-STR_703F_AIRCRAFT                                               :{WHITE}{COMMA16} flugvélar
-STR_7040_SHIP                                                   :{WHITE}{COMMA16} skip
-STR_7041_SHIPS                                                  :{WHITE}{COMMA16} skip
+STR_703A_TRAIN                                                  :{WHITE}{COMMA} lest
+STR_703B_TRAINS                                                 :{WHITE}{COMMA} lestir
+STR_703C_ROAD_VEHICLE                                           :{WHITE}{COMMA} bíll
+STR_703D_ROAD_VEHICLES                                          :{WHITE}{COMMA} bílar
+STR_703E_AIRCRAFT                                               :{WHITE}{COMMA} flugvél
+STR_703F_AIRCRAFT                                               :{WHITE}{COMMA} flugvélar
+STR_7040_SHIP                                                   :{WHITE}{COMMA} skip
+STR_7041_SHIPS                                                  :{WHITE}{COMMA} skip
 STR_7042_NONE                                                   :{WHITE}Engin
 STR_7043_FACE_SELECTION                                         :{WHITE}Andlitsval
 STR_7044_MALE                                                   :{BLACK}Karlmaður
@@ -2124,8 +2124,8 @@
 STR_707A_SELL_25_SHARE_IN_THIS_COMPANY                          :{BLACK}Selja 25% hlut í þessu fyrirtæki
 STR_707B_CAN_T_BUY_25_SHARE_IN_THIS                             :{WHITE}Get ekki keypt 25% hlut í þessu fyrirtæki...
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}Get ekki selt 25% hlut í þessu fyrirtæki...
-STR_707D_OWNED_BY                                               :{WHITE}({COMMA16}% í eigu {STRING})
-STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA16}% í eigu {STRING}{}   {COMMA16}% í eigu {STRING})
+STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% í eigu {STRING})
+STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}% í eigu {STRING}{}   {COMMA}% í eigu {STRING})
 STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{STRING} hefur verið yfirtekið af {STRING}!
 STR_7080_PROTECTED                                              :{WHITE}Þetta fyrirtæki er ekki nógu gamalt til að versla með hluti ...
 
@@ -2400,8 +2400,8 @@
 STR_8801_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Bæjarbúar fagna . . .{}Fyrsta lest kemur við á {STATION}!
 STR_8802_DETAILS                                                :{WHITE}{STRING} (Upplýsingar)
 STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}Lest fyrir
-STR_8804                                                        :{SETX 10}{COMMA8}: {STRING}
-STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA8}: {STRING}
+STR_8804                                                        :{SETX 10}{COMMA}: {STRING}
+STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING}
 STR_8806_GO_TO                                                  :Fer til {STATION}
 STR_8807_GO_TO_TRANSFER                                         :Fer til {STATION} (Yfirfæra og ferma)
 STR_8808_GO_TO_UNLOAD                                           :Fer til {STATION} (Afferma)
@@ -2427,13 +2427,13 @@
 STR_UNKNOWN_DESTINATION                                         :óþekktur áfangastaður
 STR_8812_EMPTY                                                  :{LTBLUE}Tómt
 STR_8813_FROM                                                   :{LTBLUE}{CARGO} frá {STATION}
-STR_8814_TRAIN_IS_WAITING_IN_DEPOT                              :{WHITE}Lest {COMMA16} bíður í skýli
+STR_8814_TRAIN_IS_WAITING_IN_DEPOT                              :{WHITE}Lest {COMMA} bíður í skýli
 STR_8815_NEW_VEHICLES                                           :{BLACK}Ný faratæki
 STR_8816                                                        :{BLACK}-
 STR_8818_INFORMATION                                            :{BLACK}Upplýsingar
 STR_8819_TRAIN_TOO_LONG                                         :{WHITE}Lestin er of löng
 STR_881A_TRAINS_CAN_ONLY_BE_ALTERED                             :{WHITE}Aðeins er hægt að eiga við lestir þegar þær bíða í skýli
-STR_881B_TRAINS                                                 :{WHITE}{STRING} - {COMMA16} Lestir
+STR_881B_TRAINS                                                 :{WHITE}{STRING} - {COMMA} Lestir
 STR_881C_NEW_RAIL_VEHICLES                                      :{WHITE}Nýir lestarvagnar
 STR_881D_NEW_MONORAIL_VEHICLES                                  :{WHITE}Nýir einteingungsvagnar
 STR_881E_NEW_MAGLEV_VEHICLES                                    :{WHITE}Nýir segullestarvagnar
@@ -2467,8 +2467,8 @@
 STR_8839_CAN_T_SELL_RAILROAD_VEHICLE                            :{WHITE}Get ekki selt lest...
 STR_883A_UNABLE_TO_FIND_ROUTE_TO                                :{WHITE}Get ekki fundið leit til staðbundins skýlis
 STR_883B_CAN_T_STOP_START_TRAIN                                 :{WHITE}Get ekki ræst/stöðva lest...
-STR_883C_SERVICING_INTERVAL_DAYS                                :{BLACK}Skoðanamillibil: {LTBLUE}{COMMA16}dagar{BLACK}   Seinasta skoðun: {LTBLUE}{DATE_LONG}
-STR_SERVICING_INTERVAL_PERCENT                                  :{BLACK}Skoðanamillibil: {LTBLUE}{COMMA16}%{BLACK}   Seinasta skoðun: {LTBLUE}{DATE_LONG}
+STR_883C_SERVICING_INTERVAL_DAYS                                :{BLACK}Skoðanamillibil: {LTBLUE}{COMMA}dagar{BLACK}   Seinasta skoðun: {LTBLUE}{DATE_LONG}
+STR_SERVICING_INTERVAL_PERCENT                                  :{BLACK}Skoðanamillibil: {LTBLUE}{COMMA}%{BLACK}   Seinasta skoðun: {LTBLUE}{DATE_LONG}
 STR_883D_TRAINS_CLICK_ON_TRAIN_FOR                              :{BLACK}Lestir - smelltu á lest fyrir nánari upplýsingar
 STR_883E_BUILD_NEW_TRAINS_REQUIRES                              :{BLACK}Búa til nýjar lestir (þarfnast lestarskýlis)
 STR_883F_TRAINS_CLICK_ON_TRAIN_FOR                              :{BLACK}Lestir - ýttu á lest fyrir uppl., dragðu farartæki til að bæta við/fjarlægja úr lest
@@ -2501,12 +2501,12 @@
 STR_SERVICE_HINT                                                :{BLACK}Sleppa þessarri skipun nema þörf sé á viðgerð
 STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}Ný {STRING} er nú fáanleg!
 STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
-STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Verð: {CURRENCY} Þyngd: {COMMA16}tonn{}Hraði: {VELOCITY}  Hestöfl: {COMMA16}{}Rekstrarkostnaður: {CURRENCY} á ári{}Burðargeta: {STRING}
+STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Verð: {CURRENCY} Þyngd: {COMMA}tonn{}Hraði: {VELOCITY}  Hestöfl: {COMMA}{}Rekstrarkostnaður: {CURRENCY} á ári{}Burðargeta: {STRING}
 STR_885C_BROKEN_DOWN                                            :{RED}Bilaður
 STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Aldur: {LTBLUE}{STRING}{BLACK}   Rekstrarkostnaður: {LTBLUE}{CURRENCY} á ári
-STR_885E_WEIGHT_T_POWER_HP_MAX_SPEED                            :{BLACK}Þyngd: {LTBLUE}{COMMA16}t  {BLACK}Hestöfl: {LTBLUE}{COMMA32}{BLACK} Hámarkshraði: {LTBLUE}{VELOCITY}
+STR_885E_WEIGHT_T_POWER_HP_MAX_SPEED                            :{BLACK}Þyngd: {LTBLUE}{COMMA}t  {BLACK}Hestöfl: {LTBLUE}{COMMA}{BLACK} Hámarkshraði: {LTBLUE}{VELOCITY}
 STR_885F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Hagnaður á þessu ári: {LTBLUE}{CURRENCY}  (síðasta ár: {CURRENCY})
-STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Áreiðanleiki: {LTBLUE}{COMMA8}%  {BLACK}Bilanir frá síðustu viðgerð: {LTBLUE}{COMMA16}
+STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Áreiðanleiki: {LTBLUE}{COMMA}%  {BLACK}Bilanir frá síðustu viðgerð: {LTBLUE}{COMMA}
 STR_8861_STOPPED                                                :{RED}Stöðvaður
 STR_8862_CAN_T_MAKE_TRAIN_PASS_SIGNAL                           :{WHITE}Get ekki látið lest fara framhjá hættumerki...
 STR_8863_CRASHED                                                :{RED}Árekstur!
@@ -2514,7 +2514,7 @@
 STR_8865_NAME_TRAIN                                             :{WHITE}Skírðu lestina
 STR_8866_CAN_T_NAME_TRAIN                                       :{WHITE}Get ekki skírt lest...
 STR_8867_NAME_TRAIN                                             :{BLACK}Skýrðu lestina
-STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Lestarslys!{}{COMMA16} deyja í sprengingu eftir árekstur
+STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Lestarslys!{}{COMMA} deyja í sprengingu eftir árekstur
 STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}Get ekki snúið lest við...
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Endurskíra lestargerð
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Get ekki endurskírt lestargerð...
@@ -2526,7 +2526,7 @@
 
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Bíll fyrir
-STR_9001_ROAD_VEHICLES                                          :{WHITE}{STRING} - {COMMA16} Bílar
+STR_9001_ROAD_VEHICLES                                          :{WHITE}{STRING} - {COMMA} Bílar
 STR_9002                                                        :{WHITE}{STRING}
 STR_9003_ROAD_VEHICLE_DEPOT                                     :{WHITE}{TOWN} Bílastöð
 STR_9004_NEW_VEHICLES                                           :{BLACK}Ný Farartæki
@@ -2540,13 +2540,13 @@
 STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Aldur: {LTBLUE}{STRING}{BLACK}   Rekstrarkostnaður: {LTBLUE}{CURRENCY} á ári
 STR_900E_MAX_SPEED                                              :{BLACK}Hámarkshraði: {LTBLUE}{VELOCITY}
 STR_900F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Hagnaður á þessu ári: {LTBLUE}{CURRENCY}  (síðasta ár: {CURRENCY})
-STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Áreiðanleiki: {LTBLUE}{COMMA8}%  {BLACK}Bilanir frá síðustu viðgerð: {LTBLUE}{COMMA16}
+STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Áreiðanleiki: {LTBLUE}{COMMA}%  {BLACK}Bilanir frá síðustu viðgerð: {LTBLUE}{COMMA}
 STR_9011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Byggður: {LTBLUE}{NUMU16}{BLACK} Virði: {LTBLUE}{CURRENCY}
 STR_9012_CAPACITY                                               :{BLACK}Burðargeta: {LTBLUE}{STRING}
 STR_9013_MUST_BE_STOPPED_INSIDE                                 :{WHITE}...verður að stöðvast í bifreiðaskýli
 STR_9014_CAN_T_SELL_ROAD_VEHICLE                                :{WHITE}Get ekki selt bifreið...
 STR_9015_CAN_T_STOP_START_ROAD_VEHICLE                          :{WHITE}Get ekki stöðvað/ræst bifreið...
-STR_9016_ROAD_VEHICLE_IS_WAITING                                :{WHITE}Bifreið {COMMA16} bíður nú í skýli
+STR_9016_ROAD_VEHICLE_IS_WAITING                                :{WHITE}Bifreið {COMMA} bíður nú í skýli
 STR_HEADING_FOR_ROAD_DEPOT                                      :{LTBLUE}Er á leið til bifreiðaskýlis {TOWN}
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{LTBLUE}Er á leið til bifreiðaskýlis {TOWN}, {VELOCITY}
 STR_9018_CAN_T_SEND_VEHICLE_TO_DEPOT                            :{WHITE}Get ekki sent bifreið í skýli...
@@ -2575,7 +2575,7 @@
 STR_902F_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Bæjarbúar fagna . . .{}Fyrsti strætisvagn kemur við á {STATION}!
 STR_9030_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Bæjarbúar fagna . . .{}Fyrsti vörubíll kemur við á {STATION}!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Bílslys!{}Bílstjóri deyr í sprengingu eftir árekstur við lest
-STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Bílslys!{}{COMMA16} deyja í sprengingu eftir árekstur við lest
+STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Bílslys!{}{COMMA} deyja í sprengingu eftir árekstur við lest
 STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}Get ekki snúið bifreið við...
 STR_9034_RENAME                                                 :{BLACK}Endurnefna
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Endurnefna tegund bifreiðar
@@ -2590,7 +2590,7 @@
 STR_9802_CAN_T_BUILD_DOCK_HERE                                  :{WHITE}Get ekki byggt höfn hér...
 STR_9803_SHIP_DEPOT                                             :{WHITE}{TOWN} Slippur
 STR_9804_NEW_SHIPS                                              :{BLACK}Ný skip
-STR_9805_SHIPS                                                  :{WHITE}{STRING} - {COMMA16} Skip
+STR_9805_SHIPS                                                  :{WHITE}{STRING} - {COMMA} Skip
 STR_9806_CAN_T_BUILD_SHIPS                                      :{WHITE}Get ekki smíðað skip..
 STR_9807_MUST_BUILD_SHIP_DEPOT_FIRST                            :{WHITE}Verður að smíða skip í slippnum fyrst
 STR_9808_NEW_SHIPS                                              :{WHITE}Ný skip
@@ -2605,7 +2605,7 @@
 STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Aldur: {LTBLUE}{STRING}{BLACK}   Rekstrarkostnaður: {LTBLUE}{CURRENCY}á ári
 STR_9813_MAX_SPEED                                              :{BLACK}Hámarkshraði: {LTBLUE}{VELOCITY}
 STR_9814_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Tekjur þessa árs: {LTBLUE}{CURRENCY}  (síðasta ár: {CURRENCY})
-STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Áreiðanleiki: {LTBLUE}{COMMA8}%  {BLACK}Bilanir frá síðustu skoðun: {LTBLUE}{COMMA16}
+STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Áreiðanleiki: {LTBLUE}{COMMA}%  {BLACK}Bilanir frá síðustu skoðun: {LTBLUE}{COMMA}
 STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Smíðað: {LTBLUE}{NUMU16}{BLACK} Verðmæti: {LTBLUE}{CURRENCY}
 STR_9817_CAPACITY                                               :{BLACK}Burðargeta: {LTBLUE}{STRING}
 STR_9818_CAN_T_STOP_START_SHIP                                  :{WHITE}Get ekki stöðvað/ræst skip...
@@ -2613,7 +2613,7 @@
 STR_981A_UNABLE_TO_FIND_LOCAL_DEPOT                             :{WHITE}Finnur ekkert nálægt skýli
 STR_HEADING_FOR_SHIP_DEPOT                                      :{LTBLUE}Stefnir að {TOWN} skipaskýlinu
 STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{LTBLUE}Stefnir að {TOWN} skipaskýlinu, {VELOCITY}
-STR_981C_SHIP_IS_WAITING_IN_DEPOT                               :{WHITE}Skip {COMMA16} bíður í skýli
+STR_981C_SHIP_IS_WAITING_IN_DEPOT                               :{WHITE}Skip {COMMA} bíður í skýli
 STR_981D_BUILD_SHIP_DOCK                                        :{BLACK}Byggja höfn
 STR_981E_BUILD_SHIP_DEPOT_FOR_BUILDING                          :{BLACK}Reisa skipaskýli (til að smíða og skoða skip)
 STR_981F_SHIPS_CLICK_ON_SHIP_FOR                                :{BLACK}Skip - smelltu á skip fyrir nánari upplýsingar
@@ -2664,19 +2664,19 @@
 STR_A005_NEW_AIRCRAFT                                           :{WHITE}Ný flugvél
 STR_A006_BUILD_AIRCRAFT                                         :{BLACK}Smíða flugvél
 STR_A008_CAN_T_BUILD_AIRCRAFT                                   :{WHITE}Get ekki smíðað flugvél...
-STR_A009_AIRCRAFT                                               :{WHITE}{STRING} - {COMMA16} Flugvél
+STR_A009_AIRCRAFT                                               :{WHITE}{STRING} - {COMMA} Flugvél
 STR_A00A                                                        :{WHITE}{STRING}
 STR_A00B_ORDERS                                                 :{WHITE}{STRING} (Skipanir)
 STR_A00C_DETAILS                                                :{WHITE}{STRING} (Upplýsingar)
 STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Aldur: {LTBLUE}{STRING}{BLACK}   Rekstrarkostnaður: {LTBLUE}{CURRENCY}á ári
 STR_A00E_MAX_SPEED                                              :{BLACK}Hámarkshraði: {LTBLUE}{VELOCITY}
 STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Hagnaður í ár: {LTBLUE}{CURRENCY}  (í fyrra: {CURRENCY})
-STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Áreiðanleiki: {LTBLUE}{COMMA8}%  {BLACK}Bilanir frá síðustu skoðun: {LTBLUE}{COMMA16}
+STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Áreiðanleiki: {LTBLUE}{COMMA}%  {BLACK}Bilanir frá síðustu skoðun: {LTBLUE}{COMMA}
 STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Smíðuð: {LTBLUE}{NUMU16}{BLACK} Virði: {LTBLUE}{CURRENCY}
 STR_A012_CAN_T_SEND_AIRCRAFT_TO                                 :{WHITE}Get ekki sent flugvél í flugskýli...
 STR_HEADING_FOR_HANGAR                                          :{LTBLUE}Stefnir á {STATION} flugskýli
 STR_HEADING_FOR_HANGAR_VEL                                      :{LTBLUE}Stefnir á {STATION} flugskýli, {VELOCITY}
-STR_A014_AIRCRAFT_IS_WAITING_IN                                 :{WHITE}Flugvél {COMMA16} bíður í flugskýli
+STR_A014_AIRCRAFT_IS_WAITING_IN                                 :{WHITE}Flugvél {COMMA} bíður í flugskýli
 STR_A015_AIRCRAFT_IN_THE_WAY                                    :{WHITE}Flugvél er fyrir
 STR_A016_CAN_T_STOP_START_AIRCRAFT                              :{WHITE}Get ekki stöðvað/ræst flugvél...
 STR_A017_AIRCRAFT_IS_IN_FLIGHT                                  :{WHITE}flugvélin er á flugi
@@ -2702,14 +2702,14 @@
 STR_A02B_SHOW_AIRCRAFT_DETAILS                                  :{BLACK}Sýna nánari upplýsingar um skip
 STR_A02C_NEW_AIRCRAFT_NOW_AVAILABLE                             :{BLACK}{BIGFONT}Ný flugvél nú fáanleg!
 STR_A02D                                                        :{BLACK}{BIGFONT}{STRING}
-STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Verð: {CURRENCY} Hámarkshraði: {VELOCITY}{}Burðargeta: {COMMA16} farþegar, {COMMA16} pokar af pósti{}Rekstrarkostnaður: {CURRENCY}á ári
+STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Verð: {CURRENCY} Hámarkshraði: {VELOCITY}{}Burðargeta: {COMMA} farþegar, {COMMA} pokar af pósti{}Rekstrarkostnaður: {CURRENCY}á ári
 
 STR_A030_NAME_AIRCRAFT                                          :{WHITE}Nefna flugvélina
 STR_A031_CAN_T_NAME_AIRCRAFT                                    :{WHITE}Get ekki nefnt flugvélina...
 STR_A032_NAME_AIRCRAFT                                          :{BLACK}Nefna flugvélina
 STR_A033_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Bæjarbúar fagna . . .{}Fyrsta flugvél kemur við á {STATION}!
-STR_A034_PLANE_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Flugslys!{}{COMMA16} deyja í sprengingu á {STATION}
-STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Flugslys!{}Flugvél varð eldsneytislaus, {COMMA16} deyja í sprengingu!
+STR_A034_PLANE_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Flugslys!{}{COMMA} deyja í sprengingu á {STATION}
+STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Flugslys!{}Flugvél varð eldsneytislaus, {COMMA} deyja í sprengingu!
 STR_A035_DESTINATIONS                                           :{TINYFONT}{BLACK}Áfangastaðir:
 STR_A036                                                        :{TINYFONT}{BLACK}{STATION}
 STR_A037_RENAME                                                 :{BLACK}Endurnefna
@@ -2735,7 +2735,7 @@
 STR_B003_FACTORY_DESTROYED_IN_SUSPICIOUS                        :{BLACK}{BIGFONT}Verksmiðja eyðilegst við grunsamlegar kringumstæður nálægt {TOWN}!
 STR_B004_UFO_LANDS_NEAR                                         :{BLACK}{BIGFONT}FFH lendir rétt hjá {TOWN}!
 STR_B005_COAL_MINE_SUBSIDENCE_LEAVES                            :{BLACK}{BIGFONT}Hrun í kolanámu veldur eyðileggingu nálægt {TOWN}!
-STR_B006_FLOOD_VEHICLE_DESTROYED                                :{BLACK}{BIGFONT}Flóð!{}Að minnsta kosti {COMMA16} er saknað og eru taldir af eftir gífurleg flóð!
+STR_B006_FLOOD_VEHICLE_DESTROYED                                :{BLACK}{BIGFONT}Flóð!{}Að minnsta kosti {COMMA} er saknað og eru taldir af eftir gífurleg flóð!
 
 STR_BRIBE_FAILED                                                :{WHITE}Tilraun þín til múturs var
 STR_BRIBE_FAILED_2                                              :{WHITE}uppgvötuð af héraðsrannsóknarmanni
@@ -2745,7 +2745,7 @@
 STR_PERFORMANCE_DETAIL                                          :{WHITE}Nákvæm frammistöðumæling
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Upplýsingar
 STR_PERFORMANCE_DETAIL_AMOUNT_CURRENCY                          :{BLACK}({CURRCOMPACT}/{CURRCOMPACT})
-STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA32}/{COMMA32})
+STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA}/{COMMA})
 STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{INT32}%
 SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{INT32}
 ############ Those following lines need to be in this order!!
@@ -2780,7 +2780,7 @@
 STR_NEWGRF_GRF_ID                                               :{BLACK}GRF einkenni:
 
 STR_CURRENCY_WINDOW                                             :{WHITE}Sérvalinn gjaldeyrir
-STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Gengi: {ORANGE}{CURRENCY} = {POUNDSIGN} {COMMA16}
+STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Gengi: {ORANGE}{CURRENCY} = {POUNDSIGN} {COMMA}
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Aðskilnaðarmerki:
 STR_CURRENCY_PREFIX                                             :{LTBLUE}Forskeyti:
 STR_CURRENCY_SUFFIX                                             :{LTBLUE}Viðskeyti:
@@ -2794,10 +2794,10 @@
 STR_PLANE                                                       :{BLACK}{PLANE}
 STR_SHIP                                                        :{BLACK}{SHIP}
 
-STR_SCHEDULED_TRAINS                                            :{WHITE}{STATION} - {COMMA16} Lestir
-STR_SCHEDULED_ROAD_VEHICLES                                     :{WHITE}{STATION} - {COMMA16} Bifreiðir
-STR_SCHEDULED_AIRCRAFT                                          :{WHITE}{STATION} - {COMMA16} Flugvélar
-STR_SCHEDULED_SHIPS                                             :{WHITE}{STATION} - {COMMA16} Skip
+STR_SCHEDULED_TRAINS                                            :{WHITE}{STATION} - {COMMA} Lestir
+STR_SCHEDULED_ROAD_VEHICLES                                     :{WHITE}{STATION} - {COMMA} Bifreiðir
+STR_SCHEDULED_AIRCRAFT                                          :{WHITE}{STATION} - {COMMA} Flugvélar
+STR_SCHEDULED_SHIPS                                             :{WHITE}{STATION} - {COMMA} Skip
 
 STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Sýna allar lestir sem hafa þessa stöð á áætlun
 STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Sýna allar bifreiðir sem hafa þessa stöð á áætlun
@@ -2819,7 +2819,7 @@
 STR_REPLACE_HELP                                                :{BLACK}Þetta gerir þér kleift að skipta út öllum vögum af einni tegund með annarri, þegar þeir fara í lestarskýli
 
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
-STR_SIGN_LIST_CAPTION                                           :{WHITE}Merkjalisti - {COMMA16} merki
+STR_SIGN_LIST_CAPTION                                           :{WHITE}Merkjalisti - {COMMA} merki
 
 ############ Lists rail types
 
@@ -2829,16 +2829,16 @@
 
 ############ End of list of rail types
 
-STR_TINY_BLACK                                                  :{BLACK}{TINYFONT}{COMMA16}
+STR_TINY_BLACK                                                  :{BLACK}{TINYFONT}{COMMA}
 
-STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Verð: {GOLD}{CURRENCY}{BLACK} Þyngd: {GOLD}{COMMA16}tonn
-STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Hámarkshraði: {GOLD}{VELOCITY}{BLACK}   Hestöfl: {GOLD}{COMMA32}
+STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Verð: {GOLD}{CURRENCY}{BLACK} Þyngd: {GOLD}{COMMA}tonn
+STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Hámarkshraði: {GOLD}{VELOCITY}{BLACK}   Hestöfl: {GOLD}{COMMA}
 STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}Rekstrarkostnaður: {GOLD}{CURRENCY} á ári
 STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Burðargeta: {GOLD}{STRING} {STRING}
-STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Hönnun: {GOLD}{NUMU16}{BLACK} Endingartími: {GOLD}{COMMA16} ár
-STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Hámarks áreiðanleiki: {GOLD}{COMMA8}%
+STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Hönnun: {GOLD}{NUMU16}{BLACK} Endingartími: {GOLD}{COMMA} ár
+STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Hámarks áreiðanleiki: {GOLD}{COMMA}%
 STR_PURCHASE_INFO_COST                                          :{BLACK}Verð: {GOLD}{CURRENCY}
-STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Þyngd: {GOLD}{COMMA16}tonn  ({COMMA16}tonn)
+STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Þyngd: {GOLD}{COMMA}tonn  ({COMMA}tonn)
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Verð: {GOLD}{CURRENCY}{BLACK} Hámarkshraði: {GOLD}{VELOCITY}
-STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Burðargeta: {GOLD}{COMMA16} farþegar, {COMMA16} pokar af pósti
-STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Drifvagnar: {GOLD}+{COMMA16} hestöfl{BLACK} Þyngd: {GOLD}+{COMMA8} tonn
+STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Burðargeta: {GOLD}{COMMA} farþegar, {COMMA} pokar af pósti
+STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Drifvagnar: {GOLD}+{COMMA} hestöfl{BLACK} Þyngd: {GOLD}+{COMMA} tonn
--- a/lang/italian.txt	Thu Jul 14 09:53:52 2005 +0000
+++ b/lang/italian.txt	Thu Jul 14 15:10:20 2005 +0000
@@ -82,69 +82,69 @@
 STR_004C_PLASTIC                                                :Plastica
 STR_004D_FIZZY_DRINK                                            :Bevande Frizzanti
 STR_004E                                                        :
-STR_004F_PASSENGER                                              :{COMMA16} passeggero
-STR_0050_TON_OF_COAL                                            :{COMMA16} ton. di carbone
-STR_0051_BAG_OF_MAIL                                            :{COMMA16} sacco postale
+STR_004F_PASSENGER                                              :{COMMA} passeggero
+STR_0050_TON_OF_COAL                                            :{COMMA} ton. di carbone
+STR_0051_BAG_OF_MAIL                                            :{COMMA} sacco postale
 STR_0052_OF_OIL                                                 :{VOLUME} di petrolio
-STR_0053_ITEM_OF_LIVESTOCK                                      :{COMMA16} capo di bestiame
-STR_0054_CRATE_OF_GOODS                                         :{COMMA16} cassa di beni
-STR_0055_TON_OF_GRAIN                                           :{COMMA16} ton. di grano
-STR_0056_TON_OF_WOOD                                            :{COMMA16} ton. di legna
-STR_0057_TON_OF_IRON_ORE                                        :{COMMA16} ton. di ferro grezzo
-STR_0058_TON_OF_STEEL                                           :{COMMA16} ton. di acciaio
-STR_0059_BAG_OF_VALUABLES                                       :{COMMA16} borsa di valori
-STR_005A_TON_OF_COPPER_ORE                                      :{COMMA16} ton. di rame grezzo
-STR_005B_TON_OF_MAIZE                                           :{COMMA16} ton. di mais
-STR_005C_TON_OF_FRUIT                                           :{COMMA16} ton. di frutta
-STR_005D_BAG_OF_DIAMONDS                                        :{COMMA16} borsa di diamanti
-STR_005E_TON_OF_FOOD                                            :{COMMA16} ton. di cibo
-STR_005F_TON_OF_PAPER                                           :{COMMA16} ton. di carta
-STR_0060_BAG_OF_GOLD                                            :{COMMA16} borsa d'oro
+STR_0053_ITEM_OF_LIVESTOCK                                      :{COMMA} capo di bestiame
+STR_0054_CRATE_OF_GOODS                                         :{COMMA} cassa di beni
+STR_0055_TON_OF_GRAIN                                           :{COMMA} ton. di grano
+STR_0056_TON_OF_WOOD                                            :{COMMA} ton. di legna
+STR_0057_TON_OF_IRON_ORE                                        :{COMMA} ton. di ferro grezzo
+STR_0058_TON_OF_STEEL                                           :{COMMA} ton. di acciaio
+STR_0059_BAG_OF_VALUABLES                                       :{COMMA} borsa di valori
+STR_005A_TON_OF_COPPER_ORE                                      :{COMMA} ton. di rame grezzo
+STR_005B_TON_OF_MAIZE                                           :{COMMA} ton. di mais
+STR_005C_TON_OF_FRUIT                                           :{COMMA} ton. di frutta
+STR_005D_BAG_OF_DIAMONDS                                        :{COMMA} borsa di diamanti
+STR_005E_TON_OF_FOOD                                            :{COMMA} ton. di cibo
+STR_005F_TON_OF_PAPER                                           :{COMMA} ton. di carta
+STR_0060_BAG_OF_GOLD                                            :{COMMA} borsa d'oro
 STR_0061_OF_WATER                                               :{VOLUME} di acqua
-STR_0062_TON_OF_WHEAT                                           :{COMMA16} ton. di frumento
+STR_0062_TON_OF_WHEAT                                           :{COMMA} ton. di frumento
 STR_0063_OF_RUBBER                                              :{VOLUME} di gomma
-STR_0064_TON_OF_SUGAR                                           :{COMMA16} ton. di zucchero
-STR_0065_TOY                                                    :{COMMA16} giocattolo
-STR_0066_BAG_OF_CANDY                                           :{COMMA16} busta di caramelle
+STR_0064_TON_OF_SUGAR                                           :{COMMA} ton. di zucchero
+STR_0065_TOY                                                    :{COMMA} giocattolo
+STR_0066_BAG_OF_CANDY                                           :{COMMA} busta di caramelle
 STR_0067_OF_COLA                                                :{VOLUME} di cola
-STR_0068_TON_OF_COTTON_CANDY                                    :{COMMA16} ton. di cotone candito
-STR_0069_BUBBLE                                                 :{COMMA16} bolla
-STR_006A_TON_OF_TOFFEE                                          :{COMMA16} ton. di toffee
-STR_006B_BATTERY                                                :{COMMA16} batteria
+STR_0068_TON_OF_COTTON_CANDY                                    :{COMMA} ton. di cotone candito
+STR_0069_BUBBLE                                                 :{COMMA} bolla
+STR_006A_TON_OF_TOFFEE                                          :{COMMA} ton. di toffee
+STR_006B_BATTERY                                                :{COMMA} batteria
 STR_006C_OF_PLASTIC                                             :{VOLUME} di plastica
-STR_006D_FIZZY_DRINK                                            :{COMMA16} bibite frizzanti
+STR_006D_FIZZY_DRINK                                            :{COMMA} bibite frizzanti
 STR_006E                                                        :
-STR_006F_PASSENGERS                                             :{COMMA16} passeggeri
-STR_0070_TONS_OF_COAL                                           :{COMMA16} ton. di carbone
-STR_0071_BAGS_OF_MAIL                                           :{COMMA16} sacchi postali
+STR_006F_PASSENGERS                                             :{COMMA} passeggeri
+STR_0070_TONS_OF_COAL                                           :{COMMA} ton. di carbone
+STR_0071_BAGS_OF_MAIL                                           :{COMMA} sacchi postali
 STR_0072_OF_OIL                                                 :{VOLUME} di petrolio
-STR_0073_ITEMS_OF_LIVESTOCK                                     :{COMMA16} capi di bestiame
-STR_0074_CRATES_OF_GOODS                                        :{COMMA16} casse di beni
-STR_0075_TONS_OF_GRAIN                                          :{COMMA16} ton. di grano
-STR_0076_TONS_OF_WOOD                                           :{COMMA16} ton. di legna
-STR_0077_TONS_OF_IRON_ORE                                       :{COMMA16} ton. di ferro grezzo
-STR_0078_TONS_OF_STEEL                                          :{COMMA16} ton. di acciaio
-STR_0079_BAGS_OF_VALUABLES                                      :{COMMA16} borse di valori
-STR_007A_TONS_OF_COPPER_ORE                                     :{COMMA16} ton. di rame grezzo
-STR_007B_TONS_OF_MAIZE                                          :{COMMA16} ton. di mais
-STR_007C_TONS_OF_FRUIT                                          :{COMMA16} ton. di frutta
-STR_007D_BAGS_OF_DIAMONDS                                       :{COMMA16} borse di diamanti
-STR_007E_TONS_OF_FOOD                                           :{COMMA16} ton. di cibo
-STR_007F_TONS_OF_PAPER                                          :{COMMA16} ton. di carta
-STR_0080_BAGS_OF_GOLD                                           :{COMMA16} borse d'oro
+STR_0073_ITEMS_OF_LIVESTOCK                                     :{COMMA} capi di bestiame
+STR_0074_CRATES_OF_GOODS                                        :{COMMA} casse di beni
+STR_0075_TONS_OF_GRAIN                                          :{COMMA} ton. di grano
+STR_0076_TONS_OF_WOOD                                           :{COMMA} ton. di legna
+STR_0077_TONS_OF_IRON_ORE                                       :{COMMA} ton. di ferro grezzo
+STR_0078_TONS_OF_STEEL                                          :{COMMA} ton. di acciaio
+STR_0079_BAGS_OF_VALUABLES                                      :{COMMA} borse di valori
+STR_007A_TONS_OF_COPPER_ORE                                     :{COMMA} ton. di rame grezzo
+STR_007B_TONS_OF_MAIZE                                          :{COMMA} ton. di mais
+STR_007C_TONS_OF_FRUIT                                          :{COMMA} ton. di frutta
+STR_007D_BAGS_OF_DIAMONDS                                       :{COMMA} borse di diamanti
+STR_007E_TONS_OF_FOOD                                           :{COMMA} ton. di cibo
+STR_007F_TONS_OF_PAPER                                          :{COMMA} ton. di carta
+STR_0080_BAGS_OF_GOLD                                           :{COMMA} borse d'oro
 STR_0081_OF_WATER                                               :{VOLUME} d'acqua
-STR_0082_TONS_OF_WHEAT                                          :{COMMA16} ton. di frumento
+STR_0082_TONS_OF_WHEAT                                          :{COMMA} ton. di frumento
 STR_0083_OF_RUBBER                                              :{VOLUME} di gomma
-STR_0084_TONS_OF_SUGAR                                          :{COMMA16} ton. di zucchero
-STR_0085_TOYS                                                   :{COMMA16} giocattoli
-STR_0086_BAGS_OF_CANDY                                          :{COMMA16} buste di caramelle
+STR_0084_TONS_OF_SUGAR                                          :{COMMA} ton. di zucchero
+STR_0085_TOYS                                                   :{COMMA} giocattoli
+STR_0086_BAGS_OF_CANDY                                          :{COMMA} buste di caramelle
 STR_0087_OF_COLA                                                :{VOLUME} di cola
-STR_0088_TONS_OF_COTTON_CANDY                                   :{COMMA16} ton. di cotone candito
-STR_0089_BUBBLES                                                :{COMMA16} bolle
-STR_008A_TONS_OF_TOFFEE                                         :{COMMA16} ton. di toffee
-STR_008B_BATTERIES                                              :{COMMA16} batterie
+STR_0088_TONS_OF_COTTON_CANDY                                   :{COMMA} ton. di cotone candito
+STR_0089_BUBBLES                                                :{COMMA} bolle
+STR_008A_TONS_OF_TOFFEE                                         :{COMMA} ton. di toffee
+STR_008B_BATTERIES                                              :{COMMA} batterie
 STR_008C_OF_PLASTIC                                             :{VOLUME} di plastica
-STR_008D_FIZZY_DRINKS                                           :{COMMA16} bevande frizzanti
+STR_008D_FIZZY_DRINKS                                           :{COMMA} bevande frizzanti
 STR_008E                                                        :
 STR_008F_PS                                                     :{TINYFONT}PS
 STR_0090_CL                                                     :{TINYFONT}CL
@@ -219,8 +219,8 @@
 STR_00DF_GREY                                                   :Grigio
 STR_00E0_WHITE                                                  :Bianco
 STR_00E1_TOO_MANY_VEHICLES_IN_GAME                              :{WHITE}Troppi veicoli nel gioco
-STR_00E2                                                        :{BLACK}{COMMA16}
-STR_00E3                                                        :{RED}{COMMA16}
+STR_00E2                                                        :{BLACK}{COMMA}
+STR_00E3                                                        :{RED}{COMMA}
 STR_00E4_LOCATION                                               :{BLACK}Locazione
 STR_00E5_CONTOURS                                               :Contorni
 STR_00E6_VEHICLES                                               :Veicoli
@@ -441,18 +441,18 @@
 STR_0198_PROFIT_THIS_YEAR_LAST_YEAR                             :{TINYFONT}{BLACK}Profitto quest'anno: {CURRENCY} (anno scorso: {CURRENCY})
 
 ############ range for service numbers starts
-STR_0199_YEAR                                                   :{COMMA16} anno ({COMMA16})
-STR_019A_YEARS                                                  :{COMMA16} anni ({COMMA16})
-STR_019B_YEARS                                                  :{RED}{COMMA16} anni ({COMMA16})
+STR_0199_YEAR                                                   :{COMMA} anno ({COMMA})
+STR_019A_YEARS                                                  :{COMMA} anni ({COMMA})
+STR_019B_YEARS                                                  :{RED}{COMMA} anni ({COMMA})
 ############ range for service numbers ends
 
 STR_019C_ROAD_VEHICLE                                           :Veicolo Stradale
 STR_019D_AIRCRAFT                                               :Aereo
 STR_019E_SHIP                                                   :Nave
 STR_019F_TRAIN                                                  :Treno
-STR_01A0_IS_GETTING_OLD                                         :{WHITE}{STRING} {COMMA16} stà diventando vecchio
-STR_01A1_IS_GETTING_VERY_OLD                                    :{WHITE}{STRING} {COMMA16} Stà diventando molto vecchio
-STR_01A2_IS_GETTING_VERY_OLD_AND                                :{WHITE}{STRING} {COMMA16} è troppo vecchio e necessita di essere rimpiazzato urgentemente
+STR_01A0_IS_GETTING_OLD                                         :{WHITE}{STRING} {COMMA} stà diventando vecchio
+STR_01A1_IS_GETTING_VERY_OLD                                    :{WHITE}{STRING} {COMMA} Stà diventando molto vecchio
+STR_01A2_IS_GETTING_VERY_OLD_AND                                :{WHITE}{STRING} {COMMA} è troppo vecchio e necessita di essere rimpiazzato urgentemente
 STR_01A3_LAND_AREA_INFORMATION                                  :{WHITE}Info sull'area di terreno
 STR_01A4_COST_TO_CLEAR_N_A                                      :{BLACK}Costo per ripulirlo: {LTBLUE}N/A
 STR_01A5_COST_TO_CLEAR                                          :{BLACK}Costo per ripulirlo: {LTBLUE}{CURRENCY}
@@ -497,7 +497,7 @@
 STR_01CA_31ST                                                   :31
 ############ range for days	ends
 
-STR_01CB                                                        :{TINYFONT}{COMMA16}
+STR_01CB                                                        :{TINYFONT}{COMMA}
 STR_01CC_TOGGLE_LARGE_SMALL_MAP                                 :{BLACK}Seleziona dimensione mappa grande/piccola
 STR_01CD_SELECT_TUTORIAL_DEMONSTRATION                          :{WHITE}Seleziona Tutorial/Demonstrazione
 
@@ -509,7 +509,7 @@
 STR_CARGO_ACCEPTED_5                                            :{BLACK}Merci accettate: {LTBLUE}{STRING}, {STRING}, {STRING}, {STRING}, {STRING}
 ############ range for cargo acecpted ends
 
-STR_01D1_8                                                      :({COMMA8}/8 {STRING})
+STR_01D1_8                                                      :({COMMA}/8 {STRING})
 STR_01D2_JAZZ_JUKEBOX                                           :{WHITE}Jazz Jukebox
 STR_01D3_SOUND_MUSIC                                            :Suoni/musica
 STR_01D4_SHOW_SOUND_MUSIC_WINDOW                                :{BLACK}Mostra finestra Suoni/musica
@@ -528,16 +528,16 @@
 STR_01E1_START_PLAYING_MUSIC                                    :{BLACK}Avvia la musica
 STR_01E2_DRAG_SLIDERS_TO_SET_MUSIC                              :{BLACK}Trascina le barre scorrevoli per regolare il volume
 STR_01E3                                                        :{DKGREEN}{TINYFONT}--
-STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA8}
-STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA8}
+STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA}
+STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA}
 STR_01E6                                                        :{DKGREEN}{TINYFONT}------
 STR_01E7                                                        :{DKGREEN}{TINYFONT}"{STRING}"
 STR_01E8_TRACK_XTITLE                                           :{BLACK}{TINYFONT}Brano{SETX 88}Titolo
 STR_01E9_SHUFFLE                                                :{TINYFONT}Casuale
 STR_01EA_PROGRAM                                                :{TINYFONT}{BLACK}Programma
 STR_01EB_MUSIC_PROGRAM_SELECTION                                :{WHITE}Selezione programma musicale
-STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA16} "{STRING}"
-STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA16}   "{STRING}"
+STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} "{STRING}"
+STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA}   "{STRING}"
 STR_01EE_TRACK_INDEX                                            :{TINYFONT}{BLACK}Indice brani
 STR_01EF_PROGRAM                                                :{TINYFONT}{BLACK}Programma - '{STRING}'
 STR_01F0_CLEAR                                                  :{TINYFONT}{BLACK}Elimina
@@ -577,7 +577,7 @@
 STR_0210_TOO_FAR_FROM_PREVIOUS_DESTINATIO                       :{WHITE}...troppo lontano dalla destinazione precedente
 STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Le maggiori compagnie che hanno raggiunto il livello {NUMU16}{}({STRING})
 STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Classifica società  del{NUMU16}
-STR_0212                                                        :{BIGFONT}{COMMA16}.
+STR_0212                                                        :{BIGFONT}{COMMA}.
 STR_0213_BUSINESSMAN                                            :Uomo d'affari
 STR_0214_ENTREPRENEUR                                           :Imprenditore
 STR_0215_INDUSTRIALIST                                          :Industriale
@@ -586,12 +586,12 @@
 STR_0218_MOGUL                                                  :Mogul
 STR_0219_TYCOON_OF_THE_CENTURY                                  :Magnate del secolo
 STR_HIGHSCORE_NAME                                              :{BIGFONT}{STRING}, {STRING}
-STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA16})
+STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA})
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{STRING} raggiunge lo stato '{STRING}'!
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{STRING} di {STRING} raggiunge lo stato '{STRING}'!
 STR_021D                                                        :{BLACK}
 STR_021E                                                        :{WHITE}
-STR_021F                                                        :{BLUE}{COMMA16}
+STR_021F                                                        :{BLUE}{COMMA}
 STR_0220_CREATE_SCENARIO                                        :{BLACK}Crea Scenario
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Editor Scenario
@@ -788,8 +788,8 @@
 STR_EXTRA_VIEW_PORT                                             :Mini visuale extra
 STR_SIGN_LIST                                                   :Lista cartelli
 STR_02DF_TOWN_DIRECTORY                                         :Elenco Città
-STR_TOWN_POPULATION                                             :{BLACK}Popolazione mondiale: {COMMA32}
-STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Mini visuale {COMMA16}
+STR_TOWN_POPULATION                                             :{BLACK}Popolazione mondiale: {COMMA}
+STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Mini visuale {COMMA}
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN                                :{BLACK}Copia nella mini visuale
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT                             :{BLACK}Copia la posizione dalla finestra principale alla mini visuale
 STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW                                :{BLACK}Copia dalla mini visuale
@@ -961,34 +961,34 @@
 STR_CANT_COPY_ORDER_LIST                                        :{WHITE}non puoi copiare lista ordini...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Fine degli Ordini Condivisi - -
 
-STR_TRAIN_IS_LOST                                               :{WHITE}Il Treno {COMMA16} si è perso.
-STR_TRAIN_IS_UNPROFITABLE                                       :{WHITE}Il profitto del treno {COMMA16} per l'anno scorso è stato {CURRENCY}
+STR_TRAIN_IS_LOST                                               :{WHITE}Il Treno {COMMA} si è perso.
+STR_TRAIN_IS_UNPROFITABLE                                       :{WHITE}Il profitto del treno {COMMA} per l'anno scorso è stato {CURRENCY}
 STR_EURO_INTRODUCE                                              :{BLACK}{BIGFONT}Unione Monetaria Europea!{}{}E’ stato introdotto l’euro come unica moneta per qualsiasi transazione del tuo Paese!
 
 # Start of order review system.
 # DON'T ADD OR REMOVE LINES HERE
-STR_TRAIN_HAS_TOO_FEW_ORDERS                                    :{WHITE}Il treno {COMMA16} non ha sufficienti ordini pianificati
-STR_TRAIN_HAS_VOID_ORDER                                        :{WHITE}Il treno {COMMA16} non ha alcun ordine
-STR_TRAIN_HAS_DUPLICATE_ENTRY                                   :{WHITE}Il treno {COMMA16} ha alcuni ordini duplicati
-STR_TRAIN_HAS_INVALID_ENTRY                                     :{WHITE}Il treno {COMMA16} ha una stazione non valida negli ordini
-STR_ROADVEHICLE_HAS_TOO_FEW_ORDERS                              :{WHITE}Il veicolo {COMMA16} non ha sufficienti ordini pianificati
-STR_ROADVEHICLE_HAS_VOID_ORDER                                  :{WHITE}Il veicolo {COMMA16} non ha alcun ordine
-STR_ROADVEHICLE_HAS_DUPLICATE_ENTRY                             :{WHITE}Il veicolo {COMMA16} ha alcuni ordini duplicati
-STR_ROADVEHICLE_HAS_INVALID_ENTRY                               :{WHITE}Il veicolo {COMMA16} ha una stazione non valida negli ordini
-STR_SHIP_HAS_TOO_FEW_ORDERS                                     :{WHITE}La nave {COMMA16} non ha sufficienti ordini pianificati
-STR_SHIP_HAS_VOID_ORDER                                         :{WHITE}La nave {COMMA16} non ha alcun ordine
-STR_SHIP_HAS_DUPLICATE_ENTRY                                    :{WHITE}La nave {COMMA16} ha alcuni ordini duplicati
-STR_SHIP_HAS_INVALID_ENTRY                                      :{WHITE}La nave {COMMA16} ha un porto non valido negli ordini
-STR_AIRCRAFT_HAS_TOO_FEW_ORDERS                                 :{WHITE}L’aereo {COMMA16} non ha sufficienti ordini pianificati
-STR_AIRCRAFT_HAS_VOID_ORDER                                     :{WHITE}L’aereo {COMMA16} non ha alcun ordine
-STR_AIRCRAFT_HAS_DUPLICATE_ENTRY                                :{WHITE}L’aereo {COMMA16} ha alcuni ordini duplicati
-STR_AIRCRAFT_HAS_INVALID_ENTRY                                  :{WHITE}L’aereo {COMMA16} ha un aeroporto non valido negli ordini
+STR_TRAIN_HAS_TOO_FEW_ORDERS                                    :{WHITE}Il treno {COMMA} non ha sufficienti ordini pianificati
+STR_TRAIN_HAS_VOID_ORDER                                        :{WHITE}Il treno {COMMA} non ha alcun ordine
+STR_TRAIN_HAS_DUPLICATE_ENTRY                                   :{WHITE}Il treno {COMMA} ha alcuni ordini duplicati
+STR_TRAIN_HAS_INVALID_ENTRY                                     :{WHITE}Il treno {COMMA} ha una stazione non valida negli ordini
+STR_ROADVEHICLE_HAS_TOO_FEW_ORDERS                              :{WHITE}Il veicolo {COMMA} non ha sufficienti ordini pianificati
+STR_ROADVEHICLE_HAS_VOID_ORDER                                  :{WHITE}Il veicolo {COMMA} non ha alcun ordine
+STR_ROADVEHICLE_HAS_DUPLICATE_ENTRY                             :{WHITE}Il veicolo {COMMA} ha alcuni ordini duplicati
+STR_ROADVEHICLE_HAS_INVALID_ENTRY                               :{WHITE}Il veicolo {COMMA} ha una stazione non valida negli ordini
+STR_SHIP_HAS_TOO_FEW_ORDERS                                     :{WHITE}La nave {COMMA} non ha sufficienti ordini pianificati
+STR_SHIP_HAS_VOID_ORDER                                         :{WHITE}La nave {COMMA} non ha alcun ordine
+STR_SHIP_HAS_DUPLICATE_ENTRY                                    :{WHITE}La nave {COMMA} ha alcuni ordini duplicati
+STR_SHIP_HAS_INVALID_ENTRY                                      :{WHITE}La nave {COMMA} ha un porto non valido negli ordini
+STR_AIRCRAFT_HAS_TOO_FEW_ORDERS                                 :{WHITE}L’aereo {COMMA} non ha sufficienti ordini pianificati
+STR_AIRCRAFT_HAS_VOID_ORDER                                     :{WHITE}L’aereo {COMMA} non ha alcun ordine
+STR_AIRCRAFT_HAS_DUPLICATE_ENTRY                                :{WHITE}L’aereo {COMMA} ha alcuni ordini duplicati
+STR_AIRCRAFT_HAS_INVALID_ENTRY                                  :{WHITE}L’aereo {COMMA} ha un aeroporto non valido negli ordini
 # end of order system
 
-STR_TRAIN_AUTORENEW_FAILED                                      :{WHITE}Rinnovo automatico fallito per il treno {COMMA16} (limite fondi)
-STR_ROADVEHICLE_AUTORENEW_FAILED                                :{WHITE}Rinnovo automatico fallito per il veicolo {COMMA16} (limite fondi)
-STR_SHIP_AUTORENEW_FAILED                                       :{WHITE}Rinnovo automatico fallito per la nave {COMMA16} (limite fondi)
-STR_AIRCRAFT_AUTORENEW_FAILED                                   :{WHITE}Rinnovo automatico fallito per l’aereo {COMMA16} (limite fondi)
+STR_TRAIN_AUTORENEW_FAILED                                      :{WHITE}Rinnovo automatico fallito per il treno {COMMA} (limite fondi)
+STR_ROADVEHICLE_AUTORENEW_FAILED                                :{WHITE}Rinnovo automatico fallito per il veicolo {COMMA} (limite fondi)
+STR_SHIP_AUTORENEW_FAILED                                       :{WHITE}Rinnovo automatico fallito per la nave {COMMA} (limite fondi)
+STR_AIRCRAFT_AUTORENEW_FAILED                                   :{WHITE}Rinnovo automatico fallito per l’aereo {COMMA} (limite fondi)
 
 STR_CONFIG_PATCHES                                              :{BLACK}Configura patch
 STR_CONFIG_PATCHES_TIP                                          :{BLACK}Configura le patch
@@ -1104,7 +1104,7 @@
 STR_CHEATS_TIP                                                  :{BLACK}La casella indica se hai già utilizzato questo trucco in passato
 STR_CHEATS_WARNING                                              :{BLACK}Attenzione! Stai per denunciare i tuoi avversari. Ricordati che un così grande disonore verrà ricordato per l’eternità.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Aumenta soldi di {CURRENCY64}
-STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Gioca come giocatore: {ORANGE}{COMMA16}
+STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Gioca come giocatore: {ORANGE}{COMMA}
 STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Bulldozer magico (rimuove industrie e altri): {ORANGE}{STRING}
 STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}I tunnel possono incrociarsi tra loro: {ORANGE}{STRING}
 STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Consenti costruzione quando in pausa: {ORANGE}{STRING}
@@ -1120,7 +1120,7 @@
 STR_GO_NON_STOP_TO_WAYPOINT                                     :Procedi non-stop per {WAYPOINT}
 
 STR_WAYPOINTNAME_CITY                                           :Waypoint {TOWN}
-STR_WAYPOINTNAME_CITY_SERIAL                                    :Waypoint {TOWN} #{COMMA16}
+STR_WAYPOINTNAME_CITY_SERIAL                                    :Waypoint {TOWN} #{COMMA}
 STR_LANDINFO_WAYPOINT                                           :Waypoint
 
 STR_WAYPOINT                                                    :{WHITE}Waypoint
@@ -1203,8 +1203,8 @@
 STR_CONSTRUCT_SUGAR_MINE_TIP                                    :{BLACK}Costruisci Raffineria di Zucchero
 
 STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Industrie
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}){YELLOW} ({COMMA16}% trasportato)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}/{STRING}){YELLOW} ({COMMA16}%/{COMMA16}% trasportate)
+STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}){YELLOW} ({COMMA}% trasportato)
+STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}/{STRING}){YELLOW} ({COMMA}%/{COMMA}% trasportate)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{TOWN} {STRING}
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...troppo vicina ad un’altra industria.
@@ -1244,15 +1244,15 @@
 STR_NETWORK_ADD_SERVER_TIP                                      :{BLACK}Aggiungi un server alla lista che verrà sempre controllata per giochi attivi.
 STR_NETWORK_ENTER_IP                                            :{BLACK}Digita indirizzo IP del server
 
-STR_NETWORK_CLIENTS_ONLINE                                      :{BLACK}{COMMA16}/{COMMA16}
+STR_NETWORK_CLIENTS_ONLINE                                      :{BLACK}{COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Clients
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Clients online / clients max
 STR_NETWORK_GAME_INFO                                           :{SILVER}GAME INFO
 STR_ORANGE                                                      :{ORANGE}{STRING}
-STR_NETWORK_CLIENTS                                             :{SILVER}Clients:  {WHITE}{COMMA8} / {COMMA8}
+STR_NETWORK_CLIENTS                                             :{SILVER}Clients:  {WHITE}{COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}Lingua:  {WHITE}{STRING}
 STR_NETWORK_TILESET                                             :{SILVER}Tileset:  {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Dimens:  {WHITE}{COMMA16}x{COMMA16}
+STR_NETWORK_MAP_SIZE                                            :{SILVER}Dimens:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Versione server:  {WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Indirizzo del server:  {WHITE}{STRING} : {NUMU16}
 STR_NETWORK_START_DATE                                          :{SILVER}Data di inizio:  {WHITE}{DATE_SHORT}
@@ -1517,21 +1517,21 @@
 
 ##id 0x2000
 STR_2000_TOWNS                                                  :{WHITE}Città
-STR_TOWN_LABEL_POP                                              :{WHITE}{STRING} ({COMMA32})
+STR_TOWN_LABEL_POP                                              :{WHITE}{STRING} ({COMMA})
 STR_2001                                                        :{WHITE}{STRING}
 STR_2002                                                        :{TINYFONT}{BLACK}{STRING}
 STR_2003                                                        :{TINYFONT}{WHITE}{STRING}
 STR_2004_BUILDING_MUST_BE_DEMOLISHED                            :{WHITE}E' necessario demolire l'edificio prima
 STR_2005                                                        :{WHITE}{TOWN}
-STR_2006_POPULATION                                             :{BLACK}Popolazione: {ORANGE}{COMMA32}{BLACK}  Case: {ORANGE}{COMMA32}
+STR_2006_POPULATION                                             :{BLACK}Popolazione: {ORANGE}{COMMA}{BLACK}  Case: {ORANGE}{COMMA}
 STR_2007_RENAME_TOWN                                            :Rinomina città
 STR_2008_CAN_T_RENAME_TOWN                                      :{WHITE}Non puoi rinominare città...
 STR_2009_LOCAL_AUTHORITY_REFUSES                                :{WHITE}L'autorità locale di {TOWN} non ti autorizza a farlo
 STR_200A_TOWN_NAMES_CLICK_ON_NAME                               :{BLACK}Elenco città - clicca sul nome per centrare la visuale sulla città
 STR_200B_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Centra la visuale sulla città
 STR_200C_CHANGE_TOWN_NAME                                       :{BLACK}Cambia nome alla città
-STR_200D_PASSENGERS_LAST_MONTH_MAX                              :{BLACK}Passeggeri il mese scorso: {ORANGE}{COMMA32}{BLACK}  massimo: {ORANGE}{COMMA32}
-STR_200E_MAIL_LAST_MONTH_MAX                                    :{BLACK}Posta il mese scorso: {ORANGE}{COMMA32}{BLACK}  massimo: {ORANGE}{COMMA32}
+STR_200D_PASSENGERS_LAST_MONTH_MAX                              :{BLACK}Passeggeri il mese scorso: {ORANGE}{COMMA}{BLACK}  massimo: {ORANGE}{COMMA}
+STR_200E_MAIL_LAST_MONTH_MAX                                    :{BLACK}Posta il mese scorso: {ORANGE}{COMMA}{BLACK}  massimo: {ORANGE}{COMMA}
 STR_200F_TALL_OFFICE_BLOCK                                      :Blocco di uffici alto
 STR_2010_OFFICE_BLOCK                                           :Blocco di uffici
 STR_2011_SMALL_BLOCK_OF_FLATS                                   :Piccolo blocco di appartamenti
@@ -1605,7 +1605,7 @@
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Corrompi l’autorità locale per incrementare la tua valutazione con il rischio di una severa multa se scoperto.{}  Costo: {CURRENCY}
 STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Traffico nel caos a {TOWN}!{}{}La ricostruzione stradale finanziata da {STRING} porterà 6 mesi di disagio agli automobilisti!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
-STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA32})
+STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA})
 STR_2058_UNDER_CONSTRUCTION                                     :{STRING} (in costruzione)
 STR_2059_IGLOO                                                  :Igloo
 STR_205A_TEPEES                                                 :Tepees
@@ -1667,7 +1667,7 @@
 STR_303C_OUTSTANDING                                            :Eccezionale
 ############ range for rating ends
 
-STR_303D                                                        :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA8}%)
+STR_303D                                                        :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_303E_NO_LONGER_ACCEPTS                                      :{WHITE}{STATION} non accetta più {STRING}
 STR_303F_NO_LONGER_ACCEPTS_OR                                   :{WHITE}{STATION} non accetta più {STRING} o {STRING}
 STR_3040_NOW_ACCEPTS                                            :{WHITE}{STATION} adesso accetta {STRING}
@@ -1678,7 +1678,7 @@
 STR_3045_TOO_CLOSE_TO_ANOTHER_TRUCK                             :{WHITE}Troppo vicina a un'altra stazione camion
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Devi demolire stazione bus prima
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Devi demolire stazione camion prima
-STR_3048_STATIONS                                               :{WHITE}{STRING} - {COMMA16} Stazioni
+STR_3048_STATIONS                                               :{WHITE}{STRING} - {COMMA} Stazioni
 STR_3049_0                                                      :{YELLOW}{STATION} {STRINL 0x30D1}
 STR_304A_NONE                                                   :{YELLOW}- Nulla -
 STR_304B_SITE_UNSUITABLE                                        :{WHITE}...sito inadatto
@@ -1735,7 +1735,7 @@
 STR_4002_SAVE                                                   :{BLACK}Salva
 STR_4003_DELETE                                                 :{BLACK}Elimina
 STR_4004                                                        :{STRING}, {DATE_LONG}
-STR_4005_BYTES_FREE                                             :{BLACK}{COMMA32} megabytes liberi
+STR_4005_BYTES_FREE                                             :{BLACK}{COMMA} megabytes liberi
 STR_4006_UNABLE_TO_READ_DRIVE                                   :{BLACK}Impossibile leggere dal disco
 STR_4007_GAME_SAVE_FAILED                                       :{WHITE}Salvataggio fallito
 STR_4008_UNABLE_TO_DELETE_FILE                                  :{WHITE}Impossibile eliminare il file
@@ -1796,7 +1796,7 @@
 ############ range for requires	ends
 
 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Produzione ultimo mese:
-STR_482B_TRANSPORTED                                            :{YELLOW}{STRING}{BLACK} ({COMMA16}% trasportato)
+STR_482B_TRANSPORTED                                            :{YELLOW}{STRING}{BLACK} ({COMMA}% trasportato)
 STR_482C_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Centra visule sull'industria
 STR_482D_NEW_UNDER_CONSTRUCTION                                 :{BLACK}{BIGFONT}Nuova {STRING} in costruzione vicino a {TOWN}!
 STR_482E_NEW_BEING_PLANTED_NEAR                                 :{BLACK}{BIGFONT}Nuova {STRING} è stata piantata vicino a {TOWN}!
@@ -1813,8 +1813,8 @@
 STR_4839_PRODUCTION_DOWN_BY_50                                  :{BLACK}{BIGFONT}{TOWN} {STRING} produzione scesa del 50%
 STR_483A_INSECT_INFESTATION_CAUSES                              :{BLACK}{BIGFONT}Invasione d'insetti causa devastazione a {TOWN} {STRING}!{}Produzione scesa del 50%
 STR_483B_CAN_ONLY_BE_POSITIONED                                 :{WHITE}...può essere posizionata solo vicino al bordo della mappa
-STR_INDUSTRY_PROD_GOUP                                          :{BLACK}{BIGFONT}La produzione di {STRING} a {TOWN} {STRING} è aumentata del {COMMA16}%!
-STR_INDUSTRY_PROD_GODOWN                                        :{BLACK}{BIGFONT}La produzione di {STRING} a {TOWN} {STRING} è diminuita del {COMMA16}%!
+STR_INDUSTRY_PROD_GOUP                                          :{BLACK}{BIGFONT}La produzione di {STRING} a {TOWN} {STRING} è aumentata del {COMMA}%!
+STR_INDUSTRY_PROD_GODOWN                                        :{BLACK}{BIGFONT}La produzione di {STRING} a {TOWN} {STRING} è diminuita del {COMMA}%!
 
 ##id 0x5000
 STR_5000_TRAIN_IN_TUNNEL                                        :{WHITE}Treno nel tunnel
@@ -1877,10 +1877,10 @@
 ##id 0x6000
 STR_SV_EMPTY                                                    :
 STR_SV_UNNAMED                                                  :Senza nome{SKIP}
-STR_SV_TRAIN_NAME                                               :Treno {COMMA16}
-STR_SV_ROADVEH_NAME                                             :Veicolo Stradale {COMMA16}
-STR_SV_SHIP_NAME                                                :Nave {COMMA16}
-STR_SV_AIRCRAFT_NAME                                            :Aereo {COMMA16}
+STR_SV_TRAIN_NAME                                               :Treno {COMMA}
+STR_SV_ROADVEH_NAME                                             :Veicolo Stradale {COMMA}
+STR_SV_SHIP_NAME                                                :Nave {COMMA}
+STR_SV_AIRCRAFT_NAME                                            :Aereo {COMMA}
 
 STR_SV_STNAME                                                   :{STRING}
 STR_SV_STNAME_NORTH                                             :{STRING} Nord
@@ -1930,12 +1930,12 @@
 ############ range for difficulty levels ends
 
 ############ range for difficulty settings starts
-STR_6805_MAXIMUM_NO_COMPETITORS                                 :{LTBLUE}Numero max di avversari: {ORANGE}{COMMA16}
+STR_6805_MAXIMUM_NO_COMPETITORS                                 :{LTBLUE}Numero max di avversari: {ORANGE}{COMMA}
 STR_6806_COMPETITOR_START_TIME                                  :{LTBLUE}Partenza avversari: {ORANGE}{STRING}
 STR_6807_NO_OF_TOWNS                                            :{LTBLUE}Numero di città: {ORANGE}{STRING}
 STR_6808_NO_OF_INDUSTRIES                                       :{LTBLUE}Numero di industrie: {ORANGE}{STRING}
 STR_6809_MAXIMUM_INITIAL_LOAN_000                               :{LTBLUE}Prestito iniziale massimo: {ORANGE}{CURRENCY}
-STR_680A_INITIAL_INTEREST_RATE                                  :{LTBLUE}Tasso d'interesse iniziale: {ORANGE}{COMMA16}%
+STR_680A_INITIAL_INTEREST_RATE                                  :{LTBLUE}Tasso d'interesse iniziale: {ORANGE}{COMMA}%
 STR_680B_VEHICLE_RUNNING_COSTS                                  :{LTBLUE}Consumi dei veicoli: {ORANGE}{STRING}
 STR_680C_CONSTRUCTION_SPEED_OF_COMPETITOR                       :{LTBLUE}Velocità di costruzione degli avversari: {ORANGE}{STRING}
 STR_680D_INTELLIGENCE_OF_COMPETITORS                            :{LTBLUE}Intelligenza degli avversari: {ORANGE}{STRING}
@@ -1994,7 +1994,7 @@
 ##id 0x7000
 STR_7000                                                        :
 STR_7001                                                        :{WHITE}{STRING} {BLACK}{STRING}
-STR_7002_PLAYER                                                 :(Giocatore {COMMA16})
+STR_7002_PLAYER                                                 :(Giocatore {COMMA})
 STR_7004_NEW_FACE                                               :{BLACK}Nuova Faccia
 STR_7005_COLOR_SCHEME                                           :{BLACK}Colore Società
 STR_7006_COLOR_SCHEME                                           :{GOLD}Colore Società:
@@ -2028,7 +2028,7 @@
 STR_7022_INCOME_GRAPH                                           :{WHITE}Grafico Incassi
 STR_CURRCOMPACT32                                               :{CURRCOMPACT}
 STR_CURRCOMPACT64                                               :{CURRCOMPACT64}
-STR_7024                                                        :{COMMA32}
+STR_7024                                                        :{COMMA}
 STR_7025_OPERATING_PROFIT_GRAPH                                 :{WHITE}Grafico Profitti Operazionali
 STR_7026_BANK_BALANCE                                           :{WHITE}Bilancio Bancario
 STR_7027_LOAN                                                   :{WHITE}Prestito
@@ -2052,14 +2052,14 @@
 STR_7037_PRESIDENT                                              :{WHITE}{STRING}{}{GOLD}(President)
 STR_7038_INAUGURATED                                            :{GOLD}Inaugurata: {WHITE}{NUMU16}
 STR_7039_VEHICLES                                               :{GOLD}Veicoli:
-STR_703A_TRAIN                                                  :{WHITE}{COMMA16} treno
-STR_703B_TRAINS                                                 :{WHITE}{COMMA16} treni
-STR_703C_ROAD_VEHICLE                                           :{WHITE}{COMMA16} Veicolo stradale
-STR_703D_ROAD_VEHICLES                                          :{WHITE}{COMMA16} Veicoli stradali
-STR_703E_AIRCRAFT                                               :{WHITE}{COMMA16} aereo
-STR_703F_AIRCRAFT                                               :{WHITE}{COMMA16} aerei
-STR_7040_SHIP                                                   :{WHITE}{COMMA16} nave
-STR_7041_SHIPS                                                  :{WHITE}{COMMA16} navi
+STR_703A_TRAIN                                                  :{WHITE}{COMMA} treno
+STR_703B_TRAINS                                                 :{WHITE}{COMMA} treni
+STR_703C_ROAD_VEHICLE                                           :{WHITE}{COMMA} Veicolo stradale
+STR_703D_ROAD_VEHICLES                                          :{WHITE}{COMMA} Veicoli stradali
+STR_703E_AIRCRAFT                                               :{WHITE}{COMMA} aereo
+STR_703F_AIRCRAFT                                               :{WHITE}{COMMA} aerei
+STR_7040_SHIP                                                   :{WHITE}{COMMA} nave
+STR_7041_SHIPS                                                  :{WHITE}{COMMA} navi
 STR_7042_NONE                                                   :{WHITE}Nessuno
 STR_7043_FACE_SELECTION                                         :{WHITE}Seleziona Faccia
 STR_7044_MALE                                                   :{BLACK}Maschio
@@ -2124,8 +2124,8 @@
 STR_707A_SELL_25_SHARE_IN_THIS_COMPANY                          :{BLACK}Vendi il 25% delle azioni della società
 STR_707B_CAN_T_BUY_25_SHARE_IN_THIS                             :{WHITE}Non puoi comprare il 25% delle azioni della società...
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}Non puoi vendere il 25% delle azioni della società...
-STR_707D_OWNED_BY                                               :{WHITE}({COMMA16}% posseduto da {STRING})
-STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA16}% posseduto da {STRING}{}   {COMMA16}% posseduto da {STRING})
+STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% posseduto da {STRING})
+STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}% posseduto da {STRING}{}   {COMMA}% posseduto da {STRING})
 STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{STRING} è stata rilevata da {STRING}!
 STR_7080_PROTECTED                                              :{WHITE}Questa compagnia non è abbastanza vecchia per compravendere azioni...
 
@@ -2400,8 +2400,8 @@
 STR_8801_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}I cittadini festeggiano . . .{}Primo treno arrivato a {STATION}!
 STR_8802_DETAILS                                                :{WHITE}{STRING} (Details)
 STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}Treno in mezzo
-STR_8804                                                        :{SETX 10}{COMMA8}: {STRING}
-STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA8}: {STRING}
+STR_8804                                                        :{SETX 10}{COMMA}: {STRING}
+STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING}
 STR_8806_GO_TO                                                  :Vai a {STATION}
 STR_8807_GO_TO_TRANSFER                                         :Vai a {STATION} (Trasferisci e carica)
 STR_8808_GO_TO_UNLOAD                                           :Vai a {STATION} (Scarica)
@@ -2427,13 +2427,13 @@
 STR_UNKNOWN_DESTINATION                                         :destinazione sconosciuta
 STR_8812_EMPTY                                                  :{LTBLUE}Vuoto
 STR_8813_FROM                                                   :{LTBLUE}{CARGO} da {STATION}
-STR_8814_TRAIN_IS_WAITING_IN_DEPOT                              :{WHITE}Treno {COMMA16} stà aspettando nel deposito
+STR_8814_TRAIN_IS_WAITING_IN_DEPOT                              :{WHITE}Treno {COMMA} stà aspettando nel deposito
 STR_8815_NEW_VEHICLES                                           :{BLACK}Nuovi Veicoli
 STR_8816                                                        :{BLACK}-
 STR_8818_INFORMATION                                            :{BLACK}Informazioni
 STR_8819_TRAIN_TOO_LONG                                         :{WHITE}Treno troppo lungo
 STR_881A_TRAINS_CAN_ONLY_BE_ALTERED                             :{WHITE}Un treno può essere modificato solo quando è fermo nel deposito
-STR_881B_TRAINS                                                 :{WHITE}{STRING} - {COMMA16} Treni
+STR_881B_TRAINS                                                 :{WHITE}{STRING} - {COMMA} Treni
 STR_881C_NEW_RAIL_VEHICLES                                      :{WHITE}Nuovo Veicolo Ferroviario
 STR_881D_NEW_MONORAIL_VEHICLES                                  :{WHITE}Nuovo  Veicolo Per Monorotaia
 STR_881E_NEW_MAGLEV_VEHICLES                                    :{WHITE}Nuovo Veicolo Per Maglev
@@ -2467,8 +2467,8 @@
 STR_8839_CAN_T_SELL_RAILROAD_VEHICLE                            :{WHITE}Non puoi vendere veicolo ferroviario...
 STR_883A_UNABLE_TO_FIND_ROUTE_TO                                :{WHITE}Non riesce a trovare il deposito locale
 STR_883B_CAN_T_STOP_START_TRAIN                                 :{WHITE}Non puoi far fermare/ripartire il treno...
-STR_883C_SERVICING_INTERVAL_DAYS                                :{BLACK}Intervallo Manutenz.: {LTBLUE}{COMMA16}giorni{BLACK}   Ultima Manut.: {LTBLUE}{DATE_LONG}
-STR_SERVICING_INTERVAL_PERCENT                                  :{BLACK}Intervallo Manutenz.: {LTBLUE}{COMMA16}%{BLACK}   Ultima Manut.: {LTBLUE}{DATE_LONG}
+STR_883C_SERVICING_INTERVAL_DAYS                                :{BLACK}Intervallo Manutenz.: {LTBLUE}{COMMA}giorni{BLACK}   Ultima Manut.: {LTBLUE}{DATE_LONG}
+STR_SERVICING_INTERVAL_PERCENT                                  :{BLACK}Intervallo Manutenz.: {LTBLUE}{COMMA}%{BLACK}   Ultima Manut.: {LTBLUE}{DATE_LONG}
 STR_883D_TRAINS_CLICK_ON_TRAIN_FOR                              :{BLACK}Treni - fai clic sul treno per le informazioni
 STR_883E_BUILD_NEW_TRAINS_REQUIRES                              :{BLACK}Costruisci nuovi treni (Necessario deposito)
 STR_883F_TRAINS_CLICK_ON_TRAIN_FOR                              :{BLACK}Treni - fai clic sul treno per le informazioni, trascina i veicoli per aggiungerli/rimuoverli dal treno
@@ -2501,12 +2501,12 @@
 STR_SERVICE_HINT                                                :{BLACK}Ignora l’ordine finché non sia necessaria la manutenzione
 STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}Nuova {STRING} ora disponibile!
 STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
-STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Costo: {CURRENCY} Peso: {COMMA16}t{}Velocità: {VELOCITY}  Potenza: {COMMA16}hp{}Consumi: {CURRENCY}/anno{}Capienza: {STRING}
+STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Costo: {CURRENCY} Peso: {COMMA}t{}Velocità: {VELOCITY}  Potenza: {COMMA}hp{}Consumi: {CURRENCY}/anno{}Capienza: {STRING}
 STR_885C_BROKEN_DOWN                                            :{RED}Guasto!
 STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Età: {LTBLUE}{STRING}{BLACK}   Consumi: {LTBLUE}{CURRENCY}/anno
-STR_885E_WEIGHT_T_POWER_HP_MAX_SPEED                            :{BLACK}Peso: {LTBLUE}{COMMA16}t  {BLACK}Potenza: {LTBLUE}{COMMA32}cv{BLACK} Velocità Max: {LTBLUE}{VELOCITY}
+STR_885E_WEIGHT_T_POWER_HP_MAX_SPEED                            :{BLACK}Peso: {LTBLUE}{COMMA}t  {BLACK}Potenza: {LTBLUE}{COMMA}cv{BLACK} Velocità Max: {LTBLUE}{VELOCITY}
 STR_885F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Profitto quest'anno: {LTBLUE}{CURRENCY}  (anno scorso: {CURRENCY})
-STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Affidabilità: {LTBLUE}{COMMA8}%  {BLACK}Guasti dall'ultima manutenzione: {LTBLUE}{COMMA16}
+STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Affidabilità: {LTBLUE}{COMMA}%  {BLACK}Guasti dall'ultima manutenzione: {LTBLUE}{COMMA}
 STR_8861_STOPPED                                                :{RED}Fermato
 STR_8862_CAN_T_MAKE_TRAIN_PASS_SIGNAL                           :{WHITE}Non puoi fargli passare i segnali al rischio di...
 STR_8863_CRASHED                                                :{RED}Distrutto!
@@ -2514,7 +2514,7 @@
 STR_8865_NAME_TRAIN                                             :{WHITE}Nome Treno
 STR_8866_CAN_T_NAME_TRAIN                                       :{WHITE}Non puoi rinominare il treno...
 STR_8867_NAME_TRAIN                                             :{BLACK}Nome Treno
-STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Treno schiantato!{}{COMMA16} morti in una palla di fuoco dopo la collisione
+STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Treno schiantato!{}{COMMA} morti in una palla di fuoco dopo la collisione
 STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}Non puoi invertire la direzione del treno...
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Rinomina il tipo di veicolo
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Non puoi rinominare tipo di veicolo...
@@ -2526,7 +2526,7 @@
 
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Veicolo in mezzo
-STR_9001_ROAD_VEHICLES                                          :{WHITE}{STRING} - {COMMA16} Veicoli stradali
+STR_9001_ROAD_VEHICLES                                          :{WHITE}{STRING} - {COMMA} Veicoli stradali
 STR_9002                                                        :{WHITE}{STRING}
 STR_9003_ROAD_VEHICLE_DEPOT                                     :{WHITE}{TOWN} Deposito Veicoli Stradali
 STR_9004_NEW_VEHICLES                                           :{BLACK}Nuovo Veicolo Stradale
@@ -2540,13 +2540,13 @@
 STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Età: {LTBLUE}{STRING}{BLACK}   Consumi: {LTBLUE}{CURRENCY}/anno
 STR_900E_MAX_SPEED                                              :{BLACK}Velocità Max: {LTBLUE}{VELOCITY}
 STR_900F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Profitto quest'anno: {LTBLUE}{CURRENCY}  (anno scorso: {CURRENCY})
-STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Affidabilità: {LTBLUE}{COMMA8}%  {BLACK}Guasti dall'ultima manutenz.: {LTBLUE}{COMMA16}
+STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Affidabilità: {LTBLUE}{COMMA}%  {BLACK}Guasti dall'ultima manutenz.: {LTBLUE}{COMMA}
 STR_9011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Costr. nel: {LTBLUE}{NUMU16}{BLACK} Valore: {LTBLUE}{CURRENCY}
 STR_9012_CAPACITY                                               :{BLACK}Capienza: {LTBLUE}{STRING}
 STR_9013_MUST_BE_STOPPED_INSIDE                                 :{WHITE}...deve essere fermo nel deposito
 STR_9014_CAN_T_SELL_ROAD_VEHICLE                                :{WHITE}Non puoi vendere veicolo
 STR_9015_CAN_T_STOP_START_ROAD_VEHICLE                          :{WHITE}Non puoi far fermare/avviare veicolo...
-STR_9016_ROAD_VEHICLE_IS_WAITING                                :{WHITE}Veicolo stradale {COMMA16} stà aspettando nel deposito
+STR_9016_ROAD_VEHICLE_IS_WAITING                                :{WHITE}Veicolo stradale {COMMA} stà aspettando nel deposito
 STR_HEADING_FOR_ROAD_DEPOT                                      :{LTBLUE}Direzione {TOWN} Deposito
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{LTBLUE}Direzione {TOWN} Deposito, {VELOCITY}
 STR_9018_CAN_T_SEND_VEHICLE_TO_DEPOT                            :{WHITE}Non puoi mandare il veicolo al deposito...
@@ -2575,7 +2575,7 @@
 STR_902F_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}I cittadini festeggiano . . .{}Primo bus arrivato a {STATION}!
 STR_9030_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}I cittadini festeggiano. . .{}Primo camion arrivato a {STATION}!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Veicolo distrutto!{}Il conducente muore in una palla di fuoco dopo la collisione
-STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Veicolo distrutto!{}{COMMA16} morti in una palla di fuoco dopo la collisione col treno
+STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Veicolo distrutto!{}{COMMA} morti in una palla di fuoco dopo la collisione col treno
 STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}Non puoi far girare il veicolo...
 STR_9034_RENAME                                                 :{BLACK}Rinomina
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Rinomina tipo di veicolo
@@ -2590,7 +2590,7 @@
 STR_9802_CAN_T_BUILD_DOCK_HERE                                  :{WHITE}Non puoi costruire molo qui...
 STR_9803_SHIP_DEPOT                                             :{WHITE}{TOWN} Deposito Navale
 STR_9804_NEW_SHIPS                                              :{BLACK}Nuove Navi
-STR_9805_SHIPS                                                  :{WHITE}{STRING} - {COMMA16} Navi
+STR_9805_SHIPS                                                  :{WHITE}{STRING} - {COMMA} Navi
 STR_9806_CAN_T_BUILD_SHIPS                                      :{WHITE}Non puoi costruire nave...
 STR_9807_MUST_BUILD_SHIP_DEPOT_FIRST                            :{WHITE}Devi costruire un deposito prima
 STR_9808_NEW_SHIPS                                              :{WHITE}Nuove Navi
@@ -2605,7 +2605,7 @@
 STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Età: {LTBLUE}{STRING}{BLACK}   Consumi: {LTBLUE}{CURRENCY}/anno
 STR_9813_MAX_SPEED                                              :{BLACK}Velocità Max: {LTBLUE}{VELOCITY}
 STR_9814_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Profitto quest'anno: {LTBLUE}{CURRENCY}  (anno scorso: {CURRENCY})
-STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Affidabilità: {LTBLUE}{COMMA8}%  {BLACK}Guasti dall'ultima manutenz.: {LTBLUE}{COMMA16}
+STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Affidabilità: {LTBLUE}{COMMA}%  {BLACK}Guasti dall'ultima manutenz.: {LTBLUE}{COMMA}
 STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Costr. nel: {LTBLUE}{NUMU16}{BLACK} Valore: {LTBLUE}{CURRENCY}
 STR_9817_CAPACITY                                               :{BLACK}Capienza: {LTBLUE}{STRING}
 STR_9818_CAN_T_STOP_START_SHIP                                  :{WHITE}Non puoi far fermare/ripartire la nave...
@@ -2613,7 +2613,7 @@
 STR_981A_UNABLE_TO_FIND_LOCAL_DEPOT                             :{WHITE}Non riesce a trovare il deposito locale
 STR_HEADING_FOR_SHIP_DEPOT                                      :{LTBLUE}Direzione {TOWN} Deposito
 STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{LTBLUE}Direzione {TOWN} Deposito, {VELOCITY}
-STR_981C_SHIP_IS_WAITING_IN_DEPOT                               :{WHITE}Nave {COMMA16} stà aspettano nel deposito
+STR_981C_SHIP_IS_WAITING_IN_DEPOT                               :{WHITE}Nave {COMMA} stà aspettano nel deposito
 STR_981D_BUILD_SHIP_DOCK                                        :{BLACK}Costruisci molo
 STR_981E_BUILD_SHIP_DEPOT_FOR_BUILDING                          :{BLACK}Costruisci deposito navale (per costruzione e manutenzione)
 STR_981F_SHIPS_CLICK_ON_SHIP_FOR                                :{BLACK}Navi - fai clic sulla nave per le informazioni
@@ -2664,19 +2664,19 @@
 STR_A005_NEW_AIRCRAFT                                           :{WHITE}Nuovo Aereo
 STR_A006_BUILD_AIRCRAFT                                         :{BLACK}Construisci Aereo
 STR_A008_CAN_T_BUILD_AIRCRAFT                                   :{WHITE}Non puoi costruire aereo
-STR_A009_AIRCRAFT                                               :{WHITE}{STRING} - {COMMA16} Aereo
+STR_A009_AIRCRAFT                                               :{WHITE}{STRING} - {COMMA} Aereo
 STR_A00A                                                        :{WHITE}{STRING}
 STR_A00B_ORDERS                                                 :{WHITE}{STRING} (Ordini)
 STR_A00C_DETAILS                                                :{WHITE}{STRING} (Dettagli)
 STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Età: {LTBLUE}{STRING}{BLACK}   Consumi: {LTBLUE}{CURRENCY}/anno
 STR_A00E_MAX_SPEED                                              :{BLACK}Velocità Max: {LTBLUE}{VELOCITY}
 STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Profitto quest'anno: {LTBLUE}{CURRENCY}  (anno scorso: {CURRENCY})
-STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Affidabilità: {LTBLUE}{COMMA8}%  {BLACK}Guasti dall'ultima manutenz.: {LTBLUE}{COMMA16}
+STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Affidabilità: {LTBLUE}{COMMA}%  {BLACK}Guasti dall'ultima manutenz.: {LTBLUE}{COMMA}
 STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Costr. nel: {LTBLUE}{NUMU16}{BLACK} Valore: {LTBLUE}{CURRENCY}
 STR_A012_CAN_T_SEND_AIRCRAFT_TO                                 :{WHITE}Non puoi mandare aereo nell'hangar...
 STR_HEADING_FOR_HANGAR                                          :{LTBLUE}Direzione {STATION} Hangar
 STR_HEADING_FOR_HANGAR_VEL                                      :{LTBLUE}Direzione {STATION} Hangar, {VELOCITY}
-STR_A014_AIRCRAFT_IS_WAITING_IN                                 :{WHITE}Aereo {COMMA16} sta aspettano nell'hangar
+STR_A014_AIRCRAFT_IS_WAITING_IN                                 :{WHITE}Aereo {COMMA} sta aspettano nell'hangar
 STR_A015_AIRCRAFT_IN_THE_WAY                                    :{WHITE}Aereo in mezzo
 STR_A016_CAN_T_STOP_START_AIRCRAFT                              :{WHITE}Non puoi far fermare/ripartire aereo...
 STR_A017_AIRCRAFT_IS_IN_FLIGHT                                  :{WHITE}Aereo in volo
@@ -2702,14 +2702,14 @@
 STR_A02B_SHOW_AIRCRAFT_DETAILS                                  :{BLACK}Mostra dettagli dell'aereo
 STR_A02C_NEW_AIRCRAFT_NOW_AVAILABLE                             :{BLACK}{BIGFONT}Nuovo aereo disponibile!
 STR_A02D                                                        :{BLACK}{BIGFONT}{STRING}
-STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Costo: {CURRENCY} Velocità Max: {VELOCITY}{}Capienza: {COMMA16} passeggeri, {COMMA16} sacchi postali{}Consumi: {CURRENCY}/anno
+STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Costo: {CURRENCY} Velocità Max: {VELOCITY}{}Capienza: {COMMA} passeggeri, {COMMA} sacchi postali{}Consumi: {CURRENCY}/anno
 
 STR_A030_NAME_AIRCRAFT                                          :{WHITE}Nome aereo
 STR_A031_CAN_T_NAME_AIRCRAFT                                    :{WHITE}Non puoi dare un nome all'aereo...
 STR_A032_NAME_AIRCRAFT                                          :{BLACK}Nome aereo
 STR_A033_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}I cittadini festeggiano . . .{}Primo aereo atterrato a {STATION}!
-STR_A034_PLANE_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Aereo precipitato!{}{COMMA16} morti in una palla di fuoco a {STATION}
-STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Incidente aereo!{}L'aereo ha finito il carburante, {COMMA16} morti in una palla di fuoco!
+STR_A034_PLANE_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Aereo precipitato!{}{COMMA} morti in una palla di fuoco a {STATION}
+STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Incidente aereo!{}L'aereo ha finito il carburante, {COMMA} morti in una palla di fuoco!
 STR_A035_DESTINATIONS                                           :{TINYFONT}{BLACK}Destinazioni:
 STR_A036                                                        :{TINYFONT}{BLACK}{STATION}
 STR_A037_RENAME                                                 :{BLACK}Rinomina
@@ -2735,7 +2735,7 @@
 STR_B003_FACTORY_DESTROYED_IN_SUSPICIOUS                        :{BLACK}{BIGFONT}Fabbrica distrutta in circostanze sospette vicino a {TOWN}!
 STR_B004_UFO_LANDS_NEAR                                         :{BLACK}{BIGFONT}'UFO' atterra vicino a {TOWN}!
 STR_B005_COAL_MINE_SUBSIDENCE_LEAVES                            :{BLACK}{BIGFONT}Cedimento in una miniera di carbone lascia tracce di distruzione vicino a {TOWN}!
-STR_B006_FLOOD_VEHICLE_DESTROYED                                :{BLACK}{BIGFONT}Alluvione!{}{COMMA16} distrutto o disperso a seguito di una mortale alluvione!
+STR_B006_FLOOD_VEHICLE_DESTROYED                                :{BLACK}{BIGFONT}Alluvione!{}{COMMA} distrutto o disperso a seguito di una mortale alluvione!
 
 STR_BRIBE_FAILED                                                :{WHITE}Il tentativo di corruzione è stato
 STR_BRIBE_FAILED_2                                              :{WHITE}scoperto dagli ispettori regionali.
@@ -2745,7 +2745,7 @@
 STR_PERFORMANCE_DETAIL                                          :{WHITE}Dettagli valutazione delle prestazioni
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Dettagli
 STR_PERFORMANCE_DETAIL_AMOUNT_CURRENCY                          :{BLACK}({CURRCOMPACT}/{CURRCOMPACT})
-STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA32}/{COMMA32})
+STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA}/{COMMA})
 STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{INT32}%
 SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{INT32}
 ############ Those following lines need to be in this order!!
@@ -2780,7 +2780,7 @@
 STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID:
 
 STR_CURRENCY_WINDOW                                             :{WHITE}Valuta personalizzata
-STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Cambio: {ORANGE}{CURRENCY} = {POUNDSIGN} {COMMA16}
+STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Cambio: {ORANGE}{CURRENCY} = {POUNDSIGN} {COMMA}
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Separatore:
 STR_CURRENCY_PREFIX                                             :{LTBLUE}Prefisso:
 STR_CURRENCY_SUFFIX                                             :{LTBLUE}Suffisso:
@@ -2794,10 +2794,10 @@
 STR_PLANE                                                       :{BLACK}{PLANE}
 STR_SHIP                                                        :{BLACK}{SHIP}
 
-STR_SCHEDULED_TRAINS                                            :{WHITE}{STATION} - {COMMA16} Treni
-STR_SCHEDULED_ROAD_VEHICLES                                     :{WHITE}{STATION} - {COMMA16} Veicoli
-STR_SCHEDULED_AIRCRAFT                                          :{WHITE}{STATION} - {COMMA16} Aerei
-STR_SCHEDULED_SHIPS                                             :{WHITE}{STATION} - {COMMA16} Navi
+STR_SCHEDULED_TRAINS                                            :{WHITE}{STATION} - {COMMA} Treni
+STR_SCHEDULED_ROAD_VEHICLES                                     :{WHITE}{STATION} - {COMMA} Veicoli
+STR_SCHEDULED_AIRCRAFT                                          :{WHITE}{STATION} - {COMMA} Aerei
+STR_SCHEDULED_SHIPS                                             :{WHITE}{STATION} - {COMMA} Navi
 
 STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Mostra tutti i treni che hanno questa stazione tra gli ordini
 STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Mostra tutti i veicoli che hanno questa stazione tra gli ordini
@@ -2819,7 +2819,7 @@
 STR_REPLACE_HELP                                                :{BLACK}Permette di rimpiazzare un locomotere con uno di un'altro tipo, quando il treno entra in un deposito
 
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
-STR_SIGN_LIST_CAPTION                                           :{WHITE}Lista dei Cartelli - {COMMA16} Cartelli
+STR_SIGN_LIST_CAPTION                                           :{WHITE}Lista dei Cartelli - {COMMA} Cartelli
 
 ############ Lists rail types
 
@@ -2829,16 +2829,16 @@
 
 ############ End of list of rail types
 
-STR_TINY_BLACK                                                  :{BLACK}{TINYFONT}{COMMA16}
+STR_TINY_BLACK                                                  :{BLACK}{TINYFONT}{COMMA}
 
-STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Costo: {GOLD}{CURRENCY}{BLACK} Peso: {GOLD}{COMMA16}t
-STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Velocità: {GOLD}{VELOCITY}{BLACK}   Potenza: {GOLD}{COMMA32}CV
+STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Costo: {GOLD}{CURRENCY}{BLACK} Peso: {GOLD}{COMMA}t
+STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Velocità: {GOLD}{VELOCITY}{BLACK}   Potenza: {GOLD}{COMMA}CV
 STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}Costi d'esercizio: {GOLD}{CURRENCY}/anno
 STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Capienza: {GOLD}{STRING} {STRING}
-STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Progettato nel: {GOLD}{NUMU16}{BLACK} Vita: {GOLD}{COMMA16} anni
-STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Max. Affidabilità: {GOLD}{COMMA8}%
+STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Progettato nel: {GOLD}{NUMU16}{BLACK} Vita: {GOLD}{COMMA} anni
+STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Max. Affidabilità: {GOLD}{COMMA}%
 STR_PURCHASE_INFO_COST                                          :{BLACK}Costo: {GOLD}{CURRENCY}
-STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Peso: {GOLD}{COMMA16}t  ({COMMA16}t)
+STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Peso: {GOLD}{COMMA}t  ({COMMA}t)
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Costo: {GOLD}{CURRENCY}{BLACK} Velocità: {GOLD}{VELOCITY}
-STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Capienza: {GOLD}{COMMA16} passeggeri, {COMMA16} sacchi postali
-STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Potenza Vagone: {GOLD}+{COMMA16}CV{BLACK} Peso: {GOLD}+{COMMA8}t
+STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Capienza: {GOLD}{COMMA} passeggeri, {COMMA} sacchi postali
+STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Potenza Vagone: {GOLD}+{COMMA}CV{BLACK} Peso: {GOLD}+{COMMA}t
--- a/lang/latvian.txt	Thu Jul 14 09:53:52 2005 +0000
+++ b/lang/latvian.txt	Thu Jul 14 15:10:20 2005 +0000
@@ -82,69 +82,69 @@
 STR_004C_PLASTIC                                                :Plastmasas
 STR_004D_FIZZY_DRINK                                            :Burbul'u'den'u
 STR_004E                                                        :
-STR_004F_PASSENGER                                              :{COMMA16} pasaz'ieris
-STR_0050_TON_OF_COAL                                            :{COMMA16} tonna ogl'u
-STR_0051_BAG_OF_MAIL                                            :{COMMA16} pasta maiss
+STR_004F_PASSENGER                                              :{COMMA} pasaz'ieris
+STR_0050_TON_OF_COAL                                            :{COMMA} tonna ogl'u
+STR_0051_BAG_OF_MAIL                                            :{COMMA} pasta maiss
 STR_0052_OF_OIL                                                 :{VOLUME} naftas
-STR_0053_ITEM_OF_LIVESTOCK                                      :{COMMA16} liellops
-STR_0054_CRATE_OF_GOODS                                         :{COMMA16} prec'u kaste
-STR_0055_TON_OF_GRAIN                                           :{COMMA16} tonna graudu
-STR_0056_TON_OF_WOOD                                            :{COMMA16} tonna kokmaterea'lu
-STR_0057_TON_OF_IRON_ORE                                        :{COMMA16} tonna dzelzs ru'das
-STR_0058_TON_OF_STEEL                                           :{COMMA16} tonna te'rauda
-STR_0059_BAG_OF_VALUABLES                                       :{COMMA16} maiss ar ve'rtspapi'riem
-STR_005A_TON_OF_COPPER_ORE                                      :{COMMA16} tonna vara ru'das
-STR_005B_TON_OF_MAIZE                                           :{COMMA16} tonna kukuru'zas
-STR_005C_TON_OF_FRUIT                                           :{COMMA16} tonna augl'u
-STR_005D_BAG_OF_DIAMONDS                                        :{COMMA16} maiss ar dimantiem
-STR_005E_TON_OF_FOOD                                            :{COMMA16} tonna pa'rtikas prec'u
-STR_005F_TON_OF_PAPER                                           :{COMMA16} tonna papi'ra
-STR_0060_BAG_OF_GOLD                                            :{COMMA16} zelta maiss
+STR_0053_ITEM_OF_LIVESTOCK                                      :{COMMA} liellops
+STR_0054_CRATE_OF_GOODS                                         :{COMMA} prec'u kaste
+STR_0055_TON_OF_GRAIN                                           :{COMMA} tonna graudu
+STR_0056_TON_OF_WOOD                                            :{COMMA} tonna kokmaterea'lu
+STR_0057_TON_OF_IRON_ORE                                        :{COMMA} tonna dzelzs ru'das
+STR_0058_TON_OF_STEEL                                           :{COMMA} tonna te'rauda
+STR_0059_BAG_OF_VALUABLES                                       :{COMMA} maiss ar ve'rtspapi'riem
+STR_005A_TON_OF_COPPER_ORE                                      :{COMMA} tonna vara ru'das
+STR_005B_TON_OF_MAIZE                                           :{COMMA} tonna kukuru'zas
+STR_005C_TON_OF_FRUIT                                           :{COMMA} tonna augl'u
+STR_005D_BAG_OF_DIAMONDS                                        :{COMMA} maiss ar dimantiem
+STR_005E_TON_OF_FOOD                                            :{COMMA} tonna pa'rtikas prec'u
+STR_005F_TON_OF_PAPER                                           :{COMMA} tonna papi'ra
+STR_0060_BAG_OF_GOLD                                            :{COMMA} zelta maiss
 STR_0061_OF_WATER                                               :{VOLUME} u'dens
-STR_0062_TON_OF_WHEAT                                           :{COMMA16} tonna kvies'u
+STR_0062_TON_OF_WHEAT                                           :{COMMA} tonna kvies'u
 STR_0063_OF_RUBBER                                              :{VOLUME} tonna gumijas
-STR_0064_TON_OF_SUGAR                                           :{COMMA16} tonna cukura
-STR_0065_TOY                                                    :{COMMA16} rotal'lieta
-STR_0066_BAG_OF_CANDY                                           :{COMMA16} saldumu maiss
+STR_0064_TON_OF_SUGAR                                           :{COMMA} tonna cukura
+STR_0065_TOY                                                    :{COMMA} rotal'lieta
+STR_0066_BAG_OF_CANDY                                           :{COMMA} saldumu maiss
 STR_0067_OF_COLA                                                :{VOLUME} kolas
-STR_0068_TON_OF_COTTON_CANDY                                    :{COMMA16} tonna cukurvates
-STR_0069_BUBBLE                                                 :{COMMA16} burbulis
-STR_006A_TON_OF_TOFFEE                                          :{COMMA16} tonna cukurpla'ksni's'u
-STR_006B_BATTERY                                                :{COMMA16} baterija
+STR_0068_TON_OF_COTTON_CANDY                                    :{COMMA} tonna cukurvates
+STR_0069_BUBBLE                                                 :{COMMA} burbulis
+STR_006A_TON_OF_TOFFEE                                          :{COMMA} tonna cukurpla'ksni's'u
+STR_006B_BATTERY                                                :{COMMA} baterija
 STR_006C_OF_PLASTIC                                             :{VOLUME} plastmasas
-STR_006D_FIZZY_DRINK                                            :{COMMA16} burbul'u'dens
+STR_006D_FIZZY_DRINK                                            :{COMMA} burbul'u'dens
 STR_006E                                                        :
-STR_006F_PASSENGERS                                             :{COMMA16} pasaz'ieri
-STR_0070_TONS_OF_COAL                                           :{COMMA16} tonnas ogl'u
-STR_0071_BAGS_OF_MAIL                                           :{COMMA16} pasta maisi
+STR_006F_PASSENGERS                                             :{COMMA} pasaz'ieri
+STR_0070_TONS_OF_COAL                                           :{COMMA} tonnas ogl'u
+STR_0071_BAGS_OF_MAIL                                           :{COMMA} pasta maisi
 STR_0072_OF_OIL                                                 :{VOLUME} naftas
-STR_0073_ITEMS_OF_LIVESTOCK                                     :{COMMA16} liellopi
-STR_0074_CRATES_OF_GOODS                                        :{COMMA16} kastes ar prece'm
-STR_0075_TONS_OF_GRAIN                                          :{COMMA16} tonnas graudu
-STR_0076_TONS_OF_WOOD                                           :{COMMA16} tonnas kokmaterea'lu
-STR_0077_TONS_OF_IRON_ORE                                       :{COMMA16} tonnas dzelzs ru'das
-STR_0078_TONS_OF_STEEL                                          :{COMMA16} tonnas te'rauda
-STR_0079_BAGS_OF_VALUABLES                                      :{COMMA16} maisi ar ve;rtslieta'm
-STR_007A_TONS_OF_COPPER_ORE                                     :{COMMA16} tonnas vara ru'das
-STR_007B_TONS_OF_MAIZE                                          :{COMMA16} tonnas kukuru'zas
-STR_007C_TONS_OF_FRUIT                                          :{COMMA16} tonnas augl'u
-STR_007D_BAGS_OF_DIAMONDS                                       :{COMMA16} maisi ar dimantiem
-STR_007E_TONS_OF_FOOD                                           :{COMMA16} tonnas pa'rtikas prec'u
-STR_007F_TONS_OF_PAPER                                          :{COMMA16} tonnas papi'ra
-STR_0080_BAGS_OF_GOLD                                           :{COMMA16} zelta maisi
+STR_0073_ITEMS_OF_LIVESTOCK                                     :{COMMA} liellopi
+STR_0074_CRATES_OF_GOODS                                        :{COMMA} kastes ar prece'm
+STR_0075_TONS_OF_GRAIN                                          :{COMMA} tonnas graudu
+STR_0076_TONS_OF_WOOD                                           :{COMMA} tonnas kokmaterea'lu
+STR_0077_TONS_OF_IRON_ORE                                       :{COMMA} tonnas dzelzs ru'das
+STR_0078_TONS_OF_STEEL                                          :{COMMA} tonnas te'rauda
+STR_0079_BAGS_OF_VALUABLES                                      :{COMMA} maisi ar ve;rtslieta'm
+STR_007A_TONS_OF_COPPER_ORE                                     :{COMMA} tonnas vara ru'das
+STR_007B_TONS_OF_MAIZE                                          :{COMMA} tonnas kukuru'zas
+STR_007C_TONS_OF_FRUIT                                          :{COMMA} tonnas augl'u
+STR_007D_BAGS_OF_DIAMONDS                                       :{COMMA} maisi ar dimantiem
+STR_007E_TONS_OF_FOOD                                           :{COMMA} tonnas pa'rtikas prec'u
+STR_007F_TONS_OF_PAPER                                          :{COMMA} tonnas papi'ra
+STR_0080_BAGS_OF_GOLD                                           :{COMMA} zelta maisi
 STR_0081_OF_WATER                                               :{VOLUME} u'dens
-STR_0082_TONS_OF_WHEAT                                          :{COMMA16} tonnas kvies'u
+STR_0082_TONS_OF_WHEAT                                          :{COMMA} tonnas kvies'u
 STR_0083_OF_RUBBER                                              :{VOLUME} gumijas
-STR_0084_TONS_OF_SUGAR                                          :{COMMA16} tonnas cukura
-STR_0085_TOYS                                                   :{COMMA16} rotal'lietas
-STR_0086_BAGS_OF_CANDY                                          :{COMMA16} saldumu maisi
+STR_0084_TONS_OF_SUGAR                                          :{COMMA} tonnas cukura
+STR_0085_TOYS                                                   :{COMMA} rotal'lietas
+STR_0086_BAGS_OF_CANDY                                          :{COMMA} saldumu maisi
 STR_0087_OF_COLA                                                :{VOLUME} kolas
-STR_0088_TONS_OF_COTTON_CANDY                                   :{COMMA16} tonnas cukurvates
-STR_0089_BUBBLES                                                :{COMMA16} burbul'i
-STR_008A_TONS_OF_TOFFEE                                         :{COMMA16} tonnas cukurpla'ksni's'u
-STR_008B_BATTERIES                                              :{COMMA16} baterijas
+STR_0088_TONS_OF_COTTON_CANDY                                   :{COMMA} tonnas cukurvates
+STR_0089_BUBBLES                                                :{COMMA} burbul'i
+STR_008A_TONS_OF_TOFFEE                                         :{COMMA} tonnas cukurpla'ksni's'u
+STR_008B_BATTERIES                                              :{COMMA} baterijas
 STR_008C_OF_PLASTIC                                             :{VOLUME} plastmasas
-STR_008D_FIZZY_DRINKS                                           :{COMMA16} burbul'u'den'u
+STR_008D_FIZZY_DRINKS                                           :{COMMA} burbul'u'den'u
 STR_008E                                                        :
 STR_008F_PS                                                     :{TINYFONT}PA
 STR_0090_CL                                                     :{TINYFONT}OG
@@ -219,8 +219,8 @@
 STR_00DF_GREY                                                   :Pele'ks
 STR_00E0_WHITE                                                  :Balts
 STR_00E1_TOO_MANY_VEHICLES_IN_GAME                              :{WHITE} Spe'le' ir pa'ra'k daudz transporta li'dzekl'u
-STR_00E2                                                        :{BLACK}{COMMA16}
-STR_00E3                                                        :{RED}{COMMA16}
+STR_00E2                                                        :{BLACK}{COMMA}
+STR_00E3                                                        :{RED}{COMMA}
 STR_00E4_LOCATION                                               :{BLACK}Atras'ana's vieta
 STR_00E5_CONTOURS                                               :Kontu'ras
 STR_00E6_VEHICLES                                               :Transporta li'dzekl'i
@@ -441,18 +441,18 @@
 STR_0198_PROFIT_THIS_YEAR_LAST_YEAR                             :{TINYFONT}{BLACK}S'i' gada iena'kums: {CURRENCY} (paga'jus'aja' gada': {CURRENCY})
 
 ############ range for service numbers starts
-STR_0199_YEAR                                                   :{COMMA16} gads ({COMMA16})
-STR_019A_YEARS                                                  :{COMMA16} gadi ({COMMA16})
-STR_019B_YEARS                                                  :{RED}{COMMA16} gadi ({COMMA16})
+STR_0199_YEAR                                                   :{COMMA} gads ({COMMA})
+STR_019A_YEARS                                                  :{COMMA} gadi ({COMMA})
+STR_019B_YEARS                                                  :{RED}{COMMA} gadi ({COMMA})
 ############ range for service numbers ends
 
 STR_019C_ROAD_VEHICLE                                           :Cel'u transporta li'dzeklis
 STR_019D_AIRCRAFT                                               :Lidmas'i'na
 STR_019E_SHIP                                                   :Kug'is
 STR_019F_TRAIN                                                  :Vilciens
-STR_01A0_IS_GETTING_OLD                                         :{WHITE}{STRING} {COMMA16} paliek vecs
-STR_01A1_IS_GETTING_VERY_OLD                                    :{WHITE}{STRING} {COMMA16} paliek l'oti vecs
-STR_01A2_IS_GETTING_VERY_OLD_AND                                :{WHITE}{STRING} {COMMA16} paliek l'oti vecs un ir steidzami ja'nomaina
+STR_01A0_IS_GETTING_OLD                                         :{WHITE}{STRING} {COMMA} paliek vecs
+STR_01A1_IS_GETTING_VERY_OLD                                    :{WHITE}{STRING} {COMMA} paliek l'oti vecs
+STR_01A2_IS_GETTING_VERY_OLD_AND                                :{WHITE}{STRING} {COMMA} paliek l'oti vecs un ir steidzami ja'nomaina
 STR_01A3_LAND_AREA_INFORMATION                                  :{WHITE}Zemes laukuma informa'cija
 STR_01A4_COST_TO_CLEAR_N_A                                      :{BLACK}Cost to clear: {LTBLUE}N/A
 STR_01A5_COST_TO_CLEAR                                          :{BLACK}Izmaksas noli'dzina's'anai: {LTBLUE}{CURRENCY}
@@ -497,7 +497,7 @@
 STR_01CA_31ST                                                   :31.
 ############ range for days	ends
 
-STR_01CB                                                        :{TINYFONT}{COMMA16}
+STR_01CB                                                        :{TINYFONT}{COMMA}
 STR_01CC_TOGGLE_LARGE_SMALL_MAP                                 :{BLACK}Pa'rsle'gt uz lielu/vide'ju/mazu karti
 STR_01CD_SELECT_TUTORIAL_DEMONSTRATION                          :{WHITE}Izve'le'ties ma'ci'bu/demonstra'ciju
 
@@ -509,7 +509,7 @@
 STR_CARGO_ACCEPTED_5                                            :{BLACK}Pien'em kravu: {LTBLUE}{STRING}, {STRING}, {STRING}, {STRING}, {STRING}
 ############ range for cargo acecpted ends
 
-STR_01D1_8                                                      :({COMMA8}/8 {STRING})
+STR_01D1_8                                                      :({COMMA}/8 {STRING})
 STR_01D2_JAZZ_JUKEBOX                                           :{WHITE}Dz'eza muzikas automa'ts
 STR_01D3_SOUND_MUSIC                                            :Skan'a/mu'zika
 STR_01D4_SHOW_SOUND_MUSIC_WINDOW                                :{BLACK}Ra'di't skan'as/mu'zikas logu
@@ -528,16 +528,16 @@
 STR_01E1_START_PLAYING_MUSIC                                    :{BLACK}Sa'kt muzikas spe'le's'anu
 STR_01E2_DRAG_SLIDERS_TO_SET_MUSIC                              :{BLACK}Bi'di klok'us lai maini'tu muzikas un skan'as efektu skal'umu
 STR_01E3                                                        :{DKGREEN}{TINYFONT}--
-STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA8}
-STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA8}
+STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA}
+STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA}
 STR_01E6                                                        :{DKGREEN}{TINYFONT}------
 STR_01E7                                                        :{DKGREEN}{TINYFONT}"{STRING}"
 STR_01E8_TRACK_XTITLE                                           :{BLACK}{TINYFONT}Treks{SETX 88}Nosaukums
 STR_01E9_SHUFFLE                                                :{TINYFONT}Sajaukt
 STR_01EA_PROGRAM                                                :{TINYFONT}{BLACK}Programma
 STR_01EB_MUSIC_PROGRAM_SELECTION                                :{WHITE}Mu'zikas programmas izve'le
-STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA16} "{STRING}"
-STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA16}   "{STRING}"
+STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} "{STRING}"
+STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA}   "{STRING}"
 STR_01EE_TRACK_INDEX                                            :{TINYFONT}{BLACK}Treka indekss
 STR_01EF_PROGRAM                                                :{TINYFONT}{BLACK}Programma - '{STRING}'
 STR_01F0_CLEAR                                                  :{TINYFONT}{BLACK}Dze'st
@@ -577,7 +577,7 @@
 STR_0210_TOO_FAR_FROM_PREVIOUS_DESTINATIO                       :{WHITE}...pa'ra'k ta'lu no ieprieks'e'ja' gala punkta
 STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Laba'ka's kompa'nijas, kas sasniegus'as{NUMU16}{}({STRING} Level)
 STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Kompa'niju li'gu tabula {NUMU16}
-STR_0212                                                        :{BIGFONT}{COMMA16}.
+STR_0212                                                        :{BIGFONT}{COMMA}.
 STR_0213_BUSINESSMAN                                            :Biznesmens
 STR_0214_ENTREPRENEUR                                           :Uzn'e'me'js
 STR_0215_INDUSTRIALIST                                          :Industria'lists
@@ -586,12 +586,12 @@
 STR_0218_MOGUL                                                  :Moguls
 STR_0219_TYCOON_OF_THE_CENTURY                                  :Gadsimta supervecis
 STR_HIGHSCORE_NAME                                              :{BIGFONT}{STRING}, {STRING}
-STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA16})
+STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA})
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{STRING} sasniegus'i  '{STRING}' statusu!
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{STRING} no {STRING} sasniegusi '{STRING}' statusu!
 STR_021D                                                        :{BLACK}
 STR_021E                                                        :{WHITE}
-STR_021F                                                        :{BLUE}{COMMA16}
+STR_021F                                                        :{BLUE}{COMMA}
 STR_0220_CREATE_SCENARIO                                        :{BLACK}Radi't scena'riju
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Scena'riju redaktors
@@ -788,8 +788,8 @@
 STR_EXTRA_VIEW_PORT                                             :Papildus skats
 STR_SIGN_LIST                                                   :Zi'mju saraksts
 STR_02DF_TOWN_DIRECTORY                                         :Pilse'tu saraksts
-STR_TOWN_POPULATION                                             :{BLACK}Pasaules iedzi'vota'ju skaits: {COMMA32}
-STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Skats {COMMA16}
+STR_TOWN_POPULATION                                             :{BLACK}Pasaules iedzi'vota'ju skaits: {COMMA}
+STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Skats {COMMA}
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN                                :{BLACK}Kope't uz skatu
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT                             :{BLACK}Kope't globa'la' skata atras'ana's vietu uz s'o skatu
 STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW                                :{BLACK}Kope't no skata
@@ -961,34 +961,34 @@
 STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Nevar kope't uzdevumu sarakstu...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Dali'to uzdevumu beigas - -
 
-STR_TRAIN_IS_LOST                                               :{WHITE}Train {COMMA16} is lost.
-STR_TRAIN_IS_UNPROFITABLE                                       :{WHITE}Train {COMMA16}'s profit last year was {CURRENCY}
+STR_TRAIN_IS_LOST                                               :{WHITE}Train {COMMA} is lost.
+STR_TRAIN_IS_UNPROFITABLE                                       :{WHITE}Train {COMMA}'s profit last year was {CURRENCY}
 STR_EURO_INTRODUCE                                              :{BLACK}{BIGFONT}European Monetary Union!{}{}The Euro is introduced as the sole currency for everyday transactions in your country!
 
 # Start of order review system.
 # DON'T ADD OR REMOVE LINES HERE
-STR_TRAIN_HAS_TOO_FEW_ORDERS                                    :{WHITE}Train {COMMA16} has too few orders in the schedule
-STR_TRAIN_HAS_VOID_ORDER                                        :{WHITE}Train {COMMA16} has a void order
-STR_TRAIN_HAS_DUPLICATE_ENTRY                                   :{WHITE}Train {COMMA16} has duplicate orders
-STR_TRAIN_HAS_INVALID_ENTRY                                     :{WHITE}Train {COMMA16} has an invalid station in its orders
-STR_ROADVEHICLE_HAS_TOO_FEW_ORDERS                              :{WHITE}Road Vehicle {COMMA16} has too few orders in the schedule
-STR_ROADVEHICLE_HAS_VOID_ORDER                                  :{WHITE}Road Vehicle {COMMA16} has a void order
-STR_ROADVEHICLE_HAS_DUPLICATE_ENTRY                             :{WHITE}Road Vehicle {COMMA16} has duplicate orders
-STR_ROADVEHICLE_HAS_INVALID_ENTRY                               :{WHITE}Road Vehicle {COMMA16} has an invalid station in its orders
-STR_SHIP_HAS_TOO_FEW_ORDERS                                     :{WHITE}Ship {COMMA16} has too few orders in the schedule
-STR_SHIP_HAS_VOID_ORDER                                         :{WHITE}Ship {COMMA16} has a void order
-STR_SHIP_HAS_DUPLICATE_ENTRY                                    :{WHITE}Ship {COMMA16} has duplicate orders
-STR_SHIP_HAS_INVALID_ENTRY                                      :{WHITE}Ship {COMMA16} has an invalid station in its orders
-STR_AIRCRAFT_HAS_TOO_FEW_ORDERS                                 :{WHITE}Aircraft {COMMA16} has too few orders in the schedule
-STR_AIRCRAFT_HAS_VOID_ORDER                                     :{WHITE}Aircraft {COMMA16} has a void order
-STR_AIRCRAFT_HAS_DUPLICATE_ENTRY                                :{WHITE}Aircraft {COMMA16} has duplicate orders
-STR_AIRCRAFT_HAS_INVALID_ENTRY                                  :{WHITE}Aircraft {COMMA16} has an invalid station in its orders
+STR_TRAIN_HAS_TOO_FEW_ORDERS                                    :{WHITE}Train {COMMA} has too few orders in the schedule
+STR_TRAIN_HAS_VOID_ORDER                                        :{WHITE}Train {COMMA} has a void order
+STR_TRAIN_HAS_DUPLICATE_ENTRY                                   :{WHITE}Train {COMMA} has duplicate orders
+STR_TRAIN_HAS_INVALID_ENTRY                                     :{WHITE}Train {COMMA} has an invalid station in its orders
+STR_ROADVEHICLE_HAS_TOO_FEW_ORDERS                              :{WHITE}Road Vehicle {COMMA} has too few orders in the schedule
+STR_ROADVEHICLE_HAS_VOID_ORDER                                  :{WHITE}Road Vehicle {COMMA} has a void order
+STR_ROADVEHICLE_HAS_DUPLICATE_ENTRY                             :{WHITE}Road Vehicle {COMMA} has duplicate orders
+STR_ROADVEHICLE_HAS_INVALID_ENTRY                               :{WHITE}Road Vehicle {COMMA} has an invalid station in its orders
+STR_SHIP_HAS_TOO_FEW_ORDERS                                     :{WHITE}Ship {COMMA} has too few orders in the schedule
+STR_SHIP_HAS_VOID_ORDER                                         :{WHITE}Ship {COMMA} has a void order
+STR_SHIP_HAS_DUPLICATE_ENTRY                                    :{WHITE}Ship {COMMA} has duplicate orders
+STR_SHIP_HAS_INVALID_ENTRY                                      :{WHITE}Ship {COMMA} has an invalid station in its orders
+STR_AIRCRAFT_HAS_TOO_FEW_ORDERS                                 :{WHITE}Aircraft {COMMA} has too few orders in the schedule
+STR_AIRCRAFT_HAS_VOID_ORDER                                     :{WHITE}Aircraft {COMMA} has a void order
+STR_AIRCRAFT_HAS_DUPLICATE_ENTRY                                :{WHITE}Aircraft {COMMA} has duplicate orders
+STR_AIRCRAFT_HAS_INVALID_ENTRY                                  :{WHITE}Aircraft {COMMA} has an invalid station in its orders
 # end of order system
 
-STR_TRAIN_AUTORENEW_FAILED                                      :{WHITE}Autoatjaunošana failed on train {COMMA16} (money limit)
-STR_ROADVEHICLE_AUTORENEW_FAILED                                :{WHITE}Autoatjaunošana failed on road vehicle {COMMA16} (money limit)
-STR_SHIP_AUTORENEW_FAILED                                       :{WHITE}Autoatjaunošana failed on ship {COMMA16} (money limit)
-STR_AIRCRAFT_AUTORENEW_FAILED                                   :{WHITE}Autoatjaunošana failed on aircraft {COMMA16} (money limit)
+STR_TRAIN_AUTORENEW_FAILED                                      :{WHITE}Autoatjaunošana failed on train {COMMA} (money limit)
+STR_ROADVEHICLE_AUTORENEW_FAILED                                :{WHITE}Autoatjaunošana failed on road vehicle {COMMA} (money limit)
+STR_SHIP_AUTORENEW_FAILED                                       :{WHITE}Autoatjaunošana failed on ship {COMMA} (money limit)
+STR_AIRCRAFT_AUTORENEW_FAILED                                   :{WHITE}Autoatjaunošana failed on aircraft {COMMA} (money limit)
 
 STR_CONFIG_PATCHES                                              :{BLACK}Configure Patches
 STR_CONFIG_PATCHES_TIP                                          :{BLACK}Configure the patches
@@ -1104,7 +1104,7 @@
 STR_CHEATS_TIP                                                  :{BLACK}Checkboxes indicate if you have used this cheat before
 STR_CHEATS_WARNING                                              :{BLACK}Warning! You are about to betray your fellow competitors. Keep in mind that such a disgrace will be remembered for eternity.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Increase money by {CURRENCY64}
-STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Playing as player: {ORANGE}{COMMA16}
+STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Playing as player: {ORANGE}{COMMA}
 STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Magic bulldozer (remove industries, unmovables): {ORANGE}{STRING}
 STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Tunnels may cross each other: {ORANGE}{STRING}
 STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Build while in pause mode: {ORANGE}{STRING}
@@ -1120,7 +1120,7 @@
 STR_GO_NON_STOP_TO_WAYPOINT                                     :Go non-stop via {WAYPOINT}
 
 STR_WAYPOINTNAME_CITY                                           :Waypoint {TOWN}
-STR_WAYPOINTNAME_CITY_SERIAL                                    :Waypoint {TOWN} #{COMMA16}
+STR_WAYPOINTNAME_CITY_SERIAL                                    :Waypoint {TOWN} #{COMMA}
 STR_LANDINFO_WAYPOINT                                           :Waypoint
 
 STR_WAYPOINT                                                    :{WHITE}Waypoint
@@ -1203,8 +1203,8 @@
 STR_CONSTRUCT_SUGAR_MINE_TIP                                    :{BLACK}Construct Sugar Mine
 
 STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Industrîjas
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}){YELLOW} ({COMMA16}% transported)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}/{STRING}){YELLOW} ({COMMA16}%/{COMMA16}% transported)
+STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}){YELLOW} ({COMMA}% transported)
+STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}/{STRING}){YELLOW} ({COMMA}%/{COMMA}% transported)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{TOWN} {STRING}
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...too close to another industry
@@ -1244,15 +1244,15 @@
 STR_NETWORK_ADD_SERVER_TIP                                      :{BLACK}Adds a server to the list which will always be checked for running games.
 STR_NETWORK_ENTER_IP                                            :{BLACK}Enter the address of the host
 
-STR_NETWORK_CLIENTS_ONLINE                                      :{BLACK}{COMMA16}/{COMMA16}
+STR_NETWORK_CLIENTS_ONLINE                                      :{BLACK}{COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Clients
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Clients online / clients max
 STR_NETWORK_GAME_INFO                                           :{SILVER}GAME INFO
 STR_ORANGE                                                      :{ORANGE}{STRING}
-STR_NETWORK_CLIENTS                                             :{SILVER}Clients:  {WHITE}{COMMA8} / {COMMA8}
+STR_NETWORK_CLIENTS                                             :{SILVER}Clients:  {WHITE}{COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}Valoda:  {WHITE}{STRING}
 STR_NETWORK_TILESET                                             :{SILVER}Tileset:  {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Map size:  {WHITE}{COMMA16}x{COMMA16}
+STR_NETWORK_MAP_SIZE                                            :{SILVER}Map size:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Server version:  {WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Servera adrese:  {WHITE}{STRING} : {NUMU16}
 STR_NETWORK_START_DATE                                          :{SILVER}Start date:  {WHITE}{DATE_SHORT}
@@ -1517,21 +1517,21 @@
 
 ##id 0x2000
 STR_2000_TOWNS                                                  :{WHITE}Pilse'tas
-STR_TOWN_LABEL_POP                                              :{WHITE}{STRING} ({COMMA32})
+STR_TOWN_LABEL_POP                                              :{WHITE}{STRING} ({COMMA})
 STR_2001                                                        :{WHITE}{STRING}
 STR_2002                                                        :{TINYFONT}{BLACK}{STRING}
 STR_2003                                                        :{TINYFONT}{WHITE}{STRING}
 STR_2004_BUILDING_MUST_BE_DEMOLISHED                            :{WHITE}Vispirms ja'demole' celtne
 STR_2005                                                        :{WHITE}{TOWN}
-STR_2006_POPULATION                                             :{BLACK}Iedzi'vota'ji: {ORANGE}{COMMA32}{BLACK}  Ma'jas: {ORANGE}{COMMA32}
+STR_2006_POPULATION                                             :{BLACK}Iedzi'vota'ji: {ORANGE}{COMMA}{BLACK}  Ma'jas: {ORANGE}{COMMA}
 STR_2007_RENAME_TOWN                                            :Pa'rsaukt pilse'tu
 STR_2008_CAN_T_RENAME_TOWN                                      :{WHITE}Nevar pa'rsaukt pilse'tu...
 STR_2009_LOCAL_AUTHORITY_REFUSES                                :{WHITE}{TOWN} viete'ja's varas iesta'des noraida s'a'du ri'ci'bu
 STR_200A_TOWN_NAMES_CLICK_ON_NAME                               :{BLACK}Pilse'tu nosaukumi - izve'lies pilse'tu lai iecentre'tu uz to skatu
 STR_200B_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Iecentre't galveno skatu uz pilse'tas atras'ana's vietu
 STR_200C_CHANGE_TOWN_NAME                                       :{BLACK}Pa'rsaukt pilse'tu
-STR_200D_PASSENGERS_LAST_MONTH_MAX                              :{BLACK}Pasaz'ieri paga'jus'aja' me'nesi': {ORANGE}{COMMA32}{BLACK}  maksima'lais skaits: {ORANGE}{COMMA32}
-STR_200E_MAIL_LAST_MONTH_MAX                                    :{BLACK}Pasts paga'jus'aja' me'nesi': {ORANGE}{COMMA32}{BLACK}  Maksima'lais apjoms: {ORANGE}{COMMA32}
+STR_200D_PASSENGERS_LAST_MONTH_MAX                              :{BLACK}Pasaz'ieri paga'jus'aja' me'nesi': {ORANGE}{COMMA}{BLACK}  maksima'lais skaits: {ORANGE}{COMMA}
+STR_200E_MAIL_LAST_MONTH_MAX                                    :{BLACK}Pasts paga'jus'aja' me'nesi': {ORANGE}{COMMA}{BLACK}  Maksima'lais apjoms: {ORANGE}{COMMA}
 STR_200F_TALL_OFFICE_BLOCK                                      :Augstceltne: ofisu ma'ja
 STR_2010_OFFICE_BLOCK                                           :Ofisu kvarta'ls
 STR_2011_SMALL_BLOCK_OF_FLATS                                   :Mazs dzi'vokl'u kvarta'ls
@@ -1605,7 +1605,7 @@
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Bribe the local authority to increase your rating, at the risk of a severe penalty if caught.{}  Cost: {CURRENCY}
 STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Traffic chaos in {TOWN}!{}{}Road rebuilding programme funded by {STRING} brings 6 months of misery to motorists!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
-STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA32})
+STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA})
 STR_2058_UNDER_CONSTRUCTION                                     :{STRING} (under construction)
 STR_2059_IGLOO                                                  :Igloo
 STR_205A_TEPEES                                                 :Tepees
@@ -1667,7 +1667,7 @@
 STR_303C_OUTSTANDING                                            :Outstanding
 ############ range for rating ends
 
-STR_303D                                                        :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA8}%)
+STR_303D                                                        :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_303E_NO_LONGER_ACCEPTS                                      :{WHITE}{STATION} no longer accepts {STRING}
 STR_303F_NO_LONGER_ACCEPTS_OR                                   :{WHITE}{STATION} no longer accepts {STRING} or {STRING}
 STR_3040_NOW_ACCEPTS                                            :{WHITE}{STATION} now accepts {STRING}
@@ -1678,7 +1678,7 @@
 STR_3045_TOO_CLOSE_TO_ANOTHER_TRUCK                             :{WHITE}Too close to another lorry station
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Must demolish bus station first
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Must demolish lorry station first
-STR_3048_STATIONS                                               :{WHITE}{STRING} - {COMMA16} Stations
+STR_3048_STATIONS                                               :{WHITE}{STRING} - {COMMA} Stations
 STR_3049_0                                                      :{YELLOW}{STATION} {STRINL 0x30D1}
 STR_304A_NONE                                                   :{YELLOW}- None -
 STR_304B_SITE_UNSUITABLE                                        :{WHITE}...site unsuitable
@@ -1735,7 +1735,7 @@
 STR_4002_SAVE                                                   :{BLACK}Save
 STR_4003_DELETE                                                 :{BLACK}Delete
 STR_4004                                                        :{STRING}, {DATE_LONG}
-STR_4005_BYTES_FREE                                             :{BLACK}{COMMA32} megabytes free
+STR_4005_BYTES_FREE                                             :{BLACK}{COMMA} megabytes free
 STR_4006_UNABLE_TO_READ_DRIVE                                   :{BLACK}Unable to read drive
 STR_4007_GAME_SAVE_FAILED                                       :{WHITE}Game Save Failed
 STR_4008_UNABLE_TO_DELETE_FILE                                  :{WHITE}Unable to delete file
@@ -1796,7 +1796,7 @@
 ############ range for requires	ends
 
 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Production last month:
-STR_482B_TRANSPORTED                                            :{YELLOW}{STRING}{BLACK} ({COMMA16}% transported)
+STR_482B_TRANSPORTED                                            :{YELLOW}{STRING}{BLACK} ({COMMA}% transported)
 STR_482C_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Centre the main view on industry location
 STR_482D_NEW_UNDER_CONSTRUCTION                                 :{BLACK}{BIGFONT}New {STRING} under construction near {TOWN}!
 STR_482E_NEW_BEING_PLANTED_NEAR                                 :{BLACK}{BIGFONT}New {STRING} being planted near {TOWN}!
@@ -1813,8 +1813,8 @@
 STR_4839_PRODUCTION_DOWN_BY_50                                  :{BLACK}{BIGFONT}{TOWN} {STRING} production down by 50%
 STR_483A_INSECT_INFESTATION_CAUSES                              :{BLACK}{BIGFONT}Insect infestation causes havoc at {TOWN} {STRING}!{}Production down by 50%
 STR_483B_CAN_ONLY_BE_POSITIONED                                 :{WHITE}...can only be positioned near edges of map
-STR_INDUSTRY_PROD_GOUP                                          :{BLACK}{BIGFONT}{STRING} production at {TOWN} {STRING} goes up by {COMMA16}%!
-STR_INDUSTRY_PROD_GODOWN                                        :{BLACK}{BIGFONT}{STRING} production at {TOWN} {STRING} goes down by {COMMA16}%!
+STR_INDUSTRY_PROD_GOUP                                          :{BLACK}{BIGFONT}{STRING} production at {TOWN} {STRING} goes up by {COMMA}%!
+STR_INDUSTRY_PROD_GODOWN                                        :{BLACK}{BIGFONT}{STRING} production at {TOWN} {STRING} goes down by {COMMA}%!
 
 ##id 0x5000
 STR_5000_TRAIN_IN_TUNNEL                                        :{WHITE}Vilciens tunelî
@@ -1877,10 +1877,10 @@
 ##id 0x6000
 STR_SV_EMPTY                                                    :
 STR_SV_UNNAMED                                                  :Unnamed{SKIP}
-STR_SV_TRAIN_NAME                                               :Vilciens {COMMA16}
-STR_SV_ROADVEH_NAME                                             :Road Vehicle {COMMA16}
-STR_SV_SHIP_NAME                                                :Ship {COMMA16}
-STR_SV_AIRCRAFT_NAME                                            :Aircraft {COMMA16}
+STR_SV_TRAIN_NAME                                               :Vilciens {COMMA}
+STR_SV_ROADVEH_NAME                                             :Road Vehicle {COMMA}
+STR_SV_SHIP_NAME                                                :Ship {COMMA}
+STR_SV_AIRCRAFT_NAME                                            :Aircraft {COMMA}
 
 STR_SV_STNAME                                                   :{STRING}
 STR_SV_STNAME_NORTH                                             :{STRING} North
@@ -1930,12 +1930,12 @@
 ############ range for difficulty levels ends
 
 ############ range for difficulty settings starts
-STR_6805_MAXIMUM_NO_COMPETITORS                                 :{LTBLUE}Maximum no. competitors: {ORANGE}{COMMA16}
+STR_6805_MAXIMUM_NO_COMPETITORS                                 :{LTBLUE}Maximum no. competitors: {ORANGE}{COMMA}
 STR_6806_COMPETITOR_START_TIME                                  :{LTBLUE}Competitor start time: {ORANGE}{STRING}
 STR_6807_NO_OF_TOWNS                                            :{LTBLUE}No. of towns: {ORANGE}{STRING}
 STR_6808_NO_OF_INDUSTRIES                                       :{LTBLUE}No. of industries: {ORANGE}{STRING}
 STR_6809_MAXIMUM_INITIAL_LOAN_000                               :{LTBLUE}Maximum initial loan: {ORANGE}{CURRENCY}
-STR_680A_INITIAL_INTEREST_RATE                                  :{LTBLUE}Initial interest rate: {ORANGE}{COMMA16}%
+STR_680A_INITIAL_INTEREST_RATE                                  :{LTBLUE}Initial interest rate: {ORANGE}{COMMA}%
 STR_680B_VEHICLE_RUNNING_COSTS                                  :{LTBLUE}Vehicle running costs: {ORANGE}{STRING}
 STR_680C_CONSTRUCTION_SPEED_OF_COMPETITOR                       :{LTBLUE}Construction speed of competitors: {ORANGE}{STRING}
 STR_680D_INTELLIGENCE_OF_COMPETITORS                            :{LTBLUE}Intelligence of competitors: {ORANGE}{STRING}
@@ -1994,7 +1994,7 @@
 ##id 0x7000
 STR_7000                                                        :
 STR_7001                                                        :{WHITE}{STRING} {BLACK}{STRING}
-STR_7002_PLAYER                                                 :(Player {COMMA16})
+STR_7002_PLAYER                                                 :(Player {COMMA})
 STR_7004_NEW_FACE                                               :{BLACK}Jauna Seja
 STR_7005_COLOR_SCHEME                                           :{BLACK}Krasas shçma
 STR_7006_COLOR_SCHEME                                           :{GOLD}Krasas shçma:
@@ -2028,7 +2028,7 @@
 STR_7022_INCOME_GRAPH                                           :{WHITE}Income Graph
 STR_CURRCOMPACT32                                               :{CURRCOMPACT}
 STR_CURRCOMPACT64                                               :{CURRCOMPACT64}
-STR_7024                                                        :{COMMA32}
+STR_7024                                                        :{COMMA}
 STR_7025_OPERATING_PROFIT_GRAPH                                 :{WHITE}Operating Profit Graph
 STR_7026_BANK_BALANCE                                           :{WHITE}Bank Balance
 STR_7027_LOAN                                                   :{WHITE}Aizdevums
@@ -2052,14 +2052,14 @@
 STR_7037_PRESIDENT                                              :{WHITE}{STRING}{}{GOLD}(Manager)
 STR_7038_INAUGURATED                                            :{GOLD}Inaugurated: {WHITE}{NUMU16}
 STR_7039_VEHICLES                                               :{GOLD}Vehicles:
-STR_703A_TRAIN                                                  :{WHITE}{COMMA16} train
-STR_703B_TRAINS                                                 :{WHITE}{COMMA16} trains
-STR_703C_ROAD_VEHICLE                                           :{WHITE}{COMMA16} road vehicle
-STR_703D_ROAD_VEHICLES                                          :{WHITE}{COMMA16} road vehicles
-STR_703E_AIRCRAFT                                               :{WHITE}{COMMA16} aircraft
-STR_703F_AIRCRAFT                                               :{WHITE}{COMMA16} aircraft
-STR_7040_SHIP                                                   :{WHITE}{COMMA16} ship
-STR_7041_SHIPS                                                  :{WHITE}{COMMA16} ships
+STR_703A_TRAIN                                                  :{WHITE}{COMMA} train
+STR_703B_TRAINS                                                 :{WHITE}{COMMA} trains
+STR_703C_ROAD_VEHICLE                                           :{WHITE}{COMMA} road vehicle
+STR_703D_ROAD_VEHICLES                                          :{WHITE}{COMMA} road vehicles
+STR_703E_AIRCRAFT                                               :{WHITE}{COMMA} aircraft
+STR_703F_AIRCRAFT                                               :{WHITE}{COMMA} aircraft
+STR_7040_SHIP                                                   :{WHITE}{COMMA} ship
+STR_7041_SHIPS                                                  :{WHITE}{COMMA} ships
 STR_7042_NONE                                                   :{WHITE}Neviens
 STR_7043_FACE_SELECTION                                         :{WHITE}Face Selection
 STR_7044_MALE                                                   :{BLACK}Viriešu
@@ -2124,8 +2124,8 @@
 STR_707A_SELL_25_SHARE_IN_THIS_COMPANY                          :{BLACK}Sell 25% share in this company
 STR_707B_CAN_T_BUY_25_SHARE_IN_THIS                             :{WHITE}Can't buy 25% share in this company...
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}Can't sell 25% share in this company...
-STR_707D_OWNED_BY                                               :{WHITE}({COMMA16}% owned by {STRING})
-STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA16}% owned by {STRING}{}   {COMMA16}% owned by {STRING})
+STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% owned by {STRING})
+STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}% owned by {STRING}{}   {COMMA}% owned by {STRING})
 STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{STRING} has been taken over by {STRING}!
 STR_7080_PROTECTED                                              :{WHITE}S'i' kompa'nija ir pa'ra'k jauna lai tirgotu akcijas...
 
@@ -2400,8 +2400,8 @@
 STR_8801_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Citizens celebrate . . .{}First train arrives at {STATION}!
 STR_8802_DETAILS                                                :{WHITE}{STRING} (Details)
 STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}Train in the way
-STR_8804                                                        :{SETX 10}{COMMA8}: {STRING}
-STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA8}: {STRING}
+STR_8804                                                        :{SETX 10}{COMMA}: {STRING}
+STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING}
 STR_8806_GO_TO                                                  :Go to {STATION}
 STR_8807_GO_TO_TRANSFER                                         :Uz {STATION} (Pa'rvest un pan'emt kravu)
 STR_8808_GO_TO_UNLOAD                                           :Uz {STATION} (Nokraut)
@@ -2427,13 +2427,13 @@
 STR_UNKNOWN_DESTINATION                                         :unknown destination
 STR_8812_EMPTY                                                  :{LTBLUE}Tukšs
 STR_8813_FROM                                                   :{LTBLUE}{CARGO} from {STATION}
-STR_8814_TRAIN_IS_WAITING_IN_DEPOT                              :{WHITE}Train {COMMA16} is waiting in depot
+STR_8814_TRAIN_IS_WAITING_IN_DEPOT                              :{WHITE}Train {COMMA} is waiting in depot
 STR_8815_NEW_VEHICLES                                           :{BLACK}New Vehicles
 STR_8816                                                        :{BLACK}-
 STR_8818_INFORMATION                                            :{BLACK}Informācija
 STR_8819_TRAIN_TOO_LONG                                         :{WHITE}Train too long
 STR_881A_TRAINS_CAN_ONLY_BE_ALTERED                             :{WHITE}Trains can only be altered when stopped inside a depot
-STR_881B_TRAINS                                                 :{WHITE}{STRING} - {COMMA16} Trains
+STR_881B_TRAINS                                                 :{WHITE}{STRING} - {COMMA} Trains
 STR_881C_NEW_RAIL_VEHICLES                                      :{WHITE}New Rail Vehicles
 STR_881D_NEW_MONORAIL_VEHICLES                                  :{WHITE}New Monorail Vehicles
 STR_881E_NEW_MAGLEV_VEHICLES                                    :{WHITE}New Maglev Vehicles
@@ -2467,8 +2467,8 @@
 STR_8839_CAN_T_SELL_RAILROAD_VEHICLE                            :{WHITE}Can't sell railway vehicle...
 STR_883A_UNABLE_TO_FIND_ROUTE_TO                                :{WHITE}Unable to find route to local depot
 STR_883B_CAN_T_STOP_START_TRAIN                                 :{WHITE}Can't stop/start train...
-STR_883C_SERVICING_INTERVAL_DAYS                                :{BLACK}Servicing interval: {LTBLUE}{COMMA16}days{BLACK}   Last service: {LTBLUE}{DATE_LONG}
-STR_SERVICING_INTERVAL_PERCENT                                  :{BLACK}Servicing interval: {LTBLUE}{COMMA16}%{BLACK}   Last service: {LTBLUE}{DATE_LONG}
+STR_883C_SERVICING_INTERVAL_DAYS                                :{BLACK}Servicing interval: {LTBLUE}{COMMA}days{BLACK}   Last service: {LTBLUE}{DATE_LONG}
+STR_SERVICING_INTERVAL_PERCENT                                  :{BLACK}Servicing interval: {LTBLUE}{COMMA}%{BLACK}   Last service: {LTBLUE}{DATE_LONG}
 STR_883D_TRAINS_CLICK_ON_TRAIN_FOR                              :{BLACK}Trains - click on train for information
 STR_883E_BUILD_NEW_TRAINS_REQUIRES                              :{BLACK}Build new trains (requires train depot)
 STR_883F_TRAINS_CLICK_ON_TRAIN_FOR                              :{BLACK}Trains - click on train for info., drag vehicle to add/remove from train
@@ -2501,12 +2501,12 @@
 STR_SERVICE_HINT                                                :{BLACK}Skip this order unless a service is needed
 STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}New {STRING} now available!
 STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
-STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Cost: {CURRENCY} Weight: {COMMA16}t{}Speed: {VELOCITY}  Power: {COMMA16}hp{}Running Cost: {CURRENCY}/yr{}Capacity: {STRING}
+STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Cost: {CURRENCY} Weight: {COMMA}t{}Speed: {VELOCITY}  Power: {COMMA}hp{}Running Cost: {CURRENCY}/yr{}Capacity: {STRING}
 STR_885C_BROKEN_DOWN                                            :{RED}Broken down
 STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Age: {LTBLUE}{STRING}{BLACK}   Running Cost: {LTBLUE}{CURRENCY}/yr
-STR_885E_WEIGHT_T_POWER_HP_MAX_SPEED                            :{BLACK}Svârs: {LTBLUE}{COMMA16}t  {BLACK}Power: {LTBLUE}{COMMA32}hp{BLACK} Max. speed: {LTBLUE}{VELOCITY}
+STR_885E_WEIGHT_T_POWER_HP_MAX_SPEED                            :{BLACK}Svârs: {LTBLUE}{COMMA}t  {BLACK}Power: {LTBLUE}{COMMA}hp{BLACK} Max. speed: {LTBLUE}{VELOCITY}
 STR_885F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Profit this year: {LTBLUE}{CURRENCY}  (last year: {CURRENCY})
-STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Reliability: {LTBLUE}{COMMA8}%  {BLACK}Breakdowns since last service: {LTBLUE}{COMMA16}
+STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Reliability: {LTBLUE}{COMMA}%  {BLACK}Breakdowns since last service: {LTBLUE}{COMMA}
 STR_8861_STOPPED                                                :{RED}Stoppets
 STR_8862_CAN_T_MAKE_TRAIN_PASS_SIGNAL                           :{WHITE}Can't make train pass signal at danger...
 STR_8863_CRASHED                                                :{RED}Crashed!
@@ -2514,7 +2514,7 @@
 STR_8865_NAME_TRAIN                                             :{WHITE}Nosaukt vilcienu
 STR_8866_CAN_T_NAME_TRAIN                                       :{WHITE}Can't name train...
 STR_8867_NAME_TRAIN                                             :{BLACK}Nosaukt vilcienu
-STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Train Crash!{}{COMMA16} die in fireball after collision
+STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Train Crash!{}{COMMA} die in fireball after collision
 STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}Can't reverse direction of train...
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Rename train vehicle type
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Can't rename train vehicle type...
@@ -2526,7 +2526,7 @@
 
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Road vehicle in the way
-STR_9001_ROAD_VEHICLES                                          :{WHITE}{STRING} - {COMMA16} Road Vehicles
+STR_9001_ROAD_VEHICLES                                          :{WHITE}{STRING} - {COMMA} Road Vehicles
 STR_9002                                                        :{WHITE}{STRING}
 STR_9003_ROAD_VEHICLE_DEPOT                                     :{WHITE}{TOWN} Road Vehicle Depot
 STR_9004_NEW_VEHICLES                                           :{BLACK}New Vehicles
@@ -2540,13 +2540,13 @@
 STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Age: {LTBLUE}{STRING}{BLACK}   Running Cost: {LTBLUE}{CURRENCY}/yr
 STR_900E_MAX_SPEED                                              :{BLACK}Max. speed: {LTBLUE}{VELOCITY}
 STR_900F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Profit this year: {LTBLUE}{CURRENCY}  (last year: {CURRENCY})
-STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Reliability: {LTBLUE}{COMMA8}%  {BLACK}Breakdowns since last service: {LTBLUE}{COMMA16}
+STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Reliability: {LTBLUE}{COMMA}%  {BLACK}Breakdowns since last service: {LTBLUE}{COMMA}
 STR_9011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Built: {LTBLUE}{NUMU16}{BLACK} Value: {LTBLUE}{CURRENCY}
 STR_9012_CAPACITY                                               :{BLACK}Capacitâte: {LTBLUE}{STRING}
 STR_9013_MUST_BE_STOPPED_INSIDE                                 :{WHITE}...must be stopped inside a road vehicle depot
 STR_9014_CAN_T_SELL_ROAD_VEHICLE                                :{WHITE}Can't sell road vehicle...
 STR_9015_CAN_T_STOP_START_ROAD_VEHICLE                          :{WHITE}Can't stop/start road vehicle...
-STR_9016_ROAD_VEHICLE_IS_WAITING                                :{WHITE}Road vehicle {COMMA16} is waiting in depot
+STR_9016_ROAD_VEHICLE_IS_WAITING                                :{WHITE}Road vehicle {COMMA} is waiting in depot
 STR_HEADING_FOR_ROAD_DEPOT                                      :{LTBLUE}Heading for {TOWN} Road Depot
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{LTBLUE}Heading for {TOWN} Road Depot, {VELOCITY}
 STR_9018_CAN_T_SEND_VEHICLE_TO_DEPOT                            :{WHITE}Can't send vehicle to depot...
@@ -2575,7 +2575,7 @@
 STR_902F_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Citizens celebrate . . .{}First bus arrives at {STATION}!
 STR_9030_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Citizens celebrate . . .{}First truck arrives at {STATION}!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Road Vehicle Crash!{}Driver dies in fireball after collision with train
-STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Road Vehicle Crash!{}{COMMA16} die in fireball after collision with train
+STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Road Vehicle Crash!{}{COMMA} die in fireball after collision with train
 STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}Can't make vehicle turn around...
 STR_9034_RENAME                                                 :{BLACK}Pârsaukt
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Rename road vehicle type
@@ -2590,7 +2590,7 @@
 STR_9802_CAN_T_BUILD_DOCK_HERE                                  :{WHITE}Can't build dock here...
 STR_9803_SHIP_DEPOT                                             :{WHITE}{TOWN} Ship Depot
 STR_9804_NEW_SHIPS                                              :{BLACK}New Ships
-STR_9805_SHIPS                                                  :{WHITE}{STRING} - {COMMA16} Kuìi
+STR_9805_SHIPS                                                  :{WHITE}{STRING} - {COMMA} Kuìi
 STR_9806_CAN_T_BUILD_SHIPS                                      :{WHITE}Can't build ships...
 STR_9807_MUST_BUILD_SHIP_DEPOT_FIRST                            :{WHITE}Must build ship depot first
 STR_9808_NEW_SHIPS                                              :{WHITE}New Ships
@@ -2605,7 +2605,7 @@
 STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Age: {LTBLUE}{STRING}{BLACK}   Running Cost: {LTBLUE}{CURRENCY}/yr
 STR_9813_MAX_SPEED                                              :{BLACK}Max. speed: {LTBLUE}{VELOCITY}
 STR_9814_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Profit this year: {LTBLUE}{CURRENCY}  (last year: {CURRENCY})
-STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Reliability: {LTBLUE}{COMMA8}%  {BLACK}Breakdowns since last service: {LTBLUE}{COMMA16}
+STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Reliability: {LTBLUE}{COMMA}%  {BLACK}Breakdowns since last service: {LTBLUE}{COMMA}
 STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Built: {LTBLUE}{NUMU16}{BLACK} Value: {LTBLUE}{CURRENCY}
 STR_9817_CAPACITY                                               :{BLACK}Capacity: {LTBLUE}{STRING}
 STR_9818_CAN_T_STOP_START_SHIP                                  :{WHITE}Can't stop/start ship...
@@ -2613,7 +2613,7 @@
 STR_981A_UNABLE_TO_FIND_LOCAL_DEPOT                             :{WHITE}Unable to find local depot
 STR_HEADING_FOR_SHIP_DEPOT                                      :{LTBLUE}Heading for {TOWN} Ship Depot
 STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{LTBLUE}Heading for {TOWN} Ship Depot, {VELOCITY}
-STR_981C_SHIP_IS_WAITING_IN_DEPOT                               :{WHITE}Ship {COMMA16} is waiting in depot
+STR_981C_SHIP_IS_WAITING_IN_DEPOT                               :{WHITE}Ship {COMMA} is waiting in depot
 STR_981D_BUILD_SHIP_DOCK                                        :{BLACK}Build ship dock
 STR_981E_BUILD_SHIP_DEPOT_FOR_BUILDING                          :{BLACK}Build ship depot (for building and servicing ships)
 STR_981F_SHIPS_CLICK_ON_SHIP_FOR                                :{BLACK}Ships - click on ship for information
@@ -2664,19 +2664,19 @@
 STR_A005_NEW_AIRCRAFT                                           :{WHITE}New Aircraft
 STR_A006_BUILD_AIRCRAFT                                         :{BLACK}Build Aircraft
 STR_A008_CAN_T_BUILD_AIRCRAFT                                   :{WHITE}Can't build aircraft...
-STR_A009_AIRCRAFT                                               :{WHITE}{STRING} - {COMMA16} Aircraft
+STR_A009_AIRCRAFT                                               :{WHITE}{STRING} - {COMMA} Aircraft
 STR_A00A                                                        :{WHITE}{STRING}
 STR_A00B_ORDERS                                                 :{WHITE}{STRING} (Orders)
 STR_A00C_DETAILS                                                :{WHITE}{STRING} (Details)
 STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Age: {LTBLUE}{STRING}{BLACK}   Running Cost: {LTBLUE}{CURRENCY}/yr
 STR_A00E_MAX_SPEED                                              :{BLACK}Max. speed: {LTBLUE}{VELOCITY}
 STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Profit this year: {LTBLUE}{CURRENCY}  (last year: {CURRENCY})
-STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Reliability: {LTBLUE}{COMMA8}%  {BLACK}Breakdowns since last service: {LTBLUE}{COMMA16}
+STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Reliability: {LTBLUE}{COMMA}%  {BLACK}Breakdowns since last service: {LTBLUE}{COMMA}
 STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Built: {LTBLUE}{NUMU16}{BLACK} Value: {LTBLUE}{CURRENCY}
 STR_A012_CAN_T_SEND_AIRCRAFT_TO                                 :{WHITE}Can't send aircraft to hangar...
 STR_HEADING_FOR_HANGAR                                          :{LTBLUE}Heading for {STATION} Hangar
 STR_HEADING_FOR_HANGAR_VEL                                      :{LTBLUE}Heading for {STATION} Hangar, {VELOCITY}
-STR_A014_AIRCRAFT_IS_WAITING_IN                                 :{WHITE}Aircraft {COMMA16} is waiting in the aircraft hangar
+STR_A014_AIRCRAFT_IS_WAITING_IN                                 :{WHITE}Aircraft {COMMA} is waiting in the aircraft hangar
 STR_A015_AIRCRAFT_IN_THE_WAY                                    :{WHITE}Aircraft in the way
 STR_A016_CAN_T_STOP_START_AIRCRAFT                              :{WHITE}Can't stop/start aircraft...
 STR_A017_AIRCRAFT_IS_IN_FLIGHT                                  :{WHITE}Aircraft is in flight
@@ -2702,14 +2702,14 @@
 STR_A02B_SHOW_AIRCRAFT_DETAILS                                  :{BLACK}Show aircraft details
 STR_A02C_NEW_AIRCRAFT_NOW_AVAILABLE                             :{BLACK}{BIGFONT}New aircraft now available!
 STR_A02D                                                        :{BLACK}{BIGFONT}{STRING}
-STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Cost: {CURRENCY} Max. Speed: {VELOCITY}{}Capacity: {COMMA16} passengers, {COMMA16} bags of mail{}Running Cost: {CURRENCY}/yr
+STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Cost: {CURRENCY} Max. Speed: {VELOCITY}{}Capacity: {COMMA} passengers, {COMMA} bags of mail{}Running Cost: {CURRENCY}/yr
 
 STR_A030_NAME_AIRCRAFT                                          :{WHITE}Name aircraft
 STR_A031_CAN_T_NAME_AIRCRAFT                                    :{WHITE}Can't name aircraft...
 STR_A032_NAME_AIRCRAFT                                          :{BLACK}Name aircraft
 STR_A033_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Citizens celebrate . . .{}First aircraft arrives at {STATION}!
-STR_A034_PLANE_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Plane Crash!{}{COMMA16} die in fireball at {STATION}
-STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Lidmaðînas avârija!{}Lidmaðînai pietrûka degviela, {COMMA16} nogalinâti!
+STR_A034_PLANE_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Plane Crash!{}{COMMA} die in fireball at {STATION}
+STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Lidmaðînas avârija!{}Lidmaðînai pietrûka degviela, {COMMA} nogalinâti!
 STR_A035_DESTINATIONS                                           :{TINYFONT}{BLACK}Destinations:
 STR_A036                                                        :{TINYFONT}{BLACK}{STATION}
 STR_A037_RENAME                                                 :{BLACK}Pârsaukt
@@ -2735,7 +2735,7 @@
 STR_B003_FACTORY_DESTROYED_IN_SUSPICIOUS                        :{BLACK}{BIGFONT}Factory destroyed in suspicious circumstances near {TOWN}!
 STR_B004_UFO_LANDS_NEAR                                         :{BLACK}{BIGFONT}'UFO' lands near {TOWN}!
 STR_B005_COAL_MINE_SUBSIDENCE_LEAVES                            :{BLACK}{BIGFONT}Coal mine subsidence leaves trail of destruction near {TOWN}!
-STR_B006_FLOOD_VEHICLE_DESTROYED                                :{BLACK}{BIGFONT}Floods!{}At least {COMMA16} missing, presumed dead after significant flooding!
+STR_B006_FLOOD_VEHICLE_DESTROYED                                :{BLACK}{BIGFONT}Floods!{}At least {COMMA} missing, presumed dead after significant flooding!
 
 STR_BRIBE_FAILED                                                :{WHITE}Your attempted bribe has been
 STR_BRIBE_FAILED_2                                              :{WHITE}discovered by a regional investigator
@@ -2745,7 +2745,7 @@
 STR_PERFORMANCE_DETAIL                                          :{WHITE}Detailed performance rating
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Detaïas
 STR_PERFORMANCE_DETAIL_AMOUNT_CURRENCY                          :{BLACK}({CURRCOMPACT}/{CURRCOMPACT})
-STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA32}/{COMMA32})
+STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA}/{COMMA})
 STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{INT32}%
 SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{INT32}
 ############ Those following lines need to be in this order!!
@@ -2780,7 +2780,7 @@
 STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID:
 
 STR_CURRENCY_WINDOW                                             :{WHITE}Custom currency
-STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Exchange rate: {ORANGE}{CURRENCY} = {POUNDSIGN} {COMMA16}
+STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Exchange rate: {ORANGE}{CURRENCY} = {POUNDSIGN} {COMMA}
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Separator:
 STR_CURRENCY_PREFIX                                             :{LTBLUE}Prefix:
 STR_CURRENCY_SUFFIX                                             :{LTBLUE}Suffikss:
@@ -2794,10 +2794,10 @@
 STR_PLANE                                                       :{BLACK}{PLANE}
 STR_SHIP                                                        :{BLACK}{SHIP}
 
-STR_SCHEDULED_TRAINS                                            :{WHITE}{STATION} - {COMMA16} Trains
-STR_SCHEDULED_ROAD_VEHICLES                                     :{WHITE}{STATION} - {COMMA16} Road Vehicles
-STR_SCHEDULED_AIRCRAFT                                          :{WHITE}{STATION} - {COMMA16} Aircraft
-STR_SCHEDULED_SHIPS                                             :{WHITE}{STATION} - {COMMA16} Kuìi
+STR_SCHEDULED_TRAINS                                            :{WHITE}{STATION} - {COMMA} Trains
+STR_SCHEDULED_ROAD_VEHICLES                                     :{WHITE}{STATION} - {COMMA} Road Vehicles
+STR_SCHEDULED_AIRCRAFT                                          :{WHITE}{STATION} - {COMMA} Aircraft
+STR_SCHEDULED_SHIPS                                             :{WHITE}{STATION} - {COMMA} Kuìi
 
 STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Show all trains which have this station on their schedule
 STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Show all road vehicles which have this station on their schedule
@@ -2819,7 +2819,7 @@
 STR_REPLACE_HELP                                                :{BLACK}ðis atïauj nomainît vienu lokomatîves tipu pret citu kad vilcieni ienâk depo
 
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
-STR_SIGN_LIST_CAPTION                                           :{WHITE}Zi'mju saraksts- {COMMA16} Zi'mes
+STR_SIGN_LIST_CAPTION                                           :{WHITE}Zi'mju saraksts- {COMMA} Zi'mes
 
 ############ Lists rail types
 
@@ -2829,16 +2829,16 @@
 
 ############ End of list of rail types
 
-STR_TINY_BLACK                                                  :{BLACK}{TINYFONT}{COMMA16}
+STR_TINY_BLACK                                                  :{BLACK}{TINYFONT}{COMMA}
 
-STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Cena: {GOLD}{CURRENCY}{BLACK} Svars: {GOLD}{COMMA16}t
-STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}A'trums: {GOLD}{VELOCITY}{BLACK}   Jauda: {GOLD}{COMMA32}zs
+STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Cena: {GOLD}{CURRENCY}{BLACK} Svars: {GOLD}{COMMA}t
+STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}A'trums: {GOLD}{VELOCITY}{BLACK}   Jauda: {GOLD}{COMMA}zs
 STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}Ekspua'tacijas izmaksas: {GOLD}{CURRENCY}/gada'
 STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Ietilpi'ba: {GOLD}{STRING} {STRING}
-STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Raz'ots: {GOLD}{NUMU16}{BLACK} Termin's': {GOLD}{COMMA16} gadi
-STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Maks.Dros'i'ba: {GOLD}{COMMA8}%
+STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Raz'ots: {GOLD}{NUMU16}{BLACK} Termin's': {GOLD}{COMMA} gadi
+STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Maks.Dros'i'ba: {GOLD}{COMMA}%
 STR_PURCHASE_INFO_COST                                          :{BLACK}Cena: {GOLD}{CURRENCY}
-STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Svars: {GOLD}{COMMA16}t  ({COMMA16}t)
+STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Svars: {GOLD}{COMMA}t  ({COMMA}t)
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Cena: {GOLD}{CURRENCY}{BLACK} A'trums: {GOLD}{VELOCITY}
-STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Ietilpi'ba: {GOLD}{COMMA16} pasaz'ieru, {COMMA16} pasta somas
-STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Motor-vagoni: {GOLD}+{COMMA16}zs{BLACK} Sva'rs: {GOLD}+{COMMA8}t
+STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Ietilpi'ba: {GOLD}{COMMA} pasaz'ieru, {COMMA} pasta somas
+STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Motor-vagoni: {GOLD}+{COMMA}zs{BLACK} Sva'rs: {GOLD}+{COMMA}t
--- a/lang/lithuanian.txt	Thu Jul 14 09:53:52 2005 +0000
+++ b/lang/lithuanian.txt	Thu Jul 14 15:10:20 2005 +0000
@@ -82,69 +82,69 @@
 STR_004C_PLASTIC                                                :Plastic
 STR_004D_FIZZY_DRINK                                            :Gaiviuju gerimu
 STR_004E                                                        :
-STR_004F_PASSENGER                                              :{COMMA16} keleiviai
-STR_0050_TON_OF_COAL                                            :{COMMA16} tonu anglies
-STR_0051_BAG_OF_MAIL                                            :{COMMA16} pasto maisu
+STR_004F_PASSENGER                                              :{COMMA} keleiviai
+STR_0050_TON_OF_COAL                                            :{COMMA} tonu anglies
+STR_0051_BAG_OF_MAIL                                            :{COMMA} pasto maisu
 STR_0052_OF_OIL                                                 :{VOLUME} naftos
-STR_0053_ITEM_OF_LIVESTOCK                                      :{COMMA16} galvijas
-STR_0054_CRATE_OF_GOODS                                         :{COMMA16} prekiu deze
-STR_0055_TON_OF_GRAIN                                           :{COMMA16} tonu grudu
-STR_0056_TON_OF_WOOD                                            :{COMMA16} tonu medienos
-STR_0057_TON_OF_IRON_ORE                                        :{COMMA16} tonu gelezies rudos
-STR_0058_TON_OF_STEEL                                           :{COMMA16} tonu plieno
-STR_0059_BAG_OF_VALUABLES                                       :{COMMA16} bag of valuables
-STR_005A_TON_OF_COPPER_ORE                                      :{COMMA16} tonu vario rudos
-STR_005B_TON_OF_MAIZE                                           :{COMMA16} tonu kukuruzu
-STR_005C_TON_OF_FRUIT                                           :{COMMA16} tonu vaisiu
-STR_005D_BAG_OF_DIAMONDS                                        :{COMMA16} deziu deimantu
-STR_005E_TON_OF_FOOD                                            :{COMMA16} tonu maisto
-STR_005F_TON_OF_PAPER                                           :{COMMA16} tonu popieriaus
-STR_0060_BAG_OF_GOLD                                            :{COMMA16} aukso kapsu
+STR_0053_ITEM_OF_LIVESTOCK                                      :{COMMA} galvijas
+STR_0054_CRATE_OF_GOODS                                         :{COMMA} prekiu deze
+STR_0055_TON_OF_GRAIN                                           :{COMMA} tonu grudu
+STR_0056_TON_OF_WOOD                                            :{COMMA} tonu medienos
+STR_0057_TON_OF_IRON_ORE                                        :{COMMA} tonu gelezies rudos
+STR_0058_TON_OF_STEEL                                           :{COMMA} tonu plieno
+STR_0059_BAG_OF_VALUABLES                                       :{COMMA} bag of valuables
+STR_005A_TON_OF_COPPER_ORE                                      :{COMMA} tonu vario rudos
+STR_005B_TON_OF_MAIZE                                           :{COMMA} tonu kukuruzu
+STR_005C_TON_OF_FRUIT                                           :{COMMA} tonu vaisiu
+STR_005D_BAG_OF_DIAMONDS                                        :{COMMA} deziu deimantu
+STR_005E_TON_OF_FOOD                                            :{COMMA} tonu maisto
+STR_005F_TON_OF_PAPER                                           :{COMMA} tonu popieriaus
+STR_0060_BAG_OF_GOLD                                            :{COMMA} aukso kapsu
 STR_0061_OF_WATER                                               :{VOLUME} vandens
-STR_0062_TON_OF_WHEAT                                           :{COMMA16} tonu kvieciu
+STR_0062_TON_OF_WHEAT                                           :{COMMA} tonu kvieciu
 STR_0063_OF_RUBBER                                              :{VOLUME} kauciuko
-STR_0064_TON_OF_SUGAR                                           :{COMMA16} tonu cukraus
-STR_0065_TOY                                                    :{COMMA16} zaislu
-STR_0066_BAG_OF_CANDY                                           :{COMMA16} saldumynu krepseliu
+STR_0064_TON_OF_SUGAR                                           :{COMMA} tonu cukraus
+STR_0065_TOY                                                    :{COMMA} zaislu
+STR_0066_BAG_OF_CANDY                                           :{COMMA} saldumynu krepseliu
 STR_0067_OF_COLA                                                :{VOLUME} Coca-Colos
-STR_0068_TON_OF_COTTON_CANDY                                    :{COMMA16} tonu cukraus vatos
-STR_0069_BUBBLE                                                 :{COMMA16} burbulu
-STR_006A_TON_OF_TOFFEE                                          :{COMMA16} tonu karameles
-STR_006B_BATTERY                                                :{COMMA16} bateriju
+STR_0068_TON_OF_COTTON_CANDY                                    :{COMMA} tonu cukraus vatos
+STR_0069_BUBBLE                                                 :{COMMA} burbulu
+STR_006A_TON_OF_TOFFEE                                          :{COMMA} tonu karameles
+STR_006B_BATTERY                                                :{COMMA} bateriju
 STR_006C_OF_PLASTIC                                             :{VOLUME} plastmases
-STR_006D_FIZZY_DRINK                                            :{COMMA16} gaiviuju gerimu
+STR_006D_FIZZY_DRINK                                            :{COMMA} gaiviuju gerimu
 STR_006E                                                        :
-STR_006F_PASSENGERS                                             :{COMMA16} keleiviu
-STR_0070_TONS_OF_COAL                                           :{COMMA16} tonu anglies
-STR_0071_BAGS_OF_MAIL                                           :{COMMA16} pasto maisu
+STR_006F_PASSENGERS                                             :{COMMA} keleiviu
+STR_0070_TONS_OF_COAL                                           :{COMMA} tonu anglies
+STR_0071_BAGS_OF_MAIL                                           :{COMMA} pasto maisu
 STR_0072_OF_OIL                                                 :{VOLUME} naftos
-STR_0073_ITEMS_OF_LIVESTOCK                                     :{COMMA16} galviju
-STR_0074_CRATES_OF_GOODS                                        :{COMMA16} prekiu deziu
-STR_0075_TONS_OF_GRAIN                                          :{COMMA16} tonu grudu
-STR_0076_TONS_OF_WOOD                                           :{COMMA16} tonu medienos
-STR_0077_TONS_OF_IRON_ORE                                       :{COMMA16} tonu gelezies rudos
-STR_0078_TONS_OF_STEEL                                          :{COMMA16} tonu plieno
-STR_0079_BAGS_OF_VALUABLES                                      :{COMMA16} brangenybiu maisu
-STR_007A_TONS_OF_COPPER_ORE                                     :{COMMA16} tonu vario rudos
-STR_007B_TONS_OF_MAIZE                                          :{COMMA16} tonu kukuruzu
-STR_007C_TONS_OF_FRUIT                                          :{COMMA16} tonu vaisiu
-STR_007D_BAGS_OF_DIAMONDS                                       :{COMMA16} deimantu deziu
-STR_007E_TONS_OF_FOOD                                           :{COMMA16} tonu maisto
-STR_007F_TONS_OF_PAPER                                          :{COMMA16} tonu popieriaus
-STR_0080_BAGS_OF_GOLD                                           :{COMMA16} aukso kapsu
+STR_0073_ITEMS_OF_LIVESTOCK                                     :{COMMA} galviju
+STR_0074_CRATES_OF_GOODS                                        :{COMMA} prekiu deziu
+STR_0075_TONS_OF_GRAIN                                          :{COMMA} tonu grudu
+STR_0076_TONS_OF_WOOD                                           :{COMMA} tonu medienos
+STR_0077_TONS_OF_IRON_ORE                                       :{COMMA} tonu gelezies rudos
+STR_0078_TONS_OF_STEEL                                          :{COMMA} tonu plieno
+STR_0079_BAGS_OF_VALUABLES                                      :{COMMA} brangenybiu maisu
+STR_007A_TONS_OF_COPPER_ORE                                     :{COMMA} tonu vario rudos
+STR_007B_TONS_OF_MAIZE                                          :{COMMA} tonu kukuruzu
+STR_007C_TONS_OF_FRUIT                                          :{COMMA} tonu vaisiu
+STR_007D_BAGS_OF_DIAMONDS                                       :{COMMA} deimantu deziu
+STR_007E_TONS_OF_FOOD                                           :{COMMA} tonu maisto
+STR_007F_TONS_OF_PAPER                                          :{COMMA} tonu popieriaus
+STR_0080_BAGS_OF_GOLD                                           :{COMMA} aukso kapsu
 STR_0081_OF_WATER                                               :{VOLUME} vandens
-STR_0082_TONS_OF_WHEAT                                          :{COMMA16} tonu kvieciu
+STR_0082_TONS_OF_WHEAT                                          :{COMMA} tonu kvieciu
 STR_0083_OF_RUBBER                                              :{VOLUME} kauciuko
-STR_0084_TONS_OF_SUGAR                                          :{COMMA16} tonu cukraus
-STR_0085_TOYS                                                   :{COMMA16} zaislu
-STR_0086_BAGS_OF_CANDY                                          :{COMMA16} krepseliu saldumynu
+STR_0084_TONS_OF_SUGAR                                          :{COMMA} tonu cukraus
+STR_0085_TOYS                                                   :{COMMA} zaislu
+STR_0086_BAGS_OF_CANDY                                          :{COMMA} krepseliu saldumynu
 STR_0087_OF_COLA                                                :{VOLUME} Coca-Colos
-STR_0088_TONS_OF_COTTON_CANDY                                   :{COMMA16} tonu cukraus vatos
-STR_0089_BUBBLES                                                :{COMMA16} burbulu
-STR_008A_TONS_OF_TOFFEE                                         :{COMMA16} tonu karameles
-STR_008B_BATTERIES                                              :{COMMA16} bateriju
+STR_0088_TONS_OF_COTTON_CANDY                                   :{COMMA} tonu cukraus vatos
+STR_0089_BUBBLES                                                :{COMMA} burbulu
+STR_008A_TONS_OF_TOFFEE                                         :{COMMA} tonu karameles
+STR_008B_BATTERIES                                              :{COMMA} bateriju
 STR_008C_OF_PLASTIC                                             :{VOLUME} plastmases
-STR_008D_FIZZY_DRINKS                                           :{COMMA16} gaiviuju gerimu
+STR_008D_FIZZY_DRINKS                                           :{COMMA} gaiviuju gerimu
 STR_008E                                                        :
 STR_008F_PS                                                     :{TINYFONT}PS
 STR_0090_CL                                                     :{TINYFONT}CL
@@ -219,8 +219,8 @@
 STR_00DF_GREY                                                   :Pilka
 STR_00E0_WHITE                                                  :Balta
 STR_00E1_TOO_MANY_VEHICLES_IN_GAME                              :{WHITE}Per daug transporto priemoniu zaidime
-STR_00E2                                                        :{BLACK}{COMMA16}
-STR_00E3                                                        :{RED}{COMMA16}
+STR_00E2                                                        :{BLACK}{COMMA}
+STR_00E3                                                        :{RED}{COMMA}
 STR_00E4_LOCATION                                               :{BLACK}Vieta
 STR_00E5_CONTOURS                                               :Konturai
 STR_00E6_VEHICLES                                               :Transporto priemones
@@ -441,18 +441,18 @@
 STR_0198_PROFIT_THIS_YEAR_LAST_YEAR                             :{TINYFONT}{BLACK}Pelnas siais metais: {CURRENCY} (praeitais metais: {CURRENCY})
 
 ############ range for service numbers starts
-STR_0199_YEAR                                                   :{COMMA16} metai ({COMMA16})
-STR_019A_YEARS                                                  :{COMMA16} metai ({COMMA16})
-STR_019B_YEARS                                                  :{RED}{COMMA16} metai ({COMMA16})
+STR_0199_YEAR                                                   :{COMMA} metai ({COMMA})
+STR_019A_YEARS                                                  :{COMMA} metai ({COMMA})
+STR_019B_YEARS                                                  :{RED}{COMMA} metai ({COMMA})
 ############ range for service numbers ends
 
 STR_019C_ROAD_VEHICLE                                           :Automobilis
 STR_019D_AIRCRAFT                                               :Lektuvas
 STR_019E_SHIP                                                   :Laivas
 STR_019F_TRAIN                                                  :Traukinys
-STR_01A0_IS_GETTING_OLD                                         :{WHITE}{STRING} {COMMA16} sensta
-STR_01A1_IS_GETTING_VERY_OLD                                    :{WHITE}{STRING} {COMMA16} labai suseno
-STR_01A2_IS_GETTING_VERY_OLD_AND                                :{WHITE}{STRING} {COMMA16} labai suseno ir butinai turi buti pakeistas
+STR_01A0_IS_GETTING_OLD                                         :{WHITE}{STRING} {COMMA} sensta
+STR_01A1_IS_GETTING_VERY_OLD                                    :{WHITE}{STRING} {COMMA} labai suseno
+STR_01A2_IS_GETTING_VERY_OLD_AND                                :{WHITE}{STRING} {COMMA} labai suseno ir butinai turi buti pakeistas
 STR_01A3_LAND_AREA_INFORMATION                                  :{WHITE}Informacija apie zemes plota
 STR_01A4_COST_TO_CLEAR_N_A                                      :{BLACK}Kaina isvalyti: {LTBLUE}N/A
 STR_01A5_COST_TO_CLEAR                                          :{BLACK}Kaina isvalyti: {LTBLUE}{CURRENCY}
@@ -497,7 +497,7 @@
 STR_01CA_31ST                                                   :31-a
 ############ range for days	ends
 
-STR_01CB                                                        :{TINYFONT}{COMMA16}
+STR_01CB                                                        :{TINYFONT}{COMMA}
 STR_01CC_TOGGLE_LARGE_SMALL_MAP                                 :{BLACK}Pakeisti dideli/vidutini/maza zemelapio dydi
 STR_01CD_SELECT_TUTORIAL_DEMONSTRATION                          :{WHITE}Pasirink Pavyzdi/Demonstracija
 
@@ -509,7 +509,7 @@
 STR_CARGO_ACCEPTED_5                                            :{BLACK}Krovinys priimamas: {LTBLUE}{STRING}, {STRING}, {STRING}, {STRING}, {STRING}
 ############ range for cargo acecpted ends
 
-STR_01D1_8                                                      :({COMMA8}/8 {STRING})
+STR_01D1_8                                                      :({COMMA}/8 {STRING})
 STR_01D2_JAZZ_JUKEBOX                                           :{WHITE}Jazz Jukebox
 STR_01D3_SOUND_MUSIC                                            :Garsas/muzika
 STR_01D4_SHOW_SOUND_MUSIC_WINDOW                                :{BLACK}Rodyti garso/muzikos nustatymu langa
@@ -528,16 +528,16 @@
 STR_01E1_START_PLAYING_MUSIC                                    :{BLACK}Groti muzika
 STR_01E2_DRAG_SLIDERS_TO_SET_MUSIC                              :{BLACK}Tempk uz slankiklio, jei nori nustatyti muzikos ir efektu garsuma
 STR_01E3                                                        :{DKGREEN}{TINYFONT}--
-STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA8}
-STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA8}
+STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA}
+STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA}
 STR_01E6                                                        :{DKGREEN}{TINYFONT}------
 STR_01E7                                                        :{DKGREEN}{TINYFONT}"{STRING}"
 STR_01E8_TRACK_XTITLE                                           :{BLACK}{TINYFONT}Takelis{SETX 88}Pavadinimas
 STR_01E9_SHUFFLE                                                :{TINYFONT}Atsitiktinis
 STR_01EA_PROGRAM                                                :{TINYFONT}{BLACK}Programa
 STR_01EB_MUSIC_PROGRAM_SELECTION                                :{WHITE}Muzikos programos pasirinkimas
-STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA16} "{STRING}"
-STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA16}   "{STRING}"
+STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} "{STRING}"
+STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA}   "{STRING}"
 STR_01EE_TRACK_INDEX                                            :{TINYFONT}{BLACK}Takelio numeris
 STR_01EF_PROGRAM                                                :{TINYFONT}{BLACK}Programa - '{STRING}'
 STR_01F0_CLEAR                                                  :{TINYFONT}{BLACK}Isvalyti
@@ -577,7 +577,7 @@
 STR_0210_TOO_FAR_FROM_PREVIOUS_DESTINATIO                       :{WHITE}...per toli nuo pries tai buvusio keliones tikslo
 STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Geriausios kompanijos, kurios pasieke {NUMU16}{}({STRING} lygi)
 STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Kompaniju Lygos lentele {NUMU16}
-STR_0212                                                        :{BIGFONT}{COMMA16}.
+STR_0212                                                        :{BIGFONT}{COMMA}.
 STR_0213_BUSINESSMAN                                            :Biznierius
 STR_0214_ENTREPRENEUR                                           :Verslininkas
 STR_0215_INDUSTRIALIST                                          :Fabrikantas
@@ -586,12 +586,12 @@
 STR_0218_MOGUL                                                  :Didziausias magnatas
 STR_0219_TYCOON_OF_THE_CENTURY                                  :Amziaus magnatas
 STR_HIGHSCORE_NAME                                              :{BIGFONT}{STRING}, {STRING}
-STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA16})
+STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA})
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{STRING} achieves '{STRING}' status!
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{STRING} of {STRING} achieves '{STRING}' status!
 STR_021D                                                        :{BLACK}
 STR_021E                                                        :{WHITE}
-STR_021F                                                        :{BLUE}{COMMA16}
+STR_021F                                                        :{BLUE}{COMMA}
 STR_0220_CREATE_SCENARIO                                        :{BLACK}Sukurti scenariju
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Scenarijaus Redaktorius
@@ -786,8 +786,8 @@
 STR_EXTRA_VIEW_PORT                                             :Papildomas perziuros langas
 STR_SIGN_LIST                                                   :Zenklu sarasas
 STR_02DF_TOWN_DIRECTORY                                         :Miestu sarasas
-STR_TOWN_POPULATION                                             :{BLACK}Pasaulio populiacija: {COMMA32}
-STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Perziuros langas {COMMA16}
+STR_TOWN_POPULATION                                             :{BLACK}Pasaulio populiacija: {COMMA}
+STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Perziuros langas {COMMA}
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN                                :{BLACK}Kopijuoti i perziuros langa
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT                             :{BLACK}Kopijuoti globaline padeti i si perziuros langa
 STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW                                :{BLACK}Ikelti is perziuros lango
@@ -957,34 +957,34 @@
 STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Uzduociu saraso kopijuoti negalima...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Bendru uzduociu pabaiga - -
 
-STR_TRAIN_IS_LOST                                               :{WHITE}Traukinys {COMMA16} pasimete.
-STR_TRAIN_IS_UNPROFITABLE                                       :{WHITE}Traukinio {COMMA16} pelnas praeitais metais buvo {CURRENCY}
+STR_TRAIN_IS_LOST                                               :{WHITE}Traukinys {COMMA} pasimete.
+STR_TRAIN_IS_UNPROFITABLE                                       :{WHITE}Traukinio {COMMA} pelnas praeitais metais buvo {CURRENCY}
 STR_EURO_INTRODUCE                                              :{BLACK}{BIGFONT}Bendras Europos sajungos piniginis vienetas - Euras!{}{}Nuo siol Euras tampa pagrindine valiuta kasdieniniuose atsiskaitymuose!
 
 # Start of order review system.
 # DON'T ADD OR REMOVE LINES HERE
-STR_TRAIN_HAS_TOO_FEW_ORDERS                                    :{WHITE}Traukinys {COMMA16} turi per mazai uzduociu
-STR_TRAIN_HAS_VOID_ORDER                                        :{WHITE}Traukinys {COMMA16} neturi uzduociu
-STR_TRAIN_HAS_DUPLICATE_ENTRY                                   :{WHITE}Traukinys {COMMA16} turi kelias vienodas uzduotis
-STR_TRAIN_HAS_INVALID_ENTRY                                     :{WHITE}Traukinio {COMMA16} uzduociu sarase yra netinkamu stoteliu
-STR_ROADVEHICLE_HAS_TOO_FEW_ORDERS                              :{WHITE}Automobilis {COMMA16} turi per mazai uzduociu
-STR_ROADVEHICLE_HAS_VOID_ORDER                                  :{WHITE}Automobilis {COMMA16} neturi uzduociu
-STR_ROADVEHICLE_HAS_DUPLICATE_ENTRY                             :{WHITE}Automobilis {COMMA16} turi kelias vienodas uzduotis
-STR_ROADVEHICLE_HAS_INVALID_ENTRY                               :{WHITE}Automobilio {COMMA16} uzduociu sarase yra netinkamu stoteliu
-STR_SHIP_HAS_TOO_FEW_ORDERS                                     :{WHITE}Laivas {COMMA16} turi per mazai uzduociu
-STR_SHIP_HAS_VOID_ORDER                                         :{WHITE}Laivas {COMMA16} neturi uzduociu
-STR_SHIP_HAS_DUPLICATE_ENTRY                                    :{WHITE}Laivas {COMMA16} turi kelias vienodas uzduotis
-STR_SHIP_HAS_INVALID_ENTRY                                      :{WHITE}Laivo {COMMA16} uzduociu sarase yra netinkamu stoteliu
-STR_AIRCRAFT_HAS_TOO_FEW_ORDERS                                 :{WHITE}Lektuvas {COMMA16} turi per mazai uzduociu
-STR_AIRCRAFT_HAS_VOID_ORDER                                     :{WHITE}Lektuvas {COMMA16} neturi uzduociu
-STR_AIRCRAFT_HAS_DUPLICATE_ENTRY                                :{WHITE}Lektuvas {COMMA16} turi kelias vienodas uzduotis
-STR_AIRCRAFT_HAS_INVALID_ENTRY                                  :{WHITE}Lektuvo {COMMA16} uzduociu sarase yra netinkamu stoteliu
+STR_TRAIN_HAS_TOO_FEW_ORDERS                                    :{WHITE}Traukinys {COMMA} turi per mazai uzduociu
+STR_TRAIN_HAS_VOID_ORDER                                        :{WHITE}Traukinys {COMMA} neturi uzduociu
+STR_TRAIN_HAS_DUPLICATE_ENTRY                                   :{WHITE}Traukinys {COMMA} turi kelias vienodas uzduotis
+STR_TRAIN_HAS_INVALID_ENTRY                                     :{WHITE}Traukinio {COMMA} uzduociu sarase yra netinkamu stoteliu
+STR_ROADVEHICLE_HAS_TOO_FEW_ORDERS                              :{WHITE}Automobilis {COMMA} turi per mazai uzduociu
+STR_ROADVEHICLE_HAS_VOID_ORDER                                  :{WHITE}Automobilis {COMMA} neturi uzduociu
+STR_ROADVEHICLE_HAS_DUPLICATE_ENTRY                             :{WHITE}Automobilis {COMMA} turi kelias vienodas uzduotis
+STR_ROADVEHICLE_HAS_INVALID_ENTRY                               :{WHITE}Automobilio {COMMA} uzduociu sarase yra netinkamu stoteliu
+STR_SHIP_HAS_TOO_FEW_ORDERS                                     :{WHITE}Laivas {COMMA} turi per mazai uzduociu
+STR_SHIP_HAS_VOID_ORDER                                         :{WHITE}Laivas {COMMA} neturi uzduociu
+STR_SHIP_HAS_DUPLICATE_ENTRY                                    :{WHITE}Laivas {COMMA} turi kelias vienodas uzduotis
+STR_SHIP_HAS_INVALID_ENTRY                                      :{WHITE}Laivo {COMMA} uzduociu sarase yra netinkamu stoteliu
+STR_AIRCRAFT_HAS_TOO_FEW_ORDERS                                 :{WHITE}Lektuvas {COMMA} turi per mazai uzduociu
+STR_AIRCRAFT_HAS_VOID_ORDER                                     :{WHITE}Lektuvas {COMMA} neturi uzduociu
+STR_AIRCRAFT_HAS_DUPLICATE_ENTRY                                :{WHITE}Lektuvas {COMMA} turi kelias vienodas uzduotis
+STR_AIRCRAFT_HAS_INVALID_ENTRY                                  :{WHITE}Lektuvo {COMMA} uzduociu sarase yra netinkamu stoteliu
 # end of order system
 
-STR_TRAIN_AUTORENEW_FAILED                                      :{WHITE}Traukinio {COMMA16} automatiskai atnaujinti nepavyko (pinigu limitas)
-STR_ROADVEHICLE_AUTORENEW_FAILED                                :{WHITE}Automobilio {COMMA16} automatiskai atnaujinti nepavyko (pinigu limitas)
-STR_SHIP_AUTORENEW_FAILED                                       :{WHITE}Laivo {COMMA16} automatinis atnaujimimas nepavyko (pinigu limitas)
-STR_AIRCRAFT_AUTORENEW_FAILED                                   :{WHITE}Lektuvo {COMMA16} automatinis atnaujimimas nepavyko (pinigu limitas)
+STR_TRAIN_AUTORENEW_FAILED                                      :{WHITE}Traukinio {COMMA} automatiskai atnaujinti nepavyko (pinigu limitas)
+STR_ROADVEHICLE_AUTORENEW_FAILED                                :{WHITE}Automobilio {COMMA} automatiskai atnaujinti nepavyko (pinigu limitas)
+STR_SHIP_AUTORENEW_FAILED                                       :{WHITE}Laivo {COMMA} automatinis atnaujimimas nepavyko (pinigu limitas)
+STR_AIRCRAFT_AUTORENEW_FAILED                                   :{WHITE}Lektuvo {COMMA} automatinis atnaujimimas nepavyko (pinigu limitas)
 
 STR_CONFIG_PATCHES                                              :{BLACK}Nustatymu konfiguravimas
 STR_CONFIG_PATCHES_TIP                                          :{BLACK}Konfiguruok nustatymus
@@ -1099,7 +1099,7 @@
 STR_CHEATS_TIP                                                  :{BLACK}Laukeliai rodo ar jus naudojote si triuka pries tai
 STR_CHEATS_WARNING                                              :{BLACK}Demesio! Tu bandai isduoti vargsus savo varzovus. Tai bus tavo geda visiems laikams ir niekada neuzmirsta.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Padauginti pinigu {CURRENCY64}
-STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Zaisti uz zaideja: {ORANGE}{COMMA16}
+STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Zaisti uz zaideja: {ORANGE}{COMMA}
 STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Magiskas buldozeris (pasalina gamyklas ir kt.): {ORANGE}{STRING}
 STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Tuneliai gali susikirsti: {ORANGE}{STRING}
 STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Galima statyti pauzes rezime: {ORANGE}{STRING}
@@ -1115,7 +1115,7 @@
 STR_GO_NON_STOP_TO_WAYPOINT                                     :Vaziuoti be sustojimo per {WAYPOINT}
 
 STR_WAYPOINTNAME_CITY                                           :Kontroles punktas {TOWN}
-STR_WAYPOINTNAME_CITY_SERIAL                                    :{TOWN} kontroles punktas#{COMMA16}
+STR_WAYPOINTNAME_CITY_SERIAL                                    :{TOWN} kontroles punktas#{COMMA}
 STR_LANDINFO_WAYPOINT                                           :Kontroles punktas
 
 STR_WAYPOINT                                                    :{WHITE}Kontroles punktas
@@ -1198,8 +1198,8 @@
 STR_CONSTRUCT_SUGAR_MINE_TIP                                    :{BLACK}Statyti cukraus kasykla
 
 STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Gamyklos
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}){YELLOW} ({COMMA16}% transportuota)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}/{STRING}){YELLOW} ({COMMA16}%/{COMMA16}% transportuota)
+STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}){YELLOW} ({COMMA}% transportuota)
+STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}/{STRING}){YELLOW} ({COMMA}%/{COMMA}% transportuota)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{TOWN} {STRING}
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...per arti kitos gamyklos
@@ -1239,15 +1239,15 @@
 STR_NETWORK_ADD_SERVER_TIP                                      :{BLACK}Prideda serveri i sarasa, kuris tikrinamas ieskant zaidimu
 STR_NETWORK_ENTER_IP                                            :{BLACK}Ivesk adresa (IP)
 
-STR_NETWORK_CLIENTS_ONLINE                                      :{BLACK}{COMMA16}/{COMMA16}
+STR_NETWORK_CLIENTS_ONLINE                                      :{BLACK}{COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Zaidejai
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Zaidzia / maksimaliai zaideju
 STR_NETWORK_GAME_INFO                                           :{SILVER}Zaidimo informacija
 STR_ORANGE                                                      :{ORANGE}{STRING}
-STR_NETWORK_CLIENTS                                             :{SILVER}Zaidejai:  {WHITE}{COMMA8} / {COMMA8}
+STR_NETWORK_CLIENTS                                             :{SILVER}Zaidejai:  {WHITE}{COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}Kalba:  {WHITE}{STRING}
 STR_NETWORK_TILESET                                             :{SILVER}Tileset:  {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Map size:  {WHITE}{COMMA16}x{COMMA16}
+STR_NETWORK_MAP_SIZE                                            :{SILVER}Map size:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Serverio versija:  {WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Serverio adresas:  {WHITE}{STRING} : {NUMU16}
 STR_NETWORK_START_DATE                                          :{SILVER}Zaidimo pradzia:  {WHITE}{DATE_SHORT}
@@ -1509,21 +1509,21 @@
 
 ##id 0x2000
 STR_2000_TOWNS                                                  :{WHITE}Miestai
-STR_TOWN_LABEL_POP                                              :{WHITE}{STRING} ({COMMA32})
+STR_TOWN_LABEL_POP                                              :{WHITE}{STRING} ({COMMA})
 STR_2001                                                        :{WHITE}{STRING}
 STR_2002                                                        :{TINYFONT}{BLACK}{STRING}
 STR_2003                                                        :{TINYFONT}{WHITE}{STRING}
 STR_2004_BUILDING_MUST_BE_DEMOLISHED                            :{WHITE}Pirmiau turi butu nugriautas pastatas
 STR_2005                                                        :{WHITE}{TOWN}
-STR_2006_POPULATION                                             :{BLACK}Populiacija: {ORANGE}{COMMA32}{BLACK}  Namu skaicius: {ORANGE}{COMMA32}
+STR_2006_POPULATION                                             :{BLACK}Populiacija: {ORANGE}{COMMA}{BLACK}  Namu skaicius: {ORANGE}{COMMA}
 STR_2007_RENAME_TOWN                                            :Pervardinti miesta
 STR_2008_CAN_T_RENAME_TOWN                                      :{WHITE}Negalima pervardinti miesto...
 STR_2009_LOCAL_AUTHORITY_REFUSES                                :{WHITE}{TOWN} vietine valdzia neleidzia
 STR_200A_TOWN_NAMES_CLICK_ON_NAME                               :{BLACK}Paspausk ant pavavinimo, kad parodyti ekrano centre
 STR_200B_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Rodyti miesta ekrano centre
 STR_200C_CHANGE_TOWN_NAME                                       :{BLACK}Keisti miesto varda
-STR_200D_PASSENGERS_LAST_MONTH_MAX                              :{BLACK}Keleiviu skaicius praeita menesi: {ORANGE}{COMMA32}{BLACK}  Maks.: {ORANGE}{COMMA32}
-STR_200E_MAIL_LAST_MONTH_MAX                                    :{BLACK}Pasto siuntu praejusi menesi: {ORANGE}{COMMA32}{BLACK}  Maks.: {ORANGE}{COMMA32}
+STR_200D_PASSENGERS_LAST_MONTH_MAX                              :{BLACK}Keleiviu skaicius praeita menesi: {ORANGE}{COMMA}{BLACK}  Maks.: {ORANGE}{COMMA}
+STR_200E_MAIL_LAST_MONTH_MAX                                    :{BLACK}Pasto siuntu praejusi menesi: {ORANGE}{COMMA}{BLACK}  Maks.: {ORANGE}{COMMA}
 STR_200F_TALL_OFFICE_BLOCK                                      :Aukstas biuru pastatas
 STR_2010_OFFICE_BLOCK                                           :Biuru kompleksas
 STR_2011_SMALL_BLOCK_OF_FLATS                                   :Nedidelis daugiabutis
@@ -1597,7 +1597,7 @@
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Bribe the local authority to increase your rating, at the risk of a severe penalty if caught.{}  Cost: {CURRENCY}
 STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Eismo chaosas {TOWN}!{}{}Keliu rekonstrukcija, finansuojama {STRING}, sukels 6 menesiu chaosa keliuose!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
-STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA32})
+STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA})
 STR_2058_UNDER_CONSTRUCTION                                     :{STRING} (under construction)
 STR_2059_IGLOO                                                  :Igloo
 STR_205A_TEPEES                                                 :Tepees
@@ -1659,7 +1659,7 @@
 STR_303C_OUTSTANDING                                            :Nuostabus
 ############ range for rating ends
 
-STR_303D                                                        :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA8}%)
+STR_303D                                                        :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_303E_NO_LONGER_ACCEPTS                                      :{WHITE}{STATION} daugiau nepriima {STRING}
 STR_303F_NO_LONGER_ACCEPTS_OR                                   :{WHITE}{STATION} daugiau nepriima {STRING} arba {STRING}
 STR_3040_NOW_ACCEPTS                                            :{WHITE}{STATION} jau priima {STRING}
@@ -1670,7 +1670,7 @@
 STR_3045_TOO_CLOSE_TO_ANOTHER_TRUCK                             :{WHITE}Per arti kitos sunkvezimiu pakrovimo aiksteles
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Pirmiausia turi nugriauti autobusu stotele
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Pirmiausia turi nugriauti sunkvezimiu pakrovimo aikstele
-STR_3048_STATIONS                                               :{WHITE}{STRING} - {COMMA16} Stoteles
+STR_3048_STATIONS                                               :{WHITE}{STRING} - {COMMA} Stoteles
 STR_3049_0                                                      :{YELLOW}{STATION} {STRINL 0x30D1}
 STR_304A_NONE                                                   :{YELLOW}- Nieko -
 STR_304B_SITE_UNSUITABLE                                        :{WHITE}...netinkama vieta
@@ -1726,7 +1726,7 @@
 STR_4002_SAVE                                                   :{BLACK}Issaugoti
 STR_4003_DELETE                                                 :{BLACK}Trinti
 STR_4004                                                        :{STRING}, {DATE_LONG}
-STR_4005_BYTES_FREE                                             :{BLACK}{COMMA32} Mb laisva
+STR_4005_BYTES_FREE                                             :{BLACK}{COMMA} Mb laisva
 STR_4006_UNABLE_TO_READ_DRIVE                                   :{BLACK}Negali pasiekti disko
 STR_4007_GAME_SAVE_FAILED                                       :{WHITE}Zaidimo issaugoti nepavyko
 STR_4008_UNABLE_TO_DELETE_FILE                                  :{WHITE}Failo istrinti nepavyko
@@ -1787,7 +1787,7 @@
 ############ range for requires	ends
 
 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Progukcija praeita menesi:
-STR_482B_TRANSPORTED                                            :{YELLOW}{STRING}{BLACK} ({COMMA16}% transportuota)
+STR_482B_TRANSPORTED                                            :{YELLOW}{STRING}{BLACK} ({COMMA}% transportuota)
 STR_482C_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Rodyti gamykla ekrano centre
 STR_482D_NEW_UNDER_CONSTRUCTION                                 :{BLACK}{BIGFONT}Statomas naujas {STRING} netoli miesto: {TOWN}!
 STR_482E_NEW_BEING_PLANTED_NEAR                                 :{BLACK}{BIGFONT}Sodinamas naujas {STRING} netoli miesto: {TOWN}!
@@ -1804,8 +1804,8 @@
 STR_4839_PRODUCTION_DOWN_BY_50                                  :{BLACK}{BIGFONT}{TOWN} {STRING} produkcija krenta 50%
 STR_483A_INSECT_INFESTATION_CAUSES                              :{BLACK}{BIGFONT}Vabzdziu anpludzio baime vercia {TOWN} {STRING}!{} mazinti produkcija perpus.
 STR_483B_CAN_ONLY_BE_POSITIONED                                 :{WHITE}...gali buti tik prie zemelapio krastu
-STR_INDUSTRY_PROD_GOUP                                          :{BLACK}{BIGFONT}{STRING} produkcija auga ({TOWN} {STRING}) - {COMMA16}%!
-STR_INDUSTRY_PROD_GODOWN                                        :{BLACK}{BIGFONT}{STRING} produkcija krenta ({TOWN} {STRING}) - {COMMA16}%!
+STR_INDUSTRY_PROD_GOUP                                          :{BLACK}{BIGFONT}{STRING} produkcija auga ({TOWN} {STRING}) - {COMMA}%!
+STR_INDUSTRY_PROD_GODOWN                                        :{BLACK}{BIGFONT}{STRING} produkcija krenta ({TOWN} {STRING}) - {COMMA}%!
 
 ##id 0x5000
 STR_5000_TRAIN_IN_TUNNEL                                        :{WHITE}Tunelyje traukinys
@@ -1868,10 +1868,10 @@
 ##id 0x6000
 STR_SV_EMPTY                                                    :
 STR_SV_UNNAMED                                                  :Bevardis{SKIP}
-STR_SV_TRAIN_NAME                                               :Traukinys {COMMA16}
-STR_SV_ROADVEH_NAME                                             :Automobilis  {COMMA16}
-STR_SV_SHIP_NAME                                                :Laivas {COMMA16}
-STR_SV_AIRCRAFT_NAME                                            :Lektuvas {COMMA16}
+STR_SV_TRAIN_NAME                                               :Traukinys {COMMA}
+STR_SV_ROADVEH_NAME                                             :Automobilis  {COMMA}
+STR_SV_SHIP_NAME                                                :Laivas {COMMA}
+STR_SV_AIRCRAFT_NAME                                            :Lektuvas {COMMA}
 
 STR_SV_STNAME                                                   :{STRING}
 STR_SV_STNAME_NORTH                                             :{STRING} Siaure
@@ -1921,12 +1921,12 @@
 ############ range for difficulty levels ends
 
 ############ range for difficulty settings starts
-STR_6805_MAXIMUM_NO_COMPETITORS                                 :{LTBLUE}Maksimalus priesininku skaicius: {ORANGE}{COMMA16}
+STR_6805_MAXIMUM_NO_COMPETITORS                                 :{LTBLUE}Maksimalus priesininku skaicius: {ORANGE}{COMMA}
 STR_6806_COMPETITOR_START_TIME                                  :{LTBLUE}Priesininkas pradeda zaidima: {ORANGE}{STRING}
 STR_6807_NO_OF_TOWNS                                            :{LTBLUE}Miestu gausumas zemelapyje: {ORANGE}{STRING}
 STR_6808_NO_OF_INDUSTRIES                                       :{LTBLUE}Gamyklu gausumas zemelapyje: {ORANGE}{STRING}
 STR_6809_MAXIMUM_INITIAL_LOAN_000                               :{LTBLUE}Maksimali paskola: {ORANGE}{CURRENCY}
-STR_680A_INITIAL_INTEREST_RATE                                  :{LTBLUE}Pradinis palukanu procentas: {ORANGE}{COMMA16}%
+STR_680A_INITIAL_INTEREST_RATE                                  :{LTBLUE}Pradinis palukanu procentas: {ORANGE}{COMMA}%
 STR_680B_VEHICLE_RUNNING_COSTS                                  :{LTBLUE}Islaidu transporto priem. eksploatacijai lygis: {ORANGE}{STRING}
 STR_680C_CONSTRUCTION_SPEED_OF_COMPETITOR                       :{LTBLUE}Priesininku konstrukciju statymo greitis: {ORANGE}{STRING}
 STR_680D_INTELLIGENCE_OF_COMPETITORS                            :{LTBLUE}Priesininku intelektas: {ORANGE}{STRING}
@@ -1985,7 +1985,7 @@
 ##id 0x7000
 STR_7000                                                        :
 STR_7001                                                        :{WHITE}{STRING} {BLACK}{STRING}
-STR_7002_PLAYER                                                 :(Zaidejas {COMMA16})
+STR_7002_PLAYER                                                 :(Zaidejas {COMMA})
 STR_7004_NEW_FACE                                               :{BLACK}Naujas veidas
 STR_7005_COLOR_SCHEME                                           :{BLACK}Spalva
 STR_7006_COLOR_SCHEME                                           :{GOLD}Spalva:
@@ -2019,7 +2019,7 @@
 STR_7022_INCOME_GRAPH                                           :{WHITE}Pajamu diagrama
 STR_CURRCOMPACT32                                               :{CURRCOMPACT}
 STR_CURRCOMPACT64                                               :{CURRCOMPACT64}
-STR_7024                                                        :{COMMA32}
+STR_7024                                                        :{COMMA}
 STR_7025_OPERATING_PROFIT_GRAPH                                 :{WHITE}Operating Profit Graph
 STR_7026_BANK_BALANCE                                           :{WHITE}Saskaitos balansas
 STR_7027_LOAN                                                   :{WHITE}Paskola
@@ -2043,14 +2043,14 @@
 STR_7037_PRESIDENT                                              :{WHITE}{STRING}{}{GOLD}(Direktorius)
 STR_7038_INAUGURATED                                            :{GOLD}Eina pareigas nuo: {WHITE}{NUMU16}
 STR_7039_VEHICLES                                               :{GOLD}Transporto priemones:
-STR_703A_TRAIN                                                  :{WHITE}{COMMA16} traukinys
-STR_703B_TRAINS                                                 :{WHITE}{COMMA16} traukiniai
-STR_703C_ROAD_VEHICLE                                           :{WHITE}{COMMA16} automobilis
-STR_703D_ROAD_VEHICLES                                          :{WHITE}{COMMA16} automobiliai
-STR_703E_AIRCRAFT                                               :{WHITE}{COMMA16} lektuvas
-STR_703F_AIRCRAFT                                               :{WHITE}{COMMA16} lektuvai
-STR_7040_SHIP                                                   :{WHITE}{COMMA16} laivas
-STR_7041_SHIPS                                                  :{WHITE}{COMMA16} laivai
+STR_703A_TRAIN                                                  :{WHITE}{COMMA} traukinys
+STR_703B_TRAINS                                                 :{WHITE}{COMMA} traukiniai
+STR_703C_ROAD_VEHICLE                                           :{WHITE}{COMMA} automobilis
+STR_703D_ROAD_VEHICLES                                          :{WHITE}{COMMA} automobiliai
+STR_703E_AIRCRAFT                                               :{WHITE}{COMMA} lektuvas
+STR_703F_AIRCRAFT                                               :{WHITE}{COMMA} lektuvai
+STR_7040_SHIP                                                   :{WHITE}{COMMA} laivas
+STR_7041_SHIPS                                                  :{WHITE}{COMMA} laivai
 STR_7042_NONE                                                   :{WHITE}Neturi
 STR_7043_FACE_SELECTION                                         :{WHITE}Veido pasirinkimas
 STR_7044_MALE                                                   :{BLACK}Vyras
@@ -2115,8 +2115,8 @@
 STR_707A_SELL_25_SHARE_IN_THIS_COMPANY                          :{BLACK}Parduoti 25% sios kompanijos akciju
 STR_707B_CAN_T_BUY_25_SHARE_IN_THIS                             :{WHITE}Negalima nusipirkti 25% sios kompanijos akciju...
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}Negalima parduoti 25% sios kompanijos akciju...
-STR_707D_OWNED_BY                                               :{WHITE}({COMMA16}% priklauso {STRING})
-STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA16}% priklauso {STRING}{}   {COMMA16}% priklauso {STRING})
+STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% priklauso {STRING})
+STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}% priklauso {STRING}{}   {COMMA}% priklauso {STRING})
 STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{STRING} buvo perimta {STRING}!
 STR_7080_PROTECTED                                              :{WHITE}Si kompanija dar pernelyg jauna, kad galetu pardavineti savo akcijas...
 
@@ -2391,8 +2391,8 @@
 STR_8801_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Citizens celebrate . . .{}First train arrives at {STATION}!
 STR_8802_DETAILS                                                :{WHITE}{STRING} (Details)
 STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}Train in the way
-STR_8804                                                        :{SETX 10}{COMMA8}: {STRING}
-STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA8}: {STRING}
+STR_8804                                                        :{SETX 10}{COMMA}: {STRING}
+STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING}
 STR_8806_GO_TO                                                  :Vaziuoja i {STATION}
 STR_SERVICE_AT_TRAIN_DEPOT                                      :Remontas {TOWN} traukiniu depe
 STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT                             :Vaziuoti nestojant i {TOWN} traukiniu depa
@@ -2406,13 +2406,13 @@
 STR_UNKNOWN_DESTINATION                                         :nezinomas tikslas
 STR_8812_EMPTY                                                  :{LTBLUE}Tuscias
 STR_8813_FROM                                                   :{LTBLUE}{CARGO} is {STATION}
-STR_8814_TRAIN_IS_WAITING_IN_DEPOT                              :{WHITE}Traukinys {COMMA16} laukia depe
+STR_8814_TRAIN_IS_WAITING_IN_DEPOT                              :{WHITE}Traukinys {COMMA} laukia depe
 STR_8815_NEW_VEHICLES                                           :{BLACK}Naujos tr. priemones
 STR_8816                                                        :{BLACK}-
 STR_8818_INFORMATION                                            :{BLACK}Informacijs
 STR_8819_TRAIN_TOO_LONG                                         :{WHITE}Traukinys per ilgas
 STR_881A_TRAINS_CAN_ONLY_BE_ALTERED                             :{WHITE}Sukeisti traukinius galima tiktai sustabdytus depe
-STR_881B_TRAINS                                                 :{WHITE}{STRING} - {COMMA16} traukiniai
+STR_881B_TRAINS                                                 :{WHITE}{STRING} - {COMMA} traukiniai
 STR_881C_NEW_RAIL_VEHICLES                                      :{WHITE}New Rail Vehicles
 STR_881D_NEW_MONORAIL_VEHICLES                                  :{WHITE}New Monorail Vehicles
 STR_881E_NEW_MAGLEV_VEHICLES                                    :{WHITE}New Maglev Vehicles
@@ -2446,8 +2446,8 @@
 STR_8839_CAN_T_SELL_RAILROAD_VEHICLE                            :{WHITE}Priemones negalima parduoti...
 STR_883A_UNABLE_TO_FIND_ROUTE_TO                                :{WHITE}Neranda kelio iki artimiausio garazo
 STR_883B_CAN_T_STOP_START_TRAIN                                 :{WHITE}Traukinio sustabdyti/paleisti negalima...
-STR_883C_SERVICING_INTERVAL_DAYS                                :{BLACK}Remonto intervalas: {LTBLUE}{COMMA16}dienos{BLACK}   Paskutinis remontas: {LTBLUE}{DATE_LONG}
-STR_SERVICING_INTERVAL_PERCENT                                  :{BLACK}Remonto intervalas: {LTBLUE}{COMMA16}%{BLACK}   Paskutinis remontas: {LTBLUE}{DATE_LONG}
+STR_883C_SERVICING_INTERVAL_DAYS                                :{BLACK}Remonto intervalas: {LTBLUE}{COMMA}dienos{BLACK}   Paskutinis remontas: {LTBLUE}{DATE_LONG}
+STR_SERVICING_INTERVAL_PERCENT                                  :{BLACK}Remonto intervalas: {LTBLUE}{COMMA}%{BLACK}   Paskutinis remontas: {LTBLUE}{DATE_LONG}
 STR_883D_TRAINS_CLICK_ON_TRAIN_FOR                              :{BLACK}Traukiniai - spausk ant traukinio, jei nori detalesnes informacijos
 STR_883E_BUILD_NEW_TRAINS_REQUIRES                              :{BLACK}Isigyti nauju traukiniu (reikia traukiniu depo)
 STR_883F_TRAINS_CLICK_ON_TRAIN_FOR                              :{BLACK}Traukiniai - paspausk ant traukinio jei nori detalesnes informacijos, tempk vagona, jei nori ji prikabinti/pasalinti nuo traukinio
@@ -2480,12 +2480,12 @@
 STR_SERVICE_HINT                                                :{BLACK}Nevykdyti sios uzduoties iki tol, kol nereikes remonto
 STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}Naujas {STRING} atsirado!
 STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
-STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Kaina: {CURRENCY} Svoris: {COMMA16}t{}Greitis: {VELOCITY}  Galia: {COMMA16}aj{}Eksploatacijos islaidos: {CURRENCY}/met{}Talpa: {STRING}
+STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Kaina: {CURRENCY} Svoris: {COMMA}t{}Greitis: {VELOCITY}  Galia: {COMMA}aj{}Eksploatacijos islaidos: {CURRENCY}/met{}Talpa: {STRING}
 STR_885C_BROKEN_DOWN                                            :{RED}Sugedo
 STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Amzius: {LTBLUE}{STRING}{BLACK}   Eksploatacijos islaidos: {LTBLUE}{CURRENCY}/met
-STR_885E_WEIGHT_T_POWER_HP_MAX_SPEED                            :{BLACK}Svoris: {LTBLUE}{COMMA16}t  {BLACK}Galia: {LTBLUE}{COMMA32}aj{BLACK} Maks. greitis: {LTBLUE}{VELOCITY}
+STR_885E_WEIGHT_T_POWER_HP_MAX_SPEED                            :{BLACK}Svoris: {LTBLUE}{COMMA}t  {BLACK}Galia: {LTBLUE}{COMMA}aj{BLACK} Maks. greitis: {LTBLUE}{VELOCITY}
 STR_885F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Siu metu pelnas : {LTBLUE}{CURRENCY}  (praeitu metu: {CURRENCY})
-STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Patikimumas: {LTBLUE}{COMMA8}%  {BLACK}Gedimai nuo praeito remonto: {LTBLUE}{COMMA16}
+STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Patikimumas: {LTBLUE}{COMMA}%  {BLACK}Gedimai nuo praeito remonto: {LTBLUE}{COMMA}
 STR_8861_STOPPED                                                :{RED}Sustabdyta
 STR_8862_CAN_T_MAKE_TRAIN_PASS_SIGNAL                           :{WHITE}Can't make train pass signal at danger...
 STR_8863_CRASHED                                                :{RED}Avarija!
@@ -2493,7 +2493,7 @@
 STR_8865_NAME_TRAIN                                             :{WHITE}Traukinio vardas
 STR_8866_CAN_T_NAME_TRAIN                                       :{WHITE}Negali pakeisti traukinio vardo...
 STR_8867_NAME_TRAIN                                             :{BLACK}Traukinio vardas
-STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Traukinio avarija!{}{COMMA16} zuvo liepsnose po katastrofos
+STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Traukinio avarija!{}{COMMA} zuvo liepsnose po katastrofos
 STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}Traukinio vaziavimo krypties pakeisti negalima...
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Rename train vehicle type
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Can't rename train vehicle type...
@@ -2503,7 +2503,7 @@
 
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Automobilis kelyje
-STR_9001_ROAD_VEHICLES                                          :{WHITE}{STRING} - {COMMA16} Automobiliai
+STR_9001_ROAD_VEHICLES                                          :{WHITE}{STRING} - {COMMA} Automobiliai
 STR_9002                                                        :{WHITE}{STRING}
 STR_9003_ROAD_VEHICLE_DEPOT                                     :{WHITE}{TOWN} Automobiliu garazas
 STR_9004_NEW_VEHICLES                                           :{BLACK}Naujos tr. priemones
@@ -2517,13 +2517,13 @@
 STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Amzius: {LTBLUE}{STRING}{BLACK}   Eksploatacijos islaidos: {LTBLUE}{CURRENCY}/met
 STR_900E_MAX_SPEED                                              :{BLACK}Maks. greitis: {LTBLUE}{VELOCITY}
 STR_900F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Pelnas siais metais: {LTBLUE}{CURRENCY}  (praejusiais metais: {CURRENCY})
-STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Patikimumas: {LTBLUE}{COMMA8}%  {BLACK}Sugedo po paskutinio remonto: {LTBLUE}{COMMA16}
+STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Patikimumas: {LTBLUE}{COMMA}%  {BLACK}Sugedo po paskutinio remonto: {LTBLUE}{COMMA}
 STR_9011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Pastatytas: {LTBLUE}{NUMU16}{BLACK} Verte: {LTBLUE}{CURRENCY}
 STR_9012_CAPACITY                                               :{BLACK}Talpa: {LTBLUE}{STRING}
 STR_9013_MUST_BE_STOPPED_INSIDE                                 :{WHITE}...automobilis turi buti sustabdytas garaze
 STR_9014_CAN_T_SELL_ROAD_VEHICLE                                :{WHITE}Automobilio parduoti negalima...
 STR_9015_CAN_T_STOP_START_ROAD_VEHICLE                          :{WHITE}Automobilio sustabdyti/paleisti negalima...
-STR_9016_ROAD_VEHICLE_IS_WAITING                                :{WHITE}Automobilis {COMMA16} laukia garaze
+STR_9016_ROAD_VEHICLE_IS_WAITING                                :{WHITE}Automobilis {COMMA} laukia garaze
 STR_HEADING_FOR_ROAD_DEPOT                                      :{LTBLUE}Uzduotis: {TOWN} garazas
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{LTBLUE}Uzduotis: {TOWN} garazas, {VELOCITY}
 STR_9018_CAN_T_SEND_VEHICLE_TO_DEPOT                            :{WHITE}Negalima rasti automobilio garazo...
@@ -2552,7 +2552,7 @@
 STR_902F_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Gyventojai svencia. . .{}Pirmas autobusas atvyko i {STATION}!
 STR_9030_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Gyventojai svencia. . .{}Pirmas sunkvezimis atvyko i {STATION}!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Automobilio avarija!{}Automobilio vairuotojas zuvo po susidurimo su traukiniu
-STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Automobilio avarija!{}{COMMA16} sudege po susidurimo su traukiniu
+STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Automobilio avarija!{}{COMMA} sudege po susidurimo su traukiniu
 STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}Automobilis negali apsisukti...
 STR_9034_RENAME                                                 :{BLACK}Pervardinti
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Pervardinti automobiliu tipa
@@ -2567,7 +2567,7 @@
 STR_9802_CAN_T_BUILD_DOCK_HERE                                  :{WHITE}Can't build dock here...
 STR_9803_SHIP_DEPOT                                             :{WHITE}{TOWN} Laivu depas
 STR_9804_NEW_SHIPS                                              :{BLACK}Naujas laivas
-STR_9805_SHIPS                                                  :{WHITE}{STRING} - {COMMA16} Laivai
+STR_9805_SHIPS                                                  :{WHITE}{STRING} - {COMMA} Laivai
 STR_9806_CAN_T_BUILD_SHIPS                                      :{WHITE}Negalima isigyti laivo...
 STR_9807_MUST_BUILD_SHIP_DEPOT_FIRST                            :{WHITE}Pirmiausia reikia pastatyti laivu depa
 STR_9808_NEW_SHIPS                                              :{WHITE}New Ships
@@ -2582,7 +2582,7 @@
 STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Amzius: {LTBLUE}{STRING}{BLACK}   Eksploatavimo islaidos: {LTBLUE}{CURRENCY}/met
 STR_9813_MAX_SPEED                                              :{BLACK}Maks. greitis: {LTBLUE}{VELOCITY}
 STR_9814_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Pelnas siais metais: {LTBLUE}{CURRENCY}  (praeitais metais: {CURRENCY})
-STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Patikimumas: {LTBLUE}{COMMA8}%  {BLACK}Gedimai po paskutinio remonto: {LTBLUE}{COMMA16}
+STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Patikimumas: {LTBLUE}{COMMA}%  {BLACK}Gedimai po paskutinio remonto: {LTBLUE}{COMMA}
 STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Pastatytas: {LTBLUE}{NUMU16}{BLACK} Verte: {LTBLUE}{CURRENCY}
 STR_9817_CAPACITY                                               :{BLACK}Talpa: {LTBLUE}{STRING}
 STR_9818_CAN_T_STOP_START_SHIP                                  :{WHITE}Sustabdyti/paleisti laivo negalima...
@@ -2590,7 +2590,7 @@
 STR_981A_UNABLE_TO_FIND_LOCAL_DEPOT                             :{WHITE}Negali rasti artimiausio laivu depo
 STR_HEADING_FOR_SHIP_DEPOT                                      :{LTBLUE}Kursas: {TOWN} laivu depas
 STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{LTBLUE}Kursas: {TOWN} laivu depas, {VELOCITY}
-STR_981C_SHIP_IS_WAITING_IN_DEPOT                               :{WHITE}Laivas laukia depe: {COMMA16}
+STR_981C_SHIP_IS_WAITING_IN_DEPOT                               :{WHITE}Laivas laukia depe: {COMMA}
 STR_981D_BUILD_SHIP_DOCK                                        :{BLACK}Statyti laivu doka
 STR_981E_BUILD_SHIP_DEPOT_FOR_BUILDING                          :{BLACK}Statyti laivu depa (nauju laivu isigijimui, remontui)
 STR_981F_SHIPS_CLICK_ON_SHIP_FOR                                :{BLACK}Laivai - paspausk ant laivo, jei nori daugiau informacijos
@@ -2641,19 +2641,19 @@
 STR_A005_NEW_AIRCRAFT                                           :{WHITE}Naujas lektuvas
 STR_A006_BUILD_AIRCRAFT                                         :{BLACK}Isigyti lektuva
 STR_A008_CAN_T_BUILD_AIRCRAFT                                   :{WHITE}Negalima isigyti lektuvo...
-STR_A009_AIRCRAFT                                               :{WHITE}{STRING} - {COMMA16} Lektuvai
+STR_A009_AIRCRAFT                                               :{WHITE}{STRING} - {COMMA} Lektuvai
 STR_A00A                                                        :{WHITE}{STRING}
 STR_A00B_ORDERS                                                 :{WHITE}{STRING} (Uzduotys)
 STR_A00C_DETAILS                                                :{WHITE}{STRING} (Detaliau)
 STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Amzius: {LTBLUE}{STRING}{BLACK}   Eksploatacijos islaidos: {LTBLUE}{CURRENCY}/met.
 STR_A00E_MAX_SPEED                                              :{BLACK}Maks. greitis: {LTBLUE}{VELOCITY}
 STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Pelnas siais metais: {LTBLUE}{CURRENCY}  (praeitais metais: {CURRENCY})
-STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Patikimumas: {LTBLUE}{COMMA8}%  {BLACK}Gedimai po paskutinio remonto: {LTBLUE}{COMMA16}
+STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Patikimumas: {LTBLUE}{COMMA}%  {BLACK}Gedimai po paskutinio remonto: {LTBLUE}{COMMA}
 STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Pastatytas: {LTBLUE}{NUMU16}{BLACK} Verte: {LTBLUE}{CURRENCY}
 STR_A012_CAN_T_SEND_AIRCRAFT_TO                                 :{WHITE}Negalima lektuvo nusiusti i angara...
 STR_HEADING_FOR_HANGAR                                          :{LTBLUE}Kursas: {STATION} angaras
 STR_HEADING_FOR_HANGAR_VEL                                      :{LTBLUE}Kursas: {STATION} angarasangar, {VELOCITY}
-STR_A014_AIRCRAFT_IS_WAITING_IN                                 :{WHITE}Lektuvas {COMMA16} laukia angare
+STR_A014_AIRCRAFT_IS_WAITING_IN                                 :{WHITE}Lektuvas {COMMA} laukia angare
 STR_A015_AIRCRAFT_IN_THE_WAY                                    :{WHITE}Oro uostai
 STR_A016_CAN_T_STOP_START_AIRCRAFT                              :{WHITE}Negalima cia statyti oro uosto...
 STR_A017_AIRCRAFT_IS_IN_FLIGHT                                  :{WHITE}Lektuvas dabar skrenda
@@ -2679,14 +2679,14 @@
 STR_A02B_SHOW_AIRCRAFT_DETAILS                                  :{BLACK}Rodyti lektuvo informacija
 STR_A02C_NEW_AIRCRAFT_NOW_AVAILABLE                             :{BLACK}{BIGFONT}Atsirado naujas lektuvas!
 STR_A02D                                                        :{BLACK}{BIGFONT}{STRING}
-STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Kaina: {CURRENCY} Maks. greitis: {VELOCITY}{}Talpa: {COMMA16} keleiviu, {COMMA16} pasto maisail{}Eksploatacijos islaidos: {CURRENCY}/met.
+STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Kaina: {CURRENCY} Maks. greitis: {VELOCITY}{}Talpa: {COMMA} keleiviu, {COMMA} pasto maisail{}Eksploatacijos islaidos: {CURRENCY}/met.
 
 STR_A030_NAME_AIRCRAFT                                          :{WHITE}Pervardinti lektuva
 STR_A031_CAN_T_NAME_AIRCRAFT                                    :{WHITE}Negalima pervardinti lektuvo...
 STR_A032_NAME_AIRCRAFT                                          :{BLACK}Pervardinti lektuva
 STR_A033_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Gyventojai dziugauja. . .{}Pirmas lektuvas atvyko i {STATION}!
-STR_A034_PLANE_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Lektuvo katastrofa!{}{COMMA16} sudege liepsnose prie {STATION}
-STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Lektuvo katastrofa!{}Lektuvas pritruko degalu, {COMMA16} nukrito ant zemes!
+STR_A034_PLANE_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Lektuvo katastrofa!{}{COMMA} sudege liepsnose prie {STATION}
+STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Lektuvo katastrofa!{}Lektuvas pritruko degalu, {COMMA} nukrito ant zemes!
 STR_A035_DESTINATIONS                                           :{TINYFONT}{BLACK}Paskirtis:
 STR_A036                                                        :{TINYFONT}{BLACK}{STATION}
 STR_A037_RENAME                                                 :{BLACK}Pervardinti
@@ -2712,7 +2712,7 @@
 STR_B003_FACTORY_DESTROYED_IN_SUSPICIOUS                        :{BLACK}{BIGFONT} Del neaiskiu aplinkybiu sunaikinta ferma salia {TOWN}!
 STR_B004_UFO_LANDS_NEAR                                         :{BLACK}{BIGFONT}Ateiviai nusileido salia {TOWN}!
 STR_B005_COAL_MINE_SUBSIDENCE_LEAVES                            :{BLACK}{BIGFONT}Anglies kasyklose salia {TOWN} sedantis gruntas sukele katastrofa - kasykla nenaudojama!
-STR_B006_FLOOD_VEHICLE_DESTROYED                                :{BLACK}{BIGFONT}Potvynis!{}Automobilio {COMMA16} buvo pasigesta, kaip spejama, tai susije su potvyniu!
+STR_B006_FLOOD_VEHICLE_DESTROYED                                :{BLACK}{BIGFONT}Potvynis!{}Automobilio {COMMA} buvo pasigesta, kaip spejama, tai susije su potvyniu!
 
 STR_BRIBE_FAILED                                                :{WHITE}Tavo meginimas papirkti buvo
 STR_BRIBE_FAILED_2                                              :{WHITE}issaiskinta vietiniu pareigunu
@@ -2722,7 +2722,7 @@
 STR_PERFORMANCE_DETAIL                                          :{WHITE}Issamus veiklos ivertinimas
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Detaliai
 STR_PERFORMANCE_DETAIL_AMOUNT_CURRENCY                          :{BLACK}({CURRCOMPACT}/{CURRCOMPACT})
-STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA32}/{COMMA32})
+STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA}/{COMMA})
 STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{INT32}%
 SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{INT32}
 ############ Those following lines need to be in this order!!
@@ -2757,7 +2757,7 @@
 STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID:
 
 STR_CURRENCY_WINDOW                                             :{WHITE}Pasirinkti valiuta
-STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Keitimo santykis: {ORANGE}{CURRENCY} = {POUNDSIGN} {COMMA16}
+STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Keitimo santykis: {ORANGE}{CURRENCY} = {POUNDSIGN} {COMMA}
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Skyriklis:
 STR_CURRENCY_PREFIX                                             :{LTBLUE}Priesdelis:
 STR_CURRENCY_SUFFIX                                             :{LTBLUE}Pavadinimas:
@@ -2771,10 +2771,10 @@
 STR_PLANE                                                       :{BLACK}{PLANE}
 STR_SHIP                                                        :{BLACK}{SHIP}
 
-STR_SCHEDULED_TRAINS                                            :{WHITE}{STATION} - {COMMA16} Traukiniai
-STR_SCHEDULED_ROAD_VEHICLES                                     :{WHITE}{STATION} - {COMMA16} Automobiliai
-STR_SCHEDULED_AIRCRAFT                                          :{WHITE}{STATION} - {COMMA16} Lektuvai
-STR_SCHEDULED_SHIPS                                             :{WHITE}{STATION} - {COMMA16} Laivai
+STR_SCHEDULED_TRAINS                                            :{WHITE}{STATION} - {COMMA} Traukiniai
+STR_SCHEDULED_ROAD_VEHICLES                                     :{WHITE}{STATION} - {COMMA} Automobiliai
+STR_SCHEDULED_AIRCRAFT                                          :{WHITE}{STATION} - {COMMA} Lektuvai
+STR_SCHEDULED_SHIPS                                             :{WHITE}{STATION} - {COMMA} Laivai
 
 STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Rodyti visus traukinius, kuriu uzduotuse yra itraukta si stotele
 STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Rodyti visus automobilius, kuriu uzduotyse yra pamineta si stotele
@@ -2796,7 +2796,7 @@
 STR_REPLACE_HELP                                                :{BLACK}Tai leidzia tau keisti viena tr. priemoniu tipa kitu, kai pirmojo tipo traukinys uzsuka i depa
 
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
-STR_SIGN_LIST_CAPTION                                           :{WHITE}Zenklu sarasas - {COMMA16} Zenklai
+STR_SIGN_LIST_CAPTION                                           :{WHITE}Zenklu sarasas - {COMMA} Zenklai
 
 ############ Lists rail types
 
@@ -2806,5 +2806,5 @@
 
 ############ End of list of rail types
 
-STR_TINY_BLACK                                                  :{BLACK}{TINYFONT}{COMMA16}
+STR_TINY_BLACK                                                  :{BLACK}{TINYFONT}{COMMA}
 
--- a/lang/norwegian.txt	Thu Jul 14 09:53:52 2005 +0000
+++ b/lang/norwegian.txt	Thu Jul 14 15:10:20 2005 +0000
@@ -82,69 +82,69 @@
 STR_004C_PLASTIC                                                :Plastikk
 STR_004D_FIZZY_DRINK                                            :Brus
 STR_004E                                                        :
-STR_004F_PASSENGER                                              :{COMMA16} passasjer
-STR_0050_TON_OF_COAL                                            :{COMMA16} tonn kull
-STR_0051_BAG_OF_MAIL                                            :{COMMA16} postsekk
+STR_004F_PASSENGER                                              :{COMMA} passasjer
+STR_0050_TON_OF_COAL                                            :{COMMA} tonn kull
+STR_0051_BAG_OF_MAIL                                            :{COMMA} postsekk
 STR_0052_OF_OIL                                                 :{VOLUME} olje
-STR_0053_ITEM_OF_LIVESTOCK                                      :{COMMA16} enhet buskap
-STR_0054_CRATE_OF_GOODS                                         :{COMMA16} kasse gods
-STR_0055_TON_OF_GRAIN                                           :{COMMA16} tonn korn
-STR_0056_TON_OF_WOOD                                            :{COMMA16} tonn tømmer
-STR_0057_TON_OF_IRON_ORE                                        :{COMMA16} tonn jernmalm
-STR_0058_TON_OF_STEEL                                           :{COMMA16} tonn stål
-STR_0059_BAG_OF_VALUABLES                                       :{COMMA16} sekk med verdisaker
-STR_005A_TON_OF_COPPER_ORE                                      :{COMMA16} tonn kobbermalm
-STR_005B_TON_OF_MAIZE                                           :{COMMA16} tonn mais
-STR_005C_TON_OF_FRUIT                                           :{COMMA16} tonn frukt
-STR_005D_BAG_OF_DIAMONDS                                        :{COMMA16} sekk med diamanter
-STR_005E_TON_OF_FOOD                                            :{COMMA16} tonn mat
-STR_005F_TON_OF_PAPER                                           :{COMMA16} tonn papir
-STR_0060_BAG_OF_GOLD                                            :{COMMA16} sekk med gull
+STR_0053_ITEM_OF_LIVESTOCK                                      :{COMMA} enhet buskap
+STR_0054_CRATE_OF_GOODS                                         :{COMMA} kasse gods
+STR_0055_TON_OF_GRAIN                                           :{COMMA} tonn korn
+STR_0056_TON_OF_WOOD                                            :{COMMA} tonn tømmer
+STR_0057_TON_OF_IRON_ORE                                        :{COMMA} tonn jernmalm
+STR_0058_TON_OF_STEEL                                           :{COMMA} tonn stål
+STR_0059_BAG_OF_VALUABLES                                       :{COMMA} sekk med verdisaker
+STR_005A_TON_OF_COPPER_ORE                                      :{COMMA} tonn kobbermalm
+STR_005B_TON_OF_MAIZE                                           :{COMMA} tonn mais
+STR_005C_TON_OF_FRUIT                                           :{COMMA} tonn frukt
+STR_005D_BAG_OF_DIAMONDS                                        :{COMMA} sekk med diamanter
+STR_005E_TON_OF_FOOD                                            :{COMMA} tonn mat
+STR_005F_TON_OF_PAPER                                           :{COMMA} tonn papir
+STR_0060_BAG_OF_GOLD                                            :{COMMA} sekk med gull
 STR_0061_OF_WATER                                               :{VOLUME} vann
-STR_0062_TON_OF_WHEAT                                           :{COMMA16} tonn hvete
+STR_0062_TON_OF_WHEAT                                           :{COMMA} tonn hvete
 STR_0063_OF_RUBBER                                              :{VOLUME} gummi
-STR_0064_TON_OF_SUGAR                                           :{COMMA16} tonn sukker
-STR_0065_TOY                                                    :{COMMA16} leke
-STR_0066_BAG_OF_CANDY                                           :{COMMA16} sekk med søtsaker
+STR_0064_TON_OF_SUGAR                                           :{COMMA} tonn sukker
+STR_0065_TOY                                                    :{COMMA} leke
+STR_0066_BAG_OF_CANDY                                           :{COMMA} sekk med søtsaker
 STR_0067_OF_COLA                                                :{VOLUME} cola
-STR_0068_TON_OF_COTTON_CANDY                                    :{COMMA16} tonn sukkerspinn
-STR_0069_BUBBLE                                                 :{COMMA16} boble
-STR_006A_TON_OF_TOFFEE                                          :{COMMA16} tonn karamell
-STR_006B_BATTERY                                                :{COMMA16} batteri
+STR_0068_TON_OF_COTTON_CANDY                                    :{COMMA} tonn sukkerspinn
+STR_0069_BUBBLE                                                 :{COMMA} boble
+STR_006A_TON_OF_TOFFEE                                          :{COMMA} tonn karamell
+STR_006B_BATTERY                                                :{COMMA} batteri
 STR_006C_OF_PLASTIC                                             :{VOLUME} plastikk
-STR_006D_FIZZY_DRINK                                            :{COMMA16} brus
+STR_006D_FIZZY_DRINK                                            :{COMMA} brus
 STR_006E                                                        :
-STR_006F_PASSENGERS                                             :{COMMA16} passasjerer
-STR_0070_TONS_OF_COAL                                           :{COMMA16} tonn kull
-STR_0071_BAGS_OF_MAIL                                           :{COMMA16} postsekker
+STR_006F_PASSENGERS                                             :{COMMA} passasjerer
+STR_0070_TONS_OF_COAL                                           :{COMMA} tonn kull
+STR_0071_BAGS_OF_MAIL                                           :{COMMA} postsekker
 STR_0072_OF_OIL                                                 :{VOLUME} olje
-STR_0073_ITEMS_OF_LIVESTOCK                                     :{COMMA16} enheter buskap
-STR_0074_CRATES_OF_GOODS                                        :{COMMA16} kasser gods
-STR_0075_TONS_OF_GRAIN                                          :{COMMA16} tonn korn
-STR_0076_TONS_OF_WOOD                                           :{COMMA16} tonn tømmer
-STR_0077_TONS_OF_IRON_ORE                                       :{COMMA16} tonn jernmalm
-STR_0078_TONS_OF_STEEL                                          :{COMMA16} tonn stål
-STR_0079_BAGS_OF_VALUABLES                                      :{COMMA16} sekker med verdisaker
-STR_007A_TONS_OF_COPPER_ORE                                     :{COMMA16} tonn kobbermalm
-STR_007B_TONS_OF_MAIZE                                          :{COMMA16} tonn mais
-STR_007C_TONS_OF_FRUIT                                          :{COMMA16} tonn frukt
-STR_007D_BAGS_OF_DIAMONDS                                       :{COMMA16} sekker med diamanter
-STR_007E_TONS_OF_FOOD                                           :{COMMA16} tonn mat
-STR_007F_TONS_OF_PAPER                                          :{COMMA16} tonn papir
-STR_0080_BAGS_OF_GOLD                                           :{COMMA16} sekker gull
+STR_0073_ITEMS_OF_LIVESTOCK                                     :{COMMA} enheter buskap
+STR_0074_CRATES_OF_GOODS                                        :{COMMA} kasser gods
+STR_0075_TONS_OF_GRAIN                                          :{COMMA} tonn korn
+STR_0076_TONS_OF_WOOD                                           :{COMMA} tonn tømmer
+STR_0077_TONS_OF_IRON_ORE                                       :{COMMA} tonn jernmalm
+STR_0078_TONS_OF_STEEL                                          :{COMMA} tonn stål
+STR_0079_BAGS_OF_VALUABLES                                      :{COMMA} sekker med verdisaker
+STR_007A_TONS_OF_COPPER_ORE                                     :{COMMA} tonn kobbermalm
+STR_007B_TONS_OF_MAIZE                                          :{COMMA} tonn mais
+STR_007C_TONS_OF_FRUIT                                          :{COMMA} tonn frukt
+STR_007D_BAGS_OF_DIAMONDS                                       :{COMMA} sekker med diamanter
+STR_007E_TONS_OF_FOOD                                           :{COMMA} tonn mat
+STR_007F_TONS_OF_PAPER                                          :{COMMA} tonn papir
+STR_0080_BAGS_OF_GOLD                                           :{COMMA} sekker gull
 STR_0081_OF_WATER                                               :{VOLUME} vann
-STR_0082_TONS_OF_WHEAT                                          :{COMMA16} tonn hvete
+STR_0082_TONS_OF_WHEAT                                          :{COMMA} tonn hvete
 STR_0083_OF_RUBBER                                              :{VOLUME} gummi
-STR_0084_TONS_OF_SUGAR                                          :{COMMA16} tonn sukker
-STR_0085_TOYS                                                   :{COMMA16} leker
-STR_0086_BAGS_OF_CANDY                                          :{COMMA16} sekker søtsaker
+STR_0084_TONS_OF_SUGAR                                          :{COMMA} tonn sukker
+STR_0085_TOYS                                                   :{COMMA} leker
+STR_0086_BAGS_OF_CANDY                                          :{COMMA} sekker søtsaker
 STR_0087_OF_COLA                                                :{VOLUME} cola
-STR_0088_TONS_OF_COTTON_CANDY                                   :{COMMA16} tonn sukkerspinn
-STR_0089_BUBBLES                                                :{COMMA16} bobler
-STR_008A_TONS_OF_TOFFEE                                         :{COMMA16} tonn karameller
-STR_008B_BATTERIES                                              :{COMMA16} batterier
+STR_0088_TONS_OF_COTTON_CANDY                                   :{COMMA} tonn sukkerspinn
+STR_0089_BUBBLES                                                :{COMMA} bobler
+STR_008A_TONS_OF_TOFFEE                                         :{COMMA} tonn karameller
+STR_008B_BATTERIES                                              :{COMMA} batterier
 STR_008C_OF_PLASTIC                                             :{VOLUME} plastikk
-STR_008D_FIZZY_DRINKS                                           :{COMMA16} brus
+STR_008D_FIZZY_DRINKS                                           :{COMMA} brus
 STR_008E                                                        :
 STR_008F_PS                                                     :{TINYFONT}PS
 STR_0090_CL                                                     :{TINYFONT}KL
@@ -219,8 +219,8 @@
 STR_00DF_GREY                                                   :Grå
 STR_00E0_WHITE                                                  :Hvit
 STR_00E1_TOO_MANY_VEHICLES_IN_GAME                              :{WHITE}For mange kjøretøy i spillet
-STR_00E2                                                        :{BLACK}{COMMA16}
-STR_00E3                                                        :{RED}{COMMA16}
+STR_00E2                                                        :{BLACK}{COMMA}
+STR_00E3                                                        :{RED}{COMMA}
 STR_00E4_LOCATION                                               :{BLACK}Sted
 STR_00E5_CONTOURS                                               :Konturer
 STR_00E6_VEHICLES                                               :Kjøretøy
@@ -441,18 +441,18 @@
 STR_0198_PROFIT_THIS_YEAR_LAST_YEAR                             :{TINYFONT}{BLACK}Fortjeneste i år: {CURRENCY} (sist år: {CURRENCY})
 
 ############ range for service numbers starts
-STR_0199_YEAR                                                   :{COMMA16} år ({COMMA16})
-STR_019A_YEARS                                                  :{COMMA16} år ({COMMA16})
-STR_019B_YEARS                                                  :{RED}{COMMA16} år ({COMMA16})
+STR_0199_YEAR                                                   :{COMMA} år ({COMMA})
+STR_019A_YEARS                                                  :{COMMA} år ({COMMA})
+STR_019B_YEARS                                                  :{RED}{COMMA} år ({COMMA})
 ############ range for service numbers ends
 
 STR_019C_ROAD_VEHICLE                                           :Kjøretøy
 STR_019D_AIRCRAFT                                               :Fly
 STR_019E_SHIP                                                   :Skip
 STR_019F_TRAIN                                                  :Tog
-STR_01A0_IS_GETTING_OLD                                         :{WHITE}{STRING} {COMMA16} er gammel
-STR_01A1_IS_GETTING_VERY_OLD                                    :{WHITE}{STRING} {COMMA16} er veldig gammel
-STR_01A2_IS_GETTING_VERY_OLD_AND                                :{WHITE}{STRING} {COMMA16} er veldig gammel og må byttes ut snarest
+STR_01A0_IS_GETTING_OLD                                         :{WHITE}{STRING} {COMMA} er gammel
+STR_01A1_IS_GETTING_VERY_OLD                                    :{WHITE}{STRING} {COMMA} er veldig gammel
+STR_01A2_IS_GETTING_VERY_OLD_AND                                :{WHITE}{STRING} {COMMA} er veldig gammel og må byttes ut snarest
 STR_01A3_LAND_AREA_INFORMATION                                  :{WHITE}Informasjon om felt
 STR_01A4_COST_TO_CLEAR_N_A                                      :{BLACK}Fjerningskostnad: {LTBLUE}N/A
 STR_01A5_COST_TO_CLEAR                                          :{BLACK}Fjerningskostnad:  {LTBLUE}{CURRENCY}
@@ -497,7 +497,7 @@
 STR_01CA_31ST                                                   :31.
 ############ range for days	ends
 
-STR_01CB                                                        :{TINYFONT}{COMMA16}
+STR_01CB                                                        :{TINYFONT}{COMMA}
 STR_01CC_TOGGLE_LARGE_SMALL_MAP                                 :{BLACK}Veksle mellom stort og lite kart
 STR_01CD_SELECT_TUTORIAL_DEMONSTRATION                          :{WHITE}Velg Veiledning/Demonstrasjon
 
@@ -509,7 +509,7 @@
 STR_CARGO_ACCEPTED_5                                            :{BLACK}Aksepterte varer: {LTBLUE}{STRING}, {STRING}, {STRING}, {STRING}, {STRING}
 ############ range for cargo acecpted ends
 
-STR_01D1_8                                                      :({COMMA8}/8 {STRING})
+STR_01D1_8                                                      :({COMMA}/8 {STRING})
 STR_01D2_JAZZ_JUKEBOX                                           :{WHITE}Jazz Jukebox
 STR_01D3_SOUND_MUSIC                                            :Lyd/Musikk
 STR_01D4_SHOW_SOUND_MUSIC_WINDOW                                :{BLACK}Vis lyd/musikkinnstillinger
@@ -528,16 +528,16 @@
 STR_01E1_START_PLAYING_MUSIC                                    :{BLACK}Start musikken
 STR_01E2_DRAG_SLIDERS_TO_SET_MUSIC                              :{BLACK}Dra for å endre volum på musikk og lydeffekter
 STR_01E3                                                        :{DKGREEN}{TINYFONT}--
-STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA8}
-STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA8}
+STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA}
+STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA}
 STR_01E6                                                        :{DKGREEN}{TINYFONT}------
 STR_01E7                                                        :{DKGREEN}{TINYFONT}"{STRING}"
 STR_01E8_TRACK_XTITLE                                           :{BLACK}{TINYFONT}Spor{SETX 88}Tittel
 STR_01E9_SHUFFLE                                                :{TINYFONT}Tilfeldig
 STR_01EA_PROGRAM                                                :{TINYFONT}{BLACK}Program
 STR_01EB_MUSIC_PROGRAM_SELECTION                                :{WHITE}Musikkprogram
-STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA16} "{STRING}"
-STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA16}   "{STRING}"
+STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} "{STRING}"
+STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA}   "{STRING}"
 STR_01EE_TRACK_INDEX                                            :{TINYFONT}{BLACK}Sporregister
 STR_01EF_PROGRAM                                                :{TINYFONT}{BLACK}Program - '{STRING}'
 STR_01F0_CLEAR                                                  :{TINYFONT}{BLACK}Tøm
@@ -577,7 +577,7 @@
 STR_0210_TOO_FAR_FROM_PREVIOUS_DESTINATIO                       :{WHITE}...for langt i fra forrige destinasjon
 STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Beste firma som nådde {NUMU16}{}({STRING} Nivå)
 STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Firmarangering i {NUMU16}
-STR_0212                                                        :{BIGFONT}{COMMA16}.
+STR_0212                                                        :{BIGFONT}{COMMA}.
 STR_0213_BUSINESSMAN                                            :Forretningsmann
 STR_0214_ENTREPRENEUR                                           :Entreprenør
 STR_0215_INDUSTRIALIST                                          :Industrialist
@@ -586,12 +586,12 @@
 STR_0218_MOGUL                                                  :Mogul
 STR_0219_TYCOON_OF_THE_CENTURY                                  :Århundrets finansfyrste
 STR_HIGHSCORE_NAME                                              :{BIGFONT}{STRING}, {STRING}
-STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA16})
+STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA})
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{STRING} oppnår '{STRING}'-status!
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{STRING} av {STRING} oppnår '{STRING}'-status!
 STR_021D                                                        :{BLACK}
 STR_021E                                                        :{WHITE}
-STR_021F                                                        :{BLUE}{COMMA16}
+STR_021F                                                        :{BLUE}{COMMA}
 STR_0220_CREATE_SCENARIO                                        :{BLACK}Lag scenario
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Scenarioredigerer
@@ -788,8 +788,8 @@
 STR_EXTRA_VIEW_PORT                                             :Ekstra vindu
 STR_SIGN_LIST                                                   :Skiltliste
 STR_02DF_TOWN_DIRECTORY                                         :Byoversikt
-STR_TOWN_POPULATION                                             :{BLACK}Verdensbefolkning: {COMMA32}
-STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Vindu {COMMA16}
+STR_TOWN_POPULATION                                             :{BLACK}Verdensbefolkning: {COMMA}
+STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Vindu {COMMA}
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN                                :{BLACK}Kopier til vindu
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT                             :{BLACK}Kopier stedet til den globale synsvinkelen til dette vinduet
 STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW                                :{BLACK}Kopier fra vindu
@@ -961,34 +961,34 @@
 STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Kan ikke kopiere ordre liste...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Slutt på delte ordre - -
 
-STR_TRAIN_IS_LOST                                               :{WHITE}Tog {COMMA16} har kjørt seg vill.
-STR_TRAIN_IS_UNPROFITABLE                                       :{WHITE}Tog {COMMA16} sin fortjeneste sist år var {CURRENCY}
+STR_TRAIN_IS_LOST                                               :{WHITE}Tog {COMMA} har kjørt seg vill.
+STR_TRAIN_IS_UNPROFITABLE                                       :{WHITE}Tog {COMMA} sin fortjeneste sist år var {CURRENCY}
 STR_EURO_INTRODUCE                                              :{BLACK}{BIGFONT}Europeisk Valutta Union!{}{} Euro er introdusert som den utelukkede valuttaen for hverdagslige forretninger i landet ditt!
 
 # Start of order review system.
 # DON'T ADD OR REMOVE LINES HERE
-STR_TRAIN_HAS_TOO_FEW_ORDERS                                    :{WHITE}Tog {COMMA16} har for få ordrer i kjøreplanen
-STR_TRAIN_HAS_VOID_ORDER                                        :{WHITE}Tog {COMMA16} har en tom ordre
-STR_TRAIN_HAS_DUPLICATE_ENTRY                                   :{WHITE}Tog {COMMA16} har to like ordrer
-STR_TRAIN_HAS_INVALID_ENTRY                                     :{WHITE}Tog {COMMA16} har en ugyldig stasjon i ordrene
-STR_ROADVEHICLE_HAS_TOO_FEW_ORDERS                              :{WHITE}Kjøretøy {COMMA16} har for få ordrer i kjøreplanen
-STR_ROADVEHICLE_HAS_VOID_ORDER                                  :{WHITE}Kjøretøy {COMMA16} har en tom ordre
-STR_ROADVEHICLE_HAS_DUPLICATE_ENTRY                             :{WHITE}Kjøretøy {COMMA16} har to like ordrer
-STR_ROADVEHICLE_HAS_INVALID_ENTRY                               :{WHITE}Kjøretøy {COMMA16} har en ugyldig stasjon i ordrene
-STR_SHIP_HAS_TOO_FEW_ORDERS                                     :{WHITE}Skip {COMMA16} har for få ordrer i kjøreplanen
-STR_SHIP_HAS_VOID_ORDER                                         :{WHITE}Skip {COMMA16} har en tom ordre
-STR_SHIP_HAS_DUPLICATE_ENTRY                                    :{WHITE}Ship {COMMA16} har to like ordrer
-STR_SHIP_HAS_INVALID_ENTRY                                      :{WHITE}Skip {COMMA16} har en ugyldig stasjon i ordrene
-STR_AIRCRAFT_HAS_TOO_FEW_ORDERS                                 :{WHITE}Fly {COMMA16} har for få ordrer i kjøreplanen
-STR_AIRCRAFT_HAS_VOID_ORDER                                     :{WHITE}Fly {COMMA16} har en tom ordre
-STR_AIRCRAFT_HAS_DUPLICATE_ENTRY                                :{WHITE}Fly {COMMA16} har to like ordrer
-STR_AIRCRAFT_HAS_INVALID_ENTRY                                  :{WHITE}Fly {COMMA16} har en ugyldig stasjon i ordrene
+STR_TRAIN_HAS_TOO_FEW_ORDERS                                    :{WHITE}Tog {COMMA} har for få ordrer i kjøreplanen
+STR_TRAIN_HAS_VOID_ORDER                                        :{WHITE}Tog {COMMA} har en tom ordre
+STR_TRAIN_HAS_DUPLICATE_ENTRY                                   :{WHITE}Tog {COMMA} har to like ordrer
+STR_TRAIN_HAS_INVALID_ENTRY                                     :{WHITE}Tog {COMMA} har en ugyldig stasjon i ordrene
+STR_ROADVEHICLE_HAS_TOO_FEW_ORDERS                              :{WHITE}Kjøretøy {COMMA} har for få ordrer i kjøreplanen
+STR_ROADVEHICLE_HAS_VOID_ORDER                                  :{WHITE}Kjøretøy {COMMA} har en tom ordre
+STR_ROADVEHICLE_HAS_DUPLICATE_ENTRY                             :{WHITE}Kjøretøy {COMMA} har to like ordrer
+STR_ROADVEHICLE_HAS_INVALID_ENTRY                               :{WHITE}Kjøretøy {COMMA} har en ugyldig stasjon i ordrene
+STR_SHIP_HAS_TOO_FEW_ORDERS                                     :{WHITE}Skip {COMMA} har for få ordrer i kjøreplanen
+STR_SHIP_HAS_VOID_ORDER                                         :{WHITE}Skip {COMMA} har en tom ordre
+STR_SHIP_HAS_DUPLICATE_ENTRY                                    :{WHITE}Ship {COMMA} har to like ordrer
+STR_SHIP_HAS_INVALID_ENTRY                                      :{WHITE}Skip {COMMA} har en ugyldig stasjon i ordrene
+STR_AIRCRAFT_HAS_TOO_FEW_ORDERS                                 :{WHITE}Fly {COMMA} har for få ordrer i kjøreplanen
+STR_AIRCRAFT_HAS_VOID_ORDER                                     :{WHITE}Fly {COMMA} har en tom ordre
+STR_AIRCRAFT_HAS_DUPLICATE_ENTRY                                :{WHITE}Fly {COMMA} har to like ordrer
+STR_AIRCRAFT_HAS_INVALID_ENTRY                                  :{WHITE}Fly {COMMA} har en ugyldig stasjon i ordrene
 # end of order system
 
-STR_TRAIN_AUTORENEW_FAILED                                      :{WHITE}Autoforny feilet på tog {COMMA16} (money limit)
-STR_ROADVEHICLE_AUTORENEW_FAILED                                :{WHITE}Autoforny feilet på kjøretøy {COMMA16} (money limit)
-STR_SHIP_AUTORENEW_FAILED                                       :{WHITE}Autoforny feilet på skip {COMMA16} (money limit)
-STR_AIRCRAFT_AUTORENEW_FAILED                                   :{WHITE}Autoforny feilet på fly {COMMA16} (money limit)
+STR_TRAIN_AUTORENEW_FAILED                                      :{WHITE}Autoforny feilet på tog {COMMA} (money limit)
+STR_ROADVEHICLE_AUTORENEW_FAILED                                :{WHITE}Autoforny feilet på kjøretøy {COMMA} (money limit)
+STR_SHIP_AUTORENEW_FAILED                                       :{WHITE}Autoforny feilet på skip {COMMA} (money limit)
+STR_AIRCRAFT_AUTORENEW_FAILED                                   :{WHITE}Autoforny feilet på fly {COMMA} (money limit)
 
 STR_CONFIG_PATCHES                                              :{BLACK}Patchinnstillinger
 STR_CONFIG_PATCHES_TIP                                          :{BLACK}Endre patchinnstillinger
@@ -1104,7 +1104,7 @@
 STR_CHEATS_TIP                                                  :{BLACK}Avkryssningsbokser indikerer at du har brukt denne juksekoden tidligere.
 STR_CHEATS_WARNING                                              :{BLACK}Advarsel! Vær klar over at du er i ferd med å bedra dine motstandere og at straffen for slike handlinger er å brenne i helvete etter din død.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Øk pengebeholdningen med {CURRENCY64}
-STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Spiller som spiller: {ORANGE}{COMMA16}
+STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Spiller som spiller: {ORANGE}{COMMA}
 STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Magisk bulldoser (fjern industrier, ufjernbare ting): {ORANGE}{STRING}
 STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Tuneller kan krysse hverandre: {ORANGE}{STRING}
 STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Tillat bygging i pause modus: {ORANGE}{STRING}
@@ -1120,7 +1120,7 @@
 STR_GO_NON_STOP_TO_WAYPOINT                                     :Gå uten stopp via {WAYPOINT}
 
 STR_WAYPOINTNAME_CITY                                           :Kontrollpunkt {TOWN}
-STR_WAYPOINTNAME_CITY_SERIAL                                    :Kontrollpunkt {TOWN} #{COMMA16}
+STR_WAYPOINTNAME_CITY_SERIAL                                    :Kontrollpunkt {TOWN} #{COMMA}
 STR_LANDINFO_WAYPOINT                                           :Kontrollpunkt
 
 STR_WAYPOINT                                                    :{WHITE}Kontrollpunkt
@@ -1203,8 +1203,8 @@
 STR_CONSTRUCT_SUGAR_MINE_TIP                                    :{BLACK}Bygg sukkergruve
 
 STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Industrier
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}){YELLOW} ({COMMA16}% transportert)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}/{STRING}){YELLOW} ({COMMA16}%/{COMMA16}% transportert)
+STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}){YELLOW} ({COMMA}% transportert)
+STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}/{STRING}){YELLOW} ({COMMA}%/{COMMA}% transportert)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{TOWN} {STRING}
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...For nært en annen industri
@@ -1244,15 +1244,15 @@
 STR_NETWORK_ADD_SERVER_TIP                                      :{BLACK}Legger til en tjener i listen over tjenere som alltid vil bli skjekket for aktive spill.
 STR_NETWORK_ENTER_IP                                            :{BLACK}Skriv inn IP adressen til serveren
 
-STR_NETWORK_CLIENTS_ONLINE                                      :{BLACK}{COMMA16}/{COMMA16}
+STR_NETWORK_CLIENTS_ONLINE                                      :{BLACK}{COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Klienter
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Klienter på nett / Maks. antall klienter
 STR_NETWORK_GAME_INFO                                           :{SILVER}SPILLOVERSIKT
 STR_ORANGE                                                      :{ORANGE}{STRING}
-STR_NETWORK_CLIENTS                                             :{SILVER}Klienter:  {WHITE}{COMMA8} / {COMMA8}
+STR_NETWORK_CLIENTS                                             :{SILVER}Klienter:  {WHITE}{COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}Språk:  {WHITE}{STRING}
 STR_NETWORK_TILESET                                             :{SILVER}Brikkesett:  {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Kartstørrelse:  {WHITE}{COMMA16}x{COMMA16}
+STR_NETWORK_MAP_SIZE                                            :{SILVER}Kartstørrelse:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Tjenerversjon:  {WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Server addresse:  {WHITE}{STRING} : {NUMU16}
 STR_NETWORK_START_DATE                                          :{SILVER}Startet:  {WHITE}{DATE_SHORT}
@@ -1517,21 +1517,21 @@
 
 ##id 0x2000
 STR_2000_TOWNS                                                  :{WHITE}Byer
-STR_TOWN_LABEL_POP                                              :{WHITE}{STRING} ({COMMA32})
+STR_TOWN_LABEL_POP                                              :{WHITE}{STRING} ({COMMA})
 STR_2001                                                        :{WHITE}{STRING}
 STR_2002                                                        :{TINYFONT}{BLACK}{STRING}
 STR_2003                                                        :{TINYFONT}{WHITE}{STRING}
 STR_2004_BUILDING_MUST_BE_DEMOLISHED                            :{WHITE}Bygningen må rives først
 STR_2005                                                        :{WHITE}{TOWN}
-STR_2006_POPULATION                                             :{BLACK}Innbyggertall: {ORANGE}{COMMA32}{BLACK}  Antall hus: {ORANGE}{COMMA32}
+STR_2006_POPULATION                                             :{BLACK}Innbyggertall: {ORANGE}{COMMA}{BLACK}  Antall hus: {ORANGE}{COMMA}
 STR_2007_RENAME_TOWN                                            :Bytt navn
 STR_2008_CAN_T_RENAME_TOWN                                      :{WHITE}Kan ikke bytte navn på byen...
 STR_2009_LOCAL_AUTHORITY_REFUSES                                :{WHITE}{TOWN} bystyret nekter deg å gjøre dette.
 STR_200A_TOWN_NAMES_CLICK_ON_NAME                               :{BLACK}Bynavn - trykk på by navnet for å se på byen
 STR_200B_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Sentrer bildet rundt byen
 STR_200C_CHANGE_TOWN_NAME                                       :{BLACK}Bytt navn på byen
-STR_200D_PASSENGERS_LAST_MONTH_MAX                              :{BLACK}Passasjerer siste måned: {ORANGE}{COMMA32}{BLACK}  maks: {ORANGE}{COMMA32}
-STR_200E_MAIL_LAST_MONTH_MAX                                    :{BLACK}Post sist måned: {ORANGE}{COMMA32}{BLACK}  maks: {ORANGE}{COMMA32}
+STR_200D_PASSENGERS_LAST_MONTH_MAX                              :{BLACK}Passasjerer siste måned: {ORANGE}{COMMA}{BLACK}  maks: {ORANGE}{COMMA}
+STR_200E_MAIL_LAST_MONTH_MAX                                    :{BLACK}Post sist måned: {ORANGE}{COMMA}{BLACK}  maks: {ORANGE}{COMMA}
 STR_200F_TALL_OFFICE_BLOCK                                      :Høyhus
 STR_2010_OFFICE_BLOCK                                           :Kontorblokk
 STR_2011_SMALL_BLOCK_OF_FLATS                                   :Leilighetsblokk
@@ -1605,7 +1605,7 @@
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Bestikk bystyret til å forbedre vurderingen av firmaet, men du riskerer å bli bøtlagt hvis du blir oppdaget.{}  Koster: {CURRENCY}
 STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Traffkkaos i {TOWN}!{}{}Ombygging av veien, finasiert av {STRING}, fører med seg seks måneders veiproblemer.
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
-STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA32})
+STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA})
 STR_2058_UNDER_CONSTRUCTION                                     :{STRING} (under bygging)
 STR_2059_IGLOO                                                  :Iglo
 STR_205A_TEPEES                                                 :Indianertelt
@@ -1667,7 +1667,7 @@
 STR_303C_OUTSTANDING                                            :Fremragende
 ############ range for rating ends
 
-STR_303D                                                        :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA8}%)
+STR_303D                                                        :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_303E_NO_LONGER_ACCEPTS                                      :{WHITE}{STATION} aksepterer ikke lenger {STRING}
 STR_303F_NO_LONGER_ACCEPTS_OR                                   :{WHITE}{STATION} aksepterer ikke lenger {STRING} eller {STRING}
 STR_3040_NOW_ACCEPTS                                            :{WHITE}{STATION} aksepterer nå {STRING}
@@ -1678,7 +1678,7 @@
 STR_3045_TOO_CLOSE_TO_ANOTHER_TRUCK                             :{WHITE}For nærme en annen lasteterminal
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Må rive bussterminal først
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Må rive lasteterminal først
-STR_3048_STATIONS                                               :{WHITE}{STRING} - {COMMA16} Stasjoner
+STR_3048_STATIONS                                               :{WHITE}{STRING} - {COMMA} Stasjoner
 STR_3049_0                                                      :{YELLOW}{STATION} {STRINL 0x30D1}
 STR_304A_NONE                                                   :{YELLOW}- Ingen -
 STR_304B_SITE_UNSUITABLE                                        :{WHITE}...upassende område
@@ -1735,7 +1735,7 @@
 STR_4002_SAVE                                                   :{BLACK}Lagre
 STR_4003_DELETE                                                 :{BLACK}Slett
 STR_4004                                                        :{STRING}, {DATE_LONG}
-STR_4005_BYTES_FREE                                             :{BLACK}{COMMA32} megabyte ledig
+STR_4005_BYTES_FREE                                             :{BLACK}{COMMA} megabyte ledig
 STR_4006_UNABLE_TO_READ_DRIVE                                   :{BLACK}Kan ikke lese fra disk
 STR_4007_GAME_SAVE_FAILED                                       :{WHITE}Lagring av spillet feilet
 STR_4008_UNABLE_TO_DELETE_FILE                                  :{WHITE}Kan ikke slette fil
@@ -1796,7 +1796,7 @@
 ############ range for requires	ends
 
 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Produksjon sist måned:
-STR_482B_TRANSPORTED                                            :{YELLOW}{STRING}{BLACK} ({COMMA16}% transportert)
+STR_482B_TRANSPORTED                                            :{YELLOW}{STRING}{BLACK} ({COMMA}% transportert)
 STR_482C_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Sentrer bildet på industriområdet
 STR_482D_NEW_UNDER_CONSTRUCTION                                 :{BLACK}{BIGFONT}Ny {STRING} under bygging i nærheten av {TOWN}!
 STR_482E_NEW_BEING_PLANTED_NEAR                                 :{BLACK}{BIGFONT}Ny {STRING} plantes i nærheten av {TOWN}!
@@ -1813,8 +1813,8 @@
 STR_4839_PRODUCTION_DOWN_BY_50                                  :{BLACK}{BIGFONT}{TOWN} {STRING} sin produksjon har sunket med 50 %
 STR_483A_INSECT_INFESTATION_CAUSES                              :{BLACK}{BIGFONT}Insektinvasjon på {TOWN} {STRING}!{}Produksjonen synker med 50%
 STR_483B_CAN_ONLY_BE_POSITIONED                                 :{WHITE}...kan bare plasseres i nærheten av kartkanten
-STR_INDUSTRY_PROD_GOUP                                          :{BLACK}{BIGFONT}Produksjonen av {STRING} ved {TOWN}{STRING} øker med {COMMA16}%!
-STR_INDUSTRY_PROD_GODOWN                                        :{BLACK}{BIGFONT}Produksjonen av {STRING} ved {TOWN}{STRING} synker med {COMMA16}%!
+STR_INDUSTRY_PROD_GOUP                                          :{BLACK}{BIGFONT}Produksjonen av {STRING} ved {TOWN}{STRING} øker med {COMMA}%!
+STR_INDUSTRY_PROD_GODOWN                                        :{BLACK}{BIGFONT}Produksjonen av {STRING} ved {TOWN}{STRING} synker med {COMMA}%!
 
 ##id 0x5000
 STR_5000_TRAIN_IN_TUNNEL                                        :{WHITE}Tog i tunnelen
@@ -1877,10 +1877,10 @@
 ##id 0x6000
 STR_SV_EMPTY                                                    :
 STR_SV_UNNAMED                                                  :Uten navn{SKIP}
-STR_SV_TRAIN_NAME                                               :Tog {COMMA16}
-STR_SV_ROADVEH_NAME                                             :Kjøretøy {COMMA16}
-STR_SV_SHIP_NAME                                                :Skip {COMMA16}
-STR_SV_AIRCRAFT_NAME                                            :Fly {COMMA16}
+STR_SV_TRAIN_NAME                                               :Tog {COMMA}
+STR_SV_ROADVEH_NAME                                             :Kjøretøy {COMMA}
+STR_SV_SHIP_NAME                                                :Skip {COMMA}
+STR_SV_AIRCRAFT_NAME                                            :Fly {COMMA}
 
 STR_SV_STNAME                                                   :{STRING}
 STR_SV_STNAME_NORTH                                             :{STRING} Nord
@@ -1930,12 +1930,12 @@
 ############ range for difficulty levels ends
 
 ############ range for difficulty settings starts
-STR_6805_MAXIMUM_NO_COMPETITORS                                 :{LTBLUE}Maks. antall konkurrenter: {ORANGE}{COMMA16}
+STR_6805_MAXIMUM_NO_COMPETITORS                                 :{LTBLUE}Maks. antall konkurrenter: {ORANGE}{COMMA}
 STR_6806_COMPETITOR_START_TIME                                  :{LTBLUE}Konkurrentenes starttidspunkt: {ORANGE}{STRING}
 STR_6807_NO_OF_TOWNS                                            :{LTBLUE}Antall byer: {ORANGE}{STRING}
 STR_6808_NO_OF_INDUSTRIES                                       :{LTBLUE}Antall industrier: {ORANGE}{STRING}
 STR_6809_MAXIMUM_INITIAL_LOAN_000                               :{LTBLUE}Maksimalt startlån: {ORANGE}{CURRENCY}
-STR_680A_INITIAL_INTEREST_RATE                                  :{LTBLUE}Startrente: {ORANGE}{COMMA16}%
+STR_680A_INITIAL_INTEREST_RATE                                  :{LTBLUE}Startrente: {ORANGE}{COMMA}%
 STR_680B_VEHICLE_RUNNING_COSTS                                  :{LTBLUE}Driftskostnader for kjøretøy: {ORANGE}{STRING}
 STR_680C_CONSTRUCTION_SPEED_OF_COMPETITOR                       :{LTBLUE}Konstruksjonshastighet hos konkurrenter: {ORANGE}{STRING}
 STR_680D_INTELLIGENCE_OF_COMPETITORS                            :{LTBLUE}Konkurrentenes intelligens: {ORANGE}{STRING}
@@ -1994,7 +1994,7 @@
 ##id 0x7000
 STR_7000                                                        :
 STR_7001                                                        :{WHITE}{STRING} {BLACK}{STRING}
-STR_7002_PLAYER                                                 :(Spiller {COMMA16})
+STR_7002_PLAYER                                                 :(Spiller {COMMA})
 STR_7004_NEW_FACE                                               :{BLACK}Nytt ansikt
 STR_7005_COLOR_SCHEME                                           :{BLACK}Firmafarge
 STR_7006_COLOR_SCHEME                                           :{GOLD}Firmafarge:
@@ -2028,7 +2028,7 @@
 STR_7022_INCOME_GRAPH                                           :{WHITE}Inntektsgraf
 STR_CURRCOMPACT32                                               :{CURRCOMPACT}
 STR_CURRCOMPACT64                                               :{CURRCOMPACT64}
-STR_7024                                                        :{COMMA32}
+STR_7024                                                        :{COMMA}
 STR_7025_OPERATING_PROFIT_GRAPH                                 :{WHITE}Overskuddsgraf
 STR_7026_BANK_BALANCE                                           :{WHITE}Saldo
 STR_7027_LOAN                                                   :{WHITE}Lån
@@ -2052,14 +2052,14 @@
 STR_7037_PRESIDENT                                              :{WHITE}{STRING}{}{GOLD}(Sjef)
 STR_7038_INAUGURATED                                            :{GOLD}Grunnlagt: {WHITE}{NUMU16}
 STR_7039_VEHICLES                                               :{GOLD}Kjøretøy:
-STR_703A_TRAIN                                                  :{WHITE}{COMMA16} tog
-STR_703B_TRAINS                                                 :{WHITE}{COMMA16} tog
-STR_703C_ROAD_VEHICLE                                           :{WHITE}{COMMA16} kjøretøy
-STR_703D_ROAD_VEHICLES                                          :{WHITE}{COMMA16} kjøretøy
-STR_703E_AIRCRAFT                                               :{WHITE}{COMMA16} fly
-STR_703F_AIRCRAFT                                               :{WHITE}{COMMA16} fly
-STR_7040_SHIP                                                   :{WHITE}{COMMA16} skip
-STR_7041_SHIPS                                                  :{WHITE}{COMMA16} skip
+STR_703A_TRAIN                                                  :{WHITE}{COMMA} tog
+STR_703B_TRAINS                                                 :{WHITE}{COMMA} tog
+STR_703C_ROAD_VEHICLE                                           :{WHITE}{COMMA} kjøretøy
+STR_703D_ROAD_VEHICLES                                          :{WHITE}{COMMA} kjøretøy
+STR_703E_AIRCRAFT                                               :{WHITE}{COMMA} fly
+STR_703F_AIRCRAFT                                               :{WHITE}{COMMA} fly
+STR_7040_SHIP                                                   :{WHITE}{COMMA} skip
+STR_7041_SHIPS                                                  :{WHITE}{COMMA} skip
 STR_7042_NONE                                                   :{WHITE}Ingen
 STR_7043_FACE_SELECTION                                         :{WHITE}Velg utseende
 STR_7044_MALE                                                   :{BLACK}Mann
@@ -2124,8 +2124,8 @@
 STR_707A_SELL_25_SHARE_IN_THIS_COMPANY                          :{BLACK}Selg 25% av aksjene du eier
 STR_707B_CAN_T_BUY_25_SHARE_IN_THIS                             :{WHITE}Kan ikke kjøpe 25% av aksjene...
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}Kan ikke selge 25% av aksjene...
-STR_707D_OWNED_BY                                               :{WHITE}({COMMA16}% eies av {STRING})
-STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA16}% eies av {STRING}{}   {COMMA16}% eies av {STRING})
+STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% eies av {STRING})
+STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}% eies av {STRING}{}   {COMMA}% eies av {STRING})
 STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{STRING} har blitt kjøpt opp av {STRING}!
 STR_7080_PROTECTED                                              :{WHITE}Dette selskapet selger ikke aksjer enda...
 
@@ -2400,8 +2400,8 @@
 STR_8801_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Innbyggerne jubler . . .{}Første tog ankommer {STATION}!
 STR_8802_DETAILS                                                :{WHITE}{STRING} (Detaljer)
 STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}Tog i veien
-STR_8804                                                        :{SETX 10}{COMMA8}: {STRING}
-STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA8}: {STRING}
+STR_8804                                                        :{SETX 10}{COMMA}: {STRING}
+STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING}
 STR_8806_GO_TO                                                  :Kjør til {STATION}
 STR_8807_GO_TO_TRANSFER                                         :Gå til {STATION} (Overfør og ta last)
 STR_8808_GO_TO_UNLOAD                                           :Gå til {STATION} (Last av)
@@ -2427,13 +2427,13 @@
 STR_UNKNOWN_DESTINATION                                         :Ukjent destinasjon
 STR_8812_EMPTY                                                  :{LTBLUE}Tom
 STR_8813_FROM                                                   :{LTBLUE}{CARGO} fra {STATION}
-STR_8814_TRAIN_IS_WAITING_IN_DEPOT                              :{WHITE}Tog {COMMA16} venter i togstallen
+STR_8814_TRAIN_IS_WAITING_IN_DEPOT                              :{WHITE}Tog {COMMA} venter i togstallen
 STR_8815_NEW_VEHICLES                                           :{BLACK}Nye tog/vogner
 STR_8816                                                        :{BLACK}-
 STR_8818_INFORMATION                                            :{BLACK}Informasjon
 STR_8819_TRAIN_TOO_LONG                                         :{WHITE}Toget er for langt
 STR_881A_TRAINS_CAN_ONLY_BE_ALTERED                             :{WHITE}Tog kan bare endres når det står stille i togstallen
-STR_881B_TRAINS                                                 :{WHITE}{STRING} - {COMMA16} Tog
+STR_881B_TRAINS                                                 :{WHITE}{STRING} - {COMMA} Tog
 STR_881C_NEW_RAIL_VEHICLES                                      :{WHITE}Nye tog/vogner for jernbane
 STR_881D_NEW_MONORAIL_VEHICLES                                  :{WHITE}Nye tog/vogner for Monorail
 STR_881E_NEW_MAGLEV_VEHICLES                                    :{WHITE}Nye tog/vogner for Maglev
@@ -2467,8 +2467,8 @@
 STR_8839_CAN_T_SELL_RAILROAD_VEHICLE                            :{WHITE}Kan ikke selge jernbanekjøretøy...
 STR_883A_UNABLE_TO_FIND_ROUTE_TO                                :{WHITE}Kan ikke finne en togstall i nærheten
 STR_883B_CAN_T_STOP_START_TRAIN                                 :{WHITE}Kan ikke stoppe/starte tog...
-STR_883C_SERVICING_INTERVAL_DAYS                                :{BLACK}Service interval: {LTBLUE}{COMMA16}dager{BLACK}   Sist service: {LTBLUE}{DATE_LONG}
-STR_SERVICING_INTERVAL_PERCENT                                  :{BLACK}Service intervall: {LTBLUE}{COMMA16}%{BLACK}   Sist service: {LTBLUE}{DATE_LONG}
+STR_883C_SERVICING_INTERVAL_DAYS                                :{BLACK}Service interval: {LTBLUE}{COMMA}dager{BLACK}   Sist service: {LTBLUE}{DATE_LONG}
+STR_SERVICING_INTERVAL_PERCENT                                  :{BLACK}Service intervall: {LTBLUE}{COMMA}%{BLACK}   Sist service: {LTBLUE}{DATE_LONG}
 STR_883D_TRAINS_CLICK_ON_TRAIN_FOR                              :{BLACK}Tog - trykk på tog for mer informasjon
 STR_883E_BUILD_NEW_TRAINS_REQUIRES                              :{BLACK}Bygg nye tog (trenger en togstall)
 STR_883F_TRAINS_CLICK_ON_TRAIN_FOR                              :{BLACK}Tog - trykk på tog for mer info. Dra vogn for å legge til/fjerne fra tog
@@ -2501,12 +2501,12 @@
 STR_SERVICE_HINT                                                :{BLACK}Hopp over ordren med mindre service trengs.
 STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}Nytt {STRING} er nå tilgjengelig!
 STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
-STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Koster: {CURRENCY} Vekt: {COMMA16}t{}Fart: {VELOCITY}  Kraft: {COMMA16}hk{}Driftkostnader: {CURRENCY}/år{}Kapasitet: {STRING}
+STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Koster: {CURRENCY} Vekt: {COMMA}t{}Fart: {VELOCITY}  Kraft: {COMMA}hk{}Driftkostnader: {CURRENCY}/år{}Kapasitet: {STRING}
 STR_885C_BROKEN_DOWN                                            :{RED}Havarert
 STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Alder: {LTBLUE}{STRING}{BLACK}   Driftkostnad: {LTBLUE}{CURRENCY}/år
-STR_885E_WEIGHT_T_POWER_HP_MAX_SPEED                            :{BLACK}Vekt: {LTBLUE}{COMMA16}t  {BLACK}Kraft: {LTBLUE}{COMMA32}hk{BLACK} Maks. fart: {LTBLUE}{VELOCITY}
+STR_885E_WEIGHT_T_POWER_HP_MAX_SPEED                            :{BLACK}Vekt: {LTBLUE}{COMMA}t  {BLACK}Kraft: {LTBLUE}{COMMA}hk{BLACK} Maks. fart: {LTBLUE}{VELOCITY}
 STR_885F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Inntekt i år: {LTBLUE}{CURRENCY}  (sist år: {CURRENCY})
-STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Pålitelighet: {LTBLUE}{COMMA8}%  {BLACK}Havarier siden sist service: {LTBLUE}{COMMA16}
+STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Pålitelighet: {LTBLUE}{COMMA}%  {BLACK}Havarier siden sist service: {LTBLUE}{COMMA}
 STR_8861_STOPPED                                                :{RED}Stoppet
 STR_8862_CAN_T_MAKE_TRAIN_PASS_SIGNAL                           :{WHITE}Kan ikke tvinge tog til å kjøre på rødt lys ved fare...
 STR_8863_CRASHED                                                :{RED}Krasjet
@@ -2514,7 +2514,7 @@
 STR_8865_NAME_TRAIN                                             :{WHITE}Navngi tog
 STR_8866_CAN_T_NAME_TRAIN                                       :{WHITE}Kan ikke navngi tog...
 STR_8867_NAME_TRAIN                                             :{BLACK}Navngi tog
-STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Togkrasj!{}{COMMA16} dør i kollisjonen
+STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Togkrasj!{}{COMMA} dør i kollisjonen
 STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}Kan ikke snu toget...
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Gi tog/vogn nytt navn
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Kan ikke gi tog/vogn nytt navn...
@@ -2526,7 +2526,7 @@
 
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Kjøretøy i veien
-STR_9001_ROAD_VEHICLES                                          :{WHITE}{STRING} - {COMMA16} Kjøretøy
+STR_9001_ROAD_VEHICLES                                          :{WHITE}{STRING} - {COMMA} Kjøretøy
 STR_9002                                                        :{WHITE}{STRING}
 STR_9003_ROAD_VEHICLE_DEPOT                                     :{WHITE}{TOWN} Garasje
 STR_9004_NEW_VEHICLES                                           :{BLACK}Nye kjøretøy
@@ -2540,13 +2540,13 @@
 STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Alder: {LTBLUE}{STRING}{BLACK}   Driftkostnader: {LTBLUE}{CURRENCY}/år
 STR_900E_MAX_SPEED                                              :{BLACK}Maks. fart: {LTBLUE}{VELOCITY}
 STR_900F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Inntekt i år: {LTBLUE}{CURRENCY}  (sist år: {CURRENCY})
-STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Pålitelighet: {LTBLUE}{COMMA8}%  {BLACK}Havarier siden sist service: {LTBLUE}{COMMA16}
+STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Pålitelighet: {LTBLUE}{COMMA}%  {BLACK}Havarier siden sist service: {LTBLUE}{COMMA}
 STR_9011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Bygget: {LTBLUE}{NUMU16}{BLACK} Verdi: {LTBLUE}{CURRENCY}
 STR_9012_CAPACITY                                               :{BLACK}Kapasitet: {LTBLUE}{STRING}
 STR_9013_MUST_BE_STOPPED_INSIDE                                 :{WHITE}må være stoppet i en garasje
 STR_9014_CAN_T_SELL_ROAD_VEHICLE                                :{WHITE}Kan ikke selge kjøretøy...
 STR_9015_CAN_T_STOP_START_ROAD_VEHICLE                          :{WHITE}Kan ikke starte/stoppe kjøretøy...
-STR_9016_ROAD_VEHICLE_IS_WAITING                                :{WHITE}Kjøretøy {COMMA16} er i garasjen
+STR_9016_ROAD_VEHICLE_IS_WAITING                                :{WHITE}Kjøretøy {COMMA} er i garasjen
 STR_HEADING_FOR_ROAD_DEPOT                                      :{LTBLUE}Er på vei til {TOWN} garasje
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{LTBLUE}Er på vei til {TOWN} garasje, {VELOCITY}
 STR_9018_CAN_T_SEND_VEHICLE_TO_DEPOT                            :{WHITE}Kan ikke sende kjøretøy til garasje...
@@ -2575,7 +2575,7 @@
 STR_902F_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Innbyggerne jubler . . .{}Første buss ankommer {STATION}!
 STR_9030_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Innbyggerne jubler . . .{}Første lastebil ankommer {STATION}!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Kollisjon!{}Sjåfør dør etter kollisjon med tog
-STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Kollisjon!{}{COMMA16} dør etter kollisjon med tog
+STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Kollisjon!{}{COMMA} dør etter kollisjon med tog
 STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}Kan ikke snu...
 STR_9034_RENAME                                                 :{BLACK}Endre navn
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Endre navnet til kjøretøytypen
@@ -2590,7 +2590,7 @@
 STR_9802_CAN_T_BUILD_DOCK_HERE                                  :{WHITE}Kan ikke bygge havn her...
 STR_9803_SHIP_DEPOT                                             :{WHITE}{TOWN} Skipsdepot
 STR_9804_NEW_SHIPS                                              :{BLACK}Nye skip
-STR_9805_SHIPS                                                  :{WHITE}{STRING} - {COMMA16} Skip
+STR_9805_SHIPS                                                  :{WHITE}{STRING} - {COMMA} Skip
 STR_9806_CAN_T_BUILD_SHIPS                                      :{WHITE}Kan ikke bygge skip...
 STR_9807_MUST_BUILD_SHIP_DEPOT_FIRST                            :{WHITE}Må rive skipsdepotet først
 STR_9808_NEW_SHIPS                                              :{WHITE}Nye skip
@@ -2605,7 +2605,7 @@
 STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Alder: {LTBLUE}{STRING}{BLACK}   Driftkostnader: {LTBLUE}{CURRENCY}/år
 STR_9813_MAX_SPEED                                              :{BLACK}Maks. fart: {LTBLUE}{VELOCITY}
 STR_9814_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Inntekt i år: {LTBLUE}{CURRENCY}  (sist år: {CURRENCY})
-STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Pålitelighet: {LTBLUE}{COMMA8}%  {BLACK}Havarier siden sist service: {LTBLUE}{COMMA16}
+STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Pålitelighet: {LTBLUE}{COMMA}%  {BLACK}Havarier siden sist service: {LTBLUE}{COMMA}
 STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Bygget: {LTBLUE}{NUMU16}{BLACK} Verdi: {LTBLUE}{CURRENCY}
 STR_9817_CAPACITY                                               :{BLACK}Kapasitet: {LTBLUE}{STRING}
 STR_9818_CAN_T_STOP_START_SHIP                                  :{WHITE}Kan ikke starte/stoppe skip...
@@ -2613,7 +2613,7 @@
 STR_981A_UNABLE_TO_FIND_LOCAL_DEPOT                             :{WHITE}Kan ikke finne et depot i nærheten
 STR_HEADING_FOR_SHIP_DEPOT                                      :{LTBLUE}Er på vei mot {TOWN} skipsdepot
 STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{LTBLUE}Er på vei mot {TOWN} skipsdepot, {VELOCITY}
-STR_981C_SHIP_IS_WAITING_IN_DEPOT                               :{WHITE}Skip {COMMA16} venter i depotet
+STR_981C_SHIP_IS_WAITING_IN_DEPOT                               :{WHITE}Skip {COMMA} venter i depotet
 STR_981D_BUILD_SHIP_DOCK                                        :{BLACK}Bygg havn
 STR_981E_BUILD_SHIP_DEPOT_FOR_BUILDING                          :{BLACK}Bygg skipsdepot (trengs for bygging og service av skip)
 STR_981F_SHIPS_CLICK_ON_SHIP_FOR                                :{BLACK}Skip - trykk på skip for mer informasjon
@@ -2664,19 +2664,19 @@
 STR_A005_NEW_AIRCRAFT                                           :{WHITE}Nytt fly
 STR_A006_BUILD_AIRCRAFT                                         :{BLACK}Bygg fly
 STR_A008_CAN_T_BUILD_AIRCRAFT                                   :{WHITE}Kan ikke bygge fly...
-STR_A009_AIRCRAFT                                               :{WHITE}{STRING} - {COMMA16} Fly
+STR_A009_AIRCRAFT                                               :{WHITE}{STRING} - {COMMA} Fly
 STR_A00A                                                        :{WHITE}{STRING}
 STR_A00B_ORDERS                                                 :{WHITE}{STRING} (Ordre)
 STR_A00C_DETAILS                                                :{WHITE}{STRING} (Detaljer)
 STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Alder: {LTBLUE}{STRING}{BLACK}   Driftkostnader: {LTBLUE}{CURRENCY}/år
 STR_A00E_MAX_SPEED                                              :{BLACK}Maks. fart: {LTBLUE}{VELOCITY}
 STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Inntekt i år: {LTBLUE}{CURRENCY}  (sist år: {CURRENCY})
-STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Pålitelighet: {LTBLUE}{COMMA8}%  {BLACK}Havarier siden sist service: {LTBLUE}{COMMA16}
+STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Pålitelighet: {LTBLUE}{COMMA}%  {BLACK}Havarier siden sist service: {LTBLUE}{COMMA}
 STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Bygget: {LTBLUE}{NUMU16}{BLACK} Verdi: {LTBLUE}{CURRENCY}
 STR_A012_CAN_T_SEND_AIRCRAFT_TO                                 :{WHITE}Kan ikke sende fly til hangar...
 STR_HEADING_FOR_HANGAR                                          :{LTBLUE}Er på vei til {STATION} hangar
 STR_HEADING_FOR_HANGAR_VEL                                      :{LTBLUE}Er på vei til {STATION} hangar, {VELOCITY}
-STR_A014_AIRCRAFT_IS_WAITING_IN                                 :{WHITE}Fly {COMMA16} venter i hangaren
+STR_A014_AIRCRAFT_IS_WAITING_IN                                 :{WHITE}Fly {COMMA} venter i hangaren
 STR_A015_AIRCRAFT_IN_THE_WAY                                    :{WHITE}Det er et fly i veien
 STR_A016_CAN_T_STOP_START_AIRCRAFT                              :{WHITE}Kan ikke stoppe/starte flyet...
 STR_A017_AIRCRAFT_IS_IN_FLIGHT                                  :{WHITE}Flyet er i luften
@@ -2702,14 +2702,14 @@
 STR_A02B_SHOW_AIRCRAFT_DETAILS                                  :{BLACK}Vis detaljer om flyet
 STR_A02C_NEW_AIRCRAFT_NOW_AVAILABLE                             :{BLACK}{BIGFONT}Nytt fly er nå tilgjengelig
 STR_A02D                                                        :{BLACK}{BIGFONT}{STRING}
-STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Koster: {CURRENCY} Maks. fart: {VELOCITY}{}Kapasitet: {COMMA16} passasjerer, {COMMA16} sekker post {}Driftkostnader: {CURRENCY}/år
+STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Koster: {CURRENCY} Maks. fart: {VELOCITY}{}Kapasitet: {COMMA} passasjerer, {COMMA} sekker post {}Driftkostnader: {CURRENCY}/år
 
 STR_A030_NAME_AIRCRAFT                                          :{WHITE}Navngi fly
 STR_A031_CAN_T_NAME_AIRCRAFT                                    :{WHITE}Kan ikke navngi fly...
 STR_A032_NAME_AIRCRAFT                                          :{BLACK}Navngi fly
 STR_A033_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Innbyggerne jubler . . .{}Første fly ankommer {STATION}!
-STR_A034_PLANE_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Flykrasj!{}{COMMA16} dør ved {STATION}
-STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Flystyrt!{}Fly gikk tom for drivstoff, {COMMA16} døde i eksplosjon!
+STR_A034_PLANE_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Flykrasj!{}{COMMA} dør ved {STATION}
+STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Flystyrt!{}Fly gikk tom for drivstoff, {COMMA} døde i eksplosjon!
 STR_A035_DESTINATIONS                                           :{TINYFONT}{BLACK}Stoppested:
 STR_A036                                                        :{TINYFONT}{BLACK}{STATION}
 STR_A037_RENAME                                                 :{BLACK}Endre navn
@@ -2735,7 +2735,7 @@
 STR_B003_FACTORY_DESTROYED_IN_SUSPICIOUS                        :{BLACK}{BIGFONT}Fabrikk ødelagt på mistenkeligvis i nærheten av {TOWN}!
 STR_B004_UFO_LANDS_NEAR                                         :{BLACK}{BIGFONT}"UFO" lander i nærheten av {TOWN}!
 STR_B005_COAL_MINE_SUBSIDENCE_LEAVES                            :{BLACK}{BIGFONT}Gruvegangkollaps fører til store ødeleggelser i nærheten av {TOWN}!
-STR_B006_FLOOD_VEHICLE_DESTROYED                                :{BLACK}{BIGFONT}Floder over!{}Minst {COMMA16} presumed fortapt eller død etter dødlig flod!
+STR_B006_FLOOD_VEHICLE_DESTROYED                                :{BLACK}{BIGFONT}Floder over!{}Minst {COMMA} presumed fortapt eller død etter dødlig flod!
 
 STR_BRIBE_FAILED                                                :{WHITE}Ditt forsøk på bestikkelser
 STR_BRIBE_FAILED_2                                              :{WHITE}har blitt oppdaget av en regional inspektør.
@@ -2745,7 +2745,7 @@
 STR_PERFORMANCE_DETAIL                                          :{WHITE}Detaljert prestasjons nivå
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Detalje
 STR_PERFORMANCE_DETAIL_AMOUNT_CURRENCY                          :{BLACK}({CURRCOMPACT}/{CURRCOMPACT})
-STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA32}/{COMMA32})
+STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA}/{COMMA})
 STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{INT32}%
 SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{INT32}
 ############ Those following lines need to be in this order!!
@@ -2780,7 +2780,7 @@
 STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID:
 
 STR_CURRENCY_WINDOW                                             :{WHITE}Vanlig valuta
-STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Valutakurs: {ORANGE}{CURRENCY} = {POUNDSIGN} {COMMA16}
+STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Valutakurs: {ORANGE}{CURRENCY} = {POUNDSIGN} {COMMA}
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Deler:
 STR_CURRENCY_PREFIX                                             :{LTBLUE}Prefiks:
 STR_CURRENCY_SUFFIX                                             :{LTBLUE}Suffiks:
@@ -2794,10 +2794,10 @@
 STR_PLANE                                                       :{BLACK}{PLANE}
 STR_SHIP                                                        :{BLACK}{SHIP}
 
-STR_SCHEDULED_TRAINS                                            :{WHITE}{STATION} - {COMMA16} Tog
-STR_SCHEDULED_ROAD_VEHICLES                                     :{WHITE}{STATION} - {COMMA16} Kjøretøy
-STR_SCHEDULED_AIRCRAFT                                          :{WHITE}{STATION} - {COMMA16} Fly
-STR_SCHEDULED_SHIPS                                             :{WHITE}{STATION} - {COMMA16} Skip
+STR_SCHEDULED_TRAINS                                            :{WHITE}{STATION} - {COMMA} Tog
+STR_SCHEDULED_ROAD_VEHICLES                                     :{WHITE}{STATION} - {COMMA} Kjøretøy
+STR_SCHEDULED_AIRCRAFT                                          :{WHITE}{STATION} - {COMMA} Fly
+STR_SCHEDULED_SHIPS                                             :{WHITE}{STATION} - {COMMA} Skip
 
 STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Vis alle tog som har denne stasjonen på deres timeplan
 STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Vis alle kjøretøy som har denne stasjonen på deres timeplan
@@ -2819,7 +2819,7 @@
 STR_REPLACE_HELP                                                :{BLACK}Dette verktøyet lar deg bytte ut en type lokomotiv med en annen. Dette blir gjort neste gang lokomotivet er innom et depot.
 
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
-STR_SIGN_LIST_CAPTION                                           :{WHITE}Skiltliste - {COMMA16} Skilt
+STR_SIGN_LIST_CAPTION                                           :{WHITE}Skiltliste - {COMMA} Skilt
 
 ############ Lists rail types
 
@@ -2829,16 +2829,16 @@
 
 ############ End of list of rail types
 
-STR_TINY_BLACK                                                  :{BLACK}{TINYFONT}{COMMA16}
+STR_TINY_BLACK                                                  :{BLACK}{TINYFONT}{COMMA}
 
-STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Kostnad: {GOLD}{CURRENCY}{BLACK} Vekt: {GOLD}{COMMA16}t
-STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Hastighet: {GOLD}{VELOCITY}{BLACK}   Effekt: {GOLD}{COMMA32}hk
+STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Kostnad: {GOLD}{CURRENCY}{BLACK} Vekt: {GOLD}{COMMA}t
+STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Hastighet: {GOLD}{VELOCITY}{BLACK}   Effekt: {GOLD}{COMMA}hk
 STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}Driftskostnad: {GOLD}{CURRENCY}/år
 STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Kapasitet: {GOLD}{STRING} {STRING}
-STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Markedsintrodusert: {GOLD}{NUMU16}{BLACK} Levetid: {GOLD}{COMMA16} år
-STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Maks pålitelighet: {GOLD}{COMMA8}%
+STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Markedsintrodusert: {GOLD}{NUMU16}{BLACK} Levetid: {GOLD}{COMMA} år
+STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Maks pålitelighet: {GOLD}{COMMA}%
 STR_PURCHASE_INFO_COST                                          :{BLACK}Kostnad: {GOLD}{CURRENCY}
-STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Vekt: {GOLD}{COMMA16}t  ({COMMA16}t)
+STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Vekt: {GOLD}{COMMA}t  ({COMMA}t)
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Kostnad: {GOLD}{CURRENCY}{BLACK} Hastighet: {GOLD}{VELOCITY}
-STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Kapasitet: {GOLD}{COMMA16} passasjerer, {COMMA16} sekker post
-STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Lokomotivvogner: {GOLD}+{COMMA16}hk{BLACK} Vekt: {GOLD}+{COMMA8}t
+STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Kapasitet: {GOLD}{COMMA} passasjerer, {COMMA} sekker post
+STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Lokomotivvogner: {GOLD}+{COMMA}hk{BLACK} Vekt: {GOLD}+{COMMA}t
--- a/lang/polish.txt	Thu Jul 14 09:53:52 2005 +0000
+++ b/lang/polish.txt	Thu Jul 14 15:10:20 2005 +0000
@@ -82,69 +82,69 @@
 STR_004C_PLASTIC                                                :Plastik
 STR_004D_FIZZY_DRINK                                            :Napoje gazowane
 STR_004E                                                        :
-STR_004F_PASSENGER                                              :{COMMA16} pasazerow
-STR_0050_TON_OF_COAL                                            :{COMMA16} ton wegla
-STR_0051_BAG_OF_MAIL                                            :{COMMA16} paczek poczty
+STR_004F_PASSENGER                                              :{COMMA} pasazerow
+STR_0050_TON_OF_COAL                                            :{COMMA} ton wegla
+STR_0051_BAG_OF_MAIL                                            :{COMMA} paczek poczty
 STR_0052_OF_OIL                                                 :{VOLUME} ropy
-STR_0053_ITEM_OF_LIVESTOCK                                      :{COMMA16} sztuk zywca
-STR_0054_CRATE_OF_GOODS                                         :{COMMA16} towarow
-STR_0055_TON_OF_GRAIN                                           :{COMMA16} ton zboza
-STR_0056_TON_OF_WOOD                                            :{COMMA16} ton drewna
-STR_0057_TON_OF_IRON_ORE                                        :{COMMA16} ton rudy zelaza
-STR_0058_TON_OF_STEEL                                           :{COMMA16} ton stali
-STR_0059_BAG_OF_VALUABLES                                       :{COMMA16} kosztownosci
-STR_005A_TON_OF_COPPER_ORE                                      :{COMMA16} ton rudy miedzi
-STR_005B_TON_OF_MAIZE                                           :{COMMA16} ton kukurydzy
-STR_005C_TON_OF_FRUIT                                           :{COMMA16} ton owocow
-STR_005D_BAG_OF_DIAMONDS                                        :{COMMA16} paczek diamentow
-STR_005E_TON_OF_FOOD                                            :{COMMA16} ton zywnosci
-STR_005F_TON_OF_PAPER                                           :{COMMA16} ton papieru
-STR_0060_BAG_OF_GOLD                                            :{COMMA16} zlota
+STR_0053_ITEM_OF_LIVESTOCK                                      :{COMMA} sztuk zywca
+STR_0054_CRATE_OF_GOODS                                         :{COMMA} towarow
+STR_0055_TON_OF_GRAIN                                           :{COMMA} ton zboza
+STR_0056_TON_OF_WOOD                                            :{COMMA} ton drewna
+STR_0057_TON_OF_IRON_ORE                                        :{COMMA} ton rudy zelaza
+STR_0058_TON_OF_STEEL                                           :{COMMA} ton stali
+STR_0059_BAG_OF_VALUABLES                                       :{COMMA} kosztownosci
+STR_005A_TON_OF_COPPER_ORE                                      :{COMMA} ton rudy miedzi
+STR_005B_TON_OF_MAIZE                                           :{COMMA} ton kukurydzy
+STR_005C_TON_OF_FRUIT                                           :{COMMA} ton owocow
+STR_005D_BAG_OF_DIAMONDS                                        :{COMMA} paczek diamentow
+STR_005E_TON_OF_FOOD                                            :{COMMA} ton zywnosci
+STR_005F_TON_OF_PAPER                                           :{COMMA} ton papieru
+STR_0060_BAG_OF_GOLD                                            :{COMMA} zlota
 STR_0061_OF_WATER                                               :{VOLUME} wody
-STR_0062_TON_OF_WHEAT                                           :{COMMA16} ton pszenicy
+STR_0062_TON_OF_WHEAT                                           :{COMMA} ton pszenicy
 STR_0063_OF_RUBBER                                              :{VOLUME} kauczuku
-STR_0064_TON_OF_SUGAR                                           :{COMMA16} ton cukru
-STR_0065_TOY                                                    :{COMMA16} zabawek
-STR_0066_BAG_OF_CANDY                                           :{COMMA16} paczek slodyczy
+STR_0064_TON_OF_SUGAR                                           :{COMMA} ton cukru
+STR_0065_TOY                                                    :{COMMA} zabawek
+STR_0066_BAG_OF_CANDY                                           :{COMMA} paczek slodyczy
 STR_0067_OF_COLA                                                :{VOLUME} coli
-STR_0068_TON_OF_COTTON_CANDY                                    :{COMMA16} ton waty cukrowej
-STR_0069_BUBBLE                                                 :{COMMA16} babelkow
-STR_006A_TON_OF_TOFFEE                                          :{COMMA16} ton tofi
-STR_006B_BATTERY                                                :{COMMA16} baterii
+STR_0068_TON_OF_COTTON_CANDY                                    :{COMMA} ton waty cukrowej
+STR_0069_BUBBLE                                                 :{COMMA} babelkow
+STR_006A_TON_OF_TOFFEE                                          :{COMMA} ton tofi
+STR_006B_BATTERY                                                :{COMMA} baterii
 STR_006C_OF_PLASTIC                                             :{VOLUME} plastiku
-STR_006D_FIZZY_DRINK                                            :{COMMA16} napoju gazowanego
+STR_006D_FIZZY_DRINK                                            :{COMMA} napoju gazowanego
 STR_006E                                                        :
-STR_006F_PASSENGERS                                             :{COMMA16} pasazerow
-STR_0070_TONS_OF_COAL                                           :{COMMA16} ton wegla
-STR_0071_BAGS_OF_MAIL                                           :{COMMA16} paczek z poczta
+STR_006F_PASSENGERS                                             :{COMMA} pasazerow
+STR_0070_TONS_OF_COAL                                           :{COMMA} ton wegla
+STR_0071_BAGS_OF_MAIL                                           :{COMMA} paczek z poczta
 STR_0072_OF_OIL                                                 :{VOLUME} ropy
-STR_0073_ITEMS_OF_LIVESTOCK                                     :{COMMA16} sztuk zywca
-STR_0074_CRATES_OF_GOODS                                        :{COMMA16} towarow
-STR_0075_TONS_OF_GRAIN                                          :{COMMA16} ton zboza
-STR_0076_TONS_OF_WOOD                                           :{COMMA16} ton drewna
-STR_0077_TONS_OF_IRON_ORE                                       :{COMMA16} ton rudy zelaza
-STR_0078_TONS_OF_STEEL                                          :{COMMA16} ton stali
-STR_0079_BAGS_OF_VALUABLES                                      :{COMMA16} kosztownosci
-STR_007A_TONS_OF_COPPER_ORE                                     :{COMMA16} ton rudy miedzi
-STR_007B_TONS_OF_MAIZE                                          :{COMMA16} ton kukurydzy
-STR_007C_TONS_OF_FRUIT                                          :{COMMA16} ton owocow
-STR_007D_BAGS_OF_DIAMONDS                                       :{COMMA16} diamentow
-STR_007E_TONS_OF_FOOD                                           :{COMMA16} ton zywnosci
-STR_007F_TONS_OF_PAPER                                          :{COMMA16} ton papieru
-STR_0080_BAGS_OF_GOLD                                           :{COMMA16} zlota
+STR_0073_ITEMS_OF_LIVESTOCK                                     :{COMMA} sztuk zywca
+STR_0074_CRATES_OF_GOODS                                        :{COMMA} towarow
+STR_0075_TONS_OF_GRAIN                                          :{COMMA} ton zboza
+STR_0076_TONS_OF_WOOD                                           :{COMMA} ton drewna
+STR_0077_TONS_OF_IRON_ORE                                       :{COMMA} ton rudy zelaza
+STR_0078_TONS_OF_STEEL                                          :{COMMA} ton stali
+STR_0079_BAGS_OF_VALUABLES                                      :{COMMA} kosztownosci
+STR_007A_TONS_OF_COPPER_ORE                                     :{COMMA} ton rudy miedzi
+STR_007B_TONS_OF_MAIZE                                          :{COMMA} ton kukurydzy
+STR_007C_TONS_OF_FRUIT                                          :{COMMA} ton owocow
+STR_007D_BAGS_OF_DIAMONDS                                       :{COMMA} diamentow
+STR_007E_TONS_OF_FOOD                                           :{COMMA} ton zywnosci
+STR_007F_TONS_OF_PAPER                                          :{COMMA} ton papieru
+STR_0080_BAGS_OF_GOLD                                           :{COMMA} zlota
 STR_0081_OF_WATER                                               :{VOLUME} wody
-STR_0082_TONS_OF_WHEAT                                          :{COMMA16} ton pszenicy
+STR_0082_TONS_OF_WHEAT                                          :{COMMA} ton pszenicy
 STR_0083_OF_RUBBER                                              :{VOLUME} kauczuku
-STR_0084_TONS_OF_SUGAR                                          :{COMMA16} ton cukru
-STR_0085_TOYS                                                   :{COMMA16} zabawek
-STR_0086_BAGS_OF_CANDY                                          :{COMMA16} slodyczy
+STR_0084_TONS_OF_SUGAR                                          :{COMMA} ton cukru
+STR_0085_TOYS                                                   :{COMMA} zabawek
+STR_0086_BAGS_OF_CANDY                                          :{COMMA} slodyczy
 STR_0087_OF_COLA                                                :{VOLUME} coli
-STR_0088_TONS_OF_COTTON_CANDY                                   :{COMMA16} ton waty cukrowej
-STR_0089_BUBBLES                                                :{COMMA16} babelkow
-STR_008A_TONS_OF_TOFFEE                                         :{COMMA16} ton tofi
-STR_008B_BATTERIES                                              :{COMMA16} baterii
+STR_0088_TONS_OF_COTTON_CANDY                                   :{COMMA} ton waty cukrowej
+STR_0089_BUBBLES                                                :{COMMA} babelkow
+STR_008A_TONS_OF_TOFFEE                                         :{COMMA} ton tofi
+STR_008B_BATTERIES                                              :{COMMA} baterii
 STR_008C_OF_PLASTIC                                             :{VOLUME} plastiku
-STR_008D_FIZZY_DRINKS                                           :{COMMA16} napojow gazowanych
+STR_008D_FIZZY_DRINKS                                           :{COMMA} napojow gazowanych
 STR_008E                                                        :
 STR_008F_PS                                                     :{TINYFONT}PS
 STR_0090_CL                                                     :{TINYFONT}CL
@@ -219,8 +219,8 @@
 STR_00DF_GREY                                                   :Szary
 STR_00E0_WHITE                                                  :Bialy
 STR_00E1_TOO_MANY_VEHICLES_IN_GAME                              :{WHITE}Za duzo pojazdow w grze
-STR_00E2                                                        :{BLACK}{COMMA16}
-STR_00E3                                                        :{RED}{COMMA16}
+STR_00E2                                                        :{BLACK}{COMMA}
+STR_00E3                                                        :{RED}{COMMA}
 STR_00E4_LOCATION                                               :{BLACK}Lokalizacja
 STR_00E5_CONTOURS                                               :Uksztaltowanie
 STR_00E6_VEHICLES                                               :Pojazdy
@@ -441,18 +441,18 @@
 STR_0198_PROFIT_THIS_YEAR_LAST_YEAR                             :{TINYFONT}{BLACK}Zysk w tym roku: {CURRENCY} (ostatni rok: {CURRENCY})
 
 ############ range for service numbers starts
-STR_0199_YEAR                                                   :{COMMA16} rok ({COMMA16})
-STR_019A_YEARS                                                  :{COMMA16} lata ({COMMA16})
-STR_019B_YEARS                                                  :{RED}{COMMA16} lata ({COMMA16})
+STR_0199_YEAR                                                   :{COMMA} rok ({COMMA})
+STR_019A_YEARS                                                  :{COMMA} lata ({COMMA})
+STR_019B_YEARS                                                  :{RED}{COMMA} lata ({COMMA})
 ############ range for service numbers ends
 
 STR_019C_ROAD_VEHICLE                                           :Samochod
 STR_019D_AIRCRAFT                                               :Samolot
 STR_019E_SHIP                                                   :Statek
 STR_019F_TRAIN                                                  :Pociag
-STR_01A0_IS_GETTING_OLD                                         :{WHITE}{STRING} {COMMA16} jest stary
-STR_01A1_IS_GETTING_VERY_OLD                                    :{WHITE}{STRING} {COMMA16} jest bardzo stary
-STR_01A2_IS_GETTING_VERY_OLD_AND                                :{WHITE}{STRING} {COMMA16} jest bardzo stary i natychmiast wymaga wymiany
+STR_01A0_IS_GETTING_OLD                                         :{WHITE}{STRING} {COMMA} jest stary
+STR_01A1_IS_GETTING_VERY_OLD                                    :{WHITE}{STRING} {COMMA} jest bardzo stary
+STR_01A2_IS_GETTING_VERY_OLD_AND                                :{WHITE}{STRING} {COMMA} jest bardzo stary i natychmiast wymaga wymiany
 STR_01A3_LAND_AREA_INFORMATION                                  :{WHITE}Informacja o terenie
 STR_01A4_COST_TO_CLEAR_N_A                                      :{BLACK}Koszt czyszczenia: {LTBLUE}N/A
 STR_01A5_COST_TO_CLEAR                                          :{BLACK}Koszt czyszczenia: {LTBLUE}{CURRENCY}
@@ -497,7 +497,7 @@
 STR_01CA_31ST                                                   :31szy
 ############ range for days	ends
 
-STR_01CB                                                        :{TINYFONT}{COMMA16}
+STR_01CB                                                        :{TINYFONT}{COMMA}
 STR_01CC_TOGGLE_LARGE_SMALL_MAP                                 :{BLACK}Przelaczanie miedzy duza/mala mapa
 STR_01CD_SELECT_TUTORIAL_DEMONSTRATION                          :{WHITE}Wybierz Wprowadzenie/Demo
 
@@ -509,7 +509,7 @@
 STR_CARGO_ACCEPTED_5                                            :{BLACK}Akceptowany ladunek: {LTBLUE}{STRING}, {STRING}, {STRING}, {STRING}, {STRING}
 ############ range for cargo acecpted ends
 
-STR_01D1_8                                                      :({COMMA8}/8 {STRING})
+STR_01D1_8                                                      :({COMMA}/8 {STRING})
 STR_01D2_JAZZ_JUKEBOX                                           :{WHITE}Jazz Jukebox
 STR_01D3_SOUND_MUSIC                                            :Dzwiek/muzyka
 STR_01D4_SHOW_SOUND_MUSIC_WINDOW                                :{BLACK}Pokaz okno dzwiek/muzyka
@@ -528,16 +528,16 @@
 STR_01E1_START_PLAYING_MUSIC                                    :{BLACK}Odgrywaj muzyke
 STR_01E2_DRAG_SLIDERS_TO_SET_MUSIC                              :{BLACK}Przesun suwaki zeby ustawic glosnosc dzwiekow i muzyki
 STR_01E3                                                        :{DKGREEN}{TINYFONT}--
-STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA8}
-STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA8}
+STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA}
+STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA}
 STR_01E6                                                        :{DKGREEN}{TINYFONT}------
 STR_01E7                                                        :{DKGREEN}{TINYFONT}"{STRING}"
 STR_01E8_TRACK_XTITLE                                           :{BLACK}{TINYFONT}Sciezka{SETX 88}Tytul
 STR_01E9_SHUFFLE                                                :{TINYFONT}Przypadkowo
 STR_01EA_PROGRAM                                                :{TINYFONT}{BLACK}Program
 STR_01EB_MUSIC_PROGRAM_SELECTION                                :{WHITE}Wybor Programu
-STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA16} "{STRING}"
-STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA16}   "{STRING}"
+STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} "{STRING}"
+STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA}   "{STRING}"
 STR_01EE_TRACK_INDEX                                            :{TINYFONT}{BLACK}Wykaz sciezek
 STR_01EF_PROGRAM                                                :{TINYFONT}{BLACK}Programuj - '{STRING}'
 STR_01F0_CLEAR                                                  :{TINYFONT}{BLACK}Wyczysc
@@ -577,7 +577,7 @@
 STR_0210_TOO_FAR_FROM_PREVIOUS_DESTINATIO                       :{WHITE}...zbyt daleko od poprzedniego celu
 STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Czolowka firm ktora osiagnela poziom {NUMU16}{}({STRING})
 STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Tabela Ligi Firm w {NUMU16}
-STR_0212                                                        :{BIGFONT}{COMMA16}.
+STR_0212                                                        :{BIGFONT}{COMMA}.
 STR_0213_BUSINESSMAN                                            :Biznesmen
 STR_0214_ENTREPRENEUR                                           :Przedsiebiorca
 STR_0215_INDUSTRIALIST                                          :Przemyslowiec
@@ -586,12 +586,12 @@
 STR_0218_MOGUL                                                  :Mogul
 STR_0219_TYCOON_OF_THE_CENTURY                                  :Tycoon Stulecia
 STR_HIGHSCORE_NAME                                              :{BIGFONT}{STRING}, {STRING}
-STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA16})
+STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA})
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{STRING} osiaga status: '{STRING}'!
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{STRING} z {STRING} osiagnelo status '{STRING}'!
 STR_021D                                                        :{BLACK}
 STR_021E                                                        :{WHITE}
-STR_021F                                                        :{BLUE}{COMMA16}
+STR_021F                                                        :{BLUE}{COMMA}
 STR_0220_CREATE_SCENARIO                                        :{BLACK}Tworzenie scenariusza
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Edytor scenariusza
@@ -788,8 +788,8 @@
 STR_EXTRA_VIEW_PORT                                             :Extra podglad
 STR_SIGN_LIST                                                   :Lista tablic
 STR_02DF_TOWN_DIRECTORY                                         :Lista miast
-STR_TOWN_POPULATION                                             :{BLACK}Swiatowa populacja: {COMMA32}
-STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Podglad {COMMA16}
+STR_TOWN_POPULATION                                             :{BLACK}Swiatowa populacja: {COMMA}
+STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Podglad {COMMA}
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN                                :{BLACK}Kopuj do podgladu
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT                             :{BLACK}Kopiuj obecna pozycje z glownego okna do podgladu
 STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW                                :{BLACK}Wstaw z podgladu
@@ -961,34 +961,34 @@
 STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Nie mozna skopiowac listy polecen...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Koniec wspoldz. polecen - -
 
-STR_TRAIN_IS_LOST                                               :{WHITE}Pociag {COMMA16} zabladzil.
-STR_TRAIN_IS_UNPROFITABLE                                       :{WHITE}Pociag {COMMA16} zarobil w zeszlym roku {CURRENCY}
+STR_TRAIN_IS_LOST                                               :{WHITE}Pociag {COMMA} zabladzil.
+STR_TRAIN_IS_UNPROFITABLE                                       :{WHITE}Pociag {COMMA} zarobil w zeszlym roku {CURRENCY}
 STR_EURO_INTRODUCE                                              :{BLACK}{BIGFONT}Europejska Unia Monetarna!{}{}Euro zostalo wprowadzone jako jedyna waluta do wszystkich transakcji w twoim kraju!
 
 # Start of order review system.
 # DON'T ADD OR REMOVE LINES HERE
-STR_TRAIN_HAS_TOO_FEW_ORDERS                                    :{WHITE}Pociag {COMMA16} ma za malo polecen w rozkladzie
-STR_TRAIN_HAS_VOID_ORDER                                        :{WHITE}Pociag {COMMA16} nie ma polecen
-STR_TRAIN_HAS_DUPLICATE_ENTRY                                   :{WHITE}Pociag {COMMA16} ma zduplikowane polecenia
-STR_TRAIN_HAS_INVALID_ENTRY                                     :{WHITE}Pociag {COMMA16} ma nieodpowiednia stacje w rozkladzie
-STR_ROADVEHICLE_HAS_TOO_FEW_ORDERS                              :{WHITE}Samochod {COMMA16} ma za malo polecen w rozkladzie
-STR_ROADVEHICLE_HAS_VOID_ORDER                                  :{WHITE}Samochod {COMMA16} nie ma polecen
-STR_ROADVEHICLE_HAS_DUPLICATE_ENTRY                             :{WHITE}Samochod {COMMA16} ma zduplikowane polecenia
-STR_ROADVEHICLE_HAS_INVALID_ENTRY                               :{WHITE}Samochod {COMMA16} ma nieodpowiednia stacje w rozkladzie
-STR_SHIP_HAS_TOO_FEW_ORDERS                                     :{WHITE}Statek {COMMA16} ma za malo polecen w rozkladzie
-STR_SHIP_HAS_VOID_ORDER                                         :{WHITE}Statek {COMMA16} nie ma polecen
-STR_SHIP_HAS_DUPLICATE_ENTRY                                    :{WHITE}Statek {COMMA16} ma zduplikowane polecenia
-STR_SHIP_HAS_INVALID_ENTRY                                      :{WHITE}Statek {COMMA16} ma nieodpowiednia stacje w rozkladzie
-STR_AIRCRAFT_HAS_TOO_FEW_ORDERS                                 :{WHITE}Samolot {COMMA16} ma za malo polecen w rozkladzie
-STR_AIRCRAFT_HAS_VOID_ORDER                                     :{WHITE}Samolot {COMMA16} nie ma polecen
-STR_AIRCRAFT_HAS_DUPLICATE_ENTRY                                :{WHITE}Samolot {COMMA16} ma zduplikowane polecenia
-STR_AIRCRAFT_HAS_INVALID_ENTRY                                  :{WHITE}Samolot {COMMA16} ma nieodpowiednia stacje w rozkladzie
+STR_TRAIN_HAS_TOO_FEW_ORDERS                                    :{WHITE}Pociag {COMMA} ma za malo polecen w rozkladzie
+STR_TRAIN_HAS_VOID_ORDER                                        :{WHITE}Pociag {COMMA} nie ma polecen
+STR_TRAIN_HAS_DUPLICATE_ENTRY                                   :{WHITE}Pociag {COMMA} ma zduplikowane polecenia
+STR_TRAIN_HAS_INVALID_ENTRY                                     :{WHITE}Pociag {COMMA} ma nieodpowiednia stacje w rozkladzie
+STR_ROADVEHICLE_HAS_TOO_FEW_ORDERS                              :{WHITE}Samochod {COMMA} ma za malo polecen w rozkladzie
+STR_ROADVEHICLE_HAS_VOID_ORDER                                  :{WHITE}Samochod {COMMA} nie ma polecen
+STR_ROADVEHICLE_HAS_DUPLICATE_ENTRY                             :{WHITE}Samochod {COMMA} ma zduplikowane polecenia
+STR_ROADVEHICLE_HAS_INVALID_ENTRY                               :{WHITE}Samochod {COMMA} ma nieodpowiednia stacje w rozkladzie
+STR_SHIP_HAS_TOO_FEW_ORDERS                                     :{WHITE}Statek {COMMA} ma za malo polecen w rozkladzie
+STR_SHIP_HAS_VOID_ORDER                                         :{WHITE}Statek {COMMA} nie ma polecen
+STR_SHIP_HAS_DUPLICATE_ENTRY                                    :{WHITE}Statek {COMMA} ma zduplikowane polecenia
+STR_SHIP_HAS_INVALID_ENTRY                                      :{WHITE}Statek {COMMA} ma nieodpowiednia stacje w rozkladzie
+STR_AIRCRAFT_HAS_TOO_FEW_ORDERS                                 :{WHITE}Samolot {COMMA} ma za malo polecen w rozkladzie
+STR_AIRCRAFT_HAS_VOID_ORDER                                     :{WHITE}Samolot {COMMA} nie ma polecen
+STR_AIRCRAFT_HAS_DUPLICATE_ENTRY                                :{WHITE}Samolot {COMMA} ma zduplikowane polecenia
+STR_AIRCRAFT_HAS_INVALID_ENTRY                                  :{WHITE}Samolot {COMMA} ma nieodpowiednia stacje w rozkladzie
 # end of order system
 
-STR_TRAIN_AUTORENEW_FAILED                                      :{WHITE}Blad autoodnowienia pociagu {COMMA16} (brak pieniedzy)
-STR_ROADVEHICLE_AUTORENEW_FAILED                                :{WHITE}Blad autoodnowienia samochodu {COMMA16} (brak pieniedzy)
-STR_SHIP_AUTORENEW_FAILED                                       :{WHITE}Blad autoodnowienia statku {COMMA16} (brak pieniedzy)
-STR_AIRCRAFT_AUTORENEW_FAILED                                   :{WHITE}Blad autoodnowienia samolotu {COMMA16} (brak pieniedzy)
+STR_TRAIN_AUTORENEW_FAILED                                      :{WHITE}Blad autoodnowienia pociagu {COMMA} (brak pieniedzy)
+STR_ROADVEHICLE_AUTORENEW_FAILED                                :{WHITE}Blad autoodnowienia samochodu {COMMA} (brak pieniedzy)
+STR_SHIP_AUTORENEW_FAILED                                       :{WHITE}Blad autoodnowienia statku {COMMA} (brak pieniedzy)
+STR_AIRCRAFT_AUTORENEW_FAILED                                   :{WHITE}Blad autoodnowienia samolotu {COMMA} (brak pieniedzy)
 
 STR_CONFIG_PATCHES                                              :{BLACK}Konfiguracja Patcha
 STR_CONFIG_PATCHES_TIP                                          :{BLACK}Konfiguracja Patcha
@@ -1104,7 +1104,7 @@
 STR_CHEATS_TIP                                                  :{BLACK}Checkboxy pokazuja czy uzywano juz tego tricku
 STR_CHEATS_WARNING                                              :{BLACK}Uwaga! Wlasnie chcesz zdradzic swoich wspolnikow. Zwaz, ze zostanie to zapamietane na wieki!
 STR_CHEAT_MONEY                                                 :{LTBLUE}Zwieksz ilosc pieniedzy o {CURRENCY64}
-STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Gra jako gracz: {ORANGE}{COMMA16}
+STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Gra jako gracz: {ORANGE}{COMMA}
 STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Magiczny buldozer (usuwanie przedsiebiorstw etc.): {ORANGE}{STRING}
 STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Tunele moga sie krzyzowac: {ORANGE}{STRING}
 STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Budowanie w czasie pauzy: {ORANGE}{STRING}
@@ -1120,7 +1120,7 @@
 STR_GO_NON_STOP_TO_WAYPOINT                                     :Idz bez przestanku przez {WAYPOINT}
 
 STR_WAYPOINTNAME_CITY                                           :Pkt. kontrolny {TOWN}
-STR_WAYPOINTNAME_CITY_SERIAL                                    :Pkt. kontrolny  {TOWN} #{COMMA16}
+STR_WAYPOINTNAME_CITY_SERIAL                                    :Pkt. kontrolny  {TOWN} #{COMMA}
 STR_LANDINFO_WAYPOINT                                           :Pkt. kontrolny
 
 STR_WAYPOINT                                                    :{WHITE}Pkt kontrolny
@@ -1203,8 +1203,8 @@
 STR_CONSTRUCT_SUGAR_MINE_TIP                                    :{BLACK}Wybuduj kopalnie cukru
 
 STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Przemysl
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}){YELLOW} ({COMMA16}% przetransportowano)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}/{STRING}){YELLOW} ({COMMA16}%/{COMMA16}% przetransportowano)
+STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}){YELLOW} ({COMMA}% przetransportowano)
+STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}/{STRING}){YELLOW} ({COMMA}%/{COMMA}% przetransportowano)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{TOWN} {STRING}
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...zbyt blisko innego przedsiebiorstwa
@@ -1244,15 +1244,15 @@
 STR_NETWORK_ADD_SERVER_TIP                                      :{BLACK}Dodaj serwer do listy ktora bedzie przeszukiwana w poszukiwaniu uruchomionych gier.
 STR_NETWORK_ENTER_IP                                            :{BLACK}Wpisz adres IP serwera
 
-STR_NETWORK_CLIENTS_ONLINE                                      :{BLACK}{COMMA16}/{COMMA16}
+STR_NETWORK_CLIENTS_ONLINE                                      :{BLACK}{COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Klientow
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Klientow podlaczonych / klientow maks.
 STR_NETWORK_GAME_INFO                                           :{SILVER}INFO O GRZE
 STR_ORANGE                                                      :{ORANGE}{STRING}
-STR_NETWORK_CLIENTS                                             :{SILVER}Klienci:  {WHITE}{COMMA8} / {COMMA8}
+STR_NETWORK_CLIENTS                                             :{SILVER}Klienci:  {WHITE}{COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}Jezyk:  {WHITE}{STRING}
 STR_NETWORK_TILESET                                             :{SILVER}Krajobraz:  {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Rozmiar mapy:  {WHITE}{COMMA16}x{COMMA16}
+STR_NETWORK_MAP_SIZE                                            :{SILVER}Rozmiar mapy:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Wersja serwera:  {WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Adres serwera:  {WHITE}{STRING} : {NUMU16}
 STR_NETWORK_START_DATE                                          :{SILVER}Data uruchomienia:  {WHITE}{DATE_SHORT}
@@ -1517,21 +1517,21 @@
 
 ##id 0x2000
 STR_2000_TOWNS                                                  :{WHITE}Miasta
-STR_TOWN_LABEL_POP                                              :{WHITE}{STRING} ({COMMA32})
+STR_TOWN_LABEL_POP                                              :{WHITE}{STRING} ({COMMA})
 STR_2001                                                        :{WHITE}{STRING}
 STR_2002                                                        :{TINYFONT}{BLACK}{STRING}
 STR_2003                                                        :{TINYFONT}{WHITE}{STRING}
 STR_2004_BUILDING_MUST_BE_DEMOLISHED                            :{WHITE}Budynek musi byc najpierw zburzony
 STR_2005                                                        :{WHITE}{TOWN}
-STR_2006_POPULATION                                             :{BLACK}Populacja: {ORANGE}{COMMA32}{BLACK}  Domow: {ORANGE}{COMMA32}
+STR_2006_POPULATION                                             :{BLACK}Populacja: {ORANGE}{COMMA}{BLACK}  Domow: {ORANGE}{COMMA}
 STR_2007_RENAME_TOWN                                            :Zmien nazwe miasta
 STR_2008_CAN_T_RENAME_TOWN                                      :{WHITE}Nie mozna zmienic nazwy miasta...
 STR_2009_LOCAL_AUTHORITY_REFUSES                                :{WHITE}{TOWN} Lokalne wladze nie pozwalaja na to
 STR_200A_TOWN_NAMES_CLICK_ON_NAME                               :{BLACK}Nazwy miast - klik na nazwie aby wycentrowac widok na miescie
 STR_200B_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Wycentruj glowny widok na miescie
 STR_200C_CHANGE_TOWN_NAME                                       :{BLACK}Zmien nazwe miasta
-STR_200D_PASSENGERS_LAST_MONTH_MAX                              :{BLACK}Pasazerow w zeszlym miesiacu: {ORANGE}{COMMA32}{BLACK}  maks: {ORANGE}{COMMA32}
-STR_200E_MAIL_LAST_MONTH_MAX                                    :{BLACK}Poczta w zeszlym miesiacu: {ORANGE}{COMMA32}{BLACK}  maks: {ORANGE}{COMMA32}
+STR_200D_PASSENGERS_LAST_MONTH_MAX                              :{BLACK}Pasazerow w zeszlym miesiacu: {ORANGE}{COMMA}{BLACK}  maks: {ORANGE}{COMMA}
+STR_200E_MAIL_LAST_MONTH_MAX                                    :{BLACK}Poczta w zeszlym miesiacu: {ORANGE}{COMMA}{BLACK}  maks: {ORANGE}{COMMA}
 STR_200F_TALL_OFFICE_BLOCK                                      :Wysoki biurowiec
 STR_2010_OFFICE_BLOCK                                           :Biurowiec
 STR_2011_SMALL_BLOCK_OF_FLATS                                   :Maly blok mieszkalny
@@ -1605,7 +1605,7 @@
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Daj lapowke lokanym wladzom, powieksz swoja ocene, ryzykujac powazne kary w razie zlapania.{}  Koszt: {CURRENCY}
 STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Chaos na drogach w {TOWN}!{}{}Program przebudowy drog ufundowany przez {STRING} prowadzi do 6 miesiecy meki dla kierowcow!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
-STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA32})
+STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA})
 STR_2058_UNDER_CONSTRUCTION                                     :{STRING} (w budowie)
 STR_2059_IGLOO                                                  :Iglo
 STR_205A_TEPEES                                                 :Tipi
@@ -1667,7 +1667,7 @@
 STR_303C_OUTSTANDING                                            :Bezkonkurencyjne
 ############ range for rating ends
 
-STR_303D                                                        :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA8}%)
+STR_303D                                                        :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_303E_NO_LONGER_ACCEPTS                                      :{WHITE}{STATION} dluzej nie akceptuje {STRING}
 STR_303F_NO_LONGER_ACCEPTS_OR                                   :{WHITE}{STATION} dluzej nie akceptuje {STRING} lub {STRING}
 STR_3040_NOW_ACCEPTS                                            :{WHITE}{STATION} akceptuje {STRING}
@@ -1678,7 +1678,7 @@
 STR_3045_TOO_CLOSE_TO_ANOTHER_TRUCK                             :{WHITE}Zbyt blisko innego przystanku ciez.
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Musisz zniszczyc najpierw przystanek
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Musisz najpierw zniszczyc przystanek.
-STR_3048_STATIONS                                               :{WHITE}{STRING} - {COMMA16} Stacje
+STR_3048_STATIONS                                               :{WHITE}{STRING} - {COMMA} Stacje
 STR_3049_0                                                      :{YELLOW}{STATION} {STRINL 0x30D1}
 STR_304A_NONE                                                   :{YELLOW}- Nic -
 STR_304B_SITE_UNSUITABLE                                        :{WHITE}...niewlasciwe miejsce
@@ -1735,7 +1735,7 @@
 STR_4002_SAVE                                                   :{BLACK}Zapisz
 STR_4003_DELETE                                                 :{BLACK}Usun
 STR_4004                                                        :{STRING}, {DATE_LONG}
-STR_4005_BYTES_FREE                                             :{BLACK}{COMMA32} MB wolnego
+STR_4005_BYTES_FREE                                             :{BLACK}{COMMA} MB wolnego
 STR_4006_UNABLE_TO_READ_DRIVE                                   :{BLACK}Nie mozna odczytac napedu
 STR_4007_GAME_SAVE_FAILED                                       :{WHITE}Nie mozna zapisac gry
 STR_4008_UNABLE_TO_DELETE_FILE                                  :{WHITE}Nie mozna usunac pliku
@@ -1796,7 +1796,7 @@
 ############ range for requires	ends
 
 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Wyprodukowano w ostatnim miesiacu:
-STR_482B_TRANSPORTED                                            :{YELLOW}{STRING}{BLACK} ({COMMA16}% przetransportowano)
+STR_482B_TRANSPORTED                                            :{YELLOW}{STRING}{BLACK} ({COMMA}% przetransportowano)
 STR_482C_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Centruj glowny widok na przedsiebiorstwie
 STR_482D_NEW_UNDER_CONSTRUCTION                                 :{BLACK}{BIGFONT}Rozpoczeto budowe nowego {STRING} blisko {TOWN}!
 STR_482E_NEW_BEING_PLANTED_NEAR                                 :{BLACK}{BIGFONT}Nowy {STRING} zostal obsadzony blisko {TOWN}!
@@ -1813,8 +1813,8 @@
 STR_4839_PRODUCTION_DOWN_BY_50                                  :{BLACK}{BIGFONT}{TOWN} {STRING} produkcja zmniejszona o 50%
 STR_483A_INSECT_INFESTATION_CAUSES                              :{BLACK}{BIGFONT}Plaga insektow w {TOWN} {STRING}!{}Produkcja spadla o 50%
 STR_483B_CAN_ONLY_BE_POSITIONED                                 :{WHITE}...moze byc usytuowane tylko blisko krawedzi mapy
-STR_INDUSTRY_PROD_GOUP                                          :{BLACK}{BIGFONT}{STRING} produkcja w {TOWN} {STRING} zwiekszona o {COMMA16}%!
-STR_INDUSTRY_PROD_GODOWN                                        :{BLACK}{BIGFONT}{STRING} produkcja w {TOWN} {STRING} zmniejszona o {COMMA16}%!
+STR_INDUSTRY_PROD_GOUP                                          :{BLACK}{BIGFONT}{STRING} produkcja w {TOWN} {STRING} zwiekszona o {COMMA}%!
+STR_INDUSTRY_PROD_GODOWN                                        :{BLACK}{BIGFONT}{STRING} produkcja w {TOWN} {STRING} zmniejszona o {COMMA}%!
 
 ##id 0x5000
 STR_5000_TRAIN_IN_TUNNEL                                        :{WHITE}Pociag w tunelu
@@ -1877,10 +1877,10 @@
 ##id 0x6000
 STR_SV_EMPTY                                                    :
 STR_SV_UNNAMED                                                  :Bez nazwy{SKIP}
-STR_SV_TRAIN_NAME                                               :Pociag {COMMA16}
-STR_SV_ROADVEH_NAME                                             :Samochod {COMMA16}
-STR_SV_SHIP_NAME                                                :Statek {COMMA16}
-STR_SV_AIRCRAFT_NAME                                            :Samolot {COMMA16}
+STR_SV_TRAIN_NAME                                               :Pociag {COMMA}
+STR_SV_ROADVEH_NAME                                             :Samochod {COMMA}
+STR_SV_SHIP_NAME                                                :Statek {COMMA}
+STR_SV_AIRCRAFT_NAME                                            :Samolot {COMMA}
 
 STR_SV_STNAME                                                   :{STRING}
 STR_SV_STNAME_NORTH                                             :{STRING} Polnoc
@@ -1930,12 +1930,12 @@
 ############ range for difficulty levels ends
 
 ############ range for difficulty settings starts
-STR_6805_MAXIMUM_NO_COMPETITORS                                 :{LTBLUE}Maksymalna ilosc przeciwnikow: {ORANGE}{COMMA16}
+STR_6805_MAXIMUM_NO_COMPETITORS                                 :{LTBLUE}Maksymalna ilosc przeciwnikow: {ORANGE}{COMMA}
 STR_6806_COMPETITOR_START_TIME                                  :{LTBLUE}Przeciwnik zaczyna od: {ORANGE}{STRING}
 STR_6807_NO_OF_TOWNS                                            :{LTBLUE}Ilosc miast: {ORANGE}{STRING}
 STR_6808_NO_OF_INDUSTRIES                                       :{LTBLUE}Ilosc przedsiebiorstw: {ORANGE}{STRING}
 STR_6809_MAXIMUM_INITIAL_LOAN_000                               :{LTBLUE}Maksymalna poczatkowa pozyczka: {ORANGE}{CURRENCY}
-STR_680A_INITIAL_INTEREST_RATE                                  :{LTBLUE}Poczatkowy wspolczynnik wzrostu: {ORANGE}{COMMA16}%
+STR_680A_INITIAL_INTEREST_RATE                                  :{LTBLUE}Poczatkowy wspolczynnik wzrostu: {ORANGE}{COMMA}%
 STR_680B_VEHICLE_RUNNING_COSTS                                  :{LTBLUE}Utrzymanie pojazdow: {ORANGE}{STRING}
 STR_680C_CONSTRUCTION_SPEED_OF_COMPETITOR                       :{LTBLUE}Szybkosc budowania przeciwnikow: {ORANGE}{STRING}
 STR_680D_INTELLIGENCE_OF_COMPETITORS                            :{LTBLUE}Poziom inteligencji przeciwnikow: {ORANGE}{STRING}
@@ -1994,7 +1994,7 @@
 ##id 0x7000
 STR_7000                                                        :
 STR_7001                                                        :{WHITE}{STRING} {BLACK}{STRING}
-STR_7002_PLAYER                                                 :(Gracz {COMMA16})
+STR_7002_PLAYER                                                 :(Gracz {COMMA})
 STR_7004_NEW_FACE                                               :{BLACK}nowa twarz
 STR_7005_COLOR_SCHEME                                           :{BLACK}Schemat koloru
 STR_7006_COLOR_SCHEME                                           :{GOLD}Schemat koloru:
@@ -2028,7 +2028,7 @@
 STR_7022_INCOME_GRAPH                                           :{WHITE}Wykres przychodow
 STR_CURRCOMPACT32                                               :{CURRCOMPACT}
 STR_CURRCOMPACT64                                               :{CURRCOMPACT64}
-STR_7024                                                        :{COMMA32}
+STR_7024                                                        :{COMMA}
 STR_7025_OPERATING_PROFIT_GRAPH                                 :{WHITE}Wykres obrotow
 STR_7026_BANK_BALANCE                                           :{WHITE}Bilans bankowy
 STR_7027_LOAN                                                   :{WHITE}Pozyczka
@@ -2052,14 +2052,14 @@
 STR_7037_PRESIDENT                                              :{WHITE}{STRING}{}{GOLD}(Prezes)
 STR_7038_INAUGURATED                                            :{GOLD}Inauguracja: {WHITE}{NUMU16}
 STR_7039_VEHICLES                                               :{GOLD}Pojazdy:
-STR_703A_TRAIN                                                  :{WHITE}{COMMA16} pociag
-STR_703B_TRAINS                                                 :{WHITE}{COMMA16} pociagi(ow)
-STR_703C_ROAD_VEHICLE                                           :{WHITE}{COMMA16} samochod
-STR_703D_ROAD_VEHICLES                                          :{WHITE}{COMMA16} samochody(ow)
-STR_703E_AIRCRAFT                                               :{WHITE}{COMMA16} samolot
-STR_703F_AIRCRAFT                                               :{WHITE}{COMMA16} samoloty(ow)
-STR_7040_SHIP                                                   :{WHITE}{COMMA16} statek
-STR_7041_SHIPS                                                  :{WHITE}{COMMA16} statki(ow)
+STR_703A_TRAIN                                                  :{WHITE}{COMMA} pociag
+STR_703B_TRAINS                                                 :{WHITE}{COMMA} pociagi(ow)
+STR_703C_ROAD_VEHICLE                                           :{WHITE}{COMMA} samochod
+STR_703D_ROAD_VEHICLES                                          :{WHITE}{COMMA} samochody(ow)
+STR_703E_AIRCRAFT                                               :{WHITE}{COMMA} samolot
+STR_703F_AIRCRAFT                                               :{WHITE}{COMMA} samoloty(ow)
+STR_7040_SHIP                                                   :{WHITE}{COMMA} statek
+STR_7041_SHIPS                                                  :{WHITE}{COMMA} statki(ow)
 STR_7042_NONE                                                   :{WHITE}Brak
 STR_7043_FACE_SELECTION                                         :{WHITE}Wybor twarzy
 STR_7044_MALE                                                   :{BLACK}Mezczyzna
@@ -2124,8 +2124,8 @@
 STR_707A_SELL_25_SHARE_IN_THIS_COMPANY                          :{BLACK}Sprzedaj 25% udzialow w tej firmie
 STR_707B_CAN_T_BUY_25_SHARE_IN_THIS                             :{WHITE}Nie mozna kupic 25% udzialow w tej firmie...
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}nie mozna sprzedac 25% udzialow w tej firmie...
-STR_707D_OWNED_BY                                               :{WHITE}({COMMA16}% w posiadaniu przez {STRING})
-STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA16}% w posiadaniu przez {STRING}{}   {COMMA16}% w posiadaniu przez {STRING})
+STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% w posiadaniu przez {STRING})
+STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}% w posiadaniu przez {STRING}{}   {COMMA}% w posiadaniu przez {STRING})
 STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{STRING} zostalo przejete przez {STRING}!
 STR_7080_PROTECTED                                              :{WHITE}Ta firma nie sprzedaje jeszcze akcji...
 
@@ -2400,8 +2400,8 @@
 STR_8801_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Mieszkancy swietuja . . .{}Pierwszy pociag przybyl do {STATION}!
 STR_8802_DETAILS                                                :{WHITE}{STRING} (Szczegoly)
 STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}Pociag na drodze
-STR_8804                                                        :{SETX 10}{COMMA8}: {STRING}
-STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA8}: {STRING}
+STR_8804                                                        :{SETX 10}{COMMA}: {STRING}
+STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING}
 STR_8806_GO_TO                                                  :Idz do {STATION}
 STR_8807_GO_TO_TRANSFER                                         :Idz do {STATION} (Przewiez i wez cargo)
 STR_8808_GO_TO_UNLOAD                                           :Idz do {STATION} (Wyladunek)
@@ -2427,13 +2427,13 @@
 STR_UNKNOWN_DESTINATION                                         :nieznany cel
 STR_8812_EMPTY                                                  :{LTBLUE}Pusto
 STR_8813_FROM                                                   :{LTBLUE}{CARGO} z {STATION}
-STR_8814_TRAIN_IS_WAITING_IN_DEPOT                              :{WHITE}Pociag {COMMA16} czeka w zajezdni
+STR_8814_TRAIN_IS_WAITING_IN_DEPOT                              :{WHITE}Pociag {COMMA} czeka w zajezdni
 STR_8815_NEW_VEHICLES                                           :{BLACK}Nowe pojazdy
 STR_8816                                                        :{BLACK}-
 STR_8818_INFORMATION                                            :{BLACK}Informacje
 STR_8819_TRAIN_TOO_LONG                                         :{WHITE}Pociag zbyt dlugi
 STR_881A_TRAINS_CAN_ONLY_BE_ALTERED                             :{WHITE}Pociag moze byc modyfikowany tylko jak jest zatrzymany w zajezdni
-STR_881B_TRAINS                                                 :{WHITE}{STRING} - {COMMA16} Pociagi
+STR_881B_TRAINS                                                 :{WHITE}{STRING} - {COMMA} Pociagi
 STR_881C_NEW_RAIL_VEHICLES                                      :{WHITE}Nowe pociagi
 STR_881D_NEW_MONORAIL_VEHICLES                                  :{WHITE}Nowe pociagi jednoszynowe
 STR_881E_NEW_MAGLEV_VEHICLES                                    :{WHITE}Nowe pociagi Maglev
@@ -2467,8 +2467,8 @@
 STR_8839_CAN_T_SELL_RAILROAD_VEHICLE                            :{WHITE}Nie mozna sprzedac lokomotywy...
 STR_883A_UNABLE_TO_FIND_ROUTE_TO                                :{WHITE}Nie mozna znalezc drogi do zajezdni.
 STR_883B_CAN_T_STOP_START_TRAIN                                 :{WHITE}Nie mozna zatrzymac/ruszyc pociagiem...
-STR_883C_SERVICING_INTERVAL_DAYS                                :{BLACK}Okres miedzy serwisowaniem: {LTBLUE}{COMMA16}dni{BLACK}   Ostatni serwis: {LTBLUE}{DATE_LONG}
-STR_SERVICING_INTERVAL_PERCENT                                  :{BLACK}Okres miedzy serwisowaniem: {LTBLUE}{COMMA16}%{BLACK}   Ostatni serwis: {LTBLUE}{DATE_LONG}
+STR_883C_SERVICING_INTERVAL_DAYS                                :{BLACK}Okres miedzy serwisowaniem: {LTBLUE}{COMMA}dni{BLACK}   Ostatni serwis: {LTBLUE}{DATE_LONG}
+STR_SERVICING_INTERVAL_PERCENT                                  :{BLACK}Okres miedzy serwisowaniem: {LTBLUE}{COMMA}%{BLACK}   Ostatni serwis: {LTBLUE}{DATE_LONG}
 STR_883D_TRAINS_CLICK_ON_TRAIN_FOR                              :{BLACK}Pociagi - klik na pojezdzie aby uzyskac inforamcje
 STR_883E_BUILD_NEW_TRAINS_REQUIRES                              :{BLACK}Budowa nowych pociagow (wymaga zajezdni)
 STR_883F_TRAINS_CLICK_ON_TRAIN_FOR                              :{BLACK}Pociagi - klik na pociagu po info, przeciagnij pojazd/wagon aby dodac
@@ -2501,12 +2501,12 @@
 STR_SERVICE_HINT                                                :{BLACK}Pomin to polecenie jesli jest wymagany serwis
 STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}Nowa {STRING} juz dostepna!
 STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
-STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Koszt: {CURRENCY} Waga: {COMMA16}t{}Predkosc: {VELOCITY}  Moc: {COMMA16}KM{}Utrzymanie: {CURRENCY}/rok{}Pojemnosc: {STRING}
+STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Koszt: {CURRENCY} Waga: {COMMA}t{}Predkosc: {VELOCITY}  Moc: {COMMA}KM{}Utrzymanie: {CURRENCY}/rok{}Pojemnosc: {STRING}
 STR_885C_BROKEN_DOWN                                            :{RED}Awaria
 STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Wiek: {LTBLUE}{STRING}{BLACK}   Utrzymanie: {LTBLUE}{CURRENCY}/rok
-STR_885E_WEIGHT_T_POWER_HP_MAX_SPEED                            :{BLACK}Waga: {LTBLUE}{COMMA16}t  {BLACK}Moc: {LTBLUE}{COMMA32}KM{BLACK} Max. predkosc: {LTBLUE}{VELOCITY}
+STR_885E_WEIGHT_T_POWER_HP_MAX_SPEED                            :{BLACK}Waga: {LTBLUE}{COMMA}t  {BLACK}Moc: {LTBLUE}{COMMA}KM{BLACK} Max. predkosc: {LTBLUE}{VELOCITY}
 STR_885F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Zysk w tym roku: {LTBLUE}{CURRENCY}  (w ostatnim roku: {CURRENCY})
-STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Niezawodnosc: {LTBLUE}{COMMA8}%  {BLACK}Awarie od ostatniego serwisowania: {LTBLUE}{COMMA16}
+STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Niezawodnosc: {LTBLUE}{COMMA}%  {BLACK}Awarie od ostatniego serwisowania: {LTBLUE}{COMMA}
 STR_8861_STOPPED                                                :{RED}Zatrzymany
 STR_8862_CAN_T_MAKE_TRAIN_PASS_SIGNAL                           :{WHITE}Nie mozna przepuscic pociagu za sygnal, niebezpieczenstwo...
 STR_8863_CRASHED                                                :{RED}Wypadek!
@@ -2514,7 +2514,7 @@
 STR_8865_NAME_TRAIN                                             :{WHITE}Nazwa pociagu
 STR_8866_CAN_T_NAME_TRAIN                                       :{WHITE}Nie mozna zmienic nazwy pociagu...
 STR_8867_NAME_TRAIN                                             :{BLACK}Nazwa pociagu
-STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Wypadek kolejowy!{}{COMMA16} ofiar w kolizji
+STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Wypadek kolejowy!{}{COMMA} ofiar w kolizji
 STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}Nie mozna odwrocic kierunku jazdy pociagu...
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Zmiana nazwy typu pociagu
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Nie mozna zmienic nazwy typu pojazdu...
@@ -2526,7 +2526,7 @@
 
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Samochod na drodze
-STR_9001_ROAD_VEHICLES                                          :{WHITE}{STRING} - {COMMA16} Samochody
+STR_9001_ROAD_VEHICLES                                          :{WHITE}{STRING} - {COMMA} Samochody
 STR_9002                                                        :{WHITE}{STRING}
 STR_9003_ROAD_VEHICLE_DEPOT                                     :{WHITE}{TOWN} Zajezdnia samochodowa
 STR_9004_NEW_VEHICLES                                           :{BLACK}Nowe pojazdy
@@ -2540,13 +2540,13 @@
 STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Wiek: {LTBLUE}{STRING}{BLACK}   Utrzymanie: {LTBLUE}{CURRENCY}/rok
 STR_900E_MAX_SPEED                                              :{BLACK}Max. predkkosc: {LTBLUE}{VELOCITY}
 STR_900F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Zysk w tym roku: {LTBLUE}{CURRENCY}  (ostatni rok: {CURRENCY})
-STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Niezawodnosc: {LTBLUE}{COMMA8}%  {BLACK}Awarie od ostatniego serwisowania: {LTBLUE}{COMMA16}
+STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Niezawodnosc: {LTBLUE}{COMMA}%  {BLACK}Awarie od ostatniego serwisowania: {LTBLUE}{COMMA}
 STR_9011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Zbudowany: {LTBLUE}{NUMU16}{BLACK} Wartosc: {LTBLUE}{CURRENCY}
 STR_9012_CAPACITY                                               :{BLACK}Pojemnosc: {LTBLUE}{STRING}
 STR_9013_MUST_BE_STOPPED_INSIDE                                 :{WHITE}...musi byc zatrzymany w zajezdni samochodowej
 STR_9014_CAN_T_SELL_ROAD_VEHICLE                                :{WHITE}Nie mozna sprzedac samochodu...
 STR_9015_CAN_T_STOP_START_ROAD_VEHICLE                          :{WHITE}Nie mozna zatrzymac/ruszyc samochodu...
-STR_9016_ROAD_VEHICLE_IS_WAITING                                :{WHITE}Samochod {COMMA16} czeka w zjezdni
+STR_9016_ROAD_VEHICLE_IS_WAITING                                :{WHITE}Samochod {COMMA} czeka w zjezdni
 STR_HEADING_FOR_ROAD_DEPOT                                      :{LTBLUE}Zmierza do {TOWN} zajezdni sam.
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{LTBLUE}Zmierza do {TOWN} zajezdni sam., {VELOCITY}
 STR_9018_CAN_T_SEND_VEHICLE_TO_DEPOT                            :{WHITE}Nie mozna wyslac samochodu do zajezdni sam...
@@ -2575,7 +2575,7 @@
 STR_902F_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Mieszkancy swietuja . . .{}Pierwszy autobus przybyl do {STATION}!
 STR_9030_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Mieszkancy swietuja . . .{}Pierwsza ciezarowka przybyla do {STATION}!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Wypadek samochodowy!{}Kierowca zginal po zderzeniu z pociagiem
-STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Wypadek samochodowy!{}{COMMA16} ofiar po zderzeniu z pociagiem
+STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Wypadek samochodowy!{}{COMMA} ofiar po zderzeniu z pociagiem
 STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}Nie mozna zawrocic samochodu...
 STR_9034_RENAME                                                 :{BLACK}Zmien nazwe
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Zmien nazwe typu samochodu
@@ -2590,7 +2590,7 @@
 STR_9802_CAN_T_BUILD_DOCK_HERE                                  :{WHITE}Nie mozna tutaj wybudowac portu...
 STR_9803_SHIP_DEPOT                                             :{WHITE}{TOWN} Stocznia
 STR_9804_NEW_SHIPS                                              :{BLACK}Nowe statki
-STR_9805_SHIPS                                                  :{WHITE}{STRING} - {COMMA16} Statki
+STR_9805_SHIPS                                                  :{WHITE}{STRING} - {COMMA} Statki
 STR_9806_CAN_T_BUILD_SHIPS                                      :{WHITE}Nie mozna zbudowac statku...
 STR_9807_MUST_BUILD_SHIP_DEPOT_FIRST                            :{WHITE}Trzeba najpierw zbudowac stocznie
 STR_9808_NEW_SHIPS                                              :{WHITE}Nowe statki
@@ -2605,7 +2605,7 @@
 STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Wiek: {LTBLUE}{STRING}{BLACK}   Utrzymanie: {LTBLUE}{CURRENCY}/rok
 STR_9813_MAX_SPEED                                              :{BLACK}Max. predkosc: {LTBLUE}{VELOCITY}
 STR_9814_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Zysk w tym roku: {LTBLUE}{CURRENCY}  (w ostatnim roku: {CURRENCY})
-STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Niezawodnosc: {LTBLUE}{COMMA8}%  {BLACK}Awarie od ostatniego serwisowania: {LTBLUE}{COMMA16}
+STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Niezawodnosc: {LTBLUE}{COMMA}%  {BLACK}Awarie od ostatniego serwisowania: {LTBLUE}{COMMA}
 STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Wybudowany: {LTBLUE}{NUMU16}{BLACK} Wartosc: {LTBLUE}{CURRENCY}
 STR_9817_CAPACITY                                               :{BLACK}Pojemnosc: {LTBLUE}{STRING}
 STR_9818_CAN_T_STOP_START_SHIP                                  :{WHITE}Nie mozna zatrzymac/ruszyc statku...
@@ -2613,7 +2613,7 @@
 STR_981A_UNABLE_TO_FIND_LOCAL_DEPOT                             :{WHITE}Nie mozna znalezc zajezdni
 STR_HEADING_FOR_SHIP_DEPOT                                      :{LTBLUE}Zmierza do stoczni w {TOWN}
 STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{LTBLUE}Zmierza do stoczni w {TOWN}, {VELOCITY}
-STR_981C_SHIP_IS_WAITING_IN_DEPOT                               :{WHITE}Statek {COMMA16} czeka w stoczni
+STR_981C_SHIP_IS_WAITING_IN_DEPOT                               :{WHITE}Statek {COMMA} czeka w stoczni
 STR_981D_BUILD_SHIP_DOCK                                        :{BLACK}Budowa portu
 STR_981E_BUILD_SHIP_DEPOT_FOR_BUILDING                          :{BLACK}Budowa stoczni (do budowy i serwisowania statkow)
 STR_981F_SHIPS_CLICK_ON_SHIP_FOR                                :{BLACK}Statki - klik aby uzyskac informacje o statku
@@ -2664,19 +2664,19 @@
 STR_A005_NEW_AIRCRAFT                                           :{WHITE}Nowy samolot
 STR_A006_BUILD_AIRCRAFT                                         :{BLACK}Budowa samolotu
 STR_A008_CAN_T_BUILD_AIRCRAFT                                   :{WHITE}Nie mozna zbudowac samolotu...
-STR_A009_AIRCRAFT                                               :{WHITE}{STRING} - {COMMA16} Samolot
+STR_A009_AIRCRAFT                                               :{WHITE}{STRING} - {COMMA} Samolot
 STR_A00A                                                        :{WHITE}{STRING}
 STR_A00B_ORDERS                                                 :{WHITE}{STRING} (Polecenia)
 STR_A00C_DETAILS                                                :{WHITE}{STRING} (Szczegoly)
 STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Wiek: {LTBLUE}{STRING}{BLACK}   Utrzymanie: {LTBLUE}{CURRENCY}/rok
 STR_A00E_MAX_SPEED                                              :{BLACK}Max. predkosc: {LTBLUE}{VELOCITY}
 STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Zysk w tym roku: {LTBLUE}{CURRENCY}  (w ostatnim roku: {CURRENCY})
-STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Niezawodnosc: {LTBLUE}{COMMA8}%  {BLACK}Awarie od ostatniego serwisowania: {LTBLUE}{COMMA16}
+STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Niezawodnosc: {LTBLUE}{COMMA}%  {BLACK}Awarie od ostatniego serwisowania: {LTBLUE}{COMMA}
 STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Zbudowany: {LTBLUE}{NUMU16}{BLACK} Wartosc: {LTBLUE}{CURRENCY}
 STR_A012_CAN_T_SEND_AIRCRAFT_TO                                 :{WHITE}Nie mozna wyslac samolotu do hangaru...
 STR_HEADING_FOR_HANGAR                                          :{LTBLUE}Zmierza do hangaru w {STATION}
 STR_HEADING_FOR_HANGAR_VEL                                      :{LTBLUE}Zmierza do hangaru w {STATION}, {VELOCITY}
-STR_A014_AIRCRAFT_IS_WAITING_IN                                 :{WHITE}Samolot  {COMMA16} czeka w hangarze
+STR_A014_AIRCRAFT_IS_WAITING_IN                                 :{WHITE}Samolot  {COMMA} czeka w hangarze
 STR_A015_AIRCRAFT_IN_THE_WAY                                    :{WHITE}Samolot jest w drodze
 STR_A016_CAN_T_STOP_START_AIRCRAFT                              :{WHITE}Nie mozna zatrzymac/ruszyc samolotu
 STR_A017_AIRCRAFT_IS_IN_FLIGHT                                  :{WHITE}Samolot wlasnie leci
@@ -2702,14 +2702,14 @@
 STR_A02B_SHOW_AIRCRAFT_DETAILS                                  :{BLACK}Pokaz szczegoly samolotu
 STR_A02C_NEW_AIRCRAFT_NOW_AVAILABLE                             :{BLACK}{BIGFONT}Dostepny nowy typ samolotu!
 STR_A02D                                                        :{BLACK}{BIGFONT}{STRING}
-STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Koszt: {CURRENCY} Max. Predkosc: {VELOCITY}{}Pojemnosc: {COMMA16} pasazerow, {COMMA16} paczek poczty{}Utrzymanie: {CURRENCY}/rok
+STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Koszt: {CURRENCY} Max. Predkosc: {VELOCITY}{}Pojemnosc: {COMMA} pasazerow, {COMMA} paczek poczty{}Utrzymanie: {CURRENCY}/rok
 
 STR_A030_NAME_AIRCRAFT                                          :{WHITE}Nazwa samolotu
 STR_A031_CAN_T_NAME_AIRCRAFT                                    :{WHITE}Nie mozna zmienic nazwy samolotu...
 STR_A032_NAME_AIRCRAFT                                          :{BLACK}Nazwa samolotu
 STR_A033_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Mieszkancy swietuja . . .{}pierwszy samolot przylecial do {STATION}!
-STR_A034_PLANE_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Katastrofa lotnicza!{}{COMMA16} ofiar na {STATION}
-STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Wypadek lotniczy!{}Samolot rozbil sie z braku paliwa, zginelo {COMMA16} osob!
+STR_A034_PLANE_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Katastrofa lotnicza!{}{COMMA} ofiar na {STATION}
+STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Wypadek lotniczy!{}Samolot rozbil sie z braku paliwa, zginelo {COMMA} osob!
 STR_A035_DESTINATIONS                                           :{TINYFONT}{BLACK}Cele:
 STR_A036                                                        :{TINYFONT}{BLACK}{STATION}
 STR_A037_RENAME                                                 :{BLACK}Zmien nazwe
@@ -2735,7 +2735,7 @@
 STR_B003_FACTORY_DESTROYED_IN_SUSPICIOUS                        :{BLACK}{BIGFONT}Fabryka zniszczona w niewyjasnionych okolicznosciach w poblizu {TOWN}!
 STR_B004_UFO_LANDS_NEAR                                         :{BLACK}{BIGFONT}'UFO' wyladowalo blisko {TOWN}!
 STR_B005_COAL_MINE_SUBSIDENCE_LEAVES                            :{BLACK}{BIGFONT}Tapniecie w kopalni zniszczylo tory w poblizu {TOWN}!
-STR_B006_FLOOD_VEHICLE_DESTROYED                                :{BLACK}{BIGFONT}Powodz!{}Przynajmniej {COMMA16} zaginelo lub utonelo w czasie powodzi!
+STR_B006_FLOOD_VEHICLE_DESTROYED                                :{BLACK}{BIGFONT}Powodz!{}Przynajmniej {COMMA} zaginelo lub utonelo w czasie powodzi!
 
 STR_BRIBE_FAILED                                                :{WHITE}Twoja lapowka zostala
 STR_BRIBE_FAILED_2                                              :{WHITE}wykryta przez lokalne wladze.
@@ -2745,7 +2745,7 @@
 STR_PERFORMANCE_DETAIL                                          :{WHITE}Szczegolowa tabela efektywnosci
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Szczegoly
 STR_PERFORMANCE_DETAIL_AMOUNT_CURRENCY                          :{BLACK}({CURRCOMPACT}/{CURRCOMPACT})
-STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA32}/{COMMA32})
+STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA}/{COMMA})
 STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{INT32}%
 SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{INT32}
 ############ Those following lines need to be in this order!!
@@ -2780,7 +2780,7 @@
 STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID:
 
 STR_CURRENCY_WINDOW                                             :{WHITE}Wlasna waluta
-STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Wspolczynnik wymiany: {ORANGE}{CURRENCY} = {POUNDSIGN} {COMMA16}
+STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Wspolczynnik wymiany: {ORANGE}{CURRENCY} = {POUNDSIGN} {COMMA}
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Separator:
 STR_CURRENCY_PREFIX                                             :{LTBLUE}Prefiks:
 STR_CURRENCY_SUFFIX                                             :{LTBLUE}Sufiks:
@@ -2794,10 +2794,10 @@
 STR_PLANE                                                       :{BLACK}{PLANE}
 STR_SHIP                                                        :{BLACK}{SHIP}
 
-STR_SCHEDULED_TRAINS                                            :{WHITE}{STATION} - {COMMA16} Pociag(i/ow)
-STR_SCHEDULED_ROAD_VEHICLES                                     :{WHITE}{STATION} - {COMMA16} Samochod(y/ow)
-STR_SCHEDULED_AIRCRAFT                                          :{WHITE}{STATION} - {COMMA16} Samolot(y/ow)
-STR_SCHEDULED_SHIPS                                             :{WHITE}{STATION} - {COMMA16} Statek(i/ow)
+STR_SCHEDULED_TRAINS                                            :{WHITE}{STATION} - {COMMA} Pociag(i/ow)
+STR_SCHEDULED_ROAD_VEHICLES                                     :{WHITE}{STATION} - {COMMA} Samochod(y/ow)
+STR_SCHEDULED_AIRCRAFT                                          :{WHITE}{STATION} - {COMMA} Samolot(y/ow)
+STR_SCHEDULED_SHIPS                                             :{WHITE}{STATION} - {COMMA} Statek(i/ow)
 
 STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Pokazuje wszystkie pociagi ktore maja ta stacje w swoim rozkladzie
 STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Pokazuje wszystkie samochody ktore maja ta stacje w swoim rozkladzie
@@ -2819,7 +2819,7 @@
 STR_REPLACE_HELP                                                :{BLACK}Ta funkcja pozwala wybrac typ pojazdu i zastapic go innym. Bedzie sie to odbywac w momencie gdy pociag zjedzie do zajezdni
 
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
-STR_SIGN_LIST_CAPTION                                           :{WHITE}Lista tablic - {COMMA16} Tablice
+STR_SIGN_LIST_CAPTION                                           :{WHITE}Lista tablic - {COMMA} Tablice
 
 ############ Lists rail types
 
@@ -2829,16 +2829,16 @@
 
 ############ End of list of rail types
 
-STR_TINY_BLACK                                                  :{BLACK}{TINYFONT}{COMMA16}
+STR_TINY_BLACK                                                  :{BLACK}{TINYFONT}{COMMA}
 
-STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Koszt: {GOLD}{CURRENCY}{BLACK} Waga: {GOLD}{COMMA16}t
-STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Predkosc: {GOLD}{VELOCITY}{BLACK}   Moc: {GOLD}{COMMA32}KM
+STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Koszt: {GOLD}{CURRENCY}{BLACK} Waga: {GOLD}{COMMA}t
+STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Predkosc: {GOLD}{VELOCITY}{BLACK}   Moc: {GOLD}{COMMA}KM
 STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}Koszty uzytkowania: {GOLD}{CURRENCY}/rok
 STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Ladownosc: {GOLD}{STRING} {STRING}
-STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Zaprojektowany: {GOLD}{NUMU16}{BLACK} Zywotnosc: {GOLD}{COMMA16} lat
-STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Maksymalna niezawodnosc: {GOLD}{COMMA8}%
+STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Zaprojektowany: {GOLD}{NUMU16}{BLACK} Zywotnosc: {GOLD}{COMMA} lat
+STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Maksymalna niezawodnosc: {GOLD}{COMMA}%
 STR_PURCHASE_INFO_COST                                          :{BLACK}Koszt: {GOLD}{CURRENCY}
-STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Waga: {GOLD}{COMMA16}t  ({COMMA16}t)
+STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Waga: {GOLD}{COMMA}t  ({COMMA}t)
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Koszt: {GOLD}{CURRENCY}{BLACK} Predkosc: {GOLD}{VELOCITY}
-STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Ladownosc: {GOLD}{COMMA16} pasazerow, {COMMA16} sztuk poczty
-STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Moc: {GOLD}+{COMMA16}koni mechanicznych{BLACK} Waga: {GOLD}+{COMMA8}t
+STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Ladownosc: {GOLD}{COMMA} pasazerow, {COMMA} sztuk poczty
+STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Moc: {GOLD}+{COMMA}koni mechanicznych{BLACK} Waga: {GOLD}+{COMMA}t
--- a/lang/portuguese.txt	Thu Jul 14 09:53:52 2005 +0000
+++ b/lang/portuguese.txt	Thu Jul 14 15:10:20 2005 +0000
@@ -82,69 +82,69 @@
 STR_004C_PLASTIC                                                :Plástico
 STR_004D_FIZZY_DRINK                                            :Bebidas Gasosas
 STR_004E                                                        :
-STR_004F_PASSENGER                                              :{COMMA16} passageiro
-STR_0050_TON_OF_COAL                                            :{COMMA16} tonelada de carvão
-STR_0051_BAG_OF_MAIL                                            :{COMMA16} saco de correio
+STR_004F_PASSENGER                                              :{COMMA} passageiro
+STR_0050_TON_OF_COAL                                            :{COMMA} tonelada de carvão
+STR_0051_BAG_OF_MAIL                                            :{COMMA} saco de correio
 STR_0052_OF_OIL                                                 :{VOLUME} de petróleo
-STR_0053_ITEM_OF_LIVESTOCK                                      :{COMMA16} item de gado
-STR_0054_CRATE_OF_GOODS                                         :{COMMA16} caixa de bens
-STR_0055_TON_OF_GRAIN                                           :{COMMA16} tonelada de cereais
-STR_0056_TON_OF_WOOD                                            :{COMMA16} tonelada de madeira
-STR_0057_TON_OF_IRON_ORE                                        :{COMMA16} tonelada de minério de ferro
-STR_0058_TON_OF_STEEL                                           :{COMMA16} tonelada de aço
-STR_0059_BAG_OF_VALUABLES                                       :{COMMA16} saco de valores
-STR_005A_TON_OF_COPPER_ORE                                      :{COMMA16} tonelada de minério de cobre
-STR_005B_TON_OF_MAIZE                                           :{COMMA16} tonelada de milho
-STR_005C_TON_OF_FRUIT                                           :{COMMA16} tonelada de fruta
-STR_005D_BAG_OF_DIAMONDS                                        :{COMMA16} saco de diamantes
-STR_005E_TON_OF_FOOD                                            :{COMMA16} tonelada de comida
-STR_005F_TON_OF_PAPER                                           :{COMMA16} tonelada de papel
-STR_0060_BAG_OF_GOLD                                            :{COMMA16} saco de ouro
+STR_0053_ITEM_OF_LIVESTOCK                                      :{COMMA} item de gado
+STR_0054_CRATE_OF_GOODS                                         :{COMMA} caixa de bens
+STR_0055_TON_OF_GRAIN                                           :{COMMA} tonelada de cereais
+STR_0056_TON_OF_WOOD                                            :{COMMA} tonelada de madeira
+STR_0057_TON_OF_IRON_ORE                                        :{COMMA} tonelada de minério de ferro
+STR_0058_TON_OF_STEEL                                           :{COMMA} tonelada de aço
+STR_0059_BAG_OF_VALUABLES                                       :{COMMA} saco de valores
+STR_005A_TON_OF_COPPER_ORE                                      :{COMMA} tonelada de minério de cobre
+STR_005B_TON_OF_MAIZE                                           :{COMMA} tonelada de milho
+STR_005C_TON_OF_FRUIT                                           :{COMMA} tonelada de fruta
+STR_005D_BAG_OF_DIAMONDS                                        :{COMMA} saco de diamantes
+STR_005E_TON_OF_FOOD                                            :{COMMA} tonelada de comida
+STR_005F_TON_OF_PAPER                                           :{COMMA} tonelada de papel
+STR_0060_BAG_OF_GOLD                                            :{COMMA} saco de ouro
 STR_0061_OF_WATER                                               :{VOLUME} de água
-STR_0062_TON_OF_WHEAT                                           :{COMMA16} tonelada de trigo
+STR_0062_TON_OF_WHEAT                                           :{COMMA} tonelada de trigo
 STR_0063_OF_RUBBER                                              :{VOLUME} de borracha
-STR_0064_TON_OF_SUGAR                                           :{COMMA16} tonelada de açúcar
-STR_0065_TOY                                                    :{COMMA16} brinquedo
-STR_0066_BAG_OF_CANDY                                           :{COMMA16} saco de doces
+STR_0064_TON_OF_SUGAR                                           :{COMMA} tonelada de açúcar
+STR_0065_TOY                                                    :{COMMA} brinquedo
+STR_0066_BAG_OF_CANDY                                           :{COMMA} saco de doces
 STR_0067_OF_COLA                                                :{VOLUME} de cola
-STR_0068_TON_OF_COTTON_CANDY                                    :{COMMA16} tonelada de algodão doce
-STR_0069_BUBBLE                                                 :{COMMA16} bolha
-STR_006A_TON_OF_TOFFEE                                          :{COMMA16} tonelada de caramelo
-STR_006B_BATTERY                                                :{COMMA16} bateria
+STR_0068_TON_OF_COTTON_CANDY                                    :{COMMA} tonelada de algodão doce
+STR_0069_BUBBLE                                                 :{COMMA} bolha
+STR_006A_TON_OF_TOFFEE                                          :{COMMA} tonelada de caramelo
+STR_006B_BATTERY                                                :{COMMA} bateria
 STR_006C_OF_PLASTIC                                             :{VOLUME} de plástico
-STR_006D_FIZZY_DRINK                                            :{COMMA16} Bebida Gasosa
+STR_006D_FIZZY_DRINK                                            :{COMMA} Bebida Gasosa
 STR_006E                                                        :
-STR_006F_PASSENGERS                                             :{COMMA16} passageiros
-STR_0070_TONS_OF_COAL                                           :{COMMA16} toneladas de carvão
-STR_0071_BAGS_OF_MAIL                                           :{COMMA16} sacos de correio
+STR_006F_PASSENGERS                                             :{COMMA} passageiros
+STR_0070_TONS_OF_COAL                                           :{COMMA} toneladas de carvão
+STR_0071_BAGS_OF_MAIL                                           :{COMMA} sacos de correio
 STR_0072_OF_OIL                                                 :{VOLUME} de petróleo
-STR_0073_ITEMS_OF_LIVESTOCK                                     :{COMMA16} itens de gado
-STR_0074_CRATES_OF_GOODS                                        :{COMMA16} caixas de bens
-STR_0075_TONS_OF_GRAIN                                          :{COMMA16} toneladas de cereais
-STR_0076_TONS_OF_WOOD                                           :{COMMA16} toneladas de madeira
-STR_0077_TONS_OF_IRON_ORE                                       :{COMMA16} toneladas de minério de ferro
-STR_0078_TONS_OF_STEEL                                          :{COMMA16} toneladas de aço
-STR_0079_BAGS_OF_VALUABLES                                      :{COMMA16} sacos de valores
-STR_007A_TONS_OF_COPPER_ORE                                     :{COMMA16} toneladas de minério de cobre
-STR_007B_TONS_OF_MAIZE                                          :{COMMA16} toneladas de milho
-STR_007C_TONS_OF_FRUIT                                          :{COMMA16} toneladas de fruta
-STR_007D_BAGS_OF_DIAMONDS                                       :{COMMA16} sacos de diamantes
-STR_007E_TONS_OF_FOOD                                           :{COMMA16} toneladas de comida
-STR_007F_TONS_OF_PAPER                                          :{COMMA16} toneladas de papel
-STR_0080_BAGS_OF_GOLD                                           :{COMMA16} sacos de ouro
+STR_0073_ITEMS_OF_LIVESTOCK                                     :{COMMA} itens de gado
+STR_0074_CRATES_OF_GOODS                                        :{COMMA} caixas de bens
+STR_0075_TONS_OF_GRAIN                                          :{COMMA} toneladas de cereais
+STR_0076_TONS_OF_WOOD                                           :{COMMA} toneladas de madeira
+STR_0077_TONS_OF_IRON_ORE                                       :{COMMA} toneladas de minério de ferro
+STR_0078_TONS_OF_STEEL                                          :{COMMA} toneladas de aço
+STR_0079_BAGS_OF_VALUABLES                                      :{COMMA} sacos de valores
+STR_007A_TONS_OF_COPPER_ORE                                     :{COMMA} toneladas de minério de cobre
+STR_007B_TONS_OF_MAIZE                                          :{COMMA} toneladas de milho
+STR_007C_TONS_OF_FRUIT                                          :{COMMA} toneladas de fruta
+STR_007D_BAGS_OF_DIAMONDS                                       :{COMMA} sacos de diamantes
+STR_007E_TONS_OF_FOOD                                           :{COMMA} toneladas de comida
+STR_007F_TONS_OF_PAPER                                          :{COMMA} toneladas de papel
+STR_0080_BAGS_OF_GOLD                                           :{COMMA} sacos de ouro
 STR_0081_OF_WATER                                               :{VOLUME} de água
-STR_0082_TONS_OF_WHEAT                                          :{COMMA16} toneladas de trigo
+STR_0082_TONS_OF_WHEAT                                          :{COMMA} toneladas de trigo
 STR_0083_OF_RUBBER                                              :{VOLUME} de borracha
-STR_0084_TONS_OF_SUGAR                                          :{COMMA16} toneladas de açúcar
-STR_0085_TOYS                                                   :{COMMA16} brinquedos
-STR_0086_BAGS_OF_CANDY                                          :{COMMA16} sacos de doces
+STR_0084_TONS_OF_SUGAR                                          :{COMMA} toneladas de açúcar
+STR_0085_TOYS                                                   :{COMMA} brinquedos
+STR_0086_BAGS_OF_CANDY                                          :{COMMA} sacos de doces
 STR_0087_OF_COLA                                                :{VOLUME} de cola
-STR_0088_TONS_OF_COTTON_CANDY                                   :{COMMA16} toneladas de algodão doce
-STR_0089_BUBBLES                                                :{COMMA16} bolhas
-STR_008A_TONS_OF_TOFFEE                                         :{COMMA16} toneladas de caramelo
-STR_008B_BATTERIES                                              :{COMMA16} baterias
+STR_0088_TONS_OF_COTTON_CANDY                                   :{COMMA} toneladas de algodão doce
+STR_0089_BUBBLES                                                :{COMMA} bolhas
+STR_008A_TONS_OF_TOFFEE                                         :{COMMA} toneladas de caramelo
+STR_008B_BATTERIES                                              :{COMMA} baterias
 STR_008C_OF_PLASTIC                                             :{VOLUME} de plástico
-STR_008D_FIZZY_DRINKS                                           :{COMMA16} bebidas gasosas
+STR_008D_FIZZY_DRINKS                                           :{COMMA} bebidas gasosas
 STR_008E                                                        :
 STR_008F_PS                                                     :{TINYFONT}PS
 STR_0090_CL                                                     :{TINYFONT}CL
@@ -219,8 +219,8 @@
 STR_00DF_GREY                                                   :Cinzento
 STR_00E0_WHITE                                                  :Branco
 STR_00E1_TOO_MANY_VEHICLES_IN_GAME                              :{WHITE}Existem muitos veículos em jogo
-STR_00E2                                                        :{BLACK}{COMMA16}
-STR_00E3                                                        :{RED}{COMMA16}
+STR_00E2                                                        :{BLACK}{COMMA}
+STR_00E3                                                        :{RED}{COMMA}
 STR_00E4_LOCATION                                               :{BLACK}Localização
 STR_00E5_CONTOURS                                               :Contornos
 STR_00E6_VEHICLES                                               :Veículos
@@ -441,18 +441,18 @@
 STR_0198_PROFIT_THIS_YEAR_LAST_YEAR                             :{TINYFONT}{BLACK}Lucro deste ano: {CURRENCY} (último ano: {CURRENCY})
 
 ############ range for service numbers starts
-STR_0199_YEAR                                                   :{COMMA16} ano ({COMMA16})
-STR_019A_YEARS                                                  :{COMMA16} anos ({COMMA16})
-STR_019B_YEARS                                                  :{RED}{COMMA16} anos ({COMMA16})
+STR_0199_YEAR                                                   :{COMMA} ano ({COMMA})
+STR_019A_YEARS                                                  :{COMMA} anos ({COMMA})
+STR_019B_YEARS                                                  :{RED}{COMMA} anos ({COMMA})
 ############ range for service numbers ends
 
 STR_019C_ROAD_VEHICLE                                           :Veículo de estrada
 STR_019D_AIRCRAFT                                               :Aeronave
 STR_019E_SHIP                                                   :Barco
 STR_019F_TRAIN                                                  :Comboio
-STR_01A0_IS_GETTING_OLD                                         :{WHITE}{STRING} {COMMA16} está a ficar velho
-STR_01A1_IS_GETTING_VERY_OLD                                    :{WHITE}{STRING} {COMMA16} está a ficar muito velho
-STR_01A2_IS_GETTING_VERY_OLD_AND                                :{WHITE}{STRING} {COMMA16} está a ficar muito velho e necessita de ser substituído urgentemente
+STR_01A0_IS_GETTING_OLD                                         :{WHITE}{STRING} {COMMA} está a ficar velho
+STR_01A1_IS_GETTING_VERY_OLD                                    :{WHITE}{STRING} {COMMA} está a ficar muito velho
+STR_01A2_IS_GETTING_VERY_OLD_AND                                :{WHITE}{STRING} {COMMA} está a ficar muito velho e necessita de ser substituído urgentemente
 STR_01A3_LAND_AREA_INFORMATION                                  :{WHITE}Informações do Terreno
 STR_01A4_COST_TO_CLEAR_N_A                                      :{BLACK}Custo para limpar: {LTBLUE}N/D
 STR_01A5_COST_TO_CLEAR                                          :{BLACK}Custo para limpar: {LTBLUE}{CURRENCY}
@@ -497,7 +497,7 @@
 STR_01CA_31ST                                                   :31
 ############ range for days	ends
 
-STR_01CB                                                        :{TINYFONT}{COMMA16}
+STR_01CB                                                        :{TINYFONT}{COMMA}
 STR_01CC_TOGGLE_LARGE_SMALL_MAP                                 :{BLACK}Mostrar mapa grande/pequeno
 STR_01CD_SELECT_TUTORIAL_DEMONSTRATION                          :{WHITE}Seleccionar Tutorial/Demonstração
 
@@ -509,7 +509,7 @@
 STR_CARGO_ACCEPTED_5                                            :{BLACK}Carga aceite: {LTBLUE}{STRING}, {STRING}, {STRING}, {STRING}, {STRING}
 ############ range for cargo acecpted ends
 
-STR_01D1_8                                                      :({COMMA8}/8 {STRING})
+STR_01D1_8                                                      :({COMMA}/8 {STRING})
 STR_01D2_JAZZ_JUKEBOX                                           :{WHITE}Jazz Jukebox
 STR_01D3_SOUND_MUSIC                                            :Som/música
 STR_01D4_SHOW_SOUND_MUSIC_WINDOW                                :{BLACK}Mostrar janela som/música
@@ -528,16 +528,16 @@
 STR_01E1_START_PLAYING_MUSIC                                    :{BLACK}Iniciar reprodução de música
 STR_01E2_DRAG_SLIDERS_TO_SET_MUSIC                              :{BLACK}Arraste os cursores para ajustar o volume da música e efeitos sonoros
 STR_01E3                                                        :{DKGREEN}{TINYFONT}--
-STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA8}
-STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA8}
+STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA}
+STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA}
 STR_01E6                                                        :{DKGREEN}{TINYFONT}------
 STR_01E7                                                        :{DKGREEN}{TINYFONT}'{STRING}'
 STR_01E8_TRACK_XTITLE                                           :{BLACK}{TINYFONT}Faixa{SETX 88}Título
 STR_01E9_SHUFFLE                                                :{TINYFONT}Baralhar
 STR_01EA_PROGRAM                                                :{TINYFONT}{BLACK}Programa
 STR_01EB_MUSIC_PROGRAM_SELECTION                                :{WHITE}Programação Musical
-STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA16} '{STRING}'
-STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA16}   '{STRING}'
+STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} '{STRING}'
+STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA}   '{STRING}'
 STR_01EE_TRACK_INDEX                                            :{TINYFONT}{BLACK}Índice de faixas
 STR_01EF_PROGRAM                                                :{TINYFONT}{BLACK}Programa - '{STRING}'
 STR_01F0_CLEAR                                                  :{TINYFONT}{BLACK}Limpar
@@ -577,7 +577,7 @@
 STR_0210_TOO_FAR_FROM_PREVIOUS_DESTINATIO                       :{WHITE}...Muito distante do destino anterior
 STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Top de companhias que chegaram a {NUMU16}{}({STRING} Nivél)
 STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Tabela de Liga de Companhias em {NUMU16}
-STR_0212                                                        :{BIGFONT}{COMMA16}.
+STR_0212                                                        :{BIGFONT}{COMMA}.
 STR_0213_BUSINESSMAN                                            :Negociante
 STR_0214_ENTREPRENEUR                                           :Empresário
 STR_0215_INDUSTRIALIST                                          :Industrial
@@ -586,12 +586,12 @@
 STR_0218_MOGUL                                                  :Grande magnate
 STR_0219_TYCOON_OF_THE_CENTURY                                  :Magnate do século
 STR_HIGHSCORE_NAME                                              :{BIGFONT}{STRING}, {STRING}
-STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA16})
+STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA})
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{STRING} conquista '{STRING}' desempenho!
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{STRING} de {STRING} conquista '{STRING}' desempenho!
 STR_021D                                                        :{BLACK}
 STR_021E                                                        :{WHITE}
-STR_021F                                                        :{BLUE}{COMMA16}
+STR_021F                                                        :{BLUE}{COMMA}
 STR_0220_CREATE_SCENARIO                                        :{BLACK}Criar Cenário
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Editor de Cenário
@@ -788,8 +788,8 @@
 STR_EXTRA_VIEW_PORT                                             :Visualizador extra
 STR_SIGN_LIST                                                   :Lista de sinais
 STR_02DF_TOWN_DIRECTORY                                         :Lista de cidades
-STR_TOWN_POPULATION                                             :{BLACK}População Mundial: {COMMA32}
-STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Visualizador {COMMA16}
+STR_TOWN_POPULATION                                             :{BLACK}População Mundial: {COMMA}
+STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Visualizador {COMMA}
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN                                :{BLACK}Copiar para o visualizador
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT                             :{BLACK}Copiar a localização do visualizador global para este visualizador
 STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW                                :{BLACK}Colar do visualizador
@@ -961,34 +961,34 @@
 STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Não é possível copiar a lista de ordens...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Fim de Ordens Partilhadas - -
 
-STR_TRAIN_IS_LOST                                               :{WHITE}Comboio {COMMA16} está perdido.
-STR_TRAIN_IS_UNPROFITABLE                                       :{WHITE}O lucro do comboio {COMMA16} no último ano foi de {CURRENCY}
+STR_TRAIN_IS_LOST                                               :{WHITE}Comboio {COMMA} está perdido.
+STR_TRAIN_IS_UNPROFITABLE                                       :{WHITE}O lucro do comboio {COMMA} no último ano foi de {CURRENCY}
 STR_EURO_INTRODUCE                                              :{BLACK}{BIGFONT}União Monetária Europeia!{}{}O Euro é introduzido como moeda única para todas as transacções no seu país!
 
 # Start of order review system.
 # DON'T ADD OR REMOVE LINES HERE
-STR_TRAIN_HAS_TOO_FEW_ORDERS                                    :{WHITE}O comboio {COMMA16} tem muito poucas ordens definidas
-STR_TRAIN_HAS_VOID_ORDER                                        :{WHITE}O comboio {COMMA16} tem uma ordem inválida
-STR_TRAIN_HAS_DUPLICATE_ENTRY                                   :{WHITE}O comboio {COMMA16} tem ordens duplicadas
-STR_TRAIN_HAS_INVALID_ENTRY                                     :{WHITE}O comboio {COMMA16} tem uma estação inválida nas suas ordens
-STR_ROADVEHICLE_HAS_TOO_FEW_ORDERS                              :{WHITE}O veículo de estrada {COMMA16} tem muito poucas ordens definidas
-STR_ROADVEHICLE_HAS_VOID_ORDER                                  :{WHITE}O veículo de estrada {COMMA16} tem uma ordem inválida
-STR_ROADVEHICLE_HAS_DUPLICATE_ENTRY                             :{WHITE}O veículo de estrada {COMMA16} tem ordens duplicadas
-STR_ROADVEHICLE_HAS_INVALID_ENTRY                               :{WHITE}O veículo de estrada {COMMA16} tem uma estação inválida nas suas ordens
-STR_SHIP_HAS_TOO_FEW_ORDERS                                     :{WHITE}O barco {COMMA16} tem muito poucas ordens definidas
-STR_SHIP_HAS_VOID_ORDER                                         :{WHITE}O barco {COMMA16} tem uma ordem inválida
-STR_SHIP_HAS_DUPLICATE_ENTRY                                    :{WHITE}O barco {COMMA16} tem ordens duplicadas
-STR_SHIP_HAS_INVALID_ENTRY                                      :{WHITE}O barco {COMMA16} tem uma estação inválida nas suas ordens
-STR_AIRCRAFT_HAS_TOO_FEW_ORDERS                                 :{WHITE}A aeronave {COMMA16} tem muito poucas ordens definidas
-STR_AIRCRAFT_HAS_VOID_ORDER                                     :{WHITE}A aeronave {COMMA16} tem uma ordem inválida
-STR_AIRCRAFT_HAS_DUPLICATE_ENTRY                                :{WHITE}A aeronave {COMMA16} tem ordens duplicadas
-STR_AIRCRAFT_HAS_INVALID_ENTRY                                  :{WHITE}A aeronave {COMMA16} tem uma estação inválida nas suas ordens
+STR_TRAIN_HAS_TOO_FEW_ORDERS                                    :{WHITE}O comboio {COMMA} tem muito poucas ordens definidas
+STR_TRAIN_HAS_VOID_ORDER                                        :{WHITE}O comboio {COMMA} tem uma ordem inválida
+STR_TRAIN_HAS_DUPLICATE_ENTRY                                   :{WHITE}O comboio {COMMA} tem ordens duplicadas
+STR_TRAIN_HAS_INVALID_ENTRY                                     :{WHITE}O comboio {COMMA} tem uma estação inválida nas suas ordens
+STR_ROADVEHICLE_HAS_TOO_FEW_ORDERS                              :{WHITE}O veículo de estrada {COMMA} tem muito poucas ordens definidas
+STR_ROADVEHICLE_HAS_VOID_ORDER                                  :{WHITE}O veículo de estrada {COMMA} tem uma ordem inválida
+STR_ROADVEHICLE_HAS_DUPLICATE_ENTRY                             :{WHITE}O veículo de estrada {COMMA} tem ordens duplicadas
+STR_ROADVEHICLE_HAS_INVALID_ENTRY                               :{WHITE}O veículo de estrada {COMMA} tem uma estação inválida nas suas ordens
+STR_SHIP_HAS_TOO_FEW_ORDERS                                     :{WHITE}O barco {COMMA} tem muito poucas ordens definidas
+STR_SHIP_HAS_VOID_ORDER                                         :{WHITE}O barco {COMMA} tem uma ordem inválida
+STR_SHIP_HAS_DUPLICATE_ENTRY                                    :{WHITE}O barco {COMMA} tem ordens duplicadas
+STR_SHIP_HAS_INVALID_ENTRY                                      :{WHITE}O barco {COMMA} tem uma estação inválida nas suas ordens
+STR_AIRCRAFT_HAS_TOO_FEW_ORDERS                                 :{WHITE}A aeronave {COMMA} tem muito poucas ordens definidas
+STR_AIRCRAFT_HAS_VOID_ORDER                                     :{WHITE}A aeronave {COMMA} tem uma ordem inválida
+STR_AIRCRAFT_HAS_DUPLICATE_ENTRY                                :{WHITE}A aeronave {COMMA} tem ordens duplicadas
+STR_AIRCRAFT_HAS_INVALID_ENTRY                                  :{WHITE}A aeronave {COMMA} tem uma estação inválida nas suas ordens
 # end of order system
 
-STR_TRAIN_AUTORENEW_FAILED                                      :{WHITE}A auto-renovação do comboio {COMMA16} falhou (limite de dinheiro)
-STR_ROADVEHICLE_AUTORENEW_FAILED                                :{WHITE}A auto-renovação do veículo de estrada {COMMA16} falhou (limite de dinheiro)
-STR_SHIP_AUTORENEW_FAILED                                       :{WHITE}A auto-renovação do barco {COMMA16} falhou (limite de dinheiro)
-STR_AIRCRAFT_AUTORENEW_FAILED                                   :{WHITE}A auto-renovação da aeronave {COMMA16} falhou (limite de dinheiro)
+STR_TRAIN_AUTORENEW_FAILED                                      :{WHITE}A auto-renovação do comboio {COMMA} falhou (limite de dinheiro)
+STR_ROADVEHICLE_AUTORENEW_FAILED                                :{WHITE}A auto-renovação do veículo de estrada {COMMA} falhou (limite de dinheiro)
+STR_SHIP_AUTORENEW_FAILED                                       :{WHITE}A auto-renovação do barco {COMMA} falhou (limite de dinheiro)
+STR_AIRCRAFT_AUTORENEW_FAILED                                   :{WHITE}A auto-renovação da aeronave {COMMA} falhou (limite de dinheiro)
 
 STR_CONFIG_PATCHES                                              :{BLACK}Configurar Correcções
 STR_CONFIG_PATCHES_TIP                                          :{BLACK}Configurar as correcções
@@ -1104,7 +1104,7 @@
 STR_CHEATS_TIP                                                  :{BLACK}As caixas de verificação indicam se já usou este truque antes
 STR_CHEATS_WARNING                                              :{BLACK}Atenção! Está prestes a trair os seus oponentes. Tenha em conta que isto ficará registado para sempre.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Aumentar dinheiro em {CURRENCY64}
-STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Jogar pelo jogador: {ORANGE}{COMMA16}
+STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Jogar pelo jogador: {ORANGE}{COMMA}
 STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Bulldozer mágico (destrói indústrias, etc.): {ORANGE}{STRING}
 STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Os túneis poderão cruzar-se: {ORANGE}{STRING}
 STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Permitir construção quando em pausa: {ORANGE}{STRING}
@@ -1120,7 +1120,7 @@
 STR_GO_NON_STOP_TO_WAYPOINT                                     :Ir sem parar via {WAYPOINT}
 
 STR_WAYPOINTNAME_CITY                                           :Ponto de passagem {TOWN}
-STR_WAYPOINTNAME_CITY_SERIAL                                    :Ponto de passagem {TOWN} #{COMMA16}
+STR_WAYPOINTNAME_CITY_SERIAL                                    :Ponto de passagem {TOWN} #{COMMA}
 STR_LANDINFO_WAYPOINT                                           :Ponto de passagem
 
 STR_WAYPOINT                                                    :{WHITE}Ponto de passagem
@@ -1203,8 +1203,8 @@
 STR_CONSTRUCT_SUGAR_MINE_TIP                                    :{BLACK}Construir Mina de Açúcar
 
 STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Indústrias
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}){YELLOW} ({COMMA16}% transportado)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}/{STRING}){YELLOW} ({COMMA16}%/{COMMA16}% transportado)
+STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}){YELLOW} ({COMMA}% transportado)
+STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}/{STRING}){YELLOW} ({COMMA}%/{COMMA}% transportado)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{TOWN} {STRING}
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...muito perto de outra indústria
@@ -1244,15 +1244,15 @@
 STR_NETWORK_ADD_SERVER_TIP                                      :{BLACK}Adiciona um servidor à lista que será sempre verificado se existem jogos a decorrer.
 STR_NETWORK_ENTER_IP                                            :{BLACK}Introduza o endereço IP do servidor
 
-STR_NETWORK_CLIENTS_ONLINE                                      :{BLACK}{COMMA16}/{COMMA16}
+STR_NETWORK_CLIENTS_ONLINE                                      :{BLACK}{COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Clientes
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Clientes ligados / max. clientes
 STR_NETWORK_GAME_INFO                                           :{SILVER}INFORMAÇÃO DE JOGO
 STR_ORANGE                                                      :{ORANGE}{STRING}
-STR_NETWORK_CLIENTS                                             :{SILVER}Clientes:  {WHITE}{COMMA8} / {COMMA8}
+STR_NETWORK_CLIENTS                                             :{SILVER}Clientes:  {WHITE}{COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}Idioma:  {WHITE}{STRING}
 STR_NETWORK_TILESET                                             :{SILVER}Tileset:  {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Tamanho do Mapa:  {WHITE}{COMMA16}x{COMMA16}
+STR_NETWORK_MAP_SIZE                                            :{SILVER}Tamanho do Mapa:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Versão do servidor:  {WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Endereço do servidor:  {WHITE}{STRING} : {NUMU16}
 STR_NETWORK_START_DATE                                          :{SILVER}Data de inicio:  {WHITE}{DATE_SHORT}
@@ -1517,21 +1517,21 @@
 
 ##id 0x2000
 STR_2000_TOWNS                                                  :{WHITE}Cidades
-STR_TOWN_LABEL_POP                                              :{WHITE}{STRING} ({COMMA32})
+STR_TOWN_LABEL_POP                                              :{WHITE}{STRING} ({COMMA})
 STR_2001                                                        :{WHITE}{STRING}
 STR_2002                                                        :{TINYFONT}{BLACK}{STRING}
 STR_2003                                                        :{TINYFONT}{WHITE}{STRING}
 STR_2004_BUILDING_MUST_BE_DEMOLISHED                            :{WHITE}O edifício deve ser demolido primeiro
 STR_2005                                                        :{WHITE}{TOWN}
-STR_2006_POPULATION                                             :{BLACK}População: {ORANGE}{COMMA32}{BLACK}  Casas: {ORANGE}{COMMA32}
+STR_2006_POPULATION                                             :{BLACK}População: {ORANGE}{COMMA}{BLACK}  Casas: {ORANGE}{COMMA}
 STR_2007_RENAME_TOWN                                            :Renomear Cidade
 STR_2008_CAN_T_RENAME_TOWN                                      :{WHITE}Não é possível renomear cidade...
 STR_2009_LOCAL_AUTHORITY_REFUSES                                :{WHITE}A autoridade local de {TOWN} não autoriza
 STR_200A_TOWN_NAMES_CLICK_ON_NAME                               :{BLACK}Nomes das cidades - clique no nome para centrar a visualização na cidade
 STR_200B_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Centrar visualização na cidade
 STR_200C_CHANGE_TOWN_NAME                                       :{BLACK}Alterar o nome da cidade
-STR_200D_PASSENGERS_LAST_MONTH_MAX                              :{BLACK}Passageiros no último mês: {ORANGE}{COMMA32}{BLACK}  máx: {ORANGE}{COMMA32}
-STR_200E_MAIL_LAST_MONTH_MAX                                    :{BLACK}Correio no último mês: {ORANGE}{COMMA32}{BLACK}  máx: {ORANGE}{COMMA32}
+STR_200D_PASSENGERS_LAST_MONTH_MAX                              :{BLACK}Passageiros no último mês: {ORANGE}{COMMA}{BLACK}  máx: {ORANGE}{COMMA}
+STR_200E_MAIL_LAST_MONTH_MAX                                    :{BLACK}Correio no último mês: {ORANGE}{COMMA}{BLACK}  máx: {ORANGE}{COMMA}
 STR_200F_TALL_OFFICE_BLOCK                                      :Edifício alto de escritórios
 STR_2010_OFFICE_BLOCK                                           :Edifício de escritórios
 STR_2011_SMALL_BLOCK_OF_FLATS                                   :Edifício de apartamentos grande
@@ -1605,7 +1605,7 @@
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Subornar a autoridade local para aumentar a sua avaliação, correndo o  risco de uma penalidade severa se apanhado.{}  Custo: {CURRENCY}
 STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Tráfego caótico em {TOWN}!{}{}Programa de reconstrução de estradas financiado por {STRING} provoca 6 meses de miséria aos condutores!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
-STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA32})
+STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA})
 STR_2058_UNDER_CONSTRUCTION                                     :{STRING} (em construção)
 STR_2059_IGLOO                                                  :Igloo
 STR_205A_TEPEES                                                 :Tepees
@@ -1667,7 +1667,7 @@
 STR_303C_OUTSTANDING                                            :Proeminente
 ############ range for rating ends
 
-STR_303D                                                        :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA8}%)
+STR_303D                                                        :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_303E_NO_LONGER_ACCEPTS                                      :{WHITE}{STATION} não aceita mais {STRING}
 STR_303F_NO_LONGER_ACCEPTS_OR                                   :{WHITE}{STATION} não aceita mais {STRING} ou {STRING}
 STR_3040_NOW_ACCEPTS                                            :{WHITE}{STATION} agora aceita {STRING}
@@ -1678,7 +1678,7 @@
 STR_3045_TOO_CLOSE_TO_ANOTHER_TRUCK                             :{WHITE}Demasiado perto de outra estação de carga
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Precisa de demolir a estação de autocarros primeiro
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Precisa de demolir a estação de carga primeiro
-STR_3048_STATIONS                                               :{WHITE}{STRING} - {COMMA16} Estações
+STR_3048_STATIONS                                               :{WHITE}{STRING} - {COMMA} Estações
 STR_3049_0                                                      :{YELLOW}{STATION} {STRINL 0x30D1}
 STR_304A_NONE                                                   :{YELLOW}- Nenhuma -
 STR_304B_SITE_UNSUITABLE                                        :{WHITE}...sítio inadequado
@@ -1735,7 +1735,7 @@
 STR_4002_SAVE                                                   :{BLACK}Guardar
 STR_4003_DELETE                                                 :{BLACK}Eliminar
 STR_4004                                                        :{STRING}, {DATE_LONG}
-STR_4005_BYTES_FREE                                             :{BLACK}{COMMA32} megabytes livres
+STR_4005_BYTES_FREE                                             :{BLACK}{COMMA} megabytes livres
 STR_4006_UNABLE_TO_READ_DRIVE                                   :{BLACK}Não é possível ler unidade
 STR_4007_GAME_SAVE_FAILED                                       :{WHITE}Falha ao Guardar Jogo
 STR_4008_UNABLE_TO_DELETE_FILE                                  :{WHITE}Não é possível eliminar ficheiro
@@ -1796,7 +1796,7 @@
 ############ range for requires	ends
 
 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Produção no último mês:
-STR_482B_TRANSPORTED                                            :{YELLOW}{STRING}{BLACK} ({COMMA16}% transportado)
+STR_482B_TRANSPORTED                                            :{YELLOW}{STRING}{BLACK} ({COMMA}% transportado)
 STR_482C_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Centrar visualização na localização da indústria
 STR_482D_NEW_UNDER_CONSTRUCTION                                 :{BLACK}{BIGFONT}Nova {STRING} em construção em {TOWN}!
 STR_482E_NEW_BEING_PLANTED_NEAR                                 :{BLACK}{BIGFONT}Nova {STRING} está a ser plantada em {TOWN}!
@@ -1813,8 +1813,8 @@
 STR_4839_PRODUCTION_DOWN_BY_50                                  :{BLACK}{BIGFONT}Em {TOWN}, {STRING} diminuí produção 50%
 STR_483A_INSECT_INFESTATION_CAUSES                              :{BLACK}{BIGFONT}Em {TOWN} praga de insectos causa problemas na {STRING}!{}Produção diminuí 50%
 STR_483B_CAN_ONLY_BE_POSITIONED                                 :{WHITE}...só pode ser colocado perto das bordas do mapa
-STR_INDUSTRY_PROD_GOUP                                          :{BLACK}{BIGFONT}A produção de {STRING} em {TOWN} {STRING} aumenta {COMMA16}%!
-STR_INDUSTRY_PROD_GODOWN                                        :{BLACK}{BIGFONT}A produção de {STRING} em {TOWN} {STRING} diminui {COMMA16}%!
+STR_INDUSTRY_PROD_GOUP                                          :{BLACK}{BIGFONT}A produção de {STRING} em {TOWN} {STRING} aumenta {COMMA}%!
+STR_INDUSTRY_PROD_GODOWN                                        :{BLACK}{BIGFONT}A produção de {STRING} em {TOWN} {STRING} diminui {COMMA}%!
 
 ##id 0x5000
 STR_5000_TRAIN_IN_TUNNEL                                        :{WHITE}Há um comboio no túnel
@@ -1877,10 +1877,10 @@
 ##id 0x6000
 STR_SV_EMPTY                                                    :
 STR_SV_UNNAMED                                                  :Sem nome{SKIP}
-STR_SV_TRAIN_NAME                                               :Comboio {COMMA16}
-STR_SV_ROADVEH_NAME                                             :Veículo de Estrada {COMMA16}
-STR_SV_SHIP_NAME                                                :Barco {COMMA16}
-STR_SV_AIRCRAFT_NAME                                            :Aeronave {COMMA16}
+STR_SV_TRAIN_NAME                                               :Comboio {COMMA}
+STR_SV_ROADVEH_NAME                                             :Veículo de Estrada {COMMA}
+STR_SV_SHIP_NAME                                                :Barco {COMMA}
+STR_SV_AIRCRAFT_NAME                                            :Aeronave {COMMA}
 
 STR_SV_STNAME                                                   :{STRING}
 STR_SV_STNAME_NORTH                                             :{STRING} Norte
@@ -1930,12 +1930,12 @@
 ############ range for difficulty levels ends
 
 ############ range for difficulty settings starts
-STR_6805_MAXIMUM_NO_COMPETITORS                                 :{LTBLUE}Número máximo de oponentes: {ORANGE}{COMMA16}
+STR_6805_MAXIMUM_NO_COMPETITORS                                 :{LTBLUE}Número máximo de oponentes: {ORANGE}{COMMA}
 STR_6806_COMPETITOR_START_TIME                                  :{LTBLUE}Data de início dos oponentes: {ORANGE}{STRING}
 STR_6807_NO_OF_TOWNS                                            :{LTBLUE}Número de cidades: {ORANGE}{STRING}
 STR_6808_NO_OF_INDUSTRIES                                       :{LTBLUE}Número de indústrias: {ORANGE}{STRING}
 STR_6809_MAXIMUM_INITIAL_LOAN_000                               :{LTBLUE}Empréstimo máximo inicial: {ORANGE}{CURRENCY}
-STR_680A_INITIAL_INTEREST_RATE                                  :{LTBLUE}Taxa de interesse inicial: {ORANGE}{COMMA16}%
+STR_680A_INITIAL_INTEREST_RATE                                  :{LTBLUE}Taxa de interesse inicial: {ORANGE}{COMMA}%
 STR_680B_VEHICLE_RUNNING_COSTS                                  :{LTBLUE}Custos de circulação dos veículos: {ORANGE}{STRING}
 STR_680C_CONSTRUCTION_SPEED_OF_COMPETITOR                       :{LTBLUE}Velocidade de construção dos oponentes: {ORANGE}{STRING}
 STR_680D_INTELLIGENCE_OF_COMPETITORS                            :{LTBLUE}Inteligência dos oponentes: {ORANGE}{STRING}
@@ -1994,7 +1994,7 @@
 ##id 0x7000
 STR_7000                                                        :
 STR_7001                                                        :{WHITE}{STRING} {BLACK}{STRING}
-STR_7002_PLAYER                                                 :(Jogador {COMMA16})
+STR_7002_PLAYER                                                 :(Jogador {COMMA})
 STR_7004_NEW_FACE                                               :{BLACK}Nova Cara
 STR_7005_COLOR_SCHEME                                           :{BLACK}Cores
 STR_7006_COLOR_SCHEME                                           :{GOLD}Cores:
@@ -2028,7 +2028,7 @@
 STR_7022_INCOME_GRAPH                                           :{WHITE}Gráfico de Rendimentos
 STR_CURRCOMPACT32                                               :{CURRCOMPACT}
 STR_CURRCOMPACT64                                               :{CURRCOMPACT64}
-STR_7024                                                        :{COMMA32}
+STR_7024                                                        :{COMMA}
 STR_7025_OPERATING_PROFIT_GRAPH                                 :{WHITE}Gráfico de Benefícios Operativos
 STR_7026_BANK_BALANCE                                           :{WHITE}Balanço Bancário
 STR_7027_LOAN                                                   :{WHITE}Empréstimo
@@ -2052,14 +2052,14 @@
 STR_7037_PRESIDENT                                              :{WHITE}{STRING}{}{GOLD}(Presidente)
 STR_7038_INAUGURATED                                            :{GOLD}Inaugurado: {WHITE}{NUMU16}
 STR_7039_VEHICLES                                               :{GOLD}Veículos:
-STR_703A_TRAIN                                                  :{WHITE}{COMMA16} comboio
-STR_703B_TRAINS                                                 :{WHITE}{COMMA16} comboios
-STR_703C_ROAD_VEHICLE                                           :{WHITE}{COMMA16} veículo de estrada
-STR_703D_ROAD_VEHICLES                                          :{WHITE}{COMMA16} veículos de estrada
-STR_703E_AIRCRAFT                                               :{WHITE}{COMMA16} aeronave
-STR_703F_AIRCRAFT                                               :{WHITE}{COMMA16} aeronaves
-STR_7040_SHIP                                                   :{WHITE}{COMMA16} barco
-STR_7041_SHIPS                                                  :{WHITE}{COMMA16} barcos
+STR_703A_TRAIN                                                  :{WHITE}{COMMA} comboio
+STR_703B_TRAINS                                                 :{WHITE}{COMMA} comboios
+STR_703C_ROAD_VEHICLE                                           :{WHITE}{COMMA} veículo de estrada
+STR_703D_ROAD_VEHICLES                                          :{WHITE}{COMMA} veículos de estrada
+STR_703E_AIRCRAFT                                               :{WHITE}{COMMA} aeronave
+STR_703F_AIRCRAFT                                               :{WHITE}{COMMA} aeronaves
+STR_7040_SHIP                                                   :{WHITE}{COMMA} barco
+STR_7041_SHIPS                                                  :{WHITE}{COMMA} barcos
 STR_7042_NONE                                                   :{WHITE}Nenhum
 STR_7043_FACE_SELECTION                                         :{WHITE}Selecção de Cara
 STR_7044_MALE                                                   :{BLACK}Masculino
@@ -2124,8 +2124,8 @@
 STR_707A_SELL_25_SHARE_IN_THIS_COMPANY                          :{BLACK}Vender 25% de acções nesta empresa
 STR_707B_CAN_T_BUY_25_SHARE_IN_THIS                             :{WHITE}Não é possível comprar 25% de acções nesta empresa...
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}Não é possível vender 25% de acções nesta empresa...
-STR_707D_OWNED_BY                                               :{WHITE}({COMMA16}% propriedade de {STRING})
-STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA16}% propriedade de {STRING}{}   {COMMA16}% propriedade de {STRING})
+STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% propriedade de {STRING})
+STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}% propriedade de {STRING}{}   {COMMA}% propriedade de {STRING})
 STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{STRING} foi comprada por {STRING}!
 STR_7080_PROTECTED                                              :{WHITE}Esta empresa ainda não troca acções...
 
@@ -2400,8 +2400,8 @@
 STR_8801_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Cidadãos celebram . . .{}Primeiro comboio chega a {STATION}!
 STR_8802_DETAILS                                                :{WHITE}{STRING} (Detalhes)
 STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}Comboio no caminho
-STR_8804                                                        :{SETX 10}{COMMA8}: {STRING}
-STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA8}: {STRING}
+STR_8804                                                        :{SETX 10}{COMMA}: {STRING}
+STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING}
 STR_8806_GO_TO                                                  :Ir para {STATION}
 STR_8807_GO_TO_TRANSFER                                         :Ir para {STATION} (Transferir e levar carga)
 STR_8808_GO_TO_UNLOAD                                           :Ir para {STATION} (Descarregar)
@@ -2427,13 +2427,13 @@
 STR_UNKNOWN_DESTINATION                                         :destino desconhecido
 STR_8812_EMPTY                                                  :{LTBLUE}Vazio
 STR_8813_FROM                                                   :{LTBLUE}{CARGO} de {STATION}
-STR_8814_TRAIN_IS_WAITING_IN_DEPOT                              :{WHITE}Comboio {COMMA16} está a aguardar no depósito
+STR_8814_TRAIN_IS_WAITING_IN_DEPOT                              :{WHITE}Comboio {COMMA} está a aguardar no depósito
 STR_8815_NEW_VEHICLES                                           :{BLACK}Novos Veículos
 STR_8816                                                        :{BLACK}-
 STR_8818_INFORMATION                                            :{BLACK}Informação
 STR_8819_TRAIN_TOO_LONG                                         :{WHITE}Comboio muito longo
 STR_881A_TRAINS_CAN_ONLY_BE_ALTERED                             :{WHITE}Os comboios só podem ser alterados quando parados num depósito
-STR_881B_TRAINS                                                 :{WHITE}{STRING} - {COMMA16} Comboios
+STR_881B_TRAINS                                                 :{WHITE}{STRING} - {COMMA} Comboios
 STR_881C_NEW_RAIL_VEHICLES                                      :{WHITE}Novos Veículos Ferroviários
 STR_881D_NEW_MONORAIL_VEHICLES                                  :{WHITE}Novos Veículos Monocarril
 STR_881E_NEW_MAGLEV_VEHICLES                                    :{WHITE}Novos Veículos Maglev
@@ -2467,8 +2467,8 @@
 STR_8839_CAN_T_SELL_RAILROAD_VEHICLE                            :{WHITE}Não é possível vender veículo ferroviário...
 STR_883A_UNABLE_TO_FIND_ROUTE_TO                                :{WHITE}Não é possível encontrar rota para o depósito local
 STR_883B_CAN_T_STOP_START_TRAIN                                 :{WHITE}Não é possível iniciar/parar comboio...
-STR_883C_SERVICING_INTERVAL_DAYS                                :{BLACK}Intervalo de serviço: {LTBLUE}{COMMA16}dias{BLACK}   Último serviço: {LTBLUE}{DATE_LONG}
-STR_SERVICING_INTERVAL_PERCENT                                  :{BLACK}Intervalo de serviço: {LTBLUE}{COMMA16}%{BLACK}   Último serviço: {LTBLUE}{DATE_LONG}
+STR_883C_SERVICING_INTERVAL_DAYS                                :{BLACK}Intervalo de serviço: {LTBLUE}{COMMA}dias{BLACK}   Último serviço: {LTBLUE}{DATE_LONG}
+STR_SERVICING_INTERVAL_PERCENT                                  :{BLACK}Intervalo de serviço: {LTBLUE}{COMMA}%{BLACK}   Último serviço: {LTBLUE}{DATE_LONG}
 STR_883D_TRAINS_CLICK_ON_TRAIN_FOR                              :{BLACK}Comboios - clique num comboio para informações
 STR_883E_BUILD_NEW_TRAINS_REQUIRES                              :{BLACK}Construir novos comboios (necessita de depósito de comboios)
 STR_883F_TRAINS_CLICK_ON_TRAIN_FOR                              :{BLACK}Comboios - clique num comboio para informações, arraste um veículo o adicionar ao comboio ou remover
@@ -2501,12 +2501,12 @@
 STR_SERVICE_HINT                                                :{BLACK}Saltar esta ordem a menos que seja necessário manutenção
 STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}Novo {STRING} disponível!
 STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
-STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Custo: {CURRENCY} Peso: {COMMA16}t{}Velocidade: {VELOCITY}  Potência: {COMMA16}hp{}Custo de circulação: {CURRENCY}/ano{}Capacidade: {STRING}
+STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Custo: {CURRENCY} Peso: {COMMA}t{}Velocidade: {VELOCITY}  Potência: {COMMA}hp{}Custo de circulação: {CURRENCY}/ano{}Capacidade: {STRING}
 STR_885C_BROKEN_DOWN                                            :{RED}Avariado
 STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Idade: {LTBLUE}{STRING}{BLACK}   Custo de circulação: {LTBLUE}{CURRENCY}/ano
-STR_885E_WEIGHT_T_POWER_HP_MAX_SPEED                            :{BLACK}Peso: {LTBLUE}{COMMA16}t  {BLACK}Potência: {LTBLUE}{COMMA32}hp{BLACK} Velocidade Máx.: {LTBLUE}{VELOCITY}
+STR_885E_WEIGHT_T_POWER_HP_MAX_SPEED                            :{BLACK}Peso: {LTBLUE}{COMMA}t  {BLACK}Potência: {LTBLUE}{COMMA}hp{BLACK} Velocidade Máx.: {LTBLUE}{VELOCITY}
 STR_885F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Lucros deste ano: {LTBLUE}{CURRENCY}  (último ano: {CURRENCY})
-STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Fiabilidade: {LTBLUE}{COMMA8}%  {BLACK}Avarias desde a última manutenção: {LTBLUE}{COMMA16}
+STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Fiabilidade: {LTBLUE}{COMMA}%  {BLACK}Avarias desde a última manutenção: {LTBLUE}{COMMA}
 STR_8861_STOPPED                                                :{RED}Parado
 STR_8862_CAN_T_MAKE_TRAIN_PASS_SIGNAL                           :{WHITE}Não é possível fazer o comboio passar o sinal de perigo...
 STR_8863_CRASHED                                                :{RED}Acidentado!
@@ -2514,7 +2514,7 @@
 STR_8865_NAME_TRAIN                                             :{WHITE}Renomear comboio
 STR_8866_CAN_T_NAME_TRAIN                                       :{WHITE}Não é possível renomear comboio...
 STR_8867_NAME_TRAIN                                             :{BLACK}Renomear comboio
-STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Acidente Ferroviário!{}{COMMA16} mortos numa explosão após a colisão
+STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Acidente Ferroviário!{}{COMMA} mortos numa explosão após a colisão
 STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}Não é possível inverter a direcção do comboio...
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Renomear tipo de veículo ferroviário
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Não é possível renomear tipo de veículo ferroviário...
@@ -2526,7 +2526,7 @@
 
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Veículo de estrada no caminho
-STR_9001_ROAD_VEHICLES                                          :{WHITE}{STRING} - {COMMA16} Veículos de Estrada
+STR_9001_ROAD_VEHICLES                                          :{WHITE}{STRING} - {COMMA} Veículos de Estrada
 STR_9002                                                        :{WHITE}{STRING}
 STR_9003_ROAD_VEHICLE_DEPOT                                     :{WHITE}{TOWN} Depósito de Veículos de Estrada
 STR_9004_NEW_VEHICLES                                           :{BLACK}Novos Veículos
@@ -2540,13 +2540,13 @@
 STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Idade: {LTBLUE}{STRING}{BLACK}   Custo de circulação: {LTBLUE}{CURRENCY}/ano
 STR_900E_MAX_SPEED                                              :{BLACK}Velocidade Máx.: {LTBLUE}{VELOCITY}
 STR_900F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Lucros deste ano: {LTBLUE}{CURRENCY}  (último ano: {CURRENCY})
-STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Fiabilidade: {LTBLUE}{COMMA8}%  {BLACK}Avarias desde a última manutenção: {LTBLUE}{COMMA16}
+STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Fiabilidade: {LTBLUE}{COMMA}%  {BLACK}Avarias desde a última manutenção: {LTBLUE}{COMMA}
 STR_9011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Construído: {LTBLUE}{NUMU16}{BLACK} Valor: {LTBLUE}{CURRENCY}
 STR_9012_CAPACITY                                               :{BLACK}Capacidade: {LTBLUE}{STRING}
 STR_9013_MUST_BE_STOPPED_INSIDE                                 :{WHITE}...deve estar parado num depósito de veículos de estrada
 STR_9014_CAN_T_SELL_ROAD_VEHICLE                                :{WHITE}Não é possível vender veículo de estrada...
 STR_9015_CAN_T_STOP_START_ROAD_VEHICLE                          :{WHITE}Não é possível iniciar/parar veículo de estrada...
-STR_9016_ROAD_VEHICLE_IS_WAITING                                :{WHITE}Veículo de Estrada {COMMA16} está a aguardar no depósito
+STR_9016_ROAD_VEHICLE_IS_WAITING                                :{WHITE}Veículo de Estrada {COMMA} está a aguardar no depósito
 STR_HEADING_FOR_ROAD_DEPOT                                      :{LTBLUE}Dirige-se ao depósito de {TOWN}
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{LTBLUE}Dirige-se ao depósito de {TOWN}, {VELOCITY}
 STR_9018_CAN_T_SEND_VEHICLE_TO_DEPOT                            :{WHITE}Não é possível mandar o veículo para o depósito...
@@ -2575,7 +2575,7 @@
 STR_902F_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Cidadãos celebram . . .{}Primeiro autocarro chega a {STATION}!
 STR_9030_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Cidadãos celebram . . .{}Primeiro camião chega a {STATION}!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Acidente de Veículo de Estrada!{}Condutor morre na explosão após a colisão com um comboio
-STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Acidente de Veículo de Estrada!{}{COMMA16} morrem na explosão após a colisão com um comboio
+STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Acidente de Veículo de Estrada!{}{COMMA} morrem na explosão após a colisão com um comboio
 STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}Não é possível fazer o veículo dar a volta...
 STR_9034_RENAME                                                 :{BLACK}Renomear
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Renomear tipo de veículo de estrada
@@ -2590,7 +2590,7 @@
 STR_9802_CAN_T_BUILD_DOCK_HERE                                  :{WHITE}Não é possível construir doca aqui...
 STR_9803_SHIP_DEPOT                                             :{WHITE}{TOWN} Depósito Naval
 STR_9804_NEW_SHIPS                                              :{BLACK}Novos Barcos
-STR_9805_SHIPS                                                  :{WHITE}{STRING} - {COMMA16} Barcos
+STR_9805_SHIPS                                                  :{WHITE}{STRING} - {COMMA} Barcos
 STR_9806_CAN_T_BUILD_SHIPS                                      :{WHITE}Não é possível construir barcos...
 STR_9807_MUST_BUILD_SHIP_DEPOT_FIRST                            :{WHITE}É necessário construir depósito naval primeiro
 STR_9808_NEW_SHIPS                                              :{WHITE}Novos Barcos
@@ -2605,7 +2605,7 @@
 STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Idade: {LTBLUE}{STRING}{BLACK}   Custo de circulação: {LTBLUE}{CURRENCY}/ano
 STR_9813_MAX_SPEED                                              :{BLACK}Velocidade Máx.: {LTBLUE}{VELOCITY}
 STR_9814_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Lucros deste ano: {LTBLUE}{CURRENCY}  (último ano: {CURRENCY})
-STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Fiabilidade: {LTBLUE}{COMMA8}%  {BLACK}Avarias desde a última manutenção: {LTBLUE}{COMMA16}
+STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Fiabilidade: {LTBLUE}{COMMA}%  {BLACK}Avarias desde a última manutenção: {LTBLUE}{COMMA}
 STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Construído: {LTBLUE}{NUMU16}{BLACK} Valor: {LTBLUE}{CURRENCY}
 STR_9817_CAPACITY                                               :{BLACK}Capacidade: {LTBLUE}{STRING}
 STR_9818_CAN_T_STOP_START_SHIP                                  :{WHITE}Não é possível iniciar/parar barco...
@@ -2613,7 +2613,7 @@
 STR_981A_UNABLE_TO_FIND_LOCAL_DEPOT                             :{WHITE}Não é possível encontrar depósito local
 STR_HEADING_FOR_SHIP_DEPOT                                      :{LTBLUE}Dirige-se ao depósito de {TOWN}
 STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{LTBLUE}Dirige-se ao depósito {TOWN}, {VELOCITY}
-STR_981C_SHIP_IS_WAITING_IN_DEPOT                               :{WHITE}Barco {COMMA16} está a aguardar no depósito
+STR_981C_SHIP_IS_WAITING_IN_DEPOT                               :{WHITE}Barco {COMMA} está a aguardar no depósito
 STR_981D_BUILD_SHIP_DOCK                                        :{BLACK}Construir doca naval
 STR_981E_BUILD_SHIP_DEPOT_FOR_BUILDING                          :{BLACK}Construir depósito (para criação e manutenção de barcos)
 STR_981F_SHIPS_CLICK_ON_SHIP_FOR                                :{BLACK}Barcos - clique num barco para informações
@@ -2664,19 +2664,19 @@
 STR_A005_NEW_AIRCRAFT                                           :{WHITE}Nova Aeronave
 STR_A006_BUILD_AIRCRAFT                                         :{BLACK}Construir Aeronave
 STR_A008_CAN_T_BUILD_AIRCRAFT                                   :{WHITE}Não é possível construir aeronave...
-STR_A009_AIRCRAFT                                               :{WHITE}{STRING} - {COMMA16} Aeronaves
+STR_A009_AIRCRAFT                                               :{WHITE}{STRING} - {COMMA} Aeronaves
 STR_A00A                                                        :{WHITE}{STRING}
 STR_A00B_ORDERS                                                 :{WHITE}{STRING} (Ordens)
 STR_A00C_DETAILS                                                :{WHITE}{STRING} (Detalhes)
 STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Idade: {LTBLUE}{STRING}{BLACK}   Custo de circulação: {LTBLUE}{CURRENCY}/ano
 STR_A00E_MAX_SPEED                                              :{BLACK}Velocidade Máx.: {LTBLUE}{VELOCITY}
 STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Lucros deste ano: {LTBLUE}{CURRENCY}  (último ano: {CURRENCY})
-STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Fiabilidade: {LTBLUE}{COMMA8}%  {BLACK}Avarias desde a última manutenção: {LTBLUE}{COMMA16}
+STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Fiabilidade: {LTBLUE}{COMMA}%  {BLACK}Avarias desde a última manutenção: {LTBLUE}{COMMA}
 STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Construído: {LTBLUE}{NUMU16}{BLACK} Valor: {LTBLUE}{CURRENCY}
 STR_A012_CAN_T_SEND_AIRCRAFT_TO                                 :{WHITE}Não é possível mandar aeronave para o hangar...
 STR_HEADING_FOR_HANGAR                                          :{LTBLUE}Dirige-se ao hangar de {STATION}
 STR_HEADING_FOR_HANGAR_VEL                                      :{LTBLUE}Dirige-se ao hangar de {STATION}, {VELOCITY}
-STR_A014_AIRCRAFT_IS_WAITING_IN                                 :{WHITE}Aeronave {COMMA16} está a aguardar no hangar
+STR_A014_AIRCRAFT_IS_WAITING_IN                                 :{WHITE}Aeronave {COMMA} está a aguardar no hangar
 STR_A015_AIRCRAFT_IN_THE_WAY                                    :{WHITE}Aeronave no caminho
 STR_A016_CAN_T_STOP_START_AIRCRAFT                              :{WHITE}Não é possível iniciar/parar aeronave...
 STR_A017_AIRCRAFT_IS_IN_FLIGHT                                  :{WHITE}Aeronave está em voo
@@ -2702,14 +2702,14 @@
 STR_A02B_SHOW_AIRCRAFT_DETAILS                                  :{BLACK}Mostrar detalhes da aeronave
 STR_A02C_NEW_AIRCRAFT_NOW_AVAILABLE                             :{BLACK}{BIGFONT}Nova aeronave disponível!
 STR_A02D                                                        :{BLACK}{BIGFONT}{STRING}
-STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Custo: {CURRENCY} Velocidade Máx.: {VELOCITY}{}Capacidade: {COMMA16} passageiros, {COMMA16} sacos de correio{}Custo de circulação: {CURRENCY}/ano
+STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Custo: {CURRENCY} Velocidade Máx.: {VELOCITY}{}Capacidade: {COMMA} passageiros, {COMMA} sacos de correio{}Custo de circulação: {CURRENCY}/ano
 
 STR_A030_NAME_AIRCRAFT                                          :{WHITE}Renomear aeronave
 STR_A031_CAN_T_NAME_AIRCRAFT                                    :{WHITE}Não é possível renomear aeronave...
 STR_A032_NAME_AIRCRAFT                                          :{BLACK}Renomear aeronave
 STR_A033_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Cidadãos celebram . . .{}Primeira aeronave chega a {STATION}!
-STR_A034_PLANE_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Acidente de Avião!{}{COMMA16} morrem na explosão em {STATION}
-STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Desastre de Avião!{}Avião ficou sem combustivél, {COMMA16} morreram em incêndiol!
+STR_A034_PLANE_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Acidente de Avião!{}{COMMA} morrem na explosão em {STATION}
+STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Desastre de Avião!{}Avião ficou sem combustivél, {COMMA} morreram em incêndiol!
 STR_A035_DESTINATIONS                                           :{TINYFONT}{BLACK}Destinos:
 STR_A036                                                        :{TINYFONT}{BLACK}{STATION}
 STR_A037_RENAME                                                 :{BLACK}Renomear
@@ -2735,7 +2735,7 @@
 STR_B003_FACTORY_DESTROYED_IN_SUSPICIOUS                        :{BLACK}{BIGFONT}Fábrica destruída em circunstâncias suspeitas em {TOWN}!
 STR_B004_UFO_LANDS_NEAR                                         :{BLACK}{BIGFONT}OVNI pousa em {TOWN}!
 STR_B005_COAL_MINE_SUBSIDENCE_LEAVES                            :{BLACK}{BIGFONT}Afundamento de mina de carvão deixa um rasto de destruição em {TOWN}!
-STR_B006_FLOOD_VEHICLE_DESTROYED                                :{BLACK}{BIGFONT}Inundações!{}Pelo menos {COMMA16} perdidos ou mortos após terríveis inundações!
+STR_B006_FLOOD_VEHICLE_DESTROYED                                :{BLACK}{BIGFONT}Inundações!{}Pelo menos {COMMA} perdidos ou mortos após terríveis inundações!
 
 STR_BRIBE_FAILED                                                :{WHITE}A sua tentativa de suborno foi
 STR_BRIBE_FAILED_2                                              :{WHITE}descoberta por um investigador regional
@@ -2745,7 +2745,7 @@
 STR_PERFORMANCE_DETAIL                                          :{WHITE}Detalhes de rendimentos
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Detalhes
 STR_PERFORMANCE_DETAIL_AMOUNT_CURRENCY                          :{BLACK}({CURRCOMPACT}/{CURRCOMPACT})
-STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA32}/{COMMA32})
+STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA}/{COMMA})
 STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{INT32}%
 SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{INT32}
 ############ Those following lines need to be in this order!!
@@ -2780,7 +2780,7 @@
 STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID:
 
 STR_CURRENCY_WINDOW                                             :{WHITE}Moeda Modificada
-STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Taxa de troca: {ORANGE}{CURRENCY} = {POUNDSIGN} {COMMA16}
+STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Taxa de troca: {ORANGE}{CURRENCY} = {POUNDSIGN} {COMMA}
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Separador:
 STR_CURRENCY_PREFIX                                             :{LTBLUE}Prefixo:
 STR_CURRENCY_SUFFIX                                             :{LTBLUE}Sufixo:
@@ -2794,10 +2794,10 @@
 STR_PLANE                                                       :{BLACK}{PLANE}
 STR_SHIP                                                        :{BLACK}{SHIP}
 
-STR_SCHEDULED_TRAINS                                            :{WHITE}{STATION} - {COMMA16} Comboios
-STR_SCHEDULED_ROAD_VEHICLES                                     :{WHITE}{STATION} - {COMMA16} Veiculos de Estrada
-STR_SCHEDULED_AIRCRAFT                                          :{WHITE}{STATION} - {COMMA16} Aviões
-STR_SCHEDULED_SHIPS                                             :{WHITE}{STATION} - {COMMA16} Barcos
+STR_SCHEDULED_TRAINS                                            :{WHITE}{STATION} - {COMMA} Comboios
+STR_SCHEDULED_ROAD_VEHICLES                                     :{WHITE}{STATION} - {COMMA} Veiculos de Estrada
+STR_SCHEDULED_AIRCRAFT                                          :{WHITE}{STATION} - {COMMA} Aviões
+STR_SCHEDULED_SHIPS                                             :{WHITE}{STATION} - {COMMA} Barcos
 
 STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Mostrar todos os comboios que têm esta estação nas ordens de serviço
 STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Mostrar todos os veiculos de estrada que têm esta estação nas ordens de serviço
@@ -2819,7 +2819,7 @@
 STR_REPLACE_HELP                                                :{BLACK}Permite a substiuição de um tipo de motor por outro, quando comboios do tipo original entram num depósito
 
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
-STR_SIGN_LIST_CAPTION                                           :{WHITE}Lista de sinais - {COMMA16} Sinais
+STR_SIGN_LIST_CAPTION                                           :{WHITE}Lista de sinais - {COMMA} Sinais
 
 ############ Lists rail types
 
@@ -2829,16 +2829,16 @@
 
 ############ End of list of rail types
 
-STR_TINY_BLACK                                                  :{BLACK}{TINYFONT}{COMMA16}
+STR_TINY_BLACK                                                  :{BLACK}{TINYFONT}{COMMA}
 
-STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Custo: {GOLD}{CURRENCY}{BLACK} Peso: {GOLD}{COMMA16}t
-STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Velocidade: {GOLD}{VELOCITY}{BLACK}   Potência: {GOLD}{COMMA32}cv
+STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Custo: {GOLD}{CURRENCY}{BLACK} Peso: {GOLD}{COMMA}t
+STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Velocidade: {GOLD}{VELOCITY}{BLACK}   Potência: {GOLD}{COMMA}cv
 STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}Custo de manutenção: {GOLD}{CURRENCY}/ano
 STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Capacidade: {GOLD}{STRING} {STRING}
-STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Concebido: {GOLD}{NUMU16}{BLACK} Vida útil: {GOLD}{COMMA16} anos
-STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Fiabilidade máxima: {GOLD}{COMMA8}%
+STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Concebido: {GOLD}{NUMU16}{BLACK} Vida útil: {GOLD}{COMMA} anos
+STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Fiabilidade máxima: {GOLD}{COMMA}%
 STR_PURCHASE_INFO_COST                                          :{BLACK}Custo: {GOLD}{CURRENCY}
-STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Peso: {GOLD}{COMMA16}t  ({COMMA16}t)
+STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Peso: {GOLD}{COMMA}t  ({COMMA}t)
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Custo: {GOLD}{CURRENCY}{BLACK} Velocidade: {GOLD}{VELOCITY}
-STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Capacidade: {GOLD}{COMMA16} passageiros, {COMMA16} sacos de correio
-STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Vagões Motorizados: {GOLD}+{COMMA16}cv{BLACK} Peso: {GOLD}+{COMMA8}t
+STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Capacidade: {GOLD}{COMMA} passageiros, {COMMA} sacos de correio
+STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Vagões Motorizados: {GOLD}+{COMMA}cv{BLACK} Peso: {GOLD}+{COMMA}t
--- a/lang/romanian.txt	Thu Jul 14 09:53:52 2005 +0000
+++ b/lang/romanian.txt	Thu Jul 14 15:10:20 2005 +0000
@@ -82,69 +82,69 @@
 STR_004C_PLASTIC                                                :plastic
 STR_004D_FIZZY_DRINK                                            :suc
 STR_004E                                                        :
-STR_004F_PASSENGER                                              :{COMMA16} cãlãtor
-STR_0050_TON_OF_COAL                                            :{COMMA16} tonã de cãrbune
-STR_0051_BAG_OF_MAIL                                            :{COMMA16} sac cu colete postale
+STR_004F_PASSENGER                                              :{COMMA} cãlãtor
+STR_0050_TON_OF_COAL                                            :{COMMA} tonã de cãrbune
+STR_0051_BAG_OF_MAIL                                            :{COMMA} sac cu colete postale
 STR_0052_OF_OIL                                                 :{VOLUME} de petrol
-STR_0053_ITEM_OF_LIVESTOCK                                      :{COMMA16} animal
-STR_0054_CRATE_OF_GOODS                                         :{COMMA16} pachet de bunuri
-STR_0055_TON_OF_GRAIN                                           :{COMMA16} tonã de cereale
-STR_0056_TON_OF_WOOD                                            :{COMMA16} tonã de lemne
-STR_0057_TON_OF_IRON_ORE                                        :{COMMA16} tonã de minereu de fier
-STR_0058_TON_OF_STEEL                                           :{COMMA16} tonã de otel
-STR_0059_BAG_OF_VALUABLES                                       :{COMMA16} cutie de valori
-STR_005A_TON_OF_COPPER_ORE                                      :{COMMA16} tonã de minereu de cupru
-STR_005B_TON_OF_MAIZE                                           :{COMMA16} tonã de porumb
-STR_005C_TON_OF_FRUIT                                           :{COMMA16} tonã de fructe
-STR_005D_BAG_OF_DIAMONDS                                        :{COMMA16} sac cu diamante
-STR_005E_TON_OF_FOOD                                            :{COMMA16} tonã de alimente
-STR_005F_TON_OF_PAPER                                           :{COMMA16} tonã de hârtie
-STR_0060_BAG_OF_GOLD                                            :{COMMA16} sac cu aur
+STR_0053_ITEM_OF_LIVESTOCK                                      :{COMMA} animal
+STR_0054_CRATE_OF_GOODS                                         :{COMMA} pachet de bunuri
+STR_0055_TON_OF_GRAIN                                           :{COMMA} tonã de cereale
+STR_0056_TON_OF_WOOD                                            :{COMMA} tonã de lemne
+STR_0057_TON_OF_IRON_ORE                                        :{COMMA} tonã de minereu de fier
+STR_0058_TON_OF_STEEL                                           :{COMMA} tonã de otel
+STR_0059_BAG_OF_VALUABLES                                       :{COMMA} cutie de valori
+STR_005A_TON_OF_COPPER_ORE                                      :{COMMA} tonã de minereu de cupru
+STR_005B_TON_OF_MAIZE                                           :{COMMA} tonã de porumb
+STR_005C_TON_OF_FRUIT                                           :{COMMA} tonã de fructe
+STR_005D_BAG_OF_DIAMONDS                                        :{COMMA} sac cu diamante
+STR_005E_TON_OF_FOOD                                            :{COMMA} tonã de alimente
+STR_005F_TON_OF_PAPER                                           :{COMMA} tonã de hârtie
+STR_0060_BAG_OF_GOLD                                            :{COMMA} sac cu aur
 STR_0061_OF_WATER                                               :{VOLUME} de apã
-STR_0062_TON_OF_WHEAT                                           :{COMMA16} tonã de grâu
+STR_0062_TON_OF_WHEAT                                           :{COMMA} tonã de grâu
 STR_0063_OF_RUBBER                                              :{VOLUME} de cauciuc
-STR_0064_TON_OF_SUGAR                                           :{COMMA16} tonã de zahãr
-STR_0065_TOY                                                    :{COMMA16} sac cu jucãrii
-STR_0066_BAG_OF_CANDY                                           :{COMMA16} sac cu bomboane
+STR_0064_TON_OF_SUGAR                                           :{COMMA} tonã de zahãr
+STR_0065_TOY                                                    :{COMMA} sac cu jucãrii
+STR_0066_BAG_OF_CANDY                                           :{COMMA} sac cu bomboane
 STR_0067_OF_COLA                                                :{VOLUME} de cola
-STR_0068_TON_OF_COTTON_CANDY                                    :{COMMA16} tonã de vatã de zahãr
-STR_0069_BUBBLE                                                 :{COMMA16} balonas
-STR_006A_TON_OF_TOFFEE                                          :{COMMA16} tonã de caramel
-STR_006B_BATTERY                                                :{COMMA16} baterie
+STR_0068_TON_OF_COTTON_CANDY                                    :{COMMA} tonã de vatã de zahãr
+STR_0069_BUBBLE                                                 :{COMMA} balonas
+STR_006A_TON_OF_TOFFEE                                          :{COMMA} tonã de caramel
+STR_006B_BATTERY                                                :{COMMA} baterie
 STR_006C_OF_PLASTIC                                             :{VOLUME} de plastic
-STR_006D_FIZZY_DRINK                                            :{COMMA16} bidon cu suc
+STR_006D_FIZZY_DRINK                                            :{COMMA} bidon cu suc
 STR_006E                                                        :
-STR_006F_PASSENGERS                                             :{COMMA16} cãlãtori
-STR_0070_TONS_OF_COAL                                           :{COMMA16} tone de cãrbune
-STR_0071_BAGS_OF_MAIL                                           :{COMMA16} saci cu colete postale
+STR_006F_PASSENGERS                                             :{COMMA} cãlãtori
+STR_0070_TONS_OF_COAL                                           :{COMMA} tone de cãrbune
+STR_0071_BAGS_OF_MAIL                                           :{COMMA} saci cu colete postale
 STR_0072_OF_OIL                                                 :{VOLUME} de petrol
-STR_0073_ITEMS_OF_LIVESTOCK                                     :{COMMA16} animale
-STR_0074_CRATES_OF_GOODS                                        :{COMMA16} pachete de bunuri
-STR_0075_TONS_OF_GRAIN                                          :{COMMA16} tone de cereale
-STR_0076_TONS_OF_WOOD                                           :{COMMA16} tone de lemne
-STR_0077_TONS_OF_IRON_ORE                                       :{COMMA16} tone de minereu de fier
-STR_0078_TONS_OF_STEEL                                          :{COMMA16} tone de otel
-STR_0079_BAGS_OF_VALUABLES                                      :{COMMA16} cutii de valori
-STR_007A_TONS_OF_COPPER_ORE                                     :{COMMA16} tone de minereu de cupru
-STR_007B_TONS_OF_MAIZE                                          :{COMMA16} tone de porumb
-STR_007C_TONS_OF_FRUIT                                          :{COMMA16} tone de fructe
-STR_007D_BAGS_OF_DIAMONDS                                       :{COMMA16} saci cu diamante
-STR_007E_TONS_OF_FOOD                                           :{COMMA16} tone de alimente
-STR_007F_TONS_OF_PAPER                                          :{COMMA16} tone de hârtie
-STR_0080_BAGS_OF_GOLD                                           :{COMMA16} saci cu aur
+STR_0073_ITEMS_OF_LIVESTOCK                                     :{COMMA} animale
+STR_0074_CRATES_OF_GOODS                                        :{COMMA} pachete de bunuri
+STR_0075_TONS_OF_GRAIN                                          :{COMMA} tone de cereale
+STR_0076_TONS_OF_WOOD                                           :{COMMA} tone de lemne
+STR_0077_TONS_OF_IRON_ORE                                       :{COMMA} tone de minereu de fier
+STR_0078_TONS_OF_STEEL                                          :{COMMA} tone de otel
+STR_0079_BAGS_OF_VALUABLES                                      :{COMMA} cutii de valori
+STR_007A_TONS_OF_COPPER_ORE                                     :{COMMA} tone de minereu de cupru
+STR_007B_TONS_OF_MAIZE                                          :{COMMA} tone de porumb
+STR_007C_TONS_OF_FRUIT                                          :{COMMA} tone de fructe
+STR_007D_BAGS_OF_DIAMONDS                                       :{COMMA} saci cu diamante
+STR_007E_TONS_OF_FOOD                                           :{COMMA} tone de alimente
+STR_007F_TONS_OF_PAPER                                          :{COMMA} tone de hârtie
+STR_0080_BAGS_OF_GOLD                                           :{COMMA} saci cu aur
 STR_0081_OF_WATER                                               :{VOLUME} de apã
-STR_0082_TONS_OF_WHEAT                                          :{COMMA16} tone de grâu
+STR_0082_TONS_OF_WHEAT                                          :{COMMA} tone de grâu
 STR_0083_OF_RUBBER                                              :{VOLUME} de cauciuc
-STR_0084_TONS_OF_SUGAR                                          :{COMMA16} tone de zahãr
-STR_0085_TOYS                                                   :{COMMA16} saci cu jucãrii
-STR_0086_BAGS_OF_CANDY                                          :{COMMA16} saci cu bomboane
+STR_0084_TONS_OF_SUGAR                                          :{COMMA} tone de zahãr
+STR_0085_TOYS                                                   :{COMMA} saci cu jucãrii
+STR_0086_BAGS_OF_CANDY                                          :{COMMA} saci cu bomboane
 STR_0087_OF_COLA                                                :{VOLUME} de cola
-STR_0088_TONS_OF_COTTON_CANDY                                   :{COMMA16} tone de vatã de zahãr
-STR_0089_BUBBLES                                                :{COMMA16} balonase
-STR_008A_TONS_OF_TOFFEE                                         :{COMMA16} tone de caramel
-STR_008B_BATTERIES                                              :{COMMA16} baterii
+STR_0088_TONS_OF_COTTON_CANDY                                   :{COMMA} tone de vatã de zahãr
+STR_0089_BUBBLES                                                :{COMMA} balonase
+STR_008A_TONS_OF_TOFFEE                                         :{COMMA} tone de caramel
+STR_008B_BATTERIES                                              :{COMMA} baterii
 STR_008C_OF_PLASTIC                                             :{VOLUME} de plastic
-STR_008D_FIZZY_DRINKS                                           :{COMMA16} bidoane cu suc
+STR_008D_FIZZY_DRINKS                                           :{COMMA} bidoane cu suc
 STR_008E                                                        :
 STR_008F_PS                                                     :{TINYFONT}CL
 STR_0090_CL                                                     :{TINYFONT}CB
@@ -219,8 +219,8 @@
 STR_00DF_GREY                                                   :Gri
 STR_00E0_WHITE                                                  :Alb
 STR_00E1_TOO_MANY_VEHICLES_IN_GAME                              :{WHITE}Prea multe vehicule în joc
-STR_00E2                                                        :{BLACK}{COMMA16}
-STR_00E3                                                        :{RED}{COMMA16}
+STR_00E2                                                        :{BLACK}{COMMA}
+STR_00E3                                                        :{RED}{COMMA}
 STR_00E4_LOCATION                                               :{BLACK}Locatie
 STR_00E5_CONTOURS                                               :Relief
 STR_00E6_VEHICLES                                               :Vehicule
@@ -441,18 +441,18 @@
 STR_0198_PROFIT_THIS_YEAR_LAST_YEAR                             :{TINYFONT}{BLACK}Profit anul acesta: {CURRENCY} (anul trecut: {CURRENCY})
 
 ############ range for service numbers starts
-STR_0199_YEAR                                                   :{COMMA16} an ({COMMA16})
-STR_019A_YEARS                                                  :{COMMA16} ani ({COMMA16})
-STR_019B_YEARS                                                  :{RED}{COMMA16} ani ({COMMA16})
+STR_0199_YEAR                                                   :{COMMA} an ({COMMA})
+STR_019A_YEARS                                                  :{COMMA} ani ({COMMA})
+STR_019B_YEARS                                                  :{RED}{COMMA} ani ({COMMA})
 ############ range for service numbers ends
 
 STR_019C_ROAD_VEHICLE                                           :Autovehicolul
 STR_019D_AIRCRAFT                                               :Aeronava
 STR_019E_SHIP                                                   :Nava
 STR_019F_TRAIN                                                  :Trenul
-STR_01A0_IS_GETTING_OLD                                         :{WHITE}{STRING} {COMMA16} este vechi
-STR_01A1_IS_GETTING_VERY_OLD                                    :{WHITE}{STRING} {COMMA16} este foarte vechi
-STR_01A2_IS_GETTING_VERY_OLD_AND                                :{WHITE}{STRING} {COMMA16} este foarte vechi si trebuie înlocuit urgent
+STR_01A0_IS_GETTING_OLD                                         :{WHITE}{STRING} {COMMA} este vechi
+STR_01A1_IS_GETTING_VERY_OLD                                    :{WHITE}{STRING} {COMMA} este foarte vechi
+STR_01A2_IS_GETTING_VERY_OLD_AND                                :{WHITE}{STRING} {COMMA} este foarte vechi si trebuie înlocuit urgent
 STR_01A3_LAND_AREA_INFORMATION                                  :{WHITE}Informatii teren
 STR_01A4_COST_TO_CLEAR_N_A                                      :{BLACK}Costul demolãrii: {LTBLUE}N/A
 STR_01A5_COST_TO_CLEAR                                          :{BLACK}Costul demolãrii: {LTBLUE}{CURRENCY}
@@ -497,7 +497,7 @@
 STR_01CA_31ST                                                   :31
 ############ range for days	ends
 
-STR_01CB                                                        :{TINYFONT}{COMMA16}
+STR_01CB                                                        :{TINYFONT}{COMMA}
 STR_01CC_TOGGLE_LARGE_SMALL_MAP                                 :{BLACK}Comutator dimensiune harta (micã/mijlocie/mare)
 STR_01CD_SELECT_TUTORIAL_DEMONSTRATION                          :{WHITE}Alege vizionarea unui tutorial (demonstratie)
 
@@ -509,7 +509,7 @@
 STR_CARGO_ACCEPTED_5                                            :{BLACK}Încãrcãturi acceptate: {LTBLUE}{STRING}, {STRING}, {STRING}, {STRING}, {STRING}
 ############ range for cargo acecpted ends
 
-STR_01D1_8                                                      :({COMMA8}/8 {STRING})
+STR_01D1_8                                                      :({COMMA}/8 {STRING})
 STR_01D2_JAZZ_JUKEBOX                                           :{WHITE}Tonomatul cu jazz
 STR_01D3_SOUND_MUSIC                                            :Sunet/muzicã
 STR_01D4_SHOW_SOUND_MUSIC_WINDOW                                :{BLACK}Afiseazã fereastra pentru configurarea sunetului/muzicii
@@ -528,16 +528,16 @@
 STR_01E1_START_PLAYING_MUSIC                                    :{BLACK}Porneste muzica
 STR_01E2_DRAG_SLIDERS_TO_SET_MUSIC                              :{BLACK}Foloseste acest indicator pentru a regla volumul muzicii si al efectelor sonore
 STR_01E3                                                        :{DKGREEN}{TINYFONT}--
-STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA8}
-STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA8}
+STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA}
+STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA}
 STR_01E6                                                        :{DKGREEN}{TINYFONT}------
 STR_01E7                                                        :{DKGREEN}{TINYFONT}"{STRING}"
 STR_01E8_TRACK_XTITLE                                           :{BLACK}{TINYFONT}Piesa nr: {SETX 88}Titlul
 STR_01E9_SHUFFLE                                                :{TINYFONT}Amestecã
 STR_01EA_PROGRAM                                                :{TINYFONT}{BLACK}Program
 STR_01EB_MUSIC_PROGRAM_SELECTION                                :{WHITE}Programare piese muzicale
-STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA16} "{STRING}"
-STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA16}   "{STRING}"
+STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} "{STRING}"
+STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA}   "{STRING}"
 STR_01EE_TRACK_INDEX                                            :{TINYFONT}{BLACK}Lista melodiilor
 STR_01EF_PROGRAM                                                :{TINYFONT}{BLACK}Program - '{STRING}'
 STR_01F0_CLEAR                                                  :{TINYFONT}{BLACK}Sterge
@@ -577,7 +577,7 @@
 STR_0210_TOO_FAR_FROM_PREVIOUS_DESTINATIO                       :{WHITE}...prea departe de destinatia precedentã
 STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Primele companii care au atins {NUMU16}{}(Nivelul {STRING})
 STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Clasamentul companiilor in {NUMU16}
-STR_0212                                                        :{BIGFONT}{COMMA16}.
+STR_0212                                                        :{BIGFONT}{COMMA}.
 STR_0213_BUSINESSMAN                                            :Om de afaceri
 STR_0214_ENTREPRENEUR                                           :Întreprinzãtor
 STR_0215_INDUSTRIALIST                                          :Industrias
@@ -586,12 +586,12 @@
 STR_0218_MOGUL                                                  :Mogul
 STR_0219_TYCOON_OF_THE_CENTURY                                  :Magnatul Secolului
 STR_HIGHSCORE_NAME                                              :{BIGFONT}{STRING}, {STRING}
-STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA16})
+STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA})
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{STRING} a dobandit titlul de '{STRING}'!
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{STRING} al {STRING} dobandeste titlul de '{STRING}'!
 STR_021D                                                        :{BLACK}
 STR_021E                                                        :{WHITE}
-STR_021F                                                        :{BLUE}{COMMA16}
+STR_021F                                                        :{BLUE}{COMMA}
 STR_0220_CREATE_SCENARIO                                        :{BLACK}Creeazã scenariu
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Editor scenarii
@@ -788,8 +788,8 @@
 STR_EXTRA_VIEW_PORT                                             :Extra ecran
 STR_SIGN_LIST                                                   :Lista de semne
 STR_02DF_TOWN_DIRECTORY                                         :Lista oraselor
-STR_TOWN_POPULATION                                             :{BLACK}Populatia totala: {COMMA32}
-STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Ecran{COMMA16}
+STR_TOWN_POPULATION                                             :{BLACK}Populatia totala: {COMMA}
+STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Ecran{COMMA}
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN                                :{BLACK}Copiaza pe ecranul principal
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT                             :{BLACK}Copiaza locatia ecranului principal in acest ecran
 STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW                                :{BLACK}Importa din ecran
@@ -961,34 +961,34 @@
 STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Nu pot copia lista de comenzi...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Sfârsitul comenzilor comune - -
 
-STR_TRAIN_IS_LOST                                               :{WHITE}Trenul {COMMA16} s-a rãtãcit.
-STR_TRAIN_IS_UNPROFITABLE                                       :{WHITE}Profitul trenului {COMMA16} a fost anul trecut de {CURRENCY}
+STR_TRAIN_IS_LOST                                               :{WHITE}Trenul {COMMA} s-a rãtãcit.
+STR_TRAIN_IS_UNPROFITABLE                                       :{WHITE}Profitul trenului {COMMA} a fost anul trecut de {CURRENCY}
 STR_EURO_INTRODUCE                                              :{BLACK}{BIGFONT}Uniunea Monetarã Europeanã!{}{}Euro este introdus în tarã ca monedã unicã de folosintã în tranzactiile zilnice!
 
 # Start of order review system.
 # DON'T ADD OR REMOVE LINES HERE
-STR_TRAIN_HAS_TOO_FEW_ORDERS                                    :{WHITE}Trenul {COMMA16} are prea putine comenzi în listã
-STR_TRAIN_HAS_VOID_ORDER                                        :{WHITE}Trenul {COMMA16} nu are comenzi
-STR_TRAIN_HAS_DUPLICATE_ENTRY                                   :{WHITE}Trenul {COMMA16} are comenzi repetate
-STR_TRAIN_HAS_INVALID_ENTRY                                     :{WHITE}Trenul {COMMA16} are o statie inexistentã în comenzi
-STR_ROADVEHICLE_HAS_TOO_FEW_ORDERS                              :{WHITE}Autovehiculul {COMMA16} are prea putine comenzi în listã
-STR_ROADVEHICLE_HAS_VOID_ORDER                                  :{WHITE}Autovehiculul {COMMA16} nu are comenzi
-STR_ROADVEHICLE_HAS_DUPLICATE_ENTRY                             :{WHITE}Autovehiculul {COMMA16} are comenzi repetate
-STR_ROADVEHICLE_HAS_INVALID_ENTRY                               :{WHITE}Autovehiculul {COMMA16} are o statie inexistentã în comenzi
-STR_SHIP_HAS_TOO_FEW_ORDERS                                     :{WHITE}Nava {COMMA16} are prea putine comenzi în listã
-STR_SHIP_HAS_VOID_ORDER                                         :{WHITE}Nava {COMMA16} nu are comenzi
-STR_SHIP_HAS_DUPLICATE_ENTRY                                    :{WHITE}Nava {COMMA16} are comenzi repetate
-STR_SHIP_HAS_INVALID_ENTRY                                      :{WHITE}Nava {COMMA16} are o statie inexistentã în comenzi
-STR_AIRCRAFT_HAS_TOO_FEW_ORDERS                                 :{WHITE}Aeronava {COMMA16} are prea putine comenzi în listã
-STR_AIRCRAFT_HAS_VOID_ORDER                                     :{WHITE}Aeronava {COMMA16} nu are comenzi
-STR_AIRCRAFT_HAS_DUPLICATE_ENTRY                                :{WHITE}Aeronava {COMMA16} are comenzi repetate
-STR_AIRCRAFT_HAS_INVALID_ENTRY                                  :{WHITE}Aeronava {COMMA16} are o statie inexistentã în comenzi
+STR_TRAIN_HAS_TOO_FEW_ORDERS                                    :{WHITE}Trenul {COMMA} are prea putine comenzi în listã
+STR_TRAIN_HAS_VOID_ORDER                                        :{WHITE}Trenul {COMMA} nu are comenzi
+STR_TRAIN_HAS_DUPLICATE_ENTRY                                   :{WHITE}Trenul {COMMA} are comenzi repetate
+STR_TRAIN_HAS_INVALID_ENTRY                                     :{WHITE}Trenul {COMMA} are o statie inexistentã în comenzi
+STR_ROADVEHICLE_HAS_TOO_FEW_ORDERS                              :{WHITE}Autovehiculul {COMMA} are prea putine comenzi în listã
+STR_ROADVEHICLE_HAS_VOID_ORDER                                  :{WHITE}Autovehiculul {COMMA} nu are comenzi
+STR_ROADVEHICLE_HAS_DUPLICATE_ENTRY                             :{WHITE}Autovehiculul {COMMA} are comenzi repetate
+STR_ROADVEHICLE_HAS_INVALID_ENTRY                               :{WHITE}Autovehiculul {COMMA} are o statie inexistentã în comenzi
+STR_SHIP_HAS_TOO_FEW_ORDERS                                     :{WHITE}Nava {COMMA} are prea putine comenzi în listã
+STR_SHIP_HAS_VOID_ORDER                                         :{WHITE}Nava {COMMA} nu are comenzi
+STR_SHIP_HAS_DUPLICATE_ENTRY                                    :{WHITE}Nava {COMMA} are comenzi repetate
+STR_SHIP_HAS_INVALID_ENTRY                                      :{WHITE}Nava {COMMA} are o statie inexistentã în comenzi
+STR_AIRCRAFT_HAS_TOO_FEW_ORDERS                                 :{WHITE}Aeronava {COMMA} are prea putine comenzi în listã
+STR_AIRCRAFT_HAS_VOID_ORDER                                     :{WHITE}Aeronava {COMMA} nu are comenzi
+STR_AIRCRAFT_HAS_DUPLICATE_ENTRY                                :{WHITE}Aeronava {COMMA} are comenzi repetate
+STR_AIRCRAFT_HAS_INVALID_ENTRY                                  :{WHITE}Aeronava {COMMA} are o statie inexistentã în comenzi
 # end of order system
 
-STR_TRAIN_AUTORENEW_FAILED                                      :{WHITE}Înnoirea trenului {COMMA16} a esuat (fonduri limitate)
-STR_ROADVEHICLE_AUTORENEW_FAILED                                :{WHITE}Înnoirea autovehiculului {COMMA16} a esuat (fonduri limitate)
-STR_SHIP_AUTORENEW_FAILED                                       :{WHITE}Înnoirea navei {COMMA16} a esuat (fonduri limitate)
-STR_AIRCRAFT_AUTORENEW_FAILED                                   :{WHITE}Înnoirea aeronavei {COMMA16} a esuat (fonduri limitate)
+STR_TRAIN_AUTORENEW_FAILED                                      :{WHITE}Înnoirea trenului {COMMA} a esuat (fonduri limitate)
+STR_ROADVEHICLE_AUTORENEW_FAILED                                :{WHITE}Înnoirea autovehiculului {COMMA} a esuat (fonduri limitate)
+STR_SHIP_AUTORENEW_FAILED                                       :{WHITE}Înnoirea navei {COMMA} a esuat (fonduri limitate)
+STR_AIRCRAFT_AUTORENEW_FAILED                                   :{WHITE}Înnoirea aeronavei {COMMA} a esuat (fonduri limitate)
 
 STR_CONFIG_PATCHES                                              :{BLACK}Configurare patch
 STR_CONFIG_PATCHES_TIP                                          :{BLACK}Configureazã patch-urile OpenTTD
@@ -1104,7 +1104,7 @@
 STR_CHEATS_TIP                                                  :{BLACK}Checkbox-urile aratã un cheat folosit anterior
 STR_CHEATS_WARNING                                              :{BLACK}Atentie! Esti pe cale sã-ti trãdezi colegii de joc! Nu uita cã aceastã rusine va rãmâne înregistratã pentru totdeauna!
 STR_CHEAT_MONEY                                                 :{LTBLUE}Mãreste fondurile cu {CURRENCY64}
-STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Joacã în locul jucãtorului: {ORANGE}{COMMA16}
+STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Joacã în locul jucãtorului: {ORANGE}{COMMA}
 STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Buldozer magic (demoleazã industrii si lucruri amovibile): {ORANGE}{STRING}
 STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Tunelele se pot intersecta: {ORANGE}{STRING}
 STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Construieste în modul pauzã: {ORANGE}{STRING}
@@ -1120,7 +1120,7 @@
 STR_GO_NON_STOP_TO_WAYPOINT                                     :Mergi non-stop via {WAYPOINT}
 
 STR_WAYPOINTNAME_CITY                                           :Halta {TOWN}
-STR_WAYPOINTNAME_CITY_SERIAL                                    :Halta {TOWN} #{COMMA16}
+STR_WAYPOINTNAME_CITY_SERIAL                                    :Halta {TOWN} #{COMMA}
 STR_LANDINFO_WAYPOINT                                           :Haltã de miscare
 
 STR_WAYPOINT                                                    :{WHITE}Punct de tranzit
@@ -1203,8 +1203,8 @@
 STR_CONSTRUCT_SUGAR_MINE_TIP                                    :{BLACK}Construieste minã de zahãr
 
 STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Industrii
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}){YELLOW} ({COMMA16}% transportat)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}/{STRING}){YELLOW} ({COMMA16}%/{COMMA16}% transportat)
+STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}){YELLOW} ({COMMA}% transportat)
+STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}/{STRING}){YELLOW} ({COMMA}%/{COMMA}% transportat)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{TOWN} {STRING}
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...prea aproape de altã industrie
@@ -1244,15 +1244,15 @@
 STR_NETWORK_ADD_SERVER_TIP                                      :{BLACK}Adauga un server pe lista care va fi verificata pentru jocuri active
 STR_NETWORK_ENTER_IP                                            :{BLACK}Introdu IP-ul serverului
 
-STR_NETWORK_CLIENTS_ONLINE                                      :{BLACK}{COMMA16}/{COMMA16}
+STR_NETWORK_CLIENTS_ONLINE                                      :{BLACK}{COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Clienti
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Clienti online / Nr. max. clienti
 STR_NETWORK_GAME_INFO                                           :{SILVER}INFO JOC
 STR_ORANGE                                                      :{ORANGE}{STRING}
-STR_NETWORK_CLIENTS                                             :{SILVER}Clienti:  {WHITE}{COMMA8} / {COMMA8}
+STR_NETWORK_CLIENTS                                             :{SILVER}Clienti:  {WHITE}{COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}Limba:  {WHITE}{STRING}
 STR_NETWORK_TILESET                                             :{SILVER}Tileset:  {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Marimea hartii:  {WHITE}{COMMA16}x{COMMA16}
+STR_NETWORK_MAP_SIZE                                            :{SILVER}Marimea hartii:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Versiune server:  {WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Adresa serverului:  {WHITE}{STRING} : {NUMU16}
 STR_NETWORK_START_DATE                                          :{SILVER}Data de inceput:  {WHITE}{DATE_SHORT}
@@ -1517,21 +1517,21 @@
 
 ##id 0x2000
 STR_2000_TOWNS                                                  :{WHITE}Orase
-STR_TOWN_LABEL_POP                                              :{WHITE}{STRING} ({COMMA32})
+STR_TOWN_LABEL_POP                                              :{WHITE}{STRING} ({COMMA})
 STR_2001                                                        :{WHITE}{STRING}
 STR_2002                                                        :{TINYFONT}{BLACK}{STRING}
 STR_2003                                                        :{TINYFONT}{WHITE}{STRING}
 STR_2004_BUILDING_MUST_BE_DEMOLISHED                            :{WHITE}Mai întâi trebuie sã demolezi clãdirea
 STR_2005                                                        :{WHITE}{TOWN}
-STR_2006_POPULATION                                             :{BLACK}Populatia: {ORANGE}{COMMA32}{BLACK}  Locuinte: {ORANGE}{COMMA32}
+STR_2006_POPULATION                                             :{BLACK}Populatia: {ORANGE}{COMMA}{BLACK}  Locuinte: {ORANGE}{COMMA}
 STR_2007_RENAME_TOWN                                            :Redenumire
 STR_2008_CAN_T_RENAME_TOWN                                      :{WHITE}Nu pot redenumi orasul...
 STR_2009_LOCAL_AUTHORITY_REFUSES                                :{WHITE}Autoritãtile locale din {TOWN} refuzã sã permitã acest lucru
 STR_200A_TOWN_NAMES_CLICK_ON_NAME                               :{BLACK}Numele oraselor - clic pe un nume pentru a centra imaginea pe orasul respectiv
 STR_200B_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Mutã imaginea pe locatia orasului
 STR_200C_CHANGE_TOWN_NAME                                       :{BLACK}Schimbã numele orasului
-STR_200D_PASSENGERS_LAST_MONTH_MAX                              :{BLACK}Calatori luna trecuta: {ORANGE}{COMMA32}{BLACK}  max: {ORANGE}{COMMA32}
-STR_200E_MAIL_LAST_MONTH_MAX                                    :{BLACK}Colete postale luna trecuta: {ORANGE}{COMMA32}{BLACK}  max: {ORANGE}{COMMA32}
+STR_200D_PASSENGERS_LAST_MONTH_MAX                              :{BLACK}Calatori luna trecuta: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
+STR_200E_MAIL_LAST_MONTH_MAX                                    :{BLACK}Colete postale luna trecuta: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
 STR_200F_TALL_OFFICE_BLOCK                                      :Clãdire înaltã de birouri
 STR_2010_OFFICE_BLOCK                                           :Clãdire de birouri
 STR_2011_SMALL_BLOCK_OF_FLATS                                   :Clãdire micã de birouri
@@ -1605,7 +1605,7 @@
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Mituieste autoritãtile locale pentru a-ti îmbunãtãti ratingul, dar cu riscul de a fi prins si de a plãti amenzi serioase.{}  Cost: {CURRENCY}
 STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Haos pe strãzile din {TOWN}!{}{}Programul finantat de {STRING} pentru reconstructia strãzilor, aduce 6 luni de haos participantilor la trafic!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
-STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA32})
+STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA})
 STR_2058_UNDER_CONSTRUCTION                                     :{STRING} (în constructie)
 STR_2059_IGLOO                                                  :Iglu
 STR_205A_TEPEES                                                 :Corturi
@@ -1667,7 +1667,7 @@
 STR_303C_OUTSTANDING                                            :Fantastic
 ############ range for rating ends
 
-STR_303D                                                        :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA8}%)
+STR_303D                                                        :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_303E_NO_LONGER_ACCEPTS                                      :{WHITE}{STATION} nu mai acceptã {STRING}
 STR_303F_NO_LONGER_ACCEPTS_OR                                   :{WHITE}{STATION} nu mai acceptã {STRING} sau {STRING}
 STR_3040_NOW_ACCEPTS                                            :{WHITE}{STATION} acceptã acum {STRING}
@@ -1678,7 +1678,7 @@
 STR_3045_TOO_CLOSE_TO_ANOTHER_TRUCK                             :{WHITE}Prea aproape de altã platformã pentru camioane
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Mai intâi trebuie demolatã statia de autbuz
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Mai intâi trebuie demolatã platforma pentru camioane
-STR_3048_STATIONS                                               :{WHITE}{STRING} - {COMMA16} Statii
+STR_3048_STATIONS                                               :{WHITE}{STRING} - {COMMA} Statii
 STR_3049_0                                                      :{YELLOW}{STATION} {STRINL 0x30D1}
 STR_304A_NONE                                                   :{YELLOW}- Nici una -
 STR_304B_SITE_UNSUITABLE                                        :{WHITE}...locatie nepotrivitã
@@ -1735,7 +1735,7 @@
 STR_4002_SAVE                                                   :{BLACK}Salveazã
 STR_4003_DELETE                                                 :{BLACK}Sterge
 STR_4004                                                        :{STRING}, {DATE_LONG}
-STR_4005_BYTES_FREE                                             :{BLACK}{COMMA32} megabytes liberi
+STR_4005_BYTES_FREE                                             :{BLACK}{COMMA} megabytes liberi
 STR_4006_UNABLE_TO_READ_DRIVE                                   :{BLACK}Nu pot citi acest drive
 STR_4007_GAME_SAVE_FAILED                                       :{WHITE}Salvarea jocului esuatã
 STR_4008_UNABLE_TO_DELETE_FILE                                  :{WHITE}Stergerea jocului esuatã
@@ -1796,7 +1796,7 @@
 ############ range for requires	ends
 
 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Productia luna trecutã:
-STR_482B_TRANSPORTED                                            :{YELLOW}{STRING}{BLACK} ({COMMA16}% transportat)
+STR_482B_TRANSPORTED                                            :{YELLOW}{STRING}{BLACK} ({COMMA}% transportat)
 STR_482C_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Centreazã imaginea pe locatia industriei
 STR_482D_NEW_UNDER_CONSTRUCTION                                 :{BLACK}{BIGFONT}Un nou obiectiv industrial ({STRING}) se construieste lângã {TOWN}!
 STR_482E_NEW_BEING_PLANTED_NEAR                                 :{BLACK}{BIGFONT}O nouã {STRING} se planteazã lângã {TOWN}!
@@ -1813,8 +1813,8 @@
 STR_4839_PRODUCTION_DOWN_BY_50                                  :{BLACK}{BIGFONT}Productia obiectivului {TOWN} - {STRING} a scãzut la jumãtate!
 STR_483A_INSECT_INFESTATION_CAUSES                              :{BLACK}{BIGFONT}Pagube majore din cauza insectelor la {TOWN} - {STRING}!{}Productia a scãzut cu 50%!
 STR_483B_CAN_ONLY_BE_POSITIONED                                 :{WHITE}...se poate construi doar la marginea hãrtii
-STR_INDUSTRY_PROD_GOUP                                          :{BLACK}{BIGFONT}Productia de {STRING} de la {TOWN} - {STRING} a crescut cu {COMMA16}%!
-STR_INDUSTRY_PROD_GODOWN                                        :{BLACK}{BIGFONT}Productia de {STRING} de la {TOWN} - {STRING} a scãzut cu {COMMA16}%!
+STR_INDUSTRY_PROD_GOUP                                          :{BLACK}{BIGFONT}Productia de {STRING} de la {TOWN} - {STRING} a crescut cu {COMMA}%!
+STR_INDUSTRY_PROD_GODOWN                                        :{BLACK}{BIGFONT}Productia de {STRING} de la {TOWN} - {STRING} a scãzut cu {COMMA}%!
 
 ##id 0x5000
 STR_5000_TRAIN_IN_TUNNEL                                        :{WHITE}Tren în tunel
@@ -1877,10 +1877,10 @@
 ##id 0x6000
 STR_SV_EMPTY                                                    :
 STR_SV_UNNAMED                                                  :NoName{SKIP}
-STR_SV_TRAIN_NAME                                               :Trenul {COMMA16}
-STR_SV_ROADVEH_NAME                                             :Autovehiculul {COMMA16}
-STR_SV_SHIP_NAME                                                :Nava {COMMA16}
-STR_SV_AIRCRAFT_NAME                                            :Aeronava {COMMA16}
+STR_SV_TRAIN_NAME                                               :Trenul {COMMA}
+STR_SV_ROADVEH_NAME                                             :Autovehiculul {COMMA}
+STR_SV_SHIP_NAME                                                :Nava {COMMA}
+STR_SV_AIRCRAFT_NAME                                            :Aeronava {COMMA}
 
 STR_SV_STNAME                                                   :{STRING}
 STR_SV_STNAME_NORTH                                             :{STRING} Nord
@@ -1930,12 +1930,12 @@
 ############ range for difficulty levels ends
 
 ############ range for difficulty settings starts
-STR_6805_MAXIMUM_NO_COMPETITORS                                 :{LTBLUE}Numãrul maxim de companii concurente: {ORANGE}{COMMA16}
+STR_6805_MAXIMUM_NO_COMPETITORS                                 :{LTBLUE}Numãrul maxim de companii concurente: {ORANGE}{COMMA}
 STR_6806_COMPETITOR_START_TIME                                  :{LTBLUE}Când intrã concurentii pe piatã: {ORANGE}{STRING}
 STR_6807_NO_OF_TOWNS                                            :{LTBLUE}Numãrul de orase de pe hartã: {ORANGE}{STRING}
 STR_6808_NO_OF_INDUSTRIES                                       :{LTBLUE}Numãrul de obiective industriale: {ORANGE}{STRING}
 STR_6809_MAXIMUM_INITIAL_LOAN_000                               :{LTBLUE}Valoarea maximã a împrumutului initial: {ORANGE}{CURRENCY}
-STR_680A_INITIAL_INTEREST_RATE                                  :{LTBLUE}Rata initialã a dobânzii: {ORANGE}{COMMA16}%
+STR_680A_INITIAL_INTEREST_RATE                                  :{LTBLUE}Rata initialã a dobânzii: {ORANGE}{COMMA}%
 STR_680B_VEHICLE_RUNNING_COSTS                                  :{LTBLUE}Costul de exploatare al vehiculelor: {ORANGE}{STRING}
 STR_680C_CONSTRUCTION_SPEED_OF_COMPETITOR                       :{LTBLUE}Viteza de constructie a concurentilor: {ORANGE}{STRING}
 STR_680D_INTELLIGENCE_OF_COMPETITORS                            :{LTBLUE}Gradul de inteligentã al concurentilor: {ORANGE}{STRING}
@@ -1994,7 +1994,7 @@
 ##id 0x7000
 STR_7000                                                        :
 STR_7001                                                        :{WHITE}{STRING} {BLACK}{STRING}
-STR_7002_PLAYER                                                 :(Jucãtorul {COMMA16})
+STR_7002_PLAYER                                                 :(Jucãtorul {COMMA})
 STR_7004_NEW_FACE                                               :{BLACK}Schimbã foto
 STR_7005_COLOR_SCHEME                                           :{BLACK}Culoare
 STR_7006_COLOR_SCHEME                                           :{GOLD}Culoare:
@@ -2028,7 +2028,7 @@
 STR_7022_INCOME_GRAPH                                           :{WHITE}Graficul veniturilor
 STR_CURRCOMPACT32                                               :{CURRCOMPACT}
 STR_CURRCOMPACT64                                               :{CURRCOMPACT64}
-STR_7024                                                        :{COMMA32}
+STR_7024                                                        :{COMMA}
 STR_7025_OPERATING_PROFIT_GRAPH                                 :{WHITE}Graficul profitului din operare
 STR_7026_BANK_BALANCE                                           :{WHITE}Balantã curentã
 STR_7027_LOAN                                                   :{WHITE}Credite
@@ -2052,14 +2052,14 @@
 STR_7037_PRESIDENT                                              :{WHITE}{STRING}{}{GOLD}(Presedinte)
 STR_7038_INAUGURATED                                            :{GOLD}Anul înfiintãrii: {WHITE}{NUMU16}
 STR_7039_VEHICLES                                               :{GOLD}Vehicule:
-STR_703A_TRAIN                                                  :{WHITE}{COMMA16} tren
-STR_703B_TRAINS                                                 :{WHITE}{COMMA16} trenuri
-STR_703C_ROAD_VEHICLE                                           :{WHITE}{COMMA16} autovehicul
-STR_703D_ROAD_VEHICLES                                          :{WHITE}{COMMA16} autovehicule
-STR_703E_AIRCRAFT                                               :{WHITE}{COMMA16} aeronavã
-STR_703F_AIRCRAFT                                               :{WHITE}{COMMA16} aeronave
-STR_7040_SHIP                                                   :{WHITE}{COMMA16} navã
-STR_7041_SHIPS                                                  :{WHITE}{COMMA16} nave
+STR_703A_TRAIN                                                  :{WHITE}{COMMA} tren
+STR_703B_TRAINS                                                 :{WHITE}{COMMA} trenuri
+STR_703C_ROAD_VEHICLE                                           :{WHITE}{COMMA} autovehicul
+STR_703D_ROAD_VEHICLES                                          :{WHITE}{COMMA} autovehicule
+STR_703E_AIRCRAFT                                               :{WHITE}{COMMA} aeronavã
+STR_703F_AIRCRAFT                                               :{WHITE}{COMMA} aeronave
+STR_7040_SHIP                                                   :{WHITE}{COMMA} navã
+STR_7041_SHIPS                                                  :{WHITE}{COMMA} nave
 STR_7042_NONE                                                   :{WHITE}Nici unul
 STR_7043_FACE_SELECTION                                         :{WHITE}Alegerea fotografiei
 STR_7044_MALE                                                   :{BLACK}Bãrbat
@@ -2124,8 +2124,8 @@
 STR_707A_SELL_25_SHARE_IN_THIS_COMPANY                          :{BLACK}Vinde 25% din actiunile aceste companii
 STR_707B_CAN_T_BUY_25_SHARE_IN_THIS                             :{WHITE}Nu pot cumpãra 25% din aceastã companie...
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}Nu pot vinde 25% din aceastã companie...
-STR_707D_OWNED_BY                                               :{WHITE}({COMMA16}% detinute de {STRING})
-STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA16}% detinute de {STRING}{}   {COMMA16}% detinute de {STRING})
+STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% detinute de {STRING})
+STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}% detinute de {STRING}{}   {COMMA}% detinute de {STRING})
 STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{STRING} a fost preluatã de {STRING}!
 STR_7080_PROTECTED                                              :{WHITE}Aceasta companie inca nu vinde actiuni...
 
@@ -2400,8 +2400,8 @@
 STR_8801_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Cetãtenii sãrbãtoresc {}sosirea primului tren la {STATION}!
 STR_8802_DETAILS                                                :{WHITE}{STRING} (Detalii)
 STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}Tren în drum
-STR_8804                                                        :{SETX 10}{COMMA8}: {STRING}
-STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA8}: {STRING}
+STR_8804                                                        :{SETX 10}{COMMA}: {STRING}
+STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING}
 STR_8806_GO_TO                                                  :Mergi la {STATION}
 STR_8807_GO_TO_TRANSFER                                         :Mergi la {STATION} (Transferã si preia încãrcãtura)
 STR_8808_GO_TO_UNLOAD                                           :Mergi la {STATION} (Descarcã)
@@ -2427,13 +2427,13 @@
 STR_UNKNOWN_DESTINATION                                         :destinatie necunoscutã
 STR_8812_EMPTY                                                  :{LTBLUE}Gol
 STR_8813_FROM                                                   :{LTBLUE}{CARGO} de la {STATION}
-STR_8814_TRAIN_IS_WAITING_IN_DEPOT                              :{WHITE}Trenul {COMMA16} asteaptã în depou
+STR_8814_TRAIN_IS_WAITING_IN_DEPOT                              :{WHITE}Trenul {COMMA} asteaptã în depou
 STR_8815_NEW_VEHICLES                                           :{BLACK}Vehicule noi
 STR_8816                                                        :{BLACK}-
 STR_8818_INFORMATION                                            :{BLACK}Informatii
 STR_8819_TRAIN_TOO_LONG                                         :{WHITE}Tren prea lung
 STR_881A_TRAINS_CAN_ONLY_BE_ALTERED                             :{WHITE}Trenurile pot fi modificate doar când se aflã într-un depou
-STR_881B_TRAINS                                                 :{WHITE}{STRING} - {COMMA16} Trenuri
+STR_881B_TRAINS                                                 :{WHITE}{STRING} - {COMMA} Trenuri
 STR_881C_NEW_RAIL_VEHICLES                                      :{WHITE}Noi vehicule feroviare
 STR_881D_NEW_MONORAIL_VEHICLES                                  :{WHITE}Noi vehicule monorail
 STR_881E_NEW_MAGLEV_VEHICLES                                    :{WHITE}Noi vehicule maglev
@@ -2467,8 +2467,8 @@
 STR_8839_CAN_T_SELL_RAILROAD_VEHICLE                            :{WHITE}Nu pot vinde vehiculul...
 STR_883A_UNABLE_TO_FIND_ROUTE_TO                                :{WHITE}Nu pot gãsi un drum spre un depou local
 STR_883B_CAN_T_STOP_START_TRAIN                                 :{WHITE}Nu pot opri-porni trenul...
-STR_883C_SERVICING_INTERVAL_DAYS                                :{BLACK}Intervalul pt. service: {LTBLUE}{COMMA16}zile{BLACK}   Ultimul service: {LTBLUE}{DATE_LONG}
-STR_SERVICING_INTERVAL_PERCENT                                  :{BLACK}Intervalul de service: {LTBLUE}{COMMA16}%{BLACK}   Ultimul service: {LTBLUE}{DATE_LONG}
+STR_883C_SERVICING_INTERVAL_DAYS                                :{BLACK}Intervalul pt. service: {LTBLUE}{COMMA}zile{BLACK}   Ultimul service: {LTBLUE}{DATE_LONG}
+STR_SERVICING_INTERVAL_PERCENT                                  :{BLACK}Intervalul de service: {LTBLUE}{COMMA}%{BLACK}   Ultimul service: {LTBLUE}{DATE_LONG}
 STR_883D_TRAINS_CLICK_ON_TRAIN_FOR                              :{BLACK}Trenuri - apasã aici pentru informatii despre trenuri
 STR_883E_BUILD_NEW_TRAINS_REQUIRES                              :{BLACK}Cumpãrã trenuri noi (necesitã un depou)
 STR_883F_TRAINS_CLICK_ON_TRAIN_FOR                              :{BLACK}Trenuri - clic pe tren pentru informatii, mutã vehiculele pentru adaugare scoatere din tren
@@ -2501,12 +2501,12 @@
 STR_SERVICE_HINT                                                :{BLACK}Sãri peste aceastã comandã dacã nu este necesar un service
 STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}Stiri: {STRING} este acum disponibil!
 STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
-STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Cost: {CURRENCY} Greutate: {COMMA16}t{}Vitezã: {VELOCITY}  Putere: {COMMA16}cp{}Cost de rulare: {CURRENCY}/an{}Capacitate: {STRING}
+STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Cost: {CURRENCY} Greutate: {COMMA}t{}Vitezã: {VELOCITY}  Putere: {COMMA}cp{}Cost de rulare: {CURRENCY}/an{}Capacitate: {STRING}
 STR_885C_BROKEN_DOWN                                            :{RED}Defectiune
 STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Vechimea: {LTBLUE}{STRING}{BLACK}   Cost de rulare: {LTBLUE}{CURRENCY}/an
-STR_885E_WEIGHT_T_POWER_HP_MAX_SPEED                            :{BLACK}Greutate: {LTBLUE}{COMMA16}t  {BLACK}Putere: {LTBLUE}{COMMA32}cp{BLACK} Vitezã max.: {LTBLUE}{VELOCITY}
+STR_885E_WEIGHT_T_POWER_HP_MAX_SPEED                            :{BLACK}Greutate: {LTBLUE}{COMMA}t  {BLACK}Putere: {LTBLUE}{COMMA}cp{BLACK} Vitezã max.: {LTBLUE}{VELOCITY}
 STR_885F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Profit anul acesta: {LTBLUE}{CURRENCY}  (anul trecut: {CURRENCY})
-STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Eficientã: {LTBLUE}{COMMA8}%  {BLACK}Defectiuni de la ultimul service: {LTBLUE}{COMMA16}
+STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Eficientã: {LTBLUE}{COMMA}%  {BLACK}Defectiuni de la ultimul service: {LTBLUE}{COMMA}
 STR_8861_STOPPED                                                :{RED}Oprit
 STR_8862_CAN_T_MAKE_TRAIN_PASS_SIGNAL                           :{WHITE}Nu pot permite trenului sã treacã în caz de pericol...
 STR_8863_CRASHED                                                :{RED}Accident!
@@ -2514,7 +2514,7 @@
 STR_8865_NAME_TRAIN                                             :{WHITE}Numele trenului
 STR_8866_CAN_T_NAME_TRAIN                                       :{WHITE}Nu pot redenumi trenul...
 STR_8867_NAME_TRAIN                                             :{BLACK}Numele trenului
-STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Accident feroviar!{}{COMMA16} victime în urma unei coliziuni
+STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Accident feroviar!{}{COMMA} victime în urma unei coliziuni
 STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}Nu pot schimba sensul de mers al trenului...
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Redenumeste modelul vehiculului feroviar
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Nu pot redenumi modelul acestui vehicul...
@@ -2526,7 +2526,7 @@
 
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Autovehicul in cale
-STR_9001_ROAD_VEHICLES                                          :{WHITE}{STRING} - {COMMA16}Autovehicule
+STR_9001_ROAD_VEHICLES                                          :{WHITE}{STRING} - {COMMA}Autovehicule
 STR_9002                                                        :{WHITE}{STRING}
 STR_9003_ROAD_VEHICLE_DEPOT                                     :{WHITE}Autobaza {TOWN}
 STR_9004_NEW_VEHICLES                                           :{BLACK}Autovehicule noi
@@ -2540,13 +2540,13 @@
 STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Vârsta: {LTBLUE}{STRING}{BLACK}   Cost de rulare: {LTBLUE}{CURRENCY}/an
 STR_900E_MAX_SPEED                                              :{BLACK}Vitezã max.: {LTBLUE}{VELOCITY}
 STR_900F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Profit anul acesta: {LTBLUE}{CURRENCY}  (anul trecut: {CURRENCY})
-STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Eficientã: {LTBLUE}{COMMA8}%  {BLACK}Defectiuni de la ultimul service: {LTBLUE}{COMMA16}
+STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Eficientã: {LTBLUE}{COMMA}%  {BLACK}Defectiuni de la ultimul service: {LTBLUE}{COMMA}
 STR_9011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Cumpãrat: {LTBLUE}{NUMU16}{BLACK} Valoare: {LTBLUE}{CURRENCY}
 STR_9012_CAPACITY                                               :{BLACK}Capacitate: {LTBLUE}{STRING}
 STR_9013_MUST_BE_STOPPED_INSIDE                                 :{WHITE}...trebuie oprit intr-o autobazã
 STR_9014_CAN_T_SELL_ROAD_VEHICLE                                :{WHITE}Nu pot vinde autovehiculul...
 STR_9015_CAN_T_STOP_START_ROAD_VEHICLE                          :{WHITE}Nu pot opri/porni autovehiculul...
-STR_9016_ROAD_VEHICLE_IS_WAITING                                :{WHITE}Autovehiculul {COMMA16} e parcat la autobazã
+STR_9016_ROAD_VEHICLE_IS_WAITING                                :{WHITE}Autovehiculul {COMMA} e parcat la autobazã
 STR_HEADING_FOR_ROAD_DEPOT                                      :{LTBLUE}Merge la Autobaza {TOWN}
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{LTBLUE}Merge la Autobaza {TOWN}, {VELOCITY}
 STR_9018_CAN_T_SEND_VEHICLE_TO_DEPOT                            :{WHITE}Nu pot trimite autovehiculul la autobazã...
@@ -2575,7 +2575,7 @@
 STR_902F_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Cetãtenii sãrbãtoresc{}sosirea primului autobuz la {STATION}!
 STR_9030_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Cetãtenii sãrbãtoresc{}sosirea primului camion la {STATION}!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Accident rutier!{}Soferul decedat in urma coliziunii cu un tren
-STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Accident rutier!{}{COMMA16} victime in urma coliziunii cu un tren
+STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Accident rutier!{}{COMMA} victime in urma coliziunii cu un tren
 STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}Nu pot schimba întoarce autvehiculul...
 STR_9034_RENAME                                                 :{BLACK}Redenumeste
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Redenumeste modelul de autovehicul
@@ -2590,7 +2590,7 @@
 STR_9802_CAN_T_BUILD_DOCK_HERE                                  :{WHITE}Nu pot construi port aici...
 STR_9803_SHIP_DEPOT                                             :{WHITE}Santierul Naval {TOWN}
 STR_9804_NEW_SHIPS                                              :{BLACK}Nave noi
-STR_9805_SHIPS                                                  :{WHITE}{STRING} - {COMMA16}Nave
+STR_9805_SHIPS                                                  :{WHITE}{STRING} - {COMMA}Nave
 STR_9806_CAN_T_BUILD_SHIPS                                      :{WHITE}Nu pot construi nave...
 STR_9807_MUST_BUILD_SHIP_DEPOT_FIRST                            :{WHITE}Construieste mai intâi un santier
 STR_9808_NEW_SHIPS                                              :{WHITE}Nave noi
@@ -2605,7 +2605,7 @@
 STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Vârsta: {LTBLUE}{STRING}{BLACK}   Cost de rulare: {LTBLUE}{CURRENCY}/an
 STR_9813_MAX_SPEED                                              :{BLACK}Viteza max.: {LTBLUE}{VELOCITY}
 STR_9814_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Profit anul acesta: {LTBLUE}{CURRENCY}  (anul trecut: {CURRENCY})
-STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Eficientã: {LTBLUE}{COMMA8}%  {BLACK}Defectiuni de la ultimul service: {LTBLUE}{COMMA16}
+STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Eficientã: {LTBLUE}{COMMA}%  {BLACK}Defectiuni de la ultimul service: {LTBLUE}{COMMA}
 STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Construit: {LTBLUE}{NUMU16}{BLACK} Valoare: {LTBLUE}{CURRENCY}
 STR_9817_CAPACITY                                               :{BLACK}Capacitate: {LTBLUE}{STRING}
 STR_9818_CAN_T_STOP_START_SHIP                                  :{WHITE}Nu pot opri/porni nava...
@@ -2613,7 +2613,7 @@
 STR_981A_UNABLE_TO_FIND_LOCAL_DEPOT                             :{WHITE}Nu pot gãsi un santier apropiat
 STR_HEADING_FOR_SHIP_DEPOT                                      :{LTBLUE}Merge la Santierul {TOWN}
 STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{LTBLUE}Merge la Santierul {TOWN}, {VELOCITY}
-STR_981C_SHIP_IS_WAITING_IN_DEPOT                               :{WHITE}Nava {COMMA16} este stationatã în santier
+STR_981C_SHIP_IS_WAITING_IN_DEPOT                               :{WHITE}Nava {COMMA} este stationatã în santier
 STR_981D_BUILD_SHIP_DOCK                                        :{BLACK}Construieste port
 STR_981E_BUILD_SHIP_DEPOT_FOR_BUILDING                          :{BLACK}Constructie santier naval (pentru construirea si repararea navelor)
 STR_981F_SHIPS_CLICK_ON_SHIP_FOR                                :{BLACK}Nave - clic pe o navã pentru informatii
@@ -2664,19 +2664,19 @@
 STR_A005_NEW_AIRCRAFT                                           :{WHITE}Aeronavã nouã
 STR_A006_BUILD_AIRCRAFT                                         :{BLACK}Cumpãrã aeronavã
 STR_A008_CAN_T_BUILD_AIRCRAFT                                   :{WHITE}Nu pot cumpãra aeronava...
-STR_A009_AIRCRAFT                                               :{WHITE}{STRING} - {COMMA16} Aeronave
+STR_A009_AIRCRAFT                                               :{WHITE}{STRING} - {COMMA} Aeronave
 STR_A00A                                                        :{WHITE}{STRING}
 STR_A00B_ORDERS                                                 :{WHITE}{STRING} (Comenzi)
 STR_A00C_DETAILS                                                :{WHITE}{STRING} (Detalii)
 STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Vârstã: {LTBLUE}{STRING}{BLACK}   Cost de rulare: {LTBLUE}{CURRENCY}/an
 STR_A00E_MAX_SPEED                                              :{BLACK}Vitezã max.: {LTBLUE}{VELOCITY}
 STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Profit anul acesta: {LTBLUE}{CURRENCY}  (anul trecut: {CURRENCY})
-STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Eficientã: {LTBLUE}{COMMA8}%  {BLACK}Defectiuni de la ultimul service: {LTBLUE}{COMMA16}
+STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Eficientã: {LTBLUE}{COMMA}%  {BLACK}Defectiuni de la ultimul service: {LTBLUE}{COMMA}
 STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Cumpãrat în: {LTBLUE}{NUMU16}{BLACK} Valoare: {LTBLUE}{CURRENCY}
 STR_A012_CAN_T_SEND_AIRCRAFT_TO                                 :{WHITE}Nu pot trimite nava într+un hangar...
 STR_HEADING_FOR_HANGAR                                          :{LTBLUE}Merge la Hangarul {STATION}
 STR_HEADING_FOR_HANGAR_VEL                                      :{LTBLUE}Merge la Hangarul{STATION}, {VELOCITY}
-STR_A014_AIRCRAFT_IS_WAITING_IN                                 :{WHITE}Aeronava {COMMA16} se aflã în hangar
+STR_A014_AIRCRAFT_IS_WAITING_IN                                 :{WHITE}Aeronava {COMMA} se aflã în hangar
 STR_A015_AIRCRAFT_IN_THE_WAY                                    :{WHITE}Aeronavã în cale
 STR_A016_CAN_T_STOP_START_AIRCRAFT                              :{WHITE}Nu pot opri/porni aeronava...
 STR_A017_AIRCRAFT_IS_IN_FLIGHT                                  :{WHITE}Aeronavã se aflã în zbor
@@ -2702,14 +2702,14 @@
 STR_A02B_SHOW_AIRCRAFT_DETAILS                                  :{BLACK}Afiseazã detaliile aeronavei
 STR_A02C_NEW_AIRCRAFT_NOW_AVAILABLE                             :{BLACK}{BIGFONT}Un nou tip de aeronavã disponibil!
 STR_A02D                                                        :{BLACK}{BIGFONT}{STRING}
-STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Pret: {CURRENCY} Viteza max.: {VELOCITY}{}Capacitate: {COMMA16} cãlãtori, {COMMA16} saci de postã{}Cost de rulare: {CURRENCY}/an
+STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Pret: {CURRENCY} Viteza max.: {VELOCITY}{}Capacitate: {COMMA} cãlãtori, {COMMA} saci de postã{}Cost de rulare: {CURRENCY}/an
 
 STR_A030_NAME_AIRCRAFT                                          :{WHITE}Redenumeste aeronava
 STR_A031_CAN_T_NAME_AIRCRAFT                                    :{WHITE}Nu pot redenumi aeronava...
 STR_A032_NAME_AIRCRAFT                                          :{BLACK}Redenumeste aeronava
 STR_A033_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Cetãtenii sãrbãtoresc {}sosirea primei aeronave la {STATION}!
-STR_A034_PLANE_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Accident aviatic!{}{COMMA16} victime în urma prãbusirii de la {STATION}
-STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Accident aerian!{}Aeronava in pana de combustibil, {COMMA16} victime in urma dezastrulu!
+STR_A034_PLANE_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Accident aviatic!{}{COMMA} victime în urma prãbusirii de la {STATION}
+STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Accident aerian!{}Aeronava in pana de combustibil, {COMMA} victime in urma dezastrulu!
 STR_A035_DESTINATIONS                                           :{TINYFONT}{BLACK}Destinatii:
 STR_A036                                                        :{TINYFONT}{BLACK}{STATION}
 STR_A037_RENAME                                                 :{BLACK}Redenumire
@@ -2735,7 +2735,7 @@
 STR_B003_FACTORY_DESTROYED_IN_SUSPICIOUS                        :{BLACK}{BIGFONT}Fabricã de conserve distrusã în conditii misterioase lângã {TOWN}!
 STR_B004_UFO_LANDS_NEAR                                         :{BLACK}{BIGFONT}Un OZN a aterizat lângã {TOWN}!
 STR_B005_COAL_MINE_SUBSIDENCE_LEAVES                            :{BLACK}{BIGFONT}Prãbusirea unei mine de cupru lângã {TOWN} provoacã daune majore!
-STR_B006_FLOOD_VEHICLE_DESTROYED                                :{BLACK}{BIGFONT}Inundatii!{}Se estimeaza cel putin {COMMA16}  victime!
+STR_B006_FLOOD_VEHICLE_DESTROYED                                :{BLACK}{BIGFONT}Inundatii!{}Se estimeaza cel putin {COMMA}  victime!
 
 STR_BRIBE_FAILED                                                :{WHITE}Încercarea ta de mituire
 STR_BRIBE_FAILED_2                                              :{WHITE}a fost descoperitã de un procuror local
@@ -2745,7 +2745,7 @@
 STR_PERFORMANCE_DETAIL                                          :{WHITE}Ratingul de performantã detaliat
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Detalii
 STR_PERFORMANCE_DETAIL_AMOUNT_CURRENCY                          :{BLACK}({CURRCOMPACT}/{CURRCOMPACT})
-STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA32}/{COMMA32})
+STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA}/{COMMA})
 STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{INT32}%
 SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{INT32}
 ############ Those following lines need to be in this order!!
@@ -2780,7 +2780,7 @@
 STR_NEWGRF_GRF_ID                                               :{BLACK}ID GRF:
 
 STR_CURRENCY_WINDOW                                             :{WHITE}Moneda proprie
-STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Curs de schimb: {ORANGE}{CURRENCY} = {POUNDSIGN} {COMMA16}
+STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Curs de schimb: {ORANGE}{CURRENCY} = {POUNDSIGN} {COMMA}
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Separator:
 STR_CURRENCY_PREFIX                                             :{LTBLUE}Prefix:
 STR_CURRENCY_SUFFIX                                             :{LTBLUE}Sufix:
@@ -2794,10 +2794,10 @@
 STR_PLANE                                                       :{BLACK}{PLANE}
 STR_SHIP                                                        :{BLACK}{SHIP}
 
-STR_SCHEDULED_TRAINS                                            :{WHITE}{STATION} - {COMMA16} Trenuri
-STR_SCHEDULED_ROAD_VEHICLES                                     :{WHITE}{STATION} - {COMMA16} Autovehicule
-STR_SCHEDULED_AIRCRAFT                                          :{WHITE}{STATION} - {COMMA16} Aeronave
-STR_SCHEDULED_SHIPS                                             :{WHITE}{STATION} - {COMMA16} Nave
+STR_SCHEDULED_TRAINS                                            :{WHITE}{STATION} - {COMMA} Trenuri
+STR_SCHEDULED_ROAD_VEHICLES                                     :{WHITE}{STATION} - {COMMA} Autovehicule
+STR_SCHEDULED_AIRCRAFT                                          :{WHITE}{STATION} - {COMMA} Aeronave
+STR_SCHEDULED_SHIPS                                             :{WHITE}{STATION} - {COMMA} Nave
 
 STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Afiseaza toate trenurile care opresc in aceasta statie
 STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Afiseaza toate autovehiculele care opresc in aceasta statie
@@ -2819,7 +2819,7 @@
 STR_REPLACE_HELP                                                :{BLACK}Aceasta functie iti permite sa selectezi un model de vehicul si sa-l inlocuiesti cu altul. Schimbarea se va efectua automat la intrarea vehiculului intr-un depou.
 
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
-STR_SIGN_LIST_CAPTION                                           :{WHITE}Lista de semne - {COMMA16} Semne
+STR_SIGN_LIST_CAPTION                                           :{WHITE}Lista de semne - {COMMA} Semne
 
 ############ Lists rail types
 
@@ -2829,16 +2829,16 @@
 
 ############ End of list of rail types
 
-STR_TINY_BLACK                                                  :{BLACK}{TINYFONT}{COMMA16}
+STR_TINY_BLACK                                                  :{BLACK}{TINYFONT}{COMMA}
 
-STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Cost: {GOLD}{CURRENCY}{BLACK} Greutate: {GOLD}{COMMA16}t
-STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Viteza: {GOLD}{VELOCITY}{BLACK}   Putere: {GOLD}{COMMA32}hp
+STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Cost: {GOLD}{CURRENCY}{BLACK} Greutate: {GOLD}{COMMA}t
+STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Viteza: {GOLD}{VELOCITY}{BLACK}   Putere: {GOLD}{COMMA}hp
 STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}Cost de rulare: {GOLD}{CURRENCY}/an
 STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Capacitate: {GOLD}{STRING} {STRING}
-STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}An aparitie: {GOLD}{NUMU16}{BLACK} Durata de viata: {GOLD}{COMMA16} years
-STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Eficienta max.: {GOLD}{COMMA8}%
+STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}An aparitie: {GOLD}{NUMU16}{BLACK} Durata de viata: {GOLD}{COMMA} years
+STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Eficienta max.: {GOLD}{COMMA}%
 STR_PURCHASE_INFO_COST                                          :{BLACK}Cost: {GOLD}{CURRENCY}
-STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Greutate: {GOLD}{COMMA16}t  ({COMMA16}t)
+STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Greutate: {GOLD}{COMMA}t  ({COMMA}t)
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Cost: {GOLD}{CURRENCY}{BLACK} Viteza: {GOLD}{VELOCITY}
-STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Capacitate: {GOLD}{COMMA16} calatori, {COMMA16} saci de posta
-STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Vagoane electrificate: {GOLD}+{COMMA16}cp{BLACK} Greutate: {GOLD}+{COMMA8}t
+STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Capacitate: {GOLD}{COMMA} calatori, {COMMA} saci de posta
+STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Vagoane electrificate: {GOLD}+{COMMA}cp{BLACK} Greutate: {GOLD}+{COMMA}t
--- a/lang/slovak.txt	Thu Jul 14 09:53:52 2005 +0000
+++ b/lang/slovak.txt	Thu Jul 14 15:10:20 2005 +0000
@@ -82,69 +82,69 @@
 STR_004C_PLASTIC                                                :Zuvacky
 STR_004D_FIZZY_DRINK                                            :Sumienka
 STR_004E                                                        :
-STR_004F_PASSENGER                                              :{COMMA16} cestujuci
-STR_0050_TON_OF_COAL                                            :{COMMA16} tona uhlia
-STR_0051_BAG_OF_MAIL                                            :{COMMA16} balik posty
+STR_004F_PASSENGER                                              :{COMMA} cestujuci
+STR_0050_TON_OF_COAL                                            :{COMMA} tona uhlia
+STR_0051_BAG_OF_MAIL                                            :{COMMA} balik posty
 STR_0052_OF_OIL                                                 :{VOLUME} ropy
-STR_0053_ITEM_OF_LIVESTOCK                                      :{COMMA16} kus dobytka
-STR_0054_CRATE_OF_GOODS                                         :{COMMA16} debna tovaru
-STR_0055_TON_OF_GRAIN                                           :{COMMA16} tona obilia
-STR_0056_TON_OF_WOOD                                            :{COMMA16} tona dreva
-STR_0057_TON_OF_IRON_ORE                                        :{COMMA16} tona zeleznej rudy
-STR_0058_TON_OF_STEEL                                           :{COMMA16} tona ocele
-STR_0059_BAG_OF_VALUABLES                                       :{COMMA16} vreco cennosti
-STR_005A_TON_OF_COPPER_ORE                                      :{COMMA16} tona medennej rudy
-STR_005B_TON_OF_MAIZE                                           :{COMMA16} tona kukurice
-STR_005C_TON_OF_FRUIT                                           :{COMMA16} tona ovocia
-STR_005D_BAG_OF_DIAMONDS                                        :{COMMA16} debna diamantov
-STR_005E_TON_OF_FOOD                                            :{COMMA16} tona jedla
-STR_005F_TON_OF_PAPER                                           :{COMMA16} tona papiera
-STR_0060_BAG_OF_GOLD                                            :{COMMA16} debna zlata
+STR_0053_ITEM_OF_LIVESTOCK                                      :{COMMA} kus dobytka
+STR_0054_CRATE_OF_GOODS                                         :{COMMA} debna tovaru
+STR_0055_TON_OF_GRAIN                                           :{COMMA} tona obilia
+STR_0056_TON_OF_WOOD                                            :{COMMA} tona dreva
+STR_0057_TON_OF_IRON_ORE                                        :{COMMA} tona zeleznej rudy
+STR_0058_TON_OF_STEEL                                           :{COMMA} tona ocele
+STR_0059_BAG_OF_VALUABLES                                       :{COMMA} vreco cennosti
+STR_005A_TON_OF_COPPER_ORE                                      :{COMMA} tona medennej rudy
+STR_005B_TON_OF_MAIZE                                           :{COMMA} tona kukurice
+STR_005C_TON_OF_FRUIT                                           :{COMMA} tona ovocia
+STR_005D_BAG_OF_DIAMONDS                                        :{COMMA} debna diamantov
+STR_005E_TON_OF_FOOD                                            :{COMMA} tona jedla
+STR_005F_TON_OF_PAPER                                           :{COMMA} tona papiera
+STR_0060_BAG_OF_GOLD                                            :{COMMA} debna zlata
 STR_0061_OF_WATER                                               :{VOLUME} voda
-STR_0062_TON_OF_WHEAT                                           :{COMMA16} tona psenice
+STR_0062_TON_OF_WHEAT                                           :{COMMA} tona psenice
 STR_0063_OF_RUBBER                                              :{VOLUME} kaucuk
-STR_0064_TON_OF_SUGAR                                           :{COMMA16} tona cukru
-STR_0065_TOY                                                    :{COMMA16} hracka
-STR_0066_BAG_OF_CANDY                                           :{COMMA16} debna cukrikov
+STR_0064_TON_OF_SUGAR                                           :{COMMA} tona cukru
+STR_0065_TOY                                                    :{COMMA} hracka
+STR_0066_BAG_OF_CANDY                                           :{COMMA} debna cukrikov
 STR_0067_OF_COLA                                                :{VOLUME} kofola
-STR_0068_TON_OF_COTTON_CANDY                                    :{COMMA16} tona cukrovej vaty
-STR_0069_BUBBLE                                                 :{COMMA16} bublina
-STR_006A_TON_OF_TOFFEE                                          :{COMMA16} tona karamelu
-STR_006B_BATTERY                                                :{COMMA16} bateria
+STR_0068_TON_OF_COTTON_CANDY                                    :{COMMA} tona cukrovej vaty
+STR_0069_BUBBLE                                                 :{COMMA} bublina
+STR_006A_TON_OF_TOFFEE                                          :{COMMA} tona karamelu
+STR_006B_BATTERY                                                :{COMMA} bateria
 STR_006C_OF_PLASTIC                                             :{VOLUME} zuvacka
-STR_006D_FIZZY_DRINK                                            :{COMMA16} sumienka
+STR_006D_FIZZY_DRINK                                            :{COMMA} sumienka
 STR_006E                                                        :
-STR_006F_PASSENGERS                                             :{COMMA16} cestujucich
-STR_0070_TONS_OF_COAL                                           :{COMMA16} ton uhlia
-STR_0071_BAGS_OF_MAIL                                           :{COMMA16} balikov posty
+STR_006F_PASSENGERS                                             :{COMMA} cestujucich
+STR_0070_TONS_OF_COAL                                           :{COMMA} ton uhlia
+STR_0071_BAGS_OF_MAIL                                           :{COMMA} balikov posty
 STR_0072_OF_OIL                                                 :{VOLUME} ropy
-STR_0073_ITEMS_OF_LIVESTOCK                                     :{COMMA16} kusov dobytka
-STR_0074_CRATES_OF_GOODS                                        :{COMMA16} debien tovaru
-STR_0075_TONS_OF_GRAIN                                          :{COMMA16} ton obilia
-STR_0076_TONS_OF_WOOD                                           :{COMMA16} ton dreva
-STR_0077_TONS_OF_IRON_ORE                                       :{COMMA16} ton zeleznej rudy
-STR_0078_TONS_OF_STEEL                                          :{COMMA16} ton ocele
-STR_0079_BAGS_OF_VALUABLES                                      :{COMMA16} vriec cennosti
-STR_007A_TONS_OF_COPPER_ORE                                     :{COMMA16} ton medennej rudy
-STR_007B_TONS_OF_MAIZE                                          :{COMMA16} ton kukurice
-STR_007C_TONS_OF_FRUIT                                          :{COMMA16} ton ovocia
-STR_007D_BAGS_OF_DIAMONDS                                       :{COMMA16} debien diamantov
-STR_007E_TONS_OF_FOOD                                           :{COMMA16} ton jedla
-STR_007F_TONS_OF_PAPER                                          :{COMMA16} ton papiera
-STR_0080_BAGS_OF_GOLD                                           :{COMMA16} debien zlata
+STR_0073_ITEMS_OF_LIVESTOCK                                     :{COMMA} kusov dobytka
+STR_0074_CRATES_OF_GOODS                                        :{COMMA} debien tovaru
+STR_0075_TONS_OF_GRAIN                                          :{COMMA} ton obilia
+STR_0076_TONS_OF_WOOD                                           :{COMMA} ton dreva
+STR_0077_TONS_OF_IRON_ORE                                       :{COMMA} ton zeleznej rudy
+STR_0078_TONS_OF_STEEL                                          :{COMMA} ton ocele
+STR_0079_BAGS_OF_VALUABLES                                      :{COMMA} vriec cennosti
+STR_007A_TONS_OF_COPPER_ORE                                     :{COMMA} ton medennej rudy
+STR_007B_TONS_OF_MAIZE                                          :{COMMA} ton kukurice
+STR_007C_TONS_OF_FRUIT                                          :{COMMA} ton ovocia
+STR_007D_BAGS_OF_DIAMONDS                                       :{COMMA} debien diamantov
+STR_007E_TONS_OF_FOOD                                           :{COMMA} ton jedla
+STR_007F_TONS_OF_PAPER                                          :{COMMA} ton papiera
+STR_0080_BAGS_OF_GOLD                                           :{COMMA} debien zlata
 STR_0081_OF_WATER                                               :{VOLUME} vody
-STR_0082_TONS_OF_WHEAT                                          :{COMMA16} ton psenice
+STR_0082_TONS_OF_WHEAT                                          :{COMMA} ton psenice
 STR_0083_OF_RUBBER                                              :{VOLUME} kaucuku
-STR_0084_TONS_OF_SUGAR                                          :{COMMA16} ton cukru
-STR_0085_TOYS                                                   :{COMMA16} hraciek
-STR_0086_BAGS_OF_CANDY                                          :{COMMA16} debien cukrikov
+STR_0084_TONS_OF_SUGAR                                          :{COMMA} ton cukru
+STR_0085_TOYS                                                   :{COMMA} hraciek
+STR_0086_BAGS_OF_CANDY                                          :{COMMA} debien cukrikov
 STR_0087_OF_COLA                                                :{VOLUME} kofoly
-STR_0088_TONS_OF_COTTON_CANDY                                   :{COMMA16} ton cukrovej vaty
-STR_0089_BUBBLES                                                :{COMMA16} bublin
-STR_008A_TONS_OF_TOFFEE                                         :{COMMA16} ton karamelu
-STR_008B_BATTERIES                                              :{COMMA16} baterii
+STR_0088_TONS_OF_COTTON_CANDY                                   :{COMMA} ton cukrovej vaty
+STR_0089_BUBBLES                                                :{COMMA} bublin
+STR_008A_TONS_OF_TOFFEE                                         :{COMMA} ton karamelu
+STR_008B_BATTERIES                                              :{COMMA} baterii
 STR_008C_OF_PLASTIC                                             :{VOLUME} zuvaciek
-STR_008D_FIZZY_DRINKS                                           :{COMMA16} sumienky
+STR_008D_FIZZY_DRINKS                                           :{COMMA} sumienky
 STR_008E                                                        :
 STR_008F_PS                                                     :{TINYFONT}CE
 STR_0090_CL                                                     :{TINYFONT}UH
@@ -219,8 +219,8 @@
 STR_00DF_GREY                                                   :Seda
 STR_00E0_WHITE                                                  :Biela
 STR_00E1_TOO_MANY_VEHICLES_IN_GAME                              :{WHITE}V hre je prilis vela dopravnych prostriedkov
-STR_00E2                                                        :{BLACK}{COMMA16}
-STR_00E3                                                        :{RED}{COMMA16}
+STR_00E2                                                        :{BLACK}{COMMA}
+STR_00E3                                                        :{RED}{COMMA}
 STR_00E4_LOCATION                                               :{BLACK}Pozicia
 STR_00E5_CONTOURS                                               :Vrstevnice
 STR_00E6_VEHICLES                                               :Dopravne Prostriedky
@@ -441,18 +441,18 @@
 STR_0198_PROFIT_THIS_YEAR_LAST_YEAR                             :{TINYFONT}{BLACK}Zisk tento rok: {CURRENCY} (posledny rok: {CURRENCY})
 
 ############ range for service numbers starts
-STR_0199_YEAR                                                   :{COMMA16} rok ({COMMA16})
-STR_019A_YEARS                                                  :{COMMA16} rokov ({COMMA16})
-STR_019B_YEARS                                                  :{RED}{COMMA16} rokov ({COMMA16})
+STR_0199_YEAR                                                   :{COMMA} rok ({COMMA})
+STR_019A_YEARS                                                  :{COMMA} rokov ({COMMA})
+STR_019B_YEARS                                                  :{RED}{COMMA} rokov ({COMMA})
 ############ range for service numbers ends
 
 STR_019C_ROAD_VEHICLE                                           :Automobil
 STR_019D_AIRCRAFT                                               :Lietadlo
 STR_019E_SHIP                                                   :Lod
 STR_019F_TRAIN                                                  :Vlak
-STR_01A0_IS_GETTING_OLD                                         :{WHITE}{STRING} {COMMA16} je stary
-STR_01A1_IS_GETTING_VERY_OLD                                    :{WHITE}{STRING} {COMMA16} je velmi stary
-STR_01A2_IS_GETTING_VERY_OLD_AND                                :{WHITE}{STRING} {COMMA16} je velmi stary a potrebuje vymenit
+STR_01A0_IS_GETTING_OLD                                         :{WHITE}{STRING} {COMMA} je stary
+STR_01A1_IS_GETTING_VERY_OLD                                    :{WHITE}{STRING} {COMMA} je velmi stary
+STR_01A2_IS_GETTING_VERY_OLD_AND                                :{WHITE}{STRING} {COMMA} je velmi stary a potrebuje vymenit
 STR_01A3_LAND_AREA_INFORMATION                                  :{WHITE}Informacie o pozemku
 STR_01A4_COST_TO_CLEAR_N_A                                      :{BLACK}Cena za zburanie: {LTBLUE}N/A
 STR_01A5_COST_TO_CLEAR                                          :{BLACK}Cena za zburanie: {LTBLUE}{CURRENCY}
@@ -497,7 +497,7 @@
 STR_01CA_31ST                                                   :31
 ############ range for days	ends
 
-STR_01CB                                                        :{TINYFONT}{COMMA16}
+STR_01CB                                                        :{TINYFONT}{COMMA}
 STR_01CC_TOGGLE_LARGE_SMALL_MAP                                 :{BLACK}Prepnut malu / velku mapu
 STR_01CD_SELECT_TUTORIAL_DEMONSTRATION                          :{WHITE}Vybrat Nacvik / Ukazku
 
@@ -509,7 +509,7 @@
 STR_CARGO_ACCEPTED_5                                            :{BLACK}Prijma naklad: {LTBLUE}{STRING}, {STRING}, {STRING}, {STRING}, {STRING}
 ############ range for cargo acecpted ends
 
-STR_01D1_8                                                      :({COMMA8}/8 {STRING})
+STR_01D1_8                                                      :({COMMA}/8 {STRING})
 STR_01D2_JAZZ_JUKEBOX                                           :{WHITE}Gramofon
 STR_01D3_SOUND_MUSIC                                            :Zvuk/Hydba
 STR_01D4_SHOW_SOUND_MUSIC_WINDOW                                :{BLACK}Zobraz zvukove/hudobne okno
@@ -528,16 +528,16 @@
 STR_01E1_START_PLAYING_MUSIC                                    :{BLACK}Spustit prehravanie hudby
 STR_01E2_DRAG_SLIDERS_TO_SET_MUSIC                              :{BLACK}Tahat posuvace pre zmenu hlasitosti
 STR_01E3                                                        :{DKGREEN}{TINYFONT}--
-STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA8}
-STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA8}
+STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA}
+STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA}
 STR_01E6                                                        :{DKGREEN}{TINYFONT}------
 STR_01E7                                                        :{DKGREEN}{TINYFONT}"{STRING}"
 STR_01E8_TRACK_XTITLE                                           :{BLACK}{TINYFONT}Stopa{SETX 88}Title
 STR_01E9_SHUFFLE                                                :{TINYFONT}Nahodne
 STR_01EA_PROGRAM                                                :{TINYFONT}{BLACK}Program
 STR_01EB_MUSIC_PROGRAM_SELECTION                                :{WHITE}Vyber hudobneho programu
-STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA16} "{STRING}"
-STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA16}   "{STRING}"
+STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} "{STRING}"
+STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA}   "{STRING}"
 STR_01EE_TRACK_INDEX                                            :{TINYFONT}{BLACK}Cislo stopy
 STR_01EF_PROGRAM                                                :{TINYFONT}{BLACK}Program - '{STRING}'
 STR_01F0_CLEAR                                                  :{TINYFONT}{BLACK}Zmazat
@@ -577,7 +577,7 @@
 STR_0210_TOO_FAR_FROM_PREVIOUS_DESTINATIO                       :{WHITE}...prilis daleko z predchadzajuceho ciela
 STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Najlepsie spolocnosti, ktore dosiahli {NUMU16}{}({STRING} uroven)
 STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Tabulka spolocnosti v roku {NUMU16}
-STR_0212                                                        :{BIGFONT}{COMMA16}.
+STR_0212                                                        :{BIGFONT}{COMMA}.
 STR_0213_BUSINESSMAN                                            :Obchodnik
 STR_0214_ENTREPRENEUR                                           :Podnikatel
 STR_0215_INDUSTRIALIST                                          :Priemyselnik
@@ -586,12 +586,12 @@
 STR_0218_MOGUL                                                  :Mogul
 STR_0219_TYCOON_OF_THE_CENTURY                                  :Tycoon
 STR_HIGHSCORE_NAME                                              :{BIGFONT}{STRING}, {STRING}
-STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA16})
+STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA})
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{STRING} ziskal oznacenie '{STRING}' !
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{STRING} z {STRING} ziskal oznacenie '{STRING}' !
 STR_021D                                                        :{BLACK}
 STR_021E                                                        :{WHITE}
-STR_021F                                                        :{BLUE}{COMMA16}
+STR_021F                                                        :{BLUE}{COMMA}
 STR_0220_CREATE_SCENARIO                                        :{BLACK}Vytvorit Scenar
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Editor scenarov
@@ -788,8 +788,8 @@
 STR_EXTRA_VIEW_PORT                                             :Extra pohlad
 STR_SIGN_LIST                                                   :Zoznam popisov
 STR_02DF_TOWN_DIRECTORY                                         :Zoznam miest
-STR_TOWN_POPULATION                                             :{BLACK}Svetova populacia: {COMMA32}
-STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Pohlad {COMMA16}
+STR_TOWN_POPULATION                                             :{BLACK}Svetova populacia: {COMMA}
+STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Pohlad {COMMA}
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN                                :{BLACK}Nastavit pohlad podla mapy
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT                             :{BLACK}Nastavit pohlad podla hlavneho pohladu
 STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW                                :{BLACK}Nastavit mapu podla pohladu
@@ -961,34 +961,34 @@
 STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Nemoze kopirovat zoznam smerov...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Koniec zdielanych smerov - -
 
-STR_TRAIN_IS_LOST                                               :{WHITE}Vlak {COMMA16} sa stratil.
-STR_TRAIN_IS_UNPROFITABLE                                       :{WHITE}Zisk vlaku {COMMA16} za posledny rok bol {CURRENCY}
+STR_TRAIN_IS_LOST                                               :{WHITE}Vlak {COMMA} sa stratil.
+STR_TRAIN_IS_UNPROFITABLE                                       :{WHITE}Zisk vlaku {COMMA} za posledny rok bol {CURRENCY}
 STR_EURO_INTRODUCE                                              :{BLACK}{BIGFONT}Europska Menova Unia!{}{}Euro bolo uvedene ako hlavna mena pre kazdodenne prevody v tvojej krajine.
 
 # Start of order review system.
 # DON'T ADD OR REMOVE LINES HERE
-STR_TRAIN_HAS_TOO_FEW_ORDERS                                    :{WHITE}Vlak {COMMA16} ma priliz malo prikazov
-STR_TRAIN_HAS_VOID_ORDER                                        :{WHITE}Vlak {COMMA16} ma prazdny prikaz
-STR_TRAIN_HAS_DUPLICATE_ENTRY                                   :{WHITE}Vlak {COMMA16} ma zdvojene prikazy
-STR_TRAIN_HAS_INVALID_ENTRY                                     :{WHITE}Vlak {COMMA16} ma neplatnu stanicu v prikazoch
-STR_ROADVEHICLE_HAS_TOO_FEW_ORDERS                              :{WHITE}Vozidlo {COMMA16} ma malo prikazov
-STR_ROADVEHICLE_HAS_VOID_ORDER                                  :{WHITE}Vozidlo {COMMA16} ma prazdny prikaz
-STR_ROADVEHICLE_HAS_DUPLICATE_ENTRY                             :{WHITE}Vozidlo {COMMA16} ma zdvojene prikazy
-STR_ROADVEHICLE_HAS_INVALID_ENTRY                               :{WHITE}Vozidlo {COMMA16} ma neplatnu stanicu v prikazoch
-STR_SHIP_HAS_TOO_FEW_ORDERS                                     :{WHITE}Lod {COMMA16} ma malo prikazov
-STR_SHIP_HAS_VOID_ORDER                                         :{WHITE}Lod {COMMA16} ma prazdny prikaz
-STR_SHIP_HAS_DUPLICATE_ENTRY                                    :{WHITE}Lod {COMMA16} ma zdvojene prikazy
-STR_SHIP_HAS_INVALID_ENTRY                                      :{WHITE}Lod {COMMA16} ma neplatnu stanicu v prikazoch
-STR_AIRCRAFT_HAS_TOO_FEW_ORDERS                                 :{WHITE}Lietadlo {COMMA16} ma malo prikazov
-STR_AIRCRAFT_HAS_VOID_ORDER                                     :{WHITE}Lietadlo {COMMA16} ma prazdny prikaz
-STR_AIRCRAFT_HAS_DUPLICATE_ENTRY                                :{WHITE}Lietadlo {COMMA16} ma zdvojene prikazy
-STR_AIRCRAFT_HAS_INVALID_ENTRY                                  :{WHITE}Lietadlo {COMMA16} ma neplatnu stanicu v prikazoch
+STR_TRAIN_HAS_TOO_FEW_ORDERS                                    :{WHITE}Vlak {COMMA} ma priliz malo prikazov
+STR_TRAIN_HAS_VOID_ORDER                                        :{WHITE}Vlak {COMMA} ma prazdny prikaz
+STR_TRAIN_HAS_DUPLICATE_ENTRY                                   :{WHITE}Vlak {COMMA} ma zdvojene prikazy
+STR_TRAIN_HAS_INVALID_ENTRY                                     :{WHITE}Vlak {COMMA} ma neplatnu stanicu v prikazoch
+STR_ROADVEHICLE_HAS_TOO_FEW_ORDERS                              :{WHITE}Vozidlo {COMMA} ma malo prikazov
+STR_ROADVEHICLE_HAS_VOID_ORDER                                  :{WHITE}Vozidlo {COMMA} ma prazdny prikaz
+STR_ROADVEHICLE_HAS_DUPLICATE_ENTRY                             :{WHITE}Vozidlo {COMMA} ma zdvojene prikazy
+STR_ROADVEHICLE_HAS_INVALID_ENTRY                               :{WHITE}Vozidlo {COMMA} ma neplatnu stanicu v prikazoch
+STR_SHIP_HAS_TOO_FEW_ORDERS                                     :{WHITE}Lod {COMMA} ma malo prikazov
+STR_SHIP_HAS_VOID_ORDER                                         :{WHITE}Lod {COMMA} ma prazdny prikaz
+STR_SHIP_HAS_DUPLICATE_ENTRY                                    :{WHITE}Lod {COMMA} ma zdvojene prikazy
+STR_SHIP_HAS_INVALID_ENTRY                                      :{WHITE}Lod {COMMA} ma neplatnu stanicu v prikazoch
+STR_AIRCRAFT_HAS_TOO_FEW_ORDERS                                 :{WHITE}Lietadlo {COMMA} ma malo prikazov
+STR_AIRCRAFT_HAS_VOID_ORDER                                     :{WHITE}Lietadlo {COMMA} ma prazdny prikaz
+STR_AIRCRAFT_HAS_DUPLICATE_ENTRY                                :{WHITE}Lietadlo {COMMA} ma zdvojene prikazy
+STR_AIRCRAFT_HAS_INVALID_ENTRY                                  :{WHITE}Lietadlo {COMMA} ma neplatnu stanicu v prikazoch
 # end of order system
 
-STR_TRAIN_AUTORENEW_FAILED                                      :{WHITE}Zlyhalo obnovenie vlaku {COMMA16} (finacny limit)
-STR_ROADVEHICLE_AUTORENEW_FAILED                                :{WHITE}Zlyhalo obnovenie automobilu {COMMA16} (finacny limit)
-STR_SHIP_AUTORENEW_FAILED                                       :{WHITE}Zlyhalo obnovenie lode {COMMA16} (financny limit)
-STR_AIRCRAFT_AUTORENEW_FAILED                                   :{WHITE}Zlyhalo obnovenie lietadla {COMMA16} (finacny limit)
+STR_TRAIN_AUTORENEW_FAILED                                      :{WHITE}Zlyhalo obnovenie vlaku {COMMA} (finacny limit)
+STR_ROADVEHICLE_AUTORENEW_FAILED                                :{WHITE}Zlyhalo obnovenie automobilu {COMMA} (finacny limit)
+STR_SHIP_AUTORENEW_FAILED                                       :{WHITE}Zlyhalo obnovenie lode {COMMA} (financny limit)
+STR_AIRCRAFT_AUTORENEW_FAILED                                   :{WHITE}Zlyhalo obnovenie lietadla {COMMA} (finacny limit)
 
 STR_CONFIG_PATCHES                                              :{BLACK}Konfigurovat Zaplaty
 STR_CONFIG_PATCHES_TIP                                          :{BLACK}Konfigurovat Zaplaty
@@ -1104,7 +1104,7 @@
 STR_CHEATS_TIP                                                  :{BLACK}Checkbox indikuje opakovane pouzite cheatu
 STR_CHEATS_WARNING                                              :{BLACK}Varovanie! Chcete podviest vasich protihracov. Tento podvod sa navzdy zapameta.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Zvysit hotovost o {CURRENCY64}
-STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Hrat ako hrac: {ORANGE}{COMMA16}
+STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Hrat ako hrac: {ORANGE}{COMMA}
 STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Magicky buldozer (odstrani priemysel, budovy): {ORANGE}{STRING}
 STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Tunely sa mozu navzajom krizit: {ORANGE}{STRING}
 STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Umoznit vystavbu v pauze: {ORANGE}{STRING}
@@ -1120,7 +1120,7 @@
 STR_GO_NON_STOP_TO_WAYPOINT                                     :Chod bez zastavky cez {WAYPOINT}
 
 STR_WAYPOINTNAME_CITY                                           :Smerovy bod {TOWN}
-STR_WAYPOINTNAME_CITY_SERIAL                                    :Smerovy bod {TOWN} #{COMMA16}
+STR_WAYPOINTNAME_CITY_SERIAL                                    :Smerovy bod {TOWN} #{COMMA}
 STR_LANDINFO_WAYPOINT                                           :Smerovy bod
 
 STR_WAYPOINT                                                    :{WHITE}Kontrolny bod
@@ -1203,8 +1203,8 @@
 STR_CONSTRUCT_SUGAR_MINE_TIP                                    :{BLACK}Postavit cukrovu banu
 
 STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Priemysel
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}){YELLOW} ({COMMA16}% prevezenych)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}/{STRING}){YELLOW} ({COMMA16}%/{COMMA16}% prenesenych)
+STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}){YELLOW} ({COMMA}% prevezenych)
+STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}/{STRING}){YELLOW} ({COMMA}%/{COMMA}% prenesenych)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{TOWN} {STRING}
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...prilis blizko ineho priemyslu
@@ -1244,15 +1244,15 @@
 STR_NETWORK_ADD_SERVER_TIP                                      :{BLACK}Prida server do zoznamu, v ktorom sa automaticky budu hladat beziace hry.
 STR_NETWORK_ENTER_IP                                            :{BLACK}Zadajte IP adresu serveru
 
-STR_NETWORK_CLIENTS_ONLINE                                      :{BLACK}{COMMA16}/{COMMA16}
+STR_NETWORK_CLIENTS_ONLINE                                      :{BLACK}{COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Klienti
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Klienti online / klienti max
 STR_NETWORK_GAME_INFO                                           :{SILVER}INFO O HRE
 STR_ORANGE                                                      :{ORANGE}{STRING}
-STR_NETWORK_CLIENTS                                             :{SILVER}Klienti:  {WHITE}{COMMA8} / {COMMA8}
+STR_NETWORK_CLIENTS                                             :{SILVER}Klienti:  {WHITE}{COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}Jazyk:  {WHITE}{STRING}
 STR_NETWORK_TILESET                                             :{SILVER}Prostredie:  {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Velkost mapy:  {WHITE}{COMMA16}x{COMMA16}
+STR_NETWORK_MAP_SIZE                                            :{SILVER}Velkost mapy:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Verzia servera:  {WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Adresa servera:  {WHITE}{STRING} : {NUMU16}
 STR_NETWORK_START_DATE                                          :{SILVER}Datum zaciatku:  {WHITE}{DATE_SHORT}
@@ -1517,21 +1517,21 @@
 
 ##id 0x2000
 STR_2000_TOWNS                                                  :{WHITE}Mesta
-STR_TOWN_LABEL_POP                                              :{WHITE}{STRING} ({COMMA32})
+STR_TOWN_LABEL_POP                                              :{WHITE}{STRING} ({COMMA})
 STR_2001                                                        :{WHITE}{STRING}
 STR_2002                                                        :{TINYFONT}{BLACK}{STRING}
 STR_2003                                                        :{TINYFONT}{WHITE}{STRING}
 STR_2004_BUILDING_MUST_BE_DEMOLISHED                            :{WHITE}Budova sa musi zburat
 STR_2005                                                        :{WHITE}{TOWN}
-STR_2006_POPULATION                                             :{BLACK}Obyvatelstvo: {ORANGE}{COMMA32}{BLACK}  Domov: {ORANGE}{COMMA32}
+STR_2006_POPULATION                                             :{BLACK}Obyvatelstvo: {ORANGE}{COMMA}{BLACK}  Domov: {ORANGE}{COMMA}
 STR_2007_RENAME_TOWN                                            :Premenovat mesto
 STR_2008_CAN_T_RENAME_TOWN                                      :{WHITE}Mesto nemoze byt odstranene...
 STR_2009_LOCAL_AUTHORITY_REFUSES                                :{WHITE}{TOWN} miestna sprava to nedovoli
 STR_200A_TOWN_NAMES_CLICK_ON_NAME                               :{BLACK}Nazvy miest - kliknut na meno pre pohlad na stred mesta
 STR_200B_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Pohlad na stred mesta
 STR_200C_CHANGE_TOWN_NAME                                       :{BLACK}Zmenit nazov mesta
-STR_200D_PASSENGERS_LAST_MONTH_MAX                              :{BLACK}Cestujuci posledny mesiac: {ORANGE}{COMMA32}{BLACK}  max: {ORANGE}{COMMA32}
-STR_200E_MAIL_LAST_MONTH_MAX                                    :{BLACK}Posta posledny mesiac: {ORANGE}{COMMA32}{BLACK}  max: {ORANGE}{COMMA32}
+STR_200D_PASSENGERS_LAST_MONTH_MAX                              :{BLACK}Cestujuci posledny mesiac: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
+STR_200E_MAIL_LAST_MONTH_MAX                                    :{BLACK}Posta posledny mesiac: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
 STR_200F_TALL_OFFICE_BLOCK                                      :Administrativa
 STR_2010_OFFICE_BLOCK                                           :Kancelaria
 STR_2011_SMALL_BLOCK_OF_FLATS                                   :Male byty
@@ -1605,7 +1605,7 @@
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Podplatit miestnu spravu pre zvysenie hodnotenia vasej spolocnosti, s rizikom tazkeho postihu ked sa to prevali!{}  Cost: {CURRENCY}
 STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}V meste {TOWN} zavladol dopravny chaos!{}{}Rekonstrukcia ciest financovana {STRING} prinesie 6 mesiacov utrpenia pre motoristov!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
-STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA32})
+STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA})
 STR_2058_UNDER_CONSTRUCTION                                     :{STRING} (v rekonstrukcii)
 STR_2059_IGLOO                                                  :Iglu
 STR_205A_TEPEES                                                 :Vigvam
@@ -1667,7 +1667,7 @@
 STR_303C_OUTSTANDING                                            :Perfektne
 ############ range for rating ends
 
-STR_303D                                                        :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA8}%)
+STR_303D                                                        :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_303E_NO_LONGER_ACCEPTS                                      :{WHITE}{STATION} uz neprijima {STRING}
 STR_303F_NO_LONGER_ACCEPTS_OR                                   :{WHITE}{STATION} uz neprijima {STRING} alebo {STRING}
 STR_3040_NOW_ACCEPTS                                            :{WHITE}{STATION} teraz prijima {STRING}
@@ -1678,7 +1678,7 @@
 STR_3045_TOO_CLOSE_TO_ANOTHER_TRUCK                             :{WHITE}Prilis blizko inej vykladky
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Zastavka musi byt najskor zburana
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Vykladka musi byt najskor zburana
-STR_3048_STATIONS                                               :{WHITE}{STRING} - {COMMA16} Stanice
+STR_3048_STATIONS                                               :{WHITE}{STRING} - {COMMA} Stanice
 STR_3049_0                                                      :{YELLOW}{STATION} {STRINL 0x30D1}
 STR_304A_NONE                                                   :{YELLOW}- Nie je -
 STR_304B_SITE_UNSUITABLE                                        :{WHITE}...miesto je nepouzitelne
@@ -1735,7 +1735,7 @@
 STR_4002_SAVE                                                   :{BLACK}Ulozit
 STR_4003_DELETE                                                 :{BLACK}Vymazat
 STR_4004                                                        :{STRING}, {DATE_LONG}
-STR_4005_BYTES_FREE                                             :{BLACK}{COMMA32} megabajtov volnych
+STR_4005_BYTES_FREE                                             :{BLACK}{COMMA} megabajtov volnych
 STR_4006_UNABLE_TO_READ_DRIVE                                   :{BLACK}Zariadenie je necitatelne
 STR_4007_GAME_SAVE_FAILED                                       :{WHITE}Ulozenie hry zlyhalo
 STR_4008_UNABLE_TO_DELETE_FILE                                  :{WHITE}Subor sa neda vymazat
@@ -1796,7 +1796,7 @@
 ############ range for requires	ends
 
 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Produkcia za posledny mesiac:
-STR_482B_TRANSPORTED                                            :{YELLOW}{STRING}{BLACK} ({COMMA16}% prepravene)
+STR_482B_TRANSPORTED                                            :{YELLOW}{STRING}{BLACK} ({COMMA}% prepravene)
 STR_482C_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Vycentrovanie pohladu na poziciu tovarne
 STR_482D_NEW_UNDER_CONSTRUCTION                                 :{BLACK}{BIGFONT}{STRING} sa zacina stavat nedaleko {TOWN}!
 STR_482E_NEW_BEING_PLANTED_NEAR                                 :{BLACK}{BIGFONT}{STRING} sa vysadza nedaleko {TOWN}!
@@ -1813,8 +1813,8 @@
 STR_4839_PRODUCTION_DOWN_BY_50                                  :{BLACK}{BIGFONT}{TOWN} {STRING} znizuje produkciu o 50%
 STR_483A_INSECT_INFESTATION_CAUSES                              :{BLACK}{BIGFONT}Premnozenie skodcov sposobilo znicenie urody pri {TOWN} {STRING}!{}Produkcia sa znizila o 50%
 STR_483B_CAN_ONLY_BE_POSITIONED                                 :{WHITE}...moze byt umiestnene len pri okraji mapy
-STR_INDUSTRY_PROD_GOUP                                          :{BLACK}{BIGFONT}{STRING} produkcia v {TOWN} {STRING} sa zvysuje o {COMMA16}%!
-STR_INDUSTRY_PROD_GODOWN                                        :{BLACK}{BIGFONT}{STRING} produkcia v {TOWN} {STRING} sa znizuje o {COMMA16}%!
+STR_INDUSTRY_PROD_GOUP                                          :{BLACK}{BIGFONT}{STRING} produkcia v {TOWN} {STRING} sa zvysuje o {COMMA}%!
+STR_INDUSTRY_PROD_GODOWN                                        :{BLACK}{BIGFONT}{STRING} produkcia v {TOWN} {STRING} sa znizuje o {COMMA}%!
 
 ##id 0x5000
 STR_5000_TRAIN_IN_TUNNEL                                        :{WHITE}Vlak v tuneli
@@ -1877,10 +1877,10 @@
 ##id 0x6000
 STR_SV_EMPTY                                                    :
 STR_SV_UNNAMED                                                  :Bez mena{SKIP}
-STR_SV_TRAIN_NAME                                               :Vlak {COMMA16}
-STR_SV_ROADVEH_NAME                                             :Automobil {COMMA16}
-STR_SV_SHIP_NAME                                                :Lod {COMMA16}
-STR_SV_AIRCRAFT_NAME                                            :Lietadlo {COMMA16}
+STR_SV_TRAIN_NAME                                               :Vlak {COMMA}
+STR_SV_ROADVEH_NAME                                             :Automobil {COMMA}
+STR_SV_SHIP_NAME                                                :Lod {COMMA}
+STR_SV_AIRCRAFT_NAME                                            :Lietadlo {COMMA}
 
 STR_SV_STNAME                                                   :{STRING}
 STR_SV_STNAME_NORTH                                             :{STRING} Sever
@@ -1930,12 +1930,12 @@
 ############ range for difficulty levels ends
 
 ############ range for difficulty settings starts
-STR_6805_MAXIMUM_NO_COMPETITORS                                 :{LTBLUE}Pocet konkurentov: {ORANGE}{COMMA16}
+STR_6805_MAXIMUM_NO_COMPETITORS                                 :{LTBLUE}Pocet konkurentov: {ORANGE}{COMMA}
 STR_6806_COMPETITOR_START_TIME                                  :{LTBLUE}Zaciatok konkurencie: {ORANGE}{STRING}
 STR_6807_NO_OF_TOWNS                                            :{LTBLUE}Pocet miest: {ORANGE}{STRING}
 STR_6808_NO_OF_INDUSTRIES                                       :{LTBLUE}Pocet priemyslu: {ORANGE}{STRING}
 STR_6809_MAXIMUM_INITIAL_LOAN_000                               :{LTBLUE}Maximalna prvotna pozicka: {ORANGE}{CURRENCY}
-STR_680A_INITIAL_INTEREST_RATE                                  :{LTBLUE}Pociatocny urok: {ORANGE}{COMMA16}%
+STR_680A_INITIAL_INTEREST_RATE                                  :{LTBLUE}Pociatocny urok: {ORANGE}{COMMA}%
 STR_680B_VEHICLE_RUNNING_COSTS                                  :{LTBLUE}Cena prevadzky vozidiel: {ORANGE}{STRING}
 STR_680C_CONSTRUCTION_SPEED_OF_COMPETITOR                       :{LTBLUE}Rychlost konkurencie: {ORANGE}{STRING}
 STR_680D_INTELLIGENCE_OF_COMPETITORS                            :{LTBLUE}Inteligencia konkurencie: {ORANGE}{STRING}
@@ -1994,7 +1994,7 @@
 ##id 0x7000
 STR_7000                                                        :
 STR_7001                                                        :{WHITE}{STRING} {BLACK}{STRING}
-STR_7002_PLAYER                                                 :(Hrac {COMMA16})
+STR_7002_PLAYER                                                 :(Hrac {COMMA})
 STR_7004_NEW_FACE                                               :{BLACK}Nova tvar
 STR_7005_COLOR_SCHEME                                           :{BLACK}Farebna schema
 STR_7006_COLOR_SCHEME                                           :{GOLD}Farebna schema:
@@ -2028,7 +2028,7 @@
 STR_7022_INCOME_GRAPH                                           :{WHITE}Graf zisku
 STR_CURRCOMPACT32                                               :{CURRCOMPACT}
 STR_CURRCOMPACT64                                               :{CURRCOMPACT64}
-STR_7024                                                        :{COMMA32}
+STR_7024                                                        :{COMMA}
 STR_7025_OPERATING_PROFIT_GRAPH                                 :{WHITE}Graf prevadzkoveho zisku
 STR_7026_BANK_BALANCE                                           :{WHITE}Zostatok v banke
 STR_7027_LOAN                                                   :{WHITE}Pozicka
@@ -2052,14 +2052,14 @@
 STR_7037_PRESIDENT                                              :{WHITE}{STRING}{}{GOLD}(Prezident)
 STR_7038_INAUGURATED                                            :{GOLD}Zvoleny: {WHITE}{NUMU16}
 STR_7039_VEHICLES                                               :{GOLD}Strojov:
-STR_703A_TRAIN                                                  :{WHITE}{COMMA16} vlak
-STR_703B_TRAINS                                                 :{WHITE}{COMMA16} vlakov
-STR_703C_ROAD_VEHICLE                                           :{WHITE}{COMMA16} automobil
-STR_703D_ROAD_VEHICLES                                          :{WHITE}{COMMA16} automobilov
-STR_703E_AIRCRAFT                                               :{WHITE}{COMMA16} lietadlo
-STR_703F_AIRCRAFT                                               :{WHITE}{COMMA16} lietadiel
-STR_7040_SHIP                                                   :{WHITE}{COMMA16} lod
-STR_7041_SHIPS                                                  :{WHITE}{COMMA16} lodi
+STR_703A_TRAIN                                                  :{WHITE}{COMMA} vlak
+STR_703B_TRAINS                                                 :{WHITE}{COMMA} vlakov
+STR_703C_ROAD_VEHICLE                                           :{WHITE}{COMMA} automobil
+STR_703D_ROAD_VEHICLES                                          :{WHITE}{COMMA} automobilov
+STR_703E_AIRCRAFT                                               :{WHITE}{COMMA} lietadlo
+STR_703F_AIRCRAFT                                               :{WHITE}{COMMA} lietadiel
+STR_7040_SHIP                                                   :{WHITE}{COMMA} lod
+STR_7041_SHIPS                                                  :{WHITE}{COMMA} lodi
 STR_7042_NONE                                                   :{WHITE}Ziadne
 STR_7043_FACE_SELECTION                                         :{WHITE}Vyber tvare
 STR_7044_MALE                                                   :{BLACK}Muz
@@ -2124,8 +2124,8 @@
 STR_707A_SELL_25_SHARE_IN_THIS_COMPANY                          :{BLACK}Predat 25% podiel v tejto spolocnosti
 STR_707B_CAN_T_BUY_25_SHARE_IN_THIS                             :{WHITE}25% podiel v tejto spolocnosti sa neda kupit...
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}25% podiel v tejto spolocnosti sa neda predat...
-STR_707D_OWNED_BY                                               :{WHITE}({COMMA16}% vlastnene {STRING})
-STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA16}% vlastnene {STRING}{}   {COMMA16}% vlastnene {STRING})
+STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% vlastnene {STRING})
+STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}% vlastnene {STRING}{}   {COMMA}% vlastnene {STRING})
 STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{STRING} bola kupena spolocnostou {STRING}!
 STR_7080_PROTECTED                                              :{WHITE}Tato spolocnost zatial neobchoduje s akciami...
 
@@ -2400,8 +2400,8 @@
 STR_8801_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Mesto oslavuje . . .{}Prvy vlak dorazil do stanice {STATION}!
 STR_8802_DETAILS                                                :{WHITE}{STRING} (Detaily)
 STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}Vlak v ceste
-STR_8804                                                        :{SETX 10}{COMMA8}: {STRING}
-STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA8}: {STRING}
+STR_8804                                                        :{SETX 10}{COMMA}: {STRING}
+STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING}
 STR_8806_GO_TO                                                  :Chod do {STATION}
 STR_8807_GO_TO_TRANSFER                                         :Chod do {STATION} (prelozit a nalozit iny naklad)
 STR_8808_GO_TO_UNLOAD                                           :Chod do {STATION} (vylozit)
@@ -2427,13 +2427,13 @@
 STR_UNKNOWN_DESTINATION                                         :neznamy ciel
 STR_8812_EMPTY                                                  :{LTBLUE}Prazdny
 STR_8813_FROM                                                   :{LTBLUE}{CARGO} z {STATION}
-STR_8814_TRAIN_IS_WAITING_IN_DEPOT                              :{WHITE}Vlak {COMMA16} caka v depe
+STR_8814_TRAIN_IS_WAITING_IN_DEPOT                              :{WHITE}Vlak {COMMA} caka v depe
 STR_8815_NEW_VEHICLES                                           :{BLACK}Nove vozidla
 STR_8816                                                        :{BLACK}-
 STR_8818_INFORMATION                                            :{BLACK}Informacie
 STR_8819_TRAIN_TOO_LONG                                         :{WHITE}Vlak je prilis dlhy
 STR_881A_TRAINS_CAN_ONLY_BE_ALTERED                             :{WHITE}Vlaky sa daju prerobit len v depe
-STR_881B_TRAINS                                                 :{WHITE}{STRING} - {COMMA16} Vlaky
+STR_881B_TRAINS                                                 :{WHITE}{STRING} - {COMMA} Vlaky
 STR_881C_NEW_RAIL_VEHICLES                                      :{WHITE}Nove vlaky
 STR_881D_NEW_MONORAIL_VEHICLES                                  :{WHITE}Nove jednokolajove vlaky
 STR_881E_NEW_MAGLEV_VEHICLES                                    :{WHITE}Nove magneticke vlaky
@@ -2467,8 +2467,8 @@
 STR_8839_CAN_T_SELL_RAILROAD_VEHICLE                            :{WHITE}Nemozno predat automobil...
 STR_883A_UNABLE_TO_FIND_ROUTE_TO                                :{WHITE}Nemoze najst cestu do depa
 STR_883B_CAN_T_STOP_START_TRAIN                                 :{WHITE}Nemozno zastavit/spustit vlak...
-STR_883C_SERVICING_INTERVAL_DAYS                                :{BLACK}Servisny interval: {LTBLUE}{COMMA16}dni{BLACK}   Posledny servis: {LTBLUE}{DATE_LONG}
-STR_SERVICING_INTERVAL_PERCENT                                  :{BLACK}Servisny interval: {LTBLUE}{COMMA16}%{BLACK}   Posledny servis bol: {LTBLUE}{DATE_LONG}
+STR_883C_SERVICING_INTERVAL_DAYS                                :{BLACK}Servisny interval: {LTBLUE}{COMMA}dni{BLACK}   Posledny servis: {LTBLUE}{DATE_LONG}
+STR_SERVICING_INTERVAL_PERCENT                                  :{BLACK}Servisny interval: {LTBLUE}{COMMA}%{BLACK}   Posledny servis bol: {LTBLUE}{DATE_LONG}
 STR_883D_TRAINS_CLICK_ON_TRAIN_FOR                              :{BLACK}Vlaky - kliknut na vlak pre informacie
 STR_883E_BUILD_NEW_TRAINS_REQUIRES                              :{BLACK}Vyrobit nove vlaky (potrebne depo)
 STR_883F_TRAINS_CLICK_ON_TRAIN_FOR                              :{BLACK}Vlaky - kliknut na vlak pre informacie, potiahni pre zmenu pozicie
@@ -2501,12 +2501,12 @@
 STR_SERVICE_HINT                                                :{BLACK}Vynechat tento prikaz pokial nieje potrebna oprava
 STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}Nove {STRING} je uz dostupne!
 STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
-STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Cena: {CURRENCY} Nosnost: {COMMA16}t{}Rychlost: {VELOCITY}  Vykon: {COMMA16}hp{}Cena prevadzky: {CURRENCY}/rok{}Kapacita: {STRING}
+STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Cena: {CURRENCY} Nosnost: {COMMA}t{}Rychlost: {VELOCITY}  Vykon: {COMMA}hp{}Cena prevadzky: {CURRENCY}/rok{}Kapacita: {STRING}
 STR_885C_BROKEN_DOWN                                            :{RED}Pokazene
 STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Vek: {LTBLUE}{STRING}{BLACK}   Cena prevadzky: {LTBLUE}{CURRENCY}/rok
-STR_885E_WEIGHT_T_POWER_HP_MAX_SPEED                            :{BLACK}Nosnost: {LTBLUE}{COMMA16}t  {BLACK}Vykon: {LTBLUE}{COMMA32}hp{BLACK} Max. Rychlost: {LTBLUE}{VELOCITY}
+STR_885E_WEIGHT_T_POWER_HP_MAX_SPEED                            :{BLACK}Nosnost: {LTBLUE}{COMMA}t  {BLACK}Vykon: {LTBLUE}{COMMA}hp{BLACK} Max. Rychlost: {LTBLUE}{VELOCITY}
 STR_885F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Zisk tento rok: {LTBLUE}{CURRENCY}  (predchadzajuci rok: {CURRENCY})
-STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Spolahlivost: {LTBLUE}{COMMA8}%  {BLACK}Pokazene od posledneho servisu: {LTBLUE}{COMMA16}
+STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Spolahlivost: {LTBLUE}{COMMA}%  {BLACK}Pokazene od posledneho servisu: {LTBLUE}{COMMA}
 STR_8861_STOPPED                                                :{RED}Zastavene
 STR_8862_CAN_T_MAKE_TRAIN_PASS_SIGNAL                           :{WHITE}Nemozno pustit vlak na cervenu ked hrozi nebezpecenstvo...
 STR_8863_CRASHED                                                :{RED}Havaroval!
@@ -2514,7 +2514,7 @@
 STR_8865_NAME_TRAIN                                             :{WHITE}Pomenovat vlak
 STR_8866_CAN_T_NAME_TRAIN                                       :{WHITE}Vlak nemozno pomenovat...
 STR_8867_NAME_TRAIN                                             :{BLACK}Pomenovat vlak
-STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Vlak havaroval!{}{COMMA16} mrtvych pri poziari po kolizii
+STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Vlak havaroval!{}{COMMA} mrtvych pri poziari po kolizii
 STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}Nemozno zmenit smer vlaku...
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Premenovat typ vlaku
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Typ vlaku nemoze byt premenovany...
@@ -2526,7 +2526,7 @@
 
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Automobil v ceste
-STR_9001_ROAD_VEHICLES                                          :{WHITE}{STRING} - {COMMA16} Automobily
+STR_9001_ROAD_VEHICLES                                          :{WHITE}{STRING} - {COMMA} Automobily
 STR_9002                                                        :{WHITE}{STRING}
 STR_9003_ROAD_VEHICLE_DEPOT                                     :{WHITE}{TOWN} Garaz
 STR_9004_NEW_VEHICLES                                           :{BLACK}Nove vozidla
@@ -2540,13 +2540,13 @@
 STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Vek: {LTBLUE}{STRING}{BLACK}   Cena prevadzky: {LTBLUE}{CURRENCY}/rok
 STR_900E_MAX_SPEED                                              :{BLACK}Max. Rychlost: {LTBLUE}{VELOCITY}
 STR_900F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Zisk tento rok: {LTBLUE}{CURRENCY}  (posledny rok: {CURRENCY})
-STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Spolahlivost: {LTBLUE}{COMMA8}%  {BLACK}Pokazene od posledneho servisu: {LTBLUE}{COMMA16}
+STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Spolahlivost: {LTBLUE}{COMMA}%  {BLACK}Pokazene od posledneho servisu: {LTBLUE}{COMMA}
 STR_9011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Vyrobene: {LTBLUE}{NUMU16}{BLACK} Cena: {LTBLUE}{CURRENCY}
 STR_9012_CAPACITY                                               :{BLACK}Kapacita: {LTBLUE}{STRING}
 STR_9013_MUST_BE_STOPPED_INSIDE                                 :{WHITE}...musi byt zastaveny v garazi
 STR_9014_CAN_T_SELL_ROAD_VEHICLE                                :{WHITE}Nemozno predat automobil...
 STR_9015_CAN_T_STOP_START_ROAD_VEHICLE                          :{WHITE}Nemozno zastavit/spustit automobil...
-STR_9016_ROAD_VEHICLE_IS_WAITING                                :{WHITE}Automobil {COMMA16} caka v garazi
+STR_9016_ROAD_VEHICLE_IS_WAITING                                :{WHITE}Automobil {COMMA} caka v garazi
 STR_HEADING_FOR_ROAD_DEPOT                                      :{LTBLUE}Smeruje do {TOWN} garaze
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{LTBLUE}smeruje do {TOWN} garaze, {VELOCITY}
 STR_9018_CAN_T_SEND_VEHICLE_TO_DEPOT                            :{WHITE}Nemozno poslat automobil do garaze...
@@ -2575,7 +2575,7 @@
 STR_902F_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Mesto oslavuje . . .{}Prvy autobus dorazil do {STATION}!
 STR_9030_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Mesto oslavuje . . .{}Prvy automobil dorazil do {STATION}!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Automobilova havaria!{}Vodic zomrel po kolozii s vlakom
-STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Automobilova havaria!{}{COMMA16} zomrel po kolozii s vlakom
+STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Automobilova havaria!{}{COMMA} zomrel po kolozii s vlakom
 STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}Nemozno otocit vozidlo...
 STR_9034_RENAME                                                 :{BLACK}Premenovat
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Premenovat typ automobilu
@@ -2590,7 +2590,7 @@
 STR_9802_CAN_T_BUILD_DOCK_HERE                                  :{WHITE}Tu nemozno postavit dok...
 STR_9803_SHIP_DEPOT                                             :{WHITE}{TOWN} Lodenica
 STR_9804_NEW_SHIPS                                              :{BLACK}Nove lode
-STR_9805_SHIPS                                                  :{WHITE}{STRING} - {COMMA16} Lode
+STR_9805_SHIPS                                                  :{WHITE}{STRING} - {COMMA} Lode
 STR_9806_CAN_T_BUILD_SHIPS                                      :{WHITE}Nemozno vyrobit lode...
 STR_9807_MUST_BUILD_SHIP_DEPOT_FIRST                            :{WHITE}Najskor musi byt postavena lodenica
 STR_9808_NEW_SHIPS                                              :{WHITE}Nove lode
@@ -2605,7 +2605,7 @@
 STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Vek: {LTBLUE}{STRING}{BLACK}   Cena prevadzky: {LTBLUE}{CURRENCY}/rok
 STR_9813_MAX_SPEED                                              :{BLACK}Max. rychlost: {LTBLUE}{VELOCITY}
 STR_9814_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Zisk tento rok: {LTBLUE}{CURRENCY}  (posledny rok: {CURRENCY})
-STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Spolahlivost: {LTBLUE}{COMMA8}%  {BLACK}Pokazene od posledneho servisu: {LTBLUE}{COMMA16}
+STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Spolahlivost: {LTBLUE}{COMMA}%  {BLACK}Pokazene od posledneho servisu: {LTBLUE}{COMMA}
 STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Vyrobene: {LTBLUE}{NUMU16}{BLACK} Hodnota: {LTBLUE}{CURRENCY}
 STR_9817_CAPACITY                                               :{BLACK}Kapacita: {LTBLUE}{STRING}
 STR_9818_CAN_T_STOP_START_SHIP                                  :{WHITE}Nemozno zastavit/spustit lod...
@@ -2613,7 +2613,7 @@
 STR_981A_UNABLE_TO_FIND_LOCAL_DEPOT                             :{WHITE}Nemozno najst miestnu lodenicu
 STR_HEADING_FOR_SHIP_DEPOT                                      :{LTBLUE}Smeruje do {TOWN} lodenice
 STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{LTBLUE}Smeruje do {TOWN} lodenice, {VELOCITY}
-STR_981C_SHIP_IS_WAITING_IN_DEPOT                               :{WHITE}Lod {COMMA16} caka v lodenici
+STR_981C_SHIP_IS_WAITING_IN_DEPOT                               :{WHITE}Lod {COMMA} caka v lodenici
 STR_981D_BUILD_SHIP_DOCK                                        :{BLACK}Postavit lodenicu
 STR_981E_BUILD_SHIP_DEPOT_FOR_BUILDING                          :{BLACK}Postavit lodenicu (pre vyrobu a opravy lodi)
 STR_981F_SHIPS_CLICK_ON_SHIP_FOR                                :{BLACK}Lode - kliknut pre informacie
@@ -2664,19 +2664,19 @@
 STR_A005_NEW_AIRCRAFT                                           :{WHITE}Nove Lietadlo
 STR_A006_BUILD_AIRCRAFT                                         :{BLACK}Vyrobit lietadlo
 STR_A008_CAN_T_BUILD_AIRCRAFT                                   :{WHITE}Nemozno vyrobit lietadlo...
-STR_A009_AIRCRAFT                                               :{WHITE}{STRING} - {COMMA16} Lietadlo
+STR_A009_AIRCRAFT                                               :{WHITE}{STRING} - {COMMA} Lietadlo
 STR_A00A                                                        :{WHITE}{STRING}
 STR_A00B_ORDERS                                                 :{WHITE}{STRING} (Prikazy)
 STR_A00C_DETAILS                                                :{WHITE}{STRING} (Detaily)
 STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Vek: {LTBLUE}{STRING}{BLACK}   Cena prevadzky: {LTBLUE}{CURRENCY}/rok
 STR_A00E_MAX_SPEED                                              :{BLACK}Max. Rychlost: {LTBLUE}{VELOCITY}
 STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Zisk tento rok: {LTBLUE}{CURRENCY}  (posledny rok: {CURRENCY})
-STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Spolahlivost: {LTBLUE}{COMMA8}%  {BLACK}Pokazene od posledneho servisu: {LTBLUE}{COMMA16}
+STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Spolahlivost: {LTBLUE}{COMMA}%  {BLACK}Pokazene od posledneho servisu: {LTBLUE}{COMMA}
 STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Vyrobene: {LTBLUE}{NUMU16}{BLACK} Hodnota: {LTBLUE}{CURRENCY}
 STR_A012_CAN_T_SEND_AIRCRAFT_TO                                 :{WHITE}Nemozno poslat lietadlo do hangaru...
 STR_HEADING_FOR_HANGAR                                          :{LTBLUE}Smeruje do {STATION} hangaru
 STR_HEADING_FOR_HANGAR_VEL                                      :{LTBLUE}Smeruje do {STATION} hangaru, {VELOCITY}
-STR_A014_AIRCRAFT_IS_WAITING_IN                                 :{WHITE}Lietadlo {COMMA16} caka v hangare
+STR_A014_AIRCRAFT_IS_WAITING_IN                                 :{WHITE}Lietadlo {COMMA} caka v hangare
 STR_A015_AIRCRAFT_IN_THE_WAY                                    :{WHITE}Lietadlo na ceste
 STR_A016_CAN_T_STOP_START_AIRCRAFT                              :{WHITE}Nemozno zastavit/spustit lietadlo
 STR_A017_AIRCRAFT_IS_IN_FLIGHT                                  :{WHITE}Lietadlo leti
@@ -2702,14 +2702,14 @@
 STR_A02B_SHOW_AIRCRAFT_DETAILS                                  :{BLACK}Zobrazit detaily o lietadle
 STR_A02C_NEW_AIRCRAFT_NOW_AVAILABLE                             :{BLACK}{BIGFONT}Nove lietadlo dostupne!
 STR_A02D                                                        :{BLACK}{BIGFONT}{STRING}
-STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Cena: {CURRENCY} Max. rychlost: {VELOCITY}{}Kapacita: {COMMA16} cestujucich, {COMMA16} balikov posty{}Cena prevadzky: {CURRENCY}/rok
+STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Cena: {CURRENCY} Max. rychlost: {VELOCITY}{}Kapacita: {COMMA} cestujucich, {COMMA} balikov posty{}Cena prevadzky: {CURRENCY}/rok
 
 STR_A030_NAME_AIRCRAFT                                          :{WHITE}Pomenovat lietadlo
 STR_A031_CAN_T_NAME_AIRCRAFT                                    :{WHITE}Nemozno pomenovat lietadlo...
 STR_A032_NAME_AIRCRAFT                                          :{BLACK}Pomenovat lietadlo
 STR_A033_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Mesto oslavuje . . .{}Prve lietadlo pristalo na {STATION}!
-STR_A034_PLANE_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Letecka havaria!{}{COMMA16} mrtvych pri poziari na {STATION}
-STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Letecka havaria!{}Lietadlu doslo palivo, {COMMA16} mrtvych pri poziari!
+STR_A034_PLANE_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Letecka havaria!{}{COMMA} mrtvych pri poziari na {STATION}
+STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Letecka havaria!{}Lietadlu doslo palivo, {COMMA} mrtvych pri poziari!
 STR_A035_DESTINATIONS                                           :{TINYFONT}{BLACK}Ciele:
 STR_A036                                                        :{TINYFONT}{BLACK}{STATION}
 STR_A037_RENAME                                                 :{BLACK}Premenovat
@@ -2735,7 +2735,7 @@
 STR_B003_FACTORY_DESTROYED_IN_SUSPICIOUS                        :{BLACK}{BIGFONT}Za nejasnych okolnost bola znicena tovaren nedaleko {TOWN}!
 STR_B004_UFO_LANDS_NEAR                                         :{BLACK}{BIGFONT}'UFO' pristalo nedaleko {TOWN}!
 STR_B005_COAL_MINE_SUBSIDENCE_LEAVES                            :{BLACK}{BIGFONT}Zaval v uholnej bani nedaleko {TOWN}!
-STR_B006_FLOOD_VEHICLE_DESTROYED                                :{BLACK}{BIGFONT}Povoden!{}Najmenej {COMMA16} ludi je nezvestnych alebo mrtvych po strasnych zaplavach!
+STR_B006_FLOOD_VEHICLE_DESTROYED                                :{BLACK}{BIGFONT}Povoden!{}Najmenej {COMMA} ludi je nezvestnych alebo mrtvych po strasnych zaplavach!
 
 STR_BRIBE_FAILED                                                :{WHITE}Vas pokus o uplatok bol odhaleny
 STR_BRIBE_FAILED_2                                              :{WHITE}miestnym vysetrovatelom.
@@ -2745,7 +2745,7 @@
 STR_PERFORMANCE_DETAIL                                          :{WHITE}Podrobne hodnotenie vykonu
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Podrobne
 STR_PERFORMANCE_DETAIL_AMOUNT_CURRENCY                          :{BLACK}({CURRCOMPACT}/{CURRCOMPACT})
-STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA32}/{COMMA32})
+STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA}/{COMMA})
 STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{INT32}%
 SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{INT32}
 ############ Those following lines need to be in this order!!
@@ -2780,7 +2780,7 @@
 STR_NEWGRF_GRF_ID                                               :{BLACK}ID GRF:
 
 STR_CURRENCY_WINDOW                                             :{WHITE}Vlastna mena
-STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Kurz meny: {ORANGE}{CURRENCY} = {POUNDSIGN} {COMMA16}
+STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Kurz meny: {ORANGE}{CURRENCY} = {POUNDSIGN} {COMMA}
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Oddelovac:
 STR_CURRENCY_PREFIX                                             :{LTBLUE}Predpona:
 STR_CURRENCY_SUFFIX                                             :{LTBLUE}Pripona:
@@ -2794,10 +2794,10 @@
 STR_PLANE                                                       :{BLACK}{PLANE}
 STR_SHIP                                                        :{BLACK}{SHIP}
 
-STR_SCHEDULED_TRAINS                                            :{WHITE}{STATION} - {COMMA16} Vlaky
-STR_SCHEDULED_ROAD_VEHICLES                                     :{WHITE}{STATION} - {COMMA16} Auta
-STR_SCHEDULED_AIRCRAFT                                          :{WHITE}{STATION} - {COMMA16} Lietadla
-STR_SCHEDULED_SHIPS                                             :{WHITE}{STATION} - {COMMA16} Lode
+STR_SCHEDULED_TRAINS                                            :{WHITE}{STATION} - {COMMA} Vlaky
+STR_SCHEDULED_ROAD_VEHICLES                                     :{WHITE}{STATION} - {COMMA} Auta
+STR_SCHEDULED_AIRCRAFT                                          :{WHITE}{STATION} - {COMMA} Lietadla
+STR_SCHEDULED_SHIPS                                             :{WHITE}{STATION} - {COMMA} Lode
 
 STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Zobrazit vsetky vlaky, ktore maju tuto stanicu v cestovnom poriadku
 STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Zobrazit vsetky auta, ktore maju tuto stanicu v cestovnom poriadku
@@ -2819,7 +2819,7 @@
 STR_REPLACE_HELP                                                :{BLACK}Umoznuje vybrat typ lokomotivy, ktory automaticky sa zameni za iny typ, ak vlaky s takouto lokomotivou sa zastavia v depe
 
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
-STR_SIGN_LIST_CAPTION                                           :{WHITE}Zoznam popisov - {COMMA16} popisov
+STR_SIGN_LIST_CAPTION                                           :{WHITE}Zoznam popisov - {COMMA} popisov
 
 ############ Lists rail types
 
@@ -2829,16 +2829,16 @@
 
 ############ End of list of rail types
 
-STR_TINY_BLACK                                                  :{BLACK}{TINYFONT}{COMMA16}
+STR_TINY_BLACK                                                  :{BLACK}{TINYFONT}{COMMA}
 
-STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Cena: {GOLD}{CURRENCY}{BLACK} Hmotnost: {GOLD}{COMMA16}t
-STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Rychlost: {GOLD}{VELOCITY}{BLACK}   Vykon: {GOLD}{COMMA32}hp
+STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Cena: {GOLD}{CURRENCY}{BLACK} Hmotnost: {GOLD}{COMMA}t
+STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Rychlost: {GOLD}{VELOCITY}{BLACK}   Vykon: {GOLD}{COMMA}hp
 STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}Cena prevadzky: {GOLD}{CURRENCY}/yr
 STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Kapacita: {GOLD}{STRING} {STRING}
-STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Vyrobene: {GOLD}{NUMU16}{BLACK} Zivotnost: {GOLD}{COMMA16} rokov
-STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Max. spolahlivost: {GOLD}{COMMA8}%
+STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Vyrobene: {GOLD}{NUMU16}{BLACK} Zivotnost: {GOLD}{COMMA} rokov
+STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Max. spolahlivost: {GOLD}{COMMA}%
 STR_PURCHASE_INFO_COST                                          :{BLACK}Cena: {GOLD}{CURRENCY}
-STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Hmotnost: {GOLD}{COMMA16}t  ({COMMA16}t)
+STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Hmotnost: {GOLD}{COMMA}t  ({COMMA}t)
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Cena: {GOLD}{CURRENCY}{BLACK} Rychlost: {GOLD}{VELOCITY}
-STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Kapacita: {GOLD}{COMMA16} cestujucich, {COMMA16} balikov posty
-STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Pohanane vagony: {GOLD}+{COMMA16}hp{BLACK} Hmotnost: {GOLD}+{COMMA8}t
+STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Kapacita: {GOLD}{COMMA} cestujucich, {COMMA} balikov posty
+STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Pohanane vagony: {GOLD}+{COMMA}hp{BLACK} Hmotnost: {GOLD}+{COMMA}t
--- a/lang/spanish.txt	Thu Jul 14 09:53:52 2005 +0000
+++ b/lang/spanish.txt	Thu Jul 14 15:10:20 2005 +0000
@@ -82,69 +82,69 @@
 STR_004C_PLASTIC                                                :Plástico
 STR_004D_FIZZY_DRINK                                            :Refresco
 STR_004E                                                        :
-STR_004F_PASSENGER                                              :{COMMA16} pasajero
-STR_0050_TON_OF_COAL                                            :{COMMA16} tonelada de carbón
-STR_0051_BAG_OF_MAIL                                            :{COMMA16} saca de correo
+STR_004F_PASSENGER                                              :{COMMA} pasajero
+STR_0050_TON_OF_COAL                                            :{COMMA} tonelada de carbón
+STR_0051_BAG_OF_MAIL                                            :{COMMA} saca de correo
 STR_0052_OF_OIL                                                 :{VOLUME} de petróleo
-STR_0053_ITEM_OF_LIVESTOCK                                      :{COMMA16} cabeza de ganado
-STR_0054_CRATE_OF_GOODS                                         :{COMMA16} caja de mercancía
-STR_0055_TON_OF_GRAIN                                           :{COMMA16} tonelada de grano
-STR_0056_TON_OF_WOOD                                            :{COMMA16} tonelada de madera
-STR_0057_TON_OF_IRON_ORE                                        :{COMMA16} tonelada de mineral de hierro
-STR_0058_TON_OF_STEEL                                           :{COMMA16} tonelada de acero
-STR_0059_BAG_OF_VALUABLES                                       :{COMMA16} bolsa de objetos de valor
-STR_005A_TON_OF_COPPER_ORE                                      :{COMMA16} tonelada de mineral de cobre
-STR_005B_TON_OF_MAIZE                                           :{COMMA16} tonelada de maíz
-STR_005C_TON_OF_FRUIT                                           :{COMMA16} tonelada de fruta
-STR_005D_BAG_OF_DIAMONDS                                        :{COMMA16} bolsa de diamantes
-STR_005E_TON_OF_FOOD                                            :{COMMA16} tonelada de alimento
-STR_005F_TON_OF_PAPER                                           :{COMMA16} tonelada de papel
-STR_0060_BAG_OF_GOLD                                            :{COMMA16} bolsa de oro
+STR_0053_ITEM_OF_LIVESTOCK                                      :{COMMA} cabeza de ganado
+STR_0054_CRATE_OF_GOODS                                         :{COMMA} caja de mercancía
+STR_0055_TON_OF_GRAIN                                           :{COMMA} tonelada de grano
+STR_0056_TON_OF_WOOD                                            :{COMMA} tonelada de madera
+STR_0057_TON_OF_IRON_ORE                                        :{COMMA} tonelada de mineral de hierro
+STR_0058_TON_OF_STEEL                                           :{COMMA} tonelada de acero
+STR_0059_BAG_OF_VALUABLES                                       :{COMMA} bolsa de objetos de valor
+STR_005A_TON_OF_COPPER_ORE                                      :{COMMA} tonelada de mineral de cobre
+STR_005B_TON_OF_MAIZE                                           :{COMMA} tonelada de maíz
+STR_005C_TON_OF_FRUIT                                           :{COMMA} tonelada de fruta
+STR_005D_BAG_OF_DIAMONDS                                        :{COMMA} bolsa de diamantes
+STR_005E_TON_OF_FOOD                                            :{COMMA} tonelada de alimento
+STR_005F_TON_OF_PAPER                                           :{COMMA} tonelada de papel
+STR_0060_BAG_OF_GOLD                                            :{COMMA} bolsa de oro
 STR_0061_OF_WATER                                               :{VOLUME} de agua
-STR_0062_TON_OF_WHEAT                                           :{COMMA16} tonelada de trigo
+STR_0062_TON_OF_WHEAT                                           :{COMMA} tonelada de trigo
 STR_0063_OF_RUBBER                                              :{VOLUME} de caucho
-STR_0064_TON_OF_SUGAR                                           :{COMMA16} tonelada de azucar
-STR_0065_TOY                                                    :{COMMA16} juguete
-STR_0066_BAG_OF_CANDY                                           :{COMMA16} bolsa de dulces
+STR_0064_TON_OF_SUGAR                                           :{COMMA} tonelada de azucar
+STR_0065_TOY                                                    :{COMMA} juguete
+STR_0066_BAG_OF_CANDY                                           :{COMMA} bolsa de dulces
 STR_0067_OF_COLA                                                :{VOLUME} de cola
-STR_0068_TON_OF_COTTON_CANDY                                    :{COMMA16} tonelada de algodón de azúcar
-STR_0069_BUBBLE                                                 :{COMMA16} burbuja
-STR_006A_TON_OF_TOFFEE                                          :{COMMA16} tonelada de caramelo
-STR_006B_BATTERY                                                :{COMMA16} pila
+STR_0068_TON_OF_COTTON_CANDY                                    :{COMMA} tonelada de algodón de azúcar
+STR_0069_BUBBLE                                                 :{COMMA} burbuja
+STR_006A_TON_OF_TOFFEE                                          :{COMMA} tonelada de caramelo
+STR_006B_BATTERY                                                :{COMMA} pila
 STR_006C_OF_PLASTIC                                             :{VOLUME} de plástico
-STR_006D_FIZZY_DRINK                                            :{COMMA16} refresco
+STR_006D_FIZZY_DRINK                                            :{COMMA} refresco
 STR_006E                                                        :
-STR_006F_PASSENGERS                                             :{COMMA16} pasajeros
-STR_0070_TONS_OF_COAL                                           :{COMMA16} toneladas de carbón
-STR_0071_BAGS_OF_MAIL                                           :{COMMA16} sacas de correo
+STR_006F_PASSENGERS                                             :{COMMA} pasajeros
+STR_0070_TONS_OF_COAL                                           :{COMMA} toneladas de carbón
+STR_0071_BAGS_OF_MAIL                                           :{COMMA} sacas de correo
 STR_0072_OF_OIL                                                 :{VOLUME} de petróleo
-STR_0073_ITEMS_OF_LIVESTOCK                                     :{COMMA16} cabezas de ganado
-STR_0074_CRATES_OF_GOODS                                        :{COMMA16} cajas de mercancías
-STR_0075_TONS_OF_GRAIN                                          :{COMMA16} toneladas de grano
-STR_0076_TONS_OF_WOOD                                           :{COMMA16} toneladas de madera
-STR_0077_TONS_OF_IRON_ORE                                       :{COMMA16} toneladas de mineral de hierro
-STR_0078_TONS_OF_STEEL                                          :{COMMA16} toneladas de acero
-STR_0079_BAGS_OF_VALUABLES                                      :{COMMA16} bolsas de objetos de valor
-STR_007A_TONS_OF_COPPER_ORE                                     :{COMMA16} toneladas de mineral de cobre
-STR_007B_TONS_OF_MAIZE                                          :{COMMA16} toneladas de maíz
-STR_007C_TONS_OF_FRUIT                                          :{COMMA16} toneladas de fruta
-STR_007D_BAGS_OF_DIAMONDS                                       :{COMMA16} bolsas de diamantes
-STR_007E_TONS_OF_FOOD                                           :{COMMA16} toneladas de alimento
-STR_007F_TONS_OF_PAPER                                          :{COMMA16} toneladas de papel
-STR_0080_BAGS_OF_GOLD                                           :{COMMA16} bolsas de oro
+STR_0073_ITEMS_OF_LIVESTOCK                                     :{COMMA} cabezas de ganado
+STR_0074_CRATES_OF_GOODS                                        :{COMMA} cajas de mercancías
+STR_0075_TONS_OF_GRAIN                                          :{COMMA} toneladas de grano
+STR_0076_TONS_OF_WOOD                                           :{COMMA} toneladas de madera
+STR_0077_TONS_OF_IRON_ORE                                       :{COMMA} toneladas de mineral de hierro
+STR_0078_TONS_OF_STEEL                                          :{COMMA} toneladas de acero
+STR_0079_BAGS_OF_VALUABLES                                      :{COMMA} bolsas de objetos de valor
+STR_007A_TONS_OF_COPPER_ORE                                     :{COMMA} toneladas de mineral de cobre
+STR_007B_TONS_OF_MAIZE                                          :{COMMA} toneladas de maíz
+STR_007C_TONS_OF_FRUIT                                          :{COMMA} toneladas de fruta
+STR_007D_BAGS_OF_DIAMONDS                                       :{COMMA} bolsas de diamantes
+STR_007E_TONS_OF_FOOD                                           :{COMMA} toneladas de alimento
+STR_007F_TONS_OF_PAPER                                          :{COMMA} toneladas de papel
+STR_0080_BAGS_OF_GOLD                                           :{COMMA} bolsas de oro
 STR_0081_OF_WATER                                               :{VOLUME} de agua
-STR_0082_TONS_OF_WHEAT                                          :{COMMA16} toneladas de trigo
+STR_0082_TONS_OF_WHEAT                                          :{COMMA} toneladas de trigo
 STR_0083_OF_RUBBER                                              :{VOLUME} de caucho
-STR_0084_TONS_OF_SUGAR                                          :{COMMA16} toneladas de azúcar
-STR_0085_TOYS                                                   :{COMMA16} juguetes
-STR_0086_BAGS_OF_CANDY                                          :{COMMA16} bolsas de dulces
+STR_0084_TONS_OF_SUGAR                                          :{COMMA} toneladas de azúcar
+STR_0085_TOYS                                                   :{COMMA} juguetes
+STR_0086_BAGS_OF_CANDY                                          :{COMMA} bolsas de dulces
 STR_0087_OF_COLA                                                :{VOLUME} de cola
-STR_0088_TONS_OF_COTTON_CANDY                                   :{COMMA16} toneladas de algodón de azúcar
-STR_0089_BUBBLES                                                :{COMMA16} burbujas
-STR_008A_TONS_OF_TOFFEE                                         :{COMMA16} toneladas de caramelos
-STR_008B_BATTERIES                                              :{COMMA16} pilas
+STR_0088_TONS_OF_COTTON_CANDY                                   :{COMMA} toneladas de algodón de azúcar
+STR_0089_BUBBLES                                                :{COMMA} burbujas
+STR_008A_TONS_OF_TOFFEE                                         :{COMMA} toneladas de caramelos
+STR_008B_BATTERIES                                              :{COMMA} pilas
 STR_008C_OF_PLASTIC                                             :{VOLUME} de plástico
-STR_008D_FIZZY_DRINKS                                           :{COMMA16} refrescos
+STR_008D_FIZZY_DRINKS                                           :{COMMA} refrescos
 STR_008E                                                        :
 STR_008F_PS                                                     :{TINYFONT}PS
 STR_0090_CL                                                     :{TINYFONT}CL
@@ -219,8 +219,8 @@
 STR_00DF_GREY                                                   :Gris
 STR_00E0_WHITE                                                  :Blanco
 STR_00E1_TOO_MANY_VEHICLES_IN_GAME                              :{WHITE}Demasiados vehículos en el juego
-STR_00E2                                                        :{BLACK}{COMMA16}
-STR_00E3                                                        :{RED}{COMMA16}
+STR_00E2                                                        :{BLACK}{COMMA}
+STR_00E3                                                        :{RED}{COMMA}
 STR_00E4_LOCATION                                               :{BLACK}Sitio
 STR_00E5_CONTOURS                                               :Contornos
 STR_00E6_VEHICLES                                               :Vehículos
@@ -441,18 +441,18 @@
 STR_0198_PROFIT_THIS_YEAR_LAST_YEAR                             :{TINYFONT}{BLACK}Benefício este año: {CURRENCY} (año anterior: {CURRENCY})
 
 ############ range for service numbers starts
-STR_0199_YEAR                                                   :{COMMA16} año ({COMMA16})
-STR_019A_YEARS                                                  :{COMMA16} años ({COMMA16})
-STR_019B_YEARS                                                  :{RED}{COMMA16} años ({COMMA16})
+STR_0199_YEAR                                                   :{COMMA} año ({COMMA})
+STR_019A_YEARS                                                  :{COMMA} años ({COMMA})
+STR_019B_YEARS                                                  :{RED}{COMMA} años ({COMMA})
 ############ range for service numbers ends
 
 STR_019C_ROAD_VEHICLE                                           :Vehículo de carretera
 STR_019D_AIRCRAFT                                               :Aeronave
 STR_019E_SHIP                                                   :Barco
 STR_019F_TRAIN                                                  :Tren
-STR_01A0_IS_GETTING_OLD                                         :{WHITE}{STRING} {COMMA16} se está volviendo viejo
-STR_01A1_IS_GETTING_VERY_OLD                                    :{WHITE}{STRING} {COMMA16} se está volviendo muy viejo
-STR_01A2_IS_GETTING_VERY_OLD_AND                                :{WHITE}{STRING} {COMMA16} se está volviendo demasiado viejo y requiere de ser reemplazado urgentemente
+STR_01A0_IS_GETTING_OLD                                         :{WHITE}{STRING} {COMMA} se está volviendo viejo
+STR_01A1_IS_GETTING_VERY_OLD                                    :{WHITE}{STRING} {COMMA} se está volviendo muy viejo
+STR_01A2_IS_GETTING_VERY_OLD_AND                                :{WHITE}{STRING} {COMMA} se está volviendo demasiado viejo y requiere de ser reemplazado urgentemente
 STR_01A3_LAND_AREA_INFORMATION                                  :{WHITE}Información sobre el terreno
 STR_01A4_COST_TO_CLEAR_N_A                                      :{BLACK}Coste de desbroce: {LTBLUE}N/D
 STR_01A5_COST_TO_CLEAR                                          :{BLACK}Coste de desbroce: {LTBLUE}{CURRENCY}
@@ -497,7 +497,7 @@
 STR_01CA_31ST                                                   :31
 ############ range for days	ends
 
-STR_01CB                                                        :{TINYFONT}{COMMA16}
+STR_01CB                                                        :{TINYFONT}{COMMA}
 STR_01CC_TOGGLE_LARGE_SMALL_MAP                                 :{BLACK}Cambio entre mapa grande/pequeño
 STR_01CD_SELECT_TUTORIAL_DEMONSTRATION                          :{WHITE}Seleccionar Tutorial/Demonstración
 
@@ -509,7 +509,7 @@
 STR_CARGO_ACCEPTED_5                                            :{BLACK}Carga aceptada: {LTBLUE}{STRING}, {STRING}, {STRING}, {STRING}, {STRING}
 ############ range for cargo acecpted ends
 
-STR_01D1_8                                                      :({COMMA8}/8 {STRING})
+STR_01D1_8                                                      :({COMMA}/8 {STRING})
 STR_01D2_JAZZ_JUKEBOX                                           :{WHITE}Selección de Jazz
 STR_01D3_SOUND_MUSIC                                            :Sonido/música
 STR_01D4_SHOW_SOUND_MUSIC_WINDOW                                :{BLACK}Mostrar ventana de sonido/música
@@ -528,16 +528,16 @@
 STR_01E1_START_PLAYING_MUSIC                                    :{BLACK}Comenzar música
 STR_01E2_DRAG_SLIDERS_TO_SET_MUSIC                              :{BLACK}Mueva los cursores para fijar volumen de música y efectos
 STR_01E3                                                        :{DKGREEN}{TINYFONT}--
-STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA8}
-STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA8}
+STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA}
+STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA}
 STR_01E6                                                        :{DKGREEN}{TINYFONT}------
 STR_01E7                                                        :{DKGREEN}{TINYFONT}"{STRING}"
 STR_01E8_TRACK_XTITLE                                           :{BLACK}{TINYFONT}Pista{SETX 88}Título
 STR_01E9_SHUFFLE                                                :{TINYFONT}Mezclar
 STR_01EA_PROGRAM                                                :{TINYFONT}{BLACK}Programa
 STR_01EB_MUSIC_PROGRAM_SELECTION                                :{WHITE}Selección del programa de música
-STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA16} "{STRING}"
-STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA16}   "{STRING}"
+STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} "{STRING}"
+STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA}   "{STRING}"
 STR_01EE_TRACK_INDEX                                            :{TINYFONT}{BLACK}Índice de pistas
 STR_01EF_PROGRAM                                                :{TINYFONT}{BLACK}Programa - '{STRING}'
 STR_01F0_CLEAR                                                  :{TINYFONT}{BLACK}Borrar
@@ -577,7 +577,7 @@
 STR_0210_TOO_FAR_FROM_PREVIOUS_DESTINATIO                       :{WHITE}...demasiado lejano del destino anterior
 STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Top de empresas que han alcanzado {NUMU16}{}(Nivel {STRING})
 STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Tabla clasificatoria de empresas en {NUMU16}
-STR_0212                                                        :{BIGFONT}{COMMA16}.
+STR_0212                                                        :{BIGFONT}{COMMA}.
 STR_0213_BUSINESSMAN                                            :Hombre de negocios
 STR_0214_ENTREPRENEUR                                           :Empresario
 STR_0215_INDUSTRIALIST                                          :Industrial
@@ -586,12 +586,12 @@
 STR_0218_MOGUL                                                  :Mogul
 STR_0219_TYCOON_OF_THE_CENTURY                                  :Magnate del siglo
 STR_HIGHSCORE_NAME                                              :{BIGFONT}{STRING}, {STRING}
-STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA16})
+STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA})
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{STRING} logra el estado '{STRING}'!
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{STRING} de {STRING} logra el estado '{STRING}'!
 STR_021D                                                        :{BLACK}
 STR_021E                                                        :{WHITE}
-STR_021F                                                        :{BLUE}{COMMA16}
+STR_021F                                                        :{BLUE}{COMMA}
 STR_0220_CREATE_SCENARIO                                        :{BLACK}Crear Escenario
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Editor de escenarios
@@ -788,8 +788,8 @@
 STR_EXTRA_VIEW_PORT                                             :Punto de vista extra
 STR_SIGN_LIST                                                   :Lista de señales
 STR_02DF_TOWN_DIRECTORY                                         :Listado de poblaciones
-STR_TOWN_POPULATION                                             :{BLACK}Población mundial: {COMMA32}
-STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Vista {COMMA16}
+STR_TOWN_POPULATION                                             :{BLACK}Población mundial: {COMMA}
+STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Vista {COMMA}
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN                                :{BLACK}Copiar punto de vista
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT                             :{BLACK}Copia la localización de la vista global a este punto de vista
 STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW                                :{BLACK}Pegar punto de vista
@@ -961,34 +961,34 @@
 STR_CANT_COPY_ORDER_LIST                                        :{WHITE}No se puede copiar la lista de órdenes...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Fin de órdenes compartidas - -
 
-STR_TRAIN_IS_LOST                                               :{WHITE}Tren {COMMA16} está perdido.
-STR_TRAIN_IS_UNPROFITABLE                                       :{WHITE}El beneficio del tren {COMMA16} para el pasado año fué {CURRENCY}
+STR_TRAIN_IS_LOST                                               :{WHITE}Tren {COMMA} está perdido.
+STR_TRAIN_IS_UNPROFITABLE                                       :{WHITE}El beneficio del tren {COMMA} para el pasado año fué {CURRENCY}
 STR_EURO_INTRODUCE                                              :{BLACK}{BIGFONT}¡Unión Monetaria Europea!{}{}El Euro es introducido como la moneda oficial para todas las transacciones de su país!
 
 # Start of order review system.
 # DON'T ADD OR REMOVE LINES HERE
-STR_TRAIN_HAS_TOO_FEW_ORDERS                                    :{WHITE}El tren {COMMA16} tienes muy pocas órdenes en su calendario
-STR_TRAIN_HAS_VOID_ORDER                                        :{WHITE}El tren {COMMA16} tiene una orden vacía
-STR_TRAIN_HAS_DUPLICATE_ENTRY                                   :{WHITE}El tren {COMMA16} tiene órdenes duplicadas
-STR_TRAIN_HAS_INVALID_ENTRY                                     :{WHITE}El tren {COMMA16} tiene una estación no válida en sus órdenes
-STR_ROADVEHICLE_HAS_TOO_FEW_ORDERS                              :{WHITE}El vehículo de carretera {COMMA16} tienes muy pocas órdenes en su calendario
-STR_ROADVEHICLE_HAS_VOID_ORDER                                  :{WHITE}El vehículo de carretera {COMMA16} tiene una orden vacía
-STR_ROADVEHICLE_HAS_DUPLICATE_ENTRY                             :{WHITE}El vehículo de carretera {COMMA16} tiene órdenes duplicadas
-STR_ROADVEHICLE_HAS_INVALID_ENTRY                               :{WHITE}El vehículo de carretera {COMMA16} tiene una estación no válida en sus órdenes
-STR_SHIP_HAS_TOO_FEW_ORDERS                                     :{WHITE}El barco {COMMA16} tienes muy pocas órdenes en su calendario
-STR_SHIP_HAS_VOID_ORDER                                         :{WHITE}Ship {COMMA16} tiene una orden vacía
-STR_SHIP_HAS_DUPLICATE_ENTRY                                    :{WHITE}Ship {COMMA16} tiene órdenes duplicadas
-STR_SHIP_HAS_INVALID_ENTRY                                      :{WHITE}Ship {COMMA16} tiene una estación no válida en sus órdenes
-STR_AIRCRAFT_HAS_TOO_FEW_ORDERS                                 :{WHITE}La aeronave {COMMA16} tiene muy pocas órdenes en su calendario
-STR_AIRCRAFT_HAS_VOID_ORDER                                     :{WHITE}La aeronave {COMMA16} tiene una orden vacía
-STR_AIRCRAFT_HAS_DUPLICATE_ENTRY                                :{WHITE}La aeronave {COMMA16} tiene órdenes duplicadas
-STR_AIRCRAFT_HAS_INVALID_ENTRY                                  :{WHITE}La aeronave {COMMA16} tiene una estación no válida en sus órdenes
+STR_TRAIN_HAS_TOO_FEW_ORDERS                                    :{WHITE}El tren {COMMA} tienes muy pocas órdenes en su calendario
+STR_TRAIN_HAS_VOID_ORDER                                        :{WHITE}El tren {COMMA} tiene una orden vacía
+STR_TRAIN_HAS_DUPLICATE_ENTRY                                   :{WHITE}El tren {COMMA} tiene órdenes duplicadas
+STR_TRAIN_HAS_INVALID_ENTRY                                     :{WHITE}El tren {COMMA} tiene una estación no válida en sus órdenes
+STR_ROADVEHICLE_HAS_TOO_FEW_ORDERS                              :{WHITE}El vehículo de carretera {COMMA} tienes muy pocas órdenes en su calendario
+STR_ROADVEHICLE_HAS_VOID_ORDER                                  :{WHITE}El vehículo de carretera {COMMA} tiene una orden vacía
+STR_ROADVEHICLE_HAS_DUPLICATE_ENTRY                             :{WHITE}El vehículo de carretera {COMMA} tiene órdenes duplicadas
+STR_ROADVEHICLE_HAS_INVALID_ENTRY                               :{WHITE}El vehículo de carretera {COMMA} tiene una estación no válida en sus órdenes
+STR_SHIP_HAS_TOO_FEW_ORDERS                                     :{WHITE}El barco {COMMA} tienes muy pocas órdenes en su calendario
+STR_SHIP_HAS_VOID_ORDER                                         :{WHITE}Ship {COMMA} tiene una orden vacía
+STR_SHIP_HAS_DUPLICATE_ENTRY                                    :{WHITE}Ship {COMMA} tiene órdenes duplicadas
+STR_SHIP_HAS_INVALID_ENTRY                                      :{WHITE}Ship {COMMA} tiene una estación no válida en sus órdenes
+STR_AIRCRAFT_HAS_TOO_FEW_ORDERS                                 :{WHITE}La aeronave {COMMA} tiene muy pocas órdenes en su calendario
+STR_AIRCRAFT_HAS_VOID_ORDER                                     :{WHITE}La aeronave {COMMA} tiene una orden vacía
+STR_AIRCRAFT_HAS_DUPLICATE_ENTRY                                :{WHITE}La aeronave {COMMA} tiene órdenes duplicadas
+STR_AIRCRAFT_HAS_INVALID_ENTRY                                  :{WHITE}La aeronave {COMMA} tiene una estación no válida en sus órdenes
 # end of order system
 
-STR_TRAIN_AUTORENEW_FAILED                                      :{WHITE}Auto renovar ha fallado con el tren {COMMA16} (límite de dinero)
-STR_ROADVEHICLE_AUTORENEW_FAILED                                :{WHITE}AAuto renovar ha fallado con el vehículo de carretera {COMMA16} (límite de dinero)
-STR_SHIP_AUTORENEW_FAILED                                       :{WHITE}Auto renovar ha fallado con el barco {COMMA16} (límite de dinero)
-STR_AIRCRAFT_AUTORENEW_FAILED                                   :{WHITE}Auto renovar ha fallado con la aeronave {COMMA16} (límite de dinero)
+STR_TRAIN_AUTORENEW_FAILED                                      :{WHITE}Auto renovar ha fallado con el tren {COMMA} (límite de dinero)
+STR_ROADVEHICLE_AUTORENEW_FAILED                                :{WHITE}AAuto renovar ha fallado con el vehículo de carretera {COMMA} (límite de dinero)
+STR_SHIP_AUTORENEW_FAILED                                       :{WHITE}Auto renovar ha fallado con el barco {COMMA} (límite de dinero)
+STR_AIRCRAFT_AUTORENEW_FAILED                                   :{WHITE}Auto renovar ha fallado con la aeronave {COMMA} (límite de dinero)
 
 STR_CONFIG_PATCHES                                              :{BLACK}Configurar Parches
 STR_CONFIG_PATCHES_TIP                                          :{BLACK}Configurar los parches
@@ -1104,7 +1104,7 @@
 STR_CHEATS_TIP                                                  :{BLACK}Las casillas indican si ha usado este truco antes
 STR_CHEATS_WARNING                                              :{BLACK}Atención! Usted está a punto de traicionar a sus competidores. Tenga presente que tal deshonra será recordada para toda la eternidad.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Incrementar dinero en {CURRENCY64}
-STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Jugar como el jugador: {ORANGE}{COMMA16}
+STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Jugar como el jugador: {ORANGE}{COMMA}
 STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Bulldozer mágico (elimina industrias, etc.): {ORANGE}{STRING}
 STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Los túneles pueden cruzarse: {ORANGE}{STRING}
 STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Construir mientras se está en pausa: {ORANGE}{STRING}
@@ -1120,7 +1120,7 @@
 STR_GO_NON_STOP_TO_WAYPOINT                                     :Ir directo via {WAYPOINT}
 
 STR_WAYPOINTNAME_CITY                                           :Punto de paso {TOWN}
-STR_WAYPOINTNAME_CITY_SERIAL                                    :Punto de paso {TOWN} #{COMMA16}
+STR_WAYPOINTNAME_CITY_SERIAL                                    :Punto de paso {TOWN} #{COMMA}
 STR_LANDINFO_WAYPOINT                                           :Punto de paso
 
 STR_WAYPOINT                                                    :{WHITE}Punto de paso
@@ -1203,8 +1203,8 @@
 STR_CONSTRUCT_SUGAR_MINE_TIP                                    :{BLACK}Construir mina de azúcar
 
 STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Industrias
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}){YELLOW} ({COMMA16}% transportado)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}/{STRING}){YELLOW} ({COMMA16}%/{COMMA16}% transportado)
+STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}){YELLOW} ({COMMA}% transportado)
+STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}/{STRING}){YELLOW} ({COMMA}%/{COMMA}% transportado)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{TOWN} {STRING}
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...demasiado cercano a otra industria
@@ -1244,15 +1244,15 @@
 STR_NETWORK_ADD_SERVER_TIP                                      :{BLACK}Añade un servidor a la lista que será siempre consultada para ver juegos en ejecución.
 STR_NETWORK_ENTER_IP                                            :{BLACK}Introduce la dirección IP del servidor
 
-STR_NETWORK_CLIENTS_ONLINE                                      :{BLACK}{COMMA16}/{COMMA16}
+STR_NETWORK_CLIENTS_ONLINE                                      :{BLACK}{COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Clientes
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Clientes online / máx clientes
 STR_NETWORK_GAME_INFO                                           :{SILVER}INFO JUEGO
 STR_ORANGE                                                      :{ORANGE}{STRING}
-STR_NETWORK_CLIENTS                                             :{SILVER}Clientes:  {WHITE}{COMMA8} / {COMMA8}
+STR_NETWORK_CLIENTS                                             :{SILVER}Clientes:  {WHITE}{COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}Idioma:  {WHITE}{STRING}
 STR_NETWORK_TILESET                                             :{SILVER}Escenario:  {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Tamaño Mapa:  {WHITE}{COMMA16}x{COMMA16}
+STR_NETWORK_MAP_SIZE                                            :{SILVER}Tamaño Mapa:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Versión servidor:  {WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Dirección servidor:  {WHITE}{STRING} : {NUMU16}
 STR_NETWORK_START_DATE                                          :{SILVER}Fecha inicio:  {WHITE}{DATE_SHORT}
@@ -1517,21 +1517,21 @@
 
 ##id 0x2000
 STR_2000_TOWNS                                                  :{WHITE}Poblaciones
-STR_TOWN_LABEL_POP                                              :{WHITE}{STRING} ({COMMA32})
+STR_TOWN_LABEL_POP                                              :{WHITE}{STRING} ({COMMA})
 STR_2001                                                        :{WHITE}{STRING}
 STR_2002                                                        :{TINYFONT}{BLACK}{STRING}
 STR_2003                                                        :{TINYFONT}{WHITE}{STRING}
 STR_2004_BUILDING_MUST_BE_DEMOLISHED                            :{WHITE}El edificio debe demolerse primero
 STR_2005                                                        :{WHITE}{TOWN}
-STR_2006_POPULATION                                             :{BLACK}Habitantes: {ORANGE}{COMMA32}{BLACK}  Casas: {ORANGE}{COMMA32}
+STR_2006_POPULATION                                             :{BLACK}Habitantes: {ORANGE}{COMMA}{BLACK}  Casas: {ORANGE}{COMMA}
 STR_2007_RENAME_TOWN                                            :Renombrar población
 STR_2008_CAN_T_RENAME_TOWN                                      :{WHITE}No se puede renombrar población...
 STR_2009_LOCAL_AUTHORITY_REFUSES                                :{WHITE}{TOWN} las autoridades locales rechazan esto
 STR_200A_TOWN_NAMES_CLICK_ON_NAME                               :{BLACK}Nombres de población - haga click sobre el nombre para centrar la vista en la población
 STR_200B_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Centrar la vista sobre la población
 STR_200C_CHANGE_TOWN_NAME                                       :{BLACK}Cambiar nombre de la población
-STR_200D_PASSENGERS_LAST_MONTH_MAX                              :{BLACK}Pasajeros último mes: {ORANGE}{COMMA32}{BLACK}  máx: {ORANGE}{COMMA32}
-STR_200E_MAIL_LAST_MONTH_MAX                                    :{BLACK}Correo último mes: {ORANGE}{COMMA32}{BLACK}  máx: {ORANGE}{COMMA32}
+STR_200D_PASSENGERS_LAST_MONTH_MAX                              :{BLACK}Pasajeros último mes: {ORANGE}{COMMA}{BLACK}  máx: {ORANGE}{COMMA}
+STR_200E_MAIL_LAST_MONTH_MAX                                    :{BLACK}Correo último mes: {ORANGE}{COMMA}{BLACK}  máx: {ORANGE}{COMMA}
 STR_200F_TALL_OFFICE_BLOCK                                      :Bloque alto de oficinas
 STR_2010_OFFICE_BLOCK                                           :Bloque de oficinas
 STR_2011_SMALL_BLOCK_OF_FLATS                                   :Bloque de viviendas pequeño
@@ -1605,7 +1605,7 @@
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Soborne a las autoridades locales para aumentar su ranking, con el riesgo de una severa penalización si es descubierto.{}  Coste: {CURRENCY}
 STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Colapso circulatorio en {TOWN}!{}{}¡Programa de reconstrucción de carreteras patrocinado por {STRING} causa 6 meses de problemas a los conductores!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
-STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA32})
+STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA})
 STR_2058_UNDER_CONSTRUCTION                                     :{STRING} (bajo construcción)
 STR_2059_IGLOO                                                  :Iglú
 STR_205A_TEPEES                                                 :Tipis
@@ -1667,7 +1667,7 @@
 STR_303C_OUTSTANDING                                            :Excepcional
 ############ range for rating ends
 
-STR_303D                                                        :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA8}%)
+STR_303D                                                        :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_303E_NO_LONGER_ACCEPTS                                      :{WHITE}{STATION} ya no acepta {STRING}
 STR_303F_NO_LONGER_ACCEPTS_OR                                   :{WHITE}{STATION} ya no acepta {STRING} ni {STRING}
 STR_3040_NOW_ACCEPTS                                            :{WHITE}{STATION} acepta ahora {STRING}
@@ -1678,7 +1678,7 @@
 STR_3045_TOO_CLOSE_TO_ANOTHER_TRUCK                             :{WHITE}Demasiado cerca de otra estación de camione
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Primero debe demolerse estación de autobús
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Primero debe demolerse estación de camiones
-STR_3048_STATIONS                                               :{WHITE}{STRING} - {COMMA16} Estaciones
+STR_3048_STATIONS                                               :{WHITE}{STRING} - {COMMA} Estaciones
 STR_3049_0                                                      :{YELLOW}{STATION} {STRINL 0x30D1}
 STR_304A_NONE                                                   :{YELLOW}- Ninguna -
 STR_304B_SITE_UNSUITABLE                                        :{WHITE}...lugar inapropiado
@@ -1735,7 +1735,7 @@
 STR_4002_SAVE                                                   :{BLACK}Guardar
 STR_4003_DELETE                                                 :{BLACK}Borrar
 STR_4004                                                        :{STRING}, {DATE_LONG}
-STR_4005_BYTES_FREE                                             :{BLACK}{COMMA32} megabytes libres
+STR_4005_BYTES_FREE                                             :{BLACK}{COMMA} megabytes libres
 STR_4006_UNABLE_TO_READ_DRIVE                                   :{BLACK}No es posible leer la unidad
 STR_4007_GAME_SAVE_FAILED                                       :{WHITE}Error guardando juego
 STR_4008_UNABLE_TO_DELETE_FILE                                  :{WHITE}No es posible borrar el fichero
@@ -1796,7 +1796,7 @@
 ############ range for requires	ends
 
 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Producción mes anterior:
-STR_482B_TRANSPORTED                                            :{YELLOW}{STRING}{BLACK} ({COMMA16}% transportado)
+STR_482B_TRANSPORTED                                            :{YELLOW}{STRING}{BLACK} ({COMMA}% transportado)
 STR_482C_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Centrar la vista sobre la industria
 STR_482D_NEW_UNDER_CONSTRUCTION                                 :{BLACK}{BIGFONT}Nuevo {STRING} bajo construcción cerca de {TOWN}!
 STR_482E_NEW_BEING_PLANTED_NEAR                                 :{BLACK}{BIGFONT}Nuevo {STRING} está siendo plantado cerca de {TOWN}!
@@ -1813,8 +1813,8 @@
 STR_4839_PRODUCTION_DOWN_BY_50                                  :{BLACK}{BIGFONT}La producción de {TOWN} {STRING} desciende un 50%
 STR_483A_INSECT_INFESTATION_CAUSES                              :{BLACK}{BIGFONT}¡Plaga de insectos causa estragos en {TOWN} {STRING}!{}Producción por debajo del 50%
 STR_483B_CAN_ONLY_BE_POSITIONED                                 :{WHITE}...sólo se puede colocar cerca de los bordes del mapa
-STR_INDUSTRY_PROD_GOUP                                          :{BLACK}{BIGFONT}¡La producción de {STRING} en {TOWN} {STRING} sube un {COMMA16}%!
-STR_INDUSTRY_PROD_GODOWN                                        :{BLACK}{BIGFONT}¡La producción de {STRING} en {TOWN} {STRING} desciende un {COMMA16}%!
+STR_INDUSTRY_PROD_GOUP                                          :{BLACK}{BIGFONT}¡La producción de {STRING} en {TOWN} {STRING} sube un {COMMA}%!
+STR_INDUSTRY_PROD_GODOWN                                        :{BLACK}{BIGFONT}¡La producción de {STRING} en {TOWN} {STRING} desciende un {COMMA}%!
 
 ##id 0x5000
 STR_5000_TRAIN_IN_TUNNEL                                        :{WHITE}Tren en túnel
@@ -1877,10 +1877,10 @@
 ##id 0x6000
 STR_SV_EMPTY                                                    :
 STR_SV_UNNAMED                                                  :Sin nombre{SKIP}
-STR_SV_TRAIN_NAME                                               :Tren {COMMA16}
-STR_SV_ROADVEH_NAME                                             :Vehículo de carretera {COMMA16}
-STR_SV_SHIP_NAME                                                :Barco {COMMA16}
-STR_SV_AIRCRAFT_NAME                                            :Aeronave {COMMA16}
+STR_SV_TRAIN_NAME                                               :Tren {COMMA}
+STR_SV_ROADVEH_NAME                                             :Vehículo de carretera {COMMA}
+STR_SV_SHIP_NAME                                                :Barco {COMMA}
+STR_SV_AIRCRAFT_NAME                                            :Aeronave {COMMA}
 
 STR_SV_STNAME                                                   :{STRING}
 STR_SV_STNAME_NORTH                                             :{STRING} Norte
@@ -1930,12 +1930,12 @@
 ############ range for difficulty levels ends
 
 ############ range for difficulty settings starts
-STR_6805_MAXIMUM_NO_COMPETITORS                                 :{LTBLUE}Nº Máximo de jugadores: {ORANGE}{COMMA16}
+STR_6805_MAXIMUM_NO_COMPETITORS                                 :{LTBLUE}Nº Máximo de jugadores: {ORANGE}{COMMA}
 STR_6806_COMPETITOR_START_TIME                                  :{LTBLUE}Tiempo de inicio de la competencia: {ORANGE}{STRING}
 STR_6807_NO_OF_TOWNS                                            :{LTBLUE}Nº. de poblaciones: {ORANGE}{STRING}
 STR_6808_NO_OF_INDUSTRIES                                       :{LTBLUE}Nº. de industrias: {ORANGE}{STRING}
 STR_6809_MAXIMUM_INITIAL_LOAN_000                               :{LTBLUE}Préstamo inicial máximo: {ORANGE}{CURRENCY}
-STR_680A_INITIAL_INTEREST_RATE                                  :{LTBLUE}Tasa de interés inicial: {ORANGE}{COMMA16}%
+STR_680A_INITIAL_INTEREST_RATE                                  :{LTBLUE}Tasa de interés inicial: {ORANGE}{COMMA}%
 STR_680B_VEHICLE_RUNNING_COSTS                                  :{LTBLUE}Costes de Operación de Vehículo: {ORANGE}{STRING}
 STR_680C_CONSTRUCTION_SPEED_OF_COMPETITOR                       :{LTBLUE}Velocidad de construcción de la competencia: {ORANGE}{STRING}
 STR_680D_INTELLIGENCE_OF_COMPETITORS                            :{LTBLUE}Inteligencia de la competencia: {ORANGE}{STRING}
@@ -1994,7 +1994,7 @@
 ##id 0x7000
 STR_7000                                                        :
 STR_7001                                                        :{WHITE}{STRING} {BLACK}{STRING}
-STR_7002_PLAYER                                                 :(Jugador {COMMA16})
+STR_7002_PLAYER                                                 :(Jugador {COMMA})
 STR_7004_NEW_FACE                                               :{BLACK}Nueva Cara
 STR_7005_COLOR_SCHEME                                           :{BLACK}Esquema Color
 STR_7006_COLOR_SCHEME                                           :{GOLD}Esquema color:
@@ -2028,7 +2028,7 @@
 STR_7022_INCOME_GRAPH                                           :{WHITE}Gráfico de Ingresos
 STR_CURRCOMPACT32                                               :{CURRCOMPACT}
 STR_CURRCOMPACT64                                               :{CURRCOMPACT64}
-STR_7024                                                        :{COMMA32}
+STR_7024                                                        :{COMMA}
 STR_7025_OPERATING_PROFIT_GRAPH                                 :{WHITE}Gráfico de Beneficio Operativo
 STR_7026_BANK_BALANCE                                           :{WHITE}Saldo en Banco
 STR_7027_LOAN                                                   :{WHITE}Préstamo
@@ -2052,14 +2052,14 @@
 STR_7037_PRESIDENT                                              :{WHITE}{STRING}{}{GOLD}(Presidente)
 STR_7038_INAUGURATED                                            :{GOLD}Inaugurado: {WHITE}{NUMU16}
 STR_7039_VEHICLES                                               :{GOLD}Vehiculos:
-STR_703A_TRAIN                                                  :{WHITE}{COMMA16} tren
-STR_703B_TRAINS                                                 :{WHITE}{COMMA16} trenes
-STR_703C_ROAD_VEHICLE                                           :{WHITE}{COMMA16} veh. carretera
-STR_703D_ROAD_VEHICLES                                          :{WHITE}{COMMA16} vehs. carreta
-STR_703E_AIRCRAFT                                               :{WHITE}{COMMA16} aeroplano
-STR_703F_AIRCRAFT                                               :{WHITE}{COMMA16} aeroplanos
-STR_7040_SHIP                                                   :{WHITE}{COMMA16} barco
-STR_7041_SHIPS                                                  :{WHITE}{COMMA16} barcos
+STR_703A_TRAIN                                                  :{WHITE}{COMMA} tren
+STR_703B_TRAINS                                                 :{WHITE}{COMMA} trenes
+STR_703C_ROAD_VEHICLE                                           :{WHITE}{COMMA} veh. carretera
+STR_703D_ROAD_VEHICLES                                          :{WHITE}{COMMA} vehs. carreta
+STR_703E_AIRCRAFT                                               :{WHITE}{COMMA} aeroplano
+STR_703F_AIRCRAFT                                               :{WHITE}{COMMA} aeroplanos
+STR_7040_SHIP                                                   :{WHITE}{COMMA} barco
+STR_7041_SHIPS                                                  :{WHITE}{COMMA} barcos
 STR_7042_NONE                                                   :{WHITE}Ninguno
 STR_7043_FACE_SELECTION                                         :{WHITE}Selección de cara
 STR_7044_MALE                                                   :{BLACK}Hombre
@@ -2124,8 +2124,8 @@
 STR_707A_SELL_25_SHARE_IN_THIS_COMPANY                          :{BLACK}Vender 25% acciones de esta empresa
 STR_707B_CAN_T_BUY_25_SHARE_IN_THIS                             :{WHITE}No se puede comprar el 25% de acciones...
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}No se puede vender el 25% de acciones...
-STR_707D_OWNED_BY                                               :{WHITE}({COMMA16}% propiedad de {STRING})
-STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA16}% propiedad de {STRING}{}   {COMMA16}% propiedad de {STRING})
+STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% propiedad de {STRING})
+STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}% propiedad de {STRING}{}   {COMMA}% propiedad de {STRING})
 STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{STRING} ha sido comprada por {STRING}!
 STR_7080_PROTECTED                                              :{WHITE}Esta empresa todavía no dispone acciones a la venta...
 
@@ -2400,8 +2400,8 @@
 STR_8801_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Los ciudadanos celebran . . .{}¡Primer tren llega a {STATION}!
 STR_8802_DETAILS                                                :{WHITE}{STRING} (Detalles)
 STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}Tren en camino
-STR_8804                                                        :{SETX 10}{COMMA8}: {STRING}
-STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA8}: {STRING}
+STR_8804                                                        :{SETX 10}{COMMA}: {STRING}
+STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING}
 STR_8806_GO_TO                                                  :Ir a {STATION}
 STR_8807_GO_TO_TRANSFER                                         :Ir a {STATION} (Transferir y cargar)
 STR_8808_GO_TO_UNLOAD                                           :Ir a {STATION} (Descargar)
@@ -2427,13 +2427,13 @@
 STR_UNKNOWN_DESTINATION                                         :destino desconocido
 STR_8812_EMPTY                                                  :{LTBLUE}Vacío
 STR_8813_FROM                                                   :{LTBLUE}{CARGO} desde {STATION}
-STR_8814_TRAIN_IS_WAITING_IN_DEPOT                              :{WHITE}El tren {COMMA16} está esperando en el depósito
+STR_8814_TRAIN_IS_WAITING_IN_DEPOT                              :{WHITE}El tren {COMMA} está esperando en el depósito
 STR_8815_NEW_VEHICLES                                           :{BLACK}Nuevos Vehículos
 STR_8816                                                        :{BLACK}-
 STR_8818_INFORMATION                                            :{BLACK}Información
 STR_8819_TRAIN_TOO_LONG                                         :{WHITE}Tren demasiado largo
 STR_881A_TRAINS_CAN_ONLY_BE_ALTERED                             :{WHITE}Los trenes únicamente puede ser modificados en el interior de los depósitos
-STR_881B_TRAINS                                                 :{WHITE}{STRING} - {COMMA16} Trenes
+STR_881B_TRAINS                                                 :{WHITE}{STRING} - {COMMA} Trenes
 STR_881C_NEW_RAIL_VEHICLES                                      :{WHITE}Nuevos vehículos de raíl
 STR_881D_NEW_MONORAIL_VEHICLES                                  :{WHITE}Nuevos vehículos de monorraíl
 STR_881E_NEW_MAGLEV_VEHICLES                                    :{WHITE}Nuevos vehículos de levitación magnética
@@ -2467,8 +2467,8 @@
 STR_8839_CAN_T_SELL_RAILROAD_VEHICLE                            :{WHITE}No se puede vender tren...
 STR_883A_UNABLE_TO_FIND_ROUTE_TO                                :{WHITE}No se puede encontrar ruta al depósito
 STR_883B_CAN_T_STOP_START_TRAIN                                 :{WHITE}No se puede parar/arrancar tren...
-STR_883C_SERVICING_INTERVAL_DAYS                                :{BLACK}Intervalo de despacho: {LTBLUE}{COMMA16}días{BLACK}   Último servicio: {LTBLUE}{DATE_LONG}
-STR_SERVICING_INTERVAL_PERCENT                                  :{BLACK}Intervalo de despacho: {LTBLUE}{COMMA16}%{BLACK}   Último servicio: {LTBLUE}{DATE_LONG}
+STR_883C_SERVICING_INTERVAL_DAYS                                :{BLACK}Intervalo de despacho: {LTBLUE}{COMMA}días{BLACK}   Último servicio: {LTBLUE}{DATE_LONG}
+STR_SERVICING_INTERVAL_PERCENT                                  :{BLACK}Intervalo de despacho: {LTBLUE}{COMMA}%{BLACK}   Último servicio: {LTBLUE}{DATE_LONG}
 STR_883D_TRAINS_CLICK_ON_TRAIN_FOR                              :{BLACK}Trenes - click en tren para información
 STR_883E_BUILD_NEW_TRAINS_REQUIRES                              :{BLACK}Construir nuevos trenes (requiere depósito)
 STR_883F_TRAINS_CLICK_ON_TRAIN_FOR                              :{BLACK}Trenes - click en tren para info., arrastrar vehículo para añadir/retirar del tren
@@ -2501,12 +2501,12 @@
 STR_SERVICE_HINT                                                :{BLACK}Saltar esta orden a menos que el servicio sea necesario
 STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}Nuevo {STRING} ahora disponible!
 STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
-STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Coste: {CURRENCY} Peso: {COMMA16}t{}Velocidad: {VELOCITY}  Potencia: {COMMA16}hp{}Coste Operativo: {CURRENCY}/año{}Capacidad: {STRING}
+STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Coste: {CURRENCY} Peso: {COMMA}t{}Velocidad: {VELOCITY}  Potencia: {COMMA}hp{}Coste Operativo: {CURRENCY}/año{}Capacidad: {STRING}
 STR_885C_BROKEN_DOWN                                            :{RED}Averiado
 STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Edad: {LTBLUE}{STRING}{BLACK}   Coste Operativo: {LTBLUE}{CURRENCY}/año
-STR_885E_WEIGHT_T_POWER_HP_MAX_SPEED                            :{BLACK}Peso: {LTBLUE}{COMMA16}t  {BLACK}Potencia: {LTBLUE}{COMMA32}hp{BLACK} Velocidad Máx.: {LTBLUE}{VELOCITY}
+STR_885E_WEIGHT_T_POWER_HP_MAX_SPEED                            :{BLACK}Peso: {LTBLUE}{COMMA}t  {BLACK}Potencia: {LTBLUE}{COMMA}hp{BLACK} Velocidad Máx.: {LTBLUE}{VELOCITY}
 STR_885F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Beneficio este año: {LTBLUE}{CURRENCY}  (último año: {CURRENCY})
-STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Fiabilidad: {LTBLUE}{COMMA8}%  {BLACK}Averías desde último mantenimiento: {LTBLUE}{COMMA16}
+STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Fiabilidad: {LTBLUE}{COMMA}%  {BLACK}Averías desde último mantenimiento: {LTBLUE}{COMMA}
 STR_8861_STOPPED                                                :{RED}Parado
 STR_8862_CAN_T_MAKE_TRAIN_PASS_SIGNAL                           :{WHITE}No se puede pasar la señal en peligro al tren...
 STR_8863_CRASHED                                                :{RED}¡Siniestrado!
@@ -2514,7 +2514,7 @@
 STR_8865_NAME_TRAIN                                             :{WHITE}Nombrar tren
 STR_8866_CAN_T_NAME_TRAIN                                       :{WHITE}No se puede nombrar tren...
 STR_8867_NAME_TRAIN                                             :{BLACK}Nombrar tren
-STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}¡Siniestro ferroviario!{}{COMMA16} fallecidos en la explosión de la colisión
+STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}¡Siniestro ferroviario!{}{COMMA} fallecidos en la explosión de la colisión
 STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}No se puede revertir la dirección...
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Renombrar tipo de vehículo
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}No se puede renombrar tipo de vehículo...
@@ -2526,7 +2526,7 @@
 
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Vehículo de carretera en camino
-STR_9001_ROAD_VEHICLES                                          :{WHITE}{STRING} - {COMMA16} Vehículos de Carretera
+STR_9001_ROAD_VEHICLES                                          :{WHITE}{STRING} - {COMMA} Vehículos de Carretera
 STR_9002                                                        :{WHITE}{STRING}
 STR_9003_ROAD_VEHICLE_DEPOT                                     :{WHITE}{TOWN} Depósito de vehículos
 STR_9004_NEW_VEHICLES                                           :{BLACK}Nuevos vehículos
@@ -2540,13 +2540,13 @@
 STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Edad: {LTBLUE}{STRING}{BLACK}   Coste Operativo: {LTBLUE}{CURRENCY}/año
 STR_900E_MAX_SPEED                                              :{BLACK}Velocidad Máx.: {LTBLUE}{VELOCITY}
 STR_900F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Beneficio este año: {LTBLUE}{CURRENCY}  (último año: {CURRENCY})
-STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Fiabilidad: {LTBLUE}{COMMA8}%  {BLACK}Averías desde último despacho: {LTBLUE}{COMMA16}
+STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Fiabilidad: {LTBLUE}{COMMA}%  {BLACK}Averías desde último despacho: {LTBLUE}{COMMA}
 STR_9011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Const.: {LTBLUE}{NUMU16}{BLACK} Valor: {LTBLUE}{CURRENCY}
 STR_9012_CAPACITY                                               :{BLACK}Capacidad: {LTBLUE}{STRING}
 STR_9013_MUST_BE_STOPPED_INSIDE                                 :{WHITE}...debe estar detenido dentro de un depósito
 STR_9014_CAN_T_SELL_ROAD_VEHICLE                                :{WHITE}No se puede vender vehículo...
 STR_9015_CAN_T_STOP_START_ROAD_VEHICLE                          :{WHITE}No se puede detener/arrancar vehículo...
-STR_9016_ROAD_VEHICLE_IS_WAITING                                :{WHITE}Vehículo de carretera {COMMA16} espera en depósito
+STR_9016_ROAD_VEHICLE_IS_WAITING                                :{WHITE}Vehículo de carretera {COMMA} espera en depósito
 STR_HEADING_FOR_ROAD_DEPOT                                      :{LTBLUE}Hacia el depósito de {TOWN}
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{LTBLUE}Hacia el depósito de {TOWN}, {VELOCITY}
 STR_9018_CAN_T_SEND_VEHICLE_TO_DEPOT                            :{WHITE}No se puede enviar vehículo al depósito...
@@ -2575,7 +2575,7 @@
 STR_902F_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Los ciudadanos celebran . . .{}¡Primer autobús llega a {STATION}!
 STR_9030_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Los ciudadanos celebran . . .{}¡Primer camión llega a {STATION}!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}¡Accidente de tráfico!{}El conductor fallece en la explosión tras la colisión con el tren
-STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Accidente de tráfico!{}{COMMA16} fallecidos en la explosión tras la colisión con el tren
+STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Accidente de tráfico!{}{COMMA} fallecidos en la explosión tras la colisión con el tren
 STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}No se puede hacer girar al vehículo...
 STR_9034_RENAME                                                 :{BLACK}Renombrar
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Renombrar tipo de vehículo
@@ -2590,7 +2590,7 @@
 STR_9802_CAN_T_BUILD_DOCK_HERE                                  :{WHITE}No se pueden construir muelles aquí...
 STR_9803_SHIP_DEPOT                                             :{WHITE}Astillero de {TOWN}
 STR_9804_NEW_SHIPS                                              :{BLACK}Nuevos barcos
-STR_9805_SHIPS                                                  :{WHITE}{STRING} - {COMMA16} Barcos
+STR_9805_SHIPS                                                  :{WHITE}{STRING} - {COMMA} Barcos
 STR_9806_CAN_T_BUILD_SHIPS                                      :{WHITE}No se pueden construir barcos...
 STR_9807_MUST_BUILD_SHIP_DEPOT_FIRST                            :{WHITE}Primero debe construirse astillero
 STR_9808_NEW_SHIPS                                              :{WHITE}Nuevos barcos
@@ -2605,7 +2605,7 @@
 STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Edad: {LTBLUE}{STRING}{BLACK}   Coste Operativo: {LTBLUE}{CURRENCY}/año
 STR_9813_MAX_SPEED                                              :{BLACK}Velocidad Máx.: {LTBLUE}{VELOCITY}
 STR_9814_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Beneficio este año: {LTBLUE}{CURRENCY}  (año anterior: {CURRENCY})
-STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Fiabilidad: {LTBLUE}{COMMA8}%  {BLACK}Averías desde último despacho: {LTBLUE}{COMMA16}
+STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Fiabilidad: {LTBLUE}{COMMA}%  {BLACK}Averías desde último despacho: {LTBLUE}{COMMA}
 STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Const.: {LTBLUE}{NUMU16}{BLACK} Valor: {LTBLUE}{CURRENCY}
 STR_9817_CAPACITY                                               :{BLACK}Capacidad: {LTBLUE}{STRING}
 STR_9818_CAN_T_STOP_START_SHIP                                  :{WHITE}No se puede detener/arrancar barco...
@@ -2613,7 +2613,7 @@
 STR_981A_UNABLE_TO_FIND_LOCAL_DEPOT                             :{WHITE}No se puede encontrar ruta al astillero
 STR_HEADING_FOR_SHIP_DEPOT                                      :{LTBLUE}Hacia el astillero de {TOWN}
 STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{LTBLUE}Hacia el astillero de {TOWN}, {VELOCITY}
-STR_981C_SHIP_IS_WAITING_IN_DEPOT                               :{WHITE}Barco {COMMA16} esperando en astilleros
+STR_981C_SHIP_IS_WAITING_IN_DEPOT                               :{WHITE}Barco {COMMA} esperando en astilleros
 STR_981D_BUILD_SHIP_DOCK                                        :{BLACK}Construir muelles
 STR_981E_BUILD_SHIP_DEPOT_FOR_BUILDING                          :{BLACK}Construir astillero (para construir y despachar barcos)
 STR_981F_SHIPS_CLICK_ON_SHIP_FOR                                :{BLACK}Barcos - click en barco para información
@@ -2664,19 +2664,19 @@
 STR_A005_NEW_AIRCRAFT                                           :{WHITE}Nuevo avilón
 STR_A006_BUILD_AIRCRAFT                                         :{BLACK}Construir aeronave
 STR_A008_CAN_T_BUILD_AIRCRAFT                                   :{WHITE}No se puede construir aeronave...
-STR_A009_AIRCRAFT                                               :{WHITE}{STRING} - {COMMA16} Aeronave
+STR_A009_AIRCRAFT                                               :{WHITE}{STRING} - {COMMA} Aeronave
 STR_A00A                                                        :{WHITE}{STRING}
 STR_A00B_ORDERS                                                 :{WHITE}{STRING} (Órdenes)
 STR_A00C_DETAILS                                                :{WHITE}{STRING} (Detalles)
 STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Edad: {LTBLUE}{STRING}{BLACK}   Coste Operativo: {LTBLUE}{CURRENCY}/año
 STR_A00E_MAX_SPEED                                              :{BLACK}Velocidad Máx.: {LTBLUE}{VELOCITY}
 STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Beneficio este año: {LTBLUE}{CURRENCY}  (año anterior: {CURRENCY})
-STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Fiabilidad: {LTBLUE}{COMMA8}%  {BLACK}Averías desde último despacho: {LTBLUE}{COMMA16}
+STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Fiabilidad: {LTBLUE}{COMMA}%  {BLACK}Averías desde último despacho: {LTBLUE}{COMMA}
 STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Const.: {LTBLUE}{NUMU16}{BLACK} Valor: {LTBLUE}{CURRENCY}
 STR_A012_CAN_T_SEND_AIRCRAFT_TO                                 :{WHITE}No se puede enviar la aeronave al hangar
 STR_HEADING_FOR_HANGAR                                          :{LTBLUE}Ir al hangar de {STATION}
 STR_HEADING_FOR_HANGAR_VEL                                      :{LTBLUE}Ir al hangar de {STATION}, {VELOCITY}
-STR_A014_AIRCRAFT_IS_WAITING_IN                                 :{WHITE}La aeronave {COMMA16} está esperando en el hangar
+STR_A014_AIRCRAFT_IS_WAITING_IN                                 :{WHITE}La aeronave {COMMA} está esperando en el hangar
 STR_A015_AIRCRAFT_IN_THE_WAY                                    :{WHITE}Aeronave en camino
 STR_A016_CAN_T_STOP_START_AIRCRAFT                              :{WHITE}No se puede detener/arrancar aeronave...
 STR_A017_AIRCRAFT_IS_IN_FLIGHT                                  :{WHITE}La aeronave está en vuelo
@@ -2702,14 +2702,14 @@
 STR_A02B_SHOW_AIRCRAFT_DETAILS                                  :{BLACK}Mostrar detalles de la aeronave
 STR_A02C_NEW_AIRCRAFT_NOW_AVAILABLE                             :{BLACK}{BIGFONT}¡Nueva aeronave ya disponible!
 STR_A02D                                                        :{BLACK}{BIGFONT}{STRING}
-STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Coste: {CURRENCY} Velocidad Máx.: {VELOCITY}{}Capacidad: {COMMA16} pasajeros, {COMMA16} sacas de correo{}Coste Operativo: {CURRENCY}/año
+STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Coste: {CURRENCY} Velocidad Máx.: {VELOCITY}{}Capacidad: {COMMA} pasajeros, {COMMA} sacas de correo{}Coste Operativo: {CURRENCY}/año
 
 STR_A030_NAME_AIRCRAFT                                          :{WHITE}Nombrar aeronave
 STR_A031_CAN_T_NAME_AIRCRAFT                                    :{WHITE}No se puede nombrar aeronave...
 STR_A032_NAME_AIRCRAFT                                          :{BLACK}Nombrar aeronave
 STR_A033_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Los ciudadanos celebran . . .{}¡Primera aeronave llega a {STATION}!
-STR_A034_PLANE_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}¡Avión siniestrado!{}{COMMA16} fallecidos en la explosión en {STATION}
-STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Accidente aéreo!{}La aeronave se quedó sin combustible, {COMMA16} personas mueren en la tragedia!
+STR_A034_PLANE_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}¡Avión siniestrado!{}{COMMA} fallecidos en la explosión en {STATION}
+STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Accidente aéreo!{}La aeronave se quedó sin combustible, {COMMA} personas mueren en la tragedia!
 STR_A035_DESTINATIONS                                           :{TINYFONT}{BLACK}Destinos:
 STR_A036                                                        :{TINYFONT}{BLACK}{STATION}
 STR_A037_RENAME                                                 :{BLACK}Renombrar
@@ -2735,7 +2735,7 @@
 STR_B003_FACTORY_DESTROYED_IN_SUSPICIOUS                        :{BLACK}{BIGFONT}¡Fábrica destruída en sospechosas circunstancias cerca de {TOWN}!
 STR_B004_UFO_LANDS_NEAR                                         :{BLACK}{BIGFONT}¡OVNI aterriza cerca de {TOWN}!
 STR_B005_COAL_MINE_SUBSIDENCE_LEAVES                            :{BLACK}{BIGFONT}¡Hundimiento de mina de carbón deja ola de destrucción en {TOWN}!
-STR_B006_FLOOD_VEHICLE_DESTROYED                                :{BLACK}{BIGFONT}¡Inundación!{}Al menos {COMMA16} desaparecidos o muertos después de las terribles inundaciones!
+STR_B006_FLOOD_VEHICLE_DESTROYED                                :{BLACK}{BIGFONT}¡Inundación!{}Al menos {COMMA} desaparecidos o muertos después de las terribles inundaciones!
 
 STR_BRIBE_FAILED                                                :{WHITE}Su intento de soborno ha sido
 STR_BRIBE_FAILED_2                                              :{WHITE}descubierto por un investigador regional.
@@ -2745,7 +2745,7 @@
 STR_PERFORMANCE_DETAIL                                          :{WHITE}Detalle de rendimiento
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Detalle
 STR_PERFORMANCE_DETAIL_AMOUNT_CURRENCY                          :{BLACK}({CURRCOMPACT}/{CURRCOMPACT})
-STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA32}/{COMMA32})
+STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA}/{COMMA})
 STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{INT32}%
 SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{INT32}
 ############ Those following lines need to be in this order!!
@@ -2780,7 +2780,7 @@
 STR_NEWGRF_GRF_ID                                               :{BLACK}ID GRF:
 
 STR_CURRENCY_WINDOW                                             :{WHITE}Moneda personalizada
-STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Tasa de cambio: {ORANGE}{CURRENCY} = {POUNDSIGN} {COMMA16}
+STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Tasa de cambio: {ORANGE}{CURRENCY} = {POUNDSIGN} {COMMA}
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Separador:
 STR_CURRENCY_PREFIX                                             :{LTBLUE}Prefijo:
 STR_CURRENCY_SUFFIX                                             :{LTBLUE}Sufijo:
@@ -2794,10 +2794,10 @@
 STR_PLANE                                                       :{BLACK}{PLANE}
 STR_SHIP                                                        :{BLACK}{SHIP}
 
-STR_SCHEDULED_TRAINS                                            :{WHITE}{STATION} - {COMMA16} Trenes
-STR_SCHEDULED_ROAD_VEHICLES                                     :{WHITE}{STATION} - {COMMA16} Vehículos de carretera
-STR_SCHEDULED_AIRCRAFT                                          :{WHITE}{STATION} - {COMMA16} Aeronaves
-STR_SCHEDULED_SHIPS                                             :{WHITE}{STATION} - {COMMA16} Barcos
+STR_SCHEDULED_TRAINS                                            :{WHITE}{STATION} - {COMMA} Trenes
+STR_SCHEDULED_ROAD_VEHICLES                                     :{WHITE}{STATION} - {COMMA} Vehículos de carretera
+STR_SCHEDULED_AIRCRAFT                                          :{WHITE}{STATION} - {COMMA} Aeronaves
+STR_SCHEDULED_SHIPS                                             :{WHITE}{STATION} - {COMMA} Barcos
 
 STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Mostrar todos los trenes que tienen esta estación en su horario
 STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Mostrar todos los vehículos de carretera que tienen esta estación en su horario
@@ -2819,7 +2819,7 @@
 STR_REPLACE_HELP                                                :{BLACK}Esta función permite seleccionar un tipo de locomotora y reemplazarla por otra. El cambio se realizará cuando el vehículo llegue al depósito
 
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
-STR_SIGN_LIST_CAPTION                                           :{WHITE}Lista de señales - {COMMA16} Señales
+STR_SIGN_LIST_CAPTION                                           :{WHITE}Lista de señales - {COMMA} Señales
 
 ############ Lists rail types
 
@@ -2829,16 +2829,16 @@
 
 ############ End of list of rail types
 
-STR_TINY_BLACK                                                  :{BLACK}{TINYFONT}{COMMA16}
+STR_TINY_BLACK                                                  :{BLACK}{TINYFONT}{COMMA}
 
-STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Coste: {GOLD}{CURRENCY}{BLACK} Peso: {GOLD}{COMMA16}t
-STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Velocidad: {GOLD}{VELOCITY}{BLACK}   Potencia: {GOLD}{COMMA32}cv
+STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Coste: {GOLD}{CURRENCY}{BLACK} Peso: {GOLD}{COMMA}t
+STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Velocidad: {GOLD}{VELOCITY}{BLACK}   Potencia: {GOLD}{COMMA}cv
 STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}Coste de operación: {GOLD}{CURRENCY}/año
 STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Capacidad: {GOLD}{STRING} {STRING}
-STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Diseñado: {GOLD}{NUMU16}{BLACK} Vida: {GOLD}{COMMA16} años
-STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Fiabilidad máxima: {GOLD}{COMMA8}%
+STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Diseñado: {GOLD}{NUMU16}{BLACK} Vida: {GOLD}{COMMA} años
+STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Fiabilidad máxima: {GOLD}{COMMA}%
 STR_PURCHASE_INFO_COST                                          :{BLACK}Coste: {GOLD}{CURRENCY}
-STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Peso: {GOLD}{COMMA16}t  ({COMMA16}t)
+STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Peso: {GOLD}{COMMA}t  ({COMMA}t)
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Coste: {GOLD}{CURRENCY}{BLACK} Velocidad: {GOLD}{VELOCITY}
-STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Capacidad: {GOLD}{COMMA16} pasajeros, {COMMA16} sacas de correo
-STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Vagones con motor: {GOLD}+{COMMA16}cv{BLACK} Peso: {GOLD}+{COMMA8}t
+STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Capacidad: {GOLD}{COMMA} pasajeros, {COMMA} sacas de correo
+STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Vagones con motor: {GOLD}+{COMMA}cv{BLACK} Peso: {GOLD}+{COMMA}t
--- a/lang/swedish.txt	Thu Jul 14 09:53:52 2005 +0000
+++ b/lang/swedish.txt	Thu Jul 14 15:10:20 2005 +0000
@@ -82,69 +82,69 @@
 STR_004C_PLASTIC                                                :Plast
 STR_004D_FIZZY_DRINK                                            :läsk
 STR_004E                                                        :
-STR_004F_PASSENGER                                              :{COMMA16} passagerare
-STR_0050_TON_OF_COAL                                            :{COMMA16} ton kol
-STR_0051_BAG_OF_MAIL                                            :{COMMA16} postsäck
+STR_004F_PASSENGER                                              :{COMMA} passagerare
+STR_0050_TON_OF_COAL                                            :{COMMA} ton kol
+STR_0051_BAG_OF_MAIL                                            :{COMMA} postsäck
 STR_0052_OF_OIL                                                 :{VOLUME} olja
-STR_0053_ITEM_OF_LIVESTOCK                                      :{COMMA16} boskap
-STR_0054_CRATE_OF_GOODS                                         :{COMMA16} låda gods
-STR_0055_TON_OF_GRAIN                                           :{COMMA16} ton spannmål
-STR_0056_TON_OF_WOOD                                            :{COMMA16} ton timmer
-STR_0057_TON_OF_IRON_ORE                                        :{COMMA16} ton järnmalm
-STR_0058_TON_OF_STEEL                                           :{COMMA16} ton stål
-STR_0059_BAG_OF_VALUABLES                                       :{COMMA16} värdesäck
-STR_005A_TON_OF_COPPER_ORE                                      :{COMMA16} ton kopparmalm
-STR_005B_TON_OF_MAIZE                                           :{COMMA16} ton majs
-STR_005C_TON_OF_FRUIT                                           :{COMMA16} ton frukt
-STR_005D_BAG_OF_DIAMONDS                                        :{COMMA16} diamantsäck
-STR_005E_TON_OF_FOOD                                            :{COMMA16} ton mat
-STR_005F_TON_OF_PAPER                                           :{COMMA16} ton papper
-STR_0060_BAG_OF_GOLD                                            :{COMMA16} guldsäck
+STR_0053_ITEM_OF_LIVESTOCK                                      :{COMMA} boskap
+STR_0054_CRATE_OF_GOODS                                         :{COMMA} låda gods
+STR_0055_TON_OF_GRAIN                                           :{COMMA} ton spannmål
+STR_0056_TON_OF_WOOD                                            :{COMMA} ton timmer
+STR_0057_TON_OF_IRON_ORE                                        :{COMMA} ton järnmalm
+STR_0058_TON_OF_STEEL                                           :{COMMA} ton stål
+STR_0059_BAG_OF_VALUABLES                                       :{COMMA} värdesäck
+STR_005A_TON_OF_COPPER_ORE                                      :{COMMA} ton kopparmalm
+STR_005B_TON_OF_MAIZE                                           :{COMMA} ton majs
+STR_005C_TON_OF_FRUIT                                           :{COMMA} ton frukt
+STR_005D_BAG_OF_DIAMONDS                                        :{COMMA} diamantsäck
+STR_005E_TON_OF_FOOD                                            :{COMMA} ton mat
+STR_005F_TON_OF_PAPER                                           :{COMMA} ton papper
+STR_0060_BAG_OF_GOLD                                            :{COMMA} guldsäck
 STR_0061_OF_WATER                                               :{VOLUME} vatten
-STR_0062_TON_OF_WHEAT                                           :{COMMA16} ton vete
+STR_0062_TON_OF_WHEAT                                           :{COMMA} ton vete
 STR_0063_OF_RUBBER                                              :{VOLUME} gummi
-STR_0064_TON_OF_SUGAR                                           :{COMMA16} ton socker
-STR_0065_TOY                                                    :{COMMA16} leksak
-STR_0066_BAG_OF_CANDY                                           :{COMMA16} godispåse
+STR_0064_TON_OF_SUGAR                                           :{COMMA} ton socker
+STR_0065_TOY                                                    :{COMMA} leksak
+STR_0066_BAG_OF_CANDY                                           :{COMMA} godispåse
 STR_0067_OF_COLA                                                :{VOLUME} kola
-STR_0068_TON_OF_COTTON_CANDY                                    :{COMMA16} ton spunnet socker
-STR_0069_BUBBLE                                                 :{COMMA16} bubbla
-STR_006A_TON_OF_TOFFEE                                          :{COMMA16} ton knäck
-STR_006B_BATTERY                                                :{COMMA16} batteri
+STR_0068_TON_OF_COTTON_CANDY                                    :{COMMA} ton spunnet socker
+STR_0069_BUBBLE                                                 :{COMMA} bubbla
+STR_006A_TON_OF_TOFFEE                                          :{COMMA} ton knäck
+STR_006B_BATTERY                                                :{COMMA} batteri
 STR_006C_OF_PLASTIC                                             :{VOLUME} plast
-STR_006D_FIZZY_DRINK                                            :{COMMA16} läsk
+STR_006D_FIZZY_DRINK                                            :{COMMA} läsk
 STR_006E                                                        :
-STR_006F_PASSENGERS                                             :{COMMA16} passagerare
-STR_0070_TONS_OF_COAL                                           :{COMMA16} ton kol
-STR_0071_BAGS_OF_MAIL                                           :{COMMA16} postsäckar
+STR_006F_PASSENGERS                                             :{COMMA} passagerare
+STR_0070_TONS_OF_COAL                                           :{COMMA} ton kol
+STR_0071_BAGS_OF_MAIL                                           :{COMMA} postsäckar
 STR_0072_OF_OIL                                                 :{VOLUME} olja
-STR_0073_ITEMS_OF_LIVESTOCK                                     :{COMMA16} stycken boskap
-STR_0074_CRATES_OF_GOODS                                        :{COMMA16} lådor gods
-STR_0075_TONS_OF_GRAIN                                          :{COMMA16} ton spannmål
-STR_0076_TONS_OF_WOOD                                           :{COMMA16} ton timmer
-STR_0077_TONS_OF_IRON_ORE                                       :{COMMA16} ton järnmalm
-STR_0078_TONS_OF_STEEL                                          :{COMMA16} ton stål
-STR_0079_BAGS_OF_VALUABLES                                      :{COMMA16} värdesäckar
-STR_007A_TONS_OF_COPPER_ORE                                     :{COMMA16} ton kopparmalm
-STR_007B_TONS_OF_MAIZE                                          :{COMMA16} ton majs
-STR_007C_TONS_OF_FRUIT                                          :{COMMA16} ton frukt
-STR_007D_BAGS_OF_DIAMONDS                                       :{COMMA16} diamantsäckar
-STR_007E_TONS_OF_FOOD                                           :{COMMA16} ton mat
-STR_007F_TONS_OF_PAPER                                          :{COMMA16} ton papper
-STR_0080_BAGS_OF_GOLD                                           :{COMMA16} guldsäckar
+STR_0073_ITEMS_OF_LIVESTOCK                                     :{COMMA} stycken boskap
+STR_0074_CRATES_OF_GOODS                                        :{COMMA} lådor gods
+STR_0075_TONS_OF_GRAIN                                          :{COMMA} ton spannmål
+STR_0076_TONS_OF_WOOD                                           :{COMMA} ton timmer
+STR_0077_TONS_OF_IRON_ORE                                       :{COMMA} ton järnmalm
+STR_0078_TONS_OF_STEEL                                          :{COMMA} ton stål
+STR_0079_BAGS_OF_VALUABLES                                      :{COMMA} värdesäckar
+STR_007A_TONS_OF_COPPER_ORE                                     :{COMMA} ton kopparmalm
+STR_007B_TONS_OF_MAIZE                                          :{COMMA} ton majs
+STR_007C_TONS_OF_FRUIT                                          :{COMMA} ton frukt
+STR_007D_BAGS_OF_DIAMONDS                                       :{COMMA} diamantsäckar
+STR_007E_TONS_OF_FOOD                                           :{COMMA} ton mat
+STR_007F_TONS_OF_PAPER                                          :{COMMA} ton papper
+STR_0080_BAGS_OF_GOLD                                           :{COMMA} guldsäckar
 STR_0081_OF_WATER                                               :{VOLUME} vatten
-STR_0082_TONS_OF_WHEAT                                          :{COMMA16} ton vete
+STR_0082_TONS_OF_WHEAT                                          :{COMMA} ton vete
 STR_0083_OF_RUBBER                                              :{VOLUME} gummi
-STR_0084_TONS_OF_SUGAR                                          :{COMMA16} ton socker
-STR_0085_TOYS                                                   :{COMMA16} leksaker
-STR_0086_BAGS_OF_CANDY                                          :{COMMA16} godispåsar
+STR_0084_TONS_OF_SUGAR                                          :{COMMA} ton socker
+STR_0085_TOYS                                                   :{COMMA} leksaker
+STR_0086_BAGS_OF_CANDY                                          :{COMMA} godispåsar
 STR_0087_OF_COLA                                                :{VOLUME} kola
-STR_0088_TONS_OF_COTTON_CANDY                                   :{COMMA16} ton spunnet socker
-STR_0089_BUBBLES                                                :{COMMA16} bubblor
-STR_008A_TONS_OF_TOFFEE                                         :{COMMA16} ton knäck
-STR_008B_BATTERIES                                              :{COMMA16} batterier
+STR_0088_TONS_OF_COTTON_CANDY                                   :{COMMA} ton spunnet socker
+STR_0089_BUBBLES                                                :{COMMA} bubblor
+STR_008A_TONS_OF_TOFFEE                                         :{COMMA} ton knäck
+STR_008B_BATTERIES                                              :{COMMA} batterier
 STR_008C_OF_PLASTIC                                             :{VOLUME} plast
-STR_008D_FIZZY_DRINKS                                           :{COMMA16} läsk
+STR_008D_FIZZY_DRINKS                                           :{COMMA} läsk
 STR_008E                                                        :
 STR_008F_PS                                                     :{TINYFONT}PS
 STR_0090_CL                                                     :{TINYFONT}KL
@@ -219,8 +219,8 @@
 STR_00DF_GREY                                                   :Grå
 STR_00E0_WHITE                                                  :Vit
 STR_00E1_TOO_MANY_VEHICLES_IN_GAME                              :{WHITE}För många fordon i spelet
-STR_00E2                                                        :{BLACK}{COMMA16}
-STR_00E3                                                        :{RED}{COMMA16}
+STR_00E2                                                        :{BLACK}{COMMA}
+STR_00E3                                                        :{RED}{COMMA}
 STR_00E4_LOCATION                                               :{BLACK}Plats
 STR_00E5_CONTOURS                                               :Konturer
 STR_00E6_VEHICLES                                               :Fordon
@@ -441,18 +441,18 @@
 STR_0198_PROFIT_THIS_YEAR_LAST_YEAR                             :{TINYFONT}{BLACK}Vinst detta år: {CURRENCY} (förra året: {CURRENCY})
 
 ############ range for service numbers starts
-STR_0199_YEAR                                                   :{COMMA16} år ({COMMA16})
-STR_019A_YEARS                                                  :{COMMA16} år ({COMMA16})
-STR_019B_YEARS                                                  :{RED}{COMMA16} år ({COMMA16})
+STR_0199_YEAR                                                   :{COMMA} år ({COMMA})
+STR_019A_YEARS                                                  :{COMMA} år ({COMMA})
+STR_019B_YEARS                                                  :{RED}{COMMA} år ({COMMA})
 ############ range for service numbers ends
 
 STR_019C_ROAD_VEHICLE                                           :Vägfordon
 STR_019D_AIRCRAFT                                               :Flygplan
 STR_019E_SHIP                                                   :Skepp
 STR_019F_TRAIN                                                  :Tåg
-STR_01A0_IS_GETTING_OLD                                         :{WHITE}{STRING} {COMMA16} börjar bli gammal
-STR_01A1_IS_GETTING_VERY_OLD                                    :{WHITE}{STRING} {COMMA16} börjar bli väldigt gammal
-STR_01A2_IS_GETTING_VERY_OLD_AND                                :{WHITE}{STRING} {COMMA16} börjar bli väldigt gammal och måste bytas ut
+STR_01A0_IS_GETTING_OLD                                         :{WHITE}{STRING} {COMMA} börjar bli gammal
+STR_01A1_IS_GETTING_VERY_OLD                                    :{WHITE}{STRING} {COMMA} börjar bli väldigt gammal
+STR_01A2_IS_GETTING_VERY_OLD_AND                                :{WHITE}{STRING} {COMMA} börjar bli väldigt gammal och måste bytas ut
 STR_01A3_LAND_AREA_INFORMATION                                  :{WHITE}Markinformation
 STR_01A4_COST_TO_CLEAR_N_A                                      :{BLACK}Kostnad att röja: {LTBLUE}N/A
 STR_01A5_COST_TO_CLEAR                                          :{BLACK}Kostnad att röja: {LTBLUE}{CURRENCY}
@@ -497,7 +497,7 @@
 STR_01CA_31ST                                                   :31
 ############ range for days	ends
 
-STR_01CB                                                        :{TINYFONT}{COMMA16}
+STR_01CB                                                        :{TINYFONT}{COMMA}
 STR_01CC_TOGGLE_LARGE_SMALL_MAP                                 :{BLACK}Växla stor/liten kartstorlek
 STR_01CD_SELECT_TUTORIAL_DEMONSTRATION                          :{WHITE}Välj Tutorial/Demonstration
 
@@ -509,7 +509,7 @@
 STR_CARGO_ACCEPTED_5                                            :{BLACK}Accepterat gods: {LTBLUE}{STRING}, {STRING}, {STRING}, {STRING}, {STRING}
 ############ range for cargo acecpted ends
 
-STR_01D1_8                                                      :({COMMA8}/8 {STRING})
+STR_01D1_8                                                      :({COMMA}/8 {STRING})
 STR_01D2_JAZZ_JUKEBOX                                           :{WHITE}Jazz Jukebox
 STR_01D3_SOUND_MUSIC                                            :Ljud/musik
 STR_01D4_SHOW_SOUND_MUSIC_WINDOW                                :{BLACK}Visa ljud-/musikfönster
@@ -528,16 +528,16 @@
 STR_01E1_START_PLAYING_MUSIC                                    :{BLACK}Börja spela musik
 STR_01E2_DRAG_SLIDERS_TO_SET_MUSIC                              :{BLACK}Dra för att ändra musik- och ljudvolym
 STR_01E3                                                        :{DKGREEN}{TINYFONT}--
-STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA8}
-STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA8}
+STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA}
+STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA}
 STR_01E6                                                        :{DKGREEN}{TINYFONT}------
 STR_01E7                                                        :{DKGREEN}{TINYFONT}"{STRING}"
 STR_01E8_TRACK_XTITLE                                           :{BLACK}{TINYFONT}Spår{SETX 88}Titel
 STR_01E9_SHUFFLE                                                :{TINYFONT}Slumpa
 STR_01EA_PROGRAM                                                :{TINYFONT}{BLACK}Program
 STR_01EB_MUSIC_PROGRAM_SELECTION                                :{WHITE}Musikprogram
-STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA16} "{STRING}"
-STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA16}   "{STRING}"
+STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} "{STRING}"
+STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA}   "{STRING}"
 STR_01EE_TRACK_INDEX                                            :{TINYFONT}{BLACK}Spårindex
 STR_01EF_PROGRAM                                                :{TINYFONT}{BLACK}Program - '{STRING}'
 STR_01F0_CLEAR                                                  :{TINYFONT}{BLACK}Töm
@@ -577,7 +577,7 @@
 STR_0210_TOO_FAR_FROM_PREVIOUS_DESTINATIO                       :{WHITE}...för långt från föregående destination
 STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Top companies who reached {NUMU16}{}({STRING} Level)
 STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Company League Table in {NUMU16}
-STR_0212                                                        :{BIGFONT}{COMMA16}.
+STR_0212                                                        :{BIGFONT}{COMMA}.
 STR_0213_BUSINESSMAN                                            :Affärsman
 STR_0214_ENTREPRENEUR                                           :Entreprenör
 STR_0215_INDUSTRIALIST                                          :Industrialist
@@ -586,12 +586,12 @@
 STR_0218_MOGUL                                                  :Mogul
 STR_0219_TYCOON_OF_THE_CENTURY                                  :Århundradets Tycoon
 STR_HIGHSCORE_NAME                                              :{BIGFONT}{STRING}, {STRING}
-STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA16})
+STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA})
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{STRING} uppnår '{STRING}' status!
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{STRING} från {STRING} uppnår '{STRING}' status!
 STR_021D                                                        :{BLACK}
 STR_021E                                                        :{WHITE}
-STR_021F                                                        :{BLUE}{COMMA16}
+STR_021F                                                        :{BLUE}{COMMA}
 STR_0220_CREATE_SCENARIO                                        :{BLACK}Nytt scenario
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Scenario-editor
@@ -788,8 +788,8 @@
 STR_EXTRA_VIEW_PORT                                             :Nytt vy fönster
 STR_SIGN_LIST                                                   :Skyltlista
 STR_02DF_TOWN_DIRECTORY                                         :Lista av städer
-STR_TOWN_POPULATION                                             :{BLACK}Världsbefolkning: {COMMA32}
-STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Vy fönster {COMMA16}
+STR_TOWN_POPULATION                                             :{BLACK}Världsbefolkning: {COMMA}
+STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Vy fönster {COMMA}
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN                                :{BLACK}Kopiera till vy
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT                             :{BLACK}Kopiera kartans position till detta Vyfönster
 STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW                                :{BLACK}Klistra in vyn
@@ -961,34 +961,34 @@
 STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Kan inte kopiera orderlistan...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Slut på delade order - -
 
-STR_TRAIN_IS_LOST                                               :{WHITE}Tåg {COMMA16} har tappat bort sig.
-STR_TRAIN_IS_UNPROFITABLE                                       :{WHITE}Tåg {COMMA16}s vinst förra året var {CURRENCY}
+STR_TRAIN_IS_LOST                                               :{WHITE}Tåg {COMMA} har tappat bort sig.
+STR_TRAIN_IS_UNPROFITABLE                                       :{WHITE}Tåg {COMMA}s vinst förra året var {CURRENCY}
 STR_EURO_INTRODUCE                                              :{BLACK}{BIGFONT}Europeiska Valutasystemet!{}{}Euron introduceras och ditt land går över till den som dess enda valuta!
 
 # Start of order review system.
 # DON'T ADD OR REMOVE LINES HERE
-STR_TRAIN_HAS_TOO_FEW_ORDERS                                    :{WHITE}Tåg {COMMA16} har för få destinationer
-STR_TRAIN_HAS_VOID_ORDER                                        :{WHITE}Tåg {COMMA16} har en bruten destination
-STR_TRAIN_HAS_DUPLICATE_ENTRY                                   :{WHITE}Tåg {COMMA16} har dubblerade destinationer
-STR_TRAIN_HAS_INVALID_ENTRY                                     :{WHITE}Tåg {COMMA16} har en felaktig station ibland destinationerna
-STR_ROADVEHICLE_HAS_TOO_FEW_ORDERS                              :{WHITE}Vägfordon {COMMA16} har för få destinationer
-STR_ROADVEHICLE_HAS_VOID_ORDER                                  :{WHITE}Vägfordon {COMMA16} har en bruten destination
-STR_ROADVEHICLE_HAS_DUPLICATE_ENTRY                             :{WHITE}Vägfordon {COMMA16} har dubblerade destinationer
-STR_ROADVEHICLE_HAS_INVALID_ENTRY                               :{WHITE}Vägfordon {COMMA16} har en felaktig station ibland destinationerna
-STR_SHIP_HAS_TOO_FEW_ORDERS                                     :{WHITE}Skepp {COMMA16} har för få destinationer
-STR_SHIP_HAS_VOID_ORDER                                         :{WHITE}Skepp {COMMA16} har en bruten destination
-STR_SHIP_HAS_DUPLICATE_ENTRY                                    :{WHITE}Skepp {COMMA16} har dubblerade destinationer
-STR_SHIP_HAS_INVALID_ENTRY                                      :{WHITE}Skepp {COMMA16} har en felaktig station ibland destinationerna
-STR_AIRCRAFT_HAS_TOO_FEW_ORDERS                                 :{WHITE}Flygplan {COMMA16} har för få destinationer
-STR_AIRCRAFT_HAS_VOID_ORDER                                     :{WHITE}Flygplan {COMMA16} har en bruten destination
-STR_AIRCRAFT_HAS_DUPLICATE_ENTRY                                :{WHITE}Flygplan {COMMA16} har dubblerade destinationer
-STR_AIRCRAFT_HAS_INVALID_ENTRY                                  :{WHITE}Flygplan {COMMA16} har en felaktig station ibland destinationerna
+STR_TRAIN_HAS_TOO_FEW_ORDERS                                    :{WHITE}Tåg {COMMA} har för få destinationer
+STR_TRAIN_HAS_VOID_ORDER                                        :{WHITE}Tåg {COMMA} har en bruten destination
+STR_TRAIN_HAS_DUPLICATE_ENTRY                                   :{WHITE}Tåg {COMMA} har dubblerade destinationer
+STR_TRAIN_HAS_INVALID_ENTRY                                     :{WHITE}Tåg {COMMA} har en felaktig station ibland destinationerna
+STR_ROADVEHICLE_HAS_TOO_FEW_ORDERS                              :{WHITE}Vägfordon {COMMA} har för få destinationer
+STR_ROADVEHICLE_HAS_VOID_ORDER                                  :{WHITE}Vägfordon {COMMA} har en bruten destination
+STR_ROADVEHICLE_HAS_DUPLICATE_ENTRY                             :{WHITE}Vägfordon {COMMA} har dubblerade destinationer
+STR_ROADVEHICLE_HAS_INVALID_ENTRY                               :{WHITE}Vägfordon {COMMA} har en felaktig station ibland destinationerna
+STR_SHIP_HAS_TOO_FEW_ORDERS                                     :{WHITE}Skepp {COMMA} har för få destinationer
+STR_SHIP_HAS_VOID_ORDER                                         :{WHITE}Skepp {COMMA} har en bruten destination
+STR_SHIP_HAS_DUPLICATE_ENTRY                                    :{WHITE}Skepp {COMMA} har dubblerade destinationer
+STR_SHIP_HAS_INVALID_ENTRY                                      :{WHITE}Skepp {COMMA} har en felaktig station ibland destinationerna
+STR_AIRCRAFT_HAS_TOO_FEW_ORDERS                                 :{WHITE}Flygplan {COMMA} har för få destinationer
+STR_AIRCRAFT_HAS_VOID_ORDER                                     :{WHITE}Flygplan {COMMA} har en bruten destination
+STR_AIRCRAFT_HAS_DUPLICATE_ENTRY                                :{WHITE}Flygplan {COMMA} har dubblerade destinationer
+STR_AIRCRAFT_HAS_INVALID_ENTRY                                  :{WHITE}Flygplan {COMMA} har en felaktig station ibland destinationerna
 # end of order system
 
-STR_TRAIN_AUTORENEW_FAILED                                      :{WHITE}Automatiska förnyandet av tåg {COMMA16} misslyckades (inte tillräckligt med pengar)
-STR_ROADVEHICLE_AUTORENEW_FAILED                                :{WHITE}Automatiska förnyandet av vägfordon {COMMA16} misslyckades (inte tillräckligt med pengar)
-STR_SHIP_AUTORENEW_FAILED                                       :{WHITE}Automatiska förnyandet av skepp {COMMA16} misslyckades (inte tillräckligt med pengar)
-STR_AIRCRAFT_AUTORENEW_FAILED                                   :{WHITE}Automatiska förnyandet av flygplan {COMMA16} misslyckades (inte tillräckligt med pengar)
+STR_TRAIN_AUTORENEW_FAILED                                      :{WHITE}Automatiska förnyandet av tåg {COMMA} misslyckades (inte tillräckligt med pengar)
+STR_ROADVEHICLE_AUTORENEW_FAILED                                :{WHITE}Automatiska förnyandet av vägfordon {COMMA} misslyckades (inte tillräckligt med pengar)
+STR_SHIP_AUTORENEW_FAILED                                       :{WHITE}Automatiska förnyandet av skepp {COMMA} misslyckades (inte tillräckligt med pengar)
+STR_AIRCRAFT_AUTORENEW_FAILED                                   :{WHITE}Automatiska förnyandet av flygplan {COMMA} misslyckades (inte tillräckligt med pengar)
 
 STR_CONFIG_PATCHES                                              :{BLACK}Konfigurera patchar
 STR_CONFIG_PATCHES_TIP                                          :{BLACK}Konfigurera patcharna
@@ -1103,7 +1103,7 @@
 STR_CHEATS_TIP                                                  :{BLACK}Checkboxar indikerar om du använt det här fusket förut
 STR_CHEATS_WARNING                                              :{BLACK}Varning! Du är på väg att förråda dina motståndare. Kom ihåg att sådant aldrig glöms bort.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Öka pengar genom att {CURRENCY64}
-STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Spelar som: {ORANGE}{COMMA16}
+STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Spelar som: {ORANGE}{COMMA}
 STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}trimmad bulldozer (ta bort industrier, fyrar etc.): {ORANGE}{STRING}
 STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Tunnlar kan korsa varandra: {ORANGE}{STRING}
 STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Byggnation i pause-läge: {ORANGE}{STRING}
@@ -1119,7 +1119,7 @@
 STR_GO_NON_STOP_TO_WAYPOINT                                     :Gå via {WAYPOINT} utan att stanna
 
 STR_WAYPOINTNAME_CITY                                           :Kontrollstation {TOWN}
-STR_WAYPOINTNAME_CITY_SERIAL                                    :Kontrollstation {TOWN} #{COMMA16}
+STR_WAYPOINTNAME_CITY_SERIAL                                    :Kontrollstation {TOWN} #{COMMA}
 STR_LANDINFO_WAYPOINT                                           :Kontrollpunkt
 
 STR_WAYPOINT                                                    :{WHITE}Vägpunkt
@@ -1202,8 +1202,8 @@
 STR_CONSTRUCT_SUGAR_MINE_TIP                                    :{BLACK}Bygg sockergruva
 
 STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Industrier
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}){YELLOW} ({COMMA16}% transporterat)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}/{STRING}){YELLOW} ({COMMA16}%/{COMMA16}% transporterat)
+STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}){YELLOW} ({COMMA}% transporterat)
+STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}/{STRING}){YELLOW} ({COMMA}%/{COMMA}% transporterat)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{TOWN} {STRING}
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}... för nära annan industri
@@ -1243,15 +1243,15 @@
 STR_NETWORK_ADD_SERVER_TIP                                      :{BLACK}Lägg till en server till listan som alltid kommer kontrolleras för aktiva spel.
 STR_NETWORK_ENTER_IP                                            :{BLACK}IP-adressen till servern
 
-STR_NETWORK_CLIENTS_ONLINE                                      :{BLACK}{COMMA16}/{COMMA16}
+STR_NETWORK_CLIENTS_ONLINE                                      :{BLACK}{COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Klienter
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Klienter online / Klienter max
 STR_NETWORK_GAME_INFO                                           :{SILVER}SPELINFO
 STR_ORANGE                                                      :{ORANGE}{STRING}
-STR_NETWORK_CLIENTS                                             :{SILVER}Klienter:  {WHITE}{COMMA8} / {COMMA8}
+STR_NETWORK_CLIENTS                                             :{SILVER}Klienter:  {WHITE}{COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}Språk:  {WHITE}{STRING}
 STR_NETWORK_TILESET                                             :{SILVER}Klimat:  {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Kartstorlek:  {WHITE}{COMMA16}x{COMMA16}
+STR_NETWORK_MAP_SIZE                                            :{SILVER}Kartstorlek:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Serverversion:  {WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Server adress:  {WHITE}{STRING} : {NUMU16}
 STR_NETWORK_START_DATE                                          :{SILVER}Startdatum:  {WHITE}{DATE_SHORT}
@@ -1513,21 +1513,21 @@
 
 ##id 0x2000
 STR_2000_TOWNS                                                  :{WHITE}Städer
-STR_TOWN_LABEL_POP                                              :{WHITE}{STRING} ({COMMA32})
+STR_TOWN_LABEL_POP                                              :{WHITE}{STRING} ({COMMA})
 STR_2001                                                        :{WHITE}{STRING}
 STR_2002                                                        :{TINYFONT}{BLACK}{STRING}
 STR_2003                                                        :{TINYFONT}{WHITE}{STRING}
 STR_2004_BUILDING_MUST_BE_DEMOLISHED                            :{WHITE}Byggnad måste rivas först
 STR_2005                                                        :{WHITE}{TOWN}
-STR_2006_POPULATION                                             :{BLACK}Invånare: {ORANGE}{COMMA32}{BLACK}  Hus: {ORANGE}{COMMA32}
+STR_2006_POPULATION                                             :{BLACK}Invånare: {ORANGE}{COMMA}{BLACK}  Hus: {ORANGE}{COMMA}
 STR_2007_RENAME_TOWN                                            :Byt namn på stad
 STR_2008_CAN_T_RENAME_TOWN                                      :{WHITE}Kan inte byta namn på stad...
 STR_2009_LOCAL_AUTHORITY_REFUSES                                :{WHITE}{TOWN} kommunen tillåter inte detta
 STR_200A_TOWN_NAMES_CLICK_ON_NAME                               :{BLACK}Stadsnamn - klicka på ett namn för att centrera vyn på staden
 STR_200B_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Centrera vyn på staden
 STR_200C_CHANGE_TOWN_NAME                                       :{BLACK}Byt namn på staden
-STR_200D_PASSENGERS_LAST_MONTH_MAX                              :{BLACK}Passagerare förra månaden: {ORANGE}{COMMA32}{BLACK}  max: {ORANGE}{COMMA32}
-STR_200E_MAIL_LAST_MONTH_MAX                                    :{BLACK}Post förra månaden: {ORANGE}{COMMA32}{BLACK}  max: {ORANGE}{COMMA32}
+STR_200D_PASSENGERS_LAST_MONTH_MAX                              :{BLACK}Passagerare förra månaden: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
+STR_200E_MAIL_LAST_MONTH_MAX                                    :{BLACK}Post förra månaden: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
 STR_200F_TALL_OFFICE_BLOCK                                      :Högt kontor
 STR_2010_OFFICE_BLOCK                                           :Kontor
 STR_2011_SMALL_BLOCK_OF_FLATS                                   :Små lägenheter
@@ -1601,7 +1601,7 @@
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Muta den lokala kommunen för att öka din värdering, på risken av att få höga böter om du blir upptäckt.{}  Kostnad: {CURRENCY}
 STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Trafikkaos i {TOWN}!{}{}Vägombyggnadsprogram bekostat av {STRING} medför 6 månader av elände för bilister!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
-STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA32})
+STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA})
 STR_2058_UNDER_CONSTRUCTION                                     :{STRING} (under byggnation)
 STR_2059_IGLOO                                                  :Igloo
 STR_205A_TEPEES                                                 :Kåtor
@@ -1663,7 +1663,7 @@
 STR_303C_OUTSTANDING                                            :Enastående
 ############ range for rating ends
 
-STR_303D                                                        :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA8}%)
+STR_303D                                                        :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_303E_NO_LONGER_ACCEPTS                                      :{WHITE}{STATION} tar inte längre emot {STRING}
 STR_303F_NO_LONGER_ACCEPTS_OR                                   :{WHITE}{STATION} tar inte längre emot {STRING} och {STRING}
 STR_3040_NOW_ACCEPTS                                            :{WHITE}{STATION} tar nu emot {STRING}
@@ -1674,7 +1674,7 @@
 STR_3045_TOO_CLOSE_TO_ANOTHER_TRUCK                             :{WHITE}För nära en annan lastbilsbrygga
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Måste riva busshållplats först
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Måste riva lastbilsbrygga först
-STR_3048_STATIONS                                               :{WHITE}{STRING} - {COMMA16} Stationer
+STR_3048_STATIONS                                               :{WHITE}{STRING} - {COMMA} Stationer
 STR_3049_0                                                      :{YELLOW}{STATION} {STRINL 0x30D1}
 STR_304A_NONE                                                   :{YELLOW}- Inga -
 STR_304B_SITE_UNSUITABLE                                        :{WHITE}...plats olämplig
@@ -1730,7 +1730,7 @@
 STR_4002_SAVE                                                   :{BLACK}Spara
 STR_4003_DELETE                                                 :{BLACK}Ta bort
 STR_4004                                                        :{STRING}, {DATE_LONG}
-STR_4005_BYTES_FREE                                             :{BLACK}{COMMA32} megabytes ledigt
+STR_4005_BYTES_FREE                                             :{BLACK}{COMMA} megabytes ledigt
 STR_4006_UNABLE_TO_READ_DRIVE                                   :{BLACK}Kan inte läsa från disk
 STR_4007_GAME_SAVE_FAILED                                       :{WHITE}Sparningen av spelet misslyckades
 STR_4008_UNABLE_TO_DELETE_FILE                                  :{WHITE}Kan inte ta bort filen
@@ -1791,7 +1791,7 @@
 ############ range for requires	ends
 
 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Produktion förra månaden:
-STR_482B_TRANSPORTED                                            :{YELLOW}{STRING}{BLACK} ({COMMA16}% transporterat)
+STR_482B_TRANSPORTED                                            :{YELLOW}{STRING}{BLACK} ({COMMA}% transporterat)
 STR_482C_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Centrera vyn ovanför industrin
 STR_482D_NEW_UNDER_CONSTRUCTION                                 :{BLACK}{BIGFONT}Ny {STRING} under byggnation nära {TOWN}!
 STR_482E_NEW_BEING_PLANTED_NEAR                                 :{BLACK}{BIGFONT}Ny {STRING} planteras nära {TOWN}!
@@ -1808,8 +1808,8 @@
 STR_4839_PRODUCTION_DOWN_BY_50                                  :{BLACK}{BIGFONT}Produktionen vid {TOWN} {STRING} går ned med 50%
 STR_483A_INSECT_INFESTATION_CAUSES                              :{BLACK}{BIGFONT}Problem med insekter orsakar kris vid {TOWN} {STRING}!{}Produktionen ned med 50%
 STR_483B_CAN_ONLY_BE_POSITIONED                                 :{WHITE}...kan bara placeras nära kartans kant
-STR_INDUSTRY_PROD_GOUP                                          :{BLACK}{BIGFONT}Produktionen av {STRING} vid {TOWN} {STRING} upp med {COMMA16}%!
-STR_INDUSTRY_PROD_GODOWN                                        :{BLACK}{BIGFONT}Produktionen av {STRING} vid {TOWN} {STRING} ned med {COMMA16}%!
+STR_INDUSTRY_PROD_GOUP                                          :{BLACK}{BIGFONT}Produktionen av {STRING} vid {TOWN} {STRING} upp med {COMMA}%!
+STR_INDUSTRY_PROD_GODOWN                                        :{BLACK}{BIGFONT}Produktionen av {STRING} vid {TOWN} {STRING} ned med {COMMA}%!
 
 ##id 0x5000
 STR_5000_TRAIN_IN_TUNNEL                                        :{WHITE}Tåg i tunnel
@@ -1872,10 +1872,10 @@
 ##id 0x6000
 STR_SV_EMPTY                                                    :
 STR_SV_UNNAMED                                                  :Inget namn{SKIP}
-STR_SV_TRAIN_NAME                                               :Tåg {COMMA16}
-STR_SV_ROADVEH_NAME                                             :Vägfordon {COMMA16}
-STR_SV_SHIP_NAME                                                :Skepp {COMMA16}
-STR_SV_AIRCRAFT_NAME                                            :Flygplan {COMMA16}
+STR_SV_TRAIN_NAME                                               :Tåg {COMMA}
+STR_SV_ROADVEH_NAME                                             :Vägfordon {COMMA}
+STR_SV_SHIP_NAME                                                :Skepp {COMMA}
+STR_SV_AIRCRAFT_NAME                                            :Flygplan {COMMA}
 
 STR_SV_STNAME                                                   :{STRING}
 STR_SV_STNAME_NORTH                                             :{STRING} norr
@@ -1925,12 +1925,12 @@
 ############ range for difficulty levels ends
 
 ############ range for difficulty settings starts
-STR_6805_MAXIMUM_NO_COMPETITORS                                 :{LTBLUE}Max antal motståndare: {ORANGE}{COMMA16}
+STR_6805_MAXIMUM_NO_COMPETITORS                                 :{LTBLUE}Max antal motståndare: {ORANGE}{COMMA}
 STR_6806_COMPETITOR_START_TIME                                  :{LTBLUE}Startpunkt för motståndare: {ORANGE}{STRING}
 STR_6807_NO_OF_TOWNS                                            :{LTBLUE}Antal städer: {ORANGE}{STRING}
 STR_6808_NO_OF_INDUSTRIES                                       :{LTBLUE}Antal industrier: {ORANGE}{STRING}
 STR_6809_MAXIMUM_INITIAL_LOAN_000                               :{LTBLUE}Maxstorlek på lån: {ORANGE}{CURRENCY}
-STR_680A_INITIAL_INTEREST_RATE                                  :{LTBLUE}Initial ränta: {ORANGE}{COMMA16}%
+STR_680A_INITIAL_INTEREST_RATE                                  :{LTBLUE}Initial ränta: {ORANGE}{COMMA}%
 STR_680B_VEHICLE_RUNNING_COSTS                                  :{LTBLUE}Löpande kostnader för fordon: {ORANGE}{STRING}
 STR_680C_CONSTRUCTION_SPEED_OF_COMPETITOR                       :{LTBLUE}Bygghastighet för motståndare: {ORANGE}{STRING}
 STR_680D_INTELLIGENCE_OF_COMPETITORS                            :{LTBLUE}Intelligens hos motståndare: {ORANGE}{STRING}
@@ -1989,7 +1989,7 @@
 ##id 0x7000
 STR_7000                                                        :
 STR_7001                                                        :{WHITE}{STRING} {BLACK}{STRING}
-STR_7002_PLAYER                                                 :(Spelare {COMMA16})
+STR_7002_PLAYER                                                 :(Spelare {COMMA})
 STR_7004_NEW_FACE                                               :{BLACK}Nytt ansikte
 STR_7005_COLOR_SCHEME                                           :{BLACK}Färgval
 STR_7006_COLOR_SCHEME                                           :{GOLD}Färgval:
@@ -2023,7 +2023,7 @@
 STR_7022_INCOME_GRAPH                                           :{WHITE}Graf över inkomster
 STR_CURRCOMPACT32                                               :{CURRCOMPACT}
 STR_CURRCOMPACT64                                               :{CURRCOMPACT64}
-STR_7024                                                        :{COMMA32}
+STR_7024                                                        :{COMMA}
 STR_7025_OPERATING_PROFIT_GRAPH                                 :{WHITE}Graf över vinst
 STR_7026_BANK_BALANCE                                           :{WHITE}Banksaldo
 STR_7027_LOAN                                                   :{WHITE}Lån
@@ -2047,14 +2047,14 @@
 STR_7037_PRESIDENT                                              :{WHITE}{STRING}{}{GOLD}(President)
 STR_7038_INAUGURATED                                            :{GOLD}Etablerades: {WHITE}{NUMU16}
 STR_7039_VEHICLES                                               :{GOLD}Fordon:
-STR_703A_TRAIN                                                  :{WHITE}{COMMA16} tåg
-STR_703B_TRAINS                                                 :{WHITE}{COMMA16} tåg
-STR_703C_ROAD_VEHICLE                                           :{WHITE}{COMMA16} vägfordon
-STR_703D_ROAD_VEHICLES                                          :{WHITE}{COMMA16} vägfordon
-STR_703E_AIRCRAFT                                               :{WHITE}{COMMA16} flygplan
-STR_703F_AIRCRAFT                                               :{WHITE}{COMMA16} flygplan
-STR_7040_SHIP                                                   :{WHITE}{COMMA16} skepp
-STR_7041_SHIPS                                                  :{WHITE}{COMMA16} skepp
+STR_703A_TRAIN                                                  :{WHITE}{COMMA} tåg
+STR_703B_TRAINS                                                 :{WHITE}{COMMA} tåg
+STR_703C_ROAD_VEHICLE                                           :{WHITE}{COMMA} vägfordon
+STR_703D_ROAD_VEHICLES                                          :{WHITE}{COMMA} vägfordon
+STR_703E_AIRCRAFT                                               :{WHITE}{COMMA} flygplan
+STR_703F_AIRCRAFT                                               :{WHITE}{COMMA} flygplan
+STR_7040_SHIP                                                   :{WHITE}{COMMA} skepp
+STR_7041_SHIPS                                                  :{WHITE}{COMMA} skepp
 STR_7042_NONE                                                   :{WHITE}Inga
 STR_7043_FACE_SELECTION                                         :{WHITE}Välj ansikte
 STR_7044_MALE                                                   :{BLACK}Man
@@ -2119,8 +2119,8 @@
 STR_707A_SELL_25_SHARE_IN_THIS_COMPANY                          :{BLACK}Sälj 25% andel i detta företag
 STR_707B_CAN_T_BUY_25_SHARE_IN_THIS                             :{WHITE}Kan inte köpa 25% andel i detta företag...
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}Kan inte sälja 25% andel i detta företag...
-STR_707D_OWNED_BY                                               :{WHITE}({COMMA16}% ägd av {STRING})
-STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA16}% ägd av {STRING}{}   {COMMA16}% ägd av {STRING})
+STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% ägd av {STRING})
+STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}% ägd av {STRING}{}   {COMMA}% ägd av {STRING})
 STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{STRING} har tagits över av {STRING}!
 STR_7080_PROTECTED                                              :{WHITE}Det här företaget bedriver inte aktiehandel ännu....
 
@@ -2395,8 +2395,8 @@
 STR_8801_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Invånarna firar . . .{}Första tåget ankommer till {STATION}!
 STR_8802_DETAILS                                                :{WHITE}{STRING} (Details)
 STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}Tåg i vägen
-STR_8804                                                        :{SETX 10}{COMMA8}: {STRING}
-STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA8}: {STRING}
+STR_8804                                                        :{SETX 10}{COMMA}: {STRING}
+STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING}
 STR_8806_GO_TO                                                  :Gå till {STATION}
 STR_SERVICE_AT_TRAIN_DEPOT                                      :Servning vid {TOWN} Tåg depå
 STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT                             :Gå non-stop till {TOWN} depå
@@ -2410,13 +2410,13 @@
 STR_UNKNOWN_DESTINATION                                         :okänd destination
 STR_8812_EMPTY                                                  :{LTBLUE}Tom
 STR_8813_FROM                                                   :{LTBLUE}{CARGO} från {STATION}
-STR_8814_TRAIN_IS_WAITING_IN_DEPOT                              :{WHITE}Tåg {COMMA16} väntar i depå
+STR_8814_TRAIN_IS_WAITING_IN_DEPOT                              :{WHITE}Tåg {COMMA} väntar i depå
 STR_8815_NEW_VEHICLES                                           :{BLACK}Nytt fordon
 STR_8816                                                        :{BLACK}-
 STR_8818_INFORMATION                                            :{BLACK}Information
 STR_8819_TRAIN_TOO_LONG                                         :{WHITE}Tåg för långt
 STR_881A_TRAINS_CAN_ONLY_BE_ALTERED                             :{WHITE}Tåg kan bara ändras när det står still inuti en depå
-STR_881B_TRAINS                                                 :{WHITE}{STRING} - {COMMA16} Tåg
+STR_881B_TRAINS                                                 :{WHITE}{STRING} - {COMMA} Tåg
 STR_881C_NEW_RAIL_VEHICLES                                      :{WHITE}Nytt tågfordon
 STR_881D_NEW_MONORAIL_VEHICLES                                  :{WHITE}Nytt monorail-fordon
 STR_881E_NEW_MAGLEV_VEHICLES                                    :{WHITE}Nytt maglev-Fordon
@@ -2450,8 +2450,8 @@
 STR_8839_CAN_T_SELL_RAILROAD_VEHICLE                            :{WHITE}Kan inte sälja järnvägfordon...
 STR_883A_UNABLE_TO_FIND_ROUTE_TO                                :{WHITE}Kan inte hitta rutt till närmaste depå
 STR_883B_CAN_T_STOP_START_TRAIN                                 :{WHITE}Kan inte stoppa/starta tåg...
-STR_883C_SERVICING_INTERVAL_DAYS                                :{BLACK}Serviceintervall: {LTBLUE}{COMMA16}dagar{BLACK}   Senaste service: {LTBLUE}{DATE_LONG}
-STR_SERVICING_INTERVAL_PERCENT                                  :{BLACK}Serviceintervall: {LTBLUE}{COMMA16}%{BLACK}   Senaste service: {LTBLUE}{DATE_LONG}
+STR_883C_SERVICING_INTERVAL_DAYS                                :{BLACK}Serviceintervall: {LTBLUE}{COMMA}dagar{BLACK}   Senaste service: {LTBLUE}{DATE_LONG}
+STR_SERVICING_INTERVAL_PERCENT                                  :{BLACK}Serviceintervall: {LTBLUE}{COMMA}%{BLACK}   Senaste service: {LTBLUE}{DATE_LONG}
 STR_883D_TRAINS_CLICK_ON_TRAIN_FOR                              :{BLACK}Tåg - klicka på tåg för information
 STR_883E_BUILD_NEW_TRAINS_REQUIRES                              :{BLACK}Bygg nytt tåg (kräver depå)
 STR_883F_TRAINS_CLICK_ON_TRAIN_FOR                              :{BLACK}Tåg - klicka på tåg för info, drag vagn för att lägga till/ta bort från tåg
@@ -2484,12 +2484,12 @@
 STR_SERVICE_HINT                                                :{BLACK}Skippa den här ordern om inte servning behövs
 STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}Nytt {STRING} nu tillgängligt!
 STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
-STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Kostnad: {CURRENCY} Vikt: {COMMA16}t{}Hastighet: {VELOCITY}  Effekt: {COMMA16}hp{}Löpande kostnad: {CURRENCY}/år{}Kapacitet: {STRING}
+STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Kostnad: {CURRENCY} Vikt: {COMMA}t{}Hastighet: {VELOCITY}  Effekt: {COMMA}hp{}Löpande kostnad: {CURRENCY}/år{}Kapacitet: {STRING}
 STR_885C_BROKEN_DOWN                                            :{RED}Motorstopp
 STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Ålder: {LTBLUE}{STRING}{BLACK}   Löpande kostnad: {LTBLUE}{CURRENCY}/yr
-STR_885E_WEIGHT_T_POWER_HP_MAX_SPEED                            :{BLACK}Vikt: {LTBLUE}{COMMA16}t  {BLACK}Effekt: {LTBLUE}{COMMA32}hp{BLACK} Tophastighet: {LTBLUE}{VELOCITY}
+STR_885E_WEIGHT_T_POWER_HP_MAX_SPEED                            :{BLACK}Vikt: {LTBLUE}{COMMA}t  {BLACK}Effekt: {LTBLUE}{COMMA}hp{BLACK} Tophastighet: {LTBLUE}{VELOCITY}
 STR_885F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Vinst detta år: {LTBLUE}{CURRENCY}  (förra år: {CURRENCY})
-STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Tillförlitlighet: {LTBLUE}{COMMA8}%  {BLACK}Motorstopp sedan förra service: {LTBLUE}{COMMA16}
+STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Tillförlitlighet: {LTBLUE}{COMMA}%  {BLACK}Motorstopp sedan förra service: {LTBLUE}{COMMA}
 STR_8861_STOPPED                                                :{RED}Stoppat
 STR_8862_CAN_T_MAKE_TRAIN_PASS_SIGNAL                           :{WHITE}Kan inte tillåta tåg att passera signal under fara...
 STR_8863_CRASHED                                                :{RED}Kraschad!
@@ -2497,7 +2497,7 @@
 STR_8865_NAME_TRAIN                                             :{WHITE}Byt namn på tåg
 STR_8866_CAN_T_NAME_TRAIN                                       :{WHITE}Kan inte byta namn på tåg...
 STR_8867_NAME_TRAIN                                             :{BLACK}Byt namn på tåg
-STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Tågkrash!{}{COMMA16} dog i eldklot efter kollision
+STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Tågkrash!{}{COMMA} dog i eldklot efter kollision
 STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}Kan inte kasta om tågets riktning...
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Byt namn på tågets fordonstyp
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Kan inte byta namn på tågets fordonstyp...
@@ -2507,7 +2507,7 @@
 
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Vägfordon i vägen
-STR_9001_ROAD_VEHICLES                                          :{WHITE}{STRING} - {COMMA16} Vägfordon
+STR_9001_ROAD_VEHICLES                                          :{WHITE}{STRING} - {COMMA} Vägfordon
 STR_9002                                                        :{WHITE}{STRING}
 STR_9003_ROAD_VEHICLE_DEPOT                                     :{WHITE}{TOWN} Vägfordon Depå
 STR_9004_NEW_VEHICLES                                           :{BLACK}Nytt Fordon
@@ -2521,13 +2521,13 @@
 STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Ålder: {LTBLUE}{STRING}{BLACK}   Löpande kostnad: {LTBLUE}{CURRENCY}/yr
 STR_900E_MAX_SPEED                                              :{BLACK}Tophastighet: {LTBLUE}{VELOCITY}
 STR_900F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Vinst detta år: {LTBLUE}{CURRENCY}  (förra år: {CURRENCY})
-STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Tillförlitlighet: {LTBLUE}{COMMA8}%  {BLACK}Motorstopp sedan förra service: {LTBLUE}{COMMA16}
+STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Tillförlitlighet: {LTBLUE}{COMMA}%  {BLACK}Motorstopp sedan förra service: {LTBLUE}{COMMA}
 STR_9011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Byggt: {LTBLUE}{NUMU16}{BLACK} Värde: {LTBLUE}{CURRENCY}
 STR_9012_CAPACITY                                               :{BLACK}Kapacitet: {LTBLUE}{STRING}
 STR_9013_MUST_BE_STOPPED_INSIDE                                 :{WHITE}...måste stoppas inuti ett bussgarage
 STR_9014_CAN_T_SELL_ROAD_VEHICLE                                :{WHITE}Kan inte sälja vägfordon...
 STR_9015_CAN_T_STOP_START_ROAD_VEHICLE                          :{WHITE}Kan inte stoppa/starta vägfordon...
-STR_9016_ROAD_VEHICLE_IS_WAITING                                :{WHITE}Vägfordon {COMMA16} väntar i depån
+STR_9016_ROAD_VEHICLE_IS_WAITING                                :{WHITE}Vägfordon {COMMA} väntar i depån
 STR_HEADING_FOR_ROAD_DEPOT                                      :{LTBLUE}På väg mot {TOWN} Vägdepå
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{LTBLUE}På väg mot {TOWN} Vägdepå, {VELOCITY}
 STR_9018_CAN_T_SEND_VEHICLE_TO_DEPOT                            :{WHITE}Kan inte skicka fordon till depå...
@@ -2556,7 +2556,7 @@
 STR_902F_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Invånarna firar . . .{}Första bussen ankommer till {STATION}!
 STR_9030_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Invånarna firar . . .{}Första lastbilen ankommer till {STATION}!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Vägfordonskrash!{}förare dör i eldklot efter kollision med tåg
-STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Vägfordonskrash!{}{COMMA16} dör i eldklot efter kollision med tåg
+STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Vägfordonskrash!{}{COMMA} dör i eldklot efter kollision med tåg
 STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}Kan inte tvinga fordonet att vända om...
 STR_9034_RENAME                                                 :{BLACK}Byt namn på
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Byt namn på vägfordon typ
@@ -2571,7 +2571,7 @@
 STR_9802_CAN_T_BUILD_DOCK_HERE                                  :{WHITE}Kan inte bygga hamn här...
 STR_9803_SHIP_DEPOT                                             :{WHITE}{TOWN} Skeppsdepå
 STR_9804_NEW_SHIPS                                              :{BLACK}Nytt Skepp
-STR_9805_SHIPS                                                  :{WHITE}{STRING} - {COMMA16} Skepp
+STR_9805_SHIPS                                                  :{WHITE}{STRING} - {COMMA} Skepp
 STR_9806_CAN_T_BUILD_SHIPS                                      :{WHITE}Kan inte bygga skepp...
 STR_9807_MUST_BUILD_SHIP_DEPOT_FIRST                            :{WHITE}Måste bygga skeppsdepå först
 STR_9808_NEW_SHIPS                                              :{WHITE}Nytt Skepp
@@ -2586,7 +2586,7 @@
 STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Ålder: {LTBLUE}{STRING}{BLACK}   Löpande kostnad: {LTBLUE}{CURRENCY}/yr
 STR_9813_MAX_SPEED                                              :{BLACK}Tophastighet: {LTBLUE}{VELOCITY}
 STR_9814_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Vinst detta år: {LTBLUE}{CURRENCY}  (förra år: {CURRENCY})
-STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Tillförlitlighet: {LTBLUE}{COMMA8}%  {BLACK}Motorstopp sedan förra service: {LTBLUE}{COMMA16}
+STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Tillförlitlighet: {LTBLUE}{COMMA}%  {BLACK}Motorstopp sedan förra service: {LTBLUE}{COMMA}
 STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Byggt: {LTBLUE}{NUMU16}{BLACK} Värde: {LTBLUE}{CURRENCY}
 STR_9817_CAPACITY                                               :{BLACK}Kapacitet: {LTBLUE}{STRING}
 STR_9818_CAN_T_STOP_START_SHIP                                  :{WHITE}Kan inte stoppa/starta skepp...
@@ -2594,7 +2594,7 @@
 STR_981A_UNABLE_TO_FIND_LOCAL_DEPOT                             :{WHITE}Kan inte finna lokal depå
 STR_HEADING_FOR_SHIP_DEPOT                                      :{LTBLUE}På väg mot {TOWN} Skeppsdepå
 STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{LTBLUE}På väg mot {TOWN} Skeppsdepå, {VELOCITY}
-STR_981C_SHIP_IS_WAITING_IN_DEPOT                               :{WHITE}Skepp {COMMA16} väntar i depå
+STR_981C_SHIP_IS_WAITING_IN_DEPOT                               :{WHITE}Skepp {COMMA} väntar i depå
 STR_981D_BUILD_SHIP_DOCK                                        :{BLACK}Bygg hamn
 STR_981E_BUILD_SHIP_DEPOT_FOR_BUILDING                          :{BLACK}Bygg skeppsdepå (för byggnad och lagning av skepp)
 STR_981F_SHIPS_CLICK_ON_SHIP_FOR                                :{BLACK}Skepp - klicka på skepp för information
@@ -2645,19 +2645,19 @@
 STR_A005_NEW_AIRCRAFT                                           :{WHITE}Nytt Flygplan
 STR_A006_BUILD_AIRCRAFT                                         :{BLACK}Bygg Flygplan
 STR_A008_CAN_T_BUILD_AIRCRAFT                                   :{WHITE}Kan inte bygga flygplan...
-STR_A009_AIRCRAFT                                               :{WHITE}{STRING} - {COMMA16} Flygplan
+STR_A009_AIRCRAFT                                               :{WHITE}{STRING} - {COMMA} Flygplan
 STR_A00A                                                        :{WHITE}{STRING}
 STR_A00B_ORDERS                                                 :{WHITE}{STRING} (Order)
 STR_A00C_DETAILS                                                :{WHITE}{STRING} (Detaljer)
 STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Ålder: {LTBLUE}{STRING}{BLACK}   Löpande kostnad: {LTBLUE}{CURRENCY}/yr
 STR_A00E_MAX_SPEED                                              :{BLACK}Tophastighet: {LTBLUE}{VELOCITY}
 STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Vinst detta år: {LTBLUE}{CURRENCY}  (förra år: {CURRENCY})
-STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Tillförlitlighet: {LTBLUE}{COMMA8}%  {BLACK}Motorstopp sedan förra service: {LTBLUE}{COMMA16}
+STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Tillförlitlighet: {LTBLUE}{COMMA}%  {BLACK}Motorstopp sedan förra service: {LTBLUE}{COMMA}
 STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Byggt: {LTBLUE}{NUMU16}{BLACK} Värde: {LTBLUE}{CURRENCY}
 STR_A012_CAN_T_SEND_AIRCRAFT_TO                                 :{WHITE}Kan inte skicka flygplan till hangar...
 STR_HEADING_FOR_HANGAR                                          :{LTBLUE}På väg mot {STATION} Hangar
 STR_HEADING_FOR_HANGAR_VEL                                      :{LTBLUE}På väg mot {STATION} Hangar, {VELOCITY}
-STR_A014_AIRCRAFT_IS_WAITING_IN                                 :{WHITE}Flygplan {COMMA16} väntar i flygplanshangar
+STR_A014_AIRCRAFT_IS_WAITING_IN                                 :{WHITE}Flygplan {COMMA} väntar i flygplanshangar
 STR_A015_AIRCRAFT_IN_THE_WAY                                    :{WHITE}Flygplan i vägen
 STR_A016_CAN_T_STOP_START_AIRCRAFT                              :{WHITE}Kan inte stoppa/starta flygplan...
 STR_A017_AIRCRAFT_IS_IN_FLIGHT                                  :{WHITE}Flygplan är i luften
@@ -2683,14 +2683,14 @@
 STR_A02B_SHOW_AIRCRAFT_DETAILS                                  :{BLACK}Visa flygplan detaljer
 STR_A02C_NEW_AIRCRAFT_NOW_AVAILABLE                             :{BLACK}{BIGFONT}Nytt flygplan tillgängligt!
 STR_A02D                                                        :{BLACK}{BIGFONT}{STRING}
-STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Kostnad: {CURRENCY} Tophastighet: {VELOCITY}{}Kapacitet: {COMMA16} passagerare, {COMMA16} postsäckar{}Löpande kostnad: {CURRENCY}/år
+STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Kostnad: {CURRENCY} Tophastighet: {VELOCITY}{}Kapacitet: {COMMA} passagerare, {COMMA} postsäckar{}Löpande kostnad: {CURRENCY}/år
 
 STR_A030_NAME_AIRCRAFT                                          :{WHITE}Byt namn på flygplan
 STR_A031_CAN_T_NAME_AIRCRAFT                                    :{WHITE}Kan inte byta namn på flygplan...
 STR_A032_NAME_AIRCRAFT                                          :{BLACK}Byt namn på flygplan
 STR_A033_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Invånarna firar . . .{}Första flygplanet ankommer till {STATION}!
-STR_A034_PLANE_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Flygplanskrasch!{}{COMMA16} dör i eldklot på {STATION}
-STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Flygplanskrasch!{}Flygplanet fick slut på bränsle, {COMMA16} dör i eldklot!
+STR_A034_PLANE_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Flygplanskrasch!{}{COMMA} dör i eldklot på {STATION}
+STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Flygplanskrasch!{}Flygplanet fick slut på bränsle, {COMMA} dör i eldklot!
 STR_A035_DESTINATIONS                                           :{TINYFONT}{BLACK}Destinationer:
 STR_A036                                                        :{TINYFONT}{BLACK}{STATION}
 STR_A037_RENAME                                                 :{BLACK}Byt namn på
@@ -2716,7 +2716,7 @@
 STR_B003_FACTORY_DESTROYED_IN_SUSPICIOUS                        :{BLACK}{BIGFONT}Fabrik förstörd i misstänkta omständigheter nära {TOWN}!
 STR_B004_UFO_LANDS_NEAR                                         :{BLACK}{BIGFONT}'UFO' landar nära {TOWN}!
 STR_B005_COAL_MINE_SUBSIDENCE_LEAVES                            :{BLACK}{BIGFONT}Kolgruva sjunker - lämnar spår av katastrof nära {TOWN}!
-STR_B006_FLOOD_VEHICLE_DESTROYED                                :{BLACK}{BIGFONT}Översvämning!{}Minst {COMMA16} förmodas saknade eller döda efter dödlig översvämning!
+STR_B006_FLOOD_VEHICLE_DESTROYED                                :{BLACK}{BIGFONT}Översvämning!{}Minst {COMMA} förmodas saknade eller döda efter dödlig översvämning!
 
 STR_BRIBE_FAILED                                                :{WHITE}Ditt mutningsförsök har blivit
 STR_BRIBE_FAILED_2                                              :{WHITE}uppdagat av en regional utredare.
@@ -2726,7 +2726,7 @@
 STR_PERFORMANCE_DETAIL                                          :{WHITE}Detaljerade prestandabetyg
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Detaljer
 STR_PERFORMANCE_DETAIL_AMOUNT_CURRENCY                          :{BLACK}({CURRCOMPACT}/{CURRCOMPACT})
-STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA32}/{COMMA32})
+STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA}/{COMMA})
 STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{INT32}%
 SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{INT32}
 ############ Those following lines need to be in this order!!
@@ -2761,7 +2761,7 @@
 STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID:
 
 STR_CURRENCY_WINDOW                                             :{WHITE}Egen valuta
-STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Växlingskurs: {ORANGE}{CURRENCY} = {POUNDSIGN} {COMMA16}
+STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Växlingskurs: {ORANGE}{CURRENCY} = {POUNDSIGN} {COMMA}
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Avskiljare:
 STR_CURRENCY_PREFIX                                             :{LTBLUE}Prefix:
 STR_CURRENCY_SUFFIX                                             :{LTBLUE}Suffix:
@@ -2775,10 +2775,10 @@
 STR_PLANE                                                       :{BLACK}{PLANE}
 STR_SHIP                                                        :{BLACK}{SHIP}
 
-STR_SCHEDULED_TRAINS                                            :{WHITE}{STATION} - {COMMA16} Tåg
-STR_SCHEDULED_ROAD_VEHICLES                                     :{WHITE}{STATION} - {COMMA16} Vägfordon
-STR_SCHEDULED_AIRCRAFT                                          :{WHITE}{STATION} - {COMMA16} Flygplan
-STR_SCHEDULED_SHIPS                                             :{WHITE}{STATION} - {COMMA16} Skepp
+STR_SCHEDULED_TRAINS                                            :{WHITE}{STATION} - {COMMA} Tåg
+STR_SCHEDULED_ROAD_VEHICLES                                     :{WHITE}{STATION} - {COMMA} Vägfordon
+STR_SCHEDULED_AIRCRAFT                                          :{WHITE}{STATION} - {COMMA} Flygplan
+STR_SCHEDULED_SHIPS                                             :{WHITE}{STATION} - {COMMA} Skepp
 
 STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Visa alla tåg där denna station finns med i rutten
 STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Visa alla vägfordon där denna station finns med i rutten
@@ -2800,7 +2800,7 @@
 STR_REPLACE_HELP                                                :{BLACK}Detta gör det möjligt att byta ut en fordonstyp med en annan typ, när tågen av den ursprungliga typen anländer till en depå
 
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
-STR_SIGN_LIST_CAPTION                                           :{WHITE}Skyltlista - {COMMA16} Skyltar
+STR_SIGN_LIST_CAPTION                                           :{WHITE}Skyltlista - {COMMA} Skyltar
 
 ############ Lists rail types
 
@@ -2810,16 +2810,16 @@
 
 ############ End of list of rail types
 
-STR_TINY_BLACK                                                  :{BLACK}{TINYFONT}{COMMA16}
+STR_TINY_BLACK                                                  :{BLACK}{TINYFONT}{COMMA}
 
-STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Kostnad: {GOLD}{CURRENCY}{BLACK} Vikt: {GOLD}{COMMA16}t
-STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Hastighet: {GOLD}{VELOCITY}{BLACK}   Effekt: {GOLD}{COMMA32}hk
+STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Kostnad: {GOLD}{CURRENCY}{BLACK} Vikt: {GOLD}{COMMA}t
+STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Hastighet: {GOLD}{VELOCITY}{BLACK}   Effekt: {GOLD}{COMMA}hk
 STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}Driftkostnader: {GOLD}{CURRENCY}/år
 STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Kapacitet: {GOLD}{STRING} {STRING}
-STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Designår: {GOLD}{NUMU16}{BLACK} Livslängd: {GOLD}{COMMA16} år
-STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Max. tillförlitlighet: {GOLD}{COMMA8} %
+STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Designår: {GOLD}{NUMU16}{BLACK} Livslängd: {GOLD}{COMMA} år
+STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Max. tillförlitlighet: {GOLD}{COMMA} %
 STR_PURCHASE_INFO_COST                                          :{BLACK}Kostnad: {GOLD}{CURRENCY}
-STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Vikt: {GOLD}{COMMA16}t  ({COMMA16}t)
+STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Vikt: {GOLD}{COMMA}t  ({COMMA}t)
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Kostnad: {GOLD}{CURRENCY}{BLACK} Hastighet: {GOLD}{VELOCITY}
-STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Kapacitet: {GOLD}{COMMA16} passagerare, {COMMA16} säckar post
-STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Motoriserade vagnar: {GOLD}+{COMMA16}hk{BLACK} Vikt: {GOLD}+{COMMA8}t
+STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Kapacitet: {GOLD}{COMMA} passagerare, {COMMA} säckar post
+STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Motoriserade vagnar: {GOLD}+{COMMA}hk{BLACK} Vikt: {GOLD}+{COMMA}t
--- a/strgen/strgen.c	Thu Jul 14 09:53:52 2005 +0000
+++ b/strgen/strgen.c	Thu Jul 14 15:10:20 2005 +0000
@@ -238,9 +238,7 @@
 	// 0x7B=123 is the LAST special character we may use.
 
 	// Numbers
-	{"COMMA32", EmitSingleByte, 0x7B}, // These all do the same thing nowadays
-	{"COMMA16", EmitSingleByte, 0x7B},
-	{"COMMA8", EmitSingleByte, 0x7B},
+	{"COMMA", EmitSingleByte, 0x7B},
 
 	{"NUMU16", EmitSingleByte, 0x7E}, // These two do the same thing nowadays
 	{"INT32", EmitSingleByte, 0x7E},	// signed 32 bit integer
--- a/strings.c	Thu Jul 14 09:53:52 2005 +0000
+++ b/strings.c	Thu Jul 14 15:10:20 2005 +0000
@@ -415,13 +415,9 @@
 			*buff++ = *str++;
 			*buff++ = *str++;
 			break;
-		case 0x7B: // {COMMA32}
+		case 0x7B: // {COMMA}
 			buff = FormatCommaNumber(buff, GetParamInt32());
 			break;
-		case 0x7C: // {COMMA16}
-		case 0x7D: // {COMMA8}
-			assert(0);
-			break;
 		case 0x7E: // {NUMU16}, {INT32}
 			buff = FormatNoCommaNumber(buff, GetParamInt32());
 			break;