Merged from revision: 7134

- Externalized country name and noun to cities.xml (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7135 3b4a5df2-a311-0410-b5c6-a8a6f20db521

Laptop/CampaignHistoryMain.cpp

@@ -125,7 +125,7 @@ void RenderCampaignHistory()
 	usPosX = LAPTOP_SCREEN_UL_X;
 	usPosY = LAPTOP_SCREEN_WEB_UL_Y + 80;
 
-	swprintf(sText, szCampaignHistoryWebSite[TEXT_CAMPAIGNHISTORY_DESCRIPTION_1] );
+	swprintf(sText, szCampaignHistoryWebSite[TEXT_CAMPAIGNHISTORY_DESCRIPTION_1], pCountryNames[COUNTRY_NAME]);
 	usPosY += DisplayWrappedString( usPosX, usPosY, LAPTOP_SCREEN_LR_X-LAPTOP_SCREEN_UL_X, 2, CAMPHIS_FONT_MED, CAMPHIS_FONT_COLOR, sText, FONT_MCOLOR_BLACK, FALSE, 0);
 
 	for(int i = TEXT_CAMPAIGNHISTORY_NAME_MINISTRY; i < TEXT_CAMPAIGNHISTORY_NAME_PRESSORGANISATION_SUBTITLE; ++i)
@@ -133,7 +133,19 @@ void RenderCampaignHistory()
 		// display bullet
 		BltVideoObject(FRAME_BUFFER, hPixHandle, 0, usPosX, usPosY, VO_BLT_SRCTRANSPARENCY,NULL);
 
-		swprintf(sText, szCampaignHistoryWebSite[i] );
+		switch( i )
+		{
+			case TEXT_CAMPAIGNHISTORY_NAME_REBEL:
+			case TEXT_CAMPAIGNHISTORY_NAME_PRESSORGANISATION_SUBTITLE:
+				swprintf(sText, szCampaignHistoryWebSite[i], pCountryNames[COUNTRY_NAME] );
+				break;
+			case TEXT_CAMPAIGNHISTORY_NAME_MINISTRY:
+				swprintf(sText, szCampaignHistoryWebSite[i], pCountryNames[COUNTRY_NOUN] );
+				break;
+			default:
+				swprintf(sText, szCampaignHistoryWebSite[i] );
+		}
+		
 		DrawTextToScreen( sText, usPosX + 25, usPosY, LAPTOP_SCREEN_LR_X-LAPTOP_SCREEN_UL_X, CAMPHIS_FONT_MED, CAMPHIS_FONT_COLOR, FONT_MCOLOR_BLACK, FALSE, 0 );
 
 		usPosY += 15;
@@ -236,11 +248,21 @@ void RemoveCampaignHistoryDefaults()
 void GetCampaignHistoryText( UINT8 ubNumber, STR16 pString )
 {
 	UINT32	uiStartLoc=0;
+	CHAR16		sText[800];
 
 	if ( ubNumber >= TEXT_CAMPAIGNHISTORY_MAX )
 		wcscpy(	pString, L"bla" );
 		
-	wcscpy(	pString, szCampaignHistoryWebSite[ubNumber] );
+	switch( ubNumber )
+	{
+		case TEXT_CAMPAIGNHISTORY_NAME_PRESSORGANISATION:
+		case TEXT_CAMPAIGNHISTORY_NAME_PRESSORGANISATION_SUBTITLE:
+			swprintf( sText, szCampaignHistoryWebSite[ ubNumber ], pCountryNames[COUNTRY_NAME] );
+			wcscpy(	pString, sText );
+			break;
+		default:
+			wcscpy(	pString, szCampaignHistoryWebSite[ubNumber] );
+	}
 }
 
 

Laptop/CampaignHistory_Summary.cpp

@@ -700,7 +700,7 @@ void RenderCampaignHistory_MostImportant()
 
 			if ( incident.usIncidentFlags & INCIDENT_SAMSITE_SABOTAGED )
 			{
-				swprintf(sText, szCampaignHistoryDetail[TEXT_CAMPAIGNHISTORY_DETAIL_SAMSITESABOTAGED] );
+				swprintf(sText, szCampaignHistoryDetail[TEXT_CAMPAIGNHISTORY_DETAIL_SAMSITESABOTAGED], pCountryNames[COUNTRY_NOUN], pCountryNames[COUNTRY_NAME] );
 				usPosY += DisplayWrappedString( usPosX, usPosY, LAPTOP_SCREEN_LR_X - usPosX, 2, CAMPHIS_FONT_SMALL, CAMPAIGN_HISTORY_FONT_COLOR_REGULAR,sText, FONT_MCOLOR_BLACK, FALSE, 0);
 				if ( picend < usPosY )	usPosX = LAPTOP_SCREEN_UL_X;
 			}

Laptop/laptop.cpp

@@ -6264,7 +6264,7 @@ BOOLEAN RenderWWWProgramTitleBar( void )
 	HVOBJECT hHandle;
 	VOBJECT_DESC VObjectDesc;
 	INT32 iIndex = 0;
-	CHAR16 sString[256];
+	CHAR16 sString[256], sTemp[256];
 
 	// title bar - load
 	VObjectDesc.fCreateFlags=VOBJECT_CREATE_FROMFILE;
@@ -6298,7 +6298,13 @@ BOOLEAN RenderWWWProgramTitleBar( void )
 	{
 		iIndex = guiCurrentLaptopMode - LAPTOP_MODE_WWW-1;
 
-		swprintf( sString, L"%s - %s", pWebTitle[0], pWebPagesTitles[ iIndex ] );
+		if( iIndex >= 33 && iIndex <= 36 )
+		{
+			swprintf( sTemp, pWebPagesTitles[ iIndex ], pCountryNames[COUNTRY_NAME] );
+			swprintf( sString, L"%s - %s", pWebTitle[0], sTemp );
+		}
+		else 
+			swprintf( sString, L"%s - %s", pWebTitle[0], pWebPagesTitles[ iIndex ] );
 		mprintf(iScreenWidthOffset + 140 ,iScreenHeightOffset + 33 ,sString);
 	}
 

Strategic/Map Screen Interface.cpp

@@ -6348,14 +6348,20 @@ BOOLEAN CanEntireMovementGroupMercIsInMove( SOLDIERTYPE *pSoldier, INT8 *pbError
 
 void ReportMapScreenMovementError( INT8 bErrorNumber )
 {
-	if ( bErrorNumber == -99 )
+	CHAR16 sString[ 1024 ];
+	
+	switch( bErrorNumber )
 	{
-		// - 99 is a special message # indicating a customized message
-		DoMapMessageBox( MSG_BOX_BASIC_STYLE, gsCustomErrorString, MAP_SCREEN, MSG_BOX_FLAG_OK, MapScreenDefaultOkBoxCallback );
-	}
-	else
-	{
-		DoMapMessageBox( MSG_BOX_BASIC_STYLE, pMapErrorString[ bErrorNumber ], MAP_SCREEN, MSG_BOX_FLAG_OK, MapScreenDefaultOkBoxCallback );
+		case -99:
+			// - 99 is a special message # indicating a customized message
+			DoMapMessageBox( MSG_BOX_BASIC_STYLE, gsCustomErrorString, MAP_SCREEN, MSG_BOX_FLAG_OK, MapScreenDefaultOkBoxCallback );
+			break;
+		case 8:
+			swprintf( sString, pMapErrorString[ 8 ], pCountryNames[COUNTRY_NAME] );
+			DoMapMessageBox( MSG_BOX_BASIC_STYLE, sString, MAP_SCREEN, MSG_BOX_FLAG_OK, MapScreenDefaultOkBoxCallback );
+			break;
+		default:
+			DoMapMessageBox( MSG_BOX_BASIC_STYLE, pMapErrorString[ bErrorNumber ], MAP_SCREEN, MSG_BOX_FLAG_OK, MapScreenDefaultOkBoxCallback );
 	}
 }
 

Strategic/mapscreen.h

@@ -19,6 +19,14 @@ extern int MAP_ITEMDESC_START_X;
 // HEADROCK HAM B2.7: Moved here from Strategicmap.cpp to allow use by MilitiaSquads.cpp
 
 extern BOOLEAN	gfMilitiaAllowedInTown	[ MAX_TOWNS ];
+
+// Country name identifiers
+enum
+{
+	COUNTRY_NAME,
+	COUNTRY_NOUN,
+} ;
+
 // Sector name identifiers
 enum Towns
 {

Strategic/strategicmap.cpp

@@ -862,7 +862,10 @@ typedef enum
 	CITYTABLE_ELEMENT_ICONFILE,
 	CITYTABLE_ELEMENT_ICON_POSITION,
 	CITYTABLE_ELEMENT_ICON_POSITION_X,
-	CITYTABLE_ELEMENT_ICON_POSITION_Y
+	CITYTABLE_ELEMENT_ICON_POSITION_Y,
+	CITYTABLE_ELEMENT_COUNTRYINFO,
+	CITYTABLE_ELEMENT_COUNTRYNAME,
+	CITYTABLE_ELEMENT_COUNTRYNOUN
 	
 } CITYTABLE_PARSE_STAGE;
 
@@ -888,6 +891,8 @@ typedef struct
 	CITYTABLE_PARSE_STAGE	curElement;
 
 	CHAR8					szCharData[MAX_CHAR_DATA_LENGTH+1];
+	CHAR8					countryName[MAX_TOWN_NAME_LENGHT];
+	CHAR8					countryNoun[MAX_TOWN_NAME_LENGHT];
 	cityInfo				curCityInfo;
 	
 	//cityInfo *				curArray;	// ROMAN: added
@@ -909,7 +914,6 @@ citytableStartElementHandle(void *userData, const XML_Char *name, const XML_Char
 
 	if(pData->currentDepth <= pData->maxReadDepth) //are we reading this element?
 	{
-
 		if(strcmp(name, "CITY_INFO") == 0 && pData->curElement == CITYTABLE_ELEMENT_NONE)
 		{
 			pData->curElement = CITYTABLE_ELEMENT_CITYINFO;
@@ -1065,6 +1069,21 @@ citytableStartElementHandle(void *userData, const XML_Char *name, const XML_Char
 			pData->curElement = CITYTABLE_ELEMENT_TOWNPOINT_Y;
 			pData->maxReadDepth++; //we are not skipping this element
 		}
+		else if(strcmp(name, "COUNTRY") == 0 && pData->curElement == CITYTABLE_ELEMENT_CITYINFO)
+		{
+			pData->curElement = CITYTABLE_ELEMENT_COUNTRYINFO;
+			pData->maxReadDepth++; //we are not skipping this element
+		}
+		else if(strcmp(name, "countryName") == 0 && pData->curElement == CITYTABLE_ELEMENT_COUNTRYINFO)
+		{
+			pData->curElement = CITYTABLE_ELEMENT_COUNTRYNAME;
+			pData->maxReadDepth++; //we are not skipping this element
+		}
+		else if(strcmp(name, "countryNoun") == 0 && pData->curElement == CITYTABLE_ELEMENT_COUNTRYINFO)
+		{
+			pData->curElement = CITYTABLE_ELEMENT_COUNTRYNOUN;
+			pData->maxReadDepth++; //we are not skipping this element
+		}
 
 		//pData->szCharData[0] = '\0';
 	}
@@ -1299,6 +1318,36 @@ char temp;
 
 			pData->curCityInfo.townPoint.y = atol(pData->szCharData);
 		}
+		else if(strcmp(name, "COUNTRY") == 0 && pData->curElement == CITYTABLE_ELEMENT_COUNTRYINFO)
+		{
+			pData->curElement = CITYTABLE_ELEMENT_CITYINFO;
+
+			if ( !localizedMapTextOnly )
+			{
+				MultiByteToWideChar( CP_UTF8, 0, pData->countryName, -1, pCountryNames[COUNTRY_NAME], MAX_TOWN_NAME_LENGHT);
+				MultiByteToWideChar( CP_UTF8, 0, pData->countryNoun, -1, pCountryNames[COUNTRY_NOUN], MAX_TOWN_NAME_LENGHT);
+				
+			}
+			else if ( localizedMapTextOnly )
+			{
+				MultiByteToWideChar( CP_UTF8, 0, pData->countryName, -1, pCountryNames[COUNTRY_NAME], MAX_TOWN_NAME_LENGHT);
+				MultiByteToWideChar( CP_UTF8, 0, pData->countryNoun, -1, pCountryNames[COUNTRY_NOUN], MAX_TOWN_NAME_LENGHT);
+			}
+		}
+		else if(strcmp(name, "countryName") == 0 && pData->curElement == CITYTABLE_ELEMENT_COUNTRYNAME)
+		{
+			strncpy(pData->countryName, pData->szCharData, MAX_TOWN_NAME_LENGHT - 1);
+			pData->countryName[MAX_TOWN_NAME_LENGHT - 1] = 0;
+
+			pData->curElement = CITYTABLE_ELEMENT_COUNTRYINFO;
+		}
+		else if(strcmp(name, "countryNoun") == 0 && pData->curElement == CITYTABLE_ELEMENT_COUNTRYNOUN)
+		{
+			strncpy(pData->countryNoun, pData->szCharData, MAX_TOWN_NAME_LENGHT - 1);
+			pData->countryNoun[MAX_TOWN_NAME_LENGHT - 1] = 0;
+
+			pData->curElement = CITYTABLE_ELEMENT_COUNTRYINFO;
+		}
 
 		pData->maxReadDepth--;
 	}

Tactical/Soldier Control.cpp

@@ -15233,7 +15233,7 @@ BOOLEAN		SOLDIERTYPE::EquipmentTooGood( BOOLEAN fCloselook )
 							// loop over every item and its attachments
 							if ( Item[pObj->usItem].ubCoolness > maxcoolnessallowed )
 							{
-								ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, szCovertTextStr[STR_COVERT_ITEMSTOOGOOD], this->GetName(), Item[pObj->usItem].szItemName );
+								ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, szCovertTextStr[STR_COVERT_ITEMSTOOGOOD], this->GetName(), Item[pObj->usItem].szItemName, pCountryNames[COUNTRY_NOUN] );
 								return TRUE;
 							}
 
