From bfbd28a51e8524cc83e9dc3eacd50b9aef0d2616 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Tue, 11 May 2021 20:12:26 +0300 Subject: [PATCH 57/57] Improve coding style of e*.ruleset nation rulesets See osdn #42241 Signed-off-by: Marko Lindqvist --- data/nation/eastgerman.ruleset | 17 +++---- data/nation/easttimorese.ruleset | 23 ++++----- data/nation/ecuadorian.ruleset | 26 +++++------ data/nation/egyptian.ruleset | 78 +++++++++++++++---------------- data/nation/egyptianarab.ruleset | 32 ++++++------- data/nation/elamite.ruleset | 16 +++---- data/nation/emirati.ruleset | 18 +++---- data/nation/english.ruleset | 19 ++++---- data/nation/epirote.ruleset | 59 ++++++++++++----------- data/nation/equatoguinean.ruleset | 16 +++---- data/nation/eritrean.ruleset | 24 +++++----- data/nation/esperant.ruleset | 16 +++---- data/nation/estonian.ruleset | 19 ++++---- data/nation/ethiopian.ruleset | 20 ++++---- data/nation/etruscan.ruleset | 16 +++---- data/nation/european.ruleset | 47 ++++++++++--------- data/nation/evenki.ruleset | 18 +++---- 17 files changed, 233 insertions(+), 231 deletions(-) diff --git a/data/nation/eastgerman.ruleset b/data/nation/eastgerman.ruleset index 5e806dfc1d..e106fe7d37 100644 --- a/data/nation/eastgerman.ruleset +++ b/data/nation/eastgerman.ruleset @@ -1,9 +1,9 @@ [nation_eastgerman] -name=_("East German") -plural=_("?plural:East Germans") -groups="European" -legend=_("The German Democratic Republic was founded in the Soviet\ +name = _("East German") +plural = _("?plural:East Germans") +groups = "European" +legend = _("The German Democratic Republic was founded in the Soviet\ Occupation Zone of postwar Germany in 1949. It was part of the\ Soviet dominated eastern bloc during the Cold War. The GDR was known\ for the Berlin Wall and its vast internal security apparatus, the Stasi.\ @@ -33,16 +33,17 @@ flag = "ddr" flag_alt = "germany" style = "European" -init_techs="" -init_buildings="" -init_units="" +init_techs = "" +init_buildings = "" +init_units = "" + conflicts_with = "prussian", "saxon", "brandenburgian", "mecklenburgian", "thuringian", "anhaltian" civilwar_nations = "sorbian", "saxon", "brandenburgian", "mecklenburgian", "thuringian", "anhaltian", "german", "volga german" cities = - "Berlin (grassland, !mountains)", + "Berlin (grassland, !mountains)", "Leipzig (grassland, plains, hills, !ocean)", "Dresden (plains, hills, river, mountains, !ocean)", "Karl-Marx-Stadt (hills, mountains, !ocean)", diff --git a/data/nation/easttimorese.ruleset b/data/nation/easttimorese.ruleset index 48d9399a7a..738467fb85 100644 --- a/data/nation/easttimorese.ruleset +++ b/data/nation/easttimorese.ruleset @@ -1,9 +1,9 @@ [nation_easttimorese] -name=_("East Timorese") -plural=_("?plural:East Timorese") -groups="Oceanian", "Asian", "Modern" -legend=_("A former Portuguese colony, East Timor declared independence\ +name = _("East Timorese") +plural = _("?plural:East Timorese") +groups = "Oceanian", "Asian", "Modern" +legend = _("A former Portuguese colony, East Timor declared independence\ in 1975 but was overrun by Indonesian forces shortly thereafter. East\ Timor became the first newly sovereign state of the 21st century when\ Indonesia relinquished control on May 20, 2002.") @@ -22,15 +22,15 @@ ruler_titles = { "Fundamentalism", _("Bishop %s"), _("Mother Superior %s") } -flag="east_timor" -flag_alt="-" +flag = "east_timor" +flag_alt = "-" style = "Tropical" -init_techs="" -init_buildings="" -init_units="" +init_techs = "" +init_buildings = "" +init_units = "" -civilwar_nations="Indonesian", "Moluccan" +civilwar_nations = "Indonesian", "Moluccan" cities = "Dili", @@ -68,6 +68,3 @@ cities = "Nitibe", "Hau-Builico", "Oesilo" - - - diff --git a/data/nation/ecuadorian.ruleset b/data/nation/ecuadorian.ruleset index 7343708152..638d340b8b 100644 --- a/data/nation/ecuadorian.ruleset +++ b/data/nation/ecuadorian.ruleset @@ -1,9 +1,9 @@ [nation_ecuadorian] -name=_("Ecuadorian") -plural=_("?plural:Ecuadorians") -groups="Modern", "American" -legend=_("Ecuador is a country in western South America. It is divided\ +name = _("Ecuadorian") +plural = _("?plural:Ecuadorians") +groups = "Modern", "American" +legend = _("Ecuador is a country in western South America. It is divided\ into three very distinct geographic regions: the coastal lowlands, the\ mountains of the Andes and the jungles of the Oriente. The Galápagos\ islands are also part of Ecuador. The country gained independence from\ @@ -34,13 +34,13 @@ ruler_titles = { "Fundamentalism", _("Bishop %s"), _("Mother Superior %s") } -flag="ecuador" +flag = "ecuador" flag_alt = "colombia" style = "Tropical" -init_techs="" -init_buildings="" -init_units="" +init_techs = "" +init_buildings = "" +init_units = "" conflicts_with = "inca" civilwar_nations = "canari", "inca" @@ -53,7 +53,7 @@ cities = "Manta (ocean)", "Santo Domingo de los Colorados (!ocean)", "Portoviejo (hills)", - "Durán (river)", ;Eloy Alfaro + "Durán (river)", ; Eloy Alfaro "Ambato (mountains, !ocean)", "Quevedo (river)", "Riobamba (mountains)", @@ -66,18 +66,18 @@ cities = "Santa Elena (ocean)", "Azogues (mountains)", "Guaranda (mountains)", - "Nueva Loja (forest, jungle)", ;Lago Agrio + "Nueva Loja (forest, jungle)", ; Lago Agrio "Tulcán (mountains)", "Macas (jungle)", - "Coca (jungle, river)", ;Puerto Francisco de Orellana + "Coca (jungle, river)", ; Puerto Francisco de Orellana "Tena (hills, forest, jungle)", "Zamora (mountains, hills)", "Puyo (jungle)", "Puerto Baquerizo Moreno (ocean)", "La Libertad", "El Carmen", - "Quinindé", ;Rosa Zarate - "El Empalme", ;Velasco Ibarra + "Quinindé", ; Rosa Zarate + "El Empalme", ; Velasco Ibarra "Ventanas", "Salinas", "Pasaje", diff --git a/data/nation/egyptian.ruleset b/data/nation/egyptian.ruleset index 58f140141f..d18330eae4 100644 --- a/data/nation/egyptian.ruleset +++ b/data/nation/egyptian.ruleset @@ -1,11 +1,11 @@ [nation_egyptian] -translation_domain="freeciv" +translation_domain = "freeciv" -name=_("Egyptian") -plural=_("?plural:Egyptians") -groups="Ancient", "African", "Core" -legend=_("Egypt was the second-oldest of the world's civilizations. Since\ +name = _("Egyptian") +plural = _("?plural:Egyptians") +groups = "Ancient", "African", "Core" +legend = _("Egypt was the second-oldest of the world's civilizations. Since\ ancient times it has been unusually urbanized, supporting a large\ population on silt deposited by the annual floodings of the Nile.") @@ -30,50 +30,50 @@ ruler_titles = { "Monarchy", _("Great Pharaoh %s"), _("?female:Great Pharaoh %s") } -flag="egypt_ancient" +flag = "egypt_ancient" flag_alt = "egypt" style = "Babylonian" -init_techs="" -init_buildings="" -init_units="" +init_techs = "" +init_buildings = "" +init_units = "" -civilwar_nations="nubian" +civilwar_nations = "nubian" ; Source: http://www.narmer.pl/map/nomy_en.htm ; Alternative names in comment cities = - "Waset", ; No-Amon, Diospolis Magna, Thebes, Luxor, Karnak - "Ineb-Hedj", ; Men-Nefer, Memphis, Mit Rahina - "Yunu", ; On, Heliopolis, el-Matariya - "Suentet", ; Syene, Asuan - "Sheresi", ; Merwer, Shedyt, Crokodilopolis, Arsinoe, Medinet el-Fayum - "Per-Bastet", ; Bubastis, Tell Basta - "Rakote", ; Alexandria - "Behdet", ; Sam-Behutkhet, Pa-khen-em-Amon, Hu, Diospolis Parva etc. - "Sa", ; Sais, San el-Hagar - "Hardai", ; Cynopolis - "This", ; Tjeny, Thinis, Girga - "Ipu", ; Ipu-Khent-Min, Khemmis Panopolis, Akhmim - "Djeuka", ; Antaeopolis, Kaw el-Kebir - "Yuni", ; Hermonthis, Armant - "Khem", ; Letopolis, Kom Ausim - "Henen-Nesut", ; Heracleopolis, Ehnasije el-Medine - "Per-Medjed", ; Oxyrynkhos, el-Bahnasa - "Per-Usiri", ; Djedu, Busiris, Taposiris Magna, Abusir Bana - "Imu", ; Kom el-Hisn - "Itji-Tawi", ; el-Lisht - "Sauti", ; Lycopolis, Asyut - "Akhet-Aton", ; el-Amarna - "Chaswu", ; Xois, Sakha - "Pi-Rameses", ; Qantir - "Abdju", ; Osiris, Abydos - "Djanenet", ; Hut-Waret, Tanis, Awaris, San el-Hagar + "Waset", ; No-Amon, Diospolis Magna, Thebes, Luxor, Karnak + "Ineb-Hedj", ; Men-Nefer, Memphis, Mit Rahina + "Yunu", ; On, Heliopolis, el-Matariya + "Suentet", ; Syene, Asuan + "Sheresi", ; Merwer, Shedyt, Crokodilopolis, Arsinoe, Medinet el-Fayum + "Per-Bastet", ; Bubastis, Tell Basta + "Rakote", ; Alexandria + "Behdet", ; Sam-Behutkhet, Pa-khen-em-Amon, Hu, Diospolis Parva etc. + "Sa", ; Sais, San el-Hagar + "Hardai", ; Cynopolis + "This", ; Tjeny, Thinis, Girga + "Ipu", ; Ipu-Khent-Min, Khemmis Panopolis, Akhmim + "Djeuka", ; Antaeopolis, Kaw el-Kebir + "Yuni", ; Hermonthis, Armant + "Khem", ; Letopolis, Kom Ausim + "Henen-Nesut", ; Heracleopolis, Ehnasije el-Medine + "Per-Medjed", ; Oxyrynkhos, el-Bahnasa + "Per-Usiri", ; Djedu, Busiris, Taposiris Magna, Abusir Bana + "Imu", ; Kom el-Hisn + "Itji-Tawi", ; el-Lisht + "Sauti", ; Lycopolis, Asyut + "Akhet-Aton", ; el-Amarna + "Chaswu", ; Xois, Sakha + "Pi-Rameses", ; Qantir + "Abdju", ; Osiris, Abydos + "Djanenet", ; Hut-Waret, Tanis, Awaris, San el-Hagar "Per-Banebdjedet", ; Mendes, Tema el-Amdid - "Tjeb-Neter", ; Sebennythos, Samanud + "Tjeb-Neter", ; Sebennythos, Samanud "Anpet-Djedet", ; Tmuis - "Gebtiu", ; Koptos, Kuft - "Taminhor", ; Hermopolis Parva, Damanhur + "Gebtiu", ; Koptos, Kuft + "Taminhor", ; Hermopolis Parva, Damanhur ; Cities without Old Egyptian name; Probably founded by Greeks or Romans "Pelusium", diff --git a/data/nation/egyptianarab.ruleset b/data/nation/egyptianarab.ruleset index 4927337da8..a329abd0ee 100644 --- a/data/nation/egyptianarab.ruleset +++ b/data/nation/egyptianarab.ruleset @@ -1,9 +1,9 @@ [nation_modernegyptian] -name=_("Egyptian Arab") -plural=_("?plural:Egyptian Arabs") -groups="Modern", "African", "Asian" -legend=_("Modern Egypt is the most populous Middle Eastern country as well\ +name = _("Egyptian Arab") +plural = _("?plural:Egyptian Arabs") +groups = "Modern", "African", "Asian" +legend = _("Modern Egypt is the most populous Middle Eastern country as well\ as one of the most populous in Africa. It is located on the site of one\ of the world's most ancient civilizations.") @@ -27,26 +27,26 @@ ruler_titles = { "Fundamentalism", _("Caliph %s"), _("Calipha %s") } -flag="egypt" +flag = "egypt" flag_alt = "egypt_ancient" style = "Babylonian" -init_techs="" -init_buildings="" -init_units="" +init_techs = "" +init_buildings = "" +init_units = "" -conflicts_with="egyptian" -civilwar_nations="palestinian", "sudanese", "libyan", "arab" +conflicts_with = "egyptian" +civilwar_nations = "palestinian", "sudanese", "libyan", "arab" cities = - "Al-Qahira", ;Cairo - "Eskendereyya", ;Alexandria - "As-Suways", ;Suez + "Al-Qahira", ; Cairo + "Eskendereyya", ; Alexandria + "As-Suways", ; Suez "Al-Mansura", - "El-Giza", ;Gizeh + "El-Giza", ; Gizeh "Shubra el-Kheima", - "Bur Sa'id", ;Port Said - "Al-Uqsur", ;Luxor + "Bur Sa'id", ; Port Said + "Al-Uqsur", ; Luxor "El-Mahalla el-Kubra", "Tanta", "Asyut", diff --git a/data/nation/elamite.ruleset b/data/nation/elamite.ruleset index 0960f60c5b..a31f3e25d3 100644 --- a/data/nation/elamite.ruleset +++ b/data/nation/elamite.ruleset @@ -1,9 +1,9 @@ [nation_elamite] -name=_("Elamite") -plural=_("?plural:Elamites") -groups="Asian", "Ancient" -legend=_("Elam was an ancient civilization located in the area of modern\ +name = _("Elamite") +plural = _("?plural:Elamites") +groups = "Asian", "Ancient" +legend = _("Elam was an ancient civilization located in the area of modern\ southwest Iran, which arose around 3100 BCE. The Elamite language,\ written in cuneiform, is of unknown origin. In 643 BCE the Elamite\ civilization was destroyed by the Assyrians under Assurbanipal.") @@ -27,6 +27,7 @@ leaders = { "Shilhana-Hamru-Lagamar", "Male" "Tammaritu II", "Male" } + ruler_titles = { "government", "male_title", "female_title" "Anarchy", _("Usurper %s"), _("?female:Usurper %s") @@ -36,9 +37,9 @@ flag = "elam" flag_alt = "-" style = "Classical" -init_techs="" -init_buildings="" -init_units="" +init_techs = "" +init_buildings = "" +init_units = "" conflicts_with = "iranian" civilwar_nations = "assyrian", "sumerian", "babylonian", "persian" @@ -67,4 +68,3 @@ cities = "Jiroft", "Zabol", "Marhasi" - diff --git a/data/nation/emirati.ruleset b/data/nation/emirati.ruleset index 36c967626c..a514d8d5ec 100644 --- a/data/nation/emirati.ruleset +++ b/data/nation/emirati.ruleset @@ -1,9 +1,9 @@ [nation_emirati] -name=_("Emirati") -plural=_("?plural:Emiratis") -groups="Modern", "Asian" -legend=_("The history of the United Arab Emirates goes back to the 7th\ +name = _("Emirati") +plural = _("?plural:Emiratis") +groups = "Modern", "Asian" +legend = _("The history of the United Arab Emirates goes back to the 7th\ century. In the 19th century the Emirates became a\ dependency of the United Kingdom. In 1971 six\ emirates joined in a federative state as the United\ @@ -27,15 +27,15 @@ ruler_titles = { "Republic", _("Vizier %s"), _("?female:Vizier %s") } -flag="uae" +flag = "uae" flag_alt = "-" style = "Babylonian" -init_techs="" -init_buildings="" -init_units="" +init_techs = "" +init_buildings = "" +init_units = "" -civilwar_nations="Saudi", "Omani", "Qatari" +civilwar_nations = "Saudi", "Omani", "Qatari" cities = "Abu Zabi", diff --git a/data/nation/english.ruleset b/data/nation/english.ruleset index 9a729ce131..14bce8a71e 100644 --- a/data/nation/english.ruleset +++ b/data/nation/english.ruleset @@ -1,11 +1,11 @@ [nation_english] -translation_domain="freeciv" +translation_domain = "freeciv" -name=_("English") -plural=_("?plural:English") -groups="Medieval", "Early Modern", "European", "Core" -legend=_("England was unified by Alfred the Great of Wessex in the late\ +name = _("English") +plural = _("?plural:English") +groups = "Medieval", "Early Modern", "European", "Core" +legend = _("England was unified by Alfred the Great of Wessex in the late\ 9th century, only to be conquered by William of Normandy a century\ later, in the last successful invasion of the country.") @@ -30,13 +30,14 @@ ruler_titles = { "Republic", _("Lord Protector %s"), _("Lady Protector %s") } -flag="england" +flag = "england" flag_alt = "united_kingdom" style = "European" -init_techs="" -init_buildings="" -init_units="" +init_techs = "" +init_buildings = "" +init_units = "" + civilwar_nations = "cornish", "british", "northumbrian" cities = diff --git a/data/nation/epirote.ruleset b/data/nation/epirote.ruleset index 31354a8731..e5b2ffd06a 100644 --- a/data/nation/epirote.ruleset +++ b/data/nation/epirote.ruleset @@ -1,41 +1,44 @@ [nation_epirote] -name=_("Epirote") -plural=_("?plural:Epirotes") -groups="Ancient", "European" -legend=_("The Epirotes were the ancient inhabitants of the Epirus region\ +name = _("Epirote") +plural = _("?plural:Epirotes") +groups = "Ancient", "European" +legend = _("The Epirotes were the ancient inhabitants of the Epirus region\ in northwestern Greece. Their most powerful ruler Pyrrhus launched a\ campaign against Rome in Italy, which ended in the famous \"Pyrrhic\ Victory\".") -leaders= { -"name", "sex" -"Pyrrhos", "Male" -"Arrybas", "Male" -"Alkon", "Male" -"Neoptolemos", "Male" -"Admetos", "Male" -"Aiakides", "Male" -"Falakrion", "Male" -"Deinon", "Male" -"Zopyros", "Male" -"Kallikrates", "Male" + +leaders = { + "name", "sex" + "Pyrrhos", "Male" + "Arrybas", "Male" + "Alkon", "Male" + "Neoptolemos", "Male" + "Admetos", "Male" + "Aiakides", "Male" + "Falakrion", "Male" + "Deinon", "Male" + "Zopyros", "Male" + "Kallikrates", "Male" } -flag= "epirus" -flag_alt = "greece" -style = "Classical" -ruler_titles = { "government", "male_title", "female_title" - "Anarchy", _("Usurper %s"), _("?female:Usurper %s") - "Democracy", _("Speaker %s"), _("?female:Speaker %s") - "Despotism", _("Tyrant %s"), _("?female:Tyrant %s") +flag = "epirus" +flag_alt = "greece" +style = "Classical" + +ruler_titles = { + "government", "male_title", "female_title" + "Anarchy", _("Usurper %s"), _("?female:Usurper %s") + "Democracy", _("Speaker %s"), _("?female:Speaker %s") + "Despotism", _("Tyrant %s"), _("?female:Tyrant %s") } -init_techs="" -init_buildings="" -init_units="" +init_techs = "" +init_buildings = "" +init_units = "" -conflicts_with="albanian" -civilwar_nations="macedon", "italian greek", "illyrian" +conflicts_with = "albanian" +civilwar_nations = "macedon", "italian greek", "illyrian" cities = "Dodona", diff --git a/data/nation/equatoguinean.ruleset b/data/nation/equatoguinean.ruleset index b0cb357ab8..7594ffc214 100644 --- a/data/nation/equatoguinean.ruleset +++ b/data/nation/equatoguinean.ruleset @@ -1,9 +1,9 @@ [nation_equatoguinean] -name=_("Equatoguinean") -plural=_("?plural:Equatoguineans") -groups="African", "Modern" -legend=_("Equatorial Guinea is a country in Africa. It is divided into a\ +name = _("Equatoguinean") +plural = _("?plural:Equatoguineans") +groups = "African", "Modern" +legend = _("Equatorial Guinea is a country in Africa. It is divided into a\ mainland part (Rio Muni) and the islands of Bioko and Annobon. Formerly\ Spanish Guinea, the country achieved independence in 1968. Equatorial\ Guinea is one of the wealthier countries of Africa but also one of the\ @@ -18,13 +18,13 @@ leaders = { "Teodoro Obiang Nguema", "Male" } -flag="equatorial_guinea" +flag = "equatorial_guinea" flag_alt = "-" style = "tropical" -init_techs="" -init_buildings="" -init_units="" +init_techs = "" +init_buildings = "" +init_units = "" civilwar_nations = "cameroonian", "santomean" diff --git a/data/nation/eritrean.ruleset b/data/nation/eritrean.ruleset index 91002b501a..5d4481505b 100644 --- a/data/nation/eritrean.ruleset +++ b/data/nation/eritrean.ruleset @@ -1,9 +1,9 @@ [nation_eritrean] -name=_("Eritrean") -plural=_("?plural:Eritreans") -groups="Modern", "African" -legend=_("Eritrea is a country in eastern Africa which borders Sudan,\ +name = _("Eritrean") +plural = _("?plural:Eritreans") +groups = "Modern", "African" +legend = _("Eritrea is a country in eastern Africa which borders Sudan,\ Ethiopia, and Djibouti. It was once the Kingdom of D'mt and was later\ conquered by Italy. In 1951 it was federated with Ethiopia, which led to\ the development of an independence movement in the 1960s. In 1991 the\ @@ -22,19 +22,19 @@ leaders = { ; (living). } -flag="eritrea" -flag_alt="-" +flag = "eritrea" +flag_alt = "-" style = "Babylonian" -init_techs="" -init_buildings="" -init_units="" +init_techs = "" +init_buildings = "" +init_units = "" -civilwar_nations="Ethiopian", "Italian" +civilwar_nations = "Ethiopian", "Italian" cities = - "Asmara", ; capital - "Nakfa", ; associated with independence movement + "Asmara", ; capital + "Nakfa", ; associated with independence movement ; remaining cities seen on Google maps "Hasta", "Agra", diff --git a/data/nation/esperant.ruleset b/data/nation/esperant.ruleset index e8872be11a..7ada1fb32e 100644 --- a/data/nation/esperant.ruleset +++ b/data/nation/esperant.ruleset @@ -1,9 +1,9 @@ [nation_esperant] -name=_("Esperant") -plural=_("?plural:Esperants") -groups= "Imaginary" -legend=_("The Esperants are a world community united by the Esperanto\ +name = _("Esperant") +plural = _("?plural:Esperants") +groups = "Imaginary" +legend =_("The Esperants are a world community united by the Esperanto\ language.") leaders = { @@ -16,13 +16,13 @@ leaders = { "Frederic PUJULÀ I VALLÈS", "Male" } -flag="esperanto" +flag = "esperanto" flag_alt = "-" style = "European" -init_techs="" -init_buildings="" -init_units="" +init_techs = "" +init_buildings = "" +init_units = "" civilwar_nations = "volapukan" diff --git a/data/nation/estonian.ruleset b/data/nation/estonian.ruleset index c39e341719..719557a349 100644 --- a/data/nation/estonian.ruleset +++ b/data/nation/estonian.ruleset @@ -1,9 +1,9 @@ [nation_estonian] -name=_("Estonian") -plural=_("?plural:Estonians") -groups="Modern", "European" -legend=_("Estonia is a small country on the south shore of the eastern\ +name = _("Estonian") +plural = _("?plural:Estonians") +groups = "Modern", "European" +legend = _("Estonia is a small country on the south shore of the eastern\ Baltic Sea. Its people and language are closely related to those of\ Finland.") @@ -22,14 +22,15 @@ ruler_titles = { "Fundamentalism", _("Elder %s"), _("?female:Elder %s") } -flag="estonia" +flag = "estonia" flag_alt = "-" style = "European" -init_techs="" -init_buildings="" -init_units="" -civilwar_nations="finnish", "latvian" +init_techs = "" +init_buildings = "" +init_units = "" + +civilwar_nations = "finnish", "latvian" ; Removed "danish", "dutch": No relation? cities = diff --git a/data/nation/ethiopian.ruleset b/data/nation/ethiopian.ruleset index 26b040f3be..0aef90de31 100644 --- a/data/nation/ethiopian.ruleset +++ b/data/nation/ethiopian.ruleset @@ -1,11 +1,11 @@ [nation_ethiopian] -translation_domain="freeciv" +translation_domain = "freeciv" -name=_("Ethiopian") -plural=_("?plural:Ethiopians") -groups="African", "Modern", "Core" -legend=_("Ethiopia is the oldest nation in Africa and the only one to\ +name = _("Ethiopian") +plural = _("?plural:Ethiopians") +groups = "African", "Modern", "Core" +legend = _("Ethiopia is the oldest nation in Africa and the only one to\ remain independent during European colonialism.") leaders = { @@ -27,15 +27,15 @@ ruler_titles = { "Monarchy", _("Emperor %s"), _("Empress %s") } -flag="ethiopia" +flag = "ethiopia" flag_alt = "italy" style = "Babylonian" -init_techs="" -init_buildings="" -init_units="" +init_techs = "" +init_buildings = "" +init_units = "" -civilwar_nations="Sudanese", "Somali", "Eritrean" +civilwar_nations = "Sudanese", "Somali", "Eritrean" cities = "Addis Abeba", diff --git a/data/nation/etruscan.ruleset b/data/nation/etruscan.ruleset index 316fbe5c2a..c1a5cfef4b 100644 --- a/data/nation/etruscan.ruleset +++ b/data/nation/etruscan.ruleset @@ -1,9 +1,9 @@ [nation_etruscan] -name=_("Etruscan") -plural=_("?plural:Etruscans") -groups="Ancient", "European" -legend=_("The Etruscans were an ancient civilization in Etruria, Italy,\ +name = _("Etruscan") +plural = _("?plural:Etruscans") +groups = "Ancient", "European" +legend = _("The Etruscans were an ancient civilization in Etruria, Italy,\ known for their artistic achievements and building of necropolises.\ Their language is only partly deciphered and their origins are still\ debated. They called themselves Rasna and formed a confederation of twelve\ @@ -33,14 +33,13 @@ ruler_titles = { "Republic", _("Consul %s"), _("?female:Consul %s") } - flag = "etruscan" flag_alt = "italy" style = "Classical" -init_techs="" -init_buildings="" -init_units="" +init_techs = "" +init_buildings = "" +init_units = "" conflicts_with = "italian" civilwar_nations = "roman", "corsican", "gallic" @@ -92,4 +91,3 @@ cities = "Campeva", "Tuscna", "Spica" - diff --git a/data/nation/european.ruleset b/data/nation/european.ruleset index 531ae39b70..658221e6df 100644 --- a/data/nation/european.ruleset +++ b/data/nation/european.ruleset @@ -1,9 +1,9 @@ [nation_europe] -name=_("European") -plural=_("?plural:Europeans") -groups="Imaginary" -legend=_("The foundation for the European Union was laid in 1957 with the\ +name = _("European") +plural = _("?plural:Europeans") +groups = "Imaginary" +legend = _("The foundation for the European Union was laid in 1957 with the\ Treaty of Rome. The EU project has developed since then and is beginning to\ resemble a fledgeling super state. But the question remains: Does such a\ thing as a common European identity and nation actually exist?") @@ -24,28 +24,29 @@ ruler_titles = { "Democracy", _("Commissioner %s"), _("?female:Commissioner %s") } -flag="europe" +flag = "europe" flag_alt = "-" style = "European" -init_techs="" -init_buildings="" -init_units="" - - -conflicts_with="austrian", "belgian", "bulgarian", "czech", "cypriot", - "danish", "estonian", "finnish", "french", "german", - "hellenic", "hungarian", "irish", "italian", "latvian", - "lithuanian", "luxembourgish", "maltese", "dutch", "polish", - "portuguese", "romanian", "slovakian", "slovenian", - "spanish", "swedish", "british" -civilwar_nations="austrian", "belgian", "bulgarian", "czech", "cypriot", - "danish", "estonian", "finnish", "french", "german", - "hellenic", "hungarian", "irish", "italian", "latvian", - "lithuanian", "luxembourgish", "maltese", "dutch", "polish", - "portuguese", "romanian", "slovakian", "slovenian", - "spanish", "swedish", "british" -cities= +init_techs = "" +init_buildings = "" +init_units = "" + + +conflicts_with = "austrian", "belgian", "bulgarian", "czech", "cypriot", + "danish", "estonian", "finnish", "french", "german", + "hellenic", "hungarian", "irish", "italian", "latvian", + "lithuanian", "luxembourgish", "maltese", "dutch", "polish", + "portuguese", "romanian", "slovakian", "slovenian", + "spanish", "swedish", "british" +civilwar_nations = "austrian", "belgian", "bulgarian", "czech", "cypriot", + "danish", "estonian", "finnish", "french", "german", + "hellenic", "hungarian", "irish", "italian", "latvian", + "lithuanian", "luxembourgish", "maltese", "dutch", "polish", + "portuguese", "romanian", "slovakian", "slovenian", + "spanish", "swedish", "british" + +cities = ; Sites of EU institutions "Brussel / Bruxelles", "Lëtzebuerg", diff --git a/data/nation/evenki.ruleset b/data/nation/evenki.ruleset index 6cf84a733b..420158816d 100644 --- a/data/nation/evenki.ruleset +++ b/data/nation/evenki.ruleset @@ -1,10 +1,10 @@ [nation_evenki] -name=_("Evenki") -plural=_("?plural:Evenks") -groups="Asian", "Early Modern" +name = _("Evenki") +plural = _("?plural:Evenks") +groups = "Asian", "Early Modern" -legend=_("The Evenks are a Tungusic ethnic group in Siberia, Mongolia,\ +legend = _("The Evenks are a Tungusic ethnic group in Siberia, Mongolia,\ and northern China. Historical evidence suggests that they have lived\ in the Baikal area on today's Russian-Mongolian border since the Stone\ Age. When encountered by the Russians in the 17th century, the Evenks\ @@ -22,15 +22,15 @@ ruler_titles = { "Fundamentalism", _("Shaman %s"), _("?female:Shaman %s") } -flag="evenkia" +flag = "evenkia" flag_alt="-" style = "European" -init_techs="" -init_buildings="" -init_units="" +init_techs = "" +init_buildings = "" +init_units = "" -civilwar_nations="Yakut", "Siberian", "Manchu" +civilwar_nations = "Yakut", "Siberian", "Manchu" cities = "Tura", ; Тура -- 2.30.2