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

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

01 May '19

commit c704a738ad3897527c0b42fa14301677781d7b4a Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 30 23:50:29 2019 +0000 Update translations for tpo-web --- contents+pl.po | 62 ++++++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 50 insertions(+), 12 deletions(-) diff --git a/contents+pl.po b/contents+pl.po index d2aa8639c..8327e8a52 100644 --- a/contents+pl.po +++ b/contents+pl.po @@ -389,6 +389,9 @@ msgid "" "[2008](https://lists.torproject.org/pipermail/tor-" "talk/2008-January/007837.html)." msgstr "" +"Rozwój Przeglądarki Tor rozpoczął się w " +"[2008](https://lists.torproject.org/pipermail/tor-" +"talk/2008-January/007837.html)." #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) @@ -399,6 +402,13 @@ msgid "" " 2010. It not only protected people's identity online but also allowed them " "to access critical resources, social media, and websites which were blocked." msgstr "" +"Dzięki temu, że Przeglądarka Tor uczyniła Tora bardziej dostępnym dla " +"codziennych użytkowników internetu i aktywistów, Tor był pomocniczym " +"narzędziem podczas [Arabskiej Wiosny] (https://www.theguardian.com/us-news" +"/the-nsa-files), która rozpoczęła się pod koniec 2010 roku. Nie tylko " +"chronił tożsamość ludzi w Internecie, ale także pozwolił im na dostęp do " +"krytycznych zasobów, mediów społecznościowych i stron internetowych, które " +"zostały zablokowane." #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) @@ -418,6 +428,10 @@ msgid "" "the documents also upheld assurances that, at that time, [Tor could not be " "cracked](https://www.wired.com/story/the-grand-tor/)." msgstr "" +"Tor był nie tylko narzędziem do nagłaśniania nielegalnych działań przez " +"Snowdena, ale również treść dokumentów potwierdziła zapewnienia, że w tamtym" +" czasie [Tor nie mógł zostać złamany](https://www.wired.com/story/the-grand-" +"tor/)." #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) @@ -436,6 +450,9 @@ msgid "" " run by volunteers and millions of users worldwide. And it is this diversity" " that keeps Tor users safe." msgstr "" +"Dziś sieć ma [tysiące przekaźników](https://metrics.torproject.org) " +"prowadzonych przez wolontariuszy i miliony użytkowników na całym świecie. I " +"to właśnie ta różnorodność sprawia, że użytkownicy Tora są bezpieczni." #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) @@ -444,6 +461,9 @@ msgid "" "to an uncensored internet, and Tor has become the world's strongest tool for" " privacy and freedom online." msgstr "" +"My, w Tor Project, codziennie walczymy o to, aby każdy miał prywatny dostęp " +"do nieocenzurowanego Internetu, a Tor stał się najsilniejszym na świecie " +"narzędziem do ochrony prywatności i wolności online." #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) @@ -453,6 +473,11 @@ msgid "" "is [deeply committed](https://blog.torproject.org/tor-social-contract) to " "transparency and the safety of its users." msgstr "" +"Ale Tor to coś więcej niż tylko oprogramowanie. Jest to praca stworzona z " +"miłości, przez międzynarodowa społeczność ludzi poświęconych prawom " +"człowieka. Tor Project jest [mocno zaangażowany](https://blog.torproject.org" +"/tor-social-contract) na rzecz przejrzystości i bezpieczeństwa jego " +"użytkowników." #: https//www.torproject.org/about/people/ #: (content/about/people/contents+en.lrpeople.title) @@ -539,6 +564,8 @@ msgid "" "Discuss organization and community related topics: meetups, outreach, " "translation, or website improvements." msgstr "" +"Dyskutuj na tematy związane z organizacją i społecznością: spotkania, " +"kontakty zewnętrzne, tłumaczenie lub ulepszenia strony internetowej." #: templates/contact.html:12 msgid "Watch or join publicly logged team meetings." @@ -779,7 +806,7 @@ msgstr "" #: templates/hero-download.html:2 msgid "Defend yourself." -msgstr "" +msgstr "Obroń się." #: templates/hero-download.html:45 msgid "Download in another language or platform" @@ -799,7 +826,7 @@ msgstr "Przeglądanie Prywatne." #: templates/hero-home.html:5 msgid "Explore Freely." -msgstr "" +msgstr "Przeglądaj Swobodnie" #: templates/hero-home.html:8 templates/meta.html:5 templates/meta.html:12 msgid "" @@ -808,11 +835,11 @@ msgstr "Obroń się przed śledzeniem i nadzorem. Omiń cenzurę." #: templates/home.html:7 msgid "Block Trackers" -msgstr "" +msgstr "Blokuj Skrypty Śledzące" #: templates/home.html:11 msgid "BLOCK TRACKERS" -msgstr "" +msgstr "BLOKUJ SKRYPTY ŚLEDZĄCE" #: templates/home.html:12 msgid "" @@ -820,14 +847,18 @@ msgid "" "can't follow you. Any cookies automatically clear when you're done browsing." " So will your browsing history." msgstr "" +"Przeglądarka Tor izoluje każdą odwiedzaną stronę internetową, więc skrypty " +"śledzące i reklamy innych firm nie mogą podążać za Tobą. Wszelkie pliki " +"cookie automatycznie usuwają się po zakończeniu przeglądania. Tak samo jak " +"historia przeglądania." #: templates/home.html:24 msgid "Defend Against Surveillance" -msgstr "" +msgstr "Obroń się Przed Inwigilacją" #: templates/home.html:28 msgid "DEFEND AGAINST SURVEILLANCE" -msgstr "" +msgstr "OBROŃ SIĘ PRZED INWIGILACJĄ" #: templates/home.html:29 msgid "" @@ -874,7 +905,7 @@ msgstr "Przeglądaj swobodnie" #: templates/home.html:79 msgid "BROWSE FREELY" -msgstr "" +msgstr "PRZEGLĄDAJ SWOBODNIE" #: templates/home.html:80 msgid "" @@ -886,7 +917,7 @@ msgstr "" #: templates/jobs.html:2 msgid "Current Openings" -msgstr "" +msgstr "Obecne Otwarcia" #: templates/jobs.html:13 msgid "" @@ -897,13 +928,16 @@ msgstr "" #: templates/jobs.html:18 templates/projects.html:5 msgid "Previous Openings" -msgstr "" +msgstr "Poprzednie Otwarcia" #: templates/jobs.html:32 templates/projects.html:33 msgid "" "Think you could help us in a position that's not listed? We also rely on a " "vast community of volunteer contributors and many have become paid staff." msgstr "" +"Myślisz, że mógłbyś nam pomóc w rzeczy, która nie jest wymieniona? Polegamy " +"również na ogromnej społeczności wolontariuszy, a wielu z nich stało się " +"płatnymi pracownikami." #: templates/jobs.html:32 templates/projects.html:33 msgid "We invite you to join us on IRC to find how you can get involved." @@ -925,11 +959,11 @@ msgstr "Menu" #: templates/people.html:2 msgid "Board of Directors" -msgstr "" +msgstr "Rada Dyrektorów" #: templates/people.html:3 templates/people.html:15 msgid "Core Tor" -msgstr "" +msgstr "Rdzeń Tora" #: templates/people.html:28 msgid "Join Our Team" @@ -980,7 +1014,7 @@ msgstr "Komunikaty prasowe" #: templates/press.html:54 msgid "Coverage" -msgstr "" +msgstr "Pokrycie" #: templates/press.html:61 msgid "Date" @@ -1029,6 +1063,10 @@ msgid "" "financial contributions: coding, testing, documenting, translating, " "educating, researching, and running the relays that make up the Tor network." msgstr "" +"Dziękujemy wszystkim osobom i grupom, które dotychczas umożliwiły Tora, a w " +"szczególności wolontariuszom indywidualnym, którzy wnieśli niefinansowy " +"wkład: kodowanie, testowanie, dokumentowanie, tłumaczenie, edukowanie, " +"badanie i prowadzenie przekaźników wchodzących w skład sieci Tor." #: templates/sponsors.html:5 msgid "Active Sponsors"

