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

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

08 Jun '19

commit f360b3804904f9ed5bc569483034178d582488cc Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 8 10:20:54 2019 +0000 Update translations for tpo-web --- contents+ru.po | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/contents+ru.po b/contents+ru.po index 3f8e3fa86..67d7be814 100644 --- a/contents+ru.po +++ b/contents+ru.po @@ -8,6 +8,7 @@ # Legenden Rifk <rekytcsgo(a)gmail.com>, 2019 # Emma Peel, 2019 # Sergey Smirnov <cj75300(a)gmail.com>, 2019 +# solokot <solokot(a)gmail.com>, 2019 # msgid "" msgstr "" @@ -15,7 +16,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-06-05 12:03+CET\n" "PO-Revision-Date: 2019-03-09 10:41+0000\n" -"Last-Translator: Sergey Smirnov <cj75300(a)gmail.com>, 2019\n" +"Last-Translator: solokot <solokot(a)gmail.com>, 2019\n" "Language-Team: Russian (https://www.transifex.com/otf/teams/1519/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -503,6 +504,10 @@ msgid "" "goal is to continue diversifying our funding. To inquire about sponsorship, " "please email giving(at)torproject.org." msgstr "" +"Наличие разнообразной базы пользователей означает, что у нас также есть и " +"различные источники финансирования. Наша цель — продолжать диверсификацию " +"нашего финансирования. Чтобы подробнее узнать о вопросах спонсорства, " +"пожалуйста, напишите на giving(at)torproject.org." #: https//www.torproject.org/about/reports/ #: (content/about/reports/contents+en.lrreports.body) @@ -510,6 +515,8 @@ msgid "" "The Tor Project, Inc. is a US 501(c)(3) nonprofit organization committed to " "transparency in its work and reporting." msgstr "" +"The Tor Project, Inc. — это US 501(c)(3) некоммерческая организация, " +"приверженная прозрачности в своей работе и отчётности." #: https//www.torproject.org/press/-new-release-tails/ #: (content/press/new-release-tails/contents+en.lrpost.title) @@ -563,6 +570,11 @@ msgid "" "href=\"https://www.torproject.org/dist/torbrowser/8.5a10/\">distribution " "directory</a>." msgstr "" +"Браузер Tor 8.5a10 доступен на <a " +"href=\"https://www.torproject.org/projects/torbrowser.html.en#downloads-" +"alpha\">странице Tor Browser Project</a> а также из нашего <a " +"href=\"https://www.torproject.org/dist/torbrowser/8.5a10/\">каталога " +"распространения</a>." #: templates/contact.html:8 msgid "Chat with us on" @@ -847,11 +859,11 @@ msgstr "" #: templates/footer.html:44 templates/navbar.html:12 msgid "DONATE NOW" -msgstr "" +msgstr "ПОЖЕРТВОВАТЬ" #: templates/footer.html:49 msgid "SUBSCRIBE TO OUR NEWSLETTER" -msgstr "" +msgstr "ПОДПИСАТЬСЯ НА НАШУ РАССЫЛКУ" #: templates/footer.html:50 msgid "Get monthly updates and opportunities from the Tor Project:" @@ -859,7 +871,7 @@ msgstr "Получайте ежемесячные новости от Tor Projec #: templates/footer.html:51 msgid "SIGN UP" -msgstr "" +msgstr "ПОДПИСАТЬСЯ" #: templates/footer.html:70 #, python-format @@ -873,11 +885,11 @@ msgstr "" #: templates/hero-download-languages.html:2 #: templates/hero-download-options.html:2 msgid "DEFEND YOURSELF" -msgstr "" +msgstr "ЗАЩИТИТЬ СЕБЯ" #: templates/hero-download-tor.html:2 msgid "GROW THE NETWORK" -msgstr "" +msgstr "РАСШИРИТЬ СЕТЬ" #: templates/hero-download.html:2 msgid "Defend yourself."

1 0

[translation/tbmanual-contentspot] Update translations for tbmanual-contentspot
by translation＠torproject.org 08 Jun '19

08 Jun '19