@@ -15247,7 +15247,7 @@ BOOLEAN		SOLDIERTYPE::EquipmentTooGood( BOOLEAN fCloselook )
 									// loop over every item and its attachments
 									if ( Item[iter->usItem].ubCoolness > maxcoolnessallowed )
 									{
-										ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, szCovertTextStr[STR_COVERT_ITEMSTOOGOOD], this->GetName(), Item[iter->usItem].szItemName );
+										ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, szCovertTextStr[STR_COVERT_ITEMSTOOGOOD], this->GetName(), Item[iter->usItem].szItemName, pCountryNames[COUNTRY_NOUN] );
 										return TRUE;
 									}
 					
@@ -15296,7 +15296,7 @@ BOOLEAN		SOLDIERTYPE::EquipmentTooGood( BOOLEAN fCloselook )
 								// loop over every item and its attachments
 								if ( Item[pObj->usItem].ubCoolness > maxcoolnessallowed )
 								{
-									ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, szCovertTextStr[STR_COVERT_ITEMSTOOGOOD], this->GetName(), Item[pObj->usItem].szItemName );
+									ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, szCovertTextStr[STR_COVERT_ITEMSTOOGOOD], this->GetName(), Item[pObj->usItem].szItemName, pCountryNames[COUNTRY_NOUN] );
 									return TRUE;
 								}
 
@@ -15310,7 +15310,7 @@ BOOLEAN		SOLDIERTYPE::EquipmentTooGood( BOOLEAN fCloselook )
 										// loop over every item and its attachments
 										if ( Item[iter->usItem].ubCoolness > maxcoolnessallowed )
 										{
-											ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, szCovertTextStr[STR_COVERT_ITEMSTOOGOOD], this->GetName(), Item[iter->usItem].szItemName );
+											ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, szCovertTextStr[STR_COVERT_ITEMSTOOGOOD], this->GetName(), Item[iter->usItem].szItemName, pCountryNames[COUNTRY_NOUN] );
 											return TRUE;
 										}
 					

Utils/Text.h

@@ -174,6 +174,7 @@ extern STR16 pLongAttributeStrings[];
 extern STR16 pContractStrings[];
 extern STR16 pAssignmentStrings[];
 extern STR16 pConditionStrings[];
+extern CHAR16 pCountryNames[][MAX_TOWN_NAME_LENGHT];
 extern CHAR16 pTownNames[MAX_TOWNS][MAX_TOWN_NAME_LENGHT];	// Lesh: look mapscreen.h for definitions
 extern STR16 pPersonnelScreenStrings[];
 extern STR16 pPersonnelRecordsHelpTexts[]; // added by SANDRO

Utils/_ChineseText.cpp

@@ -1735,7 +1735,7 @@ CHAR16 Message[][STRING_LENGTH] =
 	L"投降？",
 	L"此人拒绝你的包扎。",
 	L"这不可能！",
-  L"要搭乘Skyrider的直升飞机, 你得先把佣兵分配到交通工具/直升飞机。",
+	L"要搭乘Skyrider的直升飞机, 你得先把佣兵分配到交通工具/直升飞机。",
 	L"%s的时间只够给一支枪装填弹药",
 	L"血猫的回合",
 	L"全自动",
@@ -1766,9 +1766,19 @@ CHAR16 Message[][STRING_LENGTH] =
 	L"%s has repaired %s's %s as much as possible.",
 };
 
+// the country and its noun in the game
+CHAR16 pCountryNames[][MAX_TOWN_NAME_LENGHT] =
+{
+#ifdef JA2UB
+	L"Tracona",
+	L"Traconian",
+#else
+	L"Arulco",
+	L"Arulcan",
+#endif
+};
 
 // the names of the towns in the game
