tbb-commits
Threads by month
- ----- 2025 -----
- July
- 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
- 1 participants
- 18729 discussions

[tor-browser-build/maint-8.0] Use first stable tor in the 0.3.4 series
by gk@torproject.org 11 Sep '18
by gk@torproject.org 11 Sep '18
11 Sep '18
commit 6d09f7a6b7cffc04551f8909fde975f9e21f2d96
Author: Georg Koppen <gk(a)torproject.org>
Date: Tue Sep 11 09:40:16 2018 +0000
Use first stable tor in the 0.3.4 series
This fixes a crash bug on macOS 10.9.x as well (see: bug 27482).
---
projects/tor/config | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/projects/tor/config b/projects/tor/config
index aeea5e0..1549369 100644
--- a/projects/tor/config
+++ b/projects/tor/config
@@ -1,6 +1,6 @@
# vim: filetype=yaml sw=2
filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]'
-version: 0.3.3.9
+version: 0.3.4.8
git_hash: 'tor-[% c("version") %]'
git_url: https://git.torproject.org/tor.git
git_submodule: 1
1
0

[tor-browser-build/maint-8.0] Merge remote-tracking branch 'boklm/bug_26570' into maint-8.0
by gk@torproject.org 06 Sep '18
by gk@torproject.org 06 Sep '18
06 Sep '18
commit f71743e229b4a696fabccb4632df919bed2b1ee3
Merge: 80410af 018a2e9
Author: Georg Koppen <gk(a)torproject.org>
Date: Thu Sep 6 10:33:44 2018 +0000
Merge remote-tracking branch 'boklm/bug_26570' into maint-8.0
projects/release/update_responses_config.yml | 3 +++
1 file changed, 3 insertions(+)
1
0

[tor-browser-build/maint-8.0] Bug 26570: Redirect pre-8.0 stable users to a separate update directory
by gk@torproject.org 06 Sep '18
by gk@torproject.org 06 Sep '18
06 Sep '18
commit 018a2e972bb8963ee3250e7b4926fda46b3c8577
Author: Nicolas Vigier <boklm(a)torproject.org>
Date: Wed Aug 29 17:33:35 2018 +0200
Bug 26570: Redirect pre-8.0 stable users to a separate update directory
---
projects/release/update_responses_config.yml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/projects/release/update_responses_config.yml b/projects/release/update_responses_config.yml
index 90fbc3a..a66ba41 100644
--- a/projects/release/update_responses_config.yml
+++ b/projects/release/update_responses_config.yml
@@ -56,3 +56,6 @@ htaccess_rewrite_rules:
# bug 26569: Redirect pre-8.0a9 alpha users to a separate update directory
RewriteRule ^[^/]+/8\.0a[12345678]/.* https://aus1.torproject.org/torbrowser/update_pre8.0a9/alpha/$0 [last]
RewriteRule ^[^/]+/[4567]\..*/.* https://aus1.torproject.org/torbrowser/update_pre8.0a9/alpha/$0 [last]
+ release: |
+ # bug 26570: Redirect pre-8.0 stable users to a separate update directory
+ RewriteRule ^[^/]+/[4567]\..*/.* https://aus1.torproject.org/torbrowser/update_pre8.0/release/$0 [last]
1
0

[tor-browser-build/master] Bug 26570: Redirect pre-8.0 stable users to a separate update directory
by gk@torproject.org 06 Sep '18
by gk@torproject.org 06 Sep '18
06 Sep '18
commit 018a2e972bb8963ee3250e7b4926fda46b3c8577
Author: Nicolas Vigier <boklm(a)torproject.org>
Date: Wed Aug 29 17:33:35 2018 +0200
Bug 26570: Redirect pre-8.0 stable users to a separate update directory
---
projects/release/update_responses_config.yml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/projects/release/update_responses_config.yml b/projects/release/update_responses_config.yml
index 90fbc3a..a66ba41 100644
--- a/projects/release/update_responses_config.yml
+++ b/projects/release/update_responses_config.yml
@@ -56,3 +56,6 @@ htaccess_rewrite_rules:
# bug 26569: Redirect pre-8.0a9 alpha users to a separate update directory
RewriteRule ^[^/]+/8\.0a[12345678]/.* https://aus1.torproject.org/torbrowser/update_pre8.0a9/alpha/$0 [last]
RewriteRule ^[^/]+/[4567]\..*/.* https://aus1.torproject.org/torbrowser/update_pre8.0a9/alpha/$0 [last]
+ release: |
+ # bug 26570: Redirect pre-8.0 stable users to a separate update directory
+ RewriteRule ^[^/]+/[4567]\..*/.* https://aus1.torproject.org/torbrowser/update_pre8.0/release/$0 [last]
1
0

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_26570'
by gk@torproject.org 06 Sep '18
by gk@torproject.org 06 Sep '18
06 Sep '18
commit 01d1537144fc2ecd5a9c1f346b0d889234666051
Merge: 6c19357 018a2e9
Author: Georg Koppen <gk(a)torproject.org>
Date: Thu Sep 6 10:31:20 2018 +0000
Merge remote-tracking branch 'boklm/bug_26570'
projects/release/update_responses_config.yml | 3 +++
1 file changed, 3 insertions(+)
1
0

[tor-browser-build/master] Bug 27182: set mar_compression to xz for 8.0.1 release
by gk@torproject.org 06 Sep '18
by gk@torproject.org 06 Sep '18
06 Sep '18
commit 6c1935752caf9c72595d9e20cbf0da2300783ab6
Author: Nicolas Vigier <boklm(a)torproject.org>
Date: Mon Sep 3 11:47:03 2018 +0200
Bug 27182: set mar_compression to xz for 8.0.1 release
---
projects/release/update_responses_config.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/projects/release/update_responses_config.yml b/projects/release/update_responses_config.yml
index d1ed52f..8cac04c 100644
--- a/projects/release/update_responses_config.yml
+++ b/projects/release/update_responses_config.yml
@@ -48,6 +48,7 @@ versions:
win64:
minSupportedOSVersion: 6.1
[% IF c("var/release") -%]
+ mar_compression: xz
mar_compression: bzip2
[% ELSE -%]
mar_compression: xz
1
0

[tor-browser-build/maint-8.0] Bug 27182: set mar_compression to xz for 8.0.1 release
by gk@torproject.org 06 Sep '18
by gk@torproject.org 06 Sep '18
06 Sep '18
commit e16754013b11c941efe92f19ff2b041fffca8906
Author: Nicolas Vigier <boklm(a)torproject.org>
Date: Mon Sep 3 11:47:03 2018 +0200
Bug 27182: set mar_compression to xz for 8.0.1 release
---
projects/release/update_responses_config.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/projects/release/update_responses_config.yml b/projects/release/update_responses_config.yml
index d1ed52f..8cac04c 100644
--- a/projects/release/update_responses_config.yml
+++ b/projects/release/update_responses_config.yml
@@ -48,6 +48,7 @@ versions:
win64:
minSupportedOSVersion: 6.1
[% IF c("var/release") -%]
+ mar_compression: xz
mar_compression: bzip2
[% ELSE -%]
mar_compression: xz
1
0

06 Sep '18
commit 8955afc1fb84a191268219b7f4c28050585b791a
Author: Nicolas Vigier <boklm(a)torproject.org>
Date: Fri Aug 17 11:21:22 2018 +0200
Bug 27179: update mar_compression
Set mar_compression to xz for the alpha, and bzip2 for the stable.
---
projects/release/update_responses_config.yml | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/projects/release/update_responses_config.yml b/projects/release/update_responses_config.yml
index 90fbc3a..d1ed52f 100644
--- a/projects/release/update_responses_config.yml
+++ b/projects/release/update_responses_config.yml
@@ -47,10 +47,11 @@ versions:
minSupportedOSVersion: 6.1
win64:
minSupportedOSVersion: 6.1
-[% IF ! c("var/release") -%]
- mar_compression: xz
-[% END -%]
+[% IF c("var/release") -%]
mar_compression: bzip2
+[% ELSE -%]
+mar_compression: xz
+[% END -%]
htaccess_rewrite_rules:
alpha: |
# bug 26569: Redirect pre-8.0a9 alpha users to a separate update directory
1
0

[tor-browser-build/maint-8.0] Merge remote-tracking branch 'boklm/bug_27182' into maint-8.0
by gk@torproject.org 06 Sep '18
by gk@torproject.org 06 Sep '18
06 Sep '18
commit 80410afe4226a0a20feb5f9470e33ae31f1e9f8d
Merge: eea6a6a e167540
Author: Georg Koppen <gk(a)torproject.org>
Date: Thu Sep 6 10:17:42 2018 +0000
Merge remote-tracking branch 'boklm/bug_27182' into maint-8.0
projects/release/update_responses_config.yml | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
1
0

[tor-browser-build/master] Bug 26411: Stop using old MAR format in the second esr60-based stable release
by gk@torproject.org 06 Sep '18
by gk@torproject.org 06 Sep '18
06 Sep '18
commit 12d52de1efe093b75a434a10ff0fb8f48fec2858
Author: Nicolas Vigier <boklm(a)torproject.org>
Date: Wed Aug 29 17:43:32 2018 +0200
Bug 26411: Stop using old MAR format in the second esr60-based stable release
---
Makefile | 6 +++---
projects/tor-browser/build | 5 -----
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/Makefile b/Makefile
index b667960..4c21a83 100644
--- a/Makefile
+++ b/Makefile
@@ -113,7 +113,7 @@ signtag-alpha: submodule-update
incrementals-release: submodule-update
$(rbm) build release --step update_responses_config --target release --target create_unsigned_incrementals
tools/update-responses/download_missing_versions release
- MAR_OLD_FORMAT=1 tools/update-responses/gen_incrementals release
+ tools/update-responses/gen_incrementals release
$(rbm) build release --step hash_incrementals --target release
incrementals-alpha: submodule-update
@@ -132,9 +132,9 @@ update_responses-alpha: submodule-update
dmg2mar-release: submodule-update
$(rbm) build release --step update_responses_config --target release --target signed
- MAR_OLD_FORMAT=1 $(rbm) build release --step dmg2mar --target release --target signed
+ $(rbm) build release --step dmg2mar --target release --target signed
tools/update-responses/download_missing_versions release
- CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 MAR_OLD_FORMAT=1 tools/update-responses/gen_incrementals release
+ CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 tools/update-responses/gen_incrementals release
dmg2mar-alpha: submodule-update
$(rbm) build release --step update_responses_config --target alpha --target signed
diff --git a/projects/tor-browser/build b/projects/tor-browser/build
index 7211841..4c228a9 100644
--- a/projects/tor-browser/build
+++ b/projects/tor-browser/build
@@ -274,11 +274,6 @@ popd
cd $distdir
[% IF c("var/build_mar") -%]
- [% IF c("var/release") -%]
- # Let's use the bzip2 format for now so that users can update to the first
- # esr60-based Tor Browser.
- export MAR_OLD_FORMAT=1
- [% END -%]
# Create full MAR file and compressed package.
MAR_FILE=tor-browser-[% c("var/mar_osname") %]-[% c("var/torbrowser_version") %]_${PKG_LOCALE}.mar
MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff $MARTOOLS/make_full_update.sh -q $OUTDIR/$MAR_FILE "$TBDIR"
1
0

[tor-browser-build/maint-8.0] Bug 26411: Stop using old MAR format in the second esr60-based stable release
by gk@torproject.org 06 Sep '18
by gk@torproject.org 06 Sep '18
06 Sep '18
commit eea6a6af8765bf1781515fb813a6860ece96fee5
Author: Nicolas Vigier <boklm(a)torproject.org>
Date: Wed Aug 29 17:43:32 2018 +0200
Bug 26411: Stop using old MAR format in the second esr60-based stable release
---
Makefile | 6 +++---
projects/tor-browser/build | 5 -----
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/Makefile b/Makefile
index b667960..4c21a83 100644
--- a/Makefile
+++ b/Makefile
@@ -113,7 +113,7 @@ signtag-alpha: submodule-update
incrementals-release: submodule-update
$(rbm) build release --step update_responses_config --target release --target create_unsigned_incrementals
tools/update-responses/download_missing_versions release
- MAR_OLD_FORMAT=1 tools/update-responses/gen_incrementals release
+ tools/update-responses/gen_incrementals release
$(rbm) build release --step hash_incrementals --target release
incrementals-alpha: submodule-update
@@ -132,9 +132,9 @@ update_responses-alpha: submodule-update
dmg2mar-release: submodule-update
$(rbm) build release --step update_responses_config --target release --target signed
- MAR_OLD_FORMAT=1 $(rbm) build release --step dmg2mar --target release --target signed
+ $(rbm) build release --step dmg2mar --target release --target signed
tools/update-responses/download_missing_versions release
- CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 MAR_OLD_FORMAT=1 tools/update-responses/gen_incrementals release
+ CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 tools/update-responses/gen_incrementals release
dmg2mar-alpha: submodule-update
$(rbm) build release --step update_responses_config --target alpha --target signed
diff --git a/projects/tor-browser/build b/projects/tor-browser/build
index 5456ad1..219f622 100644
--- a/projects/tor-browser/build
+++ b/projects/tor-browser/build
@@ -266,11 +266,6 @@ popd
cd $distdir
[% IF c("var/build_mar") -%]
- [% IF c("var/release") -%]
- # Let's use the bzip2 format for now so that users can update to the first
- # esr60-based Tor Browser.
- export MAR_OLD_FORMAT=1
- [% END -%]
# Create full MAR file and compressed package.
MAR_FILE=tor-browser-[% c("var/mar_osname") %]-[% c("var/torbrowser_version") %]_${PKG_LOCALE}.mar
MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff $MARTOOLS/make_full_update.sh -q $OUTDIR/$MAR_FILE "$TBDIR"
1
0
commit ad725d869fda953775dc889d40f8a96a8391ff07
Author: Georg Koppen <gk(a)torproject.org>
Date: Thu Sep 6 10:03:01 2018 +0000
Fix typo in Changelog
---
projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index 693a713..7c33834 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -36,7 +36,7 @@ Tor Browser 8.5a1 -- September 5 2018
* Bug 27221: Purge startup cache if Tor Browser version changed
* Bug 26049: Reduce delay for showing update prompt to 1 hour
* Bug 25405: Cannot use Moat if a meek bridge is configured
- * Bug 27268+27257+27262+26603 : Preferences clean-up
+ * Bug 27268+27257+27262+26603: Preferences clean-up
* Windows
* Bug 26381: Work around endless loop during page load and about:tor not loading
* Bug 27411: Fix broken security slider and NoScript interaction on Windows
1
0

[tor-browser/tor-browser-60.2.0esr-8.5-1] Bug 27472 - Export MOZILLA_OFFICIAL during Android build
by gk@torproject.org 05 Sep '18
by gk@torproject.org 05 Sep '18
05 Sep '18
commit bd090e4ef466374ca3c231efa350159f7c0ab96c
Author: Matthew Finkel <Matthew.Finkel(a)gmail.com>
Date: Wed Sep 5 13:38:09 2018 +0000
Bug 27472 - Export MOZILLA_OFFICIAL during Android build
---
.mozconfig-android | 1 +
1 file changed, 1 insertion(+)
diff --git a/.mozconfig-android b/.mozconfig-android
index efcb1c5415c2..45270689fbcd 100755
--- a/.mozconfig-android
+++ b/.mozconfig-android
@@ -1,6 +1,7 @@
mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-arm-linux-androideabi
mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser"
mk_add_options MOZILLA_OFFICIAL=1
+export MOZILLA_OFFICIAL=1
ac_add_options --enable-optimize
ac_add_options --enable-official-branding
1
0

[tor-browser/tor-browser-60.2.0esr-8.5-1] Bug 27400 - Target Android API 26
by gk@torproject.org 05 Sep '18
by gk@torproject.org 05 Sep '18
05 Sep '18
commit 641dea421ec41553993b92d79a98394ae541f476
Author: Matthew Finkel <Matthew.Finkel(a)gmail.com>
Date: Tue Sep 4 21:59:41 2018 +0000
Bug 27400 - Target Android API 26
---
old-configure.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/old-configure.in b/old-configure.in
index b740691ab080..6ee9edb5b551 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -2084,7 +2084,7 @@ dnl ========================================================
case "$MOZ_BUILD_APP" in
mobile/android)
- MOZ_ANDROID_SDK(23, 23, 26.0.2, 26.0.0 26.0.0-dev 25.3.2 25.3.1)
+ MOZ_ANDROID_SDK(26, 26, 26.0.2, 26.0.0 26.0.0-dev 25.3.2 25.3.1)
;;
esac
1
0

[tor-browser/tor-browser-60.2.0esr-8.5-1] Bug 27473 - Change app name on Android for Alpha version
by gk@torproject.org 05 Sep '18
by gk@torproject.org 05 Sep '18
05 Sep '18
commit 3abcd666a37fcf11c3ba01cd628ccd086be5de37
Author: Matthew Finkel <Matthew.Finkel(a)gmail.com>
Date: Wed Sep 5 14:00:01 2018 +0000
Bug 27473 - Change app name on Android for Alpha version
---
mobile/android/branding/torbrowser/configure.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/mobile/android/branding/torbrowser/configure.sh b/mobile/android/branding/torbrowser/configure.sh
index 79b7e718cbfd..5e2dbfc15cf9 100644
--- a/mobile/android/branding/torbrowser/configure.sh
+++ b/mobile/android/branding/torbrowser/configure.sh
@@ -2,7 +2,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-ANDROID_PACKAGE_NAME=org.torproject.torbrowser
-MOZ_APP_DISPLAYNAME="Tor Browser for Android"
+ANDROID_PACKAGE_NAME=org.torproject.torbrowser_alpha
+MOZ_APP_DISPLAYNAME="Tor Browser for Android (Alpha)"
MOZ_UPDATER=
MOZ_ANDROID_ANR_REPORTER=
1
0

[tor-browser/tor-browser-60.2.0esr-8.5-1] Bug 1479311 - Don't attempt finding and highlighting a tab's base domain within a javascript: URL. r=snorp
by gk@torproject.org 05 Sep '18
by gk@torproject.org 05 Sep '18
05 Sep '18
commit 4b66110d0704227ee7e90b7adb092da2d3bf0ac5
Author: Jan Henning <jh+bugzilla(a)buttercookie.de>
Date: Fri Aug 3 20:58:46 2018 +0200
Bug 1479311 - Don't attempt finding and highlighting a tab's base domain within a javascript: URL. r=snorp
MozReview-Commit-ID: DzE0UJfMcCI
--HG--
extra : rebase_source : 2a9bcc74447a8a2862aa3c753f7bd30e1d0361dc
---
.../src/photon/java/org/mozilla/gecko/toolbar/ToolbarDisplayLayout.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mobile/android/app/src/photon/java/org/mozilla/gecko/toolbar/ToolbarDisplayLayout.java b/mobile/android/app/src/photon/java/org/mozilla/gecko/toolbar/ToolbarDisplayLayout.java
index f7f237eab1cc..9e8e1041027a 100644
--- a/mobile/android/app/src/photon/java/org/mozilla/gecko/toolbar/ToolbarDisplayLayout.java
+++ b/mobile/android/app/src/photon/java/org/mozilla/gecko/toolbar/ToolbarDisplayLayout.java
@@ -335,7 +335,7 @@ public class ToolbarDisplayLayout extends ThemedLinearLayout {
}
int index = url.indexOf(baseDomain);
- if (index == -1) {
+ if (index == -1 || url.startsWith("javascript:")) {
setTitle(url);
return;
}
1
0

03 Sep '18
commit f237614a4a08f3fa575cb06f0cdd69006a117b8f
Author: Georg Koppen <gk(a)torproject.org>
Date: Mon Sep 3 09:35:52 2018 +0000
Release preparations for 8.5a1
Version bumps
---
projects/firefox/config | 4 ++--
projects/tor-launcher/config | 2 +-
projects/tor/config | 2 +-
rbm.conf | 6 +++---
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/projects/firefox/config b/projects/firefox/config
index 124de7a..8ebbd4f 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -1,7 +1,7 @@
# vim: filetype=yaml sw=2
version: '[% c("abbrev") %]'
filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]'
-git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build3'
+git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1'
tag_gpg_id: 1
git_url: https://git.torproject.org/tor-browser.git
gpg_keyring: torbutton.gpg
@@ -9,7 +9,7 @@ gpg_keyring: torbutton.gpg
var:
firefox_platform_version: 60.2.0
firefox_version: '[% c("var/firefox_platform_version") %]esr'
- torbrowser_branch: 8.0
+ torbrowser_branch: 8.5
torbrowser_update_channel: alpha
copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]'
deps:
diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config
index 19f16bb..c5ddc0a 100644
--- a/projects/tor-launcher/config
+++ b/projects/tor-launcher/config
@@ -1,5 +1,5 @@
# vim: filetype=yaml sw=2
-version: 0.2.16.3
+version: 0.2.16.4
git_url: https://git.torproject.org/tor-launcher.git
git_hash: '[% c("version") %]'
gpg_keyring: torbutton.gpg
diff --git a/projects/tor/config b/projects/tor/config
index aeea5e0..c1a3878 100644
--- a/projects/tor/config
+++ b/projects/tor/config
@@ -1,6 +1,6 @@
# vim: filetype=yaml sw=2
filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]'
-version: 0.3.3.9
+version: 0.3.4.7-rc
git_hash: 'tor-[% c("version") %]'
git_url: https://git.torproject.org/tor.git
git_submodule: 1
diff --git a/rbm.conf b/rbm.conf
index 5cc88e4..cbbbf64 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -15,10 +15,10 @@ buildconf:
git_signtag_opt: '-s'
var:
- torbrowser_version: '8.0'
- torbrowser_build: 'build5'
+ torbrowser_version: '8.5a1'
+ torbrowser_build: 'build1'
torbrowser_incremental_from:
- - 7.5.6
+ - 8.0a10
project_name: tor-browser
multi_lingual: 0
build_mar: 1
1
0

03 Sep '18
commit b58707432f5120b1627964dfdea8feefbe605871
Author: Georg Koppen <gk(a)torproject.org>
Date: Mon Sep 3 09:33:13 2018 +0000
Updating changelog for 8.5a1; typo fixes
---
.../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 55 ++++++++++++++++++++--
1 file changed, 51 insertions(+), 4 deletions(-)
diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index c46f139..693a713 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,50 @@
+Tor Browser 8.5a1 -- September 5 2018
+ * All platforms
+ * Update Firefox to 60.2.0esr
+ * Update Tor to 0.3.4.7-rc
+ * Update OpenSSL to 1.0.2p
+ * Update Torbutton to 2.0.6
+ * Bug 27401: Start listening for NoScript before it loads
+ * Bug 27276: Adapt to new NoScript messaging protocol
+ * Bug 26884: Use Torbutton to provide security slider on mobile
+ * Bug 26962: Circuit display onboarding
+ * Bug 26520: Fix sec slider/NoScript for TOR_SKIP_LAUNCH=1
+ * Bug 26490: Remove the security slider notification
+ * Bug 27301: Improve about:tor behavior and appearance
+ * Bug 27097: Add text for Tor News signup widget
+ * Bug 27214: Improve the onboarding text
+ * Translations update
+ * Update Tor Launcher to 0.2.16.4
+ * Bug 25405: Cannot use Moat if a meek bridge is configured
+ * Bug 27392: Update Moat URLs
+ * Translations update
+ * Update HTTPS Everywhere to 2018.8.22
+ * Update NoScript to 10.1.9.1
+ * Bug 26962: New feature onboarding
+ * Bug 27403: The onboarding bubble is not always displayed
+ * Bug 27283: Fix first-party isolation for UI tour
+ * Bug 27213: Update about:tbupdate to new (about:tor) layout
+ * Bug 26670: Make canvas permission prompt respect first-party isolation
+ * Bug 26561: .onion images are not displayed
+ * Bug 21787: Spoof en-US for date picker
+ * Bug 21607: Disable WebVR for now until it is properly audited
+ * Bug 21549: Disable wasm for now until it is properly audited
+ * Bug 26614: Disable Web Authentication API until it is properly audited
+ * Bug 27281: Enable Reader View mode again
+ * Bug 26114: Don't expose navigator.mozAddonManager to websites
+ * Bug 26048: Fix potentially confusing "restart to update" message
+ * Bug 27221: Purge startup cache if Tor Browser version changed
+ * Bug 26049: Reduce delay for showing update prompt to 1 hour
+ * Bug 25405: Cannot use Moat if a meek bridge is configured
+ * Bug 27268+27257+27262+26603 : Preferences clean-up
+ * Windows
+ * Bug 26381: Work around endless loop during page load and about:tor not loading
+ * Bug 27411: Fix broken security slider and NoScript interaction on Windows
+ * Build System
+ * All Platforms
+ * Bug 27061: Enable verification of langpacks checksums
+ * Bug 27178+27179: Add support for xz compression in mar files
+
Tor Browser 8.0 -- September 5 2018
* All platforms
* Update Firefox to 60.2.0esr
@@ -131,13 +178,13 @@ Tor Browser 8.0 -- September 5 2018
* Bug 20283: Tor Browser should run without a `/proc` filesystem.
* Bug 26354: Set SSE2 support as minimal requirement for Tor Browser 8
* Build System
- * All
+ * All Platforms
* Bug 26362+26410: Use old MAR format for first ESR60-based stable
* Bug 27020: RBM build fails with runc version 1.0.1
* Bug 26949: Use GitHub repository for STIX
* Bug 26773: Add --verbose to the ./mach build flag for firefox
* Bug 26319: Don't package up Tor Browser in the `mach package` step
- * Bug 27178: add support for xz compression in mar files
+ * Bug 27178: Add support for xz compression in mar files
* Clean up
* Windows
* Bug 26203: Adapt tor-browser-build/tor-browser for Windows
@@ -232,7 +279,7 @@ Tor Browser 8.0a10 -- August 20 2018
* Bug 26951+18022: Fix execdesktop argument passing
* Bug 26795: Bump snowflake to 6077141f4a for bug 25600
* Build System
- * All
+ * All Platforms
* Bug 26410: Stop using old MAR format in the alpha series
* Bug 27020: RBM build fails with runc version 1.0.1
* Bug 26949: Use GitHub repository for STIX
@@ -303,7 +350,7 @@ Tor Browser 8.0a9 -- June 27 2018
* Bug 22242: Remove RUNPATH in Linux binaries embedded by selfrando
* Bug 26354: Set SSE2 support as minimal requirement for Tor Browser 8
* Build System
- * All
+ * All Platforms
* Bug 26362: Use old MAR format for first ESR60-based alpha
* Clean up
* Windows
1
0

[tor-browser-build/master] Bug 25405: cannot use Moat if a meek bridge is configured
by gk@torproject.org 03 Sep '18
by gk@torproject.org 03 Sep '18
03 Sep '18
commit 98da9295f4f97a022c7131de7234893d0a6293de
Author: Kathy Brade <brade(a)pearlcrescent.com>
Date: Mon Mar 26 21:10:44 2018 +0000
Bug 25405: cannot use Moat if a meek bridge is configured
When doing Moat things, use a separate profile for the secondary browser
(instead of trying to use the main meek helper profile).
---
projects/tor-browser/build | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/projects/tor-browser/build b/projects/tor-browser/build
index 5456ad1..7211841 100644
--- a/projects/tor-browser/build
+++ b/projects/tor-browser/build
@@ -34,6 +34,7 @@ touch "$GENERATEDPREFSPATH"
EXTSPATH=TorBrowser/Data/Browser/profile.default/extensions
TORCONFIGPATH=TorBrowser/Data/Tor
MEEKPROFILEPATH=TorBrowser/Data/Browser/profile.meek-http-helper
+ MOATPROFILEPATH=TorBrowser/Data/Browser/profile.moat-http-helper
mkdir -p "$TBDIR/TorBrowser/Data/Browser/Caches"
[% END %]
@@ -144,6 +145,13 @@ cat Bundle-Data/PTConfigs/meek-http-helper-user.js >> "$TBDIR/$MEEKPROFILEPATH/u
popd
[% END %]
+# For platforms for which we need to ship a Moat helper profile in addition
+# to a meek one, create it by duplicating the meek one that we just finished
+# creating.
+if [ ! -z "$MOATPROFILEPATH" ]; then
+ cp -pR $TBDIR/$MEEKPROFILEPATH $TBDIR/$MOATPROFILEPATH
+fi
+
[% IF ! c("var/multi_lingual") %]
echo 'pref("extensions.torlauncher.prompt_for_locale", false);' >> "$GENERATEDPREFSPATH"
[% END %]
1
0
commit ca35ed6bfbc779d51e62caca5b342b4d7290abea
Author: Georg Koppen <gk(a)torproject.org>
Date: Mon Sep 3 09:00:25 2018 +0000
Version bump for 0.2.16.4
---
src/install.rdf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/install.rdf b/src/install.rdf
index bb5ab52..fc8dc41 100644
--- a/src/install.rdf
+++ b/src/install.rdf
@@ -7,7 +7,7 @@
<em:creator>The Tor Project, Inc.</em:creator>
<em:contributor>Pearl Crescent, LLC</em:contributor>
<em:id>tor-launcher(a)torproject.org</em:id>
- <em:version>0.2.16.3</em:version>
+ <em:version>0.2.16.4</em:version>
<em:multiprocessCompatible>true</em:multiprocessCompatible>
<em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL>
<em:updateURL>data:text/plain,</em:updateURL>
1
0
commit 8a28a3cfa0e8dfa9ec031c298c789388fcd4693a
Author: Georg Koppen <gk(a)torproject.org>
Date: Mon Sep 3 08:59:11 2018 +0000
Translations update
---
src/chrome/locale/hi/network-settings.dtd | 66 ++++++++--------
src/chrome/locale/hi/torlauncher.properties | 114 ++++++++++++++--------------
src/chrome/locale/ru/network-settings.dtd | 8 +-
3 files changed, 94 insertions(+), 94 deletions(-)
diff --git a/src/chrome/locale/hi/network-settings.dtd b/src/chrome/locale/hi/network-settings.dtd
index 702a1fb..35916b5 100644
--- a/src/chrome/locale/hi/network-settings.dtd
+++ b/src/chrome/locale/hi/network-settings.dtd
@@ -1,7 +1,7 @@
<!ENTITY torsettings.dialog.title "टोर संजाल व्यवस्था">
-<!ENTITY torsettings.wizard.title.default "Connect to Tor">
+<!ENTITY torsettings.wizard.title.default "टोर से कनेक्ट करें">
<!ENTITY torsettings.wizard.title.configure "टोर संजाल व्यवस्था">
-<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">
+<!ENTITY torsettings.wizard.title.connecting "एक कनेक्शन की स्थापना">
<!-- For locale picker: -->
<!ENTITY torlauncher.localePicker.title "टोर विचरक भाषा ">
@@ -9,54 +9,54 @@
<!-- For "first run" wizard: -->
-<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor.">
-<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy.">
-<!ENTITY torSettings.configure "Configure">
+<!ENTITY torSettings.connectPrompt "टोर से कनेक्ट करने के लिए "कनेक्ट" पर क्लिक करें।">
+<!ENTITY torSettings.configurePrompt "नेटवर्क सेटिंग्स को समायोजित करने के लिए "कॉन्फ़िगर करें" पर क्लिक करें यदि आप ऐसे देश में हैं जो सेंसर टोर (जैसे मिस्र, चीन, तुर्की) या यदि आप किसी ऐसे निजी नेटवर्क से कनेक्ट हो रहे हैं जिसके लिए प्रॉक्सी की आवश्यकता है।">
+<!ENTITY torSettings.configure "कॉन्फ़िगर">
<!ENTITY torSettings.connect "जोड़ें">
<!-- Other: -->
-<!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restartTor "Restart Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
+<!ENTITY torsettings.startingTor "टोर शुरू करने की प्रतीक्षा कर रहा है ...">
+<!ENTITY torsettings.restartTor "टोर पुनरारंभ करें">
+<!ENTITY torsettings.reconfigTor "पुन: कॉन्फ़िगर">
-<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed.">
-<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
+<!ENTITY torsettings.discardSettings.prompt "आपने टोर ब्रिड्जस को कॉन्फ़िगर किया है या आपने स्थानीय प्रॉक्सी सेटिंग्स   दर्ज की हैं। टोर नेटवर्क से सीधा कनेक्शन बनाने के लिए, इन सेटिंग्स को हटा दिया जाना चाहिए।">
+<!ENTITY torsettings.discardSettings.proceed "सेटिंग्स हटाएँ और कनेक्ट करें">
-<!ENTITY torsettings.optional "Optional">
+<!ENTITY torsettings.optional "ऐच्छिक">
-<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!ENTITY torsettings.useProxy.type "Proxy Type:">
-<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
+<!ENTITY torsettings.useProxy.checkbox "मैं इंटरनेट से कनेक्ट करने के लिए प्रॉक्सी का उपयोग करता हूं">
+<!ENTITY torsettings.useProxy.type "प्रॉक्सी प्रकार:">
+<!ENTITY torsettings.useProxy.type.placeholder "प्रॉक्सी प्रकार का चयन करें">
<!ENTITY torsettings.useProxy.address "पता :">
-<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
+<!ENTITY torsettings.useProxy.address.placeholder "IP पता या मेजबाननाम">
<!ENTITY torsettings.useProxy.port "पोर्ट/द्वार :">
-<!ENTITY torsettings.useProxy.username "Username:">
-<!ENTITY torsettings.useProxy.password "Password:">
+<!ENTITY torsettings.useProxy.username "उपयोगकर्ता नाम">
+<!ENTITY torsettings.useProxy.password "पासवर्ड">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
-<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
-<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
-<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
-<!ENTITY torsettings.useBridges.default "Select a built-in bridge">
-<!ENTITY torsettings.useBridges.default.placeholder "select a bridge">
-<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org">
-<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image">
-<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge">
+<!ENTITY torsettings.firewall.checkbox "यह कंप्यूटर फ़ायरवॉल के माध्यम से जाता है जो केवल कुछ पोर्ट्स के कनेक्शन की अनुमति देता है...">
+<!ENTITY torsettings.firewall.allowedPorts "अनुमति प्राप्त पोर्ट्स ">
+<!ENTITY torsettings.useBridges.checkbox "टोर मेरे देश में सेंसर किया गया है">
+<!ENTITY torsettings.useBridges.default "एक अंतर्निर्मित पुल का चयन करें">
+<!ENTITY torsettings.useBridges.default.placeholder "एक पुल का चयन करें">
+<!ENTITY torsettings.useBridges.bridgeDB "Torproject.org से एक पुल का अनुरोध करें">
+<!ENTITY torsettings.useBridges.captchaSolution.placeholder "छवि से अक्षर दर्ज करें">
+<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "एक नई चुनौती प्राप्त करें">
<!ENTITY torsettings.useBridges.captchaSubmit "जमा करें">
-<!ENTITY torsettings.useBridges.custom "Provide a bridge I know">
-<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source.">
+<!ENTITY torsettings.useBridges.custom "एक पुल प्रदान करें जो मुझे पता है">
+<!ENTITY torsettings.useBridges.label "एक विश्वसनीय स्रोत से पुल जानकारी दर्ज करें।">
<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)">
-<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
+<!ENTITY torsettings.copyLog "क्लिपबोर्ड पर टोर लॉग कॉपी करें">
-<!ENTITY torsettings.proxyHelpTitle "Proxy Help">
-<!ENTITY torsettings.proxyHelp1 "A local proxy might be needed when connecting through a company, school, or university network. If you are not sure whether a proxy is needed, look at the Internet settings in another browser or check your system's network settings.">
+<!ENTITY torsettings.proxyHelpTitle "प्रॉक्सी मदद">
+<!ENTITY torsettings.proxyHelp1 "किसी कंपनी, स्कूल या विश्वविद्यालय नेटवर्क   से कनेक्ट करते समय स्थानीय प्रॉक्सी की आवश्यकता हो सकती है। यदि आप सुनिश्चित नहीं हैं कि प्रॉक्सी की आवश्यकता है, तो किसी अन्य ब्राउज़र में इंटरनेट सेटिंग्स देखें या अपने सिस्टम की नेटवर्क सेटिंग्स जांचें।">
-<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
-<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor.">
-<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">
+<!ENTITY torsettings.bridgeHelpTitle "ब्रिज रिले सहायता">
+<!ENTITY torsettings.bridgeHelp1 "पुल असूचीबद्ध रिले हैं जो टोर नेटवर्क   से कनेक्शन को अवरुद्ध करना अधिक कठिन बनाते हैं। सेंसरशिप से बचने के लिए प्रत्येक प्रकार का पुल एक अलग विधि का उपयोग करता है।   Obfs वाले लोग आपके ट्रैफ़िक को यादृच्छिक शोर की तरह दिखते हैं, और नम्र लोग आपके ट्रैफिक को टोर के बजाय उस सेवा से कनेक्ट करने की तरह दिखते हैं।">
+<!ENTITY torsettings.bridgeHelp2 "कुछ देशों में कुछ पुल काम करते हैं, लेकिन अन्य   नहीं, क्योंकि कुछ देशों ने टोर को अवरुद्ध करने का प्रयास किया है। यदि आप अनिश्चित हैं कि आपके देश में कौन से पुल काम करते हैं, तो torproject.org/about/contact.html#support पर जाएं">
<!-- Progress -->
<!ENTITY torprogress.pleaseWait "कुछ देर रुकिए। हम टोर की संजाल से जुड़ रहे हैं। कुछ मिनट लग सकते हैं।">
diff --git a/src/chrome/locale/hi/torlauncher.properties b/src/chrome/locale/hi/torlauncher.properties
index 8bda3da..d530ccb 100644
--- a/src/chrome/locale/hi/torlauncher.properties
+++ b/src/chrome/locale/hi/torlauncher.properties
@@ -1,78 +1,78 @@
### Copyright (c) 2016, The Tor Project, Inc.
### See LICENSE for licensing information.
-torlauncher.error_title=Tor Launcher
+torlauncher.error_title=टोर लॉन्चर
-torlauncher.tor_exited_during_startup=Tor exited during startup. This might be due to an error in your torrc file, a bug in Tor or another program on your system, or faulty hardware. Until you fix the underlying problem and restart Tor, Tor Browser will not start.
-torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
-torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
-torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
-torlauncher.tor_failed_to_start=Tor failed to start.
-torlauncher.tor_control_failed=Failed to take control of Tor.
-torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
-torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
+torlauncher.tor_exited_during_startup=टोर स्टार्टअप के दौरान बाहर निकला। यह आपकी torrc फ़ाइल में त्रुटि, आपके सिस्टम पर टोर या किसी अन्य प्रोग्राम में एक बग, या दोषपूर्ण हार्डवेयर के कारण हो सकता है। जब तक आप अंतर्निहित समस्या को ठीक नहीं करते हैं और टोर को पुनरारंभ नहीं करते हैं, तो Tor ब्राउज़र शुरू नहीं होगा।
+torlauncher.tor_exited=टोर अप्रत्याशित रूप से बाहर निकला। यह टोर में एक बग, आपके सिस्टम पर एक और प्रोग्राम, या दोषपूर्ण हार्डवेयर के कारण हो सकता है। जब तक आप टोर को पुनरारंभ नहीं करते हैं, तो टोर ब्राउज़र किसी भी वेबसाइट तक नहीं पहुंच पाएगा। अगर समस्या बनी रहती है, तो कृपया समर्थन टीम में अपने टोर लॉग की एक प्रति भेजें।
+torlauncher.tor_exited2=टॉर को पुनरारंभ करना आपके ब्राउज़र टैब को बंद नहीं करेगा।
+torlauncher.tor_controlconn_failed=टोर कंट्रोल पोर्ट से कनेक्ट नहीं हो सका।
+torlauncher.tor_failed_to_start=टोर शुरू होने में विफल रहा।
+torlauncher.tor_control_failed=टोर पर नियंत्रण करने में विफल
+torlauncher.tor_bootstrap_failed=टोर नेटवर्क कनेक्शन स्थापित करने में विफल रहा।
+torlauncher.tor_bootstrap_failed_details=%1$S विफल रहा (%2$S)
-torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
-torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing and could not be created.
-torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
-torlauncher.password_hash_missing=Failed to get hashed password.
+torlauncher.unable_to_start_tor=टोर शुरू करने में असमर्थ\n\n%S
+torlauncher.tor_missing=Tor exe फ़ाइल गुम है।
+torlauncher.torrc_missing=Torrc फ़ाइल गुम है और बनाया नहीं जा सका।
+torlauncher.datadir_missing=टोर डेटा निर्देशिका मौजूद नहीं है और बनाया नहीं जा सका।
+torlauncher.password_hash_missing=हैश पासवर्ड प्राप्त करने में विफल।
-torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
-torlauncher.failed_to_save_settings=Unable to save Tor settings.\n\n%S
-torlauncher.ensure_tor_is_running=Please ensure that Tor is running.
+torlauncher.failed_to_get_settings=टोर सेटिंग्स को पुनः प्राप्त करने में असमर्थ।\n\n%S
+torlauncher.failed_to_save_settings=टोर सेटिंग्स को सहेजने में असमर्थ।\n\n%S
+torlauncher.ensure_tor_is_running=कृपया सुनिश्चित करें कि टोर चल रहा है।
-torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
-torlauncher.error_proxy_type_missing=You must select the proxy type.
-torlauncher.error_bridges_missing=You must specify one or more bridges.
-torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges.
-torlauncher.error_bridgedb_bridges_missing=Please request a bridge.
-torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings.
+torlauncher.error_proxy_addr_missing=इंटरनेट का उपयोग करने के लिए प्रॉक्सी का उपयोग करने के लिए आपको टोर को कॉन्फ़िगर करने के लिए आपको एक आईपी पता या होस्टनाम और पोर्ट नंबर दोनों निर्दिष्ट करना होगा।
+torlauncher.error_proxy_type_missing=आपको प्रॉक्सी प्रकार का चयन करना होगा।
+torlauncher.error_bridges_missing=आपको एक या अधिक पुल निर्दिष्ट करना होगा।
+torlauncher.error_default_bridges_type_missing=आपको प्रदान किए गए पुलों के लिए एक परिवहन प्रकार का चयन करना होगा।
+torlauncher.error_bridgedb_bridges_missing=कृपया एक पुल का अनुरोध करें।
+torlauncher.error_bridge_bad_default_type=कोई भी पुल नहीं है जिसमें परिवहन प्रकार %S उपलब्ध है। कृपया अपनी सेटिंग्स को समायोजित करें।
-torlauncher.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
+torlauncher.bridge_suffix.meek-amazon=(चीन में काम करता है)
+torlauncher.bridge_suffix.meek-azure=(चीन में काम करता है)
-torlauncher.request_a_bridge=Request a Bridge…
-torlauncher.request_a_new_bridge=Request a New Bridge…
-torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait.
-torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge.
-torlauncher.bad_captcha_solution=The solution is not correct. Please try again.
-torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S
-torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges.
-torlauncher.no_bridges_available=No bridges are available at this time. Sorry.
+torlauncher.request_a_bridge=एक पुल का अनुरोध करें ...
+torlauncher.request_a_new_bridge=एक नए पुल का अनुरोध करें ...
+torlauncher.contacting_bridgedb=BridgeDB से संपर्क किया जा रहा है।कृपया प्रतीक्षा करें।
+torlauncher.captcha_prompt=पुल का अनुरोध करने के लिए कैप्चा को हल करें।
+torlauncher.bad_captcha_solution=समाधान सही नहीं है। कृपया पुन: प्रयास करें।
+torlauncher.unable_to_get_bridge=BridgeDB से पुल प्राप्त करने में असमर्थ।\n\n% S
+torlauncher.no_meek=यह ब्राउज़र मीक के लिए कॉन्फ़िगर नहीं किया गया है, जो पुलों को प्राप्त करने के लिए आवश्यक है।
+torlauncher.no_bridges_available=इस समय कोई पुल उपलब्ध नहीं है। माफ़ कीजिये।
torlauncher.connect=जोड़ें
-torlauncher.restart_tor=Restart Tor
+torlauncher.restart_tor=टोर पुनरारंभ करें
torlauncher.quit=छोड़ें
torlauncher.quit_win=बाहर
torlauncher.done=सम्पन्न
-torlauncher.forAssistance=For assistance, contact %S
-torlauncher.forAssistance2=For assistance, visit %S
+torlauncher.forAssistance=सहायता के लिए, %S से संपर्क करें
+torlauncher.forAssistance2=सहायता के लिए, %S पर जाएं
-torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+torlauncher.copiedNLogMessages=कॉपी कॉपी करें। %S टोर लॉग संदेश टेक्स्ट एडिटर या ईमेल संदेश में चिपकने के लिए तैयार हैं।
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
-torlauncher.bootstrapStatus.requesting_status=Retrieving network status
-torlauncher.bootstrapStatus.loading_status=Loading network status
-torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
-torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
-torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
+torlauncher.bootstrapStatus.conn_dir=एक रिले निर्देशिका से कनेक्ट कर रहा है
+torlauncher.bootstrapStatus.handshake_dir=एक एन्क्रिप्टेड निर्देशिका कनेक्शन स्थापित किया जा रहा है
+torlauncher.bootstrapStatus.requesting_status=नेटवर्क की स्थिति को पुनः प्राप्त करना
+torlauncher.bootstrapStatus.loading_status=नेटवर्क स्थिति लोड हो रहा है
+torlauncher.bootstrapStatus.loading_keys=प्राधिकरण प्रमाण पत्र लोड हो रहा है
+torlauncher.bootstrapStatus.requesting_descriptors=रिले जानकारी का अनुरोध
+torlauncher.bootstrapStatus.loading_descriptors=रिले जानकारी लोड हो रहा है
torlauncher.bootstrapStatus.conn_or=टोर संजाल से जुड़ रहा है
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
-torlauncher.bootstrapStatus.done=Connected to the Tor network!
+torlauncher.bootstrapStatus.handshake_or=एक टोर सर्किट की स्थापना की जा रही है
+torlauncher.bootstrapStatus.done=टोर नेटवर्क से जुड़ा हुआ है!
torlauncher.bootstrapWarning.done=सम्पन्न
-torlauncher.bootstrapWarning.connectrefused=connection refused
-torlauncher.bootstrapWarning.misc=miscellaneous
-torlauncher.bootstrapWarning.resourcelimit=insufficient resources
-torlauncher.bootstrapWarning.identity=identity mismatch
-torlauncher.bootstrapWarning.timeout=connection timeout
-torlauncher.bootstrapWarning.noroute=no route to host
-torlauncher.bootstrapWarning.ioerror=read/write error
-torlauncher.bootstrapWarning.pt_missing=missing pluggable transport
+torlauncher.bootstrapWarning.connectrefused=कनेक्शन नहीं हो सका
+torlauncher.bootstrapWarning.misc=कई तरह का
+torlauncher.bootstrapWarning.resourcelimit=अपर्याप्त संसाधन
+torlauncher.bootstrapWarning.identity=पहचान विसंगति
+torlauncher.bootstrapWarning.timeout=कनेक्शन का समय समाप्त
+torlauncher.bootstrapWarning.noroute=मेजबान करने के लिए कोई रास्ता नहीं
+torlauncher.bootstrapWarning.ioerror=पढ़ें / लिखें त्रुटि
+torlauncher.bootstrapWarning.pt_missing=प्लग करने लायक परिवहन लापता
-torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost.
-torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server.
-torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy.
+torlauncher.nsresult.NS_ERROR_NET_RESET=सर्वर से कनेक्शन खो गया था।
+torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=सर्वर से संपर्क स्थापित नही हो सका।
+torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=प्रॉक्सी से कनेक्ट नहीं हो सका।
diff --git a/src/chrome/locale/ru/network-settings.dtd b/src/chrome/locale/ru/network-settings.dtd
index 85d3a07..6e047e6 100644
--- a/src/chrome/locale/ru/network-settings.dtd
+++ b/src/chrome/locale/ru/network-settings.dtd
@@ -36,9 +36,9 @@
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
-<!ENTITY torsettings.firewall.checkbox "Мой сетевой экран позволяет мне подключиться только к определённым портам">
-<!ENTITY torsettings.firewall.allowedPorts "Разрешённые порты:">
-<!ENTITY torsettings.useBridges.checkbox "Tor запрещён в моей стране">
+<!ENTITY torsettings.firewall.checkbox "Мой сетевой экран позволяет мне подключиться только к определенным портам">
+<!ENTITY torsettings.firewall.allowedPorts "Разрешенные порты:">
+<!ENTITY torsettings.useBridges.checkbox "Tor запрещен в моей стране">
<!ENTITY torsettings.useBridges.default "Выбрать встроенный мост">
<!ENTITY torsettings.useBridges.default.placeholder "выбор моста">
<!ENTITY torsettings.useBridges.bridgeDB "Запросить мост от torproject.org">
@@ -56,7 +56,7 @@
<!ENTITY torsettings.bridgeHelpTitle "Помощь по ретрансляторам типа мост">
<!ENTITY torsettings.bridgeHelp1 "Мосты - это незарегистрированные реле, которые затрудняют блокировку соединений с сетью Tor.&#160 Каждый тип моста использует отличный от других метод, чтобы избежать блокировки цезорами. Обходные устройства делают ваш трафик похожим на случайный шум и имитируют то, что он подключается к этой службе вместо Tor.">
-<!ENTITY torsettings.bridgeHelp2 "Из-за того, как именно страны пытаются блокировать Tor, определённые мосты работают в одних странах, но не работают в других.  Если вы не уверены в том, какие мосты сработает в вашей стране, посетите torproject.org/about/contact.html#support">
+<!ENTITY torsettings.bridgeHelp2 "Из-за того, как именно страны пытаются блокировать Tor, определенные мосты работают в одних странах, но не работают в других.  Если вы не уверены в том, какие мосты сработает в вашей стране, посетите torproject.org/about/contact.html#support">
<!-- Progress -->
<!ENTITY torprogress.pleaseWait "Пожалуйста, подождите, пока мы установим подключение к сети Tor.  Это может занять несколько минут.">
1
0

[tor-launcher/master] Bug 25405: cannot use Moat if a meek bridge is configured
by gk@torproject.org 03 Sep '18
by gk@torproject.org 03 Sep '18
03 Sep '18
commit a5791ec33537b5efefb5c64c240e48d9ce1c8721
Author: Kathy Brade <brade(a)pearlcrescent.com>
Date: Tue Mar 6 15:39:11 2018 -0500
Bug 25405: cannot use Moat if a meek bridge is configured
When doing Moat things, use a separate profile for the secondary browser
(instead of trying to use the main meek helper profile). This is
accomplished by setting a TOR_BROWSER_MEEK_PROFILE environment variable
which meek-client-torbrowser uses to get the profile path if it is set.
---
src/modules/tl-bridgedb.jsm | 9 +++++++--
src/modules/tl-util.jsm | 19 +++++++++++++++++--
2 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/src/modules/tl-bridgedb.jsm b/src/modules/tl-bridgedb.jsm
index 339cb39..8b7a1d6 100644
--- a/src/modules/tl-bridgedb.jsm
+++ b/src/modules/tl-bridgedb.jsm
@@ -224,17 +224,22 @@ _MoatRequestor.prototype =
}
let ptStateDir = TorLauncherUtil.getTorFile("tordatadir", false);
- if (!ptStateDir)
+ let meekHelperProfileDir = TorLauncherUtil.getTorFile("pt-profiles-dir",
+ true);
+ if (!ptStateDir || !meekHelperProfileDir)
{
let msg = TorLauncherUtil.getLocalizedString("datadir_missing");
return Promise.reject(new Error(msg));
}
ptStateDir.append("pt_state"); // Match what tor uses.
+ meekHelperProfileDir.appendRelativePath("profile.moat-http-helper");
+
let envAdditions = { TOR_PT_MANAGED_TRANSPORT_VER: "1",
TOR_PT_STATE_LOCATION: ptStateDir.path,
TOR_PT_EXIT_ON_STDIN_CLOSE: "1",
- TOR_PT_CLIENT_TRANSPORTS: this.kTransport };
+ TOR_PT_CLIENT_TRANSPORTS: this.kTransport,
+ TOR_BROWSER_MEEK_PROFILE: meekHelperProfileDir.path };
if (this.mLocalProxyURL)
envAdditions.TOR_PT_PROXY = this.mLocalProxyURL;
diff --git a/src/modules/tl-util.jsm b/src/modules/tl-util.jsm
index 292f88b..36abeaa 100644
--- a/src/modules/tl-util.jsm
+++ b/src/modules/tl-util.jsm
@@ -561,6 +561,8 @@ let TorLauncherUtil = // Public
path = "Tor\\torrc";
else if ("tordatadir" == aTorFileType)
path = "Tor";
+ else if ("pt-profiles-dir" == aTorFileType)
+ path = "Tor\\PluggableTransports";
}
else if (this.isMac)
{
@@ -574,6 +576,8 @@ let TorLauncherUtil = // Public
path = "Tor/torrc";
else if ("tordatadir" == aTorFileType)
path = "Tor";
+ else if ("pt-profiles-dir" == aTorFileType)
+ path = "Tor/PluggableTransports";
else if (isIPC)
path = "Tor/" + ipcFileName;
}
@@ -589,6 +593,8 @@ let TorLauncherUtil = // Public
path = "Tor/torrc";
else if ("tordatadir" == aTorFileType)
path = "Tor";
+ else if ("pt-profiles-dir" == aTorFileType)
+ path = "Tor/PluggableTransports";
else if (isIPC)
path = "Tor/" + ipcFileName;
}
@@ -606,7 +612,9 @@ let TorLauncherUtil = // Public
path = "Data\\Tor\\torrc";
else if ("tordatadir" == aTorFileType)
path = "Data\\Tor";
- }
+ else if ("pt-profiles-dir" == aTorFileType)
+ path = "Data\\Browser";
+ }
else // Linux, Mac OS and others.
{
// This block is also used for the non-TorBrowser-Data/ case.
@@ -620,6 +628,8 @@ let TorLauncherUtil = // Public
path = "Data/Tor/torrc";
else if ("tordatadir" == aTorFileType)
path = "Data/Tor";
+ else if ("pt-profiles-dir" == aTorFileType)
+ path = "Data/Browser";
else if (isIPC)
path = "Data/Tor/" + ipcFileName;
}
@@ -662,10 +672,15 @@ let TorLauncherUtil = // Public
{
try
{
- if ("tordatadir" == aTorFileType)
+ if (("tordatadir" == aTorFileType) ||
+ ("pt-profiles-dir" == aTorFileType))
+ {
torFile.create(torFile.DIRECTORY_TYPE, 0o700);
+ }
else
+ {
torFile.create(torFile.NORMAL_FILE_TYPE, 0o600);
+ }
}
catch (e)
{
1
0

03 Sep '18
commit 8955afc1fb84a191268219b7f4c28050585b791a
Author: Nicolas Vigier <boklm(a)torproject.org>
Date: Fri Aug 17 11:21:22 2018 +0200
Bug 27179: update mar_compression
Set mar_compression to xz for the alpha, and bzip2 for the stable.
---
projects/release/update_responses_config.yml | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/projects/release/update_responses_config.yml b/projects/release/update_responses_config.yml
index 90fbc3a..d1ed52f 100644
--- a/projects/release/update_responses_config.yml
+++ b/projects/release/update_responses_config.yml
@@ -47,10 +47,11 @@ versions:
minSupportedOSVersion: 6.1
win64:
minSupportedOSVersion: 6.1
-[% IF ! c("var/release") -%]
- mar_compression: xz
-[% END -%]
+[% IF c("var/release") -%]
mar_compression: bzip2
+[% ELSE -%]
+mar_compression: xz
+[% END -%]
htaccess_rewrite_rules:
alpha: |
# bug 26569: Redirect pre-8.0a9 alpha users to a separate update directory
1
0

[tor-browser-build/master] Pick up new tor-browser tag and use build5 for 8.0
by gk@torproject.org 02 Sep '18
by gk@torproject.org 02 Sep '18
02 Sep '18
commit 346bf3bd582ea9a16f99358e892f204df4295515
Author: Georg Koppen <gk(a)torproject.org>
Date: Sun Sep 2 17:09:11 2018 +0000
Pick up new tor-browser tag and use build5 for 8.0
---
projects/firefox/config | 2 +-
projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 1 +
rbm.conf | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/projects/firefox/config b/projects/firefox/config
index 1a94f2d..124de7a 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -1,7 +1,7 @@
# vim: filetype=yaml sw=2
version: '[% c("abbrev") %]'
filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]'
-git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2'
+git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build3'
tag_gpg_id: 1
git_url: https://git.torproject.org/tor-browser.git
gpg_keyring: torbutton.gpg
diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index 477845b..c46f139 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -108,6 +108,7 @@ Tor Browser 8.0 -- September 5 2018
* Bug 26874: Fix UNC path restrictions failure in Tor Browser 8.0a9
* Bug 12968: Enable HEASLR in Windows x86_64 builds
* Bug 26381: Work around endless loop during page load and about:tor not loading
+ * Bug 27411: Fix broken security slider and NoScript interaction on Windows
* Bug 22581: Fix shutdown crash
* Bug 25266: PT config should include full names of executable files
* Bug 26304: Update zlib to version 1.2.11
diff --git a/rbm.conf b/rbm.conf
index d99460d..5cc88e4 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -16,7 +16,7 @@ buildconf:
var:
torbrowser_version: '8.0'
- torbrowser_build: 'build4'
+ torbrowser_build: 'build5'
torbrowser_incremental_from:
- 7.5.6
project_name: tor-browser
1
0

[tor-browser/tor-browser-60.2.0esr-8.0-1] Bug 27411: Security Slider breaks on Windows
by gk@torproject.org 02 Sep '18
by gk@torproject.org 02 Sep '18
02 Sep '18
commit 124fa904c4b2b24b86429ebc3448cd9114d5e4dc
Author: Georg Koppen <gk(a)torproject.org>
Date: Sun Sep 2 17:04:54 2018 +0000
Bug 27411: Security Slider breaks on Windows
Our workaround for bug 26520 does not work for Windows users as
on Windows WebExtension background scripts are running in a different
process. To get Tor Browser 8 out we disable the separate process for
the time being while working on a better fix.
---
browser/app/profile/firefox.js | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index 48f69652d982..2d0dad38ebae 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -76,11 +76,11 @@ pref("extensions.geckoProfiler.getSymbolRules", "localBreakpad,remoteBreakpad");
pref("extensions.webextensions.base-content-security-policy", "script-src 'self' https://* moz-extension: blob: filesystem: 'unsafe-eval' 'unsafe-inline'; object-src 'self' https://* moz-extension: blob: filesystem:;");
pref("extensions.webextensions.default-content-security-policy", "script-src 'self'; object-src 'self';");
-#if defined(XP_WIN)
-pref("extensions.webextensions.remote", true);
-#elif defined(XP_MACOSX) && !defined(RELEASE_OR_BETA)
-pref("extensions.webextensions.remote", true);
-#endif
+//#if defined(XP_WIN)
+//pref("extensions.webextensions.remote", true);
+//#elif defined(XP_MACOSX) && !defined(RELEASE_OR_BETA)
+//pref("extensions.webextensions.remote", true);
+//#endif
// Extensions that should not be flagged as legacy in about:addons
pref("extensions.legacy.exceptions", "{972ce4c6-7e08-4474-a285-3208198ce6fd},testpilot@cliqz.com,@testpilot-containers,jid1-NeEaf3sAHdKHPA@jetpack,@activity-streams,pulse@mozilla.com,@testpilot-addon,@min-vid,tabcentertest1@mozilla.com,snoozetabs@mozilla.com,speaktome@mozilla.com,hoverpad@mozilla.com");
1
0

[tor-browser-build/master] Pick up new tor-browser and torbutton tags for build4
by gk@torproject.org 01 Sep '18
by gk@torproject.org 01 Sep '18
01 Sep '18
commit 1ef1b0636c223549bf04b015e20c00040bb1da44
Author: Georg Koppen <gk(a)torproject.org>
Date: Sat Sep 1 20:44:16 2018 +0000
Pick up new tor-browser and torbutton tags for build4
---
projects/firefox/config | 2 +-
projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 +++-
projects/torbutton/config | 2 +-
rbm.conf | 2 +-
4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/projects/firefox/config b/projects/firefox/config
index 0ce5a37..1a94f2d 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -1,7 +1,7 @@
# vim: filetype=yaml sw=2
version: '[% c("abbrev") %]'
filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]'
-git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1'
+git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2'
tag_gpg_id: 1
git_url: https://git.torproject.org/tor-browser.git
gpg_keyring: torbutton.gpg
diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index acc278e..477845b 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -4,7 +4,7 @@ Tor Browser 8.0 -- September 5 2018
* Update Tor to 0.3.3.9
* Update OpenSSL to 1.0.2p
* Update Libevent to 2.1.8
- * Update Torbutton to 2.0.5
+ * Update Torbutton to 2.0.6
* Bug 26960: Implement new about:tor start page
* Bug 26961: Implement new user onboarding
* Bug 26962: Circuit display onboarding
@@ -13,6 +13,7 @@ Tor Browser 8.0 -- September 5 2018
* Bug 26321: Move 'New Identity', 'New Circuit' to File, hamburger menus
* Bug 26100: Adapt Torbutton to Firefox 60 ESR
* Bug 26520: Fix sec slider/NoScript for TOR_SKIP_LAUNCH=1
+ * Bug 27401: Start listening for NoScript before it loads
* Bug 26430: New Torbutton icon
* Bug 24309: Move circuit display to the identity popup
* Bug 26884: Use Torbutton to provide security slider on mobile
@@ -50,6 +51,7 @@ Tor Browser 8.0 -- September 5 2018
* Bug 27082: Enable a limited UITour for user onboarding
* Bug 26961: New user onboarding
* Bug 26962: New feature onboarding
+ * Bug 27403: The onboarding bubble is not always displayed
* Bug 27283: Fix first-party isolation for UI tour
* Bug 27213: Update about:tbupdate to new (about:tor) layout
* Bug 14952+24553: Enable HTTP2 and AltSvc
diff --git a/projects/torbutton/config b/projects/torbutton/config
index ebceca7..f076b8f 100644
--- a/projects/torbutton/config
+++ b/projects/torbutton/config
@@ -1,5 +1,5 @@
# vim: filetype=yaml sw=2
-version: 2.0.5
+version: 2.0.6
git_url: https://git.torproject.org/torbutton.git
git_hash: '[% c("version") %]'
gpg_keyring: torbutton.gpg
diff --git a/rbm.conf b/rbm.conf
index d694f1d..d99460d 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -16,7 +16,7 @@ buildconf:
var:
torbrowser_version: '8.0'
- torbrowser_build: 'build3'
+ torbrowser_build: 'build4'
torbrowser_incremental_from:
- 7.5.6
project_name: tor-browser
1
0
commit 8e70b5f35f59ba6bbb563fbef2a4853c4d657580
Author: Georg Koppen <gk(a)torproject.org>
Date: Sat Sep 1 20:37:47 2018 +0000
Release preparations for 2.0.6
Version bump and CHANGELOG update
---
src/CHANGELOG | 3 +++
src/install.rdf | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/CHANGELOG b/src/CHANGELOG
index 3494e98a..c9f24cbd 100644
--- a/src/CHANGELOG
+++ b/src/CHANGELOG
@@ -1,3 +1,6 @@
+2.0.6
+ * Bug 27401: Start listening for NoScript before it loads
+
2.0.5
* Bug 26962: Circuit display onboarding
* Bug 26520: Fix sec slider/NoScript for TOR_SKIP_LAUNCH=1
diff --git a/src/install.rdf b/src/install.rdf
index e64cde33..a92cd651 100644
--- a/src/install.rdf
+++ b/src/install.rdf
@@ -6,7 +6,7 @@
<em:name>Torbutton</em:name>
<em:creator>Mike Perry</em:creator>
<em:id>torbutton(a)torproject.org</em:id>
- <em:version>2.0.5</em:version>
+ <em:version>2.0.6</em:version>
<em:multiprocessCompatible>true</em:multiprocessCompatible>
<em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL>
<em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>
1
0

[tor-browser/tor-browser-60.2.0esr-8.0-1] Revert "fixup! Bug 26961: New user onboarding."
by gk@torproject.org 01 Sep '18
by gk@torproject.org 01 Sep '18
01 Sep '18
commit c79bb726065ce296d567a6c9ac58b37b7d750318
Author: Georg Koppen <gk(a)torproject.org>
Date: Sat Sep 1 20:29:42 2018 +0000
Revert "fixup! Bug 26961: New user onboarding."
This reverts commit 8b50d3f2f1bb5ce04ebf3a91ff701059fedb2da2.
---
browser/extensions/onboarding/content/onboarding.js | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/browser/extensions/onboarding/content/onboarding.js b/browser/extensions/onboarding/content/onboarding.js
index 4212e305a505..1f46abdb722d 100644
--- a/browser/extensions/onboarding/content/onboarding.js
+++ b/browser/extensions/onboarding/content/onboarding.js
@@ -23,8 +23,8 @@ const BRAND_SHORT_NAME = Services.strings
const PROMPT_COUNT_PREF = "browser.onboarding.notification.prompt-count";
const NOTIFICATION_FINISHED_PREF = "browser.onboarding.notification.finished";
const ONBOARDING_DIALOG_ID = "onboarding-overlay-dialog";
-const ONBOARDING_MIN_WIDTH_PX = 200;
-const SPEECH_BUBBLE_MIN_WIDTH_PX = 200;
+const ONBOARDING_MIN_WIDTH_PX = 960;
+const SPEECH_BUBBLE_MIN_WIDTH_PX = 960;
const SPEECH_BUBBLE_NEWTOUR_STRING_ID = "onboarding.overlay-icon-tooltip2";
const SPEECH_BUBBLE_UPDATETOUR_STRING_ID = "onboarding.overlay-icon-tooltip-updated2";
const ICON_STATE_WATERMARK = "watermark";
@@ -629,7 +629,6 @@ class Onboarding {
tour_type: this._tourType,
});
- this._resizeUI();
this._window.addEventListener("beforeunload", this);
this._window.addEventListener("unload", this);
this._window.addEventListener("resize", this);
@@ -643,7 +642,7 @@ class Onboarding {
}
_resizeUI() {
- this._windowWidth = this._window.innerWidth;
+ this._windowWidth = this._window.document.body.getBoundingClientRect().width;
if (this._windowWidth < ONBOARDING_MIN_WIDTH_PX) {
// Don't show the overlay UI before we get to a better, responsive design.
this.destroy();
1
0

[tor-browser/tor-browser-60.2.0esr-8.0-1] fixup! squash! Bug 26961: New user onboarding.
by gk@torproject.org 01 Sep '18
by gk@torproject.org 01 Sep '18
01 Sep '18
commit 839cc4bd054821fe7e4c093f0a05986b83491985
Author: Georg Koppen <gk(a)torproject.org>
Date: Sat Sep 1 20:20:51 2018 +0000
fixup! squash! Bug 26961: New user onboarding.
Arthur suggested to make the onboarding bubble visible on displays with
less than 960px width available, so we choose 200px instead.
---
browser/extensions/onboarding/content/onboarding.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/browser/extensions/onboarding/content/onboarding.js b/browser/extensions/onboarding/content/onboarding.js
index dd776b3edf93..9d03a6fc82d8 100644
--- a/browser/extensions/onboarding/content/onboarding.js
+++ b/browser/extensions/onboarding/content/onboarding.js
@@ -23,8 +23,8 @@ const BRAND_SHORT_NAME = Services.strings
const PROMPT_COUNT_PREF = "browser.onboarding.notification.prompt-count";
const NOTIFICATION_FINISHED_PREF = "browser.onboarding.notification.finished";
const ONBOARDING_DIALOG_ID = "onboarding-overlay-dialog";
-const ONBOARDING_MIN_WIDTH_PX = 960;
-const SPEECH_BUBBLE_MIN_WIDTH_PX = 960;
+const ONBOARDING_MIN_WIDTH_PX = 200;
+const SPEECH_BUBBLE_MIN_WIDTH_PX = 200;
const SPEECH_BUBBLE_NEWTOUR_STRING_ID = "onboarding.overlay-icon-tooltip2";
const SPEECH_BUBBLE_UPDATETOUR_STRING_ID = "onboarding.overlay-icon-tooltip-updated2";
const ICON_STATE_WATERMARK = "watermark";
1
0

[tor-browser/tor-browser-60.2.0esr-8.0-1] squash! Bug 26961: New user onboarding.
by gk@torproject.org 01 Sep '18
by gk@torproject.org 01 Sep '18
01 Sep '18
commit cd00a313475584c0a4b94eaea5171428b993ce5b
Author: Kathy Brade <brade(a)pearlcrescent.com>
Date: Sat Sep 1 14:51:12 2018 -0400
squash! Bug 26961: New user onboarding.
Also fix bug 27403: the onboarding bubble is not always displayed.
---
browser/extensions/onboarding/bootstrap.js | 6 +++++-
browser/extensions/onboarding/content/onboarding.js | 6 +++++-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/browser/extensions/onboarding/bootstrap.js b/browser/extensions/onboarding/bootstrap.js
index 4bc6d468dce9..0762249ba1e9 100644
--- a/browser/extensions/onboarding/bootstrap.js
+++ b/browser/extensions/onboarding/bootstrap.js
@@ -14,7 +14,11 @@ XPCOMUtils.defineLazyModuleGetters(this, {
const {PREF_STRING, PREF_BOOL, PREF_INT} = Ci.nsIPrefBranch;
-const BROWSER_READY_NOTIFICATION = "browser-delayed-startup-finished";
+// In Tor Browser we initialize onboarding upon "final-ui-startup" instead
+// of waiting for "browser-delayed-startup-finished"; otherwise, on first
+// run the onboarding frame script's "onload" listener is installed too
+// late to detect that about:tor is loaded.
+const BROWSER_READY_NOTIFICATION = "final-ui-startup";
const BROWSER_SESSION_STORE_NOTIFICATION = "sessionstore-windows-restored";
const PREF_WHITELIST = [
["browser.onboarding.enabled", PREF_BOOL],
diff --git a/browser/extensions/onboarding/content/onboarding.js b/browser/extensions/onboarding/content/onboarding.js
index 1f46abdb722d..dd776b3edf93 100644
--- a/browser/extensions/onboarding/content/onboarding.js
+++ b/browser/extensions/onboarding/content/onboarding.js
@@ -642,7 +642,11 @@ class Onboarding {
}
_resizeUI() {
- this._windowWidth = this._window.document.body.getBoundingClientRect().width;
+ // In Tor Browser we check against innerWidth instead of against the
+ // body's bounding rect because about:tor keeps its body hidden until
+ // the Tor status is known, and the bounding rect is zero while the
+ // body is hidden.
+ this._windowWidth = this._window.innerWidth;
if (this._windowWidth < ONBOARDING_MIN_WIDTH_PX) {
// Don't show the overlay UI before we get to a better, responsive design.
this.destroy();
1
0

[tor-browser/tor-browser-60.2.0esr-8.0-1] fixup! Bug 26961: New user onboarding.
by gk@torproject.org 01 Sep '18
by gk@torproject.org 01 Sep '18
01 Sep '18
commit 8b50d3f2f1bb5ce04ebf3a91ff701059fedb2da2
Author: Arthur Edelstein <arthuredelstein(a)gmail.com>
Date: Sat Sep 1 12:00:35 2018 -0700
fixup! Bug 26961: New user onboarding.
---
browser/extensions/onboarding/content/onboarding.js | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/browser/extensions/onboarding/content/onboarding.js b/browser/extensions/onboarding/content/onboarding.js
index 1f46abdb722d..4212e305a505 100644
--- a/browser/extensions/onboarding/content/onboarding.js
+++ b/browser/extensions/onboarding/content/onboarding.js
@@ -23,8 +23,8 @@ const BRAND_SHORT_NAME = Services.strings
const PROMPT_COUNT_PREF = "browser.onboarding.notification.prompt-count";
const NOTIFICATION_FINISHED_PREF = "browser.onboarding.notification.finished";
const ONBOARDING_DIALOG_ID = "onboarding-overlay-dialog";
-const ONBOARDING_MIN_WIDTH_PX = 960;
-const SPEECH_BUBBLE_MIN_WIDTH_PX = 960;
+const ONBOARDING_MIN_WIDTH_PX = 200;
+const SPEECH_BUBBLE_MIN_WIDTH_PX = 200;
const SPEECH_BUBBLE_NEWTOUR_STRING_ID = "onboarding.overlay-icon-tooltip2";
const SPEECH_BUBBLE_UPDATETOUR_STRING_ID = "onboarding.overlay-icon-tooltip-updated2";
const ICON_STATE_WATERMARK = "watermark";
@@ -629,6 +629,7 @@ class Onboarding {
tour_type: this._tourType,
});
+ this._resizeUI();
this._window.addEventListener("beforeunload", this);
this._window.addEventListener("unload", this);
this._window.addEventListener("resize", this);
@@ -642,7 +643,7 @@ class Onboarding {
}
_resizeUI() {
- this._windowWidth = this._window.document.body.getBoundingClientRect().width;
+ this._windowWidth = this._window.innerWidth;
if (this._windowWidth < ONBOARDING_MIN_WIDTH_PX) {
// Don't show the overlay UI before we get to a better, responsive design.
this.destroy();
1
0

[torbutton/master] Bug 27401: Start listening for NoScript before it loads
by gk@torproject.org 31 Aug '18
by gk@torproject.org 31 Aug '18
31 Aug '18
commit 9b79f00ade001b7da59ef0c8c6f560a62da954bb
Author: Arthur Edelstein <arthuredelstein(a)gmail.com>
Date: Fri Aug 31 15:00:33 2018 -0700
Bug 27401: Start listening for NoScript before it loads
---
src/chrome/content/torbutton.js | 2 --
src/components/startup-observer.js | 4 ++++
src/modules/noscript-control.js | 2 ++
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js
index 3f38830b..c3f68510 100644
--- a/src/chrome/content/torbutton.js
+++ b/src/chrome/content/torbutton.js
@@ -11,7 +11,6 @@ let { Services } = Cu.import("resource://gre/modules/Services.jsm", {});
let { showDialog, show_torbrowser_manual } = Cu.import("resource://torbutton/modules/utils.js", {});
let { unescapeTorString } = Cu.import("resource://torbutton/modules/utils.js", {});
let SecurityPrefs = Cu.import("resource://torbutton/modules/security-prefs.js", {});
-let NoScriptControl = Cu.import("resource://torbutton/modules/noscript-control.js", {});
let { bindPrefAndInit, observe } = Cu.import("resource://torbutton/modules/utils.js", {});
Cu.importGlobalProperties(["XMLHttpRequest"]);
@@ -239,7 +238,6 @@ function torbutton_init() {
torbutton_log(3, 'called init()');
SecurityPrefs.initialize();
- NoScriptControl.initialize();
if (m_tb_wasinited) {
return;
diff --git a/src/components/startup-observer.js b/src/components/startup-observer.js
index cd9e7d2c..2d20a8ad 100644
--- a/src/components/startup-observer.js
+++ b/src/components/startup-observer.js
@@ -23,6 +23,7 @@ XPCOMUtils.defineLazyModuleGetter(this, "FileUtils",
"resource://gre/modules/FileUtils.jsm");
Cu.import("resource://torbutton/modules/default-prefs.js", {}).ensureDefaultPrefs();
+let NoScriptControl = Cu.import("resource://torbutton/modules/noscript-control.js", {});
// Module specific constants
const kMODULE_NAME = "Startup";
@@ -154,6 +155,9 @@ StartupObserver.prototype = {
// but only for hackish reasons.
this._prefs.setBoolPref("extensions.torbutton.startup", true);
+ // We need to listen for NoScript before it starts.
+ NoScriptControl.initialize();
+
this.setProxySettings();
}
diff --git a/src/modules/noscript-control.js b/src/modules/noscript-control.js
index 14f78c49..a03755de 100644
--- a/src/modules/noscript-control.js
+++ b/src/modules/noscript-control.js
@@ -126,12 +126,14 @@ var initialize = () => {
// Wait for the first message from NoScript to arrive, and then
// bind the security_slider pref to the NoScript settings.
let messageListener = (a,b,c) => {
+ log(3, `Message received from NoScript: ${JSON.stringify([a,b,c])}`);
extensionContext.api.browser.runtime.onMessage.removeListener(messageListener);
bindPrefAndInit(
"extensions.torbutton.security_slider",
sliderState => setNoScriptSafetyLevel(securitySliderToSafetyLevel(sliderState)));
};
extensionContext.api.browser.runtime.onMessage.addListener(messageListener);
+ log(3, "Listening for message from NoScript.");
} catch (e) {
log(5, e.message);
}
1
0
commit 7135298135febbbb9b008f37e0068868f8baf779
Author: Georg Koppen <gk(a)torproject.org>
Date: Fri Aug 31 20:27:05 2018 +0000
Use build3 for 8.0
---
rbm.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/rbm.conf b/rbm.conf
index aef18c3..d694f1d 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -16,7 +16,7 @@ buildconf:
var:
torbrowser_version: '8.0'
- torbrowser_build: 'build2'
+ torbrowser_build: 'build3'
torbrowser_incremental_from:
- 7.5.6
project_name: tor-browser
1
0

31 Aug '18
commit e325ade8478ea7849ccbbd3c695592d5e5e87064
Author: Georg Koppen <gk(a)torproject.org>
Date: Fri Aug 31 20:26:06 2018 +0000
Actually ship stable win64 bundles
---
projects/release/config | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/projects/release/config b/projects/release/config
index 236325b..8605aa2 100644
--- a/projects/release/config
+++ b/projects/release/config
@@ -29,7 +29,7 @@ targets:
torbrowser-windows-i686: 1
torbrowser-windows-x86_64:
var:
- torbrowser-windows-x86_64: '[% ! c("var/release") %]'
+ torbrowser-windows-x86_64: 1
torbrowser-osx-x86_64:
var:
torbrowser-osx-x86_64: 1
1
0
commit 279d29d6078eb4776a9302c4a835078459006624
Author: Georg Koppen <gk(a)torproject.org>
Date: Fri Aug 31 13:06:25 2018 +0000
Use build2 for 8.0
---
rbm.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/rbm.conf b/rbm.conf
index 824291f..aef18c3 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -16,7 +16,7 @@ buildconf:
var:
torbrowser_version: '8.0'
- torbrowser_build: 'build1'
+ torbrowser_build: 'build2'
torbrowser_incremental_from:
- 7.5.6
project_name: tor-browser
1
0

[tor-browser-build/master] Bug 27397: add arma's key C218525819F78451 to ./keyring/tor.gpg
by gk@torproject.org 31 Aug '18
by gk@torproject.org 31 Aug '18
31 Aug '18
commit 4247dac61d501c2118a0a096fed453c04ba01ce8
Author: Nicolas Vigier <boklm(a)torproject.org>
Date: Fri Aug 31 14:23:14 2018 +0200
Bug 27397: add arma's key C218525819F78451 to ./keyring/tor.gpg
---
keyring/tor.gpg | Bin 21817 -> 159585 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/keyring/tor.gpg b/keyring/tor.gpg
index 51eeb40..45b333f 100644
Binary files a/keyring/tor.gpg and b/keyring/tor.gpg differ
1
0

[tor-browser-build/master] Bug 27061: Enable verification of langpacks checksums
by gk@torproject.org 31 Aug '18
by gk@torproject.org 31 Aug '18
31 Aug '18
commit 7a88a4858db7fca96e126eba8fd0d0706bc36516
Author: Sukhbir Singh <sukhbir(a)torproject.org>
Date: Tue Aug 21 17:10:24 2018 -0400
Bug 27061: Enable verification of langpacks checksums
Since https://bugzilla.mozilla.org/show_bug.cgi?id=1463749 is fixed in
Firefox 60.2 ESR, we re-enable the verification of langpack checksums.
---
projects/firefox-langpacks/build | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/projects/firefox-langpacks/build b/projects/firefox-langpacks/build
index cbbc9ca..6bc1810 100644
--- a/projects/firefox-langpacks/build
+++ b/projects/firefox-langpacks/build
@@ -4,8 +4,8 @@
[% FOREACH lang = c('var/locales') %]
[% SET lang = tmpl(lang) %]
[% SET filename = c("var/input_filename") _ '/' _ lang _ '.xpi'; %]
- #shasum=$(grep '[% c("var/ff_arch") %]/xpi/[% lang %].xpi$' SHA512SUMS-[% c("version") %] | sed 's| [% c("var/ff_arch") %]/xpi/[% lang %].xpi$||')
- #echo "$shasum [% filename %]" | sha512sum -c
+ shasum=$(grep '[% c("var/ff_arch") %]/xpi/[% lang %].xpi$' SHA512SUMS-[% c("version") %] | sed 's| [% c("var/ff_arch") %]/xpi/[% lang %].xpi$||')
+ echo "$shasum [% filename %]" | sha512sum -c
[% END %]
mkdir -p [% dest_dir %]/[% c("filename") %]
1
0
commit d7b4347988e2988fa504e692855e7a576011ad2b
Author: Georg Koppen <gk(a)torproject.org>
Date: Fri Aug 31 05:30:12 2018 +0000
Release preparations for 8.0
Version bumps and Changelog update
---
projects/firefox-langpacks/config | 2 +-
projects/firefox/config | 4 +-
.../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 180 ++++++++++++++++++++-
projects/tor-browser/config | 4 +-
projects/tor-launcher/config | 2 +-
projects/tor/config | 2 +-
projects/torbutton/config | 2 +-
rbm.conf | 6 +-
8 files changed, 189 insertions(+), 13 deletions(-)
diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config
index 04cd7dd..4e42939 100644
--- a/projects/firefox-langpacks/config
+++ b/projects/firefox-langpacks/config
@@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil
var:
ff_version: '[% pc("firefox", "var/firefox_version") %]'
- ff_build: build2
+ ff_build: build1
ff_arch: linux-i686
input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]'
diff --git a/projects/firefox/config b/projects/firefox/config
index 2da425a..0ce5a37 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -1,13 +1,13 @@
# vim: filetype=yaml sw=2
version: '[% c("abbrev") %]'
filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]'
-git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build3'
+git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1'
tag_gpg_id: 1
git_url: https://git.torproject.org/tor-browser.git
gpg_keyring: torbutton.gpg
var:
- firefox_platform_version: 60.1.0
+ firefox_platform_version: 60.2.0
firefox_version: '[% c("var/firefox_platform_version") %]esr'
torbrowser_branch: 8.0
torbrowser_update_channel: alpha
diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index f4d8dec..acc278e 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,177 @@
+Tor Browser 8.0 -- September 5 2018
+ * All platforms
+ * Update Firefox to 60.2.0esr
+ * Update Tor to 0.3.3.9
+ * Update OpenSSL to 1.0.2p
+ * Update Libevent to 2.1.8
+ * Update Torbutton to 2.0.5
+ * Bug 26960: Implement new about:tor start page
+ * Bug 26961: Implement new user onboarding
+ * Bug 26962: Circuit display onboarding
+ * Bug 27301: Improve about:tor behavior and appearance
+ * Bug 27214: Improve the onboarding text
+ * Bug 26321: Move 'New Identity', 'New Circuit' to File, hamburger menus
+ * Bug 26100: Adapt Torbutton to Firefox 60 ESR
+ * Bug 26520: Fix sec slider/NoScript for TOR_SKIP_LAUNCH=1
+ * Bug 26430: New Torbutton icon
+ * Bug 24309: Move circuit display to the identity popup
+ * Bug 26884: Use Torbutton to provide security slider on mobile
+ * Bug 26128: Adapt security slider to the WebExtensions version of NoScript
+ * Bug 27276: Adapt to new NoScript messaging protocol
+ * Bug 23247: Show security state of .onions
+ * Bug 26129: Show our about:tor page on startup
+ * Bug 26235: Hide new unusable items from help menu
+ * Bug 26058: Remove workaround for hiding 'sign in to sync' button
+ * Bug 26590: Use new svg.disabled pref in security slider
+ * Bug 26655: Adjust color and size of onion button
+ * Bug 26500: Reposition circuit display relay icon for RTL locales
+ * Bug 26409: Remove spoofed locale implementation
+ * Bug 26189: Remove content-policy.js
+ * Bug 26544: Images are not centered anymore
+ * Bug 26490: Remove the security slider notification
+ * Bug 25126: Make about:tor layout responsive
+ * Bug 27097: Add text for Tor News signup widget
+ * Bug 21245: Add da translation to Torbutton and keep track of it
+ * Bug 27129+20628: Add locales ca, ga, id, is, nb, da, he, sv, and zh-TW
+ * Translations update
+ * Update Tor Launcher to 0.2.16.3
+ * Bug 23136: Moat integration (fetch bridges for the user)
+ * Bug 25750: Update Tor Launcher to make it compatible with Firefox 60 ESR
+ * Bug 26985: Help button icons missing
+ * Bug 25509: Improve the proxy help text
+ * Bug 26466: Remove sv-SE from tracking for releases
+ * Bug 27129+20628: Add locales ca, ga, id, is, nb, da, he, sv, and zh-TW
+ * Translations update
+ * Update HTTPS Everywhere to 2018.8.22
+ * Update NoScript to 10.1.9.1
+ * Update meek to 0.31
+ * Bug 26477: Make meek extension compatible with ESR 60
+ * Update obfs4proxy to v0.0.7 (bug 25356)
+ * Bug 27082: Enable a limited UITour for user onboarding
+ * Bug 26961: New user onboarding
+ * Bug 26962: New feature onboarding
+ * Bug 27283: Fix first-party isolation for UI tour
+ * Bug 27213: Update about:tbupdate to new (about:tor) layout
+ * Bug 14952+24553: Enable HTTP2 and AltSvc
+ * Bug 25735: Tor Browser stalls while loading Facebook login page
+ * Bug 17252: Enable TLS session identifiers with first-party isolation
+ * Bug 26353: Prevent speculative connects that violate first-party isolation
+ * Bug 26670: Make canvas permission prompt respect first-party isolation
+ * Bug 24056: Use en-US strings in HTML forms if locale is spoofed to english
+ * Bug 26456: HTTP .onion sites inherit previous page's certificate information
+ * Bug 26561: .onion images are not displayed
+ * Bug 26321: Move 'New Identity', 'New Circuit' to File, hamburger menus
+ * Bug 26833: Backport Mozilla's bug 1473247
+ * Bug 26628: Backport Mozilla's bug 1470156
+ * Bug 26237: Clean up toolbar for ESR60-based Tor Browser
+ * Bug 26519: Avoid Firefox icons in ESR60
+ * Bug 26039: Load our preferences that modify extensions (fixup)
+ * Bug 26515: Update Tor Browser blog post URLs
+ * Bug 26216: Fix broken MAR file generation
+ * Bug 26409: Remove spoofed locale implementation
+ * Bug 25543: Rebase Tor Browser patches for ESR60
+ * Bug 23247: Show security state of .onions
+ * Bug 26039: Load our preferences that modify extensions
+ * Bug 17965: Isolate HPKP and HSTS to URL bar domain
+ * Bug 21787: Spoof en-US for date picker
+ * Bug 21607: Disable WebVR for now until it is properly audited
+ * Bug 21549: Disable wasm for now until it is properly audited
+ * Bug 26614: Disable Web Authentication API until it is properly audited
+ * Bug 27281: Enable Reader View mode again
+ * Bug 26114: Don't expose navigator.mozAddonManager to websites
+ * Bug 21850: Update about:tbupdate handling for e10s
+ * Bug 26048: Fix potentially confusing "restart to update" message
+ * Bug 27221: Purge startup cache if Tor Browser version changed
+ * Bug 26049: Reduce delay for showing update prompt to 1 hour
+ * Bug 26365: Add potential AltSvc support
+ * Bug 9145: Fix broken hardware acceleration on Windows and enable it
+ * Bug 26045: Add new MAR signing keys
+ * Bug 25215: Revert bug 18619 (we are not disabling IndexedDB any longer)
+ * Bug 19910: Rip out optimistic data socks handshake variant (#3875)
+ * Bug 22564: Hide Firefox Sync
+ * Bug 25090: Disable updater telemetry
+ * Bug 26127: Make sure Torbutton and Tor Launcher are not treated as legacy extensions
+ * Bug 13575: Disable randomised Firefox HTTP cache decay user tests
+ * Bug 22548: Firefox downgrades VP9 videos to VP8 for some users
+ * Bug 24995: Include git hash in tor --version
+ * Bug 27268+27257+27262+26603 : Preferences clean-up
+ * Bug 26073: Migrate general.useragent.locale to intl.locale.requested
+ * Bug 27129+20628: Make Tor Browser available in ca, ga, id, is, nb, da, he, sv, and zh-TW
+ * Bug 12927: Include Hebrew translation into Tor Browser
+ * Bug 21245: Add danish (da) translation
+ * Windows
+ * Bug 20636+10026: Create 64bit Tor Browser for Windows
+ * Bug 26239+24197: Enable content sandboxing for 64bit Windows builds
+ * Bug 26514: Fix intermittent updater failures on Win64 (Error 19)
+ * Bug 26874: Fix UNC path restrictions failure in Tor Browser 8.0a9
+ * Bug 12968: Enable HEASLR in Windows x86_64 builds
+ * Bug 26381: Work around endless loop during page load and about:tor not loading
+ * Bug 22581: Fix shutdown crash
+ * Bug 25266: PT config should include full names of executable files
+ * Bug 26304: Update zlib to version 1.2.11
+ * Update tbb-windows-installer to 0.4
+ * Bug 26355: Update tbb-windows-installer to check for Windows7+
+ * Bug 26355: Require Windows7+ for updates to Tor Browser 8
+ * OS X
+ * Bug 24136: After loading file:// URLs clicking on links is broken on OS X
+ * Bug 24243: Tor Browser only renders HTML for local pages via file://
+ * Bug 24263: Tor Browser does not run extension scripts if loaded via about:debugging
+ * Bug 22794: Don't open AF_INET/AF_INET6 sockets when AF_LOCAL is configured
+ * Linux
+ * Bug 22794: Don't open AF_INET/AF_INET6 sockets when AF_LOCAL is configured
+ * Bug 25485: Unbreak Tor Browser on systems with newer libstdc++
+ * Bug 20866: Fix OpenGL software rendering on systems with newer libstdc++
+ * Bug 26951+18022: Fix execdesktop argument passing
+ * Bug 24136: After loading file:// URLs clicking on links is broken on Linux
+ * Bug 24243: Tor Browser only renders HTML for local pages via file://
+ * Bug 24263: Tor Browser does not run extension scripts if loaded via about:debugging
+ * Bug 20283: Tor Browser should run without a `/proc` filesystem.
+ * Bug 26354: Set SSE2 support as minimal requirement for Tor Browser 8
+ * Build System
+ * All
+ * Bug 26362+26410: Use old MAR format for first ESR60-based stable
+ * Bug 27020: RBM build fails with runc version 1.0.1
+ * Bug 26949: Use GitHub repository for STIX
+ * Bug 26773: Add --verbose to the ./mach build flag for firefox
+ * Bug 26319: Don't package up Tor Browser in the `mach package` step
+ * Bug 27178: add support for xz compression in mar files
+ * Clean up
+ * Windows
+ * Bug 26203: Adapt tor-browser-build/tor-browser for Windows
+ * Bug 26204: Bundle d3dcompiler_47.dll for Tor Browser 8
+ * Bug 26205: Don't build the uninstaller for Windows during Firefox compilation
+ * Bug 26206: Ship pthread related dll where needed
+ * Bug 26396: Build libwinpthread reproducible
+ * Bug 25837: Integrate fxc2 into our build setup for Windows builds
+ * Bug 27152: Use mozilla/fxc2.git for the fxc2 repository
+ * Bug 25894: Get a rust cross-compiler for Windows
+ * Bug 25554: Bump mingw-w64 version for ESR 60
+ * Bug 23561: Fix nsis builds for Windows 64
+ * Bug 13469: Windows installer is missing many languages from NSIS file
+ * Bug 23231: Remove our STL Wrappers workaround for Windows 64bit
+ * Bug 26370: Don't copy msvcr100.dll and libssp-0.dll twice
+ * Bug 26476: Work around Tor Browser crashes due to fix for bug 1467041
+ * Bug 18287: Use SHA-2 signature for Tor Browser setup executables
+ * Bug 25420: Update GCC to 6.4.0
+ * Bug 16472: Update Binutils to 2.26.1
+ * Bug 20302: Fix FTE compilation for Windows with GCC 6.4.0
+ * Bug 25111: Don't compile Yasm on our own anymore for Windows Tor Browser
+ * Bug 18691: Switch Windows builds from precise to jessie
+ * OS X
+ * Bug 24632: Update macOS toolchain for ESR 60
+ * Bug 9711: Build our own cctools for macOS cross-compilation
+ * Bug 25548: Update macOS SDK for Tor Browser builds to 10.11
+ * Bug 26003: Clean up our mozconfig-osx-x86_64 file
+ * Bug 26195: Use new cctools in our macosx-toolchain project
+ * Bug 25975: Get a rust cross-compiler for macOS
+ * Bug 26475: Disable Stylo to make macOS build reproducible
+ * Bug 26489: Fix .app directory name in tools/dmg2mar
+ * Linux
+ * Bug 26073: Patch tor-browser-build for transition to ESR 60
+ * Bug 25481: Rust support for tor-browser and tor
+ * Bug 25304: Update GCC to 6.4.0
+ * Bug 16472: Update Binutils to 2.26.1
+
Tor Browser 8.0a10 -- August 20 2018
* All platforms
* Update Tor to 0.3.4.6-rc
@@ -44,7 +218,6 @@ Tor Browser 8.0a10 -- August 20 2018
* Bug 26514: Fix intermittent updater failures on Win64 (Error 19)
* Bug 26874: Fix UNC path restrictions failure in Tor Browser 8.0a9
* Bug 12968: Enable HEASLR in Windows x86_64 builds
- * Bug 9145: Fix broken hardware acceleration
* Update tbb-windows-installer to 0.4
* Bug 26355: Update tbb-windows-installer to check for Windows7+
* Bug 26355: Require Windows7+ for updates to Tor Browser 8
@@ -73,7 +246,6 @@ Tor Browser 8.0a9 -- June 27 2018
* Update Firefox to 60.1.0esr
* Update Tor to 0.3.4.2-alpha
* Update Libevent to 2.1.8
- * Update Binutils to 2.26.1
* Update Torbutton to 2.0.1
* Bug 26100: Adapt Torbutton to Firefox 60 ESR
* Bug 26430: New Torbutton icon
@@ -88,6 +260,7 @@ Tor Browser 8.0a9 -- June 27 2018
* Update Tor Launcher to 0.2.16.1
* Bug 25750: Update Tor Launcher to make it compatible with Firefox 60 ESR
* Bug 20890: Increase control port connection timeout
+ * Bug 26466: Remove sv-SE from tracking for releases
* Bug 20628: Add more locales to Tor Browser
* Translations update
* Update HTTPS Everywhere to 2018.6.21
@@ -97,6 +270,7 @@ Tor Browser 8.0a9 -- June 27 2018
* Bug 26039: Load our preferences that modify extensions
* Bug 17965: Isolate HPKP and HSTS to URL bar domain
* Bug 26365: Add potential AltSvc support
+ * Bug 9145: Fix broken hardware acceleration on Windows and enable it
* Bug 26045: Add new MAR signing keys
* Bug 22564: Hide Firefox Sync
* Bug 25090: Disable updater telemetry
@@ -144,6 +318,7 @@ Tor Browser 8.0a9 -- June 27 2018
* Bug 26370: Don't copy msvcr100.dll and libssp-0.dll twice
* Bug 26476: Work around Tor Browser crashes due to fix for bug 1467041
* Bug 18287: Use SHA-2 signature for Tor Browser setup executables
+ * Bug 16472: Update Binutils to 2.26.1
* OS X
* Bug 24632: Update macOS toolchain for ESR 60
* Bug 9711: Build our own cctools for macOS cross-compilation
@@ -156,6 +331,7 @@ Tor Browser 8.0a9 -- June 27 2018
* Bug 26073: Patch tor-browser-build for transition to ESR 60
* Bug 25540: Stop building and distributing sandboxed tor browser
* Bug 25481: Rust support for tor-browser and tor
+ * Bug 16472: Update Binutils to 2.26.1
Tor Browser 7.5.6 -- June 26 2018
* All platforms
diff --git a/projects/tor-browser/config b/projects/tor-browser/config
index 66dc989..7d1720b 100644
--- a/projects/tor-browser/config
+++ b/projects/tor-browser/config
@@ -67,9 +67,9 @@ input_files:
name: snowflake
enable: '[% c("var/snowflake") %]'
- filename: Bundle-Data
- - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit…
+ - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit…
name: noscript
- sha256sum: fdc539412a61e6109b9fd331c90bd73faa787eefe1ee8d06b57dc3d906c541cd
+ sha256sum: 68c3ef1b753210d376ab9b9c73fa053043f4f0f4cab219e317759fb32b104a27
- filename: 'RelativeLink/start-tor-browser.desktop'
enable: '[% c("var/linux") %]'
- filename: 'RelativeLink/execdesktop'
diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config
index c0cf724..19f16bb 100644
--- a/projects/tor-launcher/config
+++ b/projects/tor-launcher/config
@@ -1,5 +1,5 @@
# vim: filetype=yaml sw=2
-version: 0.2.16.2
+version: 0.2.16.3
git_url: https://git.torproject.org/tor-launcher.git
git_hash: '[% c("version") %]'
gpg_keyring: torbutton.gpg
diff --git a/projects/tor/config b/projects/tor/config
index 8c50e6f..aeea5e0 100644
--- a/projects/tor/config
+++ b/projects/tor/config
@@ -1,6 +1,6 @@
# vim: filetype=yaml sw=2
filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]'
-version: 0.3.4.6-rc
+version: 0.3.3.9
git_hash: 'tor-[% c("version") %]'
git_url: https://git.torproject.org/tor.git
git_submodule: 1
diff --git a/projects/torbutton/config b/projects/torbutton/config
index 4b26ca9..ebceca7 100644
--- a/projects/torbutton/config
+++ b/projects/torbutton/config
@@ -1,5 +1,5 @@
# vim: filetype=yaml sw=2
-version: 2.0.2
+version: 2.0.5
git_url: https://git.torproject.org/torbutton.git
git_hash: '[% c("version") %]'
gpg_keyring: torbutton.gpg
diff --git a/rbm.conf b/rbm.conf
index f8a2ad5..824291f 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -15,10 +15,10 @@ buildconf:
git_signtag_opt: '-s'
var:
- torbrowser_version: '8.0a10'
- torbrowser_build: 'build5'
+ torbrowser_version: '8.0'
+ torbrowser_build: 'build1'
torbrowser_incremental_from:
- - 8.0a9
+ - 7.5.6
project_name: tor-browser
multi_lingual: 0
build_mar: 1
1
0
commit c0816288f24311edd1b2fdc6e7c7091a71b7c0c5
Author: Georg Koppen <gk(a)torproject.org>
Date: Fri Aug 31 05:17:15 2018 +0000
Translations update
---
src/chrome/locale/bn-BD/network-settings.dtd | 2 +-
src/chrome/locale/da/network-settings.dtd | 2 +-
src/chrome/locale/el/network-settings.dtd | 36 +++++++-------
src/chrome/locale/el/torlauncher.properties | 28 +++++------
src/chrome/locale/es-AR/network-settings.dtd | 66 +++++++++++++-------------
src/chrome/locale/es-AR/torlauncher.properties | 30 ++++++------
src/chrome/locale/es/network-settings.dtd | 2 +-
src/chrome/locale/et/torlauncher.properties | 2 +-
src/chrome/locale/fr/torlauncher.properties | 2 +-
src/chrome/locale/ga/network-settings.dtd | 2 +-
src/chrome/locale/id/network-settings.dtd | 2 +-
src/chrome/locale/ka/torlauncher.properties | 18 +++----
src/chrome/locale/mr/torlauncher.properties | 26 +++++-----
src/chrome/locale/pt/network-settings.dtd | 2 +-
src/chrome/locale/ro/network-settings.dtd | 6 +--
src/chrome/locale/ro/torlauncher.properties | 20 ++++----
src/chrome/locale/ru/network-settings.dtd | 2 +-
src/chrome/locale/sr/network-settings.dtd | 10 ++--
src/chrome/locale/tr/network-settings.dtd | 26 +++++-----
src/chrome/locale/tr/torlauncher.properties | 8 ++--
20 files changed, 146 insertions(+), 146 deletions(-)
diff --git a/src/chrome/locale/bn-BD/network-settings.dtd b/src/chrome/locale/bn-BD/network-settings.dtd
index b9f0ba6..74cfe00 100644
--- a/src/chrome/locale/bn-BD/network-settings.dtd
+++ b/src/chrome/locale/bn-BD/network-settings.dtd
@@ -52,7 +52,7 @@
<!ENTITY torsettings.copyLog "ক্লিপবোর্ডে কপি টর লগ করুন">
<!ENTITY torsettings.proxyHelpTitle "প্রক্সি সাহায্য">
-<!ENTITY torsettings.proxyHelp1 "A local proxy might be needed when connecting through a company, school, or university network. If you are not sure whether a proxy is needed, look at the Internet settings in another browser or check your system's network settings.">
+<!ENTITY torsettings.proxyHelp1 "একটি প্রতিষ্ঠান, স্কুল বা বিশ্ববিদ্যালয়ের নেটওয়ার্কের মাধ্যমে সংযোগ করার সময় স্থানীয় প্রক্সির প্রয়োজন হতে পারে । #160; যদি আপনি নিশ্চিত না হন যে কোন প্রক্সি প্রয়োজন কিনা, অন্য ব্রাউজারে ইন্টারনেট সেটিংসের দিকে তাকান অথবা আপনার সিস্টেম এর নেটওয়ার্ক সেটিংস চেক করুন.">
<!ENTITY torsettings.bridgeHelpTitle "ব্রিজ রিলে সহায়তা">
<!ENTITY torsettings.bridgeHelp1 "ব্রিজগুলি তালিকাভুক্ত নয় এমন রিলে যা টর নেটওয়ার্ক সংযোগ বন্ধ করে আরও কঠিন করে তোলে।   সেন্সরশিপ এড়ানোর জন্য প্রতিটি ধরনের সেতু একটি ভিন্ন পদ্ধতি ব্যবহার করে।   Obfs আপনার ট্র্যাফিক র্যান্ডম শব্দ মত চেহারা, এবং নিছক টাওয়ার ট্র্যাফিক চেহারা মত এটি টর পরিবর্তে যে পরিষেবা সংযোগ করা হয়।">
diff --git a/src/chrome/locale/da/network-settings.dtd b/src/chrome/locale/da/network-settings.dtd
index a9c2852..07cdd4d 100644
--- a/src/chrome/locale/da/network-settings.dtd
+++ b/src/chrome/locale/da/network-settings.dtd
@@ -52,7 +52,7 @@
<!ENTITY torsettings.copyLog "Kopiér Tor-loggen til udklipsholderen">
<!ENTITY torsettings.proxyHelpTitle "Hjælp til proxy">
-<!ENTITY torsettings.proxyHelp1 "A local proxy might be needed when connecting through a company, school, or university network. If you are not sure whether a proxy is needed, look at the Internet settings in another browser or check your system's network settings.">
+<!ENTITY torsettings.proxyHelp1 "Der kan være brug for en lokal proxy når der oprettes forbindelse gennem et netværk i virksomhed, skole eller universitet. Hvis du ikke er sikker på om der er brug for en proxy, så kig i internetindstillingerne i en anden browser eller tjek dit systems netværksindstillinger.">
<!ENTITY torsettings.bridgeHelpTitle "Bro-relæ hjælp">
<!ENTITY torsettings.bridgeHelp1 "Broer er ulistede relæer som gør det sværrer at blokere forbindelser til Tor-netværket.  Hver type bro bruger en anderledes metode for at undgå censur.  Dem med obfs får din netværkstrafik til at ligne tilfældig støj og dem med meek får din netværkstrafik til at se ud som om den er forbundet til tjenesten i stedet for Tor.">
diff --git a/src/chrome/locale/el/network-settings.dtd b/src/chrome/locale/el/network-settings.dtd
index f3b86b1..116550e 100644
--- a/src/chrome/locale/el/network-settings.dtd
+++ b/src/chrome/locale/el/network-settings.dtd
@@ -1,7 +1,7 @@
<!ENTITY torsettings.dialog.title "Tor Ρυθμίσεις Δικτύου ">
<!ENTITY torsettings.wizard.title.default "Σύνδεση στο Tor">
<!ENTITY torsettings.wizard.title.configure "Ρυθμίσεις δικτύου Tor">
-<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">
+<!ENTITY torsettings.wizard.title.connecting "Δημιουργείται σύνδεση">
<!-- For locale picker: -->
<!ENTITY torlauncher.localePicker.title "Γλώσσα του Tor Browser">
@@ -9,8 +9,8 @@
<!-- For "first run" wizard: -->
-<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor.">
-<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy.">
+<!ENTITY torSettings.connectPrompt "Πατήστε "Σύνδεση" για να συνδεθείτε στο Tor">
+<!ENTITY torSettings.configurePrompt "Πατήστε "Ρύθμιση" για να προσαρμόσετε τις ρυθμίσεις δικτύου αν βρίσκεστε σε χώρα που αποκλείει τον Tor (όπως η Αίγυπτος, η Κίνα, η Τουρκία) ή αν συνδέεστε από προσωπικό δίκτυο που χρειάζεται διακομιστή μεσολάβησης.">
<!ENTITY torSettings.configure "Ρύθμιση ">
<!ENTITY torSettings.connect "Σύνδεση">
@@ -25,9 +25,9 @@
<!ENTITY torsettings.optional "Προεραιτικα">
-<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
+<!ENTITY torsettings.useProxy.checkbox "Χρησιμοποιώ διακομιστή μεσολάβησης για να συνδεθώ στο ίντερνετ.">
<!ENTITY torsettings.useProxy.type "Τύπος διακομιστή μεσολάβησης:">
-<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
+<!ENTITY torsettings.useProxy.type.placeholder "Επιλέξτε τύπο διακομιστή μεσολάβησης.">
<!ENTITY torsettings.useProxy.address "Διεύθυνση:">
<!ENTITY torsettings.useProxy.address.placeholder "Διεύθυνση ΙΡ η όνομα υπολογιστή ">
<!ENTITY torsettings.useProxy.port "Θύρα συστήματος:">
@@ -38,25 +38,25 @@
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "Το τείχος προστασίας μου με αφήνει να συνδέομαι μόνο σε συγκεκριμένες θύρες συστήματος">
<!ENTITY torsettings.firewall.allowedPorts "Επιτρεπόμενες Θύρες:">
-<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
-<!ENTITY torsettings.useBridges.default "Select a built-in bridge">
-<!ENTITY torsettings.useBridges.default.placeholder "select a bridge">
-<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org">
-<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image">
-<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge">
+<!ENTITY torsettings.useBridges.checkbox "Ο Tor είναι αποκλεισμένος στην χώρα μου">
+<!ENTITY torsettings.useBridges.default "Επιλέξτε μία ενταγμένη γέφυρα">
+<!ENTITY torsettings.useBridges.default.placeholder "Επιλέξτε μία γέφυρα">
+<!ENTITY torsettings.useBridges.bridgeDB "Αιτηθείτε μίας γέφυρας από το torproject.org">
+<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Πληκτρολογήστε τους χαρακτήρες της εικόνας">
+<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Πάρτε μία νέα πρόκληση.">
<!ENTITY torsettings.useBridges.captchaSubmit "Υποβολή">
-<!ENTITY torsettings.useBridges.custom "Provide a bridge I know">
-<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source.">
-<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)">
+<!ENTITY torsettings.useBridges.custom "Δώστε μου μία γέφυρα που να την γνωρίζω">
+<!ENTITY torsettings.useBridges.label "Συμπληρώστε πληροφορίες γέφυρας από έγκυρη πηγή">
+<!ENTITY torsettings.useBridges.placeholder "πληκτρολογήστε διεύθυνση:πύλη (μία σε κάθε σειρά)">
<!ENTITY torsettings.copyLog "Αντιγραφή στο πρόχειρο">
-<!ENTITY torsettings.proxyHelpTitle "Proxy Help">
-<!ENTITY torsettings.proxyHelp1 "A local proxy might be needed when connecting through a company, school, or university network. If you are not sure whether a proxy is needed, look at the Internet settings in another browser or check your system's network settings.">
+<!ENTITY torsettings.proxyHelpTitle "Βοήθεια διακομιστή μεσολάβησης">
+<!ENTITY torsettings.proxyHelp1 "Ο τοπικός διακομιστής μεσολάβησης μπορεί να χρειαστεί, όταν συνδέεστε από μία εταιρία, ένα σχολείο ή ένα δίκτυο πανεπιστημίου. Αν δεν είστε σίγουρος αν χρειάζεστε διακομιστή μεσολάβησης, ελέγξτε τις ρυθμίσεις ίντερνετ ενός άλλου περιηγητή ή τις ρυθμίσεις του δικτύου συστήματος. ">
<!ENTITY torsettings.bridgeHelpTitle "Γεφυρες αναμεταδοτων Βοηθεια">
-<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor.">
-<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">
+<!ENTITY torsettings.bridgeHelp1 "Οι γέφυρες είναι μη καταχωρημένες διευθύνσεις που κάνουν πιο δύσκολο τον αποκλεισμό της σύνδεσης στο δίκτυο Tor.  Κάθε τύπος γέφυρας χρησιμοποιεί διαφορετική μέθοδο για να αποφύγει τον αποκλεισμό.  Οι obfs κάνουν τις κινήσεις σας να μοιάζουν με τυχαίο ήχο και οι meek κάνουν τις συνδέσεις σας να μοιάζουν πως γίνονται μέσω εκείνης της υπηρεσίας αντί του Tor.">
+<!ENTITY torsettings.bridgeHelp2 "Λόγω του τρόπου που προσπαθούν κάποιες χώρες να αποκλείσουν το Tor, κάποιες γέφυρες λειτουργούν σε κάποιες χώρες, ενώ άλλες όχι.  Αν δεν είστε σίγουρος για το ποιες γέφυρες λειτουργούν στη χώρα σας, επισκεφτείτε το torproject.org/about/contact.html#support">
<!-- Progress -->
<!ENTITY torprogress.pleaseWait "Παρακαλώ περιμένετε καθώς δημιουργήστε σύνδεση στο δίκτυο Tor.  Αυτό μπορεί να πάρει μερικά λεπτά.">
diff --git a/src/chrome/locale/el/torlauncher.properties b/src/chrome/locale/el/torlauncher.properties
index 66b0e1c..ddf3011 100644
--- a/src/chrome/locale/el/torlauncher.properties
+++ b/src/chrome/locale/el/torlauncher.properties
@@ -26,20 +26,20 @@ torlauncher.error_proxy_addr_missing=Πρέπει να καθορίσετε μί
torlauncher.error_proxy_type_missing=Πρέπει να επιλέξετε τον τύπο του πληρεξούσιου διακομηστή.
torlauncher.error_bridges_missing=Πρέπει να καθορίσετε μια ή περισσότερες γέφυρες.
torlauncher.error_default_bridges_type_missing=Πρέπει να επιλέξετε έναν τύπο μεταφοράς για τις παρεχόμενες γέφυρες.
-torlauncher.error_bridgedb_bridges_missing=Please request a bridge.
+torlauncher.error_bridgedb_bridges_missing=Παρακαλώ ζητήστε μία γέφυρα.
torlauncher.error_bridge_bad_default_type=Δεν υπάρχουν γέφυρες που έχουν το είδος μεταφοράς %S διαθέσιμες. Παρακαλούμε να προσαρμόσετε τις ρυθμίσεις σας.
-torlauncher.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
+torlauncher.bridge_suffix.meek-amazon=(λειτουργεί στην Κίνα)
+torlauncher.bridge_suffix.meek-azure=(λειτουργεί στην Κίνα)
-torlauncher.request_a_bridge=Request a Bridge…
-torlauncher.request_a_new_bridge=Request a New Bridge…
-torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait.
-torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge.
-torlauncher.bad_captcha_solution=The solution is not correct. Please try again.
-torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S
-torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges.
-torlauncher.no_bridges_available=No bridges are available at this time. Sorry.
+torlauncher.request_a_bridge=Ζητήστε μία γέφυρα...
+torlauncher.request_a_new_bridge=Ζητήστε μία καινούρια γέφυρα...
+torlauncher.contacting_bridgedb=Επικοινωνούμε με την γέφυραDB. Παρακαλώ, περιμένετε.
+torlauncher.captcha_prompt=Λύστε το CAPTCHA για να ζητήσετε γέφυρα.
+torlauncher.bad_captcha_solution=Η λύση δεν είναι σωστή. Παρακαλώ, προσπαθήστε ξανά.
+torlauncher.unable_to_get_bridge=Είναι αδύνατο να βρεθεί γέφυρα από το BridgeDB.\n\n%S
+torlauncher.no_meek=Αυτός ο περιηγητής δεν είναι φτιαγμένος για meek, το οποίο χρειάζεται για να υπάρξει πρόσβαση σε γέφυρες.
+torlauncher.no_bridges_available=Δεν υπάρχουν διαθέσιμες γέφυρες αυτή τη στιγμή. Συγγνώμη.
torlauncher.connect=Σύνδεση
torlauncher.restart_tor=Eπανεκκίνηση Tor
@@ -73,6 +73,6 @@ torlauncher.bootstrapWarning.noroute=δεν βρέθηκε διαδρομή πρ
torlauncher.bootstrapWarning.ioerror=σφάλμα ανάγνωσης/εγγραφής
torlauncher.bootstrapWarning.pt_missing=Λείπει δυνατότητα σύνδεσης μεταφοράς.
-torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost.
-torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server.
-torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy.
+torlauncher.nsresult.NS_ERROR_NET_RESET=Χάθηκε η σύνδεση στον διακομιστή.
+torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Δεν έγινε σύνδεση στον διακομιστή.
+torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Δεν έγινε σύνδεση στο διακομιστή μεσολάβησης.
diff --git a/src/chrome/locale/es-AR/network-settings.dtd b/src/chrome/locale/es-AR/network-settings.dtd
index 49e0c37..2780af2 100644
--- a/src/chrome/locale/es-AR/network-settings.dtd
+++ b/src/chrome/locale/es-AR/network-settings.dtd
@@ -1,7 +1,7 @@
<!ENTITY torsettings.dialog.title "Configuraciones de la red Tor">
-<!ENTITY torsettings.wizard.title.default "Connect to Tor">
+<!ENTITY torsettings.wizard.title.default "Conectar a Tor">
<!ENTITY torsettings.wizard.title.configure "Configuraciones de la red Tor">
-<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">
+<!ENTITY torsettings.wizard.title.connecting "Estableciendo una conexión">
<!-- For locale picker: -->
<!ENTITY torlauncher.localePicker.title "Idioma del Navegador Tor">
@@ -9,54 +9,54 @@
<!-- For "first run" wizard: -->
-<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor.">
-<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy.">
+<!ENTITY torSettings.connectPrompt "Cliqueá "Conectar" para conectar a Tor.">
+<!ENTITY torSettings.configurePrompt "Cliqueá "Configurar" para modificar los ajustes de red si estás en un país que censura Tor (tales como Egipto, China, Turquía) o si te estás conectando desde una red privada que requiere un proxy.">
<!ENTITY torSettings.configure "Configurar">
<!ENTITY torSettings.connect "Conectar">
<!-- Other: -->
-<!ENTITY torsettings.startingTor "Waiting for Tor to start…">
+<!ENTITY torsettings.startingTor "Esperando que Tor arranque...">
<!ENTITY torsettings.restartTor "Reiniciar Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
+<!ENTITY torsettings.reconfigTor "Reconfigurar">
-<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed.">
-<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
+<!ENTITY torsettings.discardSettings.prompt "Has configurado puentes Tor o has entrado ajustes para proxy local.  Para hacer una conexión directa a la red de Tor, éstos ajustes deben ser removidos.">
+<!ENTITY torsettings.discardSettings.proceed "Remover ajustes y conectar">
<!ENTITY torsettings.optional "Opcional">
-<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!ENTITY torsettings.useProxy.type "Proxy Type:">
-<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
+<!ENTITY torsettings.useProxy.checkbox "Uso un proxy para conectar a Internet">
+<!ENTITY torsettings.useProxy.type "Tipo de proxy:">
+<!ENTITY torsettings.useProxy.type.placeholder "seleccioná un tipo de proxy">
<!ENTITY torsettings.useProxy.address "Dirección:">
-<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
+<!ENTITY torsettings.useProxy.address.placeholder "Dirección IP o nombre de equipo">
<!ENTITY torsettings.useProxy.port "Puerto:">
<!ENTITY torsettings.useProxy.username "Usuario:">
<!ENTITY torsettings.useProxy.password "Contraseña:">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
-<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
-<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
-<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
-<!ENTITY torsettings.useBridges.default "Select a built-in bridge">
-<!ENTITY torsettings.useBridges.default.placeholder "select a bridge">
-<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org">
-<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image">
-<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge">
-<!ENTITY torsettings.useBridges.captchaSubmit "Submit">
-<!ENTITY torsettings.useBridges.custom "Provide a bridge I know">
-<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source.">
-<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)">
-
-<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
-
-<!ENTITY torsettings.proxyHelpTitle "Proxy Help">
-<!ENTITY torsettings.proxyHelp1 "A local proxy might be needed when connecting through a company, school, or university network. If you are not sure whether a proxy is needed, look at the Internet settings in another browser or check your system's network settings.">
-
-<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
-<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor.">
-<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">
+<!ENTITY torsettings.firewall.checkbox "Esta computadora pasa a través de un cortafuegos que sólo permite conexiones a ciertos puertos">
+<!ENTITY torsettings.firewall.allowedPorts "Puerto permitidos:">
+<!ENTITY torsettings.useBridges.checkbox "Tor está censurado en mi país">
+<!ENTITY torsettings.useBridges.default "Seleccioná un puente incorporado">
+<!ENTITY torsettings.useBridges.default.placeholder "seleccioná un puente">
+<!ENTITY torsettings.useBridges.bridgeDB "Solicitá un puente desde torproject.org">
+<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Entrá los caracteres de la imagen">
+<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Obtené un nuevo desafío">
+<!ENTITY torsettings.useBridges.captchaSubmit "Enviar">
+<!ENTITY torsettings.useBridges.custom "Proveer un puente que conozco">
+<!ENTITY torsettings.useBridges.label "Entrar información de puente desde una fuente confiable.">
+<!ENTITY torsettings.useBridges.placeholder "tipo dirección:puerto (uno por línea)">
+
+<!ENTITY torsettings.copyLog "Copiar la bitácora Tor al Portapapeles">
+
+<!ENTITY torsettings.proxyHelpTitle "Ayuda para Proxy">
+<!ENTITY torsettings.proxyHelp1 "Un proxy local puede ser necesitado cuando te estés conectando a través de una red de una compañía, escuela o universidad. Si no estás seguro si un proxy es necesario, mirá los ajustes de Internet en otro navegador o revisá tus ajustes de red del sistema.">
+
+<!ENTITY torsettings.bridgeHelpTitle "Ayuda para relevo puente">
+<!ENTITY torsettings.bridgeHelp1 "Puentes son relevos no listados que hacen más dificultoso bloquear conexiones a la red de Tor.  Cada uno de los tipos de puente usa un método diferente para evitar censura.  Los obfs hacen que tu tráfico parezca ruido aleatorio, y los meek hacen que tu tráfico parezca que se está conectando a otro servicio en vez de Tor.">
+<!ENTITY torsettings.bridgeHelp2 "Por la manera en que ciertos países intentan bloquear a Tor, ciertos puentes funcionan en ciertos países pero no otros.  Si no estás seguro acerca de cuáles puentes funcionan en tu país, visitá torproject.org/about/contact.html#support">
<!-- Progress -->
<!ENTITY torprogress.pleaseWait "Por favor, espere mientras establecemos una conexión a la red Tor.  Puede tardar varios minutos.">
diff --git a/src/chrome/locale/es-AR/torlauncher.properties b/src/chrome/locale/es-AR/torlauncher.properties
index 90fc6a2..1aa88ea 100644
--- a/src/chrome/locale/es-AR/torlauncher.properties
+++ b/src/chrome/locale/es-AR/torlauncher.properties
@@ -3,7 +3,7 @@
torlauncher.error_title=Lanzador de Tor
-torlauncher.tor_exited_during_startup=Tor exited during startup. This might be due to an error in your torrc file, a bug in Tor or another program on your system, or faulty hardware. Until you fix the underlying problem and restart Tor, Tor Browser will not start.
+torlauncher.tor_exited_during_startup=Tor se cerró durante el arranque. Esto puede deberse a un error en tu archivo torrc, un fallo en Tor u otro programa en tu sistema, o componentes electrónicos defectuosos. Hasta que arregles el problema subyacente y reinicies Tor, el navegador Tor no arrancará.
torlauncher.tor_exited=Tor se cerró inesperadamente. Esto pudo ser debido a un error dentro de Tor, otro programa en tu sistema, o hardware defectuoso. Hasta que reinicies Tor, el navegador Tor no será capaz de acceder a sitios web. Si el problema persiste, por favor envía una copia de tu archivo de registro de Tor al equipo de soporte técnico.
torlauncher.tor_exited2=Reiniciar Tor no cerrará las pestañas de navegación.
torlauncher.tor_controlconn_failed=No se pudo conectar Tor con el puerto de control
@@ -26,20 +26,20 @@ torlauncher.error_proxy_addr_missing=Debes especificar tu IP o el nombre de tu H
torlauncher.error_proxy_type_missing=Debes seleccionar el tipo de Proxy.
torlauncher.error_bridges_missing=Debes especificar uno o más puentes.
torlauncher.error_default_bridges_type_missing=Debe seleccionar un tipo de transporte para los puentes provistos.
-torlauncher.error_bridgedb_bridges_missing=Please request a bridge.
+torlauncher.error_bridgedb_bridges_missing=Por favor solicitá un puente.
torlauncher.error_bridge_bad_default_type=No hay puentes disponibles que tengan el tipo de transporte %S. Por favor ajuste su configuración.
-torlauncher.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
+torlauncher.bridge_suffix.meek-amazon=(funciona en China)
+torlauncher.bridge_suffix.meek-azure=(funciona en China)
-torlauncher.request_a_bridge=Request a Bridge…
-torlauncher.request_a_new_bridge=Request a New Bridge…
-torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait.
-torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge.
-torlauncher.bad_captcha_solution=The solution is not correct. Please try again.
-torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S
-torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges.
-torlauncher.no_bridges_available=No bridges are available at this time. Sorry.
+torlauncher.request_a_bridge=Solicitá un puente...
+torlauncher.request_a_new_bridge=Solicitá un nuevo puente...
+torlauncher.contacting_bridgedb=Contactando BridgeDB. Por favor esperá.
+torlauncher.captcha_prompt=Solucioná el CAPTCHA para solicitar un puente.
+torlauncher.bad_captcha_solution=La solución no es correcta. Por favor intentá de nuevo.
+torlauncher.unable_to_get_bridge=Incapaz de obtener un puente desde BridgeDB.\n\n%S
+torlauncher.no_meek=Este navegador no está configurado para meek, el cual es necesario para obtener puentes.
+torlauncher.no_bridges_available=No hay puentes disponibles en este momento. Lo lamentamos.
torlauncher.connect=Conectar
torlauncher.restart_tor=Reiniciar Tor
@@ -73,6 +73,6 @@ torlauncher.bootstrapWarning.noroute=sin ruta al servidor
torlauncher.bootstrapWarning.ioerror=error de lectura/escritura
torlauncher.bootstrapWarning.pt_missing=Perdida de la conectividad\n
-torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost.
-torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server.
-torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy.
+torlauncher.nsresult.NS_ERROR_NET_RESET=La conexión al servidor fue perdida.
+torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=No se pudo conectar al servidor.
+torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=No se pudo conectar al proxy.
diff --git a/src/chrome/locale/es/network-settings.dtd b/src/chrome/locale/es/network-settings.dtd
index 111c7ad..bb642d3 100644
--- a/src/chrome/locale/es/network-settings.dtd
+++ b/src/chrome/locale/es/network-settings.dtd
@@ -52,7 +52,7 @@
<!ENTITY torsettings.copyLog "Copiar el registro de mensajes(log) de Tor al portapapeles">
<!ENTITY torsettings.proxyHelpTitle "Ayuda ">
-<!ENTITY torsettings.proxyHelp1 "Es posible que se necesite un proxy local al conectarse a través de una red de una empresa, escuela o universidad. Si no estás seguro de si se necesita o no un proxy, consulta la configuración de Internet en otro navegador o comprueba la configuración de red de tu sistema.">
+<!ENTITY torsettings.proxyHelp1 "Es posible que se necesite un proxy local al conectarse a través de una red de una empresa, escuela o universidad. Si no estás seguro de si se necesita o no un proxy, consulta la configuración de Internet en otro navegador o comprueba la configuración de red de tu sistema.">
<!ENTITY torsettings.bridgeHelpTitle "Ayuda de repetidores puente ('bridge relays')">
<!ENTITY torsettings.bridgeHelp1 "Los puentes son transmisores no listados que dificultan el bloqueo de las conexiones a la red Tor.  Cada tipo de puente utiliza un método diferente para evitar la censura.  Los obfs hacen que tu tráfico parezca ruido aleatorio, y los modestos hacen que tu tráfico parezca que se está conectando a ese servicio en lugar de a Tor.">
diff --git a/src/chrome/locale/et/torlauncher.properties b/src/chrome/locale/et/torlauncher.properties
index ef72391..f0cc216 100644
--- a/src/chrome/locale/et/torlauncher.properties
+++ b/src/chrome/locale/et/torlauncher.properties
@@ -43,7 +43,7 @@ torlauncher.no_bridges_available=No bridges are available at this time. Sorry.
torlauncher.connect=Ühenda
torlauncher.restart_tor=Taaskäivita Tor
-torlauncher.quit=Quit
+torlauncher.quit=Välju
torlauncher.quit_win=Välju
torlauncher.done=Valmis
diff --git a/src/chrome/locale/fr/torlauncher.properties b/src/chrome/locale/fr/torlauncher.properties
index e3a4b03..c44fa36 100644
--- a/src/chrome/locale/fr/torlauncher.properties
+++ b/src/chrome/locale/fr/torlauncher.properties
@@ -39,7 +39,7 @@ torlauncher.captcha_prompt=Résoudre le CAPTCHA pour demander un pont.
torlauncher.bad_captcha_solution=La solution est erronée. Veuillez ressayer.
torlauncher.unable_to_get_bridge=Impossible d’obtenir un pont de BridgeDB.\n\n%S
torlauncher.no_meek=Ce navigateur n’est pas configuré pour meek, qui est nécessaire pour obtenir des ponts.
-torlauncher.no_bridges_available=Aucun pont n’est proposé pour l'instant. Désolé.
+torlauncher.no_bridges_available=Aucun pont n’est proposé pour l’instant. Désolé.
torlauncher.connect=Se connecter
torlauncher.restart_tor=Redémarrer Tor
diff --git a/src/chrome/locale/ga/network-settings.dtd b/src/chrome/locale/ga/network-settings.dtd
index 94cb85d..ec8c51c 100644
--- a/src/chrome/locale/ga/network-settings.dtd
+++ b/src/chrome/locale/ga/network-settings.dtd
@@ -52,7 +52,7 @@
<!ENTITY torsettings.copyLog "Cóipeáil Logchomhad Tor go dtí an Ghearrthaisce">
<!ENTITY torsettings.proxyHelpTitle "Cabhair le Seachfhreastalaithe">
-<!ENTITY torsettings.proxyHelp1 "A local proxy might be needed when connecting through a company, school, or university network. If you are not sure whether a proxy is needed, look at the Internet settings in another browser or check your system's network settings.">
+<!ENTITY torsettings.proxyHelp1 "Uaireanta úsáidtear seachfhreastalaí áitiúil nuair a cheanglaítear ó líonra i gcomhlacht, i scoil, nó in ollscoil. Mura bhfuil tú cinnte an dteastaíonn seachfhreastalaí uait, caith súil ar na socruithe Idirlín i mbrabhsálaí eile, nó ar shocruithe líonra do chórais.">
<!ENTITY torsettings.bridgeHelpTitle "Cabhair le Droichid">
<!ENTITY torsettings.bridgeHelp1 "Tá sé níos deacra cosc a chur ar cheangail le Líonra Tor nuair a úsáideann tú droichead, cineál athsheachadán neamhliostaithe. Úsáideann gach droichead modh difriúil leis an gcinsireacht a sheachaint. Mar shampla, cuireann na droichid obfs cuma randamach ar do thrácht líonra, agus leis na cinn meek, dealraíonn sé go bhfuil tú ag ceangal leis an tseirbhís sin seachas le Tor.">
diff --git a/src/chrome/locale/id/network-settings.dtd b/src/chrome/locale/id/network-settings.dtd
index 245ca28..6667c5a 100644
--- a/src/chrome/locale/id/network-settings.dtd
+++ b/src/chrome/locale/id/network-settings.dtd
@@ -52,7 +52,7 @@
<!ENTITY torsettings.copyLog "Salin Log Tor Ke Clipboard">
<!ENTITY torsettings.proxyHelpTitle "Bantuan untuk Proxy">
-<!ENTITY torsettings.proxyHelp1 "A local proxy might be needed when connecting through a company, school, or university network. If you are not sure whether a proxy is needed, look at the Internet settings in another browser or check your system's network settings.">
+<!ENTITY torsettings.proxyHelp1 "Proxy lokal diperlukan ketika mencoba terhubung dari jaringan perusahaan, sekolah, atau universitas.  Jika anda tidak yakin bagaimana untuk menjawab pertanyaan ini, lihat pengaturan Internet di peramban lainnya atau periksa pengaturan sistem jaringan Anda untuk melihat apakah proksi lokal dibutuhkan.">
<!ENTITY torsettings.bridgeHelpTitle "Bantuan Bridge Relay">
<!ENTITY torsettings.bridgeHelp1 "Bridges adalah relays yang tidak terdaftar, yang membuat pemblokiran sambungan di Jaringan Tor lebih sulit dilakukan.  Setiap jenis bridge menggunakan metode yang berbeda untuk menghindari sensor.  Jenis obfs membuat sambungan Anda terlihat seperti kegiatan acak dan jenis meek membuat sambungan Anda terlihat tersambung ke layanan tersebut, bukan ke Tor.">
diff --git a/src/chrome/locale/ka/torlauncher.properties b/src/chrome/locale/ka/torlauncher.properties
index 1b5606d..2218a43 100644
--- a/src/chrome/locale/ka/torlauncher.properties
+++ b/src/chrome/locale/ka/torlauncher.properties
@@ -8,19 +8,19 @@ torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in To
torlauncher.tor_exited2=Tor-ის ხელახლა ჩართვით თქვენი ბრაუზერის ჩანართები არ დაიხურება.
torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
torlauncher.tor_failed_to_start=Tor-ის გაშვება ვერ მოხერხდა.
-torlauncher.tor_control_failed=Failed to take control of Tor.
-torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
+torlauncher.tor_control_failed=Tor-ის მართვა ვერ ხერხდება.
+torlauncher.tor_bootstrap_failed=Tor ვერ ახერხებს Tor-ქსელთან კავშირის დამყარებას.
torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
-torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
-torlauncher.tor_missing=The Tor executable is missing.
+torlauncher.unable_to_start_tor=Tor-ის გაშვება ვერ ხერხდება.\n\n%S
+torlauncher.tor_missing=Tor-ის გამშვები ვერ მოიძებნა.
torlauncher.torrc_missing=The torrc file is missing and could not be created.
-torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
-torlauncher.password_hash_missing=Failed to get hashed password.
+torlauncher.datadir_missing=Tor-ის მონაცემთა საქაღალდე არ არსებობს და ვერ შეიქმნება.
+torlauncher.password_hash_missing=ჰეშირებული პაროლის მიღება ვერ მოხერხდა.
-torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
-torlauncher.failed_to_save_settings=Unable to save Tor settings.\n\n%S
-torlauncher.ensure_tor_is_running=Please ensure that Tor is running.
+torlauncher.failed_to_get_settings=Tor-ის პარამეტრების მიღება ვერ ხერხდება.\n\n%S
+torlauncher.failed_to_save_settings=Tor-ის პარამეტრების შენახვა ვერ ხერხდება.\n\n%S
+torlauncher.ensure_tor_is_running=გთხოვთ დარწმუნდეთ, რომ Tor გაშვებულია.
torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
torlauncher.error_proxy_type_missing=You must select the proxy type.
diff --git a/src/chrome/locale/mr/torlauncher.properties b/src/chrome/locale/mr/torlauncher.properties
index b8d69df..8d8494a 100644
--- a/src/chrome/locale/mr/torlauncher.properties
+++ b/src/chrome/locale/mr/torlauncher.properties
@@ -5,12 +5,12 @@ torlauncher.error_title=टॉर लाँचर
torlauncher.tor_exited_during_startup=Tor exited during startup. This might be due to an error in your torrc file, a bug in Tor or another program on your system, or faulty hardware. Until you fix the underlying problem and restart Tor, Tor Browser will not start.
torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
-torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
+torlauncher.tor_exited2=टॉर रीस्टार्ट केल्याने आपले ब्राउझर टॅब बंद होणार नाही
torlauncher.tor_controlconn_failed=टॉर नियंत्रण पोर्टला जोडण्यात अपयश.
torlauncher.tor_failed_to_start=टॉर सुरू होण्यात अपयश.
-torlauncher.tor_control_failed=Failed to take control of Tor.
-torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
-torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
+torlauncher.tor_control_failed=टॉरचा ताबा घेण्यास अयशस्वी
+torlauncher.tor_bootstrap_failed=टॉर एक टॉर नेटवर्क कनेक्शन स्थापित करण्यात अयशस्वी.
+torlauncher.tor_bootstrap_failed_details=%1$S अयशस्वी (%2$S).
torlauncher.unable_to_start_tor=टॉर सुरू करण्यात अपयश.\n\n%S
torlauncher.tor_missing=टॉरची प्रोग्राम फाइल अनुपस्थित.
@@ -25,18 +25,18 @@ torlauncher.ensure_tor_is_running=कृपया टॉर सुरू अस
torlauncher.error_proxy_addr_missing=टॉरद्वारे महाजालाचा वापर करण्यासाठी IP अॅड्रेस किंवा होस्टनेम आणि पोर्ट क्रमांक ह्या दोन्ही गोष्टी पुरवणे आवश्यक आहे.
torlauncher.error_proxy_type_missing=प्रॉक्सी प्रकार निवडणे अनिवार्य आहे.
torlauncher.error_bridges_missing=एक किंवा अधिक ब्रिजेस नमुद करणे अनिवार्य आहे.
-torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges.
-torlauncher.error_bridgedb_bridges_missing=Please request a bridge.
+torlauncher.error_default_bridges_type_missing=आपण पुरविलेल्या पुलांसाठी एक परिवहन प्रकार निवडणे आवश्यक आहे.
+torlauncher.error_bridgedb_bridges_missing=कृपया पुलची विनंती करा.
torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings.
-torlauncher.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
+torlauncher.bridge_suffix.meek-amazon=(चीनमध्ये कार्य करते)
+torlauncher.bridge_suffix.meek-azure=(चीनमध्ये कार्य करते)
-torlauncher.request_a_bridge=Request a Bridge…
-torlauncher.request_a_new_bridge=Request a New Bridge…
-torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait.
-torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge.
-torlauncher.bad_captcha_solution=The solution is not correct. Please try again.
+torlauncher.request_a_bridge=ब्रिज विनंती ...
+torlauncher.request_a_new_bridge=नवीन ब्रिजची विनंती करा ...
+torlauncher.contacting_bridgedb=ब्रिजडिबशी संपर्क साधणे कृपया थांबा.
+torlauncher.captcha_prompt=पुलाची विनंती करण्यासाठी कॅप्चाचे निरसन करा.
+torlauncher.bad_captcha_solution=उपाय बरोबर नाही. कृपया पुन्हा प्रयत्न करा.
torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S
torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges.
torlauncher.no_bridges_available=No bridges are available at this time. Sorry.
diff --git a/src/chrome/locale/pt/network-settings.dtd b/src/chrome/locale/pt/network-settings.dtd
index 42b9cd4..8876712 100644
--- a/src/chrome/locale/pt/network-settings.dtd
+++ b/src/chrome/locale/pt/network-settings.dtd
@@ -52,7 +52,7 @@
<!ENTITY torsettings.copyLog "Copiar o Registo do Tor para a Área de Transferência">
<!ENTITY torsettings.proxyHelpTitle "Ajuda de Proxy">
-<!ENTITY torsettings.proxyHelp1 "A local proxy might be needed when connecting through a company, school, or university network. If you are not sure whether a proxy is needed, look at the Internet settings in another browser or check your system's network settings.">
+<!ENTITY torsettings.proxyHelp1 "Um proxy local pode ser necessário ao conectar-se através de uma empresa, escola ou rede universitária. Se você não tiver certeza se um proxy é necessário, verifique as configurações da Internet em outro navegador ou verifique as configurações de rede do seu sistema.">
<!ENTITY torsettings.bridgeHelpTitle "Ajuda da Retransmissão de Ponte">
<!ENTITY torsettings.bridgeHelp1 "As pontes são retransmissões não listadas que dificultam o bloqueio de ligações à Rede Tor. Cada tipo de ponte utiliza um método diferente para evitar a censura. Os "obfs" fazem com que o seu tráfego pareça um ruído aleatório, e os pacíficos fazem com que o seu tráfego pareça que está a ligar-se ao serviço, em vez ao Tor.">
diff --git a/src/chrome/locale/ro/network-settings.dtd b/src/chrome/locale/ro/network-settings.dtd
index 2bad00b..628b5fa 100644
--- a/src/chrome/locale/ro/network-settings.dtd
+++ b/src/chrome/locale/ro/network-settings.dtd
@@ -41,8 +41,8 @@
<!ENTITY torsettings.useBridges.checkbox "Tor este cenzurat în țara mea">
<!ENTITY torsettings.useBridges.default "Selectează o punte integrată">
<!ENTITY torsettings.useBridges.default.placeholder "selectează o punte">
-<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org">
-<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image">
+<!ENTITY torsettings.useBridges.bridgeDB "Cere o punte de la torproject.org">
+<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Introdu caracterele din imagine">
<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge">
<!ENTITY torsettings.useBridges.captchaSubmit "A depune">
<!ENTITY torsettings.useBridges.custom "Furnizează o punte pe care o știu">
@@ -52,7 +52,7 @@
<!ENTITY torsettings.copyLog "Copiați jurnalul Tor în Clipboard">
<!ENTITY torsettings.proxyHelpTitle "Ajutor Proxy">
-<!ENTITY torsettings.proxyHelp1 "A local proxy might be needed when connecting through a company, school, or university network. If you are not sure whether a proxy is needed, look at the Internet settings in another browser or check your system's network settings.">
+<!ENTITY torsettings.proxyHelp1 "Un proxy local ar putea fi necesar la conectarea din rețeaua unei companii, școli sau universități. Dacă nu ești sigur că un proxy ar fi necesar, vezi setările pentru Internet în alt navigator web sau verifică setările de rețea.">
<!ENTITY torsettings.bridgeHelpTitle "Ajutor Bridge Relay">
<!ENTITY torsettings.bridgeHelp1 "Punțile sunt relee ne-listate care fac mai dificilă blocarea conexiunilor spre Rețeaua Tor.   Fiecare tip de punte folosește o altă metodă pentru a evita cenzura.   Cele obfs fac traficul tău să semene cu zgomot aleatoriu, iar cele meek fac traficul să pară că se conectează la acel serviciu în loc de Tor.">
diff --git a/src/chrome/locale/ro/torlauncher.properties b/src/chrome/locale/ro/torlauncher.properties
index 1c6f761..6ec6f26 100644
--- a/src/chrome/locale/ro/torlauncher.properties
+++ b/src/chrome/locale/ro/torlauncher.properties
@@ -26,20 +26,20 @@ torlauncher.error_proxy_addr_missing=Pentru a folosi Tor ca proxy, prin care să
torlauncher.error_proxy_type_missing=Trebuie să selectezi un tip de proxy.
torlauncher.error_bridges_missing=Trebuie sa specifici una sau mai multe poduri.
torlauncher.error_default_bridges_type_missing=Trebuie să alegeți un tip de transport pentru punțile oferite
-torlauncher.error_bridgedb_bridges_missing=Please request a bridge.
+torlauncher.error_bridgedb_bridges_missing=Te rog să ceri o punte
torlauncher.error_bridge_bad_default_type=Nici una din punțile oferite care să ofere transport tip %S este disponibilă. Ajutați setările.
torlauncher.bridge_suffix.meek-amazon=(funcționează în China)
torlauncher.bridge_suffix.meek-azure=(funcționează în China)
-torlauncher.request_a_bridge=Request a Bridge…
-torlauncher.request_a_new_bridge=Request a New Bridge…
-torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait.
+torlauncher.request_a_bridge=Cere o punte...
+torlauncher.request_a_new_bridge=Cere o punte nouă…
+torlauncher.contacting_bridgedb=Se contactează BridgeDB. Așteptați.
torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge.
-torlauncher.bad_captcha_solution=The solution is not correct. Please try again.
-torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S
+torlauncher.bad_captcha_solution=Soluția nu este corectă. Încearcă din nou.
+torlauncher.unable_to_get_bridge=Nu s-a putut obține o punte de la BridgeDB.\n\n%S
torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges.
-torlauncher.no_bridges_available=No bridges are available at this time. Sorry.
+torlauncher.no_bridges_available=Nicio punte disponibilă în acest moment. Scuze.
torlauncher.connect=Conectare
torlauncher.restart_tor=Repornește Tor
@@ -73,6 +73,6 @@ torlauncher.bootstrapWarning.noroute=nici o rută către gazdă
torlauncher.bootstrapWarning.ioerror=eroare la scriere/citire
torlauncher.bootstrapWarning.pt_missing=pluggable transport lipsă
-torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost.
-torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server.
-torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy.
+torlauncher.nsresult.NS_ERROR_NET_RESET=Conexiunea cu serverul a fost pierdută.
+torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Nu s-a putut conecta la server.
+torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Nu s-a putut conecta la proxy.
diff --git a/src/chrome/locale/ru/network-settings.dtd b/src/chrome/locale/ru/network-settings.dtd
index c834805..85d3a07 100644
--- a/src/chrome/locale/ru/network-settings.dtd
+++ b/src/chrome/locale/ru/network-settings.dtd
@@ -52,7 +52,7 @@
<!ENTITY torsettings.copyLog "Скопировать журнал Tor в буфер обмена">
<!ENTITY torsettings.proxyHelpTitle "Помощь по прокси">
-<!ENTITY torsettings.proxyHelp1 "A local proxy might be needed when connecting through a company, school, or university network. If you are not sure whether a proxy is needed, look at the Internet settings in another browser or check your system's network settings.">
+<!ENTITY torsettings.proxyHelp1 "Локальный прокси-сервер может понадобиться при подключении через сеть компаний, школ или университетов. Если вы не уверены в необходимости прокси-сервера, посмотрите настройки Интернета в другом браузере или проверьте сетевые настройки вашей системы.">
<!ENTITY torsettings.bridgeHelpTitle "Помощь по ретрансляторам типа мост">
<!ENTITY torsettings.bridgeHelp1 "Мосты - это незарегистрированные реле, которые затрудняют блокировку соединений с сетью Tor.&#160 Каждый тип моста использует отличный от других метод, чтобы избежать блокировки цезорами. Обходные устройства делают ваш трафик похожим на случайный шум и имитируют то, что он подключается к этой службе вместо Tor.">
diff --git a/src/chrome/locale/sr/network-settings.dtd b/src/chrome/locale/sr/network-settings.dtd
index 93b9b0b..e0d20a9 100644
--- a/src/chrome/locale/sr/network-settings.dtd
+++ b/src/chrome/locale/sr/network-settings.dtd
@@ -1,5 +1,5 @@
<!ENTITY torsettings.dialog.title "Подешавања Тор мреже">
-<!ENTITY torsettings.wizard.title.default "Connect to Tor">
+<!ENTITY torsettings.wizard.title.default "Повежите се на Тор">
<!ENTITY torsettings.wizard.title.configure "Подешавања Тор мреже">
<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">
@@ -9,7 +9,7 @@
<!-- For "first run" wizard: -->
-<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor.">
+<!ENTITY torSettings.connectPrompt "Кликните на "Повежи се" да би сте се повезали на Тор">
<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy.">
<!ENTITY torSettings.configure "Конфигуриши">
<!ENTITY torSettings.connect "Повежи се">
@@ -18,7 +18,7 @@
<!ENTITY torsettings.startingTor "Чекамо да се Тор покрене...">
<!ENTITY torsettings.restartTor "Поново покрени Тор">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
+<!ENTITY torsettings.reconfigTor "Поново Конфигуриши">
<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed.">
<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
@@ -27,7 +27,7 @@
<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
<!ENTITY torsettings.useProxy.type "Врста proxyja:">
-<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
+<!ENTITY torsettings.useProxy.type.placeholder "изаберите тип проксија">
<!ENTITY torsettings.useProxy.address "Adresa:">
<!ENTITY torsettings.useProxy.address.placeholder "IP адреса или hostname">
<!ENTITY torsettings.useProxy.port "Порт:">
@@ -38,7 +38,7 @@
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "Овај рачунар пролази кроз firewall који дозвољава само конекције на одређене портове.">
<!ENTITY torsettings.firewall.allowedPorts "Дозвољени Портови:">
-<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
+<!ENTITY torsettings.useBridges.checkbox "Тор је цензурисан у мојој земљи">
<!ENTITY torsettings.useBridges.default "Select a built-in bridge">
<!ENTITY torsettings.useBridges.default.placeholder "select a bridge">
<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org">
diff --git a/src/chrome/locale/tr/network-settings.dtd b/src/chrome/locale/tr/network-settings.dtd
index 55e1244..f8a047e 100644
--- a/src/chrome/locale/tr/network-settings.dtd
+++ b/src/chrome/locale/tr/network-settings.dtd
@@ -16,8 +16,8 @@
<!-- Other: -->
-<!ENTITY torsettings.startingTor "Tor'un başlaması bekleniyor…">
-<!ENTITY torsettings.restartTor "Tor'u Yeniden Başlat">
+<!ENTITY torsettings.startingTor "Tor uygulamasının başlaması bekleniyor…">
+<!ENTITY torsettings.restartTor "Tor Uygulamasını Yeniden Başlat">
<!ENTITY torsettings.reconfigTor "Yeniden Yapılandır">
<!ENTITY torsettings.discardSettings.prompt "Tor Köprülerini yapılandırdınız ya da yerel vekil sunucu ayarlarını yazdınız.  Tor ağına doğrudan bağlanmak için bu ayarlar kaldırılmalıdır.">
@@ -30,33 +30,33 @@
<!ENTITY torsettings.useProxy.type.placeholder "vekil sunucu türünü seçin">
<!ENTITY torsettings.useProxy.address "Adres:">
<!ENTITY torsettings.useProxy.address.placeholder "IP adresi ya da sunucu adı">
-<!ENTITY torsettings.useProxy.port "Bağlantı noktası:">
-<!ENTITY torsettings.useProxy.username "Kullanıcı adı:">
+<!ENTITY torsettings.useProxy.port "Kapı Numarası:">
+<!ENTITY torsettings.useProxy.username "Kullanıcı Adı:">
<!ENTITY torsettings.useProxy.password "Parola:">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
-<!ENTITY torsettings.firewall.checkbox "Bu bilgisayar yalnız belirli bağlantı noktalarına bağlanmaya izin veren bir güvenlik duvarı kullanıyor">
-<!ENTITY torsettings.firewall.allowedPorts "İzin Verilen Bağlantı Noktaları:">
-<!ENTITY torsettings.useBridges.checkbox "Bulunduğum ülkede Tor engelleniyor">
-<!ENTITY torsettings.useBridges.default "Bir hazır köprü seçin">
+<!ENTITY torsettings.firewall.checkbox "Bu bilgisayarda yalnız belirli kapı numaralarından bağlanılmasına izin veren bir güvenlik duvarı kullanılıyor">
+<!ENTITY torsettings.firewall.allowedPorts "Kullanılabilecek Kapı Numaraları:">
+<!ENTITY torsettings.useBridges.checkbox "Bulunduğum ülkede Tor ağı engelleniyor">
+<!ENTITY torsettings.useBridges.default "Hazır Köprülerden Seçin">
<!ENTITY torsettings.useBridges.default.placeholder "bir köprü seçin">
<!ENTITY torsettings.useBridges.bridgeDB "torproject.org üzerinden bir köprü isteyin">
<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Görseldeki karakterleri yazın">
<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Yeni bir güvenlik kodu isteyin">
<!ENTITY torsettings.useBridges.captchaSubmit "Gönder">
-<!ENTITY torsettings.useBridges.custom "Bildiğim bir köprü sağla">
-<!ENTITY torsettings.useBridges.label "Güvenli bir kaynaktan gelen köprü bilgisini yazın.">
+<!ENTITY torsettings.useBridges.custom "Bildiğim Bir Köprüyü Kullanacağım">
+<!ENTITY torsettings.useBridges.label "Güvenli bir kaynaktan aldığınız köprü bilgilerini yazın.">
<!ENTITY torsettings.useBridges.placeholder "adres:kapı numarası şeklinde yazın (her satıra bir tane)">
<!ENTITY torsettings.copyLog "Tor Günlüğünü Panoya Kopyala">
<!ENTITY torsettings.proxyHelpTitle "Vekil Sunucu Yardımı">
-<!ENTITY torsettings.proxyHelp1 "Bir kurum, okul ya da üniversite ağı aracılığıyla bağlanırken yerel bir vekil sunucu gereklidir. Bir vekil sunucu kullanıp kullanmamanız gerektiğinden emin değilseniz, bilgisayarınızın ağa bağlantı şeklini anlamak için başka bir tarayıcıdaki İnternet ayarlarına bakın ya da sisteminizin ağ ayarlarını gözden geçirin.">
+<!ENTITY torsettings.proxyHelp1 "Bir kurum, okul ya da üniversite ağı aracılığıyla bağlanırken yerel bir vekil sunucu gereklidir. Bir vekil sunucu kullanıp kullanmamanız gerektiğinden emin değilseniz, bilgisayarınızın ağa bağlantı şeklini anlamak için aynı ağdaki başka bir web tarayıcısının İnternet ayarlarına bakın ya da sisteminizin ağ ayarlarını gözden geçirin.">
<!ENTITY torsettings.bridgeHelpTitle "Köprü Aktarıcı Yardımı">
-<!ENTITY torsettings.bridgeHelp1 "Köprüler, Tor Ağına bağlantıların engellenmesini zorlaştıran listelenmemiş aktarıcılardır.  Her köprü türü engellemeden kaçınmak için farklı bir yöntem kullanır.  Obfs köprüler, trafiğinizi rastgele gürültü gibi gösterir ve meek köprüleri ise, trafiğinizi Tor yerine o hizmete bağlanmış gibi gösterir.">
-<!ENTITY torsettings.bridgeHelp2 "Bazı ülkelerin Tor ağını engellemeye çalışması nedeniyle bazı köprüler bazı ülkelerde çalışır ancak diğer ülkelerde çalışmaz.  Ülkenizde hangi köprülerin çalışacağından emin değilseniz, torproject.org/about/contact.html#support adresine bakın.">
+<!ENTITY torsettings.bridgeHelp1 "Köprüler, Tor Ağına bağlantıların engellenmesini zorlaştıran ve herkese açık olarak listelenmeyen aktarıcılardır.  Her köprü türü engellemeden kaçınmak için farklı bir yöntem kullanır.  Obfs köprüleri, ağ trafiğinizi rastgele gürültü gibi gösterir. Meek köprüleri ise, trafiğinizi Tor ağı yerine o hizmete bağlanmış gibi gösterir.">
+<!ENTITY torsettings.bridgeHelp2 "Bazı ülkelerin Tor ağını engellemeye çalışması nedeniyle bazı köprüler bazı ülkelerde çalışırken başka ülkelerde çalışmayabilir.  Ülkenizde hangi köprülerin çalışacağından emin değilseniz, torproject.org/about/contact.html#support adresine bakabilirsiniz.">
<!-- Progress -->
<!ENTITY torprogress.pleaseWait "Lütfen Tor  ağı ile bağlantı kurulurken bekleyin. Bu işlem birkaç dakika sürebilir.">
diff --git a/src/chrome/locale/tr/torlauncher.properties b/src/chrome/locale/tr/torlauncher.properties
index a4b3f28..e30c41d 100644
--- a/src/chrome/locale/tr/torlauncher.properties
+++ b/src/chrome/locale/tr/torlauncher.properties
@@ -15,12 +15,12 @@ torlauncher.tor_bootstrap_failed_details=%1$S başarısız oldu (%2$S).
torlauncher.unable_to_start_tor=Tor başlatılamadı.\n\n%S
torlauncher.tor_missing=Çalıştırılabilecek Tor dosyası bulunamadı.
torlauncher.torrc_missing="Torcc" dosyası eksik ve oluşturulamadı.
-torlauncher.datadir_missing=Tor veri dizini bulunamadı ve oluşturulamadı.
+torlauncher.datadir_missing=Tor veri klasörü bulunamadı ve oluşturulamadı.
torlauncher.password_hash_missing=Karılmış parola alınamadı.
torlauncher.failed_to_get_settings=Tor ayarları alınamadı.\n\n%S
torlauncher.failed_to_save_settings=Tor ayarları kaydedilemedi.\n\n%S
-torlauncher.ensure_tor_is_running=Lütfen Tor'un çalıştığından emin olun.
+torlauncher.ensure_tor_is_running=Lütfen Tor uygulamasının çalıştığından emin olun.
torlauncher.error_proxy_addr_missing=İnternet'e bir vekil sunucu üzerinden bağlanmak için bir IP adresi ya da sunucu adı ile bağlantı noktası numarasının yazılması gereklidir.
torlauncher.error_proxy_type_missing=Vekil sunucu türünü seçmelisiniz.
@@ -42,13 +42,13 @@ torlauncher.no_meek=Bu tarayıcı, köprüleri katmak için gerekli meek uygulam
torlauncher.no_bridges_available=Maalesef şu anda kullanılabilecek bir köprü yok.
torlauncher.connect=Bağlan
-torlauncher.restart_tor=Tor'u Yeniden Başlat
+torlauncher.restart_tor=Tor Uygulamasını Yeniden Başlat
torlauncher.quit=Çık
torlauncher.quit_win=Çıkış
torlauncher.done=Tamamlandı
torlauncher.forAssistance=Yardım almak için %S ile görüşün
-torlauncher.forAssistance2=Yardım almak için, %S sayfasına bakın
+torlauncher.forAssistance2=Yardım almak için, %S sayfasına bakabilirsiniz
torlauncher.copiedNLogMessages=Kopyalama tamamlandı. %S Tor günlük iletisi bir metin düzenleyici ya da e-posta iletisine kopyalanmaya hazır.
1
0
commit 53e871e2e44733bdf8e115831e608c657c8849c0
Author: Georg Koppen <gk(a)torproject.org>
Date: Fri Aug 31 04:44:54 2018 +0000
Translations update
---
src/chrome/locale/ar/aboutTBUpdate.dtd | 4 +++
src/chrome/locale/ar/aboutTor.dtd | 9 ++++--
src/chrome/locale/ar/browserOnboarding.properties | 36 ++++++++++++++++------
src/chrome/locale/ar/torbutton.properties | 3 --
src/chrome/locale/bn-BD/aboutTBUpdate.dtd | 4 +++
src/chrome/locale/bn-BD/aboutTor.dtd | 3 ++
.../locale/bn-BD/browserOnboarding.properties | 36 ++++++++++++++++------
src/chrome/locale/bn-BD/torbutton.properties | 5 +--
src/chrome/locale/ca/aboutTBUpdate.dtd | 4 +++
src/chrome/locale/ca/aboutTor.dtd | 17 +++++-----
src/chrome/locale/ca/browserOnboarding.properties | 36 ++++++++++++++++------
src/chrome/locale/ca/torbutton.properties | 3 --
src/chrome/locale/da/aboutTBUpdate.dtd | 4 +++
src/chrome/locale/da/aboutTor.dtd | 5 ++-
src/chrome/locale/da/browserOnboarding.properties | 36 ++++++++++++++++------
src/chrome/locale/da/torbutton.properties | 3 --
src/chrome/locale/de/aboutTBUpdate.dtd | 4 +++
src/chrome/locale/de/aboutTor.dtd | 5 ++-
src/chrome/locale/de/browserOnboarding.properties | 36 ++++++++++++++++------
src/chrome/locale/de/torbutton.properties | 3 --
src/chrome/locale/es/aboutTBUpdate.dtd | 4 +++
src/chrome/locale/es/aboutTor.dtd | 3 ++
src/chrome/locale/es/browserOnboarding.properties | 36 ++++++++++++++++------
src/chrome/locale/es/torbutton.properties | 3 --
src/chrome/locale/eu/aboutTBUpdate.dtd | 4 +++
src/chrome/locale/eu/aboutTor.dtd | 3 ++
src/chrome/locale/eu/browserOnboarding.properties | 36 ++++++++++++++++------
src/chrome/locale/eu/torbutton.properties | 3 --
src/chrome/locale/fa/aboutTBUpdate.dtd | 4 +++
src/chrome/locale/fa/aboutTor.dtd | 3 ++
src/chrome/locale/fa/browserOnboarding.properties | 36 ++++++++++++++++------
src/chrome/locale/fa/torbutton.properties | 3 --
src/chrome/locale/fr/aboutTBUpdate.dtd | 4 +++
src/chrome/locale/fr/aboutTor.dtd | 17 +++++-----
src/chrome/locale/fr/browserOnboarding.properties | 36 ++++++++++++++++------
src/chrome/locale/fr/torbutton.properties | 3 --
src/chrome/locale/ga/aboutTBUpdate.dtd | 4 +++
src/chrome/locale/ga/aboutTor.dtd | 3 ++
src/chrome/locale/ga/browserOnboarding.properties | 36 ++++++++++++++++------
src/chrome/locale/ga/torbutton.properties | 3 --
src/chrome/locale/he/aboutTBUpdate.dtd | 8 +++--
src/chrome/locale/he/aboutTor.dtd | 3 ++
src/chrome/locale/he/browserOnboarding.properties | 36 ++++++++++++++++------
src/chrome/locale/he/torbutton.properties | 3 --
src/chrome/locale/id/aboutTBUpdate.dtd | 4 +++
src/chrome/locale/id/aboutTor.dtd | 3 ++
src/chrome/locale/id/browserOnboarding.properties | 36 ++++++++++++++++------
src/chrome/locale/id/torbutton.properties | 3 --
src/chrome/locale/is/aboutTBUpdate.dtd | 4 +++
src/chrome/locale/is/aboutTor.dtd | 3 ++
src/chrome/locale/is/browserOnboarding.properties | 36 ++++++++++++++++------
src/chrome/locale/is/torbutton.properties | 3 --
src/chrome/locale/it/aboutTBUpdate.dtd | 4 +++
src/chrome/locale/it/aboutTor.dtd | 3 ++
src/chrome/locale/it/browserOnboarding.properties | 36 ++++++++++++++++------
src/chrome/locale/it/torbutton.properties | 3 --
src/chrome/locale/ja/aboutTBUpdate.dtd | 4 +++
src/chrome/locale/ja/aboutTor.dtd | 3 ++
src/chrome/locale/ja/browserOnboarding.properties | 36 ++++++++++++++++------
src/chrome/locale/ja/torbutton.properties | 3 --
src/chrome/locale/ko/aboutTBUpdate.dtd | 4 +++
src/chrome/locale/ko/aboutTor.dtd | 15 +++++----
src/chrome/locale/ko/browserOnboarding.properties | 36 ++++++++++++++++------
src/chrome/locale/ko/torbutton.properties | 9 ++----
src/chrome/locale/nb/aboutTBUpdate.dtd | 4 +++
src/chrome/locale/nb/aboutTor.dtd | 3 ++
src/chrome/locale/nb/browserOnboarding.properties | 36 ++++++++++++++++------
src/chrome/locale/nb/torbutton.properties | 3 --
src/chrome/locale/nl/aboutTBUpdate.dtd | 4 +++
src/chrome/locale/nl/aboutTor.dtd | 3 ++
src/chrome/locale/nl/browserOnboarding.properties | 36 ++++++++++++++++------
src/chrome/locale/nl/torbutton.properties | 3 --
src/chrome/locale/pl/aboutTBUpdate.dtd | 4 +++
src/chrome/locale/pl/aboutTor.dtd | 3 ++
src/chrome/locale/pl/browserOnboarding.properties | 36 ++++++++++++++++------
src/chrome/locale/pl/torbutton.properties | 3 --
src/chrome/locale/pt-BR/aboutTBUpdate.dtd | 4 +++
src/chrome/locale/pt-BR/aboutTor.dtd | 8 +++--
.../locale/pt-BR/browserOnboarding.properties | 36 ++++++++++++++++------
src/chrome/locale/pt-BR/torbutton.properties | 3 --
src/chrome/locale/ru/aboutTBUpdate.dtd | 4 +++
src/chrome/locale/ru/aboutTor.dtd | 17 +++++-----
src/chrome/locale/ru/browserOnboarding.properties | 36 ++++++++++++++++------
src/chrome/locale/ru/torbutton.properties | 3 --
src/chrome/locale/sv/aboutTBUpdate.dtd | 4 +++
src/chrome/locale/sv/aboutTor.dtd | 3 ++
src/chrome/locale/sv/browserOnboarding.properties | 36 ++++++++++++++++------
src/chrome/locale/sv/torbutton.properties | 3 --
src/chrome/locale/tr/aboutTBUpdate.dtd | 4 +++
src/chrome/locale/tr/aboutTor.dtd | 3 ++
src/chrome/locale/tr/browserOnboarding.properties | 36 ++++++++++++++++------
src/chrome/locale/tr/torbutton.properties | 3 --
src/chrome/locale/vi/aboutTBUpdate.dtd | 4 +++
src/chrome/locale/vi/aboutTor.dtd | 3 ++
src/chrome/locale/vi/browserOnboarding.properties | 36 ++++++++++++++++------
src/chrome/locale/vi/torbutton.properties | 3 --
src/chrome/locale/zh-CN/aboutTBUpdate.dtd | 4 +++
src/chrome/locale/zh-CN/aboutTor.dtd | 15 +++++----
.../locale/zh-CN/browserOnboarding.properties | 36 ++++++++++++++++------
src/chrome/locale/zh-CN/torbutton.properties | 3 --
src/chrome/locale/zh-TW/aboutTBUpdate.dtd | 4 +++
src/chrome/locale/zh-TW/aboutTor.dtd | 3 ++
.../locale/zh-TW/browserOnboarding.properties | 36 ++++++++++++++++------
src/chrome/locale/zh-TW/torbutton.properties | 3 --
104 files changed, 905 insertions(+), 384 deletions(-)
diff --git a/src/chrome/locale/ar/aboutTBUpdate.dtd b/src/chrome/locale/ar/aboutTBUpdate.dtd
index ee153f6b..c4e08b80 100644
--- a/src/chrome/locale/ar/aboutTBUpdate.dtd
+++ b/src/chrome/locale/ar/aboutTBUpdate.dtd
@@ -4,3 +4,7 @@
<!ENTITY aboutTBUpdate.linkLabel "Ø²ÙØ± Ù
ÙÙØ¹Ùا">
<!ENTITY aboutTBUpdate.linkSuffix ".">
<!ENTITY aboutTBUpdate.changeLogHeading "Ø³Ø¬Ù Ø§ÙØªØºÙÙØ±Ø§Øª:">
+
+<!ENTITY aboutTBUpdate.circuitDisplayHeading "New, Redesigned Circuit Display">
+<!ENTITY aboutTBUpdate.circuitDisplayDescription "The Tor circuit display has been relocated and improved! Click the Site Identity button (located on the left side of the URL bar) to see the new circuit display.">
+<!ENTITY aboutTBUpdate.learnMore "إعرÙ/Ù Ø£ÙØ«Ø± ">
diff --git a/src/chrome/locale/ar/aboutTor.dtd b/src/chrome/locale/ar/aboutTor.dtd
index 6a71cdd9..4ebb323e 100644
--- a/src/chrome/locale/ar/aboutTor.dtd
+++ b/src/chrome/locale/ar/aboutTor.dtd
@@ -6,7 +6,7 @@
<!ENTITY aboutTor.title "Ø¹Ù ØªÙØ±">
-<!ENTITY aboutTor.ready.label "Explore. Privately.">
+<!ENTITY aboutTor.ready.label "ØªØµÙØ ØšÙÙÙØ© Ø®ÙÙØ©">
<!ENTITY aboutTor.ready2.label "Youâre ready for the worldâs most private browsing experience.">
<!ENTITY aboutTor.failure.label "ØØ¯Ø« خطأ Ù
ا!">
<!ENTITY aboutTor.failure2.label "ØªÙØ± ÙØ§ ÙØ¹Ù
Ù ÙÙ ÙØ°Ø§ اÙÙ
ØªØµÙØ.">
@@ -18,8 +18,11 @@
<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual »">
<!-- The next two entities are used within the browser's Help menu. -->
<!ENTITY aboutTor.torbrowser_user_manual.accesskey "س">
-<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual">
+<!ENTITY aboutTor.torbrowser_user_manual.label "دÙÙ٠استخداÙ
Ù
تصÙÙØ ØªÙØ±">
<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
-<!ENTITY aboutTor.getInvolved.label "Get Involved »">
+<!ENTITY aboutTor.getInvolved.label "؎ارÙ">
<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en">
+
+<!ENTITY aboutTor.newsletter.tagline "Get the latest news from Tor straight to your inbox.">
+<!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News.">
diff --git a/src/chrome/locale/ar/browserOnboarding.properties b/src/chrome/locale/ar/browserOnboarding.properties
index 6910fd7b..0b04e973 100644
--- a/src/chrome/locale/ar/browserOnboarding.properties
+++ b/src/chrome/locale/ar/browserOnboarding.properties
@@ -4,35 +4,51 @@
onboarding.tour-tor-welcome=Ù
Ø±ØØšØ§Ù
onboarding.tour-tor-welcome.title=Youâre ready.
-onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. Youâre now protected against tracking, surveillance, and censorship. This quick onboarding will show you how.
onboarding.tour-tor-welcome.button=Start Now
onboarding.tour-tor-privacy=Ø§ÙØ®ØµÙØµÙØ©
onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
-onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canât follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click âTor Networkâ to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click âTor Networkâ to learn how we protect you on the network level.
onboarding.tour-tor-privacy.button=Go to Tor Network
onboarding.tour-tor-network=Tor Network
onboarding.tour-tor-network.title=Travel a decentralized network.
-onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâs no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on âCircuit Displayâ to learn how they work.
+onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, thereâs no one point of failure or centralized entity you need to trust in order to enjoy the internet privately.
onboarding.tour-tor-network.button=Go to Circuit Display
onboarding.tour-tor-circuit-display=Circuit Display
onboarding.tour-tor-circuit-display.title=See your path.
-onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking âNew Circuit for this Siteâ on our Circuit Display. Click below to see how it works.
-onboarding.tour-tor-circuit-display.button=Ø¥ÙØªØŽØ§Ù
+onboarding.tour-tor-circuit-display.description=For each domain you visit, your traffic is relayed and encrypted in a circuit across three Tor relays around the world. No website knows where you are connecting from. You can request a new circuit by clicking âNew Circuit for this Siteâ on our Circuit Display.
+onboarding.tour-tor-circuit-display.button=See My Path
onboarding.tour-tor-security=Ø§ÙØ£Ù
اÙ
onboarding.tour-tor-security.title=Choose your experience.
-onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do.
onboarding.tour-tor-security.button=Review Settings
onboarding.tour-tor-expect-differences=Experience Tips
-onboarding.tour-tor-expect-differences.title=Experience Tips
-onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.title=Expect some differences.
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot.
onboarding.tour-tor-expect-differences.button=See FAQs
onboarding.tour-tor-onion-services=خدÙ
ات Ø§ÙØšØµÙØ© (Onion)
-onboarding.tour-tor-onion-services.title=خدÙ
ات Ø§ÙØšØµÙØ© (Onion)
-onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.title=Be extra protected.
+onboarding.tour-tor-onion-services.description=Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously. Click below to visit the DuckDuckGo onion site.
onboarding.tour-tor-onion-services.button=Visit an Onion
+
+# Circuit Display onboarding.
+onboarding.tor-circuit-display.next=Ø§ÙØªØ§ÙÙ
+onboarding.tor-circuit-display.done=Ø§ÙØªÙاء
+onboarding.tor-circuit-display.one-of-three=1 of 3
+onboarding.tor-circuit-display.two-of-three=2 of 3
+onboarding.tor-circuit-display.three-of-three=3 of 3
+
+onboarding.tor-circuit-display.intro.title=How do circuits work?
+onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assigned relays, which are computers around the world configured to forward Tor traffic. Circuits allow you to browse privately and to connect to onion services.
+
+onboarding.tor-circuit-display.diagram.title=Circuit Display
+onboarding.tor-circuit-display.diagram.msg=This diagram shows the relays that make up the circuit for this website. To prevent linking of activity across different sites, each website gets a different circuit.
+
+onboarding.tor-circuit-display.new-circuit.title=Do you need a new circuit?
+onboarding.tor-circuit-display.new-circuit.msg=If you are not able to connect to the website youâre trying to visit or it is not loading properly, then you can use this button to reload the site with a new circuit.
diff --git a/src/chrome/locale/ar/torbutton.properties b/src/chrome/locale/ar/torbutton.properties
index afaf8f5b..26e5a8f4 100644
--- a/src/chrome/locale/ar/torbutton.properties
+++ b/src/chrome/locale/ar/torbutton.properties
@@ -31,9 +31,6 @@ torbutton.popup.confirm_plugins = اÙÙ
ÙØÙØ§Øª Ù
ث٠ÙÙØ§ØŽ ÙÙ
Ù٠أÙ
torbutton.popup.never_ask_again = ÙØ§ تسأÙÙÙ Ù
رة أخرÙ
torbutton.popup.confirm_newnym = Ø³ÙØºÙÙ Ù
ØªØµÙØ ØªÙØ± Ù٠اÙÙÙØ§Ùذ ÙØ§ÙØ£ÙØ³ÙØ©Ø ÙÙ
ا ستÙ
Ø³Ø ÙÙ Ø¬ÙØ³Ø§Øª اÙÙ
ÙØ§Ùع.\n\nØ£ØªØ±ÙØ¯ إعادة ت؎غÙÙ Ù
ØªØµÙØ ØªÙØ± Ø§ÙØ¢Ù Ø£Ù
تغÙÙØ± ÙÙÙØªÙØ\n\n
-torbutton.slider_notification = ÙØ§ØŠÙ
Ø© Ø§ÙØšØµÙØ© Ø§ÙØ®Ø¶Ø±Ø§Ø¡ ØšÙØ§ Ø§ÙØ¢Ù ØŽØ±ÙØ· تÙ
Ø±ÙØ± Ø£Ù
ÙÙ ÙØªÙØ Ù٠ضؚط Ù
ستÙ٠أÙ
اÙÙ. تØÙÙ Ù
٠ذÙÙ!
-torbutton.slider_notification_button = Ø§ÙØªØ إعدادات Ø§ÙØ£Ù
اÙ
-
torbutton.maximize_warning = ØªÙØšÙر Ù
ØªØµÙØ ØªÙØ± ÙØ¯ ÙØ³Ù
Ø ÙØšØ¹Ø¶ اÙÙ
ÙØ§Ùع ØšØ§ÙØªØ¹Ø±Ù عÙÙ ØØ¬Ù
ØŽØ§ØŽØªÙØ ÙØ§Ø³ØªØ®Ø¯Ø§Ù
ÙØ°Ù اÙÙ
عÙÙÙ
ات ÙØªÙÙÙÙ. ÙÙØµÙ ØšØ§ØšÙØ§Ø¡ ÙØ§Ùذ٠Ù
ØªØµÙ ØªÙØ± عÙÙ ØØ¬Ù
ÙØ§ Ø§ÙØ§ÙتراضÙ.
# Canvas permission prompt. Strings are kept here for ease of translation.
diff --git a/src/chrome/locale/bn-BD/aboutTBUpdate.dtd b/src/chrome/locale/bn-BD/aboutTBUpdate.dtd
index 90abe5dd..93845c57 100644
--- a/src/chrome/locale/bn-BD/aboutTBUpdate.dtd
+++ b/src/chrome/locale/bn-BD/aboutTBUpdate.dtd
@@ -4,3 +4,7 @@
<!ENTITY aboutTBUpdate.linkLabel "àŠàŠ®àŠŸàŠŠà§àа àŠàŠ¯àŠŒà§àŠ¬àŠžàŠŸàŠàŠ àŠŠà§àŠà§àŠš">
<!ENTITY aboutTBUpdate.linkSuffix ".">
<!ENTITY aboutTBUpdate.changeLogHeading "àŠªàŠ°àŠ¿àŠ¬àŠ°à§àŠ€àŠ£à§àа:">
+
+<!ENTITY aboutTBUpdate.circuitDisplayHeading "àŠšàŠ€à§àŠš, àŠªàŠ°àŠ¿àŠàвà§àŠªàŠ¿àŠ€ àŠ¬àŠ°à§àŠ€àŠšà§ àŠªà§àŠ°àŠŠàŠ°à§àŠ¶àŠš">
+<!ENTITY aboutTBUpdate.circuitDisplayDescription "àŠàа àŠžàŠŸàŠ°à§àŠàŠ¿àŠ àŠ¡àŠ¿àŠžàŠªà§àвà§àа àŠ
àŠ¬àŠžà§àŠ¥àŠŸàŠš àŠàŠ¬àŠ àŠàŠšà§àŠšàŠ€àŠ¿ àŠ¹àŠ¯àŠŒà§àŠà§! àŠšàŠ€à§àŠš àŠžàŠŸàŠ°à§àŠàŠ¿àŠ àŠ¡àŠ¿àŠžàŠªà§àŠ²à§ àŠŠà§àŠàŠŸàŠ° àŠàŠšà§àН àŠžàŠŸàŠàŠàŠàŠ¿#160; àŠàŠàŠ¡à§àŠšà§àŠàŠ¿àŠàŠ¿ àŠ¬àŠŸàŠàŠš (URL àŠ¬àŠŸàŠ°à§àа àŠ¬àŠŸàŠ® àŠŠàŠ¿àŠà§ àŠ
àŠ¬àŠžà§àŠ¥àŠ¿àŠ€) àŠàŠ¿àŠªà§àŠš ी">
+<!ENTITY aboutTBUpdate.learnMore "àŠàŠ°àŠ àŠàŠŸàŠšà§àŠš">
diff --git a/src/chrome/locale/bn-BD/aboutTor.dtd b/src/chrome/locale/bn-BD/aboutTor.dtd
index dffca8a8..0896f075 100644
--- a/src/chrome/locale/bn-BD/aboutTor.dtd
+++ b/src/chrome/locale/bn-BD/aboutTor.dtd
@@ -23,3 +23,6 @@
<!ENTITY aboutTor.tor_mission.label "àŠàа àŠªà§àаàŠàвà§àŠªàŠàŠ¿ àŠàŠàŠàŠ¿ àŠ®àŠŸàŠ°à§àŠàŠ¿àŠš 501 (c) (3) àŠ
àŠ²àŠŸàŠàŠàŠšàŠ àŠªà§àŠ°àŠ€àŠ¿àŠ·à§àŠ àŠŸàŠš, àŠ®àŠŸàŠšàŠ¬àŠŸàŠ§àŠ¿àŠàŠŸàŠ° àŠàŠ¬àŠ àŠ®à§àŠà§àŠ€ àŠàŠ¬àŠ àŠàŠšà§àŠ®à§àŠà§àŠ€ àŠà§àŠž àŠžàŠšàŠŠà§ àŠàŠ¬àŠ àŠà§àŠªàŠšà§àŠ¯àŠŒàŠ€àŠŸ àŠªà§àŠ°àŠ¯à§àŠà§àŠ€àŠ¿àŠà§ àŠžàŠ®àŠ°à§àŠ¥àŠš àŠàаà§, àŠ€àŠŸàŠŠà§àа àŠšàŠ¿àŠ·àŠ¿àŠŠà§àЧ àŠžàŠ¹àŠàвàŠà§àŠ¯àŠ€àŠŸ àŠàŠ¬àŠ àŠ¬à§àŠ¯àŠ¬àŠ¹àŠŸàŠ° àŠàŠ¬àŠ àŠ€àŠŸàŠŠà§àа àŠ¬à§àŠà§àŠàŠŸàŠšàŠ¿àŠ àŠ àŠàŠšàŠªà§àŠ°àŠ¿àŠ¯àŠŒ àŠ¬à§àŠàŠŸàŠªàŠ¡àŠŒàŠŸ ी">
<!ENTITY aboutTor.getInvolved.label "àŠ¯à§àŠà§àŠ€ àŠ¹à§àŠšÂ»">
<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en">
+
+<!ENTITY aboutTor.newsletter.tagline "àŠàа àŠ¥à§àŠà§ àŠžàŠ°à§àŠ¬àŠ¶à§àŠ· àŠàŠ¬àŠ° àŠšàŠ¿àŠš àŠžà§àŠàŠŸ àŠàŠªàŠšàŠŸàŠ° àŠàŠšàŠ¬àŠà§àŠžà§ à¥€">
+<!ENTITY aboutTor.newsletter.link_text "àŠàа àŠšàŠ¿àŠàŠ-àŠàа àŠàŠšà§àН àŠžàŠŸàŠàŠš àŠàŠª àŠàаà§àŠš ी">
diff --git a/src/chrome/locale/bn-BD/browserOnboarding.properties b/src/chrome/locale/bn-BD/browserOnboarding.properties
index 219a6833..e97c12d6 100644
--- a/src/chrome/locale/bn-BD/browserOnboarding.properties
+++ b/src/chrome/locale/bn-BD/browserOnboarding.properties
@@ -4,35 +4,51 @@
onboarding.tour-tor-welcome=àŠžà§àŠ¬àŠŸàŠàŠ€àŠ®
onboarding.tour-tor-welcome.title=àŠ€à§àŠ®àŠ¿ àŠ°à§àŠ¡àŠ¿ ी
-onboarding.tour-tor-welcome.description=àŠàа àŠ¬à§àŠ°àŠŸàŠàŠàŠŸàŠ° àŠàŠ¯àŠŒà§àЬ àŠ¬à§àŠ°àŠŸàŠàŠ àŠàŠ°àŠŸàŠ° àŠžàŠ®àŠ¯àŠŒ àŠà§àŠªàŠšà§àŠ¯àŠŒàŠ€àŠŸ àŠàŠ¬àŠ àŠšàŠ¿àŠ°àŠŸàŠªàŠ€à§àŠ€àŠŸàŠ° àŠžàŠ°à§àЬà§àŠà§àŠ àŠ®àŠŸàŠš àŠªà§àŠ°àŠŠàŠŸàŠš àŠàŠ°à§ à¥€ àŠàŠªàŠšàŠ¿ àŠàŠàŠš àŠà§àаà§àŠ¯àŠŸàŠàŠ¿àŠ, àŠšàŠàŠ°àŠŠàŠŸàŠ°àŠ¿ àŠàŠ¬àŠ àŠžà§àŠšà§àŠžàŠ°àŠ¶àŠ¿àŠªà§àа àŠ¬àŠ¿àŠ°à§àŠŠà§àŠ§à§ àŠžà§àаàŠà§àŠ·àŠ¿àŠ€ ी àŠà§àŠšà§ àŠšàŠ¿àŠš àŠàŠ àŠà§àŠàŠ onboarding àŠ
àŠšà§àŠžàŠ°àŠ£ àŠàŠ°à§ àŠàŠ®àŠ°àŠŸ àŠàŠ¿ àŠàаàŠàŠ¿ ी
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. Youâre now protected against tracking, surveillance, and censorship. This quick onboarding will show you how.
onboarding.tour-tor-welcome.button=àŠàŠàŠš àŠ¶à§àŠ°à§ àŠàаà§àŠš
onboarding.tour-tor-privacy=àŠà§àŠªàŠšà§àŠ¯àŠŒàŠ€àŠŸ
onboarding.tour-tor-privacy.title=Snub àŠ¡àŠŸàŠ¯àŠŒà§àŠà§àа àŠ snoopers ी
-onboarding.tour-tor-privacy.description=àŠàа àŠ¬à§àŠ°àŠŸàŠàŠàŠŸàŠ° àŠªà§àŠ°àŠ€àŠ¿àŠàŠ¿ àŠ¡à§àŠ®à§àŠàŠšà§àа àŠàŠšà§àН àŠžàŠàв àŠà§àŠ°àŠŸàŠ«àŠ¿àŠ àŠžàŠŸàŠ¬àŠ®à§àŠ°àŠ¿àŠšàŠà§ àŠàŠŸàŠšàŠ¿àŠ¯àŠŒà§ àŠŠàŠŸàŠ àŠàŠ°àŠ¬à§ à¥€ àŠ€àŠŸàŠ° àŠ®àŠŸàŠšà§ àŠ¡àŠŸàŠ¯àŠŒà§àŠà§àа àŠàа àŠ¬àŠ¿àŠà§àŠàŠŸàŠªàŠšàŠŠàŠŸàŠ€àŠŸ àŠàŠªàŠšàŠŸàŠà§ àŠ
àŠšà§àŠžàŠ°àŠ£ àŠàŠ°àŠ€à§ àŠªàŠŸàŠ°à§ àŠšàŠŸ ी àŠàŠ¬àŠ àŠàŠªàŠšàŠŸàŠ° àŠ
àŠ§àŠ¿àŠ¬à§àŠ¶àŠšà§àа àŠªàŠ° àŠ¬àŠ¿àŠà§àŠàŠ¿àŠšà§àŠš àŠà§àŠàŠ¿ àŠ¬àŠŸ àŠ¬à§àŠ°àŠŸàŠàŠàŠŸàŠ°à§àа àŠàŠ€àŠ¿àŠ¹àŠŸàŠž àŠ®à§àŠà§ àŠ«à§àŠ²àŠŸ àŠ¹àŠ¯àŠŒ àŠàŠ®àŠš àŠà§àŠšà§ àŠ€àŠ¥à§àН àŠžà§àŠà§àаà§àŠ à¥€ àŠ¬à§àŠ°àŠŸàŠàŠàŠŸàŠ°à§ àŠàŠªàŠšàŠŸàŠ° àŠà§àŠªàŠšà§àŠ¯àŠŒàŠ€àŠŸ àŠ àŠšàŠ¿àŠ°àŠŸàŠªàŠ€à§àŠ€àŠŸ àŠžà§àаàŠà§àŠ·àŠŸ àŠšàŠ¿àŠ¶à§àŠàŠ¿àŠ€ àŠàŠ°àŠ€à§ àŠàŠ®àŠ°àŠŸ àŠàŠ àŠžàŠàв àŠªàŠ°àŠ¿àŠ¬àŠ°à§àŠ€àŠš àŠàŠ°à§ àŠ¥àŠŸàŠàŠ¿ ी àŠàŠ®àŠ°àŠŸ àŠšà§àŠàŠàŠ¯àŠŒàŠŸàŠ°à§àŠ àŠžà§àŠ€àŠ°à§ àŠàŠªàŠšàŠŸàŠà§ àŠàŠ¿à
ŠàŠŸàŠ¬à§ àŠ°àŠà§àŠ·àŠŸ àŠàŠ°àŠ¿ àŠ€àŠŸ àŠàŠŸàŠšàŠ€à§ ' àŠàа àŠšà§àŠàŠàŠ¯àŠŒàŠŸàŠ°à§àŠ ' àŠàŠ¿àŠªà§àŠš ी
+onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click âTor Networkâ to learn how we protect you on the network level.
onboarding.tour-tor-privacy.button=àŠàа àŠšà§àŠàŠàŠ¯àŠŒàŠŸàŠ°à§àŠà§ àŠ¯àŠŸàŠš
onboarding.tour-tor-network=àŠàа àŠšà§àŠàŠàŠ¯àŠŒàŠŸàŠ°à§àŠ
onboarding.tour-tor-network.title=àŠàŠàŠàŠ¿ àŠ¬àŠ¿àŠà§àŠšà§àŠŠà§àаà§àŠàŠ°àŠ£à§àа àŠšà§àŠàŠàŠ¯àŠŒàŠŸàŠ°à§àŠ àŠªàŠ°àŠ¿àŠà§àŠ°àŠ®àŠ£ àŠàŠ°à§ à¥€
-onboarding.tour-tor-network.description=àŠàа àŠ¬à§àŠ°àŠŸàŠàŠàŠŸàŠ° àŠàŠªàŠšàŠŸàŠà§ àŠàа àŠšà§àŠàŠàŠ¯àŠŒàŠŸàŠ°à§àŠà§ àŠžàŠàНà§àŠà§àŠ€ àŠàŠ°àŠ¬à§ à¥€ àŠàŠ®àŠŸàŠŠà§àа àŠšà§àŠàŠàŠ¯àŠŒàŠŸàŠ°à§àŠ VPN àŠ¥à§àŠà§ àŠàŠªàŠšàŠŸàŠà§ àŠ¬à§àŠ¶àŠ¿ àŠžà§àаàŠà§àŠ·àŠŸ àŠŠà§àŠ¯àŠŒ àŠàŠŸàŠ°àŠ£ àŠàŠàŠ¿ àŠà§àŠšà§àŠŠà§àаà§àŠ¯àŠŒ àŠšàŠ¯àŠŒ. àŠàа àŠ¹àŠ² àŠžàŠŸàŠ°à§àŠàŠŸàŠ°à§àа àŠàŠàŠàŠ¿ àŠšà§àŠàŠàŠ¯àŠŒàŠŸàŠ°à§àŠ, àŠàŠ®àŠ°àŠŸ àŠ€àŠŸàŠŠà§àа relays àŠ¬àŠ²àŠ¿, àŠžàŠŸàŠ°àŠŸ àŠ¬àŠ¿àŠ¶à§àЬà§àа àŠ¹àŠŸàŠàŠŸàŠ°à§ àŠžà§àЬà§àŠà§àŠàŠŸàŠžà§àŠ¬à§ à¥€ àŠàŠ àŠŠàŠ¿àŠà§, àŠ¬à§àŠ¯àŠ°à§àŠ¥àŠ€àŠŸàŠ° àŠàŠ àŠ¬àŠ¿àŠšà§àŠŠà§ àŠšà§àŠ àŠàŠ¬àŠ àŠàŠšà§àŠàŠŸàŠ°àŠšà§àŠ àŠàŠªàŠà§àŠ àŠàŠ°àŠŸàŠ° àŠàŠšà§àН àŠà§àŠš àŠà§àŠšà§àŠŠà§àаà§àŠ¯àŠŒ àŠžàŠàŠžà§àŠ¥àŠŸàŠàŠ¿àŠà§ àŠ¬àŠ¿àŠ¶à§àŠ¬àŠŸàŠž àŠàŠ°àŠ€à§ àŠ¹àŠ¬à§ àŠšàŠŸ ी àŠªà§àŠ°àŠ€àŠ¿àŠàŠ¿ àŠ¡à§àŠ®à§àŠàŠšà§àа àŠàŠšà§àН àŠàŠªàŠšàŠ¿ àŠàŠªà§àŠš àŠàŠ°à§ àŠàŠ®àŠ°
àŠŸ àŠàŠªàŠšàŠŸàŠ° àŠàŠšà§àН àŠàŠàŠàŠ¿ àŠ¬àŠ°à§àŠ€àŠšà§ àŠ€à§àŠ°àŠ¿ àŠàŠ°àŠ¿, àŠ€àŠŸàŠ°àŠŸ àŠàŠ¿àŠàŠŸàŠ¬à§ àŠàŠŸàŠ àŠàŠ°à§ àŠ€àŠŸ àŠàŠŸàŠšàŠ€à§ ' àŠžàŠŸàŠ°à§àŠàŠ¿àŠ àŠ¡àŠ¿àŠžàŠªà§àŠ²à§ '-àŠ àŠà§àŠ²àŠ¿àŠ àŠàаà§àŠš ी
+onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, thereâs no one point of failure or centralized entity you need to trust in order to enjoy the internet privately.
onboarding.tour-tor-network.button=àŠžàŠŸàŠ°à§àŠàŠ¿àŠ àŠ¡àŠ¿àŠžàŠªà§àвà§-àŠ€à§ àŠ¯àŠŸàŠš
onboarding.tour-tor-circuit-display=àŠžàŠŸàŠ°à§àŠàŠ¿àŠ àŠ¡àŠ¿àŠžàŠªà§àвà§
onboarding.tour-tor-circuit-display.title=àŠàŠªàŠšàŠŸàŠ° àŠªàŠ¥ àŠŠà§àŠà§àŠš ी
-onboarding.tour-tor-circuit-display.description=àŠªà§àŠ°àŠ€àŠ¿àŠàŠ¿ àŠ¡à§àŠ®à§àŠàŠšà§àа àŠàŠšà§àН àŠàŠªàŠšàŠ¿ àŠàŠªàŠšàŠŸàŠ° àŠà§àŠ°àŠŸàŠ«àŠ¿àŠ àŠ¬àŠ¿àŠà§àŠàŠªà§àŠ€àŠ¿àŠàŠ¿ àŠàŠ¬àŠ àŠžàŠŸàŠ°àŠŸ àŠ¬àŠ¿àŠ¶à§àЬà§àа àŠ€àŠ¿àŠšàŠàŠ¿ relays àŠàŠàŠàŠ¿ àŠžàŠŸàŠ°à§àŠàŠ¿àŠà§ àŠžàŠà§àŠà§àŠ€àŠŸàŠ¯àŠŒàŠ¿àŠ€ àŠàаà§àŠš ी àŠàŠ àŠàŠŸàŠ¬à§ àŠà§àŠš àŠàŠ¯àŠŒà§àŠ¬àŠžàŠŸàŠàŠ àŠàŠŸàŠšà§ àŠšàŠŸ àŠàŠªàŠšàŠ¿ àŠà§àŠ¥àŠŸ àŠ¥à§àŠà§ àŠžàŠàНà§àŠ àŠàаàŠà§àŠš, àŠàŠŸàŠ°àŠ£ àŠ€àŠŸàŠ°àŠŸ àŠ¶à§àЧà§àŠ®àŠŸàŠ€à§àа àŠ¶à§àŠ· àŠ°àŠ¿àŠ²à§ àŠ¥à§àŠà§ àŠàŠžàŠŸ àŠžàŠàНà§àŠàŠàŠ¿ àŠŠà§àŠàŠ€à§ àŠªàŠŸàŠ¬à§ à¥€ àŠàŠªàŠšàŠ¿ àŠ¯àŠŠàŠ¿ àŠàŠàŠàŠ¿ àŠšàŠ€à§àŠš àŠžàŠŸàŠ°à§àŠàŠ¿àŠ àŠªàŠàŠšà§àŠŠ àŠàаà§àŠš, àŠ€àŠŸàŠ¹àŠ²à§ àŠàŠ®àŠŸàŠŠà§àа àŠžàŠŸàŠ°à§àŠàŠ¿àŠ àŠ¡àŠ¿àŠžàŠªà§àвà§àа àŠàŠ àŠžàŠŸàŠàŠà§àа àŠàŠšà§àН àŠšàŠ€à§àŠš àŠ¬àŠ°à§àŠ€àŠšà§ àŠà§àŠ²àŠ¿àŠ àŠàŠ°à§ àŠàŠàŠàŠ¿ àŠ
àŠšà§àаà§àЧ àŠàŠ°àŠ€à§ àŠªàŠŸàŠ°à§àŠš.
àŠàŠ¿àŠàŠŸàŠ¬à§ àŠàŠŸàŠ àŠàŠ°à§ àŠ€àŠŸ àŠŠà§àŠàŠ€à§ àŠšàŠ¿àŠà§ àŠà§àŠ²àŠ¿àŠ àŠàаà§àŠš.
-onboarding.tour-tor-circuit-display.button=àŠàŠà§àŠžàŠªà§àвà§àа
+onboarding.tour-tor-circuit-display.description=For each domain you visit, your traffic is relayed and encrypted in a circuit across three Tor relays around the world. No website knows where you are connecting from. You can request a new circuit by clicking âNew Circuit for this Siteâ on our Circuit Display.
+onboarding.tour-tor-circuit-display.button=See My Path
onboarding.tour-tor-security=àŠšàŠ¿àŠ°àŠŸàŠªàŠ€à§àŠ€àŠŸ
onboarding.tour-tor-security.title=àŠàŠªàŠšàŠŸàŠ° àŠ
àŠàŠ¿àŠà§àŠàŠ€àŠŸ àŠªàŠàŠšà§àŠŠ àŠàаà§àŠš ी
-onboarding.tour-tor-security.description=àŠàŠªàŠšàŠŸàŠ° àŠà§àŠªàŠšà§àŠ¯àŠŒàŠ€àŠŸ àŠžàŠ°à§àŠ¬àŠŠàŠŸàŠ àŠàа àŠ¬à§àŠ°àŠŸàŠàŠàŠŸàŠ° àŠàŠ¬àŠ àŠàа àŠšà§àŠàŠàŠ¯àŠŒàŠŸàŠ°à§àŠ àŠŠà§àŠ¬àŠŸàŠ°àŠŸ àŠ¡àŠ¿àŠ«àŠ²à§àŠ àŠ
àŠšà§àŠžàŠŸàŠ°à§ àŠ¯àŠ€à§àŠš àŠšà§àŠàŠ¯àŠŒàŠŸ àŠ¹àŠ¬à§. àŠàŠàŠŸàŠ¡àŠŒàŠŸàŠ àŠàŠ®àŠ°àŠŸ àŠàŠªàŠšàŠŸàŠà§ àŠ¬àŠ¿àŠàŠ¿àŠšà§àŠš àŠžà§àŠàŠ¿àŠàŠž àŠªà§àŠ°àŠŠàŠŸàŠš àŠàŠ°àŠ¿ àŠ¯àŠàŠš àŠàŠªàŠšàŠ¿ àŠžàŠŸàŠàŠ àŠ
à§àŠ¯àŠŸàŠà§àŠžà§àŠž àŠàŠ°àŠŸàŠ° àŠžàŠ®àŠ¯àŠŒ àŠàŠªàŠšàŠŸàŠ° àŠ¬à§àŠ°àŠŸàŠàŠàŠŸàŠ°à§àа àŠšàŠ¿àŠ°àŠŸàŠªàŠ€à§àŠ€àŠŸàŠà§ àŠŠà§àŠàŠ€à§ àŠàŠŸàŠš. àŠàŠªàŠšàŠŸàŠ° àŠàŠ®à§àŠªàŠ¿àŠàŠàŠŸàŠ°à§ àŠàŠà§àŠ°àŠ®àŠ£ àŠàŠ°àŠ€à§ àŠàŠŸàŠ°àŠŸàŠª àŠàŠà§àŠšà§àŠàŠŠà§àа àŠŠà§àŠ¬àŠŸàŠ°àŠŸ àŠ¬à§àŠ¯àŠ¬àŠ¹àŠŸàŠ° àŠàŠ°àŠŸ àŠ¯à§àŠ€à§ àŠªàŠŸàŠ°à§ àŠàŠ®àŠš àŠàŠ¿àŠà§ àŠ¬àŠšà§àЧ àŠàŠ°àŠŸàŠ° àŠàŠšà§àН àŠàŠ®àŠŸàŠŠà§àа àŠšàŠ¿àŠ°àŠŸàŠªàŠ€à§àŠ€àŠŸ àŠ¬àŠ¿àŠšà§àŠ¯àŠŸàŠžàŠšàŠžàŠ®à§àй àŠàŠªàŠšàŠŸàŠà§ àŠžàŠ®à§àŠ®àŠ€àŠ¿ à
ŠŠà§àŠ¬à§ à¥€ àŠ¬àŠ¿àŠàŠ¿àŠšà§àŠš àŠ
àŠªàŠ¶àŠš àŠàŠ¬àŠ àŠ€àŠŸàŠ°àŠŸ àŠà§ àŠàŠ°à§ àŠ€àŠŸ àŠŠà§àŠàŠ€à§ àŠšàŠ¿àŠà§ àŠà§àŠ²àŠ¿àŠ àŠàаà§àŠš ी
+onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do.
onboarding.tour-tor-security.button=àŠªàŠ°à§àŠ¯àŠŸàŠ²à§àŠàŠšàŠŸ àŠžà§àŠàŠ¿àŠàŠž
onboarding.tour-tor-expect-differences=àŠ
àŠàŠ¿àŠà§àŠàŠ€àŠŸàŠ° àŠàŠ¿àŠªàŠž
-onboarding.tour-tor-expect-differences.title=àŠ
àŠàŠ¿àŠà§àŠàŠ€àŠŸàŠ° àŠàŠ¿àŠªàŠž
-onboarding.tour-tor-expect-differences.description=àŠàа àŠ¬à§àŠ°àŠŸàŠàŠàŠŸàŠ° àŠàŠ¬àŠ àŠàа àŠšà§àŠàŠàŠ¯àŠŒàŠŸàŠ°à§àŠ àŠŠà§àŠ¬àŠŸàŠ°àŠŸ àŠªà§àŠ°àŠŠàŠ€à§àŠ€ àŠšàŠ¿àŠ°àŠŸàŠªàŠ€à§àŠ€àŠŸ àŠàŠ¬àŠ àŠà§àŠªàŠšà§àŠ¯àŠŒàŠ€àŠŸàŠ° àŠ¬à§àŠ¶àŠ¿àŠ·à§àŠà§àНàŠà§àŠ²àŠ¿ àŠžàŠ¹, àŠàŠšà§àŠàŠŸàŠ°àŠšà§àŠ àŠ¬à§àŠ°àŠŸàŠàŠ àŠàŠ°àŠŸàŠ° àŠžàŠ®àŠ¯àŠŒ àŠàŠªàŠšàŠŸàŠ° àŠ
àŠàŠ¿àŠà§àŠàŠ€àŠŸ àŠàŠ¿àŠà§àŠàŠŸ àŠàŠ¿àŠšà§àŠš àŠ¹àŠ¬à§ à¥€ àŠàŠªàŠšàŠ¿ àŠ²àŠà§àŠ·à§àН àŠàŠ°àŠ¬à§àŠš àŠ¯à§ àŠàŠªàŠšàŠŸàŠ° àŠžàŠàНà§àŠ àŠžàŠŸàŠ°àŠŸ àŠ¬àŠ¿àŠ¶à§àЬà§àа àŠ€àŠ¿àŠšàŠàŠ¿ relays àŠ®àŠŸàŠ§à§àŠ¯àŠ®à§ àŠàвàŠà§ ी àŠ
àŠšà§àŠ àŠžàŠ®àŠ¯àŠŒ àŠžàŠŸàŠàŠ àŠàŠªàŠšàŠŸàŠà§ àŠªà§àŠ°àŠ®àŠŸàŠš àŠàŠ°àŠ€à§ àŠ¬àŠ²àŠ¬à§ àŠ¯à§ àŠàŠªàŠšàŠ¿ àŠàŠàŠàŠš àŠ®àŠŸàŠšà§àŠ· àŠ°à§àŠ¬àŠ àŠšàŠ¯àŠŒ àŠàŠ¬àŠ àŠàŠªàŠšàŠŸàŠ° àŠšàŠ¿àŠ°àŠŸàŠªàŠ€à§àŠ€àŠŸ àŠ¬àŠ¿àŠàвà§àŠªà§àа àŠàŠªàŠ° àŠšàŠ¿àŠ°à§àŠàа àŠàаà§àŠš, àŠàŠ¿àŠà§ àŠ¬àŠ¿àŠ·àŠ¯àŠŒ àŠ¹àŠ¯àŠŒàŠ€à§ àŠàŠŸàŠ àŠ¬àŠŸ àŠ
²à§àŠ¡ àŠàŠ°àŠ€à§ àŠªàŠŸàŠ°à§ àŠšàŠŸ ी àŠàŠ®àŠŸàŠŠà§àа àŠ²àŠà§àŠ·à§àН àŠžàŠ¬ àŠžàŠ®àŠ¯àŠŒ àŠàŠ®àŠŸàŠŠà§àа àŠ¬à§àŠ¯àŠ¬àŠ¹àŠŸàŠ°àŠàŠŸàŠ°à§àŠŠà§àа àŠžàŠ¬àŠà§àŠ¯àŠŒà§ àŠàŠŸàŠ²à§ àŠ
àŠàŠ¿àŠà§àŠàŠ€àŠŸ àŠªà§àŠ°àŠŠàŠŸàŠš àŠàŠ°àŠŸ àŠ¹àŠ¯àŠŒ, àŠ¯àŠàŠš àŠàŠ®àŠŸàŠŠà§àа àŠ¬à§àŠ¯àŠ¬àŠ¹àŠŸàŠ°àŠàŠŸàŠ°à§àŠŠà§àа àŠàŠžàŠ² àŠà§àŠªàŠšà§àŠ¯àŠŒàŠ€àŠŸ àŠªà§àŠ°àŠŠàŠŸàŠš àŠàŠ°àŠŸ àŠ¹àŠ¯àŠŒ ी
+onboarding.tour-tor-expect-differences.title=Expect some differences.
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot.
onboarding.tour-tor-expect-differences.button=àŠžà§àŠ¬àŠ¿àŠ§àŠŸàŠžàŠ®à§àй àŠŠà§àŠà§àŠš
onboarding.tour-tor-onion-services=Onion àŠžà§àŠ¬àŠŸ
-onboarding.tour-tor-onion-services.title=Onion àŠžà§àŠ¬àŠŸ
-onboarding.tour-tor-onion-services.description=àŠžàŠ¬àŠ¶à§àŠ·à§ àŠàŠ®àŠ°àŠŸ àŠàŠªàŠšàŠŸàŠà§ àŠªà§àŠàŠ¯àŠŒàŠŸàŠà§àа àŠžà§àŠ¬àŠŸàŠ¯àŠŒ àŠªàŠ°àŠ¿àŠàŠ¯àŠŒ àŠàŠ°àŠ¿àŠ¯àŠŒà§ àŠŠàŠ¿àŠ€à§ àŠàŠŸàŠ à¥€ àŠàŠ°àŠ® àŠà§àŠªàŠšà§àŠ¯àŠŒàŠ€àŠŸ àŠàŠ¬àŠ àŠšàŠ¿àŠ°àŠŸàŠªàŠ€à§àŠ€àŠŸàŠ° àŠàŠšà§àН, àŠžàŠŸàŠàŠàŠà§àŠ²à§ àŠ¶à§àŠ· àŠ¹àŠ¯àŠŒà§ àŠ¯àŠŸàŠ¯àŠŒ ी àŠªà§àŠàŠ¯àŠŒàŠŸàŠ àŠàа àŠšà§àŠàŠàŠ¯àŠŒàŠŸàŠ°à§àŠ àŠ¬à§àŠ¯àŠ¬àŠ¹àŠŸàŠ° àŠàŠ°à§ àŠàŠšàŠ«àŠ¿àŠàŠŸàŠ° àŠàŠ°àŠŸ àŠ¹àŠ¯àŠŒ. àŠªà§àŠàŠ¯àŠŒàŠŸàŠ àŠªàŠ°àŠ¿àŠ·à§àŠ¬àŠŸàŠžàŠ®à§àй àŠªà§àаàŠàŠŸàŠ¶àŠ àŠàŠ¬àŠ àŠŠàŠ°à§àŠ¶àŠšàŠŸàŠ°à§àŠ¥à§àŠŠà§àа àŠàŠŸàŠà§ àŠ
àŠ€àŠ¿àŠ°àŠ¿àŠà§àŠ€ àŠžà§àаàŠà§àŠ·àŠŸ àŠªà§àŠ°àŠŠàŠŸàŠš àŠàаà§, àŠ¯àŠŸàŠ° àŠ®àŠ§à§àŠ¯à§ àŠžà§àŠšà§àŠžàŠ°àŠ¶àŠ¿àŠªà§àа àŠ¬àŠ¿àŠ°à§àŠŠà§àŠ§à§ àŠ°àŠà§àŠ·àŠŸàŠàŠ¬àŠ àŠ¯à§àŠ àŠàŠ°àŠŸ àŠ¹àŠ¯àŠŒà§àŠà§ ी àŠàŠàŠ àŠàŠŸàŠ¬à§ àŠàŠ®àŠŸàŠŠà§àа àŠ¬à§àŠ°àŠŸàŠàŠàŠŸàŠ° àŠàŠªàŠšàŠŸàŠà§ àŠàŠ¯àŠŒà§àŠ¬à§ àŠ¬à§àŠšàŠŸàŠ®à§
àŠ¬à§àŠ°àŠŸàŠàŠ àŠàŠ°àŠŸàŠ° àŠ
àŠšà§àŠ®àŠ€àŠ¿ àŠŠà§àŠ¯àŠŒ, àŠ¯àŠŸ àŠ®àŠŸàŠšà§àŠ·àŠà§ àŠ¬à§àŠšàŠŸàŠ®à§ àŠžàŠŸàŠ®àŠà§àŠ°à§ àŠàŠ¬àŠ àŠªàŠ°àŠ¿àŠ·à§àŠ¬àŠŸ àŠªà§àŠ°àŠŠàŠŸàŠšà§àа àŠ
àŠšà§àŠ®àŠ€àŠ¿ àŠŠà§àŠ¯àŠŒ ी àŠàŠªàŠšàŠ¿ àŠàŠ àŠªàŠ°àŠ¿àŠ·à§àŠ¬àŠŸàŠŠàŠ¿ àŠ
à§àŠ¯àŠŸàŠà§àŠžà§àŠž àŠàŠ°àŠŸàŠ° àŠžàŠ®àŠ¯àŠŒ URL-àŠ àŠàŠàŠàŠ¿ àŠžàŠŸàŠ®àŠŸàŠšà§àН àŠªà§àŠàŠ¯àŠŒàŠŸàŠà§àа àŠàŠàŠàŠš àŠ²àŠà§àŠ·à§àН àŠàŠ°àŠ¬à§àŠš ी NYTimes àŠªà§àŠàŠ¯àŠŒàŠŸàŠ àŠªàŠ°àŠ¿àŠ·à§àŠ¬àŠŸ àŠàŠ¬àŠ àŠà§àŠàŠŸàŠ¬à§ àŠ€àŠŸàŠ°àŠŸ àŠàŠŸàŠ àŠàŠ°à§ àŠ€àŠŸ àŠŠà§àŠàŠ€à§ àŠšàŠ¿àŠà§ àŠà§àŠ²àŠ¿àŠ àŠàаà§àŠš ी
+onboarding.tour-tor-onion-services.title=Be extra protected.
+onboarding.tour-tor-onion-services.description=Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously. Click below to visit the DuckDuckGo onion site.
onboarding.tour-tor-onion-services.button=àŠàŠàŠàŠ¿ àŠªà§àŠàŠ¯àŠŒàŠŸàŠ àŠŠà§àŠà§àŠš
+
+# Circuit Display onboarding.
+onboarding.tor-circuit-display.next=àŠªàŠ°àŠ¬àŠ°à§àŠ€à§
+onboarding.tor-circuit-display.done=àŠžàŠ®à§àŠªàŠšà§àŠš
+onboarding.tor-circuit-display.one-of-three=1 of 3
+onboarding.tor-circuit-display.two-of-three=2 of 3
+onboarding.tor-circuit-display.three-of-three=3 of 3
+
+onboarding.tor-circuit-display.intro.title=How do circuits work?
+onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assigned relays, which are computers around the world configured to forward Tor traffic. Circuits allow you to browse privately and to connect to onion services.
+
+onboarding.tor-circuit-display.diagram.title=àŠžàŠŸàŠ°à§àŠàŠ¿àŠ àŠ¡àŠ¿àŠžàŠªà§àвà§
+onboarding.tor-circuit-display.diagram.msg=This diagram shows the relays that make up the circuit for this website. To prevent linking of activity across different sites, each website gets a different circuit.
+
+onboarding.tor-circuit-display.new-circuit.title=Do you need a new circuit?
+onboarding.tor-circuit-display.new-circuit.msg=If you are not able to connect to the website youâre trying to visit or it is not loading properly, then you can use this button to reload the site with a new circuit.
diff --git a/src/chrome/locale/bn-BD/torbutton.properties b/src/chrome/locale/bn-BD/torbutton.properties
index 4cdfebf5..55aa98f0 100644
--- a/src/chrome/locale/bn-BD/torbutton.properties
+++ b/src/chrome/locale/bn-BD/torbutton.properties
@@ -22,7 +22,7 @@ torbutton.popup.launch = àŠ¡àŠŸàŠàŠšàŠ²à§àŠ¡ àŠ«àŠŸàŠàв
torbutton.popup.cancel = àŠ¬àŠŸàŠ€àŠ¿àŠ²
torbutton.popup.dontask = àŠžà§àŠ¬àŠ¯àŠŒàŠàŠà§àŠ°àŠ¿àŠ¯àŠŒàŠàŠŸàŠ¬à§ àŠàŠàŠš àŠ¥à§àŠà§ àŠ«àŠŸàŠàвàŠà§àŠ²àŠ¿ àŠ¡àŠŸàŠàŠšàŠ²à§àŠ¡ àŠàаà§àŠš
torbutton.popup.no_newnym = Torbutton àŠšàŠ¿àŠ°àŠŸàŠªàŠŠà§ àŠàŠªàŠšàŠŸàŠà§ àŠàŠàŠàŠ¿ àŠšàŠ€à§àŠš àŠªàŠ°àŠ¿àŠàŠ¯àŠŒ àŠŠàŠ¿àŠ€à§ àŠªàŠŸàŠ°à§ àŠšàŠŸà¥€ àŠàŠàŠ¿ àŠàа àŠàŠšà§àŠà§àаà§àв àŠªà§àаà§àŠ àŠ
à§àŠ¯àŠŸàŠà§àŠžà§àŠž àŠšà§àŠà¥€\n\nàŠàŠªàŠšàŠ¿ àŠàа àŠ¬à§àŠ°àŠŸàŠàŠàŠŸàŠ° àŠ¬àŠŸàŠšà§àŠ¡àŠ² àŠàŠ²àŠ®àŠŸàŠš?
-torbutton.security_settings.menu.title = Security Settings
+torbutton.security_settings.menu.title = àŠšàŠ¿àŠ°àŠŸàŠªàŠ€à§àŠ€àŠŸ àŠžà§àŠàŠ¿àŠàŠž
torbutton.title.prompt_torbrowser = àŠà§àаà§àŠ€à§àŠ¬àŠªà§àаà§àŠ£ Torbutton àŠ€àŠ¥à§àН
torbutton.popup.prompt_torbrowser = Torbutton àŠàŠàŠš àŠàŠ¿àŠšà§àŠšàŠàŠŸàŠ¬à§ àŠàŠŸàŠ àŠàаà§: àŠàŠªàŠšàŠ¿ àŠàŠàŠ¿ àŠàа àŠ¬àŠšà§àЧ àŠàŠ°àŠ€à§ àŠªàŠŸàŠ°àŠ¬à§àŠš àŠšàŠŸà¥€\n\nàŠàŠ®àŠ°àŠŸ àŠàŠ àŠªàŠ°àŠ¿àŠ¬àŠ°à§àŠ€àŠšàŠàŠ¿ àŠ€à§àŠ°àŠ¿ àŠàаà§àŠàŠ¿ àŠàŠŸàŠ°àŠ£ àŠàŠàŠ¿ àŠàŠàŠàŠ¿ àŠ¬à§àŠ°àŠŸàŠàŠàŠŸàŠ°à§àа Torbutton àŠ¬à§àŠ¯àŠ¬àŠ¹àŠŸàŠ° àŠàŠ°àŠŸ àŠšàŠ¿àŠ°àŠŸàŠªàŠŠ àŠšàŠ¯àŠŒ àŠ¯àŠŸ àŠ
-àŠàа àŠ¬à§àŠ°àŠŸàŠàŠàŠ¿àŠàŠ¯àŠŒà§àа àŠàŠšà§àŠ¯àŠ àŠ¬à§àŠ¯àŠ¬àŠ¹àŠŸàŠ° àŠàŠ°àŠŸ àŠ¹àŠ¯àŠŒà¥€ àŠžà§àŠàŠŸàŠšà§ àŠ
àŠšà§àŠ àŠ¬àŠŸàŠ àŠàŠ¿àŠ² àŠ¯à§ àŠàŠ®àŠ°àŠŸ àŠ
àŠšà§àН àŠà§àŠš àŠàŠªàŠŸàŠ¯àŠŒ àŠ àŠ¿àŠ àŠàŠ°àŠ€à§ àŠªàŠŸàŠ°à§ àŠšàŠŸà¥€\n\nàŠàŠªàŠšàŠ¿ àŠ¯àŠŠàŠ¿ àŠžàŠŸàŠ§àŠŸàŠ°àŠ£àŠ€ àŠ«àŠŸàŠ¯àŠŒàŠŸàŠ°àŠ«àŠà§àŠž àŠ¬à§àŠ¯àŠ¬àŠ¹àŠŸàŠ° àŠàŠ°à§ àŠ°àŠŸàŠàŠ€à§ àŠàŠŸàŠš, àŠ€àŠŸàŠ¹àŠ²à§ àŠàŠªàŠšàŠŸàŠà§ Torbutton àŠàŠšàŠàŠšàŠžà§àŠàв àŠàŠ°àŠ€à§ àŠ¹àŠ¬à§ àŠàŠ¬àŠ àŠàа àŠ¬à§àŠ°àŠŸàŠàŠàŠŸàŠ° àŠ¬à§àŠ¯àŠŸàŠ£à§àŠ¡àŠ² àŠ¡àŠŸàŠàŠšàŠ²
à§àŠ¡ àŠàŠ°àŠ€à§ àŠ¹àŠ¬à§à¥€ àŠàа àŠ¬à§àŠ°àŠŸàŠàŠàŠŸàŠ°à§àа àŠà§àŠªàŠšà§àŠ¯àŠŒàŠ€àŠŸ àŠ¬à§àŠ¶àŠ¿àŠ·à§àŠà§àН àŠžàŠŸàŠ§àŠŸàŠ°àŠ£ àŠ«àŠŸàŠ¯àŠŒàŠŸàŠ°àŠ«àŠà§àŠžà§àа àŠà§àŠ¯àŠŒà§àŠ àŠàŠà§àŠàŠ€àŠ°, àŠàŠ®àŠšàŠàŠ¿ àŠ«àŠŸàŠ¯àŠŒàŠŸàŠ°àŠ«àŠà§àŠžà§àа àŠàаà§àЬà§àŠàŠšà§àа àŠžàŠŸàŠ¥à§ àŠ¬à§àŠ¯àŠ¬àŠ¹à§àŠ€ àŠ¹àŠ¯àŠŒà¥€\n\nTorbutton àŠà§ àŠ®à§àŠà§ àŠ«à§àŠ²àŠŸàŠ° àŠàŠšà§àН Tools-> Addons-> àŠàŠà§àŠžàŠà§àŠšàŠ¶àŠšàŠà§àŠ²àŠ¿àŠ€à§ àŠ¯àŠŸàŠš àŠàŠ¬àŠ àŠ€àŠŸàŠ°àŠªàŠ° àŠàŠ°àŠ¬à§àŠ€àŠšà§àа àŠªàŠŸàŠ¶à§ àŠžàŠ°àŠŸàŠš àŠ¬à§àŠ€àŠŸàŠ®à§ àŠà§àŠ²àŠ¿àŠ àŠàаà§àŠšà¥€
torbutton.popup.short_torbrowser = àŠà§àаà§àŠ€à§àŠ¬àŠªà§àаà§àŠ£ Torbutton àŠ€àŠ¥à§àН!\n\nTorbutton àŠàŠàŠš àŠžàŠ¬àŠžàŠ®àŠ¯àŠŒ àŠžàŠà§àŠ·àŠ® àŠàŠ°àŠŸ àŠ¹àŠ¯àŠŒà¥€\n\nàŠàŠ°àŠ àŠ€àŠ¥à§àН àŠàŠšà§àН Torbutton àŠà§àŠ²àŠ¿àŠ àŠàаà§àŠšà¥€
@@ -31,9 +31,6 @@ torbutton.popup.confirm_plugins = àŠªà§àŠ²àŠŸàŠàŠàŠš àŠ¯à§àŠ®àŠš àŠ«à§àв
torbutton.popup.never_ask_again = àŠàŠ®àŠŸàŠà§ àŠàŠ¬àŠŸàŠ° àŠàŠ¿àŠà§àŠàŠŸàŠžàŠŸ àŠàŠ°àŠ¬à§àŠš àŠšàŠŸ
torbutton.popup.confirm_newnym = àŠàа àŠ¬à§àŠ°àŠŸàŠàŠàŠŸàŠ° àŠžàŠ®àŠžà§àŠ€ àŠàŠàŠšà§àŠ¡à§ àŠàŠ¬àŠ àŠà§àŠ¯àŠŸàŠ¬ àŠ¬àŠšà§àЧ àŠàŠ°àŠ¬à§ àŠžàŠ®àŠžà§àŠ€ àŠàŠ¯àŠŒà§àŠ¬àŠžàŠŸàŠàŠ àŠžà§àŠ¶àŠš àŠ¹àŠŸàŠ°àŠ¿àŠ¯àŠŒà§ àŠ¯àŠŸàŠ¬à§à¥€\n\nàŠàŠªàŠšàŠŸàŠ° àŠªàŠ°àŠ¿àŠàŠ¯àŠŒ àŠ°àŠ¿àŠžà§àŠ àŠàŠ°àŠ€à§ àŠàŠŸàŠ°à§àŠ àŠ¬à§àŠ°àŠŸàŠàŠàŠŸàŠ° àŠªà§àŠšàŠ°àŠŸàŠ¯àŠŒ àŠàŠŸàŠ²à§ àŠàаà§àŠš?\n\n
-torbutton.slider_notification = àŠžàŠ¬à§àŠ onion àŠ®à§àŠšà§àŠ€à§ àŠàŠàŠš àŠàŠàŠàŠ¿ àŠšàŠ¿àŠ°àŠŸàŠªàŠ€à§àŠ€àŠŸ àŠžà§àŠ²àŠŸàŠàŠ¡àŠŸàŠ° àŠ°àŠ¯àŠŒà§àŠà§ àŠ¯àŠŸ àŠàŠªàŠšàŠŸàŠà§ àŠàŠªàŠšàŠŸàŠ° àŠšàŠ¿àŠ°àŠŸàŠªàŠ€à§àŠ€àŠŸ àŠžà§àŠ€àŠ°àŠà§ àŠžàŠŸàŠ®àŠà§àŠàŠžà§àН àŠàŠ°àŠ€à§ àŠŠà§àŠ¯àŠŒà¥€ àŠàŠàŠŸ àŠà§àŠ àŠàаà§àŠš!
-torbutton.slider_notification_button = àŠšàŠ¿àŠ°àŠŸàŠªàŠ€à§àŠ€àŠŸ àŠžà§àŠàŠ¿àŠàŠž àŠà§àвà§àŠš
-
torbutton.maximize_warning = Maximising àŠàа àŠ¬à§àŠ°àŠŸàŠàŠàŠŸàŠ° àŠàŠ¯àŠŒà§àŠ¬àŠžàŠŸàŠàŠàŠà§àŠ²àŠ¿ àŠàŠªàŠšàŠŸàŠ° àŠ®àŠšàŠ¿àŠàа àŠàŠàŠŸàŠ° àŠšàŠ¿àŠ°à§àŠ§àŠŸàŠ°àŠ£ àŠàŠ°àŠ€à§ àŠªàŠŸàŠ°à§, àŠ¯àŠŸ àŠàŠªàŠšàŠŸàŠà§ àŠà§àаà§àŠ¯àŠŸàŠ àŠàŠ°àŠ€à§ àŠ¬à§àŠ¯àŠ¬àŠ¹àŠŸàŠ° àŠàŠ°àŠŸ àŠ¯à§àŠ€à§ àŠªàŠŸàŠ°à§à¥€ àŠàŠ®àŠ°àŠŸ àŠžà§àŠªàŠŸàŠ°àŠ¿àŠ¶ àŠàŠ°àŠ¿ àŠ¯à§ àŠàŠªàŠšàŠ¿ àŠ€àŠŸàŠŠà§àа àŠ®à§àв àŠ¡àŠ¿àŠ«àŠ²à§àŠ àŠàŠàŠŸàŠ°à§ àŠàа àŠ¬à§àŠ°àŠŸàŠàŠàŠŸàŠ° àŠàŠàŠšà§àŠ¡à§ àŠà§àŠ¡àŠŒà§ àŠ¯àŠŸàŠšà¥€
# Canvas permission prompt. Strings are kept here for ease of translation.
diff --git a/src/chrome/locale/ca/aboutTBUpdate.dtd b/src/chrome/locale/ca/aboutTBUpdate.dtd
index 515e1e79..5daa4dc0 100644
--- a/src/chrome/locale/ca/aboutTBUpdate.dtd
+++ b/src/chrome/locale/ca/aboutTBUpdate.dtd
@@ -4,3 +4,7 @@
<!ENTITY aboutTBUpdate.linkLabel "visiteu el lloc web">
<!ENTITY aboutTBUpdate.linkSuffix ".">
<!ENTITY aboutTBUpdate.changeLogHeading "Registre de canvis:">
+
+<!ENTITY aboutTBUpdate.circuitDisplayHeading "Nova pantalla de circuits redissenyats">
+<!ENTITY aboutTBUpdate.circuitDisplayDescription "La pantalla del circuit de Tor s'ha reubicat i millorat! Feu clic al botó de Site Identity (situat a la part esquerra de la barra d'URL) per veure la nova pantalla del circuit.">
+<!ENTITY aboutTBUpdate.learnMore "AprÚn més">
diff --git a/src/chrome/locale/ca/aboutTor.dtd b/src/chrome/locale/ca/aboutTor.dtd
index 3adff326..ca8aee1c 100644
--- a/src/chrome/locale/ca/aboutTor.dtd
+++ b/src/chrome/locale/ca/aboutTor.dtd
@@ -6,20 +6,23 @@
<!ENTITY aboutTor.title "Quant a Tor">
-<!ENTITY aboutTor.ready.label "Explore. Privately.">
-<!ENTITY aboutTor.ready2.label "Youâre ready for the worldâs most private browsing experience.">
+<!ENTITY aboutTor.ready.label "Exploreu. Privadament.">
+<!ENTITY aboutTor.ready2.label "Estàs preparat per a l'experiÚncia de navegació més privada del món.">
<!ENTITY aboutTor.failure.label "Hi ha algun error.">
<!ENTITY aboutTor.failure2.label "Tor no funciona en aquest navegador.">
-<!ENTITY aboutTor.search.label "Search with DuckDuckGo">
+<!ENTITY aboutTor.search.label "Cerca amb DuckDuckGo">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com">
<!ENTITY aboutTor.torbrowser_user_manual_questions.label "Preguntes?">
-<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual »">
+<!ENTITY aboutTor.torbrowser_user_manual_link.label "Consulteu el nostre manual del navegador Tor »">
<!-- The next two entities are used within the browser's Help menu. -->
<!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">
-<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual">
+<!ENTITY aboutTor.torbrowser_user_manual.label "Manual del navegador Tor">
-<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
-<!ENTITY aboutTor.getInvolved.label "Get Involved »">
+<!ENTITY aboutTor.tor_mission.label "El projecte Tor és una US 501(c)(3) organització sense à nim de lucre que avança els drets i les llibertats dels drets humans mitjançant la creació i implementació d'anonimat de codi obert i lliure i tecnologies de privadesa, que donen suport a la seva disponibilitat i ús sense restriccions i fomenten la seva comprensió cientÃfica i popular.">
+<!ENTITY aboutTor.getInvolved.label "Involucrat »">
<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en">
+
+<!ENTITY aboutTor.newsletter.tagline "Obteniu les darreres novetats de Tor directament a la safata d'entrada.">
+<!ENTITY aboutTor.newsletter.link_text "Inscriviu-vos a les noticies de Tor.">
diff --git a/src/chrome/locale/ca/browserOnboarding.properties b/src/chrome/locale/ca/browserOnboarding.properties
index 8f47794f..059d6cfc 100644
--- a/src/chrome/locale/ca/browserOnboarding.properties
+++ b/src/chrome/locale/ca/browserOnboarding.properties
@@ -4,35 +4,51 @@
onboarding.tour-tor-welcome=Welcome
onboarding.tour-tor-welcome.title=Youâre ready.
-onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. Youâre now protected against tracking, surveillance, and censorship. This quick onboarding will show you how.
onboarding.tour-tor-welcome.button=Start Now
onboarding.tour-tor-privacy=Privadesa
onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
-onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canât follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click âTor Networkâ to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click âTor Networkâ to learn how we protect you on the network level.
onboarding.tour-tor-privacy.button=Go to Tor Network
onboarding.tour-tor-network=Tor Network
onboarding.tour-tor-network.title=Travel a decentralized network.
-onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâs no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on âCircuit Displayâ to learn how they work.
+onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, thereâs no one point of failure or centralized entity you need to trust in order to enjoy the internet privately.
onboarding.tour-tor-network.button=Go to Circuit Display
onboarding.tour-tor-circuit-display=Circuit Display
onboarding.tour-tor-circuit-display.title=See your path.
-onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking âNew Circuit for this Siteâ on our Circuit Display. Click below to see how it works.
-onboarding.tour-tor-circuit-display.button=Explore
+onboarding.tour-tor-circuit-display.description=For each domain you visit, your traffic is relayed and encrypted in a circuit across three Tor relays around the world. No website knows where you are connecting from. You can request a new circuit by clicking âNew Circuit for this Siteâ on our Circuit Display.
+onboarding.tour-tor-circuit-display.button=See My Path
onboarding.tour-tor-security=Seguretat
onboarding.tour-tor-security.title=Choose your experience.
-onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do.
onboarding.tour-tor-security.button=Review Settings
onboarding.tour-tor-expect-differences=Experience Tips
-onboarding.tour-tor-expect-differences.title=Experience Tips
-onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.title=Expect some differences.
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot.
onboarding.tour-tor-expect-differences.button=See FAQs
onboarding.tour-tor-onion-services=Onion Services
-onboarding.tour-tor-onion-services.title=Onion Services
-onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.title=Be extra protected.
+onboarding.tour-tor-onion-services.description=Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously. Click below to visit the DuckDuckGo onion site.
onboarding.tour-tor-onion-services.button=Visit an Onion
+
+# Circuit Display onboarding.
+onboarding.tor-circuit-display.next=SegÃŒent
+onboarding.tor-circuit-display.done=Fet
+onboarding.tor-circuit-display.one-of-three=1 of 3
+onboarding.tor-circuit-display.two-of-three=2 of 3
+onboarding.tor-circuit-display.three-of-three=3 of 3
+
+onboarding.tor-circuit-display.intro.title=How do circuits work?
+onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assigned relays, which are computers around the world configured to forward Tor traffic. Circuits allow you to browse privately and to connect to onion services.
+
+onboarding.tor-circuit-display.diagram.title=Circuit Display
+onboarding.tor-circuit-display.diagram.msg=This diagram shows the relays that make up the circuit for this website. To prevent linking of activity across different sites, each website gets a different circuit.
+
+onboarding.tor-circuit-display.new-circuit.title=Do you need a new circuit?
+onboarding.tor-circuit-display.new-circuit.msg=If you are not able to connect to the website youâre trying to visit or it is not loading properly, then you can use this button to reload the site with a new circuit.
diff --git a/src/chrome/locale/ca/torbutton.properties b/src/chrome/locale/ca/torbutton.properties
index 7d8b824a..7942558f 100644
--- a/src/chrome/locale/ca/torbutton.properties
+++ b/src/chrome/locale/ca/torbutton.properties
@@ -31,9 +31,6 @@ torbutton.popup.confirm_plugins = Alguns Plugins com Flash poden afectar la seva
torbutton.popup.never_ask_again = No torneu a preguntar
torbutton.popup.confirm_newnym = El navegador Tor tancarà totes les finestres i pestanyes. Totes les sessions web es perdran. \n\nVol reiniciar el navegador Tor per reiniciar la seva identitat?\n\n
-torbutton.slider_notification = El menú de la ceba verda té ara un slider que li permet ajustar el seu nivell de seguretat. Fes-li un cop d'ull!
-torbutton.slider_notification_button = Obrir les preferÚncies de seguretat
-
torbutton.maximize_warning = Maximitzar Tor Browser por permetre als llocs web determinar les dimensions del teu monitor, que pot utilitzar-se per a rastrejar-li. Li recomanem que deixe la finestra de Tor Browser amb la seva mida per defecte.
# Canvas permission prompt. Strings are kept here for ease of translation.
diff --git a/src/chrome/locale/da/aboutTBUpdate.dtd b/src/chrome/locale/da/aboutTBUpdate.dtd
index 450e65ce..8fd39182 100644
--- a/src/chrome/locale/da/aboutTBUpdate.dtd
+++ b/src/chrome/locale/da/aboutTBUpdate.dtd
@@ -4,3 +4,7 @@
<!ENTITY aboutTBUpdate.linkLabel "BesÞg vores webside">
<!ENTITY aboutTBUpdate.linkSuffix ".">
<!ENTITY aboutTBUpdate.changeLogHeading "Ãndringslog:">
+
+<!ENTITY aboutTBUpdate.circuitDisplayHeading "New, Redesigned Circuit Display">
+<!ENTITY aboutTBUpdate.circuitDisplayDescription "The Tor circuit display has been relocated and improved! Click the Site Identity button (located on the left side of the URL bar) to see the new circuit display.">
+<!ENTITY aboutTBUpdate.learnMore "Learn More">
diff --git a/src/chrome/locale/da/aboutTor.dtd b/src/chrome/locale/da/aboutTor.dtd
index 9bd057c8..42cf050b 100644
--- a/src/chrome/locale/da/aboutTor.dtd
+++ b/src/chrome/locale/da/aboutTor.dtd
@@ -20,6 +20,9 @@
<!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">
<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser-manual">
-<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
+<!ENTITY aboutTor.tor_mission.label "Tor-projektet er en US 501(c)(3) nonprofit-organisation som fremmer menneskerettigheder og friheder, ved at skabe og udsende frie og open source anonymitets- og privatlivsteknologier, som stÞtter deres ubegrÊnsede tilgÊngelighed og anvendelse, og fremmer deres videnskabelige og populÊre forståelse.">
<!ENTITY aboutTor.getInvolved.label "Deltag »">
<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en">
+
+<!ENTITY aboutTor.newsletter.tagline "Get the latest news from Tor straight to your inbox.">
+<!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News.">
diff --git a/src/chrome/locale/da/browserOnboarding.properties b/src/chrome/locale/da/browserOnboarding.properties
index d94aa845..95530ce3 100644
--- a/src/chrome/locale/da/browserOnboarding.properties
+++ b/src/chrome/locale/da/browserOnboarding.properties
@@ -4,35 +4,51 @@
onboarding.tour-tor-welcome=Welcome
onboarding.tour-tor-welcome.title=Youâre ready.
-onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. Youâre now protected against tracking, surveillance, and censorship. This quick onboarding will show you how.
onboarding.tour-tor-welcome.button=Start Now
onboarding.tour-tor-privacy=Privatliv
onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
-onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canât follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click âTor Networkâ to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click âTor Networkâ to learn how we protect you on the network level.
onboarding.tour-tor-privacy.button=Go to Tor Network
onboarding.tour-tor-network=Tor Network
onboarding.tour-tor-network.title=Travel a decentralized network.
-onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâs no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on âCircuit Displayâ to learn how they work.
+onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, thereâs no one point of failure or centralized entity you need to trust in order to enjoy the internet privately.
onboarding.tour-tor-network.button=Go to Circuit Display
onboarding.tour-tor-circuit-display=Circuit Display
onboarding.tour-tor-circuit-display.title=See your path.
-onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking âNew Circuit for this Siteâ on our Circuit Display. Click below to see how it works.
-onboarding.tour-tor-circuit-display.button=Explore
+onboarding.tour-tor-circuit-display.description=For each domain you visit, your traffic is relayed and encrypted in a circuit across three Tor relays around the world. No website knows where you are connecting from. You can request a new circuit by clicking âNew Circuit for this Siteâ on our Circuit Display.
+onboarding.tour-tor-circuit-display.button=See My Path
onboarding.tour-tor-security=Sikkerhed
onboarding.tour-tor-security.title=Choose your experience.
-onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do.
onboarding.tour-tor-security.button=Review Settings
onboarding.tour-tor-expect-differences=Experience Tips
-onboarding.tour-tor-expect-differences.title=Experience Tips
-onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.title=Expect some differences.
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot.
onboarding.tour-tor-expect-differences.button=See FAQs
onboarding.tour-tor-onion-services=Onion-tjenester
-onboarding.tour-tor-onion-services.title=Onion-tjenester
-onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.title=Be extra protected.
+onboarding.tour-tor-onion-services.description=Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously. Click below to visit the DuckDuckGo onion site.
onboarding.tour-tor-onion-services.button=Visit an Onion
+
+# Circuit Display onboarding.
+onboarding.tor-circuit-display.next=NÊste
+onboarding.tor-circuit-display.done=FuldfÞrt
+onboarding.tor-circuit-display.one-of-three=1 of 3
+onboarding.tor-circuit-display.two-of-three=2 of 3
+onboarding.tor-circuit-display.three-of-three=3 of 3
+
+onboarding.tor-circuit-display.intro.title=How do circuits work?
+onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assigned relays, which are computers around the world configured to forward Tor traffic. Circuits allow you to browse privately and to connect to onion services.
+
+onboarding.tor-circuit-display.diagram.title=Circuit Display
+onboarding.tor-circuit-display.diagram.msg=This diagram shows the relays that make up the circuit for this website. To prevent linking of activity across different sites, each website gets a different circuit.
+
+onboarding.tor-circuit-display.new-circuit.title=Do you need a new circuit?
+onboarding.tor-circuit-display.new-circuit.msg=If you are not able to connect to the website youâre trying to visit or it is not loading properly, then you can use this button to reload the site with a new circuit.
diff --git a/src/chrome/locale/da/torbutton.properties b/src/chrome/locale/da/torbutton.properties
index 512f928b..f7b7cb8a 100644
--- a/src/chrome/locale/da/torbutton.properties
+++ b/src/chrome/locale/da/torbutton.properties
@@ -31,9 +31,6 @@ torbutton.popup.confirm_plugins = Udvidelsesmoduler såsom Flash kan skade sikke
torbutton.popup.never_ask_again = SpÞrg mig aldrig igen
torbutton.popup.confirm_newnym = Tor Browser vil lukke alle vinduer og faneblade. Alle webside-sessioner vil gå tabt.\nGenstart Tor Browser nu for at nulstille din identitet?\n
-torbutton.slider_notification = Nu har det grÞnne lÞg menuen en sikkerheds skyder som lader dig tilpasse dit sikkerhedsniveau. Tjek det ud!
-torbutton.slider_notification_button = Ã
bn sikkerhedsindstillinger
-
torbutton.maximize_warning = Hvis du maksimere Tor Browser kan websteder fastslå din skÊrmstÞrrelse, hvilket kan blive brugt til at spore dig. Vi anbefaler at du lader Tor Browser-vinduet vÊre i sin originale standardstÞrrelse.
# Canvas permission prompt. Strings are kept here for ease of translation.
diff --git a/src/chrome/locale/de/aboutTBUpdate.dtd b/src/chrome/locale/de/aboutTBUpdate.dtd
index e23c4798..3d699176 100644
--- a/src/chrome/locale/de/aboutTBUpdate.dtd
+++ b/src/chrome/locale/de/aboutTBUpdate.dtd
@@ -4,3 +4,7 @@
<!ENTITY aboutTBUpdate.linkLabel "besuchen Sie unsere Website">
<!ENTITY aboutTBUpdate.linkSuffix ".">
<!ENTITY aboutTBUpdate.changeLogHeading "Changelog:">
+
+<!ENTITY aboutTBUpdate.circuitDisplayHeading "New, Redesigned Circuit Display">
+<!ENTITY aboutTBUpdate.circuitDisplayDescription "The Tor circuit display has been relocated and improved! Click the Site Identity button (located on the left side of the URL bar) to see the new circuit display.">
+<!ENTITY aboutTBUpdate.learnMore "Learn More">
diff --git a/src/chrome/locale/de/aboutTor.dtd b/src/chrome/locale/de/aboutTor.dtd
index b5552c2c..f03c0e89 100644
--- a/src/chrome/locale/de/aboutTor.dtd
+++ b/src/chrome/locale/de/aboutTor.dtd
@@ -20,6 +20,9 @@
<!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">
<!ENTITY aboutTor.torbrowser_user_manual.label "Tor-Browser-Handbuch">
-<!ENTITY aboutTor.tor_mission.label "Projekt Tor ist eine in den USA als "The Tor Project" (US 501(c)(3)) registrierte nicht-kommerzielle Organisation fÌr Menschenrechte und Freiheit, die freie und quelloffene Technologien fÌr AnomytÀt und PrivatssphÀre entwickelt und bereitstellt und die Forschung und das öffentliche VerstÀndis auf diesen Gebieten voranbringt.">
+<!ENTITY aboutTor.tor_mission.label "Projekt Tor ist eine in den USA als "The Tor Project" (US 501(c)(3)) registrierte nicht-kommerzielle Organisation fÌr Menschenrechte und Freiheit, die freie und quelloffene Technologien fÌr AnonymitÀt und PrivatsphÀre entwickelt und bereitstellt und die Forschung und das öffentliche VerstÀndnis auf diesen Gebieten voranbringt.">
<!ENTITY aboutTor.getInvolved.label "Machen Sie mit »">
<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en">
+
+<!ENTITY aboutTor.newsletter.tagline "Get the latest news from Tor straight to your inbox.">
+<!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News.">
diff --git a/src/chrome/locale/de/browserOnboarding.properties b/src/chrome/locale/de/browserOnboarding.properties
index 6b6c63fc..69c7b86e 100644
--- a/src/chrome/locale/de/browserOnboarding.properties
+++ b/src/chrome/locale/de/browserOnboarding.properties
@@ -4,35 +4,51 @@
onboarding.tour-tor-welcome=Willkommen
onboarding.tour-tor-welcome.title=Youâre ready.
-onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. Youâre now protected against tracking, surveillance, and censorship. This quick onboarding will show you how.
onboarding.tour-tor-welcome.button=Start Now
onboarding.tour-tor-privacy=PrivatsphÀre
onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
-onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canât follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click âTor Networkâ to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click âTor Networkâ to learn how we protect you on the network level.
onboarding.tour-tor-privacy.button=Go to Tor Network
onboarding.tour-tor-network=Tor Network
onboarding.tour-tor-network.title=Travel a decentralized network.
-onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâs no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on âCircuit Displayâ to learn how they work.
+onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, thereâs no one point of failure or centralized entity you need to trust in order to enjoy the internet privately.
onboarding.tour-tor-network.button=Go to Circuit Display
onboarding.tour-tor-circuit-display=Circuit Display
onboarding.tour-tor-circuit-display.title=See your path.
-onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking âNew Circuit for this Siteâ on our Circuit Display. Click below to see how it works.
-onboarding.tour-tor-circuit-display.button=Entdecken
+onboarding.tour-tor-circuit-display.description=For each domain you visit, your traffic is relayed and encrypted in a circuit across three Tor relays around the world. No website knows where you are connecting from. You can request a new circuit by clicking âNew Circuit for this Siteâ on our Circuit Display.
+onboarding.tour-tor-circuit-display.button=See My Path
onboarding.tour-tor-security=Sicherheit
onboarding.tour-tor-security.title=Choose your experience.
-onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do.
onboarding.tour-tor-security.button=Review Settings
onboarding.tour-tor-expect-differences=Experience Tips
-onboarding.tour-tor-expect-differences.title=Experience Tips
-onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.title=Expect some differences.
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot.
onboarding.tour-tor-expect-differences.button=See FAQs
onboarding.tour-tor-onion-services=Onion-Dienste
-onboarding.tour-tor-onion-services.title=Onion-Dienste
-onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.title=Be extra protected.
+onboarding.tour-tor-onion-services.description=Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously. Click below to visit the DuckDuckGo onion site.
onboarding.tour-tor-onion-services.button=Visit an Onion
+
+# Circuit Display onboarding.
+onboarding.tor-circuit-display.next=Weiter
+onboarding.tor-circuit-display.done=Fertig
+onboarding.tor-circuit-display.one-of-three=1 of 3
+onboarding.tor-circuit-display.two-of-three=2 of 3
+onboarding.tor-circuit-display.three-of-three=3 of 3
+
+onboarding.tor-circuit-display.intro.title=How do circuits work?
+onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assigned relays, which are computers around the world configured to forward Tor traffic. Circuits allow you to browse privately and to connect to onion services.
+
+onboarding.tor-circuit-display.diagram.title=Circuit Display
+onboarding.tor-circuit-display.diagram.msg=This diagram shows the relays that make up the circuit for this website. To prevent linking of activity across different sites, each website gets a different circuit.
+
+onboarding.tor-circuit-display.new-circuit.title=Do you need a new circuit?
+onboarding.tor-circuit-display.new-circuit.msg=If you are not able to connect to the website youâre trying to visit or it is not loading properly, then you can use this button to reload the site with a new circuit.
diff --git a/src/chrome/locale/de/torbutton.properties b/src/chrome/locale/de/torbutton.properties
index cb398bdb..bccd548d 100644
--- a/src/chrome/locale/de/torbutton.properties
+++ b/src/chrome/locale/de/torbutton.properties
@@ -31,9 +31,6 @@ torbutton.popup.confirm_plugins = Erweiterungen wie Flash können ihre Privatsph
torbutton.popup.never_ask_again = Nicht mehr nachfragen
torbutton.popup.confirm_newnym = Tor-Browser wird alle Fenster und Reiter schlieÃen. Alle Internetseitensitzungen gehen verloren.\n\nTor-Browser jetzt neu starten, um Ihre IdentitÀt zurÃŒckzusetzen?\n\n
-torbutton.slider_notification = Das grÌne Onion-MenÌ hat jetzt einen Sicherheitsschieberegler, mit dem Sie Ihre Sicherheitsstufe anpassen können. Probieren Sie es aus!
-torbutton.slider_notification_button = Sicherheitseinstellungen öffnen
-
torbutton.maximize_warning = Die Maximierung des Tor-Browsers kann Webseiten die Bestimmung Ihrer BildschirmgröÃe ermöglichen, um damit Ihre Spur zu verfolgen. Wir empfehlen Ihnen, das Tor-Browser-Fenster in seiner ursprÃŒnglichen StandardgröÃe zu belassen.
# Canvas permission prompt. Strings are kept here for ease of translation.
diff --git a/src/chrome/locale/es/aboutTBUpdate.dtd b/src/chrome/locale/es/aboutTBUpdate.dtd
index d515a5e8..17f354cb 100644
--- a/src/chrome/locale/es/aboutTBUpdate.dtd
+++ b/src/chrome/locale/es/aboutTBUpdate.dtd
@@ -4,3 +4,7 @@
<!ENTITY aboutTBUpdate.linkLabel "visite nuestro sitio web">
<!ENTITY aboutTBUpdate.linkSuffix ".">
<!ENTITY aboutTBUpdate.changeLogHeading "Registro de cambios:">
+
+<!ENTITY aboutTBUpdate.circuitDisplayHeading "Nuevo, Pantalla de Circuito Rediseñada RCD">
+<!ENTITY aboutTBUpdate.circuitDisplayDescription "¡Se ha trasladado y mejorado la visualización del ciruito de Tor! Clic en el botón Site Identity (situado en el lado izquierdo de la barra de direcciones URL) para ver la nueva visualización del circuito.">
+<!ENTITY aboutTBUpdate.learnMore "Aprende más">
diff --git a/src/chrome/locale/es/aboutTor.dtd b/src/chrome/locale/es/aboutTor.dtd
index 152e7590..c0934bde 100644
--- a/src/chrome/locale/es/aboutTor.dtd
+++ b/src/chrome/locale/es/aboutTor.dtd
@@ -23,3 +23,6 @@
<!ENTITY aboutTor.tor_mission.label "El proyecto Tor es una organización sin fines de lucro definida legalmente en Estados Unidos como 501(c)(3), avanzando libertades y derechos humanos mediante la creación y despliegue de tecnologÃas de anonimato y privacidad sin costo y de fuente abierta, apoyando su disponibilidad y uso sin restricciones y ampliando su entendimiento cientÃfico y popular.">
<!ENTITY aboutTor.getInvolved.label "Involúcrate">
<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en">
+
+<!ENTITY aboutTor.newsletter.tagline "Recibe las últimas noticias de Tor directamente en tu bandeja de entrada.">
+<!ENTITY aboutTor.newsletter.link_text "InscrÃbete en Tor News.">
diff --git a/src/chrome/locale/es/browserOnboarding.properties b/src/chrome/locale/es/browserOnboarding.properties
index 02543c3e..5ba63158 100644
--- a/src/chrome/locale/es/browserOnboarding.properties
+++ b/src/chrome/locale/es/browserOnboarding.properties
@@ -4,35 +4,51 @@
onboarding.tour-tor-welcome=Bienvenido/a
onboarding.tour-tor-welcome.title=Estás listo/a.
-onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. Youâre now protected against tracking, surveillance, and censorship. This quick onboarding will show you how.
onboarding.tour-tor-welcome.button=Start Now
onboarding.tour-tor-privacy=Privacidad
onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
-onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canât follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click âTor Networkâ to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click âTor Networkâ to learn how we protect you on the network level.
onboarding.tour-tor-privacy.button=Ir a la red Tor
onboarding.tour-tor-network=Red Tor
onboarding.tour-tor-network.title=Travel a decentralized network.
-onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâs no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on âCircuit Displayâ to learn how they work.
+onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, thereâs no one point of failure or centralized entity you need to trust in order to enjoy the internet privately.
onboarding.tour-tor-network.button=Go to Circuit Display
onboarding.tour-tor-circuit-display=Circuit Display
onboarding.tour-tor-circuit-display.title=See your path.
-onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking âNew Circuit for this Siteâ on our Circuit Display. Click below to see how it works.
-onboarding.tour-tor-circuit-display.button=Explorar
+onboarding.tour-tor-circuit-display.description=For each domain you visit, your traffic is relayed and encrypted in a circuit across three Tor relays around the world. No website knows where you are connecting from. You can request a new circuit by clicking âNew Circuit for this Siteâ on our Circuit Display.
+onboarding.tour-tor-circuit-display.button=See My Path
onboarding.tour-tor-security=Seguridad
onboarding.tour-tor-security.title=Choose your experience.
-onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do.
onboarding.tour-tor-security.button=Review Settings
onboarding.tour-tor-expect-differences=Experience Tips
-onboarding.tour-tor-expect-differences.title=Experience Tips
-onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.title=Expect some differences.
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot.
onboarding.tour-tor-expect-differences.button=See FAQs
onboarding.tour-tor-onion-services=Servicios onion
-onboarding.tour-tor-onion-services.title=Servicios Onion
-onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.title=Be extra protected.
+onboarding.tour-tor-onion-services.description=Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously. Click below to visit the DuckDuckGo onion site.
onboarding.tour-tor-onion-services.button=Visit an Onion
+
+# Circuit Display onboarding.
+onboarding.tor-circuit-display.next=Siguiente
+onboarding.tor-circuit-display.done=Hecho
+onboarding.tor-circuit-display.one-of-three=1 of 3
+onboarding.tor-circuit-display.two-of-three=2 of 3
+onboarding.tor-circuit-display.three-of-three=3 of 3
+
+onboarding.tor-circuit-display.intro.title=How do circuits work?
+onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assigned relays, which are computers around the world configured to forward Tor traffic. Circuits allow you to browse privately and to connect to onion services.
+
+onboarding.tor-circuit-display.diagram.title=Circuit Display
+onboarding.tor-circuit-display.diagram.msg=This diagram shows the relays that make up the circuit for this website. To prevent linking of activity across different sites, each website gets a different circuit.
+
+onboarding.tor-circuit-display.new-circuit.title=Do you need a new circuit?
+onboarding.tor-circuit-display.new-circuit.msg=If you are not able to connect to the website youâre trying to visit or it is not loading properly, then you can use this button to reload the site with a new circuit.
diff --git a/src/chrome/locale/es/torbutton.properties b/src/chrome/locale/es/torbutton.properties
index 21ec2ea0..6c56979e 100644
--- a/src/chrome/locale/es/torbutton.properties
+++ b/src/chrome/locale/es/torbutton.properties
@@ -31,9 +31,6 @@ torbutton.popup.confirm_plugins = Complementos (plugins) como Flash pueden daña
torbutton.popup.never_ask_again = No me vuelvas a preguntar
torbutton.popup.confirm_newnym = El Navegador Tor cerrará todas las ventanas y pestañas. Todas las sesiones de sitios web se perderán.\n\n¿Reiniciar el Navegador Tor para restablecer su identidad?\n\n
-torbutton.slider_notification = El menú de la cebolla verde ahora tiene un control deslizante que le permite ajustar su nivel de seguridad. ¡Ãchele un vistazo!
-torbutton.slider_notification_button = Abrir ajustes de seguridad
-
torbutton.maximize_warning = Maximizar el navegador Tor puede permitir a los sitios web determinar el tamaño de tu monitor, lo que podrÃa usarse para rastrearte. Te recomendamos que dejes las ventanas del navegador Tor en su tamaño predeterminado.
# Canvas permission prompt. Strings are kept here for ease of translation.
diff --git a/src/chrome/locale/eu/aboutTBUpdate.dtd b/src/chrome/locale/eu/aboutTBUpdate.dtd
index 5f2178ba..535b8e39 100644
--- a/src/chrome/locale/eu/aboutTBUpdate.dtd
+++ b/src/chrome/locale/eu/aboutTBUpdate.dtd
@@ -4,3 +4,7 @@
<!ENTITY aboutTBUpdate.linkLabel "ikusi ezazu gure webgunea">
<!ENTITY aboutTBUpdate.linkSuffix ".">
<!ENTITY aboutTBUpdate.changeLogHeading "Aldaketen zerrenda:">
+
+<!ENTITY aboutTBUpdate.circuitDisplayHeading "New, Redesigned Circuit Display">
+<!ENTITY aboutTBUpdate.circuitDisplayDescription "The Tor circuit display has been relocated and improved! Click the Site Identity button (located on the left side of the URL bar) to see the new circuit display.">
+<!ENTITY aboutTBUpdate.learnMore "Learn More">
diff --git a/src/chrome/locale/eu/aboutTor.dtd b/src/chrome/locale/eu/aboutTor.dtd
index 3fb2f888..123091e5 100644
--- a/src/chrome/locale/eu/aboutTor.dtd
+++ b/src/chrome/locale/eu/aboutTor.dtd
@@ -23,3 +23,6 @@
<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
<!ENTITY aboutTor.getInvolved.label "Get Involved »">
<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en">
+
+<!ENTITY aboutTor.newsletter.tagline "Get the latest news from Tor straight to your inbox.">
+<!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News.">
diff --git a/src/chrome/locale/eu/browserOnboarding.properties b/src/chrome/locale/eu/browserOnboarding.properties
index 9d378850..a3747409 100644
--- a/src/chrome/locale/eu/browserOnboarding.properties
+++ b/src/chrome/locale/eu/browserOnboarding.properties
@@ -4,35 +4,51 @@
onboarding.tour-tor-welcome=Welcome
onboarding.tour-tor-welcome.title=Youâre ready.
-onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. Youâre now protected against tracking, surveillance, and censorship. This quick onboarding will show you how.
onboarding.tour-tor-welcome.button=Start Now
onboarding.tour-tor-privacy=Pribatutasuna
onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
-onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canât follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click âTor Networkâ to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click âTor Networkâ to learn how we protect you on the network level.
onboarding.tour-tor-privacy.button=Go to Tor Network
onboarding.tour-tor-network=Tor Network
onboarding.tour-tor-network.title=Travel a decentralized network.
-onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâs no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on âCircuit Displayâ to learn how they work.
+onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, thereâs no one point of failure or centralized entity you need to trust in order to enjoy the internet privately.
onboarding.tour-tor-network.button=Go to Circuit Display
onboarding.tour-tor-circuit-display=Circuit Display
onboarding.tour-tor-circuit-display.title=See your path.
-onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking âNew Circuit for this Siteâ on our Circuit Display. Click below to see how it works.
-onboarding.tour-tor-circuit-display.button=Explore
+onboarding.tour-tor-circuit-display.description=For each domain you visit, your traffic is relayed and encrypted in a circuit across three Tor relays around the world. No website knows where you are connecting from. You can request a new circuit by clicking âNew Circuit for this Siteâ on our Circuit Display.
+onboarding.tour-tor-circuit-display.button=See My Path
onboarding.tour-tor-security=Segurtasuna
onboarding.tour-tor-security.title=Choose your experience.
-onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do.
onboarding.tour-tor-security.button=Review Settings
onboarding.tour-tor-expect-differences=Experience Tips
-onboarding.tour-tor-expect-differences.title=Experience Tips
-onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.title=Expect some differences.
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot.
onboarding.tour-tor-expect-differences.button=See FAQs
onboarding.tour-tor-onion-services=Onion Services
-onboarding.tour-tor-onion-services.title=Onion Services
-onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.title=Be extra protected.
+onboarding.tour-tor-onion-services.description=Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously. Click below to visit the DuckDuckGo onion site.
onboarding.tour-tor-onion-services.button=Visit an Onion
+
+# Circuit Display onboarding.
+onboarding.tor-circuit-display.next=Hurrengoa
+onboarding.tor-circuit-display.done=Eginda
+onboarding.tor-circuit-display.one-of-three=1 of 3
+onboarding.tor-circuit-display.two-of-three=2 of 3
+onboarding.tor-circuit-display.three-of-three=3 of 3
+
+onboarding.tor-circuit-display.intro.title=How do circuits work?
+onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assigned relays, which are computers around the world configured to forward Tor traffic. Circuits allow you to browse privately and to connect to onion services.
+
+onboarding.tor-circuit-display.diagram.title=Circuit Display
+onboarding.tor-circuit-display.diagram.msg=This diagram shows the relays that make up the circuit for this website. To prevent linking of activity across different sites, each website gets a different circuit.
+
+onboarding.tor-circuit-display.new-circuit.title=Do you need a new circuit?
+onboarding.tor-circuit-display.new-circuit.msg=If you are not able to connect to the website youâre trying to visit or it is not loading properly, then you can use this button to reload the site with a new circuit.
diff --git a/src/chrome/locale/eu/torbutton.properties b/src/chrome/locale/eu/torbutton.properties
index 85c9e01b..328f0414 100644
--- a/src/chrome/locale/eu/torbutton.properties
+++ b/src/chrome/locale/eu/torbutton.properties
@@ -31,9 +31,6 @@ torbutton.popup.confirm_plugins = Flash bezalako pluginek zure pribatutasuna eta
torbutton.popup.never_ask_again = Ez nazazu galdetu berriz
torbutton.popup.confirm_newnym = Tor nabigatzaileak lehio eta fitxa guztiak itxiko ditu. Webguneen saio guztiak galdutko dira.\n\nTor nabigatzailea orain berrabiarazi zure nortasuna berrezartzeko?\n
-torbutton.slider_notification = Tipula berdearen menua orain zure segurtasun maila egokitzen uzten dizun barra bat du. Proba ezazu!
-torbutton.slider_notification_button = Segurtasun aukerak ireki
-
torbutton.maximize_warning = Tor nabigatzailea maximizatzeak webguneek zure pantailaren neurria zehaztea baimendu dezake, eta zure jarraipena egiteko erabili daiteke. Tor nabigatzailearen lehioa neurri lehenetsian uztea gomendatzen dugu.
# Canvas permission prompt. Strings are kept here for ease of translation.
diff --git a/src/chrome/locale/fa/aboutTBUpdate.dtd b/src/chrome/locale/fa/aboutTBUpdate.dtd
index a425efc0..9502a888 100644
--- a/src/chrome/locale/fa/aboutTBUpdate.dtd
+++ b/src/chrome/locale/fa/aboutTBUpdate.dtd
@@ -4,3 +4,7 @@
<!ENTITY aboutTBUpdate.linkLabel "از ÙØšâØ³Ø§ÛØª Ù
ا Ø¯ÛØ¯Ù Ú©ÙÛØ¯">
<!ENTITY aboutTBUpdate.linkSuffix ".">
<!ENTITY aboutTBUpdate.changeLogHeading "ÙÛØ³Øª تغÛÛØ±Ø§Øª:">
+
+<!ENTITY aboutTBUpdate.circuitDisplayHeading "New, Redesigned Circuit Display">
+<!ENTITY aboutTBUpdate.circuitDisplayDescription "The Tor circuit display has been relocated and improved! Click the Site Identity button (located on the left side of the URL bar) to see the new circuit display.">
+<!ENTITY aboutTBUpdate.learnMore "Learn More">
diff --git a/src/chrome/locale/fa/aboutTor.dtd b/src/chrome/locale/fa/aboutTor.dtd
index 92674b09..add704d4 100644
--- a/src/chrome/locale/fa/aboutTor.dtd
+++ b/src/chrome/locale/fa/aboutTor.dtd
@@ -23,3 +23,6 @@
<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
<!ENTITY aboutTor.getInvolved.label "Get Involved »">
<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en">
+
+<!ENTITY aboutTor.newsletter.tagline "Get the latest news from Tor straight to your inbox.">
+<!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News.">
diff --git a/src/chrome/locale/fa/browserOnboarding.properties b/src/chrome/locale/fa/browserOnboarding.properties
index 663555ad..e0ab4338 100644
--- a/src/chrome/locale/fa/browserOnboarding.properties
+++ b/src/chrome/locale/fa/browserOnboarding.properties
@@ -4,35 +4,51 @@
onboarding.tour-tor-welcome=Ø®ÙØŽ Ø¢Ù
Ø¯ÛØ¯
onboarding.tour-tor-welcome.title=Youâre ready.
-onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. Youâre now protected against tracking, surveillance, and censorship. This quick onboarding will show you how.
onboarding.tour-tor-welcome.button=Start Now
onboarding.tour-tor-privacy=ØØ±ÛÙ
Ø®ØµÙØµÛ
onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
-onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canât follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click âTor Networkâ to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click âTor Networkâ to learn how we protect you on the network level.
onboarding.tour-tor-privacy.button=Go to Tor Network
onboarding.tour-tor-network=Tor Network
onboarding.tour-tor-network.title=Travel a decentralized network.
-onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâs no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on âCircuit Displayâ to learn how they work.
+onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, thereâs no one point of failure or centralized entity you need to trust in order to enjoy the internet privately.
onboarding.tour-tor-network.button=Go to Circuit Display
onboarding.tour-tor-circuit-display=Circuit Display
onboarding.tour-tor-circuit-display.title=See your path.
-onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking âNew Circuit for this Siteâ on our Circuit Display. Click below to see how it works.
-onboarding.tour-tor-circuit-display.button=گ؎ت ٠گذار
+onboarding.tour-tor-circuit-display.description=For each domain you visit, your traffic is relayed and encrypted in a circuit across three Tor relays around the world. No website knows where you are connecting from. You can request a new circuit by clicking âNew Circuit for this Siteâ on our Circuit Display.
+onboarding.tour-tor-circuit-display.button=See My Path
onboarding.tour-tor-security=اÙ
ÙÛØª
onboarding.tour-tor-security.title=Choose your experience.
-onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do.
onboarding.tour-tor-security.button=Review Settings
onboarding.tour-tor-expect-differences=Experience Tips
-onboarding.tour-tor-expect-differences.title=Experience Tips
-onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.title=Expect some differences.
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot.
onboarding.tour-tor-expect-differences.button=See FAQs
onboarding.tour-tor-onion-services=خدÙ
ات ÙŸÛØ§Ø²Û
-onboarding.tour-tor-onion-services.title=خدÙ
ات ÙŸÛØ§Ø²Û
-onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.title=Be extra protected.
+onboarding.tour-tor-onion-services.description=Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously. Click below to visit the DuckDuckGo onion site.
onboarding.tour-tor-onion-services.button=Visit an Onion
+
+# Circuit Display onboarding.
+onboarding.tor-circuit-display.next=ؚعدÛ
+onboarding.tor-circuit-display.done=Ø§ÙØ¬Ø§Ù
؎د
+onboarding.tor-circuit-display.one-of-three=1 of 3
+onboarding.tor-circuit-display.two-of-three=2 of 3
+onboarding.tor-circuit-display.three-of-three=3 of 3
+
+onboarding.tor-circuit-display.intro.title=How do circuits work?
+onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assigned relays, which are computers around the world configured to forward Tor traffic. Circuits allow you to browse privately and to connect to onion services.
+
+onboarding.tor-circuit-display.diagram.title=Circuit Display
+onboarding.tor-circuit-display.diagram.msg=This diagram shows the relays that make up the circuit for this website. To prevent linking of activity across different sites, each website gets a different circuit.
+
+onboarding.tor-circuit-display.new-circuit.title=Do you need a new circuit?
+onboarding.tor-circuit-display.new-circuit.msg=If you are not able to connect to the website youâre trying to visit or it is not loading properly, then you can use this button to reload the site with a new circuit.
diff --git a/src/chrome/locale/fa/torbutton.properties b/src/chrome/locale/fa/torbutton.properties
index 9a3a3148..a239e685 100644
--- a/src/chrome/locale/fa/torbutton.properties
+++ b/src/chrome/locale/fa/torbutton.properties
@@ -31,9 +31,6 @@ torbutton.popup.confirm_plugins = ÙŸÙØ§Ú¯ÛÙÙØ§ Ù
اÙÙØ¯ ÙÙØŽØ Ù
ÛØªÙ
torbutton.popup.never_ask_again = دÛگر ÙÛÚگا٠اÛ٠را از Ù
Ù Ùٟرس
torbutton.popup.confirm_newnym = Ù
Ø±ÙØ±Ú¯Ø± Tor ÙÙ
Ù ÙŸÙØ¬Ø±Ù ÙØ§ ٠تؚ ÙØ§ را Ù
Û ØšÙØ¯Ø¯. ÙÙ
Ù Ø¬ÙØ³Ø§Øª ÙØš Ø³Ø§ÛØª ØŽÙØ¯ از دست Ø®ÙØ§Ùد Ø±ÙØª\n\nØ¢ÛØ§ Ù
Û Ø®ÙØ§ÙÛØ¯ Ø±Ø§Ù Ø§ÙØ¯Ø§Ø²Û Ù
جدد Ù
Ø±ÙØ±Ú¯Ø± Tor Ø§ÙØ§Ù Ø§ÙØ¬Ø§Ù
ØŽÙØ¯ تا ÙÙÛØª Ø®ÙØ¯ را ØªÙØžÛÙ
Ù
جدد Ú©ÙÛØ¯Ø\n
-torbutton.slider_notification = Ù
ÙÙÛ ÙŸÛØ§Ø² سؚز در ØØ§Ù ØØ§Ø¶Ø± ÛÚ© ÙÙØ§Ø± ÙØºØ²Ùد٠اÙ
ÙÛØªÛ است Ú©Ù ØšÙ ØŽÙ
ا اجاز٠Ù
Û Ø¯ÙØ¯ Ø³Ø·Ø Ø§Ù
ÙÛØªÛ Ø®ÙØ¯ را ØªÙØžÛÙ
Ú©ÙÛØ¯. آ٠را ÚÚ© Ú©ÙÛØ¯!
-torbutton.slider_notification_button = ؚاز Ú©Ø±Ø¯Ù ØªÙØžÛÙ
ات اÙ
ÙÛØªÛ
-
torbutton.maximize_warning = Ù
اکسÛÙ
Ø§ÛØ² کرد٠Ù
Ø±ÙØ±Ú¯Ø± ØªÙØ± ØšÙ ÙØšØ³Ø§Ûت ÙØ§ اÛ٠اÙ
کا٠را Ù
Û Ø¯ÙØ¯ ک٠از رÙÛ Ø³Ø§ÛØ² ØµÙØÙ ÙÙ
Ø§ÛØŽØ ØŽÙ
ا را Ø±Ø¯Ú¯ÛØ±Û Ú©ÙÙØ¯. ÙŸÛØŽÙÙØ§Ø¯ Ù
Û Ú©ÙÛÙ
ک٠از Ø³Ø§ÛØ² ÙŸÛØŽ ÙØ±Ø¶ Ù
Ø±ÙØ±Ú¯Ø± ØªÙØ± Ø§Ø³ØªÙØ§Ø¯Ù Ú©ÙÛØ¯.
# Canvas permission prompt. Strings are kept here for ease of translation.
diff --git a/src/chrome/locale/fr/aboutTBUpdate.dtd b/src/chrome/locale/fr/aboutTBUpdate.dtd
index 04912b67..7ff3ca31 100644
--- a/src/chrome/locale/fr/aboutTBUpdate.dtd
+++ b/src/chrome/locale/fr/aboutTBUpdate.dtd
@@ -4,3 +4,7 @@
<!ENTITY aboutTBUpdate.linkLabel "visitez notre site Web">
<!ENTITY aboutTBUpdate.linkSuffix ".">
<!ENTITY aboutTBUpdate.changeLogHeading "Journal des changements :">
+
+<!ENTITY aboutTBUpdate.circuitDisplayHeading "Affichage des circuits nouveau et repensé">
+<!ENTITY aboutTBUpdate.circuitDisplayDescription "Lâaffichage des circuits de Tor a été déplacé et amélioréâ! Cliquez sur le bouton Identité&#160;du&#160;site (situé à gauche de la barre dâURL) pour voir le nouvel affichage des circuits.">
+<!ENTITY aboutTBUpdate.learnMore "En apprendre davantage">
diff --git a/src/chrome/locale/fr/aboutTor.dtd b/src/chrome/locale/fr/aboutTor.dtd
index 66b7f11b..708e244a 100644
--- a/src/chrome/locale/fr/aboutTor.dtd
+++ b/src/chrome/locale/fr/aboutTor.dtd
@@ -6,20 +6,23 @@
<!ENTITY aboutTor.title "Ã propos de Tor ">
-<!ENTITY aboutTor.ready.label "Explore. Privately.">
-<!ENTITY aboutTor.ready2.label "Youâre ready for the worldâs most private browsing experience.">
+<!ENTITY aboutTor.ready.label "Explorez, en toute confidentialité.">
+<!ENTITY aboutTor.ready2.label "Vous êtes prêts pour lâexpérience de navigation la plus confidentielle au monde.">
<!ENTITY aboutTor.failure.label "Une erreur sâest produiteâ!">
<!ENTITY aboutTor.failure2.label "Tor ne fonctionne pas dans ce navigateur.">
-<!ENTITY aboutTor.search.label "Search with DuckDuckGo">
+<!ENTITY aboutTor.search.label "Chercher avec DuckDuckGo">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com">
<!ENTITY aboutTor.torbrowser_user_manual_questions.label "Des questionsâ?">
-<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual »">
+<!ENTITY aboutTor.torbrowser_user_manual_link.label "Consultez notre guide dâutilisation du navigateur Tor »">
<!-- The next two entities are used within the browser's Help menu. -->
<!ENTITY aboutTor.torbrowser_user_manual.accesskey "G">
-<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual">
+<!ENTITY aboutTor.torbrowser_user_manual.label "Guide dâutilisation du Navigateur Tor">
-<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
-<!ENTITY aboutTor.getInvolved.label "Get Involved »">
+<!ENTITY aboutTor.tor_mission.label "Le Projet Tor est une organisation sans but lucratif US 501(c)(3) qui fait progresser les droits de la personne et les libertés en créant et en déployant des technologies dâanonymat et de confidentialité gratuites et à code source ouvert. Nous soutenons leur disponibilité et leur utilisation sans restriction, et promouvons une meilleure compréhension scientifique et populaire.">
+<!ENTITY aboutTor.getInvolved.label "Impliquez-vous »">
<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html">
+
+<!ENTITY aboutTor.newsletter.tagline "Obtenez les derniÚres nouvelles au sujet de Tor directement dans votre boîte de réception.">
+<!ENTITY aboutTor.newsletter.link_text "Inscrivez-vous aux nouvelles de Tor">
diff --git a/src/chrome/locale/fr/browserOnboarding.properties b/src/chrome/locale/fr/browserOnboarding.properties
index 1dc86527..4c9fff79 100644
--- a/src/chrome/locale/fr/browserOnboarding.properties
+++ b/src/chrome/locale/fr/browserOnboarding.properties
@@ -4,35 +4,51 @@
onboarding.tour-tor-welcome=Bienvenue
onboarding.tour-tor-welcome.title=Youâre ready.
-onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. Youâre now protected against tracking, surveillance, and censorship. This quick onboarding will show you how.
onboarding.tour-tor-welcome.button=Start Now
onboarding.tour-tor-privacy=Confidentialité
onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
-onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canât follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click âTor Networkâ to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click âTor Networkâ to learn how we protect you on the network level.
onboarding.tour-tor-privacy.button=Go to Tor Network
onboarding.tour-tor-network=Tor Network
onboarding.tour-tor-network.title=Travel a decentralized network.
-onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâs no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on âCircuit Displayâ to learn how they work.
+onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, thereâs no one point of failure or centralized entity you need to trust in order to enjoy the internet privately.
onboarding.tour-tor-network.button=Go to Circuit Display
onboarding.tour-tor-circuit-display=Circuit Display
onboarding.tour-tor-circuit-display.title=See your path.
-onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking âNew Circuit for this Siteâ on our Circuit Display. Click below to see how it works.
-onboarding.tour-tor-circuit-display.button=Explorer
+onboarding.tour-tor-circuit-display.description=For each domain you visit, your traffic is relayed and encrypted in a circuit across three Tor relays around the world. No website knows where you are connecting from. You can request a new circuit by clicking âNew Circuit for this Siteâ on our Circuit Display.
+onboarding.tour-tor-circuit-display.button=See My Path
onboarding.tour-tor-security=Sécurité
onboarding.tour-tor-security.title=Choose your experience.
-onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do.
onboarding.tour-tor-security.button=Review Settings
onboarding.tour-tor-expect-differences=Experience Tips
-onboarding.tour-tor-expect-differences.title=Experience Tips
-onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.title=Expect some differences.
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot.
onboarding.tour-tor-expect-differences.button=See FAQs
onboarding.tour-tor-onion-services=Les services oignon
-onboarding.tour-tor-onion-services.title=Les services oignon
-onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.title=Be extra protected.
+onboarding.tour-tor-onion-services.description=Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously. Click below to visit the DuckDuckGo onion site.
onboarding.tour-tor-onion-services.button=Visit an Onion
+
+# Circuit Display onboarding.
+onboarding.tor-circuit-display.next=Suivant
+onboarding.tor-circuit-display.done=Fait
+onboarding.tor-circuit-display.one-of-three=1 of 3
+onboarding.tor-circuit-display.two-of-three=2 of 3
+onboarding.tor-circuit-display.three-of-three=3 of 3
+
+onboarding.tor-circuit-display.intro.title=How do circuits work?
+onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assigned relays, which are computers around the world configured to forward Tor traffic. Circuits allow you to browse privately and to connect to onion services.
+
+onboarding.tor-circuit-display.diagram.title=Circuit Display
+onboarding.tor-circuit-display.diagram.msg=This diagram shows the relays that make up the circuit for this website. To prevent linking of activity across different sites, each website gets a different circuit.
+
+onboarding.tor-circuit-display.new-circuit.title=Do you need a new circuit?
+onboarding.tor-circuit-display.new-circuit.msg=If you are not able to connect to the website youâre trying to visit or it is not loading properly, then you can use this button to reload the site with a new circuit.
diff --git a/src/chrome/locale/fr/torbutton.properties b/src/chrome/locale/fr/torbutton.properties
index 8ea51db4..6f430a65 100644
--- a/src/chrome/locale/fr/torbutton.properties
+++ b/src/chrome/locale/fr/torbutton.properties
@@ -31,9 +31,6 @@ torbutton.popup.confirm_plugins = Les greffons tels que Flash peuvent nuire à v
torbutton.popup.never_ask_again = Ne plus me poser la question.
torbutton.popup.confirm_newnym = Le Navigateur Tor fermera tous les fenêtres et onglets. Les sessions des sites Web seront toutes perdues.\n\nRedémarrer le Navigateur Tor maintenant pour réinitialiser votre identitéâ?\n\n
-torbutton.slider_notification = Le menu de lâoignon vert propose maintenant un curseur de sécurité qui vous permet de régler votre niveau de sécurité. Découvrez-leâ!
-torbutton.slider_notification_button = Ouvrir préférences de sécurité
-
torbutton.maximize_warning = Maximiser le Navigateur Tor peut permettre aux sites Web de déterminer la taille de votre moniteur, ce qui peut être utilisé pour vous suivre à la trace. Nous vous recommandons de garder la taille dâorigine des fenêtres du Navigateur Tor.
# Canvas permission prompt. Strings are kept here for ease of translation.
diff --git a/src/chrome/locale/ga/aboutTBUpdate.dtd b/src/chrome/locale/ga/aboutTBUpdate.dtd
index 4114c065..258515c4 100644
--- a/src/chrome/locale/ga/aboutTBUpdate.dtd
+++ b/src/chrome/locale/ga/aboutTBUpdate.dtd
@@ -4,3 +4,7 @@
<!ENTITY aboutTBUpdate.linkLabel "tabhair cuairt ar ár suÃomh Gréasáin">
<!ENTITY aboutTBUpdate.linkSuffix ".">
<!ENTITY aboutTBUpdate.changeLogHeading "Logchomhad athruithe:">
+
+<!ENTITY aboutTBUpdate.circuitDisplayHeading "New, Redesigned Circuit Display">
+<!ENTITY aboutTBUpdate.circuitDisplayDescription "The Tor circuit display has been relocated and improved! Click the Site Identity button (located on the left side of the URL bar) to see the new circuit display.">
+<!ENTITY aboutTBUpdate.learnMore "Tuilleadh Eolais">
diff --git a/src/chrome/locale/ga/aboutTor.dtd b/src/chrome/locale/ga/aboutTor.dtd
index 62fbbf6c..ce6fe3f5 100644
--- a/src/chrome/locale/ga/aboutTor.dtd
+++ b/src/chrome/locale/ga/aboutTor.dtd
@@ -23,3 +23,6 @@
<!ENTITY aboutTor.tor_mission.label "EagraÃocht neamhbhrabúis 501(c)(3) sna Stáit Aontaithe is ea Tionscadal Tor. An phrÃomhaidhm atá againn ná cearta daonna agus an tsaoirse a chur chun cinn trà theicneolaÃochtaà oscailte agus saor in aisce a thacaÃonn leis an bprÃobháideachas ar lÃne a fhorbairt, na teicneolaÃochtaà seo a scaipeadh gan srian agus a n-úsáid a spreagadh, agus tuiscint nÃos fearr ar chúrsaà prÃobháideachais a fhorbairt i measc an phobail.">
<!ENTITY aboutTor.getInvolved.label "Glac Páirt »">
<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en">
+
+<!ENTITY aboutTor.newsletter.tagline "Faigh an nuacht is déanaà maidir le Tor i do bhosca isteach.">
+<!ENTITY aboutTor.newsletter.link_text "Cláraigh le Nuachtlitir Tor.">
diff --git a/src/chrome/locale/ga/browserOnboarding.properties b/src/chrome/locale/ga/browserOnboarding.properties
index 1a26ba8e..cc1000c1 100644
--- a/src/chrome/locale/ga/browserOnboarding.properties
+++ b/src/chrome/locale/ga/browserOnboarding.properties
@@ -4,35 +4,51 @@
onboarding.tour-tor-welcome=Welcome
onboarding.tour-tor-welcome.title=Youâre ready.
-onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. Youâre now protected against tracking, surveillance, and censorship. This quick onboarding will show you how.
onboarding.tour-tor-welcome.button=Start Now
onboarding.tour-tor-privacy=PrÃobháideachas
onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
-onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canât follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click âTor Networkâ to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click âTor Networkâ to learn how we protect you on the network level.
onboarding.tour-tor-privacy.button=Go to Tor Network
onboarding.tour-tor-network=Tor Network
onboarding.tour-tor-network.title=Travel a decentralized network.
-onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâs no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on âCircuit Displayâ to learn how they work.
+onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, thereâs no one point of failure or centralized entity you need to trust in order to enjoy the internet privately.
onboarding.tour-tor-network.button=Go to Circuit Display
onboarding.tour-tor-circuit-display=Circuit Display
onboarding.tour-tor-circuit-display.title=See your path.
-onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking âNew Circuit for this Siteâ on our Circuit Display. Click below to see how it works.
-onboarding.tour-tor-circuit-display.button=Explore
+onboarding.tour-tor-circuit-display.description=For each domain you visit, your traffic is relayed and encrypted in a circuit across three Tor relays around the world. No website knows where you are connecting from. You can request a new circuit by clicking âNew Circuit for this Siteâ on our Circuit Display.
+onboarding.tour-tor-circuit-display.button=See My Path
onboarding.tour-tor-security=Security
onboarding.tour-tor-security.title=Choose your experience.
-onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do.
onboarding.tour-tor-security.button=Review Settings
onboarding.tour-tor-expect-differences=Experience Tips
-onboarding.tour-tor-expect-differences.title=Experience Tips
-onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.title=Expect some differences.
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot.
onboarding.tour-tor-expect-differences.button=See FAQs
onboarding.tour-tor-onion-services=SeirbhÃsà Onion
-onboarding.tour-tor-onion-services.title=SeirbhÃsà Onion
-onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.title=Be extra protected.
+onboarding.tour-tor-onion-services.description=Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously. Click below to visit the DuckDuckGo onion site.
onboarding.tour-tor-onion-services.button=Visit an Onion
+
+# Circuit Display onboarding.
+onboarding.tor-circuit-display.next=Ar Aghaidh
+onboarding.tor-circuit-display.done=Déanta
+onboarding.tor-circuit-display.one-of-three=1 of 3
+onboarding.tor-circuit-display.two-of-three=2 of 3
+onboarding.tor-circuit-display.three-of-three=3 of 3
+
+onboarding.tor-circuit-display.intro.title=How do circuits work?
+onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assigned relays, which are computers around the world configured to forward Tor traffic. Circuits allow you to browse privately and to connect to onion services.
+
+onboarding.tor-circuit-display.diagram.title=Circuit Display
+onboarding.tor-circuit-display.diagram.msg=This diagram shows the relays that make up the circuit for this website. To prevent linking of activity across different sites, each website gets a different circuit.
+
+onboarding.tor-circuit-display.new-circuit.title=Do you need a new circuit?
+onboarding.tor-circuit-display.new-circuit.msg=If you are not able to connect to the website youâre trying to visit or it is not loading properly, then you can use this button to reload the site with a new circuit.
diff --git a/src/chrome/locale/ga/torbutton.properties b/src/chrome/locale/ga/torbutton.properties
index 3f38caee..ab7d7efe 100644
--- a/src/chrome/locale/ga/torbutton.properties
+++ b/src/chrome/locale/ga/torbutton.properties
@@ -31,9 +31,6 @@ torbutton.popup.confirm_plugins = Is féidir le forlÃontáin ar nós Flash doch
torbutton.popup.never_ask_again = Ná fiafraigh dÃom arÃs
torbutton.popup.confirm_newnym = Dúnfaidh Brabhsálaà Tor gach fuinneog agus gach cluaisÃn. Caillfidh tú gach seisiún oscailte.\n\nAn bhfuil fonn ort Brabhsálaà Tor a atosú anois agus d'aitheantas a athshocrú?\n\n
-torbutton.slider_notification = Anois gheobhaidh tú sleamhnán slándála faoin oinniún glas a ligeann duit an leibhéal slándála a athrú. Bain triail as!
-torbutton.slider_notification_button = Oscail na socruithe slándála
-
torbutton.maximize_warning = BÃonn suÃmh Ghréasáin in ann méid do scáileáin a fháil amach nuair a uasmhéadaÃonn tú Brabhsálaà Tor, rud a chabhraÃonn leo do ghnÃomhaÃocht ar lÃne a lorg. Molaimid duit fuinneoga an bhrabhsálaà a fhágáil ar a méid réamhshocraithe.
# Canvas permission prompt. Strings are kept here for ease of translation.
diff --git a/src/chrome/locale/he/aboutTBUpdate.dtd b/src/chrome/locale/he/aboutTBUpdate.dtd
index 2f93038d..a9989bb1 100644
--- a/src/chrome/locale/he/aboutTBUpdate.dtd
+++ b/src/chrome/locale/he/aboutTBUpdate.dtd
@@ -1,6 +1,10 @@
-<!ENTITY aboutTBUpdate.title "×¢×××× ×× ×××€××€× Tor">
+<!ENTITY aboutTBUpdate.title "×¢×××× ××€××€× Tor">
<!ENTITY aboutTBUpdate.updated "××€××€× Tor ×¢××××.">
-<!ENTITY aboutTBUpdate.linkPrefix "×××××¢ ×××¢×××× ×ª ×××תך ×¢× ××š×¡× ××,">
+<!ENTITY aboutTBUpdate.linkPrefix "×××××¢ ×××¢×××× ×××תך ×××× ×©×ך×ך ××, ">
<!ENTITY aboutTBUpdate.linkLabel "×קך ××תך ש×× ×">
<!ENTITY aboutTBUpdate.linkSuffix ".">
<!ENTITY aboutTBUpdate.changeLogHeading "×××× ×©×× ××××:">
+
+<!ENTITY aboutTBUpdate.circuitDisplayHeading "ת׊××× ×××©× ×××¢×׊×ת ×××ש ×©× ××¢××">
+<!ENTITY aboutTBUpdate.circuitDisplayDescription "ת׊××ת ××¢×× ×©× Tor ×××§×× ×××ש ×ש×׀ך×! ×××¥ ×¢× ×׀ת×ך ×××××× ×©× ×תך×× (××××§× ××Š× ×ש×××× ×©× ×©×ךת ××ת××ת) ××× ×ך××ת ×ת ת׊××ת ×××¢×× ×××ש×.">
+<!ENTITY aboutTBUpdate.learnMore "××× ×¢××">
diff --git a/src/chrome/locale/he/aboutTor.dtd b/src/chrome/locale/he/aboutTor.dtd
index 629b196e..2413d064 100644
--- a/src/chrome/locale/he/aboutTor.dtd
+++ b/src/chrome/locale/he/aboutTor.dtd
@@ -23,3 +23,6 @@
<!ENTITY aboutTor.tor_mission.label "×××× Tor ××× ×ך××× US 501(c)(3) ××× ×š××××× ×××§×× ×××××ת ××× ×××ך×××ת ×¢"× ×׊××š× ×׀ך××¡× ×©× ××× ××××××ת ×©× ××××× ××ת ×׀ך×××ת ××§×× ×€×ª×× ×××× ××, ת×××× ××××× ×ת ××ש×××ש ××ת×ÖŸ××××× ×©×××, ××§×××× ××× × ×××¢×ת ××¢×××ת ש×××.">
<!ENTITY aboutTor.getInvolved.label "×××× ××¢××š× Â«">
<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en">
+
+<!ENTITY aboutTor.newsletter.tagline "×§×× ×ת ×××ש×ת ×××ך×× ×ת ××ת Tor ×ש×ך×ת ×ת××× ×× ×× ×¡×ª ש××.">
+<!ENTITY aboutTor.newsletter.link_text "×××š×©× ×¢××ך ××ש×ת Tor">
diff --git a/src/chrome/locale/he/browserOnboarding.properties b/src/chrome/locale/he/browserOnboarding.properties
index a4f1edf0..466f104f 100644
--- a/src/chrome/locale/he/browserOnboarding.properties
+++ b/src/chrome/locale/he/browserOnboarding.properties
@@ -4,35 +4,51 @@
onboarding.tour-tor-welcome=Welcome
onboarding.tour-tor-welcome.title=Youâre ready.
-onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. Youâre now protected against tracking, surveillance, and censorship. This quick onboarding will show you how.
onboarding.tour-tor-welcome.button=Start Now
onboarding.tour-tor-privacy=׀ך×××ת
onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
-onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canât follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click âTor Networkâ to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click âTor Networkâ to learn how we protect you on the network level.
onboarding.tour-tor-privacy.button=Go to Tor Network
onboarding.tour-tor-network=Tor Network
onboarding.tour-tor-network.title=Travel a decentralized network.
-onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâs no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on âCircuit Displayâ to learn how they work.
+onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, thereâs no one point of failure or centralized entity you need to trust in order to enjoy the internet privately.
onboarding.tour-tor-network.button=Go to Circuit Display
onboarding.tour-tor-circuit-display=Circuit Display
onboarding.tour-tor-circuit-display.title=See your path.
-onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking âNew Circuit for this Siteâ on our Circuit Display. Click below to see how it works.
-onboarding.tour-tor-circuit-display.button=Explore
+onboarding.tour-tor-circuit-display.description=For each domain you visit, your traffic is relayed and encrypted in a circuit across three Tor relays around the world. No website knows where you are connecting from. You can request a new circuit by clicking âNew Circuit for this Siteâ on our Circuit Display.
+onboarding.tour-tor-circuit-display.button=See My Path
onboarding.tour-tor-security=×××××
onboarding.tour-tor-security.title=Choose your experience.
-onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do.
onboarding.tour-tor-security.button=Review Settings
onboarding.tour-tor-expect-differences=Experience Tips
-onboarding.tour-tor-expect-differences.title=Experience Tips
-onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.title=Expect some differences.
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot.
onboarding.tour-tor-expect-differences.button=See FAQs
onboarding.tour-tor-onion-services=ש×ך××ª× ×׊×
-onboarding.tour-tor-onion-services.title=ש×ך××ª× ×׊×
-onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.title=Be extra protected.
+onboarding.tour-tor-onion-services.description=Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously. Click below to visit the DuckDuckGo onion site.
onboarding.tour-tor-onion-services.button=Visit an Onion
+
+# Circuit Display onboarding.
+onboarding.tor-circuit-display.next=×××
+onboarding.tor-circuit-display.done=××׊ע
+onboarding.tor-circuit-display.one-of-three=1 of 3
+onboarding.tor-circuit-display.two-of-three=2 of 3
+onboarding.tor-circuit-display.three-of-three=3 of 3
+
+onboarding.tor-circuit-display.intro.title=How do circuits work?
+onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assigned relays, which are computers around the world configured to forward Tor traffic. Circuits allow you to browse privately and to connect to onion services.
+
+onboarding.tor-circuit-display.diagram.title=Circuit Display
+onboarding.tor-circuit-display.diagram.msg=This diagram shows the relays that make up the circuit for this website. To prevent linking of activity across different sites, each website gets a different circuit.
+
+onboarding.tor-circuit-display.new-circuit.title=Do you need a new circuit?
+onboarding.tor-circuit-display.new-circuit.msg=If you are not able to connect to the website youâre trying to visit or it is not loading properly, then you can use this button to reload the site with a new circuit.
diff --git a/src/chrome/locale/he/torbutton.properties b/src/chrome/locale/he/torbutton.properties
index 93a51a20..315ef4ce 100644
--- a/src/chrome/locale/he/torbutton.properties
+++ b/src/chrome/locale/he/torbutton.properties
@@ -31,9 +31,6 @@ torbutton.popup.confirm_plugins = ×תקע×× ×××× Flash ×××××× ××€
torbutton.popup.never_ask_again = ××£ ×€×¢× ×× ×ª×©×× ×××ª× ×©××
torbutton.popup.confirm_newnym = ××€××€× Tor ×ס××ך ×ת ×× ××××× ×ת ×××ש×× ××ת. ×× ×©××× ××תך×× ×××××. \n\n×××€×¢×× ×××ש ×ת ××€××€× Tor ×¢×ש×× ××× ××׀ס ×ת ×××ת×?\n\n
-torbutton.slider_notification = ×ת׀ך×× ×©× ×××Š× ××ך××§ ×ש ×עת ××××× ××××× ×××׀שך ×× ××ת××× ×ת ך×ת ×××××× ×©××. × ×¡× ××ת×!
-torbutton.slider_notification_button = ×€×ª× ×××ך×ת ×××××
-
torbutton.maximize_warning = ××€×¢×ת ××¡× ××× ×××€××€× Tor ×¢×××× ××ת×ך ××תך×× ××§×××¢ ×ת ×××× ××Š× ×©××, ×× ×©×¢××× ×ש×ש ××× ××תך ××ת×. ×× × ××××׊×× ×©×ª×©××ך ×ת ×××× ×ת ××€××€× Tor ××××× ×ך×ךת ××××× ×××§××š× ×©×××.
# Canvas permission prompt. Strings are kept here for ease of translation.
diff --git a/src/chrome/locale/id/aboutTBUpdate.dtd b/src/chrome/locale/id/aboutTBUpdate.dtd
index ba3aa4df..9a10bc64 100644
--- a/src/chrome/locale/id/aboutTBUpdate.dtd
+++ b/src/chrome/locale/id/aboutTBUpdate.dtd
@@ -4,3 +4,7 @@
<!ENTITY aboutTBUpdate.linkLabel "kunjungi situs web kami">
<!ENTITY aboutTBUpdate.linkSuffix ".">
<!ENTITY aboutTBUpdate.changeLogHeading "Catatan Perubahan:">
+
+<!ENTITY aboutTBUpdate.circuitDisplayHeading "New, Redesigned Circuit Display">
+<!ENTITY aboutTBUpdate.circuitDisplayDescription "The Tor circuit display has been relocated and improved! Click the Site Identity button (located on the left side of the URL bar) to see the new circuit display.">
+<!ENTITY aboutTBUpdate.learnMore "Learn More">
diff --git a/src/chrome/locale/id/aboutTor.dtd b/src/chrome/locale/id/aboutTor.dtd
index aa7e72fa..7164df0f 100644
--- a/src/chrome/locale/id/aboutTor.dtd
+++ b/src/chrome/locale/id/aboutTor.dtd
@@ -23,3 +23,6 @@
<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
<!ENTITY aboutTor.getInvolved.label "Get Involved »">
<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/terlibat/relawan.html.id">
+
+<!ENTITY aboutTor.newsletter.tagline "Get the latest news from Tor straight to your inbox.">
+<!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News.">
diff --git a/src/chrome/locale/id/browserOnboarding.properties b/src/chrome/locale/id/browserOnboarding.properties
index b914d96c..5af64bc9 100644
--- a/src/chrome/locale/id/browserOnboarding.properties
+++ b/src/chrome/locale/id/browserOnboarding.properties
@@ -4,35 +4,51 @@
onboarding.tour-tor-welcome=Selamat datang
onboarding.tour-tor-welcome.title=Youâre ready.
-onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. Youâre now protected against tracking, surveillance, and censorship. This quick onboarding will show you how.
onboarding.tour-tor-welcome.button=Start Now
onboarding.tour-tor-privacy=Privasi
onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
-onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canât follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click âTor Networkâ to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click âTor Networkâ to learn how we protect you on the network level.
onboarding.tour-tor-privacy.button=Go to Tor Network
onboarding.tour-tor-network=Tor Network
onboarding.tour-tor-network.title=Travel a decentralized network.
-onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâs no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on âCircuit Displayâ to learn how they work.
+onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, thereâs no one point of failure or centralized entity you need to trust in order to enjoy the internet privately.
onboarding.tour-tor-network.button=Go to Circuit Display
onboarding.tour-tor-circuit-display=Circuit Display
onboarding.tour-tor-circuit-display.title=See your path.
-onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking âNew Circuit for this Siteâ on our Circuit Display. Click below to see how it works.
-onboarding.tour-tor-circuit-display.button=Explore
+onboarding.tour-tor-circuit-display.description=For each domain you visit, your traffic is relayed and encrypted in a circuit across three Tor relays around the world. No website knows where you are connecting from. You can request a new circuit by clicking âNew Circuit for this Siteâ on our Circuit Display.
+onboarding.tour-tor-circuit-display.button=See My Path
onboarding.tour-tor-security=Keamanan
onboarding.tour-tor-security.title=Choose your experience.
-onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do.
onboarding.tour-tor-security.button=Review Settings
onboarding.tour-tor-expect-differences=Experience Tips
-onboarding.tour-tor-expect-differences.title=Experience Tips
-onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.title=Expect some differences.
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot.
onboarding.tour-tor-expect-differences.button=See FAQs
onboarding.tour-tor-onion-services=Layanan Onion
-onboarding.tour-tor-onion-services.title=Layanan Onion
-onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.title=Be extra protected.
+onboarding.tour-tor-onion-services.description=Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously. Click below to visit the DuckDuckGo onion site.
onboarding.tour-tor-onion-services.button=Visit an Onion
+
+# Circuit Display onboarding.
+onboarding.tor-circuit-display.next=Selanjutnya
+onboarding.tor-circuit-display.done=Selesai
+onboarding.tor-circuit-display.one-of-three=1 of 3
+onboarding.tor-circuit-display.two-of-three=2 of 3
+onboarding.tor-circuit-display.three-of-three=3 of 3
+
+onboarding.tor-circuit-display.intro.title=How do circuits work?
+onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assigned relays, which are computers around the world configured to forward Tor traffic. Circuits allow you to browse privately and to connect to onion services.
+
+onboarding.tor-circuit-display.diagram.title=Circuit Display
+onboarding.tor-circuit-display.diagram.msg=This diagram shows the relays that make up the circuit for this website. To prevent linking of activity across different sites, each website gets a different circuit.
+
+onboarding.tor-circuit-display.new-circuit.title=Do you need a new circuit?
+onboarding.tor-circuit-display.new-circuit.msg=If you are not able to connect to the website youâre trying to visit or it is not loading properly, then you can use this button to reload the site with a new circuit.
diff --git a/src/chrome/locale/id/torbutton.properties b/src/chrome/locale/id/torbutton.properties
index 7f7dffef..8f85dc96 100644
--- a/src/chrome/locale/id/torbutton.properties
+++ b/src/chrome/locale/id/torbutton.properties
@@ -31,9 +31,6 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Jangan pernah ditanyakan kembali
torbutton.popup.confirm_newnym = Peramban Tor akan menutup semua jendela dan tab. Semua sesi website akan terhapus.\n\nJalankan ulang peramban Tor untuk
-torbutton.slider_notification = Menu green onion sekarang memiliki slider keamanan yang memungkinkan anda mengatur level keamanan . silakan cek !
-torbutton.slider_notification_button = Buka pengaturan keamanan
-
torbutton.maximize_warning = Maksimalkan Browser Tor dapat mengizinkan website untuk menentukan ukuran monitor anda, yang dapat digunakan untuk track/jalur anda. kami menyarankan bahwa nda meninggalkan windows browser Tor dalam ukuran asli default nya
# Canvas permission prompt. Strings are kept here for ease of translation.
diff --git a/src/chrome/locale/is/aboutTBUpdate.dtd b/src/chrome/locale/is/aboutTBUpdate.dtd
index 3a2cdec8..aba97757 100644
--- a/src/chrome/locale/is/aboutTBUpdate.dtd
+++ b/src/chrome/locale/is/aboutTBUpdate.dtd
@@ -4,3 +4,7 @@
<!ENTITY aboutTBUpdate.linkLabel "heimsÊktu vefsvÊðið okkar">
<!ENTITY aboutTBUpdate.linkSuffix ".">
<!ENTITY aboutTBUpdate.changeLogHeading "Breytingaannáll:">
+
+<!ENTITY aboutTBUpdate.circuitDisplayHeading "New, Redesigned Circuit Display">
+<!ENTITY aboutTBUpdate.circuitDisplayDescription "The Tor circuit display has been relocated and improved! Click the Site Identity button (located on the left side of the URL bar) to see the new circuit display.">
+<!ENTITY aboutTBUpdate.learnMore "Learn More">
diff --git a/src/chrome/locale/is/aboutTor.dtd b/src/chrome/locale/is/aboutTor.dtd
index 3bae74a9..03c443cb 100644
--- a/src/chrome/locale/is/aboutTor.dtd
+++ b/src/chrome/locale/is/aboutTor.dtd
@@ -23,3 +23,6 @@
<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
<!ENTITY aboutTor.getInvolved.label "Taktu ßátt »">
<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en">
+
+<!ENTITY aboutTor.newsletter.tagline "Get the latest news from Tor straight to your inbox.">
+<!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News.">
diff --git a/src/chrome/locale/is/browserOnboarding.properties b/src/chrome/locale/is/browserOnboarding.properties
index 3da820ef..2ca47d25 100644
--- a/src/chrome/locale/is/browserOnboarding.properties
+++ b/src/chrome/locale/is/browserOnboarding.properties
@@ -4,35 +4,51 @@
onboarding.tour-tor-welcome=Welcome
onboarding.tour-tor-welcome.title=Youâre ready.
-onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. Youâre now protected against tracking, surveillance, and censorship. This quick onboarding will show you how.
onboarding.tour-tor-welcome.button=Start Now
onboarding.tour-tor-privacy=Friðhelgi
onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
-onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canât follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click âTor Networkâ to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click âTor Networkâ to learn how we protect you on the network level.
onboarding.tour-tor-privacy.button=Go to Tor Network
onboarding.tour-tor-network=Tor Network
onboarding.tour-tor-network.title=Travel a decentralized network.
-onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâs no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on âCircuit Displayâ to learn how they work.
+onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, thereâs no one point of failure or centralized entity you need to trust in order to enjoy the internet privately.
onboarding.tour-tor-network.button=Go to Circuit Display
onboarding.tour-tor-circuit-display=Circuit Display
onboarding.tour-tor-circuit-display.title=See your path.
-onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking âNew Circuit for this Siteâ on our Circuit Display. Click below to see how it works.
-onboarding.tour-tor-circuit-display.button=Explore
+onboarding.tour-tor-circuit-display.description=For each domain you visit, your traffic is relayed and encrypted in a circuit across three Tor relays around the world. No website knows where you are connecting from. You can request a new circuit by clicking âNew Circuit for this Siteâ on our Circuit Display.
+onboarding.tour-tor-circuit-display.button=See My Path
onboarding.tour-tor-security=Security
onboarding.tour-tor-security.title=Choose your experience.
-onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do.
onboarding.tour-tor-security.button=Review Settings
onboarding.tour-tor-expect-differences=Experience Tips
-onboarding.tour-tor-expect-differences.title=Experience Tips
-onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.title=Expect some differences.
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot.
onboarding.tour-tor-expect-differences.button=See FAQs
onboarding.tour-tor-onion-services=Onion-ßjónustur
-onboarding.tour-tor-onion-services.title=Onion-ßjónustur
-onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.title=Be extra protected.
+onboarding.tour-tor-onion-services.description=Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously. Click below to visit the DuckDuckGo onion site.
onboarding.tour-tor-onion-services.button=Visit an Onion
+
+# Circuit Display onboarding.
+onboarding.tor-circuit-display.next=NÊsti
+onboarding.tor-circuit-display.done=Lokið
+onboarding.tor-circuit-display.one-of-three=1 of 3
+onboarding.tor-circuit-display.two-of-three=2 of 3
+onboarding.tor-circuit-display.three-of-three=3 of 3
+
+onboarding.tor-circuit-display.intro.title=How do circuits work?
+onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assigned relays, which are computers around the world configured to forward Tor traffic. Circuits allow you to browse privately and to connect to onion services.
+
+onboarding.tor-circuit-display.diagram.title=Circuit Display
+onboarding.tor-circuit-display.diagram.msg=This diagram shows the relays that make up the circuit for this website. To prevent linking of activity across different sites, each website gets a different circuit.
+
+onboarding.tor-circuit-display.new-circuit.title=Do you need a new circuit?
+onboarding.tor-circuit-display.new-circuit.msg=If you are not able to connect to the website youâre trying to visit or it is not loading properly, then you can use this button to reload the site with a new circuit.
diff --git a/src/chrome/locale/is/torbutton.properties b/src/chrome/locale/is/torbutton.properties
index 72fbcadf..9d476492 100644
--- a/src/chrome/locale/is/torbutton.properties
+++ b/src/chrome/locale/is/torbutton.properties
@@ -31,9 +31,6 @@ torbutton.popup.confirm_plugins = ViðbÊtur eins og til dÊmis Flash geta skað
torbutton.popup.never_ask_again = Ekki spyrja mig aftur
torbutton.popup.confirm_newnym = Tor-vafrinn mun núna loka öllum flipum og gluggum. Allar setur á vefsvÊðum munu tapast.\n\nà að endurrÊsa Tor-vafrann til að núllstilla auðkennið ßitt?\n\n
-torbutton.slider_notification = The green onion menu now has a security slider which lets you adjust your security level. Check it out!
-torbutton.slider_notification_button = Opna öryggisstillingar
-
torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size.
# Canvas permission prompt. Strings are kept here for ease of translation.
diff --git a/src/chrome/locale/it/aboutTBUpdate.dtd b/src/chrome/locale/it/aboutTBUpdate.dtd
index 2229d150..9525a0f4 100644
--- a/src/chrome/locale/it/aboutTBUpdate.dtd
+++ b/src/chrome/locale/it/aboutTBUpdate.dtd
@@ -4,3 +4,7 @@
<!ENTITY aboutTBUpdate.linkLabel "visita il nostro sito web">
<!ENTITY aboutTBUpdate.linkSuffix ".">
<!ENTITY aboutTBUpdate.changeLogHeading "Log dei cambiamenti:">
+
+<!ENTITY aboutTBUpdate.circuitDisplayHeading "Visualizzazione circuito nuova e ridisegnata">
+<!ENTITY aboutTBUpdate.circuitDisplayDescription "La visualizzazione del circuito Tor Ú stata spostata e migliorata! Clicca il pulsante di identità  del sito (posto a sinistra dell'URL) per vedere il nuovo circuito.">
+<!ENTITY aboutTBUpdate.learnMore "Maggiori informazioni">
diff --git a/src/chrome/locale/it/aboutTor.dtd b/src/chrome/locale/it/aboutTor.dtd
index bef8049a..b9687c45 100644
--- a/src/chrome/locale/it/aboutTor.dtd
+++ b/src/chrome/locale/it/aboutTor.dtd
@@ -23,3 +23,6 @@
<!ENTITY aboutTor.tor_mission.label "Il Tor Project Ú una organizzazione non-profit allo scopo di avanzare i diritti e le libertà umane creando e distribuendo software libero con tecnologie per la privacy e l'anonimato, supportando la loro disponibilità e utilizzo senza restrizioni e avanzandone la loro comprensione scientifica e popolare.">
<!ENTITY aboutTor.getInvolved.label "Unisciti a noi »">
<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en">
+
+<!ENTITY aboutTor.newsletter.tagline "Ottieni le ultime info da Tor direttamente nella tua casella di posta elettronica.">
+<!ENTITY aboutTor.newsletter.link_text "Registrati alle Tor News.">
diff --git a/src/chrome/locale/it/browserOnboarding.properties b/src/chrome/locale/it/browserOnboarding.properties
index b04346b4..304c84d3 100644
--- a/src/chrome/locale/it/browserOnboarding.properties
+++ b/src/chrome/locale/it/browserOnboarding.properties
@@ -4,35 +4,51 @@
onboarding.tour-tor-welcome=Benvenuto
onboarding.tour-tor-welcome.title=Youâre ready.
-onboarding.tour-tor-welcome.description=Tor Browser offre il più alto standard di privacy e sicurezza nella navigazione del web. Ora sei protetto da tracciamento, sorveglianza e censura. Leggi come riusciamo a farlo seguendo questa rapida introduzione.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. Youâre now protected against tracking, surveillance, and censorship. This quick onboarding will show you how.
onboarding.tour-tor-welcome.button=Inizia ora
onboarding.tour-tor-privacy=Privacy
onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
-onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canât follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click âTor Networkâ to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click âTor Networkâ to learn how we protect you on the network level.
onboarding.tour-tor-privacy.button=Go to Tor Network
onboarding.tour-tor-network=Tor Network
onboarding.tour-tor-network.title=Travel a decentralized network.
-onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâs no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on âCircuit Displayâ to learn how they work.
+onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, thereâs no one point of failure or centralized entity you need to trust in order to enjoy the internet privately.
onboarding.tour-tor-network.button=Go to Circuit Display
onboarding.tour-tor-circuit-display=Circuit Display
onboarding.tour-tor-circuit-display.title=See your path.
-onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking âNew Circuit for this Siteâ on our Circuit Display. Click below to see how it works.
-onboarding.tour-tor-circuit-display.button=Esplora
+onboarding.tour-tor-circuit-display.description=For each domain you visit, your traffic is relayed and encrypted in a circuit across three Tor relays around the world. No website knows where you are connecting from. You can request a new circuit by clicking âNew Circuit for this Siteâ on our Circuit Display.
+onboarding.tour-tor-circuit-display.button=See My Path
onboarding.tour-tor-security=Sicurezza
onboarding.tour-tor-security.title=Choose your experience.
-onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do.
onboarding.tour-tor-security.button=Review Settings
onboarding.tour-tor-expect-differences=Experience Tips
-onboarding.tour-tor-expect-differences.title=Experience Tips
-onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.title=Expect some differences.
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot.
onboarding.tour-tor-expect-differences.button=See FAQs
onboarding.tour-tor-onion-services=Servizi Onion
-onboarding.tour-tor-onion-services.title=Servizi Onion
-onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.title=Be extra protected.
+onboarding.tour-tor-onion-services.description=Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously. Click below to visit the DuckDuckGo onion site.
onboarding.tour-tor-onion-services.button=Visit an Onion
+
+# Circuit Display onboarding.
+onboarding.tor-circuit-display.next=Successivo
+onboarding.tor-circuit-display.done=Fatto
+onboarding.tor-circuit-display.one-of-three=1 of 3
+onboarding.tor-circuit-display.two-of-three=2 of 3
+onboarding.tor-circuit-display.three-of-three=3 of 3
+
+onboarding.tor-circuit-display.intro.title=How do circuits work?
+onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assigned relays, which are computers around the world configured to forward Tor traffic. Circuits allow you to browse privately and to connect to onion services.
+
+onboarding.tor-circuit-display.diagram.title=Circuit Display
+onboarding.tor-circuit-display.diagram.msg=This diagram shows the relays that make up the circuit for this website. To prevent linking of activity across different sites, each website gets a different circuit.
+
+onboarding.tor-circuit-display.new-circuit.title=Do you need a new circuit?
+onboarding.tor-circuit-display.new-circuit.msg=If you are not able to connect to the website youâre trying to visit or it is not loading properly, then you can use this button to reload the site with a new circuit.
diff --git a/src/chrome/locale/it/torbutton.properties b/src/chrome/locale/it/torbutton.properties
index 93004fa1..2b87b4c4 100644
--- a/src/chrome/locale/it/torbutton.properties
+++ b/src/chrome/locale/it/torbutton.properties
@@ -31,9 +31,6 @@ torbutton.popup.confirm_plugins = Alcuni plugin come Flash possono violare la tu
torbutton.popup.never_ask_again = Non chiedermelo più
torbutton.popup.confirm_newnym = Tor Browser chiuderà tutte le schede e finestre. Tutte le sessioni dei siti andranno perse.\n\nRiavviare ora Tor Browser per azzerare la tua identità ?\n\n
-torbutton.slider_notification = Il menù della cipolla verde ha ora una slider di sicurezza che ti permette di regolare il livello di sicurezza. Dai un'occhiata!
-torbutton.slider_notification_button = Apri impostazioni sicurezza
-
torbutton.maximize_warning = Massimizzando Tor Browser, i siti web possono risalire alle dimensioni del tuo schermo, e questo può servire a rintracciarti. Ti raccomandiamo di mantenere invariate le dimensioni iniziali di default delle finestre di Tor Browser.
# Canvas permission prompt. Strings are kept here for ease of translation.
diff --git a/src/chrome/locale/ja/aboutTBUpdate.dtd b/src/chrome/locale/ja/aboutTBUpdate.dtd
index e8621340..4ded2bf7 100644
--- a/src/chrome/locale/ja/aboutTBUpdate.dtd
+++ b/src/chrome/locale/ja/aboutTBUpdate.dtd
@@ -4,3 +4,7 @@
<!ENTITY aboutTBUpdate.linkLabel "æã
ã®ãŠã§ããµã€ããèŠãŠãã ãã">
<!ENTITY aboutTBUpdate.linkSuffix "ã">
<!ENTITY aboutTBUpdate.changeLogHeading "倿Žå±¥æŽ">
+
+<!ENTITY aboutTBUpdate.circuitDisplayHeading "New, Redesigned Circuit Display">
+<!ENTITY aboutTBUpdate.circuitDisplayDescription "The Tor circuit display has been relocated and improved! Click the Site Identity button (located on the left side of the URL bar) to see the new circuit display.">
+<!ENTITY aboutTBUpdate.learnMore "Learn More">
diff --git a/src/chrome/locale/ja/aboutTor.dtd b/src/chrome/locale/ja/aboutTor.dtd
index 661cfdb9..db9195f7 100644
--- a/src/chrome/locale/ja/aboutTor.dtd
+++ b/src/chrome/locale/ja/aboutTor.dtd
@@ -23,3 +23,6 @@
<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
<!ENTITY aboutTor.getInvolved.label "Get Involved »">
<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en">
+
+<!ENTITY aboutTor.newsletter.tagline "Get the latest news from Tor straight to your inbox.">
+<!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News.">
diff --git a/src/chrome/locale/ja/browserOnboarding.properties b/src/chrome/locale/ja/browserOnboarding.properties
index b5b7601b..2261c993 100644
--- a/src/chrome/locale/ja/browserOnboarding.properties
+++ b/src/chrome/locale/ja/browserOnboarding.properties
@@ -4,35 +4,51 @@
onboarding.tour-tor-welcome=ãããã
onboarding.tour-tor-welcome.title=Youâre ready.
-onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. Youâre now protected against tracking, surveillance, and censorship. This quick onboarding will show you how.
onboarding.tour-tor-welcome.button=Start Now
onboarding.tour-tor-privacy=ãã©ã€ãã·ãŒ
onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
-onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canât follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click âTor Networkâ to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click âTor Networkâ to learn how we protect you on the network level.
onboarding.tour-tor-privacy.button=Go to Tor Network
onboarding.tour-tor-network=Tor Network
onboarding.tour-tor-network.title=Travel a decentralized network.
-onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâs no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on âCircuit Displayâ to learn how they work.
+onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, thereâs no one point of failure or centralized entity you need to trust in order to enjoy the internet privately.
onboarding.tour-tor-network.button=Go to Circuit Display
onboarding.tour-tor-circuit-display=Circuit Display
onboarding.tour-tor-circuit-display.title=See your path.
-onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking âNew Circuit for this Siteâ on our Circuit Display. Click below to see how it works.
-onboarding.tour-tor-circuit-display.button=æ¢çŽ¢
+onboarding.tour-tor-circuit-display.description=For each domain you visit, your traffic is relayed and encrypted in a circuit across three Tor relays around the world. No website knows where you are connecting from. You can request a new circuit by clicking âNew Circuit for this Siteâ on our Circuit Display.
+onboarding.tour-tor-circuit-display.button=See My Path
onboarding.tour-tor-security=ã»ãã¥ãªãã£
onboarding.tour-tor-security.title=Choose your experience.
-onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do.
onboarding.tour-tor-security.button=Review Settings
onboarding.tour-tor-expect-differences=Experience Tips
-onboarding.tour-tor-expect-differences.title=Experience Tips
-onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.title=Expect some differences.
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot.
onboarding.tour-tor-expect-differences.button=See FAQs
onboarding.tour-tor-onion-services=Onion Services
-onboarding.tour-tor-onion-services.title=Onion Services
-onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.title=Be extra protected.
+onboarding.tour-tor-onion-services.description=Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously. Click below to visit the DuckDuckGo onion site.
onboarding.tour-tor-onion-services.button=Visit an Onion
+
+# Circuit Display onboarding.
+onboarding.tor-circuit-display.next=次ãž
+onboarding.tor-circuit-display.done=å®äºããŸãã
+onboarding.tor-circuit-display.one-of-three=1 of 3
+onboarding.tor-circuit-display.two-of-three=2 of 3
+onboarding.tor-circuit-display.three-of-three=3 of 3
+
+onboarding.tor-circuit-display.intro.title=How do circuits work?
+onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assigned relays, which are computers around the world configured to forward Tor traffic. Circuits allow you to browse privately and to connect to onion services.
+
+onboarding.tor-circuit-display.diagram.title=Circuit Display
+onboarding.tor-circuit-display.diagram.msg=This diagram shows the relays that make up the circuit for this website. To prevent linking of activity across different sites, each website gets a different circuit.
+
+onboarding.tor-circuit-display.new-circuit.title=Do you need a new circuit?
+onboarding.tor-circuit-display.new-circuit.msg=If you are not able to connect to the website youâre trying to visit or it is not loading properly, then you can use this button to reload the site with a new circuit.
diff --git a/src/chrome/locale/ja/torbutton.properties b/src/chrome/locale/ja/torbutton.properties
index 7fe98766..e9623c75 100644
--- a/src/chrome/locale/ja/torbutton.properties
+++ b/src/chrome/locale/ja/torbutton.properties
@@ -31,9 +31,6 @@ torbutton.popup.confirm_plugins = Flashãªã©ã®ãã©ã°ã€ã³ã¯ããªãã®
torbutton.popup.never_ask_again = 次ããã¯ããããªã
torbutton.popup.confirm_newnym = Tor Browser ã¯å
šãŠã®ãŠã£ã³ããŠãšã¿ããéããããšããŠããŸããå
šãŠã®ã»ãã·ã§ã³ã¯å€±ãããŸãã\n\nããªãã®æ
å ±ããªã»ããããããã« Tor Browser ãåèµ·åããŸããïŒ\n\n
-torbutton.slider_notification = Green onion menu ã«ã»ãã¥ãªãã£ã¬ãã«ã調ç¯ããããã®ã¹ã©ã€ããŒã远å ãããŸããïŒ ã詊ããã ããïŒ
-torbutton.slider_notification_button = ã»ãã¥ãªãã£ã®èšå®ãéã
-
torbutton.maximize_warning = Tor Browser ãæå€§åãããšãWebãµã€ãã¯ããªãã®ã¢ãã¿ãŒãµã€ãºãå©çšããŠè¿œè·¡ã§ããããã«ãªããŸããTor Browser ã®ãŠã£ã³ããŠã®ãµã€ãºã¯åæç¶æ
ã®ãŸãŸã«ããŠããããšãããããããŸãã
# Canvas permission prompt. Strings are kept here for ease of translation.
diff --git a/src/chrome/locale/ko/aboutTBUpdate.dtd b/src/chrome/locale/ko/aboutTBUpdate.dtd
index 5ad84ba5..57e5d9af 100644
--- a/src/chrome/locale/ko/aboutTBUpdate.dtd
+++ b/src/chrome/locale/ko/aboutTBUpdate.dtd
@@ -4,3 +4,7 @@
<!ENTITY aboutTBUpdate.linkLabel "ì í¬ ì¬ìŽížë¥Œ ë°©ë¬žíŽ ì£Œìžì">
<!ENTITY aboutTBUpdate.linkSuffix " ">
<!ENTITY aboutTBUpdate.changeLogHeading "ë³ê²œì¬í:">
+
+<!ENTITY aboutTBUpdate.circuitDisplayHeading "New, Redesigned Circuit Display">
+<!ENTITY aboutTBUpdate.circuitDisplayDescription "The Tor circuit display has been relocated and improved! Click the Site Identity button (located on the left side of the URL bar) to see the new circuit display.">
+<!ENTITY aboutTBUpdate.learnMore "Learn More">
diff --git a/src/chrome/locale/ko/aboutTor.dtd b/src/chrome/locale/ko/aboutTor.dtd
index 83ea0c93..4dd465ad 100644
--- a/src/chrome/locale/ko/aboutTor.dtd
+++ b/src/chrome/locale/ko/aboutTor.dtd
@@ -6,20 +6,23 @@
<!ENTITY aboutTor.title "Torì ëíŽì">
-<!ENTITY aboutTor.ready.label "Explore. Privately.">
-<!ENTITY aboutTor.ready2.label "Youâre ready for the worldâs most private browsing experience.">
+<!ENTITY aboutTor.ready.label "ìë°íê² íìíììì€.">
+<!ENTITY aboutTor.ready2.label "ë¹ì ì ìšìžììŽ ê°ì¥ ìë°í íìì 겜íì ì€ë¹ê° ëììµëë€.">
<!ENTITY aboutTor.failure.label "ëê° ì못ëììµëë€!">
<!ENTITY aboutTor.failure2.label "Torë ìŽ ëžëŒì°ì ìì ìëíì§ ììµëë€.">
-<!ENTITY aboutTor.search.label "Search with DuckDuckGo">
+<!ENTITY aboutTor.search.label "DuckDuckGoìŒë¡ ê²ì">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com">
<!ENTITY aboutTor.torbrowser_user_manual_questions.label "ì§ë¬žìŽ ììŒì ê°ì?">
-<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual »">
+<!ENTITY aboutTor.torbrowser_user_manual_link.label "Tor ëžëŒì°ì ì€ëª
ì륌 ìœìŽë³Žêž° »">
<!-- The next two entities are used within the browser's Help menu. -->
<!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">
-<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual">
+<!ENTITY aboutTor.torbrowser_user_manual.label "Tor ëžëŒì°ì ì€ëª
ì">
<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
-<!ENTITY aboutTor.getInvolved.label "Get Involved »">
+<!ENTITY aboutTor.getInvolved.label "ì°žì¬ Â»">
<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en">
+
+<!ENTITY aboutTor.newsletter.tagline "Get the latest news from Tor straight to your inbox.">
+<!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News.">
diff --git a/src/chrome/locale/ko/browserOnboarding.properties b/src/chrome/locale/ko/browserOnboarding.properties
index 93f3774d..e2cad1ca 100644
--- a/src/chrome/locale/ko/browserOnboarding.properties
+++ b/src/chrome/locale/ko/browserOnboarding.properties
@@ -4,35 +4,51 @@
onboarding.tour-tor-welcome=Welcome
onboarding.tour-tor-welcome.title=Youâre ready.
-onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. Youâre now protected against tracking, surveillance, and censorship. This quick onboarding will show you how.
onboarding.tour-tor-welcome.button=Start Now
onboarding.tour-tor-privacy=ì¬ìí
onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
-onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canât follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click âTor Networkâ to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click âTor Networkâ to learn how we protect you on the network level.
onboarding.tour-tor-privacy.button=Go to Tor Network
onboarding.tour-tor-network=Tor Network
onboarding.tour-tor-network.title=Travel a decentralized network.
-onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâs no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on âCircuit Displayâ to learn how they work.
+onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, thereâs no one point of failure or centralized entity you need to trust in order to enjoy the internet privately.
onboarding.tour-tor-network.button=Go to Circuit Display
onboarding.tour-tor-circuit-display=Circuit Display
onboarding.tour-tor-circuit-display.title=See your path.
-onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking âNew Circuit for this Siteâ on our Circuit Display. Click below to see how it works.
-onboarding.tour-tor-circuit-display.button=Explore
+onboarding.tour-tor-circuit-display.description=For each domain you visit, your traffic is relayed and encrypted in a circuit across three Tor relays around the world. No website knows where you are connecting from. You can request a new circuit by clicking âNew Circuit for this Siteâ on our Circuit Display.
+onboarding.tour-tor-circuit-display.button=See My Path
onboarding.tour-tor-security= 볎ì
onboarding.tour-tor-security.title=Choose your experience.
-onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do.
onboarding.tour-tor-security.button=Review Settings
onboarding.tour-tor-expect-differences=Experience Tips
-onboarding.tour-tor-expect-differences.title=Experience Tips
-onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.title=Expect some differences.
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot.
onboarding.tour-tor-expect-differences.button=See FAQs
onboarding.tour-tor-onion-services=Onion ìë¹ì€
-onboarding.tour-tor-onion-services.title=Onion ìë¹ì€
-onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.title=Be extra protected.
+onboarding.tour-tor-onion-services.description=Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously. Click below to visit the DuckDuckGo onion site.
onboarding.tour-tor-onion-services.button=Visit an Onion
+
+# Circuit Display onboarding.
+onboarding.tor-circuit-display.next=ë€ì
+onboarding.tor-circuit-display.done=ìë£
+onboarding.tor-circuit-display.one-of-three=1 of 3
+onboarding.tor-circuit-display.two-of-three=2 of 3
+onboarding.tor-circuit-display.three-of-three=3 of 3
+
+onboarding.tor-circuit-display.intro.title=How do circuits work?
+onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assigned relays, which are computers around the world configured to forward Tor traffic. Circuits allow you to browse privately and to connect to onion services.
+
+onboarding.tor-circuit-display.diagram.title=Circuit Display
+onboarding.tor-circuit-display.diagram.msg=This diagram shows the relays that make up the circuit for this website. To prevent linking of activity across different sites, each website gets a different circuit.
+
+onboarding.tor-circuit-display.new-circuit.title=Do you need a new circuit?
+onboarding.tor-circuit-display.new-circuit.msg=If you are not able to connect to the website youâre trying to visit or it is not loading properly, then you can use this button to reload the site with a new circuit.
diff --git a/src/chrome/locale/ko/torbutton.properties b/src/chrome/locale/ko/torbutton.properties
index 2755c75b..aa7e363a 100644
--- a/src/chrome/locale/ko/torbutton.properties
+++ b/src/chrome/locale/ko/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.circuit_display.relay = ì€ê³ìë²
torbutton.circuit_display.tor_bridge = ëžëŠ¿ì§
torbutton.circuit_display.unknown_country = 믞íìž êµê°
torbutton.circuit_display.guard = Guard
-torbutton.circuit_display.guard_note = Your [Guard] node may not change.
+torbutton.circuit_display.guard_note = ë¹ì ì [Guard] ë
žë ë³ê²œí ìë ìê³ ë³ê²œí ìë ììµëë€.
torbutton.circuit_display.learn_more = ë ìì볎Ʞ
torbutton.content_sizer.margin_tooltip = Tor ëžëŒì°ì ë ìŽ ì¬ë°±ì ì¶ê°íì¬ ì°œì ëë¹ì ëìŽë¥Œ ìŒë°í ììŒ ìšëŒìžìì ì¬ì©ì륌 ì¶ì íë êž°ë¥ì ìœí ìíµëë€.
torbutton.panel.tooltip.disabled = Tor륌 íì±ííë €ë©Ž íŽëŠ
@@ -31,9 +31,6 @@ torbutton.popup.confirm_plugins = íëìì ê°ì íë¬ê·žìžë€ì ë¹ì
torbutton.popup.never_ask_again = ë€ìë 묌ìŽë³Žì§ ìêž°
torbutton.popup.confirm_newnym = Tor ëžëŒì°ì ì 몚ë 찜곌 íì ë«ìµëë€. 몚ë ì¹ ì¬ìŽížì ìžì
ìŽ ìì€ë©ëë€.\n\nì ìì ì¬ì€ì íêž° ìíŽ ì§êž Tor ëžëŒì°ì 륌 ë€ì ììí ê¹ì?\n\n
-torbutton.slider_notification = ë
¹ì onion ë©ëŽìë ìŽì 볎ì ìì€ì ì¡°ì í ì ìë 볎ì ì¬ëŒìŽëê° ììµëë€. íìžíŽë³Žìžì!
-torbutton.slider_notification_button = 볎ì ì€ì ìŽêž°
-
torbutton.maximize_warning = Tor ëžëŒì°ì 륌 ìµëíí멎 ì¹ ì¬ìŽížìì 몚ëí° í¬êž°ë¥Œ ê²°ì íì¬ ì¬ì©ì륌 ì¶ì í ì ììµëë€. Tor ëžëŒì°ì ì°œì ìë Ʞ볞 í¬êž°ë¡ ëë ê²ìŽ ì¢ìµëë€.
# Canvas permission prompt. Strings are kept here for ease of translation.
@@ -54,5 +51,5 @@ profileAccessDenied=%Sì íë¡í ì¡ìžì€ ê¶íìŽ ììµëë€. íìŒ ì
profileMigrationFailed=Ʞ졎 %S íë¡íì ìŽì íì§ ëª»íìµëë€. ìë¡ìŽ ì€ì ìŽ ì¬ì©ë©ëë€.
# .Onion Page Info prompt. Strings are kept here for ease of translation.
-pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service, %1$S, %2$S bit keys, %3$S)
-pageInfo_OnionEncryption=Connection Encrypted (Onion Service)
+pageInfo_OnionEncryptionWithBitsAndProtocol=ì°ê²°ì ìížííìµëë€ (Onion ìë¹ì€, %1$S, %2$S ë¹íž í€ë€, %3$S)
+pageInfo_OnionEncryption=ì°ê²°ì ìížííìµëë€ (Onion ìë¹ì€)
diff --git a/src/chrome/locale/nb/aboutTBUpdate.dtd b/src/chrome/locale/nb/aboutTBUpdate.dtd
index 919a7f7b..37cdd9b3 100644
--- a/src/chrome/locale/nb/aboutTBUpdate.dtd
+++ b/src/chrome/locale/nb/aboutTBUpdate.dtd
@@ -4,3 +4,7 @@
<!ENTITY aboutTBUpdate.linkLabel "besÞk vårt nettsted">
<!ENTITY aboutTBUpdate.linkSuffix ".">
<!ENTITY aboutTBUpdate.changeLogHeading "Endringslogg:">
+
+<!ENTITY aboutTBUpdate.circuitDisplayHeading "New, Redesigned Circuit Display">
+<!ENTITY aboutTBUpdate.circuitDisplayDescription "The Tor circuit display has been relocated and improved! Click the Site Identity button (located on the left side of the URL bar) to see the new circuit display.">
+<!ENTITY aboutTBUpdate.learnMore "LÊr mer">
diff --git a/src/chrome/locale/nb/aboutTor.dtd b/src/chrome/locale/nb/aboutTor.dtd
index 32af1462..89bd5a7f 100644
--- a/src/chrome/locale/nb/aboutTor.dtd
+++ b/src/chrome/locale/nb/aboutTor.dtd
@@ -23,3 +23,6 @@
<!ENTITY aboutTor.tor_mission.label "The Tor Project er en US 501(c)(3) ideell organisasjon som fremmer menneskerettigheter og friheter ved å skape og distribuere anonymisering og personvernteknologi for fri og åpen kildekode, som stÞtter deres ubegrensede tilgjengelighet og bruk, og fremmer sin vitenskapelige og populÊre forståelse.">
<!ENTITY aboutTor.getInvolved.label "Bli involvert »">
<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en">
+
+<!ENTITY aboutTor.newsletter.tagline "FÃ¥ de siste nyhetene fra Tor rett til innboksen din.">
+<!ENTITY aboutTor.newsletter.link_text "Registrer deg for Tor Nyheter.">
diff --git a/src/chrome/locale/nb/browserOnboarding.properties b/src/chrome/locale/nb/browserOnboarding.properties
index 49968370..cf2a005a 100644
--- a/src/chrome/locale/nb/browserOnboarding.properties
+++ b/src/chrome/locale/nb/browserOnboarding.properties
@@ -4,35 +4,51 @@
onboarding.tour-tor-welcome=Welcome
onboarding.tour-tor-welcome.title=Youâre ready.
-onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. Youâre now protected against tracking, surveillance, and censorship. This quick onboarding will show you how.
onboarding.tour-tor-welcome.button=Start Now
onboarding.tour-tor-privacy=Personvern
onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
-onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canât follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click âTor Networkâ to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click âTor Networkâ to learn how we protect you on the network level.
onboarding.tour-tor-privacy.button=Go to Tor Network
onboarding.tour-tor-network=Tor Network
onboarding.tour-tor-network.title=Travel a decentralized network.
-onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâs no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on âCircuit Displayâ to learn how they work.
+onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, thereâs no one point of failure or centralized entity you need to trust in order to enjoy the internet privately.
onboarding.tour-tor-network.button=Go to Circuit Display
onboarding.tour-tor-circuit-display=Circuit Display
onboarding.tour-tor-circuit-display.title=See your path.
-onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking âNew Circuit for this Siteâ on our Circuit Display. Click below to see how it works.
-onboarding.tour-tor-circuit-display.button=Explore
+onboarding.tour-tor-circuit-display.description=For each domain you visit, your traffic is relayed and encrypted in a circuit across three Tor relays around the world. No website knows where you are connecting from. You can request a new circuit by clicking âNew Circuit for this Siteâ on our Circuit Display.
+onboarding.tour-tor-circuit-display.button=See My Path
onboarding.tour-tor-security=Sikkerhet
onboarding.tour-tor-security.title=Choose your experience.
-onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do.
onboarding.tour-tor-security.button=Review Settings
onboarding.tour-tor-expect-differences=Experience Tips
-onboarding.tour-tor-expect-differences.title=Experience Tips
-onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.title=Expect some differences.
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot.
onboarding.tour-tor-expect-differences.button=See FAQs
onboarding.tour-tor-onion-services=LÞk-tjenester
-onboarding.tour-tor-onion-services.title=LÞk-tjenester
-onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.title=Be extra protected.
+onboarding.tour-tor-onion-services.description=Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously. Click below to visit the DuckDuckGo onion site.
onboarding.tour-tor-onion-services.button=Visit an Onion
+
+# Circuit Display onboarding.
+onboarding.tor-circuit-display.next=Neste
+onboarding.tor-circuit-display.done=Ferdig
+onboarding.tor-circuit-display.one-of-three=1 of 3
+onboarding.tor-circuit-display.two-of-three=2 of 3
+onboarding.tor-circuit-display.three-of-three=3 of 3
+
+onboarding.tor-circuit-display.intro.title=How do circuits work?
+onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assigned relays, which are computers around the world configured to forward Tor traffic. Circuits allow you to browse privately and to connect to onion services.
+
+onboarding.tor-circuit-display.diagram.title=Circuit Display
+onboarding.tor-circuit-display.diagram.msg=This diagram shows the relays that make up the circuit for this website. To prevent linking of activity across different sites, each website gets a different circuit.
+
+onboarding.tor-circuit-display.new-circuit.title=Do you need a new circuit?
+onboarding.tor-circuit-display.new-circuit.msg=If you are not able to connect to the website youâre trying to visit or it is not loading properly, then you can use this button to reload the site with a new circuit.
diff --git a/src/chrome/locale/nb/torbutton.properties b/src/chrome/locale/nb/torbutton.properties
index f0adaf03..873756e4 100644
--- a/src/chrome/locale/nb/torbutton.properties
+++ b/src/chrome/locale/nb/torbutton.properties
@@ -31,9 +31,6 @@ torbutton.popup.confirm_plugins = Nettlesertillegg som f.eks Flash kan skade per
torbutton.popup.never_ask_again = Ikke spÞr meg igjen
torbutton.popup.confirm_newnym = TOR-nettleseren vil stenge alle vinduer og faner. Alle nettstedeÞkter vil gå tapt.\n\n\nRestart TOR-nettleseren nå for å tilbakestille din identitet?\n\n
-torbutton.slider_notification = Den grÞnne lÞk-menyen har nå en sikkerhetsglidebryter som lar deg justere ditt sikkerhetsnivå. Sjekk den ut!
-torbutton.slider_notification_button = Ã
pne sikkerhetsinnstillinger
-
torbutton.maximize_warning = Ã
blåse opp vinduet Tor-nettleseren befinner seg i til full stÞrrelse gir nettsteder muligheten til å fastslå din skjermopplÞsning, som igjen kan brukes til å spore deg. Vi anbefaler at du lar Tor-nettleservinduet vÊre i orginal stÞrrelse.
# Canvas permission prompt. Strings are kept here for ease of translation.
diff --git a/src/chrome/locale/nl/aboutTBUpdate.dtd b/src/chrome/locale/nl/aboutTBUpdate.dtd
index 3fc2ec2b..9f5cc50f 100644
--- a/src/chrome/locale/nl/aboutTBUpdate.dtd
+++ b/src/chrome/locale/nl/aboutTBUpdate.dtd
@@ -4,3 +4,7 @@
<!ENTITY aboutTBUpdate.linkLabel "bezoek onze website">
<!ENTITY aboutTBUpdate.linkSuffix ".">
<!ENTITY aboutTBUpdate.changeLogHeading "Wijzigingslogboek:">
+
+<!ENTITY aboutTBUpdate.circuitDisplayHeading "New, Redesigned Circuit Display">
+<!ENTITY aboutTBUpdate.circuitDisplayDescription "The Tor circuit display has been relocated and improved! Click the Site Identity button (located on the left side of the URL bar) to see the new circuit display.">
+<!ENTITY aboutTBUpdate.learnMore "Learn More">
diff --git a/src/chrome/locale/nl/aboutTor.dtd b/src/chrome/locale/nl/aboutTor.dtd
index f1bb675c..cb8fd18f 100644
--- a/src/chrome/locale/nl/aboutTor.dtd
+++ b/src/chrome/locale/nl/aboutTor.dtd
@@ -23,3 +23,6 @@
<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
<!ENTITY aboutTor.getInvolved.label "Get Involved »">
<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en">
+
+<!ENTITY aboutTor.newsletter.tagline "Get the latest news from Tor straight to your inbox.">
+<!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News.">
diff --git a/src/chrome/locale/nl/browserOnboarding.properties b/src/chrome/locale/nl/browserOnboarding.properties
index c5810bdb..2e72b207 100644
--- a/src/chrome/locale/nl/browserOnboarding.properties
+++ b/src/chrome/locale/nl/browserOnboarding.properties
@@ -4,35 +4,51 @@
onboarding.tour-tor-welcome=Welkom
onboarding.tour-tor-welcome.title=Youâre ready.
-onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. Youâre now protected against tracking, surveillance, and censorship. This quick onboarding will show you how.
onboarding.tour-tor-welcome.button=Start Now
onboarding.tour-tor-privacy=Privacy
onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
-onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canât follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click âTor Networkâ to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click âTor Networkâ to learn how we protect you on the network level.
onboarding.tour-tor-privacy.button=Go to Tor Network
onboarding.tour-tor-network=Tor Network
onboarding.tour-tor-network.title=Travel a decentralized network.
-onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâs no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on âCircuit Displayâ to learn how they work.
+onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, thereâs no one point of failure or centralized entity you need to trust in order to enjoy the internet privately.
onboarding.tour-tor-network.button=Go to Circuit Display
onboarding.tour-tor-circuit-display=Circuit Display
onboarding.tour-tor-circuit-display.title=See your path.
-onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking âNew Circuit for this Siteâ on our Circuit Display. Click below to see how it works.
-onboarding.tour-tor-circuit-display.button=Verkennen
+onboarding.tour-tor-circuit-display.description=For each domain you visit, your traffic is relayed and encrypted in a circuit across three Tor relays around the world. No website knows where you are connecting from. You can request a new circuit by clicking âNew Circuit for this Siteâ on our Circuit Display.
+onboarding.tour-tor-circuit-display.button=See My Path
onboarding.tour-tor-security=Beveiliging
onboarding.tour-tor-security.title=Choose your experience.
-onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do.
onboarding.tour-tor-security.button=Review Settings
onboarding.tour-tor-expect-differences=Experience Tips
-onboarding.tour-tor-expect-differences.title=Experience Tips
-onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.title=Expect some differences.
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot.
onboarding.tour-tor-expect-differences.button=See FAQs
onboarding.tour-tor-onion-services=Onion Services
-onboarding.tour-tor-onion-services.title=Onion Services
-onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.title=Be extra protected.
+onboarding.tour-tor-onion-services.description=Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously. Click below to visit the DuckDuckGo onion site.
onboarding.tour-tor-onion-services.button=Visit an Onion
+
+# Circuit Display onboarding.
+onboarding.tor-circuit-display.next=Volgende
+onboarding.tor-circuit-display.done=Klaar
+onboarding.tor-circuit-display.one-of-three=1 of 3
+onboarding.tor-circuit-display.two-of-three=2 of 3
+onboarding.tor-circuit-display.three-of-three=3 of 3
+
+onboarding.tor-circuit-display.intro.title=How do circuits work?
+onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assigned relays, which are computers around the world configured to forward Tor traffic. Circuits allow you to browse privately and to connect to onion services.
+
+onboarding.tor-circuit-display.diagram.title=Circuit Display
+onboarding.tor-circuit-display.diagram.msg=This diagram shows the relays that make up the circuit for this website. To prevent linking of activity across different sites, each website gets a different circuit.
+
+onboarding.tor-circuit-display.new-circuit.title=Do you need a new circuit?
+onboarding.tor-circuit-display.new-circuit.msg=If you are not able to connect to the website youâre trying to visit or it is not loading properly, then you can use this button to reload the site with a new circuit.
diff --git a/src/chrome/locale/nl/torbutton.properties b/src/chrome/locale/nl/torbutton.properties
index b53c5ca3..920916f5 100644
--- a/src/chrome/locale/nl/torbutton.properties
+++ b/src/chrome/locale/nl/torbutton.properties
@@ -31,9 +31,6 @@ torbutton.popup.confirm_plugins = plug-ins zoals flash kunnen u privacy en anoni
torbutton.popup.never_ask_again = Vraag me dit nooit meer.
torbutton.popup.confirm_newnym = De Tor Browser zal alle windows en tabs sluiten. Alle website sessies zullen verloren gaan.\n\nHerstart de Tor Browser om je identiteit te resetten?\n\n
-torbutton.slider_notification = Het groene ui menu heeft nu een schuifregelaar waar u uw beveiligingsniveau aan kunt passen. Bekijk het eens!
-torbutton.slider_notification_button = Open de beveiligingsvoorkeuren
-
torbutton.maximize_warning = Het maximaliseren van Tor Browser stelt webpagina's in staat uw beeldschermgrootte vast te stellen; dit kan worden gebruikt om u te traceren. We raden aan dat u vensters van Tor Browser in hun oorspronkelijke grootte laat.
# Canvas permission prompt. Strings are kept here for ease of translation.
diff --git a/src/chrome/locale/pl/aboutTBUpdate.dtd b/src/chrome/locale/pl/aboutTBUpdate.dtd
index 151fb71c..d2900789 100644
--- a/src/chrome/locale/pl/aboutTBUpdate.dtd
+++ b/src/chrome/locale/pl/aboutTBUpdate.dtd
@@ -4,3 +4,7 @@
<!ENTITY aboutTBUpdate.linkLabel "odwiedź naszÄ
stronÄ internetowÄ
">
<!ENTITY aboutTBUpdate.linkSuffix ".">
<!ENTITY aboutTBUpdate.changeLogHeading "Lista zmian:">
+
+<!ENTITY aboutTBUpdate.circuitDisplayHeading "New, Redesigned Circuit Display">
+<!ENTITY aboutTBUpdate.circuitDisplayDescription "The Tor circuit display has been relocated and improved! Click the Site Identity button (located on the left side of the URL bar) to see the new circuit display.">
+<!ENTITY aboutTBUpdate.learnMore "Dowiedz siÄ wiÄcej">
diff --git a/src/chrome/locale/pl/aboutTor.dtd b/src/chrome/locale/pl/aboutTor.dtd
index f7f4c143..3d531447 100644
--- a/src/chrome/locale/pl/aboutTor.dtd
+++ b/src/chrome/locale/pl/aboutTor.dtd
@@ -23,3 +23,6 @@
<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
<!ENTITY aboutTor.getInvolved.label "Get Involved »">
<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en">
+
+<!ENTITY aboutTor.newsletter.tagline "Get the latest news from Tor straight to your inbox.">
+<!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News.">
diff --git a/src/chrome/locale/pl/browserOnboarding.properties b/src/chrome/locale/pl/browserOnboarding.properties
index 629a09a3..b1c1ebd1 100644
--- a/src/chrome/locale/pl/browserOnboarding.properties
+++ b/src/chrome/locale/pl/browserOnboarding.properties
@@ -4,35 +4,51 @@
onboarding.tour-tor-welcome=Witamy
onboarding.tour-tor-welcome.title=Youâre ready.
-onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. Youâre now protected against tracking, surveillance, and censorship. This quick onboarding will show you how.
onboarding.tour-tor-welcome.button=Start Now
onboarding.tour-tor-privacy=PrywatnoÅÄ
onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
-onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canât follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click âTor Networkâ to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click âTor Networkâ to learn how we protect you on the network level.
onboarding.tour-tor-privacy.button=Go to Tor Network
onboarding.tour-tor-network=Tor Network
onboarding.tour-tor-network.title=Travel a decentralized network.
-onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâs no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on âCircuit Displayâ to learn how they work.
+onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, thereâs no one point of failure or centralized entity you need to trust in order to enjoy the internet privately.
onboarding.tour-tor-network.button=Go to Circuit Display
onboarding.tour-tor-circuit-display=Circuit Display
onboarding.tour-tor-circuit-display.title=See your path.
-onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking âNew Circuit for this Siteâ on our Circuit Display. Click below to see how it works.
-onboarding.tour-tor-circuit-display.button=Explore
+onboarding.tour-tor-circuit-display.description=For each domain you visit, your traffic is relayed and encrypted in a circuit across three Tor relays around the world. No website knows where you are connecting from. You can request a new circuit by clicking âNew Circuit for this Siteâ on our Circuit Display.
+onboarding.tour-tor-circuit-display.button=See My Path
onboarding.tour-tor-security=BezpieczeÅstwo
onboarding.tour-tor-security.title=Choose your experience.
-onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do.
onboarding.tour-tor-security.button=Review Settings
onboarding.tour-tor-expect-differences=Experience Tips
-onboarding.tour-tor-expect-differences.title=Experience Tips
-onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.title=Expect some differences.
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot.
onboarding.tour-tor-expect-differences.button=See FAQs
onboarding.tour-tor-onion-services=UsÅugi Tor
-onboarding.tour-tor-onion-services.title=UsÅugi Tor
-onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.title=Be extra protected.
+onboarding.tour-tor-onion-services.description=Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously. Click below to visit the DuckDuckGo onion site.
onboarding.tour-tor-onion-services.button=Visit an Onion
+
+# Circuit Display onboarding.
+onboarding.tor-circuit-display.next=Dalej
+onboarding.tor-circuit-display.done=SkoÅczone
+onboarding.tor-circuit-display.one-of-three=1 of 3
+onboarding.tor-circuit-display.two-of-three=2 of 3
+onboarding.tor-circuit-display.three-of-three=3 of 3
+
+onboarding.tor-circuit-display.intro.title=How do circuits work?
+onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assigned relays, which are computers around the world configured to forward Tor traffic. Circuits allow you to browse privately and to connect to onion services.
+
+onboarding.tor-circuit-display.diagram.title=Circuit Display
+onboarding.tor-circuit-display.diagram.msg=This diagram shows the relays that make up the circuit for this website. To prevent linking of activity across different sites, each website gets a different circuit.
+
+onboarding.tor-circuit-display.new-circuit.title=Do you need a new circuit?
+onboarding.tor-circuit-display.new-circuit.msg=If you are not able to connect to the website youâre trying to visit or it is not loading properly, then you can use this button to reload the site with a new circuit.
diff --git a/src/chrome/locale/pl/torbutton.properties b/src/chrome/locale/pl/torbutton.properties
index b8b70ea3..d08b96a8 100644
--- a/src/chrome/locale/pl/torbutton.properties
+++ b/src/chrome/locale/pl/torbutton.properties
@@ -31,9 +31,6 @@ torbutton.popup.confirm_plugins = Wtyczki takie jak Flash mogÄ
szkodziÄ Twojej
torbutton.popup.never_ask_again = Nie pytaj mnie wiÄcej
torbutton.popup.confirm_newnym = Tor Browser zamknie wszystkie otwarte okna i karty. Wszystkie sesje zostanÄ
utracone.\n\nCzy chcesz zrestartowaÄ Tor Browser teraz, aby zmieniÄ toÅŒsamoÅÄ?\n\n
-torbutton.slider_notification = Zielone menu w ksztaÅcie cebuli ma suwak który pozwoli wybraÄ poziom bezpieczeÅstwa. Sprawdź i wypróbuj!
-torbutton.slider_notification_button = Otwórz ustawienia bezpieczeÅstwa
-
torbutton.maximize_warning = ZwiÄkszenie przeglÄ
darki Tor pozwala stronom internetowym ustaliÄ rozmiar ekranu i przez to ÅledziÄ uÅŒytkownika. Polecamy zostawiaÄ przeglÄ
darka Tor w domyÅlnym rozmiarze.
# Canvas permission prompt. Strings are kept here for ease of translation.
diff --git a/src/chrome/locale/pt-BR/aboutTBUpdate.dtd b/src/chrome/locale/pt-BR/aboutTBUpdate.dtd
index c56a6d6c..2c2cff6f 100644
--- a/src/chrome/locale/pt-BR/aboutTBUpdate.dtd
+++ b/src/chrome/locale/pt-BR/aboutTBUpdate.dtd
@@ -4,3 +4,7 @@
<!ENTITY aboutTBUpdate.linkLabel "visite nosso site.">
<!ENTITY aboutTBUpdate.linkSuffix ".">
<!ENTITY aboutTBUpdate.changeLogHeading "Registro de modificações:">
+
+<!ENTITY aboutTBUpdate.circuitDisplayHeading "New, Redesigned Circuit Display">
+<!ENTITY aboutTBUpdate.circuitDisplayDescription "The Tor circuit display has been relocated and improved! Click the Site Identity button (located on the left side of the URL bar) to see the new circuit display.">
+<!ENTITY aboutTBUpdate.learnMore "Saiba Mais">
diff --git a/src/chrome/locale/pt-BR/aboutTor.dtd b/src/chrome/locale/pt-BR/aboutTor.dtd
index dbf43ab1..0b87ad28 100644
--- a/src/chrome/locale/pt-BR/aboutTor.dtd
+++ b/src/chrome/locale/pt-BR/aboutTor.dtd
@@ -20,6 +20,10 @@
<!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">
<!ENTITY aboutTor.torbrowser_user_manual.label "Manual do Navegador Tor">
-<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
-<!ENTITY aboutTor.getInvolved.label "Get Involved »">
+<!ENTITY aboutTor.tor_mission.label "O Projeto Tor é uma organização sem fins lucrativos dos EUA 501 (c) (3) que promove direitos humanos e liberdades, criando e implantando tecnologias de privacidade e anonimato, de fonte aberta e livre, apoiando sua disponibilidade e uso irrestritos e promovendo seu entendimento cientÃfico e popular">
+<!ENTITY aboutTor.getInvolved.label "Envolva-se »
+">
<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en">
+
+<!ENTITY aboutTor.newsletter.tagline "Receba as últimas novidades do Tor diretamente na sua caixa de e-mail.">
+<!ENTITY aboutTor.newsletter.link_text "Inscreva-se para novidades Tor">
diff --git a/src/chrome/locale/pt-BR/browserOnboarding.properties b/src/chrome/locale/pt-BR/browserOnboarding.properties
index 3d39f44a..075ee3ac 100644
--- a/src/chrome/locale/pt-BR/browserOnboarding.properties
+++ b/src/chrome/locale/pt-BR/browserOnboarding.properties
@@ -4,35 +4,51 @@
onboarding.tour-tor-welcome=Bem Vindo
onboarding.tour-tor-welcome.title=Youâre ready.
-onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. Youâre now protected against tracking, surveillance, and censorship. This quick onboarding will show you how.
onboarding.tour-tor-welcome.button=Start Now
onboarding.tour-tor-privacy=Privacidade
onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
-onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canât follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click âTor Networkâ to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click âTor Networkâ to learn how we protect you on the network level.
onboarding.tour-tor-privacy.button=Go to Tor Network
onboarding.tour-tor-network=Tor Network
onboarding.tour-tor-network.title=Travel a decentralized network.
-onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâs no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on âCircuit Displayâ to learn how they work.
+onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, thereâs no one point of failure or centralized entity you need to trust in order to enjoy the internet privately.
onboarding.tour-tor-network.button=Go to Circuit Display
onboarding.tour-tor-circuit-display=Circuit Display
onboarding.tour-tor-circuit-display.title=See your path.
-onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking âNew Circuit for this Siteâ on our Circuit Display. Click below to see how it works.
-onboarding.tour-tor-circuit-display.button=Explorar
+onboarding.tour-tor-circuit-display.description=For each domain you visit, your traffic is relayed and encrypted in a circuit across three Tor relays around the world. No website knows where you are connecting from. You can request a new circuit by clicking âNew Circuit for this Siteâ on our Circuit Display.
+onboarding.tour-tor-circuit-display.button=See My Path
onboarding.tour-tor-security=Segurança
onboarding.tour-tor-security.title=Choose your experience.
-onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do.
onboarding.tour-tor-security.button=Review Settings
onboarding.tour-tor-expect-differences=Experience Tips
-onboarding.tour-tor-expect-differences.title=Experience Tips
-onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.title=Expect some differences.
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot.
onboarding.tour-tor-expect-differences.button=See FAQs
onboarding.tour-tor-onion-services=Serviços Onion
-onboarding.tour-tor-onion-services.title=Serviços Onion
-onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.title=Be extra protected.
+onboarding.tour-tor-onion-services.description=Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously. Click below to visit the DuckDuckGo onion site.
onboarding.tour-tor-onion-services.button=Visit an Onion
+
+# Circuit Display onboarding.
+onboarding.tor-circuit-display.next=Próximo
+onboarding.tor-circuit-display.done=Feito
+onboarding.tor-circuit-display.one-of-three=1 of 3
+onboarding.tor-circuit-display.two-of-three=2 of 3
+onboarding.tor-circuit-display.three-of-three=3 of 3
+
+onboarding.tor-circuit-display.intro.title=How do circuits work?
+onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assigned relays, which are computers around the world configured to forward Tor traffic. Circuits allow you to browse privately and to connect to onion services.
+
+onboarding.tor-circuit-display.diagram.title=Circuit Display
+onboarding.tor-circuit-display.diagram.msg=This diagram shows the relays that make up the circuit for this website. To prevent linking of activity across different sites, each website gets a different circuit.
+
+onboarding.tor-circuit-display.new-circuit.title=Do you need a new circuit?
+onboarding.tor-circuit-display.new-circuit.msg=If you are not able to connect to the website youâre trying to visit or it is not loading properly, then you can use this button to reload the site with a new circuit.
diff --git a/src/chrome/locale/pt-BR/torbutton.properties b/src/chrome/locale/pt-BR/torbutton.properties
index 1dc01fdc..69885807 100644
--- a/src/chrome/locale/pt-BR/torbutton.properties
+++ b/src/chrome/locale/pt-BR/torbutton.properties
@@ -31,9 +31,6 @@ torbutton.popup.confirm_plugins = Plugins como o Flash podem prejudicar sua priv
torbutton.popup.never_ask_again = Não me pergunte novamente
torbutton.popup.confirm_newnym = O navegador Tor fechará todas as janelas e abas. Todas as sessões de websites serão perdidas.\n\nVocê deseja reiniciar o navegador Tor agora para reiniciar a sua identidade?\n\n
-torbutton.slider_notification = O menu cebola verde agora dispõe de uma opção que lhe permite ajustar o seu nivel de seguranca. Dê uma conferida!
-torbutton.slider_notification_button = Abra as definições de segurança.
-
torbutton.maximize_warning = Maximizar o Navegador Tor pode permitir que websites determinem o tamanho do monitor, o que pode ser usado para rastreá-lo. Recomenda-se deixar a janela do Navegador Tor no seu tamanho original.
# Canvas permission prompt. Strings are kept here for ease of translation.
diff --git a/src/chrome/locale/ru/aboutTBUpdate.dtd b/src/chrome/locale/ru/aboutTBUpdate.dtd
index e5166376..3c9466ca 100644
--- a/src/chrome/locale/ru/aboutTBUpdate.dtd
+++ b/src/chrome/locale/ru/aboutTBUpdate.dtd
@@ -4,3 +4,7 @@
<!ENTITY aboutTBUpdate.linkLabel "пПÑеÑОÑе ÐœÐ°Ñ Ð²ÐµÐ±ÑайÑ">
<!ENTITY aboutTBUpdate.linkSuffix ".">
<!ENTITY aboutTBUpdate.changeLogHeading "ÐÑÑМал ОзЌеМеМОй:">
+
+<!ENTITY aboutTBUpdate.circuitDisplayHeading "New, Redesigned Circuit Display">
+<!ENTITY aboutTBUpdate.circuitDisplayDescription "The Tor circuit display has been relocated and improved! Click the Site Identity button (located on the left side of the URL bar) to see the new circuit display.">
+<!ENTITY aboutTBUpdate.learnMore "Learn More">
diff --git a/src/chrome/locale/ru/aboutTor.dtd b/src/chrome/locale/ru/aboutTor.dtd
index f30e3c4a..71c4920c 100644
--- a/src/chrome/locale/ru/aboutTor.dtd
+++ b/src/chrome/locale/ru/aboutTor.dtd
@@ -6,20 +6,23 @@
<!ENTITY aboutTor.title "РпÑПекÑе Tor">
-<!ENTITY aboutTor.ready.label "Explore. Privately.">
-<!ENTITY aboutTor.ready2.label "Youâre ready for the worldâs most private browsing experience.">
+<!ENTITY aboutTor.ready.label "ÐÑÑлеЎПваМОе. ÐПМÑОЎеМÑОалÑМПÑÑÑ.">
+<!ENTITY aboutTor.ready2.label "ÐÑ Ð³ÐŸÑÐŸÐ²Ñ Ðº ÑÐ°ÐŒÐŸÐŒÑ ÐºÐŸÐœÑОЎеМÑОалÑÐœÐŸÐŒÑ Ð¿ÑПÑЌПÑÑÑ Ð² ЌОÑе.">
<!ENTITY aboutTor.failure.label "ЧÑП-ÑП пПÑлП Ме Ñак!">
<!ENTITY aboutTor.failure2.label "Tor Ме ÑабПÑÐ°ÐµÑ Ð² ÑÑПЌ бÑаÑзеÑе.">
-<!ENTITY aboutTor.search.label "Search with DuckDuckGo">
+<!ENTITY aboutTor.search.label "ÐПОÑк ÑеÑез DuckDuckGo">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com">
<!ENTITY aboutTor.torbrowser_user_manual_questions.label "ÐПпÑПÑÑ?">
-<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual »">
+<!ENTITY aboutTor.torbrowser_user_manual_link.label "ÐзМакПЌÑÑеÑÑ Ñ ÑÑкПвПЎÑÑвПЌ пП бÑаÑзеÑÑ Ð¢ÐŸr »">
<!-- The next two entities are used within the browser's Help menu. -->
<!ENTITY aboutTor.torbrowser_user_manual.accesskey "Ð">
-<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual">
+<!ENTITY aboutTor.torbrowser_user_manual.label "Ð ÑкПвПЎÑÑвП пП бÑаÑзеÑÑ Tor">
-<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
-<!ENTITY aboutTor.getInvolved.label "Get Involved »">
+<!ENTITY aboutTor.tor_mission.label "ÐÑÐŸÐµÐºÑ Tor ÑвлÑеÑÑÑ ÐœÐµÐºÐŸÐŒÐŒÐµÑÑеÑкПй ПÑгаМОзаÑОей СКРÑП ÑÑаÑÑÑПЌ 501(c)(3), пÑПЎвОгаÑÑей пÑава ÑелПвека О ÑÐ²ÐŸÐ±ÐŸÐŽÑ Ð¿ÑÑеЌ ÑÐŸÐ·ÐŽÐ°ÐœÐžÑ Ðž ÑазвеÑÑÑÐ²Ð°ÐœÐžÑ ÑеÑ
МПлПгОй аМПМОЌМПÑÑО О кПМÑОЎеМÑОалÑМПÑÑО Ñ ÐŸÑкÑÑÑÑÐŒ ОÑÑ
ПЎМÑÐŒ кПЎПЌ, пПЎЎеÑжкО ОÑ
МеПгÑаМОÑеММПй ЎПÑÑÑпМПÑÑО О ОÑпПлÑзПваМОÑ, а Ñакже ÑПЎейÑÑÐ²ÐžÑ ÐžÑ
МаÑÑÐœÐŸÐŒÑ Ðž пПпÑлÑÑÐœÐŸÐŒÑ Ð¿ÐŸÐœÐžÐŒÐ°ÐœÐžÑ.">
+<!ENTITY aboutTor.getInvolved.label "ÐÑОÑПеЎОМÑйÑеÑÑ Â»">
<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html#ru">
+
+<!ENTITY aboutTor.newsletter.tagline "ÐПлÑÑайÑе пПÑлеЎМОе МПвПÑÑО Tor пÑÑЌП Ма Ð²Ð°Ñ Ð¿ÐŸÑÑПвÑй ÑÑОк.">
+<!ENTITY aboutTor.newsletter.link_text "ÐПЎпОÑОÑеÑÑ ÐœÐ° МПвПÑÑО Tor.">
diff --git a/src/chrome/locale/ru/browserOnboarding.properties b/src/chrome/locale/ru/browserOnboarding.properties
index d7f4a352..e9237ce7 100644
--- a/src/chrome/locale/ru/browserOnboarding.properties
+++ b/src/chrome/locale/ru/browserOnboarding.properties
@@ -4,35 +4,51 @@
onboarding.tour-tor-welcome=ÐПбÑП пПжалПваÑÑ
onboarding.tour-tor-welcome.title=Youâre ready.
-onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. Youâre now protected against tracking, surveillance, and censorship. This quick onboarding will show you how.
onboarding.tour-tor-welcome.button=Start Now
onboarding.tour-tor-privacy=ÐÑОваÑМПÑÑÑ
onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
-onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canât follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click âTor Networkâ to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click âTor Networkâ to learn how we protect you on the network level.
onboarding.tour-tor-privacy.button=Go to Tor Network
onboarding.tour-tor-network=Tor Network
onboarding.tour-tor-network.title=Travel a decentralized network.
-onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâs no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on âCircuit Displayâ to learn how they work.
+onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, thereâs no one point of failure or centralized entity you need to trust in order to enjoy the internet privately.
onboarding.tour-tor-network.button=Go to Circuit Display
onboarding.tour-tor-circuit-display=Circuit Display
onboarding.tour-tor-circuit-display.title=See your path.
-onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking âNew Circuit for this Siteâ on our Circuit Display. Click below to see how it works.
-onboarding.tour-tor-circuit-display.button=ÐбзПÑ
+onboarding.tour-tor-circuit-display.description=For each domain you visit, your traffic is relayed and encrypted in a circuit across three Tor relays around the world. No website knows where you are connecting from. You can request a new circuit by clicking âNew Circuit for this Siteâ on our Circuit Display.
+onboarding.tour-tor-circuit-display.button=See My Path
onboarding.tour-tor-security=ÐезПпаÑМПÑÑÑ
onboarding.tour-tor-security.title=Choose your experience.
-onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do.
onboarding.tour-tor-security.button=Review Settings
onboarding.tour-tor-expect-differences=Experience Tips
-onboarding.tour-tor-expect-differences.title=Experience Tips
-onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.title=Expect some differences.
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot.
onboarding.tour-tor-expect-differences.button=See FAQs
onboarding.tour-tor-onion-services=Onion-ÑеÑвОÑÑ
-onboarding.tour-tor-onion-services.title=Onion-ÑеÑвОÑÑ
-onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.title=Be extra protected.
+onboarding.tour-tor-onion-services.description=Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously. Click below to visit the DuckDuckGo onion site.
onboarding.tour-tor-onion-services.button=Visit an Onion
+
+# Circuit Display onboarding.
+onboarding.tor-circuit-display.next=ÐпеÑÑÐŽ
+onboarding.tor-circuit-display.done=ÐПÑПвП
+onboarding.tor-circuit-display.one-of-three=1 of 3
+onboarding.tor-circuit-display.two-of-three=2 of 3
+onboarding.tor-circuit-display.three-of-three=3 of 3
+
+onboarding.tor-circuit-display.intro.title=How do circuits work?
+onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assigned relays, which are computers around the world configured to forward Tor traffic. Circuits allow you to browse privately and to connect to onion services.
+
+onboarding.tor-circuit-display.diagram.title=Circuit Display
+onboarding.tor-circuit-display.diagram.msg=This diagram shows the relays that make up the circuit for this website. To prevent linking of activity across different sites, each website gets a different circuit.
+
+onboarding.tor-circuit-display.new-circuit.title=Do you need a new circuit?
+onboarding.tor-circuit-display.new-circuit.msg=If you are not able to connect to the website youâre trying to visit or it is not loading properly, then you can use this button to reload the site with a new circuit.
diff --git a/src/chrome/locale/ru/torbutton.properties b/src/chrome/locale/ru/torbutton.properties
index 15182cd3..c18c122b 100644
--- a/src/chrome/locale/ru/torbutton.properties
+++ b/src/chrome/locale/ru/torbutton.properties
@@ -31,9 +31,6 @@ torbutton.popup.confirm_plugins = ÐÐ»Ð°Ð³ÐžÐœÑ Ð²ÑПЎе Flash ЌПгÑÑ Ðœ
torbutton.popup.never_ask_again = ÐПлÑÑе Ме ÑпÑаÑОваÑÑ
torbutton.popup.confirm_newnym = Tor Browser закÑÐŸÐµÑ Ð²Ñе ПкМа О вклаЎкО. ÐÑе ÑеÑÑОО веб-ÑайÑа бÑÐŽÑÑ Ð¿ÐŸÑеÑÑМÑ.\n\nÐеÑезапÑÑÑОÑÑ ÑейÑÐ°Ñ Tor Browser, ÑÑÐŸÐ±Ñ ÐžÐ·ÐŒÐµÐœÐžÑÑ ÐаÑÑ Ð»ÐžÑМПÑÑÑ?\n\n
-torbutton.slider_notification = ÐелеМПе "лÑкПвПе" ÐŒÐµÐœÑ ÐžÐŒÐµÐµÑ Ð±ÐµÐ³ÑМПк безПпаÑМПÑÑО, кПÑПÑÑй пПзвПлÑÐµÑ ÐœÐ°ÑÑÑаОваÑÑ ÑÑÐŸÐ²ÐµÐœÑ Ð±ÐµÐ·ÐŸÐ¿Ð°ÑМПÑÑО. ÐÑеМОÑе егП!
-torbutton.slider_notification_button = ÐÑкÑÑÑÑ ÐœÐ°ÑÑÑПйкО безПпаÑМПÑÑО
-
torbutton.maximize_warning = ÐÑкÑÑÑОе бÑаÑзеÑа Tor Ма ЌакÑОЌалÑМÑÑ Ð²ÐµÐ»ÐžÑÐžÐœÑ ÐŒÐŸÐ¶ÐµÑ Ð¿ÐŸÐ·Ð²ÐŸÐ»ÐžÑÑ Ð²ÐµÐ±-ÑайÑаЌ ПпÑеЎелОÑÑ ÑÐ°Ð·ÐŒÐµÑ ÐаÑегП ЌПМОÑПÑа, ÑÑÐŸÐ±Ñ ÐŸÑÑлеЎОÑÑ ÐаÑ. ÐÑ ÑекПЌеМЎÑеЌ ПÑÑавлÑÑÑ ÐŸÐºÐœÐ° бÑаÑзеÑа в ОÑ
пеÑвПМаÑалÑМПЌ ÑазЌеÑе.
# Canvas permission prompt. Strings are kept here for ease of translation.
diff --git a/src/chrome/locale/sv/aboutTBUpdate.dtd b/src/chrome/locale/sv/aboutTBUpdate.dtd
index da02c498..02a58303 100644
--- a/src/chrome/locale/sv/aboutTBUpdate.dtd
+++ b/src/chrome/locale/sv/aboutTBUpdate.dtd
@@ -4,3 +4,7 @@
<!ENTITY aboutTBUpdate.linkLabel "besök vår hemsida">
<!ENTITY aboutTBUpdate.linkSuffix ".">
<!ENTITY aboutTBUpdate.changeLogHeading "Ãndringslogg:">
+
+<!ENTITY aboutTBUpdate.circuitDisplayHeading "New, Redesigned Circuit Display">
+<!ENTITY aboutTBUpdate.circuitDisplayDescription "The Tor circuit display has been relocated and improved! Click the Site Identity button (located on the left side of the URL bar) to see the new circuit display.">
+<!ENTITY aboutTBUpdate.learnMore "Learn More">
diff --git a/src/chrome/locale/sv/aboutTor.dtd b/src/chrome/locale/sv/aboutTor.dtd
index 2a02c639..b357efc1 100644
--- a/src/chrome/locale/sv/aboutTor.dtd
+++ b/src/chrome/locale/sv/aboutTor.dtd
@@ -23,3 +23,6 @@
<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
<!ENTITY aboutTor.getInvolved.label "Get Involved »">
<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en">
+
+<!ENTITY aboutTor.newsletter.tagline "Get the latest news from Tor straight to your inbox.">
+<!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News.">
diff --git a/src/chrome/locale/sv/browserOnboarding.properties b/src/chrome/locale/sv/browserOnboarding.properties
index 6ad7b625..847225d6 100644
--- a/src/chrome/locale/sv/browserOnboarding.properties
+++ b/src/chrome/locale/sv/browserOnboarding.properties
@@ -4,35 +4,51 @@
onboarding.tour-tor-welcome=Welcome
onboarding.tour-tor-welcome.title=Youâre ready.
-onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. Youâre now protected against tracking, surveillance, and censorship. This quick onboarding will show you how.
onboarding.tour-tor-welcome.button=Start Now
onboarding.tour-tor-privacy=Sekretess
onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
-onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canât follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click âTor Networkâ to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click âTor Networkâ to learn how we protect you on the network level.
onboarding.tour-tor-privacy.button=Go to Tor Network
onboarding.tour-tor-network=Tor Network
onboarding.tour-tor-network.title=Travel a decentralized network.
-onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâs no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on âCircuit Displayâ to learn how they work.
+onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, thereâs no one point of failure or centralized entity you need to trust in order to enjoy the internet privately.
onboarding.tour-tor-network.button=Go to Circuit Display
onboarding.tour-tor-circuit-display=Circuit Display
onboarding.tour-tor-circuit-display.title=See your path.
-onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking âNew Circuit for this Siteâ on our Circuit Display. Click below to see how it works.
-onboarding.tour-tor-circuit-display.button=Explore
+onboarding.tour-tor-circuit-display.description=For each domain you visit, your traffic is relayed and encrypted in a circuit across three Tor relays around the world. No website knows where you are connecting from. You can request a new circuit by clicking âNew Circuit for this Siteâ on our Circuit Display.
+onboarding.tour-tor-circuit-display.button=See My Path
onboarding.tour-tor-security=SÀkerhet
onboarding.tour-tor-security.title=Choose your experience.
-onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do.
onboarding.tour-tor-security.button=Review Settings
onboarding.tour-tor-expect-differences=Experience Tips
-onboarding.tour-tor-expect-differences.title=Experience Tips
-onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.title=Expect some differences.
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot.
onboarding.tour-tor-expect-differences.button=See FAQs
onboarding.tour-tor-onion-services=Onion tjÀnster
-onboarding.tour-tor-onion-services.title=Onion tjÀnster
-onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.title=Be extra protected.
+onboarding.tour-tor-onion-services.description=Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously. Click below to visit the DuckDuckGo onion site.
onboarding.tour-tor-onion-services.button=Visit an Onion
+
+# Circuit Display onboarding.
+onboarding.tor-circuit-display.next=NÀsta
+onboarding.tor-circuit-display.done=FÀrdig
+onboarding.tor-circuit-display.one-of-three=1 of 3
+onboarding.tor-circuit-display.two-of-three=2 of 3
+onboarding.tor-circuit-display.three-of-three=3 of 3
+
+onboarding.tor-circuit-display.intro.title=How do circuits work?
+onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assigned relays, which are computers around the world configured to forward Tor traffic. Circuits allow you to browse privately and to connect to onion services.
+
+onboarding.tor-circuit-display.diagram.title=Circuit Display
+onboarding.tor-circuit-display.diagram.msg=This diagram shows the relays that make up the circuit for this website. To prevent linking of activity across different sites, each website gets a different circuit.
+
+onboarding.tor-circuit-display.new-circuit.title=Do you need a new circuit?
+onboarding.tor-circuit-display.new-circuit.msg=If you are not able to connect to the website youâre trying to visit or it is not loading properly, then you can use this button to reload the site with a new circuit.
diff --git a/src/chrome/locale/sv/torbutton.properties b/src/chrome/locale/sv/torbutton.properties
index 2daa2bfb..5069c79e 100644
--- a/src/chrome/locale/sv/torbutton.properties
+++ b/src/chrome/locale/sv/torbutton.properties
@@ -31,9 +31,6 @@ torbutton.popup.confirm_plugins = Insticksmoduler så som Flash kan Àventyra di
torbutton.popup.never_ask_again = Fråga aldrig igen
torbutton.popup.confirm_newnym = Tor Browser kommer att stÀnga alla fönster och flikar. Alla webbplatssessioner kommer att gå förlorade.\n\nStarta om Tor Browser nu för att återstÀlla din identitet?\n\n
-torbutton.slider_notification = Den gröna onion menyn har nu en sÀkerhetsinstÀllning som gör det möjligt att Àndra din sÀkerhets nivå. Kolla in den!
-torbutton.slider_notification_button = Ãppna sÀkerhetsinstÀllningar
-
torbutton.maximize_warning = Att maximera Tor Browser kan ge webbplatser möjlighet att upptÀcka din skÀrmstorlek, vilket kan anvÀndas för att spåra dig. Vi rekommenderar att du lÀmnar Tor Browser fönstret i dess ursprungliga storlek.
# Canvas permission prompt. Strings are kept here for ease of translation.
diff --git a/src/chrome/locale/tr/aboutTBUpdate.dtd b/src/chrome/locale/tr/aboutTBUpdate.dtd
index 5aac624f..a0058043 100644
--- a/src/chrome/locale/tr/aboutTBUpdate.dtd
+++ b/src/chrome/locale/tr/aboutTBUpdate.dtd
@@ -4,3 +4,7 @@
<!ENTITY aboutTBUpdate.linkLabel "web sitemizden edinilebilir">
<!ENTITY aboutTBUpdate.linkSuffix ".">
<!ENTITY aboutTBUpdate.changeLogHeading "SÌrÌm notları:">
+
+<!ENTITY aboutTBUpdate.circuitDisplayHeading "Yeni, Yeniden TasarlanmıŠDevre GörÌnÌmÌ">
+<!ENTITY aboutTBUpdate.circuitDisplayDescription "Tor devresi görÃŒnÃŒmÃŒnÃŒn konumu deÄiÅtirildi ve geliÅtirildi! Site KimliÄi DÃŒÄmesine (adres çubuÄunun sol tarafında bulunan) tıklayarak yeni devre görÃŒnÃŒmÃŒne bakabilirsiniz.">
+<!ENTITY aboutTBUpdate.learnMore "Ayrıntılı Bilgi Alın">
diff --git a/src/chrome/locale/tr/aboutTor.dtd b/src/chrome/locale/tr/aboutTor.dtd
index f0f68b49..ce8761f2 100644
--- a/src/chrome/locale/tr/aboutTor.dtd
+++ b/src/chrome/locale/tr/aboutTor.dtd
@@ -23,3 +23,6 @@
<!ENTITY aboutTor.tor_mission.label "Tor Projesi, US 501(c)(3) koÅullarına uygun olarak, özgÃŒr ve açık kaynaklı anonimlik ve kiÅisel gizlilik teknolojileri geliÅtirerek insan hakları ve özgÃŒrlÃŒklerini ileriye götÃŒrmeyi, bu teknolojilerin bilimsel ve kÃŒltÃŒrel olarak bilinirliÄini arttırmayı ve herkes tarafından eriÅebilmesini saÄlamak amacıyla çalıÅan, kar amacı gÃŒtmeyen bir kuruluÅtur.">
<!ENTITY aboutTor.getInvolved.label "Katkıda Bulunun »">
<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en">
+
+<!ENTITY aboutTor.newsletter.tagline "Tor ile ilgili son geliÅmeler doÄrudan e-posta kutunuza gelsin.">
+<!ENTITY aboutTor.newsletter.link_text "Tor Haber BÃŒltenine Abone Olun">
diff --git a/src/chrome/locale/tr/browserOnboarding.properties b/src/chrome/locale/tr/browserOnboarding.properties
index 22bd337d..9413168c 100644
--- a/src/chrome/locale/tr/browserOnboarding.properties
+++ b/src/chrome/locale/tr/browserOnboarding.properties
@@ -4,35 +4,51 @@
onboarding.tour-tor-welcome=Courier'a
onboarding.tour-tor-welcome.title=Youâre ready.
-onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. Youâre now protected against tracking, surveillance, and censorship. This quick onboarding will show you how.
onboarding.tour-tor-welcome.button=Start Now
onboarding.tour-tor-privacy=Gizlilik
onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
-onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canât follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click âTor Networkâ to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click âTor Networkâ to learn how we protect you on the network level.
onboarding.tour-tor-privacy.button=Go to Tor Network
onboarding.tour-tor-network=Tor Network
onboarding.tour-tor-network.title=Travel a decentralized network.
-onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâs no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on âCircuit Displayâ to learn how they work.
+onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, thereâs no one point of failure or centralized entity you need to trust in order to enjoy the internet privately.
onboarding.tour-tor-network.button=Go to Circuit Display
onboarding.tour-tor-circuit-display=Circuit Display
onboarding.tour-tor-circuit-display.title=See your path.
-onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking âNew Circuit for this Siteâ on our Circuit Display. Click below to see how it works.
-onboarding.tour-tor-circuit-display.button=KeÅfet
+onboarding.tour-tor-circuit-display.description=For each domain you visit, your traffic is relayed and encrypted in a circuit across three Tor relays around the world. No website knows where you are connecting from. You can request a new circuit by clicking âNew Circuit for this Siteâ on our Circuit Display.
+onboarding.tour-tor-circuit-display.button=See My Path
onboarding.tour-tor-security=GÃŒvenlik
onboarding.tour-tor-security.title=Choose your experience.
-onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do.
onboarding.tour-tor-security.button=Review Settings
onboarding.tour-tor-expect-differences=Experience Tips
-onboarding.tour-tor-expect-differences.title=Experience Tips
-onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.title=Expect some differences.
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot.
onboarding.tour-tor-expect-differences.button=See FAQs
onboarding.tour-tor-onion-services=Onion Hizmetleri
-onboarding.tour-tor-onion-services.title=Onion Hizmetleri
-onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.title=Be extra protected.
+onboarding.tour-tor-onion-services.description=Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously. Click below to visit the DuckDuckGo onion site.
onboarding.tour-tor-onion-services.button=Visit an Onion
+
+# Circuit Display onboarding.
+onboarding.tor-circuit-display.next=Sonraki
+onboarding.tor-circuit-display.done=Bitti
+onboarding.tor-circuit-display.one-of-three=1 of 3
+onboarding.tor-circuit-display.two-of-three=2 of 3
+onboarding.tor-circuit-display.three-of-three=3 of 3
+
+onboarding.tor-circuit-display.intro.title=How do circuits work?
+onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assigned relays, which are computers around the world configured to forward Tor traffic. Circuits allow you to browse privately and to connect to onion services.
+
+onboarding.tor-circuit-display.diagram.title=Circuit Display
+onboarding.tor-circuit-display.diagram.msg=This diagram shows the relays that make up the circuit for this website. To prevent linking of activity across different sites, each website gets a different circuit.
+
+onboarding.tor-circuit-display.new-circuit.title=Do you need a new circuit?
+onboarding.tor-circuit-display.new-circuit.msg=If you are not able to connect to the website youâre trying to visit or it is not loading properly, then you can use this button to reload the site with a new circuit.
diff --git a/src/chrome/locale/tr/torbutton.properties b/src/chrome/locale/tr/torbutton.properties
index d79c9ee9..8ac1ecfe 100644
--- a/src/chrome/locale/tr/torbutton.properties
+++ b/src/chrome/locale/tr/torbutton.properties
@@ -31,9 +31,6 @@ torbutton.popup.confirm_plugins = Flash gibi eklentiler gizliliÄinizi ve anonim
torbutton.popup.never_ask_again = Bir daha sorma
torbutton.popup.confirm_newnym = Tor Browser tÃŒm sekme ve pencereleri kapatacak. TÃŒm web sitesi oturumları kaybolacak.\n\nKimliÄinizi sıfırlamak için Tor Browser yeniden baÅlatılsın mı?\n
-torbutton.slider_notification = YeÅil soÄan menÃŒsÃŒnde artık gÃŒvenlik dÃŒzeyini ayarlayabileceÄiniz bir gÃŒvenlik kaydırıcısı var. Deneyin!
-torbutton.slider_notification_button = GÌvenlik ayarlarını aç
-
torbutton.maximize_warning = Tor Browser görÃŒntÃŒsÃŒnÃŒn tÃŒm ekranı kaplaması, ekran boyutunuzun web siteleri tarafından öÄrenilmesini ve bu bilginin sizi izlemek için kullanılmasını saÄlayabilir. Tor Browser pencerelerini özgÃŒn varsayılan boyutlarında bırakmanız önerilir.
# Canvas permission prompt. Strings are kept here for ease of translation.
diff --git a/src/chrome/locale/vi/aboutTBUpdate.dtd b/src/chrome/locale/vi/aboutTBUpdate.dtd
index d1c233ca..fede64fa 100644
--- a/src/chrome/locale/vi/aboutTBUpdate.dtd
+++ b/src/chrome/locale/vi/aboutTBUpdate.dtd
@@ -4,3 +4,7 @@
<!ENTITY aboutTBUpdate.linkLabel "Äến thÄm trang cá»§a chúng tÃŽi">
<!ENTITY aboutTBUpdate.linkSuffix ".">
<!ENTITY aboutTBUpdate.changeLogHeading "Nháºt kÜ thay Äá»i:">
+
+<!ENTITY aboutTBUpdate.circuitDisplayHeading "New, Redesigned Circuit Display">
+<!ENTITY aboutTBUpdate.circuitDisplayDescription "The Tor circuit display has been relocated and improved! Click the Site Identity button (located on the left side of the URL bar) to see the new circuit display.">
+<!ENTITY aboutTBUpdate.learnMore "Learn More">
diff --git a/src/chrome/locale/vi/aboutTor.dtd b/src/chrome/locale/vi/aboutTor.dtd
index c79065b5..d8eb7323 100644
--- a/src/chrome/locale/vi/aboutTor.dtd
+++ b/src/chrome/locale/vi/aboutTor.dtd
@@ -23,3 +23,6 @@
<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
<!ENTITY aboutTor.getInvolved.label "Get Involved »">
<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en">
+
+<!ENTITY aboutTor.newsletter.tagline "Get the latest news from Tor straight to your inbox.">
+<!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News.">
diff --git a/src/chrome/locale/vi/browserOnboarding.properties b/src/chrome/locale/vi/browserOnboarding.properties
index 4c63fa1c..fd085289 100644
--- a/src/chrome/locale/vi/browserOnboarding.properties
+++ b/src/chrome/locale/vi/browserOnboarding.properties
@@ -4,35 +4,51 @@
onboarding.tour-tor-welcome=Xin chà o
onboarding.tour-tor-welcome.title=Youâre ready.
-onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. Youâre now protected against tracking, surveillance, and censorship. This quick onboarding will show you how.
onboarding.tour-tor-welcome.button=Start Now
onboarding.tour-tor-privacy=Riêng tư
onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
-onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canât follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click âTor Networkâ to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click âTor Networkâ to learn how we protect you on the network level.
onboarding.tour-tor-privacy.button=Go to Tor Network
onboarding.tour-tor-network=Tor Network
onboarding.tour-tor-network.title=Travel a decentralized network.
-onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâs no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on âCircuit Displayâ to learn how they work.
+onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, thereâs no one point of failure or centralized entity you need to trust in order to enjoy the internet privately.
onboarding.tour-tor-network.button=Go to Circuit Display
onboarding.tour-tor-circuit-display=Circuit Display
onboarding.tour-tor-circuit-display.title=See your path.
-onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking âNew Circuit for this Siteâ on our Circuit Display. Click below to see how it works.
-onboarding.tour-tor-circuit-display.button=Explore
+onboarding.tour-tor-circuit-display.description=For each domain you visit, your traffic is relayed and encrypted in a circuit across three Tor relays around the world. No website knows where you are connecting from. You can request a new circuit by clicking âNew Circuit for this Siteâ on our Circuit Display.
+onboarding.tour-tor-circuit-display.button=See My Path
onboarding.tour-tor-security=Bảo máºt
onboarding.tour-tor-security.title=Choose your experience.
-onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do.
onboarding.tour-tor-security.button=Review Settings
onboarding.tour-tor-expect-differences=Experience Tips
-onboarding.tour-tor-expect-differences.title=Experience Tips
-onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.title=Expect some differences.
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot.
onboarding.tour-tor-expect-differences.button=See FAQs
onboarding.tour-tor-onion-services=Các Dá»ch vụ Onion
-onboarding.tour-tor-onion-services.title=Các Dá»ch vụ Onion
-onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.title=Be extra protected.
+onboarding.tour-tor-onion-services.description=Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously. Click below to visit the DuckDuckGo onion site.
onboarding.tour-tor-onion-services.button=Visit an Onion
+
+# Circuit Display onboarding.
+onboarding.tor-circuit-display.next=Kế tiếp
+onboarding.tor-circuit-display.done=Hoà n tất
+onboarding.tor-circuit-display.one-of-three=1 of 3
+onboarding.tor-circuit-display.two-of-three=2 of 3
+onboarding.tor-circuit-display.three-of-three=3 of 3
+
+onboarding.tor-circuit-display.intro.title=How do circuits work?
+onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assigned relays, which are computers around the world configured to forward Tor traffic. Circuits allow you to browse privately and to connect to onion services.
+
+onboarding.tor-circuit-display.diagram.title=Circuit Display
+onboarding.tor-circuit-display.diagram.msg=This diagram shows the relays that make up the circuit for this website. To prevent linking of activity across different sites, each website gets a different circuit.
+
+onboarding.tor-circuit-display.new-circuit.title=Do you need a new circuit?
+onboarding.tor-circuit-display.new-circuit.msg=If you are not able to connect to the website youâre trying to visit or it is not loading properly, then you can use this button to reload the site with a new circuit.
diff --git a/src/chrome/locale/vi/torbutton.properties b/src/chrome/locale/vi/torbutton.properties
index dd2b905b..6a4f068f 100644
--- a/src/chrome/locale/vi/torbutton.properties
+++ b/src/chrome/locale/vi/torbutton.properties
@@ -31,9 +31,6 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
torbutton.popup.confirm_newnym = Trình duyá»t Tor sẜ Äóng tất cả cá»a sá» và các thẻ. Má»i trang phiên cá»§a trang web sẜ mất.\n\nKhá»i Äá»ng lại Trình duyá»t Tor bây giá» Äá» Äặt lại danh tÃnh cá»§a bạn?\n\n
-torbutton.slider_notification = Trình ÄÆ¡n Cá»§ hà nh mà u xanh bây giá» có má»t trình Äiá»u chá»nh an ninh thứ cho phép bạn Äiá»u chá»nh mức Äá» an ninh cá»§a bạn. Thá» ngay bây giá»!
-torbutton.slider_notification_button = Má» cà i Äặt an ninh
-
torbutton.maximize_warning = Má» rá»ng tá»i Äa Trình duyá»t Tor có thá» cho phép trang web xác Äá»nh kÃch cỡ mà n hình cá»§a bạn, thứ có thá» ÄÆ°á»£c dùng Äá» theo dõi bạn. Chúng tÃŽi khuyên bạn Äá» cá»§a sá» Trình duyá»t Tor á» kÃch cỡ mặc Äá»nh gá»c.
# Canvas permission prompt. Strings are kept here for ease of translation.
diff --git a/src/chrome/locale/zh-CN/aboutTBUpdate.dtd b/src/chrome/locale/zh-CN/aboutTBUpdate.dtd
index 416ddae9..a2cda6c6 100644
--- a/src/chrome/locale/zh-CN/aboutTBUpdate.dtd
+++ b/src/chrome/locale/zh-CN/aboutTBUpdate.dtd
@@ -4,3 +4,7 @@
<!ENTITY aboutTBUpdate.linkLabel "è®¿é®æä»¬ççœç«">
<!ENTITY aboutTBUpdate.linkSuffix "ã">
<!ENTITY aboutTBUpdate.changeLogHeading "æŽæ°æ¥å¿ïŒ">
+
+<!ENTITY aboutTBUpdate.circuitDisplayHeading "New, Redesigned Circuit Display">
+<!ENTITY aboutTBUpdate.circuitDisplayDescription "The Tor circuit display has been relocated and improved! Click the Site Identity button (located on the left side of the URL bar) to see the new circuit display.">
+<!ENTITY aboutTBUpdate.learnMore "Learn More">
diff --git a/src/chrome/locale/zh-CN/aboutTor.dtd b/src/chrome/locale/zh-CN/aboutTor.dtd
index 47d2a899..bcf5b05f 100644
--- a/src/chrome/locale/zh-CN/aboutTor.dtd
+++ b/src/chrome/locale/zh-CN/aboutTor.dtd
@@ -6,20 +6,23 @@
<!ENTITY aboutTor.title "å
³äº Tor">
-<!ENTITY aboutTor.ready.label "Explore. Privately.">
-<!ENTITY aboutTor.ready2.label "Youâre ready for the worldâs most private browsing experience.">
+<!ENTITY aboutTor.ready.label "ç§å¯æµè§">
+<!ENTITY aboutTor.ready2.label "欢è¿äœéªæç§å¯çæµè§ã">
<!ENTITY aboutTor.failure.label "åºéäºïŒ">
<!ENTITY aboutTor.failure2.label "Tor æ æ³åšè¯¥æµè§åšäžè¿è¡ã">
-<!ENTITY aboutTor.search.label "Search with DuckDuckGo">
+<!ENTITY aboutTor.search.label "éè¿ DuckDuckGo æçŽ¢">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com">
<!ENTITY aboutTor.torbrowser_user_manual_questions.label "æçé®ïŒ">
-<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual »">
+<!ENTITY aboutTor.torbrowser_user_manual_link.label "æ¥é
Tor Browser çšæ·æå »">
<!-- The next two entities are used within the browser's Help menu. -->
<!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">
-<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual">
+<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser çšæ·æå">
<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
-<!ENTITY aboutTor.getInvolved.label "Get Involved »">
+<!ENTITY aboutTor.getInvolved.label "åäžè¿æ¥ »">
<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en">
+
+<!ENTITY aboutTor.newsletter.tagline "éè¿é®ä»¶è·å Tor çææ°æ¶æ¯ã">
+<!ENTITY aboutTor.newsletter.link_text "泚å Tor æ°é»å衚">
diff --git a/src/chrome/locale/zh-CN/browserOnboarding.properties b/src/chrome/locale/zh-CN/browserOnboarding.properties
index aa157e16..17d74bcc 100644
--- a/src/chrome/locale/zh-CN/browserOnboarding.properties
+++ b/src/chrome/locale/zh-CN/browserOnboarding.properties
@@ -4,35 +4,51 @@
onboarding.tour-tor-welcome=欢è¿
onboarding.tour-tor-welcome.title=Youâre ready.
-onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. Youâre now protected against tracking, surveillance, and censorship. This quick onboarding will show you how.
onboarding.tour-tor-welcome.button=Start Now
onboarding.tour-tor-privacy=éç§
onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
-onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canât follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click âTor Networkâ to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click âTor Networkâ to learn how we protect you on the network level.
onboarding.tour-tor-privacy.button=Go to Tor Network
onboarding.tour-tor-network=Tor Network
onboarding.tour-tor-network.title=Travel a decentralized network.
-onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâs no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on âCircuit Displayâ to learn how they work.
+onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, thereâs no one point of failure or centralized entity you need to trust in order to enjoy the internet privately.
onboarding.tour-tor-network.button=Go to Circuit Display
onboarding.tour-tor-circuit-display=Circuit Display
onboarding.tour-tor-circuit-display.title=See your path.
-onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking âNew Circuit for this Siteâ on our Circuit Display. Click below to see how it works.
-onboarding.tour-tor-circuit-display.button=Explore
+onboarding.tour-tor-circuit-display.description=For each domain you visit, your traffic is relayed and encrypted in a circuit across three Tor relays around the world. No website knows where you are connecting from. You can request a new circuit by clicking âNew Circuit for this Siteâ on our Circuit Display.
+onboarding.tour-tor-circuit-display.button=See My Path
onboarding.tour-tor-security=å®å
š
onboarding.tour-tor-security.title=Choose your experience.
-onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do.
onboarding.tour-tor-security.button=Review Settings
onboarding.tour-tor-expect-differences=Experience Tips
-onboarding.tour-tor-expect-differences.title=Experience Tips
-onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.title=Expect some differences.
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot.
onboarding.tour-tor-expect-differences.button=See FAQs
onboarding.tour-tor-onion-services=æŽè±æå¡
-onboarding.tour-tor-onion-services.title=æŽè±æå¡
-onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.title=Be extra protected.
+onboarding.tour-tor-onion-services.description=Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously. Click below to visit the DuckDuckGo onion site.
onboarding.tour-tor-onion-services.button=Visit an Onion
+
+# Circuit Display onboarding.
+onboarding.tor-circuit-display.next=äžäžæ¥
+onboarding.tor-circuit-display.done=宿
+onboarding.tor-circuit-display.one-of-three=1 of 3
+onboarding.tor-circuit-display.two-of-three=2 of 3
+onboarding.tor-circuit-display.three-of-three=3 of 3
+
+onboarding.tor-circuit-display.intro.title=How do circuits work?
+onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assigned relays, which are computers around the world configured to forward Tor traffic. Circuits allow you to browse privately and to connect to onion services.
+
+onboarding.tor-circuit-display.diagram.title=Circuit Display
+onboarding.tor-circuit-display.diagram.msg=This diagram shows the relays that make up the circuit for this website. To prevent linking of activity across different sites, each website gets a different circuit.
+
+onboarding.tor-circuit-display.new-circuit.title=Do you need a new circuit?
+onboarding.tor-circuit-display.new-circuit.msg=If you are not able to connect to the website youâre trying to visit or it is not loading properly, then you can use this button to reload the site with a new circuit.
diff --git a/src/chrome/locale/zh-CN/torbutton.properties b/src/chrome/locale/zh-CN/torbutton.properties
index 6d2e8685..9b908a0b 100644
--- a/src/chrome/locale/zh-CN/torbutton.properties
+++ b/src/chrome/locale/zh-CN/torbutton.properties
@@ -31,9 +31,6 @@ torbutton.popup.confirm_plugins = Flash ä¹ç±»çæä»¶å¯å¯¹çšæ·çéç§äž
torbutton.popup.never_ask_again = äžå询é®
torbutton.popup.confirm_newnym = Tor Browser å°å
³éå
šéšçªå£åæ çŸé¡µãææçœç«äŒè¯éœå°äž¢å€±ã\n\næ¯åŠé©¬äžéå¯ Tor Browser 以é眮身仜æ è¯ïŒ\n\n
-torbutton.slider_notification = 绿è²çæŽè±èåå
眮å®å
šæ»åïŒå¯çšä»¥è°æŽå®å
šçº§å«ãè¯è¯å§ïŒ
-torbutton.slider_notification_button = æåŒå®å
šè®Ÿçœ®
-
torbutton.maximize_warning = æå€§å Tor Browser çªå£ä¹åïŒçœç«å¯è·åæŸç€ºåšå°ºå¯žä¿¡æ¯ïŒä»èå¯è·èžªçšæ·ã建议䜿çšé»è®€çTor Browser çªå£å€§å°ã
# Canvas permission prompt. Strings are kept here for ease of translation.
diff --git a/src/chrome/locale/zh-TW/aboutTBUpdate.dtd b/src/chrome/locale/zh-TW/aboutTBUpdate.dtd
index 10b1788a..6dc56295 100644
--- a/src/chrome/locale/zh-TW/aboutTBUpdate.dtd
+++ b/src/chrome/locale/zh-TW/aboutTBUpdate.dtd
@@ -4,3 +4,7 @@
<!ENTITY aboutTBUpdate.linkLabel "å蚪æåçç¶²ç«">
<!ENTITY aboutTBUpdate.linkSuffix "ã">
<!ENTITY aboutTBUpdate.changeLogHeading "è®æŽæ·å²çŽéïŒ">
+
+<!ENTITY aboutTBUpdate.circuitDisplayHeading "New, Redesigned Circuit Display">
+<!ENTITY aboutTBUpdate.circuitDisplayDescription "The Tor circuit display has been relocated and improved! Click the Site Identity button (located on the left side of the URL bar) to see the new circuit display.">
+<!ENTITY aboutTBUpdate.learnMore "Learn More">
diff --git a/src/chrome/locale/zh-TW/aboutTor.dtd b/src/chrome/locale/zh-TW/aboutTor.dtd
index 537538f4..d0a05ffb 100644
--- a/src/chrome/locale/zh-TW/aboutTor.dtd
+++ b/src/chrome/locale/zh-TW/aboutTor.dtd
@@ -23,3 +23,6 @@
<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
<!ENTITY aboutTor.getInvolved.label "å å
¥æå »">
<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en">
+
+<!ENTITY aboutTor.newsletter.tagline "Get the latest news from Tor straight to your inbox.">
+<!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News.">
diff --git a/src/chrome/locale/zh-TW/browserOnboarding.properties b/src/chrome/locale/zh-TW/browserOnboarding.properties
index ca84f692..eb4f9a37 100644
--- a/src/chrome/locale/zh-TW/browserOnboarding.properties
+++ b/src/chrome/locale/zh-TW/browserOnboarding.properties
@@ -4,35 +4,51 @@
onboarding.tour-tor-welcome=æ¡è¿
onboarding.tour-tor-welcome.title=Youâre ready.
-onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. Youâre now protected against tracking, surveillance, and censorship. This quick onboarding will show you how.
onboarding.tour-tor-welcome.button=Start Now
onboarding.tour-tor-privacy=é±ç§
onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
-onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canât follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click âTor Networkâ to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click âTor Networkâ to learn how we protect you on the network level.
onboarding.tour-tor-privacy.button=Go to Tor Network
onboarding.tour-tor-network=Tor Network
onboarding.tour-tor-network.title=Travel a decentralized network.
-onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâs no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on âCircuit Displayâ to learn how they work.
+onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, thereâs no one point of failure or centralized entity you need to trust in order to enjoy the internet privately.
onboarding.tour-tor-network.button=Go to Circuit Display
onboarding.tour-tor-circuit-display=Circuit Display
onboarding.tour-tor-circuit-display.title=See your path.
-onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking âNew Circuit for this Siteâ on our Circuit Display. Click below to see how it works.
-onboarding.tour-tor-circuit-display.button=æ¢çŽ¢
+onboarding.tour-tor-circuit-display.description=For each domain you visit, your traffic is relayed and encrypted in a circuit across three Tor relays around the world. No website knows where you are connecting from. You can request a new circuit by clicking âNew Circuit for this Siteâ on our Circuit Display.
+onboarding.tour-tor-circuit-display.button=See My Path
onboarding.tour-tor-security=å®å
š
onboarding.tour-tor-security.title=Choose your experience.
-onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do.
onboarding.tour-tor-security.button=Review Settings
onboarding.tour-tor-expect-differences=Experience Tips
-onboarding.tour-tor-expect-differences.title=Experience Tips
-onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.title=Expect some differences.
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot.
onboarding.tour-tor-expect-differences.button=See FAQs
onboarding.tour-tor-onion-services=æŽè¥æå
-onboarding.tour-tor-onion-services.title=æŽè¥æå
-onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.title=Be extra protected.
+onboarding.tour-tor-onion-services.description=Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously. Click below to visit the DuckDuckGo onion site.
onboarding.tour-tor-onion-services.button=Visit an Onion
+
+# Circuit Display onboarding.
+onboarding.tor-circuit-display.next=äžäžå
+onboarding.tor-circuit-display.done=宿
+onboarding.tor-circuit-display.one-of-three=1 of 3
+onboarding.tor-circuit-display.two-of-three=2 of 3
+onboarding.tor-circuit-display.three-of-three=3 of 3
+
+onboarding.tor-circuit-display.intro.title=How do circuits work?
+onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assigned relays, which are computers around the world configured to forward Tor traffic. Circuits allow you to browse privately and to connect to onion services.
+
+onboarding.tor-circuit-display.diagram.title=Circuit Display
+onboarding.tor-circuit-display.diagram.msg=This diagram shows the relays that make up the circuit for this website. To prevent linking of activity across different sites, each website gets a different circuit.
+
+onboarding.tor-circuit-display.new-circuit.title=Do you need a new circuit?
+onboarding.tor-circuit-display.new-circuit.msg=If you are not able to connect to the website youâre trying to visit or it is not loading properly, then you can use this button to reload the site with a new circuit.
diff --git a/src/chrome/locale/zh-TW/torbutton.properties b/src/chrome/locale/zh-TW/torbutton.properties
index c73ac319..f573c90a 100644
--- a/src/chrome/locale/zh-TW/torbutton.properties
+++ b/src/chrome/locale/zh-TW/torbutton.properties
@@ -31,9 +31,6 @@ torbutton.popup.confirm_plugins = è«žåŠ Flash çç芜åšå€æçšåŒå¯èœæ
torbutton.popup.never_ask_again = äžèŠååæ
torbutton.popup.confirm_newnym = æŽè¥è·¯ç±ç芜åšå°ééææèŠçªååé ãææå·²ç»å
¥çæ
äžçç¶²ç«è³èšéœå°è¢«æž
é€ã\n\nçŸåšéæ°ååæŽè¥è·¯ç±ç芜åšäŸéæ°èšçœ®æšç身仜ïŒ\n\n
-torbutton.slider_notification = ç¶ è²çæŽè¥éžå®è£¡çŸåšæäžåå®å
šæ»ååšïŒå¯è®æšèª¿æŽæšçå®å
šççŽãå¿«äŸççå§ïŒ
-torbutton.slider_notification_button = éåå®å
šæ§èšå®
-
torbutton.maximize_warning = è¥å°æŽè¥è·¯ç±ç芜åšèŠçªæå€§åïŒå¯èœæè®æé 蚪çç¶²ç«èœå€ åŸç¥æšçè¢å¹å°ºå¯žïŒæ€èå¯èœè¢«å©çšäŸèå¥äžŠè¿œè¹€æšç網路掻åãå æ€æåå»ºè°æšè®æŽè¥è·¯ç±ç芜åšèŠçªä¿æåå§ç倧å°ã
# Canvas permission prompt. Strings are kept here for ease of translation.
1
0
commit 3894b3ff7cb77a8262f85c9eff9d297b1b4885cb
Author: Georg Koppen <gk(a)torproject.org>
Date: Fri Aug 31 04:45:47 2018 +0000
Release preparations for 2.0.5
CHANGELOG update and version bump
---
src/CHANGELOG | 8 ++++++++
src/install.rdf | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/CHANGELOG b/src/CHANGELOG
index 7b464501..3494e98a 100644
--- a/src/CHANGELOG
+++ b/src/CHANGELOG
@@ -1,3 +1,11 @@
+2.0.5
+ * Bug 26962: Circuit display onboarding
+ * Bug 26520: Fix sec slider/NoScript for TOR_SKIP_LAUNCH=1
+ * Bug 26490: Remove the security slider notification
+ * Bug 27301: Improve about:tor behavior and appearance
+ * Bug 27214: Improve the onboarding text
+ * Translations update
+
2.0.4
* Bug 27276: Adapt to new NoScript messaging protocol
* Bug 27097: Add text for Tor News signup widget
diff --git a/src/install.rdf b/src/install.rdf
index d239ea5a..e64cde33 100644
--- a/src/install.rdf
+++ b/src/install.rdf
@@ -6,7 +6,7 @@
<em:name>Torbutton</em:name>
<em:creator>Mike Perry</em:creator>
<em:id>torbutton(a)torproject.org</em:id>
- <em:version>2.0.4</em:version>
+ <em:version>2.0.5</em:version>
<em:multiprocessCompatible>true</em:multiprocessCompatible>
<em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL>
<em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>
1
0

[tor-browser/tor-browser-60.1.0esr-8.0-1] fixup! Bug 23247: Communicating security expectations for .onion
by gk@torproject.org 30 Aug '18
by gk@torproject.org 30 Aug '18
30 Aug '18
commit 4f22857f926d1e35d22709a247cca0aa3f8e560f
Author: Arthur Edelstein <arthuredelstein(a)gmail.com>
Date: Wed Aug 29 21:43:38 2018 -0700
fixup! Bug 23247: Communicating security expectations for .onion
The mixed content blocker should not block a directly-loaded
image from a .onion domain. We need to detect this situation
earlier in nsMixedContentBlocker::ShouldLoad.
---
dom/security/nsMixedContentBlocker.cpp | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/dom/security/nsMixedContentBlocker.cpp b/dom/security/nsMixedContentBlocker.cpp
index 7b0e5088a4de..c8f850e1300c 100644
--- a/dom/security/nsMixedContentBlocker.cpp
+++ b/dom/security/nsMixedContentBlocker.cpp
@@ -726,6 +726,17 @@ nsMixedContentBlocker::ShouldLoad(bool aHadInsecureImageRedirect,
}
}
+ bool isHttpScheme = false;
+ rv = innerContentLocation->SchemeIs("http", &isHttpScheme);
+ NS_ENSURE_SUCCESS(rv, rv);
+
+ // .onion URLs are encrypted and authenticated. Don't treat them as mixed
+ // content if potentially trustworthy (i.e. whitelisted).
+ if (isHttpScheme && IsPotentiallyTrustworthyOnion(innerContentLocation)) {
+ *aDecision = ACCEPT;
+ return NS_OK;
+ }
+
nsCOMPtr<nsIDocShell> docShell = NS_CP_GetDocShellFromContext(aRequestingContext);
NS_ENSURE_TRUE(docShell, NS_OK);
@@ -746,10 +757,6 @@ nsMixedContentBlocker::ShouldLoad(bool aHadInsecureImageRedirect,
return NS_OK;
}
- bool isHttpScheme = false;
- rv = innerContentLocation->SchemeIs("http", &isHttpScheme);
- NS_ENSURE_SUCCESS(rv, rv);
-
// Loopback origins are not considered mixed content even over HTTP. See:
// https://w3c.github.io/webappsec-mixed-content/#should-block-fetch
if (isHttpScheme &&
@@ -758,13 +765,6 @@ nsMixedContentBlocker::ShouldLoad(bool aHadInsecureImageRedirect,
return NS_OK;
}
- // .onion URLs are encrypted and authenticated. Don't treat them as mixed
- // content if potentially trustworthy (i.e. whitelisted).
- if (isHttpScheme && IsPotentiallyTrustworthyOnion(innerContentLocation)) {
- *aDecision = ACCEPT;
- return NS_OK;
- }
-
// The page might have set the CSP directive 'upgrade-insecure-requests'. In such
// a case allow the http: load to succeed with the promise that the channel will
// get upgraded to https before fetching any data from the netwerk.
1
0
commit 7779e8a8dbfa81c01a2fbc3be596f851e54176ad
Author: Georg Koppen <gk(a)torproject.org>
Date: Thu Aug 30 20:49:15 2018 +0000
Bug 27392: Update Moat URLs
---
src/defaults/preferences/prefs.js | 6 +++---
src/install.rdf | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/defaults/preferences/prefs.js b/src/defaults/preferences/prefs.js
index 938e1b8..dcddb1b 100644
--- a/src/defaults/preferences/prefs.js
+++ b/src/defaults/preferences/prefs.js
@@ -46,9 +46,9 @@ pref("extensions.torlauncher.torrc_path", "");
pref("extensions.torlauncher.tordatadir_path", "");
// BridgeDB-related preferences (used for Moat).
-pref("extensions.torlauncher.bridgedb_front", "dontbeevil.appspot.com");
-pref("extensions.torlauncher.bridgedb_reflector", "https://tor-bridges-hyphae-channel.appspot.com");
-pref("extensions.torlauncher.moat_service", "https://bridges.torproject.org/moat");
+pref("extensions.torlauncher.bridgedb_front", "ajax.aspnetcdn.com");
+pref("extensions.torlauncher.bridgedb_reflector", "https://onionquiche.azureedge.net/");
+pref("extensions.torlauncher.moat_service", "https://moat.onionlab.eu/moat");
pref("extensions.torlauncher.bridgedb_bridge_type", "obfs4");
// Recommended default bridge type (can be set per localized bundle).
diff --git a/src/install.rdf b/src/install.rdf
index e7d7cc9..bb5ab52 100644
--- a/src/install.rdf
+++ b/src/install.rdf
@@ -7,7 +7,7 @@
<em:creator>The Tor Project, Inc.</em:creator>
<em:contributor>Pearl Crescent, LLC</em:contributor>
<em:id>tor-launcher(a)torproject.org</em:id>
- <em:version>0.2.16.2</em:version>
+ <em:version>0.2.16.3</em:version>
<em:multiprocessCompatible>true</em:multiprocessCompatible>
<em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL>
<em:updateURL>data:text/plain,</em:updateURL>
1
0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 26381: about:tor page does not load on first start on Windows and
by gk@torproject.org 30 Aug '18
by gk@torproject.org 30 Aug '18
30 Aug '18
commit b8dcb4f1ab5f06017cee025a2ad35cd17d869679
Author: Richard Pospesel <richard(a)torproject.org>
Date: Wed Aug 29 15:27:40 2018 -0700
Bug 26381: about:tor page does not load on first start on Windows and
browser is stuck in endless reload cycle
The problem goes away when the security.sandbox.content.level pref is
set to 2. This patch sets the option on Windows only to work around
this issue until the root cause is found and fixed.
---
browser/app/profile/000-tor-browser.js | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js
index 2b5ebe8cf949..b7c2ff8207f2 100644
--- a/browser/app/profile/000-tor-browser.js
+++ b/browser/app/profile/000-tor-browser.js
@@ -330,6 +330,11 @@ pref("browser.onboarding.newtour", "welcome,privacy,tor-network,circuit-display,
pref("browser.onboarding.updatetour", "welcome,privacy,tor-network,circuit-display,security,expect-differences,onion-services");
pref("browser.onboarding.skip-tour-button.hide", true);
+#ifdef XP_WIN
+// For now, reduce sandboxing level to 2 (see #26381).
+pref("security.sandbox.content.level", 2);
+#endif
+
#ifdef TOR_BROWSER_VERSION
#expand pref("torbrowser.version", __TOR_BROWSER_VERSION__);
#endif
1
0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 26670: Make canvas permission respect FPI
by gk@torproject.org 29 Aug '18
by gk@torproject.org 29 Aug '18
29 Aug '18
commit 79db24856a23ec7ae1f6d8cf46919a499ae5bb9f
Author: Arthur Edelstein <arthuredelstein(a)gmail.com>
Date: Wed Aug 29 09:56:57 2018 -0700
Bug 26670: Make canvas permission respect FPI
---
browser/base/content/browser.js | 21 ++++++++++++---------
dom/canvas/CanvasUtils.cpp | 23 ++++++++++++++++-------
dom/ipc/PBrowser.ipdl | 4 ++--
dom/ipc/TabParent.cpp | 4 ++--
dom/ipc/TabParent.h | 2 +-
5 files changed, 33 insertions(+), 21 deletions(-)
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index fbfbf3e809ca..443619533567 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -6824,7 +6824,7 @@ var CanvasPermissionPromptHelper = {
},
// aSubject is an nsIBrowser (e10s) or an nsIDOMWindow (non-e10s).
- // aData is an URL string.
+ // aData is an Origin string.
observe(aSubject, aTopic, aData) {
if (aTopic != this._permissionsPrompt) {
return;
@@ -6838,7 +6838,6 @@ var CanvasPermissionPromptHelper = {
browser = aSubject.QueryInterface(Ci.nsIBrowser);
}
- let uri = Services.io.newURI(aData);
if (gBrowser.selectedBrowser !== browser) {
// Must belong to some other window.
return;
@@ -6846,17 +6845,21 @@ var CanvasPermissionPromptHelper = {
let message = gNavigatorBundle.getFormattedString("canvas.siteprompt", ["<>"], 1);
- function setCanvasPermission(aURI, aPerm, aPersistent) {
- Services.perms.add(aURI, "canvas", aPerm,
- aPersistent ? Ci.nsIPermissionManager.EXPIRE_NEVER
- : Ci.nsIPermissionManager.EXPIRE_SESSION);
+ let principal = Services.scriptSecurityManager
+ .createCodebasePrincipalFromOrigin(aData);
+
+ function setCanvasPermission(aPerm, aPersistent) {
+ Services.perms.addFromPrincipal(
+ principal, "canvas", aPerm,
+ aPersistent ? Ci.nsIPermissionManager.EXPIRE_NEVER
+ : Ci.nsIPermissionManager.EXPIRE_SESSION);
}
let mainAction = {
label: gNavigatorBundle.getString("canvas.allow"),
accessKey: gNavigatorBundle.getString("canvas.allow.accesskey"),
callback(state) {
- setCanvasPermission(uri, Ci.nsIPermissionManager.ALLOW_ACTION,
+ setCanvasPermission(Ci.nsIPermissionManager.ALLOW_ACTION,
state && state.checkboxChecked);
}
};
@@ -6865,7 +6868,7 @@ var CanvasPermissionPromptHelper = {
label: gNavigatorBundle.getString("canvas.notAllow"),
accessKey: gNavigatorBundle.getString("canvas.notAllow.accesskey"),
callback(state) {
- setCanvasPermission(uri, Ci.nsIPermissionManager.DENY_ACTION,
+ setCanvasPermission(Ci.nsIPermissionManager.DENY_ACTION,
state && state.checkboxChecked);
}
}];
@@ -6881,7 +6884,7 @@ var CanvasPermissionPromptHelper = {
let options = {
checkbox,
- name: uri.asciiHost,
+ name: principal.URI.host,
learnMoreURL: Services.urlFormatter.formatURLPref("app.support.baseURL") + "fingerprint-permission",
};
PopupNotifications.show(browser, aTopic, message, this._notificationIcon,
diff --git a/dom/canvas/CanvasUtils.cpp b/dom/canvas/CanvasUtils.cpp
index 0a8d7f0e2e59..ca8d91d92181 100644
--- a/dom/canvas/CanvasUtils.cpp
+++ b/dom/canvas/CanvasUtils.cpp
@@ -58,8 +58,13 @@ bool IsImageExtractionAllowed(nsIDocument *aDocument, JSContext *aCx)
// Documents with system principal can always extract canvas data.
nsPIDOMWindowOuter *win = aDocument->GetWindow();
nsCOMPtr<nsIScriptObjectPrincipal> sop(do_QueryInterface(win));
- if (sop && nsContentUtils::IsSystemPrincipal(sop->GetPrincipal())) {
- return true;
+ if (!sop) {
+ return false;
+ }
+
+ nsCOMPtr<nsIPrincipal> principal(sop->GetPrincipal());
+ if (principal && nsContentUtils::IsSystemPrincipal(principal)) {
+ return true;
}
// Always give permission to chrome scripts (e.g. Page Inspector).
@@ -127,9 +132,9 @@ bool IsImageExtractionAllowed(nsIDocument *aDocument, JSContext *aCx)
// Check if the site has permission to extract canvas data.
// Either permit or block extraction if a stored permission setting exists.
uint32_t permission;
- rv = permissionManager->TestPermission(topLevelDocURI,
- PERMISSION_CANVAS_EXTRACT_DATA,
- &permission);
+ rv = permissionManager->TestPermissionFromPrincipal(principal,
+ PERMISSION_CANVAS_EXTRACT_DATA,
+ &permission);
NS_ENSURE_SUCCESS(rv, false);
switch (permission) {
case nsIPermissionManager::ALLOW_ACTION:
@@ -165,16 +170,20 @@ bool IsImageExtractionAllowed(nsIDocument *aDocument, JSContext *aCx)
nsContentUtils::LogMessageToConsole(message.get());
// Prompt the user (asynchronous).
+ nsAutoCString origin;
+ rv = principal->GetOrigin(origin);
+ NS_ENSURE_SUCCESS(rv, false);
+
if (XRE_IsContentProcess()) {
TabChild* tabChild = TabChild::GetFrom(win);
if (tabChild) {
- tabChild->SendShowCanvasPermissionPrompt(topLevelDocURISpec);
+ tabChild->SendShowCanvasPermissionPrompt(origin);
}
} else {
nsCOMPtr<nsIObserverService> obs = mozilla::services::GetObserverService();
if (obs) {
obs->NotifyObservers(win, TOPIC_CANVAS_PERMISSIONS_PROMPT,
- NS_ConvertUTF8toUTF16(topLevelDocURISpec).get());
+ NS_ConvertUTF8toUTF16(origin).get());
}
}
diff --git a/dom/ipc/PBrowser.ipdl b/dom/ipc/PBrowser.ipdl
index 024ebc5b6cf7..118eaf15af1f 100644
--- a/dom/ipc/PBrowser.ipdl
+++ b/dom/ipc/PBrowser.ipdl
@@ -579,9 +579,9 @@ parent:
* This function is used to notify the parent that it should display a
* canvas permission prompt.
*
- * @param aFirstPartyURI first party of the tab that is requesting access.
+ * @param aOrigin origin string of the document that is requesting access.
*/
- async ShowCanvasPermissionPrompt(nsCString aFirstPartyURI);
+ async ShowCanvasPermissionPrompt(nsCString aOrigin);
child:
/**
diff --git a/dom/ipc/TabParent.cpp b/dom/ipc/TabParent.cpp
index 86bb854962be..d8f4567626e1 100644
--- a/dom/ipc/TabParent.cpp
+++ b/dom/ipc/TabParent.cpp
@@ -3567,7 +3567,7 @@ TabParent::RecvLookUpDictionary(const nsString& aText,
}
mozilla::ipc::IPCResult
-TabParent::RecvShowCanvasPermissionPrompt(const nsCString& aFirstPartyURI)
+TabParent::RecvShowCanvasPermissionPrompt(const nsCString& aOrigin)
{
nsCOMPtr<nsIBrowser> browser = do_QueryInterface(mFrameElement);
if (!browser) {
@@ -3580,7 +3580,7 @@ TabParent::RecvShowCanvasPermissionPrompt(const nsCString& aFirstPartyURI)
return IPC_FAIL_NO_REASON(this);
}
nsresult rv = os->NotifyObservers(browser, "canvas-permissions-prompt",
- NS_ConvertUTF8toUTF16(aFirstPartyURI).get());
+ NS_ConvertUTF8toUTF16(aOrigin).get());
if (NS_FAILED(rv)) {
return IPC_FAIL_NO_REASON(this);
}
diff --git a/dom/ipc/TabParent.h b/dom/ipc/TabParent.h
index 7d62663835d7..6f3d6de10c10 100644
--- a/dom/ipc/TabParent.h
+++ b/dom/ipc/TabParent.h
@@ -631,7 +631,7 @@ protected:
virtual mozilla::ipc::IPCResult RecvGetTabCount(uint32_t* aValue) override;
- virtual mozilla::ipc::IPCResult RecvShowCanvasPermissionPrompt(const nsCString& aFirstPartyURI) override;
+ virtual mozilla::ipc::IPCResult RecvShowCanvasPermissionPrompt(const nsCString& aOrigin) override;
ContentCacheInParent mContentCache;
1
0

[tor-browser/tor-browser-60.1.0esr-8.0-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk@torproject.org 29 Aug '18
by gk@torproject.org 29 Aug '18
29 Aug '18
commit 3c6862f6cc8a7dc59b9eba41638100638ecb33b0
Author: Georg Koppen <gk(a)torproject.org>
Date: Tue Aug 28 21:51:27 2018 +0000
fixup! TB4: Tor Browser's Firefox preference overrides.
Disable wasm for now until we have it properly reviewed in #21549.
---
browser/app/profile/000-tor-browser.js | 2 ++
1 file changed, 2 insertions(+)
diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js
index 17c9d614b61c..2b5ebe8cf949 100644
--- a/browser/app/profile/000-tor-browser.js
+++ b/browser/app/profile/000-tor-browser.js
@@ -231,6 +231,8 @@ pref("mathml.disabled", false);
// Until we address at least the linkability concerns in #19417 let's disable
// asmjs.
pref("javascript.options.asmjs", false);
+// Unless we audit wasm properly in #21549 let's disable it.
+pref("javascript.options.wasm", false);
// Mozilla keeps still finding critical bugs in Graphite code. Disable it for
// now, see bug 21726.
pref("gfx.font_rendering.graphite.enabled", false);
1
0

[tor-browser/tor-browser-60.1.0esr-8.0-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk@torproject.org 29 Aug '18
by gk@torproject.org 29 Aug '18
29 Aug '18
commit d7442e6576b00951a7e60b97cb3308da17caa996
Author: Georg Koppen <gk(a)torproject.org>
Date: Tue Aug 28 21:57:47 2018 +0000
fixup! TB4: Tor Browser's Firefox preference overrides.
Disable WebVR for now until we have it properly audited in #21607.
---
browser/app/profile/000-tor-browser.js | 1 +
1 file changed, 1 insertion(+)
diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js
index 46c56ea0cede..17c9d614b61c 100644
--- a/browser/app/profile/000-tor-browser.js
+++ b/browser/app/profile/000-tor-browser.js
@@ -151,6 +151,7 @@ pref("media.webspeech.synth.enabled", false); // Bug 10283: Disable SpeechSynthe
pref("dom.webaudio.enabled", false); // Bug 13017: Disable Web Audio API
pref("dom.maxHardwareConcurrency", 1); // Bug 21675: Spoof single-core cpu
pref("dom.w3c_touch_events.enabled", 0); // Bug 10286: Always disable Touch API
+pref("dom.vr.enabled", false); // Bug 21607: Disable WebVR for now
// Disable randomised Firefox HTTP cache decay user test groups (Bug: 13575)
pref("security.webauth.webauthn", false); // Bug 26614: Disable Web Authentication API for now
pref("browser.cache.frecency_experiment", -1);
1
0

[tor-browser/tor-browser-60.1.0esr-8.0-1] squash! Bug 4234: Use the Firefox Update Process for Tor Browser.
by gk@torproject.org 29 Aug '18
by gk@torproject.org 29 Aug '18
29 Aug '18
commit 7b269d1c44ba383444a1bfed3acb67ab3cac5071
Author: Kathy Brade <brade(a)pearlcrescent.com>
Date: Wed Aug 22 13:51:29 2018 -0400
squash! Bug 4234: Use the Firefox Update Process for Tor Browser.
Also fix bug 27221: purge the startup cache if the Tor Browser
version changed (even if the Firefox version and build ID did
not change), e.g., after a minor Tor Browser update.
---
toolkit/xre/nsAppRunner.cpp | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
index d036bc915c80..1000014aedd0 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -3208,6 +3208,13 @@ CheckCompatibility(nsIFile* aProfileDir, const nsCString& aVersion,
if (NS_FAILED(rv) || !aVersion.Equals(buf))
return false;
+#ifdef TOR_BROWSER_VERSION
+ nsAutoCString tbVersion(TOR_BROWSER_VERSION);
+ rv = parser.GetString("Compatibility", "LastTorBrowserVersion", buf);
+ if (NS_FAILED(rv) || !tbVersion.Equals(buf))
+ return false;
+#endif
+
rv = parser.GetString("Compatibility", "LastOSABI", buf);
if (NS_FAILED(rv) || !aOSABI.Equals(buf))
return false;
@@ -3304,6 +3311,13 @@ WriteVersion(nsIFile* aProfileDir, const nsCString& aVersion,
PR_Write(fd, kHeader, sizeof(kHeader) - 1);
PR_Write(fd, aVersion.get(), aVersion.Length());
+#ifdef TOR_BROWSER_VERSION
+ nsAutoCString tbVersion(TOR_BROWSER_VERSION);
+ static const char kTorBrowserVersionHeader[] = NS_LINEBREAK "LastTorBrowserVersion=";
+ PR_Write(fd, kTorBrowserVersionHeader, sizeof(kTorBrowserVersionHeader) - 1);
+ PR_Write(fd, tbVersion.get(), tbVersion.Length());
+#endif
+
static const char kOSABIHeader[] = NS_LINEBREAK "LastOSABI=";
PR_Write(fd, kOSABIHeader, sizeof(kOSABIHeader) - 1);
PR_Write(fd, aOSABI.get(), aOSABI.Length());
1
0

[torbutton/master] Bug 26520: Fix sec slider/NoScript for TOR_SKIP_LAUNCH=1
by gk@torproject.org 29 Aug '18
by gk@torproject.org 29 Aug '18
29 Aug '18
commit 931f0659c42fe317fd8ccae0d9210f8814dcf8ea
Author: Arthur Edelstein <arthuredelstein(a)gmail.com>
Date: Mon Jul 16 17:58:33 2018 -0700
Bug 26520: Fix sec slider/NoScript for TOR_SKIP_LAUNCH=1
We need to wait for NoScript to have launched before we
send the first settings message from the security slider.
So wait for NoScript to send us a message first.
---
src/modules/noscript-control.js | 75 ++++++++++++++++++++++++-----------------
1 file changed, 44 insertions(+), 31 deletions(-)
diff --git a/src/modules/noscript-control.js b/src/modules/noscript-control.js
index 196d14c2..14f78c49 100644
--- a/src/modules/noscript-control.js
+++ b/src/modules/noscript-control.js
@@ -9,6 +9,9 @@ const { LegacyExtensionContext } =
Cu.import("resource://gre/modules/LegacyExtensionsUtils.jsm", {});
const { bindPrefAndInit } =
Cu.import("resource://torbutton/modules/utils.js", {});
+let logger = Components.classes["@torproject.org/torbutton-logger;1"]
+ .getService(Components.interfaces.nsISupports).wrappedJSObject;
+let log = (level, msg) => logger.log(level, msg);
// ## NoScript settings
@@ -80,34 +83,6 @@ let noscriptSettings = safetyLevel => (
// The extension ID for NoScript (WebExtension)
const noscriptID = "{73a6fe31-595d-460b-a920-fcc0f8843232}";
-// A mock extension object that can communicate with another extension
-// via the WebExtensions sendMessage/onMessage mechanism.
-let extensionContext = new LegacyExtensionContext({ id : noscriptID });
-
-// The component that handles WebExtensions' sendMessage.
-let messageManager = extensionContext.messenger.messageManagers[0];
-
-// __setNoScriptSettings(settings)__.
-// NoScript listens for internal settings with onMessage. We can send
-// a new settings JSON object according to NoScript's
-// protocol and these are accepted! See the use of
-// `browser.runtime.onMessage.addListener(...)` in NoScript's bg/main.js.
-let sendNoScriptSettings = settings =>
- extensionContext.messenger.sendMessage(messageManager, settings, noscriptID);
-
-// __setNoScriptSafetyLevel(safetyLevel)__.
-// Set NoScript settings according to a particular safety level
-// (security slider level): 0 = Standard, 1 = Safer, 2 = Safest
-let setNoScriptSafetyLevel = safetyLevel =>
- sendNoScriptSettings(noscriptSettings(safetyLevel));
-
-// ## Slider binding
-
-// __securitySliderToSafetyLevel(sliderState)__.
-// Converts the "extensions.torbutton.security_slider" pref value
-// to a "safety level" value: 0 = Standard, 1 = Safer, 2 = Safest
-let securitySliderToSafetyLevel = sliderState => [undefined, 2, 1, 1, 0][sliderState];
-
// Ensure binding only occurs once.
let initialized = false;
@@ -119,9 +94,47 @@ var initialize = () => {
return;
}
initialized = true;
- bindPrefAndInit(
- "extensions.torbutton.security_slider",
- sliderState => setNoScriptSafetyLevel(securitySliderToSafetyLevel(sliderState)));
+
+ try {
+ // A mock extension object that can communicate with another extension
+ // via the WebExtensions sendMessage/onMessage mechanism.
+ let extensionContext = new LegacyExtensionContext({ id : noscriptID });
+
+ // The component that handles WebExtensions' sendMessage.
+ let messageManager = extensionContext.messenger.messageManagers[0];
+
+ // __setNoScriptSettings(settings)__.
+ // NoScript listens for internal settings with onMessage. We can send
+ // a new settings JSON object according to NoScript's
+ // protocol and these are accepted! See the use of
+ // `browser.runtime.onMessage.addListener(...)` in NoScript's bg/main.js.
+ let sendNoScriptSettings = settings =>
+ extensionContext.messenger.sendMessage(messageManager, settings, noscriptID);
+
+ // __setNoScriptSafetyLevel(safetyLevel)__.
+ // Set NoScript settings according to a particular safety level
+ // (security slider level): 0 = Standard, 1 = Safer, 2 = Safest
+ let setNoScriptSafetyLevel = safetyLevel =>
+ sendNoScriptSettings(noscriptSettings(safetyLevel));
+
+ // __securitySliderToSafetyLevel(sliderState)__.
+ // Converts the "extensions.torbutton.security_slider" pref value
+ // to a "safety level" value: 0 = Standard, 1 = Safer, 2 = Safest
+ let securitySliderToSafetyLevel = sliderState =>
+ [undefined, 2, 1, 1, 0][sliderState];
+
+ // Wait for the first message from NoScript to arrive, and then
+ // bind the security_slider pref to the NoScript settings.
+ let messageListener = (a,b,c) => {
+ extensionContext.api.browser.runtime.onMessage.removeListener(messageListener);
+ bindPrefAndInit(
+ "extensions.torbutton.security_slider",
+ sliderState => setNoScriptSafetyLevel(securitySliderToSafetyLevel(sliderState)));
+ };
+ extensionContext.api.browser.runtime.onMessage.addListener(messageListener);
+ } catch (e) {
+ log(5, e.message);
+ }
};
// Export initialize() function for external use.
1
0

[tor-browser/tor-browser-60.1.0esr-8.0-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk@torproject.org 29 Aug '18
by gk@torproject.org 29 Aug '18
29 Aug '18
commit 6417fe352cdd2275664870ce0003fe3dfd2561eb
Author: Georg Koppen <gk(a)torproject.org>
Date: Tue Aug 28 22:23:19 2018 +0000
fixup! TB4: Tor Browser's Firefox preference overrides.
Disable the Web Authentication API for now until we have it
evaluated in #26614.
---
browser/app/profile/000-tor-browser.js | 1 +
1 file changed, 1 insertion(+)
diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js
index 7a0d26aa53cf..46c56ea0cede 100644
--- a/browser/app/profile/000-tor-browser.js
+++ b/browser/app/profile/000-tor-browser.js
@@ -152,6 +152,7 @@ pref("dom.webaudio.enabled", false); // Bug 13017: Disable Web Audio API
pref("dom.maxHardwareConcurrency", 1); // Bug 21675: Spoof single-core cpu
pref("dom.w3c_touch_events.enabled", 0); // Bug 10286: Always disable Touch API
// Disable randomised Firefox HTTP cache decay user test groups (Bug: 13575)
+pref("security.webauth.webauthn", false); // Bug 26614: Disable Web Authentication API for now
pref("browser.cache.frecency_experiment", -1);
// Third party stuff
1
0

[tor-browser/tor-browser-60.1.0esr-8.0-1] squash! TB4: Tor Browser's Firefox preference overrides.
by gk@torproject.org 29 Aug '18
by gk@torproject.org 29 Aug '18
29 Aug '18
commit cc1c7ef7e3c4767e5a505fe791a9026855384bb4
Author: Georg Koppen <gk(a)torproject.org>
Date: Tue Aug 28 22:32:00 2018 +0000
squash! TB4: Tor Browser's Firefox preference overrides.
Enable ReaderView mode again (#27281).
---
browser/app/profile/000-tor-browser.js | 4 ----
1 file changed, 4 deletions(-)
diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js
index 082b69a11ffe..7a0d26aa53cf 100644
--- a/browser/app/profile/000-tor-browser.js
+++ b/browser/app/profile/000-tor-browser.js
@@ -146,10 +146,6 @@ pref("privacy.resistFingerprinting.block_mozAddonManager", true); // Bug 26114
pref("dom.event.highrestimestamp.enabled", true); // Bug #17046: "Highres" (but truncated) timestamps prevent uptime leaks
pref("privacy.suppressModifierKeyEvents", true); // Bug #17009: Suppress ALT and SHIFT events"
pref("ui.use_standins_for_native_colors", true); // https://bugzilla.mozilla.org/232227
-// Make Reader View users uniform if they really want to use that feature. See
-// bug 18950 for more details.
-pref("browser.reader.detectedFirstArticle", true);
-pref("reader.parse-on-load.enabled", false);
pref("privacy.use_utc_timezone", true);
pref("media.webspeech.synth.enabled", false); // Bug 10283: Disable SpeechSynthesis API
pref("dom.webaudio.enabled", false); // Bug 13017: Disable Web Audio API
1
0

[torbutton/master] Bug 26490: Remove the security slider notification
by gk@torproject.org 28 Aug '18
by gk@torproject.org 28 Aug '18
28 Aug '18
commit 1eb701f4701340c89c9f76ad2eb6ae86ca051e61
Author: Georg Koppen <gk(a)torproject.org>
Date: Mon Aug 27 23:05:08 2018 +0000
Bug 26490: Remove the security slider notification
We now have the onboarding to show users our security slider. We
remove the notification bar on first start as it was a workaround for
that onboarding feature which on some system causes problems with
window size rounding.
---
src/chrome/content/torbutton.js | 29 -----------------------------
src/chrome/locale/en/torbutton.properties | 3 ---
src/defaults/preferences/preferences.js | 1 -
3 files changed, 33 deletions(-)
diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js
index 47621835..3f38830b 100644
--- a/src/chrome/content/torbutton.js
+++ b/src/chrome/content/torbutton.js
@@ -417,7 +417,6 @@ var torbutton_abouttor_message_handler = {
receiveMessage: function(aMessage) {
switch(aMessage.name) {
case "AboutTor:Loaded":
- torbutton_show_sec_slider_notification();
aMessage.target.messageManager.sendAsyncMessage("AboutTor:ChromeData",
this.chromeData);
break;
@@ -598,34 +597,6 @@ function torbutton_check_for_update() {
prompter.checkForUpdates();
}
-function torbutton_show_sec_slider_notification() {
- // Show the notification about the new security slider.
- if (m_tb_prefs.
- getBoolPref("extensions.torbutton.show_slider_notification")) {
- let sb = torbutton_get_stringbundle();
- let button_label =
- torbutton_get_property_string("torbutton.slider_notification_button");
- let box = gBrowser.getNotificationBox();
-
- let buttons = [{
- label: button_label,
- accessKey: 'S',
- popup: null,
- callback: torbutton_open_prefs_dialog,
- }];
-
- let priority = box.PRIORITY_INFO_LOW;
- let message =
- torbutton_get_property_string("torbutton.slider_notification");
-
- box.appendNotification(message, 'new-menu-notification',
- "chrome://torbutton/skin/tor-enabled-16.png",
- priority, buttons);
- m_tb_prefs.
- setBoolPref("extensions.torbutton.show_slider_notification", false);
- }
-}
-
// Bug 1506 P4: Checking for Tor Browser updates is pretty important,
// probably even as a fallback if we ever do get a working updater.
function torbutton_do_async_versioncheck() {
diff --git a/src/chrome/locale/en/torbutton.properties b/src/chrome/locale/en/torbutton.properties
index 60154dbe..f11fb5bf 100644
--- a/src/chrome/locale/en/torbutton.properties
+++ b/src/chrome/locale/en/torbutton.properties
@@ -31,9 +31,6 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
torbutton.popup.never_ask_again = Never ask me again
torbutton.popup.confirm_newnym = Tor Browser will close all windows and tabs. All website sessions will be lost.\n\nRestart Tor Browser now to reset your identity?\n\n
-torbutton.slider_notification = The green onion menu now has a security slider which lets you adjust your security level. Check it out!
-torbutton.slider_notification_button = Open security settings
-
torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size.
# Canvas permission prompt. Strings are kept here for ease of translation.
diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js
index 428e70bc..92d1c106 100644
--- a/src/defaults/preferences/preferences.js
+++ b/src/defaults/preferences/preferences.js
@@ -42,7 +42,6 @@ pref("extensions.torbutton(a)torproject.org.getAddons.cache.enabled", false);
// Security Slider
pref("extensions.torbutton.security_slider", 4);
pref("extensions.torbutton.security_custom", false);
-pref("extensions.torbutton.show_slider_notification", true);
pref("extensions.torbutton.prompt_torbrowser", true);
pref("extensions.torbutton.confirm_plugins", true);
1
0

[tor-browser/tor-browser-60.1.0esr-8.0-1] squash! Bug 4234: Use the Firefox Update Process for Tor Browser.
by gk@torproject.org 28 Aug '18
by gk@torproject.org 28 Aug '18
28 Aug '18
commit 9ec2b75e1639153f064fd751506f86e52979d180
Author: Kathy Brade <brade(a)pearlcrescent.com>
Date: Tue Aug 28 12:12:42 2018 -0400
squash! Bug 4234: Use the Firefox Update Process for Tor Browser.
Also fix Bug 26049: reduce the delay before the update prompt is displayed.
Instead of Firefox's 2 days, we use 1 hour (after which time the update
doorhanger will be displayed).
---
browser/branding/official/pref/firefox-branding.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/browser/branding/official/pref/firefox-branding.js b/browser/branding/official/pref/firefox-branding.js
index c53fe7202788..682da69ffce8 100644
--- a/browser/branding/official/pref/firefox-branding.js
+++ b/browser/branding/official/pref/firefox-branding.js
@@ -11,8 +11,8 @@ pref("app.update.interval", 43200); // 12 hours
// background (in seconds)
// 0 means "download everything at once"
pref("app.update.download.backgroundInterval", 0);
-// Give the user x seconds to react before showing the big UI. default=48 hours
-pref("app.update.promptWaitTime", 172800);
+// Give the user x seconds to react before showing the big UI. default=1 hour
+pref("app.update.promptWaitTime", 3600);
// app.update.url.manual: URL user can browse to manually if for some reason
// all update installation attempts fail.
// app.update.url.details: a default value for the "More information about this
1
0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 26048: potentially confusing "restart to update" message
by gk@torproject.org 28 Aug '18
by gk@torproject.org 28 Aug '18
28 Aug '18
commit 5e9fd4fcc131a2f7d17440c739db26f8c1fc893c
Author: Kathy Brade <brade(a)pearlcrescent.com>
Date: Tue Aug 28 11:58:55 2018 -0400
Bug 26048: potentially confusing "restart to update" message
Within the update doorhanger, remove the misleading message that mentions
that windows will be restored after an update is applied, and replace the
"Restart and Restore" button label with an existing
"Restart to update Tor Browser" string.
---
browser/components/customizableui/content/panelUI.inc.xul | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/browser/components/customizableui/content/panelUI.inc.xul b/browser/components/customizableui/content/panelUI.inc.xul
index 3aab2fd2587d..5891556a6e5f 100644
--- a/browser/components/customizableui/content/panelUI.inc.xul
+++ b/browser/components/customizableui/content/panelUI.inc.xul
@@ -123,7 +123,7 @@
<popupnotification id="appMenu-update-restart-notification"
popupid="update-restart"
label="&updateRestart.header.message2;"
- buttonlabel="&updateRestart.acceptButton.label;"
+ buttonlabel="&updateRestart.header.message2;"
buttonaccesskey="&updateRestart.acceptButton.accesskey;"
closebuttonhidden="true"
secondarybuttonlabel="&updateRestart.cancelButton.label;"
@@ -133,7 +133,7 @@
buttonhighlight="true"
hidden="true">
<popupnotificationcontent id="update-restart-notification-content" orient="vertical">
- <description id="update-restart-description">&updateRestart.message2;</description>
+ <description id="update-restart-description"> </description>
</popupnotificationcontent>
</popupnotification>
</panel>
1
0

28 Aug '18
commit 4028a0c197e516a72125973355505b499a17cebc
Author: Kathy Brade <brade(a)pearlcrescent.com>
Date: Tue Aug 28 14:32:07 2018 -0400
Bug 27214: Improve the onboarding text
---
src/chrome/locale/en/browserOnboarding.properties | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/chrome/locale/en/browserOnboarding.properties b/src/chrome/locale/en/browserOnboarding.properties
index 49085fba..6c2fb0c8 100644
--- a/src/chrome/locale/en/browserOnboarding.properties
+++ b/src/chrome/locale/en/browserOnboarding.properties
@@ -4,37 +4,37 @@
onboarding.tour-tor-welcome=Welcome
onboarding.tour-tor-welcome.title=You’re ready.
-onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You’re now protected against tracking, surveillance, and censorship. This quick onboarding will show you how.
onboarding.tour-tor-welcome.button=Start Now
onboarding.tour-tor-privacy=Privacy
onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
-onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers can’t follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click ‘Tor Network’ to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click ‘Tor Network’ to learn how we protect you on the network level.
onboarding.tour-tor-privacy.button=Go to Tor Network
onboarding.tour-tor-network=Tor Network
onboarding.tour-tor-network.title=Travel a decentralized network.
-onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, there’s no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on ‘Circuit Display’ to learn how they work.
+onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there’s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately.
onboarding.tour-tor-network.button=Go to Circuit Display
onboarding.tour-tor-circuit-display=Circuit Display
onboarding.tour-tor-circuit-display.title=See your path.
-onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking ‘New Circuit for this Site’ on our Circuit Display. Click below to see how it works.
-onboarding.tour-tor-circuit-display.button=Explore
+onboarding.tour-tor-circuit-display.description=For each domain you visit, your traffic is relayed and encrypted in a circuit across three Tor relays around the world. No website knows where you are connecting from. You can request a new circuit by clicking ‘New Circuit for this Site’ on our Circuit Display.
+onboarding.tour-tor-circuit-display.button=See My Path
onboarding.tour-tor-security=Security
onboarding.tour-tor-security.title=Choose your experience.
-onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do.
onboarding.tour-tor-security.button=Review Settings
onboarding.tour-tor-expect-differences=Experience Tips
-onboarding.tour-tor-expect-differences.title=Experience Tips
-onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.title=Expect some differences.
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot.
onboarding.tour-tor-expect-differences.button=See FAQs
onboarding.tour-tor-onion-services=Onion Services
-onboarding.tour-tor-onion-services.title=Onion Services
-onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.title=Be extra protected.
+onboarding.tour-tor-onion-services.description=Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously. Click below to visit the DuckDuckGo onion site.
onboarding.tour-tor-onion-services.button=Visit an Onion
# Circuit Display onboarding.
1
0

[torbutton/master] Bug 27301: Improve about:tor behavior and appearance.
by gk@torproject.org 28 Aug '18
by gk@torproject.org 28 Aug '18
28 Aug '18
commit 3bf17f3f9ca7fd40ed13d40f628384d38ba71368
Author: Kathy Brade <brade(a)pearlcrescent.com>
Date: Tue Aug 28 09:40:39 2018 -0400
Bug 27301: Improve about:tor behavior and appearance.
Change TB Manual link to open in a new tab.
Use a dynamic margin between search box and TB Manual link (10% of viewport).
Add more onion circles to improve appearance on wide displays.
---
src/chrome/content/aboutTor/aboutTor.xhtml | 54 +++++++++++++++++++++++++++++-
src/chrome/skin/aboutTor.css | 6 ++--
2 files changed, 56 insertions(+), 4 deletions(-)
diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml
index c2bbcb25..ecdd0f85 100644
--- a/src/chrome/content/aboutTor/aboutTor.xhtml
+++ b/src/chrome/content/aboutTor/aboutTor.xhtml
@@ -61,7 +61,7 @@ window.addEventListener("pageshow", function() {
<div id="bottom">
<p class="showForManual moreInfoLink">&aboutTor.torbrowser_user_manual_questions.label;
- <a id="manualLink">&aboutTor.torbrowser_user_manual_link.label;</a></p>
+ <a id="manualLink" target="_blank">&aboutTor.torbrowser_user_manual_link.label;</a></p>
<p>&aboutTor.tor_mission.label;
<a href="&aboutTor.getInvolved.link;">&aboutTor.getInvolved.label;</a></p>
</div>
@@ -138,6 +138,26 @@ window.addEventListener("pageshow", function() {
<div class="inner dashed"></div>
<div class="inner dashed"></div>
</div>
+
+ <div class="circle dotted"></div>
+
+ <div class="circle dotted">
+ <div class="inner dotted"></div>
+ <div class="inner dotted"></div>
+ <div class="inner dotted"></div>
+ </div>
+
+ <div class="circle dashed"></div>
+
+ <div class="circle dashed">
+ <div class="inner dashed"></div>
+ <div class="inner dashed"></div>
+ <div class="inner dashed"></div>
+ </div>
+
+ <div class="circle bold"></div>
+
+ <div class="circle solid"></div>
</div>
<div class="onion-pattern-row onion-pattern-offset-row">
@@ -198,6 +218,38 @@ window.addEventListener("pageshow", function() {
</div>
<div class="circle dashed"></div>
+
+ <div class="circle solid"></div>
+
+ <div class="circle dashed">
+ <div class="inner dashed"></div>
+ <div class="inner dashed"></div>
+ <div class="inner dashed"></div>
+ </div>
+
+ <div class="circle border">
+ <div class="inner border"></div>
+ <div class="inner border"></div>
+ <div class="inner border"></div>
+ </div>
+
+ <div class="circle">
+ <div class="half solid"></div>
+ <div class="half solid"></div>
+ </div>
+
+ <div class="circle dotted">
+ <div class="inner dotted"></div>
+ <div class="inner dotted"></div>
+ <div class="inner dotted"></div>
+ </div>
+
+ <div class="circle">
+ <div class="half solid"></div>
+ <div class="half dotted"></div>
+ </div>
+
+ <div class="circle dotted"></div>
</div>
</div>
</body>
diff --git a/src/chrome/skin/aboutTor.css b/src/chrome/skin/aboutTor.css
index 02a81744..c402bbed 100644
--- a/src/chrome/skin/aboutTor.css
+++ b/src/chrome/skin/aboutTor.css
@@ -119,7 +119,7 @@ body:not([showmanual]) .showForManual {
}
#bottom {
- margin-top: 170px;
+ margin-top: 10vh;
}
#bottom p {
@@ -196,12 +196,12 @@ body:not([showmanual]) .showForManual {
.onion-pattern-container {
margin: 0px auto;
width: 100%;
- max-width: 1624px; /* room for 14 of the widest circles */
+ max-width: 2200px; /* room for our 20 circles */
overflow: hidden;
}
.onion-pattern-row {
- width: 1624px;
+ width: 2200px;
display: flex;
flex-direction: row;
position: relative;
1
0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 21787: Spoof en-US for date picker
by gk@torproject.org 27 Aug '18
by gk@torproject.org 27 Aug '18
27 Aug '18
commit 7150252e7a0213aeddfe3c0aed294aae4cfcb3b8
Author: Arthur Edelstein <arthuredelstein(a)gmail.com>
Date: Mon Aug 20 15:42:08 2018 -0700
Bug 21787: Spoof en-US for date picker
When privacy.spoof_english === 2, then en-US spoofing is enabled.
In that case, make sure the date picker does not leak the locale.
---
dom/base/IntlUtils.cpp | 5 ++++
dom/base/IntlUtils.h | 2 ++
dom/webidl/IntlUtils.webidl | 6 +++++
toolkit/content/widgets/datetimebox.xml | 43 +++++++++++++++++--------------
toolkit/content/widgets/datetimepopup.xml | 3 ++-
5 files changed, 39 insertions(+), 20 deletions(-)
diff --git a/dom/base/IntlUtils.cpp b/dom/base/IntlUtils.cpp
index 9fc21414fd58..89f2ebbdc026 100644
--- a/dom/base/IntlUtils.cpp
+++ b/dom/base/IntlUtils.cpp
@@ -141,5 +141,10 @@ IntlUtils::GetLocaleInfo(const Sequence<nsString>& aLocales,
}
}
+bool
+IntlUtils::SpoofEnglish() const {
+ return Preferences::GetInt("privacy.spoof_english", 0) == 2;
+}
+
} // dom namespace
} // mozilla namespace
diff --git a/dom/base/IntlUtils.h b/dom/base/IntlUtils.h
index 76875497f293..55d8e823abfd 100644
--- a/dom/base/IntlUtils.h
+++ b/dom/base/IntlUtils.h
@@ -47,6 +47,8 @@ public:
mozilla::dom::LocaleInfo& aResult,
mozilla::ErrorResult& aError);
+ bool SpoofEnglish() const;
+
private:
~IntlUtils();
diff --git a/dom/webidl/IntlUtils.webidl b/dom/webidl/IntlUtils.webidl
index c70e0f955c82..1fea1735997c 100644
--- a/dom/webidl/IntlUtils.webidl
+++ b/dom/webidl/IntlUtils.webidl
@@ -70,4 +70,10 @@ interface IntlUtils {
*/
[Throws]
LocaleInfo getLocaleInfo(sequence<DOMString> locales);
+
+ /**
+ * Attribute that indicates whether the user has chosen
+ * to spoof the locale as en-US in content.
+ */
+ readonly attribute boolean spoofEnglish;
};
diff --git a/toolkit/content/widgets/datetimebox.xml b/toolkit/content/widgets/datetimebox.xml
index 2a7cdd50f64d..f4bb32ca35e7 100644
--- a/toolkit/content/widgets/datetimebox.xml
+++ b/toolkit/content/widgets/datetimebox.xml
@@ -27,13 +27,13 @@
<constructor>
<![CDATA[
/* eslint-disable no-multi-spaces */
- this.mYearPlaceHolder = ]]>"&date.year.placeholder;"<![CDATA[;
- this.mMonthPlaceHolder = ]]>"&date.month.placeholder;"<![CDATA[;
- this.mDayPlaceHolder = ]]>"&date.day.placeholder;"<![CDATA[;
+ this.mYearPlaceHolder = this.mSpoofEnglish ? "yyyy" : ]]>"&date.year.placeholder;"<![CDATA[;
+ this.mMonthPlaceHolder = this.mSpoofEnglish ? "mm" : ]]>"&date.month.placeholder;"<![CDATA[;
+ this.mDayPlaceHolder = this.mSpoofEnglish ? "dd" : ]]>"&date.day.placeholder;"<![CDATA[;
- this.mYearLabel = ]]>"&date.year.label;"<![CDATA[;
- this.mMonthLabel = ]]>"&date.month.label;"<![CDATA[;
- this.mDayLabel = ]]>"&date.day.label;"<![CDATA[;
+ this.mYearLabel = this.mSpoofEnglish ? "Year" : ]]>"&date.year.label;"<![CDATA[;
+ this.mMonthLabel = this.mSpoofEnglish ? "Month" : ]]>"&date.month.label;"<![CDATA[;
+ this.mDayLabel = this.mSpoofEnglish ? "Day" : ]]>"&date.day.label;"<![CDATA[;
/* eslint-enable no-multi-spaces */
this.mMinMonth = 1;
@@ -451,17 +451,17 @@
this.mPMIndicator = pmString || kDefaultPMString;
/* eslint-disable no-multi-spaces */
- this.mHourPlaceHolder = ]]>"&time.hour.placeholder;"<![CDATA[;
- this.mMinutePlaceHolder = ]]>"&time.minute.placeholder;"<![CDATA[;
- this.mSecondPlaceHolder = ]]>"&time.second.placeholder;"<![CDATA[;
- this.mMillisecPlaceHolder = ]]>"&time.millisecond.placeholder;"<![CDATA[;
- this.mDayPeriodPlaceHolder = ]]>"&time.dayperiod.placeholder;"<![CDATA[;
-
- this.mHourLabel = ]]>"&time.hour.label;"<![CDATA[;
- this.mMinuteLabel = ]]>"&time.minute.label;"<![CDATA[;
- this.mSecondLabel = ]]>"&time.second.label;"<![CDATA[;
- this.mMillisecLabel = ]]>"&time.millisecond.label;"<![CDATA[;
- this.mDayPeriodLabel = ]]>"&time.dayperiod.label;"<![CDATA[;
+ this.mHourPlaceHolder = this.mSpoofEnglish ? "--" : ]]>"&time.hour.placeholder;"<![CDATA[;
+ this.mMinutePlaceHolder = this.mSpoofEnglish ? "--" : ]]>"&time.minute.placeholder;"<![CDATA[;
+ this.mSecondPlaceHolder = this.mSpoofEnglish ? "--" : ]]>"&time.second.placeholder;"<![CDATA[;
+ this.mMillisecPlaceHolder = this.mSpoofEnglish ? "--" : ]]>"&time.millisecond.placeholder;"<![CDATA[;
+ this.mDayPeriodPlaceHolder = this.mSpoofEnglish ? "--" : ]]>"&time.dayperiod.placeholder;"<![CDATA[;
+
+ this.mHourLabel = this.mSpoofEnglish ? "Hours" : ]]>"&time.hour.label;"<![CDATA[;
+ this.mMinuteLabel = this.mSpoofEnglish ? "Minutes" :]]>"&time.minute.label;"<![CDATA[;
+ this.mSecondLabel = this.mSpoofEnglish ? "Seconds" :]]>"&time.second.label;"<![CDATA[;
+ this.mMillisecLabel = this.mSpoofEnglish ? "Milliseconds" :]]>"&time.millisecond.label;"<![CDATA[;
+ this.mDayPeriodLabel = this.mSpoofEnglish ? "AM/PM" :]]>"&time.dayperiod.label;"<![CDATA[;
/* eslint-enable no-multi-spaces */
this.mHour12 = this.is12HourTime(this.mLocales);
@@ -1218,10 +1218,11 @@
<![CDATA[
this.DEBUG = false;
this.mInputElement = this.parentNode;
- this.mLocales = window.getRegionalPrefsLocales();
+ let intlUtils = window.intlUtils;
+ this.mSpoofEnglish = intlUtils.spoofEnglish;
+ this.mLocales = this.mSpoofEnglish ? ["en-US"] : window.getRegionalPrefsLocales();
this.mIsRTL = false;
- let intlUtils = window.intlUtils;
if (intlUtils) {
this.mIsRTL =
intlUtils.getLocaleInfo(this.mLocales).direction === "rtl";
@@ -1242,6 +1243,10 @@
this.mResetButton =
document.getAnonymousElementByAttribute(this, "anonid", "reset-button");
this.mResetButton.style.visibility = "hidden";
+ if (this.mSpoofEnglish) {
+ // Use the US English version of datetime.reset.label.
+ this.mResetButton.setAttribute("aria-label", "Clear");
+ }
this.EVENTS.forEach((eventName) => {
this.addEventListener(eventName, this, { mozSystemGroup: true }, false);
diff --git a/toolkit/content/widgets/datetimepopup.xml b/toolkit/content/widgets/datetimepopup.xml
index ddbdd9dd0fd3..e9fef1234929 100644
--- a/toolkit/content/widgets/datetimepopup.xml
+++ b/toolkit/content/widgets/datetimepopup.xml
@@ -110,7 +110,8 @@
<body><
[tor-browser/tor-browser-60.1.0esr-8.0-1] fixup! Bug 26961: New user onboarding.
by gk@torproject.org 27 Aug '18
by gk@torproject.org 27 Aug '18
27 Aug '18
commit 27553c4c6684f10ede89eb39be07f09cea5bcc75
Author: Kathy Brade <brade(a)pearlcrescent.com>
Date: Mon Aug 27 16:57:42 2018 -0400
fixup! Bug 26961: New user onboarding.
---
.../onboarding/content/img/icons_tour-complete.png | Bin 1221 -> 694 bytes
.../onboarding/content/img/icons_tour-complete.svg | 4 ++--
browser/extensions/onboarding/content/onboarding.css | 8 ++++----
browser/extensions/onboarding/content/onboarding.js | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/browser/extensions/onboarding/content/img/icons_tour-complete.png b/browser/extensions/onboarding/content/img/icons_tour-complete.png
index 80b76a9bc682..8802bf083ed3 100644
Binary files a/browser/extensions/onboarding/content/img/icons_tour-complete.png and b/browser/extensions/onboarding/content/img/icons_tour-complete.png differ
diff --git a/browser/extensions/onboarding/content/img/icons_tour-complete.svg b/browser/extensions/onboarding/content/img/icons_tour-complete.svg
index 173e72c332df..761c31cbf9d0 100644
--- a/browser/extensions/onboarding/content/img/icons_tour-complete.svg
+++ b/browser/extensions/onboarding/content/img/icons_tour-complete.svg
@@ -8,10 +8,10 @@
<g id="Tips-/-Navigation" transform="translate(-30.000000, -117.000000)" stroke-width="2">
<g id="Group">
<g id="Tip-/-Check" transform="translate(30.000000, 117.000000)">
- <circle id="Oval-2" stroke="#FFFFFF" fill="#33F70C" fill-rule="evenodd" cx="10" cy="10" r="9"></circle>
+ <circle id="Oval-2" stroke="#FFFFFF" fill="#00DDB3" fill-rule="evenodd" cx="10" cy="10" r="9"></circle>
<polyline id="Path-31" stroke="#165866" stroke-linecap="round" stroke-linejoin="round" points="5.5 10.5 8.5 13.5 14.5 6.5"></polyline>
</g>
</g>
</g>
</g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/browser/extensions/onboarding/content/onboarding.css b/browser/extensions/onboarding/content/onboarding.css
index a7fb2b405b55..fa5f58975c3a 100644
--- a/browser/extensions/onboarding/content/onboarding.css
+++ b/browser/extensions/onboarding/content/onboarding.css
@@ -315,15 +315,15 @@
line-height: 22px;
padding-inline-start: 40px;
padding-inline-end: 28px;
- max-height: 360px;
+ max-height: 370px;
overflow: auto;
}
.onboarding-tour-description > h1 {
- font-size: 36px;
- margin-top: 16px;
+ font-size: 30px;
+ margin: 16px 0px 10px 0px;
font-weight: 300;
- line-height: 44px;
+ line-height: 36px;
color: #420c5d;
}
diff --git a/browser/extensions/onboarding/content/onboarding.js b/browser/extensions/onboarding/content/onboarding.js
index de382ac34890..1f46abdb722d 100644
--- a/browser/extensions/onboarding/content/onboarding.js
+++ b/browser/extensions/onboarding/content/onboarding.js
@@ -218,7 +218,7 @@ var onboardingTourset = {
"onboarding-tour-tor-onion-services-button",
"onboarding.tour-tor-onion-services.button", "a");
let anchor = button.querySelector("a");
- anchor.setAttribute("href", "https://www.nytimes3xbfgragh.onion/");
+ anchor.setAttribute("href", "https://3g2upl4pq6kufc4m.onion/");
anchor.setAttribute("target", "_blank");
return div;
1
0
commit 360427812f7953864a85ffdde8382f6b76105ace
Author: Arthur Edelstein <arthuredelstein(a)gmail.com>
Date: Mon Aug 27 14:29:29 2018 -0700
Bug 27097: Remove aboutTor.properties
This file is no longer used. Move needed strings to aboutTor.dtd
---
src/chrome/locale/af/aboutTor.properties | 15 ---------------
src/chrome/locale/ak/aboutTor.properties | 15 ---------------
src/chrome/locale/am/aboutTor.properties | 15 ---------------
src/chrome/locale/ar/aboutTor.properties | 17 -----------------
src/chrome/locale/arn/aboutTor.properties | 15 ---------------
src/chrome/locale/ast/aboutTor.properties | 15 ---------------
src/chrome/locale/az/aboutTor.properties | 15 ---------------
src/chrome/locale/be/aboutTor.properties | 15 ---------------
src/chrome/locale/bg/aboutTor.properties | 15 ---------------
src/chrome/locale/bms/aboutTor.properties | 15 ---------------
src/chrome/locale/bn-BD/aboutTor.properties | 17 -----------------
src/chrome/locale/bn-IN/aboutTor.properties | 15 ---------------
src/chrome/locale/bn/aboutTor.properties | 15 ---------------
src/chrome/locale/bo/aboutTor.properties | 15 ---------------
src/chrome/locale/br/aboutTor.properties | 15 ---------------
src/chrome/locale/bs/aboutTor.properties | 15 ---------------
src/chrome/locale/ca/aboutTor.properties | 17 -----------------
src/chrome/locale/cs/aboutTor.properties | 15 ---------------
src/chrome/locale/csb/aboutTor.properties | 15 ---------------
src/chrome/locale/cy/aboutTor.properties | 15 ---------------
src/chrome/locale/da/aboutTor.properties | 17 -----------------
src/chrome/locale/de/aboutTor.properties | 17 -----------------
src/chrome/locale/dz/aboutTor.properties | 15 ---------------
src/chrome/locale/el/aboutTor.properties | 15 ---------------
src/chrome/locale/en/aboutTor.dtd | 3 +++
src/chrome/locale/en/aboutTor.properties | 17 -----------------
src/chrome/locale/eo/aboutTor.properties | 15 ---------------
src/chrome/locale/es/aboutTor.properties | 17 -----------------
src/chrome/locale/et/aboutTor.properties | 15 ---------------
src/chrome/locale/eu/aboutTor.properties | 17 -----------------
src/chrome/locale/fa/aboutTor.properties | 17 -----------------
src/chrome/locale/fi/aboutTor.properties | 15 ---------------
src/chrome/locale/fil/aboutTor.properties | 15 ---------------
src/chrome/locale/fo/aboutTor.properties | 15 ---------------
src/chrome/locale/fr/aboutTor.properties | 17 -----------------
src/chrome/locale/fur/aboutTor.properties | 15 ---------------
src/chrome/locale/fy/aboutTor.properties | 15 ---------------
src/chrome/locale/ga/aboutTor.properties | 17 -----------------
src/chrome/locale/gl/aboutTor.properties | 15 ---------------
src/chrome/locale/gu/aboutTor.properties | 15 ---------------
src/chrome/locale/gun/aboutTor.properties | 15 ---------------
src/chrome/locale/ha/aboutTor.properties | 15 ---------------
src/chrome/locale/he/aboutTor.properties | 17 -----------------
src/chrome/locale/hi/aboutTor.properties | 15 ---------------
src/chrome/locale/hr/aboutTor.properties | 15 ---------------
src/chrome/locale/ht/aboutTor.properties | 15 ---------------
src/chrome/locale/hu/aboutTor.properties | 15 ---------------
src/chrome/locale/hy/aboutTor.properties | 15 ---------------
src/chrome/locale/id/aboutTor.properties | 17 -----------------
src/chrome/locale/is/aboutTor.properties | 17 -----------------
src/chrome/locale/it/aboutTor.properties | 17 -----------------
src/chrome/locale/ja/aboutTor.properties | 17 -----------------
src/chrome/locale/jv/aboutTor.properties | 15 ---------------
src/chrome/locale/ka/aboutTor.properties | 15 ---------------
src/chrome/locale/km/aboutTor.properties | 15 ---------------
src/chrome/locale/kn/aboutTor.properties | 15 ---------------
src/chrome/locale/ko/aboutTor.properties | 17 -----------------
src/chrome/locale/ku/aboutTor.properties | 15 ---------------
src/chrome/locale/kw/aboutTor.properties | 15 ---------------
src/chrome/locale/ky/aboutTor.properties | 15 ---------------
src/chrome/locale/lb/aboutTor.properties | 15 ---------------
src/chrome/locale/lg/aboutTor.properties | 15 ---------------
src/chrome/locale/ln/aboutTor.properties | 15 ---------------
src/chrome/locale/lo/aboutTor.properties | 15 ---------------
src/chrome/locale/lt/aboutTor.properties | 15 ---------------
src/chrome/locale/lv/aboutTor.properties | 15 ---------------
src/chrome/locale/mg/aboutTor.properties | 15 ---------------
src/chrome/locale/mi/aboutTor.properties | 15 ---------------
src/chrome/locale/mk/aboutTor.properties | 15 ---------------
src/chrome/locale/ml/aboutTor.properties | 15 ---------------
src/chrome/locale/mn/aboutTor.properties | 15 ---------------
src/chrome/locale/mr/aboutTor.properties | 15 ---------------
src/chrome/locale/ms/aboutTor.properties | 15 ---------------
src/chrome/locale/mt/aboutTor.properties | 15 ---------------
src/chrome/locale/my/aboutTor.properties | 15 ---------------
src/chrome/locale/nah/aboutTor.properties | 15 ---------------
src/chrome/locale/nap/aboutTor.properties | 15 ---------------
src/chrome/locale/nb/aboutTor.properties | 17 -----------------
src/chrome/locale/ne/aboutTor.properties | 15 ---------------
src/chrome/locale/nl/aboutTor.properties | 17 -----------------
src/chrome/locale/nn/aboutTor.properties | 15 ---------------
src/chrome/locale/nso/aboutTor.properties | 15 ---------------
src/chrome/locale/oc/aboutTor.properties | 15 ---------------
src/chrome/locale/or/aboutTor.properties | 15 ---------------
src/chrome/locale/pa/aboutTor.properties | 15 ---------------
src/chrome/locale/pap/aboutTor.properties | 15 ---------------
src/chrome/locale/pl/aboutTor.properties | 17 -----------------
src/chrome/locale/pms/aboutTor.properties | 15 ---------------
src/chrome/locale/ps/aboutTor.properties | 15 ---------------
src/chrome/locale/pt-BR/aboutTor.properties | 17 -----------------
src/chrome/locale/pt/aboutTor.properties | 28 ----------------------------
src/chrome/locale/ro/aboutTor.properties | 15 ---------------
src/chrome/locale/ru/aboutTor.properties | 17 -----------------
src/chrome/locale/sco/aboutTor.properties | 15 ---------------
src/chrome/locale/sk/aboutTor.properties | 15 ---------------
src/chrome/locale/sl/aboutTor.properties | 15 ---------------
src/chrome/locale/so/aboutTor.properties | 15 ---------------
src/chrome/locale/son/aboutTor.properties | 15 ---------------
src/chrome/locale/sq/aboutTor.properties | 15 ---------------
src/chrome/locale/sr/aboutTor.properties | 15 ---------------
src/chrome/locale/st/aboutTor.properties | 15 ---------------
src/chrome/locale/su/aboutTor.properties | 15 ---------------
src/chrome/locale/sv/aboutTor.properties | 17 -----------------
src/chrome/locale/sw/aboutTor.properties | 15 ---------------
src/chrome/locale/ta/aboutTor.properties | 15 ---------------
src/chrome/locale/te/aboutTor.properties | 15 ---------------
src/chrome/locale/tg/aboutTor.properties | 15 ---------------
src/chrome/locale/th/aboutTor.properties | 15 ---------------
src/chrome/locale/ti/aboutTor.properties | 15 ---------------
src/chrome/locale/tk/aboutTor.properties | 15 ---------------
src/chrome/locale/tr/aboutTor.properties | 17 -----------------
src/chrome/locale/uk/aboutTor.properties | 15 ---------------
src/chrome/locale/ur/aboutTor.properties | 15 ---------------
src/chrome/locale/ve/aboutTor.properties | 15 ---------------
src/chrome/locale/vi/aboutTor.properties | 17 -----------------
src/chrome/locale/wa/aboutTor.properties | 15 ---------------
src/chrome/locale/wo/aboutTor.properties | 15 ---------------
src/chrome/locale/zh-CN/aboutTor.properties | 17 -----------------
src/chrome/locale/zh-HK/aboutTor.properties | 15 ---------------
src/chrome/locale/zh-TW/aboutTor.properties | 17 -----------------
src/chrome/locale/zu/aboutTor.properties | 15 ---------------
trans_tools/import-translations.sh | 1 -
122 files changed, 3 insertions(+), 1868 deletions(-)
diff --git a/src/chrome/locale/af/aboutTor.properties b/src/chrome/locale/af/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/af/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/ak/aboutTor.properties b/src/chrome/locale/ak/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/ak/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/am/aboutTor.properties b/src/chrome/locale/am/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/am/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/ar/aboutTor.properties b/src/chrome/locale/ar/aboutTor.properties
deleted file mode 100644
index fefde5e4..00000000
--- a/src/chrome/locale/ar/aboutTor.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright (c) 2018, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.donationBanner.donate=تبرع الآن
-
-aboutTor.donationBanner.slogan=تور: دعم الصمود الرقمي
-aboutTor.donationBanner.mozilla=أعطِ اليوم وموزيلا ستعطي مثلك
-
-aboutTor.donationBanner.tagline1=يحمي الصحفيين، وكاشفي الفساد، والنُشطاء منذ ٢٠٠٦
-aboutTor.donationBanner.tagline2=حرية التواصل الشبكي العالمية
-aboutTor.donationBanner.tagline3=الحرية على الإنترنت
-aboutTor.donationBanner.tagline4=يعزّز حرية التعبير عالميًا
-aboutTor.donationBanner.tagline5=يحمي خصوصية الملايين من الأشخاص كل يوم
-
-aboutTor.newsletter.tagline=Get the latest news from Tor straight to your inbox.
-aboutTor.newsletter.link_text=Sign up for Tor News.
diff --git a/src/chrome/locale/arn/aboutTor.properties b/src/chrome/locale/arn/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/arn/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/ast/aboutTor.properties b/src/chrome/locale/ast/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/ast/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/az/aboutTor.properties b/src/chrome/locale/az/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/az/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/be/aboutTor.properties b/src/chrome/locale/be/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/be/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/bg/aboutTor.properties b/src/chrome/locale/bg/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/bg/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/bms/aboutTor.properties b/src/chrome/locale/bms/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/bms/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/bn-BD/aboutTor.properties b/src/chrome/locale/bn-BD/aboutTor.properties
deleted file mode 100644
index 50f23afa..00000000
--- a/src/chrome/locale/bn-BD/aboutTor.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright (c) 2018, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.donationBanner.donate=এখনি দান করো!
-
-aboutTor.donationBanner.slogan=টর: ডিজিটাল প্রতিরোধ ক্ষমতা
-aboutTor.donationBanner.mozilla=আজ দিন এবং মজিলা আপনার উপহারের সাথে মেলে!
-
-aboutTor.donationBanner.tagline1=2006 সাল থেকে সাংবাদিকদের রক্ষা, হুইসল ব্লোয়ার্স এবং অ্যাক্টিভিস্টরা
-aboutTor.donationBanner.tagline2=নেটওয়ার্কিং স্বাধীনতা বিশ্বব্যাপী
-aboutTor.donationBanner.tagline3=ফ্রিডম অনলাইন
-aboutTor.donationBanner.tagline4=বিশ্বব্যাপী বিনামূল্যে অভিবাদন উত্সাহদান
-aboutTor.donationBanner.tagline5=প্রতি দিন লক্ষ লক্ষ গোপনীয়তা রক্ষা করুন
-
-aboutTor.newsletter.tagline=Get the latest news from Tor straight to your inbox.
-aboutTor.newsletter.link_text=Sign up for Tor News.
diff --git a/src/chrome/locale/bn-IN/aboutTor.properties b/src/chrome/locale/bn-IN/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/bn-IN/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/bn/aboutTor.properties b/src/chrome/locale/bn/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/bn/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/bo/aboutTor.properties b/src/chrome/locale/bo/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/bo/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/br/aboutTor.properties b/src/chrome/locale/br/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/br/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/bs/aboutTor.properties b/src/chrome/locale/bs/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/bs/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/ca/aboutTor.properties b/src/chrome/locale/ca/aboutTor.properties
deleted file mode 100644
index 855044aa..00000000
--- a/src/chrome/locale/ca/aboutTor.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright (c) 2018, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.donationBanner.donate=Fes una donació ara!
-
-aboutTor.donationBanner.slogan=Tor: Potenciant la resistència digital
-aboutTor.donationBanner.mozilla=Dona avui i Mozilla us recompensarà!
-
-aboutTor.donationBanner.tagline1=Protegint periodistes, denunciants i activistes des de 2006
-aboutTor.donationBanner.tagline2=Interconectant llibertat global
-aboutTor.donationBanner.tagline3=Llibertat online
-aboutTor.donationBanner.tagline4=Fomentant la lliure expresió global
-aboutTor.donationBanner.tagline5=Protegint la Privacitat de milions de persones cada dia
-
-aboutTor.newsletter.tagline=Get the latest news from Tor straight to your inbox.
-aboutTor.newsletter.link_text=Sign up for Tor News.
diff --git a/src/chrome/locale/cs/aboutTor.properties b/src/chrome/locale/cs/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/cs/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/csb/aboutTor.properties b/src/chrome/locale/csb/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/csb/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/cy/aboutTor.properties b/src/chrome/locale/cy/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/cy/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/da/aboutTor.properties b/src/chrome/locale/da/aboutTor.properties
deleted file mode 100644
index 1f542f2a..00000000
--- a/src/chrome/locale/da/aboutTor.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright (c) 2018, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.donationBanner.donate=Donér nu!
-
-aboutTor.donationBanner.slogan=Tor: Styrker digital oprør
-aboutTor.donationBanner.mozilla=Giv i dag og Mozilla vil matche din gave!
-
-aboutTor.donationBanner.tagline1=Beskytter journalister, whistleblowers og aktivister siden 2006
-aboutTor.donationBanner.tagline2=Sammenarbejder for frihed verden over
-aboutTor.donationBanner.tagline3=Frihed online
-aboutTor.donationBanner.tagline4=Fremmer ytringsfrihed verden over
-aboutTor.donationBanner.tagline5=Beskytter privatlivet af millioner hver dag
-
-aboutTor.newsletter.tagline=Get the latest news from Tor straight to your inbox.
-aboutTor.newsletter.link_text=Sign up for Tor News.
diff --git a/src/chrome/locale/de/aboutTor.properties b/src/chrome/locale/de/aboutTor.properties
deleted file mode 100644
index 6c787679..00000000
--- a/src/chrome/locale/de/aboutTor.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright (c) 2018, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.donationBanner.donate=Jetzt spenden!
-
-aboutTor.donationBanner.slogan=Tor: Digitalen Widerstand stärken
-aboutTor.donationBanner.mozilla=Spenden Sie heute und Mozilla wird Ihr Geschenk anpassen
-
-aboutTor.donationBanner.tagline1=Schützt seit 2006 Journalisten, Whistleblower & Aktivisten
-aboutTor.donationBanner.tagline2=Weltweite Vernetzungsfreiheit
-aboutTor.donationBanner.tagline3=Freiheit online
-aboutTor.donationBanner.tagline4=Fördert weltweit freie Meinungsäußerung.
-aboutTor.donationBanner.tagline5=Schützt täglich die Privatsphäre von Millionen.
-
-aboutTor.newsletter.tagline=Get the latest news from Tor straight to your inbox.
-aboutTor.newsletter.link_text=Sign up for Tor News.
diff --git a/src/chrome/locale/dz/aboutTor.properties b/src/chrome/locale/dz/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/dz/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/el/aboutTor.properties b/src/chrome/locale/el/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/el/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/en/aboutTor.dtd b/src/chrome/locale/en/aboutTor.dtd
index 3eecc0bc..1400d7b5 100644
--- a/src/chrome/locale/en/aboutTor.dtd
+++ b/src/chrome/locale/en/aboutTor.dtd
@@ -23,3 +23,6 @@
<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
<!ENTITY aboutTor.getInvolved.label "Get Involved »">
<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en">
+
+<!ENTITY aboutTor.newsletter.tagline "Get the latest news from Tor straight to your inbox.">
+<!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News.">
diff --git a/src/chrome/locale/en/aboutTor.properties b/src/chrome/locale/en/aboutTor.properties
deleted file mode 100644
index c039f4cd..00000000
--- a/src/chrome/locale/en/aboutTor.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright (c) 2018, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.donationBanner.donate=Donate Now!
-
-aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance
-aboutTor.donationBanner.mozilla=Give today and Mozilla will match your gift!
-
-aboutTor.donationBanner.tagline1=Protecting Journalists, Whistleblowers, & Activists Since 2006
-aboutTor.donationBanner.tagline2=Networking Freedom Worldwide
-aboutTor.donationBanner.tagline3=Freedom Online
-aboutTor.donationBanner.tagline4=Fostering Free Expression Worldwide
-aboutTor.donationBanner.tagline5=Protecting the Privacy of Millions Every Day
-
-aboutTor.newsletter.tagline=Get the latest news from Tor straight to your inbox.
-aboutTor.newsletter.link_text=Sign up for Tor News.
diff --git a/src/chrome/locale/eo/aboutTor.properties b/src/chrome/locale/eo/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/eo/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/es/aboutTor.properties b/src/chrome/locale/es/aboutTor.properties
deleted file mode 100644
index bbc51ff7..00000000
--- a/src/chrome/locale/es/aboutTor.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright (c) 2018, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.donationBanner.donate=¡Dona ahora!
-
-aboutTor.donationBanner.slogan=Tor: Impulsando la resistencia digital
-aboutTor.donationBanner.mozilla=¡Dona hoy y Mozilla te la igualará!
-
-aboutTor.donationBanner.tagline1=Protegiendo a periodistas, informantes, y activistas desde 2006
-aboutTor.donationBanner.tagline2=Libertad de interconexión por todo el mundo
-aboutTor.donationBanner.tagline3=Libertad en la red
-aboutTor.donationBanner.tagline4=Fomentando la libertad de expresión por todo el mundo
-aboutTor.donationBanner.tagline5=Protegiendo la privacidad de millones de personas cada día
-
-aboutTor.newsletter.tagline=Get the latest news from Tor straight to your inbox.
-aboutTor.newsletter.link_text=Sign up for Tor News.
diff --git a/src/chrome/locale/et/aboutTor.properties b/src/chrome/locale/et/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/et/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/eu/aboutTor.properties b/src/chrome/locale/eu/aboutTor.properties
deleted file mode 100644
index 6ad8c032..00000000
--- a/src/chrome/locale/eu/aboutTor.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright (c) 2018, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.donationBanner.donate=Eman dohaintza orain!
-
-aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance
-aboutTor.donationBanner.mozilla=Give today and Mozilla will match your gift!
-
-aboutTor.donationBanner.tagline1=Protecting Journalists, Whistleblowers, & Activists Since 2006
-aboutTor.donationBanner.tagline2=Networking Freedom Worldwide
-aboutTor.donationBanner.tagline3=Freedom Online
-aboutTor.donationBanner.tagline4=Fostering Free Expression Worldwide
-aboutTor.donationBanner.tagline5=Protecting the Privacy of Millions Every Day
-
-aboutTor.newsletter.tagline=Get the latest news from Tor straight to your inbox.
-aboutTor.newsletter.link_text=Sign up for Tor News.
diff --git a/src/chrome/locale/fa/aboutTor.properties b/src/chrome/locale/fa/aboutTor.properties
deleted file mode 100644
index 5e4a0272..00000000
--- a/src/chrome/locale/fa/aboutTor.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright (c) 2018, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.donationBanner.donate=اکنون اهداء کنید!
-
-aboutTor.donationBanner.slogan=Tor: قدرت مقاومت دیجیتال
-aboutTor.donationBanner.mozilla=Give today and Mozilla will match your gift!
-
-aboutTor.donationBanner.tagline1=درحال حفاظت از خبرنگاران, افشاگران و اکتیویست ها از سال 2006
-aboutTor.donationBanner.tagline2=آزادی شبکه در جهان
-aboutTor.donationBanner.tagline3=آزادی آنلاین
-aboutTor.donationBanner.tagline4=درحال پرورش آزادی گفتار در جهان
-aboutTor.donationBanner.tagline5=درحال حفاظت ار حریم خصوصی میلیون ها مردم هر روز
-
-aboutTor.newsletter.tagline=Get the latest news from Tor straight to your inbox.
-aboutTor.newsletter.link_text=Sign up for Tor News.
diff --git a/src/chrome/locale/fi/aboutTor.properties b/src/chrome/locale/fi/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/fi/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/fil/aboutTor.properties b/src/chrome/locale/fil/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/fil/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/fo/aboutTor.properties b/src/chrome/locale/fo/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/fo/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/fr/aboutTor.properties b/src/chrome/locale/fr/aboutTor.properties
deleted file mode 100644
index 33fcdb41..00000000
--- a/src/chrome/locale/fr/aboutTor.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright (c) 2018, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.donationBanner.donate=Faites un don maintenant !
-
-aboutTor.donationBanner.slogan=Tor : la puissance de la résistance numérique
-aboutTor.donationBanner.mozilla=Faites un don aujourd’hui et Mozilla fera un don équivalent !
-
-aboutTor.donationBanner.tagline1=Nous protégeons journalistes, lanceurs d’alerte et activistes depuis 2006
-aboutTor.donationBanner.tagline2=Vers un réseau mondial de liberté
-aboutTor.donationBanner.tagline3=La liberté en ligne
-aboutTor.donationBanner.tagline4=Pour favoriser la libre expression dans le monde entier
-aboutTor.donationBanner.tagline5=Nous protégeons les renseignements personnels de millions de personnes, chaque jour
-
-aboutTor.newsletter.tagline=Get the latest news from Tor straight to your inbox.
-aboutTor.newsletter.link_text=Sign up for Tor News.
diff --git a/src/chrome/locale/fur/aboutTor.properties b/src/chrome/locale/fur/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/fur/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/fy/aboutTor.properties b/src/chrome/locale/fy/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/fy/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/ga/aboutTor.properties b/src/chrome/locale/ga/aboutTor.properties
deleted file mode 100644
index 717fbeb8..00000000
--- a/src/chrome/locale/ga/aboutTor.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright (c) 2018, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.donationBanner.donate=Tabhair Síntiús Airgid Anois!
-
-aboutTor.donationBanner.slogan=Tor: Cumhacht na Frithbheartaíochta Digití
-aboutTor.donationBanner.mozilla=Tabhair síntiús airgid inniu agus meaitseálfaidh Mozilla é!
-
-aboutTor.donationBanner.tagline1=Iriseoirí, sceithirí, agus gníomhaígh á gcosaint ó 2006
-aboutTor.donationBanner.tagline2=Saoirse Líonraithe ar fud an domhain
-aboutTor.donationBanner.tagline3=Saoirse Ar Líne
-aboutTor.donationBanner.tagline4=Saoirse Cainte á cothú ar fud an domhain
-aboutTor.donationBanner.tagline5=Príobháideachas na milliún á chosaint chuile lá
-
-aboutTor.newsletter.tagline=Get the latest news from Tor straight to your inbox.
-aboutTor.newsletter.link_text=Sign up for Tor News.
diff --git a/src/chrome/locale/gl/aboutTor.properties b/src/chrome/locale/gl/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/gl/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/gu/aboutTor.properties b/src/chrome/locale/gu/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/gu/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/gun/aboutTor.properties b/src/chrome/locale/gun/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/gun/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/ha/aboutTor.properties b/src/chrome/locale/ha/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/ha/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/he/aboutTor.properties b/src/chrome/locale/he/aboutTor.properties
deleted file mode 100644
index 6460708d..00000000
--- a/src/chrome/locale/he/aboutTor.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright (c) 2018, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.donationBanner.donate=תרום כעת!
-
-aboutTor.donationBanner.slogan=Tor: מניעים התנגדות דיגיטלית
-aboutTor.donationBanner.mozilla=תן היום ו-Mozilla תשווה את מתנתך!
-
-aboutTor.donationBanner.tagline1=מגנים על עיתונאים, חושפי שחיתות ופעילנים מאז 2006
-aboutTor.donationBanner.tagline2=מרשתים באופן עולמי חירות
-aboutTor.donationBanner.tagline3=חירות מקוונת
-aboutTor.donationBanner.tagline4=מטפחים באופן עולמי הבעה חופשית
-aboutTor.donationBanner.tagline5=מגנים על הפרטיות של מיליונים כל יום
-
-aboutTor.newsletter.tagline=קבל את החדשות האחרונות מאת Tor ישירות לתיבה הנכנסת שלך.
-aboutTor.newsletter.link_text=הירשם עבור חדשות Tor
diff --git a/src/chrome/locale/hi/aboutTor.properties b/src/chrome/locale/hi/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/hi/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/hr/aboutTor.properties b/src/chrome/locale/hr/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/hr/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/ht/aboutTor.properties b/src/chrome/locale/ht/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/ht/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/hu/aboutTor.properties b/src/chrome/locale/hu/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/hu/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/hy/aboutTor.properties b/src/chrome/locale/hy/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/hy/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/id/aboutTor.properties b/src/chrome/locale/id/aboutTor.properties
deleted file mode 100644
index d28fda5c..00000000
--- a/src/chrome/locale/id/aboutTor.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright (c) 2018, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.donationBanner.donate=Donasi Sekarang!
-
-aboutTor.donationBanner.slogan=Tor: Menggerakan Perlawanan Digital
-aboutTor.donationBanner.mozilla=Beri hari ini dan Mozilla akan mencocokkan hadiah anda
-
-aboutTor.donationBanner.tagline1=Melindungi jurnalis, pelapor pelanggaran dan aktivis sejak 2006
-aboutTor.donationBanner.tagline2=Kebebasan Jaringan di seluruh dunia
-aboutTor.donationBanner.tagline3=Bebas berinternet
-aboutTor.donationBanner.tagline4=Merawat Kebebasan Berekspresi di Seluruh Dunia
-aboutTor.donationBanner.tagline5=Melindungi Privasi Jutaan Orang Setiap Hari
-
-aboutTor.newsletter.tagline=Get the latest news from Tor straight to your inbox.
-aboutTor.newsletter.link_text=Sign up for Tor News.
diff --git a/src/chrome/locale/is/aboutTor.properties b/src/chrome/locale/is/aboutTor.properties
deleted file mode 100644
index 6a955931..00000000
--- a/src/chrome/locale/is/aboutTor.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright (c) 2018, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.donationBanner.donate=Styrkja núna!
-
-aboutTor.donationBanner.slogan=Tor: Keyrir áfram stafrænu andspyrnuhreyfinguna
-aboutTor.donationBanner.mozilla=Gefðu í dag og Mozilla kemur með mótframlag!
-
-aboutTor.donationBanner.tagline1=Verndar blaðamenn, aðgerðasinna og uppljóstrara síðan 2006
-aboutTor.donationBanner.tagline2=Frelsi á netinu út um allan heim
-aboutTor.donationBanner.tagline3=Frelsi á netinu
-aboutTor.donationBanner.tagline4=Fóstrar frjáls skoðanaskipti út um allan heim
-aboutTor.donationBanner.tagline5=Verndar einkalíf milljóna manna á hverjum degi
-
-aboutTor.newsletter.tagline=Get the latest news from Tor straight to your inbox.
-aboutTor.newsletter.link_text=Sign up for Tor News.
diff --git a/src/chrome/locale/it/aboutTor.properties b/src/chrome/locale/it/aboutTor.properties
deleted file mode 100644
index 65aa5fd3..00000000
--- a/src/chrome/locale/it/aboutTor.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright (c) 2018, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.donationBanner.donate=Dona adesso!
-
-aboutTor.donationBanner.slogan=Tor: alimentiamo la resistenza digitale
-aboutTor.donationBanner.mozilla=Dona oggi e Mozilla ricambierà il regalo!
-
-aboutTor.donationBanner.tagline1=Proteggiamo giornalisti, informatori e attivisti dal 2006
-aboutTor.donationBanner.tagline2=Rendiamo la rete libera nel mondo
-aboutTor.donationBanner.tagline3=Libertà online
-aboutTor.donationBanner.tagline4=Promuoviamo la libertà di parola nel mondo
-aboutTor.donationBanner.tagline5=Proteggiamo la privacy di milioni di persone ogni giorno
-
-aboutTor.newsletter.tagline=Get the latest news from Tor straight to your inbox.
-aboutTor.newsletter.link_text=Sign up for Tor News.
diff --git a/src/chrome/locale/ja/aboutTor.properties b/src/chrome/locale/ja/aboutTor.properties
deleted file mode 100644
index 5ef4bd04..00000000
--- a/src/chrome/locale/ja/aboutTor.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright (c) 2018, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.donationBanner.donate=今すぐ寄付願います!
-
-aboutTor.donationBanner.slogan=Tor: デジタル抵抗運動に力を与える。
-aboutTor.donationBanner.mozilla=今から寄付すると、Mozillaが一緒に同じ金額を寄付します!
-
-aboutTor.donationBanner.tagline1=2006年以来、ジャーナリスト、内部告発者、そして活動家を守っています。
-aboutTor.donationBanner.tagline2=世界的ネットワーク自由
-aboutTor.donationBanner.tagline3=フリーダムオンライン
-aboutTor.donationBanner.tagline4=世界的に自由な表現を促進します。
-aboutTor.donationBanner.tagline5=数百万件以上のプライバシーを毎日保護しています。
-
-aboutTor.newsletter.tagline=Get the latest news from Tor straight to your inbox.
-aboutTor.newsletter.link_text=Sign up for Tor News.
diff --git a/src/chrome/locale/jv/aboutTor.properties b/src/chrome/locale/jv/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/jv/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/ka/aboutTor.properties b/src/chrome/locale/ka/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/ka/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/km/aboutTor.properties b/src/chrome/locale/km/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/km/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/kn/aboutTor.properties b/src/chrome/locale/kn/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/kn/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/ko/aboutTor.properties b/src/chrome/locale/ko/aboutTor.properties
deleted file mode 100644
index c039f4cd..00000000
--- a/src/chrome/locale/ko/aboutTor.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright (c) 2018, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.donationBanner.donate=Donate Now!
-
-aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance
-aboutTor.donationBanner.mozilla=Give today and Mozilla will match your gift!
-
-aboutTor.donationBanner.tagline1=Protecting Journalists, Whistleblowers, & Activists Since 2006
-aboutTor.donationBanner.tagline2=Networking Freedom Worldwide
-aboutTor.donationBanner.tagline3=Freedom Online
-aboutTor.donationBanner.tagline4=Fostering Free Expression Worldwide
-aboutTor.donationBanner.tagline5=Protecting the Privacy of Millions Every Day
-
-aboutTor.newsletter.tagline=Get the latest news from Tor straight to your inbox.
-aboutTor.newsletter.link_text=Sign up for Tor News.
diff --git a/src/chrome/locale/ku/aboutTor.properties b/src/chrome/locale/ku/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/ku/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/kw/aboutTor.properties b/src/chrome/locale/kw/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/kw/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/ky/aboutTor.properties b/src/chrome/locale/ky/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/ky/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/lb/aboutTor.properties b/src/chrome/locale/lb/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/lb/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/lg/aboutTor.properties b/src/chrome/locale/lg/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/lg/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/ln/aboutTor.properties b/src/chrome/locale/ln/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/ln/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/lo/aboutTor.properties b/src/chrome/locale/lo/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/lo/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/lt/aboutTor.properties b/src/chrome/locale/lt/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/lt/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/lv/aboutTor.properties b/src/chrome/locale/lv/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/lv/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/mg/aboutTor.properties b/src/chrome/locale/mg/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/mg/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/mi/aboutTor.properties b/src/chrome/locale/mi/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/mi/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/mk/aboutTor.properties b/src/chrome/locale/mk/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/mk/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/ml/aboutTor.properties b/src/chrome/locale/ml/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/ml/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/mn/aboutTor.properties b/src/chrome/locale/mn/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/mn/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/mr/aboutTor.properties b/src/chrome/locale/mr/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/mr/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/ms/aboutTor.properties b/src/chrome/locale/ms/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/ms/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/mt/aboutTor.properties b/src/chrome/locale/mt/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/mt/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/my/aboutTor.properties b/src/chrome/locale/my/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/my/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/nah/aboutTor.properties b/src/chrome/locale/nah/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/nah/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/nap/aboutTor.properties b/src/chrome/locale/nap/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/nap/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/nb/aboutTor.properties b/src/chrome/locale/nb/aboutTor.properties
deleted file mode 100644
index d53095af..00000000
--- a/src/chrome/locale/nb/aboutTor.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright (c) 2018, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.donationBanner.donate=Doner nå.
-
-aboutTor.donationBanner.slogan=Tor: Pådriver for digital motstandsdyktighet
-aboutTor.donationBanner.mozilla=Gi i dag og Mozilla vil matche bidraget ditt!
-
-aboutTor.donationBanner.tagline1=Beskyttelse av journalister, fløyteblåsere og aktivister siden 2006
-aboutTor.donationBanner.tagline2=Verdensomspennende nettverksfrihet
-aboutTor.donationBanner.tagline3=Frihet på nett
-aboutTor.donationBanner.tagline4=Grobunn til verdensomspennende ytringsfrihet
-aboutTor.donationBanner.tagline5=Beskytter privatlivet til millioner hver dag
-
-aboutTor.newsletter.tagline=Get the latest news from Tor straight to your inbox.
-aboutTor.newsletter.link_text=Sign up for Tor News.
diff --git a/src/chrome/locale/ne/aboutTor.properties b/src/chrome/locale/ne/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/ne/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/nl/aboutTor.properties b/src/chrome/locale/nl/aboutTor.properties
deleted file mode 100644
index 01ce3be3..00000000
--- a/src/chrome/locale/nl/aboutTor.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright (c) 2018, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.donationBanner.donate=Doneer nu!
-
-aboutTor.donationBanner.slogan=Tor: Digitale tegenspraak aanmoedigen
-aboutTor.donationBanner.mozilla=Geef vandaag en Mozilla zal u gift koppelen!
-
-aboutTor.donationBanner.tagline1=Beschermen van Journalisten, Whistleblowers, & Activisten sinds 2006
-aboutTor.donationBanner.tagline2=Wereldwijde Netwerk Vrijheid
-aboutTor.donationBanner.tagline3=Online Vrijheid
-aboutTor.donationBanner.tagline4=Bevorderen van gratis wereldwijde vrije mening
-aboutTor.donationBanner.tagline5=Beveiligt de privacy van miljoenen gebruikers per dag
-
-aboutTor.newsletter.tagline=Get the latest news from Tor straight to your inbox.
-aboutTor.newsletter.link_text=Sign up for Tor News.
diff --git a/src/chrome/locale/nn/aboutTor.properties b/src/chrome/locale/nn/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/nn/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/nso/aboutTor.properties b/src/chrome/locale/nso/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/nso/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/oc/aboutTor.properties b/src/chrome/locale/oc/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/oc/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/or/aboutTor.properties b/src/chrome/locale/or/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/or/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/pa/aboutTor.properties b/src/chrome/locale/pa/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/pa/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/pap/aboutTor.properties b/src/chrome/locale/pap/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/pap/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/pl/aboutTor.properties b/src/chrome/locale/pl/aboutTor.properties
deleted file mode 100644
index 0abbbd31..00000000
--- a/src/chrome/locale/pl/aboutTor.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright (c) 2018, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.donationBanner.donate=Wesprzyj teraz!
-
-aboutTor.donationBanner.slogan=Tor: Zasila Odporność Cyfrową
-aboutTor.donationBanner.mozilla=Daj dzisiaj i Mozilla dopasuje Twój prezent!
-
-aboutTor.donationBanner.tagline1=Chroni dziennikarzy, informatorów i aktywistów od 2006
-aboutTor.donationBanner.tagline2=Wolność dla sieci na całym świecie
-aboutTor.donationBanner.tagline3=Wolność Online
-aboutTor.donationBanner.tagline4=Wspieranie ekspresji na całym świecie
-aboutTor.donationBanner.tagline5=Ochrona prywatności milionów każdego dnia
-
-aboutTor.newsletter.tagline=Get the latest news from Tor straight to your inbox.
-aboutTor.newsletter.link_text=Sign up for Tor News.
diff --git a/src/chrome/locale/pms/aboutTor.properties b/src/chrome/locale/pms/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/pms/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/ps/aboutTor.properties b/src/chrome/locale/ps/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/ps/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/pt-BR/aboutTor.properties b/src/chrome/locale/pt-BR/aboutTor.properties
deleted file mode 100644
index 3a91c908..00000000
--- a/src/chrome/locale/pt-BR/aboutTor.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright (c) 2018, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.donationBanner.donate=Faça uma Doação Agora!
-
-aboutTor.donationBanner.slogan=Tor: Fortalecendo a Resistência Digital
-aboutTor.donationBanner.mozilla=Faça uma doação hoje e a Mozilla doará em dobro!
-
-aboutTor.donationBanner.tagline1=Protegendo Jornalistas, Whistleblowers e Ativistas desde 2006
-aboutTor.donationBanner.tagline2=Construindo Redes de Liberdade no Mundo Todo
-aboutTor.donationBanner.tagline3=Liberdade na Internet
-aboutTor.donationBanner.tagline4=Promovendo Liberdade de Expressão no Mundo Todo
-aboutTor.donationBanner.tagline5=Protegendo a Privacidade de Milhões de Pessoas Todos os Dias
-
-aboutTor.newsletter.tagline=Get the latest news from Tor straight to your inbox.
-aboutTor.newsletter.link_text=Sign up for Tor News.
diff --git a/src/chrome/locale/pt/aboutTor.properties b/src/chrome/locale/pt/aboutTor.properties
deleted file mode 100644
index f8f6235a..00000000
--- a/src/chrome/locale/pt/aboutTor.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Procurar com <a href="%1$S">segurança</a> com <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Procurar com <a href="%1$S">segurança</a> com <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
-
-aboutTor.searchDC.privacy=Procurar com <a href="%1$S">segurança</a> com <a href="%2$S">Disconnect.me</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDC.search.link=https://search.disconnect.me/
-
-aboutTor.donationBanner.donate=Doe Agora!
-aboutTor.donationBanner.heart=O Tor é o coração da liberdade na Internet
-aboutTor.donationBanner.tagline1=Milhares de pessoas dependem do Tor para Segurança & Privacidade Online
-aboutTor.donationBanner.tagline2=Uma Rede de Pessoas Protegendo Pessoas
-aboutTor.donationBanner.tagline3=Vigilância = Opressão
-aboutTor.donationBanner.tagline4=Protegendo Jornalistas, Ativistas & Denunciantes Desde 2006
diff --git a/src/chrome/locale/ro/aboutTor.properties b/src/chrome/locale/ro/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/ro/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/ru/aboutTor.properties b/src/chrome/locale/ru/aboutTor.properties
deleted file mode 100644
index a8946d6b..00000000
--- a/src/chrome/locale/ru/aboutTor.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright (c) 2018, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.donationBanner.donate=Пожертвовать сейчас!
-
-aboutTor.donationBanner.slogan=Tor: усиливая цифровое сопротивление
-aboutTor.donationBanner.mozilla=Пожертвуйте сегодня и Mozilla удвоит Ваш взнос.
-
-aboutTor.donationBanner.tagline1=Защита журналистов, информаторов и активистов с 2006 года
-aboutTor.donationBanner.tagline2=Свобода сети во всем мире
-aboutTor.donationBanner.tagline3=Свобода в сети
-aboutTor.donationBanner.tagline4=Содействие развитию безграничного самовыражения во Всемирной Сети.
-aboutTor.donationBanner.tagline5=Защищая Конфиденциальность миллионов каждый день
-
-aboutTor.newsletter.tagline=Get the latest news from Tor straight to your inbox.
-aboutTor.newsletter.link_text=Sign up for Tor News.
diff --git a/src/chrome/locale/sco/aboutTor.properties b/src/chrome/locale/sco/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/sco/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/sk/aboutTor.properties b/src/chrome/locale/sk/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/sk/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/sl/aboutTor.properties b/src/chrome/locale/sl/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/sl/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/so/aboutTor.properties b/src/chrome/locale/so/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/so/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/son/aboutTor.properties b/src/chrome/locale/son/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/son/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/sq/aboutTor.properties b/src/chrome/locale/sq/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/sq/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/sr/aboutTor.properties b/src/chrome/locale/sr/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/sr/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/st/aboutTor.properties b/src/chrome/locale/st/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/st/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/su/aboutTor.properties b/src/chrome/locale/su/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/su/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/sv/aboutTor.properties b/src/chrome/locale/sv/aboutTor.properties
deleted file mode 100644
index ef57f1d2..00000000
--- a/src/chrome/locale/sv/aboutTor.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright (c) 2018, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.donationBanner.donate=Donera nu!
-
-aboutTor.donationBanner.slogan=Tor: Möjliggör digitalt motstånd
-aboutTor.donationBanner.mozilla=Ge idag och Mozilla kommer att matcha din gåva!
-
-aboutTor.donationBanner.tagline1=Skyddar journalister, whistleblowers och aktivister sedan 2006
-aboutTor.donationBanner.tagline2=Nätverksfrihet över hela världen
-aboutTor.donationBanner.tagline3=Frihet på nätet
-aboutTor.donationBanner.tagline4=Främjer yttrandefriheten över hela världen
-aboutTor.donationBanner.tagline5=Skydda integriteten av miljoner varje dag
-
-aboutTor.newsletter.tagline=Get the latest news from Tor straight to your inbox.
-aboutTor.newsletter.link_text=Sign up for Tor News.
diff --git a/src/chrome/locale/sw/aboutTor.properties b/src/chrome/locale/sw/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/sw/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/ta/aboutTor.properties b/src/chrome/locale/ta/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/ta/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/te/aboutTor.properties b/src/chrome/locale/te/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/te/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/tg/aboutTor.properties b/src/chrome/locale/tg/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/tg/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/th/aboutTor.properties b/src/chrome/locale/th/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/th/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/ti/aboutTor.properties b/src/chrome/locale/ti/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/ti/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/tk/aboutTor.properties b/src/chrome/locale/tk/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/tk/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/tr/aboutTor.properties b/src/chrome/locale/tr/aboutTor.properties
deleted file mode 100644
index d07ad999..00000000
--- a/src/chrome/locale/tr/aboutTor.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright (c) 2018, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.donationBanner.donate=Bağış Yapın
-
-aboutTor.donationBanner.slogan=Tor: Dijital Direnişi Güçlendiriyor
-aboutTor.donationBanner.mozilla=Destek olun ve Mozilla tarafından hediyenizin karşılığını alın!
-
-aboutTor.donationBanner.tagline1=2006 Yılından Beri Gazeteciler, Yolsuzlukları Açıklayanlar ve Aktivistler Korunuyor
-aboutTor.donationBanner.tagline2=Tüm Dünyada Ağ Özgürlüğü
-aboutTor.donationBanner.tagline3=Çevrimiçi Özgürlük
-aboutTor.donationBanner.tagline4=Tüm Dünyada İfade Özgürlüğü Destekleniyor
-aboutTor.donationBanner.tagline5=Her Gün Milyonlarca Kişinin Gizliliği Korunuyor
-
-aboutTor.newsletter.tagline=Tor ile ilgili son gelişmeler doğrudan e-posta kutunuza gelsin.
-aboutTor.newsletter.link_text=Tor Haber Bültenine Abone Olun
diff --git a/src/chrome/locale/uk/aboutTor.properties b/src/chrome/locale/uk/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/uk/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/ur/aboutTor.properties b/src/chrome/locale/ur/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/ur/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/ve/aboutTor.properties b/src/chrome/locale/ve/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/ve/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/vi/aboutTor.properties b/src/chrome/locale/vi/aboutTor.properties
deleted file mode 100644
index 6cfc4d67..00000000
--- a/src/chrome/locale/vi/aboutTor.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright (c) 2018, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.donationBanner.donate=Tài trợ ngay bây giờ!
-
-aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance
-aboutTor.donationBanner.mozilla=Give today and Mozilla will match your gift!
-
-aboutTor.donationBanner.tagline1=Protecting Journalists, Whistleblowers, & Activists Since 2006
-aboutTor.donationBanner.tagline2=Networking Freedom Worldwide
-aboutTor.donationBanner.tagline3=Freedom Online
-aboutTor.donationBanner.tagline4=Fostering Free Expression Worldwide
-aboutTor.donationBanner.tagline5=Bảo vệ riêng tư của hàng triệu người mỗi ngày
-
-aboutTor.newsletter.tagline=Get the latest news from Tor straight to your inbox.
-aboutTor.newsletter.link_text=Sign up for Tor News.
diff --git a/src/chrome/locale/wa/aboutTor.properties b/src/chrome/locale/wa/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/wa/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/wo/aboutTor.properties b/src/chrome/locale/wo/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/wo/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/zh-CN/aboutTor.properties b/src/chrome/locale/zh-CN/aboutTor.properties
deleted file mode 100644
index 4ace7b9b..00000000
--- a/src/chrome/locale/zh-CN/aboutTor.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright (c) 2018, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.donationBanner.donate=立即捐助!
-
-aboutTor.donationBanner.slogan=Tor:提供数据防护
-aboutTor.donationBanner.mozilla=现在捐助,Mozilla会满足你的礼物!
-
-aboutTor.donationBanner.tagline1=自2006年起,为记者,线人及活动家提供庇护
-aboutTor.donationBanner.tagline2=世界范围内的网络自由
-aboutTor.donationBanner.tagline3=网络自由
-aboutTor.donationBanner.tagline4=促成世界范围的言论自由
-aboutTor.donationBanner.tagline5=每日保护百万人的隐私
-
-aboutTor.newsletter.tagline=Get the latest news from Tor straight to your inbox.
-aboutTor.newsletter.link_text=Sign up for Tor News.
diff --git a/src/chrome/locale/zh-HK/aboutTor.properties b/src/chrome/locale/zh-HK/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/zh-HK/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/zh-TW/aboutTor.properties b/src/chrome/locale/zh-TW/aboutTor.properties
deleted file mode 100644
index d2a674bd..00000000
--- a/src/chrome/locale/zh-TW/aboutTor.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright (c) 2018, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.donationBanner.donate=立刻捐款!
-
-aboutTor.donationBanner.slogan=Tor: 加持數位扺抗
-aboutTor.donationBanner.mozilla=今日捐款 Mozilla 會協助加碼贈品!
-
-aboutTor.donationBanner.tagline1=從 2006 年起,保護著無數的媒體記者、揭密者和社會運動者.
-aboutTor.donationBanner.tagline2=串連全世界網絡自由
-aboutTor.donationBanner.tagline3=自由上線
-aboutTor.donationBanner.tagline4=催生全世界的表意自由
-aboutTor.donationBanner.tagline5=每日保護百萬人隱私
-
-aboutTor.newsletter.tagline=Get the latest news from Tor straight to your inbox.
-aboutTor.newsletter.link_text=Sign up for Tor News.
diff --git a/src/chrome/locale/zu/aboutTor.properties b/src/chrome/locale/zu/aboutTor.properties
deleted file mode 100644
index 02088f01..00000000
--- a/src/chrome/locale/zu/aboutTor.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/trans_tools/import-translations.sh b/trans_tools/import-translations.sh
index adb728a9..d13f8259 100755
--- a/trans_tools/import-translations.sh
+++ b/trans_tools/import-translations.sh
@@ -18,7 +18,6 @@ LOCALE_DIR=../src/chrome/locale
# FILEMAP is an array of "localeFile:translationBranch" strings.
FILEMAP=( "aboutDialog.dtd:torbutton-aboutdialogdtd"
"aboutTor.dtd:abouttor-homepage"
- "aboutTor.properties:torbutton-abouttorproperties"
"aboutTBUpdate.dtd:torbutton-abouttbupdatedtd"
"brand.dtd:torbutton-branddtd"
"brand.properties:torbutton-brandproperties"
1
0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 25696 - Design of alpha onboarding for Tor Browser for Android
by gk@torproject.org 27 Aug '18
by gk@torproject.org 27 Aug '18
27 Aug '18
commit 35f8db1e622e520992486b751ade241c23f33871
Author: Igor Oliveira <igt0(a)torproject.org>
Date: Thu Aug 23 23:11:09 2018 -0300
Bug 25696 - Design of alpha onboarding for Tor Browser for Android
- Update description copy and background color.
---
.../firstrun_basepanel_checkable_fragment.xml | 2 +-
.../android/app/src/photon/res/values/colors.xml | 1 +
.../gecko/firstrun/FirstrunPagerConfig.java | 1 +
.../org/mozilla/gecko/firstrun/FirstrunPanel.java | 2 ++
.../gecko/firstrun/FirstrunTorPagerConfig.java | 16 +++++++----
.../java/org/mozilla/gecko/firstrun/LastPanel.java | 6 ++--
.../android/base/locales/en-US/android_strings.dtd | 32 +++++++++++++--------
mobile/android/base/strings.xml.in | 10 +++++++
.../res/drawable-nodpi/figure_security.png | Bin 0 -> 52021 bytes
9 files changed, 47 insertions(+), 23 deletions(-)
diff --git a/mobile/android/app/src/main/res/layout/firstrun_basepanel_checkable_fragment.xml b/mobile/android/app/src/main/res/layout/firstrun_basepanel_checkable_fragment.xml
index 6233198982d9..b0083511ae0d 100644
--- a/mobile/android/app/src/main/res/layout/firstrun_basepanel_checkable_fragment.xml
+++ b/mobile/android/app/src/main/res/layout/firstrun_basepanel_checkable_fragment.xml
@@ -13,7 +13,7 @@
<LinearLayout android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="@dimen/firstrun_min_height"
- android:background="@android:color/white"
+ android:background="@color/tor_description_background_text"
android:gravity="center_horizontal"
android:orientation="vertical">
diff --git a/mobile/android/app/src/photon/res/values/colors.xml b/mobile/android/app/src/photon/res/values/colors.xml
index b3522be3c2db..b322a46fe008 100644
--- a/mobile/android/app/src/photon/res/values/colors.xml
+++ b/mobile/android/app/src/photon/res/values/colors.xml
@@ -153,6 +153,7 @@
<color name="tor_tab_inactive_text">#484848</color>
<color name="tor_tab_active_text">#7D4698</color>
+ <color name="tor_description_background_text">#FAFAFA</color>
<!-- Restricted profiles palette -->
<color name="restricted_profile_background_gold">#ffffcb51</color>
diff --git a/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunPagerConfig.java b/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunPagerConfig.java
index ad6eae5b6e98..09a347699a31 100644
--- a/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunPagerConfig.java
+++ b/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunPagerConfig.java
@@ -23,6 +23,7 @@ public class FirstrunPagerConfig {
public static final String KEY_IMAGE = "imageRes";
public static final String KEY_TEXT = "textRes";
public static final String KEY_SUBTEXT = "subtextRes";
+ public static final String KEY_CTATEXT = "ctatextRes";
public static List<FirstrunPanelConfig> getDefault(Context context) {
final List<FirstrunPanelConfig> panels = new LinkedList<>();
diff --git a/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunPanel.java b/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunPanel.java
index 13a2994fb2c1..f7d5745229a3 100644
--- a/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunPanel.java
+++ b/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunPanel.java
@@ -35,10 +35,12 @@ public class FirstrunPanel extends Fragment {
final int imageRes = args.getInt(FirstrunPagerConfig.KEY_IMAGE);
final int textRes = args.getInt(FirstrunPagerConfig.KEY_TEXT);
final int subtextRes = args.getInt(FirstrunPagerConfig.KEY_SUBTEXT);
+ final int ctatextRes = args.getInt(FirstrunPagerConfig.KEY_CTATEXT);
((ImageView) root.findViewById(R.id.firstrun_image)).setImageResource(imageRes);
((TextView) root.findViewById(R.id.firstrun_text)).setText(textRes);
((TextView) root.findViewById(R.id.firstrun_subtext)).setText(subtextRes);
+ ((TextView) root.findViewById(R.id.firstrun_link)).setText(ctatextRes);
}
root.findViewById(R.id.firstrun_link).setOnClickListener(new View.OnClickListener() {
diff --git a/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunTorPagerConfig.java b/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunTorPagerConfig.java
index 40b72e705784..f70f2df3335a 100644
--- a/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunTorPagerConfig.java
+++ b/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunTorPagerConfig.java
@@ -23,12 +23,14 @@ public class FirstrunTorPagerConfig {
public static final String KEY_IMAGE = "imageRes";
public static final String KEY_TEXT = "textRes";
public static final String KEY_SUBTEXT = "subtextRes";
+ public static final String KEY_CTATEXT = "ctatextRes";
public static List<FirstrunTorPanelConfig> getDefault(Context context) {
final List<FirstrunTorPanelConfig> panels = new LinkedList<>();
panels.add(SimplePanelConfigs.welcomeTorPanelConfig);
panels.add(SimplePanelConfigs.privacyPanelConfig);
panels.add(SimplePanelConfigs.torNetworkPanelConfig);
+ panels.add(SimplePanelConfigs.secSettingsPanelConfig);
panels.add(SimplePanelConfigs.tipsPanelConfig);
panels.add(SimplePanelConfigs.onionServicesPanelConfig);
@@ -41,7 +43,7 @@ public class FirstrunTorPagerConfig {
private int titleRes;
private Bundle args;
- public FirstrunTorPanelConfig(String classname, int titleRes, int imageRes, int textRes, int subtextRes) {
+ public FirstrunTorPanelConfig(String classname, int titleRes, int imageRes, int textRes, int subtextRes, int ctatextRes) {
this.classname = classname;
this.titleRes = titleRes;
@@ -49,6 +51,7 @@ public class FirstrunTorPagerConfig {
this.args.putInt(KEY_IMAGE, imageRes);
this.args.putInt(KEY_TEXT, textRes);
this.args.putInt(KEY_SUBTEXT, subtextRes);
+ this.args.putInt(KEY_CTATEXT, ctatextRes);
}
public String getClassname() {
@@ -65,10 +68,11 @@ public class FirstrunTorPagerConfig {
}
private static class SimplePanelConfigs {
- public static final FirstrunTorPanelConfig welcomeTorPanelConfig = new FirstrunTorPanelConfig(FirstrunPanel.class.getName(), R.string.firstrun_welcome_tab_title, R.drawable.figure_welcome, R.string.firstrun_welcome_title, R.string.firstrun_welcome_message);
- public static final FirstrunTorPanelConfig privacyPanelConfig = new FirstrunTorPanelConfig(FirstrunPanel.class.getName(), R.string.firstrun_privacy_tab_title, R.drawable.figure_privacy, R.string.firstrun_privacy_title, R.string.firstrun_privacy_message);
- public static final FirstrunTorPanelConfig torNetworkPanelConfig = new FirstrunTorPanelConfig(FirstrunPanel.class.getName(), R.string.firstrun_tornetwork_tab_title, R.drawable.figure_network, R.string.firstrun_tornetwork_title, R.string.firstrun_tornetwork_message);
- public static final FirstrunTorPanelConfig tipsPanelConfig = new FirstrunTorPanelConfig(FirstrunPanel.class.getName(), R.string.firstrun_tips_tab_title, R.drawable.figure_experience, R.string.firstrun_tips_title, R.string.firstrun_tips_message);
- public static final FirstrunTorPanelConfig onionServicesPanelConfig = new FirstrunTorPanelConfig(LastPanel.class.getName(), R.string.firstrun_onionservices_tab_title, R.drawable.figure_onion, R.string.firstrun_onionservices_title, R.string.firstrun_onionservices_message);
+ public static final FirstrunTorPanelConfig welcomeTorPanelConfig = new FirstrunTorPanelConfig(FirstrunPanel.class.getName(), R.string.firstrun_welcome_tab_title, R.drawable.figure_welcome, R.string.firstrun_welcome_title, R.string.firstrun_welcome_message, R.string.firstrun_welcome_next);
+ public static final FirstrunTorPanelConfig privacyPanelConfig = new FirstrunTorPanelConfig(FirstrunPanel.class.getName(), R.string.firstrun_privacy_tab_title, R.drawable.figure_privacy, R.string.firstrun_privacy_title, R.string.firstrun_privacy_message, R.string.firstrun_privacy_next);
+ public static final FirstrunTorPanelConfig torNetworkPanelConfig = new FirstrunTorPanelConfig(FirstrunPanel.class.getName(), R.string.firstrun_tornetwork_tab_title, R.drawable.figure_network, R.string.firstrun_tornetwork_title, R.string.firstrun_tornetwork_message, R.string.firstrun_tornetwork_next);
+ public static final FirstrunTorPanelConfig secSettingsPanelConfig = new FirstrunTorPanelConfig(FirstrunPanel.class.getName(), R.string.firstrun_secsettings_tab_title, R.drawable.figure_security, R.string.firstrun_secsettings_title, R.string.firstrun_secsettings_message, R.string.firstrun_secsettings_next);
+ public static final FirstrunTorPanelConfig tipsPanelConfig = new FirstrunTorPanelConfig(FirstrunPanel.class.getName(), R.string.firstrun_tips_tab_title, R.drawable.figure_experience, R.string.firstrun_tips_title, R.string.firstrun_tips_message, R.string.firstrun_tips_next);
+ public static final FirstrunTorPanelConfig onionServicesPanelConfig = new FirstrunTorPanelConfig(LastPanel.class.getName(), R.string.firstrun_onionservices_tab_title, R.drawable.figure_onion, R.string.firstrun_onionservices_title, R.string.firstrun_onionservices_message, R.string.firstrun_onionservices_next);
}
}
diff --git a/mobile/android/base/java/org/mozilla/gecko/firstrun/LastPanel.java b/mobile/android/base/java/org/mozilla/gecko/firstrun/LastPanel.java
index c4e4aa0dd96a..d68719fe7658 100644
--- a/mobile/android/base/java/org/mozilla/gecko/firstrun/LastPanel.java
+++ b/mobile/android/base/java/org/mozilla/gecko/firstrun/LastPanel.java
@@ -24,16 +24,14 @@ public class LastPanel extends FirstrunPanel {
final int imageRes = args.getInt(FirstrunPagerConfig.KEY_IMAGE);
final int textRes = args.getInt(FirstrunPagerConfig.KEY_TEXT);
final int subtextRes = args.getInt(FirstrunPagerConfig.KEY_SUBTEXT);
+ final int ctatextRes = args.getInt(FirstrunPagerConfig.KEY_CTATEXT);
((ImageView) root.findViewById(R.id.firstrun_image)).setImageResource(imageRes);
((TextView) root.findViewById(R.id.firstrun_text)).setText(textRes);
((TextView) root.findViewById(R.id.firstrun_subtext)).setText(subtextRes);
+ ((TextView) root.findViewById(R.id.firstrun_link)).setText(ctatextRes);
}
- TextView nextLink = (TextView) root.findViewById(R.id.firstrun_link);
- nextLink.setText(R.string.firstrun_welcome_button_browser);
- nextLink.setGravity(Gravity.CENTER);
-
root.findViewById(R.id.firstrun_link).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
diff --git a/mobile/android/base/locales/en-US/android_strings.dtd b/mobile/android/base/locales/en-US/android_strings.dtd
index b9181bb82e1b..d7cded48fda4 100644
--- a/mobile/android/base/locales/en-US/android_strings.dtd
+++ b/mobile/android/base/locales/en-US/android_strings.dtd
@@ -45,21 +45,29 @@
<!-- Location note: Tor First run messages -->
<!ENTITY firstrun_welcome_tab_title "Welcome">
-<!ENTITY firstrun_welcome_title "You\'re ready">
-<!ENTITY firstrun_welcome_message "Tor Browser for Android offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance, and censorship. Here\'s a quick onboarding about how it works.">
+<!ENTITY firstrun_welcome_title "You\'re ready.">
+<!ENTITY firstrun_welcome_message "Tor Browser offers the highest standard of privacy and security while browsing the web. You\'re now protected against tracking, surveillance, and censorship. This quick onboarding will show you how.">
+<!ENTITY firstrun_welcome_next "Start now">
<!ENTITY firstrun_privacy_tab_title "Privacy">
-<!ENTITY firstrun_privacy_title "Snub trackers and snoopers">
-<!ENTITY firstrun_privacy_message "Tor Browser isolates each domain you visit. That means trackers and advertisers can’t follow you. And any information stored, such as isolated cookies or your browsing history, is deleted after your session. These modifications ensure your privacy is protected while you\'re browsing. Click \'Tor Network\' to learn how we protect you on the network level.">
+<!ENTITY firstrun_privacy_title "Snub trackers and snoopers.">
+<!ENTITY firstrun_privacy_message "Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click ‘Tor Network’ to learn how we protect you on the network level.">
+<!ENTITY firstrun_privacy_next "Go to Tor Network">
<!ENTITY firstrun_tornetwork_tab_title "Tor Network">
-<!ENTITY firstrun_tornetwork_title "Travel a decentralized network">
-<!ENTITY firstrun_tornetwork_message "Tor Browser for Android routes your connection over the Tor network. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, there\'s no single point of failure and no centralized entity you need to trust in order to enjoy the internet, unlike when you use a VPN. For each domain you access, a new circuit through the network is created for you.">
+<!ENTITY firstrun_tornetwork_title "Travel a decentralized network.">
+<!ENTITY firstrun_tornetwork_message "Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there\'s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately.">
+<!ENTITY firstrun_tornetwork_next "Next">
+<!ENTITY firstrun_secsettings_tab_title "Security">
+<!ENTITY firstrun_secsettings_title "Choose your experience.">
+<!ENTITY firstrun_secsettings_message "We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer.">
+<!ENTITY firstrun_secsettings_next "Next">
<!ENTITY firstrun_tips_tab_title "Tips">
-<!ENTITY firstrun_tips_title "Experience Tips">
-<!ENTITY firstrun_tips_message "With all the security and privacy features provided by the Tor Browser and the Tor network, your experience while browsing the internet will be a little bit different. Since your connection is going through 3 relays around the world, things may run a bit slower than you\'re used to. Sometimes sites will ask you to prove you are a human, not a robot, and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on providing real privacy.">
-<!ENTITY firstrun_onionservices_tab_title "Onion Services">
-<!ENTITY firstrun_onionservices_title "Onion Services">
-<!ENTITY firstrun_onionservices_message "For enhanced privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and
-visitors, including added safeguards against censorship. The same way Tor Browser for Android allows you to browse the web with a high degree of privacy onion services allow people to provide content and services privately. You can access .onion sites using Tor Browser for Android.">
+<!ENTITY firstrun_tips_title "Experience Tips.">
+<!ENTITY firstrun_tips_message "With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot.">
+<!ENTITY firstrun_tips_next "Next">
+<!ENTITY firstrun_onionservices_tab_title "Onions">
+<!ENTITY firstrun_onionservices_title "Onion Services.">
+<!ENTITY firstrun_onionservices_message "Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously.">
+<!ENTITY firstrun_onionservices_next "Go to explore">
<!ENTITY onboard_start_restricted1 "Stay safe and in control with this simplified version of &brandShortName;.">
diff --git a/mobile/android/base/strings.xml.in b/mobile/android/base/strings.xml.in
index abf51ae53db6..cfc7b5a137f8 100644
--- a/mobile/android/base/strings.xml.in
+++ b/mobile/android/base/strings.xml.in
@@ -54,22 +54,32 @@
<string name="firstrun_welcome_tab_title">&firstrun_welcome_tab_title;</string>
<string name="firstrun_welcome_title">&firstrun_welcome_title;</string>
<string name="firstrun_welcome_message">&firstrun_welcome_message;</string>
+ <string name="firstrun_welcome_next">&firstrun_welcome_next;</string>
<string name="firstrun_privacy_tab_title">&firstrun_privacy_tab_title;</string>
<string name="firstrun_privacy_title">&firstrun_privacy_title;</string>
<string name="firstrun_privacy_message">&firstrun_privacy_message;</string>
+ <string name="firstrun_privacy_next">&firstrun_privacy_next;</string>
<string name="firstrun_tornetwork_tab_title">&firstrun_tornetwork_tab_title;</string>
<string name="firstrun_tornetwork_title">&firstrun_tornetwork_title;</string>
<string name="firstrun_tornetwork_message">&firstrun_tornetwork_message;</string>
+ <string name="firstrun_tornetwork_next">&firstrun_tornetwork_next;</string>
+
+ <string name="firstrun_secsettings_tab_title">&firstrun_secsettings_tab_title;</string>
+ <string name="firstrun_secsettings_title">&firstrun_secsettings_title;</string>
+ <string name="firstrun_secsettings_message">&firstrun_secsettings_message;</string>
+ <string name="firstrun_secsettings_next">&firstrun_secsettings_next;</string>
<string name="firstrun_tips_tab_title">&firstrun_tips_tab_title;</string>
<string name="firstrun_tips_title">&firstrun_tips_title;</string>
<string name="firstrun_tips_message">&firstrun_tips_message;</string>
+ <string name="firstrun_tips_next">&firstrun_tips_next;</string>
<string name="firstrun_onionservices_tab_title">&firstrun_onionservices_tab_title;</string>
<string name="firstrun_onionservices_title">&firstrun_onionservices_title;</string>
<string name="firstrun_onionservices_message">&firstrun_onionservices_message;</string>
+ <string name="firstrun_onionservices_next">&firstrun_onionservices_next;</string>
<string name="bookmarks_title">&bookmarks_title;</string>
<string name="history_title">&history_title;</string>
diff --git a/mobile/android/branding/torbrowser/res/drawable-nodpi/figure_security.png b/mobile/android/branding/torbrowser/res/drawable-nodpi/figure_security.png
new file mode 100644
index 000000000000..0a0d47f75370
Binary files /dev/null and b/mobile/android/branding/torbrowser/res/drawable-nodpi/figure_security.png differ
1
0

27 Aug '18
commit a8e628fec8bb6e33e0b7e6ba04a5d793240cf99a
Author: Georg Koppen <gk(a)torproject.org>
Date: Mon Aug 27 05:44:52 2018 +0000
Changelog update to add AltSvc ticket
---
projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index e9b394a..f4d8dec 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -23,7 +23,7 @@ Tor Browser 8.0a10 -- August 20 2018
* Bug 26477: Make meek extension compatible with ESR 60
* Bug 27082: Enable a limited UITour for user onboarding
* Bug 26961: New user onboarding
- * Bug 14952: Enable HTTP2 and AltSvc
+ * Bug 14952+24553: Enable HTTP2 and AltSvc
* Bug 25735: Tor Browser stalls while loading Facebook login page
* Bug 17252: Enable TLS session identifiers with first-party isolation
* Bug 26353: Prevent speculative connects that violate first-party isolation
1
0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 26962 - implement new features onboarding (part 1).
by gk@torproject.org 26 Aug '18
by gk@torproject.org 26 Aug '18
26 Aug '18
commit 69b8d3553d21796db96c0913c5747f8724b9b662
Author: Kathy Brade <brade(a)pearlcrescent.com>
Date: Fri Aug 24 14:47:31 2018 -0400
Bug 26962 - implement new features onboarding (part 1).
Add an "Explore" button to the "Circuit Display" panel within new user
onboarding which opens the DuckDuckGo .onion and then guides users through
a short circuit display tutorial.
Allow a few additional UITour actions while limiting as much as possible
how it can be used.
Tweak the UITour styles to match the Tor Browser branding.
All user interface strings are retrieved from Torbutton's
browserOnboarding.properties file.
---
browser/app/permissions | 2 +
browser/components/uitour/UITour.jsm | 51 +++-
browser/components/uitour/content-UITour.js | 2 +-
browser/extensions/onboarding/bootstrap.js | 16 ++
.../content/onboarding-tor-circuit-display.js | 283 +++++++++++++++++++++
.../onboarding/content/onboarding-tour-agent.js | 3 -
.../extensions/onboarding/content/onboarding.js | 6 +-
browser/extensions/onboarding/jar.mn | 1 +
browser/themes/shared/UITour.inc.css | 30 +--
9 files changed, 366 insertions(+), 28 deletions(-)
diff --git a/browser/app/permissions b/browser/app/permissions
index b4b166c755ae..ac3464afd41c 100644
--- a/browser/app/permissions
+++ b/browser/app/permissions
@@ -7,6 +7,8 @@
# See nsPermissionManager.cpp for more...
# UITour
+# DuckDuckGo .onion (used for circuit display onboarding).
+origin uitour 1 https://3g2upl4pq6kufc4m.onion
origin uitour 1 about:home
origin uitour 1 about:newtab
origin uitour 1 about:tor
diff --git a/browser/components/uitour/UITour.jsm b/browser/components/uitour/UITour.jsm
index b282d5c2d885..ce3e20fda662 100644
--- a/browser/components/uitour/UITour.jsm
+++ b/browser/components/uitour/UITour.jsm
@@ -42,9 +42,23 @@ const PREF_LOG_LEVEL = "browser.uitour.loglevel";
const PREF_SEENPAGEIDS = "browser.uitour.seenPageIDs";
const TOR_BROWSER_PAGE_ACTIONS_ALLOWED = new Set([
+ "showInfo", // restricted to TOR_BROWSER_TARGETS_ALLOWED
+ "showMenu", // restricted to TOR_BROWSER_MENUS_ALLOWED
+ "hideMenu", // restricted to TOR_BROWSER_MENUS_ALLOWED
+ "closeTab",
"torBrowserOpenSecuritySettings",
]);
+const TOR_BROWSER_TARGETS_ALLOWED = new Set([
+ "torBrowser-circuitDisplay",
+ "torBrowser-circuitDisplay-diagram",
+ "torBrowser-circuitDisplay-newCircuitButton",
+]);
+
+const TOR_BROWSER_MENUS_ALLOWED = new Set([
+ "controlCenter",
+]);
+
const BACKGROUND_PAGE_ACTIONS_ALLOWED = new Set([
"forceShowReaderIcon",
"getConfiguration",
@@ -103,6 +117,14 @@ var UITour = {
highlightEffects: ["random", "wobble", "zoom", "color"],
targets: new Map([
+ ["torBrowser-circuitDisplay", {
+ query: "#connection-icon",
+ }],
+ ["torBrowser-circuitDisplay-diagram",
+ torBrowserCircuitDisplayTarget("circuit-display-nodes")],
+ ["torBrowser-circuitDisplay-newCircuitButton",
+ torBrowserCircuitDisplayTarget("circuit-reload-button")],
+
["accountStatus", {
query: (aDocument) => {
// If the user is logged in, use the avatar element.
@@ -945,7 +967,7 @@ var UITour = {
// This function is copied to UITourListener.
isSafeScheme(aURI) {
- let allowedSchemes = new Set(["about"]);
+ let allowedSchemes = new Set(["about", "https"]);
if (!allowedSchemes.has(aURI.scheme)) {
log.error("Unsafe scheme:", aURI.scheme);
@@ -988,7 +1010,10 @@ var UITour = {
return Promise.reject("Invalid target name specified");
}
- let targetObject = this.targets.get(aTargetName);
+ let targetObject;
+ if (TOR_BROWSER_TARGETS_ALLOWED.has(aTargetName)) {
+ targetObject = this.targets.get(aTargetName);
+ }
if (!targetObject) {
log.warn("getTarget: The specified target name is not in the allowed set");
return Promise.reject("The specified target name is not in the allowed set");
@@ -1389,6 +1414,10 @@ var UITour = {
},
showMenu(aWindow, aMenuName, aOpenCallback = null) {
+ if (!TOR_BROWSER_MENUS_ALLOWED.has(aMenuName)) {
+ return;
+ }
+
log.debug("showMenu:", aMenuName);
function openMenuButton(aMenuBtn) {
if (!aMenuBtn || !aMenuBtn.boxObject || aMenuBtn.open) {
@@ -1485,6 +1514,10 @@ var UITour = {
},
hideMenu(aWindow, aMenuName) {
+ if (!TOR_BROWSER_MENUS_ALLOWED.has(aMenuName)) {
+ return;
+ }
+
log.debug("hideMenu:", aMenuName);
function closeMenuButton(aMenuBtn) {
if (aMenuBtn && aMenuBtn.boxObject)
@@ -1872,6 +1905,20 @@ function controlCenterTrackingToggleTarget(aUnblock) {
};
}
+function torBrowserCircuitDisplayTarget(aElemID) {
+ return {
+ infoPanelPosition: "rightcenter topleft",
+ query(aDocument) {
+ let popup = aDocument.defaultView.gIdentityHandler._identityPopup;
+ if (popup.state != "open") {
+ return null;
+ }
+ let element = aDocument.getElementById(aElemID);
+ return UITour.isElementVisible(element) ? element : null;
+ },
+ };
+}
+
this.UITour.init();
/**
diff --git a/browser/components/uitour/content-UITour.js b/browser/components/uitour/content-UITour.js
index 88d300c91419..8cd7be0c456b 100644
--- a/browser/components/uitour/content-UITour.js
+++ b/browser/components/uitour/content-UITour.js
@@ -28,7 +28,7 @@ var UITourListener = {
// This function is copied from UITour.jsm.
isSafeScheme(aURI) {
- let allowedSchemes = new Set(["about"]);
+ let allowedSchemes = new Set(["about", "https"]);
if (!allowedSchemes.has(aURI.scheme))
return false;
diff --git a/browser/extensions/onboarding/bootstrap.js b/browser/extensions/onboarding/bootstrap.js
index c553abe39759..4bc6d468dce9 100644
--- a/browser/extensions/onboarding/bootstrap.js
+++ b/browser/extensions/onboarding/bootstrap.js
@@ -87,6 +87,19 @@ function setPrefs(prefs) {
});
}
+function openTorCircuitDisplayPage() {
+ let kFrameScript = "resource://onboarding/onboarding-tor-circuit-display.js";
+ const kOnionURL = "https://3g2upl4pq6kufc4m.onion/"; // DuckDuckGo
+ let win = Services.wm.getMostRecentWindow('navigator:browser');
+ if (win) {
+ let tabBrowser = win.gBrowser;
+ let tab = tabBrowser.addTab(kOnionURL);
+ tabBrowser.selectedTab = tab;
+ let b = tabBrowser.getBrowserForTab(tab);
+ b.messageManager.loadFrameScript(kFrameScript, true);
+ }
+}
+
/**
* syncTourChecker listens to and maintains the login status inside, and can be
* queried at any time once initialized.
@@ -160,6 +173,9 @@ function initContentMessageListener() {
isLoggedIn: syncTourChecker.isLoggedIn()
});
break;
+ case "tor-open-circuit-display-page":
+ openTorCircuitDisplayPage();
+ break;
#if 0
// No telemetry in Tor Browser.
case "ping-centre":
diff --git a/browser/extensions/onboarding/content/onboarding-tor-circuit-display.js b/browser/extensions/onboarding/content/onboarding-tor-circuit-display.js
new file mode 100644
index 000000000000..de4b23c84c2a
--- /dev/null
+++ b/browser/extensions/onboarding/content/onboarding-tor-circuit-display.js
@@ -0,0 +1,283 @@
+// Copyright (c) 2018, The Tor Project, Inc.
+// vim: set sw=2 sts=2 ts=8 et syntax=javascript:
+
+let gStringBundle;
+
+let domLoadedListener = (aEvent) => {
+ let doc = aEvent.originalTarget;
+ if (doc.nodeName == "#document") {
+ removeEventListener("DOMContentLoaded", domLoadedListener);
+ beginCircuitDisplayOnboarding();
+ }
+};
+
+addEventListener("DOMContentLoaded", domLoadedListener, false);
+
+function beginCircuitDisplayOnboarding() {
+ // 1 of 3: Show the introductory "How do circuits work?" info panel.
+ let target = "torBrowser-circuitDisplay";
+ let title = getStringFromName("intro.title");
+ let msg = getStringFromName("intro.msg");
+ let button1Label = getStringFromName("one-of-three");
+ let button2Label = getStringFromName("next");
+ let buttons = [];
+ buttons.push({label: button1Label, style: "text"});
+ buttons.push({label: button2Label, style: "primary", callback: function() {
+ showCircuitDiagram(); }});
+ let options = {closeButtonCallback: function() { cleanUp(); }};
+ Mozilla.UITour.showInfo(target, title, msg, undefined, buttons, options);
+}
+
+function showCircuitDiagram() {
+ // 2 of 3: Open the control center and show the circuit diagram info panel.
+ Mozilla.UITour.showMenu("controlCenter", function() {
+ let target = "torBrowser-circuitDisplay-diagram";
+ let title = getStringFromName("diagram.title");
+ let msg = getStringFromName("diagram.msg");
+ let button1Label = getStringFromName("two-of-three");
+ let button2Label = getStringFromName("next");
+ let buttons = [];
+ buttons.push({label: button1Label, style: "text"});
+ buttons.push({label: button2Label, style: "primary", callback: function() {
+ showNewCircuitButton(); }});
+ let options = {closeButtonCallback: function() { cleanUp(); }};
+ Mozilla.UITour.showInfo(target, title, msg, undefined, buttons, options);
+ });
+}
+
+function showNewCircuitButton() {
+ // 3 of 3: Show the New Circuit button info panel.
+ let target = "torBrowser-circuitDisplay-newCircuitButton";
+ let title = getStringFromName("new-circuit.title");
+ let msg = getStringFromName("new-circuit.msg");
+ let button1Label = getStringFromName("three-of-three");
+ let button2Label = getStringFromName("done");
+ let buttons = [];
+ buttons.push({label: button1Label, style: "text"});
+ buttons.push({label: button2Label, style: "primary", callback: function() {
+ cleanUp(); }});
+ let options = {closeButtonCallback: function() { cleanUp(); }};
+ Mozilla.UITour.showInfo(target, title, msg, undefined, buttons, options);
+}
+
+function cleanUp() {
+ Mozilla.UITour.hideMenu("controlCenter");
+ Mozilla.UITour.closeTab();
+}
+
+function getStringFromName(aName) {
+ const TORBUTTON_BUNDLE_URI = "chrome://torbutton/locale/browserOnboarding.properties";
+ const PREFIX = "onboarding.tor-circuit-display.";
+
+ if (!gStringBundle) {
+ gStringBundle = Services.strings.createBundle(TORBUTTON_BUNDLE_URI)
+ }
+
+ let result;
+ try {
+ result = gStringBundle.GetStringFromName(PREFIX + aName);
+ } catch (e) {
+ result = aName;
+ }
+ return result;
+}
+
+
+// The remainder of the code in this file was adapted from
+// browser/components/uitour/UITour-lib.js (unfortunately, we cannot use that
+// code here because it directly accesses 'document' and it assumes that the
+// content window is the global JavaScript object),
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+// create namespace
+if (typeof Mozilla == "undefined") {
+ var Mozilla = {};
+}
+
+(function($) {
+ "use strict";
+
+ // create namespace
+ if (typeof Mozilla.UITour == "undefined") {
+ /**
+ * Library that exposes an event-based Web API for communicating with the
+ * desktop browser chrome. It can be used for tasks such as opening menu
+ * panels and highlighting the position of buttons in the toolbar.
+ *
+ * <p>For security/privacy reasons `Mozilla.UITour` will only work on a list of allowed
+ * secure origins. The list of allowed origins can be found in
+ * {@link https://dxr.mozilla.org/mozilla-central/source/browser/app/permissions|
+ * browser/app/permissions}.</p>
+ *
+ * @since 29
+ * @namespace
+ */
+ Mozilla.UITour = {};
+ }
+
+ function _sendEvent(action, data) {
+ var event = new content.CustomEvent("mozUITour", {
+ bubbles: true,
+ detail: {
+ action,
+ data: data || {}
+ }
+ });
+
+ content.document.dispatchEvent(event);
+ }
+
+ function _generateCallbackID() {
+ return Math.random().toString(36).replace(/[^a-z]+/g, "");
+ }
+
+ function _waitForCallback(callback) {
+ var id = _generateCallbackID();
+
+ function listener(event) {
+ if (typeof event.detail != "object")
+ return;
+ if (event.detail.callbackID != id)
+ return;
+
+ content.document.removeEventListener("mozUITourResponse", listener);
+ callback(event.detail.data);
+ }
+ content.document.addEventListener("mozUITourResponse", listener);
+
+ return id;
+ }
+
+ /**
+ * Show an arrow panel with optional images and buttons anchored at a specific UI target.
+ *
+ * @see Mozilla.UITour.hideInfo
+ *
+ * @param {Mozilla.UITour.Target} target - Identifier of the UI widget to anchor the panel at.
+ * @param {String} title - Title text to be shown as the heading of the panel.
+ * @param {String} text - Body text of the panel.
+ * @param {String} [icon=null] - URL of a 48x48px (96px @ 2dppx) image (which will be resolved
+ * relative to the tab's URI) to display in the panel.
+ * @param {Object[]} [buttons=[]] - Array of objects describing buttons.
+ * @param {String} buttons[].label - Button label
+ * @param {String} buttons[].icon - Button icon URL
+ * @param {String} buttons[].style - Button style ("primary" or "link")
+ * @param {Function} buttons[].callback - Called when the button is clicked
+ * @param {Object} [options={}] - Advanced options
+ * @param {Function} options.closeButtonCallback - Called when the panel's close button is clicked.
+ *
+ * @example
+ * var buttons = [
+ * {
+ * label: 'Cancel',
+ * style: 'link',
+ * callback: cancelBtnCallback
+ * },
+ * {
+ * label: 'Confirm',
+ * style: 'primary',
+ * callback: confirmBtnCallback
+ * }
+ * ];
+ *
+ * var icon = '//mozorg.cdn.mozilla.net/media/img/firefox/australis/logo.png';
+ *
+ * var options = {
+ * closeButtonCallback: closeBtnCallback
+ * };
+ *
+ * Mozilla.UITour.showInfo('appMenu', 'my title', 'my text', icon, buttons, options);
+ */
+ Mozilla.UITour.showInfo = function(target, title, text, icon, buttons, options) {
+ var buttonData = [];
+ if (Array.isArray(buttons)) {
+ for (var i = 0; i < buttons.length; i++) {
+ buttonData.push({
+ label: buttons[i].label,
+ icon: buttons[i].icon,
+ style: buttons[i].style,
+ callbackID: _waitForCallback(buttons[i].callback)
+ });
+ }
+ }
+
+ var closeButtonCallbackID, targetCallbackID;
+ if (options && options.closeButtonCallback)
+ closeButtonCallbackID = _waitForCallback(options.closeButtonCallback);
+ if (options && options.targetCallback)
+ targetCallbackID = _waitForCallback(options.targetCallback);
+
+ _sendEvent("showInfo", {
+ target,
+ title,
+ text,
+ icon,
+ buttons: buttonData,
+ closeButtonCallbackID,
+ targetCallbackID
+ });
+ };
+
+ /**
+ * Hide any visible info panels.
+ * @see Mozilla.UITour.showInfo
+ */
+ Mozilla.UITour.hideInfo = function() {
+ _sendEvent("hideInfo");
+ };
+
+ /**
+ * Open the named application menu.
+ *
+ * @see Mozilla.UITour.hideMenu
+ *
+ * @param {Mozilla.UITour.MenuName} name - Menu name
+ * @param {Function} [callback] - Callback to be called with no arguments when
+ * the menu opens.
+ *
+ * @example
+ * Mozilla.UITour.showMenu('appMenu', function() {
+ * console.log('menu was opened');
+ * });
+ */
+ Mozilla.UITour.showMenu = function(name, callback) {
+ var showCallbackID;
+ if (callback)
+ showCallbackID = _waitForCallback(callback);
+
+ _sendEvent("showMenu", {
+ name,
+ showCallbackID,
+ });
+ };
+
+ /**
+ * Close the named application menu.
+ *
+ * @see Mozilla.UITour.showMenu
+ *
+ * @param {Mozilla.UITour.MenuName} name - Menu name
+ */
+ Mozilla.UITour.hideMenu = function(name) {
+ _sendEvent("hideMenu", {
+ name
+ });
+ };
+
+ /**
+ * @summary Closes the tab where this code is running. As usual, if the tab is in the
+ * foreground, the tab that was displayed before is selected.
+ *
+ * @description The last tab in the current window will never be closed, in which case
+ * this call will have no effect. The calling code is expected to take an
+ * action after a small timeout in order to handle this case, for example by
+ * displaying a goodbye message or a button to restart the tour.
+ * @since 46
+ */
+ Mozilla.UITour.closeTab = function() {
+ _sendEvent("closeTab");
+ };
+})();
diff --git a/browser/extensions/onboarding/content/onboarding-tour-agent.js b/browser/extensions/onboarding/content/onboarding-tour-agent.js
index af93f7220730..b373c5e0ef01 100644
--- a/browser/extensions/onboarding/content/onboarding-tour-agent.js
+++ b/browser/extensions/onboarding/content/onboarding-tour-agent.js
@@ -18,9 +18,6 @@ let onCanSetDefaultBrowserInBackground = () => {
let onClick = evt => {
switch (evt.target.id) {
- case "onboarding-tour-tor-circuit-display-button":
- // TODO: open circuit display onboarding
- break;
case "onboarding-tour-tor-security-button":
Mozilla.UITour.torBrowserOpenSecuritySettings();
break;
diff --git a/browser/extensions/onboarding/content/onboarding.js b/browser/extensions/onboarding/content/onboarding.js
index 0cfc763e4f5e..de382ac34890 100644
--- a/browser/extensions/onboarding/content/onboarding.js
+++ b/browser/extensions/onboarding/content/onboarding.js
@@ -159,17 +159,14 @@ var onboardingTourset = {
"circuit-display": {
id: "onboarding-tour-tor-circuit-display",
tourNameId: "onboarding.tour-tor-circuit-display",
- instantComplete: true,
getPage(win) {
let div = win.document.createElement("div");
createOnboardingTourDescription(div,
"onboarding.tour-tor-circuit-display.title", "onboarding.tour-tor-circuit-display.description");
createOnboardingTourContent(div, "resource://onboarding/img/figure_tor-circuit-display.png");
-/* TODO: Circuit display onboarding will be implemented in bug 26962.
createOnboardingTourButton(div,
"onboarding-tour-tor-circuit-display-button", "onboarding.tour-tor-circuit-display.button");
-*/
return div;
},
@@ -916,6 +913,9 @@ class Onboarding {
this.gotoPage("onboarding-tour-tor-circuit-display");
handledTourActionClick = true;
break;
+ case "onboarding-tour-tor-circuit-display-button":
+ sendMessageToChrome("tor-open-circuit-display-page");
+ break;
}
if (classList.contains("onboarding-tour-item")) {
telemetry({
diff --git a/browser/extensions/onboarding/jar.mn b/browser/extensions/onboarding/jar.mn
index f7fb13d033ce..8263aa14ebcd 100644
--- a/browser/extensions/onboarding/jar.mn
+++ b/browser/extensions/onboarding/jar.mn
@@ -10,6 +10,7 @@
content/img/ (content/img/*)
* content/onboarding-tour-agent.js (content/onboarding-tour-agent.js)
* content/onboarding.js (content/onboarding.js)
+ content/onboarding-tor-circuit-display.js (content/onboarding-tor-circuit-display.js)
# Package UITour-lib.js in here rather than under
# /browser/components/uitour to avoid "unreferenced files" error when
# Onboarding extension is not built.
diff --git a/browser/themes/shared/UITour.inc.css b/browser/themes/shared/UITour.inc.css
index 1e4298afb82d..ca46be282b51 100644
--- a/browser/themes/shared/UITour.inc.css
+++ b/browser/themes/shared/UITour.inc.css
@@ -49,7 +49,8 @@
}
#UITourTooltipTitle {
- font-size: 1.45rem;
+ color: #420C5D;
+ font-size: 16px;
font-weight: bold;
margin: 0;
}
@@ -57,7 +58,8 @@
#UITourTooltipDescription {
margin-inline-start: 0;
margin-inline-end: 0;
- font-size: 1.15rem;
+ color: #4A4A4A;
+ font-size: 13px;
line-height: 1.8rem;
margin-bottom: 0; /* Override global.css */
}
@@ -79,7 +81,6 @@
#UITourTooltipButtons {
-moz-box-pack: end;
background-color: hsla(210,4%,10%,.07);
- border-top: 1px solid hsla(210,4%,10%,.14);
margin: 10px -16px -16px;
padding: 16px;
}
@@ -113,28 +114,20 @@
#UITourTooltipButtons > button:not(.button-link) {
-moz-appearance: none;
background-color: rgb(251,251,251);
- border-radius: 3px;
- border: 1px solid;
- border-color: rgb(192,192,192);
+ border-radius: 2px;
color: rgb(71,71,71);
- padding: 4px 30px;
+ padding: 6px 30px;
transition-property: background-color, border-color;
transition-duration: 150ms;
}
-#UITourTooltipButtons > button:not(.button-link):not(:active):hover {
- background-color: hsla(210,4%,10%,.15);
- border-color: hsla(210,4%,10%,.15);
- box-shadow: 0 1px 0 0 hsla(210,4%,10%,.05) inset;
-}
-
#UITourTooltipButtons > label,
#UITourTooltipButtons > button.button-link {
-moz-appearance: none;
background: transparent;
border: none;
box-shadow: none;
- color: rgba(0,0,0,0.35);
+ color: #4A4A4A;
padding-left: 10px;
padding-right: 10px;
}
@@ -143,14 +136,13 @@
color: black;
}
-/* The primary button gets the same color as the customize button. */
#UITourTooltipButtons > button.button-primary {
- background-color: rgb(116,191,67);
+ background-color: #420C5D;
color: white;
- padding-left: 30px;
- padding-right: 30px;
+ padding-left: 28px;
+ padding-right: 28px;
}
#UITourTooltipButtons > button.button-primary:not(:active):hover {
- background-color: rgb(105,173,61);
+ background-color: #410A4E;
}
1
0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 26962 - implement new features onboarding (part 2).
by gk@torproject.org 26 Aug '18
by gk@torproject.org 26 Aug '18
26 Aug '18
commit d5f82c2a5747108cc60607b3b7608e9c34640848
Author: Kathy Brade <brade(a)pearlcrescent.com>
Date: Fri Aug 24 14:52:52 2018 -0400
Bug 26962 - implement new features onboarding (part 2).
Add a "New Circuit Display" promotional banner to the about:tbupdate page.
---
.../base/content/abouttbupdate/aboutTBUpdate.css | 25 ++++++++++++++++++++++
.../base/content/abouttbupdate/aboutTBUpdate.js | 9 +++++++-
.../base/content/abouttbupdate/aboutTBUpdate.xhtml | 5 +++++
browser/base/content/tab-content.js | 10 +++++++++
.../locales/en-US/chrome/browser/aboutTBUpdate.dtd | 4 ++++
5 files changed, 52 insertions(+), 1 deletion(-)
diff --git a/browser/base/content/abouttbupdate/aboutTBUpdate.css b/browser/base/content/abouttbupdate/aboutTBUpdate.css
index 2b73552729fc..7ec1950e1474 100644
--- a/browser/base/content/abouttbupdate/aboutTBUpdate.css
+++ b/browser/base/content/abouttbupdate/aboutTBUpdate.css
@@ -53,6 +53,31 @@ a {
margin-bottom: 20px;
}
+#new-features {
+ margin-bottom: 15px;
+ padding: 10px;
+ text-align: center;
+ /* swap text and background colors in this section */
+ color: var(--abouttor-bg-toron-color);
+ background-color: var(--abouttor-text-color);
+}
+
+#new-features-description {
+ margin: 15px auto;
+ max-width: 500px;
+ font-size: 85%;
+}
+
+#new-features button {
+ padding: 8px 20px;
+ border: none;
+ border-radius: 3px;
+ font-size: 90%;
+ color: var(--abouttor-text-color);
+ background-color: var(--abouttor-bg-toron-color);
+ cursor: pointer;
+}
+
#changelog-container {
margin: 0px 20px 20px 20px;
}
diff --git a/browser/base/content/abouttbupdate/aboutTBUpdate.js b/browser/base/content/abouttbupdate/aboutTBUpdate.js
index 8243647c5708..fa8bd3241a28 100644
--- a/browser/base/content/abouttbupdate/aboutTBUpdate.js
+++ b/browser/base/content/abouttbupdate/aboutTBUpdate.js
@@ -1,4 +1,4 @@
-// Copyright (c) 2015, The Tor Project, Inc.
+// Copyright (c) 2018, The Tor Project, Inc.
// See LICENSE for licensing information.
//
// vim: set sw=2 sts=2 ts=8 et syntax=javascript:
@@ -8,3 +8,10 @@ function init()
let event = new CustomEvent("AboutTBUpdateLoad", { bubbles: true });
document.dispatchEvent(event);
}
+
+function showNewFeaturesOnboarding()
+{
+ let event = new CustomEvent("AboutTBUpdateNewFeaturesOnboarding",
+ { bubbles: true });
+ document.dispatchEvent(event);
+}
diff --git a/browser/base/content/abouttbupdate/aboutTBUpdate.xhtml b/browser/base/content/abouttbupdate/aboutTBUpdate.xhtml
index fe8ed69b537f..a046f2658a5a 100644
--- a/browser/base/content/abouttbupdate/aboutTBUpdate.xhtml
+++ b/browser/base/content/abouttbupdate/aboutTBUpdate.xhtml
@@ -28,6 +28,11 @@
</div>
</div>
<br clear="all"/>
+<div id="new-features">
+ <div>&aboutTBUpdate.circuitDisplayHeading;</div>
+ <div id="new-features-description">&aboutTBUpdate.circuitDisplayDescription;</div>
+ <button onclick="showNewFeaturesOnboarding()">&aboutTBUpdate.learnMore;</button>
+</div>
<div id="changelog-container">
<div id="changelog-heading">&aboutTBUpdate.changeLogHeading;</div>
<div id="changelog"></div>
diff --git a/browser/base/content/tab-content.js b/browser/base/content/tab-content.js
index e0cf6747aaa4..c0987dbc05c7 100644
--- a/browser/base/content/tab-content.js
+++ b/browser/base/content/tab-content.js
@@ -359,6 +359,8 @@ AboutReaderListener.init();
let AboutTBUpdateListener = {
init: function(chromeGlobal) {
chromeGlobal.addEventListener('AboutTBUpdateLoad', this, false, true);
+ chromeGlobal.addEventListener("AboutTBUpdateNewFeaturesOnboarding",
+ this, false, true);
},
get isAboutTBUpdate() {
@@ -373,6 +375,9 @@ let AboutTBUpdateListener = {
case "AboutTBUpdateLoad":
this.onPageLoad();
break;
+ case "AboutTBUpdateNewFeaturesOnboarding":
+ this.onNewFeaturesOnboarding();
+ break;
case "pagehide":
this.onPageHide(aEvent);
break;
@@ -406,6 +411,11 @@ let AboutTBUpdateListener = {
removeEventListener("pagehide", this, true);
},
+ onNewFeaturesOnboarding: function() {
+ // Tell the onboarding extension to open the circuit display onboarding.
+ sendAsyncMessage("Onboarding:OnContentMessage",
+ {action: "tor-open-circuit-display-page"});
+ },
};
AboutTBUpdateListener.init(this);
#endif
diff --git a/browser/locales/en-US/chrome/browser/aboutTBUpdate.dtd b/browser/locales/en-US/chrome/browser/aboutTBUpdate.dtd
index 37567bd7e38c..f7b3f2ed8fcd 100644
--- a/browser/locales/en-US/chrome/browser/aboutTBUpdate.dtd
+++ b/browser/locales/en-US/chrome/browser/aboutTBUpdate.dtd
@@ -4,3 +4,7 @@
<!ENTITY aboutTBUpdate.linkLabel "visit our website">
<!ENTITY aboutTBUpdate.linkSuffix ".">
<!ENTITY aboutTBUpdate.changeLogHeading "Changelog:">
+
+<!ENTITY aboutTBUpdate.circuitDisplayHeading "New, Redesigned Circuit Display">
+<!ENTITY aboutTBUpdate.circuitDisplayDescription "The Tor circuit display has been relocated and improved! Click the Site Identity button (located on the left side of the URL bar) to see the new circuit display.">
+<!ENTITY aboutTBUpdate.learnMore "Learn More">
1
0

[tor-browser/tor-browser-60.1.0esr-8.0-1] fixup! Bug 21569: Add first-party domain to Permissions key
by gk@torproject.org 26 Aug '18
by gk@torproject.org 26 Aug '18
26 Aug '18
commit d55b7bb578cf644e780d27efa2355c2046bcf689
Author: Kathy Brade <brade(a)pearlcrescent.com>
Date: Thu Aug 23 09:32:36 2018 -0400
fixup! Bug 21569: Add first-party domain to Permissions key
---
browser/components/uitour/content-UITour.js | 3 ++-
extensions/cookie/nsPermissionManager.cpp | 28 ++++++++++++++++++----------
2 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/browser/components/uitour/content-UITour.js b/browser/components/uitour/content-UITour.js
index be51b8383d6b..88d300c91419 100644
--- a/browser/components/uitour/content-UITour.js
+++ b/browser/components/uitour/content-UITour.js
@@ -48,7 +48,8 @@ var UITourListener = {
if (!this.isSafeScheme(uri))
return false;
- let permission = Services.perms.testPermission(uri, UITOUR_PERMISSION);
+ let permission = Services.perms.testPermissionFromPrincipal(
+ content.document.nodePrincipal, UITOUR_PERMISSION);
if (permission == Services.perms.ALLOW_ACTION)
return true;
diff --git a/extensions/cookie/nsPermissionManager.cpp b/extensions/cookie/nsPermissionManager.cpp
index 29958695f851..62c7277c7d84 100644
--- a/extensions/cookie/nsPermissionManager.cpp
+++ b/extensions/cookie/nsPermissionManager.cpp
@@ -207,7 +207,8 @@ GetOriginFromPrincipal(nsIPrincipal* aPrincipal, nsACString& aOrigin)
}
nsresult
-GetPrincipalFromOrigin(const nsACString& aOrigin, nsIPrincipal** aPrincipal)
+GetPrincipalFromOrigin(const nsACString& aOrigin, bool aAddFirstParty,
+ nsIPrincipal** aPrincipal)
{
nsAutoCString originNoSuffix;
mozilla::OriginAttributes attrs;
@@ -223,6 +224,13 @@ GetPrincipalFromOrigin(const nsACString& aOrigin, nsIPrincipal** aPrincipal)
nsresult rv = NS_NewURI(getter_AddRefs(uri), originNoSuffix);
NS_ENSURE_SUCCESS(rv, rv);
+ // aAddFirstParty is true when adding the default permissions from
+ // browser/app/permissions because those permissions refer to the
+ // first party domain.
+ if (aAddFirstParty) {
+ attrs.SetFirstPartyDomain(true, uri);
+ }
+
nsCOMPtr<nsIPrincipal> principal = mozilla::BasePrincipal::CreateCodebasePrincipal(uri, attrs);
principal.forget(aPrincipal);
return NS_OK;
@@ -419,7 +427,7 @@ public:
int64_t aModificationTime) final
{
nsCOMPtr<nsIPrincipal> principal;
- nsresult rv = GetPrincipalFromOrigin(aOrigin, getter_AddRefs(principal));
+ nsresult rv = GetPrincipalFromOrigin(aOrigin, false, getter_AddRefs(principal));
NS_ENSURE_SUCCESS(rv, rv);
return mPm->AddInternal(principal, aType, aPermission, mID,
@@ -2250,7 +2258,7 @@ nsPermissionManager::GetPermissionObject(nsIPrincipal* aPrincipal,
}
nsCOMPtr<nsIPrincipal> principal;
- nsresult rv = GetPrincipalFromOrigin(entry->GetKey()->mOrigin, getter_AddRefs(principal));
+ nsresult rv = GetPrincipalFromOrigin(entry->GetKey()->mOrigin, false, getter_AddRefs(principal));
NS_ENSURE_SUCCESS(rv, rv);
PermissionEntry& perm = entry->GetPermissions()[idx];
@@ -2498,7 +2506,7 @@ NS_IMETHODIMP nsPermissionManager::GetEnumerator(nsISimpleEnumerator **aEnum)
}
nsCOMPtr<nsIPrincipal> principal;
- nsresult rv = GetPrincipalFromOrigin(entry->GetKey()->mOrigin,
+ nsresult rv = GetPrincipalFromOrigin(entry->GetKey()->mOrigin, false,
getter_AddRefs(principal));
if (NS_FAILED(rv)) {
continue;
@@ -2593,7 +2601,7 @@ nsPermissionManager::RemoveAllModifiedSince(int64_t aModificationTime)
}
nsCOMPtr<nsIPrincipal> principal;
- nsresult rv = GetPrincipalFromOrigin(entry->GetKey()->mOrigin,
+ nsresult rv = GetPrincipalFromOrigin(entry->GetKey()->mOrigin, false,
getter_AddRefs(principal));
if (NS_FAILED(rv)) {
continue;
@@ -2664,7 +2672,7 @@ nsPermissionManager::RemovePermissionsWithAttributes(mozilla::OriginAttributesPa
PermissionHashKey* entry = iter.Get();
nsCOMPtr<nsIPrincipal> principal;
- nsresult rv = GetPrincipalFromOrigin(entry->GetKey()->mOrigin,
+ nsresult rv = GetPrincipalFromOrigin(entry->GetKey()->mOrigin, false,
getter_AddRefs(principal));
if (NS_FAILED(rv)) {
continue;
@@ -2851,7 +2859,7 @@ nsPermissionManager::Read()
modificationTime = stmt->AsInt64(6);
nsCOMPtr<nsIPrincipal> principal;
- nsresult rv = GetPrincipalFromOrigin(origin, getter_AddRefs(principal));
+ nsresult rv = GetPrincipalFromOrigin(origin, false, getter_AddRefs(principal));
if (NS_FAILED(rv)) {
readError = true;
continue;
@@ -3010,7 +3018,7 @@ nsPermissionManager::_DoImport(nsIInputStream *inputStream, mozIStorageConnectio
continue;
nsCOMPtr<nsIPrincipal> principal;
- error = GetPrincipalFromOrigin(lineArray[3], getter_AddRefs(principal));
+ error = GetPrincipalFromOrigin(lineArray[3], true, getter_AddRefs(principal));
if (NS_FAILED(error)) {
NS_WARNING("Couldn't import an origin permission - malformed origin");
continue;
@@ -3240,7 +3248,7 @@ nsPermissionManager::SetPermissionsWithKey(const nsACString& aPermissionKey,
// Add the permissions locally to our process
for (IPC::Permission& perm : aPerms) {
nsCOMPtr<nsIPrincipal> principal;
- nsresult rv = GetPrincipalFromOrigin(perm.origin, getter_AddRefs(principal));
+ nsresult rv = GetPrincipalFromOrigin(perm.origin, false, getter_AddRefs(principal));
if (NS_WARN_IF(NS_FAILED(rv))) {
continue;
}
@@ -3296,7 +3304,7 @@ nsPermissionManager::GetKeyForOrigin(const nsACString& aOrigin, nsACString& aKey
// Parse the origin string into a principal, and extract some useful
// information from it for assertions.
nsCOMPtr<nsIPrincipal> dbgPrincipal;
- MOZ_ALWAYS_SUCCEEDS(GetPrincipalFromOrigin(aOrigin, getter_AddRefs(dbgPrincipal)));
+ MOZ_ALWAYS_SUCCEEDS(GetPrincipalFromOrigin(aOrigin, false, getter_AddRefs(dbgPrincipal)));
nsCOMPtr<nsIURI> dbgUri;
MOZ_ALWAYS_SUCCEEDS(dbgPrincipal->GetURI(getter_AddRefs(dbgUri)));
nsAutoCString dbgScheme;
1
0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 27213 - Update about:tbupdate to new (about:tor) layout
by gk@torproject.org 26 Aug '18
by gk@torproject.org 26 Aug '18
26 Aug '18
commit 61d599ed4c5bb5ace0fc958faaf302dc968cc542
Author: Kathy Brade <brade(a)pearlcrescent.com>
Date: Fri Aug 24 14:51:11 2018 -0400
Bug 27213 - Update about:tbupdate to new (about:tor) layout
Adjust colors, fonts, and the page background to match the new
about:tor.
---
.../base/content/abouttbupdate/aboutTBUpdate.css | 27 ++++++++++++++++------
1 file changed, 20 insertions(+), 7 deletions(-)
diff --git a/browser/base/content/abouttbupdate/aboutTBUpdate.css b/browser/base/content/abouttbupdate/aboutTBUpdate.css
index c171c58624ec..2b73552729fc 100644
--- a/browser/base/content/abouttbupdate/aboutTBUpdate.css
+++ b/browser/base/content/abouttbupdate/aboutTBUpdate.css
@@ -1,7 +1,20 @@
+/*
+ * Copyright (c) 2018, The Tor Project, Inc.
+ * See LICENSE for licensing information.
+ *
+ * vim: set sw=2 sts=2 ts=8 et syntax=css:
+ */
+
+:root {
+ --abouttor-text-color: white;
+ --abouttor-bg-toron-color: #420C5D;
+}
+
body {
- font-family: sans-serif;
+ font-family: Helvetica, Arial, sans-serif;
font-size: 110%;
- background-image: -moz-linear-gradient(top, #ffffff, #ffffff 10%, #d5ffd5 50%, #d5ffd5);
+ color: var(--abouttor-text-color);
+ background-color: var(--abouttor-bg-toron-color);
background-attachment: fixed;
background-size: 100% 100%;
}
@@ -13,11 +26,13 @@ body {
right: 6px;
height: 30px;
width: 200px;
+ font-size: 15px;
white-space: pre-wrap;
text-align: right;
- color: #4d4d4d;
- font-family: "Liberation Sans", Arial, Helvetica, sans-serif;
- font-size: 14px;
+}
+
+a {
+ color: var(--abouttor-text-color);
}
#logo {
@@ -35,7 +50,6 @@ body {
#msg-updated {
font-size: 120%;
- font-weight: bold;
margin-bottom: 20px;
}
@@ -44,7 +58,6 @@ body {
}
#changelog-heading {
- font-weight: bold;
margin-bottom: 4px;
}
1
0

26 Aug '18
commit c93f06417e0bdbd6d709ec5109938347d1d38123
Author: Kathy Brade <brade(a)pearlcrescent.com>
Date: Thu Aug 23 16:44:06 2018 -0400
Bug 26962: Circuit display onboarding (part 2).
Add strings for a "New Circuit Display" promotional banner which is
shown on the about:tbupdate page.
---
src/chrome/locale/en/aboutTBUpdate.dtd | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/chrome/locale/en/aboutTBUpdate.dtd b/src/chrome/locale/en/aboutTBUpdate.dtd
index 37567bd7..f7b3f2ed 100644
--- a/src/chrome/locale/en/aboutTBUpdate.dtd
+++ b/src/chrome/locale/en/aboutTBUpdate.dtd
@@ -4,3 +4,7 @@
<!ENTITY aboutTBUpdate.linkLabel "visit our website">
<!ENTITY aboutTBUpdate.linkSuffix ".">
<!ENTITY aboutTBUpdate.changeLogHeading "Changelog:">
+
+<!ENTITY aboutTBUpdate.circuitDisplayHeading "New, Redesigned Circuit Display">
+<!ENTITY aboutTBUpdate.circuitDisplayDescription "The Tor circuit display has been relocated and improved! Click the Site Identity button (located on the left side of the URL bar) to see the new circuit display.">
+<!ENTITY aboutTBUpdate.learnMore "Learn More">
1
0

[tor-browser/tor-browser-60.1.0esr-8.0-1] fixup! Regression tests for TB4: Tor Browser's Firefox preference overrides.
by gk@torproject.org 25 Aug '18
by gk@torproject.org 25 Aug '18
25 Aug '18
commit 7f61bed1a7dd5c6af77f80419fcf0979c78ec2b4
Author: Georg Koppen <gk(a)torproject.org>
Date: Sat Aug 25 10:49:46 2018 +0000
fixup! Regression tests for TB4: Tor Browser's Firefox preference overrides.
Bug 27268: There is no plugin.expose_full_path anymore
The preference got removed in https://bugzil.la/883671.
---
tbb-tests/browser_tor_TB4.js | 1 -
1 file changed, 1 deletion(-)
diff --git a/tbb-tests/browser_tor_TB4.js b/tbb-tests/browser_tor_TB4.js
index 6defb92c60de..d52f9f137336 100644
--- a/tbb-tests/browser_tor_TB4.js
+++ b/tbb-tests/browser_tor_TB4.js
@@ -80,7 +80,6 @@ let expectedPrefs = [
["general.useragent.vendor", ""],
["general.useragent.vendorSub", ""],
["dom.enable_performance", false],
- ["plugin.expose_full_path", false],
["browser.zoom.siteSpecific", false],
["intl.charset.default", "windows-1252"],
//["intl.accept_languages", "en-us, en"], // Set by Torbutton
1
0

[tor-browser/tor-browser-60.1.0esr-8.0-1] squash! TB4: Tor Browser's Firefox preference overrides.
by gk@torproject.org 25 Aug '18
by gk@torproject.org 25 Aug '18
25 Aug '18
commit ad4624a470a0791ebe836c1b83df88b54f361286
Author: Arthur Edelstein <arthuredelstein(a)gmail.com>
Date: Fri Aug 24 18:25:10 2018 -0700
squash! TB4: Tor Browser's Firefox preference overrides.
Bug 27268: Remove references to obsolete prefs.
Removed prefs are:
browser.usedOnWindows10
browser.selfsupport.enabled
browser.selfsupport.url
browser.newtabpage.directory.ping
browser.newtabpage.directory.source
browser.newtabpage.enhanced
browser.newtabpage.introShown
browser.newtabpage.remote
plugin.expose_full_path
plugins.hide_infobar_for_missing_plugin
plugins.hideMissingPluginsNotification
dom.mozTCPSocket.enabled
---
browser/app/profile/000-tor-browser.js | 16 +---------------
1 file changed, 1 insertion(+), 15 deletions(-)
diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js
index 6fe5955960e2..082b69a11ffe 100644
--- a/browser/app/profile/000-tor-browser.js
+++ b/browser/app/profile/000-tor-browser.js
@@ -9,8 +9,6 @@ pref("browser.search.update", false);
pref("browser.rights.3.shown", true);
pref("startup.homepage_welcome_url", "");
pref("startup.homepage_welcome_url.additional", "");
-// Not set Windows 10 users would get a special introduction on first start.
-pref("browser.usedOnWindows10", true);
// Set a generic, default URL that will be opened in a tab after an update.
// Typically, this will not be used; instead, the <update> element within
@@ -89,10 +87,8 @@ pref("datareporting.policy.dataSubmissionEnabled", false);
// Don't fetch a localized remote page that Tor Browser interacts with, see
// #16727. And, yes, it is "reportUrl" and not "reportURL".
pref("datareporting.healthreport.about.reportUrl", "data:text/plain,");
-// Make sure Selfsupport and Unified Telemetry are really disabled, see: #18738.
pref("datareporting.healthreport.about.reportUrlUnified", "data:text/plain,");
-pref("browser.selfsupport.enabled", false);
-pref("browser.selfsupport.url", "");
+// Make sure Unified Telemetry is really disabled, see: #18738.
pref("toolkit.telemetry.unified", false);
pref("toolkit.telemetry.enabled", false);
// No experiments, use Tor Browser. See 21797.
@@ -103,12 +99,7 @@ pref("services.sync.engine.prefs", false); // Never sync prefs, addons, or tabs
pref("services.sync.engine.addons", false);
pref("services.sync.engine.tabs", false);
pref("extensions.getAddons.cache.enabled", false); // https://blog.mozilla.org/addons/how-to-opt-out-of-add-on-metadata-updates/
-pref("browser.newtabpage.directory.ping", "data:text/plain,"); // Bug 16316 - Avoid potential confusion over tiles for now.
-pref("browser.newtabpage.directory.source", "data:text/plain,"); // Bug 16316 - Avoid potential confusion over tiles for now.
-pref("browser.newtabpage.enhanced", false); // Bug 16316 - Avoid potential confusion over tiles for now.
-pref("browser.newtabpage.introShown", true); // Bug 16316 - Avoid potential confusion over tiles for now.
pref("browser.newtabpage.preload", false); // Bug 16316 - Avoid potential confusion over tiles for now.
-pref("browser.newtabpage.remote", false); // Bug 21685: Disable remote new tab pages
pref("browser.search.countryCode", "US"); // The next three prefs disable GeoIP search lookups (#16254)
pref("browser.search.region", "US");
pref("browser.search.geoip.url", "");
@@ -138,7 +129,6 @@ pref("browser.startup.homepage_override.buildID", "20100101");
pref("general.useragent.vendor", "");
pref("general.useragent.vendorSub", "");
pref("dom.enable_performance", false);
-pref("plugin.expose_full_path", false);
pref("browser.zoom.siteSpecific", false);
pref("intl.charset.default", "windows-1252");
pref("browser.link.open_newwindow.restriction", 0); // Bug 9881: Open popups in new tabs (to avoid fullscreen popups)
@@ -197,8 +187,6 @@ pref("network.gio.supported-protocols", "");
pref("plugin.disable", true); // Disable to search plugins on first start
pref("plugins.click_to_play", true);
pref("plugin.state.flash", 1);
-pref("plugins.hide_infobar_for_missing_plugin", true);
-pref("plugins.hideMissingPluginsNotification", true);
pref("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)
@@ -233,8 +221,6 @@ pref("devtools.appmanager.enabled", false);
// restrictive DNS look-up policy. We use "127.0.0.1" instead of "localhost" as
// a workaround. See bug 16523 for more details.
pref("devtools.debugger.chrome-debugging-host", "127.0.0.1");
-// Disable mozTCPSocket for sure (bug 18863)
-pref("dom.mozTCPSocket.enabled", false);
// Disable using UNC paths (bug 26424 and Mozilla's bug 1413868)
pref("network.file.disable_unc_paths", true);
// Enhance our treatment of file:// to avoid proxy bypasses (see Mozilla's bug
1
0

[tor-browser/tor-browser-60.1.0esr-8.0-1] squash! TB4: Tor Browser's Firefox preference overrides.
by gk@torproject.org 25 Aug '18
by gk@torproject.org 25 Aug '18
25 Aug '18
commit 03c692e334c33c21a2f50c5df75d839b93533e55
Author: Arthur Edelstein <arthuredelstein(a)gmail.com>
Date: Fri Aug 24 15:37:17 2018 -0700
squash! TB4: Tor Browser's Firefox preference overrides.
Bug 27257: Remove obsolete pref "dom.network.enabled"
(The API is disabled under privacy.resistFingerprinting.)
---
browser/app/profile/000-tor-browser.js | 1 -
1 file changed, 1 deletion(-)
diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js
index a859a7143060..6fe5955960e2 100644
--- a/browser/app/profile/000-tor-browser.js
+++ b/browser/app/profile/000-tor-browser.js
@@ -126,7 +126,6 @@ pref("webgl.min_capability_mode", true);
pref("webgl.disable-extensions", true);
pref("webgl.disable-fail-if-major-performance-caveat", true);
pref("webgl.enable-webgl2", false);
-pref("dom.network.enabled",false); // fingerprinting due to differing OS implementations
pref("gfx.downloadable_fonts.fallback_delay", -1);
pref("general.appname.override", "Netscape");
pref("general.appversion.override", "5.0 (Windows)");
1
0

[tor-browser/tor-browser-60.1.0esr-8.0-1] squash! TB4: Tor Browser's Firefox preference overrides.
by gk@torproject.org 25 Aug '18
by gk@torproject.org 25 Aug '18
25 Aug '18
commit 853758c5aede1fbe3f1402a9bd62b731795f1564
Author: Arthur Edelstein <arthuredelstein(a)gmail.com>
Date: Fri Aug 24 15:49:25 2018 -0700
squash! TB4: Tor Browser's Firefox preference overrides.
Bug 27262: Remove leftover HTTP pipelining preferences
The prefs were removed from Firefox in
https://bugzilla.mozilla.org/show_bug.cgi?id=1340655
---
browser/app/profile/000-tor-browser.js | 4 ----
1 file changed, 4 deletions(-)
diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js
index bddbe05c92bb..a859a7143060 100644
--- a/browser/app/profile/000-tor-browser.js
+++ b/browser/app/profile/000-tor-browser.js
@@ -256,10 +256,6 @@ pref("gfx.font_rendering.graphite.enabled", false);
pref("security.ssl.enable_false_start", true);
pref("network.http.connection-retry-timeout", 0);
pref("network.http.max-persistent-connections-per-proxy", 256);
-pref("network.http.pipelining.reschedule-timeout", 15000);
-pref("network.http.pipelining.read-timeout", 60000);
-// Hacked pref: Now means "Attempt to pipeline at least this many requests together"
-pref("network.http.pipelining.max-optimistic-requests", 3);
pref("network.manage-offline-status", false);
// No need to leak things to Mozilla, see bug 21790
pref("network.captive-portal-service.enabled", false);
1
0
commit dca195a191bf897680dde1363d12f7262dd26910
Author: Kathy Brade <brade(a)pearlcrescent.com>
Date: Thu Aug 23 10:26:10 2018 -0400
Bug 26962: Circuit display onboarding
Add strings needed for circuit display onboarding.
---
src/chrome/locale/en/browserOnboarding.properties | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/src/chrome/locale/en/browserOnboarding.properties b/src/chrome/locale/en/browserOnboarding.properties
index 362eefea..49085fba 100644
--- a/src/chrome/locale/en/browserOnboarding.properties
+++ b/src/chrome/locale/en/browserOnboarding.properties
@@ -36,3 +36,19 @@ onboarding.tour-tor-onion-services=Onion Services
onboarding.tour-tor-onion-services.title=Onion Services
onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
onboarding.tour-tor-onion-services.button=Visit an Onion
+
+# Circuit Display onboarding.
+onboarding.tor-circuit-display.next=Next
+onboarding.tor-circuit-display.done=Done
+onboarding.tor-circuit-display.one-of-three=1 of 3
+onboarding.tor-circuit-display.two-of-three=2 of 3
+onboarding.tor-circuit-display.three-of-three=3 of 3
+
+onboarding.tor-circuit-display.intro.title=How do circuits work?
+onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assigned relays, which are computers around the world configured to forward Tor traffic. Circuits allow you to browse privately and to connect to onion services.
+
+onboarding.tor-circuit-display.diagram.title=Circuit Display
+onboarding.tor-circuit-display.diagram.msg=This diagram shows the relays that make up the circuit for this website. To prevent linking of activity across different sites, each website gets a different circuit.
+
+onboarding.tor-circuit-display.new-circuit.title=Do you need a new circuit?
+onboarding.tor-circuit-display.new-circuit.msg=If you are not able to connect to the website you’re trying to visit or it is not loading properly, then you can use this button to reload the site with a new circuit.
1
0

24 Aug '18
commit 0c15ae41035b12c391749230d981383e489c5192
Author: Georg Koppen <gk(a)torproject.org>
Date: Fri Aug 24 08:11:05 2018 +0000
Correct snowflake related comment
---
rbm.conf | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/rbm.conf b/rbm.conf
index fe09b2d..f8a2ad5 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -171,7 +171,8 @@ targets:
var:
linux: 1
compiler: gcc
- # We only build snowflake for linux on the alpha and nightly channels for now.
+ # We only build snowflake for linux and macOS on the alpha and nightly
+ # channels for now.
snowflake: '[% c("var/alpha") || c("var/nightly") %]'
fteproxy: 1
selfrando: '[% c("var/linux-x86_64") && ! c("var/release") %]'
@@ -255,7 +256,8 @@ targets:
FLAGS: "-target x86_64-apple-darwin11 -B $cctoolsdir -isysroot $sysrootdir"
LDFLAGS: "-Wl,-syslibroot,$sysrootdir -Wl,-dead_strip -Wl,-pie"
locale_ja: ja-JP-mac
- # We only build snowflake for linux on the alpha and nightly channels for now.
+ # We only build snowflake for linux and macOS on the alpha and nightly
+ # channels for now.
snowflake: '[% c("var/alpha") || c("var/nightly") %]'
deps:
- build-essential
1
0
commit bb6f4b177a92509182c5d50839089614baee6cb2
Author: Georg Koppen <gk(a)torproject.org>
Date: Thu Aug 23 07:49:51 2018 +0000
Translations update
---
src/chrome/locale/ar/aboutTor.properties | 11 ++---
src/chrome/locale/ar/torbutton.properties | 2 +-
src/chrome/locale/bn-BD/aboutTor.properties | 11 ++---
.../locale/bn-BD/browserOnboarding.properties | 50 +++++++++++-----------
src/chrome/locale/bn-BD/torbutton.properties | 2 +-
src/chrome/locale/ca/aboutTor.properties | 11 ++---
src/chrome/locale/ca/torbutton.properties | 2 +-
src/chrome/locale/da/aboutTor.properties | 11 ++---
src/chrome/locale/da/torbutton.properties | 2 +-
src/chrome/locale/de/aboutTor.properties | 11 ++---
src/chrome/locale/de/torbutton.properties | 2 +-
src/chrome/locale/es/aboutTor.dtd | 8 ++--
src/chrome/locale/es/aboutTor.properties | 11 ++---
src/chrome/locale/es/browserOnboarding.properties | 10 ++---
src/chrome/locale/es/torbutton.properties | 2 +-
src/chrome/locale/eu/aboutTor.properties | 11 ++---
src/chrome/locale/eu/torbutton.properties | 2 +-
src/chrome/locale/fa/aboutTor.properties | 11 ++---
src/chrome/locale/fa/torbutton.properties | 2 +-
src/chrome/locale/fr/aboutTor.properties | 11 ++---
src/chrome/locale/fr/torbutton.properties | 2 +-
src/chrome/locale/ga/aboutTBUpdate.dtd | 2 +-
src/chrome/locale/ga/aboutTor.properties | 11 ++---
src/chrome/locale/ga/torbutton.properties | 8 ++--
src/chrome/locale/he/aboutTor.properties | 11 ++---
src/chrome/locale/he/torbutton.properties | 2 +-
src/chrome/locale/id/aboutTor.properties | 11 ++---
src/chrome/locale/id/torbutton.properties | 2 +-
src/chrome/locale/is/aboutTor.properties | 11 ++---
src/chrome/locale/is/torbutton.properties | 2 +-
src/chrome/locale/it/aboutTor.properties | 11 ++---
src/chrome/locale/it/browserOnboarding.properties | 4 +-
src/chrome/locale/it/torbutton.properties | 2 +-
src/chrome/locale/ja/aboutTor.properties | 11 ++---
src/chrome/locale/ja/torbutton.properties | 2 +-
src/chrome/locale/ko/aboutTor.properties | 11 ++---
src/chrome/locale/ko/torbutton.dtd | 4 +-
src/chrome/locale/ko/torbutton.properties | 2 +-
src/chrome/locale/nb/aboutTor.properties | 11 ++---
src/chrome/locale/nb/torbutton.properties | 2 +-
src/chrome/locale/nl/aboutTor.properties | 11 ++---
src/chrome/locale/nl/torbutton.properties | 2 +-
src/chrome/locale/pl/aboutTor.properties | 11 ++---
src/chrome/locale/pl/torbutton.properties | 2 +-
src/chrome/locale/pt-BR/aboutTor.dtd | 6 +--
src/chrome/locale/pt-BR/aboutTor.properties | 11 ++---
src/chrome/locale/pt-BR/torbutton.properties | 4 +-
src/chrome/locale/ru/aboutTor.properties | 11 ++---
src/chrome/locale/ru/torbutton.properties | 2 +-
src/chrome/locale/sv/aboutTor.properties | 11 ++---
src/chrome/locale/sv/torbutton.properties | 2 +-
src/chrome/locale/tr/aboutTor.properties | 11 ++---
src/chrome/locale/tr/torbutton.dtd | 26 +++++------
src/chrome/locale/tr/torbutton.properties | 16 +++----
src/chrome/locale/vi/aboutTor.properties | 11 ++---
src/chrome/locale/vi/torbutton.properties | 2 +-
src/chrome/locale/zh-CN/aboutTor.properties | 11 ++---
src/chrome/locale/zh-CN/torbutton.properties | 2 +-
src/chrome/locale/zh-TW/aboutTor.properties | 11 ++---
src/chrome/locale/zh-TW/torbutton.properties | 2 +-
60 files changed, 196 insertions(+), 274 deletions(-)
diff --git a/src/chrome/locale/ar/aboutTor.properties b/src/chrome/locale/ar/aboutTor.properties
index 07d82ff0..fefde5e4 100644
--- a/src/chrome/locale/ar/aboutTor.properties
+++ b/src/chrome/locale/ar/aboutTor.properties
@@ -1,13 +1,7 @@
-# Copyright (c) 2014, The Tor Project, Inc.
+# Copyright (c) 2018, The Tor Project, Inc.
# See LICENSE for licensing information.
# vim: set sw=2 sts=2 ts=8 et:
-aboutTor.searchDDG.privacy=Ø§ØšØØ« <a href="%1$S">ؚأÙ
اÙ</a> Ù
ع <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
-
aboutTor.donationBanner.donate=تؚرع Ø§ÙØ¢Ù
aboutTor.donationBanner.slogan=ØªÙØ±: دعÙ
Ø§ÙØµÙ
ÙØ¯ Ø§ÙØ±ÙÙ
Ù
@@ -18,3 +12,6 @@ aboutTor.donationBanner.tagline2=ØØ±ÙØ© Ø§ÙØªÙØ§ØµÙ Ø§ÙØŽØšÙÙ Ø§ÙØ¹Ø§Ù
aboutTor.donationBanner.tagline3=Ø§ÙØØ±ÙØ© عÙÙ Ø§ÙØ¥ÙØªØ±ÙØª
aboutTor.donationBanner.tagline4=ÙØ¹Ø²Ùز ØØ±ÙØ© Ø§ÙØªØ¹ØšÙر عاÙÙ
ÙÙØ§
aboutTor.donationBanner.tagline5=ÙØÙ
Ù Ø®ØµÙØµÙØ© اÙÙ
ÙØ§ÙÙÙ Ù
Ù Ø§ÙØ£ØŽØ®Ø§Øµ ÙÙ ÙÙÙ
+
+aboutTor.newsletter.tagline=Get the latest news from Tor straight to your inbox.
+aboutTor.newsletter.link_text=Sign up for Tor News.
diff --git a/src/chrome/locale/ar/torbutton.properties b/src/chrome/locale/ar/torbutton.properties
index 5dd4c283..afaf8f5b 100644
--- a/src/chrome/locale/ar/torbutton.properties
+++ b/src/chrome/locale/ar/torbutton.properties
@@ -21,8 +21,8 @@ torbutton.popup.external.suggest = ÙØ³ÙاÙ
تÙ, ÙØ¬Øš عÙÙÙ ÙØªØ اÙÙ
torbutton.popup.launch = تØÙ
Ù٠اÙÙ
ÙÙ
torbutton.popup.cancel = Ø¥ÙØºØ§Ø¡
torbutton.popup.dontask = ÙØ²Ù٠اÙÙ
ÙÙØ§Øª تÙÙØ§ØŠÙا Ù
Ù Ø§ÙØ¢Ù ÙØµØ§Ø¹Ø¯Ùا
-torbutton.popup.prompted_language = ÙÙÙ
ÙØÙ Ø²Ø± ØªÙØ± Ù
Ø²ÙØ¯Ùا Ù
Ù Ø§ÙØ®ØµÙØµÙØ©Ø ÙÙ
ÙÙÙ Ø£Ù ÙØ·ÙØš اÙÙØ³Ø® Ø§ÙØ¥ÙجÙÙØ²ÙØ© Ù
Ù ØµÙØØ§Øª Ø§ÙØ¥ÙØªØ±ÙØª. ÙØ¯ ÙÙØªØ¬ ع٠ذÙ٠عرض Ø§ÙØµÙØØ§Øª Ø§ÙØªÙ ØªÙØ¶Ù ÙØ±Ø§Ø¡ØªÙا ØšÙØºØªÙ Ø§ÙØ£Ù
ؚاÙÙØºØ© Ø§ÙØ¥ÙجÙÙØ²ÙØ©.\n\nÙÙ ØªØ±ÙØ¯ Ø·ÙØš ØµÙØØ§Øª اÙÙØš ØšØ§ÙÙØºØ© Ø§ÙØ¥ÙجÙÙØ²ÙØ© ÙØ®ØµÙØµÙØ© Ø£ÙØ¶ÙØ
torbutton.popup.no_newnym = ÙØ§ ÙÙ
ÙÙ ÙØ²Ø± ØªÙØ± Ø£Ù ÙØ¹Ø·ÙÙ ÙÙÙØ© Ø¬Ø¯ÙØ¯Ø© ؚ؎Ù٠آÙ
ÙØ ÙØ£ÙÙ ÙØ§ ÙØ³ØªØ·Ùع اÙÙØµÙ٠إÙÙ Ù
ÙÙØ° تØÙÙ
ØªÙØ±.\n\nÙ٠تستخدÙ
ØØ²Ù
Ø© Ù
ØªØµÙØ ØªÙØ± ØØ§ÙÙØ§ÙØ
+torbutton.security_settings.menu.title = إعدادات Ø§ÙØ£Ù
ا
torbutton.title.prompt_torbrowser = Ù
عÙÙÙ
ات ÙØ§Ù
Ø© ع٠زر ØªÙØ±
torbutton.popup.prompt_torbrowser = ÙÙØ¯ ØªØºÙØ±Øª طرÙÙØ© عÙ
٠زر ØªÙØ±: ÙÙ
ÙØ¹Ø¯ ؚإÙ
ÙØ§Ù٠إÙÙØ§ÙÙ.\n\nأجرÙÙØ§ ÙØ°Ø§ Ø§ÙØªØºÙÙØ± ÙØ£ÙÙ Ù
Ù ØºÙØ± Ø§ÙØ¢Ù
٠استخداÙ
زر ØªÙØ± Ù٠اÙÙ
ØªØµÙØ Ø§ÙØ°Ù ÙØ³ØªØ®Ø¯Ù
ÙÙ Ø§ÙØªØµÙØ Ø®Ø§Ø±Ø¬ ØªÙØ±. ÙÙØ§Ù Ø§ÙØ¹Ø¯Ùد Ù
Ù Ø§ÙØ¹ÙÙ Ø§ÙØªÙ ÙØ§ ÙÙ
ÙÙ Ù
Ø¹Ø§ÙØ¬ØªÙا ؚأ٠طرÙÙØ© أخرÙ.\n\nإذا أردت Ø§ÙØ§Ø³ØªÙ
رار Ù٠استخداÙ
ÙÙÙÙØ±ÙÙÙØ³ Ø¹Ø§Ø¯ÙØ§Ø ÙØ¹ÙÙÙ Ø¥Ø²Ø§ÙØ© زر ØªÙØ± ÙØªÙزÙÙ ØØ²Ù
Ø© Ù
ØªØµÙØ ØªÙØ±. ÙÙ
ا أ٠خصا؊ص Ø§ÙØ®ØµÙØµÙØ© ÙÙ
ØªØµÙØ ØªÙØ± تتÙÙ٠عÙ٠تÙÙ Ø§ÙØªÙ ÙÙ Ù
ØªØµÙØ ÙÙÙÙØ±ÙÙÙØ³ Ø§ÙØ¹Ø§Ø¯ÙØ ØØªÙ Ø¹ÙØ¯ استخداÙ
Ù Ù
ع زر ØªÙØ±.\n\nÙØ¥Ø²Ø§ÙØ© زر ØªÙØ±Ø Ø§Ø°ÙØš Ø¥ÙÙ Ø£Ø¯ÙØ§Øª->Ø¥Ø¶Ø§ÙØ§Øª->Ù
ØÙÙØ§Øª Ø Ø«Ù
اضغط عÙ٠زر Ø¥Ø²Ø§ÙØ© Ø§ÙØ°Ù ØšØ¬Ø§ÙØš Ø²Ø± ØªÙØ±.
torbutton.popup.short_torbrowser = Ù
عÙÙÙ
ات ÙØ§Ù
Ø© ع٠زر ØªÙØ±.\n\nزر ØªÙØ± Ù
ÙØ¹Ù٠دا؊Ù
ا Ø§ÙØ¢Ù.\n\nاضغط عÙ٠زر ØªÙØ± ÙÙÙ
Ø²ÙØ¯ Ù
٠اÙÙ
عÙÙÙ
ات.
diff --git a/src/chrome/locale/bn-BD/aboutTor.properties b/src/chrome/locale/bn-BD/aboutTor.properties
index 210ce23c..50f23afa 100644
--- a/src/chrome/locale/bn-BD/aboutTor.properties
+++ b/src/chrome/locale/bn-BD/aboutTor.properties
@@ -1,13 +1,7 @@
-# Copyright (c) 2014, The Tor Project, Inc.
+# Copyright (c) 2018, The Tor Project, Inc.
# See LICENSE for licensing information.
# vim: set sw=2 sts=2 ts=8 et:
-aboutTor.searchDDG.privacy=<a href="%1$S"> DuckDuckGo àŠŠàŠ¿àŠ¯àŠŒà§ àŠšàŠ¿àŠ°àŠŸàŠªàŠŠà§ àŠ
àŠšà§àŠžàŠšà§àŠ§àŠŸàŠš àŠàаà§àŠš <a href="%2$S">
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
-
aboutTor.donationBanner.donate=àŠàŠàŠšàŠ¿ àŠŠàŠŸàŠš àŠàаà§!
aboutTor.donationBanner.slogan=àŠàа: àŠ¡àŠ¿àŠàŠ¿àŠàŠŸàŠ² àŠªà§àŠ°àŠ€àŠ¿àŠ°à§àЧ àŠà§àŠ·àŠ®àŠ€àŠŸ
@@ -18,3 +12,6 @@ aboutTor.donationBanner.tagline2=àŠšà§àŠàŠàŠ¯àŠŒàŠŸàŠ°à§àŠàŠ¿àŠ àŠžà§àЬ
aboutTor.donationBanner.tagline3=àŠ«à§àŠ°àŠ¿àŠ¡àŠ® àŠ
àŠšàŠ²àŠŸàŠàŠš
aboutTor.donationBanner.tagline4=àŠ¬àŠ¿àŠ¶à§àŠ¬àŠ¬à§àŠ¯àŠŸàŠªà§ àŠ¬àŠ¿àŠšàŠŸàŠ®à§àвà§àŠ¯à§ àŠ
àŠàŠ¿àŠ¬àŠŸàŠŠàŠš àŠàŠ€à§àŠžàŠŸàŠ¹àŠŠàŠŸàŠš
aboutTor.donationBanner.tagline5=àŠªà§àŠ°àŠ€àŠ¿ àŠŠàŠ¿àŠš àŠ²àŠà§àŠ· àŠ²àŠà§àŠ· àŠà§àŠªàŠšà§àŠ¯àŠŒàŠ€àŠŸ àŠ°àŠà§àŠ·àŠŸ àŠàаà§àŠš
+
+aboutTor.newsletter.tagline=Get the latest news from Tor straight to your inbox.
+aboutTor.newsletter.link_text=Sign up for Tor News.
diff --git a/src/chrome/locale/bn-BD/browserOnboarding.properties b/src/chrome/locale/bn-BD/browserOnboarding.properties
index aaf75ba1..219a6833 100644
--- a/src/chrome/locale/bn-BD/browserOnboarding.properties
+++ b/src/chrome/locale/bn-BD/browserOnboarding.properties
@@ -2,37 +2,37 @@
# See LICENSE for licensing information.
# vim: set sw=2 sts=2 ts=8 et:
-onboarding.tour-tor-welcome=Welcome
-onboarding.tour-tor-welcome.title=Youâre ready.
-onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
-onboarding.tour-tor-welcome.button=Start Now
+onboarding.tour-tor-welcome=àŠžà§àŠ¬àŠŸàŠàŠ€àŠ®
+onboarding.tour-tor-welcome.title=àŠ€à§àŠ®àŠ¿ àŠ°à§àŠ¡àŠ¿ ी
+onboarding.tour-tor-welcome.description=àŠàа àŠ¬à§àŠ°àŠŸàŠàŠàŠŸàŠ° àŠàŠ¯àŠŒà§àЬ àŠ¬à§àŠ°àŠŸàŠàŠ àŠàŠ°àŠŸàŠ° àŠžàŠ®àŠ¯àŠŒ àŠà§àŠªàŠšà§àŠ¯àŠŒàŠ€àŠŸ àŠàŠ¬àŠ àŠšàŠ¿àŠ°àŠŸàŠªàŠ€à§àŠ€àŠŸàŠ° àŠžàŠ°à§àЬà§àŠà§àŠ àŠ®àŠŸàŠš àŠªà§àŠ°àŠŠàŠŸàŠš àŠàŠ°à§ à¥€ àŠàŠªàŠšàŠ¿ àŠàŠàŠš àŠà§àаà§àŠ¯àŠŸàŠàŠ¿àŠ, àŠšàŠàŠ°àŠŠàŠŸàŠ°àŠ¿ àŠàŠ¬àŠ àŠžà§àŠšà§àŠžàŠ°àŠ¶àŠ¿àŠªà§àа àŠ¬àŠ¿àŠ°à§àŠŠà§àŠ§à§ àŠžà§àаàŠà§àŠ·àŠ¿àŠ€ ी àŠà§àŠšà§ àŠšàŠ¿àŠš àŠàŠ àŠà§àŠàŠ onboarding àŠ
àŠšà§àŠžàŠ°àŠ£ àŠàŠ°à§ àŠàŠ®àŠ°àŠŸ àŠàŠ¿ àŠàаàŠàŠ¿ ी
+onboarding.tour-tor-welcome.button=àŠàŠàŠš àŠ¶à§àŠ°à§ àŠàаà§àŠš
onboarding.tour-tor-privacy=àŠà§àŠªàŠšà§àŠ¯àŠŒàŠ€àŠŸ
-onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
-onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canât follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click âTor Networkâ to learn how we protect you on the network level.
-onboarding.tour-tor-privacy.button=Go to Tor Network
+onboarding.tour-tor-privacy.title=Snub àŠ¡àŠŸàŠ¯àŠŒà§àŠà§àа àŠ snoopers ी
+onboarding.tour-tor-privacy.description=àŠàа àŠ¬à§àŠ°àŠŸàŠàŠàŠŸàŠ° àŠªà§àŠ°àŠ€àŠ¿àŠàŠ¿ àŠ¡à§àŠ®à§àŠàŠšà§àа àŠàŠšà§àН àŠžàŠàв àŠà§àŠ°àŠŸàŠ«àŠ¿àŠ àŠžàŠŸàŠ¬àŠ®à§àŠ°àŠ¿àŠšàŠà§ àŠàŠŸàŠšàŠ¿àŠ¯àŠŒà§ àŠŠàŠŸàŠ àŠàŠ°àŠ¬à§ à¥€ àŠ€àŠŸàŠ° àŠ®àŠŸàŠšà§ àŠ¡àŠŸàŠ¯àŠŒà§àŠà§àа àŠàа àŠ¬àŠ¿àŠà§àŠàŠŸàŠªàŠšàŠŠàŠŸàŠ€àŠŸ àŠàŠªàŠšàŠŸàŠà§ àŠ
àŠšà§àŠžàŠ°àŠ£ àŠàŠ°àŠ€à§ àŠªàŠŸàŠ°à§ àŠšàŠŸ ी àŠàŠ¬àŠ àŠàŠªàŠšàŠŸàŠ° àŠ
àŠ§àŠ¿àŠ¬à§àŠ¶àŠšà§àа àŠªàŠ° àŠ¬àŠ¿àŠà§àŠàŠ¿àŠšà§àŠš àŠà§àŠàŠ¿ àŠ¬àŠŸ àŠ¬à§àŠ°àŠŸàŠàŠàŠŸàŠ°à§àа àŠàŠ€àŠ¿àŠ¹àŠŸàŠž àŠ®à§àŠà§ àŠ«à§àŠ²àŠŸ àŠ¹àŠ¯àŠŒ àŠàŠ®àŠš àŠà§àŠšà§ àŠ€àŠ¥à§àН àŠžà§àŠà§àаà§àŠ à¥€ àŠ¬à§àŠ°àŠŸàŠàŠàŠŸàŠ°à§ àŠàŠªàŠšàŠŸàŠ° àŠà§àŠªàŠšà§àŠ¯àŠŒàŠ€àŠŸ àŠ àŠšàŠ¿àŠ°àŠŸàŠªàŠ€à§àŠ€àŠŸ àŠžà§àаàŠà§àŠ·àŠŸ àŠšàŠ¿àŠ¶à§àŠàŠ¿àŠ€ àŠàŠ°àŠ€à§ àŠàŠ®àŠ°àŠŸ àŠàŠ àŠžàŠàв àŠªàŠ°àŠ¿àŠ¬àŠ°à§àŠ€àŠš àŠàŠ°à§ àŠ¥àŠŸàŠàŠ¿ ी àŠàŠ®àŠ°àŠŸ àŠšà§àŠàŠàŠ¯àŠŒàŠŸàŠ°à§àŠ àŠžà§àŠ€àŠ°à§ àŠàŠªàŠšàŠŸàŠà§ àŠàŠ¿à
ŠàŠŸàŠ¬à§ àŠ°àŠà§àŠ·àŠŸ àŠàŠ°àŠ¿ àŠ€àŠŸ àŠàŠŸàŠšàŠ€à§ ' àŠàа àŠšà§àŠàŠàŠ¯àŠŒàŠŸàŠ°à§àŠ ' àŠàŠ¿àŠªà§àŠš ी
+onboarding.tour-tor-privacy.button=àŠàа àŠšà§àŠàŠàŠ¯àŠŒàŠŸàŠ°à§àŠà§ àŠ¯àŠŸàŠš
-onboarding.tour-tor-network=Tor Network
-onboarding.tour-tor-network.title=Travel a decentralized network.
-onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâs no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on âCircuit Displayâ to learn how they work.
-onboarding.tour-tor-network.button=Go to Circuit Display
+onboarding.tour-tor-network=àŠàа àŠšà§àŠàŠàŠ¯àŠŒàŠŸàŠ°à§àŠ
+onboarding.tour-tor-network.title=àŠàŠàŠàŠ¿ àŠ¬àŠ¿àŠà§àŠšà§àŠŠà§àаà§àŠàŠ°àŠ£à§àа àŠšà§àŠàŠàŠ¯àŠŒàŠŸàŠ°à§àŠ àŠªàŠ°àŠ¿àŠà§àŠ°àŠ®àŠ£ àŠàŠ°à§ à¥€
+onboarding.tour-tor-network.description=àŠàа àŠ¬à§àŠ°àŠŸàŠàŠàŠŸàŠ° àŠàŠªàŠšàŠŸàŠà§ àŠàа àŠšà§àŠàŠàŠ¯àŠŒàŠŸàŠ°à§àŠà§ àŠžàŠàНà§àŠà§àŠ€ àŠàŠ°àŠ¬à§ à¥€ àŠàŠ®àŠŸàŠŠà§àа àŠšà§àŠàŠàŠ¯àŠŒàŠŸàŠ°à§àŠ VPN àŠ¥à§àŠà§ àŠàŠªàŠšàŠŸàŠà§ àŠ¬à§àŠ¶àŠ¿ àŠžà§àаàŠà§àŠ·àŠŸ àŠŠà§àŠ¯àŠŒ àŠàŠŸàŠ°àŠ£ àŠàŠàŠ¿ àŠà§àŠšà§àŠŠà§àаà§àŠ¯àŠŒ àŠšàŠ¯àŠŒ. àŠàа àŠ¹àŠ² àŠžàŠŸàŠ°à§àŠàŠŸàŠ°à§àа àŠàŠàŠàŠ¿ àŠšà§àŠàŠàŠ¯àŠŒàŠŸàŠ°à§àŠ, àŠàŠ®àŠ°àŠŸ àŠ€àŠŸàŠŠà§àа relays àŠ¬àŠ²àŠ¿, àŠžàŠŸàŠ°àŠŸ àŠ¬àŠ¿àŠ¶à§àЬà§àа àŠ¹àŠŸàŠàŠŸàŠ°à§ àŠžà§àЬà§àŠà§àŠàŠŸàŠžà§àŠ¬à§ à¥€ àŠàŠ àŠŠàŠ¿àŠà§, àŠ¬à§àŠ¯àŠ°à§àŠ¥àŠ€àŠŸàŠ° àŠàŠ àŠ¬àŠ¿àŠšà§àŠŠà§ àŠšà§àŠ àŠàŠ¬àŠ àŠàŠšà§àŠàŠŸàŠ°àŠšà§àŠ àŠàŠªàŠà§àŠ àŠàŠ°àŠŸàŠ° àŠàŠšà§àН àŠà§àŠš àŠà§àŠšà§àŠŠà§àаà§àŠ¯àŠŒ àŠžàŠàŠžà§àŠ¥àŠŸàŠàŠ¿àŠà§ àŠ¬àŠ¿àŠ¶à§àŠ¬àŠŸàŠž àŠàŠ°àŠ€à§ àŠ¹àŠ¬à§ àŠšàŠŸ ी àŠªà§àŠ°àŠ€àŠ¿àŠàŠ¿ àŠ¡à§àŠ®à§àŠàŠšà§àа àŠàŠšà§àН àŠàŠªàŠšàŠ¿ àŠàŠªà§àŠš àŠàŠ°à§ àŠàŠ®àŠ°
àŠŸ àŠàŠªàŠšàŠŸàŠ° àŠàŠšà§àН àŠàŠàŠàŠ¿ àŠ¬àŠ°à§àŠ€àŠšà§ àŠ€à§àŠ°àŠ¿ àŠàŠ°àŠ¿, àŠ€àŠŸàŠ°àŠŸ àŠàŠ¿àŠàŠŸàŠ¬à§ àŠàŠŸàŠ àŠàŠ°à§ àŠ€àŠŸ àŠàŠŸàŠšàŠ€à§ ' àŠžàŠŸàŠ°à§àŠàŠ¿àŠ àŠ¡àŠ¿àŠžàŠªà§àŠ²à§ '-àŠ àŠà§àŠ²àŠ¿àŠ àŠàаà§àŠš ी
+onboarding.tour-tor-network.button=àŠžàŠŸàŠ°à§àŠàŠ¿àŠ àŠ¡àŠ¿àŠžàŠªà§àвà§-àŠ€à§ àŠ¯àŠŸàŠš
-onboarding.tour-tor-circuit-display=Circuit Display
-onboarding.tour-tor-circuit-display.title=See your path.
-onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking âNew Circuit for this Siteâ on our Circuit Display. Click below to see how it works.
-onboarding.tour-tor-circuit-display.button=Explore
+onboarding.tour-tor-circuit-display=àŠžàŠŸàŠ°à§àŠàŠ¿àŠ àŠ¡àŠ¿àŠžàŠªà§àвà§
+onboarding.tour-tor-circuit-display.title=àŠàŠªàŠšàŠŸàŠ° àŠªàŠ¥ àŠŠà§àŠà§àŠš ी
+onboarding.tour-tor-circuit-display.description=àŠªà§àŠ°àŠ€àŠ¿àŠàŠ¿ àŠ¡à§àŠ®à§àŠàŠšà§àа àŠàŠšà§àН àŠàŠªàŠšàŠ¿ àŠàŠªàŠšàŠŸàŠ° àŠà§àŠ°àŠŸàŠ«àŠ¿àŠ àŠ¬àŠ¿àŠà§àŠàŠªà§àŠ€àŠ¿àŠàŠ¿ àŠàŠ¬àŠ àŠžàŠŸàŠ°àŠŸ àŠ¬àŠ¿àŠ¶à§àЬà§àа àŠ€àŠ¿àŠšàŠàŠ¿ relays àŠàŠàŠàŠ¿ àŠžàŠŸàŠ°à§àŠàŠ¿àŠà§ àŠžàŠà§àŠà§àŠ€àŠŸàŠ¯àŠŒàŠ¿àŠ€ àŠàаà§àŠš ी àŠàŠ àŠàŠŸàŠ¬à§ àŠà§àŠš àŠàŠ¯àŠŒà§àŠ¬àŠžàŠŸàŠàŠ àŠàŠŸàŠšà§ àŠšàŠŸ àŠàŠªàŠšàŠ¿ àŠà§àŠ¥àŠŸ àŠ¥à§àŠà§ àŠžàŠàНà§àŠ àŠàаàŠà§àŠš, àŠàŠŸàŠ°àŠ£ àŠ€àŠŸàŠ°àŠŸ àŠ¶à§àЧà§àŠ®àŠŸàŠ€à§àа àŠ¶à§àŠ· àŠ°àŠ¿àŠ²à§ àŠ¥à§àŠà§ àŠàŠžàŠŸ àŠžàŠàНà§àŠàŠàŠ¿ àŠŠà§àŠàŠ€à§ àŠªàŠŸàŠ¬à§ à¥€ àŠàŠªàŠšàŠ¿ àŠ¯àŠŠàŠ¿ àŠàŠàŠàŠ¿ àŠšàŠ€à§àŠš àŠžàŠŸàŠ°à§àŠàŠ¿àŠ àŠªàŠàŠšà§àŠŠ àŠàаà§àŠš, àŠ€àŠŸàŠ¹àŠ²à§ àŠàŠ®àŠŸàŠŠà§àа àŠžàŠŸàŠ°à§àŠàŠ¿àŠ àŠ¡àŠ¿àŠžàŠªà§àвà§àа àŠàŠ àŠžàŠŸàŠàŠà§àа àŠàŠšà§àН àŠšàŠ€à§àŠš àŠ¬àŠ°à§àŠ€àŠšà§ àŠà§àŠ²àŠ¿àŠ àŠàŠ°à§ àŠàŠàŠàŠ¿ àŠ
àŠšà§àаà§àЧ àŠàŠ°àŠ€à§ àŠªàŠŸàŠ°à§àŠš.
àŠàŠ¿àŠàŠŸàŠ¬à§ àŠàŠŸàŠ àŠàŠ°à§ àŠ€àŠŸ àŠŠà§àŠàŠ€à§ àŠšàŠ¿àŠà§ àŠà§àŠ²àŠ¿àŠ àŠàаà§àŠš.
+onboarding.tour-tor-circuit-display.button=àŠàŠà§àŠžàŠªà§àвà§àа
-onboarding.tour-tor-security=Security
-onboarding.tour-tor-security.title=Choose your experience.
-onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
-onboarding.tour-tor-security.button=Review Settings
+onboarding.tour-tor-security=àŠšàŠ¿àŠ°àŠŸàŠªàŠ€à§àŠ€àŠŸ
+onboarding.tour-tor-security.title=àŠàŠªàŠšàŠŸàŠ° àŠ
àŠàŠ¿àŠà§àŠàŠ€àŠŸ àŠªàŠàŠšà§àŠŠ àŠàаà§àŠš ी
+onboarding.tour-tor-security.description=àŠàŠªàŠšàŠŸàŠ° àŠà§àŠªàŠšà§àŠ¯àŠŒàŠ€àŠŸ àŠžàŠ°à§àŠ¬àŠŠàŠŸàŠ àŠàа àŠ¬à§àŠ°àŠŸàŠàŠàŠŸàŠ° àŠàŠ¬àŠ àŠàа àŠšà§àŠàŠàŠ¯àŠŒàŠŸàŠ°à§àŠ àŠŠà§àŠ¬àŠŸàŠ°àŠŸ àŠ¡àŠ¿àŠ«àŠ²à§àŠ àŠ
àŠšà§àŠžàŠŸàŠ°à§ àŠ¯àŠ€à§àŠš àŠšà§àŠàŠ¯àŠŒàŠŸ àŠ¹àŠ¬à§. àŠàŠàŠŸàŠ¡àŠŒàŠŸàŠ àŠàŠ®àŠ°àŠŸ àŠàŠªàŠšàŠŸàŠà§ àŠ¬àŠ¿àŠàŠ¿àŠšà§àŠš àŠžà§àŠàŠ¿àŠàŠž àŠªà§àŠ°àŠŠàŠŸàŠš àŠàŠ°àŠ¿ àŠ¯àŠàŠš àŠàŠªàŠšàŠ¿ àŠžàŠŸàŠàŠ àŠ
à§àŠ¯àŠŸàŠà§àŠžà§àŠž àŠàŠ°àŠŸàŠ° àŠžàŠ®àŠ¯àŠŒ àŠàŠªàŠšàŠŸàŠ° àŠ¬à§àŠ°àŠŸàŠàŠàŠŸàŠ°à§àа àŠšàŠ¿àŠ°àŠŸàŠªàŠ€à§àŠ€àŠŸàŠà§ àŠŠà§àŠàŠ€à§ àŠàŠŸàŠš. àŠàŠªàŠšàŠŸàŠ° àŠàŠ®à§àŠªàŠ¿àŠàŠàŠŸàŠ°à§ àŠàŠà§àŠ°àŠ®àŠ£ àŠàŠ°àŠ€à§ àŠàŠŸàŠ°àŠŸàŠª àŠàŠà§àŠšà§àŠàŠŠà§àа àŠŠà§àŠ¬àŠŸàŠ°àŠŸ àŠ¬à§àŠ¯àŠ¬àŠ¹àŠŸàŠ° àŠàŠ°àŠŸ àŠ¯à§àŠ€à§ àŠªàŠŸàŠ°à§ àŠàŠ®àŠš àŠàŠ¿àŠà§ àŠ¬àŠšà§àЧ àŠàŠ°àŠŸàŠ° àŠàŠšà§àН àŠàŠ®àŠŸàŠŠà§àа àŠšàŠ¿àŠ°àŠŸàŠªàŠ€à§àŠ€àŠŸ àŠ¬àŠ¿àŠšà§àŠ¯àŠŸàŠžàŠšàŠžàŠ®à§àй àŠàŠªàŠšàŠŸàŠà§ àŠžàŠ®à§àŠ®àŠ€àŠ¿ à
ŠŠà§àŠ¬à§ à¥€ àŠ¬àŠ¿àŠàŠ¿àŠšà§àŠš àŠ
àŠªàŠ¶àŠš àŠàŠ¬àŠ àŠ€àŠŸàŠ°àŠŸ àŠà§ àŠàŠ°à§ àŠ€àŠŸ àŠŠà§àŠàŠ€à§ àŠšàŠ¿àŠà§ àŠà§àŠ²àŠ¿àŠ àŠàаà§àŠš ी
+onboarding.tour-tor-security.button=àŠªàŠ°à§àŠ¯àŠŸàŠ²à§àŠàŠšàŠŸ àŠžà§àŠàŠ¿àŠàŠž
-onboarding.tour-tor-expect-differences=Experience Tips
-onboarding.tour-tor-expect-differences.title=Experience Tips
-onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
-onboarding.tour-tor-expect-differences.button=See FAQs
+onboarding.tour-tor-expect-differences=àŠ
àŠàŠ¿àŠà§àŠàŠ€àŠŸàŠ° àŠàŠ¿àŠªàŠž
+onboarding.tour-tor-expect-differences.title=àŠ
àŠàŠ¿àŠà§àŠàŠ€àŠŸàŠ° àŠàŠ¿àŠªàŠž
+onboarding.tour-tor-expect-differences.description=àŠàа àŠ¬à§àŠ°àŠŸàŠàŠàŠŸàŠ° àŠàŠ¬àŠ àŠàа àŠšà§àŠàŠàŠ¯àŠŒàŠŸàŠ°à§àŠ àŠŠà§àŠ¬àŠŸàŠ°àŠŸ àŠªà§àŠ°àŠŠàŠ€à§àŠ€ àŠšàŠ¿àŠ°àŠŸàŠªàŠ€à§àŠ€àŠŸ àŠàŠ¬àŠ àŠà§àŠªàŠšà§àŠ¯àŠŒàŠ€àŠŸàŠ° àŠ¬à§àŠ¶àŠ¿àŠ·à§àŠà§àНàŠà§àŠ²àŠ¿ àŠžàŠ¹, àŠàŠšà§àŠàŠŸàŠ°àŠšà§àŠ àŠ¬à§àŠ°àŠŸàŠàŠ àŠàŠ°àŠŸàŠ° àŠžàŠ®àŠ¯àŠŒ àŠàŠªàŠšàŠŸàŠ° àŠ
àŠàŠ¿àŠà§àŠàŠ€àŠŸ àŠàŠ¿àŠà§àŠàŠŸ àŠàŠ¿àŠšà§àŠš àŠ¹àŠ¬à§ à¥€ àŠàŠªàŠšàŠ¿ àŠ²àŠà§àŠ·à§àН àŠàŠ°àŠ¬à§àŠš àŠ¯à§ àŠàŠªàŠšàŠŸàŠ° àŠžàŠàНà§àŠ àŠžàŠŸàŠ°àŠŸ àŠ¬àŠ¿àŠ¶à§àЬà§àа àŠ€àŠ¿àŠšàŠàŠ¿ relays àŠ®àŠŸàŠ§à§àŠ¯àŠ®à§ àŠàвàŠà§ ी àŠ
àŠšà§àŠ àŠžàŠ®àŠ¯àŠŒ àŠžàŠŸàŠàŠ àŠàŠªàŠšàŠŸàŠà§ àŠªà§àŠ°àŠ®àŠŸàŠš àŠàŠ°àŠ€à§ àŠ¬àŠ²àŠ¬à§ àŠ¯à§ àŠàŠªàŠšàŠ¿ àŠàŠàŠàŠš àŠ®àŠŸàŠšà§àŠ· àŠ°à§àŠ¬àŠ àŠšàŠ¯àŠŒ àŠàŠ¬àŠ àŠàŠªàŠšàŠŸàŠ° àŠšàŠ¿àŠ°àŠŸàŠªàŠ€à§àŠ€àŠŸ àŠ¬àŠ¿àŠàвà§àŠªà§àа àŠàŠªàŠ° àŠšàŠ¿àŠ°à§àŠàа àŠàаà§àŠš, àŠàŠ¿àŠà§ àŠ¬àŠ¿àŠ·àŠ¯àŠŒ àŠ¹àŠ¯àŠŒàŠ€à§ àŠàŠŸàŠ àŠ¬àŠŸ àŠ
²à§àŠ¡ àŠàŠ°àŠ€à§ àŠªàŠŸàŠ°à§ àŠšàŠŸ ी àŠàŠ®àŠŸàŠŠà§àа àŠ²àŠà§àŠ·à§àН àŠžàŠ¬ àŠžàŠ®àŠ¯àŠŒ àŠàŠ®àŠŸàŠŠà§àа àŠ¬à§àŠ¯àŠ¬àŠ¹àŠŸàŠ°àŠàŠŸàŠ°à§àŠŠà§àа àŠžàŠ¬àŠà§àŠ¯àŠŒà§ àŠàŠŸàŠ²à§ àŠ
àŠàŠ¿àŠà§àŠàŠ€àŠŸ àŠªà§àŠ°àŠŠàŠŸàŠš àŠàŠ°àŠŸ àŠ¹àŠ¯àŠŒ, àŠ¯àŠàŠš àŠàŠ®àŠŸàŠŠà§àа àŠ¬à§àŠ¯àŠ¬àŠ¹àŠŸàŠ°àŠàŠŸàŠ°à§àŠŠà§àа àŠàŠžàŠ² àŠà§àŠªàŠšà§àŠ¯àŠŒàŠ€àŠŸ àŠªà§àŠ°àŠŠàŠŸàŠš àŠàŠ°àŠŸ àŠ¹àŠ¯àŠŒ ी
+onboarding.tour-tor-expect-differences.button=àŠžà§àŠ¬àŠ¿àŠ§àŠŸàŠžàŠ®à§àй àŠŠà§àŠà§àŠš
onboarding.tour-tor-onion-services=Onion àŠžà§àŠ¬àŠŸ
onboarding.tour-tor-onion-services.title=Onion àŠžà§àŠ¬àŠŸ
-onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
-onboarding.tour-tor-onion-services.button=Visit an Onion
+onboarding.tour-tor-onion-services.description=àŠžàŠ¬àŠ¶à§àŠ·à§ àŠàŠ®àŠ°àŠŸ àŠàŠªàŠšàŠŸàŠà§ àŠªà§àŠàŠ¯àŠŒàŠŸàŠà§àа àŠžà§àŠ¬àŠŸàŠ¯àŠŒ àŠªàŠ°àŠ¿àŠàŠ¯àŠŒ àŠàŠ°àŠ¿àŠ¯àŠŒà§ àŠŠàŠ¿àŠ€à§ àŠàŠŸàŠ à¥€ àŠàŠ°àŠ® àŠà§àŠªàŠšà§àŠ¯àŠŒàŠ€àŠŸ àŠàŠ¬àŠ àŠšàŠ¿àŠ°àŠŸàŠªàŠ€à§àŠ€àŠŸàŠ° àŠàŠšà§àН, àŠžàŠŸàŠàŠàŠà§àŠ²à§ àŠ¶à§àŠ· àŠ¹àŠ¯àŠŒà§ àŠ¯àŠŸàŠ¯àŠŒ ी àŠªà§àŠàŠ¯àŠŒàŠŸàŠ àŠàа àŠšà§àŠàŠàŠ¯àŠŒàŠŸàŠ°à§àŠ àŠ¬à§àŠ¯àŠ¬àŠ¹àŠŸàŠ° àŠàŠ°à§ àŠàŠšàŠ«àŠ¿àŠàŠŸàŠ° àŠàŠ°àŠŸ àŠ¹àŠ¯àŠŒ. àŠªà§àŠàŠ¯àŠŒàŠŸàŠ àŠªàŠ°àŠ¿àŠ·à§àŠ¬àŠŸàŠžàŠ®à§àй àŠªà§àаàŠàŠŸàŠ¶àŠ àŠàŠ¬àŠ àŠŠàŠ°à§àŠ¶àŠšàŠŸàŠ°à§àŠ¥à§àŠŠà§àа àŠàŠŸàŠà§ àŠ
àŠ€àŠ¿àŠ°àŠ¿àŠà§àŠ€ àŠžà§àаàŠà§àŠ·àŠŸ àŠªà§àŠ°àŠŠàŠŸàŠš àŠàаà§, àŠ¯àŠŸàŠ° àŠ®àŠ§à§àŠ¯à§ àŠžà§àŠšà§àŠžàŠ°àŠ¶àŠ¿àŠªà§àа àŠ¬àŠ¿àŠ°à§àŠŠà§àŠ§à§ àŠ°àŠà§àŠ·àŠŸàŠàŠ¬àŠ àŠ¯à§àŠ àŠàŠ°àŠŸ àŠ¹àŠ¯àŠŒà§àŠà§ ी àŠàŠàŠ àŠàŠŸàŠ¬à§ àŠàŠ®àŠŸàŠŠà§àа àŠ¬à§àŠ°àŠŸàŠàŠàŠŸàŠ° àŠàŠªàŠšàŠŸàŠà§ àŠàŠ¯àŠŒà§àŠ¬à§ àŠ¬à§àŠšàŠŸàŠ®à§
àŠ¬à§àŠ°àŠŸàŠàŠ àŠàŠ°àŠŸàŠ° àŠ
àŠšà§àŠ®àŠ€àŠ¿ àŠŠà§àŠ¯àŠŒ, àŠ¯àŠŸ àŠ®àŠŸàŠšà§àŠ·àŠà§ àŠ¬à§àŠšàŠŸàŠ®à§ àŠžàŠŸàŠ®àŠà§àŠ°à§ àŠàŠ¬àŠ àŠªàŠ°àŠ¿àŠ·à§àŠ¬àŠŸ àŠªà§àŠ°àŠŠàŠŸàŠšà§àа àŠ
àŠšà§àŠ®àŠ€àŠ¿ àŠŠà§àŠ¯àŠŒ ी àŠàŠªàŠšàŠ¿ àŠàŠ àŠªàŠ°àŠ¿àŠ·à§àŠ¬àŠŸàŠŠàŠ¿ àŠ
à§àŠ¯àŠŸàŠà§àŠžà§àŠž àŠàŠ°àŠŸàŠ° àŠžàŠ®àŠ¯àŠŒ URL-àŠ àŠàŠàŠàŠ¿ àŠžàŠŸàŠ®àŠŸàŠšà§àН àŠªà§àŠàŠ¯àŠŒàŠŸàŠà§àа àŠàŠàŠàŠš àŠ²àŠà§àŠ·à§àН àŠàŠ°àŠ¬à§àŠš ी NYTimes àŠªà§àŠàŠ¯àŠŒàŠŸàŠ àŠªàŠ°àŠ¿àŠ·à§àŠ¬àŠŸ àŠàŠ¬àŠ àŠà§àŠàŠŸàŠ¬à§ àŠ€àŠŸàŠ°àŠŸ àŠàŠŸàŠ àŠàŠ°à§ àŠ€àŠŸ àŠŠà§àŠàŠ€à§ àŠšàŠ¿àŠà§ àŠà§àŠ²àŠ¿àŠ àŠàаà§àŠš ी
+onboarding.tour-tor-onion-services.button=àŠàŠàŠàŠ¿ àŠªà§àŠàŠ¯àŠŒàŠŸàŠ àŠŠà§àŠà§àŠš
diff --git a/src/chrome/locale/bn-BD/torbutton.properties b/src/chrome/locale/bn-BD/torbutton.properties
index 45634d87..4cdfebf5 100644
--- a/src/chrome/locale/bn-BD/torbutton.properties
+++ b/src/chrome/locale/bn-BD/torbutton.properties
@@ -21,8 +21,8 @@ torbutton.popup.external.suggest = àŠšàŠ¿àŠ°àŠŸàŠªàŠŠ àŠ¹àŠàŠ¯àŠŒàŠŸàŠ° àŠàŠš
torbutton.popup.launch = àŠ¡àŠŸàŠàŠšàŠ²à§àŠ¡ àŠ«àŠŸàŠàв
torbutton.popup.cancel = àŠ¬àŠŸàŠ€àŠ¿àŠ²
torbutton.popup.dontask = àŠžà§àŠ¬àŠ¯àŠŒàŠàŠà§àŠ°àŠ¿àŠ¯àŠŒàŠàŠŸàŠ¬à§ àŠàŠàŠš àŠ¥à§àŠà§ àŠ«àŠŸàŠàвàŠà§àŠ²àŠ¿ àŠ¡àŠŸàŠàŠšàŠ²à§àŠ¡ àŠàаà§àŠš
-torbutton.popup.prompted_language = àŠàŠªàŠšàŠ¿ àŠàŠ°àŠ àŠà§àŠªàŠšà§àŠ¯àŠŒàŠ€àŠŸ àŠŠàŠ¿àŠ€à§, Torbutton àŠàŠ¯àŠŒà§àЬ àŠªà§àŠà§àа àŠàŠàаà§àŠàŠ¿ àŠàŠŸàŠ·àŠŸ àŠžàŠàŠžà§àŠàŠ°àŠ£ àŠ
àŠšà§àаà§àЧ àŠàŠ°àŠ€à§ àŠªàŠŸàŠ°à§àŠšà¥€ àŠàŠàŠ¿ àŠàŠªàŠšàŠŸàŠ° àŠªàŠ°àŠ¿àŠ¬àŠ°à§àŠ€à§ àŠàŠàаà§àŠàŠ¿ àŠàŠŸàŠ·àŠŸàŠ¯àŠŒ àŠªà§àŠ°àŠŠàŠ°à§àŠ¶àŠš àŠàŠ°àŠŸàŠ° àŠàŠšà§àН àŠàŠªàŠšàŠŸàŠ° àŠžà§àŠ¥àŠŸàŠšà§àŠ¯àŠŒ àŠàŠŸàŠ·àŠŸàŠ€à§ àŠªàŠ¡àŠŒàŠ€à§ àŠªàŠàŠšà§àŠŠ àŠàŠ°à§ àŠàŠ®àŠš àŠàŠ¯àŠŒà§àЬ àŠªà§àŠ·à§àŠ àŠŸàŠà§àŠ²àŠ¿àŠ° àŠàŠŸàŠ°àŠ£ àŠ¹àŠ€à§ àŠªàŠŸàŠ°à§à¥€\n\nàŠàŠªàŠšàŠ¿ àŠàŠŸàŠ² àŠà§àŠªàŠšà§àŠ¯àŠŒàŠ€àŠŸ àŠàŠšà§àН àŠàŠàаà§àŠàŠ¿ àŠàŠŸàŠ·àŠŸ àŠàŠ¯àŠŒà§àЬ àŠªà§àŠ àŠ
àŠšà§àаà§àЧ àŠàŠ°àŠ€à§ àŠàŠŸàŠš?
torbutton.popup.no_newnym = Torbutton àŠšàŠ¿àŠ°àŠŸàŠªàŠŠà§ àŠàŠªàŠšàŠŸàŠà§ àŠàŠàŠàŠ¿ àŠšàŠ€à§àŠš àŠªàŠ°àŠ¿àŠàŠ¯àŠŒ àŠŠàŠ¿àŠ€à§ àŠªàŠŸàŠ°à§ àŠšàŠŸà¥€ àŠàŠàŠ¿ àŠàа àŠàŠšà§àŠà§àаà§àв àŠªà§àаà§àŠ àŠ
à§àŠ¯àŠŸàŠà§àŠžà§àŠž àŠšà§àŠà¥€\n\nàŠàŠªàŠšàŠ¿ àŠàа àŠ¬à§àŠ°àŠŸàŠàŠàŠŸàŠ° àŠ¬àŠŸàŠšà§àŠ¡àŠ² àŠàŠ²àŠ®àŠŸàŠš?
+torbutton.security_settings.menu.title = Security Settings
torbutton.title.prompt_torbrowser = àŠà§àаà§àŠ€à§àŠ¬àŠªà§àаà§àŠ£ Torbutton àŠ€àŠ¥à§àН
torbutton.popup.prompt_torbrowser = Torbutton àŠàŠàŠš àŠàŠ¿àŠšà§àŠšàŠàŠŸàŠ¬à§ àŠàŠŸàŠ àŠàаà§: àŠàŠªàŠšàŠ¿ àŠàŠàŠ¿ àŠàа àŠ¬àŠšà§àЧ àŠàŠ°àŠ€à§ àŠªàŠŸàŠ°àŠ¬à§àŠš àŠšàŠŸà¥€\n\nàŠàŠ®àŠ°àŠŸ àŠàŠ àŠªàŠ°àŠ¿àŠ¬àŠ°à§àŠ€àŠšàŠàŠ¿ àŠ€à§àŠ°àŠ¿ àŠàаà§àŠàŠ¿ àŠàŠŸàŠ°àŠ£ àŠàŠàŠ¿ àŠàŠàŠàŠ¿ àŠ¬à§àŠ°àŠŸàŠàŠàŠŸàŠ°à§àа Torbutton àŠ¬à§àŠ¯àŠ¬àŠ¹àŠŸàŠ° àŠàŠ°àŠŸ àŠšàŠ¿àŠ°àŠŸàŠªàŠŠ àŠšàŠ¯àŠŒ àŠ¯àŠŸ àŠ
-àŠàа àŠ¬à§àŠ°àŠŸàŠàŠàŠ¿àŠàŠ¯àŠŒà§àа àŠàŠšà§àŠ¯àŠ àŠ¬à§àŠ¯àŠ¬àŠ¹àŠŸàŠ° àŠàŠ°àŠŸ àŠ¹àŠ¯àŠŒà¥€ àŠžà§àŠàŠŸàŠšà§ àŠ
àŠšà§àŠ àŠ¬àŠŸàŠ àŠàŠ¿àŠ² àŠ¯à§ àŠàŠ®àŠ°àŠŸ àŠ
àŠšà§àН àŠà§àŠš àŠàŠªàŠŸàŠ¯àŠŒ àŠ àŠ¿àŠ àŠàŠ°àŠ€à§ àŠªàŠŸàŠ°à§ àŠšàŠŸà¥€\n\nàŠàŠªàŠšàŠ¿ àŠ¯àŠŠàŠ¿ àŠžàŠŸàŠ§àŠŸàŠ°àŠ£àŠ€ àŠ«àŠŸàŠ¯àŠŒàŠŸàŠ°àŠ«àŠà§àŠž àŠ¬à§àŠ¯àŠ¬àŠ¹àŠŸàŠ° àŠàŠ°à§ àŠ°àŠŸàŠàŠ€à§ àŠàŠŸàŠš, àŠ€àŠŸàŠ¹àŠ²à§ àŠàŠªàŠšàŠŸàŠà§ Torbutton àŠàŠšàŠàŠšàŠžà§àŠàв àŠàŠ°àŠ€à§ àŠ¹àŠ¬à§ àŠàŠ¬àŠ àŠàа àŠ¬à§àŠ°àŠŸàŠàŠàŠŸàŠ° àŠ¬à§àŠ¯àŠŸàŠ£à§àŠ¡àŠ² àŠ¡àŠŸàŠàŠšàŠ²
à§àŠ¡ àŠàŠ°àŠ€à§ àŠ¹àŠ¬à§à¥€ àŠàа àŠ¬à§àŠ°àŠŸàŠàŠàŠŸàŠ°à§àа àŠà§àŠªàŠšà§àŠ¯àŠŒàŠ€àŠŸ àŠ¬à§àŠ¶àŠ¿àŠ·à§àŠà§àН àŠžàŠŸàŠ§àŠŸàŠ°àŠ£ àŠ«àŠŸàŠ¯àŠŒàŠŸàŠ°àŠ«àŠà§àŠžà§àа àŠà§àŠ¯àŠŒà§àŠ àŠàŠà§àŠàŠ€àŠ°, àŠàŠ®àŠšàŠàŠ¿ àŠ«àŠŸàŠ¯àŠŒàŠŸàŠ°àŠ«àŠà§àŠžà§àа àŠàаà§àЬà§àŠàŠšà§àа àŠžàŠŸàŠ¥à§ àŠ¬à§àŠ¯àŠ¬àŠ¹à§àŠ€ àŠ¹àŠ¯àŠŒà¥€\n\nTorbutton àŠà§ àŠ®à§àŠà§ àŠ«à§àŠ²àŠŸàŠ° àŠàŠšà§àН Tools-> Addons-> àŠàŠà§àŠžàŠà§àŠšàŠ¶àŠšàŠà§àŠ²àŠ¿àŠ€à§ àŠ¯àŠŸàŠš àŠàŠ¬àŠ àŠ€àŠŸàŠ°àŠªàŠ° àŠàŠ°àŠ¬à§àŠ€àŠšà§àа àŠªàŠŸàŠ¶à§ àŠžàŠ°àŠŸàŠš àŠ¬à§àŠ€àŠŸàŠ®à§ àŠà§àŠ²àŠ¿àŠ àŠàаà§àŠšà¥€
torbutton.popup.short_torbrowser = àŠà§àаà§àŠ€à§àŠ¬àŠªà§àаà§àŠ£ Torbutton àŠ€àŠ¥à§àН!\n\nTorbutton àŠàŠàŠš àŠžàŠ¬àŠžàŠ®àŠ¯àŠŒ àŠžàŠà§àŠ·àŠ® àŠàŠ°àŠŸ àŠ¹àŠ¯àŠŒà¥€\n\nàŠàŠ°àŠ àŠ€àŠ¥à§àН àŠàŠšà§àН Torbutton àŠà§àŠ²àŠ¿àŠ àŠàаà§àŠšà¥€
diff --git a/src/chrome/locale/ca/aboutTor.properties b/src/chrome/locale/ca/aboutTor.properties
index 169ac01c..855044aa 100644
--- a/src/chrome/locale/ca/aboutTor.properties
+++ b/src/chrome/locale/ca/aboutTor.properties
@@ -1,13 +1,7 @@
-# Copyright (c) 2014, The Tor Project, Inc.
+# Copyright (c) 2018, The Tor Project, Inc.
# See LICENSE for licensing information.
# vim: set sw=2 sts=2 ts=8 et:
-aboutTor.searchDDG.privacy=Cerca <a href="%1$S">de forma segura</a> amb <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
-
aboutTor.donationBanner.donate=Fes una donació ara!
aboutTor.donationBanner.slogan=Tor: Potenciant la resistÚncia digital
@@ -18,3 +12,6 @@ aboutTor.donationBanner.tagline2=Interconectant llibertat global
aboutTor.donationBanner.tagline3=Llibertat online
aboutTor.donationBanner.tagline4=Fomentant la lliure expresió global
aboutTor.donationBanner.tagline5=Protegint la Privacitat de milions de persones cada dia
+
+aboutTor.newsletter.tagline=Get the latest news from Tor straight to your inbox.
+aboutTor.newsletter.link_text=Sign up for Tor News.
diff --git a/src/chrome/locale/ca/torbutton.properties b/src/chrome/locale/ca/torbutton.properties
index 978d6b91..7d8b824a 100644
--- a/src/chrome/locale/ca/torbutton.properties
+++ b/src/chrome/locale/ca/torbutton.properties
@@ -21,8 +21,8 @@ torbutton.popup.external.suggest = Per seguretat, obriu els fitxers descarregats
torbutton.popup.launch = Descarrega el fitxer
torbutton.popup.cancel = Cancel·la
torbutton.popup.dontask = A partir d'ara, descarrega els fitxers automà ticament
-torbutton.popup.prompted_language = Per donar-vos més privacitat, el Torbutton pot demanar la versió en anglÚs de les pà gines web. Això pot provocar que les pà gines web que vulgueu veure en una altra llengua siguin mostrades en anglÚs.\n\nVoleu demanar les pà gines web en anglÚs per una major privadesa?
torbutton.popup.no_newnym = El Torbutton no pot adjudicar-vos de forma segura una nova identitat. No disposeu d'accés al Tor Control Port.\n\nEsteu usant el Tor Browser Bundle?
+torbutton.security_settings.menu.title = Configuració de seguretat
torbutton.title.prompt_torbrowser = Informació important sobre Torbutton
torbutton.popup.prompt_torbrowser = Torbutton Funciona de forma diferent ara: ja no el pot tancar.\n\nHem fet aquest canvi per que l'ús de Torbutton en un navegador utilitzat també per navegar fora de l'entorn de Tor ja no es segur. Hi havien moltes incidÚncies i no hem trobat cap altre solució per arreglar-les. \n\nSi desitja continuar utilitzant Firefox de forma habitual, ha de desinstalar Torbutton i descarregar Tor Browser Bundle. La seguretat de Tor Browser es millor que la de Firefox, fins i tot quan es fa servir Torbutton. \n\nPer desinstalar Torbutton, seleccioni Eines->Addons->Extensions and faci click sobre el botó Desinstalar al costat de Torbutton
torbutton.popup.short_torbrowser = Informació important sobre Torbutton! \n\nTorbutton ara és troba sempre activat.\n\nFaci click sobre Torbutton per més informació.
diff --git a/src/chrome/locale/da/aboutTor.properties b/src/chrome/locale/da/aboutTor.properties
index 3f1e238f..1f542f2a 100644
--- a/src/chrome/locale/da/aboutTor.properties
+++ b/src/chrome/locale/da/aboutTor.properties
@@ -1,13 +1,7 @@
-# Copyright (c) 2014, The Tor Project, Inc.
+# Copyright (c) 2018, The Tor Project, Inc.
# See LICENSE for licensing information.
# vim: set sw=2 sts=2 ts=8 et:
-aboutTor.searchDDG.privacy=SÞg <a href="%1$S">sikkert</a> med <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
-
aboutTor.donationBanner.donate=Donér nu!
aboutTor.donationBanner.slogan=Tor: Styrker digital oprÞr
@@ -18,3 +12,6 @@ aboutTor.donationBanner.tagline2=Sammenarbejder for frihed verden over
aboutTor.donationBanner.tagline3=Frihed online
aboutTor.donationBanner.tagline4=Fremmer ytringsfrihed verden over
aboutTor.donationBanner.tagline5=Beskytter privatlivet af millioner hver dag
+
+aboutTor.newsletter.tagline=Get the latest news from Tor straight to your inbox.
+aboutTor.newsletter.link_text=Sign up for Tor News.
diff --git a/src/chrome/locale/da/torbutton.properties b/src/chrome/locale/da/torbutton.properties
index 978691c4..512f928b 100644
--- a/src/chrome/locale/da/torbutton.properties
+++ b/src/chrome/locale/da/torbutton.properties
@@ -21,8 +21,8 @@ torbutton.popup.external.suggest = For at vÊre sikker bÞr du kun åbne downloa
torbutton.popup.launch = Download fil
torbutton.popup.cancel = Annuller
torbutton.popup.dontask = Download automatisk filer fremover
-torbutton.popup.prompted_language = For at yde stÞrre privatliv, kan Torbutton forespÞrge den engelsk sprogversion af websiderne. Det kan gÞre at websider som du foretrÊkker at lÊse på dit modersmål vises på engelsk i stedet for.\n\nVil du gerne forespÞrge engelske websider for Þget privatliv?
torbutton.popup.no_newnym = Torbutton kan ikke med sikkerhed give dig en ny identitet. Den har ikke adgang til kontrolporten for Tor.\n\nKÞrer du Tor Browser-bundet?
+torbutton.security_settings.menu.title = Sikkerhedsindstillinger
torbutton.title.prompt_torbrowser = Vigtig Torbutton-information
torbutton.popup.prompt_torbrowser = Torbutton fungerer anderledes end fÞr: du kan ikke lÊngere slå den fra.\n\nDu foretog denne Êndring, da det ikke er sikkert at anvende Torbutton i en browser, der også anvendes til non-Tor-browsing. Der var for mange fejl deri, som vi ikke kunne rette på andre måder.\n\nHvis du Þnsker at anvende Firefox på normal vis, så bÞr du afinstallere Torbutton og downloade Tor Browser-bundet. Indstillingerne for privatliv i Tor Browser overgår også de normale i Firefox, selv når Firefox anvende med Torbutton.\n\nFor at fjerne Torbutton, så gå til Funktioner->TilfÞjelser->Udvidelser og klik dernÊst Fjern-knappen ved siden af Torbutton.
torbutton.popup.short_torbrowser = Vigtig Torbutton-information!\n\nTorbutton er nu altid slået til.\n\nKlik på Torbutton for mere information.
diff --git a/src/chrome/locale/de/aboutTor.properties b/src/chrome/locale/de/aboutTor.properties
index 9d2b0df3..6c787679 100644
--- a/src/chrome/locale/de/aboutTor.properties
+++ b/src/chrome/locale/de/aboutTor.properties
@@ -1,13 +1,7 @@
-# Copyright (c) 2014, The Tor Project, Inc.
+# Copyright (c) 2018, The Tor Project, Inc.
# See LICENSE for licensing information.
# vim: set sw=2 sts=2 ts=8 et:
-aboutTor.searchDDG.privacy=<a href="%1$S">Sicheres</a> Suchen mit <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
-
aboutTor.donationBanner.donate=Jetzt spenden!
aboutTor.donationBanner.slogan=Tor: Digitalen Widerstand stÀrken
@@ -18,3 +12,6 @@ aboutTor.donationBanner.tagline2=Weltweite Vernetzungsfreiheit
aboutTor.donationBanner.tagline3=Freiheit online
aboutTor.donationBanner.tagline4=Fördert weltweit freie MeinungsÀuÃerung.
aboutTor.donationBanner.tagline5=SchÌtzt tÀglich die PrivatsphÀre von Millionen.
+
+aboutTor.newsletter.tagline=Get the latest news from Tor straight to your inbox.
+aboutTor.newsletter.link_text=Sign up for Tor News.
diff --git a/src/chrome/locale/de/torbutton.properties b/src/chrome/locale/de/torbutton.properties
index d03bb543..cb398bdb 100644
--- a/src/chrome/locale/de/torbutton.properties
+++ b/src/chrome/locale/de/torbutton.properties
@@ -21,8 +21,8 @@ torbutton.popup.external.suggest = Um sicher zu sein, sollten Sie heruntergelade
torbutton.popup.launch = Datei herunterladen
torbutton.popup.cancel = Abbrechen
torbutton.popup.dontask = Von jetzt an Dateien immer automatisch herunterladen
-torbutton.popup.prompted_language = Um Ihre PrivatsphÀre zu erhöhen, kann Torbutton die jeweilige englische Version einer Webseite anfordern. Dies kann zur Folge haben, dass Webseiten, die sie lieber in Ihrer Muttersprache lesen wÌrden, nun in Englisch dargestellt werden. \n\nSollen nun - zur Erhöhung Ihrer PrivatsphÀre - Webseiten in Englisch geladen werden?
torbutton.popup.no_newnym = Torbutton kann Ihnen keine neue IdentitÀt geben, da es keinen Zugriff auf den Tor-Steueranschluss hat.\n\nBenutzen Sie das Tor-Browser-Paket?
+torbutton.security_settings.menu.title = Sicherheitseinstellungen
torbutton.title.prompt_torbrowser = Wichtige Torbutton-Information
torbutton.popup.prompt_torbrowser = Torbutton funktioniert jetzt anders als vorher: es kann nicht mehr abgeschaltet werden.\n\nWir haben diese Ãnderung vorgenommen, da es nicht sicher ist, Torbutton auch in einem Browser zu benutzen, der auch fÃŒr den Betrieb ohne Tor gedacht ist. Es gab zu viele Fehler, die wir sonst nicht hÀtten beheben können.\n\nWenn Sie Firefox weiterhin normal benutzen möchten, sollten Sie Torbutton deinstallieren, und das Tor-Browser-Paket herunterladen. Die PrivatsphÀreeinstellungen des Tor-Browsers sind auÃerdem denen des normalen Firefox ÃŒberlegen, selbst wenn Firefox mit Torbutton benutzt wird.\n\nUm Torbutton zu entfernen, gehen Sie einfach auf Extras->Add-ons->Erweiterungen und klicken Sie auf Entfernen neben dem Torbutton.
torbutton.popup.short_torbrowser = Wichtige Torbutton-Information!\n\nTorbutton ist jetzt immer aktiviert.\n\nBitte auf den Torbutton klicken, um mehr Informationen zu erhalten.
diff --git a/src/chrome/locale/es/aboutTor.dtd b/src/chrome/locale/es/aboutTor.dtd
index 2c7494e7..152e7590 100644
--- a/src/chrome/locale/es/aboutTor.dtd
+++ b/src/chrome/locale/es/aboutTor.dtd
@@ -6,8 +6,8 @@
<!ENTITY aboutTor.title "Acerca de Tor">
-<!ENTITY aboutTor.ready.label "Explora. Privadamente.">
-<!ENTITY aboutTor.ready2.label "Estás listo para experimentar la navegación más privada del mundo.">
+<!ENTITY aboutTor.ready.label "Explora. En privado.">
+<!ENTITY aboutTor.ready2.label "Ahora estás listo/a para experimentar la navegación más privada del mundo.">
<!ENTITY aboutTor.failure.label "¡Algo fue mal!">
<!ENTITY aboutTor.failure2.label "Tor no está funcionando en este navegador.">
@@ -20,6 +20,6 @@
<!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">
<!ENTITY aboutTor.torbrowser_user_manual.label "Manual del Navegador Tor">
-<!ENTITY aboutTor.tor_mission.label "El proyecto Tor es una organización sin fines de lucro definida legalmente en EUA 501(c)(3), avanzando libertades y derechos humanos mediante la creación y despliegue de tecnologÃas de anonimato y privacidad sin costo y de fuente abierta, soportando su disponibilidad y uso sin restricciones y ampliando su entendimiento cientÃfico y popular.">
-<!ENTITY aboutTor.getInvolved.label "Involúcrese">
+<!ENTITY aboutTor.tor_mission.label "El proyecto Tor es una organización sin fines de lucro definida legalmente en Estados Unidos como 501(c)(3), avanzando libertades y derechos humanos mediante la creación y despliegue de tecnologÃas de anonimato y privacidad sin costo y de fuente abierta, apoyando su disponibilidad y uso sin restricciones y ampliando su entendimiento cientÃfico y popular.">
+<!ENTITY aboutTor.getInvolved.label "Involúcrate">
<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en">
diff --git a/src/chrome/locale/es/aboutTor.properties b/src/chrome/locale/es/aboutTor.properties
index f1e2d598..bbc51ff7 100644
--- a/src/chrome/locale/es/aboutTor.properties
+++ b/src/chrome/locale/es/aboutTor.properties
@@ -1,13 +1,7 @@
-# Copyright (c) 2014, The Tor Project, Inc.
+# Copyright (c) 2018, The Tor Project, Inc.
# See LICENSE for licensing information.
# vim: set sw=2 sts=2 ts=8 et:
-aboutTor.searchDDG.privacy=Busque <a href="%1$S">de forma segura</a> con <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy?kl=-es
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/?kl=-es
-
aboutTor.donationBanner.donate=¡Dona ahora!
aboutTor.donationBanner.slogan=Tor: Impulsando la resistencia digital
@@ -18,3 +12,6 @@ aboutTor.donationBanner.tagline2=Libertad de interconexión por todo el mundo
aboutTor.donationBanner.tagline3=Libertad en la red
aboutTor.donationBanner.tagline4=Fomentando la libertad de expresión por todo el mundo
aboutTor.donationBanner.tagline5=Protegiendo la privacidad de millones de personas cada dÃa
+
+aboutTor.newsletter.tagline=Get the latest news from Tor straight to your inbox.
+aboutTor.newsletter.link_text=Sign up for Tor News.
diff --git a/src/chrome/locale/es/browserOnboarding.properties b/src/chrome/locale/es/browserOnboarding.properties
index 6b8764e4..02543c3e 100644
--- a/src/chrome/locale/es/browserOnboarding.properties
+++ b/src/chrome/locale/es/browserOnboarding.properties
@@ -2,17 +2,17 @@
# See LICENSE for licensing information.
# vim: set sw=2 sts=2 ts=8 et:
-onboarding.tour-tor-welcome=Bienvenido
-onboarding.tour-tor-welcome.title=Youâre ready.
+onboarding.tour-tor-welcome=Bienvenido/a
+onboarding.tour-tor-welcome.title=Estás listo/a.
onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
onboarding.tour-tor-welcome.button=Start Now
onboarding.tour-tor-privacy=Privacidad
onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canât follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click âTor Networkâ to learn how we protect you on the network level.
-onboarding.tour-tor-privacy.button=Go to Tor Network
+onboarding.tour-tor-privacy.button=Ir a la red Tor
-onboarding.tour-tor-network=Tor Network
+onboarding.tour-tor-network=Red Tor
onboarding.tour-tor-network.title=Travel a decentralized network.
onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâs no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on âCircuit Displayâ to learn how they work.
onboarding.tour-tor-network.button=Go to Circuit Display
@@ -32,7 +32,7 @@ onboarding.tour-tor-expect-differences.title=Experience Tips
onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
onboarding.tour-tor-expect-differences.button=See FAQs
-onboarding.tour-tor-onion-services=Servicios Onion
+onboarding.tour-tor-onion-services=Servicios onion
onboarding.tour-tor-onion-services.title=Servicios Onion
onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
onboarding.tour-tor-onion-services.button=Visit an Onion
diff --git a/src/chrome/locale/es/torbutton.properties b/src/chrome/locale/es/torbutton.properties
index 9335f4df..21ec2ea0 100644
--- a/src/chrome/locale/es/torbutton.properties
+++ b/src/chrome/locale/es/torbutton.properties
@@ -21,8 +21,8 @@ torbutton.popup.external.suggest = Para estar seguro, deberÃas abrir únicament
torbutton.popup.launch = Descargar fichero
torbutton.popup.cancel = Cancelar
torbutton.popup.dontask = Descargar ficheros automáticamente a partir de ahora
-torbutton.popup.prompted_language = Para darle mayor privacidad, Torbutton puede solicitar la versión en inglés de las páginas web. Esto podrÃa causar que páginas que prefiera leer en su idioma nativo se muestren en inglés en su lugar. \n \n¿Le gustarÃa solicitar páginas web en inglés para mejor privacidad?
torbutton.popup.no_newnym = Torbutton no puede darle una nueva identidad (instancia de Tor) de forma segura. No tiene acceso al puerto de control de Tor (ControlPort)\n\n¿Está ejecutando el Paquete de Navegador Tor?
+torbutton.security_settings.menu.title = Configuración de seguridad
torbutton.title.prompt_torbrowser = Información importante sobre Torbutton
torbutton.popup.prompt_torbrowser = Torbutton ahora funciona de manera diferente: ya no lo podrás apagar. \n \nHicimos este cambio porque no es seguro utilizar Torbutton en un navegador que también se utilice para navegar sin Tor. Hubo tantos fallos con esto que no pudimos arreglarlo de otro modo. \n \nSi quieres seguir usando Firefox normalmente, deberÃas desinstalar Torbutton y descargar el Paquete de Navegador Tor. Las propiedades de privacidad del Navegador Tor son superiores a las de un Firefox normal, incluso cuando se usa Firefox con Torbutton. \n \nPara eliminar Torbutton. vaya a Herramientas->Complementos->Extensiones y haga clic en el botón Eliminar próximo a Torbutton.
torbutton.popup.short_torbrowser = ¡Información importante sobre Torbutton! \n \nTorbutton ahora está siempre encendido. \n \nHaga clic en (el botón de) Torbutton para más información.
diff --git a/src/chrome/locale/eu/aboutTor.properties b/src/chrome/locale/eu/aboutTor.properties
index 04030391..6ad8c032 100644
--- a/src/chrome/locale/eu/aboutTor.properties
+++ b/src/chrome/locale/eu/aboutTor.properties
@@ -1,13 +1,7 @@
-# Copyright (c) 2014, The Tor Project, Inc.
+# Copyright (c) 2018, The Tor Project, Inc.
# See LICENSE for licensing information.
# vim: set sw=2 sts=2 ts=8 et:
-aboutTor.searchDDG.privacy=Bilatu<a href="%1$S">modu seguruan</a> ondokoarekin: <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
-
aboutTor.donationBanner.donate=Eman dohaintza orain!
aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance
@@ -18,3 +12,6 @@ aboutTor.donationBanner.tagline2=Networking Freedom Worldwide
aboutTor.donationBanner.tagline3=Freedom Online
aboutTor.donationBanner.tagline4=Fostering Free Expression Worldwide
aboutTor.donationBanner.tagline5=Protecting the Privacy of Millions Every Day
+
+aboutTor.newsletter.tagline=Get the latest news from Tor straight to your inbox.
+aboutTor.newsletter.link_text=Sign up for Tor News.
diff --git a/src/chrome/locale/eu/torbutton.properties b/src/chrome/locale/eu/torbutton.properties
index 5362d070..85c9e01b 100644
--- a/src/chrome/locale/eu/torbutton.properties
+++ b/src/chrome/locale/eu/torbutton.properties
@@ -21,8 +21,8 @@ torbutton.popup.external.suggest = Arriskutik kanpo egoteko, zuk deskargatutako
torbutton.popup.launch = Fitxategia deskargatu
torbutton.popup.cancel = Utzi
torbutton.popup.dontask = Hemendik aurrera fitxategiak automatikoki deskargatu
-torbutton.popup.prompted_language = Pribatutasun gehiago emateko, Torbuttonek webguneen Ingelerazko bertsioa eska dezake. Honek zure ama hizkuntzan irakurtzea nahiago izan ditzakezun orriak Ingeleraz agertzea ekar dezake.\n\nNahiko al zenuke webguneen Ingelerazko hizkuntza eskatu pribatutasun hobeagoa izateko?
torbutton.popup.no_newnym = Torbuttonek ezin dizu modu seguruan nortasun berri bat eman. Ez du Tor Kontrol Portura nola sartzerik.\n\nTor Browser Bundle exekutatzen ari al zara?
+torbutton.security_settings.menu.title = Segurtasun Ezarpenak
torbutton.title.prompt_torbrowser = Torbutton informazio garratzitsua
torbutton.popup.prompt_torbrowser = Torbuttonek ezberdin egiten du lan orain: ezin da gehiago itzali.\n\nTor kanpoko nabigatzea ere egiteko erabiltzen den nabigatzaile batean Torbutton erabiltzea segurura ez delako aldaketa hau egin dugu. Beste era batean konpondu ezin genituen akats asko zeuden.\n\nFirefox modu arruntean erabiltzen jarraitu nahi baduzu, Torbutton kendu beharko zenuke eta Tor Browser Bundlea deskargatu. Tor Browserren pribatutasun ezaugarriak Firefox arruntarenak baino hobeak dia, baita Firefox Torbuttonekin erabiltzen bada ere.\n\nTorbutton kentzeko, joan hona Tresnak->Gehigarriak->Hedapenak eta Torbuttonen ondoan dagoen Kendu botoian sakatu.
torbutton.popup.short_torbrowser = Torbutton informazio garrantzitsua!\n\nTorbutton orain beti gaituta dago.\n\nSakatu Torbuttonen informazio gehiago lortzeko.
diff --git a/src/chrome/locale/fa/aboutTor.properties b/src/chrome/locale/fa/aboutTor.properties
index 58c75b26..5e4a0272 100644
--- a/src/chrome/locale/fa/aboutTor.properties
+++ b/src/chrome/locale/fa/aboutTor.properties
@@ -1,13 +1,7 @@
-# Copyright (c) 2014, The Tor Project, Inc.
+# Copyright (c) 2018, The Tor Project, Inc.
# See LICENSE for licensing information.
# vim: set sw=2 sts=2 ts=8 et:
-aboutTor.searchDDG.privacy=جستج٠<a href="%1$S">اÛÙ
Ù</a> ؚا <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
-
aboutTor.donationBanner.donate=اکÙÙÙ Ø§ÙØ¯Ø§Ø¡ Ú©ÙÛØ¯!
aboutTor.donationBanner.slogan=Tor: ÙØ¯Ø±Øª Ù
ÙØ§ÙÙ
ت Ø¯ÛØ¬ÛتاÙ
@@ -18,3 +12,6 @@ aboutTor.donationBanner.tagline2=Ø¢Ø²Ø§Ø¯Û ØŽØšÚ©Ù Ø¯Ø± Ø¬ÙØ§Ù
aboutTor.donationBanner.tagline3=Ø¢Ø²Ø§Ø¯Û Ø¢ÙÙØ§ÛÙ
aboutTor.donationBanner.tagline4=Ø¯Ø±ØØ§Ù ÙŸØ±ÙØ±ØŽ Ø¢Ø²Ø§Ø¯Û Ú¯ÙØªØ§Ø± در Ø¬ÙØ§Ù
aboutTor.donationBanner.tagline5=Ø¯Ø±ØØ§Ù ØÙا؞ت ار ØØ±ÛÙ
Ø®ØµÙØµÛ Ù
ÛÙÛÙÙ ÙØ§ Ù
ردÙ
ÙØ± Ø±ÙØ²
+
+aboutTor.newsletter.tagline=Get the latest news from Tor straight to your inbox.
+aboutTor.newsletter.link_text=Sign up for Tor News.
diff --git a/src/chrome/locale/fa/torbutton.properties b/src/chrome/locale/fa/torbutton.properties
index 1ce4082b..9a3a3148 100644
--- a/src/chrome/locale/fa/torbutton.properties
+++ b/src/chrome/locale/fa/torbutton.properties
@@ -21,8 +21,8 @@ torbutton.popup.external.suggest = ØšØ±Ø§Û Ø§ÛÙ
Ù Ù
Ø§ÙØ¯ÙØ ØšØ§ÛØ¯ ÙÙ
torbutton.popup.launch = داÙÙÙØ¯ ÙØ§ÛÙ
torbutton.popup.cancel = ÙØºÙ
torbutton.popup.dontask = از اÛÙ ÙŸØ³Ø ÙØ§ÛÙÙØ§ ØšÙ Ø·ÙØ± Ø®ÙØ¯Ú©Ø§Ø± داÙÙÙØ¯ ØŽÙØ¯.
-torbutton.popup.prompted_language = ØšØ±Ø§Û ØÙا؞ت ØšÙØŽØªØ± از ØØ±ÙÙ
Ø®ØµÙØµÛ ØŽÙ
Ø§Ø Ø¯Ú©Ù
Ù ØªÙØ± Ù
ÛâØªÙØ§Ùد ÙØ³Ø®Ù اÙÚ¯ÙÙØ³Û ØµÙØØ§Øª ÙØš Ø±Ø§ Ø¯Ø±Ø®ÙØ§Ø³Øª Ú©ÙØ¯. اÙÙ Ù
ÙØ¶Ùع Ù
Ù
ک٠است ؚاعث ØŽÙØ¯ ØµÙØÙâÙØ§ÛÛ Ø±Ø§ Ú©Ù ØªØ±Ø¬ÛØ Ù
ÛØ¯ÙÛØ¯ ؚ٠زؚا٠Ù
Ø§Ø¯Ø±Û Ø®ÙØ¯ ØšØ®ÙØ§ÙÙØ¯Ø در Ø¹ÙØ¶ ؚ٠اÙÚ¯ÙÙØ³Û ÙÙ
Ø§ÙØŽ Ø¯Ø§Ø¯Ù ØŽÙÙØ¯.\n\nØ¢ÙØ§ ؚا اÙÙ ÙØ¬Ùد Ù
ÛâØ®ÙØ§ÙÙØ¯ ØšØ±Ø§Û ØÙا؞ت ØšÙØŽØªØ± از ØØ±ÙÙ
Ø®ØµÙØµÛ Ø¯Ø±Ø®ÙØ§Ø³Øª ÙØ³Ø®Ù اÙÚ¯ÙÙØ³Û ØµÙØØ§Øª را ؚدÙÙØ¯Ø
torbutton.popup.no_newnym = Torbutton ÙÙ
Û ØªÙØ§Ùد ØšÙ ØŽÙ
ا ÛÚ© ØŽÙØ§Ø³Ù Ø¬Ø¯ÛØ¯ اÙ
Ù ØšØ¯ÙØ¯. Ø¯Ø³ØªØ±Ø³Û ØšÙ ÙŸÙØ±Øª Ú©ÙØªØ±Ù ÙÛØ¯Ø§ÙÛØ§ اÙ
Ú©Ø§Ù ÙŸØ°ÛØ± ÙÛØ³Øª.\n\n Ø¢ÛØ§ ØŽÙ
ا در ØØ§Ù اجرا ØšØ³ØªÙ ÙØ±Ù
Ø§ÙØ²Ø§Ø±Û Ù
Ø±ÙØ±Ú¯Ø± ØªÙØ± ÙØ³ØªÛدØ
+torbutton.security_settings.menu.title = ØªÙØžÛÙ
ات اÙ
ÙÛØªÛ
torbutton.title.prompt_torbrowser = Ø§Ø·ÙØ§Ø¹Ø§Øª Ù
ÙÙ
Torbutton
torbutton.popup.prompt_torbrowser = اکÙÙÙ Torbutton ØšØ·ÙØ± Ù
ØªÙØ§ÙØªÛ Ú©Ø§Ø± Ù
ÛâÚ©ÙØ¯ - دÛگر ÙÙ
ÛâØªÙØ§ÙÛØ¯ Ø¢Ùâ Ø±Ø§ خاÙ
ÙØŽ Ú©ÙÛØ¯.\n\nاÛÙ ØªØºÛØ±Ø§Øª ؚ٠اÛ٠دÙÛ٠اعÙ
ا٠؎د٠است Ú©Ù Ø§Ø³ØªÙØ§Ø¯Ù از Torbutton در Ù
Ø±ÙØ±Ú¯Ø±Û Ú©Ù ØšØ±Ø§Û Ù
Ø±ÙØ±Ú¯Ø±Û ؚدÙ٠تر ÙÛØ² Ø§Ø³ØªÙØ§Ø¯Ù Ù
ÛØŽÙØ¯Ø Ø§ÛÙ
Ù ÙÛØ³Øª. ÙÙØµÙØ§Û ÙØ±Ù
Ø§ÙØ²Ø§Ø±Û Ø¢ÙÙØ¯Ø± Ø²ÛØ§Ø¯ ØšÙØ¯ Ú©Ù ØšÙ Ø±ÙØŽ Ø¯ÛÚ¯Ø±Û ÙÙ
ÛØªÙØ§ÙØ³ØªÛÙ
آ٠را ØÙ Ú©ÙÛÙ
.\n\nاگر Ù
ÛØ®ÙاÙÛØ¯ ØšÙ Ø·ÙØ± Ø¹Ø§Ø¯Û ØšÙ Ø§Ø³ØªÙØ§Ø¯Ù از ÙØ§ÛØ±ÙØ§Ú©Ø³ اداÙ
٠دÙÛØ¯Ø ØšØ§ÛØ¯ ÙØ±Ù
Ø§ÙØ²Ø§Ø± Torbutton را ØØ°Ù کرد٠٠Tor Browser Bundle (ؚست٠Ù
Ø±ÙØ±Ú¯Ø± تر) را داÙÙÙØ¯ Ú©ÙÛØ¯. ÙÛÚÚ¯ÛÙØ§Û Ø®ØµÙØµÛ ØšÙØ¯Ù ØªØ±Ø ØšÙ Ø¢ÙÙØ§ÛÛ Ú©Ù Ø¯Ø± ÙØ§ÛØ±ÙØ§Ú©Ø³ Ø§Ø³ØªØ ØšØ±ØªØ±Û Ø¯Ø§Ø±Ø¯Ø ØØªÛ ÙÙگاÙ
Û Ú©Ù ÙØ§ÛØ±ÙØ§Ú©Ø³ ؚا Torbutton Ø§Ø³ØªÙØ§Ø¯Ù ØŽÙØ¯.\n\nØšØ±Ø§Û ØØ°Ù
TorbuttonØ ØšØ±ÙÛØ¯ ØšÙ Ø§ØšØ²Ø§Ø±ÙØ§ ( ÛØ§ tools اگر از ÙØ³Ø®Ù اÙÚ¯ÙÛØ³Û ÙØ§ÛØ±ÙØ§Ú©Ø³ Ø§Ø³ØªÙØ§Ø¯Ù Ù
ÛÚ©ÙÛØ¯)Ø Ø§ÙØ²ÙÙÙ ÙØ§ (Addons)Ø ØšØ±ÙØ§Ù
Ù ÙØ§Û گستر؎ ÛØ§Ùت٠(Extensions ) ٠سٟس دکÙ
Ù Remove ک٠در Ú©ÙØ§Ø± Torbutton است را ؚزÙÛØ¯.
torbutton.popup.short_torbrowser = Ø§Ø·ÙØ§Ø¹Ùت Ù
ÙÙ
Torbutton!\n\nTorbutton ÙÙ
ÛØŽÙ ÙØ¹Ø§Ù ؚا؎د!\n\nØšØ±Ø§Û Ø§Ø·ÙØ§Ø¹Ø§Øª ØšÛØŽØªØ± رÙÛ Torbutton Ú©ÙÛÚ© ÙÙ
اÛÛØ¯.
diff --git a/src/chrome/locale/fr/aboutTor.properties b/src/chrome/locale/fr/aboutTor.properties
index 952d3ae4..33fcdb41 100644
--- a/src/chrome/locale/fr/aboutTor.properties
+++ b/src/chrome/locale/fr/aboutTor.properties
@@ -1,13 +1,7 @@
-# Copyright (c) 2014, The Tor Project, Inc.
+# Copyright (c) 2018, The Tor Project, Inc.
# See LICENSE for licensing information.
# vim: set sw=2 sts=2 ts=8 et:
-aboutTor.searchDDG.privacy=Chercher <a href="%1$S">en toute sécurité</a> avec <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
-
aboutTor.donationBanner.donate=Faites un don maintenantâ!
aboutTor.donationBanner.slogan=Tor : la puissance de la résistance numérique
@@ -18,3 +12,6 @@ aboutTor.donationBanner.tagline2=Vers un réseau mondial de liberté
aboutTor.donationBanner.tagline3=La liberté en ligne
aboutTor.donationBanner.tagline4=Pour favoriser la libre expression dans le monde entier
aboutTor.donationBanner.tagline5=Nous protégeons les renseignements personnels de millions de personnes, chaque jour
+
+aboutTor.newsletter.tagline=Get the latest news from Tor straight to your inbox.
+aboutTor.newsletter.link_text=Sign up for Tor News.
diff --git a/src/chrome/locale/fr/torbutton.properties b/src/chrome/locale/fr/torbutton.properties
index 919fdc8c..8ea51db4 100644
--- a/src/chrome/locale/fr/torbutton.properties
+++ b/src/chrome/locale/fr/torbutton.properties
@@ -21,8 +21,8 @@ torbutton.popup.external.suggest = Par sécurité, vous ne devriez ouvrir les fi
torbutton.popup.launch = Télécharger le fichier
torbutton.popup.cancel = Annuler
torbutton.popup.dontask = Télécharger automatiquement à partir de maintenant
-torbutton.popup.prompted_language = Pour renforcer votre anonymat, BoutonTor peut demander la version anglaise des pages Web. Les pages que vous préférez lire dans votre langue maternelle pourraient alors sâafficher en anglais.\n\nVoulez-vous demander des pages Web en anglais pour améliorer votre anonymatâ?
torbutton.popup.no_newnym = BoutonTor ne peut pas vous attribuer une nouvelle identité de façon sûre. Il nâa pas accÚs au port de contrÃŽle de Tor.\n\nUtilisez-vous lâoffre groupée du Navigateur Torâ?
+torbutton.security_settings.menu.title = ParamÚtres de sécurité
torbutton.title.prompt_torbrowser = Informations importantes concernant BoutonTor
torbutton.popup.prompt_torbrowser = BoutonTor fonctionne différemment maintenant : vous ne pouvez plus le désactiver.\n\nNous avons effectué ce changement car il nâest pas sécuritaire dâutiliser BoutonTor dans un navigateur qui est également utiliser pour une navigation sans Tor. Trop de bogues ne pouvaient être réglés autrement.\n\nSi vous voulez continuer à utiliser Firefox normalement, vous devriez désinstaller BoutonTor et télécharger lâoffre groupée du Navigateur Tor. Les propriétés de confidentialité du Navigateur Tor sont aussi supérieures à celles de Firefox, même sâil est utilisé avec BoutonTor.\n\nPour enlever BoutonTor, allez dans Outils->Modules complémentaires->Extensions et cliquer sur Supprimer à coté de BoutonTor.
torbutton.popup.short_torbrowser = Informations importantes concernant BoutonTorâ!\n\nBoutonTor est toujours activé dorénavant.\n\nCliquer sur BoutonTor pour plus dâinformations.
diff --git a/src/chrome/locale/ga/aboutTBUpdate.dtd b/src/chrome/locale/ga/aboutTBUpdate.dtd
index 1c4063a3..4114c065 100644
--- a/src/chrome/locale/ga/aboutTBUpdate.dtd
+++ b/src/chrome/locale/ga/aboutTBUpdate.dtd
@@ -1,6 +1,6 @@
<!ENTITY aboutTBUpdate.title "Nuashonrú Brabhsálaà Tor">
<!ENTITY aboutTBUpdate.updated "NuashonraÃodh Brabhsálaà Tor">
-<!ENTITY aboutTBUpdate.linkPrefix "Chun teach ar an eolas is déanaà maidir leis an leagan seo,">
+<!ENTITY aboutTBUpdate.linkPrefix "Chun teacht ar an eolas is déanaà maidir leis an leagan seo, ">
<!ENTITY aboutTBUpdate.linkLabel "tabhair cuairt ar ár suÃomh Gréasáin">
<!ENTITY aboutTBUpdate.linkSuffix ".">
<!ENTITY aboutTBUpdate.changeLogHeading "Logchomhad athruithe:">
diff --git a/src/chrome/locale/ga/aboutTor.properties b/src/chrome/locale/ga/aboutTor.properties
index 7db055e4..717fbeb8 100644
--- a/src/chrome/locale/ga/aboutTor.properties
+++ b/src/chrome/locale/ga/aboutTor.properties
@@ -1,13 +1,7 @@
-# Copyright (c) 2014, The Tor Project, Inc.
+# Copyright (c) 2018, The Tor Project, Inc.
# See LICENSE for licensing information.
# vim: set sw=2 sts=2 ts=8 et:
-aboutTor.searchDDG.privacy=<a href="%1$S">Cuardach slán</a> le <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
-
aboutTor.donationBanner.donate=Tabhair SÃntiús Airgid Anois!
aboutTor.donationBanner.slogan=Tor: Cumhacht na FrithbheartaÃochta DigitÃ
@@ -18,3 +12,6 @@ aboutTor.donationBanner.tagline2=Saoirse LÃonraithe ar fud an domhain
aboutTor.donationBanner.tagline3=Saoirse Ar LÃne
aboutTor.donationBanner.tagline4=Saoirse Cainte á cothú ar fud an domhain
aboutTor.donationBanner.tagline5=PrÃobháideachas na milliún á chosaint chuile lá
+
+aboutTor.newsletter.tagline=Get the latest news from Tor straight to your inbox.
+aboutTor.newsletter.link_text=Sign up for Tor News.
diff --git a/src/chrome/locale/ga/torbutton.properties b/src/chrome/locale/ga/torbutton.properties
index a8e1578a..3f38caee 100644
--- a/src/chrome/locale/ga/torbutton.properties
+++ b/src/chrome/locale/ga/torbutton.properties
@@ -2,11 +2,11 @@ torbutton.circuit_display.internet = An tIdirlÃon
torbutton.circuit_display.ip_unknown = IP anaithnid
torbutton.circuit_display.onion_site = SuÃomh Onion
torbutton.circuit_display.this_browser = An brabhsálaà seo
-torbutton.circuit_display.relay = Relay
+torbutton.circuit_display.relay = Athsheachadán
torbutton.circuit_display.tor_bridge = Droichead
torbutton.circuit_display.unknown_country = TÃr anaithnid
-torbutton.circuit_display.guard = Guard
-torbutton.circuit_display.guard_note = Your [Guard] node may not change.
+torbutton.circuit_display.guard = Garda
+torbutton.circuit_display.guard_note = NÃl cead agat an [Garda] a athrú.
torbutton.circuit_display.learn_more = Tuilleadh eolais
torbutton.content_sizer.margin_tooltip = Cuireann Brabhsálaà Tor an chiumhais seo leis an bhfuinneog ionas nach mbeidh leithead agus airde na fuinneoige chomh suntasach, sa chaoi go mbÃonn sé nÃos deacra do ghnÃomhaÃocht ar lÃne a lorg.
torbutton.panel.tooltip.disabled = Cliceáil le Tor a chumasú
@@ -21,8 +21,8 @@ torbutton.popup.external.suggest = Le bheith slán sábháilte, nÃor chóir dui
torbutton.popup.launch = Ãoslódáil an comhad
torbutton.popup.cancel = Cealaigh
torbutton.popup.dontask = Ãoslódáil comhaid go huathoibrÃoch as seo amach
-torbutton.popup.prompted_language = Is féidir leis an gcnaipe Tor an leagan Béarla de leathanaigh Ghréasáin a iarraidh, chun tuilleadh prÃobháideachais a thabhairt duit. Leis seo i bhfeidhm, seans go bhfaighidh tú an leagan Béarla de leathanaigh dhátheangacha ab fhearr leat a léamh i nGaeilge.\n\nAn bhfuil fonn ort leaganacha Béarla a iarraidh mar sin féin?
torbutton.popup.no_newnym = NÃl an cnaipe Tor in ann aitheantas nua a thabhairt duit go sábháilte. NÃl sé in ann teacht ar Phort Rialaithe Tor.\n\nAn bhfuil tú ag úsáid Burla Brabhsálaà Tor?
+torbutton.security_settings.menu.title = Socruithe Slándála
torbutton.title.prompt_torbrowser = Eolas Tábhachtach faoi Chnaipe Tor
torbutton.popup.prompt_torbrowser = FeidhmÃonn an cnaipe Tor go difriúil anois; nà féidir leat é a mhúchadh a thuilleadh.\n\nD'athraÃomar é seo toisc nach bhfuil sé sábháilte an cnaipe Tor a úsáid i mbrabhsálaà a úsáidtear le brabhsáil lasmuigh de Tor. Bhà an iomarca fabhtanna ann nach rabhamar in ann deisiú ar aon bhealach eile.\n\nMás mian leat leanúint ar aghaidh le Firefox mar is gnáth, ba chóir duit an cnaipe Tor a dhÃshuiteáil agus Brabhsálaà Tor a Ãoslódáil. Tá na hairÃonna slándála i mBrabhsálaà Tor i bhfad nÃos fearr ná na cinn i ngnáth-Firefox, fiú nuair a úsáidtear Firefox leis an gcnaipe Tor.\n\nChun an cnaipe Tor a bhaint, oscail UirlisÃ->Breiseáin->EisÃnteachtaà ansin cliceáil an cnaipe Bain in aice le Cnaipe Tor.
torbutton.popup.short_torbrowser = Eolas Tábhachtach maidir leis an gCnaipe Tor!\n\nTá an Cnaipe Tor cumasaithe i gcónaÃ.\n\nCliceáil air chun tuilleadh eolais a fháil.
diff --git a/src/chrome/locale/he/aboutTor.properties b/src/chrome/locale/he/aboutTor.properties
index 0999a786..6460708d 100644
--- a/src/chrome/locale/he/aboutTor.properties
+++ b/src/chrome/locale/he/aboutTor.properties
@@ -1,13 +1,7 @@
-# Copyright (c) 2014, The Tor Project, Inc.
+# Copyright (c) 2018, The Tor Project, Inc.
# See LICENSE for licensing information.
# vim: set sw=2 sts=2 ts=8 et:
-aboutTor.searchDDG.privacy=×׀ש <a href="%1$S">×××××</a> ×¢× <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
-
aboutTor.donationBanner.donate=תך×× ×עת!
aboutTor.donationBanner.slogan=Tor: ×× ××¢×× ××ª× ×××ת ×××××××ת
@@ -18,3 +12,6 @@ aboutTor.donationBanner.tagline2=×ךשת×× ××××€× ×¢×××× ××ך×ת
aboutTor.donationBanner.tagline3=××ך×ת ××§××× ×ª
aboutTor.donationBanner.tagline4=×××€××× ××××€× ×¢×××× ×××¢× ××׀ש×ת
aboutTor.donationBanner.tagline5=××× ×× ×¢× ×׀ך×××ת ×©× ×××××× ×× ×× ×××
+
+aboutTor.newsletter.tagline=×§×× ×ת ×××ש×ת ×××ך×× ×ת ××ת Tor ×ש×ך×ת ×ת××× ×× ×× ×¡×ª ש××.
+aboutTor.newsletter.link_text=×××š×©× ×¢××ך ××ש×ת Tor
diff --git a/src/chrome/locale/he/torbutton.properties b/src/chrome/locale/he/torbutton.properties
index cdcd18c7..93a51a20 100644
--- a/src/chrome/locale/he/torbutton.properties
+++ b/src/chrome/locale/he/torbutton.properties
@@ -21,8 +21,8 @@ torbutton.popup.external.suggest = ××תך ××××××, ×¢××× ×׀ת×× ×§
torbutton.popup.launch = ×××š× ×§×××¥
torbutton.popup.cancel = ×××
torbutton.popup.dontask = ×××š× ×§×׊×× ××××€× ××××××× ××¢×ª× ×××××
-torbutton.popup.prompted_language = ××× ×תת ×× ××תך ׀ך×××ת, Torbutton ×××× ××קש ×ת ×××š×¡× ××× ×××ת ×©× ××ª×š× ××× ××š× ×. ×× ×¢×©×× ××ך×× ××תך×× ×©××ª× ××¢×××£ ×קך×× ×ש׀ת ××× ×©×× ××××ת ××׊××× ××× ×××ת ×××§××.\n\n××× ××ª× ×š××Š× ××קש ×תך×× ××©×€× ××× ×××ת ×¢××ך ׀ך×××ת ×××× ××תך?
torbutton.popup.no_newnym = Torbutton ××× × ×××× ×תת ×× ××××× ×××ת ××ש×. ××× ×× ×××©× ×× ×€×ª×ת ×××§×š× ×©× Tor.\n\n××× ××ª× ×ך××¥ ×ת ××××ת ××€××€× Tor?
+torbutton.security_settings.menu.title = ×××ך×ת ×××××
torbutton.title.prompt_torbrowser = ××××¢ ×ש×× ×©× Torbutton
torbutton.popup.prompt_torbrowser = Torbutton ×¢××× ×××× ××ךת: ××× × ×××× ××××ת ×××ª× ××תך.\n\nעש×× × ×©×× ×× ×× ×× ××× ×× ×××× ××שת×ש ×-Torbutton ×××€××€× ×× ××Š× ×ש×××ש ×× ×¢××ך ××××©× ×©××× × Tor. ××× ××תך ××× ×ª×§××× ×©×× ××××× × ××ª×§× ××× ××š× ××ךת.\n\n×× ××ª× ×š××Š× ×××ש×× ××שת×ש ×-Firefox ×ך×××, ×¢××× ××ס×ך ×ת Torbutton ××××ך×× ×ת ××××ת ××€××€× Tor. ×××€××× × ×׀ך×××ת ×©× ××€××€× Tor ×× × ×¢××× ××תך ××שך ××× ×©× Firefox ך×××, ××€××× ××שך Firefox × ××Š× ×ש×××ש ×¢× Torbutton.\n\n××× ××ס×ך ×ת Torbutton, ×× ×× ××××->ת×ס׀×ת->×ך×××ת ××× ×××¥ ×¢× ××׀ת×ך ×סך ××× Torbutton.
torbutton.popup.short_torbrowser = ××××¢ ×ש×× ×¢× Torbutton!\nTorbutton ת××× ×××׀שך ×¢×ש××.\n×××¥ ×¢× ×-Torbutton ××¢×× ××××¢.
diff --git a/src/chrome/locale/id/aboutTor.properties b/src/chrome/locale/id/aboutTor.properties
index d3ffe671..d28fda5c 100644
--- a/src/chrome/locale/id/aboutTor.properties
+++ b/src/chrome/locale/id/aboutTor.properties
@@ -1,13 +1,7 @@
-# Copyright (c) 2014, The Tor Project, Inc.
+# Copyright (c) 2018, The Tor Project, Inc.
# See LICENSE for licensing information.
# vim: set sw=2 sts=2 ts=8 et:
-aboutTor.searchDDG.privacy=Cari <a href="%1$S">secara aman</a> dengan <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privasi.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
-
aboutTor.donationBanner.donate=Donasi Sekarang!
aboutTor.donationBanner.slogan=Tor: Menggerakan Perlawanan Digital
@@ -18,3 +12,6 @@ aboutTor.donationBanner.tagline2=Kebebasan Jaringan di seluruh dunia
aboutTor.donationBanner.tagline3=Bebas berinternet
aboutTor.donationBanner.tagline4=Merawat Kebebasan Berekspresi di Seluruh Dunia
aboutTor.donationBanner.tagline5=Melindungi Privasi Jutaan Orang Setiap Hari
+
+aboutTor.newsletter.tagline=Get the latest news from Tor straight to your inbox.
+aboutTor.newsletter.link_text=Sign up for Tor News.
diff --git a/src/chrome/locale/id/torbutton.properties b/src/chrome/locale/id/torbutton.properties
index 01ec5cae..7f7dffef 100644
--- a/src/chrome/locale/id/torbutton.properties
+++ b/src/chrome/locale/id/torbutton.properties
@@ -21,8 +21,8 @@ torbutton.popup.external.suggest = Agar aman, sebaiknya anda hanya membuka file
torbutton.popup.launch = Unduh file
torbutton.popup.cancel = Batal
torbutton.popup.dontask = Secara otomatis file-file akan di unduh mulai sekarang
-torbutton.popup.prompted_language = Untuk memberikan Anda kerahasiaan yang lebih, Torbutton akan meminta versi bahasa Inggris dari halaman web. Ini mungkin menyebabkan halaman web yang Anda ingin baca dalam bahasa asli Anda akan ditampilkan dalam bahasa Inggris. â â Apakah anda mau meminta halaman web bahasa Inggris untuk kerahasiaan yang lebih baik?
torbutton.popup.no_newnym = Torbution tidak dapat memberikan Anda identitas baru secara aman. Torbutton tidak memiliki akses terhadap Tor Control Port. ââ Apakah Anda sedang menjalankan paket browser Tor?
+torbutton.security_settings.menu.title = Pengaturan Keamanan
torbutton.title.prompt_torbrowser = Important Torbutton Information
torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/is/aboutTor.properties b/src/chrome/locale/is/aboutTor.properties
index fde655f3..6a955931 100644
--- a/src/chrome/locale/is/aboutTor.properties
+++ b/src/chrome/locale/is/aboutTor.properties
@@ -1,13 +1,7 @@
-# Copyright (c) 2014, The Tor Project, Inc.
+# Copyright (c) 2018, The Tor Project, Inc.
# See LICENSE for licensing information.
# vim: set sw=2 sts=2 ts=8 et:
-aboutTor.searchDDG.privacy=Leita á <a href="%1$S">öruggan hátt</a> með <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
-
aboutTor.donationBanner.donate=Styrkja núna!
aboutTor.donationBanner.slogan=Tor: Keyrir áfram stafrÊnu andspyrnuhreyfinguna
@@ -18,3 +12,6 @@ aboutTor.donationBanner.tagline2=Frelsi á netinu út um allan heim
aboutTor.donationBanner.tagline3=Frelsi á netinu
aboutTor.donationBanner.tagline4=Fóstrar frjáls skoðanaskipti út um allan heim
aboutTor.donationBanner.tagline5=Verndar einkalÃf milljóna manna á hverjum degi
+
+aboutTor.newsletter.tagline=Get the latest news from Tor straight to your inbox.
+aboutTor.newsletter.link_text=Sign up for Tor News.
diff --git a/src/chrome/locale/is/torbutton.properties b/src/chrome/locale/is/torbutton.properties
index 81fc5305..72fbcadf 100644
--- a/src/chrome/locale/is/torbutton.properties
+++ b/src/chrome/locale/is/torbutton.properties
@@ -21,8 +21,8 @@ torbutton.popup.external.suggest = To be safe, you should only open downloaded f
torbutton.popup.launch = Ná à skrá
torbutton.popup.cancel = HÊtta við
torbutton.popup.dontask = Hlaða sjálfkrafa inn skrám héðan à frá
-torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
+torbutton.security_settings.menu.title = Ãryggisstillingar
torbutton.title.prompt_torbrowser = MikilvÊgar upplÜsingar um Tor-hnappinn
torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
torbutton.popup.short_torbrowser = MikilvÊgar upplÜsingar um Tor-hnappinn!\n\nTor-hnappurinn er núna alltaf virkur.\n\nSmelltu á Tor-hnappinn til að sjá nánar.
diff --git a/src/chrome/locale/it/aboutTor.properties b/src/chrome/locale/it/aboutTor.properties
index e25f90ad..65aa5fd3 100644
--- a/src/chrome/locale/it/aboutTor.properties
+++ b/src/chrome/locale/it/aboutTor.properties
@@ -1,13 +1,7 @@
-# Copyright (c) 2014, The Tor Project, Inc.
+# Copyright (c) 2018, The Tor Project, Inc.
# See LICENSE for licensing information.
# vim: set sw=2 sts=2 ts=8 et:
-aboutTor.searchDDG.privacy=Cerca <a href="%1$S">in modo sicuro</a> con <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
-
aboutTor.donationBanner.donate=Dona adesso!
aboutTor.donationBanner.slogan=Tor: alimentiamo la resistenza digitale
@@ -18,3 +12,6 @@ aboutTor.donationBanner.tagline2=Rendiamo la rete libera nel mondo
aboutTor.donationBanner.tagline3=Libertà online
aboutTor.donationBanner.tagline4=Promuoviamo la libertà di parola nel mondo
aboutTor.donationBanner.tagline5=Proteggiamo la privacy di milioni di persone ogni giorno
+
+aboutTor.newsletter.tagline=Get the latest news from Tor straight to your inbox.
+aboutTor.newsletter.link_text=Sign up for Tor News.
diff --git a/src/chrome/locale/it/browserOnboarding.properties b/src/chrome/locale/it/browserOnboarding.properties
index c3169b1d..b04346b4 100644
--- a/src/chrome/locale/it/browserOnboarding.properties
+++ b/src/chrome/locale/it/browserOnboarding.properties
@@ -4,8 +4,8 @@
onboarding.tour-tor-welcome=Benvenuto
onboarding.tour-tor-welcome.title=Youâre ready.
-onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
-onboarding.tour-tor-welcome.button=Start Now
+onboarding.tour-tor-welcome.description=Tor Browser offre il più alto standard di privacy e sicurezza nella navigazione del web. Ora sei protetto da tracciamento, sorveglianza e censura. Leggi come riusciamo a farlo seguendo questa rapida introduzione.
+onboarding.tour-tor-welcome.button=Inizia ora
onboarding.tour-tor-privacy=Privacy
onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
diff --git a/src/chrome/locale/it/torbutton.properties b/src/chrome/locale/it/torbutton.properties
index 3f8f2bac..93004fa1 100644
--- a/src/chrome/locale/it/torbutton.properties
+++ b/src/chrome/locale/it/torbutton.properties
@@ -21,8 +21,8 @@ torbutton.popup.external.suggest = Per essere totalmente sicuri, si dovrebbe apr
torbutton.popup.launch = Scaricare il file
torbutton.popup.cancel = Annulla
torbutton.popup.dontask = Scaricare automaticamente i file d'ora in poi
-torbutton.popup.prompted_language = Per aumentare la tua privacy, Torbutton può richiedere la versione inglese delle pagine web. Perciò alcune pagine che preferiresti leggere nella tua lingua potrebbero essere visualizzate in inglese.\n\nPreferisci richiedere le pagine web in inglese per una maggiore privacy?
torbutton.popup.no_newnym = Torbutton non può assegnarti una nuova identità in modo sicuro, poiché non ha accesso alla porta di controllo di Tor.\n\nStai usando Tor Browser Bundle?
+torbutton.security_settings.menu.title = Impostazioni sicurezza
torbutton.title.prompt_torbrowser = Informazioni importanti su Torbutton
torbutton.popup.prompt_torbrowser = Torbutton ora funziona in modo diverso: non Ú più possibile disabilitarlo.\n\nQuesto cambiamento Ú stato apportato poiché risulta poco sicuro utilizzare Torbutton in un browser utilizzato anche senza di esso. Ci sono alcuni problemi critici che non Ú possibile risolvere in un modo diverso da questo.\n\nSe si desidera utilizzare Firefox normalmente (senza, quindi, Torbutton) Ú necessario disinstallare manualmente Torbutton ed installare Tor Browser Bundle. Le impostazioni per la privacy, inoltre, sono superiori su Tor Browser rispetto ad una normale installazione di Firefox, anche quando quest'ultimo Ú utilizzato con Torbutton.\n\nPer rimuovere Torbutton, andare in Strumenti -> Componenti aggiuntivi -> Estensioni e fare clic sul pulsante Disinstalla vicino a Torbutton.
torbutton.popup.short_torbrowser = Informazioni importanti su Torbutton!\n\nTorbutton ora Ú sempre abilitato.\n\nFai clic su Torbutton per ulteriori informazioni.
diff --git a/src/chrome/locale/ja/aboutTor.properties b/src/chrome/locale/ja/aboutTor.properties
index 5e85397c..5ef4bd04 100644
--- a/src/chrome/locale/ja/aboutTor.properties
+++ b/src/chrome/locale/ja/aboutTor.properties
@@ -1,13 +1,7 @@
-# Copyright (c) 2014, The Tor Project, Inc.
+# Copyright (c) 2018, The Tor Project, Inc.
# See LICENSE for licensing information.
# vim: set sw=2 sts=2 ts=8 et:
-aboutTor.searchDDG.privacy=<a href="%2$S">DuckDuckGo</a>ã§<a href="%1$S">å®å
šã«</a>æ€çŽ¢ãã
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
-
aboutTor.donationBanner.donate=ä»ããå¯ä»é¡ããŸãïŒ
aboutTor.donationBanner.slogan=Tor: ããžã¿ã«æµæéåã«åãäžããã
@@ -18,3 +12,6 @@ aboutTor.donationBanner.tagline2=äžççãããã¯ãŒã¯èªç±
aboutTor.donationBanner.tagline3=ããªãŒãã ãªã³ã©ã€ã³
aboutTor.donationBanner.tagline4=äžççã«èªç±ãªè¡šçŸãä¿é²ããŸãã
aboutTor.donationBanner.tagline5=æ°çŸäžä»¶ä»¥äžã®ãã©ã€ãã·ãŒãæ¯æ¥ä¿è·ããŠããŸãã
+
+aboutTor.newsletter.tagline=Get the latest news from Tor straight to your inbox.
+aboutTor.newsletter.link_text=Sign up for Tor News.
diff --git a/src/chrome/locale/ja/torbutton.properties b/src/chrome/locale/ja/torbutton.properties
index 29e15568..7fe98766 100644
--- a/src/chrome/locale/ja/torbutton.properties
+++ b/src/chrome/locale/ja/torbutton.properties
@@ -21,8 +21,8 @@ torbutton.popup.external.suggest = å®å
šã§ããããã«ã¯ããªãã©ã€ã³
torbutton.popup.launch = ãã¡ã€ã«ãããŠã³ããŒããã
torbutton.popup.cancel = ãã£ã³ã»ã«
torbutton.popup.dontask = ä»ãããã¡ã€ã«ãèªåçã«ããŠã³ããŒããã
-torbutton.popup.prompted_language = ãããã©ã€ãã·ãŒãå®ãããã«ãTorbuttonã¯ãŠã§ãããŒãžã®è±èªçãèŠæ±ããããšãã§ããŸãã ããã¯ããªããæ¯åœèªã§èªã¿ãããŠã§ãããŒãžã代ããã«è±èªã§è¡šç€ºããããããããŸããã\n\nããé«ããã©ã€ãã·ãŒã®ããã«ãè±èªã®ãŠã§ãããŒãžãèŠæ±ããŸããïŒ
torbutton.popup.no_newnym = Torã³ã³ãããŒã«ããŒãã«ã¢ã¯ã»ã¹ã§ããŸããã§ãããTorbuttonã¯æ°ããæ¥ç¶çµè·¯ãå®å
šã«çšæããããšãã§ããŸããã\n\nTorãã©ãŠã¶ãã³ãã«ãèµ·åããŠããŸããïŒ
+torbutton.security_settings.menu.title = ã»ãã¥ãªãã£èšå®
torbutton.title.prompt_torbrowser = éèŠãªTorbuttonã®æ
å ±
torbutton.popup.prompt_torbrowser = Torbuttonã¯çŸåšå¥æ§ã«åäœããŠããŸããããæ¢ããããšã¯ã§ããŸããã\n\nç§ãã¡ã¯ãéTorãã©ãŠãžã³ã°ã®ããã«ã䜿ãããŠãããã©ãŠã¶ã§ã®Torbuttonã®äœ¿çšãå®å
šã§ã¯ãªãããããã®å€æŽãè¡ããŸããã ä»ã®æ¹æ³ã§ä¿®æ£ããããšãã§ããªããã°ãå€ãããŸããã\n\næ£åžžã«Firefoxã䜿çšãããå Žåã¯ãTorbuttonãã¢ã³ã€ã³ã¹ããŒã«ããŠãTor Browser BundleãããŠã³ããŒããã¹ãã§ãã Tor Browserã®ãã©ã€ãã·ãŒç¹æ§ã¯FirefoxãTorbuttonãšäœ¿ãããŠããæã§ããéåžžã®Firefoxã®ãããããåªå¢ã§ãã\n\nTorbuttonãåé€ããã«ã¯ãããŒã«->ã¢ããªã³->ãšã¯ã¹ãã³ã·ã§ã³ã«è¡ããããããTorbuttonã®é£ã®åé€ãã¿ã³ãã¯ãªãã¯ããŠãã ããã
torbutton.popup.short_torbrowser = éèŠãªTorbuttonã®æ
å ±!\n\nTorbuttonã¯çŸåšåžžã«æå¹ã§ãã\n\n詳现ã¯Torbuttonãã¯ãªãã¯ããŠãã ããã
diff --git a/src/chrome/locale/ko/aboutTor.properties b/src/chrome/locale/ko/aboutTor.properties
index d09b69c8..c039f4cd 100644
--- a/src/chrome/locale/ko/aboutTor.properties
+++ b/src/chrome/locale/ko/aboutTor.properties
@@ -1,13 +1,7 @@
-# Copyright (c) 2014, The Tor Project, Inc.
+# Copyright (c) 2018, The Tor Project, Inc.
# See LICENSE for licensing information.
# vim: set sw=2 sts=2 ts=8 et:
-aboutTor.searchDDG.privacy=<a href="%2$S">DuckDuckGo</a>륌 íµíŽ <a href="%1$S>ìì íê²</a> ê²ì
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
-
aboutTor.donationBanner.donate=Donate Now!
aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance
@@ -18,3 +12,6 @@ aboutTor.donationBanner.tagline2=Networking Freedom Worldwide
aboutTor.donationBanner.tagline3=Freedom Online
aboutTor.donationBanner.tagline4=Fostering Free Expression Worldwide
aboutTor.donationBanner.tagline5=Protecting the Privacy of Millions Every Day
+
+aboutTor.newsletter.tagline=Get the latest news from Tor straight to your inbox.
+aboutTor.newsletter.link_text=Sign up for Tor News.
diff --git a/src/chrome/locale/ko/torbutton.dtd b/src/chrome/locale/ko/torbutton.dtd
index 835a7cca..5daf9f14 100644
--- a/src/chrome/locale/ko/torbutton.dtd
+++ b/src/chrome/locale/ko/torbutton.dtd
@@ -46,6 +46,6 @@
<!ENTITY torbutton.prefs.sec_js_disabled "ìë° ì€í¬ëŠœížë Ʞ볞 ì€ì ìŒë¡ 몚ë ì¬ìŽížìì ë¹íì±í ëìŽ ììµëë€.">
<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
-<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
-<!ENTITY torbutton.circuit_display.title "Tor Circuit">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "ì€ëì€ì ëìì(HTML5 media) ë³Žë €ë©Ž ë륎ììì€.">
+<!ENTITY torbutton.circuit_display.title "í 륎 ìí·">
<!ENTITY torbutton.circuit_display.new_circuit "New Circuit for this Site">
diff --git a/src/chrome/locale/ko/torbutton.properties b/src/chrome/locale/ko/torbutton.properties
index 846b6c48..2755c75b 100644
--- a/src/chrome/locale/ko/torbutton.properties
+++ b/src/chrome/locale/ko/torbutton.properties
@@ -21,8 +21,8 @@ torbutton.popup.external.suggest = ìì íêž° ìíì¬ ì€íëŒìž ìŒ ë
torbutton.popup.launch = íìŒì ë€ìŽë¡ë íêž°
torbutton.popup.cancel = ì·šì
torbutton.popup.dontask = ì§êžë¶í° íìŒì ìëìŒë¡ ë€ìŽë¡ë
-torbutton.popup.prompted_language = ë ë§ì ê°ìž ì 볎륌 ìíŽ, Torbuttonì ììŽ ë²ì ì¹íìŽì§ë¥Œ ìì²í ì ììµëë€. ìŽê²ì ê·íì 몚êµìŽ ëì ììŽë¥Œ íìíë ì¹ íìŽì§ë¥Œ ìŒìŒí¬ ì ììµëë€.\n\në ëì ê°ìž ì 볎륌 ìíŽ ììŽ ì¹ íìŽì§ë¥Œ ìì²íìê² ìµëê¹?
torbutton.popup.no_newnym = Torbuttonì ìì íê² ìë¡ìŽ ì ìì ì€ ì ììµëë€. ìŽê²ì Tor 컚ížë¡€ í¬ížì ì ê·Œí ì ììµëë€.\n\nTor Browser Bundleì ì¬ì©íê³ ê³ìëê¹?
+torbutton.security_settings.menu.title = 볎ì ì€ì
torbutton.title.prompt_torbrowser = ì€ìí Torbutton ì 볎
torbutton.popup.prompt_torbrowser = Torbuttonì ì§êž ë€ë¥Žê² ìëí©ëë€. ê·íë ëìŽì ë ì ììµëë€. ë¹Tor ëžëŒì°ì§ì ì¬ì©ë ì ìë ëžëŒì°ì žìì ì¬ì©íë ê²ì ìííêž° ë묞ì ìŽ ë³í륌 ë§ë€ììµëë€. ì°ëŠ¬ê° ìŽë€ ë€ë¥ž ë°©ë²ìŒë¡ ê³ ì¹ ì ìë ìë§ì ë²ê·žë ììµëë€. ë§ìœ íìŽìŽíì€ë¥Œ ìŒë°ì ìŒë¡ ì¬ì©íꞰ륌 ìíì ë€ë©Ž Torbuttonì ìžìžì€íš íìê³ Tor Browser Bundleì ë€ìŽë¡ë íììì€. Tor browserì íëŒìŽë²ì ì€ì ì, ì¬ì§ìŽ íìŽìŽíì€ê° Torbutton곌 ì°ìëëŒë, 볎íµì íìŽìŽíì€ì ì€ì ì ì°ì í©ëë€. Torbuttonì ì§ì°ìë €ë©Ž, ë구 - ë¶ê° êž°ë¥ - íì¥ì ë€ìŽê°ì
ì
Torbutton ìì ì ê±° ë²íŒì ë륎ììì€.
torbutton.popup.short_torbrowser = ì€ìí Torbutton ì 볎! Torbuttonì ìŽì íì íì±íë©ëë€. ë ë§ì ì 볎륌 ìíŽìë Torbuttonì ë륎ììì€.
diff --git a/src/chrome/locale/nb/aboutTor.properties b/src/chrome/locale/nb/aboutTor.properties
index b72d167f..d53095af 100644
--- a/src/chrome/locale/nb/aboutTor.properties
+++ b/src/chrome/locale/nb/aboutTor.properties
@@ -1,13 +1,7 @@
-# Copyright (c) 2014, The Tor Project, Inc.
+# Copyright (c) 2018, The Tor Project, Inc.
# See LICENSE for licensing information.
# vim: set sw=2 sts=2 ts=8 et:
-aboutTor.searchDDG.privacy=SÞk <a href="%1$S">sikkert</a> med <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
-
aboutTor.donationBanner.donate=Doner nå.
aboutTor.donationBanner.slogan=Tor: PÃ¥driver for digital motstandsdyktighet
@@ -18,3 +12,6 @@ aboutTor.donationBanner.tagline2=Verdensomspennende nettverksfrihet
aboutTor.donationBanner.tagline3=Frihet på nett
aboutTor.donationBanner.tagline4=Grobunn til verdensomspennende ytringsfrihet
aboutTor.donationBanner.tagline5=Beskytter privatlivet til millioner hver dag
+
+aboutTor.newsletter.tagline=Get the latest news from Tor straight to your inbox.
+aboutTor.newsletter.link_text=Sign up for Tor News.
diff --git a/src/chrome/locale/nb/torbutton.properties b/src/chrome/locale/nb/torbutton.properties
index b1942b4a..f0adaf03 100644
--- a/src/chrome/locale/nb/torbutton.properties
+++ b/src/chrome/locale/nb/torbutton.properties
@@ -21,8 +21,8 @@ torbutton.popup.external.suggest = For å vÊre på den sikre siden, bÞr du kun
torbutton.popup.launch = Last ned fil
torbutton.popup.cancel = Avbryt
torbutton.popup.dontask = Last ned filer automatisk fra nå av
-torbutton.popup.prompted_language = For å gi deg et bedre personvern, kan Torbutton spÞrre om en engelskspråklig versjon av nettsider. Dette kan resultere i at nettsider du foretrekker å lese på morsmålet ditt vises på engelsk istedet.\n\nVil du spÞrre om engelskspråklige nettsider for å bedre personvernet?
torbutton.popup.no_newnym = Torbutton kan ikke trygt gi deg en ny identitet. Den har ikke tilgang til Tor-kontrollporten.\n\nKjÞrer du Tor-nettleserpakken?
+torbutton.security_settings.menu.title = Sikkerhetsinnstillinger
torbutton.title.prompt_torbrowser = Viktig Torbutton-informasjon
torbutton.popup.prompt_torbrowser = Torbutton fungerer annerledes nå. Du kan ikke skru den av lenger.\n\nVi gjorde denne forandringen fordi det ikke er sikkert å bruke Torbutton i en nettleser som også brukers til annen surfing enn Tor. \nDet var for mange feil der til at vi kunne fikse det på en annen måte.\n\nHvis du Þnsker å bruke Firefox normalt, bÞr du avinstallere Torbutton og laste ned Tor-nettleserforpakningen. Personvernsinnstillingene til Tor-nettleseren er også overlegen forvalget i Firefox, selv når Firefox brukes med Torbutton.\n\nFor å fjerne Torbutton, gå til VerktÞy->Tillegg->Utvidelser og klikk på Fjern-knappen ved siden av Torbutton.
torbutton.popup.short_torbrowser = Viktig Torbutton-informasjon!\n\nTorbutton er alltid aktivert nå.\n\nKlikk på Torbutton for mer informasjon.
diff --git a/src/chrome/locale/nl/aboutTor.properties b/src/chrome/locale/nl/aboutTor.properties
index 1604a0ee..01ce3be3 100644
--- a/src/chrome/locale/nl/aboutTor.properties
+++ b/src/chrome/locale/nl/aboutTor.properties
@@ -1,13 +1,7 @@
-# Copyright (c) 2014, The Tor Project, Inc.
+# Copyright (c) 2018, The Tor Project, Inc.
# See LICENSE for licensing information.
# vim: set sw=2 sts=2 ts=8 et:
-aboutTor.searchDDG.privacy=<a href="%1$S">Veilig</a> zoeken met <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
-
aboutTor.donationBanner.donate=Doneer nu!
aboutTor.donationBanner.slogan=Tor: Digitale tegenspraak aanmoedigen
@@ -18,3 +12,6 @@ aboutTor.donationBanner.tagline2=Wereldwijde Netwerk Vrijheid
aboutTor.donationBanner.tagline3=Online Vrijheid
aboutTor.donationBanner.tagline4=Bevorderen van gratis wereldwijde vrije mening
aboutTor.donationBanner.tagline5=Beveiligt de privacy van miljoenen gebruikers per dag
+
+aboutTor.newsletter.tagline=Get the latest news from Tor straight to your inbox.
+aboutTor.newsletter.link_text=Sign up for Tor News.
diff --git a/src/chrome/locale/nl/torbutton.properties b/src/chrome/locale/nl/torbutton.properties
index 9379a730..b53c5ca3 100644
--- a/src/chrome/locale/nl/torbutton.properties
+++ b/src/chrome/locale/nl/torbutton.properties
@@ -21,8 +21,8 @@ torbutton.popup.external.suggest = Om veilig te surfen, zou u alleen bestanden m
torbutton.popup.launch = Download bestand
torbutton.popup.cancel = Annuleren
torbutton.popup.dontask = Download bestanden automatisch vanaf nu
-torbutton.popup.prompted_language = Om je meer privacy te geven kan Torbutton pagina's in de Engelse taal opvragen. Dit kan er voor zorgen dat web pagina's die je graag in je eigen taal wilt lezen in het Engels weergegeven worden. Wil je web pagina's in de Engelse taal opvragen voor betere privacy?
torbutton.popup.no_newnym = Torbutton je niet veilig een nieuwe identiteit geven. Het heeft geen toegang tot de Tor Control Port.\n\nGebruik je de Tor Browser Bundle?
+torbutton.security_settings.menu.title = Beveiligingsinstellingen
torbutton.title.prompt_torbrowser = Belangrijke Torbutton informatie
torbutton.popup.prompt_torbrowser = Torbutton werkt nu anders: je kan het niet meer uitzetten.\n\nWe hebben deze verandering doorgevoerd, omdat het niet veilig is om Torbutton te gebruiken in een browser welke ook gebruikt wordt voor niet-Tor browsen. Er zaten teveel fouten in welke we niet konden repareren op een andere manier.\n\nAls je Firefox wilt blijven gebruiken op de normale manier, dan zal je Torbutten moeten deinstalleren en de Tor Browser Bundle moeten downloaden. De privacy eigenschappen van Tor Browser zijn ook superieur ten opzichte van de normale Firefox, zelfs wanneer Firefox gebruikt wordt met Torbutton.\n\nOm Torbutton te verwijderen, ga naar Extra->Add-ons->Extensies en klik dan op de knop Uitschakelen naast Torbutton.
torbutton.popup.short_torbrowser = Belangrijke Torbutton Informatie!\n\nTorbutten is nu altijd ingeschakeld.\n\nKlik op de Torbutton voor meer informatie.
diff --git a/src/chrome/locale/pl/aboutTor.properties b/src/chrome/locale/pl/aboutTor.properties
index b6e1bba3..0abbbd31 100644
--- a/src/chrome/locale/pl/aboutTor.properties
+++ b/src/chrome/locale/pl/aboutTor.properties
@@ -1,13 +1,7 @@
-# Copyright (c) 2014, The Tor Project, Inc.
+# Copyright (c) 2018, The Tor Project, Inc.
# See LICENSE for licensing information.
# vim: set sw=2 sts=2 ts=8 et:
-aboutTor.searchDDG.privacy=Szukaj <a href="%1$S">bezpiecznie</a> uÅŒywajÄ
c wyszukiwarki <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
-
aboutTor.donationBanner.donate=Wesprzyj teraz!
aboutTor.donationBanner.slogan=Tor: Zasila OdpornoÅÄ CyfrowÄ
@@ -18,3 +12,6 @@ aboutTor.donationBanner.tagline2=WolnoÅÄ dla sieci na caÅym Åwiecie
aboutTor.donationBanner.tagline3=WolnoÅÄ Online
aboutTor.donationBanner.tagline4=Wspieranie ekspresji na caÅym Åwiecie
aboutTor.donationBanner.tagline5=Ochrona prywatnoÅci milionów kaÅŒdego dnia
+
+aboutTor.newsletter.tagline=Get the latest news from Tor straight to your inbox.
+aboutTor.newsletter.link_text=Sign up for Tor News.
diff --git a/src/chrome/locale/pl/torbutton.properties b/src/chrome/locale/pl/torbutton.properties
index a7904141..b8b70ea3 100644
--- a/src/chrome/locale/pl/torbutton.properties
+++ b/src/chrome/locale/pl/torbutton.properties
@@ -21,8 +21,8 @@ torbutton.popup.external.suggest = Aby byÄ bezpiecznym, pobrane pliki naleÅŒy u
torbutton.popup.launch = Pobierz plik
torbutton.popup.cancel = Anuluj
torbutton.popup.dontask = Automatyczne pobieranie plików jest od teraz wÅÄ
czone
-torbutton.popup.prompted_language = Aby daÄ Ci wiÄcej prywatnoÅci, Torbutton moÅŒe ÅŒÄ
daÄ angielskich wersji stron internetowych. To moÅŒe spowodowaÄ, ÅŒe strony, które wolisz czytaÄ we wÅasnym jÄzyku bÄdÄ
siÄ zamiast tego wyÅwietlaÄ po angielsku.\n\nCzy chcesz ÅŒÄ
daÄ stron w jÄzyku angielskim dla lepszej prywatnoÅci?
torbutton.popup.no_newnym = Torbutton nie moÅŒe bezpiecznie daÄ Ci nowej toÅŒsamoÅci. Nie ma dostÄpu do Portu Kontrolnego Tora.\n\nUÅŒywasz Paczki Tora z PrzeglÄ
darkÄ
?
+torbutton.security_settings.menu.title = Ustawienia bezpieczeÅstwa
torbutton.title.prompt_torbrowser = WaÅŒne informacje o Torbuttonie
torbutton.popup.prompt_torbrowser = Torbutton teraz dziaÅa inaczej: nie moÅŒna juÅŒ go wyÅÄ
czyÄ.\n\nZrobiliÅmy tÄ zmianÄ, gdyÅŒ nie jest bezpiecznie uÅŒywaÄ Torbuttona w przeglÄ
darce uÅŒywanej takÅŒe do przeglÄ
dania sieci bez Tora. ByÅo za duÅŒo bÅÄdów, których nie mogliÅmy naprawiÄ inaczej.\n\nJeÅli chcesz dalej normalnie uÅŒywaÄ Firefoksa, odinstaluj Torbutton i pobierz PaczkÄ Tora z PrzeglÄ
darkÄ
. Cechy prywatnoÅci w PrzeglÄ
darce Tora sÄ
lepsze od tych w normalnym Firefoksie, nawet gdy jest uÅŒywany z Torbutonem.\n\nAby usunÄ
Ä Torbuttona, wejdź do NarzÄdzia->Dodatki->Rozszerzenia i kliknij przycisk UsuÅ obok Torbuttona.
torbutton.popup.short_torbrowser = WaÅŒne informacje o Torbuttonie!\n\nTorbutton jest teraz ciÄ
gle wÅÄ
czony.\n\nKliknij Turbutton, aby dowiedzieÄ siÄ wiÄcej.
diff --git a/src/chrome/locale/pt-BR/aboutTor.dtd b/src/chrome/locale/pt-BR/aboutTor.dtd
index 80c6f8bc..dbf43ab1 100644
--- a/src/chrome/locale/pt-BR/aboutTor.dtd
+++ b/src/chrome/locale/pt-BR/aboutTor.dtd
@@ -11,14 +11,14 @@
<!ENTITY aboutTor.failure.label "Alguma coisa deu errado!">
<!ENTITY aboutTor.failure2.label "Tor não está funcionando neste navegador. ">
-<!ENTITY aboutTor.search.label "Search with DuckDuckGo">
+<!ENTITY aboutTor.search.label "Pesquise com DuckDuckGo">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com">
<!ENTITY aboutTor.torbrowser_user_manual_questions.label "Perguntas?">
-<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual »">
+<!ENTITY aboutTor.torbrowser_user_manual_link.label "Veja nosso Manual do Navegador Tor">
<!-- The next two entities are used within the browser's Help menu. -->
<!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">
-<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual">
+<!ENTITY aboutTor.torbrowser_user_manual.label "Manual do Navegador Tor">
<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
<!ENTITY aboutTor.getInvolved.label "Get Involved »">
diff --git a/src/chrome/locale/pt-BR/aboutTor.properties b/src/chrome/locale/pt-BR/aboutTor.properties
index 44b73037..3a91c908 100644
--- a/src/chrome/locale/pt-BR/aboutTor.properties
+++ b/src/chrome/locale/pt-BR/aboutTor.properties
@@ -1,13 +1,7 @@
-# Copyright (c) 2014, The Tor Project, Inc.
+# Copyright (c) 2018, The Tor Project, Inc.
# See LICENSE for licensing information.
# vim: set sw=2 sts=2 ts=8 et:
-aboutTor.searchDDG.privacy=Buscar <a href="%1$S">com segurança</a> utilizando <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
-
aboutTor.donationBanner.donate=Faça uma Doação Agora!
aboutTor.donationBanner.slogan=Tor: Fortalecendo a Resistência Digital
@@ -18,3 +12,6 @@ aboutTor.donationBanner.tagline2=Construindo Redes de Liberdade no Mundo Todo
aboutTor.donationBanner.tagline3=Liberdade na Internet
aboutTor.donationBanner.tagline4=Promovendo Liberdade de Expressão no Mundo Todo
aboutTor.donationBanner.tagline5=Protegendo a Privacidade de Milhões de Pessoas Todos os Dias
+
+aboutTor.newsletter.tagline=Get the latest news from Tor straight to your inbox.
+aboutTor.newsletter.link_text=Sign up for Tor News.
diff --git a/src/chrome/locale/pt-BR/torbutton.properties b/src/chrome/locale/pt-BR/torbutton.properties
index 09ea7581..1dc01fdc 100644
--- a/src/chrome/locale/pt-BR/torbutton.properties
+++ b/src/chrome/locale/pt-BR/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.circuit_display.relay = Relê
torbutton.circuit_display.tor_bridge = Ponte
torbutton.circuit_display.unknown_country = PaÃs desconhecido
torbutton.circuit_display.guard = Guard
-torbutton.circuit_display.guard_note = Your [Guard] node may not change.
+torbutton.circuit_display.guard_note = Seu nó [Guard] não pode mudar.
torbutton.circuit_display.learn_more = Aprenda mais
torbutton.content_sizer.margin_tooltip = O Navegador Tor inclui esta margem para que a altura e a largura da janela sejam menos distinguÃveis, o que reduz a possibilidade de que alguém rastreie a sua navegação .
torbutton.panel.tooltip.disabled = Clique para habilitar o Tor
@@ -21,8 +21,8 @@ torbutton.popup.external.suggest = Para sua segurança, você só deve abrir arq
torbutton.popup.launch = Fazer o download do arquivo
torbutton.popup.cancel = Cancelar
torbutton.popup.dontask = Fazer o download dos arquivos automaticamente de agora em diante
-torbutton.popup.prompted_language = Para proporcionar-lhe mais privacidade, o Torbutton pode requisitar a versão em inglês das páginas da web. Isso pode fazer com que as páginas que você prefere ler na sua lÃngua nativa apareçam em Inglês.
torbutton.popup.no_newnym = O Torbutton não pode lhe dar uma nova identidade com segurança. Ele não tem acesso à Porta de Controle do Tor.\n\nVocê está usando o Pacote do Navegador Tor?
+torbutton.security_settings.menu.title = Configurações de Segurança
torbutton.title.prompt_torbrowser = Informação importante do Torbutton
torbutton.popup.prompt_torbrowser = O Torbutton agora está funcionando de outra maneira: você não pode mais desligá-lo.\n\nNós fizemos esta mudança porque não é seguro usar o Torbutton em um navegador que também é usado para navegação não-Tor. Havia muitos bugs que nós não conseguÃamos resolver de nenhum outro modo.\n\nSe você quiser continuar usando o Firefox normalmente, deverá desinstalar o Torbutton e fazer o download do Pacote do Navegador Tor. As configurações de privacidade do Navegador Tor também são superiores à quelas do Firefox comum, mesmo quando era usado com o Torbutton.\n\nPara remover o Torbutton, vá até Ferramentas->Complementos->Extensões e clique no botão Remover próximo ao Torbutton.
torbutton.popup.short_torbrowser = Informação Importante do Torbutton!\n\nO Torbutton agora estará sempre habilitado.\n\nClique no Torbutton para mais informações.
diff --git a/src/chrome/locale/ru/aboutTor.properties b/src/chrome/locale/ru/aboutTor.properties
index 4339b076..a8946d6b 100644
--- a/src/chrome/locale/ru/aboutTor.properties
+++ b/src/chrome/locale/ru/aboutTor.properties
@@ -1,13 +1,7 @@
-# Copyright (c) 2014, The Tor Project, Inc.
+# Copyright (c) 2018, The Tor Project, Inc.
# See LICENSE for licensing information.
# vim: set sw=2 sts=2 ts=8 et:
-aboutTor.searchDDG.privacy=ÐÑОÑе<a href="%1$S">безПпаÑМП</a> Ñ <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
-
aboutTor.donationBanner.donate=ÐПжеÑÑвПваÑÑ ÑейÑаÑ!
aboutTor.donationBanner.slogan=Tor: ÑÑÐžÐ»ÐžÐ²Ð°Ñ ÑОÑÑПвПе ÑПпÑПÑОвлеМОе
@@ -18,3 +12,6 @@ aboutTor.donationBanner.tagline2=СвПбПЎа ÑеÑО вП вÑеЌ ЌОÑе
aboutTor.donationBanner.tagline3=СвПбПЎа в ÑеÑО
aboutTor.donationBanner.tagline4=СПЎейÑÑвОе ÑазвОÑÐžÑ Ð±ÐµÐ·Ð³ÑаМОÑМПгП ÑаЌПвÑÑÐ°Ð¶ÐµÐœÐžÑ Ð²ÐŸ ÐÑеЌОÑМПй СеÑО.
aboutTor.donationBanner.tagline5=ÐаÑОÑÐ°Ñ ÐПМÑОЎеМÑОалÑМПÑÑÑ ÐŒÐžÐ»Ð»ÐžÐŸÐœÐŸÐ² кажЎÑй ЎеМÑ
+
+aboutTor.newsletter.tagline=Get the latest news from Tor straight to your inbox.
+aboutTor.newsletter.link_text=Sign up for Tor News.
diff --git a/src/chrome/locale/ru/torbutton.properties b/src/chrome/locale/ru/torbutton.properties
index 687a52e2..15182cd3 100644
--- a/src/chrome/locale/ru/torbutton.properties
+++ b/src/chrome/locale/ru/torbutton.properties
@@ -21,8 +21,8 @@ torbutton.popup.external.suggest = ÐÐ»Ñ Ð±ÐµÐ·ÐŸÐ¿Ð°ÑМПÑÑО, ÑекПЌе
torbutton.popup.launch = СкаÑаÑÑ Ñайл
torbutton.popup.cancel = ÐÑЌеМОÑÑ
torbutton.popup.dontask = С ÑÑПгП ЌПЌеМÑа ÑкаÑОваÑÑ ÑÐ°Ð¹Ð»Ñ Ð°Ð²ÑПЌаÑОÑеÑкО
-torbutton.popup.prompted_language = ÐÐ»Ñ Ð¿ÑеЎПÑÑÐ°Ð²Ð»ÐµÐœÐžÑ Ð±ÐŸÐ»ÑÑей пÑОваÑМПÑÑО, Torbutton ÐŒÐŸÐ¶ÐµÑ Ð·Ð°Ð¿ÑаÑОваÑÑ Ð²ÐµÑÑОО ÑÑÑÐ°ÐœÐžÑ ÐœÐ° аМглОйÑкПЌ ÑзÑке. ÐÑП ÐŒÐŸÐ¶ÐµÑ Ð¿ÐŸÐ²Ð»ÐµÑÑ ÐŸÑПбÑажеМОе ÑÑÑÐ°ÐœÐžÑ ÐœÐ° аМглОйÑкПЌ ÑзÑке, вЌеÑÑП ПÑПбÑÐ°Ð¶ÐµÐœÐžÑ ÐžÑ
Ма ваÑеЌ ÑПЎМПЌ ÑзÑке.\n\nХПÑОÑе запÑаÑОваÑÑ ÑÑÑаМОÑÑ ÐœÐ° аМглОйÑкПЌ ÑзÑке ÐŽÐ»Ñ Ð±ÐŸÐ»ÑÑей пÑОваÑМПÑÑО?
torbutton.popup.no_newnym = Torbutton Ме ÐŒÐŸÐ¶ÐµÑ Ð±ÐµÐ·ÐŸÐ¿Ð°ÑМП ЎаÑÑ Ð²Ð°ÐŒ МПвÑÑ Ð»ÐžÑМПÑÑÑ. ÐМ Ме ÐžÐŒÐµÐµÑ ÐŽÐŸÑÑÑпа к Tor Control Port.\n\nÐÑ ÐžÑпПлÑзÑеÑе Tor Browser Bundle?
+torbutton.security_settings.menu.title = ÐаÑÑÑПйкО безПпаÑМПÑÑО
torbutton.title.prompt_torbrowser = ÐÐ°Ð¶ÐœÐ°Ñ ÐžÐœÑПÑЌаÑÐžÑ Torbutton
torbutton.popup.prompt_torbrowser = Torbutton ÑабПÑÐ°ÐµÑ Ð¿ÐŸ-ÐŽÑÑгПЌÑ. ÐÑ ÐœÐµ ЌПжеÑе вÑклÑÑОÑÑ ÐµÐ³ÐŸ бПлÑÑе â â ÐÑ ÑЎелалО ÑÑП ОзЌеМеМОе, пПÑÐŸÐŒÑ ÑÑП ÑÑП Ме безПпаÑМП ОÑпПлÑзПваÑÑ Torbutton в бÑаÑзеÑе, кПÑПÑÑй Ñакже ОÑпПлÑзÑеÑÑÑ ÐŽÐ»Ñ ÐœÐµ-Tor пÑПÑЌПÑÑа. СÑÑеÑÑвПвалО ÑлОÑкПЌ ЌМПгП ПÑОбПк ÑаЌ, ÑÑП ÐŒÑ ÐœÐµ ЌПглО ОÑпÑавОÑÑ ÐœÐžÐºÐ°ÐºÐžÐŒ ÐŽÑÑгОЌ ÑпПÑПбПЌ. â â ÐÑлО Ð²Ñ Ñ
ПÑОÑе пÑПЎПлжаÑÑ ÐžÑпПлÑзПваÑÑ Firefox МПÑЌалÑМП, Ð²Ñ ÐŽÐŸÐ»Ð¶ÐœÑ ÑЎалОÑÑ Torbutton О ÑкаÑаÑÑ Tor Browser Bundle. СвПйÑÑва кПМÑОЎеМÑОалÑМПÑÑО Tor Browser Ñакже пÑевПÑÑ
ПЎÑÑ ÐŸÐ±ÑÑМÑй Firefox, Ўаже еÑлО Firefox ОÑпПлÑзÑеÑÑÑ Ñ Torbutton. â â ЧÑÐŸÐ±Ñ ÑЎалОÑÑ Torbutton, пеÑейЎÐ
žÑе в ÐŒÐµÐœÑ Ð¡ÐµÑвОÑ-> ÐПпПлМеМОÑ-> РаÑÑОÑеМОÑ, а заÑеЌ МажЌОÑе ÐºÐœÐŸÐ¿ÐºÑ Ð£ÐŽÐ°Ð»ÐžÑÑ ÑÑЎПЌ Ñ Torbutton.
torbutton.popup.short_torbrowser = ÐÐ°Ð¶ÐœÐ°Ñ ÐžÐœÑПÑЌаÑÐžÑ Torbutton! â â Torbutton ÑепеÑÑ Ð²ÑегЎа вклÑÑеМ. â â ÐажЌОÑе Ма Torbutton ÐŽÐ»Ñ Ð¿ÐŸÐ»ÑÑÐµÐœÐžÑ ÐŽÐŸÐ¿ÐŸÐ»ÐœÐžÑелÑМПй ОМÑПÑЌаÑОО.
diff --git a/src/chrome/locale/sv/aboutTor.properties b/src/chrome/locale/sv/aboutTor.properties
index d871467c..ef57f1d2 100644
--- a/src/chrome/locale/sv/aboutTor.properties
+++ b/src/chrome/locale/sv/aboutTor.properties
@@ -1,13 +1,7 @@
-# Copyright (c) 2014, The Tor Project, Inc.
+# Copyright (c) 2018, The Tor Project, Inc.
# See LICENSE for licensing information.
# vim: set sw=2 sts=2 ts=8 et:
-aboutTor.searchDDG.privacy=Sök <a href="%1$S">sÀkert</a> med <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
-
aboutTor.donationBanner.donate=Donera nu!
aboutTor.donationBanner.slogan=Tor: Möjliggör digitalt motstånd
@@ -18,3 +12,6 @@ aboutTor.donationBanner.tagline2=NÀtverksfrihet över hela vÀrlden
aboutTor.donationBanner.tagline3=Frihet på nÀtet
aboutTor.donationBanner.tagline4=FrÀmjer yttrandefriheten över hela vÀrlden
aboutTor.donationBanner.tagline5=Skydda integriteten av miljoner varje dag
+
+aboutTor.newsletter.tagline=Get the latest news from Tor straight to your inbox.
+aboutTor.newsletter.link_text=Sign up for Tor News.
diff --git a/src/chrome/locale/sv/torbutton.properties b/src/chrome/locale/sv/torbutton.properties
index 554ffc72..2daa2bfb 100644
--- a/src/chrome/locale/sv/torbutton.properties
+++ b/src/chrome/locale/sv/torbutton.properties
@@ -21,8 +21,8 @@ torbutton.popup.external.suggest = Det Àr sÀkrast att öppna filer du har hÀm
torbutton.popup.launch = HÀmta hem filen
torbutton.popup.cancel = Avbryt
torbutton.popup.dontask = HÀmta hem filer automatiskt i fortsÀttningen
-torbutton.popup.prompted_language = För ett bÀttre integritetsskydd kan Torbutton begÀra den engelska versionen av webbplatser. Detta kan göra att webbplatser som du föredrar att lÀsa på ditt modersmål visas på engelska istÀllet.\\\n\\\n Vill du visa sidor på engelska för att få ett bÀttre integritetsskydd?
torbutton.popup.no_newnym = Torbutton kan inte sÀkert ge dig en ny identitet. Det har inte tillgång till Tor Control Port.\n\nKör du Tor Browser Bundle?
+torbutton.security_settings.menu.title = SÀkerhetsinstÀllningar
torbutton.title.prompt_torbrowser = Viktig information om Torbutton
torbutton.popup.prompt_torbrowser = Torbutton fungerar annorlunda nu: Du kan inte slå av den lÀngre.\n\nVi gjorde denna förÀndring eftersom det inte Àr sÀkert att anvÀnda Torbutton i en webblÀsare som också anvÀnds för icke-Tor surfning. Det var för många buggar som vi inte kunde fixa på något annat sÀtt.\n\nOm du vill fortsÀtta anvÀnda Firefox normalt så bör du avinstallera Tor Browser och ladda ner Tor Browser Bundle. Tor Browser skyddar din integritet bÀttre Àn vanliga Firefox, Àven nÀr Firefox anvÀnds med Tor Button.\n\nFör att ta bort Torbutton, gå till Verktyg->TillÀgg->TillÀgg och klicka på Ta bort-knappen bredvid Torbutton.
torbutton.popup.short_torbrowser = Viktig information om Torbutton!\n\nTorbutton Àr nu alltid aktiverad.\n\nKlicka på Torbutton för mer information.
diff --git a/src/chrome/locale/tr/aboutTor.properties b/src/chrome/locale/tr/aboutTor.properties
index e07e35d8..d07ad999 100644
--- a/src/chrome/locale/tr/aboutTor.properties
+++ b/src/chrome/locale/tr/aboutTor.properties
@@ -1,13 +1,7 @@
-# Copyright (c) 2014, The Tor Project, Inc.
+# Copyright (c) 2018, The Tor Project, Inc.
# See LICENSE for licensing information.
# vim: set sw=2 sts=2 ts=8 et:
-aboutTor.searchDDG.privacy=<a href="%2$S">DuckDuckGo</a> kullanarak <a href="%1$S">gÌvenli</a> arama yapın.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
-
aboutTor.donationBanner.donate=BaÄıŠYapın
aboutTor.donationBanner.slogan=Tor: Dijital DireniÅi GÌçlendiriyor
@@ -18,3 +12,6 @@ aboutTor.donationBanner.tagline2=TÃŒm DÃŒnyada AÄ ÃzgÃŒrlÃŒÄÃŒ
aboutTor.donationBanner.tagline3=Ãevrimiçi ÃzgÃŒrlÃŒk
aboutTor.donationBanner.tagline4=TÃŒm DÃŒnyada İfade ÃzgÃŒrlÃŒÄÃŒ Destekleniyor
aboutTor.donationBanner.tagline5=Her GÃŒn Milyonlarca KiÅinin GizliliÄi Korunuyor
+
+aboutTor.newsletter.tagline=Tor ile ilgili son geliÅmeler doÄrudan e-posta kutunuza gelsin.
+aboutTor.newsletter.link_text=Tor Haber BÃŒltenine Abone Olun
diff --git a/src/chrome/locale/tr/torbutton.dtd b/src/chrome/locale/tr/torbutton.dtd
index 052c0932..e349d913 100644
--- a/src/chrome/locale/tr/torbutton.dtd
+++ b/src/chrome/locale/tr/torbutton.dtd
@@ -1,4 +1,4 @@
-<!ENTITY torbutton.context_menu.new_identity "Yeni Kimlik">
+<!ENTITY torbutton.context_menu.new_identity "KimliÄi Yenile">
<!ENTITY torbutton.context_menu.new_identity_key "I">
<!ENTITY torbutton.context_menu.new_circuit "Bu Sitenin Tor Devresini Yenile">
<!ENTITY torbutton.context_menu.new_circuit_key "C">
@@ -13,7 +13,7 @@
<!ENTITY torbutton.button.tooltip "Torbutton uygulamasını baÅlatmak için tıklayın">
<!ENTITY torbutton.prefs.security_settings "Tor Browser GÌvenlik Ayarları">
<!ENTITY torbutton.prefs.restore_defaults "Varsayılanlara Sıfırla">
-<!ENTITY torbutton.prefs.custom_warning "Ãzel tarayıcı tercihleriniz alıÅılmadık gÃŒvenlik ayarları ile sonuçlandı. GÃŒvenlik ve gizlilik nedenleri ile, aÅaÄıdaki varsayılan gÃŒvenlik seviyelerinden birini seçmenizi öneriyoruz.">
+<!ENTITY torbutton.prefs.custom_warning "Tarayıcınız standart olmayan özel gÃŒvenlik ayarları kullanıyor. GÃŒvenlik ve gizlilik nedenleriyle aÅaÄıdaki varsayılan gÃŒvenlik ayarı dÃŒzeylerinden birini seçmeniz önerilir.">
<!ENTITY torbutton.cookiedialog.title "Ãerez Koruması Yönetimi">
<!ENTITY torbutton.cookiedialog.lockCol "KorunmuÅ">
<!ENTITY torbutton.cookiedialog.domainCol "Sunucu">
@@ -23,27 +23,27 @@
<!ENTITY torbutton.cookiedialog.removeCookie "Ãerezi Sil">
<!ENTITY torbutton.cookiedialog.unprotectCookie "Ãerez Korumasını Kaldır">
<!ENTITY torbutton.cookiedialog.removeAllBut "Korunanlar DıÅında TÃŒmÃŒnÃŒ Sil">
-<!ENTITY torbutton.cookiedialog.saveAllCookies "Yeni Ãerezleri Koru">
-<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Yeni Ãerezleri Koruma">
-<!ENTITY torbutton.prefs.restrict_thirdparty "3. taraf çerez ve diÄer iz sÃŒrÃŒcÃŒ bilgiler engellensin">
+<!ENTITY torbutton.cookiedialog.saveAllCookies "Yeni Ãerezler Korunsun">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Yeni Ãerezler Korunmasın">
+<!ENTITY torbutton.prefs.restrict_thirdparty "ÃçÌncÃŒ taraf çerezleri ve diÄer izleme bilgileri engellensin">
<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Bu seçeneÄi iÅaretleyerek, çeÅitli web tarayıcıların, web sitelerinde yaptıÄınız iÅlemleri izlemesini engelleyebilirsiniz. DeÄiÅtirilen özellikler içinde blob İnternet adresleri, yayın kanalları, web tarayıcı ön belleÄi, çerezler, favicon dosyaları, HTTP Auth baÅlık bilgileri, ön baÄlantı bilgileri, localStorage, mediaSource adresleri, OCSP istekleri, SharedWorkers ve TLS oturumu bulunur.">
<!ENTITY torbutton.prefs.resist_fingerprinting "DiÄer Tor Browser kullanıcılarından sizi ayıran ayrıntılar deÄiÅtirilsin">
<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
-<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Bilgisayarınızın baÅarımı, tuÅ takımı dÃŒzeni, yerel dil ayarları, yÃŒklenmiÅ eklentilerin konumu, yÃŒklenmiÅ eklentilerin listesi, aÄınızın durumu, ekran yönlendirmesi, ekran boyutu, siteye baÄlı özel yakınlaÅtırma seviyeleri, desteklenen dosya tÃŒrleri, sistem renkleri ve WebGL yetenekleri gibi size özel olan ve kimliÄinizin belirlenmesinde kullanılabilecek bilgileri gizlemek için bu kutuyu iÅaretlenmiÅ olarak tutun.">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Bilgisayarınızın baÅarımı, tuÅ takımı dÃŒzeni, yerel dil ayarları, kurulmuÅ eklentilerin konumu, kurulmuÅ eklentilerin listesi, aÄınızın durumu, ekran yönlendirmesi, ekran boyutu, siteye baÄlı özel yakınlaÅtırma seviyeleri, desteklenen dosya tÃŒrleri, sistem renkleri ve WebGL yetenekleri gibi size özel olan ve kimliÄinizin belirlenmesinde kullanılabilecek bilgileri gizlemek için bu kutuyu iÅaretlenmiÅ olarak tutun.">
<!ENTITY torbutton.prefs.sec_caption "GÃŒvenlik DÃŒzeyi">
<!ENTITY torbutton.prefs.sec_caption_tooltip "GÃŒvenlik ayarı ile belirli web tarayıcı özeliklerini kapatabilirsiniz. Ancak bu durumda web tarayıcınız saldırılara karÅı daha korumasız olur.">
<!ENTITY torbutton.prefs.sec_standard_label "Standart">
<!ENTITY torbutton.prefs.sec_standard_description "TÌm Tor Browser ve web sitesi özellikleri kullanılabilir.">
-<!ENTITY torbutton.prefs.sec_safer_label "Daha gÃŒvenli">
+<!ENTITY torbutton.prefs.sec_safer_label "Daha GÃŒvenli">
<!ENTITY torbutton.prefs.sec_safer_description "Sıklıkla tehlikeli olan web sitesi özellikleri devre dıÅı bırakılır ve bazı sitelerin iÅlevlerinde kayıplar olabilir. ">
-<!ENTITY torbutton.prefs.sec_safer_list_label "Daha gÃŒvenli ayarlarda:">
-<!ENTITY torbutton.prefs.sec_safest_label "En gÃŒvenli">
+<!ENTITY torbutton.prefs.sec_safer_list_label "Daha gÃŒvenli ayarlar kullanıldıÄında:">
+<!ENTITY torbutton.prefs.sec_safest_label "En GÃŒvenli">
<!ENTITY torbutton.prefs.sec_safest_description "Yalnız duraÄan siteler ve temel hizmetler için gerekli web sitesi özelliklerine izin verilir. Bu deÄiÅiklikler görselleri, ortamları ve betikleri etkiler.">
-<!ENTITY torbutton.prefs.sec_safest_list_label "En gÃŒvenli ayarlarda:">
-<!ENTITY torbutton.prefs.sec_learn_more_label "Ayrıntılı bilgi">
-<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript, HTTPS kullanmayan sitelerde devre dıÅı bırakılır.">
-<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript varsayılan olarak tÃŒm sitelerde devre dıÅı bırakılır.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "En gÃŒvenli ayarlar kullanıldıÄında:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Ayrıntılı bilgi alın">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript,,HTTPS kullanmayan sitelerde devre dıÅı bırakılır.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript betikleri tÃŒm sitelerde varsayılan olarak devre dıÅı bırakılır.">
<!ENTITY torbutton.prefs.sec_limit_typography "Bazı yazı tÃŒrleri ve matematik simgeleri devre dıÅı bırakılır.">
<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Bazı yazı tÃŒrleri, simgeler, matematik simgeleri ve görseller devre dıÅı bırakılır.">
<!ENTITY torbutton.prefs.sec_click_to_play_media "Ses ve görÃŒntÃŒler (HTML5 ortamı) tıklayarak çalıÅtırılabilir.">
diff --git a/src/chrome/locale/tr/torbutton.properties b/src/chrome/locale/tr/torbutton.properties
index 3554ebb0..d79c9ee9 100644
--- a/src/chrome/locale/tr/torbutton.properties
+++ b/src/chrome/locale/tr/torbutton.properties
@@ -7,10 +7,10 @@ torbutton.circuit_display.tor_bridge = KöprÌ
torbutton.circuit_display.unknown_country = Bilinmeyen Ãlke
torbutton.circuit_display.guard = Koruma
torbutton.circuit_display.guard_note = [Guard] dÃŒÄÃŒmÃŒnÃŒz deÄiÅtirilemez.
-torbutton.circuit_display.learn_more = Ayrıntılı bilgi
+torbutton.circuit_display.learn_more = Ayrıntılı bilgi alın
torbutton.content_sizer.margin_tooltip = Tor Browser pencerenizin geniÅlik ve yÃŒksekliÄini daha az ayırt edilebilir duruma getirmek için kenar boÅlukları ekleyerek kiÅilerin sizi çevrim içi olarak izleme yeteneÄini azaltır.
-torbutton.panel.tooltip.disabled = Tor yazılımını etkinleÅtirmek için tıklayın
-torbutton.panel.tooltip.enabled = Tor yazılımını devre dıÅı bırakmak için tıklayın
+torbutton.panel.tooltip.disabled = Tor uygulamasını etkinleÅtirmek için tıklayın
+torbutton.panel.tooltip.enabled = Tor uygulamasını devre dıÅı bırakmak için tıklayın
torbutton.panel.label.disabled = Tor Devre DıÅı
torbutton.panel.label.enabled = Tor Etkin
extensions.torbutton(a)torproject.org.description = Torbutton, Tor ayarlarını yapabileceÄiniz ve kiÅisel tarama verilerini hızlı ve kolayca silebileceÄiniz bir dÃŒÄme sunar.
@@ -21,13 +21,13 @@ torbutton.popup.external.suggest = GÌvende olmak için, indirilen dosyaları ya
torbutton.popup.launch = Dosyayı indir
torbutton.popup.cancel = İptal\n
torbutton.popup.dontask = Bundan sonra dosyalar otomatik indirilsin
-torbutton.popup.prompted_language = Daha fazla gizlilik icin, Torbutton sayfaların İngilizce sÌrÌmlerini göstermeyi isteyebilir. Bu özellik, web sayfalarının ana diliniz yerine İngilizce görÌntÌlenmesine neden olabilir.\n\nDaha iyi gizlilik için web sayfalarının İngilizce sÌrÌmlerinin görÌntÌlenmesini ister misiniz?
torbutton.popup.no_newnym = Torbutton size yeni bir gÃŒvenli kimlik saÄlayamadı. Tor Denetim Kapısına giriÅ yapılamıyor.\n\nTor Browser Bundle uygulamasını çalıÅtırdıÄınızdan emin olun.
+torbutton.security_settings.menu.title = GÌvenlik Ayarları
torbutton.title.prompt_torbrowser = Ãnemli Torbutton Bilgisi
-torbutton.popup.prompt_torbrowser = Torbutton Åimdi farklı çalıÅıyor: artık kapatamıyorsunuz.\n\nBu deÄiÅikliÄi yapmamızın nedeni Tor dıÅında kullanılan baÅka bir tarayıcıda Torbutton kullanmanın gÃŒvenli olmaması. BaÅka tÃŒrlÃŒ çözemeyeceÄimiz birçok sorun vardı.\n\nFirefox tarayıcısını normal olarak kullanmak istiyorsanız, Torbutton yazılımını kaldırıp Tor Browser Bundle paketini indirebilirsiniz. Tor Browser gizlilik özellikleri normal Firefox tarayıcısına, hatta Torbutton ile kullanan Firefox ikilisine göre çok daha ÃŒstÃŒndÃŒr.\n\nTorbutton yazılımını kaldırmak için, Araçlar->Eklentiler->Uzantılar bölÃŒmÃŒne gidin ve Torbutton yazılımının yanındaki Kaldır dÃŒÄmesine tıklayın.
+torbutton.popup.prompt_torbrowser = Torbutton Åimdi farklı çalıÅıyor: artık kapatamıyorsunuz.\n\nBu deÄiÅikliÄi yapmamızın nedeni Tor dıÅında kullanılan baÅka bir tarayıcıda Torbutton kullanmanın gÃŒvenli olmaması. BaÅka tÃŒrlÃŒ çözemeyeceÄimiz birçok sorun vardı.\n\nFirefox tarayıcısını normal olarak kullanmak istiyorsanız, Torbutton uygulamasını kaldırıp Tor Browser Bundle paketini indirebilirsiniz. Tor Browser gizlilik özellikleri normal Firefox tarayıcısına, hatta Torbutton ile kullanan Firefox ikilisine göre çok daha ÃŒstÃŒndÃŒr.\n\nTorbutton uygulamasını kaldırmak için, Araçlar->Eklentiler->Uzantılar bölÃŒmÃŒne gidin ve Torbutton yazılımının yanındaki Kaldır dÃŒÄmesine tıklayın.
torbutton.popup.short_torbrowser = Ãnemli Torbutton Bilgisi!\n\nTorbutton artık kapatılamayacak Åekilde etkinleÅtirildi.\n\nAyrıntılı bilgi almak için Torbutton ÃŒzerine tıklayın.
-torbutton.popup.confirm_plugins = Flash gibi eklentiler gizliliÄinizi ve anonim kimliÄinizi zedeleyebilir.\n\nBu eklentiler Tor yazılımını atlatarak geçerli konum ve IP adresinizi ortaya çıkarabilir.\n\nBu eklentileri etkinleÅtirmek istediÄinize emin misiniz?\n
+torbutton.popup.confirm_plugins = Flash gibi eklentiler gizliliÄinizi ve anonim kimliÄinizi zedeleyebilir.\n\nBu eklentiler Tor uygulamasını atlatarak geçerli konum ve IP adresinizi ortaya çıkarabilir.\n\nBu eklentileri etkinleÅtirmek istediÄinize emin misiniz?\n
torbutton.popup.never_ask_again = Bir daha sorma
torbutton.popup.confirm_newnym = Tor Browser tÃŒm sekme ve pencereleri kapatacak. TÃŒm web sitesi oturumları kaybolacak.\n\nKimliÄinizi sıfırlamak için Tor Browser yeniden baÅlatılsın mı?\n
@@ -48,8 +48,8 @@ canvas.neverAccessKey=e
# Profile/startup error messages. Strings are kept here for ease of translation.
# LOCALIZATION NOTE: %S is the application name.
profileProblemTitle=%S Profili Sorunu
-profileReadOnly=%S salt okunur bir dosya sisteminden çalıÅtırılamaz. LÃŒtfen kullanmadan önce %S yazılımını farklı bir konuma kopyalayın.
-profileReadOnlyMac=%S salt okunur bir dosya sisteminden çalıÅtırılamaz. LÃŒtfen kullanmadan önce %S yazılımını MasaÃŒstÃŒ veya Uygulamalar klasörÃŒne kopyalayın.
+profileReadOnly=%S salt okunur bir dosya sisteminden çalıÅtırılamaz. LÃŒtfen kullanmadan önce %S uygulamasını farklı bir konuma kopyalayın.
+profileReadOnlyMac=%S salt okunur bir dosya sisteminden çalıÅtırılamaz. LÃŒtfen kullanmadan önce %S uygulamasını MasaÃŒstÃŒ veya Uygulamalar klasörÃŒne kopyalayın.
profileAccessDenied=%S, profilinize eriÅemiyor. LÃŒtfen dosya sistemi izinlerini ayarlayarak yeniden deneyin.
profileMigrationFailed=Mevcut %S profilinizin taÅınma iÅlemi baÅarısız oldu.\nYeni ayarlar kullanılacak.
diff --git a/src/chrome/locale/vi/aboutTor.properties b/src/chrome/locale/vi/aboutTor.properties
index 56a00af1..6cfc4d67 100644
--- a/src/chrome/locale/vi/aboutTor.properties
+++ b/src/chrome/locale/vi/aboutTor.properties
@@ -1,13 +1,7 @@
-# Copyright (c) 2014, The Tor Project, Inc.
+# Copyright (c) 2018, The Tor Project, Inc.
# See LICENSE for licensing information.
# vim: set sw=2 sts=2 ts=8 et:
-aboutTor.searchDDG.privacy=Tìm kiếm <a href="%1$S">má»t cách an toà n</a>vá»i <a href="%2$S"> DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
-
aboutTor.donationBanner.donate=Tà i trợ ngay bây giá»!
aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance
@@ -18,3 +12,6 @@ aboutTor.donationBanner.tagline2=Networking Freedom Worldwide
aboutTor.donationBanner.tagline3=Freedom Online
aboutTor.donationBanner.tagline4=Fostering Free Expression Worldwide
aboutTor.donationBanner.tagline5=Bảo vá» riêng tư cá»§a hà ng triá»u ngưá»i má»i ngà y
+
+aboutTor.newsletter.tagline=Get the latest news from Tor straight to your inbox.
+aboutTor.newsletter.link_text=Sign up for Tor News.
diff --git a/src/chrome/locale/vi/torbutton.properties b/src/chrome/locale/vi/torbutton.properties
index d304b7e8..dd2b905b 100644
--- a/src/chrome/locale/vi/torbutton.properties
+++ b/src/chrome/locale/vi/torbutton.properties
@@ -21,8 +21,8 @@ torbutton.popup.external.suggest = Äá» an toà n, bạn chá» nên má» những
torbutton.popup.launch = Tải táºp tin
torbutton.popup.cancel = Há»§y bá»
torbutton.popup.dontask = Tá»± Äá»ng tải những táºp tin ká» từ bây giá»
-torbutton.popup.prompted_language = Äá» bạn có thêm sư riêng tư, Torbutton có thá» yêu cầu trang mạng sá» dụng phiên bản Tiếng Anh. Viá»c nà y có thá» gây ra viá»c những trang bạn muá»n Äá»c bằng tiếng mẹ Äẻ lại hiá»n thá» bằng tiếng Anh thay và o Äó.\n\nBạn có muá»n yêu cầu trang mạng bằng tiếng Anh Äá» có thêm sá»± riêng tư?
torbutton.popup.no_newnym = Torbutton khÃŽng thá» ÄÆ°a bạn má»t danh tÃnh má»i má»t cách an toà n. Nó khÃŽng có ÄÆ°á»ng truy cáºp và o Tor Control Port.\n\nCó phải bạn Äang dùng Tor Browser Bundle?
+torbutton.security_settings.menu.title = Những cà i Äặt vá» an ninh
torbutton.title.prompt_torbrowser = Important Torbutton Information
torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/zh-CN/aboutTor.properties b/src/chrome/locale/zh-CN/aboutTor.properties
index 9c0bb803..4ace7b9b 100644
--- a/src/chrome/locale/zh-CN/aboutTor.properties
+++ b/src/chrome/locale/zh-CN/aboutTor.properties
@@ -1,13 +1,7 @@
-# Copyright (c) 2014, The Tor Project, Inc.
+# Copyright (c) 2018, The Tor Project, Inc.
# See LICENSE for licensing information.
# vim: set sw=2 sts=2 ts=8 et:
-aboutTor.searchDDG.privacy=䜿çš<a href="%2$S">DuckDuckGo</a><a href="%1$S">å®å
š</a>æçŽ¢ã
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
-
aboutTor.donationBanner.donate=ç«å³æå©ïŒ
aboutTor.donationBanner.slogan=Tor:æäŸæ°æ®é²æ€
@@ -18,3 +12,6 @@ aboutTor.donationBanner.tagline2=äžçèåŽå
ççœç»èªç±
aboutTor.donationBanner.tagline3=çœç»èªç±
aboutTor.donationBanner.tagline4=ä¿æäžçèåŽçèšè®ºèªç±
aboutTor.donationBanner.tagline5=æ¯æ¥ä¿æ€çŸäžäººçéç§
+
+aboutTor.newsletter.tagline=Get the latest news from Tor straight to your inbox.
+aboutTor.newsletter.link_text=Sign up for Tor News.
diff --git a/src/chrome/locale/zh-CN/torbutton.properties b/src/chrome/locale/zh-CN/torbutton.properties
index dac704ca..6d2e8685 100644
--- a/src/chrome/locale/zh-CN/torbutton.properties
+++ b/src/chrome/locale/zh-CN/torbutton.properties
@@ -21,8 +21,8 @@ torbutton.popup.external.suggest = 䞺äºå®å
šèµ·è§ïŒæšåºè¯¥åªåšçŠ»çº¿ç¶
torbutton.popup.launch = äžèœœæä»¶
torbutton.popup.cancel = åæ¶
torbutton.popup.dontask = 以åèªåšäžèœœæä»¶
-torbutton.popup.prompted_language = äžºäºæŽå¥œå°ä¿æ€éç§ïŒ Torbutton å¯ä»¥è¯·æ±çœé¡µçè±è¯çæ¬ãè¿å¯èœå¯ŒèŽæšåžææµè§çæ¬åè¯èšççœé¡µä»¥è±è¯æŸç€ºã\n\näžºäºæŽå¥œå°ä¿æ€éç§ïŒæ¯åŠè¯·æ±çœé¡µä»¥è±è¯æŸç€ºïŒ
torbutton.popup.no_newnym = Torbutton æ æ³å®å
šå°äžºæšåæ¢äžäžªæ°èº«ä»œã宿 æ³è®¿é® Tor çæ§å¶ç«¯å£ã\n\næšç®åæ£åšäœ¿çš Tor æµè§åšå¥ä»¶åïŒ
+torbutton.security_settings.menu.title = å®å
šè®Ÿçœ®
torbutton.title.prompt_torbrowser = Torbutton éèŠä¿¡æ¯
torbutton.popup.prompt_torbrowser = Torbutton å·¥äœæ¹åŒæææ¹åïŒå®äžåèœå€å
³éã\n\nååºè¿ç§æ¹åæ¯å 䞺åšéå¿åæµè§çæµè§åšäžïŒåæ¶äœ¿çš Torbutton å¹¶äžå®å
šãæå€ªå€æ æ³å
æçé误ã\n\nåŠææšåžææ£åžžäœ¿çš Firefox ïŒè¯·åžèœœ Torbutton æä»¶ïŒäžèœœ Tor æµè§åšå¥ä»¶ãTor æµè§åšçéç§ç¹æ§äŒäºæ®éç Firefox ïŒå³äœ¿Firefoxäžäœ¿çšäºTorbuttonã\n\nç§»é€ TorbuttonïŒè¯·å° å·¥å
·Tools->éå ç»ä»¶Addons->æ©å±Extensions äžïŒåš Torbutton æç¹å»åžèœœã
torbutton.popup.short_torbrowser = Torbutton éèŠä¿¡æ¯ïŒ\n\nTorbutton ç®åå·²ç¥å€äºå¯çšç¶æã\n\nç¹å» Torbutton è·åæŽå€ä¿¡æ¯ã
diff --git a/src/chrome/locale/zh-TW/aboutTor.properties b/src/chrome/locale/zh-TW/aboutTor.properties
index a66dbe3d..d2a674bd 100644
--- a/src/chrome/locale/zh-TW/aboutTor.properties
+++ b/src/chrome/locale/zh-TW/aboutTor.properties
@@ -1,13 +1,7 @@
-# Copyright (c) 2014, The Tor Project, Inc.
+# Copyright (c) 2018, The Tor Project, Inc.
# See LICENSE for licensing information.
# vim: set sw=2 sts=2 ts=8 et:
-aboutTor.searchDDG.privacy=éé <a href="%2$S">DuckDuckGo</a> <a href="%1$S">å®å
šå°</a>æå°ã
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
-
aboutTor.donationBanner.donate=ç«å»ææ¬ŸïŒ
aboutTor.donationBanner.slogan=Tor: å ææžäœæºæ
@@ -18,3 +12,6 @@ aboutTor.donationBanner.tagline2=äž²é£å
šäžç網絡èªç±
aboutTor.donationBanner.tagline3=èªç±äžç·
aboutTor.donationBanner.tagline4=å¬çå
šäžçç衚æèªç±
aboutTor.donationBanner.tagline5=æ¯æ¥ä¿è·çŸè¬äººé±ç§
+
+aboutTor.newsletter.tagline=Get the latest news from Tor straight to your inbox.
+aboutTor.newsletter.link_text=Sign up for Tor News.
diff --git a/src/chrome/locale/zh-TW/torbutton.properties b/src/chrome/locale/zh-TW/torbutton.properties
index bc31f27e..c73ac319 100644
--- a/src/chrome/locale/zh-TW/torbutton.properties
+++ b/src/chrome/locale/zh-TW/torbutton.properties
@@ -21,8 +21,8 @@ torbutton.popup.external.suggest = çºäºå®å
šèµ·èŠïŒæšæè©²åªåšé¢ç·ç
torbutton.popup.launch = äžèŒæªæ¡
torbutton.popup.cancel = åæ¶
torbutton.popup.dontask = åŸçŸåšéå§èªåäžèŒæªæ¡
-torbutton.popup.prompted_language = çºäºçµŠæšæŽå€çé±ç§ïŒTorbutton å¯ä»¥çŒéè±æçç¶²é çè«æ±èšèãéå¯èœæå°èŽåæ¬æè©²ä»¥æšçæ¯èªäŸé¡¯ç€ºçç¶²é ïŒæ¹æä»¥è±æç顯瀺ã\n\næšèŠäœ¿çšè±æç¶²é äŸç²åŸæŽå¥œçé±ç§åïŒ
torbutton.popup.no_newnym = Torbutton ç¡æ³å®å
šå°çµŠäœ äžåæ°ç身仜ãå®ç¡æ³ååæŽè¥è·¯ç±çæ§å¶é£æ¥å ã\n\næšç®åæ£åšå·è¡çæ¯æŽè¥è·¯ç±ç芜åšåïŒ
+torbutton.security_settings.menu.title = å®å
šæ§èšå®
torbutton.title.prompt_torbrowser = éèŠç Torbutton è³èš
torbutton.popup.prompt_torbrowser = Torbutton çŸåšä»¥äžåçæ¹åŒéäœïŒæšåä¹äžèœå°å
¶ééã\n\næååäºé暣çè®æŽïŒå çºè¥åšåäžåç芜åšäžïŒäœ¿çšæŽè¥è·¯ç±é 蚪網ç«ïŒååæäžç¶éæŽè¥è·¯ç±é 蚪å
¶ä»ç¶²ç«ïŒå°ææå®å
šäžççæ
®ãç®åä»æå€ªå€æåç¡æ³ä¿®åŸ©ççšåŒé¯èª€ååšã\n\nåŠææšåžæç¹Œçºæ£åžžäœ¿çšç«ççžç芜åšïŒæšæè§£é€å®è£ Torbutton 䞊äžèŒæŽè¥è·¯ç±ç芜åšå¥ä»¶ãæŽè¥è·¯ç±ç芜åšçé±ç§æ§ä¹åªæŒæ®éçç«ççžç芜åšïŒå³äœ¿ç¶ç«ççžç芜åšè Torbutton äžèµ·äœ¿çšæä¹æ¯ã\n\nèŠç§»é€ TorbuttonïŒè«ååŸ å·¥å
· -> éå å
ä»¶ -> æŽå
å¥ä»¶ ç¶åŸæäžäž Torbutton æéç ãç§»é€ãæéã
torbutton.popup.short_torbrowser = éèŠç Torbutton è³èšïŒ\n\nTorbutton çŸåšæ°žé åçšã\n\næäžäž Torbutton ç²åæŽå€è³èšã
1
0
commit dc772e2c9f17cb0cf5d006f24c35430fadaf1aae
Author: Georg Koppen <gk(a)torproject.org>
Date: Thu Aug 23 08:17:33 2018 +0000
Preparing new release (2.0.4)
CHANGELOG update and versions bump
---
src/CHANGELOG | 5 +++++
src/install.rdf | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/CHANGELOG b/src/CHANGELOG
index 58fa5ff4..7b464501 100644
--- a/src/CHANGELOG
+++ b/src/CHANGELOG
@@ -1,3 +1,8 @@
+2.0.4
+ * Bug 27276: Adapt to new NoScript messaging protocol
+ * Bug 27097: Add text for Tor News signup widget
+ * Translations update
+
2.0.3
* Bug 26884: Use Torbutton to provide security slider on mobile
* Translations update
diff --git a/src/install.rdf b/src/install.rdf
index 985d3900..d239ea5a 100644
--- a/src/install.rdf
+++ b/src/install.rdf
@@ -6,7 +6,7 @@
<em:name>Torbutton</em:name>
<em:creator>Mike Perry</em:creator>
<em:id>torbutton(a)torproject.org</em:id>
- <em:version>2.0.3</em:version>
+ <em:version>2.0.4</em:version>
<em:multiprocessCompatible>true</em:multiprocessCompatible>
<em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL>
<em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>
1
0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 27271 - Don't allow the user to install extensions from web
by gk@torproject.org 23 Aug '18
by gk@torproject.org 23 Aug '18
23 Aug '18
commit a0620db9e7cd08e3d67a42d0c5b1067d5b3ed355
Author: Igor Oliveira <igt0(a)torproject.org>
Date: Wed Aug 22 15:51:32 2018 -0300
Bug 27271 - Don't allow the user to install extensions from web
An attacker can send a tampered torbutton extension to the user and
TBA, currently, is not able to verify if the torbutton extension
was built by Tor.
---
mobile/android/app/000-tor-browser-android.js | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/mobile/android/app/000-tor-browser-android.js b/mobile/android/app/000-tor-browser-android.js
index 399c6f07718b..04a613092e6d 100644
--- a/mobile/android/app/000-tor-browser-android.js
+++ b/mobile/android/app/000-tor-browser-android.js
@@ -56,3 +56,8 @@ pref("general.useragent.updates.url", "");
// Override this because Orbot uses 9050 as the default
pref("network.proxy.socks_port", 9050);
+
+// Do not allow the user to install extensions from web
+pref("xpinstall.enabled", false);
+pref("extensions.enabledScopes", 1);
+pref("extensions.autoDisableScopes", 1);
1
0
commit a848723ce2511b187a43f315f3a3315ec7e86bff
Author: Georg Koppen <gk(a)torproject.org>
Date: Thu Aug 23 07:12:41 2018 +0000
Bump HTTPS-Everywhere version
This new versions picks up a fix for #26548.
---
projects/https-everywhere/config | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config
index 739347b..03edcee 100644
--- a/projects/https-everywhere/config
+++ b/projects/https-everywhere/config
@@ -1,5 +1,5 @@
# vim: filetype=yaml sw=2
-version: 2018.6.21
+version: 2018.8.22
git_url: https://git.torproject.org/https-everywhere.git
git_hash: '[% c("version") %]'
git_submodule: 1
1
0

[torbutton/master] Bug 27276: Adapt to new NoScript messaging protocol
by gk@torproject.org 23 Aug '18
by gk@torproject.org 23 Aug '18
23 Aug '18
commit aa379dcc5c06ee542a1c63adc769678700e32eaa
Author: Arthur Edelstein <arthuredelstein(a)gmail.com>
Date: Wed Aug 22 17:06:44 2018 -0700
Bug 27276: Adapt to new NoScript messaging protocol
Also, fix a bug in noscript-control.js where initialized
was never set to true.
---
src/modules/noscript-control.js | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/modules/noscript-control.js b/src/modules/noscript-control.js
index 6270efe5..196d14c2 100644
--- a/src/modules/noscript-control.js
+++ b/src/modules/noscript-control.js
@@ -48,7 +48,8 @@ const default_caps = [
// capabilities. Most things are blocked.
let noscriptSettings = safetyLevel => (
{
- "type": "NoScript.updateSettings",
+ "type": "NoScript.updateSettings", // backwards compatibility
+ "_messageName": "updateSettings",
"policy": {
"DEFAULT": {
"capabilities": default_caps[safetyLevel],
@@ -117,6 +118,7 @@ var initialize = () => {
if (initialized) {
return;
}
+ initialized = true;
bindPrefAndInit(
"extensions.torbutton.security_slider",
sliderState => setNoScriptSafetyLevel(securitySliderToSafetyLevel(sliderState)));
1
0

[tor-browser/tor-browser-60.1.0esr-8.0-1] squash! TB4: Tor Browser's Firefox preference overrides.
by gk@torproject.org 23 Aug '18
by gk@torproject.org 23 Aug '18
23 Aug '18
commit 703c18896354c159a2fc132f468289282104a235
Author: Arthur Edelstein <arthuredelstein(a)gmail.com>
Date: Wed Aug 22 14:47:41 2018 -0700
squash! TB4: Tor Browser's Firefox preference overrides.
Bug 26114: addons.mozilla.org is not special
* Don't expose navigator.mozAddonManager on any site
* Don't block NoScript from modifying addons.mozilla.org or other sites
---
browser/app/profile/000-tor-browser.js | 3 +++
1 file changed, 3 insertions(+)
diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js
index b701dcce812b..bddbe05c92bb 100644
--- a/browser/app/profile/000-tor-browser.js
+++ b/browser/app/profile/000-tor-browser.js
@@ -153,6 +153,7 @@ pref("device.sensors.enabled", false);
pref("dom.enable_resource_timing", false); // Bug 13024: To hell with this API
pref("dom.enable_user_timing", false); // Bug 16336: To hell with this API
pref("privacy.resistFingerprinting", true);
+pref("privacy.resistFingerprinting.block_mozAddonManager", true); // Bug 26114
pref("dom.event.highrestimestamp.enabled", true); // Bug #17046: "Highres" (but truncated) timestamps prevent uptime leaks
pref("privacy.suppressModifierKeyEvents", true); // Bug #17009: Suppress ALT and SHIFT events"
pref("ui.use_standins_for_native_colors", true); // https://bugzilla.mozilla.org/232227
@@ -284,6 +285,8 @@ pref("extensions.getAddons.showPane", false);
// Show our legacy extensions directly on about:addons and get rid of the
// warning for the default theme.
pref("extensions.legacy.exceptions", "{972ce4c6-7e08-4474-a285-3208198ce6fd},torbutton@torproject.org,tor-launcher@torproject.org");
+// Bug 26114: Allow NoScript to access addons.mozilla.org etc.
+pref("extensions.webextensions.restrictedDomains", "");
// Toolbar layout
pref("browser.uiCustomization.state", "{\"placements\":{\"widget-overflow-fixed-list\":[],\"PersonalToolbar\":[],\"nav-bar\":[\"torbutton-button\",\"back-button\",\"forward-button\",\"stop-reload-button\",\"urlbar-container\",\"downloads-button\",\"_73a6fe31-595d-460b-a920-fcc0f8843232_-browser-action\"],\"TabsToolbar\":[\"tabbrowser-tabs\",\"new-tab-button\",\"alltabs-button\"],\"toolbar-menubar\":[\"menubar-items\"],\"PanelUI-contents\":[\"home-button\",\"edit-controls\",\"zoom-controls\",\"new-window-button\",\"save-page-button\",\"print-button\",\"bookmarks-menu-button\",\"history-panelmenu\",\"find-button\",\"preferences-button\",\"add-ons-button\",\"developer-button\",\"https-everywhere-button\"],\"addon-bar\":[\"addonbar-closebutton\",\"status-bar\"]},\"seen\":[\"developer-button\",\"https-everywhere_eff_org-browser-action\",\"_73a6fe31-595d-460b-a920-fcc0f8843232_-browser-action\"],\"dirtyAreaCache\":[\"PersonalToolbar\",\"nav-bar\",\"TabsToolbar\",\"toolbar-menubar\"],\"cur
rentVersion\":14,\"newElementCount\":1}");
1
0

22 Aug '18
commit 3e7502789eca79d2e73c82b65770fc0d08527584
Author: Arthur Edelstein <arthuredelstein(a)gmail.com>
Date: Wed Aug 22 10:19:15 2018 -0700
Bug 27097: Text for Tor News signup widget
---
src/chrome/locale/en/aboutTor.properties | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/chrome/locale/en/aboutTor.properties b/src/chrome/locale/en/aboutTor.properties
index 375c0da1..c039f4cd 100644
--- a/src/chrome/locale/en/aboutTor.properties
+++ b/src/chrome/locale/en/aboutTor.properties
@@ -12,3 +12,6 @@ aboutTor.donationBanner.tagline2=Networking Freedom Worldwide
aboutTor.donationBanner.tagline3=Freedom Online
aboutTor.donationBanner.tagline4=Fostering Free Expression Worldwide
aboutTor.donationBanner.tagline5=Protecting the Privacy of Millions Every Day
+
+aboutTor.newsletter.tagline=Get the latest news from Tor straight to your inbox.
+aboutTor.newsletter.link_text=Sign up for Tor News.
1
0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 27220 - Don't verify signature for Tor Button
by gk@torproject.org 22 Aug '18
by gk@torproject.org 22 Aug '18
22 Aug '18
commit b9aecf44142c7874de51bd29abdcd40dcf3e6cb2
Author: Igor Oliveira <igt0(a)torproject.org>
Date: Mon Aug 20 16:33:16 2018 -0300
Bug 27220 - Don't verify signature for Tor Button
Tor Browser for Desktop has a similar logic.
---
toolkit/mozapps/extensions/internal/XPIInstall.jsm | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/toolkit/mozapps/extensions/internal/XPIInstall.jsm b/toolkit/mozapps/extensions/internal/XPIInstall.jsm
index 659d97616dc6..17fa45514063 100644
--- a/toolkit/mozapps/extensions/internal/XPIInstall.jsm
+++ b/toolkit/mozapps/extensions/internal/XPIInstall.jsm
@@ -1029,6 +1029,10 @@ function getSignedStatus(aRv, aCert, aAddonID) {
}
function shouldVerifySignedState(aAddon) {
+ if (aAddon.id === "torbutton(a)torproject.org") {
+ return false;
+ }
+
// Updated system add-ons should always have their signature checked
if (aAddon._installLocation.name == KEY_APP_SYSTEM_ADDONS)
return true;
1
0
commit e49c122c0816589e87ff5f5c5102ec4507f9ec6f
Author: Georg Koppen <gk(a)torproject.org>
Date: Wed Aug 22 07:05:40 2018 +0000
Translations update
---
src/chrome/locale/ga/aboutTor.dtd | 14 +++++++-------
src/chrome/locale/pt-BR/aboutTor.dtd | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/chrome/locale/ga/aboutTor.dtd b/src/chrome/locale/ga/aboutTor.dtd
index fd31fd4a..62fbbf6c 100644
--- a/src/chrome/locale/ga/aboutTor.dtd
+++ b/src/chrome/locale/ga/aboutTor.dtd
@@ -6,20 +6,20 @@
<!ENTITY aboutTor.title "Maidir le Tor">
-<!ENTITY aboutTor.ready.label "Explore. Privately.">
-<!ENTITY aboutTor.ready2.label "You’re ready for the world’s most private browsing experience.">
+<!ENTITY aboutTor.ready.label "Brabhsáil. Príobháideachas.">
+<!ENTITY aboutTor.ready2.label "Tá tú réidh don bhrabhsálaí is príobháidí ar domhan.">
<!ENTITY aboutTor.failure.label "Chuaigh rud éigin ar strae!">
<!ENTITY aboutTor.failure2.label "Níl Tor ag obair sa bhrabhsálaí seo.">
-<!ENTITY aboutTor.search.label "Search with DuckDuckGo">
+<!ENTITY aboutTor.search.label "Cuardach DuckDuckGo">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com">
<!ENTITY aboutTor.torbrowser_user_manual_questions.label "Ceisteanna?">
-<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual »">
+<!ENTITY aboutTor.torbrowser_user_manual_link.label "Féach ar Lámhleabhar Bhrabhsálaí Tor »">
<!-- The next two entities are used within the browser's Help menu. -->
<!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">
-<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual">
+<!ENTITY aboutTor.torbrowser_user_manual.label "Lámhleabhar Bhrabhsálaí Tor">
-<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
-<!ENTITY aboutTor.getInvolved.label "Get Involved »">
+<!ENTITY aboutTor.tor_mission.label "Eagraíocht neamhbhrabúis 501(c)(3) sna Stáit Aontaithe is ea Tionscadal Tor. An phríomhaidhm atá againn ná cearta daonna agus an tsaoirse a chur chun cinn trí theicneolaíochtaí oscailte agus saor in aisce a thacaíonn leis an bpríobháideachas ar líne a fhorbairt, na teicneolaíochtaí seo a scaipeadh gan srian agus a n-úsáid a spreagadh, agus tuiscint níos fearr ar chúrsaí príobháideachais a fhorbairt i measc an phobail.">
+<!ENTITY aboutTor.getInvolved.label "Glac Páirt »">
<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en">
diff --git a/src/chrome/locale/pt-BR/aboutTor.dtd b/src/chrome/locale/pt-BR/aboutTor.dtd
index 97e5e0f8..80c6f8bc 100644
--- a/src/chrome/locale/pt-BR/aboutTor.dtd
+++ b/src/chrome/locale/pt-BR/aboutTor.dtd
@@ -7,7 +7,7 @@
<!ENTITY aboutTor.title "Sobre Tor">
<!ENTITY aboutTor.ready.label "Explore. Privately.">
-<!ENTITY aboutTor.ready2.label "You’re ready for the world’s most private browsing experience.">
+<!ENTITY aboutTor.ready2.label "Você está pronto para a maior experiência de navegação privada do mundo.">
<!ENTITY aboutTor.failure.label "Alguma coisa deu errado!">
<!ENTITY aboutTor.failure2.label "Tor não está funcionando neste navegador. ">
1
0

[torbutton/master] Bug 26884 - Part 3: Remove optionsURL from install.rdf
by gk@torproject.org 22 Aug '18
by gk@torproject.org 22 Aug '18
22 Aug '18
commit 86adebdcf40095b8ac449129f6c6458c03d7a747
Author: Igor Oliveira <igt0(a)torproject.org>
Date: Tue Jul 31 18:35:56 2018 -0300
Bug 26884 - Part 3: Remove optionsURL from install.rdf
The preference is not available in the Desktop and it doesn't
make sense on mobile.
Thus, we are removing it.
---
src/install.rdf | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/install.rdf b/src/install.rdf
index 8a085cbc..dad18434 100644
--- a/src/install.rdf
+++ b/src/install.rdf
@@ -9,7 +9,6 @@
<em:version>2.0.2</em:version>
<em:multiprocessCompatible>true</em:multiprocessCompatible>
<em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL>
- <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL>
<em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>
<em:updateURL>data:text/plain,</em:updateURL>
<em:updateKey>-</em:updateKey>
1
0

22 Aug '18
commit 9e706c1c63b914941a9e63472b7892427660d300
Merge: 717430b7 86adebdc
Author: Georg Koppen <gk(a)torproject.org>
Date: Wed Aug 22 06:10:15 2018 +0000
Merge remote-tracking branch 'igt0/26884-v6'
src/chrome/content/aboutTor/aboutTor-content.js | 4 +-
src/chrome/content/preferences-mobile.js | 76 ++++++++++++++++++++++
src/chrome/content/preferences.js | 4 +-
src/chrome/content/preferences.xhtml | 85 +++++++++++++++++++++++++
src/chrome/content/tor-circuit-display.js | 4 +-
src/chrome/content/torbutton.js | 78 +++++++++++++++--------
src/chrome/locale/en/torbutton.properties | 1 +
src/chrome/skin/preferences-mobile.css | 47 ++++++++++++++
src/install.rdf | 1 -
src/modules/utils.js | 10 ++-
10 files changed, 274 insertions(+), 36 deletions(-)
1
0

[torbutton/master] Bug 26884 - Part 1: Move show_torbrowser_manual and
by gk@torproject.org 22 Aug '18
by gk@torproject.org 22 Aug '18
22 Aug '18
commit 5b5931efdf9d8d8bc018d5c02abb14d4e379e160
Author: Igor Oliveira <igt0(a)torproject.org>
Date: Tue Jul 31 17:03:02 2018 -0300
Bug 26884 - Part 1: Move show_torbrowser_manual and
get_general_useragent_locale to utils
On Desktop, show_torbrowser_manual is a torbutton.js method and it
is called by other components using the window.opener.
However, on mobile, the security settings is opened in a tab instead
of a modal. Thus the window.opener is nil.
This patch moves the show_torbrowser_manual to util.js allowing it
to be accessible from anywhere.
---
src/chrome/content/aboutTor/aboutTor-content.js | 4 +--
src/chrome/content/preferences.js | 4 +--
src/chrome/content/tor-circuit-display.js | 4 +--
src/chrome/content/torbutton.js | 33 ++++---------------------
src/modules/utils.js | 10 +++++++-
5 files changed, 20 insertions(+), 35 deletions(-)
diff --git a/src/chrome/content/aboutTor/aboutTor-content.js b/src/chrome/content/aboutTor/aboutTor-content.js
index c2e26c8c..ae20505e 100644
--- a/src/chrome/content/aboutTor/aboutTor-content.js
+++ b/src/chrome/content/aboutTor/aboutTor-content.js
@@ -18,7 +18,7 @@ var {classes: Cc, interfaces: Ci, utils: Cu} = Components;
Cu.import("resource://gre/modules/Services.jsm");
-let { bindPrefAndInit } = Cu.import("resource://torbutton/modules/utils.js", {});
+let { bindPrefAndInit, show_torbrowser_manual } = Cu.import("resource://torbutton/modules/utils.js", {});
var AboutTorListener = {
@@ -89,7 +89,7 @@ var AboutTorListener = {
else
body.removeAttribute("toron");
- if (aData.showManual)
+ if (show_torbrowser_manual())
body.setAttribute("showmanual", "yes");
else
body.removeAttribute("showmanual");
diff --git a/src/chrome/content/preferences.js b/src/chrome/content/preferences.js
index 36c8818c..81668d6e 100644
--- a/src/chrome/content/preferences.js
+++ b/src/chrome/content/preferences.js
@@ -5,7 +5,7 @@ let { utils: Cu } = Components;
let { getBoolPref, getIntPref, setBoolPref, setIntPref, getCharPref } =
Cu.import("resource://gre/modules/Services.jsm", {}).Services.prefs;
-let { getLocale } =
+let { getLocale, show_torbrowser_manual } =
Cu.import("resource://torbutton/modules/utils.js", {});
// Description elements have the follow names.
@@ -67,7 +67,7 @@ function torbutton_save_security_settings() {
// Help Menu and on about:tor: if we have the manual available for a locale,
// let's show the "Learn more"-link, otherwise hide it.
function torbutton_set_learn_more_links() {
- let show_manual = window.opener.torbutton_show_torbrowser_manual();
+ let show_manual = show_torbrowser_manual();
let locale = ""
if (show_manual) {
locale = getLocale();
diff --git a/src/chrome/content/tor-circuit-display.js b/src/chrome/content/tor-circuit-display.js
index 7b12db08..fe6b51c1 100644
--- a/src/chrome/content/tor-circuit-display.js
+++ b/src/chrome/content/tor-circuit-display.js
@@ -33,7 +33,7 @@ Cu.import("resource://gre/modules/Services.jsm");
let { controller } = Cu.import("resource://torbutton/modules/tor-control-port.js", {});
// Utility functions
-let { bindPrefAndInit, observe } = Cu.import("resource://torbutton/modules/utils.js", {});
+let { bindPrefAndInit, observe, getLocale } = Cu.import("resource://torbutton/modules/utils.js", {});
// Make the TorButton logger available.
let logger = Cc["@torproject.org/torbutton-logger;1"]
@@ -381,7 +381,7 @@ let setupGuardNote = function () {
let guardNoteString = uiString("guard_note");
let learnMoreString = uiString("learn_more");
let [noteBefore, name, noteAfter] = guardNoteString.split(/[\[\]]/);
- let localeCode = torbutton_get_general_useragent_locale();
+ let localeCode = getLocale();
appendHtml(guardNote,
["div", {},
noteBefore, ["span", {class: "circuit-guard-name"}, name],
diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js
index 134f10da..b4e6ed18 100644
--- a/src/chrome/content/torbutton.js
+++ b/src/chrome/content/torbutton.js
@@ -8,8 +8,8 @@
// http://kb.mozillazine.org/Links_to_local_pages_don%27t_work
let { Services } = Cu.import("resource://gre/modules/Services.jsm", {});
-let { showDialog } = Cu.import("resource://torbutton/modules/utils.js", {});
-let { getLocale, unescapeTorString } = Cu.import("resource://torbutton/modules/utils.js", {});
+let { showDialog, show_torbrowser_manual } = Cu.import("resource://torbutton/modules/utils.js", {});
+let { unescapeTorString } = Cu.import("resource://torbutton/modules/utils.js", {});
let SecurityPrefs = Cu.import("resource://torbutton/modules/security-prefs.js", {});
let NoScriptControl = Cu.import("resource://torbutton/modules/noscript-control.js", {});
let { bindPrefAndInit, observe } = Cu.import("resource://torbutton/modules/utils.js", {});
@@ -435,8 +435,7 @@ var torbutton_abouttor_message_handler = {
// not working.
get chromeData() {
return {
- torOn: torbutton_tor_check_ok(),
- showManual: torbutton_show_torbrowser_manual()
+ torOn: torbutton_tor_check_ok()
};
}
};
@@ -730,21 +729,6 @@ function torbutton_update_toolbutton()
torbutton_get_property_string(tooltipKey));
}
-// Bug 1506 P3: Support code for language+uagent spoofing
-function torbutton_get_general_useragent_locale() {
- try {
- const locale = getLocale();
- if (/chrome:\/\//.test(locale)) {
- return m_tb_prefs.getComplexValue("intl.locale.requested",
- Components.interfaces.nsIPrefLocalizedString).data;
- }
- return locale;
- } catch(err) {
- torbutton_log(4, "Error while getting locale" + err);
- return 'en-US';
- }
-}
-
// Bug 1506 P4: Control port interaction. Needed for New Identity.
function torbutton_socket_readline(input) {
var str = "";
@@ -2213,20 +2197,13 @@ function torbutton_update_noscript_button()
}, 0);
}
-// Returns true if we should show the tor browser manual.
-function torbutton_show_torbrowser_manual() {
- let availableLocales = ["de", "en", "es", "fr", "nl", "pt", "tr", "vi", "zh"];
- let shortLocale = torbutton_get_general_useragent_locale().substring(0, 2);
- return availableLocales.indexOf(shortLocale) >= 0;
-}
-
// Makes sure the item in the Help Menu and the link in about:tor
// for the Tor Browser User Manual are only visible when
-// torbutton_show_torbrowser_manual() returns true.
+// show_torbrowser_manual() returns true.
function torbutton_init_user_manual_links() {
let menuitem = document.getElementById("torBrowserUserManual");
bindPrefAndInit("intl.locale.requested", val => {
- menuitem.hidden = !torbutton_show_torbrowser_manual();
+ menuitem.hidden = !show_torbrowser_manual();
torbutton_abouttor_message_handler.updateAllOpenPages();
});
}
diff --git a/src/modules/utils.js b/src/modules/utils.js
index 0a2649dd..5af071ec 100644
--- a/src/modules/utils.js
+++ b/src/modules/utils.js
@@ -205,6 +205,14 @@ var unescapeTorString = function(str) {
return _torControl._strUnescape(str);
};
+// Returns true if we should show the tor browser manual.
+var show_torbrowser_manual = () => {
+ let availableLocales = ["de", "en", "es", "fr", "nl", "pt", "tr", "vi", "zh"];
+ let shortLocale = getLocale().substring(0, 2);
+ return availableLocales.indexOf(shortLocale) >= 0;
+}
+
+
// Export utility functions for external use.
let EXPORTED_SYMBOLS = ["bindPref", "bindPrefAndInit", "getEnv", "getLocale",
- "getPrefValue", "observe", "showDialog", "unescapeTorString"];
+ "getPrefValue", "observe", "showDialog", "show_torbrowser_manual", "unescapeTorString"];
1
0
commit a9fccda42ca553100051861ce88789d99b4b4d46
Author: Georg Koppen <gk(a)torproject.org>
Date: Wed Aug 22 09:19:13 2018 +0000
Release preparations for 2.0.3
---
src/CHANGELOG | 4 ++++
src/install.rdf | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/CHANGELOG b/src/CHANGELOG
index 131bb2d4..58fa5ff4 100644
--- a/src/CHANGELOG
+++ b/src/CHANGELOG
@@ -1,3 +1,7 @@
+2.0.3
+ * Bug 26884: Use Torbutton to provide security slider on mobile
+ * Translations update
+
2.0.2
* Bug 26960: Implement new about:tor start page
* Bug 26961: Implement new user onboarding
diff --git a/src/install.rdf b/src/install.rdf
index dad18434..985d3900 100644
--- a/src/install.rdf
+++ b/src/install.rdf
@@ -6,7 +6,7 @@
<em:name>Torbutton</em:name>
<em:creator>Mike Perry</em:creator>
<em:id>torbutton(a)torproject.org</em:id>
- <em:version>2.0.2</em:version>
+ <em:version>2.0.3</em:version>
<em:multiprocessCompatible>true</em:multiprocessCompatible>
<em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL>
<em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>
1
0

[torbutton/master] Bug 26884 - Part 2: Create mobile security slider
by gk@torproject.org 22 Aug '18
by gk@torproject.org 22 Aug '18
22 Aug '18
commit 690a3836779975202fd722579dfa5997953af61d
Author: Igor Oliveira <igt0(a)torproject.org>
Date: Tue Jul 31 18:28:49 2018 -0300
Bug 26884 - Part 2: Create mobile security slider
Create a responsive security slider, it can be used on mobile and
tablet.
---
src/chrome/content/preferences-mobile.js | 76 +++++++++++++++++++++++++++
src/chrome/content/preferences.xhtml | 85 +++++++++++++++++++++++++++++++
src/chrome/content/torbutton.js | 45 ++++++++++++++++
src/chrome/locale/en/torbutton.properties | 1 +
src/chrome/skin/preferences-mobile.css | 47 +++++++++++++++++
5 files changed, 254 insertions(+)
diff --git a/src/chrome/content/preferences-mobile.js b/src/chrome/content/preferences-mobile.js
new file mode 100644
index 00000000..e2da9b88
--- /dev/null
+++ b/src/chrome/content/preferences-mobile.js
@@ -0,0 +1,76 @@
+// # Security Settings User Interface for Mobile
+
+// Utilities
+let { utils: Cu } = Components;
+let { getBoolPref, getIntPref, setBoolPref, setIntPref, getCharPref } =
+ Cu.import("resource://gre/modules/Services.jsm", {}).Services.prefs;
+
+let { getLocale, show_torbrowser_manual } =
+ Cu.import("resource://torbutton/modules/utils.js", {});
+
+// Description elements have the follow names.
+const descNames =
+ [, "desc_standard", "desc_safer", "desc_safest"];
+// "Learn-more"-elements have the follow names.
+const linkNames =
+ [, "link_standard", "link_safer", "link_safest"];
+// A single `state` object that reflects the user settings in this UI.
+
+let state = { slider : 0, custom : false};
+
+// Utility functions to convert between the legacy 4-value pref index
+// and the 3-valued security slider.
+let sliderPositionToPrefSetting = pos => [, 4, 2, 1][pos];
+let prefSettingToSliderPosition = pref => [, 3, 2, 2, 1][pref];
+
+// Set the desired slider value and update UI.
+function torbutton_set_slider(sliderValue) {
+ state.slider = sliderValue;
+ let slider = document.getElementById("torbutton_sec_slider");
+ slider.value = sliderValue.toString();
+ let descs = descNames.map(name => document.getElementById(name));
+ descs.forEach((desc, i) => {
+ if (state.slider !== i) {
+ desc.style.display = 'none';
+ } else {
+ desc.style.display = 'block';
+ }
+ });
+ torbutton_save_security_settings();
+}
+
+// Read prefs 'extensions.torbutton.security_slider' and
+// 'extensions.torbutton.security_custom', and initialize the UI.
+function torbutton_init_security_ui() {
+ torbutton_set_slider(prefSettingToSliderPosition(
+ getIntPref("extensions.torbutton.security_slider")));
+ torbutton_set_learn_more_links();
+}
+
+// Write the two prefs from the current settings.
+function torbutton_save_security_settings() {
+ setIntPref("extensions.torbutton.security_slider",
+ sliderPositionToPrefSetting(state.slider));
+ setBoolPref("extensions.torbutton.security_custom", state.custom);
+}
+
+// We follow the way we treat the links to the Tor Browser User Manual on the
+// Help Menu and on about:tor: if we have the manual available for a locale,
+// let's show the "Learn more"-link, otherwise hide it.
+function torbutton_set_learn_more_links() {
+ let show_manual = show_torbrowser_manual();
+ let locale = ""
+ if (show_manual) {
+ locale = getLocale();
+ }
+ let links = linkNames.map(name => document.getElementById(name));
+ links.forEach(link => {;
+ if (show_manual && locale != "") {
+ link.href= "https:/tb-manual.torproject.org/" + locale +
+ "/security-slider.html";
+ link.hidden = false;
+ } else {
+ link.hidden = true;
+ }
+ });
+}
diff --git a/src/chrome/content/preferences.xhtml b/src/chrome/content/preferences.xhtml
new file mode 100644
index 00000000..6f662f5f
--- /dev/null
+++ b/src/chrome/content/preferences.xhtml
@@ -0,0 +1,85 @@
+<!DOCTYPE overlay SYSTEM "chrome://torbutton/locale/torbutton.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <meta charset="UTF-8"/>
+ <meta name="viewport" content="width=device-width, initial-scale=1"/>
+ <head>
+ <title>&torbutton.prefs.security_settings;</title>
+ <link type="text/css" rel="stylesheet" charset="UTF-8" href="chrome://torbutton/skin/preferences.css"/>
+ <link type="text/css" rel="stylesheet" charset="UTF-8" href="chrome://torbutton/skin/preferences-mobile.css"/>
+ <script type="text/javascript" src="torbutton_util.js"></script>
+ <script type="text/javascript" src="preferences-mobile.js"></script>
+ <style>
+ </style>
+ </head>
+ <body onload="torbutton_init_security_ui()">
+ <div class="wrapper outer-wrapper">
+ <div class="title">
+ &torbutton.prefs.sec_caption;
+ </div>
+ <div class="wrapper inner-wrapper">
+ <input id="torbutton_sec_slider" type="range" min="1" max="3" list="datalist" onchange="torbutton_set_slider(parseInt(this.value, 10))"/>
+ <datalist id="datalist">
+ <option onclick="torbutton_set_slider(1)">
+ &torbutton.prefs.sec_standard_label;
+ </option>
+ <option onclick="torbutton_set_slider(2)">
+ &torbutton.prefs.sec_safer_label;
+ </option>
+ <option onclick="torbutton_set_slider(3)">
+ &torbutton.prefs.sec_safest_label;
+ </option>
+ </datalist>
+ <div class="description-wrapper">
+ <div id="desc_safest" class="description">
+ <p class="slider-text-size slider-text-weight">
+ &torbutton.prefs.sec_safest_description;
+ </p>
+ <p class="slider-text-size slider-text-weight">
+ &torbutton.prefs.sec_safest_list_label;
+ </p>
+ <p class="slider-text-size">
+ &torbutton.prefs.sec_js_disabled;
+ </p>
+ <p class="slider-text-size">
+ &torbutton.prefs.sec_limit_graphics_and_typography;
+ </p>
+ <p class="slider-text-size">
+ &torbutton.prefs.sec_click_to_play_media;
+ </p>
+ <a id="link_safest" class="text-link">
+ &torbutton.prefs.sec_learn_more_label;
+ </a>
+ </div>
+ <div id="desc_safer" class="description">
+ <p class="slider-text-size slider-text-weight">
+ &torbutton.prefs.sec_safer_description;
+ </p>
+ <p class="slider-text-size slider-text-weight">
+ &torbutton.prefs.sec_safer_list_label;
+ </p>
+ <p class="slider-text-size">
+ &torbutton.prefs.sec_js_on_https_sites_only;
+ </p>
+ <p class="slider-text-size">
+ &torbutton.prefs.sec_limit_typography;
+ </p>
+ <p class="slider-text-size">
+ &torbutton.prefs.sec_click_to_play_media;
+ </p>
+ <a id="link_safer" class="text-link">
+ &torbutton.prefs.sec_learn_more_label;
+ </a>
+ </div>
+ <div id="desc_standard" class="description">
+ <p class="slider-text-size slider-text-weight">
+ &torbutton.prefs.sec_standard_description;
+ </p>
+ <a id="link_standard" class="text-link">
+ &torbutton.prefs.sec_learn_more_label;
+ </a>
+ </div>
+ </div>
+ </div>
+ </div>
+ </body>
+</html>
diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js
index b4e6ed18..47621835 100644
--- a/src/chrome/content/torbutton.js
+++ b/src/chrome/content/torbutton.js
@@ -342,6 +342,8 @@ function torbutton_init() {
window.messageManager.addMessageListener("AboutTor:Loaded",
torbutton_abouttor_message_handler);
+ setupPreferencesForMobile();
+
// XXX: Get rid of the cached asmjs (or IndexedDB) files on disk in case we
// don't allow things saved to disk. This is an ad-hoc fix to work around
// #19417. Once this is properly solved we should remove this code again.
@@ -1906,6 +1908,49 @@ function torbutton_is_windowed(wind) {
let stopOpenSecuritySettingsObserver;
+function showSecurityPreferencesPanel(chromeWindow) {
+ const tabBrowser = chromeWindow.BrowserApp;
+ let settingsTab = null;
+
+ const SECURITY_PREFERENCES_URI = 'chrome://torbutton/content/preferences.xhtml';
+
+ tabBrowser.tabs.some(function (tab) {
+ // If the security prefs tab is opened, send the user to it
+ if (tab.browser.currentURI.spec === SECURITY_PREFERENCES_URI) {
+ settingsTab = tab;
+ return true;
+ }
+ return false;
+ });
+
+ if (settingsTab === null) {
+ // Open up the settings panel in a new tab.
+ tabBrowser.addTab(SECURITY_PREFERENCES_URI, {
+ 'selected': true,
+ 'parentId': tabBrowser.selectedTab.id
+ });
+ } else {
+ // Activate an existing settings panel tab.
+ tabBrowser.selectTab(settingsTab);
+ }
+}
+
+function setupPreferencesForMobile() {
+ if (Services.appinfo.OS !== "Android") {
+ return;
+ }
+
+ torbutton_log(4, "Setting up settings preferences for Android.");
+
+ const chromeWindow = Services.wm.getMostRecentWindow('navigator:browser');
+
+ // Add the extension's chrome menu item to the main browser menu.
+ chromeWindow.NativeWindow.menu.add({
+ 'name': torbutton_get_property_string("torbutton.security_settings.menu.title"),
+ 'callback': showSecurityPreferencesPanel.bind(this, chromeWindow)
+ });
+}
+
// Bug 1506 P3: This is needed pretty much only for the version check
// and the window resizing. See comments for individual functions for
// details
diff --git a/src/chrome/locale/en/torbutton.properties b/src/chrome/locale/en/torbutton.properties
index 53573df0..60154dbe 100644
--- a/src/chrome/locale/en/torbutton.properties
+++ b/src/chrome/locale/en/torbutton.properties
@@ -22,6 +22,7 @@ torbutton.popup.launch = Download file
torbutton.popup.cancel = Cancel
torbutton.popup.dontask = Automatically download files from now on
torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
+torbutton.security_settings.menu.title = Security Settings
torbutton.title.prompt_torbrowser = Important Torbutton Information
torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/skin/preferences-mobile.css b/src/chrome/skin/preferences-mobile.css
new file mode 100644
index 00000000..b6d54e8d
--- /dev/null
+++ b/src/chrome/skin/preferences-mobile.css
@@ -0,0 +1,47 @@
+.wrapper {
+ display: flex;
+}
+
+.outer-wrapper {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+}
+
+.inner-wrapper {
+ height: 350px;
+ width: 100%;
+ max-width: 600px;
+ flex-direction: column;
+ align-items: center;
+}
+
+#torbutton_sec_slider {
+ align-self: stretch;
+ width: auto;
+ height: auto;
+}
+
+datalist {
+ display: flex;
+ flex-direction: row;
+ justify-content: space-between;
+ align-self: stretch;
+}
+
+p {
+ text-align: justify;
+}
+
+div > p {
+ margin-top: 0px;
+}
+
+.title {
+ font-weight: bold;
+ line-height: 30px;
+}
+
+.wrapper .inner-wrapper * {
+ margin-top: 10px;
+}
1
0

21 Aug '18
commit 4ac367e5eb035b9fa79a58de9a324f77ee2a9db8
Author: Georg Koppen <gk(a)torproject.org>
Date: Tue Aug 21 15:24:57 2018 +0000
Bump OpenSSL version to 1.0.2p
---
projects/openssl/config | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/projects/openssl/config b/projects/openssl/config
index fe1c5fa..d3ed959 100644
--- a/projects/openssl/config
+++ b/projects/openssl/config
@@ -1,5 +1,5 @@
# vim: filetype=yaml sw=2
-version: 1.0.2o
+version: 1.0.2p
filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
var:
@@ -26,4 +26,4 @@ input_files:
- name: '[% c("var/compiler") %]'
project: '[% c("var/compiler") %]'
- URL: 'https://www.openssl.org/source/openssl-[% c("version") %].tar.gz'
- sha256sum: ec3f5c9714ba0fd45cb4e087301eb1336c317e0d20b575a125050470e8089e4d
+ sha256sum: 50a98e07b1a89eb8f6a99477f262df71c6fa7bef77df4dc83025a2845c827d00
1
0
commit 717430b7d03b587f113943625d2a4dc073fed2da
Author: Georg Koppen <gk(a)torproject.org>
Date: Tue Aug 21 08:06:17 2018 +0000
Add missing Changelog entry
---
src/CHANGELOG | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/CHANGELOG b/src/CHANGELOG
index ce4354bd..131bb2d4 100644
--- a/src/CHANGELOG
+++ b/src/CHANGELOG
@@ -7,6 +7,7 @@
* Bug 26500: Reposition circuit display relay icon for RTL locales
* Bug 26409: Remove spoofed locale implementation
* Bug 26189: Remove content-policy.js
+ * Bug 26544: Images are not centered anymore
* Bug 27129: Add locales ca, ga, id, is, nb
* Translations update
1
0
commit 67a8d3787f86ed06c38297df7c4c7a5ed07d0913
Author: Georg Koppen <gk(a)torproject.org>
Date: Mon Aug 20 10:57:32 2018 +0000
Translations update
---
src/chrome/locale/de/aboutTor.dtd | 2 +-
src/chrome/locale/he/aboutTor.dtd | 16 ++++++++--------
src/chrome/locale/is/aboutTor.dtd | 10 +++++-----
src/chrome/locale/it/aboutTor.dtd | 14 +++++++-------
src/chrome/locale/nb/aboutTor.dtd | 12 ++++++------
src/chrome/locale/zh-TW/aboutTor.dtd | 10 +++++-----
6 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/src/chrome/locale/de/aboutTor.dtd b/src/chrome/locale/de/aboutTor.dtd
index a653661a..b5552c2c 100644
--- a/src/chrome/locale/de/aboutTor.dtd
+++ b/src/chrome/locale/de/aboutTor.dtd
@@ -20,6 +20,6 @@
<!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">
<!ENTITY aboutTor.torbrowser_user_manual.label "Tor-Browser-Handbuch">
-<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
+<!ENTITY aboutTor.tor_mission.label "Projekt Tor ist eine in den USA als "The Tor Project" (US 501(c)(3)) registrierte nicht-kommerzielle Organisation für Menschenrechte und Freiheit, die freie und quelloffene Technologien für Anomytät und Privatssphäre entwickelt und bereitstellt und die Forschung und das öffentliche Verständis auf diesen Gebieten voranbringt.">
<!ENTITY aboutTor.getInvolved.label "Machen Sie mit »">
<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en">
diff --git a/src/chrome/locale/he/aboutTor.dtd b/src/chrome/locale/he/aboutTor.dtd
index 46f110f4..629b196e 100644
--- a/src/chrome/locale/he/aboutTor.dtd
+++ b/src/chrome/locale/he/aboutTor.dtd
@@ -6,20 +6,20 @@
<!ENTITY aboutTor.title "אודות Tor">
-<!ENTITY aboutTor.ready.label "Explore. Privately.">
-<!ENTITY aboutTor.ready2.label "You’re ready for the world’s most private browsing experience.">
+<!ENTITY aboutTor.ready.label "חקור. בפרטיות.">
+<!ENTITY aboutTor.ready2.label "אתה מוכן לחוויה של הגלישה הפרטית ביותר של העולם.">
<!ENTITY aboutTor.failure.label "משהו השתבש!">
<!ENTITY aboutTor.failure2.label "Tor אינו עובד בדפדפן זה.">
-<!ENTITY aboutTor.search.label "Search with DuckDuckGo">
+<!ENTITY aboutTor.search.label "חפש עם DuckDuckGo">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com">
<!ENTITY aboutTor.torbrowser_user_manual_questions.label "שאלות?">
-<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual »">
+<!ENTITY aboutTor.torbrowser_user_manual_link.label "בדוק את מדריך של דפדפן Tor שלנו «">
<!-- The next two entities are used within the browser's Help menu. -->
-<!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">
-<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual">
+<!ENTITY aboutTor.torbrowser_user_manual.accesskey "מ">
+<!ENTITY aboutTor.torbrowser_user_manual.label "מדריך של דפדפן Tor">
-<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
-<!ENTITY aboutTor.getInvolved.label "Get Involved »">
+<!ENTITY aboutTor.tor_mission.label "מיזם Tor הוא ארגון US 501(c)(3) ללא רווחים המקדם זכויות אדם וחירויות ע"י יצירה ופריסה של טכנולוגיות של אלמוניות ופרטיות בקוד פתוח וחינמי, תמיכה בזמינות ובשימוש בלתי־מוגבל שלהן, וקידום הבנה מדעית ועממית שלהן.">
+<!ENTITY aboutTor.getInvolved.label "הייה מעורב «">
<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en">
diff --git a/src/chrome/locale/is/aboutTor.dtd b/src/chrome/locale/is/aboutTor.dtd
index 63152e0a..3bae74a9 100644
--- a/src/chrome/locale/is/aboutTor.dtd
+++ b/src/chrome/locale/is/aboutTor.dtd
@@ -6,20 +6,20 @@
<!ENTITY aboutTor.title "Um Tor">
-<!ENTITY aboutTor.ready.label "Explore. Privately.">
+<!ENTITY aboutTor.ready.label "Vafraðu í friði fyrir hnýsni.">
<!ENTITY aboutTor.ready2.label "You’re ready for the world’s most private browsing experience.">
<!ENTITY aboutTor.failure.label "Eitthvað fór úrskeiðis!">
<!ENTITY aboutTor.failure2.label "Tor virkar ekki í þessum vafra.">
-<!ENTITY aboutTor.search.label "Search with DuckDuckGo">
+<!ENTITY aboutTor.search.label "Leita með DuckDuckGo">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com">
<!ENTITY aboutTor.torbrowser_user_manual_questions.label "Spurningar?">
-<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual »">
+<!ENTITY aboutTor.torbrowser_user_manual_link.label "Skoðaðu notendahandbók Tor-vafrans »">
<!-- The next two entities are used within the browser's Help menu. -->
<!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">
-<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual">
+<!ENTITY aboutTor.torbrowser_user_manual.label "Notendahandbók Tor-vafrans">
<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
-<!ENTITY aboutTor.getInvolved.label "Get Involved »">
+<!ENTITY aboutTor.getInvolved.label "Taktu þátt »">
<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en">
diff --git a/src/chrome/locale/it/aboutTor.dtd b/src/chrome/locale/it/aboutTor.dtd
index f373ceb1..bef8049a 100644
--- a/src/chrome/locale/it/aboutTor.dtd
+++ b/src/chrome/locale/it/aboutTor.dtd
@@ -6,20 +6,20 @@
<!ENTITY aboutTor.title "Info su Tor">
-<!ENTITY aboutTor.ready.label "Explore. Privately.">
-<!ENTITY aboutTor.ready2.label "You’re ready for the world’s most private browsing experience.">
+<!ENTITY aboutTor.ready.label "Naviga. Privatamente.">
+<!ENTITY aboutTor.ready2.label "Sei pronto per l'esperienza di navigazione più privata al mondo.">
<!ENTITY aboutTor.failure.label "Qualcosa è Andato Storto!">
<!ENTITY aboutTor.failure2.label "Tor non sta funzionando su questo browser.">
-<!ENTITY aboutTor.search.label "Search with DuckDuckGo">
+<!ENTITY aboutTor.search.label "Cerca con DuckDuckGo">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com">
<!ENTITY aboutTor.torbrowser_user_manual_questions.label "Domande?">
-<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual »">
+<!ENTITY aboutTor.torbrowser_user_manual_link.label "Controlla il Manuale del Browser Tor »">
<!-- The next two entities are used within the browser's Help menu. -->
<!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">
-<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual">
+<!ENTITY aboutTor.torbrowser_user_manual.label "Manuale Browser Tor">
-<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
-<!ENTITY aboutTor.getInvolved.label "Get Involved »">
+<!ENTITY aboutTor.tor_mission.label "Il Tor Project è una organizzazione non-profit allo scopo di avanzare i diritti e le libertà umane creando e distribuendo software libero con tecnologie per la privacy e l'anonimato, supportando la loro disponibilità e utilizzo senza restrizioni e avanzandone la loro comprensione scientifica e popolare.">
+<!ENTITY aboutTor.getInvolved.label "Unisciti a noi »">
<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en">
diff --git a/src/chrome/locale/nb/aboutTor.dtd b/src/chrome/locale/nb/aboutTor.dtd
index 7b37ddbe..32af1462 100644
--- a/src/chrome/locale/nb/aboutTor.dtd
+++ b/src/chrome/locale/nb/aboutTor.dtd
@@ -6,20 +6,20 @@
<!ENTITY aboutTor.title "Om Tor">
-<!ENTITY aboutTor.ready.label "Explore. Privately.">
-<!ENTITY aboutTor.ready2.label "You’re ready for the world’s most private browsing experience.">
+<!ENTITY aboutTor.ready.label "Utforsk. Privat.">
+<!ENTITY aboutTor.ready2.label "Du er klar for verdens mest private surfing opplevelse.">
<!ENTITY aboutTor.failure.label "Noe gikk galt!">
<!ENTITY aboutTor.failure2.label "Tor fungerer ikke i denne nettleseren.">
-<!ENTITY aboutTor.search.label "Search with DuckDuckGo">
+<!ENTITY aboutTor.search.label "Søk med DuckDuckGo">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com">
<!ENTITY aboutTor.torbrowser_user_manual_questions.label "Spørsmål?">
<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual »">
<!-- The next two entities are used within the browser's Help menu. -->
<!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">
-<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual">
+<!ENTITY aboutTor.torbrowser_user_manual.label "Tor-nettleseren Håndbok">
-<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
-<!ENTITY aboutTor.getInvolved.label "Get Involved »">
+<!ENTITY aboutTor.tor_mission.label "The Tor Project er en US 501(c)(3) ideell organisasjon som fremmer menneskerettigheter og friheter ved å skape og distribuere anonymisering og personvernteknologi for fri og åpen kildekode, som støtter deres ubegrensede tilgjengelighet og bruk, og fremmer sin vitenskapelige og populære forståelse.">
+<!ENTITY aboutTor.getInvolved.label "Bli involvert »">
<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en">
diff --git a/src/chrome/locale/zh-TW/aboutTor.dtd b/src/chrome/locale/zh-TW/aboutTor.dtd
index e5b4e099..537538f4 100644
--- a/src/chrome/locale/zh-TW/aboutTor.dtd
+++ b/src/chrome/locale/zh-TW/aboutTor.dtd
@@ -7,19 +7,19 @@
<!ENTITY aboutTor.title "關於洋蔥路由">
<!ENTITY aboutTor.ready.label "Explore. Privately.">
-<!ENTITY aboutTor.ready2.label "You’re ready for the world’s most private browsing experience.">
+<!ENTITY aboutTor.ready2.label "您已準備好使用全世界最私密的瀏覽體驗。">
<!ENTITY aboutTor.failure.label "發生錯誤!">
<!ENTITY aboutTor.failure2.label "洋蔥路由無法在此瀏覽器中運作。">
-<!ENTITY aboutTor.search.label "Search with DuckDuckGo">
+<!ENTITY aboutTor.search.label "用 DuckDuckGo 搜尋">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com">
<!ENTITY aboutTor.torbrowser_user_manual_questions.label "有什麼問題?">
-<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual »">
+<!ENTITY aboutTor.torbrowser_user_manual_link.label "查看我們的洋蔥路由瀏覽器手冊 »">
<!-- The next two entities are used within the browser's Help menu. -->
<!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">
-<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual">
+<!ENTITY aboutTor.torbrowser_user_manual.label "洋蔥路由瀏覽器手冊">
<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
-<!ENTITY aboutTor.getInvolved.label "Get Involved »">
+<!ENTITY aboutTor.getInvolved.label "加入我們 »">
<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en">
1
0
commit ca50708b2da346c122f9b859cf7718ae46e5820d
Author: Georg Koppen <gk(a)torproject.org>
Date: Tue Aug 21 08:01:43 2018 +0000
Added missing Changelog entry
---
projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 1 +
1 file changed, 1 insertion(+)
diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index 5970d71..e9b394a 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -10,6 +10,7 @@ Tor Browser 8.0a10 -- August 20 2018
* Bug 26500: Reposition circuit display relay icon for RTL locales
* Bug 26409: Remove spoofed locale implementation
* Bug 26189: Remove content-policy.js
+ * Bug 26544: Images are not centered anymore
* Bug 27129: Add locales ca, ga, id, is, nb
* Translations update
* Update Tor Launcher to 0.2.16.2
1
0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 24796 - Comment out excess permissions from GeckoView
by gk@torproject.org 20 Aug '18
by gk@torproject.org 20 Aug '18
20 Aug '18
commit d0ccd485e2bb22fea4d9d758906dcee7468b4a6a
Author: Matthew Finkel <Matthew.Finkel(a)gmail.com>
Date: Mon Jul 16 22:22:59 2018 +0000
Bug 24796 - Comment out excess permissions from GeckoView
The GeckoView AndroidManifest.xml is not preprocessed unlike Fennec's
manifest, so we can't use the ifdef preprocessor guards around the
permissions we do not want. Commenting the permissions is the
next-best-thing.
---
.../android/geckoview/src/main/AndroidManifest.xml | 31 ++++++++++++----------
1 file changed, 17 insertions(+), 14 deletions(-)
diff --git a/mobile/android/geckoview/src/main/AndroidManifest.xml b/mobile/android/geckoview/src/main/AndroidManifest.xml
index 9a74f5843240..6f82aa6aa74d 100644
--- a/mobile/android/geckoview/src/main/AndroidManifest.xml
+++ b/mobile/android/geckoview/src/main/AndroidManifest.xml
@@ -1,13 +1,15 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.mozilla.geckoview">
-#ifdef MOZ_ANDROID_NETWORK_STATE
+<!--#ifdef MOZ_ANDROID_NETWORK_STATE-->
+ <!--
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-#endif
+ -->
+<!--#endif-->
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
@@ -17,24 +19,25 @@
<uses-permission android:name="android.permission.WAKE_LOCK"/>
<uses-permission android:name="android.permission.VIBRATE"/>
-#ifdef MOZ_ANDROID_LOCATION
+<!--#ifdef MOZ_ANDROID_LOCATION-->
+ <!--
<uses-feature android:name="android.hardware.location" android:required="false"/>
<uses-feature android:name="android.hardware.location.gps" android:required="false"/>
-#endif
+ -->
+<!--#endif-->
<uses-feature android:name="android.hardware.touchscreen"/>
- <uses-permission android:name="android.permission.CAMERA" />
- <uses-feature android:name="android.hardware.camera" android:required="false"/>
- <uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
-
- <!--#ifdef MOZ_WEBRTC-->
+<!--#ifdef MOZ_WEBRTC-->
<!-- TODO preprocess AndroidManifest.xml so that we can
conditionally include WebRTC permissions based on MOZ_WEBRTC. -->
- <uses-permission android:name="android.permission.RECORD_AUDIO"/>-->
- <uses-feature android:name="android.hardware.audio.low_latency" android:required="false"/>-->
- <uses-feature android:name="android.hardware.microphone" android:required="false"/>-->
- <uses-feature android:name="android.hardware.camera.any" android:required="false"/>-->
- <!--#endif-->
+ <!--<uses-permission android:name="android.permission.RECORD_AUDIO"/>-->
+ <!--<uses-feature android:name="android.hardware.audio.low_latency" android:required="false"/>-->
+ <!--<uses-feature android:name="android.hardware.microphone" android:required="false"/>-->
+ <!--<uses-feature android:name="android.hardware.camera.any" android:required="false"/>-->
+ <!--<uses-permission android:name="android.permission.CAMERA" />-->
+ <!--<uses-feature android:name="android.hardware.camera" android:required="false"/>-->
+ <!--<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>-->
+<!--#endif-->
<!-- App requires OpenGL ES 2.0 -->
<uses-feature android:glEsVersion="0x00020000" android:required="true" />
1
0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 25696 - Implement alpha onboarding for Tor Browser for Android
by gk@torproject.org 20 Aug '18
by gk@torproject.org 20 Aug '18
20 Aug '18
commit 9c58e200f6eb526a5b337138b994b9eb31af5817
Author: Igor Oliveira <igt0(a)torproject.org>
Date: Mon Aug 6 00:12:26 2018 -0300
Bug 25696 - Implement alpha onboarding for Tor Browser for Android
- FirstrunTorPagerConfig.java: Create file that sets up all the views
in the pager.
- FirstrunPager.java: Update code to use the FirstrunTorPagerConfig.
- FirstrunLastPanel.java: Create view that adds a close handler in the
latest pager view.
---
.../res/layout/firstrun_animation_container.xml | 10 +--
.../firstrun_basepanel_checkable_fragment.xml | 34 ++++++----
.../android/app/src/photon/res/values/colors.xml | 4 +-
.../android/app/src/photon/res/values/styles.xml | 7 ++
.../mozilla/gecko/firstrun/FirstrunLastPanel.java | 30 +++++++++
.../org/mozilla/gecko/firstrun/FirstrunPager.java | 18 ++---
.../gecko/firstrun/FirstrunTorPagerConfig.java | 74 +++++++++++++++++++++
.../java/org/mozilla/gecko/firstrun/LastPanel.java | 11 ++-
.../android/base/locales/en-US/android_strings.dtd | 20 +++++-
mobile/android/base/strings.xml.in | 22 +++++-
.../res/drawable-nodpi/figure_experience.png | Bin 0 -> 44299 bytes
.../res/drawable-nodpi/figure_network.png | Bin 0 -> 70302 bytes
.../torbrowser/res/drawable-nodpi/figure_onion.png | Bin 0 -> 139952 bytes
.../res/drawable-nodpi/figure_privacy.png | Bin 0 -> 61696 bytes
.../res/drawable-nodpi/figure_welcome.png | Bin 0 -> 83798 bytes
.../drawable-nodpi/home_tab_menu_strip_tor.9.png | Bin 0 -> 126 bytes
16 files changed, 189 insertions(+), 41 deletions(-)
diff --git a/mobile/android/app/src/main/res/layout/firstrun_animation_container.xml b/mobile/android/app/src/main/res/layout/firstrun_animation_container.xml
index 3e7225365c57..dd20466a8e1a 100644
--- a/mobile/android/app/src/main/res/layout/firstrun_animation_container.xml
+++ b/mobile/android/app/src/main/res/layout/firstrun_animation_container.xml
@@ -8,7 +8,7 @@
xmlns:gecko="http://schemas.android.com/apk/res-auto"
android:layout_height="match_parent"
android:layout_width="match_parent"
- android:background="@color/dark_transparent_overlay">
+ android:background="@android:color/white">
<org.mozilla.gecko.firstrun.FirstrunPager
android:id="@+id/firstrun_pager"
@@ -18,12 +18,12 @@
<org.mozilla.gecko.home.TabMenuStrip android:layout_width="match_parent"
android:layout_height="@dimen/tabs_strip_height"
- android:background="@color/firstrun_pager_header"
+ android:background="@android:color/white"
android:visibility="visible"
android:layout_gravity="top"
- gecko:strip="@drawable/home_tab_menu_strip"
- gecko:activeTextColor="@color/placeholder_grey"
- gecko:inactiveTextColor="@color/tab_text_color"
+ gecko:strip="@drawable/home_tab_menu_strip_tor"
+ gecko:activeTextColor="@color/tor_tab_active_text"
+ gecko:inactiveTextColor="@color/tor_tab_inactive_text"
gecko:tabsMarginLeft="@dimen/firstrun_tab_strip_content_start" />
</org.mozilla.gecko.firstrun.FirstrunPager>
diff --git a/mobile/android/app/src/main/res/layout/firstrun_basepanel_checkable_fragment.xml b/mobile/android/app/src/main/res/layout/firstrun_basepanel_checkable_fragment.xml
index 700ab20663ce..6233198982d9 100644
--- a/mobile/android/app/src/main/res/layout/firstrun_basepanel_checkable_fragment.xml
+++ b/mobile/android/app/src/main/res/layout/firstrun_basepanel_checkable_fragment.xml
@@ -13,31 +13,37 @@
<LinearLayout android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="@dimen/firstrun_min_height"
- android:background="@color/about_page_header_grey"
+ android:background="@android:color/white"
android:gravity="center_horizontal"
android:orientation="vertical">
- <ImageView android:id="@+id/firstrun_image"
- android:layout_width="wrap_content"
- android:layout_height="@dimen/firstrun_background_height"
- android:layout_marginTop="30dp"
- android:layout_marginBottom="18dp"
- android:scaleType="fitCenter"
- android:layout_gravity="center"
- android:adjustViewBounds="true"/>
+ <LinearLayout android:layout_width="match_parent"
+ android:layout_height="@dimen/firstrun_background_height"
+ android:background="@android:color/white"
+ android:gravity="center"
+ android:layout_gravity="center">
+
+ <ImageView android:id="@+id/firstrun_image"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:scaleType="fitCenter"
+ android:layout_gravity="center"
+ android:adjustViewBounds="true"/>
+ </LinearLayout>
<TextView android:id="@+id/firstrun_text"
android:layout_width="@dimen/firstrun_content_width"
android:layout_height="wrap_content"
- android:gravity="center"
+ android:gravity="left"
android:textAppearance="@style/TextAppearance.FirstrunLight.Main"/>
<TextView android:id="@+id/firstrun_subtext"
android:layout_width="@dimen/firstrun_content_width"
android:layout_height="wrap_content"
android:paddingTop="20dp"
- android:gravity="center"
- android:textAppearance="@style/TextAppearance.FirstrunRegular.Body"/>
+ android:gravity="left"
+ android:lineSpacingExtra="5dp"
+ android:textAppearance="@style/TextAppearance.FirstrunTorRegular.Body"/>
<android.support.v7.widget.SwitchCompat
android:id="@+id/firstrun_switch"
@@ -47,10 +53,10 @@
android:visibility="invisible"/>
<TextView android:id="@+id/firstrun_link"
- android:layout_width="wrap_content"
+ android:layout_width="@dimen/firstrun_content_width"
android:layout_height="wrap_content"
android:layout_marginBottom="30dp"
- android:gravity="center"
+ android:gravity="left"
android:textAppearance="@style/TextAppearance.Link"
android:textAllCaps="true"
android:text="@string/firstrun_button_next"/>
diff --git a/mobile/android/app/src/photon/res/values/colors.xml b/mobile/android/app/src/photon/res/values/colors.xml
index 73478f47bf4a..b3522be3c2db 100644
--- a/mobile/android/app/src/photon/res/values/colors.xml
+++ b/mobile/android/app/src/photon/res/values/colors.xml
@@ -130,7 +130,7 @@
<color name="private_browsing_purple">#CF68FF</color>
<!-- On boarding -->
- <color name="ob_click">#0A84FF</color>
+ <color name="ob_click">#7D4698</color>
<color name="ob_press">#003EAA</color>
<color name="ob_title">#212121</color>
<color name="ob_subtitle">#737373</color>
@@ -151,6 +151,8 @@
<color name="url_bar_shadow_private">#272727</color>
+ <color name="tor_tab_inactive_text">#484848</color>
+ <color name="tor_tab_active_text">#7D4698</color>
<!-- Restricted profiles palette -->
<color name="restricted_profile_background_gold">#ffffcb51</color>
diff --git a/mobile/android/app/src/photon/res/values/styles.xml b/mobile/android/app/src/photon/res/values/styles.xml
index 49e01ee1caee..3330430b22d7 100644
--- a/mobile/android/app/src/photon/res/values/styles.xml
+++ b/mobile/android/app/src/photon/res/values/styles.xml
@@ -729,6 +729,7 @@
<style name="TextAppearance.FirstrunLight"/>
<style name="TextAppearance.FirstrunRegular"/>
+ <style name="TextAppearance.FirstrunTorRegular"/>
<style name="TextAppearance.FirstrunLight.Main">
<item name="android:textSize">20sp</item>
@@ -741,6 +742,12 @@
<item name="android:lineSpacingMultiplier">1.25</item>
</style>
+ <style name="TextAppearance.FirstrunTorRegular.Body">
+ <item name="android:textSize">16sp</item>
+ <item name="android:textColor">@color/ob_subtitle</item>
+ <item name="android:lineSpacingMultiplier">2</item>
+ </style>
+
<style name="TextAppearance.Link">
<item name="android:textSize">16sp</item>
<item name="android:textColor">@color/ob_click</item>
diff --git a/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunLastPanel.java b/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunLastPanel.java
new file mode 100644
index 000000000000..37ccda25d328
--- /dev/null
+++ b/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunLastPanel.java
@@ -0,0 +1,30 @@
+/* -*- Mode: Java; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil; -*-
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.gecko.firstrun;
+
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import org.mozilla.gecko.R;
+
+public class FirstrunLastPanel extends FirstrunPanel {
+
+ @Override
+ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstance) {
+ final ViewGroup root = (ViewGroup) super.onCreateView(inflater, container, savedInstance);
+
+ root.findViewById(R.id.firstrun_link).setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ close();
+ }
+ });
+
+ return root;
+ }
+}
diff --git a/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunPager.java b/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunPager.java
index 044fe41850d5..48152c60870f 100644
--- a/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunPager.java
+++ b/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunPager.java
@@ -64,15 +64,7 @@ public class FirstrunPager extends RtlViewPager {
}
public void load(Context appContext, FragmentManager fm, final FirstrunAnimationContainer.OnFinishListener onFinishListener) {
- final List<FirstrunPagerConfig.FirstrunPanelConfig> panels;
-
- if (Restrictions.isRestrictedProfile(context)) {
- panels = FirstrunPagerConfig.getRestricted();
- } else if (FirefoxAccounts.firefoxAccountsExist(context)) {
- panels = FirstrunPagerConfig.forFxAUser(appContext);
- } else {
- panels = FirstrunPagerConfig.getDefault(appContext);
- }
+ final List<FirstrunTorPagerConfig.FirstrunTorPanelConfig> panels = FirstrunTorPagerConfig.getDefault(appContext);
setAdapter(new ViewPagerAdapter(fm, panels));
this.pagerNavigation = new FirstrunPanel.PagerNavigation() {
@@ -136,14 +128,14 @@ public class FirstrunPager extends RtlViewPager {
}
protected class ViewPagerAdapter extends FragmentPagerAdapter {
- private final List<FirstrunPagerConfig.FirstrunPanelConfig> panels;
+ private final List<FirstrunTorPagerConfig.FirstrunTorPanelConfig> panels;
private final Fragment[] fragments;
- public ViewPagerAdapter(FragmentManager fm, List<FirstrunPagerConfig.FirstrunPanelConfig> panels) {
+ public ViewPagerAdapter(FragmentManager fm, List<FirstrunTorPagerConfig.FirstrunTorPanelConfig> panels) {
super(fm);
this.panels = panels;
this.fragments = new Fragment[panels.size()];
- for (FirstrunPagerConfig.FirstrunPanelConfig panel : panels) {
+ for (FirstrunTorPagerConfig.FirstrunTorPanelConfig panel : panels) {
mDecor.onAddPagerView(context.getString(panel.getTitleRes()));
}
@@ -156,7 +148,7 @@ public class FirstrunPager extends RtlViewPager {
public Fragment getItem(int i) {
Fragment fragment = this.fragments[i];
if (fragment == null) {
- FirstrunPagerConfig.FirstrunPanelConfig panelConfig = panels.get(i);
+ FirstrunTorPagerConfig.FirstrunTorPanelConfig panelConfig = panels.get(i);
fragment = Fragment.instantiate(context, panelConfig.getClassname(), panelConfig.getArgs());
((FirstrunPanel) fragment).setPagerNavigation(pagerNavigation);
fragments[i] = fragment;
diff --git a/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunTorPagerConfig.java b/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunTorPagerConfig.java
new file mode 100644
index 000000000000..40b72e705784
--- /dev/null
+++ b/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunTorPagerConfig.java
@@ -0,0 +1,74 @@
+/* -*- Mode: Java; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil; -*-
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.gecko.firstrun;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.util.Log;
+import org.mozilla.gecko.GeckoSharedPrefs;
+import org.mozilla.gecko.R;
+import org.mozilla.gecko.Telemetry;
+import org.mozilla.gecko.TelemetryContract;
+import org.mozilla.gecko.Experiments;
+
+import java.util.LinkedList;
+import java.util.List;
+
+public class FirstrunTorPagerConfig {
+ public static final String LOGTAG = "FirstrunPagerConfigTor";
+
+ public static final String KEY_IMAGE = "imageRes";
+ public static final String KEY_TEXT = "textRes";
+ public static final String KEY_SUBTEXT = "subtextRes";
+
+ public static List<FirstrunTorPanelConfig> getDefault(Context context) {
+ final List<FirstrunTorPanelConfig> panels = new LinkedList<>();
+ panels.add(SimplePanelConfigs.welcomeTorPanelConfig);
+ panels.add(SimplePanelConfigs.privacyPanelConfig);
+ panels.add(SimplePanelConfigs.torNetworkPanelConfig);
+ panels.add(SimplePanelConfigs.tipsPanelConfig);
+ panels.add(SimplePanelConfigs.onionServicesPanelConfig);
+
+ return panels;
+ }
+
+ public static class FirstrunTorPanelConfig {
+
+ private String classname;
+ private int titleRes;
+ private Bundle args;
+
+ public FirstrunTorPanelConfig(String classname, int titleRes, int imageRes, int textRes, int subtextRes) {
+ this.classname = classname;
+ this.titleRes = titleRes;
+
+ this.args = new Bundle();
+ this.args.putInt(KEY_IMAGE, imageRes);
+ this.args.putInt(KEY_TEXT, textRes);
+ this.args.putInt(KEY_SUBTEXT, subtextRes);
+ }
+
+ public String getClassname() {
+ return this.classname;
+ }
+
+ public int getTitleRes() {
+ return this.titleRes;
+ }
+
+ public Bundle getArgs() {
+ return args;
+ }
+ }
+
+ private static class SimplePanelConfigs {
+ public static final FirstrunTorPanelConfig welcomeTorPanelConfig = new FirstrunTorPanelConfig(FirstrunPanel.class.getName(), R.string.firstrun_welcome_tab_title, R.drawable.figure_welcome, R.string.firstrun_welcome_title, R.string.firstrun_welcome_message);
+ public static final FirstrunTorPanelConfig privacyPanelConfig = new FirstrunTorPanelConfig(FirstrunPanel.class.getName(), R.string.firstrun_privacy_tab_title, R.drawable.figure_privacy, R.string.firstrun_privacy_title, R.string.firstrun_privacy_message);
+ public static final FirstrunTorPanelConfig torNetworkPanelConfig = new FirstrunTorPanelConfig(FirstrunPanel.class.getName(), R.string.firstrun_tornetwork_tab_title, R.drawable.figure_network, R.string.firstrun_tornetwork_title, R.string.firstrun_tornetwork_message);
+ public static final FirstrunTorPanelConfig tipsPanelConfig = new FirstrunTorPanelConfig(FirstrunPanel.class.getName(), R.string.firstrun_tips_tab_title, R.drawable.figure_experience, R.string.firstrun_tips_title, R.string.firstrun_tips_message);
+ public static final FirstrunTorPanelConfig onionServicesPanelConfig = new FirstrunTorPanelConfig(LastPanel.class.getName(), R.string.firstrun_onionservices_tab_title, R.drawable.figure_onion, R.string.firstrun_onionservices_title, R.string.firstrun_onionservices_message);
+ }
+}
diff --git a/mobile/android/base/java/org/mozilla/gecko/firstrun/LastPanel.java b/mobile/android/base/java/org/mozilla/gecko/firstrun/LastPanel.java
index d100c49b3480..c4e4aa0dd96a 100644
--- a/mobile/android/base/java/org/mozilla/gecko/firstrun/LastPanel.java
+++ b/mobile/android/base/java/org/mozilla/gecko/firstrun/LastPanel.java
@@ -6,6 +6,7 @@
package org.mozilla.gecko.firstrun;
import android.os.Bundle;
+import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -13,8 +14,6 @@ import android.widget.ImageView;
import android.widget.TextView;
import org.mozilla.gecko.R;
-import org.mozilla.gecko.Telemetry;
-import org.mozilla.gecko.TelemetryContract;
public class LastPanel extends FirstrunPanel {
@Override
@@ -29,19 +28,19 @@ public class LastPanel extends FirstrunPanel {
((ImageView) root.findViewById(R.id.firstrun_image)).setImageResource(imageRes);
((TextView) root.findViewById(R.id.firstrun_text)).setText(textRes);
((TextView) root.findViewById(R.id.firstrun_subtext)).setText(subtextRes);
- ((TextView) root.findViewById(R.id.firstrun_link)).setText(R.string.firstrun_welcome_button_browser);
-
}
+ TextView nextLink = (TextView) root.findViewById(R.id.firstrun_link);
+ nextLink.setText(R.string.firstrun_welcome_button_browser);
+ nextLink.setGravity(Gravity.CENTER);
+
root.findViewById(R.id.firstrun_link).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- Telemetry.sendUIEvent(TelemetryContract.Event.ACTION, TelemetryContract.Method.BUTTON, "firstrun-next");
close();
}
});
-
return root;
}
}
diff --git a/mobile/android/base/locales/en-US/android_strings.dtd b/mobile/android/base/locales/en-US/android_strings.dtd
index b4e2296268c1..b9181bb82e1b 100644
--- a/mobile/android/base/locales/en-US/android_strings.dtd
+++ b/mobile/android/base/locales/en-US/android_strings.dtd
@@ -6,7 +6,7 @@
<!ENTITY firstrun_urlbar_message2 "Thanks for choosing &brandShortName;">
<!ENTITY firstrun_urlbar_subtext2 "A modern mobile browser from The Tor Project, the non-profit committed to a free and open web.">
<!ENTITY firstrun_panel_title_privacy "Privacy">
-<!ENTITY firstrun_privacy_message "Browse like no one\'s watching">
+<!--!ENTITY firstrun_privacy_message "Browse like no one\'s watching"-->
<!ENTITY firstrun_privacy_subtext "Private Browsing with Tracking Protection blocks trackers while you browse and won’t remember your history when you finish browsing.">
<!ENTITY firstrun_panel_title_customize "Customize">
<!ENTITY firstrun_customize_message "Make &brandShortName; your own.">
@@ -43,6 +43,24 @@
<!ENTITY firstrun_account_title "You">
<!ENTITY firstrun_account_message "Have &brandShortName; on another device?">
+<!-- Location note: Tor First run messages -->
+<!ENTITY firstrun_welcome_tab_title "Welcome">
+<!ENTITY firstrun_welcome_title "You\'re ready">
+<!ENTITY firstrun_welcome_message "Tor Browser for Android offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance, and censorship. Here\'s a quick onboarding about how it works.">
+<!ENTITY firstrun_privacy_tab_title "Privacy">
+<!ENTITY firstrun_privacy_title "Snub trackers and snoopers">
+<!ENTITY firstrun_privacy_message "Tor Browser isolates each domain you visit. That means trackers and advertisers can’t follow you. And any information stored, such as isolated cookies or your browsing history, is deleted after your session. These modifications ensure your privacy is protected while you\'re browsing. Click \'Tor Network\' to learn how we protect you on the network level.">
+<!ENTITY firstrun_tornetwork_tab_title "Tor Network">
+<!ENTITY firstrun_tornetwork_title "Travel a decentralized network">
+<!ENTITY firstrun_tornetwork_message "Tor Browser for Android routes your connection over the Tor network. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, there\'s no single point of failure and no centralized entity you need to trust in order to enjoy the internet, unlike when you use a VPN. For each domain you access, a new circuit through the network is created for you.">
+<!ENTITY firstrun_tips_tab_title "Tips">
+<!ENTITY firstrun_tips_title "Experience Tips">
+<!ENTITY firstrun_tips_message "With all the security and privacy features provided by the Tor Browser and the Tor network, your experience while browsing the internet will be a little bit different. Since your connection is going through 3 relays around the world, things may run a bit slower than you\'re used to. Sometimes sites will ask you to prove you are a human, not a robot, and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on providing real privacy.">
+<!ENTITY firstrun_onionservices_tab_title "Onion Services">
+<!ENTITY firstrun_onionservices_title "Onion Services">
+<!ENTITY firstrun_onionservices_message "For enhanced privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and
+visitors, including added safeguards against censorship. The same way Tor Browser for Android allows you to browse the web with a high degree of privacy onion services allow people to provide content and services privately. You can access .onion sites using Tor Browser for Android.">
+
<!ENTITY onboard_start_restricted1 "Stay safe and in control with this simplified version of &brandShortName;.">
<!-- Localization note: These are used as the titles of different pages on the home screen.
diff --git a/mobile/android/base/strings.xml.in b/mobile/android/base/strings.xml.in
index cf43a3b4c78b..abf51ae53db6 100644
--- a/mobile/android/base/strings.xml.in
+++ b/mobile/android/base/strings.xml.in
@@ -32,7 +32,7 @@
<string name="firstrun_urlbar_message">&firstrun_urlbar_message2;</string>
<string name="firstrun_urlbar_subtext">&firstrun_urlbar_subtext2;</string>
<string name="firstrun_panel_title_privacy">&firstrun_panel_title_privacy;</string>
- <string name="firstrun_privacy_message">&firstrun_privacy_message;</string>
+ <!--string name="firstrun_privacy_message">&firstrun_privacy_message;</string-->
<string name="firstrun_privacy_subtext">&firstrun_privacy_subtext;</string>
<string name="firstrun_panel_title_customize">&firstrun_panel_title_customize;</string>
<string name="firstrun_customize_message">&firstrun_customize_message;</string>
@@ -51,6 +51,26 @@
<string name="firstrun_welcome_restricted">&onboard_start_restricted1;</string>
+ <string name="firstrun_welcome_tab_title">&firstrun_welcome_tab_title;</string>
+ <string name="firstrun_welcome_title">&firstrun_welcome_title;</string>
+ <string name="firstrun_welcome_message">&firstrun_welcome_message;</string>
+
+ <string name="firstrun_privacy_tab_title">&firstrun_privacy_tab_title;</string>
+ <string name="firstrun_privacy_title">&firstrun_privacy_title;</string>
+ <string name="firstrun_privacy_message">&firstrun_privacy_message;</string>
+
+ <string name="firstrun_tornetwork_tab_title">&firstrun_tornetwork_tab_title;</string>
+ <string name="firstrun_tornetwork_title">&firstrun_tornetwork_title;</string>
+ <string name="firstrun_tornetwork_message">&firstrun_tornetwork_message;</string>
+
+ <string name="firstrun_tips_tab_title">&firstrun_tips_tab_title;</string>
+ <string name="firstrun_tips_title">&firstrun_tips_title;</string>
+ <string name="firstrun_tips_message">&firstrun_tips_message;</string>
+
+ <string name="firstrun_onionservices_tab_title">&firstrun_onionservices_tab_title;</string>
+ <string name="firstrun_onionservices_title">&firstrun_onionservices_title;</string>
+ <string name="firstrun_onionservices_message">&firstrun_onionservices_message;</string>
+
<string name="bookmarks_title">&bookmarks_title;</string>
<string name="history_title">&history_title;</string>
diff --git a/mobile/android/branding/torbrowser/res/drawable-nodpi/figure_experience.png b/mobile/android/branding/torbrowser/res/drawable-nodpi/figure_experience.png
new file mode 100644
index 000000000000..2eeeb1ccbd7d
Binary files /dev/null and b/mobile/android/branding/torbrowser/res/drawable-nodpi/figure_experience.png differ
diff --git a/mobile/android/branding/torbrowser/res/drawable-nodpi/figure_network.png b/mobile/android/branding/torbrowser/res/drawable-nodpi/figure_network.png
new file mode 100644
index 000000000000..62bf5e2d144d
Binary files /dev/null and b/mobile/android/branding/torbrowser/res/drawable-nodpi/figure_network.png differ
diff --git a/mobile/android/branding/torbrowser/res/drawable-nodpi/figure_onion.png b/mobile/android/branding/torbrowser/res/drawable-nodpi/figure_onion.png
new file mode 100644
index 000000000000..cbd8236f82e9
Binary files /dev/null and b/mobile/android/branding/torbrowser/res/drawable-nodpi/figure_onion.png differ
diff --git a/mobile/android/branding/torbrowser/res/drawable-nodpi/figure_privacy.png b/mobile/android/branding/torbrowser/res/drawable-nodpi/figure_privacy.png
new file mode 100644
index 000000000000..d9d56229aa8a
Binary files /dev/null and b/mobile/android/branding/torbrowser/res/drawable-nodpi/figure_privacy.png differ
diff --git a/mobile/android/branding/torbrowser/res/drawable-nodpi/figure_welcome.png b/mobile/android/branding/torbrowser/res/drawable-nodpi/figure_welcome.png
new file mode 100644
index 000000000000..274dea5c31a6
Binary files /dev/null and b/mobile/android/branding/torbrowser/res/drawable-nodpi/figure_welcome.png differ
diff --git a/mobile/android/branding/torbrowser/res/drawable-nodpi/home_tab_menu_strip_tor.9.png b/mobile/android/branding/torbrowser/res/drawable-nodpi/home_tab_menu_strip_tor.9.png
new file mode 100644
index 000000000000..a92420d11b8e
Binary files /dev/null and b/mobile/android/branding/torbrowser/res/drawable-nodpi/home_tab_menu_strip_tor.9.png differ
1
0

[tor-browser-build/master] Bug 27178: add support for xz compression in mar files
by gk@torproject.org 17 Aug '18
by gk@torproject.org 17 Aug '18
17 Aug '18
commit 93acbf12b01c83facfb6fb023ceff10d9f601b98
Author: Nicolas Vigier <boklm(a)torproject.org>
Date: Fri Aug 17 09:35:25 2018 +0200
Bug 27178: add support for xz compression in mar files
Add the option `mar_compression` to update_responses_config.yml to
select the compression format used in the mar files.
Currently we are using bzip2 for the previous alpha, xz for the new
alpha, and bzip2 for both the previous and new stable.
---
projects/release/update_responses_config.yml | 4 ++++
tools/update-responses/update_responses | 27 +++++++++++++++++++--------
2 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/projects/release/update_responses_config.yml b/projects/release/update_responses_config.yml
index 3f7ff41..90fbc3a 100644
--- a/projects/release/update_responses_config.yml
+++ b/projects/release/update_responses_config.yml
@@ -47,6 +47,10 @@ versions:
minSupportedOSVersion: 6.1
win64:
minSupportedOSVersion: 6.1
+[% IF ! c("var/release") -%]
+ mar_compression: xz
+[% END -%]
+mar_compression: bzip2
htaccess_rewrite_rules:
alpha: |
# bug 26569: Redirect pre-8.0a9 alpha users to a separate update directory
diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses
index 3295808..59cd2ef 100755
--- a/tools/update-responses/update_responses
+++ b/tools/update-responses/update_responses
@@ -154,19 +154,24 @@ sub get_version_downloads {
}
sub extract_mar {
- my ($mar_file, $dest_dir) = @_;
+ my ($mar_file, $dest_dir, $compression) = @_;
my $old_cwd = getcwd;
mkdir $dest_dir;
chdir $dest_dir or exit_error "Cannot enter $dest_dir";
my $res = system('mar', '-x', $mar_file);
exit_error "Error extracting $mar_file" if $res;
- my $bunzip_file = sub {
+ if ($compression ne 'bzip2' && $compression ne 'xz') {
+ exit_error "Unknown compression format $compression";
+ }
+ my $compr_ext = $compression eq 'bzip2' ? 'bz2' : 'xz';
+ my $compr_cmd = $compression eq 'bzip2' ? 'bunzip2' : 'unxz';
+ my $uncompress_file = sub {
return unless -f $File::Find::name;
- rename $File::Find::name, "$File::Find::name.bz2";
- system('bunzip2', "$File::Find::name.bz2") == 0
+ rename $File::Find::name, "$File::Find::name.$compr_ext";
+ system($compr_cmd, "$File::Find::name.$compr_ext") == 0
|| exit_error "Error decompressing $File::Find::name";
};
- find($bunzip_file, $dest_dir);
+ find($uncompress_file, $dest_dir);
my $manifest = -f 'updatev3.manifest' ? 'updatev3.manifest'
: 'updatev2.manifest';
my @lines = read_file($manifest) if -f $manifest;
@@ -208,8 +213,12 @@ sub create_incremental_mar {
};
return if $pm->start($finished_file);
my $tmpdir = get_tmpdir($config);
- extract_mar(mar_filename($config, $appname, $from_version, $os, $lang), "$tmpdir/A");
- extract_mar(mar_filename($config, $appname, $new_version, $os, $lang), "$tmpdir/B");
+ my $mar_c_from = get_config($config, $from_version, $os, 'mar_compression');
+ my $mar_c_new = get_config($config, $new_version, $os, 'mar_compression');
+ extract_mar(mar_filename($config, $appname, $from_version, $os, $lang),
+ "$tmpdir/A", $mar_c_from);
+ extract_mar(mar_filename($config, $appname, $new_version, $os, $lang),
+ "$tmpdir/B", $mar_c_new);
# bug 26054: make sure previous macOS version is code signed
if (($os eq 'osx64') && ! -f "$tmpdir/A/Contents/_CodeSignature/CodeResources") {
exit_error "Missing code signature in $from_version while creating $mar_file";
@@ -279,9 +288,11 @@ sub get_buildinfos {
foreach my $lang (keys %{$files->{$os}}) {
next unless $files->{$os}{$lang}{complete};
my $tmpdir = get_tmpdir($config);
+ my $mar_compression = get_config($config, $version, $os, 'mar_compression');
extract_mar(
mar_filename($config, $config->{appname_marfile}, $version, $os, $lang),
- "$tmpdir");
+ "$tmpdir",
+ $mar_compression);
my $appfile = "$tmpdir/application.ini" if -f "$tmpdir/application.ini";
$appfile = "$tmpdir/Contents/Resources/application.ini"
if -f "$tmpdir/Contents/Resources/application.ini";
1
0

[tor-browser-build/master] Pick up new Torbutton and TorLauncher tags
by gk@torproject.org 17 Aug '18
by gk@torproject.org 17 Aug '18
17 Aug '18
commit 6e159020d7121bf4e1a315592c060ba3d8678b41
Author: Georg Koppen <gk(a)torproject.org>
Date: Fri Aug 17 07:05:12 2018 +0000
Pick up new Torbutton and TorLauncher tags
---
rbm.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/rbm.conf b/rbm.conf
index 028f576..fe09b2d 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -16,7 +16,7 @@ buildconf:
var:
torbrowser_version: '8.0a10'
- torbrowser_build: 'build3'
+ torbrowser_build: 'build5'
torbrowser_incremental_from:
- 8.0a9
project_name: tor-browser
1
0

[tor-browser-build/master] Bump Torbutton and TorLauncher versions as well
by gk@torproject.org 17 Aug '18
by gk@torproject.org 17 Aug '18
17 Aug '18
commit b76357d6c719bae1c598475806d8a361eb8f8e65
Author: Georg Koppen <gk(a)torproject.org>
Date: Fri Aug 17 07:00:00 2018 +0000
Bump Torbutton and TorLauncher versions as well
---
projects/tor-launcher/config | 2 +-
projects/torbutton/config | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config
index 013b897..c0cf724 100644
--- a/projects/tor-launcher/config
+++ b/projects/tor-launcher/config
@@ -1,5 +1,5 @@
# vim: filetype=yaml sw=2
-version: 0.2.16.1
+version: 0.2.16.2
git_url: https://git.torproject.org/tor-launcher.git
git_hash: '[% c("version") %]'
gpg_keyring: torbutton.gpg
diff --git a/projects/torbutton/config b/projects/torbutton/config
index ba53944..4b26ca9 100644
--- a/projects/torbutton/config
+++ b/projects/torbutton/config
@@ -1,5 +1,5 @@
# vim: filetype=yaml sw=2
-version: 2.0.1
+version: 2.0.2
git_url: https://git.torproject.org/torbutton.git
git_hash: '[% c("version") %]'
gpg_keyring: torbutton.gpg
1
0

[tor-browser-build/master] Bug 27174: update keyring/torbrowser.gpg to add new subkey
by gk@torproject.org 17 Aug '18
by gk@torproject.org 17 Aug '18
17 Aug '18
commit 48ff98c88e3359cfd0490acc9a0346b3d0c5bd3a
Author: Nicolas Vigier <boklm(a)torproject.org>
Date: Thu Aug 16 23:17:10 2018 +0200
Bug 27174: update keyring/torbrowser.gpg to add new subkey
---
keyring/torbrowser.gpg | Bin 49267 -> 125669 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/keyring/torbrowser.gpg b/keyring/torbrowser.gpg
index dfdee06..4f19dd0 100644
Binary files a/keyring/torbrowser.gpg and b/keyring/torbrowser.gpg differ
1
0
commit 1584f48516deaa01a21c704f625ab7203d5d8ea7
Author: Georg Koppen <gk(a)torproject.org>
Date: Thu Aug 16 11:42:45 2018 +0000
Picking up changes for build3
Fixed missing items in Changelog, correct sha256sum for new NoScript
---
projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 2 ++
rbm.conf | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index cda434d..5970d71 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -23,6 +23,7 @@ Tor Browser 8.0a10 -- August 20 2018
* Bug 27082: Enable a limited UITour for user onboarding
* Bug 26961: New user onboarding
* Bug 14952: Enable HTTP2 and AltSvc
+ * Bug 25735: Tor Browser stalls while loading Facebook login page
* Bug 17252: Enable TLS session identifiers with first-party isolation
* Bug 26353: Prevent speculative connects that violate first-party isolation
* Bug 24056: Use en-US strings in HTML forms if locale is spoofed to english
@@ -137,6 +138,7 @@ Tor Browser 8.0a9 -- June 27 2018
* Bug 25894: Get a rust cross-compiler for Windows
* Bug 25554: Bump mingw-w64 version for ESR 60
* Bug 23561: Fix nsis builds for Windows 64
+ * Bug 13469: Windows installer is missing many languages from NSIS file
* Bug 23231: Remove our STL Wrappers workaround for Windows 64bit
* Bug 26370: Don't copy msvcr100.dll and libssp-0.dll twice
* Bug 26476: Work around Tor Browser crashes due to fix for bug 1467041
diff --git a/rbm.conf b/rbm.conf
index 57de6cc..028f576 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -16,7 +16,7 @@ buildconf:
var:
torbrowser_version: '8.0a10'
- torbrowser_build: 'build2'
+ torbrowser_build: 'build3'
torbrowser_incremental_from:
- 8.0a9
project_name: tor-browser
1
0

[tor-browser-build/master] Bump the NoScript sha256sum value as well
by gk@torproject.org 16 Aug '18
by gk@torproject.org 16 Aug '18
16 Aug '18
commit b9f89a7b1224659fda8c2030e261e4e270d7c239
Author: Georg Koppen <gk(a)torproject.org>
Date: Thu Aug 16 11:27:47 2018 +0000
Bump the NoScript sha256sum value as well
---
projects/tor-browser/config | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/projects/tor-browser/config b/projects/tor-browser/config
index 549df34..66dc989 100644
--- a/projects/tor-browser/config
+++ b/projects/tor-browser/config
@@ -69,7 +69,7 @@ input_files:
- filename: Bundle-Data
- URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit…
name: noscript
- sha256sum: d41f5d36337569d1a1633303d7d07505ab905efba0644e73edccf43edc0d39e0
+ sha256sum: fdc539412a61e6109b9fd331c90bd73faa787eefe1ee8d06b57dc3d906c541cd
- filename: 'RelativeLink/start-tor-browser.desktop'
enable: '[% c("var/linux") %]'
- filename: 'RelativeLink/execdesktop'
1
0

[tor-browser-build/master] Picking up tor-browser tag bump for build2
by gk@torproject.org 16 Aug '18
by gk@torproject.org 16 Aug '18
16 Aug '18
commit a8379c78e34dde020bbd3d123298ceff9e43bd13
Author: Georg Koppen <gk(a)torproject.org>
Date: Thu Aug 16 10:39:30 2018 +0000
Picking up tor-browser tag bump for build2
---
rbm.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/rbm.conf b/rbm.conf
index f0ea58e..57de6cc 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -16,7 +16,7 @@ buildconf:
var:
torbrowser_version: '8.0a10'
- torbrowser_build: 'build1'
+ torbrowser_build: 'build2'
torbrowser_incremental_from:
- 8.0a9
project_name: tor-browser
1
0
commit 9901f022a04ab63aa84e3d41736b66d45e524efd
Author: Georg Koppen <gk(a)torproject.org>
Date: Thu Aug 16 10:38:45 2018 +0000
Bump tor-browser tag as well
---
projects/firefox/config | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/projects/firefox/config b/projects/firefox/config
index 7546d24..2da425a 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -1,7 +1,7 @@
# vim: filetype=yaml sw=2
version: '[% c("abbrev") %]'
filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]'
-git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2'
+git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build3'
tag_gpg_id: 1
git_url: https://git.torproject.org/tor-browser.git
gpg_keyring: torbutton.gpg
1
0