commit f82ebae5915ddb4fcf09b2e2811312f0415ee2e7 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 8 10:18:15 2019 +0000 Update translations for tbmanual-contentspot --- contents+ru.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/contents+ru.po b/contents+ru.po index 533f0d783..7051f1a44 100644 --- a/contents+ru.po +++ b/contents+ru.po @@ -7,6 +7,7 @@ # erinm, 2019 # Emma Peel, 2019 # Sergey Smirnov <cj75300(a)gmail.com>, 2019 +# solokot <solokot(a)gmail.com>, 2019 # msgid "" msgstr "" @@ -14,7 +15,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-06-03 14:04+CET\n" "PO-Revision-Date: 2018-11-14 12:31+0000\n" -"Last-Translator: Sergey Smirnov <cj75300(a)gmail.com>, 2019\n" +"Last-Translator: solokot <solokot(a)gmail.com>, 2019\n" "Language-Team: Russian (https://www.transifex.com/otf/teams/1519/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -2444,7 +2445,7 @@ msgstr "" #: templates/footer.html:24 msgid "SUBSCRIBE TO OUR NEWSLETTER" -msgstr "" +msgstr "ПОДПИСАТЬСЯ НА НАШУ РАССЫЛКУ" #: templates/footer.html:25 msgid "Get monthly updates and opportunities from the Tor Project:" @@ -2452,7 +2453,7 @@ msgstr "Получайте ежемесячные новости от Tor Projec #: templates/footer.html:26 msgid "SIGN UP" -msgstr "" +msgstr "ПОДПИСАТЬСЯ" #: templates/footer.html:32 msgid "" @@ -2476,7 +2477,7 @@ msgstr "Пожертвуйте" #: templates/navbar.html:6 msgid "DONATE NOW" -msgstr "" +msgstr "ПОЖЕРТВОВАТЬ" #: templates/navbar.html:41 msgid "Download Tor Browser"

1 0

[translation/donatepages-messagespot] Update translations for donatepages-messagespot
by translation＠torproject.org 08 Jun '19

08 Jun '19