-
 CHAR16 pTownNames[MAX_TOWNS][MAX_TOWN_NAME_LENGHT] =
 {
 	L"",
@@ -3934,11 +3944,7 @@ STR16 pMapErrorString[] =
 //6-10
 	L"需要有人护送才能行军。请把他分进一个小队里。", // merc can't move unescorted .. for a male
 	L"需要有人护送才能行军。请把她分进一个小队里。", // for a female
-#ifdef JA2UB
-	L"佣兵尚未到达Tracona!",
-#else
-	L"佣兵尚未到达Arulco!",
-#endif
+	L"佣兵尚未到达%s!",
 	L"看来得先谈妥合同。",
 	L"无法发出行军命令。目前有空袭。",
 //11-15
@@ -4394,10 +4400,10 @@ STR16 pWebPagesTitles[] =
 	L"McGillicutty 公墓",
 	L"",
 	L"无法找到URL",
-	L"Arulco新闻发布会 - 战役总结",
-	L"Arulco新闻发布会 - 战役报告",
-	L"Arulco新闻发布会 - 最新消息",
-	L"Arulco新闻发布会 - 关于我们",
+	L"%s新闻发布会 - 战役总结",
+	L"%s新闻发布会 - 战役报告",
+	L"%s新闻发布会 - 最新消息",
+	L"%s新闻发布会 - 关于我们",
 	L"Bobby Ray - 最近的运货",
 	L"百科全书",
 	L"百科全书 - 数据",
@@ -7951,7 +7957,7 @@ STR16	szCovertTextStr[]=
 	L"%s's %s 可疑!", // L"%s's %s is suspicious!",
 	L"%s's %s 属于军用装备!", // 	L"%s's %s is considered military hardware!",
 	L"%s 携带了太多的枪支！", //L"%s carries too many guns!",
-	L"%s's %s 对于普通士兵来说太先进了!", //	L"%s's %s is too advanced for an arulcan soldier!",
+	L"%s's %s 对于%s士兵来说太先进了!", //	L"%s's %s is too advanced for an arulcan soldier!",
 	L"%s's %s 有太多附件!", //	L"%s's %s has too many attachments!",
 	L"%s 被发现有可疑举动！", //L"%s was seen performing suspicious activities!",
 	L"%s 被发现不像个平民！", //L"%s does not look like a civilian!",
@@ -8318,15 +8324,15 @@ STR16	szSoldierClassName[]=
 
 STR16	szCampaignHistoryWebSite[]=
 {
-	L"Arulco新闻议会",
-	L"Arulco情报配送部门",
-	L"Arulco革命运动",
+	L"%s新闻议会",
+	L"%s情报配送部门",
+	L"%s革命运动",
 	L"时代国际版",
 	L"国际时代",
 	L"R.I.S. (情报侦察服务)",
 
-	L"Arulco媒体资源集",
-	L"我们是中立情报部门。我们从Arulco搜集各种新闻报道。我们不会对这些资料进行评估——我们仅仅将它们发表出来供你自己评估。我们从各类资源中发布文章",
+	L"%s媒体资源集",
+	L"我们是中立情报部门。我们从%s搜集各种新闻报道。我们不会对这些资料进行评估——我们仅仅将它们发表出来供你自己评估。我们从各类资源中发布文章",
 	
 	L"战斗总结",
 	L"战役报告",
@@ -8365,7 +8371,7 @@ STR16	szCampaignHistoryDetail[]=
 	L"%s部署了%d辆坦克，%d辆坦克在激烈的交火中被摧毁。",
 	L"据称双方都部署了狙击手。",
 	L"未经证实的消息称有%s名狙击手参与了交火。"
-	L"This sector is of huge strategic importance, as it houses one of the handful of anti-air missile batteries the arulcan army posesses. Aerial photographs show extensive damage to the command center. This will leave the airspace above Arulco undefended for the time being.",
+	L"This sector is of huge strategic importance, as it houses one of the handful of anti-air missile batteries the %s army posesses. Aerial photographs show extensive damage to the command center. This will leave the airspace above %s undefended for the time being.",
 	L"The situation on the ground has gotten even more confusing, as it seems rebel infighting has reached a new level. We now have confirmation that rebel militia engaed in active combat with foreign mercenaries.",
 	L"The royalists position seems more precarious than previously thought. Reports of a split surfaced, with amry personnel opening fire on each other.",
 };
@@ -8418,7 +8424,7 @@ STR16	szCampaignHistoryResultString[]=
 	L"虽然反抗军在人数上占有优势，但是女王部队装备精良。反抗军显然落败了。",
 
 	L"在激烈的战斗中双方都遭到了巨大损失，不过最终，女王部队以人数上的优势决定了战役的胜利。反抗军被击溃。至于有没有幸存者，我们目前还无法核实。",
-	L"在激烈的交火中，Arulco部队的优秀训练起到了关键性作用。反抗军被迫撤退。",
+	L"在激烈的交火中，女王部队的优秀训练起到了关键性作用。反抗军被迫撤退。",
 	
 	L"双方都不愿轻易认输。虽然女王部队最终扫除了当地的反抗军威胁，但是巨大的损失使得女王军队本身名存实亡。不过很显然，如果女王军队能够耗得起的话，反抗军很快就会消失得一干二净了。",
 };

Utils/_DutchText.cpp

@@ -1763,9 +1763,19 @@ CHAR16 Message[][STRING_LENGTH] =
 	L"%s has repaired %s's %s as much as possible.",
 };
 
+// the country and its noun in the game
+CHAR16 pCountryNames[][MAX_TOWN_NAME_LENGHT] =
+{
+#ifdef JA2UB
+	L"Tracona",
+	L"Traconian",
+#else
+	L"Arulco",
+	L"Arulcan",
+#endif
+};
 
 // the names of the towns in the game
-
 CHAR16 pTownNames[MAX_TOWNS][MAX_TOWN_NAME_LENGHT] =
 {
 	L"",
@@ -3933,11 +3943,7 @@ STR16 pMapErrorString[] =
 //6-10
 	L"heeft een escorte nodig. Plaats hem in een team.", // merc can't move unescorted .. for a male
 	L"heeft een escorte nodig. Plaats haar in een team.", // for a female
-#ifdef JA2UB
-	L"Huurling is nog niet in Tracona aangekomen!",
-#else
-	L"Huurling is nog niet in Arulco aangekomen!",
-#endif
+	L"Huurling is nog niet in %s aangekomen!",
 	L"Het lijkt erop dat er eerst nog contractbesprekingen gehouden moeten worden.",
 	L"Cannot give a movement order. Air raid is going on.",
 //11-15
@@ -4395,10 +4401,10 @@ STR16 pWebPagesTitles[] =
 	L"McGillicutty's Mortuarium",
 	L"",
 	L"URL niet gevonden.",
-	L"Arulco Press Council - Conflict Summary",	// TODO.Translate
-	L"Arulco Press Council - Battle Reports",
-	L"Arulco Press Council - Latest News",
-	L"Arulco Press Council - About us",
+	L"%s Press Council - Conflict Summary",	// TODO.Translate
+	L"%s Press Council - Battle Reports",
+	L"%s Press Council - Latest News",
+	L"%s Press Council - About us",
 	L"Bobby Ray's - Recentelijke Zendingen",
 	L"Encyclopedia",
 	L"Encyclopedia - Data",
@@ -7931,7 +7937,7 @@ STR16	zNewTacticalMessages[]=
 	L"Since your laptop has no transmitter, you won't be able to hire new team members.  Perhaps this would be a good time to load a saved game or start over!",
 	L"%s hears the sound of crumpling metal coming from underneath Jerry's body.  It sounds disturbingly like your laptop antenna being crushed.",  //the %s is the name of a merc.  @@@  Modified
 	L"After scanning the note left behind by Deputy Commander Morris, %s senses an oppurtinity.  The note contains the coordinates for launching missiles against different towns in Arulco.  It also gives the coodinates of the origin - the missile facility.",
-	L"Noticing the control panel, %s figures the numbers can be reveresed, so that the missile might destroy this very facility.  %s needs to find an escape route.  The elevator appears to offer the fastest solution...",
+	L"Noticing the control panel, %s figures the numbers can be reversed, so that the missile might destroy this very facility.  %s needs to find an escape route.  The elevator appears to offer the fastest solution...",
 	L"This is an IRON MAN game and you cannot save when enemies are around.",	//	@@@  new text
 	L"(Cannot save during combat)", //@@@@ new text
 	L"The current campaign name is greater than 30 characters.",							// @@@ new text
@@ -7962,7 +7968,7 @@ STR16	szCovertTextStr[]=
 	L"%s's %s is suspicious!",
 	L"%s's %s is considered military hardware!",
 	L"%s carries too many guns!",
-	L"%s's %s is too advanced for an arulcan soldier!",
+	L"%s's %s is too advanced for an %s soldier!",
 	L"%s's %s has too many attachments!",
 	L"%s was seen performing suspicious activities!",
 	L"%s does not look like a civilian!",
@@ -8332,15 +8338,15 @@ STR16	szSoldierClassName[]=	// TODO.Translate
 
 STR16	szCampaignHistoryWebSite[]=
 {
-	L"Arulco Press Council",
-	L"Ministry for Arulcan Information Distribution",
-	L"Arulco Revolutionary Movement",
+	L"%s Press Council",
+	L"Ministry for %s Information Distribution",
+	L"%s Revolutionary Movement",
 	L"The Times International",
 	L"International Times",
 	L"R.I.S. (Recon Intelligence Service)",
 
-	L"A collection of press sources from Arulco",
-	L"We are a neutral source of information. We collect different news articles from Arulco. We do not judge these sources - we merely publish them, so you can judge yourself. We post articles from various sources, among them",
+	L"A collection of press sources from %s",
+	L"We are a neutral source of information. We collect different news articles from %s. We do not judge these sources - we merely publish them, so you can judge yourself. We post articles from various sources, among them",
 	
 	L"Conflict Summary",
 	L"Battle reports",
@@ -8379,7 +8385,7 @@ STR16	szCampaignHistoryDetail[]=
 	L"%d tanks were used by %s, %d of them were destroyed in the fierce fighting.",
 	L"Both sides are said to have used snipers.",
 	L"Unverified reports indicate %s snipers were involved in the firefight."
-	L"This sector is of huge strategic importance, as it houses one of the handful of anti-air missile batteries the arulcan army posesses. Aerial photographs show extensive damage to the command center. This will leave the airspace above Arulco undefended for the time being.",
+	L"This sector is of huge strategic importance, as it houses one of the handful of anti-air missile batteries the %s army posesses. Aerial photographs show extensive damage to the command center. This will leave the airspace above %s undefended for the time being.",
 	L"The situation on the ground has gotten even more confusing, as it seems rebel infighting has reached a new level. We now have confirmation that rebel militia engaed in active combat with foreign mercenaries.",
 	L"The royalists position seems more precarious than previously thought. Reports of a split surfaced, with amry personnel opening fire on each other.",
 };
@@ -8432,7 +8438,7 @@ STR16	szCampaignHistoryResultString[]=
 	L"Even though the rebels had more boots on the ground, the army was better equipped. The rebels clearly lost.",
 
 	L"Fierce fighting saw significant losses on both sides, but in the end, the army's higher number of bodies decided the battle. The rebel force was destroyed. There might have been survivors, but we cannot verify this at this point.",
-	L"In an intense firefight, the superior training of the arulcan armed forces tipped the scales. The rebels had to retreat.",
+	L"In an intense firefight, the superior training of the armed forces tipped the scales. The rebels had to retreat.",
 	
 	L"Neither side was willing to yield. While the army ultimately removed the rebel threat in the area, the staggering losses have resulted in the army unit continuing to exist in name only. But it is clear the rebels will soon be out of men and women if the army can keep on this rate of attrition.",
 };

