(svn r27479) -Fix: Remove genders from non-default cases.

1 files changed, 307 insertions, 307 deletions

diff --git a/src/lang/latin.txt b/src/lang/latin.txt
index 8628f420c..e69bbeb3a 100644
--- a/src/lang/latin.txt
+++ b/src/lang/latin.txt
@@ -30,256 +30,256 @@ STR_JUST_NOTHING                                                :Nihil
 # Plural cargo name
 STR_CARGO_PLURAL_NOTHING                                        :
 STR_CARGO_PLURAL_PASSENGERS                                     :{G=mp}Vectores
-STR_CARGO_PLURAL_PASSENGERS.gen                                 :{G=mp}vectorum
-STR_CARGO_PLURAL_PASSENGERS.acc                                 :{G=mp}Vectores
-STR_CARGO_PLURAL_PASSENGERS.dat                                 :{G=mp}Vectoribus
+STR_CARGO_PLURAL_PASSENGERS.gen                                 :vectorum
+STR_CARGO_PLURAL_PASSENGERS.acc                                 :Vectores
+STR_CARGO_PLURAL_PASSENGERS.dat                                 :Vectoribus
 STR_CARGO_PLURAL_COAL                                           :{G=m}Carbo
-STR_CARGO_PLURAL_COAL.gen                                       :{G=m}carbonis
-STR_CARGO_PLURAL_COAL.acc                                       :{G=m}Carbonem
-STR_CARGO_PLURAL_COAL.dat                                       :{G=m}Carboni
+STR_CARGO_PLURAL_COAL.gen                                       :carbonis
+STR_CARGO_PLURAL_COAL.acc                                       :Carbonem
+STR_CARGO_PLURAL_COAL.dat                                       :Carboni
 STR_CARGO_PLURAL_MAIL                                           :{G=fp}Epistulae
-STR_CARGO_PLURAL_MAIL.gen                                       :{G=fp}epistularum
-STR_CARGO_PLURAL_MAIL.acc                                       :{G=fp}Epistulas
-STR_CARGO_PLURAL_MAIL.dat                                       :{G=fp}Epistulis
+STR_CARGO_PLURAL_MAIL.gen                                       :epistularum
+STR_CARGO_PLURAL_MAIL.acc                                       :Epistulas
+STR_CARGO_PLURAL_MAIL.dat                                       :Epistulis
 STR_CARGO_PLURAL_OIL                                            :{G=n}Petroleum
-STR_CARGO_PLURAL_OIL.gen                                        :{G=n}petrolei
-STR_CARGO_PLURAL_OIL.acc                                        :{G=n}Petroleum
-STR_CARGO_PLURAL_OIL.dat                                        :{G=n}Petroleo
+STR_CARGO_PLURAL_OIL.gen                                        :petrolei
+STR_CARGO_PLURAL_OIL.acc                                        :Petroleum
+STR_CARGO_PLURAL_OIL.dat                                        :Petroleo
 STR_CARGO_PLURAL_LIVESTOCK                                      :{G=np}Pecora
-STR_CARGO_PLURAL_LIVESTOCK.gen                                  :{G=np}pecorum
-STR_CARGO_PLURAL_LIVESTOCK.acc                                  :{G=np}Pecora
-STR_CARGO_PLURAL_LIVESTOCK.dat                                  :{G=np}Pecoribus
+STR_CARGO_PLURAL_LIVESTOCK.gen                                  :pecorum
+STR_CARGO_PLURAL_LIVESTOCK.acc                                  :Pecora
+STR_CARGO_PLURAL_LIVESTOCK.dat                                  :Pecoribus
 STR_CARGO_PLURAL_GOODS                                          :{G=fp}Merces
-STR_CARGO_PLURAL_GOODS.gen                                      :{G=fp}mercium
-STR_CARGO_PLURAL_GOODS.acc                                      :{G=fp}Merces
-STR_CARGO_PLURAL_GOODS.dat                                      :{G=fp}Mercibus
+STR_CARGO_PLURAL_GOODS.gen                                      :mercium
+STR_CARGO_PLURAL_GOODS.acc                                      :Merces
+STR_CARGO_PLURAL_GOODS.dat                                      :Mercibus
 STR_CARGO_PLURAL_GRAIN                                          :{G=n}Frumentum
-STR_CARGO_PLURAL_GRAIN.gen                                      :{G=n}frumenti
-STR_CARGO_PLURAL_GRAIN.acc                                      :{G=n}Frumentum
-STR_CARGO_PLURAL_GRAIN.dat                                      :{G=n}Frumento
+STR_CARGO_PLURAL_GRAIN.gen                                      :frumenti
+STR_CARGO_PLURAL_GRAIN.acc                                      :Frumentum
+STR_CARGO_PLURAL_GRAIN.dat                                      :Frumento
 STR_CARGO_PLURAL_WOOD                                           :{G=n}Lignum
-STR_CARGO_PLURAL_WOOD.gen                                       :{G=n}ligni
-STR_CARGO_PLURAL_WOOD.acc                                       :{G=n}Lignum
-STR_CARGO_PLURAL_WOOD.dat                                       :{G=n}Ligno
+STR_CARGO_PLURAL_WOOD.gen                                       :ligni
+STR_CARGO_PLURAL_WOOD.acc                                       :Lignum
+STR_CARGO_PLURAL_WOOD.dat                                       :Ligno
 STR_CARGO_PLURAL_IRON_ORE                                       :{G=n}Ferrum
-STR_CARGO_PLURAL_IRON_ORE.gen                                   :{G=n}ferri
-STR_CARGO_PLURAL_IRON_ORE.acc                                   :{G=n}Ferrum
-STR_CARGO_PLURAL_IRON_ORE.dat                                   :{G=n}Ferro
+STR_CARGO_PLURAL_IRON_ORE.gen                                   :ferri
+STR_CARGO_PLURAL_IRON_ORE.acc                                   :Ferrum
+STR_CARGO_PLURAL_IRON_ORE.dat                                   :Ferro
 STR_CARGO_PLURAL_STEEL                                          :{G=m}Chalybs
-STR_CARGO_PLURAL_STEEL.gen                                      :{G=m}chalybis
-STR_CARGO_PLURAL_STEEL.acc                                      :{G=m}Chalybem
-STR_CARGO_PLURAL_STEEL.dat                                      :{G=m}Chalybi
+STR_CARGO_PLURAL_STEEL.gen                                      :chalybis
+STR_CARGO_PLURAL_STEEL.acc                                      :Chalybem
+STR_CARGO_PLURAL_STEEL.dat                                      :Chalybi
 STR_CARGO_PLURAL_VALUABLES                                      :{G=fp}Res Pretiosa
-STR_CARGO_PLURAL_VALUABLES.gen                                  :{G=fp}rerum pretiosarum
-STR_CARGO_PLURAL_VALUABLES.acc                                  :{G=fp}Res Pretiosas
-STR_CARGO_PLURAL_VALUABLES.dat                                  :{G=fp}Rebus Pretiosis
+STR_CARGO_PLURAL_VALUABLES.gen                                  :rerum pretiosarum
+STR_CARGO_PLURAL_VALUABLES.acc                                  :Res Pretiosas
+STR_CARGO_PLURAL_VALUABLES.dat                                  :Rebus Pretiosis
 STR_CARGO_PLURAL_COPPER_ORE                                     :{G=n}Aes
-STR_CARGO_PLURAL_COPPER_ORE.gen                                 :{G=n}aeris
-STR_CARGO_PLURAL_COPPER_ORE.acc                                 :{G=n}Aes
-STR_CARGO_PLURAL_COPPER_ORE.dat                                 :{G=n}Aeri
+STR_CARGO_PLURAL_COPPER_ORE.gen                                 :aeris
+STR_CARGO_PLURAL_COPPER_ORE.acc                                 :Aes
+STR_CARGO_PLURAL_COPPER_ORE.dat                                 :Aeri
 STR_CARGO_PLURAL_MAIZE                                          :{G=n}Maizium
-STR_CARGO_PLURAL_MAIZE.gen                                      :{G=n}maizii
-STR_CARGO_PLURAL_MAIZE.acc                                      :{G=n}Maizium
-STR_CARGO_PLURAL_MAIZE.dat                                      :{G=n}Maizio
+STR_CARGO_PLURAL_MAIZE.gen                                      :maizii
+STR_CARGO_PLURAL_MAIZE.acc                                      :Maizium
+STR_CARGO_PLURAL_MAIZE.dat                                      :Maizio
 STR_CARGO_PLURAL_FRUIT                                          :{G=mp}Fructus
