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

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

12 Nov '18

commit 4be764ff1cf0309312337424c887991c79ff0ccb Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 12 10:45:20 2018 +0000 Update translations for donatepages-messagespot --- locale/it/LC_MESSAGES/messages.po | 65 ++++++++++++++++++++++++++++++--------- 1 file changed, 51 insertions(+), 14 deletions(-) diff --git a/locale/it/LC_MESSAGES/messages.po b/locale/it/LC_MESSAGES/messages.po index 4478fcc02..24c1b84eb 100644 --- a/locale/it/LC_MESSAGES/messages.po +++ b/locale/it/LC_MESSAGES/messages.po @@ -494,10 +494,12 @@ msgid "" "Tor at the Heart of Internet, Powering Digital Resistance or Open " "Observvatory of Network Interference (OONI) T-Shirt" msgstr "" +"Maglietta \"Tor at the Heart of Internet\", \"Powering Digital Resistance\" " +"o \"Open Observvatory of Network Interference\" (OONI)" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:488 msgid "Strength in Numbers T-Shirt" -msgstr "" +msgstr "Maglietta \"Strength in Numbers\"" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:492 msgid "Choose your size." @@ -509,11 +511,11 @@ msgstr "Felpa" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:500 msgid "A required field is missing from the form." -msgstr "" +msgstr "Nel modulo manca un campo obbligatorio." #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:502 msgid "Please reload the page and try again." -msgstr "" +msgstr "Per favore ricarica la pagina e riprova." #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:506 msgid "There was a problem submitting your request to the server:<br>" @@ -546,10 +548,12 @@ msgid "" "Stand up for the universal human rights to privacy and freedom and help keep" " Tor independent, robust, and secure." msgstr "" +"Difendi i diritti umani universali sulla privacy e sulla libertà e aiuta a " +"mantenere Tor indipendente, robusto e sicuro." #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:627 msgid "Mozilla will match your gift and double your impact." -msgstr "" +msgstr "Mozilla corrisponderà il tuo regalo e raddoppierà il tuo impatto." #: tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:34 msgid "Tor Thanks You" @@ -561,11 +565,11 @@ msgstr "Grazie!" #: tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:48 msgid "Thank you for supporting Tor's Strength in Numbers campaign." -msgstr "" +msgstr "Grazie per il sostegno alla lotta di Tor \"Strength in Numbers\"." #: tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:50 msgid "You should receive an email receipt shortly." -msgstr "" +msgstr "A breve dovrebbe arrivarti una ricevuta via email." #: tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:52 msgid "" @@ -574,18 +578,27 @@ msgid "" "privacy-enhancing browser for mobile devices and making it easier for third-" "party developers to integrate Tor into their applications." msgstr "" +"Con il tuo sostegno e i generosi fondi corrisposti da Mozilla, saremo in " +"grado di affrontare progetti ambiziosi, come lo sviluppo di un browser per " +"dispositivi mobili più sicuro, in grado di migliorare la privacy e di " +"facilitare a sviluppatori terzi l'integrazione di Tor nelle loro " +"applicazioni." #: tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:56 msgid "" "It's an incredible time to stand up for world-leading security and privacy " "software." msgstr "" +"È un momento incredibile per lottare per un software di sicurezza e privacy " +"di livello mondiale." #: tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:58 msgid "" "Tell family, friends, and colleagues that you're supporting privacy and " "security with Tor!" msgstr "" +"Dì alla famiglia, agli amici e ai colleghi che stai sostenendo la privacy e " +"la sicurezza con Tor!" #: tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:62 msgid "SHARE THE TOR PROJECT" @@ -604,10 +617,12 @@ msgid "" "We need people to run relays, write code, organize the community and spread " "the word about our good work." msgstr "" +"Abbiamo bisogno di persone che gestiscano relay, scrivano codice, " +"organizzino la comunità e diffondano parole sul nostro buon lavoro." #: tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:102 msgid "Learn how you can help." -msgstr "" +msgstr "Scopri come puoi aiutare." #: tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:110 msgid "I Want To Volunteer" @@ -636,19 +651,19 @@ msgstr "" #: tmp/cache_locale/2d/2d5f07aeb16acd7bb0a8dd355b13f59678a1f0ba6ea2b3d9dec8d2b5dcfbfde5.php:31 msgid "Subscribe to Our Newsletter" -msgstr "" +msgstr "Iscriviti alla nostra newsletter" #: tmp/cache_locale/2d/2d5f07aeb16acd7bb0a8dd355b13f59678a1f0ba6ea2b3d9dec8d2b5dcfbfde5.php:35 msgid "Get monthly updates and opportunities from the Tor Project." -msgstr "" +msgstr "Ricevi aggiornamenti mensili e altre opportunità dal Progetto Tor." #: tmp/cache_locale/2d/2d5f07aeb16acd7bb0a8dd355b13f59678a1f0ba6ea2b3d9dec8d2b5dcfbfde5.php:39 msgid "Sign Up" -msgstr "" +msgstr "Iscriviti" #: tmp/cache_locale/2d/2d5f07aeb16acd7bb0a8dd355b13f59678a1f0ba6ea2b3d9dec8d2b5dcfbfde5.php:47 msgid "Donate FAQs" -msgstr "" +msgstr "FAQ donatori" #: tmp/cache_locale/2d/2d5f07aeb16acd7bb0a8dd355b13f59678a1f0ba6ea2b3d9dec8d2b5dcfbfde5.php:51 msgid "Privacy Policy" @@ -817,11 +832,11 @@ msgstr "" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:123 msgid "What kinds of people support Tor?" -msgstr "" +msgstr "Che tipo di persone sostengono Tor?" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:127 msgid "All kinds of people." -msgstr "" +msgstr "Tutti i tipi di persone." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:129 msgid "" @@ -833,12 +848,21 @@ msgid "" "Federal Foreign Office of Germany, the U.S. Naval Research Laboratory, " "Omidyar Network, SRI International, and Radio Free Asia." msgstr "" +"Migliaia di individui hanno donato per sostenere il Progetto Tor e abbiamo " +"anche ricevuto finanziamenti da una vasta gamma di organizzazioni incluse " +"Google, la Ford Foundation, la Knight Foundation, Reddit, la U.S. National " +"Science Foundation, la Electronic Frontier Foundation, Human Rights Watch, " +"la Swedish International Development Cooperation Agency, la Federal Foreign " +"Office of Germany, la U.S. Naval Research Laboratory, Omidyar Network, SRI " +"International, Radio Free Asia." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:131 msgid "" "People also support Tor in non-financial ways, for example by running Tor " "relays to help carry traffic for other users." msgstr "" +"Altre persone sostengono Tor in forme non economiche, ad esempio gestendo " +"relay di Tor per aiutare a traspostare il traffico ad altri utenti." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:133 msgid "" @@ -846,10 +870,15 @@ msgid "" "anonymous, because the more people using Tor, the harder it is to identify " "any single individual." msgstr "" +"Inoltre, chiunque usi Tor aiuta a mantenere altri utenti sicuri e anonimi, " +"perchè più gente usa Tor, più difficile è identificare ogni singolo " +"individuo." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:139 msgid "How does the Tor software work to protect people's anonymity?" msgstr "" +"In che modo il software Tor funziona per proteggere l'anonimato delle " +"persone?" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:143 msgid "" @@ -857,17 +886,21 @@ msgid "" "which is a distributed network of relays run by volunteers all around the " "world." msgstr "" +"Tor ti protegge rimbalzando le tue comunicazioni attraverso la rete Tor, che" +" è una rete distribuita di relay gestiti da volontari in tutto il mondo." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:145 msgid "" "If someone is watching your internet connection, Tor prevents them from " "finding out what sites you are visiting." msgstr "" +"Se qualcuno sta spiando la tua connessione internet, Tor gli impedisce di " +"scoprire quali siti stai visitando." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:147 msgid "" "It also prevents sites you visit from finding out where you're located." -msgstr "" +msgstr "Impedisce inoltre ai siti che visiti di scoprire la tua posizione." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:149 msgid "" @@ -875,6 +908,10 @@ msgid "" "target=\"_blank\" " "href=\"https://www.torproject.org/about/overview.html.en\">overview page." msgstr "" +"Puoi approfondire il funzionamento di Tor nella nostra <a class=\"hyperlinks" +" links\" target=\"_blank\" " +"href=\"https://www.torproject.org/about/overview.html.en\">pagina di " +"riepilogo." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:156 msgid ""

1 0

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

12 Nov '18

commit 27de6c718578fdb5433d2069b784d48f13d343e7 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 12 10:15:20 2018 +0000 Update translations for donatepages-messagespot --- locale/it/LC_MESSAGES/messages.po | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/locale/it/LC_MESSAGES/messages.po b/locale/it/LC_MESSAGES/messages.po index 0f4a0107f..4478fcc02 100644 --- a/locale/it/LC_MESSAGES/messages.po +++ b/locale/it/LC_MESSAGES/messages.po @@ -3,14 +3,14 @@ # Matteo Sechi <inactive+tomateschie.transifex(a)transifex.com>, 2018 # Thomas Di Cristofaro <inactive+ThomasDiCristofaro(a)transifex.com>, 2018 # SebastianoPistore <SebastianoPistore.info(a)protonmail.ch>, 2018 -# Random_R, 2018 # mattia_b89 <mattia.b89(a)gmail.com>, 2018 # erinm, 2018 # Giuseppe Pignataro (Fastbyte01) <rogepix(a)gmail.com>, 2018 +# Random_R, 2018 # msgid "" msgstr "" -"Last-Translator: Giuseppe Pignataro (Fastbyte01) <rogepix(a)gmail.com>, 2018\n" +"Last-Translator: Random_R, 2018\n" "Language-Team: Italian (https://www.transifex.com/otf/teams/1519/it/)\n" "Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -242,7 +242,7 @@ msgstr "Tor: la Forza in Numeri" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:52 #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:75 msgid "Donate to the Tor Project and protect the privacy of millions." -msgstr "" +msgstr "Dona al Progetto Tor e proteggi la privacy di milioni di persone." #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:54 #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:77 @@ -277,15 +277,15 @@ msgstr "" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:123 msgid "Number of Donations" -msgstr "" +msgstr "Numero di donazioni" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:139 msgid "Total Donated" -msgstr "" +msgstr "Totale donato" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:155 msgid "Total Raised with Mozilla's Match" -msgstr "" +msgstr "Totale fondi raccolti corrisposti da Mozilla" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:163 #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:169 @@ -323,12 +323,13 @@ msgstr "Scegli il tuo regalo come ringraziamento." #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:215 msgid "No thanks, I don't want a gift." -msgstr "" +msgstr "No grazie, non voglio un regalo." #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:217 #, php-format msgid "I would prefer 100% of my donation to go to the Tor Project's work." msgstr "" +"Preferisco che il 100% della mia donazione vada al lavoro del Progetto Tor." #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:228 msgid "sticker Pack" @@ -349,6 +350,8 @@ msgstr "t-shirt" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:253 msgid "Get our limited edition Tor: Strength in Numbers shirt." msgstr "" +"Ricevi la nostra maglietta in edizione limitata \"Tor: Strength in " +"Numbers\"." #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:264 msgid "t-shirt pack" @@ -360,14 +363,17 @@ msgid "" "the Digital Resistance, Open Observatory of Network Interference (OONI), or " "Tor at the Heart of Internet Freedom t-shirts." msgstr "" +"La nostra maglietta \"Tor: Strength in Numbers\", più una tra \"Tor: " +"Powering the Digital Resistance\", \"Open Observatory of Network " +"Interference\" (OONI), o \"Tor at the Heart of Internet Freedom\"." #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:280 msgid "Tor at the Heart of Internet Freedom" -msgstr "" +msgstr "Tor at the Heart of Internet Freedom" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:284 msgid "Powering the Digital Resistance" -msgstr "" +msgstr "Powering the Digital Resistance" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:288 msgid "Open Observatory of Network Interference" @@ -380,6 +386,8 @@ msgstr "felpa" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:306 msgid "Your generous support of Tor gets you this high-quality zip hoodie." msgstr "" +"Il tuo generoso sostegno a Tor ti premia con una felpa con cappuccio di alta" +" qualità." #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:316 msgid "how do you want to <span class=\"green\">DONATE</span>?"

1 0

[translation/support-portal_completed] Update translations for support-portal_completed
by translation＠torproject.org 12 Nov '18

12 Nov '18

commit fe2bd215b45d8acb4e9cebe4f1e306dac4a2eb5b Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 12 09:49:47 2018 +0000 Update translations for support-portal_completed --- contents+ga.po | 4 ++++ contents+id.po | 3 +++ 2 files changed, 7 insertions(+) diff --git a/contents+ga.po b/contents+ga.po index 6eeed2d34..e00d3f788 100644 --- a/contents+ga.po +++ b/contents+ga.po @@ -1199,6 +1199,8 @@ msgid "" "If a SOCKS proxy is not required, or you’re not sure, please try connecting " "to the Tor network without a SOCKS proxy." msgstr "" +"Mura dteastaíonn seachfhreastalaí SOCKS uait, nó mura bhfuil tú cinnte, déan" +" iarracht ceangal a bhunú le líonra Tor gan seachfhreastalaí SOCKS." #: http//localhost/tbb/tbb-38/ #: (content/tbb/tbb-38/contents+en.lrquestion.description) @@ -1514,6 +1516,8 @@ msgid "" "If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" +"Má fheiceann tú línte den sórt seo i do logchomhad Tor, ciallaíonn sé gur " +"theip ort ceangal a bhunú le seachfhreastalaí SOCKS." #: http//localhost/tbb/tbb-35/ #: (content/tbb/tbb-35/contents+en.lrquestion.description) diff --git a/contents+id.po b/contents+id.po index 7c1207751..24ab2ed65 100644 --- a/contents+id.po +++ b/contents+id.po @@ -1185,6 +1185,8 @@ msgid "" "If a SOCKS proxy is not required, or you’re not sure, please try connecting " "to the Tor network without a SOCKS proxy." msgstr "" +"Jika proxy SOCKS tidak diperlukan, atau Anda tidak yakin bahwa proxy SOCKS " +"diperlukan, silakan coba tanpa proxy SOCKS" #: http//localhost/tbb/tbb-38/ #: (content/tbb/tbb-38/contents+en.lrquestion.description) @@ -1496,6 +1498,7 @@ msgid "" "If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" +"Jika Anda melihat baris seperti ini, Tor gagal tersambung ke SOCKS proxy." #: http//localhost/tbb/tbb-35/ #: (content/tbb/tbb-35/contents+en.lrquestion.description)

