From 661284a403eef53bcb41c608c2490e70983e4a14 Mon Sep 17 00:00:00 2001
From: elexis <elexis@wildfiregames.com>
Date: Sat, 19 Aug 2017 11:47:24 +0000
Subject: [PATCH] Fix some string issues and reveal the name of the next
 release (Ken Wood).

Change the tense of the Capture The Relic message, as proposed by brian
(WhiteTreePaladin).
Consistently use title case for buttons.
Use more descriptive and concise option titles.
Remove two unused strings.

Fixes #4718
Refs
https://wildfiregames.com/forum/index.php?/topic/22745-all-relics-captured-message/
Refs
https://wildfiregames.com/forum/index.php?/topic/22461-alpha-23-name-suggestions/
Reviewed by: brian (WhiteTreePaladin), leper, GunChleoc.
Release name agreed with Itms on 2017-07-29 on irc.

This was SVN commit r20000.
---
 binaries/data/mods/public/gui/common/gamedescription.js   | 4 ++--
 binaries/data/mods/public/gui/common/settings.js          | 2 +-
 binaries/data/mods/public/gui/gamesetup/gamesetup.js      | 2 +-
 .../data/mods/public/gui/gamesetup_mp/gamesetup_mp.xml    | 6 +++---
 binaries/data/mods/public/gui/options/options.json        | 8 ++++----
 binaries/data/mods/public/gui/pregame/mainmenu.xml        | 6 +++---
 .../data/mods/public/gui/session/selection_details.js     | 2 +-
 .../selection_panels_middle/multiple_details_area.xml     | 2 --
 .../public/gui/session/top_panel/button_game_speed.xml    | 2 +-
 binaries/data/mods/public/gui/session/top_panel/label.xml | 2 +-
 binaries/data/mods/public/maps/scripts/CaptureTheRelic.js | 8 ++++----
 .../settings/victory_conditions/capture_the_relic.json    | 2 +-
 12 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/binaries/data/mods/public/gui/common/gamedescription.js b/binaries/data/mods/public/gui/common/gamedescription.js
