(svn r3560) Restore plural forms of cargo types for several languages.

I extracted the info from 2614:2615.
If you speak one of the languages, please check if the changes are correct.

11 files changed, 220 insertions, 220 deletions

diff --git a/lang/brazilian_portuguese.txt b/lang/brazilian_portuguese.txt
index ffa032d24..235933082 100644
--- a/lang/brazilian_portuguese.txt
+++ b/lang/brazilian_portuguese.txt
@@ -83,37 +83,37 @@ STR_004B_BATTERY                                                :Baterias
 STR_004C_PLASTIC                                                :Plástico
 STR_004D_FIZZY_DRINK                                            :Bebidas Gasosas
 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_PASSENGERS                                         :{COMMA} passageiro{P "" s}
+STR_QUANTITY_COAL                                               :{COMMA} tonelada{P "" s} de carvão
+STR_QUANTITY_MAIL                                               :{COMMA} saco{P "" s} de correspondências
 STR_QUANTITY_OIL                                                :{VOLUME} de petróleo
-STR_QUANTITY_LIVESTOCK                                          :{COMMA} insumo de gado
+STR_QUANTITY_LIVESTOCK                                          :{COMMA} insumo{P "" s} 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_GRAIN                                              :{COMMA} tonelada{P "" s} de cereais
+STR_QUANTITY_WOOD                                               :{COMMA} tonelada{P "" s} de madeira
+STR_QUANTITY_IRON_ORE                                           :{COMMA} tonelada{P "" s} de minério de ferro
+STR_QUANTITY_STEEL                                              :{COMMA} tonelada{P "" s} de aço
+STR_QUANTITY_VALUABLES                                          :{COMMA} saco{P "" s} de valores
+STR_QUANTITY_COPPER_ORE                                         :{COMMA} tonelada{P "" s} de minério de cobre
+STR_QUANTITY_MAIZE                                              :{COMMA} tonelada{P "" s} de milho
+STR_QUANTITY_FRUIT                                              :{COMMA} tonelada{P "" s} de fruta
+STR_QUANTITY_DIAMONDS                                           :{COMMA} saco{P "" s} de diamantes
+STR_QUANTITY_FOOD                                               :{COMMA} tonelada{P "" s} de comida
+STR_QUANTITY_PAPER                                              :{COMMA} tonelada{P "" s} de papel
+STR_QUANTITY_GOLD                                               :{COMMA} saco{P "" s} de ouro
 STR_QUANTITY_WATER                                              :{VOLUME} de água
-STR_QUANTITY_WHEAT                                              :{COMMA} tonelada de trigo
+STR_QUANTITY_WHEAT                                              :{COMMA} tonelada{P "" s} 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_SUGAR                                              :{COMMA} tonelada{P "" s} de açúcar
+STR_QUANTITY_TOYS                                               :{COMMA} brinquedo{P "" s}
+STR_QUANTITY_SWEETS                                             :{COMMA} saco{P "" s} 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_CANDYFLOSS                                         :{COMMA} tonelada{P "" s} de algodão doce
+STR_QUANTITY_BUBBLES                                            :{COMMA} bolha{P "" s}
+STR_QUANTITY_TOFFEE                                             :{COMMA} tonelada{P "" s} de caramelo
+STR_QUANTITY_BATTERIES                                          :{COMMA} bateria{P "" s}
 STR_QUANTITY_PLASTIC                                            :{VOLUME} de plástico
-STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA} Bebida Gasosa
+STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA} bebida{P "" s} gasosa
 STR_ABBREV_NOTHING                                              :
 STR_ABBREV_PASSENGERS                                           :{TINYFONT}PS
 STR_ABBREV_COAL                                                 :{TINYFONT}CL
diff --git a/lang/catalan.txt b/lang/catalan.txt
index 6e752bb74..31783d1d0 100644
--- a/lang/catalan.txt
+++ b/lang/catalan.txt
@@ -83,37 +83,37 @@ STR_004B_BATTERY                                                :Pila
 STR_004C_PLASTIC                                                :Plàstic
 STR_004D_FIZZY_DRINK                                            :Beguda Gasosa
 STR_QUANTITY_NOTHING                                            :
