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

10 files changed, 933 insertions, 933 deletions

diff --git a/src/lang/czech.txt b/src/lang/czech.txt
index 38a6a02f2..68d635d29 100644
--- a/src/lang/czech.txt
+++ b/src/lang/czech.txt
@@ -35,14 +35,14 @@ STR_CARGO_PLURAL_PASSENGERS.big                                 :Cestující
 STR_CARGO_PLURAL_COAL                                           :Uhlí
 STR_CARGO_PLURAL_COAL.big                                       :Uhlí
 STR_CARGO_PLURAL_MAIL                                           :{G=f}Pošta
-STR_CARGO_PLURAL_MAIL.nom                                       :{G=f}pošta
-STR_CARGO_PLURAL_MAIL.gen                                       :{G=f}pošty
-STR_CARGO_PLURAL_MAIL.dat                                       :{G=f}poštu
-STR_CARGO_PLURAL_MAIL.acc                                       :{G=f}poštu
-STR_CARGO_PLURAL_MAIL.loc                                       :{G=f}poště
-STR_CARGO_PLURAL_MAIL.ins                                       :{G=f}poštou
+STR_CARGO_PLURAL_MAIL.nom                                       :pošta
+STR_CARGO_PLURAL_MAIL.gen                                       :pošty
+STR_CARGO_PLURAL_MAIL.dat                                       :poštu
+STR_CARGO_PLURAL_MAIL.acc                                       :poštu
+STR_CARGO_PLURAL_MAIL.loc                                       :poště
+STR_CARGO_PLURAL_MAIL.ins                                       :poštou
 STR_CARGO_PLURAL_MAIL.big                                       :Pošta
-STR_CARGO_PLURAL_MAIL.small                                     :{G=f}pošta
+STR_CARGO_PLURAL_MAIL.small                                     :pošta
 STR_CARGO_PLURAL_OIL                                            :Ropa
 STR_CARGO_PLURAL_OIL.gen                                        :Ropy
 STR_CARGO_PLURAL_OIL.acc                                        :Ropu
@@ -3612,14 +3612,14 @@ STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}Chceš
 STR_ENGINE_PREVIEW_CAPTION                                      :{WHITE}Zpráva od výrobce dopravních prostředků
 STR_ENGINE_PREVIEW_MESSAGE                                      :{GOLD}Právě jsme vyvinuli nov{G ý ou é é é é á} {STRING.acc}. Měl byste zájem o roční výhradní právo na používání tohoto prostředku, aby byl otestován před uvedením na trh?
 STR_ENGINE_PREVIEW_RAILROAD_LOCOMOTIVE                          :{G=f}lokomotiva
-STR_ENGINE_PREVIEW_RAILROAD_LOCOMOTIVE.acc                      :{G=f}lokomotivu
+STR_ENGINE_PREVIEW_RAILROAD_LOCOMOTIVE.acc                      :lokomotivu
 STR_ENGINE_PREVIEW_ROAD_VEHICLE                                 :{G=n}silniční vozidlo
 STR_ENGINE_PREVIEW_AIRCRAFT                                     :{G=n}letadlo
 STR_ENGINE_PREVIEW_SHIP                                         :{G=f}loď
 STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE                          :{G=f}lokomotiva pro monorail
-STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE.acc                      :{G=f}lokomotivu pro monorail
+STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE.acc                      :lokomotivu pro monorail
 STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE                            :{G=f}lokomotiva Maglev
-STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE.acc                        :{G=f}lokomotivu Maglev
+STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE.acc                        :lokomotivu Maglev
 
 STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER                      :{BLACK}Cena: {CURRENCY_LONG} Hmotnost: {WEIGHT_SHORT}{}Rychlost: {VELOCITY}  Výkon: {POWER}{}Cena provozu: {CURRENCY_LONG} ročně{}Kapacita: {CARGO_LONG}
 STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER_MAX_TE               :{BLACK}Cena: {CURRENCY_LONG} Váha: {WEIGHT_SHORT}{}Rychlost: {VELOCITY}  Síla: {POWER}  Maximální tažná síla: {6:FORCE}{}Provozní náklady: {4:CURRENCY_LONG}/rok{}Kapacita: {5:CARGO_LONG}
@@ -4615,153 +4615,153 @@ STR_TOWN_BUILDING_NAME_PIGGY_BANK_1                             :Banka prasátko
 ##id 0x4800
 # industry names
 STR_INDUSTRY_NAME_COAL_MINE                                     :{G=m}Uhelný důl
-STR_INDUSTRY_NAME_COAL_MINE.gen                                 :{G=m}uhelného dolu
-STR_INDUSTRY_NAME_COAL_MINE.loc                                 :{G=m}v uhelném dole
-STR_INDUSTRY_NAME_COAL_MINE.small                               :{G=m}uhelný důl
+STR_INDUSTRY_NAME_COAL_MINE.gen                                 :uhelného dolu
+STR_INDUSTRY_NAME_COAL_MINE.loc                                 :v uhelném dole
+STR_INDUSTRY_NAME_COAL_MINE.small                               :uhelný důl
 STR_INDUSTRY_NAME_POWER_STATION                                 :{G=f}Elektrárna
-STR_INDUSTRY_NAME_POWER_STATION.gen                             :{G=f}elektrárny
-STR_INDUSTRY_NAME_POWER_STATION.loc                             :{G=f}v elektrárně
-STR_INDUSTRY_NAME_POWER_STATION.small                           :{G=f}elektrárna
+STR_INDUSTRY_NAME_POWER_STATION.gen                             :elektrárny
+STR_INDUSTRY_NAME_POWER_STATION.loc                             :v elektrárně
+STR_INDUSTRY_NAME_POWER_STATION.small                           :elektrárna
 STR_INDUSTRY_NAME_SAWMILL                                       :{G=f}Pila
-STR_INDUSTRY_NAME_SAWMILL.gen                                   :{G=f}pily
-STR_INDUSTRY_NAME_SAWMILL.loc                                   :{G=f}na pile
-STR_INDUSTRY_NAME_SAWMILL.small                                 :{G=f}pila
+STR_INDUSTRY_NAME_SAWMILL.gen                                   :pily
+STR_INDUSTRY_NAME_SAWMILL.loc                                   :na pile
+STR_INDUSTRY_NAME_SAWMILL.small                                 :pila
 STR_INDUSTRY_NAME_FOREST                                        :{G=m}Les
-STR_INDUSTRY_NAME_FOREST.gen                                    :{G=m}lesa
-STR_INDUSTRY_NAME_FOREST.loc                                    :{G=m}v lese
-STR_INDUSTRY_NAME_FOREST.small                                  :{G=m}les
+STR_INDUSTRY_NAME_FOREST.gen                                    :lesa
+STR_INDUSTRY_NAME_FOREST.loc                                    :v lese
+STR_INDUSTRY_NAME_FOREST.small                                  :les
 STR_INDUSTRY_NAME_OIL_REFINERY                                  :{G=f}Rafinerie
-STR_INDUSTRY_NAME_OIL_REFINERY.gen                              :{G=f}rafinerie
-STR_INDUSTRY_NAME_OIL_REFINERY.loc                              :{G=f}v rafinerii
-STR_INDUSTRY_NAME_OIL_REFINERY.small                            :{G=f}rafinerie
+STR_INDUSTRY_NAME_OIL_REFINERY.gen                              :rafinerie
+STR_INDUSTRY_NAME_OIL_REFINERY.loc                              :v rafinerii
+STR_INDUSTRY_NAME_OIL_REFINERY.small                            :rafinerie
 STR_INDUSTRY_NAME_OIL_RIG                                       :{G=f}Ropná plošina
-STR_INDUSTRY_NAME_OIL_RIG.gen                                   :{G=f}ropné plošiny
-STR_INDUSTRY_NAME_OIL_RIG.loc                                   :{G=f}na ropné plošině
-STR_INDUSTRY_NAME_OIL_RIG.small                                 :{G=f}ropná plošina
+STR_INDUSTRY_NAME_OIL_RIG.gen                                   :ropné plošiny
+STR_INDUSTRY_NAME_OIL_RIG.loc                                   :na ropné plošině
+STR_INDUSTRY_NAME_OIL_RIG.small                                 :ropná plošina
 STR_INDUSTRY_NAME_FACTORY                                       :{G=f}Továrna
-STR_INDUSTRY_NAME_FACTORY.gen                                   :{G=f}továrny
-STR_INDUSTRY_NAME_FACTORY.loc                                   :{G=f}v továrně
-STR_INDUSTRY_NAME_FACTORY.small                                 :{G=f}továrna
+STR_INDUSTRY_NAME_FACTORY.gen                                   :továrny
+STR_INDUSTRY_NAME_FACTORY.loc                                   :v továrně
+STR_INDUSTRY_NAME_FACTORY.small                                 :továrna
 STR_INDUSTRY_NAME_PRINTING_WORKS                                :{G=f}Tiskárna
-STR_INDUSTRY_NAME_PRINTING_WORKS.gen                            :{G=f}tiskárny
-STR_INDUSTRY_NAME_PRINTING_WORKS.loc                            :{G=f}v tiskárně
-STR_INDUSTRY_NAME_PRINTING_WORKS.small                          :{G=f}tiskárna
+STR_INDUSTRY_NAME_PRINTING_WORKS.gen                            :tiskárny
+STR_INDUSTRY_NAME_PRINTING_WORKS.loc                            :v tiskárně
+STR_INDUSTRY_NAME_PRINTING_WORKS.small                          :tiskárna
 STR_INDUSTRY_NAME_STEEL_MILL                                    :{G=f}Ocelárna
-STR_INDUSTRY_NAME_STEEL_MILL.gen                                :{G=f}ocelárny
-STR_INDUSTRY_NAME_STEEL_MILL.loc                                :{G=f}v ocelárně
-STR_INDUSTRY_NAME_STEEL_MILL.small                              :{G=f}ocelárna
+STR_INDUSTRY_NAME_STEEL_MILL.gen                                :ocelárny
+STR_INDUSTRY_NAME_STEEL_MILL.loc                                :v ocelárně
+STR_INDUSTRY_NAME_STEEL_MILL.small                              :ocelárna
 STR_INDUSTRY_NAME_FARM                                          :{G=f}Farma
-STR_INDUSTRY_NAME_FARM.gen                                      :{G=f}farmy
-STR_INDUSTRY_NAME_FARM.loc                                      :{G=f}na farmě
-STR_INDUSTRY_NAME_FARM.small                                    :{G=f}farma
+STR_INDUSTRY_NAME_FARM.gen                                      :farmy
+STR_INDUSTRY_NAME_FARM.loc                                      :na farmě
+STR_INDUSTRY_NAME_FARM.small                                    :farma
 STR_INDUSTRY_NAME_COPPER_ORE_MINE                               :{G=m}Důl na měděnou rudu
-STR_INDUSTRY_NAME_COPPER_ORE_MINE.gen                           :{G=m}dolu na měděnou rudu
-STR_INDUSTRY_NAME_COPPER_ORE_MINE.loc                           :{G=m}v dole na měděnou rudu
-STR_INDUSTRY_NAME_COPPER_ORE_MINE.small                         :{G=m}důl na měděnou rudu
+STR_INDUSTRY_NAME_COPPER_ORE_MINE.gen                           :dolu na měděnou rudu
+STR_INDUSTRY_NAME_COPPER_ORE_MINE.loc                           :v dole na měděnou rudu
+STR_INDUSTRY_NAME_COPPER_ORE_MINE.small                         :důl na měděnou rudu
 STR_INDUSTRY_NAME_OIL_WELLS                                     :{G=m}Ropný vrt
-STR_INDUSTRY_NAME_OIL_WELLS.gen                                 :{G=m}ropného vrtu
-STR_INDUSTRY_NAME_OIL_WELLS.loc                                 :{G=m}v ropném vrtu
-STR_INDUSTRY_NAME_OIL_WELLS.small                               :{G=m}ropný vrt
+STR_INDUSTRY_NAME_OIL_WELLS.gen                                 :ropného vrtu
+STR_INDUSTRY_NAME_OIL_WELLS.loc                                 :v ropném vrtu
+STR_INDUSTRY_NAME_OIL_WELLS.small                               :ropný vrt
 STR_INDUSTRY_NAME_BANK                                          :{G=f}Banka
-STR_INDUSTRY_NAME_BANK.gen                                      :{G=f}banky
-STR_INDUSTRY_NAME_BANK.loc                                      :{G=f}v bance
-STR_INDUSTRY_NAME_BANK.small                                    :{G=f}banka
+STR_INDUSTRY_NAME_BANK.gen                                      :banky
+STR_INDUSTRY_NAME_BANK.loc                                      :v bance
+STR_INDUSTRY_NAME_BANK.small                                    :banka
 STR_INDUSTRY_NAME_FOOD_PROCESSING_PLANT                         :{G=m}Potravinářský závod
-STR_INDUSTRY_NAME_FOOD_PROCESSING_PLANT.gen                     :{G=m}potravinářského závodu
-STR_INDUSTRY_NAME_FOOD_PROCESSING_PLANT.loc                     :{G=m}v potravinářském závodu
-STR_INDUSTRY_NAME_FOOD_PROCESSING_PLANT.small                   :{G=m}potravinářský závod
+STR_INDUSTRY_NAME_FOOD_PROCESSING_PLANT.gen                     :potravinářského závodu
+STR_INDUSTRY_NAME_FOOD_PROCESSING_PLANT.loc                     :v potravinářském závodu
+STR_INDUSTRY_NAME_FOOD_PROCESSING_PLANT.small                   :potravinářský závod
 STR_INDUSTRY_NAME_PAPER_MILL                                    :{G=f}Papírna
-STR_INDUSTRY_NAME_PAPER_MILL.gen                                :{G=f}papírny
-STR_INDUSTRY_NAME_PAPER_MILL.loc                                :{G=f}v papírně
-STR_INDUSTRY_NAME_PAPER_MILL.small                              :{G=f}papírna
+STR_INDUSTRY_NAME_PAPER_MILL.gen                                :papírny
+STR_INDUSTRY_NAME_PAPER_MILL.loc                                :v papírně
+STR_INDUSTRY_NAME_PAPER_MILL.small                              :papírna
 STR_INDUSTRY_NAME_GOLD_MINE                                     :{G=m}Zlatý důl
-STR_INDUSTRY_NAME_GOLD_MINE.gen                                 :{G=m}zlatého dolu
-STR_INDUSTRY_NAME_GOLD_MINE.loc                                 :{G=m}ve zlatém dole
-STR_INDUSTRY_NAME_GOLD_MINE.small                               :{G=m}zlatý důl
+STR_INDUSTRY_NAME_GOLD_MINE.gen                                 :zlatého dolu
+STR_INDUSTRY_NAME_GOLD_MINE.loc                                 :ve zlatém dole
+STR_INDUSTRY_NAME_GOLD_MINE.small                               :zlatý důl
 STR_INDUSTRY_NAME_BANK_TROPIC_ARCTIC                            :{G=f}Banka
-STR_INDUSTRY_NAME_BANK_TROPIC_ARCTIC.gen                        :{G=f}banky
-STR_INDUSTRY_NAME_BANK_TROPIC_ARCTIC.loc                        :{G=f}v bance
-STR_INDUSTRY_NAME_BANK_TROPIC_ARCTIC.small                      :{G=f}banka
+STR_INDUSTRY_NAME_BANK_TROPIC_ARCTIC.gen                        :banky
+STR_INDUSTRY_NAME_BANK_TROPIC_ARCTIC.loc                        :v bance
+STR_INDUSTRY_NAME_BANK_TROPIC_ARCTIC.small                      :banka
 STR_INDUSTRY_NAME_DIAMOND_MINE                                  :{G=m}Diamantový důl
-STR_INDUSTRY_NAME_DIAMOND_MINE.gen                              :{G=m}diamantového dolu
-STR_INDUSTRY_NAME_DIAMOND_MINE.loc                              :{G=m}v diamantovém dole
-STR_INDUSTRY_NAME_DIAMOND_MINE.small                            :{G=m}diamantový důl
+STR_INDUSTRY_NAME_DIAMOND_MINE.gen                              :diamantového dolu
+STR_INDUSTRY_NAME_DIAMOND_MINE.loc                              :v diamantovém dole
+STR_INDUSTRY_NAME_DIAMOND_MINE.small                            :diamantový důl
 STR_INDUSTRY_NAME_IRON_ORE_MINE                                 :{G=m}Důl na železnou rudu
-STR_INDUSTRY_NAME_IRON_ORE_MINE.gen                             :{G=m}dolu na železnou rudu
-STR_INDUSTRY_NAME_IRON_ORE_MINE.loc                             :{G=m}v dole na železnou rudu
-STR_INDUSTRY_NAME_IRON_ORE_MINE.small                           :{G=m}důl na železnou rudu
+STR_INDUSTRY_NAME_IRON_ORE_MINE.gen                             :dolu na železnou rudu
+STR_INDUSTRY_NAME_IRON_ORE_MINE.loc                             :v dole na železnou rudu
+STR_INDUSTRY_NAME_IRON_ORE_MINE.small                           :důl na železnou rudu
 STR_INDUSTRY_NAME_FRUIT_PLANTATION                              :{G=m}Ovocný sad
-STR_INDUSTRY_NAME_FRUIT_PLANTATION.gen                          :{G=m}ovocného sadu
-STR_INDUSTRY_NAME_FRUIT_PLANTATION.loc                          :{G=m}v ovocném sadu
-STR_INDUSTRY_NAME_FRUIT_PLANTATION.small                        :{G=m}ovocný sad
+STR_INDUSTRY_NAME_FRUIT_PLANTATION.gen                          :ovocného sadu
+STR_INDUSTRY_NAME_FRUIT_PLANTATION.loc                          :v ovocném sadu
+STR_INDUSTRY_NAME_FRUIT_PLANTATION.small                        :ovocný sad
 STR_INDUSTRY_NAME_RUBBER_PLANTATION                             :{G=f}Kaučuková plantáž
-STR_INDUSTRY_NAME_RUBBER_PLANTATION.gen                         :{G=f}kaučukové plantáže
-STR_INDUSTRY_NAME_RUBBER_PLANTATION.loc                         :{G=f}na kaučukové plantáži
-STR_INDUSTRY_NAME_RUBBER_PLANTATION.small                       :{G=f}kaučuková plantáž
+STR_INDUSTRY_NAME_RUBBER_PLANTATION.gen                         :kaučukové plantáže
+STR_INDUSTRY_NAME_RUBBER_PLANTATION.loc                         :na kaučukové plantáži
+STR_INDUSTRY_NAME_RUBBER_PLANTATION.small                       :kaučuková plantáž
 STR_INDUSTRY_NAME_WATER_SUPPLY                                  :{G=m}Zdroj vody
-STR_INDUSTRY_NAME_WATER_SUPPLY.gen                              :{G=m}zdroje vody
-STR_INDUSTRY_NAME_WATER_SUPPLY.loc                              :{G=m}ve zdroji vody
-STR_INDUSTRY_NAME_WATER_SUPPLY.small                            :{G=m}zdroj vody
+STR_INDUSTRY_NAME_WATER_SUPPLY.gen                              :zdroje vody
+STR_INDUSTRY_NAME_WATER_SUPPLY.loc                              :ve zdroji vody
+STR_INDUSTRY_NAME_WATER_SUPPLY.small                            :zdroj vody
 STR_INDUSTRY_NAME_WATER_TOWER                                   :{G=m}Vodojem
-STR_INDUSTRY_NAME_WATER_TOWER.gen                               :{G=m}vodojemu
-STR_INDUSTRY_NAME_WATER_TOWER.loc                               :{G=m}ve vodojemu
-STR_INDUSTRY_NAME_WATER_TOWER.small                             :{G=m}vodojem
+STR_INDUSTRY_NAME_WATER_TOWER.gen                               :vodojemu
+STR_INDUSTRY_NAME_WATER_TOWER.loc                               :ve vodojemu
+STR_INDUSTRY_NAME_WATER_TOWER.small                             :vodojem
 STR_INDUSTRY_NAME_FACTORY_2                                     :{G=f}Továrna
-STR_INDUSTRY_NAME_FACTORY_2.gen                                 :{G=f}továrny
-STR_INDUSTRY_NAME_FACTORY_2.loc                                 :{G=f}v továrně
-STR_INDUSTRY_NAME_FACTORY_2.small                               :{G=f}továrna
+STR_INDUSTRY_NAME_FACTORY_2.gen                                 :továrny
+STR_INDUSTRY_NAME_FACTORY_2.loc                                 :v továrně
+STR_INDUSTRY_NAME_FACTORY_2.small                               :továrna
 STR_INDUSTRY_NAME_FARM_2                                        :{G=f}Farma
-STR_INDUSTRY_NAME_FARM_2.gen                                    :{G=f}farmy
-STR_INDUSTRY_NAME_FARM_2.loc                                    :{G=f}na farmě
-STR_INDUSTRY_NAME_FARM_2.small                                  :{G=f}farma
+STR_INDUSTRY_NAME_FARM_2.gen                                    :farmy
+STR_INDUSTRY_NAME_FARM_2.loc                                    :na farmě
+STR_INDUSTRY_NAME_FARM_2.small                                  :farma
 STR_INDUSTRY_NAME_LUMBER_MILL                                   :{G=f}Pila
-STR_INDUSTRY_NAME_LUMBER_MILL.gen                               :{G=f}pily
-STR_INDUSTRY_NAME_LUMBER_MILL.loc                               :{G=f}na pile
-STR_INDUSTRY_NAME_LUMBER_MILL.small                             :{G=f}pila
+STR_INDUSTRY_NAME_LUMBER_MILL.gen                               :pily
+STR_INDUSTRY_NAME_LUMBER_MILL.loc                               :na pile
+STR_INDUSTRY_NAME_LUMBER_MILL.small                             :pila
 STR_INDUSTRY_NAME_COTTON_CANDY_FOREST                           :{G=m}Les cukrové vaty