commit f0483e4e5ddb6c374195efdcf264500bb359272b Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 8 10:15:38 2019 +0000 Update translations for donatepages-messagespot --- locale/ru/LC_MESSAGES/messages.po | 41 ++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/locale/ru/LC_MESSAGES/messages.po b/locale/ru/LC_MESSAGES/messages.po index fda51d621..fe5e2bf53 100644 --- a/locale/ru/LC_MESSAGES/messages.po +++ b/locale/ru/LC_MESSAGES/messages.po @@ -17,10 +17,11 @@ # erinm, 2019 # Sergey Smirnov <cj75300(a)gmail.com>, 2019 # Yanis Voloshin <y(a)7i4.ru>, 2019 +# solokot <solokot(a)gmail.com>, 2019 # msgid "" msgstr "" -"Last-Translator: Yanis Voloshin <y(a)7i4.ru>, 2019\n" +"Last-Translator: solokot <solokot(a)gmail.com>, 2019\n" "Language-Team: Russian (https://www.transifex.com/otf/teams/1519/ru/)\n" "Language: ru\n" "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n" @@ -43,7 +44,7 @@ msgstr "Поддержите Tor Project сегодня!" #: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:607 #: tmp/cache_locale/03/03963079e40d8bba608baf2120533e119d90cb2cfc82fee9e293708eb548373f.php:75 msgid "Tor: Strength in Numbers" -msgstr "Tor: Сила в цифрах" +msgstr "Tor: сила в цифрах" #: tmp/cache_locale/f1/f1c758a0a2b3397f444e81463a5afc68c251bdbcd430c9979e3044b79d32dffc.php:52 #: tmp/cache_locale/f1/f1c758a0a2b3397f444e81463a5afc68c251bdbcd430c9979e3044b79d32dffc.php:75 @@ -94,7 +95,7 @@ msgstr "" #: tmp/cache_locale/f1/f1c758a0a2b3397f444e81463a5afc68c251bdbcd430c9979e3044b79d32dffc.php:111 msgid "Want to make a one time donation instead?" -msgstr "" +msgstr "Хотите сделать единовременное пожертвование?" #: tmp/cache_locale/f1/f1c758a0a2b3397f444e81463a5afc68c251bdbcd430c9979e3044b79d32dffc.php:118 #: tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:102 @@ -120,7 +121,7 @@ msgstr "" #: tmp/cache_locale/f1/f1c758a0a2b3397f444e81463a5afc68c251bdbcd430c9979e3044b79d32dffc.php:214 msgid "Monthly giving" -msgstr "" +msgstr "Ежемесячное пожертвование" #: tmp/cache_locale/e1/e1e12763540d9524f8871157240d5a8fbf2ea77ace1c46527b3031db68943acc.php:34 msgid "Processing Donation - Tor" @@ -166,7 +167,7 @@ msgstr "" #: tmp/cache_locale/df/df997ca3aa3a1f02bff7d4f32e59f3fbfbe5d29a77fa6348a08ff96869ac914c.php:61 msgid "Thank you for standing up for privacy and freedom online." -msgstr "" +msgstr "Спасибо, что отстаиваете конфиденциальность и свободу в интернете." #: tmp/cache_locale/df/df997ca3aa3a1f02bff7d4f32e59f3fbfbe5d29a77fa6348a08ff96869ac914c.php:63 msgid "" @@ -244,7 +245,7 @@ msgstr "Фамилия" #: tmp/cache_locale/ce/cec5a6fe643ad38144e0af02cadfaaf024540f1f46db44998f6c033630795bef.php:41 msgid "Estimated Donation Date:" -msgstr "" +msgstr "Предполагаемая дата пожертвования:" #: tmp/cache_locale/ce/cec5a6fe643ad38144e0af02cadfaaf024540f1f46db44998f6c033630795bef.php:46 msgid "Email" @@ -252,19 +253,19 @@ msgstr "Почта" #: tmp/cache_locale/ce/cec5a6fe643ad38144e0af02cadfaaf024540f1f46db44998f6c033630795bef.php:51 msgid "Choose a Currency" -msgstr "" +msgstr "Выберите валюту" #: tmp/cache_locale/ce/cec5a6fe643ad38144e0af02cadfaaf024540f1f46db44998f6c033630795bef.php:73 msgid "Currency Amount" -msgstr "" +msgstr "Сумма" #: tmp/cache_locale/ce/cec5a6fe643ad38144e0af02cadfaaf024540f1f46db44998f6c033630795bef.php:80 msgid "Report Donation" -msgstr "" +msgstr "Квитанция о пожертвовании" #: tmp/cache_locale/ce/cec5a6fe643ad38144e0af02cadfaaf024540f1f46db44998f6c033630795bef.php:87 msgid "Wallet Addresses" -msgstr "" +msgstr "Адреса кошельков" #: tmp/cache_locale/ad/ad05838d90eae883761f0bcec6c27d77959c6e2884e8abf6c4aec89d7a741ea9.php:34 msgid "Tor Privacy Policy" @@ -772,7 +773,7 @@ msgstr "Mozilla подберет вам подарок и удвоит вашу #: tmp/cache_locale/70/70a3de9c7fb70a68cae132efaa24457b72f71189189cd4c8c492f3cd459b6483.php:61 msgid "Want to donate by credit card or PayPal?" -msgstr "" +msgstr "Хотите пожертвовать с помощью кредитной карты или PayPal?" #: tmp/cache_locale/70/70a3de9c7fb70a68cae132efaa24457b72f71189189cd4c8c492f3cd459b6483.php:70 msgid "" @@ -784,6 +785,8 @@ msgid "" "Please fill out this form and then send your coins to the appropriate " "wallet." msgstr "" +"Пожалуйста, заполните эту форму и отправьте средства на соответствующий " +"кошелёк." #: tmp/cache_locale/70/70a3de9c7fb70a68cae132efaa24457b72f71189189cd4c8c492f3cd459b6483.php:79 msgid "" @@ -840,7 +843,7 @@ msgstr "Порядок действий" #: tmp/cache_locale/54/5420828d7720daccac45a05e74a0bdde5ef138020bd4901a7e81ad8817d3f8e8.php:61 msgid "Thank you for your support of the Tor Project." -msgstr "" +msgstr "Спасибо за поддержку Tor Project." #: tmp/cache_locale/54/5420828d7720daccac45a05e74a0bdde5ef138020bd4901a7e81ad8817d3f8e8.php:65 msgid "" @@ -2082,6 +2085,8 @@ msgid "" "The European shirt fits run a little small so you might want to consider " "sizing up." msgstr "" +"Европейская футболка немного меньше, так что вам следует продумать вопрос о " +"выборе размера." #: tmp/cache_locale/36/36a88fcfb8a236c24db42d5e39602cd43f2ed8bec6f6b807fb97f8e091541f37.php:36 msgid "Fit" @@ -2133,24 +2138,24 @@ msgstr "XXL" #: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:145 msgid "Want to donate cryptocurrency?" -msgstr "" +msgstr "Хотите пожертвовать криптовалюту?" #: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:150 msgid "Want to donate stock or via postal mail?" -msgstr "" +msgstr "Хотите пожертвовать акции или по почте?" #: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:453 msgid "Gift Selected" -msgstr "" +msgstr "Подарок выбран" #: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:457 msgid "No Gift Selected" -msgstr "" +msgstr "Подарок не выбран" #: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:461 msgid "Sticker Pack" -msgstr "" +msgstr "Набор стикеров" #: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:477 msgid "T-Shirt Pack" -msgstr "" +msgstr "Комплект футболок"

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 08 Jun '19

