Fix North Ireland Nation

Closes #2292

data/default/nationlist.ruleset

@@ -487,7 +487,7 @@ default_nationset = "all"
 *include "nation/nigerien.ruleset"
 *include "nation/nimiipuu.ruleset"
 *include "nation/norman.ruleset"
-*include "nation/northernirish.ruleset"
+*include "nation/northireland.ruleset"
 *include "nation/northkorean.ruleset"
 *include "nation/northumbrian.ruleset"
 *include "nation/norwegian.ruleset"

data/misc/flags-large.spec

@@ -387,7 +387,7 @@ sprites =
 		"f.niger", "tilesets/flags/niger-large"
 		"f.nigeria", "tilesets/flags/nigeria-large"
 		"f.normandy", "tilesets/flags/normandy-large"
-		"f.northernireland", "tilesets/flags/northernireland-large"
+		"f.northireland", "tilesets/flags/northireland-large"
 		"f.north_korea", "tilesets/flags/north_korea-large"
 		"f.northumbria", "tilesets/flags/northumbria-large"
 		"f.norway", "tilesets/flags/norway-large"

data/misc/flags.spec

@@ -53,7 +53,7 @@ artists = "
    Atlantis		J.M. Maalderink
    Australia		Daniel McRae
    Austria		Christoph Breitler
-   Austria Hungary	Public Domain (Wikimedia Commons) 
+   Austria Hungary	Public Domain (Wikimedia Commons)
    Avar			J.M. Maalderink
    Aymara		Daniel Markstedt
    Azerbaijan		Daniel McRae
@@ -196,7 +196,7 @@ artists = "
    Gaul			Daniel Markstedt and Kilian Valkhof
    Georgia		Christian Schaller
    Gepid		Andrzej G.
-   German Empire	XYZ/Sketlux 
+   German Empire	XYZ/Sketlux
    Germanic		Andrzej G.
    Germany		Philipp Sadleder
    Ghana		J.M. Maalderink
@@ -228,7 +228,7 @@ artists = "
    Helvetii		J.M. Maalderink and Andrzej G.
    Hephthalite		J.M. Maalderink
    Hesse		Madden (Wikimedia Commons)
-   Hessen-Darmstadt	XYZ/Sketlux 
+   Hessen-Darmstadt	XYZ/Sketlux
    Himyar		Daniel Markstedt
    Hittite		Daniel Markstedt
    Honduras		Wikimedia Commons
@@ -436,15 +436,15 @@ artists = "
    Raramuri		J.M. Maalderink
    Rep. Congo		J.M. Maalderink
    Rhineland		J.M. Maalderink
-   Rhodesia		modified by XYZ/Sketlux from Wikimedia Commons in 2016. 
+   Rhodesia		modified by XYZ/Sketlux from Wikimedia Commons in 2016.
    Rif			Mysid (Wikipedia)
    Romania		Daniel McRae
    Rome			Vasco Alexandre Da Silva Costa, Patricia Fidi
    Russia		Oleg Krivosheev
    RVN			J.M. Maalderink
    Rwanda		Cezary Biele
    Ryukyu		Daniel Markstedt
-   Saar Protectorate	EclecticArkie (Wikimedia Commons) 
+   Saar Protectorate	EclecticArkie (Wikimedia Commons)
    Sabinium		J.M. Maalderink
    SADR			J.M. Maalderink
    St. Kitts and Nevis	Denelson83 and Pumbaa80 (Wikimedia Commons)
@@ -464,7 +464,7 @@ artists = "
    Savoy		J.M. Maalderink
    Saxony 		Sir Iain (Wikimedia Commons)
    Scania		Daniel Markstedt
-   Schaumburg-Lippe	XYZ/Sketlux 
+   Schaumburg-Lippe	XYZ/Sketlux
    Schleswig-Holstein	Madden and Drbashir117 (Wikimedia Commons)
    Scotland		Sigge Kotliar
    Scottish Gaelic	Oxenhillshaw (Wikimedia Commons), Daniel Markstedt and Michael Bauer
