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

- Fix: individual militia are not properly disbanded if player runs out of funds

Browse Source 
- Fix: wrong website names used
- Removed confusing links on militia overview website

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8448 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2017-08-15 11:57:10 +00:00
parent 8e6cff9b5d
commit 561f6387cd
13 changed files with 41 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Utils/_ChineseText.cpp
+3 -10
View File
@@ -5122,18 +5122,17 @@ STR16 pWebPagesTitles[] =
L"%s新闻发布会 - 战役报告",
L"%s新闻发布会 - 最新消息",
L"%s新闻发布会 - 关于我们",
L"佣兵喜欢或不喜欢你 - 家", //L"Mercs Love or Dislike You - Home",
L"佣兵喜欢或不喜欢你 - 关于我们", //L"Mercs Love or Dislike You - About us",
L"佣兵喜欢或不喜欢你 - 队伍分析", //L"Mercs Love or Dislike You - Analyze a team",
L"佣兵喜欢或不喜欢你 - 成对对比", //L"Mercs Love or Dislike You - Pairwise comparison",
L"佣兵喜欢或不喜欢你 - 关于我们", //L"Mercs Love or Dislike You - About us",
L"Mercs Love or Dislike You - Personality", // TODO.Translate
L"世界卫生组织 - 关于世界卫生组织", //L"WHO - About WHO",
L"世界卫生组织 - 阿鲁克的疾病", //L"WHO - Disease in Arulco",
L"世界卫生组织 - 有用的贴士", //L"WHO - Helpful Tips",
L"Kerberus安保公司 - 关于我们", //L"Kerberus - About Us",
L"Kerberus安保公司 - 雇佣队伍", //L"Kerberus - Hire a Team",
L"Kerberus安保公司 - 独立协议", //L"Kerberus - Individual Contracts",
L"民兵名单",//L"Militia Roster",
L"民兵统计",//L"Militia Statistics",
L"Militia Overview", // TODO.Translate
L"Bobby Ray - 最近的运货",
L"百科全书",
L"百科全书 - 数据",
@@ -11078,12 +11077,6 @@ STR16 szMilitiaWebSite[] =
// main page
L"民兵",//L"Militia",
L"民兵力量总览",//L"Militia Forces Overview",
// links to other pages
L"民兵名单",//L"Militia Roster",
L"统计",//L"Statistics",
L"关于",//L"About",
};
STR16 szIndividualMilitiaBattleReportText[] =
Utils/_DutchText.cpp
+4 -11
View File
@@ -5130,19 +5130,18 @@ STR16 pWebPagesTitles[] =
L"%s Press Council - Battle Reports",
L"%s Press Council - Latest News",
L"%s Press Council - About us",
L"Mercs Love or Dislike You - Home", // TODO.Translate
L"Mercs Love or Dislike You - About us",
L"Mercs Love or Dislike You - Analyze a team",
L"Mercs Love or Dislike You - Pairwise comparison",
L"Mercs Love or Dislike You - About us",
L"Mercs Love or Dislike You - Personality",
L"WHO - About WHO",
L"WHO - Disease in Arulco",
L"WHO - Helpful Tips",
L"Kerberus - About Us",
L"Kerberus - Hire a Team",
L"Kerberus - Individual Contracts",
L"Militia Roster", // TODO.Translate
L"Militia Statistics",
L"Bobby Ray's - Recentelijke Zendingen",
L"Militia Overview",
L"Bobby Ray's - Recent Shipments",
L"Encyclopedia",
L"Encyclopedia - Data",
L"Briefing Room",
@@ -11096,12 +11095,6 @@ STR16 szMilitiaWebSite[] =
// main page
L"Militia",
L"Militia Forces Overview",
// links to other pages
L"Militia Roster",
L"Statistics",
L"About",
};
STR16 szIndividualMilitiaBattleReportText[] =
Utils/_EnglishText.cpp
+2 -10
View File
@@ -5119,19 +5119,17 @@ STR16 pWebPagesTitles[] =
L"%s Press Council - Battle Reports",
L"%s Press Council - Latest News",
L"%s Press Council - About us",
L"Mercs Love or Dislike You - Home",
L"Mercs Love or Dislike You - About us",
L"Mercs Love or Dislike You - Analyze a team",
L"Mercs Love or Dislike You - Pairwise comparison",
L"Mercs Love or Dislike You - Personality",
L"Mercs Love or Dislike You - About us",
L"WHO - About WHO",
L"WHO - Disease in Arulco",
L"WHO - Helpful Tips",
L"Kerberus - About Us",
L"Kerberus - Hire a Team",
L"Kerberus - Individual Contracts",
L"Militia Roster",
L"Militia Statistics",
L"Militia Overview",
L"Bobby Ray's - Recent Shipments",
L"Encyclopedia",
L"Encyclopedia - Data",
@@ -11077,12 +11075,6 @@ STR16 szMilitiaWebSite[] =
// main page
L"Militia",
L"Militia Forces Overview",
// links to other pages
L"Militia Roster",
L"Statistics",
L"About",
};
STR16 szIndividualMilitiaBattleReportText[] =
Utils/_FrenchText.cpp
+3 -10
View File
@@ -5135,18 +5135,17 @@ STR16 pWebPagesTitles[] =
L"%s, conseil de presse : Rapports",
L"%s, conseil de presse : Dernières nouvelles",
L"%s, conseil de presse : À propos de nous",
L"Mercs Love or Dislike You - Home", // TODO.Translate
L"Mercs Love or Dislike You - About us", // TODO.Translate
L"Mercs Love or Dislike You - Analyze a team",
L"Mercs Love or Dislike You - Pairwise comparison",
L"Mercs Love or Dislike You - About us",
L"Mercs Love or Dislike You - Personality",
L"WHO - About WHO",
L"WHO - Disease in Arulco",
L"WHO - Helpful Tips",
L"Kerberus - About Us",
L"Kerberus - Hire a Team",
L"Kerberus - Individual Contracts",
L"Militia Roster", // TODO.Translate
L"Militia Statistics",
L"Militia Overview", // TODO.Translate
L"Bobby Ray : Dernières commandes",
L"Encyclopédie",
L"Encyclopédie : Données",
@@ -11078,12 +11077,6 @@ STR16 szMilitiaWebSite[] =
// main page
L"Militia",
L"Militia Forces Overview",
// links to other pages
L"Militia Roster",
L"Statistics",
L"About",
};
STR16 szIndividualMilitiaBattleReportText[] =
Utils/_GermanText.cpp
+3 -10
View File
@@ -5071,18 +5071,17 @@ STR16 pWebPagesTitles[] =
L"%s Presse Rat - Kampfberichte",
L"%s Presse Rat - Aktuellste Neuigkeiten",
L"%s Presse Rat - Über uns",
L"Mercs Love or Dislike You - Home", // TODO.Translate
L"Mercs Love or Dislike You - About us", // TODO.Translate
L"Mercs Love or Dislike You - Analyze a team",
L"Mercs Love or Dislike You - Pairwise comparison",
L"Mercs Love or Dislike You - About us",
L"Mercs Love or Dislike You - Personality",
L"WHO - About WHO",
L"WHO - Disease in Arulco",
L"WHO - Helpful Tips",
L"Kerberus - About Us",
L"Kerberus - Hire a Team",
L"Kerberus - Individual Contracts",
L"Militia Roster", // TODO.Translate
L"Militia Statistics",
L"Miliz - Übersicht",
L"Bobby Rays - Letzte Lieferungen",
L"Enzyklopädie",
L"Enzyklopädie - Daten",
@@ -10908,12 +10907,6 @@ STR16 szMilitiaWebSite[] =
// main page
L"Militia",
L"Militia Forces Overview",
// links to other pages
L"Militia Roster",
L"Statistics",
L"About",
};
STR16 szIndividualMilitiaBattleReportText[] =
Utils/_ItalianText.cpp
+4 -11
View File
@@ -5117,19 +5117,18 @@ STR16 pWebPagesTitles[] =
L"%s Press Council - Battle Reports",
L"%s Press Council - Latest News",
L"%s Press Council - About us",
L"Mercs Love or Dislike You - Home", // TODO.Translate
L"Mercs Love or Dislike You - About us", // TODO.Translate
L"Mercs Love or Dislike You - Analyze a team",
L"Mercs Love or Dislike You - Pairwise comparison",
L"Mercs Love or Dislike You - About us",
L"Mercs Love or Dislike You - Personality",
L"WHO - About WHO",
L"WHO - Disease in Arulco",
L"WHO - Helpful Tips",
L"Kerberus - About Us",
L"Kerberus - Hire a Team",
L"Kerberus - Individual Contracts",
L"Militia Roster", // TODO.Translate
L"Militia Statistics",
L"Bobby Ray - Spedizioni recenti",
L"Militia Overview",
L"Bobby Ray's - Recent Shipments",
L"Encyclopedia",
L"Encyclopedia - Data",
L"Briefing Room",
@@ -11087,12 +11086,6 @@ STR16 szMilitiaWebSite[] =
// main page
L"Militia",
L"Militia Forces Overview",
// links to other pages
L"Militia Roster",
L"Statistics",
L"About",
};
STR16 szIndividualMilitiaBattleReportText[] =
Utils/_PolishText.cpp
+3 -10
View File
@@ -5132,18 +5132,17 @@ STR16 pWebPagesTitles[] =
L"%s Press Council - Battle Reports",
L"%s Press Council - Latest News",
L"%s Press Council - About us",
L"Mercs Love or Dislike You - Home", // TODO.Translate
L"Mercs Love or Dislike You - About us", // TODO.Translate
L"Mercs Love or Dislike You - Analyze a team",
L"Mercs Love or Dislike You - Pairwise comparison",
L"Mercs Love or Dislike You - About us",
L"Mercs Love or Dislike You - Personality",
L"WHO - About WHO",
L"WHO - Disease in Arulco",
L"WHO - Helpful Tips",
L"Kerberus - About Us",
L"Kerberus - Hire a Team",
L"Kerberus - Individual Contracts",
L"Militia Roster", // TODO.Translate
L"Militia Statistics",
L"Militia Overview", // TODO.Translate
L"Bobby Ray's - Ostatnie dostawy",
L"Encyclopedia",
L"Encyclopedia - Dane",
@@ -11100,12 +11099,6 @@ STR16 szMilitiaWebSite[] =
// main page
L"Militia",
L"Militia Forces Overview",
// links to other pages
L"Militia Roster",
L"Statistics",
L"About",
};
STR16 szIndividualMilitiaBattleReportText[] =
Utils/_RussianText.cpp
+2 -10
View File
@@ -5123,19 +5123,17 @@ STR16 pWebPagesTitles[] =
L"%s Пресс-служба - Боевые отчеты",
L"%s Пресс-служба - Последние новости",
L"%s Пресс-служба - О нас",
L"\"Бойцы Любят Тебя или Клянут\"",
L"\"Бойцы Любят Тебя или Клянут\" О нас",
L"\"Бойцы Любят Тебя или Клянут\" Анализ команды",
L"\"Бойцы Любят Тебя или Клянут\" Парные сравнения",
L"\"Бойцы Любят Тебя или Клянут\" Комментарии",
L"\"Бойцы Любят Тебя или Клянут\" О нас",
L"ВОЗ",
L"ВОЗ - Заболевания в Арулько",
L"ВОЗ - Полезно знать",
L"Цербер",
L"Цербер - Найм команды",
L"Цербер - Индивидуальные контракты",
L"Список ополчения",
L"Статистика ополчения",
L"Militia Overview", // TODO.Translate
L"Бобби Рэй - последние поступления",
L"Энциклопедия",
L"Энциклопедия - данные",
@@ -11081,12 +11079,6 @@ STR16 szMilitiaWebSite[] =
// main page
L"Ополчение",
L"Силы ополчения",
// links to other pages
L"Список",
L"Статистика",
L"О нас",
};
STR16 szIndividualMilitiaBattleReportText[] =