Index: ps/trunk/binaries/data/mods/public/gui/gamesetup/gamesetup.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/gamesetup/gamesetup.js
+++ ps/trunk/binaries/data/mods/public/gui/gamesetup/gamesetup.js
@@ -289,7 +289,7 @@
 
 /**
  * Remembers which clients are assigned to which player slots and whether they are ready.
- * The keys are guids or "local" in Singleplayer.
+ * The keys are GUIDs or "local" in single-player.
  */
 var g_PlayerAssignments = {};
 
@@ -1226,7 +1226,7 @@
 			}
 		};
 
-	// Replace empty playername when entering a singleplayermatch for the first time
+	// Replace empty player name when entering a single-player match for the first time.
 	if (!g_IsNetworked)
 		Engine.ConfigDB_CreateAndWriteValueToFile("user", "playername.singleplayer", singleplayerName(), "config/user.cfg");
 
Index: ps/trunk/binaries/data/mods/public/gui/gamesetup/gamesetup.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/gamesetup/gamesetup.xml
+++ ps/trunk/binaries/data/mods/public/gui/gamesetup/gamesetup.xml
@@ -82,7 +82,7 @@
 				</object>
 			</object>
 
-			<!-- Singleplayer / AI tips -->
+			<!-- Single-player / AI tips -->
 			<object name="spTips" size="24 370 500 570" type="image" hidden="true">
 				<object size="4 10 28 34" type="image" sprite="ModernGear"/>
 				<object name="aiTips" size="32 0 100%-20 100%-32" type="text" style="ModernLeftLabelText"/>
