December 2018 - tor-commits - lists.torproject.org

[translation/tbmanual-contentspot_completed] Update translations for tbmanual-contentspot_completed
by translation＠torproject.org 01 Dec '18

01 Dec '18

commit ef9c9d5a01d75d20b50fab855048ad7ea4a44d18 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Dec 1 18:17:10 2018 +0000 Update translations for tbmanual-contentspot_completed --- contents+ka.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/contents+ka.po b/contents+ka.po index c70fa06af..0303257b6 100644 --- a/contents+ka.po +++ b/contents+ka.po @@ -480,7 +480,7 @@ msgid "" "Because bridge addresses are not public, you will need to request them " "yourself. You have two options:" msgstr "" -"ვინაიდან, გადამცემი ხიდები არაა საჯაროდ ხელმისაწვდომი, დაგჭირდებათ მისი " +"ვინაიდან, გადამცემი ხიდები არაა საჯაროდ ხელმისაწვდომი, დაგჭირდებათ მათი " "მოთხოვნა. გაქვთ ორი არჩევანი:" #: https//tb-manual.torproject.org/en-US/bridges/ @@ -889,8 +889,8 @@ msgstr "" "თქვენს შესვლას. დღესდღეობით, საიტების უმეტესობა იყენებს სხვა საიტების " "მომსახურებებს, მათ შორის სოციალური ქსელების „მოწონების“ ღილაკებს, " "სტატისტიკის აღმრიცხველებსა და დარეკლამების საშუალებებს, რომელთაგან თითოეულს " -"შეუძლია სხვადასხვა საიტზე თქვენი მოქმედებების დაკავშირება და ერთიანად " -"აღრიცხვა." +"შეუძლია სხვადასხვა საიტზე თქვენს მოქმედებებს შორის კავშირის დადგენა და " +"ერთიანად აღრიცხვა." #: https//tb-manual.torproject.org/en-US/managing-identities/ #: (content/managing-identities/contents+en-US.lrtopic.body) @@ -2353,15 +2353,15 @@ msgstr "გამოიწერეთ ჩვენი სიახლეებ msgid "Get monthly updates and opportunities from the Tor Project" msgstr "" "გაეცანით ყოველთვიურად Tor-პროექტთან დაკავშირებულ ახალ ამბებსა და ახალ " -"შესაძლებლობებს." +"შესაძლებლობებს" #: templates/footer.html:32 msgid "" "Trademark, copyright notices, and rules for use by third parties can be " "found in our " msgstr "" -"სავაჭრო ნიშნები, საავტორო უფლებების დაცვის განაცხადები და მესამე მხარის მიერ" -" გამოსაყენებელი წესები, შეგიძლიათ იხილოთ " +"სავაჭრო ნიშნების, საავტორო უფლებების დაცვის განაცხადებისა და მესამე მხარის " +"მიერ გამოსაყენებელი წესების თაობაზე, შეგიძლიათ იხილოთ ჩვენი" #: templates/layout.html:7 msgid "Tor Project | Tor Browser Manual"

1 0

[translation/tbmanual-contentspot] Update translations for tbmanual-contentspot
by translation＠torproject.org 01 Dec '18

01 Dec '18

