- tor-commits - lists.torproject.org

[translation/donatepages-messagespot] https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
by translation＠torproject.org 29 May '20

29 May '20

commit 08596a5e3e26af46ac51b7d3fcdc9f134fcc4e02 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 29 21:15:40 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=donatepages-message… --- locale/mr/LC_MESSAGES/messages.po | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/locale/mr/LC_MESSAGES/messages.po b/locale/mr/LC_MESSAGES/messages.po index 5006b8d376..d714229a45 100644 --- a/locale/mr/LC_MESSAGES/messages.po +++ b/locale/mr/LC_MESSAGES/messages.po @@ -1,9 +1,11 @@ +# # Translators: # erinm, 2019 +# vinay bichave <vinaybichave4(a)gmail.com>, 2020 # msgid "" msgstr "" -"Last-Translator: erinm, 2019\n" +"Last-Translator: vinay bichave <vinaybichave4(a)gmail.com>, 2020\n" "Language-Team: Marathi (https://www.transifex.com/otf/teams/1519/mr/)\n" "Language: mr\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -277,7 +279,7 @@ msgstr "S" #: tmp/cache_locale/eb/eb66db0fc2349cdc00200df1ba86814695c5deb02dc0f5941de0ada2f44eb52b.php:96 #: tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:78 msgid "M" -msgstr "" +msgstr "म " #: tmp/cache_locale/eb/eb66db0fc2349cdc00200df1ba86814695c5deb02dc0f5941de0ada2f44eb52b.php:100 #: tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:82 @@ -766,7 +768,7 @@ msgstr "" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:443 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:446 msgid "Donate" -msgstr "" +msgstr "दान " #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:453 msgid "Gift Selected" @@ -1031,6 +1033,10 @@ msgid "" " and privacy technologies, supporting their unrestricted availability and " "use, and furthering their scientific and popular understanding." msgstr "" +"टोर हा प्रकल्प यू. एस 501 (क)(३) विना - नफा संस्था आहे जी मुक्त आणि मुक्त " +"स्त्रोत निनावीपणा आणि गोपनीयताचा तंत्रज्ञान तयार आणि तैनात करून, त्यांच्या " +"प्रतिबंधित उपलब्धता आणि वापरास समर्थन देऊन आणि त्यांचे वैज्ञानिक आणि " +"लोकप्रिय समजुती पुढे आणून मानवी हक्क आणि स्वातंत्र्यांसाठी प्रगती करणे." #: tmp/cache_locale/92/92eb639bc328f3dd569fa22b60c4360b6fe38f1a4cd80a14fce862d91bd765cb.php:49 #: tmp/cache_locale/2d/2d5f07aeb16acd7bb0a8dd355b13f59678a1f0ba6ea2b3d9dec8d2b5dcfbfde5.php:31 @@ -1073,7 +1079,7 @@ msgstr "" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:64 #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:44 msgid "Questions?" -msgstr "" +msgstr "प्रश्न?" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:80 #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:59 @@ -2373,7 +2379,7 @@ msgstr "" #: tmp/cache_locale/6c/6cd01cfbd4684dcca4eada963c78b5d694a2f40cd309be9366b080c410b3c5a0.php:92 #: tmp/cache_locale/0d/0de73852fd4b6afe8a4f069f907a5e1e93a3159f5ffaddbf485db43dd4ce3a8a.php:71 msgid "Donate Now" -msgstr "" +msgstr "दान करा " #: tmp/cache_locale/66/666e9197f427d70c0743bcdae2c3e34f41f9d7acf2b2dddb2c21c21723e73d10.php:52 #: tmp/cache_locale/66/666e9197f427d70c0743bcdae2c3e34f41f9d7acf2b2dddb2c21c21723e73d10.php:75

1 0

[translation/abouttor-homepage] https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage
by translation＠torproject.org 29 May '20

29 May '20

