From c63f256c69ca6fafde36cc9a94919709ff1e7e1b Mon Sep 17 00:00:00 2001
From: lalien <lalien@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Thu, 11 May 2006 15:06:24 +0000
Subject: [PATCH] Little Alien

- Changed descriptions for options menu items



git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@64 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 JA2.vcproj             |  4 ++--
 Utils/_EnglishText.cpp |  6 +++---
 Utils/_GermanText.cpp  | 13 ++++++++-----
 Utils/_RussianText.cpp | 31 ++++++++++++++++++++++++++++---
 local.h                |  2 +-
 5 files changed, 42 insertions(+), 14 deletions(-)

diff --git a/JA2.vcproj b/JA2.vcproj
index e8807e47..d9e3cf88 100644
--- a/JA2.vcproj
+++ b/JA2.vcproj
@@ -42,7 +42,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="libexpatMT.lib mss32.lib winmm.lib smackw32.lib fmodvc.lib"
-				OutputFile="C:\games\Jagged Alliance 2 v1.13\ja2_debug_2006_04_27.exe"
+				OutputFile="C:\games\Jagged Alliance 2 v1.13\ja2_debug_2006_05_11.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories=".\..\..\Standard Gaming Platform\"
@@ -545,7 +545,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="libexpatMT.lib winmm.lib smackw32.lib mss32.lib fmodvc.lib"
-				OutputFile="C:\Games\Jagged Alliance 2 v1.13\ja2_release_2006_04_27.exe"
+				OutputFile="C:\Games\Jagged Alliance 2 v1.13\ja2_release_2006_05_11.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories=".\..\..\Standard Gaming Platform\"
diff --git a/Utils/_EnglishText.cpp b/Utils/_EnglishText.cpp
index 8d5bff46..de39d394 100644
--- a/Utils/_EnglishText.cpp
+++ b/Utils/_EnglishText.cpp
@@ -3443,7 +3443,7 @@ STR16	zOptionsScreenHelpText[] =
 	L"When ON, an additional \"safety\" click will be required for movement in Real-time.",
 
 	//Sleep/Wake notification
-  L"When ON, you will be notified when mercs on \"assignment\" go to sleep and resume work.",
+	L"When ON, you will be notified when mercs on \"assignment\" go to sleep and resume work.",
 
 	//Use the metric system
 	L"When ON, uses the metric system for measurements; otherwise it uses the Imperial system.",
@@ -3469,8 +3469,8 @@ STR16	zOptionsScreenHelpText[] =
 	L"When ON, the movement cursor is shown in 3D. ( |Home )",
 
 	// Options for 1.13
-	L"When ON, the the chance to hit is shown on the cursor.",
-	L"GL Burst, i dont know what is it :(",
+	L"When ON, the chance to hit is shown on the cursor.",
+	L"GL Burst uses burst cursor.",
 	L"Enemy drop all items, when he is dead.",
 };
 
diff --git a/Utils/_GermanText.cpp b/Utils/_GermanText.cpp
index 76c0972f..9f0fa98d 100644
--- a/Utils/_GermanText.cpp
+++ b/Utils/_GermanText.cpp
@@ -3106,10 +3106,10 @@ STR16 zSaveLoadText[] =
 	L"Schwierigkeit",
 	L"Platinum Mode", //Placeholder English
 	L"Bobby Ray's",
-	L"Good Selection",
-	L"Great Selection",
-	L"Excellent Selection",
-	L"Awesome Selection",
+	L"Normale Auswahl",
+	L"GroЯe Auswahl",
+	L"Ausgezeichnete Auswahl",
+	L"Fantastische Auswahl",
 };
 
 //MapScreen
@@ -3207,6 +3207,9 @@ STR16 zOptionsToggleText[] =
 	L"Baumkronen zeigen",
 	L"Drahtgitter zeigen",
 	L"3D Cursor zeigen",
+	L"Trefferchance anzeigen",
+	L"GL Burst verwendet burst Cursor",
+	L"Gegner lassen alles fallen",
 };
 
 //This is the help text associated with the above toggles.
@@ -3291,7 +3294,7 @@ STR16 gzGIOScreenText[] =
 	L"Einsteiger",				
 	L"Profi",
 	L"Alter Hase",
-	L"INSANE",
+	L"WAHNSINNIG",
 	L"Ok",
 	L"Abbrechen",
 	L"Extraschwer",
diff --git a/Utils/_RussianText.cpp b/Utils/_RussianText.cpp
index f82d2f2a..d8d4c0bf 100644
--- a/Utils/_RussianText.cpp
+++ b/Utils/_RussianText.cpp
@@ -134,6 +134,8 @@ UINT16 AmmoCaliber[][20] =
 	L"Ракета",
 	L"", // дротик
 	L"", // пламя
+//	L".50 cal", // barrett
+//	L"9mm Hvy", // Val silent
 };
 
 // This BobbyRayAmmoCaliber is virtually the same as AmmoCaliber however the bobby version doesnt have as much room for the words.
