Index: ps/trunk/binaries/data/mods/public/gui/pregame/mainmenu.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/pregame/mainmenu.js	(revision 21885)
+++ ps/trunk/binaries/data/mods/public/gui/pregame/mainmenu.js	(revision 21886)
@@ -1,291 +1,245 @@
 var currentSubmenuType; // contains submenu type
 var MARGIN = 4; // menu border size
 var g_ShowSplashScreens;
 
 /**
  * Available backdrops
  */
 var g_BackgroundLayerData = [];
 
 /**
  * Chosen backdrop
  */
 var g_BackgroundLayerset;
 
 var g_T0 = Date.now();
 var g_LastTickTime = Date.now();
 
 function init(initData, hotloadData)
 {
 	initMusic();
 
 	global.music.setState(global.music.states.MENU);
 
 	// Initialize currentSubmenuType with placeholder to avoid null when switching
 	currentSubmenuType = "submenuSinglePlayer";
 
-	EnableUserReport(Engine.IsUserReportEnabled());
-
 	// Only show splash screen(s) once at startup, but not again after hotloading
 	g_ShowSplashScreens = hotloadData ? hotloadData.showSplashScreens : initData && initData.isStartup;
 
 	// Pick a random background and initialise it
 	g_BackgroundLayerset = pickRandom(g_BackgroundLayerData);
 	for (let i = 0; i < g_BackgroundLayerset.length; ++i)
 	{
 		let guiObj = Engine.GetGUIObjectByName("background[" + i + "]");
 		guiObj.hidden = false;
 		guiObj.sprite = g_BackgroundLayerset[i].sprite;
 		guiObj.z = i;
 	}
+
 	Engine.GetGUIObjectByName("structreeButton").tooltip = colorizeHotkey(
 		translate("%(hotkey)s: View the structure tree of civilizations featured in 0 A.D."),
 		"structree");
+
 	Engine.GetGUIObjectByName("civInfoButton").tooltip = colorizeHotkey(
 		translate("%(hotkey)s: Learn about the many civilizations featured in 0 A.D."),
 		"civinfo");
+
 	Engine.GetGUIObjectByName("lobbyButton").tooltip = colorizeHotkey(
 		translate("%(hotkey)s: Launch the multiplayer lobby to join and host publicly visible games and chat with other players."),
 		"lobby");
 }
 
 function getHotloadData()
 {
 	return { "showSplashScreens": g_ShowSplashScreens };
 }
 
 function scrollBackgrounds()
 {
 	for (let i = 0; i < g_BackgroundLayerset.length; ++i)
 	{
 		let guiObj = Engine.GetGUIObjectByName("background[" + i + "]");
 
 		let screen = guiObj.parent.getComputedSize();
 		let h = screen.bottom - screen.top;
 		let w = h * 16/9;
 		let iw = h * 2;
 
 		let offset = g_BackgroundLayerset[i].offset((Date.now() - g_T0) / 1000, w);
 
 		if (g_BackgroundLayerset[i].tiling)
 		{
 			let left = offset % iw;
 			if (left >= 0)
 				left -= iw;
 			guiObj.size = new GUISize(left, screen.top, screen.right, screen.bottom);
 		}
 		else
 			guiObj.size = new GUISize(screen.right/2 - h + offset, screen.top, screen.right/2 + h + offset, screen.bottom);
 	}
 }
 
