Index: ps/trunk/binaries/data/mods/public/gui/common/network.js =================================================================== --- ps/trunk/binaries/data/mods/public/gui/common/network.js +++ ps/trunk/binaries/data/mods/public/gui/common/network.js @@ -70,7 +70,7 @@ case 4: return translate("Game has already started, no observers allowed."); case 5: return translate("You have been kicked."); case 6: return translate("You have been banned."); - case 7: return translate("Playername in use. If you were disconnected, retry in few seconds."); + case 7: return translate("Player name in use. If you were disconnected, retry in few seconds."); case 8: return translate("Server full."); case 9: return translate("Secure lobby authentication failed. Join via lobby."); case 10: return translate("Error: Server failed to allocate a unique client identifier."); Index: ps/trunk/binaries/data/mods/public/gui/options/options.js =================================================================== --- ps/trunk/binaries/data/mods/public/gui/options/options.js +++ ps/trunk/binaries/data/mods/public/gui/options/options.js @@ -348,7 +348,7 @@ messageBox( 500, 200, - translate("Some setting values are invalid! Are you sure to save them?"), + translate("Some setting values are invalid! Are you sure you want to save them?"), translate("Warning"), [translate("No"), translate("Yes")], [null, reallySaveChanges] Index: ps/trunk/binaries/data/mods/public/gui/prelobby/common/terms/Privacy_Policy.txt =================================================================== --- ps/trunk/binaries/data/mods/public/gui/prelobby/common/terms/Privacy_Policy.txt +++ ps/trunk/binaries/data/mods/public/gui/prelobby/common/terms/Privacy_Policy.txt @@ -1,12 +1,12 @@ [font="sans-bold-18"]0 A.D. Empires Ascendant Multiplayer Lobby Privacy Policy[/font] -[font="sans-bold-14"]Document Date:[/font] 2018-10-16 +[font="sans-bold-14"]Document Date:[/font] 2020-12-24 [font="sans-bold-16"]Personal data processed by Wildfire Games and purposes of processing:[/font] -[font="sans-bold-14"]1. Playername[/font] +[font="sans-bold-14"]1. Player name[/font] The player is identified by a name that the player chooses at the time of registration. -Having a unique playername is a requirement to gain a rating, to allow players, moderators and developers to identify players they met before, communicate about the game, coordinate matches and enables moderators to enforce the Terms of Use. -The playername serves as a pseudoynm. The identity (natural person) of players is not known to Wildfire Games, except where personally identifiable information (such as the realname) was disclosed on the Lobby Chat, other services of Wildfire Games or elsewhere in the public, or when the IP address is used to bring criminal proceedings. +Having a unique player name is a requirement to gain a rating, to allow players, moderators and developers to identify players they met before, communicate about the game, coordinate matches and enables moderators to enforce the Terms of Use. +The player name serves as a pseudonym. The identity (natural person) of players is not known to Wildfire Games, except where personally identifiable information (such as the real name) was disclosed on the Lobby Chat, other services of Wildfire Games or elsewhere in the public, or when the IP address is used to bring criminal proceedings. [font="sans-bold-14"]2. Password[/font] A player is authenticated using a password that the player chooses at the time of registration. Index: ps/trunk/binaries/data/mods/public/gui/text/quotes.txt =================================================================== --- ps/trunk/binaries/data/mods/public/gui/text/quotes.txt +++ ps/trunk/binaries/data/mods/public/gui/text/quotes.txt @@ -140,7 +140,7 @@ “War is sweet to those who have no experience of it, but the experienced man fears its approach in his heart.” \n— Pindar (fragment 110) “Themistocles robbed his fellow citizens of spear and shield, and degraded the people of Athens to the rowing-pad and the oar.” \n— Plato, no friend of the Athenian navy (Plutarch, “Parallel Lives”, “Themistocles”, sec. 3) “No guest is so welcome in a friend's house that he will not become a nuisance after three days.” \n— Plautus (“The Swaggering Soldier”, Act III, scene 1, 146) -“You cannot eat your cake and have it too, unless you think your money is immortal.” \n— Plautus (“Trinummus”, Act II, scene 4, 12) +“You cannot eat your cake and have it too, unless you think your money is immortal.”\n— Plautus (“Trinummus”, Act II, scene 4, 13–14) “He \[Alexander] thought nothing invincible for the courageous, and nothing secure for the cowardly.” \n— Plutarch (“Parallel Lives”, “Alexander”, sec. 58) “One \[…] shot an arrow at him with such accuracy and force that it pierced his breastplate and got stuck in his ribs. \[…] Alexander recoiled and sank to his knees. \[…] At last Alexander killed the barbarian. But he received many wounds, at last was struck on the neck with a mace, and leaned against the city wall, his eyes still fixed upon his foes.” \n— Plutarch about the Mallian Campaign (“Parallel Lives”, “Alexander”, sec. 63) “When the pirates demanded a ransom of twenty talents for him, Caesar burst out laughing. They did not know, he said, who it was that they had captured, and he volunteered to pay fifty.” \n— Plutarch, who mentions later that Caesar got his money back and had his captors crucified (“Parallel Lives”, “Caesar”, sec. 2) @@ -165,7 +165,7 @@ “The hour of departure has arrived, and we go our ways – I to die, and you to live. Which is better God only knows.” Socrates, in his defense when trialled for corrupting the youth and not worshipping the proper gods (he later drank hemlock after the death sentence) \n— Plato (“Apology”, 42a) “Walls and ships are nothing without men living together inside them.” \n— Sophocles (“Oedipus Rex”) “We accepted an empire that was offered to us and refused to give it up under the pressure of three of the strongest motives: fear, honor and interest. It was not we who set the example, for it has always been the law that the weak should be subject to the strong.” \n— Speech of an Athenian embassy in Sparta (Thucydides, “History of the Peloponnesian War”, I. 76.2) -“He could boast that he found a city of brick and left it a city of marble.” \n— Suetonius, commenting on the many building projects of Augustus in Rome (“Divus Augustus”, sec 38) +“He could boast that he found a city of brick and left it a city of marble.”\n— Suetonius, commenting on the many building projects of Augustus in Rome (“Divus Augustus”, 28.3) “Moderation in all things.” \n— Terence (“The Girl from Andros”, 61) “Fortune favors the bold.” \n— Terence in a play about a great Athenian admiral (“Phormio”, 203) “I do not know how to tune the lyre or play the harp, but I do know how to raise a city that was small and unimportant to glory and greatness.” \n— Themistocles, defending his lack of cultural sophistication (Plutarch, “Parallel Lives”, “Themistocles”, sec. 2) @@ -178,8 +178,8 @@ “This was the greatest action that happened in all this war, and all others that we have heard of amongst the Greeks, being to the victors most glorious and most calamitous to the vanquished. For they were utterly and at all points defeated, and their sufferings were many. Army and fleet and all they ever had perished, nothing was saved and few of so many ever returned home. Thus ended the Sicilian expedition.” \n— Thucydides (“History of the Peloponnesian War”, VII. 87.6–7) “As the world goes, justice is only a matter between equals, while the strong do what they can and the weak suffer what they must.” \n— Thucydides, describing Athenians addressing the defeated Melians who are unwilling to surrender (“History of the Peloponnesian War”, V. 89.1) “When the Lacedaemonians were no longer able to run after them, the skirmishers \[…] all charged them at once, casting stones, arrows, and darts to the closest man at hand.” \n— Thucydides, describing the Spartan disaster at the Battle of Sphacteria (“History of the Peloponnesian War”, IV. 34.2) -“The soldiers fight and die to support others in wealth and luxury and they are called masters of the world without owning a single piece of farmland of their own.” \n— Tiberius Gracchus, advocating for land reform to the benefit of homeless and unemployed veterans whose lands had often been bought up why they were on campaign (Plutarch, “Parallel Lives”, “Tiberius Gracchus”, sec. 9) -“The wild beasts of Italy have their caves to retire to, but the brave veterans who spilled their blood in her cause have nothing left but air and light. They wander around homeless with their wives and children.” \n— Tiberius Gracchus, advocating for land reform to the benefit of homeless and unemployed veterans whose lands had often been bought up why they were on campaign (Plutarch, “Parallel Lives”, “Tiberius Gracchus”, sec. 9) +“The wild beasts of Italy have their caves to retire to, but the brave veterans who spilled their blood in her cause have nothing left but air and light. They wander around homeless with their wives and children.”\n— Tiberius Gracchus, advocating for land reform to the benefit of homeless and unemployed veterans whose lands had often been bought up while they were on campaign. (Plutarch, “Parallel Lives”, “Tiberius Gracchus”, 9.4–5) +“The soldiers fight and die to support others in wealth and luxury and they are called masters of the world without owning a single piece of farmland of their own.”\n— Tiberius Gracchus, advocating for land reform to the benefit of homeless and unemployed veterans whose lands had often been bought up while they were on campaign. (Plutarch, “Parallel Lives”, “Tiberius Gracchus”, 9.5) “Do not trust the horse, Trojans! I fear the Greeks even when they bring gifts.” \n— Virgil (“Aeneid”, II. 48–49) “Prepared for either alternative.” \n— Virgil (“Aeneid”, II. 61) “Homer and Hesiod ascribed to their Gods all things that are a disgrace among mortals: stealing, adultery, deceiving one another.” \n— Xenophanes (fragment 11) Index: ps/trunk/binaries/data/mods/public/maps/random/rmbiome/gulf_of_bothnia/frozen_lake.json =================================================================== --- ps/trunk/binaries/data/mods/public/maps/random/rmbiome/gulf_of_bothnia/frozen_lake.json +++ ps/trunk/binaries/data/mods/public/maps/random/rmbiome/gulf_of_bothnia/frozen_lake.json @@ -1,7 +1,7 @@ { "Description": { "Title": "Frozen Lake", - "Description": "Solidifying it's grip, the harsh cold has succeeded in freezing up the gulf. The thick ice formed is capable of withstanding any weight." + "Description": "Solidifying its grip, the harsh cold has succeeded in freezing up the gulf. The thick ice formed is capable of withstanding any weight." }, "Environment": { "SkySet": "stormy", Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/egypt_3pv3p.xml =================================================================== --- ps/trunk/binaries/data/mods/public/maps/skirmishes/egypt_3pv3p.xml +++ ps/trunk/binaries/data/mods/public/maps/skirmishes/egypt_3pv3p.xml @@ -62,7 +62,7 @@ "g": 40, "r": 80 }, - "Name": "Theben", + "Name": "Thebes", "Team": 0 }, { Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/vesuvius_6p.xml =================================================================== --- ps/trunk/binaries/data/mods/public/maps/skirmishes/vesuvius_6p.xml +++ ps/trunk/binaries/data/mods/public/maps/skirmishes/vesuvius_6p.xml @@ -40,7 +40,7 @@ kush Temple of Apedemak Pr-ʿIprmk - Train Healers and Apedamak Champions and research healing technologies. + Train Healers and Apedemak Champions and research healing technologies. TempleOfApedemak