08 Jun '19

commit 81df41b9b3578cc94c2fd8ba966e6b1e4c57a4bf Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 8 08:46:15 2019 +0000 Update translations for https_everywhere_completed --- tr/https-everywhere.dtd | 1 + 1 file changed, 1 insertion(+) diff --git a/tr/https-everywhere.dtd b/tr/https-everywhere.dtd index 4948125ff..9cf557499 100644 --- a/tr/https-everywhere.dtd +++ b/tr/https-everywhere.dtd @@ -35,6 +35,7 @@ <!ENTITY https-everywhere.options.storedRulesetsVersion "Kaydedilmiş kural kümesi sürümü:"> <!ENTITY https-everywhere.options.updatesLastChecked "Son güncelleme denetimi:"> <!ENTITY https-everywhere.options.updatesLastCheckedNever "asla"> +<!ENTITY https-everywhere.options.debuggingRulesets "Kural Kümeleri Hata Ayıklama (gelişmiş)"> <!ENTITY https-everywhere.prefs.export_settings "Ayarları Dışa Aktar"> <!ENTITY https-everywhere.prefs.reset_defaults "Varsayılanları Yükle">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 08 Jun '19

08 Jun '19

commit 686c85dd6dde4dc26031ba2b6e720f0f33997d21 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 8 08:46:07 2019 +0000 Update translations for https_everywhere --- tr/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tr/https-everywhere.dtd b/tr/https-everywhere.dtd index b54178802..9cf557499 100644 --- a/tr/https-everywhere.dtd +++ b/tr/https-everywhere.dtd @@ -35,7 +35,7 @@ <!ENTITY https-everywhere.options.storedRulesetsVersion "Kaydedilmiş kural kümesi sürümü:"> <!ENTITY https-everywhere.options.updatesLastChecked "Son güncelleme denetimi:"> <!ENTITY https-everywhere.options.updatesLastCheckedNever "asla"> -<!ENTITY https-everywhere.options.debuggingRulesets "Debugging Rulesets (advanced)"> +<!ENTITY https-everywhere.options.debuggingRulesets "Kural Kümeleri Hata Ayıklama (gelişmiş)"> <!ENTITY https-everywhere.prefs.export_settings "Ayarları Dışa Aktar"> <!ENTITY https-everywhere.prefs.reset_defaults "Varsayılanları Yükle">

1 0

[translation/support-portal_completed] Update translations for support-portal_completed
by translation＠torproject.org 08 Jun '19

08 Jun '19

