From aa5ecbdae9900df335fd87f78869580fde4ac458 Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Sun, 2 May 2021 05:22:15 +0300
Subject: [PATCH 47/47] Improve coding style of c*.ruleset nation rulesets

See osdn #42136

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 data/nation/californian.ruleset          |  19 +-
 data/nation/cambodian.ruleset            |  19 +-
 data/nation/cameroonian.ruleset          |  21 +-
 data/nation/canadian.ruleset             | 173 +++++-----
 data/nation/canari.ruleset               |  23 +-
 data/nation/cantonese.ruleset            |  18 +-
 data/nation/capeverdean.ruleset          |  14 +-
 data/nation/carantanian.ruleset          |  20 +-
 data/nation/carthaginian.ruleset         |  25 +-
 data/nation/castilian.ruleset            |  18 +-
 data/nation/catalan.ruleset              |  18 +-
 data/nation/celtiberian.ruleset          |  17 +-
 data/nation/celtic.ruleset               |  25 +-
 data/nation/centralafrican.ruleset       |  23 +-
 data/nation/centralamerican.ruleset      | 125 ++++---
 data/nation/centrallithuanian.ruleset    |  18 +-
 data/nation/chadian.ruleset              |  22 +-
 data/nation/cham.ruleset                 |  18 +-
 data/nation/chananean.ruleset            |  42 +--
 data/nation/chechen.ruleset              |  96 +++---
 data/nation/cherokee.ruleset             |  22 +-
 data/nation/chiapanec.ruleset            |  16 +-
 data/nation/chickasaw.ruleset            |  19 +-
 data/nation/chilean.ruleset              |  16 +-
 data/nation/chimu.ruleset                |  70 ++--
 data/nation/chinese.ruleset              |  21 +-
 data/nation/chinook.ruleset              |  20 +-
 data/nation/choctaw.ruleset              |  21 +-
 data/nation/chola.ruleset                |  14 +-
 data/nation/chrobatian.ruleset           |  20 +-
 data/nation/chumash.ruleset              |  83 ++---
 data/nation/chuvash.ruleset              |  20 +-
 data/nation/circassian.ruleset           |  20 +-
 data/nation/colombian.ruleset            |  20 +-
 data/nation/comanche.ruleset             |  79 ++---
 data/nation/comorian.ruleset             |  17 +-
 data/nation/confederate.ruleset          |  22 +-
 data/nation/congolese.ruleset            |  17 +-
 data/nation/congolesebrazzaville.ruleset |  18 +-
 data/nation/cornish.ruleset              | 102 +++---
 data/nation/corsican.ruleset             |  28 +-
 data/nation/cossack.ruleset              |  20 +-
 data/nation/costarican.ruleset           |  13 +-
 data/nation/cree.ruleset                 |  18 +-
 data/nation/cretan.ruleset               |  18 +-
 data/nation/crimeantatar.ruleset         | 422 +++++++++++------------
 data/nation/croatian.ruleset             |  17 +-
 data/nation/crusader.ruleset             |  26 +-
 data/nation/cuban.ruleset                |  17 +-
 data/nation/curonian.ruleset             |  26 +-
 data/nation/cuyavian.ruleset             |  21 +-
 data/nation/cypriot.ruleset              |  16 +-
 data/nation/cyrenaican.ruleset           |  17 +-
 data/nation/czech.ruleset                |  14 +-
 data/nation/czechoslovak.ruleset         |  19 +-
 55 files changed, 1054 insertions(+), 1029 deletions(-)

diff --git a/data/nation/californian.ruleset b/data/nation/californian.ruleset
index 1a4d3e5b39..64ddc4bc92 100644
--- a/data/nation/californian.ruleset
+++ b/data/nation/californian.ruleset
@@ -1,9 +1,9 @@
 [nation_californian]
 