1 0

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 12 Nov '18

12 Nov '18

commit f93feeb8eca3a0a0b629febc4ffeaa629f189d0c Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 12 09:49:40 2018 +0000 Update translations for support-portal --- contents+el.po | 8 ++++++-- contents+fa.po | 10 +++++++++- contents+ga.po | 4 ++++ contents+id.po | 3 +++ contents+is.po | 10 +++++++++- contents+ko.po | 10 +++++++++- 6 files changed, 40 insertions(+), 5 deletions(-) diff --git a/contents+el.po b/contents+el.po index 2c498d298..30ea9c73e 100644 --- a/contents+el.po +++ b/contents+el.po @@ -2,8 +2,8 @@ # erinm, 2018 # ilias_ <teneatis(a)gmail.com>, 2018 # Sofia K., 2018 -# Emma Peel, 2018 # A Papac <ap909219(a)protonmail.com>, 2018 +# Emma Peel, 2018 # msgid "" msgstr "" @@ -11,7 +11,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-27 19:20+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: A Papac <ap909219(a)protonmail.com>, 2018\n" +"Last-Translator: Emma Peel, 2018\n" "Language-Team: Greek (https://www.transifex.com/otf/teams/1519/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1213,6 +1213,8 @@ msgid "" "If a SOCKS proxy is not required, or you’re not sure, please try connecting " "to the Tor network without a SOCKS proxy." msgstr "" +"Αν δεν απαιτείται ένας SOCKS proxy ή δεν είστε βέβαιος, δοκιμάστε να " +"συνδεθείτε στο δίκτυο Tor χωρίς SOCKS proxy." #: http//localhost/tbb/tbb-38/ #: (content/tbb/tbb-38/contents+en.lrquestion.description) @@ -1527,6 +1529,8 @@ msgid "" "If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" +"Αν δείτε γραμμές όπως αυτό στο αρχείο καταγραφής Tor, αυτό σημαίνει ότι δεν " +"μπορείτε να συνδεθείτε σε ένα SOCKS proxy." #: http//localhost/tbb/tbb-35/ #: (content/tbb/tbb-35/contents+en.lrquestion.description) diff --git a/contents+fa.po b/contents+fa.po index 93e6a5c37..20e0c4413 100644 --- a/contents+fa.po +++ b/contents+fa.po @@ -1,6 +1,7 @@ # Translators: # A.Mehraban <Mehr.Ban(a)chmail.ir>, 2018 # erinm, 2018 +# Emma Peel, 2018 # msgid "" msgstr "" @@ -8,7 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-27 19:20+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: erinm, 2018\n" +"Last-Translator: Emma Peel, 2018\n" "Language-Team: Persian (https://www.transifex.com/otf/teams/1519/fa/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1266,6 +1267,7 @@ msgstr "نصب-افزونه-مرورگر-تور" msgid "" "2017-10-29 09:23:40.800 [NOTICE] Opening Socks listener on 127.0.0.1:9150" msgstr "" +"2017-10-29 09:23:40.800 [NOTICE] Opening Socks listener on 127.0.0.1:9150" #: http//localhost/censorship/censorship-2/ #: (content/censorship/censorship-2/contents+en.lrquestion.description) @@ -1789,6 +1791,8 @@ msgid "" "2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " "toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" msgstr "" +"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " +"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" #: http//localhost/misc/misc-10/ #: (content/misc/misc-10/contents+en.lrquestion.seo_slug) @@ -2000,6 +2004,7 @@ msgstr "" msgid "" "11/1/2017 21:11:43 PM.500 [NOTICE] Opening Socks listener on 127.0.0.1:9150" msgstr "" +"11/1/2017 21:11:43 PM.500 [NOTICE] Opening Socks listener on 127.0.0.1:9150" #: http//localhost/onionservices/onionservices-2/ #: (content/onionservices/onionservices-2/contents+en.lrquestion.description) @@ -2995,6 +3000,8 @@ msgid "" "2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect to " "xx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" msgstr "" +"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect to " +"xx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" #: http//localhost/gettor/gettor-2/ #: (content/gettor/gettor-2/contents+en.lrquestion.description) @@ -3423,6 +3430,7 @@ msgstr "اگر torproject.org مسدود باشد، چگونه Tor را دانل msgid "" "19.11.2017 00:04:47.400 [NOTICE] Opening Socks listener on 127.0.0.1:9150" msgstr "" +"19.11.2017 00:04:47.400 [NOTICE] Opening Socks listener on 127.0.0.1:9150" #: http//localhost/tormobile/tormobile-4/ #: (content/tormobile/tormobile-4/contents+en.lrquestion.seo_slug) diff --git a/contents+ga.po b/contents+ga.po index 6eeed2d34..e00d3f788 100644 --- a/contents+ga.po +++ b/contents+ga.po @@ -1199,6 +1199,8 @@ msgid "" "If a SOCKS proxy is not required, or you’re not sure, please try connecting " "to the Tor network without a SOCKS proxy." msgstr "" +"Mura dteastaíonn seachfhreastalaí SOCKS uait, nó mura bhfuil tú cinnte, déan" +" iarracht ceangal a bhunú le líonra Tor gan seachfhreastalaí SOCKS." #: http//localhost/tbb/tbb-38/ #: (content/tbb/tbb-38/contents+en.lrquestion.description) @@ -1514,6 +1516,8 @@ msgid "" "If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" +"Má fheiceann tú línte den sórt seo i do logchomhad Tor, ciallaíonn sé gur " +"theip ort ceangal a bhunú le seachfhreastalaí SOCKS." #: http//localhost/tbb/tbb-35/ #: (content/tbb/tbb-35/contents+en.lrquestion.description) diff --git a/contents+id.po b/contents+id.po index 7c1207751..24ab2ed65 100644 --- a/contents+id.po +++ b/contents+id.po @@ -1185,6 +1185,8 @@ msgid "" "If a SOCKS proxy is not required, or you’re not sure, please try connecting " "to the Tor network without a SOCKS proxy." msgstr "" +"Jika proxy SOCKS tidak diperlukan, atau Anda tidak yakin bahwa proxy SOCKS " +"diperlukan, silakan coba tanpa proxy SOCKS" #: http//localhost/tbb/tbb-38/ #: (content/tbb/tbb-38/contents+en.lrquestion.description) @@ -1496,6 +1498,7 @@ msgid "" "If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" +"Jika Anda melihat baris seperti ini, Tor gagal tersambung ke SOCKS proxy." #: http//localhost/tbb/tbb-35/ #: (content/tbb/tbb-35/contents+en.lrquestion.description) diff --git a/contents+is.po b/contents+is.po index 57ea62716..b2255cc5b 100644 --- a/contents+is.po +++ b/contents+is.po @@ -1,6 +1,7 @@ # Translators: # erinm, 2018 # Sveinn í Felli <sv1(a)fellsnet.is>, 2018 +# Emma Peel, 2018 # msgid "" msgstr "" @@ -8,7 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-27 19:20+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: Sveinn í Felli <sv1(a)fellsnet.is>, 2018\n" +"Last-Translator: Emma Peel, 2018\n" "Language-Team: Icelandic (https://www.transifex.com/otf/teams/1519/is/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1256,6 +1257,7 @@ msgstr "install-add-on-extension-tor-browser" msgid "" "2017-10-29 09:23:40.800 [NOTICE] Opening Socks listener on 127.0.0.1:9150" msgstr "" +"2017-10-29 09:23:40.800 [NOTICE] Opening Socks listener on 127.0.0.1:9150" #: http//localhost/censorship/censorship-2/ #: (content/censorship/censorship-2/contents+en.lrquestion.description) @@ -1767,6 +1769,8 @@ msgid "" "2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " "toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" msgstr "" +"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " +"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" #: http//localhost/misc/misc-10/ #: (content/misc/misc-10/contents+en.lrquestion.seo_slug) @@ -1975,6 +1979,7 @@ msgstr "" msgid "" "11/1/2017 21:11:43 PM.500 [NOTICE] Opening Socks listener on 127.0.0.1:9150" msgstr "" +"11/1/2017 21:11:43 PM.500 [NOTICE] Opening Socks listener on 127.0.0.1:9150" #: http//localhost/onionservices/onionservices-2/ #: (content/onionservices/onionservices-2/contents+en.lrquestion.description) @@ -2955,6 +2960,8 @@ msgid "" "2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect to " "xx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" msgstr "" +"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect to " +"xx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" #: http//localhost/gettor/gettor-2/ #: (content/gettor/gettor-2/contents+en.lrquestion.description) @@ -3385,6 +3392,7 @@ msgstr "" msgid "" "19.11.2017 00:04:47.400 [NOTICE] Opening Socks listener on 127.0.0.1:9150" msgstr "" +"19.11.2017 00:04:47.400 [NOTICE] Opening Socks listener on 127.0.0.1:9150" #: http//localhost/tormobile/tormobile-4/ #: (content/tormobile/tormobile-4/contents+en.lrquestion.seo_slug) diff --git a/contents+ko.po b/contents+ko.po index 9f3bba233..5c9559bfa 100644 --- a/contents+ko.po +++ b/contents+ko.po @@ -1,6 +1,7 @@ # Translators: # erinm, 2018 # Philipp Sauter <qt123(a)pm.me>, 2018 +# Emma Peel, 2018 # msgid "" msgstr "" @@ -8,7 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-27 19:20+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: Philipp Sauter <qt123(a)pm.me>, 2018\n" +"Last-Translator: Emma Peel, 2018\n" "Language-Team: Korean (https://www.transifex.com/otf/teams/1519/ko/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1281,6 +1282,7 @@ msgstr "tor-브라우저에-확장-기능을-설치" msgid "" "2017-10-29 09:23:40.800 [NOTICE] Opening Socks listener on 127.0.0.1:9150" msgstr "" +"2017-10-29 09:23:40.800 [NOTICE] Opening Socks listener on 127.0.0.1:9150" #: http//localhost/censorship/censorship-2/ #: (content/censorship/censorship-2/contents+en.lrquestion.description) @@ -1790,6 +1792,8 @@ msgid "" "2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " "toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" msgstr "" +"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " +"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" #: http//localhost/misc/misc-10/ #: (content/misc/misc-10/contents+en.lrquestion.seo_slug) @@ -1998,6 +2002,7 @@ msgstr "" msgid "" "11/1/2017 21:11:43 PM.500 [NOTICE] Opening Socks listener on 127.0.0.1:9150" msgstr "" +"11/1/2017 21:11:43 PM.500 [NOTICE] Opening Socks listener on 127.0.0.1:9150" #: http//localhost/onionservices/onionservices-2/ #: (content/onionservices/onionservices-2/contents+en.lrquestion.description) @@ -2969,6 +2974,8 @@ msgid "" "2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect to " "xx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" msgstr "" +"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect to " +"xx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" #: http//localhost/gettor/gettor-2/ #: (content/gettor/gettor-2/contents+en.lrquestion.description) @@ -3393,6 +3400,7 @@ msgstr "" msgid "" "19.11.2017 00:04:47.400 [NOTICE] Opening Socks listener on 127.0.0.1:9150" msgstr "" +"19.11.2017 00:04:47.400 [NOTICE] Opening Socks listener on 127.0.0.1:9150" #: http//localhost/tormobile/tormobile-4/ #: (content/tormobile/tormobile-4/contents+en.lrquestion.seo_slug)

1 0

[translation/support-portal_completed] Update translations for support-portal_completed
by translation＠torproject.org 12 Nov '18

12 Nov '18

