Index: ps/trunk/binaries/data/mods/mod/gui/termsdialog/termsdialog.xml
===================================================================
--- ps/trunk/binaries/data/mods/mod/gui/termsdialog/termsdialog.xml	(revision 21894)
+++ ps/trunk/binaries/data/mods/mod/gui/termsdialog/termsdialog.xml	(revision 21895)
@@ -1,46 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
 <objects>
 
 	<script directory="gui/common/"/>
 	<script directory="gui/termsdialog/"/>
 
 	<object type="image" z="0" sprite="ModernFade"/>
 
 	<object type="image" style="ModernDialog" size="50%-360 50%-290 50%+360 50%+290">
 
 		<object name="title" style="ModernLabelText" type="text" size="50%-128 -18 50%+128 14"/>
 
 		<object size="25 18 100%-25 50">
 			<object type="text" name="languageLabel" style="ModernLabelText">
 				<translatableAttribute id="caption">Language</translatableAttribute>
 			</object>
 			<object type="dropdown" name="languageDropdown" style="ModernDropDown" tooltip_style="onscreenToolTip"/>
 		</object>
 
 		<object size="20 60 100%-20 100%-50">
 			<object name="mainTextPanel" type="image" sprite="ModernFade">
 				<object name="mainText" type="text" style="ModernTextPanel"/>
 			</object>
 		</object>
 
 		<object size="25 100%-45 100% 100%-16">
 
 			<object size="0 0 160 100%" type="button" name="button[0]" style="ModernButtonRed" hidden="true"/>
 			<object size="170 0 330 100%" type="button" name="button[1]" style="ModernButtonRed" hidden="true"/>
 
 			<object size="100%-355 0 100% 100%">
 				<object type="button" style="ModernButtonRed" size="0 0 160 100%" hotkey="cancel">
-					<translatableAttribute id="caption">Cancel</translatableAttribute>
+					<translatableAttribute id="caption">Decline</translatableAttribute>
 					<action on="Press">closeTerms(false);</action>
 				</object>
 
 				<object name="connectButton" type="button" style="ModernButtonRed" size="170 0 330 100%">
-					<translatableAttribute id="caption" context="mod.io connection message box">Connect</translatableAttribute>
+					<translatableAttribute id="caption">Accept</translatableAttribute>
 					<action on="Press">closeTerms(true);</action>
 				</object>
 			</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	(revision 21894)
+++ ps/trunk/binaries/data/mods/public/gui/pregame/userreport/userreport.js	(revision 21895)
@@ -1,82 +1,83 @@
 var g_TermsUserReport = {
 	"TermsAndConditions": {
-		"title": translate("Technical Details"),
-		"instruction": "",
+		"title": translateWithContext("UserReporter Terms and Conditions", "Terms"),
+		"instruction": translate("Please read and accept the UserReporter Terms and Conditions."),
 		"file": "gui/manual/userreport.txt",
 		"config": "userreport.terms",
 		"callback": data => {
 			setUserReportEnabled(data.accepted);
 		},
 		"accepted": false,
 		"urlButtons": [
 			{
 				"caption": translate("Publications"),
 				"url": Engine.ConfigDB_GetValue("user", "userreport.url_publication")
 			}
 		]
 	}
 };
 
 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()
 {
 	initTerms(g_TermsUserReport);
 	loadTermsAcceptance();
 
 	setUserReportEnabled(!checkTerms() && Engine.IsUserReportEnabled());
 }
 
 function setUserReportEnabled(enabled)
 {
 	Engine.SetUserReportEnabled(enabled);
 	updateUserReportButtons();
 }
 
 function updateUserReportButtons()
 {
 	let termsFeedback = checkTerms();
 
 	let userReportEnableButton = Engine.GetGUIObjectByName("userReportEnableButton");
 	userReportEnableButton.caption = Engine.IsUserReportEnabled() ? translate("Disable Feedback") : translate("Enable Feedback");
 	userReportEnableButton.enabled = !termsFeedback;
 	userReportEnableButton.tooltip = termsFeedback;
 	userReportEnableButton.onPress = () => {
 		setUserReportEnabled(!Engine.IsUserReportEnabled());
 	};
 
 	let userReportTermsButton = Engine.GetGUIObjectByName("userReportTermsButton");
+	userReportTermsButton.caption = g_TermsUserReport.TermsAndConditions.title;
 	userReportTermsButton.onPress = () => {
 		openTerms("TermsAndConditions");
 	};
 }
 
 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" +
+			translate("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.");
+			translate("You can automatically send us feedback that can help us fix bugs, and improve performance and compatibility.");
 }
Index: ps/trunk/binaries/data/mods/public/gui/pregame/userreport/userreport.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/pregame/userreport/userreport.xml	(revision 21894)
+++ ps/trunk/binaries/data/mods/public/gui/pregame/userreport/userreport.xml	(revision 21895)
@@ -1,16 +1,13 @@
 <?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 type="button" name="userReportTermsButton" style="StoneButton" size="100%-146 100%-36 100%-8 100%-8"/>
 
 </object>
Index: ps/trunk/binaries/data/mods/public/gui/prelobby/common/terms/termslobby.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/prelobby/common/terms/termslobby.js	(revision 21894)
+++ ps/trunk/binaries/data/mods/public/gui/prelobby/common/terms/termslobby.js	(revision 21895)
@@ -1,44 +1,44 @@
 var g_TermsButtonHeight = 40;
 
 function initLobbyTerms()
 {
 	let terms = {
 		"Service": {
 			"title": translate("Terms of Service"),
-			"instruction": translate("Please read the Terms of Service"),
+			"instruction": translate("Please read and accept the Terms of Service."),
 			"file": "gui/prelobby/common/terms/Terms_of_Service.txt",
 			"config": "lobby.terms_of_service",
 			"salt": () => Engine.GetGUIObjectByName("username").caption,
 			"accepted": false,
 			"callback": updateFeedback
 		},
 		"Use": {
 			"title": translate("Terms of Use"),
-			"instruction": translate("Please read the Terms of Use"),
+			"instruction": translate("Please read and accept the Terms of Use."),
 			"file": "gui/prelobby/common/terms/Terms_of_Use.txt",
 			"config": "lobby.terms_of_use",
 			"salt": () => Engine.GetGUIObjectByName("username").caption,
 			"accepted": false,
 			"callback": updateFeedback
 		}
 	};
 
 	Object.keys(terms).forEach((page, i) => {
 
 		let button = Engine.GetGUIObjectByName("termsButton[" + i + "]");
 
 		button.caption = terms[page].title;
 
 		button.onPress = () => {
 			openTerms(page);
 		};
 
 		let size = button.size;
 		size.top = i * g_TermsButtonHeight;
 		size.bottom = i * g_TermsButtonHeight + 28;
 		button.size = size;
 	});
 
 	initTerms(terms);
 	loadTermsAcceptance();
 }