-STR_QUANTITY_PASSENGERS                                         :{COMMA} passatger
-STR_QUANTITY_COAL                                               :{COMMA} tona de carbó
-STR_QUANTITY_MAIL                                               :{COMMA} saca de correu
+STR_QUANTITY_PASSENGERS                                         :{COMMA} passatger{P "" s}
+STR_QUANTITY_COAL                                               :{COMMA} ton{P a es} de carbó
+STR_QUANTITY_MAIL                                               :{COMMA} sa{P ca ques} 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_LIVESTOCK                                          :{COMMA} cap{P "" s} de bestiar
+STR_QUANTITY_GOODS                                              :{COMMA} palet{P "" s} de mercaderies
+STR_QUANTITY_GRAIN                                              :{COMMA} ton{P a es} de gra
+STR_QUANTITY_WOOD                                               :{COMMA} ton{P a es} de fusta
+STR_QUANTITY_IRON_ORE                                           :{COMMA} ton{P a es} de mineral de ferro
+STR_QUANTITY_STEEL                                              :{COMMA} ton{P a es} d'acer
+STR_QUANTITY_VALUABLES                                          :{COMMA} sa{P ca ques} de valors
+STR_QUANTITY_COPPER_ORE                                         :{COMMA} ton{P a es} de mineral de coure
+STR_QUANTITY_MAIZE                                              :{COMMA} ton{P a es} de blat de moro
+STR_QUANTITY_FRUIT                                              :{COMMA} ton{P a es} de fruita
+STR_QUANTITY_DIAMONDS                                           :{COMMA} boss{P a es} de diamants
+STR_QUANTITY_FOOD                                               :{COMMA} ton{P a es} de queviures
+STR_QUANTITY_PAPER                                              :{COMMA} ton{P a es} de paper
+STR_QUANTITY_GOLD                                               :{COMMA} sa{P ca ques} d'or
 STR_QUANTITY_WATER                                              :{VOLUME} d'aigua
-STR_QUANTITY_WHEAT                                              :{COMMA} tona de blat
+STR_QUANTITY_WHEAT                                              :{COMMA} ton{P a es} 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_SUGAR                                              :{COMMA} ton{P a es} de sucre
+STR_QUANTITY_TOYS                                               :{COMMA} joguin{P a es}
+STR_QUANTITY_SWEETS                                             :{COMMA} boss{P a es} 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_CANDYFLOSS                                         :{COMMA} ton{P a es} de cotó de sucre
+STR_QUANTITY_BUBBLES                                            :{COMMA} bomboll{P a es}
+STR_QUANTITY_TOFFEE                                             :{COMMA} ton{P a es} de caramel
+STR_QUANTITY_BATTERIES                                          :{COMMA} pil{P a es}
 STR_QUANTITY_PLASTIC                                            :{VOLUME} de plàstic
-STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA} beguda gasosa
+STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA} begud{P a es} gasosa
 STR_ABBREV_NOTHING                                              :
 STR_ABBREV_PASSENGERS                                           :{TINYFONT}PS
 STR_ABBREV_COAL                                                 :{TINYFONT}CB
diff --git a/lang/danish.txt b/lang/danish.txt
index a336fe10f..39ad8ba9e 100644
--- a/lang/danish.txt
+++ b/lang/danish.txt
@@ -83,35 +83,35 @@ STR_004B_BATTERY                                                :Batteri
 STR_004C_PLASTIC                                                :Plastik
 STR_004D_FIZZY_DRINK                                            :Sodavand
 STR_QUANTITY_NOTHING                                            :
-STR_QUANTITY_PASSENGERS                                         :{COMMA} passager
-STR_QUANTITY_COAL                                               :{COMMA} ton kul
-STR_QUANTITY_MAIL                                               :{COMMA} sæk post
+STR_QUANTITY_PASSENGERS                                         :{COMMA} passager{P "" er}
+STR_QUANTITY_COAL                                               :{COMMA} ton{P "" s} kul
+STR_QUANTITY_MAIL                                               :{COMMA} sæk{P "" ke} 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_GOODS                                              :{COMMA} kasse{P "" r} gods
+STR_QUANTITY_GRAIN                                              :{COMMA} ton{P "" s} korn
+STR_QUANTITY_WOOD                                               :{COMMA} ton{P "" s} træ
+STR_QUANTITY_IRON_ORE                                           :{COMMA} ton{P "" s} jernmalm
+STR_QUANTITY_STEEL                                              :{COMMA} ton{P "" s} stål
+STR_QUANTITY_VALUABLES                                          :{COMMA} sæk{P "" ke} værdigendstande
+STR_QUANTITY_COPPER_ORE                                         :{COMMA} ton{P "" s} kobbermalm
+STR_QUANTITY_MAIZE                                              :{COMMA} ton{P "" s} majs
+STR_QUANTITY_FRUIT                                              :{COMMA} ton{P "" s} frugt
+STR_QUANTITY_DIAMONDS                                           :{COMMA} sæk{P "" ke} diamanter
+STR_QUANTITY_FOOD                                               :{COMMA} ton{P "" s} mad
+STR_QUANTITY_PAPER                                              :{COMMA} ton{P "" s} papir
+STR_QUANTITY_GOLD                                               :{COMMA} sæk{P "" ke} guld
 STR_QUANTITY_WATER                                              :{VOLUME} vand
-STR_QUANTITY_WHEAT                                              :{COMMA} ton hvede
+STR_QUANTITY_WHEAT                                              :{COMMA} ton{P "" s} hvede
 STR_QUANTITY_RUBBER                                             :{VOLUME} gummi
-STR_QUANTITY_SUGAR                                              :{COMMA} ton sukker
+STR_QUANTITY_SUGAR                                              :{COMMA} ton{P "" s} sukker
 STR_QUANTITY_TOYS                                               :{COMMA} legetøj
-STR_QUANTITY_SWEETS                                             :{COMMA} sæk slik
+STR_QUANTITY_SWEETS                                             :{COMMA} sæk{P "" ke} slik
 STR_QUANTITY_COLA                                               :{VOLUME} cola
-STR_QUANTITY_CANDYFLOSS                                         :{COMMA} ton candyfloss
-STR_QUANTITY_BUBBLES                                            :{COMMA} boble
+STR_QUANTITY_CANDYFLOSS                                         :{COMMA} ton{P "" s} candyfloss
+STR_QUANTITY_BUBBLES                                            :{COMMA} boble{P "" r}
 STR_QUANTITY_TOFFEE                                             :{COMMA} ton karamel
-STR_QUANTITY_BATTERIES                                          :{COMMA} batteri
+STR_QUANTITY_BATTERIES                                          :{COMMA} batteri{P "" er}
 STR_QUANTITY_PLASTIC                                            :{VOLUME} plastik
 STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA} sodavand
 STR_ABBREV_NOTHING                                              :
diff --git a/lang/dutch.txt b/lang/dutch.txt
index 8f208bce5..5bd3ee8f5 100644
--- a/lang/dutch.txt
+++ b/lang/dutch.txt
@@ -83,37 +83,37 @@ STR_004B_BATTERY                                                :Batterij
 STR_004C_PLASTIC                                                :Plastic
 STR_004D_FIZZY_DRINK                                            :Frisdrank
 STR_QUANTITY_NOTHING                                            :
-STR_QUANTITY_PASSENGERS                                         :{COMMA} passagier
+STR_QUANTITY_PASSENGERS                                         :{COMMA} passagier{P "" s}
 STR_QUANTITY_COAL                                               :{COMMA} ton kolen
-STR_QUANTITY_MAIL                                               :{COMMA} zak post
+STR_QUANTITY_MAIL                                               :{COMMA} zak{P "" ken} post
 STR_QUANTITY_OIL                                                :{VOLUME} olie
-STR_QUANTITY_LIVESTOCK                                          :{COMMA} stuk vee
-STR_QUANTITY_GOODS                                              :{COMMA} pallet goederen
+STR_QUANTITY_LIVESTOCK                                          :{COMMA} stuk{P "" s} vee
+STR_QUANTITY_GOODS                                              :{COMMA} pallet{P "" s} 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_VALUABLES                                          :{COMMA} zak{P "" ken} 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_DIAMONDS                                           :{COMMA} zak{P "" ken} diamanten
 STR_QUANTITY_FOOD                                               :{COMMA} ton voedsel
 STR_QUANTITY_PAPER                                              :{COMMA} ton papier
