(svn r3495) Rename the string handles for cargo names with a quantity and abbreviated cargo names to something sensible, i.e. STR_QUANTITY_$NAME and STR_ABBREV_$NAME

28 files changed, 1717 insertions, 1717 deletions

diff --git a/lang/american.txt b/lang/american.txt
index ac8c93a16..61b921eb6 100644
--- a/lang/american.txt
+++ b/lang/american.txt
@@ -82,70 +82,70 @@ STR_004A_TOFFEE                                                 :Toffee
 STR_004B_BATTERY                                                :Battery
 STR_004C_PLASTIC                                                :Plastic
 STR_004D_FIZZY_DRINK                                            :Fizzy Drink
-STR_004E                                                        :
-STR_004F_PASSENGER                                              :{COMMA} passenger{P "" s}
-STR_0050_TON_OF_COAL                                            :{COMMA} ton{P "" s} of coal
-STR_0051_BAG_OF_MAIL                                            :{COMMA} bag{P "" s} of mail
-STR_0052_OF_OIL                                                 :{VOLUME} of oil
-STR_0053_ITEM_OF_LIVESTOCK                                      :{COMMA} item{P "" s} of livestock
-STR_0054_CRATE_OF_GOODS                                         :{COMMA} crate{P "" s} of goods
-STR_0055_TON_OF_GRAIN                                           :{COMMA} ton{P "" s} of grain
-STR_0056_TON_OF_WOOD                                            :{COMMA} ton{P "" s} of wood
-STR_0057_TON_OF_IRON_ORE                                        :{COMMA} ton{P "" s} of iron ore
-STR_0058_TON_OF_STEEL                                           :{COMMA} ton{P "" s} of steel
-STR_0059_BAG_OF_VALUABLES                                       :{COMMA} bag{P "" s} of valuables
-STR_005A_TON_OF_COPPER_ORE                                      :{COMMA} ton{P "" s} of copper ore
-STR_005B_TON_OF_MAIZE                                           :{COMMA} ton{P "" s} of maize
-STR_005C_TON_OF_FRUIT                                           :{COMMA} ton{P "" s} of fruit
-STR_005D_BAG_OF_DIAMONDS                                        :{COMMA} bag{P "" s} of diamonds
-STR_005E_TON_OF_FOOD                                            :{COMMA} ton{P "" s} of food
-STR_005F_TON_OF_PAPER                                           :{COMMA} ton{P "" s} of paper
-STR_0060_BAG_OF_GOLD                                            :{COMMA} bag{P "" s} of gold
-STR_0061_OF_WATER                                               :{VOLUME} of water
-STR_0062_TON_OF_WHEAT                                           :{COMMA} ton{P "" s} of wheat
-STR_0063_OF_RUBBER                                              :{VOLUME} of rubber
-STR_0064_TON_OF_SUGAR                                           :{COMMA} ton{P "" s} of sugar
-STR_0065_TOY                                                    :{COMMA} toy{P "" s}
-STR_0066_BAG_OF_CANDY                                           :{COMMA} bag{P "" s} of candy
-STR_0067_OF_COLA                                                :{VOLUME} of cola
-STR_0068_TON_OF_COTTON_CANDY                                    :{COMMA} ton{P "" s} of cotton candy
-STR_0069_BUBBLE                                                 :{COMMA} bubble{P "" s}
-STR_006A_TON_OF_TOFFEE                                          :{COMMA} ton{P "" s} of toffee
-STR_006B_BATTERY                                                :{COMMA} batter{P y ies}
-STR_006C_OF_PLASTIC                                             :{VOLUME} of plastic
-STR_006D_FIZZY_DRINK                                            :{COMMA} fizzy drink{P "" s}
-STR_008E                                                        :
-STR_008F_PS                                                     :{TINYFONT}PS
-STR_0090_CL                                                     :{TINYFONT}CL
-STR_0091_ML                                                     :{TINYFONT}ML
-STR_0092_OL                                                     :{TINYFONT}OL
-STR_0093_LV                                                     :{TINYFONT}LV
-STR_0094_GD                                                     :{TINYFONT}GD
-STR_0095_GR                                                     :{TINYFONT}GR
-STR_0096_WD                                                     :{TINYFONT}WD
-STR_0097_OR                                                     :{TINYFONT}OR
-STR_0098_ST                                                     :{TINYFONT}ST
-STR_0099_VL                                                     :{TINYFONT}VL
-STR_009A_CO                                                     :{TINYFONT}CO
-STR_009B_MZ                                                     :{TINYFONT}MZ
-STR_009C_FT                                                     :{TINYFONT}FT
-STR_009D_DM                                                     :{TINYFONT}DM
-STR_009E_FD                                                     :{TINYFONT}FD
-STR_009F_PR                                                     :{TINYFONT}PR
-STR_00A0_GD                                                     :{TINYFONT}GD
-STR_00A1_WR                                                     :{TINYFONT}WR
-STR_00A2_WH                                                     :{TINYFONT}WH
-STR_00A3_RB                                                     :{TINYFONT}RB
-STR_00A4_SG                                                     :{TINYFONT}SG
-STR_00A5_TY                                                     :{TINYFONT}TY
-STR_00A6_SW                                                     :{TINYFONT}SW
-STR_00A7_CL                                                     :{TINYFONT}CL
-STR_00A8_CF                                                     :{TINYFONT}CF
-STR_00A9_BU                                                     :{TINYFONT}BU
-STR_00AA_TF                                                     :{TINYFONT}TF
-STR_00AB_BA                                                     :{TINYFONT}BA
-STR_00AC_PL                                                     :{TINYFONT}PL
-STR_00AD_FZ                                                     :{TINYFONT}FZ
+STR_QUANTITY_NOTHING                                            :
+STR_QUANTITY_PASSENGERS                                         :{COMMA} passenger{P "" s}
+STR_QUANTITY_COAL                                               :{COMMA} ton{P "" s} of coal
+STR_QUANTITY_MAIL                                               :{COMMA} bag{P "" s} of mail
+STR_QUANTITY_OIL                                                :{VOLUME} of oil
+STR_QUANTITY_LIVESTOCK                                          :{COMMA} item{P "" s} of livestock
+STR_QUANTITY_GOODS                                              :{COMMA} crate{P "" s} of goods
+STR_QUANTITY_GRAIN                                              :{COMMA} ton{P "" s} of grain
+STR_QUANTITY_WOOD                                               :{COMMA} ton{P "" s} of wood
+STR_QUANTITY_IRON_ORE                                           :{COMMA} ton{P "" s} of iron ore
+STR_QUANTITY_STEEL                                              :{COMMA} ton{P "" s} of steel
+STR_QUANTITY_VALUABLES                                          :{COMMA} bag{P "" s} of valuables
+STR_QUANTITY_COPPER_ORE                                         :{COMMA} ton{P "" s} of copper ore
+STR_QUANTITY_MAIZE                                              :{COMMA} ton{P "" s} of maize
+STR_QUANTITY_FRUIT                                              :{COMMA} ton{P "" s} of fruit
+STR_QUANTITY_DIAMONDS                                           :{COMMA} bag{P "" s} of diamonds
+STR_QUANTITY_FOOD                                               :{COMMA} ton{P "" s} of food
+STR_QUANTITY_PAPER                                              :{COMMA} ton{P "" s} of paper
+STR_QUANTITY_GOLD                                               :{COMMA} bag{P "" s} of gold
+STR_QUANTITY_WATER                                              :{VOLUME} of water
+STR_QUANTITY_WHEAT                                              :{COMMA} ton{P "" s} of wheat
+STR_QUANTITY_RUBBER                                             :{VOLUME} of rubber
+STR_QUANTITY_SUGAR                                              :{COMMA} ton{P "" s} of sugar
+STR_QUANTITY_TOYS                                               :{COMMA} toy{P "" s}
+STR_QUANTITY_SWEETS                                             :{COMMA} bag{P "" s} of candy
+STR_QUANTITY_COLA                                               :{VOLUME} of cola
+STR_QUANTITY_CANDYFLOSS                                         :{COMMA} ton{P "" s} of cotton candy
+STR_QUANTITY_BUBBLES                                            :{COMMA} bubble{P "" s}
+STR_QUANTITY_TOFFEE                                             :{COMMA} ton{P "" s} of toffee
+STR_QUANTITY_BATTERIES                                          :{COMMA} batter{P y ies}
+STR_QUANTITY_PLASTIC                                            :{VOLUME} of plastic
+STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA} fizzy drink{P "" s}
+STR_ABBREV_NOTHING                                              :
+STR_ABBREV_PASSENGERS                                           :{TINYFONT}PS
+STR_ABBREV_COAL                                                 :{TINYFONT}CL
+STR_ABBREV_MAIL                                                 :{TINYFONT}ML
+STR_ABBREV_OIL                                                  :{TINYFONT}OL
+STR_ABBREV_LIVESTOCK                                            :{TINYFONT}LV
+STR_ABBREV_GOODS                                                :{TINYFONT}GD
+STR_ABBREV_GRAIN                                                :{TINYFONT}GR
+STR_ABBREV_WOOD                                                 :{TINYFONT}WD
+STR_ABBREV_IRON_ORE                                             :{TINYFONT}OR
+STR_ABBREV_STEEL                                                :{TINYFONT}ST
+STR_ABBREV_VALUABLES                                            :{TINYFONT}VL
+STR_ABBREV_COPPER_ORE                                           :{TINYFONT}CO
+STR_ABBREV_MAIZE                                                :{TINYFONT}MZ
+STR_ABBREV_FRUIT                                                :{TINYFONT}FT
+STR_ABBREV_DIAMONDS                                             :{TINYFONT}DM
+STR_ABBREV_FOOD                                                 :{TINYFONT}FD
+STR_ABBREV_PAPER                                                :{TINYFONT}PR
+STR_ABBREV_GOLD                                                 :{TINYFONT}GD
+STR_ABBREV_WATER                                                :{TINYFONT}WR
+STR_ABBREV_WHEAT                                                :{TINYFONT}WH
+STR_ABBREV_RUBBER                                               :{TINYFONT}RB
+STR_ABBREV_SUGAR                                                :{TINYFONT}SG
+STR_ABBREV_TOYS                                                 :{TINYFONT}TY
+STR_ABBREV_SWEETS                                               :{TINYFONT}SW
+STR_ABBREV_COLA                                                 :{TINYFONT}CL
+STR_ABBREV_CANDYFLOSS                                           :{TINYFONT}CF
+STR_ABBREV_BUBBLES                                              :{TINYFONT}BU
+STR_ABBREV_TOFFEE                                               :{TINYFONT}TF
+STR_ABBREV_BATTERIES                                            :{TINYFONT}BA
+STR_ABBREV_PLASTIC                                              :{TINYFONT}PL
+STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}FZ
 STR_00AE                                                        :{WHITE}{DATE_SHORT}
 STR_00AF                                                        :{WHITE}{DATE_LONG}
 STR_00B0_MAP                                                    :{WHITE}Map - {STRING}
diff --git a/lang/brazilian_portuguese.txt b/lang/brazilian_portuguese.txt
index b3e5f87f6..ffa032d24 100644
--- a/lang/brazilian_portuguese.txt
+++ b/lang/brazilian_portuguese.txt
@@ -82,70 +82,70 @@ STR_004A_TOFFEE                                                 :Caramelo
 STR_004B_BATTERY                                                :Baterias
 STR_004C_PLASTIC                                                :Plástico
 STR_004D_FIZZY_DRINK                                            :Bebidas Gasosas
-STR_004E                                                        :
-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                                      :{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                                           :{COMMA} tonelada de trigo
-STR_0063_OF_RUBBER                                              :{VOLUME} de borracha
-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                                    :{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                                            :{COMMA} Bebida Gasosa
-STR_008E                                                        :
-STR_008F_PS                                                     :{TINYFONT}PS
-STR_0090_CL                                                     :{TINYFONT}CL
-STR_0091_ML                                                     :{TINYFONT}ML
-STR_0092_OL                                                     :{TINYFONT}OL
-STR_0093_LV                                                     :{TINYFONT}LV
-STR_0094_GD                                                     :{TINYFONT}GD
-STR_0095_GR                                                     :{TINYFONT}GR
-STR_0096_WD                                                     :{TINYFONT}WD
-STR_0097_OR                                                     :{TINYFONT}OR
-STR_0098_ST                                                     :{TINYFONT}ST
-STR_0099_VL                                                     :{TINYFONT}VL
-STR_009A_CO                                                     :{TINYFONT}CO
-STR_009B_MZ                                                     :{TINYFONT}MZ
-STR_009C_FT                                                     :{TINYFONT}FT
-STR_009D_DM                                                     :{TINYFONT}DM
-STR_009E_FD                                                     :{TINYFONT}FD
-STR_009F_PR                                                     :{TINYFONT}PR
-STR_00A0_GD                                                     :{TINYFONT}GD
-STR_00A1_WR                                                     :{TINYFONT}WR
-STR_00A2_WH                                                     :{TINYFONT}WH
-STR_00A3_RB                                                     :{TINYFONT}RB
-STR_00A4_SG                                                     :{TINYFONT}SG
-STR_00A5_TY                                                     :{TINYFONT}TY
-STR_00A6_SW                                                     :{TINYFONT}SW
-STR_00A7_CL                                                     :{TINYFONT}CL
-STR_00A8_CF                                                     :{TINYFONT}CF
-STR_00A9_BU                                                     :{TINYFONT}BU
-STR_00AA_TF                                                     :{TINYFONT}TF
-STR_00AB_BA                                                     :{TINYFONT}BA
-STR_00AC_PL                                                     :{TINYFONT}PL
-STR_00AD_FZ                                                     :{TINYFONT}FZ
+STR_QUANTITY_NOTHING                                            :
+STR_QUANTITY_PASSENGERS                                         :{COMMA} passageiro
+STR_QUANTITY_COAL                                               :{COMMA} tonelada de carvão
+STR_QUANTITY_MAIL                                               :{COMMA} saco de correspondências
+STR_QUANTITY_OIL                                                :{VOLUME} de petróleo
+STR_QUANTITY_LIVESTOCK                                          :{COMMA} insumo de gado
+STR_QUANTITY_GOODS                                              :{COMMA} caixas de bens
+STR_QUANTITY_GRAIN                                              :{COMMA} tonelada de cereais
+STR_QUANTITY_WOOD                                               :{COMMA} tonelada de madeira
+STR_QUANTITY_IRON_ORE                                           :{COMMA} tonelada de minério de ferro
+STR_QUANTITY_STEEL                                              :{COMMA} tonelada de aço
+STR_QUANTITY_VALUABLES                                          :{COMMA} saco de valores
+STR_QUANTITY_COPPER_ORE                                         :{COMMA} tonelada de minério de cobre
+STR_QUANTITY_MAIZE                                              :{COMMA} tonelada de milho
+STR_QUANTITY_FRUIT                                              :{COMMA} tonelada de fruta
+STR_QUANTITY_DIAMONDS                                           :{COMMA} saco de diamantes
+STR_QUANTITY_FOOD                                               :{COMMA} tonelada de comida
+STR_QUANTITY_PAPER                                              :{COMMA} tonelada de papel
+STR_QUANTITY_GOLD                                               :{COMMA} saco de ouro
+STR_QUANTITY_WATER                                              :{VOLUME} de água
+STR_QUANTITY_WHEAT                                              :{COMMA} tonelada de trigo
+STR_QUANTITY_RUBBER                                             :{VOLUME} de borracha
+STR_QUANTITY_SUGAR                                              :{COMMA} tonelada de açúcar
+STR_QUANTITY_TOYS                                               :{COMMA} brinquedo
+STR_QUANTITY_SWEETS                                             :{COMMA} saco de doces
+STR_QUANTITY_COLA                                               :{VOLUME} de cola
+STR_QUANTITY_CANDYFLOSS                                         :{COMMA} tonelada de algodão doce
+STR_QUANTITY_BUBBLES                                            :{COMMA} bolha
+STR_QUANTITY_TOFFEE                                             :{COMMA} tonelada de caramelo
+STR_QUANTITY_BATTERIES                                          :{COMMA} bateria
+STR_QUANTITY_PLASTIC                                            :{VOLUME} de plástico
+STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA} Bebida Gasosa
+STR_ABBREV_NOTHING                                              :
+STR_ABBREV_PASSENGERS                                           :{TINYFONT}PS
+STR_ABBREV_COAL                                                 :{TINYFONT}CL
+STR_ABBREV_MAIL                                                 :{TINYFONT}ML
+STR_ABBREV_OIL                                                  :{TINYFONT}OL
+STR_ABBREV_LIVESTOCK                                            :{TINYFONT}LV
+STR_ABBREV_GOODS                                                :{TINYFONT}GD
+STR_ABBREV_GRAIN                                                :{TINYFONT}GR
+STR_ABBREV_WOOD                                                 :{TINYFONT}WD
+STR_ABBREV_IRON_ORE                                             :{TINYFONT}OR
+STR_ABBREV_STEEL                                                :{TINYFONT}ST
+STR_ABBREV_VALUABLES                                            :{TINYFONT}VL
+STR_ABBREV_COPPER_ORE                                           :{TINYFONT}CO
+STR_ABBREV_MAIZE                                                :{TINYFONT}MZ
+STR_ABBREV_FRUIT                                                :{TINYFONT}FT
+STR_ABBREV_DIAMONDS                                             :{TINYFONT}DM
+STR_ABBREV_FOOD                                                 :{TINYFONT}FD
+STR_ABBREV_PAPER                                                :{TINYFONT}PR
+STR_ABBREV_GOLD                                                 :{TINYFONT}GD
+STR_ABBREV_WATER                                                :{TINYFONT}WR
+STR_ABBREV_WHEAT                                                :{TINYFONT}WH
+STR_ABBREV_RUBBER                                               :{TINYFONT}RB
+STR_ABBREV_SUGAR                                                :{TINYFONT}SG
+STR_ABBREV_TOYS                                                 :{TINYFONT}TY
+STR_ABBREV_SWEETS                                               :{TINYFONT}SW
+STR_ABBREV_COLA                                                 :{TINYFONT}CL
+STR_ABBREV_CANDYFLOSS                                           :{TINYFONT}CF
+STR_ABBREV_BUBBLES                                              :{TINYFONT}BU
+STR_ABBREV_TOFFEE                                               :{TINYFONT}TF
+STR_ABBREV_BATTERIES                                            :{TINYFONT}BA
+STR_ABBREV_PLASTIC                                              :{TINYFONT}PL
+STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}FZ
 STR_00AE                                                        :{WHITE}{DATE_SHORT}
 STR_00AF                                                        :{WHITE}{DATE_LONG}
 STR_00B0_MAP                                                    :{WHITE}Mapa - {STRING}
diff --git a/lang/catalan.txt b/lang/catalan.txt
index a48ad09bc..0f7125c7b 100644
--- a/lang/catalan.txt
+++ b/lang/catalan.txt
@@ -82,70 +82,70 @@ STR_004A_TOFFEE                                                 :Caramel
 STR_004B_BATTERY                                                :Pila
 STR_004C_PLASTIC                                                :Plàstic
 STR_004D_FIZZY_DRINK                                            :Beguda Gasosa
-STR_004E                                                        :
-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                                      :{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                                           :{COMMA} tona de blat
-STR_0063_OF_RUBBER                                              :{VOLUME} de cautxú
-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                                    :{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                                            :{COMMA} beguda gasosa
-STR_008E                                                        :
-STR_008F_PS                                                     :{TINYFONT}PS
-STR_0090_CL                                                     :{TINYFONT}CB
-STR_0091_ML                                                     :{TINYFONT}CR
-STR_0092_OL                                                     :{TINYFONT}PT
-STR_0093_LV                                                     :{TINYFONT}BE
-STR_0094_GD                                                     :{TINYFONT}ME
-STR_0095_GR                                                     :{TINYFONT}GR
-STR_0096_WD                                                     :{TINYFONT}FU
-STR_0097_OR                                                     :{TINYFONT}FE
-STR_0098_ST                                                     :{TINYFONT}AC
-STR_0099_VL                                                     :{TINYFONT}VL
-STR_009A_CO                                                     :{TINYFONT}CO
-STR_009B_MZ                                                     :{TINYFONT}BM
-STR_009C_FT                                                     :{TINYFONT}FR
-STR_009D_DM                                                     :{TINYFONT}DM
-STR_009E_FD                                                     :{TINYFONT}QV
-STR_009F_PR                                                     :{TINYFONT}PR
-STR_00A0_GD                                                     :{TINYFONT}OR
-STR_00A1_WR                                                     :{TINYFONT}AI
-STR_00A2_WH                                                     :{TINYFONT}BL
-STR_00A3_RB                                                     :{TINYFONT}CX
-STR_00A4_SG                                                     :{TINYFONT}SU
-STR_00A5_TY                                                     :{TINYFONT}JO
-STR_00A6_SW                                                     :{TINYFONT}XU
-STR_00A7_CL                                                     :{TINYFONT}RF
-STR_00A8_CF                                                     :{TINYFONT}CS
-STR_00A9_BU                                                     :{TINYFONT}BM
-STR_00AA_TF                                                     :{TINYFONT}CA
-STR_00AB_BA                                                     :{TINYFONT}BA
-STR_00AC_PL                                                     :{TINYFONT}PL
-STR_00AD_FZ                                                     :{TINYFONT}BG
+STR_QUANTITY_NOTHING                                            :
+STR_QUANTITY_PASSENGERS                                         :{COMMA} passatger
+STR_QUANTITY_COAL                                               :{COMMA} tona de carbó
+STR_QUANTITY_MAIL                                               :{COMMA} saca de correu
+STR_QUANTITY_OIL                                                :{VOLUME} de petroli
+STR_QUANTITY_LIVESTOCK                                          :{COMMA} cap de bestiar
+STR_QUANTITY_GOODS                                              :{COMMA} palet de mercaderies
+STR_QUANTITY_GRAIN                                              :{COMMA} tona de gra
+STR_QUANTITY_WOOD                                               :{COMMA} tona de fusta
+STR_QUANTITY_IRON_ORE                                           :{COMMA} tona de mineral de ferro
+STR_QUANTITY_STEEL                                              :{COMMA} tona d'acer
+STR_QUANTITY_VALUABLES                                          :{COMMA} saca de valors
+STR_QUANTITY_COPPER_ORE                                         :{COMMA} tona de mineral de coure
+STR_QUANTITY_MAIZE                                              :{COMMA} tona de blat de moro
+STR_QUANTITY_FRUIT                                              :{COMMA} tona de fruita
+STR_QUANTITY_DIAMONDS                                           :{COMMA} bossa de diamants
+STR_QUANTITY_FOOD                                               :{COMMA} tona de queviures
+STR_QUANTITY_PAPER                                              :{COMMA} tona de paper
+STR_QUANTITY_GOLD                                               :{COMMA} sac d'or
+STR_QUANTITY_WATER                                              :{VOLUME} d'aigua
+STR_QUANTITY_WHEAT                                              :{COMMA} tona de blat
+STR_QUANTITY_RUBBER                                             :{VOLUME} de cautxú
+STR_QUANTITY_SUGAR                                              :{COMMA} tona de sucre
+STR_QUANTITY_TOYS                                               :{COMMA} joguina
+STR_QUANTITY_SWEETS                                             :{COMMA} bossa de dolços
+STR_QUANTITY_COLA                                               :{VOLUME} de refrescs
+STR_QUANTITY_CANDYFLOSS                                         :{COMMA} tona de cotó de sucre
+STR_QUANTITY_BUBBLES                                            :{COMMA} bombolla
+STR_QUANTITY_TOFFEE                                             :{COMMA} tona de caramel
+STR_QUANTITY_BATTERIES                                          :{COMMA} pila
+STR_QUANTITY_PLASTIC                                            :{VOLUME} de plàstic
+STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA} beguda gasosa
+STR_ABBREV_NOTHING                                              :
+STR_ABBREV_PASSENGERS                                           :{TINYFONT}PS
+STR_ABBREV_COAL                                                 :{TINYFONT}CB
+STR_ABBREV_MAIL                                                 :{TINYFONT}CR
+STR_ABBREV_OIL                                                  :{TINYFONT}PT
+STR_ABBREV_LIVESTOCK                                            :{TINYFONT}BE
+STR_ABBREV_GOODS                                                :{TINYFONT}ME
+STR_ABBREV_GRAIN                                                :{TINYFONT}GR
+STR_ABBREV_WOOD                                                 :{TINYFONT}FU
+STR_ABBREV_IRON_ORE                                             :{TINYFONT}FE
+STR_ABBREV_STEEL                                                :{TINYFONT}AC
+STR_ABBREV_VALUABLES                                            :{TINYFONT}VL
+STR_ABBREV_COPPER_ORE                                           :{TINYFONT}CO
+STR_ABBREV_MAIZE                                                :{TINYFONT}BM
+STR_ABBREV_FRUIT                                                :{TINYFONT}FR
+STR_ABBREV_DIAMONDS                                             :{TINYFONT}DM
+STR_ABBREV_FOOD                                                 :{TINYFONT}QV
+STR_ABBREV_PAPER                                                :{TINYFONT}PR
+STR_ABBREV_GOLD                                                 :{TINYFONT}OR
+STR_ABBREV_WATER                                                :{TINYFONT}AI
+STR_ABBREV_WHEAT                                                :{TINYFONT}BL
+STR_ABBREV_RUBBER                                               :{TINYFONT}CX
+STR_ABBREV_SUGAR                                                :{TINYFONT}SU
+STR_ABBREV_TOYS                                                 :{TINYFONT}JO
+STR_ABBREV_SWEETS                                               :{TINYFONT}XU
+STR_ABBREV_COLA                                                 :{TINYFONT}RF
+STR_ABBREV_CANDYFLOSS                                           :{TINYFONT}CS
+STR_ABBREV_BUBBLES                                              :{TINYFONT}BM
+STR_ABBREV_TOFFEE                                               :{TINYFONT}CA
+STR_ABBREV_BATTERIES                                            :{TINYFONT}BA
+STR_ABBREV_PLASTIC                                              :{TINYFONT}PL
+STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}BG
 STR_00AE                                                        :{WHITE}{DATE_SHORT}
 STR_00AF                                                        :{WHITE}{DATE_LONG}
 STR_00B0_MAP                                                    :{WHITE}Mapa - {STRING}
diff --git a/lang/czech.txt b/lang/czech.txt
index b21f19e7e..a8ae43794 100644
--- a/lang/czech.txt
+++ b/lang/czech.txt
@@ -139,70 +139,70 @@ STR_004A_TOFFEE                                                 :karamelu
 STR_004B_BATTERY                                                :baterií
 STR_004C_PLASTIC                                                :plastu
 STR_004D_FIZZY_DRINK                                            :limonád
