summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/lang/afrikaans.txt8
-rw-r--r--src/lang/arabic_egypt.txt8
-rw-r--r--src/lang/basque.txt8
-rw-r--r--src/lang/belarusian.txt38
-rw-r--r--src/lang/brazilian_portuguese.txt8
-rw-r--r--src/lang/bulgarian.txt8
-rw-r--r--src/lang/catalan.txt8
-rw-r--r--src/lang/croatian.txt18
-rw-r--r--src/lang/czech.txt14
-rw-r--r--src/lang/danish.txt8
-rw-r--r--src/lang/dutch.txt8
-rw-r--r--src/lang/english_AU.txt8
-rw-r--r--src/lang/english_US.txt8
-rw-r--r--src/lang/esperanto.txt8
-rw-r--r--src/lang/estonian.txt10
-rw-r--r--src/lang/faroese.txt8
-rw-r--r--src/lang/finnish.txt8
-rw-r--r--src/lang/french.txt8
-rw-r--r--src/lang/gaelic.txt26
-rw-r--r--src/lang/galician.txt8
-rw-r--r--src/lang/german.txt8
-rw-r--r--src/lang/greek.txt14
-rw-r--r--src/lang/hebrew.txt10
-rw-r--r--src/lang/hungarian.txt14
-rw-r--r--src/lang/icelandic.txt8
-rw-r--r--src/lang/indonesian.txt8
-rw-r--r--src/lang/irish.txt8
-rw-r--r--src/lang/italian.txt8
-rw-r--r--src/lang/japanese.txt8
-rw-r--r--src/lang/korean.txt8
-rw-r--r--src/lang/latin.txt26
-rw-r--r--src/lang/latvian.txt8
-rw-r--r--src/lang/lithuanian.txt20
-rw-r--r--src/lang/luxembourgish.txt8
-rw-r--r--src/lang/malay.txt8
-rw-r--r--src/lang/norwegian_bokmal.txt8
-rw-r--r--src/lang/norwegian_nynorsk.txt8
-rw-r--r--src/lang/polish.txt42
-rw-r--r--src/lang/portuguese.txt8
-rw-r--r--src/lang/romanian.txt8
-rw-r--r--src/lang/russian.txt20
-rw-r--r--src/lang/serbian.txt26
-rw-r--r--src/lang/simplified_chinese.txt8
-rw-r--r--src/lang/slovak.txt14
-rw-r--r--src/lang/slovenian.txt26
-rw-r--r--src/lang/spanish.txt8
-rw-r--r--src/lang/spanish_MX.txt8
-rw-r--r--src/lang/swedish.txt8
-rw-r--r--src/lang/tamil.txt8
-rw-r--r--src/lang/thai.txt8
-rw-r--r--src/lang/traditional_chinese.txt8
-rw-r--r--src/lang/turkish.txt8
-rw-r--r--src/lang/ukrainian.txt20
-rw-r--r--src/lang/unfinished/chuvash.txt8
-rw-r--r--src/lang/unfinished/frisian.txt8
-rw-r--r--src/lang/unfinished/ido.txt8
-rw-r--r--src/lang/unfinished/macedonian.txt8
-rw-r--r--src/lang/unfinished/maltese.txt8
-rw-r--r--src/lang/unfinished/marathi.txt8
-rw-r--r--src/lang/unfinished/persian.txt8
-rw-r--r--src/lang/unfinished/urdu.txt8
-rw-r--r--src/lang/vietnamese.txt8
-rw-r--r--src/lang/welsh.txt8
63 files changed, 357 insertions, 357 deletions
diff --git a/src/lang/afrikaans.txt b/src/lang/afrikaans.txt
index abb65269a..5ac444e61 100644
--- a/src/lang/afrikaans.txt
+++ b/src/lang/afrikaans.txt
@@ -49,9 +49,9 @@ STR_CARGO_PLURAL_WHEAT :Koring
STR_CARGO_PLURAL_RUBBER :Rubber
STR_CARGO_PLURAL_SUGAR :Suiker
STR_CARGO_PLURAL_TOYS :Speelgoed
-STR_CARGO_PLURAL_CANDY :Lekkers
+STR_CARGO_PLURAL_SWEETS :Lekkers
STR_CARGO_PLURAL_COLA :Kola
-STR_CARGO_PLURAL_COTTON_CANDY :Spookasem
+STR_CARGO_PLURAL_CANDYFLOSS :Spookasem
STR_CARGO_PLURAL_BUBBLES :Borrels
STR_CARGO_PLURAL_TOFFEE :Toffie
STR_CARGO_PLURAL_BATTERIES :Batterye
@@ -83,9 +83,9 @@ STR_CARGO_SINGULAR_WHEAT :Koring
STR_CARGO_SINGULAR_RUBBER :Rubber
STR_CARGO_SINGULAR_SUGAR :Suiker
STR_CARGO_SINGULAR_TOY :Speelding
-STR_CARGO_SINGULAR_CANDY :Lekker
+STR_CARGO_SINGULAR_SWEETS :Lekker
STR_CARGO_SINGULAR_COLA :Kola
-STR_CARGO_SINGULAR_COTTON_CANDY :Spookasem
+STR_CARGO_SINGULAR_CANDYFLOSS :Spookasem
STR_CARGO_SINGULAR_BUBBLE :Borrel
STR_CARGO_SINGULAR_TOFFEE :Toffie
STR_CARGO_SINGULAR_BATTERY :Battery
diff --git a/src/lang/arabic_egypt.txt b/src/lang/arabic_egypt.txt
index c5df571ea..d86812afb 100644
--- a/src/lang/arabic_egypt.txt
+++ b/src/lang/arabic_egypt.txt
@@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT :قمح
STR_CARGO_PLURAL_RUBBER :مطاط
STR_CARGO_PLURAL_SUGAR :سكر
STR_CARGO_PLURAL_TOYS :دُمَي
-STR_CARGO_PLURAL_CANDY :حلويات
+STR_CARGO_PLURAL_SWEETS :حلويات
STR_CARGO_PLURAL_COLA :كولا
-STR_CARGO_PLURAL_COTTON_CANDY :سكر نبات
+STR_CARGO_PLURAL_CANDYFLOSS :سكر نبات
STR_CARGO_PLURAL_BUBBLES :فقاعات
STR_CARGO_PLURAL_TOFFEE :توفي
STR_CARGO_PLURAL_BATTERIES :بطاريات
@@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT :قمح
STR_CARGO_SINGULAR_RUBBER :مطاط
STR_CARGO_SINGULAR_SUGAR :سكر
STR_CARGO_SINGULAR_TOY :دُمِيه
-STR_CARGO_SINGULAR_CANDY :حلويات
+STR_CARGO_SINGULAR_SWEETS :حلويات
STR_CARGO_SINGULAR_COLA :كولا
-STR_CARGO_SINGULAR_COTTON_CANDY :سكر نبات
+STR_CARGO_SINGULAR_CANDYFLOSS :سكر نبات
STR_CARGO_SINGULAR_BUBBLE :فقاعات
STR_CARGO_SINGULAR_TOFFEE :توفي
STR_CARGO_SINGULAR_BATTERY :بطاريات
diff --git a/src/lang/basque.txt b/src/lang/basque.txt
index 088783db8..3c84f8df6 100644
--- a/src/lang/basque.txt
+++ b/src/lang/basque.txt
@@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT :Garia
STR_CARGO_PLURAL_RUBBER :Goma
STR_CARGO_PLURAL_SUGAR :Azukrea
STR_CARGO_PLURAL_TOYS :Jostailuak
-STR_CARGO_PLURAL_CANDY :Gozokiak
+STR_CARGO_PLURAL_SWEETS :Gozokiak
STR_CARGO_PLURAL_COLA :Kola
-STR_CARGO_PLURAL_COTTON_CANDY :Kotoiezko Azukrea
+STR_CARGO_PLURAL_CANDYFLOSS :Kotoiezko Azukrea
STR_CARGO_PLURAL_BUBBLES :Burbuilak
STR_CARGO_PLURAL_TOFFEE :Gozoki lehengaia
STR_CARGO_PLURAL_BATTERIES :Pilak
@@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT :Garia
STR_CARGO_SINGULAR_RUBBER :Goma
STR_CARGO_SINGULAR_SUGAR :Azukrea
STR_CARGO_SINGULAR_TOY :Jostailua
-STR_CARGO_SINGULAR_CANDY :Gozoki
+STR_CARGO_SINGULAR_SWEETS :Gozoki
STR_CARGO_SINGULAR_COLA :Kola
-STR_CARGO_SINGULAR_COTTON_CANDY :Kotoiezko Azukrea
+STR_CARGO_SINGULAR_CANDYFLOSS :Kotoiezko Azukrea
STR_CARGO_SINGULAR_BUBBLE :Burbuila
STR_CARGO_SINGULAR_TOFFEE :Gozoki lehengaia
STR_CARGO_SINGULAR_BATTERY :Pila
diff --git a/src/lang/belarusian.txt b/src/lang/belarusian.txt
index 29df4c3c2..e295b6028 100644
--- a/src/lang/belarusian.txt
+++ b/src/lang/belarusian.txt
@@ -166,7 +166,7 @@ STR_CARGO_PLURAL_TOYS.dat :цацкам
STR_CARGO_PLURAL_TOYS.acc :цацкі
STR_CARGO_PLURAL_TOYS.abl :цацкамі
STR_CARGO_PLURAL_TOYS.pre :цацках
-STR_CARGO_PLURAL_CANDY :{G=p}Цукеркi
+STR_CARGO_PLURAL_SWEETS :{G=p}Цукеркi
STR_CARGO_PLURAL_CANDY.gen :цукерак
STR_CARGO_PLURAL_CANDY.dat :цукеркам
STR_CARGO_PLURAL_CANDY.acc :цукеркі
@@ -178,12 +178,12 @@ STR_CARGO_PLURAL_COLA.dat :коле
STR_CARGO_PLURAL_COLA.acc :колу
STR_CARGO_PLURAL_COLA.abl :колай
STR_CARGO_PLURAL_COLA.pre :коле
-STR_CARGO_PLURAL_COTTON_CANDY :{G=f}Цукровая баўна
-STR_CARGO_PLURAL_COTTON_CANDY.gen :цукровай баўны
-STR_CARGO_PLURAL_COTTON_CANDY.dat :цукровай баўне
-STR_CARGO_PLURAL_COTTON_CANDY.acc :цукровую баўну
-STR_CARGO_PLURAL_COTTON_CANDY.abl :цукровай баўнай
-STR_CARGO_PLURAL_COTTON_CANDY.pre :цукровай баўне
+STR_CARGO_PLURAL_CANDYFLOSS :{G=f}Цукровая баўна
+STR_CARGO_PLURAL_CANDYFLOSS.gen :цукровай баўны
+STR_CARGO_PLURAL_CANDYFLOSS.dat :цукровай баўне
+STR_CARGO_PLURAL_CANDYFLOSS.acc :цукровую баўну
+STR_CARGO_PLURAL_CANDYFLOSS.abl :цукровай баўнай
+STR_CARGO_PLURAL_CANDYFLOSS.pre :цукровай баўне
STR_CARGO_PLURAL_BUBBLES :{G=p}Бурбалкi
STR_CARGO_PLURAL_BUBBLES.gen :бурбалак
STR_CARGO_PLURAL_BUBBLES.dat :бурбалкам
@@ -355,24 +355,24 @@ STR_CARGO_SINGULAR_TOY.dat :цаццы
STR_CARGO_SINGULAR_TOY.acc :цацку
STR_CARGO_SINGULAR_TOY.abl :цацкай
STR_CARGO_SINGULAR_TOY.pre :цаццы
-STR_CARGO_SINGULAR_CANDY :{G=f}Цукерка
-STR_CARGO_SINGULAR_CANDY.gen :цукеркі
-STR_CARGO_SINGULAR_CANDY.dat :цукерцы
-STR_CARGO_SINGULAR_CANDY.acc :цукерку
-STR_CARGO_SINGULAR_CANDY.abl :цукеркай
-STR_CARGO_SINGULAR_CANDY.pre :цукерцы
+STR_CARGO_SINGULAR_SWEETS :{G=f}Цукерка
+STR_CARGO_SINGULAR_SWEETS.gen :цукеркі
+STR_CARGO_SINGULAR_SWEETS.dat :цукерцы
+STR_CARGO_SINGULAR_SWEETS.acc :цукерку
+STR_CARGO_SINGULAR_SWEETS.abl :цукеркай
+STR_CARGO_SINGULAR_SWEETS.pre :цукерцы
STR_CARGO_SINGULAR_COLA :{G=f}Кола
STR_CARGO_SINGULAR_COLA.gen :колы
STR_CARGO_SINGULAR_COLA.dat :коле
STR_CARGO_SINGULAR_COLA.acc :колу
STR_CARGO_SINGULAR_COLA.abl :колай
STR_CARGO_SINGULAR_COLA.pre :коле
-STR_CARGO_SINGULAR_COTTON_CANDY :{G=f}Цукровая баўна
-STR_CARGO_SINGULAR_COTTON_CANDY.gen :цукровай баўны
-STR_CARGO_SINGULAR_COTTON_CANDY.dat :цукровай баўне
-STR_CARGO_SINGULAR_COTTON_CANDY.acc :цукровую баўну
-STR_CARGO_SINGULAR_COTTON_CANDY.abl :цукровай баўнай
-STR_CARGO_SINGULAR_COTTON_CANDY.pre :цукровай баўне
+STR_CARGO_SINGULAR_CANDYFLOSS :{G=f}Цукровая баўна
+STR_CARGO_SINGULAR_CANDYFLOSS.gen :цукровай баўны
+STR_CARGO_SINGULAR_CANDYFLOSS.dat :цукровай баўне
+STR_CARGO_SINGULAR_CANDYFLOSS.acc :цукровую баўну
+STR_CARGO_SINGULAR_CANDYFLOSS.abl :цукровай баўнай
+STR_CARGO_SINGULAR_CANDYFLOSS.pre :цукровай баўне
STR_CARGO_SINGULAR_BUBBLE :{G=f}Бурбалка
STR_CARGO_SINGULAR_BUBBLE.gen :бурбалкі
STR_CARGO_SINGULAR_BUBBLE.dat :бурбалцы
diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt
index 040a6e049..49d34f5bf 100644
--- a/src/lang/brazilian_portuguese.txt
+++ b/src/lang/brazilian_portuguese.txt
@@ -49,9 +49,9 @@ STR_CARGO_PLURAL_WHEAT :{G=m}Trigo
STR_CARGO_PLURAL_RUBBER :{G=f}Borracha
STR_CARGO_PLURAL_SUGAR :{G=m}Açúcar
STR_CARGO_PLURAL_TOYS :{G=m}Brinquedos
-STR_CARGO_PLURAL_CANDY :{G=m}Doces
+STR_CARGO_PLURAL_SWEETS :{G=m}Doces
STR_CARGO_PLURAL_COLA :{G=f}Cola
-STR_CARGO_PLURAL_COTTON_CANDY :{G=m}Algodão Doce
+STR_CARGO_PLURAL_CANDYFLOSS :{G=m}Algodão Doce
STR_CARGO_PLURAL_BUBBLES :{G=f}Bolhas
STR_CARGO_PLURAL_TOFFEE :{G=m}Caramelo
STR_CARGO_PLURAL_BATTERIES :{G=f}Pilhas
@@ -83,9 +83,9 @@ STR_CARGO_SINGULAR_WHEAT :{G=m}Trigo
STR_CARGO_SINGULAR_RUBBER :{G=f}Borracha
STR_CARGO_SINGULAR_SUGAR :{G=m}Açúcar
STR_CARGO_SINGULAR_TOY :{G=m}Brinquedo
-STR_CARGO_SINGULAR_CANDY :{G=m}Doce
+STR_CARGO_SINGULAR_SWEETS :{G=m}Doce
STR_CARGO_SINGULAR_COLA :{G=m}Cola
-STR_CARGO_SINGULAR_COTTON_CANDY :{G=m}Algodão doce
+STR_CARGO_SINGULAR_CANDYFLOSS :{G=m}Algodão doce
STR_CARGO_SINGULAR_BUBBLE :{G=f}Bolha
STR_CARGO_SINGULAR_TOFFEE :{G=m}Caramelo
STR_CARGO_SINGULAR_BATTERY :{G=f}Pilha
diff --git a/src/lang/bulgarian.txt b/src/lang/bulgarian.txt
index 37ead463b..c5a645caf 100644
--- a/src/lang/bulgarian.txt
+++ b/src/lang/bulgarian.txt
@@ -50,9 +50,9 @@ STR_CARGO_PLURAL_WHEAT :Пшеница
STR_CARGO_PLURAL_RUBBER :Каучук
STR_CARGO_PLURAL_SUGAR :Захар
STR_CARGO_PLURAL_TOYS :Играчки
-STR_CARGO_PLURAL_CANDY :Сладки
+STR_CARGO_PLURAL_SWEETS :Сладки
STR_CARGO_PLURAL_COLA :Кола
-STR_CARGO_PLURAL_COTTON_CANDY :Захарен памук
+STR_CARGO_PLURAL_CANDYFLOSS :Захарен памук
STR_CARGO_PLURAL_BUBBLES :Балони
STR_CARGO_PLURAL_TOFFEE :Карамел
STR_CARGO_PLURAL_BATTERIES :Батерии
@@ -84,9 +84,9 @@ STR_CARGO_SINGULAR_WHEAT :Пшеница
STR_CARGO_SINGULAR_RUBBER :Каучук
STR_CARGO_SINGULAR_SUGAR :Захар
STR_CARGO_SINGULAR_TOY :Играчки
-STR_CARGO_SINGULAR_CANDY :Сладки
+STR_CARGO_SINGULAR_SWEETS :Сладки
STR_CARGO_SINGULAR_COLA :Кола
-STR_CARGO_SINGULAR_COTTON_CANDY :Захарен памук
+STR_CARGO_SINGULAR_CANDYFLOSS :Захарен памук
STR_CARGO_SINGULAR_BUBBLE :Балони
STR_CARGO_SINGULAR_TOFFEE :Карамел
STR_CARGO_SINGULAR_BATTERY :Батерии
diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt
index 958632690..e2b456102 100644
--- a/src/lang/catalan.txt
+++ b/src/lang/catalan.txt
@@ -49,9 +49,9 @@ STR_CARGO_PLURAL_WHEAT :{G=Masculin}Bla
STR_CARGO_PLURAL_RUBBER :{G=Masculin}Cautxú
STR_CARGO_PLURAL_SUGAR :{G=Masculin}Sucre
STR_CARGO_PLURAL_TOYS :{G=Femenin}Joguines
-STR_CARGO_PLURAL_CANDY :{G=Masculin}Dolços
+STR_CARGO_PLURAL_SWEETS :{G=Masculin}Dolços
STR_CARGO_PLURAL_COLA :{G=Masculin}Refrescos
-STR_CARGO_PLURAL_COTTON_CANDY :{G=Masculin}Cotó de sucre
+STR_CARGO_PLURAL_CANDYFLOSS :{G=Masculin}Cotó de sucre
STR_CARGO_PLURAL_BUBBLES :{G=Femenin}Bombolles
STR_CARGO_PLURAL_TOFFEE :{G=Masculin}Caramels
STR_CARGO_PLURAL_BATTERIES :{G=Femenin}Piles
@@ -83,9 +83,9 @@ STR_CARGO_SINGULAR_WHEAT :{G=Masculin}Bla
STR_CARGO_SINGULAR_RUBBER :{G=Masculin}Cautxú
STR_CARGO_SINGULAR_SUGAR :{G=Masculin}Sucre
STR_CARGO_SINGULAR_TOY :{G=Femenin}Joguina
-STR_CARGO_SINGULAR_CANDY :{G=Masculin}Dolç
+STR_CARGO_SINGULAR_SWEETS :{G=Masculin}Dolç
STR_CARGO_SINGULAR_COLA :{G=Masculin}Refresc
-STR_CARGO_SINGULAR_COTTON_CANDY :{G=Masculin}Cotó de sucre
+STR_CARGO_SINGULAR_CANDYFLOSS :{G=Masculin}Cotó de sucre
STR_CARGO_SINGULAR_BUBBLE :{G=Femenin}Bombolla
STR_CARGO_SINGULAR_TOFFEE :{G=Masculin}Caramel
STR_CARGO_SINGULAR_BATTERY :{G=Femenin}Pila
diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt
index 8b44a0aea..3566934e5 100644
--- a/src/lang/croatian.txt
+++ b/src/lang/croatian.txt
@@ -73,12 +73,12 @@ STR_CARGO_PLURAL_SUGAR :Šećer
STR_CARGO_PLURAL_SUGAR.gen :šećera
STR_CARGO_PLURAL_TOYS :Igračke
STR_CARGO_PLURAL_TOYS.gen :igračaka
-STR_CARGO_PLURAL_CANDY :Slatkiši
+STR_CARGO_PLURAL_SWEETS :Slatkiši
STR_CARGO_PLURAL_CANDY.gen :slatkiša
STR_CARGO_PLURAL_COLA :Cola
STR_CARGO_PLURAL_COLA.gen :cole
-STR_CARGO_PLURAL_COTTON_CANDY :Šećerna vuna
-STR_CARGO_PLURAL_COTTON_CANDY.gen :šećerne vune
+STR_CARGO_PLURAL_CANDYFLOSS :Šećerna vuna
+STR_CARGO_PLURAL_CANDYFLOSS.gen :šećerne vune
STR_CARGO_PLURAL_BUBBLES :Baloni
STR_CARGO_PLURAL_BUBBLES.gen :balona
STR_CARGO_PLURAL_TOFFEE :Mliječne karamele
@@ -161,15 +161,15 @@ STR_CARGO_SINGULAR_SUGAR.aku :šećer
STR_CARGO_SINGULAR_TOY :Igračka
STR_CARGO_SINGULAR_TOY.gen :igračaka
STR_CARGO_SINGULAR_TOY.aku :igračku
-STR_CARGO_SINGULAR_CANDY :Slatkiš
-STR_CARGO_SINGULAR_CANDY.gen :slatkiša
-STR_CARGO_SINGULAR_CANDY.aku :slatkiš
+STR_CARGO_SINGULAR_SWEETS :Slatkiš
+STR_CARGO_SINGULAR_SWEETS.gen :slatkiša
+STR_CARGO_SINGULAR_SWEETS.aku :slatkiš
STR_CARGO_SINGULAR_COLA :Cola
STR_CARGO_SINGULAR_COLA.gen :cole
STR_CARGO_SINGULAR_COLA.aku :colu
-STR_CARGO_SINGULAR_COTTON_CANDY :Šećerna vuna
-STR_CARGO_SINGULAR_COTTON_CANDY.gen :šećerne vune
-STR_CARGO_SINGULAR_COTTON_CANDY.aku :šećernu vunu
+STR_CARGO_SINGULAR_CANDYFLOSS :Šećerna vuna
+STR_CARGO_SINGULAR_CANDYFLOSS.gen :šećerne vune
+STR_CARGO_SINGULAR_CANDYFLOSS.aku :šećernu vunu
STR_CARGO_SINGULAR_BUBBLE :Balon
STR_CARGO_SINGULAR_BUBBLE.gen :balona
STR_CARGO_SINGULAR_BUBBLE.aku :balon
diff --git a/src/lang/czech.txt b/src/lang/czech.txt
index 4f03a803d..0d0b8772d 100644
--- a/src/lang/czech.txt
+++ b/src/lang/czech.txt
@@ -102,17 +102,17 @@ STR_CARGO_PLURAL_SUGAR.big :Cukr
STR_CARGO_PLURAL_TOYS :hračky
STR_CARGO_PLURAL_TOYS.gen :hraček
STR_CARGO_PLURAL_TOYS.big :Hračky
-STR_CARGO_PLURAL_CANDY :bonbony
+STR_CARGO_PLURAL_SWEETS :bonbony
STR_CARGO_PLURAL_CANDY.gen :bonbonů
STR_CARGO_PLURAL_CANDY.big :Bonbony
STR_CARGO_PLURAL_COLA :kola
STR_CARGO_PLURAL_COLA.gen :koly
STR_CARGO_PLURAL_COLA.acc :kolu
STR_CARGO_PLURAL_COLA.big :Kola
-STR_CARGO_PLURAL_COTTON_CANDY :cukrová vata
-STR_CARGO_PLURAL_COTTON_CANDY.gen :cukrové vaty
-STR_CARGO_PLURAL_COTTON_CANDY.acc :cukrovou vatu
-STR_CARGO_PLURAL_COTTON_CANDY.big :Cukrová vata
+STR_CARGO_PLURAL_CANDYFLOSS :cukrová vata
+STR_CARGO_PLURAL_CANDYFLOSS.gen :cukrové vaty
+STR_CARGO_PLURAL_CANDYFLOSS.acc :cukrovou vatu
+STR_CARGO_PLURAL_CANDYFLOSS.big :Cukrová vata
STR_CARGO_PLURAL_BUBBLES :bubliny
STR_CARGO_PLURAL_BUBBLES.gen :bublin
STR_CARGO_PLURAL_BUBBLES.big :Bubliny
@@ -157,9 +157,9 @@ STR_CARGO_SINGULAR_WHEAT :pšenice
STR_CARGO_SINGULAR_RUBBER :kaučuku
STR_CARGO_SINGULAR_SUGAR :cukru
STR_CARGO_SINGULAR_TOY :hraček
-STR_CARGO_SINGULAR_CANDY :bonbonů
+STR_CARGO_SINGULAR_SWEETS :bonbonů
STR_CARGO_SINGULAR_COLA :koly
-STR_CARGO_SINGULAR_COTTON_CANDY :cukrové vaty
+STR_CARGO_SINGULAR_CANDYFLOSS :cukrové vaty
STR_CARGO_SINGULAR_BUBBLE :bublin
STR_CARGO_SINGULAR_TOFFEE :karamelu
STR_CARGO_SINGULAR_BATTERY :baterií
diff --git a/src/lang/danish.txt b/src/lang/danish.txt
index 10852b899..95d65615e 100644
--- a/src/lang/danish.txt
+++ b/src/lang/danish.txt
@@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT :Hvede
STR_CARGO_PLURAL_RUBBER :Gummi
STR_CARGO_PLURAL_SUGAR :Sukker
STR_CARGO_PLURAL_TOYS :Legetøj
-STR_CARGO_PLURAL_CANDY :Slik
+STR_CARGO_PLURAL_SWEETS :Slik
STR_CARGO_PLURAL_COLA :Cola
-STR_CARGO_PLURAL_COTTON_CANDY :Candyfloss
+STR_CARGO_PLURAL_CANDYFLOSS :Candyfloss
STR_CARGO_PLURAL_BUBBLES :Bobler
STR_CARGO_PLURAL_TOFFEE :Karamel
STR_CARGO_PLURAL_BATTERIES :Batterier
@@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT :Hvede
STR_CARGO_SINGULAR_RUBBER :Gummi
STR_CARGO_SINGULAR_SUGAR :Sukker
STR_CARGO_SINGULAR_TOY :Legetøj
-STR_CARGO_SINGULAR_CANDY :Slik
+STR_CARGO_SINGULAR_SWEETS :Slik
STR_CARGO_SINGULAR_COLA :Cola
-STR_CARGO_SINGULAR_COTTON_CANDY :Candyfloss
+STR_CARGO_SINGULAR_CANDYFLOSS :Candyfloss
STR_CARGO_SINGULAR_BUBBLE :Boble
STR_CARGO_SINGULAR_TOFFEE :Karamel
STR_CARGO_SINGULAR_BATTERY :Batteri
diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt
index e7d28ce11..4f3e3c3ac 100644
--- a/src/lang/dutch.txt
+++ b/src/lang/dutch.txt
@@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT :Tarwe
STR_CARGO_PLURAL_RUBBER :Rubber
STR_CARGO_PLURAL_SUGAR :Suiker
STR_CARGO_PLURAL_TOYS :Speelgoed
-STR_CARGO_PLURAL_CANDY :Snoep
+STR_CARGO_PLURAL_SWEETS :Snoep
STR_CARGO_PLURAL_COLA :Cola
-STR_CARGO_PLURAL_COTTON_CANDY :Suikerspin
+STR_CARGO_PLURAL_CANDYFLOSS :Suikerspin
STR_CARGO_PLURAL_BUBBLES :Bellen
STR_CARGO_PLURAL_TOFFEE :Toffee
STR_CARGO_PLURAL_BATTERIES :Batterijen
@@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT :Tarwe
STR_CARGO_SINGULAR_RUBBER :Rubber
STR_CARGO_SINGULAR_SUGAR :Suiker
STR_CARGO_SINGULAR_TOY :Speelgoed
-STR_CARGO_SINGULAR_CANDY :Snoep
+STR_CARGO_SINGULAR_SWEETS :Snoep
STR_CARGO_SINGULAR_COLA :Cola
-STR_CARGO_SINGULAR_COTTON_CANDY :Suikerspin
+STR_CARGO_SINGULAR_CANDYFLOSS :Suikerspin
STR_CARGO_SINGULAR_BUBBLE :Bubbel
STR_CARGO_SINGULAR_TOFFEE :Toffee
STR_CARGO_SINGULAR_BATTERY :Batterij
diff --git a/src/lang/english_AU.txt b/src/lang/english_AU.txt
index 177c9eb2b..a4a2b405d 100644
--- a/src/lang/english_AU.txt
+++ b/src/lang/english_AU.txt
@@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT :Wheat
STR_CARGO_PLURAL_RUBBER :Rubber
STR_CARGO_PLURAL_SUGAR :Sugar
STR_CARGO_PLURAL_TOYS :Toys
-STR_CARGO_PLURAL_CANDY :Lollies
+STR_CARGO_PLURAL_SWEETS :Lollies
STR_CARGO_PLURAL_COLA :Cola
-STR_CARGO_PLURAL_COTTON_CANDY :Fairy Floss
+STR_CARGO_PLURAL_CANDYFLOSS :Fairy Floss
STR_CARGO_PLURAL_BUBBLES :Bubbles
STR_CARGO_PLURAL_TOFFEE :Toffee
STR_CARGO_PLURAL_BATTERIES :Batteries
@@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT :Wheat
STR_CARGO_SINGULAR_RUBBER :Rubber
STR_CARGO_SINGULAR_SUGAR :Sugar
STR_CARGO_SINGULAR_TOY :Toy
-STR_CARGO_SINGULAR_CANDY :lollies
+STR_CARGO_SINGULAR_SWEETS :lollies
STR_CARGO_SINGULAR_COLA :Cola
-STR_CARGO_SINGULAR_COTTON_CANDY :Fairy Floss
+STR_CARGO_SINGULAR_CANDYFLOSS :Fairy Floss
STR_CARGO_SINGULAR_BUBBLE :Bubble
STR_CARGO_SINGULAR_TOFFEE :Toffee
STR_CARGO_SINGULAR_BATTERY :Battery
diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt
index b63351429..73b1bf42b 100644
--- a/src/lang/english_US.txt
+++ b/src/lang/english_US.txt
@@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT :Wheat
STR_CARGO_PLURAL_RUBBER :Rubber
STR_CARGO_PLURAL_SUGAR :Sugar
STR_CARGO_PLURAL_TOYS :Toys
-STR_CARGO_PLURAL_CANDY :Candy
+STR_CARGO_PLURAL_SWEETS :Candy
STR_CARGO_PLURAL_COLA :Cola
-STR_CARGO_PLURAL_COTTON_CANDY :Cotton Candy
+STR_CARGO_PLURAL_CANDYFLOSS :Cotton Candy
STR_CARGO_PLURAL_BUBBLES :Bubbles
STR_CARGO_PLURAL_TOFFEE :Toffee
STR_CARGO_PLURAL_BATTERIES :Batteries
@@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT :Wheat
STR_CARGO_SINGULAR_RUBBER :Rubber
STR_CARGO_SINGULAR_SUGAR :Sugar
STR_CARGO_SINGULAR_TOY :Toy
-STR_CARGO_SINGULAR_CANDY :Candy
+STR_CARGO_SINGULAR_SWEETS :Candy
STR_CARGO_SINGULAR_COLA :Cola
-STR_CARGO_SINGULAR_COTTON_CANDY :Cotton Candy
+STR_CARGO_SINGULAR_CANDYFLOSS :Cotton Candy
STR_CARGO_SINGULAR_BUBBLE :Bubble
STR_CARGO_SINGULAR_TOFFEE :Toffee
STR_CARGO_SINGULAR_BATTERY :Battery
diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt
index 6a03087e3..676314aa6 100644
--- a/src/lang/esperanto.txt
+++ b/src/lang/esperanto.txt
@@ -49,9 +49,9 @@ STR_CARGO_PLURAL_WHEAT :Tritiko
STR_CARGO_PLURAL_RUBBER :Kaŭĉuko
STR_CARGO_PLURAL_SUGAR :Sukero
STR_CARGO_PLURAL_TOYS :Ludiloj
-STR_CARGO_PLURAL_CANDY :Dolĉaĵoj
+STR_CARGO_PLURAL_SWEETS :Dolĉaĵoj
STR_CARGO_PLURAL_COLA :Kolao
-STR_CARGO_PLURAL_COTTON_CANDY :Sukerŝpinaĵoj
+STR_CARGO_PLURAL_CANDYFLOSS :Sukerŝpinaĵoj
STR_CARGO_PLURAL_BUBBLES :Vezikoj
STR_CARGO_PLURAL_TOFFEE :Tofeoj
STR_CARGO_PLURAL_BATTERIES :Baterioj
@@ -83,9 +83,9 @@ STR_CARGO_SINGULAR_WHEAT :Tritiko
STR_CARGO_SINGULAR_RUBBER :Kaŭĉuko
STR_CARGO_SINGULAR_SUGAR :Sukero
STR_CARGO_SINGULAR_TOY :Ludilo
-STR_CARGO_SINGULAR_CANDY :Dolĉaĵo
+STR_CARGO_SINGULAR_SWEETS :Dolĉaĵo
STR_CARGO_SINGULAR_COLA :Kolao
-STR_CARGO_SINGULAR_COTTON_CANDY :Sukerŝpinaĵo
+STR_CARGO_SINGULAR_CANDYFLOSS :Sukerŝpinaĵo
STR_CARGO_SINGULAR_BUBBLE :Veziko
STR_CARGO_SINGULAR_TOFFEE :Tofeo
STR_CARGO_SINGULAR_BATTERY :Baterio
diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt
index 383357dbc..eab1f86e3 100644
--- a/src/lang/estonian.txt
+++ b/src/lang/estonian.txt
@@ -72,12 +72,12 @@ STR_CARGO_PLURAL_SUGAR :Suhkur
STR_CARGO_PLURAL_SUGAR.g :Suhkru
STR_CARGO_PLURAL_TOYS :Mänguasjad
STR_CARGO_PLURAL_TOYS.g :Mänguasjade
-STR_CARGO_PLURAL_CANDY :Maiustused
+STR_CARGO_PLURAL_SWEETS :Maiustused
STR_CARGO_PLURAL_CANDY.g :Maiustuste
STR_CARGO_PLURAL_COLA :Koola
STR_CARGO_PLURAL_COLA.g :Koola
-STR_CARGO_PLURAL_COTTON_CANDY :Suhkruvatt
-STR_CARGO_PLURAL_COTTON_CANDY.g :Suhkruvati
+STR_CARGO_PLURAL_CANDYFLOSS :Suhkruvatt
+STR_CARGO_PLURAL_CANDYFLOSS.g :Suhkruvati
STR_CARGO_PLURAL_BUBBLES :Mullid
STR_CARGO_PLURAL_BUBBLES.g :Mullide
STR_CARGO_PLURAL_TOFFEE :Iiris
@@ -137,9 +137,9 @@ STR_CARGO_SINGULAR_SUGAR :Suhkur
STR_CARGO_SINGULAR_SUGAR.g :Suhkru
STR_CARGO_SINGULAR_TOY :Mänguasjad
STR_CARGO_SINGULAR_TOY.g :Mänguasjade
-STR_CARGO_SINGULAR_CANDY :Maiustus
+STR_CARGO_SINGULAR_SWEETS :Maiustus
STR_CARGO_SINGULAR_COLA :Koola
-STR_CARGO_SINGULAR_COTTON_CANDY :Suhkruvatt
+STR_CARGO_SINGULAR_CANDYFLOSS :Suhkruvatt
STR_CARGO_SINGULAR_BUBBLE :Mullid
STR_CARGO_SINGULAR_TOFFEE :Iiris
STR_CARGO_SINGULAR_TOFFEE.g :Iirise
diff --git a/src/lang/faroese.txt b/src/lang/faroese.txt
index 4f9592eb6..66ed873d6 100644
--- a/src/lang/faroese.txt
+++ b/src/lang/faroese.txt
@@ -49,9 +49,9 @@ STR_CARGO_PLURAL_WHEAT :{G=n}Hveiti
STR_CARGO_PLURAL_RUBBER :{G=n}Gummi
STR_CARGO_PLURAL_SUGAR :{G=n}Sukur
STR_CARGO_PLURAL_TOYS :{G=n}Leikutoy
-STR_CARGO_PLURAL_CANDY :{G=n}Góðgæti
+STR_CARGO_PLURAL_SWEETS :{G=n}Góðgæti
STR_CARGO_PLURAL_COLA :{G=n}Kola
-STR_CARGO_PLURAL_COTTON_CANDY :{G=n}Kandifloss
+STR_CARGO_PLURAL_CANDYFLOSS :{G=n}Kandifloss
STR_CARGO_PLURAL_BUBBLES :{G=f}Sápiblørir
STR_CARGO_PLURAL_TOFFEE :{G=n}Toffee
STR_CARGO_PLURAL_BATTERIES :{G=n}Battarí
@@ -83,9 +83,9 @@ STR_CARGO_SINGULAR_WHEAT :{G=n}Hveiti
STR_CARGO_SINGULAR_RUBBER :{G=n}Gummi
STR_CARGO_SINGULAR_SUGAR :{G=n}Sukur
STR_CARGO_SINGULAR_TOY :{G=n}Leikutoy
-STR_CARGO_SINGULAR_CANDY :{G=n}Góðgæti
+STR_CARGO_SINGULAR_SWEETS :{G=n}Góðgæti
STR_CARGO_SINGULAR_COLA :{G=n}Kola
-STR_CARGO_SINGULAR_COTTON_CANDY :{G=n}Kandifloss
+STR_CARGO_SINGULAR_CANDYFLOSS :{G=n}Kandifloss
STR_CARGO_SINGULAR_BUBBLE :{G=f}Sápibløra
STR_CARGO_SINGULAR_TOFFEE :{G=n}Toffee
STR_CARGO_SINGULAR_BATTERY :{G=n}Battarí
diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt
index c0dc8553c..b756e299c 100644
--- a/src/lang/finnish.txt
+++ b/src/lang/finnish.txt
@@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT :Vehnää
STR_CARGO_PLURAL_RUBBER :Kumia
STR_CARGO_PLURAL_SUGAR :Sokeria
STR_CARGO_PLURAL_TOYS :Leluja
-STR_CARGO_PLURAL_CANDY :Karkkia
+STR_CARGO_PLURAL_SWEETS :Karkkia
STR_CARGO_PLURAL_COLA :Limsaa
-STR_CARGO_PLURAL_COTTON_CANDY :Hattaraa
+STR_CARGO_PLURAL_CANDYFLOSS :Hattaraa
STR_CARGO_PLURAL_BUBBLES :Kuplia
STR_CARGO_PLURAL_TOFFEE :Toffeeta
STR_CARGO_PLURAL_BATTERIES :Paristoja
@@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT :Vehnä
STR_CARGO_SINGULAR_RUBBER :Kumi
STR_CARGO_SINGULAR_SUGAR :Sokeri
STR_CARGO_SINGULAR_TOY :Lelu
-STR_CARGO_SINGULAR_CANDY :Karkki
+STR_CARGO_SINGULAR_SWEETS :Karkki
STR_CARGO_SINGULAR_COLA :Limsa
-STR_CARGO_SINGULAR_COTTON_CANDY :Hattara
+STR_CARGO_SINGULAR_CANDYFLOSS :Hattara
STR_CARGO_SINGULAR_BUBBLE :Kupla
STR_CARGO_SINGULAR_TOFFEE :Toffee
STR_CARGO_SINGULAR_BATTERY :Paristo
diff --git a/src/lang/french.txt b/src/lang/french.txt
index d885db2ac..fba699ebb 100644
--- a/src/lang/french.txt
+++ b/src/lang/french.txt
@@ -49,9 +49,9 @@ STR_CARGO_PLURAL_WHEAT :Blé
STR_CARGO_PLURAL_RUBBER :Caoutchouc
STR_CARGO_PLURAL_SUGAR :Sucre
STR_CARGO_PLURAL_TOYS :Jouets
-STR_CARGO_PLURAL_CANDY :Bonbons
+STR_CARGO_PLURAL_SWEETS :Bonbons
STR_CARGO_PLURAL_COLA :Cola
-STR_CARGO_PLURAL_COTTON_CANDY :Barbe à papa
+STR_CARGO_PLURAL_CANDYFLOSS :Barbe à papa
STR_CARGO_PLURAL_BUBBLES :Bulles
STR_CARGO_PLURAL_TOFFEE :Caramel
STR_CARGO_PLURAL_BATTERIES :Batteries
@@ -83,9 +83,9 @@ STR_CARGO_SINGULAR_WHEAT :Blé
STR_CARGO_SINGULAR_RUBBER :Caoutchouc
STR_CARGO_SINGULAR_SUGAR :Sucre
STR_CARGO_SINGULAR_TOY :Jouet
-STR_CARGO_SINGULAR_CANDY :Bonbon
+STR_CARGO_SINGULAR_SWEETS :Bonbon
STR_CARGO_SINGULAR_COLA :Cola
-STR_CARGO_SINGULAR_COTTON_CANDY :Barbe à papa
+STR_CARGO_SINGULAR_CANDYFLOSS :Barbe à papa
STR_CARGO_SINGULAR_BUBBLE :Bulle
STR_CARGO_SINGULAR_TOFFEE :Caramel
STR_CARGO_SINGULAR_BATTERY :Batterie
diff --git a/src/lang/gaelic.txt b/src/lang/gaelic.txt
index 37f180cce..852ebee8f 100644
--- a/src/lang/gaelic.txt
+++ b/src/lang/gaelic.txt
@@ -119,7 +119,7 @@ STR_CARGO_PLURAL_TOYS :{G=f}Dèideagan
STR_CARGO_PLURAL_TOYS.nom :Dèideagan
STR_CARGO_PLURAL_TOYS.gen :Dhèideagan
STR_CARGO_PLURAL_TOYS.dat :Dèideagan
-STR_CARGO_PLURAL_CANDY :{G=m}Mìlseanan
+STR_CARGO_PLURAL_SWEETS :{G=m}Mìlseanan
STR_CARGO_PLURAL_CANDY.nom :Mìlseanan
STR_CARGO_PLURAL_CANDY.gen :Mhìlseanan
STR_CARGO_PLURAL_CANDY.dat :Mìlseanan
@@ -127,10 +127,10 @@ STR_CARGO_PLURAL_COLA :{G=m}Cola
STR_CARGO_PLURAL_COLA.nom :Cola
STR_CARGO_PLURAL_COLA.gen :Cola
STR_CARGO_PLURAL_COLA.dat :Cola
-STR_CARGO_PLURAL_COTTON_CANDY :{G=f}Canach-shiùcair
-STR_CARGO_PLURAL_COTTON_CANDY.nom :Canach-shiùcair
-STR_CARGO_PLURAL_COTTON_CANDY.gen :Canaich-siùcair
-STR_CARGO_PLURAL_COTTON_CANDY.dat :Canach-shiùcair
+STR_CARGO_PLURAL_CANDYFLOSS :{G=f}Canach-shiùcair
+STR_CARGO_PLURAL_CANDYFLOSS.nom :Canach-shiùcair
+STR_CARGO_PLURAL_CANDYFLOSS.gen :Canaich-siùcair
+STR_CARGO_PLURAL_CANDYFLOSS.dat :Canach-shiùcair
STR_CARGO_PLURAL_BUBBLES :{G=m}Builgeanan
STR_CARGO_PLURAL_BUBBLES.nom :Builgeanan
STR_CARGO_PLURAL_BUBBLES.gen :Bhuilgeanan
@@ -246,18 +246,18 @@ STR_CARGO_SINGULAR_TOY :{G=f}Dèideag
STR_CARGO_SINGULAR_TOY.nom :Dèideag
STR_CARGO_SINGULAR_TOY.gen :Dèideig
STR_CARGO_SINGULAR_TOY.dat :Dèideag
-STR_CARGO_SINGULAR_CANDY :{G=m}Mìlsean
-STR_CARGO_SINGULAR_CANDY.nom :Mìlsean
-STR_CARGO_SINGULAR_CANDY.gen :Mìlsein
-STR_CARGO_SINGULAR_CANDY.dat :Mìlsean
+STR_CARGO_SINGULAR_SWEETS :{G=m}Mìlsean
+STR_CARGO_SINGULAR_SWEETS.nom :Mìlsean
+STR_CARGO_SINGULAR_SWEETS.gen :Mìlsein
+STR_CARGO_SINGULAR_SWEETS.dat :Mìlsean
STR_CARGO_SINGULAR_COLA :{G=m}Cola
STR_CARGO_SINGULAR_COLA.nom :Cola
STR_CARGO_SINGULAR_COLA.gen :Cola
STR_CARGO_SINGULAR_COLA.dat :Cola
-STR_CARGO_SINGULAR_COTTON_CANDY :{G=f}Canach-shiùcair
-STR_CARGO_SINGULAR_COTTON_CANDY.nom :Canach-shiùcair
-STR_CARGO_SINGULAR_COTTON_CANDY.gen :Canaich-siùcair
-STR_CARGO_SINGULAR_COTTON_CANDY.dat :Canach-shiùcair
+STR_CARGO_SINGULAR_CANDYFLOSS :{G=f}Canach-shiùcair
+STR_CARGO_SINGULAR_CANDYFLOSS.nom :Canach-shiùcair
+STR_CARGO_SINGULAR_CANDYFLOSS.gen :Canaich-siùcair
+STR_CARGO_SINGULAR_CANDYFLOSS.dat :Canach-shiùcair
STR_CARGO_SINGULAR_BUBBLE :{G=m}Builgean
STR_CARGO_SINGULAR_BUBBLE.nom :Builgean
STR_CARGO_SINGULAR_BUBBLE.gen :Builgein
diff --git a/src/lang/galician.txt b/src/lang/galician.txt
index 577789b6b..5834e93d5 100644
--- a/src/lang/galician.txt
+++ b/src/lang/galician.txt
@@ -49,9 +49,9 @@ STR_CARGO_PLURAL_WHEAT :Trigo
STR_CARGO_PLURAL_RUBBER :Caucho
STR_CARGO_PLURAL_SUGAR :Azucre
STR_CARGO_PLURAL_TOYS :Xoguetes
-STR_CARGO_PLURAL_CANDY :Lambetadas
+STR_CARGO_PLURAL_SWEETS :Lambetadas
STR_CARGO_PLURAL_COLA :Cola
-STR_CARGO_PLURAL_COTTON_CANDY :Algodón de azucre
+STR_CARGO_PLURAL_CANDYFLOSS :Algodón de azucre
STR_CARGO_PLURAL_BUBBLES :Burbullas
STR_CARGO_PLURAL_TOFFEE :Toffee
STR_CARGO_PLURAL_BATTERIES :Pilas
@@ -83,9 +83,9 @@ STR_CARGO_SINGULAR_WHEAT :Trigo
STR_CARGO_SINGULAR_RUBBER :Caucho
STR_CARGO_SINGULAR_SUGAR :Azucre
STR_CARGO_SINGULAR_TOY :Xoguete
-STR_CARGO_SINGULAR_CANDY :Lambetada
+STR_CARGO_SINGULAR_SWEETS :Lambetada
STR_CARGO_SINGULAR_COLA :Cola
-STR_CARGO_SINGULAR_COTTON_CANDY :Algodón de azucre
+STR_CARGO_SINGULAR_CANDYFLOSS :Algodón de azucre
STR_CARGO_SINGULAR_BUBBLE :Burbulla
STR_CARGO_SINGULAR_TOFFEE :Toffee
STR_CARGO_SINGULAR_BATTERY :Pila
diff --git a/src/lang/german.txt b/src/lang/german.txt
index 2d1ea4574..2cad372f9 100644
--- a/src/lang/german.txt
+++ b/src/lang/german.txt
@@ -49,9 +49,9 @@ STR_CARGO_PLURAL_WHEAT :{G=m}Weizen
STR_CARGO_PLURAL_RUBBER :{G=m}Kautschuk
STR_CARGO_PLURAL_SUGAR :{G=m}Zucker
STR_CARGO_PLURAL_TOYS :{G=p}Spielzeuge
-STR_CARGO_PLURAL_CANDY :{G=p}Bonbons
+STR_CARGO_PLURAL_SWEETS :{G=p}Bonbons
STR_CARGO_PLURAL_COLA :{G=w}Cola
-STR_CARGO_PLURAL_COTTON_CANDY :{G=w}Zuckerwatte
+STR_CARGO_PLURAL_CANDYFLOSS :{G=w}Zuckerwatte
STR_CARGO_PLURAL_BUBBLES :{G=p}Luftblasen
STR_CARGO_PLURAL_TOFFEE :{G=n}Karamell
STR_CARGO_PLURAL_BATTERIES :{G=p}Batterien
@@ -83,9 +83,9 @@ STR_CARGO_SINGULAR_WHEAT :{G=n}Weizen
STR_CARGO_SINGULAR_RUBBER :{G=m}Kautschuk
STR_CARGO_SINGULAR_SUGAR :{G=m}Zucker
STR_CARGO_SINGULAR_TOY :{G=n}Spielzeug
-STR_CARGO_SINGULAR_CANDY :{G=m}Bonbon
+STR_CARGO_SINGULAR_SWEETS :{G=m}Bonbon
STR_CARGO_SINGULAR_COLA :{G=w}Cola
-STR_CARGO_SINGULAR_COTTON_CANDY :{G=w}Zuckerwatte
+STR_CARGO_SINGULAR_CANDYFLOSS :{G=w}Zuckerwatte
STR_CARGO_SINGULAR_BUBBLE :{G=w}Luftblase
STR_CARGO_SINGULAR_TOFFEE :{G=n}Karamell
STR_CARGO_SINGULAR_BATTERY :{G=w}Batterie
diff --git a/src/lang/greek.txt b/src/lang/greek.txt
index 65e565e3e..c09aa806f 100644
--- a/src/lang/greek.txt
+++ b/src/lang/greek.txt
@@ -72,12 +72,12 @@ STR_CARGO_PLURAL_SUGAR :{G=f}Ζάχαρ
STR_CARGO_PLURAL_SUGAR.geniki :Ζάχαρης
STR_CARGO_PLURAL_TOYS :{G=n}Παιχνίδια
STR_CARGO_PLURAL_TOYS.geniki :Παιχνιδιών
-STR_CARGO_PLURAL_CANDY :{G=n}Γλυκίσματα
+STR_CARGO_PLURAL_SWEETS :{G=n}Γλυκίσματα
STR_CARGO_PLURAL_CANDY.geniki :Γλυκισμάτων
STR_CARGO_PLURAL_COLA :{G=f}Κόλα
STR_CARGO_PLURAL_COLA.geniki :Κόλας
-STR_CARGO_PLURAL_COTTON_CANDY :{G=n}Μαλλιά της γριάς
-STR_CARGO_PLURAL_COTTON_CANDY.geniki :Μαλλιών της γριάς
+STR_CARGO_PLURAL_CANDYFLOSS :{G=n}Μαλλιά της γριάς
+STR_CARGO_PLURAL_CANDYFLOSS.geniki :Μαλλιών της γριάς
STR_CARGO_PLURAL_BUBBLES :{G=f}Φυσαλίδες
STR_CARGO_PLURAL_BUBBLES.geniki :Φυσαλίδων
STR_CARGO_PLURAL_TOFFEE :{G=n}Καραμέλες βουτύρου
@@ -136,11 +136,11 @@ STR_CARGO_SINGULAR_SUGAR :{G=f}Ζάχαρ
STR_CARGO_SINGULAR_SUGAR.subs :Ζάχαρες
STR_CARGO_SINGULAR_TOY :{G=n}Παιχνίδι
STR_CARGO_SINGULAR_TOY.subs :Παιχνίδια
-STR_CARGO_SINGULAR_CANDY :{G=n}Γλυκό
-STR_CARGO_SINGULAR_CANDY.subs :Γλυκα
+STR_CARGO_SINGULAR_SWEETS :{G=n}Γλυκό
+STR_CARGO_SINGULAR_SWEETS.subs :Γλυκα
STR_CARGO_SINGULAR_COLA :{G=f}Κόλα
-STR_CARGO_SINGULAR_COTTON_CANDY :{G=n}Μαλλί της γριάς
-STR_CARGO_SINGULAR_COTTON_CANDY.subs :Μαλλί της γριάς
+STR_CARGO_SINGULAR_CANDYFLOSS :{G=n}Μαλλί της γριάς
+STR_CARGO_SINGULAR_CANDYFLOSS.subs :Μαλλί της γριάς
STR_CARGO_SINGULAR_BUBBLE :{G=f}Φυσαλίδα
STR_CARGO_SINGULAR_BUBBLE.subs :Φυσαλίδες
STR_CARGO_SINGULAR_TOFFEE :{G=n}Καραμέλα βουτύρου
diff --git a/src/lang/hebrew.txt b/src/lang/hebrew.txt
index 2bdba01d9..5a8f15312 100644
--- a/src/lang/hebrew.txt
+++ b/src/lang/hebrew.txt
@@ -50,9 +50,9 @@ STR_CARGO_PLURAL_WHEAT :חיטה
STR_CARGO_PLURAL_RUBBER :גומי
STR_CARGO_PLURAL_SUGAR :סוכר
STR_CARGO_PLURAL_TOYS :צעצועים
-STR_CARGO_PLURAL_CANDY :ממתקים
+STR_CARGO_PLURAL_SWEETS :ממתקים
STR_CARGO_PLURAL_COLA :קולה
-STR_CARGO_PLURAL_COTTON_CANDY :שערות סבתא
+STR_CARGO_PLURAL_CANDYFLOSS :שערות סבתא
STR_CARGO_PLURAL_BUBBLES :בועות
STR_CARGO_PLURAL_TOFFEE :טופי
STR_CARGO_PLURAL_BATTERIES :סוללות
@@ -92,10 +92,10 @@ STR_CARGO_SINGULAR_RUBBER :גומי
STR_CARGO_SINGULAR_SUGAR :סוכר
STR_CARGO_SINGULAR_TOY :צעצוע
STR_CARGO_SINGULAR_TOY.plural :צעצועים
-STR_CARGO_SINGULAR_CANDY :ממתק
-STR_CARGO_SINGULAR_CANDY.plural :ממתקים
+STR_CARGO_SINGULAR_SWEETS :ממתק
+STR_CARGO_SINGULAR_SWEETS.plural :ממתקים
STR_CARGO_SINGULAR_COLA :קולה
-STR_CARGO_SINGULAR_COTTON_CANDY :צמר גפן מתוק
+STR_CARGO_SINGULAR_CANDYFLOSS :צמר גפן מתוק
STR_CARGO_SINGULAR_BUBBLE :בועה
STR_CARGO_SINGULAR_BUBBLE.plural :בועות
STR_CARGO_SINGULAR_TOFFEE :טופי
diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt
index 8520f8fea..c3ed93acc 100644
--- a/src/lang/hungarian.txt
+++ b/src/lang/hungarian.txt
@@ -72,12 +72,12 @@ STR_CARGO_PLURAL_SUGAR :Cukor
STR_CARGO_PLURAL_SUGAR.t :cukrot
STR_CARGO_PLURAL_TOYS :Játék
STR_CARGO_PLURAL_TOYS.t :játékot
-STR_CARGO_PLURAL_CANDY :Cukorka
+STR_CARGO_PLURAL_SWEETS :Cukorka
STR_CARGO_PLURAL_CANDY.t :cukorkát
STR_CARGO_PLURAL_COLA :Kóla
STR_CARGO_PLURAL_COLA.t :kólát
-STR_CARGO_PLURAL_COTTON_CANDY :Vattacukor
-STR_CARGO_PLURAL_COTTON_CANDY.t :vattacukrot
+STR_CARGO_PLURAL_CANDYFLOSS :Vattacukor
+STR_CARGO_PLURAL_CANDYFLOSS.t :vattacukrot
STR_CARGO_PLURAL_BUBBLES :Buborék
STR_CARGO_PLURAL_BUBBLES.t :buborékot
STR_CARGO_PLURAL_TOFFEE :Tejkaramella
@@ -137,12 +137,12 @@ STR_CARGO_SINGULAR_SUGAR :cukor
STR_CARGO_SINGULAR_SUGAR.t :cukrot
STR_CARGO_SINGULAR_TOY :játék
STR_CARGO_SINGULAR_TOY.t :játékot
-STR_CARGO_SINGULAR_CANDY :cukorka
-STR_CARGO_SINGULAR_CANDY.t :cukorkát
+STR_CARGO_SINGULAR_SWEETS :cukorka
+STR_CARGO_SINGULAR_SWEETS.t :cukorkát
STR_CARGO_SINGULAR_COLA :kóla
STR_CARGO_SINGULAR_COLA.t :kólát
-STR_CARGO_SINGULAR_COTTON_CANDY :vattacukor
-STR_CARGO_SINGULAR_COTTON_CANDY.t :vattacukrot
+STR_CARGO_SINGULAR_CANDYFLOSS :vattacukor
+STR_CARGO_SINGULAR_CANDYFLOSS.t :vattacukrot
STR_CARGO_SINGULAR_BUBBLE :buborék
STR_CARGO_SINGULAR_BUBBLE.t :buborékot
STR_CARGO_SINGULAR_TOFFEE :tejkaramella
diff --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt
index f25b2d315..eca04147e 100644
--- a/src/lang/icelandic.txt
+++ b/src/lang/icelandic.txt
@@ -49,9 +49,9 @@ STR_CARGO_PLURAL_WHEAT :Hveiti
STR_CARGO_PLURAL_RUBBER :Gúmmí
STR_CARGO_PLURAL_SUGAR :Sykur
STR_CARGO_PLURAL_TOYS :Leikföng
-STR_CARGO_PLURAL_CANDY :Sælgæti
+STR_CARGO_PLURAL_SWEETS :Sælgæti
STR_CARGO_PLURAL_COLA :Kóladrykkir
-STR_CARGO_PLURAL_COTTON_CANDY :Sykurfrauð
+STR_CARGO_PLURAL_CANDYFLOSS :Sykurfrauð
STR_CARGO_PLURAL_BUBBLES :Kúlur
STR_CARGO_PLURAL_TOFFEE :Toffý
STR_CARGO_PLURAL_BATTERIES :Rafhlöður
@@ -83,9 +83,9 @@ STR_CARGO_SINGULAR_WHEAT :Hveitis
STR_CARGO_SINGULAR_RUBBER :Gúmmí
STR_CARGO_SINGULAR_SUGAR :Sykur
STR_CARGO_SINGULAR_TOY :Leikfanga
-STR_CARGO_SINGULAR_CANDY :Sælgætis
+STR_CARGO_SINGULAR_SWEETS :Sælgætis
STR_CARGO_SINGULAR_COLA :Kóladrykkja
-STR_CARGO_SINGULAR_COTTON_CANDY :Sykurfrauðs
+STR_CARGO_SINGULAR_CANDYFLOSS :Sykurfrauðs
STR_CARGO_SINGULAR_BUBBLE :Kúlu
STR_CARGO_SINGULAR_TOFFEE :Toffý
STR_CARGO_SINGULAR_BATTERY :Rafhlöðu
diff --git a/src/lang/indonesian.txt b/src/lang/indonesian.txt
index 70a240208..dc1a20878 100644
--- a/src/lang/indonesian.txt
+++ b/src/lang/indonesian.txt
@@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT :Gandum
STR_CARGO_PLURAL_RUBBER :Karet
STR_CARGO_PLURAL_SUGAR :Gula
STR_CARGO_PLURAL_TOYS :Mainan
-STR_CARGO_PLURAL_CANDY :Manisan
+STR_CARGO_PLURAL_SWEETS :Manisan
STR_CARGO_PLURAL_COLA :Kola
-STR_CARGO_PLURAL_COTTON_CANDY :Arum Manis
+STR_CARGO_PLURAL_CANDYFLOSS :Arum Manis
STR_CARGO_PLURAL_BUBBLES :Gelembung
STR_CARGO_PLURAL_TOFFEE :Gula-gula
STR_CARGO_PLURAL_BATTERIES :Baterai
@@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT :Gandum
STR_CARGO_SINGULAR_RUBBER :Karet
STR_CARGO_SINGULAR_SUGAR :Gula
STR_CARGO_SINGULAR_TOY :Mainan
-STR_CARGO_SINGULAR_CANDY :Manisan
+STR_CARGO_SINGULAR_SWEETS :Manisan
STR_CARGO_SINGULAR_COLA :Kola
-STR_CARGO_SINGULAR_COTTON_CANDY :Arum Manis
+STR_CARGO_SINGULAR_CANDYFLOSS :Arum Manis
STR_CARGO_SINGULAR_BUBBLE :Gelembung
STR_CARGO_SINGULAR_TOFFEE :Gula-gula
STR_CARGO_SINGULAR_BATTERY :Baterai
diff --git a/src/lang/irish.txt b/src/lang/irish.txt
index 527daebf1..0658941a7 100644
--- a/src/lang/irish.txt
+++ b/src/lang/irish.txt
@@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT :Cruinneacht
STR_CARGO_PLURAL_RUBBER :Rubar
STR_CARGO_PLURAL_SUGAR :Siúcra
STR_CARGO_PLURAL_TOYS :Bréagáin
-STR_CARGO_PLURAL_CANDY :Milseáin
+STR_CARGO_PLURAL_SWEETS :Milseáin
STR_CARGO_PLURAL_COLA :Cóla
-STR_CARGO_PLURAL_COTTON_CANDY :Scamall siúcra
+STR_CARGO_PLURAL_CANDYFLOSS :Scamall siúcra
STR_CARGO_PLURAL_BUBBLES :Súilíní
STR_CARGO_PLURAL_TOFFEE :Taifí
STR_CARGO_PLURAL_BATTERIES :Cadhnraí
@@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT :Cruithneacht
STR_CARGO_SINGULAR_RUBBER :Rubar
STR_CARGO_SINGULAR_SUGAR :Siúcra
STR_CARGO_SINGULAR_TOY :Bréagán
-STR_CARGO_SINGULAR_CANDY :Milseán
+STR_CARGO_SINGULAR_SWEETS :Milseán
STR_CARGO_SINGULAR_COLA :Cóla
-STR_CARGO_SINGULAR_COTTON_CANDY :Scamall siúcra
+STR_CARGO_SINGULAR_CANDYFLOSS :Scamall siúcra
STR_CARGO_SINGULAR_BUBBLE :Súilín
STR_CARGO_SINGULAR_TOFFEE :Taifí
STR_CARGO_SINGULAR_BATTERY :Ceallra
diff --git a/src/lang/italian.txt b/src/lang/italian.txt
index 94784dc45..770ddc41a 100644
--- a/src/lang/italian.txt
+++ b/src/lang/italian.txt
@@ -50,9 +50,9 @@ STR_CARGO_PLURAL_WHEAT :{G=m}Frumento
STR_CARGO_PLURAL_RUBBER :{G=f}Gomma
STR_CARGO_PLURAL_SUGAR :{G=m}Zucchero
STR_CARGO_PLURAL_TOYS :{G=m}Giocattoli
-STR_CARGO_PLURAL_CANDY :{G=f}Caramelle
+STR_CARGO_PLURAL_SWEETS :{G=f}Caramelle
STR_CARGO_PLURAL_COLA :{G=f}Cola
-STR_CARGO_PLURAL_COTTON_CANDY :{G=m}Zucchero filato
+STR_CARGO_PLURAL_CANDYFLOSS :{G=m}Zucchero filato
STR_CARGO_PLURAL_BUBBLES :{G=f}Bollicine
STR_CARGO_PLURAL_TOFFEE :{G=m}Toffee
STR_CARGO_PLURAL_BATTERIES :{G=f}Batterie
@@ -84,9 +84,9 @@ STR_CARGO_SINGULAR_WHEAT :{G=m}Frumento
STR_CARGO_SINGULAR_RUBBER :{G=f}Gomma
STR_CARGO_SINGULAR_SUGAR :{G=m}Zucchero
STR_CARGO_SINGULAR_TOY :{G=m}Giocattolo
-STR_CARGO_SINGULAR_CANDY :{G=f}Caramella
+STR_CARGO_SINGULAR_SWEETS :{G=f}Caramella
STR_CARGO_SINGULAR_COLA :{G=f}Cola
-STR_CARGO_SINGULAR_COTTON_CANDY :{G=m}Zucchero filato
+STR_CARGO_SINGULAR_CANDYFLOSS :{G=m}Zucchero filato
STR_CARGO_SINGULAR_BUBBLE :{G=f}Bollicine
STR_CARGO_SINGULAR_TOFFEE :{G=m}Toffee
STR_CARGO_SINGULAR_BATTERY :{G=f}Batterie
diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt
index 5a157e91d..203a33ab3 100644
--- a/src/lang/japanese.txt
+++ b/src/lang/japanese.txt
@@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT :小麦
STR_CARGO_PLURAL_RUBBER :ゴム
STR_CARGO_PLURAL_SUGAR :砂糖
STR_CARGO_PLURAL_TOYS :おもちゃ
-STR_CARGO_PLURAL_CANDY :お菓子
+STR_CARGO_PLURAL_SWEETS :お菓子
STR_CARGO_PLURAL_COLA :コーラ
-STR_CARGO_PLURAL_COTTON_CANDY :わたあめ
+STR_CARGO_PLURAL_CANDYFLOSS :わたあめ
STR_CARGO_PLURAL_BUBBLES :泡
STR_CARGO_PLURAL_TOFFEE :タフィー
STR_CARGO_PLURAL_BATTERIES :電池
@@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT :小麦
STR_CARGO_SINGULAR_RUBBER :ゴム
STR_CARGO_SINGULAR_SUGAR :砂糖
STR_CARGO_SINGULAR_TOY :おもちゃ
-STR_CARGO_SINGULAR_CANDY :お菓子
+STR_CARGO_SINGULAR_SWEETS :お菓子
STR_CARGO_SINGULAR_COLA :コーラ
-STR_CARGO_SINGULAR_COTTON_CANDY :わたあめ
+STR_CARGO_SINGULAR_CANDYFLOSS :わたあめ
STR_CARGO_SINGULAR_BUBBLE :泡
STR_CARGO_SINGULAR_TOFFEE :タフィー
STR_CARGO_SINGULAR_BATTERY :電池
diff --git a/src/lang/korean.txt b/src/lang/korean.txt
index 68d66b1bd..dfd20b2d5 100644
--- a/src/lang/korean.txt
+++ b/src/lang/korean.txt
@@ -49,9 +49,9 @@ STR_CARGO_PLURAL_WHEAT :{G=m}밀
STR_CARGO_PLURAL_RUBBER :{G=f}고무
STR_CARGO_PLURAL_SUGAR :{G=m}설탕
STR_CARGO_PLURAL_TOYS :{G=m}장난감
-STR_CARGO_PLURAL_CANDY :{G=m}사탕
+STR_CARGO_PLURAL_SWEETS :{G=m}사탕
STR_CARGO_PLURAL_COLA :{G=f}콜라
-STR_CARGO_PLURAL_COTTON_CANDY :{G=m}솜사탕
+STR_CARGO_PLURAL_CANDYFLOSS :{G=m}솜사탕
STR_CARGO_PLURAL_BUBBLES :{G=m}거품
STR_CARGO_PLURAL_TOFFEE :{G=f}토피
STR_CARGO_PLURAL_BATTERIES :{G=f}건전지
@@ -83,9 +83,9 @@ STR_CARGO_SINGULAR_WHEAT :{G=m}밀
STR_CARGO_SINGULAR_RUBBER :{G=f}고무
STR_CARGO_SINGULAR_SUGAR :{G=m}설탕
STR_CARGO_SINGULAR_TOY :{G=m}장난감
-STR_CARGO_SINGULAR_CANDY :{G=m}사탕
+STR_CARGO_SINGULAR_SWEETS :{G=m}사탕
STR_CARGO_SINGULAR_COLA :{G=f}콜라
-STR_CARGO_SINGULAR_COTTON_CANDY :{G=m}솜사탕
+STR_CARGO_SINGULAR_CANDYFLOSS :{G=m}솜사탕
STR_CARGO_SINGULAR_BUBBLE :{G=m}거품
STR_CARGO_SINGULAR_TOFFEE :{G=f}토피
STR_CARGO_SINGULAR_BATTERY :{G=f}건전지
diff --git a/src/lang/latin.txt b/src/lang/latin.txt
index 3fe5a1129..a61630ede 100644
--- a/src/lang/latin.txt
+++ b/src/lang/latin.txt
@@ -119,7 +119,7 @@ STR_CARGO_PLURAL_TOYS :{G=np}Ludicra
STR_CARGO_PLURAL_TOYS.gen :ludicrorum
STR_CARGO_PLURAL_TOYS.acc :Ludicra
STR_CARGO_PLURAL_TOYS.dat :Ludicris
-STR_CARGO_PLURAL_CANDY :{G=np}Bellaria
+STR_CARGO_PLURAL_SWEETS :{G=np}Bellaria
STR_CARGO_PLURAL_CANDY.gen :bellariorum
STR_CARGO_PLURAL_CANDY.acc :Bellaria
STR_CARGO_PLURAL_CANDY.dat :Bellariis
@@ -127,10 +127,10 @@ STR_CARGO_PLURAL_COLA :{G=f}Cola
STR_CARGO_PLURAL_COLA.gen :colae
STR_CARGO_PLURAL_COLA.acc :Colam
STR_CARGO_PLURAL_COLA.dat :Colae
-STR_CARGO_PLURAL_COTTON_CANDY :{G=n}Sacchari Xylinum
-STR_CARGO_PLURAL_COTTON_CANDY.gen :sacchari xylini
-STR_CARGO_PLURAL_COTTON_CANDY.acc :Sacchari Xylinum
-STR_CARGO_PLURAL_COTTON_CANDY.dat :Sacchari Xylino
+STR_CARGO_PLURAL_CANDYFLOSS :{G=n}Sacchari Xylinum
+STR_CARGO_PLURAL_CANDYFLOSS.gen :sacchari xylini
+STR_CARGO_PLURAL_CANDYFLOSS.acc :Sacchari Xylinum
+STR_CARGO_PLURAL_CANDYFLOSS.dat :Sacchari Xylino
STR_CARGO_PLURAL_BUBBLES :{G=fp}Bullae
STR_CARGO_PLURAL_BUBBLES.gen :bullarum
STR_CARGO_PLURAL_BUBBLES.acc :Bullas
@@ -246,18 +246,18 @@ STR_CARGO_SINGULAR_TOY :{G=np}Ludicra
STR_CARGO_SINGULAR_TOY.gen :ludicrorum
STR_CARGO_SINGULAR_TOY.acc :Ludicra
STR_CARGO_SINGULAR_TOY.dat :Ludicris
-STR_CARGO_SINGULAR_CANDY :{G=np}Bellaria
-STR_CARGO_SINGULAR_CANDY.gen :bellariorum
-STR_CARGO_SINGULAR_CANDY.acc :Bellaria
-STR_CARGO_SINGULAR_CANDY.dat :Bellariis
+STR_CARGO_SINGULAR_SWEETS :{G=np}Bellaria
+STR_CARGO_SINGULAR_SWEETS.gen :bellariorum
+STR_CARGO_SINGULAR_SWEETS.acc :Bellaria
+STR_CARGO_SINGULAR_SWEETS.dat :Bellariis
STR_CARGO_SINGULAR_COLA :{G=f}Cola
STR_CARGO_SINGULAR_COLA.gen :colae
STR_CARGO_SINGULAR_COLA.acc :Colam
STR_CARGO_SINGULAR_COLA.dat :Colae
-STR_CARGO_SINGULAR_COTTON_CANDY :{G=n}Sacchari Xylinum
-STR_CARGO_SINGULAR_COTTON_CANDY.gen :sacchari xylini
-STR_CARGO_SINGULAR_COTTON_CANDY.acc :Sacchari Xylinum
-STR_CARGO_SINGULAR_COTTON_CANDY.dat :Sacchari Xylino
+STR_CARGO_SINGULAR_CANDYFLOSS :{G=n}Sacchari Xylinum
+STR_CARGO_SINGULAR_CANDYFLOSS.gen :sacchari xylini
+STR_CARGO_SINGULAR_CANDYFLOSS.acc :Sacchari Xylinum
+STR_CARGO_SINGULAR_CANDYFLOSS.dat :Sacchari Xylino
STR_CARGO_SINGULAR_BUBBLE :{G=fp}Bullae
STR_CARGO_SINGULAR_BUBBLE.gen :bullarum
STR_CARGO_SINGULAR_BUBBLE.acc :Bullas
diff --git a/src/lang/latvian.txt b/src/lang/latvian.txt
index b4811bb90..e14040c1a 100644
--- a/src/lang/latvian.txt
+++ b/src/lang/latvian.txt
@@ -50,9 +50,9 @@ STR_CARGO_PLURAL_WHEAT :Kvieši
STR_CARGO_PLURAL_RUBBER :Kaučuks
STR_CARGO_PLURAL_SUGAR :Cukurs
STR_CARGO_PLURAL_TOYS :Rotaļlietas
-STR_CARGO_PLURAL_CANDY :Saldumi
+STR_CARGO_PLURAL_SWEETS :Saldumi
STR_CARGO_PLURAL_COLA :Kola
-STR_CARGO_PLURAL_COTTON_CANDY :Cukurvate
+STR_CARGO_PLURAL_CANDYFLOSS :Cukurvate
STR_CARGO_PLURAL_BUBBLES :Burbuļi
STR_CARGO_PLURAL_TOFFEE :Īriss
STR_CARGO_PLURAL_BATTERIES :Baterijas
@@ -84,9 +84,9 @@ STR_CARGO_SINGULAR_WHEAT :Kvieši
STR_CARGO_SINGULAR_RUBBER :Kaučuks
STR_CARGO_SINGULAR_SUGAR :Cukurs
STR_CARGO_SINGULAR_TOY :Rotaļlieta
-STR_CARGO_SINGULAR_CANDY :Saldumi
+STR_CARGO_SINGULAR_SWEETS :Saldumi
STR_CARGO_SINGULAR_COLA :Kola
-STR_CARGO_SINGULAR_COTTON_CANDY :Cukurvate
+STR_CARGO_SINGULAR_CANDYFLOSS :Cukurvate
STR_CARGO_SINGULAR_BUBBLE :Burbuļi
STR_CARGO_SINGULAR_TOFFEE :Īriss
STR_CARGO_SINGULAR_BATTERY :Baterijas
diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt
index 1e052710a..8e78fb11d 100644
--- a/src/lang/lithuanian.txt
+++ b/src/lang/lithuanian.txt
@@ -194,7 +194,7 @@ STR_CARGO_PLURAL_TOYS.kam :žaislams
STR_CARGO_PLURAL_TOYS.ka :žaislus
STR_CARGO_PLURAL_TOYS.kuo :žaislais
STR_CARGO_PLURAL_TOYS.kur :žaisluose
-STR_CARGO_PLURAL_CANDY :Saldumynai
+STR_CARGO_PLURAL_SWEETS :Saldumynai
STR_CARGO_PLURAL_CANDY.kas :saldumynai
STR_CARGO_PLURAL_CANDY.ko :saldumynų
STR_CARGO_PLURAL_CANDY.kam :saldumynams
@@ -208,13 +208,13 @@ STR_CARGO_PLURAL_COLA.kam :kolai
STR_CARGO_PLURAL_COLA.ka :kolą
STR_CARGO_PLURAL_COLA.kuo :kola
STR_CARGO_PLURAL_COLA.kur :koloje
-STR_CARGO_PLURAL_COTTON_CANDY :Cukraus vata
-STR_CARGO_PLURAL_COTTON_CANDY.kas :cukraus vata
-STR_CARGO_PLURAL_COTTON_CANDY.ko :cukraus vatos
-STR_CARGO_PLURAL_COTTON_CANDY.kam :cukraus vatai
-STR_CARGO_PLURAL_COTTON_CANDY.ka :cukraus vatą
-STR_CARGO_PLURAL_COTTON_CANDY.kuo :cukraus vata
-STR_CARGO_PLURAL_COTTON_CANDY.kur :cukraus vatoje
+STR_CARGO_PLURAL_CANDYFLOSS :Cukraus vata
+STR_CARGO_PLURAL_CANDYFLOSS.kas :cukraus vata
+STR_CARGO_PLURAL_CANDYFLOSS.ko :cukraus vatos
+STR_CARGO_PLURAL_CANDYFLOSS.kam :cukraus vatai
+STR_CARGO_PLURAL_CANDYFLOSS.ka :cukraus vatą
+STR_CARGO_PLURAL_CANDYFLOSS.kuo :cukraus vata
+STR_CARGO_PLURAL_CANDYFLOSS.kur :cukraus vatoje
STR_CARGO_PLURAL_BUBBLES :Burbulai
STR_CARGO_PLURAL_BUBBLES.kas :burbulai
STR_CARGO_PLURAL_BUBBLES.ko :burbulų
@@ -276,9 +276,9 @@ STR_CARGO_SINGULAR_WHEAT :Kviečių
STR_CARGO_SINGULAR_RUBBER :Kaučiuko
STR_CARGO_SINGULAR_SUGAR :Cukraus
STR_CARGO_SINGULAR_TOY :Žaislų
-STR_CARGO_SINGULAR_CANDY :Saldumynų
+STR_CARGO_SINGULAR_SWEETS :Saldumynų
STR_CARGO_SINGULAR_COLA :Kolos
-STR_CARGO_SINGULAR_COTTON_CANDY :Cukraus vatos
+STR_CARGO_SINGULAR_CANDYFLOSS :Cukraus vatos
STR_CARGO_SINGULAR_BUBBLE :Burbulų
STR_CARGO_SINGULAR_TOFFEE :Karamelės
STR_CARGO_SINGULAR_BATTERY :Baterijų
diff --git a/src/lang/luxembourgish.txt b/src/lang/luxembourgish.txt
index d1fc27a6b..f73c886e4 100644
--- a/src/lang/luxembourgish.txt
+++ b/src/lang/luxembourgish.txt
@@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT :Weess
STR_CARGO_PLURAL_RUBBER :Kautschuk
STR_CARGO_PLURAL_SUGAR :Zocker
STR_CARGO_PLURAL_TOYS :Spillsaachen
-STR_CARGO_PLURAL_CANDY :Séissegkeeten
+STR_CARGO_PLURAL_SWEETS :Séissegkeeten
STR_CARGO_PLURAL_COLA :Cola
-STR_CARGO_PLURAL_COTTON_CANDY :Zockerwatt
+STR_CARGO_PLURAL_CANDYFLOSS :Zockerwatt
STR_CARGO_PLURAL_BUBBLES :Blosen
STR_CARGO_PLURAL_TOFFEE :Karamell
STR_CARGO_PLURAL_BATTERIES :Batterien
@@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT :Weess
STR_CARGO_SINGULAR_RUBBER :Kautschuck
STR_CARGO_SINGULAR_SUGAR :Zocker
STR_CARGO_SINGULAR_TOY :Spillsaach
-STR_CARGO_SINGULAR_CANDY :Séissegkeet
+STR_CARGO_SINGULAR_SWEETS :Séissegkeet
STR_CARGO_SINGULAR_COLA :Cola
-STR_CARGO_SINGULAR_COTTON_CANDY :Zockerwatt
+STR_CARGO_SINGULAR_CANDYFLOSS :Zockerwatt
STR_CARGO_SINGULAR_BUBBLE :Blos
STR_CARGO_SINGULAR_TOFFEE :Karamell
STR_CARGO_SINGULAR_BATTERY :Batterie
diff --git a/src/lang/malay.txt b/src/lang/malay.txt
index 051bb4f3b..9cfa8578f 100644
--- a/src/lang/malay.txt
+++ b/src/lang/malay.txt
@@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT :Gandum
STR_CARGO_PLURAL_RUBBER :Getah
STR_CARGO_PLURAL_SUGAR :Gula
STR_CARGO_PLURAL_TOYS :Mainan
-STR_CARGO_PLURAL_CANDY :Gula-gula
+STR_CARGO_PLURAL_SWEETS :Gula-gula
STR_CARGO_PLURAL_COLA :Minuman cola
-STR_CARGO_PLURAL_COTTON_CANDY :Gula kapas
+STR_CARGO_PLURAL_CANDYFLOSS :Gula kapas
STR_CARGO_PLURAL_BUBBLES :Buih
STR_CARGO_PLURAL_TOFFEE :Tofi
STR_CARGO_PLURAL_BATTERIES :Bateri
@@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT :Gandum
STR_CARGO_SINGULAR_RUBBER :Getah
STR_CARGO_SINGULAR_SUGAR :Gula
STR_CARGO_SINGULAR_TOY :Mainan
-STR_CARGO_SINGULAR_CANDY :Manisan
+STR_CARGO_SINGULAR_SWEETS :Manisan
STR_CARGO_SINGULAR_COLA :Minuman cola
-STR_CARGO_SINGULAR_COTTON_CANDY :Gula kapas
+STR_CARGO_SINGULAR_CANDYFLOSS :Gula kapas
STR_CARGO_SINGULAR_BUBBLE :Buih
STR_CARGO_SINGULAR_TOFFEE :Tofi
STR_CARGO_SINGULAR_BATTERY :Bateri
diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt
index 474d6c2b6..f51737db2 100644
--- a/src/lang/norwegian_bokmal.txt
+++ b/src/lang/norwegian_bokmal.txt
@@ -50,9 +50,9 @@ STR_CARGO_PLURAL_WHEAT :Hvete
STR_CARGO_PLURAL_RUBBER :Gummi
STR_CARGO_PLURAL_SUGAR :Sukker
STR_CARGO_PLURAL_TOYS :Leketøy
-STR_CARGO_PLURAL_CANDY :Godteri
+STR_CARGO_PLURAL_SWEETS :Godteri
STR_CARGO_PLURAL_COLA :Cola
-STR_CARGO_PLURAL_COTTON_CANDY :Sukkerspinn
+STR_CARGO_PLURAL_CANDYFLOSS :Sukkerspinn
STR_CARGO_PLURAL_BUBBLES :Bobler
STR_CARGO_PLURAL_TOFFEE :Karamell
STR_CARGO_PLURAL_BATTERIES :Batterier
@@ -84,9 +84,9 @@ STR_CARGO_SINGULAR_WHEAT :Hvete
STR_CARGO_SINGULAR_RUBBER :Gummi
STR_CARGO_SINGULAR_SUGAR :Sukker
STR_CARGO_SINGULAR_TOY :Leketøy
-STR_CARGO_SINGULAR_CANDY :Godteri
+STR_CARGO_SINGULAR_SWEETS :Godteri
STR_CARGO_SINGULAR_COLA :Cola
-STR_CARGO_SINGULAR_COTTON_CANDY :Sukkerspinn
+STR_CARGO_SINGULAR_CANDYFLOSS :Sukkerspinn
STR_CARGO_SINGULAR_BUBBLE :Boble
STR_CARGO_SINGULAR_TOFFEE :Karamell
STR_CARGO_SINGULAR_BATTERY :Batteri
diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt
index 36db98b65..adf49f505 100644
--- a/src/lang/norwegian_nynorsk.txt
+++ b/src/lang/norwegian_nynorsk.txt
@@ -50,9 +50,9 @@ STR_CARGO_PLURAL_WHEAT :Kveite
STR_CARGO_PLURAL_RUBBER :Gummi
STR_CARGO_PLURAL_SUGAR :Sukker
STR_CARGO_PLURAL_TOYS :Leiketøy
-STR_CARGO_PLURAL_CANDY :Godteri
+STR_CARGO_PLURAL_SWEETS :Godteri
STR_CARGO_PLURAL_COLA :Cola
-STR_CARGO_PLURAL_COTTON_CANDY :Sukkerspinn
+STR_CARGO_PLURAL_CANDYFLOSS :Sukkerspinn
STR_CARGO_PLURAL_BUBBLES :Bobler
STR_CARGO_PLURAL_TOFFEE :Karamell
STR_CARGO_PLURAL_BATTERIES :Batteri
@@ -84,9 +84,9 @@ STR_CARGO_SINGULAR_WHEAT :Kveite
STR_CARGO_SINGULAR_RUBBER :Gummi
STR_CARGO_SINGULAR_SUGAR :Sukker
STR_CARGO_SINGULAR_TOY :Leiketøy
-STR_CARGO_SINGULAR_CANDY :Godteri
+STR_CARGO_SINGULAR_SWEETS :Godteri
STR_CARGO_SINGULAR_COLA :Cola
-STR_CARGO_SINGULAR_COTTON_CANDY :Sukkerspinn
+STR_CARGO_SINGULAR_CANDYFLOSS :Sukkerspinn
STR_CARGO_SINGULAR_BUBBLE :Boble
STR_CARGO_SINGULAR_TOFFEE :Karamell
STR_CARGO_SINGULAR_BATTERY :Batteri
diff --git a/src/lang/polish.txt b/src/lang/polish.txt
index c39f1b0c3..b7759eb71 100644
--- a/src/lang/polish.txt
+++ b/src/lang/polish.txt
@@ -188,7 +188,7 @@ STR_CARGO_PLURAL_TOYS.b :zabawki
STR_CARGO_PLURAL_TOYS.n :zabawkami
STR_CARGO_PLURAL_TOYS.m :zabawkach
STR_CARGO_PLURAL_TOYS.w :zabawki
-STR_CARGO_PLURAL_CANDY :Słodycze
+STR_CARGO_PLURAL_SWEETS :Słodycze
STR_CARGO_PLURAL_CANDY.d :słodyczy
STR_CARGO_PLURAL_CANDY.c :słodyczom
STR_CARGO_PLURAL_CANDY.b :słodycze
@@ -202,13 +202,13 @@ STR_CARGO_PLURAL_COLA.b :colę
STR_CARGO_PLURAL_COLA.n :colą
STR_CARGO_PLURAL_COLA.m :coli
STR_CARGO_PLURAL_COLA.w :colo
-STR_CARGO_PLURAL_COTTON_CANDY :Wata cukrowa
-STR_CARGO_PLURAL_COTTON_CANDY.d :waty cukrowej
-STR_CARGO_PLURAL_COTTON_CANDY.c :wacie cukrowej
-STR_CARGO_PLURAL_COTTON_CANDY.b :watę cukrową
-STR_CARGO_PLURAL_COTTON_CANDY.n :watą cukrową
-STR_CARGO_PLURAL_COTTON_CANDY.m :wacie cukrowej
-STR_CARGO_PLURAL_COTTON_CANDY.w :wato cukrowa
+STR_CARGO_PLURAL_CANDYFLOSS :Wata cukrowa
+STR_CARGO_PLURAL_CANDYFLOSS.d :waty cukrowej
+STR_CARGO_PLURAL_CANDYFLOSS.c :wacie cukrowej
+STR_CARGO_PLURAL_CANDYFLOSS.b :watę cukrową
+STR_CARGO_PLURAL_CANDYFLOSS.n :watą cukrową
+STR_CARGO_PLURAL_CANDYFLOSS.m :wacie cukrowej
+STR_CARGO_PLURAL_CANDYFLOSS.w :wato cukrowa
STR_CARGO_PLURAL_BUBBLES :Bąbelki
STR_CARGO_PLURAL_BUBBLES.d :bąbelków
STR_CARGO_PLURAL_BUBBLES.c :bąbelkom
@@ -408,12 +408,12 @@ STR_CARGO_SINGULAR_TOY.b :zabawkę
STR_CARGO_SINGULAR_TOY.n :zabawką
STR_CARGO_SINGULAR_TOY.m :zabawce
STR_CARGO_SINGULAR_TOY.w :zabawko
-STR_CARGO_SINGULAR_CANDY :Słodycz
-STR_CARGO_SINGULAR_CANDY.d :słodyczy
-STR_CARGO_SINGULAR_CANDY.c :słodyczy
-STR_CARGO_SINGULAR_CANDY.b :słodycz
-STR_CARGO_SINGULAR_CANDY.n :słodyczą
-STR_CARGO_SINGULAR_CANDY.m :słodyczy
+STR_CARGO_SINGULAR_SWEETS :Słodycz
+STR_CARGO_SINGULAR_SWEETS.d :słodyczy
+STR_CARGO_SINGULAR_SWEETS.c :słodyczy
+STR_CARGO_SINGULAR_SWEETS.b :słodycz
+STR_CARGO_SINGULAR_SWEETS.n :słodyczą
+STR_CARGO_SINGULAR_SWEETS.m :słodyczy
STR_CARGO_SINGULAR_COLA :Cola
STR_CARGO_SINGULAR_COLA.d :coli
STR_CARGO_SINGULAR_COLA.c :coli
@@ -421,13 +421,13 @@ STR_CARGO_SINGULAR_COLA.b :colę
STR_CARGO_SINGULAR_COLA.n :colą
STR_CARGO_SINGULAR_COLA.m :coli
STR_CARGO_SINGULAR_COLA.w :colo
-STR_CARGO_SINGULAR_COTTON_CANDY :Wata cukrowa
-STR_CARGO_SINGULAR_COTTON_CANDY.d :waty cukrowej
-STR_CARGO_SINGULAR_COTTON_CANDY.c :wacie cukrowej
-STR_CARGO_SINGULAR_COTTON_CANDY.b :watę cukrową
-STR_CARGO_SINGULAR_COTTON_CANDY.n :watą cukrową
-STR_CARGO_SINGULAR_COTTON_CANDY.m :wacie cukrowej
-STR_CARGO_SINGULAR_COTTON_CANDY.w :wato cukrowa
+STR_CARGO_SINGULAR_CANDYFLOSS :Wata cukrowa
+STR_CARGO_SINGULAR_CANDYFLOSS.d :waty cukrowej
+STR_CARGO_SINGULAR_CANDYFLOSS.c :wacie cukrowej
+STR_CARGO_SINGULAR_CANDYFLOSS.b :watę cukrową
+STR_CARGO_SINGULAR_CANDYFLOSS.n :watą cukrową
+STR_CARGO_SINGULAR_CANDYFLOSS.m :wacie cukrowej
+STR_CARGO_SINGULAR_CANDYFLOSS.w :wato cukrowa
STR_CARGO_SINGULAR_BUBBLE :Bąbelek
STR_CARGO_SINGULAR_BUBBLE.d :bąbelka
STR_CARGO_SINGULAR_BUBBLE.c :bąbelkowi
diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt
index 342aa839d..a98e24b91 100644
--- a/src/lang/portuguese.txt
+++ b/src/lang/portuguese.txt
@@ -49,9 +49,9 @@ STR_CARGO_PLURAL_WHEAT :Trigo
STR_CARGO_PLURAL_RUBBER :Borracha
STR_CARGO_PLURAL_SUGAR :Açúcar
STR_CARGO_PLURAL_TOYS :Brinquedos
-STR_CARGO_PLURAL_CANDY :Doces
+STR_CARGO_PLURAL_SWEETS :Doces
STR_CARGO_PLURAL_COLA :Bebida de cola
-STR_CARGO_PLURAL_COTTON_CANDY :Algodão Doce
+STR_CARGO_PLURAL_CANDYFLOSS :Algodão Doce
STR_CARGO_PLURAL_BUBBLES :Bolhas
STR_CARGO_PLURAL_TOFFEE :Caramelo
STR_CARGO_PLURAL_BATTERIES :Baterias
@@ -83,9 +83,9 @@ STR_CARGO_SINGULAR_WHEAT :Trigo
STR_CARGO_SINGULAR_RUBBER :Borracha
STR_CARGO_SINGULAR_SUGAR :Açúcar
STR_CARGO_SINGULAR_TOY :Brinquedos
-STR_CARGO_SINGULAR_CANDY :Doces
+STR_CARGO_SINGULAR_SWEETS :Doces
STR_CARGO_SINGULAR_COLA :Bebida de cola
-STR_CARGO_SINGULAR_COTTON_CANDY :Algodão Doce
+STR_CARGO_SINGULAR_CANDYFLOSS :Algodão Doce
STR_CARGO_SINGULAR_BUBBLE :Bolhas
STR_CARGO_SINGULAR_TOFFEE :Caramelo
STR_CARGO_SINGULAR_BATTERY :Baterias
diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt
index eecd07d70..c79feefab 100644
--- a/src/lang/romanian.txt
+++ b/src/lang/romanian.txt
@@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT :Grâu
STR_CARGO_PLURAL_RUBBER :Cauciuc
STR_CARGO_PLURAL_SUGAR :Zahăr
STR_CARGO_PLURAL_TOYS :Jucării
-STR_CARGO_PLURAL_CANDY :Dulciuri
+STR_CARGO_PLURAL_SWEETS :Dulciuri
STR_CARGO_PLURAL_COLA :Cola
-STR_CARGO_PLURAL_COTTON_CANDY :Vată de zahăr
+STR_CARGO_PLURAL_CANDYFLOSS :Vată de zahăr
STR_CARGO_PLURAL_BUBBLES :Balonașe
STR_CARGO_PLURAL_TOFFEE :Caramele
STR_CARGO_PLURAL_BATTERIES :Baterii
@@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT :Grâu
STR_CARGO_SINGULAR_RUBBER :Cauciuc
STR_CARGO_SINGULAR_SUGAR :Zahăr
STR_CARGO_SINGULAR_TOY :Jucărie
-STR_CARGO_SINGULAR_CANDY :Dulciuri
+STR_CARGO_SINGULAR_SWEETS :Dulciuri
STR_CARGO_SINGULAR_COLA :Cola
-STR_CARGO_SINGULAR_COTTON_CANDY :Vată de zahăr
+STR_CARGO_SINGULAR_CANDYFLOSS :Vată de zahăr
STR_CARGO_SINGULAR_BUBBLE :Balonaș
STR_CARGO_SINGULAR_TOFFEE :Caramea
STR_CARGO_SINGULAR_BATTERY :Baterie
diff --git a/src/lang/russian.txt b/src/lang/russian.txt
index 650b21d6a..24eef4e9a 100644
--- a/src/lang/russian.txt
+++ b/src/lang/russian.txt
@@ -96,15 +96,15 @@ STR_CARGO_PLURAL_SUGAR.acc :сахар
STR_CARGO_PLURAL_TOYS :{G=p}Игрушки
STR_CARGO_PLURAL_TOYS.gen :игрушек
STR_CARGO_PLURAL_TOYS.acc :игрушки
-STR_CARGO_PLURAL_CANDY :{G=p}Конфеты
+STR_CARGO_PLURAL_SWEETS :{G=p}Конфеты
STR_CARGO_PLURAL_CANDY.gen :конфет
STR_CARGO_PLURAL_CANDY.acc :конфеты
STR_CARGO_PLURAL_COLA :{G=f}Кола
STR_CARGO_PLURAL_COLA.gen :колы
STR_CARGO_PLURAL_COLA.acc :колу
-STR_CARGO_PLURAL_COTTON_CANDY :{G=f}Сахарная вата
-STR_CARGO_PLURAL_COTTON_CANDY.gen :сахарной ваты
-STR_CARGO_PLURAL_COTTON_CANDY.acc :сахарную вату
+STR_CARGO_PLURAL_CANDYFLOSS :{G=f}Сахарная вата
+STR_CARGO_PLURAL_CANDYFLOSS.gen :сахарной ваты
+STR_CARGO_PLURAL_CANDYFLOSS.acc :сахарную вату
STR_CARGO_PLURAL_BUBBLES :{G=p}Пузырьки
STR_CARGO_PLURAL_BUBBLES.gen :пузырьков
STR_CARGO_PLURAL_BUBBLES.acc :пузырьки
@@ -192,15 +192,15 @@ STR_CARGO_SINGULAR_SUGAR.acc :сахар
STR_CARGO_SINGULAR_TOY :{G=p}Игрушки
STR_CARGO_SINGULAR_TOY.gen :игрушек
STR_CARGO_SINGULAR_TOY.acc :игрушки
-STR_CARGO_SINGULAR_CANDY :{G=p}Конфеты
-STR_CARGO_SINGULAR_CANDY.gen :конфет
-STR_CARGO_SINGULAR_CANDY.acc :конфеты
+STR_CARGO_SINGULAR_SWEETS :{G=p}Конфеты
+STR_CARGO_SINGULAR_SWEETS.gen :конфет
+STR_CARGO_SINGULAR_SWEETS.acc :конфеты
STR_CARGO_SINGULAR_COLA :{G=f}Кола
STR_CARGO_SINGULAR_COLA.gen :колы
STR_CARGO_SINGULAR_COLA.acc :колу
-STR_CARGO_SINGULAR_COTTON_CANDY :{G=f}Сахарная вата
-STR_CARGO_SINGULAR_COTTON_CANDY.gen :сахарной ваты
-STR_CARGO_SINGULAR_COTTON_CANDY.acc :сахарную вату
+STR_CARGO_SINGULAR_CANDYFLOSS :{G=f}Сахарная вата
+STR_CARGO_SINGULAR_CANDYFLOSS.gen :сахарной ваты
+STR_CARGO_SINGULAR_CANDYFLOSS.acc :сахарную вату
STR_CARGO_SINGULAR_BUBBLE :{G=p}Пузырьки
STR_CARGO_SINGULAR_BUBBLE.gen :пузырьков
STR_CARGO_SINGULAR_BUBBLE.acc :пузырьки
diff --git a/src/lang/serbian.txt b/src/lang/serbian.txt
index 4131acf75..b6ec8e2d6 100644
--- a/src/lang/serbian.txt
+++ b/src/lang/serbian.txt
@@ -119,7 +119,7 @@ STR_CARGO_PLURAL_TOYS :igračke
STR_CARGO_PLURAL_TOYS.big :Igračke
STR_CARGO_PLURAL_TOYS.gen :igračaka
STR_CARGO_PLURAL_TOYS.aku :igračke
-STR_CARGO_PLURAL_CANDY :slatkiši
+STR_CARGO_PLURAL_SWEETS :slatkiši
STR_CARGO_PLURAL_CANDY.big :Slatkiši
STR_CARGO_PLURAL_CANDY.gen :slatkiša
STR_CARGO_PLURAL_CANDY.aku :slatkiše
@@ -127,10 +127,10 @@ STR_CARGO_PLURAL_COLA :kola
STR_CARGO_PLURAL_COLA.big :Kola
STR_CARGO_PLURAL_COLA.gen :kole
STR_CARGO_PLURAL_COLA.aku :kolu
-STR_CARGO_PLURAL_COTTON_CANDY :šećerna vuna
-STR_CARGO_PLURAL_COTTON_CANDY.big :Šećerna vuna
-STR_CARGO_PLURAL_COTTON_CANDY.gen :šećerne vune
-STR_CARGO_PLURAL_COTTON_CANDY.aku :šećernu vunu
+STR_CARGO_PLURAL_CANDYFLOSS :šećerna vuna
+STR_CARGO_PLURAL_CANDYFLOSS.big :Šećerna vuna
+STR_CARGO_PLURAL_CANDYFLOSS.gen :šećerne vune
+STR_CARGO_PLURAL_CANDYFLOSS.aku :šećernu vunu
STR_CARGO_PLURAL_BUBBLES :mehurići
STR_CARGO_PLURAL_BUBBLES.big :Mehurići
STR_CARGO_PLURAL_BUBBLES.gen :mehurića
@@ -246,18 +246,18 @@ STR_CARGO_SINGULAR_TOY :igračka
STR_CARGO_SINGULAR_TOY.big :Igračka
STR_CARGO_SINGULAR_TOY.gen :igračke
STR_CARGO_SINGULAR_TOY.aku :igračku
-STR_CARGO_SINGULAR_CANDY :slatkiš
-STR_CARGO_SINGULAR_CANDY.big :Slatkiš
-STR_CARGO_SINGULAR_CANDY.gen :slatkiša
-STR_CARGO_SINGULAR_CANDY.aku :slatkiš
+STR_CARGO_SINGULAR_SWEETS :slatkiš
+STR_CARGO_SINGULAR_SWEETS.big :Slatkiš
+STR_CARGO_SINGULAR_SWEETS.gen :slatkiša
+STR_CARGO_SINGULAR_SWEETS.aku :slatkiš
STR_CARGO_SINGULAR_COLA :kola
STR_CARGO_SINGULAR_COLA.big :Kola
STR_CARGO_SINGULAR_COLA.gen :kole
STR_CARGO_SINGULAR_COLA.aku :kolu
-STR_CARGO_SINGULAR_COTTON_CANDY :šećerna vuna
-STR_CARGO_SINGULAR_COTTON_CANDY.big :Šećerna vuna
-STR_CARGO_SINGULAR_COTTON_CANDY.gen :šećerne vune
-STR_CARGO_SINGULAR_COTTON_CANDY.aku :šećernu vunu
+STR_CARGO_SINGULAR_CANDYFLOSS :šećerna vuna
+STR_CARGO_SINGULAR_CANDYFLOSS.big :Šećerna vuna
+STR_CARGO_SINGULAR_CANDYFLOSS.gen :šećerne vune
+STR_CARGO_SINGULAR_CANDYFLOSS.aku :šećernu vunu
STR_CARGO_SINGULAR_BUBBLE :mehurić
STR_CARGO_SINGULAR_BUBBLE.big :Mehurić
STR_CARGO_SINGULAR_BUBBLE.gen :mehurića
diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt
index 971d405aa..1b113ac76 100644
--- a/src/lang/simplified_chinese.txt
+++ b/src/lang/simplified_chinese.txt
@@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT :小麦
STR_CARGO_PLURAL_RUBBER :橡胶
STR_CARGO_PLURAL_SUGAR :蔗糖
STR_CARGO_PLURAL_TOYS :玩具
-STR_CARGO_PLURAL_CANDY :糖果
+STR_CARGO_PLURAL_SWEETS :糖果
STR_CARGO_PLURAL_COLA :可乐
-STR_CARGO_PLURAL_COTTON_CANDY :棉花糖
+STR_CARGO_PLURAL_CANDYFLOSS :棉花糖
STR_CARGO_PLURAL_BUBBLES :泡泡
STR_CARGO_PLURAL_TOFFEE :太妃糖
STR_CARGO_PLURAL_BATTERIES :电池
@@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT :小麦
STR_CARGO_SINGULAR_RUBBER :橡胶
STR_CARGO_SINGULAR_SUGAR :蔗糖
STR_CARGO_SINGULAR_TOY :玩具
-STR_CARGO_SINGULAR_CANDY :糖果
+STR_CARGO_SINGULAR_SWEETS :糖果
STR_CARGO_SINGULAR_COLA :可乐
-STR_CARGO_SINGULAR_COTTON_CANDY :棉花糖
+STR_CARGO_SINGULAR_CANDYFLOSS :棉花糖
STR_CARGO_SINGULAR_BUBBLE :泡泡
STR_CARGO_SINGULAR_TOFFEE :太妃糖
STR_CARGO_SINGULAR_BATTERY :电池
diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt
index 8e7c29f1d..5a333b98c 100644
--- a/src/lang/slovak.txt
+++ b/src/lang/slovak.txt
@@ -73,12 +73,12 @@ STR_CARGO_PLURAL_SUGAR :Cukor
STR_CARGO_PLURAL_SUGAR.g :cukru
STR_CARGO_PLURAL_TOYS :Hračky
STR_CARGO_PLURAL_TOYS.g :hračiek
-STR_CARGO_PLURAL_CANDY :Cukríky
+STR_CARGO_PLURAL_SWEETS :Cukríky
STR_CARGO_PLURAL_CANDY.g :cukríkov
STR_CARGO_PLURAL_COLA :Kofola
STR_CARGO_PLURAL_COLA.g :kofoly
-STR_CARGO_PLURAL_COTTON_CANDY :Cukrová vata
-STR_CARGO_PLURAL_COTTON_CANDY.g :cukrovej vaty
+STR_CARGO_PLURAL_CANDYFLOSS :Cukrová vata
+STR_CARGO_PLURAL_CANDYFLOSS.g :cukrovej vaty
STR_CARGO_PLURAL_BUBBLES :Bublinky
STR_CARGO_PLURAL_BUBBLES.g :bubliniek
STR_CARGO_PLURAL_TOFFEE :Karamelky
@@ -138,12 +138,12 @@ STR_CARGO_SINGULAR_SUGAR :Cukor
STR_CARGO_SINGULAR_SUGAR.g :cukru
STR_CARGO_SINGULAR_TOY :Hračka
STR_CARGO_SINGULAR_TOY.g :hračky
-STR_CARGO_SINGULAR_CANDY :Cukrík
-STR_CARGO_SINGULAR_CANDY.g :cukríka
+STR_CARGO_SINGULAR_SWEETS :Cukrík
+STR_CARGO_SINGULAR_SWEETS.g :cukríka
STR_CARGO_SINGULAR_COLA :Kofola
STR_CARGO_SINGULAR_COLA.g :kofoly
-STR_CARGO_SINGULAR_COTTON_CANDY :Cukrová vata
-STR_CARGO_SINGULAR_COTTON_CANDY.g :cukrovej vaty
+STR_CARGO_SINGULAR_CANDYFLOSS :Cukrová vata
+STR_CARGO_SINGULAR_CANDYFLOSS.g :cukrovej vaty
STR_CARGO_SINGULAR_BUBBLE :Bublinka
STR_CARGO_SINGULAR_BUBBLE.g :bublinky
STR_CARGO_SINGULAR_TOFFEE :Karamel
diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt
index 6112a6a82..e90de58c2 100644
--- a/src/lang/slovenian.txt
+++ b/src/lang/slovenian.txt
@@ -105,16 +105,16 @@ STR_CARGO_PLURAL_SUGAR.d :Sladkorju
STR_CARGO_PLURAL_TOYS :Igrače
STR_CARGO_PLURAL_TOYS.r :Igrač
STR_CARGO_PLURAL_TOYS.d :Igračam
-STR_CARGO_PLURAL_CANDY :Sladkarije
+STR_CARGO_PLURAL_SWEETS :Sladkarije
STR_CARGO_PLURAL_CANDY.r :Sladkarij
STR_CARGO_PLURAL_CANDY.d :Sladkarijam
STR_CARGO_PLURAL_COLA :Cockta
STR_CARGO_PLURAL_COLA.r :Cockte
STR_CARGO_PLURAL_COLA.d :Cockti
-STR_CARGO_PLURAL_COTTON_CANDY :Sladkorna pena
-STR_CARGO_PLURAL_COTTON_CANDY.r :Sladkorne pene
-STR_CARGO_PLURAL_COTTON_CANDY.d :Sladkorni peni
-STR_CARGO_PLURAL_COTTON_CANDY.t :Sladkorno peno
+STR_CARGO_PLURAL_CANDYFLOSS :Sladkorna pena
+STR_CARGO_PLURAL_CANDYFLOSS.r :Sladkorne pene
+STR_CARGO_PLURAL_CANDYFLOSS.d :Sladkorni peni
+STR_CARGO_PLURAL_CANDYFLOSS.t :Sladkorno peno
STR_CARGO_PLURAL_BUBBLES :Mehurčki
STR_CARGO_PLURAL_BUBBLES.r :Mehurčkov
STR_CARGO_PLURAL_BUBBLES.d :Mehurčkom
@@ -212,18 +212,18 @@ STR_CARGO_SINGULAR_TOY :Igrača
STR_CARGO_SINGULAR_TOY.r :Igrače
STR_CARGO_SINGULAR_TOY.d :Igrači
STR_CARGO_SINGULAR_TOY.t :Igračo
-STR_CARGO_SINGULAR_CANDY :Sladkarija
-STR_CARGO_SINGULAR_CANDY.r :Sladkarije
-STR_CARGO_SINGULAR_CANDY.d :Sladkariji
-STR_CARGO_SINGULAR_CANDY.t :Sladkarijo
+STR_CARGO_SINGULAR_SWEETS :Sladkarija
+STR_CARGO_SINGULAR_SWEETS.r :Sladkarije
+STR_CARGO_SINGULAR_SWEETS.d :Sladkariji
+STR_CARGO_SINGULAR_SWEETS.t :Sladkarijo
STR_CARGO_SINGULAR_COLA :Cockta
STR_CARGO_SINGULAR_COLA.r :Cockte
STR_CARGO_SINGULAR_COLA.d :Cockti
STR_CARGO_SINGULAR_COLA.t :Cockto
-STR_CARGO_SINGULAR_COTTON_CANDY :Sladkorna pena
-STR_CARGO_SINGULAR_COTTON_CANDY.r :Sladkorne pene
-STR_CARGO_SINGULAR_COTTON_CANDY.d :Sladkorni peni
-STR_CARGO_SINGULAR_COTTON_CANDY.t :Sladkorno peno
+STR_CARGO_SINGULAR_CANDYFLOSS :Sladkorna pena
+STR_CARGO_SINGULAR_CANDYFLOSS.r :Sladkorne pene
+STR_CARGO_SINGULAR_CANDYFLOSS.d :Sladkorni peni
+STR_CARGO_SINGULAR_CANDYFLOSS.t :Sladkorno peno
STR_CARGO_SINGULAR_BUBBLE :Mehurček
STR_CARGO_SINGULAR_BUBBLE.r :Mehurčka
STR_CARGO_SINGULAR_BUBBLE.d :Mehurčku
diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt
index 0fba4df70..05c2ad512 100644
--- a/src/lang/spanish.txt
+++ b/src/lang/spanish.txt
@@ -49,9 +49,9 @@ STR_CARGO_PLURAL_WHEAT :{G=m}Trigo
STR_CARGO_PLURAL_RUBBER :{G=m}Caucho
STR_CARGO_PLURAL_SUGAR :{G=m}Azúcar
STR_CARGO_PLURAL_TOYS :{G=m}Juguetes
-STR_CARGO_PLURAL_CANDY :{G=m}Caramelos
+STR_CARGO_PLURAL_SWEETS :{G=m}Caramelos
STR_CARGO_PLURAL_COLA :{G=f}Cola
-STR_CARGO_PLURAL_COTTON_CANDY :{G=m}Algodón de Azúcar
+STR_CARGO_PLURAL_CANDYFLOSS :{G=m}Algodón de Azúcar
STR_CARGO_PLURAL_BUBBLES :{G=f}Burbujas
STR_CARGO_PLURAL_TOFFEE :{G=m}Tofes
STR_CARGO_PLURAL_BATTERIES :{G=f}Pilas
@@ -83,9 +83,9 @@ STR_CARGO_SINGULAR_WHEAT :{G=m}Trigo
STR_CARGO_SINGULAR_RUBBER :{G=m}Caucho
STR_CARGO_SINGULAR_SUGAR :{G=m}Azúcar
STR_CARGO_SINGULAR_TOY :{G=m}Juguete
-STR_CARGO_SINGULAR_CANDY :{G=m}Caramelo
+STR_CARGO_SINGULAR_SWEETS :{G=m}Caramelo
STR_CARGO_SINGULAR_COLA :{G=f}Cola
-STR_CARGO_SINGULAR_COTTON_CANDY :{G=m}Algodón de Azúcar
+STR_CARGO_SINGULAR_CANDYFLOSS :{G=m}Algodón de Azúcar
STR_CARGO_SINGULAR_BUBBLE :{G=f}Burbuja
STR_CARGO_SINGULAR_TOFFEE :{G=m}Tofe
STR_CARGO_SINGULAR_BATTERY :{G=f}Pila
diff --git a/src/lang/spanish_MX.txt b/src/lang/spanish_MX.txt
index 2c4fe437b..ee9c8ff37 100644
--- a/src/lang/spanish_MX.txt
+++ b/src/lang/spanish_MX.txt
@@ -49,9 +49,9 @@ STR_CARGO_PLURAL_WHEAT :{G=m}Trigo
STR_CARGO_PLURAL_RUBBER :{G=m}Caucho
STR_CARGO_PLURAL_SUGAR :{G=m}Azúcar
STR_CARGO_PLURAL_TOYS :{G=m}Juguetes
-STR_CARGO_PLURAL_CANDY :{G=m}Dulces
+STR_CARGO_PLURAL_SWEETS :{G=m}Dulces
STR_CARGO_PLURAL_COLA :{G=f}Bebida de cola
-STR_CARGO_PLURAL_COTTON_CANDY :{G=m}Algodón de azúcar
+STR_CARGO_PLURAL_CANDYFLOSS :{G=m}Algodón de azúcar
STR_CARGO_PLURAL_BUBBLES :{G=f}Burbujas
STR_CARGO_PLURAL_TOFFEE :{G=m}Caramelos suaves
STR_CARGO_PLURAL_BATTERIES :{G=f}Pilas
@@ -83,9 +83,9 @@ STR_CARGO_SINGULAR_WHEAT :{G=m}Trigo
STR_CARGO_SINGULAR_RUBBER :{G=m}Caucho
STR_CARGO_SINGULAR_SUGAR :{G=m}Azúcar
STR_CARGO_SINGULAR_TOY :{G=m}Juguete
-STR_CARGO_SINGULAR_CANDY :{G=m}Dulce
+STR_CARGO_SINGULAR_SWEETS :{G=m}Dulce
STR_CARGO_SINGULAR_COLA :{G=f}Bebida de cola
-STR_CARGO_SINGULAR_COTTON_CANDY :{G=m}Algodón de azúcar
+STR_CARGO_SINGULAR_CANDYFLOSS :{G=m}Algodón de azúcar
STR_CARGO_SINGULAR_BUBBLE :{G=f}Burbuja
STR_CARGO_SINGULAR_TOFFEE :{G=m}Caramelo suave
STR_CARGO_SINGULAR_BATTERY :{G=f}Pila
diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt
index 21c811345..6f83e5d46 100644
--- a/src/lang/swedish.txt
+++ b/src/lang/swedish.txt
@@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT :Vete
STR_CARGO_PLURAL_RUBBER :Gummi
STR_CARGO_PLURAL_SUGAR :Socker
STR_CARGO_PLURAL_TOYS :Leksaker
-STR_CARGO_PLURAL_CANDY :Godis
+STR_CARGO_PLURAL_SWEETS :Godis
STR_CARGO_PLURAL_COLA :Kola
-STR_CARGO_PLURAL_COTTON_CANDY :Sockervadd
+STR_CARGO_PLURAL_CANDYFLOSS :Sockervadd
STR_CARGO_PLURAL_BUBBLES :Bubblor
STR_CARGO_PLURAL_TOFFEE :Knäck
STR_CARGO_PLURAL_BATTERIES :Batterier
@@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT :Spannmål
STR_CARGO_SINGULAR_RUBBER :Gummi
STR_CARGO_SINGULAR_SUGAR :Socker
STR_CARGO_SINGULAR_TOY :Leksak
-STR_CARGO_SINGULAR_CANDY :Godis
+STR_CARGO_SINGULAR_SWEETS :Godis
STR_CARGO_SINGULAR_COLA :Kola
-STR_CARGO_SINGULAR_COTTON_CANDY :Sockervadd
+STR_CARGO_SINGULAR_CANDYFLOSS :Sockervadd
STR_CARGO_SINGULAR_BUBBLE :Bubbla
STR_CARGO_SINGULAR_TOFFEE :Knäck
STR_CARGO_SINGULAR_BATTERY :Batteri
diff --git a/src/lang/tamil.txt b/src/lang/tamil.txt
index f4cdbe058..4e7c33b86 100644
--- a/src/lang/tamil.txt
+++ b/src/lang/tamil.txt
@@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT :கோதும
STR_CARGO_PLURAL_RUBBER :இறப்பர்
STR_CARGO_PLURAL_SUGAR :சர்க்கரை
STR_CARGO_PLURAL_TOYS :பொம்மைகள்
-STR_CARGO_PLURAL_CANDY :இனிப்புகள்
+STR_CARGO_PLURAL_SWEETS :இனிப்புகள்
STR_CARGO_PLURAL_COLA :கோலா
-STR_CARGO_PLURAL_COTTON_CANDY :பஞ்சுமிட்டாய்
+STR_CARGO_PLURAL_CANDYFLOSS :பஞ்சுமிட்டாய்
STR_CARGO_PLURAL_BUBBLES :குமிழிகள்
STR_CARGO_PLURAL_TOFFEE :மிட்டாய்கள்
STR_CARGO_PLURAL_BATTERIES :பாட்டரிகள்
@@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT :கோதும
STR_CARGO_SINGULAR_RUBBER :இறப்பர்
STR_CARGO_SINGULAR_SUGAR :சர்க்கரை
STR_CARGO_SINGULAR_TOY :பொம்மை
-STR_CARGO_SINGULAR_CANDY :இனிப்பு
+STR_CARGO_SINGULAR_SWEETS :இனிப்பு
STR_CARGO_SINGULAR_COLA :கோலா
-STR_CARGO_SINGULAR_COTTON_CANDY :பஞ்சுமிட்டாய்
+STR_CARGO_SINGULAR_CANDYFLOSS :பஞ்சுமிட்டாய்
STR_CARGO_SINGULAR_BUBBLE :குமிழி
STR_CARGO_SINGULAR_TOFFEE :மிட்டாய்
STR_CARGO_SINGULAR_BATTERY :மின்கலம்
diff --git a/src/lang/thai.txt b/src/lang/thai.txt
index 95b051e08..bbc964690 100644
--- a/src/lang/thai.txt
+++ b/src/lang/thai.txt
@@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT :ข้าวส
STR_CARGO_PLURAL_RUBBER :ยางพารา
STR_CARGO_PLURAL_SUGAR :น้ำตาล
STR_CARGO_PLURAL_TOYS :ของเล่น
-STR_CARGO_PLURAL_CANDY :ขนมสายไหม
+STR_CARGO_PLURAL_SWEETS :ขนมสายไหม
STR_CARGO_PLURAL_COLA :โคล่า
-STR_CARGO_PLURAL_COTTON_CANDY :ขนมสายไหม
+STR_CARGO_PLURAL_CANDYFLOSS :ขนมสายไหม
STR_CARGO_PLURAL_BUBBLES :ฟอง
STR_CARGO_PLURAL_TOFFEE :ลูกอม
STR_CARGO_PLURAL_BATTERIES :ถ่านไฟฉาย
@@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT :ข้าวส
STR_CARGO_SINGULAR_RUBBER :ยางพารา
STR_CARGO_SINGULAR_SUGAR :น้ำตาล
STR_CARGO_SINGULAR_TOY :ของเล่น
-STR_CARGO_SINGULAR_CANDY :ขนมสายไหม
+STR_CARGO_SINGULAR_SWEETS :ขนมสายไหม
STR_CARGO_SINGULAR_COLA :โคล่า
-STR_CARGO_SINGULAR_COTTON_CANDY :ขนมสายไหม
+STR_CARGO_SINGULAR_CANDYFLOSS :ขนมสายไหม
STR_CARGO_SINGULAR_BUBBLE :ฟอง
STR_CARGO_SINGULAR_TOFFEE :ลูกอม
STR_CARGO_SINGULAR_BATTERY :ถ่านไฟฉาย
diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt
index eabbb0360..85d8b1de4 100644
--- a/src/lang/traditional_chinese.txt
+++ b/src/lang/traditional_chinese.txt
@@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT :小麥
STR_CARGO_PLURAL_RUBBER :橡膠
STR_CARGO_PLURAL_SUGAR :砂糖
STR_CARGO_PLURAL_TOYS :玩具
-STR_CARGO_PLURAL_CANDY :糖果
+STR_CARGO_PLURAL_SWEETS :糖果
STR_CARGO_PLURAL_COLA :可樂
-STR_CARGO_PLURAL_COTTON_CANDY :棉花糖
+STR_CARGO_PLURAL_CANDYFLOSS :棉花糖
STR_CARGO_PLURAL_BUBBLES :氣泡
STR_CARGO_PLURAL_TOFFEE :太妃糖
STR_CARGO_PLURAL_BATTERIES :電池
@@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT :小麥
STR_CARGO_SINGULAR_RUBBER :橡膠
STR_CARGO_SINGULAR_SUGAR :砂糖
STR_CARGO_SINGULAR_TOY :玩具
-STR_CARGO_SINGULAR_CANDY :糖果
+STR_CARGO_SINGULAR_SWEETS :糖果
STR_CARGO_SINGULAR_COLA :可樂
-STR_CARGO_SINGULAR_COTTON_CANDY :棉花糖
+STR_CARGO_SINGULAR_CANDYFLOSS :棉花糖
STR_CARGO_SINGULAR_BUBBLE :氣泡
STR_CARGO_SINGULAR_TOFFEE :太妃糖
STR_CARGO_SINGULAR_BATTERY :電池
diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt
index 6246e05b7..d9d664e95 100644
--- a/src/lang/turkish.txt
+++ b/src/lang/turkish.txt
@@ -49,9 +49,9 @@ STR_CARGO_PLURAL_WHEAT :Buğday
STR_CARGO_PLURAL_RUBBER :Kauçuk
STR_CARGO_PLURAL_SUGAR :Şeker
STR_CARGO_PLURAL_TOYS :Oyuncak
-STR_CARGO_PLURAL_CANDY :Tatlı
+STR_CARGO_PLURAL_SWEETS :Tatlı
STR_CARGO_PLURAL_COLA :Kola
-STR_CARGO_PLURAL_COTTON_CANDY :Pamuk şeker
+STR_CARGO_PLURAL_CANDYFLOSS :Pamuk şeker
STR_CARGO_PLURAL_BUBBLES :Baloncuk
STR_CARGO_PLURAL_TOFFEE :Şekerleme
STR_CARGO_PLURAL_BATTERIES :Pil
@@ -83,9 +83,9 @@ STR_CARGO_SINGULAR_WHEAT :Buğday
STR_CARGO_SINGULAR_RUBBER :Kauçuk
STR_CARGO_SINGULAR_SUGAR :Şeker
STR_CARGO_SINGULAR_TOY :Oyuncak
-STR_CARGO_SINGULAR_CANDY :Tatlı
+STR_CARGO_SINGULAR_SWEETS :Tatlı
STR_CARGO_SINGULAR_COLA :Kola
-STR_CARGO_SINGULAR_COTTON_CANDY :Pamuk helva
+STR_CARGO_SINGULAR_CANDYFLOSS :Pamuk helva
STR_CARGO_SINGULAR_BUBBLE :Balon
STR_CARGO_SINGULAR_TOFFEE :Şekerleme
STR_CARGO_SINGULAR_BATTERY :Pil
diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt
index e0799edda..a0053615b 100644
--- a/src/lang/ukrainian.txt
+++ b/src/lang/ukrainian.txt
@@ -95,15 +95,15 @@ STR_CARGO_PLURAL_SUGAR.z :цукор
STR_CARGO_PLURAL_TOYS :іграшки
STR_CARGO_PLURAL_TOYS.r :іграшок
STR_CARGO_PLURAL_TOYS.z :іграшки
-STR_CARGO_PLURAL_CANDY :солодощі
+STR_CARGO_PLURAL_SWEETS :солодощі
STR_CARGO_PLURAL_CANDY.r :солодощів
STR_CARGO_PLURAL_CANDY.z :солодощі
STR_CARGO_PLURAL_COLA :кола
STR_CARGO_PLURAL_COLA.r :коли
STR_CARGO_PLURAL_COLA.z :колу
-STR_CARGO_PLURAL_COTTON_CANDY :солодка вата
-STR_CARGO_PLURAL_COTTON_CANDY.r :солодкої вати
-STR_CARGO_PLURAL_COTTON_CANDY.z :солодку вату
+STR_CARGO_PLURAL_CANDYFLOSS :солодка вата
+STR_CARGO_PLURAL_CANDYFLOSS.r :солодкої вати
+STR_CARGO_PLURAL_CANDYFLOSS.z :солодку вату
STR_CARGO_PLURAL_BUBBLES :бульбашки
STR_CARGO_PLURAL_BUBBLES.r :бульбашок
STR_CARGO_PLURAL_BUBBLES.z :бульбашки
@@ -191,15 +191,15 @@ STR_CARGO_SINGULAR_SUGAR.z :цукор
STR_CARGO_SINGULAR_TOY :іграшки
STR_CARGO_SINGULAR_TOY.r :іграшок
STR_CARGO_SINGULAR_TOY.z :іграшки
-STR_CARGO_SINGULAR_CANDY :цукерки
-STR_CARGO_SINGULAR_CANDY.r :цукерок
-STR_CARGO_SINGULAR_CANDY.z :цукерки
+STR_CARGO_SINGULAR_SWEETS :цукерки
+STR_CARGO_SINGULAR_SWEETS.r :цукерок
+STR_CARGO_SINGULAR_SWEETS.z :цукерки
STR_CARGO_SINGULAR_COLA :кола
STR_CARGO_SINGULAR_COLA.r :коли
STR_CARGO_SINGULAR_COLA.z :колу
-STR_CARGO_SINGULAR_COTTON_CANDY :солодка вата
-STR_CARGO_SINGULAR_COTTON_CANDY.r :солодкої вати
-STR_CARGO_SINGULAR_COTTON_CANDY.z :солодку вату
+STR_CARGO_SINGULAR_CANDYFLOSS :солодка вата
+STR_CARGO_SINGULAR_CANDYFLOSS.r :солодкої вати
+STR_CARGO_SINGULAR_CANDYFLOSS.z :солодку вату
STR_CARGO_SINGULAR_BUBBLE :бульбашки
STR_CARGO_SINGULAR_BUBBLE.r :бульбашок
STR_CARGO_SINGULAR_BUBBLE.z :бульбашки
diff --git a/src/lang/unfinished/chuvash.txt b/src/lang/unfinished/chuvash.txt
index e0608c3e3..701e9aa97 100644
--- a/src/lang/unfinished/chuvash.txt
+++ b/src/lang/unfinished/chuvash.txt
@@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT :Тулă
STR_CARGO_PLURAL_RUBBER :Каучук
STR_CARGO_PLURAL_SUGAR :Сахăр
STR_CARGO_PLURAL_TOYS :Теттесем
-STR_CARGO_PLURAL_CANDY :Канфетсем
+STR_CARGO_PLURAL_SWEETS :Канфетсем
STR_CARGO_PLURAL_COLA :Кола
-STR_CARGO_PLURAL_COTTON_CANDY :Сахăр ваткĕ
+STR_CARGO_PLURAL_CANDYFLOSS :Сахăр ваткĕ
STR_CARGO_PLURAL_BUBBLES :Хӑмпӑҫӑмсем
STR_CARGO_PLURAL_TOFFEE :Карамель
STR_CARGO_PLURAL_BATTERIES :Батарейкасем
@@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT :Тулă
STR_CARGO_SINGULAR_RUBBER :Каучук
STR_CARGO_SINGULAR_SUGAR :Сахăр
STR_CARGO_SINGULAR_TOY :Тетте
-STR_CARGO_SINGULAR_CANDY :Канфетсем
+STR_CARGO_SINGULAR_SWEETS :Канфетсем
STR_CARGO_SINGULAR_COLA :Кола
-STR_CARGO_SINGULAR_COTTON_CANDY :Сахăр ваткĕ
+STR_CARGO_SINGULAR_CANDYFLOSS :Сахăр ваткĕ
STR_CARGO_SINGULAR_BUBBLE :Хӑмпӑҫӑм
STR_CARGO_SINGULAR_TOFFEE :Карамель
STR_CARGO_SINGULAR_BATTERY :Батарейкасем
diff --git a/src/lang/unfinished/frisian.txt b/src/lang/unfinished/frisian.txt
index 97b3746b8..57f55e83b 100644
--- a/src/lang/unfinished/frisian.txt
+++ b/src/lang/unfinished/frisian.txt
@@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT :Weet
STR_CARGO_PLURAL_RUBBER :Rubber
STR_CARGO_PLURAL_SUGAR :Sûker
STR_CARGO_PLURAL_TOYS :Boartersguod
-STR_CARGO_PLURAL_CANDY :Snobbersguod
+STR_CARGO_PLURAL_SWEETS :Snobbersguod
STR_CARGO_PLURAL_COLA :Kola
-STR_CARGO_PLURAL_COTTON_CANDY :Sûkerspin
+STR_CARGO_PLURAL_CANDYFLOSS :Sûkerspin
STR_CARGO_PLURAL_BUBBLES :Bubbels
STR_CARGO_PLURAL_TOFFEE :Toffee
STR_CARGO_PLURAL_BATTERIES :Batterijen
@@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT :Weet
STR_CARGO_SINGULAR_RUBBER :Rubber
STR_CARGO_SINGULAR_SUGAR :Sûker
STR_CARGO_SINGULAR_TOY :Boartersguod
-STR_CARGO_SINGULAR_CANDY :Snobbersguod
+STR_CARGO_SINGULAR_SWEETS :Snobbersguod
STR_CARGO_SINGULAR_COLA :Kola
-STR_CARGO_SINGULAR_COTTON_CANDY :Sûkerspin
+STR_CARGO_SINGULAR_CANDYFLOSS :Sûkerspin
STR_CARGO_SINGULAR_BUBBLE :Bûle
STR_CARGO_SINGULAR_TOFFEE :Toffee
STR_CARGO_SINGULAR_BATTERY :Batterij
diff --git a/src/lang/unfinished/ido.txt b/src/lang/unfinished/ido.txt
index 8807e62bb..d08932073 100644
--- a/src/lang/unfinished/ido.txt
+++ b/src/lang/unfinished/ido.txt
@@ -47,9 +47,9 @@ STR_CARGO_PLURAL_WHEAT :Frumento
STR_CARGO_PLURAL_RUBBER :Kauchuko
STR_CARGO_PLURAL_SUGAR :Sukro
STR_CARGO_PLURAL_TOYS :Ludili
-STR_CARGO_PLURAL_CANDY :Bonboni
+STR_CARGO_PLURAL_SWEETS :Bonboni
STR_CARGO_PLURAL_COLA :Kolao
-STR_CARGO_PLURAL_COTTON_CANDY :Kandi-lanugo
+STR_CARGO_PLURAL_CANDYFLOSS :Kandi-lanugo
STR_CARGO_PLURAL_BUBBLES :Buli
STR_CARGO_PLURAL_TOFFEE :Karamelo
STR_CARGO_PLURAL_BATTERIES :Baterii
@@ -81,9 +81,9 @@ STR_CARGO_SINGULAR_WHEAT :Frumento
STR_CARGO_SINGULAR_RUBBER :Kauchuko
STR_CARGO_SINGULAR_SUGAR :Sukro
STR_CARGO_SINGULAR_TOY :Ludilo
-STR_CARGO_SINGULAR_CANDY :Bonbono
+STR_CARGO_SINGULAR_SWEETS :Bonbono
STR_CARGO_SINGULAR_COLA :Kolao
-STR_CARGO_SINGULAR_COTTON_CANDY :Kandi-lanugo
+STR_CARGO_SINGULAR_CANDYFLOSS :Kandi-lanugo
STR_CARGO_SINGULAR_BUBBLE :Bulo
STR_CARGO_SINGULAR_TOFFEE :Karamelo
STR_CARGO_SINGULAR_BATTERY :Baterio
diff --git a/src/lang/unfinished/macedonian.txt b/src/lang/unfinished/macedonian.txt
index 340bb0818..388467788 100644
--- a/src/lang/unfinished/macedonian.txt
+++ b/src/lang/unfinished/macedonian.txt
@@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT :Пченица
STR_CARGO_PLURAL_RUBBER :Гума
STR_CARGO_PLURAL_SUGAR :Шеќер
STR_CARGO_PLURAL_TOYS :Играчки
-STR_CARGO_PLURAL_CANDY :Колачиња
+STR_CARGO_PLURAL_SWEETS :Колачиња
STR_CARGO_PLURAL_COLA :Кола (сок)
-STR_CARGO_PLURAL_COTTON_CANDY :Суровина за колачиња
+STR_CARGO_PLURAL_CANDYFLOSS :Суровина за колачиња
STR_CARGO_PLURAL_BUBBLES :Меурчиња
STR_CARGO_PLURAL_TOFFEE :Карамели
STR_CARGO_PLURAL_BATTERIES :Батерии
@@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT :Пченица
STR_CARGO_SINGULAR_RUBBER :Гума
STR_CARGO_SINGULAR_SUGAR :Шеќер
STR_CARGO_SINGULAR_TOY :Играчка
-STR_CARGO_SINGULAR_CANDY :Колаче
+STR_CARGO_SINGULAR_SWEETS :Колаче
STR_CARGO_SINGULAR_COLA :Кола (сок)
-STR_CARGO_SINGULAR_COTTON_CANDY :Суровина за колачиња
+STR_CARGO_SINGULAR_CANDYFLOSS :Суровина за колачиња
STR_CARGO_SINGULAR_BUBBLE :Меурче
STR_CARGO_SINGULAR_TOFFEE :Карамела
STR_CARGO_SINGULAR_BATTERY :Батерија
diff --git a/src/lang/unfinished/maltese.txt b/src/lang/unfinished/maltese.txt
index ea06945bb..fccf5f42d 100644
--- a/src/lang/unfinished/maltese.txt
+++ b/src/lang/unfinished/maltese.txt
@@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT :Qamħ
STR_CARGO_PLURAL_RUBBER :Lastku
STR_CARGO_PLURAL_SUGAR :Zokkor
STR_CARGO_PLURAL_TOYS :Ġugarelli
-STR_CARGO_PLURAL_CANDY :Ħelu
+STR_CARGO_PLURAL_SWEETS :Ħelu
STR_CARGO_PLURAL_COLA :Koka
-STR_CARGO_PLURAL_COTTON_CANDY :Kandifloss
+STR_CARGO_PLURAL_CANDYFLOSS :Kandifloss
STR_CARGO_PLURAL_BUBBLES :Bżieżaq
STR_CARGO_PLURAL_TOFFEE :Tofija
STR_CARGO_PLURAL_BATTERIES :Batteriji
@@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT :Qamħ
STR_CARGO_SINGULAR_RUBBER :Lastku
STR_CARGO_SINGULAR_SUGAR :Zokkor
STR_CARGO_SINGULAR_TOY :Ġugarell
-STR_CARGO_SINGULAR_CANDY :Ħelwa
+STR_CARGO_SINGULAR_SWEETS :Ħelwa
STR_CARGO_SINGULAR_COLA :Koka
-STR_CARGO_SINGULAR_COTTON_CANDY :Kandiflos
+STR_CARGO_SINGULAR_CANDYFLOSS :Kandiflos
STR_CARGO_SINGULAR_BUBBLE :Bużżieqa
STR_CARGO_SINGULAR_TOFFEE :Tofija
STR_CARGO_SINGULAR_BATTERY :Batterija
diff --git a/src/lang/unfinished/marathi.txt b/src/lang/unfinished/marathi.txt
index 25cae04d3..488c016bc 100644
--- a/src/lang/unfinished/marathi.txt
+++ b/src/lang/unfinished/marathi.txt
@@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT :गहू
STR_CARGO_PLURAL_RUBBER :रबर
STR_CARGO_PLURAL_SUGAR :साखर
STR_CARGO_PLURAL_TOYS :खेळणी
-STR_CARGO_PLURAL_CANDY :मिठाई
+STR_CARGO_PLURAL_SWEETS :मिठाई
STR_CARGO_PLURAL_COLA :शीतपेये
-STR_CARGO_PLURAL_COTTON_CANDY :म्हातारीचा कापूस
+STR_CARGO_PLURAL_CANDYFLOSS :म्हातारीचा कापूस
STR_CARGO_PLURAL_BUBBLES :बुडबुडे
STR_CARGO_PLURAL_TOFFEE :टॉफी
STR_CARGO_PLURAL_BATTERIES :बॅटरी
@@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT :गहू
STR_CARGO_SINGULAR_RUBBER :रबर
STR_CARGO_SINGULAR_SUGAR :साखर
STR_CARGO_SINGULAR_TOY :खेळणी
-STR_CARGO_SINGULAR_CANDY :मिठाई
+STR_CARGO_SINGULAR_SWEETS :मिठाई
STR_CARGO_SINGULAR_COLA :कोला
-STR_CARGO_SINGULAR_COTTON_CANDY :कँडी फ्लास
+STR_CARGO_SINGULAR_CANDYFLOSS :कँडी फ्लास
STR_CARGO_SINGULAR_BUBBLE :बुडबुडा
STR_CARGO_SINGULAR_TOFFEE :टॉफी
STR_CARGO_SINGULAR_BATTERY :बॅटरी
diff --git a/src/lang/unfinished/persian.txt b/src/lang/unfinished/persian.txt
index dde996e03..ffebcc904 100644
--- a/src/lang/unfinished/persian.txt
+++ b/src/lang/unfinished/persian.txt
@@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT :گندم
STR_CARGO_PLURAL_RUBBER :کائوچو
STR_CARGO_PLURAL_SUGAR :شکر
STR_CARGO_PLURAL_TOYS :اسباب بازی
-STR_CARGO_PLURAL_CANDY :شیرینی
+STR_CARGO_PLURAL_SWEETS :شیرینی
STR_CARGO_PLURAL_COLA :نوشابه
-STR_CARGO_PLURAL_COTTON_CANDY :پشمک
+STR_CARGO_PLURAL_CANDYFLOSS :پشمک
STR_CARGO_PLURAL_BUBBLES :حباب
STR_CARGO_PLURAL_TOFFEE :تافی
STR_CARGO_PLURAL_BATTERIES :باتری
@@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT :گندم
STR_CARGO_SINGULAR_RUBBER :کائوچو
STR_CARGO_SINGULAR_SUGAR :شکر
STR_CARGO_SINGULAR_TOY :اسباب بازی
-STR_CARGO_SINGULAR_CANDY :شیرینی
+STR_CARGO_SINGULAR_SWEETS :شیرینی
STR_CARGO_SINGULAR_COLA :نوشابه
-STR_CARGO_SINGULAR_COTTON_CANDY :پشمک
+STR_CARGO_SINGULAR_CANDYFLOSS :پشمک
STR_CARGO_SINGULAR_BUBBLE :حباب
STR_CARGO_SINGULAR_TOFFEE :تافی
STR_CARGO_SINGULAR_BATTERY :باتری
diff --git a/src/lang/unfinished/urdu.txt b/src/lang/unfinished/urdu.txt
index 2e8266c23..37edeb27e 100644
--- a/src/lang/unfinished/urdu.txt
+++ b/src/lang/unfinished/urdu.txt
@@ -49,9 +49,9 @@ STR_CARGO_PLURAL_WHEAT :گندم
STR_CARGO_PLURAL_RUBBER :ربڑ
STR_CARGO_PLURAL_SUGAR :چینی
STR_CARGO_PLURAL_TOYS :کھلونے
-STR_CARGO_PLURAL_CANDY :مٹھایاں
+STR_CARGO_PLURAL_SWEETS :مٹھایاں
STR_CARGO_PLURAL_COLA :کوئلہ
-STR_CARGO_PLURAL_COTTON_CANDY :کینڈی فلاس
+STR_CARGO_PLURAL_CANDYFLOSS :کینڈی فلاس
STR_CARGO_PLURAL_BUBBLES :بلبلے
STR_CARGO_PLURAL_TOFFEE :ٹافی
STR_CARGO_PLURAL_BATTERIES :بیٹریاں
@@ -83,9 +83,9 @@ STR_CARGO_SINGULAR_WHEAT :گندم
STR_CARGO_SINGULAR_RUBBER :ربڑ
STR_CARGO_SINGULAR_SUGAR :چینی
STR_CARGO_SINGULAR_TOY :کھلونا
-STR_CARGO_SINGULAR_CANDY :مٹھائی
+STR_CARGO_SINGULAR_SWEETS :مٹھائی
STR_CARGO_SINGULAR_COLA :کولا
-STR_CARGO_SINGULAR_COTTON_CANDY :کینڈی فلاس
+STR_CARGO_SINGULAR_CANDYFLOSS :کینڈی فلاس
STR_CARGO_SINGULAR_BUBBLE :بلبلہ
STR_CARGO_SINGULAR_TOFFEE :ٹافی
STR_CARGO_SINGULAR_BATTERY :بیٹری
diff --git a/src/lang/vietnamese.txt b/src/lang/vietnamese.txt
index 8d3abf6d9..aed29fab1 100644
--- a/src/lang/vietnamese.txt
+++ b/src/lang/vietnamese.txt
@@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT :Bột mì
STR_CARGO_PLURAL_RUBBER :Cao su
STR_CARGO_PLURAL_SUGAR :Đường
STR_CARGO_PLURAL_TOYS :Đồ chơi
-STR_CARGO_PLURAL_CANDY :Kẹo
+STR_CARGO_PLURAL_SWEETS :Kẹo
STR_CARGO_PLURAL_COLA :Nước cola
-STR_CARGO_PLURAL_COTTON_CANDY :Kẹo bông
+STR_CARGO_PLURAL_CANDYFLOSS :Kẹo bông
STR_CARGO_PLURAL_BUBBLES :Bong bóng
STR_CARGO_PLURAL_TOFFEE :Kẹo bơ cứng
STR_CARGO_PLURAL_BATTERIES :Pin
@@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT :Bột mì
STR_CARGO_SINGULAR_RUBBER :Cao su
STR_CARGO_SINGULAR_SUGAR :Đường
STR_CARGO_SINGULAR_TOY :Đồ chơi
-STR_CARGO_SINGULAR_CANDY :Kẹo
+STR_CARGO_SINGULAR_SWEETS :Kẹo
STR_CARGO_SINGULAR_COLA :Nước cola
-STR_CARGO_SINGULAR_COTTON_CANDY :Kẹo bông
+STR_CARGO_SINGULAR_CANDYFLOSS :Kẹo bông
STR_CARGO_SINGULAR_BUBBLE :Bong bóng
STR_CARGO_SINGULAR_TOFFEE :Kẹo bơ cứng
STR_CARGO_SINGULAR_BATTERY :Pin
diff --git a/src/lang/welsh.txt b/src/lang/welsh.txt
index 2f267f488..8f68d17a7 100644
--- a/src/lang/welsh.txt
+++ b/src/lang/welsh.txt
@@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT :Gwenith
STR_CARGO_PLURAL_RUBBER :Rwber
STR_CARGO_PLURAL_SUGAR :Siwgr
STR_CARGO_PLURAL_TOYS :Teganau
-STR_CARGO_PLURAL_CANDY :Melysion
+STR_CARGO_PLURAL_SWEETS :Melysion
STR_CARGO_PLURAL_COLA :Cola
-STR_CARGO_PLURAL_COTTON_CANDY :Candifflos
+STR_CARGO_PLURAL_CANDYFLOSS :Candifflos
STR_CARGO_PLURAL_BUBBLES :Swigod
STR_CARGO_PLURAL_TOFFEE :Toffi
STR_CARGO_PLURAL_BATTERIES :Baterïau
@@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT :Gwenith
STR_CARGO_SINGULAR_RUBBER :Rwber
STR_CARGO_SINGULAR_SUGAR :Siwgr
STR_CARGO_SINGULAR_TOY :Tegan
-STR_CARGO_SINGULAR_CANDY :Melysyn
+STR_CARGO_SINGULAR_SWEETS :Melysyn
STR_CARGO_SINGULAR_COLA :Cola
-STR_CARGO_SINGULAR_COTTON_CANDY :Candifflos
+STR_CARGO_SINGULAR_CANDYFLOSS :Candifflos
STR_CARGO_SINGULAR_BUBBLE :Swigen
STR_CARGO_SINGULAR_TOFFEE :Toffi
STR_CARGO_SINGULAR_BATTERY :Batri