commit 1c1e4ed5bb189d03bb54a626f5907d1b547b1b58 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Dec 1 18:17:05 2018 +0000 Update translations for tbmanual-contentspot --- contents+ka.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/contents+ka.po b/contents+ka.po index c70fa06af..0303257b6 100644 --- a/contents+ka.po +++ b/contents+ka.po @@ -480,7 +480,7 @@ msgid "" "Because bridge addresses are not public, you will need to request them " "yourself. You have two options:" msgstr "" -"ვინაიდან, გადამცემი ხიდები არაა საჯაროდ ხელმისაწვდომი, დაგჭირდებათ მისი " +"ვინაიდან, გადამცემი ხიდები არაა საჯაროდ ხელმისაწვდომი, დაგჭირდებათ მათი " "მოთხოვნა. გაქვთ ორი არჩევანი:" #: https//tb-manual.torproject.org/en-US/bridges/ @@ -889,8 +889,8 @@ msgstr "" "თქვენს შესვლას. დღესდღეობით, საიტების უმეტესობა იყენებს სხვა საიტების " "მომსახურებებს, მათ შორის სოციალური ქსელების „მოწონების“ ღილაკებს, " "სტატისტიკის აღმრიცხველებსა და დარეკლამების საშუალებებს, რომელთაგან თითოეულს " -"შეუძლია სხვადასხვა საიტზე თქვენი მოქმედებების დაკავშირება და ერთიანად " -"აღრიცხვა." +"შეუძლია სხვადასხვა საიტზე თქვენს მოქმედებებს შორის კავშირის დადგენა და " +"ერთიანად აღრიცხვა." #: https//tb-manual.torproject.org/en-US/managing-identities/ #: (content/managing-identities/contents+en-US.lrtopic.body) @@ -2353,15 +2353,15 @@ msgstr "გამოიწერეთ ჩვენი სიახლეებ msgid "Get monthly updates and opportunities from the Tor Project" msgstr "" "გაეცანით ყოველთვიურად Tor-პროექტთან დაკავშირებულ ახალ ამბებსა და ახალ " -"შესაძლებლობებს." +"შესაძლებლობებს" #: templates/footer.html:32 msgid "" "Trademark, copyright notices, and rules for use by third parties can be " "found in our " msgstr "" -"სავაჭრო ნიშნები, საავტორო უფლებების დაცვის განაცხადები და მესამე მხარის მიერ" -" გამოსაყენებელი წესები, შეგიძლიათ იხილოთ " +"სავაჭრო ნიშნების, საავტორო უფლებების დაცვის განაცხადებისა და მესამე მხარის " +"მიერ გამოსაყენებელი წესების თაობაზე, შეგიძლიათ იხილოთ ჩვენი" #: templates/layout.html:7 msgid "Tor Project | Tor Browser Manual"

1 0

[translation/donatepages-messagespot] Update translations for donatepages-messagespot
by translation＠torproject.org 01 Dec '18

01 Dec '18

