tbb-commits
Threads by month
- ----- 2025 -----
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
January 2022
- 5 participants
- 47 discussions

[Git][tpo/applications/android-components] Pushed new branch android-components-96.0.13-11.5-1
by boklm (@boklm) 25 Jan '22
by boklm (@boklm) 25 Jan '22
25 Jan '22
boklm pushed new branch android-components-96.0.13-11.5-1 at The Tor Project / Applications / android-components
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/android-components/-/tree/an…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[tor-browser-bundle-testsuite/master] Fixed tests for Tor Browser 11/Firefox 91.
by richard@torproject.org 19 Jan '22
by richard@torproject.org 19 Jan '22
19 Jan '22
commit b7bf572b77a1c355473204a79da912d2333e392f
Author: Piero V <vogliadifarniente(a)gmail.com>
Date: Fri Jan 7 12:49:02 2022 +0100
Fixed tests for Tor Browser 11/Firefox 91.
Canged fp_navigator and fp_useragent to test with the correct version.
The screen dimensions test was failing because letterboxing is disabled
on about:pages (I checked with Richard, and this is the indended
behavior).
Therefore, the test is now run on a TPO page, and it passes.
Updated the settings test, to check for new settings (see
tor-browser!215), and not to check anymore for deprecated and removed
settings (see tor-browser#40177).
As a result of these settings changes, some DOM objects are now
exposed:
* pointer events
* gamepads
* applicationCache
* visualViewport
However, Tor Browser already contains mitigatins against their use for
fingerprinting (e.g., gamepads do not work, Mozilla added some
protections to pointer events for Bugzilla#1363508, letterboxing should
prevent fingerprinting on visualViewport, cache storage is 0 bytes,
etc...).
Some other DOM objects are just new (e.g., clientInformation).
Finally, HTTPS everywhere test failed because now Firefox redirects to
HTTPS if available, even when HTTPS-Only Mode is not enabled.
To detect if HTTPS everywhere is actually the responsible of the
redirect, we need to run it with dom.security.https_first_pbm set to
false.
---
.../test_dom-objects-enumeration.py | 21 ++++++++--
marionette/tor_browser_tests/test_fp_navigator.py | 3 +-
.../tor_browser_tests/test_fp_screen_dimensions.py | 2 +
marionette/tor_browser_tests/test_fp_useragent.py | 3 +-
.../tor_browser_tests/test_https-everywhere.py | 7 +++-
marionette/tor_browser_tests/test_settings.py | 48 +++++++++++++++-------
6 files changed, 62 insertions(+), 22 deletions(-)
diff --git a/marionette/tor_browser_tests/test_dom-objects-enumeration.py b/marionette/tor_browser_tests/test_dom-objects-enumeration.py
index 26ff945..666e9b0 100644
--- a/marionette/tor_browser_tests/test_dom-objects-enumeration.py
+++ b/marionette/tor_browser_tests/test_dom-objects-enumeration.py
@@ -17,6 +17,7 @@ class Test(testsuite.TorBrowserTest):
"AbortSignal",
"AbstractRange",
"addEventListener",
+ "applicationCache",
"alert",
"Animation",
"AnimationEffect",
@@ -61,6 +62,7 @@ class Test(testsuite.TorBrowserTest):
"CharacterData",
"clearInterval",
"clearTimeout",
+ "clientInformation",
"Clipboard",
"ClipboardEvent",
"close",
@@ -368,6 +370,7 @@ class Test(testsuite.TorBrowserTest):
"NotifyPaintEvent",
"Number",
"Object",
+ "OfflineResourceList",
"onabort",
"onabsolutedeviceorientation",
"onafterprint",
@@ -376,6 +379,7 @@ class Test(testsuite.TorBrowserTest):
"onanimationiteration",
"onanimationstart",
"onauxclick",
+ "onbeforeinput",
"onbeforeprint",
"onbeforeunload",
"onblur",
@@ -387,10 +391,8 @@ class Test(testsuite.TorBrowserTest):
"oncontextmenu",
"oncuechange",
"ondblclick",
- "ondevicelight",
"ondevicemotion",
"ondeviceorientation",
- "ondeviceproximity",
"ondrag",
"ondragend",
"ondragenter",
@@ -405,6 +407,9 @@ class Test(testsuite.TorBrowserTest):
"onerror",
"onfocus",
"onformdata",
+ "ongamepadconnected",
+ "ongamepaddisconnected",
+ "ongotpointercapture",
"onhashchange",
"oninput",
"oninvalid",
@@ -417,6 +422,7 @@ class Test(testsuite.TorBrowserTest):
"onloadedmetadata",
"onloadend",
"onloadstart",
+ "onlostpointercapture",
"onmessage",
"onmessageerror",
"onmousedown",
@@ -435,6 +441,14 @@ class Test(testsuite.TorBrowserTest):
"onpause",
"onplay",
"onplaying",
+ "onpointercancel",
+ "onpointerdown",
+ "onpointerenter",
+ "onpointerleave",
+ "onpointermove",
+ "onpointerout",
+ "onpointerover",
+ "onpointerup",
"onpopstate",
"onprogress",
"onratechange",
@@ -459,7 +473,6 @@ class Test(testsuite.TorBrowserTest):
"ontransitionstart",
"onunhandledrejection",
"onunload",
- "onuserproximity",
"onvolumechange",
"onwaiting",
"onwebkitanimationend",
@@ -498,6 +511,7 @@ class Test(testsuite.TorBrowserTest):
"personalbar",
"Plugin",
"PluginArray",
+ "PointerEvent",
"PopStateEvent",
"PopupBlockedEvent",
"postMessage",
@@ -713,6 +727,7 @@ class Test(testsuite.TorBrowserTest):
"ValidityState",
"valueOf",
"VideoPlaybackQuality",
+ "visualViewport",
"VisualViewport",
"VTTCue",
"VTTRegion",
diff --git a/marionette/tor_browser_tests/test_fp_navigator.py b/marionette/tor_browser_tests/test_fp_navigator.py
index 91dc951..e976d85 100644
--- a/marionette/tor_browser_tests/test_fp_navigator.py
+++ b/marionette/tor_browser_tests/test_fp_navigator.py
@@ -56,7 +56,8 @@ class Test(MarionetteTestCase):
app_version = "5.0 (Macintosh)"
platform = "MacIntel"
oscpu = "Intel Mac OS X 10.13"
- nav_props["userAgent"] = "Mozilla/5.0 (" + ua_os + "; rv:78.0) Gecko/20100101 Firefox/78.0"
+ ua_ver = '91.0'
+ nav_props["userAgent"] = "Mozilla/5.0 (" + ua_os + "; rv:" + ua_ver + ") Gecko/20100101 Firefox/" + ua_ver
nav_props["appVersion"] = app_version
nav_props["platform"] = platform
nav_props["oscpu"] = oscpu
diff --git a/marionette/tor_browser_tests/test_fp_screen_dimensions.py b/marionette/tor_browser_tests/test_fp_screen_dimensions.py
index 2e0af6d..48de4d6 100644
--- a/marionette/tor_browser_tests/test_fp_screen_dimensions.py
+++ b/marionette/tor_browser_tests/test_fp_screen_dimensions.py
@@ -3,6 +3,8 @@ from marionette_harness import MarionetteTestCase
class Test(MarionetteTestCase):
def test_screen_dims(self):
with self.marionette.using_context('content'):
+ self.marionette.navigate('https://check.torproject.org/')
+
# https://gitweb.torproject.org/torbrowser.git/blob/HEAD:/src/current-patches…
js = self.marionette.execute_script
# check that availWidth and availHeight are equal to window innerWidth and innerHeight
diff --git a/marionette/tor_browser_tests/test_fp_useragent.py b/marionette/tor_browser_tests/test_fp_useragent.py
index 5b32bb3..13da933 100644
--- a/marionette/tor_browser_tests/test_fp_useragent.py
+++ b/marionette/tor_browser_tests/test_fp_useragent.py
@@ -15,5 +15,6 @@ class Test(MarionetteTestCase):
ua_os = 'Windows NT 6.1; Win64; x64'
if osname == 'MacOSX':
ua_os = 'Macintosh; Intel Mac OS X 10.13'
- self.assertEqual("Mozilla/5.0 (" + ua_os + "; rv:78.0) Gecko/20100101 Firefox/78.0",
+ ua_ver = '91.0'
+ self.assertEqual("Mozilla/5.0 (" + ua_os + "; rv:" + ua_ver + ") Gecko/20100101 Firefox/" + ua_ver,
js("return navigator.userAgent"))
diff --git a/marionette/tor_browser_tests/test_https-everywhere.py b/marionette/tor_browser_tests/test_https-everywhere.py
index 7819771..443c9a6 100644
--- a/marionette/tor_browser_tests/test_https-everywhere.py
+++ b/marionette/tor_browser_tests/test_https-everywhere.py
@@ -10,8 +10,8 @@ class Test(MarionetteTestCase):
ts = testsuite.TestSuite()
self.ts = ts
- self.HTTP_URL = "http://httpbin.org/"
- self.HTTPS_URL = "https://httpbin.org/"
+ self.HTTP_URL = "http://https-everywhere.badssl.com/redirect-test/status.svg"
+ self.HTTPS_URL = "https://https-everywhere.badssl.com/redirect-test/status.svg"
self.is_disabled = self.ts.t['test']['name'] == 'https-everywhere-disabled'
@@ -51,6 +51,9 @@ class Test(MarionetteTestCase):
lambda _: m.execute_script("return OnionAliasStore._onionMap.size;") > 0)
with self.marionette.using_context('content'):
+ # Even without HTTPS Everywhere, Firefox checks if HTTPS is
+ # available, with this set to true
+ self.marionette.set_pref('dom.security.https_first_pbm', False)
self.marionette.navigate(self.HTTP_URL)
if not self.is_disabled:
diff --git a/marionette/tor_browser_tests/test_settings.py b/marionette/tor_browser_tests/test_settings.py
index f24cdd0..86dfe77 100644
--- a/marionette/tor_browser_tests/test_settings.py
+++ b/marionette/tor_browser_tests/test_settings.py
@@ -32,11 +32,13 @@ class Test(MarionetteTestCase):
# Disk activity: Disable Browsing History Storage
"browser.privatebrowsing.autostart": True,
"browser.cache.disk.enable": False,
- "browser.cache.offline.enable": False,
"permissions.memory_only": True,
"network.cookie.lifetimePolicy": 2,
"security.nocertdb": True,
+ # Enabled LSNG
+ "dom.storage.next_gen": True,
+
# Disk activity: TBB Directory Isolation
"browser.download.useDownloadDir": False,
"browser.shell.checkDefaultBrowser": False,
@@ -60,6 +62,9 @@ class Test(MarionetteTestCase):
"datareporting.policy.dataSubmissionEnabled": False,
"security.mixed_content.block_active_content": True, # Activated with bug #21323
+ # Bug 40083: Make sure Region.jsm fetching is disabled
+ "browser.region.update.enabled": False,
+
# Make sure Unified Telemetry is really disabled, see: #18738.
"toolkit.telemetry.unified": False,
"toolkit.telemetry.enabled": True if ts.t["tbbinfos"]["version"].startswith("tbb-nightly") else False,
@@ -75,10 +80,8 @@ class Test(MarionetteTestCase):
"privacy.trackingprotection.pbmode.enabled": False,
# Disable the Pocket extension (Bug #18886 and #31602)
"extensions.pocket.enabled": False,
- "network.http.referer.hideOnionSource": True,
# Fingerprinting
- "webgl.disable-extensions": True,
"webgl.disable-fail-if-major-performance-caveat": True,
"webgl.enable-webgl2": False,
"gfx.downloadable_fonts.fallback_delay": -1,
@@ -91,22 +94,38 @@ class Test(MarionetteTestCase):
"privacy.resistFingerprinting.block_mozAddonManager": True, # Bug 26114
"dom.webaudio.enabled": False, # Bug 13017: Disable Web Audio API
"dom.w3c_touch_events.enabled": 0, # Bug 10286: Always disable Touch API
- "dom.w3c_pointer_events.enabled": False,
"dom.vr.enabled": False, # Bug 21607: Disable WebVR for now
# Disable randomised Firefox HTTP cache decay user test groups (Bug: 13575)
"security.webauth.webauthn": False, # Bug 26614: Disable Web Authentication API for now
+ # Disable SAB, no matter if the sites are cross-origin isolated.
+ "dom.postMessage.sharedArrayBuffer.withCOOP_COEP": False,
+ "network.http.referer.hideOnionSource": True,
+ # Bug 40463: Disable Windows SSO
+ "network.http.windows-sso.enabled": False,
+ # Bug 40383: Disable new PerformanceEventTiming
+ "dom.enable_event_timing": False,
+ # Disable API for measuring text width and height.
+ "dom.textMetrics.actualBoundingBox.enabled": False,
+ "dom.textMetrics.baselines.enabled": False,
+ "dom.textMetrics.emHeight.enabled": False,
+ "dom.textMetrics.fontBoundingBox.enabled": False,
+ "pdfjs.enableScripting": False,
# Third party stuff
"network.cookie.cookieBehavior": 1,
"privacy.firstparty.isolate": True,
"network.http.spdy.allow-push": False, # Disabled for now. See https://bugs.torproject.org/27127
"network.predictor.enabled": False, # Temporarily disabled. See https://bugs.torproject.org/16633
+ # Bug 40177: Make sure tracker cookie purging is disabled
+ "privacy.purge_trackers.enabled": False,
# Proxy and proxy security
"network.proxy.socks": "127.0.0.1",
"network.proxy.socks_remote_dns": True,
"network.proxy.no_proxies_on": "", # For fingerprinting and local service vulns (#10419)
"network.proxy.type": 1,
+ # Bug 40548: Disable proxy-bypass
+ "network.proxy.failover_direct": False,
"network.security.ports.banned": "9050,9051,9150,9151",
"network.dns.disablePrefetch": True,
"network.protocol-handler.external-default": False,
@@ -118,7 +137,6 @@ class Test(MarionetteTestCase):
"network.protocol-handler.warn-external.news": True,
"network.protocol-handler.warn-external.nntp": True,
"network.protocol-handler.warn-external.snews": True,
- "plugin.state.flash": 0,
"media.peerconnection.enabled": False, # Disable WebRTC interfaces
# Disables media devices but only if `media.peerconnection.enabled` is set to
# `false` as well. (see bug 16328 for this defense-in-depth measure)
@@ -173,14 +191,14 @@ class Test(MarionetteTestCase):
# extensions.enabledScopes is set to 5 by marionette_driver
#"extensions.enabledScopes": 1,
"extensions.pendingOperations": False,
- "xpinstall.whitelist.add": "",
- "xpinstall.whitelist.add.36": "",
# We don't know what extensions Mozilla is advertising to our users and we
# don't want to have some random Google Analytics script running either on the
# about:addons page, see bug 22073 and 22900.
"extensions.getAddons.showPane": False,
# Bug 26114: Allow NoScript to access addons.mozilla.org etc.
"extensions.webextensions.restrictedDomains": "",
+ # Don't give Mozilla-recommended third-party extensions special privileges.
+ "extensions.postDownloadThirdPartyPrompt": False,
"dom.enable_resource_timing": False,
@@ -190,16 +208,12 @@ class Test(MarionetteTestCase):
# Enforce certificate pinning, see: https://bugs.torproject.org/16206
"security.cert_pinning.enforcement_level": 2,
+ # Don't load OS client certs.
+ "security.osclientcerts.autoload": False,
+
# Don't allow MitM via Microsoft Family Safety, see bug 21686
"security.family_safety.mode": 0,
- # Disable the language pack signing check for now, see: bug 26465
-
- # Avoid report TLS errors to Mozilla. We might want to repurpose this feature
- # one day to help detecting bad relays (which is bug 19119). For now we just
- # hide the checkbox, see bug 22072.
- "security.ssl.errorReporting.enabled": False,
-
# Workaround for https://bugs.torproject.org/13579. Progress on
# `about:downloads` is only shown if the following preference is set to `true`
# in case the download panel got removed from the toolbar.
@@ -211,7 +225,7 @@ class Test(MarionetteTestCase):
# checking torbrowser.version match the version from the filename
"torbrowser.version": ts.t["tbbinfos"]["version"],
- "startup.homepage_override_url": "https://blog.torproject.org/category/tags/tor-browser",
+ "startup.homepage_override_url": "https://blog.torproject.org/category/applications",
# Disable network information API everywhere
# but, alas, the behavior is inconsistent across platforms, see:
@@ -220,6 +234,10 @@ class Test(MarionetteTestCase):
"dom.netinfo.enabled": False,
}
+ MOZ_BUNDLED_FONTS = True
+ if MOZ_BUNDLED_FONTS:
+ self.SETTINGS["gfx.bundled-fonts.activate"] = 1
+
# Settings for the Tor Browser 8.0
self.SETTINGS_80 = {
}
1
0

