From 17c683a34bbd40cca51d351e8777e48e3805c38f Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Tue, 9 Nov 2021 17:56:14 +0200 Subject: [PATCH 18/18] Clear out trailing spaces from nation files See osdn #43181 Signed-off-by: Marko Lindqvist --- data/nation/aborigines.ruleset | 14 +-- data/nation/aleut.ruleset | 4 +- data/nation/amazonian.ruleset | 2 +- data/nation/american.ruleset | 100 +++++++++---------- data/nation/arab.ruleset | 4 +- data/nation/aramean.ruleset | 2 +- data/nation/argentine.ruleset | 2 +- data/nation/ashanti.ruleset | 6 +- data/nation/asturian.ruleset | 4 +- data/nation/aztec.ruleset | 4 +- data/nation/babylonian.ruleset | 2 +- data/nation/barbadian.ruleset | 2 +- data/nation/bavarian.ruleset | 2 +- data/nation/benin.ruleset | 2 +- data/nation/bosporan.ruleset | 2 +- data/nation/botswanan.ruleset | 2 +- data/nation/briton.ruleset | 2 +- data/nation/cantonese.ruleset | 2 +- data/nation/chananean.ruleset | 2 +- data/nation/chickasaw.ruleset | 2 +- data/nation/chimu.ruleset | 4 +- data/nation/chinese.ruleset | 42 ++++---- data/nation/choctaw.ruleset | 2 +- data/nation/chumash.ruleset | 2 +- data/nation/circassian.ruleset | 2 +- data/nation/confederate.ruleset | 2 +- data/nation/cossack.ruleset | 2 +- data/nation/crimeantatar.ruleset | 2 +- data/nation/curonian.ruleset | 2 +- data/nation/cuyavian.ruleset | 2 +- data/nation/cypriot.ruleset | 2 +- data/nation/dutch.ruleset | 20 ++-- data/nation/epirote.ruleset | 2 +- data/nation/eritrean.ruleset | 2 +- data/nation/finnish.ruleset | 2 +- data/nation/franconian.ruleset | 4 +- data/nation/fulani.ruleset | 2 +- data/nation/galician.ruleset | 6 +- data/nation/gallic.ruleset | 2 +- data/nation/gepid.ruleset | 6 +- data/nation/greek.ruleset | 32 +++--- data/nation/guarani.ruleset | 2 +- data/nation/hacker.ruleset | 2 +- data/nation/hanoverian.ruleset | 6 +- data/nation/hansa.ruleset | 4 +- data/nation/hasinay.ruleset | 2 +- data/nation/holyroman.ruleset | 2 +- data/nation/iroquois.ruleset | 26 ++--- data/nation/jolof.ruleset | 2 +- data/nation/kazakh.ruleset | 12 +-- data/nation/komi.ruleset | 2 +- data/nation/kuna.ruleset | 2 +- data/nation/lithuanian.ruleset | 4 +- data/nation/lojbanistani.ruleset | 2 +- data/nation/maasai.ruleset | 2 +- data/nation/malaysian.ruleset | 4 +- data/nation/maltese.ruleset | 2 +- data/nation/manx.ruleset | 2 +- data/nation/maori.ruleset | 2 +- data/nation/marathi.ruleset | 2 +- data/nation/median.ruleset | 2 +- data/nation/mexican.ruleset | 4 +- data/nation/mikmaq.ruleset | 2 +- data/nation/miskito.ruleset | 2 +- data/nation/monegasque.ruleset | 2 +- data/nation/moroccan.ruleset | 2 +- data/nation/muskogee.ruleset | 162 +++++++++++++++---------------- data/nation/nepali.ruleset | 4 +- data/nation/nimiipuu.ruleset | 4 +- data/nation/ostrogothic.ruleset | 6 +- data/nation/pelasgian.ruleset | 2 +- data/nation/phoenician.ruleset | 4 +- data/nation/pictish.ruleset | 2 +- data/nation/piedmontese.ruleset | 2 +- data/nation/quebecois.ruleset | 2 +- data/nation/romanian.ruleset | 34 +++---- data/nation/sami.ruleset | 2 +- data/nation/scottish.ruleset | 12 +-- data/nation/seljuk.ruleset | 2 +- data/nation/siberian.ruleset | 2 +- data/nation/silesian.ruleset | 6 +- data/nation/sorbian.ruleset | 2 +- data/nation/southafrican.ruleset | 2 +- 83 files changed, 325 insertions(+), 325 deletions(-) diff --git a/data/nation/aborigines.ruleset b/data/nation/aborigines.ruleset index 19fa234d05..4789eb7e57 100644 --- a/data/nation/aborigines.ruleset +++ b/data/nation/aborigines.ruleset @@ -46,20 +46,20 @@ cities = "Meekatharra", "Eromanga", "Kapooka", - "Bulli", - "Woonona", - "Bellambi", + "Bulli", + "Woonona", + "Bellambi", "Boorowa", "Dunedoo", - "Balgownie", - "Corrimal", + "Balgownie", + "Corrimal", "Towradgi", "Coonabarabran", "Gerringong", "Moothi", "Unanderra", - "Warrawong", - "Dapto", + "Warrawong", + "Dapto", "Nulladulla", "Warragamba", "Watanobbi", diff --git a/data/nation/aleut.ruleset b/data/nation/aleut.ruleset index 8260a9a948..fd5845af14 100644 --- a/data/nation/aleut.ruleset +++ b/data/nation/aleut.ruleset @@ -24,8 +24,8 @@ ruler_titles = { } flag = "aleut" -flag_alt = "-" -style = "celtic" +flag_alt = "-" +style = "celtic" init_techs = "" init_buildings = "" diff --git a/data/nation/amazonian.ruleset b/data/nation/amazonian.ruleset index bcd1181fc2..4d14f3c38a 100644 --- a/data/nation/amazonian.ruleset +++ b/data/nation/amazonian.ruleset @@ -31,7 +31,7 @@ init_units = "" civilwar_nations = "Turkish" cities = - "Pontus", "Smyrna", "Ephesus", "Sinope", "Paphos", "Themiscyra", + "Pontus", "Smyrna", "Ephesus", "Sinope", "Paphos", "Themiscyra", "Cyme", "Myrine", "Pitane", "Mytilene", "Priene", "Megara", "Chaeronea", "Chalcis", "Scotussa", "Cynoscephalae", "Athens", "Palus Maeotis" diff --git a/data/nation/american.ruleset b/data/nation/american.ruleset index 5371c3a168..8a4afe1a4c 100644 --- a/data/nation/american.ruleset +++ b/data/nation/american.ruleset @@ -61,83 +61,83 @@ init_units = "" civilwar_nations = "confederate" cities = - "Washington (ocean, river, swamp, !desert)", - "New York (ocean, river, forest, !desert, !jungle)", - "Boston (ocean, forest, !desert, !jungle)", - "Philadelphia (ocean, river, forest, !desert)", + "Washington (ocean, river, swamp, !desert)", + "New York (ocean, river, forest, !desert, !jungle)", + "Boston (ocean, forest, !desert, !jungle)", + "Philadelphia (ocean, river, forest, !desert)", "Los Angeles (ocean, desert, plains)", - "Atlanta (!ocean, forest, !desert)", - "Chicago (!ocean, forest, !desert, !jungle)", - "St. Louis (river, grassland, !desert)", + "Atlanta (!ocean, forest, !desert)", + "Chicago (!ocean, forest, !desert, !jungle)", + "St. Louis (river, grassland, !desert)", "Detroit (!ocean, forest, !desert, !jungle)", - "New Orleans (ocean, river, swamp, !desert)", - "Baltimore (ocean, river, swamp, !desert)", - "Denver (!ocean, hills, mountains)", - "Cincinnati (!ocean, forest, !desert)", + "New Orleans (ocean, river, swamp, !desert)", + "Baltimore (ocean, river, swamp, !desert)", + "Denver (!ocean, hills, mountains)", + "Cincinnati (!ocean, forest, !desert)", "Dallas (!ocean, desert, plains)", - "Houston (ocean, desert, plains)", - "San Antonio (!ocean, desert, plains)", + "Houston (ocean, desert, plains)", + "San Antonio (!ocean, desert, plains)", "San Francisco (ocean, hills)", - "Fresno (hills, plains)", + "Fresno (hills, plains)", "Seattle (ocean, hills, forest, !desert, !jungle)", - "Portland (river, forest, !desert, !jungle)", - "Miami (ocean, jungle, swamp, !desert, !tundra, !hills, !mountains)", + "Portland (river, forest, !desert, !jungle)", + "Miami (ocean, jungle, swamp, !desert, !tundra, !hills, !mountains)", "Las Vegas (!ocean, desert)", "Cleveland (!ocean, forest, !desert)", - "Toledo (!ocean, forest, !desert)", + "Toledo (!ocean, forest, !desert)", "Pittsburgh (!ocean, river, forest, hills, !desert)", - "Salt Lake City (!ocean, plains, desert)", - "San Diego (ocean, plains, desert)", - "Phoenix (!ocean, desert)", + "Salt Lake City (!ocean, plains, desert)", + "San Diego (ocean, plains, desert)", + "Phoenix (!ocean, desert)", "Minneapolis (!ocean, !hills, !mountains, !desert, !jungle)", - "St. Paul (!ocean, !hills, !mountains, !desert, !jungle)", + "St. Paul (!ocean, !hills, !mountains, !desert, !jungle)", "Kansas City (!ocean, river, !hills, !mountains)", "Buffalo (!ocean, !desert, !jungle)", - "Syracuse (!ocean, !desert)", - "Wichita (!ocean, !forest, !jungle, !hills, !mountains)", + "Syracuse (!ocean, !desert)", + "Wichita (!ocean, !forest, !jungle, !hills, !mountains)", "Indianapolis (!ocean, forest, !desert)", - "Orlando (swamp, jungle, !hills, !mountains)", - "Omaha (!ocean, river, !hills, !mountains)", - "Baton Rouge (river, swamp, !desert, !hills, !mountains)", - "Milwaukee (!ocean, !jungle, !desert)", - "Honolulu (ocean, swamp, jungle, !desert)", - "Boise (!ocean, hills, mountains, !jungle)", - "Fargo (!ocean, tundra, !hills, !mountains, !jungle)", + "Orlando (swamp, jungle, !hills, !mountains)", + "Omaha (!ocean, river, !hills, !mountains)", + "Baton Rouge (river, swamp, !desert, !hills, !mountains)", + "Milwaukee (!ocean, !jungle, !desert)", + "Honolulu (ocean, swamp, jungle, !desert)", + "Boise (!ocean, hills, mountains, !jungle)", + "Fargo (!ocean, tundra, !hills, !mountains, !jungle)", "Springfield (!ocean, !desert)", - "Nashville (!ocean, !desert)", - "Hartford (ocean, !desert)", + "Nashville (!ocean, !desert)", + "Hartford (ocean, !desert)", "Charlotte (forest, !desert)", "Raleigh (forest, !desert)", "Charleston (ocean, river, swamp, !desert)", "Savannah (ocean, swamp, !desert)", "Mobile (ocean, river, swamp, !desert)", - "El Paso (!ocean, desert, plains)", + "El Paso (!ocean, desert, plains)", "Anchorage (ocean, tundra, !jungle)", "Fairbanks (!ocean, tundra, !jungle)", - "Spokane (!ocean, plains, !jungle)", - "Tacoma (ocean, river, swamp, forest, !desert, !jungle)", - "Fort Worth (!ocean, desert, plains)", - "Austin (!ocean, desert, plains)", - "Sacramento (!ocean, grassland)", + "Spokane (!ocean, plains, !jungle)", + "Tacoma (ocean, river, swamp, forest, !desert, !jungle)", + "Fort Worth (!ocean, desert, plains)", + "Austin (!ocean, desert, plains)", + "Sacramento (!ocean, grassland)", "Oklahoma City (!ocean, !forest, !hills, !mountains)", - "Jacksonville (jungle, swamp, !hills, !mountains)", - "Sioux Falls (!ocean, !jungle)", - "Madison (!ocean, !jungle)", + "Jacksonville (jungle, swamp, !hills, !mountains)", + "Sioux Falls (!ocean, !jungle)", + "Madison (!ocean, !jungle)", "Lubbock (!ocean, desert, plains)", - "Amarillo (!ocean, desert, plains)", - "Little Rock (!ocean, !desert)", + "Amarillo (!ocean, desert, plains)", + "Little Rock (!ocean, !desert)", "Tucson (!ocean, desert)", - "Erie (!ocean, !desert, !jungle)", - "Flint (!ocean, !desert, !jungle)", - "Trenton (ocean, forest, !desert)", - "Newark (ocean, forest, !desert)", + "Erie (!ocean, !desert, !jungle)", + "Flint (!ocean, !desert, !jungle)", + "Trenton (ocean, forest, !desert)", + "Newark (ocean, forest, !desert)", "Richmond (!ocean, forest, !desert)", "Reno (!ocean, !forest, desert)", "Santa Fe (!ocean, desert, hills, mountains)", "San Jose (hills, plains)", - "Tulsa (!ocean, !forest, !hills, !mountains)", - "Annapolis (ocean, river, swamp, forest, !desert)", - "Akron (!ocean, forest, !desert)", + "Tulsa (!ocean, !forest, !hills, !mountains)", + "Annapolis (ocean, river, swamp, forest, !desert)", + "Akron (!ocean, forest, !desert)", "Urbana-Champaign (!ocean, forest, !desert)", "Columbus", "Memphis", diff --git a/data/nation/arab.ruleset b/data/nation/arab.ruleset index 59eb6dd805..7ea3266d49 100644 --- a/data/nation/arab.ruleset +++ b/data/nation/arab.ruleset @@ -46,7 +46,7 @@ civilwar_nations = "Iraqi", "Libyan", "Sudanese", "Syrian", "Egyptian Arab", "Yemeni", "Lebanese", "Emirati", "Jordanian", "Omani", "Sahrawi", "Mauritanian", "Kuwaiti", "Qatari", "Bahraini" -; Arab Peninsula and Near East. City names are mostly from the Ummayyad +; Arab Peninsula and Near East. City names are mostly from the Ummayyad ; and Abbasid periods. These are Arab spellings rather than Anglicized ones; ; thus, Dimashq = Damascus, Al Qahira = Cairo, etc. @@ -73,7 +73,7 @@ cities = "Sijilmasa", "Al-Hufuf", "Burayda", - "At-Ta’if", + "At-Ta’if", "Al-Hudayda", "Al-Mukalla", "Ta'izz", diff --git a/data/nation/aramean.ruleset b/data/nation/aramean.ruleset index 356ef14d1b..b46d7b106a 100644 --- a/data/nation/aramean.ruleset +++ b/data/nation/aramean.ruleset @@ -1,4 +1,4 @@ -[nation_aramean] +[nation_aramean] name = _("Aramean") plural = _("?plural:Arameans") diff --git a/data/nation/argentine.ruleset b/data/nation/argentine.ruleset index 3ad3a9d6bf..9d79f52cfb 100644 --- a/data/nation/argentine.ruleset +++ b/data/nation/argentine.ruleset @@ -106,7 +106,7 @@ cities = "Coronel Suárez", "Coronel Pringles", "Tres Arroyos (river)", - "Punta Alta", + "Punta Alta", "General Acha", "Río Colorado (river)", "San Cristóbal", diff --git a/data/nation/ashanti.ruleset b/data/nation/ashanti.ruleset index e550486f98..10151b1fee 100644 --- a/data/nation/ashanti.ruleset +++ b/data/nation/ashanti.ruleset @@ -1,4 +1,4 @@ -[nation_ashanti] +[nation_ashanti] name = _("Ashanti") plural = _("?plural:Ashantis") @@ -32,8 +32,8 @@ leaders = { ruler_titles = { "government", "male_title", "female_title" - "Democracy", _("Councillor %s"), _("?female:Councillor %s") - "Monarchy", _("Asantehene %s"), _("?female:Asantehene %s") + "Democracy", _("Councillor %s"), _("?female:Councillor %s") + "Monarchy", _("Asantehene %s"), _("?female:Asantehene %s") } flag = "ashanti" diff --git a/data/nation/asturian.ruleset b/data/nation/asturian.ruleset index 5a4e6c05d0..105c8644fb 100644 --- a/data/nation/asturian.ruleset +++ b/data/nation/asturian.ruleset @@ -45,7 +45,7 @@ cities = "Xixón", "Uviéu", "Avilés", "Cangues d'Onís", "La Pola Siero", "Grau", "Cangas", "Ribesella", "Mieres", "Llugones", "Llangréu", "A Veiga", "Villaviciosa", "Candás", "Cuideiru", "Les Arriondes", "Lluanco", - "Llanes", "L.luarca", "Navia", "Pravia", "Tapia", "La Vega", + "Llanes", "L.luarca", "Navia", "Pravia", "Tapia", "La Vega", "La Puela", "Nubleo", "Muros", "Nava", "Soto Ribera", "Posada", "Prau", "Martimporra", "Grullos", "Colunga", "Llastres", "Sames", "Les Arenes", "Santolaya de Morcín", "Benia", "Tinéu", "Salas", @@ -54,5 +54,5 @@ cities = "Balmonte", "Vilanova", "Degaña", "Alles", "Taramundi", "Noreña", "La Plaza", "San Xuan de Beleño", "Villayón", "Bárzana", "Grandas", "Santuyanu", "Santantolín", "La Caizuela", "Proaza", "Villanueva", - "Santolaya de Cabranes", "Cuaña", "La Pola Somiedu", "Pezós", + "Santolaya de Cabranes", "Cuaña", "La Pola Somiedu", "Pezós", "L'Infiestu", "Vega", "Rusecu", "A Caridá", "O Chao" diff --git a/data/nation/aztec.ruleset b/data/nation/aztec.ruleset index 2229f66c21..58c8598a9c 100644 --- a/data/nation/aztec.ruleset +++ b/data/nation/aztec.ruleset @@ -28,7 +28,7 @@ ruler_titles = { "government", "male_title", "female_title" "Democracy", _("Speaker %s"), _("?female:Speaker %s") "Monarchy", _("Emperor %s"), _("Empress %s") -} +} flag = "aztec" flag_alt = "mexico" ; Used previously @@ -102,7 +102,7 @@ cities = "Cihuatlan", "Tlaxquiauhco", "Huexotla", - "Tziuhcoac", + "Tziuhcoac", "Ocuillan", "Axocopan", "Nopallan" diff --git a/data/nation/babylonian.ruleset b/data/nation/babylonian.ruleset index d44a99b91d..ac01fc0a66 100644 --- a/data/nation/babylonian.ruleset +++ b/data/nation/babylonian.ruleset @@ -23,7 +23,7 @@ ruler_titles = { "government", "male_title", "female_title" ; /* TRANS: Lugal = Great Man */ "Monarchy", _("%s Lugal"), _("?female:%s Lugal") -} +} flag = "babylon" flag_alt = "-" diff --git a/data/nation/barbadian.ruleset b/data/nation/barbadian.ruleset index a590faa985..d4a25b4446 100644 --- a/data/nation/barbadian.ruleset +++ b/data/nation/barbadian.ruleset @@ -81,4 +81,4 @@ cities = "Seaview", "Lead Vale", "Welchman Hall" - + diff --git a/data/nation/bavarian.ruleset b/data/nation/bavarian.ruleset index c23a94ca2d..db3e13acdc 100644 --- a/data/nation/bavarian.ruleset +++ b/data/nation/bavarian.ruleset @@ -4,7 +4,7 @@ name = _("Bavarian") plural = _("?plural:Bavarians") groups = "Medieval", "Early Modern", "European" legend = _("Bavaria, before national unification in 1870 CE, was one of the\ - largest of the German kingdoms.") + largest of the German kingdoms.") leaders = { "name", "sex" diff --git a/data/nation/benin.ruleset b/data/nation/benin.ruleset index 74fcb51d77..82229606c0 100644 --- a/data/nation/benin.ruleset +++ b/data/nation/benin.ruleset @@ -1,4 +1,4 @@ -[nation_benin] +[nation_benin] name = _("Benin") plural = _("?plural:Benin") diff --git a/data/nation/bosporan.ruleset b/data/nation/bosporan.ruleset index 819939a7db..2cdcc80d05 100644 --- a/data/nation/bosporan.ruleset +++ b/data/nation/bosporan.ruleset @@ -33,7 +33,7 @@ ruler_titles = "Anarchy", _("Usurper %s"), _("?female:Usurper %s") "Despotism", _("Despot %s"), _("?female:Despot %s") "Republic", _("Consul %s"), _("?female:Consul %s") -} +} flag = "bosporus" flag_alt = "-" diff --git a/data/nation/botswanan.ruleset b/data/nation/botswanan.ruleset index d999a8d922..e312feb56c 100644 --- a/data/nation/botswanan.ruleset +++ b/data/nation/botswanan.ruleset @@ -44,7 +44,7 @@ cities = "Kanye", "Mushopa", "Goodhope", - "Kopong", + "Kopong", "Hukuntsi", "Kang", "Ghanzi", diff --git a/data/nation/briton.ruleset b/data/nation/briton.ruleset index 85346f4b84..d7e6d052c9 100644 --- a/data/nation/briton.ruleset +++ b/data/nation/briton.ruleset @@ -21,7 +21,7 @@ ruler_titles = { "Despotism", _("Chieftain %s"), _("?female:Chieftain %s") "Fundamentalism", _("Druid %s"), _("?female:Druid %s") "Monarchy", _("High King %s"), _("High Queen %s") -} +} flag = "britannia" flag_alt = "gaul" diff --git a/data/nation/cantonese.ruleset b/data/nation/cantonese.ruleset index b7a7eb2708..e462844a3c 100644 --- a/data/nation/cantonese.ruleset +++ b/data/nation/cantonese.ruleset @@ -21,7 +21,7 @@ leaders = { "Jihng Sih", "Female" "Leung Kai Chiu", "Male" "Can Gwingming", "Male" - "Syun Fo", "Male" + "Syun Fo", "Male" } ruler_titles = { diff --git a/data/nation/chananean.ruleset b/data/nation/chananean.ruleset index 581257bd6b..e617a32ab2 100644 --- a/data/nation/chananean.ruleset +++ b/data/nation/chananean.ruleset @@ -49,7 +49,7 @@ cities = "Canis Major", "Sirius", - ; Classification + ; Classification "Canidae", "Carnivora", diff --git a/data/nation/chickasaw.ruleset b/data/nation/chickasaw.ruleset index 2283182684..c3f8558c2b 100644 --- a/data/nation/chickasaw.ruleset +++ b/data/nation/chickasaw.ruleset @@ -8,7 +8,7 @@ legend=_("One of the so-called Five Civilized Tribes, the Chickasaw\ Mississippi at the time of first contact with Europeans. The name\ \"Mississippi\" itself originates from a Chickasaw word meaning\ \"Without Source.\"") - + leaders = { "name", "sex" "Holmes Colbert", "Male" diff --git a/data/nation/chimu.ruleset b/data/nation/chimu.ruleset index 00f0c5af21..f9f66a7d90 100644 --- a/data/nation/chimu.ruleset +++ b/data/nation/chimu.ruleset @@ -1,4 +1,4 @@ -[nation_chimu] +[nation_chimu] name = _("Chimu") plural = _("?plural:Chimu") @@ -10,7 +10,7 @@ legend = _("Inheritors of the Moche cultural tradition, Chimor began\ last king, Minchancaman, was captured and led to the Inka capital\ Qosqo. Chimu artisans contributed greatly to the manufacture of Inka\ artistic wares. Until its fall, Chimor controlled perhaps 2/3 of\ - the population of the northern Andes.") + the population of the northern Andes.") leaders = { "name", "sex" diff --git a/data/nation/chinese.ruleset b/data/nation/chinese.ruleset index c58536660c..30f8770e23 100644 --- a/data/nation/chinese.ruleset +++ b/data/nation/chinese.ruleset @@ -49,106 +49,106 @@ cities = "Shanghai", "Guangzhou", "Tianjin", - "Nanjing", + "Nanjing", "Xi'an", "Chongqing", "Chengdu", "Jinan", - "Shijiazhuang", + "Shijiazhuang", "Taiyuan", "Zhengzhou", "Wuhan", "Changsha", - "Nanchang", + "Nanchang", "Hangzhou", "Fuzhou", "Hefei", "Guiyang", - "Lanzhou", + "Lanzhou", "Kunming", "Xining", "Nanning", "Yinchuan", - "Shenyang", + "Shenyang", "Changchun", "Harbin", "Luoyang", "Kaifeng", - "Qingdao", + "Qingdao", "Suzhou", "Wuxi", "Xiamen", "Haikou", - "Hong Kong", + "Hong Kong", "Datong", "Anyang", "Shangqiu", "Nanyang", - "Dengfeng", + "Dengfeng", "Handan", "Baoding", "Chengde", "Tangshan", - "Zhangjiakou", + "Zhangjiakou", "Yantai", "Zibo", "Jining", "Dezhou", - "Qinhuangdao", + "Qinhuangdao", "Changshu", "Gaoyou", "Nantong", "Zhenjiang", - "Lianyungang", + "Lianyungang", "Yangzhou", "Xuzhou", "Changzhou", "Wenzhou", - "Huzhou", + "Huzhou", "Shaoxing", "Jiaxing", "Ningbo", "Zhangzhou", - "Quanzhou", + "Quanzhou", "Shantou", "Foshan", "Shenzhen", "Zhuhai", - "Zhongshan", + "Zhongshan", "Huizhou", "Chaozhou", "Ganzhou", "Jiujiang", - "Jingdezhen", + "Jingdezhen", "Zhanjiang", "Liuzhou", "Beihai", "Guilin", - "Yichang", + "Yichang", "Xiangtan", "Zhuzhou", "Shaoyang", "Hengyang", - "Yueyang", + "Yueyang", "Mianyang", "Zigong", "Xianyang", "Baoji", - "Gejiu", + "Gejiu", "Tianshui", "Jiuquan", "Baiyin", "Dunhuang", - "Jiayuguan", + "Jiayuguan", "Dalian", "Anshan", "Fushun", "Jilin", - "Mudanjiang", + "Mudanjiang", "Liaoyang", "Dandong", "Baotou", - "Heihe", + "Heihe", "Bengbu", "Wuhu", "Anqing", diff --git a/data/nation/choctaw.ruleset b/data/nation/choctaw.ruleset index e5ef19b2f9..dc2ecae85f 100644 --- a/data/nation/choctaw.ruleset +++ b/data/nation/choctaw.ruleset @@ -1,4 +1,4 @@ -[nation_choctaw] +[nation_choctaw] name = _("Choctaw") plural = _("?plural:Choctaws") diff --git a/data/nation/chumash.ruleset b/data/nation/chumash.ruleset index 02ab2d3439..c08e22aa45 100644 --- a/data/nation/chumash.ruleset +++ b/data/nation/chumash.ruleset @@ -1,4 +1,4 @@ -[nation_chumash] +[nation_chumash] name = _("Chumash") plural = _("?plural:Chumash") diff --git a/data/nation/circassian.ruleset b/data/nation/circassian.ruleset index f44094be8f..a52927fa32 100644 --- a/data/nation/circassian.ruleset +++ b/data/nation/circassian.ruleset @@ -24,7 +24,7 @@ leaders = { "Temriuk", "Male" "Beslan", "Male" "Qanoqwe", "Male" - "Gwascheney", "Female" ; a.k.a Maria + "Gwascheney", "Female" ; a.k.a Maria } flag = "adygea" diff --git a/data/nation/confederate.ruleset b/data/nation/confederate.ruleset index 5a5f0fe6f5..b0021c3264 100644 --- a/data/nation/confederate.ruleset +++ b/data/nation/confederate.ruleset @@ -64,7 +64,7 @@ cities = "Norfolk", "Augusta", "Columbus", - "Atlanta", + "Atlanta", "Wilmington", "Columbia", diff --git a/data/nation/cossack.ruleset b/data/nation/cossack.ruleset index 51fb445991..385903a0e8 100644 --- a/data/nation/cossack.ruleset +++ b/data/nation/cossack.ruleset @@ -1,4 +1,4 @@ -[nation_cossack] +[nation_cossack] name = _("Cossack") plural = _("?plural:Cossacks") diff --git a/data/nation/crimeantatar.ruleset b/data/nation/crimeantatar.ruleset index 40b134c7b6..f1a462f771 100644 --- a/data/nation/crimeantatar.ruleset +++ b/data/nation/crimeantatar.ruleset @@ -1,4 +1,4 @@ -[nation_crimeantatar] +[nation_crimeantatar] name = _("Crimean Tatar") plural = _("?plural:Crimean Tatars") diff --git a/data/nation/curonian.ruleset b/data/nation/curonian.ruleset index dc4c584273..ef5695dcb3 100644 --- a/data/nation/curonian.ruleset +++ b/data/nation/curonian.ruleset @@ -1,4 +1,4 @@ -[nation_curonian] +[nation_curonian] name = _("Curonian") plural = _("?plural:Curonians") diff --git a/data/nation/cuyavian.ruleset b/data/nation/cuyavian.ruleset index 4d54ba8327..137f08a035 100644 --- a/data/nation/cuyavian.ruleset +++ b/data/nation/cuyavian.ruleset @@ -15,7 +15,7 @@ leaders = { "Władysław Garbaty", "Male" "Kazimierz III Gniewkowski", "Male" "Leszek Inowrocławski", "Male" - "Władysław Biały", "Male" + "Władysław Biały", "Male" } flag = "cuyavia" diff --git a/data/nation/cypriot.ruleset b/data/nation/cypriot.ruleset index 9b1d78c3ae..4c57e23d23 100644 --- a/data/nation/cypriot.ruleset +++ b/data/nation/cypriot.ruleset @@ -80,6 +80,6 @@ cities = "Episkopi", "Kokkinotrimithia", "Mouttagiaka", - "Agia Napa", + "Agia Napa", "Akaki", "Lythorodontas" diff --git a/data/nation/dutch.ruleset b/data/nation/dutch.ruleset index b38421851d..f03106a15f 100644 --- a/data/nation/dutch.ruleset +++ b/data/nation/dutch.ruleset @@ -67,8 +67,8 @@ cities = "Haarlem (forest)", "Delft (grassland)", "Nijmegen (river, forest, hills)", - "Groningen (plains)", - "Leeuwarden (grassland)", + "Groningen (plains)", + "Leeuwarden (grassland)", "Middelburg (grassland)", "Alkmaar (grassland, swamp)", "Hoorn (ocean, lake)", @@ -86,22 +86,22 @@ cities = "Kampen (river)", "Zutphen (river, forest)", "Amersfoort (forest, hills, river)", - "Breda (forest)", - "Dokkum (plains)", - "Eindhoven (forest)", + "Breda (forest)", + "Dokkum (plains)", + "Eindhoven (forest)", "Naarden (forest)", "Sneek (river)", "Stavoren (ocean, lake)", - "Venlo (river, forest)", + "Venlo (river, forest)", "Enschede (forest)", "Roermond (river, forest)", "Delfshaven (river)", "Goes (ocean)", "Veere (ocean)", "Franeker (river)", - "Assen (forest, plains)", + "Assen (forest, plains)", "Bergen op Zoom (ocean, lake, forest)", - "Emmen (forest, plains, swamp)", + "Emmen (forest, plains, swamp)", "Hulst (swamp)", "Hengelo (forest)", "Apeldoorn (forest, hills)", @@ -110,8 +110,8 @@ cities = "Vlaardingen (river)", "Weert (forest)", "Sittard (hills)", - "Purmerend (grassland)", - "Helmond (forest)", + "Purmerend (grassland)", + "Helmond (forest)", "Geleen (hills)", "Roosendaal (forest)", "Ede (forest)", diff --git a/data/nation/epirote.ruleset b/data/nation/epirote.ruleset index e5b2ffd06a..b56042b521 100644 --- a/data/nation/epirote.ruleset +++ b/data/nation/epirote.ruleset @@ -1,4 +1,4 @@ -[nation_epirote] +[nation_epirote] name = _("Epirote") plural = _("?plural:Epirotes") diff --git a/data/nation/eritrean.ruleset b/data/nation/eritrean.ruleset index 5d4481505b..754c33a519 100644 --- a/data/nation/eritrean.ruleset +++ b/data/nation/eritrean.ruleset @@ -35,7 +35,7 @@ civilwar_nations = "Ethiopian", "Italian" cities = "Asmara", ; capital "Nakfa", ; associated with independence movement - ; remaining cities seen on Google maps + ; remaining cities seen on Google maps "Hasta", "Agra", "Afchewa", diff --git a/data/nation/finnish.ruleset b/data/nation/finnish.ruleset index cd13fcb098..60441a2708 100644 --- a/data/nation/finnish.ruleset +++ b/data/nation/finnish.ruleset @@ -42,7 +42,7 @@ civilwar_nations = "Sami", "Karelian", "Mordvin", "Alander", "Estonian" ; ; all the Finnish cities, the situation in 1998, ; ordered by combined population and age (in 2000) -; +; ; location preferences created if relevant to the city image ; - if the city is at a notable lake or quite near the Baltic ; Sea, ocean isn't preferred either way diff --git a/data/nation/franconian.ruleset b/data/nation/franconian.ruleset index b29558b551..117635c678 100644 --- a/data/nation/franconian.ruleset +++ b/data/nation/franconian.ruleset @@ -1,4 +1,4 @@ -[nation_franconian] +[nation_franconian] name = _("Franconian") plural = _("?plural:Franconians") @@ -22,7 +22,7 @@ leaders = { ruler_titles = { "government", "male_title", "female_title" "Despotism", _("Duke %s"), _("Duchess %s") - "Fundamentalism", _("Prince-Bishop %s"), _("Mother Superior %s") + "Fundamentalism", _("Prince-Bishop %s"), _("Mother Superior %s") } flag = "franconia" diff --git a/data/nation/fulani.ruleset b/data/nation/fulani.ruleset index a86464c0a1..dea809a108 100644 --- a/data/nation/fulani.ruleset +++ b/data/nation/fulani.ruleset @@ -18,7 +18,7 @@ leaders = { "Nana Asma'u", "Female" "Muhammed Bello", "Male" "Abu Bakr Atiku", "Male" - "Aliyu Baba dan Bello", "Male" + "Aliyu Baba dan Bello", "Male" "Umar ibn Sa'id Tall", "Male" "Seku Amadu", "Male" "Abu Bakr bin Bello", "Male" diff --git a/data/nation/galician.ruleset b/data/nation/galician.ruleset index 182cafe7d0..a1be62e233 100644 --- a/data/nation/galician.ruleset +++ b/data/nation/galician.ruleset @@ -35,8 +35,8 @@ civilwar_nations = "portuguese", "asturian" cities = "Santiago de Compostela", "A Coruña", "Vigo", "Lugo", "Pontevedra", "Ourense", "Ferrol", "Mondoñedo", "Tui", "Betanzos", "Ribadeo", - "Santa Uxía de Riveira", "Narón", "A Guardia", - "O Barco de Valdeorras", "Ribadeo", "Carballo", "Padrón", "Laracha", + "Santa Uxía de Riveira", "Narón", "A Guardia", + "O Barco de Valdeorras", "Ribadeo", "Carballo", "Padrón", "Laracha", "Ares", "Viveiro", "Foz", "Burela", "Póboa do Caramiñal", "Verín", "Arteixo", "Malpica", "Laxe", "Baiona", "Allariz", "Arzúa", "Bueu", "A Estrada", "Monforte de Lemos", "Mugardos", "Porriño", "Redondela", @@ -45,5 +45,5 @@ cities = "Ortigueira", "Melide", "Camariñas", "Negreira", "Noia", "O Grove", "Muros", "As Pontes de García Rodríguez", "Vilagarcía de Arousa", "Celanova", "Cambados", "Ordes", "Porto do Son", "Lalín", "O Carballiño", - "A Rúa", "Cariño", "Póboa de Trives", "Chantada", "Ponteareas", + "A Rúa", "Cariño", "Póboa de Trives", "Chantada", "Ponteareas", "Marín", "Monfero", "Ponteceso", "Guitiriz", "Xove", "Carral" diff --git a/data/nation/gallic.ruleset b/data/nation/gallic.ruleset index 7eef0adc91..7ecf1e3bf0 100644 --- a/data/nation/gallic.ruleset +++ b/data/nation/gallic.ruleset @@ -29,7 +29,7 @@ ruler_titles = { "Despotism", _("Chieftain %s"), _("?female:Chieftain %s") "Fundamentalism", _("Druid %s"), _("?female:Druid %s") "Republic", _("Consul %s"), _("?female:Consul %s") -} +} flag = "gaul" flag_alt = "-" diff --git a/data/nation/gepid.ruleset b/data/nation/gepid.ruleset index 40da7fb5d7..ffa76950fa 100644 --- a/data/nation/gepid.ruleset +++ b/data/nation/gepid.ruleset @@ -34,16 +34,16 @@ leaders = { } flag = "gepid" -flag_alt = "-" +flag_alt = "-" style = "Celtic" ruler_titles = { "government", "male_title", "female_title" - "Fundamentalism", _("Presbyter %s"), _("?female:Presbyter %s") + "Fundamentalism", _("Presbyter %s"), _("?female:Presbyter %s") "Anarchy", _("Usurper %s"), _("?female:Usurper %s") "Despotism", _("Great Warrior %s"), _("?female:Great Warrior %s") "Republic", _("Spokesman %s"), _("Spokeswoman %s") - "Democracy", _("Speaker %s"), _("?female:Speaker %s") + "Democracy", _("Speaker %s"), _("?female:Speaker %s") } init_techs = "" diff --git a/data/nation/greek.ruleset b/data/nation/greek.ruleset index e5025a9823..f1bb1be794 100644 --- a/data/nation/greek.ruleset +++ b/data/nation/greek.ruleset @@ -77,7 +77,7 @@ cities = "Atalanti", "Oropos", "Livadeia", - "Larisa (river)", + "Larisa (river)", "Iolkos", "Amfiklaia", "Kyzikos", @@ -92,7 +92,7 @@ cities = "Thira (ocean)", "Panormos", "Ortygia", - "Milos (ocean)", + "Milos (ocean)", "Lykosoura", "Amyklai", "Klazomenai", @@ -100,35 +100,35 @@ cities = "Distomon (hills, mountains)", ; Additional cities sorted in joint population/chronology order "Smyrni (ocean)", - "Alexandreia (ocean)", + "Alexandreia (ocean)", "Nikomideia", "Trapezous (ocean)", - "Chania", - "Knossos", + "Chania", + "Knossos", "Pafos", "Mitylini (ocean)", - "Chios", + "Chios", "Sinopi", "Rodos (ocean)", "Adrianoupolis (river)", - "Volos", + "Volos", "Neapolis", "Ammostochos", - "Arta (river)", + "Arta (river)", "Serrai", "Katerini", "Trikala", "Lamia", - "Agrinion", + "Agrinion", "Xanthi", "Veroia", "Drama", - "Komotini", + "Komotini", "Troia", - "Kozani", + "Kozani", "Karditsa (!ocean)", "Samos", - "Pirgos", + "Pirgos", "Tripolis (mountains)", "Rethymnon", "Kastoria", @@ -137,17 +137,17 @@ cities = "Preveza", "Kilkis", "Ayios Nikolaos", - "Zakynthos (ocean)", + "Zakynthos (ocean)", "Igoumenotsa", "Mesolongion", - "Lefkosia", + "Lefkosia", "Grevena", "Argostolion (ocean)", "Karpenisi", - "Lefkas", + "Lefkas", "Militos", "Polygyros", - "Kalamai", + "Kalamai", "Kariai (mountains)", "Ermoupolis", "Ydra (ocean)", diff --git a/data/nation/guarani.ruleset b/data/nation/guarani.ruleset index 877ef94477..691d4ee3f9 100644 --- a/data/nation/guarani.ruleset +++ b/data/nation/guarani.ruleset @@ -1,4 +1,4 @@ -[nation_guarani] +[nation_guarani] name = _("Guarani") plural = _("?plural:Guarani") diff --git a/data/nation/hacker.ruleset b/data/nation/hacker.ruleset index d70f61dc68..4e79c9c772 100644 --- a/data/nation/hacker.ruleset +++ b/data/nation/hacker.ruleset @@ -46,7 +46,7 @@ init_units = "" civilwar_nations = "antarctican", "martian" -cities = +cities = "Core Dump", "Kernel Panic", "One More Turn", diff --git a/data/nation/hanoverian.ruleset b/data/nation/hanoverian.ruleset index 0b72f0feb2..e29783faee 100644 --- a/data/nation/hanoverian.ruleset +++ b/data/nation/hanoverian.ruleset @@ -5,7 +5,7 @@ plural = _("?plural:Hanoverians") groups = "European", "Early Modern" legend = _("Hanover was a state in Northern Germany, in current Lower\ Saxony. From 1714 to 1837 Hanover and the United Kingdom were united\ - in a personal union. In 1866 it was gobbled up by Prussia.") + in a personal union. In 1866 it was gobbled up by Prussia.") leaders = { "name", "sex" @@ -19,8 +19,8 @@ leaders = { ruler_titles = { "government", "male_title", "female_title" - "Despotism", _("Duke %s"), _("Duchess %s") - "Fundamentalism", _("Prince-Bishop %s"), _("Princess-Bishop %s") + "Despotism", _("Duke %s"), _("Duchess %s") + "Fundamentalism", _("Prince-Bishop %s"), _("Princess-Bishop %s") "Democracy", _("Minister-President %s"), _("?female:Minister-President %s") } diff --git a/data/nation/hansa.ruleset b/data/nation/hansa.ruleset index 7d1b4f5f0f..d883387ee8 100644 --- a/data/nation/hansa.ruleset +++ b/data/nation/hansa.ruleset @@ -25,8 +25,8 @@ ruler_titles = { "government", "male_title", "female_title" "Democracy", _("Councillor %s"), _("?female:Councillor %s") "Despotism", _("Lord %s"), _("Lady %s") - "Fundamentalism", _("Bishop %s"), _("?female:Bishop %s") - "Republic", _("Burgomaster %s"), _("?female:Burgomaster %s") + "Fundamentalism", _("Bishop %s"), _("?female:Bishop %s") + "Republic", _("Burgomaster %s"), _("?female:Burgomaster %s") } flag = "hansa" diff --git a/data/nation/hasinay.ruleset b/data/nation/hasinay.ruleset index eca7ffb49d..1de02a3d5e 100644 --- a/data/nation/hasinay.ruleset +++ b/data/nation/hasinay.ruleset @@ -1,4 +1,4 @@ -[nation_hasinay] +[nation_hasinay] name = _("Hasinay") plural = _("?plural:Hasinay") diff --git a/data/nation/holyroman.ruleset b/data/nation/holyroman.ruleset index dc293610b0..9e18aec644 100644 --- a/data/nation/holyroman.ruleset +++ b/data/nation/holyroman.ruleset @@ -30,7 +30,7 @@ leaders = { ruler_titles = { "government", "male_title", "female_title" "Anarchy", _("Pretender %s"), _("?female:Pretender %s") - "Democracy", _("Chancellor %s"), _("?female:Chancellor %s") + "Democracy", _("Chancellor %s"), _("?female:Chancellor %s") "Fundamentalism", _("Pope %s"), _("Popess %s") "Monarchy", _("Emperor %s"), _("Empress %s") } diff --git a/data/nation/iroquois.ruleset b/data/nation/iroquois.ruleset index eafbf9e4e4..c822957153 100644 --- a/data/nation/iroquois.ruleset +++ b/data/nation/iroquois.ruleset @@ -100,8 +100,8 @@ cities = ; http://www.accessgenealogy.com/native/tribes/iroquioi/iroquoisvillages.htm "Adjouquay", - "Allaquippa", - "Anpuaqun", + "Allaquippa", + "Anpuaqun", "Aquatsagana", "Aratumquat", "Awegen", @@ -124,9 +124,9 @@ cities = "Coreorgonel", "Cowawago", "Cussewago", - "Ganadoga", + "Ganadoga", "Ganagarahhare", - "Ganasarage", + "Ganasarage", "Ganeraske", "Ganneious", "Glasswanoge", @@ -138,14 +138,14 @@ cities = "Jonondes", "Juniata", "Juraken", - "Kahendohon", + "Kahendohon", "Kanaghsaws", "Kannawalohalla", "Kanesadageh", "Karaken", "Karhationni", - "Karhawenradon", - "Kayehkwarageh", + "Karhawenradon", + "Kayehkwarageh", "Kaygen", "Kickenapawling", "Kiskiminetas", @@ -170,17 +170,17 @@ cities = "Oquaga", "Osewingo", "Oskawaserenhon", - "Ostonwackin", + "Ostonwackin", "Otiahanague", - "Otsiningo", + "Otsiningo", "Otskwirakeron", "Ousagwentera", "Paille Coupfle", "Pluggy's Town", - "Punxatawney", + "Punxatawney", "Runonvea", "Sawcunk", - "Schoharie", + "Schoharie", "Schohorage", "Sconassi", "Scoutash's Town", @@ -191,7 +191,7 @@ cities = "Shannopin", "Shenango", "Sheshequin", - "Sheoquage", + "Sheoquage", "Sittawingo", "Skenandowa", "Solocka", @@ -207,6 +207,6 @@ cities = "Unadilla", "Wakatomica", "Wakerhon", - "Wauteghe", + "Wauteghe", "Yoghroonwago", "Youcham" diff --git a/data/nation/jolof.ruleset b/data/nation/jolof.ruleset index b4450b6948..d1647adf5d 100644 --- a/data/nation/jolof.ruleset +++ b/data/nation/jolof.ruleset @@ -1,4 +1,4 @@ -[nation_jolof] +[nation_jolof] name = _("Jolof") plural = _("?plural:Jolof") diff --git a/data/nation/kazakh.ruleset b/data/nation/kazakh.ruleset index 7d355d5808..08cd0c92b0 100644 --- a/data/nation/kazakh.ruleset +++ b/data/nation/kazakh.ruleset @@ -41,22 +41,22 @@ cities = "Türkistan", "Şımkent", "Oral", - "Pavlodar", + "Pavlodar", "Semey", "Petropavl", "Almatı", "Astana", - "Kökşetaw", + "Kökşetaw", "Qızılorda", "Öskemen", "Aqtöbe", "Qostanay", - "Atıraw", + "Atıraw", "Qarağandı", "Jarkent", "Atbasar", "Temirtaw", - "Balqaş", + "Balqaş", "Taldıqorğan", "Ayagoz", "Aral", @@ -65,7 +65,7 @@ cities = "Rudnıy", "Aqtaw", "Bayqoñır", - "Zaysan", + "Zaysan", "Arqalıq", "Esil", "Aksay", @@ -84,7 +84,7 @@ cities = ; Could not confirm Kazakh spelling of the following cities. ; "Qapshaghay", -; "Zhangatas", +; "Zhangatas", ; "Embi", ; "Lepsi", ; "Shalqar", diff --git a/data/nation/komi.ruleset b/data/nation/komi.ruleset index 3908a0bc4a..b738881877 100644 --- a/data/nation/komi.ruleset +++ b/data/nation/komi.ruleset @@ -1,4 +1,4 @@ -[nation_komi] +[nation_komi] name = _("Komi") plural = _("?plural:Komi") diff --git a/data/nation/kuna.ruleset b/data/nation/kuna.ruleset index 0ca95538c3..ec386fd86e 100644 --- a/data/nation/kuna.ruleset +++ b/data/nation/kuna.ruleset @@ -23,7 +23,7 @@ ruler_titles = { "Fundamentalism", _("Shaman %s"), _("?female:Shaman %s") "Monarchy", _("Great Chief %s"), _("?female:Great Chief %s") "Republic", _("Governor %s"), _("?female:Governor %s") -} +} flag = "kuna_yala" flag_alt = "-" diff --git a/data/nation/lithuanian.ruleset b/data/nation/lithuanian.ruleset index 81e8b24efa..d95cb56c5e 100644 --- a/data/nation/lithuanian.ruleset +++ b/data/nation/lithuanian.ruleset @@ -48,12 +48,12 @@ cities = "Šilutė", "Merkinė", "Jurbarkas", "Palanga", "Mažeikiai", "Kuršėnai", "Trakai", "Kernavė", "Varėna", "Rokiškis", "Kupiškis", "Druskininkai", "Marijampolė", - "Utena", "Anykščiai", "Kretinga", "Naujoji Akmenė", + "Utena", "Anykščiai", "Kretinga", "Naujoji Akmenė", "Birštonas", "Biržai", "Pasvalys", "Vilkaviškis", "Veliuona", "Molėtai", "Ignalina", "Šalčinininkai", "Kaišiadorys", "Širvintos", "Joniškis", "Prienai", "Gargždai", "Skuodas", "Akmenė", "Kelmė", "Varniai", "Tytuvėnai", "Pakruojis", "Jonava", "Žagarė", - "Kretinga", "Šilalė", "Tauragė", "Šakiai", "Skaudvilė", + "Kretinga", "Šilalė", "Tauragė", "Šakiai", "Skaudvilė", "Kazlų Rūda", "Kaišiadorys", "Lazdijai", "Radviliškis", "Švenčionys", "Tilžė", "Pagėgiai", "Švenčionėliai", "Seinai" diff --git a/data/nation/lojbanistani.ruleset b/data/nation/lojbanistani.ruleset index 7ba66e1f6f..e51603869e 100644 --- a/data/nation/lojbanistani.ruleset +++ b/data/nation/lojbanistani.ruleset @@ -23,7 +23,7 @@ leaders = { flag = "jbonai" flag_alt = "american" ; Born there style = "European" - + init_techs = "" init_buildings = "" init_units = "" diff --git a/data/nation/maasai.ruleset b/data/nation/maasai.ruleset index 01d755b174..7940a58919 100644 --- a/data/nation/maasai.ruleset +++ b/data/nation/maasai.ruleset @@ -1,4 +1,4 @@ -[nation_maasai] +[nation_maasai] name = _("Maasai") plural = _("?plural:Maasais") diff --git a/data/nation/malaysian.ruleset b/data/nation/malaysian.ruleset index 6b8dbfc08d..7669512356 100644 --- a/data/nation/malaysian.ruleset +++ b/data/nation/malaysian.ruleset @@ -39,7 +39,7 @@ cities = "Putrajaya", "Ipoh", "George Town", - "Butterworth", + "Butterworth", "Muar", "Melaka", "Johor Bahru", @@ -47,7 +47,7 @@ cities = "Kangar", "Kuala Terengganu", "Sungai Petani", - "Port Dickson", + "Port Dickson", "Klang", "Alor Setar", "Kota Baharu", diff --git a/data/nation/maltese.ruleset b/data/nation/maltese.ruleset index c711bfcbab..b2e9a9698f 100644 --- a/data/nation/maltese.ruleset +++ b/data/nation/maltese.ruleset @@ -30,7 +30,7 @@ ruler_titles = { flag = "malta" flag_alt = "europe" - + style = "Classical" init_techs = "" diff --git a/data/nation/manx.ruleset b/data/nation/manx.ruleset index cb46f03154..f683de0281 100644 --- a/data/nation/manx.ruleset +++ b/data/nation/manx.ruleset @@ -1,4 +1,4 @@ -[nation_manx] +[nation_manx] name = _("Manx") plural = _("?plural:Manx") diff --git a/data/nation/maori.ruleset b/data/nation/maori.ruleset index 56faef24a5..0cf86da778 100644 --- a/data/nation/maori.ruleset +++ b/data/nation/maori.ruleset @@ -44,7 +44,7 @@ cities = "Whakatane", "Wairoa (ocean, plains)", "Kataia", - "Whangarei", + "Whangarei", "Te Puke", "Te Whanganui (hills, ocean)", ; Wellington; alt. Maori: Poneke "Otautahi (plains, ocean)", ; Christchurch diff --git a/data/nation/marathi.ruleset b/data/nation/marathi.ruleset index 20b0970802..19aa151471 100644 --- a/data/nation/marathi.ruleset +++ b/data/nation/marathi.ruleset @@ -88,6 +88,6 @@ cities = "Palakwadi", "Satara", "Elichpur", - "Barsi", + "Barsi", "Badlapur", "Nandurbar" diff --git a/data/nation/median.ruleset b/data/nation/median.ruleset index 64bbbcc0b5..32d1de4879 100644 --- a/data/nation/median.ruleset +++ b/data/nation/median.ruleset @@ -32,7 +32,7 @@ ruler_titles = { "Anarchy", _("Usurper %s"), _("?female:Usurper %s") "Despotism", _("Satrap %s"), _("?female:Satrap %s") "Monarchy", _("%s Shahanshah"), _("%s Shahbanu") -} +} init_techs = "" init_buildings = "" diff --git a/data/nation/mexican.ruleset b/data/nation/mexican.ruleset index fc387bd7a0..86b1c70ab7 100644 --- a/data/nation/mexican.ruleset +++ b/data/nation/mexican.ruleset @@ -97,7 +97,7 @@ cities = "Nuevo Laredo (river, desert)", "Reynosa (river, desert)", "Matamoros (river, grassland)", - "Campeche (ocean, jungle)", + "Campeche (ocean, jungle)", "Chetumal (ocean, jungle)", "Villahermosa (river, jungle, swamp)", "Tuxtla Gutiérrez (river, mountains)", @@ -123,7 +123,7 @@ cities = "Tepic (mountains)", "Guaymas (ocean)", "La Paz (ocean, desert, hills)", - "Valladolid (jungle, forest)", + "Valladolid (jungle, forest)", "Acuña (river, desert)", "Monclova (desert, plains)", "Nogales (desert)", diff --git a/data/nation/mikmaq.ruleset b/data/nation/mikmaq.ruleset index 55878eaf65..c3602af11d 100644 --- a/data/nation/mikmaq.ruleset +++ b/data/nation/mikmaq.ruleset @@ -1,4 +1,4 @@ -[nation_mikmaq] +[nation_mikmaq] name = _("Mi'kmaq") plural = _("?plural:Mi'kmaq") diff --git a/data/nation/miskito.ruleset b/data/nation/miskito.ruleset index c04c317b86..4ed111698d 100644 --- a/data/nation/miskito.ruleset +++ b/data/nation/miskito.ruleset @@ -1,4 +1,4 @@ -[nation_miskito] +[nation_miskito] name = _("Miskito") plural = _("?plural:Miskito") diff --git a/data/nation/monegasque.ruleset b/data/nation/monegasque.ruleset index c24004b56c..76c409523b 100644 --- a/data/nation/monegasque.ruleset +++ b/data/nation/monegasque.ruleset @@ -31,7 +31,7 @@ ruler_titles = { "Despotism", _("Prince %s"), _("Princess %s") } -flag = "monaco_alternative" +flag = "monaco_alternative" flag_alt = "indonesia" ;the regular flag is identical to the Indonesian flag style = "Classical" diff --git a/data/nation/moroccan.ruleset b/data/nation/moroccan.ruleset index 5acd587e5d..8d0a64214f 100644 --- a/data/nation/moroccan.ruleset +++ b/data/nation/moroccan.ruleset @@ -63,7 +63,7 @@ cities = "Guelmim", "Laayoun", "Dakhla", - "Figuig", + "Figuig", "Ifrane", "Azrou", "Imouzzar", diff --git a/data/nation/muskogee.ruleset b/data/nation/muskogee.ruleset index 3f15e27386..00a40f2dd0 100644 --- a/data/nation/muskogee.ruleset +++ b/data/nation/muskogee.ruleset @@ -50,111 +50,111 @@ cities = "Mikasuke", ; Capital of the State of Muskogee "Tukabatchi", ; The historically most populous town "Oakfuskee", ; Current Creek nation capital - "Abihka", - "Abikudshi", - "Alkehatchee", - "Anatichapko", - "Assilanapi", - "Atasi", - "Atchinaalgi", - "Atchinahatchi", - "Aucheucaula", - "Canjauda", - "Cayomulgi", - "Chakihlako", - "Chananagi", - "Chatoksofki", - "Chatukchufaula", - "Chiaha", - "Cholocco Litabixee", - "Conaliga", - "Coosahatchi", - "Eufaula", - "Fusihatchi", - "Ghuaclahatche", - "Hatchichapa", - "Hillabi", - "Hlanudshiapala", + "Abihka", + "Abikudshi", + "Alkehatchee", + "Anatichapko", + "Assilanapi", + "Atasi", + "Atchinaalgi", + "Atchinahatchi", + "Aucheucaula", + "Canjauda", + "Cayomulgi", + "Chakihlako", + "Chananagi", + "Chatoksofki", + "Chatukchufaula", + "Chiaha", + "Cholocco Litabixee", + "Conaliga", + "Coosahatchi", + "Eufaula", + "Fusihatchi", + "Ghuaclahatche", + "Hatchichapa", + "Hillabi", + "Hlanudshiapala", "Hlaphlako", - "Hlahlokalka", - "Huhliwahli", - "Ikanachaka", - "Ikanhatki", - "Imukfa", - "Ipisogi", - "Istapoga", - "Istudshilaika", - "Kailaidshi", - "Keroff", - "Kitolopataki", - "Kohamutkikatska", - "Kulumi", - "Littefutchi", - "Lutchapoga", - "Muklassa", - "Ninnipaskulgees", - "Niuyaka", - "Oakfuskudshi", - "Okchayi", - "Okchayndshi", - "Ooeasa", - "Opilhlako", - "Oselarneby", + "Hlahlokalka", + "Huhliwahli", + "Ikanachaka", + "Ikanhatki", + "Imukfa", + "Ipisogi", + "Istapoga", + "Istudshilaika", + "Kailaidshi", + "Keroff", + "Kitolopataki", + "Kohamutkikatska", + "Kulumi", + "Littefutchi", + "Lutchapoga", + "Muklassa", + "Ninnipaskulgees", + "Niuyaka", + "Oakfuskudshi", + "Okchayi", + "Okchayndshi", + "Ooeasa", + "Opilhlako", + "Oselarneby", "Otituchina", - "Pakan Tallahassee", - "Pinhoti", - "Potchushatchi", - "Sakapatayi", - "Satapo", - "Saugahatchi", - "Sukaispoka", - "Taladega", - "Talasi", - "Talasihatchi", - "Talapoosa", + "Pakan Tallahassee", + "Pinhoti", + "Potchushatchi", + "Sakapatayi", + "Satapo", + "Saugahatchi", + "Sukaispoka", + "Taladega", + "Talasi", + "Talasihatchi", + "Talapoosa", "Taliposehogy", - "Tukpafka", - "Tukhtukagi", - "Tuskegee", - "Uktaliasasi", - "Ullibahali", - "Wakokayi", - "Weogufka", - "Wetumpka", - "Wewoka", + "Tukpafka", + "Tukhtukagi", + "Tuskegee", + "Uktaliasasi", + "Ullibahali", + "Wakokayi", + "Weogufka", + "Wetumpka", + "Wewoka", "Woksoyudshi", "Amakalli", "Apalachicola", "Apatai", - "Chattahoochee", + "Chattahoochee", "Chiaha", "Chiahudshi", "Chihlakonini", "Chiskatalofa", "Chukahlako", - "Cotohautustennuggee", + "Cotohautustennuggee", "Ematlochee", "Finhalui", "Hatchichapa", "Hihagee", - "Hlekatska", + "Hlekatska", "Hogologes", "Hotalihuyana", "Huhlitaiga", - "Itahasiwaki", + "Itahasiwaki", "Kaila", - "Kasihta", - "Kawaiki", - "Nipky", + "Kasihta", + "Kawaiki", + "Nipky", "Ocheeses", - "Ocmulgee", + "Ocmulgee", "Oconee", "Okitiyakni", "Osotchi", - "Sawokli", + "Sawokli", "Sawokliudshi", - "Secharlecha", + "Secharlecha", "Suolanocha", - "Tamali", - "Telmocresses", + "Tamali", + "Telmocresses", "Wikaihlako" diff --git a/data/nation/nepali.ruleset b/data/nation/nepali.ruleset index 290a08e59b..b258d3734e 100644 --- a/data/nation/nepali.ruleset +++ b/data/nation/nepali.ruleset @@ -31,7 +31,7 @@ ruler_titles = { flag = "nepal" flag_alt = "-" -style = "Asian" +style = "Asian" init_techs = "" init_buildings = "" @@ -39,7 +39,7 @@ init_units = "" civilwar_nations = "sherpa", "sikkimese" -cities = +cities = "Kathmandu", "Pokhara", "Lalitpur", diff --git a/data/nation/nimiipuu.ruleset b/data/nation/nimiipuu.ruleset index ec41f8cafb..66ee48d6aa 100644 --- a/data/nation/nimiipuu.ruleset +++ b/data/nation/nimiipuu.ruleset @@ -48,13 +48,13 @@ leaders = { ; (Three Feathers) signed treaty of 1855 "Mi-tat-wap-tes", "Male" -; (Chief Jason) +; (Chief Jason) "Kalkalshuatash", "Male" ; First Home and Farm Association President (1923) "James Stuart", "Male" -; Chair of NPTEC until 2007 +; Chair of NPTEC until 2007 "Rebecca Miles", "Female" } diff --git a/data/nation/ostrogothic.ruleset b/data/nation/ostrogothic.ruleset index f114d360d2..baa1b61267 100644 --- a/data/nation/ostrogothic.ruleset +++ b/data/nation/ostrogothic.ruleset @@ -27,9 +27,9 @@ leaders = { ruler_titles = { "government", "male_title", "female_title" - "Anarchy", _("Usurper %s"), _("?female:Usurper %s") - "Fundamentalism", _("Presbyter %s"), _("?female:Presbyter %s") - "Republic", _("Consul %s"), _("?female:Consul %s") + "Anarchy", _("Usurper %s"), _("?female:Usurper %s") + "Fundamentalism", _("Presbyter %s"), _("?female:Presbyter %s") + "Republic", _("Consul %s"), _("?female:Consul %s") } flag = "valknut" diff --git a/data/nation/pelasgian.ruleset b/data/nation/pelasgian.ruleset index b765830908..d39ab8c378 100644 --- a/data/nation/pelasgian.ruleset +++ b/data/nation/pelasgian.ruleset @@ -41,7 +41,7 @@ cities = "Korinthos", "Zakynthos", "Athenai", - "Mykenai", + "Mykenai", "Amarynthos", "Tirynsos", "Brilettos", diff --git a/data/nation/phoenician.ruleset b/data/nation/phoenician.ruleset index 5143e16529..c9bed2850c 100644 --- a/data/nation/phoenician.ruleset +++ b/data/nation/phoenician.ruleset @@ -42,7 +42,7 @@ cities = "Saidoon", ; English: "Sidon", modern "Sayda" "Berut", ; Greek: "Berytos"; Modern "Beirut" "Gebal", ; Greek: "Byblos" - "Batrun", + "Batrun", "Athar", ; Greek: "Tripoli" in Lebanon "Sarepta", ; modern "Sarafand" "Ugarit", @@ -70,7 +70,7 @@ cities = "Tharros", "Malaka", ; modern "Malaga" "Sexi", ; modern "Almuñecár" - "Utica", + "Utica", "Karalis", "Zili", "Tingis", ; modern "Tangier" diff --git a/data/nation/pictish.ruleset b/data/nation/pictish.ruleset index c0bb9aeb98..118bca54ca 100644 --- a/data/nation/pictish.ruleset +++ b/data/nation/pictish.ruleset @@ -25,7 +25,7 @@ ruler_titles = { "Anarchy", _("Usurper %s"), _("?female:Usurper %s") "Fundamentalism", _("Druid %s"), _("?female:Druid %s") "Monarchy", _("High King %s"), _("High Queen %s") -} +} flag = "pict" flag_alt = "scotland" diff --git a/data/nation/piedmontese.ruleset b/data/nation/piedmontese.ruleset index a551328045..385f70a95b 100644 --- a/data/nation/piedmontese.ruleset +++ b/data/nation/piedmontese.ruleset @@ -98,7 +98,7 @@ cities = "San Giulano di Geneva", ; Saint-Julien-en-Genevois "Borgo San Dalmazzo", "Cherasco", - "Varallo", + "Varallo", "Susa", "Cavour", "Dogliani", diff --git a/data/nation/quebecois.ruleset b/data/nation/quebecois.ruleset index 3346d66649..a2d810eefd 100644 --- a/data/nation/quebecois.ruleset +++ b/data/nation/quebecois.ruleset @@ -20,7 +20,7 @@ ruler_titles = { "Democracy", _("Premier %s"), _("Premiere %s") "Fundamentalism", _("Archbishop %s"), _("Mother Superior %s") "Republic", _("Governor %s"), _("?female:Governor %s") -} +} flag = "quebec" flag_alt = "-" diff --git a/data/nation/romanian.ruleset b/data/nation/romanian.ruleset index 250206bf4b..9dce7da03b 100644 --- a/data/nation/romanian.ruleset +++ b/data/nation/romanian.ruleset @@ -68,7 +68,7 @@ cities = "Suceava", "Piatra Neamţ", "Drobeta-Severin", - "Focşani", + "Focşani", "Târgu Jiu", "Tulcea", "Târgovişte", @@ -76,7 +76,7 @@ cities = "Bistriţa", "Slatina", "Hunedoara", - "Vaslui", + "Vaslui", "Călăraşi", "Giurgiu", "Roman", @@ -84,7 +84,7 @@ cities = "Bârlad", "Alba Iulia", "Zalău", - "Sfântu Gheorghe", + "Sfântu Gheorghe", "Turda", "Mediaş", "Slobozia", @@ -92,13 +92,13 @@ cities = "Alexandria", "Petroşani", "Lugoj", - "Medgidia", + "Medgidia", "Paşcani", "Tecuci", "Miercurea Ciuc", "Sighetu Marmaţiei", "Mangalia", - "Râmnicu Sărat", + "Râmnicu Sărat", "Câmpina", "Dej", "Câmpulung", @@ -106,14 +106,14 @@ cities = "Reghin", "Mioveni", "Făgăraş", - "Caracal", + "Caracal", "Feteşti", "Curtea de Argeş", "Năvodari", "Sighişoara", "Roşiori de Vede", "Dorohoi", - "Turnu Măgurele", + "Turnu Măgurele", "Fălticeni", "Huşi", "Vulcan", @@ -122,7 +122,7 @@ cities = "Lupeni", "Caransebeş", "Cugir", - "Săcele", + "Săcele", "Câmpia Turzii", "Târnăveni", "Sebeş", @@ -130,7 +130,7 @@ cities = "Petrila", "Borşa", "Zărneşti", - "Comăneşti", + "Comăneşti", "Motru", "Carei", "Moineşti", @@ -139,14 +139,14 @@ cities = "Gherla", "Balş", "Moreni", - "Târgu Neamţ", + "Târgu Neamţ", "Drăgăşani", "Târgu Secuiesc", "Băileşti", "Buhuşi", "Corabia", "Câmpulung Moldovenesc", - "Blaj", + "Blaj", "Gheorgheni", "Calafat", "Adjud", @@ -155,7 +155,7 @@ cities = "Filiaşi", "Salonta", "Buftea", - "Urziceni", + "Urziceni", "Bocşa", "Breaza", "Marghita", @@ -165,7 +165,7 @@ cities = "Vatra", "Cisnădie", "Mizil", - "Şimleu Silvaniei", + "Şimleu Silvaniei", "Topliţa", "Zimnicea", "Gura Humorului", @@ -173,7 +173,7 @@ cities = "Pucioasa", "Negreşti-Oaş", "Râşnov", - "Avrig", + "Avrig", "Baia Sprie", "Ocna Mureş", "Orşova", @@ -181,14 +181,14 @@ cities = "Moldova Nouă", "Călan", "Sinaia", - "Ţăndărei", + "Ţăndărei", "Simeria", "Dărmăneşti", "Târgu Ocna", "Târgu Lăpuş", "Vălenii de Munte", "Târgu Frumos", - "Scorniceşti", + "Scorniceşti", "Comarnic", "Ovidiu", "Drăgăneşti", @@ -196,7 +196,7 @@ cities = "Mărăşeşti", "Sânnicolau", "Ianca", - "Nehoiu", + "Nehoiu", "Rovinari", "Strehaia", "Haţeg", diff --git a/data/nation/sami.ruleset b/data/nation/sami.ruleset index b0987913eb..d0a11f5d2e 100644 --- a/data/nation/sami.ruleset +++ b/data/nation/sami.ruleset @@ -33,7 +33,7 @@ init_units = "" civilwar_nations = "finnish", "swedish", "norwegian", "russian" -; Sami city names are taken from the northernmost regions of Norway +; Sami city names are taken from the northernmost regions of Norway ; (Finnmark) Sweden and Finland (Lapland) and also a few from Russia. ; Some of these names use the classic orthography in the respective ; countries while yet some use a more modern native Sami orthography. diff --git a/data/nation/scottish.ruleset b/data/nation/scottish.ruleset index 36183aec85..6f744b70ae 100644 --- a/data/nation/scottish.ruleset +++ b/data/nation/scottish.ruleset @@ -51,7 +51,7 @@ cities = "Kilmarnock", "Dumfries (river)", "East Kilbride (hills)", - "Coatbridge (river)", + "Coatbridge (river)", "Dumbarton (ocean)", "Irvine (ocean, river)", "Lanrick (river)", ; Lanark @@ -72,26 +72,26 @@ cities = "Stranraer (ocean)", "Airdrie (hills)", "Troon (ocean)", - "Ullapool (ocean)", + "Ullapool (ocean)", "Ayr (ocean, river)", "Aviemore (mountains)", - "Lerwick (ocean)", + "Lerwick (ocean)", "Largs (ocean, river)", "Bellshill (hills)", "Week (ocean)", ; Wick "Larkhall (river)", "Cowdenbeath", - "Gretna (ocean, river)", + "Gretna (ocean, river)", "Brechin (river)", "Helensburgh (ocean)", - "Dunblane (river)", + "Dunblane (river)", "Montrose (ocean, river)", "Kilwinnin", ; Kilwinning "Monifieth (ocean)", "Dunbar (ocean, river)", "Cumnock", "Stornoway (ocean)", - "Callander (river)", + "Callander (river)", "Portree (ocean)", "Kelsae (river)", ; Kelso "Whitebridge (river)", diff --git a/data/nation/seljuk.ruleset b/data/nation/seljuk.ruleset index 7e0ecc3434..555b7d7255 100644 --- a/data/nation/seljuk.ruleset +++ b/data/nation/seljuk.ruleset @@ -38,7 +38,7 @@ ruler_titles = { "government", "male_title", "female_title" "Despotism", _("%s Bey"), _("?female:%s Bey") "Monarchy", _("Sultan %s"), _("Sultana %s") "Fundamentalism", _("Caliph %s"), _("Calipha %s") -} +} init_techs = "" init_buildings = "" diff --git a/data/nation/siberian.ruleset b/data/nation/siberian.ruleset index 5a4413c96a..6d84e7ab5e 100644 --- a/data/nation/siberian.ruleset +++ b/data/nation/siberian.ruleset @@ -22,7 +22,7 @@ ruler_titles = { "Despotism", _("General %s"), _("?female:General %s") "Fundamentalism", _("Patriarch %s"), _("Matriarch %s") "Republic", _("Governor %s"), _("?female:Governor %s") -} +} flag = "siberia" flag_alt = "-" diff --git a/data/nation/silesian.ruleset b/data/nation/silesian.ruleset index 0f2bee094d..32524096bc 100644 --- a/data/nation/silesian.ruleset +++ b/data/nation/silesian.ruleset @@ -51,17 +51,17 @@ cities = "Świdnica", "Lubin", "Chojnów", - "Małczyce", + "Małczyce", "Kłodzko", "Bytom", "Oświecim", "Złotoryja", "Bielany", - "Zgorzelec", + "Zgorzelec", "Żary", "Bystrzyca (river)", "Żagan", - "Bogatynia", + "Bogatynia", "Chocianów", "Nowa Sól", "Zabrze", diff --git a/data/nation/sorbian.ruleset b/data/nation/sorbian.ruleset index e99915eccc..3cec40bf52 100644 --- a/data/nation/sorbian.ruleset +++ b/data/nation/sorbian.ruleset @@ -25,7 +25,7 @@ ruler_titles = { "government", "male_title", "female_title" "Despotism", _("Prince %s"), _("Princess %s") "Republic", _("Burgomaster %s"), _("?female:Burgomaster %s") -} +} flag = "lusatia" flag_alt = "-" diff --git a/data/nation/southafrican.ruleset b/data/nation/southafrican.ruleset index a94bee16a4..4d0643133d 100644 --- a/data/nation/southafrican.ruleset +++ b/data/nation/southafrican.ruleset @@ -23,7 +23,7 @@ leaders = { ruler_titles = { "government", "male_title", "female_title" "Fundamentalism", _("Archbishop %s"), _("?female:Archbishop %s") -} +} flag = "south_africa" flag_alt = "-" -- 2.30.2