-STR_QUANTITY_GOLD                                               :{COMMA} zak goud
+STR_QUANTITY_GOLD                                               :{COMMA} zak{P "" ken} 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_SWEETS                                             :{COMMA} zak{P "" ken} snoep
 STR_QUANTITY_COLA                                               :{VOLUME} cola
 STR_QUANTITY_CANDYFLOSS                                         :{COMMA} ton suikerspinnen
-STR_QUANTITY_BUBBLES                                            :{COMMA} bel
+STR_QUANTITY_BUBBLES                                            :{COMMA} bel{P "" len}
 STR_QUANTITY_TOFFEE                                             :{COMMA} ton toffee
-STR_QUANTITY_BATTERIES                                          :{COMMA} batterij
+STR_QUANTITY_BATTERIES                                          :{COMMA} batterij{P "" en}
 STR_QUANTITY_PLASTIC                                            :{VOLUME} plastic
-STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA} blikje frisdrank
+STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA} blikje{P "" s} frisdrank
 STR_ABBREV_NOTHING                                              :
 STR_ABBREV_PASSENGERS                                           :{TINYFONT}PS
 STR_ABBREV_COAL                                                 :{TINYFONT}KL
diff --git a/lang/galician.txt b/lang/galician.txt
index 99d7ae587..4607f839f 100644
--- a/lang/galician.txt
+++ b/lang/galician.txt
@@ -83,37 +83,37 @@ STR_004B_BATTERY                                                :Batería
 STR_004C_PLASTIC                                                :Plástico
 STR_004D_FIZZY_DRINK                                            :Bebida Gaseosa
 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_PASSENGERS                                         :{COMMA} pasaxeiro{P "" s}
+STR_QUANTITY_COAL                                               :{COMMA} ton{P "" s}. de carbón
+STR_QUANTITY_MAIL                                               :{COMMA} saco{P "" s} 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_LIVESTOCK                                          :{COMMA} item{P "" s} de gando
+STR_QUANTITY_GOODS                                              :{COMMA} caixón{P "" s} de mercadorías
+STR_QUANTITY_GRAIN                                              :{COMMA} ton{P "" s}. de gran
+STR_QUANTITY_WOOD                                               :{COMMA} ton{P "" s}. de madeira
+STR_QUANTITY_IRON_ORE                                           :{COMMA} ton{P "" s}. de hematita
+STR_QUANTITY_STEEL                                              :{COMMA} ton{P "" s}. de aceiro
+STR_QUANTITY_VALUABLES                                          :{COMMA} saco{P "" s} de valores
+STR_QUANTITY_COPPER_ORE                                         :{COMMA} ton{P "" s}. de mineral de cobre
+STR_QUANTITY_MAIZE                                              :{COMMA} ton{P "" s}. de millo
+STR_QUANTITY_FRUIT                                              :{COMMA} ton{P "" s}. de froita
+STR_QUANTITY_DIAMONDS                                           :{COMMA} saco{P "" s} de diamantes
+STR_QUANTITY_FOOD                                               :{COMMA} ton{P "" s}. de comida
+STR_QUANTITY_PAPER                                              :{COMMA} ton{P "" s}. de papel
+STR_QUANTITY_GOLD                                               :{COMMA} saco{P "" s} de ouro
 STR_QUANTITY_WATER                                              :{VOLUME} de auga
-STR_QUANTITY_WHEAT                                              :{COMMA} ton. de trigo
+STR_QUANTITY_WHEAT                                              :{COMMA} ton{P "" s}. 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_SUGAR                                              :{COMMA} ton{P "" s}. de azucre
+STR_QUANTITY_TOYS                                               :{COMMA} xoguete{P "" s}
+STR_QUANTITY_SWEETS                                             :{COMMA} saco{P "" s} 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_CANDYFLOSS                                         :{COMMA} ton{P "" s}. de algodón de azucre
+STR_QUANTITY_BUBBLES                                            :{COMMA} burbulla{P "" s}
+STR_QUANTITY_TOFFEE                                             :{COMMA} ton{P "" s}. de toffee
+STR_QUANTITY_BATTERIES                                          :{COMMA} batería{P "" s}
 STR_QUANTITY_PLASTIC                                            :{VOLUME} de plástico
-STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA} bebida gaseosa
+STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA} bebida{P "" s} gaseosa{P "" s}
 STR_ABBREV_NOTHING                                              :
 STR_ABBREV_PASSENGERS                                           :{TINYFONT}PS
 STR_ABBREV_COAL                                                 :{TINYFONT}CL