commit 73538ae672b8c8dab5643b3e4732246d94fac280 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 12 08:50:15 2018 +0000 Update translations for support-portal_completed --- contents+bn.po | 4 ++++ contents+ca.po | 4 ++++ contents+de.po | 4 ++++ contents+es-AR.po | 7 ++++++- contents+es.po | 4 ++++ contents+fr.po | 8 ++++++-- contents+it.po | 4 ++++ contents+pt-BR.po | 4 ++++ contents+tr.po | 4 ++++ contents+zh-CN.po | 8 ++++---- 10 files changed, 44 insertions(+), 7 deletions(-) diff --git a/contents+bn.po b/contents+bn.po index 3d25086e1..af4a8205c 100644 --- a/contents+bn.po +++ b/contents+bn.po @@ -1180,6 +1180,8 @@ msgid "" "If a SOCKS proxy is not required, or you’re not sure, please try connecting " "to the Tor network without a SOCKS proxy." msgstr "" +"যদি কোন সচক্স প্রক্সি প্রয়োজন হয় না, অথবা আপনি নিশ্চিত না হন, দয়া করে " +"একটি সচক্স প্রক্সি ছাড়াই টর নেটওয়ার্কে সংযোগ করার চেষ্টা করুন ।" #: http//localhost/tbb/tbb-38/ #: (content/tbb/tbb-38/contents+en.lrquestion.description) @@ -1489,6 +1491,8 @@ msgid "" "If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" +"যদি আপনি আপনার টর লগে এই ধরনের লাইনগুলো দেখেন, এর মানে আপনি একটি মোজা " +"প্রক্সির সাথে সংযোগ করতে ব্যর্থ হন ।" #: http//localhost/tbb/tbb-35/ #: (content/tbb/tbb-35/contents+en.lrquestion.description) diff --git a/contents+ca.po b/contents+ca.po index 9caf7b3b5..2e2dff9f9 100644 --- a/contents+ca.po +++ b/contents+ca.po @@ -1189,6 +1189,8 @@ msgid "" "If a SOCKS proxy is not required, or you’re not sure, please try connecting " "to the Tor network without a SOCKS proxy." msgstr "" +"Si no es requereix un proxy SOCKS, o no esteu segur, intenteu connectar-vos " +"a la xarxa Tor sense un proxy SOCKS." #: http//localhost/tbb/tbb-38/ #: (content/tbb/tbb-38/contents+en.lrquestion.description) @@ -1500,6 +1502,8 @@ msgid "" "If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" +"Si veieu línies com aquestes al vostre registre de Tor, significa que no " +"esteu connectant a un proxy SOCKS." #: http//localhost/tbb/tbb-35/ #: (content/tbb/tbb-35/contents+en.lrquestion.description) diff --git a/contents+de.po b/contents+de.po index 896b7560e..354d3fd36 100644 --- a/contents+de.po +++ b/contents+de.po @@ -1200,6 +1200,8 @@ msgid "" "If a SOCKS proxy is not required, or you’re not sure, please try connecting " "to the Tor network without a SOCKS proxy." msgstr "" +"Wenn kein SOCKS-Proxy nötig ist, oder du nicht sicher bist, versuche dich " +"mit dem Tor-Netzwerk ohne SOCKS-Proxy zu verbinden." #: http//localhost/tbb/tbb-38/ #: (content/tbb/tbb-38/contents+en.lrquestion.description) @@ -1511,6 +1513,8 @@ msgid "" "If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" +"Wenn in der Log-Datei Zeile wie diese auftauchen, bedeutet das, der SOCKS-" +"Proxy kann nicht erreicht werden." #: http//localhost/tbb/tbb-35/ #: (content/tbb/tbb-35/contents+en.lrquestion.description) diff --git a/contents+es-AR.po b/contents+es-AR.po index 57f225067..79df5e091 100644 --- a/contents+es-AR.po +++ b/contents+es-AR.po @@ -1,6 +1,7 @@ # Translators: # erinm, 2018 # Zuhualime Akoochimoya, 2018 +# Emma Peel, 2018 # msgid "" msgstr "" @@ -8,7 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-27 19:20+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: Zuhualime Akoochimoya, 2018\n" +"Last-Translator: Emma Peel, 2018\n" "Language-Team: Spanish (Argentina) (https://www.transifex.com/otf/teams/1519/es_AR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1198,6 +1199,8 @@ msgid "" "If a SOCKS proxy is not required, or you’re not sure, please try connecting " "to the Tor network without a SOCKS proxy." msgstr "" +"Si un proxy SOCKS no es requerido, o no estás seguro, por favor tratá " +"conectando a la red de Tor sin un proxy SOCKS." #: http//localhost/tbb/tbb-38/ #: (content/tbb/tbb-38/contents+en.lrquestion.description) @@ -1509,6 +1512,8 @@ msgid "" "If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" +"Si ves líneas cómo éstas en tu bitácora Tor, significa que estás fallando en" +" conectarte a un proxy SOCKS." #: http//localhost/tbb/tbb-35/ #: (content/tbb/tbb-35/contents+en.lrquestion.description) diff --git a/contents+es.po b/contents+es.po index 97e33ce4c..ec593f3b1 100644 --- a/contents+es.po +++ b/contents+es.po @@ -1198,6 +1198,8 @@ msgid "" "If a SOCKS proxy is not required, or you’re not sure, please try connecting " "to the Tor network without a SOCKS proxy." msgstr "" +"Si no se requiere un proxy SOCKS, o no estás seguro, por favor intenta " +"conectarte a la red Tor sin un proxy SOCKS." #: http//localhost/tbb/tbb-38/ #: (content/tbb/tbb-38/contents+en.lrquestion.description) @@ -1512,6 +1514,8 @@ msgid "" "If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" +"Si ves líneas como estas en tu registro Tor, significa que no te estás " +"conectando a un proxy SOCKS." #: http//localhost/tbb/tbb-35/ #: (content/tbb/tbb-35/contents+en.lrquestion.description) diff --git a/contents+fr.po b/contents+fr.po index d26f40f14..7aa15d9f0 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -1,7 +1,7 @@ # Translators: # erinm, 2018 -# Emma Peel, 2018 # AO <ao(a)localizationlab.org>, 2018 +# Emma Peel, 2018 # msgid "" msgstr "" @@ -9,7 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-27 19:20+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: AO <ao(a)localizationlab.org>, 2018\n" +"Last-Translator: Emma Peel, 2018\n" "Language-Team: French (https://www.transifex.com/otf/teams/1519/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1216,6 +1216,8 @@ msgid "" "If a SOCKS proxy is not required, or you’re not sure, please try connecting " "to the Tor network without a SOCKS proxy." msgstr "" +"Si un mandataire SOCKS n’est pas exigé ou si vous n’êtes pas certain, " +"veuillez essayer de vous connecter au réseau Tor sans mandataire SOCKS." #: http//localhost/tbb/tbb-38/ #: (content/tbb/tbb-38/contents+en.lrquestion.description) @@ -1533,6 +1535,8 @@ msgid "" "If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" +"Si vous rencontrez de telles lignes dans votre journal de Tor, cela signifie" +" que vous n’arrivez pas à vous connecter à un mandataire SOCKS." #: http//localhost/tbb/tbb-35/ #: (content/tbb/tbb-35/contents+en.lrquestion.description) diff --git a/contents+it.po b/contents+it.po index df482f0c1..4de2f6f35 100644 --- a/contents+it.po +++ b/contents+it.po @@ -1196,6 +1196,8 @@ msgid "" "If a SOCKS proxy is not required, or you’re not sure, please try connecting " "to the Tor network without a SOCKS proxy." msgstr "" +"Se non è richiesto un SOCKS proxy, o non ne sei sicuro, prova per favore a " +"connetterti al network Tor senza utilizzare un SOCKS proxy." #: http//localhost/tbb/tbb-38/ #: (content/tbb/tbb-38/contents+en.lrquestion.description) @@ -1505,6 +1507,8 @@ msgid "" "If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" +"Se vedi delle righe simili a queste nel tuo log di Tor, significa che non " +"riesci a conetterti al SOCKS proxy." #: http//localhost/tbb/tbb-35/ #: (content/tbb/tbb-35/contents+en.lrquestion.description) diff --git a/contents+pt-BR.po b/contents+pt-BR.po index 8a01de6b6..af2df9fc1 100644 --- a/contents+pt-BR.po +++ b/contents+pt-BR.po @@ -1192,6 +1192,8 @@ msgid "" "If a SOCKS proxy is not required, or you’re not sure, please try connecting " "to the Tor network without a SOCKS proxy." msgstr "" +"Se um SOCKS proxy não é necessário, ou você não tem certeza, por favor tente" +" conectar a rede Tor sem um SOCKS proxy." #: http//localhost/tbb/tbb-38/ #: (content/tbb/tbb-38/contents+en.lrquestion.description) @@ -1505,6 +1507,8 @@ msgid "" "If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" +"Se você vê linhas como essas no seu registro Tor, isso significa que você " +"está falhando ao conectar a um SOCKS proxy." #: http//localhost/tbb/tbb-35/ #: (content/tbb/tbb-35/contents+en.lrquestion.description) diff --git a/contents+tr.po b/contents+tr.po index a36b68fda..7d0da41e3 100644 --- a/contents+tr.po +++ b/contents+tr.po @@ -1186,6 +1186,8 @@ msgid "" "If a SOCKS proxy is not required, or you’re not sure, please try connecting " "to the Tor network without a SOCKS proxy." msgstr "" +"Bir SOCKS vekil sunucusu kullanılması gerekmiyorsa ya da emin değilseniz " +"lütfen Tor ağına SOCKS vekil sunucusu kullanmadan bağlanmayı deneyin." #: http//localhost/tbb/tbb-38/ #: (content/tbb/tbb-38/contents+en.lrquestion.description) @@ -1497,6 +1499,8 @@ msgid "" "If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" +"Tor günlüğünde buna benzer satırlar görüyorsanız, bir SOCKS vekil sunucusu " +"ile bağlantı kurma sorunları yaşıyorsunuz demektir." #: http//localhost/tbb/tbb-35/ #: (content/tbb/tbb-35/contents+en.lrquestion.description) diff --git a/contents+zh-CN.po b/contents+zh-CN.po index 73301b36e..c2be7d760 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -2,8 +2,8 @@ # Herman Gu <hkoe.academic(a)gmail.com>, 2018 # erinm, 2018 # MD Rights <psychi2009(a)gmail.com>, 2018 -# Emma Peel, 2018 # ヨイツの賢狼ホロ, 2018 +# Emma Peel, 2018 # msgid "" msgstr "" @@ -11,7 +11,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-27 19:20+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: ヨイツの賢狼ホロ, 2018\n" +"Last-Translator: Emma Peel, 2018\n" "Language-Team: Chinese (China) (https://www.transifex.com/otf/teams/1519/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1072,7 +1072,7 @@ msgstr "默认禁用 JavaScript 造成的不便过于严重，也许会让大多 msgid "" "If a SOCKS proxy is not required, or you’re not sure, please try connecting " "to the Tor network without a SOCKS proxy." -msgstr "" +msgstr "如果您的系统不需要代理，或者您不敢肯定，请尝试直接连接 Tor 网络。" #: http//localhost/tbb/tbb-38/ #: (content/tbb/tbb-38/contents+en.lrquestion.description) @@ -1352,7 +1352,7 @@ msgstr "tor-browser-will-not-connect-no-censorship" msgid "" "If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." -msgstr "" +msgstr "如果您看见这些提示出现在您的日志里面，这意味着您连接 SOCKS 代理失败了。" #: http//localhost/tbb/tbb-35/ #: (content/tbb/tbb-35/contents+en.lrquestion.description)

1 0

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 12 Nov '18

12 Nov '18