-STR_CARGO_PLURAL_FRUIT.gen                                      :{G=mp}fructuum
-STR_CARGO_PLURAL_FRUIT.acc                                      :{G=mp}Fructus
-STR_CARGO_PLURAL_FRUIT.dat                                      :{G=mp}Fructibus
+STR_CARGO_PLURAL_FRUIT.gen                                      :fructuum
+STR_CARGO_PLURAL_FRUIT.acc                                      :Fructus
+STR_CARGO_PLURAL_FRUIT.dat                                      :Fructibus
 STR_CARGO_PLURAL_DIAMONDS                                       :{G=mp}Adamantes
-STR_CARGO_PLURAL_DIAMONDS.gen                                   :{G=mp}adamantum
-STR_CARGO_PLURAL_DIAMONDS.acc                                   :{G=mp}Adamantes
-STR_CARGO_PLURAL_DIAMONDS.dat                                   :{G=mp}Adamantibus
+STR_CARGO_PLURAL_DIAMONDS.gen                                   :adamantum
+STR_CARGO_PLURAL_DIAMONDS.acc                                   :Adamantes
+STR_CARGO_PLURAL_DIAMONDS.dat                                   :Adamantibus
 STR_CARGO_PLURAL_FOOD                                           :{G=m}Cibus
-STR_CARGO_PLURAL_FOOD.gen                                       :{G=m}cibi
-STR_CARGO_PLURAL_FOOD.acc                                       :{G=m}Cibum
-STR_CARGO_PLURAL_FOOD.dat                                       :{G=m}Cibo
+STR_CARGO_PLURAL_FOOD.gen                                       :cibi
+STR_CARGO_PLURAL_FOOD.acc                                       :Cibum
+STR_CARGO_PLURAL_FOOD.dat                                       :Cibo
 STR_CARGO_PLURAL_PAPER                                          :{G=f}Charta
-STR_CARGO_PLURAL_PAPER.gen                                      :{G=f}chartae
-STR_CARGO_PLURAL_PAPER.acc                                      :{G=f}Chartam
-STR_CARGO_PLURAL_PAPER.dat                                      :{G=f}Chartae
+STR_CARGO_PLURAL_PAPER.gen                                      :chartae
+STR_CARGO_PLURAL_PAPER.acc                                      :Chartam
+STR_CARGO_PLURAL_PAPER.dat                                      :Chartae
 STR_CARGO_PLURAL_GOLD                                           :{G=n}Aurum
-STR_CARGO_PLURAL_GOLD.gen                                       :{G=n}auri
-STR_CARGO_PLURAL_GOLD.acc                                       :{G=n}Aurum
-STR_CARGO_PLURAL_GOLD.dat                                       :{G=n}Auro
+STR_CARGO_PLURAL_GOLD.gen                                       :auri
+STR_CARGO_PLURAL_GOLD.acc                                       :Aurum
+STR_CARGO_PLURAL_GOLD.dat                                       :Auro
 STR_CARGO_PLURAL_WATER                                          :{G=f}Aqua
-STR_CARGO_PLURAL_WATER.gen                                      :{G=f}aquae
-STR_CARGO_PLURAL_WATER.acc                                      :{G=f}Aquam
-STR_CARGO_PLURAL_WATER.dat                                      :{G=f}Aquae
+STR_CARGO_PLURAL_WATER.gen                                      :aquae
+STR_CARGO_PLURAL_WATER.acc                                      :Aquam
+STR_CARGO_PLURAL_WATER.dat                                      :Aquae
 STR_CARGO_PLURAL_WHEAT                                          :{G=n}Triticum
-STR_CARGO_PLURAL_WHEAT.gen                                      :{G=n}tritici
-STR_CARGO_PLURAL_WHEAT.acc                                      :{G=n}Triticum
-STR_CARGO_PLURAL_WHEAT.dat                                      :{G=n}Tritico
+STR_CARGO_PLURAL_WHEAT.gen                                      :tritici
+STR_CARGO_PLURAL_WHEAT.acc                                      :Triticum
+STR_CARGO_PLURAL_WHEAT.dat                                      :Tritico
 STR_CARGO_PLURAL_RUBBER                                         :{G=f}Gummis
-STR_CARGO_PLURAL_RUBBER.gen                                     :{G=f}gummis
-STR_CARGO_PLURAL_RUBBER.acc                                     :{G=f}Gummem
-STR_CARGO_PLURAL_RUBBER.dat                                     :{G=f}Gummi
+STR_CARGO_PLURAL_RUBBER.gen                                     :gummis
+STR_CARGO_PLURAL_RUBBER.acc                                     :Gummem
+STR_CARGO_PLURAL_RUBBER.dat                                     :Gummi
 STR_CARGO_PLURAL_SUGAR                                          :{G=n}Saccharum
-STR_CARGO_PLURAL_SUGAR.gen                                      :{G=n}sacchari
-STR_CARGO_PLURAL_SUGAR.acc                                      :{G=n}Saccharum
-STR_CARGO_PLURAL_SUGAR.dat                                      :{G=n}Saccharo
+STR_CARGO_PLURAL_SUGAR.gen                                      :sacchari
+STR_CARGO_PLURAL_SUGAR.acc                                      :Saccharum
+STR_CARGO_PLURAL_SUGAR.dat                                      :Saccharo
 STR_CARGO_PLURAL_TOYS                                           :{G=np}Ludicra
-STR_CARGO_PLURAL_TOYS.gen                                       :{G=np}ludicrorum
-STR_CARGO_PLURAL_TOYS.acc                                       :{G=np}Ludicra
-STR_CARGO_PLURAL_TOYS.dat                                       :{G=np}Ludicris
+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_CANDY.gen                                      :{G=np}bellariorum
-STR_CARGO_PLURAL_CANDY.acc                                      :{G=np}Bellaria
-STR_CARGO_PLURAL_CANDY.dat                                      :{G=np}Bellariis
+STR_CARGO_PLURAL_CANDY.gen                                      :bellariorum
+STR_CARGO_PLURAL_CANDY.acc                                      :Bellaria
+STR_CARGO_PLURAL_CANDY.dat                                      :Bellariis
 STR_CARGO_PLURAL_COLA                                           :{G=f}Cola
-STR_CARGO_PLURAL_COLA.gen                                       :{G=f}colae
-STR_CARGO_PLURAL_COLA.acc                                       :{G=f}Colam
-STR_CARGO_PLURAL_COLA.dat                                       :{G=f}Colae
+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                               :{G=n}sacchari xylini
-STR_CARGO_PLURAL_COTTON_CANDY.acc                               :{G=n}Sacchari Xylinum
-STR_CARGO_PLURAL_COTTON_CANDY.dat                               :{G=n}Sacchari Xylino
+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_BUBBLES                                        :{G=fp}Bullae
-STR_CARGO_PLURAL_BUBBLES.gen                                    :{G=fp}bullarum
-STR_CARGO_PLURAL_BUBBLES.acc                                    :{G=fp}Bullas
-STR_CARGO_PLURAL_BUBBLES.dat                                    :{G=fp}Bullis
+STR_CARGO_PLURAL_BUBBLES.gen                                    :bullarum
+STR_CARGO_PLURAL_BUBBLES.acc                                    :Bullas
+STR_CARGO_PLURAL_BUBBLES.dat                                    :Bullis
 STR_CARGO_PLURAL_TOFFEE                                         :{G=n}Saccharum Tostum
-STR_CARGO_PLURAL_TOFFEE.gen                                     :{G=n}sacchari tosti
-STR_CARGO_PLURAL_TOFFEE.acc                                     :{G=n}Saccharum Tostum
-STR_CARGO_PLURAL_TOFFEE.dat                                     :{G=n}Saccharo Tosto
+STR_CARGO_PLURAL_TOFFEE.gen                                     :sacchari tosti
+STR_CARGO_PLURAL_TOFFEE.acc                                     :Saccharum Tostum
+STR_CARGO_PLURAL_TOFFEE.dat                                     :Saccharo Tosto
 STR_CARGO_PLURAL_BATTERIES                                      :{G=fp}Pilae Electricae
-STR_CARGO_PLURAL_BATTERIES.gen                                  :{G=fp}pilarum electricarum
-STR_CARGO_PLURAL_BATTERIES.acc                                  :{G=fp}Pilas Electricas
-STR_CARGO_PLURAL_BATTERIES.dat                                  :{G=fp}Pilis Electricis
+STR_CARGO_PLURAL_BATTERIES.gen                                  :pilarum electricarum
+STR_CARGO_PLURAL_BATTERIES.acc                                  :Pilas Electricas
+STR_CARGO_PLURAL_BATTERIES.dat                                  :Pilis Electricis
 STR_CARGO_PLURAL_PLASTIC                                        :{G=f}Plastica