diff --git a/lang/icelandic.txt b/lang/icelandic.txt
index f4ce1165e..2f0128a0a 100644
--- a/lang/icelandic.txt
+++ b/lang/icelandic.txt
@@ -83,37 +83,37 @@ STR_004B_BATTERY                                                :Rafhlöðu
 STR_004C_PLASTIC                                                :Plast
 STR_004D_FIZZY_DRINK                                            :Gosdrykkja
 STR_QUANTITY_NOTHING                                            :
-STR_QUANTITY_PASSENGERS                                         :{COMMA} farþegi
+STR_QUANTITY_PASSENGERS                                         :{COMMA} farþeg{P i ar}
 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_LIVESTOCK                                          :{COMMA} nautgrip{P u i}r
+STR_QUANTITY_GOODS                                              :{COMMA} kass{P i ar} 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_VALUABLES                                          :{COMMA} pok{P i ar} 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_DIAMONDS                                           :{COMMA} pok{P i ar} 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_GOLD                                               :{COMMA} pok{P i ar} 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_TOYS                                               :{COMMA} leikf{P a ö}ng
+STR_QUANTITY_SWEETS                                             :{COMMA} pok{P i ar} 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_BUBBLES                                            :{COMMA} kúl{P a ur}
 STR_QUANTITY_TOFFEE                                             :{COMMA} tonn af toffý
-STR_QUANTITY_BATTERIES                                          :{COMMA} rafhlaða
+STR_QUANTITY_BATTERIES                                          :{COMMA} rafhl{P aða öður}
 STR_QUANTITY_PLASTIC                                            :{VOLUME} af plasti
-STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA} gosdrykkur
+STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA} gosdrykk{P u i}r
 STR_ABBREV_NOTHING                                              :
 STR_ABBREV_PASSENGERS                                           :{TINYFONT}PS
 STR_ABBREV_COAL                                                 :{TINYFONT}CL
diff --git a/lang/italian.txt b/lang/italian.txt
index 8fb9e60c2..9121f3671 100644
--- a/lang/italian.txt
+++ b/lang/italian.txt
@@ -83,35 +83,35 @@ STR_004B_BATTERY                                                :Batterie
 STR_004C_PLASTIC                                                :Plastica
 STR_004D_FIZZY_DRINK                                            :Bevande Frizzanti
 STR_QUANTITY_NOTHING                                            :
-STR_QUANTITY_PASSENGERS                                         :{COMMA} passeggero
+STR_QUANTITY_PASSENGERS                                         :{COMMA} passegger{P o i}
 STR_QUANTITY_COAL                                               :{COMMA} ton. di carbone
-STR_QUANTITY_MAIL                                               :{COMMA} sacco postale
+STR_QUANTITY_MAIL                                               :{COMMA} sacc{P o i} postal{P e i}
 STR_QUANTITY_OIL                                                :{VOLUME} di petrolio
-STR_QUANTITY_LIVESTOCK                                          :{COMMA} capo di bestiame
-STR_QUANTITY_GOODS                                              :{COMMA} cassa di beni
+STR_QUANTITY_LIVESTOCK                                          :{COMMA} cap{P o i} di bestiame
+STR_QUANTITY_GOODS                                              :{COMMA} cass{P a e} 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_VALUABLES                                          :{COMMA} bors{P a e} 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_DIAMONDS                                           :{COMMA} bors{P a e} 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_GOLD                                               :{COMMA} bors{P a e} 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_TOYS                                               :{COMMA} giocattol{P o i}
+STR_QUANTITY_SWEETS                                             :{COMMA} bust{P a e} di caramelle
 STR_QUANTITY_COLA                                               :{VOLUME} di cola
 STR_QUANTITY_CANDYFLOSS                                         :{COMMA} ton. di cotone candito
-STR_QUANTITY_BUBBLES                                            :{COMMA} bolla
+STR_QUANTITY_BUBBLES                                            :{COMMA} boll{P a e}
 STR_QUANTITY_TOFFEE                                             :{COMMA} ton. di toffee
