From 274ca12f7c7d651de6f3558314a7fec18be37e96 Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Sat, 18 Sep 2021 00:37:11 +0300
Subject: [PATCH 26/26] Improve coding style of s*.ruleset nation rulesets

See osdn #42860

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 data/nation/sabine.ruleset                |  21 ++-
 data/nation/sahrawi.ruleset               |  23 ++-
 data/nation/saintlucian.ruleset           |  19 +-
 data/nation/saka.ruleset                  |  70 +++----
 data/nation/salishan.ruleset              | 158 ++++++++--------
 data/nation/salvadoran.ruleset            |  14 +-
 data/nation/sami.ruleset                  |  53 +++---
 data/nation/sammarinese.ruleset           |  14 +-
 data/nation/samnite.ruleset               | 110 +++++------
 data/nation/samoan.ruleset                |  22 +--
 data/nation/samogitian.ruleset            |  16 +-
 data/nation/santomean.ruleset             |  14 +-
 data/nation/sardinian.ruleset             |  18 +-
 data/nation/sarmatian.ruleset             |  87 ++++-----
 data/nation/saudi.ruleset                 |  25 +--
 data/nation/savoyard.ruleset              |  18 +-
 data/nation/saxon.ruleset                 |  17 +-
 data/nation/scanian.ruleset               |  22 +--
 data/nation/schleswig-holsteinian.ruleset | 146 +++++++--------
 data/nation/scottish.ruleset              |  75 ++++----
 data/nation/scottishgaelic.ruleset        | 177 +++++++++---------
 data/nation/scythian.ruleset              |  27 ++-
 data/nation/seleucid.ruleset              |  18 +-
 data/nation/seljuk.ruleset                | 108 +++++------
 data/nation/seminole.ruleset              |  21 ++-
 data/nation/senegalese.ruleset            |  22 ++-
 data/nation/serbian.ruleset               |  16 +-
 data/nation/seychellois.ruleset           |  17 +-
 data/nation/shan.ruleset                  |  20 +-
 data/nation/shawnee.ruleset               |  82 +++++----
 data/nation/sherpa.ruleset                |  22 +--
 data/nation/siberian.ruleset              |  30 ++-
 data/nation/sicilian.ruleset              |  16 +-
 data/nation/sierraleonean.ruleset         |  16 +-
 data/nation/sikh.ruleset                  | 211 +++++++++++-----------
 data/nation/sikkimese.ruleset             |  32 ++--
 data/nation/silesian.ruleset              |  17 +-
 data/nation/singaporean.ruleset           |  19 +-
 data/nation/singlebarbarian.ruleset       |  16 +-
 data/nation/sinhalese.ruleset             |  22 +--
 data/nation/sioux.ruleset                 |  19 +-
 data/nation/slavic.ruleset                |   2 +-
 data/nation/slovakian.ruleset             |  19 +-
 data/nation/slovenian.ruleset             |  20 +-
 data/nation/solomonislander.ruleset       |  14 +-
 data/nation/somali.ruleset                |  25 ++-
 data/nation/somaliland.ruleset            |  22 +--
 data/nation/songhai.ruleset               |  23 +--
 data/nation/sorbian.ruleset               |  26 +--
 data/nation/sotho.ruleset                 |  18 +-
 data/nation/southafrican.ruleset          |  22 ++-
 data/nation/southamerican.ruleset         |  25 +--
 data/nation/southkorean.ruleset           |  16 +-
 data/nation/southsudanese.ruleset         |  19 +-
 data/nation/southvietnamese.ruleset       |  17 +-
 data/nation/southyemeni.ruleset           |  17 +-
 data/nation/soviet.ruleset                |  16 +-
 data/nation/spanish.ruleset               |  24 +--
 data/nation/srivijaya.ruleset             |  14 +-
 data/nation/sudanese.ruleset              |  23 ++-
 data/nation/suebian.ruleset               |  70 +++----
 data/nation/sumerian.ruleset              |  19 +-
 data/nation/surinamese.ruleset            |  18 +-
 data/nation/swahili.ruleset               |  21 ++-
 data/nation/swazi.ruleset                 |  19 +-
 data/nation/swedish.ruleset               |  22 ++-
 data/nation/swiss.ruleset                 |  19 +-
 data/nation/syrian.ruleset                |  30 +--
 68 files changed, 1246 insertions(+), 1204 deletions(-)

diff --git a/data/nation/sabine.ruleset b/data/nation/sabine.ruleset
index 4d21ae16d0..26c3eec68c 100644
--- a/data/nation/sabine.ruleset
+++ b/data/nation/sabine.ruleset
@@ -1,13 +1,14 @@
 [nation_sabine]
 