commit 7f74f6fa592c025627b714218d8293188e6ed5fb Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 12 08:49:57 2018 +0000 Update translations for support-portal --- contents+bn.po | 4 ++++ contents+ca.po | 4 ++++ contents+de.po | 4 ++++ contents+es-AR.po | 7 ++++++- contents+es.po | 4 ++++ contents+fr.po | 8 ++++++-- contents+it.po | 4 ++++ contents+pt-BR.po | 4 ++++ contents+ru.po | 9 +++++++-- contents+tr.po | 4 ++++ contents+zh-CN.po | 8 ++++---- 11 files changed, 51 insertions(+), 9 deletions(-) diff --git a/contents+bn.po b/contents+bn.po index 3d25086e1..af4a8205c 100644 --- a/contents+bn.po +++ b/contents+bn.po @@ -1180,6 +1180,8 @@ msgid "" "If a SOCKS proxy is not required, or you’re not sure, please try connecting " "to the Tor network without a SOCKS proxy." msgstr "" +"যদি কোন সচক্স প্রক্সি প্রয়োজন হয় না, অথবা আপনি নিশ্চিত না হন, দয়া করে " +"একটি সচক্স প্রক্সি ছাড়াই টর নেটওয়ার্কে সংযোগ করার চেষ্টা করুন ।" #: http//localhost/tbb/tbb-38/ #: (content/tbb/tbb-38/contents+en.lrquestion.description) @@ -1489,6 +1491,8 @@ msgid "" "If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" +"যদি আপনি আপনার টর লগে এই ধরনের লাইনগুলো দেখেন, এর মানে আপনি একটি মোজা " +"প্রক্সির সাথে সংযোগ করতে ব্যর্থ হন ।" #: http//localhost/tbb/tbb-35/ #: (content/tbb/tbb-35/contents+en.lrquestion.description) diff --git a/contents+ca.po b/contents+ca.po index 9caf7b3b5..2e2dff9f9 100644 --- a/contents+ca.po +++ b/contents+ca.po @@ -1189,6 +1189,8 @@ msgid "" "If a SOCKS proxy is not required, or you’re not sure, please try connecting " "to the Tor network without a SOCKS proxy." msgstr "" +"Si no es requereix un proxy SOCKS, o no esteu segur, intenteu connectar-vos " +"a la xarxa Tor sense un proxy SOCKS." #: http//localhost/tbb/tbb-38/ #: (content/tbb/tbb-38/contents+en.lrquestion.description) @@ -1500,6 +1502,8 @@ msgid "" "If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" +"Si veieu línies com aquestes al vostre registre de Tor, significa que no " +"esteu connectant a un proxy SOCKS." #: http//localhost/tbb/tbb-35/ #: (content/tbb/tbb-35/contents+en.lrquestion.description) diff --git a/contents+de.po b/contents+de.po index 896b7560e..354d3fd36 100644 --- a/contents+de.po +++ b/contents+de.po @@ -1200,6 +1200,8 @@ msgid "" "If a SOCKS proxy is not required, or you’re not sure, please try connecting " "to the Tor network without a SOCKS proxy." msgstr "" +"Wenn kein SOCKS-Proxy nötig ist, oder du nicht sicher bist, versuche dich " +"mit dem Tor-Netzwerk ohne SOCKS-Proxy zu verbinden." #: http//localhost/tbb/tbb-38/ #: (content/tbb/tbb-38/contents+en.lrquestion.description) @@ -1511,6 +1513,8 @@ msgid "" "If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" +"Wenn in der Log-Datei Zeile wie diese auftauchen, bedeutet das, der SOCKS-" +"Proxy kann nicht erreicht werden." #: http//localhost/tbb/tbb-35/ #: (content/tbb/tbb-35/contents+en.lrquestion.description) diff --git a/contents+es-AR.po b/contents+es-AR.po index 57f225067..79df5e091 100644 --- a/contents+es-AR.po +++ b/contents+es-AR.po @@ -1,6 +1,7 @@ # Translators: # erinm, 2018 # Zuhualime Akoochimoya, 2018 +# Emma Peel, 2018 # msgid "" msgstr "" @@ -8,7 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-27 19:20+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: Zuhualime Akoochimoya, 2018\n" +"Last-Translator: Emma Peel, 2018\n" "Language-Team: Spanish (Argentina) (https://www.transifex.com/otf/teams/1519/es_AR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1198,6 +1199,8 @@ msgid "" "If a SOCKS proxy is not required, or you’re not sure, please try connecting " "to the Tor network without a SOCKS proxy." msgstr "" +"Si un proxy SOCKS no es requerido, o no estás seguro, por favor tratá " +"conectando a la red de Tor sin un proxy SOCKS." #: http//localhost/tbb/tbb-38/ #: (content/tbb/tbb-38/contents+en.lrquestion.description) @@ -1509,6 +1512,8 @@ msgid "" "If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" +"Si ves líneas cómo éstas en tu bitácora Tor, significa que estás fallando en" +" conectarte a un proxy SOCKS." #: http//localhost/tbb/tbb-35/ #: (content/tbb/tbb-35/contents+en.lrquestion.description) diff --git a/contents+es.po b/contents+es.po index 97e33ce4c..ec593f3b1 100644 --- a/contents+es.po +++ b/contents+es.po @@ -1198,6 +1198,8 @@ msgid "" "If a SOCKS proxy is not required, or you’re not sure, please try connecting " "to the Tor network without a SOCKS proxy." msgstr "" +"Si no se requiere un proxy SOCKS, o no estás seguro, por favor intenta " +"conectarte a la red Tor sin un proxy SOCKS." #: http//localhost/tbb/tbb-38/ #: (content/tbb/tbb-38/contents+en.lrquestion.description) @@ -1512,6 +1514,8 @@ msgid "" "If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" +"Si ves líneas como estas en tu registro Tor, significa que no te estás " +"conectando a un proxy SOCKS." #: http//localhost/tbb/tbb-35/ #: (content/tbb/tbb-35/contents+en.lrquestion.description) diff --git a/contents+fr.po b/contents+fr.po index d26f40f14..7aa15d9f0 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -1,7 +1,7 @@ # Translators: # erinm, 2018 -# Emma Peel, 2018 # AO <ao(a)localizationlab.org>, 2018 +# Emma Peel, 2018 # msgid "" msgstr "" @@ -9,7 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-27 19:20+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: AO <ao(a)localizationlab.org>, 2018\n" +"Last-Translator: Emma Peel, 2018\n" "Language-Team: French (https://www.transifex.com/otf/teams/1519/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1216,6 +1216,8 @@ msgid "" "If a SOCKS proxy is not required, or you’re not sure, please try connecting " "to the Tor network without a SOCKS proxy." msgstr "" +"Si un mandataire SOCKS n’est pas exigé ou si vous n’êtes pas certain, " +"veuillez essayer de vous connecter au réseau Tor sans mandataire SOCKS." #: http//localhost/tbb/tbb-38/ #: (content/tbb/tbb-38/contents+en.lrquestion.description) @@ -1533,6 +1535,8 @@ msgid "" "If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" +"Si vous rencontrez de telles lignes dans votre journal de Tor, cela signifie" +" que vous n’arrivez pas à vous connecter à un mandataire SOCKS." #: http//localhost/tbb/tbb-35/ #: (content/tbb/tbb-35/contents+en.lrquestion.description) diff --git a/contents+it.po b/contents+it.po index df482f0c1..4de2f6f35 100644 --- a/contents+it.po +++ b/contents+it.po @@ -1196,6 +1196,8 @@ msgid "" "If a SOCKS proxy is not required, or you’re not sure, please try connecting " "to the Tor network without a SOCKS proxy." msgstr "" +"Se non è richiesto un SOCKS proxy, o non ne sei sicuro, prova per favore a " +"connetterti al network Tor senza utilizzare un SOCKS proxy." #: http//localhost/tbb/tbb-38/ #: (content/tbb/tbb-38/contents+en.lrquestion.description) @@ -1505,6 +1507,8 @@ msgid "" "If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" +"Se vedi delle righe simili a queste nel tuo log di Tor, significa che non " +"riesci a conetterti al SOCKS proxy." #: http//localhost/tbb/tbb-35/ #: (content/tbb/tbb-35/contents+en.lrquestion.description) diff --git a/contents+pt-BR.po b/contents+pt-BR.po index 8a01de6b6..af2df9fc1 100644 --- a/contents+pt-BR.po +++ b/contents+pt-BR.po @@ -1192,6 +1192,8 @@ msgid "" "If a SOCKS proxy is not required, or you’re not sure, please try connecting " "to the Tor network without a SOCKS proxy." msgstr "" +"Se um SOCKS proxy não é necessário, ou você não tem certeza, por favor tente" +" conectar a rede Tor sem um SOCKS proxy." #: http//localhost/tbb/tbb-38/ #: (content/tbb/tbb-38/contents+en.lrquestion.description) @@ -1505,6 +1507,8 @@ msgid "" "If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" +"Se você vê linhas como essas no seu registro Tor, isso significa que você " +"está falhando ao conectar a um SOCKS proxy." #: http//localhost/tbb/tbb-35/ #: (content/tbb/tbb-35/contents+en.lrquestion.description) diff --git a/contents+ru.po b/contents+ru.po index 6a9844cc3..8e42f46de 100644 --- a/contents+ru.po +++ b/contents+ru.po @@ -4,6 +4,7 @@ # Sergey Smirnov <cj75300(a)gmail.com>, 2018 # Legenden Rifk <rekytcsgo(a)gmail.com>, 2018 # diana azaryan <dianazryn(a)gmail.com>, 2018 +# Emma Peel, 2018 # msgid "" msgstr "" @@ -11,7 +12,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-27 19:20+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: diana azaryan <dianazryn(a)gmail.com>, 2018\n" +"Last-Translator: Emma Peel, 2018\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" @@ -1170,6 +1171,8 @@ msgid "" "If a SOCKS proxy is not required, or you’re not sure, please try connecting " "to the Tor network without a SOCKS proxy." msgstr "" +"Если SOCKS прокси не требуется, или же вы не уверены, пожалуйста, " +"подключитесь к сети тор без SOCKS прокси." #: http//localhost/tbb/tbb-38/ #: (content/tbb/tbb-38/contents+en.lrquestion.description) @@ -1474,6 +1477,8 @@ msgid "" "If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" +"Если вы видите подобные строчки в логе Tor, значит, не удалось соединение с " +"SOCKS-прокси." #: http//localhost/tbb/tbb-35/ #: (content/tbb/tbb-35/contents+en.lrquestion.description) @@ -1506,7 +1511,7 @@ msgstr "Могу ли я использовать Tor с другим брауз #: http//localhost/operators/operators-3/ #: (content/operators/operators-3/contents+en.lrquestion.description) msgid "ExitPolicy reject *:*" -msgstr "" +msgstr "ExitPolicy reject *:*" #: http//localhost/operators/operators-6/ #: (content/operators/operators-6/contents+en.lrquestion.description) diff --git a/contents+tr.po b/contents+tr.po index a36b68fda..7d0da41e3 100644 --- a/contents+tr.po +++ b/contents+tr.po @@ -1186,6 +1186,8 @@ msgid "" "If a SOCKS proxy is not required, or you’re not sure, please try connecting " "to the Tor network without a SOCKS proxy." msgstr "" +"Bir SOCKS vekil sunucusu kullanılması gerekmiyorsa ya da emin değilseniz " +"lütfen Tor ağına SOCKS vekil sunucusu kullanmadan bağlanmayı deneyin." #: http//localhost/tbb/tbb-38/ #: (content/tbb/tbb-38/contents+en.lrquestion.description) @@ -1497,6 +1499,8 @@ msgid "" "If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" +"Tor günlüğünde buna benzer satırlar görüyorsanız, bir SOCKS vekil sunucusu " +"ile bağlantı kurma sorunları yaşıyorsunuz demektir." #: http//localhost/tbb/tbb-35/ #: (content/tbb/tbb-35/contents+en.lrquestion.description) diff --git a/contents+zh-CN.po b/contents+zh-CN.po index 73301b36e..c2be7d760 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -2,8 +2,8 @@ # Herman Gu <hkoe.academic(a)gmail.com>, 2018 # erinm, 2018 # MD Rights <psychi2009(a)gmail.com>, 2018 -# Emma Peel, 2018 # ヨイツの賢狼ホロ, 2018 +# Emma Peel, 2018 # msgid "" msgstr "" @@ -11,7 +11,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-27 19:20+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: ヨイツの賢狼ホロ, 2018\n" +"Last-Translator: Emma Peel, 2018\n" "Language-Team: Chinese (China) (https://www.transifex.com/otf/teams/1519/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1072,7 +1072,7 @@ msgstr "默认禁用 JavaScript 造成的不便过于严重，也许会让大多 msgid "" "If a SOCKS proxy is not required, or you’re not sure, please try connecting " "to the Tor network without a SOCKS proxy." -msgstr "" +msgstr "如果您的系统不需要代理，或者您不敢肯定，请尝试直接连接 Tor 网络。" #: http//localhost/tbb/tbb-38/ #: (content/tbb/tbb-38/contents+en.lrquestion.description) @@ -1352,7 +1352,7 @@ msgstr "tor-browser-will-not-connect-no-censorship" msgid "" "If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." -msgstr "" +msgstr "如果您看见这些提示出现在您的日志里面，这意味着您连接 SOCKS 代理失败了。" #: http//localhost/tbb/tbb-35/ #: (content/tbb/tbb-35/contents+en.lrquestion.description)

1 0

[translation/support-portal_completed] Update translations for support-portal_completed
by translation＠torproject.org 12 Nov '18

12 Nov '18