-STR_INDUSTRY_NAME_COTTON_CANDY_FOREST.gen                       :{G=m}lesa cukrové vaty
-STR_INDUSTRY_NAME_COTTON_CANDY_FOREST.loc                       :{G=m}v lese cukrové vaty
-STR_INDUSTRY_NAME_COTTON_CANDY_FOREST.small                     :{G=m}les cukrové vaty
+STR_INDUSTRY_NAME_COTTON_CANDY_FOREST.gen                       :lesa cukrové vaty
+STR_INDUSTRY_NAME_COTTON_CANDY_FOREST.loc                       :v lese cukrové vaty
+STR_INDUSTRY_NAME_COTTON_CANDY_FOREST.small                     :les cukrové vaty
 STR_INDUSTRY_NAME_CANDY_FACTORY                                 :{G=f}Továrna na sladkosti
-STR_INDUSTRY_NAME_CANDY_FACTORY.gen                             :{G=f}továrny na sladkosti
-STR_INDUSTRY_NAME_CANDY_FACTORY.loc                             :{G=f}továrně na sladkosti
-STR_INDUSTRY_NAME_CANDY_FACTORY.small                           :{G=f}továrna na sladkosti
+STR_INDUSTRY_NAME_CANDY_FACTORY.gen                             :továrny na sladkosti
+STR_INDUSTRY_NAME_CANDY_FACTORY.loc                             :továrně na sladkosti
+STR_INDUSTRY_NAME_CANDY_FACTORY.small                           :továrna na sladkosti
 STR_INDUSTRY_NAME_BATTERY_FARM                                  :{G=f}Farma na baterie
-STR_INDUSTRY_NAME_BATTERY_FARM.gen                              :{G=f}farmy na baterie
-STR_INDUSTRY_NAME_BATTERY_FARM.loc                              :{G=f}na farmě na baterie
-STR_INDUSTRY_NAME_BATTERY_FARM.small                            :{G=f}farma na baterie
+STR_INDUSTRY_NAME_BATTERY_FARM.gen                              :farmy na baterie
+STR_INDUSTRY_NAME_BATTERY_FARM.loc                              :na farmě na baterie
+STR_INDUSTRY_NAME_BATTERY_FARM.small                            :farma na baterie
 STR_INDUSTRY_NAME_COLA_WELLS                                    :{G=fp}Kolové studny
-STR_INDUSTRY_NAME_COLA_WELLS.gen                                :{G=fp}kolových studen
-STR_INDUSTRY_NAME_COLA_WELLS.loc                                :{G=fp}v kolových studnách
-STR_INDUSTRY_NAME_COLA_WELLS.small                              :{G=fp}kolové studny
+STR_INDUSTRY_NAME_COLA_WELLS.gen                                :kolových studen
+STR_INDUSTRY_NAME_COLA_WELLS.loc                                :v kolových studnách
+STR_INDUSTRY_NAME_COLA_WELLS.small                              :kolové studny
 STR_INDUSTRY_NAME_TOY_SHOP                                      :{G=n}Hračkářství
-STR_INDUSTRY_NAME_TOY_SHOP.gen                                  :{G=n}hračkářství
-STR_INDUSTRY_NAME_TOY_SHOP.loc                                  :{G=n}v hračkářství
-STR_INDUSTRY_NAME_TOY_SHOP.small                                :{G=n}hračkářství
+STR_INDUSTRY_NAME_TOY_SHOP.gen                                  :hračkářství
+STR_INDUSTRY_NAME_TOY_SHOP.loc                                  :v hračkářství
+STR_INDUSTRY_NAME_TOY_SHOP.small                                :hračkářství
 STR_INDUSTRY_NAME_TOY_FACTORY                                   :{G=f}Továrna na hračky
-STR_INDUSTRY_NAME_TOY_FACTORY.gen                               :{G=f}továrny na hračky
-STR_INDUSTRY_NAME_TOY_FACTORY.loc                               :{G=f}v továrně na hračky
-STR_INDUSTRY_NAME_TOY_FACTORY.small                             :{G=f}továrna na hračky
+STR_INDUSTRY_NAME_TOY_FACTORY.gen                               :továrny na hračky
+STR_INDUSTRY_NAME_TOY_FACTORY.loc                               :v továrně na hračky
+STR_INDUSTRY_NAME_TOY_FACTORY.small                             :továrna na hračky
 STR_INDUSTRY_NAME_PLASTIC_FOUNTAINS                             :{G=fp}Plastové fontány
-STR_INDUSTRY_NAME_PLASTIC_FOUNTAINS.gen                         :{G=fp}plastových fontán
-STR_INDUSTRY_NAME_PLASTIC_FOUNTAINS.loc                         :{G=fp}v plastových fontánách
-STR_INDUSTRY_NAME_PLASTIC_FOUNTAINS.small                       :{G=fp}plastové fontány
+STR_INDUSTRY_NAME_PLASTIC_FOUNTAINS.gen                         :plastových fontán
+STR_INDUSTRY_NAME_PLASTIC_FOUNTAINS.loc                         :v plastových fontánách
+STR_INDUSTRY_NAME_PLASTIC_FOUNTAINS.small                       :plastové fontány
 STR_INDUSTRY_NAME_FIZZY_DRINK_FACTORY                           :{G=f}Sodovkárna
-STR_INDUSTRY_NAME_FIZZY_DRINK_FACTORY.gen                       :{G=f}sodovkárny
-STR_INDUSTRY_NAME_FIZZY_DRINK_FACTORY.loc                       :{G=f}v sodovkárně
-STR_INDUSTRY_NAME_FIZZY_DRINK_FACTORY.small                     :{G=f}sodovkárna
+STR_INDUSTRY_NAME_FIZZY_DRINK_FACTORY.gen                       :sodovkárny
+STR_INDUSTRY_NAME_FIZZY_DRINK_FACTORY.loc                       :v sodovkárně
+STR_INDUSTRY_NAME_FIZZY_DRINK_FACTORY.small                     :sodovkárna
 STR_INDUSTRY_NAME_BUBBLE_GENERATOR                              :{G=m}Generátor bublin
-STR_INDUSTRY_NAME_BUBBLE_GENERATOR.gen                          :{G=m}generátoru bublin
-STR_INDUSTRY_NAME_BUBBLE_GENERATOR.loc                          :{G=m}v generátoru bublin
-STR_INDUSTRY_NAME_BUBBLE_GENERATOR.small                        :{G=m}generátor bublin
+STR_INDUSTRY_NAME_BUBBLE_GENERATOR.gen                          :generátoru bublin
+STR_INDUSTRY_NAME_BUBBLE_GENERATOR.loc                          :v generátoru bublin
+STR_INDUSTRY_NAME_BUBBLE_GENERATOR.small                        :generátor bublin
 STR_INDUSTRY_NAME_TOFFEE_QUARRY                                 :{G=m}Karamelolom
-STR_INDUSTRY_NAME_TOFFEE_QUARRY.gen                             :{G=m}karamelolomu
-STR_INDUSTRY_NAME_TOFFEE_QUARRY.loc                             :{G=m}v karamelolomu
-STR_INDUSTRY_NAME_TOFFEE_QUARRY.small                           :{G=m}karamelolom
+STR_INDUSTRY_NAME_TOFFEE_QUARRY.gen                             :karamelolomu
+STR_INDUSTRY_NAME_TOFFEE_QUARRY.loc                             :v karamelolomu
+STR_INDUSTRY_NAME_TOFFEE_QUARRY.small                           :karamelolom
 STR_INDUSTRY_NAME_SUGAR_MINE                                    :{G=m}Cukerný důl
-STR_INDUSTRY_NAME_SUGAR_MINE.gen                                :{G=m}cukerného dolu
-STR_INDUSTRY_NAME_SUGAR_MINE.loc                                :{G=m}v cukerném dole
-STR_INDUSTRY_NAME_SUGAR_MINE.small                              :{G=m}cukerný důl
+STR_INDUSTRY_NAME_SUGAR_MINE.gen                                :cukerného dolu
+STR_INDUSTRY_NAME_SUGAR_MINE.loc                                :v cukerném dole
+STR_INDUSTRY_NAME_SUGAR_MINE.small                              :cukerný důl
 
 ############ WARNING, using range 0x6000 for strings that are stored in the savegame
 ############ These strings may never get a new id, or savegames will break!
diff --git a/src/lang/gaelic.txt b/src/lang/gaelic.txt
index 0ae1be14f..ce342c7c6 100644
--- a/src/lang/gaelic.txt
+++ b/src/lang/gaelic.txt
@@ -930,9 +930,9 @@ STR_SMALLMAP_LEGENDA_TRANSPORT_ROUTES                           :{TINY_FONT}{BLA
 STR_SMALLMAP_LEGENDA_FOREST                                     :{TINY_FONT}{BLACK}Coille
 STR_SMALLMAP_LEGENDA_RAILROAD_STATION                           :{TINY_FONT}{BLACK}Stèisean rèile
 STR_SMALLMAP_LEGENDA_TRUCK_LOADING_BAY                          :{G=m}{TINY_FONT}{BLACK}Ionad-luchdaidh nan làraidh
-STR_SMALLMAP_LEGENDA_TRUCK_LOADING_BAY.nom                      :{G=m}{TINY_FONT}{BLACK}Ionad-luchdaidh nan làraidh
-STR_SMALLMAP_LEGENDA_TRUCK_LOADING_BAY.gen                      :{G=m}{TINY_FONT}{BLACK}Ionaid-luchdaidh nan làraidh
-STR_SMALLMAP_LEGENDA_TRUCK_LOADING_BAY.dat                      :{G=m}{TINY_FONT}{BLACK}Ionad-luchdaidh nan làraidh
+STR_SMALLMAP_LEGENDA_TRUCK_LOADING_BAY.nom                      :{TINY_FONT}{BLACK}Ionad-luchdaidh nan làraidh
+STR_SMALLMAP_LEGENDA_TRUCK_LOADING_BAY.gen                      :{TINY_FONT}{BLACK}Ionaid-luchdaidh nan làraidh
+STR_SMALLMAP_LEGENDA_TRUCK_LOADING_BAY.dat                      :{TINY_FONT}{BLACK}Ionad-luchdaidh nan làraidh
 STR_SMALLMAP_LEGENDA_BUS_STATION                                :{TINY_FONT}{BLACK}Stèisean bus
 STR_SMALLMAP_LEGENDA_AIRPORT_HELIPORT                           :{TINY_FONT}{BLACK}Port-adhair/port-heileacoptair
 STR_SMALLMAP_LEGENDA_DOCK                                       :{G=m}{TINY_FONT}{BLACK}Port
@@ -2643,9 +2643,9 @@ STR_DEPOT_BUILD_SHIP_ORIENTATION_TOOLTIP                        :{BLACK}Tagh com
 
 # Dock construction window
 STR_STATION_BUILD_DOCK_CAPTION                                  :{G=m}{WHITE}Port
-STR_STATION_BUILD_DOCK_CAPTION.nom                              :{G=m}{WHITE}Port
-STR_STATION_BUILD_DOCK_CAPTION.gen                              :{G=m}{WHITE}Puirt
-STR_STATION_BUILD_DOCK_CAPTION.dat                              :{G=m}{WHITE}Port
+STR_STATION_BUILD_DOCK_CAPTION.nom                              :{WHITE}Port
+STR_STATION_BUILD_DOCK_CAPTION.gen                              :{WHITE}Puirt
+STR_STATION_BUILD_DOCK_CAPTION.dat                              :{WHITE}Port
 
 # Airport toolbar
 STR_TOOLBAR_AIRCRAFT_CAPTION                                    :{WHITE}Puirt-adhair
@@ -2664,14 +2664,14 @@ STR_AIRPORT_INTERNATIONAL                                       :Eadar-nàiseant
 STR_AIRPORT_COMMUTER                                            :Iomlaideach
 STR_AIRPORT_INTERCONTINENTAL                                    :Thar chuain
 STR_AIRPORT_HELIPORT                                            :{G=m}Port-heileacoptair
-STR_AIRPORT_HELIPORT.nom                                        :{G=m}Port-heileacoptair
-STR_AIRPORT_HELIPORT.gen                                        :{G=m}Puirt-heileacoptair
-STR_AIRPORT_HELIPORT.dat                                        :{G=m}Port-heileacoptair
+STR_AIRPORT_HELIPORT.nom                                        :Port-heileacoptair
+STR_AIRPORT_HELIPORT.gen                                        :Puirt-heileacoptair
+STR_AIRPORT_HELIPORT.dat                                        :Port-heileacoptair
 STR_AIRPORT_HELIDEPOT                                           :Hangar-heileacoptair
 STR_AIRPORT_HELISTATION                                         :{G=m}Stèisean heileacoptair
-STR_AIRPORT_HELISTATION.nom                                     :{G=m}Stèisean heileacoptair
-STR_AIRPORT_HELISTATION.gen                                     :{G=m}Stèisein heileacoptair
-STR_AIRPORT_HELISTATION.dat                                     :{G=m}Stèisean heileacoptair
+STR_AIRPORT_HELISTATION.nom                                     :Stèisean heileacoptair
+STR_AIRPORT_HELISTATION.gen                                     :Stèisein heileacoptair
+STR_AIRPORT_HELISTATION.dat                                     :Stèisean heileacoptair
 
 STR_AIRPORT_CLASS_SMALL                                         :Puirt-adhair beaga
 STR_AIRPORT_CLASS_LARGE                                         :Puirt-adhair mòra
@@ -2851,26 +2851,26 @@ STR_LAI_TREE_NAME_RAINFOREST                                    :Coille-uisge
 STR_LAI_TREE_NAME_CACTUS_PLANTS                                 :Cactasan
 
 STR_LAI_STATION_DESCRIPTION_RAILROAD_STATION                    :{G=m}Stèisean rèile
-STR_LAI_STATION_DESCRIPTION_RAILROAD_STATION.nom                :{G=m}Stèisean rèile
-STR_LAI_STATION_DESCRIPTION_RAILROAD_STATION.gen                :{G=m}Stèisein rèile
-STR_LAI_STATION_DESCRIPTION_RAILROAD_STATION.dat                :{G=m}Stèisean rèile
+STR_LAI_STATION_DESCRIPTION_RAILROAD_STATION.nom                :Stèisean rèile
+STR_LAI_STATION_DESCRIPTION_RAILROAD_STATION.gen                :Stèisein rèile
+STR_LAI_STATION_DESCRIPTION_RAILROAD_STATION.dat                :Stèisean rèile
 STR_LAI_STATION_DESCRIPTION_AIRCRAFT_HANGAR                     :{G=m}Hangar
-STR_LAI_STATION_DESCRIPTION_AIRCRAFT_HANGAR.nom                 :{G=m}Hangar
-STR_LAI_STATION_DESCRIPTION_AIRCRAFT_HANGAR.gen                 :{G=m}Hangair
-STR_LAI_STATION_DESCRIPTION_AIRCRAFT_HANGAR.dat                 :{G=m}Hangar
+STR_LAI_STATION_DESCRIPTION_AIRCRAFT_HANGAR.nom                 :Hangar
+STR_LAI_STATION_DESCRIPTION_AIRCRAFT_HANGAR.gen                 :Hangair
+STR_LAI_STATION_DESCRIPTION_AIRCRAFT_HANGAR.dat                 :Hangar
 STR_LAI_STATION_DESCRIPTION_AIRPORT                             :{G=m}Port-adhair
-STR_LAI_STATION_DESCRIPTION_AIRPORT.nom                         :{G=m}Port-adhair
-STR_LAI_STATION_DESCRIPTION_AIRPORT.gen                         :{G=m}Puirt-adhair
-STR_LAI_STATION_DESCRIPTION_AIRPORT.dat                         :{G=m}Port-adhair
+STR_LAI_STATION_DESCRIPTION_AIRPORT.nom                         :Port-adhair
+STR_LAI_STATION_DESCRIPTION_AIRPORT.gen                         :Puirt-adhair
+STR_LAI_STATION_DESCRIPTION_AIRPORT.dat                         :Port-adhair
 STR_LAI_STATION_DESCRIPTION_TRUCK_LOADING_AREA                  :Ionad-luchdaidh nan làraidh
 STR_LAI_STATION_DESCRIPTION_BUS_STATION                         :{G=m}Stèisean bus
-STR_LAI_STATION_DESCRIPTION_BUS_STATION.nom                     :{G=m}Stèisean bus
-STR_LAI_STATION_DESCRIPTION_BUS_STATION.gen                     :{G=m}Stèisein bus
-STR_LAI_STATION_DESCRIPTION_BUS_STATION.dat                     :{G=m}Stèisean bus
+STR_LAI_STATION_DESCRIPTION_BUS_STATION.nom                     :Stèisean bus
+STR_LAI_STATION_DESCRIPTION_BUS_STATION.gen                     :Stèisein bus
+STR_LAI_STATION_DESCRIPTION_BUS_STATION.dat                     :Stèisean bus
 STR_LAI_STATION_DESCRIPTION_SHIP_DOCK                           :{G=m}Port
-STR_LAI_STATION_DESCRIPTION_SHIP_DOCK.nom                       :{G=m}Port
-STR_LAI_STATION_DESCRIPTION_SHIP_DOCK.gen                       :{G=m}Puirt
-STR_LAI_STATION_DESCRIPTION_SHIP_DOCK.dat                       :{G=m}Port
+STR_LAI_STATION_DESCRIPTION_SHIP_DOCK.nom                       :Port
+STR_LAI_STATION_DESCRIPTION_SHIP_DOCK.gen                       :Puirt
+STR_LAI_STATION_DESCRIPTION_SHIP_DOCK.dat                       :Port
 STR_LAI_STATION_DESCRIPTION_BUOY                                :Fleodrainn
 STR_LAI_STATION_DESCRIPTION_WAYPOINT                            :Puing-thurais
 
@@ -2880,9 +2880,9 @@ STR_LAI_WATER_DESCRIPTION_LOCK                                  :Loc
 STR_LAI_WATER_DESCRIPTION_RIVER                                 :Abhainn
 STR_LAI_WATER_DESCRIPTION_COAST_OR_RIVERBANK                    :Oirthir no bot
 STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT                            :{G=m}Cala
-STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT.nom                        :{G=m}Cala
-STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT.gen                        :{G=m}Calaidh
-STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT.dat                        :{G=m}Cala
+STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT.nom                        :Cala
+STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT.gen                        :Calaidh
+STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT.dat                        :Cala
 
 # Industries come directly from their industry names
 
@@ -4712,9 +4712,9 @@ STR_TOWN_BUILDING_NAME_LARGE_OFFICE_BLOCK_1                     :{G=m}Ionad oifi
 STR_TOWN_BUILDING_NAME_TOWN_HOUSES_1                            :Taighean-baile
 STR_TOWN_BUILDING_NAME_HOTEL_1                                  :{G=m}Taigh-òsta
 STR_TOWN_BUILDING_NAME_STATUE_1                                 :{G=f}Ìomhaigh
-STR_TOWN_BUILDING_NAME_STATUE_1.nom                             :{G=f}Ìomhaigh
-STR_TOWN_BUILDING_NAME_STATUE_1.gen                             :{G=f}Ìomhaighe
-STR_TOWN_BUILDING_NAME_STATUE_1.dat                             :{G=f}Ìomhaigh
+STR_TOWN_BUILDING_NAME_STATUE_1.nom                             :Ìomhaigh
+STR_TOWN_BUILDING_NAME_STATUE_1.gen                             :Ìomhaighe
+STR_TOWN_BUILDING_NAME_STATUE_1.dat                             :Ìomhaigh
 STR_TOWN_BUILDING_NAME_FOUNTAIN_1                               :{G=m}Fuaran
 STR_TOWN_BUILDING_NAME_PARK_1                                   :{G=f}Pàirc
 STR_TOWN_BUILDING_NAME_OFFICE_BLOCK_2                           :{G=m}Ionad oifisean
@@ -4731,42 +4731,42 @@ STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_2                      :Ionad oifisean
 STR_TOWN_BUILDING_NAME_SHOPS_AND_OFFICES_2                      :Bùthan is oifisean
 STR_TOWN_BUILDING_NAME_SHOPS_AND_OFFICES_3                      :Bùthan is oifisean
 STR_TOWN_BUILDING_NAME_THEATER_1                                :{G=m}Taigh-cluiche
-STR_TOWN_BUILDING_NAME_THEATER_1.nom                            :{G=m}Taigh-cluiche
-STR_TOWN_BUILDING_NAME_THEATER_1.gen                            :{G=m}Taighe-chluiche
-STR_TOWN_BUILDING_NAME_THEATER_1.dat                            :{G=m}Taigh-cluiche
+STR_TOWN_BUILDING_NAME_THEATER_1.nom                            :Taigh-cluiche
+STR_TOWN_BUILDING_NAME_THEATER_1.gen                            :Taighe-chluiche
+STR_TOWN_BUILDING_NAME_THEATER_1.dat                            :Taigh-cluiche
 STR_TOWN_BUILDING_NAME_STADIUM_2                                :{G=m}Stèideam
-STR_TOWN_BUILDING_NAME_STADIUM_2.nom                            :{G=m}Stèideam
-STR_TOWN_BUILDING_NAME_STADIUM_2.gen                            :{G=m}Stèideim
-STR_TOWN_BUILDING_NAME_STADIUM_2.dat                            :{G=m}Stèideam
+STR_TOWN_BUILDING_NAME_STADIUM_2.nom                            :Stèideam
+STR_TOWN_BUILDING_NAME_STADIUM_2.gen                            :Stèideim
+STR_TOWN_BUILDING_NAME_STADIUM_2.dat                            :Stèideam
 STR_TOWN_BUILDING_NAME_OFFICES_1                                :{G=f}Oifisean
 STR_TOWN_BUILDING_NAME_HOUSES_2                                 :{G=m}Taighean
-STR_TOWN_BUILDING_NAME_HOUSES_2.nom                             :{G=m}Taighean
-STR_TOWN_BUILDING_NAME_HOUSES_2.gen                             :{G=m}Thaighean
-STR_TOWN_BUILDING_NAME_HOUSES_2.dat                             :{G=m}Taighean
+STR_TOWN_BUILDING_NAME_HOUSES_2.nom                             :Taighean
+STR_TOWN_BUILDING_NAME_HOUSES_2.gen                             :Thaighean
+STR_TOWN_BUILDING_NAME_HOUSES_2.dat                             :Taighean
 STR_TOWN_BUILDING_NAME_CINEMA_1                                 :{G=m}Taigh-dhealbh
-STR_TOWN_BUILDING_NAME_CINEMA_1.nom                             :{G=m}Taigh-dhealbh
-STR_TOWN_BUILDING_NAME_CINEMA_1.gen                             :{G=m}Taighe-dhealbh
-STR_TOWN_BUILDING_NAME_CINEMA_1.dat                             :{G=m}Taigh-dhealbh
+STR_TOWN_BUILDING_NAME_CINEMA_1.nom                             :Taigh-dhealbh
+STR_TOWN_BUILDING_NAME_CINEMA_1.gen                             :Taighe-dhealbh
+STR_TOWN_BUILDING_NAME_CINEMA_1.dat                             :Taigh-dhealbh
 STR_TOWN_BUILDING_NAME_SHOPPING_MALL_1                          :{G=m}Ionad bhùthan
-STR_TOWN_BUILDING_NAME_SHOPPING_MALL_1.nom                      :{G=m}Ionad bhùthan
-STR_TOWN_BUILDING_NAME_SHOPPING_MALL_1.gen                      :{G=m}Ionaid bhùthan
-STR_TOWN_BUILDING_NAME_SHOPPING_MALL_1.dat                      :{G=m}Ionad bhùthan
+STR_TOWN_BUILDING_NAME_SHOPPING_MALL_1.nom                      :Ionad bhùthan
+STR_TOWN_BUILDING_NAME_SHOPPING_MALL_1.gen                      :Ionaid bhùthan
+STR_TOWN_BUILDING_NAME_SHOPPING_MALL_1.dat                      :Ionad bhùthan
 STR_TOWN_BUILDING_NAME_IGLOO_1                                  :{G=m}Taigh-sneachda
-STR_TOWN_BUILDING_NAME_IGLOO_1.nom                              :{G=m}Taigh-sneachda
-STR_TOWN_BUILDING_NAME_IGLOO_1.gen                              :{G=m}Taighe-shneachda
-STR_TOWN_BUILDING_NAME_IGLOO_1.dat                              :{G=m}Taigh-sneachda
+STR_TOWN_BUILDING_NAME_IGLOO_1.nom                              :Taigh-sneachda
+STR_TOWN_BUILDING_NAME_IGLOO_1.gen                              :Taighe-shneachda
+STR_TOWN_BUILDING_NAME_IGLOO_1.dat                              :Taigh-sneachda
 STR_TOWN_BUILDING_NAME_TEPEES_1                                 :{G=m}Tìpidhean
-STR_TOWN_BUILDING_NAME_TEPEES_1.nom                             :{G=m}Tìpidhean
-STR_TOWN_BUILDING_NAME_TEPEES_1.gen                             :{G=m}Thìpidhean
-STR_TOWN_BUILDING_NAME_TEPEES_1.dat                             :{G=m}Tìpidhean
+STR_TOWN_BUILDING_NAME_TEPEES_1.nom                             :Tìpidhean
+STR_TOWN_BUILDING_NAME_TEPEES_1.gen                             :Thìpidhean
+STR_TOWN_BUILDING_NAME_TEPEES_1.dat                             :Tìpidhean
 STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1                           :{G=m}Taigh poit-teatha
-STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1.nom                       :{G=m}Taigh poit-teatha
-STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1.gen                       :{G=m}Taighe poit-teatha
-STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1.dat                       :{G=m}Taigh poit-teatha
+STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1.nom                       :Taigh poit-teatha
+STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1.gen                       :Taighe poit-teatha
+STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1.dat                       :Taigh poit-teatha
 STR_TOWN_BUILDING_NAME_PIGGY_BANK_1                             :{G=f}Mucag-airgid
-STR_TOWN_BUILDING_NAME_PIGGY_BANK_1.nom                         :{G=f}Mucag-airgid
-STR_TOWN_BUILDING_NAME_PIGGY_BANK_1.gen                         :{G=f}Mucaige-airgid
-STR_TOWN_BUILDING_NAME_PIGGY_BANK_1.dat                         :{G=f}Mucag-airgid
+STR_TOWN_BUILDING_NAME_PIGGY_BANK_1.nom                         :Mucag-airgid
+STR_TOWN_BUILDING_NAME_PIGGY_BANK_1.gen                         :Mucaige-airgid
+STR_TOWN_BUILDING_NAME_PIGGY_BANK_1.dat                         :Mucag-airgid
 
 ##id 0x4800
 # industry names
@@ -4940,15 +4940,15 @@ STR_SV_STNAME_WOODS                                             :Coille {STRING}
 STR_SV_STNAME_LAKESIDE                                          :Loch {STRING}
 STR_SV_STNAME_EXCHANGE                                          :Iomlaid {STRING}
 STR_SV_STNAME_AIRPORT                                           :{G=m}Port-adhair {STRING}
-STR_SV_STNAME_AIRPORT.nom                                       :{G=m}Port-adhair - {STRING}
-STR_SV_STNAME_AIRPORT.gen                                       :{G=m}Puirt-adhair - {STRING}
-STR_SV_STNAME_AIRPORT.dat                                       :{G=m}Port-adhair - {STRING}
+STR_SV_STNAME_AIRPORT.nom                                       :Port-adhair - {STRING}
+STR_SV_STNAME_AIRPORT.gen                                       :Puirt-adhair - {STRING}
+STR_SV_STNAME_AIRPORT.dat                                       :Port-adhair - {STRING}
 STR_SV_STNAME_OILFIELD                                          :Achadh-ola {STRING}
 STR_SV_STNAME_MINES                                             :Mèinnean {STRING}
 STR_SV_STNAME_DOCKS                                             :{G=m}Port {STRING}
-STR_SV_STNAME_DOCKS.nom                                         :{G=m}Port - {STRING}
-STR_SV_STNAME_DOCKS.gen                                         :{G=m}Puirt - {STRING}
-STR_SV_STNAME_DOCKS.dat                                         :{G=m}Port - {STRING}
+STR_SV_STNAME_DOCKS.nom                                         :Port - {STRING}
+STR_SV_STNAME_DOCKS.gen                                         :Puirt - {STRING}
+STR_SV_STNAME_DOCKS.dat                                         :Port - {STRING}
 STR_SV_STNAME_BUOY                                              :{STRING}
 STR_SV_STNAME_WAYPOINT                                          :{STRING}
 ##id 0x6020
@@ -4958,9 +4958,9 @@ STR_SV_STNAME_BRANCH                                            :Meur {STRING}
 STR_SV_STNAME_UPPER                                             :{STRING} Uachdarach
 STR_SV_STNAME_LOWER                                             :{STRING} Iochdarach
 STR_SV_STNAME_HELIPORT                                          :{G=m}Port-heileacoptair {STRING}
-STR_SV_STNAME_HELIPORT.nom                                      :{G=m}Port-heileacoptair - {STRING}
-STR_SV_STNAME_HELIPORT.gen                                      :{G=m}Puirt-heileacoptair - {STRING}
-STR_SV_STNAME_HELIPORT.dat                                      :{G=m}Port-heileacoptair - {STRING}
+STR_SV_STNAME_HELIPORT.nom                                      :Port-heileacoptair - {STRING}
+STR_SV_STNAME_HELIPORT.gen                                      :Puirt-heileacoptair - {STRING}
+STR_SV_STNAME_HELIPORT.dat                                      :Port-heileacoptair - {STRING}
 STR_SV_STNAME_FOREST                                            :Coille {STRING}
 STR_SV_STNAME_FALLBACK                                          :{STRING} Stèisean {NUM}
 ############ end of savegame specific region!
@@ -5240,21 +5240,21 @@ STR_FORMAT_WAYPOINT_NAME                                        :Puing-thurais {
 STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :Puing-thurais {1:COMMA} {0:TOWN}
 
 STR_FORMAT_DEPOT_NAME_TRAIN                                     :{G=f}Trèan-lann {TOWN}
-STR_FORMAT_DEPOT_NAME_TRAIN.nom                                 :{G=f}Trèan-lann - {TOWN}
-STR_FORMAT_DEPOT_NAME_TRAIN.gen                                 :{G=f}Trèan-lainn - {TOWN}
-STR_FORMAT_DEPOT_NAME_TRAIN.dat                                 :{G=f}Trèan-lann - {TOWN}
+STR_FORMAT_DEPOT_NAME_TRAIN.nom                                 :Trèan-lann - {TOWN}
+STR_FORMAT_DEPOT_NAME_TRAIN.gen                                 :Trèan-lainn - {TOWN}
+STR_FORMAT_DEPOT_NAME_TRAIN.dat                                 :Trèan-lann - {TOWN}
 STR_FORMAT_DEPOT_NAME_TRAIN_SERIAL                              :Trèan-lann {1:COMMA} {0:TOWN}
 STR_FORMAT_DEPOT_NAME_ROAD_VEHICLE                              :{G=f}Garaids {TOWN}
 STR_FORMAT_DEPOT_NAME_ROAD_VEHICLE_SERIAL                       :{G=f}Garaids {1:COMMA} {0:TOWN}
 STR_FORMAT_DEPOT_NAME_SHIP                                      :{G=m}Cala {TOWN}
-STR_FORMAT_DEPOT_NAME_SHIP.nom                                  :{G=m}Cala - {TOWN}
-STR_FORMAT_DEPOT_NAME_SHIP.gen                                  :{G=m}Calaidh - {TOWN}
-STR_FORMAT_DEPOT_NAME_SHIP.dat                                  :{G=m}Cala - {TOWN}
+STR_FORMAT_DEPOT_NAME_SHIP.nom                                  :Cala - {TOWN}
+STR_FORMAT_DEPOT_NAME_SHIP.gen                                  :Calaidh - {TOWN}
+STR_FORMAT_DEPOT_NAME_SHIP.dat                                  :Cala - {TOWN}
 STR_FORMAT_DEPOT_NAME_SHIP_SERIAL                               :{G=m}Cala {1:COMMA} {0:TOWN}
 STR_FORMAT_DEPOT_NAME_AIRCRAFT                                  :{G=m}Hangar {STATION}
-STR_FORMAT_DEPOT_NAME_AIRCRAFT.nom                              :{G=m}Hangar - {STATION}
-STR_FORMAT_DEPOT_NAME_AIRCRAFT.gen                              :{G=m}Hangair - {STATION}
-STR_FORMAT_DEPOT_NAME_AIRCRAFT.dat                              :{G=m}Hangar - {STATION}
+STR_FORMAT_DEPOT_NAME_AIRCRAFT.nom                              :Hangar - {STATION}
+STR_FORMAT_DEPOT_NAME_AIRCRAFT.gen                              :Hangair - {STATION}
+STR_FORMAT_DEPOT_NAME_AIRCRAFT.dat                              :Hangar - {STATION}
 
 STR_UNKNOWN_STATION                                             :stèisean neo-aithnichte
 STR_DEFAULT_SIGN_NAME                                           :Sanas
diff --git a/src/lang/greek.txt b/src/lang/greek.txt
index 1028a0ce6..3e3fcebaf 100644
--- a/src/lang/greek.txt
+++ b/src/lang/greek.txt
@@ -30,31 +30,31 @@ STR_JUST_NOTHING                                                :Τίποτα
 # Plural cargo name
 STR_CARGO_PLURAL_NOTHING                                        :
 STR_CARGO_PLURAL_PASSENGERS                                     :{G=m}Επιβάτες
-STR_CARGO_PLURAL_PASSENGERS.geniki                              :{G=m}Επιβάτη
+STR_CARGO_PLURAL_PASSENGERS.geniki                              :Επιβάτη
 STR_CARGO_PLURAL_COAL                                           :{G=m}Άνθρακες
-STR_CARGO_PLURAL_COAL.geniki                                    :{G=m}Άνθρακων
+STR_CARGO_PLURAL_COAL.geniki                                    :Άνθρακων
 STR_CARGO_PLURAL_MAIL                                           :{G=f}Αλληλογραφία
-STR_CARGO_PLURAL_MAIL.geniki                                    :{G=f}Αλληλογραφίας
+STR_CARGO_PLURAL_MAIL.geniki                                    :Αλληλογραφίας
 STR_CARGO_PLURAL_OIL                                            :{G=n}Πετρέλαια
-STR_CARGO_PLURAL_OIL.geniki                                     :{G=n}Πετρελαίου
+STR_CARGO_PLURAL_OIL.geniki                                     :Πετρελαίου
 STR_CARGO_PLURAL_LIVESTOCK                                      :{G=n}Ζώα
 STR_CARGO_PLURAL_LIVESTOCK.geniki                               :Ζώων
 STR_CARGO_PLURAL_GOODS                                          :{G=n}Αγαθά
 STR_CARGO_PLURAL_GOODS.geniki                                   :Αγαθών
 STR_CARGO_PLURAL_GRAIN                                          :{G=n}Σιτηρά
-STR_CARGO_PLURAL_GRAIN.geniki                                   :{G=n}Σιτηρών
+STR_CARGO_PLURAL_GRAIN.geniki                                   :Σιτηρών
 STR_CARGO_PLURAL_WOOD                                           :{G=f}Ξυλεία
 STR_CARGO_PLURAL_WOOD.geniki                                    :Ξυλείας
 STR_CARGO_PLURAL_IRON_ORE                                       :{G=n}Σιδηρομεταλλεύματα
-STR_CARGO_PLURAL_IRON_ORE.geniki                                :{G=n}Σιδηρομεταλλευμάτων
+STR_CARGO_PLURAL_IRON_ORE.geniki                                :Σιδηρομεταλλευμάτων
 STR_CARGO_PLURAL_STEEL                                          :{G=m}Χάλυβες
-STR_CARGO_PLURAL_STEEL.geniki                                   :{G=m}Χάλυβα
+STR_CARGO_PLURAL_STEEL.geniki                                   :Χάλυβα
 STR_CARGO_PLURAL_VALUABLES                                      :{G=n}Πολύτιμα είδη
-STR_CARGO_PLURAL_VALUABLES.geniki                               :{G=n}Πολύτιμων ειδών
+STR_CARGO_PLURAL_VALUABLES.geniki                               :Πολύτιμων ειδών
 STR_CARGO_PLURAL_COPPER_ORE                                     :{G=n}Μεταλλεύματα Χαλκού
-STR_CARGO_PLURAL_COPPER_ORE.geniki                              :{G=n}Μεταλλευμάτων Χαλκού
+STR_CARGO_PLURAL_COPPER_ORE.geniki                              :Μεταλλευμάτων Χαλκού
 STR_CARGO_PLURAL_MAIZE                                          :{G=n}Καλαμπόκια
-STR_CARGO_PLURAL_MAIZE.geniki                                   :{G=n}Καλαμποκιών
+STR_CARGO_PLURAL_MAIZE.geniki                                   :Καλαμποκιών
 STR_CARGO_PLURAL_FRUIT                                          :{G=n}Φρούτα
 STR_CARGO_PLURAL_FRUIT.geniki                                   :Φρούτων
 STR_CARGO_PLURAL_DIAMONDS                                       :{G=n}Διαμάντια
@@ -72,89 +72,89 @@ STR_CARGO_PLURAL_WHEAT.geniki                                   :Σιταριώ�
 STR_CARGO_PLURAL_RUBBER                                         :{G=n}Λάστιχα
 STR_CARGO_PLURAL_RUBBER.geniki                                  :Λάστιχων
 STR_CARGO_PLURAL_SUGAR                                          :{G=f}Ζάχαρη
-STR_CARGO_PLURAL_SUGAR.geniki                                   :{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_CANDY.geniki                                   :{G=n}Γλυκισμάτων
+STR_CARGO_PLURAL_CANDY.geniki                                   :Γλυκισμάτων
 STR_CARGO_PLURAL_COLA                                           :{G=f}Κόλα
-STR_CARGO_PLURAL_COLA.geniki                                    :{G=f}Κόλας
+STR_CARGO_PLURAL_COLA.geniki                                    :Κόλας
 STR_CARGO_PLURAL_COTTON_CANDY                                   :{G=n}Μαλλιά της γριάς
-STR_CARGO_PLURAL_COTTON_CANDY.geniki                            :{G=n}Μαλλιών της γριάς
+STR_CARGO_PLURAL_COTTON_CANDY.geniki                            :Μαλλιών της γριάς
 STR_CARGO_PLURAL_BUBBLES                                        :{G=f}Φυσαλίδες
-STR_CARGO_PLURAL_BUBBLES.geniki                                 :{G=f}Φυσαλίδων
+STR_CARGO_PLURAL_BUBBLES.geniki                                 :Φυσαλίδων
 STR_CARGO_PLURAL_TOFFEE                                         :{G=n}Καραμέλες βουτύρου
-STR_CARGO_PLURAL_TOFFEE.geniki                                  :{G=n}Καραμέλων βουτύρου
+STR_CARGO_PLURAL_TOFFEE.geniki                                  :Καραμέλων βουτύρου
 STR_CARGO_PLURAL_BATTERIES                                      :{G=f}Μπαταρίες
-STR_CARGO_PLURAL_BATTERIES.geniki                               :{G=f}Μπαταριών
+STR_CARGO_PLURAL_BATTERIES.geniki                               :Μπαταριών
 STR_CARGO_PLURAL_PLASTIC                                        :{G=n}Πλαστικά
-STR_CARGO_PLURAL_PLASTIC.geniki                                 :{G=n}Πλαστικών
+STR_CARGO_PLURAL_PLASTIC.geniki                                 :Πλαστικών
 STR_CARGO_PLURAL_FIZZY_DRINKS                                   :{G=n}Αναψυκτικά
-STR_CARGO_PLURAL_FIZZY_DRINKS.geniki                            :{G=n}Αναψυκτικών
+STR_CARGO_PLURAL_FIZZY_DRINKS.geniki                            :Αναψυκτικών
 
 # Singular cargo name
 STR_CARGO_SINGULAR_NOTHING                                      :
 STR_CARGO_SINGULAR_PASSENGER                                    :{G=m}Επιβάτης
-STR_CARGO_SINGULAR_PASSENGER.subs                               :{G=m}Επιβάτες
+STR_CARGO_SINGULAR_PASSENGER.subs                               :Επιβάτες
 STR_CARGO_SINGULAR_COAL                                         :{G=m}Άνθρακας
-STR_CARGO_SINGULAR_COAL.subs                                    :{G=m}Άνθρακες
+STR_CARGO_SINGULAR_COAL.subs                                    :Άνθρακες
 STR_CARGO_SINGULAR_MAIL                                         :{G=f}Αλληλογραφία
-STR_CARGO_SINGULAR_MAIL.subs                                    :{G=f}Αλληλογραφία
+STR_CARGO_SINGULAR_MAIL.subs                                    :Αλληλογραφία
 STR_CARGO_SINGULAR_OIL                                          :{G=n}Πετρέλαιο
-STR_CARGO_SINGULAR_OIL.subs                                     :{G=n}Πετρέλαιο
+STR_CARGO_SINGULAR_OIL.subs                                     :Πετρέλαιο
 STR_CARGO_SINGULAR_LIVESTOCK                                    :{G=n}Ζώο
-STR_CARGO_SINGULAR_LIVESTOCK.subs                               :{G=n}Ζώα
+STR_CARGO_SINGULAR_LIVESTOCK.subs                               :Ζώα
 STR_CARGO_SINGULAR_GOODS                                        :{G=n}Αγαθό
-STR_CARGO_SINGULAR_GOODS.subs                                   :{G=n}Αγαθα
+STR_CARGO_SINGULAR_GOODS.subs                                   :Αγαθα
 STR_CARGO_SINGULAR_GRAIN                                        :{G=n}Σιτηρό
-STR_CARGO_SINGULAR_GRAIN.subs                                   :{G=n}Σιτηρα
+STR_CARGO_SINGULAR_GRAIN.subs                                   :Σιτηρα
 STR_CARGO_SINGULAR_WOOD                                         :{G=f}Ξυλεία
-STR_CARGO_SINGULAR_WOOD.subs                                    :{G=f}Ξυλεία
+STR_CARGO_SINGULAR_WOOD.subs                                    :Ξυλεία
 STR_CARGO_SINGULAR_IRON_ORE                                     :{G=n}Σιδηρομετάλλευμα
-STR_CARGO_SINGULAR_IRON_ORE.subs                                :{G=n}Σιδηρομετάλλευμα
+STR_CARGO_SINGULAR_IRON_ORE.subs                                :Σιδηρομετάλλευμα
 STR_CARGO_SINGULAR_STEEL                                        :{G=m}Χάλυβας
-STR_CARGO_SINGULAR_STEEL.subs                                   :{G=m}Χάλυβα
+STR_CARGO_SINGULAR_STEEL.subs                                   :Χάλυβα
 STR_CARGO_SINGULAR_VALUABLES                                    :{G=n}Πολύτιμο είδος
-STR_CARGO_SINGULAR_VALUABLES.subs                               :{G=n}Πολύτιμα είδη
+STR_CARGO_SINGULAR_VALUABLES.subs                               :Πολύτιμα είδη
 STR_CARGO_SINGULAR_COPPER_ORE                                   :{G=n}Μετάλλευμα Χαλκού
-STR_CARGO_SINGULAR_COPPER_ORE.subs                              :{G=n}Μετάλλευμα Χαλκού
+STR_CARGO_SINGULAR_COPPER_ORE.subs                              :Μετάλλευμα Χαλκού
 STR_CARGO_SINGULAR_MAIZE                                        :{G=n}Καλαμπόκι
-STR_CARGO_SINGULAR_MAIZE.subs                                   :{G=n}Καλαμπόκι
+STR_CARGO_SINGULAR_MAIZE.subs                                   :Καλαμπόκι
 STR_CARGO_SINGULAR_FRUIT                                        :{G=n}Φρούτο
-STR_CARGO_SINGULAR_FRUIT.subs                                   :{G=n}Φρούτα
+STR_CARGO_SINGULAR_FRUIT.subs                                   :Φρούτα
 STR_CARGO_SINGULAR_DIAMOND                                      :{G=n}Διαμάντι
-STR_CARGO_SINGULAR_DIAMOND.subs                                 :{G=n}Διαμάντια
+STR_CARGO_SINGULAR_DIAMOND.subs                                 :Διαμάντια
 STR_CARGO_SINGULAR_FOOD                                         :{G=n}Τρόφιμο
-STR_CARGO_SINGULAR_FOOD.subs                                    :{G=n}Τρόφιμα
+STR_CARGO_SINGULAR_FOOD.subs                                    :Τρόφιμα
 STR_CARGO_SINGULAR_PAPER                                        :{G=n}Χαρτί
-STR_CARGO_SINGULAR_PAPER.subs                                   :{G=n}Χαρτία
+STR_CARGO_SINGULAR_PAPER.subs                                   :Χαρτία
 STR_CARGO_SINGULAR_GOLD                                         :{G=m}Χρυσός
-STR_CARGO_SINGULAR_GOLD.subs                                    :{G=m}Χρυσό
+STR_CARGO_SINGULAR_GOLD.subs                                    :Χρυσό
 STR_CARGO_SINGULAR_WATER                                        :{G=n}Νερό
-STR_CARGO_SINGULAR_WATER.subs                                   :{G=n}Νερα
+STR_CARGO_SINGULAR_WATER.subs                                   :Νερα
 STR_CARGO_SINGULAR_WHEAT                                        :{G=n}Σιτάρι
-STR_CARGO_SINGULAR_WHEAT.subs                                   :{G=n}Σιτάρια
+STR_CARGO_SINGULAR_WHEAT.subs                                   :Σιτάρια
 STR_CARGO_SINGULAR_RUBBER                                       :{G=n}Λάστιχο
-STR_CARGO_SINGULAR_RUBBER.subs                                  :{G=n}Λάστιχα
+STR_CARGO_SINGULAR_RUBBER.subs                                  :Λάστιχα
 STR_CARGO_SINGULAR_SUGAR                                        :{G=f}Ζάχαρη
-STR_CARGO_SINGULAR_SUGAR.subs                                   :{G=f}Ζάχαρες
+STR_CARGO_SINGULAR_SUGAR.subs                                   :Ζάχαρες
 STR_CARGO_SINGULAR_TOY                                          :{G=n}Παιχνίδι
-STR_CARGO_SINGULAR_TOY.subs                                     :{G=n}Παιχνίδια
+STR_CARGO_SINGULAR_TOY.subs                                     :Παιχνίδια
 STR_CARGO_SINGULAR_CANDY                                        :{G=n}Γλυκό
-STR_CARGO_SINGULAR_CANDY.subs                                   :{G=n}Γλυκα
+STR_CARGO_SINGULAR_CANDY.subs                                   :Γλυκα
 STR_CARGO_SINGULAR_COLA                                         :{G=f}Κόλα
 STR_CARGO_SINGULAR_COTTON_CANDY                                 :{G=n}Μαλλί της γριάς
-STR_CARGO_SINGULAR_COTTON_CANDY.subs                            :{G=n}Μαλλί της γριάς
+STR_CARGO_SINGULAR_COTTON_CANDY.subs                            :Μαλλί της γριάς
 STR_CARGO_SINGULAR_BUBBLE                                       :{G=f}Φυσαλίδα
-STR_CARGO_SINGULAR_BUBBLE.subs                                  :{G=f}Φυσαλίδες
+STR_CARGO_SINGULAR_BUBBLE.subs                                  :Φυσαλίδες
 STR_CARGO_SINGULAR_TOFFEE                                       :{G=n}Καραμέλα βουτύρου
-STR_CARGO_SINGULAR_TOFFEE.subs                                  :{G=n}Ζαχαρωτα
+STR_CARGO_SINGULAR_TOFFEE.subs                                  :Ζαχαρωτα
 STR_CARGO_SINGULAR_BATTERY                                      :{G=f}Μπαταρία
-STR_CARGO_SINGULAR_BATTERY.subs                                 :{G=f}Μπαταρίες
+STR_CARGO_SINGULAR_BATTERY.subs                                 :Μπαταρίες
 STR_CARGO_SINGULAR_PLASTIC                                      :{G=n}Πλαστικό
-STR_CARGO_SINGULAR_PLASTIC.subs                                 :{G=n}Πλαστικα
+STR_CARGO_SINGULAR_PLASTIC.subs                                 :Πλαστικα
 STR_CARGO_SINGULAR_FIZZY_DRINK                                  :{G=n}Αναψυκτικό
-STR_CARGO_SINGULAR_FIZZY_DRINK.subs                             :{G=n}Αναψυκτικα
+STR_CARGO_SINGULAR_FIZZY_DRINK.subs                             :Αναψυκτικα
 
 # Quantity of cargo
 STR_QUANTITY_NOTHING                                            :
@@ -3533,17 +3533,17 @@ STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}Πρό�
 STR_ENGINE_PREVIEW_CAPTION                                      :{WHITE}Μήνυμα από κατασκευαστή οχημάτων
 STR_ENGINE_PREVIEW_MESSAGE                                      :{GOLD}Μόλις ολοκληρώσαμε την σχεδίαση {G ενός μίας ενός} {G νέου νέας νέου} {STRING.geniki} - θα ενδιαφερόσασταν για ενός έτους αποκλειστικής χρήσης αυτού του οχήματος, για να δούμε την απόδοση του πριν το κάνουμε ευρέως διαθέσιμο;
 STR_ENGINE_PREVIEW_RAILROAD_LOCOMOTIVE                          :{G=f}ατμομηχανή
-STR_ENGINE_PREVIEW_RAILROAD_LOCOMOTIVE.geniki                   :{G=f}ατμομηχανής
+STR_ENGINE_PREVIEW_RAILROAD_LOCOMOTIVE.geniki                   :ατμομηχανής
 STR_ENGINE_PREVIEW_ROAD_VEHICLE                                 :{G=n}οχήματος δρόμου
-STR_ENGINE_PREVIEW_ROAD_VEHICLE.geniki                          :{G=n}Οχήματος δρόμου
+STR_ENGINE_PREVIEW_ROAD_VEHICLE.geniki                          :Οχήματος δρόμου
 STR_ENGINE_PREVIEW_AIRCRAFT                                     :{G=n}αεροσκάφους
-STR_ENGINE_PREVIEW_AIRCRAFT.geniki                              :{G=n}αεροσκάφους
+STR_ENGINE_PREVIEW_AIRCRAFT.geniki                              :αεροσκάφους
 STR_ENGINE_PREVIEW_SHIP                                         :{G=n}πλοίου
-STR_ENGINE_PREVIEW_SHIP.geniki                                  :{G=n}πλοίου
+STR_ENGINE_PREVIEW_SHIP.geniki                                  :πλοίου
 STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE                          :{G=f}μηχανής μονοτρόχιου
-STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE.geniki                   :{G=f}μηχανής monorail
+STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE.geniki                   :μηχανής monorail
 STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE                            :{G=f}μηχανής maglev
-STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE.geniki                     :{G=f}μηχανής maglev
+STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE.geniki                     :μηχανής maglev
 
 STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER                      :{BLACK}Κόστος: {CURRENCY_LONG} Βάρος: {WEIGHT_SHORT}{}Ταχύτητα: {VELOCITY}  Δύναμη Κινητήρα: {POWER}{}Κόστος Λειτουργίας: {CURRENCY_LONG}/έτος{}Χωρητικότητα: {CARGO_LONG}
 STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER_MAX_TE               :{BLACK}Κόστος: {CURRENCY_LONG} Βάρος: {WEIGHT_SHORT}{}Ταχύτητα: {VELOCITY}  Δύναμη Κινητήρα: {POWER}  Μεγ. Ε.Δ: {6:FORCE}{}Λειτουργικό Κόστος: {4:CURRENCY_LONG}/έτος{}Χωρητικότητα: {5:CARGO_LONG}
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!
diff --git a/src/lang/latvian.txt b/src/lang/latvian.txt
index f9083170d..e30e6485a 100644
--- a/src/lang/latvian.txt
+++ b/src/lang/latvian.txt
@@ -2508,7 +2508,7 @@ STR_LAND_AREA_INFORMATION_OWNER                                 :{BLACK}Īpašni
 STR_LAND_AREA_INFORMATION_ROAD_OWNER                            :{BLACK}Ceļa īpašnieks: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_TRAM_OWNER                            :{BLACK}Tramvaju ceļa īpašnieks: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_RAIL_OWNER                            :{BLACK}Dzelzceļa īpašnieks: {LTBLUE}{STRING}
-STR_LAND_AREA_INFORMATION_RAIL_OWNER.kas                        :{G=f}{BLACK}Dzelzceļa īpašniece: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_RAIL_OWNER.kas                        :{BLACK}Dzelzceļa īpašniece: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY                       :{BLACK}Pašvaldība: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Neviena
 STR_LAND_AREA_INFORMATION_LANDINFO_COORDS                       :{BLACK}Koordinātes: {LTBLUE}{NUM} x {NUM} x {NUM} ({STRING})
@@ -2817,9 +2817,9 @@ STR_NEWGRF_ERROR_DOS_OR_WINDOWS                                 :{1:STRING} ir T
 STR_NEWGRF_ERROR_UNSET_SWITCH                                   :{1:STRING} ir paredzēts lietošanai kopā ar {STRING}
 STR_NEWGRF_ERROR_INVALID_PARAMETER                              :Nepareizs parametrs priekš {1:STRING}: parametrs {STRING} ({NUM})
 STR_NEWGRF_ERROR_LOAD_BEFORE                                    :{1:STRING} jābūt ielādētam pirms {STRING}.
-STR_NEWGRF_ERROR_LOAD_BEFORE.kas                                :{G=f}{1:STRING} jābūt ielādētai pirms {STRING}.
+STR_NEWGRF_ERROR_LOAD_BEFORE.kas                                :{1:STRING} jābūt ielādētai pirms {STRING}.
 STR_NEWGRF_ERROR_LOAD_AFTER                                     :{1:STRING} jābūt ielādētam pēc {STRING}.
-STR_NEWGRF_ERROR_LOAD_AFTER.kas                                 :{G=f}{1:STRING} jābūt ielādētai pēc {STRING}.
+STR_NEWGRF_ERROR_LOAD_AFTER.kas                                 :{1:STRING} jābūt ielādētai pēc {STRING}.
 STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER                            :{1:STRING} ir vajadzīga Open TTD versija {STRING} vai labāka
 STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE                          :GRF fails radīts tulkošanai
 STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED                        :Ir ielādēti pārāk daudzi NewGRF
@@ -2896,7 +2896,7 @@ STR_EDIT_SIGN_SIGN_OSKTITLE                                     :{BLACK}Ievadīt
 # Town directory window
 STR_TOWN_DIRECTORY_CAPTION                                      :{WHITE}Pilsētas
 STR_TOWN_DIRECTORY_NONE                                         :{G=m}{ORANGE}- Neviens -
-STR_TOWN_DIRECTORY_NONE.kas                                     :{G=f}{ORANGE}- Neviena -
+STR_TOWN_DIRECTORY_NONE.kas                                     :{ORANGE}- Neviena -
 STR_TOWN_DIRECTORY_TOWN                                         :{ORANGE}{TOWN}{BLACK} ({COMMA})
 STR_TOWN_DIRECTORY_LIST_TOOLTIP                                 :{BLACK}Pilsētu nosaukumi - klikšķināt uz nosaukuma, lai centrētu skatu uz to. Ctrl+klikšķis atvērs jaunu skatu lauku uz pilsētu
 STR_TOWN_POPULATION                                             :{BLACK}Pasaules iedzīvotāju skaits: {COMMA}
@@ -2984,9 +2984,9 @@ STR_GOAL_QUESTION_BUTTON_ACCEPT                                 :Pieņemt
 STR_GOAL_QUESTION_BUTTON_IGNORE                                 :Neievērot
 STR_GOAL_QUESTION_BUTTON_RETRY                                  :Mēģināt vēl
 STR_GOAL_QUESTION_BUTTON_PREVIOUS                               :Iepriekšējais
-STR_GOAL_QUESTION_BUTTON_PREVIOUS.kas                           :{G=f}Iepriekšējā
+STR_GOAL_QUESTION_BUTTON_PREVIOUS.kas                           :Iepriekšējā
 STR_GOAL_QUESTION_BUTTON_NEXT                                   :Nākamais
-STR_GOAL_QUESTION_BUTTON_NEXT.kas                               :{G=f}Nākamā
+STR_GOAL_QUESTION_BUTTON_NEXT.kas                               :Nākamā
 STR_GOAL_QUESTION_BUTTON_STOP                                   :Apturēt
 STR_GOAL_QUESTION_BUTTON_START                                  :Sākt
 STR_GOAL_QUESTION_BUTTON_GO                                     :Doties
@@ -3198,7 +3198,7 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL                           :{WHITE}{CURRENC
 # Industry directory
 STR_INDUSTRY_DIRECTORY_CAPTION                                  :{WHITE}Ražotnes
 STR_INDUSTRY_DIRECTORY_NONE                                     :{G=m}{ORANGE}- Neviens -
-STR_INDUSTRY_DIRECTORY_NONE.kas                                 :{G=f}{ORANGE}- Neviena -
+STR_INDUSTRY_DIRECTORY_NONE.kas                                 :{ORANGE}- Neviena -
 STR_INDUSTRY_DIRECTORY_ITEM                                     :{ORANGE}{INDUSTRY}{BLACK} ({CARGO_LONG}{STRING}){YELLOW} ({COMMA}% pārvadāts)
 STR_INDUSTRY_DIRECTORY_ITEM_TWO                                 :{ORANGE}{INDUSTRY}{BLACK} ({CARGO_LONG}{STRING}/{CARGO_LONG}{STRING}){YELLOW} ({COMMA}%/{COMMA}% pārvadāts)
 STR_INDUSTRY_DIRECTORY_ITEM_NOPROD                              :{ORANGE}{INDUSTRY}
diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt
index e53494427..97875e196 100644
--- a/src/lang/lithuanian.txt
+++ b/src/lang/lithuanian.txt
@@ -1815,21 +1815,21 @@ STR_CONFIG_SETTING_LINKGRAPH_TIME                               :Pasiskirstymo g
 STR_CONFIG_SETTING_LINKGRAPH_TIME_HELPTEXT                      :Laiko trukmė skirta pilnam krovinių paskirstymo grafui perskaičiuoti. Nustačius per mažą reikšmę, žaidimas gali trumpam pakibti, kol bus baigti skaičiavimai. Kita vertus, kuo ilgesnė ši trukmė, tuo vėliau į grafą bus įtraukti maršrutų pakeitimai.
 STR_CONFIG_SETTING_DISTRIBUTION_MANUAL                          :originalus
 STR_CONFIG_SETTING_DISTRIBUTION_ASYMMETRIC                      :asimetriškas
-STR_CONFIG_SETTING_DISTRIBUTION_ASYMMETRIC.kas                  :{G=vyr}asimetriškas
-STR_CONFIG_SETTING_DISTRIBUTION_ASYMMETRIC.ko                   :{G=vyr}asimetriško
-STR_CONFIG_SETTING_DISTRIBUTION_ASYMMETRIC.kam                  :{G=vyr}asimetriškam
-STR_CONFIG_SETTING_DISTRIBUTION_ASYMMETRIC.ka                   :{G=vyr}asimetišką
-STR_CONFIG_SETTING_DISTRIBUTION_ASYMMETRIC.kuo                  :{G=vyr}asimetrišku
-STR_CONFIG_SETTING_DISTRIBUTION_ASYMMETRIC.kur                  :{G=vyr}asimetriškame
-STR_CONFIG_SETTING_DISTRIBUTION_ASYMMETRIC.kreip                :{G=vyr}asimetriškas
+STR_CONFIG_SETTING_DISTRIBUTION_ASYMMETRIC.kas                  :asimetriškas
+STR_CONFIG_SETTING_DISTRIBUTION_ASYMMETRIC.ko                   :asimetriško
+STR_CONFIG_SETTING_DISTRIBUTION_ASYMMETRIC.kam                  :asimetriškam
+STR_CONFIG_SETTING_DISTRIBUTION_ASYMMETRIC.ka                   :asimetišką
+STR_CONFIG_SETTING_DISTRIBUTION_ASYMMETRIC.kuo                  :asimetrišku
+STR_CONFIG_SETTING_DISTRIBUTION_ASYMMETRIC.kur                  :asimetriškame
+STR_CONFIG_SETTING_DISTRIBUTION_ASYMMETRIC.kreip                :asimetriškas
 STR_CONFIG_SETTING_DISTRIBUTION_SYMMETRIC                       :simetriškas
-STR_CONFIG_SETTING_DISTRIBUTION_SYMMETRIC.kas                   :{G=vyr}simetriškas
-STR_CONFIG_SETTING_DISTRIBUTION_SYMMETRIC.ko                    :{G=vyr}simetriško
-STR_CONFIG_SETTING_DISTRIBUTION_SYMMETRIC.kam                   :{G=vyr}simetriškam
-STR_CONFIG_SETTING_DISTRIBUTION_SYMMETRIC.ka                    :{G=vyr}simetrišką
-STR_CONFIG_SETTING_DISTRIBUTION_SYMMETRIC.kuo                   :{G=vyr}simetrišku
-STR_CONFIG_SETTING_DISTRIBUTION_SYMMETRIC.kur                   :{G=vyr}simetriškame
-STR_CONFIG_SETTING_DISTRIBUTION_SYMMETRIC.kreip                 :{G=vyr}simetriškas
+STR_CONFIG_SETTING_DISTRIBUTION_SYMMETRIC.kas                   :simetriškas
+STR_CONFIG_SETTING_DISTRIBUTION_SYMMETRIC.ko                    :simetriško
+STR_CONFIG_SETTING_DISTRIBUTION_SYMMETRIC.kam                   :simetriškam
+STR_CONFIG_SETTING_DISTRIBUTION_SYMMETRIC.ka                    :simetrišką
+STR_CONFIG_SETTING_DISTRIBUTION_SYMMETRIC.kuo                   :simetrišku
+STR_CONFIG_SETTING_DISTRIBUTION_SYMMETRIC.kur                   :simetriškame
+STR_CONFIG_SETTING_DISTRIBUTION_SYMMETRIC.kreip                 :simetriškas
 STR_CONFIG_SETTING_DISTRIBUTION_PAX                             :Keleivių paskirstymas: {STRING}
 STR_CONFIG_SETTING_DISTRIBUTION_PAX_HELPTEXT                    :„Simetriškas“ reiškia, jog iš stoties A į stotį B keliaus apytiksliai toks pat keleivių srautas, kaip ir iš B į A. „Asimetriško“ režimo atveju, srautai pirmyn ir atgal gali skirtis. „Originalus“ reiškia, kad srautai nebus reguliuojami ir veiks kaip ir originaliame TTD žaidime.
 STR_CONFIG_SETTING_DISTRIBUTION_MAIL                            :Pasiskirstymo režimas paštui: {STRING}
@@ -4787,301 +4787,301 @@ STR_TOWN_BUILDING_NAME_PIGGY_BANK_1                             :Paršiukų bank
 ##id 0x4800
 # industry names
 STR_INDUSTRY_NAME_COAL_MINE                                     :{G=mot}anglies kasykla
-STR_INDUSTRY_NAME_COAL_MINE.kas                                 :{G=mot}anglies kasykla
-STR_INDUSTRY_NAME_COAL_MINE.ko                                  :{G=mot}anglies kasyklos
-STR_INDUSTRY_NAME_COAL_MINE.kam                                 :{G=mot}anglies kasyklai
-STR_INDUSTRY_NAME_COAL_MINE.ka                                  :{G=mot}anglies kasyklą
-STR_INDUSTRY_NAME_COAL_MINE.kuo                                 :{G=mot}anglies kasykla
-STR_INDUSTRY_NAME_COAL_MINE.kur                                 :{G=mot}anglies kasykloje
-STR_INDUSTRY_NAME_COAL_MINE.kreip                               :{G=mot}anglies kasykla
+STR_INDUSTRY_NAME_COAL_MINE.kas                                 :anglies kasykla
+STR_INDUSTRY_NAME_COAL_MINE.ko                                  :anglies kasyklos
+STR_INDUSTRY_NAME_COAL_MINE.kam                                 :anglies kasyklai
+STR_INDUSTRY_NAME_COAL_MINE.ka                                  :anglies kasyklą
+STR_INDUSTRY_NAME_COAL_MINE.kuo                                 :anglies kasykla
+STR_INDUSTRY_NAME_COAL_MINE.kur                                 :anglies kasykloje
+STR_INDUSTRY_NAME_COAL_MINE.kreip                               :anglies kasykla
 STR_INDUSTRY_NAME_POWER_STATION                                 :{G=mot}elektrinė
-STR_INDUSTRY_NAME_POWER_STATION.kas                             :{G=mot}elektrinė
-STR_INDUSTRY_NAME_POWER_STATION.ko                              :{G=mot}elektrinės
-STR_INDUSTRY_NAME_POWER_STATION.kam                             :{G=mot}elektrinei
-STR_INDUSTRY_NAME_POWER_STATION.ka                              :{G=mot}elektrinę
-STR_INDUSTRY_NAME_POWER_STATION.kuo                             :{G=mot}elektrine
-STR_INDUSTRY_NAME_POWER_STATION.kur                             :{G=mot}elektrinėje
-STR_INDUSTRY_NAME_POWER_STATION.kreip                           :{G=mot}elektrine
+STR_INDUSTRY_NAME_POWER_STATION.kas                             :elektrinė
+STR_INDUSTRY_NAME_POWER_STATION.ko                              :elektrinės
+STR_INDUSTRY_NAME_POWER_STATION.kam                             :elektrinei
+STR_INDUSTRY_NAME_POWER_STATION.ka                              :elektrinę
+STR_INDUSTRY_NAME_POWER_STATION.kuo                             :elektrine
+STR_INDUSTRY_NAME_POWER_STATION.kur                             :elektrinėje
+STR_INDUSTRY_NAME_POWER_STATION.kreip                           :elektrine
 STR_INDUSTRY_NAME_SAWMILL                                       :{G=mot}lentpjūvė
-STR_INDUSTRY_NAME_SAWMILL.kas                                   :{G=mot}lentpjūvė
-STR_INDUSTRY_NAME_SAWMILL.ko                                    :{G=mot}lentpjūvės
-STR_INDUSTRY_NAME_SAWMILL.kam                                   :{G=mot}lentpjūvei
-STR_INDUSTRY_NAME_SAWMILL.ka                                    :{G=mot}lentpjūvę
-STR_INDUSTRY_NAME_SAWMILL.kuo                                   :{G=mot}lentpjūve
-STR_INDUSTRY_NAME_SAWMILL.kur                                   :{G=mot}lentpjūvėje
-STR_INDUSTRY_NAME_SAWMILL.kreip                                 :{G=mot}lentpjūve
+STR_INDUSTRY_NAME_SAWMILL.kas                                   :lentpjūvė
+STR_INDUSTRY_NAME_SAWMILL.ko                                    :lentpjūvės
+STR_INDUSTRY_NAME_SAWMILL.kam                                   :lentpjūvei
+STR_INDUSTRY_NAME_SAWMILL.ka                                    :lentpjūvę
+STR_INDUSTRY_NAME_SAWMILL.kuo                                   :lentpjūve
+STR_INDUSTRY_NAME_SAWMILL.kur                                   :lentpjūvėje
+STR_INDUSTRY_NAME_SAWMILL.kreip                                 :lentpjūve
 STR_INDUSTRY_NAME_FOREST                                        :{G=vyr}miškas
-STR_INDUSTRY_NAME_FOREST.kas                                    :{G=vyr}miškas
-STR_INDUSTRY_NAME_FOREST.ko                                     :{G=vyr}miško
-STR_INDUSTRY_NAME_FOREST.kam                                    :{G=vyr}miškui
-STR_INDUSTRY_NAME_FOREST.ka                                     :{G=vyr}mišką
-STR_INDUSTRY_NAME_FOREST.kuo                                    :{G=vyr}mišku
-STR_INDUSTRY_NAME_FOREST.kur                                    :{G=vyr}miške
-STR_INDUSTRY_NAME_FOREST.kreip                                  :{G=vyr}miške
+STR_INDUSTRY_NAME_FOREST.kas                                    :miškas
+STR_INDUSTRY_NAME_FOREST.ko                                     :miško
+STR_INDUSTRY_NAME_FOREST.kam                                    :miškui
+STR_INDUSTRY_NAME_FOREST.ka                                     :mišką
+STR_INDUSTRY_NAME_FOREST.kuo                                    :mišku
+STR_INDUSTRY_NAME_FOREST.kur                                    :miške
+STR_INDUSTRY_NAME_FOREST.kreip                                  :miške
 STR_INDUSTRY_NAME_OIL_REFINERY                                  :{G=mot}naftos perdirbimo įmonė
-STR_INDUSTRY_NAME_OIL_REFINERY.kas                              :{G=mot}naftos perdirbimo įmonė
-STR_INDUSTRY_NAME_OIL_REFINERY.ko                               :{G=mot}naftos perdirbimo įmonės
-STR_INDUSTRY_NAME_OIL_REFINERY.kam                              :{G=mot}naftos perdirbimo įmonei
-STR_INDUSTRY_NAME_OIL_REFINERY.ka                               :{G=mot}naftos perdirbimo įmonę
-STR_INDUSTRY_NAME_OIL_REFINERY.kuo                              :{G=mot}naftos perdirbimo įmone
-STR_INDUSTRY_NAME_OIL_REFINERY.kur                              :{G=mot}naftos perdirbimo įmonėje
-STR_INDUSTRY_NAME_OIL_REFINERY.kreip                            :{G=mot}naftos perdirbimo įmone
+STR_INDUSTRY_NAME_OIL_REFINERY.kas                              :naftos perdirbimo įmonė
+STR_INDUSTRY_NAME_OIL_REFINERY.ko                               :naftos perdirbimo įmonės
+STR_INDUSTRY_NAME_OIL_REFINERY.kam                              :naftos perdirbimo įmonei
+STR_INDUSTRY_NAME_OIL_REFINERY.ka                               :naftos perdirbimo įmonę
+STR_INDUSTRY_NAME_OIL_REFINERY.kuo                              :naftos perdirbimo įmone
+STR_INDUSTRY_NAME_OIL_REFINERY.kur                              :naftos perdirbimo įmonėje
+STR_INDUSTRY_NAME_OIL_REFINERY.kreip                            :naftos perdirbimo įmone
 STR_INDUSTRY_NAME_OIL_RIG                                       :{G=mot}naftos platforma
-STR_INDUSTRY_NAME_OIL_RIG.kas                                   :{G=mot}naftos platforma
-STR_INDUSTRY_NAME_OIL_RIG.ko                                    :{G=mot}naftos platformos
-STR_INDUSTRY_NAME_OIL_RIG.kam                                   :{G=mot}naftos platformai
-STR_INDUSTRY_NAME_OIL_RIG.ka                                    :{G=mot}naftos platformą
-STR_INDUSTRY_NAME_OIL_RIG.kuo                                   :{G=mot}naftos platforma
-STR_INDUSTRY_NAME_OIL_RIG.kur                                   :{G=mot}naftos platformoje
-STR_INDUSTRY_NAME_OIL_RIG.kreip                                 :{G=mot}naftos platforma
+STR_INDUSTRY_NAME_OIL_RIG.kas                                   :naftos platforma
+STR_INDUSTRY_NAME_OIL_RIG.ko                                    :naftos platformos
+STR_INDUSTRY_NAME_OIL_RIG.kam                                   :naftos platformai
+STR_INDUSTRY_NAME_OIL_RIG.ka                                    :naftos platformą
+STR_INDUSTRY_NAME_OIL_RIG.kuo                                   :naftos platforma
+STR_INDUSTRY_NAME_OIL_RIG.kur                                   :naftos platformoje
+STR_INDUSTRY_NAME_OIL_RIG.kreip                                 :naftos platforma
 STR_INDUSTRY_NAME_FACTORY                                       :{G=mot}gamykla
-STR_INDUSTRY_NAME_FACTORY.kas                                   :{G=mot}gamykla
-STR_INDUSTRY_NAME_FACTORY.ko                                    :{G=mot}gamyklos
-STR_INDUSTRY_NAME_FACTORY.kam                                   :{G=mot}gamyklai
-STR_INDUSTRY_NAME_FACTORY.ka                                    :{G=mot}gamyklą
-STR_INDUSTRY_NAME_FACTORY.kuo                                   :{G=mot}gamykla
-STR_INDUSTRY_NAME_FACTORY.kur                                   :{G=mot}gamykloje
-STR_INDUSTRY_NAME_FACTORY.kreip                                 :{G=mot}gamykla
+STR_INDUSTRY_NAME_FACTORY.kas                                   :gamykla
+STR_INDUSTRY_NAME_FACTORY.ko                                    :gamyklos
+STR_INDUSTRY_NAME_FACTORY.kam                                   :gamyklai
+STR_INDUSTRY_NAME_FACTORY.ka                                    :gamyklą
+STR_INDUSTRY_NAME_FACTORY.kuo                                   :gamykla
+STR_INDUSTRY_NAME_FACTORY.kur                                   :gamykloje
+STR_INDUSTRY_NAME_FACTORY.kreip                                 :gamykla
 STR_INDUSTRY_NAME_PRINTING_WORKS                                :{G=mot}spaustuvė
-STR_INDUSTRY_NAME_PRINTING_WORKS.kas                            :{G=mot}spaustuvė
-STR_INDUSTRY_NAME_PRINTING_WORKS.ko                             :{G=mot}spaustuvės
-STR_INDUSTRY_NAME_PRINTING_WORKS.kam                            :{G=mot}spaustuvei
-STR_INDUSTRY_NAME_PRINTING_WORKS.ka                             :{G=mot}spaustuvę
-STR_INDUSTRY_NAME_PRINTING_WORKS.kuo                            :{G=mot}spaustuve
-STR_INDUSTRY_NAME_PRINTING_WORKS.kur                            :{G=mot}spaustuvėje
-STR_INDUSTRY_NAME_PRINTING_WORKS.kreip                          :{G=mot}spaustuve
+STR_INDUSTRY_NAME_PRINTING_WORKS.kas                            :spaustuvė
+STR_INDUSTRY_NAME_PRINTING_WORKS.ko                             :spaustuvės
+STR_INDUSTRY_NAME_PRINTING_WORKS.kam                            :spaustuvei
+STR_INDUSTRY_NAME_PRINTING_WORKS.ka                             :spaustuvę
+STR_INDUSTRY_NAME_PRINTING_WORKS.kuo                            :spaustuve
+STR_INDUSTRY_NAME_PRINTING_WORKS.kur                            :spaustuvėje
+STR_INDUSTRY_NAME_PRINTING_WORKS.kreip                          :spaustuve
 STR_INDUSTRY_NAME_STEEL_MILL                                    :{G=mot}plieno liejykla
-STR_INDUSTRY_NAME_STEEL_MILL.kas                                :{G=mot}plieno liejykla
-STR_INDUSTRY_NAME_STEEL_MILL.ko                                 :{G=mot}plieno liejyklos
-STR_INDUSTRY_NAME_STEEL_MILL.kam                                :{G=mot}plieno liejyklai
-STR_INDUSTRY_NAME_STEEL_MILL.ka                                 :{G=mot}plieno liejyklą
-STR_INDUSTRY_NAME_STEEL_MILL.kuo                                :{G=mot}plieno liejykla
-STR_INDUSTRY_NAME_STEEL_MILL.kur                                :{G=mot}plieno liejykloje
-STR_INDUSTRY_NAME_STEEL_MILL.kreip                              :{G=mot}plieno liejykla
+STR_INDUSTRY_NAME_STEEL_MILL.kas                                :plieno liejykla
+STR_INDUSTRY_NAME_STEEL_MILL.ko                                 :plieno liejyklos
+STR_INDUSTRY_NAME_STEEL_MILL.kam                                :plieno liejyklai
+STR_INDUSTRY_NAME_STEEL_MILL.ka                                 :plieno liejyklą
+STR_INDUSTRY_NAME_STEEL_MILL.kuo                                :plieno liejykla
+STR_INDUSTRY_NAME_STEEL_MILL.kur                                :plieno liejykloje
+STR_INDUSTRY_NAME_STEEL_MILL.kreip                              :plieno liejykla
 STR_INDUSTRY_NAME_FARM                                          :{G=vyr}ūkis
-STR_INDUSTRY_NAME_FARM.kas                                      :{G=vyr}ūkis
-STR_INDUSTRY_NAME_FARM.ko                                       :{G=vyr}ūkio
-STR_INDUSTRY_NAME_FARM.kam                                      :{G=vyr}ūkiui
-STR_INDUSTRY_NAME_FARM.ka                                       :{G=vyr}ūkį
-STR_INDUSTRY_NAME_FARM.kuo                                      :{G=vyr}ūkiu
-STR_INDUSTRY_NAME_FARM.kur                                      :{G=vyr}ūkyje
-STR_INDUSTRY_NAME_FARM.kreip                                    :{G=vyr}ūki
+STR_INDUSTRY_NAME_FARM.kas                                      :ūkis
+STR_INDUSTRY_NAME_FARM.ko                                       :ūkio
+STR_INDUSTRY_NAME_FARM.kam                                      :ūkiui
+STR_INDUSTRY_NAME_FARM.ka                                       :ūkį
+STR_INDUSTRY_NAME_FARM.kuo                                      :ūkiu
+STR_INDUSTRY_NAME_FARM.kur                                      :ūkyje
+STR_INDUSTRY_NAME_FARM.kreip                                    :ūki
 STR_INDUSTRY_NAME_COPPER_ORE_MINE                               :{G=mot}vario rūdos kasykla
-STR_INDUSTRY_NAME_COPPER_ORE_MINE.kas                           :{G=mot}vario rūdos kasykla
-STR_INDUSTRY_NAME_COPPER_ORE_MINE.ko                            :{G=mot}vario rūdos kasyklos
-STR_INDUSTRY_NAME_COPPER_ORE_MINE.kam                           :{G=mot}vario rūdos kasyklai
-STR_INDUSTRY_NAME_COPPER_ORE_MINE.ka                            :{G=mot}vario rūdos kasyklą
-STR_INDUSTRY_NAME_COPPER_ORE_MINE.kuo                           :{G=mot}vario rūdos kasykla
-STR_INDUSTRY_NAME_COPPER_ORE_MINE.kur                           :{G=mot}vario rūdos kasykloje
-STR_INDUSTRY_NAME_COPPER_ORE_MINE.kreip                         :{G=mot}vario rūdos kasykla
+STR_INDUSTRY_NAME_COPPER_ORE_MINE.kas                           :vario rūdos kasykla
+STR_INDUSTRY_NAME_COPPER_ORE_MINE.ko                            :vario rūdos kasyklos
+STR_INDUSTRY_NAME_COPPER_ORE_MINE.kam                           :vario rūdos kasyklai
+STR_INDUSTRY_NAME_COPPER_ORE_MINE.ka                            :vario rūdos kasyklą
+STR_INDUSTRY_NAME_COPPER_ORE_MINE.kuo                           :vario rūdos kasykla
+STR_INDUSTRY_NAME_COPPER_ORE_MINE.kur                           :vario rūdos kasykloje
+STR_INDUSTRY_NAME_COPPER_ORE_MINE.kreip                         :vario rūdos kasykla
 STR_INDUSTRY_NAME_OIL_WELLS                                     :{G=vyr}naftos gręžinys
-STR_INDUSTRY_NAME_OIL_WELLS.kas                                 :{G=vyr}naftos gręžinys
-STR_INDUSTRY_NAME_OIL_WELLS.ko                                  :{G=vyr}naftos gręžinio
-STR_INDUSTRY_NAME_OIL_WELLS.kam                                 :{G=vyr}naftos gręžiniui
-STR_INDUSTRY_NAME_OIL_WELLS.ka                                  :{G=vyr}naftos gręžinį
-STR_INDUSTRY_NAME_OIL_WELLS.kuo                                 :{G=vyr}naftos gręžiniu
-STR_INDUSTRY_NAME_OIL_WELLS.kur                                 :{G=vyr}naftos gręžinyje
-STR_INDUSTRY_NAME_OIL_WELLS.kreip                               :{G=vyr}naftos gręžiny
+STR_INDUSTRY_NAME_OIL_WELLS.kas                                 :naftos gręžinys
+STR_INDUSTRY_NAME_OIL_WELLS.ko                                  :naftos gręžinio
+STR_INDUSTRY_NAME_OIL_WELLS.kam                                 :naftos gręžiniui
+STR_INDUSTRY_NAME_OIL_WELLS.ka                                  :naftos gręžinį
+STR_INDUSTRY_NAME_OIL_WELLS.kuo                                 :naftos gręžiniu
+STR_INDUSTRY_NAME_OIL_WELLS.kur                                 :naftos gręžinyje
+STR_INDUSTRY_NAME_OIL_WELLS.kreip                               :naftos gręžiny
 STR_INDUSTRY_NAME_BANK                                          :{G=vyr}bankas
-STR_INDUSTRY_NAME_BANK.kas                                      :{G=vyr}bankas
-STR_INDUSTRY_NAME_BANK.ko                                       :{G=vyr}banko
-STR_INDUSTRY_NAME_BANK.kam                                      :{G=vyr}bankui
-STR_INDUSTRY_NAME_BANK.ka                                       :{G=vyr}banką
-STR_INDUSTRY_NAME_BANK.kuo                                      :{G=vyr}banku
-STR_INDUSTRY_NAME_BANK.kur                                      :{G=vyr}banke
-STR_INDUSTRY_NAME_BANK.kreip                                    :{G=vyr}banke
+STR_INDUSTRY_NAME_BANK.kas                                      :bankas
+STR_INDUSTRY_NAME_BANK.ko                                       :banko
+STR_INDUSTRY_NAME_BANK.kam                                      :bankui
+STR_INDUSTRY_NAME_BANK.ka                                       :banką
+STR_INDUSTRY_NAME_BANK.kuo                                      :banku
+STR_INDUSTRY_NAME_BANK.kur                                      :banke
+STR_INDUSTRY_NAME_BANK.kreip                                    :banke
 STR_INDUSTRY_NAME_FOOD_PROCESSING_PLANT                         :{G=mot}maisto perdirbimo įmonė
-STR_INDUSTRY_NAME_FOOD_PROCESSING_PLANT.kas                     :{G=mot}maisto perdirbimo įmonė
-STR_INDUSTRY_NAME_FOOD_PROCESSING_PLANT.ko                      :{G=mot}maisto perdirbimo įmonės
-STR_INDUSTRY_NAME_FOOD_PROCESSING_PLANT.kam                     :{G=mot}maisto perdirbimo įmonei
-STR_INDUSTRY_NAME_FOOD_PROCESSING_PLANT.ka                      :{G=mot}maisto perdirbimo įmonę
-STR_INDUSTRY_NAME_FOOD_PROCESSING_PLANT.kuo                     :{G=mot}maisto perdirbimo įmone
-STR_INDUSTRY_NAME_FOOD_PROCESSING_PLANT.kur                     :{G=mot}maisto perdirbimo įmonėje
-STR_INDUSTRY_NAME_FOOD_PROCESSING_PLANT.kreip                   :{G=mot}maisto perdirbimo įmone
+STR_INDUSTRY_NAME_FOOD_PROCESSING_PLANT.kas                     :maisto perdirbimo įmonė
+STR_INDUSTRY_NAME_FOOD_PROCESSING_PLANT.ko                      :maisto perdirbimo įmonės
+STR_INDUSTRY_NAME_FOOD_PROCESSING_PLANT.kam                     :maisto perdirbimo įmonei
+STR_INDUSTRY_NAME_FOOD_PROCESSING_PLANT.ka                      :maisto perdirbimo įmonę
+STR_INDUSTRY_NAME_FOOD_PROCESSING_PLANT.kuo                     :maisto perdirbimo įmone
+STR_INDUSTRY_NAME_FOOD_PROCESSING_PLANT.kur                     :maisto perdirbimo įmonėje
+STR_INDUSTRY_NAME_FOOD_PROCESSING_PLANT.kreip                   :maisto perdirbimo įmone
 STR_INDUSTRY_NAME_PAPER_MILL                                    :{G=vyr}popieriaus fabrikas
-STR_INDUSTRY_NAME_PAPER_MILL.kas                                :{G=vyr}popieriaus fabrikas
-STR_INDUSTRY_NAME_PAPER_MILL.ko                                 :{G=vyr}popieriaus fabriko
-STR_INDUSTRY_NAME_PAPER_MILL.kam                                :{G=vyr}popieriaus fabrikui
-STR_INDUSTRY_NAME_PAPER_MILL.ka                                 :{G=vyr}popieriaus fabriką
-STR_INDUSTRY_NAME_PAPER_MILL.kuo                                :{G=vyr}popieriaus fabriku
-STR_INDUSTRY_NAME_PAPER_MILL.kur                                :{G=vyr}popieriaus fabrike
-STR_INDUSTRY_NAME_PAPER_MILL.kreip                              :{G=vyr}popieriaus fabrike
+STR_INDUSTRY_NAME_PAPER_MILL.kas                                :popieriaus fabrikas
+STR_INDUSTRY_NAME_PAPER_MILL.ko                                 :popieriaus fabriko
+STR_INDUSTRY_NAME_PAPER_MILL.kam                                :popieriaus fabrikui
+STR_INDUSTRY_NAME_PAPER_MILL.ka                                 :popieriaus fabriką
+STR_INDUSTRY_NAME_PAPER_MILL.kuo                                :popieriaus fabriku
+STR_INDUSTRY_NAME_PAPER_MILL.kur                                :popieriaus fabrike
+STR_INDUSTRY_NAME_PAPER_MILL.kreip                              :popieriaus fabrike
 STR_INDUSTRY_NAME_GOLD_MINE                                     :{G=mot}aukso kasykla
-STR_INDUSTRY_NAME_GOLD_MINE.kas                                 :{G=mot}aukso kasykla
-STR_INDUSTRY_NAME_GOLD_MINE.ko                                  :{G=mot}aukso kasyklos
-STR_INDUSTRY_NAME_GOLD_MINE.kam                                 :{G=mot}aukso kasyklai
-STR_INDUSTRY_NAME_GOLD_MINE.ka                                  :{G=mot}aukso kasyklą
-STR_INDUSTRY_NAME_GOLD_MINE.kuo                                 :{G=mot}aukso kasykla
-STR_INDUSTRY_NAME_GOLD_MINE.kur                                 :{G=mot}aukso kasykloje
-STR_INDUSTRY_NAME_GOLD_MINE.kreip                               :{G=mot}aukso kasykla
+STR_INDUSTRY_NAME_GOLD_MINE.kas                                 :aukso kasykla
+STR_INDUSTRY_NAME_GOLD_MINE.ko                                  :aukso kasyklos
+STR_INDUSTRY_NAME_GOLD_MINE.kam                                 :aukso kasyklai
+STR_INDUSTRY_NAME_GOLD_MINE.ka                                  :aukso kasyklą
+STR_INDUSTRY_NAME_GOLD_MINE.kuo                                 :aukso kasykla
+STR_INDUSTRY_NAME_GOLD_MINE.kur                                 :aukso kasykloje
+STR_INDUSTRY_NAME_GOLD_MINE.kreip                               :aukso kasykla
 STR_INDUSTRY_NAME_BANK_TROPIC_ARCTIC                            :{G=vyr}bankas
-STR_INDUSTRY_NAME_BANK_TROPIC_ARCTIC.kas                        :{G=vyr}bankas
-STR_INDUSTRY_NAME_BANK_TROPIC_ARCTIC.ko                         :{G=vyr}banko
-STR_INDUSTRY_NAME_BANK_TROPIC_ARCTIC.kam                        :{G=vyr}bankui
-STR_INDUSTRY_NAME_BANK_TROPIC_ARCTIC.ka                         :{G=vyr}banką
-STR_INDUSTRY_NAME_BANK_TROPIC_ARCTIC.kuo                        :{G=vyr}banku
-STR_INDUSTRY_NAME_BANK_TROPIC_ARCTIC.kur                        :{G=vyr}banke
-STR_INDUSTRY_NAME_BANK_TROPIC_ARCTIC.kreip                      :{G=vyr}banke
+STR_INDUSTRY_NAME_BANK_TROPIC_ARCTIC.kas                        :bankas
+STR_INDUSTRY_NAME_BANK_TROPIC_ARCTIC.ko                         :banko
+STR_INDUSTRY_NAME_BANK_TROPIC_ARCTIC.kam                        :bankui
+STR_INDUSTRY_NAME_BANK_TROPIC_ARCTIC.ka                         :banką
+STR_INDUSTRY_NAME_BANK_TROPIC_ARCTIC.kuo                        :banku
+STR_INDUSTRY_NAME_BANK_TROPIC_ARCTIC.kur                        :banke
+STR_INDUSTRY_NAME_BANK_TROPIC_ARCTIC.kreip                      :banke
 STR_INDUSTRY_NAME_DIAMOND_MINE                                  :{G=mot}deimantų kasykla
-STR_INDUSTRY_NAME_DIAMOND_MINE.kas                              :{G=mot}deimantų kasykla
-STR_INDUSTRY_NAME_DIAMOND_MINE.ko                               :{G=mot}deimantų kasyklos
-STR_INDUSTRY_NAME_DIAMOND_MINE.kam                              :{G=mot}deimantų kasyklai
-STR_INDUSTRY_NAME_DIAMOND_MINE.ka                               :{G=mot}deimantų kasyklą
-STR_INDUSTRY_NAME_DIAMOND_MINE.kuo                              :{G=mot}deimantų kasykla
-STR_INDUSTRY_NAME_DIAMOND_MINE.kur                              :{G=mot}deimantų kasykloje
-STR_INDUSTRY_NAME_DIAMOND_MINE.kreip                            :{G=mot}deimantų kasykla
+STR_INDUSTRY_NAME_DIAMOND_MINE.kas                              :deimantų kasykla
+STR_INDUSTRY_NAME_DIAMOND_MINE.ko                               :deimantų kasyklos
+STR_INDUSTRY_NAME_DIAMOND_MINE.kam                              :deimantų kasyklai
+STR_INDUSTRY_NAME_DIAMOND_MINE.ka                               :deimantų kasyklą
+STR_INDUSTRY_NAME_DIAMOND_MINE.kuo                              :deimantų kasykla
+STR_INDUSTRY_NAME_DIAMOND_MINE.kur                              :deimantų kasykloje
+STR_INDUSTRY_NAME_DIAMOND_MINE.kreip                            :deimantų kasykla
 STR_INDUSTRY_NAME_IRON_ORE_MINE                                 :{G=mot}geležies rūdos kasykla
-STR_INDUSTRY_NAME_IRON_ORE_MINE.kas                             :{G=mot}geležies rūdos kasykla
-STR_INDUSTRY_NAME_IRON_ORE_MINE.ko                              :{G=mot}geležies rūdos kasyklos
-STR_INDUSTRY_NAME_IRON_ORE_MINE.kam                             :{G=mot}geležies rūdos kasyklai
-STR_INDUSTRY_NAME_IRON_ORE_MINE.ka                              :{G=mot}geležies rūdos kasyklą
-STR_INDUSTRY_NAME_IRON_ORE_MINE.kuo                             :{G=mot}geležies rūdos kasykla
-STR_INDUSTRY_NAME_IRON_ORE_MINE.kur                             :{G=mot}geležies rūdos kasykloje
-STR_INDUSTRY_NAME_IRON_ORE_MINE.kreip                           :{G=mot}geležies rūdos kasykla
+STR_INDUSTRY_NAME_IRON_ORE_MINE.kas                             :geležies rūdos kasykla
+STR_INDUSTRY_NAME_IRON_ORE_MINE.ko                              :geležies rūdos kasyklos
+STR_INDUSTRY_NAME_IRON_ORE_MINE.kam                             :geležies rūdos kasyklai
+STR_INDUSTRY_NAME_IRON_ORE_MINE.ka                              :geležies rūdos kasyklą
+STR_INDUSTRY_NAME_IRON_ORE_MINE.kuo                             :geležies rūdos kasykla
+STR_INDUSTRY_NAME_IRON_ORE_MINE.kur                             :geležies rūdos kasykloje
+STR_INDUSTRY_NAME_IRON_ORE_MINE.kreip                           :geležies rūdos kasykla
 STR_INDUSTRY_NAME_FRUIT_PLANTATION                              :{G=mot}vaisių plantacija
-STR_INDUSTRY_NAME_FRUIT_PLANTATION.kas                          :{G=mot}vaisių plantacija
-STR_INDUSTRY_NAME_FRUIT_PLANTATION.ko                           :{G=mot}vaisių plantacijos
-STR_INDUSTRY_NAME_FRUIT_PLANTATION.kam                          :{G=mot}vaisių plantacijai
-STR_INDUSTRY_NAME_FRUIT_PLANTATION.ka                           :{G=mot}vaisių plantaciją
-STR_INDUSTRY_NAME_FRUIT_PLANTATION.kuo                          :{G=mot}vaisių plantacija
-STR_INDUSTRY_NAME_FRUIT_PLANTATION.kur                          :{G=mot}vaisių plantacijoje
-STR_INDUSTRY_NAME_FRUIT_PLANTATION.kreip                        :{G=mot}vaisių plantacija
+STR_INDUSTRY_NAME_FRUIT_PLANTATION.kas                          :vaisių plantacija
+STR_INDUSTRY_NAME_FRUIT_PLANTATION.ko                           :vaisių plantacijos
+STR_INDUSTRY_NAME_FRUIT_PLANTATION.kam                          :vaisių plantacijai
+STR_INDUSTRY_NAME_FRUIT_PLANTATION.ka                           :vaisių plantaciją
+STR_INDUSTRY_NAME_FRUIT_PLANTATION.kuo                          :vaisių plantacija
+STR_INDUSTRY_NAME_FRUIT_PLANTATION.kur                          :vaisių plantacijoje
+STR_INDUSTRY_NAME_FRUIT_PLANTATION.kreip                        :vaisių plantacija
 STR_INDUSTRY_NAME_RUBBER_PLANTATION                             :{G=mot}kaučiukmedžių plantacija
-STR_INDUSTRY_NAME_RUBBER_PLANTATION.kas                         :{G=mot}kaučiukmedžių plantacija
-STR_INDUSTRY_NAME_RUBBER_PLANTATION.ko                          :{G=mot}kaučiukmedžių plantacijos
-STR_INDUSTRY_NAME_RUBBER_PLANTATION.kam                         :{G=mot}kaučiukmedžių plantacijai
-STR_INDUSTRY_NAME_RUBBER_PLANTATION.ka                          :{G=mot}kaučiukmedžių plantaciją
-STR_INDUSTRY_NAME_RUBBER_PLANTATION.kuo                         :{G=mot}kaučiukmedžių plantacija
-STR_INDUSTRY_NAME_RUBBER_PLANTATION.kur                         :{G=mot}kaučiukmedžių plantacijoje
-STR_INDUSTRY_NAME_RUBBER_PLANTATION.kreip                       :{G=mot}kaučiukmedžių plantacija
+STR_INDUSTRY_NAME_RUBBER_PLANTATION.kas                         :kaučiukmedžių plantacija
+STR_INDUSTRY_NAME_RUBBER_PLANTATION.ko                          :kaučiukmedžių plantacijos
+STR_INDUSTRY_NAME_RUBBER_PLANTATION.kam                         :kaučiukmedžių plantacijai
+STR_INDUSTRY_NAME_RUBBER_PLANTATION.ka                          :kaučiukmedžių plantaciją
+STR_INDUSTRY_NAME_RUBBER_PLANTATION.kuo                         :kaučiukmedžių plantacija
+STR_INDUSTRY_NAME_RUBBER_PLANTATION.kur                         :kaučiukmedžių plantacijoje
+STR_INDUSTRY_NAME_RUBBER_PLANTATION.kreip                       :kaučiukmedžių plantacija
 STR_INDUSTRY_NAME_WATER_SUPPLY                                  :{G=vyr}vandens gręžinys
-STR_INDUSTRY_NAME_WATER_SUPPLY.kas                              :{G=vyr}vandens gręžinys
-STR_INDUSTRY_NAME_WATER_SUPPLY.ko                               :{G=vyr}vandens gręžinio
-STR_INDUSTRY_NAME_WATER_SUPPLY.kam                              :{G=vyr}vandens gręžiniui
-STR_INDUSTRY_NAME_WATER_SUPPLY.ka                               :{G=vyr}vandens gręžinį
-STR_INDUSTRY_NAME_WATER_SUPPLY.kuo                              :{G=vyr}vandens gręžiniu
-STR_INDUSTRY_NAME_WATER_SUPPLY.kur                              :{G=vyr}vandens gręžinyje
-STR_INDUSTRY_NAME_WATER_SUPPLY.kreip                            :{G=vyr}vandens gręžiny
+STR_INDUSTRY_NAME_WATER_SUPPLY.kas                              :vandens gręžinys
+STR_INDUSTRY_NAME_WATER_SUPPLY.ko                               :vandens gręžinio
+STR_INDUSTRY_NAME_WATER_SUPPLY.kam                              :vandens gręžiniui
+STR_INDUSTRY_NAME_WATER_SUPPLY.ka                               :vandens gręžinį
+STR_INDUSTRY_NAME_WATER_SUPPLY.kuo                              :vandens gręžiniu
+STR_INDUSTRY_NAME_WATER_SUPPLY.kur                              :vandens gręžinyje
+STR_INDUSTRY_NAME_WATER_SUPPLY.kreip                            :vandens gręžiny
 STR_INDUSTRY_NAME_WATER_TOWER                                   :{G=vyr}vandentiekio bokštas
-STR_INDUSTRY_NAME_WATER_TOWER.kas                               :{G=vyr}vandentiekio bokštas
-STR_INDUSTRY_NAME_WATER_TOWER.ko                                :{G=vyr}vandentiekio bokšto
-STR_INDUSTRY_NAME_WATER_TOWER.kam                               :{G=vyr}vandentiekio bokštui
-STR_INDUSTRY_NAME_WATER_TOWER.ka                                :{G=vyr}vandentiekio bokštą
-STR_INDUSTRY_NAME_WATER_TOWER.kuo                               :{G=vyr}vandentiekio bokštu
-STR_INDUSTRY_NAME_WATER_TOWER.kur                               :{G=vyr}vandentiekio bokšte
-STR_INDUSTRY_NAME_WATER_TOWER.kreip                             :{G=vyr}vandentiekio bokšte
+STR_INDUSTRY_NAME_WATER_TOWER.kas                               :vandentiekio bokštas
+STR_INDUSTRY_NAME_WATER_TOWER.ko                                :vandentiekio bokšto
+STR_INDUSTRY_NAME_WATER_TOWER.kam                               :vandentiekio bokštui
+STR_INDUSTRY_NAME_WATER_TOWER.ka                                :vandentiekio bokštą
+STR_INDUSTRY_NAME_WATER_TOWER.kuo                               :vandentiekio bokštu
+STR_INDUSTRY_NAME_WATER_TOWER.kur                               :vandentiekio bokšte
+STR_INDUSTRY_NAME_WATER_TOWER.kreip                             :vandentiekio bokšte
 STR_INDUSTRY_NAME_FACTORY_2                                     :{G=mot}gamykla
-STR_INDUSTRY_NAME_FACTORY_2.kas                                 :{G=mot}gamykla
-STR_INDUSTRY_NAME_FACTORY_2.ko                                  :{G=mot}gamyklos
-STR_INDUSTRY_NAME_FACTORY_2.kam                                 :{G=mot}gamyklai
-STR_INDUSTRY_NAME_FACTORY_2.ka                                  :{G=mot}gamyklą
-STR_INDUSTRY_NAME_FACTORY_2.kuo                                 :{G=mot}gamykla
-STR_INDUSTRY_NAME_FACTORY_2.kur                                 :{G=mot}gamykloje
-STR_INDUSTRY_NAME_FACTORY_2.kreip                               :{G=mot}gamykla
+STR_INDUSTRY_NAME_FACTORY_2.kas                                 :gamykla
+STR_INDUSTRY_NAME_FACTORY_2.ko                                  :gamyklos
+STR_INDUSTRY_NAME_FACTORY_2.kam                                 :gamyklai
+STR_INDUSTRY_NAME_FACTORY_2.ka                                  :gamyklą
+STR_INDUSTRY_NAME_FACTORY_2.kuo                                 :gamykla
+STR_INDUSTRY_NAME_FACTORY_2.kur                                 :gamykloje
+STR_INDUSTRY_NAME_FACTORY_2.kreip                               :gamykla
 STR_INDUSTRY_NAME_FARM_2                                        :{G=vyr}ūkis
-STR_INDUSTRY_NAME_FARM_2.kas                                    :{G=vyr}ūkis
-STR_INDUSTRY_NAME_FARM_2.ko                                     :{G=vyr}ūkio
-STR_INDUSTRY_NAME_FARM_2.kam                                    :{G=vyr}ūkiui
-STR_INDUSTRY_NAME_FARM_2.ka                                     :{G=vyr}ūkį
-STR_INDUSTRY_NAME_FARM_2.kuo                                    :{G=vyr}ūkiu
-STR_INDUSTRY_NAME_FARM_2.kur                                    :{G=vyr}ūkyje
-STR_INDUSTRY_NAME_FARM_2.kreip                                  :{G=vyr}ūki
+STR_INDUSTRY_NAME_FARM_2.kas                                    :ūkis
+STR_INDUSTRY_NAME_FARM_2.ko                                     :ūkio
+STR_INDUSTRY_NAME_FARM_2.kam                                    :ūkiui
+STR_INDUSTRY_NAME_FARM_2.ka                                     :ūkį
+STR_INDUSTRY_NAME_FARM_2.kuo                                    :ūkiu
+STR_INDUSTRY_NAME_FARM_2.kur                                    :ūkyje
+STR_INDUSTRY_NAME_FARM_2.kreip                                  :ūki
 STR_INDUSTRY_NAME_LUMBER_MILL                                   :{G=mot}lentpjūvė
-STR_INDUSTRY_NAME_LUMBER_MILL.kas                               :{G=mot}lentpjūvė
-STR_INDUSTRY_NAME_LUMBER_MILL.ko                                :{G=mot}lentpjūvės
-STR_INDUSTRY_NAME_LUMBER_MILL.kam                               :{G=mot}lentpjūvei
-STR_INDUSTRY_NAME_LUMBER_MILL.ka                                :{G=mot}lentpjūvę
-STR_INDUSTRY_NAME_LUMBER_MILL.kuo                               :{G=mot}lentpjūve
-STR_INDUSTRY_NAME_LUMBER_MILL.kur                               :{G=mot}lentpjūvėje
-STR_INDUSTRY_NAME_LUMBER_MILL.kreip                             :{G=mot}lentpjūve
+STR_INDUSTRY_NAME_LUMBER_MILL.kas                               :lentpjūvė
+STR_INDUSTRY_NAME_LUMBER_MILL.ko                                :lentpjūvės
+STR_INDUSTRY_NAME_LUMBER_MILL.kam                               :lentpjūvei
+STR_INDUSTRY_NAME_LUMBER_MILL.ka                                :lentpjūvę
+STR_INDUSTRY_NAME_LUMBER_MILL.kuo                               :lentpjūve
+STR_INDUSTRY_NAME_LUMBER_MILL.kur                               :lentpjūvėje
+STR_INDUSTRY_NAME_LUMBER_MILL.kreip                             :lentpjūve
 STR_INDUSTRY_NAME_COTTON_CANDY_FOREST                           :{G=vyr}ledinukų miškas
-STR_INDUSTRY_NAME_COTTON_CANDY_FOREST.kas                       :{G=vyr}ledinukų miškas
-STR_INDUSTRY_NAME_COTTON_CANDY_FOREST.ko                        :{G=vyr}ledinukų miško
-STR_INDUSTRY_NAME_COTTON_CANDY_FOREST.kam                       :{G=vyr}ledinukų miškui
-STR_INDUSTRY_NAME_COTTON_CANDY_FOREST.ka                        :{G=vyr}ledinukų mišką
-STR_INDUSTRY_NAME_COTTON_CANDY_FOREST.kuo                       :{G=vyr}ledinukų mišku
-STR_INDUSTRY_NAME_COTTON_CANDY_FOREST.kur                       :{G=vyr}ledinukų miške
-STR_INDUSTRY_NAME_COTTON_CANDY_FOREST.kreip                     :{G=vyr}ledinukų miške
+STR_INDUSTRY_NAME_COTTON_CANDY_FOREST.kas                       :ledinukų miškas
+STR_INDUSTRY_NAME_COTTON_CANDY_FOREST.ko                        :ledinukų miško
+STR_INDUSTRY_NAME_COTTON_CANDY_FOREST.kam                       :ledinukų miškui
+STR_INDUSTRY_NAME_COTTON_CANDY_FOREST.ka                        :ledinukų mišką
+STR_INDUSTRY_NAME_COTTON_CANDY_FOREST.kuo                       :ledinukų mišku
+STR_INDUSTRY_NAME_COTTON_CANDY_FOREST.kur                       :ledinukų miške
+STR_INDUSTRY_NAME_COTTON_CANDY_FOREST.kreip                     :ledinukų miške
 STR_INDUSTRY_NAME_CANDY_FACTORY                                 :{G=vyr}saldumynų fabrikas
-STR_INDUSTRY_NAME_CANDY_FACTORY.kas                             :{G=vyr}saldumynų fabrikas
-STR_INDUSTRY_NAME_CANDY_FACTORY.ko                              :{G=vyr}saldumynų fabriko
-STR_INDUSTRY_NAME_CANDY_FACTORY.kam                             :{G=vyr}saldumynų fabrikui
-STR_INDUSTRY_NAME_CANDY_FACTORY.ka                              :{G=vyr}saldumynų fabriką
-STR_INDUSTRY_NAME_CANDY_FACTORY.kuo                             :{G=vyr}saldumynų fabriku
-STR_INDUSTRY_NAME_CANDY_FACTORY.kur                             :{G=vyr}saldumynų fabrike
-STR_INDUSTRY_NAME_CANDY_FACTORY.kreip                           :{G=vyr}saldumynų fabrike
+STR_INDUSTRY_NAME_CANDY_FACTORY.kas                             :saldumynų fabrikas
+STR_INDUSTRY_NAME_CANDY_FACTORY.ko                              :saldumynų fabriko
+STR_INDUSTRY_NAME_CANDY_FACTORY.kam                             :saldumynų fabrikui
+STR_INDUSTRY_NAME_CANDY_FACTORY.ka                              :saldumynų fabriką
+STR_INDUSTRY_NAME_CANDY_FACTORY.kuo                             :saldumynų fabriku
+STR_INDUSTRY_NAME_CANDY_FACTORY.kur                             :saldumynų fabrike
+STR_INDUSTRY_NAME_CANDY_FACTORY.kreip                           :saldumynų fabrike
 STR_INDUSTRY_NAME_BATTERY_FARM                                  :{G=vyr}baterijų ūkis
-STR_INDUSTRY_NAME_BATTERY_FARM.kas                              :{G=vyr}baterijų ūkis
-STR_INDUSTRY_NAME_BATTERY_FARM.ko                               :{G=vyr}baterijų ūkio
-STR_INDUSTRY_NAME_BATTERY_FARM.kam                              :{G=vyr}baterijų ūkiui
-STR_INDUSTRY_NAME_BATTERY_FARM.ka                               :{G=vyr}baterijų ūkį
-STR_INDUSTRY_NAME_BATTERY_FARM.kuo                              :{G=vyr}baterijų ūkiu
-STR_INDUSTRY_NAME_BATTERY_FARM.kur                              :{G=vyr}baterijų ūkyje
-STR_INDUSTRY_NAME_BATTERY_FARM.kreip                            :{G=vyr}baterijų ūki
+STR_INDUSTRY_NAME_BATTERY_FARM.kas                              :baterijų ūkis
+STR_INDUSTRY_NAME_BATTERY_FARM.ko                               :baterijų ūkio
+STR_INDUSTRY_NAME_BATTERY_FARM.kam                              :baterijų ūkiui
+STR_INDUSTRY_NAME_BATTERY_FARM.ka                               :baterijų ūkį
+STR_INDUSTRY_NAME_BATTERY_FARM.kuo                              :baterijų ūkiu
+STR_INDUSTRY_NAME_BATTERY_FARM.kur                              :baterijų ūkyje
+STR_INDUSTRY_NAME_BATTERY_FARM.kreip                            :baterijų ūki
 STR_INDUSTRY_NAME_COLA_WELLS                                    :{G=vyr}kolos šulinys
-STR_INDUSTRY_NAME_COLA_WELLS.kas                                :{G=vyr}kolos šulinys
-STR_INDUSTRY_NAME_COLA_WELLS.ko                                 :{G=vyr}kolos šulinio
-STR_INDUSTRY_NAME_COLA_WELLS.kam                                :{G=vyr}kolos šuliniui
-STR_INDUSTRY_NAME_COLA_WELLS.ka                                 :{G=vyr}kolos šulinį
-STR_INDUSTRY_NAME_COLA_WELLS.kuo                                :{G=vyr}kolos šuliniu
-STR_INDUSTRY_NAME_COLA_WELLS.kur                                :{G=vyr}kolos šulinyje
-STR_INDUSTRY_NAME_COLA_WELLS.kreip                              :{G=vyr}kolos šuliny
+STR_INDUSTRY_NAME_COLA_WELLS.kas                                :kolos šulinys
+STR_INDUSTRY_NAME_COLA_WELLS.ko                                 :kolos šulinio
+STR_INDUSTRY_NAME_COLA_WELLS.kam                                :kolos šuliniui
+STR_INDUSTRY_NAME_COLA_WELLS.ka                                 :kolos šulinį
+STR_INDUSTRY_NAME_COLA_WELLS.kuo                                :kolos šuliniu
+STR_INDUSTRY_NAME_COLA_WELLS.kur                                :kolos šulinyje
+STR_INDUSTRY_NAME_COLA_WELLS.kreip                              :kolos šuliny
 STR_INDUSTRY_NAME_TOY_SHOP                                      :{G=mot}žaislų parduotuvė
-STR_INDUSTRY_NAME_TOY_SHOP.kas                                  :{G=mot}žaislų parduotuvė
-STR_INDUSTRY_NAME_TOY_SHOP.ko                                   :{G=mot}žaislų parduotuvės
-STR_INDUSTRY_NAME_TOY_SHOP.kam                                  :{G=mot}žaislų parduotuvei
-STR_INDUSTRY_NAME_TOY_SHOP.ka                                   :{G=mot}žaislų parduotuvę
-STR_INDUSTRY_NAME_TOY_SHOP.kuo                                  :{G=mot}žaislų parduotuve
-STR_INDUSTRY_NAME_TOY_SHOP.kur                                  :{G=mot}žaislų parduotuvėje
-STR_INDUSTRY_NAME_TOY_SHOP.kreip                                :{G=mot}žaislų parduotuve
+STR_INDUSTRY_NAME_TOY_SHOP.kas                                  :žaislų parduotuvė
+STR_INDUSTRY_NAME_TOY_SHOP.ko                                   :žaislų parduotuvės
+STR_INDUSTRY_NAME_TOY_SHOP.kam                                  :žaislų parduotuvei
+STR_INDUSTRY_NAME_TOY_SHOP.ka                                   :žaislų parduotuvę
+STR_INDUSTRY_NAME_TOY_SHOP.kuo                                  :žaislų parduotuve
+STR_INDUSTRY_NAME_TOY_SHOP.kur                                  :žaislų parduotuvėje
+STR_INDUSTRY_NAME_TOY_SHOP.kreip                                :žaislų parduotuve
 STR_INDUSTRY_NAME_TOY_FACTORY                                   :{G=vyr}žaislų fabrikas
-STR_INDUSTRY_NAME_TOY_FACTORY.kas                               :{G=vyr}žaislų fabrikas
-STR_INDUSTRY_NAME_TOY_FACTORY.ko                                :{G=vyr}žaislų fabriko
-STR_INDUSTRY_NAME_TOY_FACTORY.kam                               :{G=vyr}žaislų fabrikui
-STR_INDUSTRY_NAME_TOY_FACTORY.ka                                :{G=vyr}žaislų fabriką
-STR_INDUSTRY_NAME_TOY_FACTORY.kuo                               :{G=vyr}žaislų fabriku
-STR_INDUSTRY_NAME_TOY_FACTORY.kur                               :{G=vyr}žaislų fabrike
-STR_INDUSTRY_NAME_TOY_FACTORY.kreip                             :{G=vyr}žaislų fabrike
+STR_INDUSTRY_NAME_TOY_FACTORY.kas                               :žaislų fabrikas
+STR_INDUSTRY_NAME_TOY_FACTORY.ko                                :žaislų fabriko
+STR_INDUSTRY_NAME_TOY_FACTORY.kam                               :žaislų fabrikui
+STR_INDUSTRY_NAME_TOY_FACTORY.ka                                :žaislų fabriką
+STR_INDUSTRY_NAME_TOY_FACTORY.kuo                               :žaislų fabriku
+STR_INDUSTRY_NAME_TOY_FACTORY.kur                               :žaislų fabrike
+STR_INDUSTRY_NAME_TOY_FACTORY.kreip                             :žaislų fabrike
 STR_INDUSTRY_NAME_PLASTIC_FOUNTAINS                             :{G=vyr}plastiko fontanai
-STR_INDUSTRY_NAME_PLASTIC_FOUNTAINS.kas                         :{G=vyr}plastiko fontanai
-STR_INDUSTRY_NAME_PLASTIC_FOUNTAINS.ko                          :{G=vyr}plastiko fontanų
-STR_INDUSTRY_NAME_PLASTIC_FOUNTAINS.kam                         :{G=vyr}plastiko fontanams
-STR_INDUSTRY_NAME_PLASTIC_FOUNTAINS.ka                          :{G=vyr}plastiko fontanus
-STR_INDUSTRY_NAME_PLASTIC_FOUNTAINS.kuo                         :{G=vyr}plastiko fontanais
-STR_INDUSTRY_NAME_PLASTIC_FOUNTAINS.kur                         :{G=vyr}plastiko fontanuose
-STR_INDUSTRY_NAME_PLASTIC_FOUNTAINS.kreip                       :{G=vyr}plastiko fontanai
+STR_INDUSTRY_NAME_PLASTIC_FOUNTAINS.kas                         :plastiko fontanai
+STR_INDUSTRY_NAME_PLASTIC_FOUNTAINS.ko                          :plastiko fontanų
+STR_INDUSTRY_NAME_PLASTIC_FOUNTAINS.kam                         :plastiko fontanams
+STR_INDUSTRY_NAME_PLASTIC_FOUNTAINS.ka                          :plastiko fontanus
+STR_INDUSTRY_NAME_PLASTIC_FOUNTAINS.kuo                         :plastiko fontanais
+STR_INDUSTRY_NAME_PLASTIC_FOUNTAINS.kur                         :plastiko fontanuose
+STR_INDUSTRY_NAME_PLASTIC_FOUNTAINS.kreip                       :plastiko fontanai
 STR_INDUSTRY_NAME_FIZZY_DRINK_FACTORY                           :{G=mot}putojančių gėrimų gamykla
-STR_INDUSTRY_NAME_FIZZY_DRINK_FACTORY.kas                       :{G=mot}putojančių gėrimų gamykla
-STR_INDUSTRY_NAME_FIZZY_DRINK_FACTORY.ko                        :{G=mot}putojančių gėrimų gamyklos
-STR_INDUSTRY_NAME_FIZZY_DRINK_FACTORY.kam                       :{G=mot}putojančių gėrimų gamyklai
-STR_INDUSTRY_NAME_FIZZY_DRINK_FACTORY.ka                        :{G=mot}putojančių gėrimų gamyklą
-STR_INDUSTRY_NAME_FIZZY_DRINK_FACTORY.kuo                       :{G=mot}putojančių gėrimų gamykla
-STR_INDUSTRY_NAME_FIZZY_DRINK_FACTORY.kur                       :{G=mot}putojančių gėrimų gamykloje
-STR_INDUSTRY_NAME_FIZZY_DRINK_FACTORY.kreip                     :{G=mot}putojančių gėrimų gamykla
+STR_INDUSTRY_NAME_FIZZY_DRINK_FACTORY.kas                       :putojančių gėrimų gamykla
+STR_INDUSTRY_NAME_FIZZY_DRINK_FACTORY.ko                        :putojančių gėrimų gamyklos
+STR_INDUSTRY_NAME_FIZZY_DRINK_FACTORY.kam                       :putojančių gėrimų gamyklai
+STR_INDUSTRY_NAME_FIZZY_DRINK_FACTORY.ka                        :putojančių gėrimų gamyklą
+STR_INDUSTRY_NAME_FIZZY_DRINK_FACTORY.kuo                       :putojančių gėrimų gamykla
+STR_INDUSTRY_NAME_FIZZY_DRINK_FACTORY.kur                       :putojančių gėrimų gamykloje
+STR_INDUSTRY_NAME_FIZZY_DRINK_FACTORY.kreip                     :putojančių gėrimų gamykla
 STR_INDUSTRY_NAME_BUBBLE_GENERATOR                              :{G=vyr}burbulų generatorius
-STR_INDUSTRY_NAME_BUBBLE_GENERATOR.kas                          :{G=vyr}burbulų generatorius
-STR_INDUSTRY_NAME_BUBBLE_GENERATOR.ko                           :{G=vyr}burbulų generatoriaus
-STR_INDUSTRY_NAME_BUBBLE_GENERATOR.kam                          :{G=vyr}burbulų generatoriui
-STR_INDUSTRY_NAME_BUBBLE_GENERATOR.ka                           :{G=vyr}burbulų generatorius
-STR_INDUSTRY_NAME_BUBBLE_GENERATOR.kuo                          :{G=vyr}burbulų generatoriais
-STR_INDUSTRY_NAME_BUBBLE_GENERATOR.kur                          :{G=vyr}burbulų generatoriuose
-STR_INDUSTRY_NAME_BUBBLE_GENERATOR.kreip                        :{G=vyr}burbulų generatoriau
+STR_INDUSTRY_NAME_BUBBLE_GENERATOR.kas                          :burbulų generatorius
+STR_INDUSTRY_NAME_BUBBLE_GENERATOR.ko                           :burbulų generatoriaus
+STR_INDUSTRY_NAME_BUBBLE_GENERATOR.kam                          :burbulų generatoriui
+STR_INDUSTRY_NAME_BUBBLE_GENERATOR.ka                           :burbulų generatorius
+STR_INDUSTRY_NAME_BUBBLE_GENERATOR.kuo                          :burbulų generatoriais
+STR_INDUSTRY_NAME_BUBBLE_GENERATOR.kur                          :burbulų generatoriuose
+STR_INDUSTRY_NAME_BUBBLE_GENERATOR.kreip                        :burbulų generatoriau
 STR_INDUSTRY_NAME_TOFFEE_QUARRY                                 :{G=vyr}saldainių fabrikas
-STR_INDUSTRY_NAME_TOFFEE_QUARRY.kas                             :{G=vyr}saldainių fabrikas
-STR_INDUSTRY_NAME_TOFFEE_QUARRY.ko                              :{G=vyr}saldainių fabriko
-STR_INDUSTRY_NAME_TOFFEE_QUARRY.kam                             :{G=vyr}saldainių fabrikui
-STR_INDUSTRY_NAME_TOFFEE_QUARRY.ka                              :{G=vyr}saldainių fabriką
-STR_INDUSTRY_NAME_TOFFEE_QUARRY.kuo                             :{G=vyr}saldainių fabriku
-STR_INDUSTRY_NAME_TOFFEE_QUARRY.kur                             :{G=vyr}saldainių fabrike
-STR_INDUSTRY_NAME_TOFFEE_QUARRY.kreip                           :{G=vyr}saldainių fabrike
+STR_INDUSTRY_NAME_TOFFEE_QUARRY.kas                             :saldainių fabrikas
+STR_INDUSTRY_NAME_TOFFEE_QUARRY.ko                              :saldainių fabriko
+STR_INDUSTRY_NAME_TOFFEE_QUARRY.kam                             :saldainių fabrikui
+STR_INDUSTRY_NAME_TOFFEE_QUARRY.ka                              :saldainių fabriką
+STR_INDUSTRY_NAME_TOFFEE_QUARRY.kuo                             :saldainių fabriku
+STR_INDUSTRY_NAME_TOFFEE_QUARRY.kur                             :saldainių fabrike
+STR_INDUSTRY_NAME_TOFFEE_QUARRY.kreip                           :saldainių fabrike
 STR_INDUSTRY_NAME_SUGAR_MINE                                    :{G=mot}cukraus kasykla
-STR_INDUSTRY_NAME_SUGAR_MINE.kas                                :{G=mot}cukraus kasykla
-STR_INDUSTRY_NAME_SUGAR_MINE.ko                                 :{G=mot}cukraus kasyklos
-STR_INDUSTRY_NAME_SUGAR_MINE.kam                                :{G=mot}cukraus kasyklai
-STR_INDUSTRY_NAME_SUGAR_MINE.ka                                 :{G=mot}cukraus kasyklą
-STR_INDUSTRY_NAME_SUGAR_MINE.kuo                                :{G=mot}cukraus kasykla
-STR_INDUSTRY_NAME_SUGAR_MINE.kur                                :{G=mot}cukraus kasykloje
-STR_INDUSTRY_NAME_SUGAR_MINE.kreip                              :{G=mot}cukraus kasykla
+STR_INDUSTRY_NAME_SUGAR_MINE.kas                                :cukraus kasykla
+STR_INDUSTRY_NAME_SUGAR_MINE.ko                                 :cukraus kasyklos
+STR_INDUSTRY_NAME_SUGAR_MINE.kam                                :cukraus kasyklai
+STR_INDUSTRY_NAME_SUGAR_MINE.ka                                 :cukraus kasyklą
+STR_INDUSTRY_NAME_SUGAR_MINE.kuo                                :cukraus kasykla
+STR_INDUSTRY_NAME_SUGAR_MINE.kur                                :cukraus kasykloje
+STR_INDUSTRY_NAME_SUGAR_MINE.kreip                              :cukraus kasykla
 
 ############ WARNING, using range 0x6000 for strings that are stored in the savegame
 ############ These strings may never get a new id, or savegames will break!
diff --git a/src/lang/polish.txt b/src/lang/polish.txt
index 6f8774e01..f6a829478 100644
--- a/src/lang/polish.txt
+++ b/src/lang/polish.txt
@@ -1108,7 +1108,7 @@ STR_SMALLMAP_LEGENDA_SHIPS                                      :{TINY_FONT}{BLA
 STR_SMALLMAP_LEGENDA_AIRCRAFT                                   :{TINY_FONT}{BLACK}Samoloty
 STR_SMALLMAP_LEGENDA_TRANSPORT_ROUTES                           :{TINY_FONT}{BLACK}Trasy transportowe
 STR_SMALLMAP_LEGENDA_FOREST                                     :{G=m}{TINY_FONT}{BLACK}Las
-STR_SMALLMAP_LEGENDA_FOREST.d                                   :{G=m}{TINY_FONT}{BLACK}Lasu
+STR_SMALLMAP_LEGENDA_FOREST.d                                   :{TINY_FONT}{BLACK}Lasu
 STR_SMALLMAP_LEGENDA_RAILROAD_STATION                           :{TINY_FONT}{BLACK}Stacja kolejowa
 STR_SMALLMAP_LEGENDA_TRUCK_LOADING_BAY                          :{TINY_FONT}{BLACK}Załadunek ciężarówek
 STR_SMALLMAP_LEGENDA_BUS_STATION                                :{TINY_FONT}{BLACK}Przystanek
@@ -3899,17 +3899,17 @@ STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}Sprzeda
 STR_ENGINE_PREVIEW_CAPTION                                      :{WHITE}Wiadomość od producenta pojazdów
 STR_ENGINE_PREVIEW_MESSAGE                                      :{GOLD}Właśnie zaprojektowaliśmy now{G y ą e} {STRING.b} - czy jesteś zainteresowany w rocznej wyłączności na użycie tego pojazdu, żebyśmy mogli zobaczyć przed wypuszczeniem na rynek jak się sprawuje?
 STR_ENGINE_PREVIEW_RAILROAD_LOCOMOTIVE                          :{G=f}lokomotywa
-STR_ENGINE_PREVIEW_RAILROAD_LOCOMOTIVE.b                        :{G=f}lokomotywę
+STR_ENGINE_PREVIEW_RAILROAD_LOCOMOTIVE.b                        :lokomotywę
 STR_ENGINE_PREVIEW_ROAD_VEHICLE                                 :{G=m}pojazd
-STR_ENGINE_PREVIEW_ROAD_VEHICLE.b                               :{G=m}pojazd
+STR_ENGINE_PREVIEW_ROAD_VEHICLE.b                               :pojazd
 STR_ENGINE_PREVIEW_AIRCRAFT                                     :{G=m}samolot
-STR_ENGINE_PREVIEW_AIRCRAFT.b                                   :{G=m}samolot
+STR_ENGINE_PREVIEW_AIRCRAFT.b                                   :samolot
 STR_ENGINE_PREVIEW_SHIP                                         :{G=m}statek
-STR_ENGINE_PREVIEW_SHIP.b                                       :{G=m}statek
+STR_ENGINE_PREVIEW_SHIP.b                                       :statek
 STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE                          :{G=f}lokomotywa jednoszynowa
-STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE.b                        :{G=f}lokomotywę jednoszynową
+STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE.b                        :lokomotywę jednoszynową
 STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE                            :{G=f}lokomotywa Maglev
-STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE.b                          :{G=f}lokomotywę Maglev
+STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE.b                          :lokomotywę Maglev
 
 STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER                      :{BLACK}Koszt: {CURRENCY_LONG} Masa: {WEIGHT_SHORT}{}Prędkość: {VELOCITY}  Moc: {POWER}{}Koszt utrzymania: {CURRENCY_LONG}/rok{}Ładowność: {CARGO_LONG}
 STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER_MAX_TE               :{BLACK}Koszt: {CURRENCY_LONG} Masa: {WEIGHT_SHORT}{}Prędkość: {VELOCITY}  Moc: {POWER}  Maksymalna siła pociągowa: {6:FORCE}{}Koszt utrzymania: {4:CURRENCY_LONG}/rok{}Ładowność: {5:CARGO_LONG}
@@ -4898,79 +4898,79 @@ STR_TOWN_BUILDING_NAME_PIGGY_BANK_1                             :Świnka-skarbon
 ##id 0x4800
 # industry names
 STR_INDUSTRY_NAME_COAL_MINE                                     :{G=f}Kopalnia węgla
-STR_INDUSTRY_NAME_COAL_MINE.d                                   :{G=f}kopalni węgla
+STR_INDUSTRY_NAME_COAL_MINE.d                                   :kopalni węgla
 STR_INDUSTRY_NAME_POWER_STATION                                 :{G=f}Elektrownia
-STR_INDUSTRY_NAME_POWER_STATION.d                               :{G=f}elektrowni
+STR_INDUSTRY_NAME_POWER_STATION.d                               :elektrowni
 STR_INDUSTRY_NAME_SAWMILL                                       :{G=m}Tartak
-STR_INDUSTRY_NAME_SAWMILL.d                                     :{G=m}tartaku
+STR_INDUSTRY_NAME_SAWMILL.d                                     :tartaku
 STR_INDUSTRY_NAME_FOREST                                        :{G=m}Las
-STR_INDUSTRY_NAME_FOREST.d                                      :{G=m}lasu
+STR_INDUSTRY_NAME_FOREST.d                                      :lasu
 STR_INDUSTRY_NAME_OIL_REFINERY                                  :{G=f}Rafineria
-STR_INDUSTRY_NAME_OIL_REFINERY.d                                :{G=f}rafinerii
+STR_INDUSTRY_NAME_OIL_REFINERY.d                                :rafinerii
 STR_INDUSTRY_NAME_OIL_RIG                                       :{G=f}Platforma wiertnicza
-STR_INDUSTRY_NAME_OIL_RIG.d                                     :{G=f}platformy wiertniczej
+STR_INDUSTRY_NAME_OIL_RIG.d                                     :platformy wiertniczej
 STR_INDUSTRY_NAME_FACTORY                                       :{G=f}Fabryka
-STR_INDUSTRY_NAME_FACTORY.d                                     :{G=f}fabryki
+STR_INDUSTRY_NAME_FACTORY.d                                     :fabryki
 STR_INDUSTRY_NAME_PRINTING_WORKS                                :{G=f}Drukarnia
-STR_INDUSTRY_NAME_PRINTING_WORKS.d                              :{G=f}drukarni
+STR_INDUSTRY_NAME_PRINTING_WORKS.d                              :drukarni
 STR_INDUSTRY_NAME_STEEL_MILL                                    :{G=f}Huta
-STR_INDUSTRY_NAME_STEEL_MILL.d                                  :{G=f}huty
+STR_INDUSTRY_NAME_STEEL_MILL.d                                  :huty
 STR_INDUSTRY_NAME_FARM                                          :{G=f}Farma
-STR_INDUSTRY_NAME_FARM.d                                        :{G=f}farmy
+STR_INDUSTRY_NAME_FARM.d                                        :farmy
 STR_INDUSTRY_NAME_COPPER_ORE_MINE                               :{G=f}Kopalnia rudy miedzi
-STR_INDUSTRY_NAME_COPPER_ORE_MINE.d                             :{G=f}kopalni rudy miedzi
+STR_INDUSTRY_NAME_COPPER_ORE_MINE.d                             :kopalni rudy miedzi
 STR_INDUSTRY_NAME_OIL_WELLS                                     :{G=m}Pole naftowe
-STR_INDUSTRY_NAME_OIL_WELLS.d                                   :{G=m}pola naftowego
+STR_INDUSTRY_NAME_OIL_WELLS.d                                   :pola naftowego
 STR_INDUSTRY_NAME_BANK                                          :{G=m}Bank
-STR_INDUSTRY_NAME_BANK.d                                        :{G=m}banku
+STR_INDUSTRY_NAME_BANK.d                                        :banku
 STR_INDUSTRY_NAME_FOOD_PROCESSING_PLANT                         :{G=f}Przetwórnia żywności
-STR_INDUSTRY_NAME_FOOD_PROCESSING_PLANT.d                       :{G=f}przetwórni żywności
+STR_INDUSTRY_NAME_FOOD_PROCESSING_PLANT.d                       :przetwórni żywności
 STR_INDUSTRY_NAME_PAPER_MILL                                    :{G=m}Zakład papierniczy
-STR_INDUSTRY_NAME_PAPER_MILL.d                                  :{G=m}zakładu papierniczego
+STR_INDUSTRY_NAME_PAPER_MILL.d                                  :zakładu papierniczego
 STR_INDUSTRY_NAME_GOLD_MINE                                     :{G=f}Kopalnia złota
-STR_INDUSTRY_NAME_GOLD_MINE.d                                   :{G=f}kopalni złota
+STR_INDUSTRY_NAME_GOLD_MINE.d                                   :kopalni złota
 STR_INDUSTRY_NAME_BANK_TROPIC_ARCTIC                            :{G=m}Bank
-STR_INDUSTRY_NAME_BANK_TROPIC_ARCTIC.d                          :{G=m}banku
+STR_INDUSTRY_NAME_BANK_TROPIC_ARCTIC.d                          :banku
 STR_INDUSTRY_NAME_DIAMOND_MINE                                  :{G=f}Kopalnia diamentów
-STR_INDUSTRY_NAME_DIAMOND_MINE.d                                :{G=f}kopalni diamentów
+STR_INDUSTRY_NAME_DIAMOND_MINE.d                                :kopalni diamentów
 STR_INDUSTRY_NAME_IRON_ORE_MINE                                 :{G=f}Kopalnia rudy żelaza
-STR_INDUSTRY_NAME_IRON_ORE_MINE.d                               :{G=f}kopalni rudy żelaza
+STR_INDUSTRY_NAME_IRON_ORE_MINE.d                               :kopalni rudy żelaza
 STR_INDUSTRY_NAME_FRUIT_PLANTATION                              :{G=f}Plantacja owoców
-STR_INDUSTRY_NAME_FRUIT_PLANTATION.d                            :{G=f}plantacji owoców
+STR_INDUSTRY_NAME_FRUIT_PLANTATION.d                            :plantacji owoców
 STR_INDUSTRY_NAME_RUBBER_PLANTATION                             :{G=f}Plantacja kauczuku
-STR_INDUSTRY_NAME_RUBBER_PLANTATION.d                           :{G=f}plantacji kauczuku
+STR_INDUSTRY_NAME_RUBBER_PLANTATION.d                           :plantacji kauczuku
 STR_INDUSTRY_NAME_WATER_SUPPLY                                  :{G=n}Ujęcie wody
-STR_INDUSTRY_NAME_WATER_SUPPLY.d                                :{G=n}ujęcia wody
+STR_INDUSTRY_NAME_WATER_SUPPLY.d                                :ujęcia wody
 STR_INDUSTRY_NAME_WATER_TOWER                                   :{G=f}Wieża ciśnień
-STR_INDUSTRY_NAME_WATER_TOWER.d                                 :{G=f}wieży ciśnień
+STR_INDUSTRY_NAME_WATER_TOWER.d                                 :wieży ciśnień
 STR_INDUSTRY_NAME_FACTORY_2                                     :{G=f}Fabryka
-STR_INDUSTRY_NAME_FACTORY_2.d                                   :{G=f}fabryki
+STR_INDUSTRY_NAME_FACTORY_2.d                                   :fabryki
 STR_INDUSTRY_NAME_FARM_2                                        :{G=f}Farma
-STR_INDUSTRY_NAME_FARM_2.d                                      :{G=f}farmy
+STR_INDUSTRY_NAME_FARM_2.d                                      :farmy
 STR_INDUSTRY_NAME_LUMBER_MILL                                   :{G=m}Tartak
-STR_INDUSTRY_NAME_LUMBER_MILL.d                                 :{G=m}tartaku
+STR_INDUSTRY_NAME_LUMBER_MILL.d                                 :tartaku
 STR_INDUSTRY_NAME_COTTON_CANDY_FOREST                           :{G=m}Las waty cukrowej
-STR_INDUSTRY_NAME_COTTON_CANDY_FOREST.d                         :{G=m}lasu waty cukrowej
+STR_INDUSTRY_NAME_COTTON_CANDY_FOREST.d                         :lasu waty cukrowej
 STR_INDUSTRY_NAME_CANDY_FACTORY                                 :{G=m}Zakład cukierniczy
-STR_INDUSTRY_NAME_CANDY_FACTORY.d                               :{G=m}zakładu cukierniczego
+STR_INDUSTRY_NAME_CANDY_FACTORY.d                               :zakładu cukierniczego
 STR_INDUSTRY_NAME_BATTERY_FARM                                  :{G=f}Farma baterii
-STR_INDUSTRY_NAME_BATTERY_FARM.d                                :{G=f}farmy baterii
+STR_INDUSTRY_NAME_BATTERY_FARM.d                                :farmy baterii
 STR_INDUSTRY_NAME_COLA_WELLS                                    :{G=f}Studnia coli
-STR_INDUSTRY_NAME_COLA_WELLS.d                                  :{G=f}studni coli
+STR_INDUSTRY_NAME_COLA_WELLS.d                                  :studni coli
 STR_INDUSTRY_NAME_TOY_SHOP                                      :{G=m}Sklep z zabawkami
-STR_INDUSTRY_NAME_TOY_SHOP.d                                    :{G=m}sklepu z zabawkami
+STR_INDUSTRY_NAME_TOY_SHOP.d                                    :sklepu z zabawkami
 STR_INDUSTRY_NAME_TOY_FACTORY                                   :{G=f}Fabryka zabawek
-STR_INDUSTRY_NAME_TOY_FACTORY.d                                 :{G=f}fabryki zabawek
+STR_INDUSTRY_NAME_TOY_FACTORY.d                                 :fabryki zabawek
 STR_INDUSTRY_NAME_PLASTIC_FOUNTAINS                             :{G=f}Fontanny plastiku
-STR_INDUSTRY_NAME_PLASTIC_FOUNTAINS.d                           :{G=f}fontann plastiku
+STR_INDUSTRY_NAME_PLASTIC_FOUNTAINS.d                           :fontann plastiku
 STR_INDUSTRY_NAME_FIZZY_DRINK_FACTORY                           :{G=f}Fabryka napojów gazowanych
-STR_INDUSTRY_NAME_FIZZY_DRINK_FACTORY.d                         :{G=f}fabryki napojów gazowanych
+STR_INDUSTRY_NAME_FIZZY_DRINK_FACTORY.d                         :fabryki napojów gazowanych
 STR_INDUSTRY_NAME_BUBBLE_GENERATOR                              :{G=m}Generator bąbelków
-STR_INDUSTRY_NAME_BUBBLE_GENERATOR.d                            :{G=m}generatora bąbelków
+STR_INDUSTRY_NAME_BUBBLE_GENERATOR.d                            :generatora bąbelków
 STR_INDUSTRY_NAME_TOFFEE_QUARRY                                 :{G=f}Odkrywka toffi
-STR_INDUSTRY_NAME_TOFFEE_QUARRY.d                               :{G=f}odkrywkę toffi
+STR_INDUSTRY_NAME_TOFFEE_QUARRY.d                               :odkrywkę toffi
 STR_INDUSTRY_NAME_SUGAR_MINE                                    :{G=f}Kopalnia cukru
-STR_INDUSTRY_NAME_SUGAR_MINE.d                                  :{G=f}kopalni cukru
+STR_INDUSTRY_NAME_SUGAR_MINE.d                                  :kopalni cukru
 
 ############ WARNING, using range 0x6000 for strings that are stored in the savegame
 ############ These strings may never get a new id, or savegames will break!
diff --git a/src/lang/russian.txt b/src/lang/russian.txt
index 993c80996..23799175f 100644
--- a/src/lang/russian.txt
+++ b/src/lang/russian.txt
@@ -2387,29 +2387,29 @@ STR_CONTENT_NO_ZLIB_SUB                                         :{WHITE}... за
 
 # Order of these is important!
 STR_CONTENT_TYPE_BASE_GRAPHICS                                  :{G=m}Базовая графика
-STR_CONTENT_TYPE_BASE_GRAPHICS.gen                              :{G=m}набора базовой графики
-STR_CONTENT_TYPE_BASE_GRAPHICS.acc                              :{G=m}набор базовой графики
+STR_CONTENT_TYPE_BASE_GRAPHICS.gen                              :набора базовой графики
+STR_CONTENT_TYPE_BASE_GRAPHICS.acc                              :набор базовой графики
 STR_CONTENT_TYPE_NEWGRF                                         :{G=m}NewGRF
-STR_CONTENT_TYPE_NEWGRF.gen                                     :{G=m}NewGRF
-STR_CONTENT_TYPE_NEWGRF.acc                                     :{G=m}NewGRF
+STR_CONTENT_TYPE_NEWGRF.gen                                     :NewGRF
+STR_CONTENT_TYPE_NEWGRF.acc                                     :NewGRF
 STR_CONTENT_TYPE_AI                                             :{G=m}ИИ
-STR_CONTENT_TYPE_AI.gen                                         :{G=m}ИИ
-STR_CONTENT_TYPE_AI.acc                                         :{G=m}ИИ
+STR_CONTENT_TYPE_AI.gen                                         :ИИ
+STR_CONTENT_TYPE_AI.acc                                         :ИИ
 STR_CONTENT_TYPE_AI_LIBRARY                                     :{G=f}Библиотека ИИ
-STR_CONTENT_TYPE_AI_LIBRARY.gen                                 :{G=f}библиотеки ИИ
-STR_CONTENT_TYPE_AI_LIBRARY.acc                                 :{G=f}библиотеку ИИ
+STR_CONTENT_TYPE_AI_LIBRARY.gen                                 :библиотеки ИИ
+STR_CONTENT_TYPE_AI_LIBRARY.acc                                 :библиотеку ИИ
 STR_CONTENT_TYPE_SCENARIO                                       :{G=m}Сценарий
-STR_CONTENT_TYPE_SCENARIO.gen                                   :{G=m}сценария
-STR_CONTENT_TYPE_SCENARIO.acc                                   :{G=m}сценарий
+STR_CONTENT_TYPE_SCENARIO.gen                                   :сценария
+STR_CONTENT_TYPE_SCENARIO.acc                                   :сценарий
 STR_CONTENT_TYPE_HEIGHTMAP                                      :{G=f}Карта высот
-STR_CONTENT_TYPE_HEIGHTMAP.gen                                  :{G=f}карты высот
-STR_CONTENT_TYPE_HEIGHTMAP.acc                                  :{G=f}карту высот
+STR_CONTENT_TYPE_HEIGHTMAP.gen                                  :карты высот
+STR_CONTENT_TYPE_HEIGHTMAP.acc                                  :карту высот
 STR_CONTENT_TYPE_BASE_SOUNDS                                    :Основные звуки
-STR_CONTENT_TYPE_BASE_SOUNDS.gen                                :{G=m}набора базовых звуков
-STR_CONTENT_TYPE_BASE_SOUNDS.acc                                :{G=m}набор базовых звуков
+STR_CONTENT_TYPE_BASE_SOUNDS.gen                                :набора базовых звуков
+STR_CONTENT_TYPE_BASE_SOUNDS.acc                                :набор базовых звуков
 STR_CONTENT_TYPE_BASE_MUSIC                                     :{G=f}Музыка
-STR_CONTENT_TYPE_BASE_MUSIC.gen                                 :{G=f}музыки
-STR_CONTENT_TYPE_BASE_MUSIC.acc                                 :{G=f}музыку
+STR_CONTENT_TYPE_BASE_MUSIC.gen                                 :музыки
+STR_CONTENT_TYPE_BASE_MUSIC.acc                                 :музыку
 STR_CONTENT_TYPE_GAME_SCRIPT                                    :Игровой скрипт
 STR_CONTENT_TYPE_GS_LIBRARY                                     :Библиотека ИС
 
diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt
index deb39341f..b08ee64c5 100644
--- a/src/lang/slovak.txt
+++ b/src/lang/slovak.txt
@@ -750,7 +750,7 @@ STR_HIGHSCORE_TOP_COMPANIES_WHO_REACHED                         :{BIG_FONT}{BLAC
 STR_HIGHSCORE_TOP_COMPANIES_NETWORK_GAME                        :{BIG_FONT}{BLACK}Tabuľka spoločnosti v roku {NUM}
 STR_HIGHSCORE_POSITION                                          :{BIG_FONT}{BLACK}{COMMA}.
 STR_HIGHSCORE_PERFORMANCE_TITLE_BUSINESSMAN                     :{G=z}Obchodníčka
-STR_HIGHSCORE_PERFORMANCE_TITLE_BUSINESSMAN.g                   :{G=s}Obchodníci
+STR_HIGHSCORE_PERFORMANCE_TITLE_BUSINESSMAN.g                   :Obchodníci
 STR_HIGHSCORE_PERFORMANCE_TITLE_ENTREPRENEUR                    :{G=z}Podnikateľka
 STR_HIGHSCORE_PERFORMANCE_TITLE_INDUSTRIALIST                   :{G=m}Priemyselník
 STR_HIGHSCORE_PERFORMANCE_TITLE_CAPITALIST                      :{G=m}Kapitalista
@@ -4967,7 +4967,7 @@ STR_COMPANY_NAME_COMPANY_NUM                                    :{COMPANY} {COMP
 STR_DEPOT_NAME                                                  :{DEPOT}
 STR_ENGINE_NAME                                                 :{ENGINE}
 STR_HIDDEN_ENGINE_NAME                                          :{ENGINE} (skryté)
-STR_HIDDEN_ENGINE_NAME.g                                        :{G=m}{ENGINE} (skrytý)
+STR_HIDDEN_ENGINE_NAME.g                                        :{ENGINE} (skrytý)
 STR_GROUP_NAME                                                  :{GROUP}
 STR_INDUSTRY_NAME                                               :{INDUSTRY}
 STR_PRESIDENT_NAME                                              :{PRESIDENT_NAME}
diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt
index 6b3f46077..b8c4576ab 100644
--- a/src/lang/ukrainian.txt
+++ b/src/lang/ukrainian.txt
@@ -2415,9 +2415,9 @@ STR_LINKGRAPH_LEGEND_SELECT_COMPANIES                           :{BLACK}Вибе
 STR_LINKGRAPH_LEGEND_UNUSED                                     :{TINY_FONT}{BLACK}не використовується
 STR_LINKGRAPH_LEGEND_SATURATED                                  :{TINY_FONT}{BLACK}заповнений
 STR_LINKGRAPH_LEGEND_OVERLOADED                                 :{G=m}{TINY_FONT}{BLACK}перевантажений
-STR_LINKGRAPH_LEGEND_OVERLOADED.r                               :{G=m}{TINY_FONT}{BLACK}перевантаженого
-STR_LINKGRAPH_LEGEND_OVERLOADED.d                               :{G=m}{TINY_FONT}{BLACK}перевантаженому
-STR_LINKGRAPH_LEGEND_OVERLOADED.z                               :{G=m}{TINY_FONT}{BLACK}перевантажений
+STR_LINKGRAPH_LEGEND_OVERLOADED.r                               :{TINY_FONT}{BLACK}перевантаженого
+STR_LINKGRAPH_LEGEND_OVERLOADED.d                               :{TINY_FONT}{BLACK}перевантаженому
+STR_LINKGRAPH_LEGEND_OVERLOADED.z                               :{TINY_FONT}{BLACK}перевантажений
 
 # Base for station construction window(s)
 STR_STATION_BUILD_COVERAGE_AREA_TITLE                           :{BLACK}Підсвічення зони покриття
@@ -4643,61 +4643,61 @@ STR_TOWN_BUILDING_NAME_PIGGY_BANK_1                             :Копилка
 ##id 0x4800
 # industry names
 STR_INDUSTRY_NAME_COAL_MINE                                     :{G=f}Вугільна шахта
-STR_INDUSTRY_NAME_COAL_MINE.z                                   :{G=f}вугільну шахту
+STR_INDUSTRY_NAME_COAL_MINE.z                                   :вугільну шахту
 STR_INDUSTRY_NAME_POWER_STATION                                 :{G=f}Електростанція
-STR_INDUSTRY_NAME_POWER_STATION.z                               :{G=f}електростанцію
+STR_INDUSTRY_NAME_POWER_STATION.z                               :електростанцію
 STR_INDUSTRY_NAME_SAWMILL                                       :{G=f}Лісопилка
-STR_INDUSTRY_NAME_SAWMILL.z                                     :{G=f}лісопилку
+STR_INDUSTRY_NAME_SAWMILL.z                                     :лісопилку
 STR_INDUSTRY_NAME_FOREST                                        :{G=m}Ліс
-STR_INDUSTRY_NAME_FOREST.z                                      :{G=m}ліс
+STR_INDUSTRY_NAME_FOREST.z                                      :ліс
 STR_INDUSTRY_NAME_OIL_REFINERY                                  :{G=m}Нафтопереробний завод
-STR_INDUSTRY_NAME_OIL_REFINERY.z                                :{G=m}нафтопереробний завод
+STR_INDUSTRY_NAME_OIL_REFINERY.z                                :нафтопереробний завод
 STR_INDUSTRY_NAME_OIL_RIG                                       :{G=f}Нафтова платформа
-STR_INDUSTRY_NAME_OIL_RIG.z                                     :{G=f}нафтову платформу
+STR_INDUSTRY_NAME_OIL_RIG.z                                     :нафтову платформу
 STR_INDUSTRY_NAME_FACTORY                                       :{G=f}Фабрика
-STR_INDUSTRY_NAME_FACTORY.z                                     :{G=f}фабрику
+STR_INDUSTRY_NAME_FACTORY.z                                     :фабрику
 STR_INDUSTRY_NAME_PRINTING_WORKS                                :{G=f}Друкарня
-STR_INDUSTRY_NAME_PRINTING_WORKS.z                              :{G=f}друкарню
+STR_INDUSTRY_NAME_PRINTING_WORKS.z                              :друкарню
 STR_INDUSTRY_NAME_STEEL_MILL                                    :{G=m}Сталеварний завод
-STR_INDUSTRY_NAME_STEEL_MILL.z                                  :{G=m}сталеварний завод
+STR_INDUSTRY_NAME_STEEL_MILL.z                                  :сталеварний завод
 STR_INDUSTRY_NAME_FARM                                          :{G=f}Ферма
-STR_INDUSTRY_NAME_FARM.z                                        :{G=f}ферму
+STR_INDUSTRY_NAME_FARM.z                                        :ферму
 STR_INDUSTRY_NAME_COPPER_ORE_MINE                               :{G=f}Міднорудна шахта
-STR_INDUSTRY_NAME_COPPER_ORE_MINE.z                             :{G=f}міднорудну шахту
+STR_INDUSTRY_NAME_COPPER_ORE_MINE.z                             :міднорудну шахту
 STR_INDUSTRY_NAME_OIL_WELLS                                     :{G=f}Нафтова свердловина
-STR_INDUSTRY_NAME_OIL_WELLS.z                                   :{G=f}нафтову свердловину
+STR_INDUSTRY_NAME_OIL_WELLS.z                                   :нафтову свердловину
 STR_INDUSTRY_NAME_BANK                                          :{G=m}Банк
-STR_INDUSTRY_NAME_BANK.z                                        :{G=m}банк
+STR_INDUSTRY_NAME_BANK.z                                        :банк
 STR_INDUSTRY_NAME_FOOD_PROCESSING_PLANT                         :{G=m}Продуктовий завод
-STR_INDUSTRY_NAME_FOOD_PROCESSING_PLANT.z                       :{G=m}продуктовий завод
+STR_INDUSTRY_NAME_FOOD_PROCESSING_PLANT.z                       :продуктовий завод
 STR_INDUSTRY_NAME_PAPER_MILL                                    :{G=f}Паперова фабрика
-STR_INDUSTRY_NAME_PAPER_MILL.z                                  :{G=f}паперову фабрику
+STR_INDUSTRY_NAME_PAPER_MILL.z                                  :паперову фабрику
 STR_INDUSTRY_NAME_GOLD_MINE                                     :{G=f}Золоторудна шахта
-STR_INDUSTRY_NAME_GOLD_MINE.z                                   :{G=f}золоторудну шахту
+STR_INDUSTRY_NAME_GOLD_MINE.z                                   :золоторудну шахту
 STR_INDUSTRY_NAME_BANK_TROPIC_ARCTIC                            :{G=m}Банк
-STR_INDUSTRY_NAME_BANK_TROPIC_ARCTIC.z                          :{G=m}банк
+STR_INDUSTRY_NAME_BANK_TROPIC_ARCTIC.z                          :банк
 STR_INDUSTRY_NAME_DIAMOND_MINE                                  :{G=f}Діамантова шахта
-STR_INDUSTRY_NAME_DIAMOND_MINE.z                                :{G=f}діамантову шахту
+STR_INDUSTRY_NAME_DIAMOND_MINE.z                                :діамантову шахту
 STR_INDUSTRY_NAME_IRON_ORE_MINE                                 :{G=f}Залізорудна шахта
-STR_INDUSTRY_NAME_IRON_ORE_MINE.z                               :{G=f}залізорудну шахту
+STR_INDUSTRY_NAME_IRON_ORE_MINE.z                               :залізорудну шахту
 STR_INDUSTRY_NAME_FRUIT_PLANTATION                              :{G=m}Фруктовий сад
-STR_INDUSTRY_NAME_FRUIT_PLANTATION.z                            :{G=m}фруктовий сад
+STR_INDUSTRY_NAME_FRUIT_PLANTATION.z                            :фруктовий сад
 STR_INDUSTRY_NAME_RUBBER_PLANTATION                             :{G=m}Каучуковий сад
-STR_INDUSTRY_NAME_RUBBER_PLANTATION.z                           :{G=m}каучуковий сад
+STR_INDUSTRY_NAME_RUBBER_PLANTATION.z                           :каучуковий сад
 STR_INDUSTRY_NAME_WATER_SUPPLY                                  :Водопостачання
 STR_INDUSTRY_NAME_WATER_SUPPLY.z                                :водопостачання
 STR_INDUSTRY_NAME_WATER_TOWER                                   :{G=f}Водонапірна башта
-STR_INDUSTRY_NAME_WATER_TOWER.z                                 :{G=f}водонапірну башту
+STR_INDUSTRY_NAME_WATER_TOWER.z                                 :водонапірну башту
 STR_INDUSTRY_NAME_FACTORY_2                                     :{G=f}Фабрика
-STR_INDUSTRY_NAME_FACTORY_2.z                                   :{G=f}фабрику
+STR_INDUSTRY_NAME_FACTORY_2.z                                   :фабрику
 STR_INDUSTRY_NAME_FARM_2                                        :{G=f}Ферма
-STR_INDUSTRY_NAME_FARM_2.z                                      :{G=f}ферму
+STR_INDUSTRY_NAME_FARM_2.z                                      :ферму
 STR_INDUSTRY_NAME_LUMBER_MILL                                   :{G=f}Лісопилка
-STR_INDUSTRY_NAME_LUMBER_MILL.z                                 :{G=f}лісопилку
+STR_INDUSTRY_NAME_LUMBER_MILL.z                                 :лісопилку
 STR_INDUSTRY_NAME_COTTON_CANDY_FOREST                           :{G=m}Ліс солодкої вати
-STR_INDUSTRY_NAME_COTTON_CANDY_FOREST.z                         :{G=m}ліс солодкої вати
+STR_INDUSTRY_NAME_COTTON_CANDY_FOREST.z                         :ліс солодкої вати
 STR_INDUSTRY_NAME_CANDY_FACTORY                                 :{G=f}Цукеркова фабрика
-STR_INDUSTRY_NAME_CANDY_FACTORY.z                               :{G=f}цукеркову фабрику
+STR_INDUSTRY_NAME_CANDY_FACTORY.z                               :цукеркову фабрику
 STR_INDUSTRY_NAME_BATTERY_FARM                                  :Батарейкове поле
 STR_INDUSTRY_NAME_BATTERY_FARM.z                                :батарейкове поле
 STR_INDUSTRY_NAME_COLA_WELLS                                    :Джерело Кока-коли