commit 37c38cfba97a50eafe1cde0da90b2ea03851e2ca Author: Translation commit bot <translation(a)torproject.org> Date: Sat Dec 1 18:15:21 2018 +0000 Update translations for donatepages-messagespot --- locale/pl/LC_MESSAGES/messages.po | 63 ++++++++++++++++++++++++++++++++------- 1 file changed, 53 insertions(+), 10 deletions(-) diff --git a/locale/pl/LC_MESSAGES/messages.po b/locale/pl/LC_MESSAGES/messages.po index c3225e5d5..a7b45ded5 100644 --- a/locale/pl/LC_MESSAGES/messages.po +++ b/locale/pl/LC_MESSAGES/messages.po @@ -723,14 +723,21 @@ msgid "" "OS X</a> and <a class=\"hyperlinks links\" target=\"_blank\" " "href=\"https://www.torproject.org/projects/torbrowser.html.en#linux\">Linux</a>." msgstr "" +"Oferujemy instrukcję jak pobrać dla <a class=\"hyperlinks links\" " +"target=\"_blank\" " +"href=\"https://www.torproject.org/projects/torbrowser.html.en#windows\">Windows</a>," +" <a class=\"hyperlinks links\" target=\"_blank\" " +"href=\"https://www.torproject.org/projects/torbrowser.html.en#macosx\">Max " +"OS X</a> i <a class=\"hyperlinks links\" target=\"_blank\" " +"href=\"https://www.torproject.org/projects/torbrowser.html.en#linux\">Linux</a>." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:123 msgid "What kinds of people support Tor?" -msgstr "" +msgstr "Jakie typy ludzi wspierają Tor?" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:127 msgid "All kinds of people." -msgstr "" +msgstr "Wiele typów ludzi." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:129 msgid "" @@ -800,7 +807,7 @@ msgstr "" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:166 msgid "Does the Tor software work?" -msgstr "" +msgstr "Czy oprogramowanie Tor działa?" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:170 msgid "" @@ -834,12 +841,16 @@ msgid "" "Downloading Tor Browser or using the Tor network is legal in nearly every " "country." msgstr "" +"Pobranie przeglądarki Tor lub używanie sieci Tor jest legalne w prawie " +"każdym kraju." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:186 msgid "" "A few web sites occasionally block Tor, but that doesn't mean you're doing " "anything wrong." msgstr "" +"Kilka stron sporadycznie blokuje Tor, ale to nie oznacza że robisz coś " +"złego." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:188 msgid "" @@ -847,12 +858,17 @@ msgid "" "using Tor in the past, or that they misunderstand what Tor is and how it " "works (we’re working to change this)." msgstr "" +"Zwykle oznacza to że ta strona miała problemy z wizytorami używającymi Tor w" +" przeszłości lub to że nie rozumieją czym jest Tor ani jak działa (pracujemy" +" nad zmienieniem tego)." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:190 msgid "" "But it is not illegal to use Tor, and you shouldn't get in trouble for doing" " it." msgstr "" +"Ale używanie Tor nie jest nielegalne i nie powinieneś wpaść w kłopoty za " +"używanie go." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:192 msgid "" @@ -860,12 +876,17 @@ msgid "" "class=\"hyperlinks links\" target=\"_blank\" " "href=\"https://www.eff.org/torchallenge/faq.html\">EFF site</a>." msgstr "" +"Więcej informacji o statusie prawnym Tor'a na <a class=\"hyperlinks links\" " +"target=\"_blank\" href=\"https://www.eff.org/torchallenge/faq.html\">stronie" +" EFF</a>." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:198 msgid "" "Where can I find out more about the Tor Project, especially financial " "information?" msgstr "" +"Gdzie mogę znaleźć więcej informacji o Projekcie Tor, zwłaszcza finansowe " +"informacje?" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:202 msgid "" @@ -876,7 +897,7 @@ msgstr "" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:208 msgid "Where does the Tor Project's money come from?" -msgstr "" +msgstr "Skąd pochodzą pieniądze Projektu Tor?" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:212 msgid "" @@ -891,6 +912,9 @@ msgid "" "href=\"https://www.torproject.org/about/sponsors.html.en\">https://www.torproject.org/about/sponsors</a>" " for more.)" msgstr "" +"(Zobacz <a class=\"hyperlinks links single-link\" target=\"_blank\" " +"href=\"https://www.torproject.org/about/sponsors.html.en\">https://www.torproject.org/about/sponsors</a>" +" dla większej ilości informacji.)" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:216 msgid "" @@ -968,10 +992,11 @@ msgstr "" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:266 msgid "If I am not in the United States, can I still donate?" msgstr "" +"Jeżeli nie jestem w Stanach Zjednoczonych, czy mogę nadal przekazać dotację?" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:270 msgid "Yes, definitely." -msgstr "" +msgstr "Tak, definitywnie." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:272 msgid "" @@ -988,7 +1013,7 @@ msgstr "" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:282 #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:562 msgid "No, sorry." -msgstr "" +msgstr "Przepraszamy, lecz nie." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:284 msgid "" @@ -996,58 +1021,73 @@ msgid "" "used, we're required by the IRS to track and report separately on that " "money." msgstr "" +"Jeśli akceptujemy dotację od kogoś kto specyfikuje jak chce żeby była ona " +"użyta, IRS wymaga od nas żebyśmy śledzili i raportowali osobno te pieniądze." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:286 msgid "" "That would be a big administrative burden for a small organization, and we " "don't think it's a good idea for us." msgstr "" +"To by było ogromne administracyjne brzemię dla małej organizacji i nie jest " +"to dla nas dobry pomysł." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:288 msgid "" "However, we would be very happy to hear your ideas and feedback about our " "work." msgstr "" +"Ale, bylibyśmy bardzo chętni żeby usłyszeć wasze pomysły i feedback o naszej" +" pracy." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:290 msgid "" "If you're donating using a mechanism that allows for comments, feel free to " "send your thoughts that way." msgstr "" +"Jeśli wysyłasz dotację sposobem który pozwala na komentarz, nie krępuj się " +"wyrazić swoich myśli w ten sposób." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:296 msgid "Can I donate while using Tor Browser?" -msgstr "" +msgstr "Czy mogę przekazać dotację używając Przeglądarki Tor?" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:300 msgid "Yes! In our testing, donation works via Tor Browser." -msgstr "" +msgstr "Tak! W naszych testach, dotacje działają na Przeglądarce Tor." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:302 msgid "" "If you run into problems, please contact giving(at)torproject.org." msgstr "" +"Jeśli napotkach jakieś problemy, proszę skontaktuj się z giving(małpa)torproject.org." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:306 msgid "" "For users logging in to Paypal: some people had no problem donating via " "PayPal while using Tor Browser." msgstr "" +"Dla użytkowników logujących się do Paypal: wiele osób nie miało żadnych " +"problemów z dotacją przez PayPal używająć Przeglądarki Tor." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:308 msgid "" "In past years, some people couldn't complete the donation process, and one " "person had their PayPal account temporarily frozen." msgstr "" +"W poprzednich latach, kilka osób nie mogło zakończyć procesu dotacji oraz " +"jedna osoba miała swoje konto PayPal chwilowo zamrożone." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:310 msgid "If you run into any problems donating via PayPal, please let us know." msgstr "" +"Jeśli napotkasz jakieś problemy z dotacją przez PayPal, proszę powiadom nas." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:316 msgid "How can I donate via debit or credit card?" -msgstr "" +msgstr "Jak mogę przekazać dotację używając karty kredytowej lub debetowej?" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:320 msgid "" @@ -1055,10 +1095,13 @@ msgid "" "Discover or American Express) or via PayPal, please visit our <a " "href=\"https://donate.torproject.org\">donate page</a>." msgstr "" +"Aby przekazać dotację używając głównych kart kredytowych lub debetowych " +"(VISA, MasterCard, Discover lub American Express) lub przez PayPal, proszę " +"odwiedź naszą <a href=\"https://donate.torproject.org\">stronę dotacji</a>." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:326 msgid "Why do you ask for my address and similar information?" -msgstr "" +msgstr "Dlaczego pytasz o mój adres i podobne informacje?" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:330 msgid ""