-STR_004E                                                        :
-STR_004F_PASSENGER                                              :{COMMA} cestující{P "" "" ch}
-STR_0050_TON_OF_COAL                                            :{COMMA} tun{P a y ""} uhlí
-STR_0051_BAG_OF_MAIL                                            :{COMMA} balík{P "" "y" u} po¨ty
-STR_0052_OF_OIL                                                 :{VOLUME} ropy
-STR_0053_ITEM_OF_LIVESTOCK                                      :{COMMA} kus{P "" y u} dobytka
-STR_0054_CRATE_OF_GOODS                                         :{COMMA} krabic{P e e ""} zbo¸í
-STR_0055_TON_OF_GRAIN                                           :{COMMA} tun{P a y ""} zrní
-STR_0056_TON_OF_WOOD                                            :{COMMA} tun{P a y ""} dreva
-STR_0057_TON_OF_IRON_ORE                                        :{COMMA} tun{P a y ""} ¸elezné rudy
-STR_0058_TON_OF_STEEL                                           :{COMMA} tun{P a y ""} oceli
-STR_0059_BAG_OF_VALUABLES                                       :{COMMA} balík{P "" "y" u} cenin
-STR_005A_TON_OF_COPPER_ORE                                      :{COMMA} tun{P a y ""} medene rudy
-STR_005B_TON_OF_MAIZE                                           :{COMMA} tun{P a y ""} kukurice
-STR_005C_TON_OF_FRUIT                                           :{COMMA} tun{P a y ""} ovoce
-STR_005D_BAG_OF_DIAMONDS                                        :{COMMA} pyt{P el le lu} diamantu
-STR_005E_TON_OF_FOOD                                            :{COMMA} tun{P a y ""} jídla
-STR_005F_TON_OF_PAPER                                           :{COMMA} tun{P a y ""} papíru
-STR_0060_BAG_OF_GOLD                                            :{COMMA} balík{P "" "y" u}
-STR_0061_OF_WATER                                               :{VOLUME} vody
-STR_0062_TON_OF_WHEAT                                           :{COMMA} tun{P a y ""} kukurice
-STR_0063_OF_RUBBER                                              :{VOLUME} kaucuku
-STR_0064_TON_OF_SUGAR                                           :{COMMA} tun{P a y ""} cukru
-STR_0065_TOY                                                    :{COMMA} hrac{P ka ky ek}
-STR_0066_BAG_OF_CANDY                                           :{COMMA} pyt{P el le lu} bonbonu
-STR_0067_OF_COLA                                                :{VOLUME} coly
-STR_0068_TON_OF_COTTON_CANDY                                    :{COMMA} tun{P a y ""} cukrové vaty
-STR_0069_BUBBLE                                                 :{COMMA} bublin{P a y ""}
-STR_006A_TON_OF_TOFFEE                                          :{COMMA} tun{P a y ""} karamelu
-STR_006B_BATTERY                                                :{COMMA} bateri{P e e í}
-STR_006C_OF_PLASTIC                                             :{VOLUME} plastu
-STR_006D_FIZZY_DRINK                                            :{COMMA} limonád{P a y ""}
-STR_008E                                                        :
-STR_008F_PS                                                     :{TINYFONT}CS
-STR_0090_CL                                                     :{TINYFONT}UH
-STR_0091_ML                                                     :{TINYFONT}PT
-STR_0092_OL                                                     :{TINYFONT}RP
-STR_0093_LV                                                     :{TINYFONT}DB
-STR_0094_GD                                                     :{TINYFONT}ZB
-STR_0095_GR                                                     :{TINYFONT}ZN
-STR_0096_WD                                                     :{TINYFONT}DR
-STR_0097_OR                                                     :{TINYFONT}ZR
-STR_0098_ST                                                     :{TINYFONT}OC
-STR_0099_VL                                                     :{TINYFONT}CN
-STR_009A_CO                                                     :{TINYFONT}MD
-STR_009B_MZ                                                     :{TINYFONT}KU
-STR_009C_FT                                                     :{TINYFONT}OV
-STR_009D_DM                                                     :{TINYFONT}DM
-STR_009E_FD                                                     :{TINYFONT}JD
-STR_009F_PR                                                     :{TINYFONT}PR
-STR_00A0_GD                                                     :{TINYFONT}ZL
-STR_00A1_WR                                                     :{TINYFONT}VD
-STR_00A2_WH                                                     :{TINYFONT}PS
-STR_00A3_RB                                                     :{TINYFONT}KA
-STR_00A4_SG                                                     :{TINYFONT}CU
-STR_00A5_TY                                                     :{TINYFONT}HR
-STR_00A6_SW                                                     :{TINYFONT}BO
-STR_00A7_CL                                                     :{TINYFONT}KL
-STR_00A8_CF                                                     :{TINYFONT}CV
-STR_00A9_BU                                                     :{TINYFONT}BU
-STR_00AA_TF                                                     :{TINYFONT}KR
-STR_00AB_BA                                                     :{TINYFONT}BA
-STR_00AC_PL                                                     :{TINYFONT}PL
-STR_00AD_FZ                                                     :{TINYFONT}LI
+STR_QUANTITY_NOTHING                                            :
+STR_QUANTITY_PASSENGERS                                         :{COMMA} cestující{P "" "" ch}
+STR_QUANTITY_COAL                                               :{COMMA} tun{P a y ""} uhlí
+STR_QUANTITY_MAIL                                               :{COMMA} balík{P "" "y" u} po¨ty
+STR_QUANTITY_OIL                                                :{VOLUME} ropy
+STR_QUANTITY_LIVESTOCK                                          :{COMMA} kus{P "" y u} dobytka
+STR_QUANTITY_GOODS                                              :{COMMA} krabic{P e e ""} zbo¸í
+STR_QUANTITY_GRAIN                                              :{COMMA} tun{P a y ""} zrní
+STR_QUANTITY_WOOD                                               :{COMMA} tun{P a y ""} dreva
+STR_QUANTITY_IRON_ORE                                           :{COMMA} tun{P a y ""} ¸elezné rudy
+STR_QUANTITY_STEEL                                              :{COMMA} tun{P a y ""} oceli
+STR_QUANTITY_VALUABLES                                          :{COMMA} balík{P "" "y" u} cenin
+STR_QUANTITY_COPPER_ORE                                         :{COMMA} tun{P a y ""} medene rudy
+STR_QUANTITY_MAIZE                                              :{COMMA} tun{P a y ""} kukurice
+STR_QUANTITY_FRUIT                                              :{COMMA} tun{P a y ""} ovoce
+STR_QUANTITY_DIAMONDS                                           :{COMMA} pyt{P el le lu} diamantu
+STR_QUANTITY_FOOD                                               :{COMMA} tun{P a y ""} jídla
+STR_QUANTITY_PAPER                                              :{COMMA} tun{P a y ""} papíru
+STR_QUANTITY_GOLD                                               :{COMMA} balík{P "" "y" u}
+STR_QUANTITY_WATER                                              :{VOLUME} vody
+STR_QUANTITY_WHEAT                                              :{COMMA} tun{P a y ""} kukurice
+STR_QUANTITY_RUBBER                                             :{VOLUME} kaucuku
+STR_QUANTITY_SUGAR                                              :{COMMA} tun{P a y ""} cukru
+STR_QUANTITY_TOYS                                               :{COMMA} hrac{P ka ky ek}
+STR_QUANTITY_SWEETS                                             :{COMMA} pyt{P el le lu} bonbonu
+STR_QUANTITY_COLA                                               :{VOLUME} coly
+STR_QUANTITY_CANDYFLOSS                                         :{COMMA} tun{P a y ""} cukrové vaty
+STR_QUANTITY_BUBBLES                                            :{COMMA} bublin{P a y ""}
+STR_QUANTITY_TOFFEE                                             :{COMMA} tun{P a y ""} karamelu
+STR_QUANTITY_BATTERIES                                          :{COMMA} bateri{P e e í}
+STR_QUANTITY_PLASTIC                                            :{VOLUME} plastu
+STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA} limonád{P a y ""}
+STR_ABBREV_NOTHING                                              :
+STR_ABBREV_PASSENGERS                                           :{TINYFONT}CS
+STR_ABBREV_COAL                                                 :{TINYFONT}UH
+STR_ABBREV_MAIL                                                 :{TINYFONT}PT
+STR_ABBREV_OIL                                                  :{TINYFONT}RP
+STR_ABBREV_LIVESTOCK                                            :{TINYFONT}DB
+STR_ABBREV_GOODS                                                :{TINYFONT}ZB
+STR_ABBREV_GRAIN                                                :{TINYFONT}ZN
+STR_ABBREV_WOOD                                                 :{TINYFONT}DR
+STR_ABBREV_IRON_ORE                                             :{TINYFONT}ZR
+STR_ABBREV_STEEL                                                :{TINYFONT}OC
+STR_ABBREV_VALUABLES                                            :{TINYFONT}CN
+STR_ABBREV_COPPER_ORE                                           :{TINYFONT}MD
+STR_ABBREV_MAIZE                                                :{TINYFONT}KU
+STR_ABBREV_FRUIT                                                :{TINYFONT}OV
+STR_ABBREV_DIAMONDS                                             :{TINYFONT}DM
+STR_ABBREV_FOOD                                                 :{TINYFONT}JD
+STR_ABBREV_PAPER                                                :{TINYFONT}PR
+STR_ABBREV_GOLD                                                 :{TINYFONT}ZL
+STR_ABBREV_WATER                                                :{TINYFONT}VD
+STR_ABBREV_WHEAT                                                :{TINYFONT}PS
+STR_ABBREV_RUBBER                                               :{TINYFONT}KA
+STR_ABBREV_SUGAR                                                :{TINYFONT}CU
+STR_ABBREV_TOYS                                                 :{TINYFONT}HR
+STR_ABBREV_SWEETS                                               :{TINYFONT}BO
+STR_ABBREV_COLA                                                 :{TINYFONT}KL
+STR_ABBREV_CANDYFLOSS                                           :{TINYFONT}CV
+STR_ABBREV_BUBBLES                                              :{TINYFONT}BU
+STR_ABBREV_TOFFEE                                               :{TINYFONT}KR
+STR_ABBREV_BATTERIES                                            :{TINYFONT}BA
+STR_ABBREV_PLASTIC                                              :{TINYFONT}PL
+STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}LI
 STR_00AE                                                        :{WHITE}{DATE_SHORT}
 STR_00AF                                                        :{WHITE}{DATE_LONG}
 STR_00B0_MAP                                                    :{WHITE}Mapa - {STRING}
diff --git a/lang/danish.txt b/lang/danish.txt
index 391c09c4c..ee74576b8 100644
--- a/lang/danish.txt
+++ b/lang/danish.txt
@@ -82,70 +82,70 @@ STR_004A_TOFFEE                                                 :Karamel
 STR_004B_BATTERY                                                :Batteri
 STR_004C_PLASTIC                                                :Plastik
 STR_004D_FIZZY_DRINK                                            :Sodavand
-STR_004E                                                        :
-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                                      :{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                                           :{COMMA} ton hvede
-STR_0063_OF_RUBBER                                              :{VOLUME} gummi
-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                                    :{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                                            :{COMMA} sodavand
-STR_008E                                                        :
-STR_008F_PS                                                     :{TINYFONT}PS
-STR_0090_CL                                                     :{TINYFONT}CL
-STR_0091_ML                                                     :{TINYFONT}ML
-STR_0092_OL                                                     :{TINYFONT}OL
-STR_0093_LV                                                     :{TINYFONT}LV
-STR_0094_GD                                                     :{TINYFONT}GD
-STR_0095_GR                                                     :{TINYFONT}GR
-STR_0096_WD                                                     :{TINYFONT}WD
-STR_0097_OR                                                     :{TINYFONT}OR
-STR_0098_ST                                                     :{TINYFONT}ST
-STR_0099_VL                                                     :{TINYFONT}VL
-STR_009A_CO                                                     :{TINYFONT}CO
-STR_009B_MZ                                                     :{TINYFONT}MZ
-STR_009C_FT                                                     :{TINYFONT}FT
-STR_009D_DM                                                     :{TINYFONT}DM
-STR_009E_FD                                                     :{TINYFONT}FD
-STR_009F_PR                                                     :{TINYFONT}PR
-STR_00A0_GD                                                     :{TINYFONT}GD
-STR_00A1_WR                                                     :{TINYFONT}WR
-STR_00A2_WH                                                     :{TINYFONT}WH
-STR_00A3_RB                                                     :{TINYFONT}RB
-STR_00A4_SG                                                     :{TINYFONT}SG
-STR_00A5_TY                                                     :{TINYFONT}TY
-STR_00A6_SW                                                     :{TINYFONT}SW
-STR_00A7_CL                                                     :{TINYFONT}CL
-STR_00A8_CF                                                     :{TINYFONT}CF
-STR_00A9_BU                                                     :{TINYFONT}BU
-STR_00AA_TF                                                     :{TINYFONT}TF
-STR_00AB_BA                                                     :{TINYFONT}BA
-STR_00AC_PL                                                     :{TINYFONT}PL
-STR_00AD_FZ                                                     :{TINYFONT}FZ
+STR_QUANTITY_NOTHING                                            :
+STR_QUANTITY_PASSENGERS                                         :{COMMA} passager
+STR_QUANTITY_COAL                                               :{COMMA} ton kul
+STR_QUANTITY_MAIL                                               :{COMMA} sæk post
+STR_QUANTITY_OIL                                                :{VOLUME} olie
+STR_QUANTITY_LIVESTOCK                                          :{COMMA} stk. kvæg
+STR_QUANTITY_GOODS                                              :{COMMA} kasse gods
+STR_QUANTITY_GRAIN                                              :{COMMA} ton korn
+STR_QUANTITY_WOOD                                               :{COMMA} ton træ
+STR_QUANTITY_IRON_ORE                                           :{COMMA} ton jernmalm
+STR_QUANTITY_STEEL                                              :{COMMA} ton stål
+STR_QUANTITY_VALUABLES                                          :{COMMA} sæk værdigendstande
+STR_QUANTITY_COPPER_ORE                                         :{COMMA} tons kobbermalm
+STR_QUANTITY_MAIZE                                              :{COMMA} ton majs
+STR_QUANTITY_FRUIT                                              :{COMMA} ton frugt
+STR_QUANTITY_DIAMONDS                                           :{COMMA} sæk diamanter
+STR_QUANTITY_FOOD                                               :{COMMA} ton mad
+STR_QUANTITY_PAPER                                              :{COMMA} ton papir
+STR_QUANTITY_GOLD                                               :{COMMA} sæk guld
+STR_QUANTITY_WATER                                              :{VOLUME} vand
+STR_QUANTITY_WHEAT                                              :{COMMA} ton hvede
+STR_QUANTITY_RUBBER                                             :{VOLUME} gummi
+STR_QUANTITY_SUGAR                                              :{COMMA} ton sukker
+STR_QUANTITY_TOYS                                               :{COMMA} legetøj
+STR_QUANTITY_SWEETS                                             :{COMMA} sæk slik
+STR_QUANTITY_COLA                                               :{VOLUME} cola
+STR_QUANTITY_CANDYFLOSS                                         :{COMMA} ton candyfloss
+STR_QUANTITY_BUBBLES                                            :{COMMA} boble
+STR_QUANTITY_TOFFEE                                             :{COMMA} ton karamel
+STR_QUANTITY_BATTERIES                                          :{COMMA} batteri
+STR_QUANTITY_PLASTIC                                            :{VOLUME} plastik
+STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA} sodavand
+STR_ABBREV_NOTHING                                              :
+STR_ABBREV_PASSENGERS                                           :{TINYFONT}PS
+STR_ABBREV_COAL                                                 :{TINYFONT}CL
+STR_ABBREV_MAIL                                                 :{TINYFONT}ML
+STR_ABBREV_OIL                                                  :{TINYFONT}OL
+STR_ABBREV_LIVESTOCK                                            :{TINYFONT}LV
+STR_ABBREV_GOODS                                                :{TINYFONT}GD
+STR_ABBREV_GRAIN                                                :{TINYFONT}GR
+STR_ABBREV_WOOD                                                 :{TINYFONT}WD
+STR_ABBREV_IRON_ORE                                             :{TINYFONT}OR
+STR_ABBREV_STEEL                                                :{TINYFONT}ST
+STR_ABBREV_VALUABLES                                            :{TINYFONT}VL
+STR_ABBREV_COPPER_ORE                                           :{TINYFONT}CO
+STR_ABBREV_MAIZE                                                :{TINYFONT}MZ
+STR_ABBREV_FRUIT                                                :{TINYFONT}FT
+STR_ABBREV_DIAMONDS                                             :{TINYFONT}DM
+STR_ABBREV_FOOD                                                 :{TINYFONT}FD
+STR_ABBREV_PAPER                                                :{TINYFONT}PR
+STR_ABBREV_GOLD                                                 :{TINYFONT}GD
+STR_ABBREV_WATER                                                :{TINYFONT}WR
+STR_ABBREV_WHEAT                                                :{TINYFONT}WH
+STR_ABBREV_RUBBER                                               :{TINYFONT}RB
+STR_ABBREV_SUGAR                                                :{TINYFONT}SG
+STR_ABBREV_TOYS                                                 :{TINYFONT}TY
+STR_ABBREV_SWEETS                                               :{TINYFONT}SW
+STR_ABBREV_COLA                                                 :{TINYFONT}CL
+STR_ABBREV_CANDYFLOSS                                           :{TINYFONT}CF
+STR_ABBREV_BUBBLES                                              :{TINYFONT}BU
+STR_ABBREV_TOFFEE                                               :{TINYFONT}TF
+STR_ABBREV_BATTERIES                                            :{TINYFONT}BA
+STR_ABBREV_PLASTIC                                              :{TINYFONT}PL
+STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}FZ
 STR_00AE                                                        :{WHITE}{DATE_SHORT}
 STR_00AF                                                        :{WHITE}{DATE_LONG}
 STR_00B0_MAP                                                    :{WHITE}Kort - {STRING}
diff --git a/lang/dutch.txt b/lang/dutch.txt
index 787b4a27c..8f208bce5 100644
--- a/lang/dutch.txt
+++ b/lang/dutch.txt
@@ -82,70 +82,70 @@ STR_004A_TOFFEE                                                 :Toffee
 STR_004B_BATTERY                                                :Batterij
 STR_004C_PLASTIC                                                :Plastic
 STR_004D_FIZZY_DRINK                                            :Frisdrank
-STR_004E                                                        :
-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                                      :{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                                           :{COMMA} ton tarwe
-STR_0063_OF_RUBBER                                              :{VOLUME} rubber
-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                                    :{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                                            :{COMMA} blikje frisdrank
-STR_008E                                                        :
-STR_008F_PS                                                     :{TINYFONT}PS
-STR_0090_CL                                                     :{TINYFONT}KL
-STR_0091_ML                                                     :{TINYFONT}PT
-STR_0092_OL                                                     :{TINYFONT}OL
-STR_0093_LV                                                     :{TINYFONT}VE
-STR_0094_GD                                                     :{TINYFONT}GD
-STR_0095_GR                                                     :{TINYFONT}GR
-STR_0096_WD                                                     :{TINYFONT}HT
-STR_0097_OR                                                     :{TINYFONT}IJ
-STR_0098_ST                                                     :{TINYFONT}ST
-STR_0099_VL                                                     :{TINYFONT}KB
-STR_009A_CO                                                     :{TINYFONT}KE
-STR_009B_MZ                                                     :{TINYFONT}MS
-STR_009C_FT                                                     :{TINYFONT}FT
-STR_009D_DM                                                     :{TINYFONT}DM
-STR_009E_FD                                                     :{TINYFONT}VD
-STR_009F_PR                                                     :{TINYFONT}PR
-STR_00A0_GD                                                     :{TINYFONT}GD
-STR_00A1_WR                                                     :{TINYFONT}WR
-STR_00A2_WH                                                     :{TINYFONT}TW
-STR_00A3_RB                                                     :{TINYFONT}RB
-STR_00A4_SG                                                     :{TINYFONT}SK
-STR_00A5_TY                                                     :{TINYFONT}SP
-STR_00A6_SW                                                     :{TINYFONT}SN
-STR_00A7_CL                                                     :{TINYFONT}CL
-STR_00A8_CF                                                     :{TINYFONT}SS
-STR_00A9_BU                                                     :{TINYFONT}BE
-STR_00AA_TF                                                     :{TINYFONT}TF
-STR_00AB_BA                                                     :{TINYFONT}BA
-STR_00AC_PL                                                     :{TINYFONT}PL
-STR_00AD_FZ                                                     :{TINYFONT}FR
+STR_QUANTITY_NOTHING                                            :
+STR_QUANTITY_PASSENGERS                                         :{COMMA} passagier
+STR_QUANTITY_COAL                                               :{COMMA} ton kolen
+STR_QUANTITY_MAIL                                               :{COMMA} zak post
+STR_QUANTITY_OIL                                                :{VOLUME} olie
+STR_QUANTITY_LIVESTOCK                                          :{COMMA} stuk vee
+STR_QUANTITY_GOODS                                              :{COMMA} pallet goederen
+STR_QUANTITY_GRAIN                                              :{COMMA} ton graan
+STR_QUANTITY_WOOD                                               :{COMMA} ton hout
+STR_QUANTITY_IRON_ORE                                           :{COMMA} ton ijzererts
+STR_QUANTITY_STEEL                                              :{COMMA} ton staal
+STR_QUANTITY_VALUABLES                                          :{COMMA} zak kostbaarheden
+STR_QUANTITY_COPPER_ORE                                         :{COMMA} ton kopererts
+STR_QUANTITY_MAIZE                                              :{COMMA} ton maïs
+STR_QUANTITY_FRUIT                                              :{COMMA} ton fruit
+STR_QUANTITY_DIAMONDS                                           :{COMMA} zak diamanten
+STR_QUANTITY_FOOD                                               :{COMMA} ton voedsel
+STR_QUANTITY_PAPER                                              :{COMMA} ton papier
+STR_QUANTITY_GOLD                                               :{COMMA} zak goud
+STR_QUANTITY_WATER                                              :{VOLUME} water
+STR_QUANTITY_WHEAT                                              :{COMMA} ton tarwe
+STR_QUANTITY_RUBBER                                             :{VOLUME} rubber
+STR_QUANTITY_SUGAR                                              :{COMMA} ton suiker
+STR_QUANTITY_TOYS                                               :{COMMA} speelgoed
+STR_QUANTITY_SWEETS                                             :{COMMA} zak snoep
+STR_QUANTITY_COLA                                               :{VOLUME} cola
+STR_QUANTITY_CANDYFLOSS                                         :{COMMA} ton suikerspinnen
+STR_QUANTITY_BUBBLES                                            :{COMMA} bel
+STR_QUANTITY_TOFFEE                                             :{COMMA} ton toffee
+STR_QUANTITY_BATTERIES                                          :{COMMA} batterij
+STR_QUANTITY_PLASTIC                                            :{VOLUME} plastic
+STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA} blikje frisdrank
+STR_ABBREV_NOTHING                                              :
+STR_ABBREV_PASSENGERS                                           :{TINYFONT}PS
+STR_ABBREV_COAL                                                 :{TINYFONT}KL
+STR_ABBREV_MAIL                                                 :{TINYFONT}PT
+STR_ABBREV_OIL                                                  :{TINYFONT}OL
+STR_ABBREV_LIVESTOCK                                            :{TINYFONT}VE
+STR_ABBREV_GOODS                                                :{TINYFONT}GD
+STR_ABBREV_GRAIN                                                :{TINYFONT}GR
+STR_ABBREV_WOOD                                                 :{TINYFONT}HT
+STR_ABBREV_IRON_ORE                                             :{TINYFONT}IJ
+STR_ABBREV_STEEL                                                :{TINYFONT}ST
+STR_ABBREV_VALUABLES                                            :{TINYFONT}KB
+STR_ABBREV_COPPER_ORE                                           :{TINYFONT}KE
+STR_ABBREV_MAIZE                                                :{TINYFONT}MS
+STR_ABBREV_FRUIT                                                :{TINYFONT}FT
+STR_ABBREV_DIAMONDS                                             :{TINYFONT}DM
+STR_ABBREV_FOOD                                                 :{TINYFONT}VD
+STR_ABBREV_PAPER                                                :{TINYFONT}PR
+STR_ABBREV_GOLD                                                 :{TINYFONT}GD
+STR_ABBREV_WATER                                                :{TINYFONT}WR
+STR_ABBREV_WHEAT                                                :{TINYFONT}TW
+STR_ABBREV_RUBBER                                               :{TINYFONT}RB
+STR_ABBREV_SUGAR                                                :{TINYFONT}SK
+STR_ABBREV_TOYS                                                 :{TINYFONT}SP
+STR_ABBREV_SWEETS                                               :{TINYFONT}SN
+STR_ABBREV_COLA                                                 :{TINYFONT}CL
+STR_ABBREV_CANDYFLOSS                                           :{TINYFONT}SS
+STR_ABBREV_BUBBLES                                              :{TINYFONT}BE
+STR_ABBREV_TOFFEE                                               :{TINYFONT}TF
+STR_ABBREV_BATTERIES                                            :{TINYFONT}BA
+STR_ABBREV_PLASTIC                                              :{TINYFONT}PL
+STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}FR
 STR_00AE                                                        :{WHITE}{DATE_SHORT}
 STR_00AF                                                        :{WHITE}{DATE_LONG}
 STR_00B0_MAP                                                    :{WHITE}Kaart - {STRING}
diff --git a/lang/english.txt b/lang/english.txt
index d9249608f..624ae0799 100644
--- a/lang/english.txt
+++ b/lang/english.txt
@@ -82,70 +82,70 @@ STR_004A_TOFFEE                                                 :Toffee
 STR_004B_BATTERY                                                :Battery
 STR_004C_PLASTIC                                                :Plastic
 STR_004D_FIZZY_DRINK                                            :Fizzy Drink
-STR_004E                                                        :
-STR_004F_PASSENGER                                              :{COMMA} passenger{P "" s}
-STR_0050_TON_OF_COAL                                            :{COMMA} tonne{P "" s} of coal
-STR_0051_BAG_OF_MAIL                                            :{COMMA} bag{P "" s} of mail
-STR_0052_OF_OIL                                                 :{VOLUME} of oil
-STR_0053_ITEM_OF_LIVESTOCK                                      :{COMMA} item{P "" s} of livestock
-STR_0054_CRATE_OF_GOODS                                         :{COMMA} crate{P "" s} of goods
-STR_0055_TON_OF_GRAIN                                           :{COMMA} tonne{P "" s} of grain
-STR_0056_TON_OF_WOOD                                            :{COMMA} tonne{P "" s} of wood
-STR_0057_TON_OF_IRON_ORE                                        :{COMMA} tonne{P "" s} of iron ore
-STR_0058_TON_OF_STEEL                                           :{COMMA} tonne{P "" s} of steel
-STR_0059_BAG_OF_VALUABLES                                       :{COMMA} bag{P "" s} of valuables
-STR_005A_TON_OF_COPPER_ORE                                      :{COMMA} tonne{P "" s} of copper ore
-STR_005B_TON_OF_MAIZE                                           :{COMMA} tonne{P "" s} of maize
-STR_005C_TON_OF_FRUIT                                           :{COMMA} tonne{P "" s} of fruit
-STR_005D_BAG_OF_DIAMONDS                                        :{COMMA} bag{P "" s} of diamonds
-STR_005E_TON_OF_FOOD                                            :{COMMA} tonne{P "" s} of food
-STR_005F_TON_OF_PAPER                                           :{COMMA} tonne{P "" s} of paper
-STR_0060_BAG_OF_GOLD                                            :{COMMA} bag{P "" s} of gold
-STR_0061_OF_WATER                                               :{VOLUME} of water
-STR_0062_TON_OF_WHEAT                                           :{COMMA} tonne{P "" s} of wheat
-STR_0063_OF_RUBBER                                              :{VOLUME} of rubber
-STR_0064_TON_OF_SUGAR                                           :{COMMA} tonne{P "" s} of sugar
-STR_0065_TOY                                                    :{COMMA} toy{P "" s}
-STR_0066_BAG_OF_CANDY                                           :{COMMA} bag{P "" s} of sweets
-STR_0067_OF_COLA                                                :{VOLUME} of cola
-STR_0068_TON_OF_COTTON_CANDY                                    :{COMMA} tonne{P "" s} of candyfloss
-STR_0069_BUBBLE                                                 :{COMMA} bubble{P "" s}
-STR_006A_TON_OF_TOFFEE                                          :{COMMA} tonne{P "" s} of toffee
-STR_006B_BATTERY                                                :{COMMA} batter{P y ies}
-STR_006C_OF_PLASTIC                                             :{VOLUME} of plastic
-STR_006D_FIZZY_DRINK                                            :{COMMA} fizzy drink{P "" s}
-STR_008E                                                        :
-STR_008F_PS                                                     :{TINYFONT}PS
-STR_0090_CL                                                     :{TINYFONT}CL
-STR_0091_ML                                                     :{TINYFONT}ML
-STR_0092_OL                                                     :{TINYFONT}OL
-STR_0093_LV                                                     :{TINYFONT}LV
-STR_0094_GD                                                     :{TINYFONT}GD
-STR_0095_GR                                                     :{TINYFONT}GR
-STR_0096_WD                                                     :{TINYFONT}WD
-STR_0097_OR                                                     :{TINYFONT}OR
-STR_0098_ST                                                     :{TINYFONT}ST
-STR_0099_VL                                                     :{TINYFONT}VL
-STR_009A_CO                                                     :{TINYFONT}CO
-STR_009B_MZ                                                     :{TINYFONT}MZ
-STR_009C_FT                                                     :{TINYFONT}FT
-STR_009D_DM                                                     :{TINYFONT}DM
-STR_009E_FD                                                     :{TINYFONT}FD
-STR_009F_PR                                                     :{TINYFONT}PR
-STR_00A0_GD                                                     :{TINYFONT}GD
-STR_00A1_WR                                                     :{TINYFONT}WR
-STR_00A2_WH                                                     :{TINYFONT}WH
-STR_00A3_RB                                                     :{TINYFONT}RB
-STR_00A4_SG                                                     :{TINYFONT}SG
-STR_00A5_TY                                                     :{TINYFONT}TY
-STR_00A6_SW                                                     :{TINYFONT}SW
-STR_00A7_CL                                                     :{TINYFONT}CL
-STR_00A8_CF                                                     :{TINYFONT}CF
-STR_00A9_BU                                                     :{TINYFONT}BU
-STR_00AA_TF                                                     :{TINYFONT}TF
-STR_00AB_BA                                                     :{TINYFONT}BA
-STR_00AC_PL                                                     :{TINYFONT}PL
-STR_00AD_FZ                                                     :{TINYFONT}FZ
+STR_QUANTITY_NOTHING                                            :
+STR_QUANTITY_PASSENGERS                                         :{COMMA} passenger{P "" s}
+STR_QUANTITY_COAL                                               :{COMMA} tonne{P "" s} of coal
+STR_QUANTITY_MAIL                                               :{COMMA} bag{P "" s} of mail
+STR_QUANTITY_OIL                                                :{VOLUME} of oil
+STR_QUANTITY_LIVESTOCK                                          :{COMMA} item{P "" s} of livestock
+STR_QUANTITY_GOODS                                              :{COMMA} crate{P "" s} of goods
+STR_QUANTITY_GRAIN                                              :{COMMA} tonne{P "" s} of grain
+STR_QUANTITY_WOOD                                               :{COMMA} tonne{P "" s} of wood
+STR_QUANTITY_IRON_ORE                                           :{COMMA} tonne{P "" s} of iron ore
+STR_QUANTITY_STEEL                                              :{COMMA} tonne{P "" s} of steel
+STR_QUANTITY_VALUABLES                                          :{COMMA} bag{P "" s} of valuables
+STR_QUANTITY_COPPER_ORE                                         :{COMMA} tonne{P "" s} of copper ore
+STR_QUANTITY_MAIZE                                              :{COMMA} tonne{P "" s} of maize
+STR_QUANTITY_FRUIT                                              :{COMMA} tonne{P "" s} of fruit
+STR_QUANTITY_DIAMONDS                                           :{COMMA} bag{P "" s} of diamonds
+STR_QUANTITY_FOOD                                               :{COMMA} tonne{P "" s} of food
+STR_QUANTITY_PAPER                                              :{COMMA} tonne{P "" s} of paper
+STR_QUANTITY_GOLD                                               :{COMMA} bag{P "" s} of gold
+STR_QUANTITY_WATER                                              :{VOLUME} of water
+STR_QUANTITY_WHEAT                                              :{COMMA} tonne{P "" s} of wheat
+STR_QUANTITY_RUBBER                                             :{VOLUME} of rubber
+STR_QUANTITY_SUGAR                                              :{COMMA} tonne{P "" s} of sugar
+STR_QUANTITY_TOYS                                               :{COMMA} toy{P "" s}
+STR_QUANTITY_SWEETS                                             :{COMMA} bag{P "" s} of sweets
+STR_QUANTITY_COLA                                               :{VOLUME} of cola
+STR_QUANTITY_CANDYFLOSS                                         :{COMMA} tonne{P "" s} of candyfloss
+STR_QUANTITY_BUBBLES                                            :{COMMA} bubble{P "" s}
+STR_QUANTITY_TOFFEE                                             :{COMMA} tonne{P "" s} of toffee
+STR_QUANTITY_BATTERIES                                          :{COMMA} batter{P y ies}
+STR_QUANTITY_PLASTIC                                            :{VOLUME} of plastic
+STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA} fizzy drink{P "" s}
+STR_ABBREV_NOTHING                                              :
+STR_ABBREV_PASSENGERS                                           :{TINYFONT}PS
+STR_ABBREV_COAL                                                 :{TINYFONT}CL
+STR_ABBREV_MAIL                                                 :{TINYFONT}ML
+STR_ABBREV_OIL                                                  :{TINYFONT}OL
+STR_ABBREV_LIVESTOCK                                            :{TINYFONT}LV
+STR_ABBREV_GOODS                                                :{TINYFONT}GD
+STR_ABBREV_GRAIN                                                :{TINYFONT}GR
+STR_ABBREV_WOOD                                                 :{TINYFONT}WD
+STR_ABBREV_IRON_ORE                                             :{TINYFONT}OR
+STR_ABBREV_STEEL                                                :{TINYFONT}ST
+STR_ABBREV_VALUABLES                                            :{TINYFONT}VL
+STR_ABBREV_COPPER_ORE                                           :{TINYFONT}CO
+STR_ABBREV_MAIZE                                                :{TINYFONT}MZ
+STR_ABBREV_FRUIT                                                :{TINYFONT}FT
+STR_ABBREV_DIAMONDS                                             :{TINYFONT}DM
+STR_ABBREV_FOOD                                                 :{TINYFONT}FD
+STR_ABBREV_PAPER                                                :{TINYFONT}PR
+STR_ABBREV_GOLD                                                 :{TINYFONT}GD
+STR_ABBREV_WATER                                                :{TINYFONT}WR
+STR_ABBREV_WHEAT                                                :{TINYFONT}WH
+STR_ABBREV_RUBBER                                               :{TINYFONT}RB
+STR_ABBREV_SUGAR                                                :{TINYFONT}SG
+STR_ABBREV_TOYS                                                 :{TINYFONT}TY
+STR_ABBREV_SWEETS                                               :{TINYFONT}SW
+STR_ABBREV_COLA                                                 :{TINYFONT}CL
+STR_ABBREV_CANDYFLOSS                                           :{TINYFONT}CF
+STR_ABBREV_BUBBLES                                              :{TINYFONT}BU
+STR_ABBREV_TOFFEE                                               :{TINYFONT}TF
+STR_ABBREV_BATTERIES                                            :{TINYFONT}BA
+STR_ABBREV_PLASTIC                                              :{TINYFONT}PL
+STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}FZ
 STR_00AE                                                        :{WHITE}{DATE_SHORT}
 STR_00AF                                                        :{WHITE}{DATE_LONG}
 STR_00B0_MAP                                                    :{WHITE}Map - {STRING}
