August 2019 - tor-commits - lists.torproject.org

[tor/master] Merge branch 'tor-github/pr/1195'
by asn＠torproject.org 06 Aug '19

06 Aug '19

commit d7afdb3b0fef4db30c9eb8cdad5890bfc241bb8d Merge: 4ee65a6f8 1440c2cb3 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Aug 6 14:51:47 2019 +0300 Merge branch 'tor-github/pr/1195' Makefile.am | 19 +++++++++++++++--- changes/ticket31304 | 3 +++ changes/ticket31311 | 3 +++ scripts/maint/practracker/practracker_tests.py | 11 ++++++++--- scripts/maint/practracker/test_practracker.sh | 27 ++++++++++++++++---------- src/test/include.am | 6 +++++- 6 files changed, 52 insertions(+), 17 deletions(-)

1 0

[tor/master] Adjust test_practracker.sh to work on windows
by asn＠torproject.org 06 Aug '19

06 Aug '19

commit 1440c2cb340f904cafb402474b538725abdeb04f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 1 15:05:34 2019 -0400 Adjust test_practracker.sh to work on windows The required change is to ignore trailing CRs when diffing files. --- scripts/maint/practracker/test_practracker.sh | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/scripts/maint/practracker/test_practracker.sh b/scripts/maint/practracker/test_practracker.sh index c7be22770..c878ca558 100755 --- a/scripts/maint/practracker/test_practracker.sh +++ b/scripts/maint/practracker/test_practracker.sh @@ -28,6 +28,17 @@ run_practracker() { --max-include-count=0 --max-file-size=0 --max-function-size=0 --terse \ "${DATA}/" "$@"; } +compare() { + # we can't use cmp because we need to use -b for windows + diff -b -u "$@" > "${TMPDIR}/test-diff" + if test -z "$(cat "${TMPDIR}"/test-diff)"; then + echo "OK" + else + cat "${TMPDIR}/test-diff" + echo "FAILED" + exit 1 + fi +} echo "unit tests:" @@ -37,18 +48,10 @@ echo "ex0:" run_practracker --exceptions "${DATA}/ex0.txt" > "${TMPDIR}/ex0-received.txt" -if cmp "${TMPDIR}/ex0-received.txt" "${DATA}/ex0-expected.txt" ; then - echo " OK" -else - exit 1 -fi +compare "${TMPDIR}/ex0-received.txt" "${DATA}/ex0-expected.txt" echo "ex1:" run_practracker --exceptions "${DATA}/ex1.txt" > "${TMPDIR}/ex1-received.txt" -if cmp "${TMPDIR}/ex1-received.txt" "${DATA}/ex1-expected.txt" ;then - echo " OK" -else - exit 1 -fi +compare "${TMPDIR}/ex1-received.txt" "${DATA}/ex1-expected.txt"

1 0

[translation/tpo-web] Update translations for tpo-web
by translation＠torproject.org 06 Aug '19

06 Aug '19

commit 2c36a927c1ae46f3e55b1db4fc3a6b8934e454c8 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 6 11:52:02 2019 +0000 Update translations for tpo-web --- contents+is.po | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/contents+is.po b/contents+is.po index eebf10a97..64605e2d9 100644 --- a/contents+is.po +++ b/contents+is.po @@ -230,7 +230,7 @@ msgstr "Sækja grunnkóða Tor" #: https//www.torproject.org/about/cy-pres/ #: (content/about/cy-pres/contents+en.lrpage.title) msgid "Cy Pres Awards" -msgstr "" +msgstr "Cy Pres verðlaunin" #: https//www.torproject.org/about/cy-pres/ #: (content/about/cy-pres/contents+en.lrpage.body) @@ -261,6 +261,9 @@ msgid "" "The Tor Project is a U.S.-based 501(3) nonprofit founded in 2006 with the " "mission of advancing human rights and freedoms by:" msgstr "" +"Tor-verkefnið, skráð sem bandarísk 501(c)3 sjálfseignarstofnun, var stofnað " +"árið 2006 og er með það hlutverk að styðja við mannréttindi og frelsi með " +"því að:" #: https//www.torproject.org/about/cy-pres/ #: (content/about/cy-pres/contents+en.lrpage.body) @@ -337,7 +340,7 @@ msgstr "" #: https//www.torproject.org/about/cy-pres/ #: (content/about/cy-pres/contents+en.lrpage.body) msgid "- [The Tor Project in the Media](https://www.torproject.org/press/)" -msgstr "" +msgstr "- [Tor-verkefnið í fjölmiðlum](https://www.torproject.org/press/)" #: https//www.torproject.org/about/cy-pres/ #: (content/about/cy-pres/contents+en.lrpage.body) @@ -345,6 +348,8 @@ msgid "" "- [The Tor Project Financial " "Reports](https://www.torproject.org/about/reports/)" msgstr "" +"- [Fjárhagsupplýsingar Tor-" +"verkefnisins](https://www.torproject.org/about/reports/)" #: https//www.torproject.org/about/cy-pres/ #: (content/about/cy-pres/contents+en.lrpage.body)

1 0

[translation/tor_outreach_md_completed] Update translations for tor_outreach_md_completed
by translation＠torproject.org 06 Aug '19

06 Aug '19

commit d02bba4754d7b3f80f844e25a53ac6597d7f7507 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 6 11:51:55 2019 +0000 Update translations for tor_outreach_md_completed --- tor-outreach2019-2020-is.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tor-outreach2019-2020-is.md b/tor-outreach2019-2020-is.md index 25fdb4718..4da9b364e 100644 --- a/tor-outreach2019-2020-is.md +++ b/tor-outreach2019-2020-is.md @@ -124,7 +124,7 @@ Bekele veit ekki að beiðnin um vefsíðuna kemur frá Amal nema ef hún segir Fólk út um víða veröld notar Tor til að verja persónuupplýsingar sínar og til að geta skoðað vefinn án hafta. -Tor aðstoðar við að vernda blaðamenn, verjendur mannréttinda, fórnarlömb heimilisofbeldis, akademíska vísindamenn og alla þá sem gætu orðið fyrir eftirliti, skráningu og ritskoðun. +Tor aðstoðar við að vernda blaðamenn, baráttufólk fyrir mannréttindum, fórnarlömb heimilisofbeldis, akademíska vísindamenn og alla þá sem gætu orðið fyrir eftirliti, skráningu og ritskoðun. ## 6. Af hverju treysta Tor?

1 0

[translation/tor_outreach_md] Update translations for tor_outreach_md
by translation＠torproject.org 06 Aug '19

06 Aug '19

commit 27a17c0e5ed16afae37b8194d3fc19bc7763fdc9 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 6 11:51:50 2019 +0000 Update translations for tor_outreach_md --- tor-outreach2019-2020-is.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tor-outreach2019-2020-is.md b/tor-outreach2019-2020-is.md index 25fdb4718..4da9b364e 100644 --- a/tor-outreach2019-2020-is.md +++ b/tor-outreach2019-2020-is.md @@ -124,7 +124,7 @@ Bekele veit ekki að beiðnin um vefsíðuna kemur frá Amal nema ef hún segir Fólk út um víða veröld notar Tor til að verja persónuupplýsingar sínar og til að geta skoðað vefinn án hafta. -Tor aðstoðar við að vernda blaðamenn, verjendur mannréttinda, fórnarlömb heimilisofbeldis, akademíska vísindamenn og alla þá sem gætu orðið fyrir eftirliti, skráningu og ritskoðun. +Tor aðstoðar við að vernda blaðamenn, baráttufólk fyrir mannréttindum, fórnarlömb heimilisofbeldis, akademíska vísindamenn og alla þá sem gætu orðið fyrir eftirliti, skráningu og ritskoðun. ## 6. Af hverju treysta Tor?

1 0

[translation/tba-torbrowserstringsdtd_completed] Update translations for tba-torbrowserstringsdtd_completed
by translation＠torproject.org 06 Aug '19

06 Aug '19

commit 9784d4f7f312a6690e1e0e67c1249811fd16137d Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 6 11:49:13 2019 +0000 Update translations for tba-torbrowserstringsdtd_completed --- nl/torbrowser_strings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nl/torbrowser_strings.dtd b/nl/torbrowser_strings.dtd index 51b7b3aaa..438296740 100644 --- a/nl/torbrowser_strings.dtd +++ b/nl/torbrowser_strings.dtd @@ -55,4 +55,4 @@ <!ENTITY tor_notify_user_about_error "Er is een fout opgetreden; veeg voor meer informatie."> -<!ENTITY sync_not_supported "Sync is not currently supported in Tor Browser on Android"> +<!ENTITY sync_not_supported "Firefox-sync wordt momenteel niet ondersteund door Tor browser op Android">

1 0

[translation/tba-torbrowserstringsdtd] Update translations for tba-torbrowserstringsdtd
by translation＠torproject.org 06 Aug '19

06 Aug '19

commit 7377b19306b6c5e6ac653d382edcea6355a47b04 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 6 11:49:07 2019 +0000 Update translations for tba-torbrowserstringsdtd --- nl/torbrowser_strings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nl/torbrowser_strings.dtd b/nl/torbrowser_strings.dtd index 51b7b3aaa..438296740 100644 --- a/nl/torbrowser_strings.dtd +++ b/nl/torbrowser_strings.dtd @@ -55,4 +55,4 @@ <!ENTITY tor_notify_user_about_error "Er is een fout opgetreden; veeg voor meer informatie."> -<!ENTITY sync_not_supported "Sync is not currently supported in Tor Browser on Android"> +<!ENTITY sync_not_supported "Firefox-sync wordt momenteel niet ondersteund door Tor browser op Android">

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 06 Aug '19

06 Aug '19

commit 4dd4ca00a670564b1854f52ad2c00a9087e46abd Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 6 11:47:11 2019 +0000 Update translations for tails-misc_completed --- is.po | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/is.po b/is.po index d7d8c5d97..ab5279df8 100644 --- a/is.po +++ b/is.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-05-18 19:31+0200\n" -"PO-Revision-Date: 2019-05-23 08:01+0000\n" +"POT-Creation-Date: 2019-06-30 18:53+0200\n" +"PO-Revision-Date: 2019-08-06 11:44+0000\n" "Last-Translator: Sveinn í Felli <sv1(a)fellsnet.is>\n" "Language-Team: Icelandic (http://www.transifex.com/otf/torproject/language/is/)\n" "MIME-Version: 1.0\n" @@ -423,11 +423,11 @@ msgstr "Skjálæsing" msgid "Set up a password to unlock the screen." msgstr "Settu upp lykilorð til að aflæsa skjánum." -#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:136 +#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149 msgid "Password" msgstr "Lykilorð" -#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:142 +#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150 msgid "Confirm" msgstr "Staðfesta" @@ -633,6 +633,19 @@ msgid "" "{error_message}" msgstr "Gat ekki aflæst gagnageymslu {volume_name}:\n{error_message}" +#. Translators: Don't translate {volume_name} or {error_message}, +#. they are placeholder and will be replaced. +#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330 +#, python-brace-format +msgid "" +"Couldn't lock volume {volume_name}:\n" +"{error_message}" +msgstr "Gat ekki læst gagnageymslu {volume_name}:\n{error_message}" + +#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:332 +msgid "Error locking volume" +msgstr "Villa við að læsa gagnageymslu" + #: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_list.py:83 msgid "No file containers added" msgstr "Engum skráagámum bætt við"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 06 Aug '19

06 Aug '19

commit 64da132ea93191dafdc7e24e53e367aba8eece2f Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 6 11:47:05 2019 +0000 Update translations for tails-misc --- is.po | 8 ++++---- nl.po | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/is.po b/is.po index d4642c0bc..ab5279df8 100644 --- a/is.po +++ b/is.po @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-06-30 18:53+0200\n" -"PO-Revision-Date: 2019-07-01 01:04+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2019-08-06 11:44+0000\n" +"Last-Translator: Sveinn í Felli <sv1(a)fellsnet.is>\n" "Language-Team: Icelandic (http://www.transifex.com/otf/torproject/language/is/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -640,11 +640,11 @@ msgstr "Gat ekki aflæst gagnageymslu {volume_name}:\n{error_message}" msgid "" "Couldn't lock volume {volume_name}:\n" "{error_message}" -msgstr "" +msgstr "Gat ekki læst gagnageymslu {volume_name}:\n{error_message}" #: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:332 msgid "Error locking volume" -msgstr "" +msgstr "Villa við að læsa gagnageymslu" #: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_list.py:83 msgid "No file containers added" diff --git a/nl.po b/nl.po index b38ab001f..14f7a0715 100644 --- a/nl.po +++ b/nl.po @@ -34,8 +34,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-06-30 18:53+0200\n" -"PO-Revision-Date: 2019-07-02 13:05+0000\n" -"Last-Translator: Anbiya Popal <anbiya2004(a)gmail.com>\n" +"PO-Revision-Date: 2019-08-06 11:43+0000\n" +"Last-Translator: Meteor0id\n" "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -45,7 +45,7 @@ msgstr "" #: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:39 msgid "Tor is ready" -msgstr "Tor is gereed." +msgstr "Tor is gereed" #: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:40 msgid "You can now access the Internet." @@ -665,7 +665,7 @@ msgstr "Kon volume {volume_name}:\n{error_message} niet ontgrendelen" msgid "" "Couldn't lock volume {volume_name}:\n" "{error_message}" -msgstr "" +msgstr "Kon volume niet vergrendelen {volume_name}:\n{error_message}" #: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:332 msgid "Error locking volume"

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 06 Aug '19

06 Aug '19

commit f45e5b574c344a06cbdc8ba5f094f28ecdfd0c81 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 6 11:46:24 2019 +0000 Update translations for https_everywhere_completed --- is/https-everywhere.dtd | 2 ++ 1 file changed, 2 insertions(+) diff --git a/is/https-everywhere.dtd b/is/https-everywhere.dtd index dff905b5c..b1b17a35a 100644 --- a/is/https-everywhere.dtd +++ b/is/https-everywhere.dtd @@ -19,6 +19,7 @@ <!ENTITY https-everywhere.menu.showCounter "Birta teljara"> <!ENTITY https-everywhere.menu.viewAllRules "Skoða allar reglur"> +<!ENTITY https-everywhere.options.settings "Stillingar"> <!ENTITY https-everywhere.options.generalSettings "Almennar stillingar"> <!ENTITY https-everywhere.options.advancedSettings "Ítarlegar stillingar"> <!ENTITY https-everywhere.options.updateChannels "Uppfærslurásir"> @@ -35,6 +36,7 @@ <!ENTITY https-everywhere.options.storedRulesetsVersion "Útgáfa vistaðra reglusetta:"> <!ENTITY https-everywhere.options.updatesLastChecked "Síðast athugað með uppfærslur:"> <!ENTITY https-everywhere.options.updatesLastCheckedNever "aldrei"> +<!ENTITY https-everywhere.options.debuggingRulesets "Reglusett fyrir villuleit (ítarlegt)"> <!ENTITY https-everywhere.prefs.export_settings "Flytja út stillingar"> <!ENTITY https-everywhere.prefs.reset_defaults "Frumstilla á sjálfgefnar stillingar">

1 0