(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

5 files changed, 245 insertions, 245 deletions

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}