diff --git a/lang/estonian.txt b/lang/estonian.txt
index e860f4a41..6e04744bb 100644
--- a/lang/estonian.txt
+++ b/lang/estonian.txt
@@ -82,70 +82,70 @@ STR_004A_TOFFEE                                                 :Iiris
 STR_004B_BATTERY                                                :Patarei
 STR_004C_PLASTIC                                                :Plastmass
 STR_004D_FIZZY_DRINK                                            :Kihisev jook
-STR_004E                                                        :
-STR_004F_PASSENGER                                              :{COMMA} reisija{P "" t}
-STR_0050_TON_OF_COAL                                            :{COMMA} tonn{P "" i} kivisütt
-STR_0051_BAG_OF_MAIL                                            :{COMMA} postipakk{P "" i}
-STR_0052_OF_OIL                                                 :{VOLUME} naftat
-STR_0053_ITEM_OF_LIVESTOCK                                      :{COMMA} loom{P "" a}
-STR_0054_CRATE_OF_GOODS                                         :{COMMA} kast{P "" i} kaupa
-STR_0055_TON_OF_GRAIN                                           :{COMMA} tonn{P "" i} teravilja
-STR_0056_TON_OF_WOOD                                            :{COMMA} tonn{P "" i} puitu
-STR_0057_TON_OF_IRON_ORE                                        :{COMMA} tonn{P "" i} rauamaaki
-STR_0058_TON_OF_STEEL                                           :{COMMA} tonn{P "" i} terast
-STR_0059_BAG_OF_VALUABLES                                       :{COMMA} kotitäi{P s t} väärisasju
-STR_005A_TON_OF_COPPER_ORE                                      :{COMMA} tonn{P "" i} vasemaaki
-STR_005B_TON_OF_MAIZE                                           :{COMMA} tonn{P "" i} maisi
-STR_005C_TON_OF_FRUIT                                           :{COMMA} tonn{P "" i} puuvilju
-STR_005D_BAG_OF_DIAMONDS                                        :{COMMA} kotitäi{P s t} teemante{P id ""}
-STR_005E_TON_OF_FOOD                                            :{COMMA} tonn{P "" i} toitu
-STR_005F_TON_OF_PAPER                                           :{COMMA} tonn{P "" i} paberit
-STR_0060_BAG_OF_GOLD                                            :{COMMA} kotitäi{P s t} kulda
-STR_0061_OF_WATER                                               :{VOLUME} vett
-STR_0062_TON_OF_WHEAT                                           :{COMMA} tonn{P "" i} nisu
-STR_0063_OF_RUBBER                                              :{VOLUME} Kummi
-STR_0064_TON_OF_SUGAR                                           :{COMMA} tonn{P "" i} suhkrut
-STR_0065_TOY                                                    :{COMMA} mänguas{P i ja}
-STR_0066_BAG_OF_CANDY                                           :{COMMA} kontitäi{P s t} maiustusi
-STR_0067_OF_COLA                                                :{VOLUME} koolat
-STR_0068_TON_OF_COTTON_CANDY                                    :{COMMA} tonn{P "" i} suhkruvatti
-STR_0069_BUBBLE                                                 :{COMMA} mull{P "" i}
-STR_006A_TON_OF_TOFFEE                                          :{COMMA} tonn{P "" i} iirist
-STR_006B_BATTERY                                                :{COMMA} patarei{P "" d}
-STR_006C_OF_PLASTIC                                             :{VOLUME} plastmassi
-STR_006D_FIZZY_DRINK                                            :{COMMA} kihisevaid jooke
-STR_008E                                                        :
-STR_008F_PS                                                     :{TINYFONT}PS
-STR_0090_CL                                                     :{TINYFONT}CL
-STR_0091_ML                                                     :{TINYFONT}ML
-STR_0092_OL                                                     :{TINYFONT}OL
-STR_0093_LV                                                     :{TINYFONT}LV
-STR_0094_GD                                                     :{TINYFONT}GD
-STR_0095_GR                                                     :{TINYFONT}GR
-STR_0096_WD                                                     :{TINYFONT}WD
-STR_0097_OR                                                     :{TINYFONT}OR
-STR_0098_ST                                                     :{TINYFONT}ST
-STR_0099_VL                                                     :{TINYFONT}VL
-STR_009A_CO                                                     :{TINYFONT}CO
-STR_009B_MZ                                                     :{TINYFONT}MZ
-STR_009C_FT                                                     :{TINYFONT}FT
-STR_009D_DM                                                     :{TINYFONT}DM
-STR_009E_FD                                                     :{TINYFONT}FD
-STR_009F_PR                                                     :{TINYFONT}PR
-STR_00A0_GD                                                     :{TINYFONT}GD
-STR_00A1_WR                                                     :{TINYFONT}WR
-STR_00A2_WH                                                     :{TINYFONT}WH
-STR_00A3_RB                                                     :{TINYFONT}RB
-STR_00A4_SG                                                     :{TINYFONT}SG
-STR_00A5_TY                                                     :{TINYFONT}TY
-STR_00A6_SW                                                     :{TINYFONT}SW
-STR_00A7_CL                                                     :{TINYFONT}CL
-STR_00A8_CF                                                     :{TINYFONT}CF
-STR_00A9_BU                                                     :{TINYFONT}BU
-STR_00AA_TF                                                     :{TINYFONT}TF
-STR_00AB_BA                                                     :{TINYFONT}BA
-STR_00AC_PL                                                     :{TINYFONT}PL
-STR_00AD_FZ                                                     :{TINYFONT}FZ
+STR_QUANTITY_NOTHING                                            :
+STR_QUANTITY_PASSENGERS                                         :{COMMA} reisija{P "" t}
+STR_QUANTITY_COAL                                               :{COMMA} tonn{P "" i} kivisütt
+STR_QUANTITY_MAIL                                               :{COMMA} postipakk{P "" i}
+STR_QUANTITY_OIL                                                :{VOLUME} naftat
+STR_QUANTITY_LIVESTOCK                                          :{COMMA} loom{P "" a}
+STR_QUANTITY_GOODS                                              :{COMMA} kast{P "" i} kaupa
+STR_QUANTITY_GRAIN                                              :{COMMA} tonn{P "" i} teravilja
+STR_QUANTITY_WOOD                                               :{COMMA} tonn{P "" i} puitu
+STR_QUANTITY_IRON_ORE                                           :{COMMA} tonn{P "" i} rauamaaki
+STR_QUANTITY_STEEL                                              :{COMMA} tonn{P "" i} terast
+STR_QUANTITY_VALUABLES                                          :{COMMA} kotitäi{P s t} väärisasju
+STR_QUANTITY_COPPER_ORE                                         :{COMMA} tonn{P "" i} vasemaaki
+STR_QUANTITY_MAIZE                                              :{COMMA} tonn{P "" i} maisi
+STR_QUANTITY_FRUIT                                              :{COMMA} tonn{P "" i} puuvilju
+STR_QUANTITY_DIAMONDS                                           :{COMMA} kotitäi{P s t} teemante{P id ""}
+STR_QUANTITY_FOOD                                               :{COMMA} tonn{P "" i} toitu
+STR_QUANTITY_PAPER                                              :{COMMA} tonn{P "" i} paberit
+STR_QUANTITY_GOLD                                               :{COMMA} kotitäi{P s t} kulda
+STR_QUANTITY_WATER                                              :{VOLUME} vett
+STR_QUANTITY_WHEAT                                              :{COMMA} tonn{P "" i} nisu
+STR_QUANTITY_RUBBER                                             :{VOLUME} Kummi
+STR_QUANTITY_SUGAR                                              :{COMMA} tonn{P "" i} suhkrut
+STR_QUANTITY_TOYS                                               :{COMMA} mänguas{P i ja}
+STR_QUANTITY_SWEETS                                             :{COMMA} kontitäi{P s t} maiustusi
+STR_QUANTITY_COLA                                               :{VOLUME} koolat
+STR_QUANTITY_CANDYFLOSS                                         :{COMMA} tonn{P "" i} suhkruvatti
+STR_QUANTITY_BUBBLES                                            :{COMMA} mull{P "" i}
+STR_QUANTITY_TOFFEE                                             :{COMMA} tonn{P "" i} iirist
+STR_QUANTITY_BATTERIES                                          :{COMMA} patarei{P "" d}
+STR_QUANTITY_PLASTIC                                            :{VOLUME} plastmassi
+STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA} kihisevaid jooke
+STR_ABBREV_NOTHING                                              :
+STR_ABBREV_PASSENGERS                                           :{TINYFONT}PS
+STR_ABBREV_COAL                                                 :{TINYFONT}CL
+STR_ABBREV_MAIL                                                 :{TINYFONT}ML
+STR_ABBREV_OIL                                                  :{TINYFONT}OL
+STR_ABBREV_LIVESTOCK                                            :{TINYFONT}LV
+STR_ABBREV_GOODS                                                :{TINYFONT}GD
+STR_ABBREV_GRAIN                                                :{TINYFONT}GR
+STR_ABBREV_WOOD                                                 :{TINYFONT}WD
+STR_ABBREV_IRON_ORE                                             :{TINYFONT}OR
+STR_ABBREV_STEEL                                                :{TINYFONT}ST
+STR_ABBREV_VALUABLES                                            :{TINYFONT}VL
+STR_ABBREV_COPPER_ORE                                           :{TINYFONT}CO
+STR_ABBREV_MAIZE                                                :{TINYFONT}MZ
+STR_ABBREV_FRUIT                                                :{TINYFONT}FT
+STR_ABBREV_DIAMONDS                                             :{TINYFONT}DM
+STR_ABBREV_FOOD                                                 :{TINYFONT}FD
+STR_ABBREV_PAPER                                                :{TINYFONT}PR
+STR_ABBREV_GOLD                                                 :{TINYFONT}GD
+STR_ABBREV_WATER                                                :{TINYFONT}WR
+STR_ABBREV_WHEAT                                                :{TINYFONT}WH
+STR_ABBREV_RUBBER                                               :{TINYFONT}RB
+STR_ABBREV_SUGAR                                                :{TINYFONT}SG
+STR_ABBREV_TOYS                                                 :{TINYFONT}TY
+STR_ABBREV_SWEETS                                               :{TINYFONT}SW
+STR_ABBREV_COLA                                                 :{TINYFONT}CL
+STR_ABBREV_CANDYFLOSS                                           :{TINYFONT}CF
+STR_ABBREV_BUBBLES                                              :{TINYFONT}BU
+STR_ABBREV_TOFFEE                                               :{TINYFONT}TF
+STR_ABBREV_BATTERIES                                            :{TINYFONT}BA
+STR_ABBREV_PLASTIC                                              :{TINYFONT}PL
+STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}FZ
 STR_00AE                                                        :{WHITE}{DATE_SHORT}
 STR_00AF                                                        :{WHITE}{DATE_LONG}
 STR_00B0_MAP                                                    :{WHITE}Kaart - {STRING}
diff --git a/lang/finnish.txt b/lang/finnish.txt
index b60e59d12..bf3c0bcc1 100644
--- a/lang/finnish.txt
+++ b/lang/finnish.txt
@@ -82,70 +82,70 @@ STR_004A_TOFFEE                                                 :Toffee
 STR_004B_BATTERY                                                :Paristo
 STR_004C_PLASTIC                                                :Muovi
 STR_004D_FIZZY_DRINK                                            :Sihijuoma
-STR_004E                                                        :
-STR_004F_PASSENGER                                              :{COMMA} matkustaja{P "" a}
-STR_0050_TON_OF_COAL                                            :{COMMA} tonni{P "" a} kivihiiltä
-STR_0051_BAG_OF_MAIL                                            :{COMMA} säkki{P "" ä} postia
-STR_0052_OF_OIL                                                 :{VOLUME} öljyä
-STR_0053_ITEM_OF_LIVESTOCK                                      :{COMMA} erä{P "" ä} karjaa
-STR_0054_CRATE_OF_GOODS                                         :{COMMA} laatikko{P "" a} tavaraa
-STR_0055_TON_OF_GRAIN                                           :{COMMA} tonni{P "" a} viljaa
-STR_0056_TON_OF_WOOD                                            :{COMMA} tonni{P "" a} puutavaraa
-STR_0057_TON_OF_IRON_ORE                                        :{COMMA} tonni{P "" a} rautamalmia
-STR_0058_TON_OF_STEEL                                           :{COMMA} tonni{P "" a} terästä
-STR_0059_BAG_OF_VALUABLES                                       :{COMMA} säkki{P "" ä} arvotavaraa
-STR_005A_TON_OF_COPPER_ORE                                      :{COMMA} tonni{P "" a} kuparimalmia
-STR_005B_TON_OF_MAIZE                                           :{COMMA} tonni maissia
-STR_005C_TON_OF_FRUIT                                           :{COMMA} tonni{P "" a} hedelmiä
-STR_005D_BAG_OF_DIAMONDS                                        :{COMMA} säkki{P "" ä} timantteja
-STR_005E_TON_OF_FOOD                                            :{COMMA} tonni{P "" a} ruokaa
-STR_005F_TON_OF_PAPER                                           :{COMMA} tonni{P "" a}  paperia
-STR_0060_BAG_OF_GOLD                                            :{COMMA} säkki{P "" ä} kultaa
-STR_0061_OF_WATER                                               :{VOLUME} vettä
-STR_0062_TON_OF_WHEAT                                           :{COMMA} tonni{P "" a} vehnää
-STR_0063_OF_RUBBER                                              :{VOLUME} kumia
-STR_0064_TON_OF_SUGAR                                           :{COMMA} tonni{P "" a} sokeria
-STR_0065_TOY                                                    :{COMMA} lelu{P "" a}
-STR_0066_BAG_OF_CANDY                                           :{COMMA} säkki{P "" ä} karkkia
-STR_0067_OF_COLA                                                :{VOLUME} limsaa
-STR_0068_TON_OF_COTTON_CANDY                                    :{COMMA} tonni{P "" a} hattaraa
-STR_0069_BUBBLE                                                 :{COMMA} kupla{P "" a}
-STR_006A_TON_OF_TOFFEE                                          :{COMMA} tonni{P "" a} toffeeta
-STR_006B_BATTERY                                                :{COMMA} paristo{P "" a}
-STR_006C_OF_PLASTIC                                             :{VOLUME} muovia
-STR_006D_FIZZY_DRINK                                            :{COMMA} sihijuoma{P "" a}
-STR_008E                                                        :
-STR_008F_PS                                                     :{TINYFONT}MA
-STR_0090_CL                                                     :{TINYFONT}HL
-STR_0091_ML                                                     :{TINYFONT}SP
-STR_0092_OL                                                     :{TINYFONT}ÖL
-STR_0093_LV                                                     :{TINYFONT}KA
-STR_0094_GD                                                     :{TINYFONT}TA
-STR_0095_GR                                                     :{TINYFONT}VL
-STR_0096_WD                                                     :{TINYFONT}PT
-STR_0097_OR                                                     :{TINYFONT}RM
-STR_0098_ST                                                     :{TINYFONT}TR
-STR_0099_VL                                                     :{TINYFONT}AT
-STR_009A_CO                                                     :{TINYFONT}KM
-STR_009B_MZ                                                     :{TINYFONT}MS
-STR_009C_FT                                                     :{TINYFONT}HE
-STR_009D_DM                                                     :{TINYFONT}TI
-STR_009E_FD                                                     :{TINYFONT}RU
-STR_009F_PR                                                     :{TINYFONT}PA
-STR_00A0_GD                                                     :{TINYFONT}KU
-STR_00A1_WR                                                     :{TINYFONT}VS
-STR_00A2_WH                                                     :{TINYFONT}VH
-STR_00A3_RB                                                     :{TINYFONT}KI
-STR_00A4_SG                                                     :{TINYFONT}SK
-STR_00A5_TY                                                     :{TINYFONT}LL
-STR_00A6_SW                                                     :{TINYFONT}KR
-STR_00A7_CL                                                     :{TINYFONT}LM
-STR_00A8_CF                                                     :{TINYFONT}HT
-STR_00A9_BU                                                     :{TINYFONT}KP
-STR_00AA_TF                                                     :{TINYFONT}TF
-STR_00AB_BA                                                     :{TINYFONT}PT
-STR_00AC_PL                                                     :{TINYFONT}MV
-STR_00AD_FZ                                                     :{TINYFONT}SJ
+STR_QUANTITY_NOTHING                                            :
+STR_QUANTITY_PASSENGERS                                         :{COMMA} matkustaja{P "" a}
+STR_QUANTITY_COAL                                               :{COMMA} tonni{P "" a} kivihiiltä
+STR_QUANTITY_MAIL                                               :{COMMA} säkki{P "" ä} postia
+STR_QUANTITY_OIL                                                :{VOLUME} öljyä
+STR_QUANTITY_LIVESTOCK                                          :{COMMA} erä{P "" ä} karjaa
+STR_QUANTITY_GOODS                                              :{COMMA} laatikko{P "" a} tavaraa
+STR_QUANTITY_GRAIN                                              :{COMMA} tonni{P "" a} viljaa
+STR_QUANTITY_WOOD                                               :{COMMA} tonni{P "" a} puutavaraa
+STR_QUANTITY_IRON_ORE                                           :{COMMA} tonni{P "" a} rautamalmia
+STR_QUANTITY_STEEL                                              :{COMMA} tonni{P "" a} terästä
+STR_QUANTITY_VALUABLES                                          :{COMMA} säkki{P "" ä} arvotavaraa
+STR_QUANTITY_COPPER_ORE                                         :{COMMA} tonni{P "" a} kuparimalmia
+STR_QUANTITY_MAIZE                                              :{COMMA} tonni maissia
+STR_QUANTITY_FRUIT                                              :{COMMA} tonni{P "" a} hedelmiä
+STR_QUANTITY_DIAMONDS                                           :{COMMA} säkki{P "" ä} timantteja
+STR_QUANTITY_FOOD                                               :{COMMA} tonni{P "" a} ruokaa
+STR_QUANTITY_PAPER                                              :{COMMA} tonni{P "" a}  paperia
+STR_QUANTITY_GOLD                                               :{COMMA} säkki{P "" ä} kultaa
+STR_QUANTITY_WATER                                              :{VOLUME} vettä
+STR_QUANTITY_WHEAT                                              :{COMMA} tonni{P "" a} vehnää
+STR_QUANTITY_RUBBER                                             :{VOLUME} kumia
+STR_QUANTITY_SUGAR                                              :{COMMA} tonni{P "" a} sokeria
+STR_QUANTITY_TOYS                                               :{COMMA} lelu{P "" a}
+STR_QUANTITY_SWEETS                                             :{COMMA} säkki{P "" ä} karkkia
+STR_QUANTITY_COLA                                               :{VOLUME} limsaa
+STR_QUANTITY_CANDYFLOSS                                         :{COMMA} tonni{P "" a} hattaraa
+STR_QUANTITY_BUBBLES                                            :{COMMA} kupla{P "" a}
+STR_QUANTITY_TOFFEE                                             :{COMMA} tonni{P "" a} toffeeta
+STR_QUANTITY_BATTERIES                                          :{COMMA} paristo{P "" a}
+STR_QUANTITY_PLASTIC                                            :{VOLUME} muovia
+STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA} sihijuoma{P "" a}
+STR_ABBREV_NOTHING                                              :
+STR_ABBREV_PASSENGERS                                           :{TINYFONT}MA
+STR_ABBREV_COAL                                                 :{TINYFONT}HL
+STR_ABBREV_MAIL                                                 :{TINYFONT}SP
+STR_ABBREV_OIL                                                  :{TINYFONT}ÖL
+STR_ABBREV_LIVESTOCK                                            :{TINYFONT}KA
+STR_ABBREV_GOODS                                                :{TINYFONT}TA
+STR_ABBREV_GRAIN                                                :{TINYFONT}VL
+STR_ABBREV_WOOD                                                 :{TINYFONT}PT
+STR_ABBREV_IRON_ORE                                             :{TINYFONT}RM
+STR_ABBREV_STEEL                                                :{TINYFONT}TR
+STR_ABBREV_VALUABLES                                            :{TINYFONT}AT
+STR_ABBREV_COPPER_ORE                                           :{TINYFONT}KM
+STR_ABBREV_MAIZE                                                :{TINYFONT}MS
+STR_ABBREV_FRUIT                                                :{TINYFONT}HE
+STR_ABBREV_DIAMONDS                                             :{TINYFONT}TI
+STR_ABBREV_FOOD                                                 :{TINYFONT}RU
+STR_ABBREV_PAPER                                                :{TINYFONT}PA
+STR_ABBREV_GOLD                                                 :{TINYFONT}KU
+STR_ABBREV_WATER                                                :{TINYFONT}VS
+STR_ABBREV_WHEAT                                                :{TINYFONT}VH
+STR_ABBREV_RUBBER                                               :{TINYFONT}KI
+STR_ABBREV_SUGAR                                                :{TINYFONT}SK
+STR_ABBREV_TOYS                                                 :{TINYFONT}LL
+STR_ABBREV_SWEETS                                               :{TINYFONT}KR
+STR_ABBREV_COLA                                                 :{TINYFONT}LM
+STR_ABBREV_CANDYFLOSS                                           :{TINYFONT}HT
+STR_ABBREV_BUBBLES                                              :{TINYFONT}KP
+STR_ABBREV_TOFFEE                                               :{TINYFONT}TF
+STR_ABBREV_BATTERIES                                            :{TINYFONT}PT
+STR_ABBREV_PLASTIC                                              :{TINYFONT}MV
+STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}SJ
 STR_00AE                                                        :{WHITE}{DATE_SHORT}
 STR_00AF                                                        :{WHITE}{DATE_LONG}
 STR_00B0_MAP                                                    :{WHITE}Kartta - {STRING}
diff --git a/lang/french.txt b/lang/french.txt
index 60eaabfa9..ce375880e 100644
--- a/lang/french.txt
+++ b/lang/french.txt
@@ -83,70 +83,70 @@ STR_004A_TOFFEE                                                 :Caramel
 STR_004B_BATTERY                                                :Batterie
 STR_004C_PLASTIC                                                :Plastique
 STR_004D_FIZZY_DRINK                                            :Boisson Gazeuse
-STR_004E                                                        :
-STR_004F_PASSENGER                                              :{COMMA} passager{P "" s}
-STR_0050_TON_OF_COAL                                            :{COMMA} tonne{P "" s} de charbon
-STR_0051_BAG_OF_MAIL                                            :{COMMA} sac{P "" s} posta{P l ux}
-STR_0052_OF_OIL                                                 :{VOLUME} de pétrole
-STR_0053_ITEM_OF_LIVESTOCK                                      :{COMMA} tête{P "" s} de bétail
-STR_0054_CRATE_OF_GOODS                                         :{COMMA} caisse{P "" s} de biens
-STR_0055_TON_OF_GRAIN                                           :{COMMA} tonne{P "" s} de grains
-STR_0056_TON_OF_WOOD                                            :{COMMA} tonne{P "" s} de bois
-STR_0057_TON_OF_IRON_ORE                                        :{COMMA} tonne{P "" s} de fer
-STR_0058_TON_OF_STEEL                                           :{COMMA} tonne{P "" s} d'acier
-STR_0059_BAG_OF_VALUABLES                                       :{COMMA} sac{P "" s} d'objets de valeur
-STR_005A_TON_OF_COPPER_ORE                                      :{COMMA} tonne{P "" s} de cuivre
-STR_005B_TON_OF_MAIZE                                           :{COMMA} tonne{P "" s} de maïs
-STR_005C_TON_OF_FRUIT                                           :{COMMA} tonne{P "" s} de fruits
-STR_005D_BAG_OF_DIAMONDS                                        :{COMMA} sac{P "" s} de diamants
-STR_005E_TON_OF_FOOD                                            :{COMMA} tonne{P "" s} de nourriture
-STR_005F_TON_OF_PAPER                                           :{COMMA} tonne{P "" s} de papier
-STR_0060_BAG_OF_GOLD                                            :{COMMA} sac{P "" s} d'or
-STR_0061_OF_WATER                                               :{VOLUME} d'eau
-STR_0062_TON_OF_WHEAT                                           :{COMMA} tonne{P "" s} de blé
-STR_0063_OF_RUBBER                                              :{VOLUME} de caoutchouc
-STR_0064_TON_OF_SUGAR                                           :{COMMA} tonne{P "" s} de sucre
-STR_0065_TOY                                                    :{COMMA} jouet{P "" s}
-STR_0066_BAG_OF_CANDY                                           :{COMMA} sac{P "" s} de jouets
-STR_0067_OF_COLA                                                :{VOLUME} de cola
-STR_0068_TON_OF_COTTON_CANDY                                    :{COMMA} tonne{P "" s} de barbe à papa
-STR_0069_BUBBLE                                                 :{COMMA} bulle{P "" s}
-STR_006A_TON_OF_TOFFEE                                          :{COMMA} tonne{P "" s} de caramel
-STR_006B_BATTERY                                                :{COMMA} batterie{P "" s}
-STR_006C_OF_PLASTIC                                             :{VOLUME} de plastique
-STR_006D_FIZZY_DRINK                                            :{COMMA} boisson{P "" s} gazeuse{P "" s}
-STR_008E                                                        :
-STR_008F_PS                                                     :{TINYFONT}PS
-STR_0090_CL                                                     :{TINYFONT}CL
-STR_0091_ML                                                     :{TINYFONT}ML
-STR_0092_OL                                                     :{TINYFONT}OL
-STR_0093_LV                                                     :{TINYFONT}LV
-STR_0094_GD                                                     :{TINYFONT}GD
-STR_0095_GR                                                     :{TINYFONT}GR
-STR_0096_WD                                                     :{TINYFONT}WD
-STR_0097_OR                                                     :{TINYFONT}OR
-STR_0098_ST                                                     :{TINYFONT}ST
-STR_0099_VL                                                     :{TINYFONT}VL
-STR_009A_CO                                                     :{TINYFONT}CO
-STR_009B_MZ                                                     :{TINYFONT}MZ
-STR_009C_FT                                                     :{TINYFONT}FT
-STR_009D_DM                                                     :{TINYFONT}DM
-STR_009E_FD                                                     :{TINYFONT}FD
-STR_009F_PR                                                     :{TINYFONT}PR
-STR_00A0_GD                                                     :{TINYFONT}GD
-STR_00A1_WR                                                     :{TINYFONT}WR
-STR_00A2_WH                                                     :{TINYFONT}WH
-STR_00A3_RB                                                     :{TINYFONT}RB
-STR_00A4_SG                                                     :{TINYFONT}SG
-STR_00A5_TY                                                     :{TINYFONT}TY
-STR_00A6_SW                                                     :{TINYFONT}SW
-STR_00A7_CL                                                     :{TINYFONT}CL
-STR_00A8_CF                                                     :{TINYFONT}CF
-STR_00A9_BU                                                     :{TINYFONT}BU
-STR_00AA_TF                                                     :{TINYFONT}TF
-STR_00AB_BA                                                     :{TINYFONT}BA
-STR_00AC_PL                                                     :{TINYFONT}PL
-STR_00AD_FZ                                                     :{TINYFONT}FZ
+STR_QUANTITY_NOTHING                                            :
+STR_QUANTITY_PASSENGERS                                         :{COMMA} passager{P "" s}
+STR_QUANTITY_COAL                                               :{COMMA} tonne{P "" s} de charbon
+STR_QUANTITY_MAIL                                               :{COMMA} sac{P "" s} posta{P l ux}
+STR_QUANTITY_OIL                                                :{VOLUME} de pétrole
+STR_QUANTITY_LIVESTOCK                                          :{COMMA} tête{P "" s} de bétail
+STR_QUANTITY_GOODS                                              :{COMMA} caisse{P "" s} de biens
+STR_QUANTITY_GRAIN                                              :{COMMA} tonne{P "" s} de grains
+STR_QUANTITY_WOOD                                               :{COMMA} tonne{P "" s} de bois
+STR_QUANTITY_IRON_ORE                                           :{COMMA} tonne{P "" s} de fer
+STR_QUANTITY_STEEL                                              :{COMMA} tonne{P "" s} d'acier
+STR_QUANTITY_VALUABLES                                          :{COMMA} sac{P "" s} d'objets de valeur
+STR_QUANTITY_COPPER_ORE                                         :{COMMA} tonne{P "" s} de cuivre
+STR_QUANTITY_MAIZE                                              :{COMMA} tonne{P "" s} de maïs
+STR_QUANTITY_FRUIT                                              :{COMMA} tonne{P "" s} de fruits
+STR_QUANTITY_DIAMONDS                                           :{COMMA} sac{P "" s} de diamants
+STR_QUANTITY_FOOD                                               :{COMMA} tonne{P "" s} de nourriture
+STR_QUANTITY_PAPER                                              :{COMMA} tonne{P "" s} de papier
+STR_QUANTITY_GOLD                                               :{COMMA} sac{P "" s} d'or
+STR_QUANTITY_WATER                                              :{VOLUME} d'eau
+STR_QUANTITY_WHEAT                                              :{COMMA} tonne{P "" s} de blé
+STR_QUANTITY_RUBBER                                             :{VOLUME} de caoutchouc
+STR_QUANTITY_SUGAR                                              :{COMMA} tonne{P "" s} de sucre
+STR_QUANTITY_TOYS                                               :{COMMA} jouet{P "" s}
+STR_QUANTITY_SWEETS                                             :{COMMA} sac{P "" s} de jouets
+STR_QUANTITY_COLA                                               :{VOLUME} de cola
+STR_QUANTITY_CANDYFLOSS                                         :{COMMA} tonne{P "" s} de barbe à papa
+STR_QUANTITY_BUBBLES                                            :{COMMA} bulle{P "" s}
+STR_QUANTITY_TOFFEE                                             :{COMMA} tonne{P "" s} de caramel
+STR_QUANTITY_BATTERIES                                          :{COMMA} batterie{P "" s}
+STR_QUANTITY_PLASTIC                                            :{VOLUME} de plastique
+STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA} boisson{P "" s} gazeuse{P "" s}
+STR_ABBREV_NOTHING                                              :
+STR_ABBREV_PASSENGERS                                           :{TINYFONT}PS
+STR_ABBREV_COAL                                                 :{TINYFONT}CL
+STR_ABBREV_MAIL                                                 :{TINYFONT}ML
+STR_ABBREV_OIL                                                  :{TINYFONT}OL
+STR_ABBREV_LIVESTOCK                                            :{TINYFONT}LV
+STR_ABBREV_GOODS                                                :{TINYFONT}GD
+STR_ABBREV_GRAIN                                                :{TINYFONT}GR
+STR_ABBREV_WOOD                                                 :{TINYFONT}WD
+STR_ABBREV_IRON_ORE                                             :{TINYFONT}OR
+STR_ABBREV_STEEL                                                :{TINYFONT}ST
+STR_ABBREV_VALUABLES                                            :{TINYFONT}VL
+STR_ABBREV_COPPER_ORE                                           :{TINYFONT}CO
+STR_ABBREV_MAIZE                                                :{TINYFONT}MZ
+STR_ABBREV_FRUIT                                                :{TINYFONT}FT
+STR_ABBREV_DIAMONDS                                             :{TINYFONT}DM
+STR_ABBREV_FOOD                                                 :{TINYFONT}FD
+STR_ABBREV_PAPER                                                :{TINYFONT}PR
+STR_ABBREV_GOLD                                                 :{TINYFONT}GD
+STR_ABBREV_WATER                                                :{TINYFONT}WR
+STR_ABBREV_WHEAT                                                :{TINYFONT}WH
+STR_ABBREV_RUBBER                                               :{TINYFONT}RB
+STR_ABBREV_SUGAR                                                :{TINYFONT}SG
+STR_ABBREV_TOYS                                                 :{TINYFONT}TY
+STR_ABBREV_SWEETS                                               :{TINYFONT}SW
+STR_ABBREV_COLA                                                 :{TINYFONT}CL
+STR_ABBREV_CANDYFLOSS                                           :{TINYFONT}CF
+STR_ABBREV_BUBBLES                                              :{TINYFONT}BU
+STR_ABBREV_TOFFEE                                               :{TINYFONT}TF
+STR_ABBREV_BATTERIES                                            :{TINYFONT}BA
+STR_ABBREV_PLASTIC                                              :{TINYFONT}PL
+STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}FZ
 STR_00AE                                                        :{WHITE}{DATE_SHORT}
 STR_00AF                                                        :{WHITE}{DATE_LONG}
 STR_00B0_MAP                                                    :{WHITE}Carte - {STRING}
