Merged New Inventory Project into main branch

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

Utils/_RussianText.cpp

@@ -763,7 +763,7 @@ STR16 gzMercSkillText[] =
 	L"Âîðîâñòâî",
 	L"Áîåâûå èñêóññòâà",
 	L"Õîëîäíîå îðóæèå",
-	L"Ñòðåëüáà ñ êðûø", 
+	L"Ñíàéïåð", 
 	L"Êàìóôëÿæ",
 	L"Êàìóôëÿæ (Ãîðîä)",
 	L"Êàìóôëÿæ (Ïóñòûíÿ)",
@@ -1404,6 +1404,7 @@ CHAR16 TacticalStr[][ MED_STRING_LENGTH ] =
 	L"Ñîñòîÿíèå: %d/%d\nÒîïëèâî: %d/%d",
 	L"%s íå âèäèò %s.",  // Cannot see person trying to talk to
 	L"Ïðèíàäëåæíîñòü îòñîåäèíåíà",	//ïð
+	L"Âû íå ìîæåòå ñîäåðæàòü åùå îäíó ìàøèíó, äîâîëüñòâóéòåñü óæå èìåþùèìèñÿ äâóìÿ.",
 };
 
 //Varying helptext explains (for the "Go to Sector/Map" checkbox) what will happen given different circumstances in the "exiting sector" interface.
@@ -1614,6 +1615,7 @@ STR16 pMapInventoryErrorString[] =
 	L"Âî âðåìÿ áîÿ âàì ïðèäåòñÿ ïîäáèðàòü âåùè âðó÷íóþ.",	//*ïåðåôðàçèðîâàòü, ïîêàçûâàåòñÿ êîãäà ïûòàåøüñÿ ñî ñòðàòåãè÷ êàðòû â èíâåíòàðå ñåêòîðà âçÿòü ïðåäìåò
 	L"Âî âðåìÿ áîÿ âàì ïðèäåòñÿ âûêëàäûâàòü âåùè âðó÷íóþ.",
 	L"%s âíå ýòîãî ñåêòîðà, è íå ìîæåò îñòàâèòü ïðåäìåò.",
+	L"Âî âðåìÿ áèòâû âû íå ìîæåòå çàðÿæàòü îðóæèå ïàòðîíàìè èç êîðîáà.",
 };
 
 STR16 pMapInventoryStrings[] =
@@ -2417,7 +2419,7 @@ STR16 pWebPagesTitles[] =
 STR16 pShowBookmarkString[] =
 {
 	L"Ïîäñêàçêà",
-	L"Ùåëêíèòå åùå ðàç ïî êíîïêå \"Ñàéòû\" äëÿ îòîáðàæåíèÿ    ìåíþ ñàéòîâ.",
+	L"Ùåëêíèòå åùå ðàç ïî êíîïêå \"Ñàéòû\" äëÿ îòîáðàæåíèÿ ìåíþ ñàéòîâ.",
 };
 
 STR16 pLaptopTitles[] =
@@ -2839,6 +2841,7 @@ STR16			BobbyRFilter[] =
 	// Used
 	L"Îðóæèå",
 	L"Áðîíÿ",
+	L"Ðàçãð.ñ-ìû",
 	L"Ðàçíîå",
 
 	// Armour
@@ -2856,6 +2859,7 @@ STR16			BobbyRFilter[] =
 	L"Àïòå÷êè",
 	L"Íàáîðû",
 	L"Ãîëîâíûå",
+	L"Ðàçãð.ñ-ìû",
 	L"Ðàçíîå",
 };
 
@@ -3379,6 +3383,8 @@ STR16			zSaveLoadText[] =
 	L"Áîëüøîé",
 	L"Îãðîìíûé",
 	L"Âñå, âêëþ÷àÿ ýêñêëþçèâ",
+
+	L"Íîâûé èíâåíòàðü, èñïîëüçóåìûé â ýòîì ðåëèçå, íå ðàáîòàåò ïðè ðàçðåøåíèè ýêðàíà 640õ480. Èçìåíèòå ðàçðåøåíèå è çàïóñòèò èãðó çàíîâî.",
 };
 
 
@@ -3598,6 +3604,9 @@ STR16	gzGIOScreenText[] =
 	L"Áîëüøîé",
 	L"Îãðîìíûé",
 	L"Âñå, âêëþ÷àÿ ýêñêëþçèâ",
+	L"Ðåæèì èíâåíòàðÿ",
+	L"Êëàññè÷åñêèé",
+	L"Íîâûé âàðèàíò",
 };
 
 STR16 pDeliveryLocationStrings[] =
@@ -3990,6 +3999,8 @@ STR16 sRepairsDoneString[] =
 	L"%s: çàâåðøåí ðåìîíò âñåãî îðóæèÿ è áðîíè.",
 	L"%s: çàâåðøåí ðåìîíò âñåé ýêèïèðîâêè îòðÿäà.",
 	L"%s: çàâåðøåí ðåìîíò âñåõ âåùåé, èìåþùèõñÿ ó îòðÿäà.",
+	L"%s: çàâåðøåí ðåìîíò âñåõ âåùåé, èìåþùèõñÿ ó îòðÿäà.",
+	L"%s: çàâåðøåí ðåìîíò âñåõ âåùåé, èìåþùèõñÿ ó îòðÿäà.",
 };
 
 STR16 zGioDifConfirmText[]=
@@ -4231,10 +4242,19 @@ STR16	New113MERCMercMailTexts[] =
 // INFO: Do not replace the ± characters. They indicate the <B2> (-> Newline) from the edt files
 STR16 MissingIMPSkillsDescriptions[] =
 {
-	// Rooftop sniping
-	L"Ñòðåëüáà ñ êðûø: Äàæå ìóðàâüè â îïàñíîñòè. Êàäæàÿ öåëü áåçæàëîñòíî îòñëåæèâàåòñÿ! ± ",
+	// Sniper
+	L"Ñíàéïåð: Ó âàñ ãëàçà ÿñòðåáà. Â ñâîáîäíîå âðåìÿ âû ðàçâëåêàåòåñü îòñòðåëèâàÿ êðûëûøêè ó ìóõ ñ ðàññòîÿíèÿ 100 ìåòðîâ! ± ",
 	// Camouflage
 	L"Ìàñêèðîâêà: Íà âàøåì ôîíå êóñòû âûãëÿäÿò ñèíòåòè÷åñêèìè! ± ",	
 };
 
+STR16 NewInvMessage[] = 
+{
+	L"Â äàííûé ìîìåíò ïîäíÿòü ðþêçàê íåëüçÿ.",
+	L"Âû íå ìîæåòå îäíîâðåìåííî íîñèòü 2 ðþêçàêà.",
+	L"Âû ïîòåðÿëè ñâîé ðþêçàê...",
+	L"Çàìîê ðþêçàêà ðàáîòàåò ëèøü âî âðåìÿ áèòâû.",
+	L"Âû íå ìîæåòå ïåðåäâèãàòüñÿ ñ îòêðûòûì ðþêçàêîì.",
+};
+
 #endif //RUSSIAN