1 0

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

01 May '19

commit bba0b051eed1b59f1ceadd777b3c42a9f9679751 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 30 23:20:45 2019 +0000 Update translations for support-portal --- contents+pl.po | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contents+pl.po b/contents+pl.po index 7570112b3..6f3154132 100644 --- a/contents+pl.po +++ b/contents+pl.po @@ -2112,6 +2112,9 @@ msgid "" " routing, and is developed by someone who works closely with the Tor " "Project." msgstr "" +"Polecamy aplikację na iOS o nazwie Onion Browser, która jest aplikacją open " +"source, która używa routingu Tor i jest rozwijana przez kogoś, kto ściśle " +"współpracuje z Tor Project." #: https//support.torproject.org/tormobile/tormobile-3/ #: (content/tormobile/tormobile-3/contents+en.lrquestion.description)

1 0

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

01 May '19

commit 45e4394bbff96c710fc285afa815c199305a5e2c Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 30 23:20:21 2019 +0000 Update translations for tpo-web --- contents+pl.po | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/contents+pl.po b/contents+pl.po index 7281aa3e2..d2aa8639c 100644 --- a/contents+pl.po +++ b/contents+pl.po @@ -232,6 +232,8 @@ msgid "" "The Tor Project, Inc, became a 501(c)3 nonprofit in 2006, but the idea of " "\"onion routing\" began in the mid 1990s." msgstr "" +"The Tor Project, Inc, stał się 501(c)3 nonprofit w 2006 roku, ale pomysł " +"\"routingu cebulowego\" rozpoczął się w połowie 1990." #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) @@ -241,6 +243,11 @@ msgid "" "been involved in Tor are united by a common belief: internet users should " "have private access to an uncensored web.**" msgstr "" +"**Tak jak użytkownicy Tora, programiści, naukowcy i fundatorzy, którzy " +"umożliwili stworzenie Tora, są zróżnicowana grupą ludzi. Ale wszyscy ludzie," +" którzy byli zaangażowani w Tora są zjednoczeni wspólnym przekonaniem: " +"użytkownicy internetu powinni mieć prywatny dostęp do nieocenzurowanej " +"sieci.**" #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) @@ -252,6 +259,12 @@ msgid "" "that don't reveal who is talking to whom, even to someone monitoring the " "network." msgstr "" +"W latach 1990-tych, brak bezpieczeństwa w internecie i jego zdolności do " +"śledzenia i nadzorowania stawał się coraz bardziej oczywisty, a w 1995 roku " +"David Goldschlag, Mike Reed i Paul Syverson z Laboratorium Badań Marynarki " +"Wojennej Stanów Zjednoczonych (U.S. Naval Research Lab - NRL) zadawali sobie" +" pytanie, czy istnieje sposób stworzenia połączeń internetowych, które nie " +"ujawniają, z kim kto rozmawia, nawet komuś monitorującym sieć." #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) @@ -259,6 +272,8 @@ msgid "" "Their answer was to create and deploy the first research designs and " "prototypes of onion routing." msgstr "" +"Ich odpowiedzią było stworzenie i wdrożenie pierwszych projektów badawczych " +"i prototypów routingu cebulowego." #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) @@ -283,6 +298,9 @@ msgid "" "Technology (MIT)](https://web.mit.edu/) graduate, began working on an NRL " "onion routing project with Paul Syverson." msgstr "" +"Na początku 2000 roku, Roger Dingledine, absolwent [Massachusetts Institute " +"of Technology (MIT)](https://web.mit.edu/) rozpoczął pracę nad projektem " +"NRL dotyczącym routingu cebulowego z Paulem Syversonem." #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) @@ -292,6 +310,10 @@ msgid "" "stood for The Onion Routing. Nick Mathewson, a classmate of Roger's at MIT, " "joined the project soon after." msgstr "" +"Aby odróżnić tę oryginalną pracę w NRL od innych działań związanych z " +"routingiem cebulowym, które zaczęły pojawiać się gdzie indziej, Roger nazwał" +" projekt Tor, który oznaczał The Onion Routing. Wkrótce potem do projektu " +"dołączył Nick Mathewson, kolega z klasy Rogera z MIT." #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) @@ -301,6 +323,11 @@ msgid "" "diverse interests and trust assumptions, and the software needed to be free " "and open to maximize transparency and separation." msgstr "" +"Od momentu powstania w latach 1990-tych, routing cebulowy został pomyślany " +"tak, aby opierał się na sieci zdecentralizowanej. Sieć musiała być " +"obsługiwana przez podmioty o zróżnicowanych interesach i założeniach " +"zaufania, a oprogramowanie musiało być wolne i otwarte, aby zmaksymalizować " +"przejrzystość i separację." #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) @@ -308,6 +335,9 @@ msgid "" "That's why in October 2002 when the Tor network was initially deployed, its " "code was released under a free and open software license." msgstr "" +"Dlatego w październiku 2002 roku, kiedy sieć Tor została początkowo " +"uruchomiona, jej kod został wydany na licencji wolnego i otwartego " +"oprogramowania." #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) @@ -326,6 +356,11 @@ msgid "" "work on Tor in 2004. In 2006, the Tor Project, Inc., a 501(c)3 nonprofit " "organization, was founded to maintain Tor's development." msgstr "" +"Uznając korzyści płynące z praw autorskich dla Tor, [Fundacja Electronic " +"Frontier Foundation (EFF)](https://www.eff.org/) rozpoczęła finansowanie " +"prac Rogera i Nicka nad Torem w 2004 roku. W 2006, Tor Project, Inc., " +"organizacja non-profit 501(c)3 została założona w celu utrzymywania rozwoju " +"Tora." #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) @@ -334,6 +369,9 @@ msgid "" "address censorship, such as the need to get around government firewalls, in " "order for its users to access the open web." msgstr "" +"W 2007 roku organizacja rozpoczęła tworzenie mostków do sieci Tor w celu " +"rozwiązania kwestii cenzury, takich jak konieczność obejścia rządowych zapór" +" ogniowych, aby umożliwić użytkownikom dostęp do otwartej sieci." #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body)