1 0

[translation/donatepages-messagespot] Update translations for donatepages-messagespot
by translation＠torproject.org 01 Dec '18

01 Dec '18

commit 0f4e3945e9e2fab68abd958001e403df5c2ca692 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Dec 1 17:45:23 2018 +0000 Update translations for donatepages-messagespot --- locale/pl/LC_MESSAGES/messages.po | 54 ++++++++++++++++++++++----------------- 1 file changed, 31 insertions(+), 23 deletions(-) diff --git a/locale/pl/LC_MESSAGES/messages.po b/locale/pl/LC_MESSAGES/messages.po index 3923c0854..c3225e5d5 100644 --- a/locale/pl/LC_MESSAGES/messages.po +++ b/locale/pl/LC_MESSAGES/messages.po @@ -336,30 +336,32 @@ msgstr "bluza" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:306 msgid "Your generous support of Tor gets you this high-quality zip hoodie." msgstr "" +"Twoje hojne wsparcie projektu Tor zdobywa Ci tą wysokiej jakości zapinaną " +"bluzę z kapturem." #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:316 msgid "how do you want to DONATE?" -msgstr "" +msgstr "Jak chcesz przekazać DOTACJĘ?" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:322 msgid "Credit Card" -msgstr "" +msgstr "Karta Kredytowa" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:338 msgid "Your Info" -msgstr "" +msgstr "Twoje informacje" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:342 msgid "* required fields" -msgstr "" +msgstr "* pola wymagane" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:347 msgid "First Name" -msgstr "" +msgstr "Imię" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:351 msgid "Last Name" -msgstr "" +msgstr "Nazwisko" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:357 msgid "Street Address" @@ -379,11 +381,11 @@ msgstr "Stan" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:380 msgid "Zip" -msgstr "" +msgstr "Kod pocztowy" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:386 msgid "Enter email" -msgstr "" +msgstr "Wpisz email" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:390 msgid "We‘ll email you your receipt" @@ -445,23 +447,23 @@ msgstr "" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:488 msgid "Strength in Numbers T-Shirt" -msgstr "" +msgstr "Koszulka \"Siła w liczbach\"" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:492 msgid "Choose your size." -msgstr "" +msgstr "Wybierz swój rozmiar" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:496 msgid "Sweatshirt" -msgstr "" +msgstr "Bluza" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:500 msgid "A required field is missing from the form." -msgstr "" +msgstr "Pole wymagane jest niewypełnione w formularzu." #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:502 msgid "Please reload the page and try again." -msgstr "" +msgstr "Proszę odświeżyć stronę i spróbować ponownie." #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:506 msgid "There was a problem submitting your request to the server: " @@ -483,7 +485,7 @@ msgstr "Te pole jest wymagane" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:525 msgid "Invalid email address." -msgstr "" +msgstr "Nieprawidłowy adres email" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:538 msgid "One moment while we shovel coal into our servers." @@ -501,7 +503,7 @@ msgstr "" #: tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:34 msgid "Tor Thanks You" -msgstr "" +msgstr "Tor Ci dziękuje" #: tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:44 msgid "Thank you!" @@ -587,11 +589,11 @@ msgstr "" #: tmp/cache_locale/2d/2d5f07aeb16acd7bb0a8dd355b13f59678a1f0ba6ea2b3d9dec8d2b5dcfbfde5.php:39 msgid "Sign Up" -msgstr "" +msgstr "Zarejestruj się" #: tmp/cache_locale/2d/2d5f07aeb16acd7bb0a8dd355b13f59678a1f0ba6ea2b3d9dec8d2b5dcfbfde5.php:47 msgid "Donate FAQs" -msgstr "" +msgstr "FAQs dotacji" #: tmp/cache_locale/2d/2d5f07aeb16acd7bb0a8dd355b13f59678a1f0ba6ea2b3d9dec8d2b5dcfbfde5.php:51 msgid "Privacy Policy" @@ -622,7 +624,7 @@ msgstr "" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:68 msgid "What is the Tor Project and what does it do?" -msgstr "" +msgstr "Czym jest Projekt Tor i co on robi?" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:72 msgid "" @@ -647,11 +649,11 @@ msgstr "" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:78 msgid "It was founded in 2006." -msgstr "" +msgstr "Założony w 2006." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:84 msgid "Who works for the Tor Project, and what do they do?" -msgstr "" +msgstr "Kto pracuje dla Projektu Tor, i co oni robią?" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:88 msgid "" @@ -676,13 +678,16 @@ msgstr "" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:97 msgid "Who uses Tor?" -msgstr "" +msgstr "Kto używa Tor?" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:101 msgid "" "The vast majority of Tor users are ordinary people who want control of their" " privacy online or people whose internet use is censored." msgstr "" +"Dużą większością użytkowników Tor są zwyczajni ludzie którzy chcą mieć " +"kontrolę nad swoją prywatnością w sieci lub Ci, których internet jest " +"ocenzurowany." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:103 msgid "" @@ -692,11 +697,11 @@ msgstr "" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:109 msgid "Can anyone use Tor?" -msgstr "" +msgstr "Czy każdy może używać Tor?" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:113 msgid "Yes! Tor is free, and anyone can use it." -msgstr "" +msgstr "Tak! Tor jest darmowy i każdy może go używać." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:115 msgid "" @@ -704,6 +709,9 @@ msgid "" "href=\"https://www.torproject.org/projects/torbrowser.html.en\">download Tor Browser</a>." msgstr "" +"Żeby zacząć musisz <a class=\"hyperlinks\" target=\"_blank\" " +"href=\"https://www.torproject.org/projects/torbrowser.html.en\"> pobrać przeglądarkę Tor</a>." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:117 msgid ""

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/527'
by nickm＠torproject.org 01 Dec '18