-STR_CARGO_PLURAL_PLASTIC.gen                                    :{G=f}plasticae
-STR_CARGO_PLURAL_PLASTIC.acc                                    :{G=f}Plasticam
-STR_CARGO_PLURAL_PLASTIC.dat                                    :{G=f}Plasticae
+STR_CARGO_PLURAL_PLASTIC.gen                                    :plasticae
+STR_CARGO_PLURAL_PLASTIC.acc                                    :Plasticam
+STR_CARGO_PLURAL_PLASTIC.dat                                    :Plasticae
 STR_CARGO_PLURAL_FIZZY_DRINKS                                   :{G=fp}Potiones Carbonatae
-STR_CARGO_PLURAL_FIZZY_DRINKS.gen                               :{G=fp}potionum carbonatarum
-STR_CARGO_PLURAL_FIZZY_DRINKS.acc                               :{G=fp}Potiones Carbonatas
-STR_CARGO_PLURAL_FIZZY_DRINKS.dat                               :{G=fp}Potionibus Carbonatis
+STR_CARGO_PLURAL_FIZZY_DRINKS.gen                               :potionum carbonatarum
+STR_CARGO_PLURAL_FIZZY_DRINKS.acc                               :Potiones Carbonatas
+STR_CARGO_PLURAL_FIZZY_DRINKS.dat                               :Potionibus Carbonatis
 
 # Singular cargo name
 STR_CARGO_SINGULAR_NOTHING                                      :
 STR_CARGO_SINGULAR_PASSENGER                                    :{G=mp}Vectores
-STR_CARGO_SINGULAR_PASSENGER.gen                                :{G=mp}vectorum
-STR_CARGO_SINGULAR_PASSENGER.acc                                :{G=mp}Vectores
-STR_CARGO_SINGULAR_PASSENGER.dat                                :{G=mp}Vectoribus
+STR_CARGO_SINGULAR_PASSENGER.gen                                :vectorum
+STR_CARGO_SINGULAR_PASSENGER.acc                                :Vectores
+STR_CARGO_SINGULAR_PASSENGER.dat                                :Vectoribus
 STR_CARGO_SINGULAR_COAL                                         :{G=m}Carbo
-STR_CARGO_SINGULAR_COAL.gen                                     :{G=m}carbonis
-STR_CARGO_SINGULAR_COAL.acc                                     :{G=m}Carbonem
-STR_CARGO_SINGULAR_COAL.dat                                     :{G=m}Carboni
+STR_CARGO_SINGULAR_COAL.gen                                     :carbonis
+STR_CARGO_SINGULAR_COAL.acc                                     :Carbonem
+STR_CARGO_SINGULAR_COAL.dat                                     :Carboni
 STR_CARGO_SINGULAR_MAIL                                         :{G=fp}Epistulae
-STR_CARGO_SINGULAR_MAIL.gen                                     :{G=fp}epistularum
-STR_CARGO_SINGULAR_MAIL.acc                                     :{G=fp}Epistulas
-STR_CARGO_SINGULAR_MAIL.dat                                     :{G=fp}Epistulis
+STR_CARGO_SINGULAR_MAIL.gen                                     :epistularum
+STR_CARGO_SINGULAR_MAIL.acc                                     :Epistulas
+STR_CARGO_SINGULAR_MAIL.dat                                     :Epistulis
 STR_CARGO_SINGULAR_OIL                                          :{G=n}Petroleum
-STR_CARGO_SINGULAR_OIL.gen                                      :{G=n}petrolei
-STR_CARGO_SINGULAR_OIL.acc                                      :{G=n}Petroleum
-STR_CARGO_SINGULAR_OIL.dat                                      :{G=n}Petroleo
+STR_CARGO_SINGULAR_OIL.gen                                      :petrolei
+STR_CARGO_SINGULAR_OIL.acc                                      :Petroleum
+STR_CARGO_SINGULAR_OIL.dat                                      :Petroleo
 STR_CARGO_SINGULAR_LIVESTOCK                                    :{G=np}Pecora
-STR_CARGO_SINGULAR_LIVESTOCK.gen                                :{G=np}pecorum
-STR_CARGO_SINGULAR_LIVESTOCK.acc                                :{G=np}Pecora
-STR_CARGO_SINGULAR_LIVESTOCK.dat                                :{G=np}Pecoribus
+STR_CARGO_SINGULAR_LIVESTOCK.gen                                :pecorum
+STR_CARGO_SINGULAR_LIVESTOCK.acc                                :Pecora
+STR_CARGO_SINGULAR_LIVESTOCK.dat                                :Pecoribus
 STR_CARGO_SINGULAR_GOODS                                        :{G=fp}Merces
-STR_CARGO_SINGULAR_GOODS.gen                                    :{G=fp}mercium
-STR_CARGO_SINGULAR_GOODS.acc                                    :{G=fp}Merces
-STR_CARGO_SINGULAR_GOODS.dat                                    :{G=fp}Mercibus
+STR_CARGO_SINGULAR_GOODS.gen                                    :mercium
+STR_CARGO_SINGULAR_GOODS.acc                                    :Merces
+STR_CARGO_SINGULAR_GOODS.dat                                    :Mercibus
 STR_CARGO_SINGULAR_GRAIN                                        :{G=n}Frumentum
-STR_CARGO_SINGULAR_GRAIN.gen                                    :{G=n}frumenti
-STR_CARGO_SINGULAR_GRAIN.acc                                    :{G=n}Frumentum
-STR_CARGO_SINGULAR_GRAIN.dat                                    :{G=n}Frumento
+STR_CARGO_SINGULAR_GRAIN.gen                                    :frumenti
+STR_CARGO_SINGULAR_GRAIN.acc                                    :Frumentum
+STR_CARGO_SINGULAR_GRAIN.dat                                    :Frumento
 STR_CARGO_SINGULAR_WOOD                                         :{G=n}Lignum
-STR_CARGO_SINGULAR_WOOD.gen                                     :{G=n}ligni
-STR_CARGO_SINGULAR_WOOD.acc                                     :{G=n}Lignum
-STR_CARGO_SINGULAR_WOOD.dat                                     :{G=n}Ligno
+STR_CARGO_SINGULAR_WOOD.gen                                     :ligni
+STR_CARGO_SINGULAR_WOOD.acc                                     :Lignum
+STR_CARGO_SINGULAR_WOOD.dat                                     :Ligno
 STR_CARGO_SINGULAR_IRON_ORE                                     :{G=n}Ferrum
-STR_CARGO_SINGULAR_IRON_ORE.gen                                 :{G=n}ferri
-STR_CARGO_SINGULAR_IRON_ORE.acc                                 :{G=n}Ferrum
-STR_CARGO_SINGULAR_IRON_ORE.dat                                 :{G=n}Ferro
+STR_CARGO_SINGULAR_IRON_ORE.gen                                 :ferri
+STR_CARGO_SINGULAR_IRON_ORE.acc                                 :Ferrum
+STR_CARGO_SINGULAR_IRON_ORE.dat                                 :Ferro
 STR_CARGO_SINGULAR_STEEL                                        :{G=m}Chalybs
-STR_CARGO_SINGULAR_STEEL.gen                                    :{G=m}chalybis
-STR_CARGO_SINGULAR_STEEL.acc                                    :{G=m}Chalybem
-STR_CARGO_SINGULAR_STEEL.dat                                    :{G=m}Chalybi
+STR_CARGO_SINGULAR_STEEL.gen                                    :chalybis
+STR_CARGO_SINGULAR_STEEL.acc                                    :Chalybem
+STR_CARGO_SINGULAR_STEEL.dat                                    :Chalybi
 STR_CARGO_SINGULAR_VALUABLES                                    :{G=fp}Res Pretiosa
-STR_CARGO_SINGULAR_VALUABLES.gen                                :{G=fp}rerum pretiosarum
-STR_CARGO_SINGULAR_VALUABLES.acc                                :{G=fp}Res Pretiosas
-STR_CARGO_SINGULAR_VALUABLES.dat                                :{G=fp}Rebus Pretiosis
+STR_CARGO_SINGULAR_VALUABLES.gen                                :rerum pretiosarum
+STR_CARGO_SINGULAR_VALUABLES.acc                                :Res Pretiosas
+STR_CARGO_SINGULAR_VALUABLES.dat                                :Rebus Pretiosis
 STR_CARGO_SINGULAR_COPPER_ORE                                   :{G=n}Aes
