commit 3b3161cb9f1e96eaaa303a405df4a88a2be62a55 Author: Kathy Brade <brade@pearlcrescent.com> Date: Wed Aug 15 10:06:09 2018 -0400 Bug 26961: New user onboarding Add strings for use by new user onboarding. Add "TorOpenSecuritySettings" observer. --- src/chrome/content/torbutton.js | 10 +++++- src/chrome/locale/en/browserOnboarding.properties | 38 +++++++++++++++++++++++ trans_tools/import-translations.sh | 1 + 3 files changed, 48 insertions(+), 1 deletion(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 8e62a5ab..134f10da 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -12,7 +12,7 @@ let { showDialog } = Cu.import("resource://torbutton/modules/utils.js", {}); let { getLocale, unescapeTorString } = Cu.import("resource://torbutton/modules/utils.js", {}); let SecurityPrefs = Cu.import("resource://torbutton/modules/security-prefs.js", {}); let NoScriptControl = Cu.import("resource://torbutton/modules/noscript-control.js", {}); -let { bindPrefAndInit } = Cu.import("resource://torbutton/modules/utils.js", {}); +let { bindPrefAndInit, observe } = Cu.import("resource://torbutton/modules/utils.js", {}); Cu.importGlobalProperties(["XMLHttpRequest"]); @@ -1920,6 +1920,8 @@ function torbutton_is_windowed(wind) { return true; } +let stopOpenSecuritySettingsObserver; + // Bug 1506 P3: This is needed pretty much only for the version check // and the window resizing. See comments for individual functions for // details @@ -1953,6 +1955,11 @@ function torbutton_new_window(event) Ci.nsIWebProgress.NOTIFY_STATE_DOCUMENT); } + // Register the TorOpenSecuritySettings observer, which is used by + // UITour to open the security slider dialog. + stopOpenSecuritySettingsObserver = observe("TorOpenSecuritySettings", + torbutton_open_prefs_dialog); + // Check the version on every new window. We're already pinging check in these cases. torbutton_do_async_versioncheck(); @@ -1964,6 +1971,7 @@ function torbutton_new_window(event) function torbutton_close_window(event) { torbutton_window_pref_observer.unregister(); torbutton_tor_check_observer.unregister(); + stopOpenSecuritySettingsObserver(); window.removeEventListener("sizemodechange", m_tb_resize_handler, false); diff --git a/src/chrome/locale/en/browserOnboarding.properties b/src/chrome/locale/en/browserOnboarding.properties new file mode 100644 index 00000000..362eefea --- /dev/null +++ b/src/chrome/locale/en/browserOnboarding.properties @@ -0,0 +1,38 @@ +# Copyright (c) 2018, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +onboarding.tour-tor-welcome=Welcome +onboarding.tour-tor-welcome.title=You’re ready. +onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding. +onboarding.tour-tor-welcome.button=Start Now + +onboarding.tour-tor-privacy=Privacy +onboarding.tour-tor-privacy.title=Snub trackers and snoopers. +onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers can’t follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click ‘Tor Network’ to learn how we protect you on the network level. +onboarding.tour-tor-privacy.button=Go to Tor Network + +onboarding.tour-tor-network=Tor Network +onboarding.tour-tor-network.title=Travel a decentralized network. +onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, there’s no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on ‘Circuit Display’ to learn how they work. +onboarding.tour-tor-network.button=Go to Circuit Display + +onboarding.tour-tor-circuit-display=Circuit Display +onboarding.tour-tor-circuit-display.title=See your path. +onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking ‘New Circuit for this Site’ on our Circuit Display. Click below to see how it works. +onboarding.tour-tor-circuit-display.button=Explore + +onboarding.tour-tor-security=Security +onboarding.tour-tor-security.title=Choose your experience. +onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do. +onboarding.tour-tor-security.button=Review Settings + +onboarding.tour-tor-expect-differences=Experience Tips +onboarding.tour-tor-expect-differences.title=Experience Tips +onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users. +onboarding.tour-tor-expect-differences.button=See FAQs + +onboarding.tour-tor-onion-services=Onion Services +onboarding.tour-tor-onion-services.title=Onion Services +onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work. +onboarding.tour-tor-onion-services.button=Visit an Onion diff --git a/trans_tools/import-translations.sh b/trans_tools/import-translations.sh index 2f0be994..342188d0 100755 --- a/trans_tools/import-translations.sh +++ b/trans_tools/import-translations.sh @@ -20,6 +20,7 @@ FILEMAP=( "aboutDialog.dtd:torbutton-aboutdialogdtd" "aboutTBUpdate.dtd:torbutton-abouttbupdatedtd" "brand.dtd:torbutton-branddtd" "brand.properties:torbutton-brandproperties" + "browserOnboarding.properties:torbutton-browseronboardingproperties" "torbutton.dtd:torbutton-torbuttondtd" "torbutton.properties:torbutton-torbuttonproperties" )