-STR_QUANTITY_BATTERIES                                          :{COMMA} batteria
+STR_QUANTITY_BATTERIES                                          :{COMMA} batteri{P a e}
 STR_QUANTITY_PLASTIC                                            :{VOLUME} di plastica
 STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA} bibite frizzanti
 STR_ABBREV_NOTHING                                              :
diff --git a/lang/norwegian.txt b/lang/norwegian.txt
index 0be0f2960..1c47a28bd 100644
--- a/lang/norwegian.txt
+++ b/lang/norwegian.txt
@@ -83,35 +83,35 @@ STR_004B_BATTERY                                                :Batteri
 STR_004C_PLASTIC                                                :Plastikk
 STR_004D_FIZZY_DRINK                                            :Brus
 STR_QUANTITY_NOTHING                                            :
-STR_QUANTITY_PASSENGERS                                         :{COMMA} passasjer
+STR_QUANTITY_PASSENGERS                                         :{COMMA} passasjer{P "" er}
 STR_QUANTITY_COAL                                               :{COMMA} tonn kull
-STR_QUANTITY_MAIL                                               :{COMMA} postsekk
+STR_QUANTITY_MAIL                                               :{COMMA} postsekk{P "" er}
 STR_QUANTITY_OIL                                                :{VOLUME} olje
-STR_QUANTITY_LIVESTOCK                                          :{COMMA} enhet buskap
-STR_QUANTITY_GOODS                                              :{COMMA} kasse gods
+STR_QUANTITY_LIVESTOCK                                          :{COMMA} enhet{P "" er} buskap
+STR_QUANTITY_GOODS                                              :{COMMA} kasse{P "" r} 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_VALUABLES                                          :{COMMA} sekk{P "" er} 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_DIAMONDS                                           :{COMMA} sekk{P "" er} med diamanter
 STR_QUANTITY_FOOD                                               :{COMMA} tonn mat
 STR_QUANTITY_PAPER                                              :{COMMA} tonn papir
-STR_QUANTITY_GOLD                                               :{COMMA} sekk med gull
+STR_QUANTITY_GOLD                                               :{COMMA} sekk{P "" er} 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_TOYS                                               :{COMMA} leke{P "" r}
+STR_QUANTITY_SWEETS                                             :{COMMA} sekk{P "" er} med søtsaker
 STR_QUANTITY_COLA                                               :{VOLUME} cola
 STR_QUANTITY_CANDYFLOSS                                         :{COMMA} tonn sukkerspinn
-STR_QUANTITY_BUBBLES                                            :{COMMA} boble
+STR_QUANTITY_BUBBLES                                            :{COMMA} boble{P "" r}
 STR_QUANTITY_TOFFEE                                             :{COMMA} tonn karamell
-STR_QUANTITY_BATTERIES                                          :{COMMA} batteri
+STR_QUANTITY_BATTERIES                                          :{COMMA} batteri{P "" er}
 STR_QUANTITY_PLASTIC                                            :{VOLUME} plastikk
 STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA} brus
 STR_ABBREV_NOTHING                                              :
diff --git a/lang/portuguese.txt b/lang/portuguese.txt
index cb92f2a61..87d9dff56 100644
--- a/lang/portuguese.txt
+++ b/lang/portuguese.txt
@@ -83,37 +83,37 @@ STR_004B_BATTERY                                                :Baterias
 STR_004C_PLASTIC                                                :Plástico
 STR_004D_FIZZY_DRINK                                            :Bebidas Gasosas
 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_PASSENGERS                                         :{COMMA} passageiro{P "" s}
+STR_QUANTITY_COAL                                               :{COMMA} tonelada{P "" s} de carvão
+STR_QUANTITY_MAIL                                               :{COMMA} saco{P "" s} 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_LIVESTOCK                                          :{COMMA} ite{P m ns} de gado
+STR_QUANTITY_GOODS                                              :{COMMA} caixa{P "" s} de bens
+STR_QUANTITY_GRAIN                                              :{COMMA} tonelada{P "" s} de cereais
+STR_QUANTITY_WOOD                                               :{COMMA} tonelada{P "" s} de madeira
+STR_QUANTITY_IRON_ORE                                           :{COMMA} tonelada{P "" s} de minério de ferro
+STR_QUANTITY_STEEL                                              :{COMMA} tonelada{P "" s} de aço
+STR_QUANTITY_VALUABLES                                          :{COMMA} saco{P "" s} de valores
+STR_QUANTITY_COPPER_ORE                                         :{COMMA} tonelada{P "" s} de minério de cobre
+STR_QUANTITY_MAIZE                                              :{COMMA} tonelada{P "" s} de milho
+STR_QUANTITY_FRUIT                                              :{COMMA} tonelada{P "" s} de fruta
+STR_QUANTITY_DIAMONDS                                           :{COMMA} saco{P "" s} de diamantes
+STR_QUANTITY_FOOD                                               :{COMMA} tonelada{P "" s} de comida
+STR_QUANTITY_PAPER                                              :{COMMA} tonelada{P "" s} de papel
+STR_QUANTITY_GOLD                                               :{COMMA} saco{P "" s} de ouro
 STR_QUANTITY_WATER                                              :{VOLUME} de água