Utils/_EnglishText.cpp

@@ -1736,7 +1736,7 @@ CHAR16 Message[][STRING_LENGTH] =
 	L"Surrender?",
 	L"This person refuses your aid.",
 	L"I DON'T think so!",
-  L"To travel in Skyrider's chopper, you'll have to ASSIGN mercs to VEHICLE/HELICOPTER first.",
+	L"To travel in Skyrider's chopper, you'll have to ASSIGN mercs to VEHICLE/HELICOPTER first.",
 	L"%s only had enough time to reload ONE gun",
 	L"Bloodcats' turn",
 	L"full auto",
@@ -1767,9 +1767,19 @@ CHAR16 Message[][STRING_LENGTH] =
 	L"%s has repaired %s's %s as much as possible.",
 };
 
+// the country and its noun in the game
+CHAR16 pCountryNames[][MAX_TOWN_NAME_LENGHT] =
+{
+#ifdef JA2UB
+	L"Tracona",
+	L"Traconian",
+#else
+	L"Arulco",
+	L"Arulcan",
+#endif
+};
 
 // the names of the towns in the game
-
 CHAR16 pTownNames[MAX_TOWNS][MAX_TOWN_NAME_LENGHT] =
 {
 	L"",
@@ -3932,11 +3942,7 @@ STR16 pMapErrorString[] =
 //6-10
 	L"needs an escort to move. Place him on a squad with one.", // merc can't move unescorted .. for a male
 	L"needs an escort to move. Place her on a squad with one.", // for a female
-#ifdef JA2UB
-	L"Merc hasn't yet arrived in Tracona!",
-#else
-	L"Merc hasn't yet arrived in Arulco!",
-#endif
+	L"Merc hasn't yet arrived in %s!",
 	L"Looks like there's some contract negotiations to settle first.",
 	L"Cannot give a movement order. Air raid is going on.",
 //11-15
@@ -4392,10 +4398,10 @@ STR16 pWebPagesTitles[] =
 	L"McGillicutty's Mortuary",
 	L"",
 	L"URL not found.",
-	L"Arulco Press Council - Conflict Summary",
-	L"Arulco Press Council - Battle Reports",
-	L"Arulco Press Council - Latest News",
-	L"Arulco Press Council - About us",
+	L"%s Press Council - Conflict Summary",
+	L"%s Press Council - Battle Reports",
+	L"%s Press Council - Latest News",
+	L"%s Press Council - About us",
 	L"Bobby Ray's - Recent Shipments",
 	L"Encyclopedia",
 	L"Encyclopedia - Data",
@@ -7917,7 +7923,7 @@ STR16	zNewTacticalMessages[]=
 	L"Since your laptop has no transmitter, you won't be able to hire new team members.  Perhaps this would be a good time to load a saved game or start over!",
 	L"%s hears the sound of crumpling metal coming from underneath Jerry's body.  It sounds disturbingly like your laptop antenna being crushed.",  //the %s is the name of a merc.  @@@  Modified
 	L"After scanning the note left behind by Deputy Commander Morris, %s senses an oppurtinity.  The note contains the coordinates for launching missiles against different towns in Arulco.  It also gives the coodinates of the origin - the missile facility.",
-	L"Noticing the control panel, %s figures the numbers can be reveresed, so that the missile might destroy this very facility.  %s needs to find an escape route.  The elevator appears to offer the fastest solution...",
+	L"Noticing the control panel, %s figures the numbers can be reversed, so that the missile might destroy this very facility.  %s needs to find an escape route.  The elevator appears to offer the fastest solution...",
 	L"This is an IRON MAN game and you cannot save when enemies are around.",	//	@@@  new text
 	L"(Cannot save during combat)", //@@@@ new text
 	L"The current campaign name is greater than 30 characters.",							// @@@ new text
@@ -7948,7 +7954,7 @@ STR16	szCovertTextStr[]=
 	L"%s's %s is suspicious!",
 	L"%s's %s is considered military hardware!",
 	L"%s carries too many guns!",
-	L"%s's %s is too advanced for an arulcan soldier!",
+	L"%s's %s is too advanced for an %s soldier!",
 	L"%s's %s has too many attachments!",
 	L"%s was seen performing suspicious activities!",
 	L"%s does not look like a civilian!",
@@ -8316,15 +8322,15 @@ STR16	szSoldierClassName[]=
 
 STR16	szCampaignHistoryWebSite[]=
 {
-	L"Arulco Press Council",
-	L"Ministry for Arulcan Information Distribution",
-	L"Arulco Revolutionary Movement",
+	L"%s Press Council",
+	L"Ministry for %s Information Distribution",
+	L"%s Revolutionary Movement",
 	L"The Times International",
 	L"International Times",
 	L"R.I.S. (Recon Intelligence Service)",
 
-	L"A collection of press sources from Arulco",
-	L"We are a neutral source of information. We collect different news articles from Arulco. We do not judge these sources - we merely publish them, so you can judge yourself. We post articles from various sources, among them",
+	L"A collection of press sources from %s",
+	L"We are a neutral source of information. We collect different news articles from %s. We do not judge these sources - we merely publish them, so you can judge yourself. We post articles from various sources, among them",
 	
 	L"Conflict Summary",
 	L"Battle reports",
@@ -8363,7 +8369,7 @@ STR16	szCampaignHistoryDetail[]=
 	L"%d tanks were used by %s, %d of them were destroyed in the fierce fighting.",
 	L"Both sides are said to have used snipers.",
 	L"Unverified reports indicate %s snipers were involved in the firefight.",
-	L"This sector is of huge strategic importance, as it houses one of the handful of anti-air missile batteries the arulcan army posesses. Aerial photographs show extensive damage to the command center. This will leave the airspace above Arulco undefended for the time being.",
+	L"This sector is of huge strategic importance, as it houses one of the handful of anti-air missile batteries the %s army posesses. Aerial photographs show extensive damage to the command center. This will leave the airspace above %s undefended for the time being.",
 	L"The situation on the ground has gotten even more confusing, as it seems rebel infighting has reached a new level. We now have confirmation that rebel militia engaed in active combat with foreign mercenaries.",
 	L"The royalists position seems more precarious than previously thought. Reports of a split surfaced, with amry personnel opening fire on each other.",
 };
@@ -8416,7 +8422,7 @@ STR16	szCampaignHistoryResultString[]=
 	L"Even though the rebels had more boots on the ground, the army was better equipped. The rebels clearly lost.",
 
 	L"Fierce fighting saw significant losses on both sides, but in the end, the army's higher number of bodies decided the battle. The rebel force was destroyed. There might have been survivors, but we cannot verify this at this point.",
-	L"In an intense firefight, the superior training of the arulcan armed forces tipped the scales. The rebels had to retreat.",
+	L"In an intense firefight, the superior training of the armed forces tipped the scales. The rebels had to retreat.",
 	
 	L"Neither side was willing to yield. While the army ultimately removed the rebel threat in the area, the staggering losses have resulted in the army unit continuing to exist in name only. But it is clear the rebels will soon be out of men and women if the army can keep on this rate of attrition.",
 };