@@ -972,7 +972,7 @@ sprites =
 		"f.niger", "tilesets/flags/niger"
 		"f.nigeria", "tilesets/flags/nigeria"
 		"f.normandy", "tilesets/flags/normandy"
-		"f.northernireland", "tilesets/flags/northernireland"
+		"f.northireland", "tilesets/flags/northireland"
 		"f.north_korea", "tilesets/flags/north_korea"
 		"f.northumbria", "tilesets/flags/northumbria"
 		"f.norway", "tilesets/flags/norway"

data/misc/shields-large.spec

@@ -388,7 +388,7 @@ sprites =
 		"f.shield.nigeria", "tilesets/flags/nigeria-shield-large"
 		"f.shield.normandy", "tilesets/flags/normandy-shield-large"
 		"f.shield.north_korea", "tilesets/flags/north_korea-shield-large"
-		"f.shield.northernireland", "tilesets/flags/northernireland-shield-large"
+		"f.shield.northireland", "tilesets/flags/northireland-shield-large"
 		"f.shield.northumbria", "tilesets/flags/northumbria-shield-large"
 		"f.shield.norway", "tilesets/flags/norway-shield-large"
 		"f.shield.novgorod", "tilesets/flags/novgorod-shield-large"

data/misc/shields.spec

@@ -386,7 +386,7 @@ sprites =
 		"f.shield.niger", "tilesets/flags/niger-shield"
 		"f.shield.nigeria", "tilesets/flags/nigeria-shield"
 		"f.shield.normandy", "tilesets/flags/normandy-shield"
-		"f.shield.northernireland", "tilesets/flags/northernireland-shield"
+		"f.shield.northireland", "tilesets/flags/northireland-shield"
 		"f.shield.north_korea", "tilesets/flags/north_korea-shield"
 		"f.shield.northumbria", "tilesets/flags/northumbria-shield"
 		"f.shield.norway", "tilesets/flags/norway-shield"

data/nation/CMakeLists.txt

@@ -370,7 +370,7 @@ install(
   nigerien.ruleset
   nimiipuu.ruleset
   norman.ruleset
-  northernirish.ruleset
+  northireland.ruleset
   northkorean.ruleset
   northumbrian.ruleset
   norwegian.ruleset

data/nation/northernirish.ruleset → data/nation/northireland.ruleset

@@ -1,9 +1,9 @@
-[nation_northirish]
+[nation_northireland]
 
 name   = _("Northern Ireland")
 plural = _("?plural:Northern Irish")
 groups = "Modern", "European"
-legend=_("Northern Ireland is a part of the United Kingdom that occupies\
+legend=_("North Ireland is a part of the United Kingdom that occupies\
 the northeastern part of the island of Ireland. Northern Ireland has a\
 complex history of conflict and cooperation between the British unionists,\
 who want to remain in the U.K., and the Irish nationalists, who seek to\
@@ -37,15 +37,15 @@ ruler_titles = {
  "Democracy",       _("First Minister %s"),_("?female:First Minister %s")
 }
 
-flag = "northernireland" ; Credits to Sangjinhwa on Wikimedia commons.
+flag = "northireland" ; Credits to Sangjinhwa on Wikimedia commons.
 flag_alt = "england" ; Similar colors
 style = "Celtic"
 
 init_techs = ""
 init_buildings = ""
 init_units = ""
 
-civilwar_nations = "irish", "british", "english", "gaelic", "scottish gaelic" ; add to civilwar nation list for Ireland and Britain. 
+civilwar_nations = "irish", "british", "english", "gaelic", "scottish gaelic" ; add to civilwar nation list for Ireland and Britain.
 
 cities = ; Cities sourced from geoba.se
   "Belfast",

translations/nations/POTFILES.in

@@ -331,7 +331,7 @@ data/nation/nigerian.ruleset
 data/nation/nigerien.ruleset
 data/nation/nimiipuu.ruleset
 data/nation/norman.ruleset
-data/nation/northernirish.ruleset
+data/nation/northireland.ruleset
 data/nation/northkorean.ruleset
 data/nation/northumbrian.ruleset
 data/nation/norwegian.ruleset