[tor-commits] [translation/tbmanual-contentspot] Update translations for tbmanual-contentspot
commit 49cb5ff02b9179a087ae165790820b8af371b0d1 Author: Translation commit bot Date: Fri Dec 7 06:47:02 2018 + Update translations for tbmanual-contentspot --- contents+he.po | 62 +- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/contents+he.po b/contents+he.po index 4a76f9607..234481dff 100644 --- a/contents+he.po +++ b/contents+he.po @@ -183,7 +183,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/downloading/ #: (content/downloading/contents+en-US.lrtopic.body) msgid "# Mirrors" -msgstr "" +msgstr "# ××ª×¨× ×ר×Ö¸×" #: https//tb-manual.torproject.org/en-US/downloading/ #: (content/downloading/contents+en-US.lrtopic.body) @@ -212,7 +212,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/downloading/ #: (content/downloading/contents+en-US.lrtopic.body) msgid "## To use GetTor via email:" -msgstr "" +msgstr "## ××× ××שת×ש ×Ö¾GetTor ××¨× ×××\"×:" #: https//tb-manual.torproject.org/en-US/downloading/ #: (content/downloading/contents+en-US.lrtopic.body) @@ -242,7 +242,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/downloading/ #: (content/downloading/contents+en-US.lrtopic.body) msgid "## To use GetTor via Twitter:" -msgstr "" +msgstr "## ××× ××שת×ש ×Ö¾GetTor ××¨× Twitter:" #: https//tb-manual.torproject.org/en-US/downloading/ #: (content/downloading/contents+en-US.lrtopic.body) @@ -257,7 +257,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/downloading/ #: (content/downloading/contents+en-US.lrtopic.body) msgid "## To use GetTor via Jabber/XMPP (Jitsi, CoyIM, etc.):" -msgstr "" +msgstr "## ××× ××שת×ש ×Ö¾GetTor ××¨× Jabber/XMPP (Jitsi, CoyIM, ×××'):" #: https//tb-manual.torproject.org/en-US/downloading/ #: (content/downloading/contents+en-US.lrtopic.body) @@ -415,7 +415,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/bridges/ #: (content/bridges/contents+en-US.lrtopic.body) msgid "# Getting bridge addresses" -msgstr "" +msgstr "# ×ש×ת ×ת×××ת ×שר" #: https//tb-manual.torproject.org/en-US/bridges/ #: (content/bridges/contents+en-US.lrtopic.body) @@ -440,7 +440,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/bridges/ #: (content/bridges/contents+en-US.lrtopic.body) msgid "# Entering bridge addresses" -msgstr "" +msgstr "# ××× ×¡×ª ×ת×××ת ×שר" #: https//tb-manual.torproject.org/en-US/bridges/ #: (content/bridges/contents+en-US.lrtopic.body) @@ -523,7 +523,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/transports/ #: (content/transports/contents+en-US.lrtopic.body) msgid "# Types of pluggable transport" -msgstr "" +msgstr "# ס×××× ×©× ×ª×¢×××¨× × ×ª×ק×" #: https//tb-manual.torproject.org/en-US/transports/ #: (content/transports/contents+en-US.lrtopic.body) @@ -681,7 +681,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/circumvention/ #: (content/circumvention/contents+en-US.lrtopic.body) msgid "# Using pluggable transports" -msgstr "" +msgstr "# ש×××ש ×תע××ר×ת × ×ª×ק×ת" #: https//tb-manual.torproject.org/en-US/circumvention/ #: (content/circumvention/contents+en-US.lrtopic.body) @@ -727,7 +727,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/circumvention/ #: (content/circumvention/contents+en-US.lrtopic.body) msgid "# Which transport should I use?" -msgstr "" +msgstr "# ××××× ×ª×¢×××¨× ×¢××× ××שת×ש?" #: https//tb-manual.torproject.org/en-US/circumvention/ #: (content/circumvention/contents+en-US.lrtopic.body) @@ -803,7 +803,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/managing-identities/ #: (content/managing-identities/contents+en-US.lrtopic.body) msgid "# The URL bar" -msgstr "" +msgstr "# ש×רת ×ת××ת ××תר" #: https//tb-manual.torproject.org/en-US/managing-identities/ #: (content/managing-identities/contents+en-US.lrtopic.body) @@ -918,7 +918,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/managing-identities/ #: (content/managing-identities/contents+en-US.lrtopic.body) msgid "# Changing identities and circuits" -msgstr "" +msgstr "# ש×× ×× ×©× ×××××ת ×××¢××××" #: https//tb-manual.torproject.org/en-US/managing-identities/ #: (content/managing-identities/contents+en-US.lrtopic.body) @@ -956,7 +956,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/managing-identities/ #: (content/managing-identities/contents+en-US.lrtopic.body) msgid "## New Tor circuit for this site" -msgstr "" +msgstr "## ××¢×× Tor ××ש ×¢××ר ×תר ××" #: https//tb-manual.torproject.org/en-US/managing-identities/ #: (content/managing-identities/contents+en-US.lrtopic.body) @@ -1036,7 +1036,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/onion-services/ #: (content/onion-services/contents+en-US.lrtopic.body) msgid "# How
[tor-commits] [translation/support-portal] Update translations for support-portal
commit 38d31d9085754afcbfc96837c0ea3d17e27c Author: Translation commit bot Date: Fri Dec 7 06:19:01 2018 + Update translations for support-portal --- contents+he.po | 20 +++- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/contents+he.po b/contents+he.po index 01f7266e0..40e281a06 100644 --- a/contents+he.po +++ b/contents+he.po @@ -35,7 +35,7 @@ msgstr "××××" #: http//localhost (content/menu/contents+en-US.lrtopic.body) msgid "Newsletter" -msgstr "" +msgstr "××רת ××××¢" #: http//localhost (content/menu/contents+en-US.lrtopic.body) msgid "Contact" @@ -3375,11 +3375,13 @@ msgid "" "For example, the DuckDuckGo onion is http://3g2upl4pq6kufc4m.onion\;>https://3g2upl4pq6kufc4m.onion." msgstr "" +"××××××, ×××¦× ×©× DuckDuckGo ××× http://3g2upl4pq6kufc4m.onion\;>https://3g2upl4pq6kufc4m.onion." #: http//localhost/onionservices/accessing-websites-that-are-only-accessible-over-tor/ #: (content/onionservices/onionservices-1/contents+en.lrquestion.description) msgid "You can access these websites by using Tor Browser." -msgstr "" +msgstr "××ª× ×××× ××ש×× ×××©× ×× ×תר×× ××× ×¢\"× ×©×××ש ××פ××¤× Tor." #: http//localhost/onionservices/accessing-websites-that-are-only-accessible-over-tor/ #: (content/onionservices/onionservices-1/contents+en.lrquestion.description) @@ -3483,39 +3485,39 @@ msgstr "i-cannot-reach-x-dot-onion" #: http//localhost/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.title) msgid "General Glossary" -msgstr "" +msgstr "××ר×× ××××" #: http//localhost/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "" "The community team has developed this Glossary of terms about and related to" " Tor" -msgstr "" +msgstr "צ××ת ×ק×××× ×©×× × ×¤××ª× ××ר×× ××× ××× ×× ××××ת Tor" #: http//localhost/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "# term" -msgstr "" +msgstr "# ××× ×" #: http//localhost/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "definition" -msgstr "" +msgstr "×××ר×" #: http//localhost/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "term:" -msgstr "" +msgstr "××× ×:" #: http//localhost/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "" -msgstr "" +msgstr "" #: http//localhost/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.seo_slug) msgid "tor-glossary" -msgstr "" +msgstr "tor-glossary" #: http//localhost/misc/tracing-tor-user/ #: (content/misc/misc-1/contents+en.lrquestion.title) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tbmanual-contentspot] Update translations for tbmanual-contentspot
commit c805e4e120074699f20713fb06fc44d534a9c06e Author: Translation commit bot Date: Fri Dec 7 06:16:59 2018 + Update translations for tbmanual-contentspot --- contents+he.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contents+he.po b/contents+he.po index a4a5e0b60..4a76f9607 100644 --- a/contents+he.po +++ b/contents+he.po @@ -1,7 +1,7 @@ # Translators: -# ION, 2018 # Emma Peel, 2018 # erinm, 2018 +# ION, 2018 # msgid "" msgstr "" @@ -9,7 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-11-30 09:02+CET\n" "PO-Revision-Date: 2018-11-14 12:31+\n" -"Last-Translator: erinm, 2018\n" +"Last-Translator: ION, 2018\n" "Language-Team: Hebrew (https://www.transifex.com/otf/teams/1519/he/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -45,7 +45,7 @@ msgstr "××××" #: https//tb-manual.torproject.org/en-US/menu/ #: (content/menu/contents+en-US.lrtopic.body) msgid "Newsletter" -msgstr "" +msgstr "××רת ××××¢" #: https//tb-manual.torproject.org/en-US/menu/ #: (content/menu/contents+en-US.lrtopic.body) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/donatepages-messagespot] Update translations for donatepages-messagespot
commit bcb430d07ab35199b037e258452415ab065a47a6 Author: Translation commit bot Date: Fri Dec 7 06:15:20 2018 + Update translations for donatepages-messagespot --- locale/he/LC_MESSAGES/messages.po | 40 +-- 1 file changed, 30 insertions(+), 10 deletions(-) diff --git a/locale/he/LC_MESSAGES/messages.po b/locale/he/LC_MESSAGES/messages.po index ac60bae1c..57f199edf 100644 --- a/locale/he/LC_MESSAGES/messages.po +++ b/locale/he/LC_MESSAGES/messages.po @@ -64,7 +64,7 @@ msgstr "" msgid "" "We may also learn incidental data such as the date and time of your " "donation." -msgstr "" +msgstr "×× ×× × ×¢×©×××× ×× ××××× × ×ª×× ×× ×רע××× ×××× ×ª×ר×× ×××× ×©× ×תר××× ×©××." #: tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:78 msgid "" @@ -77,6 +77,8 @@ msgid "" "If you have provided your email address, we will email you once to thank you" " and give you a receipt." msgstr "" +"×××§×¨× ×©×¡×פקת ×ת ×ת××ת ××××\"× ×©××, × ×©×× ×× ×××\"× ×¤×¢× ××ת ××× ×××××ת ×× ××תת" +" ×× ×§×××." #: tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:85 msgid "" @@ -237,7 +239,7 @@ msgstr "ס×\"× × ×ª×¨××" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:155 msgid "Total Raised with Mozilla's Match" -msgstr "" +msgstr "ס×\"× × ××¡×¤× ×¢× ×ש×××ת Mozilla" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:163 #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:169 @@ -452,11 +454,11 @@ msgstr "×Öµ××ָע" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:500 msgid "A required field is missing from the form." -msgstr "" +msgstr "ש×× ×ר×ש ×סר ×××פס." #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:502 msgid "Please reload the page and try again." -msgstr "" +msgstr "×× × ××¢× ×××ש ×ת ××¢××× ×× ×¡× ×©××." #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:506 msgid "There was a problem submitting your request to the server:" @@ -508,7 +510,7 @@ msgstr "" #: tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:50 msgid "You should receive an email receipt shortly." -msgstr "" +msgstr "××ª× ×××ר ×ק×× ×§××ת ×××\"× ×ª×× ××× ×§×¦×¨." #: tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:52 msgid "" @@ -547,10 +549,12 @@ msgid "" "We need people to run relays, write code, organize the community and spread " "the word about our good work." msgstr "" +"×× ×× × ×¦×¨×××× ×× ×©×× ××ר××¥ ××סר××, ××ת×× ×§××, ××ר×× ×ת ×ק×××× ×××פ××¥ ×ת ×××××¢×" +" ×¢× ××¢×××× ××××× ×©×× ×." #: tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:102 msgid "Learn how you can help." -msgstr "" +msgstr "××× ×××¦× ××ª× ×××× ××¢××ר." #: tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:110 msgid "I Want To Volunteer" @@ -577,11 +581,11 @@ msgstr "" #: tmp/cache_locale/2d/2d5f07aeb16acd7bb0a8dd355b13f59678a1f0ba6ea2b3d9dec8d2b5dcfbfde5.php:31 msgid "Subscribe to Our Newsletter" -msgstr "" +msgstr "×××¨×©× ××× ×× ×××רת ×××××¢ ש×× ×" #: tmp/cache_locale/2d/2d5f07aeb16acd7bb0a8dd355b13f59678a1f0ba6ea2b3d9dec8d2b5dcfbfde5.php:35 msgid "Get monthly updates and opportunities from the Tor Project." -msgstr "" +msgstr "ק×× ×¢×××× ×× ×××ש××× ×××××× ×××ת ××××× Tor." #: tmp/cache_locale/2d/2d5f07aeb16acd7bb0a8dd355b13f59678a1f0ba6ea2b3d9dec8d2b5dcfbfde5.php:39 msgid "Sign Up" @@ -768,11 +772,13 @@ msgid "" "If someone is watching your internet connection, Tor prevents them from " "finding out what sites you are visiting." msgstr "" +"×× ××ש×× ×¢××§× ××ר ××××ר ×××× ××¨× × ×©××, Tor ××× ×¢ ××× × ××××ת ××××× ×תר×× ××ª× " +"××קר." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:147 msgid "" "It also prevents sites you visit from finding out where you're located." -msgstr "" +msgstr "××× ×× ××× ×¢ ××תר×× ××××ת ×××¤× ××ª× ×××ק×." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:149 msgid "" @@ -1272,6 +1278,9 @@ msgid "" "options.html.en\" class=\"hyperlinks links\" target=\"_blank\">other ways " "you can donate." msgstr "" +"××! ×× × ×¨×©××× ×©× https://www.torproject.org/donate/donate-; +"options.html.en\"
[tor-commits] [translation/donatepages-messagespot] Update translations for donatepages-messagespot
commit 4aa086cba92c78f0b59f223b3db7eb670f069c46 Author: Translation commit bot Date: Fri Dec 7 05:45:19 2018 + Update translations for donatepages-messagespot --- locale/he/LC_MESSAGES/messages.po | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/locale/he/LC_MESSAGES/messages.po b/locale/he/LC_MESSAGES/messages.po index 23c588cc8..ac60bae1c 100644 --- a/locale/he/LC_MESSAGES/messages.po +++ b/locale/he/LC_MESSAGES/messages.po @@ -229,11 +229,11 @@ msgstr "" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:123 msgid "Number of Donations" -msgstr "" +msgstr "×ספר תר×××ת" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:139 msgid "Total Donated" -msgstr "" +msgstr "ס×\"× × ×ª×¨××" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:155 msgid "Total Raised with Mozilla's Match" @@ -275,7 +275,7 @@ msgstr "××ר ×ת ××©× ×©×× ×××ת ×ת×××ª× ×." #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:215 msgid "No thanks, I don't want a gift." -msgstr "" +msgstr "×× ×ª×××, ×× × ×× ×¨××¦× ×©×." #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:217 #, php-format @@ -492,7 +492,7 @@ msgstr "" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:627 msgid "Mozilla will match your gift and double your impact." -msgstr "" +msgstr "Mozilla תש××× ×ת ××©× ×©×× ×ת×פ×× ×¤× ×©× ××× ×ת ×שפעת×." #: tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:34 msgid "Tor Thanks You" @@ -1149,7 +1149,7 @@ msgstr "" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:380 msgid "You can buy cash gift cards and mail them to us." -msgstr "" +msgstr "××ª× ×××× ××§× ×ת ×ר×××¡× ×©× ×©× ××××× ××ש××× ×××ª× ×××× × ××××ר." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:382 msgid "" @@ -1565,7 +1565,7 @@ msgstr "× × ×¡× ××¢× ×ת ××, ××× × ×¤×¨×¡× ×ת ש×××ª× (×××ª×©× #: tmp/cache_locale/08/08a9b06344a88c9ea01db4cdf9711c9cee305183a512ae0e8b7381dae8c6d798.php:22 msgid "See if your employer offers employee gift matching" -msgstr "" +msgstr "ר×× ×× ××עס×ק ש×× ×צ××¢ ×ש×××ת ×©× ×©× ×¢×××××" #: tmp/cache_locale/08/08a9b06344a88c9ea01db4cdf9711c9cee305183a512ae0e8b7381dae8c6d798.php:52 msgid "Company" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-build/master] Release preparations for 8.5a6
commit 76243271b0f02b0a965a0294ef8242c787bfc668 Author: Georg Koppen Date: Thu Dec 6 22:31:40 2018 + Release preparations for 8.5a6 Changelog update and versions bump --- projects/firefox-langpacks/config | 2 +- projects/firefox/config| 4 ++-- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 24 ++ projects/torbutton/config | 2 +- rbm.conf | 5 +++-- 5 files changed, 31 insertions(+), 6 deletions(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index 4e42939..04cd7dd 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil var: ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build1 + ff_build: build2 ff_arch: linux-i686 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]' diff --git a/projects/firefox/config b/projects/firefox/config index 7ffaf43..639d504 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,14 +1,14 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 gpg_keyring: torbutton.gpg var: - firefox_platform_version: 60.3.0 + firefox_platform_version: 60.4.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 8.5 torbrowser_update_channel: alpha diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 5c3732b..54645e8 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,27 @@ +Tor Browser 8.5a6 -- December 11 2018 + * All Platforms + * Update Firefox to 60.4.0esr + * Update OpenSSL to 1.0.2q + * Update Torbutton to 2.1.3 + * Bug 28540: Use new text for 2018 donation banner + * Bug 27290: Remove WebGL pref for min capability mode + * Bug 28075: Tone down missing SOCKS credential warning + * Bug 28747: Remove NoScript (XPCOM) related unused code + * Translations update + * Bug 28608: Disable background HTTP response throttling + * Bug 28695: Set default security.pki.name_matching_mode to enforce (3) + * Bug 27290: Remove WebGL pref for min capability mode + * Bug 27919: Backport SSL status API + * Windows + * Bug 28740: Adapt Windows navigator.platform value on 64-bit systems + * Android + * Bug 26843: Multi-locale support for Tor Browser on Android + * Build System + * Android + * Bug 25164: Add .apk to our sha256sums unsigned build file + * Bug 28696: Make path to Gradle dependencies reproducible + * Bug 28697: Use pregenerated keystore and fix timestamp issues + Tor Browser 8.5a5 -- December 3 2018 * All Platforms * Update Torbutton to 2.1.2 diff --git a/projects/torbutton/config b/projects/torbutton/config index 2e48f31..0fff877 100644 --- a/projects/torbutton/config +++ b/projects/torbutton/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2.1.2 +version: 2.1.3 git_url: https://git.torproject.org/torbutton.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/rbm.conf b/rbm.conf index f64a80b..a397752 100644 --- a/rbm.conf +++ b/rbm.conf @@ -15,10 +15,11 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '8.5a5' - torbrowser_build: 'build2' + torbrowser_version: '8.5a6' + torbrowser_build: 'build1' torbrowser_incremental_from: - 8.5a4 +- 8.5a5 project_name: tor-browser multi_lingual: 0 build_mar: 1 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-build/master] Bug 28697: No need to specify the architecture for using Buster
commit 0a2cc62f08063cc0c91b1db57e87505c954349a9 Author: Georg Koppen Date: Thu Dec 6 22:06:03 2018 + Bug 28697: No need to specify the architecture for using Buster --- projects/tor-browser/config | 1 - 1 file changed, 1 deletion(-) diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 3a7f035..6199954 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -51,7 +51,6 @@ targets: # leads to a stalled build. Work around this by switching to Buster. container: suite: buster -arch: amd64 input_files: - project: container-image ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 1472618 - Make navigator.platform return "Win32", even on Win64 OS. r=peterv
commit a3cbc068df86e03a6420bc863be2793e35078fa3 Author: Chris Peterson Date: Mon Jul 2 11:02:23 2018 -0700 Bug 1472618 - Make navigator.platform return "Win32", even on Win64 OS. r=peterv navigator.platform returns "Win64" in 64-bit Firefox and IE, but "Win32" in 64-bit Chrome and Edge. "Win32" appears to be the de facto platform value for Windows. This change doesn't hide the OS architecture from web content because navigator.userAgent still mentions "Win64; x64" in 64-bit Firefox, Chrome, Edge, and IE. MozReview-Commit-ID: CplYnGDQgTe --HG-- extra : rebase_source : c00a1a7462ea91d44700dd0581c88c1c4cad2346 extra : source : 1976c327f251702be255a9d0769121c6bc5303a1 This fixes our bug 28740. --- .../components/resistfingerprinting/test/browser/browser_navigator.js | 2 +- dom/base/Navigator.cpp| 4 +--- toolkit/components/resistfingerprinting/nsRFPService.h| 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/browser/components/resistfingerprinting/test/browser/browser_navigator.js b/browser/components/resistfingerprinting/test/browser/browser_navigator.js index e0aaf6fb27fe..3736fcd33ce5 100644 --- a/browser/components/resistfingerprinting/test/browser/browser_navigator.js +++ b/browser/components/resistfingerprinting/test/browser/browser_navigator.js @@ -24,7 +24,7 @@ const SPOOFED_APPVERSION = { }; const SPOOFED_PLATFORM = { linux: "Linux x86_64", - win: "Win64", + win: "Win32", macosx: "MacIntel", android: "Linux armv7l", other: "Linux x86_64", diff --git a/dom/base/Navigator.cpp b/dom/base/Navigator.cpp index 33563ad65ccb..55d1f7a0474b 100644 --- a/dom/base/Navigator.cpp +++ b/dom/base/Navigator.cpp @@ -1653,9 +1653,7 @@ Navigator::GetPlatform(nsAString& aPlatform, bool aUsePrefOverriddenValue) // Sorry for the #if platform ugliness, but Communicator is likewise // hardcoded and we are seeking backward compatibility here (bug 47080). -#if defined(_WIN64) - aPlatform.AssignLiteral("Win64"); -#elif defined(WIN32) +#if defined(WIN32) aPlatform.AssignLiteral("Win32"); #elif defined(XP_MACOSX) && defined(__ppc__) aPlatform.AssignLiteral("MacPPC"); diff --git a/toolkit/components/resistfingerprinting/nsRFPService.h b/toolkit/components/resistfingerprinting/nsRFPService.h index da79da8de948..4ed0c1d4cfaf 100644 --- a/toolkit/components/resistfingerprinting/nsRFPService.h +++ b/toolkit/components/resistfingerprinting/nsRFPService.h @@ -25,7 +25,7 @@ #define SPOOFED_UA_OS "Windows NT 6.1; Win64; x64" #define SPOOFED_APPVERSION "5.0 (Windows)" #define SPOOFED_OSCPU "Windows NT 6.1; Win64; x64" -#define SPOOFED_PLATFORM "Win64" +#define SPOOFED_PLATFORM "Win32" #elif defined(XP_MACOSX) #define SPOOFED_UA_OS "Macintosh; Intel Mac OS X 10.13" #define SPOOFED_APPVERSION "5.0 (Macintosh)" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [metrics-web/master] Schedule changes related to #28353.
commit ab9acb2f7b92fa70b33c0f9c6980a604a84e346d Author: Karsten Loesing Date: Wed Dec 5 21:19:10 2018 +0100 Schedule changes related to #28353. In roughly two weeks from now we're going to update one bandwidth graph and remove two obsolete ones. Similar to commit b14dbc3, announce this change now, so that any folks using our CSV files get the chance to update their tools. --- src/main/resources/web/json/metrics.json | 8 src/main/resources/web/jsps/stats.jsp| 25 - 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/src/main/resources/web/json/metrics.json b/src/main/resources/web/json/metrics.json index 527f13f..9cb50ad 100644 --- a/src/main/resources/web/json/metrics.json +++ b/src/main/resources/web/json/metrics.json @@ -68,9 +68,9 @@ }, { "id": "bandwidth", -"title": "Total relay bandwidth", +"title": "Total relay bandwidth (deprecated)", "type": "Graph", -"description": "This graph shows the total advertised and consumed bandwidth of all relays in the network.", +"description": "This graph shows the total advertised and consumed bandwidth of all relays in the network. This graph will disappear by December 20, 2018, because it won't contain anything new compared to the soon-to-be tweaked Advertised and consumed bandwidth by relay flags graph.", "function": "bandwidth", "parameters": [ "start", @@ -79,9 +79,9 @@ }, { "id": "bwhist-flags", -"title": "Consumed bandwidth by Exit/Guard flag combination", +"title": "Consumed bandwidth by Exit/Guard flag combination (deprecated)", "type": "Graph", -"description": "This graph shows the consumed bandwidth reported by relays, subdivided into four distinct subsets by assigned \"Exit\" and/or \"Guard\" flags.", +"description": "This graph shows the consumed bandwidth reported by relays, subdivided into four distinct subsets by assigned \"Exit\" and/or \"Guard\" flags. This graph will disappear by December 20, 2018, because it won't contain anything new compared to the soon-to-be tweaked Advertised and consumed bandwidth by relay flags graph.", "function": "bwhist_flags", "parameters": [ "start", diff --git a/src/main/resources/web/jsps/stats.jsp b/src/main/resources/web/jsps/stats.jsp index 17a49ac..002a3af 100644 --- a/src/main/resources/web/jsps/stats.jsp +++ b/src/main/resources/web/jsps/stats.jsp @@ -48,7 +48,8 @@ https://metrics.torproject.org/identifier.csv August 15, 2018: Made the first batch of changes to per-graph CSV files. September 15, 2018: Removed all pre-aggregated CSV files. October 28, 2018: Added and/or removed columns to Tor Browser downloads and updates by platform and Tor Browser downloads and updates by locale graphs. -December 20, 2018: Remove source parameters and output rows with aggregates over all sources from Time to download files over Tor, Timeouts and failures of downloading files over Tor, Circuit build times, Circuit round-trip latencies graphs. +December 20, 2018 (scheduled): Remove source parameters and output rows with aggregates over all sources from Time to download files over Tor, Timeouts and failures of downloading files over Tor, Circuit build times, Circuit round-trip latencies graphs. +December 20, 2018 (scheduled): Remove two graphs Total relay bandwidth and Consumed bandwidth by Exit/Guard flag combination, and update the data format of the Advertised and consumed bandwidth by relay flag graph to cover all data previously contained in the first two graphs. @@ -336,6 +337,11 @@ Traffic # data # + +Deprecated +This graph will disappear by December 20, 2018, because it won't contain anything new compared to the soon-to-be tweaked Advertised and consumed bandwidth by relay flags graph. + + Parameters @@ -367,10 +373,14 @@ Traffic # date: UTC date (-MM-DD) that relays reported bandwidth data for. -guard_advbw: Total advertised bandwidth in Gbit/s that relays with the "Guard" relay flag are capable to provide. -guard_bwhist: Total consumed bandwidth in Gbit/s as the average of written and read traffic of relays with the "Guard" relay flag. -exit_advbw: Total advertised bandwidth in Gbit/s that relays with the "Exit" relay flag are capable to provide. -exit_bwhist: Total consumed bandwidth in Gbit/s as the average of written and read traffic of relays with the "Exit" relay flag. +guard_advbw: Total advertised bandwidth in Gbit/s that relays with the "Guard" relay flag are capable to provide. This column is going to be removed after December 20, 2018. +guard_bwhist: Total consumed bandwidth in Gbit/s as the average of written and read traffic of relays with the "Guard" relay flag. This column is going to be removed after December 20, 2018. +exit_advbw: Total advertised bandwidth in Gbit/s that relays with the "Exit" relay flag are capable to provide. This column is going to be
[tor-commits] [tor-browser-build/master] Bug 25164: Add .apk to our unsigned sha256sums file
commit 3d7c32b67b25d869d94ec8f23da82e7558fb9993 Author: Georg Koppen Date: Thu Dec 6 19:16:16 2018 + Bug 25164: Add .apk to our unsigned sha256sums file --- projects/release/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/release/build b/projects/release/build index e7c7410..cf190a6 100644 --- a/projects/release/build +++ b/projects/release/build @@ -32,7 +32,7 @@ RewriteRule ^sha256sums.txt.asc$ sha256sums-unsigned-build.txt.asc RewriteRule ^sha256sums.incrementals.txt$ sha256sums-unsigned-build.incrementals.txt RewriteRule ^sha256sums.incrementals.txt.asc$ sha256sums-unsigned-build.incrementals.txt.asc EOF -sha256sum $(ls -1 *.exe *.tar.xz *.dmg *.mar *.zip *.tar.gz | grep -v '\.incremental\.mar$' | sort) > sha256sums-unsigned-build.txt +sha256sum $(ls -1 *.exe *.tar.xz *.dmg *.mar *.zip *.tar.gz *.apk | grep -v '\.incremental\.mar$' | sort) > sha256sums-unsigned-build.txt [% IF c("var/sign_build") -%] gpg -abs [% c("var/sign_build_gpg_opts") %] sha256sums-unsigned-build.txt [% END -%] ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-build/master] Bug 28697: Use pre-generated android keystore and fix timestamps on zipped archives
commit ea1d0b24448f0365b9c8ff60a6ab2c4a130ec279 Author: sisbell Date: Tue Dec 4 12:20:40 2018 -0800 Bug 28697: Use pre-generated android keystore and fix timestamps on zipped archives --- projects/tor-browser/android-qa.keystore | Bin 0 -> 2138 bytes projects/tor-browser/build.android| 6 +++--- projects/tor-browser/config | 4 projects/tor-browser/how-to-generate-keystore.txt | 3 +++ 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/projects/tor-browser/android-qa.keystore b/projects/tor-browser/android-qa.keystore new file mode 100644 index 000..90cfaed Binary files /dev/null and b/projects/tor-browser/android-qa.keystore differ diff --git a/projects/tor-browser/build.android b/projects/tor-browser/build.android index b623466..d56d4b5 100644 --- a/projects/tor-browser/build.android +++ b/projects/tor-browser/build.android @@ -9,10 +9,10 @@ cd /var/tmp/build mv $rootdir/[% c('input_files_by_name/https-everywhere') %] $ext_dir/https-everywhere-...@eff.org.xpi mv $rootdir/[% c('input_files_by_name/noscript') %] $ext_dir/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi +[% c("var/touch") %] $ext_dir $ext_dir/* zip -d $apk META-INF/\* -zip -r $apk $ext_dir +zip -r -X $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 1 -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 +[% c("var/faketime") %] jarsigner -verbose -digestalg SHA1 -sigalg MD5withRSA -keystore $rootdir/android-qa.keystore -signedjar $qa_apk $apk androidqakey -storepass android -keypass android diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 43db189..2b937bd 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -46,6 +46,7 @@ targets: var: arch_deps: - openjdk-8-jdk +- faketime input_files: - project: container-image @@ -108,3 +109,6 @@ input_files: URL: https://files.pythonhosted.org/packages/7e/9b/f99171190f04cd23768547dd34533b4016bd582842f53cd9fe9585a74c74/pefile-2017.11.5.tar.gz sha256sum: 675c35ee0e1677db9e80d2f48d8a7ff2cf38e6207e8cd5e2a2c6d126db025854 enable: '[% c("var/windows") %]' + # To generate a new keystore, see how-to-generate-keystore.txt + - filename: android-qa.keystore +enable: '[% c("var/android") %]' diff --git a/projects/tor-browser/how-to-generate-keystore.txt b/projects/tor-browser/how-to-generate-keystore.txt new file mode 100644 index 000..3dbe443 --- /dev/null +++ b/projects/tor-browser/how-to-generate-keystore.txt @@ -0,0 +1,3 @@ +To generate a new keystore, type the following command: + +keytool -genkey -v -keystore android-qa.keystore -storepass android -alias androidqakey -keypass android -keyalg RSA -keysize 2048 -validity 1 -dname "CN=Android Tor QA,O=Tor,C=US" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-build/master] Bug 28750: Switch to Buster for avoiding faketime issues
commit 60163914e4f9418709bfe5b8fdc946fb56ca6e07 Author: Georg Koppen Date: Thu Dec 6 19:13:53 2018 + Bug 28750: Switch to Buster for avoiding faketime issues If we are using faketime on Stretch when signing our debug .apk the build freezes for unknown reasons on some machines. Switching to Buster avoids that. --- projects/tor-browser/config | 5 + 1 file changed, 5 insertions(+) diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 2b937bd..3a7f035 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -47,6 +47,11 @@ targets: arch_deps: - openjdk-8-jdk - faketime + # On some machines using faketime with Stretch to make the debug signature + # leads to a stalled build. Work around this by switching to Buster. + container: +suite: buster +arch: amd64 input_files: - project: container-image ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-build/master] Bug 26843: Get l10n-changesets.json from tor-browser.git
commit bad46e532fa614ffdd3ed0e21f4b8fae3ba7793d Author: Nicolas Vigier Date: Thu Dec 6 14:34:41 2018 + Bug 26843: Get l10n-changesets.json from tor-browser.git The json file used by projects/firefox-locale-bundle is only available from https://product-details.mozilla.org/ after a build has been shipped, which is too late for us. However, it is also available from the firefox sources tree, so we can get it from our tor-browser.git clone instead. The format of this json file is a little different, so we also need to adapt the get_hg_hash script. --- projects/firefox-locale-bundle/build | 6 +- projects/firefox-locale-bundle/config | 4 projects/firefox-locale-bundle/get_hg_hash | 2 +- projects/firefox/config| 2 ++ 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/projects/firefox-locale-bundle/build b/projects/firefox-locale-bundle/build index 3fec48e..7000300 100644 --- a/projects/firefox-locale-bundle/build +++ b/projects/firefox-locale-bundle/build @@ -2,6 +2,10 @@ [% c("var/set_default_env") -%] +cat > l10n-changesets.json << 'EOF_CHANGESETS' +[% pc('firefox', 'var/l10n-changesets.json') %] +EOF_CHANGESETS + clone_dir='[% c("basedir") %]/hg_clones/[% project %]' mkdir -p "$clone_dir" cd "$clone_dir" @@ -19,7 +23,7 @@ tmpdir=$(mktemp -d) cd [% lang %] fi hg_hash=$([% c("basedir") %]/projects/firefox-locale-bundle/get_hg_hash \ -$rootdir/[% c('input_files_by_name/firefox_json') %] \ +$rootdir/l10n-changesets.json \ [% lang %]) [% c("hg") %] archive -r "$hg_hash" -t files "$tmpdir"/[% lang %] cd .. diff --git a/projects/firefox-locale-bundle/config b/projects/firefox-locale-bundle/config index 13c5fb8..2f4997f 100644 --- a/projects/firefox-locale-bundle/config +++ b/projects/firefox-locale-bundle/config @@ -6,7 +6,3 @@ var: use_container: 0 ff_version: '[% pc("firefox", "var/firefox_version") %]' ff_build: build1 - -input_files: - - name: firefox_json -URL: 'https://product-details.mozilla.org/1.0/l10n/Firefox-[% c("var/ff_version") %]-[% c("var/ff_build") %].json' diff --git a/projects/firefox-locale-bundle/get_hg_hash b/projects/firefox-locale-bundle/get_hg_hash index 0531113..9b2b5bd 100755 --- a/projects/firefox-locale-bundle/get_hg_hash +++ b/projects/firefox-locale-bundle/get_hg_hash @@ -16,6 +16,6 @@ exit_error("Error reading $file", 2) unless defined $json_text; my $data = decode_json($json_text); -my $changeset = $data->{locales}{$locale}{changeset}; +my $changeset = $data->{$locale}{revision}; exit_error("Can't find locale $locale in $file", 3) unless $changeset; print "$changeset\n"; diff --git a/projects/firefox/config b/projects/firefox/config index 314326f..7ffaf43 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -24,6 +24,8 @@ var: use_container: 1 # this should be updated when the list of gradle dependencies is changed gradle_dependencies_version: 3 + # used by projects/firefox-locale-bundle + l10n-changesets.json: '[% exec("cat mobile/locales/l10n-changesets.json") %]' targets: release: ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/donatepages-messagespot] Update translations for donatepages-messagespot
commit 4a610141b879ba69e9345ecfd5c0ca4c6d8d0bb1 Author: Translation commit bot Date: Thu Dec 6 18:45:21 2018 + Update translations for donatepages-messagespot --- locale/fr/LC_MESSAGES/messages.po | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po index 69456ed6d..3d9c7ec88 100644 --- a/locale/fr/LC_MESSAGES/messages.po +++ b/locale/fr/LC_MESSAGES/messages.po @@ -602,16 +602,16 @@ msgid "" "Tell family, friends, and colleagues that you're supporting privacy and " "security with Tor!" msgstr "" -"Dites à votre famille, vos amis et collègues que vous soutenez la " -"confidentialité et la sécurité avec Tor !" +"Dites à votre famille, à vos amis et à vos collègues que vous soutenez le " +"droit à la vie privée et la sécurité avec Torâ!" #: tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:62 msgid "SHARE THE TOR PROJECT" -msgstr "PARTAGER LE PROJET TOR" +msgstr "PARTAGEZ LE PROJET TOR" #: tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:88 msgid "Got Skills?" -msgstr "Vous avez Skills ?" +msgstr "Avez-vous des compétencesâ?" #: tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:94 msgid "The Tor network depends on volunteers." ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tba-torbrowserstringsdtd_completed] Update translations for tba-torbrowserstringsdtd_completed
commit 56cbfe0fc5299455bd5125a11871681e3b6c95e7 Author: Translation commit bot Date: Thu Dec 6 18:16:57 2018 + Update translations for tba-torbrowserstringsdtd_completed --- es/android_strings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es/android_strings.dtd b/es/android_strings.dtd index 17b841191..a1eebd9b5 100644 --- a/es/android_strings.dtd +++ b/es/android_strings.dtd @@ -21,5 +21,5 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tba-torbrowserstringsdtd] Update translations for tba-torbrowserstringsdtd
commit 841ee8125193394061f73eb03963f8d8d462076c Author: Translation commit bot Date: Thu Dec 6 18:16:51 2018 + Update translations for tba-torbrowserstringsdtd --- es/android_strings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es/android_strings.dtd b/es/android_strings.dtd index 17b841191..a1eebd9b5 100644 --- a/es/android_strings.dtd +++ b/es/android_strings.dtd @@ -21,5 +21,5 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
commit e1b542e7db8600334b87ed2356f13130212381c9 Author: Translation commit bot Date: Thu Dec 6 16:41:01 2018 + Update translations for tor-launcher-network-settings_completed --- et/network-settings.dtd | 62 + 1 file changed, 62 insertions(+) diff --git a/et/network-settings.dtd b/et/network-settings.dtd new file mode 100644 index 0..6af4f5481 --- /dev/null +++ b/et/network-settings.dtd @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
commit 7fffe3f95d9283ad36fbcaa6a30d1da683cd Author: Translation commit bot Date: Thu Dec 6 16:40:55 2018 + Update translations for tor-launcher-network-settings --- et/network-settings.dtd | 76 - 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/et/network-settings.dtd b/et/network-settings.dtd index 1e7c7126c..6af4f5481 100644 --- a/et/network-settings.dtd +++ b/et/network-settings.dtd @@ -1,62 +1,62 @@ - - - - + + + + - - + + - - - - + + + + - + - - + + - + - - - + + + - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-browseronboardingproperties] Update translations for torbutton-browseronboardingproperties
commit a5a85b8a5b53a96678a497c8789f5b98e3c5cbbc Author: Translation commit bot Date: Thu Dec 6 16:40:28 2018 + Update translations for torbutton-browseronboardingproperties --- et/browserOnboarding.properties | 14 +++--- ro/browserOnboarding.properties | 12 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/et/browserOnboarding.properties b/et/browserOnboarding.properties index 8dc186756..bc75a29b9 100644 --- a/et/browserOnboarding.properties +++ b/et/browserOnboarding.properties @@ -2,18 +2,18 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -onboarding.tour-tor-welcome=Welcome +onboarding.tour-tor-welcome=Tere tulemast 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-privacy=Privaatsus -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.title=Väldi jälitajaid ja muidunuuskijaid. +onboarding.tour-tor-privacy.description=Tor'i brauser isoleerib küpsised ja kustutab teie brauseriajaloo pärast teie sessiooni. Need modifikatsioonid tagavad Teie privaatsuse ja turvalisuse ja on brauseris kaitstud. Klikkige âTor'i võrkâ nupu peale et õppida kuidas me Teid võrgutasandil kaitseme. +onboarding.tour-tor-privacy.button=Mine Tor'i võrkku -onboarding.tour-tor-network=Tor Network -onboarding.tour-tor-network.title=Travel a decentralized network. +onboarding.tour-tor-network=Tor'i võrk +onboarding.tour-tor-network.title=Rända mööda detsentraliseeritud võrku. onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, thereâs no one point of failure or centralized entity you need to trust in order to enjoy the internet privately. onboarding.tour-tor-network.button=Go to Circuit Display @@ -23,7 +23,7 @@ onboarding.tour-tor-circuit-display.description=For each domain you visit, your onboarding.tour-tor-circuit-display.button=See My Path onboarding.tour-tor-security=Turvalisus -onboarding.tour-tor-security.title=Choose your experience. +onboarding.tour-tor-security.title=Valige kuidas soovite kogeda. onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do. onboarding.tour-tor-security.button=Review Settings diff --git a/ro/browserOnboarding.properties b/ro/browserOnboarding.properties index bf29fdaf6..96926dd27 100644 --- a/ro/browserOnboarding.properties +++ b/ro/browserOnboarding.properties @@ -8,12 +8,12 @@ onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard onboarding.tour-tor-welcome.button=Start Now onboarding.tour-tor-privacy=Securitate -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.title=TerÈi ce urmÄresc activitatea. +onboarding.tour-tor-privacy.description=Tor Browser izolveazÄ cookie-urile Èi Èterge istoricul de navigare dupÄ fiecare sesiune. Aceste modificÄri asigurÄ intimitatea Èi siguranÈa ta. ApasÄ âReÈea Torâ pentru a afla cum te protejÄm la nivel de reÈea. +onboarding.tour-tor-privacy.button=CÄtre reÈea Tor -onboarding.tour-tor-network=Tor Network -onboarding.tour-tor-network.title=Travel a decentralized network. +onboarding.tour-tor-network=ReÈea Tor +onboarding.tour-tor-network.title=NavigheazÄ Ã®ntr-o reÈea descentralizatÄ onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, thereâs no one point of failure or centralized entity you need to trust in order to enjoy the internet privately. onboarding.tour-tor-network.button=Go to Circuit Display @@ -23,7 +23,7 @@ onboarding.tour-tor-circuit-display.description=For each domain you visit, your
[tor-commits] [translation-tools/master] remove manual in mallard, now we have the lektor one
commit db5ec463b41315e6c5fdbdbb634d671d4cc60979 Author: emma peel Date: Thu Dec 6 16:36:16 2018 + remove manual in mallard, now we have the lektor one --- config | 1 - 1 file changed, 1 deletion(-) diff --git a/config b/config index 80f7714..4eb82fc 100644 --- a/config +++ b/config @@ -25,7 +25,6 @@ tbmanual-contentspot tbmanual-contentspot_completed tor-and-https tor-and-https_completed tor_animation tor_animation_completed torbirdy torbirdy_completed -tor-browser-manual tor-browser-manual_completed torbutton-brandproperties torbutton-brandproperties_completed torbutton-branddtd torbutton-branddtd_completed torbutton-torbuttonproperties torbutton-torbuttonproperties_completed ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tba-torbrowserstringsdtd] Update translations for tba-torbrowserstringsdtd
commit 0077dfdc2242f5974c9dd115d3703877c05b720d Author: Translation commit bot Date: Thu Dec 6 16:34:04 2018 + Update translations for tba-torbrowserstringsdtd --- et/android_strings.dtd | 25 + 1 file changed, 25 insertions(+) diff --git a/et/android_strings.dtd b/et/android_strings.dtd new file mode 100644 index 0..f8ebd4c6d --- /dev/null +++ b/et/android_strings.dtd @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-persistence-setup] Update translations for tails-persistence-setup
commit 77528635090aa18aca733df961e03b045d8be831 Author: Translation commit bot Date: Thu Dec 6 16:33:56 2018 + Update translations for tails-persistence-setup --- ca/ca.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ca/ca.po b/ca/ca.po index a697bab37..a06071bf9 100644 --- a/ca/ca.po +++ b/ca/ca.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: Tails developers \n" "POT-Creation-Date: 2018-11-01 12:21+0100\n" -"PO-Revision-Date: 2018-12-05 19:51+\n" +"PO-Revision-Date: 2018-12-06 11:53+\n" "Last-Translator: Jaime Muñoz MartÃn \n" "Language-Team: Catalan (http://www.transifex.com/otf/torproject/language/ca/)\n" "MIME-Version: 1.0\n" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tba-torbrowserstringsdtd_completed] Update translations for tba-torbrowserstringsdtd_completed
commit 4eca7e0c90e96d6a8ac900b8b25e7f02c1155249 Author: Translation commit bot Date: Thu Dec 6 16:34:09 2018 + Update translations for tba-torbrowserstringsdtd_completed --- et/android_strings.dtd | 25 + 1 file changed, 25 insertions(+) diff --git a/et/android_strings.dtd b/et/android_strings.dtd new file mode 100644 index 0..f8ebd4c6d --- /dev/null +++ b/et/android_strings.dtd @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-openpgp-applet] Update translations for tails-openpgp-applet
commit c25b2379f3278d8adf0f4bc3c443d156dfd100be Author: Translation commit bot Date: Thu Dec 6 16:33:35 2018 + Update translations for tails-openpgp-applet --- et/openpgp-applet.pot | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/et/openpgp-applet.pot b/et/openpgp-applet.pot index 8d962eb0e..784c21563 100644 --- a/et/openpgp-applet.pot +++ b/et/openpgp-applet.pot @@ -4,14 +4,15 @@ # # Translators: # Kristjan Räts , 2016 +# Paul Martin Korp , 2018 # Rivo Zängov , 2018 msgid "" msgstr "" -"Project-Id-Version: The Tor Project\n" +"Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: ta...@boum.org\n" "POT-Creation-Date: 2017-08-05 15:07-0400\n" -"PO-Revision-Date: 2018-08-06 16:48+\n" -"Last-Translator: Madis\n" +"PO-Revision-Date: 2018-12-06 14:38+\n" +"Last-Translator: Paul Martin Korp \n" "Language-Team: Estonian (http://www.transifex.com/otf/torproject/language/et/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,11 +22,11 @@ msgstr "" #: bin/openpgp-applet:160 msgid "You are about to exit OpenPGP Applet. Are you sure?" -msgstr "" +msgstr "Te olete väljumas OpenPGP aplettist. Kas te olete kindel?" #: bin/openpgp-applet:172 msgid "OpenPGP encryption applet" -msgstr "" +msgstr "OpenPGP krüpteerimisaplett" #: bin/openpgp-applet:175 msgid "Exit" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-onioncircuits_completed] Update translations for tails-onioncircuits_completed
commit 21fc177f442aaf1bc3c8083df458539e1aeecbab Author: Translation commit bot Date: Thu Dec 6 16:33:50 2018 + Update translations for tails-onioncircuits_completed --- et/onioncircuits.pot | 87 1 file changed, 87 insertions(+) diff --git a/et/onioncircuits.pot b/et/onioncircuits.pot new file mode 100644 index 0..b433fce7f --- /dev/null +++ b/et/onioncircuits.pot @@ -0,0 +1,87 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Paul Martin Korp , 2018 +# Rivo Zängov , 2018 +msgid "" +msgstr "" +"Project-Id-Version: Tor Project\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-08-03 13:00+\n" +"PO-Revision-Date: 2018-12-06 11:41+\n" +"Last-Translator: Paul Martin Korp \n" +"Language-Team: Estonian (http://www.transifex.com/otf/torproject/language/et/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: et\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../onioncircuits:81 +msgid "You are not connected to Tor yet..." +msgstr "Te ei ole veel Tor'i ühendunud..." + +#: ../onioncircuits:95 +msgid "Onion Circuits" +msgstr "Sibula ringteed" + +#: ../onioncircuits:125 +msgid "Circuit" +msgstr "Ringtee" + +#: ../onioncircuits:126 +msgid "Status" +msgstr "Staatus" + +#: ../onioncircuits:142 +msgid "Click on a circuit for more detail about its Tor relays." +msgstr "Kliki ringtee peale, et kuvada lisaandmeid Tor'i ringteede kohta." + +#: ../onioncircuits:221 +msgid "The connection to Tor was lost..." +msgstr "Ãhendus Tor'iga katkes..." + +#: ../onioncircuits:317 +msgid "..." +msgstr "..." + +#: ../onioncircuits:343 +#, c-format +msgid "%s: %s" +msgstr "%s: %s" + +#: ../onioncircuits:554 +msgid "GeoIP database unavailable. No country information will be displayed." +msgstr "GeoIP andmebaas polnud saadaval. Informatsiooni riigi kohta ei kuvata." + +#: ../onioncircuits:585 +#, c-format +msgid "%s (%s)" +msgstr "%s(%s)" + +#: ../onioncircuits:590 +#, c-format +msgid "%.2f Mb/s" +msgstr "%.2fMb/s" + +#: ../onioncircuits:592 ../onioncircuits:593 ../onioncircuits:594 +msgid "Unknown" +msgstr "Tundmatu" + +#: ../onioncircuits:607 +msgid "Fingerprint:" +msgstr "Sõrmejälg:" + +#: ../onioncircuits:608 +msgid "Published:" +msgstr "Avaldatud:" + +#: ../onioncircuits:609 +msgid "IP:" +msgstr "IP:" + +#: ../onioncircuits:610 +msgid "Bandwidth:" +msgstr "Ribalaius:" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-onioncircuits] Update translations for tails-onioncircuits
commit 44d778403cd0d8fd6e3c21ed3cc23fc93ee51536 Author: Translation commit bot Date: Thu Dec 6 16:33:45 2018 + Update translations for tails-onioncircuits --- et/onioncircuits.pot | 29 +++-- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/et/onioncircuits.pot b/et/onioncircuits.pot index 77cd4373f..b433fce7f 100644 --- a/et/onioncircuits.pot +++ b/et/onioncircuits.pot @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Paul Martin Korp , 2018 # Rivo Zängov , 2018 msgid "" msgstr "" -"Project-Id-Version: The Tor Project\n" +"Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-08-03 13:00+\n" -"PO-Revision-Date: 2018-01-17 14:18+\n" -"Last-Translator: Rivo Zängov \n" +"PO-Revision-Date: 2018-12-06 11:41+\n" +"Last-Translator: Paul Martin Korp \n" "Language-Team: Estonian (http://www.transifex.com/otf/torproject/language/et/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,15 +21,15 @@ msgstr "" #: ../onioncircuits:81 msgid "You are not connected to Tor yet..." -msgstr "" +msgstr "Te ei ole veel Tor'i ühendunud..." #: ../onioncircuits:95 msgid "Onion Circuits" -msgstr "" +msgstr "Sibula ringteed" #: ../onioncircuits:125 msgid "Circuit" -msgstr "" +msgstr "Ringtee" #: ../onioncircuits:126 msgid "Status" @@ -36,15 +37,15 @@ msgstr "Staatus" #: ../onioncircuits:142 msgid "Click on a circuit for more detail about its Tor relays." -msgstr "" +msgstr "Kliki ringtee peale, et kuvada lisaandmeid Tor'i ringteede kohta." #: ../onioncircuits:221 msgid "The connection to Tor was lost..." -msgstr "" +msgstr "Ãhendus Tor'iga katkes..." #: ../onioncircuits:317 msgid "..." -msgstr "" +msgstr "..." #: ../onioncircuits:343 #, c-format @@ -53,17 +54,17 @@ msgstr "%s: %s" #: ../onioncircuits:554 msgid "GeoIP database unavailable. No country information will be displayed." -msgstr "" +msgstr "GeoIP andmebaas polnud saadaval. Informatsiooni riigi kohta ei kuvata." #: ../onioncircuits:585 #, c-format msgid "%s (%s)" -msgstr "" +msgstr "%s(%s)" #: ../onioncircuits:590 #, c-format msgid "%.2f Mb/s" -msgstr "" +msgstr "%.2fMb/s" #: ../onioncircuits:592 ../onioncircuits:593 ../onioncircuits:594 msgid "Unknown" @@ -79,8 +80,8 @@ msgstr "Avaldatud:" #: ../onioncircuits:609 msgid "IP:" -msgstr "" +msgstr "IP:" #: ../onioncircuits:610 msgid "Bandwidth:" -msgstr "" +msgstr "Ribalaius:" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/mat-gui] Update translations for mat-gui
commit d95e8e24873f4322535bcd80816f419b82c1ef21 Author: Translation commit bot Date: Thu Dec 6 16:32:51 2018 + Update translations for mat-gui --- et.po | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/et.po b/et.po index 2a30990cd..d760b26f4 100644 --- a/et.po +++ b/et.po @@ -5,13 +5,14 @@ # Translators: # G , 2015 # Kristjan Räts , 2016 +# Paul Martin Korp , 2018 msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-10 23:06+0100\n" -"PO-Revision-Date: 2018-10-04 00:25+\n" -"Last-Translator: erinm\n" +"PO-Revision-Date: 2018-12-06 14:37+\n" +"Last-Translator: Paul Martin Korp \n" "Language-Team: Estonian (http://www.transifex.com/otf/torproject/language/et/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -67,11 +68,11 @@ msgstr "Eelistused" #: mat-gui:232 msgid "Reduce PDF quality" -msgstr "Vähenda PDFi kvaliteeti" +msgstr "Vähenda PDF'i kvaliteeti" #: mat-gui:235 msgid "Reduce the produced PDF size and quality" -msgstr "Vähenda valmistatud PDFi suurust ja kvaliteeti" +msgstr "Vähenda valmistatud PDF'i suurust ja kvaliteeti" #: mat-gui:238 msgid "Remove unsupported file from archives" @@ -162,7 +163,7 @@ msgstr "Metaandmed" #: data/mat.glade:354 msgid "Name" -msgstr "Name" +msgstr "Nimi" #: data/mat.glade:368 msgid "Content" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
commit 5b9223ec933dab7a492af66992dc45c214bdce5c Author: Translation commit bot Date: Thu Dec 6 16:32:46 2018 + Update translations for liveusb-creator_completed --- et/et.po | 521 +++ 1 file changed, 521 insertions(+) diff --git a/et/et.po b/et/et.po new file mode 100644 index 0..bbb079ed5 --- /dev/null +++ b/et/et.po @@ -0,0 +1,521 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Paul Martin Korp , 2018 +msgid "" +msgstr "" +"Project-Id-Version: Tor Project\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-10-20 12:34+0200\n" +"PO-Revision-Date: 2018-12-06 13:51+\n" +"Last-Translator: Paul Martin Korp \n" +"Language-Team: Estonian (http://www.transifex.com/otf/torproject/language/et/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: et\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../tails_installer/creator.py:100 +msgid "You must run this application as root" +msgstr "Te peate käivitama selle rakenduse root'ina" + +#: ../tails_installer/creator.py:146 +msgid "Extracting live image to the target device..." +msgstr "Ekstraktin live image't sihtseadmesse..." + +#: ../tails_installer/creator.py:153 +#, python-format +msgid "Wrote to device at %(speed)d MB/sec" +msgstr "Kirjutasin seadmele %(speed)dMB/sek" + +#: ../tails_installer/creator.py:296 +#, python-format +msgid "" +"There was a problem executing the following command: `%(command)s`.\n" +"A more detailed error log has been written to '%(filename)s'." +msgstr "Ilmnes viga järgneva käsu täitmisel:`%(command)s`.\nDetailsem vealogi kirjutati '%(filename)s'." + +#: ../tails_installer/creator.py:315 +msgid "Verifying SHA1 checksum of LiveCD image..." +msgstr "Kontrollin LiveCD SHA1 checksummi..." + +#: ../tails_installer/creator.py:319 +msgid "Verifying SHA256 checksum of LiveCD image..." +msgstr "Kontrollin LiveCD SHA256 checksummi..." + +#: ../tails_installer/creator.py:335 +msgid "" +"Error: The SHA1 of your Live CD is invalid. You can run this program with " +"the --noverify argument to bypass this verification check." +msgstr "Viga: Teie LiveCD SHA1 on kehtetu. Te võite jooksutada seda programmi -noverify argumendiga et seda kontrolli ignoreerida." + +#: ../tails_installer/creator.py:341 +msgid "Unknown ISO, skipping checksum verification" +msgstr "Teadmatu ISO, jätan checksumi kontrollimise vahele" + +#: ../tails_installer/creator.py:353 +#, python-format +msgid "" +"Not enough free space on device.\n" +"%dMB ISO + %dMB overlay > %dMB free space" +msgstr "Teie seadmel pole piisavalt palju vaba ruumi. %dMB ISO+ %dMB pealistus> %dMB vaba ruumi" + +#: ../tails_installer/creator.py:360 +#, python-format +msgid "Creating %sMB persistent overlay" +msgstr "Loon %sMB püsivat pealistust" + +#: ../tails_installer/creator.py:421 +#, python-format +msgid "Unable to copy %(infile)s to %(outfile)s: %(message)s" +msgstr "Ei suutnud kopeerida %(infile)s %(outfile)s'i: %(message)s" + +#: ../tails_installer/creator.py:435 +msgid "Removing existing Live OS" +msgstr "Eemalda olemasolev Live OS" + +#: ../tails_installer/creator.py:444 ../tails_installer/creator.py:457 +#, python-format +msgid "Unable to chmod %(file)s: %(message)s" +msgstr "Ei suutnud chmod'ida %(file)s:%(message)s" + +#: ../tails_installer/creator.py:450 +#, python-format +msgid "Unable to remove file from previous LiveOS: %(message)s" +msgstr "Ei suutnud faili eelnevast LiveOS'ist eemaldada: %(message)s" + +#: ../tails_installer/creator.py:464 +#, python-format +msgid "Unable to remove directory from previous LiveOS: %(message)s" +msgstr "Ei suutnud kataloogi eelnevast LiveOS'ist eemaldada: %(message)s" + +#: ../tails_installer/creator.py:512 +#, python-format +msgid "Cannot find device %s" +msgstr "Ei suuda leida seadet %s" + +#: ../tails_installer/creator.py:713 +#, python-format +msgid "Unable to write on %(device)s, skipping." +msgstr "Ei suutnud kirjutada %(device)s'le, jätan vahele." + +#: ../tails_installer/creator.py:743 +#, python-format +msgid "" +"Some partitions of the target device %(device)s are mounted. They will be " +"unmounted before starting the installation process." +msgstr "Osad sihtseadme %(device)s jaotused on paigaldatud. Need võetakse ära enne installimisprotsessi alustamist." + +#: ../tails_installer/creator.py:786 ../tails_installer/creator.py:1010 +msgid "Unknown filesystem. Your device may need to be reformatted." +msgstr "Teadmatu failisüsteem. Teie seadet peab võib-olla taaslähtestama. " + +#: ../tails_installer/creator.py:789 ../tails_installer/creator.py:1013 +#, python-format +msgid "Unsupported filesystem: %s" +msgstr "Toetamata failisüsteem: %s" + +#: ../tails_installer/creator.py:807 +#, python-format +msgid "Unknown GLib exception while
[tor-commits] [translation/mat-gui_completed] Update translations for mat-gui_completed
commit 2e39032cc4d52bb751178bdf689f5b2b13dbbfb4 Author: Translation commit bot Date: Thu Dec 6 16:32:56 2018 + Update translations for mat-gui_completed --- et.po | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/et.po b/et.po index 2a30990cd..d760b26f4 100644 --- a/et.po +++ b/et.po @@ -5,13 +5,14 @@ # Translators: # G , 2015 # Kristjan Räts , 2016 +# Paul Martin Korp , 2018 msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-10 23:06+0100\n" -"PO-Revision-Date: 2018-10-04 00:25+\n" -"Last-Translator: erinm\n" +"PO-Revision-Date: 2018-12-06 14:37+\n" +"Last-Translator: Paul Martin Korp \n" "Language-Team: Estonian (http://www.transifex.com/otf/torproject/language/et/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -67,11 +68,11 @@ msgstr "Eelistused" #: mat-gui:232 msgid "Reduce PDF quality" -msgstr "Vähenda PDFi kvaliteeti" +msgstr "Vähenda PDF'i kvaliteeti" #: mat-gui:235 msgid "Reduce the produced PDF size and quality" -msgstr "Vähenda valmistatud PDFi suurust ja kvaliteeti" +msgstr "Vähenda valmistatud PDF'i suurust ja kvaliteeti" #: mat-gui:238 msgid "Remove unsupported file from archives" @@ -162,7 +163,7 @@ msgstr "Metaandmed" #: data/mat.glade:354 msgid "Name" -msgstr "Name" +msgstr "Nimi" #: data/mat.glade:368 msgid "Content" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator
commit fd1c4e27e358417b0daa5ab59ba6c5b069291d27 Author: Translation commit bot Date: Thu Dec 6 16:32:40 2018 + Update translations for liveusb-creator --- et/et.po | 291 --- 1 file changed, 146 insertions(+), 145 deletions(-) diff --git a/et/et.po b/et/et.po index 69b7d9ead..bbb079ed5 100644 --- a/et/et.po +++ b/et/et.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Paul Martin Korp , 2018 msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-10-17 13:11+0200\n" -"PO-Revision-Date: 2018-10-17 14:51+\n" -"Last-Translator: erinm\n" +"POT-Creation-Date: 2018-10-20 12:34+0200\n" +"PO-Revision-Date: 2018-12-06 13:51+\n" +"Last-Translator: Paul Martin Korp \n" "Language-Team: Estonian (http://www.transifex.com/otf/torproject/language/et/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,346 +20,346 @@ msgstr "" #: ../tails_installer/creator.py:100 msgid "You must run this application as root" -msgstr "" +msgstr "Te peate käivitama selle rakenduse root'ina" #: ../tails_installer/creator.py:146 msgid "Extracting live image to the target device..." -msgstr "" +msgstr "Ekstraktin live image't sihtseadmesse..." #: ../tails_installer/creator.py:153 #, python-format msgid "Wrote to device at %(speed)d MB/sec" -msgstr "" +msgstr "Kirjutasin seadmele %(speed)dMB/sek" #: ../tails_installer/creator.py:296 #, python-format msgid "" "There was a problem executing the following command: `%(command)s`.\n" "A more detailed error log has been written to '%(filename)s'." -msgstr "" +msgstr "Ilmnes viga järgneva käsu täitmisel:`%(command)s`.\nDetailsem vealogi kirjutati '%(filename)s'." #: ../tails_installer/creator.py:315 msgid "Verifying SHA1 checksum of LiveCD image..." -msgstr "" +msgstr "Kontrollin LiveCD SHA1 checksummi..." #: ../tails_installer/creator.py:319 msgid "Verifying SHA256 checksum of LiveCD image..." -msgstr "" +msgstr "Kontrollin LiveCD SHA256 checksummi..." #: ../tails_installer/creator.py:335 msgid "" "Error: The SHA1 of your Live CD is invalid. You can run this program with " "the --noverify argument to bypass this verification check." -msgstr "" +msgstr "Viga: Teie LiveCD SHA1 on kehtetu. Te võite jooksutada seda programmi -noverify argumendiga et seda kontrolli ignoreerida." #: ../tails_installer/creator.py:341 msgid "Unknown ISO, skipping checksum verification" -msgstr "" +msgstr "Teadmatu ISO, jätan checksumi kontrollimise vahele" #: ../tails_installer/creator.py:353 #, python-format msgid "" "Not enough free space on device.\n" "%dMB ISO + %dMB overlay > %dMB free space" -msgstr "" +msgstr "Teie seadmel pole piisavalt palju vaba ruumi. %dMB ISO+ %dMB pealistus> %dMB vaba ruumi" #: ../tails_installer/creator.py:360 #, python-format msgid "Creating %sMB persistent overlay" -msgstr "" +msgstr "Loon %sMB püsivat pealistust" #: ../tails_installer/creator.py:421 #, python-format msgid "Unable to copy %(infile)s to %(outfile)s: %(message)s" -msgstr "" +msgstr "Ei suutnud kopeerida %(infile)s %(outfile)s'i: %(message)s" #: ../tails_installer/creator.py:435 msgid "Removing existing Live OS" -msgstr "" +msgstr "Eemalda olemasolev Live OS" -#: ../tails_installer/creator.py:444 ../tails_installer/creator.py:456 +#: ../tails_installer/creator.py:444 ../tails_installer/creator.py:457 #, python-format msgid "Unable to chmod %(file)s: %(message)s" -msgstr "" +msgstr "Ei suutnud chmod'ida %(file)s:%(message)s" -#: ../tails_installer/creator.py:449 +#: ../tails_installer/creator.py:450 #, python-format msgid "Unable to remove file from previous LiveOS: %(message)s" -msgstr "" +msgstr "Ei suutnud faili eelnevast LiveOS'ist eemaldada: %(message)s" -#: ../tails_installer/creator.py:462 +#: ../tails_installer/creator.py:464 #, python-format msgid "Unable to remove directory from previous LiveOS: %(message)s" -msgstr "" +msgstr "Ei suutnud kataloogi eelnevast LiveOS'ist eemaldada: %(message)s" -#: ../tails_installer/creator.py:510 +#: ../tails_installer/creator.py:512 #, python-format msgid "Cannot find device %s" -msgstr "" +msgstr "Ei suuda leida seadet %s" -#: ../tails_installer/creator.py:711 +#: ../tails_installer/creator.py:713 #, python-format msgid "Unable to write on %(device)s, skipping." -msgstr "" +msgstr "Ei suutnud kirjutada %(device)s'le, jätan vahele." -#: ../tails_installer/creator.py:741 +#: ../tails_installer/creator.py:743 #, python-format msgid "" "Some partitions of the target device %(device)s are mounted. They will be " "unmounted before starting the installation process." -msgstr "" +msgstr "Osad sihtseadme %(device)s jaotused on paigaldatud. Need võetakse ära enne installimisprotsessi alustamist." -#: ../tails_installer/creator.py:784
[tor-commits] [translation/https_everywhere_completed] Update translations for https_everywhere_completed
commit 05911de1413c99e3b89c376fd9e755ba680bf94b Author: Translation commit bot Date: Thu Dec 6 16:32:34 2018 + Update translations for https_everywhere_completed --- et/https-everywhere.dtd | 26 +++--- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/et/https-everywhere.dtd b/et/https-everywhere.dtd index d1edb9ce1..251ae64d5 100644 --- a/et/https-everywhere.dtd +++ b/et/https-everywhere.dtd @@ -1,5 +1,5 @@ - - + + @@ -7,18 +7,20 @@ - - + + - + - + + + @@ -29,18 +31,20 @@ - + - + - + - + + + - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/https_everywhere] Update translations for https_everywhere
commit a070c88e5f1eae2b4782ed85be49dee16fb9288f Author: Translation commit bot Date: Thu Dec 6 16:32:28 2018 + Update translations for https_everywhere --- et/https-everywhere.dtd | 30 +++--- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/et/https-everywhere.dtd b/et/https-everywhere.dtd index 7df14cfdb..251ae64d5 100644 --- a/et/https-everywhere.dtd +++ b/et/https-everywhere.dtd @@ -1,5 +1,5 @@ - - + + @@ -7,20 +7,20 @@ - - + + - + - - - + + + @@ -31,20 +31,20 @@ - + - + - + - - - + + + - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/bridgedb_completed] Update translations for bridgedb_completed
commit 1573ac678f2ff625e05a1f96fc472982f62796a6 Author: Translation commit bot Date: Thu Dec 6 16:32:04 2018 + Update translations for bridgedb_completed --- et/LC_MESSAGES/bridgedb.po | 59 +++--- 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/et/LC_MESSAGES/bridgedb.po b/et/LC_MESSAGES/bridgedb.po index a1a8cfe35..de5712e82 100644 --- a/et/LC_MESSAGES/bridgedb.po +++ b/et/LC_MESSAGES/bridgedb.po @@ -5,13 +5,14 @@ # Translators: # G , 2015 # Mart Laub , 2014 +# Paul Martin Korp , 2018 msgid "" msgstr "" -"Project-Id-Version: The Tor Project\n" +"Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n" "POT-Creation-Date: 2015-07-25 03:40+\n" -"PO-Revision-Date: 2018-04-12 18:54+\n" -"Last-Translator: IDRASSI Mounir \n" +"PO-Revision-Date: 2018-12-06 12:22+\n" +"Last-Translator: Paul Martin Korp \n" "Language-Team: Estonian (http://www.transifex.com/otf/torproject/language/et/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -33,7 +34,7 @@ msgstr "" #. "Tor Browser" #: bridgedb/https/server.py:167 msgid "Sorry! Something went wrong with your request." -msgstr "Vabandust! Midagi läks sinu päringuga valesti." +msgstr "Vabandust! Midagi läks Teie päringuga valesti." #: bridgedb/https/templates/base.html:79 msgid "Report a Bug" @@ -57,7 +58,7 @@ msgstr "Vali kõik" #: bridgedb/https/templates/bridges.html:40 msgid "Show QRCode" -msgstr "Näita QRKoodi" +msgstr "Näita QR-koodi" #: bridgedb/https/templates/bridges.html:52 msgid "QRCode for your bridge lines" @@ -74,7 +75,7 @@ msgstr "Oli seda nüüd vaja..." #: bridgedb/https/templates/bridges.html:68 msgid "It seems there was an error getting your QRCode." -msgstr "Viga tekkis teie QRKoodi hankimisel." +msgstr "QR-koodi hankimisel ilmnes viga." #: bridgedb/https/templates/bridges.html:73 msgid "" @@ -101,7 +102,7 @@ msgstr "%s1%s samm." #: bridgedb/https/templates/index.html:13 #, python-format msgid "Download %s Tor Browser %s" -msgstr "Lae alla %s Tor Browser %s" +msgstr "Lae alla %s Tor brauser %s" #: bridgedb/https/templates/index.html:25 #, python-format @@ -121,7 +122,7 @@ msgstr "%s3%s samm." #: bridgedb/https/templates/index.html:38 #, python-format msgid "Now %s add the bridges to Tor Browser %s" -msgstr "Nüüd %s lisa sillad Tor Browseri %s" +msgstr "Nüüd %s lisa sillad Tor'i brauserisse%s" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! @@ -158,7 +159,7 @@ msgstr "%sJ%sah!" #: bridgedb/https/templates/options.html:147 #, python-format msgid "%sG%set Bridges" -msgstr "%sH%sangi Bridges" +msgstr "%sH%sangi sillad" #: bridgedb/strings.py:43 msgid "[This is an automated message; please do not reply.]" @@ -173,12 +174,12 @@ msgstr "Siin on sinu sillad:" msgid "" "You have exceeded the rate limit. Please slow down! The minimum time between\n" "emails is %s hours. All further emails during this time period will be ignored." -msgstr "Oled ületanud määra limiidi. Palun võta aeglasemalt! Miinimum aeg e-mailide vahel\non %s tundi. Edasiseid e-maile selles ajavahemikus ignoreeritakse." +msgstr "Olete ületanud määra limiidi. Palun võtke aeglasemalt! Miinimum aeg e-mailide vahel\non %s tundi. Edasiseid e-maile selles ajavahemikus ignoreeritakse." #: bridgedb/strings.py:50 msgid "" "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" -msgstr "KÃSUD: (ühenda KÃSUD, et täpsustada valikuid üheaegselt)" +msgstr "KÃSUD: (kombineeri KÃSUD, et täpsustada valikuid üheaegselt)" #. TRANSLATORS: Please DO NOT translate the word "BridgeDB". #: bridgedb/strings.py:53 @@ -247,7 +248,7 @@ msgid "" "Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n" "help to circumvent internet censorship in many cases.\n" "\n" -msgstr "Lisaks, BridgeDB-l on hulgaliselt tavapäraseid, igavaid sildu %s ilma\nPluggable Transports-ideta %s, mis võib-olla ei kõla kutsuvalt, kuid on siiski\nsuutelised aitama hiilida interneti tsensuuris nii mitmelgi juhul.\n\n" +msgstr "Lisaks on BridgeDB-l ka palju tavapäraseid, igavaid sildu %s ilma\nPluggable Transports-ideta %s, mis võib-olla ei kõla nii lahedalt, kuid need sillad saavad teil paljudel juhtul internetitsensuuri eest kõrvale põigata.\n\n" #: bridgedb/strings.py:101 msgid "What are bridges?" @@ -256,7 +257,7 @@ msgstr "Mis on sillad?" #: bridgedb/strings.py:102 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." -msgstr "%s Sillad %s on Tor-i osad, mis aitavad interneti tsensuursuses ringi hiilida." +msgstr "%s Sillad %s on Tor-i releed, mis aitavad internetitsensuuri eest kõrvale põigata." #: bridgedb/strings.py:107
[tor-commits] [translation/bridgedb] Update translations for bridgedb
commit 772df52e0f3ef0efdaf4b88e991a7bfac264fc52 Author: Translation commit bot Date: Thu Dec 6 16:31:56 2018 + Update translations for bridgedb --- et/LC_MESSAGES/bridgedb.po | 59 +++--- 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/et/LC_MESSAGES/bridgedb.po b/et/LC_MESSAGES/bridgedb.po index a1a8cfe35..de5712e82 100644 --- a/et/LC_MESSAGES/bridgedb.po +++ b/et/LC_MESSAGES/bridgedb.po @@ -5,13 +5,14 @@ # Translators: # G , 2015 # Mart Laub , 2014 +# Paul Martin Korp , 2018 msgid "" msgstr "" -"Project-Id-Version: The Tor Project\n" +"Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n" "POT-Creation-Date: 2015-07-25 03:40+\n" -"PO-Revision-Date: 2018-04-12 18:54+\n" -"Last-Translator: IDRASSI Mounir \n" +"PO-Revision-Date: 2018-12-06 12:22+\n" +"Last-Translator: Paul Martin Korp \n" "Language-Team: Estonian (http://www.transifex.com/otf/torproject/language/et/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -33,7 +34,7 @@ msgstr "" #. "Tor Browser" #: bridgedb/https/server.py:167 msgid "Sorry! Something went wrong with your request." -msgstr "Vabandust! Midagi läks sinu päringuga valesti." +msgstr "Vabandust! Midagi läks Teie päringuga valesti." #: bridgedb/https/templates/base.html:79 msgid "Report a Bug" @@ -57,7 +58,7 @@ msgstr "Vali kõik" #: bridgedb/https/templates/bridges.html:40 msgid "Show QRCode" -msgstr "Näita QRKoodi" +msgstr "Näita QR-koodi" #: bridgedb/https/templates/bridges.html:52 msgid "QRCode for your bridge lines" @@ -74,7 +75,7 @@ msgstr "Oli seda nüüd vaja..." #: bridgedb/https/templates/bridges.html:68 msgid "It seems there was an error getting your QRCode." -msgstr "Viga tekkis teie QRKoodi hankimisel." +msgstr "QR-koodi hankimisel ilmnes viga." #: bridgedb/https/templates/bridges.html:73 msgid "" @@ -101,7 +102,7 @@ msgstr "%s1%s samm." #: bridgedb/https/templates/index.html:13 #, python-format msgid "Download %s Tor Browser %s" -msgstr "Lae alla %s Tor Browser %s" +msgstr "Lae alla %s Tor brauser %s" #: bridgedb/https/templates/index.html:25 #, python-format @@ -121,7 +122,7 @@ msgstr "%s3%s samm." #: bridgedb/https/templates/index.html:38 #, python-format msgid "Now %s add the bridges to Tor Browser %s" -msgstr "Nüüd %s lisa sillad Tor Browseri %s" +msgstr "Nüüd %s lisa sillad Tor'i brauserisse%s" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! @@ -158,7 +159,7 @@ msgstr "%sJ%sah!" #: bridgedb/https/templates/options.html:147 #, python-format msgid "%sG%set Bridges" -msgstr "%sH%sangi Bridges" +msgstr "%sH%sangi sillad" #: bridgedb/strings.py:43 msgid "[This is an automated message; please do not reply.]" @@ -173,12 +174,12 @@ msgstr "Siin on sinu sillad:" msgid "" "You have exceeded the rate limit. Please slow down! The minimum time between\n" "emails is %s hours. All further emails during this time period will be ignored." -msgstr "Oled ületanud määra limiidi. Palun võta aeglasemalt! Miinimum aeg e-mailide vahel\non %s tundi. Edasiseid e-maile selles ajavahemikus ignoreeritakse." +msgstr "Olete ületanud määra limiidi. Palun võtke aeglasemalt! Miinimum aeg e-mailide vahel\non %s tundi. Edasiseid e-maile selles ajavahemikus ignoreeritakse." #: bridgedb/strings.py:50 msgid "" "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" -msgstr "KÃSUD: (ühenda KÃSUD, et täpsustada valikuid üheaegselt)" +msgstr "KÃSUD: (kombineeri KÃSUD, et täpsustada valikuid üheaegselt)" #. TRANSLATORS: Please DO NOT translate the word "BridgeDB". #: bridgedb/strings.py:53 @@ -247,7 +248,7 @@ msgid "" "Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n" "help to circumvent internet censorship in many cases.\n" "\n" -msgstr "Lisaks, BridgeDB-l on hulgaliselt tavapäraseid, igavaid sildu %s ilma\nPluggable Transports-ideta %s, mis võib-olla ei kõla kutsuvalt, kuid on siiski\nsuutelised aitama hiilida interneti tsensuuris nii mitmelgi juhul.\n\n" +msgstr "Lisaks on BridgeDB-l ka palju tavapäraseid, igavaid sildu %s ilma\nPluggable Transports-ideta %s, mis võib-olla ei kõla nii lahedalt, kuid need sillad saavad teil paljudel juhtul internetitsensuuri eest kõrvale põigata.\n\n" #: bridgedb/strings.py:101 msgid "What are bridges?" @@ -256,7 +257,7 @@ msgstr "Mis on sillad?" #: bridgedb/strings.py:102 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." -msgstr "%s Sillad %s on Tor-i osad, mis aitavad interneti tsensuursuses ringi hiilida." +msgstr "%s Sillad %s on Tor-i releed, mis aitavad internetitsensuuri eest kõrvale põigata." #: bridgedb/strings.py:107 msgid "I need
[tor-commits] [torbutton/master] Release preparations for 2.1.3
commit 61c79b29f463666548754d9a2a6b15c996df48ee Author: Georg Koppen Date: Thu Dec 6 14:53:53 2018 + Release preparations for 2.1.3 CHANGELOG update and version bump --- src/CHANGELOG | 7 +++ src/install.rdf | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 0abd10b5..6f5b3f3b 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,10 @@ +2.1.3 + * Bug 28540: Use new text for 2018 donation banner + * Bug 27290: Remove WebGL pref for min capability mode + * Bug 28075: Tone down missing SOCKS credential warning + * Bug 28747: Remove NoScript (XPCOM) related unused code + * Translations update + 2.1.2 * Bug 25013: Integrate Torbutton into tor-browser for Android * Bug 27111: Update about:tor desktop version to work on mobile diff --git a/src/install.rdf b/src/install.rdf index 45bee11a..1ece0c4c 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ Torbutton Mike Perry torbut...@torproject.org -2.1.2 +2.1.3 true https://www.torproject.org/projects/torbrowser.html.en chrome://torbutton/skin/tor.png ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [torbutton/master] Fold in maint-2.0 CHANGELOG
commit 7f3f89164b409736f4eb70019005f5f8960e906c Author: Georg Koppen Date: Thu Dec 6 14:51:17 2018 + Fold in maint-2.0 CHANGELOG --- src/CHANGELOG | 6 ++ 1 file changed, 6 insertions(+) diff --git a/src/CHANGELOG b/src/CHANGELOG index 0db59514..0abd10b5 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -15,6 +15,12 @@ * Bug 28082: Add locales cs, el, hu, ka * Translations update +2.0.8 + * Bug 23925+27959: Donation banner for year end 2018 campaign + * Bug 24172: Donation banner clobbers Tor Browser version string + * Bug 27760: Use new NoScript API for IPC and fix about:blank issue + * Translations update + 2.1 * Bug 27175: Add pref to allow users to persist custom noscript settings * Bug 27760: Use new NoScript API for IPC and fix about:blank issue ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Merge branch 'maint-0.3.4' into release-0.3.4
commit f1c58bbf42b5e4089552b57b9469208943464b46 Merge: 92fb9f934 c4f7953d8 Author: Nick Mathewson Date: Thu Dec 6 09:26:33 2018 -0500 Merge branch 'maint-0.3.4' into release-0.3.4 changes/geoip-2018-12-05 | 4 + src/config/geoip | 10100 +++-- src/config/geoip6| 3151 +- 3 files changed, 8147 insertions(+), 5108 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.3
commit 00341d97f356142619865218b2ff6a6ae95dca5d Merge: ffc7b81b5 57798eb1c Author: Nick Mathewson Date: Thu Dec 6 09:26:32 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.3 changes/geoip-2018-12-05 | 4 + src/config/geoip | 10100 +++-- src/config/geoip6| 3151 +- 3 files changed, 8147 insertions(+), 5108 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.4' into maint-0.3.5
commit c1f86f74927d9233305b4ef93adebf52dadd0147 Merge: 967efc0d2 c4f7953d8 Author: Nick Mathewson Date: Thu Dec 6 09:26:33 2018 -0500 Merge branch 'maint-0.3.4' into maint-0.3.5 changes/geoip-2018-12-05 | 4 + src/config/geoip | 10100 +++-- src/config/geoip6| 3151 +- 3 files changed, 8147 insertions(+), 5108 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3
commit 12b68854a0055ffd697ddf07abb038ed586feb30 Merge: 8c1eb28d6 00341d97f Author: Nick Mathewson Date: Thu Dec 6 09:26:32 2018 -0500 Merge branch 'maint-0.3.3' into release-0.3.3 changes/geoip-2018-12-05 | 4 + src/config/geoip | 10100 +++-- src/config/geoip6| 3151 +- 3 files changed, 8147 insertions(+), 5108 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.2.9' into maint-0.3.3
commit 00341d97f356142619865218b2ff6a6ae95dca5d Merge: ffc7b81b5 57798eb1c Author: Nick Mathewson Date: Thu Dec 6 09:26:32 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.3 changes/geoip-2018-12-05 | 4 + src/config/geoip | 10100 +++-- src/config/geoip6| 3151 +- 3 files changed, 8147 insertions(+), 5108 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit a4c608af3c602c4db58b259ac25ae5a845f30965 Merge: b9d0aa210 c1f86f749 Author: Nick Mathewson Date: Thu Dec 6 09:26:34 2018 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 changes/geoip-2018-12-05 | 4 + src/config/geoip | 10100 +++-- src/config/geoip6| 3151 +- 3 files changed, 8147 insertions(+), 5108 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.3' into maint-0.3.4
commit c4f7953d8b869f9b7637428d5fc859fb62f302ff Merge: e3a19b1c7 00341d97f Author: Nick Mathewson Date: Thu Dec 6 09:26:32 2018 -0500 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/geoip-2018-12-05 | 4 + src/config/geoip | 10100 +++-- src/config/geoip6| 3151 +- 3 files changed, 8147 insertions(+), 5108 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.3.5'
commit 2ccb9e9444be568cbd1552a0ea86ec58bc4a92e1 Merge: 46a321fbd c1f86f749 Author: Nick Mathewson Date: Thu Dec 6 09:26:34 2018 -0500 Merge branch 'maint-0.3.5' changes/geoip-2018-12-05 | 4 + src/config/geoip | 10100 +++-- src/config/geoip6| 3151 +- 3 files changed, 8147 insertions(+), 5108 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4
commit c4f7953d8b869f9b7637428d5fc859fb62f302ff Merge: e3a19b1c7 00341d97f Author: Nick Mathewson Date: Thu Dec 6 09:26:32 2018 -0500 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/geoip-2018-12-05 | 4 + src/config/geoip | 10100 +++-- src/config/geoip6| 3151 +- 3 files changed, 8147 insertions(+), 5108 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Merge branch 'maint-0.2.9' into maint-0.3.3
commit 00341d97f356142619865218b2ff6a6ae95dca5d Merge: ffc7b81b5 57798eb1c Author: Nick Mathewson Date: Thu Dec 6 09:26:32 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.3 changes/geoip-2018-12-05 | 4 + src/config/geoip | 10100 +++-- src/config/geoip6| 3151 +- 3 files changed, 8147 insertions(+), 5108 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4
commit c4f7953d8b869f9b7637428d5fc859fb62f302ff Merge: e3a19b1c7 00341d97f Author: Nick Mathewson Date: Thu Dec 6 09:26:32 2018 -0500 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/geoip-2018-12-05 | 4 + src/config/geoip | 10100 +++-- src/config/geoip6| 3151 +- 3 files changed, 8147 insertions(+), 5108 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9
commit 30ecd90961a1e878641b0fd054b82d8ab17a2318 Merge: ea890d7de 57798eb1c Author: Nick Mathewson Date: Thu Dec 6 09:26:31 2018 -0500 Merge branch 'maint-0.2.9' into release-0.2.9 changes/geoip-2018-12-05 | 4 + src/config/geoip | 10100 +++-- src/config/geoip6| 3151 +- 3 files changed, 8147 insertions(+), 5108 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4
commit c4f7953d8b869f9b7637428d5fc859fb62f302ff Merge: e3a19b1c7 00341d97f Author: Nick Mathewson Date: Thu Dec 6 09:26:32 2018 -0500 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/geoip-2018-12-05 | 4 + src/config/geoip | 10100 +++-- src/config/geoip6| 3151 +- 3 files changed, 8147 insertions(+), 5108 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.5] Merge branch 'maint-0.3.4' into maint-0.3.5
commit c1f86f74927d9233305b4ef93adebf52dadd0147 Merge: 967efc0d2 c4f7953d8 Author: Nick Mathewson Date: Thu Dec 6 09:26:33 2018 -0500 Merge branch 'maint-0.3.4' into maint-0.3.5 changes/geoip-2018-12-05 | 4 + src/config/geoip | 10100 +++-- src/config/geoip6| 3151 +- 3 files changed, 8147 insertions(+), 5108 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.3.4' into maint-0.3.5
commit c1f86f74927d9233305b4ef93adebf52dadd0147 Merge: 967efc0d2 c4f7953d8 Author: Nick Mathewson Date: Thu Dec 6 09:26:33 2018 -0500 Merge branch 'maint-0.3.4' into maint-0.3.5 changes/geoip-2018-12-05 | 4 + src/config/geoip | 10100 +++-- src/config/geoip6| 3151 +- 3 files changed, 8147 insertions(+), 5108 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.3
commit 00341d97f356142619865218b2ff6a6ae95dca5d Merge: ffc7b81b5 57798eb1c Author: Nick Mathewson Date: Thu Dec 6 09:26:32 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.3 changes/geoip-2018-12-05 | 4 + src/config/geoip | 10100 +++-- src/config/geoip6| 3151 +- 3 files changed, 8147 insertions(+), 5108 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.5] Merge branch 'maint-0.3.3' into maint-0.3.4
commit c4f7953d8b869f9b7637428d5fc859fb62f302ff Merge: e3a19b1c7 00341d97f Author: Nick Mathewson Date: Thu Dec 6 09:26:32 2018 -0500 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/geoip-2018-12-05 | 4 + src/config/geoip | 10100 +++-- src/config/geoip6| 3151 +- 3 files changed, 8147 insertions(+), 5108 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.5] Merge branch 'maint-0.2.9' into maint-0.3.3
commit 00341d97f356142619865218b2ff6a6ae95dca5d Merge: ffc7b81b5 57798eb1c Author: Nick Mathewson Date: Thu Dec 6 09:26:32 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.3 changes/geoip-2018-12-05 | 4 + src/config/geoip | 10100 +++-- src/config/geoip6| 3151 +- 3 files changed, 8147 insertions(+), 5108 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.4] Merge branch 'maint-0.2.9' into maint-0.3.3
commit 00341d97f356142619865218b2ff6a6ae95dca5d Merge: ffc7b81b5 57798eb1c Author: Nick Mathewson Date: Thu Dec 6 09:26:32 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.3 changes/geoip-2018-12-05 | 4 + src/config/geoip | 10100 +++-- src/config/geoip6| 3151 +- 3 files changed, 8147 insertions(+), 5108 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.3
commit 00341d97f356142619865218b2ff6a6ae95dca5d Merge: ffc7b81b5 57798eb1c Author: Nick Mathewson Date: Thu Dec 6 09:26:32 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.3 changes/geoip-2018-12-05 | 4 + src/config/geoip | 10100 +++-- src/config/geoip6| 3151 +- 3 files changed, 8147 insertions(+), 5108 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/support-portal] pulling translations from transifex
commit c18415051049bb63045412a4a14f4f0446192ff3 Author: Translation commit bot Date: Thu Dec 6 10:03:23 2018 + pulling translations from transifex --- contents+cs.po | 56 1 file changed, 48 insertions(+), 8 deletions(-) diff --git a/contents+cs.po b/contents+cs.po index 76c0ab50c..c06d4ae45 100644 --- a/contents+cs.po +++ b/contents+cs.po @@ -282,6 +282,10 @@ msgid "" "and https://noscript.net/\;>NoScript â and adding" " anything else could deanonymize you." msgstr "" +"ProhlÞeÄ Tor má už v základu nainstalované doplÅky https://www.eff.org/https-everywhere\;>HTTPS Everywhere a " +"https://noscript.net/\;>NoScript. PÅidánà dalÅ¡Ãch" +" může omezit ochranu vaÅ¡Ã anonymity." #: http//localhost/faq/install-add-on-extension-tor-browser/ #: (content/faq/faq-3/contents+en.lrquestion.seo_slug) @@ -306,6 +310,13 @@ msgid "" "href=\"https://www.torproject.org/download/download-easy.html.en#mac\;>macOS" " (OS X)." msgstr "" +"ProhlÞeÄ Tor je nynà dostupný pro https://www.torproject.org/download/download-; +"easy.html.en#windows\">Windows, https://www.torproject.org/download/download-; +"easy.html.en#linux\">Linux a https://www.torproject.org/download/download-easy.html.en#mac\;>macOS" +" (OS X)." #: http//localhost/faq/temp-faq-4/ #: (content/faq/faq-4/contents+en.lrquestion.description) @@ -317,6 +328,13 @@ msgid "" "href=\"https://guardianproject.info/apps/orbot/\;>Orbot and " "https://guardianproject.info/apps/orfox/\;>Orfox." msgstr "" +"Pro https://www.torproject.org/docs/android.html.en\;>Android " +"jsou jako alternativy dostupné aplikace https://guardianproject.info/apps/orbot/\;>Orbot a " +"https://guardianproject.info/apps/orfox/\;>Orfox " +"od https://guardianproject.info/\;>The Guardian " +"Project." #: http//localhost/faq/temp-faq-4/ #: (content/faq/faq-4/contents+en.lrquestion.description) @@ -326,13 +344,15 @@ msgid "" "There is no official version of Tor for iOS yet, though we recommend " "https://onionbrowser.com/\;>Onion Browser." msgstr "" +"Pro iOS zatÃm nenà žádná oficiálnà verze Toru, nicménÄ můžeme doporuÄit " +"https://onionbrowser.com/\;>Onion Browser." #: http//localhost/faq/use-vpn-with-tor/ #: (content/faq/faq-5/contents+en.lrquestion.title) #: http//localhost/misc/use-vpn-with-tor/ #: (content/misc/misc-13/contents+en.lrquestion.title) msgid "Can I use a VPN with Tor?" -msgstr "" +msgstr "Mohu s Torem použÃvat i VPN?" #: http//localhost/faq/use-vpn-with-tor/ #: (content/faq/faq-5/contents+en.lrquestion.description) @@ -343,6 +363,9 @@ msgid "" " advanced user who knows how to configure both in a way that doesn't " "compromise your privacy." msgstr "" +"ObecnÄ nedoporuÄujeme použÃvat VPN v kombinaci s Torem, pokud nejste opravdu" +" pokroÄilý uživatel, který vÃ, jak je dohromady nastavit tak, aby jejich " +"kombinace neomezila jeho soukromÃ." #: http//localhost/faq/use-vpn-with-tor/ #: (content/faq/faq-5/contents+en.lrquestion.description) @@ -353,6 +376,9 @@ msgid "" "href=\"https://trac.torproject.org/projects/tor/wiki/doc/TorPlusVPN\;>our " "wiki." msgstr "" +"Podrobné informace o spoleÄném použÃvánà Toru a VPN najdete na https://trac.torproject.org/projects/tor/wiki/doc/TorPlusVPN\;>naÅ¡Ã " +"wiki." #: http//localhost/faq/use-vpn-with-tor/ #: (content/faq/faq-5/contents+en.lrquestion.seo_slug) @@ -367,6 +393,7 @@ msgid "" "What are the most common issues with the latest stable version of Tor " "Browser?" msgstr "" +"Jaké jsou nejÄastÄjÅ¡Ã problémy s poslednà stabilnà verzà prohlÞeÄe Tor?" #: http//localhost/tbb/most-common-issues-latest-stable-tor-browser/ #: (content/tbb/tbb-1/contents+en.lrquestion.description) @@ -374,6 +401,8 @@ msgid "" "Whenever we release a new stable version of Tor Browser, we write a blog " "post that details its new features and known issues." msgstr "" +"Kdykoliv vydáme stabilnà verzi prohlÞeÄe, pÃÅ¡eme na blog podrobnosti a nové" +" verzi a pÅÃpadných známých problémech s nÃ." #: http//localhost/tbb/most-common-issues-latest-stable-tor-browser/ #: (content/tbb/tbb-1/contents+en.lrquestion.description) @@ -383,6 +412,10 @@ msgid "" "href=\"https://blog.torproject.org\;>blog.torproject.org for the " "most recent stable Tor Browser post to see if your issue is listed." msgstr "" +"Pokud po aktualizaci prohlÞeÄe Tor narazÃte na nÄjaký nový problém, " +"podÃvejte se na https://blog.torproject.org\;>blog.torproject.org na " +"informace k poslednÃmu vydánÃ, jestli je váš problém již známý." #: http//localhost/tbb/most-common-issues-latest-stable-tor-browser/ #: (content/tbb/tbb-1/contents+en.lrquestion.description) @@ -391,6 +424,8 @@ msgid "" "href=\"https://trac.torproject.org\;>bug report about what you're" " experiencing." msgstr "" +"Pokud váš problém uvedený nenÃ,
[tor-commits] [tor-browser-build/master] Bug 28696: Changing paths to Gradle dependencies are included in build
commit 9ec8d7fb09a2069ef7c79d81547040ce6661ab3b Author: sisbell Date: Tue Dec 4 12:14:39 2018 -0800 Bug 28696: Changing paths to Gradle dependencies are included in build --- projects/firefox/build | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/projects/firefox/build b/projects/firefox/build index f631ec5..da82862 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -1,13 +1,6 @@ #!/bin/bash [% c("var/setarch") -%] [% c("var/set_default_env") -%] -[% IF c("var/android") %] - export GRADLE_MAVEN_REPOSITORIES="file://$rootdir/[% c('input_files_by_name/gradle-dependencies') %]" - # Prepare building the multi-locale .apk - mkdir -p /var/tmp/dist/locales - tar -C /var/tmp/dist/locales -xf $rootdir/[% c('input_files_by_name/firefox-locale-bundle') %] -[% END -%] - [% IF c("var/windows") -%] [% pc('gcc', 'var/setup', { compiler_tarfile => c('input_files_by_name/gcc') }) %] # We need a link to our GCC, otherwise the system cc gets used which points to @@ -105,7 +98,14 @@ mv -f $rootdir/[% c('input_files_by_name/mozconfig') %] .mozconfig [% END -%] [% IF c("var/android") %] + export GRADLE_MAVEN_REPOSITORIES="file:///var/tmp/gradle-dependencies" + # Move Gradle Repo to hard-coded location. This location is embedded in the file + # chrome/toolkit/content/global/buildconfig.html so needs to be standard for reproducibility + mv $rootdir/[% c('input_files_by_name/gradle-dependencies') %] /var/tmp/gradle-dependencies cp $rootdir/[% c('input_files_by_name/orbot') %]/* mobile/android/app + # Prepare building the multi-locale .apk + mkdir -p /var/tmp/dist/locales + tar -C /var/tmp/dist/locales -xf $rootdir/[% c('input_files_by_name/firefox-locale-bundle') %] [% END %] eval $(perl $rootdir/get-moz-build-date [% c("var/copyright_year") %] $(cat browser/config/version.txt)) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-build/master] Bug 28573: Include all locales in Android testbuild
commit c359853bd44b320595d5a52fc4340ab3b6825d8d Author: Nicolas Vigier Date: Thu Dec 6 08:42:19 2018 + Bug 28573: Include all locales in Android testbuild --- README.HACKING | 10 +- projects/tor-browser/build | 6 -- projects/tor-browser/config | 2 +- rbm.conf| 3 +-- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/README.HACKING b/README.HACKING index d9b0674..7634093 100644 --- a/README.HACKING +++ b/README.HACKING @@ -319,7 +319,15 @@ Types of builds: nightly, alpha, release, and testbuild The testbuild makefile target allows you to do a build quickly in the testbuild directory, skipping the generation of all the locales and the -mar files. This is useful during development. +.mar files. This is useful during development. + +In the case of Android builds, we are generating a multi-locale apk, +contrary to the desktop builds where we have one bundle for each locale. +Removing locales in a multi-locale bundle does not make a significant +difference in build time, therefore we still include all the locales in +the Android testbuild. There are also no .mar files generated in the +Android builds, so currently, in the Android case, the only difference +introduced by the testbuild target is the output directory. By default the testbuild is based on the alpha build. All the options can have a different definition for the alpha, release and nightly builds. diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 250a0e9..4661f7a 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -209,7 +209,8 @@ popd # Prepare our language packs for using the proper search engines and embed # our default bookmarks. See bugs 18915 and 21879 for more details. -[% FOREACH lang = c('var/locales') %] +[% SET locales = c("var/testbuild") ? [] : c("var/locales") -%] +[% FOREACH lang = locales %] [% SET lang = tmpl(lang); SET xpi = '$rootdir/' _ c('input_files_by_name/firefox-langpacks') _ '/' _ lang _ '.xpi'; %] @@ -325,7 +326,8 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ # If we did not create a multi-lingual package above, create a package for # each locale. [% IF ! c("var/multi_lingual") %] - [% FOREACH lang = c('var/locales') %] + [% SET locales = c("var/testbuild") ? [] : c("var/locales") -%] + [% FOREACH lang = locales %] [% SET lang = tmpl(lang); SET xpi = '$rootdir/' _ c('input_files_by_name/firefox-langpacks') _ '/' _ lang _ '.xpi'; SET tbdir = '$distdir/tor-browser_' _ lang; diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 149b800..43db189 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -58,7 +58,7 @@ input_files: enable: '[% ! c("var/android") %]' - project: firefox-langpacks name: firefox-langpacks -enable: '[% c("var/locales").size && ! c("var/android") %]' +enable: '[% ! c("var/testbuild") && ! c("var/android") %]' - project: tor-launcher name: tor-launcher enable: '[% ! c("var/android") %]' diff --git a/rbm.conf b/rbm.conf index 0d53855..f64a80b 100644 --- a/rbm.conf +++ b/rbm.conf @@ -136,8 +136,7 @@ targets: - alpha testbuild: var: - # To make build faster, don't build any locale - locales: [] + testbuild: 1 # Don't create mar files to save time build_mar: 0 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits