From 3e8dbb52acea49864c9ca03a156dd10fa14260d6 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Mon, 15 Nov 2021 06:32:41 +0200 Subject: [PATCH 9/9] Nations: Replace translation domain definition "freeciv" with "freeciv-core" This makes it to match the actual translation domain the translations are from. See osdn #42111 Signed-off-by: Marko Lindqvist --- data/alien/nation/adventurers.ruleset | 2 +- data/alien/nation/galacticsound.ruleset | 2 +- data/alien/nation/jw.ruleset | 2 +- data/alien/nation/kindergarden.ruleset | 2 +- data/alien/nation/lunatics.ruleset | 2 +- data/alien/nation/madmen.ruleset | 2 +- data/alien/nation/mathclub.ruleset | 2 +- data/alien/nation/secretsociety.ruleset | 2 +- data/alien/nation/teamgladiators.ruleset | 2 +- data/civ2/nations.ruleset | 46 ++++++++++++------------ data/nation/american.ruleset | 2 +- data/nation/animals.ruleset | 2 +- data/nation/apache.ruleset | 2 +- data/nation/arab.ruleset | 2 +- data/nation/austrian.ruleset | 2 +- data/nation/aztec.ruleset | 2 +- data/nation/babylonian.ruleset | 2 +- data/nation/barbarian.ruleset | 2 +- data/nation/brazilian.ruleset | 2 +- data/nation/byzantium.ruleset | 2 +- data/nation/carthaginian.ruleset | 2 +- data/nation/celtic.ruleset | 2 +- data/nation/cherokee.ruleset | 2 +- data/nation/chinese.ruleset | 2 +- data/nation/danish.ruleset | 2 +- data/nation/dutch.ruleset | 2 +- data/nation/egyptian.ruleset | 2 +- data/nation/english.ruleset | 2 +- data/nation/ethiopian.ruleset | 2 +- data/nation/french.ruleset | 2 +- data/nation/german.ruleset | 2 +- data/nation/greek.ruleset | 2 +- data/nation/hittite.ruleset | 2 +- data/nation/hunnic.ruleset | 2 +- data/nation/inca.ruleset | 2 +- data/nation/indian.ruleset | 2 +- data/nation/indonesian.ruleset | 2 +- data/nation/iroquois.ruleset | 2 +- data/nation/italian.ruleset | 2 +- data/nation/japanese.ruleset | 2 +- data/nation/khmer.ruleset | 2 +- data/nation/korean.ruleset | 2 +- data/nation/mali.ruleset | 2 +- data/nation/mayan.ruleset | 2 +- data/nation/mongol.ruleset | 2 +- data/nation/persian.ruleset | 2 +- data/nation/pirate.ruleset | 2 +- data/nation/polish.ruleset | 2 +- data/nation/polynesian.ruleset | 2 +- data/nation/portuguese.ruleset | 2 +- data/nation/roman.ruleset | 2 +- data/nation/russian.ruleset | 2 +- data/nation/singlebarbarian.ruleset | 2 +- data/nation/sioux.ruleset | 2 +- data/nation/songhai.ruleset | 2 +- data/nation/spanish.ruleset | 2 +- data/nation/sumerian.ruleset | 2 +- data/nation/swedish.ruleset | 2 +- data/nation/taino.ruleset | 2 +- data/nation/thai.ruleset | 2 +- data/nation/tupi.ruleset | 2 +- data/nation/turk.ruleset | 2 +- data/nation/viking.ruleset | 2 +- data/nation/zulu.ruleset | 2 +- data/webperimental/nations.ruleset | 2 +- server/ruleset.c | 5 ++- tools/ruleutil/rulesave.c | 2 +- 67 files changed, 92 insertions(+), 89 deletions(-) diff --git a/data/alien/nation/adventurers.ruleset b/data/alien/nation/adventurers.ruleset index da1b2a8df0..f7e3032ae8 100644 --- a/data/alien/nation/adventurers.ruleset +++ b/data/alien/nation/adventurers.ruleset @@ -1,6 +1,6 @@ [nation_adventurers] -translation_domain="freeciv" +translation_domain = "freeciv-core" name = _("Adventurers") plural = _("?plural:Adventurers") diff --git a/data/alien/nation/galacticsound.ruleset b/data/alien/nation/galacticsound.ruleset index c84986c0d8..acdd6c2cbf 100644 --- a/data/alien/nation/galacticsound.ruleset +++ b/data/alien/nation/galacticsound.ruleset @@ -1,6 +1,6 @@ [nation_galactic_sound] -translation_domain="freeciv" +translation_domain = "freeciv-core" name = _("Galactic Sound") plural = _("?plural:Fans") diff --git a/data/alien/nation/jw.ruleset b/data/alien/nation/jw.ruleset index c0fe1321cd..02a3bbadd9 100644 --- a/data/alien/nation/jw.ruleset +++ b/data/alien/nation/jw.ruleset @@ -1,6 +1,6 @@ [nation_jw] -translation_domain="freeciv" +translation_domain = "freeciv-core" name = _("J&W Corporation") plural = _("?plural:JeeWees") diff --git a/data/alien/nation/kindergarden.ruleset b/data/alien/nation/kindergarden.ruleset index b18e8369cb..db1cace28c 100644 --- a/data/alien/nation/kindergarden.ruleset +++ b/data/alien/nation/kindergarden.ruleset @@ -1,6 +1,6 @@ [nation_kindergarden] -translation_domain="freeciv" +translation_domain = "freeciv-core" name = _("Kindergarden") plural = _("?plural:Children") diff --git a/data/alien/nation/lunatics.ruleset b/data/alien/nation/lunatics.ruleset index 33b4c4a9f6..2002882e02 100644 --- a/data/alien/nation/lunatics.ruleset +++ b/data/alien/nation/lunatics.ruleset @@ -1,6 +1,6 @@ [nation_lunatic] -translation_domain="freeciv" +translation_domain = "freeciv-core" name = _("Lunatic") plural = _("?plural:Lunatics") diff --git a/data/alien/nation/madmen.ruleset b/data/alien/nation/madmen.ruleset index c88b092075..6f9802e5e5 100644 --- a/data/alien/nation/madmen.ruleset +++ b/data/alien/nation/madmen.ruleset @@ -1,6 +1,6 @@ [nation_madmen] -translation_domain="freeciv" +translation_domain = "freeciv-core" name = _("Madmen") plural = _("?plural:Madmen") diff --git a/data/alien/nation/mathclub.ruleset b/data/alien/nation/mathclub.ruleset index 297f5c8036..9c8a55ae90 100644 --- a/data/alien/nation/mathclub.ruleset +++ b/data/alien/nation/mathclub.ruleset @@ -1,6 +1,6 @@ [nation_math_club] -translation_domain="freeciv" +translation_domain = "freeciv-core" name = _("Math Club") plural = _("?plural:Mathematicians") diff --git a/data/alien/nation/secretsociety.ruleset b/data/alien/nation/secretsociety.ruleset index 075f51baa0..12b8393c30 100644 --- a/data/alien/nation/secretsociety.ruleset +++ b/data/alien/nation/secretsociety.ruleset @@ -1,6 +1,6 @@ [nation_secret_society] -translation_domain="freeciv" +translation_domain = "freeciv-core" name = _("Secret Society") plural = _("?plural:Billionaries") diff --git a/data/alien/nation/teamgladiators.ruleset b/data/alien/nation/teamgladiators.ruleset index 3ffc12ce67..f387e539d2 100644 --- a/data/alien/nation/teamgladiators.ruleset +++ b/data/alien/nation/teamgladiators.ruleset @@ -1,6 +1,6 @@ [nation_team_gladiators] -translation_domain="freeciv" +translation_domain = "freeciv-core" name = _("Team Gladiators") plural = _("?plural:Athletes") diff --git a/data/civ2/nations.ruleset b/data/civ2/nations.ruleset index f5f72ea310..95c2027b5b 100644 --- a/data/civ2/nations.ruleset +++ b/data/civ2/nations.ruleset @@ -114,7 +114,7 @@ hidden=true [nation_american] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("American") plural=_("?plural:Americans") @@ -228,7 +228,7 @@ cities = [nation_aztec] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("Aztec") plural=_("?plural:Aztecs") @@ -329,7 +329,7 @@ cities = [nation_babylonian] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("Babylonian") plural=_("?plural:Babylonians") @@ -397,7 +397,7 @@ cities = [nation_carthaginian] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("Carthaginian") plural=_("?plural:Carthaginians") @@ -433,7 +433,7 @@ cities = [nation_celtic] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("Celtic") plural=_("?plural:Celts") @@ -524,7 +524,7 @@ cities = [nation_chinese] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("Chinese") plural=_("?plural:Chinese") @@ -674,7 +674,7 @@ cities = [nation_egyptian] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("Egyptian") plural=_("?plural:Egyptians") @@ -757,7 +757,7 @@ cities = [nation_english] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("English") plural=_("?plural:English") @@ -872,7 +872,7 @@ cities = [nation_french] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("French") plural=_("?plural:French") @@ -999,7 +999,7 @@ cities = [nation_german] -translation_domain="freeciv" +translation_domain = "freeciv-core" name = _("German") plural = _("?plural:Germans") @@ -1157,7 +1157,7 @@ cities = [nation_greek] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("Greek") plural=_("?plural:Greeks") @@ -1310,7 +1310,7 @@ cities = [nation_indian] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("Indian") plural=_("?plural:Indians") @@ -1409,7 +1409,7 @@ cities = [nation_japanese] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("Japanese") plural=_("?plural:Japanese") @@ -1526,7 +1526,7 @@ cities = [nation_mongol] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("Mongol") plural=_("?plural:Mongols") @@ -1594,7 +1594,7 @@ cities= [nation_persian] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("Persian") plural=_("?plural:Persians") @@ -1670,7 +1670,7 @@ cities = [nation_roman] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("Roman") plural=_("?plural:Romans") @@ -1725,7 +1725,7 @@ cities = [nation_russian] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("Russian") plural=_("?plural:Russians") @@ -1824,7 +1824,7 @@ cities = [nation_sioux] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("Sioux") plural=_("?plural:Sioux") @@ -1918,7 +1918,7 @@ cities = [nation_spanish] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("Spanish") plural=_("?plural:Spanish") @@ -1995,7 +1995,7 @@ cities = [nation_viking] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("Viking") plural=_("?plural:Vikings") @@ -2078,7 +2078,7 @@ cities = [nation_zulu] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("Zulu") plural=_("?plural:Zulus") @@ -2151,7 +2151,7 @@ cities = [nation_barbarian] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("Barbarian") plural=_("?plural:Barbarians") @@ -2192,7 +2192,7 @@ barbarian_type = "LandAndSea" ; Freeciv should always pick the one "LandAndSea" barbarian in new games. [nation_pirate] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("Pirate") plural=_("?plural:Pirates") diff --git a/data/nation/american.ruleset b/data/nation/american.ruleset index 132f5e34f5..4b5e4ddecc 100644 --- a/data/nation/american.ruleset +++ b/data/nation/american.ruleset @@ -1,6 +1,6 @@ [nation_american] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("American") plural=_("?plural:Americans") diff --git a/data/nation/animals.ruleset b/data/nation/animals.ruleset index 800e9392ee..73f9d67a71 100644 --- a/data/nation/animals.ruleset +++ b/data/nation/animals.ruleset @@ -1,6 +1,6 @@ [nation_animals] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("Animal Kingdom") plural=_("?plural:Animals") diff --git a/data/nation/apache.ruleset b/data/nation/apache.ruleset index 09115e370b..166b1bef73 100644 --- a/data/nation/apache.ruleset +++ b/data/nation/apache.ruleset @@ -1,6 +1,6 @@ [nation_apache] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("Apache") plural=_("?plural:Apaches") diff --git a/data/nation/arab.ruleset b/data/nation/arab.ruleset index bce7557ea9..e89afc865b 100644 --- a/data/nation/arab.ruleset +++ b/data/nation/arab.ruleset @@ -1,6 +1,6 @@ [nation_arab] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("Arab") plural=_("?plural:Arabs") diff --git a/data/nation/austrian.ruleset b/data/nation/austrian.ruleset index 47e9d4a538..e6152b4c4c 100644 --- a/data/nation/austrian.ruleset +++ b/data/nation/austrian.ruleset @@ -1,6 +1,6 @@ [nation_austrian] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("Austrian") plural=_("?plural:Austrians") diff --git a/data/nation/aztec.ruleset b/data/nation/aztec.ruleset index 640eb72d0a..20ee1671d0 100644 --- a/data/nation/aztec.ruleset +++ b/data/nation/aztec.ruleset @@ -1,6 +1,6 @@ [nation_aztec] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("Aztec") plural=_("?plural:Aztecs") diff --git a/data/nation/babylonian.ruleset b/data/nation/babylonian.ruleset index 569605da50..bce3715377 100644 --- a/data/nation/babylonian.ruleset +++ b/data/nation/babylonian.ruleset @@ -1,6 +1,6 @@ [nation_babylonian] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("Babylonian") plural=_("?plural:Babylonians") diff --git a/data/nation/barbarian.ruleset b/data/nation/barbarian.ruleset index 1cc7252b24..607ddaaaf0 100644 --- a/data/nation/barbarian.ruleset +++ b/data/nation/barbarian.ruleset @@ -1,6 +1,6 @@ [nation_barbarian] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("Barbarian") plural=_("?plural:Barbarians") diff --git a/data/nation/brazilian.ruleset b/data/nation/brazilian.ruleset index 20fc66184d..7c01b634af 100644 --- a/data/nation/brazilian.ruleset +++ b/data/nation/brazilian.ruleset @@ -1,6 +1,6 @@ [nation_brazilian] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("Brazilian") plural=_("?plural:Brazilians") diff --git a/data/nation/byzantium.ruleset b/data/nation/byzantium.ruleset index 510ee3f026..0cb8ed51f6 100644 --- a/data/nation/byzantium.ruleset +++ b/data/nation/byzantium.ruleset @@ -1,6 +1,6 @@ [nation_byzantine] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("Byzantine") plural=_("?plural:Byzantines") diff --git a/data/nation/carthaginian.ruleset b/data/nation/carthaginian.ruleset index 0232983fc2..0015ac3dbf 100644 --- a/data/nation/carthaginian.ruleset +++ b/data/nation/carthaginian.ruleset @@ -1,6 +1,6 @@ [nation_carthaginian] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("Carthaginian") plural=_("?plural:Carthaginians") diff --git a/data/nation/celtic.ruleset b/data/nation/celtic.ruleset index c92403f62a..c7d86fe3ef 100644 --- a/data/nation/celtic.ruleset +++ b/data/nation/celtic.ruleset @@ -1,6 +1,6 @@ [nation_celtic] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("Celtic") plural=_("?plural:Celts") diff --git a/data/nation/cherokee.ruleset b/data/nation/cherokee.ruleset index 909f427a2d..d15d76814f 100644 --- a/data/nation/cherokee.ruleset +++ b/data/nation/cherokee.ruleset @@ -1,6 +1,6 @@ [nation_cherokee] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("Cherokee") plural=_("?plural:Cherokees") diff --git a/data/nation/chinese.ruleset b/data/nation/chinese.ruleset index 4b0a8248cd..a3f5f4ef33 100644 --- a/data/nation/chinese.ruleset +++ b/data/nation/chinese.ruleset @@ -1,6 +1,6 @@ [nation_chinese] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("Chinese") plural=_("?plural:Chinese") diff --git a/data/nation/danish.ruleset b/data/nation/danish.ruleset index 8b0a809785..0fe6dcc264 100644 --- a/data/nation/danish.ruleset +++ b/data/nation/danish.ruleset @@ -1,6 +1,6 @@ [nation_danish] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("Danish") plural=_("?plural:Danes") diff --git a/data/nation/dutch.ruleset b/data/nation/dutch.ruleset index cdc5bfd95b..7490a0bf2e 100644 --- a/data/nation/dutch.ruleset +++ b/data/nation/dutch.ruleset @@ -1,6 +1,6 @@ [nation_dutch] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("Dutch") plural=_("?plural:Dutch") diff --git a/data/nation/egyptian.ruleset b/data/nation/egyptian.ruleset index 58f140141f..c228a81ff6 100644 --- a/data/nation/egyptian.ruleset +++ b/data/nation/egyptian.ruleset @@ -1,6 +1,6 @@ [nation_egyptian] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("Egyptian") plural=_("?plural:Egyptians") diff --git a/data/nation/english.ruleset b/data/nation/english.ruleset index 9a729ce131..e5c9b2291c 100644 --- a/data/nation/english.ruleset +++ b/data/nation/english.ruleset @@ -1,6 +1,6 @@ [nation_english] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("English") plural=_("?plural:English") diff --git a/data/nation/ethiopian.ruleset b/data/nation/ethiopian.ruleset index 26b040f3be..0ebbec494f 100644 --- a/data/nation/ethiopian.ruleset +++ b/data/nation/ethiopian.ruleset @@ -1,6 +1,6 @@ [nation_ethiopian] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("Ethiopian") plural=_("?plural:Ethiopians") diff --git a/data/nation/french.ruleset b/data/nation/french.ruleset index cdb785ea53..5fe8e5d303 100644 --- a/data/nation/french.ruleset +++ b/data/nation/french.ruleset @@ -1,6 +1,6 @@ [nation_french] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("French") plural=_("?plural:French") diff --git a/data/nation/german.ruleset b/data/nation/german.ruleset index 91e15cd72b..389d5aab60 100644 --- a/data/nation/german.ruleset +++ b/data/nation/german.ruleset @@ -1,6 +1,6 @@ [nation_german] -translation_domain="freeciv" +translation_domain = "freeciv-core" name = _("German") plural = _("?plural:Germans") diff --git a/data/nation/greek.ruleset b/data/nation/greek.ruleset index 43e9c7af70..1e4a7bd16e 100644 --- a/data/nation/greek.ruleset +++ b/data/nation/greek.ruleset @@ -1,6 +1,6 @@ [nation_greek] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("Greek") plural=_("?plural:Greeks") diff --git a/data/nation/hittite.ruleset b/data/nation/hittite.ruleset index ada4f21f96..df6a4c2153 100644 --- a/data/nation/hittite.ruleset +++ b/data/nation/hittite.ruleset @@ -1,6 +1,6 @@ [nation_hittite] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("Hittite") plural=_("?plural:Hittites") diff --git a/data/nation/hunnic.ruleset b/data/nation/hunnic.ruleset index 0d3f942acf..b81e6f7964 100644 --- a/data/nation/hunnic.ruleset +++ b/data/nation/hunnic.ruleset @@ -1,6 +1,6 @@ [nation_hunnic] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("Hunnic") plural=_("?plural:Huns") diff --git a/data/nation/inca.ruleset b/data/nation/inca.ruleset index a6dbba13aa..12b44c0be6 100644 --- a/data/nation/inca.ruleset +++ b/data/nation/inca.ruleset @@ -1,6 +1,6 @@ [nation_inca] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("Inca") plural=_("?plural:Incas") diff --git a/data/nation/indian.ruleset b/data/nation/indian.ruleset index 1cf842c674..1f13e43819 100644 --- a/data/nation/indian.ruleset +++ b/data/nation/indian.ruleset @@ -1,6 +1,6 @@ [nation_indian] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("Indian") plural=_("?plural:Indians") diff --git a/data/nation/indonesian.ruleset b/data/nation/indonesian.ruleset index 5a19b2a789..2d08accd0a 100644 --- a/data/nation/indonesian.ruleset +++ b/data/nation/indonesian.ruleset @@ -1,6 +1,6 @@ [nation_indonesian] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("Indonesian") plural=_("?plural:Indonesians") diff --git a/data/nation/iroquois.ruleset b/data/nation/iroquois.ruleset index eaf8bb96a7..981f779116 100644 --- a/data/nation/iroquois.ruleset +++ b/data/nation/iroquois.ruleset @@ -1,6 +1,6 @@ [nation_iroquois] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("Iroquois") plural=_("?plural:Iroquois") diff --git a/data/nation/italian.ruleset b/data/nation/italian.ruleset index 148171749d..d2d74fc7f3 100644 --- a/data/nation/italian.ruleset +++ b/data/nation/italian.ruleset @@ -1,6 +1,6 @@ [nation_italian] -translation_domain="freeciv" +translation_domain = "freeciv-core" name = _("Italian") plural = _("?plural:Italians") diff --git a/data/nation/japanese.ruleset b/data/nation/japanese.ruleset index e0646c9f11..a7850e5b4f 100644 --- a/data/nation/japanese.ruleset +++ b/data/nation/japanese.ruleset @@ -1,6 +1,6 @@ [nation_japanese] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("Japanese") plural=_("?plural:Japanese") diff --git a/data/nation/khmer.ruleset b/data/nation/khmer.ruleset index db937f3ea8..bef416da2c 100644 --- a/data/nation/khmer.ruleset +++ b/data/nation/khmer.ruleset @@ -1,6 +1,6 @@ [nation_khmer] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("Khmer") plural=_("?plural:Khmers") diff --git a/data/nation/korean.ruleset b/data/nation/korean.ruleset index 161d34a315..b506b60516 100644 --- a/data/nation/korean.ruleset +++ b/data/nation/korean.ruleset @@ -1,6 +1,6 @@ [nation_korean] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("Korean") plural=_("?plural:Koreans") diff --git a/data/nation/mali.ruleset b/data/nation/mali.ruleset index 055d8aafef..607d51e343 100644 --- a/data/nation/mali.ruleset +++ b/data/nation/mali.ruleset @@ -1,6 +1,6 @@ [nation_mali] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("Mali") plural=_("?plural:Malis") diff --git a/data/nation/mayan.ruleset b/data/nation/mayan.ruleset index 961862e819..503f3a6877 100644 --- a/data/nation/mayan.ruleset +++ b/data/nation/mayan.ruleset @@ -1,6 +1,6 @@ [nation_mayan] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("Mayan") plural=_("?plural:Mayas") diff --git a/data/nation/mongol.ruleset b/data/nation/mongol.ruleset index 0701e8146a..e51c299fb5 100644 --- a/data/nation/mongol.ruleset +++ b/data/nation/mongol.ruleset @@ -1,6 +1,6 @@ [nation_mongol] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("Mongol") plural=_("?plural:Mongols") diff --git a/data/nation/persian.ruleset b/data/nation/persian.ruleset index 171878d553..14ffa39ae7 100644 --- a/data/nation/persian.ruleset +++ b/data/nation/persian.ruleset @@ -1,6 +1,6 @@ [nation_persian] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("Persian") plural=_("?plural:Persians") diff --git a/data/nation/pirate.ruleset b/data/nation/pirate.ruleset index 33df17fda6..4dcf829a39 100644 --- a/data/nation/pirate.ruleset +++ b/data/nation/pirate.ruleset @@ -1,6 +1,6 @@ [nation_pirate] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("Pirate") plural=_("?plural:Pirates") diff --git a/data/nation/polish.ruleset b/data/nation/polish.ruleset index 8e3c541ec7..bca511e34f 100644 --- a/data/nation/polish.ruleset +++ b/data/nation/polish.ruleset @@ -1,6 +1,6 @@ [nation_polish] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("Polish") plural=_("?plural:Poles") diff --git a/data/nation/polynesian.ruleset b/data/nation/polynesian.ruleset index b57a08da11..2c6489be18 100644 --- a/data/nation/polynesian.ruleset +++ b/data/nation/polynesian.ruleset @@ -1,6 +1,6 @@ [nation_polynesian] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("Polynesian") plural=_("?plural:Polynesians") diff --git a/data/nation/portuguese.ruleset b/data/nation/portuguese.ruleset index 9153ae1844..03699c4166 100644 --- a/data/nation/portuguese.ruleset +++ b/data/nation/portuguese.ruleset @@ -1,6 +1,6 @@ [nation_portuguese] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("Portuguese") plural=_("?plural:Portuguese") diff --git a/data/nation/roman.ruleset b/data/nation/roman.ruleset index 69dc444c4e..dfa748222b 100644 --- a/data/nation/roman.ruleset +++ b/data/nation/roman.ruleset @@ -1,6 +1,6 @@ [nation_roman] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("Roman") plural=_("?plural:Romans") diff --git a/data/nation/russian.ruleset b/data/nation/russian.ruleset index 4d6d7e68a9..e00b3e796e 100644 --- a/data/nation/russian.ruleset +++ b/data/nation/russian.ruleset @@ -1,6 +1,6 @@ [nation_russian] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("Russian") plural=_("?plural:Russians") diff --git a/data/nation/singlebarbarian.ruleset b/data/nation/singlebarbarian.ruleset index 91d02619fe..9947b4d3c3 100644 --- a/data/nation/singlebarbarian.ruleset +++ b/data/nation/singlebarbarian.ruleset @@ -1,6 +1,6 @@ [nation_barbarian] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("Barbarian") plural=_("?plural:Barbarians") diff --git a/data/nation/sioux.ruleset b/data/nation/sioux.ruleset index 349a834df6..1492fce57d 100644 --- a/data/nation/sioux.ruleset +++ b/data/nation/sioux.ruleset @@ -1,6 +1,6 @@ [nation_sioux] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("Sioux") plural=_("?plural:Sioux") diff --git a/data/nation/songhai.ruleset b/data/nation/songhai.ruleset index 2afdce6b45..a05a6d13c7 100644 --- a/data/nation/songhai.ruleset +++ b/data/nation/songhai.ruleset @@ -1,6 +1,6 @@ [nation_songhai] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("Songhai") plural=_("?plural:Songhai") diff --git a/data/nation/spanish.ruleset b/data/nation/spanish.ruleset index 9769076205..48475154d4 100644 --- a/data/nation/spanish.ruleset +++ b/data/nation/spanish.ruleset @@ -1,6 +1,6 @@ [nation_spanish] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("Spanish") plural=_("?plural:Spanish") diff --git a/data/nation/sumerian.ruleset b/data/nation/sumerian.ruleset index 15129701e7..bcfe858be5 100644 --- a/data/nation/sumerian.ruleset +++ b/data/nation/sumerian.ruleset @@ -1,6 +1,6 @@ [nation_sumerian] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("Sumerian") plural=_("?plural:Sumerians") diff --git a/data/nation/swedish.ruleset b/data/nation/swedish.ruleset index aa3e32d395..abf8832d89 100644 --- a/data/nation/swedish.ruleset +++ b/data/nation/swedish.ruleset @@ -1,6 +1,6 @@ [nation_swedish] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("Swedish") plural=_("?plural:Swedes") diff --git a/data/nation/taino.ruleset b/data/nation/taino.ruleset index 3ead23d62a..8fa813d51f 100644 --- a/data/nation/taino.ruleset +++ b/data/nation/taino.ruleset @@ -1,6 +1,6 @@ [nation_taino] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("Taino") plural=_("?plural:Taino") diff --git a/data/nation/thai.ruleset b/data/nation/thai.ruleset index 6d6f3f2381..ebffc283f0 100644 --- a/data/nation/thai.ruleset +++ b/data/nation/thai.ruleset @@ -1,6 +1,6 @@ [nation_thai] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("Thai") plural=_("?plural:Thai") diff --git a/data/nation/tupi.ruleset b/data/nation/tupi.ruleset index 8c3a68740e..897fa651cb 100644 --- a/data/nation/tupi.ruleset +++ b/data/nation/tupi.ruleset @@ -1,6 +1,6 @@ [nation_tupi] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("Tupi") plural=_("?plural:Tupi") diff --git a/data/nation/turk.ruleset b/data/nation/turk.ruleset index 029dc5d7d4..4602cf42f4 100644 --- a/data/nation/turk.ruleset +++ b/data/nation/turk.ruleset @@ -1,6 +1,6 @@ [nation_turk] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("Turkish") plural=_("?plural:Turks") diff --git a/data/nation/viking.ruleset b/data/nation/viking.ruleset index a06967c627..ec50dcef96 100644 --- a/data/nation/viking.ruleset +++ b/data/nation/viking.ruleset @@ -1,6 +1,6 @@ [nation_viking] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("Viking") plural=_("?plural:Vikings") diff --git a/data/nation/zulu.ruleset b/data/nation/zulu.ruleset index 2908e363f8..647845a7cf 100644 --- a/data/nation/zulu.ruleset +++ b/data/nation/zulu.ruleset @@ -1,6 +1,6 @@ [nation_zulu] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("Zulu") plural=_("?plural:Zulus") diff --git a/data/webperimental/nations.ruleset b/data/webperimental/nations.ruleset index 13cded30e1..6a91267189 100644 --- a/data/webperimental/nations.ruleset +++ b/data/webperimental/nations.ruleset @@ -68,7 +68,7 @@ builder_default = 50 [nation_barbarian] -translation_domain="freeciv" +translation_domain = "freeciv-core" name=_("Barbarian") plural=_("?plural:Barbarians") diff --git a/server/ruleset.c b/server/ruleset.c index 857f3d043a..7cf90aaf73 100644 --- a/server/ruleset.c +++ b/server/ruleset.c @@ -4637,7 +4637,10 @@ static bool load_nation_names(struct section_file *file, domain = "freeciv-nations"; } - if (!strcmp("freeciv", domain)) { + if (!strcmp("freeciv-core", domain)) { + pl->translation_domain = NULL; + } else if (compat->compat_mode && compat->ver_nations < RSFORMAT_3_1 + && !strcmp("freeciv", domain)) { pl->translation_domain = NULL; } else if (!strcmp("freeciv-nations", domain)) { pl->translation_domain = fc_malloc(strlen(domain) + 1); diff --git a/tools/ruleutil/rulesave.c b/tools/ruleutil/rulesave.c index 602fc1b757..2f11ea989c 100644 --- a/tools/ruleutil/rulesave.c +++ b/tools/ruleutil/rulesave.c @@ -1804,7 +1804,7 @@ static bool save_nation(struct section_file *sfile, struct nation_type *pnat, fc_snprintf(path, sizeof(path), "nation_%d", sect_idx++); if (pnat->translation_domain == NULL) { - secfile_insert_str(sfile, "freeciv", "%s.translation_domain", path); + secfile_insert_str(sfile, "freeciv-core", "%s.translation_domain", path); } else { secfile_insert_str(sfile, pnat->translation_domain, "%s.translation_domain", path); } -- 2.30.2