-STR_CARGO_SINGULAR_COPPER_ORE.gen                               :{G=n}aeris
-STR_CARGO_SINGULAR_COPPER_ORE.acc                               :{G=n}Aes
-STR_CARGO_SINGULAR_COPPER_ORE.dat                               :{G=n}Aeri
+STR_CARGO_SINGULAR_COPPER_ORE.gen                               :aeris
+STR_CARGO_SINGULAR_COPPER_ORE.acc                               :Aes
+STR_CARGO_SINGULAR_COPPER_ORE.dat                               :Aeri
 STR_CARGO_SINGULAR_MAIZE                                        :{G=n}Maizium
-STR_CARGO_SINGULAR_MAIZE.gen                                    :{G=n}maizii
-STR_CARGO_SINGULAR_MAIZE.acc                                    :{G=n}Maizium
-STR_CARGO_SINGULAR_MAIZE.dat                                    :{G=n}Maizio
+STR_CARGO_SINGULAR_MAIZE.gen                                    :maizii
+STR_CARGO_SINGULAR_MAIZE.acc                                    :Maizium
+STR_CARGO_SINGULAR_MAIZE.dat                                    :Maizio
 STR_CARGO_SINGULAR_FRUIT                                        :{G=mp}Fructus
-STR_CARGO_SINGULAR_FRUIT.gen                                    :{G=mp}fructuum
-STR_CARGO_SINGULAR_FRUIT.acc                                    :{G=mp}Fructus
-STR_CARGO_SINGULAR_FRUIT.dat                                    :{G=mp}Fructibus
+STR_CARGO_SINGULAR_FRUIT.gen                                    :fructuum
+STR_CARGO_SINGULAR_FRUIT.acc                                    :Fructus
+STR_CARGO_SINGULAR_FRUIT.dat                                    :Fructibus
 STR_CARGO_SINGULAR_DIAMOND                                      :{G=mp}Adamantes
-STR_CARGO_SINGULAR_DIAMOND.gen                                  :{G=mp}adamantum
-STR_CARGO_SINGULAR_DIAMOND.acc                                  :{G=mp}Adamantes
-STR_CARGO_SINGULAR_DIAMOND.dat                                  :{G=mp}Adamantibus
+STR_CARGO_SINGULAR_DIAMOND.gen                                  :adamantum
+STR_CARGO_SINGULAR_DIAMOND.acc                                  :Adamantes
+STR_CARGO_SINGULAR_DIAMOND.dat                                  :Adamantibus
 STR_CARGO_SINGULAR_FOOD                                         :{G=m}Cibus
-STR_CARGO_SINGULAR_FOOD.gen                                     :{G=m}cibi
-STR_CARGO_SINGULAR_FOOD.acc                                     :{G=m}Cibum
-STR_CARGO_SINGULAR_FOOD.dat                                     :{G=m}Cibo
+STR_CARGO_SINGULAR_FOOD.gen                                     :cibi
+STR_CARGO_SINGULAR_FOOD.acc                                     :Cibum
+STR_CARGO_SINGULAR_FOOD.dat                                     :Cibo
 STR_CARGO_SINGULAR_PAPER                                        :{G=f}Charta
-STR_CARGO_SINGULAR_PAPER.gen                                    :{G=f}chartae
-STR_CARGO_SINGULAR_PAPER.acc                                    :{G=f}Chartam
-STR_CARGO_SINGULAR_PAPER.dat                                    :{G=f}Chartae
+STR_CARGO_SINGULAR_PAPER.gen                                    :chartae
+STR_CARGO_SINGULAR_PAPER.acc                                    :Chartam
+STR_CARGO_SINGULAR_PAPER.dat                                    :Chartae
 STR_CARGO_SINGULAR_GOLD                                         :{G=n}Aurum
-STR_CARGO_SINGULAR_GOLD.gen                                     :{G=n}auri
-STR_CARGO_SINGULAR_GOLD.acc                                     :{G=n}Aurum
-STR_CARGO_SINGULAR_GOLD.dat                                     :{G=n}Auro
+STR_CARGO_SINGULAR_GOLD.gen                                     :auri
+STR_CARGO_SINGULAR_GOLD.acc                                     :Aurum
+STR_CARGO_SINGULAR_GOLD.dat                                     :Auro
 STR_CARGO_SINGULAR_WATER                                        :{G=f}Aqua
-STR_CARGO_SINGULAR_WATER.gen                                    :{G=f}aquae
-STR_CARGO_SINGULAR_WATER.acc                                    :{G=f}Aquam
-STR_CARGO_SINGULAR_WATER.dat                                    :{G=f}Aquae
+STR_CARGO_SINGULAR_WATER.gen                                    :aquae
+STR_CARGO_SINGULAR_WATER.acc                                    :Aquam
+STR_CARGO_SINGULAR_WATER.dat                                    :Aquae
 STR_CARGO_SINGULAR_WHEAT                                        :{G=n}Triticum
-STR_CARGO_SINGULAR_WHEAT.gen                                    :{G=n}tritici
-STR_CARGO_SINGULAR_WHEAT.acc                                    :{G=n}Triticum
-STR_CARGO_SINGULAR_WHEAT.dat                                    :{G=n}Tritico
+STR_CARGO_SINGULAR_WHEAT.gen                                    :tritici
+STR_CARGO_SINGULAR_WHEAT.acc                                    :Triticum
+STR_CARGO_SINGULAR_WHEAT.dat                                    :Tritico
 STR_CARGO_SINGULAR_RUBBER                                       :{G=f}Gummis
-STR_CARGO_SINGULAR_RUBBER.gen                                   :{G=f}gummis
-STR_CARGO_SINGULAR_RUBBER.acc                                   :{G=f}Gummem
-STR_CARGO_SINGULAR_RUBBER.dat                                   :{G=f}Gummi
+STR_CARGO_SINGULAR_RUBBER.gen                                   :gummis
+STR_CARGO_SINGULAR_RUBBER.acc                                   :Gummem
+STR_CARGO_SINGULAR_RUBBER.dat                                   :Gummi
 STR_CARGO_SINGULAR_SUGAR                                        :{G=n}Saccharum
-STR_CARGO_SINGULAR_SUGAR.gen                                    :{G=n}sacchari
-STR_CARGO_SINGULAR_SUGAR.acc                                    :{G=n}Saccharum
-STR_CARGO_SINGULAR_SUGAR.dat                                    :{G=n}Saccharo
+STR_CARGO_SINGULAR_SUGAR.gen                                    :sacchari
+STR_CARGO_SINGULAR_SUGAR.acc                                    :Saccharum
+STR_CARGO_SINGULAR_SUGAR.dat                                    :Saccharo
 STR_CARGO_SINGULAR_TOY                                          :{G=np}Ludicra
-STR_CARGO_SINGULAR_TOY.gen                                      :{G=np}ludicrorum
-STR_CARGO_SINGULAR_TOY.acc                                      :{G=np}Ludicra
-STR_CARGO_SINGULAR_TOY.dat                                      :{G=np}Ludicris
+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                                    :{G=np}bellariorum
-STR_CARGO_SINGULAR_CANDY.acc                                    :{G=np}Bellaria
-STR_CARGO_SINGULAR_CANDY.dat                                    :{G=np}Bellariis
+STR_CARGO_SINGULAR_CANDY.gen                                    :bellariorum
+STR_CARGO_SINGULAR_CANDY.acc                                    :Bellaria
+STR_CARGO_SINGULAR_CANDY.dat                                    :Bellariis
 STR_CARGO_SINGULAR_COLA                                         :{G=f}Cola
-STR_CARGO_SINGULAR_COLA.gen                                     :{G=f}colae
-STR_CARGO_SINGULAR_COLA.acc                                     :{G=f}Colam
-STR_CARGO_SINGULAR_COLA.dat                                     :{G=f}Colae
+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                             :{G=n}sacchari xylini
-STR_CARGO_SINGULAR_COTTON_CANDY.acc                             :{G=n}Sacchari Xylinum
-STR_CARGO_SINGULAR_COTTON_CANDY.dat                             :{G=n}Sacchari Xylino
+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_BUBBLE                                       :{G=fp}Bullae
-STR_CARGO_SINGULAR_BUBBLE.gen                                   :{G=fp}bullarum
-STR_CARGO_SINGULAR_BUBBLE.acc                                   :{G=fp}Bullas
-STR_CARGO_SINGULAR_BUBBLE.dat                                   :{G=fp}Bullis
+STR_CARGO_SINGULAR_BUBBLE.gen                                   :bullarum
+STR_CARGO_SINGULAR_BUBBLE.acc                                   :Bullas
+STR_CARGO_SINGULAR_BUBBLE.dat                                   :Bullis
 STR_CARGO_SINGULAR_TOFFEE                                       :{G=n}Saccharum Tostum