commit 5a33286bad97327220b9647ad0ff1717f6f81e54 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 29 21:15:05 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage --- mr/aboutTor.dtd | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/mr/aboutTor.dtd b/mr/aboutTor.dtd new file mode 100644 index 0000000000..199b1cb8b7 --- /dev/null +++ b/mr/aboutTor.dtd @@ -0,0 +1,31 @@ + + +<!ENTITY aboutTor.title "टोर बद्दल"> + +<!ENTITY aboutTor.viewChangelog.label "बदललेला लॉग पहा "> + +<!ENTITY aboutTor.ready.label "खसगिरीत्या अन्वेषण"> +<!ENTITY aboutTor.ready2.label "तुम्ही तय्यार आहात जगातील सर्वात खासगी ब्राउझिंग अनुभवा साठी "> +<!ENTITY aboutTor.failure.label "काहीतरी चुकलं!"> +<!ENTITY aboutTor.failure2.label "टोर ह्या ब्राउझर मध्ये नाही चालत आहे "> + +<!ENTITY aboutTor.search.label "'डक डक गो' ने शोधा "> +<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com"> + +<!ENTITY aboutTor.torbrowser_user_manual_questions.label "प्रश्न?"> +<!ENTITY aboutTor.torbrowser_user_manual_link.label "आमच्या टोर ब्राउझर मॅन्युअल पहा "> + +<!ENTITY aboutTor.torbrowser_user_manual.accesskey "म "> +<!ENTITY aboutTor.torbrowser_user_manual.label "टोर ब्राउझर मॅन्युअल"> + +<!ENTITY aboutTor.tor_mission.label "टोर हा प्रकल्प यू. एस 501(क)(3) विना - नफा संस्था आहे जी मुक्त आणि मुक्त स्त्रोत निनावीपणा आणि गोपनीयताचा तंत्रज्ञान तयार आणि तैनात करून, त्यांच्या प्रतिबंधित उपलब्धता आणि वापरास समर्थन देऊन आणि त्यांचे वैज्ञानिक आणि लोकप्रिय समजुती पुढे आणून मानवी हक्क आणि स्वातंत्र्यांसाठी प्रगती करणे."> +<!ENTITY aboutTor.getInvolved.label "सारभागी हव्या "> + +<!ENTITY aboutTor.newsletter.tagline "टोर बद्दल नवीन बातम्या मिरवा थेट तुमच्या इनबॉक्स मध्ये "> +<!ENTITY aboutTor.newsletter.link_text "टोर च्या बातम्यांसाठी साइन उप करा "> +<!ENTITY aboutTor.donationBanner.freeToUse "टोर ही एक मोफत सेवा आहे तुमच्या देणगी मुळे "> +<!ENTITY aboutTor.donationBanner.buttonA "दान करा ">

1 0

[tor-browser-build/master] Bug 30318 - Integrate snowflake on Android
by sysrqb＠torproject.org 29 May '20

29 May '20