commit 3987c6739274b4b24cdcfb2570d4bbfa03f427ff Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 12 08:20:42 2018 +0000 Update translations for support-portal_completed --- contents+bn.po | 10 +++------- contents+ca.po | 10 +++------- contents+de.po | 10 +++------- contents+es-AR.po | 10 +++------- contents+es.po | 10 +++------- contents+fr.po | 10 +++------- contents+ga.po | 10 +++------- contents+id.po | 9 +++------ contents+it.po | 10 +++------- contents+pt-BR.po | 10 +++------- contents+tr.po | 10 +++------- contents+zh-CN.po | 10 +++++----- contents.pot | 12 ++++++------ 13 files changed, 44 insertions(+), 87 deletions(-) diff --git a/contents+bn.po b/contents+bn.po index c518f396f..3d25086e1 100644 --- a/contents+bn.po +++ b/contents+bn.po @@ -1177,11 +1177,9 @@ msgstr "" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If a SOCKS proxy is not required, or you’re not sure, please try connecting" -" to the Tor network without a SOCKS proxy." +"If a SOCKS proxy is not required, or you’re not sure, please try connecting " +"to the Tor network without a SOCKS proxy." msgstr "" -"যদি কোন সচক্স প্রক্সি প্রয়োজন হয় না, অথবা আপনি নিশ্চিত না হন, দয়া করে " -"একটি সচক্স প্রক্সি ছাড়াই টর নেটওয়ার্কে সংযোগ করার চেষ্টা করুন ।" #: http//localhost/tbb/tbb-38/ #: (content/tbb/tbb-38/contents+en.lrquestion.description) @@ -1488,11 +1486,9 @@ msgstr "tor-browser-will-not-connect-no-censorship" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" -"যদি আপনি আপনার টর লগে এই ধরনের লাইনগুলো দেখেন, এর মানে আপনি একটি মোজা " -"প্রক্সির সাথে সংযোগ করতে ব্যর্থ হন ।" #: http//localhost/tbb/tbb-35/ #: (content/tbb/tbb-35/contents+en.lrquestion.description) diff --git a/contents+ca.po b/contents+ca.po index 7766c6273..9caf7b3b5 100644 --- a/contents+ca.po +++ b/contents+ca.po @@ -1186,11 +1186,9 @@ msgstr "" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If a SOCKS proxy is not required, or you’re not sure, please try connecting" -" to the Tor network without a SOCKS proxy." +"If a SOCKS proxy is not required, or you’re not sure, please try connecting " +"to the Tor network without a SOCKS proxy." msgstr "" -"Si no es requereix un proxy SOCKS, o no esteu segur, intenteu connectar-vos " -"a la xarxa Tor sense un proxy SOCKS." #: http//localhost/tbb/tbb-38/ #: (content/tbb/tbb-38/contents+en.lrquestion.description) @@ -1499,11 +1497,9 @@ msgstr "navegador-tor-no-connecta-no-censurat" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" -"Si veieu línies com aquestes al vostre registre de Tor, significa que no " -"esteu connectant a un proxy SOCKS." #: http//localhost/tbb/tbb-35/ #: (content/tbb/tbb-35/contents+en.lrquestion.description) diff --git a/contents+de.po b/contents+de.po index 6dc3bc9fb..896b7560e 100644 --- a/contents+de.po +++ b/contents+de.po @@ -1197,11 +1197,9 @@ msgstr "" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If a SOCKS proxy is not required, or you’re not sure, please try connecting" -" to the Tor network without a SOCKS proxy." +"If a SOCKS proxy is not required, or you’re not sure, please try connecting " +"to the Tor network without a SOCKS proxy." msgstr "" -"Wenn kein SOCKS-Proxy nötig ist, oder du nicht sicher bist, versuche dich " -"mit dem Tor-Netzwerk ohne SOCKS-Proxy zu verbinden." #: http//localhost/tbb/tbb-38/ #: (content/tbb/tbb-38/contents+en.lrquestion.description) @@ -1510,11 +1508,9 @@ msgstr "tor-browser-verbindet-sich-nicht-keine-zensur" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" -"Wenn in der Log-Datei Zeile wie diese auftauchen, bedeutet das, der SOCKS-" -"Proxy kann nicht erreicht werden." #: http//localhost/tbb/tbb-35/ #: (content/tbb/tbb-35/contents+en.lrquestion.description) diff --git a/contents+es-AR.po b/contents+es-AR.po index ebde15569..57f225067 100644 --- a/contents+es-AR.po +++ b/contents+es-AR.po @@ -1195,11 +1195,9 @@ msgstr "" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If a SOCKS proxy is not required, or you’re not sure, please try connecting" -" to the Tor network without a SOCKS proxy." +"If a SOCKS proxy is not required, or you’re not sure, please try connecting " +"to the Tor network without a SOCKS proxy." msgstr "" -"Si un proxy SOCKS no es requerido, o no estás seguro, por favor tratá " -"conectando a la red de Tor sin un proxy SOCKS." #: http//localhost/tbb/tbb-38/ #: (content/tbb/tbb-38/contents+en.lrquestion.description) @@ -1508,11 +1506,9 @@ msgstr "navegador-tor-no-conecta-sin-censura" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" -"Si ves líneas cómo éstas en tu bitácora Tor, significa que estás fallando en" -" conectarte a un proxy SOCKS." #: http//localhost/tbb/tbb-35/ #: (content/tbb/tbb-35/contents+en.lrquestion.description) diff --git a/contents+es.po b/contents+es.po index d2b352ce7..97e33ce4c 100644 --- a/contents+es.po +++ b/contents+es.po @@ -1195,11 +1195,9 @@ msgstr "" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If a SOCKS proxy is not required, or you’re not sure, please try connecting" -" to the Tor network without a SOCKS proxy." +"If a SOCKS proxy is not required, or you’re not sure, please try connecting " +"to the Tor network without a SOCKS proxy." msgstr "" -"Si no se requiere un proxy SOCKS, o no estás seguro, por favor intenta " -"conectarte a la red Tor sin un proxy SOCKS." #: http//localhost/tbb/tbb-38/ #: (content/tbb/tbb-38/contents+en.lrquestion.description) @@ -1511,11 +1509,9 @@ msgstr "navegador-tor-no-conectara-censurado" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" -"Si ves líneas como estas en tu registro Tor, significa que no te estás " -"conectando a un proxy SOCKS." #: http//localhost/tbb/tbb-35/ #: (content/tbb/tbb-35/contents+en.lrquestion.description) diff --git a/contents+fr.po b/contents+fr.po index c64baf973..d26f40f14 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -1213,11 +1213,9 @@ msgstr "" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If a SOCKS proxy is not required, or you’re not sure, please try connecting" -" to the Tor network without a SOCKS proxy." +"If a SOCKS proxy is not required, or you’re not sure, please try connecting " +"to the Tor network without a SOCKS proxy." msgstr "" -"Si un mandataire SOCKS n’est pas exigé ou si vous n’êtes pas certain, " -"veuillez essayer de vous connecter au réseau Tor sans mandataire SOCKS." #: http//localhost/tbb/tbb-38/ #: (content/tbb/tbb-38/contents+en.lrquestion.description) @@ -1532,11 +1530,9 @@ msgstr "navigateur-tor-ne-se-connecte-pas-aucune-censure" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" -"Si vous rencontrez de telles lignes dans votre journal de Tor, cela signifie" -" que vous n’arrivez pas à vous connecter à un mandataire SOCKS." #: http//localhost/tbb/tbb-35/ #: (content/tbb/tbb-35/contents+en.lrquestion.description) diff --git a/contents+ga.po b/contents+ga.po index f4cd8eb3f..6eeed2d34 100644 --- a/contents+ga.po +++ b/contents+ga.po @@ -1196,11 +1196,9 @@ msgstr "" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If a SOCKS proxy is not required, or you’re not sure, please try connecting" -" to the Tor network without a SOCKS proxy." +"If a SOCKS proxy is not required, or you’re not sure, please try connecting " +"to the Tor network without a SOCKS proxy." msgstr "" -"Mura dteastaíonn seachfhreastalaí SOCKS uait, nó mura bhfuil tú cinnte, déan" -" iarracht ceangal a bhunú le líonra Tor gan seachfhreastalaí SOCKS." #: http//localhost/tbb/tbb-38/ #: (content/tbb/tbb-38/contents+en.lrquestion.description) @@ -1513,11 +1511,9 @@ msgstr "tor-browser-will-not-connect-no-censorship" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" -"Má fheiceann tú línte den sórt seo i do logchomhad Tor, ciallaíonn sé gur " -"theip ort ceangal a bhunú le seachfhreastalaí SOCKS." #: http//localhost/tbb/tbb-35/ #: (content/tbb/tbb-35/contents+en.lrquestion.description) diff --git a/contents+id.po b/contents+id.po index e0e6a95fc..7c1207751 100644 --- a/contents+id.po +++ b/contents+id.po @@ -1182,11 +1182,9 @@ msgstr "" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If a SOCKS proxy is not required, or you’re not sure, please try connecting" -" to the Tor network without a SOCKS proxy." +"If a SOCKS proxy is not required, or you’re not sure, please try connecting " +"to the Tor network without a SOCKS proxy." msgstr "" -"Jika proxy SOCKS tidak diperlukan, atau Anda tidak yakin bahwa proxy SOCKS " -"diperlukan, silakan coba tanpa proxy SOCKS" #: http//localhost/tbb/tbb-38/ #: (content/tbb/tbb-38/contents+en.lrquestion.description) @@ -1495,10 +1493,9 @@ msgstr "tor-browser-will-not-connect-no-censorship " #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" -"Jika Anda melihat baris seperti ini, Tor gagal tersambung ke SOCKS proxy." #: http//localhost/tbb/tbb-35/ #: (content/tbb/tbb-35/contents+en.lrquestion.description) diff --git a/contents+it.po b/contents+it.po index b0e1f7278..df482f0c1 100644 --- a/contents+it.po +++ b/contents+it.po @@ -1193,11 +1193,9 @@ msgstr "" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If a SOCKS proxy is not required, or you’re not sure, please try connecting" -" to the Tor network without a SOCKS proxy." +"If a SOCKS proxy is not required, or you’re not sure, please try connecting " +"to the Tor network without a SOCKS proxy." msgstr "" -"Se non è richiesto un SOCKS proxy, o non ne sei sicuro, prova per favore a " -"connetterti al network Tor senza utilizzare un SOCKS proxy." #: http//localhost/tbb/tbb-38/ #: (content/tbb/tbb-38/contents+en.lrquestion.description) @@ -1504,11 +1502,9 @@ msgstr "tor-browser-non-si-connette-no-censura" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" -"Se vedi delle righe simili a queste nel tuo log di Tor, significa che non " -"riesci a conetterti al SOCKS proxy." #: http//localhost/tbb/tbb-35/ #: (content/tbb/tbb-35/contents+en.lrquestion.description) diff --git a/contents+pt-BR.po b/contents+pt-BR.po index ff9bdf7b2..8a01de6b6 100644 --- a/contents+pt-BR.po +++ b/contents+pt-BR.po @@ -1189,11 +1189,9 @@ msgstr "" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If a SOCKS proxy is not required, or you’re not sure, please try connecting" -" to the Tor network without a SOCKS proxy." +"If a SOCKS proxy is not required, or you’re not sure, please try connecting " +"to the Tor network without a SOCKS proxy." msgstr "" -"Se um SOCKS proxy não é necessário, ou você não tem certeza, por favor tente" -" conectar a rede Tor sem um SOCKS proxy." #: http//localhost/tbb/tbb-38/ #: (content/tbb/tbb-38/contents+en.lrquestion.description) @@ -1504,11 +1502,9 @@ msgstr "tor-browser-nao-conecta-sem-censura" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" -"Se você vê linhas como essas no seu registro Tor, isso significa que você " -"está falhando ao conectar a um SOCKS proxy." #: http//localhost/tbb/tbb-35/ #: (content/tbb/tbb-35/contents+en.lrquestion.description) diff --git a/contents+tr.po b/contents+tr.po index 35baf3ed0..a36b68fda 100644 --- a/contents+tr.po +++ b/contents+tr.po @@ -1183,11 +1183,9 @@ msgstr "" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If a SOCKS proxy is not required, or you’re not sure, please try connecting" -" to the Tor network without a SOCKS proxy." +"If a SOCKS proxy is not required, or you’re not sure, please try connecting " +"to the Tor network without a SOCKS proxy." msgstr "" -"Bir SOCKS vekil sunucusu kullanılması gerekmiyorsa ya da emin değilseniz " -"lütfen Tor ağına SOCKS vekil sunucusu kullanmadan bağlanmayı deneyin." #: http//localhost/tbb/tbb-38/ #: (content/tbb/tbb-38/contents+en.lrquestion.description) @@ -1496,11 +1494,9 @@ msgstr "tor-browser-baglantisi-kurulamiyor-ag-sansurlenmemis" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" -"Tor günlüğünde buna benzer satırlar görüyorsanız, bir SOCKS vekil sunucusu " -"ile bağlantı kurma sorunları yaşıyorsunuz demektir." #: http//localhost/tbb/tbb-35/ #: (content/tbb/tbb-35/contents+en.lrquestion.description) diff --git a/contents+zh-CN.po b/contents+zh-CN.po index 5b4c08233..73301b36e 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -1070,9 +1070,9 @@ msgstr "默认禁用 JavaScript 造成的不便过于严重，也许会让大多 #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If a SOCKS proxy is not required, or you’re not sure, please try connecting" -" to the Tor network without a SOCKS proxy." -msgstr "如果您的系统不需要代理，或者您不敢肯定，请尝试直接连接 Tor 网络。" +"If a SOCKS proxy is not required, or you’re not sure, please try connecting " +"to the Tor network without a SOCKS proxy." +msgstr "" #: http//localhost/tbb/tbb-38/ #: (content/tbb/tbb-38/contents+en.lrquestion.description) @@ -1350,9 +1350,9 @@ msgstr "tor-browser-will-not-connect-no-censorship" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." -msgstr "如果您看见这些提示出现在您的日志里面，这意味着您连接 SOCKS 代理失败了。" +msgstr "" #: http//localhost/tbb/tbb-35/ #: (content/tbb/tbb-35/contents+en.lrquestion.description) diff --git a/contents.pot b/contents.pot index bbc09ecf5..a3cb6e4e5 100644 --- a/contents.pot +++ b/contents.pot @@ -1166,11 +1166,11 @@ msgstr "" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If a SOCKS proxy is not required, or you’re not sure, please try connecting" -" to the Tor network without a SOCKS proxy." +"If a SOCKS proxy is not required, or you’re not sure, please try connecting " +"to the Tor network without a SOCKS proxy." msgstr "" -"If a SOCKS proxy is not required, or you’re not sure, please try connecting" -" to the Tor network without a SOCKS proxy." +"If a SOCKS proxy is not required, or you’re not sure, please try connecting " +"to the Tor network without a SOCKS proxy." #: http//localhost/tbb/tbb-38/ #: (content/tbb/tbb-38/contents+en.lrquestion.description) @@ -1473,10 +1473,10 @@ msgstr "tor-browser-will-not-connect-no-censorship" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." #: http//localhost/tbb/tbb-35/

1 0

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 12 Nov '18

12 Nov '18

commit 5fb425d81940e4ff4cef882b88d621d94df04456 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 12 08:20:20 2018 +0000 Update translations for support-portal --- contents+bn.po | 10 +++------- contents+ca.po | 10 +++------- contents+de.po | 10 +++------- contents+el.po | 10 +++------- contents+es-AR.po | 10 +++------- contents+es.po | 10 +++------- contents+fa.po | 6 +++--- contents+fr.po | 10 +++------- contents+ga.po | 10 +++------- contents+he.po | 6 +++--- contents+id.po | 9 +++------ contents+is.po | 6 +++--- contents+it.po | 10 +++------- contents+ka.po | 6 +++--- contents+ko.po | 6 +++--- contents+nb.po | 6 +++--- contents+pt-BR.po | 10 +++------- contents+pt-PT.po | 6 +++--- contents+ru.po | 10 +++------- contents+tr.po | 10 +++------- contents+zh-CN.po | 10 +++++----- contents.pot | 12 ++++++------ 22 files changed, 71 insertions(+), 122 deletions(-) diff --git a/contents+bn.po b/contents+bn.po index c518f396f..3d25086e1 100644 --- a/contents+bn.po +++ b/contents+bn.po @@ -1177,11 +1177,9 @@ msgstr "" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If a SOCKS proxy is not required, or you’re not sure, please try connecting" -" to the Tor network without a SOCKS proxy." +"If a SOCKS proxy is not required, or you’re not sure, please try connecting " +"to the Tor network without a SOCKS proxy." msgstr "" -"যদি কোন সচক্স প্রক্সি প্রয়োজন হয় না, অথবা আপনি নিশ্চিত না হন, দয়া করে " -"একটি সচক্স প্রক্সি ছাড়াই টর নেটওয়ার্কে সংযোগ করার চেষ্টা করুন ।" #: http//localhost/tbb/tbb-38/ #: (content/tbb/tbb-38/contents+en.lrquestion.description) @@ -1488,11 +1486,9 @@ msgstr "tor-browser-will-not-connect-no-censorship" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" -"যদি আপনি আপনার টর লগে এই ধরনের লাইনগুলো দেখেন, এর মানে আপনি একটি মোজা " -"প্রক্সির সাথে সংযোগ করতে ব্যর্থ হন ।" #: http//localhost/tbb/tbb-35/ #: (content/tbb/tbb-35/contents+en.lrquestion.description) diff --git a/contents+ca.po b/contents+ca.po index 7766c6273..9caf7b3b5 100644 --- a/contents+ca.po +++ b/contents+ca.po @@ -1186,11 +1186,9 @@ msgstr "" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If a SOCKS proxy is not required, or you’re not sure, please try connecting" -" to the Tor network without a SOCKS proxy." +"If a SOCKS proxy is not required, or you’re not sure, please try connecting " +"to the Tor network without a SOCKS proxy." msgstr "" -"Si no es requereix un proxy SOCKS, o no esteu segur, intenteu connectar-vos " -"a la xarxa Tor sense un proxy SOCKS." #: http//localhost/tbb/tbb-38/ #: (content/tbb/tbb-38/contents+en.lrquestion.description) @@ -1499,11 +1497,9 @@ msgstr "navegador-tor-no-connecta-no-censurat" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" -"Si veieu línies com aquestes al vostre registre de Tor, significa que no " -"esteu connectant a un proxy SOCKS." #: http//localhost/tbb/tbb-35/ #: (content/tbb/tbb-35/contents+en.lrquestion.description) diff --git a/contents+de.po b/contents+de.po index 6dc3bc9fb..896b7560e 100644 --- a/contents+de.po +++ b/contents+de.po @@ -1197,11 +1197,9 @@ msgstr "" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If a SOCKS proxy is not required, or you’re not sure, please try connecting" -" to the Tor network without a SOCKS proxy." +"If a SOCKS proxy is not required, or you’re not sure, please try connecting " +"to the Tor network without a SOCKS proxy." msgstr "" -"Wenn kein SOCKS-Proxy nötig ist, oder du nicht sicher bist, versuche dich " -"mit dem Tor-Netzwerk ohne SOCKS-Proxy zu verbinden." #: http//localhost/tbb/tbb-38/ #: (content/tbb/tbb-38/contents+en.lrquestion.description) @@ -1510,11 +1508,9 @@ msgstr "tor-browser-verbindet-sich-nicht-keine-zensur" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" -"Wenn in der Log-Datei Zeile wie diese auftauchen, bedeutet das, der SOCKS-" -"Proxy kann nicht erreicht werden." #: http//localhost/tbb/tbb-35/ #: (content/tbb/tbb-35/contents+en.lrquestion.description) diff --git a/contents+el.po b/contents+el.po index 8d4107bc9..2c498d298 100644 --- a/contents+el.po +++ b/contents+el.po @@ -1210,11 +1210,9 @@ msgstr "" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If a SOCKS proxy is not required, or you’re not sure, please try connecting" -" to the Tor network without a SOCKS proxy." +"If a SOCKS proxy is not required, or you’re not sure, please try connecting " +"to the Tor network without a SOCKS proxy." msgstr "" -"Αν δεν απαιτείται ένας SOCKS proxy ή δεν είστε βέβαιος, δοκιμάστε να " -"συνδεθείτε στο δίκτυο Tor χωρίς SOCKS proxy." #: http//localhost/tbb/tbb-38/ #: (content/tbb/tbb-38/contents+en.lrquestion.description) @@ -1526,11 +1524,9 @@ msgstr "tor-browser-will-not-connect-no-censorship" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" -"Αν δείτε γραμμές όπως αυτό στο αρχείο καταγραφής Tor, αυτό σημαίνει ότι δεν " -"μπορείτε να συνδεθείτε σε ένα SOCKS proxy." #: http//localhost/tbb/tbb-35/ #: (content/tbb/tbb-35/contents+en.lrquestion.description) diff --git a/contents+es-AR.po b/contents+es-AR.po index ebde15569..57f225067 100644 --- a/contents+es-AR.po +++ b/contents+es-AR.po @@ -1195,11 +1195,9 @@ msgstr "" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If a SOCKS proxy is not required, or you’re not sure, please try connecting" -" to the Tor network without a SOCKS proxy." +"If a SOCKS proxy is not required, or you’re not sure, please try connecting " +"to the Tor network without a SOCKS proxy." msgstr "" -"Si un proxy SOCKS no es requerido, o no estás seguro, por favor tratá " -"conectando a la red de Tor sin un proxy SOCKS." #: http//localhost/tbb/tbb-38/ #: (content/tbb/tbb-38/contents+en.lrquestion.description) @@ -1508,11 +1506,9 @@ msgstr "navegador-tor-no-conecta-sin-censura" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" -"Si ves líneas cómo éstas en tu bitácora Tor, significa que estás fallando en" -" conectarte a un proxy SOCKS." #: http//localhost/tbb/tbb-35/ #: (content/tbb/tbb-35/contents+en.lrquestion.description) diff --git a/contents+es.po b/contents+es.po index d2b352ce7..97e33ce4c 100644 --- a/contents+es.po +++ b/contents+es.po @@ -1195,11 +1195,9 @@ msgstr "" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If a SOCKS proxy is not required, or you’re not sure, please try connecting" -" to the Tor network without a SOCKS proxy." +"If a SOCKS proxy is not required, or you’re not sure, please try connecting " +"to the Tor network without a SOCKS proxy." msgstr "" -"Si no se requiere un proxy SOCKS, o no estás seguro, por favor intenta " -"conectarte a la red Tor sin un proxy SOCKS." #: http//localhost/tbb/tbb-38/ #: (content/tbb/tbb-38/contents+en.lrquestion.description) @@ -1511,11 +1509,9 @@ msgstr "navegador-tor-no-conectara-censurado" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" -"Si ves líneas como estas en tu registro Tor, significa que no te estás " -"conectando a un proxy SOCKS." #: http//localhost/tbb/tbb-35/ #: (content/tbb/tbb-35/contents+en.lrquestion.description) diff --git a/contents+fa.po b/contents+fa.po index 1fa060dcc..93e6a5c37 100644 --- a/contents+fa.po +++ b/contents+fa.po @@ -1043,8 +1043,8 @@ msgstr "" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If a SOCKS proxy is not required, or you’re not sure, please try connecting" -" to the Tor network without a SOCKS proxy." +"If a SOCKS proxy is not required, or you’re not sure, please try connecting " +"to the Tor network without a SOCKS proxy." msgstr "" #: http//localhost/tbb/tbb-38/ @@ -1312,7 +1312,7 @@ msgstr "" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" diff --git a/contents+fr.po b/contents+fr.po index c64baf973..d26f40f14 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -1213,11 +1213,9 @@ msgstr "" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If a SOCKS proxy is not required, or you’re not sure, please try connecting" -" to the Tor network without a SOCKS proxy." +"If a SOCKS proxy is not required, or you’re not sure, please try connecting " +"to the Tor network without a SOCKS proxy." msgstr "" -"Si un mandataire SOCKS n’est pas exigé ou si vous n’êtes pas certain, " -"veuillez essayer de vous connecter au réseau Tor sans mandataire SOCKS." #: http//localhost/tbb/tbb-38/ #: (content/tbb/tbb-38/contents+en.lrquestion.description) @@ -1532,11 +1530,9 @@ msgstr "navigateur-tor-ne-se-connecte-pas-aucune-censure" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" -"Si vous rencontrez de telles lignes dans votre journal de Tor, cela signifie" -" que vous n’arrivez pas à vous connecter à un mandataire SOCKS." #: http//localhost/tbb/tbb-35/ #: (content/tbb/tbb-35/contents+en.lrquestion.description) diff --git a/contents+ga.po b/contents+ga.po index f4cd8eb3f..6eeed2d34 100644 --- a/contents+ga.po +++ b/contents+ga.po @@ -1196,11 +1196,9 @@ msgstr "" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If a SOCKS proxy is not required, or you’re not sure, please try connecting" -" to the Tor network without a SOCKS proxy." +"If a SOCKS proxy is not required, or you’re not sure, please try connecting " +"to the Tor network without a SOCKS proxy." msgstr "" -"Mura dteastaíonn seachfhreastalaí SOCKS uait, nó mura bhfuil tú cinnte, déan" -" iarracht ceangal a bhunú le líonra Tor gan seachfhreastalaí SOCKS." #: http//localhost/tbb/tbb-38/ #: (content/tbb/tbb-38/contents+en.lrquestion.description) @@ -1513,11 +1511,9 @@ msgstr "tor-browser-will-not-connect-no-censorship" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" -"Má fheiceann tú línte den sórt seo i do logchomhad Tor, ciallaíonn sé gur " -"theip ort ceangal a bhunú le seachfhreastalaí SOCKS." #: http//localhost/tbb/tbb-35/ #: (content/tbb/tbb-35/contents+en.lrquestion.description) diff --git a/contents+he.po b/contents+he.po index c1e20ff4a..b419e2f1c 100644 --- a/contents+he.po +++ b/contents+he.po @@ -1025,8 +1025,8 @@ msgstr "" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If a SOCKS proxy is not required, or you’re not sure, please try connecting" -" to the Tor network without a SOCKS proxy." +"If a SOCKS proxy is not required, or you’re not sure, please try connecting " +"to the Tor network without a SOCKS proxy." msgstr "" #: http//localhost/tbb/tbb-38/ @@ -1291,7 +1291,7 @@ msgstr "tor-browser-will-not-connect-no-censorship" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" diff --git a/contents+id.po b/contents+id.po index e0e6a95fc..7c1207751 100644 --- a/contents+id.po +++ b/contents+id.po @@ -1182,11 +1182,9 @@ msgstr "" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If a SOCKS proxy is not required, or you’re not sure, please try connecting" -" to the Tor network without a SOCKS proxy." +"If a SOCKS proxy is not required, or you’re not sure, please try connecting " +"to the Tor network without a SOCKS proxy." msgstr "" -"Jika proxy SOCKS tidak diperlukan, atau Anda tidak yakin bahwa proxy SOCKS " -"diperlukan, silakan coba tanpa proxy SOCKS" #: http//localhost/tbb/tbb-38/ #: (content/tbb/tbb-38/contents+en.lrquestion.description) @@ -1495,10 +1493,9 @@ msgstr "tor-browser-will-not-connect-no-censorship " #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" -"Jika Anda melihat baris seperti ini, Tor gagal tersambung ke SOCKS proxy." #: http//localhost/tbb/tbb-35/ #: (content/tbb/tbb-35/contents+en.lrquestion.description) diff --git a/contents+is.po b/contents+is.po index 2887f880d..57ea62716 100644 --- a/contents+is.po +++ b/contents+is.po @@ -1032,8 +1032,8 @@ msgstr "" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If a SOCKS proxy is not required, or you’re not sure, please try connecting" -" to the Tor network without a SOCKS proxy." +"If a SOCKS proxy is not required, or you’re not sure, please try connecting " +"to the Tor network without a SOCKS proxy." msgstr "" #: http//localhost/tbb/tbb-38/ @@ -1300,7 +1300,7 @@ msgstr "tor-browser-will-not-connect-no-censorship" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" diff --git a/contents+it.po b/contents+it.po index b0e1f7278..df482f0c1 100644 --- a/contents+it.po +++ b/contents+it.po @@ -1193,11 +1193,9 @@ msgstr "" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If a SOCKS proxy is not required, or you’re not sure, please try connecting" -" to the Tor network without a SOCKS proxy." +"If a SOCKS proxy is not required, or you’re not sure, please try connecting " +"to the Tor network without a SOCKS proxy." msgstr "" -"Se non è richiesto un SOCKS proxy, o non ne sei sicuro, prova per favore a " -"connetterti al network Tor senza utilizzare un SOCKS proxy." #: http//localhost/tbb/tbb-38/ #: (content/tbb/tbb-38/contents+en.lrquestion.description) @@ -1504,11 +1502,9 @@ msgstr "tor-browser-non-si-connette-no-censura" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" -"Se vedi delle righe simili a queste nel tuo log di Tor, significa che non " -"riesci a conetterti al SOCKS proxy." #: http//localhost/tbb/tbb-35/ #: (content/tbb/tbb-35/contents+en.lrquestion.description) diff --git a/contents+ka.po b/contents+ka.po index 877c24ca5..947891483 100644 --- a/contents+ka.po +++ b/contents+ka.po @@ -1066,8 +1066,8 @@ msgstr "" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If a SOCKS proxy is not required, or you’re not sure, please try connecting" -" to the Tor network without a SOCKS proxy." +"If a SOCKS proxy is not required, or you’re not sure, please try connecting " +"to the Tor network without a SOCKS proxy." msgstr "" #: http//localhost/tbb/tbb-38/ @@ -1331,7 +1331,7 @@ msgstr "" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" diff --git a/contents+ko.po b/contents+ko.po index 0120cce14..9f3bba233 100644 --- a/contents+ko.po +++ b/contents+ko.po @@ -1057,8 +1057,8 @@ msgstr "" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If a SOCKS proxy is not required, or you’re not sure, please try connecting" -" to the Tor network without a SOCKS proxy." +"If a SOCKS proxy is not required, or you’re not sure, please try connecting " +"to the Tor network without a SOCKS proxy." msgstr "" #: http//localhost/tbb/tbb-38/ @@ -1325,7 +1325,7 @@ msgstr "" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" diff --git a/contents+nb.po b/contents+nb.po index 74c570753..4023e45d0 100644 --- a/contents+nb.po +++ b/contents+nb.po @@ -1020,8 +1020,8 @@ msgstr "" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If a SOCKS proxy is not required, or you’re not sure, please try connecting" -" to the Tor network without a SOCKS proxy." +"If a SOCKS proxy is not required, or you’re not sure, please try connecting " +"to the Tor network without a SOCKS proxy." msgstr "" #: http//localhost/tbb/tbb-38/ @@ -1291,7 +1291,7 @@ msgstr "" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" diff --git a/contents+pt-BR.po b/contents+pt-BR.po index ff9bdf7b2..8a01de6b6 100644 --- a/contents+pt-BR.po +++ b/contents+pt-BR.po @@ -1189,11 +1189,9 @@ msgstr "" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If a SOCKS proxy is not required, or you’re not sure, please try connecting" -" to the Tor network without a SOCKS proxy." +"If a SOCKS proxy is not required, or you’re not sure, please try connecting " +"to the Tor network without a SOCKS proxy." msgstr "" -"Se um SOCKS proxy não é necessário, ou você não tem certeza, por favor tente" -" conectar a rede Tor sem um SOCKS proxy." #: http//localhost/tbb/tbb-38/ #: (content/tbb/tbb-38/contents+en.lrquestion.description) @@ -1504,11 +1502,9 @@ msgstr "tor-browser-nao-conecta-sem-censura" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" -"Se você vê linhas como essas no seu registro Tor, isso significa que você " -"está falhando ao conectar a um SOCKS proxy." #: http//localhost/tbb/tbb-35/ #: (content/tbb/tbb-35/contents+en.lrquestion.description) diff --git a/contents+pt-PT.po b/contents+pt-PT.po index bf69fd37b..9bb4844b2 100644 --- a/contents+pt-PT.po +++ b/contents+pt-PT.po @@ -1089,8 +1089,8 @@ msgstr "" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If a SOCKS proxy is not required, or you’re not sure, please try connecting" -" to the Tor network without a SOCKS proxy." +"If a SOCKS proxy is not required, or you’re not sure, please try connecting " +"to the Tor network without a SOCKS proxy." msgstr "" #: http//localhost/tbb/tbb-38/ @@ -1368,7 +1368,7 @@ msgstr "tor-browser-nao-ira-ligar-sem-censura" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" diff --git a/contents+ru.po b/contents+ru.po index 316a3ae3e..6a9844cc3 100644 --- a/contents+ru.po +++ b/contents+ru.po @@ -1167,11 +1167,9 @@ msgstr "" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If a SOCKS proxy is not required, or you’re not sure, please try connecting" -" to the Tor network without a SOCKS proxy." +"If a SOCKS proxy is not required, or you’re not sure, please try connecting " +"to the Tor network without a SOCKS proxy." msgstr "" -"Если SOCKS прокси не требуется, или же вы не уверены, пожалуйста, " -"подключитесь к сети тор без SOCKS прокси." #: http//localhost/tbb/tbb-38/ #: (content/tbb/tbb-38/contents+en.lrquestion.description) @@ -1473,11 +1471,9 @@ msgstr "" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" -"Если вы видите подобные строчки в логе Tor, значит, не удалось соединение с " -"SOCKS-прокси." #: http//localhost/tbb/tbb-35/ #: (content/tbb/tbb-35/contents+en.lrquestion.description) diff --git a/contents+tr.po b/contents+tr.po index 35baf3ed0..a36b68fda 100644 --- a/contents+tr.po +++ b/contents+tr.po @@ -1183,11 +1183,9 @@ msgstr "" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If a SOCKS proxy is not required, or you’re not sure, please try connecting" -" to the Tor network without a SOCKS proxy." +"If a SOCKS proxy is not required, or you’re not sure, please try connecting " +"to the Tor network without a SOCKS proxy." msgstr "" -"Bir SOCKS vekil sunucusu kullanılması gerekmiyorsa ya da emin değilseniz " -"lütfen Tor ağına SOCKS vekil sunucusu kullanmadan bağlanmayı deneyin." #: http//localhost/tbb/tbb-38/ #: (content/tbb/tbb-38/contents+en.lrquestion.description) @@ -1496,11 +1494,9 @@ msgstr "tor-browser-baglantisi-kurulamiyor-ag-sansurlenmemis" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" -"Tor günlüğünde buna benzer satırlar görüyorsanız, bir SOCKS vekil sunucusu " -"ile bağlantı kurma sorunları yaşıyorsunuz demektir." #: http//localhost/tbb/tbb-35/ #: (content/tbb/tbb-35/contents+en.lrquestion.description) diff --git a/contents+zh-CN.po b/contents+zh-CN.po index 5b4c08233..73301b36e 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -1070,9 +1070,9 @@ msgstr "默认禁用 JavaScript 造成的不便过于严重，也许会让大多 #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If a SOCKS proxy is not required, or you’re not sure, please try connecting" -" to the Tor network without a SOCKS proxy." -msgstr "如果您的系统不需要代理，或者您不敢肯定，请尝试直接连接 Tor 网络。" +"If a SOCKS proxy is not required, or you’re not sure, please try connecting " +"to the Tor network without a SOCKS proxy." +msgstr "" #: http//localhost/tbb/tbb-38/ #: (content/tbb/tbb-38/contents+en.lrquestion.description) @@ -1350,9 +1350,9 @@ msgstr "tor-browser-will-not-connect-no-censorship" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." -msgstr "如果您看见这些提示出现在您的日志里面，这意味着您连接 SOCKS 代理失败了。" +msgstr "" #: http//localhost/tbb/tbb-35/ #: (content/tbb/tbb-35/contents+en.lrquestion.description) diff --git a/contents.pot b/contents.pot index bbc09ecf5..a3cb6e4e5 100644 --- a/contents.pot +++ b/contents.pot @@ -1166,11 +1166,11 @@ msgstr "" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If a SOCKS proxy is not required, or you’re not sure, please try connecting" -" to the Tor network without a SOCKS proxy." +"If a SOCKS proxy is not required, or you’re not sure, please try connecting " +"to the Tor network without a SOCKS proxy." msgstr "" -"If a SOCKS proxy is not required, or you’re not sure, please try connecting" -" to the Tor network without a SOCKS proxy." +"If a SOCKS proxy is not required, or you’re not sure, please try connecting " +"to the Tor network without a SOCKS proxy." #: http//localhost/tbb/tbb-38/ #: (content/tbb/tbb-38/contents+en.lrquestion.description) @@ -1473,10 +1473,10 @@ msgstr "tor-browser-will-not-connect-no-censorship" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." #: http//localhost/tbb/tbb-35/

