November 2018 - tbb-commits - lists.torproject.org

[torbutton/master] Bug 28093: Update donation banner style to make it fit in small screens
by gk＠torproject.org 21 Nov '18

21 Nov '18

commit a41034ced7a6c0fe590320d9da61d15df1fef42f Author: Igor Oliveira <igt0(a)torproject.org> Date: Tue Nov 20 11:15:03 2018 -0200 Bug 28093: Update donation banner style to make it fit in small screens --- src/chrome/skin/aboutTor.css | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/src/chrome/skin/aboutTor.css b/src/chrome/skin/aboutTor.css index 60035a24..cf8290c9 100644 --- a/src/chrome/skin/aboutTor.css +++ b/src/chrome/skin/aboutTor.css @@ -431,3 +431,30 @@ body[mobile] .top .heading1 { font-size: 62px; line-height: 1.1 } + +body[mobile] #donation-banner { + position: static; +} + +body[mobile][show-donation-banner="true"] .torcontent-container, +body[mobile][show-donation-banner="true"] .onion-pattern-container { + transform: none; +} + +body[mobile][show-donation-banner="false"] .torcontent-container { + transform: translateY(-200px); +} + +@media only screen and (max-width: 480px) { + #donation-banner-image { + display: none; + } + + #donation-banner-lines { + align-items: stretch; + } + + #donation-banner-button { + text-align: center; + } +}

1 0

[torbutton/master] Bug 27111: Update about:tor desktop version to work on mobile
by gk＠torproject.org 21 Nov '18

21 Nov '18

commit 61deb44d0c07eb1ec1d71eac2f0a7aeca87ea054 Author: Igor Oliveira <igt0(a)torproject.org> Date: Wed Aug 29 07:31:26 2018 -0300 Bug 27111: Update about:tor desktop version to work on mobile Update torbutton, aboutTor(markup and styling) to work on mobile. --- src/chrome/content/aboutTor/aboutTor-content.js | 3 ++ src/chrome/content/aboutTor/aboutTor.xhtml | 2 ++ src/chrome/content/torbutton.js | 23 +++++++++++---- src/chrome/skin/aboutTor.css | 36 ++++++++++++++++++++++++ src/chrome/skin/torbrowser_mobile_logo.png | Bin 0 -> 9345 bytes 5 files changed, 59 insertions(+), 5 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor-content.js b/src/chrome/content/aboutTor/aboutTor-content.js index e8f5ffa2..d34bbe5c 100644 --- a/src/chrome/content/aboutTor/aboutTor-content.js +++ b/src/chrome/content/aboutTor/aboutTor-content.js @@ -119,6 +119,9 @@ var AboutTorListener = { else body.removeAttribute("showmanual"); + if (aData.mobile) + body.setAttribute("mobile", "yes"); + // Setting body.initialized="yes" displays the body. body.setAttribute("initialized", "yes"); }, diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index 9256748e..94dd13f3 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -18,6 +18,7 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> + <meta name="viewport" content="width=device-width, initial-scale=1"/> <title>&aboutTor.title;</title> <link rel="stylesheet" type="text/css" media="all" href="resource://torbutton-assets/aboutTor.css"/> @@ -73,6 +74,7 @@ window.addEventListener("pageshow", function() { </script> <div id="torstatus-version"/> <div class="torcontent-container"> + <img class="torcontent-logo" src="resource://torbutton-assets/torbrowser_mobile_logo.png"/> <div id="torstatus" class="top"> <div id="torstatus-on-container" class="hideIfTorOff torstatus-container"> <div class="heading1">&aboutTor.ready.label;</div> diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 90da5827..ee13f461 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -238,6 +238,10 @@ function torbutton_donation_banner_countdown() { } } +function torbutton_is_mobile() { + return Services.appinfo.OS === "Android"; +} + // Bug 1506 P2-P4: This code sets some version variables that are irrelevant. // It does read out some important environment variables, though. It is // called once per browser window.. This might belong in a component. @@ -408,11 +412,19 @@ function torbutton_init() { torbutton_update_toolbutton(); torbutton_notify_if_update_needed(); - createTorCircuitDisplay(m_tb_control_ipc_file, m_tb_control_host, - m_tb_control_port, m_tb_control_pass, - "extensions.torbutton.display_circuit"); + try { + createTorCircuitDisplay(m_tb_control_ipc_file, m_tb_control_host, + m_tb_control_port, m_tb_control_pass, + "extensions.torbutton.display_circuit"); + } catch(e) { + torbutton_log(4, "Error creating the tor circuit display " + e); + } - torbutton_init_user_manual_links(); + try { + torbutton_init_user_manual_links(); + } catch(e) { + torbutton_log(4, "Error loading the user manual " + e); + } // Arrange for our about:tor content script to be loaded in each frame. window.messageManager.loadFrameScript( @@ -449,6 +461,7 @@ var torbutton_abouttor_message_handler = { // not working. get chromeData() { return { + mobile: torbutton_is_mobile(), torOn: torbutton_tor_check_ok() }; } @@ -1932,7 +1945,7 @@ function showSecurityPreferencesPanel(chromeWindow) { } function setupPreferencesForMobile() { - if (Services.appinfo.OS !== "Android") { + if (!torbutton_is_mobile()) { return; } diff --git a/src/chrome/skin/aboutTor.css b/src/chrome/skin/aboutTor.css index 9f195cfd..60035a24 100644 --- a/src/chrome/skin/aboutTor.css +++ b/src/chrome/skin/aboutTor.css @@ -199,6 +199,8 @@ body:not([showmanual]) .showForManual { width: 100%; max-width: 2200px; /* room for our 20 circles */ overflow: hidden; + position: absolute; + bottom: 0px; } .onion-pattern-row { @@ -395,3 +397,37 @@ body[show-donation-banner="true"] #onboarding-overlay-button { transition: transform 0ms; position: absolute; } + +/* + * Mobile specific css + */ + +.torcontent-logo { + display: none; +} + +body[mobile] #torstatus-version, +body[mobile] .searchbox, +body[mobile] .top .heading2, +body[mobile] #bottom { + display: none; +} + +body[mobile] .top { + white-space: normal; + margin-top: 0px !important; +} + +body[mobile] .torcontent-logo { + display: block; + margin-top: 20px; + width: 50%; + height: auto; + margin-left: auto; + margin-right: auto; +} + +body[mobile] .top .heading1 { + font-size: 62px; + line-height: 1.1 +} diff --git a/src/chrome/skin/torbrowser_mobile_logo.png b/src/chrome/skin/torbrowser_mobile_logo.png new file mode 100644 index 00000000..9d8317f0 Binary files /dev/null and b/src/chrome/skin/torbrowser_mobile_logo.png differ

1 0

[tor-browser-build/master] Bug 28476: Enable android nightly builds
by boklm＠torproject.org 21 Nov '18

21 Nov '18

commit 80d0df6b8936729b26544cdb4535b5d1001feaf6 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Nov 21 12:02:39 2018 +0100 Bug 28476: Enable android nightly builds Update testsuite_git_commit to enable android nightly builds. --- tools/ansible/roles/tbb-nightly-build/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ansible/roles/tbb-nightly-build/defaults/main.yml b/tools/ansible/roles/tbb-nightly-build/defaults/main.yml index af7e03d..5f04029 100644 --- a/tools/ansible/roles/tbb-nightly-build/defaults/main.yml +++ b/tools/ansible/roles/tbb-nightly-build/defaults/main.yml @@ -5,7 +5,7 @@ nightly_build_cron_minute: 20 nightly_build_keep_builds: 2 testsuite_dir: "/home/{{ nightly_build_user }}/tbb-testsuite" testsuite_git_url: https://git.torproject.org/user/boklm/tor-browser-bundle-testsuite.git -testsuite_git_commit: 348ad855711382089c4fbf1badfec58e31a6c148 +testsuite_git_commit: 7b0dcd9f21bfde6b097b687c63f84fa579296804 nightly_build_wwwdir: "/home/{{ nightly_build_user }}/www" nightly_build_nginx_enable: true nightly_build_nginx_listen: 127.0.0.1:80

1 0

[torbutton/master] Bug 28540: New text for 2018 donation banner
by gk＠torproject.org 21 Nov '18

21 Nov '18

commit 1503b5e151cd8bb528f143f5fdf4513791d3f10f Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Nov 20 13:52:47 2018 -0800 Bug 28540: New text for 2018 donation banner --- src/chrome/locale/en-US/aboutTor.dtd | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/chrome/locale/en-US/aboutTor.dtd b/src/chrome/locale/en-US/aboutTor.dtd index 6efb202e..a36d812c 100644 --- a/src/chrome/locale/en-US/aboutTor.dtd +++ b/src/chrome/locale/en-US/aboutTor.dtd @@ -35,8 +35,13 @@ <!ENTITY aboutTor.donationBanner.line2d "Protect the privacy of millions."> <!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> <!ENTITY aboutTor.donationBanner.line2f "We need your support!"> +<!ENTITY aboutTor.donationBanner.line2g "Support internet freedom."> +<!ENTITY aboutTor.donationBanner.line2h "Defend the open web."> +<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online."> +<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019."> <!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match your donation."> +<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice as strong."> <!ENTITY aboutTor.donationBanner.buttonA "Donate Now"> <!ENTITY aboutTor.donationBanner.buttonB "Count Me In">

1 0

[tor-browser-build/master] Bug 28472: Add Android Makefile Rules
by gk＠torproject.org 20 Nov '18

20 Nov '18

commit 836a8b56606978fa7a140cfd1a9d9ddb6b2e41e2 Author: sisbell <shane.isbell(a)gmail.com> Date: Thu Nov 15 20:27:38 2018 -0800 Bug 28472: Add Android Makefile Rules --- Makefile | 15 +++++++++++++++ projects/release/build | 4 ++++ projects/release/config | 11 +++++++++++ 3 files changed, 30 insertions(+) diff --git a/Makefile b/Makefile index 4c21a83..8ec5d0c 100644 --- a/Makefile +++ b/Makefile @@ -5,6 +5,9 @@ all: release release: submodule-update $(rbm) build release --target release --target torbrowser-all +release-android-armv7: submodule-update + $(rbm) build release --target release --target torbrowser-android-armv7 + release-linux-x86_64: submodule-update $(rbm) build release --target release --target torbrowser-linux-x86_64 @@ -26,6 +29,9 @@ release-osx-x86_64: submodule-update alpha: submodule-update $(rbm) build release --target alpha --target torbrowser-all +alpha-android-armv7: submodule-update + $(rbm) build release --target alpha --target torbrowser-android-armv7 + alpha-linux-x86_64: submodule-update $(rbm) build release --target alpha --target torbrowser-linux-x86_64 @@ -47,6 +53,9 @@ alpha-osx-x86_64: submodule-update nightly: submodule-update $(rbm) build release --target nightly --target torbrowser-all +nightly-android-armv7: submodule-update + $(rbm) build release --target nightly --target torbrowser-android-armv7 + nightly-linux-x86_64: submodule-update $(rbm) build release --target nightly --target torbrowser-linux-x86_64 @@ -68,6 +77,9 @@ nightly-osx-x86_64: submodule-update alpha_nightly: submodule-update $(rbm) build release --target alpha_nightly --target torbrowser-all +alpha_nightly-android-armv7: submodule-update + $(rbm) build release --target alpha_nightly --target torbrowser-android-armv7 + alpha_nightly-linux-x86_64: submodule-update $(rbm) build release --target alpha_nightly --target torbrowser-linux-x86_64 @@ -86,6 +98,9 @@ alpha_nightly-osx-x86_64: submodule-update testbuild: submodule-update $(rbm) build release --target testbuild --target torbrowser-all +testbuild-android-armv7: submodule-update + $(rbm) build release --target testbuild --target torbrowser-android-armv7 + testbuild-linux-x86_64: submodule-update $(rbm) build release --target testbuild --target torbrowser-linux-x86_64 diff --git a/projects/release/build b/projects/release/build index 882d26d..2c9912f 100644 --- a/projects/release/build +++ b/projects/release/build @@ -4,6 +4,10 @@ [% IF ENV.HOME %]export HOME="[% ENV.HOME %]"[% END %] destdir="[% dest_dir _ '/' _ c("var/publish_dir") %]" mkdir -p "$destdir" +[% IF c("var/torbrowser-android-armv7") -%] + mv [% c('input_files_by_name/android-armv7') %]/* "$destdir"/ + [% RETURN %] +[% END -%] [% IF c("var/torbrowser-windows-i686") -%] mv [% c('input_files_by_name/windows-i686') %]/* "$destdir"/ mv [% c('input_files_by_name/windows-expert-bundle') %]/* "$destdir"/ diff --git a/projects/release/config b/projects/release/config index 8605aa2..65e297d 100644 --- a/projects/release/config +++ b/projects/release/config @@ -14,6 +14,10 @@ targets: - torbrowser-windows-i686 - torbrowser-windows-x86_64 - torbrowser-osx-x86_64 + - torbrowser-android-armv7 + torbrowser-android-armv7: + var: + torbrowser-android-armv7: 1 torbrowser-linux-x86_64: var: torbrowser-linux-x86_64: 1 @@ -80,6 +84,13 @@ targets: input_files: # Release + - name: android-armv7 + project: tor-browser + enable: '[% c("var/torbrowser-android-armv7") %]' + target: + - '[% c("var/build_target") %]' + - torbrowser-android-armv7 + - name: linux-x86_64 project: tor-browser enable: '[% c("var/torbrowser-linux-x86_64") %]'

1 0

[tor-browser-build/master] Bug 28144: Update projects/tor-browser for Android
by gk＠torproject.org 20 Nov '18

20 Nov '18

commit 6028be7e4b62d6ab419258dc3237e395f1dc34e6 Author: sisbell <shane.isbell(a)gmail.com> Date: Tue Nov 6 17:54:05 2018 -0800 Bug 28144: Update projects/tor-browser for Android --- projects/tor-browser/build.android | 18 ++++++++++++++++++ projects/tor-browser/config | 15 ++++++++++++++- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/projects/tor-browser/build.android b/projects/tor-browser/build.android new file mode 100644 index 0000000..24bdc70 --- /dev/null +++ b/projects/tor-browser/build.android @@ -0,0 +1,18 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +ext_dir=assets/distribution/extensions +qa_apk=[% dest_dir %]/[% c('filename') %]/tor-browser-[% c("version") %]-[% c("var/osname") %]-qa.apk +apk=$rootdir/[% c('input_files_by_name/firefox') %]/tor-browser-unsigned-unaligned.apk + +mkdir -p /var/tmp/build/$ext_dir [% dest_dir _ '/' _ c('filename') %] +cd /var/tmp/build + +mv $rootdir/[% c('input_files_by_name/https-everywhere') %] $ext_dir/https-everywhere-eff(a)eff.org.xpi +mv $rootdir/[% c('input_files_by_name/noscript') %] $ext_dir/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi + +zip -d $apk META-INF/\* +zip -r $apk $ext_dir + +# Sign a QA build. This apk is not a debug version and doesn't contain a debug flag in the manifest +keytool -genkey -v -keystore qa.keystore -storepass android -alias androidqakey -keypass android -keyalg RSA -keysize 2048 -validity 10000 -dname "CN=Android Tor QA,O=Tor,C=US" +jarsigner -verbose -digestalg SHA1 -sigalg MD5withRSA -keystore qa.keystore -signedjar $qa_apk $apk androidqakey -storepass android -keypass android diff --git a/projects/tor-browser/config b/projects/tor-browser/config index bb1c259..e4e3a03 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -41,29 +41,41 @@ targets: windows-x86_64: var: mar_osname: win64 + android-armv7: + build: '[% INCLUDE build.android %]' + var: + arch_deps: + - openjdk-8-jdk input_files: - project: container-image - filename: run_scripts + enable: '[% ! c("var/android") %]' - project: firefox name: firefox - project: tor name: tor + enable: '[% ! c("var/android") %]' - project: firefox-langpacks name: firefox-langpacks - enable: '[% c("var/locales").size %]' + enable: '[% c("var/locales").size && ! c("var/android") %]' - project: tor-launcher name: tor-launcher + enable: '[% ! c("var/android") %]' - project: torbutton name: torbutton + enable: '[% ! c("var/android") %]' - project: https-everywhere name: https-everywhere - project: fonts name: fonts + enable: '[% ! c("var/android") %]' - project: meek name: meek + enable: '[% ! c("var/android") %]' - project: obfs4 name: obfs4 + enable: '[% ! c("var/android") %]' - project: fteproxy name: fteproxy enable: '[% c("var/fteproxy") %]' @@ -71,6 +83,7 @@ input_files: name: snowflake enable: '[% c("var/snowflake") %]' - filename: Bundle-Data + enable: '[% ! c("var/android") %]' - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript sha256sum: e7ec0345c2174e64c7552ab708a59c8efd7c1078fedda64d9c9ad06a899194b9

1 0

[tor-browser-build/master] Bug 28483: Modify Android Toolchain API Version
by gk＠torproject.org 20 Nov '18

20 Nov '18

commit d66abd6cb81944bb24f9ec4255a5311bdebf58da Author: sisbell <shane.isbell(a)gmail.com> Date: Fri Nov 16 12:17:26 2018 -0800 Bug 28483: Modify Android Toolchain API Version --- projects/android-toolchain/build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/projects/android-toolchain/build b/projects/android-toolchain/build index 325a543..a9d3139 100644 --- a/projects/android-toolchain/build +++ b/projects/android-toolchain/build @@ -17,7 +17,8 @@ unzip -qq [% c("input_files_by_name/gradle_bin") %] -d $GRADLE_HOME cd $NDK_HOME mv android-ndk-r15c/* . rm -fR android-ndk-r15c -./build/tools/make_standalone_toolchain.py --api 26 --arch arm --install-dir=./arm +# API 16 is the minimum we currently support for Tor Browser on Android +./build/tools/make_standalone_toolchain.py --api 16 --arch arm --install-dir=./arm # Tool Archives cd $SDK_HOME

1 0

[tor-browser-build/master] Bug 28468: Modify Android toolchain to support Orbot
by gk＠torproject.org 20 Nov '18

20 Nov '18

commit 5e3b6403e384198f0f85c482777970340333bc5a Author: sisbell <shane.isbell(a)gmail.com> Date: Fri Nov 16 12:18:52 2018 -0800 Bug 28468: Modify Android toolchain to support Orbot --- projects/android-toolchain/config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/projects/android-toolchain/config b/projects/android-toolchain/config index 122ae5f..c14f90e 100644 --- a/projects/android-toolchain/config +++ b/projects/android-toolchain/config @@ -13,6 +13,8 @@ var: export ANDROID_SDK_HOME=/var/tmp/dist/[% project %]/android-sdk-linux export ANDROID_NDK_HOME=/var/tmp/dist/[% project %]/android-ndk export GRADLE_HOME=/var/tmp/dist/[% project %]/gradle + export ANDROID_HOME=$ANDROID_SDK_HOME + export GRADLE_USER_HOME=$GRADLE_HOME google_repo: https://dl.google.com/android/repository input_files: - project: container-image

1 0

[torbutton/master] Translations updates
by gk＠torproject.org 20 Nov '18

20 Nov '18

commit 50d2baa2788db45036b7f614ec21ce2dbcb53b7e Author: Georg Koppen <gk(a)torproject.org> Date: Tue Nov 20 09:29:37 2018 +0000 Translations updates --- src/chrome/locale/fa/aboutTor.dtd | 2 +- src/chrome/locale/fa/browserOnboarding.properties | 16 ++++++++-------- src/chrome/locale/fa/torbutton.properties | 4 ++-- src/chrome/locale/ja/torbutton.dtd | 4 ++-- src/chrome/locale/ka/aboutTor.dtd | 2 +- src/chrome/locale/sv/aboutTBUpdate.dtd | 2 +- src/chrome/locale/sv/aboutTor.dtd | 4 ++-- src/chrome/locale/sv/brand.dtd | 6 +++--- src/chrome/locale/sv/brand.properties | 6 +++--- src/chrome/locale/sv/browserOnboarding.properties | 6 +++--- src/chrome/locale/sv/torbutton.dtd | 4 ++-- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/chrome/locale/fa/aboutTor.dtd b/src/chrome/locale/fa/aboutTor.dtd index be1440b7..da917341 100644 --- a/src/chrome/locale/fa/aboutTor.dtd +++ b/src/chrome/locale/fa/aboutTor.dtd @@ -7,7 +7,7 @@ <!ENTITY aboutTor.title "درباره‌ی تور"> <!ENTITY aboutTor.ready.label "کاوش. خصوصی."> -<!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 "تور با این مرورگر کار نمی‌کند."> diff --git a/src/chrome/locale/fa/browserOnboarding.properties b/src/chrome/locale/fa/browserOnboarding.properties index e0ab4338..2dcbded9 100644 --- a/src/chrome/locale/fa/browserOnboarding.properties +++ b/src/chrome/locale/fa/browserOnboarding.properties @@ -3,14 +3,14 @@ # vim: set sw=2 sts=2 ts=8 et: 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’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-welcome.title=شما آماده هستید. +onboarding.tour-tor-welcome.description=مرورگر تور در هنگام مرورگری وب بالاترین استاندارد در حریم شخصی و امنیت را به شما ارائه می‌دهد. شما حالا در برابر ردیابی, زیرنظر داشتن و سانسور محافظت می‌شوید. چگونگی این امر توسط این پذیرش سازمانی سریع به شما نشان داده خواهد شد. +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 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-privacy.button=به شبکه تور برو onboarding.tour-tor-network=Tor Network onboarding.tour-tor-network.title=Travel a decentralized network. @@ -30,7 +30,7 @@ onboarding.tour-tor-security.button=Review Settings onboarding.tour-tor-expect-differences=Experience Tips onboarding.tour-tor-expect-differences.title=Expect some differences. onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot. -onboarding.tour-tor-expect-differences.button=See FAQs +onboarding.tour-tor-expect-differences.button=مشاهده پرسشگان onboarding.tour-tor-onion-services=خدمات پیازی onboarding.tour-tor-onion-services.title=Be extra protected. @@ -40,9 +40,9 @@ 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.one-of-three=۱ از ۳ +onboarding.tor-circuit-display.two-of-three=۲ از ۳ +onboarding.tor-circuit-display.three-of-three=۳ از ۳ 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. diff --git a/src/chrome/locale/fa/torbutton.properties b/src/chrome/locale/fa/torbutton.properties index a239e685..3f90df0c 100644 --- a/src/chrome/locale/fa/torbutton.properties +++ b/src/chrome/locale/fa/torbutton.properties @@ -5,7 +5,7 @@ torbutton.circuit_display.this_browser = این مرورگر torbutton.circuit_display.relay = بازپخش torbutton.circuit_display.tor_bridge = پل torbutton.circuit_display.unknown_country = کشور ناشناخته -torbutton.circuit_display.guard = Guard +torbutton.circuit_display.guard = محافظ torbutton.circuit_display.guard_note = Your [Guard] node may not change. torbutton.circuit_display.learn_more = اطلاعات بیشتر torbutton.content_sizer.margin_tooltip = مرورگر Tor اضافه می کند این حاشیه را به عرض و ارتفاع پنجره شما که کمتر مشخص شود، و در نتیجه باعث کاهش توانایی به ردیابی آنلاین شما شود. @@ -52,4 +52,4 @@ profileMigrationFailed=مهاجرت ناموفق از پروفایل %S.\nتنظ # .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_OnionEncryption=ارتباط رمزگذاری شد (سرویس پیازی) diff --git a/src/chrome/locale/ja/torbutton.dtd b/src/chrome/locale/ja/torbutton.dtd index 359dcf48..65368394 100644 --- a/src/chrome/locale/ja/torbutton.dtd +++ b/src/chrome/locale/ja/torbutton.dtd @@ -47,5 +47,5 @@ <!ENTITY torbutton.prefs.sec_limit_typography "いくつかのフォントと数学記号が無効化されます。"> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "いくつかのアイコン、数学記号および画像が無効化されます。"> <!ENTITY torbutton.prefs.sec_click_to_play_media "オーディオとビデオ(HTML5メディア)はクリックすると再生されます。"> -<!ENTITY torbutton.circuit_display.title "Tor Circuit"> -<!ENTITY torbutton.circuit_display.new_circuit "New Circuit for this Site"> +<!ENTITY torbutton.circuit_display.title "Tor サーキット"> +<!ENTITY torbutton.circuit_display.new_circuit "このサイトに新しいサーキットを使用する"> diff --git a/src/chrome/locale/ka/aboutTor.dtd b/src/chrome/locale/ka/aboutTor.dtd index f232c0ba..f6b9dd76 100644 --- a/src/chrome/locale/ka/aboutTor.dtd +++ b/src/chrome/locale/ka/aboutTor.dtd @@ -20,7 +20,7 @@ <!ENTITY aboutTor.torbrowser_user_manual.accesskey "ხ"> <!ENTITY aboutTor.torbrowser_user_manual.label "Tor-ბრაუზერის სახელმძღვანელო"> -<!ENTITY aboutTor.tor_mission.label "Tor-პროექტი წარმოადგენს 501(c)(3) არამომგებიან ორგანიზაციას, რომელიც ხელს უწყობს ადამიანის უფლებების დაცვისა და თავისუფლების ხარისხის გაუმჯობესებას, უფასო და ღია წყაროს მქონე, ვინაობისა და პირადი მონაცემების გამჟღავნებისგან დაცული ტექნოლოგიების შექმნითა და შემუშავებით, მათთან შეუზღუდავი წვდომისა და გამოყენების უზრუნველყოფით, შემდგომი კვლევებითა და მუშაობით , საზოგადოების ცნობიერების დონის ასამაღლებლად."> +<!ENTITY aboutTor.tor_mission.label "Tor-პროექტი წარმოადგენს 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/sv/aboutTBUpdate.dtd b/src/chrome/locale/sv/aboutTBUpdate.dtd index 7b757280..781f545a 100644 --- a/src/chrome/locale/sv/aboutTBUpdate.dtd +++ b/src/chrome/locale/sv/aboutTBUpdate.dtd @@ -1,5 +1,5 @@ <!ENTITY aboutTBUpdate.title "Tor Browser-uppdatering"> -<!ENTITY aboutTBUpdate.updated "Tor-webbläsaren har uppdaterats."> +<!ENTITY aboutTBUpdate.updated "Tor Browser har uppdaterats."> <!ENTITY aboutTBUpdate.linkPrefix "För den senaste information om den här versionen,"> <!ENTITY aboutTBUpdate.linkLabel "besök vår hemsida"> <!ENTITY aboutTBUpdate.linkSuffix "."> diff --git a/src/chrome/locale/sv/aboutTor.dtd b/src/chrome/locale/sv/aboutTor.dtd index 76dcfa01..110322e4 100644 --- a/src/chrome/locale/sv/aboutTor.dtd +++ b/src/chrome/locale/sv/aboutTor.dtd @@ -15,10 +15,10 @@ <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com"> <!ENTITY aboutTor.torbrowser_user_manual_questions.label "Frågor?"> -<!ENTITY aboutTor.torbrowser_user_manual_link.label "Kolla in bruksanvisning för Tor-webbläsaren »"> +<!ENTITY aboutTor.torbrowser_user_manual_link.label "Kolla in bruksanvisning för Tor Browser »">  <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M"> -<!ENTITY aboutTor.torbrowser_user_manual.label "Bruksanvisning för Tor-webbläsaren"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Bruksanvisning för Tor Browser"> <!ENTITY aboutTor.tor_mission.label "Tor-projektet är en amerikansk 501(c)(3) ideell organisation som främjar mänskliga rättigheter och friheter genom att skapa och distribuera anonymitets- och sekretessteknik med fri och öppen källkod, stödja deras obegränsade tillgänglighet och användning och främja deras vetenskapliga och populära förståelse."> <!ENTITY aboutTor.getInvolved.label "Engagera dig »"> diff --git a/src/chrome/locale/sv/brand.dtd b/src/chrome/locale/sv/brand.dtd index 43a95e12..797bdb92 100644 --- a/src/chrome/locale/sv/brand.dtd +++ b/src/chrome/locale/sv/brand.dtd @@ -2,9 +2,9 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShorterName "Tor-webbläsaren"> -<!ENTITY brandShortName "Tor-webbläsaren"> -<!ENTITY brandFullName "Tor-webbläsare"> +<!ENTITY brandShorterName "Tor Browser"> +<!ENTITY brandShortName "Tor Browser"> +<!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor-projektet"> <!ENTITY trademarkInfo.part1 "Firefox och Firefox-logotyperna är varumärken som tillhör Mozilla Foundation."> diff --git a/src/chrome/locale/sv/brand.properties b/src/chrome/locale/sv/brand.properties index 7c215e54..555e01e6 100644 --- a/src/chrome/locale/sv/brand.properties +++ b/src/chrome/locale/sv/brand.properties @@ -2,9 +2,9 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShorterName=Tor webbläsaren -brandShortName=Tor webbläsaren -brandFullName=Tor webbläsaren +brandShorterName=Tor Browser +brandShortName=Tor Browser +brandFullName=Tor Browser vendorShortName=Tor-projektet homePageSingleStartMain=Firefox Start, en snabb hemsida med inbyggd sökfunktion diff --git a/src/chrome/locale/sv/browserOnboarding.properties b/src/chrome/locale/sv/browserOnboarding.properties index 779564db..8cc7e3f1 100644 --- a/src/chrome/locale/sv/browserOnboarding.properties +++ b/src/chrome/locale/sv/browserOnboarding.properties @@ -4,17 +4,17 @@ onboarding.tour-tor-welcome=Välkommen onboarding.tour-tor-welcome.title=Du är redo. -onboarding.tour-tor-welcome.description=Tor-webbläsaren erbjuder högsta standard för integritet och säkerhet när du surfar på webben. Du är nu skyddad mot spårning, övervakning och censur. Denna snabba introduktion kommer att visa dig hur. +onboarding.tour-tor-welcome.description=Tor Browser erbjuder högsta standard för integritet och säkerhet när du surfar på webben. Du är nu skyddad mot spårning, övervakning och censur. Denna snabba introduktion kommer att visa dig hur. onboarding.tour-tor-welcome.button=Börja nu onboarding.tour-tor-privacy=Sekretess onboarding.tour-tor-privacy.title=Avvisa bevakare och snokare. -onboarding.tour-tor-privacy.description=Tor-webbläsaren isolerar kakor och tar bort din webbläsarhistorik efter din session. Dessa ändringar säkerställa din integritet och säkerhet skyddas i webbläsaren. Klicka på "Tor-nätverk" för att lära dig hur vi skyddar dig på nätverksnivå. +onboarding.tour-tor-privacy.description=Tor Browser isolerar kakor och tar bort din webbläsarhistorik efter din session. Dessa ändringar säkerställa din integritet och säkerhet skyddas i webbläsaren. Klicka på "Tor-nätverk" för att lära dig hur vi skyddar dig på nätverksnivå. onboarding.tour-tor-privacy.button=Gå till Tor-nätverket onboarding.tour-tor-network=Tor-nätverk onboarding.tour-tor-network.title=Res ett decentraliserat nätverk. -onboarding.tour-tor-network.description=Tor-webbläsaren ansluter dig till Tor-nätverket som drivs av tusentals volontärer runt om i världen. Till skillnad från en VPN, det finns ingen punkt av misslyckande eller centraliserad enhet du behöver lita på för att njuta av internet privat. +onboarding.tour-tor-network.description=Tor Browser ansluter dig till Tor-nätverket som drivs av tusentals volontärer runt om i världen. Till skillnad från en VPN, det finns ingen punkt av misslyckande eller centraliserad enhet du behöver lita på för att njuta av internet privat. onboarding.tour-tor-network.button=Gå till kretsvisning onboarding.tour-tor-circuit-display=Kretsvisning diff --git a/src/chrome/locale/sv/torbutton.dtd b/src/chrome/locale/sv/torbutton.dtd index 4bbc35a8..067b45b3 100644 --- a/src/chrome/locale/sv/torbutton.dtd +++ b/src/chrome/locale/sv/torbutton.dtd @@ -6,12 +6,12 @@ <!ENTITY torbutton.context_menu.preferences.key "S"> <!ENTITY torbutton.context_menu.networksettings "Tor-nätverksinställningar..."> <!ENTITY torbutton.context_menu.networksettings.key "N"> -<!ENTITY torbutton.context_menu.downloadUpdate "Sök efter uppdateringar för Tor webbläsare..."> +<!ENTITY torbutton.context_menu.downloadUpdate "Sök efter uppdateringar för Tor Browser..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Skydd mot Cookies..."> <!ENTITY torbutton.context_menu.cookieProtections.key "S"> <!ENTITY torbutton.button.tooltip "Klicka för att initialisera Torbutton"> -<!ENTITY torbutton.prefs.security_settings "Tor-webbläsares säkerhetsinställningar"> +<!ENTITY torbutton.prefs.security_settings "Säkerhetsinställningar i Tor Browser"> <!ENTITY torbutton.prefs.restore_defaults "Återställ standard"> <!ENTITY torbutton.prefs.custom_warning "Dina anpassade webbläsarinställningar har resulterat i ovanliga säkerhetsinställningar. Av säkerhets- och integritetsskäl rekommenderar vi att du använder en av de fördefinierade säkerhetsnivåerna."> <!ENTITY torbutton.cookiedialog.title "Hantera Cookies skydd">

1 0

[torbutton/master] Bug 27701 - Don't show App Blocker on Android
by gk＠torproject.org 20 Nov '18

20 Nov '18

commit 82729ba49f026a03966adb75b6b7737d71579967 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Mon Nov 19 17:12:03 2018 +0000 Bug 27701 - Don't show App Blocker on Android --- src/modules/default-prefs.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/modules/default-prefs.js b/src/modules/default-prefs.js index d4c948f8..6a2bd86c 100644 --- a/src/modules/default-prefs.js +++ b/src/modules/default-prefs.js @@ -21,6 +21,12 @@ function ensureDefaultPrefs () { Services.console.logStringMessage( `Preference ${aPrefName} with value ${aValue} has an invalid value type`); } + + // Disable the External App Blocker on Android + if ((aPrefName === "extensions.torbutton.launch_warning") && + (Services.appinfo.OS === "Android")) { + defaultPrefBranch.setBoolPref(aPrefName, false); + } } }; Services.scriptloader.loadSubScript(kDefaultPreferences, context);

1 0