commit 4d57755506496d02107e4dc2adf38252032df383 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri May 29 20:26:19 2020 +0000 Bug 30318 - Integrate snowflake on Android --- projects/tor-android-service/config | 2 +- .../0001-Bug-30318-Add-snowflake-support.patch | 90 ++++++++++++++++++++++ projects/tor-onion-proxy-library/build | 1 + projects/tor-onion-proxy-library/config | 1 + 4 files changed, 93 insertions(+), 1 deletion(-) diff --git a/projects/tor-android-service/config b/projects/tor-android-service/config index 800fc47..7ab3ca7 100644 --- a/projects/tor-android-service/config +++ b/projects/tor-android-service/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %]' -git_hash: ed2e1479eeddede01b1d510ef79dc5ec798b39c0 +git_hash: ecc251d0a73f7e2034a271efd28036a0108b8688 git_url: https://git.torproject.org/tor-android-service.git git_submodule: 1 diff --git a/projects/tor-onion-proxy-library/0001-Bug-30318-Add-snowflake-support.patch b/projects/tor-onion-proxy-library/0001-Bug-30318-Add-snowflake-support.patch new file mode 100644 index 0000000..03e06aa --- /dev/null +++ b/projects/tor-onion-proxy-library/0001-Bug-30318-Add-snowflake-support.patch @@ -0,0 +1,90 @@ +From e006e215b274b1b834e098b199ea2697bc11b0f1 Mon Sep 17 00:00:00 2001 +From: Georg Koppen <gk(a)torproject.org> +Date: Sun, 10 May 2020 08:29:10 +0000 +Subject: [PATCH] Bug 30318: Add snowflake support + + +diff --git a/android/build.gradle b/android/build.gradle +index a8d9bdc..2392731 100644 +--- a/android/build.gradle ++++ b/android/build.gradle +@@ -93,6 +93,9 @@ task copyPluggableTransports(type: Copy) { + rename { filename -> + filename.replace 'obfs4proxy', 'libObfs4proxy.so' + } ++ rename { filename -> ++ filename.replace 'snowflake-client', 'libSnowflake.so' ++ } + } + + gradle.projectsEvaluated { +diff --git a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java +index 2405097..bcb6a37 100644 +--- a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java ++++ b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java +@@ -109,22 +109,33 @@ public final class TorConfigBuilder { + return this; + } + +- public TorConfigBuilder configurePluggableTransportsFromSettings(File pluggableTransportClient) throws IOException { +- if (pluggableTransportClient == null) { ++ public TorConfigBuilder configurePluggableTransportsFromSettings(File pluggableTransportObfs, File pluggableTransportSnow) throws IOException { ++ if (pluggableTransportObfs == null || pluggableTransportSnow == null) { + return this; + } + +- if (!pluggableTransportClient.exists()) { +- throw new IOException("Bridge binary does not exist: " + pluggableTransportClient ++ if (!pluggableTransportObfs.exists()) { ++ throw new IOException("Obfs4proxy binary does not exist: " + pluggableTransportObfs + .getCanonicalPath()); + } + +- if (!pluggableTransportClient.canExecute()) { +- throw new IOException("Bridge binary is not executable: " + pluggableTransportClient ++ if (!pluggableTransportSnow.exists()) { ++ throw new IOException("Snowflake binary does not exist: " + pluggableTransportSnow + .getCanonicalPath()); + } + +- transportPlugin(pluggableTransportClient.getCanonicalPath()); ++ if (!pluggableTransportObfs.canExecute()) { ++ throw new IOException("Obfs4proxy binary is not executable: " + pluggableTransportObfs ++ .getCanonicalPath()); ++ } ++ ++ if (!pluggableTransportSnow.canExecute()) { ++ throw new IOException("Snowflake binary is not executable: " + pluggableTransportSnow ++ .getCanonicalPath()); ++ } ++ ++ ++ transportPlugin(pluggableTransportObfs.getCanonicalPath(), pluggableTransportSnow.getCanonicalPath()); + return this; + } + +@@ -491,8 +502,9 @@ public final class TorConfigBuilder { + return transPort(settings.transPort()); + } + +- public TorConfigBuilder transportPlugin(String clientPath) { +- buffer.append("ClientTransportPlugin meek_lite,obfs3,obfs4 exec ").append(clientPath).append('\n'); ++ public TorConfigBuilder transportPlugin(String obfsPath, String snowPath) { ++ buffer.append("ClientTransportPlugin meek_lite,obfs3,obfs4 exec ").append(obfsPath).append('\n'); ++ buffer.append("ClientTransportPlugin snowflake exec ").append(snowPath).append(" -url https://snowflake-broker.azureedge.net/ -front ajax.aspnetcdn.com -ice stun:stun.l.google.com:19302\n"); + return this; + } + +@@ -557,6 +569,9 @@ public final class TorConfigBuilder { + case 3: + reqBridgeType = "meek_lite"; + break; ++ case 4: ++ reqBridgeType = "snowflake"; ++ break; + default: + throw new IOException("Requested unknown transport type: " + bridgesType); + } +-- +2.26.2 + diff --git a/projects/tor-onion-proxy-library/build b/projects/tor-onion-proxy-library/build index dfe1837..937c72f 100644 --- a/projects/tor-onion-proxy-library/build +++ b/projects/tor-onion-proxy-library/build @@ -22,6 +22,7 @@ cd /var/tmp/build/[% project %]-[% c('version') %] patch -p1 < $rootdir/gradle.patch patch -p1 < $rootdir/0001-Bug-33931-Filter-bridges-in-stream-by-type.patch +patch -p1 < $rootdir/0001-Bug-30318-Add-snowflake-support.patch # Extract obfs4proxy from TorBrowser/Tor/PluggableTransports/obfs4proxy tar --strip-components=4 -xf $rootdir/[% c('input_files_by_name/obfs4') %] diff --git a/projects/tor-onion-proxy-library/config b/projects/tor-onion-proxy-library/config index cffcdd0..98bb93c 100644 --- a/projects/tor-onion-proxy-library/config +++ b/projects/tor-onion-proxy-library/config @@ -28,3 +28,4 @@ input_files: exec: '[% INCLUDE "fetch-gradle-dependencies" %]' - filename: gradle.patch - filename: 0001-Bug-33931-Filter-bridges-in-stream-by-type.patch + - filename: 0001-Bug-30318-Add-snowflake-support.patch

1 0

[tor-browser-build/master] Bug 28672: Android reproducible build of Snowflake
by sysrqb＠torproject.org 29 May '20

29 May '20

commit 853e75e9276432a39153db2e3fa54375af9b8822 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Thu Apr 30 13:46:56 2020 +0000 Bug 28672: Android reproducible build of Snowflake --- projects/snowflake/build | 7 +++++++ projects/snowflake/config | 3 +++ projects/tor-browser/config | 2 +- projects/tor-onion-proxy-library/build | 7 ++++++- projects/tor-onion-proxy-library/config | 2 ++ rbm.conf | 3 +++ 6 files changed, 22 insertions(+), 2 deletions(-) diff --git a/projects/snowflake/build b/projects/snowflake/build index 2724dd9..a72caba 100644 --- a/projects/snowflake/build +++ b/projects/snowflake/build @@ -5,6 +5,13 @@ distdir=/var/tmp/dist/[% project %] [% c("var/set_PTDIR_DOCSDIR") -%] mkdir -p $PTDIR $DOCSDIR +[% IF c("var/android") -%] + [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] + # We need to explicitly set CGO_ENABLED with Go 1.13.x as the Android build + # breaks otherwise. + export CGO_ENABLED=1 +[% END -%] + tar -C /var/tmp/dist -xf [% c('input_files_by_name/uniuri') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/goptlib') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/pion-webrtc') %] diff --git a/projects/snowflake/config b/projects/snowflake/config index efd0707..898fe70 100644 --- a/projects/snowflake/config +++ b/projects/snowflake/config @@ -22,3 +22,6 @@ input_files: project: kcp-go - name: smux project: smux + - name: '[% c("var/compiler") %]' + project: '[% c("var/compiler") %]' + enable: '[% c("var/android") %]' diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 3f41ed2..809bfa0 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -70,7 +70,7 @@ input_files: enable: '[% ! c("var/android") %]' - project: snowflake name: snowflake - enable: '[% c("var/snowflake") %]' + enable: '[% c("var/snowflake") && ! c("var/android") %]' - filename: Bundle-Data enable: '[% ! c("var/android") %]' - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… diff --git a/projects/tor-onion-proxy-library/build b/projects/tor-onion-proxy-library/build index c8025ad..dfe1837 100644 --- a/projects/tor-onion-proxy-library/build +++ b/projects/tor-onion-proxy-library/build @@ -26,12 +26,17 @@ patch -p1 < $rootdir/0001-Bug-33931-Filter-bridges-in-stream-by-type.patch # Extract obfs4proxy from TorBrowser/Tor/PluggableTransports/obfs4proxy tar --strip-components=4 -xf $rootdir/[% c('input_files_by_name/obfs4') %] -# Overwrite the obfs4proxy binary provided by Pluto +# Extract snowflake from TorBrowser/Tor/PluggableTransports/snowflake +tar --strip-components=4 -xf $rootdir/[% c('input_files_by_name/snowflake') %] + +# Overwrite the obfs4proxy binary provided by Pluto and add Snowflake for d in external/pluto/bin/*; do cp obfs4proxy $d/ + cp snowflake-client $d/ done rm obfs4proxy +rm snowflake-client # Build Android Libraries and Apps $GRADLE_HOME/gradle-4.10.2/bin/gradle --offline --no-daemon -P androidplugin=3.1.0 -Dmaven.repo.local=$gradle_repo assembleRelease -x lint diff --git a/projects/tor-onion-proxy-library/config b/projects/tor-onion-proxy-library/config index 5d90481..cffcdd0 100644 --- a/projects/tor-onion-proxy-library/config +++ b/projects/tor-onion-proxy-library/config @@ -21,6 +21,8 @@ input_files: project: '[% c("var/compiler") %]' - project: obfs4 name: obfs4 + - project: snowflake + name: snowflake - filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]' name: gradle-dependencies exec: '[% INCLUDE "fetch-gradle-dependencies" %]' diff --git a/rbm.conf b/rbm.conf index ba1cc23..f2d0f4f 100644 --- a/rbm.conf +++ b/rbm.conf @@ -253,6 +253,9 @@ targets: android_min_api_x86_64: 21 CC: '$ANDROID_NDK_HOME/[% c("var/toolchain_arch") %]/bin/clang' CXX: '$ANDROID_NDK_HOME/[% c("var/toolchain_arch") %]/bin/clang++' + # We only build snowflake on the alpha and nightly + # channels for now. + snowflake: '[% c("var/alpha") || c("var/nightly") %]' container: suite: buster arch: amd64

