Fixed some remaining uses of deprecated Khalifate names

[ci skip]

Also "colour"->"color"

data/core/macros/deprecated-utils.cfg

@@ -25,7 +25,7 @@
 #wmllint: markcheck on
 
 #define MAGENTA_IS_THE_TEAM_COLOR
-    #deprecated 3 1.15 This used to be used to set the default team colour for most unit types
+    #deprecated 3 1.15 This used to be used to set the default team color for most unit types
     #deprecated 3 1.15 It's no longer needed, since the default is now set in the game_config.
 #enddef
 

data/test/maps/pathfind_1.cfg

@@ -1309,7 +1309,7 @@ victory_when_enemies_defeated=yes
         extra_recruit=""
         id="Batal-80"
         name="Yushiyadr al"
-        type="Batal"
+        type="Dune Ranger"
         unrenamable=no
         x=4
         y=32
@@ -1320,7 +1320,7 @@ victory_when_enemies_defeated=yes
         extra_recruit=""
         id="Faris-81"
         name="Fawzih"
-        type="Faris"
+        type="Dune Sunderer"
         unrenamable=no
         x=13
         y=28
@@ -1331,7 +1331,7 @@ victory_when_enemies_defeated=yes
         extra_recruit=""
         id="Faris-82"
         name="Usawhid"
-        type="Faris"
+        type="Dune Sunderer"
         unrenamable=no
         x=22
         y=44
@@ -1342,7 +1342,7 @@ victory_when_enemies_defeated=yes
         extra_recruit=""
         id="Faris-83"
         name="Wajdy"
-        type="Faris"
+        type="Dune Sunderer"
         unrenamable=no
         x=44
         y=37
@@ -1353,7 +1353,7 @@ victory_when_enemies_defeated=yes
         extra_recruit=""
         id="Qanas-84"
         name="Dhan"
-        type="Qanas"
+        type="Dune Raider"
         unrenamable=no
         x=37
         y=36
@@ -1364,7 +1364,7 @@ victory_when_enemies_defeated=yes
         extra_recruit=""
         id="Saree-85"
         name="Abdul-Allahi"
-        type="Saree"
+        type="Dune Swiftrider"
         unrenamable=no
         x=28
         y=34