summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
Diffstat (limited to 'lang')
-rw-r--r--lang/american.txt28
-rw-r--r--lang/brazilian_portuguese.txt28
-rw-r--r--lang/catalan.txt28
-rw-r--r--lang/czech.txt28
-rw-r--r--lang/danish.txt28
-rw-r--r--lang/dutch.txt28
-rw-r--r--lang/estonian.txt28
-rw-r--r--lang/finnish.txt28
-rw-r--r--lang/french.txt28
-rw-r--r--lang/galician.txt28
-rw-r--r--lang/german.txt28
-rw-r--r--lang/hungarian.txt28
-rw-r--r--lang/icelandic.txt28
-rw-r--r--lang/italian.txt28
-rw-r--r--lang/norwegian.txt28
-rw-r--r--lang/polish.txt28
-rw-r--r--lang/portuguese.txt28
-rw-r--r--lang/romanian.txt28
-rw-r--r--lang/slovak.txt28
-rw-r--r--lang/spanish.txt28
-rw-r--r--lang/swedish.txt28
-rw-r--r--lang/turkish.txt28
22 files changed, 308 insertions, 308 deletions
diff --git a/lang/american.txt b/lang/american.txt
index e764f9a90..3c2ecd862 100644
--- a/lang/american.txt
+++ b/lang/american.txt
@@ -84,33 +84,33 @@ STR_004C_PLASTIC :Plastic
STR_004D_FIZZY_DRINK :Fizzy Drink
STR_QUANTITY_NOTHING :
STR_QUANTITY_PASSENGERS :{COMMA} passenger{P "" s}
-STR_QUANTITY_COAL :{COMMA} ton{P "" s} of coal
+STR_QUANTITY_COAL :{WEIGHT} of coal
STR_QUANTITY_MAIL :{COMMA} bag{P "" s} of mail
STR_QUANTITY_OIL :{VOLUME} of oil
STR_QUANTITY_LIVESTOCK :{COMMA} item{P "" s} of livestock
STR_QUANTITY_GOODS :{COMMA} crate{P "" s} of goods
-STR_QUANTITY_GRAIN :{COMMA} ton{P "" s} of grain
-STR_QUANTITY_WOOD :{COMMA} ton{P "" s} of wood
-STR_QUANTITY_IRON_ORE :{COMMA} ton{P "" s} of iron ore
-STR_QUANTITY_STEEL :{COMMA} ton{P "" s} of steel
+STR_QUANTITY_GRAIN :{WEIGHT} of grain
+STR_QUANTITY_WOOD :{WEIGHT} of wood
+STR_QUANTITY_IRON_ORE :{WEIGHT} of iron ore
+STR_QUANTITY_STEEL :{WEIGHT} of steel
STR_QUANTITY_VALUABLES :{COMMA} bag{P "" s} of valuables
-STR_QUANTITY_COPPER_ORE :{COMMA} ton{P "" s} of copper ore
-STR_QUANTITY_MAIZE :{COMMA} ton{P "" s} of maize
-STR_QUANTITY_FRUIT :{COMMA} ton{P "" s} of fruit
+STR_QUANTITY_COPPER_ORE :{WEIGHT} of copper ore
+STR_QUANTITY_MAIZE :{WEIGHT} of maize
+STR_QUANTITY_FRUIT :{WEIGHT} of fruit
STR_QUANTITY_DIAMONDS :{COMMA} bag{P "" s} of diamonds
-STR_QUANTITY_FOOD :{COMMA} ton{P "" s} of food
-STR_QUANTITY_PAPER :{COMMA} ton{P "" s} of paper
+STR_QUANTITY_FOOD :{WEIGHT} of food
+STR_QUANTITY_PAPER :{WEIGHT} of paper
STR_QUANTITY_GOLD :{COMMA} bag{P "" s} of gold
STR_QUANTITY_WATER :{VOLUME} of water
-STR_QUANTITY_WHEAT :{COMMA} ton{P "" s} of wheat
+STR_QUANTITY_WHEAT :{WEIGHT} of wheat
STR_QUANTITY_RUBBER :{VOLUME} of rubber
-STR_QUANTITY_SUGAR :{COMMA} ton{P "" s} of sugar
+STR_QUANTITY_SUGAR :{WEIGHT} of sugar
STR_QUANTITY_TOYS :{COMMA} toy{P "" s}
STR_QUANTITY_SWEETS :{COMMA} bag{P "" s} of candy
STR_QUANTITY_COLA :{VOLUME} of cola
-STR_QUANTITY_CANDYFLOSS :{COMMA} ton{P "" s} of cotton candy
+STR_QUANTITY_CANDYFLOSS :{WEIGHT} of cotton candy
STR_QUANTITY_BUBBLES :{COMMA} bubble{P "" s}
-STR_QUANTITY_TOFFEE :{COMMA} ton{P "" s} of toffee
+STR_QUANTITY_TOFFEE :{WEIGHT} of toffee
STR_QUANTITY_BATTERIES :{COMMA} batter{P y ies}
STR_QUANTITY_PLASTIC :{VOLUME} of plastic
STR_QUANTITY_FIZZY_DRINKS :{COMMA} fizzy drink{P "" s}
diff --git a/lang/brazilian_portuguese.txt b/lang/brazilian_portuguese.txt
index 5de4cf79f..c340eb47d 100644
--- a/lang/brazilian_portuguese.txt
+++ b/lang/brazilian_portuguese.txt
@@ -84,33 +84,33 @@ STR_004C_PLASTIC :Plástico
STR_004D_FIZZY_DRINK :Bebidas Gasosas
STR_QUANTITY_NOTHING :
STR_QUANTITY_PASSENGERS :{COMMA} passageiro{P "" s}
-STR_QUANTITY_COAL :{COMMA} tonelada{P "" s} de carvão
+STR_QUANTITY_COAL :{WEIGHT} 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{P "" s} de gado
STR_QUANTITY_GOODS :{COMMA} caixas 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_GRAIN :{WEIGHT} de cereais
+STR_QUANTITY_WOOD :{WEIGHT} de madeira
+STR_QUANTITY_IRON_ORE :{WEIGHT} de minério de ferro
+STR_QUANTITY_STEEL :{WEIGHT} 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_COPPER_ORE :{WEIGHT} de minério de cobre
+STR_QUANTITY_MAIZE :{WEIGHT} de milho
+STR_QUANTITY_FRUIT :{WEIGHT} 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_FOOD :{WEIGHT} de comida
+STR_QUANTITY_PAPER :{WEIGHT} de papel
STR_QUANTITY_GOLD :{COMMA} saco{P "" s} de ouro
STR_QUANTITY_WATER :{VOLUME} de água
-STR_QUANTITY_WHEAT :{COMMA} tonelada{P "" s} de trigo
+STR_QUANTITY_WHEAT :{WEIGHT} de trigo
STR_QUANTITY_RUBBER :{VOLUME} de borracha
-STR_QUANTITY_SUGAR :{COMMA} tonelada{P "" s} de açúcar
+STR_QUANTITY_SUGAR :{WEIGHT} 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{P "" s} de algodão doce
+STR_QUANTITY_CANDYFLOSS :{WEIGHT} de algodão doce
STR_QUANTITY_BUBBLES :{COMMA} bolha{P "" s}
-STR_QUANTITY_TOFFEE :{COMMA} tonelada{P "" s} de caramelo
+STR_QUANTITY_TOFFEE :{WEIGHT} de caramelo
STR_QUANTITY_BATTERIES :{COMMA} bateria{P "" s}
STR_QUANTITY_PLASTIC :{VOLUME} de plástico
STR_QUANTITY_FIZZY_DRINKS :{COMMA} bebida{P "" s} gasosa
diff --git a/lang/catalan.txt b/lang/catalan.txt
index 156a53558..329521bac 100644
--- a/lang/catalan.txt
+++ b/lang/catalan.txt
@@ -84,33 +84,33 @@ STR_004C_PLASTIC :Plàstic
STR_004D_FIZZY_DRINK :Beguda Gasosa
STR_QUANTITY_NOTHING :
STR_QUANTITY_PASSENGERS :{COMMA} passatger{P "" s}
-STR_QUANTITY_COAL :{COMMA} ton{P a es} de carbó
+STR_QUANTITY_COAL :{WEIGHT} de carbó
STR_QUANTITY_MAIL :{COMMA} sa{P ca ques} de correu
STR_QUANTITY_OIL :{VOLUME} de petroli
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_GRAIN :{WEIGHT} de gra
+STR_QUANTITY_WOOD :{WEIGHT} de fusta
+STR_QUANTITY_IRON_ORE :{WEIGHT} de mineral de ferro
+STR_QUANTITY_STEEL :{WEIGHT} 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_COPPER_ORE :{WEIGHT} de mineral de coure
+STR_QUANTITY_MAIZE :{WEIGHT} de blat de moro
+STR_QUANTITY_FRUIT :{WEIGHT} 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_FOOD :{WEIGHT} de queviures
+STR_QUANTITY_PAPER :{WEIGHT} de paper
STR_QUANTITY_GOLD :{COMMA} sa{P ca ques} d'or
STR_QUANTITY_WATER :{VOLUME} d'aigua
-STR_QUANTITY_WHEAT :{COMMA} ton{P a es} de blat
+STR_QUANTITY_WHEAT :{WEIGHT} de blat
STR_QUANTITY_RUBBER :{VOLUME} de cautxú
-STR_QUANTITY_SUGAR :{COMMA} ton{P a es} de sucre
+STR_QUANTITY_SUGAR :{WEIGHT} 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} ton{P a es} de cotó de sucre
+STR_QUANTITY_CANDYFLOSS :{WEIGHT} de cotó de sucre
STR_QUANTITY_BUBBLES :{COMMA} bomboll{P a es}
-STR_QUANTITY_TOFFEE :{COMMA} ton{P a es} de caramel
+STR_QUANTITY_TOFFEE :{WEIGHT} de caramel
STR_QUANTITY_BATTERIES :{COMMA} pil{P a es}
STR_QUANTITY_PLASTIC :{VOLUME} de plàstic
STR_QUANTITY_FIZZY_DRINKS :{COMMA} begud{P a es} gasosa
diff --git a/lang/czech.txt b/lang/czech.txt
index 61142dc31..43b88ba5c 100644
--- a/lang/czech.txt
+++ b/lang/czech.txt
@@ -141,33 +141,33 @@ STR_004C_PLASTIC :plastu
STR_004D_FIZZY_DRINK :limonád
STR_QUANTITY_NOTHING :
STR_QUANTITY_PASSENGERS :{COMMA} cestující{P "" "" ch}
-STR_QUANTITY_COAL :{COMMA} tun{P a y ""} uhlí
+STR_QUANTITY_COAL :{WEIGHT} uhlí
STR_QUANTITY_MAIL :{COMMA} balík{P "" "y" u} po¨ty
STR_QUANTITY_OIL :{VOLUME} ropy
STR_QUANTITY_LIVESTOCK :{COMMA} kus{P "" y u} dobytka
STR_QUANTITY_GOODS :{COMMA} krabic{P e e ""} zbo¸í
-STR_QUANTITY_GRAIN :{COMMA} tun{P a y ""} zrní
-STR_QUANTITY_WOOD :{COMMA} tun{P a y ""} dreva
-STR_QUANTITY_IRON_ORE :{COMMA} tun{P a y ""} ¸elezné rudy
-STR_QUANTITY_STEEL :{COMMA} tun{P a y ""} oceli
+STR_QUANTITY_GRAIN :{WEIGHT} zrní
+STR_QUANTITY_WOOD :{WEIGHT} dreva
+STR_QUANTITY_IRON_ORE :{WEIGHT} ¸elezné rudy
+STR_QUANTITY_STEEL :{WEIGHT} oceli
STR_QUANTITY_VALUABLES :{COMMA} balík{P "" "y" u} cenin
-STR_QUANTITY_COPPER_ORE :{COMMA} tun{P a y ""} medene rudy
-STR_QUANTITY_MAIZE :{COMMA} tun{P a y ""} kukurice
-STR_QUANTITY_FRUIT :{COMMA} tun{P a y ""} ovoce
+STR_QUANTITY_COPPER_ORE :{WEIGHT} medene rudy
+STR_QUANTITY_MAIZE :{WEIGHT} kukurice
+STR_QUANTITY_FRUIT :{WEIGHT} ovoce
STR_QUANTITY_DIAMONDS :{COMMA} pyt{P el le lu} diamantu
-STR_QUANTITY_FOOD :{COMMA} tun{P a y ""} jídla
-STR_QUANTITY_PAPER :{COMMA} tun{P a y ""} papíru
+STR_QUANTITY_FOOD :{WEIGHT} jídla
+STR_QUANTITY_PAPER :{WEIGHT} papíru
STR_QUANTITY_GOLD :{COMMA} balík{P "" "y" u}
STR_QUANTITY_WATER :{VOLUME} vody
-STR_QUANTITY_WHEAT :{COMMA} tun{P a y ""} kukurice
+STR_QUANTITY_WHEAT :{WEIGHT} kukurice
STR_QUANTITY_RUBBER :{VOLUME} kaucuku
-STR_QUANTITY_SUGAR :{COMMA} tun{P a y ""} cukru
+STR_QUANTITY_SUGAR :{WEIGHT} cukru
STR_QUANTITY_TOYS :{COMMA} hrac{P ka ky ek}
STR_QUANTITY_SWEETS :{COMMA} pyt{P el le lu} bonbonu
STR_QUANTITY_COLA :{VOLUME} coly
-STR_QUANTITY_CANDYFLOSS :{COMMA} tun{P a y ""} cukrové vaty
+STR_QUANTITY_CANDYFLOSS :{WEIGHT} cukrové vaty
STR_QUANTITY_BUBBLES :{COMMA} bublin{P a y ""}
-STR_QUANTITY_TOFFEE :{COMMA} tun{P a y ""} karamelu
+STR_QUANTITY_TOFFEE :{WEIGHT} karamelu
STR_QUANTITY_BATTERIES :{COMMA} bateri{P e e í}
STR_QUANTITY_PLASTIC :{VOLUME} plastu
STR_QUANTITY_FIZZY_DRINKS :{COMMA} limonád{P a y ""}
diff --git a/lang/danish.txt b/lang/danish.txt
index 54344cc61..6a95ed59e 100644
--- a/lang/danish.txt
+++ b/lang/danish.txt
@@ -84,33 +84,33 @@ STR_004C_PLASTIC :Plastik
STR_004D_FIZZY_DRINK :Sodavand
STR_QUANTITY_NOTHING :
STR_QUANTITY_PASSENGERS :{COMMA} passager{P "" er}
-STR_QUANTITY_COAL :{COMMA} ton{P "" s} kul
+STR_QUANTITY_COAL :{WEIGHT} 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{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_GRAIN :{WEIGHT} korn
+STR_QUANTITY_WOOD :{WEIGHT} træ
+STR_QUANTITY_IRON_ORE :{WEIGHT} jernmalm
+STR_QUANTITY_STEEL :{WEIGHT} 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_COPPER_ORE :{WEIGHT} kobbermalm
+STR_QUANTITY_MAIZE :{WEIGHT} majs
+STR_QUANTITY_FRUIT :{WEIGHT} 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_FOOD :{WEIGHT} mad
+STR_QUANTITY_PAPER :{WEIGHT} papir
STR_QUANTITY_GOLD :{COMMA} sæk{P "" ke} guld
STR_QUANTITY_WATER :{VOLUME} vand
-STR_QUANTITY_WHEAT :{COMMA} ton{P "" s} hvede
+STR_QUANTITY_WHEAT :{WEIGHT} hvede
STR_QUANTITY_RUBBER :{VOLUME} gummi
-STR_QUANTITY_SUGAR :{COMMA} ton{P "" s} sukker
+STR_QUANTITY_SUGAR :{WEIGHT} sukker
STR_QUANTITY_TOYS :{COMMA} legetøj
STR_QUANTITY_SWEETS :{COMMA} sæk{P "" ke} slik
STR_QUANTITY_COLA :{VOLUME} cola
-STR_QUANTITY_CANDYFLOSS :{COMMA} ton{P "" s} candyfloss
+STR_QUANTITY_CANDYFLOSS :{WEIGHT} candyfloss
STR_QUANTITY_BUBBLES :{COMMA} boble{P "" r}
-STR_QUANTITY_TOFFEE :{COMMA} ton karamel
+STR_QUANTITY_TOFFEE :{WEIGHT} karamel
STR_QUANTITY_BATTERIES :{COMMA} batteri{P "" er}
STR_QUANTITY_PLASTIC :{VOLUME} plastik
STR_QUANTITY_FIZZY_DRINKS :{COMMA} sodavand
diff --git a/lang/dutch.txt b/lang/dutch.txt
index 4a67bb1c7..2dc925f68 100644
--- a/lang/dutch.txt
+++ b/lang/dutch.txt
@@ -84,33 +84,33 @@ STR_004C_PLASTIC :Plastic
STR_004D_FIZZY_DRINK :Frisdrank
STR_QUANTITY_NOTHING :
STR_QUANTITY_PASSENGERS :{COMMA} passagier{P "" s}
-STR_QUANTITY_COAL :{COMMA} ton kolen
+STR_QUANTITY_COAL :{WEIGHT} kolen
STR_QUANTITY_MAIL :{COMMA} zak{P "" ken} post
STR_QUANTITY_OIL :{VOLUME} olie
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_GRAIN :{WEIGHT} graan
+STR_QUANTITY_WOOD :{WEIGHT} hout
+STR_QUANTITY_IRON_ORE :{WEIGHT} ijzererts
+STR_QUANTITY_STEEL :{WEIGHT} staal
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_COPPER_ORE :{WEIGHT} kopererts
+STR_QUANTITY_MAIZE :{WEIGHT} maïs
+STR_QUANTITY_FRUIT :{WEIGHT} fruit
STR_QUANTITY_DIAMONDS :{COMMA} zak{P "" ken} diamanten
-STR_QUANTITY_FOOD :{COMMA} ton voedsel
-STR_QUANTITY_PAPER :{COMMA} ton papier
+STR_QUANTITY_FOOD :{WEIGHT} voedsel
+STR_QUANTITY_PAPER :{WEIGHT} papier
STR_QUANTITY_GOLD :{COMMA} zak{P "" ken} goud
STR_QUANTITY_WATER :{VOLUME} water
-STR_QUANTITY_WHEAT :{COMMA} ton tarwe
+STR_QUANTITY_WHEAT :{WEIGHT} tarwe
STR_QUANTITY_RUBBER :{VOLUME} rubber
-STR_QUANTITY_SUGAR :{COMMA} ton suiker
+STR_QUANTITY_SUGAR :{WEIGHT} suiker
STR_QUANTITY_TOYS :{COMMA} speelgoed
STR_QUANTITY_SWEETS :{COMMA} zak{P "" ken} snoep
STR_QUANTITY_COLA :{VOLUME} cola
-STR_QUANTITY_CANDYFLOSS :{COMMA} ton suikerspinnen
+STR_QUANTITY_CANDYFLOSS :{WEIGHT} suikerspinnen
STR_QUANTITY_BUBBLES :{COMMA} bel{P "" len}
-STR_QUANTITY_TOFFEE :{COMMA} ton toffee
+STR_QUANTITY_TOFFEE :{WEIGHT} toffee
STR_QUANTITY_BATTERIES :{COMMA} batterij{P "" en}
STR_QUANTITY_PLASTIC :{VOLUME} plastic
STR_QUANTITY_FIZZY_DRINKS :{COMMA} blikje{P "" s} frisdrank
diff --git a/lang/estonian.txt b/lang/estonian.txt
index 1c90832ad..6e3a7fec7 100644
--- a/lang/estonian.txt
+++ b/lang/estonian.txt
@@ -84,33 +84,33 @@ STR_004C_PLASTIC :Plastmass
STR_004D_FIZZY_DRINK :Kihisev jook
STR_QUANTITY_NOTHING :
STR_QUANTITY_PASSENGERS :{COMMA} reisija{P "" t}
-STR_QUANTITY_COAL :{COMMA} tonn{P "" i} kivisütt
+STR_QUANTITY_COAL :{WEIGHT} kivisütt
STR_QUANTITY_MAIL :{COMMA} postipakk{P "" i}
STR_QUANTITY_OIL :{VOLUME} naftat
STR_QUANTITY_LIVESTOCK :{COMMA} loom{P "" a}
STR_QUANTITY_GOODS :{COMMA} kast{P "" i} kaupa
-STR_QUANTITY_GRAIN :{COMMA} tonn{P "" i} teravilja
-STR_QUANTITY_WOOD :{COMMA} tonn{P "" i} puitu
-STR_QUANTITY_IRON_ORE :{COMMA} tonn{P "" i} rauamaaki
-STR_QUANTITY_STEEL :{COMMA} tonn{P "" i} terast
+STR_QUANTITY_GRAIN :{WEIGHT} teravilja
+STR_QUANTITY_WOOD :{WEIGHT} puitu
+STR_QUANTITY_IRON_ORE :{WEIGHT} rauamaaki
+STR_QUANTITY_STEEL :{WEIGHT} terast
STR_QUANTITY_VALUABLES :{COMMA} kotitäi{P s t} väärisasju
-STR_QUANTITY_COPPER_ORE :{COMMA} tonn{P "" i} vasemaaki
-STR_QUANTITY_MAIZE :{COMMA} tonn{P "" i} maisi
-STR_QUANTITY_FRUIT :{COMMA} tonn{P "" i} puuvilju
+STR_QUANTITY_COPPER_ORE :{WEIGHT} vasemaaki
+STR_QUANTITY_MAIZE :{WEIGHT} maisi
+STR_QUANTITY_FRUIT :{WEIGHT} puuvilju
STR_QUANTITY_DIAMONDS :{COMMA} kotitäi{P s t} teemante{P id ""}
-STR_QUANTITY_FOOD :{COMMA} tonn{P "" i} toitu
-STR_QUANTITY_PAPER :{COMMA} tonn{P "" i} paberit
+STR_QUANTITY_FOOD :{WEIGHT} toitu
+STR_QUANTITY_PAPER :{WEIGHT} paberit
STR_QUANTITY_GOLD :{COMMA} kotitäi{P s t} kulda
STR_QUANTITY_WATER :{VOLUME} vett
-STR_QUANTITY_WHEAT :{COMMA} tonn{P "" i} nisu
+STR_QUANTITY_WHEAT :{WEIGHT} nisu
STR_QUANTITY_RUBBER :{VOLUME} Kummi
-STR_QUANTITY_SUGAR :{COMMA} tonn{P "" i} suhkrut
+STR_QUANTITY_SUGAR :{WEIGHT} suhkrut
STR_QUANTITY_TOYS :{COMMA} mänguas{P i ja}
STR_QUANTITY_SWEETS :{COMMA} kontitäi{P s t} maiustusi
STR_QUANTITY_COLA :{VOLUME} koolat
-STR_QUANTITY_CANDYFLOSS :{COMMA} tonn{P "" i} suhkruvatti
+STR_QUANTITY_CANDYFLOSS :{WEIGHT} suhkruvatti
STR_QUANTITY_BUBBLES :{COMMA} mull{P "" i}
-STR_QUANTITY_TOFFEE :{COMMA} tonn{P "" i} iirist
+STR_QUANTITY_TOFFEE :{WEIGHT} iirist
STR_QUANTITY_BATTERIES :{COMMA} patarei{P "" d}
STR_QUANTITY_PLASTIC :{VOLUME} plastmassi
STR_QUANTITY_FIZZY_DRINKS :{COMMA} kihisevaid jooke
diff --git a/lang/finnish.txt b/lang/finnish.txt
index a02ef9517..2bbc718b9 100644
--- a/lang/finnish.txt
+++ b/lang/finnish.txt
@@ -84,33 +84,33 @@ STR_004C_PLASTIC :Muovi
STR_004D_FIZZY_DRINK :Sihijuoma
STR_QUANTITY_NOTHING :
STR_QUANTITY_PASSENGERS :{COMMA} matkustaja{P "" a}
-STR_QUANTITY_COAL :{COMMA} tonni{P "" a} kivihiiltä
+STR_QUANTITY_COAL :{WEIGHT} kivihiiltä
STR_QUANTITY_MAIL :{COMMA} säkki{P "" ä} postia
STR_QUANTITY_OIL :{VOLUME} öljyä
STR_QUANTITY_LIVESTOCK :{COMMA} erä{P "" ä} karjaa
STR_QUANTITY_GOODS :{COMMA} laatikko{P "" a} tavaraa
-STR_QUANTITY_GRAIN :{COMMA} tonni{P "" a} viljaa
-STR_QUANTITY_WOOD :{COMMA} tonni{P "" a} puutavaraa
-STR_QUANTITY_IRON_ORE :{COMMA} tonni{P "" a} rautamalmia
-STR_QUANTITY_STEEL :{COMMA} tonni{P "" a} terästä
+STR_QUANTITY_GRAIN :{WEIGHT} viljaa
+STR_QUANTITY_WOOD :{WEIGHT} puutavaraa
+STR_QUANTITY_IRON_ORE :{WEIGHT} rautamalmia
+STR_QUANTITY_STEEL :{WEIGHT} terästä
STR_QUANTITY_VALUABLES :{COMMA} säkki{P "" ä} arvotavaraa
-STR_QUANTITY_COPPER_ORE :{COMMA} tonni{P "" a} kuparimalmia
-STR_QUANTITY_MAIZE :{COMMA} tonni maissia
-STR_QUANTITY_FRUIT :{COMMA} tonni{P "" a} hedelmiä
+STR_QUANTITY_COPPER_ORE :{WEIGHT} kuparimalmia
+STR_QUANTITY_MAIZE :{WEIGHT} maissia
+STR_QUANTITY_FRUIT :{WEIGHT} hedelmiä
STR_QUANTITY_DIAMONDS :{COMMA} säkki{P "" ä} timantteja
-STR_QUANTITY_FOOD :{COMMA} tonni{P "" a} ruokaa
-STR_QUANTITY_PAPER :{COMMA} tonni{P "" a} paperia
+STR_QUANTITY_FOOD :{WEIGHT} ruokaa
+STR_QUANTITY_PAPER :{WEIGHT} paperia
STR_QUANTITY_GOLD :{COMMA} säkki{P "" ä} kultaa
STR_QUANTITY_WATER :{VOLUME} vettä
-STR_QUANTITY_WHEAT :{COMMA} tonni{P "" a} vehnää
+STR_QUANTITY_WHEAT :{WEIGHT} vehnää
STR_QUANTITY_RUBBER :{VOLUME} kumia
-STR_QUANTITY_SUGAR :{COMMA} tonni{P "" a} sokeria
+STR_QUANTITY_SUGAR :{WEIGHT} sokeria
STR_QUANTITY_TOYS :{COMMA} lelu{P "" a}
STR_QUANTITY_SWEETS :{COMMA} säkki{P "" ä} karkkia
STR_QUANTITY_COLA :{VOLUME} limsaa
-STR_QUANTITY_CANDYFLOSS :{COMMA} tonni{P "" a} hattaraa
+STR_QUANTITY_CANDYFLOSS :{WEIGHT} hattaraa
STR_QUANTITY_BUBBLES :{COMMA} kupla{P "" a}
-STR_QUANTITY_TOFFEE :{COMMA} tonni{P "" a} toffeeta
+STR_QUANTITY_TOFFEE :{WEIGHT} toffeeta
STR_QUANTITY_BATTERIES :{COMMA} paristo{P "" a}
STR_QUANTITY_PLASTIC :{VOLUME} muovia
STR_QUANTITY_FIZZY_DRINKS :{COMMA} sihijuoma{P "" a}
diff --git a/lang/french.txt b/lang/french.txt
index 386a191e4..4bb3eb81a 100644
--- a/lang/french.txt
+++ b/lang/french.txt
@@ -85,33 +85,33 @@ STR_004C_PLASTIC :Plastique
STR_004D_FIZZY_DRINK :Boisson Gazeuse
STR_QUANTITY_NOTHING :
STR_QUANTITY_PASSENGERS :{COMMA} passager{P "" s}
-STR_QUANTITY_COAL :{COMMA} tonne{P "" s} de charbon
+STR_QUANTITY_COAL :{WEIGHT} de charbon
STR_QUANTITY_MAIL :{COMMA} sac{P "" s} posta{P l ux}
STR_QUANTITY_OIL :{VOLUME} de pétrole
STR_QUANTITY_LIVESTOCK :{COMMA} tête{P "" s} de bétail
STR_QUANTITY_GOODS :{COMMA} caisse{P "" s} de biens
-STR_QUANTITY_GRAIN :{COMMA} tonne{P "" s} de grains
-STR_QUANTITY_WOOD :{COMMA} tonne{P "" s} de bois
-STR_QUANTITY_IRON_ORE :{COMMA} tonne{P "" s} de fer
-STR_QUANTITY_STEEL :{COMMA} tonne{P "" s} d'acier
+STR_QUANTITY_GRAIN :{WEIGHT} de grains
+STR_QUANTITY_WOOD :{WEIGHT} de bois
+STR_QUANTITY_IRON_ORE :{WEIGHT} de fer
+STR_QUANTITY_STEEL :{WEIGHT} d'acier
STR_QUANTITY_VALUABLES :{COMMA} sac{P "" s} d'objets de valeur
-STR_QUANTITY_COPPER_ORE :{COMMA} tonne{P "" s} de cuivre
-STR_QUANTITY_MAIZE :{COMMA} tonne{P "" s} de maïs
-STR_QUANTITY_FRUIT :{COMMA} tonne{P "" s} de fruits
+STR_QUANTITY_COPPER_ORE :{WEIGHT} de cuivre
+STR_QUANTITY_MAIZE :{WEIGHT} de maïs
+STR_QUANTITY_FRUIT :{WEIGHT} de fruits
STR_QUANTITY_DIAMONDS :{COMMA} sac{P "" s} de diamants
-STR_QUANTITY_FOOD :{COMMA} tonne{P "" s} de nourriture
-STR_QUANTITY_PAPER :{COMMA} tonne{P "" s} de papier
+STR_QUANTITY_FOOD :{WEIGHT} de nourriture
+STR_QUANTITY_PAPER :{WEIGHT} de papier
STR_QUANTITY_GOLD :{COMMA} sac{P "" s} d'or
STR_QUANTITY_WATER :{VOLUME} d'eau
-STR_QUANTITY_WHEAT :{COMMA} tonne{P "" s} de blé
+STR_QUANTITY_WHEAT :{WEIGHT} de blé
STR_QUANTITY_RUBBER :{VOLUME} de caoutchouc
-STR_QUANTITY_SUGAR :{COMMA} tonne{P "" s} de sucre
+STR_QUANTITY_SUGAR :{WEIGHT} de sucre
STR_QUANTITY_TOYS :{COMMA} jouet{P "" s}
STR_QUANTITY_SWEETS :{COMMA} sac{P "" s} de jouets
STR_QUANTITY_COLA :{VOLUME} de cola
-STR_QUANTITY_CANDYFLOSS :{COMMA} tonne{P "" s} de barbe à papa
+STR_QUANTITY_CANDYFLOSS :{WEIGHT} de barbe à papa
STR_QUANTITY_BUBBLES :{COMMA} bulle{P "" s}
-STR_QUANTITY_TOFFEE :{COMMA} tonne{P "" s} de caramel
+STR_QUANTITY_TOFFEE :{WEIGHT} de caramel
STR_QUANTITY_BATTERIES :{COMMA} batterie{P "" s}
STR_QUANTITY_PLASTIC :{VOLUME} de plastique
STR_QUANTITY_FIZZY_DRINKS :{COMMA} boisson{P "" s} gazeuse{P "" s}
diff --git a/lang/galician.txt b/lang/galician.txt
index 8e4984c94..0d0c2174e 100644
--- a/lang/galician.txt
+++ b/lang/galician.txt
@@ -84,33 +84,33 @@ STR_004C_PLASTIC :Plástico
STR_004D_FIZZY_DRINK :Bebida Gaseosa
STR_QUANTITY_NOTHING :
STR_QUANTITY_PASSENGERS :{COMMA} pasaxeiro{P "" s}
-STR_QUANTITY_COAL :{COMMA} ton{P "" s}. de carbón
+STR_QUANTITY_COAL :{WEIGHT} de carbón
STR_QUANTITY_MAIL :{COMMA} saco{P "" s} de correo
STR_QUANTITY_OIL :{VOLUME} de petróleo
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_GRAIN :{WEIGHT} de gran
+STR_QUANTITY_WOOD :{WEIGHT} de madeira
+STR_QUANTITY_IRON_ORE :{WEIGHT} de hematita
+STR_QUANTITY_STEEL :{WEIGHT} 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_COPPER_ORE :{WEIGHT} de mineral de cobre
+STR_QUANTITY_MAIZE :{WEIGHT} de millo
+STR_QUANTITY_FRUIT :{WEIGHT} 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_FOOD :{WEIGHT} de comida
+STR_QUANTITY_PAPER :{WEIGHT} de papel
STR_QUANTITY_GOLD :{COMMA} saco{P "" s} de ouro
STR_QUANTITY_WATER :{VOLUME} de auga
-STR_QUANTITY_WHEAT :{COMMA} ton{P "" s}. de trigo
+STR_QUANTITY_WHEAT :{WEIGHT} de trigo
STR_QUANTITY_RUBBER :{VOLUME} de caucho
-STR_QUANTITY_SUGAR :{COMMA} ton{P "" s}. de azucre
+STR_QUANTITY_SUGAR :{WEIGHT} 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{P "" s}. de algodón de azucre
+STR_QUANTITY_CANDYFLOSS :{WEIGHT} de algodón de azucre
STR_QUANTITY_BUBBLES :{COMMA} burbulla{P "" s}
-STR_QUANTITY_TOFFEE :{COMMA} ton{P "" s}. de toffee
+STR_QUANTITY_TOFFEE :{WEIGHT} de toffee
STR_QUANTITY_BATTERIES :{COMMA} batería{P "" s}
STR_QUANTITY_PLASTIC :{VOLUME} de plástico
STR_QUANTITY_FIZZY_DRINKS :{COMMA} bebida{P "" s} gaseosa{P "" s}
diff --git a/lang/german.txt b/lang/german.txt
index 2278164d2..7135a8ed2 100644
--- a/lang/german.txt
+++ b/lang/german.txt
@@ -85,33 +85,33 @@ STR_004C_PLASTIC :Plastik
STR_004D_FIZZY_DRINK :Limonade
STR_QUANTITY_NOTHING :
STR_QUANTITY_PASSENGERS :{COMMA} Passagier{P "" e}
-STR_QUANTITY_COAL :{COMMA} Tonne{P "" n} Kohle
+STR_QUANTITY_COAL :{WEIGHT} Kohle
STR_QUANTITY_MAIL :{COMMA} Posts{P ack äcke}
STR_QUANTITY_OIL :{VOLUME} Öl
STR_QUANTITY_LIVESTOCK :{COMMA} Stück Vieh
STR_QUANTITY_GOODS :{COMMA} Warenkiste{P "" n}
-STR_QUANTITY_GRAIN :{COMMA} Tonne{P "" n} Getreide
-STR_QUANTITY_WOOD :{COMMA} Tonne{P "" n} Holz
-STR_QUANTITY_IRON_ORE :{COMMA} Tonne{P "" n} Eisenerz
-STR_QUANTITY_STEEL :{COMMA} Tonne{P "" n} Stahl
+STR_QUANTITY_GRAIN :{WEIGHT} Getreide
+STR_QUANTITY_WOOD :{WEIGHT} Holz
+STR_QUANTITY_IRON_ORE :{WEIGHT} Eisenerz
+STR_QUANTITY_STEEL :{WEIGHT} Stahl
STR_QUANTITY_VALUABLES :{COMMA} {P Sack Säcke} mit Wertsachen
-STR_QUANTITY_COPPER_ORE :{COMMA} Tonne{P "" n} Kupfererz
-STR_QUANTITY_MAIZE :{COMMA} Tonne{P "" n} Mais
-STR_QUANTITY_FRUIT :{COMMA} Tonne{P "" n} Früchte
+STR_QUANTITY_COPPER_ORE :{WEIGHT} Kupfererz
+STR_QUANTITY_MAIZE :{WEIGHT} Mais
+STR_QUANTITY_FRUIT :{WEIGHT} Früchte
STR_QUANTITY_DIAMONDS :{COMMA} {P Sack Säcke} mit Diamanten
-STR_QUANTITY_FOOD :{COMMA} Tonne{P "" n} Nahrungsmittel
-STR_QUANTITY_PAPER :{COMMA} Tonne{P "" n} Papier
+STR_QUANTITY_FOOD :{WEIGHT} Nahrungsmittel
+STR_QUANTITY_PAPER :{WEIGHT} Papier
STR_QUANTITY_GOLD :{COMMA} {P Sack Säcke} mit Gold
STR_QUANTITY_WATER :{VOLUME} Wasser
-STR_QUANTITY_WHEAT :{COMMA} Tonne{P "" n} Weizen
+STR_QUANTITY_WHEAT :{WEIGHT} Weizen
STR_QUANTITY_RUBBER :{VOLUME} Kautschuk
-STR_QUANTITY_SUGAR :{COMMA} Tonne{P "" n} Zucker
+STR_QUANTITY_SUGAR :{WEIGHT} Zucker
STR_QUANTITY_TOYS :{COMMA} Spielzeug{P "" e}
STR_QUANTITY_SWEETS :{COMMA} {P Sack Säcke} mit Bonbons
STR_QUANTITY_COLA :{VOLUME} Cola
-STR_QUANTITY_CANDYFLOSS :{COMMA} Tonne{P "" n} Zuckerwatte
+STR_QUANTITY_CANDYFLOSS :{WEIGHT} Zuckerwatte
STR_QUANTITY_BUBBLES :{COMMA} Luftblase{P "" n}
-STR_QUANTITY_TOFFEE :{COMMA} Tonne{P "" n} Karamell
+STR_QUANTITY_TOFFEE :{WEIGHT} Karamell
STR_QUANTITY_BATTERIES :{COMMA} Batterie{P "" n}
STR_QUANTITY_PLASTIC :{VOLUME} Plastik
STR_QUANTITY_FIZZY_DRINKS :{COMMA} Limonade{P "" n}
diff --git a/lang/hungarian.txt b/lang/hungarian.txt
index f7ada846b..957a76aed 100644
--- a/lang/hungarian.txt
+++ b/lang/hungarian.txt
@@ -116,33 +116,33 @@ STR_004C_PLASTIC :mûanyag
STR_004D_FIZZY_DRINK :szénsavas ital
STR_QUANTITY_NOTHING :
STR_QUANTITY_PASSENGERS :{COMMA} utas
-STR_QUANTITY_COAL :{COMMA} tonna szén
+STR_QUANTITY_COAL :{WEIGHT} szén
STR_QUANTITY_MAIL :{COMMA} csomag levél
STR_QUANTITY_OIL :{VOLUME} olaj
STR_QUANTITY_LIVESTOCK :{COMMA} állat
STR_QUANTITY_GOODS :{COMMA} láda áru
-STR_QUANTITY_GRAIN :{COMMA} tonna búza
-STR_QUANTITY_WOOD :{COMMA} tonna fa
-STR_QUANTITY_IRON_ORE :{COMMA} tonna vasérc
-STR_QUANTITY_STEEL :{COMMA} tonna acél
+STR_QUANTITY_GRAIN :{WEIGHT} búza
+STR_QUANTITY_WOOD :{WEIGHT} fa
+STR_QUANTITY_IRON_ORE :{WEIGHT} vasérc
+STR_QUANTITY_STEEL :{WEIGHT} acél
STR_QUANTITY_VALUABLES :{COMMA} csomag értéktárgy
-STR_QUANTITY_COPPER_ORE :{COMMA} tonna rézérc
-STR_QUANTITY_MAIZE :{COMMA} tonna kukorica
-STR_QUANTITY_FRUIT :{COMMA} tonna gyümölcs
+STR_QUANTITY_COPPER_ORE :{WEIGHT} rézérc
+STR_QUANTITY_MAIZE :{WEIGHT} kukorica
+STR_QUANTITY_FRUIT :{WEIGHT} gyümölcs
STR_QUANTITY_DIAMONDS :{COMMA} zsák gyémánt
-STR_QUANTITY_FOOD :{COMMA} tonna étel
-STR_QUANTITY_PAPER :{COMMA} tonna papír
+STR_QUANTITY_FOOD :{WEIGHT} étel
+STR_QUANTITY_PAPER :{WEIGHT} papír
STR_QUANTITY_GOLD :{COMMA} zsák arany
STR_QUANTITY_WATER :{VOLUME} víz
-STR_QUANTITY_WHEAT :{COMMA} tonna búza
+STR_QUANTITY_WHEAT :{WEIGHT} búza
STR_QUANTITY_RUBBER :{VOLUME} gumi
-STR_QUANTITY_SUGAR :{COMMA} tonna cukor
+STR_QUANTITY_SUGAR :{WEIGHT} cukor
STR_QUANTITY_TOYS :{COMMA} játék
STR_QUANTITY_SWEETS :{COMMA} zsák cukorka
STR_QUANTITY_COLA :{VOLUME} kóla
-STR_QUANTITY_CANDYFLOSS :{COMMA} tonna vattacukor
+STR_QUANTITY_CANDYFLOSS :{WEIGHT} vattacukor
STR_QUANTITY_BUBBLES :{COMMA} buborék
-STR_QUANTITY_TOFFEE :{COMMA} tonna tejkaramella
+STR_QUANTITY_TOFFEE :{WEIGHT} tejkaramella
STR_QUANTITY_BATTERIES :{COMMA} elem
STR_QUANTITY_PLASTIC :{VOLUME} mûanyag
STR_QUANTITY_FIZZY_DRINKS :{COMMA} szénsavas ital
diff --git a/lang/icelandic.txt b/lang/icelandic.txt
index b57ce5d53..330e7e95f 100644
--- a/lang/icelandic.txt
+++ b/lang/icelandic.txt
@@ -84,33 +84,33 @@ STR_004C_PLASTIC :Plast
STR_004D_FIZZY_DRINK :Gosdrykkja
STR_QUANTITY_NOTHING :
STR_QUANTITY_PASSENGERS :{COMMA} farþeg{P i ar}
-STR_QUANTITY_COAL :{COMMA} tonn af kolum
+STR_QUANTITY_COAL :{WEIGHT} af kolum
STR_QUANTITY_MAIL :{COMMA} pokar af pósti
STR_QUANTITY_OIL :{VOLUME} af olíu
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_GRAIN :{WEIGHT} af korni
+STR_QUANTITY_WOOD :{WEIGHT} af timbri
+STR_QUANTITY_IRON_ORE :{WEIGHT} af járngrýti
+STR_QUANTITY_STEEL :{WEIGHT} af stáli
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_COPPER_ORE :{WEIGHT} af kopar
+STR_QUANTITY_MAIZE :{WEIGHT} af maís
+STR_QUANTITY_FRUIT :{WEIGHT} af ávöxtum
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_FOOD :{WEIGHT} af matvælum
+STR_QUANTITY_PAPER :{WEIGHT} af pappír
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_WHEAT :{WEIGHT} af hveiti
STR_QUANTITY_RUBBER :{VOLUME} af gúmmíi
-STR_QUANTITY_SUGAR :{COMMA} tonn af sykri
+STR_QUANTITY_SUGAR :{WEIGHT} af sykri
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_CANDYFLOSS :{WEIGHT} af sykurfrauði
STR_QUANTITY_BUBBLES :{COMMA} kúl{P a ur}
-STR_QUANTITY_TOFFEE :{COMMA} tonn af toffý
+STR_QUANTITY_TOFFEE :{WEIGHT} af toffý
STR_QUANTITY_BATTERIES :{COMMA} rafhl{P aða öður}
STR_QUANTITY_PLASTIC :{VOLUME} af plasti
STR_QUANTITY_FIZZY_DRINKS :{COMMA} gosdrykk{P u i}r
diff --git a/lang/italian.txt b/lang/italian.txt
index 898c07c1a..a8efe402b 100644
--- a/lang/italian.txt
+++ b/lang/italian.txt
@@ -84,33 +84,33 @@ STR_004C_PLASTIC :Plastica
STR_004D_FIZZY_DRINK :Bevande Frizzanti
STR_QUANTITY_NOTHING :
STR_QUANTITY_PASSENGERS :{COMMA} passegger{P o i}
-STR_QUANTITY_COAL :{COMMA} ton. di carbone
+STR_QUANTITY_COAL :{WEIGHT} di carbone
STR_QUANTITY_MAIL :{COMMA} sacc{P o i} postal{P e i}
STR_QUANTITY_OIL :{VOLUME} di petrolio
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_GRAIN :{WEIGHT} di grano
+STR_QUANTITY_WOOD :{WEIGHT} di legna
+STR_QUANTITY_IRON_ORE :{WEIGHT} di ferro grezzo
+STR_QUANTITY_STEEL :{WEIGHT} di acciaio
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_COPPER_ORE :{WEIGHT} di rame grezzo
+STR_QUANTITY_MAIZE :{WEIGHT} di mais
+STR_QUANTITY_FRUIT :{WEIGHT} di frutta
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_FOOD :{WEIGHT} di cibo
+STR_QUANTITY_PAPER :{WEIGHT} di carta
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_WHEAT :{WEIGHT} di frumento
STR_QUANTITY_RUBBER :{VOLUME} di gomma
-STR_QUANTITY_SUGAR :{COMMA} ton. di zucchero
+STR_QUANTITY_SUGAR :{WEIGHT} di zucchero
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_CANDYFLOSS :{WEIGHT} di cotone candito
STR_QUANTITY_BUBBLES :{COMMA} boll{P a e}
-STR_QUANTITY_TOFFEE :{COMMA} ton. di toffee
+STR_QUANTITY_TOFFEE :{WEIGHT} di toffee
STR_QUANTITY_BATTERIES :{COMMA} batteri{P a e}
STR_QUANTITY_PLASTIC :{VOLUME} di plastica
STR_QUANTITY_FIZZY_DRINKS :{COMMA} bibite frizzanti
diff --git a/lang/norwegian.txt b/lang/norwegian.txt
index 3d13e8289..d5b5e0ac2 100644
--- a/lang/norwegian.txt
+++ b/lang/norwegian.txt
@@ -84,33 +84,33 @@ STR_004C_PLASTIC :Plastikk
STR_004D_FIZZY_DRINK :Brus
STR_QUANTITY_NOTHING :
STR_QUANTITY_PASSENGERS :{COMMA} passasjer{P "" er}
-STR_QUANTITY_COAL :{COMMA} tonn kull
+STR_QUANTITY_COAL :{WEIGHT} kull
STR_QUANTITY_MAIL :{COMMA} postsekk{P "" er}
STR_QUANTITY_OIL :{VOLUME} olje
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_GRAIN :{WEIGHT} korn
+STR_QUANTITY_WOOD :{WEIGHT} tømmer
+STR_QUANTITY_IRON_ORE :{WEIGHT} jernmalm
+STR_QUANTITY_STEEL :{WEIGHT} stål
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_COPPER_ORE :{WEIGHT} kobbermalm
+STR_QUANTITY_MAIZE :{WEIGHT} mais
+STR_QUANTITY_FRUIT :{WEIGHT} frukt
STR_QUANTITY_DIAMONDS :{COMMA} sekk{P "" er} med diamanter
-STR_QUANTITY_FOOD :{COMMA} tonn mat
-STR_QUANTITY_PAPER :{COMMA} tonn papir
+STR_QUANTITY_FOOD :{WEIGHT} mat
+STR_QUANTITY_PAPER :{WEIGHT} papir
STR_QUANTITY_GOLD :{COMMA} sekk{P "" er} med gull
STR_QUANTITY_WATER :{VOLUME} vann
-STR_QUANTITY_WHEAT :{COMMA} tonn hvete
+STR_QUANTITY_WHEAT :{WEIGHT} hvete
STR_QUANTITY_RUBBER :{VOLUME} gummi
-STR_QUANTITY_SUGAR :{COMMA} tonn sukker
+STR_QUANTITY_SUGAR :{WEIGHT} sukker
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_CANDYFLOSS :{WEIGHT} sukkerspinn
STR_QUANTITY_BUBBLES :{COMMA} boble{P "" r}
-STR_QUANTITY_TOFFEE :{COMMA} tonn karamell
+STR_QUANTITY_TOFFEE :{WEIGHT} karamell
STR_QUANTITY_BATTERIES :{COMMA} batteri{P "" er}
STR_QUANTITY_PLASTIC :{VOLUME} plastikk
STR_QUANTITY_FIZZY_DRINKS :{COMMA} brus
diff --git a/lang/polish.txt b/lang/polish.txt
index 3061f14ad..35436d3fd 100644
--- a/lang/polish.txt
+++ b/lang/polish.txt
@@ -84,33 +84,33 @@ STR_004C_PLASTIC :Plastik
STR_004D_FIZZY_DRINK :Napoje gazowane
STR_QUANTITY_NOTHING :
STR_QUANTITY_PASSENGERS :{COMMA} pasazerow
-STR_QUANTITY_COAL :{COMMA} ton wegla
+STR_QUANTITY_COAL :{WEIGHT} wegla
STR_QUANTITY_MAIL :{COMMA} paczek poczty
STR_QUANTITY_OIL :{VOLUME} ropy
STR_QUANTITY_LIVESTOCK :{COMMA} sztuk zywca
STR_QUANTITY_GOODS :{COMMA} towarow
-STR_QUANTITY_GRAIN :{COMMA} ton zboza
-STR_QUANTITY_WOOD :{COMMA} ton drewna
-STR_QUANTITY_IRON_ORE :{COMMA} ton rudy zelaza
-STR_QUANTITY_STEEL :{COMMA} ton stali
+STR_QUANTITY_GRAIN :{WEIGHT} zboza
+STR_QUANTITY_WOOD :{WEIGHT} drewna
+STR_QUANTITY_IRON_ORE :{WEIGHT} rudy zelaza
+STR_QUANTITY_STEEL :{WEIGHT} stali
STR_QUANTITY_VALUABLES :{COMMA} kosztownosci
-STR_QUANTITY_COPPER_ORE :{COMMA} ton rudy miedzi
-STR_QUANTITY_MAIZE :{COMMA} ton kukurydzy
-STR_QUANTITY_FRUIT :{COMMA} ton owocow
+STR_QUANTITY_COPPER_ORE :{WEIGHT} rudy miedzi
+STR_QUANTITY_MAIZE :{WEIGHT} kukurydzy
+STR_QUANTITY_FRUIT :{WEIGHT} owocow
STR_QUANTITY_DIAMONDS :{COMMA} paczek diamentow
-STR_QUANTITY_FOOD :{COMMA} ton zywnosci
-STR_QUANTITY_PAPER :{COMMA} ton papieru
+STR_QUANTITY_FOOD :{WEIGHT} zywnosci
+STR_QUANTITY_PAPER :{WEIGHT} papieru
STR_QUANTITY_GOLD :{COMMA} zlota
STR_QUANTITY_WATER :{VOLUME} wody
-STR_QUANTITY_WHEAT :{COMMA} ton pszenicy
+STR_QUANTITY_WHEAT :{WEIGHT} pszenicy
STR_QUANTITY_RUBBER :{VOLUME} kauczuku
-STR_QUANTITY_SUGAR :{COMMA} ton cukru
+STR_QUANTITY_SUGAR :{WEIGHT} cukru
STR_QUANTITY_TOYS :{COMMA} zabawek
STR_QUANTITY_SWEETS :{COMMA} paczek slodyczy
STR_QUANTITY_COLA :{VOLUME} coli
-STR_QUANTITY_CANDYFLOSS :{COMMA} ton waty cukrowej
+STR_QUANTITY_CANDYFLOSS :{WEIGHT} waty cukrowej
STR_QUANTITY_BUBBLES :{COMMA} babelkow
-STR_QUANTITY_TOFFEE :{COMMA} ton tofi
+STR_QUANTITY_TOFFEE :{WEIGHT} tofi
STR_QUANTITY_BATTERIES :{COMMA} bateri{P a e i}
STR_QUANTITY_PLASTIC :{VOLUME} plastiku
STR_QUANTITY_FIZZY_DRINKS :{COMMA} napoju gazowanego
diff --git a/lang/portuguese.txt b/lang/portuguese.txt
index 2635d0a6c..76e3ac57b 100644
--- a/lang/portuguese.txt
+++ b/lang/portuguese.txt
@@ -84,33 +84,33 @@ STR_004C_PLASTIC :Plástico
STR_004D_FIZZY_DRINK :Bebidas Gasosas
STR_QUANTITY_NOTHING :
STR_QUANTITY_PASSENGERS :{COMMA} passageiro{P "" s}
-STR_QUANTITY_COAL :{COMMA} tonelada{P "" s} de carvão
+STR_QUANTITY_COAL :{WEIGHT} de carvão
STR_QUANTITY_MAIL :{COMMA} saco{P "" s} de correio
STR_QUANTITY_OIL :{VOLUME} de petróleo
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_GRAIN :{WEIGHT} de cereais
+STR_QUANTITY_WOOD :{WEIGHT} de madeira
+STR_QUANTITY_IRON_ORE :{WEIGHT} de minério de ferro
+STR_QUANTITY_STEEL :{WEIGHT} 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_COPPER_ORE :{WEIGHT} de minério de cobre
+STR_QUANTITY_MAIZE :{WEIGHT} de milho
+STR_QUANTITY_FRUIT :{WEIGHT} 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_FOOD :{WEIGHT} de comida
+STR_QUANTITY_PAPER :{WEIGHT} de papel
STR_QUANTITY_GOLD :{COMMA} saco{P "" s} de ouro
STR_QUANTITY_WATER :{VOLUME} de água
-STR_QUANTITY_WHEAT :{COMMA} tonelada{P "" s} de trigo
+STR_QUANTITY_WHEAT :{WEIGHT} de trigo
STR_QUANTITY_RUBBER :{VOLUME} de borracha
-STR_QUANTITY_SUGAR :{COMMA} tonelada{P "" s} de açúcar
+STR_QUANTITY_SUGAR :{WEIGHT} 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{P "" s} de algodão doce
+STR_QUANTITY_CANDYFLOSS :{WEIGHT} de algodão doce
STR_QUANTITY_BUBBLES :{COMMA} bolha{P "" s}
-STR_QUANTITY_TOFFEE :{COMMA} tonelada{P "" s} de caramelo
+STR_QUANTITY_TOFFEE :{WEIGHT} de caramelo
STR_QUANTITY_BATTERIES :{COMMA} pilh{P y as}
STR_QUANTITY_PLASTIC :{VOLUME} de plástico
STR_QUANTITY_FIZZY_DRINKS :{COMMA} bebida{P "" s} gasosa{P "" s}
diff --git a/lang/romanian.txt b/lang/romanian.txt
index 50100237d..f90e0fbde 100644
--- a/lang/romanian.txt
+++ b/lang/romanian.txt
@@ -84,33 +84,33 @@ STR_004C_PLASTIC :plastic
STR_004D_FIZZY_DRINK :suc
STR_QUANTITY_NOTHING :
STR_QUANTITY_PASSENGERS :{COMMA} cãlãtor{P "" i}
-STR_QUANTITY_COAL :{COMMA} ton{P ã e} de cãrbune
+STR_QUANTITY_COAL :{WEIGHT} de cãrbune
STR_QUANTITY_MAIL :{COMMA} sac{P "" i} cu colete postale
STR_QUANTITY_OIL :{VOLUME} de petrol
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_GRAIN :{WEIGHT} de cereale
+STR_QUANTITY_WOOD :{WEIGHT} de lemne
+STR_QUANTITY_IRON_ORE :{WEIGHT} de minereu de fier
+STR_QUANTITY_STEEL :{WEIGHT} 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_COPPER_ORE :{WEIGHT} de minereu de cupru
+STR_QUANTITY_MAIZE :{WEIGHT} de porumb
+STR_QUANTITY_FRUIT :{WEIGHT} 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_FOOD :{WEIGHT} de alimente
+STR_QUANTITY_PAPER :{WEIGHT} de hârtie
STR_QUANTITY_GOLD :{COMMA} sac{P "" i} cu aur
STR_QUANTITY_WATER :{VOLUME} de apã
-STR_QUANTITY_WHEAT :{COMMA} ton{P ã e} de grâu
+STR_QUANTITY_WHEAT :{WEIGHT} de grâu
STR_QUANTITY_RUBBER :{VOLUME} de cauciuc
-STR_QUANTITY_SUGAR :{COMMA} ton{P ã e} de zahãr
+STR_QUANTITY_SUGAR :{WEIGHT} 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{P ã e} de vatã de zahãr
+STR_QUANTITY_CANDYFLOSS :{WEIGHT} de vatã de zahãr
STR_QUANTITY_BUBBLES :{COMMA} balonas{P "" e}
-STR_QUANTITY_TOFFEE :{COMMA} ton{P ã e} de caramel
+STR_QUANTITY_TOFFEE :{WEIGHT} de caramel
STR_QUANTITY_BATTERIES :{COMMA} bateri{P e i}
STR_QUANTITY_PLASTIC :{VOLUME} de plastic
STR_QUANTITY_FIZZY_DRINKS :{COMMA} bido{P n ane} cu suc
diff --git a/lang/slovak.txt b/lang/slovak.txt
index 4c1e02fee..ec15a5f40 100644
--- a/lang/slovak.txt
+++ b/lang/slovak.txt
@@ -84,33 +84,33 @@ STR_004C_PLASTIC :Zuvacky
STR_004D_FIZZY_DRINK :Sumienka
STR_QUANTITY_NOTHING :
STR_QUANTITY_PASSENGERS :{COMMA} cestujuci{P "" "" ch}
-STR_QUANTITY_COAL :{COMMA} ton{P a y ""} uhlia
+STR_QUANTITY_COAL :{WEIGHT} uhlia
STR_QUANTITY_MAIL :{COMMA} balik{P "" y ov} posty
STR_QUANTITY_OIL :{VOLUME} ropy
STR_QUANTITY_LIVESTOCK :{COMMA} kus{P "" y ov} dobytka
STR_QUANTITY_GOODS :{COMMA} deb{P na ny ien} tovaru
-STR_QUANTITY_GRAIN :{COMMA} ton{P a y ""} obilia
-STR_QUANTITY_WOOD :{COMMA} ton{P a y ""} dreva
-STR_QUANTITY_IRON_ORE :{COMMA} ton{P a y ""} zeleznej rudy
-STR_QUANTITY_STEEL :{COMMA} ton{P a y ""} ocele
+STR_QUANTITY_GRAIN :{WEIGHT} obilia
+STR_QUANTITY_WOOD :{WEIGHT} dreva
+STR_QUANTITY_IRON_ORE :{WEIGHT} zeleznej rudy
+STR_QUANTITY_STEEL :{WEIGHT} ocele
STR_QUANTITY_VALUABLES :{COMMA} vr{P eco ecia iec} cennosti
-STR_QUANTITY_COPPER_ORE :{COMMA} ton{P a y ""} medennej rudy
-STR_QUANTITY_MAIZE :{COMMA} ton{P a y ""} kukurice
-STR_QUANTITY_FRUIT :{COMMA} ton{P a y ""} ovocia
+STR_QUANTITY_COPPER_ORE :{WEIGHT} medennej rudy
+STR_QUANTITY_MAIZE :{WEIGHT} kukurice
+STR_QUANTITY_FRUIT :{WEIGHT} ovocia
STR_QUANTITY_DIAMONDS :{COMMA} deb{P na ny ien} diamantov
-STR_QUANTITY_FOOD :{COMMA} ton{P a y ""} jedla
-STR_QUANTITY_PAPER :{COMMA} ton{P a y ""} papiera
+STR_QUANTITY_FOOD :{WEIGHT} jedla
+STR_QUANTITY_PAPER :{WEIGHT} papiera
STR_QUANTITY_GOLD :{COMMA} deb{P na ny ien} zlata
STR_QUANTITY_WATER :{VOLUME} voda
-STR_QUANTITY_WHEAT :{COMMA} ton{P a y ""} psenice
+STR_QUANTITY_WHEAT :{WEIGHT} psenice
STR_QUANTITY_RUBBER :{VOLUME} kaucuk
-STR_QUANTITY_SUGAR :{COMMA} ton{P a y ""} cukru
+STR_QUANTITY_SUGAR :{WEIGHT} cukru
STR_QUANTITY_TOYS :{COMMA} hrac{P ka ky iek}
STR_QUANTITY_SWEETS :{COMMA} deb{P na ny ien} cukrikov
STR_QUANTITY_COLA :{VOLUME} kofola
-STR_QUANTITY_CANDYFLOSS :{COMMA} ton{P a y ""} cukrovej vaty
+STR_QUANTITY_CANDYFLOSS :{WEIGHT} cukrovej vaty
STR_QUANTITY_BUBBLES :{COMMA} bublin{P a y ""}
-STR_QUANTITY_TOFFEE :{COMMA} ton{P a y ""} karamelu
+STR_QUANTITY_TOFFEE :{WEIGHT} karamelu
STR_QUANTITY_BATTERIES :{COMMA} bateri{P a e i}
STR_QUANTITY_PLASTIC :{VOLUME} zuvacka
STR_QUANTITY_FIZZY_DRINKS :{COMMA} sumien{P ka ky ok}
diff --git a/lang/spanish.txt b/lang/spanish.txt
index 46824a8af..83f9de492 100644
--- a/lang/spanish.txt
+++ b/lang/spanish.txt
@@ -84,33 +84,33 @@ STR_004C_PLASTIC :Plástico
STR_004D_FIZZY_DRINK :Refresco
STR_QUANTITY_NOTHING :
STR_QUANTITY_PASSENGERS :{COMMA} pasajero{P "" s}
-STR_QUANTITY_COAL :{COMMA} tonelada{P "" s} de carbón
+STR_QUANTITY_COAL :{WEIGHT} de carbón
STR_QUANTITY_MAIL :{COMMA} saca{P "" s} de correo
STR_QUANTITY_OIL :{VOLUME} de petróleo
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_GRAIN :{WEIGHT} de grano
+STR_QUANTITY_WOOD :{WEIGHT} de madera
+STR_QUANTITY_IRON_ORE :{WEIGHT} de mineral de hierro
+STR_QUANTITY_STEEL :{WEIGHT} 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_COPPER_ORE :{WEIGHT} de mineral de cobre
+STR_QUANTITY_MAIZE :{WEIGHT} de maíz
+STR_QUANTITY_FRUIT :{WEIGHT} 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_FOOD :{WEIGHT} de alimento
+STR_QUANTITY_PAPER :{WEIGHT} de papel
STR_QUANTITY_GOLD :{COMMA} bolsa{P "" s} de oro
STR_QUANTITY_WATER :{VOLUME} de agua
-STR_QUANTITY_WHEAT :{COMMA} tonelada{P "" s} de trigo
+STR_QUANTITY_WHEAT :{WEIGHT} de trigo
STR_QUANTITY_RUBBER :{VOLUME} de caucho
-STR_QUANTITY_SUGAR :{COMMA} tonelada{P "" s} de azucar
+STR_QUANTITY_SUGAR :{WEIGHT} 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{P "" s} de algodón de azúcar
+STR_QUANTITY_CANDYFLOSS :{WEIGHT} 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_TOFFEE :{WEIGHT} de caramelo{P "" s}
STR_QUANTITY_BATTERIES :{COMMA} pila{P "" s}
STR_QUANTITY_PLASTIC :{VOLUME} de plástico
STR_QUANTITY_FIZZY_DRINKS :{COMMA} refresco{P "" s}
diff --git a/lang/swedish.txt b/lang/swedish.txt
index ea67fd139..f8c8cfbcb 100644
--- a/lang/swedish.txt
+++ b/lang/swedish.txt
@@ -84,33 +84,33 @@ STR_004C_PLASTIC :Plast
STR_004D_FIZZY_DRINK :läsk
STR_QUANTITY_NOTHING :
STR_QUANTITY_PASSENGERS :{COMMA} passagerare
-STR_QUANTITY_COAL :{COMMA} ton kol
+STR_QUANTITY_COAL :{WEIGHT} kol
STR_QUANTITY_MAIL :{COMMA} postsäck{P "" ar}
STR_QUANTITY_OIL :{VOLUME} olja
STR_QUANTITY_LIVESTOCK :{COMMA} boskap
STR_QUANTITY_GOODS :{COMMA} låd{P a or} gods
-STR_QUANTITY_GRAIN :{COMMA} ton spannmål
-STR_QUANTITY_WOOD :{COMMA} ton timmer
-STR_QUANTITY_IRON_ORE :{COMMA} ton järnmalm
-STR_QUANTITY_STEEL :{COMMA} ton stål
+STR_QUANTITY_GRAIN :{WEIGHT} spannmål
+STR_QUANTITY_WOOD :{WEIGHT} timmer
+STR_QUANTITY_IRON_ORE :{WEIGHT} järnmalm
+STR_QUANTITY_STEEL :{WEIGHT} stål
STR_QUANTITY_VALUABLES :{COMMA} värdesäck{P "" ar}
-STR_QUANTITY_COPPER_ORE :{COMMA} ton kopparmalm
-STR_QUANTITY_MAIZE :{COMMA} ton majs
-STR_QUANTITY_FRUIT :{COMMA} ton frukt
+STR_QUANTITY_COPPER_ORE :{WEIGHT} kopparmalm
+STR_QUANTITY_MAIZE :{WEIGHT} majs
+STR_QUANTITY_FRUIT :{WEIGHT} frukt
STR_QUANTITY_DIAMONDS :{COMMA} diamantsäck{P "" ar}
-STR_QUANTITY_FOOD :{COMMA} ton mat
-STR_QUANTITY_PAPER :{COMMA} ton papper
+STR_QUANTITY_FOOD :{WEIGHT} mat
+STR_QUANTITY_PAPER :{WEIGHT} papper
STR_QUANTITY_GOLD :{COMMA} guldsäck{P "" ar}
STR_QUANTITY_WATER :{VOLUME} vatten
-STR_QUANTITY_WHEAT :{COMMA} ton vete
+STR_QUANTITY_WHEAT :{WEIGHT} vete
STR_QUANTITY_RUBBER :{VOLUME} gummi
-STR_QUANTITY_SUGAR :{COMMA} ton socker
+STR_QUANTITY_SUGAR :{WEIGHT} socker
STR_QUANTITY_TOYS :{COMMA} leksak{P "" er}
STR_QUANTITY_SWEETS :{COMMA} godispås{P e ar}
STR_QUANTITY_COLA :{VOLUME} kola
-STR_QUANTITY_CANDYFLOSS :{COMMA} ton spunnet socker
+STR_QUANTITY_CANDYFLOSS :{WEIGHT} spunnet socker
STR_QUANTITY_BUBBLES :{COMMA} bubbl{P a or}
-STR_QUANTITY_TOFFEE :{COMMA} ton knäck
+STR_QUANTITY_TOFFEE :{WEIGHT} knäck
STR_QUANTITY_BATTERIES :{COMMA} batteri{P "" er}
STR_QUANTITY_PLASTIC :{VOLUME} plast
STR_QUANTITY_FIZZY_DRINKS :{COMMA} läsk
diff --git a/lang/turkish.txt b/lang/turkish.txt
index b795286e0..823555407 100644
--- a/lang/turkish.txt
+++ b/lang/turkish.txt
@@ -84,33 +84,33 @@ STR_004C_PLASTIC :Plastik
STR_004D_FIZZY_DRINK :içecek
STR_QUANTITY_NOTHING :
STR_QUANTITY_PASSENGERS :{COMMA} yolcu
-STR_QUANTITY_COAL :{COMMA} ton kömür
+STR_QUANTITY_COAL :{WEIGHT} kömür
STR_QUANTITY_MAIL :{COMMA} çanta posta
STR_QUANTITY_OIL :{VOLUME} petrol
STR_QUANTITY_LIVESTOCK :{COMMA} tane hayvan
STR_QUANTITY_GOODS :{COMMA} kasa esya
-STR_QUANTITY_GRAIN :{COMMA} ton tahil
-STR_QUANTITY_WOOD :{COMMA} ton odun
-STR_QUANTITY_IRON_ORE :{COMMA} ton demir
-STR_QUANTITY_STEEL :{COMMA} ton çelik
+STR_QUANTITY_GRAIN :{WEIGHT} tahil
+STR_QUANTITY_WOOD :{WEIGHT} odun
+STR_QUANTITY_IRON_ORE :{WEIGHT} demir
+STR_QUANTITY_STEEL :{WEIGHT} çelik
STR_QUANTITY_VALUABLES :{COMMA} çanta mücevher
-STR_QUANTITY_COPPER_ORE :{COMMA} ton bakir
-STR_QUANTITY_MAIZE :{COMMA} ton misir
-STR_QUANTITY_FRUIT :{COMMA} ton meyve
+STR_QUANTITY_COPPER_ORE :{WEIGHT} bakir
+STR_QUANTITY_MAIZE :{WEIGHT} misir
+STR_QUANTITY_FRUIT :{WEIGHT} meyve
STR_QUANTITY_DIAMONDS :{COMMA} canta elmas
-STR_QUANTITY_FOOD :{COMMA} ton yiyecek
-STR_QUANTITY_PAPER :{COMMA} ton kagit
+STR_QUANTITY_FOOD :{WEIGHT} yiyecek
+STR_QUANTITY_PAPER :{WEIGHT} kagit
STR_QUANTITY_GOLD :{COMMA} çanta altin
STR_QUANTITY_WATER :{VOLUME} su
-STR_QUANTITY_WHEAT :{COMMA} ton un
+STR_QUANTITY_WHEAT :{WEIGHT} un
STR_QUANTITY_RUBBER :{VOLUME} lastik
-STR_QUANTITY_SUGAR :{COMMA} ton seker
+STR_QUANTITY_SUGAR :{WEIGHT} seker
STR_QUANTITY_TOYS :{COMMA} oyuncak
STR_QUANTITY_SWEETS :{COMMA} canta tatli
STR_QUANTITY_COLA :{VOLUME} kola
-STR_QUANTITY_CANDYFLOSS :{COMMA} ton pamukhelva
+STR_QUANTITY_CANDYFLOSS :{WEIGHT} pamukhelva
STR_QUANTITY_BUBBLES :{COMMA} balon
-STR_QUANTITY_TOFFEE :{COMMA} ton bonbon
+STR_QUANTITY_TOFFEE :{WEIGHT} bonbon
STR_QUANTITY_BATTERIES :{COMMA} pil
STR_QUANTITY_PLASTIC :{VOLUME} plastik
STR_QUANTITY_FIZZY_DRINKS :{COMMA} içecek