diff --git a/lang/galician.txt b/lang/galician.txt
index addf97b10..99d7ae587 100644
--- a/lang/galician.txt
+++ b/lang/galician.txt
@@ -82,70 +82,70 @@ STR_004A_TOFFEE                                                 :Toffee
 STR_004B_BATTERY                                                :Batería
 STR_004C_PLASTIC                                                :Plástico
 STR_004D_FIZZY_DRINK                                            :Bebida Gaseosa
-STR_004E                                                        :
-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                                      :{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                                           :{COMMA} ton. de trigo
-STR_0063_OF_RUBBER                                              :{VOLUME} de caucho
-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                                    :{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                                            :{COMMA} bebida gaseosa
-STR_008E                                                        :
-STR_008F_PS                                                     :{TINYFONT}PS
-STR_0090_CL                                                     :{TINYFONT}CL
-STR_0091_ML                                                     :{TINYFONT}ML
-STR_0092_OL                                                     :{TINYFONT}OL
-STR_0093_LV                                                     :{TINYFONT}LV
-STR_0094_GD                                                     :{TINYFONT}GD
-STR_0095_GR                                                     :{TINYFONT}GR
-STR_0096_WD                                                     :{TINYFONT}WD
-STR_0097_OR                                                     :{TINYFONT}OR
-STR_0098_ST                                                     :{TINYFONT}ST
-STR_0099_VL                                                     :{TINYFONT}VL
-STR_009A_CO                                                     :{TINYFONT}CO
-STR_009B_MZ                                                     :{TINYFONT}MZ
-STR_009C_FT                                                     :{TINYFONT}FT
-STR_009D_DM                                                     :{TINYFONT}DM
-STR_009E_FD                                                     :{TINYFONT}FD
-STR_009F_PR                                                     :{TINYFONT}PR
-STR_00A0_GD                                                     :{TINYFONT}GD
-STR_00A1_WR                                                     :{TINYFONT}WR
-STR_00A2_WH                                                     :{TINYFONT}WH
-STR_00A3_RB                                                     :{TINYFONT}RB
-STR_00A4_SG                                                     :{TINYFONT}SG
-STR_00A5_TY                                                     :{TINYFONT}TY
-STR_00A6_SW                                                     :{TINYFONT}SW
-STR_00A7_CL                                                     :{TINYFONT}CL
-STR_00A8_CF                                                     :{TINYFONT}CF
-STR_00A9_BU                                                     :{TINYFONT}BU
-STR_00AA_TF                                                     :{TINYFONT}TF
-STR_00AB_BA                                                     :{TINYFONT}BA
-STR_00AC_PL                                                     :{TINYFONT}PL
-STR_00AD_FZ                                                     :{TINYFONT}FZ
+STR_QUANTITY_NOTHING                                            :
+STR_QUANTITY_PASSENGERS                                         :{COMMA} pasaxeiro
+STR_QUANTITY_COAL                                               :{COMMA} ton. de carbón
+STR_QUANTITY_MAIL                                               :{COMMA} saco de correo
+STR_QUANTITY_OIL                                                :{VOLUME} de petróleo
+STR_QUANTITY_LIVESTOCK                                          :{COMMA} item de gando
+STR_QUANTITY_GOODS                                              :{COMMA} caixón de mercadorías
+STR_QUANTITY_GRAIN                                              :{COMMA} ton. de gran
+STR_QUANTITY_WOOD                                               :{COMMA} ton. de madeira
+STR_QUANTITY_IRON_ORE                                           :{COMMA} ton. de hematita
+STR_QUANTITY_STEEL                                              :{COMMA} ton. de aceiro
+STR_QUANTITY_VALUABLES                                          :{COMMA} saco de valores
+STR_QUANTITY_COPPER_ORE                                         :{COMMA} ton. de mineral de cobre
+STR_QUANTITY_MAIZE                                              :{COMMA} ton. de millo
+STR_QUANTITY_FRUIT                                              :{COMMA} ton. de froita
+STR_QUANTITY_DIAMONDS                                           :{COMMA} saco de diamantes
+STR_QUANTITY_FOOD                                               :{COMMA} ton. de comida
+STR_QUANTITY_PAPER                                              :{COMMA} ton. de papel
+STR_QUANTITY_GOLD                                               :{COMMA} saco de ouro
+STR_QUANTITY_WATER                                              :{VOLUME} de auga
+STR_QUANTITY_WHEAT                                              :{COMMA} ton. de trigo
+STR_QUANTITY_RUBBER                                             :{VOLUME} de caucho
+STR_QUANTITY_SUGAR                                              :{COMMA} ton. de azucre
+STR_QUANTITY_TOYS                                               :{COMMA} xoguete
+STR_QUANTITY_SWEETS                                             :{COMMA} saco de caramelo
+STR_QUANTITY_COLA                                               :{VOLUME} de cola
+STR_QUANTITY_CANDYFLOSS                                         :{COMMA} ton. de algodón de azucre
+STR_QUANTITY_BUBBLES                                            :{COMMA} burbulla
+STR_QUANTITY_TOFFEE                                             :{COMMA} ton. de toffee
+STR_QUANTITY_BATTERIES                                          :{COMMA} batería
+STR_QUANTITY_PLASTIC                                            :{VOLUME} de plástico
+STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA} bebida gaseosa
+STR_ABBREV_NOTHING                                              :
+STR_ABBREV_PASSENGERS                                           :{TINYFONT}PS
+STR_ABBREV_COAL                                                 :{TINYFONT}CL
+STR_ABBREV_MAIL                                                 :{TINYFONT}ML
+STR_ABBREV_OIL                                                  :{TINYFONT}OL
+STR_ABBREV_LIVESTOCK                                            :{TINYFONT}LV
+STR_ABBREV_GOODS                                                :{TINYFONT}GD
+STR_ABBREV_GRAIN                                                :{TINYFONT}GR
+STR_ABBREV_WOOD                                                 :{TINYFONT}WD
+STR_ABBREV_IRON_ORE                                             :{TINYFONT}OR
+STR_ABBREV_STEEL                                                :{TINYFONT}ST
+STR_ABBREV_VALUABLES                                            :{TINYFONT}VL
+STR_ABBREV_COPPER_ORE                                           :{TINYFONT}CO
+STR_ABBREV_MAIZE                                                :{TINYFONT}MZ
+STR_ABBREV_FRUIT                                                :{TINYFONT}FT
+STR_ABBREV_DIAMONDS                                             :{TINYFONT}DM
+STR_ABBREV_FOOD                                                 :{TINYFONT}FD
+STR_ABBREV_PAPER                                                :{TINYFONT}PR
+STR_ABBREV_GOLD                                                 :{TINYFONT}GD
+STR_ABBREV_WATER                                                :{TINYFONT}WR
+STR_ABBREV_WHEAT                                                :{TINYFONT}WH
+STR_ABBREV_RUBBER                                               :{TINYFONT}RB
+STR_ABBREV_SUGAR                                                :{TINYFONT}SG
+STR_ABBREV_TOYS                                                 :{TINYFONT}TY
+STR_ABBREV_SWEETS                                               :{TINYFONT}SW
+STR_ABBREV_COLA                                                 :{TINYFONT}CL
+STR_ABBREV_CANDYFLOSS                                           :{TINYFONT}CF
+STR_ABBREV_BUBBLES                                              :{TINYFONT}BU
+STR_ABBREV_TOFFEE                                               :{TINYFONT}TF
+STR_ABBREV_BATTERIES                                            :{TINYFONT}BA
+STR_ABBREV_PLASTIC                                              :{TINYFONT}PL
+STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}FZ
 STR_00AE                                                        :{WHITE}{DATE_SHORT}
 STR_00AF                                                        :{WHITE}{DATE_LONG}
 STR_00B0_MAP                                                    :{WHITE}Mapa - {STRING}
diff --git a/lang/german.txt b/lang/german.txt
index f2fdc9493..3134efdbd 100644
--- a/lang/german.txt
+++ b/lang/german.txt
@@ -83,70 +83,70 @@ STR_004A_TOFFEE                                                 :Karamell
 STR_004B_BATTERY                                                :Batterie
 STR_004C_PLASTIC                                                :Plastik
 STR_004D_FIZZY_DRINK                                            :Limonade
-STR_004E                                                        :
-STR_004F_PASSENGER                                              :{COMMA} Passagier{P "" e}
-STR_0050_TON_OF_COAL                                            :{COMMA} Tonne{P "" n} Kohle
-STR_0051_BAG_OF_MAIL                                            :{COMMA} Posts{P ack äcke}
-STR_0052_OF_OIL                                                 :{VOLUME} Öl
-STR_0053_ITEM_OF_LIVESTOCK                                      :{COMMA} Stück Vieh
-STR_0054_CRATE_OF_GOODS                                         :{COMMA} Warenkiste{P "" n}
-STR_0055_TON_OF_GRAIN                                           :{COMMA} Tonne{P "" n} Getreide
-STR_0056_TON_OF_WOOD                                            :{COMMA} Tonne{P "" n} Holz
-STR_0057_TON_OF_IRON_ORE                                        :{COMMA} Tonne{P "" n} Eisenerz
-STR_0058_TON_OF_STEEL                                           :{COMMA} Tonne{P "" n} Stahl
-STR_0059_BAG_OF_VALUABLES                                       :{COMMA} {P Sack Säcke} mit Wertsachen
-STR_005A_TON_OF_COPPER_ORE                                      :{COMMA} Tonne{P "" n} Kupfererz
-STR_005B_TON_OF_MAIZE                                           :{COMMA} Tonne{P "" n} Mais
-STR_005C_TON_OF_FRUIT                                           :{COMMA} Tonne{P "" n} Früchte
-STR_005D_BAG_OF_DIAMONDS                                        :{COMMA} {P Sack Säcke} mit Diamanten
-STR_005E_TON_OF_FOOD                                            :{COMMA} Tonne{P "" n} Nahrungsmittel
-STR_005F_TON_OF_PAPER                                           :{COMMA} Tonne{P "" n} Papier
-STR_0060_BAG_OF_GOLD                                            :{COMMA} {P Sack Säcke} mit Gold
-STR_0061_OF_WATER                                               :{VOLUME} Wasser
-STR_0062_TON_OF_WHEAT                                           :{COMMA} Tonne{P "" n} Weizen
-STR_0063_OF_RUBBER                                              :{VOLUME} Kautschuk
-STR_0064_TON_OF_SUGAR                                           :{COMMA} Tonne{P "" n} Zucker
-STR_0065_TOY                                                    :{COMMA} Spielzeug{P "" e}
-STR_0066_BAG_OF_CANDY                                           :{COMMA} {P Sack Säcke} mit Bonbons
-STR_0067_OF_COLA                                                :{VOLUME} Cola
-STR_0068_TON_OF_COTTON_CANDY                                    :{COMMA} Tonne{P "" n} Zuckerwatte
-STR_0069_BUBBLE                                                 :{COMMA} Luftblase{P "" n}
-STR_006A_TON_OF_TOFFEE                                          :{COMMA} Tonne{P "" n} Karamell
-STR_006B_BATTERY                                                :{COMMA} Batterie{P "" n}
-STR_006C_OF_PLASTIC                                             :{VOLUME} Plastik
-STR_006D_FIZZY_DRINK                                            :{COMMA} Limonade{P "" n}
-STR_008E                                                        :
-STR_008F_PS                                                     :{TINYFONT}PS
-STR_0090_CL                                                     :{TINYFONT}KL
-STR_0091_ML                                                     :{TINYFONT}PO
-STR_0092_OL                                                     :{TINYFONT}ÖL
-STR_0093_LV                                                     :{TINYFONT}VI
-STR_0094_GD                                                     :{TINYFONT}WK
-STR_0095_GR                                                     :{TINYFONT}GT
-STR_0096_WD                                                     :{TINYFONT}HO
-STR_0097_OR                                                     :{TINYFONT}EE
-STR_0098_ST                                                     :{TINYFONT}ST
-STR_0099_VL                                                     :{TINYFONT}WE
-STR_009A_CO                                                     :{TINYFONT}KU
-STR_009B_MZ                                                     :{TINYFONT}MA
-STR_009C_FT                                                     :{TINYFONT}FR
-STR_009D_DM                                                     :{TINYFONT}DI
-STR_009E_FD                                                     :{TINYFONT}NM
-STR_009F_PR                                                     :{TINYFONT}PA
-STR_00A0_GD                                                     :{TINYFONT}GD
-STR_00A1_WR                                                     :{TINYFONT}WA
-STR_00A2_WH                                                     :{TINYFONT}WZ
-STR_00A3_RB                                                     :{TINYFONT}KA
-STR_00A4_SG                                                     :{TINYFONT}ZU
-STR_00A5_TY                                                     :{TINYFONT}SP
-STR_00A6_SW                                                     :{TINYFONT}BO
-STR_00A7_CL                                                     :{TINYFONT}CO
-STR_00A8_CF                                                     :{TINYFONT}ZW
-STR_00A9_BU                                                     :{TINYFONT}LB
-STR_00AA_TF                                                     :{TINYFONT}KM
-STR_00AB_BA                                                     :{TINYFONT}BA
-STR_00AC_PL                                                     :{TINYFONT}PL
-STR_00AD_FZ                                                     :{TINYFONT}LI
+STR_QUANTITY_NOTHING                                            :
+STR_QUANTITY_PASSENGERS                                         :{COMMA} Passagier{P "" e}
+STR_QUANTITY_COAL                                               :{COMMA} Tonne{P "" n} Kohle
+STR_QUANTITY_MAIL                                               :{COMMA} Posts{P ack äcke}
+STR_QUANTITY_OIL                                                :{VOLUME} Öl
+STR_QUANTITY_LIVESTOCK                                          :{COMMA} Stück Vieh
+STR_QUANTITY_GOODS                                              :{COMMA} Warenkiste{P "" n}
+STR_QUANTITY_GRAIN                                              :{COMMA} Tonne{P "" n} Getreide
+STR_QUANTITY_WOOD                                               :{COMMA} Tonne{P "" n} Holz
+STR_QUANTITY_IRON_ORE                                           :{COMMA} Tonne{P "" n} Eisenerz
+STR_QUANTITY_STEEL                                              :{COMMA} Tonne{P "" n} Stahl
+STR_QUANTITY_VALUABLES                                          :{COMMA} {P Sack Säcke} mit Wertsachen
+STR_QUANTITY_COPPER_ORE                                         :{COMMA} Tonne{P "" n} Kupfererz
+STR_QUANTITY_MAIZE                                              :{COMMA} Tonne{P "" n} Mais
+STR_QUANTITY_FRUIT                                              :{COMMA} Tonne{P "" n} Früchte
+STR_QUANTITY_DIAMONDS                                           :{COMMA} {P Sack Säcke} mit Diamanten
+STR_QUANTITY_FOOD                                               :{COMMA} Tonne{P "" n} Nahrungsmittel
+STR_QUANTITY_PAPER                                              :{COMMA} Tonne{P "" n} Papier
+STR_QUANTITY_GOLD                                               :{COMMA} {P Sack Säcke} mit Gold
+STR_QUANTITY_WATER                                              :{VOLUME} Wasser
+STR_QUANTITY_WHEAT                                              :{COMMA} Tonne{P "" n} Weizen
+STR_QUANTITY_RUBBER                                             :{VOLUME} Kautschuk
+STR_QUANTITY_SUGAR                                              :{COMMA} Tonne{P "" n} Zucker
+STR_QUANTITY_TOYS                                               :{COMMA} Spielzeug{P "" e}
+STR_QUANTITY_SWEETS                                             :{COMMA} {P Sack Säcke} mit Bonbons
+STR_QUANTITY_COLA                                               :{VOLUME} Cola
+STR_QUANTITY_CANDYFLOSS                                         :{COMMA} Tonne{P "" n} Zuckerwatte
+STR_QUANTITY_BUBBLES                                            :{COMMA} Luftblase{P "" n}
+STR_QUANTITY_TOFFEE                                             :{COMMA} Tonne{P "" n} Karamell
+STR_QUANTITY_BATTERIES                                          :{COMMA} Batterie{P "" n}
+STR_QUANTITY_PLASTIC                                            :{VOLUME} Plastik
+STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA} Limonade{P "" n}
+STR_ABBREV_NOTHING                                              :
+STR_ABBREV_PASSENGERS                                           :{TINYFONT}PS
+STR_ABBREV_COAL                                                 :{TINYFONT}KL
+STR_ABBREV_MAIL                                                 :{TINYFONT}PO
+STR_ABBREV_OIL                                                  :{TINYFONT}ÖL
+STR_ABBREV_LIVESTOCK                                            :{TINYFONT}VI
+STR_ABBREV_GOODS                                                :{TINYFONT}WK
+STR_ABBREV_GRAIN                                                :{TINYFONT}GT
+STR_ABBREV_WOOD                                                 :{TINYFONT}HO
+STR_ABBREV_IRON_ORE                                             :{TINYFONT}EE
+STR_ABBREV_STEEL                                                :{TINYFONT}ST
+STR_ABBREV_VALUABLES                                            :{TINYFONT}WE
+STR_ABBREV_COPPER_ORE                                           :{TINYFONT}KU
+STR_ABBREV_MAIZE                                                :{TINYFONT}MA
+STR_ABBREV_FRUIT                                                :{TINYFONT}FR
+STR_ABBREV_DIAMONDS                                             :{TINYFONT}DI
+STR_ABBREV_FOOD                                                 :{TINYFONT}NM
+STR_ABBREV_PAPER                                                :{TINYFONT}PA
+STR_ABBREV_GOLD                                                 :{TINYFONT}GD
+STR_ABBREV_WATER                                                :{TINYFONT}WA
+STR_ABBREV_WHEAT                                                :{TINYFONT}WZ
+STR_ABBREV_RUBBER                                               :{TINYFONT}KA
+STR_ABBREV_SUGAR                                                :{TINYFONT}ZU
+STR_ABBREV_TOYS                                                 :{TINYFONT}SP
+STR_ABBREV_SWEETS                                               :{TINYFONT}BO
+STR_ABBREV_COLA                                                 :{TINYFONT}CO
+STR_ABBREV_CANDYFLOSS                                           :{TINYFONT}ZW
+STR_ABBREV_BUBBLES                                              :{TINYFONT}LB
+STR_ABBREV_TOFFEE                                               :{TINYFONT}KM
+STR_ABBREV_BATTERIES                                            :{TINYFONT}BA
+STR_ABBREV_PLASTIC                                              :{TINYFONT}PL
+STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}LI
 STR_00AE                                                        :{WHITE}{DATE_SHORT}
 STR_00AF                                                        :{WHITE}{DATE_LONG}
 STR_00B0_MAP                                                    :{WHITE}Karte - {STRING}
diff --git a/lang/hungarian.txt b/lang/hungarian.txt
index bbd3c3f29..40e4c8b59 100644
--- a/lang/hungarian.txt
+++ b/lang/hungarian.txt
@@ -114,70 +114,70 @@ STR_004A_TOFFEE                                                 :tejkaramella
 STR_004B_BATTERY                                                :elem
 STR_004C_PLASTIC                                                :mûanyag
 STR_004D_FIZZY_DRINK                                            :szénsavas ital
-STR_004E                                                        :
-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                                      :{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                                           :{COMMA} tonna búza
-STR_0063_OF_RUBBER                                              :{VOLUME} gumi
-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                                    :{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                                            :{COMMA} szénsavas ital
-STR_008E                                                        :
-STR_008F_PS                                                     :{TINYFONT}UT
-STR_0090_CL                                                     :{TINYFONT}SZ
-STR_0091_ML                                                     :{TINYFONT}LV
-STR_0092_OL                                                     :{TINYFONT}OL
-STR_0093_LV                                                     :{TINYFONT}ÁL
-STR_0094_GD                                                     :{TINYFONT}ÁR
-STR_0095_GR                                                     :{TINYFONT}BZ
-STR_0096_WD                                                     :{TINYFONT}FA
-STR_0097_OR                                                     :{TINYFONT}VÉ
-STR_0098_ST                                                     :{TINYFONT}AC
-STR_0099_VL                                                     :{TINYFONT}ÉP
-STR_009A_CO                                                     :{TINYFONT}RÉ
-STR_009B_MZ                                                     :{TINYFONT}KU
-STR_009C_FT                                                     :{TINYFONT}GÜ
-STR_009D_DM                                                     :{TINYFONT}GM
-STR_009E_FD                                                     :{TINYFONT}ÉT
-STR_009F_PR                                                     :{TINYFONT}PR
-STR_00A0_GD                                                     :{TINYFONT}AR
-STR_00A1_WR                                                     :{TINYFONT}VZ
-STR_00A2_WH                                                     :{TINYFONT}BZ
-STR_00A3_RB                                                     :{TINYFONT}GM
-STR_00A4_SG                                                     :{TINYFONT}CU
-STR_00A5_TY                                                     :{TINYFONT}JT
-STR_00A6_SW                                                     :{TINYFONT}CK
-STR_00A7_CL                                                     :{TINYFONT}KL
-STR_00A8_CF                                                     :{TINYFONT}VC
-STR_00A9_BU                                                     :{TINYFONT}BB
-STR_00AA_TF                                                     :{TINYFONT}TK
-STR_00AB_BA                                                     :{TINYFONT}EL
-STR_00AC_PL                                                     :{TINYFONT}MA
-STR_00AD_FZ                                                     :{TINYFONT}SS
+STR_QUANTITY_NOTHING                                            :
+STR_QUANTITY_PASSENGERS                                         :{COMMA} utas
+STR_QUANTITY_COAL                                               :{COMMA} tonna szén
+STR_QUANTITY_MAIL                                               :{COMMA} csomag levél
+STR_QUANTITY_OIL                                                :{VOLUME} olaj
+STR_QUANTITY_LIVESTOCK                                          :{COMMA} állat
+STR_QUANTITY_GOODS                                              :{COMMA} láda áru
+STR_QUANTITY_GRAIN                                              :{COMMA} tonna búza
+STR_QUANTITY_WOOD                                               :{COMMA} tonna fa
+STR_QUANTITY_IRON_ORE                                           :{COMMA} tonna vasérc
+STR_QUANTITY_STEEL                                              :{COMMA} tonna acél
+STR_QUANTITY_VALUABLES                                          :{COMMA} csomag értéktárgy
+STR_QUANTITY_COPPER_ORE                                         :{COMMA} tonna rézérc
+STR_QUANTITY_MAIZE                                              :{COMMA} tonna kukorica
+STR_QUANTITY_FRUIT                                              :{COMMA} tonna gyümölcs
+STR_QUANTITY_DIAMONDS                                           :{COMMA} zsák gyémánt
+STR_QUANTITY_FOOD                                               :{COMMA} tonna étel
+STR_QUANTITY_PAPER                                              :{COMMA} tonna papír
+STR_QUANTITY_GOLD                                               :{COMMA} zsák arany
+STR_QUANTITY_WATER                                              :{VOLUME} víz
+STR_QUANTITY_WHEAT                                              :{COMMA} tonna búza
+STR_QUANTITY_RUBBER                                             :{VOLUME} gumi
+STR_QUANTITY_SUGAR                                              :{COMMA} tonna cukor
+STR_QUANTITY_TOYS                                               :{COMMA} játék
+STR_QUANTITY_SWEETS                                             :{COMMA} zsák cukorka
+STR_QUANTITY_COLA                                               :{VOLUME} kóla
+STR_QUANTITY_CANDYFLOSS                                         :{COMMA} tonna vattacukor
+STR_QUANTITY_BUBBLES                                            :{COMMA} buborék
+STR_QUANTITY_TOFFEE                                             :{COMMA} tonna tejkaramella
+STR_QUANTITY_BATTERIES                                          :{COMMA} elem
+STR_QUANTITY_PLASTIC                                            :{VOLUME} mûanyag
+STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA} szénsavas ital
+STR_ABBREV_NOTHING                                              :
+STR_ABBREV_PASSENGERS                                           :{TINYFONT}UT
+STR_ABBREV_COAL                                                 :{TINYFONT}SZ
+STR_ABBREV_MAIL                                                 :{TINYFONT}LV
+STR_ABBREV_OIL                                                  :{TINYFONT}OL
+STR_ABBREV_LIVESTOCK                                            :{TINYFONT}ÁL
+STR_ABBREV_GOODS                                                :{TINYFONT}ÁR
+STR_ABBREV_GRAIN                                                :{TINYFONT}BZ
+STR_ABBREV_WOOD                                                 :{TINYFONT}FA
+STR_ABBREV_IRON_ORE                                             :{TINYFONT}VÉ
+STR_ABBREV_STEEL                                                :{TINYFONT}AC
+STR_ABBREV_VALUABLES                                            :{TINYFONT}ÉP
+STR_ABBREV_COPPER_ORE                                           :{TINYFONT}RÉ
+STR_ABBREV_MAIZE                                                :{TINYFONT}KU
+STR_ABBREV_FRUIT                                                :{TINYFONT}GÜ
+STR_ABBREV_DIAMONDS                                             :{TINYFONT}GM
+STR_ABBREV_FOOD                                                 :{TINYFONT}ÉT
+STR_ABBREV_PAPER                                                :{TINYFONT}PR
+STR_ABBREV_GOLD                                                 :{TINYFONT}AR
+STR_ABBREV_WATER                                                :{TINYFONT}VZ
+STR_ABBREV_WHEAT                                                :{TINYFONT}BZ
+STR_ABBREV_RUBBER                                               :{TINYFONT}GM
+STR_ABBREV_SUGAR                                                :{TINYFONT}CU
+STR_ABBREV_TOYS                                                 :{TINYFONT}JT
+STR_ABBREV_SWEETS                                               :{TINYFONT}CK
+STR_ABBREV_COLA                                                 :{TINYFONT}KL
+STR_ABBREV_CANDYFLOSS                                           :{TINYFONT}VC
+STR_ABBREV_BUBBLES                                              :{TINYFONT}BB
+STR_ABBREV_TOFFEE                                               :{TINYFONT}TK
+STR_ABBREV_BATTERIES                                            :{TINYFONT}EL
+STR_ABBREV_PLASTIC                                              :{TINYFONT}MA
+STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}SS
 STR_00AE                                                        :{WHITE}{DATE_SHORT}
 STR_00AF                                                        :{WHITE}{DATE_LONG}
 STR_00B0_MAP                                                    :{WHITE}Térkép - {STRING}