01 Dec '18

commit d4d4a4b2dd95ce0cb8db6fc0074f0ac66d659469 Merge: c63d951e7 d02012413 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Dec 1 11:30:53 2018 -0500 Merge remote-tracking branch 'tor-github/pr/527' changes/bug28518 | 4 ++++ src/app/config/config.c | 21 +++++++++++++++++++++ 2 files changed, 25 insertions(+)

1 0

[tor/master] Add changes file for #28518.
by nickm＠torproject.org 01 Dec '18

01 Dec '18

commit d020124138cc0d16e685bfd35dd388a4db7f68af Author: Alexander Færøy <ahf(a)torproject.org> Date: Mon Nov 19 16:33:06 2018 +0100 Add changes file for #28518. See: https://bugs.torproject.org/28518 --- changes/bug28518 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/bug28518 b/changes/bug28518 new file mode 100644 index 000000000..d7ebab29b --- /dev/null +++ b/changes/bug28518 @@ -0,0 +1,4 @@ + o Minor features (FreeBSD): + - Warn relay operators if the "net.inet.ip.random_id" sysctl (IP ID + randomization) is disabled on their relay if it is running on FreeBSD + based operating systems. Closes ticket 28518.

1 0

[tor/master] Complain if net.inet.ip.random_id is not set on FreeBSD-based servers
by nickm＠torproject.org 01 Dec '18

01 Dec '18

commit 71651ea4aa507ee50865bd9584873e0c9a422c14 Author: Fabian Keil <fk(a)fabiankeil.de> Date: Tue Apr 7 16:36:05 2015 +0200 Complain if net.inet.ip.random_id is not set on FreeBSD-based servers Apparently a couple of operators haven't gotten the memos [0] yet and it looks like FreeBSD's default value will not change any time soon [1]. [0]: https://lists.torproject.org/pipermail/tor-relays/2014-March/004199.html https://lists.torproject.org/pipermail/tor-relays/2014-November/005687.html https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=195828 [1]: https://lists.freebsd.org/pipermail/freebsd-net/2015-April/041942.html --- src/app/config/config.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/app/config/config.c b/src/app/config/config.c index 45a23d67d..56fca1549 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -157,6 +157,10 @@ #include "core/or/connection_st.h" #include "core/or/port_cfg_st.h" +#ifdef __FreeBSD__ +#include <sys/sysctl.h> +#endif + #ifdef HAVE_SYSTEMD # if defined(__COVERITY__) && !defined(__INCLUDE_LEVEL__) /* Systemd's use of gcc's __INCLUDE_LEVEL__ extension macro appears to confuse @@ -3383,6 +3387,23 @@ options_validate(or_options_t *old_options, or_options_t *options, if (ContactInfo && !string_is_utf8(ContactInfo, strlen(ContactInfo))) REJECT("ContactInfo config option must be UTF-8."); +#ifdef __FreeBSD__ + if (server_mode(options)) { + int random_id_state; + size_t state_size = sizeof(random_id_state); + + if (sysctlbyname("net.inet.ip.random_id", &random_id_state, + &state_size, NULL, 0)) { + log_warn(LD_CONFIG, + "Failed to figure out if IP ids are randomized."); + } else if (random_id_state == 0) { + log_warn(LD_CONFIG, "Looks like IP ids are not randomized. " + "Please consider setting the net.inet.ip.random_id sysctl, " + "so your relay makes it harder to figure out how busy it is."); + } + } +#endif + /* Special case on first boot if no Log options are given. */ if (!options->Logs && !options->RunAsDaemon && !from_setconf) { if (quiet_level == 0)