1 0

[translation/torbutton-aboutdialogdtd] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-aboutdialogdtd
by translation＠torproject.org 29 May '20

29 May '20

commit a9969b8505f5b3025fdd8249f566f164a4c433c8 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 29 20:51:54 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-aboutdial… --- mr/aboutdialog.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mr/aboutdialog.dtd b/mr/aboutdialog.dtd index 95dbbd809e..6a32e0c65d 100644 --- a/mr/aboutdialog.dtd +++ b/mr/aboutdialog.dtd @@ -11,7 +11,7 @@ <!ENTITY help.getInvolvedLink "get involved"> <!ENTITY help.end "!">  -<!ENTITY bottomLinks.questions "Questions?"> +<!ENTITY bottomLinks.questions "प्रश्न?">  <!ENTITY bottomLinks.grow "Help the Tor Network Grow!">

1 0

[translation/tba-torbrowserstringsdtd] https://gitweb.torproject.org/translation.git/commit/?h=tba-torbrowserstringsdtd
by translation＠torproject.org 29 May '20

29 May '20

commit 5d39b35d4b271e42d9184ee1a9c29b09a0d14785 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 29 20:50:12 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tba-torbrowserstrin… --- mr/torbrowser_strings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mr/torbrowser_strings.dtd b/mr/torbrowser_strings.dtd index ccec2c3de7..15e17a527a 100644 --- a/mr/torbrowser_strings.dtd +++ b/mr/torbrowser_strings.dtd @@ -33,7 +33,7 @@ <!ENTITY pref_tor_provide_a_bridge_title "एक पूल प्रदान करा "> <!ENTITY pref_category_tor_network_summary "टोर ब्राउझर आपल्याला टोर नेटवर्कशी जोडतो जो जगभरातील हजारो स्वयंसेवक लोकांनी चालावला जातो! हे परयाय तुमची मदत करू शक्ता का?"> -<!ENTITY pref_category_tor_bridge_summary "Bridges are unlisted Tor relays that make it more difficult to block connections into the Tor network. Because of how some countries try to block Tor, certain bridges work in some countries but not others."> +<!ENTITY pref_category_tor_bridge_summary "पूल हे असूचीबद्ध टोर चे रिले आहेत जे टोर नेटवर्कच्या कनेक्शन मध्ये अडथळे आणणा आधिक आवघड बनवतात. पण काही देश टोर मध्ये अडथळे आणतात, त्यामुळे काही देशयात पूल चालतात पण बाकी मध्ये नाही."> <!ENTITY pref_choice_tor_bridges_enabled_title "आंतरजाल इथे सेन्सॉरड आहे "> <!ENTITY pref_choice_tor_bridges_enabled_summary "पूलला कॉन्फिगर करून टोरला जोडण्यासाठी टॅप करा ">

1 0

[tor-browser/tor-browser-68.9.0esr-10.0-1] squash! Bug 28329 - Part 4. Add new Tor Bootstrapping and configuration screens
by sysrqb＠torproject.org 29 May '20

29 May '20

commit 002d35ffa55518c5517c2be746da2678a70da47a Author: Georg Koppen <gk(a)torproject.org> Date: Fri May 8 06:31:09 2020 +0000 squash! Bug 28329 - Part 4. Add new Tor Bootstrapping and configuration screens Bug 30318: Integrate snowflake into mobile Tor Browser --- .../res/layout/preference_tor_network_select_bridge_type.xml | 11 +++++++++++ .../java/org/mozilla/gecko/torbootstrap/TorPreferences.java | 7 ++++++- mobile/android/base/locales/en-US/torbrowser_strings.dtd | 1 + mobile/android/base/strings.xml.in | 1 + 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/mobile/android/app/src/main/res/layout/preference_tor_network_select_bridge_type.xml b/mobile/android/app/src/main/res/layout/preference_tor_network_select_bridge_type.xml index 4ef5925e233d..6108819430d3 100644 --- a/mobile/android/app/src/main/res/layout/preference_tor_network_select_bridge_type.xml +++ b/mobile/android/app/src/main/res/layout/preference_tor_network_select_bridge_type.xml @@ -74,6 +74,17 @@ android:textSize="16sp" android:text="@string/pref_bridges_type_meek_azure"/> <include layout="@xml/separator" /> + <RadioButton android:id="@+id/radio_pref_bridges_snowflake" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="10sp" + android:layout_marginBottom="10sp" + android:buttonTint="@color/tor_bridges_select_builtin" + android:fontFamily="Roboto-Regular" + android:textColor="#DE000000" + android:textSize="16sp" + android:text="@string/pref_bridges_type_snowflake"/> + <include layout="@xml/separator" /> </RadioGroup> </LinearLayout> diff --git a/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorPreferences.java b/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorPreferences.java index cb37f3867ca4..66473529c069 100644 --- a/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorPreferences.java +++ b/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorPreferences.java @@ -679,6 +679,9 @@ public class TorPreferences extends AppCompatPreferenceActivity { case "meek": buttonId = R.id.radio_pref_bridges_meek_azure; break; + case "snowflake": + buttonId = R.id.radio_pref_bridges_snowflake; + break; } if (buttonId != -1) { @@ -730,11 +733,13 @@ public class TorPreferences extends AppCompatPreferenceActivity { // // Similarly, if meek-azure is chosen, substitute it with "meek" // (tor-android-service only handles these keywords specially if - // they are less than 5 characters). + // they are less than 10 characters). if (bridgesType.contains("obfs4")) { bridgesType = "obfs4"; } else if (bridgesType.contains("meek-azure")) { bridgesType = "meek"; + } else if (bridgesType.contains("snowflake")) { + bridgesType = "snowflake"; } Preference bridgesTypePref = findPreference(PREFS_BRIDGES_TYPE); diff --git a/mobile/android/base/locales/en-US/torbrowser_strings.dtd b/mobile/android/base/locales/en-US/torbrowser_strings.dtd index 8d000f90d561..d4009b272ce9 100644 --- a/mobile/android/base/locales/en-US/torbrowser_strings.dtd +++ b/mobile/android/base/locales/en-US/torbrowser_strings.dtd @@ -54,6 +54,7 @@  <!ENTITY pref_bridges_type_obfs4 "obfs4 (recommended)"> <!ENTITY pref_bridges_type_meek_azure "meek-azure"> +<!ENTITY pref_bridges_type_snowflake "snowflake"> <!ENTITY pref_tor_network_bridges_enabled_change_builtin "You\'re using a built-in bridge to connect to Tor. Change"> <!ENTITY pref_tor_network_bridges_enabled_change_custom "You\'re using a custom bridge to connect to Tor. Change"> <!ENTITY pref_tor_network_using_multiple_provided_bridges "You\'re using multiple custom bridges."> diff --git a/mobile/android/base/strings.xml.in b/mobile/android/base/strings.xml.in index 5a6c14bb4331..2dc7c6650880 100644 --- a/mobile/android/base/strings.xml.in +++ b/mobile/android/base/strings.xml.in @@ -102,6 +102,7 @@ <string name="pref_choice_tor_bridges_enabled_summary">&pref_choice_tor_bridges_enabled_summary;</string> <string name="pref_bridges_type_obfs4">&pref_bridges_type_obfs4;</string> <string name="pref_bridges_type_meek_azure">&pref_bridges_type_meek_azure;</string> + <string name="pref_bridges_type_snowflake">&pref_bridges_type_snowflake;</string> <string name="pref_tor_bridges_provide_manual_button_title">&pref_tor_bridges_provide_manual_button_title;</string> <string name="pref_tor_bridges_provide_select_text_title">&pref_tor_bridges_provide_select_text_title;</string>

1 0

[translation/tba-torbrowserstringsdtd] https://gitweb.torproject.org/translation.git/commit/?h=tba-torbrowserstringsdtd
by translation＠torproject.org 29 May '20

29 May '20

commit 9048a407ba01478f32d02154fe610c78d1fa78d2 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 29 20:20:11 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tba-torbrowserstrin… --- mr/torbrowser_strings.dtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mr/torbrowser_strings.dtd b/mr/torbrowser_strings.dtd index 542387c23d..ccec2c3de7 100644 --- a/mr/torbrowser_strings.dtd +++ b/mr/torbrowser_strings.dtd @@ -17,11 +17,11 @@ <!ENTITY firstrun_secsettings_next "पुढे "> <!ENTITY firstrun_tips_tab_title "टिप्स "> <!ENTITY firstrun_tips_title "आनुभवी टिप्स "> -<!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_message "टॉरने दिलेल्या सर्व सुरक्षा आणि गोपनीयता वैशिष्ट्यांसह, अंतरजाळ ब्राउझ करताना आपला अनुभव काही वेगळा असू शकतो. गोष्टी थोडा हळू असू शकतात आणि आपल्या सुरक्षिततेच्या पातळीवर अवलंबूनअसल्याने काही घटक कार्य करू शकत नाहीत, किंवा लोड करु शकत नाहीत. आपण मनुष्य आहात आणि रोबोट नाही ह्याची सिद्धधा तुम्हाला विचारू जाऊ शक्त."> <!ENTITY firstrun_tips_next "पुढे "> -<!ENTITY firstrun_onionservices_tab_title "कांदा(अनियन)"> -<!ENTITY firstrun_onionservices_title "कांदा(अनियन) सेवा "> -<!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_tab_title "कांदा(ओनियन)"> +<!ENTITY firstrun_onionservices_title "कांदा(ओनियन) सेवा "> +<!ENTITY firstrun_onionservices_message "कांदा(ओनियन) सेवा ही वेबसाईट अस्ते जी .onion ने समाप्त होते, हे अतिरिक्त संरक्षण देतात प्रकाशकांना आणि अभ्यागतांना, ह्यासोबत अतिरिक्त संरक्षण प्रदान करतात सेन्सॉरशिपच्या विरुद्ध. कांदा(ओनियन) सेवा कोणालाही गोष्टी आणि सेवा अज्ञातपणे प्रदान करण्याची परवानगी देतात."> <!ENTITY firstrun_onionservices_next "अन्वेषण कडे चला "> <!ENTITY tor_bootstrap_swipe_for_logs "डावी कडे स्वाइप करा टोर नोंदी साठी ">

1 0

[tor-browser/tor-browser-68.9.0esr-10.0-1] fixup! Bug 34321 - Add Learn More onboarding item
by sysrqb＠torproject.org 29 May '20

29 May '20

commit c64571e507f1d6868f6a08d807489d6b34063af1 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri May 29 13:24:39 2020 +0000 fixup! Bug 34321 - Add Learn More onboarding item --- browser/extensions/onboarding/content/Onboarding.jsm | 2 -- 1 file changed, 2 deletions(-) diff --git a/browser/extensions/onboarding/content/Onboarding.jsm b/browser/extensions/onboarding/content/Onboarding.jsm index 2115b2bd9d27..b411a3039a3e 100644 --- a/browser/extensions/onboarding/content/Onboarding.jsm +++ b/browser/extensions/onboarding/content/Onboarding.jsm @@ -124,7 +124,6 @@ var onboardingTourset = { "tor-network-9.0": { id: "onboarding-tour-tor-network-9-0", tourNameId: "onboarding.tour-tor-network", - highlightId: "onboarding.tour-tor-update.prefix-new", getPage(win) { let div = win.document.createElement("div"); @@ -249,7 +248,6 @@ var onboardingTourset = { "toolbar-update-9.0": { id: "onboarding-tour-tor-toolbar-update-9-0", tourNameId: "onboarding.tour-tor-toolbar", - highlightId: "onboarding.tour-tor-update.prefix-updated", getPage(win) { let div = win.document.createElement("div");

1 0

[tor-browser/tor-browser-68.9.0esr-10.0-1] Merge branch 'bug34347_00' into tor-browser-68.9.0esr-10.0-1
by sysrqb＠torproject.org 29 May '20

29 May '20

commit 0d7f107b512ba82d57cc20c791aea402a499b584 Merge: 62b2d85bf2b2 c64571e507f1 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri May 29 19:57:29 2020 +0000 Merge branch 'bug34347_00' into tor-browser-68.9.0esr-10.0-1 browser/extensions/onboarding/content/Onboarding.jsm | 2 -- 1 file changed, 2 deletions(-)

1 0