Merge branch 'pregmod-master' into 'pregmod-master'

fix to unit names

See merge request !3098

src/SecExp/secBarracks.tw

@@ -191,7 +191,7 @@ You are free to organize your menial slaves into fighting units. Currently you h
 <<if $helots > 0 && $activeUnits < $maxUnits>>
 	<br>
 	<<link "Form a new unit" "secBarracks">>
-		<<set _name = "<<= ordinalSuffix($createdMercUnits+1)>> slave platoon">>
+		<<set _name = "<<= ordinalSuffix($createdSlavesUnits+1)>> slave platoon">>
 		<<if $helots >= $maxTroops>>
 			<<set _newUnit = {
 			ID: 0,
@@ -333,7 +333,7 @@ __Militia__
 	<<if $militiaFreeManpower > 0 && $activeUnits < $maxUnits>>
 		<br>
 		<<link "Form a new unit" "secBarracks">>
-			<<set _name = "<<= ordinalSuffix($createdMercUnits+1)>> citizens' platoon">>
+			<<set _name = "<<= ordinalSuffix($createdMilitiaUnits+1)>> citizens' platoon">>
 			<<if $militiaFreeManpower >= $maxTroops>>
 				<<set _newUnit = {
 				ID: 0,