commit 03383329c6fcf7af9c51aea3b256012ea94d2f43 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 8 08:21:44 2019 +0000 Update translations for support-portal_completed --- contents+ka.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/contents+ka.po b/contents+ka.po index 4c0ef6e2f..6b88b55cc 100644 --- a/contents+ka.po +++ b/contents+ka.po @@ -4232,9 +4232,9 @@ msgid "" "network, typically running on behalf of one user, that routes application " "connections over a series of [relays](#relay)." msgstr "" -"[Tor-ში](#tor-/-tor-network/-core-tor), კლიენტი ეწოდება კვანძს Tor-ქსელში, " -"ჩვეულებრივ გაშვებული ერთი მომხმარებლის მიერ, რომელიც პროგრამის კავშირებს " -"ატარებს [გადამცემების](#relay) მწკრივის გავლით." +"[Tor-ში](#tor-/-tor-network/-core-tor), კლიენტი ეწოდება Tor-ქსელის კვანძს, " +"ჩვეულებრივ, გაშვებულს ერთი მომხმარებლის მიერ, რომელიც პროგრამის კავშირებს " +"ამისამართებს [გადამცემების](#relay) მწკრივის გავლით." #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -4699,10 +4699,10 @@ msgid "" "](#add-on-extension-or-plugin) that makes [HTTPS](#https) the default on " "websites that have set up HTTPS but have not made it the default." msgstr "" -"HTTPS Everywhere არის [Firefox](#firefox)-ის, Chrome-ისა და Opera-ს " -"[გაფართოება](#add-on-extension-or-plugin), რომელიც ნაგულისხმევად იყენებს " -"[HTTPS](#https)-ს იმ საიტებზე, რომლებსაც გააჩნია HTTPS მაგრამ ნაგულისხმევად " -"არ აქვთ მითითებული." +"HTTPS-Everywhere არის [Firefox](#firefox)-ის, Chrome-ისა და Opera-ს " +"[გაფართოება](#add-on-extension-or-plugin), [HTTPS](#https)-ს ნაგულისხმევად " +"გამოსაყენებლად იმ საიტებზე, რომლებსაც გააჩნია HTTPS, მაგრამ ნაგულისხმევად არ" +" აქვს მითითებული." #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -5389,7 +5389,7 @@ msgid "" "message or other files." msgstr "" "ამასთან, საიდუმლო გასაღების გამოყენება შეიძლება [ხელმოწერის](#cryptographic-" -"signature) სახით, წერილის ან სხვა სახის ფაილების შემქმნელის ვინაობის " +"signature) სახით, წერილის ან სხვა სახეობის ფაილების შემქმნელის ვინაობის " "დასამოწმებლად." #: https//support.torproject.org/misc/glossary/

1 0

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 08 Jun '19

08 Jun '19

commit bd133607ac8525b376a222181765f1f921f88508 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 8 08:21:34 2019 +0000 Update translations for support-portal --- contents+ka.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/contents+ka.po b/contents+ka.po index 4c0ef6e2f..6b88b55cc 100644 --- a/contents+ka.po +++ b/contents+ka.po @@ -4232,9 +4232,9 @@ msgid "" "network, typically running on behalf of one user, that routes application " "connections over a series of [relays](#relay)." msgstr "" -"[Tor-ში](#tor-/-tor-network/-core-tor), კლიენტი ეწოდება კვანძს Tor-ქსელში, " -"ჩვეულებრივ გაშვებული ერთი მომხმარებლის მიერ, რომელიც პროგრამის კავშირებს " -"ატარებს [გადამცემების](#relay) მწკრივის გავლით." +"[Tor-ში](#tor-/-tor-network/-core-tor), კლიენტი ეწოდება Tor-ქსელის კვანძს, " +"ჩვეულებრივ, გაშვებულს ერთი მომხმარებლის მიერ, რომელიც პროგრამის კავშირებს " +"ამისამართებს [გადამცემების](#relay) მწკრივის გავლით." #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -4699,10 +4699,10 @@ msgid "" "](#add-on-extension-or-plugin) that makes [HTTPS](#https) the default on " "websites that have set up HTTPS but have not made it the default." msgstr "" -"HTTPS Everywhere არის [Firefox](#firefox)-ის, Chrome-ისა და Opera-ს " -"[გაფართოება](#add-on-extension-or-plugin), რომელიც ნაგულისხმევად იყენებს " -"[HTTPS](#https)-ს იმ საიტებზე, რომლებსაც გააჩნია HTTPS მაგრამ ნაგულისხმევად " -"არ აქვთ მითითებული." +"HTTPS-Everywhere არის [Firefox](#firefox)-ის, Chrome-ისა და Opera-ს " +"[გაფართოება](#add-on-extension-or-plugin), [HTTPS](#https)-ს ნაგულისხმევად " +"გამოსაყენებლად იმ საიტებზე, რომლებსაც გააჩნია HTTPS, მაგრამ ნაგულისხმევად არ" +" აქვს მითითებული." #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -5389,7 +5389,7 @@ msgid "" "message or other files." msgstr "" "ამასთან, საიდუმლო გასაღების გამოყენება შეიძლება [ხელმოწერის](#cryptographic-" -"signature) სახით, წერილის ან სხვა სახის ფაილების შემქმნელის ვინაობის " +"signature) სახით, წერილის ან სხვა სახეობის ფაილების შემქმნელის ვინაობის " "დასამოწმებლად." #: https//support.torproject.org/misc/glossary/

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 08 Jun '19

08 Jun '19