-STR_CARGO_SINGULAR_TOFFEE.gen                                   :{G=n}sacchari tosti
-STR_CARGO_SINGULAR_TOFFEE.acc                                   :{G=n}Saccharum Tostum
-STR_CARGO_SINGULAR_TOFFEE.dat                                   :{G=n}Saccharo Tosto
+STR_CARGO_SINGULAR_TOFFEE.gen                                   :sacchari tosti
+STR_CARGO_SINGULAR_TOFFEE.acc                                   :Saccharum Tostum
+STR_CARGO_SINGULAR_TOFFEE.dat                                   :Saccharo Tosto
 STR_CARGO_SINGULAR_BATTERY                                      :{G=fp}Pilae Electricae
-STR_CARGO_SINGULAR_BATTERY.gen                                  :{G=fp}pilarum electricarum
-STR_CARGO_SINGULAR_BATTERY.acc                                  :{G=fp}Pilas Electricas
-STR_CARGO_SINGULAR_BATTERY.dat                                  :{G=fp}Pilis Electricis
+STR_CARGO_SINGULAR_BATTERY.gen                                  :pilarum electricarum
+STR_CARGO_SINGULAR_BATTERY.acc                                  :Pilas Electricas
+STR_CARGO_SINGULAR_BATTERY.dat                                  :Pilis Electricis
 STR_CARGO_SINGULAR_PLASTIC                                      :{G=f}Plastica
-STR_CARGO_SINGULAR_PLASTIC.gen                                  :{G=f}plasticae
-STR_CARGO_SINGULAR_PLASTIC.acc                                  :{G=f}Plasticam
-STR_CARGO_SINGULAR_PLASTIC.dat                                  :{G=f}Plasticae
+STR_CARGO_SINGULAR_PLASTIC.gen                                  :plasticae
+STR_CARGO_SINGULAR_PLASTIC.acc                                  :Plasticam
+STR_CARGO_SINGULAR_PLASTIC.dat                                  :Plasticae
 STR_CARGO_SINGULAR_FIZZY_DRINK                                  :{G=fp}Potiones Carbonatae
-STR_CARGO_SINGULAR_FIZZY_DRINK.gen                              :{G=fp}potionum carbonatarum
-STR_CARGO_SINGULAR_FIZZY_DRINK.acc                              :{G=fp}Potiones Carbonatas
-STR_CARGO_SINGULAR_FIZZY_DRINK.dat                              :{G=fp}Potionibus Carbonatis
+STR_CARGO_SINGULAR_FIZZY_DRINK.gen                              :potionum carbonatarum
+STR_CARGO_SINGULAR_FIZZY_DRINK.acc                              :Potiones Carbonatas
+STR_CARGO_SINGULAR_FIZZY_DRINK.dat                              :Potionibus Carbonatis
 
 # Quantity of cargo
 STR_QUANTITY_NOTHING                                            :
@@ -2423,25 +2423,25 @@ STR_CONTENT_NO_ZLIB_SUB                                         :{WHITE}... itaq
 
 # Order of these is important!
 STR_CONTENT_TYPE_BASE_GRAPHICS                                  :{G=n}Fundamentum Graphicum
-STR_CONTENT_TYPE_BASE_GRAPHICS.gen                              :{G=n}Fundamenti Graphici
+STR_CONTENT_TYPE_BASE_GRAPHICS.gen                              :Fundamenti Graphici
 STR_CONTENT_TYPE_NEWGRF                                         :{G=n}NewGRF
-STR_CONTENT_TYPE_NEWGRF.gen                                     :{G=n}NewGRF
+STR_CONTENT_TYPE_NEWGRF.gen                                     :NewGRF
 STR_CONTENT_TYPE_AI                                             :{G=f}IA
-STR_CONTENT_TYPE_AI.gen                                         :{G=f}IA
+STR_CONTENT_TYPE_AI.gen                                         :IA
 STR_CONTENT_TYPE_AI_LIBRARY                                     :{G=f}Bibliotheca IA
-STR_CONTENT_TYPE_AI_LIBRARY.gen                                 :{G=f}Bibliothecae IA
+STR_CONTENT_TYPE_AI_LIBRARY.gen                                 :Bibliothecae IA
 STR_CONTENT_TYPE_SCENARIO                                       :{G=n}Scaenarium
-STR_CONTENT_TYPE_SCENARIO.gen                                   :{G=n}Scaenarii
+STR_CONTENT_TYPE_SCENARIO.gen                                   :Scaenarii
 STR_CONTENT_TYPE_HEIGHTMAP                                      :{G=f}Tabula Altitudinum
-STR_CONTENT_TYPE_HEIGHTMAP.gen                                  :{G=f}Tabulae Altitudinum
+STR_CONTENT_TYPE_HEIGHTMAP.gen                                  :Tabulae Altitudinum
 STR_CONTENT_TYPE_BASE_SOUNDS                                    :{G=n}Fundamentum Sonicum
-STR_CONTENT_TYPE_BASE_SOUNDS.gen                                :{G=n}Fundamenti Sonici
+STR_CONTENT_TYPE_BASE_SOUNDS.gen                                :Fundamenti Sonici
 STR_CONTENT_TYPE_BASE_MUSIC                                     :{G=n}Fundamentum Musicum
-STR_CONTENT_TYPE_BASE_MUSIC.gen                                 :{G=n}Fundamenti Musici
+STR_CONTENT_TYPE_BASE_MUSIC.gen                                 :Fundamenti Musici
 STR_CONTENT_TYPE_GAME_SCRIPT                                    :{G=n}Ludi Scriptum
-STR_CONTENT_TYPE_GAME_SCRIPT.gen                                :{G=n}Ludi Scripti
+STR_CONTENT_TYPE_GAME_SCRIPT.gen                                :Ludi Scripti
 STR_CONTENT_TYPE_GS_LIBRARY                                     :{G=f}Bibliotheca Ludi Scriptorum
-STR_CONTENT_TYPE_GS_LIBRARY.gen                                 :{G=f}Bibliothecae Ludi Scriptorum
+STR_CONTENT_TYPE_GS_LIBRARY.gen                                 :Bibliothecae Ludi Scriptorum
 
 # Content downloading progress window
 STR_CONTENT_DOWNLOAD_TITLE                                      :{WHITE}Res arcessens...
@@ -4716,153 +4716,153 @@ STR_TOWN_BUILDING_NAME_PIGGY_BANK_1                             :Argentaria Porc
 ##id 0x4800
 # industry names
 STR_INDUSTRY_NAME_COAL_MINE                                     :{G=f}Carbonifodina
-STR_INDUSTRY_NAME_COAL_MINE.gen                                 :{G=f}carbonifodinae
-STR_INDUSTRY_NAME_COAL_MINE.acc                                 :{G=f}Carbonifodinam
-STR_INDUSTRY_NAME_COAL_MINE.abl                                 :{G=f}Carbonifodina
+STR_INDUSTRY_NAME_COAL_MINE.gen                                 :carbonifodinae
+STR_INDUSTRY_NAME_COAL_MINE.acc                                 :Carbonifodinam
+STR_INDUSTRY_NAME_COAL_MINE.abl                                 :Carbonifodina
 STR_INDUSTRY_NAME_POWER_STATION                                 :{G=f}Electrificina
-STR_INDUSTRY_NAME_POWER_STATION.gen                             :{G=f}electrificinae
-STR_INDUSTRY_NAME_POWER_STATION.acc                             :{G=f}Electrificinam
-STR_INDUSTRY_NAME_POWER_STATION.abl                             :{G=f}Electrificina
+STR_INDUSTRY_NAME_POWER_STATION.gen                             :electrificinae
+STR_INDUSTRY_NAME_POWER_STATION.acc                             :Electrificinam
+STR_INDUSTRY_NAME_POWER_STATION.abl                             :Electrificina
 STR_INDUSTRY_NAME_SAWMILL                                       :{G=f}Serraria
-STR_INDUSTRY_NAME_SAWMILL.gen                                   :{G=f}serrariae
-STR_INDUSTRY_NAME_SAWMILL.acc                                   :{G=f}Serrariam
-STR_INDUSTRY_NAME_SAWMILL.abl                                   :{G=f}Serraria
+STR_INDUSTRY_NAME_SAWMILL.gen                                   :serrariae
+STR_INDUSTRY_NAME_SAWMILL.acc                                   :Serrariam
+STR_INDUSTRY_NAME_SAWMILL.abl                                   :Serraria
 STR_INDUSTRY_NAME_FOREST                                        :{G=f}Silva