-name=_("Californian")
-plural=_("?plural:Californians")
-groups="American"
-legend=_("California is the largest US state by population and economy.\
+name   = _("Californian")
+plural = _("?plural:Californians")
+groups = "American"
+legend = _("California is the largest US state by population and economy.\
  First populated by Native Americans, it was colonized by Spanish\
  missionaries in the 18th century. California became a territory of\
  Mexico upon that country's independence. During the Mexican-American War\
@@ -37,15 +37,15 @@ ruler_titles = {
  "Republic",        _("Governor %s"),  _("?female:Governor %s")
 }
 
-flag="california"
+flag = "california"
 flag_alt = "usa"
 style = "European"
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
-civilwar_nations="mexican", "american", "chumash", "ohlone"
+civilwar_nations = "mexican", "american", "chumash", "ohlone"
 
 cities =
  "Sacramento (plains, grassland)", ;state capital
@@ -148,4 +148,3 @@ cities =
  "Willows",
  "Colusa",
  "Quincy"
-
diff --git a/data/nation/cambodian.ruleset b/data/nation/cambodian.ruleset
index d2bf056834..040bd8d3e9 100644
--- a/data/nation/cambodian.ruleset
+++ b/data/nation/cambodian.ruleset
@@ -1,9 +1,9 @@
 [nation_cambodian]
 
-name=_("Cambodian")
-plural=_("?plural:Cambodians")
-groups="Modern", "Asian"
-legend=_("Kampuchea (known in English as Cambodia) is the modern successor\
+name   = _("Cambodian")
+plural = _("?plural:Cambodians")
+groups = "Modern", "Asian"
+legend = _("Kampuchea (known in English as Cambodia) is the modern successor\
  state of the mighty Khmer Empire, which ruled most of the Indochinese\
  Peninsula between the 11th\
  and 14th centuries.")
@@ -16,7 +16,7 @@ leaders = {
  "Jayavarman II",       "Male"
 }
 
-flag="kampuchea"
+flag = "kampuchea"
 flag_alt = "-"
 style = "Asian"
 
@@ -25,10 +25,11 @@ ruler_titles = {
  "Communism",       _("Brother %s"),        _("Sister %s")
 }
 
-init_techs=""
-init_buildings=""
-init_units=""
-civilwar_nations="thai", "vietnamese"
+init_techs = ""
+init_buildings = ""
+init_units = ""
+
+civilwar_nations = "thai", "vietnamese"
 
 cities =
  "Phnom Penh",
diff --git a/data/nation/cameroonian.ruleset b/data/nation/cameroonian.ruleset
index 2938cb446d..e5fe747fb2 100644
--- a/data/nation/cameroonian.ruleset
+++ b/data/nation/cameroonian.ruleset
@@ -1,27 +1,28 @@
 [nation_cameroonian]
 
-name = _("Cameroonian")
+name   = _("Cameroonian")
 plural = _("?plural:Cameroonians")
-groups="African", "Modern"
-legend=_("Cameroon is a country in West Central Africa. Colonized by the\
+groups = "African", "Modern"
+legend = _("Cameroon is a country in West Central Africa. Colonized by the\
  Germans, it was divided between Britain and France after World War I. It\
  has been independent since 1960.")
+
 leaders = {
- "name",                "sex"
+ "name",            "sex"
  "John Ngu Foncha", "Male"
- "Ahmadou Ahidjo", "Male"
- "Paul Biya", "Male"
+ "Ahmadou Ahidjo",  "Male"
+ "Paul Biya",       "Male"
 }
 
 flag = "cameroon"
 flag_alt = "-"
 style = "Tropical"
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
-civilwar_nations="nigerian", "fulani"
+civilwar_nations = "nigerian", "fulani"
 
 cities =
  "Yaoundé",
diff --git a/data/nation/canadian.ruleset b/data/nation/canadian.ruleset
index b1ab217f86..127eb89ba4 100644
--- a/data/nation/canadian.ruleset
+++ b/data/nation/canadian.ruleset
@@ -1,10 +1,9 @@
 [nation_canadian]
 
-name=_("Canadian")
-plural=_("?plural:Canadians")
-groups="Modern", "American"
-conflicts_with="quebecois", "inuit", "acadian"
-legend=_("Geographically, Canada is the second largest country in world.\
+name   = _("Canadian")
+plural = _("?plural:Canadians")
+groups = "Modern", "American"
+legend = _("Geographically, Canada is the second largest country in world.\
  The magnetic north pole currently lies on Canadian territory.")
 
 leaders = {
@@ -26,14 +25,16 @@ ruler_titles = {
  "Fundamentalism",  _("Bishop %s"), _("Mother Superior %s")
 }
 
-flag="canada"
+flag = "canada"
 flag_alt = "canada_old"
 style = "Celtic"
 
-init_techs=""
-init_buildings=""
-init_units=""
-civilwar_nations=
+init_techs = ""
+init_buildings = ""
+init_units = ""
+
+conflicts_with = "quebecois", "inuit", "acadian"
+civilwar_nations =
 ; Sub-national nations
  "quebecois", "acadian", "newfoundland",
 ; First Nations
@@ -42,83 +43,83 @@ civilwar_nations=
 ; Terrains:  desert, plains, grassland, river, forest, hills, mountains, tundra, swamp, jungle, ocean
 ; Capitals of provinces and territories are listed first in this list
 cities =
-"Ottawa (river, hills, !jungle, !desert, forest, !mountains, !tundra, !ocean)",
-"Toronto (ocean, forest, !desert, !mountains, !tundra, !jungle)",
-"Quebec (river, hills, plains, !desert, !swamp, !jungle)",
-"Edmonton (mountains, hills, plains, !jungle, !desert, !swamp, !ocean)",
-"Victoria (mountains, ocean, jungle, !desert, !tundra)",
-"Winnipeg (plains, river, !jungle, !tundra, !desert, !forest, !hills, !mountains, !ocean)",
-"Regina (plains, !forest, !desert, !hills, !mountains, !tundra, !jungle, !ocean)",
-"Fredericton (hills, !desert, !mountains, !tundra, !jungle, ocean)",
-"St. John's (ocean, hills, !desert, !jungle)",
-"Charlottetown (ocean, swamp, !desert, !mountains, !tundra, !jungle)",
-"Halifax (ocean, hills, !desert, !mountains, !tundra, !jungle)",
-"Yellowknife (tundra, !hills, !mountains, !jungle, !forest)",
-"Whitehorse (mountains, tundra, !forest, !jungle)",
-"Iqaluit (tundra, ocean, !mountains, !jungle)",
+ "Ottawa (river, hills, !jungle, !desert, forest, !mountains, !tundra, !ocean)",
+ "Toronto (ocean, forest, !desert, !mountains, !tundra, !jungle)",
+ "Quebec (river, hills, plains, !desert, !swamp, !jungle)",
+ "Edmonton (mountains, hills, plains, !jungle, !desert, !swamp, !ocean)",
+ "Victoria (mountains, ocean, jungle, !desert, !tundra)",
+ "Winnipeg (plains, river, !jungle, !tundra, !desert, !forest, !hills, !mountains, !ocean)",
+ "Regina (plains, !forest, !desert, !hills, !mountains, !tundra, !jungle, !ocean)",
+ "Fredericton (hills, !desert, !mountains, !tundra, !jungle, ocean)",
+ "St. John's (ocean, hills, !desert, !jungle)",
+ "Charlottetown (ocean, swamp, !desert, !mountains, !tundra, !jungle)",
+ "Halifax (ocean, hills, !desert, !mountains, !tundra, !jungle)",
+ "Yellowknife (tundra, !hills, !mountains, !jungle, !forest)",
+ "Whitehorse (mountains, tundra, !forest, !jungle)",
+ "Iqaluit (tundra, ocean, !mountains, !jungle)",
 ; Then the largest non-capital cities
-"Vancouver (ocean, river, mountains, jungle, !desert, !tundra)",
-"Montreal (river, mountains, !desert, !tundra, !jungle)",
-"Calgary (mountains, hills, grassland, !tundra, !forest, !desert, !swamp, !jungle, !ocean)",
-"Saskatoon (grassland, plains, !desert, !forest, !hills, !mountains, !tundra, !swamp, !jungle, !ocean)",
-"Hamilton (ocean, hills, !desert, !mountains, !tundra, !jungle)",
-"Moncton (river, hills, !jungle, !tundra, !mountains, !desert)",
-"Sherbrooke (hills, river, !jungle, !desert, !ocean, !tundra)",
-"Kelowna (mountains, river, !desert, !tundra, !jungle, !ocean)",
-"Moose Jaw (!desert, !forest, !hills, !mountains, !tundra, !swamp, !jungle, !ocean)",
-"Brandon (!ocean, !mountains, !hills, !desert, !jungle)",
-"Sudbury (hills, tundra, !jungle, !ocean)",
-"St. John (ocean, hills, !desert, river, !tundra, !jungle)",
-"Sault Ste. Marie (ocean, ocean, !desert, !mountains, !jungle, !tundra)",
-"Thunder Bay (ocean, swamp, !desert, !mountains, !jungle, !tundra)",
-"Niagara Falls (river, hills, !desert, !jungle, !tundra, !mountains)",
-"Red Deer (!mountains, river, hills, !desert, !jungle, !tundra, !swamp, !ocean)",
-"Jasper (mountains, !jungle, !plains, !grassland, !swamp,!ocean)",
-"Gatineau (hills, river, !desert, forest, !tundra, !jungle, !ocean)",
-"Prince Rupert (!desert, !plains, !grassland, mountains, !jungle, ocean, ocean)",
-"Windsor (river, !desert, !jungle, !tundra, !mountains)",
-"Prince George (mountains, river, !desert, !grassland, !tundra, !swamp, !jungle, !ocean)",
-"Kamloops (river, mountains, !desert, forest, !tundra, !jungle)",
-"Lethbridge (river, plains, !mountains, !tundra, !jungle, !swamp, !ocean)",
-"Medicine Hat (river, plains, !mountains, !tundra, !jungle, !swamp, !ocean, !forest)",
-"Prince Albert (river, plains, grassland, !mountains, !hills, !tundra, !desert, !forest, !ocean, !jungle)",
-"Thompson (plains, !mountains, !hills, !desert, !tundra, !jungle, !ocean)",
-"Timmins (tundra, !mountains, !jungle, !ocean)",
-"Sarnia (ocean, !desert, !jungle, !tundra, !mountains)",
-"Guelph (!ocean, !desert, river, forest, !mountains, !tundra, !jungle)",
-"St. Catharines (river, hills, !mountains, !tundra, !jungle, !desert)",
-"Barrie (ocean, !mountains, !tundra, !jungle, !desert)",
-"North Bay (ocean, hills, !mountains, !jungle)",
-"Belleville (ocean, forest, !desert, !jungle, !tundra, !mountains)",
-"Kingston (ocean, hills, forest, !desert, !jungle, !tundra, !mountains)",
-"Cornwall (river, hills, forest, !desert, !jungle, !tundra, !mountains)",
-"Trois-Rivieres (river, river, !desert, !jungle, !tundra, !mountains)",
-"Chicoutimi (river, hills, forest, !desert, !jungle, !tundra, !ocean)",
-"Rimouski (ocean, hills, forest, !desert, !jungle, !tundra)",
-"Dartmouth (ocean, hills, !desert, !jungle, river, !tundra)",
-"Glace Bay (ocean, !desert, !jungle, river, !tundra)",
-"Corner Brook (mountains, ocean, hills, !swamp, !tundra, !jungle)",
-"Gander (hills, forest, !tundra, !jungle, !ocean, !desert, river, !mountains)",
-"Swawinigan (river, hills, plains, !jungle, !ocean, !desert, !tundra)",
-"Saguenay (hills, !jungle, !desert, grassland, !jungle)",
-"Banff (mountains, !desert, !jungle, !plains, !grassland, !ocean)",
-"Dawson (mountains, tundra, !jungle, !plains, !grassland, !ocean)",
-"Truro (ocean, hills, !desert, !tundra, !jungle)",
+ "Vancouver (ocean, river, mountains, jungle, !desert, !tundra)",
+ "Montreal (river, mountains, !desert, !tundra, !jungle)",
+ "Calgary (mountains, hills, grassland, !tundra, !forest, !desert, !swamp, !jungle, !ocean)",
+ "Saskatoon (grassland, plains, !desert, !forest, !hills, !mountains, !tundra, !swamp, !jungle, !ocean)",
+ "Hamilton (ocean, hills, !desert, !mountains, !tundra, !jungle)",
+ "Moncton (river, hills, !jungle, !tundra, !mountains, !desert)",
+ "Sherbrooke (hills, river, !jungle, !desert, !ocean, !tundra)",
+ "Kelowna (mountains, river, !desert, !tundra, !jungle, !ocean)",
+ "Moose Jaw (!desert, !forest, !hills, !mountains, !tundra, !swamp, !jungle, !ocean)",
+ "Brandon (!ocean, !mountains, !hills, !desert, !jungle)",
+ "Sudbury (hills, tundra, !jungle, !ocean)",
+ "St. John (ocean, hills, !desert, river, !tundra, !jungle)",
+ "Sault Ste. Marie (ocean, ocean, !desert, !mountains, !jungle, !tundra)",
+ "Thunder Bay (ocean, swamp, !desert, !mountains, !jungle, !tundra)",
+ "Niagara Falls (river, hills, !desert, !jungle, !tundra, !mountains)",
+ "Red Deer (!mountains, river, hills, !desert, !jungle, !tundra, !swamp, !ocean)",
+ "Jasper (mountains, !jungle, !plains, !grassland, !swamp,!ocean)",
+ "Gatineau (hills, river, !desert, forest, !tundra, !jungle, !ocean)",
+ "Prince Rupert (!desert, !plains, !grassland, mountains, !jungle, ocean, ocean)",
+ "Windsor (river, !desert, !jungle, !tundra, !mountains)",
+ "Prince George (mountains, river, !desert, !grassland, !tundra, !swamp, !jungle, !ocean)",
+ "Kamloops (river, mountains, !desert, forest, !tundra, !jungle)",
+ "Lethbridge (river, plains, !mountains, !tundra, !jungle, !swamp, !ocean)",
+ "Medicine Hat (river, plains, !mountains, !tundra, !jungle, !swamp, !ocean, !forest)",
+ "Prince Albert (river, plains, grassland, !mountains, !hills, !tundra, !desert, !forest, !ocean, !jungle)",
+ "Thompson (plains, !mountains, !hills, !desert, !tundra, !jungle, !ocean)",
+ "Timmins (tundra, !mountains, !jungle, !ocean)",
+ "Sarnia (ocean, !desert, !jungle, !tundra, !mountains)",
+ "Guelph (!ocean, !desert, river, forest, !mountains, !tundra, !jungle)",
+ "St. Catharines (river, hills, !mountains, !tundra, !jungle, !desert)",
+ "Barrie (ocean, !mountains, !tundra, !jungle, !desert)",
+ "North Bay (ocean, hills, !mountains, !jungle)",
+ "Belleville (ocean, forest, !desert, !jungle, !tundra, !mountains)",
+ "Kingston (ocean, hills, forest, !desert, !jungle, !tundra, !mountains)",
+ "Cornwall (river, hills, forest, !desert, !jungle, !tundra, !mountains)",
+ "Trois-Rivieres (river, river, !desert, !jungle, !tundra, !mountains)",
+ "Chicoutimi (river, hills, forest, !desert, !jungle, !tundra, !ocean)",
+ "Rimouski (ocean, hills, forest, !desert, !jungle, !tundra)",
+ "Dartmouth (ocean, hills, !desert, !jungle, river, !tundra)",
+ "Glace Bay (ocean, !desert, !jungle, river, !tundra)",
+ "Corner Brook (mountains, ocean, hills, !swamp, !tundra, !jungle)",
+ "Gander (hills, forest, !tundra, !jungle, !ocean, !desert, river, !mountains)",
+ "Swawinigan (river, hills, plains, !jungle, !ocean, !desert, !tundra)",
+ "Saguenay (hills, !jungle, !desert, grassland, !jungle)",
+ "Banff (mountains, !desert, !jungle, !plains, !grassland, !ocean)",
+ "Dawson (mountains, tundra, !jungle, !plains, !grassland, !ocean)",
+ "Truro (ocean, hills, !desert, !tundra, !jungle)",
 ; Other Canadian towns
-"Churchhill (ocean, tundra, !jungle, !desert, !mountains, !hills)",
-"Castlegar (mountains, river, !jungle, !desert, !ocean)",
+ "Churchhill (ocean, tundra, !jungle, !desert, !mountains, !hills)",
+ "Castlegar (mountains, river, !jungle, !desert, !ocean)",
 ; Greater Toronto Area communities
-"Mississauga (ocean, !tundra, !jungle, !desert, !mountains)",
-"Brampton (forest, river, !desert, !mountains, !jungle, !tundra)",
-"Oakville (ocean, !tundra, !jungle, !desert, !mountains)",
-"Oshawa (ocean, !tundra, !jungle, !desert, !mountains)",
-"Whitby (ocean, !tundra, !jungle, !desert, !mountains)",
-"Ajax (ocean, !tundra, !jungle, !desert, !mountains)",
-"Pickering (ocean, !tundra, !jungle, !desert, !mountains)",
-"Markham (!ocean, !tundra, !jungle, !desert, !mountains, !river, !swamp)",
-"Newmarket (!ocean, !tundra, !jungle, !desert, !mountains)",
-"Uxbridge (hills, !tundra, !jungle, !desert, !mountains)",
+ "Mississauga (ocean, !tundra, !jungle, !desert, !mountains)",
+ "Brampton (forest, river, !desert, !mountains, !jungle, !tundra)",
+ "Oakville (ocean, !tundra, !jungle, !desert, !mountains)",
+ "Oshawa (ocean, !tundra, !jungle, !desert, !mountains)",
+ "Whitby (ocean, !tundra, !jungle, !desert, !mountains)",
+ "Ajax (ocean, !tundra, !jungle, !desert, !mountains)",
+ "Pickering (ocean, !tundra, !jungle, !desert, !mountains)",
+ "Markham (!ocean, !tundra, !jungle, !desert, !mountains, !river, !swamp)",
+ "Newmarket (!ocean, !tundra, !jungle, !desert, !mountains)",
+ "Uxbridge (hills, !tundra, !jungle, !desert, !mountains)",
 ; Eastern Ontario communities
-"Perth (river, swamp, !tundra, !jungle, !desert, !mountains)",
-"Smith's Falls (river, hills, !tundra, !jungle, !desert, !mountains)",
-"Carlton Place (river, !hills, !tundra, !jungle, !desert, !mountains)"
+ "Perth (river, swamp, !tundra, !jungle, !desert, !mountains)",
+ "Smith's Falls (river, hills, !tundra, !jungle, !desert, !mountains)",
+ "Carlton Place (river, !hills, !tundra, !jungle, !desert, !mountains)"
diff --git a/data/nation/canari.ruleset b/data/nation/canari.ruleset
index 2217c8fa55..3bd40a2d98 100644
--- a/data/nation/canari.ruleset
+++ b/data/nation/canari.ruleset
@@ -1,11 +1,11 @@
 [nation_canari]
 
-name=_("Cañari")
+name      = _("Cañari")
 ; pre-2.6 had plain ASCII names
-rule_name="Canari"
-plural=_("?plural:Cañaris")
-groups="Medieval", "American"
-legend=_("The Cañaris were a pre-Columbian civilization in what is now\
+rule_name = "Canari"
+plural    = _("?plural:Cañaris")
+groups    = "Medieval", "American"
+legend    = _("The Cañaris were a pre-Columbian civilization in what is now\
  Ecuador, whose existence can be traced from the 6th century onwards.\
  They were one of the few Andean cultures not to worship the sun. The\
  Cañari language was probably related to the Mochica language of Peru,\
@@ -29,19 +29,20 @@ ruler_titles = {
  "Monarchy",   _("High King %s"), _("High Queen %s")
 }
 
-flag="canar"
+flag = "canar"
 flag_alt = "-"
 style = "Babylonian"
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
+
 conflicts_with = "ecuadorian"
 civilwar_nations = "tairona", "chimu", "inca"
 
 cities =
- "Guapdondelig",	;Tomebamba/Cuenca
- "Hatun Cañari",	;Ingapirca
+ "Guapdondelig",        ; Tomebamba/Cuenca
+ "Hatun Cañari",        ; Ingapirca
  "Chobshi",
  "Yacubiñay",
  "Shabalula",
diff --git a/data/nation/cantonese.ruleset b/data/nation/cantonese.ruleset
index ce186918a4..b7a7eb2708 100644
--- a/data/nation/cantonese.ruleset
+++ b/data/nation/cantonese.ruleset
@@ -1,9 +1,9 @@
 [nation_cantonese]
 
-name=_("Cantonese")
-plural=_("?plural:Cantonese")
-groups="Asian", "Ancient"
-legend=_("The Cantonese are a sub-group of the Chinese people originating\
+name   = _("Cantonese")
+plural = _("?plural:Cantonese")
+groups = "Asian", "Ancient"
+legend = _("The Cantonese are a sub-group of the Chinese people originating\
  from Guangdong Province in Southern China comprising about 70 million\
  people. The Cantonese are renowned for their music and food and constitute\
  an important element in Overseas Chinese communities worldwide. They also\
@@ -29,15 +29,15 @@ ruler_titles = {
  "Democracy",       _("Chancellor %s"),      _("?female:Chancellor %s")
 }
 
-flag="cantonese"
+flag = "cantonese"
 flag_alt = "-"
 style = "Asian"
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
-civilwar_nations="Miao", "Vietnamese", "Zhuang"
+civilwar_nations = "Miao", "Vietnamese", "Zhuang"
 
 cities =
  "Gwongzau", ;Guangzhou
diff --git a/data/nation/capeverdean.ruleset b/data/nation/capeverdean.ruleset
index 0a36617f02..bd4099afc3 100644
--- a/data/nation/capeverdean.ruleset
+++ b/data/nation/capeverdean.ruleset
@@ -1,9 +1,9 @@
 [nation_capeverdean]
 
-name = _("Cape Verdean")
+name   = _("Cape Verdean")
 plural = _("?plural:Cape Verdean")
-groups="African", "Modern"
-legend=_("Cape Verde is an archipelago off the coast of West Africa.\
+groups = "African", "Modern"
+legend = _("Cape Verde is an archipelago off the coast of West Africa.\
  Before the islands were settled by the Portuguese in the 15th century\
  they were probably uninhabited. Cape Verde subsequently became a major\
  center for the Atlantic slave trade. The islands declared independence\
@@ -29,11 +29,11 @@ flag = "cape_verde"
 flag_alt = "-"
 style = "Classical"
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
-civilwar_nations="bissau-guinean"
+civilwar_nations = "bissau-guinean"
 
 cities =
  "Praia",
diff --git a/data/nation/carantanian.ruleset b/data/nation/carantanian.ruleset
index 15a00801b5..377cc6b47e 100644
--- a/data/nation/carantanian.ruleset
+++ b/data/nation/carantanian.ruleset
@@ -1,9 +1,9 @@
 [nation_carantanian]
 
-name=_("Carantanian")
-plural=_("?plural:Carantanians")
-groups="Medieval", "European"
-legend=_("The Carantanians or Alpine Slavs were an Early Medieval\
+name   = _("Carantanian")
+plural = _("?plural:Carantanians")
+groups = "Medieval", "European"
+legend = _("The Carantanians or Alpine Slavs were an Early Medieval\
  confederation of South West Slavic tribes who settled in modern-day\
  Austria. The Duchy of Carantania was one of the earliest Slav states,\
  existing since the seventh century CE. In the eighth century, it fell\
@@ -12,6 +12,7 @@ legend=_("The Carantanians or Alpine Slavs were an Early Medieval\
  joined the revolt of the Croatian duke Ljudevit Posavski. After its fall\
  in 822 the state was abolished and incorporated directly into the realm\
  of the Franks. Slovenians are the modern descendants of the Carantanians.")
+
 leaders = {
  "name",                "sex"
  "Valuk",               "Male"
@@ -20,7 +21,8 @@ leaders = {
  "Chotimir",            "Male"
  "Valtunk",             "Male"
 }
-flag="carantanian"
+
+flag = "carantanian"
 flag_alt = "-"
 style = "Celtic"
 
@@ -30,11 +32,11 @@ ruler_titles = {
  "Monarchy",        _("Grand Duke %s"),   _("Grand Duchess %s")
 }
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
-conflicts_with="Austrian", "Slovenian"
+conflicts_with = "Austrian", "Slovenian"
 civilwar_nations = "Chrobatian", "Moravian", "Slovakian", "Slovenian"
 
 cities =
diff --git a/data/nation/carthaginian.ruleset b/data/nation/carthaginian.ruleset
index 0232983fc2..815ecba7a8 100644
--- a/data/nation/carthaginian.ruleset
+++ b/data/nation/carthaginian.ruleset
@@ -1,13 +1,11 @@
 [nation_carthaginian]
 
-translation_domain="freeciv"
+translation_domain = "freeciv"
 
-name=_("Carthaginian")
-plural=_("?plural:Carthaginians")
-groups="Ancient", "African", "Core"
-; Carthage being a successor-state of the Phoenician empire
-conflicts_with="phoenician"
-legend=_("The Carthaginians, descendants of Phoenician traders,\
+name   = _("Carthaginian")
+plural = _("?plural:Carthaginians")
+groups = "Ancient", "African", "Core"
+legend = _("The Carthaginians, descendants of Phoenician traders,\
  ran a naval empire in the Mediterranean from the 5th to 2nd centuries\
  BCE. Carthage was destroyed by Rome in 146 BCE.")
 
@@ -25,14 +23,17 @@ ruler_titles = {
  "Democracy",       _("Judge %s"),       _("?female:Judge %s")
 }
 
-flag="cartago"
+flag = "cartago"
 flag_alt = "tunisia"	; Used previously
 style = "Classical"
 
-init_techs=""
-init_buildings=""
-init_units=""
-civilwar_nations="phoenician", "sicilian", "iberian"
+init_techs = ""
+init_buildings = ""
+init_units = ""
+
+; Carthage being a successor-state of the Phoenician empire
+conflicts_with = "phoenician"
+civilwar_nations = "phoenician", "sicilian", "iberian"
 
 ;Ancient cities from Africa and south Spain,
 ;some are later roman colonies and not carthaginian towns
diff --git a/data/nation/castilian.ruleset b/data/nation/castilian.ruleset
index a3035a9ff4..faeff2a36a 100644
--- a/data/nation/castilian.ruleset
+++ b/data/nation/castilian.ruleset
@@ -1,9 +1,9 @@
 [nation_castilian]
 
-name=_("Castilian")
-plural=_("?plural:Castilians")
-groups="European", "Medieval"
-legend=_("Castile emerged to become the most powerful of the medieval\
+name   = _("Castilian")
+plural = _("?plural:Castilians")
+groups = "European", "Medieval"
+legend = _("Castile emerged to become the most powerful of the medieval\
  Spanish kingdoms. It absorbed Leon and later formed a personal union\
  with Aragon. Its current territory is divided over several autonomous\
  communities of Spain.")
@@ -32,15 +32,15 @@ ruler_titles = {
  "Fundamentalism", _("Cardinal %s"), _("Mother Superior %s")
 }
 
-flag="castile"
+flag = "castile"
 flag_alt = "spain"
 style = "European"
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
-civilwar_nations="leonese", "aragonese"
+civilwar_nations = "leonese", "aragonese"
 
 cities =
  "Burgos",
diff --git a/data/nation/catalan.ruleset b/data/nation/catalan.ruleset
index f8d50dac9e..e0ee036c23 100644
--- a/data/nation/catalan.ruleset
+++ b/data/nation/catalan.ruleset
@@ -1,9 +1,9 @@
 [nation_catalan]
 
-name=_("Catalan")
-plural=_("?plural:Catalans")
-groups="Medieval", "Early Modern", "European"
-legend=_("During the Middle Ages, Catalan kings conquered and presided over\
+name   = _("Catalan")
+plural = _("?plural:Catalans")
+groups = "Medieval", "Early Modern", "European"
+legend = _("During the Middle Ages, Catalan kings conquered and presided over\
  several kingdoms on the shores of the Mediterranean Sea, from the Iberian\
  peninsula to parts of Italy and Greece. This confederation/empire became a\
  major naval and trading power in the Mediterranean area. Catalans kept\
@@ -32,15 +32,15 @@ ruler_titles = {
  "Fundamentalism",  _("Archbishop %s"),      _("Mother Superior %s")
 }
 
-flag="catalan"
+flag = "catalan"
 flag_alt = "-"
 style = "Classical"
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
-civilwar_nations="Spanish", "French", "Occitan", "Andorran"
+civilwar_nations = "Spanish", "French", "Occitan", "Andorran"
 
 ; This city list does not actually correspond to medieval Catalonia,
 ; but rather to all lands settled by Catalans, where Catalan is still spoken
diff --git a/data/nation/celtiberian.ruleset b/data/nation/celtiberian.ruleset
index b161dfca38..2785adec37 100644
--- a/data/nation/celtiberian.ruleset
+++ b/data/nation/celtiberian.ruleset
@@ -1,9 +1,9 @@
 [nation_celtiberian]
 
-name=_("Celtiberian")
-plural=_("?plural:Celtiberians")
-groups="Ancient", "European"
-legend=_("The Celtiberians were a people from East-Central Spain that lived\
+name   = _("Celtiberian")
+plural = _("?plural:Celtiberians")
+groups = "Ancient", "European"
+legend = _("The Celtiberians were a people from East-Central Spain that lived\
  during the last millennium BCE. They were of mixed Celtic and Iberian\
  descent and were defeated by Rome in the Numantian War.")
 
@@ -20,13 +20,14 @@ leaders = {
  "Thurro",      "Male"
 }
 
-flag="celtiberian"
+flag = "celtiberian"
 flag_alt = "-"
 style = "Celtic"
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
+
 conflicts_with = "spanish", "castilian", "catalan", "aragonese"
 civilwar_nations = "iberian", "gallic", "gaelic"
 
diff --git a/data/nation/celtic.ruleset b/data/nation/celtic.ruleset
index c92403f62a..091220d2c1 100644
--- a/data/nation/celtic.ruleset
+++ b/data/nation/celtic.ruleset
@@ -1,17 +1,18 @@
 [nation_celtic]
 
-translation_domain="freeciv"
+translation_domain = "freeciv"
 
-name=_("Celtic")
-plural=_("?plural:Celts")
-groups="Ancient", "European", "Core"
-legend=_("The Celts were an Indo-European ethno-linguistic complex in Western\
+name   = _("Celtic")
+plural = _("?plural:Celts")
+groups = "Ancient", "European", "Core"
+legend = _("The Celts were an Indo-European ethno-linguistic complex in Western\
  Europe, probably originating from the area between the upper Rhine and\
  upper Danube, from the Urnfield culture and the western group of the\
  Hallstatt culture. The Celts were known as cruel and savage warriors\
  who terrorized the ancient civilized peoples of Europe and Asia Minor.\
  The Celts colonized much of Europe and had a large influence on the\
  development of European civilization.")
+
 leaders = {
        "name",                "sex"
        "Noudentos",           "Male"         ;Nuada Airgetlám
@@ -29,7 +30,7 @@ leaders = {
        "Windoseibara",        "Female"       ;Guinevere
 }
 
-flag="celtic"
+flag = "celtic"
 flag_alt = "-"
 style = "Celtic"
 
@@ -42,13 +43,13 @@ ruler_titles = {
   "Fundamentalism", _("High Druid %s"),    _("?female:High Druid %s")
 }
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
-conflicts_with="Boian", "Belgic", "Briton", "Gallic", "Helvetian", "Gaelic",
-               "Scottish Gaelic", "Manx", "Welsh", "Cornish", "Breton", "Irish",
-               "Celtiberian", "Indo-European" ; Galatian Noric
+conflicts_with = "Boian", "Belgic", "Briton", "Gallic", "Helvetian", "Gaelic",
+                 "Scottish Gaelic", "Manx", "Welsh", "Cornish", "Breton", "Irish",
+                 "Celtiberian", "Indo-European" ; Galatian Noric
 civilwar_nations = "Boian", "Belgic", "Briton", "Gallic", "Helvetian", "Gaelic",
                    "Scottish Gaelic", "Manx", "Welsh", "Cornish", "Breton", "Irish",
                    "Celtiberian" ; Galatian Noric Lusitanian
diff --git a/data/nation/centralafrican.ruleset b/data/nation/centralafrican.ruleset
index bb9585544c..7b6364382b 100644
--- a/data/nation/centralafrican.ruleset
+++ b/data/nation/centralafrican.ruleset
@@ -1,13 +1,14 @@
 [nation_central_african]
 
-name=_("Central African")
-plural=_("?plural:Central Africans")
-groups="Modern", "African"
-legend=_("The Central African Republic is a country in Central Africa,\
+name   = _("Central African")
+plural = _("?plural:Central Africans")
+groups = "Modern", "African"
+legend = _("The Central African Republic is a country in Central Africa,\
  formerly known as the French African territory of Ubangi-Shari. It was\
  ruled briefly as a dictatorship in the 70s under Emperor Bokassa I during\
  which it was called the Central African Empire.")
-leaders=
+
+leaders =
 {
  "name",		"sex"
  "André Kolingba",	"male"
@@ -22,15 +23,15 @@ ruler_titles = {
  "Monarchy",        _("Emperor %s"),   _("Empress %s")
 }
 
-flag="car"
-flag_alt="-"
+flag = "car"
+flag_alt = "-"
 style = "Tropical"
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
-civilwar_nations="Chadian", "Congolese", "Cameroonian"
+civilwar_nations = "Chadian", "Congolese", "Cameroonian"
 
 cities =
  "Bangui",
diff --git a/data/nation/centralamerican.ruleset b/data/nation/centralamerican.ruleset
index 5533009a3a..9eb0770488 100644
--- a/data/nation/centralamerican.ruleset
+++ b/data/nation/centralamerican.ruleset
@@ -1,10 +1,10 @@
 [nation_centralamerican]
 
-name=_("Central American")
-plural=_("?plural:Central Americans")
-groups="American"
+name   = _("Central American")
+plural = _("?plural:Central Americans")
+groups = "American"
 
-legend=_("During the colonial era Central America formed the Captaincy\
+legend = _("During the colonial era Central America formed the Captaincy\
  General of Guatemala. Central America declared independence from Spain\
  in 1821, shortly joined Mexico, and then formed a federal republic.\
  Struggles between Guatemala and the other provinces and between liberals\
@@ -33,71 +33,70 @@ flag         = "central_america"
 flag_alt     = "-"
 style        = "Tropical"
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
-conflicts_with= "guatemalan", "honduran", "salvadoran", "nicaraguan", "costa rican", "chiapanec"
+conflicts_with = "guatemalan", "honduran", "salvadoran", "nicaraguan", "costa rican", "chiapanec"
 civilwar_nations = "guatemalan", "honduran", "salvadoran", "nicaraguan", "costa rican", "chiapanec"
 
 cities =
 ;federal capitals
-"Guatemala",
-"San Salvador",
+ "Guatemala",
+ "San Salvador",
 ;capitals of member republics
-"San José",
-"Comayagua",
-"Granada",
-"Cartago",
-"Quetzaltenango",
-"Heredia",
-"León",
-"Alajuela",
+ "San José",
+ "Comayagua",
+ "Granada",
+ "Cartago",
+ "Quetzaltenango",
+ "Heredia",
+ "León",
+ "Alajuela",
 ;capitals of member republics after dissolution
-"Managua",
-"Tegucigalpa",
+ "Managua",
+ "Tegucigalpa",
 ;capitals of reunification attempts
-"Amapala",
-"Chinandega",
+ "Amapala",
+ "Chinandega",
 ;other cities
-"San Pedro Sula",
-"Tapachula",
-"Puerto de Caballos",	;Puerto Cortés
-"Santa Ana",
-"Comayagüela",
-"Estelí",
-"Huehuetenango",
-"Puerto Limón",
-"Sonsonate",
-"Matagalpa",
-"Trujillo",
-"La Ceiba",
-"San Miguel",
-"Liberia",
-"Chimaltenango",
-"Nicoya",
-"Verapaz",
-"San Vicente",
-"Boaco",
-"Santiago de Guatemala", ;Antigua Guatemala
-"Choluteca",
-"Rivas",
-"Puntarenas",
-"Huixtla",
-"Tela",
-"Juigalpa",
-"Escuintla",
-"La Unión",
-"Danlí",
-"Chiquimula",
-"Omoa",
-"Masaya",
-"Juticalpa",
-"San Francisco",
-"Santa Rosa",
-"Zacatecoluca",
-"San Rafael",
-"Totonicapán",
-"Ocotal",
-"Soyapango"
-
+ "San Pedro Sula",
+ "Tapachula",
+ "Puerto de Caballos",  ;Puerto Cortés
+ "Santa Ana",
+ "Comayagüela",
+ "Estelí",
+ "Huehuetenango",
+ "Puerto Limón",
+ "Sonsonate",
+ "Matagalpa",
+ "Trujillo",
+ "La Ceiba",
+ "San Miguel",
+ "Liberia",
+ "Chimaltenango",
+ "Nicoya",
+ "Verapaz",
+ "San Vicente",
+ "Boaco",
+ "Santiago de Guatemala", ;Antigua Guatemala
+ "Choluteca",
+ "Rivas",
+ "Puntarenas",
+ "Huixtla",
+ "Tela",
+ "Juigalpa",
+ "Escuintla",
+ "La Unión",
+ "Danlí",
+ "Chiquimula",
+ "Omoa",
+ "Masaya",
+ "Juticalpa",
+ "San Francisco",
+ "Santa Rosa",
+ "Zacatecoluca",
+ "San Rafael",
+ "Totonicapán",
+ "Ocotal",
+ "Soyapango"
diff --git a/data/nation/centrallithuanian.ruleset b/data/nation/centrallithuanian.ruleset
index 074b76a57c..a3c5507f29 100644
--- a/data/nation/centrallithuanian.ruleset
+++ b/data/nation/centrallithuanian.ruleset
@@ -1,9 +1,9 @@
 [nation_centrallithuanian]
 
-name=_("Central Lithuanian")
-plural=_("?plural:Central Lithuanians")
-groups="European"
-legend=_("Lithuanian Poles are an ethnic minority in Lithuania, mainly in\
+name   = _("Central Lithuanian")
+plural = _("?plural:Central Lithuanians")
+groups = "European"
+legend = _("Lithuanian Poles are an ethnic minority in Lithuania, mainly in\
  the Aukshtota region. They are a remnant of the Polish-Lithuanian\
  Commonwealth - the Commonwealth of Two Nations, which was founded with\
  the Union of Lublin in 1569. This state united the Kingdom of Poland with\
@@ -19,6 +19,7 @@ legend=_("Lithuanian Poles are an ethnic minority in Lithuania, mainly in\
  of a Republic of Central Lithuania, which was then incorporated into\
  Poland. After World War II most of the Lithuanian Poles were displaced to\
  Poland's new western territories.")
+
 leaders = {
  "name",                "sex"
  "Gabriel Narutowicz",  "Male"
@@ -29,7 +30,8 @@ leaders = {
  "Jerzy Iwanowski",     "Male"
  "Stefan Mokrzecki",    "Male"
 }
-flag="central_lithuania"
+
+flag = "central_lithuania"
 flag_alt = "-"
 style = "Celtic"
 
@@ -41,9 +43,9 @@ ruler_titles = {
  "Fundamentalism",  _("Archbishop %s"),          _("Mother Superior %s")
 }
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
 civilwar_nations = "Lithuanian", "Polish", "Belarusian", "Lipka Tatar", "Mazovian"
 
diff --git a/data/nation/chadian.ruleset b/data/nation/chadian.ruleset
index 29516f963e..f676223345 100644
--- a/data/nation/chadian.ruleset
+++ b/data/nation/chadian.ruleset
@@ -1,28 +1,31 @@
 [nation_chadian]
 
-name=_("Chadian")
-plural=_("?plural:Chadians")
-groups="African", "Modern"
-legend=_("Chad is a landlocked country in Africa. Once the site of the\
+name   = _("Chadian")
+plural = _("?plural:Chadians")
+groups = "African", "Modern"
+legend = _("Chad is a landlocked country in Africa. Once the site of the\
  Kanem-Bornu Empire, Chad was colonized by France in 1900. Independent\
  since 1960, Chad remains one of the poorest countries of the world. From\
  1982 to 1990 Hissene Habré led a notoriously brutal dictatorship.")
+
 leaders = {
  "name",                "sex"
  "François Tombalbaye",	"male"
  "Félix Malloum",       "male"
  "Hissène Habré",       "male"
 }
+
 ruler_titles = { "government",     "male_title",       "female_title"
                  "Despotism",      _("General %s"),    _("?female:General %s")
 	       }
-flag="chad"
+
+flag = "chad"
 flag_alt = "-"
 style = "tropical"
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
 conflicts_with = "romanian" ;similar flag , "kanem-bornu"
 civilwar_nations = "central african", "kanem-bornu"
@@ -70,6 +73,3 @@ cities =
  "Melfi",
  "Béboto",
  "Aouzou"
-
-
-
diff --git a/data/nation/cham.ruleset b/data/nation/cham.ruleset
index b7824f2de7..6549e62e97 100644
--- a/data/nation/cham.ruleset
+++ b/data/nation/cham.ruleset
@@ -1,9 +1,9 @@
 [nation_cham]
 
-name=_("Cham")
-plural=_("?plural:Chams")
-groups="Asian", "Medieval"
-legend=_("Champa was the name of a group of closely related polities\
+name   = _("Cham")
+plural = _("?plural:Chams")
+groups = "Asian", "Medieval"
+legend = _("Champa was the name of a group of closely related polities\
  in what is now the southern half of Vietnam. From the time of the\
  earliest historical records, the Champa kings were Hindus who\
  worshipped Shiva in particular. Involved with conflicts with the\
@@ -24,15 +24,15 @@ leaders = {
  "Vikrantavarman I",    "Male"
 }
 
-flag="cham"
+flag = "cham"
 flag_alt="-"
 style = "Asian"
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
-civilwar_nations="Acehnese", "Vietnamese", "Sri Vijaya",
+civilwar_nations = "Acehnese", "Vietnamese", "Sri Vijaya",
  "Majapahit", "Cambodian"
 
 cities =
diff --git a/data/nation/chananean.ruleset b/data/nation/chananean.ruleset
index 4e88fbfb6c..581257bd6b 100644
--- a/data/nation/chananean.ruleset
+++ b/data/nation/chananean.ruleset
@@ -1,9 +1,9 @@
 [nation_chananean]
 
-name=_("Chananean")
-plural=_("?plural:Chananeans")
-groups="Imaginary"
-legend=_("Reports of chynocephaly (having the head of a dog or jackal)\
+name   = _("Chananean")
+plural = _("?plural:Chananeans")
+groups = "Imaginary"
+legend = _("Reports of chynocephaly (having the head of a dog or jackal)\
  can be traced to Greek Antiquity. The physician Ctesias and the traveler\
  Megasthenes placed them in India. In the middle ages, Giovanni da Pian\
  and Marco Polo made reference to them, while the theologian Ratramnus\
@@ -32,13 +32,13 @@ ruler_titles = {
  "Republic",        _("%s Alpha"),        _("?female:%s Alpha")
 }
 
-flag="chananea"
+flag = "chananea"
 flag_alt = "-"
 style = "Babylonian"
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
 civilwar_nations = "werewolf", "alsatian"
 
@@ -56,19 +56,19 @@ cities =
  ; Varieties
  "Akita Inu",
  "Malamute",
- "Hound", 
- "Basenji", 
- "Chow Chow", 
- "Wolfhound", 
- "Lhasa Apso", 
- "Pekingese", 
- "Saluki", 
- "Samoyed", 
- "Shar Pei", 
- "Shiba Inu", 
- "Shih Tzu", 
- "Husky", 
- "Terrier", 
+ "Hound",
+ "Basenji",
+ "Chow Chow",
+ "Wolfhound",
+ "Lhasa Apso",
+ "Pekingese",
+ "Saluki",
+ "Samoyed",
+ "Shar Pei",
+ "Shiba Inu",
+ "Shih Tzu",
+ "Husky",
+ "Terrier",
  "Mastiff",
  "Jackal",
  "Jindo Gae",
diff --git a/data/nation/chechen.ruleset b/data/nation/chechen.ruleset
index 08df425fd2..f505906715 100644
--- a/data/nation/chechen.ruleset
+++ b/data/nation/chechen.ruleset
@@ -1,10 +1,10 @@
 [nation_chechen]
 
-name=_("Chechen")
-plural=_("?plural:Chechens")
-groups="Asian", "European", "Early Modern"
+name   = _("Chechen")
+plural = _("?plural:Chechens")
+groups = "Asian", "European", "Early Modern"
 
-legend=_("Chechnya is an ancient nation in the Caucasus, currently part\
+legend = _("Chechnya is an ancient nation in the Caucasus, currently part\
  of the Russian Federation. In 1588, the Chechens voluntarily subjected\
  themselves as vassals to the Moscovite tsar. Nevertheless, they have\
  repeatedly waged war against Russia. In the 1990s, after the breakup\
@@ -31,55 +31,55 @@ ruler_titles = {
  "Fundamentalism",  _("Imam %s"),      _("Imama %s")
 }
 
-flag="chechnya"
+flag = "chechnya"
 flag_alt = "-"
 style = "European"
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
 
-conflicts_with= "soviet", "tatar" ;latter because of similar flag
+conflicts_with = "soviet", "tatar" ;latter because of similar flag
 civilwar_nations = "russian", "ossetian"
 
 cities =
-"Sölƶa-Ġala",		;Grozny
-"Ẋalxa-Marta",		;Urus-Martan
-"Şela-Ġala",		;Shali
-"Argun",		;Argun
-"Gümse",		;Gudermes
-"Evtara",		;Avtury
-"Vedana",		;Vedana
-"Thäẋa-Marta",		;Achkhoy-Martan
-"Terkathi",		;Znamenskoye
-"Dari-Ġala",		;Shelkovskaya
-"Şatoy",		;Shatoy
-"Ẋanġaala",		;Khankala
-"Yokka-Ataġla",		;Starye Atagi
-"Sämajaşka",		;Samashki
-"Jalaroy",		;Aleroy
-"Hosi-Yurt",		;Tsenteroy
-"Iton-Qäl",		;Itum-Kale
-"Kurşloy",		;Kurchaloy
-"Nevre",		;Naurskaya
-"Ena-Yurt",		;Sernovoskaya
-"Kotari-Yurt",		;Katyr-Yurt
-"Jalxan-Ġala",		;Alkhan-Kala
-"Oysungur",		;Oyskhara
-"Alroy",		;Alleroy
-"Galayn-Ç̇oƶ",		;Galanchozh
-"Exa-Barze",		;Assinovskaya
-"Ġoy",			;Goyty
-"Laxa-Njovre",		;Nadterechnoye
-"Doykur-Evl",		;Tolstoy-Yurt
-"Jälin-Yurt",		;Gvardeyskoye
-"Orazkey",		;Chervlyonnaya
-"Balargathi",		;Balerik
-"Çeçana",		;Chechen-Aul
-"Olxuzuri-Khuotar",	;Alkhazurovo
-"Bummat",		;Bamut
-"Zaki-Evla",		;Zakan-Yurt
-"Laqa-Njovre",		;Verkhyj Naur
-"Bepza-Böra",		;Koshkeldy
-"Obargye"		;Grebenskaya
+ "Sölƶa-Ġala",          ; Grozny
+ "Ẋalxa-Marta",         ; Urus-Martan
+ "Şela-Ġala",           ; Shali
+ "Argun",               ; Argun
+ "Gümse",               ; Gudermes
+ "Evtara",              ; Avtury
+ "Vedana",              ; Vedana
+ "Thäẋa-Marta",         ; Achkhoy-Martan
+ "Terkathi",            ; Znamenskoye
+ "Dari-Ġala",           ; Shelkovskaya
+ "Şatoy",               ; Shatoy
+ "Ẋanġaala",            ; Khankala
+ "Yokka-Ataġla",        ; Starye Atagi
+ "Sämajaşka",           ; Samashki
+ "Jalaroy",             ; Aleroy
+ "Hosi-Yurt",           ; Tsenteroy
+ "Iton-Qäl",            ; Itum-Kale
+ "Kurşloy",             ; Kurchaloy
+ "Nevre",               ; Naurskaya
+ "Ena-Yurt",            ; Sernovoskaya
+ "Kotari-Yurt",         ; Katyr-Yurt
+ "Jalxan-Ġala",         ; Alkhan-Kala
+ "Oysungur",            ; Oyskhara
+ "Alroy",               ; Alleroy
+ "Galayn-Ç̇oƶ",          ; Galanchozh
+ "Exa-Barze",           ; Assinovskaya
+ "Ġoy",                 ; Goyty
+ "Laxa-Njovre",         ; Nadterechnoye
+ "Doykur-Evl",          ; Tolstoy-Yurt
+ "Jälin-Yurt",          ; Gvardeyskoye
+ "Orazkey",             ; Chervlyonnaya
+ "Balargathi",          ; Balerik
+ "Çeçana",              ; Chechen-Aul
+ "Olxuzuri-Khuotar",    ; Alkhazurovo
+ "Bummat",              ; Bamut
+ "Zaki-Evla",           ; Zakan-Yurt
+ "Laqa-Njovre",         ; Verkhyj Naur
+ "Bepza-Böra",          ; Koshkeldy
+ "Obargye"              ; Grebenskaya
diff --git a/data/nation/cherokee.ruleset b/data/nation/cherokee.ruleset
index 909f427a2d..0f7b295f44 100644
--- a/data/nation/cherokee.ruleset
+++ b/data/nation/cherokee.ruleset
@@ -1,11 +1,11 @@
 [nation_cherokee]
 
-translation_domain="freeciv"
+translation_domain = "freeciv"
 
-name=_("Cherokee")
-plural=_("?plural:Cherokees")
-groups="American", "Core"
-legend=_("The Cherokee nation is the largest Native American\
+name   = _("Cherokee")
+plural = _("?plural:Cherokees")
+groups = "American", "Core"
+legend = _("The Cherokee nation is the largest Native American\
  nation in North America today.")
 
 leaders = {
@@ -26,22 +26,22 @@ ruler_titles = {
  "Democracy",       _("Principal Chief %s"), _("?female:Principal Chief %s")
 }
 
-flag= "keetoowah"
+flag = "keetoowah"
 flag_alt = "-"
 style = "Celtic"
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
-civilwar_nations="choctaw", "iroquois", "chickasaw"
+civilwar_nations = "choctaw", "iroquois", "chickasaw"
 
 ; names of early Cherokee settlements in no particular order
 cities =
  "Tanasi",
  "Nanyahala",
  "Tikaleyasuni",
- "Kulsetsiyi",	; (or Sugartown)
+ "Kulsetsiyi",  ; (or Sugartown)
  "Ustanali",
  "Natuhli",
  "Cowee",
diff --git a/data/nation/chiapanec.ruleset b/data/nation/chiapanec.ruleset
index 09d0a0e81e..33da303a92 100644
--- a/data/nation/chiapanec.ruleset
+++ b/data/nation/chiapanec.ruleset
@@ -1,9 +1,9 @@
 [nation_chiapanec]
 
-name=_("Chiapanec")
-plural=_("?plural:Chiapanecs")
-groups="American"
-legend=_("Chiapas is a state in southern Mexico. It was governed from\
+name   = _("Chiapanec")
+plural = _("?plural:Chiapanecs")
+groups = "American"
+legend = _("Chiapas is a state in southern Mexico. It was governed from\
  Guatemala during the colonial era, but in 1824, after a brief\
  independence, it chose to join Mexico. Chiapas has a sizeable indigenous\
  (predominantly Mayan) population. Much of Chiapas' history has been\
@@ -24,7 +24,7 @@ leaders = {
  "Elba Esther Gordillo",   "Female"
 }
 
-flag="chiapas"
+flag = "chiapas"
 flag_alt = "-"
 style = "Tropical"
 
@@ -35,9 +35,9 @@ ruler_titles = {
  "Republic",       _("Governor %s"),   _("?female:Governor %s")
 }
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
 civilwar_nations = "mayan", "guatemalan"
 
diff --git a/data/nation/chickasaw.ruleset b/data/nation/chickasaw.ruleset
index c57441843e..2283182684 100644
--- a/data/nation/chickasaw.ruleset
+++ b/data/nation/chickasaw.ruleset
@@ -1,8 +1,8 @@
 [nation_chickasaw]
 
-name=_("Chickasaw")
-plural=_("?plural:Chickasaws")
-groups="Early Modern", "American"
+name   = _("Chickasaw")
+plural = _("?plural:Chickasaws")
+groups = "Early Modern", "American"
 legend=_("One of the so-called Five Civilized Tribes, the Chickasaw\
  occupied primarily what is today the northern part of the U.S. state of\
  Mississippi at the time of first contact with Europeans. The name\
@@ -18,8 +18,9 @@ leaders = {
  "Itawamba",                     "Male"
  "Taski Etoka",                  "Male"
 }
-flag="chickasaw"
-flag_alt="-"
+
+flag = "chickasaw"
+flag_alt = "-"
 style = "Celtic"
 
 ruler_titles = {
@@ -29,11 +30,11 @@ ruler_titles = {
  "Democracy",       _("Principal Chief %s"), _("?female:Principal Chief %s")
 }
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
-civilwar_nations="Cherokee", "Muskogee", "Choctaw"
+civilwar_nations = "Cherokee", "Muskogee", "Choctaw"
 
 cities =
 ; Old Mississippi settlements http://www.accessgenealogy.com/native/tribes/chickasaw/chickasawhist.htm
diff --git a/data/nation/chilean.ruleset b/data/nation/chilean.ruleset
index 1db4ea3174..5072781284 100644
--- a/data/nation/chilean.ruleset
+++ b/data/nation/chilean.ruleset
@@ -1,9 +1,9 @@
 [nation_chilean]
 
-name=_("Chilean")
-plural=_("?plural:Chileans")
-groups="Modern", "American"
-legend=_("Chile is located on the south-western coast of South America.\
+name   = _("Chilean")
+plural = _("?plural:Chileans")
+groups = "Modern", "American"
+legend = _("Chile is located on the south-western coast of South America.\
  Chile declared its independence from Spain in 1810. At the expense of\
  Bolivia, Peru and the indigenous Mapuche people, Chile more than doubled\
  its territory in the 19th century. Often having been more stable and\
@@ -31,14 +31,14 @@ ruler_titles = {
  "Fundamentalism",  _("Archbishop %s"),      _("Mother Superior %s")
 }
 
-flag="chile"
+flag = "chile"
 flag_alt = "-"
 style = "European"
 
-init_techs=""
-init_buildings=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
-init_units=""
 civilwar_nations = "mapuche", "rapa nui"
 
 cities =
diff --git a/data/nation/chimu.ruleset b/data/nation/chimu.ruleset
index ec6df520e8..00f0c5af21 100644
--- a/data/nation/chimu.ruleset
+++ b/data/nation/chimu.ruleset
@@ -1,9 +1,9 @@
 [nation_chimu] 
 
-name=_("Chimu") 
-plural=_("?plural:Chimu") 
-groups="Medieval", "American" 
-legend=_("Inheritors of the Moche cultural tradition, Chimor began\
+name   = _("Chimu")
+plural = _("?plural:Chimu")
+groups = "Medieval", "American"
+legend = _("Inheritors of the Moche cultural tradition, Chimor began\
  its expansion in the 12th century from the Moche river valley in\
  what is now northern Peru. Their expansion continued until they\
  were halted and conquered by the rising Inka Empire in 1470. Their\
@@ -26,37 +26,37 @@ ruler_titles = {
  "Despotism",       _("Lord %s"),      _("Lady %s")
 }
 
-flag= "chimu" 
-flag_alt = "-" 
-style = "Babylonian" 
+flag = "chimu"
+flag_alt = "-"
+style = "Babylonian"
 
-init_techs="" 
-init_buildings="" 
-init_units="" 
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
-civilwar_nations="inca", "aymara", "mwiska"
+civilwar_nations = "inca", "aymara", "mwiska"
 
-cities = 
-"Chan Chan", 
-"Farfán", 
-"Pacatnamú", 
-"Sican", 
-"Manchán", 
-"Cinto", 
-"Túcume", 
-"Juayanca", 
-"Chotuna", 
-"Batan", 
-"Mocollope", 
-"Galindo", 
-"Huancaco", 
-"Panamarca", 
-"Cao", 
-"Piura", 
-"Chiclayo", 
-"Huamachuco", 
-"Apurlé", 
-"Piura", 
-"Payta", 
-"Pacasmayo", 
-"Viru"
+cities =
+ "Chan Chan",
+ "Farfán",
+ "Pacatnamú",
+ "Sican",
+ "Manchán",
+ "Cinto",
+ "Túcume",
+ "Juayanca",
+ "Chotuna",
+ "Batan",
+ "Mocollope",
+ "Galindo",
+ "Huancaco",
+ "Panamarca",
+ "Cao",
+ "Piura",
+ "Chiclayo",
+ "Huamachuco",
+ "Apurlé",
+ "Piura",
+ "Payta",
+ "Pacasmayo",
+ "Viru"
diff --git a/data/nation/chinese.ruleset b/data/nation/chinese.ruleset
index 4b0a8248cd..c58536660c 100644
--- a/data/nation/chinese.ruleset
+++ b/data/nation/chinese.ruleset
@@ -1,11 +1,11 @@
 [nation_chinese]
 
-translation_domain="freeciv"
+translation_domain = "freeciv"
 
-name=_("Chinese")
-plural=_("?plural:Chinese")
-groups="Modern", "Asian", "Core"
-legend=_("China is the oldest major civilization that is still in\
+name   = _("Chinese")
+plural = _("?plural:Chinese")
+groups = "Modern", "Asian", "Core"
+legend = _("China is the oldest major civilization that is still in\
  existence today, with written records dating back over 3,500 years.\
  After first being unified by the Qin dynasty in 221 BCE, China alternated\
  between periods of unity and disunity, and was occasionally conquered by\
@@ -30,14 +30,15 @@ ruler_titles = {
  "Communism",       _("Chairman %s"),  _("Chairwoman %s")
 }
 
-flag="china"
+flag = "china"
 flag_alt = "-"
 style = "Asian"
 
-init_techs=""
-init_buildings=""
-init_units=""
-civilwar_nations=
+init_techs = ""
+init_buildings = ""
+init_units = ""
+
+civilwar_nations =
 ; Technically Taiwan (ROC) is the site of government-in-exile of China proper
  "taiwanese",
 ; Nations part of modern PRC
diff --git a/data/nation/chinook.ruleset b/data/nation/chinook.ruleset
index 35d662be93..e47dd67ea1 100644
--- a/data/nation/chinook.ruleset
+++ b/data/nation/chinook.ruleset
@@ -1,9 +1,9 @@
 [nation_chinook]
 
-name=_("Chinook")
-plural=_("?plural:Chinooks")
-groups="American", "Early Modern"
-legend=_("The Chinook Confederacy was a group of communities with common\
+name   = _("Chinook")
+plural = _("?plural:Chinooks")
+groups = "American", "Early Modern"
+legend = _("The Chinook Confederacy was a group of communities with common\
  customs and language. They were a sedentary people living along the\
  Columbia river in present-day Oregon and Washington in the United\
  States. Chinook regional influence can be seen in the fact that\
@@ -24,15 +24,15 @@ ruler_titles = {
  "Democracy",       _("Principal Chief %s"), _("?female:Principal Chief %s")
 }
 
-flag="clatsop"
-flag_alt="-"
+flag = "clatsop"
+flag_alt = "-"
 style = "Celtic"
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
-civilwar_nations="Nimiipuu", "Salishan"
+civilwar_nations = "Nimiipuu", "Salishan"
 
 cities =
  "Multnomah",
diff --git a/data/nation/choctaw.ruleset b/data/nation/choctaw.ruleset
index 0f9f9bd9fe..e5ef19b2f9 100644
--- a/data/nation/choctaw.ruleset
+++ b/data/nation/choctaw.ruleset
@@ -1,9 +1,9 @@
 [nation_choctaw] 
 
-name=_("Choctaw") 
-plural=_("?plural:Choctaws") 
-groups="American", "Early Modern"
-legend=_("One of the so-called Five Civilized Tribes, the Choctaw\
+name   = _("Choctaw")
+plural = _("?plural:Choctaws")
+groups = "American", "Early Modern"
+legend = _("One of the so-called Five Civilized Tribes, the Choctaw\
  traditionally occupied much of the middle and south of today's U.S.\
  state of Mississippi. First encountered by Spanish explorers in the\
  16th century, they became long-time French allies before siding\
@@ -33,14 +33,15 @@ ruler_titles = {
  "Fundamentalism",  _("Shaman %s"),          _("?female:Shaman %s")
 }
 
-flag="choctaw"
-flag_alt="-"
+flag = "choctaw"
+flag_alt = "-"
 style = "Celtic"
 
-init_techs=""
-init_buildings=""
-init_units=""
-civilwar_nations="Muskogee", "Chickasaw", "Seminole" 
+init_techs = ""
+init_buildings = ""
+init_units = ""
+
+civilwar_nations = "Muskogee", "Chickasaw", "Seminole"
 
 cities =
 ; legendary origin location
diff --git a/data/nation/chola.ruleset b/data/nation/chola.ruleset
index 7461802154..4ca6364fc8 100644
--- a/data/nation/chola.ruleset
+++ b/data/nation/chola.ruleset
@@ -1,10 +1,10 @@
 [nation_chola]
 
-name=_("Chola")
-plural=_("?plural:Cholas")
-groups="Asian", "Medieval"
+name   = _("Chola")
+plural = _("?plural:Cholas")
+groups = "Asian", "Medieval"
 
-legend=_("The Cholas were a Tamil dynasty centered in southern India that\
+legend = _("The Cholas were a Tamil dynasty centered in southern India that\
  was unusually influential in northern India. They began as a\
  tributary state to the Pallavas, but in the 9th century their power began\
  to grow. During the 11th century, they led expeditions against other\
@@ -30,9 +30,9 @@ flag         = "chola"
 flag_alt     = "-"
 style        = "Tropical"
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
 civilwar_nations = "gupta", "lankese", "maldivian"
 
diff --git a/data/nation/chrobatian.ruleset b/data/nation/chrobatian.ruleset
index 46996dc8f7..c14fbe7c04 100644
--- a/data/nation/chrobatian.ruleset
+++ b/data/nation/chrobatian.ruleset
@@ -1,15 +1,16 @@
 [nation_chrobatian]
 
-name=_("Chrobatian")
-plural=_("?plural:Chrobatians")
-groups="European", "Medieval"
-legend=_("Chrobatia was an Early Medieval, semi-legendary Slavic\
+name   = _("Chrobatian")
+plural = _("?plural:Chrobatians")
+groups = "European", "Medieval"
+legend = _("Chrobatia was an Early Medieval, semi-legendary Slavic\
  state organized by the White Croats in a part of Central Europe that\
  can not be conclusively identified today. The main source of the\
  existence of a White Croatian state is a mention by the Byzantine\
  Emperor Constantine VII Porphyrogennetos. White Croatia is sometimes\
  associated with a prince Slavnik, lord of Libice, whose influence\
  extended to the region of Silesia and the land of Krakow.")
+
 leaders = {
  "name",                "sex"
  "Krok",                "Male"          ;semi-legendary prince or chieftain in Czech folklore
@@ -20,7 +21,8 @@ leaders = {
  "Vojtĕch",             "Male"          ;Saint Adalbert, son of prince Slavnik
  "Radim",               "Male"          ;archbishop Gaudentius, brother of Saint Adalbert
 }
-flag="chrobatian"
+
+flag = "chrobatian"
 flag_alt = "-"
 style = "Celtic"
 
@@ -31,11 +33,11 @@ ruler_titles = {
  "Monarchy",       _("Grand Prince %s"), _("Grand Princess %s")
 }
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
-conflicts_with="czech", "polish", "moravian", "silesian", "austrian", "prussian"
+conflicts_with = "czech", "polish", "moravian", "silesian", "austrian", "prussian"
 civilwar_nations = "czech", "vistulan", "silesian", "moravian"
 
 cities =
diff --git a/data/nation/chumash.ruleset b/data/nation/chumash.ruleset
index 5862983809..02ab2d3439 100644
--- a/data/nation/chumash.ruleset
+++ b/data/nation/chumash.ruleset
@@ -1,9 +1,9 @@
 [nation_chumash] 
 
-name=_("Chumash") 
-plural=_("?plural:Chumash") 
-groups="American"
-legend=_("Inhabiting the Santa Barbara Channel Islands and the southern\
+name   = _("Chumash")
+plural = _("?plural:Chumash")
+groups = "American"
+legend = _("Inhabiting the Santa Barbara Channel Islands and the southern\
  California coastline between Malibu and Paso Robles inland towards the San\
  Joaquin valley, the Chumash lived in large permanent villages and maintained\
  a semi-monetized economy. These villages came to be ruled by hereditary\
@@ -26,42 +26,43 @@ ruler_titles = {
 }
 
 flag = "chumash"
-flag_alt = "-" 
-style = "Celtic" 
+flag_alt = "-"
+style = "Celtic"
 
-init_techs="" 
-init_buildings="" 
-init_units="" 
-civilwar_nations="hopi", "ohlone"
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
-cities = 
-"Syuxtun", 
-"Xonxon’ata", 
-"Lompo’", 
-"Niaqla", 
-"Tuqan", 
-"Shawa", 
-"Xaxas", 
-"Lisiqishi", 
-"Sis’a", 
-"Kashtiq", 
-"Stuk", 
-"Texax", 
-"‘Ataxis", 
-"Chimimu’", 
-"Chihlkukunach", 
-"Wasna", 
-"Lalimanux", 
-"Nanawani", 
-"Heqep", 
-"Hawamiw", 
-"Washlayik", 
-"Tashlipun", 
-"Tso", 
-"Helewashkuy", 
-"Mikiw", 
-"Chanu", 
-"Kach’antuk’", 
-"Huwam", 
-"Achililiwo", 
-"Shnaxalyiwi"
+civilwar_nations = "hopi", "ohlone"
+
+cities =
+ "Syuxtun",
+ "Xonxon’ata",
+ "Lompo’",
+ "Niaqla",
+ "Tuqan",
+ "Shawa",
+ "Xaxas",
+ "Lisiqishi",
+ "Sis’a",
+ "Kashtiq",
+ "Stuk",
+ "Texax",
+ "‘Ataxis",
+ "Chimimu’",
+ "Chihlkukunach",
+ "Wasna",
+ "Lalimanux",
+ "Nanawani",
+ "Heqep",
+ "Hawamiw",
+ "Washlayik",
+ "Tashlipun",
+ "Tso",
+ "Helewashkuy",
+ "Mikiw",
+ "Chanu",
+ "Kach’antuk’",
+ "Huwam",
+ "Achililiwo",
+ "Shnaxalyiwi"
diff --git a/data/nation/chuvash.ruleset b/data/nation/chuvash.ruleset
index 939e93bea3..bac76d8da5 100644
--- a/data/nation/chuvash.ruleset
+++ b/data/nation/chuvash.ruleset
@@ -1,13 +1,14 @@
 [nation_chuvash]
 
-name=_("Chuvash")
-plural=_("?plural:Chuvashes")
-groups="European"
-legend=_("Chuvashes are a Turkic ethnic group in Eastern European Russia\
+name   = _("Chuvash")
+plural = _("?plural:Chuvashes")
+groups = "European"
+legend = _("Chuvashes are a Turkic ethnic group in Eastern European Russia\
  and Western Siberia. They may be descendants of Old Bulgarian Turkic\
  tribes and possibly Huns. Today there are about 1.8 million Chuvashes,\
  about half of them in the Republic of Chuvashia, which is part of the\
  Russian Federation.")
+
 leaders = {
  "name",                         "sex"
  "Vakrim",                       "Male"
@@ -19,7 +20,8 @@ leaders = {
  "Tanil El'men",                 "Male"
  "Nikolay Vasilyevich Fyodorov", "Male"
 }
-flag="chuvashia"
+
+flag = "chuvashia"
 flag_alt = "-"
 style = "Celtic"
 
@@ -29,11 +31,11 @@ ruler_titles = {
  "Fundamentalism", _("Patriarch %s"),          _("Matriarch %s")
  }
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
-conflicts_with="volga bulgar", "soviet", "golden horde", "russian", "gokturk"
+conflicts_with = "volga bulgar", "soviet", "golden horde", "russian", "gokturk"
 civilwar_nations = "tatar", "bashkir", "mordvin", "volga bulgar"
 
 cities =
diff --git a/data/nation/circassian.ruleset b/data/nation/circassian.ruleset
index 779c7a76b1..f44094be8f 100644
--- a/data/nation/circassian.ruleset
+++ b/data/nation/circassian.ruleset
@@ -1,10 +1,10 @@
 [nation_circassian]
 
-name=_("Circassian")
-plural=_("?plural:Circassians")
-groups="Ancient", "Medieval", "Early Modern", "European"
+name   = _("Circassian")
+plural = _("?plural:Circassians")
+groups = "Ancient", "Medieval", "Early Modern", "European"
 ; /* xgettext:no-c-format */
-legend=_("The Circassians are the indigenous peoples of the Northwest\
+legend = _("The Circassians are the indigenous peoples of the Northwest\
  Caucasus. The Circassian or Adyghe language is part of the Northwest\
  Caucasian language family, related to Kabardian, Abkhaz and Ubykh. The\
  Circassians first emerged as a coherent entity some 6000 years ago. They\
@@ -14,6 +14,7 @@ legend=_("The Circassians are the indigenous peoples of the Northwest\
  middle of the 19th century, when they were defeated and subjected to\
  genocide at the hands of the Russian Empire. Today less than 10% of the\
  Circassian population lives in their original homeland.")
+
 leaders = {
  "name",                  "sex"
  "Inal Teghen",		  "Male"   ; a.k.a Inal Tighen or Inal the Great
@@ -25,7 +26,8 @@ leaders = {
  "Qanoqwe",               "Male"
  "Gwascheney",            "Female" ; a.k.a Maria  
 }
-flag="adygea"
+
+flag = "adygea"
 flag_alt = "-"
 style = "Celtic"
 
@@ -36,11 +38,11 @@ ruler_titles = {
  "Fundamentalism",  _("Grand Mufti %s"), _("?female:Grand Mufti %s")
 }
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
-conflicts_with="soviet"
+conflicts_with = "soviet"
 civilwar_nations = "abkhaz", "chechen", "ossetian", "cossack", "kalmyk",
  "crimean tatar", "golden horde"
 
diff --git a/data/nation/colombian.ruleset b/data/nation/colombian.ruleset
index e25d7b2a05..2a9981bc0d 100644
--- a/data/nation/colombian.ruleset
+++ b/data/nation/colombian.ruleset
@@ -1,9 +1,9 @@
 [nation_colombian]
 
-name=_("Colombian")
-plural=_("?plural:Colombians")
-groups="Modern", "American"
-legend=_("Colombia is a country in northern South America. The region was\
+name   = _("Colombian")
+plural = _("?plural:Colombians")
+groups = "Modern", "American"
+legend = _("Colombia is a country in northern South America. The region was\
  an Amerindian cultural center in pre-European time. The Spanish began\
  settling Colombia's north coast around 1500. In 1819 the Republic of\
  Colombia gained independence.")
@@ -30,16 +30,16 @@ ruler_titles = {
  "Monarchy",       _("Viceroy %s"),      _("Vicereine %s")
 }
 
-flag="colombia"
+flag = "colombia"
 flag_alt = "-"
 style = "Tropical"
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
-conflicts_with="Tairona"
-civilwar_nations="Venezuelan", "Ecuadorian", "Panamanian"
+conflicts_with = "Tairona"
+civilwar_nations = "Venezuelan", "Ecuadorian", "Panamanian"
 
 cities =
  "Bogotá",
diff --git a/data/nation/comanche.ruleset b/data/nation/comanche.ruleset
index eeff12aa39..7c83a24417 100644
--- a/data/nation/comanche.ruleset
+++ b/data/nation/comanche.ruleset
@@ -1,9 +1,9 @@
 [nation_comanche]
 
-name=_("Comanche")
-plural=_("?plural:Comanches")
-groups="American"
-legend=_("The Comanche or Numunu are a Native American ethnic group whose\
+name   = _("Comanche")
+plural = _("?plural:Comanches")
+groups = "American"
+legend = _("The Comanche or Numunu are a Native American ethnic group whose\
  historic range (the Comancheria) consisted of present-day eastern New\
  Mexico, southern Colorado, northeastern Arizona, southern Kansas, all of\
  Oklahoma, and most of northwest Texas.")
@@ -29,42 +29,43 @@ ruler_titles = {
 flag = "comanche"
 flag_alt = "-"
 style = "celtic"
-init_techs=""
-init_buildings=""
-init_units=""
+
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
 civilwar_nations = "hopi", "apache"
 
 cities =
-  "Húpenúú",
-"Kúhtsútúúka",
-"Kwaarú Núú",
-"Mútsahne",
-"Nokoni Núú",
-"Tahnahwah",
-"Tanimúú",
-"Pagatsú",
-"Pekwi Túhka",
-"Penatúka Núú",
-"Tayúúwit",
-"Kúvahrahtpaht",
-"Taykahpwai",
-"Pikaatamú",
-"Saria Túhka",
-"Yaparúhka",
-"Ketahtoh Tú",
-"Motso Tú",
-"Pibianigwai",
-"Súhmúhtúhka",
-"Titchahkaynah",
-"Wahkoh",
-"Waw'ai",
-"Hai'ne'na'úne",
-"It'chit'a'búd'ah",
-"Itehtah'o",
-"Naú'niem",
-"Ohnonúú",
-"Pahúraix",
-"Pohoi",
-"Tútsanoo Yehkú",
-"Wianúú"
+ "Húpenúú",
+ "Kúhtsútúúka",
+ "Kwaarú Núú",
+ "Mútsahne",
+ "Nokoni Núú",
+ "Tahnahwah",
+ "Tanimúú",
+ "Pagatsú",
+ "Pekwi Túhka",
+ "Penatúka Núú",
+ "Tayúúwit",
+ "Kúvahrahtpaht",
+ "Taykahpwai",
+ "Pikaatamú",
+ "Saria Túhka",
+ "Yaparúhka",
+ "Ketahtoh Tú",
+ "Motso Tú",
+ "Pibianigwai",
+ "Súhmúhtúhka",
+ "Titchahkaynah",
+ "Wahkoh",
+ "Waw'ai",
+ "Hai'ne'na'úne",
+ "It'chit'a'búd'ah",
+ "Itehtah'o",
+ "Naú'niem",
+ "Ohnonúú",
+ "Pahúraix",
+ "Pohoi",
+ "Tútsanoo Yehkú",
+ "Wianúú"
diff --git a/data/nation/comorian.ruleset b/data/nation/comorian.ruleset
index 2b989f1859..ac128a8b8e 100644
--- a/data/nation/comorian.ruleset
+++ b/data/nation/comorian.ruleset
@@ -1,9 +1,9 @@
 [nation_comorian]
 
-name=_("Comorian")
-plural=_("?plural:Comorians")
-groups="Modern", "African"
-legend=_("The Comoros is an island country in the Mozambique channel,\
+name   = _("Comorian")
+plural = _("?plural:Comorians")
+groups = "Modern", "African"
+legend = _("The Comoros is an island country in the Mozambique channel,\
  consisting of Grande Comore, Moheli and Anjouan, although the Comoran\
  government also claims Mayotte, which is currently a French overseas\
  departement. Having been under Arab influence since the 8th century,\
@@ -26,13 +26,13 @@ ruler_titles = {
  "Monarchy",       _("Sultan %s"),      _("Sultana %s")
 }
 
-flag="comoros"
+flag = "comoros"
 flag_alt = "-"
 style = "Tropical"
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
 civilwar_nations = "swahili", "arab" ; anjouan
 
@@ -82,4 +82,3 @@ cities =
  "Ivémbeni-Bandasamoulini",
  "Mbambao Mtsanga",
  "Hamavouna"
- 
diff --git a/data/nation/confederate.ruleset b/data/nation/confederate.ruleset
index be6d5cdd14..5a5f0fe6f5 100644
--- a/data/nation/confederate.ruleset
+++ b/data/nation/confederate.ruleset
@@ -1,9 +1,9 @@
 [nation_confederate]
 
-name=_("Confederate")
-plural=_("?plural:Confederates")
-groups="American"
-legend=_("The Confederate States of America was a splinter nation of the\
+name   = _("Confederate")
+plural = _("?plural:Confederates")
+groups = "American"
+legend = _("The Confederate States of America was a splinter nation of the\
  United States, formed by eleven Southern states, existing from 1861 to\
  1865. The states seceded from the United States because of political and\
  cultural differences with the North, most prominently the issue of slavery,\
@@ -36,16 +36,16 @@ ruler_titles = {
  "Fundamentalism",  _("Reverend %s"),  _("?female:Reverend %s")
 }
 
-flag="southern_cross"
-flag_alt="-"
+flag = "southern_cross"
+flag_alt = "-"
 style = "European"
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
-conflicts_with="texan"
-civilwar_nations="american", "texan"
+conflicts_with = "texan"
+civilwar_nations = "american", "texan"
 
 cities =
 ; Capitals and was-to-be capitals
diff --git a/data/nation/congolese.ruleset b/data/nation/congolese.ruleset
index 4e2704e507..30b28db9ba 100644
--- a/data/nation/congolese.ruleset
+++ b/data/nation/congolese.ruleset
@@ -1,10 +1,10 @@
 [nation_congolese]
 
-name=_("Congolese")
-plural=_("?plural:Congolese")
-groups="Modern", "African"
+name   = _("Congolese")
+plural = _("?plural:Congolese")
+groups = "Modern", "African"
 
-legend=_("The Democratic Republic of the Congo is a big country in\
+legend = _("The Democratic Republic of the Congo is a big country in\
  Central Africa. Despite (or because of) its wealth of natural\
  resources it has been in ruins for most of its modern history. In 1885\
  Congo was awarded to Léopold II of Belgium as his personal possession,\
@@ -26,13 +26,14 @@ leaders = {
  "Joseph Kabila",               "Male"
 }
 
-flag="dr_congo"
+flag = "dr_congo"
 flag_alt = "-"
 style = "Tropical"
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
+
 conflicts_with = "kongo"
 civilwar_nations = "katangan", "rwandan", "burundian"
 
diff --git a/data/nation/congolesebrazzaville.ruleset b/data/nation/congolesebrazzaville.ruleset
index 266f00e82f..caa56bc19c 100644
--- a/data/nation/congolesebrazzaville.ruleset
+++ b/data/nation/congolesebrazzaville.ruleset
@@ -1,9 +1,9 @@
 [nation_congolesebrazzaville]
 
-name=_("Brazzaville-Congolese")
-plural=_("?plural:Brazzaville-Congolese")
-groups="African", "Modern"
-legend=_("The Republic of the Congo is a country in Central Africa, not\
+name   = _("Brazzaville-Congolese")
+plural = _("?plural:Brazzaville-Congolese")
+groups = "African", "Modern"
+legend = _("The Republic of the Congo is a country in Central Africa, not\
  to be confused with the Democratic Republic of the Congo. Congo has been\
  independent from France since 1960. From 1970 to 1991 it was governed as\
  a Marxist-Leninist one party state; in this period the country was known\
@@ -28,13 +28,13 @@ ruler_titles = {
  "Fundamentalism", _("Bishop %s"),   _("Mother Superior %s")
 }
 
-flag="r_congo"
+flag = "r_congo"
 flag_alt = "-"
 style = "Tropical"
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
 conflicts_with = "kongo"
 civilwar_nations = "congolese", "central african"
@@ -75,5 +75,3 @@ cities =
  "Gamboma",
  "Dia",
  "Gamakala"
-
-
diff --git a/data/nation/cornish.ruleset b/data/nation/cornish.ruleset
index 4f5a639eff..3c2b5589d9 100644
--- a/data/nation/cornish.ruleset
+++ b/data/nation/cornish.ruleset
@@ -1,9 +1,9 @@
 [nation_cornish]
 
-name = _("Cornish")
+name   = _("Cornish")
 plural = _("?plural:Cornish")
-groups= "Medieval", "European"
-legend=_("Cornwall is a region in the extreme southwest of England,\
+groups = "Medieval", "European"
+legend = _("Cornwall is a region in the extreme southwest of England,\
  traditionally the home of the legendary King Arthur.")
 
 leaders = {
@@ -25,57 +25,57 @@ flag = "cornwall"
 flag_alt = "england"
 style = "Celtic"
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
-civilwar_nations="Welsh", "Breton"
+civilwar_nations = "Welsh", "Breton"
 
 cities =
- "Truru",		; Truro
- "Austol",		; St Austell
- "Aberfal",		; Falmouth
- "Pensans",		; Penzance
- "Lulynn",		; Newlyn
- "Cambron",		; Camborne
- "Tewyn Plustry",	; Newquay
- "Essa",		; Saltash
- "Bosvenegh",		; Bodmin
- "Resrudh",		; Redruth
- "Porth Ia",		; St Ives
- "Hellys",		; Helston
- "Bud",			; Bude
- "Liskeard",		; Lys Kerwyd
- "Penntorr",		; Torpoint
- "Heyl",		; Hayle
- "Lannstefan",		; Launceston
- "Lanndreth",		; St Blazey
- "Ponsrys",		; Wadebridge
- "Penrynn",		; Penryn
- "Logh",		; Looe
- "Kelliwik",		; Callington
- "Lannyust",		; St Just in Penwith
- "Plew Golom",		; St Columb Major
- "Lannwedhenek",	; Padstow
- "Sen Mewen",		; St Mewan
- "Tredhinas",		; St Dennis
- "Lostwydhyel",		; Lostwithiel
- "Ryskammel",		; Camelford
- "Fowydh",		; Fowey
- "Lannvorek",		; Mevagissey
- "Lannaghevran",	; St Keverne
- "Marghasyow",		; Marazion
- "Porth",		; Par
- "Morvedh",		; Morvah
- "Karnrosveur",		; Bugle
- "Trewoen",		; Trewoon
- "Egloslasek",		; Ladock
- "Komm",		; Coombe
- "Lannvowsedh",		; St Mawes
- "Porthynys",		; Mousehole
- "Pennwydh",		; Reawla
- "Porthmeur",		; Charlestown
- "Sen Kubi"		; Cuby
+ "Truru",               ; Truro
+ "Austol",              ; St Austell
+ "Aberfal",             ; Falmouth
+ "Pensans",             ; Penzance
+ "Lulynn",              ; Newlyn
+ "Cambron",             ; Camborne
+ "Tewyn Plustry",       ; Newquay
+ "Essa",                ; Saltash
+ "Bosvenegh",           ; Bodmin
+ "Resrudh",             ; Redruth
+ "Porth Ia",            ; St Ives
+ "Hellys",              ; Helston
+ "Bud",                 ; Bude
+ "Liskeard",            ; Lys Kerwyd
+ "Penntorr",            ; Torpoint
+ "Heyl",                ; Hayle
+ "Lannstefan",          ; Launceston
+ "Lanndreth",           ; St Blazey
+ "Ponsrys",             ; Wadebridge
+ "Penrynn",             ; Penryn
+ "Logh",                ; Looe
+ "Kelliwik",            ; Callington
+ "Lannyust",            ; St Just in Penwith
+ "Plew Golom",          ; St Columb Major
+ "Lannwedhenek",        ; Padstow
+ "Sen Mewen",           ; St Mewan
+ "Tredhinas",           ; St Dennis
+ "Lostwydhyel",         ; Lostwithiel
+ "Ryskammel",           ; Camelford
+ "Fowydh",              ; Fowey
+ "Lannvorek",           ; Mevagissey
+ "Lannaghevran",        ; St Keverne
+ "Marghasyow",          ; Marazion
+ "Porth",               ; Par
+ "Morvedh",             ; Morvah
+ "Karnrosveur",         ; Bugle
+ "Trewoen",             ; Trewoon
+ "Egloslasek",          ; Ladock
+ "Komm",                ; Coombe
+ "Lannvowsedh",         ; St Mawes
+ "Porthynys",           ; Mousehole
+ "Pennwydh",            ; Reawla
+ "Porthmeur",           ; Charlestown
+ "Sen Kubi"             ; Cuby
 
 ; City names for which no Cornish equivalent could be found
 
diff --git a/data/nation/corsican.ruleset b/data/nation/corsican.ruleset
index e0be8c2327..ba13f784e8 100644
--- a/data/nation/corsican.ruleset
+++ b/data/nation/corsican.ruleset
@@ -1,9 +1,9 @@
 [nation_corsican]
 
-name=_("Corsican")
-plural=_("?plural:Corsicans")
-groups="European", "Early Modern"
-legend=_("For most of its history, Corsica has been ruled by foreign\
+name   = _("Corsican")
+plural = _("?plural:Corsicans")
+groups = "European", "Early Modern"
+legend = _("For most of its history, Corsica has been ruled by foreign\
  powers. Greeks, Etruscans, Romans, Vandals, Visigoths, Byzantines,\
  Saracens, Lombards, the Papal States and Genoese all held sway over\
  Corsica at one time or another. The 18th century saw a war of\
@@ -32,23 +32,23 @@ ruler_titles = {
  "Republic",      _("General-in-Chief %s"), _("?female:General-in-Chief %s")
 }
 
-flag="corsica"
+flag = "corsica"
 flag_alt = "-"
 style = "Celtic"
 
-init_techs=""
-init_buildings=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
-init_units=""
 civilwar_nations = "italian", "french"
 
 cities =
- "Corti",		;Capital of Corsican Republic
- "Aiacciu",		;Modern capital of region of Corsica
- "Bastia",		;Capital of departement of Haute-Corse
- "Aleria",		;Oldest city of Corsica
- "Ponte Novu",		;Site of 1769 defeat
- "Porti Vechju",	;Rest of cities by population size
+ "Corti",               ; Capital of Corsican Republic
+ "Aiacciu",             ; Modern capital of region of Corsica
+ "Bastia",              ; Capital of departement of Haute-Corse
+ "Aleria",              ; Oldest city of Corsica
+ "Ponte Novu",          ; Site of 1769 defeat
+ "Porti Vechju",        ; Rest of cities by population size
  "Biguglia",
  "U Borgu",
  "Calvi",
diff --git a/data/nation/cossack.ruleset b/data/nation/cossack.ruleset
index ffe85db2e3..51fb445991 100644
--- a/data/nation/cossack.ruleset
+++ b/data/nation/cossack.ruleset
@@ -1,9 +1,9 @@
 [nation_cossack] 
 
-name=_("Cossack") 
-plural=_("?plural:Cossacks") 
-groups="European", "Early Modern"
-legend=_("The Zaporozhian Cossacks lived in Zaporozhia, in Central\
+name   = _("Cossack")
+plural = _("?plural:Cossacks")
+groups = "European", "Early Modern"
+legend = _("The Zaporozhian Cossacks lived in Zaporozhia, in Central\
  Ukraine. They were a multi-ethnic community with Ruthenians being the\
  dominant element, organized in a military manner.")
 
@@ -32,13 +32,13 @@ ruler_titles = {
  "Fundamentalism",  _("Patriarch %s"),    _("Matriarch %s")
 }
 
-flag= "cossack" 
-flag_alt = "-" 
-style = "Celtic" 
+flag = "cossack"
+flag_alt = "-"
+style = "Celtic"
 
-init_techs="" 
-init_buildings="" 
-init_units="" 
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
 conflicts_with = "ukrainian"
 civilwar_nations = "ukrainian", "russian", "crimean tatar", "volga german"
diff --git a/data/nation/costarican.ruleset b/data/nation/costarican.ruleset
index af917b1f1b..2b55c1ac71 100644
--- a/data/nation/costarican.ruleset
+++ b/data/nation/costarican.ruleset
@@ -1,9 +1,9 @@
 [nation_costarican]
 
-name = _("Costa Rican")
+name   = _("Costa Rican")
 plural = _("?plural:Costa Ricans")
-groups= "Modern", "American"
-legend=_("Costa Rica became an independent republic in 1840. It has been\
+groups = "Modern", "American"
+legend = _("Costa Rica became an independent republic in 1840. It has been\
  without an army since 1949 and is one of the most democratic and wealthy\
  countries of Latin America.")
 
@@ -30,9 +30,10 @@ flag = "costa_rica"
 flag_alt = ""
 style = "European"
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
+
 civilwar_nations = "cuban", "nicaraguan"
 
 cities =
diff --git a/data/nation/cree.ruleset b/data/nation/cree.ruleset
index b9cb5df7dc..6eeac81633 100644
--- a/data/nation/cree.ruleset
+++ b/data/nation/cree.ruleset
@@ -1,10 +1,10 @@
 [nation_cree]
 
-name=_("Cree")
-plural=_("?plural:Cree")
-groups="American"
+name   = _("Cree")
+plural = _("?plural:Cree")
+groups = "American"
 
-legend=_("The Cree are the largest native group in Canada with over 200,000\
+legend = _("The Cree are the largest native group in Canada with over 200,000\
  members who speak an Algonquian language and often call themselves\
  \"Iiyiyuu\" or \"Iinuu,\" meaning \"people.\" They originally inhabited\
  much of Quebec, Labrador, Alberta, Saskatchewan, Ontario and Manitoba.")
@@ -16,15 +16,15 @@ leaders = {
  "Ominayak",    "Male"
 }
 
-flag="innu"
+flag = "innu"
 flag_alt = "-"
 style = "Celtic"
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
-civilwar_nations="metis", "inuit", "anishinaabe"
+civilwar_nations = "metis", "inuit", "anishinaabe"
 
 cities =
  "Chisasibi",
diff --git a/data/nation/cretan.ruleset b/data/nation/cretan.ruleset
index 751a6bdd7c..cbd9ee6afb 100644
--- a/data/nation/cretan.ruleset
+++ b/data/nation/cretan.ruleset
@@ -1,9 +1,9 @@
 [nation_cretan]
 
-name=_("Cretan")
-plural=_("?plural:Cretans")
-groups="European"
-legend=_("Crete is an island in the Mediterranean Sea, the largest of the\
+name   = _("Cretan")
+plural = _("?plural:Cretans")
+groups = "European"
+legend = _("Crete is an island in the Mediterranean Sea, the largest of the\
  Greek Archipelago. In the 3rd and 2nd millennia BCE Crete was the site of\
  Europe's first advanced civilization, the Minoan culture. An eruption of\
  nearby Thera destroyed the Minoan civilization. Crete then became part of\
@@ -28,15 +28,15 @@ ruler_titles = {
  "Fundamentalism",  _("Patriarch %s"),      _("Matriarch %s")
 }
 
-flag="crete"
+flag = "crete"
 flag_alt = "-"
 style = "Classical"
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
-civilwar_nations="Hellenic", "Cypriot"
+civilwar_nations = "Hellenic", "Cypriot"
 
 cities =
  "Chania",
diff --git a/data/nation/crimeantatar.ruleset b/data/nation/crimeantatar.ruleset
index 5b94234a71..40b134c7b6 100644
--- a/data/nation/crimeantatar.ruleset
+++ b/data/nation/crimeantatar.ruleset
@@ -1,9 +1,9 @@
 [nation_crimeantatar] 
 
-name=_("Crimean Tatar") 
-plural=_("?plural:Crimean Tatars") 
-groups="Medieval", "European", "Early Modern"
-legend=_("Historical feudal state on the Crimean Peninsula, existing from\
+name   = _("Crimean Tatar")
+plural = _("?plural:Crimean Tatars")
+groups = "Medieval", "European", "Early Modern"
+legend = _("Historical feudal state on the Crimean Peninsula, existing from\
  the 15th to the 18th century. Crimean Tatars invaded Poland and Russia,\
  which caused wars with Turkey.")
 
@@ -41,215 +41,215 @@ ruler_titles = {
  "Fundamentalism",  _("Grand Mufti %s"),  _("?female:Grand Mufti %s")
 }
 
-flag= "crimean_tatar" 
-flag_alt = "turkey" 
-style = "Classical" 
+flag = "crimean_tatar"
+flag_alt = "turkey"
+style = "Classical"
 
-init_techs="" 
-init_buildings="" 
-init_units="" 
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
-civilwar_nations="Tatar", "Ukrainian", "Ottoman", "Bashkir"
+civilwar_nations = "Tatar", "Ukrainian", "Ottoman", "Bashkir"
 
 ;Names of cities comes from this webpages: http://crh.wikipedia.org/wiki/Kategoriya:Q?r?mdaki_regionlar
 cities =
-  "Bağçasaray",
-"Yalta",
-"Curçı",
-"Kefe",
-"Kaygador",
-"Paşa Töpe",
-"Kürey Başı",
-"Otuz",
-"Sultan Sala",
-"Köktöbel",
-"Baraq Göl",
-"Qızıltaş",
-"Aşağı Otuz",
-"Büyük Lambat",
-"Aşağı Degirmenköy",
-"Degirmenköy",
-"Küçük Lambat",
-"Küçükköy",
-"Kürkület",
-"Qarasan",
-"Qastel",
-"Demirci",
-"Lavanda",
-"Yedi Ev",
-"Körbekül",
-"Aşağı Şuma",
-"Haçı Özenbaş",
-"Yuqarı Şuma",
-"Küçük Özen",
-"Quru Özen",
-"Tuvaq",
-"Ulu Özen",
-"Partenit",
-"Çayka",
-"Qarabağ",
-"Üsküt",
-"Arpat",
-"Saraylı Qıyat",
-"Aqtaçı Qıyat",
-"Ana Yurt",
-"Aykavan",
-"Bura",
-"Cafer Berdi",
-"Cağatay",
-"Mamaq",
-"Suin Acı",
-"Yağı Sarabuz",
-"Temir Ağa",
-"Molla Eli",
-"Qaraç",
-"Seymanlarköy",
-"Terek Eli ",
-"Yağmurça",
-"Badana",
-"Aratuq",
-"Atman",
-"Bötke",
-"Çeşmeci",
-"Çumaq Qan",
-"Qarağaç",
-"Qurça",
-"Sabla",
-"Beş Terek",
-"Aşağı Asma",
-"Dermenci",
-"Qalmuq Qan",
-"Şeyhköy",
-"Tuvatay",
-"Yuqan Asma",
-"Biy Tanış",
-"Çalğan",
-"Çüyke",
-"Borançı Qıtay",
-"Qazançi",
-"Uzqastı",
-"Bulğanaq",
-"Cav Cürek",
-"Bulğanaq Badraq",
-"Ağaç Eli",
-"Qoyaş",
-"Çoyunçi",
-"Beki Eli",
-"Eski Lez",
-"Üç Quyu Tarhan",
-"Yağı Lez",
-"Mamut Sultan",
-"Anğara",
-"Büyük Yanköy",
-"Colman",
-"Eski Orda",
-"Şumhay",
-"Tahta Cami",
-"Tavel",
-"Tavşan Bazar",
-"Tirke",
-"Totayköy",
-"Mazanka",
-"Atalıq Eli",
-"Tav Dayır",
-"Tolban",
-"Miğlerçik",
-"Azat",
-"Cabaç",
-"Dörtkül",
-"Kün Tuvğan",
-"Qara Çora",
-"Qasıq Degirmen",
-"Acı Keç",
-"Cağa Mamış",
-"Qulcuq",
-"Cabanaq",
-"Qart Mışıq",
-"Taqıl",
-"Ulu Çoqraq",
-"Sarabuz",
-"Kiçkene",
-"Aqmeçit",
-"Doğuzlav",
-"Dört Saqal",
-"Aqqoca",
-"Camal",
-"Sadir Bağay",
-"Toqa",
-"Qara Acı",
-"Ablaq Acı",
-"Mayak",
-"Qızıl Çoğrav",
-"Çegelek",
-"Yaşpek",
-"Tabuldi Ass",
-"Terekli Ass",
-"Tarpançı",
-"Can Baba",
-"Çeger Acı",
-"Qıpçaq",
-"Qunan",
-"Tatar Çağaltay",
-"Bay Qıyat",
-"Nemse Çağaltay",
-"Yarılğaç",
-"Kerleut",
-"Musa Ali",
-"Qarlav",
-"Balıqlava",
-"Baydar",
-"Bağa",
-"Büyük Muskomiya",
-"Hayto",
-"Kalendo",
-"Küçük Muskomiya",
-"Özömoye",
-"Sahtik",
-"Savatka",
-"Skele",
-"Urkusta",
-"Uzunca",
-"Varnautka",
-"Inkerman",
-"Şülü",
-"Uppa",
-"Aqleyız",
-"Acıköy",
-"Belbek",
-"Otarköy",
-"Qamışlı",
-"Qacı",
-"Eski Eli",
-"Mamaşay",
-"Polüşko",
-"Aqşeyh",
-"Ayıp",
-"Qızılbay",
-"Tatar Aqşeyh",
-"Baqqal",
-"Büyten",
-"Qarçığa",
-"Yuqan Baqqal",
-"Niva",
-"Tavkel Nayman",
-"Celal",
-"Manay",
-"Çerkez",
-"Samay",
-"Smail Bay",
-"Yağı Manay",
-"Munus",
-"Ağay",
-"Aqsaqal Merkit",
-"Biy Örlük",
-"Onfrang",
-"Qara Merkit",
-"Nemse Köp Qan",
-"Atay Temir",
-"Kereyit",
-"Rus Köp Qan",
-"Taş Quyu",
-"Oğuz Oğlu",
-"San Bolat",
-"Toq Şeyh",
-"Qaraba Köküş"
+ "Bağçasaray",
+ "Yalta",
+ "Curçı",
+ "Kefe",
+ "Kaygador",
+ "Paşa Töpe",
+ "Kürey Başı",
+ "Otuz",
+ "Sultan Sala",
+ "Köktöbel",
+ "Baraq Göl",
+ "Qızıltaş",
+ "Aşağı Otuz",
+ "Büyük Lambat",
+ "Aşağı Degirmenköy",
+ "Degirmenköy",
+ "Küçük Lambat",
+ "Küçükköy",
+ "Kürkület",
+ "Qarasan",
+ "Qastel",
+ "Demirci",
+ "Lavanda",
+ "Yedi Ev",
+ "Körbekül",
+ "Aşağı Şuma",
+ "Haçı Özenbaş",
+ "Yuqarı Şuma",
+ "Küçük Özen",
+ "Quru Özen",
+ "Tuvaq",
+ "Ulu Özen",
+ "Partenit",
+ "Çayka",
+ "Qarabağ",
+ "Üsküt",
+ "Arpat",
+ "Saraylı Qıyat",
+ "Aqtaçı Qıyat",
+ "Ana Yurt",
+ "Aykavan",
+ "Bura",
+ "Cafer Berdi",
+ "Cağatay",
+ "Mamaq",
+ "Suin Acı",
+ "Yağı Sarabuz",
+ "Temir Ağa",
+ "Molla Eli",
+ "Qaraç",
+ "Seymanlarköy",
+ "Terek Eli ",
+ "Yağmurça",
+ "Badana",
+ "Aratuq",
+ "Atman",
+ "Bötke",
+ "Çeşmeci",
+ "Çumaq Qan",
+ "Qarağaç",
+ "Qurça",
+ "Sabla",
+ "Beş Terek",
+ "Aşağı Asma",
+ "Dermenci",
+ "Qalmuq Qan",
+ "Şeyhköy",
+ "Tuvatay",
+ "Yuqan Asma",
+ "Biy Tanış",
+ "Çalğan",
+ "Çüyke",
+ "Borançı Qıtay",
+ "Qazançi",
+ "Uzqastı",
+ "Bulğanaq",
+ "Cav Cürek",
+ "Bulğanaq Badraq",
+ "Ağaç Eli",
+ "Qoyaş",
+ "Çoyunçi",
+ "Beki Eli",
+ "Eski Lez",
+ "Üç Quyu Tarhan",
+ "Yağı Lez",
+ "Mamut Sultan",
+ "Anğara",
+ "Büyük Yanköy",
+ "Colman",
+ "Eski Orda",
+ "Şumhay",
+ "Tahta Cami",
+ "Tavel",
+ "Tavşan Bazar",
+ "Tirke",
+ "Totayköy",
+ "Mazanka",
+ "Atalıq Eli",
+ "Tav Dayır",
+ "Tolban",
+ "Miğlerçik",
+ "Azat",
+ "Cabaç",
+ "Dörtkül",
+ "Kün Tuvğan",
+ "Qara Çora",
+ "Qasıq Degirmen",
+ "Acı Keç",
+ "Cağa Mamış",
+ "Qulcuq",
+ "Cabanaq",
+ "Qart Mışıq",
+ "Taqıl",
+ "Ulu Çoqraq",
+ "Sarabuz",
+ "Kiçkene",
+ "Aqmeçit",
+ "Doğuzlav",
+ "Dört Saqal",
+ "Aqqoca",
+ "Camal",
+ "Sadir Bağay",
+ "Toqa",
+ "Qara Acı",
+ "Ablaq Acı",
+ "Mayak",
+ "Qızıl Çoğrav",
+ "Çegelek",
+ "Yaşpek",
+ "Tabuldi Ass",
+ "Terekli Ass",
+ "Tarpançı",
+ "Can Baba",
+ "Çeger Acı",
+ "Qıpçaq",
+ "Qunan",
+ "Tatar Çağaltay",
+ "Bay Qıyat",
+ "Nemse Çağaltay",
+ "Yarılğaç",
+ "Kerleut",
+ "Musa Ali",
+ "Qarlav",
+ "Balıqlava",
+ "Baydar",
+ "Bağa",
+ "Büyük Muskomiya",
+ "Hayto",
+ "Kalendo",
+ "Küçük Muskomiya",
+ "Özömoye",
+ "Sahtik",
+ "Savatka",
+ "Skele",
+ "Urkusta",
+ "Uzunca",
+ "Varnautka",
+ "Inkerman",
+ "Şülü",
+ "Uppa",
+ "Aqleyız",
+ "Acıköy",
+ "Belbek",
+ "Otarköy",
+ "Qamışlı",
+ "Qacı",
+ "Eski Eli",
+ "Mamaşay",
+ "Polüşko",
+ "Aqşeyh",
+ "Ayıp",
+ "Qızılbay",
+ "Tatar Aqşeyh",
+ "Baqqal",
+ "Büyten",
+ "Qarçığa",
+ "Yuqan Baqqal",
+ "Niva",
+ "Tavkel Nayman",
+ "Celal",
+ "Manay",
+ "Çerkez",
+ "Samay",
+ "Smail Bay",
+ "Yağı Manay",
+ "Munus",
+ "Ağay",
+ "Aqsaqal Merkit",
+ "Biy Örlük",
+ "Onfrang",
+ "Qara Merkit",
+ "Nemse Köp Qan",
+ "Atay Temir",
+ "Kereyit",
+ "Rus Köp Qan",
+ "Taş Quyu",
+ "Oğuz Oğlu",
+ "San Bolat",
+ "Toq Şeyh",
+ "Qaraba Köküş"
diff --git a/data/nation/croatian.ruleset b/data/nation/croatian.ruleset
index 059a69bb87..0efb17b9eb 100644
--- a/data/nation/croatian.ruleset
+++ b/data/nation/croatian.ruleset
@@ -1,9 +1,9 @@
 [nation_croatian]
 
-name=_("Croatian")
-plural=_("?plural:Croatians")
-groups="Modern", "European"
-legend=_("Croatia is the region of the Southern Slavs that was held by the\
+name   = _("Croatian")
+plural = _("?plural:Croatians")
+groups = "Modern", "European"
+legend = _("Croatia is the region of the Southern Slavs that was held by the\
  Austro-Hungarian Empire, rather than coming under Ottoman rule after the\
  collapse of Byzantium. During most of the 20th century it was part of the\
  Yugoslav Federation.")
@@ -26,6 +26,7 @@ leaders = {
  "Franjo Tuđman",               "Male"
  "Josip Jelačić",               "Male"
 }
+
 ruler_titles = {
  "government",      "male_title",      "female_title"
  ; /* TRANS: Ban = Duke */
@@ -33,14 +34,14 @@ ruler_titles = {
  "Fundamentalism",  _("Bishop %s"),    _("Mother Superior %s")
 }
 
-flag="croatia"
+flag = "croatia"
 flag_alt = "-"
 style = "European"
 
-init_techs=""
-init_buildings=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
-init_units=""
 civilwar_nations = "slovenian"
 
 cities =
diff --git a/data/nation/crusader.ruleset b/data/nation/crusader.ruleset
index fd0ca78a6c..ea3c16cc51 100644
--- a/data/nation/crusader.ruleset
+++ b/data/nation/crusader.ruleset
@@ -1,9 +1,9 @@
 [nation_crusader]
 
-name=_("Crusader")
-plural=_("?plural:Crusaders")
-groups="Asian", "Medieval"
-legend=_("The Crusades were a series of wars in which European armies\
+name   = _("Crusader")
+plural = _("?plural:Crusaders")
+groups = "Asian", "Medieval"
+legend = _("The Crusades were a series of wars in which European armies\
  tried to re-establish Christian control over the Holy Land. The First\
  Crusade was called by Pope Urban II in 1095. The crusaders managed to\
  wrestle control of much of the Levant from Muslim hands and established\
@@ -36,17 +36,17 @@ ruler_titles = {
  "Fundamentalism", _("Patriarch %s"),           _("Matriarch %s")
 }
 
-flag="jerusalem"
+flag = "jerusalem"
 flag_alt = "-"
 style = "Babylonian"
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
-civilwar_nations="Knights Templar", "Arab", "Mamluk", "Armenian", "Seljuk", "Latin", "Cypriot"
+civilwar_nations = "Knights Templar", "Arab", "Mamluk", "Armenian", "Seljuk", "Latin", "Cypriot"
 
-conflicts_with="Israeli", "Israelite", "Lebanese", "Syrian"
+conflicts_with = "Israeli", "Israelite", "Lebanese", "Syrian"
 
 cities =
 ; names in Old French
@@ -59,11 +59,11 @@ cities =
  "Tiberias",
  "Jaffa (ocean)",
  "Ascalon (ocean)",
- "Gibelet (ocean)",	; Byblos
+ "Gibelet (ocean)",     ; Byblos
  "Turbessel",
  "Sidon (ocean)",
  "Beyrout (ocean)",
- "Crac de l'Ospital",	; Krak des Chevaliers
+ "Crac de l'Ospital",   ; Krak des Chevaliers
  "Monréal",
  "Haifa (ocean)",
  "Nazareth",
@@ -78,7 +78,7 @@ cities =
  "Belvoir",
  "Crac des Moabites",
  "Ibelin",
- "Naples",		; Nablus
+ "Naples",              ; Nablus
  "Banias",
  "Maraclea",
  "Bethlehem",
diff --git a/data/nation/cuban.ruleset b/data/nation/cuban.ruleset
index 5c5d2e4c7f..0535ca30ec 100644
--- a/data/nation/cuban.ruleset
+++ b/data/nation/cuban.ruleset
@@ -1,9 +1,9 @@
 [nation_cuban]
 
-name=_("Cuban")
-plural=_("?plural:Cubans")
-groups="Modern", "American"
-legend=_("Cuba came under Spanish control in the 16th century. In the\
+name   = _("Cuban")
+plural = _("?plural:Cubans")
+groups = "Modern", "American"
+legend = _("Cuba came under Spanish control in the 16th century. In the\
  following centuries, the island became one of the leading producers of\
  tobacco, sugar and coffee in the world. Cuba was granted nominal\
  independence in 1902.")
@@ -24,13 +24,14 @@ ruler_titles = {
  "Fundamentalism", _("Cardinal %s"),   _("Mother Superior %s")
 }
 
-flag="cuba"
+flag = "cuba"
 flag_alt = "-"
 style = "Classical"
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
+
 civilwar_nations = "dominicano", "venezuelan", "taino"
 
 cities =
diff --git a/data/nation/curonian.ruleset b/data/nation/curonian.ruleset
index 825ad5312e..dc4c584273 100644
--- a/data/nation/curonian.ruleset
+++ b/data/nation/curonian.ruleset
@@ -1,9 +1,9 @@
 [nation_curonian] 
 
-name=_("Curonian") 
-plural=_("?plural:Curonians") 
-groups="Medieval", "Early Modern", "European" 
-legend=_("The Duchy of Courland and Semigallia was created as the result\
+name   = _("Curonian")
+plural = _("?plural:Curonians")
+groups = "Medieval", "Early Modern", "European"
+legend = _("The Duchy of Courland and Semigallia was created as the result\
  of the secularization of the Teutonic Order State. The dukes of Courland\
  were vassals of Poland until its collapse. Duke Jakob Kettler led the\
  failed attempts of colonization in South America and Africa.")
@@ -31,21 +31,21 @@ ruler_titles = {
  "Monarchy",       _("Grand Duke %s"),    _("Grand Duchess %s")
 }
 
-flag= "courland" 
-flag_alt = "-" 
-style = "European" 
+flag = "courland"
+flag_alt = "-"
+style = "European"
 
-init_techs="" 
-init_buildings="" 
-init_units="" 
+init_techs = ""
+init_buildings =""
+init_units = ""
 
-conflicts_with="latvian", "indonesian" ;latter because of similar flag
-civilwar_nations="teutonic", "latvian",
+conflicts_with = "latvian", "indonesian" ;latter because of similar flag
+civilwar_nations = "teutonic", "latvian",
 
 ;colonies
 "gambian", "trinidadian and tobagonian"
 
-cities=
+cities =
   "Mitau",
   "Goldingen",
   "Windau",
diff --git a/data/nation/cuyavian.ruleset b/data/nation/cuyavian.ruleset
index 63f12ad037..4d54ba8327 100644
--- a/data/nation/cuyavian.ruleset
+++ b/data/nation/cuyavian.ruleset
@@ -1,11 +1,12 @@
 [nation_cuyavian]
 
-name=_("Cuyavian")
-plural=_("?plural:Cuyavians")
-groups="European", "Medieval"
-legend=_("Cuyavia is a historical region in Northern-Central Poland,\
+name   = _("Cuyavian")
+plural = _("?plural:Cuyavians")
+groups = "European", "Medieval"
+legend = _("Cuyavia is a historical region in Northern-Central Poland,\
  bordered to the East by Masovia, on the West by Greater Poland and on the\
  North by Pomerania.")
+
 leaders = {
  "name",                      "sex"
  "Kazimierz I Kujawski",      "Male"
@@ -16,7 +17,8 @@ leaders = {
  "Leszek Inowrocławski",      "Male"
  "Władysław Biały",           "Male"	   
 }
-flag="cuyavia"
+
+flag = "cuyavia"
 flag_alt = "-"
 style = "Celtic"
 
@@ -27,11 +29,11 @@ ruler_titles = {
  "Fundamentalism", _("Bishop %s"),       _("Mother Superior %s")
 }
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
-conflicts_with="polish", "slavic" ; gothic polanian
+conflicts_with = "polish", "slavic" ; gothic polanian
 civilwar_nations = "greater polish", "mazovian", "polish"
 
 cities =
@@ -61,4 +63,3 @@ cities =
  "Kowal",
  "Aleksandrów Kujawski",
  "Nowa Wieś Wielka"
-
diff --git a/data/nation/cypriot.ruleset b/data/nation/cypriot.ruleset
index 65938d07a9..9b1d78c3ae 100644
--- a/data/nation/cypriot.ruleset
+++ b/data/nation/cypriot.ruleset
@@ -1,9 +1,9 @@
 [nation_cypriot]
 
-name=_("Cypriot")
-plural=_("?plural:Cypriots")
-groups="Modern", "European"
-legend=_("Cyprus became an independent republic on 16th August 1960.\
+name   = _("Cypriot")
+plural = _("?plural:Cypriots")
+groups = "Modern", "European"
+legend = _("Cyprus became an independent republic on 16th August 1960.\
  It is a Eurasian island country located in the eastern Mediterranean,\
  south of Turkey and west of Syria and Lebanon.")
 
@@ -24,13 +24,13 @@ ruler_titles = {
  "Fundamentalism",  _("Archbishop %s"),        _("Matriarch %s")
 }
 
-flag="cyprus"
+flag = "cyprus"
 flag_alt = "-"
 style = "Classical"
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
 civilwar_nations = "Turkish Cypriot", "Hellenic"
 
diff --git a/data/nation/cyrenaican.ruleset b/data/nation/cyrenaican.ruleset
index d2643b95b9..7a0ae90ab1 100644
--- a/data/nation/cyrenaican.ruleset
+++ b/data/nation/cyrenaican.ruleset
@@ -1,9 +1,9 @@
 [nation_cyrenaican]
 
-name=_("Cyrenaican")
-plural=_("?plural:Cyrenaicans")
-groups="African"
-legend=_("Cyrenaica is a historical region in Eastern Libya. In Classical\
+name   = _("Cyrenaican")
+plural = _("?plural:Cyrenaicans")
+groups = "African"
+legend = _("Cyrenaica is a historical region in Eastern Libya. In Classical\
  Antiquity the region was part of the Greek cultural realm. From the 7th\
  century onwards the region was controlled by various Arab dynasties.\
  Cyrenaica was occupied by Italy in 1911. After World War II a short-lived\
@@ -28,12 +28,13 @@ ruler_titles = {
  "Monarchy",        _("Emir %s"),      _("Emira %s")
 }
 
-flag ="cyrenaica"
+flag = "cyrenaica"
 style = "Classical"
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
+
 civilwar_nations = "amazigh", "libyan"
 
 cities =
diff --git a/data/nation/czech.ruleset b/data/nation/czech.ruleset
index 7c964e3213..699aafaca8 100644
--- a/data/nation/czech.ruleset
+++ b/data/nation/czech.ruleset
@@ -1,9 +1,9 @@
 [nation_czech]
 
-name = _("Czech")
+name   = _("Czech")
 plural = _("?plural:Czechs")
-groups="Modern", "Medieval", "European"
-legend=_("Today's Czech Republic was until 1993 part of Czechoslovakia,\
+groups = "Modern", "Medieval", "European"
+legend = _("Today's Czech Republic was until 1993 part of Czechoslovakia,\
  which had been until 1918 part of the Austro-Hungarian Empire.")
 
 leaders = {
@@ -38,11 +38,11 @@ flag = "czech"
 flag_alt = "-"
 style = "European"
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
-civilwar_nations="slovakian", "silesian", "moravian", "sorbian"
+civilwar_nations = "slovakian", "silesian", "moravian", "sorbian"
 
 cities =
         "Praha", "Brno", "Ostrava", "Plzeň", "Hradec Králové",
diff --git a/data/nation/czechoslovak.ruleset b/data/nation/czechoslovak.ruleset
index c4212a36ba..ce04765622 100644
--- a/data/nation/czechoslovak.ruleset
+++ b/data/nation/czechoslovak.ruleset
@@ -1,12 +1,13 @@
 [nation_czechoslovak]
 
-name = _("Czechoslovakian")
+name   = _("Czechoslovakian")
 plural = _("?plural:Czechoslovakians")
-groups="European"
-legend=_("Czechoslovakia was founded in 1918. It was long the only\
+groups = "European"
+legend = _("Czechoslovakia was founded in 1918. It was long the only\
  democracy in Eastern Europe until it was overrun by the Nazis in 1939\
  and the Soviet Union in 1948. Four years after the fall of communism it\
  was split into the Czech and Slovak republics.")
+
 leaders = {
  "name",                "sex"
  "Tomáš G. Masaryk",	"male"
@@ -20,7 +21,6 @@ leaders = {
  "Vaclav Havel",	"male"
 }
 
-
 flag = "czechoslovakia"
 flag_alt = "czech" ;flag was identical to Czech flag
 style = "European"
@@ -31,10 +31,11 @@ ruler_titles = {
  "Despotism",       _("Voivode %s"),     _("?female:Voivode %s")
 }
 
-init_techs=""
-init_buildings=""
-init_units=""
-conflicts_with="czech", "slovakian", "moravian"
-civilwar_nations="czech", "slovakian"
+init_techs = ""
+init_buildings = ""
+init_units = ""
+
+conflicts_with = "czech", "slovakian", "moravian"
+civilwar_nations = "czech", "slovakian"
 
 ;city names will be taken from Czech and Slovakian nations
-- 
2.30.2