- fixed an instance of wrong assignment strings

- prisoner decision messagebox now allows to select a specific prison
- Fix: under certain conditions, calling militia reinforcements with militia equipment selection could get sector items with invalid GridNo to become lost

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5888 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2013-03-02 19:14:46 +00:00
parent a798d66ae4
commit 72dbd9e33f
13 changed files with 109 additions and 56 deletions
+1
View File
@@ -942,6 +942,7 @@ enum
WEAPON_CLEANING_STR,
PRISONER_NO_PRISONS_STR,
PRISONER_DECIDE_STR,
PRISONER_LETGO_STR,
PRISONER_OFFER_SURRENDER,
PRISONER_DEMAND_SURRENDER_STR,
PRISONER_OFFER_SURRENDER_STR,
+2 -1
View File
@@ -2929,7 +2929,8 @@ CHAR16 TacticalStr[][ MED_STRING_LENGTH ] =
// added by Flugente: decide what to do with prisoners
L"你现在没有可用的监狱关押这些俘虏,你不得不放他们走。", //L"You have no prison for these prisoners, you have to let them go",
L"Yes - 将俘虏送入监狱 No - 放俘虏离开这里", //L"Yes - Send prisoners to jail No - Let them go",
L"Where do you want to send the prisoners?",//TODO.Translate
L"Let them go",
L"你想要做什么?",
L"劝说敌人投降",
L"Offer surrender",//TODO.Translate
+2 -1
View File
@@ -2926,7 +2926,8 @@ CHAR16 TacticalStr[][ MED_STRING_LENGTH ] =
// added by Flugente: decide what to do with prisoners
L"You have no prison for these prisoners, you have to let them go",
L"Yes - Send prisoners to jail No - Let them go",
L"Where do you want to send the prisoners?",//TODO.Translate
L"Let them go",
L"What do you want to do?",
L"Demand surrender",
L"Offer surrender",
+2 -1
View File
@@ -2928,7 +2928,8 @@ CHAR16 TacticalStr[][ MED_STRING_LENGTH ] =
// added by Flugente: decide what to do with prisoners
L"You have no prison for these prisoners, you have to let them go",
L"Yes - Send prisoners to jail No - Let them go",
L"Where do you want to send the prisoners?",
L"Let them go",
L"What do you want to do?",
L"Demand surrender",
L"Offer surrender",
+2 -1
View File
@@ -2933,7 +2933,8 @@ CHAR16 TacticalStr[][ MED_STRING_LENGTH ] =
// added by Flugente: decide what to do with prisoners
L"You have no prison for these prisoners, you have to let them go",
L"Yes - Send prisoners to jail No - Let them go",
L"Where do you want to send the prisoners?",//TODO.Translate
L"Let them go",
L"What do you want to do?",
L"Demand surrender",
L"Offer surrender",
+5 -4
View File
@@ -2931,12 +2931,13 @@ CHAR16 TacticalStr[][ MED_STRING_LENGTH ] =
// added by Flugente: decide what to do with prisoners
L"Sie haben kein Gefängnis für die Gefangenen und müssen diese nun laufen lassen",
L"Ja - Gefangene ins Gefängnis bringen Nein - Laßt sie gehen",
L"Wohin mit den Gefangenen?",
L"Entlassen",
L"Was möchten Sie tun?",
L"Aufgabe einfordern",
L"Aufgabe anbieten",
L"Kapitulation fordern",
L"Kapitulation anbieten",
L"Sprechen",
L"Militia inspection",//TODO.Translate
L"Miliz inspizieren",
L"unused",
};
+2 -1
View File
@@ -2921,7 +2921,8 @@ CHAR16 TacticalStr[][ MED_STRING_LENGTH ] =
// added by Flugente: decide what to do with prisoners
L"You have no prison for these prisoners, you have to let them go",
L"Yes - Send prisoners to jail No - Let them go",
L"Where do you want to send the prisoners?",//TODO.Translate
L"Let them go",
L"What do you want to do?",
L"Demand surrender",
L"Offer surrender",
+2 -1
View File
@@ -2936,7 +2936,8 @@ CHAR16 TacticalStr[][ MED_STRING_LENGTH ] =
// added by Flugente: decide what to do with prisoners
L"You have no prison for these prisoners, you have to let them go",
L"Yes - Send prisoners to jail No - Let them go",
L"Where do you want to send the prisoners?",//TODO.Translate
L"Let them go",
L"What do you want to do?",
L"Demand surrender",
L"Offer surrender",
+2 -1
View File
@@ -2928,7 +2928,8 @@ CHAR16 TacticalStr[][ MED_STRING_LENGTH ] =
// added by Flugente: decide what to do with prisoners
L"У вас нет тюрьмы для содержания заключённых, придётся отпустить их",
L"Да - Отправить заключенных в тюрьму Нет - Отпустит",
L"Where do you want to send the prisoners?",//TODO.Translate
L"Let them go",
L"Что вы хотите сделать?",
L"Требовать сдаться",
L"Предлоить сдаться",
+2 -1
View File
@@ -2930,7 +2930,8 @@ CHAR16 TacticalStr[][ MED_STRING_LENGTH ] =
// added by Flugente: decide what to do with prisoners
L"You have no prison for these prisoners, you have to let them go",
L"Yes - Send prisoners to jail No - Let them go",
L"Where do you want to send the prisoners?",//TODO.Translate
L"Let them go",
L"What do you want to do?",
L"Demand surrender",
L"Offer surrender",