-STR_INDUSTRY_NAME_FOREST.gen                                    :{G=f}silvae
-STR_INDUSTRY_NAME_FOREST.acc                                    :{G=f}Silvam
-STR_INDUSTRY_NAME_FOREST.abl                                    :{G=f}Silva
+STR_INDUSTRY_NAME_FOREST.gen                                    :silvae
+STR_INDUSTRY_NAME_FOREST.acc                                    :Silvam
+STR_INDUSTRY_NAME_FOREST.abl                                    :Silva
 STR_INDUSTRY_NAME_OIL_REFINERY                                  :{G=n}Ergasterium Petrolearium
-STR_INDUSTRY_NAME_OIL_REFINERY.gen                              :{G=n}ergasterii petrolearii
-STR_INDUSTRY_NAME_OIL_REFINERY.acc                              :{G=n}Ergasterium Petrolearium
-STR_INDUSTRY_NAME_OIL_REFINERY.abl                              :{G=n}Ergasterio Petroleario
+STR_INDUSTRY_NAME_OIL_REFINERY.gen                              :ergasterii petrolearii
+STR_INDUSTRY_NAME_OIL_REFINERY.acc                              :Ergasterium Petrolearium
+STR_INDUSTRY_NAME_OIL_REFINERY.abl                              :Ergasterio Petroleario
 STR_INDUSTRY_NAME_OIL_RIG                                       :{G=m}Suggestus Petrolearius
-STR_INDUSTRY_NAME_OIL_RIG.gen                                   :{G=m}suggestus petrolearii
-STR_INDUSTRY_NAME_OIL_RIG.acc                                   :{G=m}Suggestum Petrolearium
-STR_INDUSTRY_NAME_OIL_RIG.abl                                   :{G=m}Suggestu Petroleario
+STR_INDUSTRY_NAME_OIL_RIG.gen                                   :suggestus petrolearii
+STR_INDUSTRY_NAME_OIL_RIG.acc                                   :Suggestum Petrolearium
+STR_INDUSTRY_NAME_OIL_RIG.abl                                   :Suggestu Petroleario
 STR_INDUSTRY_NAME_FACTORY                                       :{G=f}Fabrica
-STR_INDUSTRY_NAME_FACTORY.gen                                   :{G=f}fabricae
-STR_INDUSTRY_NAME_FACTORY.acc                                   :{G=f}Fabricam
-STR_INDUSTRY_NAME_FACTORY.abl                                   :{G=f}Fabrica
+STR_INDUSTRY_NAME_FACTORY.gen                                   :fabricae
+STR_INDUSTRY_NAME_FACTORY.acc                                   :Fabricam
+STR_INDUSTRY_NAME_FACTORY.abl                                   :Fabrica
 STR_INDUSTRY_NAME_PRINTING_WORKS                                :{G=n}Impressorium
-STR_INDUSTRY_NAME_PRINTING_WORKS.gen                            :{G=n}impressorii
-STR_INDUSTRY_NAME_PRINTING_WORKS.acc                            :{G=n}Impressorium
-STR_INDUSTRY_NAME_PRINTING_WORKS.abl                            :{G=n}Impressorio
+STR_INDUSTRY_NAME_PRINTING_WORKS.gen                            :impressorii
+STR_INDUSTRY_NAME_PRINTING_WORKS.acc                            :Impressorium
+STR_INDUSTRY_NAME_PRINTING_WORKS.abl                            :Impressorio
 STR_INDUSTRY_NAME_STEEL_MILL                                    :{G=f}Fabrica Chalybeia
-STR_INDUSTRY_NAME_STEEL_MILL.gen                                :{G=f}fabricae chalybeiae
-STR_INDUSTRY_NAME_STEEL_MILL.acc                                :{G=f}Fabricam Chalybeiam
-STR_INDUSTRY_NAME_STEEL_MILL.abl                                :{G=f}Fabrica Chalybeia
+STR_INDUSTRY_NAME_STEEL_MILL.gen                                :fabricae chalybeiae
+STR_INDUSTRY_NAME_STEEL_MILL.acc                                :Fabricam Chalybeiam
+STR_INDUSTRY_NAME_STEEL_MILL.abl                                :Fabrica Chalybeia
 STR_INDUSTRY_NAME_FARM                                          :{G=m}Fundus
-STR_INDUSTRY_NAME_FARM.gen                                      :{G=m}fundi
-STR_INDUSTRY_NAME_FARM.acc                                      :{G=m}Fundum
-STR_INDUSTRY_NAME_FARM.abl                                      :{G=m}Fundo
+STR_INDUSTRY_NAME_FARM.gen                                      :fundi
+STR_INDUSTRY_NAME_FARM.acc                                      :Fundum
+STR_INDUSTRY_NAME_FARM.abl                                      :Fundo
 STR_INDUSTRY_NAME_COPPER_ORE_MINE                               :{G=f}Aerifodina
-STR_INDUSTRY_NAME_COPPER_ORE_MINE.gen                           :{G=f}aerifodinae
-STR_INDUSTRY_NAME_COPPER_ORE_MINE.acc                           :{G=f}Aerifodinam
-STR_INDUSTRY_NAME_COPPER_ORE_MINE.abl                           :{G=f}Aerifodina
+STR_INDUSTRY_NAME_COPPER_ORE_MINE.gen                           :aerifodinae
+STR_INDUSTRY_NAME_COPPER_ORE_MINE.acc                           :Aerifodinam
+STR_INDUSTRY_NAME_COPPER_ORE_MINE.abl                           :Aerifodina
 STR_INDUSTRY_NAME_OIL_WELLS                                     :{G=mp}Putei Petrolearii
-STR_INDUSTRY_NAME_OIL_WELLS.gen                                 :{G=mp}puteorum petroleariorum
-STR_INDUSTRY_NAME_OIL_WELLS.acc                                 :{G=mp}Puteos Petrolearios
-STR_INDUSTRY_NAME_OIL_WELLS.abl                                 :{G=mp}Puteis Petroleariis
+STR_INDUSTRY_NAME_OIL_WELLS.gen                                 :puteorum petroleariorum
+STR_INDUSTRY_NAME_OIL_WELLS.acc                                 :Puteos Petrolearios
+STR_INDUSTRY_NAME_OIL_WELLS.abl                                 :Puteis Petroleariis
 STR_INDUSTRY_NAME_BANK                                          :{G=f}Argentaria
-STR_INDUSTRY_NAME_BANK.gen                                      :{G=f}argentariae
-STR_INDUSTRY_NAME_BANK.acc                                      :{G=f}Argentariam
-STR_INDUSTRY_NAME_BANK.abl                                      :{G=f}Argentaria
+STR_INDUSTRY_NAME_BANK.gen                                      :argentariae
+STR_INDUSTRY_NAME_BANK.acc                                      :Argentariam
+STR_INDUSTRY_NAME_BANK.abl                                      :Argentaria
 STR_INDUSTRY_NAME_FOOD_PROCESSING_PLANT                         :{G=f}Fabrica Cibaria
-STR_INDUSTRY_NAME_FOOD_PROCESSING_PLANT.gen                     :{G=f}fabricae cibariae
-STR_INDUSTRY_NAME_FOOD_PROCESSING_PLANT.acc                     :{G=f}Fabricam Cibariam
-STR_INDUSTRY_NAME_FOOD_PROCESSING_PLANT.abl                     :{G=f}Fabrica Cibaria
+STR_INDUSTRY_NAME_FOOD_PROCESSING_PLANT.gen                     :fabricae cibariae
+STR_INDUSTRY_NAME_FOOD_PROCESSING_PLANT.acc                     :Fabricam Cibariam
+STR_INDUSTRY_NAME_FOOD_PROCESSING_PLANT.abl                     :Fabrica Cibaria
 STR_INDUSTRY_NAME_PAPER_MILL                                    :{G=f}Fabrica Chartaria
-STR_INDUSTRY_NAME_PAPER_MILL.gen                                :{G=f}fabricae chartariae
-STR_INDUSTRY_NAME_PAPER_MILL.acc                                :{G=f}Fabricam Chartariam
-STR_INDUSTRY_NAME_PAPER_MILL.abl                                :{G=f}Fabrica Chartaria
+STR_INDUSTRY_NAME_PAPER_MILL.gen                                :fabricae chartariae
+STR_INDUSTRY_NAME_PAPER_MILL.acc                                :Fabricam Chartariam
+STR_INDUSTRY_NAME_PAPER_MILL.abl                                :Fabrica Chartaria
 STR_INDUSTRY_NAME_GOLD_MINE                                     :{G=f}Aurifodina