Utils/_FrenchText.cpp

@@ -1770,9 +1770,19 @@ CHAR16 Message[][STRING_LENGTH] =
 	L"%s a aidé %s pour réparer au mieux : %s.",
 };
 
+// the country and its noun in the game
+CHAR16 pCountryNames[][MAX_TOWN_NAME_LENGHT] =
+{
+#ifdef JA2UB
+	L"Tracona",
+	L"Traconian",
+#else
+	L"Arulco",
+	L"Arulcaine",
+#endif
+};
 
 // the names of the towns in the game
-
 CHAR16 pTownNames[MAX_TOWNS][MAX_TOWN_NAME_LENGHT] =
 {
 	L"",
@@ -3940,7 +3950,7 @@ STR16 pMapErrorString[] =
 //6-10
 	L"doit être escorté. Mettez-le dans une escouade.", // merc can't move unescorted .. for a male
 	L"doit être escortée. Mettez-la dans une escouade.", // for a female
-	L"Ce mercenaire n'est pas encore arrivé !",
+	L"Ce mercenaire n'est pas encore arrivé dans %s !",
 	L"Il faudrait d'abord revoir les termes du contrat...",
 	L"",
 //11-15
@@ -4400,10 +4410,10 @@ STR16 pWebPagesTitles[] =
 	L"Morgue McGillicutty",
 	L"",
 	L"URL introuvable.",
-	L"Conseil de presse : Bilan du conflit",
-	L"Conseil de presse : Rapports",
-	L"Conseil de presse : Dernières Nouvelles",
-	L"Conseil de presse : À propos de nous",
+	L"%s conseil de presse : Bilan du conflit",
+	L"%s conseil de presse : Rapports",
+	L"%s conseil de presse : Dernières Nouvelles",
+	L"%s conseil de presse : À propos de nous",
 	L"Bobby Ray : Dernières commandes",
 	L"Encyclopédie",
 	L"Encyclopédie : Données",
@@ -7945,7 +7955,7 @@ STR16	szCovertTextStr[]=
 	L"%s a un(e) %s suspect(e) !",
 	L"%s a un(e) %s considéré(e) comme du matériel militaire !",
 	L"%s transporte trop d'armes !",
-	L"%s a un(e) %s trop avancé(e) pour un soldat d'Arulco !",
+	L"%s a un(e) %s trop avancé(e) pour un soldat %s !",
 	L"%s a un(e) %s avec trop d'accessoires !",
 	L"%s a été repéré(e) en train de commettre des activités douteuses !",
 	L"%s ne ressemble pas à un civil !",
@@ -8314,15 +8324,15 @@ STR16	szSoldierClassName[]=
 
 STR16	szCampaignHistoryWebSite[]=
 {
-	L"Conseil de presse d'Arulco",
-	L"Ministère de l'information d'Arulco",
-	L"Mouvement révolutionnaire d'Arulco",
+	L"Conseil de presse d'%s",
+	L"Ministère de l'information d'%s",
+	L"Mouvement révolutionnaire d'%s",
 	L"The Times International",
 	L"International Times",
 	L"RIS (Renseignements Internationaux Spécialisés)",
 
-	L"Recueille les articles de presse d'Arulco",
-	L"Nous sommes une source d'information neutre. Nous collectons différents articles d'actualité venant d'Arulco. Nous ne jugeons pas ces sources, nous nous contentons de les publier, pour que vous puissiez vous faire votre avis. Nous faisons paraitre des articles de différentes sources, venant :",
+	L"Recueille les articles de presse d'%s",
+	L"Nous sommes une source d'information neutre. Nous collectons différents articles d'actualité venant d'%s. Nous ne jugeons pas ces sources, nous nous contentons de les publier, pour que vous puissiez vous faire votre avis. Nous faisons paraitre des articles de différentes sources, venant :",
 	
 	L"Bilan du conflit",
 	L"Rapports",
@@ -8361,7 +8371,7 @@ STR16	szCampaignHistoryDetail[]=
 	L"Il y avait %d chars pour renforcer %s. %d d'entre eux ont été détruits dans des combats acharnés.",
 	L"Les deux camps avaient des tireurs d'élite.",
 	L"Des sources non vérifiées indiquent que %s tireurs d'élite ont été impliqués dans le combat."
-	L"Ce secteur a une très grande importance stratégique, car il abrite l'une des rares batteries de missiles sol-air que l'armée arulcaine possède. Des photographies aériennes montrent les dégâts du centre de commande. Ça laissera l'espace aérien d'Arulco sans défense pour le moment.",
+	L"Ce secteur a une très grande importance stratégique, car il abrite l'une des rares batteries de missiles sol-air que l'armée %s possède. Des photographies aériennes montrent les dégâts du centre de commande. Ça laissera l'espace aérien d'%s sans défense pour le moment.",
 	L"La situation sur le terrain est devenue encore plus confuse, car il semble que le combat des rebelles a pris un nouveau virage. On a maintenant la confirmation qu'une milice rebelle s'est engagée activement avec les mercenaires étrangers.",
 	L"La position des royalistes semble plus précaire qu'on ne le pensait. Des rapports d'une scission au sein de l'armée ont fait surface, impliquant des échanges de feu au sein même du personnel militaire.",
 };
@@ -8414,7 +8424,7 @@ STR16	szCampaignHistoryResultString[]=
 	L"Même si les rebelles étaient plus nombreux sur le terrain, l'armée était mieux équipée. Les rebelles ont évidemment perdu.",
 
 	L"La violence des combats a fait des pertes considérables dans les deux camps, mais à la fin, la supériorité numérique l'armée a fait pencher la balance en sa faveur. La force rebelle a été anéantie. Il pourrait y avoir des survivants, mais nous ne pouvons pas confirmer cette source pour le moment.",
-	L"Lors d'une fusillade intense, l'entraînement supérieur de l'armée arulcaine a fait pencher la balance en sa faveur. Les rebelles ont dû battre en retraite.",
+	L"Lors d'une fusillade intense, l'entraînement supérieur de l'armée a fait pencher la balance en sa faveur. Les rebelles ont dû battre en retraite.",
 	
 	L"Aucun des deux camps n'était prêt à se soumettre. Alors que l'armée a finalement écarté la menace rebelle de la zone, leurs pertes conséquentes ont conduit l'unité à continuer d'exister uniquement de nom. Mais il est clair que les rebelles vont rapidement être à court d'hommes et de femmes si l'armée continue ce taux d'attrition.",
 };

Utils/_GermanText.cpp

@@ -1781,6 +1781,19 @@ CHAR16 Message[][STRING_LENGTH] =
 	L"%s has repaired %s's %s as much as possible.",
 };
 