-STR_QUANTITY_WHEAT                                              :{COMMA} tonelada de trigo
+STR_QUANTITY_WHEAT                                              :{COMMA} tonelada{P "" s} 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_SUGAR                                              :{COMMA} tonelada{P "" s} de açúcar
+STR_QUANTITY_TOYS                                               :{COMMA} brinquedo{P "" s}
+STR_QUANTITY_SWEETS                                             :{COMMA} saco{P "" s} 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_CANDYFLOSS                                         :{COMMA} tonelada{P "" s} de algodão doce
+STR_QUANTITY_BUBBLES                                            :{COMMA} bolha{P "" s}
+STR_QUANTITY_TOFFEE                                             :{COMMA} tonelada{P "" s} 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_QUANTITY_FIZZY_DRINKS                                       :{COMMA} bebida{P "" s} gasosa{P "" s}
 STR_ABBREV_NOTHING                                              :
 STR_ABBREV_PASSENGERS                                           :{TINYFONT}PS
 STR_ABBREV_COAL                                                 :{TINYFONT}CL
diff --git a/lang/romanian.txt b/lang/romanian.txt
index 487d371ea..546f4e8eb 100644
--- a/lang/romanian.txt
+++ b/lang/romanian.txt
@@ -83,37 +83,37 @@ STR_004B_BATTERY                                                :baterii
 STR_004C_PLASTIC                                                :plastic
 STR_004D_FIZZY_DRINK                                            :suc
 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_PASSENGERS                                         :{COMMA} cãlãtor{P "" i}
+STR_QUANTITY_COAL                                               :{COMMA} ton{P ã e} de cãrbune
+STR_QUANTITY_MAIL                                               :{COMMA} sac{P "" i} 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_LIVESTOCK                                          :{COMMA} animal{P "" e}
+STR_QUANTITY_GOODS                                              :{COMMA} pachet{P "" e} de bunuri
+STR_QUANTITY_GRAIN                                              :{COMMA} ton{P ã e} de cereale
+STR_QUANTITY_WOOD                                               :{COMMA} ton{P ã e} de lemne
+STR_QUANTITY_IRON_ORE                                           :{COMMA} ton{P ã e} de minereu de fier
+STR_QUANTITY_STEEL                                              :{COMMA} ton{P ã e} de otel
+STR_QUANTITY_VALUABLES                                          :{COMMA} cuti{P e i} de valori
+STR_QUANTITY_COPPER_ORE                                         :{COMMA} ton{P ã e} de minereu de cupru
+STR_QUANTITY_MAIZE                                              :{COMMA} ton{P ã e} de porumb
+STR_QUANTITY_FRUIT                                              :{COMMA} ton{P ã e} de fructe
+STR_QUANTITY_DIAMONDS                                           :{COMMA} sac{P "" i} cu diamante
+STR_QUANTITY_FOOD                                               :{COMMA} ton{P ã e} de alimente
+STR_QUANTITY_PAPER                                              :{COMMA} ton{P ã e} de hârtie
+STR_QUANTITY_GOLD                                               :{COMMA} sac{P "" i} cu aur
 STR_QUANTITY_WATER                                              :{VOLUME} de apã