1 0

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

01 May '19

commit 8f45a341de004543412eb55d10b48ef147d93537 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 30 22:20:20 2019 +0000 Update translations for tpo-web --- contents+pl.po | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/contents+pl.po b/contents+pl.po index fd9c503dc..7281aa3e2 100644 --- a/contents+pl.po +++ b/contents+pl.po @@ -5,16 +5,16 @@ # Dawid Job <hoek(a)tuta.io>, 2019 # erinm, 2019 # wigatesi, 2019 -# Dawid Potocki <dpot(a)disroot.org>, 2019 # Waldemar Stoczkowski, 2019 +# Dawid Potocki <dpot(a)disroot.org>, 2019 # msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-04-23 13:54+CET\n" +"POT-Creation-Date: 2019-04-25 20:12+CET\n" "PO-Revision-Date: 2019-03-09 10:41+0000\n" -"Last-Translator: Waldemar Stoczkowski, 2019\n" +"Last-Translator: Dawid Potocki <dpot(a)disroot.org>, 2019\n" "Language-Team: Polish (https://www.transifex.com/otf/teams/1519/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -166,6 +166,8 @@ msgid "" "We need your help to keep Tor secure and safe for millions across the globe." " [Donate Now](https://donate.torproject.org/)" msgstr "" +"Potrzebujemy twojej pomocy, aby Tor był bezpieczny dla milionów ludzi na " +"całym świecie. [Zrób Dotacje](https://donate.torproject.org/)" #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.title) #: https//www.torproject.org/about/history/ @@ -195,6 +197,11 @@ msgid "" "bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToRepo…," " and are not putting yourself at risk." msgstr "" +"Proszę pobierz wydanie alpha tylko wtedy, gdy nie masz nic przeciwko temu, " +"że niektóre rzeczy mogą nie działać prawidłowo, chcesz nam pomóc w " +"znalezieniu i [zgłoszeniu " +"błędów](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToRe…," +" i nie narażasz się na ryzyko." #: https//www.torproject.org/download/languages/ #: (content/download/languages/contents+en.lrpage.title) @@ -209,6 +216,10 @@ msgid "" "add more. Want to help us translate? [See here](https://tb-" "manual.torproject.org/becoming-tor-translator/)" msgstr "" +"Chcemy, aby każdy mógł cieszyć się Przeglądarką Tor w swoim własnym języku. " +"Przeglądarka Tor jest teraz dostępna w 25 różnych językach, a my pracujemy " +"nad dodaniem kolejnych. Chcesz nam pomóc w tłumaczeniu? [Sprawdź " +"tutaj](https://tb-manual.torproject.org/becoming-tor-translator/)" #: https//www.torproject.org/download/tor/ #: (content/download/tor/contents+en.lrpage.title) @@ -588,20 +599,20 @@ msgstr "Pobierz Tor Browser na system Android." msgid "Protect yourself against tracking, surveillance, and censorship." msgstr "Chroń się przed śledzeniem, nadzorem i cenzurą." -#: templates/download-android.html:20 templates/download-android.html:22 +#: templates/download-android.html:28 templates/download-android.html:30 msgid "Download .apk" msgstr "Pobierz .apk" -#: templates/download-android.html:26 +#: templates/download-android.html:35 msgid "Go to Google Play" msgstr "Przejdź do Google Play" -#: templates/download-android.html:30 +#: templates/download-android.html:39 #, python-format msgid "Go to F-droid %s" msgstr "Przejdź do F-droid %s" -#: templates/download-android.html:35 +#: templates/download-android.html:44 msgid "Are you a iOS user? We encourage you to try Onion Browser." msgstr "" "Czy jesteś użytkownikiem iOS? Zachęcamy do wypróbowania Onion Browser." @@ -732,15 +743,15 @@ msgstr "" msgid "Defend yourself." msgstr "" -#: templates/hero-download.html:42 +#: templates/hero-download.html:45 msgid "Download in another language or platform" msgstr "Pobierz w innym języku lub platformę" -#: templates/hero-download.html:43 +#: templates/hero-download.html:46 msgid "Advanced Install Options" msgstr "Opcje Instalacja Zaawansowana" -#: templates/hero-download.html:47 +#: templates/hero-download.html:50 msgid "Read the latest release announcements" msgstr "Przeczytaj najnowsze informacje o wydaniu" @@ -1027,7 +1038,7 @@ msgstr "" msgid "Use your skills to volunteer." msgstr "Wykorzystaj swoje umiejętności, aby zgłosić się na ochotnika." -#: templates/macros/downloads.html:47 +#: templates/macros/downloads.html:61 msgid "tor browser manual" msgstr "instrukcja obsługi przeglądarki"

1 0

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

30 Apr '19

commit a27c60c77957392da0bca2a833e4cc6cc92f4f68 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 30 21:20:38 2019 +0000 Update translations for support-portal --- contents+ru.po | 53 ++++++++++++++++++++++++++--------------------------- 1 file changed, 26 insertions(+), 27 deletions(-) diff --git a/contents+ru.po b/contents+ru.po index 6ad431ddd..b6f280095 100644 --- a/contents+ru.po +++ b/contents+ru.po @@ -1494,8 +1494,8 @@ msgid "" "This option is useful if you want to prevent your subsequent browser " "activity from being linkable to what you were doing before." msgstr "" -"Данная функция позволяет предотвратить установление взаимосвязей между " -"Вашими последующими и предыдущими действиями в браузере." +"Эта функция не позволяет установить связь между вашими действиями в браузере" +" в разное время." #: https//support.torproject.org/tbb/tbb-29/ #: (content/tbb/tbb-29/contents+en.lrquestion.description) @@ -1504,9 +1504,9 @@ msgid "" "information such as cookies and browsing history, and use new Tor circuits " "for all connections." msgstr "" -"Выбор этого закроет все ваши вкладки и окна, очистят все конфиденциальные " -"данные, такие как файлы cookie и историю просмотров, и будет использоваться " -"новый цикл для всех подключений." +"При выборе этой опции все ваши вкладки и окна будут закрыты, все приватные " +"данные (например, файлы cookie, история просмотров) будут очищены. Вы " +"увидите новую цепочку узлов." #: https//support.torproject.org/tbb/tbb-29/ #: (content/tbb/tbb-29/contents+en.lrquestion.description) @@ -1514,8 +1514,8 @@ msgid "" "Tor Browser will warn you that all activity and downloads will be stopped, " "so take this into account before clicking \"New Identity\"." msgstr "" -"Tor Browser предупредит вас, что все действия и загрузки будут остановлены, " -"поэтому примите это во внимание, прежде чем нажимать на \"Новая личность\"." +"Прежде, чем создавать \"новую личность\", обратите внимание: все действия и " +"загрузки в Tor Browser будут остановлены." #: https//support.torproject.org/tbb/tbb-29/ #: (content/tbb/tbb-29/contents+en.lrquestion.description) @@ -1537,8 +1537,8 @@ msgid "" "This option is useful if the exit relay you are using is unable to connect " "to the website you require, or is not loading it properly." msgstr "" -"Эта опция полезна, если используемый вами выходной релей, не может " -"подключиться к нужному веб-сайту, или не загружает его корректно." +"Опция полезна, если через текущий выходной узел нет подключения к нужному " +"сайту или сайт загружается некорректно." #: https//support.torproject.org/tbb/tbb-29/ #: (content/tbb/tbb-29/contents+en.lrquestion.description) @@ -1546,8 +1546,8 @@ msgid "" "Selecting it will cause the currently-active tab or window to be reloaded " "over a new Tor circuit." msgstr "" -"При выборе этого параметра активная вкладка или окно будет перезагружена по " -"новому циклу Tor." +"При выборе этой опции активная вкладка или окно будет перезагружена по новой" +" цепочке Tor." #: https//support.torproject.org/tbb/tbb-29/ #: (content/tbb/tbb-29/contents+en.lrquestion.description) @@ -1555,8 +1555,8 @@ msgid "" "Other open tabs and windows from the same website will use the new circuit " "as well once they are reloaded." msgstr "" -"Другие открытые вкладки и окна с одного и того же веб-сайта будут " -"использовать новую схему также после их перезагрузки." +"При перезагрузке содержимого других открытых вкладок и окон с того же сайта " +"будет использована новая цепочка Tor." #: https//support.torproject.org/tbb/tbb-29/ #: (content/tbb/tbb-29/contents+en.lrquestion.description) @@ -1564,9 +1564,8 @@ msgid "" "This option does not clear any private information or unlink your activity, " "nor does it affect your current connections to other websites." msgstr "" -"Данная функция не удаляет никакие личные данные или информацию о Ваших " -"действиях, а также не оказывает влияния на текущие соединения с другими " -"сайтами." +"Никакие личные данные или информация о ваших действиях не удаляются. " +"Никакого влияния на соединения с другими сайтами тоже нет." #: https//support.torproject.org/tbb/tbb-29/ #: (content/tbb/tbb-29/contents+en.lrquestion.description) @@ -1592,8 +1591,8 @@ msgid "" "Tor Browser often makes your connection appear as though it is coming from " "an entirely different part of the world." msgstr "" -"При использовании Tor Browser чаще всего ваше соединение выглядит так, " -"словно вы находитесь совсем в другой части света." +"При использовании Tor Browser ваше соединение обычно выглядит так, будто вы " +"находитесь в другой части света." #: https//support.torproject.org/tbb/tbb-30/ #: (content/tbb/tbb-30/contents+en.lrquestion.description) @@ -1612,7 +1611,7 @@ msgid "" "procedure for account recovery, or contacting the operators and explaining " "the situation." msgstr "" -"Единственный способ решить проблему — следовать рекомендациям сайта для " +"Единственный способ решить проблему – следовать рекомендациям сайта для " "восстановления доступа к аккаунту. Вы также можете связаться со службой " "поддержки сайта и объяснить ситуацию." @@ -1631,8 +1630,8 @@ msgstr "" #: (content/tbb/tbb-30/contents+en.lrquestion.description) msgid "Contact your provider and ask them if they provide 2FA." msgstr "" -"Свяжитесь с владельцами сайта и спросите, предлагают ли они двухфакторную " -"аутентификацию." +"Свяжитесь с владельцами сайта и спросите, есть ли у них функция " +"двухфакторной аутентификации." #: https//support.torproject.org/tbb/tbb-32/ #: (content/tbb/tbb-32/contents+en.lrquestion.title) @@ -1761,8 +1760,8 @@ msgid "" "Unfortunately, some websites deliver CAPTCHAs to Tor users, and we are not " "able to remove CAPTCHAs from websites." msgstr "" -"К сожалению, некоторые веб-сайты требуют от пользователей Tor проходить " -"капчу. Мы не можем убрать капчу с веб-сайтов." +"К сожалению, некоторые сайты требуют от пользователей Tor проходить капчу. " +"Мы не можем убрать капчу с веб-сайта." #: https//support.torproject.org/tbb/tbb-35/ #: (content/tbb/tbb-35/contents+en.lrquestion.description) @@ -1771,9 +1770,9 @@ msgid "" "inform them that their CAPTCHAs are preventing users such as yourself from " "using their services." msgstr "" -"Лучшее, что можно сделать в этих случаях, это связаться с владельцами сайтов" -" и сказать им, что капчи препятствуют пользователям вроде вас получать " -"доступ к их ресурсам." +"Лучшее, что можно сделать в этих случаях – связаться с владельцем сайта и " +"сказать ему, что капча препятствует пользователям вроде вас получать доступ " +"к его ресурсам." #: https//support.torproject.org/tbb/tbb-36/ #: (content/tbb/tbb-36/contents+en.lrquestion.title) @@ -1879,7 +1878,7 @@ msgid "" "Tor Browser is a modified version of Firefox specifically designed for use " "with Tor." msgstr "" -"Tor Browser — модифицированный браузер Firefox, версия специально для работы" +"Tor Browser – модифицированный браузер Firefox, версия специально для работы" " с Tor." #: https//support.torproject.org/tbb/tbb-4/

1 0

[meek/master] Terminate firefox and meek-client simultaneously.
by dcf＠torproject.org 30 Apr '19

30 Apr '19

commit c7737223bb1ed9f6944a5020db5ed527b25efd97 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Apr 18 23:23:08 2019 -0600 Terminate firefox and meek-client simultaneously. Let both their terminateTimeouts run concurrently. --- meek-client-torbrowser/meek-client-torbrowser.go | 41 +++++++++++++++--------- 1 file changed, 26 insertions(+), 15 deletions(-) diff --git a/meek-client-torbrowser/meek-client-torbrowser.go b/meek-client-torbrowser/meek-client-torbrowser.go index 7c304ea..38a9fc3 100644 --- a/meek-client-torbrowser/meek-client-torbrowser.go +++ b/meek-client-torbrowser/meek-client-torbrowser.go @@ -34,6 +34,7 @@ import ( "path/filepath" "regexp" "strings" + "sync" "syscall" "time" ) @@ -413,25 +414,35 @@ func main() { log.Print(err) } + var wg sync.WaitGroup if firefoxCmd != nil { - err := terminateCmd(firefoxCmd) - // We terminate Firefox with SIGTERM, so don't log an error - // if the exit status is "terminated by SIGTERM." - if err2, ok := err.(*exec.ExitError); ok { - if status, ok := err2.Sys().(syscall.WaitStatus); ok { - if status.Signaled() && status.Signal() == syscall.SIGTERM { - err = nil + wg.Add(1) + go func() { + defer wg.Done() + err := terminateCmd(firefoxCmd) + // We terminate Firefox with SIGTERM, so don't log an + // error if the exit status is "terminated by SIGTERM." + if err2, ok := err.(*exec.ExitError); ok { + if status, ok := err2.Sys().(syscall.WaitStatus); ok { + if status.Signaled() && status.Signal() == syscall.SIGTERM { + err = nil + } } } - } - if err != nil { - log.Printf("error terminating firefox: %v", err) - } + if err != nil { + log.Printf("error terminating firefox: %v", err) + } + }() } if meekClientCmd != nil { - err := terminatePTCmd(meekClientCmd) - if err != nil { - log.Printf("error terminating meek-client: %v", err) - } + wg.Add(1) + go func() { + defer wg.Done() + err := terminatePTCmd(meekClientCmd) + if err != nil { + log.Printf("error terminating meek-client: %v", err) + } + }() } + wg.Wait() }

1 0

[meek/master] Remove unused logKill and logSignal.
by dcf＠torproject.org 30 Apr '19

30 Apr '19

commit ee71a6ad9f5c681d97255f2f0dc7875b843aefd0 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Apr 18 23:18:54 2019 -0600 Remove unused logKill and logSignal. --- meek-client-torbrowser/meek-client-torbrowser.go | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/meek-client-torbrowser/meek-client-torbrowser.go b/meek-client-torbrowser/meek-client-torbrowser.go index 1274327..7c304ea 100644 --- a/meek-client-torbrowser/meek-client-torbrowser.go +++ b/meek-client-torbrowser/meek-client-torbrowser.go @@ -56,26 +56,6 @@ type ptCmd struct { StdinCloser io.WriteCloser } -// Log a call to os.Process.Kill. -func logKill(p *os.Process) error { - log.Printf("killing PID %d", p.Pid) - err := p.Kill() - if err != nil { - log.Print(err) - } - return err -} - -// Log a call to os.Process.Signal. -func logSignal(p *os.Process, sig os.Signal) error { - log.Printf("sending signal %s to PID %d", sig, p.Pid) - err := p.Signal(sig) - if err != nil { - log.Print(err) - } - return err -} - func copyFile(srcPath string, mode os.FileMode, destPath string) error { inFile, err := os.Open(srcPath) if err != nil {

1 0

[meek/master] Factor out a startProcesses function, kill processes in main.
by dcf＠torproject.org 30 Apr '19

30 Apr '19

commit 9436eba46455f8f0d0db7109959d7779e980fe9f Author: David Fifield <david(a)bamsoftware.com> Date: Thu Apr 18 22:54:06 2019 -0600 Factor out a startProcesses function, kill processes in main. --- meek-client-torbrowser/meek-client-torbrowser.go | 98 +++++++++++++++--------- 1 file changed, 60 insertions(+), 38 deletions(-) diff --git a/meek-client-torbrowser/meek-client-torbrowser.go b/meek-client-torbrowser/meek-client-torbrowser.go index 16f0ebc..ce79193 100644 --- a/meek-client-torbrowser/meek-client-torbrowser.go +++ b/meek-client-torbrowser/meek-client-torbrowser.go @@ -315,6 +315,53 @@ func runMeekClient(helperAddr string, meekClientCommandLine []string) (cmd *exec return cmd, nil } +// Run firefox and meek-client and return the processes. When err is nil, both +// processes were started successfully. If err is non-nil, one or both processes +// may have failed to start. If a process did not start, its corresponding +// return value will be nil. The caller is responsible for terminating whatever +// processes were started, whether or not err is nil. +func startProcesses(sigChan <-chan os.Signal, meekClientCommandLine []string) (firefoxCmd *exec.Cmd, meekClientCmd *exec.Cmd, err error) { + // Start firefox. + var stdout io.Reader + firefoxCmd, stdout, err = runFirefox() + if err != nil { + firefoxCmd = nil + err = fmt.Errorf("error running firefox: %v", err) + return + } + + // Find out the helper's listening address. + addrChan := make(chan string) + errChan := make(chan error) + go func() { + addr, err := grepHelperAddr(stdout) + if err == nil { + addrChan <- addr + } else { + errChan <- err + } + }() + var helperAddr string + select { + case sig := <-sigChan: + err = fmt.Errorf("received signal %v before starting meek-client", sig) + return + case err = <-errChan: + err = fmt.Errorf("error looking for helper address: %v", err) + return + case helperAddr = <-addrChan: + } + + // Start meek-client with the helper address. + meekClientCmd, err = runMeekClient(helperAddr, meekClientCommandLine) + if err != nil { + meekClientCmd = nil + err = fmt.Errorf("error running meek-client: %v", err) + return + } + return +} + func main() { var logFilename string @@ -361,48 +408,23 @@ func main() { }() } - // Start firefox. - firefoxCmd, stdout, err := runFirefox() - if err != nil { - log.Print(err) - return - } - defer logKill(firefoxCmd.Process) - - // Find out the helper's listening address. - addrChan := make(chan string) - errChan := make(chan error) - go func() { - addr, err := grepHelperAddr(stdout) - if err == nil { - addrChan <- addr - } else { - errChan <- err - } - }() - var helperAddr string - select { - case sig := <-sigChan: + firefoxCmd, meekClientCmd, err := startProcesses(sigChan, meekClientCommandLine) + if err == nil { + // Both processes started successfully. Now let them run until + // we are instructed to stop. + sig := <-sigChan log.Printf("sig %s", sig) - return - case err = <-errChan: + logSignal(meekClientCmd.Process, sig) + } else { + // Otherwise don't wait, go ahead and terminate whatever + // processes were started. log.Print(err) - return - case helperAddr = <-addrChan: } - // Start meek-client with the helper address. - meekClientCmd, err := runMeekClient(helperAddr, meekClientCommandLine) - if err != nil { - log.Print(err) - return + if firefoxCmd != nil { + logKill(firefoxCmd.Process) } - defer logKill(meekClientCmd.Process) - - sig := <-sigChan - log.Printf("sig %s", sig) - err = logSignal(meekClientCmd.Process, sig) - if err != nil { - log.Print(err) + if meekClientCmd != nil { + logKill(firefoxCmd.Process) } }

1 0

[meek/master] Be more careful about terminating meek-client.
by dcf＠torproject.org 30 Apr '19

30 Apr '19

commit adf41cd3adf6e3884626b6b7e4c7f131660343dd Author: David Fifield <david(a)bamsoftware.com> Date: Sat Feb 23 02:23:05 2019 -0700 Be more careful about terminating meek-client. First close its stdin and send SIGTERM; and then kill it if that doesn't work. Set TOR_PT_EXIT_ON_STDIN_EOF=1 unconditionally in the subprocess. On Windows it's the same, except don't send SIGTERM. https://bugs.torproject.org/15125 https://bugs.torproject.org/25613 --- meek-client-torbrowser/meek-client-torbrowser.go | 27 ++++++++++++++----- meek-client-torbrowser/terminate_other.go | 33 ++++++++++++++++++++++++ meek-client-torbrowser/terminate_windows.go | 30 +++++++++++++++++++++ 3 files changed, 84 insertions(+), 6 deletions(-) diff --git a/meek-client-torbrowser/meek-client-torbrowser.go b/meek-client-torbrowser/meek-client-torbrowser.go index ce79193..0f295ff 100644 --- a/meek-client-torbrowser/meek-client-torbrowser.go +++ b/meek-client-torbrowser/meek-client-torbrowser.go @@ -35,16 +35,27 @@ import ( "regexp" "strings" "syscall" + "time" ) // This magic string is emitted by meek-http-helper. var helperAddrPattern = regexp.MustCompile(`^meek-http-helper: listen (127\.0\.0\.1:\d+)$`) +// How long to wait for child processes to exit gracefully before killing them. +const terminateTimeout = 2 * time.Second + func usage() { fmt.Fprintf(os.Stderr, "Usage: %s [meek-client-torbrowser args] -- meek-client [meek-client args]\n", os.Args[0]) flag.PrintDefaults() } +// ptCmd is a *exec.Cmd augmented with an io.WriteCloser for its stdin, which we +// can close to instruct the PT subprocess to terminate. +type ptCmd struct { + *exec.Cmd + StdinCloser io.WriteCloser +} + // Log a call to os.Process.Kill. func logKill(p *os.Process) error { log.Printf("killing PID %d", p.Pid) @@ -293,14 +304,16 @@ func grepHelperAddr(r io.Reader) (string, error) { } // Run meek-client and return its exec.Cmd. -func runMeekClient(helperAddr string, meekClientCommandLine []string) (cmd *exec.Cmd, err error) { +func runMeekClient(helperAddr string, meekClientCommandLine []string) (cmd *ptCmd, err error) { meekClientPath := meekClientCommandLine[0] args := meekClientCommandLine[1:] args = append(args, []string{"--helper", helperAddr}...) - cmd = exec.Command(meekClientPath, args...) + cmd = new(ptCmd) + cmd.Cmd = exec.Command(meekClientPath, args...) // Give the subprocess a stdin for TOR_PT_EXIT_ON_STDIN_CLOSE purposes. // https://bugs.torproject.org/24642 - _, err = cmd.StdinPipe() + cmd.Env = append(os.Environ(), "TOR_PT_EXIT_ON_STDIN_CLOSE=1") + cmd.StdinCloser, err = cmd.StdinPipe() if err != nil { return } @@ -320,7 +333,7 @@ func runMeekClient(helperAddr string, meekClientCommandLine []string) (cmd *exec // may have failed to start. If a process did not start, its corresponding // return value will be nil. The caller is responsible for terminating whatever // processes were started, whether or not err is nil. -func startProcesses(sigChan <-chan os.Signal, meekClientCommandLine []string) (firefoxCmd *exec.Cmd, meekClientCmd *exec.Cmd, err error) { +func startProcesses(sigChan <-chan os.Signal, meekClientCommandLine []string) (firefoxCmd *exec.Cmd, meekClientCmd *ptCmd, err error) { // Start firefox. var stdout io.Reader firefoxCmd, stdout, err = runFirefox() @@ -414,7 +427,6 @@ func main() { // we are instructed to stop. sig := <-sigChan log.Printf("sig %s", sig) - logSignal(meekClientCmd.Process, sig) } else { // Otherwise don't wait, go ahead and terminate whatever // processes were started. @@ -425,6 +437,9 @@ func main() { logKill(firefoxCmd.Process) } if meekClientCmd != nil { - logKill(firefoxCmd.Process) + err := terminatePTCmd(meekClientCmd) + if err != nil { + log.Printf("error terminating meek-client: %v", err) + } } } diff --git a/meek-client-torbrowser/terminate_other.go b/meek-client-torbrowser/terminate_other.go new file mode 100644 index 0000000..d38e27b --- /dev/null +++ b/meek-client-torbrowser/terminate_other.go @@ -0,0 +1,33 @@ +// +build !windows + +// Process termination code for platforms that have SIGTERM (i.e., not Windows). + +package main + +import ( + "syscall" + "time" +) + +// Terminate a PT subprocess: first close its stdin and send it SIGTERM; then +// kill it if that doesn't work. +func terminatePTCmd(cmd *ptCmd) error { + err := cmd.StdinCloser.Close() + err2 := cmd.Process.Signal(syscall.SIGTERM) + if err == nil { + err = err2 + } + ch := make(chan error, 1) + go func() { + ch <- cmd.Wait() + }() + select { + case <-time.After(terminateTimeout): + err2 = cmd.Process.Kill() + case err2 = <-ch: + } + if err == nil { + err = err2 + } + return err +} diff --git a/meek-client-torbrowser/terminate_windows.go b/meek-client-torbrowser/terminate_windows.go new file mode 100644 index 0000000..c00c44f --- /dev/null +++ b/meek-client-torbrowser/terminate_windows.go @@ -0,0 +1,30 @@ +// +build windows + +// Process termination code for platforms that don't have SIGTERM (i.e., +// Windows). + +package main + +import ( + "time" +) + +// Terminate a PT subprocess: first close its stdin; then kill it if that +// doesn't work. +func terminatePTCmd(cmd *ptCmd) error { + err := cmd.StdinCloser.Close() + ch := make(chan error, 1) + go func() { + ch <- cmd.Wait() + }() + var err2 error + select { + case <-time.After(terminateTimeout): + err2 = cmd.Process.Kill() + case err2 = <-ch: + } + if err == nil { + err = err2 + } + return err +}

1 0

[meek/master] Be more careful about terminating Firefox.
by dcf＠torproject.org 30 Apr '19

30 Apr '19

commit 1b3a72f3c7208dd7c0471bb3e9077667091874c8 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Apr 18 23:15:49 2019 -0600 Be more careful about terminating Firefox. First send it a SIGTERM; then kill it if that doesn't work. On Windows, just kill it immediately without waiting. --- meek-client-torbrowser/meek-client-torbrowser.go | 14 ++++++++++++- meek-client-torbrowser/terminate_other.go | 25 ++++++++++++++++-------- meek-client-torbrowser/terminate_windows.go | 6 ++++++ 3 files changed, 36 insertions(+), 9 deletions(-) diff --git a/meek-client-torbrowser/meek-client-torbrowser.go b/meek-client-torbrowser/meek-client-torbrowser.go index 0f295ff..1274327 100644 --- a/meek-client-torbrowser/meek-client-torbrowser.go +++ b/meek-client-torbrowser/meek-client-torbrowser.go @@ -434,7 +434,19 @@ func main() { } if firefoxCmd != nil { - logKill(firefoxCmd.Process) + err := terminateCmd(firefoxCmd) + // We terminate Firefox with SIGTERM, so don't log an error + // if the exit status is "terminated by SIGTERM." + if err2, ok := err.(*exec.ExitError); ok { + if status, ok := err2.Sys().(syscall.WaitStatus); ok { + if status.Signaled() && status.Signal() == syscall.SIGTERM { + err = nil + } + } + } + if err != nil { + log.Printf("error terminating firefox: %v", err) + } } if meekClientCmd != nil { err := terminatePTCmd(meekClientCmd) diff --git a/meek-client-torbrowser/terminate_other.go b/meek-client-torbrowser/terminate_other.go index d38e27b..19bf2b8 100644 --- a/meek-client-torbrowser/terminate_other.go +++ b/meek-client-torbrowser/terminate_other.go @@ -5,22 +5,20 @@ package main import ( + "os/exec" "syscall" "time" ) -// Terminate a PT subprocess: first close its stdin and send it SIGTERM; then -// kill it if that doesn't work. -func terminatePTCmd(cmd *ptCmd) error { - err := cmd.StdinCloser.Close() - err2 := cmd.Process.Signal(syscall.SIGTERM) - if err == nil { - err = err2 - } +// Terminate a subprocess: first send it SIGTERM; then kill it if that doesn't +// work. +func terminateCmd(cmd *exec.Cmd) error { + err := cmd.Process.Signal(syscall.SIGTERM) ch := make(chan error, 1) go func() { ch <- cmd.Wait() }() + var err2 error select { case <-time.After(terminateTimeout): err2 = cmd.Process.Kill() @@ -31,3 +29,14 @@ func terminatePTCmd(cmd *ptCmd) error { } return err } + +// Terminate a PT subprocess: first close its stdin and send it SIGTERM; then +// kill it if that doesn't work. +func terminatePTCmd(cmd *ptCmd) error { + err := cmd.StdinCloser.Close() + err2 := terminateCmd(cmd.Cmd) + if err == nil { + err = err2 + } + return err +} diff --git a/meek-client-torbrowser/terminate_windows.go b/meek-client-torbrowser/terminate_windows.go index c00c44f..0bbdcab 100644 --- a/meek-client-torbrowser/terminate_windows.go +++ b/meek-client-torbrowser/terminate_windows.go @@ -6,9 +6,15 @@ package main import ( + "os/exec" "time" ) +// Terminate a subprocess: on Windows all we can do is kill it. +func terminateCmd(cmd *exec.Cmd) error { + return cmd.Process.Kill() +} + // Terminate a PT subprocess: first close its stdin; then kill it if that // doesn't work. func terminatePTCmd(cmd *ptCmd) error {

1 0