June 2021 - tor-commits - lists.torproject.org

[translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
by translation＠torproject.org 24 Jun '21

24 Jun '21

commit 96a98bb31b41d5abb2e39729303a0eff69be5dd8 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 24 17:15:37 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- fi.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fi.po b/fi.po index ed741e0ec8..b05ee6cfb7 100644 --- a/fi.po +++ b/fi.po @@ -22,7 +22,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-05-28 18:17-0500\n" -"PO-Revision-Date: 2021-06-24 16:45+0000\n" +"PO-Revision-Date: 2021-06-24 16:49+0000\n" "Last-Translator: mine sheep <minesheep103(a)gmail.com>\n" "Language-Team: Finnish (http://www.transifex.com/otf/torproject/language/fi/)\n" "MIME-Version: 1.0\n" @@ -1947,7 +1947,7 @@ msgid "" "your real IP address.\\n\\nOnly use the Unsafe Browser to sign in to a " "network using a captive portal or browse trusted web pages on the local " "network." -msgstr "" +msgstr "Unsafe Browser ei ole anonyymi ja sillä avatut verkkosivut näkevät oikean IP osoitteesi.\\n\\nKäytä Unsafe Browseria vain verkkoon kirjautumiseen tai luotettavan paikallisen verkon selaamiseen" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54 msgid "Starting the Unsafe Browser..."

1 0

[tor-launcher/master] Merge remote-tracking branch 'richardgl/40481'
by sysrqb＠torproject.org 24 Jun '21

24 Jun '21

commit 7dfd7e94368128bc3a68dd3adfecca8723082d14 Merge: 6eed724 6358161 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Jun 24 16:46:55 2021 +0000 Merge remote-tracking branch 'richardgl/40481' src/chrome/locale/en-US/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor-launcher/master] fixup! Bug 27476: about:torconnect fixes and new strings
by sysrqb＠torproject.org 24 Jun '21

24 Jun '21

commit 6358161f36153ba241b7146f8dc9cd713d26183d Author: Richard Pospesel <richard(a)torproject.org> Date: Thu Jun 24 16:53:30 2021 +0200 fixup! Bug 27476: about:torconnect fixes and new strings --- src/chrome/locale/en-US/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/locale/en-US/network-settings.dtd b/src/chrome/locale/en-US/network-settings.dtd index 45dde8f..73d32e0 100644 --- a/src/chrome/locale/en-US/network-settings.dtd +++ b/src/chrome/locale/en-US/network-settings.dtd @@ -67,7 +67,7 @@ <!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." > <!ENTITY torPreferences.learnMore "Learn More"> <!ENTITY torPreferences.quickstart "Quickstart"> -<!ENTITY torPreferences.quickstartDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world. Quickstart allows Tor Browser to connect automatically."> +<!ENTITY torPreferences.quickstartDescription "Quickstart allows Tor Browser to connect automatically."> <!ENTITY torPreferences.quickstartCheckbox "Always connect automatically"> <!ENTITY torPreferences.bridges "Bridges"> <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">

1 0

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 24 Jun '21

24 Jun '21

commit 05e18b43f17d8434cccc8bffc403e768892a8845 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 24 16:46:32 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- fi.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fi.po b/fi.po index 2912c8ce30..e0ff2a9296 100644 --- a/fi.po +++ b/fi.po @@ -22,8 +22,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-05-28 18:17-0500\n" -"PO-Revision-Date: 2021-06-01 12:30+0000\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2021-06-24 16:45+0000\n" +"Last-Translator: mine sheep <minesheep103(a)gmail.com>\n" "Language-Team: Finnish (http://www.transifex.com/otf/torproject/language/fi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
by translation＠torproject.org 24 Jun '21

24 Jun '21

commit 8d6aa6e22bc603ee6f58d6e3b40dc34b53db2023 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 24 16:45:50 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- fi.po | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/fi.po b/fi.po index af3ef6d4cd..ed741e0ec8 100644 --- a/fi.po +++ b/fi.po @@ -22,8 +22,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-05-28 18:17-0500\n" -"PO-Revision-Date: 2021-06-01 12:30+0000\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2021-06-24 16:45+0000\n" +"Last-Translator: mine sheep <minesheep103(a)gmail.com>\n" "Language-Team: Finnish (http://www.transifex.com/otf/torproject/language/fi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -72,7 +72,7 @@ msgid "" "To add more, install some software using <a " "href=\"synaptic.desktop\">Synaptic Package Manager</a> or <a " "href=\"org.gnome.Terminal.desktop\">APT on the command line</a>." -msgstr "Jos haluat lisätä lisää, asenna ohjelmistoja käyttäen <a href=\"synaptic.desktop\">Synaptic Package Manageria</a> tai <a href=\"org.gnome.Terminal.desktop\">APTta komentorivillä</a>." +msgstr "Jos haluat asentaa lisää, asenna ohjelmistoja käyttäen <a href=\"synaptic.desktop\">Synaptic Package Manageria</a> tai <a href=\"org.gnome.Terminal.desktop\">APTta komentorivillä</a>." #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:154 msgid "_Create persistent storage" @@ -1705,16 +1705,16 @@ msgstr "" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304 msgid "Connecting to Tor without bridges…" -msgstr "" +msgstr "Yhdistetään Tor-verkkoon ilman siltoja..." #: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335 msgid "Connecting to Tor with default bridges…" -msgstr "" +msgstr "Yhdistetään Tor-verkkoon oletus-silloilla..." #: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318 msgid "Connecting to Tor with custom bridges…" -msgstr "" +msgstr "Yhdistetään Tor-verkkoon mukautetuilla silloilla..." #: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410 msgid "" @@ -2002,7 +2002,7 @@ msgid "" "You are not connected to a local network yet.\\n\\nTo be able to start the " "Unsafe Browser, you first need to connect to a Wi-Fi, wired, or mobile " "network." -msgstr "" +msgstr "Et ole vielä yhdistänyt paikalliseen verkkoon.\\n\\nVoidaksesi käynnistää Unsafe Browser, yhdistä Wi-Fi, langalliseen tai mobiili verkkoon" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:135 msgid "Failed to run browser." @@ -2532,7 +2532,7 @@ msgstr "" #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123 msgid "Use a default bridge" -msgstr "" +msgstr "Käytä oletus siltaa" #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142 msgid "obfs4 (recommended)" @@ -2549,7 +2549,7 @@ msgstr "Ei mikään" #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194 msgid "Request a new bridge" -msgstr "" +msgstr "Pyydä uusi silta" #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227 msgid "Type in a bridge that I already know" @@ -2563,12 +2563,12 @@ msgid "" "\n" "To request obfs4 bridges, you can send an empty email to\n" "<tt>bridges(a)torproject.org</tt> from a Gmail or Riseup email address.\n" -msgstr "" +msgstr "Tällä hetkellä vain obfs4 sillat salaavat Tor-verkon käytön\n\nobfs4 sillat alkavat sanalla \"obfs4\".\n\nPyytääksesi obfs4 siltoja, lähetä tyhjä sähköposti osoitteeseen \n<tt>bridges(a)torproject.org</tt>Gmail tai Riseup sähköpostiosoitteesta.\n" #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363 #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1017 msgid "Connect to _Tor" -msgstr "" +msgstr "Yhdistä Tor-verkkoon" #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405 msgid "Error connecting to Tor" @@ -2576,7 +2576,7 @@ msgstr "Virhe Toriin yhdistämisessä" #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428 msgid "• Public network" -msgstr "" +msgstr "• Julkinen verkko" #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448 msgid "" @@ -2633,13 +2633,13 @@ msgstr "" #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700 msgid "<b>Connect to Tor automatically (easier)</b>" -msgstr "" +msgstr "<b>Yhdistä Tor-verkkoon automaattisesti (helppo)</b>" #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748 msgid "" "We recommend connecting to Tor automatically if you are on a public Wi-Fi " "network or if many people in your country use Tor to circumvent censorship." -msgstr "" +msgstr "On suositeltavaa yhdistää Tor-verkkoon automaattisesti, jos käytät julkista WI-Fi verkkoa tai jos monet ihmiset käyttävät Toria sensuurin kiertämiseen." #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766 msgid "" @@ -2755,7 +2755,7 @@ msgstr "Välityspalvelimen tyyppi" #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1591 msgid "No proxy" -msgstr "" +msgstr "Ei välityspalvelinta" #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1592 msgid "SOCKS 4"

1 0

[tor-browser/tor-browser-78.11.0esr-10.5-1] fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser
by sysrqb＠torproject.org 24 Jun '21

24 Jun '21

commit d3b4824cd61cb05b3f2e712a4d80fab27b8b9ec2 Author: Richard Pospesel <richard(a)torproject.org> Date: Thu Jun 24 18:08:26 2021 +0200 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser --- browser/components/torconnect/content/aboutTorConnect.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/browser/components/torconnect/content/aboutTorConnect.js b/browser/components/torconnect/content/aboutTorConnect.js index 5fb5b2924b94..02ea82433a37 100644 --- a/browser/components/torconnect/content/aboutTorConnect.js +++ b/browser/components/torconnect/content/aboutTorConnect.js @@ -100,6 +100,7 @@ class AboutTorConnect { this.elemProgressDesc.textContent = this.torStrings.settings.quickstartDescription; this.showElem(this.elemConnectButton); + this.elemConnectButton.focus(); this.showElem(this.elemAdvancedButton); this.hideElem(this.elemCopyLogLink); this.hideElem(this.elemCancelButton); @@ -114,6 +115,7 @@ class AboutTorConnect { this.hideElem(this.elemAdvancedButton); this.hideElem(this.elemCopyLogLink); this.showElem(this.elemCancelButton); + this.elemCancelButton.focus(); this.showElem(this.elemProgressContent); this.showElem(this.elemProgressMeter); this.elemTitle.classList.remove("error"); @@ -125,6 +127,7 @@ class AboutTorConnect { this.showElem(this.elemConnectButton); this.hideElem(this.elemCancelButton); this.showElem(this.elemAdvancedButton); + this.elemAdvancedButton.focus(); this.showElem(this.elemProgressContent); this.hideElem(this.elemProgressMeter); this.elemTitle.classList.add("error"); @@ -278,7 +281,6 @@ class AboutTorConnect { this.elemConnectButton.addEventListener("click", () => { this.connect(); }); - this.elemConnectButton.focus(); this.elemCancelButton.textContent = this.torStrings.torConnect.cancel; this.elemCancelButton.addEventListener("click", () => {

1 0

[tor-browser/tor-browser-78.11.0esr-10.5-1] Merge remote-tracking branch 'richardgl/40480_again' into tor-browser-78.11.0esr-10.5-1
by sysrqb＠torproject.org 24 Jun '21

24 Jun '21

commit 280556dc26c9b0b221941d067810a1507eca1bbe Merge: f6578c3e0085 d3b4824cd61c Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Jun 24 16:43:31 2021 +0000 Merge remote-tracking branch 'richardgl/40480_again' into tor-browser-78.11.0esr-10.5-1 browser/components/torconnect/content/aboutTorConnect.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

1 0

[tor-browser/tor-browser-78.11.0esr-10.5-1] fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser
by sysrqb＠torproject.org 24 Jun '21

24 Jun '21

commit b0faf995b30bbff00da3499b544d5431ff7016a3 Author: Richard Pospesel <richard(a)torproject.org> Date: Thu Jun 24 16:53:00 2021 +0200 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser --- .../components/torconnect/content/aboutTorConnect.js | 2 +- browser/components/torpreferences/content/torPane.js | 20 ++++++++++++-------- .../components/torpreferences/content/torPane.xhtml | 9 ++++++++- browser/modules/TorStrings.jsm | 2 +- 4 files changed, 22 insertions(+), 11 deletions(-) diff --git a/browser/components/torconnect/content/aboutTorConnect.js b/browser/components/torconnect/content/aboutTorConnect.js index 5fb5b2924b94..657427767629 100644 --- a/browser/components/torconnect/content/aboutTorConnect.js +++ b/browser/components/torconnect/content/aboutTorConnect.js @@ -98,7 +98,7 @@ class AboutTorConnect { setInitialUI() { this.setTitle(this.torStrings.torConnect.torConnect); this.elemProgressDesc.textContent = - this.torStrings.settings.quickstartDescription; + this.torStrings.settings.torPreferencesDescription; this.showElem(this.elemConnectButton); this.showElem(this.elemAdvancedButton); this.hideElem(this.elemCopyLogLink); diff --git a/browser/components/torpreferences/content/torPane.js b/browser/components/torpreferences/content/torPane.js index d63b31c4c6f6..01609ddda090 100644 --- a/browser/components/torpreferences/content/torPane.js +++ b/browser/components/torpreferences/content/torPane.js @@ -75,11 +75,12 @@ const gTorPane = (function() { }, torPreferences: { header: "h1#torPreferences-header", + description: "span#torPreferences-description", + learnMore: "label#torPreferences-learnMore", }, quickstart: { header: "h2#torPreferences-quickstart-header", description: "span#torPreferences-quickstart-description", - learnMore: "label#torPreferences-quickstart-learnMore", enableQuickstartCheckbox: "checkbox#torPreferences-quickstart-toggle", }, bridges: { @@ -220,15 +221,11 @@ const gTorPane = (function() { // Heading prefpane.querySelector(selectors.torPreferences.header).innerText = TorStrings.settings.torPreferencesHeading; - - // Quickstart - prefpane.querySelector(selectors.quickstart.header).innerText = - TorStrings.settings.quickstartHeading; - prefpane.querySelector(selectors.quickstart.description).textContent = - TorStrings.settings.quickstartDescription; + prefpane.querySelector(selectors.torPreferences.description).textContent = + TorStrings.settings.torPreferencesDescription; { let learnMore = prefpane.querySelector( - selectors.quickstart.learnMore + selectors.torPreferences.learnMore ); learnMore.setAttribute("value", TorStrings.settings.learnMore); learnMore.setAttribute( @@ -236,6 +233,13 @@ const gTorPane = (function() { TorStrings.settings.learnMoreTorBrowserURL ); } + + // Quickstart + prefpane.querySelector(selectors.quickstart.header).innerText = + TorStrings.settings.quickstartHeading; + prefpane.querySelector(selectors.quickstart.description).textContent = + TorStrings.settings.quickstartDescription; + this._enableQuickstartCheckbox = prefpane.querySelector( selectors.quickstart.enableQuickstartCheckbox ); diff --git a/browser/components/torpreferences/content/torPane.xhtml b/browser/components/torpreferences/content/torPane.xhtml index 996325e08bf7..7c8071f2cf10 100644 --- a/browser/components/torpreferences/content/torPane.xhtml +++ b/browser/components/torpreferences/content/torPane.xhtml @@ -33,6 +33,14 @@ <html:h1 id="torPreferences-header"/> </hbox> +<groupbox data-category="paneTor" + hidden="true"> + <description flex="1"> + <html:span id="torPreferences-description" class="tail-with-learn-more"/> + <label id="torPreferences-learnMore" class="learnMore text-link" is="text-link"/> + </description> +</groupbox> +  <groupbox id="torPreferences-quickstart-group" data-category="paneTor" @@ -40,7 +48,6 @@ <html:h2 id="torPreferences-quickstart-header"/> <description flex="1"> <html:span id="torPreferences-quickstart-description"/> - <label id="torPreferences-quickstart-learnMore" class="learnMore text-link" is="text-link"/> </description> <checkbox id="torPreferences-quickstart-toggle"/> </groupbox> diff --git a/browser/modules/TorStrings.jsm b/browser/modules/TorStrings.jsm index e7597bbfa74f..c086d0fe3117 100644 --- a/browser/modules/TorStrings.jsm +++ b/browser/modules/TorStrings.jsm @@ -258,7 +258,7 @@ var TorStrings = { ), learnMore: getString("torPreferences.learnMore", "Learn More"), quickstartHeading: getString("torPreferences.quickstart", "Quickstart"), - quickstartDescription: getString("torPreferences.quickstartDescription", "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world. Quickstart allows Tor Browser to connect automatically."), + quickstartDescription: getString("torPreferences.quickstartDescription", "Quickstart allows Tor Browser to connect automatically."), quickstartCheckbox : getString("torPreferences.quickstartCheckbox", "Always connect automatically"), bridgesHeading: getString("torPreferences.bridges", "Bridges"), bridgesDescription: getString(

1 0

[tor-browser/tor-browser-78.11.0esr-10.5-1] Merge remote-tracking branch 'richardgl/40481' into tor-browser-78.11.0esr-10.5-1
by sysrqb＠torproject.org 24 Jun '21

24 Jun '21

commit 287d6bbc24a94dd321731deb27e553920fc864fa Merge: 280556dc26c9 b0faf995b30b Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Jun 24 16:44:00 2021 +0000 Merge remote-tracking branch 'richardgl/40481' into tor-browser-78.11.0esr-10.5-1 .../components/torconnect/content/aboutTorConnect.js | 2 +- browser/components/torpreferences/content/torPane.js | 20 ++++++++++++-------- .../components/torpreferences/content/torPane.xhtml | 9 ++++++++- browser/modules/TorStrings.jsm | 2 +- 4 files changed, 22 insertions(+), 11 deletions(-) diff --cc browser/components/torconnect/content/aboutTorConnect.js index 02ea82433a37,657427767629..1c574a5d07c9 --- a/browser/components/torconnect/content/aboutTorConnect.js +++ b/browser/components/torconnect/content/aboutTorConnect.js @@@ -98,9 -98,8 +98,9 @@@ class AboutTorConnect setInitialUI() { this.setTitle(this.torStrings.torConnect.torConnect); this.elemProgressDesc.textContent = - this.torStrings.settings.quickstartDescription; + this.torStrings.settings.torPreferencesDescription; this.showElem(this.elemConnectButton); + this.elemConnectButton.focus(); this.showElem(this.elemAdvancedButton); this.hideElem(this.elemCopyLogLink); this.hideElem(this.elemCancelButton);

1 0

[tor-browser-build/master] Bug 40302: Update version of snowflake
by sysrqb＠torproject.org 24 Jun '21

24 Jun '21

commit 4faacf83a969c590db643bfcd67d6b4859770d57 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Tue Jun 1 15:03:50 2021 -0400 Bug 40302: Update version of snowflake --- projects/snowflake/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/snowflake/config b/projects/snowflake/config index 95ef549..6022b2c 100644 --- a/projects/snowflake/config +++ b/projects/snowflake/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://git.torproject.org/pluggable-transports/snowflake.git -git_hash: 1b29ad7de14fb0a6d2bf88aea38353733682cd26 +git_hash: ae7cc478fd345a1e588f8315ec980809c6806372 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var:

1 0