@@ -161,6 +163,9 @@ UINT16 BobbyRayAmmoCaliber[][20] =
 	L"Монстр",
 	L"Ракета",
 	L"", // дротик
+//	L"", // flamethrower
+//	L".50 cal", // barrett
+//	L"9mm Hvy", // Val silent
 };
 
 
@@ -284,6 +289,8 @@ UINT16 Message[][STRING_LENGTH] =
 	L"ход Кошки-Убийцы",
 	L"automatic",
 	L"no full auto",
+	L"accurate",
+	L"inaccurate",
 };
 
 
@@ -765,6 +772,7 @@ STR16 pTacticalPopupButtonStrings[] =
 	L"Исп.взрывчатку", 
 	L"Ломом",
 	L"Отмена(|E|s|c)"
+	L"Close",
 };
 
 // Door Traps. When we examine a door, it could have a particular trap on it. These are the traps.
@@ -1830,6 +1838,7 @@ STR16 pTransactionText[] =
 	L"Стоим.экипировки ополч: %s", // initial cost to equip a town's militia
 	L"Покупки у %s.",	//is used for the Shop keeper interface.  The dealers name will be appended to the end of the string.
 	L"%s положил деньги.",
+	L"Sold Item(s) to the Locals",
 };
 
 STR16 pTransactionAlternateText[] =
@@ -1920,7 +1929,7 @@ STR16 pMapErrorString[] =
 	L"чтобы двигаться, нужен эскорт.Обеспечьте ее эскортом.", // for a female
 	L"Наемник еще не прибыл в Арулько!",
 	L"Кажется,сначала нужно уладить все проблемы с контрактом.",
-	L"",
+	L"Cannot give a movement order. Air raid is going on.",		// WANNE 2
 //11-15
 	L"Приказ двигаться? Тут же битва идет!",
 	L"Вы наткнулись на засаду Кошки-Убийцы в секторе %s!",
@@ -3283,7 +3292,7 @@ STR16			zSaveLoadText[] =
 	L"Сложн.",
 	L"Platinum Mode", //Placeholder English
 	L"Bobby Ray's",
-	L"Good Selection",
+	L"Normal Selection",
 	L"Great Selection",
 	L"Excellent Selection",
 	L"Awesome Selection",
@@ -3322,6 +3331,8 @@ STR16		zMarksMapScreenText[] =
 	L"%s:много ополченцев.",
 	L"У наемн.конечн.контракт.", 
   L"Контракт наемн.не застрахован",
+	// WANNE 2
+	L"Map Overview",		// 24
 };
 
 
@@ -3381,6 +3392,9 @@ STR16		zOptionsToggleText[] =
 	L"Показать верхушки деревьев",
 	L"Показывать каркасы",
 	L"Показать трехмерный курсор",
+	L"Show Chance to Hit on the cursor",
+	L"GL Burst Uses Burst Cursor",
+	L"Enemies Drop All Items",
 };
 
 //This is the help text associated with the above toggles.
@@ -3445,6 +3459,10 @@ STR16	zOptionsScreenHelpText[] =
 
 	L"Когда опция вкл,движущийся курсор-трехмерный.( |Home )",
 
+	// Options for 1.13
+	L"When ON, the chance to hit is shown on the cursor.",
+	L"GL Burst uses burst cursor.",
+	L"Enemy drop all items, when he is dead.",
 };
 
 
@@ -3470,7 +3488,7 @@ STR16	gzGIOScreenText[] =
 	L"Время хода ограничено",
 	L"Отключено в демо-версии", 
 	L"Bobby Ray's Selection",
-	L"Good",
+	L"Normal",
 	L"Great",
 	L"Excellent",
 	L"Awesome",
@@ -3649,6 +3667,10 @@ STR16 pMessageStrings[] =
 	L"Багаж прибыл в Драссен.",
 	L"%s должен прибыть в указанное место высадки (сектор %s) в день %d,примерно в %s.",		//first %s is mercs name, next is the sector location and name where they will be arriving in, lastely is the day an the time of arrival
 	L"История обновлена.",
+	L"Grenade Bursts - Using Targeting Cursor (Spread fire enabled)",
+	L"Grenade Bursts - Using Trajectory Cursor (Spread fire disabled)",
+	L"Drop All Enabled",
+	L"Drop All Disabled",
 #ifdef JA2BETAVERSION
 	L"Игра сохранена в ячейку авто-сохранения.",
 #endif
@@ -4009,6 +4031,9 @@ STR16 gzLateLocalizedString[] =
 	L"Сопроводить Джона и Мэри?",
 	
   L"Выключатель нажат.",
+
+	L"%s's armour attachment has been smashed!",
+	L"%s fires %d more rounds than intended!"
 };
 
 STR16 gzCWStrings[] = 
diff --git a/local.h b/local.h
index 09bc6fcc..1d523d0f 100644
--- a/local.h
+++ b/local.h
@@ -5,7 +5,7 @@
 #include "Screens.h"
 
 //rain
-#include "NewGameSettings.h"
+//#include "NewGameSettings.h"
 //end rain