Index: ps/trunk/binaries/data/mods/public/gui/options/options.json
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/options/options.json
+++ ps/trunk/binaries/data/mods/public/gui/options/options.json
@@ -5,20 +5,20 @@
 		[
 			{
 				"type": "string",
-				"label": "Playername (Single Player)",
-				"tooltip": "How you want to be addressed in Single Player matches.",
+				"label": "Player Name (Single-player)",
+				"tooltip": "How you want to be addressed in single-player matches.",
 				"config": "playername.singleplayer"
 			},
 			{
 				"type": "string",
-				"label": "Playername (Multiplayer)",
-				"tooltip": "How you want to be addressed in Multiplayer matches (except lobby).",
+				"label": "Player Name (Multiplayer)",
+				"tooltip": "How you want to be addressed in multiplayer matches (except lobby).",
 				"config": "playername.multiplayer"
 			},
 			{
 				"type": "boolean",
 				"label": "Background Pause",
-				"tooltip": "Pause single player games when window loses focus.",
+				"tooltip": "Pause single-player games when window loses focus.",
 				"config": "pauseonfocusloss"
 			},
 			{
Index: ps/trunk/binaries/data/mods/public/gui/pregame/MainMenuItems.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/pregame/MainMenuItems.js
+++ ps/trunk/binaries/data/mods/public/gui/pregame/MainMenuItems.js
@@ -46,8 +46,8 @@
 		]
 	},
 	{
-		"caption": translate("Single Player"),
-		"tooltip": translate("Click here to start a new single player game."),
+		"caption": translate("Single-player"),
+		"tooltip": translate("Click here to start a new single-player game."),
 		"submenu": [
 			{
 				"caption": translate("Matches"),
@@ -75,7 +75,7 @@
 					Engine.SwitchGuiPage("page_replaymenu.xml", {
 						"replaySelectionData": {
 							"filters": {
-								"singleplayer": "Singleplayer"
+								"singleplayer": "Single-player"
 							}
 						}
 					});
Index: ps/trunk/binaries/data/mods/public/gui/replaymenu/replay_filters.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/replaymenu/replay_filters.js
+++ ps/trunk/binaries/data/mods/public/gui/replaymenu/replay_filters.js
@@ -139,8 +139,8 @@
 function initSingleplayerFilter(filters)
 {
 	let singleplayerFilter = Engine.GetGUIObjectByName("singleplayerFilter");
-	singleplayerFilter.list = [translate("Single- and multiplayer"), translate("Single Player"), translate("Multiplayer")];
-	singleplayerFilter.list_data = ["", "Singleplayer", "Multiplayer"];
+	singleplayerFilter.list = [translate("Single-player and multiplayer"), translate("Single-player"), translate("Multiplayer")];
+	singleplayerFilter.list_data = ["", "Single-player", "Multiplayer"];
 
 	if (filters && filters.singleplayer)
 		singleplayerFilter.selected = singleplayerFilter.list_data.indexOf(filters.singleplayer);
@@ -234,10 +234,10 @@
 	if (compatibilityFilter.checked && !isReplayCompatible(replay))
 		return false;
 
-	// Filter by singleplayer / multiplayer
+	// Filter by single-player or multiplayer.
 	let singleplayerFilter = Engine.GetGUIObjectByName("singleplayerFilter");
 	let selectedSingleplayerFilter = singleplayerFilter.list_data[singleplayerFilter.selected] || "";
-	if (selectedSingleplayerFilter == "Singleplayer" && replay.isMultiplayer ||
+	if (selectedSingleplayerFilter == "Single-player" && replay.isMultiplayer ||
 	    selectedSingleplayerFilter == "Multiplayer" && !replay.isMultiplayer)
 		return false;
 
Index: ps/trunk/binaries/data/mods/public/gui/replaymenu/replay_menu.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/replaymenu/replay_menu.xml
+++ ps/trunk/binaries/data/mods/public/gui/replaymenu/replay_menu.xml
@@ -109,7 +109,7 @@
 				<translatableAttribute id="caption">Filter compatible replays</translatableAttribute>
 			</object>
 
-			<!-- Singleplayer / Multiplayer Filter -->
+			<!-- Single-player / Multiplayer Filter -->
 			<object name="singleplayerFilter" type="dropdown" style="ModernDropDown" size="0 30 100% 55" font="sans-bold-13">
 				<action on="SelectionChange">displayReplayList();</action>
 			</object>
Index: ps/trunk/binaries/data/mods/public/gui/session/GameSpeedControl.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/GameSpeedControl.js
+++ ps/trunk/binaries/data/mods/public/gui/session/GameSpeedControl.js
@@ -1,6 +1,6 @@
 /**
  * This class controls the gamespeed.
- * The control is only available in singleplayer and replaymode.
+ * 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.
  */
 class GameSpeedControl
Index: ps/trunk/binaries/data/mods/public/gui/session/PauseControl.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/PauseControl.js
+++ ps/trunk/binaries/data/mods/public/gui/session/PauseControl.js
@@ -2,7 +2,7 @@
  * Controller to pause or resume the game and remember which players paused the game.
  *
  * If the current player ordered a pause manually, it is called explicit pause.
- * If the player opened a dialog in singleplayer mode, the game is paused implicitly.
+ * If the player opened a dialog in single-player mode, the game is paused implicitly.
  */
 class PauseControl
 {
@@ -10,7 +10,7 @@
 	{
 		/**
 		 * This is true if the current player has paused the game using the pause button or hotkey.
-		 * The game may also be paused without this being true in singleplayermode when opening a dialog.
+		 * The game may also be paused without this being true in single-player mode when opening a dialog.
 		 */
 		this.explicitPause = false;
 
@@ -48,7 +48,7 @@
 	}
 
 	/**
-	 * Called from UI dialogs, but only in singleplayermode.
+	 * Called from UI dialogs, but only in single-player mode.
 	 */
 	implicitPause()
 	{
Index: ps/trunk/binaries/data/mods/public/gui/session/SessionMessageBox.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/SessionMessageBox.js
+++ ps/trunk/binaries/data/mods/public/gui/session/SessionMessageBox.js
@@ -1,6 +1,6 @@
 /**
  * This is the same as a regular MessageBox, but it pauses if it is
- * a singleplayer game, until the player answered the dialog.
+ * a single-player game, until the player answered the dialog.
  */
 class SessionMessageBox
 {
Index: ps/trunk/binaries/data/mods/public/gui/session/chat/ChatMessageFormatPlayer.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/chat/ChatMessageFormatPlayer.js
+++ ps/trunk/binaries/data/mods/public/gui/session/chat/ChatMessageFormatPlayer.js
@@ -76,7 +76,7 @@
 		msg.cmd = msg.text.split(/\s/)[0];
 		msg.text = msg.text.substr(msg.cmd.length + 1);
 
-		// GUID is "local" in singleplayer, some string in multiplayer.
+		// GUID is "local" in single-player, some string in multiplayer.
 		// Chat messages sent by the simulation (AI) come with the playerID.
 		let senderID = msg.player ? msg.player : (g_PlayerAssignments[msg.guid] || msg).player;
 
Index: ps/trunk/binaries/data/mods/public/gui/session/message_box/QuitConfirmationMenu.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/message_box/QuitConfirmationMenu.js
+++ ps/trunk/binaries/data/mods/public/gui/session/message_box/QuitConfirmationMenu.js
@@ -6,7 +6,7 @@
 }
 
 /**
- * In singleplayer mode, replaymode and for observers in multiplayermatches that
+ * In single-player mode, replay mode and for observers in multiplayer matches that
  * aren't the host, exit the match instantly.
  */
 QuitConfirmationMenu.prototype.Singleplayer = class extends QuitConfirmation
Index: ps/trunk/binaries/data/mods/public/gui/session/session.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/session.js
+++ ps/trunk/binaries/data/mods/public/gui/session/session.js
@@ -105,7 +105,7 @@
 
 /**
  * Remembers which clients are assigned to which player slots.
- * The keys are guids or "local" in Singleplayer.
+ * The keys are GUIDs or "local" in single-player.
  */
 var g_PlayerAssignments;