Commit 3635ee8a authored by Kathleen Brade's avatar Kathleen Brade Committed by Georg Koppen
Browse files

Bug 10534: Let's not advertise help desk emails directly

Do not display the help@rt.torproject.org email address (currently,
no one is responding to help desk email).

In the wizard and network settings window, point users to
torproject.org/about/contact.html#support for assistance.
parent c4d03f9b
<?xml version="1.0"?>
<!--
- Copyright (c) 2014, The Tor Project, Inc.
- Copyright (c) 2016, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
......@@ -118,10 +118,12 @@
<html:div>&torsettings.bridgeHelp3.emailDesc;</html:div>
<html:div>&torsettings.bridgeHelp3.emailList;</html:div>
</html:li>
<!-- As of April 2016, no one is responding to help desk email. Hopefully this will change soon.
<html:li>
<html:div class="heading">&torsettings.bridgeHelp4Heading;</html:div>
<html:div class="endOfHelp">&torsettings.bridgeHelp4;</html:div>
</html:li>
-->
</html:ol>
</vbox>
<panel id="copyLogFeedbackPanel" type="arrow" fade="slow"
......
// Copyright (c) 2015, The Tor Project, Inc.
// Copyright (c) 2016, The Tor Project, Inc.
// See LICENSE for licensing information.
//
// vim: set sw=2 sts=2 ts=8 et syntax=javascript:
......@@ -23,7 +23,9 @@ const kPrefDefaultBridgeRecommendedType =
"extensions.torlauncher.default_bridge_recommended_type";
const kPrefDefaultBridgeType = "extensions.torlauncher.default_bridge_type";
const kSupportAddr = "help@rt.torproject.org";
// As of April 2016, no one is responding to help desk email. Hopefully this will change soon.
//const kSupportAddr = "help@rt.torproject.org";
const kSupportURL = "torproject.org/about/contact.html#support";
const kTorProcessReadyTopic = "TorProcessIsReady";
const kTorProcessExitedTopic = "TorProcessExited";
......@@ -89,7 +91,7 @@ function initDialogCommon(aHasQuitButton)
if (forAssistance)
{
forAssistance.textContent = TorLauncherUtil.getFormattedLocalizedString(
"forAssistance", [kSupportAddr], 1);
"forAssistance2", [kSupportURL], 1);
}
if (aHasQuitButton)
......
......@@ -65,7 +65,7 @@
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
......
......@@ -36,6 +36,7 @@ torlauncher.quit_win=Exit
torlauncher.done=Done
torlauncher.forAssistance=For assistance, contact %S
torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment