1
0
forked from 0ad/0ad

Fix some issues reported on Transifex.

This was SVN commit r17037.
This commit is contained in:
Nicolas Auvray 2015-09-18 19:51:56 +00:00
parent 0c043b5bdb
commit 7b84c26a44
12 changed files with 27 additions and 14 deletions

View File

@ -98,6 +98,7 @@ function updateCounters()
{
var currentSpeed = Engine.GetSimRate();
if (currentSpeed != 1.0)
// Translation: The "x" means "times", with the mathematical meaning of multiplication.
caption += sprintf(
translate("%(time)s (%(speed)sx)"),
{

View File

@ -474,6 +474,7 @@ function addChatMessage(msg)
{
let lastAmount = amounts.pop();
amounts = sprintf(translate("%(previousAmounts)s and %(lastAmount)s"), {
// Translation: This comma is used for separating first to penultimate elements in an enumeration.
"previousAmounts": amounts.join(translate(", ")),
"lastAmount": lastAmount
});

View File

@ -138,12 +138,12 @@ function getTradingTooltip(gain)
});
if (gain.market1Gain && gain.market1Owner != gain.traderOwner)
tooltip += translate(", ") + sprintf(translate("%(gain)s (%(player)s)"), {
tooltip += translateWithContext("Separation mark in an enumeration", ", ") + sprintf(translate("%(gain)s (%(player)s)"), {
gain: gain.market1Gain,
player: (!g_IsNetworked && gain.market1Owner == playerID) ? translate("You") : simState.players[gain.market1Owner].name
});
if (gain.market2Gain && gain.market2Owner != gain.traderOwner)
tooltip += translate(", ") + sprintf(translate("%(gain)s (%(player)s)"), {
tooltip += translateWithContext("Separation mark in an enumeration", ", ") + sprintf(translate("%(gain)s (%(player)s)"), {
gain: gain.market2Gain,
player: (!g_IsNetworked && gain.market2Owner == playerID) ? translate("You") : simState.players[gain.market2Owner].name
});

View File

@ -1,6 +1,6 @@
PIKEMEN
- Heavily armored and slow. Low attack.
- Used against cavalry for a 4x attack bonus or against other melee infantry to pin them them in place.
- Used against cavalry or against other melee infantry to pin them in place.
- Available to: Macedonians, Seleucids, and Ptolemies.

View File

@ -1,8 +1,8 @@
STOA
- A special starting structure for the Hellenes.
- A special starting structure for Greek factions.
- Grants +10 Population.
- Only enabled in some game modes.
- Only present on some maps.
- Can be found in the Atlas editor for custom scenarios.

View File

@ -255,7 +255,7 @@ var economic_walkthrough = [
{
"trigger": "time",
"time": 525,
"instructions": markForTranslation(" - Build enough houses, your CC should be kept busy as much as possible, it is the only training building until town phase.")
"instructions": markForTranslation(" - Build enough houses, your CC should be kept busy as much as possible.")
},
{
"trigger": "time",

View File

@ -22,13 +22,21 @@ Visibility.prototype.Init = function()
{
this.retainInFog = this.template.RetainInFog == "true";
this.alwaysVisible = this.template.AlwaysVisible == "true";
this.corpse = this.template.Corpse == "true";
this.preview = this.template.Preview == "true";
this.activated = false;
// This component is used by corpses and previews.
// Activation happens at template loading.
this.corpse = this.template.Corpse == "true";
this.preview = this.template.Preview == "true";
if (this.preview || this.corpse)
this.SetActivated(true);
// If the entity is a GarrisonHolder, it can hold units from
// other players than the owner. In that situation, the entity needs
// to be visible for those players, else they won't be able to un-
// garrison their own units.
this.garrisonPlayers = [];
};
/**
@ -52,6 +60,11 @@ Visibility.prototype.IsActivated = function()
return this.activated;
};
Visibility.prototype.ChangeGarrisonPlayers = function(players)
{
};
/**
* This function is called if the range manager scriptedVisibility flag is set to true for this entity.
* If so, the return value supersedes the visibility computed by the range manager.

View File

@ -8,7 +8,7 @@
<Capturable.GarrisonRegenRate> <Add>2</Add> </Capturable.GarrisonRegenRate>
</Modifications>
<AuraName>Hero Aura</AuraName>
<AuraDescription>When garrisoned in a structure, it galvanizes its defenders, +2 GarrisonRegenRate</AuraDescription>
<AuraDescription>When garrisoned in a structure, the hero gives it a bonus of +2 capture points recovery rate.</AuraDescription>
</AuraA>
</Auras>
<Attack>

View File

@ -12,7 +12,7 @@
<Attack.Capture.Value> <Add>1</Add> </Attack.Capture.Value>
</Modifications>
<AuraName>Tactician Aura</AuraName>
<AuraDescription>All allied units +2 Attack and +1 Capture within vision range of him.</AuraDescription>
<AuraDescription>All allied units +2 Attack and +1 Capture within his vision range.</AuraDescription>
<OverlayIcon>art/textures/ui/session/auras/attack_bonus.png</OverlayIcon>
</Aura1>
</Auras>

View File

@ -22,8 +22,7 @@
<GenericName>Darius The Great</GenericName>
<SpecificName>Darayavahush I</SpecificName>
<Icon>units/pers_hero_darius.png</Icon>
<Tooltip>Hero Aura: "Merchant of the Empire." Boosts profitablity of trade during his lifetime (TBD).
Ranged attack 2x vs. spearmen. Ranged attack 1.5x vs. Swordsmen.</Tooltip>
<Tooltip>Hero Aura: "Merchant of the Empire." Boosts profitablity of trade during his lifetime (TBD).</Tooltip>
<History>(King, 521 BC - 486 BC) The son of Vishtaspa (Hystaspes), the satrap of Parthia and Hyrcania; a great administrator as well as a decent general, Darius introduced the division of the empire into satrapies and conquered NW India, Thrace and Macedonia. He was called the 'Merchant of the Empire'.</History>
</Identity>
<Loot>

View File

@ -11,7 +11,7 @@
<Attack.Capture.Value> <Add>2</Add> </Attack.Capture.Value>
</Modifications>
<AuraName>Sword of Rome Aura</AuraName>
<AuraDescription>+5 Attack and +2 Capture for Roman units within sight of him.</AuraDescription>
<AuraDescription>+5 Attack and +2 Capture for Roman units within his vision range.</AuraDescription>
<OverlayIcon>art/textures/ui/session/auras/attack_bonus.png</OverlayIcon>
</Aura1>
</Auras>

View File

@ -4,7 +4,6 @@
<Civ>gaia</Civ>
<GenericName>Samnite Swordsman</GenericName>
<SpecificName>(Samnite Swordsman)</SpecificName>
<Tooltip>Bonus vs. All Spear Units.</Tooltip>
<History>The Samnites were an aboriginal people of Southern and Central Italy. They were fierce warriors and frequently rebelled against Roman rule.</History>
<VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
<Icon>units/samnite_swordsman.png</Icon>