From 56361236a53b2339ec8409235d18570bbf027fe0 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 2 Jun 2021 03:56:50 +0300 Subject: [PATCH 47/47] Improve coding style of i*.ruleset nation rulesets See osdn #42453 Signed-off-by: Marko Lindqvist --- data/nation/iberian.ruleset | 18 ++--- data/nation/icelandic.ruleset | 19 ++--- data/nation/illyrian.ruleset | 15 ++-- data/nation/inca.ruleset | 21 +++--- data/nation/indian.ruleset | 40 +++++------ data/nation/indoeuropean.ruleset | 31 ++++---- data/nation/indonesian.ruleset | 25 ++++--- data/nation/inuit.ruleset | 25 +++---- data/nation/iranian.ruleset | 20 +++--- data/nation/iraqi.ruleset | 18 ++--- data/nation/irish.ruleset | 17 +++-- data/nation/iroquois.ruleset | 117 ++++++++++++++++--------------- data/nation/israeli.ruleset | 33 ++++----- data/nation/israelite.ruleset | 117 +++++++++++++++---------------- data/nation/italian.ruleset | 18 ++--- data/nation/italiangreek.ruleset | 20 +++--- data/nation/ivoirian.ruleset | 18 ++--- 17 files changed, 290 insertions(+), 282 deletions(-) diff --git a/data/nation/iberian.ruleset b/data/nation/iberian.ruleset index 7094c696d6..64010bec3a 100644 --- a/data/nation/iberian.ruleset +++ b/data/nation/iberian.ruleset @@ -1,9 +1,9 @@ [nation_iberian] -name=_("Iberian") -plural=_("?plural:Iberians") -groups="Ancient", "European" -legend=_("The Iberians were non-Indo-European inhabitants of the\ +name = _("Iberian") +plural = _("?plural:Iberians") +groups = "Ancient", "European" +legend = _("The Iberians were non-Indo-European inhabitants of the\ ancient Iberian Peninsula. Very little is known about their history.\ They were subjugated by Rome in the last centuries BCE.") @@ -18,13 +18,14 @@ leaders = { "Mandonio", "Male" } -flag="iberian" +flag = "iberian" flag_alt = "-" style = "Babylonian" -init_techs="" -init_buildings="" -init_units="" +init_techs = "" +init_buildings = "" +init_units = "" + conflicts_with = "spanish", "portuguese", "castilian", "catalan", "aragonese" civilwar_nations = "basque", "etruscan", "celtiberian" ;lustianian tartessian @@ -74,4 +75,3 @@ cities = "Indika", "Kallentum", "Sexs" - diff --git a/data/nation/icelandic.ruleset b/data/nation/icelandic.ruleset index a25c40a6f2..c8879c5424 100644 --- a/data/nation/icelandic.ruleset +++ b/data/nation/icelandic.ruleset @@ -1,9 +1,9 @@ [nation_icelandic] -name=_("Icelandic") -plural=_("?plural:Icelanders") -groups="Modern", "European" -legend=_("Iceland was long one of the largest uninhabited islands in the\ +name = _("Icelandic") +plural = _("?plural:Icelanders") +groups = "Modern", "European" +legend = _("Iceland was long one of the largest uninhabited islands in the\ world, until it was settled by Norwegian Vikings in the\ late 9th century. The island was kept initially under the Norwegian and\ later the Danish crown until independence from Denmark in 1944.") @@ -17,18 +17,21 @@ leaders = { "Kristján Eldjárn", "Male" "Vigdís Finnbogadóttir", "Female" } + ruler_titles = { "government", "male_title", "female_title" "Despotism", _("Earl %s"), _("?female:Earl %s") "Fundamentalism", _("Bishop %s"), _("?female:Bishop %s") } -flag="iceland" + +flag = "iceland" flag_alt = "norway" style = "European" -init_techs="" -init_buildings="" -init_units="" +init_techs = "" +init_buildings = "" +init_units = "" + civilwar_nations = "danish", "faroese" cities = diff --git a/data/nation/illyrian.ruleset b/data/nation/illyrian.ruleset index 642c5c5a7c..8b9e28b4d3 100644 --- a/data/nation/illyrian.ruleset +++ b/data/nation/illyrian.ruleset @@ -1,9 +1,9 @@ [nation_illyrian] -name=_("Illyrian") -plural=_("?plural:Illyrians") -groups="Ancient", "European" -legend=_("Illyrians were Indo-European tribes who appeared in the\ +name = _("Illyrian") +plural = _("?plural:Illyrians") +groups = "Ancient", "European" +legend = _("Illyrians were Indo-European tribes who appeared in the\ western part of the Balkan Peninsula before 1000 BCE, including\ Corcyra island and Ambracia bay in prehistoric Epirus to the south.\ They mixed with Thracians in Dardania to the east,\ @@ -30,9 +30,10 @@ flag = "illyria" flag_alt = "-" style = "Classical" -init_techs="" -init_buildings="" -init_units="" +init_techs = "" +init_buildings = "" +init_units = "" + civilwar_nations = "thracian", "paeonian", "epirote", "liburnian" ; known regional capitals listed first. diff --git a/data/nation/inca.ruleset b/data/nation/inca.ruleset index a6dbba13aa..6c1790ea20 100644 --- a/data/nation/inca.ruleset +++ b/data/nation/inca.ruleset @@ -1,12 +1,12 @@ [nation_inca] -translation_domain="freeciv" +translation_domain = "freeciv" -name=_("Inca") -plural=_("?plural:Incas") -groups="Medieval", "American", "Core" +name = _("Inca") +plural = _("?plural:Incas") +groups = "Medieval", "American", "Core" -legend=_("The Inca were an Amerind people of the Northern Andes who\ +legend = _("The Inca were an Amerind people of the Northern Andes who\ conquered an empire stretching along the west coast of South America\ from what is now southern Chile nearly to the Equator. They had the bad\ timing to do it just a few decades before the Spanish conquistadors\ @@ -36,14 +36,15 @@ ruler_titles = { "Monarchy", _("Sapa Inka %s"), _("Sapa Qoya %s") } -flag="inca" +flag = "inca" flag_alt = "peru" ; Used previously style = "Tropical" -init_techs="" -init_buildings="" -init_units="" -civilwar_nations="aymara", "chimu", "canari" +init_techs = "" +init_buildings = "" +init_units = "" + +civilwar_nations = "aymara", "chimu", "canari" cities = "Qosqo", diff --git a/data/nation/indian.ruleset b/data/nation/indian.ruleset index 1cf842c674..143b90063d 100644 --- a/data/nation/indian.ruleset +++ b/data/nation/indian.ruleset @@ -1,11 +1,11 @@ [nation_indian] -translation_domain="freeciv" +translation_domain = "freeciv" -name=_("Indian") -plural=_("?plural:Indians") -groups="Modern", "Asian", "Core" -legend=_("The Republic of India was created in 1950 following a\ +name = _("Indian") +plural = _("?plural:Indians") +groups = "Modern", "Asian", "Core" +legend = _("The Republic of India was created in 1950 following a\ non-violent independence movement led by Mahatma Gandhi. With more\ than a billion inhabitants it is the world's second most populous\ country as well as the world's largest democracy.") @@ -29,33 +29,33 @@ ruler_titles = { "Republic", _("Mahatma %s"), _("?female:Mahatma %s") } -flag="india" +flag = "india" flag_alt = "-" style = "Asian" -init_techs="" -init_buildings="" -init_units="" +init_techs = "" +init_buildings = "" +init_units = "" -conflicts_with="Gupta", "Chola", "Mughal", "Marathi" -civilwar_nations="Bengali", "Sikh", "Kashmiri", "Assamese", "Marathi" +conflicts_with = "Gupta", "Chola", "Mughal", "Marathi" +civilwar_nations = "Bengali", "Sikh", "Kashmiri", "Assamese", "Marathi" cities = "Delhi", - "Mumbai", ; Bombay - "Chennai", ; Madras + "Mumbai", ; Bombay + "Chennai", ; Madras "Bangalore", - "Kolkata", ; Calcutta - "Ahmedabad", ; Ahmadabad + "Kolkata", ; Calcutta + "Ahmedabad", ; Ahmadabad "Kanpur", "Hyderabad", "Lucknow", - "Varanasi", ; Benares + "Varanasi", ; Benares "Chandigarh", "Madurai", "Coimbatore", - "Kozhikode", ; Calicut - "Thiruvananthapuram", ; Trivandrum + "Kozhikode", ; Calicut + "Thiruvananthapuram", ; Trivandrum "Nagpur", "Amritsar", "Srinagar", @@ -70,8 +70,8 @@ cities = "Mysore", "Raipur", "Gaya", - "Kanpur", ; Cawnpore - "Pune (hills)", ; Poona + "Kanpur", ; Cawnpore + "Pune (hills)", ; Poona "Ranchi", "Bhubaneswar", "Thiruvananthapuram", diff --git a/data/nation/indoeuropean.ruleset b/data/nation/indoeuropean.ruleset index 749f706815..7c939eb425 100644 --- a/data/nation/indoeuropean.ruleset +++ b/data/nation/indoeuropean.ruleset @@ -1,9 +1,9 @@ [nation_indoeuropean] -name=_("Indo-European") -plural=_("?plural:Indo-Europeans") -groups="Imaginary", "European", "Asian" -legend=_("The Indo-Europeans were a hypothetical ancient people who were\ +name = _("Indo-European") +plural = _("?plural:Indo-Europeans") +groups = "Imaginary", "European", "Asian" +legend = _("The Indo-Europeans were a hypothetical ancient people who were\ linguistically ancestral to modern peoples in Europe and South and West\ Asia. They probably existed about 5000 years ago somewhere on the\ Eurasian steppes, but their true origins remain a mystery. The existence\ @@ -11,6 +11,7 @@ legend=_("The Indo-Europeans were a hypothetical ancient people who were\ on the basis of which attempts to reconstruct the Proto-Indo-European\ language have been made. One of the first scientists who noted the\ similarities between these languages was Sir William Jones.") + leaders = { "name", "sex" "William Jones", "Male" @@ -30,21 +31,21 @@ leaders = { "Friderik Kortlandt", "Male" } -flag="indoeuropean" +flag = "indoeuropean" flag_alt = "-" style = "Celtic" -init_techs="" -init_buildings="" -init_units="" +init_techs = "" +init_buildings = "" +init_units = "" -conflicts_with="gallic", "briton", "roman", "western roman", "byzantine", "scythian", - "sarmatian", "celtiberian", "greek", "macedon", "thracian", "paeonian", - "illyrian", "persian", "tocharian", "saka", "hephthalite", - "slavic", "liburnian", "helvetian", "gaelic", "pictish", "viking", - "ostrogothic", "visigothic", "vandalic", "armenian", "hittite", - "epirote", "teutonic", "frankish", "boian", "phrygian", "dacian", - "belgic" +conflicts_with = "gallic", "briton", "roman", "western roman", "byzantine", + "scythian", "sarmatian", "celtiberian", "greek", "macedon", + "thracian", "paeonian", "illyrian", "persian", "tocharian", + "saka", "hephthalite", "slavic", "liburnian", "helvetian", + "gaelic", "pictish", "viking", "ostrogothic", "visigothic", + "vandalic", "armenian", "hittite", "epirote", "teutonic", + "frankish", "boian", "phrygian", "dacian", "belgic" civilwar_nations = ; armenian "armenian", diff --git a/data/nation/indonesian.ruleset b/data/nation/indonesian.ruleset index 5a19b2a789..4cc0249224 100644 --- a/data/nation/indonesian.ruleset +++ b/data/nation/indonesian.ruleset @@ -1,11 +1,11 @@ [nation_indonesian] -translation_domain="freeciv" +translation_domain = "freeciv" -name=_("Indonesian") -plural=_("?plural:Indonesians") -groups="Modern", "Asian", "Oceanian", "Core" -legend=_("Indonesia is a large country on the Malay Archipelago with central\ +name = _("Indonesian") +plural = _("?plural:Indonesians") +groups = "Modern", "Asian", "Oceanian", "Core" +legend = _("Indonesia is a large country on the Malay Archipelago with central\ government on the island of Java. The country has a Muslim majority and is\ one of the most populous in the world.") @@ -21,17 +21,18 @@ ruler_titles = { "Monarchy", _("Sultan %s"), _("Sultana %s") "Fundamentalism", _("Imam %s"), _("Imama %s") } -flag="indonesia" + +flag = "indonesia" flag_alt = "-" style = "Tropical" -init_techs="" -init_buildings="" -init_units="" +init_techs = "" +init_buildings = "" +init_units = "" ; Singapore has very similar flag -conflicts_with="Singaporean", "Majapahit", "Sri Vijaya" -civilwar_nations="Acehnese", "East Timorese", "Moluccan", "Papuan" +conflicts_with = "Singaporean", "Majapahit", "Sri Vijaya" +civilwar_nations = "Acehnese", "East Timorese", "Moluccan", "Papuan" cities = "Jakarta", @@ -61,5 +62,3 @@ cities = "Jambi", "Pacet", "Ambon" - - diff --git a/data/nation/inuit.ruleset b/data/nation/inuit.ruleset index dc14b8c412..53367003a0 100644 --- a/data/nation/inuit.ruleset +++ b/data/nation/inuit.ruleset @@ -1,9 +1,9 @@ [nation_inuit] -name=_("Inuit") -plural=_("?plural:Inuits") -groups="American" -legend=_("The Inuits are a group of peoples inhabiting the Arctic areas\ +name = _("Inuit") +plural = _("?plural:Inuits") +groups = "American" +legend = _("The Inuits are a group of peoples inhabiting the Arctic areas\ of North America and Siberia. The Canadian territory of Nunavut has a\ majority population of Inuits; the name of the territory means \"our\ land\" in Inuktitut.") @@ -24,20 +24,21 @@ ruler_titles = { "Democracy", _("Principal Chief %s"), _("?female:Principal Chief %s") } -flag="nunavut" +flag = "nunavut" flag_alt = "greenland" ; used previously style = "European" -init_techs="" -init_buildings="" -init_units="" -civilwar_nations="Canadian", "Aleut", "Greenlander" +init_techs = "" +init_buildings = "" +init_units = "" + +civilwar_nations = "Canadian", "Aleut", "Greenlander" cities = ; Communities recognised by the Government of Nunavut - "Iqaluit", ; Frobisher Bay + "Iqaluit", ; Frobisher Bay "Kangiqiniq", - "Arviat", ; Eskimo Point + "Arviat", ; Eskimo Point "Qamani’tuaq", "Iglulik", "Iqaluktuuttiaq", @@ -55,7 +56,7 @@ cities = "Arviligjuaq", "Sanirajak", "Qikiqtarjuaq", - "Kimmirut", ; Lake Harbour + "Kimmirut", ; Lake Harbour "Tikirarjuaq", "Igluligaarjuk", "Qausuittuq", diff --git a/data/nation/iranian.ruleset b/data/nation/iranian.ruleset index ca5d6a9f60..f4db13c1e0 100644 --- a/data/nation/iranian.ruleset +++ b/data/nation/iranian.ruleset @@ -1,9 +1,9 @@ [nation_iranian] -name=_("Iranian") -plural=_("?plural:Iranians") -groups="Modern", "Asian" -legend=_("Iran means \"Land of the Aryans\" - long known as Persia in the\ +name = _("Iranian") +plural = _("?plural:Iranians") +groups = "Modern", "Asian" +legend = _("Iran means \"Land of the Aryans\" - long known as Persia in the\ Western world. The country is today an Islamic Republic and a major\ power in the Middle East.") @@ -42,16 +42,16 @@ ruler_titles = { "Fundamentalism", _("Ayatollah %s"), _("?female:Ayatollah %s") } -flag="iran" +flag = "iran" flag_alt = "-" style = "Classical" -init_techs="" -init_buildings="" -init_units="" +init_techs = "" +init_buildings = "" +init_units = "" -conflicts_with="Persian" -civilwar_nations="Tajik", "Pashtun", "Azeri" +conflicts_with = "Persian" +civilwar_nations = "Tajik", "Pashtun", "Azeri" ; http://de.wikipedia.org/wiki/Liste_der_Städte_im_Iran cities = diff --git a/data/nation/iraqi.ruleset b/data/nation/iraqi.ruleset index be6f7bd287..a44b1569b4 100644 --- a/data/nation/iraqi.ruleset +++ b/data/nation/iraqi.ruleset @@ -1,9 +1,9 @@ [nation_iraqi] -name=_("Iraqi") -plural=_("?plural:Iraqis") -groups="Modern", "Asian" -legend=_("Iraq was founded after the fall of the Ottoman\ +name = _("Iraqi") +plural = _("?plural:Iraqis") +groups = "Modern", "Asian" +legend = _("Iraq was founded after the fall of the Ottoman\ empire. It is encompassing the ancient region of Mesopotamia at the\ confluence of the Tigris and Euphrates rivers.") @@ -26,12 +26,12 @@ flag = "iraq" flag_alt = "iraq_old" style = "Babylonian" -init_techs="" -init_buildings="" -init_units="" +init_techs = "" +init_buildings = "" +init_units = "" -conflicts_with="Sumerian", "Babylonian" -civilwar_nations="Assyrian", "Kurdish", "Kuwaiti" +conflicts_with = "Sumerian", "Babylonian" +civilwar_nations = "Assyrian", "Kurdish", "Kuwaiti" cities = "Baghdad", diff --git a/data/nation/irish.ruleset b/data/nation/irish.ruleset index c15ce4b74e..d6d23926bd 100644 --- a/data/nation/irish.ruleset +++ b/data/nation/irish.ruleset @@ -1,9 +1,9 @@ [nation_irish] -name = _("Irish") +name = _("Irish") plural = _("?plural:Irish") -groups="Medieval", "Modern", "European" -legend=_("Ireland held out against the Romans and Vikings but was\ +groups = "Medieval", "Modern", "European" +legend = _("Ireland held out against the Romans and Vikings but was\ conquered by the Normans in 1171. It was ruled by the English until 1922\ when most of the country was granted limited autonomy, becoming a republic\ in 1949. The North of Ireland was settled in the 17th century by Scottish\ @@ -44,16 +44,16 @@ ruler_titles = { "Democracy", _("Taoiseach %s"), _("?female:Taoiseach %s") } -flag="ireland" +flag = "ireland" flag_alt = "-" style = "Celtic" -init_techs="" -init_buildings="" -init_units="" +init_techs = "" +init_buildings = "" +init_units = "" ; Similar flags -conflicts_with="italian" +conflicts_with = "italian" civilwar_nations = "scottish gaelic", "english", "scottish", "gaelic" cities = @@ -166,4 +166,3 @@ cities = "Portarlington (swamp, !ocean)", "Cahir (hills)", "Trim (grassland, river)" - diff --git a/data/nation/iroquois.ruleset b/data/nation/iroquois.ruleset index eaf8bb96a7..eafbf9e4e4 100644 --- a/data/nation/iroquois.ruleset +++ b/data/nation/iroquois.ruleset @@ -1,11 +1,11 @@ [nation_iroquois] -translation_domain="freeciv" +translation_domain = "freeciv" -name=_("Iroquois") -plural=_("?plural:Iroquois") -groups="Medieval", "Early Modern", "American", "Core" -legend=_("The Iroquois Confederacy - known as Haudenosaunee in their own\ +name = _("Iroquois") +plural = _("?plural:Iroquois") +groups = "Medieval", "Early Modern", "American", "Core" +legend = _("The Iroquois Confederacy - known as Haudenosaunee in their own\ language - was a North American group of nations with common language and\ culture. They were based in what is now upstate New York and consisted\ originally of five nations: Seneca, Cayuga, Onondaga, Oneida and Mohawk.\ @@ -30,70 +30,71 @@ ruler_titles = { "Democracy", _("Principal Chief %s"), _("?female:Principal Chief %s") } -flag="iroquois" +flag = "iroquois" flag_alt = "-" style = "Celtic" -init_techs="" -init_buildings="" -init_units="" +init_techs = "" +init_buildings = "" +init_units = "" + civilwar_nations = "american", "quebecois", "sioux" cities = - "Onondaga", ; (Onondaga) - "Oneida", ; (Oneida) - "Teyagon", ; (at Toronto) (Seneca) - "Ganaraske (river)", ; (at Port Hope) (Cayuga) - "Akwesasne", ; (=Saint Regis) (Mohawk) - "Canienga", ; (Canienga=Mohawk) - "Oswegatchie", ; (=Ogdensburgh) (Onondaga / Oneida) - "Caughnawaga", ; (Mohawk) - "Cattaraugus", ; (Seneca) - "Kente", ; (Cayuga) + "Onondaga", ; (Onondaga) + "Oneida", ; (Oneida) + "Teyagon", ; (at Toronto) (Seneca) + "Ganaraske (river)", ; (at Port Hope) (Cayuga) + "Akwesasne", ; (=Saint Regis) (Mohawk) + "Canienga", ; (Canienga=Mohawk) + "Oswegatchie", ; (=Ogdensburgh) (Onondaga / Oneida) + "Caughnawaga", ; (Mohawk) + "Cattaraugus", ; (Seneca) + "Kente", ; (Cayuga) - "Gandesetaiagon", ; (=Oshawa) (Seneca) - "Tiohero", ; (Cayuga) + "Gandesetaiagon", ; (=Oshawa) (Seneca) + "Tiohero", ; (Cayuga) "Niagara Falls (river)", ; (Neutral / Tuscarora) - "Tonawanda", ; (Seneca) - "Owego", ; (Cayuga) - "Kanagaro", ; (Mohawk) - "Opolopong", ; (Oneida) - "Grand River (river)", ; (Seneca) - "Deseroken", ; (Onondaga) - "Allegany", ; (Seneca) + "Tonawanda", ; (Seneca) + "Owego", ; (Cayuga) + "Kanagaro", ; (Mohawk) + "Opolopong", ; (Oneida) + "Grand River (river)", ; (Seneca) + "Deseroken", ; (Onondaga) + "Allegany", ; (Seneca) - "Salamanca", ; (=Bucktooth) (Seneca) - "Tuscarora", ; (Tuscarora) - "Saratoga", ; (Mohawk) - "Geneseo", ; (Seneca) - "Chondote", ; (Cayuga) - "Tyendinaga", ; (=Brantville) (Mohawk) - "Tueadasso", ; (Onondaga) - "Buckaloon", ; (Seneca) - "Onnontare", ; (Cayuga) - "Skohare", ; (Mohawk) + "Salamanca", ; (=Bucktooth) (Seneca) + "Tuscarora", ; (Tuscarora) + "Saratoga", ; (Mohawk) + "Geneseo", ; (Seneca) + "Chondote", ; (Cayuga) + "Tyendinaga", ; (=Brantville) (Mohawk) + "Tueadasso", ; (Onondaga) + "Buckaloon", ; (Seneca) + "Onnontare", ; (Cayuga) + "Skohare", ; (Mohawk) - "Catherine's Town", ; (Seneca) - "Ganogeh", ; (Cayuga) - "Oka (mountains)", ; (=Lac des Deux-Montagnes) (Mohawk) - "Skannayutenate", ; (Cayuga) - "Oriska", ; (Oneida) - "Canajoharie", ; (Mohawk) - "Oil Springs", ; (Seneca) - "Gannentaha", ; (Onondaga) - "Buffalo Creek", ; (Seneca) - "Neodakheat", ; (Cayuga) + "Catherine's Town", ; (Seneca) + "Ganogeh", ; (Cayuga) + "Oka (mountains)", ; (=Lac des Deux-Montagnes) (Mohawk) + "Skannayutenate", ; (Cayuga) + "Oriska", ; (Oneida) + "Canajoharie", ; (Mohawk) + "Oil Springs", ; (Seneca) + "Gannentaha", ; (Onondaga) + "Buffalo Creek", ; (Seneca) + "Neodakheat", ; (Cayuga) - "Cowassalong", ; (Oneida) - "Union Springs", ; (Cayuga) - "Venango", ; (Seneca) - "Nowadaga", ; (Mohawk) - "Chemung", ; (Seneca) - "Osquake", ; (Mohawk) - "Cittenango", ; (Oneida) - "Gadoquat", ; (Onondaga) - "Onnahee", ; (Seneca) - "Mingo Town", ; (Iroquois) + "Cowassalong", ; (Oneida) + "Union Springs", ; (Cayuga) + "Venango", ; (Seneca) + "Nowadaga", ; (Mohawk) + "Chemung", ; (Seneca) + "Osquake", ; (Mohawk) + "Cittenango", ; (Oneida) + "Gadoquat", ; (Onondaga) + "Onnahee", ; (Seneca) + "Mingo Town", ; (Iroquois) ; More cities in alphabetical order. Source: ; http://www.accessgenealogy.com/native/tribes/iroquioi/iroquoisvillages.htm diff --git a/data/nation/israeli.ruleset b/data/nation/israeli.ruleset index 050a6167e2..5ad03b8872 100644 --- a/data/nation/israeli.ruleset +++ b/data/nation/israeli.ruleset @@ -1,9 +1,9 @@ [nation_israeli] -name=_("Israeli") -plural=_("?plural:Israelis") -groups="Modern", "Asian" -legend=_("The nation of Israel was founded in 1948 as a scattered collection\ +name = _("Israeli") +plural = _("?plural:Israelis") +groups = "Modern", "Asian" +legend = _("The nation of Israel was founded in 1948 as a scattered collection\ of cantons in British Palestine, and has gradually expanded through winning\ wars in 1948, 1967 and 1973.") @@ -18,36 +18,37 @@ leaders = { "Yitzhak Rabin", "Male" "Shimon Peres", "Male" } + ruler_titles = { "government", "male_title", "female_title" "Communism", _("Kibbutznik %s"), _("?female:Kibbutznikit %s") "Despotism", _("General %s"), _("?female:General %s") "Fundamentalism", _("Rabbi %s"), _("?female:Rabbi %s") } -flag="israel" +flag = "israel" flag_alt = "menora" style = "Babylonian" -init_techs="" -init_buildings="" +init_techs = "" +init_buildings = "" +init_units = "" -init_units="" civilwar_nations = "palestinian" cities = ;claimed capital - "Yerushalayim", ;Jerusalem + "Yerushalayim", ; Jerusalem ;internationally recognized capital - "Tel Aviv-Yafo (ocean)", ;Tel Aviv-Jaffa + "Tel Aviv-Yafo (ocean)", ; Tel Aviv-Jaffa ;other cities in Israel proper "Haifa (ocean)", - "Be'er Sheva (desert)", ;Beersheba - "Natzrat", ;Nazareth + "Be'er Sheva (desert)", ; Beersheba + "Natzrat", ; Nazareth "Ramlah", "Ashdod (ocean)", - "Ashqelon (ocean)", ;Ashkelon + "Ashqelon (ocean)", ; Ashkelon "Rishon LeZiyyon", "Petah Tiqwa", "Netanya", @@ -67,13 +68,13 @@ cities = "Qiryat Atta", "Giv'atayim", "Hod HaSharon", - "Elat", ;Eilat - "Akko", ;Acre + "Elat", ; Eilat + "Akko", ; Acre "Karmi'el", "Umm al-Fahm", "Rahat", "Natzrat Illit", - "Tverya", ;Tiberias + "Tverya", ; Tiberias "Afula", "Qiryat Motzkin", "Rosh HaAyin", diff --git a/data/nation/israelite.ruleset b/data/nation/israelite.ruleset index 00806f89d3..11e59ab9cf 100644 --- a/data/nation/israelite.ruleset +++ b/data/nation/israelite.ruleset @@ -1,9 +1,9 @@ [nation_israelite] -name=_("Israelite") -plural=_("?plural:Israelites") -groups="Ancient", "Asian" -legend=_("Israel was a Jewish kingdom on the eastern shore of the\ +name = _("Israelite") +plural = _("?plural:Israelites") +groups = "Ancient", "Asian" +legend = _("Israel was a Jewish kingdom on the eastern shore of the\ Mediterranean founded around 1000 BCE. Much of its history is told in the\ holy books of the Abrahamic religions. The last Jewish kingdom was\ destroyed by the Romans in the 1st century CE, leaving the Jews\ @@ -32,66 +32,65 @@ ruler_titles = { "Democracy", _("Judge %s"), _("?female:Judge %s") } -flag="israel_ancient" +flag = "israel_ancient" flag_alt = "israel" style = "Babylonian" -init_techs="" -init_buildings="" - -init_units="" +init_techs = "" +init_buildings = "" +init_units = "" conflicts_with = "israeli", "palestinian" civilwar_nations = "aramean", "egyptian", "phoenician" cities = - "Yerushalayim", ;Jerusalem - "Yeriho", ;Jericho - "Hevron", ;Hebron - "Shomron", ;Samaria - "Be'er Sheva", ;Beersheba - "Teverya", ;Tiberias - "Bet El", ;Bethel - "Shekem", ;Shechem - "Bet Lehem", ;Bethlehem - "Akko", ;Acre - "Yafo", ;Jaffa - "Bet Horon", ;Bethoron - "Bet Shemesh", ;Beith Shemesh - "Bet She'an", ;/* Beith She'an */ - "Keisarya", ;Caesarea - "Haifa", ;Haifa - "Ashdod", ;Ashdod - "Lod", ;Lydda - "Elat", ;Eilat - "Ashqelon", ;Askhelon - "Dan", ;Dan - "Natzrat", ;Nazareth - "Abel Bet Maacha", ;Abel-beth-maachah - "Dimona", ;Dimona - "Holon", ;Holon - "Tirza", ;Tirzah - "'Azza", ;Gaza - "Sidon", ;Sidon - "Tzor", ;Tyre - "Arad", ;Arad - "Edrei", ;Edrei - "Ramot Gil'ad", ;Ramoth-Gilead - "Magdal", ;Magdala - "Kfar Nahum", ;Capernaum - "Jisre'el", ;Jezreel - "Mahanayim", ;Mahanaim - "Dor", ;Dor - "Gezer", ;Gezer - "Yarmuth", ;Jarmut - "Gat Rimmon", ;Gat-Rimon - "Kedesh", ;Kedesh - "Yavesh Gil'ad", ;Jabesh-Gilead - "Gilgal", ;Gilgal - "Hazor", ;Hazor - "Shilo", ;Shiloh - "Debar", ;Debir - "Ekron", ;Ekron - "Jazer", ;Jazer - "Ai", ;Ai - "Megiddo" ;Armageddon + "Yerushalayim", ; Jerusalem + "Yeriho", ; Jericho + "Hevron", ; Hebron + "Shomron", ; Samaria + "Be'er Sheva", ; Beersheba + "Teverya", ; Tiberias + "Bet El", ; Bethel + "Shekem", ; Shechem + "Bet Lehem", ; Bethlehem + "Akko", ; Acre + "Yafo", ; Jaffa + "Bet Horon", ; Bethoron + "Bet Shemesh", ; Beith Shemesh + "Bet She'an", ; /* Beith She'an */ + "Keisarya", ; Caesarea + "Haifa", ; Haifa + "Ashdod", ; Ashdod + "Lod", ; Lydda + "Elat", ; Eilat + "Ashqelon", ; Askhelon + "Dan", ; Dan + "Natzrat", ; Nazareth + "Abel Bet Maacha", ; Abel-beth-maachah + "Dimona", ; Dimona + "Holon", ; Holon + "Tirza", ; Tirzah + "'Azza", ; Gaza + "Sidon", ; Sidon + "Tzor", ; Tyre + "Arad", ; Arad + "Edrei", ; Edrei + "Ramot Gil'ad", ; Ramoth-Gilead + "Magdal", ; Magdala + "Kfar Nahum", ; Capernaum + "Jisre'el", ; Jezreel + "Mahanayim", ; Mahanaim + "Dor", ; Dor + "Gezer", ; Gezer + "Yarmuth", ; Jarmut + "Gat Rimmon", ; Gat-Rimon + "Kedesh", ; Kedesh + "Yavesh Gil'ad", ; Jabesh-Gilead + "Gilgal", ; Gilgal + "Hazor", ; Hazor + "Shilo", ; Shiloh + "Debar", ; Debir + "Ekron", ; Ekron + "Jazer", ; Jazer + "Ai", ; Ai + "Megiddo" ; Armageddon diff --git a/data/nation/italian.ruleset b/data/nation/italian.ruleset index 148171749d..c95af66249 100644 --- a/data/nation/italian.ruleset +++ b/data/nation/italian.ruleset @@ -1,11 +1,11 @@ [nation_italian] -translation_domain="freeciv" +translation_domain = "freeciv" -name = _("Italian") +name = _("Italian") plural = _("?plural:Italians") -groups="Medieval", "Modern", "European", "Core" -legend=_("The Italian nation was unified in 1870 CE after decades of\ +groups = "Medieval", "Modern", "European", "Core" +legend = _("The Italian nation was unified in 1870 CE after decades of\ campaigning by indigenous nationalists. It was a monarchy under the\ House of Savoy until 1922, then a fascist state until 1945 after which\ democracy was restored by the World War II victors.") @@ -49,13 +49,13 @@ flag = "italy" flag_alt = "-" style = "Classical" -init_techs="" -init_buildings="" -init_units="" +init_techs = "" +init_buildings = "" +init_units = "" -conflicts_with="Florentine", "Friulian", "Genoese", "Milanese", "Neapolitan", +conflicts_with = "Florentine", "Friulian", "Genoese", "Milanese", "Neapolitan", "Piedmontese", "Sardinian", "Sicilian", "Venetian" -civilwar_nations="Florentine", "Friulian", "Genoese", "Milanese", "Neapolitan", +civilwar_nations = "Florentine", "Friulian", "Genoese", "Milanese", "Neapolitan", "Piedmontese", "Sardinian", "Sicilian", "Venetian", "Papal" cities = diff --git a/data/nation/italiangreek.ruleset b/data/nation/italiangreek.ruleset index 1c9998bd83..5e36f54a33 100644 --- a/data/nation/italiangreek.ruleset +++ b/data/nation/italiangreek.ruleset @@ -1,9 +1,9 @@ [nation_italiangreek] -name=_("Italian Greek") -plural=_("?plural:Italian Greeks") -groups="Ancient", "European" -legend=_("Ancient Magna Graecia was a complex of Greek cities-colonies on\ +name = _("Italian Greek") +plural = _("?plural:Italian Greeks") +groups = "Ancient", "European" +legend = _("Ancient Magna Graecia was a complex of Greek cities-colonies on\ the coasts of Italy and Sicily, founded during the Greek Colonization.\ They played an important role in the development of Etruscan and Roman\ cultures. In the 5th century BCE Magna Graecia was dominated by the\ @@ -13,6 +13,7 @@ legend=_("Ancient Magna Graecia was a complex of Greek cities-colonies on\ by 272 BC. After the fall of the Western Roman Empire, Southern Italy was\ temporarily part of the Byzantine Empire as the Catepanate of Italia. A\ Greek-speaking population has survived in these areas to modern times.") + leaders = { "name", "sex" ; Tyrants of Syracuse @@ -36,7 +37,8 @@ leaders = { "Basileios Boannes", "Male" "Georgios Maniakes", "Male" } -flag="italian_greek" + +flag = "italian_greek" flag_alt = "-" style = "Classical" @@ -49,11 +51,11 @@ ruler_titles = { "Republic", _("Captain %s"), _("?female:Captain %s") } -init_techs="" -init_buildings="" -init_units="" +init_techs = "" +init_buildings = "" +init_units = "" -conflicts_with="Western Roman", "Byzantine", "Neapolitan", "Sicilian", "Italian" +conflicts_with = "Western Roman", "Byzantine", "Neapolitan", "Sicilian", "Italian" civilwar_nations = "Greek", "Epirote", "Roman", "Etruscan" cities = diff --git a/data/nation/ivoirian.ruleset b/data/nation/ivoirian.ruleset index 972bd634d4..3496e6dba8 100644 --- a/data/nation/ivoirian.ruleset +++ b/data/nation/ivoirian.ruleset @@ -1,14 +1,14 @@ [nation_ivoirian] -name=_("Ivoirian") -plural=_("?plural:Ivoirian") -groups="Modern", "African" -legend=_("Ivory Coast or Côte d'Ivoire achieved independence in 1960. It\ +name = _("Ivoirian") +plural = _("?plural:Ivoirian") +groups = "Modern", "African" +legend = _("Ivory Coast or Côte d'Ivoire achieved independence in 1960. It\ has been relatively stable compared to other West African countries, but\ in the 2000s it lived through a civil war.") leaders = { - "name", "sex" + "name", "sex" "Félix Houphouët-Boigny", "Male" "Henri Konan Bédié", "Male" "Robert Guéï", "Male" @@ -19,11 +19,11 @@ flag = "ivory_coast" flag_alt = "-" style = "Tropical" -init_techs="" -init_buildings="" -init_units="" +init_techs = "" +init_buildings = "" +init_units = "" -civilwar_nations="malian", "burkinabe" +civilwar_nations = "malian", "burkinabe" cities = "Abidjan", -- 2.30.2