Index: binaries/data/mods/public/gui/common/MapCache.js =================================================================== --- binaries/data/mods/public/gui/common/MapCache.js +++ binaries/data/mods/public/gui/common/MapCache.js @@ -1,5 +1,5 @@ /** - * This class obtains, caches and provides the gamesettings from map XML and JSON files. + * This class obtains, caches, and provides the game settings from map XML and JSON files. */ class MapCache { Index: binaries/data/mods/public/gui/common/gamedescription.js =================================================================== --- binaries/data/mods/public/gui/common/gamedescription.js +++ binaries/data/mods/public/gui/common/gamedescription.js @@ -38,7 +38,7 @@ * Returns a formatted string describing the player assignments. * Needs g_CivData to translate! * - * @param {Object} playerDataArray - As known from gamesetup and simstate. + * @param {Object} playerDataArray - As known from game setup and sim state. * @param {(string[]|false)} playerStates - One of "won", "defeated", "active" for each player. * @returns {string} */ @@ -176,7 +176,7 @@ } /** - * Sets an additional map label, map preview image and describes the chosen gamesettings more closely. + * Sets an additional map label, map preview image and describes the chosen game settings more closely. * * Requires g_GameAttributes and g_VictoryConditions. */ @@ -411,8 +411,8 @@ return titles.map(title => sprintf(translate("%(label)s %(details)s"), { "label": coloredText(title.label, g_DescriptionHighlight), "details": - title.value === true ? translateWithContext("gamesetup option", "enabled") : - title.value || translateWithContext("gamesetup option", "disabled") + title.value === true ? translateWithContext("game setup option", "enabled") : + title.value || translateWithContext("game setup option", "disabled") })).join("\n"); } Index: binaries/data/mods/public/gui/common/settings.js =================================================================== --- binaries/data/mods/public/gui/common/settings.js +++ binaries/data/mods/public/gui/common/settings.js @@ -22,13 +22,13 @@ /** * An object containing all values given by setting name. - * Used by lobby, gamesetup, session, summary screen and replay menu. + * Used by lobby, game setup, session, summary screen, and replay menu. */ const g_Settings = loadSettingsValues(); /** * Loads and translates all values of all settings which - * can be configured by dropdowns in the gamesetup. + * can be configured by dropdowns in the game setup. * * @returns {Object|undefined} */ @@ -171,7 +171,7 @@ { "Name": "skirmish", "Title": translateWithContext("map", "Skirmish"), - "Description": translate("A map with a predefined landscape and number of players. Freely select the other gamesettings."), + "Description": translate("A map with a predefined landscape and number of players. Freely select the other game settings."), "Default": true, "Path": "maps/skirmishes/", "Suffix": ".xml", Index: binaries/data/mods/public/gui/gamesetup/Controls/GameSettingsControl.js =================================================================== --- binaries/data/mods/public/gui/gamesetup/Controls/GameSettingsControl.js +++ binaries/data/mods/public/gui/gamesetup/Controls/GameSettingsControl.js @@ -204,7 +204,7 @@ /** * This function is to be called when a GUI control has initiated a value change. * - * To avoid an infinite loop, do not call this function when a gamesetup message was + * To avoid an infinite loop, do not call this function when a game setup message was * received and the data had only been modified deterministically. */ setNetworkGameAttributes() Index: binaries/data/mods/public/gui/gamesetup/Controls/PlayerAssignmentsControl.js =================================================================== --- binaries/data/mods/public/gui/gamesetup/Controls/PlayerAssignmentsControl.js +++ binaries/data/mods/public/gui/gamesetup/Controls/PlayerAssignmentsControl.js @@ -85,7 +85,7 @@ } /** - * Called whenever a client joins/leaves or any gamesetting is changed. + * Called whenever a client joins or leaves or any game setting is changed. */ onPlayerAssignmentMessage(message) { Index: binaries/data/mods/public/gui/gamesetup/Controls/StartGameControl.js =================================================================== --- binaries/data/mods/public/gui/gamesetup/Controls/StartGameControl.js +++ binaries/data/mods/public/gui/gamesetup/Controls/StartGameControl.js @@ -1,14 +1,14 @@ /** * Cheat prevention: * - * 1. Ensure that the host cannot start the game unless all clients agreed on the gamesettings using the ready system. + * 1. Ensure that the host cannot start the game unless all clients agreed on the game settings using the ready system. * * TODO: * 2. Ensure that the host cannot start the game with GameAttributes different from the agreed ones. * This may be achieved by: * - Determining the seed collectively. - * - passing the agreed gamesettings to the engine when starting the game instance - * - rejecting new gamesettings from the server after the game launch event + * - passing the agreed game settings to the engine when starting the game instance + * - rejecting new game settings from the server after the game launch event */ class StartGameControl { Index: binaries/data/mods/public/gui/gamesetup/NetMessages/GameRegisterStanza.js =================================================================== --- binaries/data/mods/public/gui/gamesetup/NetMessages/GameRegisterStanza.js +++ binaries/data/mods/public/gui/gamesetup/NetMessages/GameRegisterStanza.js @@ -54,7 +54,7 @@ } /** - * Send the relevant gamesettings to the lobbybot in a deferred manner. + * Send the relevant game settings to the lobby bot in a deferred manner. */ sendDelayed() { @@ -68,7 +68,7 @@ } /** - * Send the relevant gamesettings to the lobbybot immediately. + * Send the relevant game settings to the lobby bot immediately. */ sendImmediately() { @@ -141,6 +141,6 @@ } /** - * Send the current gamesettings to the lobby bot if the settings didn't change for this number of milliseconds. + * Send the current game settings to the lobby bot if the settings didn't change for this number of milliseconds. */ GameRegisterStanza.prototype.Timeout = 2000; Index: binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/GameSettingControl.js =================================================================== --- binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/GameSettingControl.js +++ binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/GameSettingControl.js @@ -1,5 +1,5 @@ /** - * The GameSettingControl is an abstract class that is inherited by gamesetting control classes specific to a GUI object type, + * The GameSettingControl is an abstract class that is inherited by game setting control classes specific to a GUI object type, * such as the GameSettingControlCheckbox or GameSettingControlDropdown. * * These classes are abstract classes too and are implemented by each handler class specific to one logical setting of g_GameAttributes. @@ -24,7 +24,7 @@ class GameSettingControl { // The constructor and inherited constructors shall not modify game attributes, - // since all GameSettingControl shall be able to subscribe to any gamesetting change. + // since all GameSettingControl shall be able to subscribe to any game setting change. constructor(gameSettingControlManager, category, playerIndex, setupWindow) { // Store arguments Index: binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/GameSettingControlCheckbox.js =================================================================== --- binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/GameSettingControlCheckbox.js +++ binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/GameSettingControlCheckbox.js @@ -1,5 +1,5 @@ /** - * This class is implemented by gamesettings that are controlled by a checkbox. + * This class is implemented by game settings that are controlled by a checkbox. */ class GameSettingControlCheckbox extends GameSettingControl { Index: binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/GameSettingControlDropdown.js =================================================================== --- binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/GameSettingControlDropdown.js +++ binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/GameSettingControlDropdown.js @@ -1,5 +1,5 @@ /** - * This class is implemented by gamesettings that are controlled by a dropdown. + * This class is implemented by game settings that are controlled by a dropdown. */ class GameSettingControlDropdown extends GameSettingControl { Index: binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/GameSettingControlSlider.js =================================================================== --- binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/GameSettingControlSlider.js +++ binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/GameSettingControlSlider.js @@ -1,5 +1,5 @@ /** - * This class is implemented by gamesettings that are controlled by a slider. + * This class is implemented by game settings that are controlled by a slider. */ class GameSettingControlSlider extends GameSettingControl { Index: binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/MapFilter.js =================================================================== --- binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/MapFilter.js +++ binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/MapFilter.js @@ -80,7 +80,7 @@ onGameAttributesFinalize() { - // The setting is only relevant to the gamesetup stage! + // This setting is only relevant in the game setup stage. delete g_GameAttributes.mapFilter; } }; Index: binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSetupPage.js =================================================================== --- binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSetupPage.js +++ binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSetupPage.js @@ -1,5 +1,5 @@ /** - * This class owns all handlers of the gamesetup page, excluding controllers that apply to all subpages and handlers for specific subpages. + * This class owns all handlers of the game setup page, excluding controllers that apply to all subpages and handlers for specific subpages. */ SetupWindowPages.GameSetupPage = class { @@ -7,7 +7,7 @@ { Engine.ProfileStart("GameSetupPage"); - // This class instance owns all gamesetting GUI controls such as dropdowns and checkboxes visible in this page. + // This class instance owns all game setting GUI controls such as dropdowns and checkboxes visible in this page. this.gameSettingControlManager = new GameSettingControlManager(setupWindow); // These classes manage GUI buttons. Index: binaries/data/mods/public/gui/gamesetup/SetupWindow.js =================================================================== --- binaries/data/mods/public/gui/gamesetup/SetupWindow.js +++ binaries/data/mods/public/gui/gamesetup/SetupWindow.js @@ -1,5 +1,5 @@ /** - * This class stores the GameSetupPage and every subpage that is shown in the gamesetup. + * This class stores the GameSetupPage and every subpage that is shown in the game setup. */ class SetupWindowPages { Index: binaries/data/mods/public/gui/gamesetup_mp/gamesetup_mp.js =================================================================== --- binaries/data/mods/public/gui/gamesetup_mp/gamesetup_mp.js +++ binaries/data/mods/public/gui/gamesetup_mp/gamesetup_mp.js @@ -14,7 +14,7 @@ var g_ServerName = ""; /** - * Cached to pass it to the gamesetup of the controller to report the game to the lobby. + * Cached to pass it to the game setup of the controller to report the game to the lobby. */ var g_ServerPort; Index: binaries/data/mods/public/gui/lobby/LobbyPage/Buttons/JoinButton.js =================================================================== --- binaries/data/mods/public/gui/lobby/LobbyPage/Buttons/JoinButton.js +++ binaries/data/mods/public/gui/lobby/LobbyPage/Buttons/JoinButton.js @@ -23,7 +23,7 @@ } /** - * Immediately rejoin and join gamesetups. Otherwise confirm late-observer join attempt. + * Immediately rejoin and join game setups. Otherwise confirm late-observer join attempt. */ onPress() { Index: binaries/data/mods/public/gui/options/options.json =================================================================== --- binaries/data/mods/public/gui/options/options.json +++ binaries/data/mods/public/gui/options/options.json @@ -79,7 +79,7 @@ { "type": "boolean", "label": "Chat timestamp", - "tooltip": "Show time that messages are posted in the lobby, gamesetup and ingame chat.", + "tooltip": "Display the time at which a chat message was posted.", "config": "chat.timestamp" } ] @@ -105,7 +105,7 @@ { "type": "boolean", "label": "Fog", - "tooltip": "Enable Fog.", + "tooltip": "Enable fog.", "dependencies": ["preferglsl"], "config": "fog", "function": "Renderer_SetFogEnabled" @@ -119,13 +119,13 @@ }, { "type": "dropdown", - "label": "Anti-Aliasing", + "label": "Antialiasing", "tooltip": "Reduce aliasing effect on edges.", "dependencies": ["postproc", "preferglsl"], "config": "antialiasing", "list": [ - { "value": "disabled", "label": "Disabled", "tooltip": "Do not use anti-aliasing." }, - { "value": "fxaa", "label": "FXAA", "tooltip": "Fast, but simple anti-aliasing." } + { "value": "disabled", "label": "Disabled", "tooltip": "Do not use antialiasing." }, + { "value": "fxaa", "label": "FXAA", "tooltip": "Fast, but simple antialiasing." } ], "function": "Renderer_UpdateAntiAliasingTechnique" }, @@ -253,7 +253,7 @@ { "type": "boolean", "label": "Smooth vision", - "tooltip": "Lift darkness and fog-of-war smoothly.", + "tooltip": "Lift darkness and fog of war smoothly.", "config": "smoothlos", "function": "Renderer_SetSmoothLOSEnabled" }, @@ -345,7 +345,7 @@ }, { "type": "boolean", - "label": "Game setup - new player notification", + "label": "New player notification in game setup", "tooltip": "Receive audio notification when a new client joins the game setup.", "config": "sound.notify.gamesetup.join" } @@ -451,7 +451,7 @@ ] }, { - "label": "In-Game", + "label": "Game Session", "tooltip": "Change options regarding the in-game settings.", "options": [ @@ -511,19 +511,19 @@ { "type": "boolean", "label": "Attack range visualization", - "tooltip": "Display the attack range of selected defensive structures (can also be toggled in-game with the hotkey).", + "tooltip": "Display the attack range of selected defensive structures (can also be toggled in game with the hotkey).", "config": "gui.session.attackrange" }, { "type": "boolean", "label": "Aura range visualization", - "tooltip": "Display the range of auras of selected units and structures (can also be toggled in-game with the hotkey).", + "tooltip": "Display the range of auras of selected units and structures (can also be toggled in game with the hotkey).", "config": "gui.session.aurasrange" }, { "type": "boolean", "label": "Heal range visualization", - "tooltip": "Display the healing range of selected units (can also be toggled in-game with the hotkey).", + "tooltip": "Display the healing range of selected units (can also be toggled in game with the hotkey).", "config": "gui.session.healrange" }, { @@ -599,7 +599,7 @@ }, { "type": "dropdown", - "label": "Control Group Membership", + "label": "Control group membership", "tooltip": "Decide whether units can be part of multiple control groups.", "config": "gui.session.disjointcontrolgroups", "list": [ Index: binaries/data/mods/public/gui/pregame/MainMenuItems.js =================================================================== --- binaries/data/mods/public/gui/pregame/MainMenuItems.js +++ binaries/data/mods/public/gui/pregame/MainMenuItems.js @@ -1,6 +1,6 @@ var g_MainMenuItems = [ { - "caption": translate("Learn To Play"), + "caption": translate("Learn to Play"), "tooltip": translate("Learn how to play, start the tutorial, discover the technology trees, and the history behind the civilizations."), "submenu": [ { Index: binaries/data/mods/public/gui/prelobby/common/terms/Terms_of_Service.txt =================================================================== --- binaries/data/mods/public/gui/prelobby/common/terms/Terms_of_Service.txt +++ binaries/data/mods/public/gui/prelobby/common/terms/Terms_of_Service.txt @@ -2,7 +2,7 @@ [font="sans-bold-14"]Document Date:[/font] 2018-10-16 -The 0 A.D. Empires Ascendant Multiplayer Lobby is an online service provided by Wildfire Games that allows players to setup online multiplayer matches, discuss the game in a public chat room and gain a rating that reflects their skill. +The 0 A.D. Empires Ascendant Multiplayer Lobby is an online service provided by Wildfire Games that allows players to set up online multiplayer matches, discuss the game in a public chat room and gain a rating that reflects their skill. Due to the subject matter of historic warfare, description and depiction of violence and the language on the Multiplayer Lobby, 0 A.D. and the Multiplayer Lobby are not directed to young children (COPPA ยง312.2). The minimum age to use the Multiplayer Lobby is 13. Index: binaries/data/mods/public/gui/replaymenu/replay_filters.js =================================================================== --- binaries/data/mods/public/gui/replaymenu/replay_filters.js +++ binaries/data/mods/public/gui/replaymenu/replay_filters.js @@ -154,7 +154,7 @@ function initVictoryConditionFilter(filters) { let victoryConditionFilter = Engine.GetGUIObjectByName("victoryConditionFilter"); - victoryConditionFilter.list = [translate("Any Victory Condition")].concat(g_VictoryConditions.map(victoryCondition => translateVictoryCondition(victoryCondition.Name))); + victoryConditionFilter.list = [translate("Any victory condition")].concat(g_VictoryConditions.map(victoryCondition => translateVictoryCondition(victoryCondition.Name))); victoryConditionFilter.list_data = [""].concat(g_VictoryConditions.map(victoryCondition => victoryCondition.Name)); if (filters && filters.victoryCondition) Index: binaries/data/mods/public/gui/session/GameSpeedControl.js =================================================================== --- binaries/data/mods/public/gui/session/GameSpeedControl.js +++ binaries/data/mods/public/gui/session/GameSpeedControl.js @@ -1,5 +1,5 @@ /** - * This class controls the gamespeed. + * This class controls the game speed. * The control is only available in single-player and replay mode. * Fast forwarding is enabled if and only if there is no human player assigned. */ @@ -27,7 +27,7 @@ let simRate = Engine.GetSimRate(); - // If the gamespeed is something like 0.100001 from the gamesetup, set it to 0.1 + // If the game speed is something like 0.100001 from the game setup, set it to 0.1 let gameSpeedIdx = gameSpeeds.Speed.indexOf(+simRate.toFixed(2)); this.gameSpeed.selected = gameSpeedIdx != -1 ? gameSpeedIdx : gameSpeeds.Default; } Index: binaries/data/mods/public/gui/session/session.js =================================================================== --- binaries/data/mods/public/gui/session/session.js +++ binaries/data/mods/public/gui/session/session.js @@ -35,7 +35,7 @@ var g_TradeDialog; /** - * Map, player and match settings set in gamesetup. + * Map, player and match settings set in game setup. */ const g_GameAttributes = deepfreeze(Engine.GuiInterfaceCall("GetInitAttributes")); Index: binaries/data/mods/public/gui/session/top_panel/IconButtons/GameSpeedButton.js =================================================================== --- binaries/data/mods/public/gui/session/top_panel/IconButtons/GameSpeedButton.js +++ binaries/data/mods/public/gui/session/top_panel/IconButtons/GameSpeedButton.js @@ -1,5 +1,5 @@ /** - * This class handles the button that shows the gamespeed control. + * This class handles the button that shows the game speed control. */ class GameSpeedButton {