-function formatUserReportStatus(status)
-{
-	let d = status.split(/:/, 3);
-
-	if (d[0] == "disabled")
-		return translate("disabled");
-
-	if (d[0] == "connecting")
-		return translate("connecting to server");
-
-	if (d[0] == "sending")
-		return sprintf(translate("uploading (%f%%)"), Math.floor(100 * d[1]));
-
-	if (d[0] == "completed")
-	{
-		let httpCode = d[1];
-		if (httpCode == 200)
-			return translate("upload succeeded");
-		return sprintf(translate("upload failed (%(errorCode)s)"), { "errorCode": httpCode });
-	}
-
-	if (d[0] == "failed")
-		return sprintf(translate("upload failed (%(errorMessage)s)"), { "errorMessage": d[2] });
-
-	return translate("unknown");
-}
-
 function onTick()
 {
 	let now = Date.now();
 	let tickLength = Date.now() - g_LastTickTime;
 	g_LastTickTime = now;
 
 	scrollBackgrounds();
 
 	updateMenuPosition(tickLength);
 
-	if (Engine.IsUserReportEnabled())
-		Engine.GetGUIObjectByName("userReportEnabledText").caption =
-			'[font="sans-bold-16"]' + translate("Thank you for helping improve 0 A.D.!") + "[/font]\n\n" +
-			translate("Anonymous feedback is currently enabled.") + "\n" +
-			sprintf(translate("Status: %(status)s."), {
-				"status": formatUserReportStatus(Engine.GetUserReportStatus())
-			});
-
 	// Show splash screens here, so we don't interfere with main menu hotloading
 	if (g_ShowSplashScreens)
 	{
 		g_ShowSplashScreens = false;
 
 		if (Engine.ConfigDB_GetValue("user", "gui.splashscreen.enable") === "true" ||
 		    Engine.ConfigDB_GetValue("user", "gui.splashscreen.version") < Engine.GetFileMTime("gui/splashscreen/splashscreen.txt"))
 			Engine.PushGuiPage("page_splashscreen.xml", { "page": "splashscreen", "callback": "SplashScreenClosedCallback" });
 		else
 			ShowRenderPathMessage();
 	}
 }
 
 function ShowRenderPathMessage()
 {
 	// Warn about removing fixed render path
 	if (Engine.Renderer_GetRenderPath() == "fixed")
 		messageBox(
 			600, 300,
 			"[font=\"sans-bold-16\"]" +
 			sprintf(translate("%(warning)s You appear to be using non-shader (fixed function) graphics. This option will be removed in a future 0 A.D. release, to allow for more advanced graphics features. We advise upgrading your graphics card to a more recent, shader-compatible model."), {
 				"warning": coloredText("Warning:", "200 20 20")
 			}) +
 			"\n\n" +
 			// Translation: This is the second paragraph of a warning. The
 			// warning explains that the user is using “non-shader“ graphics,
 			// and that in the future this will not be supported by the game, so
 			// the user will need a better graphics card.
 			translate("Please press \"Read More\" for more information or \"OK\" to continue."),
 			translate("WARNING!"),
 			[translate("OK"), translate("Read More")],
 			[ null, function() { Engine.OpenURL("https://www.wildfiregames.com/forum/index.php?showtopic=16734"); } ]
 		);
 }
 
 function SplashScreenClosedCallback()
 {
 	ShowRenderPathMessage();
 }
 
-function EnableUserReport(Enabled)
-{
-	Engine.GetGUIObjectByName("userReportDisabled").hidden = Enabled;
-	Engine.GetGUIObjectByName("userReportEnabled").hidden = !Enabled;
-	Engine.SetUserReportEnabled(Enabled);
-}
-
 /**
  * Slide menu.
  */
 function updateMenuPosition(dt)
 {
 	let submenu = Engine.GetGUIObjectByName("submenu");
 
 	if (submenu.hidden == false)
 	{
 		// Number of pixels per millisecond to move
 		let SPEED = 1.2;
 
 		let maxOffset = Engine.GetGUIObjectByName("mainMenu").size.right - submenu.size.left;
 		if (maxOffset > 0)
 		{
 			let offset = Math.min(SPEED * dt, maxOffset);
 			let size = submenu.size;
 			size.left += offset;
 			size.right += offset;
 			submenu.size = size;
 		}
 	}
 }
 
 /**
  * Opens the menu by revealing the screen which contains the menu.
  */
 function openMenu(newSubmenu, position, buttonHeight, numButtons)
 {
 	currentSubmenuType = newSubmenu;
 	Engine.GetGUIObjectByName(currentSubmenuType).hidden = false;
 
 	let submenu = Engine.GetGUIObjectByName("submenu");
 	let top = position - MARGIN;
 	let bottom = position + ((buttonHeight + MARGIN) * numButtons);
 	submenu.size = new GUISize(submenu.size.left, top, submenu.size.right, bottom);
 
 	// Blend in right border of main menu into the left border of the submenu
 	blendSubmenuIntoMain(top, bottom);
 
 	submenu.hidden = false;
 }
 
 function closeMenu()
 {
 	Engine.GetGUIObjectByName(currentSubmenuType).hidden = true;
 
 	let submenu = Engine.GetGUIObjectByName("submenu");
 	submenu.hidden = true;
 	submenu.size = Engine.GetGUIObjectByName("mainMenu").size;
 
 	Engine.GetGUIObjectByName("MainMenuPanelRightBorderTop").size = "100%-2 0 100% 100%";
 }
 
 /**
  * Sizes right border on main menu panel to match the submenu.
  */
 function blendSubmenuIntoMain(topPosition, bottomPosition)
 {
 	Engine.GetGUIObjectByName("MainMenuPanelRightBorderTop").size = "100%-2 0 100% " + (topPosition + MARGIN);
 	Engine.GetGUIObjectByName("MainMenuPanelRightBorderBottom").size = "100%-2 " + (bottomPosition) + " 100% 100%";
 }
 
 function getBuildString()
 {
 	return sprintf(translate("Build: %(buildDate)s (%(revision)s)"), {
 		"buildDate": Engine.GetBuildTimestamp(0),
 		"revision": Engine.GetBuildTimestamp(2)
 	});
 }
 
 function exitGamePressed()
 {
 	closeMenu();
 
 	messageBox(
 		400, 200,
 		translate("Are you sure you want to quit 0 A.D.?"),
 		translate("Confirmation"),
 		[translate("No"), translate("Yes")],
 		[null, Engine.Exit]
 	);
 }
 
 function pressedScenarioEditorButton()
 {
 	closeMenu();
 
 	if (Engine.AtlasIsAvailable())
 		messageBox(
 			400, 200,
 			translate("Are you sure you want to quit 0 A.D. and open the Scenario Editor?"),
 			translate("Confirmation"),
 			[translate("No"), translate("Yes")],
 			[null, Engine.RestartInAtlas]
 		);
 	else
 		messageBox(
 			400, 200,
 			translate("The scenario editor is not available or failed to load. See the game logs for additional information."),
 			translate("Error")
 		);
 }
 
 function getLobbyDisabledByBuild()
 {
 	return translate("Launch the multiplayer lobby to join and host publicly visible games and chat with other players. \\[DISABLED BY BUILD]");
 }
 