-name=_("Sabine")
-plural=_("?plural:Sabines")
-groups="Ancient", "European"
-legend=_("The Sabines were an Italic tribe whose language was closest to\
+name   = _("Sabine")
+plural = _("?plural:Sabines")
+groups = "Ancient", "European"
+legend = _("The Sabines were an Italic tribe whose language was closest to\
  Umbrian. They had an impact on the history of Rome. The Sabines and\
  the early Roman Republic regularly warred against each other, but\
  eventually the Sabines were assimilated into the Roman culture. Several\
  Roman families prided themselves on their Sabine origins.")
+
 leaders = {
  "name",                         "sex"
  "Titus Tatius",                 "Male"
@@ -21,21 +22,23 @@ leaders = {
  "Claudia",                      "Female"
  "Valeria",                      "Female"
 }
+
 ruler_titles = {
  "government",      "male_title",      "female_title"
  "Anarchy",         _("Usurper %s"),   _("?female:Usurper %s")
  "Democracy",       _("Tribune %s"),   _("?female:Tribune %s")
  "Republic",        _("Consul %s"),    _("?female:Consul %s")
 }
-flag="sabinium"
+
+flag = "sabinium"
 flag_alt = "rome"
 style = "Celtic"
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
-conflicts_with="Western Roman", "Italian", "Papal", "Ostrogothic"
+conflicts_with = "Western Roman", "Italian", "Papal", "Ostrogothic"
                ; "Langobardic"
 civilwar_nations = "Roman", "Samnite"
 
diff --git a/data/nation/sahrawi.ruleset b/data/nation/sahrawi.ruleset
index 20237e3291..811581e1e8 100644
--- a/data/nation/sahrawi.ruleset
+++ b/data/nation/sahrawi.ruleset
@@ -1,9 +1,9 @@
 [nation_sahrawi]
 
-name=_("Sahrawi")
-plural=_("?plural:Sahrawis")
-groups="African", "Modern"
-legend=_("The Sahrawi are the inhabitants of the Western Sahara, a former\
+name   = _("Sahrawi")
+plural = _("?plural:Sahrawis")
+groups = "African", "Modern"
+legend = _("The Sahrawi are the inhabitants of the Western Sahara, a former\
  Spanish colony. Morocco currently controls most of the area, which is\
  considered an illegal occupation by most of the international community.\
  The Moroccan Army and Sahrawi Polisario rebels have been fighting each\
@@ -16,19 +16,22 @@ leaders = {
  "Mohamed Abdelaziz",           "Male"
  "Aminatou Haidar",             "Female"
 }
+
 ruler_titles = {
  "government",      "male_title",            "female_title"
  "Fundamentalism",  _("Caliph %s"),          _("Calipha %s")
 }
-flag="sadr"
+
+flag = "sadr"
 flag_alt = "-"
 style = "Babylonian"
 
-init_techs=""
-init_buildings=""
-init_units=""
-conflicts_with="palestinian" ;similar flag
-civilwar_nations="moroccan", "mauritanian"
+init_techs = ""
+init_buildings = ""
+init_units = ""
+
+conflicts_with = "palestinian" ;similar flag
+civilwar_nations = "moroccan", "mauritanian"
 
 cities =
  "Al-Ayun",
diff --git a/data/nation/saintlucian.ruleset b/data/nation/saintlucian.ruleset
index a464ac7766..26154ec692 100644
--- a/data/nation/saintlucian.ruleset
+++ b/data/nation/saintlucian.ruleset
@@ -1,9 +1,9 @@
 [nation_saintlucian]
 
-name=_("Saint Lucian")
-plural=_("?plural:Saint Lucian")
-groups="Modern", "American"
-legend=_("Saint Lucia is an island nation in the Eastern Caribbean. During\
+name   = _("Saint Lucian")
+plural = _("?plural:Saint Lucian")
+groups = "Modern", "American"
+legend = _("Saint Lucia is an island nation in the Eastern Caribbean. During\
  the colonial era, Saint Lucia changed hands between France and Britain no\
  less than fourteen times until the British finally secured it in 1814. The\
  island became independent in 1979. It a member both of the Commonwealth\
@@ -23,15 +23,16 @@ ruler_titles = {
  "government",      "male_title",    "female_title"
  "Fundamentalism",  _("Bishop %s"),  _("Mother Superior %s")
 }
-flag="saint_lucia"
+
+flag = "saint_lucia"
 flag_alt = "-"
 style = "Tropical"
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
-civilwar_nations="Barbadian", "Vincentian" ; martinican
+civilwar_nations = "Barbadian", "Vincentian" ; martinican
 
 cities =
  "Castries",
diff --git a/data/nation/saka.ruleset b/data/nation/saka.ruleset
index 23b379cc53..c077f42bfb 100644
--- a/data/nation/saka.ruleset
+++ b/data/nation/saka.ruleset
@@ -1,11 +1,12 @@
 [nation_saka]
 
-name=_("Saka")
-plural=_("?plural:Saka")
-groups="Ancient", "Asian"
-legend=_("The Saka were an ancient Iranian tribe from the Central Asian\
+name   = _("Saka")
+plural = _("?plural:Saka")
+groups = "Ancient", "Asian"
+legend = _("The Saka were an ancient Iranian tribe from the Central Asian\
  steppes. They were very closely related to the European Scythians,\
  and were probably descendants of the Andronovo culture.")
+
 leaders = {
  "name",    "sex"
  "Skunkha", "Male"
@@ -17,41 +18,42 @@ leaders = {
  "Vima",    "Male"
  "Arshak",  "Male"
 }
+
 flag = "saka"
 flag_alt = "-"
 style = "celtic"
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
+
 conflicts_with = "kazakh", "uzbek", "kyrgyz", "tajik", "afghani"
 civilwar_nations = "scythian", "sarmatian", "persian", "tocharian"
 
 cities =
-
-"Pazyryk",
-"Tagar",
-"Khotan",
-"Khiva",
-"Gorgan",
-"Bashadar",
-"Tuekta",
-"Ulandryk",
-"Polosmak",
-"Berel",
-"Charklik",
-"Niya",
-"Jumi",
-"Daha",
-"Parna",
-"Minusinsk",
-"Uygarak",
-"Issyk-Kul",
-"Tushara",
-"Badakhshan",
-"Chitral",
-"Wakhan",
-"Bhullar",
-"Sandhu",
-"Gulcha",
-"Qarategin"
+ "Pazyryk",
+ "Tagar",
+ "Khotan",
+ "Khiva",
+ "Gorgan",
+ "Bashadar",
+ "Tuekta",
+ "Ulandryk",
+ "Polosmak",
+ "Berel",
+ "Charklik",
+ "Niya",
+ "Jumi",
+ "Daha",
+ "Parna",
+ "Minusinsk",
+ "Uygarak",
+ "Issyk-Kul",
+ "Tushara",
+ "Badakhshan",
+ "Chitral",
+ "Wakhan",
+ "Bhullar",
+ "Sandhu",
+ "Gulcha",
+ "Qarategin"
diff --git a/data/nation/salishan.ruleset b/data/nation/salishan.ruleset
index c169a79864..b5afa7bf06 100644
--- a/data/nation/salishan.ruleset
+++ b/data/nation/salishan.ruleset
@@ -1,9 +1,9 @@
 [nation_salishan]
 
-name=_("Salishan")
-plural=_("?plural:Salishans")
-groups="American"
-legend=_("The Salishans are a cultural-linguistic group of peoples in\
+name   = _("Salishan")
+plural = _("?plural:Salishans")
+groups = "American"
+legend = _("The Salishans are a cultural-linguistic group of peoples in\
  the Pacific Northwest region of the United States and Canada. Among the\
  most famous Salishans is Chief Seattle, leader of the Duwamish tribe,\
  after whom the city of Seattle is named. Other well known Salishan tribes\
@@ -26,15 +26,15 @@ ruler_titles = {
  "Democracy",       _("Principal Chief %s"), _("?female:Principal Chief %s")
 }
 
-flag="salish"
-flag_alt="-"
+flag = "salish"
+flag_alt = "-"
 style = "Celtic"
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
-civilwar_nations="Nuu-chah-nulth", "Nimiipuu", "Chinook"
+civilwar_nations = "Nuu-chah-nulth", "Nimiipuu", "Chinook"
 
 cities =
 ; Names based on tribes, bands and assorted geographical names. Tried to be
@@ -42,74 +42,74 @@ cities =
 ; feel more than free to fix it.
 
 ; Coast Salish
- "Dxw'dew'abš", 	;Duwamish
- "S'dukwalbixw",	;Snoqualmie
- "Pwiya'lap",		;Puyallup
- "Xacuabš",		;Sammamish
- "Sqwali'abš",		;Nisqually
- "Noxws'á'aq",		;Nooksack
- "Šášíšálh",		;Shishalh
- "Skwxwú7meš",		;Squamish
- "Nexwsƛayem",		;Klallam
- "Xwlemi",		;Lummi
- "Nuxálk",		;Bella Coola
- "Wsáneć",		;Saanich
- "Samens",		;Samish
- "Semiahme",		;Semyome
- "T'sou-ke",		;Sooke
- "Lku'ngen",		;Songish
- "Sqwuqwó'beš",		;Skokomish
- "K'ómoks",		;Comox
- "ƛa A'min",		;Sliammon
- "ƛohos",		;Klahoose
- "Snunéymuxw",		;Snuneymux
- "Sts'ailes",		;Chehalis
- "Eslha7an",		;Uslawn
- "Xwemelch'stn",	;Homulchesan
- "St'a7mes",		;Stawamus
- "Boḱećen",		;Pauquachin
- "Málexeł",		;Malahat
- "Sixmełeł",		;Esquimalt
- "Ts'á'utw",		;Tsawout
- "Wćiánew",		;Becher Bay
- "Wjołełp",		;Tsartlip
- "Wsíkem",		;Tseycum
- "Stólo",		;Stolo
+ "Dxw'dew'abš",         ; Duwamish
+ "S'dukwalbixw",        ; Snoqualmie
+ "Pwiya'lap",           ; Puyallup
+ "Xacuabš",             ; Sammamish
+ "Sqwali'abš",          ; Nisqually
+ "Noxws'á'aq",          ; Nooksack
+ "Šášíšálh",            ; Shishalh
+ "Skwxwú7meš",          ; Squamish
+ "Nexwsƛayem",          ; Klallam
+ "Xwlemi",              ; Lummi
+ "Nuxálk",              ; Bella Coola
+ "Wsáneć",              ; Saanich
+ "Samens",              ; Samish
+ "Semiahme",            ; Semyome
+ "T'sou-ke",            ; Sooke
+ "Lku'ngen",            ; Songish
+ "Sqwuqwó'beš",         ; Skokomish
+ "K'ómoks",             ; Comox
+ "ƛa A'min",            ; Sliammon
+ "ƛohos",               ; Klahoose
+ "Snunéymuxw",          ; Snuneymux
+ "Sts'ailes",           ; Chehalis
+ "Eslha7an",            ; Uslawn
+ "Xwemelch'stn",        ; Homulchesan
+ "St'a7mes",            ; Stawamus
+ "Boḱećen",             ; Pauquachin
+ "Málexeł",             ; Malahat
+ "Sixmełeł",            ; Esquimalt
+ "Ts'á'utw",            ; Tsawout
+ "Wćiánew",             ; Becher Bay
+ "Wjołełp",             ; Tsartlip
+ "Wsíkem",              ; Tseycum
+ "Stólo",               ; Stolo
 
 ; Interior Salish
- "Spokane",		;Spokane
- "Salish",		;Flathead
- "Schitsu'umš",		;/* Coeur d'Alene */
- "Še'xwepmex",		;Shuswap
- "St'at'imc",		;/* St'at'imc */
- "Skowa'xtsenex",	;Sinkiuse
- "Syilx'tsn",		;Osoyoos
- "Nespelem",		;Nespelem
- "S-ookanhkchinx",	;Okanagan
- "N'selixtcl'n",	;Sanpoil
- "Kalispel",		;Kalispel
- "Stswecem'c",		;Canoe Lake
- "Xgat'tem",		;Dog Creek
- "T'exelc",		;Williams Lake
- "Sexqeltqin",		;Adams Lake
- "Tk'umlups",		;Kamloops
- "Quaaout",		;Little Shuswap
- "Sk'etsin",		;Neskonlith
- "Splats'in",		;Spalumcheen
- "St'uxwtews",		;Bonaparte
- "Pellt'iq't",		;Whispering Pines
- "Simpcw",		;North Thompson
- "Ts'kw'aylaxw",	;Pavilion
- "Esketemc",		;Akali Lake
- "Nxwísten",		;Bridge River
- "Tsal'álh",		;Selton Lake
- "Sekw'el'wás",		;Cayoose Creek
- "Xa'xlip",		;Fountain First
- "Lil'wa",		;Mount Curri
- "T'it'q'et",		;Lillooet
- "N'quatqua",		;Nequatque
- "Xa'xtsa",		;Port Douglas
- "Nle'ké'pmx",		;Thompson River
- "Spaxomin",		;Upper Nicola
- "Senijextee",		;Sinixt
- "P'squosa"		;Wenatchi
+ "Spokane",             ; Spokane
+ "Salish",              ; Flathead
+ "Schitsu'umš",         ; /* Coeur d'Alene */
+ "Še'xwepmex",          ; Shuswap
+ "St'at'imc",           ; /* St'at'imc */
+ "Skowa'xtsenex",       ; Sinkiuse
+ "Syilx'tsn",           ; Osoyoos
+ "Nespelem",            ; Nespelem
+ "S-ookanhkchinx",      ; Okanagan
+ "N'selixtcl'n",        ; Sanpoil
+ "Kalispel",            ; Kalispel
+ "Stswecem'c",          ; Canoe Lake
+ "Xgat'tem",            ; Dog Creek
+ "T'exelc",             ; Williams Lake
+ "Sexqeltqin",          ; Adams Lake
+ "Tk'umlups",           ; Kamloops
+ "Quaaout",             ; Little Shuswap
+ "Sk'etsin",            ; Neskonlith
+ "Splats'in",           ; Spalumcheen
+ "St'uxwtews",          ; Bonaparte
+ "Pellt'iq't",          ; Whispering Pines
+ "Simpcw",              ; North Thompson
+ "Ts'kw'aylaxw",        ; Pavilion
+ "Esketemc",            ; Akali Lake
+ "Nxwísten",            ; Bridge River
+ "Tsal'álh",            ; Selton Lake
+ "Sekw'el'wás",         ; Cayoose Creek
+ "Xa'xlip",             ; Fountain First
+ "Lil'wa",              ; Mount Curri
+ "T'it'q'et",           ; Lillooet
+ "N'quatqua",           ; Nequatque
+ "Xa'xtsa",             ; Port Douglas
+ "Nle'ké'pmx",          ; Thompson River
+ "Spaxomin",            ; Upper Nicola
+ "Senijextee",          ; Sinixt
+ "P'squosa"             ; Wenatchi
diff --git a/data/nation/salvadoran.ruleset b/data/nation/salvadoran.ruleset
index 8058edbb19..29616a27d5 100644
--- a/data/nation/salvadoran.ruleset
+++ b/data/nation/salvadoran.ruleset
@@ -1,9 +1,9 @@
 [nation_salvadoran]
 
-name=_("Salvadoran")
-plural=_("?plural:Salvadorans")
-groups="American", "Modern"
-legend=_("Originally inhabited by Pipil Indians, in the 16th century El\
+name   = _("Salvadoran")
+plural = _("?plural:Salvadorans")
+groups = "American", "Modern"
+legend = _("Originally inhabited by Pipil Indians, in the 16th century El\
  Salvador was conquered by the Spanish. It joined the Central American\
  federation upon independence and became a fully independent republic in\
  1840. Although formally El Salvador has been a democracy for most of its\
@@ -39,9 +39,9 @@ flag         = "el_salvador"
 flag_alt     = "-"
 style        = "Tropical"
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
 conflicts_with = "nicaraguan" ;similar flag
 civilwar_nations = "guatemalan", "honduran"
diff --git a/data/nation/sami.ruleset b/data/nation/sami.ruleset
index eb57d2ba9b..b0987913eb 100644
--- a/data/nation/sami.ruleset
+++ b/data/nation/sami.ruleset
@@ -1,9 +1,9 @@
 [nation_sami]
 
-name=_("Sami")
-plural=_("?plural:Sami")
-groups="European"
-legend=_("The Sami are a people of northern Scandinavia. Their nation spans\
+name   = _("Sami")
+plural = _("?plural:Sami")
+groups = "European"
+legend = _("The Sami are a people of northern Scandinavia. Their nation spans\
  over the northernmost regions of the Scandinavian countries and\
  northwestern Russia.")
 
@@ -23,14 +23,15 @@ ruler_titles = {
  "Republic",        _("Spokesman %s"),   _("Spokeswoman %s")
 }
 
-flag="sapmi"
+flag = "sapmi"
 flag_alt = "-"
 style = "European"
 
-init_techs=""
-init_buildings=""
-init_units=""
-civilwar_nations="finnish", "swedish", "norwegian", "russian"
+init_techs = ""
+init_buildings = ""
+init_units = ""
+
+civilwar_nations = "finnish", "swedish", "norwegian", "russian"
 
 ; Sami city names are taken from the northernmost regions of Norway 
 ; (Finnmark) Sweden and Finland (Lapland) and also a few from Russia.
@@ -42,23 +43,23 @@ civilwar_nations="finnish", "swedish", "norwegian", "russian"
 ; http://www.fjallen.nu/besoka/karta.htm
 
 cities =
- "Guovdageaidnu", 		; Kautokeino (Norway)
- "Kárášjohka (river)",		; Karasjok (Norway)
- "Giron",			; Kiruna (Sweden)
- "Anar",			; Inari (Finland)
- "Lujávri (river, swamp)",	; Lovozero (Russia)
- "Garesavvon",			; Karesuando (Sweden)
- "Dálvvadis",			; Jokkmokk (Sweden)
- "Álaheaju",			; Alta (Norway)
- "Váhtjer (mountains)",		; Gällivare (Sweden)
- "Guojkkajåhkkå (river)",	; Kvikkjokk (Sweden)
- "Muorjek (swamp, river)",	; Murjek (Sweden)
- "Avvil",			; Ivalo (Finland)
- "Ohcejohka (river)",		; Utsjoki (Finland)
- "Bårjås",			; Porjus (Sweden)
- "Ábeskovvu (ocean)",		; Abisko (Sweden)
- "Jäggeluokta (ocean)",		; Jäkkvik (Sweden)
- "Njoammelsasskam",		; Harsprånget (Sweden)
+ "Guovdageaidnu",               ; Kautokeino (Norway)
+ "Kárášjohka (river)",          ; Karasjok (Norway)
+ "Giron",                       ; Kiruna (Sweden)
+ "Anar",                        ; Inari (Finland)
+ "Lujávri (river, swamp)",      ; Lovozero (Russia)
+ "Garesavvon",                  ; Karesuando (Sweden)
+ "Dálvvadis",                   ; Jokkmokk (Sweden)
+ "Álaheaju",                    ; Alta (Norway)
+ "Váhtjer (mountains)",         ; Gällivare (Sweden)
+ "Guojkkajåhkkå (river)",       ; Kvikkjokk (Sweden)
+ "Muorjek (swamp, river)",      ; Murjek (Sweden)
+ "Avvil",                       ; Ivalo (Finland)
+ "Ohcejohka (river)",           ; Utsjoki (Finland)
+ "Bårjås",                      ; Porjus (Sweden)
+ "Ábeskovvu (ocean)",           ; Abisko (Sweden)
+ "Jäggeluokta (ocean)",         ; Jäkkvik (Sweden)
+ "Njoammelsasskam",             ; Harsprånget (Sweden)
  "Karagasnjarga",
  "Noarvas",
  "Aiddejavvre (river, swamp)",
diff --git a/data/nation/sammarinese.ruleset b/data/nation/sammarinese.ruleset
index 3d9cdbdb42..9fc3fe14c9 100644
--- a/data/nation/sammarinese.ruleset
+++ b/data/nation/sammarinese.ruleset
@@ -1,9 +1,9 @@
 [nation_sammarinese]
 
-name = _("Sammarinese")
+name   = _("Sammarinese")
 plural = _("?plural:Sammarinese")
-groups="European", "Modern", "Early Modern", "Medieval"
-legend=_("San Marino is a tiny landlocked country on the Italian Peninsula.\
+groups = "European", "Modern", "Early Modern", "Medieval"
+legend = _("San Marino is a tiny landlocked country on the Italian Peninsula.\
  It is the oldest independent republic in the world. According to legend,\
  it was founded by Saint Marinus in 301 CE.")
 
@@ -30,11 +30,11 @@ flag = "san_marino"
 flag_alt = "-"
 style = "European"
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
-civilwar_nations="Italian", "Papal"
+civilwar_nations = "Italian", "Papal"
 
 cities =
  "San Marino",
diff --git a/data/nation/samnite.ruleset b/data/nation/samnite.ruleset
index 03901ed332..1b1c5f9238 100644
--- a/data/nation/samnite.ruleset
+++ b/data/nation/samnite.ruleset
@@ -1,13 +1,14 @@
 [nation_samnite]
 
-name=_("Samnite")
-plural=_("?plural:Samnites")
-groups="Ancient", "European"
-legend=_("The Samnites were an ancient confederation of Italic tribes who\
+name   = _("Samnite")
+plural = _("?plural:Samnites")
+groups = "Ancient", "European"
+legend = _("The Samnites were an ancient confederation of Italic tribes who\
  spoke the Oscan language and inhabited Central Italy, South of the\
  Sabines. After losing the wars with Rome the Samnites were subjected to\
  Rome and became Romanized. They were good soldiers and famed as Roman\
  gladiators.")
+
 leaders = {
  "name",                 "sex"
  "Statius",              "Male"
@@ -18,62 +19,65 @@ leaders = {
  "Ovius Calavius",       "Male"
  "Novius Calavius",      "Male"
 }
-flag="samnium"
-flag_alt = "rome"
-style = "Classical"
+
 ruler_titles = {
  "government",      "male_title",      "female_title"
  "Anarchy",         _("Usurper %s"),   _("?female:Usurper %s")
  "Democracy",       _("Tribune %s"),   _("?female:Tribune %s")
  "Republic",        _("Consul %s"),    _("?female:Consul %s")
 }
-init_techs=""
-init_buildings=""
-init_units=""
 
-conflicts_with="Western Roman", "Ostrogothic", 
-               "Neapolitan", "Papal", "Italian" ;Langobardic
+flag = "samnium"
+flag_alt = "rome"
+style = "Classical"
+
+init_techs = ""
+init_buildings = ""
+init_units = ""
+
+conflicts_with = "Western Roman", "Ostrogothic",
+                 "Neapolitan", "Papal", "Italian" ;Langobardic
 civilwar_nations = "Sabine", "Roman"
 
 cities =
-"Beneventum",
-"Allifae",
-"Aeclanum",
-"Abellinum",
-"Compsa",
-"Aquilonia",
-"Romulea",
-"Trivicum",
-"Equus Tuticus",
-"Saepinum",
-"Aesernia",
-"Murgantia",
-"Vescellium",
-"Vercellium",
-"Sicilinum",
-"Ferentinum",
-"Fratulum",
-"Taurasia",
-"Aletrium",
-"Iuvanum",
-"Caudium",
-"Caiatia",
-"Trebula",
-"Cubulteria",
-"Thermulae",
-"Praetutii",
-"Anxanum",
-"Pallanum",
-"Ortona",
-"Histonium",
-"Buca",
-"Interamna",
-"Larinum",
-"Annum",
-"Uscosium",
-"Clotoris",
-"Atessa",
-"Venafrum",
-"Saticula",
-"Telesia",
-"Bovianum Undecumanorum"
+ "Beneventum",
+ "Allifae",
+ "Aeclanum",
+ "Abellinum",
+ "Compsa",
+ "Aquilonia",
+ "Romulea",
+ "Trivicum",
+ "Equus Tuticus",
+ "Saepinum",
+ "Aesernia",
+ "Murgantia",
+ "Vescellium",
+ "Vercellium",
+ "Sicilinum",
+ "Ferentinum",
+ "Fratulum",
+ "Taurasia",
+ "Aletrium",
+ "Iuvanum",
+ "Caudium",
+ "Caiatia",
+ "Trebula",
+ "Cubulteria",
+ "Thermulae",
+ "Praetutii",
+ "Anxanum",
+ "Pallanum",
+ "Ortona",
+ "Histonium",
+ "Buca",
+ "Interamna",
+ "Larinum",
+ "Annum",
+ "Uscosium",
+ "Clotoris",
+ "Atessa",
+ "Venafrum",
+ "Saticula",
+ "Telesia",
+ "Bovianum Undecumanorum"
diff --git a/data/nation/samoan.ruleset b/data/nation/samoan.ruleset
index e342658d04..aca83987d3 100644
--- a/data/nation/samoan.ruleset
+++ b/data/nation/samoan.ruleset
@@ -1,9 +1,9 @@
 [nation_samoan]
 
-name=_("Samoan")
-plural=_("?plural:Samoans")
-groups="Oceanian", "Modern"
-legend=_("Samoa is a country occupying the Western part of the Samoan\
+name   = _("Samoan")
+plural = _("?plural:Samoans")
+groups = "Oceanian", "Modern"
+legend = _("Samoa is a country occupying the Western part of the Samoan\
  islands of the Central Pacific; the Eastern part is governed by the\
  United States as American Samoa. Samoa was settled by Austronesian\
  peoples around 1500 BCE. It was probably from Samoa that the Polynesians\
@@ -21,10 +21,6 @@ leaders = {
  "Matatumua Maimoana",                  "Female"
 }
 
-flag="samoa"
-flag_alt = "-"
-style = "Tropical"
-
 ruler_titles = {
  "government",     "male_title",                    "female_title"
  "Fundamentalism", _("Elder %s"),                   _("?female:Elder %s")
@@ -32,9 +28,13 @@ ruler_titles = {
  "Republic",       _("Chief of the Government %s"), _("?female:Chief of the Government %s")
 }
 
-init_techs=""
-init_buildings=""
-init_units=""
+flag = "samoa"
+flag_alt = "-"
+style = "Tropical"
+
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
 conflicts_with = "burmese", "taiwanese" ;similar flags
 civilwar_nations = "fijian", "tongan"
diff --git a/data/nation/samogitian.ruleset b/data/nation/samogitian.ruleset
index e43bb84373..38e6b7741f 100644
--- a/data/nation/samogitian.ruleset
+++ b/data/nation/samogitian.ruleset
@@ -1,9 +1,9 @@
 [nation_samogitian]
 
-name=_("Samogitian")
-plural=_("?plural:Samogitians")
-groups="Medieval", "European"
-legend=_("Samogitia - historical country near the Baltic Sea - home to the\
+name   = _("Samogitian")
+plural = _("?plural:Samogitians")
+groups = "Medieval", "European"
+legend = _("Samogitia - historical country near the Baltic Sea - home to the\
  last pagans in Europe (official until 1413). Today, Samogitia is a region\
  of Lithuania.")
 
@@ -21,13 +21,13 @@ ruler_titles = {
  "Despotism",       _("Duke %s"),         _("Duchess %s")
 }
 
-flag="samogitia"
+flag = "samogitia"
 flag_alt = "-"
 style = "European"
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
 conflicts_with = "lithuanian"
 civilwar_nations = "lithuanian", "latvian"
diff --git a/data/nation/santomean.ruleset b/data/nation/santomean.ruleset
index ac356b573a..3dea1adc0a 100644
--- a/data/nation/santomean.ruleset
+++ b/data/nation/santomean.ruleset
@@ -1,9 +1,9 @@
 [nation_santomean]
 
-name = _("Santomean")
+name   = _("Santomean")
 plural = _("?plural:Santomeans")
-groups="African", "Modern"
-legend=_("São Tomé and Príncipe are two islands in the Atlantic Ocean off\
+groups = "African", "Modern"
+legend = _("São Tomé and Príncipe are two islands in the Atlantic Ocean off\
  the coast of Africa. The main island was named after Saint Thomas by the\
  Portuguese sailors who first discovered the island on the saint's feast\
  day around 1470. The islands turned into the first major European\
@@ -30,11 +30,11 @@ flag = "sao_tome_and_principe"
 flag_alt = "-"
 style = "Tropical"
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
-civilwar_nations="cape verdean", "angolan"
+civilwar_nations = "cape verdean", "angolan"
 
 cities =
  "São Tomé",
diff --git a/data/nation/sardinian.ruleset b/data/nation/sardinian.ruleset
index 95d1ad3137..713bd6faae 100644
--- a/data/nation/sardinian.ruleset
+++ b/data/nation/sardinian.ruleset
@@ -1,9 +1,9 @@
 [nation_sardinian]
 
-name=_("Sardinian")
-plural=_("?plural:Sardinians")
-groups="European", "Medieval", "Early Modern"
-legend=_("Sardinia is an island in the Mediterranean Sea and an autonomous\
+name   = _("Sardinian")
+plural = _("?plural:Sardinians")
+groups = "European", "Medieval", "Early Modern"
+legend = _("Sardinia is an island in the Mediterranean Sea and an autonomous\
  region of Italy. The site of the Nuraghic civilization in prehistory, the\
  island passed to Phoenician and then Roman rule. Upon the collapse of the\
  Roman Empire Sardinia was occupied by the Vandals and later by the\
@@ -28,17 +28,19 @@ leaders = {
  "Giuseppe Brotzu",           "Male"
  "Camillo Bellieni",          "Male"
 }
+
 ruler_titles = { "government",     "male_title",   "female_title"
                  "Democracy",      _("Judge %s"),  _("?female:Judge %s")
                  "Fundamentalism", _("Fra %s"),    _("Mother Superior %s")
                }
-flag="sardinia"
+
+flag = "sardinia"
 flag_alt = "-"
 style = "babylonian"
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
 civilwar_nations = "piedmontese", "catalan", "corsican"
 
diff --git a/data/nation/sarmatian.ruleset b/data/nation/sarmatian.ruleset
index b610803f98..eb0fa92737 100644
--- a/data/nation/sarmatian.ruleset
+++ b/data/nation/sarmatian.ruleset
@@ -1,9 +1,9 @@
 [nation_sarmatian]
 
-name=_("Sarmatian")
-plural=_("?plural:Sarmatians")
-groups="Ancient", "Asian", "European"
-legend=_("The Sarmatians were Iranian pastoral tribes from Central Asia\
+name   = _("Sarmatian")
+plural = _("?plural:Sarmatians")
+groups = "Ancient", "Asian", "European"
+legend = _("The Sarmatians were Iranian pastoral tribes from Central Asia\
  and Southwest Siberia. They were closely related to the Saka and the\
  Scythians. The myth of the origin from the Sarmatians formed the basis\
  of the Polish culture from the 15th to the 18th century.")
@@ -29,45 +29,46 @@ flag = "sarmatia"
 flag_alt = "-"
 style = "celtic"
 
-init_techs=""
-init_buildings=""
-init_units=""
-conflicts_with = "kazakh", "khazar", "soviet", "ruthenian", "russian", "ukrainian", "cossack", "crimean tatar"
+init_techs = ""
+init_buildings = ""
+init_units = ""
+
+conflicts_with = "kazakh", "khazar", "soviet", "ruthenian", "russian", "ukrainian",
+                 "cossack", "crimean tatar"
 civilwar_nations = "scythian", "ossetian", "ruthenian", "abkhaz", "gothic", "saka"
 
 cities =
-
-"Andronovo",
-"Prokhorov",
-"Orenburg",
-"Orsk",
-"Uspe",
-"Hohlach",
-"Kobyakovo",
-"Pokrovka",
-"Kosika",
-"Krasnogorovka",
-"Taman",
-"Zmielnogorsk",
-"Kardaielova",
-"Chernaya",
-"Petrovka",
-"Sintashta",
-"Arkaim",
-"Alakul",
-"Alekseyevka",
-"Fedorovo",
-"Omsk",
-"Tomsk",
-"Biysk",
-"Baranaul",
-"Semipalatinsk",
-"Ust'-Labinska",
-"Novoselka",
-"Hrushivka",
-"Aleksandropol",
-"Salomatina",
-"Susly",
-"Vozdvizhenska",
-"Armavir",
-"Zubovski"
+ "Andronovo",
+ "Prokhorov",
+ "Orenburg",
+ "Orsk",
+ "Uspe",
+ "Hohlach",
+ "Kobyakovo",
+ "Pokrovka",
+ "Kosika",
+ "Krasnogorovka",
+ "Taman",
+ "Zmielnogorsk",
+ "Kardaielova",
+ "Chernaya",
+ "Petrovka",
+ "Sintashta",
+ "Arkaim",
+ "Alakul",
+ "Alekseyevka",
+ "Fedorovo",
+ "Omsk",
+ "Tomsk",
+ "Biysk",
+ "Baranaul",
+ "Semipalatinsk",
+ "Ust'-Labinska",
+ "Novoselka",
+ "Hrushivka",
+ "Aleksandropol",
+ "Salomatina",
+ "Susly",
+ "Vozdvizhenska",
+ "Armavir",
+ "Zubovski"
diff --git a/data/nation/saudi.ruleset b/data/nation/saudi.ruleset
index 397cbd0356..3cbf23addd 100644
--- a/data/nation/saudi.ruleset
+++ b/data/nation/saudi.ruleset
@@ -1,9 +1,9 @@
 [nation_saudi]
 
-name=_("Saudi")
-plural=_("?plural:Saudis")
-groups="Asian", "Early Modern", "Modern"
-legend=_("Saudi Arabia is located on the Arabian Peninsula and includes\
+name   = _("Saudi")
+plural = _("?plural:Saudis")
+groups = "Asian", "Early Modern", "Modern"
+legend = _("Saudi Arabia is located on the Arabian Peninsula and includes\
  Mecca and Medina, the holiest sites of Islam. The First Saudi state was\
  established in 1744. Current Saudi Arabia dates from the union of Hejaz\
  and Nejd in 1925. Named after its ruling dynasty, the house of Saud,\
@@ -27,20 +27,21 @@ ruler_titles = {
  "Republic",        _("Vizier %s"),    _("?female:Vizier %s")
 }
 
-flag="saudi_arabia"
+flag = "saudi_arabia"
 flag_alt = "arab"
 style = "Babylonian"
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
 civilwar_nations = "emirati", "bahraini"
+
 cities =
- "Ar-Riyadh",	;Riyadh
- "Makka",	;Mecca
- "Al-Madina",	;Medina
- "Jidda",	;Jeddah
+ "Ar-Riyadh",   ; Riyadh
+ "Makka",       ; Mecca
+ "Al-Madina",   ; Medina
+ "Jidda",       ; Jeddah
  "Ad-Dammam",
  "At-Ta'if",
  "Tabuk",
diff --git a/data/nation/savoyard.ruleset b/data/nation/savoyard.ruleset
index 5583957aa7..9b93671b53 100644
--- a/data/nation/savoyard.ruleset
+++ b/data/nation/savoyard.ruleset
@@ -1,9 +1,9 @@
 [nation_savoyard]
 
-name=_("Savoyard")
-plural=_("?plural:Savoyards")
-groups="Medieval", "Early Modern", "European"
-legend=_("Savoy emerged in the Western Alps after the disintegration of\
+name   = _("Savoyard")
+plural = _("?plural:Savoyards")
+groups = "Medieval", "Early Modern", "European"
+legend = _("Savoy emerged in the Western Alps after the disintegration of\
  the Burgundian Kingdom. Its dynasty established control over Sardinia\
  and Piedmont and later all of Italy. Savoy's growth and survival over\
  the centuries were not based on spectacular conquests, but on gradual\
@@ -22,7 +22,7 @@ leaders = {
  "Antoine Louis Albitte",       "Male"
 }
 
-flag="savoy"
+flag = "savoy"
 flag_alt = "-"
 style = "European"
 
@@ -32,9 +32,10 @@ ruler_titles = {
  "Fundamentalism",  _("Bishop %s"),         _("Mother Superior %s")
 }
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
+
 conflicts_with = "danish" ;similar flag
 civilwar_nations = "burgundian", "piedmontese"
 
@@ -91,4 +92,3 @@ cities =
  "Megève",
  "Sciez",
  "Barberaz"
-
diff --git a/data/nation/saxon.ruleset b/data/nation/saxon.ruleset
index bc16c6f508..a97ff36a4c 100644
--- a/data/nation/saxon.ruleset
+++ b/data/nation/saxon.ruleset
@@ -1,9 +1,9 @@
 [nation_saxon]
 
-name=_("Saxon")
-plural=_("?plural:Saxons")
-groups="Medieval", "Early Modern", "European"
-legend=_("The Electorate of Saxony was an independent hereditary electorate\
+name   = _("Saxon")
+plural = _("?plural:Saxons")
+groups = "Medieval", "Early Modern", "European"
+legend = _("The Electorate of Saxony was an independent hereditary electorate\
  of the Holy Roman Empire from 1356-1806.")
 
 leaders = {
@@ -22,13 +22,14 @@ ruler_titles = {
  "Fundamentalism",   _("Bishop %s"),     _("?female:Bishop %s")
 }
 
-flag="saxony"
+flag = "saxony"
 flag_alt = "-"
 style = "European"
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
+
 civilwar_nations = "sorbian", "hanoverian", "thuringian", "anhaltian"
 
 cities =
diff --git a/data/nation/scanian.ruleset b/data/nation/scanian.ruleset
index 49bd3df7a2..0d60c653f5 100644
--- a/data/nation/scanian.ruleset
+++ b/data/nation/scanian.ruleset
@@ -1,9 +1,9 @@
 [nation_scanian]
 
-name=_("Scanian")
-plural=_("?plural:Scanians")
-groups="Medieval", "European"
-legend=_("Scania is the southernmost region of Sweden. Historically one of\
+name   = _("Scanian")
+plural = _("?plural:Scanians")
+groups = "Medieval", "European"
+legend = _("Scania is the southernmost region of Sweden. Historically one of\
  many petty kingdoms in Viking age Scandinavia, it became in medieval times\
  part of Denmark but was ceded to Sweden through the Treaty of Roskilde in\
  1658. Scania saw something of a national revival in the late 20th century\
@@ -26,16 +26,16 @@ ruler_titles = {
  "Despotism",    _("Earl %s"),           _("?female:Earl %s")
 }
 
-flag="scania"
-flag_alt="-"
+flag = "scania"
+flag_alt = "-"
 style = "European"
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
-conflicts_with="Danish" ; Similar flag
-civilwar_nations="Swedish"
+conflicts_with = "Danish" ; Similar flag
+civilwar_nations = "Swedish"
 
 ; Cities in Skåne unless otherwise noted
 ; Danish/Scanian forms with Swedish in comment
diff --git a/data/nation/schleswig-holsteinian.ruleset b/data/nation/schleswig-holsteinian.ruleset
index fd924253da..446e083822 100644
--- a/data/nation/schleswig-holsteinian.ruleset
+++ b/data/nation/schleswig-holsteinian.ruleset
@@ -1,24 +1,25 @@
 [nation_schleswig-holsteinian]
 
-name=_("Schleswig-Holsteinian")
-plural=_("?plural:Schleswig-Holsteinians")
-groups="European", "Medieval"
-legend=_("For much of its history, the duchies of Schleswig and Holstein\
+name   = _("Schleswig-Holsteinian")
+plural = _("?plural:Schleswig-Holsteinians")
+groups = "European", "Medieval"
+legend = _("For much of its history, the duchies of Schleswig and Holstein\
  have been contested by Germany and Denmark. The territories were united\
  in a personal union in 1375. In the 19th century, Schleswig-Holstein's\
  confused status led to two wars between Denmark and Prussia, and in 1866\
  Schleswig-Holstein became a Prussian province. After World War I, Northern\
  Schleswig was annexed by Denmark. Currently Schleswig-Holstein is a state\
  of the Federal Republic of Germany.")
+
 leaders = {
- "name",		"sex"
-"Mechthild",		"female"
-"Heinrich der Eiserne",	"male"
-"Gerhard III",		"male"
-"Adolf IV",		"male"
-"Johann der Jüngere",	"male"
-"Karl Friedrich",	"male"
-"Theodor Steltzer",	"male"
+ "name",                 "sex"
+ "Mechthild",            "female"
+ "Heinrich der Eiserne", "male"
+ "Gerhard III",          "male"
+ "Adolf IV",             "male"
+ "Johann der Jüngere",   "male"
+ "Karl Friedrich",       "male"
+ "Theodor Steltzer",     "male"
 }
 
 ruler_titles = {
@@ -29,72 +30,71 @@ ruler_titles = {
  "Democracy", _("Minister-President %s"), _("?female:Minister-President %s")
 }
 
-flag="schleswig-holstein" 
-flag_alt = "-" 
-style = "european" 
+flag = "schleswig-holstein"
+flag_alt = "-"
+style = "european"
 
-init_techs="" 
-init_buildings="" 
-init_units="" 
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
 civilwar_nations = "oldenburgian", "danish", "frisian"
 
-cities = 
-"Schleswig",		;historical capital of Schleswig
-"Kiel",			;capital of Holstein
-"Flensburg",		;later capital of Schleswig
-"Sonderburg",		;Danish Sønderborg
-"Heide",
-"Tondern",		;Danish Tønder
-"Neumünster",
-"Apenrade",		;Danish Aabenraa
-"Plön",
-"Oldenburg in Holstein",
-"Itzehoe",
-"Eckernförde",
-"Husum",
-"Bad Oldesloe",
-"Hadersleben",		;Danish Haderslev
-"Bordesholm",
-"Bad Segeberg",
-"Pinneberg",
-"Rendsburg",
-"Wyk auf Föhr (ocean)",
-"Glückstadt",
-"Burg auf Fehmarn (ocean)",
-"Norburg",		;Danish Norborg
-"Westerland (ocean)",
-"Bargteheide",
-"Meldorf",
-"Christiansfeld",	;Danish Christiansfeld
-"Brunsbüttel",
-"Heiligenhafen",
-"Neustadt in Holstein",
-"Gravenstein",		;Danish Gråsten
-"Kaltenkirchen",
-"Marne",
-"Norderstedt",
-"Reinbek",
-"Reinfeld",
-"Tönning",
-"Preetz",
-"Schwentinental",
-"Pattburg",		;Danish Padborg
-"Bad Bramstedt",
-"Wahlstedt",
-"Tingleff",		;Danish Tinglev
-"Bredstedt",
-"Glinde",
-"Wilster",
-"Woyen",		;Danish Vojens
-"Altona",
-"Wandsbek",
+cities =
+ "Schleswig",           ; historical capital of Schleswig
+ "Kiel",                ; capital of Holstein
+ "Flensburg",           ; later capital of Schleswig
+ "Sonderburg",          ; Danish Sønderborg
+ "Heide",
+ "Tondern",             ; Danish Tønder
+ "Neumünster",
+ "Apenrade",            ; Danish Aabenraa
+ "Plön",
+ "Oldenburg in Holstein",
+ "Itzehoe",
+ "Eckernförde",
+ "Husum",
+ "Bad Oldesloe",
+ "Hadersleben",         ; Danish Haderslev
+ "Bordesholm",
+ "Bad Segeberg",
+ "Pinneberg",
+ "Rendsburg",
+ "Wyk auf Föhr (ocean)",
+ "Glückstadt",
+ "Burg auf Fehmarn (ocean)",
+ "Norburg",             ; Danish Norborg
+ "Westerland (ocean)",
+ "Bargteheide",
+ "Meldorf",
+ "Christiansfeld",      ; Danish Christiansfeld
+ "Brunsbüttel",
+ "Heiligenhafen",
+ "Neustadt in Holstein",
+ "Gravenstein",         ; Danish Gråsten
+ "Kaltenkirchen",
+ "Marne",
+ "Norderstedt",
+ "Reinbek",
+ "Reinfeld",
+ "Tönning",
+ "Preetz",
+ "Schwentinental",
+ "Pattburg",            ; Danish Padborg
+ "Bad Bramstedt",
+ "Wahlstedt",
+ "Tingleff",            ; Danish Tinglev
+ "Bredstedt",
+ "Glinde",
+ "Wilster",
+ "Woyen",               ; Danish Vojens
+ "Altona",
+ "Wandsbek",
 
 ;Free City of Lübeck, not historically part of Schleswig-Holstein
-"Lübeck",
+ "Lübeck",
 
 ;Duchy of Saxe-Lauenburg
-"Lauenburg/Elbe",
-"Ratzeburg",
-"Geesthacht"
-
+ "Lauenburg/Elbe",
+ "Ratzeburg",
+ "Geesthacht"
diff --git a/data/nation/scottish.ruleset b/data/nation/scottish.ruleset
index 11cd278ce9..36183aec85 100644
--- a/data/nation/scottish.ruleset
+++ b/data/nation/scottish.ruleset
@@ -1,9 +1,9 @@
 [nation_scottish]
 
-name=_("Scottish")
-plural=_("?plural:Scots")
-groups="Medieval", "Early Modern", "European"
-legend=_("Scotland, originally settled in late Roman times by Irish\
+name   = _("Scottish")
+plural = _("?plural:Scots")
+groups = "Medieval", "Early Modern", "European"
+legend = _("Scotland, originally settled in late Roman times by Irish\
  raiders who displaced the native Picts, was an independent kingdom from\
  around 1034 CE to the Union of Crowns with England in 1701.")
 
@@ -26,47 +26,48 @@ ruler_titles = {
  "Democracy",   _("First Minister %s"), _("?female:First Minister %s")
 }
 
-flag="scotland"
+flag = "scotland"
 flag_alt = "united_kingdom"
 style = "Celtic"
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
+
 civilwar_nations = "scottish gaelic", "irish", "american"
 
 cities =
  "Edinburgh",
- "Glesga (river)",		; Glasgow
- "Aiberdeen (ocean, river)",	; Aberdeen
+ "Glesga (river)",              ; Glasgow
+ "Aiberdeen (ocean, river)",    ; Aberdeen
  "Perth (river)",
  "Dundee (ocean, river)",
- "Stirlin (hills)",		; Stirling
- "Innerness (river)",		; Inverness
+ "Stirlin (hills)",             ; Stirling
+ "Innerness (river)",           ; Inverness
  "Hamilton",
- "Mitherwall",			; Motherwell
+ "Mitherwall",                  ; Motherwell
  "Dunfermline",
- "Fawkirk",			; Falkirk
+ "Fawkirk",                     ; Falkirk
  "Kilmarnock",
  "Dumfries (river)",
  "East Kilbride (hills)",
  "Coatbridge (river)", 
  "Dumbarton (ocean)",
  "Irvine (ocean, river)",
- "Lanrick (river)",		; Lanark
- "Saunt Andras (ocean,river)",	; St Andrews
+ "Lanrick (river)",             ; Lanark
+ "Saunt Andras (ocean,river)",  ; St Andrews
  "Kirkcaldy (ocean)",
- "Fort William (ocean)", 
+ "Fort William (ocean)",
  "Bathgate",
  "Cumbernauld",
- "Port Glesga (ocean)",		; Port Glasgow
+ "Port Glesga (ocean)",         ; Port Glasgow
  "Johnstone",
- "Leevinston (river)",		; Livingston
+ "Leevinston (river)",          ; Livingston
  "Lockerbie",
  "Oban (ocean)",
  "Leven (ocean)",
  "Paisley (ocean, river)",
- "Peterheid (ocean)",		; Peterhead
+ "Peterheid (ocean)",           ; Peterhead
  "Prestwick (ocean)",
  "Stranraer (ocean)",
  "Airdrie (hills)",
@@ -77,7 +78,7 @@ cities =
  "Lerwick (ocean)", 
  "Largs (ocean, river)",
  "Bellshill (hills)",
- "Week (ocean)",		; Wick
+ "Week (ocean)",                ; Wick
  "Larkhall (river)",
  "Cowdenbeath",
  "Gretna (ocean, river)", 
@@ -85,44 +86,44 @@ cities =
  "Helensburgh (ocean)",
  "Dunblane (river)", 
  "Montrose (ocean, river)",
- "Kilwinnin",			; Kilwinning
- "Monifieth (ocean)", 
+ "Kilwinnin",                   ; Kilwinning
+ "Monifieth (ocean)",
  "Dunbar (ocean, river)",
  "Cumnock",
  "Stornoway (ocean)",
  "Callander (river)", 
  "Portree (ocean)",
- "Kelsae (river)",		; Kelso
+ "Kelsae (river)",              ; Kelso
  "Whitebridge (river)",
- "Kirkintilloch", 
+ "Kirkintilloch",
  "Mallaig (ocean)",
  "Braemar (hills)",
- "Jeddart (river)",		; Jedburgh
+ "Jeddart (river)",             ; Jedburgh
  "Alloa (river)",
  "Newton Stewart (river)",
- "Wigtoun",			; Wigtown
- "Girvan (ocean, river)", 
+ "Wigtoun",                     ; Wigtown
+ "Girvan (ocean, river)",
  "Fort Augustus (ocean, river)",
  "Arbroath (ocean)",
  "Shotts (hills)",
  "Kinghorn (ocean)",
- "Cauldstream (river)",		; Coldstream
- "Hymooth (ocean, river)",	; Eyemouth
- "Wishae",			; Wishaw
- "Kirkwaa (ocean)",		; Kirkwall
- "Hadentoun (grassland)",	; Haddington
+ "Cauldstream (river)",         ; Coldstream
+ "Hymooth (ocean, river)",      ; Eyemouth
+ "Wishae",                      ; Wishaw
+ "Kirkwaa (ocean)",             ; Kirkwall
+ "Hadentoun (grassland)",       ; Haddington
  "Glencoe (river, hills)",
  "Rothesay (ocean)",
  "Culross (ocean)",
  "Gourock (ocean)",
- "Copshie (hills)",		; Newcastleton
- "Burghstounness (ocean)",	; /* Bo'ness */
+ "Copshie (hills)",             ; Newcastleton
+ "Burghstounness (ocean)",      ; /* Bo'ness */
  "Fraserburgh (ocean)",
  "Nairn (ocean, river)",
  "Annan (ocean, river)",
- "Dervel (hills)",		; Darvel
+ "Dervel (hills)",              ; Darvel
  "Huntly (hills)",
  "Inverurie (river)",
- "Peebles (river)", 
+ "Peebles (river)",
  "Elgin (river)",
  "Dunkeld (river, grassland)"
diff --git a/data/nation/scottishgaelic.ruleset b/data/nation/scottishgaelic.ruleset
index df09065421..7651a0c4d6 100644
--- a/data/nation/scottishgaelic.ruleset
+++ b/data/nation/scottishgaelic.ruleset
@@ -1,9 +1,9 @@
 [nation_scottishgaelic]
 
-name=_("Scottish Gaelic")
-plural=_("?plural:Scottish Gaels")
-groups="Medieval", "European"
-legend=_("Both Gaels and the Gaelic language were brought\
+name   = _("Scottish Gaelic")
+plural = _("?plural:Scottish Gaels")
+groups = "Medieval", "European"
+legend = _("Both Gaels and the Gaelic language were brought\
  to Scotland by the Dalriada dynasty from Ireland. They first\
  settled in Argyll (Earra Ghaidheal or the Coastland of the\
  Gael) and soon expanded further into territory held by the\
@@ -27,8 +27,6 @@ leaders = {
  "Aonghas Òg Ìle",		"Male" ; Angus Og of Islay
  "Sìleas na Ceapaich",		"Female" ; Silis of Keppoch
  "Fionnghal nighean Raghnaill",	"Female" ; Flora MacDonald
- 
- 
 }
 
 ruler_titles = {
@@ -39,101 +37,100 @@ ruler_titles = {
  "Democracy",   _("First Minister %s"), _("?female:First Minister %s")
 }
 
-flag="scottishgaelic"
-flag_alt="scotland"
+flag = "scottishgaelic"
+flag_alt = "scotland"
 style = "Celtic"
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
-civilwar_nations="Scottish", "Irish", "Briton", "Manx"
-conflicts_with="Gaelic", "Scottish"
+civilwar_nations = "Scottish", "Irish", "Briton", "Manx"
+conflicts_with = "Gaelic", "Scottish"
 
 cities =
 
- "Dùn Ada (ocean)",		; Dunadd
- "Dùn Ollaidh (ocean,hills)",	; Dunollie
- "Dùn Abhartaich (ocean)", 	; Dunaverty
+ "Dùn Ada (ocean)",             ; Dunadd
+ "Dùn Ollaidh (ocean,hills)",   ; Dunollie
+ "Dùn Abhartaich (ocean)",      ; Dunaverty
  "Dùn Chailleann (river, grassland)", ; Dunkeld
- "Sruighlea (hills)",		; Stirling
- "Dùn Breatainn (ocean)",	; Dumbarton
- "Fionn-lagan (river)", 	; Finlaggan
- "Peairt (river)",		; Perth
- "Dùn Bheagain (ocean)", 	; Dunvegan
- "Bàgh a' Chaisteil (ocean)", 	; Castlebay
- "Dùn Thuilm (ocean)",		; Duntulm
- "Eilean Donnain (ocean)", 	; Eilean Donan
- "Dùn Èideann",			; Edinburgh
+ "Sruighlea (hills)",           ; Stirling
+ "Dùn Breatainn (ocean)",       ; Dumbarton
+ "Fionn-lagan (river)",         ; Finlaggan
+ "Peairt (river)",              ; Perth
+ "Dùn Bheagain (ocean)",        ; Dunvegan
+ "Bàgh a' Chaisteil (ocean)",   ; Castlebay
+ "Dùn Thuilm (ocean)",          ; Duntulm
+ "Eilean Donnain (ocean)",      ; Eilean Donan
+ "Dùn Èideann",                 ; Edinburgh
  "Obar Dheathain (ocean, river)", ; Aberdeen
- "Dùn Dè (ocean, river)",	; Dundee
- "Inbhir Nis (river)",		; Inverness
- "Dùn Phàrlain",		; Dunfermline
- "An Eaglais Bhreac",		; Falkirk
- "Cille Mheàrnaig",		; Kilmarnock
- "Dùn Phris (river)",		; Dumfries
+ "Dùn Dè (ocean, river)",       ; Dundee
+ "Inbhir Nis (river)",          ; Inverness
+ "Dùn Phàrlain",                ; Dunfermline
+ "An Eaglais Bhreac",           ; Falkirk
+ "Cille Mheàrnaig",             ; Kilmarnock
+ "Dùn Phris (river)",           ; Dumfries
  "Cille Bhrìghde an Ear (hills)", ; East Kilbride
- "Lannraig (river)",		; Lanark
- "Cill Rìmhinn (ocean,river)",	; St Andrews
- "Dùn Stafhanais (ocean)",	; Dunstaffnage
- "Cathair Chaladain (ocean)",	; Kirkcaldy
- "Dùn Omhain (ocean)",		; Dunoon
- "Roghadal (ocean)",		; Rodel
- "Comar nan Allt",		; Cumbernauld
- "An t-Òban (ocean)",		; Oban
- "Glaschu (river)",		; Glasgow
- "Inbhir Lìobhann (ocean)",	; Leven
- "Pàislig (ocean, river)",	; Paisley
- "Dùn Rath (ocean)",		; Dounreay
- "Goillspidh (ocean)",		; Golspie
- "Ceann Phàdraig (ocean)",	; Peterhead
- "An t-Sròn Reamhar (ocean)",	; Stranraer
- "An t-Àrd Ruigh (hills)",	; Airdrie
- "Tobar Mhoire (ocean)",	; Tobermory
- "Inbhir Theòrsa (ocean)",	; Thurso
- "An t-Sròn (ocean)",		; Troon
- "Ullapul (ocean)", 		; Ullapool
- "Inbhir Àir (ocean, river)",	; Ayr
- "An Aghaidh Mhòr (mountains)",	; Aviemore
- "Inbhir Ùige (ocean)",		; Wick
- "Dùn Bhlàthain (river)",	; Dunblane
+ "Lannraig (river)",            ; Lanark
+ "Cill Rìmhinn (ocean,river)",  ; St Andrews
+ "Dùn Stafhanais (ocean)",      ; Dunstaffnage
+ "Cathair Chaladain (ocean)",   ; Kirkcaldy
+ "Dùn Omhain (ocean)",          ; Dunoon
+ "Roghadal (ocean)",            ; Rodel
+ "Comar nan Allt",              ; Cumbernauld
+ "An t-Òban (ocean)",           ; Oban
+ "Glaschu (river)",             ; Glasgow
+ "Inbhir Lìobhann (ocean)",     ; Leven
+ "Pàislig (ocean, river)",      ; Paisley
+ "Dùn Rath (ocean)",            ; Dounreay
+ "Goillspidh (ocean)",          ; Golspie
+ "Ceann Phàdraig (ocean)",      ; Peterhead
+ "An t-Sròn Reamhar (ocean)",   ; Stranraer
+ "An t-Àrd Ruigh (hills)",      ; Airdrie
+ "Tobar Mhoire (ocean)",        ; Tobermory
+ "Inbhir Theòrsa (ocean)",      ; Thurso
+ "An t-Sròn (ocean)",           ; Troon
+ "Ullapul (ocean)",             ; Ullapool
+ "Inbhir Àir (ocean, river)",   ; Ayr
+ "An Aghaidh Mhòr (mountains)", ; Aviemore
+ "Inbhir Ùige (ocean)",         ; Wick
+ "Dùn Bhlàthain (river)",       ; Dunblane
  "Ceann a' Ghiùthsaich (mountains)", ; Kingussie
- "Blàr Athall (hills)",		; Blair Atholl
- "Monadh Rois (ocean, river)",	; Montrose
- "Loch Baghastail (ocean)",	; Lochboisdale
- "An Tòb (ocean)",		; Leverburgh
- "Monadh Fèithe (ocean)",	; Monifieth
- "Dùn Barra (ocean, river)",	; Dunbar
- "Steòrnabhagh (ocean)",	; Stornoway
- "Calasraid (river)",		; Callander
- "Crosabol (ocean)",		; Crossapoll
+ "Blàr Athall (hills)",         ; Blair Atholl
+ "Monadh Rois (ocean, river)",  ; Montrose
+ "Loch Baghastail (ocean)",     ; Lochboisdale
+ "An Tòb (ocean)",              ; Leverburgh
+ "Monadh Fèithe (ocean)",       ; Monifieth
+ "Dùn Barra (ocean, river)",    ; Dunbar
+ "Steòrnabhagh (ocean)",        ; Stornoway
+ "Calasraid (river)",           ; Callander
+ "Crosabol (ocean)",            ; Crossapoll
  "Allt na h-Eirbhe (mountains)", ; Altnaharra
- "Port Rìgh (ocean)",		; Portree
- "Càrlabhagh (ocean)",		; Carloway
- "Cathair Ceann Tulach", 	; Kirkintilloch
- "Diùirinis (ocean)",		; Durness
- "Bogha Mòr (ocean)",		; Bowmore
- "Bràigh Mhàrr (hills)",	; Braemar
+ "Port Rìgh (ocean)",           ; Portree
+ "Càrlabhagh (ocean)",          ; Carloway
+ "Cathair Ceann Tulach",        ; Kirkintilloch
+ "Diùirinis (ocean)",           ; Durness
+ "Bogha Mòr (ocean)",           ; Bowmore
+ "Bràigh Mhàrr (hills)",        ; Braemar
  "Inbhir Uraidh (hills, river)", ; Inverurie
- "Alamhagh (river)",		; Alloa
- "Druim na Drochaid (river)",	; Drumnadrochit
+ "Alamhagh (river)",            ; Alloa
+ "Druim na Drochaid (river)",   ; Drumnadrochit
  "Inbhir Gharbhain (ocean, river)", ; Girvan
  "Cill Chuimein (ocean, river)", ; Fort Augustus
- "Àird a' Bhàsair (ocean)",	; Ardvasar
- "Obar Bhrothaig (ocean)",	; Arbroath
- "Loch nam Madadh (ocean)",	; Lochmaddy
- "An t-Alltan Fuar (river)",	; Coldstream
- "Inbhir Eighe (ocean, river)",	; Eyemouth
- "Baile Bhòid (ocean)",		; Rothesay
- "Inbhir Aora (ocean)",		; Inveraray
- "Cuileann Ros (ocean)",	; Culross
- "Guireag (ocean)",		; Gourock
- "Cille Chòmhghain (ocean)",	; Kilchoan
- "Am Machaire (ocean)",		; Machrie
- "Ceann Fhàil (ocean)",		; /* Bo'ness */
- "A' Bhruaich (ocean)",		; Fraserburgh
- "Srath Bhalgaidh (hills)",	; Huntly
- "Inbhir Ùraidh (river)",	; Inverurie
- "Na Pùballan (river)",		; Peebles
- "Eilginn (river)"		; Elgin
-
+ "Àird a' Bhàsair (ocean)",     ; Ardvasar
+ "Obar Bhrothaig (ocean)",      ; Arbroath
+ "Loch nam Madadh (ocean)",     ; Lochmaddy
+ "An t-Alltan Fuar (river)",    ; Coldstream
+ "Inbhir Eighe (ocean, river)", ; Eyemouth
+ "Baile Bhòid (ocean)",         ; Rothesay
+ "Inbhir Aora (ocean)",         ; Inveraray
+ "Cuileann Ros (ocean)",        ; Culross
+ "Guireag (ocean)",             ; Gourock
+ "Cille Chòmhghain (ocean)",    ; Kilchoan
+ "Am Machaire (ocean)",         ; Machrie
+ "Ceann Fhàil (ocean)",         ; /* Bo'ness */
+ "A' Bhruaich (ocean)",         ; Fraserburgh
+ "Srath Bhalgaidh (hills)",     ; Huntly
+ "Inbhir Ùraidh (river)",       ; Inverurie
+ "Na Pùballan (river)",         ; Peebles
+ "Eilginn (river)"              ; Elgin
diff --git a/data/nation/scythian.ruleset b/data/nation/scythian.ruleset
index 6653b3b588..d1861e8906 100644
--- a/data/nation/scythian.ruleset
+++ b/data/nation/scythian.ruleset
@@ -1,9 +1,9 @@
-[nation_scythian] 
+[nation_scythian]
 
-name=_("Scythian") 
-plural=_("?plural:Scythians") 
-groups="Ancient", "European", "Asian"
-legend=_("The Scythians or Scyths were an Ancient Iranian people of\
+name   = _("Scythian")
+plural = _("?plural:Scythians")
+groups = "Ancient", "European", "Asian"
+legend = _("The Scythians or Scyths were an Ancient Iranian people of\
  horse-riding nomadic pastoralists who throughout Classical Antiquity\
  dominated the Pontic-Caspian steppe, known at the time as Scythia. By\
  Late Antiquity the closely-related Sarmatians came to dominate the\
@@ -33,16 +33,16 @@ leaders = {
  "Zarina",      "Female"
 }
 
-flag= "scythia" 
-flag_alt = "-" 
-style = "Celtic" 
+flag = "scythia"
+flag_alt = "-"
+style = "Celtic"
 
-init_techs="" 
-init_buildings="" 
-init_units="" 
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
-conflicts_with="russian", "ukrainian", "ruthenian"
-civilwar_nations="thracian", "persian", "tocharian", "ossetian", "sarmatian", "saka"
+conflicts_with = "russian", "ukrainian", "ruthenian"
+civilwar_nations = "thracian", "persian", "tocharian", "ossetian", "sarmatian", "saka"
 
 cities =
  "Tanais",
@@ -76,4 +76,3 @@ cities =
  "Orlat",
  "Solokha",
  "Histria"
-
diff --git a/data/nation/seleucid.ruleset b/data/nation/seleucid.ruleset
index 76c68aba14..f5b0194801 100644
--- a/data/nation/seleucid.ruleset
+++ b/data/nation/seleucid.ruleset
@@ -1,9 +1,9 @@
 [nation_seleucid]
 
-name=_("Seleucid")
-plural=_("?plural:Seleucids")
-groups="Asian", "Ancient"
-legend=_("The Seleucid Empire was one of the diadochi states founded when\
+name   = _("Seleucid")
+plural = _("?plural:Seleucids")
+groups = "Asian", "Ancient"
+legend = _("The Seleucid Empire was one of the diadochi states founded when\
  Alexander the Great's generals carved up his empire after his death. It\
  was named after its founder Seleucus I Nicator. Centered in Syria, the\
  Seleucids were the most powerful of the diadochi states but eventually\
@@ -29,14 +29,13 @@ ruler_titles = {
  "Despotism",       _("Satrap %s"),    _("?female:Satrap %s")
 }
 
-flag="seleucid"
+flag = "seleucid"
 flag_alt = "-"
 style = "Classical"
 
-
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
 conflicts_with = "persian", "syrian", "israeli"
 civilwar_nations = "parthian", "aramean", "israelite"
@@ -78,4 +77,3 @@ cities =
  "Makedonopoli",
  "Abydos",
  "Kyzikos"
-
diff --git a/data/nation/seljuk.ruleset b/data/nation/seljuk.ruleset
index 251116a0eb..7e0ecc3434 100644
--- a/data/nation/seljuk.ruleset
+++ b/data/nation/seljuk.ruleset
@@ -1,9 +1,9 @@
-[nation_seljuk] 
+[nation_seljuk]
 
-name=_("Seljuk") 
-plural=_("?plural:Seljuks") 
-groups="Medieval", "Asian" 
-legend=_("The Seljuks were a Turkic horde whose name comes from their founder\
+name   = _("Seljuk")
+plural = _("?plural:Seljuks")
+groups = "Medieval", "Asian"
+legend = _("The Seljuks were a Turkic horde whose name comes from their founder\
  Seljuk. After the victory over the Ghaznavids in 1040 CE they created their\
  own state. In 1055 CE the Seljuks took Baghdad, and their leader\
  Tughril Beg took the title sultan. The Seljuks are famous for the defeat\
@@ -12,7 +12,7 @@ legend=_("The Seljuks were a Turkic horde whose name comes from their founder\
  Seljuks continued to rule in the Sultanate of Rum, which would later form\
  the basis of the Ottoman Turks.")
 
-leaders={
+leaders = {
  "name",                	"sex"
  "Selçuk",			"male"
  "Tuğrul",			"male"
@@ -30,58 +30,58 @@ leaders={
  "Gıyaseddin Mesud II",		"male"
 }
 
-flag= "seljuk" 
-flag_alt = "-" 
-style = "Classical" 
+flag = "seljuk"
+flag_alt = "-"
+style = "Classical"
 
 ruler_titles = { "government",    "male_title", "female_title"
-                "Despotism",      _("%s Bey"),     _("?female:%s Bey")
-		"Monarchy",       _("Sultan %s"),  _("Sultana %s")
-		"Fundamentalism", _("Caliph %s"),  _("Calipha %s") 
+                 "Despotism",      _("%s Bey"),     _("?female:%s Bey")
+                 "Monarchy",       _("Sultan %s"),  _("Sultana %s")
+                 "Fundamentalism", _("Caliph %s"),  _("Calipha %s")
 } 
 
-init_techs="" 
-init_buildings="" 
-init_units="" 
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
-conflicts_with="turkish", "ottoman", "azeri"
-civilwar_nations="ottoman", "turkmen", "afghani", "persian", "azeri", "khwarezmian", "crusader"
+conflicts_with = "turkish", "ottoman", "azeri"
+civilwar_nations = "ottoman", "turkmen", "afghani", "persian", "azeri",
+                   "khwarezmian", "crusader"
 
 cities =
-"Nişabur",	;Nishapur
-"İsfahan",
-"Rey",
-"Konya",
-"İznik",
-"Hamedan",	;Hamadan
-"Musul",	;Mosul
-"Antakya",	;Antioch
-"Semerkand",	;Samarkand
-"Kayseri",	;Caesarea
-"Kâbil",	;Kabul
-"Şanlıurfa",	;Edessa
-"Halep",	;Aleppo
-"Sivas",
-"Bağdat",	;Baghdad
-"Şam",		;Damsascus
-"Kudüs",	;Jerusalem
-"Erzurum",
-"Malazgirt",	;Manzikert
-"Merv",
-"Hive",		;Khiva
-"Diyâr-ı Bekr",	;Diyarbakir
-"Erzincan",
-"Aksaray",
-"Kangal",
-"Urganch",
-"Durağan",
-"Mezar-ı Şerif", ;Mazar-i-Sharif
-"Hekimhan",
-"Kandehar",	;Kandahar
-"Buhara",	;Bukhara
-"Kadınhanı",
-"Taşkent",	;Tashkent
-"Fergana",
-"Basra",
-"Ahan"
-
+ "Nişabur",      ; Nishapur
+ "İsfahan",
+ "Rey",
+ "Konya",
+ "İznik",
+ "Hamedan",      ; Hamadan
+ "Musul",        ; Mosul
+ "Antakya",      ; Antioch
+ "Semerkand",    ; Samarkand
+ "Kayseri",      ; Caesarea
+ "Kâbil",        ; Kabul
+ "Şanlıurfa",    ; Edessa
+ "Halep",        ; Aleppo
+ "Sivas",
+ "Bağdat",       ; Baghdad
+ "Şam",          ; Damsascus
+ "Kudüs",        ; Jerusalem
+ "Erzurum",
+ "Malazgirt",    ; Manzikert
+ "Merv",
+ "Hive",         ; Khiva
+ "Diyâr-ı Bekr", ; Diyarbakir
+ "Erzincan",
+ "Aksaray",
+ "Kangal",
+ "Urganch",
+ "Durağan",
+ "Mezar-ı Şerif", ; Mazar-i-Sharif
+ "Hekimhan",
+ "Kandehar",     ; Kandahar
+ "Buhara",       ; Bukhara
+ "Kadınhanı",
+ "Taşkent",      ; Tashkent
+ "Fergana",
+ "Basra",
+ "Ahan"
diff --git a/data/nation/seminole.ruleset b/data/nation/seminole.ruleset
index bf89e1d59f..73f13e8a96 100644
--- a/data/nation/seminole.ruleset
+++ b/data/nation/seminole.ruleset
@@ -1,9 +1,9 @@
-[nation_seminole] 
+[nation_seminole]
 
-name=_("Seminole") 
-plural=_("?plural:Seminoles") 
-groups="American", "Early Modern"
-legend=_("The Seminole people emerged in the 18th century through a\
+name   = _("Seminole")
+plural = _("?plural:Seminoles")
+groups = "American", "Early Modern"
+legend = _("The Seminole people emerged in the 18th century through a\
  process of ethnogenesis, out of groups of lower Creek emigrants who\
  fled the encroachment of White settlers in the U.S. state of Georgia and\
  elsewhere, south to the Florida peninsula which at that time was under\
@@ -37,14 +37,15 @@ ruler_titles = {
  "Fundamentalism",  _("Shaman %s"),          _("?female:Shaman %s")
 }
 
-flag="seminole"
+flag = "seminole"
 flag_alt="-"
 style = "Celtic"
 
-init_techs=""
-init_buildings=""
-init_units=""
-civilwar_nations="Muskogee", "Chickasaw", "Choctaw" 
+init_techs = ""
+init_buildings = ""
+init_units = ""
+
+civilwar_nations = "Muskogee", "Chickasaw", "Choctaw"
 
 cities =
 ; principal town
diff --git a/data/nation/senegalese.ruleset b/data/nation/senegalese.ruleset
index 590f5377a0..5aa9bd30e3 100644
--- a/data/nation/senegalese.ruleset
+++ b/data/nation/senegalese.ruleset
@@ -1,9 +1,9 @@
 [nation_senegalese]
 
-name=_("Senegalese")
-plural=_("?plural:Senegalese")
-groups="Modern", "African"
-legend=_("Senegal is the westernmost country of mainland Africa. It has\
+name   = _("Senegalese")
+plural = _("?plural:Senegalese")
+groups = "Modern", "African"
+legend = _("Senegal is the westernmost country of mainland Africa. It has\
  been independent from France since 1960. Senegal is relatively stable\
  and democratic compared to its neighbors.")
 
@@ -13,21 +13,23 @@ leaders = {
  "Abdou Diouf",                 "Male"
  "Mame Madior Boye",            "Female"
 }
+
 ruler_titles = {
  "government",      "male_title",         "female_title"
  "Fundamentalism",  _("Grand Mufti %s"), _("?female:Grand Mufti %s")
  "Monarchy",        _("Mansa %s"),       _("?female:Mansa %s")
 }
-flag= "senegal"
+
+flag = "senegal"
 flag_alt = "-"
 style = "Tropical"
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
-conflicts_with="jolof"
-civilwar_nations="malian", "jolof", "gambian", "fulani"
+conflicts_with = "jolof"
+civilwar_nations = "malian", "jolof", "gambian", "fulani"
 
 cities =
  "Dakar (ocean)",
diff --git a/data/nation/serbian.ruleset b/data/nation/serbian.ruleset
index 4c54619127..eb582d1cdc 100644
--- a/data/nation/serbian.ruleset
+++ b/data/nation/serbian.ruleset
@@ -1,9 +1,9 @@
 [nation_serbian]
 
-name=_("Serbian")
-plural=_("?plural:Serbians")
-groups="Modern", "Medieval", "European"
-legend=_("Serbia is part of the region of the Southern Slavs that was\
+name   = _("Serbian")
+plural = _("?plural:Serbians")
+groups = "Modern", "Medieval", "European"
+legend = _("Serbia is part of the region of the Southern Slavs that was\
  conquered by the Ottomans after the collapse of the Byzantine Empire. \
  During most of the 20th century it was part of the Yugoslav Federation.")
 
@@ -35,13 +35,13 @@ ruler_titles = {
  "Fundamentalism",  _("Patriarch %s"), _("Matriarch %s")
 }
 
-flag="serbia"
+flag = "serbia"
 flag_alt = "-"
 style = "European"
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
 civilwar_nations = "montenegrin", "croatian", "bosnian-herzegovinian", "kosovar"
 
diff --git a/data/nation/seychellois.ruleset b/data/nation/seychellois.ruleset
index 0536bfd3eb..14fc16fc28 100644
--- a/data/nation/seychellois.ruleset
+++ b/data/nation/seychellois.ruleset
@@ -1,9 +1,9 @@
 [nation_seychellois]
 
-name=_("Seychellois")
-plural=_("?plural:Seychellois")
-groups="African", "Modern"
-legend=_("The Seychelles is an archipelagic country off the coast of\
+name   = _("Seychellois")
+plural = _("?plural:Seychellois")
+groups = "African", "Modern"
+legend = _("The Seychelles is an archipelagic country off the coast of\
  Eastern Africa in the Indian Ocean. The Islands have been visited by\
  Austronesian, Maldivian and Arab merchants in antiquity but by the\
  time of the European discoveries the Seychelles had no indigenous\
@@ -21,12 +21,13 @@ leaders = {
  "France-Albert René", "Male"
 }
 
-flag ="seychelles"
+flag = "seychelles"
 style = "tropical"
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
+
 civilwar_nations = "comorian", "mauritian", "maldivian"
 
 cities =
diff --git a/data/nation/shan.ruleset b/data/nation/shan.ruleset
index 3672747bad..06c348b7f2 100644
--- a/data/nation/shan.ruleset
+++ b/data/nation/shan.ruleset
@@ -1,9 +1,9 @@
 [nation_shan]
 
-name=_("Shan")
-plural=_("?plural:Shans")
-groups="Medieval", "Early Modern", "Asian"
-legend=_("The Shans are an ethnic group related to the Thais and the\
+name   = _("Shan")
+plural = _("?plural:Shans")
+groups = "Medieval", "Early Modern", "Asian"
+legend = _("The Shans are an ethnic group related to the Thais and the\
  Laotians. After the fall of the Burmese dominated Bagan Kingdom to the\
  Mongols in 1287, a succession of Shan kingdoms known by historians\
  as the Shan States controlled much of today's Myanmar, Laos, Thailand,\
@@ -18,15 +18,15 @@ leaders = {
  "Sawlon",              "Male"
 }
 
-flag="shan"
-flag_alt="-"
+flag = "shan"
+flag_alt = "-"
 style = "Asian"
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
-civilwar_nations="Assamese", "Laotian", "Thai"
+civilwar_nations = "Assamese", "Laotian", "Thai"
 
 cities =
 ; /* Historical polities; in most cases also modern settlements */
diff --git a/data/nation/shawnee.ruleset b/data/nation/shawnee.ruleset
index 1fa1793a75..179beb7b6c 100644
--- a/data/nation/shawnee.ruleset
+++ b/data/nation/shawnee.ruleset
@@ -1,22 +1,23 @@
-[nation_shawnee] 
+[nation_shawnee]
 
-name=_("Shawnee") 
-plural=_("?plural:Shawnee") 
-groups="American" 
-legend=_("An Algonquian people, the Shawnee were led by Tikamthi (better\
+name   = _("Shawnee")
+plural = _("?plural:Shawnee")
+groups = "American"
+legend = _("An Algonquian people, the Shawnee were led by Tikamthi (better\
  known as Tecumseh) and his brother Tenskwatawa in trying to create a\
  pan-native alliance against American expansionism but were ultimately\
  unsuccessful and made to resettle in the Indian Territory (modern Oklahoma).")
 
 leaders = {
- "name",                "sex"
-"Paxinos",              "Male"
-"Tenskwatawa",          "Male"
-"Tikamthi",             "Male"
-"Nererahhe",            "Male"
-"Waweyapiersenwaw",     "Male"
-"Tanacharison",         "Male"
+ "name",                 "sex"
+ "Paxinos",              "Male"
+ "Tenskwatawa",          "Male"
+ "Tikamthi",             "Male"
+ "Nererahhe",            "Male"
+ "Waweyapiersenwaw",     "Male"
+ "Tanacharison",         "Male"
 }
+
 ruler_titles = {
  "government",      "male_title",            "female_title"
  "Monarchy",        _("Great Chief %s"),     _("?female:Great Chief %s")
@@ -25,33 +26,34 @@ ruler_titles = {
  "Fundamentalism",  _("Shaman %s"),          _("?female:Shaman %s")
 }
 
-flag = "shawnee" 
-flag_alt = "-" 
-style = "Celtic" 
+flag = "shawnee"
+flag_alt = "-"
+style = "Celtic"
+
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
-init_techs="" 
-init_buildings="" 
-init_units="" 
-civilwar_nations="iroquois", "anishinaabe", "cree" 
+civilwar_nations = "iroquois", "anishinaabe", "cree"
 
-cities = 
-"Chalahgawtha", 
-"Kittanning", 
-"Shamokin", 
-"Sonnioto", 
-"Chalahgawtha", ; Chillicothe 
-"Wakatomika", 
-"Kagoughsage", 
-"Kymulga", 
-"Wakatawicks", 
-"Mequachake", 
-"Sawanogi", 
-"Piqua", 
-"Peixtan", 
-"Nawake", 
-"Wapaughkonetta", 
-"Kickenapawling", 
-"Conedogwinit", 
-"Scoutash", 
-"Chililisuagi", 
-"Wakarusa"
+cities =
+ "Chalahgawtha",
+ "Kittanning",
+ "Shamokin",
+ "Sonnioto",
+ "Chalahgawtha", ; Chillicothe
+ "Wakatomika",
+ "Kagoughsage",
+ "Kymulga",
+ "Wakatawicks",
+ "Mequachake",
+ "Sawanogi",
+ "Piqua",
+ "Peixtan",
+ "Nawake",
+ "Wapaughkonetta",
+ "Kickenapawling",
+ "Conedogwinit",
+ "Scoutash",
+ "Chililisuagi",
+ "Wakarusa"
diff --git a/data/nation/sherpa.ruleset b/data/nation/sherpa.ruleset
index c9697c14ca..0dcefe9572 100644
--- a/data/nation/sherpa.ruleset
+++ b/data/nation/sherpa.ruleset
@@ -1,9 +1,9 @@
 [nation_sherpa]
 
-name=_("Sherpa")
-plural=_("?plural:Sherpas")
-groups="Asian", "Early Modern"
-legend=_("Sherpas are an ethnic group who settled in the Himalaya region\
+name   = _("Sherpa")
+plural = _("?plural:Sherpas")
+groups = "Asian", "Early Modern"
+legend = _("Sherpas are an ethnic group who settled in the Himalaya region\
  of modern-day Nepal in the 15th century. They are of Tibetan stock and\
  speak a language related to modern Tibetan though they are not mutually\
  intelligible. After a few centuries of autonomy, Sherpa communities\
@@ -22,16 +22,16 @@ leaders = {
  "Gegyelpo",               "Male"
 }
 
-flag="sherpa"
-flag_alt="-"
+flag = "sherpa"
+flag_alt = "-"
 style = "Asian"
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
-conflicts_with="Nepali"
-civilwar_nations="Tibetan", "Nepali"
+conflicts_with = "Nepali"
+civilwar_nations = "Tibetan", "Nepali"
 
 cities =
 ; Sherpa villages; Nepali name as comment, if known
diff --git a/data/nation/siberian.ruleset b/data/nation/siberian.ruleset
index b2cbcda7a7..5a4413c96a 100644
--- a/data/nation/siberian.ruleset
+++ b/data/nation/siberian.ruleset
@@ -1,9 +1,9 @@
-[nation_siberian] 
+[nation_siberian]
 
-name=_("Siberian") 
-plural=_("?plural:Siberians") 
-groups="Asian" 
-legend=_("Siberia is a historical and geographical region of Russia and\
+name   = _("Siberian")
+plural = _("?plural:Siberians")
+groups = "Asian"
+legend = _("Siberia is a historical and geographical region of Russia and\
  the USSR. During the reign of the czars separatist sentiments prevailed\
  amongst some Slavic colonists. In 1918 a Siberian Republic was proclaimed\
  but it was annexed by the USSR after only a few months.")
@@ -24,18 +24,18 @@ ruler_titles = {
  "Republic",            _("Governor %s"),  _("?female:Governor %s")
 } 
 
-flag= "siberia" 
-flag_alt = "-" 
-style = "European" 
+flag = "siberia"
+flag_alt = "-"
+style = "European"
 
-init_techs="" 
-init_buildings="" 
-init_units="" 
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
-conflicts_with="sarmatian", "gokturk" ;saka
-civilwar_nations="russian", "tatar", "tuvan", "mongol", "yakut"
+conflicts_with = "sarmatian", "gokturk" ;saka
+civilwar_nations = "russian", "tatar", "tuvan", "mongol", "yakut"
 
-cities=
+cities =
  "Omsk",
  "Krasnoyarsk",
  "Novosibirsk",
@@ -95,5 +95,3 @@ cities=
  "Kansk",
  "Rubtsovsk",
  "Provideniya"
-
-
diff --git a/data/nation/sicilian.ruleset b/data/nation/sicilian.ruleset
index 828638e064..7a756a9e49 100644
--- a/data/nation/sicilian.ruleset
+++ b/data/nation/sicilian.ruleset
@@ -1,9 +1,9 @@
 [nation_sicilian]
 
-name=_("Sicilian")
-plural=_("?plural:Sicilians")
-groups="Medieval", "Early Modern", "European"
-legend=_("Sicily is the largest island of Italy. It has been ruled by\
+name   = _("Sicilian")
+plural = _("?plural:Sicilians")
+groups = "Medieval", "Early Modern", "European"
+legend = _("Sicily is the largest island of Italy. It has been ruled by\
  Greeks, Carthaginians, Romans, Vandals, Ostrogoths, Byzantines and\
  Arabs. In the 11th century the Normans founded the Kingdom of Sicily\
  which gradually became one of Italy's more powerful states. In 1816 it\
@@ -30,14 +30,14 @@ ruler_titles = {
  "Fundamentalism",  _("Fra %s"),       _("Madre %s")
 }
 
-flag="sicily"
+flag = "sicily"
 flag_alt = "-"
 style = "Classical"
 
-init_techs=""
-init_buildings=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
-init_units=""
 civilwar_nations = "neapolitan", "maltese"
 
 cities =
diff --git a/data/nation/sierraleonean.ruleset b/data/nation/sierraleonean.ruleset
index 322dff94dc..717230129e 100644
--- a/data/nation/sierraleonean.ruleset
+++ b/data/nation/sierraleonean.ruleset
@@ -1,9 +1,9 @@
 [nation_sierraleonean]
 
-name=_("Sierra Leonean")
-plural=_("?plural:Sierra Leoneans")
-groups="African", "Modern"
-legend=_("Sierra Leone is a country in West Africa. It was founded in\
+name   = _("Sierra Leonean")
+plural = _("?plural:Sierra Leoneans")
+groups = "African", "Modern"
+legend = _("Sierra Leone is a country in West Africa. It was founded in\
  1792 as a home for liberated slaves and quickly passed to become a\
  British dependency. Sierra Leone has been an independent republic since\
  1961. In the 1990s the country passed through a civil war. Today, Sierra\
@@ -24,13 +24,13 @@ leaders = {
  "Valentine Strasser",     "Male"
 }
 
-flag="sierra_leone"
+flag = "sierra_leone"
 flag_alt = "-"
 style = "tropical"
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
 civilwar_nations = "liberian", "fulani"
 
diff --git a/data/nation/sikh.ruleset b/data/nation/sikh.ruleset
index df2cddd3da..bb6e8b6621 100644
--- a/data/nation/sikh.ruleset
+++ b/data/nation/sikh.ruleset
@@ -1,9 +1,9 @@
 [nation_sikh]
 
-name=_("Sikh")
-plural=_("?plural:Sikhs")
-groups="Asian", "Early Modern"
-legend=_("Sikhs are the followers of a monotheistic religion originating\
+name   = _("Sikh")
+plural = _("?plural:Sikhs")
+groups = "Asian", "Early Modern"
+legend = _("Sikhs are the followers of a monotheistic religion originating\
  from the Indian Subcontinent in the 15th century. The Punjab, on the\
  border of Pakistan and India, is the heartland of Sikhism. In the 19th\
  century a Sikh Empire existed in the region.")
@@ -38,110 +38,109 @@ flag = "sikh"
 flag_alt = "-"
 style = "Babylonian"
 
-init_techs=""
-init_buildings=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
-init_units=""
 conflicts_with = "chola"
 civilwar_nations = "afghani", "pakistani", "indian"
 
 cities =
-"Amritsar",
-"Lahore",
-"Gujranwala",
-"Bathinda",
-"Chandigarh",
-"Jalandhar",
-"Ludhiana",
-"Patiala",
-"Rawalpindi",
-"Jatoi",
-"Chiniot",
-"Firoza",
-"Attock",
-"Khanpur",
-"Talagang",
-"Sheikhupura",
-"Wazirabad",
-"Kamoke",
-"Jampur",
-"Sahiwal",
-"Taxila",
-"Chakwal",
-"Okara",
-"Ahmadpur East",
-"Toba Tek Singh",
-"Qaidabad",
-"Ahmed Nager Chatha",
-"Sialkot",
-"Jaranwala",
-"Chunian",
-"Kot Addu",
-"Isa Khel",
-"Phalla",
-"Dera Ghazi Khan",
-"Daska",
-"Rabwah",
-"Faisalabad",
-"Kharian",
-"Kasur",
-"Lodhran",
-"Bhakkar",
-"Baghalchur",
-"Rahimyar Khan",
-"Rojhan",
-"Multan",
-"Haroonabad",
-"Renala Khurd",
-"Nurpur",
-"Samundri",
-"Bahawalnagar",
-"Sadiqabad",
-"Choa Saidan Shah",
-"Mithankot",
-"Dhaular",
-"Rajanpur",
-"Gujar Khan",
-"Yazman",
-"Dunyapur",
-"Chaubara",
-"Gojra",
-"Burewala",
-"Pasrur",
-"Jahania",
-"Karor",
-"Bhalwal",
-"Vihari",
-"Jhang Sadar",
-"Pakpattan",
-"Dinga",
-"Kamalia",
-"Jand",
-"Jhelum",
-"Kalur Kot",
-"Muzaffargarh",
-"Shahpur",
-"Gujrat",
-"Dipalpur",
-"Shakargarh",
-"Fatehjang",
-"Sargodha",
-"Hasilpur",
-"Leiah",
-"Pind Dadan Khan",
-"Shaher Sultan",
-"Hafizabad",
-"Liaqatpur",
-"Wah",
-"Mandi Burewala",
-"Mianwali",
-"Khushab",
-"Mailsi",
-"Murree",
-"Arifwala",
-"Khanewal",
-"Narowaal",
-"Chichawatni",
-"Mankera",
-"Bahawalpur"
-
+ "Amritsar",
+ "Lahore",
+ "Gujranwala",
+ "Bathinda",
+ "Chandigarh",
+ "Jalandhar",
+ "Ludhiana",
+ "Patiala",
+ "Rawalpindi",
+ "Jatoi",
+ "Chiniot",
+ "Firoza",
+ "Attock",
+ "Khanpur",
+ "Talagang",
+ "Sheikhupura",
+ "Wazirabad",
+ "Kamoke",
+ "Jampur",
+ "Sahiwal",
+ "Taxila",
+ "Chakwal",
+ "Okara",
+ "Ahmadpur East",
+ "Toba Tek Singh",
+ "Qaidabad",
+ "Ahmed Nager Chatha",
+ "Sialkot",
+ "Jaranwala",
+ "Chunian",
+ "Kot Addu",
+ "Isa Khel",
+ "Phalla",
+ "Dera Ghazi Khan",
+ "Daska",
+ "Rabwah",
+ "Faisalabad",
+ "Kharian",
+ "Kasur",
+ "Lodhran",
+ "Bhakkar",
+ "Baghalchur",
+ "Rahimyar Khan",
+ "Rojhan",
+ "Multan",
+ "Haroonabad",
+ "Renala Khurd",
+ "Nurpur",
+ "Samundri",
+ "Bahawalnagar",
+ "Sadiqabad",
+ "Choa Saidan Shah",
+ "Mithankot",
+ "Dhaular",
+ "Rajanpur",
+ "Gujar Khan",
+ "Yazman",
+ "Dunyapur",
+ "Chaubara",
+ "Gojra",
+ "Burewala",
+ "Pasrur",
+ "Jahania",
+ "Karor",
+ "Bhalwal",
+ "Vihari",
+ "Jhang Sadar",
+ "Pakpattan",
+ "Dinga",
+ "Kamalia",
+ "Jand",
+ "Jhelum",
+ "Kalur Kot",
+ "Muzaffargarh",
+ "Shahpur",
+ "Gujrat",
+ "Dipalpur",
+ "Shakargarh",
+ "Fatehjang",
+ "Sargodha",
+ "Hasilpur",
+ "Leiah",
+ "Pind Dadan Khan",
+ "Shaher Sultan",
+ "Hafizabad",
+ "Liaqatpur",
+ "Wah",
+ "Mandi Burewala",
+ "Mianwali",
+ "Khushab",
+ "Mailsi",
+ "Murree",
+ "Arifwala",
+ "Khanewal",
+ "Narowaal",
+ "Chichawatni",
+ "Mankera",
+ "Bahawalpur"
diff --git a/data/nation/sikkimese.ruleset b/data/nation/sikkimese.ruleset
index 14799be1aa..f5046d16ac 100644
--- a/data/nation/sikkimese.ruleset
+++ b/data/nation/sikkimese.ruleset
@@ -1,19 +1,19 @@
 [nation_sikkimese]
 
-name=_("Sikkimese")
-plural=_("?plural:Sikkimese")
-groups="Asian", "Medieval", "Early Modern"
-legend=_("Wedged between Nepal and Bhutan, the Himalayan kingdom\
+name   = _("Sikkimese")
+plural = _("?plural:Sikkimese")
+groups = "Asian", "Medieval", "Early Modern"
+legend = _("Wedged between Nepal and Bhutan, the Himalayan kingdom\
  of Sikkim was ruled by a lineage of monarchs known as chogyals for\
  centuries, until becoming the 22nd state of India in 1975.")
 
 leaders = {
- "name",                "sex"
-"Tashi Namgyal",        "Male"
-"Tshudpud Namgyal",     "Male"
-"Pendiongmu",           "Female"
-"Phuntsog Namgyal",     "Male"
-"Khye Bumsa",           "Male"
+ "name",                 "sex"
+ "Tashi Namgyal",        "Male"
+ "Tshudpud Namgyal",     "Male"
+ "Pendiongmu",           "Female"
+ "Phuntsog Namgyal",     "Male"
+ "Khye Bumsa",           "Male"
 }
 
 ruler_titles = {
@@ -23,15 +23,15 @@ ruler_titles = {
  "Monarchy",        _("Maharaja %s"),  _("Maharani %s")
 }
 
-flag="sikkim"
-flag_alt="-"
+flag = "sikkim"
+flag_alt = "-"
 style = "Asian"
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
-civilwar_nations="Bhutanese", "Nepali", "Indian"
+civilwar_nations = "Bhutanese", "Nepali", "Indian"
 
 cities =
  "Yuksom",
diff --git a/data/nation/silesian.ruleset b/data/nation/silesian.ruleset
index 31503088e4..0f2bee094d 100644
--- a/data/nation/silesian.ruleset
+++ b/data/nation/silesian.ruleset
@@ -1,9 +1,9 @@
 [nation_silesian]
 
-name=_("Silesian")
-plural=_("?plural:Silesians")
-groups="Medieval", "European"
-legend=_("Silesia is a region of southern Poland that was at one time an\
+name   = _("Silesian")
+plural = _("?plural:Silesians")
+groups = "Medieval", "European"
+legend = _("Silesia is a region of southern Poland that was at one time an\
  independent kingdom.")
 
 leaders = {
@@ -23,13 +23,14 @@ ruler_titles = {
  "Fundamentalism",   _("Bishop %s"),        _("Mother Superior %s")
 }
 
-flag="silesia"
+flag = "silesia"
 flag_alt = "-"
 style = "European"
-init_techs=""
-init_buildings=""
 
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
+
 civilwar_nations = "polish", "sorbian", "moravian"
 
 ; if you want your favourite city to be in more prominent place, go ahead
diff --git a/data/nation/singaporean.ruleset b/data/nation/singaporean.ruleset
index 524d1b7676..f899b3edcd 100644
--- a/data/nation/singaporean.ruleset
+++ b/data/nation/singaporean.ruleset
@@ -12,10 +12,10 @@
 ; import trading parters: Japan, Saudi Arabia, U.S.A., Malaysia
 ; above data are for 1986, trying to find newer data
 
-name=_("Singaporean")
-plural=_("?plural:Singaporeans")
-groups="Modern", "Asian"
-legend=_("Singapore is a mercantile city-state located at the southernmost\
+name   = _("Singaporean")
+plural = _("?plural:Singaporeans")
+groups = "Modern", "Asian"
+legend = _("Singapore is a mercantile city-state located at the southernmost\
  tip of the Malaysian Peninsula.")
 
 leaders = {
@@ -32,14 +32,15 @@ ruler_titles = {
  "Monarchy",    _("Sultan %s"),         _("Sultana %s")
 }
 
-flag="singapore"
+flag = "singapore"
 flag_alt = "-"
 style = "Asian"
 
-init_techs=""
-init_buildings=""
-init_units=""
-civilwar_nations="malaysian"
+init_techs = ""
+init_buildings = ""
+init_units = ""
+
+civilwar_nations = "malaysian"
 
 cities =
   "Singapore", "Esplanade", "Tumasik", "Raffles Place", "Keppel", "Chinatown",
diff --git a/data/nation/singlebarbarian.ruleset b/data/nation/singlebarbarian.ruleset
index 91d02619fe..4d0390aa11 100644
--- a/data/nation/singlebarbarian.ruleset
+++ b/data/nation/singlebarbarian.ruleset
@@ -1,11 +1,11 @@
 [nation_barbarian]
 
-translation_domain="freeciv"
+translation_domain = "freeciv"
 
-name=_("Barbarian")
-plural=_("?plural:Barbarians")
-groups="Core", "Barbarian"
-legend=_("Since the dawn of civilization, barbarians have been a threat to\
+name   = _("Barbarian")
+plural = _("?plural:Barbarians")
+groups = "Core", "Barbarian"
+legend = _("Since the dawn of civilization, barbarians have been a threat to\
  cultured peoples everywhere.")
 
 leaders = {
@@ -22,9 +22,9 @@ flag     = "pirate"
 flag_alt = "barbarian"
 style    = "European"
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
 cities = "Barbaricum"
 
diff --git a/data/nation/sinhalese.ruleset b/data/nation/sinhalese.ruleset
index 0455900f7b..374082c650 100644
--- a/data/nation/sinhalese.ruleset
+++ b/data/nation/sinhalese.ruleset
@@ -1,10 +1,10 @@
 [nation_sinhalese]
 
-name=_("Sinhalese")
-plural=_("?plural:Sinhalese")
-groups="Asian", "Ancient", "Medieval"
+name   = _("Sinhalese")
+plural = _("?plural:Sinhalese")
+groups = "Asian", "Ancient", "Medieval"
 
-legend=_("The Sinhalese people of Sri Lanka trace their ancestry to\
+legend = _("The Sinhalese people of Sri Lanka trace their ancestry to\
  the semi-legendary Prince Vijaya who settled the island of Sri Lanka\
  together with 700 followers in 543 BCE.")
 
@@ -25,16 +25,16 @@ ruler_titles = {
  "Despotism",    _("Prince %s"),           _("Princess %s")
 }
 
-flag="sinhalese"
-flag_alt="-"
+flag = "sinhalese"
+flag_alt = "-"
 style = "Asian"
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
-conflicts_with="Lankese"
-civilwar_nations="Chola", "Gupta"
+conflicts_with = "Lankese"
+civilwar_nations = "Chola", "Gupta"
 
 cities =
  "Anuradhapura",
diff --git a/data/nation/sioux.ruleset b/data/nation/sioux.ruleset
index 349a834df6..5a2b9dc5ae 100644
--- a/data/nation/sioux.ruleset
+++ b/data/nation/sioux.ruleset
@@ -1,11 +1,11 @@
 [nation_sioux]
 
-translation_domain="freeciv"
+translation_domain = "freeciv"
 
-name=_("Sioux")
-plural=_("?plural:Sioux")
-groups="Medieval", "American", "Core"
-legend=_("The Sioux was a North American nation that fought several\
+name   = _("Sioux")
+plural = _("?plural:Sioux")
+groups = "Medieval", "American", "Core"
+legend = _("The Sioux was a North American nation that fought several\
  decisive battles against the United States. It consisted of three distinct\
  groups of tribes: the Lakota, the Dakota and the Nakota.")
 
@@ -32,13 +32,14 @@ ruler_titles = {
  "Fundamentalism",  _("Shaman %s"),          _("?female:Shaman %s")
 }
 
-flag="cheyenne"
+flag = "cheyenne"
 flag_alt = "-"
 style = "Celtic"
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
+
 civilwar_nations = "iroquois", "hopi", "cree"
 
 ; City names are tribes. List based on data from this page:
diff --git a/data/nation/slavic.ruleset b/data/nation/slavic.ruleset
index af96ef9dbd..90ad64c431 100644
--- a/data/nation/slavic.ruleset
+++ b/data/nation/slavic.ruleset
@@ -1,6 +1,6 @@
 [nation_slavic]
 
-name = _("Slavic")
+name   = _("Slavic")
 plural = _("?plural:Slavs")
 groups = "Ancient", "European"
 legend = _("The Slavs are a modern linguistic group of several nations in\
diff --git a/data/nation/slovakian.ruleset b/data/nation/slovakian.ruleset
index ad47c5cad3..269bfc3b07 100644
--- a/data/nation/slovakian.ruleset
+++ b/data/nation/slovakian.ruleset
@@ -1,9 +1,9 @@
 [nation_slovak]
 
-name=_("Slovakian")
-plural=_("?plural:Slovakians")
-groups="Medieval", "Modern", "European"
-legend=_("Slovakia is a country in the heart of Europe. Formerly part of\
+name   = _("Slovakian")
+plural = _("?plural:Slovakians")
+groups = "Medieval", "Modern", "European"
+legend = _("Slovakia is a country in the heart of Europe. Formerly part of\
  Czechoslovakia, until 1918 it was part of the Austro-Hungarian Empire.")
 
 leaders = {
@@ -25,15 +25,16 @@ ruler_titles = {
  "Communism",   _("General Secretary %s"), _("?female:General Secretary %s")
 }
 
-flag="slovakia"
+flag = "slovakia"
 flag_alt = "-" ; former CzechoSlovakia has the same flag as Czech
                ; - the blue triangle in it means Slovakia
 style = "European"
 
-init_techs=""
-init_buildings=""
-init_units=""
-civilwar_nations="hungarian", "rusyn"
+init_techs = ""
+init_buildings = ""
+init_units = ""
+
+civilwar_nations = "hungarian", "rusyn"
 
 cities =
  "Bratislava",
diff --git a/data/nation/slovenian.ruleset b/data/nation/slovenian.ruleset
index bd9259dc6c..f61d02318b 100644
--- a/data/nation/slovenian.ruleset
+++ b/data/nation/slovenian.ruleset
@@ -1,9 +1,9 @@
 [nation_slovenian]
 
-name=_("Slovenian")
-plural=_("?plural:Slovenians")
-groups="Medieval", "Modern", "European"
-legend=_("Slovenia was the most western and northern republic of the old\
+name   = _("Slovenian")
+plural = _("?plural:Slovenians")
+groups = "Medieval", "Modern", "European"
+legend = _("Slovenia was the most western and northern republic of the old\
  Yugoslav Federation.")
 
 leaders = {
@@ -13,21 +13,23 @@ leaders = {
  "Kocelj",              "Male"
  "Primož Trubar",       "Male"
 }
+
 ruler_titles = {
  "government",      "male_title",      "female_title"
  "Despotism",       _("Ban %s"),       _("?female:Ban %s")
  "Fundamentalism",  _("Bishop %s"),    _("Mother Superior %s")
 }
-flag="slovenia"
+
+flag = "slovenia"
 flag_alt = "-"
 style = "European"
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
 ; Chain of similar flags: Previously "russian"
-conflicts_with="slovakian"
+conflicts_with = "slovakian"
 civilwar_nations = "serbian"
 
 cities =
diff --git a/data/nation/solomonislander.ruleset b/data/nation/solomonislander.ruleset
index 6f3d7b177c..a99a8b9a6f 100644
--- a/data/nation/solomonislander.ruleset
+++ b/data/nation/solomonislander.ruleset
@@ -1,9 +1,9 @@
 [nation_solomonislander]
 
-name = _("Solomon Islander")
+name   = _("Solomon Islander")
 plural = _("?plural:Solomon Islanders")
-groups="Oceanian", "Modern"
-legend=_("Solomon Islands is a country in Melanesia, located between\
+groups = "Oceanian", "Modern"
+legend = _("Solomon Islands is a country in Melanesia, located between\
  Papua New Guinea and Vanuatu. Inhabited by Austronesian peoples since\
  4000 BCE, the islands became a British protectorate in the 19th century.\
  The islands were the site of some fierce fighting during World War II,\
@@ -23,11 +23,11 @@ flag = "solomon_islands"
 flag_alt = "-"
 style = "Tropical"
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
-civilwar_nations="papua new guinean", "vanuatuan"
+civilwar_nations = "papua new guinean", "vanuatuan"
 
 cities =
  "Honiara",
diff --git a/data/nation/somali.ruleset b/data/nation/somali.ruleset
index 2d24a69576..37849b077e 100644
--- a/data/nation/somali.ruleset
+++ b/data/nation/somali.ruleset
@@ -1,9 +1,9 @@
-[nation_somali] 
+[nation_somali]
 
-name=_("Somali") 
-plural=_("?plural:Somalis") 
-groups="Medieval", "Early Modern", "Modern", "African"
-legend=_("Somalia is a country in the Horn of Africa. In ancient times\
+name   = _("Somali")
+plural = _("?plural:Somalis")
+groups = "Medieval", "Early Modern", "Modern", "African"
+legend = _("Somalia is a country in the Horn of Africa. In ancient times\
  Somalia was a trading hub. At the end of the 19th century it was\
  colonized by Britain and Italy. Somalia regained its independence in\
  1960. The military under general Siad Barre seized power in 1969. Siad\
@@ -36,17 +36,17 @@ ruler_titles = {
  "Despotism",       _("Sheikh %s"),    _("Shaykha %s")
 }
 
-flag= "somalia" 
-flag_alt = "arab" 
-style = "Tropical" 
+flag = "somalia"
+flag_alt = "arab"
+style = "Tropical"
 
-init_techs="" 
-init_buildings="" 
-init_units="" 
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
 civilwar_nations = "yemeni", "djiboutian", "somaliland"
 
-cities = 
+cities =
  "Muqdisho",
  "Hargeysa",
  "Marka",
@@ -98,4 +98,3 @@ cities =
  "Saylac",
  "Xarardheere",
  "Xudur"
-
diff --git a/data/nation/somaliland.ruleset b/data/nation/somaliland.ruleset
index 95c27433a2..8853b8353d 100644
--- a/data/nation/somaliland.ruleset
+++ b/data/nation/somaliland.ruleset
@@ -1,9 +1,9 @@
-[nation_somaliland] 
+[nation_somaliland]
 
-name=_("Somaliland") 
-plural=_("?plural:Somalilanders") 
-groups="Modern", "African"
-legend=_("The Republic of Somaliland is an unrecognized state in Northern\
+name   = _("Somaliland")
+plural = _("?plural:Somalilanders")
+groups = "Modern", "African"
+legend = _("The Republic of Somaliland is an unrecognized state in Northern\
  Somalia, roughly concurrent with former British Somaliland. It declared\
  independence upon the collapse of Somalia in 1991. Although it enjoys\
  more stability and a somewhat higher standard of living than the rest of\
@@ -25,13 +25,13 @@ ruler_titles = {
  "Despotism",       _("Sheikh %s"),    _("Shaykha %s")
 }
 
-flag= "somaliland" 
-flag_alt = "somalia" 
-style = "Tropical" 
+flag = "somaliland"
+flag_alt = "somalia"
+style = "Tropical"
 
-init_techs="" 
-init_buildings="" 
-init_units="" 
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
 civilwar_nations = "somali"
 
diff --git a/data/nation/songhai.ruleset b/data/nation/songhai.ruleset
index 2afdce6b45..734bc1e3bd 100644
--- a/data/nation/songhai.ruleset
+++ b/data/nation/songhai.ruleset
@@ -1,11 +1,11 @@
 [nation_songhai]
 
-translation_domain="freeciv"
+translation_domain = "freeciv"
 
-name=_("Songhai")
-plural=_("?plural:Songhai")
-groups="Medieval", "African", "Core"
-legend=_("The Songhai people established a state in the 11th century CE\
+name   = _("Songhai")
+plural = _("?plural:Songhai")
+groups = "Medieval", "African", "Core"
+legend = _("The Songhai people established a state in the 11th century CE\
  centered on the city of Gao. Following the decline of the Mali empire\
  a few hundred years later, the Songhai established an empire of their own\
  which eventually grew to become one of the largest in the history of\
@@ -21,19 +21,21 @@ leaders = {
  "Sonni Ali",                   "Male"
  "Sunni Silman Dandi",          "Male"
 }
+
 ruler_titles = {
  "government",      "male_title",      "female_title"
  "Fundamentalism",  _("Caliph %s"),    _("Calipha %s")
  "Monarchy",        _("Mansa %s"),     _("?female:Mansa %s")
 }
 
-flag="songhai"
-flag_alt="-"
+flag = "songhai"
+flag_alt = "-"
 style = "Tropical"
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
+
 conflicts_with = "Malian", "Nigerien"
 civilwar_nations = "Nigerien", "Burkinabe"
 
@@ -61,4 +63,3 @@ cities =
  "Karabara",
  "Ras el Ma",
  "Hombori"
-
diff --git a/data/nation/sorbian.ruleset b/data/nation/sorbian.ruleset
index bc3cbf2faf..e99915eccc 100644
--- a/data/nation/sorbian.ruleset
+++ b/data/nation/sorbian.ruleset
@@ -1,9 +1,9 @@
-[nation_sorbian] 
+[nation_sorbian]
 
-name=_("Sorbian") 
-plural=_("?plural:Sorbs") 
-groups="Medieval", "European" 
-legend=_("The Sorbs are West Slavic people living in the East of Germany\
+name   = _("Sorbian")
+plural = _("?plural:Sorbs")
+groups = "Medieval", "European"
+legend = _("The Sorbs are West Slavic people living in the East of Germany\
  in Eastern Saxony and Southern Brandenburg (Lusatia).\
  The region has historically been associated with Poland and Bohemia.")
 
@@ -27,17 +27,17 @@ ruler_titles = {
  "Republic",      _("Burgomaster %s"), _("?female:Burgomaster %s")
 } 
 
-flag= "lusatia" 
-flag_alt = "-" 
-style = "Celtic" 
+flag = "lusatia"
+flag_alt = "-"
+style = "Celtic"
 
-init_techs="" 
-init_buildings="" 
-init_units="" 
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
-civilwar_nations= "saxon", "polish", "czech"
+civilwar_nations = "saxon", "polish", "czech"
 
-cities=
+cities =
   "Chóśebuz",                ;Cottbus
   "Budyšin",                 ;Bautzen
   "Kamjenc",
diff --git a/data/nation/sotho.ruleset b/data/nation/sotho.ruleset
index a13b8651d4..34d328d9ad 100644
--- a/data/nation/sotho.ruleset
+++ b/data/nation/sotho.ruleset
@@ -1,9 +1,9 @@
 [nation_sotho]
 
-name=_("Sotho")
-plural=_("?plural:Basotho")
-groups="African"
-legend=_("A Bantu people in Southern Africa, the ancestors of the Basotho\
+name   = _("Sotho")
+plural = _("?plural:Basotho")
+groups = "African"
+legend = _("A Bantu people in Southern Africa, the ancestors of the Basotho\
  first arrived in the region by the end of the first millennium CE. The\
  Basotho first formed a unified polity in the early 19th century under\
  king Moshoeshoe I. Today, there are about 2 million Sotho in the Kingdom\
@@ -21,15 +21,15 @@ leaders = {
  "Kenneth Mopeli",           "Male"
 }
 
-flag="lesotho_old"
+flag = "lesotho_old"
 flag_alt = "-"
 style = "Celtic"
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
-civilwar_nations="tswana", "lesothoan", "south african"
+civilwar_nations = "tswana", "lesothoan", "south african"
 
 cities =
 ;alternating cities in Lesotho and South Africa
diff --git a/data/nation/southafrican.ruleset b/data/nation/southafrican.ruleset
index d55d0de4b9..a94bee16a4 100644
--- a/data/nation/southafrican.ruleset
+++ b/data/nation/southafrican.ruleset
@@ -1,9 +1,9 @@
 [nation_southafrican]
 
-name=_("South African")
-plural=_("?plural:South Africans")
-groups="Modern", "African"
-legend=_("Dutch settlers began colonizing southern Africa in the 17th\
+name   = _("South African")
+plural = _("?plural:South Africans")
+groups = "Modern", "African"
+legend = _("Dutch settlers began colonizing southern Africa in the 17th\
  century. After many wars between primarily Boers (descendants of Dutch\
  settlers), British forces and Zulus, the Union of South Africa was created\
  in 1910. The South African government became notorious for its\
@@ -19,20 +19,22 @@ leaders = {
  "J.C. Smuts",          "Male"
  "H.F. Verwoerd",       "Male"
 }
+
 ruler_titles = {
  "government",     "male_title",       "female_title"
  "Fundamentalism", _("Archbishop %s"), _("?female:Archbishop %s")
 } 
-flag="south_africa"
+
+flag = "south_africa"
 flag_alt = "-"
 style = "Tropical"
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
-conflicts_with="boer", "zulu", "xhosa", "venda", "sotho", "tswana"
-civilwar_nations="boer", "zulu", "xhosa", "venda", "namibian", "sotho", "tswana"
+conflicts_with = "boer", "zulu", "xhosa", "venda", "sotho", "tswana"
+civilwar_nations = "boer", "zulu", "xhosa", "venda", "namibian", "sotho", "tswana"
 
 ; The three capitals at top and the rest in order of population as of 2005
 ; http://de.wikipedia.org/wiki/Liste_der_Städte_in_Südafrika
diff --git a/data/nation/southamerican.ruleset b/data/nation/southamerican.ruleset
index 5497a33171..21633472c1 100644
--- a/data/nation/southamerican.ruleset
+++ b/data/nation/southamerican.ruleset
@@ -1,9 +1,9 @@
 [nation_southamerican]
 
-name=_("South American")
-plural=_("?plural:South Americans")
-groups= "Imaginary"
-legend=_("The Union of South American Nations was formed in 2008, modeled\
+name   = _("South American")
+plural = _("?plural:South Americans")
+groups = "Imaginary"
+legend = _("The Union of South American Nations was formed in 2008, modeled\
  after the European Union, but panamericanism has already existed since\
  the 19th century.")
 
@@ -21,17 +21,20 @@ ruler_titles = {
  "Fundamentalism",  _("Archbishop %s"),    _("Madre %s")
 }
 
-flag="unasur"
+flag = "unasur"
 flag_alt = "-"
 style = "European"
 
-init_techs=""
-init_buildings=""
-init_units=""
-conflicts_with="argentine", "bolivian", "brazilian", "chilean", "colombian",
- "ecuadorian", "guyanese", "paraguayan", "peruvian", "surinamese", "uruguayan", "venezuelan"
+init_techs = ""
+init_buildings = ""
+init_units = ""
+
+conflicts_with = "argentine", "bolivian", "brazilian", "chilean", "colombian",
+ "ecuadorian", "guyanese", "paraguayan", "peruvian", "surinamese", "uruguayan",
+ "venezuelan"
 civilwar_nations = "argentine", "bolivian", "brazilian", "chilean", "colombian",
- "ecuadorian", "guyanese", "paraguayan", "peruvian", "surinamese", "uruguayan", "venezuelan"
+ "ecuadorian", "guyanese", "paraguayan", "peruvian", "surinamese", "uruguayan",
+ "venezuelan"
 
 cities=
 ; Sites of Uasur institutions
diff --git a/data/nation/southkorean.ruleset b/data/nation/southkorean.ruleset
index d0934d9f71..8a34e07a71 100644
--- a/data/nation/southkorean.ruleset
+++ b/data/nation/southkorean.ruleset
@@ -1,9 +1,9 @@
 [nation_southkorean]
 
-name=_("South Korean")
-plural=_("?plural:South Koreans")
-groups="Modern", "Asian"
-legend=_("Formerly the site of a unified Korean state, the Korean\
+name   = _("South Korean")
+plural = _("?plural:South Koreans")
+groups = "Modern", "Asian"
+legend = _("Formerly the site of a unified Korean state, the Korean\
  peninsula is today divided into two states - North and South Korea -\
  as a result of the stalemate after the Korean War in 1953. The South\
  Korean government was formed from the nationalist and anti-communist\
@@ -19,13 +19,13 @@ leaders = {
  "Park Geun-hye",       "Female"
 }
 
-flag="korea"
+flag = "korea"
 flag_alt = "-"
 style = "Asian"
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
 civilwar_nations = "North Korean"
 
diff --git a/data/nation/southsudanese.ruleset b/data/nation/southsudanese.ruleset
index b7cf4b2d01..7ccae68d1f 100644
--- a/data/nation/southsudanese.ruleset
+++ b/data/nation/southsudanese.ruleset
@@ -1,9 +1,9 @@
 [nation_southsudanese]
 
-name=_("South Sudanese")
-plural=_("?plural:South Sudanese")
-groups="Modern", "African"
-legend=_("A long civil war pitted Southern Sudan, inhabited mostly by black\
+name   = _("South Sudanese")
+plural = _("?plural:South Sudanese")
+groups = "Modern", "African"
+legend = _("A long civil war pitted Southern Sudan, inhabited mostly by black\
  Africans and predominantly Animist and Christian, against the Muslim and\
  Arab North. The war left two million dead and many more displaced until a\
  ceasefire was signed in 2005. Southern Sudan achieved full independence\
@@ -17,14 +17,15 @@ leaders = {
  "Salva Kiir Mayardit",        "Male"
 }
 
-flag="southern_sudan"
+flag = "southern_sudan"
 flag_alt = "-"
 style = "Tropical"
 
-init_techs=""
-init_buildings=""
-init_units=""
-civilwar_nations="sudanese", "ugandan"
+init_techs = ""
+init_buildings = ""
+init_units = ""
+
+civilwar_nations = "sudanese", "ugandan"
 
 cities =
  "Juba",
diff --git a/data/nation/southvietnamese.ruleset b/data/nation/southvietnamese.ruleset
index 3334efe404..7cbc3247ed 100644
--- a/data/nation/southvietnamese.ruleset
+++ b/data/nation/southvietnamese.ruleset
@@ -1,9 +1,9 @@
 [nation_southvietnamese]
 
-name=_("South Vietnamese")
-plural=_("?plural:South Vietnamese")
-groups="Asian"
-legend=_("South Vietnam, officially the Republic of Vietnam, was the\
+name   = _("South Vietnamese")
+plural = _("?plural:South Vietnamese")
+groups = "Asian"
+legend = _("South Vietnam, officially the Republic of Vietnam, was the\
  American-backed state during the Vietnam War. The country was reunited\
  with North Vietnam after it was conquered by communist forces in 1975.")
 
@@ -25,13 +25,14 @@ ruler_titles = {
  "Monarchy",        _("Emperor %s"),      _("Empress %s")
 }
 
-flag="rvn"
+flag = "rvn"
 flag_alt = "vietnam"
 style = "Asian"
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
+
 conflicts_with = "badian", "catalan" ;similar flags , "cham"
 civilwar_nations = "vietnamese"
 
diff --git a/data/nation/southyemeni.ruleset b/data/nation/southyemeni.ruleset
index 38b868d8f8..5c5a169101 100644
--- a/data/nation/southyemeni.ruleset
+++ b/data/nation/southyemeni.ruleset
@@ -1,9 +1,9 @@
 [nation_southyemeni]
 
-name=_("South Yemeni")
-plural=_("?plural:South Yemenis")
-groups="Asian"
-legend=_("The area around Aden was colonized by the British in 1839.\
+name   = _("South Yemeni")
+plural = _("?plural:South Yemenis")
+groups = "Asian"
+legend = _("The area around Aden was colonized by the British in 1839.\
  South Yemen declared independence in 1967 and joined the communist bloc.\
  It was united with North Yemen in 1990.")
 
@@ -23,13 +23,14 @@ ruler_titles = {
  "Monarchy",       _("Sultan %s"),         _("Sultana %s")
 }
 
-flag="south_yemen"
+flag = "south_yemen"
 flag_alt = "-"
 style = "Babylonian"
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
+
 conflicts_with = "himyarite"
 civilwar_nations = "yemeni"
 
diff --git a/data/nation/soviet.ruleset b/data/nation/soviet.ruleset
index 425cd99803..d80f04b485 100644
--- a/data/nation/soviet.ruleset
+++ b/data/nation/soviet.ruleset
@@ -1,9 +1,9 @@
 [nation_soviet]
 
-name=_("Soviet")
-plural=_("?plural:Soviets")
-groups="European", "Asian"
-legend=_("The history of the Soviet Union starts in November 1917,\
+name   = _("Soviet")
+plural = _("?plural:Soviets")
+groups = "European", "Asian"
+legend = _("The history of the Soviet Union starts in November 1917,\
  when under Lenin's leadership a Bolshevik revolution occurred.\
  On December 31 1922, four Soviet republics integrated into one\
  country. The Soviet Union became one of the most powerful states in\
@@ -30,13 +30,13 @@ ruler_titles = {
  "Monarchy",    _("Great Leader %s"),        _("?female:Great Leader %s")
 }
 
-flag="soviet"
+flag = "soviet"
 flag_alt = "-"
 style = "European"
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
 conflicts_with = "Russian", "Moldovan", "Kazakh", "Kyrgyz", "Tajik",
  "Turkmen", "Uzbek"
diff --git a/data/nation/spanish.ruleset b/data/nation/spanish.ruleset
index 9769076205..7e44197895 100644
--- a/data/nation/spanish.ruleset
+++ b/data/nation/spanish.ruleset
@@ -1,18 +1,18 @@
 [nation_spanish]
 
-translation_domain="freeciv"
+translation_domain = "freeciv"
 
-name=_("Spanish")
-plural=_("?plural:Spanish")
-groups="Early Modern", "Modern", "European", "Core"
-legend=_("The modern Spanish nation was formed when the rulers of the\
+name   = _("Spanish")
+plural = _("?plural:Spanish")
+groups = "Early Modern", "Modern", "European", "Core"
+legend = _("The modern Spanish nation was formed when the rulers of the\
  kingdoms of Castile and Aragon led the recapture of the Iberian\
  peninsula from the Moslems. The Reconquista was completed in 1492,\
  the same year Columbus sailed. Spain then went on to create an empire\
  on which the sun never set.")
 
 leaders = {
- "name",                         "sex" 
+ "name",                         "sex"
  "Pelayo",                       "Male"
  "Rodrigo Díaz de Vivar",        "Male"
  "Alfonso el Sabio",             "Male"
@@ -43,17 +43,17 @@ ruler_titles = {
  "Fundamentalism", _("Cardinal %s"),       _("Mother Superior %s")
 }
 
-flag="spain"
+flag = "spain"
 flag_alt = "-"
 style = "Classical"
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
-conflicts_with="aragonese", "asturian", "castilian", "galician", "leonese"
+conflicts_with = "aragonese", "asturian", "castilian", "galician", "leonese"
 
-civilwar_nations=
+civilwar_nations =
 ; Sub-national nations
  "aragonese", "asturian", "basque", "castilian", "catalan", "galician",
  "leonese",
diff --git a/data/nation/srivijaya.ruleset b/data/nation/srivijaya.ruleset
index 23c8aed446..2664f0578f 100644
--- a/data/nation/srivijaya.ruleset
+++ b/data/nation/srivijaya.ruleset
@@ -1,8 +1,8 @@
 [nation_srivijaya]
 
-name=_("Sri Vijaya")
-plural=_("?plural:Sri Vijaya")
-groups="Asian", "Medieval"
+name   = _("Sri Vijaya")
+plural = _("?plural:Sri Vijaya")
+groups = "Asian", "Medieval"
 
 legend=_("Sri Vijaya was an empire centered on Palembang in eastern\
  Sumatra and extended its control through much of the coastal regions of\
@@ -30,11 +30,11 @@ flag         = "srivijaya"
 flag_alt     = "-"
 style        = "Tropical"
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
-civilwar_nations="Majapahit", "indonesian", "malaysian"
+civilwar_nations = "Majapahit", "indonesian", "malaysian"
 
 cities =
  "Palembang",
diff --git a/data/nation/sudanese.ruleset b/data/nation/sudanese.ruleset
index 4463b1dc3d..06dddca184 100644
--- a/data/nation/sudanese.ruleset
+++ b/data/nation/sudanese.ruleset
@@ -1,9 +1,9 @@
 [nation_sudanese]
 
-name=_("Sudanese")
-plural=_("?plural:Sudanese")
-groups="Modern", "African"
-legend=_("In 1820 Sudan came under Egyptian rule and later British rule.\
+name   = _("Sudanese")
+plural = _("?plural:Sudanese")
+groups = "Modern", "African"
+legend = _("In 1820 Sudan came under Egyptian rule and later British rule.\
  Sudan became independent in 1956.")
 
 leaders = {
@@ -13,20 +13,23 @@ leaders = {
  "Ibrahim Abboud",              "Male"
  "Omar al-Bashir",              "Male"
 }
+
 ruler_titles = {
  "government",      "male_title",           "female_title"
  "Despotism",       _("%s Pasha"),          _("?female:%s Pasha")
  "Fundamentalism",  _("Mahdi %s"),          _("?female:Mahdi %s")
  "Monarchy",        _("Sultan %s"),         _("Sultana %s")
 }
-flag="sudan"
+
+flag = "sudan"
 flag_alt = "-"
 style = "Classical"
 
-init_techs=""
-init_buildings=""
-init_units=""
-civilwar_nations="south sudanese", "darfuri"
+init_techs = ""
+init_buildings = ""
+init_units = ""
+
+civilwar_nations = "south sudanese", "darfuri"
 
 cities =
  "Al-Khartum",
@@ -35,7 +38,7 @@ cities =
  "Nyala",
  "Al-Qadarif",
  "Atbara",
- "Bur Sudan (ocean)",	; English: "Port Sudan"
+ "Bur Sudan (ocean)",   ; English: "Port Sudan"
  "Wadi Haifa",
  "Kassala",
  "Kusti",
diff --git a/data/nation/suebian.ruleset b/data/nation/suebian.ruleset
index e548f51e0d..dafd2c275d 100644
--- a/data/nation/suebian.ruleset
+++ b/data/nation/suebian.ruleset
@@ -1,9 +1,9 @@
 [nation_suebian]
 
-name=_("Suebian")
-plural=_("?plural:Suebians")
-groups="Ancient", "Medieval", "European"
-legend=_("The Suebians were an ancient West Germanic tribal confederation,\
+name   = _("Suebian")
+plural = _("?plural:Suebians")
+groups = "Ancient", "Medieval", "European"
+legend = _("The Suebians were an ancient West Germanic tribal confederation,\
  which may have been formed by Ariovistus for his expedition to Gaul.\
  The Suebians included the Germanic tribes from the Elbe river basin\
  belonging to the Herminonic language group, such as the Marcomanni and\
@@ -14,6 +14,7 @@ legend=_("The Suebians were an ancient West Germanic tribal confederation,\
  the Vandals and the Alans. They settled in the northwest of the Iberian\
  Peninsula, where they established their own kingdom, which was conquered\
  by the Visigoths in 585 CE.")
+
 leaders = {
  "name",                "sex"
  "Ariovistus",          "Male"        ;probably a suebian chieftain, known in
@@ -40,45 +41,46 @@ leaders = {
  "Andeka",              "Male"
  "Malarik",             "Male"
 }
-flag="suebian"
+
+flag = "suebian"
 flag_alt = "-"
 style = "Celtic"
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
-conflicts_with="spanish", "portuguese", "galician", "asturian", "german",
+conflicts_with = "spanish", "portuguese", "galician", "asturian", "german",
  "czech", "east german", "thuringian"
 civilwar_nations = "Visigothic", "Western Roman"
 
 cities =
- "Bracara Augusta",	;Braga
- "Portus Cale",		;Porto
- "Lucus Augusti",	;Lugo
- "Asturica Augusta",	;Astorga
- "Corunium",		;A Coruña
- "Campus Stellae",	;Santiago de Compostela
- "Conimbriga",		;Coimbra
- "Vicus",		;Vigo
- "Brigantia",		;Bragança
- "Legio",		;León
- "Aquae Urentes",	;Ourense
- "Lamecum",		;Lamego
- "Flavium Brigantium",	;Betanzos
- "Iria Flavia",		;Padrón
- "Tude",		;Tui
- "Pons Veteris",	;Pontevedra
+ "Bracara Augusta",     ; Braga
+ "Portus Cale",         ; Porto
+ "Lucus Augusti",       ; Lugo
+ "Asturica Augusta",    ; Astorga
+ "Corunium",            ; A Coruña
+ "Campus Stellae",      ; Santiago de Compostela
+ "Conimbriga",          ; Coimbra
+ "Vicus",               ; Vigo
+ "Brigantia",           ; Bragança
+ "Legio",               ; León
+ "Aquae Urentes",       ; Ourense
+ "Lamecum",             ; Lamego
+ "Flavium Brigantium",  ; Betanzos
+ "Iria Flavia",         ; Padrón
+ "Tude",                ; Tui
+ "Pons Veteris",        ; Pontevedra
  "Britonia",
- "Viso",		;Viseu
+ "Viso",                ; Viseu
  "Nemetobriga",
- "Aquae Flaviae",	;Chaves
- "Aegitania",		;Idanha
+ "Aquae Flaviae",       ; Chaves
+ "Aegitania",           ; Idanha
  "Aquae Querquennae",
- "Dactonium",		;Monforte de Lemos
- "Lamaecus",		;Lamego
+ "Dactonium",           ; Monforte de Lemos
+ "Lamaecus",            ; Lamego
  "Sabaria",
- "Forum Limicorum",	;Ginzo de Limia
- "Villa Alba",		;Vilalba
- "Querculus",		;O Carballiño
- "Libunca"		;Ribadeo
+ "Forum Limicorum",     ; Ginzo de Limia
+ "Villa Alba",          ; Vilalba
+ "Querculus",           ; O Carballiño
+ "Libunca"              ; Ribadeo
diff --git a/data/nation/sumerian.ruleset b/data/nation/sumerian.ruleset
index 15129701e7..4da6c517a2 100644
--- a/data/nation/sumerian.ruleset
+++ b/data/nation/sumerian.ruleset
@@ -1,11 +1,11 @@
 [nation_sumerian]
 
-translation_domain="freeciv"
+translation_domain = "freeciv"
 
-name=_("Sumerian")
-plural=_("?plural:Sumerians")
-groups="Ancient", "Asian", "Core"
-legend=_("Sumer controlled southern Mesopotamia until the rise of\
+name   = _("Sumerian")
+plural = _("?plural:Sumerians")
+groups = "Ancient", "Asian", "Core"
+legend = _("Sumer controlled southern Mesopotamia until the rise of\
  Babylonia. Tablets of Sumerian writing some 5500 years old have been\
  found, pre-dating every other writing in history.")
 
@@ -33,10 +33,11 @@ flag = "sumeria"
 flag_alt = "-"
 style = "Babylonian"
 
-init_techs=""
-init_buildings=""
-init_units=""
-civilwar_nations="assyrian", "egyptian", "babylonian"
+init_techs = ""
+init_buildings = ""
+init_units = ""
+
+civilwar_nations = "assyrian", "egyptian", "babylonian"
 
 cities =
  "Unug", ; Uruk
diff --git a/data/nation/surinamese.ruleset b/data/nation/surinamese.ruleset
index d19a039dab..38cd03892d 100644
--- a/data/nation/surinamese.ruleset
+++ b/data/nation/surinamese.ruleset
@@ -1,10 +1,10 @@
 [nation_surinamese]
 
-name=_("Surinamese")
-plural=_("?plural:Surinamese")
-groups="American", "Modern"
+name   = _("Surinamese")
+plural = _("?plural:Surinamese")
+groups = "American", "Modern"
 
-legend=_("Suriname is the smallest independent country of South America.\
+legend = _("Suriname is the smallest independent country of South America.\
  Originally it was inhabited by Arawak Indians. It was first colonized by\
  the English who traded it with the Dutch for New Amsterdam, modern New\
  York, in 1667. Suriname was granted self government in 1954 and became\
@@ -29,15 +29,15 @@ ruler_titles = {
  "Fundamentalism", _("Reverend %s"),       _("?female:Reverend %s")
 }
 
-flag="suriname"
+flag = "suriname"
 flag_alt = "-"
 style = "Tropical"
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
-civilwar_nations="tupi", "dutch", "guyanese", "antillean"
+civilwar_nations = "tupi", "dutch", "guyanese", "antillean"
 
 cities =
  "Paramaribo",
diff --git a/data/nation/swahili.ruleset b/data/nation/swahili.ruleset
index b301d9ba1c..04347ddea5 100644
--- a/data/nation/swahili.ruleset
+++ b/data/nation/swahili.ruleset
@@ -1,9 +1,9 @@
 [nation_swahili]
 
-name=_("Swahili")
-plural=_("?plural:Swahili")
-groups="African", "Medieval"
-legend=_("The Swahili are a Bantu ethnic group living along the Eastern\
+name   = _("Swahili")
+plural = _("?plural:Swahili")
+groups = "African", "Medieval"
+legend = _("The Swahili are a Bantu ethnic group living along the Eastern\
  Coast of Africa. From about the 9th century onwards the region, at the\
  crossroads of Islamic and African cultural influences, saw the rise of\
  Swahili city states, including Zanzibar, Kilwa Kisiwani, Mozambique and\
@@ -26,18 +26,19 @@ leaders = {
  "Tippu Tip",              "Male"
 }
 
-flag ="swahili"
-style = "babylonian"
-
 ruler_titles = {
  "government",      "male_title",            "female_title"
  "Fundamentalism",  _("Mullah %s"),          _("?female:Mullah %s")
  "Monarchy",        _("Sultan %s"),          _("Sultana %s")
 }
 
-init_techs=""
-init_buildings=""
-init_units=""
+flag = "swahili"
+style = "babylonian"
+
+init_techs = ""
+init_buildings = ""
+init_units = ""
+
 civilwar_nations = "zanzibari", "comorian", "mozambican", "tanganyikan", "kenyan"
 conflicts_with = "zanzibari", "comorian", "mozambican", "tanganyikan", "kenyan",
  "tanzanian", "ugandan"
diff --git a/data/nation/swazi.ruleset b/data/nation/swazi.ruleset
index ad85185b2f..36d6aa4353 100644
--- a/data/nation/swazi.ruleset
+++ b/data/nation/swazi.ruleset
@@ -1,9 +1,9 @@
 [nation_swazi]
 
-name=_("Swazi")
-plural=_("?plural:Swazis")
-groups="Modern", "African"
-legend=_("The Swazi are a Bantu people of southern Africa. Under the\
+name   = _("Swazi")
+plural = _("?plural:Swazis")
+groups = "Modern", "African"
+legend = _("The Swazi are a Bantu people of southern Africa. Under the\
  leadership of Mswati II (1820 - 1868), the Swazis expanded their territory\
  and stabilized the southern frontier with the Zulus.")
 
@@ -23,14 +23,15 @@ ruler_titles = {
  "Democracy",      _("Principal Chief %s"), _("?female:Principal Chief %s")
 }
 
-flag="swaziland"
+flag = "swaziland"
 flag_alt = "rwanda"
 style = "Tropical"
 
-init_techs=""
-init_buildings=""
-init_units=""
-civilwar_nations="zulu", "xhosa"
+init_techs = ""
+init_buildings = ""
+init_units = ""
+
+civilwar_nations = "zulu", "xhosa"
 
 ; The two capitals at top and the rest in order of population as of 2005
 ; http://de.wikipedia.org/wiki/Liste_der_Städte_in_Swasiland
diff --git a/data/nation/swedish.ruleset b/data/nation/swedish.ruleset
index aa3e32d395..34a801a657 100644
--- a/data/nation/swedish.ruleset
+++ b/data/nation/swedish.ruleset
@@ -1,11 +1,11 @@
 [nation_swedish]
 
-translation_domain="freeciv"
+translation_domain = "freeciv"
 
-name=_("Swedish")
-plural=_("?plural:Swedes")
-groups="Medieval", "Early Modern", "Modern", "European", "Core"
-legend=_("The Kingdom of Sweden was christianized and consolidated as a\
+name   = _("Swedish")
+plural = _("?plural:Swedes")
+groups = "Medieval", "Early Modern", "Modern", "European", "Core"
+legend = _("The Kingdom of Sweden was christianized and consolidated as a\
  political entity by the 12th century CE. The country rose to prominence as\
  one of the great powers of Europe in the 17th century, following\
  substantial military conquests by the so called Warrior Kings. However,\
@@ -34,14 +34,16 @@ ruler_titles = {
  "Despotism",       _("Earl %s"),           _("?female:Earl %s")
 }
 
-flag="sweden"
+flag = "sweden"
 flag_alt = "-"
 style = "European"
 
-init_techs=""
-init_buildings=""
-init_units=""
-civilwar_nations = "viking", "danish", "norwegian", "sami", "scanian", "western pomeranian"
+init_techs = ""
+init_buildings = ""
+init_units = ""
+
+civilwar_nations = "viking", "danish", "norwegian", "sami", "scanian",
+                   "western pomeranian"
 
 ; /* <-- avoid gettext warnings
 ;
diff --git a/data/nation/swiss.ruleset b/data/nation/swiss.ruleset
index 509b460c46..0214e42b92 100644
--- a/data/nation/swiss.ruleset
+++ b/data/nation/swiss.ruleset
@@ -1,9 +1,9 @@
 [nation_swiss]
 
-name=_("Swiss")
-plural=_("?plural:Swiss")
-groups="Modern", "Early Modern", "Medieval", "European"
-legend=_("Switzerland has existed as a state in its present form since the\
+name   = _("Swiss")
+plural = _("?plural:Swiss")
+groups = "Modern", "Early Modern", "Medieval", "European"
+legend = _("Switzerland has existed as a state in its present form since the\
  adoption of the Swiss Federal Constitution in 1848. The precursors of modern\
  Switzerland established a protective alliance at the end of the 13th century,\
  forming a loose confederation of states which persisted for centuries.")
@@ -38,14 +38,15 @@ ruler_titles = {
  "Democracy",      _("Federal Councillor %s"), _("?female:Federal Councillor %s")
 }
 
-flag="switzerland"
+flag = "switzerland"
 flag_alt = "-"
 style = "European"
 
-init_techs=""
-init_buildings=""
-init_units=""
-civilwar_nations="austrian", "french", "italian", "romansh"
+init_techs = ""
+init_buildings = ""
+init_units = ""
+
+civilwar_nations = "austrian", "french", "italian", "romansh"
 
 cities =
  "Bern (river)",
diff --git a/data/nation/syrian.ruleset b/data/nation/syrian.ruleset
index ef0742b3c3..ce885e86f3 100644
--- a/data/nation/syrian.ruleset
+++ b/data/nation/syrian.ruleset
@@ -1,9 +1,9 @@
 [nation_syrian]
 
-name=_("Syrian")
-plural=_("?plural:Syrians")
-groups="Modern", "Asian"
-legend=_("The modern Syrian Arab Republic was formed from a French mandate\
+name   = _("Syrian")
+plural = _("?plural:Syrians")
+groups = "Modern", "Asian"
+legend = _("The modern Syrian Arab Republic was formed from a French mandate\
  and gradually gained independence during the 1940s.")
 
 leaders = {
@@ -22,25 +22,25 @@ ruler_titles = {
  "Monarchy",       _("Emir %s"),              _("Emira %s")
 }
 
-flag="syria"
+flag = "syria"
 flag_alt = "-"
 style = "Classical"
 
-init_techs=""
-init_buildings=""
-init_units=""
+init_techs = ""
+init_buildings = ""
+init_units = ""
 
 ; Similar flags:
-conflicts_with="iraqi"
-civilwar_nations="turkish", "israeli", "lebanese"
+conflicts_with = "iraqi"
+civilwar_nations = "turkish", "israeli", "lebanese"
 
 ; http://pl.wikipedia.org/wiki/Miasta_Syrii
 cities =
- "Dimashq ash-Sham",	; Damascus
- "Halab",		; Aleppo
- "Hims",		; Homs
+ "Dimashq ash-Sham",    ; Damascus
+ "Halab",               ; Aleppo
+ "Hims",                ; Homs
  "Hama",
- "Al-Ladhiqiya",	; Latakia
+ "Al-Ladhiqiya",        ; Latakia
  "Dayr as-Zawr",
  "Ar-Raqqa",
  "Al-Bab",
@@ -62,7 +62,7 @@ cities =
  "Al-Mayadin",
  "Nawa",
  "Ar-Rastan",
- "Tadmor",		; Palmyra
+ "Tadmor",              ; Palmyra
  "Ayn al-Arab",
  "Afrin",
  "Khan Shaykhun"
-- 
2.33.0