diff --git a/lang/icelandic.txt b/lang/icelandic.txt
index c2931138e..f4ce1165e 100644
--- a/lang/icelandic.txt
+++ b/lang/icelandic.txt
@@ -82,70 +82,70 @@ STR_004A_TOFFEE                                                 :Toffý
 STR_004B_BATTERY                                                :Rafhlöðu
 STR_004C_PLASTIC                                                :Plast
 STR_004D_FIZZY_DRINK                                            :Gosdrykkja
-STR_004E                                                        :
-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                                      :{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                                           :{COMMA} tonn af hveiti
-STR_0063_OF_RUBBER                                              :{VOLUME} af gúmmíi
-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                                    :{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                                            :{COMMA} gosdrykkur
-STR_008E                                                        :
-STR_008F_PS                                                     :{TINYFONT}PS
-STR_0090_CL                                                     :{TINYFONT}CL
-STR_0091_ML                                                     :{TINYFONT}ML
-STR_0092_OL                                                     :{TINYFONT}OL
-STR_0093_LV                                                     :{TINYFONT}LV
-STR_0094_GD                                                     :{TINYFONT}GD
-STR_0095_GR                                                     :{TINYFONT}GR
-STR_0096_WD                                                     :{TINYFONT}WD
-STR_0097_OR                                                     :{TINYFONT}OR
-STR_0098_ST                                                     :{TINYFONT}ST
-STR_0099_VL                                                     :{TINYFONT}VL
-STR_009A_CO                                                     :{TINYFONT}CO
-STR_009B_MZ                                                     :{TINYFONT}MZ
-STR_009C_FT                                                     :{TINYFONT}FT
-STR_009D_DM                                                     :{TINYFONT}DM
-STR_009E_FD                                                     :{TINYFONT}FD
-STR_009F_PR                                                     :{TINYFONT}PR
-STR_00A0_GD                                                     :{TINYFONT}GD
-STR_00A1_WR                                                     :{TINYFONT}WR
-STR_00A2_WH                                                     :{TINYFONT}WH
-STR_00A3_RB                                                     :{TINYFONT}RB
-STR_00A4_SG                                                     :{TINYFONT}SG
-STR_00A5_TY                                                     :{TINYFONT}TY
-STR_00A6_SW                                                     :{TINYFONT}SW
-STR_00A7_CL                                                     :{TINYFONT}CL
-STR_00A8_CF                                                     :{TINYFONT}CF
-STR_00A9_BU                                                     :{TINYFONT}BU
-STR_00AA_TF                                                     :{TINYFONT}TF
-STR_00AB_BA                                                     :{TINYFONT}BA
-STR_00AC_PL                                                     :{TINYFONT}PL
-STR_00AD_FZ                                                     :{TINYFONT}FZ
+STR_QUANTITY_NOTHING                                            :
+STR_QUANTITY_PASSENGERS                                         :{COMMA} farþegi
+STR_QUANTITY_COAL                                               :{COMMA} tonn af kolum
+STR_QUANTITY_MAIL                                               :{COMMA} pokar af pósti
+STR_QUANTITY_OIL                                                :{VOLUME} af olíu
+STR_QUANTITY_LIVESTOCK                                          :{COMMA} nautgripur
+STR_QUANTITY_GOODS                                              :{COMMA} kassi af vörum
+STR_QUANTITY_GRAIN                                              :{COMMA} tonn af korni
+STR_QUANTITY_WOOD                                               :{COMMA} tonn af timbri
+STR_QUANTITY_IRON_ORE                                           :{COMMA} tonn af járngrýti
+STR_QUANTITY_STEEL                                              :{COMMA} tonn af stáli
+STR_QUANTITY_VALUABLES                                          :{COMMA} poki af verðmætum
+STR_QUANTITY_COPPER_ORE                                         :{COMMA} tonn af kopar
+STR_QUANTITY_MAIZE                                              :{COMMA} tonn af maís
+STR_QUANTITY_FRUIT                                              :{COMMA} tonn af ávöxtum
+STR_QUANTITY_DIAMONDS                                           :{COMMA} poki af demöntum
+STR_QUANTITY_FOOD                                               :{COMMA} tonn af matvælum
+STR_QUANTITY_PAPER                                              :{COMMA} tonn af pappír
+STR_QUANTITY_GOLD                                               :{COMMA} poki af gulli
+STR_QUANTITY_WATER                                              :{VOLUME} af vatni
+STR_QUANTITY_WHEAT                                              :{COMMA} tonn af hveiti
+STR_QUANTITY_RUBBER                                             :{VOLUME} af gúmmíi
+STR_QUANTITY_SUGAR                                              :{COMMA} tonn af sykri
+STR_QUANTITY_TOYS                                               :{COMMA} leikfang
+STR_QUANTITY_SWEETS                                             :{COMMA} poki af sælgæti
+STR_QUANTITY_COLA                                               :{VOLUME} af kóladrykk
+STR_QUANTITY_CANDYFLOSS                                         :{COMMA} tonn af sykurfrauði
+STR_QUANTITY_BUBBLES                                            :{COMMA} kúla
+STR_QUANTITY_TOFFEE                                             :{COMMA} tonn af toffý
+STR_QUANTITY_BATTERIES                                          :{COMMA} rafhlaða
+STR_QUANTITY_PLASTIC                                            :{VOLUME} af plasti
+STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA} gosdrykkur
+STR_ABBREV_NOTHING                                              :
+STR_ABBREV_PASSENGERS                                           :{TINYFONT}PS
+STR_ABBREV_COAL                                                 :{TINYFONT}CL
+STR_ABBREV_MAIL                                                 :{TINYFONT}ML
+STR_ABBREV_OIL                                                  :{TINYFONT}OL
+STR_ABBREV_LIVESTOCK                                            :{TINYFONT}LV
+STR_ABBREV_GOODS                                                :{TINYFONT}GD
+STR_ABBREV_GRAIN                                                :{TINYFONT}GR
+STR_ABBREV_WOOD                                                 :{TINYFONT}WD
+STR_ABBREV_IRON_ORE                                             :{TINYFONT}OR
+STR_ABBREV_STEEL                                                :{TINYFONT}ST
+STR_ABBREV_VALUABLES                                            :{TINYFONT}VL
+STR_ABBREV_COPPER_ORE                                           :{TINYFONT}CO
+STR_ABBREV_MAIZE                                                :{TINYFONT}MZ
+STR_ABBREV_FRUIT                                                :{TINYFONT}FT
+STR_ABBREV_DIAMONDS                                             :{TINYFONT}DM
+STR_ABBREV_FOOD                                                 :{TINYFONT}FD
+STR_ABBREV_PAPER                                                :{TINYFONT}PR
+STR_ABBREV_GOLD                                                 :{TINYFONT}GD
+STR_ABBREV_WATER                                                :{TINYFONT}WR
+STR_ABBREV_WHEAT                                                :{TINYFONT}WH
+STR_ABBREV_RUBBER                                               :{TINYFONT}RB
+STR_ABBREV_SUGAR                                                :{TINYFONT}SG
+STR_ABBREV_TOYS                                                 :{TINYFONT}TY
+STR_ABBREV_SWEETS                                               :{TINYFONT}SW
+STR_ABBREV_COLA                                                 :{TINYFONT}CL
+STR_ABBREV_CANDYFLOSS                                           :{TINYFONT}CF
+STR_ABBREV_BUBBLES                                              :{TINYFONT}BU
+STR_ABBREV_TOFFEE                                               :{TINYFONT}TF
+STR_ABBREV_BATTERIES                                            :{TINYFONT}BA
+STR_ABBREV_PLASTIC                                              :{TINYFONT}PL
+STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}FZ
 STR_00AE                                                        :{WHITE}{DATE_SHORT}
 STR_00AF                                                        :{WHITE}{DATE_LONG}
 STR_00B0_MAP                                                    :{WHITE}Kort - {STRING}
diff --git a/lang/italian.txt b/lang/italian.txt
index 22850e855..8fb9e60c2 100644
--- a/lang/italian.txt
+++ b/lang/italian.txt
@@ -82,70 +82,70 @@ STR_004A_TOFFEE                                                 :Toffee
 STR_004B_BATTERY                                                :Batterie
 STR_004C_PLASTIC                                                :Plastica
 STR_004D_FIZZY_DRINK                                            :Bevande Frizzanti
-STR_004E                                                        :
-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                                      :{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                                           :{COMMA} ton. di frumento
-STR_0063_OF_RUBBER                                              :{VOLUME} di gomma
-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                                    :{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                                            :{COMMA} bibite frizzanti
-STR_008E                                                        :
-STR_008F_PS                                                     :{TINYFONT}PS
-STR_0090_CL                                                     :{TINYFONT}CL
-STR_0091_ML                                                     :{TINYFONT}ML
-STR_0092_OL                                                     :{TINYFONT}OL
-STR_0093_LV                                                     :{TINYFONT}LV
-STR_0094_GD                                                     :{TINYFONT}GD
-STR_0095_GR                                                     :{TINYFONT}GR
-STR_0096_WD                                                     :{TINYFONT}WD
-STR_0097_OR                                                     :{TINYFONT}OR
-STR_0098_ST                                                     :{TINYFONT}ST
-STR_0099_VL                                                     :{TINYFONT}VL
-STR_009A_CO                                                     :{TINYFONT}CO
-STR_009B_MZ                                                     :{TINYFONT}MZ
-STR_009C_FT                                                     :{TINYFONT}FT
-STR_009D_DM                                                     :{TINYFONT}DM
-STR_009E_FD                                                     :{TINYFONT}FD
-STR_009F_PR                                                     :{TINYFONT}PR
-STR_00A0_GD                                                     :{TINYFONT}GD
-STR_00A1_WR                                                     :{TINYFONT}WR
-STR_00A2_WH                                                     :{TINYFONT}WH
-STR_00A3_RB                                                     :{TINYFONT}RB
-STR_00A4_SG                                                     :{TINYFONT}SG
-STR_00A5_TY                                                     :{TINYFONT}TY
-STR_00A6_SW                                                     :{TINYFONT}SW
-STR_00A7_CL                                                     :{TINYFONT}CL
-STR_00A8_CF                                                     :{TINYFONT}CF
-STR_00A9_BU                                                     :{TINYFONT}BU
-STR_00AA_TF                                                     :{TINYFONT}TF
-STR_00AB_BA                                                     :{TINYFONT}BA
-STR_00AC_PL                                                     :{TINYFONT}PL
-STR_00AD_FZ                                                     :{TINYFONT}FZ
+STR_QUANTITY_NOTHING                                            :
+STR_QUANTITY_PASSENGERS                                         :{COMMA} passeggero
+STR_QUANTITY_COAL                                               :{COMMA} ton. di carbone
+STR_QUANTITY_MAIL                                               :{COMMA} sacco postale
+STR_QUANTITY_OIL                                                :{VOLUME} di petrolio
+STR_QUANTITY_LIVESTOCK                                          :{COMMA} capo di bestiame
+STR_QUANTITY_GOODS                                              :{COMMA} cassa di beni
+STR_QUANTITY_GRAIN                                              :{COMMA} ton. di grano
+STR_QUANTITY_WOOD                                               :{COMMA} ton. di legna
+STR_QUANTITY_IRON_ORE                                           :{COMMA} ton. di ferro grezzo
+STR_QUANTITY_STEEL                                              :{COMMA} ton. di acciaio
+STR_QUANTITY_VALUABLES                                          :{COMMA} borsa di valori
+STR_QUANTITY_COPPER_ORE                                         :{COMMA} ton. di rame grezzo
+STR_QUANTITY_MAIZE                                              :{COMMA} ton. di mais
+STR_QUANTITY_FRUIT                                              :{COMMA} ton. di frutta
+STR_QUANTITY_DIAMONDS                                           :{COMMA} borsa di diamanti
+STR_QUANTITY_FOOD                                               :{COMMA} ton. di cibo
+STR_QUANTITY_PAPER                                              :{COMMA} ton. di carta
+STR_QUANTITY_GOLD                                               :{COMMA} borsa d'oro
+STR_QUANTITY_WATER                                              :{VOLUME} di acqua
+STR_QUANTITY_WHEAT                                              :{COMMA} ton. di frumento
+STR_QUANTITY_RUBBER                                             :{VOLUME} di gomma
+STR_QUANTITY_SUGAR                                              :{COMMA} ton. di zucchero
+STR_QUANTITY_TOYS                                               :{COMMA} giocattolo
+STR_QUANTITY_SWEETS                                             :{COMMA} busta di caramelle
+STR_QUANTITY_COLA                                               :{VOLUME} di cola
+STR_QUANTITY_CANDYFLOSS                                         :{COMMA} ton. di cotone candito
+STR_QUANTITY_BUBBLES                                            :{COMMA} bolla
+STR_QUANTITY_TOFFEE                                             :{COMMA} ton. di toffee
+STR_QUANTITY_BATTERIES                                          :{COMMA} batteria
+STR_QUANTITY_PLASTIC                                            :{VOLUME} di plastica
+STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA} bibite frizzanti
+STR_ABBREV_NOTHING                                              :
+STR_ABBREV_PASSENGERS                                           :{TINYFONT}PS
+STR_ABBREV_COAL                                                 :{TINYFONT}CL
+STR_ABBREV_MAIL                                                 :{TINYFONT}ML
+STR_ABBREV_OIL                                                  :{TINYFONT}OL
+STR_ABBREV_LIVESTOCK                                            :{TINYFONT}LV
+STR_ABBREV_GOODS                                                :{TINYFONT}GD
+STR_ABBREV_GRAIN                                                :{TINYFONT}GR
+STR_ABBREV_WOOD                                                 :{TINYFONT}WD
+STR_ABBREV_IRON_ORE                                             :{TINYFONT}OR
+STR_ABBREV_STEEL                                                :{TINYFONT}ST
+STR_ABBREV_VALUABLES                                            :{TINYFONT}VL
+STR_ABBREV_COPPER_ORE                                           :{TINYFONT}CO
+STR_ABBREV_MAIZE                                                :{TINYFONT}MZ
+STR_ABBREV_FRUIT                                                :{TINYFONT}FT
+STR_ABBREV_DIAMONDS                                             :{TINYFONT}DM
+STR_ABBREV_FOOD                                                 :{TINYFONT}FD
+STR_ABBREV_PAPER                                                :{TINYFONT}PR
+STR_ABBREV_GOLD                                                 :{TINYFONT}GD
+STR_ABBREV_WATER                                                :{TINYFONT}WR
+STR_ABBREV_WHEAT                                                :{TINYFONT}WH
+STR_ABBREV_RUBBER                                               :{TINYFONT}RB
+STR_ABBREV_SUGAR                                                :{TINYFONT}SG
+STR_ABBREV_TOYS                                                 :{TINYFONT}TY
+STR_ABBREV_SWEETS                                               :{TINYFONT}SW
+STR_ABBREV_COLA                                                 :{TINYFONT}CL
+STR_ABBREV_CANDYFLOSS                                           :{TINYFONT}CF
+STR_ABBREV_BUBBLES                                              :{TINYFONT}BU
+STR_ABBREV_TOFFEE                                               :{TINYFONT}TF
+STR_ABBREV_BATTERIES                                            :{TINYFONT}BA
+STR_ABBREV_PLASTIC                                              :{TINYFONT}PL
+STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}FZ
 STR_00AE                                                        :{WHITE}{DATE_SHORT}
 STR_00AF                                                        :{WHITE}{DATE_LONG}
 STR_00B0_MAP                                                    :{WHITE}Mappa - {STRING}
diff --git a/lang/norwegian.txt b/lang/norwegian.txt
index 6a87cba12..0be0f2960 100644
--- a/lang/norwegian.txt
+++ b/lang/norwegian.txt
@@ -82,70 +82,70 @@ STR_004A_TOFFEE                                                 :Karamell
 STR_004B_BATTERY                                                :Batteri
 STR_004C_PLASTIC                                                :Plastikk
 STR_004D_FIZZY_DRINK                                            :Brus
-STR_004E                                                        :
-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                                      :{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                                           :{COMMA} tonn hvete
-STR_0063_OF_RUBBER                                              :{VOLUME} gummi
-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                                    :{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                                            :{COMMA} brus
-STR_008E                                                        :
-STR_008F_PS                                                     :{TINYFONT}PS
-STR_0090_CL                                                     :{TINYFONT}KL
-STR_0091_ML                                                     :{TINYFONT}PT
-STR_0092_OL                                                     :{TINYFONT}OL
-STR_0093_LV                                                     :{TINYFONT}BS
-STR_0094_GD                                                     :{TINYFONT}GD
-STR_0095_GR                                                     :{TINYFONT}KN
-STR_0096_WD                                                     :{TINYFONT}VD
-STR_0097_OR                                                     :{TINYFONT}JM
-STR_0098_ST                                                     :{TINYFONT}ST
-STR_0099_VL                                                     :{TINYFONT}VS
-STR_009A_CO                                                     :{TINYFONT}KM
-STR_009B_MZ                                                     :{TINYFONT}MS
-STR_009C_FT                                                     :{TINYFONT}FT
-STR_009D_DM                                                     :{TINYFONT}DM
-STR_009E_FD                                                     :{TINYFONT}MT
-STR_009F_PR                                                     :{TINYFONT}PR
-STR_00A0_GD                                                     :{TINYFONT}GL
-STR_00A1_WR                                                     :{TINYFONT}VN
-STR_00A2_WH                                                     :{TINYFONT}HV
-STR_00A3_RB                                                     :{TINYFONT}GM
-STR_00A4_SG                                                     :{TINYFONT}SK
-STR_00A5_TY                                                     :{TINYFONT}LT
-STR_00A6_SW                                                     :{TINYFONT}SS
-STR_00A7_CL                                                     :{TINYFONT}CL
-STR_00A8_CF                                                     :{TINYFONT}SP
-STR_00A9_BU                                                     :{TINYFONT}BO
-STR_00AA_TF                                                     :{TINYFONT}KM
-STR_00AB_BA                                                     :{TINYFONT}BA
-STR_00AC_PL                                                     :{TINYFONT}PL
-STR_00AD_FZ                                                     :{TINYFONT}MV
+STR_QUANTITY_NOTHING                                            :
+STR_QUANTITY_PASSENGERS                                         :{COMMA} passasjer
+STR_QUANTITY_COAL                                               :{COMMA} tonn kull
+STR_QUANTITY_MAIL                                               :{COMMA} postsekk
+STR_QUANTITY_OIL                                                :{VOLUME} olje
+STR_QUANTITY_LIVESTOCK                                          :{COMMA} enhet buskap
+STR_QUANTITY_GOODS                                              :{COMMA} kasse gods
+STR_QUANTITY_GRAIN                                              :{COMMA} tonn korn
+STR_QUANTITY_WOOD                                               :{COMMA} tonn tømmer
+STR_QUANTITY_IRON_ORE                                           :{COMMA} tonn jernmalm
+STR_QUANTITY_STEEL                                              :{COMMA} tonn stål
+STR_QUANTITY_VALUABLES                                          :{COMMA} sekk med verdisaker
+STR_QUANTITY_COPPER_ORE                                         :{COMMA} tonn kobbermalm
+STR_QUANTITY_MAIZE                                              :{COMMA} tonn mais
+STR_QUANTITY_FRUIT                                              :{COMMA} tonn frukt
+STR_QUANTITY_DIAMONDS                                           :{COMMA} sekk med diamanter
+STR_QUANTITY_FOOD                                               :{COMMA} tonn mat
+STR_QUANTITY_PAPER                                              :{COMMA} tonn papir
+STR_QUANTITY_GOLD                                               :{COMMA} sekk med gull
+STR_QUANTITY_WATER                                              :{VOLUME} vann
+STR_QUANTITY_WHEAT                                              :{COMMA} tonn hvete
+STR_QUANTITY_RUBBER                                             :{VOLUME} gummi
+STR_QUANTITY_SUGAR                                              :{COMMA} tonn sukker
+STR_QUANTITY_TOYS                                               :{COMMA} leke
+STR_QUANTITY_SWEETS                                             :{COMMA} sekk med søtsaker
+STR_QUANTITY_COLA                                               :{VOLUME} cola
+STR_QUANTITY_CANDYFLOSS                                         :{COMMA} tonn sukkerspinn
+STR_QUANTITY_BUBBLES                                            :{COMMA} boble
+STR_QUANTITY_TOFFEE                                             :{COMMA} tonn karamell
+STR_QUANTITY_BATTERIES                                          :{COMMA} batteri
+STR_QUANTITY_PLASTIC                                            :{VOLUME} plastikk
+STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA} brus
+STR_ABBREV_NOTHING                                              :
+STR_ABBREV_PASSENGERS                                           :{TINYFONT}PS
+STR_ABBREV_COAL                                                 :{TINYFONT}KL
+STR_ABBREV_MAIL                                                 :{TINYFONT}PT
+STR_ABBREV_OIL                                                  :{TINYFONT}OL
+STR_ABBREV_LIVESTOCK                                            :{TINYFONT}BS
+STR_ABBREV_GOODS                                                :{TINYFONT}GD
+STR_ABBREV_GRAIN                                                :{TINYFONT}KN
+STR_ABBREV_WOOD                                                 :{TINYFONT}VD
+STR_ABBREV_IRON_ORE                                             :{TINYFONT}JM
+STR_ABBREV_STEEL                                                :{TINYFONT}ST
+STR_ABBREV_VALUABLES                                            :{TINYFONT}VS
+STR_ABBREV_COPPER_ORE                                           :{TINYFONT}KM
+STR_ABBREV_MAIZE                                                :{TINYFONT}MS
+STR_ABBREV_FRUIT                                                :{TINYFONT}FT
+STR_ABBREV_DIAMONDS                                             :{TINYFONT}DM
+STR_ABBREV_FOOD                                                 :{TINYFONT}MT
+STR_ABBREV_PAPER                                                :{TINYFONT}PR
+STR_ABBREV_GOLD                                                 :{TINYFONT}GL
+STR_ABBREV_WATER                                                :{TINYFONT}VN
+STR_ABBREV_WHEAT                                                :{TINYFONT}HV
+STR_ABBREV_RUBBER                                               :{TINYFONT}GM
+STR_ABBREV_SUGAR                                                :{TINYFONT}SK
+STR_ABBREV_TOYS                                                 :{TINYFONT}LT
+STR_ABBREV_SWEETS                                               :{TINYFONT}SS
+STR_ABBREV_COLA                                                 :{TINYFONT}CL
+STR_ABBREV_CANDYFLOSS                                           :{TINYFONT}SP
+STR_ABBREV_BUBBLES                                              :{TINYFONT}BO
+STR_ABBREV_TOFFEE                                               :{TINYFONT}KM
+STR_ABBREV_BATTERIES                                            :{TINYFONT}BA
+STR_ABBREV_PLASTIC                                              :{TINYFONT}PL
+STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}MV
 STR_00AE                                                        :{WHITE}{DATE_SHORT}
 STR_00AF                                                        :{WHITE}{DATE_LONG}
 STR_00B0_MAP                                                    :{WHITE}Kart - {STRING}
diff --git a/lang/polish.txt b/lang/polish.txt
index 2d0d10931..55580b033 100644
--- a/lang/polish.txt
+++ b/lang/polish.txt
@@ -82,70 +82,70 @@ STR_004A_TOFFEE                                                 :Tofi
 STR_004B_BATTERY                                                :Baterie
 STR_004C_PLASTIC                                                :Plastik
 STR_004D_FIZZY_DRINK                                            :Napoje gazowane
-STR_004E                                                        :
-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                                      :{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                                           :{COMMA} ton pszenicy
-STR_0063_OF_RUBBER                                              :{VOLUME} kauczuku
-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                                    :{COMMA} ton waty cukrowej
-STR_0069_BUBBLE                                                 :{COMMA} babelkow
-STR_006A_TON_OF_TOFFEE                                          :{COMMA} ton tofi
-STR_006B_BATTERY                                                :{COMMA} bateri{P a e i}
-STR_006C_OF_PLASTIC                                             :{VOLUME} plastiku
-STR_006D_FIZZY_DRINK                                            :{COMMA} napoju gazowanego
-STR_008E                                                        :
-STR_008F_PS                                                     :{TINYFONT}PS
-STR_0090_CL                                                     :{TINYFONT}CL
-STR_0091_ML                                                     :{TINYFONT}ML
-STR_0092_OL                                                     :{TINYFONT}OL
-STR_0093_LV                                                     :{TINYFONT}LV
-STR_0094_GD                                                     :{TINYFONT}GD
-STR_0095_GR                                                     :{TINYFONT}GR
-STR_0096_WD                                                     :{TINYFONT}WD
-STR_0097_OR                                                     :{TINYFONT}OR
-STR_0098_ST                                                     :{TINYFONT}ST
-STR_0099_VL                                                     :{TINYFONT}VL
-STR_009A_CO                                                     :{TINYFONT}CO
-STR_009B_MZ                                                     :{TINYFONT}MZ
-STR_009C_FT                                                     :{TINYFONT}FT
-STR_009D_DM                                                     :{TINYFONT}DM
-STR_009E_FD                                                     :{TINYFONT}FD
-STR_009F_PR                                                     :{TINYFONT}PR
-STR_00A0_GD                                                     :{TINYFONT}GD
-STR_00A1_WR                                                     :{TINYFONT}WR
-STR_00A2_WH                                                     :{TINYFONT}WH
-STR_00A3_RB                                                     :{TINYFONT}RB
-STR_00A4_SG                                                     :{TINYFONT}SG
-STR_00A5_TY                                                     :{TINYFONT}TY
-STR_00A6_SW                                                     :{TINYFONT}SW
-STR_00A7_CL                                                     :{TINYFONT}CL
-STR_00A8_CF                                                     :{TINYFONT}CF
-STR_00A9_BU                                                     :{TINYFONT}BU
-STR_00AA_TF                                                     :{TINYFONT}TF
-STR_00AB_BA                                                     :{TINYFONT}BA
-STR_00AC_PL                                                     :{TINYFONT}PL
-STR_00AD_FZ                                                     :{TINYFONT}FZ
+STR_QUANTITY_NOTHING                                            :
+STR_QUANTITY_PASSENGERS                                         :{COMMA} pasazerow
+STR_QUANTITY_COAL                                               :{COMMA} ton wegla
+STR_QUANTITY_MAIL                                               :{COMMA} paczek poczty
+STR_QUANTITY_OIL                                                :{VOLUME} ropy
+STR_QUANTITY_LIVESTOCK                                          :{COMMA} sztuk zywca
+STR_QUANTITY_GOODS                                              :{COMMA} towarow
+STR_QUANTITY_GRAIN                                              :{COMMA} ton zboza
+STR_QUANTITY_WOOD                                               :{COMMA} ton drewna
+STR_QUANTITY_IRON_ORE                                           :{COMMA} ton rudy zelaza
+STR_QUANTITY_STEEL                                              :{COMMA} ton stali
+STR_QUANTITY_VALUABLES                                          :{COMMA} kosztownosci
+STR_QUANTITY_COPPER_ORE                                         :{COMMA} ton rudy miedzi
+STR_QUANTITY_MAIZE                                              :{COMMA} ton kukurydzy
+STR_QUANTITY_FRUIT                                              :{COMMA} ton owocow
+STR_QUANTITY_DIAMONDS                                           :{COMMA} paczek diamentow
+STR_QUANTITY_FOOD                                               :{COMMA} ton zywnosci
+STR_QUANTITY_PAPER                                              :{COMMA} ton papieru
+STR_QUANTITY_GOLD                                               :{COMMA} zlota
+STR_QUANTITY_WATER                                              :{VOLUME} wody
+STR_QUANTITY_WHEAT                                              :{COMMA} ton pszenicy
+STR_QUANTITY_RUBBER                                             :{VOLUME} kauczuku
+STR_QUANTITY_SUGAR                                              :{COMMA} ton cukru
+STR_QUANTITY_TOYS                                               :{COMMA} zabawek
+STR_QUANTITY_SWEETS                                             :{COMMA} paczek slodyczy
+STR_QUANTITY_COLA                                               :{VOLUME} coli
+STR_QUANTITY_CANDYFLOSS                                         :{COMMA} ton waty cukrowej
+STR_QUANTITY_BUBBLES                                            :{COMMA} babelkow
+STR_QUANTITY_TOFFEE                                             :{COMMA} ton tofi
+STR_QUANTITY_BATTERIES                                          :{COMMA} bateri{P a e i}
+STR_QUANTITY_PLASTIC                                            :{VOLUME} plastiku
+STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA} napoju gazowanego
+STR_ABBREV_NOTHING                                              :
+STR_ABBREV_PASSENGERS                                           :{TINYFONT}PS
+STR_ABBREV_COAL                                                 :{TINYFONT}CL
+STR_ABBREV_MAIL                                                 :{TINYFONT}ML
+STR_ABBREV_OIL                                                  :{TINYFONT}OL
+STR_ABBREV_LIVESTOCK                                            :{TINYFONT}LV
+STR_ABBREV_GOODS                                                :{TINYFONT}GD
+STR_ABBREV_GRAIN                                                :{TINYFONT}GR
+STR_ABBREV_WOOD                                                 :{TINYFONT}WD
+STR_ABBREV_IRON_ORE                                             :{TINYFONT}OR
+STR_ABBREV_STEEL                                                :{TINYFONT}ST
+STR_ABBREV_VALUABLES                                            :{TINYFONT}VL
+STR_ABBREV_COPPER_ORE                                           :{TINYFONT}CO
+STR_ABBREV_MAIZE                                                :{TINYFONT}MZ
+STR_ABBREV_FRUIT                                                :{TINYFONT}FT
+STR_ABBREV_DIAMONDS                                             :{TINYFONT}DM
+STR_ABBREV_FOOD                                                 :{TINYFONT}FD
+STR_ABBREV_PAPER                                                :{TINYFONT}PR
+STR_ABBREV_GOLD                                                 :{TINYFONT}GD
+STR_ABBREV_WATER                                                :{TINYFONT}WR
+STR_ABBREV_WHEAT                                                :{TINYFONT}WH
+STR_ABBREV_RUBBER                                               :{TINYFONT}RB
+STR_ABBREV_SUGAR                                                :{TINYFONT}SG
+STR_ABBREV_TOYS                                                 :{TINYFONT}TY
+STR_ABBREV_SWEETS                                               :{TINYFONT}SW
+STR_ABBREV_COLA                                                 :{TINYFONT}CL
+STR_ABBREV_CANDYFLOSS                                           :{TINYFONT}CF
+STR_ABBREV_BUBBLES                                              :{TINYFONT}BU
+STR_ABBREV_TOFFEE                                               :{TINYFONT}TF
+STR_ABBREV_BATTERIES                                            :{TINYFONT}BA
+STR_ABBREV_PLASTIC                                              :{TINYFONT}PL
+STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}FZ
 STR_00AE                                                        :{WHITE}{DATE_SHORT}
 STR_00AF                                                        :{WHITE}{DATE_LONG}
 STR_00B0_MAP                                                    :{WHITE}Mapa - {STRING}