-function getTechnicalDetails()
-{
-	return translate("Technical Details");
-}
-
 function getManual()
 {
 	return translate("Manual");
 }
Index: ps/trunk/binaries/data/mods/public/gui/pregame/mainmenu.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/pregame/mainmenu.xml	(revision 21885)
+++ ps/trunk/binaries/data/mods/public/gui/pregame/mainmenu.xml	(revision 21886)
@@ -1,681 +1,624 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <objects>
 
 	<script directory="gui/common/"/>
 	<script directory="gui/pregame/"/>
 	<script directory="gui/pregame/backgrounds/"/>
+	<script directory="gui/pregame/userreport/"/>
 
 	<!--
 	==========================================
 	- MAIN MENU
 	==========================================
 	-->
 	<object>
 
 		<action on="Tick">
 			onTick();
 		</action>
 
 		<repeat count="5">
 			<object name="background[n]"
 				type="image"
 				hidden="true"
 				ghost="true"
 			/>
 		</repeat>
 
 		<!--
 		==========================================
 		- MAIN MENU - STATIC TOOLTIP WINDOW
 		==========================================
 		-->
 		<object name="pgToolTip"
 			style="TranslucentPanel"
 			type="text"
 			hidden="true"
 			size="100%-290 25 100% 140"
 			ghost="true"
 		/>
 
 		<!--
 		==========================================
 		- MAIN MENU - USER REPORT
 		==========================================
 		-->