+// the country and its noun in the game
+CHAR16 pCountryNames[][MAX_TOWN_NAME_LENGHT] =
+{
+#ifdef JA2UB
+	L"Tracona",
+	L"Traconian",
+#else
+	L"Arulco",
+	L"Arulcan",
+#endif
+};
+
+// the names of the towns in the game
 CHAR16 pTownNames[MAX_TOWNS][MAX_TOWN_NAME_LENGHT] =
 {
 	L"",
@@ -3897,11 +3910,7 @@ STR16 pMapErrorString[] =
 //6-10
 	L"braucht eine Eskorte. Platzieren Sie ihn in einem Trupp mit Eskorte.", // merc can't move unescorted .. for a male
 	L"braucht eine Eskorte. Platzieren Sie sie in einem Trupp mit Eskorte.", // for a female
-#ifdef JA2UB
-	L"Söldner ist noch nicht in Tracona!",
-#else
-	L"Söldner ist noch nicht in Arulco!",
-#endif
+	L"Söldner ist noch nicht in %s!",
 	L"Erst mal Vertrag aushandeln!",
 	L"Marschbefehl ist nicht möglich. Luftangriffe finden statt.",
 //11-15
@@ -4334,10 +4343,10 @@ STR16 pWebPagesTitles[] =
 	L"McGillicuttys Bestattungen",
 	L"",
 	L"URL nicht gefunden.",
-	L"Arulco Presse Rat - Konflikt-Zusammenfassungen",
-	L"Arulco Presse Rat - Kampfberichte",
-	L"Arulco Presse Rat - Aktuellste Neuigkeiten",
-	L"Arulco Presse Rat - Über uns",
+	L"%s Presse Rat - Konflikt-Zusammenfassungen",
+	L"%s Presse Rat - Kampfberichte",
+	L"%s Presse Rat - Aktuellste Neuigkeiten",
+	L"%s Presse Rat - Über uns",
 	L"Bobby Rays - Letzte Lieferungen",
 	L"Enzyklopädie",
 	L"Enzyklopädie - Daten",
@@ -7773,7 +7782,7 @@ STR16	szCovertTextStr[]=
 	L"%s's %s ist verdächtig!",
 	L"%s's %s ist eine militärische Ausrüstung!",
 	L"%s trägt zu viele Waffen!",
-	L"%s's %s ist zu fortgeschritten für einen Soldaten dieser Armee!",
+	L"%s's %s ist zu fortgeschritten für einen %s Soldat!",
 	L"%s's %s hat zu viele Anbauten!",
 	L"%s wurde gesichtet bei verdächtigen Handlungen!",
 	L"%s schaut nicht wie ein Zivilist aus!",
@@ -8142,15 +8151,15 @@ STR16	szSoldierClassName[]=	// TODO.Translate
 
 STR16	szCampaignHistoryWebSite[]=
 {
-	L"Arulco Press Council",
-	L"Ministry for Arulcan Information Distribution",
-	L"Arulco Revolutionary Movement",
+	L"%s Press Council",
+	L"Ministry for %s Information Distribution",
+	L"%s Revolutionary Movement",
 	L"The Times International",
 	L"International Times",
 	L"R.I.S. (Recon Intelligence Service)",
 
-	L"A collection of press sources from Arulco",
-	L"We are a neutral source of information. We collect different news articles from Arulco. We do not judge these sources - we merely publish them, so you can judge yourself. We post articles from various sources, among them",
+	L"A collection of press sources from %s",
+	L"We are a neutral source of information. We collect different news articles from %s. We do not judge these sources - we merely publish them, so you can judge yourself. We post articles from various sources, among them",
 	
 	L"Conflict Summary",
 	L"Battle reports",
@@ -8189,7 +8198,7 @@ STR16	szCampaignHistoryDetail[]=
 	L"%d tanks were used by %s, %d of them were destroyed in the fierce fighting.",
 	L"Both sides are said to have used snipers.",
 	L"Unverified reports indicate %s snipers were involved in the firefight."
-	L"This sector is of huge strategic importance, as it houses one of the handful of anti-air missile batteries the arulcan army posesses. Aerial photographs show extensive damage to the command center. This will leave the airspace above Arulco undefended for the time being.",
+	L"This sector is of huge strategic importance, as it houses one of the handful of anti-air missile batteries the %s army posesses. Aerial photographs show extensive damage to the command center. This will leave the airspace above %s undefended for the time being.",
 	L"The situation on the ground has gotten even more confusing, as it seems rebel infighting has reached a new level. We now have confirmation that rebel militia engaed in active combat with foreign mercenaries.",
 	L"The royalists position seems more precarious than previously thought. Reports of a split surfaced, with amry personnel opening fire on each other.",
 };
@@ -8242,7 +8251,7 @@ STR16	szCampaignHistoryResultString[]=
 	L"Even though the rebels had more boots on the ground, the army was better equipped. The rebels clearly lost.",
 
 	L"Fierce fighting saw significant losses on both sides, but in the end, the army's higher number of bodies decided the battle. The rebel force was destroyed. There might have been survivors, but we cannot verify this at this point.",
-	L"In an intense firefight, the superior training of the arulcan armed forces tipped the scales. The rebels had to retreat.",
+	L"In an intense firefight, the superior training of the armed forces tipped the scales. The rebels had to retreat.",
 	
 	L"Neither side was willing to yield. While the army ultimately removed the rebel threat in the area, the staggering losses have resulted in the army unit continuing to exist in name only. But it is clear the rebels will soon be out of men and women if the army can keep on this rate of attrition.",
 };

Utils/_ItalianText.cpp

@@ -1759,9 +1759,19 @@ CHAR16 Message[][STRING_LENGTH] =
 	L"%s has repaired %s's %s as much as possible.",
 };
 
+// the country and its noun in the game
+CHAR16 pCountryNames[][MAX_TOWN_NAME_LENGHT] =
+{
+#ifdef JA2UB
+	L"Tracona",
+	L"Traconian",
+#else
+	L"Arulco",
+	L"Arulcan",
+#endif
+};
 
 // the names of the towns in the game
-
 CHAR16 pTownNames[MAX_TOWNS][MAX_TOWN_NAME_LENGHT] =
 {
 	L"",
@@ -3927,11 +3937,7 @@ STR16 pMapErrorString[] =
 //6-10
 	L"ha bisogno di una scorta per muoversi. Inseritelo in una squadra che ne è provvista.", // merc can't move unescorted .. for a male
 	L"ha bisogno di una scorta per muoversi. Inseritela in una squadra che ne è provvista.", // for a female
-#ifdef JA2UB
-	L"Il mercenario non è ancora arrivato ad Tracona!",
-#else
-	L"Il mercenario non è ancora arrivato ad Arulco!",
-#endif
+	L"Il mercenario non è ancora arrivato ad %s!",
 	L"Sembra che ci siano negoziazioni di contratto da stabilire.",
 	L"",
 //11-15
@@ -4383,10 +4389,10 @@ STR16 pWebPagesTitles[] =
 	L"Servizio di pompe funebri di McGillicutty",
 	L"",
 	L"URL non ritrovato.",
-	L"Arulco Press Council - Conflict Summary",	// TODO.Translate
-	L"Arulco Press Council - Battle Reports",
-	L"Arulco Press Council - Latest News",
-	L"Arulco Press Council - About us",
+	L"%s Press Council - Conflict Summary",	// TODO.Translate
+	L"%s Press Council - Battle Reports",
+	L"%s Press Council - Latest News",
+	L"%s Press Council - About us",
 	L"Bobby Ray - Spedizioni recenti",
 	L"Encyclopedia",
 	L"Encyclopedia - Data",
@@ -7953,7 +7959,7 @@ STR16	szCovertTextStr[]=
 	L"%s's %s is suspicious!",
 	L"%s's %s is considered military hardware!",
 	L"%s carries too many guns!",
-	L"%s's %s is too advanced for an arulcan soldier!",
+	L"%s's %s is too advanced for an %s soldier!",
 	L"%s's %s has too many attachments!",
 	L"%s was seen performing suspicious activities!",
 	L"%s does not look like a civilian!",
@@ -8324,15 +8330,15 @@ STR16	szSoldierClassName[]=	// TODO.Translate
 
 STR16	szCampaignHistoryWebSite[]=
 {
-	L"Arulco Press Council",
-	L"Ministry for Arulcan Information Distribution",
-	L"Arulco Revolutionary Movement",
+	L"%s Press Council",
+	L"Ministry for %s Information Distribution",
+	L"%s Revolutionary Movement",
 	L"The Times International",
 	L"International Times",
 	L"R.I.S. (Recon Intelligence Service)",
 
-	L"A collection of press sources from Arulco",
-	L"We are a neutral source of information. We collect different news articles from Arulco. We do not judge these sources - we merely publish them, so you can judge yourself. We post articles from various sources, among them",
+	L"A collection of press sources from %s",
+	L"We are a neutral source of information. We collect different news articles from %s. We do not judge these sources - we merely publish them, so you can judge yourself. We post articles from various sources, among them",
 	
 	L"Conflict Summary",
 	L"Battle reports",
@@ -8371,7 +8377,7 @@ STR16	szCampaignHistoryDetail[]=
 	L"%d tanks were used by %s, %d of them were destroyed in the fierce fighting.",
 	L"Both sides are said to have used snipers.",
 	L"Unverified reports indicate %s snipers were involved in the firefight."
-	L"This sector is of huge strategic importance, as it houses one of the handful of anti-air missile batteries the arulcan army posesses. Aerial photographs show extensive damage to the command center. This will leave the airspace above Arulco undefended for the time being.",
+	L"This sector is of huge strategic importance, as it houses one of the handful of anti-air missile batteries the %s army posesses. Aerial photographs show extensive damage to the command center. This will leave the airspace above %s undefended for the time being.",
 	L"The situation on the ground has gotten even more confusing, as it seems rebel infighting has reached a new level. We now have confirmation that rebel militia engaed in active combat with foreign mercenaries.",
 	L"The royalists position seems more precarious than previously thought. Reports of a split surfaced, with amry personnel opening fire on each other.",
 };
@@ -8424,7 +8430,7 @@ STR16	szCampaignHistoryResultString[]=
 	L"Even though the rebels had more boots on the ground, the army was better equipped. The rebels clearly lost.",
 
 	L"Fierce fighting saw significant losses on both sides, but in the end, the army's higher number of bodies decided the battle. The rebel force was destroyed. There might have been survivors, but we cannot verify this at this point.",
-	L"In an intense firefight, the superior training of the arulcan armed forces tipped the scales. The rebels had to retreat.",
+	L"In an intense firefight, the superior training of the armed forces tipped the scales. The rebels had to retreat.",
 	
 	L"Neither side was willing to yield. While the army ultimately removed the rebel threat in the area, the staggering losses have resulted in the army unit continuing to exist in name only. But it is clear the rebels will soon be out of men and women if the army can keep on this rate of attrition.",
 };

