Add TorStrings module for localization

48886604 · Alex Catarineu · Pier Angelo Vendrame · 559d7793 · 48886604 · 48886604
Commit 48886604 authored Jul 24, 2020 by Alex Catarineu Committed by Pier Angelo Vendrame Apr 8, 2024
--- a/browser/base/content/browser-doctype.inc
+++ b/browser/base/content/browser-doctype.inc
+<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
+%brandDTD;
+<!ENTITY % torbuttonDTD SYSTEM "chrome://torbutton/locale/torbutton.dtd">
+%torbuttonDTD;
+<!ENTITY % aboutDialogDTD SYSTEM "chrome://torbutton/locale/aboutDialog.dtd">
+%aboutDialogDTD;
--- a/browser/base/content/browser.xhtml
+++ b/browser/base/content/browser.xhtml
@@ -37,6 +37,10 @@
 <?xml-stylesheet href="chrome://browser/skin/places/tree-icons.css" type="text/css"?>
 <?xml-stylesheet href="chrome://browser/skin/places/editBookmark.css" type="text/css"?>

+<!DOCTYPE window [
+#include browser-doctype.inc
+]>
+
 <html id="main-window"
        xmlns:html="http://www.w3.org/1999/xhtml"
        xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"


--- a/browser/base/content/hiddenWindowMac.xhtml
+++ b/browser/base/content/hiddenWindowMac.xhtml
@@ -8,6 +8,10 @@

 <?xml-stylesheet href="chrome://browser/skin/webRTC-menubar-indicator.css" type="text/css"?>

+<!DOCTYPE window [
+#include browser-doctype.inc
+]>
+
 <window id="main-window"
        xmlns:html="http://www.w3.org/1999/xhtml"
        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"


--- a/browser/base/content/pageinfo/pageInfo.xhtml
+++ b/browser/base/content/pageinfo/pageInfo.xhtml
@@ -6,6 +6,12 @@
 <?xml-stylesheet href="chrome://browser/content/pageinfo/pageInfo.css" type="text/css"?>
 <?xml-stylesheet href="chrome://browser/skin/pageInfo.css" type="text/css"?>

+<!DOCTYPE window [
+#ifdef XP_MACOSX
+#include ../browser-doctype.inc
+#endif
+]>
+
 <window id="main-window"
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
  xmlns:html="http://www.w3.org/1999/xhtml"


--- a/browser/components/places/content/places.xhtml
+++ b/browser/components/places/content/places.xhtml
@@ -16,7 +16,11 @@
 <?xml-stylesheet href="chrome://browser/content/downloads/downloads.css"?>
 <?xml-stylesheet href="chrome://browser/skin/downloads/allDownloadsView.css"?>

-<!DOCTYPE window>
+<!DOCTYPE window [
+#ifdef XP_MACOSX
+#include ../../../base/content/browser-doctype.inc
+#endif
+]>

 <window id="places"
        data-l10n-id="places-library3"


--- a/browser/components/shell/content/setDesktopBackground.xhtml
+++ b/browser/components/shell/content/setDesktopBackground.xhtml
@@ -7,6 +7,12 @@
 <?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 <?xml-stylesheet href="chrome://browser/skin/setDesktopBackground.css" type="text/css"?>

+<!DOCTYPE window [
+#ifdef XP_MACOSX
+#include ../../../base/content/browser-doctype.inc
+#endif
+]>
+
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
        xmlns:html="http://www.w3.org/1999/xhtml"
        windowtype="Shell:SetDesktopBackground"