1 0

[tor/master] Move net.inet.ip.random_id code to lib/net/
by nickm＠torproject.org 01 Dec '18

01 Dec '18

commit 701eaef980de4f7dbb5c31c4fee9b7e1e266d7a1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Dec 1 11:36:03 2018 -0500 Move net.inet.ip.random_id code to lib/net/ --- src/app/config/config.c | 21 +-------------------- src/lib/net/socket.c | 29 +++++++++++++++++++++++++++++ src/lib/net/socket.h | 1 + 3 files changed, 31 insertions(+), 20 deletions(-) diff --git a/src/app/config/config.c b/src/app/config/config.c index d907b0713..50f3793d6 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -157,10 +157,6 @@ #include "core/or/connection_st.h" #include "core/or/port_cfg_st.h" -#ifdef __FreeBSD__ -#include <sys/sysctl.h> -#endif - #ifdef HAVE_SYSTEMD # if defined(__COVERITY__) && !defined(__INCLUDE_LEVEL__) /* Systemd's use of gcc's __INCLUDE_LEVEL__ extension macro appears to confuse @@ -3386,22 +3382,7 @@ options_validate(or_options_t *old_options, or_options_t *options, if (ContactInfo && !string_is_utf8(ContactInfo, strlen(ContactInfo))) REJECT("ContactInfo config option must be UTF-8."); -#ifdef __FreeBSD__ - if (server_mode(options)) { - int random_id_state; - size_t state_size = sizeof(random_id_state); - - if (sysctlbyname("net.inet.ip.random_id", &random_id_state, - &state_size, NULL, 0)) { - log_warn(LD_CONFIG, - "Failed to figure out if IP ids are randomized."); - } else if (random_id_state == 0) { - log_warn(LD_CONFIG, "Looks like IP ids are not randomized. " - "Please consider setting the net.inet.ip.random_id sysctl, " - "so your relay makes it harder to figure out how busy it is."); - } - } -#endif + check_network_configuration(server_mode(options)); /* Special case on first boot if no Log options are given. */ if (!options->Logs && !options->RunAsDaemon && !from_setconf) { diff --git a/src/lib/net/socket.c b/src/lib/net/socket.c index cd7c9685c..8940e0059 100644 --- a/src/lib/net/socket.c +++ b/src/lib/net/socket.c @@ -31,6 +31,9 @@ #endif #include <stddef.h> #include <string.h> +#ifdef __FreeBSD__ +#include <sys/sysctl.h> +#endif /** Called before we make any calls to network-related functions. * (Some operating systems require their network libraries to be @@ -60,6 +63,32 @@ network_init(void) return 0; } +/** + * Warn the user if any system network parameters should be changed. + */ +void +check_network_configuration(bool server_mode) +{ +#ifdef __FreeBSD__ + if (server_mode) { + int random_id_state; + size_t state_size = sizeof(random_id_state); + + if (sysctlbyname("net.inet.ip.random_id", &random_id_state, + &state_size, NULL, 0)) { + log_warn(LD_CONFIG, + "Failed to figure out if IP ids are randomized."); + } else if (random_id_state == 0) { + log_warn(LD_CONFIG, "Looks like IP ids are not randomized. " + "Please consider setting the net.inet.ip.random_id sysctl, " + "so your relay makes it harder to figure out how busy it is."); + } + } +#else + (void) server_mode; +#endif +} + /* When set_max_file_sockets() is called, update this with the max file * descriptor value so we can use it to check the limit when opening a new * socket. Default value is what Debian sets as the default hard limit. */ diff --git a/src/lib/net/socket.h b/src/lib/net/socket.h index 2b87441fc..822b9975e 100644 --- a/src/lib/net/socket.h +++ b/src/lib/net/socket.h @@ -54,6 +54,7 @@ int tor_addr_from_getsockname(struct tor_addr_t *addr_out, tor_socket_t sock); int set_socket_nonblocking(tor_socket_t socket); int tor_socketpair(int family, int type, int protocol, tor_socket_t fd[2]); int network_init(void); +void check_network_configuration(bool server_mode); int get_max_sockets(void); void set_max_sockets(int);

1 0

[tor/master] Add pre-push git hook to prevent fixup and squash commits from ending up in master
by nickm＠torproject.org 01 Dec '18

01 Dec '18

commit ffee0a6384e751486bb4ca2752b6a00527b923ca Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Tue Nov 20 15:40:52 2018 +0200 Add pre-push git hook to prevent fixup and squash commits from ending up in master --- changes/ticket27993 | 3 +++ scripts/maint/pre-push | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) diff --git a/changes/ticket27993 b/changes/ticket27993 new file mode 100644 index 000000000..78ee7c205 --- /dev/null +++ b/changes/ticket27993 @@ -0,0 +1,3 @@ + o Minor features (developer tooling): + - Provide git hook script to prevent "fixup!" and "squash!" commits from + ending up in master. Closes ticket 27993. diff --git a/scripts/maint/pre-push b/scripts/maint/pre-push new file mode 100755 index 000000000..2cf1837b8 --- /dev/null +++ b/scripts/maint/pre-push @@ -0,0 +1,56 @@ +#!/bin/sh + +# git pre-push hook script to prevent "fixup!" and "squash!" commit +# from ending up in master, or in any branch if CUR_BRANCH check is removed. +# It is meant to be placed in .git/hooks directory. +# +# The following sample script was used as starting point: +# https://github.com/git/git/blob/master/templates/hooks--pre-push.sample + +z40=0000000000000000000000000000000000000000 + +CUR_BRANCH=$(git rev-parse --abbrev-ref HEAD) +if [ "$CUR_BRANCH" != "master" ] +then + exit 0 +fi + +echo "Running pre-push hook" + +# shellcheck disable=SC2034 +while read -r local_ref local_sha remote_ref remote_sha +do + if [ "$local_sha" = $z40 ] + then + # Handle delete + : + else + if [ "$remote_sha" = $z40 ] + then + # New branch, examine all commits + range="$local_sha" + else + # Update to existing branch, examine new commits + range="$remote_sha..$local_sha" + fi + + # Check for fixup! commit + commit=$(git rev-list -n 1 --grep '^fixup!' "$range") + if [ -n "$commit" ] + then + echo >&2 "Found fixup! commit in $local_ref, not pushing" + exit 1 + fi + + # Check for squash! commit + commit=$(git rev-list -n 1 --grep '^squash!' "$range") + if [ -n "$commit" ] + then + echo >&2 "Found squash! commit in $local_ref, not pushing" + exit 1 + fi + fi +done + +exit 0 +

1 0

[tor/master] Also disallow fixup/squash commits in maint-* and release-*
by nickm＠torproject.org 01 Dec '18

01 Dec '18

commit b2053cfc44f4876a52f8d71f2308077c6e39498d Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Tue Nov 20 16:37:30 2018 +0200 Also disallow fixup/squash commits in maint-* and release-* --- scripts/maint/pre-push | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/maint/pre-push b/scripts/maint/pre-push index 2cf1837b8..26c48c4e2 100755 --- a/scripts/maint/pre-push +++ b/scripts/maint/pre-push @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # git pre-push hook script to prevent "fixup!" and "squash!" commit # from ending up in master, or in any branch if CUR_BRANCH check is removed. @@ -10,7 +10,8 @@ z40=0000000000000000000000000000000000000000 CUR_BRANCH=$(git rev-parse --abbrev-ref HEAD) -if [ "$CUR_BRANCH" != "master" ] +if [ "$CUR_BRANCH" != "master" ] && [[ $CUR_BRANCH != release-* ]] && + [[ $CUR_BRANCH != maint-* ]] then exit 0 fi

1 0