[tor-browser-bundle-testsuite/master] Changed the IP address for the bridge test
by richard@torproject.org 19 Jan '22
by richard@torproject.org 19 Jan '22
19 Jan '22
commit 0167631fd8a5737d9d6c21e1f5fa02e6c71bcff6
Author: Pier Angelo Vendrame <pierov(a)torproject.org>
Date: Mon Jan 10 17:31:51 2022 +0100
Changed the IP address for the bridge test
The bridge test was not ending, because the bridge specified in the
configuration was down. With this new bridge, the test passed as
expected.
---
tor-config/tor_bridge.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tor-config/tor_bridge.conf b/tor-config/tor_bridge.conf
index 5d82115..23eb9eb 100644
--- a/tor-config/tor_bridge.conf
+++ b/tor-config/tor_bridge.conf
@@ -1,4 +1,4 @@
[% INCLUDE main_config %]
UseBridges 1
-Bridge 35.170.192.213:12358
+Bridge 185.100.87.30:80 5B403DFE34F4872EB027059CECAE30B0C864B3A2
1
0

[tor-browser-bundle-testsuite/master] Bug 40033: Use Python 2 for the test virtual environment
by richard@torproject.org 19 Jan '22
by richard@torproject.org 19 Jan '22
19 Jan '22
commit 1e53c8a9667e3d3f429b4473ce5af1794ab0a8f1
Author: Pier Angelo Vendrame <pierov(a)torproject.org>
Date: Mon Jan 17 09:32:31 2022 +0100
Bug 40033: Use Python 2 for the test virtual environment
---
setup-virtualenv | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/setup-virtualenv b/setup-virtualenv
index f0c6288..9641ee1 100755
--- a/setup-virtualenv
+++ b/setup-virtualenv
@@ -42,7 +42,7 @@ if ($OSNAME eq 'cygwin') {
}
unless (-d $virtenv_marionette_dir) {
- run($virtualenv_cmd, $virtenv_marionette_dir);
+ run($virtualenv_cmd, $virtenv_marionette_dir, '-p', 'python2');
# upgrade pip and setuptools
run("$virtenv_marionette_dir/$bin/pip", 'install', '--upgrade', 'pip');
run("$virtenv_marionette_dir/$bin/pip", 'install', '--upgrade', 'setuptools');
1
0

[tor-browser-build/master] Bug 40419: Update namecoin-torbutton.patch
by gk@torproject.org 19 Jan '22
by gk@torproject.org 19 Jan '22
19 Jan '22
commit 003cff75564f89d6764666198a92dc8d574745fa
Author: Richard Pospesel <richard(a)torproject.org>
Date: Wed Jan 19 12:59:02 2022 +0100
Bug 40419: Update namecoin-torbutton.patch
- Rebased patch to apply to torbutton after the tor-browser#40679 fix
---
projects/firefox/namecoin-torbutton.patch | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/projects/firefox/namecoin-torbutton.patch b/projects/firefox/namecoin-torbutton.patch
index 5649ee6..4e92628 100644
--- a/projects/firefox/namecoin-torbutton.patch
+++ b/projects/firefox/namecoin-torbutton.patch
@@ -1,5 +1,5 @@
diff --git a/chrome/content/tor-circuit-display.js b/chrome/content/tor-circuit-display.js
-index 119f6fca..477b0302 100644
+index d6034384..120d32a0 100644
--- a/chrome/content/tor-circuit-display.js
+++ b/chrome/content/tor-circuit-display.js
@@ -48,7 +48,11 @@ let credentialsToNodeDataMap = new Map(),
@@ -118,7 +118,7 @@ index 119f6fca..477b0302 100644
// Hide the note about guards if we are using a bridge.
document.getElementById("circuit-guard-note-container").style.display =
-@@ -450,6 +491,7 @@ let setupDisplay = function (enablePrefName) {
+@@ -454,6 +495,7 @@ let setupDisplay = function (enablePrefName) {
stopCollectingIsolationData = null,
stopCollectingBrowserCredentials = null,
stopEnsuringCorrectPopupDimensions = null,
@@ -126,7 +126,7 @@ index 119f6fca..477b0302 100644
stop = function() {
syncDisplayWithSelectedTab(false);
if (myController) {
-@@ -462,6 +504,9 @@ let setupDisplay = function (enablePrefName) {
+@@ -466,6 +508,9 @@ let setupDisplay = function (enablePrefName) {
if (stopEnsuringCorrectPopupDimensions) {
stopEnsuringCorrectPopupDimensions();
}
@@ -136,11 +136,11 @@ index 119f6fca..477b0302 100644
myController = null;
}
},
-@@ -475,6 +520,7 @@ let setupDisplay = function (enablePrefName) {
- stop();
- });
- syncDisplayWithSelectedTab(true);
-+ stopCollectingBitTargets = collectBitTargets(myController);
- stopCollectingIsolationData = collectIsolationData(myController, updateCircuitDisplay);
- stopCollectingBrowserCredentials = collectBrowserCredentials();
- stopEnsuringCorrectPopupDimensions = ensureCorrectPopupDimensions();
+@@ -474,6 +519,7 @@ let setupDisplay = function (enablePrefName) {
+ try {
+ myController = await wait_for_controller();
+ syncDisplayWithSelectedTab(true);
++ stopCollectingBitTargets = collectBitTargets(myController);
+ stopCollectingIsolationData = collectIsolationData(myController, updateCircuitDisplay);
+ stopCollectingBrowserCredentials = collectBrowserCredentials();
+ stopEnsuringCorrectPopupDimensions = ensureCorrectPopupDimensions();
1
0

[tor-launcher/master] Added extensions.torlauncher.launch_delay debug pref handling to simulate slow tor launch
by gk@torproject.org 19 Jan '22
by gk@torproject.org 19 Jan '22
19 Jan '22
commit db7845b74fd1778acd1d2c4c68f724a27ca8ca69
Author: Richard Pospesel <richard(a)torproject.org>
Date: Fri Dec 17 16:58:28 2021 +0100
Added extensions.torlauncher.launch_delay debug pref handling to simulate slow tor launch
---
src/components/tl-process.js | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/src/components/tl-process.js b/src/components/tl-process.js
index d52dcda..51369a6 100644
--- a/src/components/tl-process.js
+++ b/src/components/tl-process.js
@@ -3,6 +3,8 @@
//
// vim: set sw=2 sts=2 ts=8 et syntax=javascript:
+const { setTimeout } = ChromeUtils.import("resource://gre/modules/Timer.jsm")
+
const Cc = Components.classes;
const Ci = Components.interfaces;
const Cr = Components.results;
@@ -41,6 +43,8 @@ TorProcessService.prototype =
kPrefPromptAtStartup: "extensions.torlauncher.prompt_at_startup",
kPrefDefaultBridgeType: "extensions.torlauncher.default_bridge_type",
+ // useful for simulating slow tor daemon launch
+ kPrefTorDaemonLaunchDelay: "extensions.torlauncher.launch_delay",
kWizardProgressPageID: "progress",
@@ -528,7 +532,17 @@ TorProcessService.prototype =
for (var i = 0; i < args.length; ++i)
TorLauncherLogger.log(2, " " + args[i]);
- p.runwAsync(args, args.length, this, false);
+ const launchDelay = TorLauncherUtil.getIntPref(this.kPrefTorDaemonLaunchDelay, 0);
+ let runwAsync = () => p.runwAsync(args, args.length, this, false);
+
+ if (launchDelay > 0) {
+ setTimeout(() => {
+ runwAsync();
+ }, launchDelay);
+ } else {
+ runwAsync();
+ }
+
this.mTorProcess = p;
this.mTorProcessStartTime = Date.now();
}
1
0

[tor-launcher/master] Bug 40679: Missing features on first-time launch in esr91
by gk@torproject.org 19 Jan '22
by gk@torproject.org 19 Jan '22
19 Jan '22
commit d09cfa334a731e705568baf1cd75411b42db04fa
Author: Richard Pospesel <richard(a)torproject.org>
Date: Fri Dec 17 16:59:48 2021 +0100
Bug 40679: Missing features on first-time launch in esr91
- updated tor controller connect calls to use torbutton's new
async api
- fixes tor-browser#40679
---
src/components/tl-protocol.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/components/tl-protocol.js b/src/components/tl-protocol.js
index cdf5894..f5dddeb 100644
--- a/src/components/tl-protocol.js
+++ b/src/components/tl-protocol.js
@@ -775,7 +775,7 @@ TorProtocolService.prototype =
var conn;
try {
const avoidCache = true;
- conn = controller(e => { throw e; }, avoidCache);
+ conn = await controller(avoidCache);
if (!aIsEventConnection && TorLauncherUtil.shouldStartAndOwnTor &&
!TorLauncherUtil.shouldOnlyConfigureTor)
1
0

[tor-browser/tor-browser-91.5.0esr-11.5-1] fixup! Bug 10760: Integrate TorButton to TorBrowser core
by gk@torproject.org 19 Jan '22
by gk@torproject.org 19 Jan '22
19 Jan '22
commit 2a8908bbdcbeb9aeec735e8a833a5650589653b9
Author: Georg Koppen <gk(a)torproject.org>
Date: Wed Jan 19 13:37:52 2022 +0000
fixup! Bug 10760: Integrate TorButton to TorBrowser core
---
toolkit/torproject/torbutton | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton
index 29445428ee7c..a7f607351517 160000
--- a/toolkit/torproject/torbutton
+++ b/toolkit/torproject/torbutton
@@ -1 +1 @@
-Subproject commit 29445428ee7c1e033d00d9332983b895dccc052d
+Subproject commit a7f6073515175a1f2d7a2bca1eaec2bfaff03c0c
1
0

[tor-browser/tor-browser-91.5.0esr-11.5-1] fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser
by gk@torproject.org 19 Jan '22
by gk@torproject.org 19 Jan '22
19 Jan '22
commit eefa8951d7eabcb2b079cb0719bbfc8daff2fc24
Author: Richard Pospesel <richard(a)torproject.org>
Date: Tue Dec 21 17:05:49 2021 +0100
fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser
---
browser/base/content/utilityOverlay.js | 12 +++++++++---
browser/modules/TorConnect.jsm | 11 ++++++-----
2 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/browser/base/content/utilityOverlay.js b/browser/base/content/utilityOverlay.js
index 3d22093119ca..5f629dece94e 100644
--- a/browser/base/content/utilityOverlay.js
+++ b/browser/base/content/utilityOverlay.js
@@ -337,11 +337,17 @@ function openUILinkIn(
aPostData,
aReferrerInfo
) {
-
// make sure users are not faced with the scary red 'tor isn't working' screen
// if they navigate to about:tor before bootstrapped
- if (url === "about:tor" && TorConnect.shouldShowTorConnect) {
- url = `about:torconnect?redirect=${encodeURIComponent("about:tor")}`;
+ //
+ // fixes tor-browser#40752
+ // new tabs also redirect to about:tor if browser.newtabpage.enabled is true
+ // otherwise they go to about:blank
+ if (TorConnect.shouldShowTorConnect) {
+ if (url === "about:tor" ||
+ (url === "about:newtab" && Services.prefs.getBoolPref("browser.newtabpage.enabled", false))) {
+ url = TorConnect.getRedirectURL(url);
+ }
}
var params;
diff --git a/browser/modules/TorConnect.jsm b/browser/modules/TorConnect.jsm
index 7c8580b5d8a9..c7ab480e2be0 100644
--- a/browser/modules/TorConnect.jsm
+++ b/browser/modules/TorConnect.jsm
@@ -587,6 +587,10 @@ const TorConnect = (() => {
);
},
+ getRedirectURL: function(url) {
+ return `about:torconnect?redirect=${encodeURIComponent(url)}`;
+ },
+
// called from browser.js on browser startup, passed in either the user's homepage(s)
// or uris passed via command-line; we want to replace them with about:torconnect uris
// which redirect after bootstrapping
@@ -628,13 +632,10 @@ const TorConnect = (() => {
let uris = uriStrings.map(uriStringToUri);
// assume we have a valid uri and generate an about:torconnect redirect uri
- let uriToRedirectUri = (uri) => {
- return`about:torconnect?redirect=${encodeURIComponent(uri.spec)}`;
- };
- let redirectUris = uris.map(uriToRedirectUri);
+ let redirectUrls = uris.map((uri) => this.getRedirectURL(uri.spec));
console.log(`TorConnect: Will load after bootstrap => [${uris.map((uri) => {return uri.spec;}).join(", ")}]`);
- return redirectUris;
+ return redirectUrls;
},
};
retval.init();
1
0
commit a7f6073515175a1f2d7a2bca1eaec2bfaff03c0c
Author: Georg Koppen <gk(a)torproject.org>
Date: Wed Jan 19 13:35:53 2022 +0000
Translations update
---
chrome/locale/ar/aboutTor.dtd | 28 ----------------------------
chrome/locale/bn-BD/aboutTor.dtd | 28 ----------------------------
chrome/locale/ca/aboutTor.dtd | 28 ----------------------------
chrome/locale/cs/aboutTor.dtd | 28 ----------------------------
chrome/locale/da/aboutTor.dtd | 28 ----------------------------
chrome/locale/de/aboutTor.dtd | 28 ----------------------------
chrome/locale/el/aboutTor.dtd | 28 ----------------------------
chrome/locale/el/torbutton.dtd | 6 +++---
chrome/locale/es-AR/aboutTor.dtd | 28 ----------------------------
chrome/locale/es-ES/aboutTor.dtd | 28 ----------------------------
chrome/locale/eu/aboutTor.dtd | 28 ----------------------------
chrome/locale/fa/aboutTor.dtd | 28 ----------------------------
chrome/locale/fr/aboutTor.dtd | 28 ----------------------------
chrome/locale/fr/torbutton.dtd | 2 +-
chrome/locale/ga-IE/aboutTor.dtd | 28 ----------------------------
chrome/locale/he/aboutTor.dtd | 28 ----------------------------
chrome/locale/hu/aboutTor.dtd | 28 ----------------------------
chrome/locale/id/aboutTor.dtd | 28 ----------------------------
chrome/locale/id/torbutton.dtd | 2 +-
chrome/locale/is/aboutTor.dtd | 28 ----------------------------
chrome/locale/it/aboutTor.dtd | 28 ----------------------------
chrome/locale/ja/aboutTor.dtd | 28 ----------------------------
chrome/locale/ja/torbutton.dtd | 4 ++--
chrome/locale/ka/aboutTor.dtd | 28 ----------------------------
chrome/locale/ko/aboutTor.dtd | 28 ----------------------------
chrome/locale/lt/aboutTor.dtd | 28 ----------------------------
chrome/locale/lt/torbutton.dtd | 4 ++--
chrome/locale/mk/aboutTor.dtd | 28 ----------------------------
chrome/locale/mk/torbutton.dtd | 4 ++--
chrome/locale/ms/aboutTor.dtd | 28 ----------------------------
chrome/locale/my/aboutTor.dtd | 28 ----------------------------
chrome/locale/nb-NO/aboutTor.dtd | 28 ----------------------------
chrome/locale/nl/aboutTor.dtd | 28 ----------------------------
chrome/locale/nl/torbutton.dtd | 4 ++--
chrome/locale/pl/aboutTor.dtd | 28 ----------------------------
chrome/locale/pt-BR/aboutTor.dtd | 28 ----------------------------
chrome/locale/ro/aboutTor.dtd | 28 ----------------------------
chrome/locale/ru/aboutTor.dtd | 28 ----------------------------
chrome/locale/sv-SE/aboutTor.dtd | 28 ----------------------------
chrome/locale/th/aboutTor.dtd | 28 ----------------------------
chrome/locale/tr/aboutTor.dtd | 28 ----------------------------
chrome/locale/vi/aboutTor.dtd | 28 ----------------------------
chrome/locale/zh-CN/aboutTor.dtd | 28 ----------------------------
chrome/locale/zh-CN/torbutton.dtd | 4 ++--
chrome/locale/zh-TW/aboutTor.dtd | 30 +-----------------------------
chrome/locale/zh-TW/torbutton.properties | 2 +-
46 files changed, 17 insertions(+), 1053 deletions(-)
diff --git a/chrome/locale/ar/aboutTor.dtd b/chrome/locale/ar/aboutTor.dtd
index 60f87894..00f2f913 100644
--- a/chrome/locale/ar/aboutTor.dtd
+++ b/chrome/locale/ar/aboutTor.dtd
@@ -29,31 +29,3 @@
<!ENTITY aboutTor.newsletter.link_text "اشترك للحصول على أخبار تور.">
<!ENTITY aboutTor.donationBanner.freeToUse "Tor متاح مجاناً بفضل تبرعات من أشخاص مثلك">
<!ENTITY aboutTor.donationBanner.buttonA "تبرع الآن">
-
-<!-- Year end campaign strings -->
-
-<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
- phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
- translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
- with a similar theme:
-
- - DON'T TOUCH MY DATA
- - DON'T SPY ON MY DATA
- - MY DATA IS PRIVATE
- - KEEP OFF MY DATA
-
- Please place newline characters (\n) between words or phrases which can be placed in separate lines
- so we can word-wrap our final assets correctly.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.slogan "HANDS\nOFF\nMY\nDATA">
-<!ENTITY aboutTor.yec.motto "الخصوصية هي حق من حقوق الإنسان">
-<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
- also format it like the name of an organization in whichever way that is appropriate for your locale.
-
- Please keep the currency in USD.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.donationMatch "سيتم مطابقة تبرعك بواسطة Friends of Tor ، حتى 150000 دولار.">
diff --git a/chrome/locale/bn-BD/aboutTor.dtd b/chrome/locale/bn-BD/aboutTor.dtd
index 0808560c..e52c4b7a 100644
--- a/chrome/locale/bn-BD/aboutTor.dtd
+++ b/chrome/locale/bn-BD/aboutTor.dtd
@@ -29,31 +29,3 @@
<!ENTITY aboutTor.newsletter.link_text "টর নিউজ-এর জন্য সাইন আপ করুন ।">
<!ENTITY aboutTor.donationBanner.freeToUse "আপনার মতো মানুষদের দানের জন্যই Tor বিনামূল্যে ব্যবহার করা যায়">
<!ENTITY aboutTor.donationBanner.buttonA "এখুনি দান করুন! ">
-
-<!-- Year end campaign strings -->
-
-<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
- phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
- translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
- with a similar theme:
-
- - DON'T TOUCH MY DATA
- - DON'T SPY ON MY DATA
- - MY DATA IS PRIVATE
- - KEEP OFF MY DATA
-
- Please place newline characters (\n) between words or phrases which can be placed in separate lines
- so we can word-wrap our final assets correctly.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.slogan "HANDS\nOFF\nMY\nDATA">
-<!ENTITY aboutTor.yec.motto "গোপনীয়তা একটি মানুষের অধিকার">
-<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
- also format it like the name of an organization in whichever way that is appropriate for your locale.
-
- Please keep the currency in USD.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.donationMatch "তোমার অনুদানের সমান পরিমাণ অনুদান $১,৫০,০০০ পর্যন্ত দিলে টরের বন্ধুরা তার সমান অনুদান টরকে দিবে।">
diff --git a/chrome/locale/ca/aboutTor.dtd b/chrome/locale/ca/aboutTor.dtd
index db8d2753..0741dd00 100644
--- a/chrome/locale/ca/aboutTor.dtd
+++ b/chrome/locale/ca/aboutTor.dtd
@@ -29,31 +29,3 @@
<!ENTITY aboutTor.newsletter.link_text "Inscriviu-vos a les noticies de Tor.">
<!ENTITY aboutTor.donationBanner.freeToUse "Tor és d'ús gratuït gràcies als donatius de persones com vós.">
<!ENTITY aboutTor.donationBanner.buttonA "Feu una donació">
-
-<!-- Year end campaign strings -->
-
-<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
- phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
- translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
- with a similar theme:
-
- - DON'T TOUCH MY DATA
- - DON'T SPY ON MY DATA
- - MY DATA IS PRIVATE
- - KEEP OFF MY DATA
-
- Please place newline characters (\n) between words or phrases which can be placed in separate lines
- so we can word-wrap our final assets correctly.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.slogan "HANDS\nOFF\nMY\nDATA">
-<!ENTITY aboutTor.yec.motto "La privadesa és un dret humà">
-<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
- also format it like the name of an organization in whichever way that is appropriate for your locale.
-
- Please keep the currency in USD.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.donationMatch "Amics del Tor igualarà la vostra donació fins a 150.000 dòlars.">
diff --git a/chrome/locale/cs/aboutTor.dtd b/chrome/locale/cs/aboutTor.dtd
index eaddc377..96eaad26 100644
--- a/chrome/locale/cs/aboutTor.dtd
+++ b/chrome/locale/cs/aboutTor.dtd
@@ -29,31 +29,3 @@
<!ENTITY aboutTor.newsletter.link_text "Přihlaste se k odběru zpravodaje Toru.">
<!ENTITY aboutTor.donationBanner.freeToUse "Tor je zdarma k použití díky darům od lidí jako jste vy.">
<!ENTITY aboutTor.donationBanner.buttonA "Přispějte">
-
-<!-- Year end campaign strings -->
-
-<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
- phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
- translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
- with a similar theme:
-
- - DON'T TOUCH MY DATA
- - DON'T SPY ON MY DATA
- - MY DATA IS PRIVATE
- - KEEP OFF MY DATA
-
- Please place newline characters (\n) between words or phrases which can be placed in separate lines
- so we can word-wrap our final assets correctly.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.slogan "RUCE\nPRYČ\nOD\nMÝCH\nDAT">
-<!ENTITY aboutTor.yec.motto "Soukromí je lidské právo">
-<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
- also format it like the name of an organization in whichever way that is appropriate for your locale.
-
- Please keep the currency in USD.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.donationMatch "Váš dar bude dorovnán společností Friends of Tor, a to až do výše 150 000 $.">
diff --git a/chrome/locale/da/aboutTor.dtd b/chrome/locale/da/aboutTor.dtd
index 62a0faa8..09c87f8c 100644
--- a/chrome/locale/da/aboutTor.dtd
+++ b/chrome/locale/da/aboutTor.dtd
@@ -29,31 +29,3 @@
<!ENTITY aboutTor.newsletter.link_text "Tilmeld Tor-nyheder.">
<!ENTITY aboutTor.donationBanner.freeToUse "Tor er gratis at bruge takke være donationer fra personer som dig.">
<!ENTITY aboutTor.donationBanner.buttonA "Donér nu">
-
-<!-- Year end campaign strings -->
-
-<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
- phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
- translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
- with a similar theme:
-
- - DON'T TOUCH MY DATA
- - DON'T SPY ON MY DATA
- - MY DATA IS PRIVATE
- - KEEP OFF MY DATA
-
- Please place newline characters (\n) between words or phrases which can be placed in separate lines
- so we can word-wrap our final assets correctly.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.slogan "HANDS\nOFF\nMY\nDATA">
-<!ENTITY aboutTor.yec.motto "Privatliv er en menneskeret">
-<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
- also format it like the name of an organization in whichever way that is appropriate for your locale.
-
- Please keep the currency in USD.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.donationMatch "Din donation vil blive matchet af venner af Tor, op til $150.000.">
diff --git a/chrome/locale/de/aboutTor.dtd b/chrome/locale/de/aboutTor.dtd
index b602df14..65f3834a 100644
--- a/chrome/locale/de/aboutTor.dtd
+++ b/chrome/locale/de/aboutTor.dtd
@@ -29,31 +29,3 @@
<!ENTITY aboutTor.newsletter.link_text "Tor-Nachrichten abonnieren.">
<!ENTITY aboutTor.donationBanner.freeToUse "Tor ist aufgrund von Spenden von Leuten wie dir frei nutzbar.">
<!ENTITY aboutTor.donationBanner.buttonA "Spende jetzt">
-
-<!-- Year end campaign strings -->
-
-<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
- phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
- translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
- with a similar theme:
-
- - DON'T TOUCH MY DATA
- - DON'T SPY ON MY DATA
- - MY DATA IS PRIVATE
- - KEEP OFF MY DATA
-
- Please place newline characters (\n) between words or phrases which can be placed in separate lines
- so we can word-wrap our final assets correctly.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.slogan "HÄNDE\nWEG\nVON MEINEN\nDATEN">
-<!ENTITY aboutTor.yec.motto "Datenschutz ist ein Menschenrecht">
-<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
- also format it like the name of an organization in whichever way that is appropriate for your locale.
-
- Please keep the currency in USD.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.donationMatch "Deine Spende wird von Friends of Tor verdoppelt, bis zu 150.000 $.">
diff --git a/chrome/locale/el/aboutTor.dtd b/chrome/locale/el/aboutTor.dtd
index 43179324..bc3f7546 100644
--- a/chrome/locale/el/aboutTor.dtd
+++ b/chrome/locale/el/aboutTor.dtd
@@ -29,31 +29,3 @@
<!ENTITY aboutTor.newsletter.link_text "Εγγραφτείτε για τα νέα του Tor.">
<!ENTITY aboutTor.donationBanner.freeToUse "Το Tor είναι δωρεάν επειδή στηρίζεται σε δωρεές από άτομα σαν κι εσάς.">
<!ENTITY aboutTor.donationBanner.buttonA "Κάνε μια δωρεά τώρα">
-
-<!-- Year end campaign strings -->
-
-<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
- phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
- translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
- with a similar theme:
-
- - DON'T TOUCH MY DATA
- - DON'T SPY ON MY DATA
- - MY DATA IS PRIVATE
- - KEEP OFF MY DATA
-
- Please place newline characters (\n) between words or phrases which can be placed in separate lines
- so we can word-wrap our final assets correctly.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.slogan "ΚΑΤΩ ΤΑ\nΧΕΡΙΑ\nΑΠΟ ΤΑ\nΔΕΔΟΜΕΝΑ ΜΟΥ">
-<!ENTITY aboutTor.yec.motto "Η ιδιωτικότητα είναι ανθρώπινο δικαίωμα ">
-<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
- also format it like the name of an organization in whichever way that is appropriate for your locale.
-
- Please keep the currency in USD.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.donationMatch "Η Friends of Tor θα δωρίσει το ίδιο ποσό με τη δωρεά σας, μέχρι $150.000.">
diff --git a/chrome/locale/el/torbutton.dtd b/chrome/locale/el/torbutton.dtd
index b39def2c..2b43207e 100644
--- a/chrome/locale/el/torbutton.dtd
+++ b/chrome/locale/el/torbutton.dtd
@@ -1,8 +1,8 @@
<!ENTITY torbutton.context_menu.new_identity "Νέα Ταυτότητα">
-<!ENTITY torbutton.context_menu.new_identity_sentence_case "New identity">
+<!ENTITY torbutton.context_menu.new_identity_sentence_case "Νέα ταυτότητα">
<!ENTITY torbutton.context_menu.new_identity_key "I">
<!ENTITY torbutton.context_menu.new_circuit "Νέο κύκλωμα Tor για αυτήν την ιστοσελίδα">
-<!ENTITY torbutton.context_menu.new_circuit_sentence_case "New tor circuit for this site">
+<!ENTITY torbutton.context_menu.new_circuit_sentence_case "Νέο κύκλωμα Tor για αυτό τον ιστότοπο">
<!ENTITY torbutton.context_menu.new_circuit_key "C">
<!ENTITY torbutton.context_menu.networksettings "Ρυθμίσεις του Δικτύου Tor...">
<!ENTITY torbutton.context_menu.networksettings.key "N">
@@ -47,7 +47,7 @@
<!ENTITY torbutton.prefs.sec_custom_summary "Οι προσαρμοσμένες προτιμήσεις του browser σας έχουν οδηγήσει σε ασυνήθιστες ρυθμίσεις ασφάλειας. Για λόγους ασφαλείας και ιδιωτικότητας, προτείνουμε να επιλέξετε ένα από τα προεπιλεγμένα επίπεδα ασφάλειας.">
<!ENTITY torbutton.prefs.sec_restore_defaults "Επαναφορά προεπιλογών">
<!ENTITY torbutton.prefs.sec_advanced_security_settings "Ρυθμίσεις ασφαλείας για προχωρημένους...">
-<!ENTITY torbutton.prefs.sec_change "Change…">
+<!ENTITY torbutton.prefs.sec_change "Αλλαγή...">
<!ENTITY torbutton.circuit_display.title "Κύκλωμα Tor">
<!ENTITY torbutton.circuit_display.new_circuit "Νέο κύκλωμα για αυτή την ιστοσελίδα">
diff --git a/chrome/locale/es-AR/aboutTor.dtd b/chrome/locale/es-AR/aboutTor.dtd
index 70d667bd..0c4ebb64 100644
--- a/chrome/locale/es-AR/aboutTor.dtd
+++ b/chrome/locale/es-AR/aboutTor.dtd
@@ -29,31 +29,3 @@
<!ENTITY aboutTor.newsletter.link_text "Registrate en Tor News.">
<!ENTITY aboutTor.donationBanner.freeToUse "Tor puede ser usado libremente gracias a las donaciones de personas como vos.">
<!ENTITY aboutTor.donationBanner.buttonA "Doná ahora">
-
-<!-- Year end campaign strings -->
-
-<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
- phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
- translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
- with a similar theme:
-
- - DON'T TOUCH MY DATA
- - DON'T SPY ON MY DATA
- - MY DATA IS PRIVATE
- - KEEP OFF MY DATA
-
- Please place newline characters (\n) between words or phrases which can be placed in separate lines
- so we can word-wrap our final assets correctly.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.slogan "NO\nTOQUÉS\nMIS\nDATOS">
-<!ENTITY aboutTor.yec.motto "La privacidad es un derecho humano">
-<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
- also format it like the name of an organization in whichever way that is appropriate for your locale.
-
- Please keep the currency in USD.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.donationMatch "Tu donación va a ser igualada por Amigos de Tor hasta USD 150.000">
diff --git a/chrome/locale/es-ES/aboutTor.dtd b/chrome/locale/es-ES/aboutTor.dtd
index 491c547a..0671a826 100644
--- a/chrome/locale/es-ES/aboutTor.dtd
+++ b/chrome/locale/es-ES/aboutTor.dtd
@@ -29,31 +29,3 @@
<!ENTITY aboutTor.newsletter.link_text "Inscríbete en Tor News.">
<!ENTITY aboutTor.donationBanner.freeToUse "Se puede usar Tor libremente por las donaciones de personas como tu.">
<!ENTITY aboutTor.donationBanner.buttonA "Dona ahora.">
-
-<!-- Year end campaign strings -->
-
-<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
- phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
- translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
- with a similar theme:
-
- - DON'T TOUCH MY DATA
- - DON'T SPY ON MY DATA
- - MY DATA IS PRIVATE
- - KEEP OFF MY DATA
-
- Please place newline characters (\n) between words or phrases which can be placed in separate lines
- so we can word-wrap our final assets correctly.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.slogan "NO\nTOQUES\nMIS\nDATOS">
-<!ENTITY aboutTor.yec.motto "La privacidad es un derecho humano.">
-<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
- also format it like the name of an organization in whichever way that is appropriate for your locale.
-
- Please keep the currency in USD.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.donationMatch "Tu donación será igualada por Amigos de Tor hasta $150.000.">
diff --git a/chrome/locale/eu/aboutTor.dtd b/chrome/locale/eu/aboutTor.dtd
index 75ec4f0b..b115af74 100644
--- a/chrome/locale/eu/aboutTor.dtd
+++ b/chrome/locale/eu/aboutTor.dtd
@@ -29,31 +29,3 @@
<!ENTITY aboutTor.newsletter.link_text "Harpidetu Tor berrietara">
<!ENTITY aboutTor.donationBanner.freeToUse "Tor is free to use because of donations from people like you.">
<!ENTITY aboutTor.donationBanner.buttonA "Egin dohaintza orain">
-
-<!-- Year end campaign strings -->
-
-<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
- phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
- translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
- with a similar theme:
-
- - DON'T TOUCH MY DATA
- - DON'T SPY ON MY DATA
- - MY DATA IS PRIVATE
- - KEEP OFF MY DATA
-
- Please place newline characters (\n) between words or phrases which can be placed in separate lines
- so we can word-wrap our final assets correctly.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.slogan "HANDS\nOFF\nMY\nDATA">
-<!ENTITY aboutTor.yec.motto "Privacy is a human right">
-<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
- also format it like the name of an organization in whichever way that is appropriate for your locale.
-
- Please keep the currency in USD.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.donationMatch "Your donation will be matched by Friends of Tor, up to $150,000.">
diff --git a/chrome/locale/fa/aboutTor.dtd b/chrome/locale/fa/aboutTor.dtd
index c2438d36..44e1efbc 100644
--- a/chrome/locale/fa/aboutTor.dtd
+++ b/chrome/locale/fa/aboutTor.dtd
@@ -29,31 +29,3 @@
<!ENTITY aboutTor.newsletter.link_text "ثبتنام برای اخبار Tor.">
<!ENTITY aboutTor.donationBanner.freeToUse "Tor برای استفاده رایگان است، این به خاطر حمایت افرادی مانند شماست.">
<!ENTITY aboutTor.donationBanner.buttonA "اکنون حمایت کنید">
-
-<!-- Year end campaign strings -->
-
-<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
- phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
- translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
- with a similar theme:
-
- - DON'T TOUCH MY DATA
- - DON'T SPY ON MY DATA
- - MY DATA IS PRIVATE
- - KEEP OFF MY DATA
-
- Please place newline characters (\n) between words or phrases which can be placed in separate lines
- so we can word-wrap our final assets correctly.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.slogan "دست\nاز\nاطلاعات\nمن\nبردارید">
-<!ENTITY aboutTor.yec.motto "حریم خصوصی یک حق انسانی است">
-<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
- also format it like the name of an organization in whichever way that is appropriate for your locale.
-
- Please keep the currency in USD.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.donationMatch "کمک مالی شما با دوستان تور تا سقف 150000 دلار مطابقت داده می شود.">
diff --git a/chrome/locale/fr/aboutTor.dtd b/chrome/locale/fr/aboutTor.dtd
index 4b0fbbd8..75b45004 100644
--- a/chrome/locale/fr/aboutTor.dtd
+++ b/chrome/locale/fr/aboutTor.dtd
@@ -29,31 +29,3 @@
<!ENTITY aboutTor.newsletter.link_text "Inscrivez-vous aux nouvelles de Tor.">
<!ENTITY aboutTor.donationBanner.freeToUse "Tor peut être utilisé gratuitement grâce aux dons de personnes telles que vous.">
<!ENTITY aboutTor.donationBanner.buttonA "Faites un don maintenant">
-
-<!-- Year end campaign strings -->
-
-<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
- phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
- translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
- with a similar theme:
-
- - DON'T TOUCH MY DATA
- - DON'T SPY ON MY DATA
- - MY DATA IS PRIVATE
- - KEEP OFF MY DATA
-
- Please place newline characters (\n) between words or phrases which can be placed in separate lines
- so we can word-wrap our final assets correctly.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.slogan "NE TOUCHEZ\nPAS\nÀ MES\nDONNÉES">
-<!ENTITY aboutTor.yec.motto "La vie privée est un droit de la personne">
-<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
- also format it like the name of an organization in whichever way that is appropriate for your locale.
-
- Please keep the currency in USD.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.donationMatch "Votre don sera égalé par les Amis de Tor à concurrence de 150 000 $.">
diff --git a/chrome/locale/fr/torbutton.dtd b/chrome/locale/fr/torbutton.dtd
index d740bc37..1ba569b7 100644
--- a/chrome/locale/fr/torbutton.dtd
+++ b/chrome/locale/fr/torbutton.dtd
@@ -52,5 +52,5 @@
<!ENTITY torbutton.circuit_display.new_circuit "Nouveau circuit pour ce site">
<!-- Onion services strings. Strings are kept here for ease of translation. -->
-<!ENTITY torbutton.onionServices.authPrompt.tooltip "Ouvrir l’invite d’authentification du client du service oignon">
+<!ENTITY torbutton.onionServices.authPrompt.tooltip "Ouvrir l’invite d’authentification client du service oignon">
<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Mémoriser cette clé">
diff --git a/chrome/locale/ga-IE/aboutTor.dtd b/chrome/locale/ga-IE/aboutTor.dtd
index 88365aed..8f03245a 100644
--- a/chrome/locale/ga-IE/aboutTor.dtd
+++ b/chrome/locale/ga-IE/aboutTor.dtd
@@ -29,31 +29,3 @@
<!ENTITY aboutTor.newsletter.link_text "Cláraigh le Nuachtlitir Tor.">
<!ENTITY aboutTor.donationBanner.freeToUse "Tá Tor saor in aisce a bhuí le bronntanais airgid ó dhaoine cosúil leatsa.">
<!ENTITY aboutTor.donationBanner.buttonA "Tabhair síntiús airgid anois">
-
-<!-- Year end campaign strings -->
-
-<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
- phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
- translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
- with a similar theme:
-
- - DON'T TOUCH MY DATA
- - DON'T SPY ON MY DATA
- - MY DATA IS PRIVATE
- - KEEP OFF MY DATA
-
- Please place newline characters (\n) between words or phrases which can be placed in separate lines
- so we can word-wrap our final assets correctly.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.slogan "HANDS\nOFF\nMY\nDATA">
-<!ENTITY aboutTor.yec.motto "Is buncheart daonna é an príobháideachas">
-<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
- also format it like the name of an organization in whichever way that is appropriate for your locale.
-
- Please keep the currency in USD.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.donationMatch "Your donation will be matched by Friends of Tor, up to $150,000.">
diff --git a/chrome/locale/he/aboutTor.dtd b/chrome/locale/he/aboutTor.dtd
index c48ae2b7..520d773b 100644
--- a/chrome/locale/he/aboutTor.dtd
+++ b/chrome/locale/he/aboutTor.dtd
@@ -29,31 +29,3 @@
<!ENTITY aboutTor.newsletter.link_text "הירשם עבור חדשות Tor.">
<!ENTITY aboutTor.donationBanner.freeToUse "Tor חינמי לשימוש בגלל תרומות מאנשים כמוך.">
<!ENTITY aboutTor.donationBanner.buttonA "תרום עכשיו">
-
-<!-- Year end campaign strings -->
-
-<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
- phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
- translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
- with a similar theme:
-
- - DON'T TOUCH MY DATA
- - DON'T SPY ON MY DATA
- - MY DATA IS PRIVATE
- - KEEP OFF MY DATA
-
- Please place newline characters (\n) between words or phrases which can be placed in separate lines
- so we can word-wrap our final assets correctly.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.slogan "HANDS\nOFF\nMY\nDATA">
-<!ENTITY aboutTor.yec.motto "פרטיות היא זכות אדם">
-<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
- also format it like the name of an organization in whichever way that is appropriate for your locale.
-
- Please keep the currency in USD.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.donationMatch "תרומתך תוכפל על ידי החברים של Tor, עד סכום של $150,000">
diff --git a/chrome/locale/hu/aboutTor.dtd b/chrome/locale/hu/aboutTor.dtd
index bfd3e056..0ea02599 100644
--- a/chrome/locale/hu/aboutTor.dtd
+++ b/chrome/locale/hu/aboutTor.dtd
@@ -29,31 +29,3 @@
<!ENTITY aboutTor.newsletter.link_text "Iratkozzon fel a Tor hírekhez.">
<!ENTITY aboutTor.donationBanner.freeToUse "A Tor ingyenes az Önhöz hasonló személyek támogatásai miatt.">
<!ENTITY aboutTor.donationBanner.buttonA "Támogasson most">
-
-<!-- Year end campaign strings -->
-
-<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
- phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
- translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
- with a similar theme:
-
- - DON'T TOUCH MY DATA
- - DON'T SPY ON MY DATA
- - MY DATA IS PRIVATE
- - KEEP OFF MY DATA
-
- Please place newline characters (\n) between words or phrases which can be placed in separate lines
- so we can word-wrap our final assets correctly.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.slogan "HANDS\nOFF\nMY\nDATA">
-<!ENTITY aboutTor.yec.motto "A magánélet emberi jog">
-<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
- also format it like the name of an organization in whichever way that is appropriate for your locale.
-
- Please keep the currency in USD.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.donationMatch "A támogatásoddal egyező összeget ad a Friends of Tor, 150 000 dollárig.">
diff --git a/chrome/locale/id/aboutTor.dtd b/chrome/locale/id/aboutTor.dtd
index a6663ba9..be1ecb07 100644
--- a/chrome/locale/id/aboutTor.dtd
+++ b/chrome/locale/id/aboutTor.dtd
@@ -29,31 +29,3 @@
<!ENTITY aboutTor.newsletter.link_text "Daftar untuk mendapatkan Berita Tor.">
<!ENTITY aboutTor.donationBanner.freeToUse "Tor bebas digunakan karena donasi dari orang-orang seperti Anda.">
<!ENTITY aboutTor.donationBanner.buttonA "Donasi Sekarang">
-
-<!-- Year end campaign strings -->
-
-<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
- phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
- translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
- with a similar theme:
-
- - DON'T TOUCH MY DATA
- - DON'T SPY ON MY DATA
- - MY DATA IS PRIVATE
- - KEEP OFF MY DATA
-
- Please place newline characters (\n) between words or phrases which can be placed in separate lines
- so we can word-wrap our final assets correctly.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.slogan "Jauhi\nData\nSaya">
-<!ENTITY aboutTor.yec.motto "Privasi adalah sebuah hak asasi manusia">
-<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
- also format it like the name of an organization in whichever way that is appropriate for your locale.
-
- Please keep the currency in USD.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.donationMatch "Donasi Anda akan disesuaikan oleh "Friends of Tor", hingga $150.000.">
diff --git a/chrome/locale/id/torbutton.dtd b/chrome/locale/id/torbutton.dtd
index dbc6b90f..399c1624 100644
--- a/chrome/locale/id/torbutton.dtd
+++ b/chrome/locale/id/torbutton.dtd
@@ -2,7 +2,7 @@
<!ENTITY torbutton.context_menu.new_identity_sentence_case "Identitas baru">
<!ENTITY torbutton.context_menu.new_identity_key "I">
<!ENTITY torbutton.context_menu.new_circuit "Sirkuit Tor Baru untuk Situs ini">
-<!ENTITY torbutton.context_menu.new_circuit_sentence_case "New tor circuit for this site">
+<!ENTITY torbutton.context_menu.new_circuit_sentence_case "Sirkuit tor baru untuk situs ini">
<!ENTITY torbutton.context_menu.new_circuit_key "C">
<!ENTITY torbutton.context_menu.networksettings "Pengaturan Jaringan Tor…">
<!ENTITY torbutton.context_menu.networksettings.key "N">
diff --git a/chrome/locale/is/aboutTor.dtd b/chrome/locale/is/aboutTor.dtd
index 84f950bc..14bad9ac 100644
--- a/chrome/locale/is/aboutTor.dtd
+++ b/chrome/locale/is/aboutTor.dtd
@@ -29,31 +29,3 @@
<!ENTITY aboutTor.newsletter.link_text "Skráðu þig til að fá Tor-fréttir.">
<!ENTITY aboutTor.donationBanner.freeToUse "Öllum er frjálst að nota Tor vegna styrkja frá fólki eins og þér.">
<!ENTITY aboutTor.donationBanner.buttonA "Styrkja núna">
-
-<!-- Year end campaign strings -->
-
-<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
- phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
- translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
- with a similar theme:
-
- - DON'T TOUCH MY DATA
- - DON'T SPY ON MY DATA
- - MY DATA IS PRIVATE
- - KEEP OFF MY DATA
-
- Please place newline characters (\n) between words or phrases which can be placed in separate lines
- so we can word-wrap our final assets correctly.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.slogan "HANDS\nOFF\nMY\nDATA">
-<!ENTITY aboutTor.yec.motto "Friðhelgi persónuupplýsinga er mannréttindi">
-<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
- also format it like the name of an organization in whichever way that is appropriate for your locale.
-
- Please keep the currency in USD.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.donationMatch "Styrkur frá þér verður jafnaður upp af Friends of Tor, allt að $150,000.">
diff --git a/chrome/locale/it/aboutTor.dtd b/chrome/locale/it/aboutTor.dtd
index 29d6ae12..34fe8006 100644
--- a/chrome/locale/it/aboutTor.dtd
+++ b/chrome/locale/it/aboutTor.dtd
@@ -29,31 +29,3 @@
<!ENTITY aboutTor.newsletter.link_text "Registrati alle Tor News.">
<!ENTITY aboutTor.donationBanner.freeToUse "L'utilizzo di Tor è gratuito grazie alle donazioni fatte da persone come te.">
<!ENTITY aboutTor.donationBanner.buttonA "Dona Adesso">
-
-<!-- Year end campaign strings -->
-
-<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
- phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
- translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
- with a similar theme:
-
- - DON'T TOUCH MY DATA
- - DON'T SPY ON MY DATA
- - MY DATA IS PRIVATE
- - KEEP OFF MY DATA
-
- Please place newline characters (\n) between words or phrases which can be placed in separate lines
- so we can word-wrap our final assets correctly.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.slogan "VIA\nDAI\nMEI\nDATI">
-<!ENTITY aboutTor.yec.motto "La privacy è un diritto umano">
-<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
- also format it like the name of an organization in whichever way that is appropriate for your locale.
-
- Please keep the currency in USD.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.donationMatch "La tua donazione sarà abbinata a "Amici di Tor", fino a $ 150.000.">
diff --git a/chrome/locale/ja/aboutTor.dtd b/chrome/locale/ja/aboutTor.dtd
index 7a7d2dc9..10eb73a1 100644
--- a/chrome/locale/ja/aboutTor.dtd
+++ b/chrome/locale/ja/aboutTor.dtd
@@ -29,31 +29,3 @@
<!ENTITY aboutTor.newsletter.link_text "Tor ニュースに申し込む。">
<!ENTITY aboutTor.donationBanner.freeToUse "Tor は皆さんからの寄付に支えられています。">
<!ENTITY aboutTor.donationBanner.buttonA "今すぐ寄付">
-
-<!-- Year end campaign strings -->
-
-<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
- phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
- translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
- with a similar theme:
-
- - DON'T TOUCH MY DATA
- - DON'T SPY ON MY DATA
- - MY DATA IS PRIVATE
- - KEEP OFF MY DATA
-
- Please place newline characters (\n) between words or phrases which can be placed in separate lines
- so we can word-wrap our final assets correctly.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.slogan "データ\nに\n手を\n触れるな">
-<!ENTITY aboutTor.yec.motto "プライバシーは人権です">
-<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
- also format it like the name of an organization in whichever way that is appropriate for your locale.
-
- Please keep the currency in USD.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.donationMatch "あなたが寄付した額と同額を、Torのパートナーも寄付します (最大150,000ドル)">
diff --git a/chrome/locale/ja/torbutton.dtd b/chrome/locale/ja/torbutton.dtd
index fcc97264..0c0f78c0 100644
--- a/chrome/locale/ja/torbutton.dtd
+++ b/chrome/locale/ja/torbutton.dtd
@@ -1,5 +1,5 @@
<!ENTITY torbutton.context_menu.new_identity "新しい識別子">
-<!ENTITY torbutton.context_menu.new_identity_sentence_case "New identity">
+<!ENTITY torbutton.context_menu.new_identity_sentence_case "新しい識別子">
<!ENTITY torbutton.context_menu.new_identity_key "I">
<!ENTITY torbutton.context_menu.new_circuit "このサイト用の Tor 回線を再構築">
<!ENTITY torbutton.context_menu.new_circuit_sentence_case "New tor circuit for this site">
@@ -47,7 +47,7 @@
<!ENTITY torbutton.prefs.sec_custom_summary "あなたのブラウザーにおけるカスタム設定はセキュリティ結果に影響を及ぼしません。セキュリティとプライバシーに関してはデフォルトのセキュリティレベルのひとつを選択することをおすすめいたします。">
<!ENTITY torbutton.prefs.sec_restore_defaults "デフォルトにもどす">
<!ENTITY torbutton.prefs.sec_advanced_security_settings "詳細セキュリティ設定…">
-<!ENTITY torbutton.prefs.sec_change "Change…">
+<!ENTITY torbutton.prefs.sec_change "変更…">
<!ENTITY torbutton.circuit_display.title "Tor 回線">
<!ENTITY torbutton.circuit_display.new_circuit "このサイト用の回線を再構築">
diff --git a/chrome/locale/ka/aboutTor.dtd b/chrome/locale/ka/aboutTor.dtd
index 14c2db32..1f1b89bf 100644
--- a/chrome/locale/ka/aboutTor.dtd
+++ b/chrome/locale/ka/aboutTor.dtd
@@ -29,31 +29,3 @@
<!ENTITY aboutTor.newsletter.link_text "გამოიწერეთ Tor-ის სიახლეები.">
<!ENTITY aboutTor.donationBanner.freeToUse "Tor უფასოა, თქვენნაირი ადამიანების შემოწირულობების წყალობით.">
<!ENTITY aboutTor.donationBanner.buttonA "გაიღეთ თანხა">
-
-<!-- Year end campaign strings -->
-
-<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
- phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
- translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
- with a similar theme:
-
- - DON'T TOUCH MY DATA
- - DON'T SPY ON MY DATA
- - MY DATA IS PRIVATE
- - KEEP OFF MY DATA
-
- Please place newline characters (\n) between words or phrases which can be placed in separate lines
- so we can word-wrap our final assets correctly.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.slogan "ᲮᲔᲚᲔᲑᲘ\nᲨᲝᲠᲡ ᲩᲔᲛᲘ\nᲞᲘᲠᲐᲓᲘ\nᲡᲘᲕᲠᲪᲘᲓᲐᲜ">
-<!ENTITY aboutTor.yec.motto "პირადულობა ადამიანის ძირეული უფლებაა">
-<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
- also format it like the name of an organization in whichever way that is appropriate for your locale.
-
- Please keep the currency in USD.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.donationMatch "თქვენი შემოწირულობა გაორმაგდება Tor-ის მეგობრების მიერ, $150,000-ამდე.">
diff --git a/chrome/locale/ko/aboutTor.dtd b/chrome/locale/ko/aboutTor.dtd
index 18bf3bfe..04e6de97 100644
--- a/chrome/locale/ko/aboutTor.dtd
+++ b/chrome/locale/ko/aboutTor.dtd
@@ -29,31 +29,3 @@
<!ENTITY aboutTor.newsletter.link_text "Tor 뉴스를 구독.">
<!ENTITY aboutTor.donationBanner.freeToUse "Tor는 바로 당신과 같은 사람들의 기부 덕분에 자유롭게 사용할 수 있습니다.">
<!ENTITY aboutTor.donationBanner.buttonA "기부하기">
-
-<!-- Year end campaign strings -->
-
-<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
- phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
- translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
- with a similar theme:
-
- - DON'T TOUCH MY DATA
- - DON'T SPY ON MY DATA
- - MY DATA IS PRIVATE
- - KEEP OFF MY DATA
-
- Please place newline characters (\n) between words or phrases which can be placed in separate lines
- so we can word-wrap our final assets correctly.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.slogan "HANDS\nOFF\nMY\nDATA">
-<!ENTITY aboutTor.yec.motto "프라이버시는 인권입니다">
-<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
- also format it like the name of an organization in whichever way that is appropriate for your locale.
-
- Please keep the currency in USD.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.donationMatch "Your donation will be matched by Friends of Tor, up to $150,000.">
diff --git a/chrome/locale/lt/aboutTor.dtd b/chrome/locale/lt/aboutTor.dtd
index 7885a6be..4b711723 100644
--- a/chrome/locale/lt/aboutTor.dtd
+++ b/chrome/locale/lt/aboutTor.dtd
@@ -29,31 +29,3 @@
<!ENTITY aboutTor.newsletter.link_text "Užsisakykite Tor naujienas.">
<!ENTITY aboutTor.donationBanner.freeToUse "Tor yra nemokamas naudoti dėl paaukojimų iš tokių žmonių kaip jūs.">
<!ENTITY aboutTor.donationBanner.buttonA "Paaukokite dabar">
-
-<!-- Year end campaign strings -->
-
-<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
- phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
- translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
- with a similar theme:
-
- - DON'T TOUCH MY DATA
- - DON'T SPY ON MY DATA
- - MY DATA IS PRIVATE
- - KEEP OFF MY DATA
-
- Please place newline characters (\n) between words or phrases which can be placed in separate lines
- so we can word-wrap our final assets correctly.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.slogan "PATRAUKITE\nRANKAS\nNUO\nMANO\nDUOMENŲ">
-<!ENTITY aboutTor.yec.motto "Privatumas yra žmogaus teisė">
-<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
- also format it like the name of an organization in whichever way that is appropriate for your locale.
-
- Please keep the currency in USD.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.donationMatch "„Friends of Tor“ paaukos tiek pat, kiek ir jūs, iki $150000.">
diff --git a/chrome/locale/lt/torbutton.dtd b/chrome/locale/lt/torbutton.dtd
index 3e1e58e1..37326068 100644
--- a/chrome/locale/lt/torbutton.dtd
+++ b/chrome/locale/lt/torbutton.dtd
@@ -1,8 +1,8 @@
<!ENTITY torbutton.context_menu.new_identity "Nauja tapatybė">
-<!ENTITY torbutton.context_menu.new_identity_sentence_case "New identity">
+<!ENTITY torbutton.context_menu.new_identity_sentence_case "Nauja tapatybė">
<!ENTITY torbutton.context_menu.new_identity_key "T">
<!ENTITY torbutton.context_menu.new_circuit "Nauja Tor grandinė šiai svetainei">
-<!ENTITY torbutton.context_menu.new_circuit_sentence_case "New tor circuit for this site">
+<!ENTITY torbutton.context_menu.new_circuit_sentence_case "Nauja Tor grandinė šiai svetainei">
<!ENTITY torbutton.context_menu.new_circuit_key "G">
<!ENTITY torbutton.context_menu.networksettings "Tor tinklo nustatymai…">
<!ENTITY torbutton.context_menu.networksettings.key "N">
diff --git a/chrome/locale/mk/aboutTor.dtd b/chrome/locale/mk/aboutTor.dtd
index 785c23f3..5853c075 100644
--- a/chrome/locale/mk/aboutTor.dtd
+++ b/chrome/locale/mk/aboutTor.dtd
@@ -29,31 +29,3 @@
<!ENTITY aboutTor.newsletter.link_text "Пријавете се за Tor Вести.">
<!ENTITY aboutTor.donationBanner.freeToUse "Tor е бесплатен за користење благодарение на донациите од луѓе како вас.">
<!ENTITY aboutTor.donationBanner.buttonA "Донирај сега">
-
-<!-- Year end campaign strings -->
-
-<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
- phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
- translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
- with a similar theme:
-
- - DON'T TOUCH MY DATA
- - DON'T SPY ON MY DATA
- - MY DATA IS PRIVATE
- - KEEP OFF MY DATA
-
- Please place newline characters (\n) between words or phrases which can be placed in separate lines
- so we can word-wrap our final assets correctly.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.slogan "РАЦЕТЕ\nПОНАСТРАНА\nОД\nМОИТЕ\nПОДАТОЦИ">
-<!ENTITY aboutTor.yec.motto "Приватноста е човеково право">
-<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
- also format it like the name of an organization in whichever way that is appropriate for your locale.
-
- Please keep the currency in USD.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.donationMatch "Вашата донација ќе биде дуплицирана од Пријателите на Tor, до $150,000.">
diff --git a/chrome/locale/mk/torbutton.dtd b/chrome/locale/mk/torbutton.dtd
index 35bc81b3..d8f0c6a8 100644
--- a/chrome/locale/mk/torbutton.dtd
+++ b/chrome/locale/mk/torbutton.dtd
@@ -1,8 +1,8 @@
<!ENTITY torbutton.context_menu.new_identity "Нов идентитет">
-<!ENTITY torbutton.context_menu.new_identity_sentence_case "New identity">
+<!ENTITY torbutton.context_menu.new_identity_sentence_case "Нов идентитет">
<!ENTITY torbutton.context_menu.new_identity_key "I">
<!ENTITY torbutton.context_menu.new_circuit "Нов Tor круг за оваа страна">
-<!ENTITY torbutton.context_menu.new_circuit_sentence_case "New tor circuit for this site">
+<!ENTITY torbutton.context_menu.new_circuit_sentence_case "Нов Tor круг за оваа веб страна">
<!ENTITY torbutton.context_menu.new_circuit_key "C">
<!ENTITY torbutton.context_menu.networksettings "Тор мрежни поставки...">
<!ENTITY torbutton.context_menu.networksettings.key "N">
diff --git a/chrome/locale/ms/aboutTor.dtd b/chrome/locale/ms/aboutTor.dtd
index 231e59a1..b49406f7 100644
--- a/chrome/locale/ms/aboutTor.dtd
+++ b/chrome/locale/ms/aboutTor.dtd
@@ -29,31 +29,3 @@
<!ENTITY aboutTor.newsletter.link_text "Daftar untuk dapatkan Berita Tor.">
<!ENTITY aboutTor.donationBanner.freeToUse "Tor sepenuhnya percuma digunakan kerana adanya derma oleh individu seperti anda.">
<!ENTITY aboutTor.donationBanner.buttonA "Dermalah Sekarang">
-
-<!-- Year end campaign strings -->
-
-<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
- phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
- translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
- with a similar theme:
-
- - DON'T TOUCH MY DATA
- - DON'T SPY ON MY DATA
- - MY DATA IS PRIVATE
- - KEEP OFF MY DATA
-
- Please place newline characters (\n) between words or phrases which can be placed in separate lines
- so we can word-wrap our final assets correctly.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.slogan "HANDS\nOFF\nMY\nDATA">
-<!ENTITY aboutTor.yec.motto "Privasi atau kesendirian ialah hak asasi manusia">
-<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
- also format it like the name of an organization in whichever way that is appropriate for your locale.
-
- Please keep the currency in USD.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.donationMatch "Your donation will be matched by Friends of Tor, up to $150,000.">
diff --git a/chrome/locale/my/aboutTor.dtd b/chrome/locale/my/aboutTor.dtd
index d4be1cf6..06bc3410 100644
--- a/chrome/locale/my/aboutTor.dtd
+++ b/chrome/locale/my/aboutTor.dtd
@@ -29,31 +29,3 @@
<!ENTITY aboutTor.newsletter.link_text "Tor News သတင်းများအတွက် အမည် စာရင်းသွင်းလိုက်ပါ။">
<!ENTITY aboutTor.donationBanner.freeToUse "Tor သည် သင့်လို သုံးသူများမှ လှူဒါန်းငွေကြောင့် အခမဲ့သုံးနိုင်ပါသည်။">
<!ENTITY aboutTor.donationBanner.buttonA "အခုဘဲ လှူမယ်">
-
-<!-- Year end campaign strings -->
-
-<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
- phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
- translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
- with a similar theme:
-
- - DON'T TOUCH MY DATA
- - DON'T SPY ON MY DATA
- - MY DATA IS PRIVATE
- - KEEP OFF MY DATA
-
- Please place newline characters (\n) between words or phrases which can be placed in separate lines
- so we can word-wrap our final assets correctly.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.slogan "HANDS\nOFF\nMY\nDATA">
-<!ENTITY aboutTor.yec.motto "Privacy is a human right">
-<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
- also format it like the name of an organization in whichever way that is appropriate for your locale.
-
- Please keep the currency in USD.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.donationMatch "Your donation will be matched by Friends of Tor, up to $150,000.">
diff --git a/chrome/locale/nb-NO/aboutTor.dtd b/chrome/locale/nb-NO/aboutTor.dtd
index fb6544bf..15c0c327 100644
--- a/chrome/locale/nb-NO/aboutTor.dtd
+++ b/chrome/locale/nb-NO/aboutTor.dtd
@@ -29,31 +29,3 @@
<!ENTITY aboutTor.newsletter.link_text "Registrer deg for Tor-nyheter.">
<!ENTITY aboutTor.donationBanner.freeToUse "Tor er gratis å bruke, grunnet bidrag fra folk som deg.">
<!ENTITY aboutTor.donationBanner.buttonA "Donér nå">
-
-<!-- Year end campaign strings -->
-
-<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
- phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
- translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
- with a similar theme:
-
- - DON'T TOUCH MY DATA
- - DON'T SPY ON MY DATA
- - MY DATA IS PRIVATE
- - KEEP OFF MY DATA
-
- Please place newline characters (\n) between words or phrases which can be placed in separate lines
- so we can word-wrap our final assets correctly.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.slogan "HANDS\nOFF\nMY\nDATA">
-<!ENTITY aboutTor.yec.motto "Personvern er en menneskerettighet">
-<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
- also format it like the name of an organization in whichever way that is appropriate for your locale.
-
- Please keep the currency in USD.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.donationMatch "Your donation will be matched by Friends of Tor, up to $150,000.">
diff --git a/chrome/locale/nl/aboutTor.dtd b/chrome/locale/nl/aboutTor.dtd
index 9af03022..ca46073b 100644
--- a/chrome/locale/nl/aboutTor.dtd
+++ b/chrome/locale/nl/aboutTor.dtd
@@ -29,31 +29,3 @@
<!ENTITY aboutTor.newsletter.link_text "Meld u aan voor de Tor-nieuwsbrief.">
<!ENTITY aboutTor.donationBanner.freeToUse "Tor is gratis te gebruiken dankzij donaties van mensen zoals u.">
<!ENTITY aboutTor.donationBanner.buttonA "Doneer nu">
-
-<!-- Year end campaign strings -->
-
-<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
- phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
- translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
- with a similar theme:
-
- - DON'T TOUCH MY DATA
- - DON'T SPY ON MY DATA
- - MY DATA IS PRIVATE
- - KEEP OFF MY DATA
-
- Please place newline characters (\n) between words or phrases which can be placed in separate lines
- so we can word-wrap our final assets correctly.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.slogan "HANDS\nOFF\nMY\nDATA">
-<!ENTITY aboutTor.yec.motto "Privacy is een mensenrecht">
-<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
- also format it like the name of an organization in whichever way that is appropriate for your locale.
-
- Please keep the currency in USD.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.donationMatch "Uw donatie wordt verdubbeld door Friends of Tor, tot een maximum van $150.000.">
diff --git a/chrome/locale/nl/torbutton.dtd b/chrome/locale/nl/torbutton.dtd
index 5efd0182..9d64c1d1 100644
--- a/chrome/locale/nl/torbutton.dtd
+++ b/chrome/locale/nl/torbutton.dtd
@@ -2,7 +2,7 @@
<!ENTITY torbutton.context_menu.new_identity_sentence_case "Nieuwe identiteit">
<!ENTITY torbutton.context_menu.new_identity_key "d">
<!ENTITY torbutton.context_menu.new_circuit "Nieuw Tor-circuit voor deze website">
-<!ENTITY torbutton.context_menu.new_circuit_sentence_case "New tor circuit for this site">
+<!ENTITY torbutton.context_menu.new_circuit_sentence_case "Nieuw Torcircuit voor deze website">
<!ENTITY torbutton.context_menu.new_circuit_key "c">
<!ENTITY torbutton.context_menu.networksettings "Tor-netwerkinstellingen…">
<!ENTITY torbutton.context_menu.networksettings.key "n">
@@ -47,7 +47,7 @@
<!ENTITY torbutton.prefs.sec_custom_summary "Uw aangepaste browservoorkeuren hebben tot ongebruikelijke beveiligingsinstellingen geleid. Uit veiligheids- en privacyoverwegingen raden we aan een van de standaard beveiligingsniveaus te kiezen.">
<!ENTITY torbutton.prefs.sec_restore_defaults "Standaardwaarden herstellen">
<!ENTITY torbutton.prefs.sec_advanced_security_settings "Geavanceerde beveiligingsinstellingen…">
-<!ENTITY torbutton.prefs.sec_change "Change…">
+<!ENTITY torbutton.prefs.sec_change "Wijzigen …">
<!ENTITY torbutton.circuit_display.title "Tor-circuit">
<!ENTITY torbutton.circuit_display.new_circuit "Nieuw circuit voor deze website">
diff --git a/chrome/locale/pl/aboutTor.dtd b/chrome/locale/pl/aboutTor.dtd
index 6750b260..f67d40b9 100644
--- a/chrome/locale/pl/aboutTor.dtd
+++ b/chrome/locale/pl/aboutTor.dtd
@@ -29,31 +29,3 @@
<!ENTITY aboutTor.newsletter.link_text "Zapisz się na newsletter.">
<!ENTITY aboutTor.donationBanner.freeToUse "Z przeglądarki Tor można korzystać bezpłatnie dzięki darowiznom od osób takich jak Ty.">
<!ENTITY aboutTor.donationBanner.buttonA "Wesprzyj teraz">
-
-<!-- Year end campaign strings -->
-
-<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
- phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
- translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
- with a similar theme:
-
- - DON'T TOUCH MY DATA
- - DON'T SPY ON MY DATA
- - MY DATA IS PRIVATE
- - KEEP OFF MY DATA
-
- Please place newline characters (\n) between words or phrases which can be placed in separate lines
- so we can word-wrap our final assets correctly.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.slogan "RĘCE\nPRECZ\nOD\nMOICH\nDANYCH">
-<!ENTITY aboutTor.yec.motto "Prawo do prywatności jest prawem człowieka. ">
-<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
- also format it like the name of an organization in whichever way that is appropriate for your locale.
-
- Please keep the currency in USD.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.donationMatch "Twoja darowizna zostanie wyrównana przez przyjaciół sieci Tor, aż do 150 000 dolarów.">
diff --git a/chrome/locale/pt-BR/aboutTor.dtd b/chrome/locale/pt-BR/aboutTor.dtd
index 71aa2346..10cc06e9 100644
--- a/chrome/locale/pt-BR/aboutTor.dtd
+++ b/chrome/locale/pt-BR/aboutTor.dtd
@@ -30,31 +30,3 @@
<!ENTITY aboutTor.newsletter.link_text "Inscreva-se para receber Notícias do Tor.">
<!ENTITY aboutTor.donationBanner.freeToUse "O Tor é gratuito graças às doações de pessoas como você.">
<!ENTITY aboutTor.donationBanner.buttonA "Doe Agora">
-
-<!-- Year end campaign strings -->
-
-<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
- phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
- translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
- with a similar theme:
-
- - DON'T TOUCH MY DATA
- - DON'T SPY ON MY DATA
- - MY DATA IS PRIVATE
- - KEEP OFF MY DATA
-
- Please place newline characters (\n) between words or phrases which can be placed in separate lines
- so we can word-wrap our final assets correctly.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.slogan "TIREM AS\nMÃOS\nDOS MEUS\nDADOS">
-<!ENTITY aboutTor.yec.motto "Privacidade é um direito humano.">
-<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
- also format it like the name of an organization in whichever way that is appropriate for your locale.
-
- Please keep the currency in USD.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.donationMatch "Os Amigos do Tor farão uma doação do mesmo valor da sua, no limite de $150,000.00.">
diff --git a/chrome/locale/ro/aboutTor.dtd b/chrome/locale/ro/aboutTor.dtd
index 9c5d3c33..07488af9 100644
--- a/chrome/locale/ro/aboutTor.dtd
+++ b/chrome/locale/ro/aboutTor.dtd
@@ -29,31 +29,3 @@
<!ENTITY aboutTor.newsletter.link_text "Abonează-te la Tor News.">
<!ENTITY aboutTor.donationBanner.freeToUse "Tor poate fi folosit gratuit datorită donațiilor de la oameni ca tine.">
<!ENTITY aboutTor.donationBanner.buttonA "Donează Acum">
-
-<!-- Year end campaign strings -->
-
-<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
- phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
- translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
- with a similar theme:
-
- - DON'T TOUCH MY DATA
- - DON'T SPY ON MY DATA
- - MY DATA IS PRIVATE
- - KEEP OFF MY DATA
-
- Please place newline characters (\n) between words or phrases which can be placed in separate lines
- so we can word-wrap our final assets correctly.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.slogan "IA-ȚI\nMÂINILE\nDE PE DATELE\nMELE">
-<!ENTITY aboutTor.yec.motto "Confidențialitatea este un drept uman">
-<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
- also format it like the name of an organization in whichever way that is appropriate for your locale.
-
- Please keep the currency in USD.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.donationMatch "Donația dumneavoastră va fi potrivită de Prietenii lui Tor, până la 150.000 USD.">
diff --git a/chrome/locale/ru/aboutTor.dtd b/chrome/locale/ru/aboutTor.dtd
index 7ea0b5f8..372bbcd5 100644
--- a/chrome/locale/ru/aboutTor.dtd
+++ b/chrome/locale/ru/aboutTor.dtd
@@ -29,31 +29,3 @@
<!ENTITY aboutTor.newsletter.link_text "Подпишитесь на новости Tor.">
<!ENTITY aboutTor.donationBanner.freeToUse "Tor бесплатен благодаря пожертвованиям таких людей, как вы.">
<!ENTITY aboutTor.donationBanner.buttonA "Пожертвовать">
-
-<!-- Year end campaign strings -->
-
-<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
- phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
- translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
- with a similar theme:
-
- - DON'T TOUCH MY DATA
- - DON'T SPY ON MY DATA
- - MY DATA IS PRIVATE
- - KEEP OFF MY DATA
-
- Please place newline characters (\n) between words or phrases which can be placed in separate lines
- so we can word-wrap our final assets correctly.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.slogan "РУКИ\nПРОЧЬ\nОТ МОИХ\nДАННЫХ">
-<!ENTITY aboutTor.yec.motto "Приватность – право человека">
-<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
- also format it like the name of an organization in whichever way that is appropriate for your locale.
-
- Please keep the currency in USD.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.donationMatch "Ваше пожертвование (до $150000) будет удвоено Friends of Tor.">
diff --git a/chrome/locale/sv-SE/aboutTor.dtd b/chrome/locale/sv-SE/aboutTor.dtd
index f5e56647..4ff532ec 100644
--- a/chrome/locale/sv-SE/aboutTor.dtd
+++ b/chrome/locale/sv-SE/aboutTor.dtd
@@ -29,31 +29,3 @@
<!ENTITY aboutTor.newsletter.link_text "Anmäl dig till Tor-nyheter.">
<!ENTITY aboutTor.donationBanner.freeToUse "Tor är gratis att använda på grund av donationer från personer som du.">
<!ENTITY aboutTor.donationBanner.buttonA "Donera nu">
-
-<!-- Year end campaign strings -->
-
-<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
- phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
- translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
- with a similar theme:
-
- - DON'T TOUCH MY DATA
- - DON'T SPY ON MY DATA
- - MY DATA IS PRIVATE
- - KEEP OFF MY DATA
-
- Please place newline characters (\n) between words or phrases which can be placed in separate lines
- so we can word-wrap our final assets correctly.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.slogan "HÄNDERNA\nBORT FRÅN\nMINA\nDATA">
-<!ENTITY aboutTor.yec.motto "Integritet är en mänsklig rättighet">
-<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
- also format it like the name of an organization in whichever way that is appropriate for your locale.
-
- Please keep the currency in USD.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.donationMatch "Din donation kommer att matchas av Friends of Tor, upp till $150 000.">
diff --git a/chrome/locale/th/aboutTor.dtd b/chrome/locale/th/aboutTor.dtd
index 29531f5d..96ebca5e 100644
--- a/chrome/locale/th/aboutTor.dtd
+++ b/chrome/locale/th/aboutTor.dtd
@@ -29,31 +29,3 @@
<!ENTITY aboutTor.newsletter.link_text "สมัครรับข่าวสารเกี่ยวกับ Tor">
<!ENTITY aboutTor.donationBanner.freeToUse "บริการ Tor นี้ฟรี ไม่มีค่าใช้จ่ายใดๆเพราะเงินบริจาคจากผู้มีน้ำใจอย่างคุณ">
<!ENTITY aboutTor.donationBanner.buttonA "ร่วมบริจาค">
-
-<!-- Year end campaign strings -->
-
-<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
- phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
- translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
- with a similar theme:
-
- - DON'T TOUCH MY DATA
- - DON'T SPY ON MY DATA
- - MY DATA IS PRIVATE
- - KEEP OFF MY DATA
-
- Please place newline characters (\n) between words or phrases which can be placed in separate lines
- so we can word-wrap our final assets correctly.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.slogan "HANDS\nOFF\nMY\nDATA">
-<!ENTITY aboutTor.yec.motto "ความเป็นส่วนตัวคือสิทธิมนุษยชน">
-<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
- also format it like the name of an organization in whichever way that is appropriate for your locale.
-
- Please keep the currency in USD.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.donationMatch "เงินบริจาคของคุณจะส่งมอบให้ Tor สูงสุดถึง 150,000 ดอลลาร์สหรัฐ">
diff --git a/chrome/locale/tr/aboutTor.dtd b/chrome/locale/tr/aboutTor.dtd
index dc3eb89e..5c330e18 100644
--- a/chrome/locale/tr/aboutTor.dtd
+++ b/chrome/locale/tr/aboutTor.dtd
@@ -29,31 +29,3 @@
<!ENTITY aboutTor.newsletter.link_text "Tor duyurularına abone olun">
<!ENTITY aboutTor.donationBanner.freeToUse "Tor sizin gibi insanların bağışları ile desteklendiği için ücretsiz olarak kullanılabiliyor.">
<!ENTITY aboutTor.donationBanner.buttonA "Bağış yapın">
-
-<!-- Year end campaign strings -->
-
-<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
- phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
- translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
- with a similar theme:
-
- - DON'T TOUCH MY DATA
- - DON'T SPY ON MY DATA
- - MY DATA IS PRIVATE
- - KEEP OFF MY DATA
-
- Please place newline characters (\n) between words or phrases which can be placed in separate lines
- so we can word-wrap our final assets correctly.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.slogan "VERİLERİME\nDOKUNMA">
-<!ENTITY aboutTor.yec.motto "Kişisel gizlilik bir insan hakkıdır">
-<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
- also format it like the name of an organization in whichever way that is appropriate for your locale.
-
- Please keep the currency in USD.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.donationMatch "Friends of Tor, $150.000 altında yaptığınız bağış kadar katkıda bulunacak.">
diff --git a/chrome/locale/vi/aboutTor.dtd b/chrome/locale/vi/aboutTor.dtd
index 45d44a81..b6bf4286 100644
--- a/chrome/locale/vi/aboutTor.dtd
+++ b/chrome/locale/vi/aboutTor.dtd
@@ -29,31 +29,3 @@
<!ENTITY aboutTor.newsletter.link_text "Đăng kí nhận tin tức từ Tor.">
<!ENTITY aboutTor.donationBanner.freeToUse "Tor miễn phí là nhờ sự ủng hộ của những người như bạn.">
<!ENTITY aboutTor.donationBanner.buttonA "Đóng góp Ngay bây giờ">
-
-<!-- Year end campaign strings -->
-
-<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
- phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
- translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
- with a similar theme:
-
- - DON'T TOUCH MY DATA
- - DON'T SPY ON MY DATA
- - MY DATA IS PRIVATE
- - KEEP OFF MY DATA
-
- Please place newline characters (\n) between words or phrases which can be placed in separate lines
- so we can word-wrap our final assets correctly.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.slogan "HANDS\nOFF\nMY\nDATA">
-<!ENTITY aboutTor.yec.motto "Privacy is a human right">
-<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
- also format it like the name of an organization in whichever way that is appropriate for your locale.
-
- Please keep the currency in USD.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.donationMatch "Your donation will be matched by Friends of Tor, up to $150,000.">
diff --git a/chrome/locale/zh-CN/aboutTor.dtd b/chrome/locale/zh-CN/aboutTor.dtd
index 4aa0815c..5b4f5fa7 100644
--- a/chrome/locale/zh-CN/aboutTor.dtd
+++ b/chrome/locale/zh-CN/aboutTor.dtd
@@ -29,31 +29,3 @@
<!ENTITY aboutTor.newsletter.link_text "订阅 Tor 的最新动态">
<!ENTITY aboutTor.donationBanner.freeToUse "Tor 是免费使用的,因为有和您一样的人捐助。">
<!ENTITY aboutTor.donationBanner.buttonA "立即捐助">
-
-<!-- Year end campaign strings -->
-
-<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
- phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
- translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
- with a similar theme:
-
- - DON'T TOUCH MY DATA
- - DON'T SPY ON MY DATA
- - MY DATA IS PRIVATE
- - KEEP OFF MY DATA
-
- Please place newline characters (\n) between words or phrases which can be placed in separate lines
- so we can word-wrap our final assets correctly.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.slogan "别碰\n我的\n隐私">
-<!ENTITY aboutTor.yec.motto "隐私是一项人权">
-<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
- also format it like the name of an organization in whichever way that is appropriate for your locale.
-
- Please keep the currency in USD.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.donationMatch "您的捐款将由 Tor 的伙伴们配捐,最高15万美元。">
diff --git a/chrome/locale/zh-CN/torbutton.dtd b/chrome/locale/zh-CN/torbutton.dtd
index d6d1a237..221c89e4 100644
--- a/chrome/locale/zh-CN/torbutton.dtd
+++ b/chrome/locale/zh-CN/torbutton.dtd
@@ -2,7 +2,7 @@
<!ENTITY torbutton.context_menu.new_identity_sentence_case "新建身份">
<!ENTITY torbutton.context_menu.new_identity_key "I">
<!ENTITY torbutton.context_menu.new_circuit "为此站点使用新的 Tor 链路">
-<!ENTITY torbutton.context_menu.new_circuit_sentence_case "New tor circuit for this site">
+<!ENTITY torbutton.context_menu.new_circuit_sentence_case "为此站点建立新的 Tor 链路">
<!ENTITY torbutton.context_menu.new_circuit_key "C">
<!ENTITY torbutton.context_menu.networksettings "Tor 网络设置…">
<!ENTITY torbutton.context_menu.networksettings.key "N">
@@ -47,7 +47,7 @@
<!ENTITY torbutton.prefs.sec_custom_summary "您自定义的浏览器设置导致了不安全的安全设置。出于安全和隐私考虑,我们建议您选择一个默认的安全级别。">
<!ENTITY torbutton.prefs.sec_restore_defaults "恢复默认设置">
<!ENTITY torbutton.prefs.sec_advanced_security_settings "高级安全选项…">
-<!ENTITY torbutton.prefs.sec_change "Change…">
+<!ENTITY torbutton.prefs.sec_change "更改…">
<!ENTITY torbutton.circuit_display.title "Tor 链路">
<!ENTITY torbutton.circuit_display.new_circuit "为此站点使用新线路">
diff --git a/chrome/locale/zh-TW/aboutTor.dtd b/chrome/locale/zh-TW/aboutTor.dtd
index 5dc4ac80..ead0eb2a 100644
--- a/chrome/locale/zh-TW/aboutTor.dtd
+++ b/chrome/locale/zh-TW/aboutTor.dtd
@@ -27,33 +27,5 @@
<!ENTITY aboutTor.newsletter.tagline "將 Tor 的最新消息直接傳送到您的收件匣。">
<!ENTITY aboutTor.newsletter.link_text "訂閱 Tor 的新資訊。">
-<!ENTITY aboutTor.donationBanner.freeToUse "由於有像您這樣的人捐款,Tor 可以免費使用。">
+<!ENTITY aboutTor.donationBanner.freeToUse "由於有像您這樣的人捐款,洋蔥路由才得以免費使用。">
<!ENTITY aboutTor.donationBanner.buttonA "立刻捐款">
-
-<!-- Year end campaign strings -->
-
-<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
- phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
- translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
- with a similar theme:
-
- - DON'T TOUCH MY DATA
- - DON'T SPY ON MY DATA
- - MY DATA IS PRIVATE
- - KEEP OFF MY DATA
-
- Please place newline characters (\n) between words or phrases which can be placed in separate lines
- so we can word-wrap our final assets correctly.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.slogan "別\n碰\n我的\n資料">
-<!ENTITY aboutTor.yec.motto "隱私即人權">
-<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
- also format it like the name of an organization in whichever way that is appropriate for your locale.
-
- Please keep the currency in USD.
-
- Thank you!
--->
-<!ENTITY aboutTor.yec.donationMatch "Friends of Tor 組織將會捐助與您所捐助的款項相同的金額,上限為$150,000。">
diff --git a/chrome/locale/zh-TW/torbutton.properties b/chrome/locale/zh-TW/torbutton.properties
index fecce63a..586a922a 100644
--- a/chrome/locale/zh-TW/torbutton.properties
+++ b/chrome/locale/zh-TW/torbutton.properties
@@ -78,7 +78,7 @@ onionServices.descInvalid.longDescription=技術細節: %S — 該洋蔥服務
# Tor SOCKS error 0xF2:
onionServices.introFailed.pageTitle=載入洋蔥站台時發生問題
onionServices.introFailed.header=洋蔥站台已斷線
-onionServices.introFailed=最可能的原因是 Onion 網站已離線。請聯絡 Onion 網站管理員。
+onionServices.introFailed=最有可能的原因是該洋蔥站台已離線,請聯絡該站台的管理員。
onionServices.introFailed.longDescription=技術細節: %S — 該洋蔥服務之識別證已找到,但該服務與引見節點之連線已中斷,造成引見連線建立失敗。這通常是肇因於該服務更換識別證,或是已經不再提供服務。
# Tor SOCKS error 0xF3:
onionServices.rendezvousFailed.pageTitle=載入洋蔥站台發生問題
1
0