-STR_INDUSTRY_NAME_GOLD_MINE.gen                                 :{G=f}aurifodinae
-STR_INDUSTRY_NAME_GOLD_MINE.acc                                 :{G=f}Aurifodinam
-STR_INDUSTRY_NAME_GOLD_MINE.abl                                 :{G=f}Aurifodina
+STR_INDUSTRY_NAME_GOLD_MINE.gen                                 :aurifodinae
+STR_INDUSTRY_NAME_GOLD_MINE.acc                                 :Aurifodinam
+STR_INDUSTRY_NAME_GOLD_MINE.abl                                 :Aurifodina
 STR_INDUSTRY_NAME_BANK_TROPIC_ARCTIC                            :{G=f}Argentaria
-STR_INDUSTRY_NAME_BANK_TROPIC_ARCTIC.gen                        :{G=f}argentariae
-STR_INDUSTRY_NAME_BANK_TROPIC_ARCTIC.acc                        :{G=f}Argentariam
-STR_INDUSTRY_NAME_BANK_TROPIC_ARCTIC.abl                        :{G=f}Argentaria
+STR_INDUSTRY_NAME_BANK_TROPIC_ARCTIC.gen                        :argentariae
+STR_INDUSTRY_NAME_BANK_TROPIC_ARCTIC.acc                        :Argentariam
+STR_INDUSTRY_NAME_BANK_TROPIC_ARCTIC.abl                        :Argentaria
 STR_INDUSTRY_NAME_DIAMOND_MINE                                  :{G=f}Adamantifodina
-STR_INDUSTRY_NAME_DIAMOND_MINE.gen                              :{G=f}adamantifodinae
-STR_INDUSTRY_NAME_DIAMOND_MINE.acc                              :{G=f}Adamantifodinam
-STR_INDUSTRY_NAME_DIAMOND_MINE.abl                              :{G=f}Adamantifodina
+STR_INDUSTRY_NAME_DIAMOND_MINE.gen                              :adamantifodinae
+STR_INDUSTRY_NAME_DIAMOND_MINE.acc                              :Adamantifodinam
+STR_INDUSTRY_NAME_DIAMOND_MINE.abl                              :Adamantifodina
 STR_INDUSTRY_NAME_IRON_ORE_MINE                                 :{G=f}Ferrifodina
-STR_INDUSTRY_NAME_IRON_ORE_MINE.gen                             :{G=f}ferrifodinae
-STR_INDUSTRY_NAME_IRON_ORE_MINE.acc                             :{G=f}Ferrifodinam
-STR_INDUSTRY_NAME_IRON_ORE_MINE.abl                             :{G=f}Ferrifodina
+STR_INDUSTRY_NAME_IRON_ORE_MINE.gen                             :ferrifodinae
+STR_INDUSTRY_NAME_IRON_ORE_MINE.acc                             :Ferrifodinam
+STR_INDUSTRY_NAME_IRON_ORE_MINE.abl                             :Ferrifodina
 STR_INDUSTRY_NAME_FRUIT_PLANTATION                              :{G=n}Arbustum Fructuarium
-STR_INDUSTRY_NAME_FRUIT_PLANTATION.gen                          :{G=n}arbusti fructuarii
-STR_INDUSTRY_NAME_FRUIT_PLANTATION.acc                          :{G=n}Arbustum Fructuarium
-STR_INDUSTRY_NAME_FRUIT_PLANTATION.abl                          :{G=n}Arbusto Fructuario
+STR_INDUSTRY_NAME_FRUIT_PLANTATION.gen                          :arbusti fructuarii
+STR_INDUSTRY_NAME_FRUIT_PLANTATION.acc                          :Arbustum Fructuarium
+STR_INDUSTRY_NAME_FRUIT_PLANTATION.abl                          :Arbusto Fructuario
 STR_INDUSTRY_NAME_RUBBER_PLANTATION                             :{G=n}Arbustum Gummosum
-STR_INDUSTRY_NAME_RUBBER_PLANTATION.gen                         :{G=n}arbusti gummosi
-STR_INDUSTRY_NAME_RUBBER_PLANTATION.acc                         :{G=n}Arbustum Gummosum
-STR_INDUSTRY_NAME_RUBBER_PLANTATION.abl                         :{G=n}Arbusto Gummoso
+STR_INDUSTRY_NAME_RUBBER_PLANTATION.gen                         :arbusti gummosi
+STR_INDUSTRY_NAME_RUBBER_PLANTATION.acc                         :Arbustum Gummosum
+STR_INDUSTRY_NAME_RUBBER_PLANTATION.abl                         :Arbusto Gummoso
 STR_INDUSTRY_NAME_WATER_SUPPLY                                  :{G=m}Fons Aquae
-STR_INDUSTRY_NAME_WATER_SUPPLY.gen                              :{G=m}fontis aquae
-STR_INDUSTRY_NAME_WATER_SUPPLY.acc                              :{G=m}Fontem Aquae
-STR_INDUSTRY_NAME_WATER_SUPPLY.abl                              :{G=m}Fonte Aquae
+STR_INDUSTRY_NAME_WATER_SUPPLY.gen                              :fontis aquae
+STR_INDUSTRY_NAME_WATER_SUPPLY.acc                              :Fontem Aquae
+STR_INDUSTRY_NAME_WATER_SUPPLY.abl                              :Fonte Aquae
 STR_INDUSTRY_NAME_WATER_TOWER                                   :{G=f}Turris Aquaria
-STR_INDUSTRY_NAME_WATER_TOWER.gen                               :{G=f}turris aquariae
-STR_INDUSTRY_NAME_WATER_TOWER.acc                               :{G=f}Turrim Aquariam
-STR_INDUSTRY_NAME_WATER_TOWER.abl                               :{G=f}Turri Aquaria
+STR_INDUSTRY_NAME_WATER_TOWER.gen                               :turris aquariae
+STR_INDUSTRY_NAME_WATER_TOWER.acc                               :Turrim Aquariam
+STR_INDUSTRY_NAME_WATER_TOWER.abl                               :Turri Aquaria
 STR_INDUSTRY_NAME_FACTORY_2                                     :{G=f}Fabrica
-STR_INDUSTRY_NAME_FACTORY_2.gen                                 :{G=f}fabricae
-STR_INDUSTRY_NAME_FACTORY_2.acc                                 :{G=f}Fabricam
-STR_INDUSTRY_NAME_FACTORY_2.abl                                 :{G=f}Fabrica
+STR_INDUSTRY_NAME_FACTORY_2.gen                                 :fabricae
+STR_INDUSTRY_NAME_FACTORY_2.acc                                 :Fabricam
+STR_INDUSTRY_NAME_FACTORY_2.abl                                 :Fabrica
 STR_INDUSTRY_NAME_FARM_2                                        :{G=m}Fundus
-STR_INDUSTRY_NAME_FARM_2.gen                                    :{G=m}fundi
-STR_INDUSTRY_NAME_FARM_2.acc                                    :{G=m}Fundum
-STR_INDUSTRY_NAME_FARM_2.abl                                    :{G=m}Fundo
+STR_INDUSTRY_NAME_FARM_2.gen                                    :fundi
+STR_INDUSTRY_NAME_FARM_2.acc                                    :Fundum
+STR_INDUSTRY_NAME_FARM_2.abl                                    :Fundo
 STR_INDUSTRY_NAME_LUMBER_MILL                                   :{G=np}Castra Lignatorum
-STR_INDUSTRY_NAME_LUMBER_MILL.gen                               :{G=np}castrorum lignatorum
-STR_INDUSTRY_NAME_LUMBER_MILL.acc                               :{G=np}Castra Lignatorum
-STR_INDUSTRY_NAME_LUMBER_MILL.abl                               :{G=np}Castris Lignatorum
+STR_INDUSTRY_NAME_LUMBER_MILL.gen                               :castrorum lignatorum
+STR_INDUSTRY_NAME_LUMBER_MILL.acc                               :Castra Lignatorum
+STR_INDUSTRY_NAME_LUMBER_MILL.abl                               :Castris Lignatorum
 STR_INDUSTRY_NAME_COTTON_CANDY_FOREST                           :{G=f}Silva Saccari Xylini
-STR_INDUSTRY_NAME_COTTON_CANDY_FOREST.gen                       :{G=f}silvae saccari xylini
-STR_INDUSTRY_NAME_COTTON_CANDY_FOREST.acc                       :{G=f}Silvam Saccari Xylini
-STR_INDUSTRY_NAME_COTTON_CANDY_FOREST.abl                       :{G=f}Silva Saccari Xylini
+STR_INDUSTRY_NAME_COTTON_CANDY_FOREST.gen                       :silvae saccari xylini
+STR_INDUSTRY_NAME_COTTON_CANDY_FOREST.acc                       :Silvam Saccari Xylini
+STR_INDUSTRY_NAME_COTTON_CANDY_FOREST.abl                       :Silva Saccari Xylini
 STR_INDUSTRY_NAME_CANDY_FACTORY                                 :{G=f}Fabrica Bellarica