diff --git a/lang/portuguese.txt b/lang/portuguese.txt
index 08c8dbb09..cb92f2a61 100644
--- a/lang/portuguese.txt
+++ b/lang/portuguese.txt
@@ -82,70 +82,70 @@ STR_004A_TOFFEE                                                 :Caramelo
 STR_004B_BATTERY                                                :Baterias
 STR_004C_PLASTIC                                                :Plástico
 STR_004D_FIZZY_DRINK                                            :Bebidas Gasosas
-STR_004E                                                        :
-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                                      :{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                                           :{COMMA} tonelada de trigo
-STR_0063_OF_RUBBER                                              :{VOLUME} de borracha
-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                                    :{COMMA} tonelada de algodão doce
-STR_0069_BUBBLE                                                 :{COMMA} bolha
-STR_006A_TON_OF_TOFFEE                                          :{COMMA} tonelada de caramelo
-STR_006B_BATTERY                                                :{COMMA} pilh{P y as}
-STR_006C_OF_PLASTIC                                             :{VOLUME} de plástico
-STR_006D_FIZZY_DRINK                                            :{COMMA} Bebida Gasosa
-STR_008E                                                        :
-STR_008F_PS                                                     :{TINYFONT}PS
-STR_0090_CL                                                     :{TINYFONT}CL
-STR_0091_ML                                                     :{TINYFONT}ML
-STR_0092_OL                                                     :{TINYFONT}OL
-STR_0093_LV                                                     :{TINYFONT}LV
-STR_0094_GD                                                     :{TINYFONT}GD
-STR_0095_GR                                                     :{TINYFONT}GR
-STR_0096_WD                                                     :{TINYFONT}WD
-STR_0097_OR                                                     :{TINYFONT}OR
-STR_0098_ST                                                     :{TINYFONT}ST
-STR_0099_VL                                                     :{TINYFONT}VL
-STR_009A_CO                                                     :{TINYFONT}CO
-STR_009B_MZ                                                     :{TINYFONT}MZ
-STR_009C_FT                                                     :{TINYFONT}FT
-STR_009D_DM                                                     :{TINYFONT}DM
-STR_009E_FD                                                     :{TINYFONT}FD
-STR_009F_PR                                                     :{TINYFONT}PR
-STR_00A0_GD                                                     :{TINYFONT}GD
-STR_00A1_WR                                                     :{TINYFONT}WR
-STR_00A2_WH                                                     :{TINYFONT}WH
-STR_00A3_RB                                                     :{TINYFONT}RB
-STR_00A4_SG                                                     :{TINYFONT}SG
-STR_00A5_TY                                                     :{TINYFONT}TY
-STR_00A6_SW                                                     :{TINYFONT}SW
-STR_00A7_CL                                                     :{TINYFONT}CL
-STR_00A8_CF                                                     :{TINYFONT}CF
-STR_00A9_BU                                                     :{TINYFONT}BU
-STR_00AA_TF                                                     :{TINYFONT}TF
-STR_00AB_BA                                                     :{TINYFONT}BA
-STR_00AC_PL                                                     :{TINYFONT}PL
-STR_00AD_FZ                                                     :{TINYFONT}FZ
+STR_QUANTITY_NOTHING                                            :
+STR_QUANTITY_PASSENGERS                                         :{COMMA} passageiro
+STR_QUANTITY_COAL                                               :{COMMA} tonelada de carvão
+STR_QUANTITY_MAIL                                               :{COMMA} saco de correio
+STR_QUANTITY_OIL                                                :{VOLUME} de petróleo
+STR_QUANTITY_LIVESTOCK                                          :{COMMA} item de gado
+STR_QUANTITY_GOODS                                              :{COMMA} caixa de bens
+STR_QUANTITY_GRAIN                                              :{COMMA} tonelada de cereais
+STR_QUANTITY_WOOD                                               :{COMMA} tonelada de madeira
+STR_QUANTITY_IRON_ORE                                           :{COMMA} tonelada de minério de ferro
+STR_QUANTITY_STEEL                                              :{COMMA} tonelada de aço
+STR_QUANTITY_VALUABLES                                          :{COMMA} saco de valores
+STR_QUANTITY_COPPER_ORE                                         :{COMMA} tonelada de minério de cobre
+STR_QUANTITY_MAIZE                                              :{COMMA} tonelada de milho
+STR_QUANTITY_FRUIT                                              :{COMMA} tonelada de fruta
+STR_QUANTITY_DIAMONDS                                           :{COMMA} saco de diamantes
+STR_QUANTITY_FOOD                                               :{COMMA} tonelada de comida
+STR_QUANTITY_PAPER                                              :{COMMA} tonelada de papel
+STR_QUANTITY_GOLD                                               :{COMMA} saco de ouro
+STR_QUANTITY_WATER                                              :{VOLUME} de água
+STR_QUANTITY_WHEAT                                              :{COMMA} tonelada de trigo
+STR_QUANTITY_RUBBER                                             :{VOLUME} de borracha
+STR_QUANTITY_SUGAR                                              :{COMMA} tonelada de açúcar
+STR_QUANTITY_TOYS                                               :{COMMA} brinquedo
+STR_QUANTITY_SWEETS                                             :{COMMA} saco de doces
+STR_QUANTITY_COLA                                               :{VOLUME} de cola
+STR_QUANTITY_CANDYFLOSS                                         :{COMMA} tonelada de algodão doce
+STR_QUANTITY_BUBBLES                                            :{COMMA} bolha
+STR_QUANTITY_TOFFEE                                             :{COMMA} tonelada de caramelo
+STR_QUANTITY_BATTERIES                                          :{COMMA} pilh{P y as}
+STR_QUANTITY_PLASTIC                                            :{VOLUME} de plástico
+STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA} Bebida Gasosa
+STR_ABBREV_NOTHING                                              :
+STR_ABBREV_PASSENGERS                                           :{TINYFONT}PS
+STR_ABBREV_COAL                                                 :{TINYFONT}CL
+STR_ABBREV_MAIL                                                 :{TINYFONT}ML
+STR_ABBREV_OIL                                                  :{TINYFONT}OL
+STR_ABBREV_LIVESTOCK                                            :{TINYFONT}LV
+STR_ABBREV_GOODS                                                :{TINYFONT}GD
+STR_ABBREV_GRAIN                                                :{TINYFONT}GR
+STR_ABBREV_WOOD                                                 :{TINYFONT}WD
+STR_ABBREV_IRON_ORE                                             :{TINYFONT}OR
+STR_ABBREV_STEEL                                                :{TINYFONT}ST
+STR_ABBREV_VALUABLES                                            :{TINYFONT}VL
+STR_ABBREV_COPPER_ORE                                           :{TINYFONT}CO
+STR_ABBREV_MAIZE                                                :{TINYFONT}MZ
+STR_ABBREV_FRUIT                                                :{TINYFONT}FT
+STR_ABBREV_DIAMONDS                                             :{TINYFONT}DM
+STR_ABBREV_FOOD                                                 :{TINYFONT}FD
+STR_ABBREV_PAPER                                                :{TINYFONT}PR
+STR_ABBREV_GOLD                                                 :{TINYFONT}GD
+STR_ABBREV_WATER                                                :{TINYFONT}WR
+STR_ABBREV_WHEAT                                                :{TINYFONT}WH
+STR_ABBREV_RUBBER                                               :{TINYFONT}RB
+STR_ABBREV_SUGAR                                                :{TINYFONT}SG
+STR_ABBREV_TOYS                                                 :{TINYFONT}TY
+STR_ABBREV_SWEETS                                               :{TINYFONT}SW
+STR_ABBREV_COLA                                                 :{TINYFONT}CL
+STR_ABBREV_CANDYFLOSS                                           :{TINYFONT}CF
+STR_ABBREV_BUBBLES                                              :{TINYFONT}BU
+STR_ABBREV_TOFFEE                                               :{TINYFONT}TF
+STR_ABBREV_BATTERIES                                            :{TINYFONT}BA
+STR_ABBREV_PLASTIC                                              :{TINYFONT}PL
+STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}FZ
 STR_00AE                                                        :{WHITE}{DATE_SHORT}
 STR_00AF                                                        :{WHITE}{DATE_LONG}
 STR_00B0_MAP                                                    :{WHITE}Mapa - {STRING}
diff --git a/lang/romanian.txt b/lang/romanian.txt
index 3244bcf2e..487d371ea 100644
--- a/lang/romanian.txt
+++ b/lang/romanian.txt
@@ -82,70 +82,70 @@ STR_004A_TOFFEE                                                 :caramel
 STR_004B_BATTERY                                                :baterii
 STR_004C_PLASTIC                                                :plastic
 STR_004D_FIZZY_DRINK                                            :suc
-STR_004E                                                        :
-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                                      :{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                                           :{COMMA} tonã de grâu
-STR_0063_OF_RUBBER                                              :{VOLUME} de cauciuc
-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                                    :{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                                            :{COMMA} bidon cu suc
-STR_008E                                                        :
-STR_008F_PS                                                     :{TINYFONT}CL
-STR_0090_CL                                                     :{TINYFONT}CB
-STR_0091_ML                                                     :{TINYFONT}PO
-STR_0092_OL                                                     :{TINYFONT}PT
-STR_0093_LV                                                     :{TINYFONT}AN
-STR_0094_GD                                                     :{TINYFONT}BN
-STR_0095_GR                                                     :{TINYFONT}CR
-STR_0096_WD                                                     :{TINYFONT}LM
-STR_0097_OR                                                     :{TINYFONT}FE
-STR_0098_ST                                                     :{TINYFONT}OT
-STR_0099_VL                                                     :{TINYFONT}VL
-STR_009A_CO                                                     :{TINYFONT}CU
-STR_009B_MZ                                                     :{TINYFONT}PR
-STR_009C_FT                                                     :{TINYFONT}FR
-STR_009D_DM                                                     :{TINYFONT}DM
-STR_009E_FD                                                     :{TINYFONT}AL
-STR_009F_PR                                                     :{TINYFONT}HR
-STR_00A0_GD                                                     :{TINYFONT}AU
-STR_00A1_WR                                                     :{TINYFONT}AP
-STR_00A2_WH                                                     :{TINYFONT}GR
-STR_00A3_RB                                                     :{TINYFONT}CU
-STR_00A4_SG                                                     :{TINYFONT}ZH
-STR_00A5_TY                                                     :{TINYFONT}JC
-STR_00A6_SW                                                     :{TINYFONT}BB
-STR_00A7_CL                                                     :{TINYFONT}CO
-STR_00A8_CF                                                     :{TINYFONT}VZ
-STR_00A9_BU                                                     :{TINYFONT}BL
-STR_00AA_TF                                                     :{TINYFONT}CM
-STR_00AB_BA                                                     :{TINYFONT}BA
-STR_00AC_PL                                                     :{TINYFONT}PL
-STR_00AD_FZ                                                     :{TINYFONT}SC
+STR_QUANTITY_NOTHING                                            :
+STR_QUANTITY_PASSENGERS                                         :{COMMA} cãlãtor
+STR_QUANTITY_COAL                                               :{COMMA} tonã de cãrbune
+STR_QUANTITY_MAIL                                               :{COMMA} sac cu colete postale
+STR_QUANTITY_OIL                                                :{VOLUME} de petrol
+STR_QUANTITY_LIVESTOCK                                          :{COMMA} animal
+STR_QUANTITY_GOODS                                              :{COMMA} pachet de bunuri
+STR_QUANTITY_GRAIN                                              :{COMMA} tonã de cereale
+STR_QUANTITY_WOOD                                               :{COMMA} tonã de lemne
+STR_QUANTITY_IRON_ORE                                           :{COMMA} tonã de minereu de fier
+STR_QUANTITY_STEEL                                              :{COMMA} tonã de otel
+STR_QUANTITY_VALUABLES                                          :{COMMA} cutie de valori
+STR_QUANTITY_COPPER_ORE                                         :{COMMA} tonã de minereu de cupru
+STR_QUANTITY_MAIZE                                              :{COMMA} tonã de porumb
+STR_QUANTITY_FRUIT                                              :{COMMA} tonã de fructe
+STR_QUANTITY_DIAMONDS                                           :{COMMA} sac cu diamante
+STR_QUANTITY_FOOD                                               :{COMMA} tonã de alimente
+STR_QUANTITY_PAPER                                              :{COMMA} tonã de hârtie
+STR_QUANTITY_GOLD                                               :{COMMA} sac cu aur
+STR_QUANTITY_WATER                                              :{VOLUME} de apã
+STR_QUANTITY_WHEAT                                              :{COMMA} tonã de grâu
+STR_QUANTITY_RUBBER                                             :{VOLUME} de cauciuc
+STR_QUANTITY_SUGAR                                              :{COMMA} tonã de zahãr
+STR_QUANTITY_TOYS                                               :{COMMA} sac cu jucãrii
+STR_QUANTITY_SWEETS                                             :{COMMA} sac cu bomboane
+STR_QUANTITY_COLA                                               :{VOLUME} de cola
+STR_QUANTITY_CANDYFLOSS                                         :{COMMA} tonã de vatã de zahãr
+STR_QUANTITY_BUBBLES                                            :{COMMA} balonas
+STR_QUANTITY_TOFFEE                                             :{COMMA} tonã de caramel
+STR_QUANTITY_BATTERIES                                          :{COMMA} baterie
+STR_QUANTITY_PLASTIC                                            :{VOLUME} de plastic
+STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA} bidon cu suc
+STR_ABBREV_NOTHING                                              :
+STR_ABBREV_PASSENGERS                                           :{TINYFONT}CL
+STR_ABBREV_COAL                                                 :{TINYFONT}CB
+STR_ABBREV_MAIL                                                 :{TINYFONT}PO
+STR_ABBREV_OIL                                                  :{TINYFONT}PT
+STR_ABBREV_LIVESTOCK                                            :{TINYFONT}AN
+STR_ABBREV_GOODS                                                :{TINYFONT}BN
+STR_ABBREV_GRAIN                                                :{TINYFONT}CR
+STR_ABBREV_WOOD                                                 :{TINYFONT}LM
+STR_ABBREV_IRON_ORE                                             :{TINYFONT}FE
+STR_ABBREV_STEEL                                                :{TINYFONT}OT
+STR_ABBREV_VALUABLES                                            :{TINYFONT}VL
+STR_ABBREV_COPPER_ORE                                           :{TINYFONT}CU
+STR_ABBREV_MAIZE                                                :{TINYFONT}PR
+STR_ABBREV_FRUIT                                                :{TINYFONT}FR
+STR_ABBREV_DIAMONDS                                             :{TINYFONT}DM
+STR_ABBREV_FOOD                                                 :{TINYFONT}AL
+STR_ABBREV_PAPER                                                :{TINYFONT}HR
+STR_ABBREV_GOLD                                                 :{TINYFONT}AU
+STR_ABBREV_WATER                                                :{TINYFONT}AP
+STR_ABBREV_WHEAT                                                :{TINYFONT}GR
+STR_ABBREV_RUBBER                                               :{TINYFONT}CU
+STR_ABBREV_SUGAR                                                :{TINYFONT}ZH
+STR_ABBREV_TOYS                                                 :{TINYFONT}JC
+STR_ABBREV_SWEETS                                               :{TINYFONT}BB
+STR_ABBREV_COLA                                                 :{TINYFONT}CO
+STR_ABBREV_CANDYFLOSS                                           :{TINYFONT}VZ
+STR_ABBREV_BUBBLES                                              :{TINYFONT}BL
+STR_ABBREV_TOFFEE                                               :{TINYFONT}CM
+STR_ABBREV_BATTERIES                                            :{TINYFONT}BA
+STR_ABBREV_PLASTIC                                              :{TINYFONT}PL
+STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}SC
 STR_00AE                                                        :{WHITE}{DATE_SHORT}
 STR_00AF                                                        :{WHITE}{DATE_LONG}
 STR_00B0_MAP                                                    :{WHITE}Harta - {STRING}
diff --git a/lang/slovak.txt b/lang/slovak.txt
index 5f251aa52..b248f6412 100644
--- a/lang/slovak.txt
+++ b/lang/slovak.txt
@@ -82,70 +82,70 @@ STR_004A_TOFFEE                                                 :Karamel
 STR_004B_BATTERY                                                :Baterie
 STR_004C_PLASTIC                                                :Zuvacky
 STR_004D_FIZZY_DRINK                                            :Sumienka
-STR_004E                                                        :
-STR_004F_PASSENGER                                              :{COMMA} cestujuci{P "" "" ch}
-STR_0050_TON_OF_COAL                                            :{COMMA} ton{P a y ""} uhlia
-STR_0051_BAG_OF_MAIL                                            :{COMMA} balik{P "" y ov} posty
-STR_0052_OF_OIL                                                 :{VOLUME} ropy
-STR_0053_ITEM_OF_LIVESTOCK                                      :{COMMA} kus{P "" y ov} dobytka
-STR_0054_CRATE_OF_GOODS                                         :{COMMA} deb{P na ny ien} tovaru
-STR_0055_TON_OF_GRAIN                                           :{COMMA} ton{P a y ""} obilia
-STR_0056_TON_OF_WOOD                                            :{COMMA} ton{P a y ""} dreva
-STR_0057_TON_OF_IRON_ORE                                        :{COMMA} ton{P a y ""} zeleznej rudy
-STR_0058_TON_OF_STEEL                                           :{COMMA} ton{P a y ""} ocele
-STR_0059_BAG_OF_VALUABLES                                       :{COMMA} vr{P eco ecia iec} cennosti
-STR_005A_TON_OF_COPPER_ORE                                      :{COMMA} ton{P a y ""} medennej rudy
-STR_005B_TON_OF_MAIZE                                           :{COMMA} ton{P a y ""} kukurice
-STR_005C_TON_OF_FRUIT                                           :{COMMA} ton{P a y ""} ovocia
-STR_005D_BAG_OF_DIAMONDS                                        :{COMMA} deb{P na ny ien} diamantov
-STR_005E_TON_OF_FOOD                                            :{COMMA} ton{P a y ""} jedla
-STR_005F_TON_OF_PAPER                                           :{COMMA} ton{P a y ""} papiera
-STR_0060_BAG_OF_GOLD                                            :{COMMA} deb{P na ny ien} zlata
-STR_0061_OF_WATER                                               :{VOLUME} voda
-STR_0062_TON_OF_WHEAT                                           :{COMMA} ton{P a y ""} psenice
-STR_0063_OF_RUBBER                                              :{VOLUME} kaucuk
-STR_0064_TON_OF_SUGAR                                           :{COMMA} ton{P a y ""} cukru
-STR_0065_TOY                                                    :{COMMA} hrac{P ka ky iek}
-STR_0066_BAG_OF_CANDY                                           :{COMMA} deb{P na ny ien} cukrikov
-STR_0067_OF_COLA                                                :{VOLUME} kofola
-STR_0068_TON_OF_COTTON_CANDY                                    :{COMMA} ton{P a y ""} cukrovej vaty
-STR_0069_BUBBLE                                                 :{COMMA} bublin{P a y ""}
-STR_006A_TON_OF_TOFFEE                                          :{COMMA} ton{P a y ""} karamelu
-STR_006B_BATTERY                                                :{COMMA} bateri{P a e i}
-STR_006C_OF_PLASTIC                                             :{VOLUME} zuvacka
-STR_006D_FIZZY_DRINK                                            :{COMMA} sumien{P ka ky ok}
-STR_008E                                                        :
-STR_008F_PS                                                     :{TINYFONT}CE
-STR_0090_CL                                                     :{TINYFONT}UH
-STR_0091_ML                                                     :{TINYFONT}PO
-STR_0092_OL                                                     :{TINYFONT}RO
-STR_0093_LV                                                     :{TINYFONT}DO
-STR_0094_GD                                                     :{TINYFONT}TO
-STR_0095_GR                                                     :{TINYFONT}OB
-STR_0096_WD                                                     :{TINYFONT}DR
-STR_0097_OR                                                     :{TINYFONT}ZR
-STR_0098_ST                                                     :{TINYFONT}OC
-STR_0099_VL                                                     :{TINYFONT}CE
-STR_009A_CO                                                     :{TINYFONT}MR
-STR_009B_MZ                                                     :{TINYFONT}KU
-STR_009C_FT                                                     :{TINYFONT}OV
-STR_009D_DM                                                     :{TINYFONT}DI
-STR_009E_FD                                                     :{TINYFONT}JE
-STR_009F_PR                                                     :{TINYFONT}PA
-STR_00A0_GD                                                     :{TINYFONT}ZL
-STR_00A1_WR                                                     :{TINYFONT}VO
-STR_00A2_WH                                                     :{TINYFONT}PS
-STR_00A3_RB                                                     :{TINYFONT}KA
-STR_00A4_SG                                                     :{TINYFONT}CU
-STR_00A5_TY                                                     :{TINYFONT}HR
-STR_00A6_SW                                                     :{TINYFONT}CK
-STR_00A7_CL                                                     :{TINYFONT}KO
-STR_00A8_CF                                                     :{TINYFONT}CV
-STR_00A9_BU                                                     :{TINYFONT}BU
-STR_00AA_TF                                                     :{TINYFONT}KR
-STR_00AB_BA                                                     :{TINYFONT}BT
-STR_00AC_PL                                                     :{TINYFONT}ZU
-STR_00AD_FZ                                                     :{TINYFONT}SU
+STR_QUANTITY_NOTHING                                            :
+STR_QUANTITY_PASSENGERS                                         :{COMMA} cestujuci{P "" "" ch}
+STR_QUANTITY_COAL                                               :{COMMA} ton{P a y ""} uhlia
+STR_QUANTITY_MAIL                                               :{COMMA} balik{P "" y ov} posty
+STR_QUANTITY_OIL                                                :{VOLUME} ropy
+STR_QUANTITY_LIVESTOCK                                          :{COMMA} kus{P "" y ov} dobytka
+STR_QUANTITY_GOODS                                              :{COMMA} deb{P na ny ien} tovaru
+STR_QUANTITY_GRAIN                                              :{COMMA} ton{P a y ""} obilia
+STR_QUANTITY_WOOD                                               :{COMMA} ton{P a y ""} dreva
+STR_QUANTITY_IRON_ORE                                           :{COMMA} ton{P a y ""} zeleznej rudy
+STR_QUANTITY_STEEL                                              :{COMMA} ton{P a y ""} ocele
+STR_QUANTITY_VALUABLES                                          :{COMMA} vr{P eco ecia iec} cennosti
+STR_QUANTITY_COPPER_ORE                                         :{COMMA} ton{P a y ""} medennej rudy
+STR_QUANTITY_MAIZE                                              :{COMMA} ton{P a y ""} kukurice
+STR_QUANTITY_FRUIT                                              :{COMMA} ton{P a y ""} ovocia
+STR_QUANTITY_DIAMONDS                                           :{COMMA} deb{P na ny ien} diamantov
+STR_QUANTITY_FOOD                                               :{COMMA} ton{P a y ""} jedla
+STR_QUANTITY_PAPER                                              :{COMMA} ton{P a y ""} papiera
+STR_QUANTITY_GOLD                                               :{COMMA} deb{P na ny ien} zlata
+STR_QUANTITY_WATER                                              :{VOLUME} voda
+STR_QUANTITY_WHEAT                                              :{COMMA} ton{P a y ""} psenice
+STR_QUANTITY_RUBBER                                             :{VOLUME} kaucuk
+STR_QUANTITY_SUGAR                                              :{COMMA} ton{P a y ""} cukru
+STR_QUANTITY_TOYS                                               :{COMMA} hrac{P ka ky iek}
+STR_QUANTITY_SWEETS                                             :{COMMA} deb{P na ny ien} cukrikov
+STR_QUANTITY_COLA                                               :{VOLUME} kofola
+STR_QUANTITY_CANDYFLOSS                                         :{COMMA} ton{P a y ""} cukrovej vaty
+STR_QUANTITY_BUBBLES                                            :{COMMA} bublin{P a y ""}
+STR_QUANTITY_TOFFEE                                             :{COMMA} ton{P a y ""} karamelu
+STR_QUANTITY_BATTERIES                                          :{COMMA} bateri{P a e i}
+STR_QUANTITY_PLASTIC                                            :{VOLUME} zuvacka
+STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA} sumien{P ka ky ok}
+STR_ABBREV_NOTHING                                              :
+STR_ABBREV_PASSENGERS                                           :{TINYFONT}CE
+STR_ABBREV_COAL                                                 :{TINYFONT}UH
+STR_ABBREV_MAIL                                                 :{TINYFONT}PO
+STR_ABBREV_OIL                                                  :{TINYFONT}RO
+STR_ABBREV_LIVESTOCK                                            :{TINYFONT}DO
+STR_ABBREV_GOODS                                                :{TINYFONT}TO
+STR_ABBREV_GRAIN                                                :{TINYFONT}OB
+STR_ABBREV_WOOD                                                 :{TINYFONT}DR
+STR_ABBREV_IRON_ORE                                             :{TINYFONT}ZR
+STR_ABBREV_STEEL                                                :{TINYFONT}OC
+STR_ABBREV_VALUABLES                                            :{TINYFONT}CE
+STR_ABBREV_COPPER_ORE                                           :{TINYFONT}MR
+STR_ABBREV_MAIZE                                                :{TINYFONT}KU
+STR_ABBREV_FRUIT                                                :{TINYFONT}OV
+STR_ABBREV_DIAMONDS                                             :{TINYFONT}DI
+STR_ABBREV_FOOD                                                 :{TINYFONT}JE
+STR_ABBREV_PAPER                                                :{TINYFONT}PA
+STR_ABBREV_GOLD                                                 :{TINYFONT}ZL
+STR_ABBREV_WATER                                                :{TINYFONT}VO
+STR_ABBREV_WHEAT                                                :{TINYFONT}PS
+STR_ABBREV_RUBBER                                               :{TINYFONT}KA
+STR_ABBREV_SUGAR                                                :{TINYFONT}CU
+STR_ABBREV_TOYS                                                 :{TINYFONT}HR
+STR_ABBREV_SWEETS                                               :{TINYFONT}CK
+STR_ABBREV_COLA                                                 :{TINYFONT}KO
+STR_ABBREV_CANDYFLOSS                                           :{TINYFONT}CV
+STR_ABBREV_BUBBLES                                              :{TINYFONT}BU
+STR_ABBREV_TOFFEE                                               :{TINYFONT}KR
+STR_ABBREV_BATTERIES                                            :{TINYFONT}BT
+STR_ABBREV_PLASTIC                                              :{TINYFONT}ZU
+STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}SU
 STR_00AE                                                        :{WHITE}{DATE_SHORT}
 STR_00AF                                                        :{WHITE}{DATE_LONG}
 STR_00B0_MAP                                                    :{WHITE}Mapa - {STRING}
diff --git a/lang/spanish.txt b/lang/spanish.txt
index c257fbc9c..9d617b51b 100644
--- a/lang/spanish.txt
+++ b/lang/spanish.txt
@@ -82,70 +82,70 @@ STR_004A_TOFFEE                                                 :Caramelo
 STR_004B_BATTERY                                                :Pilas
 STR_004C_PLASTIC                                                :Plástico
 STR_004D_FIZZY_DRINK                                            :Refresco