-STR_QUANTITY_WHEAT                                              :{COMMA} tonã de grâu
+STR_QUANTITY_WHEAT                                              :{COMMA} ton{P ã e} 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_SUGAR                                              :{COMMA} ton{P ã e} de zahãr
+STR_QUANTITY_TOYS                                               :{COMMA} sac{P "" i} cu jucãrii
+STR_QUANTITY_SWEETS                                             :{COMMA} sac{P "" i} 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_CANDYFLOSS                                         :{COMMA} ton{P ã e} de vatã de zahãr
+STR_QUANTITY_BUBBLES                                            :{COMMA} balonas{P "" e}
+STR_QUANTITY_TOFFEE                                             :{COMMA} ton{P ã e} de caramel
+STR_QUANTITY_BATTERIES                                          :{COMMA} bateri{P e i}
 STR_QUANTITY_PLASTIC                                            :{VOLUME} de plastic
-STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA} bidon cu suc
+STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA} bido{P n ane} cu suc
 STR_ABBREV_NOTHING                                              :
 STR_ABBREV_PASSENGERS                                           :{TINYFONT}CL
 STR_ABBREV_COAL                                                 :{TINYFONT}CB
diff --git a/lang/spanish.txt b/lang/spanish.txt
index 9d617b51b..f8c120d8c 100644
--- a/lang/spanish.txt
+++ b/lang/spanish.txt
@@ -83,37 +83,37 @@ STR_004B_BATTERY                                                :Pilas
 STR_004C_PLASTIC                                                :Plástico
 STR_004D_FIZZY_DRINK                                            :Refresco
 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_PASSENGERS                                         :{COMMA} pasajero{P "" s}
+STR_QUANTITY_COAL                                               :{COMMA} tonelada{P "" s} de carbón
+STR_QUANTITY_MAIL                                               :{COMMA} saca{P "" s} 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_LIVESTOCK                                          :{COMMA} cabeza{P "" s} de ganado
+STR_QUANTITY_GOODS                                              :{COMMA} caja{P "" s} de mercancía{P "" s}
+STR_QUANTITY_GRAIN                                              :{COMMA} tonelada{P "" s} de grano
+STR_QUANTITY_WOOD                                               :{COMMA} tonelada{P "" s} de madera
+STR_QUANTITY_IRON_ORE                                           :{COMMA} tonelada{P "" s} de mineral de hierro
+STR_QUANTITY_STEEL                                              :{COMMA} tonelada{P "" s} de acero
+STR_QUANTITY_VALUABLES                                          :{COMMA} bolsa{P "" s} de objetos de valor
+STR_QUANTITY_COPPER_ORE                                         :{COMMA} tonelada{P "" s} de mineral de cobre
+STR_QUANTITY_MAIZE                                              :{COMMA} tonelada{P "" s} de maíz
+STR_QUANTITY_FRUIT                                              :{COMMA} tonelada{P "" s} de fruta
+STR_QUANTITY_DIAMONDS                                           :{COMMA} bolsa{P "" s} de diamantes
+STR_QUANTITY_FOOD                                               :{COMMA} tonelada{P "" s} de alimento
+STR_QUANTITY_PAPER                                              :{COMMA} tonelada{P "" s} de papel
+STR_QUANTITY_GOLD                                               :{COMMA} bolsa{P "" s} de oro
 STR_QUANTITY_WATER                                              :{VOLUME} de agua
-STR_QUANTITY_WHEAT                                              :{COMMA} tonelada de trigo
+STR_QUANTITY_WHEAT                                              :{COMMA} tonelada{P "" s} 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_SUGAR                                              :{COMMA} tonelada{P "" s} de azucar
+STR_QUANTITY_TOYS                                               :{COMMA} juguete{P "" s}
+STR_QUANTITY_SWEETS                                             :{COMMA} bolsa{P "" s} 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_CANDYFLOSS                                         :{COMMA} tonelada{P "" s} de algodón de azúcar
+STR_QUANTITY_BUBBLES                                            :{COMMA} burbuja{P "" s}
+STR_QUANTITY_TOFFEE                                             :{COMMA} tonelada{P "" s} de caramelo{P "" s}
+STR_QUANTITY_BATTERIES                                          :{COMMA} pila{P "" s}
 STR_QUANTITY_PLASTIC                                            :{VOLUME} de plástico
-STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA} refresco
+STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA} refresco{P "" s}
 STR_ABBREV_NOTHING                                              :
 STR_ABBREV_PASSENGERS                                           :{TINYFONT}PS
 STR_ABBREV_COAL                                                 :{TINYFONT}CL