1 0

[stem/master] Add a descriptor type_annotation method
by atagar＠torproject.org 12 Nov '18

12 Nov '18

commit 1fa75186657a6b5f1f839314ed666ccf618abc7a Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Nov 11 17:11:38 2018 -0800 Add a descriptor type_annotation method Interesting feature request from irl... https://trac.torproject.org/projects/tor/ticket/28397 We can't knowledgeably provide a version number (those come from CollecTor, for instance to specify which bridge scrubbing specification metrics used). But we can certainly provide a valid annotation. --- docs/change_log.rst | 1 + stem/descriptor/__init__.py | 59 ++++++++++++++++++---- stem/descriptor/extrainfo_descriptor.py | 4 ++ stem/descriptor/hidden_service_descriptor.py | 2 + stem/descriptor/microdescriptor.py | 2 + stem/descriptor/networkstatus.py | 17 +++++++ stem/descriptor/server_descriptor.py | 4 ++ stem/descriptor/tordnsel.py | 2 + test/unit/descriptor/extrainfo_descriptor.py | 4 ++ test/unit/descriptor/hidden_service_descriptor.py | 1 + test/unit/descriptor/microdescriptor.py | 2 + .../descriptor/networkstatus/bridge_document.py | 1 + test/unit/descriptor/networkstatus/document_v2.py | 1 + test/unit/descriptor/networkstatus/document_v3.py | 4 ++ .../descriptor/networkstatus/key_certificate.py | 1 + test/unit/descriptor/server_descriptor.py | 2 + test/unit/descriptor/tordnsel.py | 2 + 17 files changed, 99 insertions(+), 10 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 01f3f2a4..f8db0b52 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -51,6 +51,7 @@ The following are only available within Stem's `git repository * **Descriptors** + * Added :func:`~stem.descriptor.Descriptor.type_annotation` method (:trac:`28397`) * DescriptorDownloader crashed if **use_mirrors** is set (:trac:`28393`) * Don't download from Serge, a bridge authority that frequently timeout diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index a9860140..13c69f11 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -125,6 +125,24 @@ DocumentHandler = stem.util.enum.UppercaseEnum( ) +class TypeAnnotation(collections.namedtuple('TypeAnnotation', ['name', 'major_version', 'minor_version'])): + """ + `Tor metrics type annotation + <https://metrics.torproject.org/collector.html#relay-descriptors>`_. The + string representation is the header annotation, for example "@type + server-descriptor 1.0". + + .. versionadded:: 1.8.0 + + :var str name: name of the descriptor type + :var int major_version: major version number + :var int minor_version: minor version number + """ + + def __str__(self): + return '@type %s %s.%s' % (self.name, self.major_version, self.minor_version) + + class SigningKey(collections.namedtuple('SigningKey', ['private', 'public', 'public_digest'])): """ Key used by relays to sign their server and extrainfo descriptors. @@ -333,30 +351,30 @@ def _parse_metrics_file(descriptor_type, major_version, minor_version, descripto # Parses descriptor files from metrics, yielding individual descriptors. This # throws a TypeError if the descriptor_type or version isn't recognized. - if descriptor_type == 'server-descriptor' and major_version == 1: + if descriptor_type == stem.descriptor.server_descriptor.RelayDescriptor.TYPE_ANNOTATION_NAME and major_version == 1: for desc in stem.descriptor.server_descriptor._parse_file(descriptor_file, is_bridge = False, validate = validate, **kwargs): yield desc - elif descriptor_type == 'bridge-server-descriptor' and major_version == 1: + elif descriptor_type == stem.descriptor.server_descriptor.BridgeDescriptor.TYPE_ANNOTATION_NAME and major_version == 1: for desc in stem.descriptor.server_descriptor._parse_file(descriptor_file, is_bridge = True, validate = validate, **kwargs): yield desc - elif descriptor_type == 'extra-info' and major_version == 1: + elif descriptor_type == stem.descriptor.extrainfo_descriptor.RelayExtraInfoDescriptor.TYPE_ANNOTATION_NAME and major_version == 1: for desc in stem.descriptor.extrainfo_descriptor._parse_file(descriptor_file, is_bridge = False, validate = validate, **kwargs): yield desc - elif descriptor_type == 'microdescriptor' and major_version == 1: + elif descriptor_type == stem.descriptor.microdescriptor.Microdescriptor.TYPE_ANNOTATION_NAME and major_version == 1: for desc in stem.descriptor.microdescriptor._parse_file(descriptor_file, validate = validate, **kwargs): yield desc - elif descriptor_type == 'bridge-extra-info' and major_version == 1: + elif descriptor_type == stem.descriptor.extrainfo_descriptor.BridgeExtraInfoDescriptor.TYPE_ANNOTATION_NAME and major_version == 1: # version 1.1 introduced a 'transport' field... # https://trac.torproject.org/6257 for desc in stem.descriptor.extrainfo_descriptor._parse_file(descriptor_file, is_bridge = True, validate = validate, **kwargs): yield desc - elif descriptor_type == 'network-status-2' and major_version == 1: + elif descriptor_type == stem.descriptor.networkstatus.NetworkStatusDocumentV2.TYPE_ANNOTATION_NAME and major_version == 1: document_type = stem.descriptor.networkstatus.NetworkStatusDocumentV2 for desc in stem.descriptor.networkstatus._parse_file(descriptor_file, document_type, validate = validate, document_handler = document_handler, **kwargs): yield desc - elif descriptor_type == 'dir-key-certificate-3' and major_version == 1: + elif descriptor_type == stem.descriptor.networkstatus.KeyCertificate.TYPE_ANNOTATION_NAME and major_version == 1: for desc in stem.descriptor.networkstatus._parse_file_key_certs(descriptor_file, validate = validate, **kwargs): yield desc elif descriptor_type in ('network-status-consensus-3', 'network-status-vote-3') and major_version == 1: @@ -369,17 +387,17 @@ def _parse_metrics_file(descriptor_type, major_version, minor_version, descripto for desc in stem.descriptor.networkstatus._parse_file(descriptor_file, document_type, is_microdescriptor = True, validate = validate, document_handler = document_handler, **kwargs): yield desc - elif descriptor_type == 'bridge-network-status' and major_version == 1: + elif descriptor_type == stem.descriptor.networkstatus.BridgeNetworkStatusDocument.TYPE_ANNOTATION_NAME and major_version == 1: document_type = stem.descriptor.networkstatus.BridgeNetworkStatusDocument for desc in stem.descriptor.networkstatus._parse_file(descriptor_file, document_type, validate = validate, document_handler = document_handler, **kwargs): yield desc - elif descriptor_type == 'tordnsel' and major_version == 1: + elif descriptor_type == stem.descriptor.tordnsel.TorDNSEL.TYPE_ANNOTATION_NAME and major_version == 1: document_type = stem.descriptor.tordnsel.TorDNSEL for desc in stem.descriptor.tordnsel._parse_file(descriptor_file, validate = validate, **kwargs): yield desc - elif descriptor_type == 'hidden-service-descriptor' and major_version == 1: + elif descriptor_type == stem.descriptor.hidden_service_descriptor.HiddenServiceDescriptor.TYPE_ANNOTATION_NAME and major_version == 1: document_type = stem.descriptor.hidden_service_descriptor.HiddenServiceDescriptor for desc in stem.descriptor.hidden_service_descriptor._parse_file(descriptor_file, validate = validate, **kwargs): @@ -617,6 +635,7 @@ class Descriptor(object): ATTRIBUTES = {} # mapping of 'attribute' => (default_value, parsing_function) PARSER_FOR_LINE = {} # line keyword to its associated parsing function + TYPE_ANNOTATION_NAME = None def __init__(self, contents, lazy_load = False): self._path = None @@ -675,6 +694,26 @@ class Descriptor(object): return cls(cls.content(attr, exclude, sign), validate = validate) + def type_annotation(self): + """ + Provides the `Tor metrics annotation + <https://metrics.torproject.org/collector.html#relay-descriptors>`_ of this + descriptor type. For example, "@type server-descriptor 1.0" for server + descriptors. + + Please note that the version number component is specific to CollecTor, + and for the moment hardcode as 1.0. This may change in the future. + + .. versionadded:: 1.8.0 + + :returns: :class:`~stem.descriptor.TypeAnnotation` with our type information + """ + + if self.TYPE_ANNOTATION_NAME is not None: + return TypeAnnotation(self.TYPE_ANNOTATION_NAME, 1, 0) + else: + raise NotImplementedError('%s does not have a @type annotation' % type(self).__name__) + def get_path(self): """ Provides the absolute path that we loaded this descriptor from. diff --git a/stem/descriptor/extrainfo_descriptor.py b/stem/descriptor/extrainfo_descriptor.py index 485b3063..8d8894d1 100644 --- a/stem/descriptor/extrainfo_descriptor.py +++ b/stem/descriptor/extrainfo_descriptor.py @@ -903,6 +903,8 @@ class RelayExtraInfoDescriptor(ExtraInfoDescriptor): Added the ed25519_certificate and ed25519_signature attributes. """ + TYPE_ANNOTATION_NAME = 'extra-info' + ATTRIBUTES = dict(ExtraInfoDescriptor.ATTRIBUTES, **{ 'ed25519_certificate': (None, _parse_identity_ed25519_line), 'ed25519_signature': (None, _parse_router_sig_ed25519_line), @@ -963,6 +965,8 @@ class BridgeExtraInfoDescriptor(ExtraInfoDescriptor): Added the ed25519_certificate_hash and router_digest_sha256 attributes. """ + TYPE_ANNOTATION_NAME = 'bridge-extra-info' + ATTRIBUTES = dict(ExtraInfoDescriptor.ATTRIBUTES, **{ 'ed25519_certificate_hash': (None, _parse_master_key_ed25519_line), 'router_digest_sha256': (None, _parse_router_digest_sha256_line), diff --git a/stem/descriptor/hidden_service_descriptor.py b/stem/descriptor/hidden_service_descriptor.py index 83618dd8..a7cc0e3d 100644 --- a/stem/descriptor/hidden_service_descriptor.py +++ b/stem/descriptor/hidden_service_descriptor.py @@ -213,6 +213,8 @@ class HiddenServiceDescriptor(Descriptor): Added the **skip_crypto_validation** constructor argument. """ + TYPE_ANNOTATION_NAME = 'hidden-service-descriptor' + ATTRIBUTES = { 'descriptor_id': (None, _parse_rendezvous_service_descriptor_line), 'version': (None, _parse_version_line), diff --git a/stem/descriptor/microdescriptor.py b/stem/descriptor/microdescriptor.py index 731e8453..74a01071 100644 --- a/stem/descriptor/microdescriptor.py +++ b/stem/descriptor/microdescriptor.py @@ -233,6 +233,8 @@ class Microdescriptor(Descriptor): Added the protocols attribute. """ + TYPE_ANNOTATION_NAME = 'microdescriptor' + ATTRIBUTES = { 'onion_key': (None, _parse_onion_key_line), 'ntor_onion_key': (None, _parse_ntor_onion_key_line), diff --git a/stem/descriptor/networkstatus.py b/stem/descriptor/networkstatus.py index 57098e81..63483c94 100644 --- a/stem/descriptor/networkstatus.py +++ b/stem/descriptor/networkstatus.py @@ -65,6 +65,7 @@ import stem.version from stem.descriptor import ( PGP_BLOCK_END, Descriptor, + TypeAnnotation, DocumentHandler, _descriptor_content, _descriptor_components, @@ -442,6 +443,8 @@ class NetworkStatusDocumentV2(NetworkStatusDocument): a default value, others are left as **None** if undefined """ + TYPE_ANNOTATION_NAME = 'network-status-2' + ATTRIBUTES = { 'version': (None, _parse_network_status_version_line), 'hostname': (None, _parse_dir_source_line), @@ -1088,6 +1091,16 @@ class NetworkStatusDocumentV3(NetworkStatusDocument): self.routers = dict((desc.fingerprint, desc) for desc in router_iter) self._footer(document_file, validate) + def type_annotation(self): + if not self.is_microdescriptor: + return TypeAnnotation('network-status-consensus-3' if not self.is_vote else 'network-status-vote-3', 1, 0) + else: + # Directory authorities do not issue a 'microdescriptor consensus' vote, + # so unlike the above there isn't a 'network-status-microdesc-vote-3' + # counterpart here. + + return TypeAnnotation('network-status-microdesc-consensus-3', 1, 0) + def validate_signatures(self, key_certs): """ Validates we're properly signed by the signing certificates. @@ -1613,6 +1626,8 @@ class KeyCertificate(Descriptor): **\*** mandatory attribute """ + TYPE_ANNOTATION_NAME = 'dir-key-certificate-3' + ATTRIBUTES = { 'version': (None, _parse_dir_key_certificate_version_line), 'address': (None, _parse_dir_address_line), @@ -1766,6 +1781,8 @@ class BridgeNetworkStatusDocument(NetworkStatusDocument): :var datetime published: time when the document was published """ + TYPE_ANNOTATION_NAME = 'bridge-network-status' + def __init__(self, raw_content, validate = False): super(BridgeNetworkStatusDocument, self).__init__(raw_content) diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index d212459e..0d12f875 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -793,6 +793,8 @@ class RelayDescriptor(ServerDescriptor): Added the **skip_crypto_validation** constructor argument. """ + TYPE_ANNOTATION_NAME = 'server-descriptor' + ATTRIBUTES = dict(ServerDescriptor.ATTRIBUTES, **{ 'certificate': (None, _parse_identity_ed25519_line), 'ed25519_certificate': (None, _parse_identity_ed25519_line), @@ -997,6 +999,8 @@ class BridgeDescriptor(ServerDescriptor): descriptors). """ + TYPE_ANNOTATION_NAME = 'bridge-server-descriptor' + ATTRIBUTES = dict(ServerDescriptor.ATTRIBUTES, **{ 'ed25519_certificate_hash': (None, _parse_master_key_ed25519_for_hash_line), 'router_digest_sha256': (None, _parse_router_digest_sha256_line), diff --git a/stem/descriptor/tordnsel.py b/stem/descriptor/tordnsel.py index b573b79c..c4aba296 100644 --- a/stem/descriptor/tordnsel.py +++ b/stem/descriptor/tordnsel.py @@ -60,6 +60,8 @@ class TorDNSEL(Descriptor): a default value, others are left as **None** if undefined """ + TYPE_ANNOTATION_NAME = 'tordnsel' + def __init__(self, raw_contents, validate): super(TorDNSEL, self).__init__(raw_contents) raw_contents = stem.util.str_tools._to_unicode(raw_contents) diff --git a/test/unit/descriptor/extrainfo_descriptor.py b/test/unit/descriptor/extrainfo_descriptor.py index d649040a..f3252d4e 100644 --- a/test/unit/descriptor/extrainfo_descriptor.py +++ b/test/unit/descriptor/extrainfo_descriptor.py @@ -72,6 +72,8 @@ k0d2aofcVbHr4fPQOSST0LXDrhFl5Fqo5um296zpJGvRUeO6S44U/EfJAGShtqWw dir_write_values_start = [0, 0, 0, 227328, 349184, 382976, 738304] self.assertEqual(dir_write_values_start, desc.dir_write_history_values[:7]) + self.assertEqual('@type extra-info 1.0', str(desc.type_annotation())) + def test_metrics_bridge_descriptor(self): """ Parses and checks our results against an extrainfo bridge descriptor from @@ -133,6 +135,8 @@ k0d2aofcVbHr4fPQOSST0LXDrhFl5Fqo5um296zpJGvRUeO6S44U/EfJAGShtqWw self.assertEqual({}, desc.dir_v2_responses_unknown) self.assertEqual({}, desc.dir_v2_responses_unknown) + self.assertEqual('@type bridge-extra-info 1.0', str(desc.type_annotation())) + @test.require.cryptography def test_descriptor_signing(self): RelayExtraInfoDescriptor.create(sign = True) diff --git a/test/unit/descriptor/hidden_service_descriptor.py b/test/unit/descriptor/hidden_service_descriptor.py index 23067c62..437366a2 100644 --- a/test/unit/descriptor/hidden_service_descriptor.py +++ b/test/unit/descriptor/hidden_service_descriptor.py @@ -424,6 +424,7 @@ class TestHiddenServiceDescriptor(unittest.TestCase): self.assertEqual([], desc.introduction_points_auth) self.assertEqual(b'', desc.introduction_points_content) self.assertEqual([], desc.introduction_points()) + self.assertEqual('@type hidden-service-descriptor 1.0', str(desc.type_annotation())) def test_unrecognized_line(self): """ diff --git a/test/unit/descriptor/microdescriptor.py b/test/unit/descriptor/microdescriptor.py index 5f245619..bb4b91a2 100644 --- a/test/unit/descriptor/microdescriptor.py +++ b/test/unit/descriptor/microdescriptor.py @@ -74,6 +74,8 @@ class TestMicrodescriptor(unittest.TestCase): self.assertEqual({b'@last-listed': b'2013-02-24 00:18:36'}, router.get_annotations()) self.assertEqual([b'@last-listed 2013-02-24 00:18:36'], router.get_annotation_lines()) + self.assertEqual('@type microdescriptor 1.0', str(router.type_annotation())) + def test_minimal_microdescriptor(self): """ Basic sanity check that we can parse a microdescriptor with minimal diff --git a/test/unit/descriptor/networkstatus/bridge_document.py b/test/unit/descriptor/networkstatus/bridge_document.py index d027c94d..97e3e178 100644 --- a/test/unit/descriptor/networkstatus/bridge_document.py +++ b/test/unit/descriptor/networkstatus/bridge_document.py @@ -51,6 +51,7 @@ class TestBridgeNetworkStatusDocument(unittest.TestCase): self.assertEqual(datetime.datetime(2012, 6, 1, 4, 7, 4), document.published) self.assertEqual({}, document.routers) self.assertEqual([], document.get_unrecognized_lines()) + self.assertEqual('@type bridge-network-status 1.0', str(document.type_annotation())) def test_document(self): """ diff --git a/test/unit/descriptor/networkstatus/document_v2.py b/test/unit/descriptor/networkstatus/document_v2.py index a02ea7a5..7dcc235b 100644 --- a/test/unit/descriptor/networkstatus/document_v2.py +++ b/test/unit/descriptor/networkstatus/document_v2.py @@ -56,6 +56,7 @@ TpQQk3nNQF8z6UIvdlvP+DnJV4izWVkQEZgUZgIVM0E= self.assertEqual([], document.get_unrecognized_lines()) self.assertEqual(3, len(document.routers)) + self.assertEqual('@type network-status-2 1.0', str(document.type_annotation())) router1 = document.routers['719BE45DE224B607C53707D0E2143E2D423E74CF'] self.assertEqual('moria2', router1.nickname) diff --git a/test/unit/descriptor/networkstatus/document_v3.py b/test/unit/descriptor/networkstatus/document_v3.py index 18d9088a..e4258dab 100644 --- a/test/unit/descriptor/networkstatus/document_v3.py +++ b/test/unit/descriptor/networkstatus/document_v3.py @@ -121,6 +121,7 @@ ci356fosgLiM1sVqCUkNdA== self.assertEqual([], document.consensus_methods) self.assertEqual(None, document.published) self.assertEqual([], document.get_unrecognized_lines()) + self.assertEqual('@type network-status-consensus-3 1.0', str(document.type_annotation())) router = document.routers['348225F83C854796B2DD6364E65CB189B33BD696'] self.assertEqual('test002r', router.nickname) @@ -254,6 +255,7 @@ DnN5aFtYKiTc19qIC7Nmo+afPdDEf0MlJvEOP5EWl3w= self.assertEqual('178.218.213.229', router.address) self.assertEqual(80, router.or_port) self.assertEqual(None, router.dir_port) + self.assertEqual('@type network-status-vote-3 1.0', str(document.type_annotation())) authority = document.directory_authorities[0] self.assertEqual(1, len(document.directory_authorities)) @@ -1143,6 +1145,8 @@ DnN5aFtYKiTc19qIC7Nmo+afPdDEf0MlJvEOP5EWl3w= self.assertTrue(entry1 in document.routers.values()) self.assertTrue(entry2 in document.routers.values()) + self.assertEqual('@type network-status-microdesc-consensus-3 1.0', str(document.type_annotation())) + # try with an invalid RouterStatusEntry entry3 = RouterStatusEntryMicroV3(RouterStatusEntryMicroV3.content({'r': 'ugabuga'}), False) diff --git a/test/unit/descriptor/networkstatus/key_certificate.py b/test/unit/descriptor/networkstatus/key_certificate.py index 0da8da11..985610fb 100644 --- a/test/unit/descriptor/networkstatus/key_certificate.py +++ b/test/unit/descriptor/networkstatus/key_certificate.py @@ -89,6 +89,7 @@ PPc3r7zKlL/jEGHwz+C7kE88HIvkVnKLLn//40b6HxitHSOCkZ1vtp8YyXae6xnU self.assertEqual(expected_signing_key, cert.signing_key) self.assertEqual(expected_crosscert, cert.crosscert) self.assertEqual(expected_key_cert, cert.certification) + self.assertEqual('@type dir-key-certificate-3 1.0', str(cert.type_annotation())) self.assertEqual([], cert.get_unrecognized_lines()) def test_metrics_certificate(self): diff --git a/test/unit/descriptor/server_descriptor.py b/test/unit/descriptor/server_descriptor.py index 6e6d27d4..ec1af553 100644 --- a/test/unit/descriptor/server_descriptor.py +++ b/test/unit/descriptor/server_descriptor.py @@ -155,6 +155,7 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= self.assertEqual([], desc.get_unrecognized_lines()) self.assertEqual('2C7B27BEAB04B4E2459D89CA6D5CD1CC5F95A689', desc.digest()) + self.assertEqual('@type server-descriptor 1.0', str(desc.type_annotation())) self.assertEqual(['2'], desc.hidden_service_dir) # obsolete field def test_metrics_descriptor_multiple(self): @@ -436,6 +437,7 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= self.assertFalse(hasattr(desc, 'ed25519_certificate')) self.assertEqual('lgIuiAJCoXPRwWoHgG4ZAoKtmrv47aPr4AsbmESj8AA', desc.ed25519_certificate_hash) self.assertEqual('OB/fqLD8lYmjti09R+xXH/D4S2qlizxdZqtudnsunxE', desc.router_digest_sha256) + self.assertEqual('@type bridge-server-descriptor 1.0', str(desc.type_annotation())) self.assertEqual([], desc.get_unrecognized_lines()) def test_cr_in_contact_line(self): diff --git a/test/unit/descriptor/tordnsel.py b/test/unit/descriptor/tordnsel.py index f6cf07ff..fbc17442 100644 --- a/test/unit/descriptor/tordnsel.py +++ b/test/unit/descriptor/tordnsel.py @@ -86,3 +86,5 @@ class TestTorDNSELDescriptor(unittest.TestCase): self.assertTrue(is_valid_fingerprint(desc.fingerprint)) self.assertEqual('030B22437D99B2DB2908B747B6962EAD13AB4038', desc.fingerprint) self.assertEqual(0, len(desc.exit_addresses)) + + self.assertEqual('@type tordnsel 1.0', str(desc.type_annotation()))

1 0

[tor/maint-0.2.9] Fix a bug in usage of SSL_set1_groups_list()
by nickm＠torproject.org 11 Nov '18

11 Nov '18

commit 46796623f995c5b63d5cfbda1a038d9f6158ec90 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Nov 11 18:03:50 2018 -0500 Fix a bug in usage of SSL_set1_groups_list() Apparently, even though the manpage says it returns an int, it can return a long instead and cause a warning. Bug not in any released Tor. Part of #28399 --- src/common/tortls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/tortls.c b/src/common/tortls.c index 7c50f8711..1fbe3c663 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -1228,7 +1228,7 @@ tor_tls_context_new(crypto_pk_t *identity, unsigned int key_lifetime, list = "P-256:P-224"; else list = "P-256:P-224"; - int r = SSL_CTX_set1_groups_list(result->ctx, list); + int r = (int) SSL_CTX_set1_groups_list(result->ctx, list); if (r < 0) goto error; }

1 0