Merged revision(s) 7209 from branches/ja2_source_official_2014:

- improved prisoner handling code

- Fix: imprisoned officers were wrongly converted into elites


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

Utils/_ChineseText.cpp

@@ -8058,10 +8058,10 @@ STR16	szFoodTextStr[]=
 
 STR16	szPrisonerTextStr[]=
 {
-	L"%d 精英, %d 正规军 和 %d 长官被审问.",	//L"%d elites, %d regulars and %d amins were interrogated.",
+	L"%d officers, %d elites, %d regulars and %d admins were interrogated.",	// TODO.Translate
 	L"%d 名俘虏已支付赎金", //L"%d prisoners paid ransom money.",
 	L"%d 名俘虏已供出同伙位置", //L"%d prisoners revealed enemy positions.",
-	L"%d 精英, %d 正规军 and %d 长官加入我们.",	//L"%d elites, %d regulars and %d amins joined our cause.",
+	L"%d officers, %d elites, %d regulars and %d admins joined our cause.",		// TODO.Translate
 	L"俘虏掀起大规模暴动！在 %s 监狱！", //L"Prisoners start a massive riot in %s!",
 	L"俘虏被押送前往 %s 监狱", //L"The army now occupies the prison in %s, the prisoners were freed!",
 	L"俘虏已被释放！", //L"Prisoners have been released!",

Utils/_DutchText.cpp

@@ -8071,10 +8071,10 @@ STR16	szFoodTextStr[]=
 // TODO.Translate
 STR16	szPrisonerTextStr[]=
 {
-	L"%d elites, %d regulars and %d admins were interrogated.",
+	L"%d officers, %d elites, %d regulars and %d admins were interrogated.",
 	L"%d prisoners paid ransom money.",
 	L"%d prisoners revealed enemy positions.",
-	L"%d elites, %d regulars and %d admins joined our cause.",
+	L"%d officers, %d elites, %d regulars and %d admins joined our cause.",
 	L"Prisoners start a massive riot in %s!",
 	L"%d prisoners were sent to %s!",
 	L"Prisoners have been released!",

Utils/_EnglishText.cpp

@@ -8056,10 +8056,10 @@ STR16	szFoodTextStr[]=
 
 STR16	szPrisonerTextStr[]=
 {
-	L"%d elites, %d regulars and %d admins were interrogated.",
+	L"%d officers, %d elites, %d regulars and %d admins were interrogated.",
 	L"%d prisoners paid ransom money.",
 	L"%d prisoners revealed enemy positions.",
-	L"%d elites, %d regulars and %d admins joined our cause.",
+	L"%d officers, %d elites, %d regulars and %d admins joined our cause.",
 	L"Prisoners start a massive riot in %s!",
 	L"%d prisoners were sent to %s!",
 	L"Prisoners have been released!",

Utils/_FrenchText.cpp

@@ -8056,10 +8056,10 @@ STR16	szFoodTextStr[]=
 
 STR16	szPrisonerTextStr[]=
 {
-	L"Prisonnier(s) ayant été interrogé(s) : %d élite(s), %d régulier(s) et %d administratif(s).",   // TODO.Translate. A voir définition (to see finished, definition)
+	L"%d officers, %d elites, %d regulars and %d admins were interrogated.",	// TODO.Translate
 	L"Prisonnier(s) ayant payé une rançon : %d.",   // TODO.Translate. A voir définition (to see finished, definition)
 	L"Prisonnier(s) ayant révélé les positions ennemies : %d.",   // TODO.Translate. A voir définition (to see finished, definition)
-	L"Prisonnier(s) ayant rejoint notre cause : %d élite(s), %d régulier(s) et %d administratif(s).",  // TODO.Translate. A voir définition (to see finished, definition)
+	L"%d officers, %d elites, %d regulars and %d admins joined our cause.",		// TODO.Translate
 	L"Prisonnier(s) ayant commencé une émeute : %s !",   // TODO.Translate. A voir définition (to see finished, definition)
 	L"Prisonnier(s) envoyé(s) en %s : %d !",   // TODO.Translate. A voir définition (to see finished, definition)
 	L"Prisonnier(s) libéré(s) !",

Utils/_GermanText.cpp

@@ -7884,10 +7884,10 @@ STR16	szFoodTextStr[]=
 
 STR16	szPrisonerTextStr[]=
 {
-	L"%d Elite-, %d Reguläre und %d Hilfssoldaten wurden verhört.",
+	L"%d Offiziere, %d Elite-, %d Reguläre und %d Hilfssoldaten wurden verhört.",
 	L"%d Gefangene wurden gegen Lösegeld freigelassen.",
 	L"%d Gefangene haben uns Truppenstandorte verraten.",
-	L"%d Elite-, %d Reguläre und %d Hilfssoldaten laufen zu uns über.",
+	L"%d Offiziere, %d Elite-, %d Reguläre und %d Hilfssoldaten laufen zu uns über.",
 	L"Gefangenenaufstand in %s!",
 	L"%d Gefangene wurden nach %s geschickt!",
 	L"Gefangene freigelassen!",

Utils/_ItalianText.cpp

@@ -8062,10 +8062,10 @@ STR16	szFoodTextStr[]=
 // TODO.Translate
 STR16	szPrisonerTextStr[]=
 {
-	L"%d elites, %d regulars and %d admins were interrogated.",
+	L"%d officers, %d elites, %d regulars and %d admins were interrogated.",
 	L"%d prisoners paid ransom money.",
 	L"%d prisoners revealed enemy positions.",
-	L"%d elites, %d regulars and %d admins joined our cause.",
+	L"%d officers, %d elites, %d regulars and %d admins joined our cause.",
 	L"Prisoners start a massive riot in %s!",
 	L"%d prisoners were sent to %s!",
 	L"Prisoners have been released!",

Utils/_PolishText.cpp

@@ -8080,10 +8080,10 @@ STR16	szFoodTextStr[]=
 // TODO.Translate
 STR16	szPrisonerTextStr[]=
 {
-	L"%d elites, %d regulars and %d admins were interrogated.",
+	L"%d officers, %d elites, %d regulars and %d admins were interrogated.",
 	L"%d prisoners paid ransom money.",
 	L"%d prisoners revealed enemy positions.",
-	L"%d elites, %d regulars and %d admins joined our cause.",
+	L"%d officers, %d elites, %d regulars and %d admins joined our cause.",
 	L"Prisoners start a massive riot in %s!",
 	L"%d prisoners were sent to %s!",
 	L"Prisoners have been released!",

Utils/_RussianText.cpp

@@ -8060,10 +8060,10 @@ STR16	szFoodTextStr[]=
 // TODO.Translate
 STR16	szPrisonerTextStr[]=
 {
-	L"%d elites, %d regulars and %d admins were interrogated.",
+	L"%d officers, %d elites, %d regulars and %d admins were interrogated.",
 	L"%d prisoners paid ransom money.",
 	L"%d prisoners revealed enemy positions.",
-	L"%d elites, %d regulars and %d admins joined our cause.",
+	L"%d officers, %d elites, %d regulars and %d admins joined our cause.",
 	L"Prisoners start a massive riot in %s!",
 	L"%d prisoners were sent to %s!",
 	L"Prisoners have been released!",

Utils/_TaiwaneseText.cpp

@@ -8071,10 +8071,10 @@ STR16	szFoodTextStr[]=
 // TODO.Translate
 STR16	szPrisonerTextStr[]=
 {
-	L"%d elites, %d regulars and %d admins were interrogated.",
+	L"%d officers, %d elites, %d regulars and %d admins were interrogated.",
 	L"%d prisoners paid ransom money.",
 	L"%d prisoners revealed enemy positions.",
-	L"%d elites, %d regulars and %d admins joined our cause.",
+	L"%d officers, %d elites, %d regulars and %d admins joined our cause.",
 	L"Prisoners start a massive riot in %s!",
 	L"%d prisoners were sent to %s!",
 	L"Prisoners have been released!",