-		<object
-			name="userReportDisabled"
-			size="100%-304 100%-154 100%-4 100%-4"
-			type="image"
-			style="userReportPanel"
-		>
-			<object
-				type="text"
-				style="userReportText"
-			>
-				<attribute id="caption">
-					<keep>[font="sans-bold-16"]</keep>
-					<translate>Help improve 0 A.D.!</translate>
-					<keep>[/font]\n</keep>
-					<translate>You can automatically send us anonymous feedback that will help us fix bugs, and improve performance and compatibility.</translate>
-				</attribute>
-			</object>
-			<object type="button" style="StoneButton" size="8 100%-36 146 100%-8">
-				<translatableAttribute id="caption">Enable Feedback</translatableAttribute>
-				<action on="Press">EnableUserReport(true);</action>
-			</object>
-			<object type="button" style="StoneButton" size="100%-146 100%-36 100%-8 100%-8">
-				<translatableAttribute id="caption">Technical Details</translatableAttribute>
-				<action on="Press">
-					Engine.PushGuiPage("page_manual.xml", {
-						"page": "manual/userreport",
-						"title": getTechnicalDetails()
-					});
-				</action>
-			</object>
-		</object>
-
-		<object
-			name="userReportEnabled"
-			size="100%-304 100%-154 100%-4 100%-4"
-			type="image"
-			style="userReportPanel"
-		>
-			<object
-				name="userReportEnabledText"
-				type="text"
-				style="userReportText"
-			/>
-
-			<object type="button" style="StoneButton" size="8 100%-36 146 100%-8">
-				<translatableAttribute id="caption">Disable Feedback</translatableAttribute>
-				<action on="Press">EnableUserReport(false);</action>
-			</object>
-			<object type="button" style="StoneButton" size="100%-146 100%-36 100%-8 100%-8">
-				<translatableAttribute id="caption">Technical Details</translatableAttribute>
-				<action on="Press">
-					Engine.PushGuiPage("page_manual.xml", {
-						"page": "manual/userreport",
-						"title": getTechnicalDetails()
-					});
-				</action>
-			</object>
-		</object>
-
+		<include file="gui/pregame/userreport/userreport.xml"/>
 
 		<!--
 		==========================================
 		- SUBMENU
 		==========================================
 		-->
 
 		<object hotkey="cancel">
 			<action on="Press">
 				closeMenu();
 			</action>
 		</object>
 
 		<!-- hide submenu when user clicks on the background -->
 		<object type="button">
 			<action on="Press">
 				closeMenu();
 			</action>
 		</object>
 
 		<!-- submenu -->
 		<object name="submenu"
 			type="image"
 			style="SubmenuPanel"
 			size="60 50%-100 300 50%+100"
 			hidden="true"
 		>
 			<!-- submenuLearnToPlay -->
 			<object name="submenuLearn"
 				type="image"
 				size="0 4 100%-4 100%-4"
 				tooltip_style="pgToolTip"
 				hidden="true"
 			>
 				<!-- LEARN TO PLAY BUTTON -->
 				<object
 					type="button"
 					style="StoneButtonFancy"
 					size="0 0 100% 28"
 					tooltip_style="pgToolTip"
 				>
 					<translatableAttribute id="caption">Manual</translatableAttribute>
 					<translatableAttribute id="tooltip">Open the 0 A.D. Game Manual.</translatableAttribute>
 					<action on="Press">
 						closeMenu();
 						Engine.PushGuiPage("page_manual.xml", {
 							"page": "manual/intro",
 							"title": getManual(),
 							"url": "https://trac.wildfiregames.com/wiki/0adManual"
 						});
 					</action>
 				</object>
 
 				<!-- START TUTORIAL BUTTON -->
 				<object
 					type="button"
 					style="StoneButtonFancy"
 					size="0 32 100% 60"
 					tooltip_style="pgToolTip"
 				>
 					<translatableAttribute id="caption">Tutorial</translatableAttribute>
 					<translatableAttribute id="tooltip">Start the economic tutorial.</translatableAttribute>
 					<action on="Press">
 						Engine.SwitchGuiPage("page_gamesetup.xml", { "tutorial": true });
 					</action>
 				</object>
 
 				<!-- STRUCTREE BUTTON -->
 				<object
 					style="StoneButtonFancy"
 					type="button"
 					size="0 64 100% 92"
 					tooltip_style="pgToolTip"
 					name="structreeButton"
 					hotkey="structree"
 				>
 					<translatableAttribute id="caption">Structure Tree</translatableAttribute>
 					<action on="Press">
 						closeMenu();
 						Engine.PushGuiPage("page_structree.xml", {});
 					</action>
 				</object>
 
 				<!-- HISTORY BUTTON -->
 				<object
 					style="StoneButtonFancy"
 					type="button"
 					size="0 96 100% 124"
 					tooltip_style="pgToolTip"
 					name="civInfoButton"
 					hotkey="civinfo"
 				>
 					<translatableAttribute id="caption">History</translatableAttribute>
 					<action on="Press">
 						closeMenu();
 						Engine.PushGuiPage("page_civinfo.xml");
 					</action>
 				</object>
 
 			</object>
 
 			<!-- submenuSinglePlayer -->
 			<object name="submenuSinglePlayer"
 				type="image"
 				size="0 4 100%-4 100%-4"
 				tooltip_style="pgToolTip"
 				hidden="true"
 			>
 				<object
 					type="button"
 					style="StoneButtonFancy"
 					size="0 0 100% 28"
 					tooltip_style="pgToolTip"
 				>
 					<translatableAttribute id="caption">Matches</translatableAttribute>
 					<translatableAttribute id="tooltip">Click here to start a new single player game.</translatableAttribute>
 					<action on="Press">
 						Engine.SwitchGuiPage("page_gamesetup.xml", {});
 					</action>
 				</object>
 
 				<object
 					type="button"
 					style="StoneButtonFancy"
 					size="0 32 100% 60"
 					tooltip_style="pgToolTip"
 					enabled="false"
 				>
 					<translatableAttribute id="caption">Campaigns</translatableAttribute>
 					<translatableAttribute id="tooltip">Relive history through historical military campaigns. \[NOT YET IMPLEMENTED]</translatableAttribute>
 					<action on="Press">
 						closeMenu();
 					</action>
 				</object>
 
 				<object
 					type="button"
 					style="StoneButtonFancy"
 					size="0 64 100% 92"
 					tooltip_style="pgToolTip"
 				>
 					<translatableAttribute id="caption">Load Game</translatableAttribute>
 					<translatableAttribute id="tooltip">Click here to load a saved game.</translatableAttribute>
 					<action on="Press">
 						closeMenu();
 						Engine.PushGuiPage("page_loadgame.xml", { "type": "offline" });
 					</action>
 				</object>
 
 				<object
 					type="button"
 					style="StoneButtonFancy"
 					size="0 96 100% 124"
 					tooltip_style="pgToolTip"
 				>
 					<translatableAttribute id="caption">Replays</translatableAttribute>
 					<translatableAttribute id="tooltip">Playback previous games.</translatableAttribute>
 					<action on="Press">
 						closeMenu();
 						Engine.SwitchGuiPage("page_replaymenu.xml", {
 							"replaySelectionData": {
 								"filters": {
 									"singleplayer": "Singleplayer"
 								}
 							}
 						});
 					</action>
 				</object>
 			</object>
 
 			<!-- submenuMultiplayer -->
 			<object name="submenuMultiplayer"
 				type="image"
 				size="0 4 100%-4 100%-4"
 				tooltip_style="pgToolTip"
 				hidden="true"
 			>
 				<object
 					type="button"
 					style="StoneButtonFancy"
 					size="0 0 100% 28"
 					tooltip_style="pgToolTip"
 				>
 					<translatableAttribute id="caption" comment="Join a game by specifying the host's IP address.">Join Game</translatableAttribute>
 					<translatableAttribute id="tooltip">Joining an existing multiplayer game.</translatableAttribute>
 					<action on="Press">
 						closeMenu();
 						Engine.PushGuiPage("page_gamesetup_mp.xml", { "multiplayerGameType": "join" });
 					</action>
 				</object>
 
 				<object
 					type="button"
 					style="StoneButtonFancy"
 					size="0 32 100% 60"
 					tooltip_style="pgToolTip"
 				>
 					<translatableAttribute id="caption">Host Game</translatableAttribute>
 					<translatableAttribute id="tooltip">Host a multiplayer game.\n\nRequires UDP port 20595 to be open.</translatableAttribute>
 					<action on="Press">
 						closeMenu();
 						Engine.PushGuiPage("page_gamesetup_mp.xml", { multiplayerGameType: "host" });
 					</action>
 				</object>
 
 				<object
 					type="button"
 					style="StoneButtonFancy"
 					size="0 64 100% 92"
 					tooltip_style="pgToolTip"
 					name="lobbyButton"
 					hotkey="lobby"
 				>
 					<translatableAttribute id="caption">Game Lobby</translatableAttribute>
 					<action on="Press">
 						if (!Engine.StartXmppClient)
 							return;
 						closeMenu();
 						Engine.PushGuiPage("page_prelobby_entrance.xml");
 					</action>
 					<action on="load">
 						if (!Engine.StartXmppClient)
 						{
 							this.enabled = false;
 							this.tooltip = getLobbyDisabledByBuild();
 						}
 					</action>
 				</object>
 
 				<object
 					type="button"
 					style="StoneButtonFancy"
 					size="0 96 100% 124"
 					tooltip_style="pgToolTip"
 				>
 					<translatableAttribute id="caption">Replays</translatableAttribute>
 					<translatableAttribute id="tooltip">Playback previous games.</translatableAttribute>
 					<action on="Press">
 						closeMenu();
 						Engine.SwitchGuiPage("page_replaymenu.xml", {
 							"replaySelectionData": {
 								"filters": {
 									"singleplayer": "Multiplayer"
 								}
 							}
 						});
 					</action>
 				</object>
 			</object>
 
 			<!-- submenuOptions -->
 			<object name="submenuOptions"
 				type="image"
 				size="0 4 100%-4 100%-4"
 				tooltip_style="pgToolTip"
 				hidden="true"
 			>
 				<object
 					style="StoneButtonFancy"
 					type="button"
 					size="0 0 100% 28"
 					tooltip_style="pgToolTip"
 				>
 					<translatableAttribute id="caption">Options</translatableAttribute>
 					<translatableAttribute id="tooltip">Adjust game settings.</translatableAttribute>
 					<action on="Press">
 						closeMenu();
 						Engine.PushGuiPage("page_options.xml");
 					</action>
 				</object>
 
 				<object
 					style="StoneButtonFancy"
 					type="button"
 					size="0 32 100% 60"
 					tooltip_style="pgToolTip"
 				>
 					<translatableAttribute id="caption">Language</translatableAttribute>
 					<translatableAttribute id="tooltip">Choose the language of the game.</translatableAttribute>
 					<action on="Press">
 						closeMenu();
 						Engine.PushGuiPage("page_locale.xml");
 					</action>
 				</object>
 
 				<object
 					style="StoneButtonFancy"
 					type="button"
 					size="0 64 100% 92"
 					tooltip_style="pgToolTip"
 				>
 					<translatableAttribute id="caption">Mod Selection</translatableAttribute>
 					<translatableAttribute id="tooltip">Select and download mods for the game.</translatableAttribute>
 					<action on="Press">
 						Engine.SwitchGuiPage("page_modmod.xml");
 					</action>
 				</object>
 				<object
 					style="StoneButtonFancy"
 					type="button"
 					size="0 96 100% 124"
 					tooltip_style="pgToolTip"
 				>
 					<translatableAttribute id="caption">Welcome Screen</translatableAttribute>
 					<translatableAttribute id="tooltip">Show the Welcome Screen. Useful if you hid it by mistake.</translatableAttribute>
 					<action on="Press">
 						closeMenu();
 						Engine.PushGuiPage("page_splashscreen.xml", {
 							"page": "splashscreen",
 							"callback": "SplashScreenClosedCallback"
 						});
 					</action>
 				</object>
 			</object>
 		</object>
 
 
 		<!--
 		==========================================
 		- MAIN MENU PANEL
 		==========================================
 		-->
 		<object name="mainMenu"
 			type="image"
 			style="MainMenuPanel"
 			size="60 -2 300 100%+2"
 			z="50"
 		>
 			<!-- These are used to make the right side blend in with the submenu -->
 			<object name="MainMenuPanelRightBorderTop"
 				type="image"
 				sprite="MainMenuPanelRightBorder"
 				ghost="true"
 				size="100%-2 0 100% 100%"
 			/>
 			<object name="MainMenuPanelRightBorderBottom"
 				type="image"
 				sprite="MainMenuPanelRightBorder"
 				ghost="true"
 				size="100%-2 0 100% 100%"
 			/>
 
 			<object
 				type="image"
 				sprite="productLogo"
 				ghost="true"
 				size="50%-110 30 50%+110 130"
 			/>
 
 			<object
 				type="image"
 				size="8 156 100%-8 356"
 				ghost="false"
 			>
 				<!-- LEARN BUTTON -->
 				<object
 					style="StoneButtonFancy"
 					type="button"
 					size="4 4 100%-4 32"
 					tooltip_style="pgToolTip"
 				>
 					<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();
 						openMenu("submenuLearn", this.parent.size.top + this.size.top, this.size.bottom - this.size.top, 4);
 					</action>
 				</object>
 
 				<!-- SINGLEPLAYER BUTTON -->
 				<object
 					style="StoneButtonFancy"
 					type="button"
 					size="4 36 100%-4 64"
 					tooltip_style="pgToolTip"
 				>
 					<translatableAttribute id="caption">Single Player</translatableAttribute>
 					<translatableAttribute id="tooltip">Challenge the computer player to a single player match.</translatableAttribute>
 					<action on="Press">
 						closeMenu();
 						openMenu("submenuSinglePlayer", this.parent.size.top + this.size.top, this.size.bottom - this.size.top, 4);
 					</action>
 				</object>
 
 				<!-- MULTIPLAYER BUTTON -->
 				<object
 					style="StoneButtonFancy"
 					type="button"
 					size="4 68 100%-4 96"
 					tooltip_style="pgToolTip"
 				>
 					<translatableAttribute id="caption">Multiplayer</translatableAttribute>
 					<translatableAttribute id="tooltip">Fight against one or more human players in a multiplayer game.</translatableAttribute>
 					<action on="Press">
 						closeMenu();
 						openMenu("submenuMultiplayer", this.parent.size.top + this.size.top, this.size.bottom - this.size.top, 4);
 					</action>
 				</object>
 
 				<!-- OPTIONS BUTTON -->
 				<object
 					style="StoneButtonFancy"
 					type="button"
 					size="4 100 100%-4 128"
 					tooltip_style="pgToolTip"
 				>
 					<translatableAttribute id="caption">Settings</translatableAttribute>
 					<translatableAttribute id="tooltip">Game options and mod selection.</translatableAttribute>
 					<action on="Press">
 						closeMenu();
 						openMenu("submenuOptions", this.parent.size.top + this.size.top, this.size.bottom - this.size.top, 4);
 					</action>
 				</object>
 
 				<!-- SCENARIO EDITOR BUTTON -->
 				<object
 					style="StoneButtonFancy"
 					type="button"
 					size="4 132 100%-4 160"
 					tooltip_style="pgToolTip"
 				>
 					<translatableAttribute id="caption">Scenario Editor</translatableAttribute>
 					<translatableAttribute id="tooltip">Open the Atlas Scenario Editor in a new window. You can run this more reliably by starting the game with the command-line argument &quot;-editor&quot;.</translatableAttribute>
 					<action on="Press">
 						pressedScenarioEditorButton();
 					</action>
 				</object>
 
 				<!-- EXIT BUTTON -->
 				<object
 					type="button"
 					style="StoneButtonFancy"
 					size="4 164 100%-4 192"
 					tooltip_style="pgToolTip"
 				>
 					<translatableAttribute id="caption">Exit</translatableAttribute>
 					<translatableAttribute id="tooltip">Exits the game.</translatableAttribute>
 					<action on="Press">exitGamePressed();</action>
 				</object>
 			</object>
 
 			<!-- PRE-RELEASE INFO -->
 			<object size="8 100%-420 100%-8 100%-94"
 				type="image"
 				style="TranslucentPanelThinBorder"
 			>
 				<!-- PRE-RELEASE WARNING -->
 				<object
 					font="sans-14"
 					type="text"
 					textcolor="white"
 					size="8 8 100%-8 100%-36"
 					ghost="true"
 				>
 					<!-- IMPORTANT: remember to update session/top_panel/label.xml in sync with this: -->
 					<attribute id="caption">
 						<keep>[font="sans-bold-16"]</keep>
 						<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>
 				</object>
 
 				<!-- GET INVOLVED -->
 				<object type="button"
 					style="StoneButton"
 					tooltip_style="pgToolTip"
 					size="8 100%-180 50%-4 100%-152"
 				>
 					<translatableAttribute id="caption">Website</translatableAttribute>
 					<translatableAttribute id="tooltip">Click to open play0ad.com in your web browser.</translatableAttribute>
 					<action on="Press">
 						openURL("https://play0ad.com/");
 					</action>
 				</object>
 
 				<object type="button"
 					style="StoneButton"
 					tooltip_style="pgToolTip"
 					size="50%+4 100%-180 100%-8 100%-152"
 				>
 					<translatableAttribute id="caption">Chat</translatableAttribute>
 					<translatableAttribute id="tooltip">Click to open the 0 A.D. IRC chat in your browser. (#0ad on webchat.quakenet.org)</translatableAttribute>
 					<action on="Press">
 						openURL("https://webchat.quakenet.org/?channels=0ad");
 					</action>
 				</object>
 
 				<object type="button"
 					style="StoneButton"
 					tooltip_style="pgToolTip"
 					size="8 100%-144 100%-8 100%-116"
 				>
 					<translatableAttribute id="caption">Report a Bug</translatableAttribute>
 					<translatableAttribute id="tooltip">Click to visit 0 A.D. Trac to report a bug, crash, or error.</translatableAttribute>
 					<action on="Press">
 						openURL("https://trac.wildfiregames.com/wiki/ReportingErrors/");
 					</action>
 				</object>
 
 				<object type="button"
 					style="StoneButton"
 					tooltip_style="pgToolTip"
 					size="8 100%-108 100%-8 100%-80"
 				>
 					<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">
 						openURL("https://trac.wildfiregames.com/wiki/Localization");
 					</action>
 				</object>
 
 				<object type="button"
 					style="StoneButton"
 					tooltip_style="pgToolTip"
 					size="8 100%-72 100%-8 100%-44"
 				>
 					<translatableAttribute id="caption">Donate</translatableAttribute>
 					<translatableAttribute id="tooltip">Help with the project expenses by donating.</translatableAttribute>
 					<action on="Press">
 						openURL("https://play0ad.com/community/donate/");
 					</action>
 				</object>
 
 				<object type="button"
 					style="StoneButton"
 					tooltip_style="pgToolTip"
 					size="8 100%-36 100%-8 100%-8"
 				>
 					<translatableAttribute id="caption">Credits</translatableAttribute>
 					<translatableAttribute id="tooltip">Click to see the 0 A.D. credits.</translatableAttribute>
 					<action on="Press">
 						Engine.PushGuiPage("page_credits.xml");
 					</action>
 				</object>
 
 			</object>
 
 			<!-- LOGO AND BUILD VERSION -->
 			<object
 				size="4 100%-84 100%-4 100%-56"
 				ghost="true"
 			>
 
 				<!-- COMPANY LOGO -->
 				<object
 					type="image"
 					sprite="companyLogo"
 					ghost="true"
 					size="50%-16 0 50%+16 32"
 				/>
 
 				<!-- COMPANY NAME -->
 				<object type="text"
 					style="MediumTitleText"
 					ghost="true"
 					size="50%-128 32 50%+128 48"
 				>
 					<translatableAttribute id="caption">WILDFIRE GAMES</translatableAttribute>
 				</object>
 			</object>
 
 			<!-- VERSION -->
 			<object
 				type="text"
 				style="MediumTitleText"
 				ghost="true"
 				size="50%-128 100%-36 50%+128 100%"
 			>
 				<action on="Load">
 					this.caption = getBuildString();
 				</action>
 			</object>
 		</object>
 	</object>
 
 </objects>
Index: ps/trunk/binaries/data/mods/public/gui/pregame/userreport/userreport.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/pregame/userreport/userreport.js	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/gui/pregame/userreport/userreport.js	(revision 21886)
@@ -0,0 +1,59 @@
+var g_UserReportStatusFormat = {
+	"disabled": data => translate("disabled"),
+	"proxy": data => translate("connecting to server"),
+	"waiting": data => translate("connecting to server"),
+	"connecting": data => translate("connecting to server"),
+	"sending": data => sprintf(translate("uploading (%f%%)"), Math.floor(100 * data[1])),
+	"completed": data =>
+		data[1] == 200 ?
+			translate("upload succeeded") :
+			sprintf(translate("upload failed (%(errorCode)s)"), {
+				"errorCode": data[1]
+			}),
+	"failed": data => sprintf(translate("upload failed (%(errorMessage)s)"), {
+		"errorMessage": uneval(data[2])
+	})
+};
+
+function initUserReport()
+{
+	setUserReportEnabled(Engine.IsUserReportEnabled());
+}
+
+function setUserReportEnabled(enabled)
+{
+	Engine.SetUserReportEnabled(enabled);
+	updateUserReportButtons();
+}
+
+function updateUserReportButtons()
+{
+	let userReportEnableButton = Engine.GetGUIObjectByName("userReportEnableButton");
+	userReportEnableButton.caption = Engine.IsUserReportEnabled() ? translate("Disable Feedback") : translate("Enable Feedback");
+	userReportEnableButton.onPress = () => {
+		setUserReportEnabled(!Engine.IsUserReportEnabled());
+	};
+
+	let userReportTermsButton = Engine.GetGUIObjectByName("userReportTermsButton");
+	userReportTermsButton.onPress = () => {
+		Engine.PushGuiPage("page_manual.xml", {
+			"page": "manual/userreport",
+			"title": translate("Technical Details")
+		});
+	};
+}
+
+function updateUserReportStatus()
+{
+	let statusData = Engine.GetUserReportStatus().split(/:/, 3);
+
+	Engine.GetGUIObjectByName("userReportText").caption =
+		Engine.IsUserReportEnabled() ?
+			setStringTags(translate("Thank you for helping improve 0 A.D.!"), { "font": "sans-bold-16" }) + "\n\n" +
+			translate("Anonymous feedback is currently enabled.") + "\n" +
+			sprintf(translate("Status: %(status)s."), {
+				"status": g_UserReportStatusFormat[statusData[0]] ? g_UserReportStatusFormat[statusData[0]](statusData) : translate("unknown")
+			}) :
+			setStringTags(translate("Help improve 0 A.D.!"), { "font": "sans-bold-16" }) + "\n\n" +
+			translate("You can automatically send us anonymous feedback that will help us fix bugs, and improve performance and compatibility.");
+}

Property changes on: ps/trunk/binaries/data/mods/public/gui/pregame/userreport/userreport.js
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/gui/pregame/userreport/userreport.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/pregame/userreport/userreport.xml	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/gui/pregame/userreport/userreport.xml	(revision 21886)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<object name="userReport" type="image" style="userReportPanel" size="100%-304 100%-154 100%-4 100%-4">
+
+	<action on="Load">initUserReport();</action>
+	<action on="Tick">updateUserReportStatus();</action>
+
+	<object type="text" name="userReportText" style="userReportText"/>
+
+	<object type="button" name="userReportEnableButton" style="StoneButton" size="8 100%-36 146 100%-8"/>
+
+	<object type="button" name="userReportTermsButton" style="StoneButton" size="100%-146 100%-36 100%-8 100%-8">
+		<translatableAttribute id="caption">Technical Details</translatableAttribute>
+	</object>
+
+</object>

Property changes on: ps/trunk/binaries/data/mods/public/gui/pregame/userreport/userreport.xml
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property