wowgetoffyourcellphone/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Fix some string issues and reveal the name of the next release (Ken Wood).

Browse Source 
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.
This commit is contained in:
elexis 2017-08-19 11:47:24 +00:00
parent be2f3b4d42
commit 661284a403
12 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
binaries/data/mods/public/gui/common/gamedescription.js
View File

@ -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 }

2
binaries/data/mods/public/gui/common/settings.js
View File

@ -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()
{

2
binaries/data/mods/public/gui/gamesetup/gamesetup.js
View File

@ -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 :

6
binaries/data/mods/public/gui/gamesetup_mp/gamesetup_mp.xml
View File

@ -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">

8
binaries/data/mods/public/gui/options/options.json
View File

@ -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 }
}

6
binaries/data/mods/public/gui/pregame/mainmenu.xml
View File

@ -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");

2
binaries/data/mods/public/gui/session/selection_details.js
View File

@ -421,7 +421,7 @@ function displayMultiple(entStates)
"hitpoints": capturePoints[playerID],
"maxHitpoints": maxCapturePoints
},
translate("Capture points:"));
translate("Capture Points:"));
}
let numberOfUnits = Engine.GetGUIObjectByName("numberOfUnits");

2
binaries/data/mods/public/gui/session/selection_panels_middle/multiple_details_area.xml
View File

@ -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"/>

2
binaries/data/mods/public/gui/session/top_panel/button_game_speed.xml
View File

@ -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();

2
binaries/data/mods/public/gui/session/top_panel/label.xml
View File

@ -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">

8
binaries/data/mods/public/maps/scripts/CaptureTheRelic.js
View File

@ -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);

2
binaries/data/mods/public/simulation/data/settings/victory_conditions/capture_the_relic.json
View File

@ -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":
[