1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-02 14:36:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

- Fix: wrong print format in militia battlereports

Browse Source 
- Added flag for militia desertion

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8547 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2018-03-14 19:46:43 +00:00
parent 524fc502f8
commit 56f9864441
12 changed files with 72 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Utils/_ChineseText.cpp
+6 -5
View File
@@ -11127,8 +11127,8 @@ STR16 szMilitiaWebSite[] =
STR16 szIndividualMilitiaBattleReportText[] =
{
L"参与行动 %s",//L"Took part in Operation %s",
L"招募日期 %d, %d:%2d in %s",//L"Recruited on Day %d, %d:%2d in %s",
L"加薪日期 %d, %d:%2d",//L"Promoted on Day %d, %d:%2d",
L"招募日期 %d, %d:%02d in %s",//L"Recruited on Day %d, %d:%02d in %s",
L"加薪日期 %d, %d:%02d",//L"Promoted on Day %d, %d:%02d",
L"KIA,行动 %s",//L"KIA, Operation %s",
L"在行动中受了轻伤 %s",//L"Lightly wounded during Operation %s",
@@ -11136,9 +11136,9 @@ STR16 szIndividualMilitiaBattleReportText[] =
L"在行动中受了致命伤 %s",//L"Critically wounded during Operation %s",
L"在行动中勇敢地战斗 %s",//L"Valiantly fought in Operation %s",
L"从Kerberus安保公司雇佣的时间：%d, %d:%2d 在 %s",//L"Hired from Kerberus on Day %d, %d:%2d in %s",
L"反叛的时间：%d, %d:%2d 在 %s",//L"Defected to us on Day %d, %d:%2d in %s",
L"合同终止的时间：%d, %d:%2d",//L"Contract terminated on Day %d, %d:%2d",
L"从Kerberus安保公司雇佣的时间：%d, %d:%02d 在 %s",//L"Hired from Kerberus on Day %d, %d:%02d in %s",
L"反叛的时间：%d, %d:%02d 在 %s",//L"Defected to us on Day %d, %d:%02d in %s",
L"合同终止的时间：%d, %d:%02d",//L"Contract terminated on Day %d, %d:%02d",
};
STR16 szIndividualMilitiaTraitRequirements[] =
@@ -11191,6 +11191,7 @@ STR16 szIdividualMilitiaWebsiteText[] =
L"%s 在现在载入的区域尚未激活.",//L"%s is not active in the currently loaded sector.",
L"%s 已经被提升为熟练民兵",//L"%s has been promoted to regular militia",
L"%s 已经被提升为精英民兵",//L"%s has been promoted to elite militia",
L"Status: Deserted", // TODO:Translate
};
STR16 szIdividualMilitiaWebsiteFilterText_Dead[] =
Utils/_DutchText.cpp
+6 -5
View File
@@ -11145,8 +11145,8 @@ STR16 szMilitiaWebSite[] =
STR16 szIndividualMilitiaBattleReportText[] =
{
L"Took part in Operation %s",
L"Recruited on Day %d, %d:%2d in %s",
L"Promoted on Day %d, %d:%2d",
L"Recruited on Day %d, %d:%02d in %s",
L"Promoted on Day %d, %d:%02d",
L"KIA, Operation %s",
L"Lightly wounded during Operation %s",
@@ -11154,9 +11154,9 @@ STR16 szIndividualMilitiaBattleReportText[] =
L"Critically wounded during Operation %s",
L"Valiantly fought in Operation %s",
L"Hired from Kerberus on Day %d, %d:%2d in %s",
L"Defected to us on Day %d, %d:%2d in %s",
L"Contract terminated on Day %d, %d:%2d",
L"Hired from Kerberus on Day %d, %d:%02d in %s",
L"Defected to us on Day %d, %d:%02d in %s",
L"Contract terminated on Day %d, %d:%02d",
};
STR16 szIndividualMilitiaTraitRequirements[] =
@@ -11209,6 +11209,7 @@ STR16 szIdividualMilitiaWebsiteText[] =
L"%s is not active in the currently loaded sector.",
L"%s has been promoted to regular militia",
L"%s has been promoted to elite militia",
L"Status: Deserted", // TODO:Translate
};
STR16 szIdividualMilitiaWebsiteFilterText_Dead[] =
Utils/_EnglishText.cpp
+6 -5
View File
@@ -11129,8 +11129,8 @@ STR16 szMilitiaWebSite[] =
STR16 szIndividualMilitiaBattleReportText[] =
{
L"Took part in Operation %s",
L"Recruited on Day %d, %d:%2d in %s",
L"Promoted on Day %d, %d:%2d",
L"Recruited on Day %d, %d:%02d in %s",
L"Promoted on Day %d, %d:%02d",
L"KIA, Operation %s",
L"Lightly wounded during Operation %s",
@@ -11138,9 +11138,9 @@ STR16 szIndividualMilitiaBattleReportText[] =
L"Critically wounded during Operation %s",
L"Valiantly fought in Operation %s",
L"Hired from Kerberus on Day %d, %d:%2d in %s",
L"Defected to us on Day %d, %d:%2d in %s",
L"Contract terminated on Day %d, %d:%2d",
L"Hired from Kerberus on Day %d, %d:%02d in %s",
L"Defected to us on Day %d, %d:%02d in %s",
L"Contract terminated on Day %d, %d:%02d",
};
STR16 szIndividualMilitiaTraitRequirements[] =
@@ -11193,6 +11193,7 @@ STR16 szIdividualMilitiaWebsiteText[] =
L"%s is not active in the currently loaded sector.",
L"%s has been promoted to regular militia",
L"%s has been promoted to elite militia",
L"Status: Deserted",
};
STR16 szIdividualMilitiaWebsiteFilterText_Dead[] =
Utils/_FrenchText.cpp
+6 -5
View File
@@ -11127,8 +11127,8 @@ STR16 szMilitiaWebSite[] =
STR16 szIndividualMilitiaBattleReportText[] =
{
L"Took part in Operation %s",
L"Recruited on Day %d, %d:%2d in %s",
L"Promoted on Day %d, %d:%2d",
L"Recruited on Day %d, %d:%02d in %s",
L"Promoted on Day %d, %d:%02d",
L"KIA, Operation %s",
L"Lightly wounded during Operation %s",
@@ -11136,9 +11136,9 @@ STR16 szIndividualMilitiaBattleReportText[] =
L"Critically wounded during Operation %s",
L"Valiantly fought in Operation %s",
L"Hired from Kerberus on Day %d, %d:%2d in %s",
L"Defected to us on Day %d, %d:%2d in %s",
L"Contract terminated on Day %d, %d:%2d",
L"Hired from Kerberus on Day %d, %d:%02d in %s",
L"Defected to us on Day %d, %d:%02d in %s",
L"Contract terminated on Day %d, %d:%02d",
};
STR16 szIndividualMilitiaTraitRequirements[] =
@@ -11191,6 +11191,7 @@ STR16 szIdividualMilitiaWebsiteText[] =
L"%s is not active in the currently loaded sector.",
L"%s has been promoted to regular militia",
L"%s has been promoted to elite militia",
L"Status: Deserted", // TODO:Translate
};
STR16 szIdividualMilitiaWebsiteFilterText_Dead[] =
Utils/_GermanText.cpp
+6 -5
View File
@@ -10957,8 +10957,8 @@ STR16 szMilitiaWebSite[] =
STR16 szIndividualMilitiaBattleReportText[] =
{
L"Took part in Operation %s",
L"Recruited on Day %d, %d:%2d in %s",
L"Promoted on Day %d, %d:%2d",
L"Recruited on Day %d, %d:%02d in %s",
L"Promoted on Day %d, %d:%02d",
L"KIA, Operation %s",
L"Lightly wounded during Operation %s",
@@ -10966,9 +10966,9 @@ STR16 szIndividualMilitiaBattleReportText[] =
L"Critically wounded during Operation %s",
L"Valiantly fought in Operation %s",
L"Hired from Kerberus on Day %d, %d:%2d in %s",
L"Defected to us on Day %d, %d:%2d in %s",
L"Contract terminated on Day %d, %d:%2d",
L"Hired from Kerberus on Day %d, %d:%02d in %s",
L"Defected to us on Day %d, %d:%02d in %s",
L"Contract terminated on Day %d, %d:%02d",
};
STR16 szIndividualMilitiaTraitRequirements[] =
@@ -11021,6 +11021,7 @@ STR16 szIdividualMilitiaWebsiteText[] =
L"%s is not active in the currently loaded sector.",
L"%s has been promoted to regular militia",
L"%s has been promoted to elite militia",
L"Status: Deserted", // TODO:Translate
};
STR16 szIdividualMilitiaWebsiteFilterText_Dead[] =
Utils/_ItalianText.cpp
+6 -5
View File
@@ -11136,8 +11136,8 @@ STR16 szMilitiaWebSite[] =
STR16 szIndividualMilitiaBattleReportText[] =
{
L"Took part in Operation %s",
L"Recruited on Day %d, %d:%2d in %s",
L"Promoted on Day %d, %d:%2d",
L"Recruited on Day %d, %d:%02d in %s",
L"Promoted on Day %d, %d:%02d",
L"KIA, Operation %s",
L"Lightly wounded during Operation %s",
@@ -11145,9 +11145,9 @@ STR16 szIndividualMilitiaBattleReportText[] =
L"Critically wounded during Operation %s",
L"Valiantly fought in Operation %s",
L"Hired from Kerberus on Day %d, %d:%2d in %s",
L"Defected to us on Day %d, %d:%2d in %s",
L"Contract terminated on Day %d, %d:%2d",
L"Hired from Kerberus on Day %d, %d:%02d in %s",
L"Defected to us on Day %d, %d:%02d in %s",
L"Contract terminated on Day %d, %d:%02d",
};
STR16 szIndividualMilitiaTraitRequirements[] =
@@ -11200,6 +11200,7 @@ STR16 szIdividualMilitiaWebsiteText[] =
L"%s is not active in the currently loaded sector.",
L"%s has been promoted to regular militia",
L"%s has been promoted to elite militia",
L"Status: Deserted", // TODO:Translate
};
STR16 szIdividualMilitiaWebsiteFilterText_Dead[] =
Utils/_PolishText.cpp
+6 -5
View File
@@ -11149,8 +11149,8 @@ STR16 szMilitiaWebSite[] =
STR16 szIndividualMilitiaBattleReportText[] =
{
L"Took part in Operation %s",
L"Recruited on Day %d, %d:%2d in %s",
L"Promoted on Day %d, %d:%2d",
L"Recruited on Day %d, %d:%02d in %s",
L"Promoted on Day %d, %d:%02d",
L"KIA, Operation %s",
L"Lightly wounded during Operation %s",
@@ -11158,9 +11158,9 @@ STR16 szIndividualMilitiaBattleReportText[] =
L"Critically wounded during Operation %s",
L"Valiantly fought in Operation %s",
L"Hired from Kerberus on Day %d, %d:%2d in %s",
L"Defected to us on Day %d, %d:%2d in %s",
L"Contract terminated on Day %d, %d:%2d",
L"Hired from Kerberus on Day %d, %d:%02d in %s",
L"Defected to us on Day %d, %d:%02d in %s",
L"Contract terminated on Day %d, %d:%02d",
};
STR16 szIndividualMilitiaTraitRequirements[] =
@@ -11213,6 +11213,7 @@ STR16 szIdividualMilitiaWebsiteText[] =
L"%s is not active in the currently loaded sector.",
L"%s has been promoted to regular militia",
L"%s has been promoted to elite militia",
L"Status: Deserted", // TODO:Translate
};
STR16 szIdividualMilitiaWebsiteFilterText_Dead[] =
Utils/_RussianText.cpp
+6 -5
View File
@@ -11129,8 +11129,8 @@ STR16 szMilitiaWebSite[] =
STR16 szIndividualMilitiaBattleReportText[] =
{
L"Участи в Операции %s",
L"Пришел в день %d, %d:%2d in %s",
L"Повышен в день %d, %d:%2d",
L"Пришел в день %d, %d:%02d in %s",
L"Повышен в день %d, %d:%02d",
L"KIA, Operation %s",
L"Мелкое ранение в операции %s",
@@ -11138,9 +11138,9 @@ STR16 szIndividualMilitiaBattleReportText[] =
L"Критическое ранение в операции %s",
L"Проявил(а) доблесть в операции %s",
L"Нанят из Цербера в день %d, %d:%2d in %s",
L"Defected to us on Day %d, %d:%2d in %s",
L"Contract terminated on Day %d, %d:%2d",
L"Нанят из Цербера в день %d, %d:%02d in %s",
L"Defected to us on Day %d, %d:%02d in %s",
L"Contract terminated on Day %d, %d:%02d",
};
STR16 szIndividualMilitiaTraitRequirements[] =
@@ -11193,6 +11193,7 @@ STR16 szIdividualMilitiaWebsiteText[] =
L"%s is not active in the currently loaded sector.",
L"%s has been promoted to regular militia",
L"%s has been promoted to elite militia",
L"Status: Deserted", // TODO:Translate
};
STR16 szIdividualMilitiaWebsiteFilterText_Dead[] =