commit 57d273dfa984e02ab0c67e9ff7529fdbaebeea08 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 8 06:46:16 2019 +0000 Update translations for https_everywhere_completed --- ka/https-everywhere.dtd | 1 + 1 file changed, 1 insertion(+) diff --git a/ka/https-everywhere.dtd b/ka/https-everywhere.dtd index dc475850c..2ce55e437 100644 --- a/ka/https-everywhere.dtd +++ b/ka/https-everywhere.dtd @@ -35,6 +35,7 @@ <!ENTITY https-everywhere.options.storedRulesetsVersion "შენახული მზა წესების ვერსია:"> <!ENTITY https-everywhere.options.updatesLastChecked "განახლებების ბოლო შემოწმება:"> <!ENTITY https-everywhere.options.updatesLastCheckedNever "არასდროს"> +<!ENTITY https-everywhere.options.debuggingRulesets "გამართვის მზა წესები (გაფართოებული)"> <!ENTITY https-everywhere.prefs.export_settings "პარამეტრების გატანა"> <!ENTITY https-everywhere.prefs.reset_defaults "ნაგულისხმევის აღდგენა">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 08 Jun '19

08 Jun '19

commit ba59bfffc1eccdc9ad564de8724d991fce7a8ebd Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 8 06:46:05 2019 +0000 Update translations for https_everywhere --- ka/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ka/https-everywhere.dtd b/ka/https-everywhere.dtd index defbd5cbc..2ce55e437 100644 --- a/ka/https-everywhere.dtd +++ b/ka/https-everywhere.dtd @@ -35,7 +35,7 @@ <!ENTITY https-everywhere.options.storedRulesetsVersion "შენახული მზა წესების ვერსია:"> <!ENTITY https-everywhere.options.updatesLastChecked "განახლებების ბოლო შემოწმება:"> <!ENTITY https-everywhere.options.updatesLastCheckedNever "არასდროს"> -<!ENTITY https-everywhere.options.debuggingRulesets "Debugging Rulesets (advanced)"> +<!ENTITY https-everywhere.options.debuggingRulesets "გამართვის მზა წესები (გაფართოებული)"> <!ENTITY https-everywhere.prefs.export_settings "პარამეტრების გატანა"> <!ENTITY https-everywhere.prefs.reset_defaults "ნაგულისხმევის აღდგენა">

1 0

[stem/master] Support additional test torrc options
by atagar＠torproject.org 07 Jun '19

07 Jun '19