-STR_004E                                                        :
-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                                      :{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                                           :{COMMA} tonelada de trigo
-STR_0063_OF_RUBBER                                              :{VOLUME} de caucho
-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                                    :{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                                            :{COMMA} refresco
-STR_008E                                                        :
-STR_008F_PS                                                     :{TINYFONT}PS
-STR_0090_CL                                                     :{TINYFONT}CL
-STR_0091_ML                                                     :{TINYFONT}ML
-STR_0092_OL                                                     :{TINYFONT}OL
-STR_0093_LV                                                     :{TINYFONT}LV
-STR_0094_GD                                                     :{TINYFONT}GD
-STR_0095_GR                                                     :{TINYFONT}GR
-STR_0096_WD                                                     :{TINYFONT}WD
-STR_0097_OR                                                     :{TINYFONT}OR
-STR_0098_ST                                                     :{TINYFONT}ST
-STR_0099_VL                                                     :{TINYFONT}VL
-STR_009A_CO                                                     :{TINYFONT}CO
-STR_009B_MZ                                                     :{TINYFONT}MZ
-STR_009C_FT                                                     :{TINYFONT}FT
-STR_009D_DM                                                     :{TINYFONT}DM
-STR_009E_FD                                                     :{TINYFONT}FD
-STR_009F_PR                                                     :{TINYFONT}PR
-STR_00A0_GD                                                     :{TINYFONT}GD
-STR_00A1_WR                                                     :{TINYFONT}WR
-STR_00A2_WH                                                     :{TINYFONT}WH
-STR_00A3_RB                                                     :{TINYFONT}RB
-STR_00A4_SG                                                     :{TINYFONT}SG
-STR_00A5_TY                                                     :{TINYFONT}TY
-STR_00A6_SW                                                     :{TINYFONT}SW
-STR_00A7_CL                                                     :{TINYFONT}CL
-STR_00A8_CF                                                     :{TINYFONT}CF
-STR_00A9_BU                                                     :{TINYFONT}BU
-STR_00AA_TF                                                     :{TINYFONT}TF
-STR_00AB_BA                                                     :{TINYFONT}BA
-STR_00AC_PL                                                     :{TINYFONT}PL
-STR_00AD_FZ                                                     :{TINYFONT}FZ
+STR_QUANTITY_NOTHING                                            :
+STR_QUANTITY_PASSENGERS                                         :{COMMA} pasajero
+STR_QUANTITY_COAL                                               :{COMMA} tonelada de carbón
+STR_QUANTITY_MAIL                                               :{COMMA} saca de correo
+STR_QUANTITY_OIL                                                :{VOLUME} de petróleo
+STR_QUANTITY_LIVESTOCK                                          :{COMMA} cabeza de ganado
+STR_QUANTITY_GOODS                                              :{COMMA} caja de mercancía
+STR_QUANTITY_GRAIN                                              :{COMMA} tonelada de grano
+STR_QUANTITY_WOOD                                               :{COMMA} tonelada de madera
+STR_QUANTITY_IRON_ORE                                           :{COMMA} tonelada de mineral de hierro
+STR_QUANTITY_STEEL                                              :{COMMA} tonelada de acero
+STR_QUANTITY_VALUABLES                                          :{COMMA} bolsa de objetos de valor
+STR_QUANTITY_COPPER_ORE                                         :{COMMA} tonelada de mineral de cobre
+STR_QUANTITY_MAIZE                                              :{COMMA} tonelada de maíz
+STR_QUANTITY_FRUIT                                              :{COMMA} tonelada de fruta
+STR_QUANTITY_DIAMONDS                                           :{COMMA} bolsa de diamantes
+STR_QUANTITY_FOOD                                               :{COMMA} tonelada de alimento
+STR_QUANTITY_PAPER                                              :{COMMA} tonelada de papel
+STR_QUANTITY_GOLD                                               :{COMMA} bolsa de oro
+STR_QUANTITY_WATER                                              :{VOLUME} de agua
+STR_QUANTITY_WHEAT                                              :{COMMA} tonelada de trigo
+STR_QUANTITY_RUBBER                                             :{VOLUME} de caucho
+STR_QUANTITY_SUGAR                                              :{COMMA} tonelada de azucar
+STR_QUANTITY_TOYS                                               :{COMMA} juguete
+STR_QUANTITY_SWEETS                                             :{COMMA} bolsa de dulces
+STR_QUANTITY_COLA                                               :{VOLUME} de cola
+STR_QUANTITY_CANDYFLOSS                                         :{COMMA} tonelada de algodón de azúcar
+STR_QUANTITY_BUBBLES                                            :{COMMA} burbuja
+STR_QUANTITY_TOFFEE                                             :{COMMA} tonelada de caramelo
+STR_QUANTITY_BATTERIES                                          :{COMMA} pila
+STR_QUANTITY_PLASTIC                                            :{VOLUME} de plástico
+STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA} refresco
+STR_ABBREV_NOTHING                                              :
+STR_ABBREV_PASSENGERS                                           :{TINYFONT}PS
+STR_ABBREV_COAL                                                 :{TINYFONT}CL
+STR_ABBREV_MAIL                                                 :{TINYFONT}ML
+STR_ABBREV_OIL                                                  :{TINYFONT}OL
+STR_ABBREV_LIVESTOCK                                            :{TINYFONT}LV
+STR_ABBREV_GOODS                                                :{TINYFONT}GD
+STR_ABBREV_GRAIN                                                :{TINYFONT}GR
+STR_ABBREV_WOOD                                                 :{TINYFONT}WD
+STR_ABBREV_IRON_ORE                                             :{TINYFONT}OR
+STR_ABBREV_STEEL                                                :{TINYFONT}ST
+STR_ABBREV_VALUABLES                                            :{TINYFONT}VL
+STR_ABBREV_COPPER_ORE                                           :{TINYFONT}CO
+STR_ABBREV_MAIZE                                                :{TINYFONT}MZ
+STR_ABBREV_FRUIT                                                :{TINYFONT}FT
+STR_ABBREV_DIAMONDS                                             :{TINYFONT}DM
+STR_ABBREV_FOOD                                                 :{TINYFONT}FD
+STR_ABBREV_PAPER                                                :{TINYFONT}PR
+STR_ABBREV_GOLD                                                 :{TINYFONT}GD
+STR_ABBREV_WATER                                                :{TINYFONT}WR
+STR_ABBREV_WHEAT                                                :{TINYFONT}WH
+STR_ABBREV_RUBBER                                               :{TINYFONT}RB
+STR_ABBREV_SUGAR                                                :{TINYFONT}SG
+STR_ABBREV_TOYS                                                 :{TINYFONT}TY
+STR_ABBREV_SWEETS                                               :{TINYFONT}SW
+STR_ABBREV_COLA                                                 :{TINYFONT}CL
+STR_ABBREV_CANDYFLOSS                                           :{TINYFONT}CF
+STR_ABBREV_BUBBLES                                              :{TINYFONT}BU
+STR_ABBREV_TOFFEE                                               :{TINYFONT}TF
+STR_ABBREV_BATTERIES                                            :{TINYFONT}BA
+STR_ABBREV_PLASTIC                                              :{TINYFONT}PL
+STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}FZ
 STR_00AE                                                        :{WHITE}{DATE_SHORT}
 STR_00AF                                                        :{WHITE}{DATE_LONG}
 STR_00B0_MAP                                                    :{WHITE}Mapa - {STRING}
diff --git a/lang/swedish.txt b/lang/swedish.txt
index 9ebf8a6d2..5f05a88ee 100644
--- a/lang/swedish.txt
+++ b/lang/swedish.txt
@@ -82,70 +82,70 @@ STR_004A_TOFFEE                                                 :Knäck
 STR_004B_BATTERY                                                :Batterier
 STR_004C_PLASTIC                                                :Plast
 STR_004D_FIZZY_DRINK                                            :läsk
-STR_004E                                                        :
-STR_004F_PASSENGER                                              :{COMMA} passagerare
-STR_0050_TON_OF_COAL                                            :{COMMA} ton kol
-STR_0051_BAG_OF_MAIL                                            :{COMMA} postsäck{P "" ar}
-STR_0052_OF_OIL                                                 :{VOLUME} olja
-STR_0053_ITEM_OF_LIVESTOCK                                      :{COMMA} boskap
-STR_0054_CRATE_OF_GOODS                                         :{COMMA} låd{P a or} 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{P "" ar}
-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{P "" ar}
-STR_005E_TON_OF_FOOD                                            :{COMMA} ton mat
-STR_005F_TON_OF_PAPER                                           :{COMMA} ton papper
-STR_0060_BAG_OF_GOLD                                            :{COMMA} guldsäck{P "" ar}
-STR_0061_OF_WATER                                               :{VOLUME} vatten
-STR_0062_TON_OF_WHEAT                                           :{COMMA} ton vete
-STR_0063_OF_RUBBER                                              :{VOLUME} gummi
-STR_0064_TON_OF_SUGAR                                           :{COMMA} ton socker
-STR_0065_TOY                                                    :{COMMA} leksak{P "" er}
-STR_0066_BAG_OF_CANDY                                           :{COMMA} godispås{P e ar}
-STR_0067_OF_COLA                                                :{VOLUME} kola
-STR_0068_TON_OF_COTTON_CANDY                                    :{COMMA} ton spunnet socker
-STR_0069_BUBBLE                                                 :{COMMA} bubbl{P a or}
-STR_006A_TON_OF_TOFFEE                                          :{COMMA} ton knäck
-STR_006B_BATTERY                                                :{COMMA} batteri{P "" er}
-STR_006C_OF_PLASTIC                                             :{VOLUME} plast
-STR_006D_FIZZY_DRINK                                            :{COMMA} läsk
-STR_008E                                                        :
-STR_008F_PS                                                     :{TINYFONT}PS
-STR_0090_CL                                                     :{TINYFONT}KL
-STR_0091_ML                                                     :{TINYFONT}PO
-STR_0092_OL                                                     :{TINYFONT}OL
-STR_0093_LV                                                     :{TINYFONT}BO
-STR_0094_GD                                                     :{TINYFONT}GD
-STR_0095_GR                                                     :{TINYFONT}SP
-STR_0096_WD                                                     :{TINYFONT}TI
-STR_0097_OR                                                     :{TINYFONT}JÄ
-STR_0098_ST                                                     :{TINYFONT}ST
-STR_0099_VL                                                     :{TINYFONT}VÄ
-STR_009A_CO                                                     :{TINYFONT}KO
-STR_009B_MZ                                                     :{TINYFONT}MA
-STR_009C_FT                                                     :{TINYFONT}FR
-STR_009D_DM                                                     :{TINYFONT}DI
-STR_009E_FD                                                     :{TINYFONT}MT
-STR_009F_PR                                                     :{TINYFONT}PA
-STR_00A0_GD                                                     :{TINYFONT}GL
-STR_00A1_WR                                                     :{TINYFONT}VA
-STR_00A2_WH                                                     :{TINYFONT}VE
-STR_00A3_RB                                                     :{TINYFONT}GU
-STR_00A4_SG                                                     :{TINYFONT}SO
-STR_00A5_TY                                                     :{TINYFONT}LE
-STR_00A6_SW                                                     :{TINYFONT}GO
-STR_00A7_CL                                                     :{TINYFONT}KA
-STR_00A8_CF                                                     :{TINYFONT}SS
-STR_00A9_BU                                                     :{TINYFONT}BU
-STR_00AA_TF                                                     :{TINYFONT}KN
-STR_00AB_BA                                                     :{TINYFONT}BA
-STR_00AC_PL                                                     :{TINYFONT}PL
-STR_00AD_FZ                                                     :{TINYFONT}LÄ
+STR_QUANTITY_NOTHING                                            :
+STR_QUANTITY_PASSENGERS                                         :{COMMA} passagerare
+STR_QUANTITY_COAL                                               :{COMMA} ton kol
+STR_QUANTITY_MAIL                                               :{COMMA} postsäck{P "" ar}
+STR_QUANTITY_OIL                                                :{VOLUME} olja
+STR_QUANTITY_LIVESTOCK                                          :{COMMA} boskap
+STR_QUANTITY_GOODS                                              :{COMMA} låd{P a or} gods
+STR_QUANTITY_GRAIN                                              :{COMMA} ton spannmål
+STR_QUANTITY_WOOD                                               :{COMMA} ton timmer
+STR_QUANTITY_IRON_ORE                                           :{COMMA} ton järnmalm
+STR_QUANTITY_STEEL                                              :{COMMA} ton stål
+STR_QUANTITY_VALUABLES                                          :{COMMA} värdesäck{P "" ar}
+STR_QUANTITY_COPPER_ORE                                         :{COMMA} ton kopparmalm
+STR_QUANTITY_MAIZE                                              :{COMMA} ton majs
+STR_QUANTITY_FRUIT                                              :{COMMA} ton frukt
+STR_QUANTITY_DIAMONDS                                           :{COMMA} diamantsäck{P "" ar}
+STR_QUANTITY_FOOD                                               :{COMMA} ton mat
+STR_QUANTITY_PAPER                                              :{COMMA} ton papper
+STR_QUANTITY_GOLD                                               :{COMMA} guldsäck{P "" ar}
+STR_QUANTITY_WATER                                              :{VOLUME} vatten
+STR_QUANTITY_WHEAT                                              :{COMMA} ton vete
+STR_QUANTITY_RUBBER                                             :{VOLUME} gummi
+STR_QUANTITY_SUGAR                                              :{COMMA} ton socker
+STR_QUANTITY_TOYS                                               :{COMMA} leksak{P "" er}
+STR_QUANTITY_SWEETS                                             :{COMMA} godispås{P e ar}
+STR_QUANTITY_COLA                                               :{VOLUME} kola
+STR_QUANTITY_CANDYFLOSS                                         :{COMMA} ton spunnet socker
+STR_QUANTITY_BUBBLES                                            :{COMMA} bubbl{P a or}
+STR_QUANTITY_TOFFEE                                             :{COMMA} ton knäck
+STR_QUANTITY_BATTERIES                                          :{COMMA} batteri{P "" er}
+STR_QUANTITY_PLASTIC                                            :{VOLUME} plast
+STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA} läsk
+STR_ABBREV_NOTHING                                              :
+STR_ABBREV_PASSENGERS                                           :{TINYFONT}PS
+STR_ABBREV_COAL                                                 :{TINYFONT}KL
+STR_ABBREV_MAIL                                                 :{TINYFONT}PO
+STR_ABBREV_OIL                                                  :{TINYFONT}OL
+STR_ABBREV_LIVESTOCK                                            :{TINYFONT}BO
+STR_ABBREV_GOODS                                                :{TINYFONT}GD
+STR_ABBREV_GRAIN                                                :{TINYFONT}SP
+STR_ABBREV_WOOD                                                 :{TINYFONT}TI
+STR_ABBREV_IRON_ORE                                             :{TINYFONT}JÄ
+STR_ABBREV_STEEL                                                :{TINYFONT}ST
+STR_ABBREV_VALUABLES                                            :{TINYFONT}VÄ
+STR_ABBREV_COPPER_ORE                                           :{TINYFONT}KO
+STR_ABBREV_MAIZE                                                :{TINYFONT}MA
+STR_ABBREV_FRUIT                                                :{TINYFONT}FR
+STR_ABBREV_DIAMONDS                                             :{TINYFONT}DI
+STR_ABBREV_FOOD                                                 :{TINYFONT}MT
+STR_ABBREV_PAPER                                                :{TINYFONT}PA
+STR_ABBREV_GOLD                                                 :{TINYFONT}GL
+STR_ABBREV_WATER                                                :{TINYFONT}VA
+STR_ABBREV_WHEAT                                                :{TINYFONT}VE
+STR_ABBREV_RUBBER                                               :{TINYFONT}GU
+STR_ABBREV_SUGAR                                                :{TINYFONT}SO
+STR_ABBREV_TOYS                                                 :{TINYFONT}LE
+STR_ABBREV_SWEETS                                               :{TINYFONT}GO
+STR_ABBREV_COLA                                                 :{TINYFONT}KA
+STR_ABBREV_CANDYFLOSS                                           :{TINYFONT}SS
+STR_ABBREV_BUBBLES                                              :{TINYFONT}BU
+STR_ABBREV_TOFFEE                                               :{TINYFONT}KN
+STR_ABBREV_BATTERIES                                            :{TINYFONT}BA
+STR_ABBREV_PLASTIC                                              :{TINYFONT}PL
+STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}LÄ
 STR_00AE                                                        :{WHITE}{DATE_SHORT}
 STR_00AF                                                        :{WHITE}{DATE_LONG}
 STR_00B0_MAP                                                    :{WHITE}Karta - {STRING}
diff --git a/lang/turkish.txt b/lang/turkish.txt
index 7ba0c2782..4f313e575 100644
--- a/lang/turkish.txt
+++ b/lang/turkish.txt
@@ -82,70 +82,70 @@ STR_004A_TOFFEE                                                 :Bonbon
 STR_004B_BATTERY                                                :Pil
 STR_004C_PLASTIC                                                :Plastik
 STR_004D_FIZZY_DRINK                                            :içecek
-STR_004E                                                        :
-STR_004F_PASSENGER                                              :{COMMA} yolcu
-STR_0050_TON_OF_COAL                                            :{COMMA} ton kömür
-STR_0051_BAG_OF_MAIL                                            :{COMMA} çanta posta
-STR_0052_OF_OIL                                                 :{VOLUME} petrol
-STR_0053_ITEM_OF_LIVESTOCK                                      :{COMMA} tane hayvan
-STR_0054_CRATE_OF_GOODS                                         :{COMMA} kasa esya
-STR_0055_TON_OF_GRAIN                                           :{COMMA} ton tahil
-STR_0056_TON_OF_WOOD                                            :{COMMA} ton odun
-STR_0057_TON_OF_IRON_ORE                                        :{COMMA} ton demir
-STR_0058_TON_OF_STEEL                                           :{COMMA} ton çelik
-STR_0059_BAG_OF_VALUABLES                                       :{COMMA} çanta mücevher
-STR_005A_TON_OF_COPPER_ORE                                      :{COMMA} ton bakir
-STR_005B_TON_OF_MAIZE                                           :{COMMA} ton misir
-STR_005C_TON_OF_FRUIT                                           :{COMMA} ton meyve
-STR_005D_BAG_OF_DIAMONDS                                        :{COMMA} canta elmas
-STR_005E_TON_OF_FOOD                                            :{COMMA} ton yiyecek
-STR_005F_TON_OF_PAPER                                           :{COMMA} ton kagit
-STR_0060_BAG_OF_GOLD                                            :{COMMA} çanta altin
-STR_0061_OF_WATER                                               :{VOLUME} su
-STR_0062_TON_OF_WHEAT                                           :{COMMA} ton un
-STR_0063_OF_RUBBER                                              :{VOLUME} lastik
-STR_0064_TON_OF_SUGAR                                           :{COMMA} ton seker
-STR_0065_TOY                                                    :{COMMA} oyuncak
-STR_0066_BAG_OF_CANDY                                           :{COMMA} canta tatli
-STR_0067_OF_COLA                                                :{VOLUME} kola
-STR_0068_TON_OF_COTTON_CANDY                                    :{COMMA} ton pamukhelva
-STR_0069_BUBBLE                                                 :{COMMA} balon
-STR_006A_TON_OF_TOFFEE                                          :{COMMA} ton bonbon
-STR_006B_BATTERY                                                :{COMMA} pil
-STR_006C_OF_PLASTIC                                             :{VOLUME} plastik
-STR_006D_FIZZY_DRINK                                            :{COMMA} içecek
-STR_008E                                                        :
-STR_008F_PS                                                     :{TINYFONT}YL
-STR_0090_CL                                                     :{TINYFONT}KÖ
-STR_0091_ML                                                     :{TINYFONT}PO
-STR_0092_OL                                                     :{TINYFONT}PE
-STR_0093_LV                                                     :{TINYFONT}HV
-STR_0094_GD                                                     :{TINYFONT}ES
-STR_0095_GR                                                     :{TINYFONT}TH
-STR_0096_WD                                                     :{TINYFONT}OD
-STR_0097_OR                                                     :{TINYFONT}DM
-STR_0098_ST                                                     :{TINYFONT}ÇE
-STR_0099_VL                                                     :{TINYFONT}MÜ
-STR_009A_CO                                                     :{TINYFONT}BK
-STR_009B_MZ                                                     :{TINYFONT}MS
-STR_009C_FT                                                     :{TINYFONT}MV
-STR_009D_DM                                                     :{TINYFONT}EL
-STR_009E_FD                                                     :{TINYFONT}YE
-STR_009F_PR                                                     :{TINYFONT}KA
-STR_00A0_GD                                                     :{TINYFONT}ES
-STR_00A1_WR                                                     :{TINYFONT}SU
-STR_00A2_WH                                                     :{TINYFONT}UN
-STR_00A3_RB                                                     :{TINYFONT}LA
-STR_00A4_SG                                                     :{TINYFONT}SK
-STR_00A5_TY                                                     :{TINYFONT}OY
-STR_00A6_SW                                                     :{TINYFONT}TA
-STR_00A7_CL                                                     :{TINYFONT}KO
-STR_00A8_CF                                                     :{TINYFONT}PH
-STR_00A9_BU                                                     :{TINYFONT}BA
-STR_00AA_TF                                                     :{TINYFONT}PH
-STR_00AB_BA                                                     :{TINYFONT}PI
-STR_00AC_PL                                                     :{TINYFONT}PL
-STR_00AD_FZ                                                     :{TINYFONT}iç
+STR_QUANTITY_NOTHING                                            :
+STR_QUANTITY_PASSENGERS                                         :{COMMA} yolcu
+STR_QUANTITY_COAL                                               :{COMMA} ton kömür
+STR_QUANTITY_MAIL                                               :{COMMA} çanta posta
+STR_QUANTITY_OIL                                                :{VOLUME} petrol
+STR_QUANTITY_LIVESTOCK                                          :{COMMA} tane hayvan
+STR_QUANTITY_GOODS                                              :{COMMA} kasa esya
+STR_QUANTITY_GRAIN                                              :{COMMA} ton tahil
+STR_QUANTITY_WOOD                                               :{COMMA} ton odun
+STR_QUANTITY_IRON_ORE                                           :{COMMA} ton demir
+STR_QUANTITY_STEEL                                              :{COMMA} ton çelik
+STR_QUANTITY_VALUABLES                                          :{COMMA} çanta mücevher
+STR_QUANTITY_COPPER_ORE                                         :{COMMA} ton bakir
+STR_QUANTITY_MAIZE                                              :{COMMA} ton misir
+STR_QUANTITY_FRUIT                                              :{COMMA} ton meyve
+STR_QUANTITY_DIAMONDS                                           :{COMMA} canta elmas
+STR_QUANTITY_FOOD                                               :{COMMA} ton yiyecek
+STR_QUANTITY_PAPER                                              :{COMMA} ton kagit
+STR_QUANTITY_GOLD                                               :{COMMA} çanta altin
+STR_QUANTITY_WATER                                              :{VOLUME} su
+STR_QUANTITY_WHEAT                                              :{COMMA} ton un
+STR_QUANTITY_RUBBER                                             :{VOLUME} lastik
+STR_QUANTITY_SUGAR                                              :{COMMA} ton seker
+STR_QUANTITY_TOYS                                               :{COMMA} oyuncak
+STR_QUANTITY_SWEETS                                             :{COMMA} canta tatli
+STR_QUANTITY_COLA                                               :{VOLUME} kola
+STR_QUANTITY_CANDYFLOSS                                         :{COMMA} ton pamukhelva
+STR_QUANTITY_BUBBLES                                            :{COMMA} balon
+STR_QUANTITY_TOFFEE                                             :{COMMA} ton bonbon
+STR_QUANTITY_BATTERIES                                          :{COMMA} pil
+STR_QUANTITY_PLASTIC                                            :{VOLUME} plastik
+STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA} içecek
+STR_ABBREV_NOTHING                                              :
+STR_ABBREV_PASSENGERS                                           :{TINYFONT}YL
+STR_ABBREV_COAL                                                 :{TINYFONT}KÖ
+STR_ABBREV_MAIL                                                 :{TINYFONT}PO
+STR_ABBREV_OIL                                                  :{TINYFONT}PE
+STR_ABBREV_LIVESTOCK                                            :{TINYFONT}HV
+STR_ABBREV_GOODS                                                :{TINYFONT}ES
+STR_ABBREV_GRAIN                                                :{TINYFONT}TH
+STR_ABBREV_WOOD                                                 :{TINYFONT}OD
+STR_ABBREV_IRON_ORE                                             :{TINYFONT}DM
+STR_ABBREV_STEEL                                                :{TINYFONT}ÇE
+STR_ABBREV_VALUABLES                                            :{TINYFONT}MÜ
+STR_ABBREV_COPPER_ORE                                           :{TINYFONT}BK
+STR_ABBREV_MAIZE                                                :{TINYFONT}MS
+STR_ABBREV_FRUIT                                                :{TINYFONT}MV
+STR_ABBREV_DIAMONDS                                             :{TINYFONT}EL
+STR_ABBREV_FOOD                                                 :{TINYFONT}YE
+STR_ABBREV_PAPER                                                :{TINYFONT}KA
+STR_ABBREV_GOLD                                                 :{TINYFONT}ES
+STR_ABBREV_WATER                                                :{TINYFONT}SU
+STR_ABBREV_WHEAT                                                :{TINYFONT}UN
+STR_ABBREV_RUBBER                                               :{TINYFONT}LA
+STR_ABBREV_SUGAR                                                :{TINYFONT}SK
+STR_ABBREV_TOYS                                                 :{TINYFONT}OY
+STR_ABBREV_SWEETS                                               :{TINYFONT}TA
+STR_ABBREV_COLA                                                 :{TINYFONT}KO
+STR_ABBREV_CANDYFLOSS                                           :{TINYFONT}PH
+STR_ABBREV_BUBBLES                                              :{TINYFONT}BA
+STR_ABBREV_TOFFEE                                               :{TINYFONT}PH
+STR_ABBREV_BATTERIES                                            :{TINYFONT}PI
+STR_ABBREV_PLASTIC                                              :{TINYFONT}PL
+STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}iç
 STR_00AE                                                        :{WHITE}{DATE_SHORT}
 STR_00AF                                                        :{WHITE}{DATE_LONG}
 STR_00B0_MAP                                                    :{WHITE}Harita - {STRING}
diff --git a/lang/unfinished/frisian.txt b/lang/unfinished/frisian.txt
index 8bdd4756b..bb5cb4ee1 100644
--- a/lang/unfinished/frisian.txt
+++ b/lang/unfinished/frisian.txt
@@ -64,21 +64,21 @@ STR_0047_COLA                                                   :Cola
 STR_004A_TOFFEE                                                 :Toffee
 STR_004B_BATTERY                                                :Batterij
 STR_004C_PLASTIC                                                :Plestik
-STR_004E                                                        :
-STR_004F_PASSENGER                                              :{COMMA} passazjier
-STR_0050_TON_OF_COAL                                            :{COMMA} ton coal
-STR_0051_BAG_OF_MAIL                                            :{COMMA} tassen mei post
-STR_0052_OF_OIL                                                 :{VOLUME} oalje
-STR_0055_TON_OF_GRAIN                                           :{COMMA} ton graan
-STR_0056_TON_OF_WOOD                                            :{COMMA} ton hout
-STR_0058_TON_OF_STEEL                                           :{COMMA} ton stiel
-STR_0059_BAG_OF_VALUABLES                                       :{COMMA} tas kostber guod
-STR_005B_TON_OF_MAIZE                                           :{COMMA} ton mais
-STR_005C_TON_OF_FRUIT                                           :{COMMA} ton fruit
-STR_005E_TON_OF_FOOD                                            :{COMMA} ton iten
-STR_005F_TON_OF_PAPER                                           :{COMMA} ton papier
-STR_0060_BAG_OF_GOLD                                            :{COMMA} tas goud
-STR_0061_OF_WATER                                               :{VOLUME} wetter
+STR_QUANTITY_NOTHING                                            :
+STR_QUANTITY_PASSENGERS                                         :{COMMA} passazjier
+STR_QUANTITY_COAL                                               :{COMMA} ton coal
+STR_QUANTITY_MAIL                                               :{COMMA} tassen mei post
+STR_QUANTITY_OIL                                                :{VOLUME} oalje
+STR_QUANTITY_GRAIN                                              :{COMMA} ton graan
+STR_QUANTITY_WOOD                                               :{COMMA} ton hout
+STR_QUANTITY_STEEL                                              :{COMMA} ton stiel
+STR_QUANTITY_VALUABLES                                          :{COMMA} tas kostber guod
+STR_QUANTITY_MAIZE                                              :{COMMA} ton mais
+STR_QUANTITY_FRUIT                                              :{COMMA} ton fruit
+STR_QUANTITY_FOOD                                               :{COMMA} ton iten
+STR_QUANTITY_PAPER                                              :{COMMA} ton papier
+STR_QUANTITY_GOLD                                               :{COMMA} tas goud
+STR_QUANTITY_WATER                                              :{VOLUME} wetter
 STR_00B2_MESSAGE                                                :{YELLOW}Bericht
 STR_00B3_MESSAGE_FROM                                           :{YELLOW}Bericht fan {STRING}
 STR_00B7_VERSION                                                :{BLACK}OpenTTD fersje {REV}
diff --git a/lang/unfinished/latvian.txt b/lang/unfinished/latvian.txt
index 538f9323c..48616dfab 100644
--- a/lang/unfinished/latvian.txt
+++ b/lang/unfinished/latvian.txt
@@ -82,70 +82,70 @@ STR_004A_TOFFEE                                                 :Cukurpla'ksni't
 STR_004B_BATTERY                                                :Baterijas
 STR_004C_PLASTIC                                                :Plastmasas
 STR_004D_FIZZY_DRINK                                            :Burbul'u'den'u
-STR_004E                                                        :
-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                                      :{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                                           :{COMMA} tonna kvies'u
-STR_0063_OF_RUBBER                                              :{VOLUME} tonna gumijas
-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                                    :{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                                            :{COMMA} burbul'u'dens
-STR_008E                                                        :
-STR_008F_PS                                                     :{TINYFONT}PA
-STR_0090_CL                                                     :{TINYFONT}OG
-STR_0091_ML                                                     :{TINYFONT}PT
-STR_0092_OL                                                     :{TINYFONT}NF
-STR_0093_LV                                                     :{TINYFONT}LL
-STR_0094_GD                                                     :{TINYFONT}PR
-STR_0095_GR                                                     :{TINYFONT}GR
-STR_0096_WD                                                     :{TINYFONT}KM
-STR_0097_OR                                                     :{TINYFONT}DZ
-STR_0098_ST                                                     :{TINYFONT}TR
-STR_0099_VL                                                     :{TINYFONT}VP
-STR_009A_CO                                                     :{TINYFONT}VR
-STR_009B_MZ                                                     :{TINYFONT}KU
-STR_009C_FT                                                     :{TINYFONT}AU
-STR_009D_DM                                                     :{TINYFONT}DM
-STR_009E_FD                                                     :{TINYFONT}PP
-STR_009F_PR                                                     :{TINYFONT}PS
-STR_00A0_GD                                                     :{TINYFONT}ZE
-STR_00A1_WR                                                     :{TINYFONT}UD
-STR_00A2_WH                                                     :{TINYFONT}KV
-STR_00A3_RB                                                     :{TINYFONT}GU
-STR_00A4_SG                                                     :{TINYFONT}CU
-STR_00A5_TY                                                     :{TINYFONT}RT
-STR_00A6_SW                                                     :{TINYFONT}SA
-STR_00A7_CL                                                     :{TINYFONT}KO
-STR_00A8_CF                                                     :{TINYFONT}CV
-STR_00A9_BU                                                     :{TINYFONT}BB
-STR_00AA_TF                                                     :{TINYFONT}CP
-STR_00AB_BA                                                     :{TINYFONT}BT
-STR_00AC_PL                                                     :{TINYFONT}PL
-STR_00AD_FZ                                                     :{TINYFONT}BU
+STR_QUANTITY_NOTHING                                            :
+STR_QUANTITY_PASSENGERS                                         :{COMMA} pasaz'ieris
+STR_QUANTITY_COAL                                               :{COMMA} tonna ogl'u
+STR_QUANTITY_MAIL                                               :{COMMA} pasta maiss
+STR_QUANTITY_OIL                                                :{VOLUME} naftas
+STR_QUANTITY_LIVESTOCK                                          :{COMMA} liellops
+STR_QUANTITY_GOODS                                              :{COMMA} prec'u kaste
+STR_QUANTITY_GRAIN                                              :{COMMA} tonna graudu
+STR_QUANTITY_WOOD                                               :{COMMA} tonna kokmaterea'lu
+STR_QUANTITY_IRON_ORE                                           :{COMMA} tonna dzelzs ru'das
+STR_QUANTITY_STEEL                                              :{COMMA} tonna te'rauda
+STR_QUANTITY_VALUABLES                                          :{COMMA} maiss ar ve'rtspapi'riem
+STR_QUANTITY_COPPER_ORE                                         :{COMMA} tonna vara ru'das
+STR_QUANTITY_MAIZE                                              :{COMMA} tonna kukuru'zas
+STR_QUANTITY_FRUIT                                              :{COMMA} tonna augl'u
+STR_QUANTITY_DIAMONDS                                           :{COMMA} maiss ar dimantiem
+STR_QUANTITY_FOOD                                               :{COMMA} tonna pa'rtikas prec'u
+STR_QUANTITY_PAPER                                              :{COMMA} tonna papi'ra
+STR_QUANTITY_GOLD                                               :{COMMA} zelta maiss
+STR_QUANTITY_WATER                                              :{VOLUME} u'dens
+STR_QUANTITY_WHEAT                                              :{COMMA} tonna kvies'u
+STR_QUANTITY_RUBBER                                             :{VOLUME} tonna gumijas
+STR_QUANTITY_SUGAR                                              :{COMMA} tonna cukura
+STR_QUANTITY_TOYS                                               :{COMMA} rotal'lieta
+STR_QUANTITY_SWEETS                                             :{COMMA} saldumu maiss
+STR_QUANTITY_COLA                                               :{VOLUME} kolas
+STR_QUANTITY_CANDYFLOSS                                         :{COMMA} tonna cukurvates
+STR_QUANTITY_BUBBLES                                            :{COMMA} burbulis
+STR_QUANTITY_TOFFEE                                             :{COMMA} tonna cukurpla'ksni's'u
+STR_QUANTITY_BATTERIES                                          :{COMMA} baterija
+STR_QUANTITY_PLASTIC                                            :{VOLUME} plastmasas
+STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA} burbul'u'dens
+STR_ABBREV_NOTHING                                              :
+STR_ABBREV_PASSENGERS                                           :{TINYFONT}PA
+STR_ABBREV_COAL                                                 :{TINYFONT}OG
+STR_ABBREV_MAIL                                                 :{TINYFONT}PT
+STR_ABBREV_OIL                                                  :{TINYFONT}NF
+STR_ABBREV_LIVESTOCK                                            :{TINYFONT}LL
+STR_ABBREV_GOODS                                                :{TINYFONT}PR
+STR_ABBREV_GRAIN                                                :{TINYFONT}GR
+STR_ABBREV_WOOD                                                 :{TINYFONT}KM
+STR_ABBREV_IRON_ORE                                             :{TINYFONT}DZ
+STR_ABBREV_STEEL                                                :{TINYFONT}TR
+STR_ABBREV_VALUABLES                                            :{TINYFONT}VP
+STR_ABBREV_COPPER_ORE                                           :{TINYFONT}VR
+STR_ABBREV_MAIZE                                                :{TINYFONT}KU
+STR_ABBREV_FRUIT                                                :{TINYFONT}AU
+STR_ABBREV_DIAMONDS                                             :{TINYFONT}DM
+STR_ABBREV_FOOD                                                 :{TINYFONT}PP
+STR_ABBREV_PAPER                                                :{TINYFONT}PS
+STR_ABBREV_GOLD                                                 :{TINYFONT}ZE
+STR_ABBREV_WATER                                                :{TINYFONT}UD
+STR_ABBREV_WHEAT                                                :{TINYFONT}KV
+STR_ABBREV_RUBBER                                               :{TINYFONT}GU
+STR_ABBREV_SUGAR                                                :{TINYFONT}CU
+STR_ABBREV_TOYS                                                 :{TINYFONT}RT
+STR_ABBREV_SWEETS                                               :{TINYFONT}SA
+STR_ABBREV_COLA                                                 :{TINYFONT}KO
+STR_ABBREV_CANDYFLOSS                                           :{TINYFONT}CV
+STR_ABBREV_BUBBLES                                              :{TINYFONT}BB
+STR_ABBREV_TOFFEE                                               :{TINYFONT}CP
+STR_ABBREV_BATTERIES                                            :{TINYFONT}BT
+STR_ABBREV_PLASTIC                                              :{TINYFONT}PL
+STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}BU
 STR_00AE                                                        :{WHITE}{DATE_SHORT}
 STR_00AF                                                        :{WHITE}{DATE_LONG}
 STR_00B0_MAP                                                    :{WHITE}Karte - {STRING}
diff --git a/lang/unfinished/lithuanian.txt b/lang/unfinished/lithuanian.txt
index 6f57c69b4..26cca0e41 100644
--- a/lang/unfinished/lithuanian.txt
+++ b/lang/unfinished/lithuanian.txt
@@ -82,69 +82,69 @@ STR_004A_TOFFEE                                                 :Karameles
 STR_004B_BATTERY                                                :Bateriju
 STR_004C_PLASTIC                                                :Plastic
 STR_004D_FIZZY_DRINK                                            :Gaiviuju gerimu
-STR_004E                                                        :
-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                                      :{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_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                                           :{COMMA} tonu kvieciu
-STR_0063_OF_RUBBER                                              :{VOLUME} kauciuko
-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                                    :{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                                            :{COMMA} gaiviuju gerimu
-STR_008E                                                        :
-STR_008F_PS                                                     :{TINYFONT}PS
-STR_0090_CL                                                     :{TINYFONT}CL
-STR_0091_ML                                                     :{TINYFONT}ML
-STR_0092_OL                                                     :{TINYFONT}OL
-STR_0093_LV                                                     :{TINYFONT}LV
-STR_0094_GD                                                     :{TINYFONT}GD
-STR_0095_GR                                                     :{TINYFONT}GR
-STR_0096_WD                                                     :{TINYFONT}WD
-STR_0097_OR                                                     :{TINYFONT}OR
-STR_0098_ST                                                     :{TINYFONT}ST
-STR_0099_VL                                                     :{TINYFONT}VL
-STR_009A_CO                                                     :{TINYFONT}CO
-STR_009B_MZ                                                     :{TINYFONT}MZ
-STR_009C_FT                                                     :{TINYFONT}FT
-STR_009D_DM                                                     :{TINYFONT}DM
-STR_009E_FD                                                     :{TINYFONT}FD
-STR_009F_PR                                                     :{TINYFONT}PR
-STR_00A0_GD                                                     :{TINYFONT}GD
-STR_00A1_WR                                                     :{TINYFONT}WR
-STR_00A2_WH                                                     :{TINYFONT}WH
-STR_00A3_RB                                                     :{TINYFONT}RB
-STR_00A4_SG                                                     :{TINYFONT}SG
-STR_00A5_TY                                                     :{TINYFONT}TY
-STR_00A6_SW                                                     :{TINYFONT}SW
-STR_00A7_CL                                                     :{TINYFONT}CL
-STR_00A8_CF                                                     :{TINYFONT}CF
-STR_00A9_BU                                                     :{TINYFONT}BU
-STR_00AA_TF                                                     :{TINYFONT}TF
-STR_00AB_BA                                                     :{TINYFONT}BA
-STR_00AC_PL                                                     :{TINYFONT}PL
-STR_00AD_FZ                                                     :{TINYFONT}FZ
+STR_QUANTITY_NOTHING                                            :
+STR_QUANTITY_PASSENGERS                                         :{COMMA} keleiviai
+STR_QUANTITY_COAL                                               :{COMMA} tonu anglies
+STR_QUANTITY_MAIL                                               :{COMMA} pasto maisu
+STR_QUANTITY_OIL                                                :{VOLUME} naftos
+STR_QUANTITY_LIVESTOCK                                          :{COMMA} galvijas
+STR_QUANTITY_GOODS                                              :{COMMA} prekiu deze
+STR_QUANTITY_GRAIN                                              :{COMMA} tonu grudu
+STR_QUANTITY_WOOD                                               :{COMMA} tonu medienos
+STR_QUANTITY_IRON_ORE                                           :{COMMA} tonu gelezies rudos
+STR_QUANTITY_STEEL                                              :{COMMA} tonu plieno
+STR_QUANTITY_COPPER_ORE                                         :{COMMA} tonu vario rudos
+STR_QUANTITY_MAIZE                                              :{COMMA} tonu kukuruzu
+STR_QUANTITY_FRUIT                                              :{COMMA} tonu vaisiu
+STR_QUANTITY_DIAMONDS                                           :{COMMA} deziu deimantu
+STR_QUANTITY_FOOD                                               :{COMMA} tonu maisto
+STR_QUANTITY_PAPER                                              :{COMMA} tonu popieriaus
+STR_QUANTITY_GOLD                                               :{COMMA} aukso kapsu
+STR_QUANTITY_WATER                                              :{VOLUME} vandens
+STR_QUANTITY_WHEAT                                              :{COMMA} tonu kvieciu
+STR_QUANTITY_RUBBER                                             :{VOLUME} kauciuko
+STR_QUANTITY_SUGAR                                              :{COMMA} tonu cukraus
+STR_QUANTITY_TOYS                                               :{COMMA} zaislu
+STR_QUANTITY_SWEETS                                             :{COMMA} saldumynu krepseliu
+STR_QUANTITY_COLA                                               :{VOLUME} Coca-Colos
+STR_QUANTITY_CANDYFLOSS                                         :{COMMA} tonu cukraus vatos
+STR_QUANTITY_BUBBLES                                            :{COMMA} burbulu
+STR_QUANTITY_TOFFEE                                             :{COMMA} tonu karameles
+STR_QUANTITY_BATTERIES                                          :{COMMA} bateriju
+STR_QUANTITY_PLASTIC                                            :{VOLUME} plastmases
+STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA} gaiviuju gerimu
+STR_ABBREV_NOTHING                                              :
+STR_ABBREV_PASSENGERS                                           :{TINYFONT}PS
+STR_ABBREV_COAL                                                 :{TINYFONT}CL
+STR_ABBREV_MAIL                                                 :{TINYFONT}ML
+STR_ABBREV_OIL                                                  :{TINYFONT}OL
+STR_ABBREV_LIVESTOCK                                            :{TINYFONT}LV
+STR_ABBREV_GOODS                                                :{TINYFONT}GD
+STR_ABBREV_GRAIN                                                :{TINYFONT}GR
+STR_ABBREV_WOOD                                                 :{TINYFONT}WD
+STR_ABBREV_IRON_ORE                                             :{TINYFONT}OR
+STR_ABBREV_STEEL                                                :{TINYFONT}ST
+STR_ABBREV_VALUABLES                                            :{TINYFONT}VL
+STR_ABBREV_COPPER_ORE                                           :{TINYFONT}CO
+STR_ABBREV_MAIZE                                                :{TINYFONT}MZ
+STR_ABBREV_FRUIT                                                :{TINYFONT}FT
+STR_ABBREV_DIAMONDS                                             :{TINYFONT}DM
+STR_ABBREV_FOOD                                                 :{TINYFONT}FD
+STR_ABBREV_PAPER                                                :{TINYFONT}PR
+STR_ABBREV_GOLD                                                 :{TINYFONT}GD
+STR_ABBREV_WATER                                                :{TINYFONT}WR
+STR_ABBREV_WHEAT                                                :{TINYFONT}WH
+STR_ABBREV_RUBBER                                               :{TINYFONT}RB
+STR_ABBREV_SUGAR                                                :{TINYFONT}SG
+STR_ABBREV_TOYS                                                 :{TINYFONT}TY
+STR_ABBREV_SWEETS                                               :{TINYFONT}SW
+STR_ABBREV_COLA                                                 :{TINYFONT}CL
+STR_ABBREV_CANDYFLOSS                                           :{TINYFONT}CF
+STR_ABBREV_BUBBLES                                              :{TINYFONT}BU
+STR_ABBREV_TOFFEE                                               :{TINYFONT}TF
+STR_ABBREV_BATTERIES                                            :{TINYFONT}BA
+STR_ABBREV_PLASTIC                                              :{TINYFONT}PL
+STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}FZ
 STR_00AE                                                        :{WHITE}{DATE_SHORT}
 STR_00AF                                                        :{WHITE}{DATE_LONG}
 STR_00B0_MAP                                                    :{WHITE}Zemelapis - {STRING}
diff --git a/lang/unfinished/russian.txt b/lang/unfinished/russian.txt
index 3db02f989..f7bfb47a0 100644
--- a/lang/unfinished/russian.txt
+++ b/lang/unfinished/russian.txt
@@ -82,46 +82,46 @@ STR_004A_TOFFEE                                                 :Iriska
 STR_004B_BATTERY                                                :Batareyki
 STR_004C_PLASTIC                                                :Plastik
 STR_004D_FIZZY_DRINK                                            :Shipuchie napitki
-STR_004E                                                        :
-STR_004F_PASSENGER                                              :{COMMA} passajirov
-STR_0050_TON_OF_COAL                                            :{COMMA} tonna uglya
-STR_0051_BAG_OF_MAIL                                            :{COMMA} sumka s pochtoy
-STR_0052_OF_OIL                                                 :{VOLUME} nefti
-STR_0053_ITEM_OF_LIVESTOCK                                      :{COMMA} golov domashnego skota
-STR_0054_CRATE_OF_GOODS                                         :{COMMA} korobka s tovarom
-STR_0055_TON_OF_GRAIN                                           :{COMMA} tonna zerna
-STR_0056_TON_OF_WOOD                                            :{COMMA} tonna dereva
-STR_0057_TON_OF_IRON_ORE                                        :{COMMA} tonna zheleznoy rudi
-STR_0058_TON_OF_STEEL                                           :{COMMA} tonna stali
-STR_0059_BAG_OF_VALUABLES                                       :{COMMA} sumka s dragocennostyami
-STR_005A_TON_OF_COPPER_ORE                                      :{COMMA} tonna mednoy rudi
-STR_005B_TON_OF_MAIZE                                           :{COMMA} tonna kukuruzi
-STR_005C_TON_OF_FRUIT                                           :{COMMA} tonna fruktov
-STR_005D_BAG_OF_DIAMONDS                                        :{COMMA} meshok s almazami
-STR_005E_TON_OF_FOOD                                            :{COMMA} tonna prodovolstviya
-STR_005F_TON_OF_PAPER                                           :{COMMA} tonna bumagi
-STR_0060_BAG_OF_GOLD                                            :{COMMA} meshok zolota
-STR_0061_OF_WATER                                               :{VOLUME} vodi
-STR_0062_TON_OF_WHEAT                                           :{COMMA} tonna pshenici
-STR_0063_OF_RUBBER                                              :{VOLUME} rezini
-STR_0064_TON_OF_SUGAR                                           :{COMMA} tonna sahara
-STR_0065_TOY                                                    :{COMMA} igrushka
-STR_0066_BAG_OF_CANDY                                           :{COMMA} meshok sladostey
-STR_0067_OF_COLA                                                :{VOLUME} koli
-STR_0068_TON_OF_COTTON_CANDY                                    :{COMMA} tonna saharnoy vati
-STR_0069_BUBBLE                                                 :{COMMA} puzirki
-STR_006A_TON_OF_TOFFEE                                          :{COMMA} tonna irisok
-STR_006B_BATTERY                                                :{COMMA} batareyki
-STR_006C_OF_PLASTIC                                             :{VOLUME} plastika
-STR_006D_FIZZY_DRINK                                            :{COMMA} shipuchie napitki
-STR_008E                                                        :
-STR_008F_PS                                                     :{TINYFONT}PS
-STR_0090_CL                                                     :{TINYFONT}CL
-STR_0091_ML                                                     :{TINYFONT}ML
-STR_0092_OL                                                     :{TINYFONT}OL
-STR_0093_LV                                                     :{TINYFONT}LV
-STR_0094_GD                                                     :{TINYFONT}GD
-STR_0095_GR                                                     :{TINYFONT}GR
+STR_QUANTITY_NOTHING                                            :
+STR_QUANTITY_PASSENGERS                                         :{COMMA} passajirov
+STR_QUANTITY_COAL                                               :{COMMA} tonna uglya
+STR_QUANTITY_MAIL                                               :{COMMA} sumka s pochtoy
+STR_QUANTITY_OIL                                                :{VOLUME} nefti
+STR_QUANTITY_LIVESTOCK                                          :{COMMA} golov domashnego skota
+STR_QUANTITY_GOODS                                              :{COMMA} korobka s tovarom
+STR_QUANTITY_GRAIN                                              :{COMMA} tonna zerna
+STR_QUANTITY_WOOD                                               :{COMMA} tonna dereva
+STR_QUANTITY_IRON_ORE                                           :{COMMA} tonna zheleznoy rudi
+STR_QUANTITY_STEEL                                              :{COMMA} tonna stali
+STR_QUANTITY_VALUABLES                                          :{COMMA} sumka s dragocennostyami
+STR_QUANTITY_COPPER_ORE                                         :{COMMA} tonna mednoy rudi
+STR_QUANTITY_MAIZE                                              :{COMMA} tonna kukuruzi
+STR_QUANTITY_FRUIT                                              :{COMMA} tonna fruktov
+STR_QUANTITY_DIAMONDS                                           :{COMMA} meshok s almazami
+STR_QUANTITY_FOOD                                               :{COMMA} tonna prodovolstviya
+STR_QUANTITY_PAPER                                              :{COMMA} tonna bumagi
+STR_QUANTITY_GOLD                                               :{COMMA} meshok zolota
+STR_QUANTITY_WATER                                              :{VOLUME} vodi
+STR_QUANTITY_WHEAT                                              :{COMMA} tonna pshenici
+STR_QUANTITY_RUBBER                                             :{VOLUME} rezini
+STR_QUANTITY_SUGAR                                              :{COMMA} tonna sahara
+STR_QUANTITY_TOYS                                               :{COMMA} igrushka
+STR_QUANTITY_SWEETS                                             :{COMMA} meshok sladostey
+STR_QUANTITY_COLA                                               :{VOLUME} koli
+STR_QUANTITY_CANDYFLOSS                                         :{COMMA} tonna saharnoy vati
+STR_QUANTITY_BUBBLES                                            :{COMMA} puzirki
+STR_QUANTITY_TOFFEE                                             :{COMMA} tonna irisok
+STR_QUANTITY_BATTERIES                                          :{COMMA} batareyki
+STR_QUANTITY_PLASTIC                                            :{VOLUME} plastika
+STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA} shipuchie napitki
+STR_ABBREV_NOTHING                                              :
+STR_ABBREV_PASSENGERS                                           :{TINYFONT}PS
+STR_ABBREV_COAL                                                 :{TINYFONT}CL
+STR_ABBREV_MAIL                                                 :{TINYFONT}ML
+STR_ABBREV_OIL                                                  :{TINYFONT}OL
+STR_ABBREV_LIVESTOCK                                            :{TINYFONT}LV
+STR_ABBREV_GOODS                                                :{TINYFONT}GD
+STR_ABBREV_GRAIN                                                :{TINYFONT}GR
 STR_00AF                                                        :{WHITE}{DATE_LONG}
 STR_00B0_MAP                                                    :{WHITE}Karta - {STRING}
 STR_00B1_GAME_OPTIONS                                           :{WHITE}Igrovie Opcii
diff --git a/lang/unfinished/slovenian.txt b/lang/unfinished/slovenian.txt
index 21cc5333c..cbc6412b2 100644
--- a/lang/unfinished/slovenian.txt
+++ b/lang/unfinished/slovenian.txt
@@ -82,69 +82,69 @@ STR_004A_TOFFEE                                                 :karamela
 STR_004B_BATTERY                                                :baterija
 STR_004C_PLASTIC                                                :plastika
 STR_004D_FIZZY_DRINK                                            :gazirana pijaca
-STR_004E                                                        :
-STR_004F_PASSENGER                                              :{COMMA} potnikov
-STR_0050_TON_OF_COAL                                            :{COMMA} ton premoga
-STR_0051_BAG_OF_MAIL                                            :{COMMA} vrec poste
-STR_0052_OF_OIL                                                 :{VOLUME} nafte
-STR_0053_ITEM_OF_LIVESTOCK                                      :{COMMA} glav zivine
-STR_0054_CRATE_OF_GOODS                                         :{COMMA} gajb tovora
-STR_0055_TON_OF_GRAIN                                           :{COMMA} ton zita
-STR_0057_TON_OF_IRON_ORE                                        :{COMMA} ton zelezove rude
-STR_0058_TON_OF_STEEL                                           :{COMMA} ton jekla
-STR_0059_BAG_OF_VALUABLES                                       :{COMMA} vrec dragocenosti
-STR_005A_TON_OF_COPPER_ORE                                      :{COMMA} ton bakrove rude
-STR_005B_TON_OF_MAIZE                                           :{COMMA} ton koruze
-STR_005C_TON_OF_FRUIT                                           :{COMMA} ton sadja
-STR_005D_BAG_OF_DIAMONDS                                        :{COMMA} vrec diamantov
-STR_005E_TON_OF_FOOD                                            :{COMMA} ton hrane
-STR_005F_TON_OF_PAPER                                           :{COMMA} ton papirja
-STR_0060_BAG_OF_GOLD                                            :{COMMA} vrec zlata
-STR_0061_OF_WATER                                               :{VOLUME} vode
-STR_0062_TON_OF_WHEAT                                           :{COMMA} ton psenice
-STR_0063_OF_RUBBER                                              :{VOLUME} gume
-STR_0064_TON_OF_SUGAR                                           :{COMMA} ton sladkorja
-STR_0065_TOY                                                    :{COMMA} igrac
-STR_0066_BAG_OF_CANDY                                           :{COMMA} vrec bombonov
-STR_0067_OF_COLA                                                :{VOLUME} cockte
-STR_0068_TON_OF_COTTON_CANDY                                    :{COMMA} ton sladkorne pene
-STR_0069_BUBBLE                                                 :{COMMA} balonckov
-STR_006A_TON_OF_TOFFEE                                          :{COMMA} ton karamele
-STR_006B_BATTERY                                                :{COMMA} baterij
-STR_006C_OF_PLASTIC                                             :{VOLUME} plastike
-STR_006D_FIZZY_DRINK                                            :{COMMA} gaziranih pijac
-STR_008E                                                        :
-STR_008F_PS                                                     :{TINYFONT}PO
-STR_0090_CL                                                     :{TINYFONT}PR
-STR_0091_ML                                                     :{TINYFONT}PS
-STR_0092_OL                                                     :{TINYFONT}NF
-STR_0093_LV                                                     :{TINYFONT}ZV
-STR_0094_GD                                                     :{TINYFONT}TO
-STR_0095_GR                                                     :{TINYFONT}ZT
-STR_0096_WD                                                     :{TINYFONT}LS
-STR_0097_OR                                                     :{TINYFONT}ZZ
-STR_0098_ST                                                     :{TINYFONT}JK
-STR_0099_VL                                                     :{TINYFONT}DR
-STR_009A_CO                                                     :{TINYFONT}BK
-STR_009B_MZ                                                     :{TINYFONT}KZ
-STR_009C_FT                                                     :{TINYFONT}SJ
-STR_009D_DM                                                     :{TINYFONT}DM
-STR_009E_FD                                                     :{TINYFONT}HR
-STR_009F_PR                                                     :{TINYFONT}PR
-STR_00A0_GD                                                     :{TINYFONT}ZL
-STR_00A1_WR                                                     :{TINYFONT}VO
-STR_00A2_WH                                                     :{TINYFONT}PN
-STR_00A3_RB                                                     :{TINYFONT}GU
-STR_00A4_SG                                                     :{TINYFONT}SK
-STR_00A5_TY                                                     :{TINYFONT}IG
-STR_00A6_SW                                                     :{TINYFONT}BB
-STR_00A7_CL                                                     :{TINYFONT}CL
-STR_00A8_CF                                                     :{TINYFONT}SP
-STR_00A9_BU                                                     :{TINYFONT}BL
-STR_00AA_TF                                                     :{TINYFONT}KA
-STR_00AB_BA                                                     :{TINYFONT}BA
-STR_00AC_PL                                                     :{TINYFONT}PL
-STR_00AD_FZ                                                     :{TINYFONT}GP
+STR_QUANTITY_NOTHING                                            :
+STR_QUANTITY_PASSENGERS                                         :{COMMA} potnikov
+STR_QUANTITY_COAL                                               :{COMMA} ton premoga
+STR_QUANTITY_MAIL                                               :{COMMA} vrec poste
+STR_QUANTITY_OIL                                                :{VOLUME} nafte
+STR_QUANTITY_LIVESTOCK                                          :{COMMA} glav zivine
+STR_QUANTITY_GOODS                                              :{COMMA} gajb tovora
+STR_QUANTITY_GRAIN                                              :{COMMA} ton zita
+STR_QUANTITY_IRON_ORE                                           :{COMMA} ton zelezove rude
+STR_QUANTITY_STEEL                                              :{COMMA} ton jekla
+STR_QUANTITY_VALUABLES                                          :{COMMA} vrec dragocenosti
+STR_QUANTITY_COPPER_ORE                                         :{COMMA} ton bakrove rude
+STR_QUANTITY_MAIZE                                              :{COMMA} ton koruze
+STR_QUANTITY_FRUIT                                              :{COMMA} ton sadja
+STR_QUANTITY_DIAMONDS                                           :{COMMA} vrec diamantov
+STR_QUANTITY_FOOD                                               :{COMMA} ton hrane
+STR_QUANTITY_PAPER                                              :{COMMA} ton papirja
+STR_QUANTITY_GOLD                                               :{COMMA} vrec zlata
+STR_QUANTITY_WATER                                              :{VOLUME} vode
+STR_QUANTITY_WHEAT                                              :{COMMA} ton psenice
+STR_QUANTITY_RUBBER                                             :{VOLUME} gume
+STR_QUANTITY_SUGAR                                              :{COMMA} ton sladkorja
+STR_QUANTITY_TOYS                                               :{COMMA} igrac
+STR_QUANTITY_SWEETS                                             :{COMMA} vrec bombonov
+STR_QUANTITY_COLA                                               :{VOLUME} cockte
+STR_QUANTITY_CANDYFLOSS                                         :{COMMA} ton sladkorne pene
+STR_QUANTITY_BUBBLES                                            :{COMMA} balonckov
+STR_QUANTITY_TOFFEE                                             :{COMMA} ton karamele
+STR_QUANTITY_BATTERIES                                          :{COMMA} baterij
+STR_QUANTITY_PLASTIC                                            :{VOLUME} plastike
+STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA} gaziranih pijac
+STR_ABBREV_NOTHING                                              :
+STR_ABBREV_PASSENGERS                                           :{TINYFONT}PO
+STR_ABBREV_COAL                                                 :{TINYFONT}PR
+STR_ABBREV_MAIL                                                 :{TINYFONT}PS
+STR_ABBREV_OIL                                                  :{TINYFONT}NF
+STR_ABBREV_LIVESTOCK                                            :{TINYFONT}ZV
+STR_ABBREV_GOODS                                                :{TINYFONT}TO
+STR_ABBREV_GRAIN                                                :{TINYFONT}ZT
+STR_ABBREV_WOOD                                                 :{TINYFONT}LS
+STR_ABBREV_IRON_ORE                                             :{TINYFONT}ZZ
+STR_ABBREV_STEEL                                                :{TINYFONT}JK
+STR_ABBREV_VALUABLES                                            :{TINYFONT}DR
+STR_ABBREV_COPPER_ORE                                           :{TINYFONT}BK
+STR_ABBREV_MAIZE                                                :{TINYFONT}KZ
+STR_ABBREV_FRUIT                                                :{TINYFONT}SJ
+STR_ABBREV_DIAMONDS                                             :{TINYFONT}DM
+STR_ABBREV_FOOD                                                 :{TINYFONT}HR
+STR_ABBREV_PAPER                                                :{TINYFONT}PR
+STR_ABBREV_GOLD                                                 :{TINYFONT}ZL
+STR_ABBREV_WATER                                                :{TINYFONT}VO
+STR_ABBREV_WHEAT                                                :{TINYFONT}PN
+STR_ABBREV_RUBBER                                               :{TINYFONT}GU
+STR_ABBREV_SUGAR                                                :{TINYFONT}SK
+STR_ABBREV_TOYS                                                 :{TINYFONT}IG
+STR_ABBREV_SWEETS                                               :{TINYFONT}BB
+STR_ABBREV_COLA                                                 :{TINYFONT}CL
+STR_ABBREV_CANDYFLOSS                                           :{TINYFONT}SP
+STR_ABBREV_BUBBLES                                              :{TINYFONT}BL
+STR_ABBREV_TOFFEE                                               :{TINYFONT}KA
+STR_ABBREV_BATTERIES                                            :{TINYFONT}BA
+STR_ABBREV_PLASTIC                                              :{TINYFONT}PL
+STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}GP
 STR_00AE                                                        :{WHITE}{DATE_SHORT}
 STR_00AF                                                        :{WHITE}{DATE_LONG}
 STR_00B0_MAP                                                    :{WHITE}Mapa - {STRING}