index d3f4db8c5a..d893e8109a 100644
--- a/binaries/data/mods/public/gui/common/gamedescription.js
+++ b/binaries/data/mods/public/gui/common/gamedescription.js
@@ -243,8 +243,8 @@ function getGameDescription(extended = false)
 			title = sprintf(
 				translatePluralWithContext(
 					"victory condition",
-					"Capture The Relic (%(min)s minute)",
-					"Capture The Relic (%(min)s minutes)",
+					"Capture the Relic (%(min)s minute)",
+					"Capture the Relic (%(min)s minutes)",
 					g_GameAttributes.settings.VictoryDuration
 				),
 				{ "min": g_GameAttributes.settings.VictoryDuration }
diff --git a/binaries/data/mods/public/gui/common/settings.js b/binaries/data/mods/public/gui/common/settings.js
index 480f6aa82b..4d7e1cd51a 100644
--- a/binaries/data/mods/public/gui/common/settings.js
+++ b/binaries/data/mods/public/gui/common/settings.js
@@ -132,7 +132,7 @@ function loadAIDifficulties()
 }
 
 /**
- * Loads available victory times for victory conditions like Wonder and Capture The Relic.
+ * Loads available victory times for victory conditions like Wonder and Capture the Relic.
  */
 function loadVictoryDuration()
 {
diff --git a/binaries/data/mods/public/gui/gamesetup/gamesetup.js b/binaries/data/mods/public/gui/gamesetup/gamesetup.js
index 8e2c037c43..2c36adfe4d 100644
--- a/binaries/data/mods/public/gui/gamesetup/gamesetup.js
+++ b/binaries/data/mods/public/gui/gamesetup/gamesetup.js
@@ -854,7 +854,7 @@ var g_MiscControls = {
 	},
 	"startGame": {
 		"caption": () =>
-			g_IsController ? translate("Start game!") : g_ReadyData[g_IsReady].caption,
+			g_IsController ? translate("Start Game!") : g_ReadyData[g_IsReady].caption,
 		"tooltip": (hoverIdx) =>
 			!g_IsController ?
 				g_ReadyData[g_IsReady].tooltip :
diff --git a/binaries/data/mods/public/gui/gamesetup_mp/gamesetup_mp.xml b/binaries/data/mods/public/gui/gamesetup_mp/gamesetup_mp.xml
index 1717861096..ca8fe13a2c 100644
--- a/binaries/data/mods/public/gui/gamesetup_mp/gamesetup_mp.xml
+++ b/binaries/data/mods/public/gui/gamesetup_mp/gamesetup_mp.xml
@@ -28,7 +28,7 @@
 			</object>
 
 			<object type="text" size="20 36 50% 66" style="ModernRightLabelText">
-				<translatableAttribute id="caption">Player name:</translatableAttribute>
+				<translatableAttribute id="caption">Player Name:</translatableAttribute>
 			</object>
 
 			<object name="joinPlayerName" type="input" size="50%+10 40 100%-20 64" style="ModernInput">
@@ -70,7 +70,7 @@
 
 			<object name="hostPlayerNameWrapper" hidden="true">
 				<object type="text" size="20 36 50% 66" style="ModernRightLabelText">
-					<translatableAttribute id="caption">Player name:</translatableAttribute>
+					<translatableAttribute id="caption">Player Name:</translatableAttribute>
 				</object>
 
 				<object name="hostPlayerName" type="input" size="50%+10 40 100%-20 64" style="ModernInput">
@@ -83,7 +83,7 @@
 			<!-- Host server name is only used on games started through the lobby. -->
 			<object name="hostServerNameWrapper" hidden="true">
 				<object type="text" size="20 36 50% 66" style="ModernRightLabelText">
-					<translatableAttribute id="caption">Server name:</translatableAttribute>
+					<translatableAttribute id="caption">Server Name:</translatableAttribute>
 				</object>
 
 				<object name="hostServerName" type="input" size="50%+10 40 100%-20 64" style="ModernInput">
diff --git a/binaries/data/mods/public/gui/options/options.json b/binaries/data/mods/public/gui/options/options.json
index 8106b25f63..44266dd915 100644
--- a/binaries/data/mods/public/gui/options/options.json
+++ b/binaries/data/mods/public/gui/options/options.json
@@ -152,7 +152,7 @@
 		},
 		{
 			"type": "slider",
-			"label": "Graphics quality",
+			"label": "Shader Effects",
 			"tooltip": "Number of shader effects. REQUIRES GAME RESTART",
 			"parameters": { "config": "materialmgr.quality", "min": 0, "max": 10 }
 		},
@@ -183,7 +183,7 @@
 		},
 		{
 			"type": "invertedboolean",
-			"label": "Activate water effects",
+			"label": "Water Effects",
 			"tooltip": "When OFF, use the lowest settings possible to render water. This makes other settings irrelevant.",
 			"parameters": { "config": "waterugly", "renderer": "WaterUgly" },
 			"dependencies": [ "waterfancyeffects", "waterrealdepth", "waterreflection", "waterrefraction", "watershadows" ]
@@ -238,13 +238,13 @@
 		},
 		{
 			"type": "slider",
-			"label": "FPS throttling in menus",
+			"label": "FPS Throttling in Menus",
 			"tooltip": "To save CPU workload, throttle render frequency in all menus. Set to maximum to disable throttling.",
 			"parameters": { "config": "adaptivefps.menu", "min": 20, "max": 100 }
 		},
 		{
 			"type": "slider",
-			"label": "FPS throttling in games",
+			"label": "FPS Throttling in Games",
 			"tooltip": "To save CPU workload, throttle render frequency in running games. Set to maximum to disable throttling.",
 			"parameters": { "config": "adaptivefps.session", "min": 20, "max": 100 }
 		}
diff --git a/binaries/data/mods/public/gui/pregame/mainmenu.xml b/binaries/data/mods/public/gui/pregame/mainmenu.xml
index 4e55ca458e..09e35c2665 100644
--- a/binaries/data/mods/public/gui/pregame/mainmenu.xml
+++ b/binaries/data/mods/public/gui/pregame/mainmenu.xml
@@ -453,7 +453,7 @@
 					size="4 4 100%-4 32"
 					tooltip_style="pgToolTip"
 				>