commit 394852cf08e7eb65904918591b503696bcac86de Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jun 7 15:42:47 2019 -0700 Support additional test torrc options Teor would like to run stem's integ tests against a Chutnet network... https://trac.torproject.org/projects/tor/ticket/30702 Highly unusual use case, but making it possible. Stem now accepts a STEM_TEST_CONFIG environment variable that overwrites any internal testing configuration values (see test/settings.cfg), along with a 'integ.extra_torrc' option. So to use this... 1. Write a file that overwrites our integ.extra_torrc configuration. Available macros include... [DATA_DIR] [OR_PORT] [SOCKS_PORT] 2. Set STEM_TEST_CONFIG to the path of that file. 3. Run our integ tests, and check the beginning of the output where it says 'writing torrc' to confirm that the torrc looks as you expect. For example... % cat /home/atagar/Desktop/stem/my_test_config integ.extra_torrc |Nickname Demo[OR_PORT] |FetchUselessDescriptors 1 % export STEM_TEST_CONFIG=/home/atagar/Desktop/stem/my_test_config % ./run_tests.py --integ ... Setting up a test instance... making test directory (/home/atagar/Desktop/stem/test/data)... done configuring logger (/home/atagar/Desktop/stem/test/data/log)... done writing torrc (/home/atagar/Desktop/stem/test/data/torrc)... done # Configuration for stem's integration tests DataDirectory /home/atagar/Desktop/stem/test/data SocksPort 1112 ORPort 1113 ExitRelay 0 PublishServerDescriptor 0 AssumeReachable 1 DownloadExtraInfo 1 Log notice stdout Log debug file /home/atagar/Desktop/stem/test/data/tor_log # Torrc options for the RUN_OPEN target ControlPort 1111 # Torrc options from /home/atagar/Desktop/stem/my_test_config Nickname Demo1113 FetchUselessDescriptors 1 --- run_tests.py | 3 +++ test/runner.py | 36 ++++++++++++++++++------------------ test/settings.cfg | 25 +++++++++++++++++++++++++ 3 files changed, 46 insertions(+), 18 deletions(-) diff --git a/run_tests.py b/run_tests.py index ef31a05e..77db73b5 100755 --- a/run_tests.py +++ b/run_tests.py @@ -187,6 +187,9 @@ def main(): test_config = stem.util.conf.get_config('test') test_config.load(os.path.join(test.STEM_BASE, 'test', 'settings.cfg')) + if 'STEM_TEST_CONFIG' in os.environ: + test_config.load(os.environ['STEM_TEST_CONFIG']) + try: args = test.arguments.parse(sys.argv[1:]) test.task.TOR_VERSION.args = (args.tor_path,) diff --git a/test/runner.py b/test/runner.py index b7da06a4..c343ed57 100644 --- a/test/runner.py +++ b/test/runner.py @@ -52,6 +52,8 @@ import test from test.output import println, STATUS, ERROR, SUBSTATUS, NO_NL CONFIG = stem.util.conf.config_dict('test', { + 'integ.torrc': '', + 'integ.extra_torrc': '', 'integ.test_directory': './test/data', 'integ.log': './test/data/log', 'target.torrc': {}, @@ -60,18 +62,6 @@ CONFIG = stem.util.conf.config_dict('test', { SOCKS_PORT = 1112 ORPORT = 1113 -BASE_TORRC = """# configuration for stem integration tests -DataDirectory %%s -SocksPort %i -ORPort %i -ExitRelay 0 -PublishServerDescriptor 0 -AssumeReachable 1 -DownloadExtraInfo 1 -Log notice stdout -Log debug file %%s/tor_log -""" % (SOCKS_PORT, ORPORT) - # singleton Runner instance INTEG_RUNNER = None @@ -221,22 +211,32 @@ class Runner(object): data_dir_path = './%s' % os.path.basename(self._test_dir) config_csv = CONFIG['target.torrc'].get(config_target) - extra_torrc_opts = [] + target_torrc_opts = [] if config_csv: for opt in config_csv.split(','): opt = opt.strip() if opt in Torrc.keys(): - extra_torrc_opts.append(Torrc[opt]) + target_torrc_opts.append(Torrc[opt]) else: raise ValueError("'%s' isn't a test.runner.Torrc enumeration" % opt) - self._custom_opts = extra_torrc_opts - self._torrc_contents = BASE_TORRC % (data_dir_path, data_dir_path) + self._custom_opts = target_torrc_opts + + self._torrc_contents = CONFIG['integ.torrc'] + + if target_torrc_opts: + self._torrc_contents += '\n\n# Torrc options for the %s target\n\n' % config_target + self._torrc_contents += '\n'.join(target_torrc_opts) + + if CONFIG['integ.extra_torrc']: + self._torrc_contents += '\n\n# Torrc options from %s\n\n' % os.environ['STEM_TEST_CONFIG'] + self._torrc_contents += CONFIG['integ.extra_torrc'] - if extra_torrc_opts: - self._torrc_contents += '\n'.join(extra_torrc_opts) + '\n' + self._torrc_contents = self._torrc_contents.replace('[DATA_DIR]', data_dir_path) + self._torrc_contents = self._torrc_contents.replace('[SOCKS_PORT]', str(SOCKS_PORT)) + self._torrc_contents = self._torrc_contents.replace('[OR_PORT]', str(ORPORT)) try: self._tor_cwd = os.getcwd() diff --git a/test/settings.cfg b/test/settings.cfg index 5b4feb60..6a2f5914 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -19,6 +19,31 @@ integ.test_directory ./test/data exclude_paths .*/stem/test/data/.* integ.log ./test/data/log +integ.torrc +|# Configuration for stem's integration tests +| +|DataDirectory [DATA_DIR] +|SocksPort [SOCKS_PORT] +|ORPort [OR_PORT] +|ExitRelay 0 +|PublishServerDescriptor 0 +|AssumeReachable 1 +|DownloadExtraInfo 1 +|Log notice stdout +|Log debug file [DATA_DIR]/tor_log + +# To append additional torrc options you can overwrite the following. For +# example... +# +# % cat /home/atagar/Desktop/stem/my_test_config +# integ.extra_torrc +# |Nickname StemTestDemo +# |FetchUselessDescriptors 1 +# +# % export STEM_TEST_CONFIG=/home/atagar/Desktop/stem + +integ.extra_torrc + # The following are less testing framework attributes that aren't as commonly # reconfigured. #

1 0