--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -225,6 +225,8 @@
 @RESPATH@/browser/chrome/browser.manifest
 @RESPATH@/chrome/pdfjs.manifest
 @RESPATH@/chrome/pdfjs/*
+@RESPATH@/chrome/torbutton.manifest
+@RESPATH@/chrome/torbutton/*
 @RESPATH@/chrome/toolkit@JAREXT@
 @RESPATH@/chrome/toolkit.manifest
 #ifdef MOZ_GTK


--- a/browser/modules/TorStrings.jsm
+++ b/browser/modules/TorStrings.jsm
--- a/browser/modules/moz.build
+++ b/browser/modules/moz.build
@@ -147,6 +147,7 @@ EXTRA_JS_MODULES += [
    "SitePermissions.sys.mjs",
    "TabsList.jsm",
    "TabUnloader.jsm",
+    "TorStrings.jsm",
    "TransientPrefs.jsm",
    "URILoadingHelper.sys.mjs",
    "webrtcUI.jsm",


--- a/mobile/android/installer/package-manifest.in
+++ b/mobile/android/installer/package-manifest.in
@@ -140,6 +140,10 @@
 ; Base Browser
 @BINPATH@/components/SecurityLevel.manifest

+; Torbutton
+@BINPATH@/chrome/torbutton@JAREXT@
+@BINPATH@/chrome/torbutton.manifest
+
 ; [Default Preferences]
 ; All the pref files must be part of base to prevent migration bugs
 #ifndef MOZ_ANDROID_FAT_AAR_ARCHITECTURES


--- a/toolkit/moz.build
+++ b/toolkit/moz.build
@@ -22,6 +22,7 @@ DIRS += [
    "mozapps/preferences",
    "profile",
    "themes",
+    "torbutton",
 ]

 if CONFIG["OS_ARCH"] == "WINNT":


--- a/toolkit/torbutton/chrome/locale/en-US/aboutDialog.dtd
+++ b/toolkit/torbutton/chrome/locale/en-US/aboutDialog.dtd
+<!-- Copyright (c) 2022, The Tor Project, Inc.
+   - This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY project.start           "&brandShortName; is developed by ">
+<!-- LOCALIZATION NOTE (project.tpoLink): This is a link title that links to https://www.torproject.org -->
+<!ENTITY project.tpoLink         "the &vendorShortName;">
+<!ENTITY project.end             ", a nonprofit working to defend your privacy and freedom online.">
+
+<!ENTITY help.start              "Want to help? ">
+<!-- LOCALIZATION NOTE (help.donate): This is a link title that links to https://donate.torproject.org/ -->
+<!ENTITY help.donateLink         "Donate">
+<!ENTITY help.or                 " or ">
+<!-- LOCALIZATION NOTE (help.getInvolvedLink): This is a link title that links to https://community.torproject.org/ -->
+<!ENTITY help.getInvolvedLink    "get involved">
+<!ENTITY help.end                "!">
+<!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to https://support.torproject.org/ -->
+<!ENTITY bottomLinks.questions   "Questions?">
+<!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to https://community.torproject.org/relay/ -->
+<!ENTITY bottomLinks.grow        "Help the Tor Network Grow!">
+<!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to about:license -->
+<!ENTITY bottomLinks.license  "Licensing Information">
+<!ENTITY tor.TrademarkStatement   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
--- a/toolkit/torbutton/chrome/locale/en-US/aboutTBUpdate.dtd
+++ b/toolkit/torbutton/chrome/locale/en-US/aboutTBUpdate.dtd
+<!-- Copyright (c) 2022, The Tor Project, Inc.
+   - This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY aboutTBUpdate.changelogTitle "Tor Browser Changelog">
+<!ENTITY aboutTBUpdate.version "Version">
+<!ENTITY aboutTBUpdate.releaseDate "Release Date">
+<!ENTITY aboutTBUpdate.releaseNotes "Release Notes">
+<!-- LOCALIZATION NOTE: the following entities are used to create the link to
+  -  obtain more information about the latest update.
+  -  The markup on the page looks like this:
+  -  &aboutTBUpdate.linkPrefix;<a href="...">&aboutTBUpdate.linkLabel;</a>&aboutTBUpdate.linkSuffix;
+  -  So, linkPrefix is what precedes the link, linkLabel is the link itself,
+  -  and linkSuffix is a text after the link. -->
+<!ENTITY aboutTBUpdate.linkPrefix "For the most up-to-date information about this release, ">
+<!ENTITY aboutTBUpdate.linkLabel  "visit our website">
+<!ENTITY aboutTBUpdate.linkSuffix ".">
--- a/toolkit/torbutton/chrome/locale/en-US/brand.dtd
+++ b/toolkit/torbutton/chrome/locale/en-US/brand.dtd
+<!-- Copyright (c) 2022, The Tor Project, Inc.
+   - This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY  brandShortName        "Tor Browser">
+
+<!-- Still used in aboutDialog -->
+<!ENTITY  vendorShortName       "Tor Project">
--- a/toolkit/torbutton/chrome/locale/en-US/brand.properties
+++ b/toolkit/torbutton/chrome/locale/en-US/brand.properties
+# Copyright (c) 2022, The Tor Project, Inc.
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+brandShorterName=Tor Browser
+brandShortName=Tor Browser
+brandFullName=Tor Browser
--- a/toolkit/torbutton/chrome/locale/en-US/branding/brand.ftl
+++ b/toolkit/torbutton/chrome/locale/en-US/branding/brand.ftl
+# For Tor Browser, we use a new file (different than the brand.ftl file
+# that is used by Firefox) to avoid picking up the -brand-short-name values
+# that Mozilla includes in the Firefox language packs.
+
+-brand-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
--- a/toolkit/torbutton/chrome/locale/en-US/browserOnboarding.properties
+++ b/toolkit/torbutton/chrome/locale/en-US/browserOnboarding.properties
+# Copyright (c) 2019, The Tor Project, Inc.
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+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’re now protected against tracking, surveillance, and censorship. This quick onboarding will show you how.
+onboarding.tour-tor-welcome.next-button=Go to Privacy
+
+onboarding.tour-tor-privacy=Privacy
+onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
+onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected 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 connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there’s no single point of failure or centralized entity you need to trust in order to enjoy the internet privately.
+onboarding.tour-tor-network.description-para2=NEW: Tor Network Settings, including the ability to request bridges where Tor is blocked, can now be found in Preferences.
+onboarding.tour-tor-network.action-button=Adjust Your Tor Network Settings
+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 Tor relays around the world. No website knows where you are connecting from. You can request a new circuit by clicking ‘New Circuit for this Site’ on our Circuit Display.
+onboarding.tour-tor-circuit-display.button=See My Path
+onboarding.tour-tor-circuit-display.next-button=Go to Security
+
+onboarding.tour-tor-security=Security
+onboarding.tour-tor-security.title=Choose your experience.
+onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do.
+onboarding.tour-tor-security.description-suffix=Note: By default, NoScript and HTTPS Everywhere are not included on the toolbar, but you can customize your toolbar to add them.
+onboarding.tour-tor-security-level.button=See Your Security Level
+onboarding.tour-tor-security-level.next-button=Go to Experience Tips
+
+onboarding.tour-tor-expect-differences=Experience Tips
+onboarding.tour-tor-expect-differences.title=Expect some differences.
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot.
+onboarding.tour-tor-expect-differences.button=See FAQs
+onboarding.tour-tor-expect-differences.next-button=Go to Onion Services
+
+onboarding.tour-tor-onion-services=Onion Services
+onboarding.tour-tor-onion-services.title=Be extra protected.
+onboarding.tour-tor-onion-services.description=Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously. Click below to visit the DuckDuckGo onion site.
+onboarding.tour-tor-onion-services.button=Visit an Onion
+onboarding.tour-tor-onion-services.next-button=Done
+
+onboarding.overlay-icon-tooltip-updated2=See what's new\nin %S
+onboarding.tour-tor-update.prefix-new=New
+onboarding.tour-tor-update.prefix-updated=Updated
+
+onboarding.tour-tor-toolbar=Toolbar
+onboarding.tour-tor-toolbar-update-9.0.title=Goodbye Onion Button.
+onboarding.tour-tor-toolbar-update-9.0.description=We want your experience using Tor to be fully integrated within Tor Browser.
+onboarding.tour-tor-toolbar-update-9.0.description-para2=That's why now, rather than using the onion button, you can see your Tor Circuit via the [i] in the URL bar and request a New Identity using the toolbar button or the [≡] menu.
+onboarding.tour-tor-toolbar-update-9.0.button=How to Request a New Identity
+onboarding.tour-tor-toolbar-update-9.0.next-button=Go to Tor Network
+
+# Circuit Display onboarding.
+onboarding.tor-circuit-display.next=Next
+onboarding.tor-circuit-display.done=Done
+onboarding.tor-circuit-display.one-of-three=1 of 3
+onboarding.tor-circuit-display.two-of-three=2 of 3
+onboarding.tor-circuit-display.three-of-three=3 of 3
+
+onboarding.tor-circuit-display.intro.title=How do circuits work?
+onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assigned relays, which are computers around the world configured to forward Tor traffic. Circuits allow you to browse privately and to connect to onion services.
+
+onboarding.tor-circuit-display.diagram.title=Circuit Display
+onboarding.tor-circuit-display.diagram.msg=This diagram shows the relays that make up the circuit for this website. To prevent linking of activity across different sites, each website gets a different circuit.
+
+onboarding.tor-circuit-display.new-circuit.title=Do you need a new circuit?
+onboarding.tor-circuit-display.new-circuit.msg=If you are not able to connect to the website you’re trying to visit or it is not loading properly, then you can use this button to reload the site with a new circuit.
--- a/toolkit/torbutton/chrome/locale/en-US/onboarding.properties
+++ b/toolkit/torbutton/chrome/locale/en-US/onboarding.properties
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# LOCALIZATION NOTE(onboarding.overlay-icon-tooltip2): This string will be used
+# to show the tooltip alongside the notification icon in the overlay tour. %S is
+# brandShortName. The tooltip is designed to show in two lines. Please use \n to
+# do appropriate line breaking.
+onboarding.overlay-icon-tooltip2=New to %S?\nLet’s get started.
+# LOCALIZATION NOTE(onboarding.overlay-icon-tooltip-updated2): %S is
+# brandShortName. The tooltip is designed to show in two lines. Please use \n to
+# do appropriate line breaking.
+onboarding.overlay-icon-tooltip-updated2=%S is all new.\nSee what you can do!
+# LOCALIZATION NOTE(onboarding.overlay-close-button-tooltip): The overlay close button is an icon button. This tooltip would be shown when mousing hovering on the button.
+onboarding.overlay-close-button-tooltip=Close
+# LOCALIZATION NOTE(onboarding.notification-close-button-tooltip): The notification close button is an icon button. This tooltip would be shown when mousing hovering on the button.
+onboarding.notification-close-button-tooltip=Dismiss
+# LOCALIZATION NOTE(onboarding.complete): This string is used to describe an
+# onboarding tour item that is complete.
+onboarding.complete=Complete
--- a/toolkit/torbutton/chrome/locale/en-US/onionLocation.properties
+++ b/toolkit/torbutton/chrome/locale/en-US/onionLocation.properties
+# Copyright (c) 2022, The Tor Project, Inc.
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# Onion-Location strings.
+onionLocation.loadOnion=Visit the .onion
+# Localization note: this is the access key for "Visit the .onion".
+# It should be a character that appears in that string.
+onionLocation.loadOnionAccessKey=V
+onionLocation.notNow=Not Now
+# Localization note: this is the access key for "Not now".
+# It should be a character that appears in that string.
+onionLocation.notNowAccessKey=n
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
--- a/toolkit/torbutton/chrome/locale/en-US/rulesets.properties
+++ b/toolkit/torbutton/chrome/locale/en-US/rulesets.properties
+# Copyright (c) 2022, The Tor Project, Inc.
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# about:rulesets strings.
+rulesets.warningTitle=Proceed with Caution
+rulesets.warningDescription=Adding or modifying rulesets can cause attackers to hijack your browser. Proceed only if you know what you are doing.
+rulesets.warningEnable=Warn me when I attempt to access these preferences
+rulesets.warningButton=Accept the Risk and Continue
+# Ruleset list
+rulesets.rulesets=Rulesets
+rulesets.noRulesets=No rulesets found
+rulesets.noRulesetsDescr=When you save a ruleset in Tor Browser, it will show up here.
+# LOCALIZATION NOTE: %S will be replaced by the update date (automatically formatted by Firefox's l10n component)
+rulesets.lastUpdated=Last updated %S
+rulesets.neverUpdated=Never updated, or last update failed
+rulesets.enabled=Enabled
+rulesets.disabled=Disabled
+# Ruleset details/edit ruleset
+rulesets.edit=Edit
+rulesets.name=Name
+rulesets.jwk=JWK
+rulesets.pathPrefix=Path Prefix
+rulesets.scope=Scope
+rulesets.enable=Enable this ruleset
+rulesets.checkUpdates=Check for Updates
+rulesets.jwkPlaceholder=The key used to sign this ruleset in the JWK (JSON Web Key) format
+rulesets.jwkInvalid=The JWK could not be parsed, or it is not a valid key
+rulesets.pathPrefixPlaceholder=URL prefix that contains the files needed by the ruleset
+rulesets.pathPrefixInvalid=The path prefix is not a valid HTTP(S) URL
+rulesets.scopePlaceholder=Regular expression for the scope of the rules
+rulesets.scopeInvalid=The scope could not be parsed as a regular expression
+rulesets.save=Save
+rulesets.cancel=Cancel