[tor-commits] [tor-launcher/master] fixup! Bug 27476: about:torconnect fixes and new strings

[sysrqb at torproject.org]

commit 16ec47a0ae93a5b48f69183304c61b2dbe14762c
Author: Richard Pospesel <richard at torproject.org>
Date:   Tue Jun 8 18:08:59 2021 +0200

    fixup! Bug 27476: about:torconnect fixes and new strings
---
 src/chrome/locale/en-US/network-settings.dtd  | 3 +++
 src/defaults/preferences/torlauncher-prefs.js | 1 +
 2 files changed, 4 insertions(+)

diff --git a/src/chrome/locale/en-US/network-settings.dtd b/src/chrome/locale/en-US/network-settings.dtd
index 81163a1..45dde8f 100644
--- a/src/chrome/locale/en-US/network-settings.dtd
+++ b/src/chrome/locale/en-US/network-settings.dtd
@@ -66,6 +66,9 @@
 <!ENTITY torPreferences.torSettings "Tor Settings">
 <!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." >
 <!ENTITY torPreferences.learnMore "Learn More">
+<!ENTITY torPreferences.quickstart "Quickstart">
+<!ENTITY torPreferences.quickstartDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world. Quickstart allows Tor Browser to connect automatically.">
+<!ENTITY torPreferences.quickstartCheckbox "Always connect automatically">
 <!ENTITY torPreferences.bridges "Bridges">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
 <!ENTITY torPreferences.useBridge "Use a bridge">
diff --git a/src/defaults/preferences/torlauncher-prefs.js b/src/defaults/preferences/torlauncher-prefs.js
index 1f7a22f..ded8f2c 100644
--- a/src/defaults/preferences/torlauncher-prefs.js
+++ b/src/defaults/preferences/torlauncher-prefs.js
@@ -4,6 +4,7 @@ pref("extensions.torlauncher.prompt_for_locale", true);
 
 pref("extensions.torlauncher.start_tor", true);
 pref("extensions.torlauncher.prompt_at_startup", true);
+pref("extensions.torlauncher.quickstart", false);
 
 // This pref controls whether Tor Launcher will try to remove the old
 // meek and moat http helper browser profiles. This only has an effect