-					<translatableAttribute id="caption">Learn To Play</translatableAttribute>
+					<translatableAttribute id="caption">Learn to Play</translatableAttribute>
 					<translatableAttribute id="tooltip">Learn how to play, start the tutorial, discover the technology trees, and the history behind the civilizations</translatableAttribute>
 					<action on="Press">
 						closeMenu();
@@ -536,7 +536,7 @@
 					<!-- IMPORTANT: remember to update session/top_panel/label.xml in sync with this: -->
 					<attribute id="caption">
 						<keep>[font="sans-bold-16"]</keep>
-						<translate>Alpha XXII: Venustas</translate>
+						<translate>Alpha XXIII: Ken Wood</translate>
 						<keep>[/font]\n\n</keep>
 						<translate>WARNING: This is an early development version of the game. Many features have not been added yet.</translate>
 					</attribute>
@@ -584,7 +584,7 @@
 					tooltip_style="pgToolTip"
 					size="8 100%-72 100%-8 100%-44"
 				>
-					<translatableAttribute id="caption">Translate the game</translatableAttribute>
+					<translatableAttribute id="caption">Translate the Game</translatableAttribute>
 					<translatableAttribute id="tooltip">Click to open the 0 A.D. translate page in your browser.</translatableAttribute>
 					<action on="Press"><![CDATA[
 						openURL("http://trac.wildfiregames.com/wiki/Localization");
diff --git a/binaries/data/mods/public/gui/session/selection_details.js b/binaries/data/mods/public/gui/session/selection_details.js
index dd47be2eb0..7b7d5a44ee 100644
--- a/binaries/data/mods/public/gui/session/selection_details.js
+++ b/binaries/data/mods/public/gui/session/selection_details.js
@@ -421,7 +421,7 @@ function displayMultiple(entStates)
 				"hitpoints": capturePoints[playerID],
 				"maxHitpoints": maxCapturePoints
 			},
-			translate("Capture points:"));
+			translate("Capture Points:"));
 	}
 
 	let numberOfUnits = Engine.GetGUIObjectByName("numberOfUnits");
diff --git a/binaries/data/mods/public/gui/session/selection_panels_middle/multiple_details_area.xml b/binaries/data/mods/public/gui/session/selection_panels_middle/multiple_details_area.xml
index 44e97afe74..06d4cb58f9 100644
--- a/binaries/data/mods/public/gui/session/selection_panels_middle/multiple_details_area.xml
+++ b/binaries/data/mods/public/gui/session/selection_panels_middle/multiple_details_area.xml
@@ -27,7 +27,6 @@
 	<object size= "100%-38 50 100%-18 100%-44" type="image" tooltip_style="sessionToolTip">
 	<!-- Health bar -->
 	<object size="4 0 11 100%" type="image" name="healthMultiple" tooltip_style="sessionToolTip">
-		<translatableAttribute id="tooltip">Hitpoints</translatableAttribute>
 		<object type="image" sprite="barBorder" ghost="true" size="-1 -1 100%+1 100%+1"/>
 		<object type="image" sprite="healthBackground" ghost="true"/>
 		<object type="image" sprite="healthForeground" ghost="true" name="healthBarMultiple"/>
@@ -36,7 +35,6 @@
 
 	<!-- Capture bar -->
 	<object size="15 0 22 100%" type="image" name="captureMultiple" tooltip_style="sessionToolTip">
-		<translatableAttribute id="tooltip">Capture points</translatableAttribute>
 		<object type="image" sprite="barBorder" ghost="true" size="-1 -1 100%+1 100%+1"/>
 		<repeat count="9">
 			<object type="image" sprite="playerColorBackground" ghost="true" name="captureBarMultiple[n]" hidden="true"/>
diff --git a/binaries/data/mods/public/gui/session/top_panel/button_game_speed.xml b/binaries/data/mods/public/gui/session/top_panel/button_game_speed.xml
index 35e210b61b..fecac5d480 100644
--- a/binaries/data/mods/public/gui/session/top_panel/button_game_speed.xml
+++ b/binaries/data/mods/public/gui/session/top_panel/button_game_speed.xml
@@ -7,7 +7,7 @@
 		style="iconButton"
 		tooltip_style="sessionToolTip"
 	>
-		<translatableAttribute id="tooltip">Game speed</translatableAttribute>
+		<translatableAttribute id="tooltip">Game Speed</translatableAttribute>
 		<object size="5 5 100%-5 100%-5" type="image" sprite="stretched:session/icons/resources/time_small.png" ghost="true"/>
 		<action on="Press">
 			toggleGameSpeed();
diff --git a/binaries/data/mods/public/gui/session/top_panel/label.xml b/binaries/data/mods/public/gui/session/top_panel/label.xml
index 5d0a721264..4f5ff82733 100644
--- a/binaries/data/mods/public/gui/session/top_panel/label.xml
+++ b/binaries/data/mods/public/gui/session/top_panel/label.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <object size="50%+20 0 100%-226 100%" name="alphaLabel" type="text" style="ModernLabelText" text_valign="top" ghost="true">
 	<!-- IMPORTANT: remember to update pregame/mainmenu.xml in sync with this: -->
-	<translatableAttribute id="caption">ALPHA XXII : Venustas</translatableAttribute>
+	<translatableAttribute id="caption">ALPHA XXIII : Ken Wood</translatableAttribute>
 
 	<!-- Displays build date and revision number-->
 	<object size="50%-128 0 50%+128 100%-2" name="buildTimeLabel" type="text" style="BuildNameText" ghost="true">
diff --git a/binaries/data/mods/public/maps/scripts/CaptureTheRelic.js b/binaries/data/mods/public/maps/scripts/CaptureTheRelic.js
index 1d0cebb1d1..58e4488969 100644
--- a/binaries/data/mods/public/maps/scripts/CaptureTheRelic.js
+++ b/binaries/data/mods/public/maps/scripts/CaptureTheRelic.js
@@ -127,8 +127,8 @@ Trigger.prototype.StartCaptureTheRelicCountdown = function(playerAndAllies)
 	let isTeam = playerAndAllies.length > 1;
 	this.ownRelicsVictoryMessage = cmpGuiInterface.AddTimeNotification({
 		"message": isTeam ?
-			markForTranslation("%(player)s's team has captured all relics and will have won in %(time)s") :
-			markForTranslation("%(player)s has captured all relics and will have won in %(time)s"),
+			markForTranslation("%(player)s's team has captured all relics and will win in %(time)s.") :
+			markForTranslation("%(player)s has captured all relics and will win in %(time)s."),
 		"players": others,
 		"parameters": {
 			"player": cmpPlayer.GetName()
@@ -139,8 +139,8 @@ Trigger.prototype.StartCaptureTheRelicCountdown = function(playerAndAllies)
 
 	this.othersRelicsVictoryMessage = cmpGuiInterface.AddTimeNotification({
 		"message": isTeam ?
-			markForTranslation("Your team has captured all relics and will have won in %(time)s") :
-			markForTranslation("You have captured all relics and will have won in %(time)s"),
+			markForTranslation("Your team has captured all relics and will win in %(time)s.") :
+			markForTranslation("You have captured all relics and will win in %(time)s."),
 		"players": playerAndAllies,
 		"translateMessage": true
 	}, captureTheRelicDuration);
diff --git a/binaries/data/mods/public/simulation/data/settings/victory_conditions/capture_the_relic.json b/binaries/data/mods/public/simulation/data/settings/victory_conditions/capture_the_relic.json
index ed2b5ffa9d..2cd40322c7 100644
--- a/binaries/data/mods/public/simulation/data/settings/victory_conditions/capture_the_relic.json
+++ b/binaries/data/mods/public/simulation/data/settings/victory_conditions/capture_the_relic.json
@@ -2,7 +2,7 @@
 	"TranslatedKeys": ["Title", "Description"],
 	"Data":
 	{
-		"Title": "Capture The Relic",
+		"Title": "Capture the Relic",
 		"Description": "Capture all relics spread across the map and keep them for a certain time to win the game.",
 		"Scripts":
 		[