Utils/_PolishText.cpp

@@ -1775,9 +1775,19 @@ CHAR16 Message[][STRING_LENGTH] =
 	L"%s has repaired %s's %s as much as possible.",
 };
 
+// the country and its noun in the game
+CHAR16 pCountryNames[][MAX_TOWN_NAME_LENGHT] =
+{
+#ifdef JA2UB
+	L"Tracony",
+	L"Traconian",
+#else
+	L"Arulco",
+	L"Arulcan",
+#endif
+};
 
 // the names of the towns in the game
-
 CHAR16 pTownNames[MAX_TOWNS][MAX_TOWN_NAME_LENGHT] =
 {
 	L"",
@@ -3942,11 +3952,7 @@ STR16 pMapErrorString[] =
 //6-10
 	L"musi mieć eskortę, aby się przemieszczać. Umieść go w oddziale z eskortą.", // merc can't move unescorted .. for a male
 	L"musi mieć eskortę, aby się przemieszczać. Umieść ją w oddziale z eskortą.", // for a female
-#ifdef JA2UB
-	L"Najemnik nie przybył jeszcze do Tracony!",
-#else
-	L"Najemnik nie przybył jeszcze do Arulco!",
-#endif
+	L"Najemnik nie przybył jeszcze do %s!",
 	L"Wygląda na to, że trzeba wpierw uregulować sprawy kontraktu.",
 	L"Nie można przemieścić najemnika. Trwa nalot powietrzny.",
 //11-15
@@ -4402,10 +4408,10 @@ STR16 pWebPagesTitles[] =
 	L"McGillicutty - Zakład pogrzebowy",
 	L"",
 	L"Nie odnaleziono URL.",
-	L"Arulco Press Council - Conflict Summary",	// TODO.Translate
-	L"Arulco Press Council - Battle Reports",
-	L"Arulco Press Council - Latest News",
-	L"Arulco Press Council - About us",
+	L"%s Press Council - Conflict Summary",	// TODO.Translate
+	L"%s Press Council - Battle Reports",
+	L"%s Press Council - Latest News",
+	L"%s Press Council - About us",
 	L"Bobby Ray's - Ostatnie dostawy",
 	L"Encyclopedia",
 	L"Encyclopedia - Dane",
@@ -7972,7 +7978,7 @@ STR16	szCovertTextStr[]=
 	L"%s's %s is suspicious!",
 	L"%s's %s is considered military hardware!",
 	L"%s carries too many guns!",
-	L"%s's %s is too advanced for an arulcan soldier!",
+	L"%s's %s is too advanced for an %s soldier!",
 	L"%s's %s has too many attachments!",
 	L"%s was seen performing suspicious activities!",
 	L"%s does not look like a civilian!",
@@ -8342,15 +8348,15 @@ STR16	szSoldierClassName[]=	// TODO.Translate
 
 STR16	szCampaignHistoryWebSite[]=
 {
-	L"Arulco Press Council",
-	L"Ministry for Arulcan Information Distribution",
-	L"Arulco Revolutionary Movement",
+	L"%s Press Council",
+	L"Ministry for %s Information Distribution",
+	L"%s Revolutionary Movement",
 	L"The Times International",
 	L"International Times",
 	L"R.I.S. (Recon Intelligence Service)",
 
-	L"A collection of press sources from Arulco",
-	L"We are a neutral source of information. We collect different news articles from Arulco. We do not judge these sources - we merely publish them, so you can judge yourself. We post articles from various sources, among them",
+	L"A collection of press sources from %s",
+	L"We are a neutral source of information. We collect different news articles from %s. We do not judge these sources - we merely publish them, so you can judge yourself. We post articles from various sources, among them",
 	
 	L"Conflict Summary",
 	L"Battle reports",
@@ -8389,7 +8395,7 @@ STR16	szCampaignHistoryDetail[]=
 	L"%d tanks were used by %s, %d of them were destroyed in the fierce fighting.",
 	L"Both sides are said to have used snipers.",
 	L"Unverified reports indicate %s snipers were involved in the firefight."
-	L"This sector is of huge strategic importance, as it houses one of the handful of anti-air missile batteries the arulcan army posesses. Aerial photographs show extensive damage to the command center. This will leave the airspace above Arulco undefended for the time being.",
+	L"This sector is of huge strategic importance, as it houses one of the handful of anti-air missile batteries the %s army posesses. Aerial photographs show extensive damage to the command center. This will leave the airspace above %s undefended for the time being.",
 	L"The situation on the ground has gotten even more confusing, as it seems rebel infighting has reached a new level. We now have confirmation that rebel militia engaed in active combat with foreign mercenaries.",
 	L"The royalists position seems more precarious than previously thought. Reports of a split surfaced, with amry personnel opening fire on each other.",
 };
@@ -8442,7 +8448,7 @@ STR16	szCampaignHistoryResultString[]=
 	L"Even though the rebels had more boots on the ground, the army was better equipped. The rebels clearly lost.",
 
 	L"Fierce fighting saw significant losses on both sides, but in the end, the army's higher number of bodies decided the battle. The rebel force was destroyed. There might have been survivors, but we cannot verify this at this point.",
-	L"In an intense firefight, the superior training of the arulcan armed forces tipped the scales. The rebels had to retreat.",
+	L"In an intense firefight, the superior training of the armed forces tipped the scales. The rebels had to retreat.",
 	
 	L"Neither side was willing to yield. While the army ultimately removed the rebel threat in the area, the staggering losses have resulted in the army unit continuing to exist in name only. But it is clear the rebels will soon be out of men and women if the army can keep on this rate of attrition.",
 };

Utils/_RussianText.cpp

@@ -1736,7 +1736,7 @@ CHAR16 Message[][STRING_LENGTH] =
 	L"Сдаться?",
 	L"Человек отверг вашу помощь.",
 	L"Вам это надо?",
-  L"Чтобы воспользоваться вертолётом Небесного Всадника - выберите \"Транспорт/Вертолёт\".",
+	L"Чтобы воспользоваться вертолётом Небесного Всадника - выберите \"Транспорт/Вертолёт\".",
 	L"%s успевает зарядить только одно оружие.",
 	L"Ход кошек-убийц", //Bloodcats' turn
 	L"автоматический", //full auto
@@ -1767,9 +1767,19 @@ CHAR16 Message[][STRING_LENGTH] =
 	L"%s has repaired %s's %s as much as possible.",
 };
 
+// the country and its noun in the game
+CHAR16 pCountryNames[][MAX_TOWN_NAME_LENGHT] =
+{
+#ifdef JA2UB
+	L"Тракону",
+	L"Траконец",
+#else
+	L"Арулько",
+	L"Арулькиец",
+#endif
+};
 
 // the names of the towns in the game