-STR_INDUSTRY_NAME_CANDY_FACTORY.gen                             :{G=f}fabricae bellaricae
-STR_INDUSTRY_NAME_CANDY_FACTORY.acc                             :{G=f}Fabricam Bellaricam
-STR_INDUSTRY_NAME_CANDY_FACTORY.abl                             :{G=f}Fabrica Bellarica
+STR_INDUSTRY_NAME_CANDY_FACTORY.gen                             :fabricae bellaricae
+STR_INDUSTRY_NAME_CANDY_FACTORY.acc                             :Fabricam Bellaricam
+STR_INDUSTRY_NAME_CANDY_FACTORY.abl                             :Fabrica Bellarica
 STR_INDUSTRY_NAME_BATTERY_FARM                                  :{G=m}Fundus Pilarum Electricarum
-STR_INDUSTRY_NAME_BATTERY_FARM.gen                              :{G=m}fundi pilarum electricarum
-STR_INDUSTRY_NAME_BATTERY_FARM.acc                              :{G=m}Fundum Pilarum Electricarum
-STR_INDUSTRY_NAME_BATTERY_FARM.abl                              :{G=m}Fundo Pilarum Electricarum
+STR_INDUSTRY_NAME_BATTERY_FARM.gen                              :fundi pilarum electricarum
+STR_INDUSTRY_NAME_BATTERY_FARM.acc                              :Fundum Pilarum Electricarum
+STR_INDUSTRY_NAME_BATTERY_FARM.abl                              :Fundo Pilarum Electricarum
 STR_INDUSTRY_NAME_COLA_WELLS                                    :{G=mp}Putei Colae
-STR_INDUSTRY_NAME_COLA_WELLS.gen                                :{G=mp}puteorum colae
-STR_INDUSTRY_NAME_COLA_WELLS.acc                                :{G=mp}Puteos Colae
-STR_INDUSTRY_NAME_COLA_WELLS.abl                                :{G=mp}Puteis Colae
+STR_INDUSTRY_NAME_COLA_WELLS.gen                                :puteorum colae
+STR_INDUSTRY_NAME_COLA_WELLS.acc                                :Puteos Colae
+STR_INDUSTRY_NAME_COLA_WELLS.abl                                :Puteis Colae
 STR_INDUSTRY_NAME_TOY_SHOP                                      :{G=f}Taberna Ludicrorum
-STR_INDUSTRY_NAME_TOY_SHOP.gen                                  :{G=f}tabernae ludicrorum
-STR_INDUSTRY_NAME_TOY_SHOP.acc                                  :{G=f}Tabernam Ludicrorum
-STR_INDUSTRY_NAME_TOY_SHOP.abl                                  :{G=f}Taberna Ludicrorum
+STR_INDUSTRY_NAME_TOY_SHOP.gen                                  :tabernae ludicrorum
+STR_INDUSTRY_NAME_TOY_SHOP.acc                                  :Tabernam Ludicrorum
+STR_INDUSTRY_NAME_TOY_SHOP.abl                                  :Taberna Ludicrorum
 STR_INDUSTRY_NAME_TOY_FACTORY                                   :{G=f}Fabrica Ludicrorum
-STR_INDUSTRY_NAME_TOY_FACTORY.gen                               :{G=f}fabricae ludicrorum
-STR_INDUSTRY_NAME_TOY_FACTORY.acc                               :{G=f}Fabricam Ludicrorum
-STR_INDUSTRY_NAME_TOY_FACTORY.abl                               :{G=f}Fabrica Ludicrorum
+STR_INDUSTRY_NAME_TOY_FACTORY.gen                               :fabricae ludicrorum
+STR_INDUSTRY_NAME_TOY_FACTORY.acc                               :Fabricam Ludicrorum
+STR_INDUSTRY_NAME_TOY_FACTORY.abl                               :Fabrica Ludicrorum
 STR_INDUSTRY_NAME_PLASTIC_FOUNTAINS                             :{G=mp}Fontes Plasticae
-STR_INDUSTRY_NAME_PLASTIC_FOUNTAINS.gen                         :{G=mp}fontium plasticae
-STR_INDUSTRY_NAME_PLASTIC_FOUNTAINS.acc                         :{G=mp}Fontes Plasticae
-STR_INDUSTRY_NAME_PLASTIC_FOUNTAINS.abl                         :{G=mp}Fontibus Plasticae
+STR_INDUSTRY_NAME_PLASTIC_FOUNTAINS.gen                         :fontium plasticae
+STR_INDUSTRY_NAME_PLASTIC_FOUNTAINS.acc                         :Fontes Plasticae
+STR_INDUSTRY_NAME_PLASTIC_FOUNTAINS.abl                         :Fontibus Plasticae
 STR_INDUSTRY_NAME_FIZZY_DRINK_FACTORY                           :{G=f}Fabrica Potionum Carbonatarum
-STR_INDUSTRY_NAME_FIZZY_DRINK_FACTORY.gen                       :{G=f}fabricae potionum carbonatarum
-STR_INDUSTRY_NAME_FIZZY_DRINK_FACTORY.acc                       :{G=f}Fabricam Potionum Carbonatarum
-STR_INDUSTRY_NAME_FIZZY_DRINK_FACTORY.abl                       :{G=f}Fabrica Potionum Carbonatarum
+STR_INDUSTRY_NAME_FIZZY_DRINK_FACTORY.gen                       :fabricae potionum carbonatarum
+STR_INDUSTRY_NAME_FIZZY_DRINK_FACTORY.acc                       :Fabricam Potionum Carbonatarum
+STR_INDUSTRY_NAME_FIZZY_DRINK_FACTORY.abl                       :Fabrica Potionum Carbonatarum
 STR_INDUSTRY_NAME_BUBBLE_GENERATOR                              :{G=n}Generatrum Bullarum
-STR_INDUSTRY_NAME_BUBBLE_GENERATOR.gen                          :{G=n}generatri bullarum
-STR_INDUSTRY_NAME_BUBBLE_GENERATOR.acc                          :{G=n}Generatrum Bullarum
-STR_INDUSTRY_NAME_BUBBLE_GENERATOR.abl                          :{G=n}Generatro Bullarum
+STR_INDUSTRY_NAME_BUBBLE_GENERATOR.gen                          :generatri bullarum
+STR_INDUSTRY_NAME_BUBBLE_GENERATOR.acc                          :Generatrum Bullarum
+STR_INDUSTRY_NAME_BUBBLE_GENERATOR.abl                          :Generatro Bullarum
 STR_INDUSTRY_NAME_TOFFEE_QUARRY                                 :{G=fp}Lapicidinae Sacchari Tosti
-STR_INDUSTRY_NAME_TOFFEE_QUARRY.gen                             :{G=fp}lapicidinarum sacchari tosti
-STR_INDUSTRY_NAME_TOFFEE_QUARRY.acc                             :{G=fp}Lapicidinas Sacchari Tosti
-STR_INDUSTRY_NAME_TOFFEE_QUARRY.abl                             :{G=fp}Lapicidinis Sacchari Tosti
+STR_INDUSTRY_NAME_TOFFEE_QUARRY.gen                             :lapicidinarum sacchari tosti
+STR_INDUSTRY_NAME_TOFFEE_QUARRY.acc                             :Lapicidinas Sacchari Tosti
+STR_INDUSTRY_NAME_TOFFEE_QUARRY.abl                             :Lapicidinis Sacchari Tosti
 STR_INDUSTRY_NAME_SUGAR_MINE                                    :{G=f}Saccharifodina
-STR_INDUSTRY_NAME_SUGAR_MINE.gen                                :{G=f}saccharifodinae
-STR_INDUSTRY_NAME_SUGAR_MINE.acc                                :{G=f}Saccharifodinam
-STR_INDUSTRY_NAME_SUGAR_MINE.abl                                :{G=f}Saccharifodina
+STR_INDUSTRY_NAME_SUGAR_MINE.gen                                :saccharifodinae
+STR_INDUSTRY_NAME_SUGAR_MINE.acc                                :Saccharifodinam
+STR_INDUSTRY_NAME_SUGAR_MINE.abl                                :Saccharifodina
 
 ############ WARNING, using range 0x6000 for strings that are stored in the savegame
 ############ These strings may never get a new id, or savegames will break!