From 06a832a7ab6c9eb26d4b7c6aac8e708d836a5ffc Mon Sep 17 00:00:00 2001
From: Wanne <Wanne@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Wed, 12 Feb 2014 11:45:29 +0000
Subject: [PATCH] Merged from revision: 6898 - Fixed wrong/missing texts

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6899 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 Utils/_DutchText.cpp   |  4 ++--
 Utils/_FrenchText.cpp  | 20 +++++++++++++-------
 Utils/_GermanText.cpp  |  6 +++++-
 Utils/_ItalianText.cpp |  4 ++++
 4 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/Utils/_DutchText.cpp b/Utils/_DutchText.cpp
index 1133dbcf4..edbc86d73 100644
--- a/Utils/_DutchText.cpp
+++ b/Utils/_DutchText.cpp
@@ -6035,9 +6035,9 @@ STR16 pMapScreenJustStartedHelpText[] =
 {
 	L"Ga naar AIM en huur wat huurlingen in ( *Hint* dat kan bij Laptop )",
 #ifdef JA2UB
-	L"Als je klaar bent om naar Arulco te gaan, klik dan op TijdVersneller onder rechts op het scherm.",	// to inform the player to hit time compression to get the game underway
-#else
 	L"Als je klaar bent om naar Tracona te gaan, klik dan op TijdVersneller onder rechts op het scherm.",	// to inform the player to hit time compression to get the game underway
+#else
+	L"Als je klaar bent om naar Arulco te gaan, klik dan op TijdVersneller onder rechts op het scherm.",	// to inform the player to hit time compression to get the game underway
 #endif
 };
 
diff --git a/Utils/_FrenchText.cpp b/Utils/_FrenchText.cpp
index 81538a993..067118b7d 100644
--- a/Utils/_FrenchText.cpp
+++ b/Utils/_FrenchText.cpp
@@ -2359,7 +2359,7 @@ STR16 gzMercSkillTextNew[] =
 	L"Arme automatique",
 	L"Arme lourde",
 	L"Tireur d'élite",
-	L"Éclaireur",// !!!Scout =! Eclaireur.
+	L"Éclaireur",// Hunter
 	L"Flingueur",
 	L"Arts martiaux",
 	L"Meneur",
@@ -2381,6 +2381,8 @@ STR16 gzMercSkillTextNew[] =
 
 	// new minor traits
 	L"Opérateur radio",	// 21
+	L"Snitch",	// 22   // TODO.Translate
+
 	// second names for major skills
 	L"Mitrailleur",
 	L"Bombardier",
@@ -2392,24 +2394,24 @@ STR16 gzMercSkillTextNew[] =
 	L"Ingénieur",
 	L"Chirurgien",
 	// placeholders for minor traits
-	L"Placeholder",		// 31
+	L"Placeholder",		// 32
 	L"Placeholder",
 	L"Placeholder",
 	L"Placeholder",
 	L"Placeholder",
-	L"Placeholder",		// 36
+	L"Placeholder",		// 37
 	L"Placeholder",
 	L"Placeholder",
 	L"Placeholder",
-	L"Placeholder",		// 40
-	L"Espion",			// 41
+	L"Placeholder",		// 41
+	L"Espion",			// 42
 	L"Placeholder",		// for radio operator (minor trait)
-	L"Plus...",
+	L"Placeholder",		// for snitch (minor trait)
+	L"Plus...",         // 45
 	L"Divers",			// for VARIOUSSKILLS
 };
 //////////////////////////////////////////////////////////
 
-
 // This is pop up help text for the options that are available to the merc
 
 STR16 pTacticalPopupButtonStrings[] =
@@ -6030,7 +6032,11 @@ STR16 pMilitiaButtonsHelpText[] =
 STR16 pMapScreenJustStartedHelpText[] =
 {
 	L"Allez sur le site de l'AIM et engagez des mercenaires (*Conseil* allez voir dans le Poste de travail)", // to inform the player to hired some mercs to get things going
+#ifdef JA2UB
 	L"Cliquez sur le bouton de compression du temps pour faire avancer votre escouade sur le terrain.", // to inform the player to hit time compression to get the game underway
+#else
+	L"Cliquez sur le bouton de compression du temps pour faire avancer votre escouade sur le terrain.", // to inform the player to hit time compression to get the game underway
+#endif
 };
 
 STR16 pAntiHackerString[] = 
diff --git a/Utils/_GermanText.cpp b/Utils/_GermanText.cpp
index ccb429cf4..ef303d4fe 100644
--- a/Utils/_GermanText.cpp
+++ b/Utils/_GermanText.cpp
@@ -4961,7 +4961,7 @@ STR16 AimAlumniText[] =
 	L"SEITE 3",
 	L"A.I.M.-Veteranen",	// Title of the page
 	L"ENDE",		// Stops displaying information on selected merc
-	L"Nächste",
+	L"Nächste",	
 };
 
 //AIM Home Page
@@ -5862,7 +5862,11 @@ STR16 pMilitiaButtonsHelpText[] =
 STR16 pMapScreenJustStartedHelpText[] = 
 {
 	L"Zu AIM gehen und Söldner anheuern ( *Tip*: Befindet sich im Laptop )", // to inform the player to hire some mercs to get things going
+#ifdef JA2UB
+	L"Sobald Sie für die Reise nach Tracona bereit sind, klicken Sie auf den Zeitraffer-Button unten rechts auf dem Bildschirm.", // to inform the player to hit time compression to get the game underway
+#else
 	L"Sobald Sie für die Reise nach Arulco bereit sind, klicken Sie auf den Zeitraffer-Button unten rechts auf dem Bildschirm.", // to inform the player to hit time compression to get the game underway
+#endif
 };
 
 STR16 pAntiHackerString[] = 
diff --git a/Utils/_ItalianText.cpp b/Utils/_ItalianText.cpp
index 796064cca..e1b290748 100644
--- a/Utils/_ItalianText.cpp
+++ b/Utils/_ItalianText.cpp
@@ -6019,7 +6019,11 @@ STR16 pMilitiaButtonsHelpText[] =
 STR16 pMapScreenJustStartedHelpText[] =
 {
 	L"Andate all'A.I.M. e arruolate alcuni mercenari (*Hint* è nel Laptop)", // to inform the player to hired some mercs to get things going
+#ifdef JA2UB
+	L"Quando sarete pronti per partire per Tracona, cliccate sul pulsante nella parte in basso a destra dello schermo.", // to inform the player to hit time compression to get the game underway
+#else
 	L"Quando sarete pronti per partire per Arulco, cliccate sul pulsante nella parte in basso a destra dello schermo.", // to inform the player to hit time compression to get the game underway
+#endif
 };
 
 STR16 pAntiHackerString[] =