-
 CHAR16 pTownNames[MAX_TOWNS][MAX_TOWN_NAME_LENGHT] =
 {
 	L"",
@@ -3933,11 +3943,7 @@ STR16 pMapErrorString[] =
 //6-10
 	L"нуждается в сопровождении чтобы идти. Назначьте его с кем-нибудь в отряд.", // merc can't move unescorted .. for a male
 	L"нуждается в сопровождении чтобы идти. Назначьте ее с кем-нибудь в отряд.", // for a female
-#ifdef JA2UB
-	L"Наёмник ещё не прибыл в Тракону!",
-#else
-	L"Наёмник ещё не прибыл в Арулько!",
-#endif
+	L"Наёмник ещё не прибыл в %s!",
 	L"Кажется, сначала надо уладить проблемы с контрактом.",
 	L"Бежать от самолета? Только после вас!",	// Cannot give a movement order. Air raid is going on.
 //11-15
@@ -4393,10 +4399,10 @@ STR16 pWebPagesTitles[] =
 	L"Похоронная служба Макгилликатти",
 	L"",
 	L"Адрес не найден.",
-	L"Arulco Press Council - Conflict Summary",	// TODO.Translate
-	L"Arulco Press Council - Battle Reports",
-	L"Arulco Press Council - Latest News",
-	L"Arulco Press Council - About us",
+	L"%s Press Council - Conflict Summary",	// TODO.Translate
+	L"%s Press Council - Battle Reports",
+	L"%s Press Council - Latest News",
+	L"%s Press Council - About us",
 	L"Бобби Рэй - последние поступления",
 	L"Энциклопедия",
 	L"Энциклопедия - данные",
@@ -7951,7 +7957,7 @@ STR16	szCovertTextStr[]=
 	L"%s's %s is suspicious!",
 	L"%s's %s is considered military hardware!",
 	L"%s carries too many guns!",
-	L"%s's %s is too advanced for an arulcan soldier!",
+	L"%s's %s is too advanced for an %s soldier!",
 	L"%s's %s has too many attachments!",
 	L"%s was seen performing suspicious activities!",
 	L"%s does not look like a civilian!",
@@ -8321,15 +8327,15 @@ STR16	szSoldierClassName[]=	// TODO.Translate
 
 STR16	szCampaignHistoryWebSite[]=
 {
-	L"Arulco Press Council",
-	L"Ministry for Arulcan Information Distribution",
-	L"Arulco Revolutionary Movement",
+	L"%s Press Council",
+	L"Ministry for %s Information Distribution",
+	L"%s Revolutionary Movement",
 	L"The Times International",
 	L"International Times",
 	L"R.I.S. (Recon Intelligence Service)",
 
-	L"A collection of press sources from Arulco",
-	L"We are a neutral source of information. We collect different news articles from Arulco. We do not judge these sources - we merely publish them, so you can judge yourself. We post articles from various sources, among them",
+	L"A collection of press sources from %s",
+	L"We are a neutral source of information. We collect different news articles from %s. We do not judge these sources - we merely publish them, so you can judge yourself. We post articles from various sources, among them",
 	
 	L"Conflict Summary",
 	L"Battle reports",
@@ -8368,7 +8374,7 @@ STR16	szCampaignHistoryDetail[]=
 	L"%d tanks were used by %s, %d of them were destroyed in the fierce fighting.",
 	L"Both sides are said to have used snipers.",
 	L"Unverified reports indicate %s snipers were involved in the firefight."
-	L"This sector is of huge strategic importance, as it houses one of the handful of anti-air missile batteries the arulcan army posesses. Aerial photographs show extensive damage to the command center. This will leave the airspace above Arulco undefended for the time being.",
+	L"This sector is of huge strategic importance, as it houses one of the handful of anti-air missile batteries the %s army posesses. Aerial photographs show extensive damage to the command center. This will leave the airspace above %s undefended for the time being.",
 	L"The situation on the ground has gotten even more confusing, as it seems rebel infighting has reached a new level. We now have confirmation that rebel militia engaed in active combat with foreign mercenaries.",
 	L"The royalists position seems more precarious than previously thought. Reports of a split surfaced, with amry personnel opening fire on each other.",
 };
@@ -8421,7 +8427,7 @@ STR16	szCampaignHistoryResultString[]=
 	L"Even though the rebels had more boots on the ground, the army was better equipped. The rebels clearly lost.",
 
 	L"Fierce fighting saw significant losses on both sides, but in the end, the army's higher number of bodies decided the battle. The rebel force was destroyed. There might have been survivors, but we cannot verify this at this point.",
-	L"In an intense firefight, the superior training of the arulcan armed forces tipped the scales. The rebels had to retreat.",
+	L"In an intense firefight, the superior training of the armed forces tipped the scales. The rebels had to retreat.",
 	
 	L"Neither side was willing to yield. While the army ultimately removed the rebel threat in the area, the staggering losses have resulted in the army unit continuing to exist in name only. But it is clear the rebels will soon be out of men and women if the army can keep on this rate of attrition.",
 };

Utils/_TaiwaneseText.cpp

@@ -1736,7 +1736,7 @@ CHAR16 Message[][STRING_LENGTH] =
 	L"Surrender?",
 	L"This person refuses your aid.",
 	L"I DON'T think so!",
-  L"To travel in Skyrider's chopper, you'll have to ASSIGN mercs to VEHICLE/HELICOPTER first.",
+	L"To travel in Skyrider's chopper, you'll have to ASSIGN mercs to VEHICLE/HELICOPTER first.",
 	L"%s only had enough time to reload ONE gun",
 	L"Bloodcats' turn",
 	L"full auto",
@@ -1746,7 +1746,7 @@ CHAR16 Message[][STRING_LENGTH] =
 	L"no semi auto",
 	L"The enemy has no more items to steal!",
 	L"The enemy has no item in its hand!",
-// TODO.Translate
+
 	L"%s's desert camouflage has worn off.",
 	L"%s's desert camouflage has washed off.",
 	
@@ -1767,9 +1767,19 @@ CHAR16 Message[][STRING_LENGTH] =
 	L"%s has repaired %s's %s as much as possible.",
 };
 
+// the country and its noun in the game
+CHAR16 pCountryNames[][MAX_TOWN_NAME_LENGHT] =
+{
+#ifdef JA2UB
+	L"Tracona",
+	L"Traconian",
+#else
+	L"Arulco",
+	L"Arulcan",
+#endif
+};
 
 // the names of the towns in the game
-
 CHAR16 pTownNames[MAX_TOWNS][MAX_TOWN_NAME_LENGHT] =
 {
 	L"",
@@ -3938,11 +3948,7 @@ STR16 pMapErrorString[] =
 //6-10
 	L"needs an escort to move. Place him on a squad with one.", // merc can't move unescorted .. for a male
 	L"needs an escort to move. Place her on a squad with one.", // for a female
-#ifdef JA2UB
-	L"Merc hasn't yet arrived in Tracona!",
-#else
-	L"Merc hasn't yet arrived in Arulco!",
-#endif
+	L"Merc hasn't yet arrived in %s!",
 	L"Looks like there's some contract negotiations to settle first.",
 	L"Cannot give a movement order. Air raid is going on.",
 //11-15
@@ -4398,10 +4404,10 @@ STR16 pWebPagesTitles[] =
 	L"McGillicutty's Mortuary",
 	L"",
 	L"URL not found.",
-	L"Arulco Press Council - Conflict Summary",	// TODO.Translate
-	L"Arulco Press Council - Battle Reports",
-	L"Arulco Press Council - Latest News",
-	L"Arulco Press Council - About us",
+	L"%s Press Council - Conflict Summary",
+	L"%s Press Council - Battle Reports",
+	L"%s Press Council - Latest News",
+	L"%s Press Council - About us",
 	L"Bobby Ray's - Recent Shipments",
 	L"Encyclopedia",
 	L"Encyclopedia - Data",
@@ -7931,7 +7937,7 @@ STR16	zNewTacticalMessages[]=
 	L"Since your laptop has no transmitter, you won't be able to hire new team members.  Perhaps this would be a good time to load a saved game or start over!",
 	L"%s hears the sound of crumpling metal coming from underneath Jerry's body.  It sounds disturbingly like your laptop antenna being crushed.",  //the %s is the name of a merc.  @@@  Modified
 	L"After scanning the note left behind by Deputy Commander Morris, %s senses an oppurtinity.  The note contains the coordinates for launching missiles against different towns in Arulco.  It also gives the coodinates of the origin - the missile facility.",
-	L"Noticing the control panel, %s figures the numbers can be reveresed, so that the missile might destroy this very facility.  %s needs to find an escape route.  The elevator appears to offer the fastest solution...",
+	L"Noticing the control panel, %s figures the numbers can be reversed, so that the missile might destroy this very facility.  %s needs to find an escape route.  The elevator appears to offer the fastest solution...",
 	L"This is an IRON MAN game and you cannot save when enemies are around.",	//	@@@  new text
 	L"(Cannot save during combat)", //@@@@ new text
 	L"The current campaign name is greater than 30 characters.",							// @@@ new text
@@ -7962,7 +7968,7 @@ STR16	szCovertTextStr[]=
 	L"%s's %s is suspicious!",
 	L"%s's %s is considered military hardware!",
 	L"%s carries too many guns!",
-	L"%s's %s is too advanced for an arulcan soldier!",
+	L"%s's %s is too advanced for an %s soldier!",
 	L"%s's %s has too many attachments!",
 	L"%s was seen performing suspicious activities!",
 	L"%s does not look like a civilian!",
@@ -8379,7 +8385,7 @@ STR16	szCampaignHistoryDetail[]=
 	L"%d tanks were used by %s, %d of them were destroyed in the fierce fighting.",
 	L"Both sides are said to have used snipers.",
 	L"Unverified reports indicate %s snipers were involved in the firefight."
-	L"This sector is of huge strategic importance, as it houses one of the handful of anti-air missile batteries the arulcan army posesses. Aerial photographs show extensive damage to the command center. This will leave the airspace above Arulco undefended for the time being.",
+	L"This sector is of huge strategic importance, as it houses one of the handful of anti-air missile batteries the %s army posesses. Aerial photographs show extensive damage to the command center. This will leave the airspace above %s undefended for the time being.",
 	L"The situation on the ground has gotten even more confusing, as it seems rebel infighting has reached a new level. We now have confirmation that rebel militia engaed in active combat with foreign mercenaries.",
 	L"The royalists position seems more precarious than previously thought. Reports of a split surfaced, with amry personnel opening fire on each other.",
 };
@@ -8432,7 +8438,7 @@ STR16	szCampaignHistoryResultString[]=
 	L"Even though the rebels had more boots on the ground, the army was better equipped. The rebels clearly lost.",
 
 	L"Fierce fighting saw significant losses on both sides, but in the end, the army's higher number of bodies decided the battle. The rebel force was destroyed. There might have been survivors, but we cannot verify this at this point.",
-	L"In an intense firefight, the superior training of the arulcan armed forces tipped the scales. The rebels had to retreat.",
+	L"In an intense firefight, the superior training of the armed forces tipped the scales. The rebels had to retreat.",
 	
 	L"Neither side was willing to yield. While the army ultimately removed the rebel threat in the area, the staggering losses have resulted in the army unit continuing to exist in name only. But it is clear the rebels will soon be out of men and women if the army can keep on this rate of attrition.",
 };