January 2015 - tor-commits - lists.torproject.org

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 30 Jan '15

30 Jan '15

commit f654df49c1c71af4bc1d6fef28cf2459e6c13818 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 30 01:45:24 2015 +0000 Update translations for tails-persistence-setup --- sk/sk.po | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/sk/sk.po b/sk/sk.po index b873e46..9c760b1 100644 --- a/sk/sk.po +++ b/sk/sk.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# FooBar <thewired(a)riseup.net>, 2015 # Michal Slovák <michalslovak2(a)hotmail.com>, 2013 # Roman 'Kaktuxista' Benji <romanbeno273(a)gmail.com>, 2014 # Roman 'Kaktuxista' Benji <romanbeno273(a)gmail.com>, 2014 @@ -10,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2014-10-08 21:13+0200\n" -"PO-Revision-Date: 2014-10-09 10:19+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"POT-Creation-Date: 2015-01-13 19:22+0100\n" +"PO-Revision-Date: 2015-01-30 01:44+0000\n" +"Last-Translator: FooBar <thewired(a)riseup.net>\n" "Language-Team: Slovak (http://www.transifex.com/projects/p/torproject/language/sk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -82,7 +83,7 @@ msgstr "Záložky prehliadača" #: ../lib/Tails/Persistence/Configuration/Presets.pm:120 msgid "Bookmarks saved in the Tor Browser" -msgstr "" +msgstr "Záložky uložené v Tor Browseri" #: ../lib/Tails/Persistence/Configuration/Presets.pm:128 msgid "Printers" @@ -121,67 +122,67 @@ msgstr "Symbolicky odkazovať do $HOME každý súbor alebo priečinok nájdený msgid "Setup Tails persistent volume" msgstr "Nastaviť Tails perzistentné médium" -#: ../lib/Tails/Persistence/Setup.pm:307 ../lib/Tails/Persistence/Setup.pm:452 +#: ../lib/Tails/Persistence/Setup.pm:307 ../lib/Tails/Persistence/Setup.pm:451 msgid "Error" msgstr "Chyba" -#: ../lib/Tails/Persistence/Setup.pm:339 +#: ../lib/Tails/Persistence/Setup.pm:338 #, perl-format msgid "Device %s already has a persistent volume." msgstr "Zariadenie %s už má perzistentné médium." -#: ../lib/Tails/Persistence/Setup.pm:347 +#: ../lib/Tails/Persistence/Setup.pm:346 #, perl-format msgid "Device %s has not enough unallocated space." msgstr "Zariadenie %s nemá dostatok alokovaného miesta." -#: ../lib/Tails/Persistence/Setup.pm:355 ../lib/Tails/Persistence/Setup.pm:369 +#: ../lib/Tails/Persistence/Setup.pm:354 ../lib/Tails/Persistence/Setup.pm:368 #, perl-format msgid "Device %s has no persistent volume." msgstr "Zariadenie %s nemá žiadne perzistentné médium." -#: ../lib/Tails/Persistence/Setup.pm:361 +#: ../lib/Tails/Persistence/Setup.pm:360 msgid "" "Cannot delete the persistent volume while in use. You should restart Tails " "without persistence." msgstr "Nemožno odstrániť perzistentné médium počas doby jeho používania. Mali by ste reštartovať Tails bez dátovej trvanlivosti." -#: ../lib/Tails/Persistence/Setup.pm:380 +#: ../lib/Tails/Persistence/Setup.pm:379 msgid "Persistence volume is not unlocked." msgstr "Perzistentné médium nie je odomknuté." -#: ../lib/Tails/Persistence/Setup.pm:385 +#: ../lib/Tails/Persistence/Setup.pm:384 msgid "Persistence volume is not mounted." msgstr "Perzistentné médium nie je pripojené." -#: ../lib/Tails/Persistence/Setup.pm:390 +#: ../lib/Tails/Persistence/Setup.pm:389 msgid "Persistence volume is not readable. Permissions or ownership problems?" msgstr "Perzistentné médium nie je čitateľné. Problémy s oprávneniami alebo vlastníctvom?" -#: ../lib/Tails/Persistence/Setup.pm:395 +#: ../lib/Tails/Persistence/Setup.pm:394 msgid "Persistence volume is not writable. Maybe it was mounted read-only?" msgstr "Perzistentné médium nie je zapisovateľné. Možno bolo pripojené iba ako read-only?" -#: ../lib/Tails/Persistence/Setup.pm:404 +#: ../lib/Tails/Persistence/Setup.pm:403 #, perl-format msgid "Tails is running from non-USB / non-SDIO device %s." msgstr "Tails je spustený z non-USB / non-SDIO zariadenia %s." -#: ../lib/Tails/Persistence/Setup.pm:410 +#: ../lib/Tails/Persistence/Setup.pm:409 #, perl-format msgid "Device %s is optical." msgstr "Zariadenie %s je optické." -#: ../lib/Tails/Persistence/Setup.pm:417 +#: ../lib/Tails/Persistence/Setup.pm:416 #, perl-format msgid "Device %s was not created using Tails Installer." msgstr "Zariadenie %s nebolo vytvorené pomocou inštalátora Tails." -#: ../lib/Tails/Persistence/Setup.pm:677 +#: ../lib/Tails/Persistence/Setup.pm:676 msgid "Persistence wizard - Finished" msgstr "Sprievodca trvanlivosťou dát - Dokončený" -#: ../lib/Tails/Persistence/Setup.pm:680 +#: ../lib/Tails/Persistence/Setup.pm:679 msgid "" "Any changes you have made will only take effect after restarting Tails.\n" "\n"

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 30 Jan '15

30 Jan '15

commit 105c80bfc1cf3cc83ff9d4e951d4e261e247c7c2 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 30 01:45:07 2015 +0000 Update translations for bridgedb_completed --- sk/LC_MESSAGES/bridgedb.po | 367 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 313 insertions(+), 54 deletions(-) diff --git a/sk/LC_MESSAGES/bridgedb.po b/sk/LC_MESSAGES/bridgedb.po index e982650..34c57ac 100644 --- a/sk/LC_MESSAGES/bridgedb.po +++ b/sk/LC_MESSAGES/bridgedb.po @@ -1,18 +1,20 @@ # Translations template for BridgeDB. -# Copyright (C) 2013 ORGANIZATION +# Copyright (C) 2014 'The Tor Project, Inc.' # This file is distributed under the same license as the BridgeDB project. # # Translators: -# Translators: -# Michelozzo <michalslovak2(a)hotmail.com>, 2013 -# Svistwarrior273 <romanbeno273(a)gmail.com>, 2014 +# elo, 2014 +# FooBar <thewired(a)riseup.net>, 2015 +# Michal Slovák <michalslovak2(a)hotmail.com>, 2013 +# Roman 'Kaktuxista' Benji <romanbeno273(a)gmail.com>, 2014 +# StefanH <stefan.holent(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" -"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2013-03-27 21:41+0000\n" -"PO-Revision-Date: 2014-03-27 09:10+0000\n" -"Last-Translator: Svistwarrior273 <romanbeno273(a)gmail.com>\n" +"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" +"POT-Creation-Date: 2014-07-26 02:11+0000\n" +"PO-Revision-Date: 2015-01-30 01:41+0000\n" +"Last-Translator: FooBar <thewired(a)riseup.net>\n" "Language-Team: Slovak (http://www.transifex.com/projects/p/torproject/language/sk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,82 +23,339 @@ msgstr "" "Language: sk\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: lib/bridgedb/templates/base.html:33 +#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in +#. any string (regardless of capitalization and/or punctuation): +#. "BridgeDB" +#. "pluggable transport" +#. "pluggable transports" +#. "obfs2" +#. "obfs3" +#. "scramblesuit" +#. "fteproxy" +#. "Tor" +#. "Tor Browser" +#: lib/bridgedb/HTTPServer.py:121 +msgid "Sorry! Something went wrong with your request." +msgstr "Prepáčte! Niečo je zle s vašou požiadavkou." + +#: lib/bridgedb/strings.py:18 +msgid "[This is an automated message; please do not reply.]" +msgstr "[Toto je automatická správa; prosím, neodpovedajte.]" + +#: lib/bridgedb/strings.py:20 +msgid "Here are your bridges:" +msgstr "Tu sú vaše premostenia:" + +#: lib/bridgedb/strings.py:22 +#, python-format +msgid "" +"You have exceeded the rate limit. Please slow down! The minimum time between\n" +"emails is %s hours. All further emails during this time period will be ignored." +msgstr "Prekročili ste rate limit. Prosím spomaľte. Minimálny čas medzi emailmi je %s hodín. Všetky dalšie emaily počas tejto doby budú ignorované." + +#: lib/bridgedb/strings.py:25 +msgid "" +"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" +msgstr "PRÍKAZY: (kombinujte príkazy na zadanie viac možností naraz)" + +#. TRANSLATORS: Please DO NOT translate the word "BridgeDB". +#: lib/bridgedb/strings.py:28 +msgid "Welcome to BridgeDB!" +msgstr "Vitajte v BridgeDB!" + +#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". +#: lib/bridgedb/strings.py:30 +msgid "Currently supported transport TYPEs:" +msgstr "Práve podporované transport typy:" + +#: lib/bridgedb/strings.py:31 +#, python-format +msgid "Hey, %s!" +msgstr "Hej, %s!" + +#: lib/bridgedb/strings.py:32 +msgid "Hello, friend!" +msgstr "Ahoj, priateľ!" + +#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101 +msgid "Public Keys" +msgstr "Verejné kľúče" + +#. TRANSLATORS: This string will end up saying something like: +#. "This email was generated with rainbows, unicorns, and sparkles +#. for alice(a)example.com on Friday, 09 May, 2014 at 18:59:39." +#: lib/bridgedb/strings.py:37 +#, python-format +msgid "" +"This email was generated with rainbows, unicorns, and sparkles\n" +"for %s on %s at %s." +msgstr "Tento email bol generovaný s dúhami, jednorožcami a trblietkami pre %s dňa %s o %s." + +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#. TRANSLATORS: Please DO NOT translate "Tor". +#. TRANSLATORS: Please DO NOT translate "Tor Network". +#: lib/bridgedb/strings.py:47 +#, python-format +msgid "" +"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n" +"which can help obfuscate your connections to the Tor Network, making it more\n" +"difficult for anyone watching your internet traffic to determine that you are\n" +"using Tor.\n" +"\n" +msgstr "BridgeDB vám dokáže ponúknuť niekolko typov %spremostení s Pluggable Transports%s,\nktoré vám pomôžu maskovať vaše pripojenie na Tor Network, ktoré ztaží každému kto sleduje vaše internetové pripojenie zistiť to že používate Tor.\n" + +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#: lib/bridgedb/strings.py:54 +msgid "" +"Some bridges with IPv6 addresses are also available, though some Pluggable\n" +"Transports aren't IPv6 compatible.\n" +"\n" +msgstr "Niektoré premostenia s IPv6 adresami sú taktiež dostupné, ale niektoré Pluggable Transports kompatibilné s IPv6 niesú.\n\n" + +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring, +#. regular, or unexciting". Like vanilla ice cream. It refers to bridges +#. which do not have Pluggable Transports, and only speak the regular, +#. boring Tor protocol. Translate it as you see fit. Have fun with it. +#: lib/bridgedb/strings.py:63 +#, python-format +msgid "" +"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n" +"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n" +"help to circumvent internet censorship in many cases.\n" +"\n" +msgstr "Dodatočne, BridgeDB má dosť pôvodnych premostení %s bez žiadnych Pluggable Transports %s ktoré možno niesu až také cool, ale vo veľa prípadoch stále dokážu obísť cenzúrovanie internetu.\n\n" + +#: lib/bridgedb/strings.py:76 msgid "What are bridges?" msgstr "Čo sú to premostenia?" -#: lib/bridgedb/templates/base.html:34 +#: lib/bridgedb/strings.py:77 #, python-format -msgid "" -"%s Bridge relays %s are Tor relays that help you circumvent censorship." -msgstr "%s premostovacie relé %s sú také relé Toru, ktoré vám pomôžu obchádzať cenzúru." +msgid "%s Bridges %s are Tor relays that help you circumvent censorship." +msgstr "%s premostenia %s sú Tor relaye ktoré vám pomáhaju obísť cenzúru." -#: lib/bridgedb/templates/base.html:39 +#: lib/bridgedb/strings.py:82 msgid "I need an alternative way of getting bridges!" msgstr "Potrebujem iný spôsob ako získať premostenia!" -#: lib/bridgedb/templates/base.html:40 +#: lib/bridgedb/strings.py:83 #, python-format msgid "" -"Another way to find public bridge addresses is to send an email (from a %s " -"or a %s address) to %s with the line 'get bridges' by itself in the body of " -"the mail." -msgstr "Ďalším spôsobom zistenia verejných adries mostov je zaslať email (z adries %s alebo %s) na %s s telom správy obsahujúcim riadok 'get bridges'." +"Another way to get bridges is to send an email to %s. Please note that you must\n" +"send the email using an address from one of the following email providers:\n" +"%s, %s or %s." +msgstr "Dalším spôsobom ako získať premostenia je poslať mail na %s. \nEmail však musíte poslať pomocou adresy od jedného z týchto poskytovateľov:\n%s, %s alebo %s." -#: lib/bridgedb/templates/base.html:48 +#: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" msgstr "Moje premostenia nefungujú! Potrebujem pomoc!" -#: lib/bridgedb/templates/base.html:49 +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:92 #, python-format +msgid "If your Tor doesn't work, you should email %s." +msgstr "Ak váš Tor nefunguje, skúste napísať email %s." + +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#. TRANSLATORS: Please DO NOT translate "Tor Browser". +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:96 msgid "" -"If your Tor doesn't work, you should email %s. Try including as much info " -"about your case as you can, including the list of bridges you used, the " -"bundle filename/version you used, the messages that Tor gave out, etc." -msgstr "Ak váš Tor nefunguje, mali by ste zaslať email na adresu %s. Pokúste sa zahrnúť všetky vám známe fakty, vrátane zoznamu vami využívaných mostov, názov/verziu používanej verzie Bundle, všetky správy vypísané Torom, atď." +"Try including as much info about your case as you can, including the list of\n" +"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n" +"and any messages which Tor gave out, etc." +msgstr "Skúste napísať čo najviac informacií o vašom prípade, vrátane zoznamu premostení a Pluggable Transportov ktoré ste skúšali použiť, verzia Tor Browseru, a hlášky ktoré Tor vypísal, apod." + +#: lib/bridgedb/strings.py:103 +msgid "Here are your bridge lines:" +msgstr "Tu sú vaše premostenia:" + +#: lib/bridgedb/strings.py:104 +msgid "Get Bridges!" +msgstr "Získať premostenia!" + +#: lib/bridgedb/strings.py:108 +msgid "Please select options for bridge type:" +msgstr "Prosím vyberte si možnosti na typ premostenia:" + +#: lib/bridgedb/strings.py:109 +msgid "Do you need IPv6 addresses?" +msgstr "Potrebujete IPv6 adresy?" + +#: lib/bridgedb/strings.py:110 +#, python-format +msgid "Do you need a %s?" +msgstr "Potrebujete %s?" -#: lib/bridgedb/templates/bridges.html:10 +#: lib/bridgedb/strings.py:114 +msgid "Your browser is not displaying images properly." +msgstr "Váš prehliadač nezobrazuje obrázky správne." + +#: lib/bridgedb/strings.py:115 +msgid "Enter the characters from the image above..." +msgstr "Vložte znaky z obrázku vyššie..." + +#: lib/bridgedb/strings.py:119 +msgid "How to start using your bridges" +msgstr "Ako začať používať vaše premostenia" + +#. TRANSLATORS: Please DO NOT translate "Tor Browser". +#: lib/bridgedb/strings.py:121 +#, python-format msgid "" -"To use the above lines, go to Vidalia's Network settings page, and click " -"\"My ISP blocks connections to the Tor network\". Then add each bridge " -"address one at a time." -msgstr "Ak chcete využiť vyššie uvedené, navštívte stránku Nastavenia siete vo Vidalii a kliknite na \"Môj ISP blokuje pripojenia k sieti Toru\". Potom postupne pridávajte adresy premostení jednu za druhou." +"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n" +"Browser download page %s to start Tor Browser." +msgstr "Na zadanie premostení do Tor Browsera, riaďte sa inštrukciami na %s stánke stiahnutia Tor Browseru %s na spustenie Tor Browseru." + +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:125 +msgid "" +"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" +"the wizard until it asks:" +msgstr "Keď vyskočia 'Tor Sieťové Nastavenia', kliknite na 'Konfigurovať' a pokračujte ďalej kým sa váš insťalátor nespýta:" + +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:129 +msgid "" +"Does your Internet Service Provider (ISP) block or otherwise censor connections\n" +"to the Tor network?" +msgstr "Blokuje alebo nejak cenzuruje váš Poskytovateľ Internetu (ISP) pripojenia k Sieti Tor?" + +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:133 +msgid "" +"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n" +"paste the bridge lines into the text input box. Finally, click 'Connect', and\n" +"you should be good to go! If you experience trouble, try clicking the 'Help'\n" +"button in the 'Tor Network Settings' wizard for further assistance." +msgstr "Označte 'Áno' a potom kliknite na 'Ďalej'. Na konfiguráciu nových premostení, skopírujte premostenia do políčka na text. Potom kliknite na 'Pripojiť' a už by to malo fungovať. Ak máte nejaké problemy, kliknite na tlačidlo 'Pomoc' v 'Tor sieťových nastaveniach' pre viac informacií. " + +#: lib/bridgedb/strings.py:141 +msgid "Displays this message." +msgstr "Zobrazí túto správu." + +#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the +#. same non-Pluggable Transport bridges described above as being +#. "plain-ol'-vanilla" bridges. +#: lib/bridgedb/strings.py:145 +msgid "Request vanilla bridges." +msgstr "Požiadať o pôvodné premostenia." + +#: lib/bridgedb/strings.py:146 +msgid "Request IPv6 bridges." +msgstr "Požiadať o IPv6 premostenia." + +#. TRANSLATORS: Please DO NOT translate the word the word "TYPE". +#: lib/bridgedb/strings.py:148 +msgid "Request a Pluggable Transport by TYPE." +msgstr "Požiadať o Pluggable Transport podla typu." + +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: Please DO NOT translate "GnuPG". +#: lib/bridgedb/strings.py:151 +msgid "Get a copy of BridgeDB's public GnuPG key." +msgstr "Stiahnite si kópiu verejného klúča GNUPG pre BridgeDB." + +#: lib/bridgedb/templates/base.html:92 +msgid "Report a Bug" +msgstr "Nahlásiť chybu" + +#: lib/bridgedb/templates/base.html:94 +msgid "Source Code" +msgstr "Zdrojový kód" -#: lib/bridgedb/templates/bridges.html:13 -msgid "No bridges currently available" -msgstr "Momentálne nie sú dostupné žiadne premostenia." +#: lib/bridgedb/templates/base.html:97 +msgid "Changelog" +msgstr "Posledné zmeny" -#: lib/bridgedb/templates/captcha.html:6 -msgid "Upgrade your browser to Firefox" -msgstr "Aktualizujte váš prehliadač na Firefox" +#: lib/bridgedb/templates/base.html:99 +msgid "Contact" +msgstr "Kontakt" -#: lib/bridgedb/templates/captcha.html:8 -msgid "Type the two words" -msgstr "Napíšte dve slová" +#. TRANSLATORS: Please translate this into some silly way to say +#. "There was a problem!" in your language. For example, +#. for Italian, you might translate this into "Mama mia!", +#. or for French: "Sacrebleu!". :) +#: lib/bridgedb/templates/bridges.html:66 +msgid "Uh oh, spaghettios!" +msgstr "Do pekla!" -#: lib/bridgedb/templates/index.html:6 -msgid "Step 1" -msgstr "Krok 1" +#: lib/bridgedb/templates/bridges.html:72 +msgid "There currently aren't any bridges available..." +msgstr "Práve niesú dostupné žiadne premostenia..." -#: lib/bridgedb/templates/index.html:8 +#: lib/bridgedb/templates/bridges.html:73 #, python-format -msgid "Get %s Tor Browser Bundle %s" -msgstr "Získajte %s Tor Browser Bundle %s" +msgid "" +" Perhaps you should try %s going back %s and choosing a different bridge " +"type!" +msgstr "Možno by ste mohli skúsiť %s ísť späť %s a vybrať si iný typ premostenia." + +#: lib/bridgedb/templates/index.html:11 +#, python-format +msgid "Step %s1%s" +msgstr "Krok %s1%s" #: lib/bridgedb/templates/index.html:13 -msgid "Step 2" -msgstr "Krok 2" +#, python-format +msgid "Download %s Tor Browser %s" +msgstr "Stiahnuť %s Tor Browser %s" -#: lib/bridgedb/templates/index.html:15 +#: lib/bridgedb/templates/index.html:25 +#, python-format +msgid "Step %s2%s" +msgstr "Krok %s2%s" + +#: lib/bridgedb/templates/index.html:27 #, python-format msgid "Get %s bridges %s" msgstr "Získajte %s premostenia %s" -#: lib/bridgedb/templates/index.html:19 -msgid "Step 3" -msgstr "Krok 3" +#: lib/bridgedb/templates/index.html:36 +#, python-format +msgid "Step %s3%s" +msgstr "Krok %s3%s" + +#: lib/bridgedb/templates/index.html:38 +#, python-format +msgid "Now %s add the bridges to Tor Browser %s" +msgstr "Teraz %s pridajte premostenia do Tor Browsera %s" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. (These are used to insert HTML5 underlining tags, to mark accesskeys +#. for disabled users.) +#: lib/bridgedb/templates/options.html:38 +#, python-format +msgid "%sJ%sust give me bridges!" +msgstr "%sL%sen mi zobrazte premostenia!" + +#: lib/bridgedb/templates/options.html:52 +msgid "Advanced Options" +msgstr "Pokročilé možnosti" + +#: lib/bridgedb/templates/options.html:88 +msgid "No" +msgstr "Nie" + +#: lib/bridgedb/templates/options.html:89 +msgid "none" +msgstr "žiadne" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." +#: lib/bridgedb/templates/options.html:130 +#, python-format +msgid "%sY%ses!" +msgstr "%sÁ%sno!" -#: lib/bridgedb/templates/index.html:21 +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. TRANSLATORS: Please do NOT translate the word "bridge"! +#: lib/bridgedb/templates/options.html:154 #, python-format -msgid "Now %s add the bridges to Tor %s" -msgstr "Teraz %s pridajte premostenia k Toru %s" +msgid "%sG%set Bridges" +msgstr "%sN%sastaviť Bridges"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 30 Jan '15

30 Jan '15

commit d7ba03926752e53ba05b81e1bdf6b621c4665118 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 30 01:45:03 2015 +0000 Update translations for bridgedb --- sk/LC_MESSAGES/bridgedb.po | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/sk/LC_MESSAGES/bridgedb.po b/sk/LC_MESSAGES/bridgedb.po index 94e898e..34c57ac 100644 --- a/sk/LC_MESSAGES/bridgedb.po +++ b/sk/LC_MESSAGES/bridgedb.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2014-07-26 02:11+0000\n" -"PO-Revision-Date: 2015-01-30 01:14+0000\n" +"PO-Revision-Date: 2015-01-30 01:41+0000\n" "Last-Translator: FooBar <thewired(a)riseup.net>\n" "Language-Team: Slovak (http://www.transifex.com/projects/p/torproject/language/sk/)\n" "MIME-Version: 1.0\n" @@ -103,7 +103,7 @@ msgid "" "difficult for anyone watching your internet traffic to determine that you are\n" "using Tor.\n" "\n" -msgstr "" +msgstr "BridgeDB vám dokáže ponúknuť niekolko typov %spremostení s Pluggable Transports%s,\nktoré vám pomôžu maskovať vaše pripojenie na Tor Network, ktoré ztaží každému kto sleduje vaše internetové pripojenie zistiť to že používate Tor.\n" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #: lib/bridgedb/strings.py:54 @@ -111,7 +111,7 @@ msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" "\n" -msgstr "" +msgstr "Niektoré premostenia s IPv6 adresami sú taktiež dostupné, ale niektoré Pluggable Transports kompatibilné s IPv6 niesú.\n\n" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring, @@ -125,7 +125,7 @@ msgid "" "Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n" "help to circumvent internet censorship in many cases.\n" "\n" -msgstr "" +msgstr "Dodatočne, BridgeDB má dosť pôvodnych premostení %s bez žiadnych Pluggable Transports %s ktoré možno niesu až také cool, ale vo veľa prípadoch stále dokážu obísť cenzúrovanie internetu.\n\n" #: lib/bridgedb/strings.py:76 msgid "What are bridges?" @@ -146,7 +146,7 @@ msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" "send the email using an address from one of the following email providers:\n" "%s, %s or %s." -msgstr "" +msgstr "Dalším spôsobom ako získať premostenia je poslať mail na %s. \nEmail však musíte poslať pomocou adresy od jedného z týchto poskytovateľov:\n%s, %s alebo %s." #: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" @@ -166,7 +166,7 @@ msgid "" "Try including as much info about your case as you can, including the list of\n" "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n" "and any messages which Tor gave out, etc." -msgstr "" +msgstr "Skúste napísať čo najviac informacií o vašom prípade, vrátane zoznamu premostení a Pluggable Transportov ktoré ste skúšali použiť, verzia Tor Browseru, a hlášky ktoré Tor vypísal, apod." #: lib/bridgedb/strings.py:103 msgid "Here are your bridge lines:" @@ -174,11 +174,11 @@ msgstr "Tu sú vaše premostenia:" #: lib/bridgedb/strings.py:104 msgid "Get Bridges!" -msgstr "" +msgstr "Získať premostenia!" #: lib/bridgedb/strings.py:108 msgid "Please select options for bridge type:" -msgstr "Prosím vyberte si možnosťi na typ premostenia:" +msgstr "Prosím vyberte si možnosti na typ premostenia:" #: lib/bridgedb/strings.py:109 msgid "Do you need IPv6 addresses?" @@ -207,7 +207,7 @@ msgstr "Ako začať používať vaše premostenia" msgid "" "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n" "Browser download page %s to start Tor Browser." -msgstr "" +msgstr "Na zadanie premostení do Tor Browsera, riaďte sa inštrukciami na %s stánke stiahnutia Tor Browseru %s na spustenie Tor Browseru." #. TRANSLATORS: Please DO NOT translate "Tor". #: lib/bridgedb/strings.py:125 @@ -230,7 +230,7 @@ msgid "" "paste the bridge lines into the text input box. Finally, click 'Connect', and\n" "you should be good to go! If you experience trouble, try clicking the 'Help'\n" "button in the 'Tor Network Settings' wizard for further assistance." -msgstr "" +msgstr "Označte 'Áno' a potom kliknite na 'Ďalej'. Na konfiguráciu nových premostení, skopírujte premostenia do políčka na text. Potom kliknite na 'Pripojiť' a už by to malo fungovať. Ak máte nejaké problemy, kliknite na tlačidlo 'Pomoc' v 'Tor sieťových nastaveniach' pre viac informacií. " #: lib/bridgedb/strings.py:141 msgid "Displays this message." @@ -241,22 +241,22 @@ msgstr "Zobrazí túto správu." #. "plain-ol'-vanilla" bridges. #: lib/bridgedb/strings.py:145 msgid "Request vanilla bridges." -msgstr "" +msgstr "Požiadať o pôvodné premostenia." #: lib/bridgedb/strings.py:146 msgid "Request IPv6 bridges." -msgstr "" +msgstr "Požiadať o IPv6 premostenia." #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". #: lib/bridgedb/strings.py:148 msgid "Request a Pluggable Transport by TYPE." -msgstr "" +msgstr "Požiadať o Pluggable Transport podla typu." #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "GnuPG". #: lib/bridgedb/strings.py:151 msgid "Get a copy of BridgeDB's public GnuPG key." -msgstr "" +msgstr "Stiahnite si kópiu verejného klúča GNUPG pre BridgeDB." #: lib/bridgedb/templates/base.html:92 msgid "Report a Bug" @@ -268,7 +268,7 @@ msgstr "Zdrojový kód" #: lib/bridgedb/templates/base.html:97 msgid "Changelog" -msgstr "" +msgstr "Posledné zmeny" #: lib/bridgedb/templates/base.html:99 msgid "Contact" @@ -280,7 +280,7 @@ msgstr "Kontakt" #. or for French: "Sacrebleu!". :) #: lib/bridgedb/templates/bridges.html:66 msgid "Uh oh, spaghettios!" -msgstr "" +msgstr "Do pekla!" #: lib/bridgedb/templates/bridges.html:72 msgid "There currently aren't any bridges available..." @@ -291,7 +291,7 @@ msgstr "Práve niesú dostupné žiadne premostenia..." msgid "" " Perhaps you should try %s going back %s and choosing a different bridge " "type!" -msgstr "" +msgstr "Možno by ste mohli skúsiť %s ísť späť %s a vybrať si iný typ premostenia." #: lib/bridgedb/templates/index.html:11 #, python-format @@ -321,7 +321,7 @@ msgstr "Krok %s3%s" #: lib/bridgedb/templates/index.html:38 #, python-format msgid "Now %s add the bridges to Tor Browser %s" -msgstr "" +msgstr "Teraz %s pridajte premostenia do Tor Browsera %s" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! @@ -330,7 +330,7 @@ msgstr "" #: lib/bridgedb/templates/options.html:38 #, python-format msgid "%sJ%sust give me bridges!" -msgstr "" +msgstr "%sL%sen mi zobrazte premostenia!" #: lib/bridgedb/templates/options.html:52 msgid "Advanced Options"

1 0

[translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
by translation＠torproject.org 30 Jan '15

30 Jan '15

commit 3dec86947d2e7573070272f495176e25fd18f69f Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 30 01:15:26 2015 +0000 Update translations for liveusb-creator_completed --- sk/sk.po | 110 +++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 59 insertions(+), 51 deletions(-) diff --git a/sk/sk.po b/sk/sk.po index fd6f9fb..033d619 100644 --- a/sk/sk.po +++ b/sk/sk.po @@ -4,6 +4,7 @@ # # Translators: # elo, 2014 +# FooBar <thewired(a)riseup.net>, 2015 # K0L0M4N <koloman375(a)gmail.com>, 2012 # Michal Slovák <michalslovak2(a)hotmail.com>, 2013 # feonsu <feonsu(a)gmail.com>, 2008-2009 @@ -14,9 +15,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-01 22:11+0200\n" -"PO-Revision-Date: 2014-07-03 22:50+0000\n" -"Last-Translator: elo\n" +"POT-Creation-Date: 2015-01-13 18:07+0100\n" +"PO-Revision-Date: 2015-01-30 01:01+0000\n" +"Last-Translator: FooBar <thewired(a)riseup.net>\n" "Language-Team: Slovak (http://www.transifex.com/projects/p/torproject/language/sk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,22 +30,22 @@ msgstr "" msgid "%(distribution)s Installer" msgstr "%(distribution)s inštalátor" -#: ../liveusb/gui.py:773 +#: ../liveusb/gui.py:775 #, python-format msgid "%(filename)s selected" msgstr "%(filename)s vybraný" -#: ../liveusb/gui.py:423 +#: ../liveusb/gui.py:425 #, python-format msgid "%(size)s %(label)s" msgstr "%(size)s %(label)s" -#: ../liveusb/gui.py:429 +#: ../liveusb/gui.py:431 #, python-format msgid "%(vendor)s %(model)s (%(details)s) - %(device)s" msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s" -#: ../liveusb/creator.py:1047 +#: ../liveusb/creator.py:1059 #, python-format msgid "%s already bootable" msgstr "%s je už bootovateľné." @@ -101,12 +102,12 @@ msgid "" "persist after a reboot." msgstr "Alokovaním dodatočného miesta na vašom USB kľúči pre trvalé úložisko budete schopní ukladať dáta a robiť pernamentné úpravy vášho live operačného systému. Bez toho nebude možné uložiť dáta, ktoré by sa zachovali aj po reboote." -#: ../liveusb/creator.py:1146 ../liveusb/creator.py:1409 +#: ../liveusb/creator.py:1158 ../liveusb/creator.py:1421 #, python-format msgid "Calculating the SHA1 of %s" msgstr "Počítam SHA1 %s" -#: ../liveusb/creator.py:1357 +#: ../liveusb/creator.py:1369 msgid "Cannot find" msgstr "Nepodarilo sa nájsť" @@ -134,7 +135,7 @@ msgstr "Naklonovať\n&&\naktualizovať" msgid "Creating %sMB persistent overlay" msgstr "Vytváram %sMB trvalé úložisko" -#: ../liveusb/gui.py:551 +#: ../liveusb/gui.py:553 msgid "" "Device is not yet mounted, so we cannot determine the amount of free space." msgstr "Zariadenie zatiaľ nie je pripojené, takže nemôžeme určiť množstvo voľného miesta." @@ -144,11 +145,11 @@ msgstr "Zariadenie zatiaľ nie je pripojené, takže nemôžeme určiť množstv msgid "Download %(distribution)s" msgstr "Stiahnuť %(distribution)s" -#: ../liveusb/gui.py:747 +#: ../liveusb/gui.py:749 msgid "Download complete!" msgstr "Sťahovanie dokončené!" -#: ../liveusb/gui.py:751 +#: ../liveusb/gui.py:753 msgid "Download failed: " msgstr "Sťahovanie zlyhalo: " @@ -157,7 +158,7 @@ msgstr "Sťahovanie zlyhalo: " msgid "Downloading %s..." msgstr "Sťahujem %s..." -#: ../liveusb/creator.py:1142 +#: ../liveusb/creator.py:1154 msgid "Drive is a loopback, skipping MBR reset" msgstr "Zariadenie je slučka, preskakujem resetovanie hlavného bootovacieho záznamu" @@ -166,7 +167,7 @@ msgstr "Zariadenie je slučka, preskakujem resetovanie hlavného bootovacieho z msgid "Entering unmount_device for '%(device)s'" msgstr "Vkladá sa unmount_device pre zariadenie %(device)s'" -#: ../liveusb/creator.py:1222 +#: ../liveusb/creator.py:1234 msgid "Error probing device" msgstr "Chyba pri snímaní zariadenia" @@ -186,7 +187,7 @@ msgstr "Chyba: SHA1 kontrolný súčet Live CD je neplatný. Na preskočenie tej msgid "Extracting live image to the target device..." msgstr "Extrahuje sa live obraz na cieľové zariadenie..." -#: ../liveusb/creator.py:1090 +#: ../liveusb/creator.py:1102 #, python-format msgid "Formatting %(device)s as FAT32" msgstr "Formátujem %(device)s ako FAT32" @@ -209,7 +210,7 @@ msgstr "Ak si nezvolíte už existujúce Live ISO, bude vám stiahnuté vybraté msgid "Install Tails" msgstr "Nainštalovať Tails" -#: ../liveusb/gui.py:614 +#: ../liveusb/gui.py:616 msgid "Installation complete!" msgstr "Inštalácia dokončená!" @@ -218,11 +219,11 @@ msgstr "Inštalácia dokončená!" msgid "Installation complete! (%s)" msgstr "Inštalácia je dokončená! (%s)" -#: ../liveusb/gui.py:615 +#: ../liveusb/gui.py:617 msgid "Installation was completed. Press OK to close this program." msgstr "Inštalácia bola dokončená. Stlačením OK zatvoríte tento program." -#: ../liveusb/creator.py:947 ../liveusb/creator.py:1263 +#: ../liveusb/creator.py:959 ../liveusb/creator.py:1275 msgid "Installing bootloader..." msgstr "Inštaluje sa bootloader..." @@ -230,13 +231,13 @@ msgstr "Inštaluje sa bootloader..." msgid "LiveUSB creation failed!" msgstr "Vytvorenie LiveUSB zlyhalo!" -#: ../liveusb/creator.py:1358 +#: ../liveusb/creator.py:1370 msgid "" "Make sure to extract the entire liveusb-creator zip file before running this" " program." msgstr "Uistite sa, že rozbalíte celý liveusb-creator súbor zip pred spustením tohto programu." -#: ../liveusb/creator.py:1234 +#: ../liveusb/creator.py:1246 msgid "" "Make sure your USB key is plugged in and formatted with the FAT filesystem" msgstr "Skontrolujte, či je USB kľúč pripojený a naformátovaný na súborový systém FAT" @@ -246,7 +247,7 @@ msgstr "Skontrolujte, či je USB kľúč pripojený a naformátovaný na súboro msgid "Mount %s exists after unmounting" msgstr "Pripojenie %s existuje po odpojení" -#: ../liveusb/gui.py:557 +#: ../liveusb/gui.py:559 #, python-format msgid "No free space on device %(device)s" msgstr "Nedostatok miesta na zariadení %(device)s" @@ -256,14 +257,17 @@ msgid "No mount points found" msgstr "Neboli nájdené žiadne body pripojenia" #: ../liveusb/creator.py:401 -msgid "Not enough free space on device." -msgstr "Na zariadení nie je dostatok miesta." +#, python-format +msgid "" +"Not enough free space on device.\n" +"%dMB ISO + %dMB overlay > %dMB free space" +msgstr "Nedostatok miesta na zariadení.\n%dMB pre ISO + %dMB pre overlay > %dMB volného miesta" -#: ../liveusb/gui.py:538 +#: ../liveusb/gui.py:540 msgid "Partition is FAT16; Restricting overlay size to 2G" msgstr "Partícia je FAT16; obmedzuje veľkosť na 2 GB" -#: ../liveusb/gui.py:534 +#: ../liveusb/gui.py:536 msgid "Partition is FAT32; Restricting overlay size to 4G" msgstr "Partícia je FAT32; Veľkosť úložiska sa obmedzuje na 4G" @@ -272,7 +276,7 @@ msgstr "Partícia je FAT32; Veľkosť úložiska sa obmedzuje na 4G" msgid "Partitioning device %(device)s" msgstr "Rozdeľuje sa zariadenie %(device)s" -#: ../liveusb/gui.py:605 +#: ../liveusb/gui.py:607 msgid "Persistent Storage" msgstr "Trvalé úložisko" @@ -280,19 +284,19 @@ msgstr "Trvalé úložisko" msgid "Persistent Storage (0 MB)" msgstr "Trvalé úložisko (0 MB)" -#: ../liveusb/gui.py:667 ../liveusb/gui.py:696 +#: ../liveusb/gui.py:669 ../liveusb/gui.py:698 msgid "Please confirm your device selection" msgstr "Prosíme potvrďte váš výber zariadenia" -#: ../liveusb/gui.py:451 +#: ../liveusb/gui.py:453 msgid "Refreshing releases..." msgstr "Obnovujú sa vydania.." -#: ../liveusb/gui.py:456 +#: ../liveusb/gui.py:458 msgid "Releases updated!" msgstr "Vydania aktualizované!" -#: ../liveusb/creator.py:954 ../liveusb/creator.py:1281 +#: ../liveusb/creator.py:966 ../liveusb/creator.py:1293 #, python-format msgid "Removing %(file)s" msgstr "Odoberám %(file)s" @@ -301,12 +305,12 @@ msgstr "Odoberám %(file)s" msgid "Removing existing Live OS" msgstr "Odoberám existujúci Live OS" -#: ../liveusb/creator.py:1136 +#: ../liveusb/creator.py:1148 #, python-format msgid "Resetting Master Boot Record of %s" msgstr "Resetujem hlavný bootovací záznam %s" -#: ../liveusb/gui.py:758 +#: ../liveusb/gui.py:760 msgid "Select Live ISO" msgstr "Vyberte Live ISO" @@ -326,7 +330,7 @@ msgid "" "Source type does not support verification of ISO MD5 checksum, skipping" msgstr "Typ zdroja nepodporuje overenie ISO MD5 pomocou kontrolného súčtu, preskakujem" -#: ../liveusb/creator.py:1170 +#: ../liveusb/creator.py:1182 msgid "Synchronizing data on disk..." msgstr "Synchronizujem údaje na disk..." @@ -334,7 +338,7 @@ msgstr "Synchronizujem údaje na disk..." msgid "Target Device" msgstr "Cieľové zariadenie" -#: ../liveusb/gui.py:761 +#: ../liveusb/gui.py:763 msgid "" "The selected file is unreadable. Please fix its permissions or select " "another file." @@ -378,11 +382,15 @@ msgstr "Táto lišta bude indikovať, ako ďaleko sa momentálne nachádzate v p msgid "This is the status console, where all messages get written to." msgstr "Toto je stavová konzola, do ktorej budú vypisované všetky správy." -#: ../liveusb/creator.py:910 +#: ../liveusb/creator.py:922 msgid "Trying to continue anyway." msgstr "Snažiť sa napriek tomu pokračovať." -#: ../liveusb/creator.py:942 +#: ../liveusb/gui.py:407 +msgid "USB drive found" +msgstr "USB klúč nájdený" + +#: ../liveusb/creator.py:954 #, python-format msgid "Unable to change volume label: %(message)s" msgstr "Nie je možné zmeniť menovku zväzku: %(message)s" @@ -401,20 +409,20 @@ msgstr "Nedá sa kopírovať %(infile)s do %(outfile)s: %(message)s" msgid "Unable to find any USB drive" msgstr "Nepodarilo sa nájsť žiadne USB zariadenie" -#: ../liveusb/creator.py:1224 +#: ../liveusb/creator.py:1236 msgid "Unable to find any supported device" msgstr "Nenašlo sa žiadne podporované zariadenie" -#: ../liveusb/creator.py:1067 +#: ../liveusb/creator.py:1079 msgid "Unable to find partition" msgstr "Nedá sa nájsť partícia" -#: ../liveusb/creator.py:1304 +#: ../liveusb/creator.py:1316 msgid "" "Unable to get Win32_LogicalDisk; win32com query did not return any results" msgstr "Nedá sa získať Win32_LogicalDisk; win32com neodpovedá na požiadavku" -#: ../liveusb/gui.py:660 +#: ../liveusb/gui.py:662 msgid "Unable to mount device" msgstr "Nie je možné pripojiť zariadenie" @@ -433,12 +441,12 @@ msgstr "Nedá sa odobrať adresár z predošlého LiveOS: %(message)s" msgid "Unable to remove file from previous LiveOS: %(message)s" msgstr "Nedá sa odobrať súbor z predošlého LiveOS: %(message)s" -#: ../liveusb/creator.py:1139 +#: ../liveusb/creator.py:1151 msgid "" "Unable to reset MBR. You may not have the `syslinux` package installed." msgstr "Nedá sa resetovať hlavný bootovací záznam. Možno nemáte nainštalovaný balík `syslinux`" -#: ../liveusb/gui.py:767 +#: ../liveusb/gui.py:769 msgid "" "Unable to use the selected file. You may have better luck if you move your " "ISO to the root of your drive (ie: C:\\)" @@ -458,7 +466,7 @@ msgstr "Neznáme ISO, preskakuje sa overenie kontrolného súčtu" msgid "Unknown dbus exception while trying to mount device: %(message)s" msgstr "Neznám dbus výnimka pri pokuse pripojiť zariadenie: %(message)s" -#: ../liveusb/creator.py:779 ../liveusb/creator.py:921 +#: ../liveusb/creator.py:779 ../liveusb/creator.py:933 msgid "Unknown filesystem. Your device may need to be reformatted." msgstr "Neznámy súborový systém. Vaše zariadenie bude potrebné preformátovať." @@ -477,12 +485,12 @@ msgstr "Odpája sa '%(udi)s' na zariadení '%(device)s'" msgid "Unmounting mounted filesystems on '%(device)s'" msgstr "Odpájajú sa pripojené súborové systémy na zariadení '%(device)s'" -#: ../liveusb/creator.py:907 +#: ../liveusb/creator.py:919 #, python-format msgid "Unsupported device '%(device)s', please report a bug." msgstr "Nepodporované zariadenie '%(device)s', prosíme nahláste túto chybu." -#: ../liveusb/creator.py:784 ../liveusb/creator.py:924 +#: ../liveusb/creator.py:784 ../liveusb/creator.py:936 #, python-format msgid "Unsupported filesystem: %s" msgstr "Nepodporovaný súborový systém: %s" @@ -494,7 +502,7 @@ msgid "" "In case you are trying to upgrade a manually installed Tails system (that is, if it was installed without this installer), this option is not supported: you need to install it anew to start with, e.g. by choosing the \"Clone & Install\" action instead." msgstr "Nepodporovaný súborový systém: %s\nV prípade, že sa pokúšate aktualizovať manuálne nainštalovaný systém Tails (čiže bez pomoci tohto inštalátora), táto voľba nie je podporovaná: potrebujete si nainštalovať namiesto toho nový, napr. zvolením akcie \"Naklonovať & nainštalovať\"." -#: ../liveusb/creator.py:1237 +#: ../liveusb/creator.py:1249 #, python-format msgid "" "Unsupported filesystem: %s\n" @@ -526,11 +534,11 @@ msgstr "Overovanie kontrolného súčtu SHA1 obrazu LiveCD..." msgid "Verifying SHA256 checksum of LiveCD image..." msgstr "Overovanie kontrolného súčtu SHA256 obrazu LiveCD..." -#: ../liveusb/creator.py:918 ../liveusb/creator.py:1230 +#: ../liveusb/creator.py:930 ../liveusb/creator.py:1242 msgid "Verifying filesystem..." msgstr "Kontroluje sa súborový systém..." -#: ../liveusb/gui.py:694 +#: ../liveusb/gui.py:696 msgid "" "Warning: Creating a new persistent overlay will delete your existing one." msgstr "Upozornenie: Vytvorením nového trvalého úložiska sa vymaže to už existujúce." @@ -547,14 +555,14 @@ msgstr "Upozornenie: Tento nástroj je potrebné spustiť ako Administrátor. U msgid "Wrote to device at %(speed)d MB/sec" msgstr "Zapísané na zariadenie rýchlosťou %(speed)d Mb/s" -#: ../liveusb/gui.py:668 +#: ../liveusb/gui.py:670 #, python-format msgid "" "You are going to install Tails on the %(size)s %(vendor)s %(model)s device " "(%(device)s). All data on the selected device will be lost. Continue?" msgstr "Idete inštalovať Tails na %(size)s %(vendor)s %(model)s zariadení (%(device)s). Všetky dáta na vybranom zariadení budú stratené. Pokračovať?" -#: ../liveusb/gui.py:684 +#: ../liveusb/gui.py:686 #, python-format msgid "" "You are going to upgrade Tails on the %(parent_size)s %(vendor)s %(model)s " @@ -568,7 +576,7 @@ msgid "" "ext4 filesystem" msgstr "Používate starú verziu syslinux-extlinux, ktorá nepodporuje súborový systém ext4" -#: ../liveusb/gui.py:752 +#: ../liveusb/gui.py:754 msgid "You can try again to resume your download" msgstr "Môžete skúsiť znovu spustiť sťahovanie"

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 30 Jan '15

30 Jan '15

commit eef85d9590821d17dbf8a98f82a6dc98885722cb Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 30 01:15:22 2015 +0000 Update translations for liveusb-creator --- sk/sk.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sk/sk.po b/sk/sk.po index f9833a1..033d619 100644 --- a/sk/sk.po +++ b/sk/sk.po @@ -4,6 +4,7 @@ # # Translators: # elo, 2014 +# FooBar <thewired(a)riseup.net>, 2015 # K0L0M4N <koloman375(a)gmail.com>, 2012 # Michal Slovák <michalslovak2(a)hotmail.com>, 2013 # feonsu <feonsu(a)gmail.com>, 2008-2009 @@ -15,8 +16,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-01-13 18:07+0100\n" -"PO-Revision-Date: 2015-01-14 08:41+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2015-01-30 01:01+0000\n" +"Last-Translator: FooBar <thewired(a)riseup.net>\n" "Language-Team: Slovak (http://www.transifex.com/projects/p/torproject/language/sk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -260,7 +261,7 @@ msgstr "Neboli nájdené žiadne body pripojenia" msgid "" "Not enough free space on device.\n" "%dMB ISO + %dMB overlay > %dMB free space" -msgstr "" +msgstr "Nedostatok miesta na zariadení.\n%dMB pre ISO + %dMB pre overlay > %dMB volného miesta" #: ../liveusb/gui.py:540 msgid "Partition is FAT16; Restricting overlay size to 2G" @@ -387,7 +388,7 @@ msgstr "Snažiť sa napriek tomu pokračovať." #: ../liveusb/gui.py:407 msgid "USB drive found" -msgstr "" +msgstr "USB klúč nájdený" #: ../liveusb/creator.py:954 #, python-format

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 30 Jan '15

30 Jan '15

commit 0e6f8980cdeb45b9ed793091e0ade2b8ade5ce2c Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 30 01:15:02 2015 +0000 Update translations for bridgedb --- sk/LC_MESSAGES/bridgedb.po | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/sk/LC_MESSAGES/bridgedb.po b/sk/LC_MESSAGES/bridgedb.po index 7753cfa..94e898e 100644 --- a/sk/LC_MESSAGES/bridgedb.po +++ b/sk/LC_MESSAGES/bridgedb.po @@ -4,6 +4,7 @@ # # Translators: # elo, 2014 +# FooBar <thewired(a)riseup.net>, 2015 # Michal Slovák <michalslovak2(a)hotmail.com>, 2013 # Roman 'Kaktuxista' Benji <romanbeno273(a)gmail.com>, 2014 # StefanH <stefan.holent(a)gmail.com>, 2014 @@ -12,8 +13,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2014-07-26 02:11+0000\n" -"PO-Revision-Date: 2014-10-15 17:11+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2015-01-30 01:14+0000\n" +"Last-Translator: FooBar <thewired(a)riseup.net>\n" "Language-Team: Slovak (http://www.transifex.com/projects/p/torproject/language/sk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -43,19 +44,19 @@ msgstr "[Toto je automatická správa; prosím, neodpovedajte.]" #: lib/bridgedb/strings.py:20 msgid "Here are your bridges:" -msgstr "Tu sú vaše bridges:" +msgstr "Tu sú vaše premostenia:" #: lib/bridgedb/strings.py:22 #, python-format msgid "" "You have exceeded the rate limit. Please slow down! The minimum time between\n" "emails is %s hours. All further emails during this time period will be ignored." -msgstr "" +msgstr "Prekročili ste rate limit. Prosím spomaľte. Minimálny čas medzi emailmi je %s hodín. Všetky dalšie emaily počas tejto doby budú ignorované." #: lib/bridgedb/strings.py:25 msgid "" "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" -msgstr "" +msgstr "PRÍKAZY: (kombinujte príkazy na zadanie viac možností naraz)" #. TRANSLATORS: Please DO NOT translate the word "BridgeDB". #: lib/bridgedb/strings.py:28 @@ -65,16 +66,16 @@ msgstr "Vitajte v BridgeDB!" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". #: lib/bridgedb/strings.py:30 msgid "Currently supported transport TYPEs:" -msgstr "" +msgstr "Práve podporované transport typy:" #: lib/bridgedb/strings.py:31 #, python-format msgid "Hey, %s!" -msgstr "" +msgstr "Hej, %s!" #: lib/bridgedb/strings.py:32 msgid "Hello, friend!" -msgstr "" +msgstr "Ahoj, priateľ!" #: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101 msgid "Public Keys" @@ -88,7 +89,7 @@ msgstr "Verejné kľúče" msgid "" "This email was generated with rainbows, unicorns, and sparkles\n" "for %s on %s at %s." -msgstr "" +msgstr "Tento email bol generovaný s dúhami, jednorožcami a trblietkami pre %s dňa %s o %s." #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". @@ -133,7 +134,7 @@ msgstr "Čo sú to premostenia?" #: lib/bridgedb/strings.py:77 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." -msgstr "" +msgstr "%s premostenia %s sú Tor relaye ktoré vám pomáhaju obísť cenzúru." #: lib/bridgedb/strings.py:82 msgid "I need an alternative way of getting bridges!" @@ -155,7 +156,7 @@ msgstr "Moje premostenia nefungujú! Potrebujem pomoc!" #: lib/bridgedb/strings.py:92 #, python-format msgid "If your Tor doesn't work, you should email %s." -msgstr "" +msgstr "Ak váš Tor nefunguje, skúste napísať email %s." #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #. TRANSLATORS: Please DO NOT translate "Tor Browser". @@ -169,7 +170,7 @@ msgstr "" #: lib/bridgedb/strings.py:103 msgid "Here are your bridge lines:" -msgstr "" +msgstr "Tu sú vaše premostenia:" #: lib/bridgedb/strings.py:104 msgid "Get Bridges!" @@ -177,7 +178,7 @@ msgstr "" #: lib/bridgedb/strings.py:108 msgid "Please select options for bridge type:" -msgstr "" +msgstr "Prosím vyberte si možnosťi na typ premostenia:" #: lib/bridgedb/strings.py:109 msgid "Do you need IPv6 addresses?" @@ -213,14 +214,14 @@ msgstr "" msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" -msgstr "" +msgstr "Keď vyskočia 'Tor Sieťové Nastavenia', kliknite na 'Konfigurovať' a pokračujte ďalej kým sa váš insťalátor nespýta:" #. TRANSLATORS: Please DO NOT translate "Tor". #: lib/bridgedb/strings.py:129 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor connections\n" "to the Tor network?" -msgstr "" +msgstr "Blokuje alebo nejak cenzuruje váš Poskytovateľ Internetu (ISP) pripojenia k Sieti Tor?" #. TRANSLATORS: Please DO NOT translate "Tor". #: lib/bridgedb/strings.py:133 @@ -283,7 +284,7 @@ msgstr "" #: lib/bridgedb/templates/bridges.html:72 msgid "There currently aren't any bridges available..." -msgstr "" +msgstr "Práve niesú dostupné žiadne premostenia..." #: lib/bridgedb/templates/bridges.html:73 #, python-format

1 0

[tor/master] Support unix: prefix in port configuration
by nickm＠torproject.org 29 Jan '15

29 Jan '15

commit bf3fb55c4721cf9228c24060a15397d2b8a62ee7 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Wed Jan 28 17:55:38 2015 -0500 Support unix: prefix in port configuration It's now possible to use SocksPort or any other kind of port that can use a Unix socket like so: SocksPort unix:/foo/bar/unix.sock Fixes #14451 Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/or/config.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++----- src/or/config.h | 1 + 2 files changed, 65 insertions(+), 6 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 568baec..0bdf8d0 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -68,6 +68,9 @@ /* From main.c */ extern int quiet_level; +/* Prefix used to indicate a Unix socket in a FooPort configuration. */ +static const char *unix_socket_prefix = "unix:"; + /** A list of abbreviations and aliases to map command-line options, obsolete * option names, or alternative option names, to their current values. */ static config_abbrev_t option_abbrevs_[] = { @@ -5620,6 +5623,47 @@ warn_nonlocal_controller_ports(smartlist_t *ports, unsigned forbid) #define CL_PORT_TAKES_HOSTNAMES (1u<<5) #define CL_PORT_IS_UNIXSOCKET (1u<<6) +#ifdef HAVE_SYS_UN_H + +/** Parse the given addrport and set path_out if a Unix socket + * path is found. Return 0 on success. On error, a negative value is + * returned, -ENOENT if no Unix statement found, -EINVAL if the socket path + * is empty and -ENOSYS if AF_UNIX is not supported (see function in the + * #else statement below). */ + +int +config_parse_unix_port(const char *addrport, char **path_out) +{ + tor_assert(path_out); + tor_assert(addrport); + + if (strcmpstart(addrport, unix_socket_prefix)) { + /* Not a Unix socket path. */ + return -ENOENT; + } + + if (strlen(addrport + strlen(unix_socket_prefix)) == 0) { + /* Empty socket path, not very usable. */ + return -EINVAL; + } + + *path_out = tor_strdup(addrport + strlen(unix_socket_prefix)); + return 0; +} + +#else /* defined(HAVE_SYS_UN_H) */ + +int +config_parse_unix_port(const char *addrport, char **path_out) +{ + log_warn(LD_CONFIG, + "Port configuration %s is for an AF_UNIX socket, but we have no" + "support available on this platform", + escaped(addrport)); + return -ENOSYS; +} +#endif /* defined(HAVE_SYS_UN_H) */ + /** * Parse port configuration for a single port type. * @@ -5681,6 +5725,7 @@ parse_port_config(smartlist_t *out, const unsigned takes_hostnames = flags & CL_PORT_TAKES_HOSTNAMES; const unsigned is_unix_socket = flags & CL_PORT_IS_UNIXSOCKET; int got_zero_port=0, got_nonzero_port=0; + char *unix_socket_path = NULL; /* FooListenAddress is deprecated; let's make it work like it used to work, * though. */ @@ -5785,7 +5830,7 @@ parse_port_config(smartlist_t *out, for (; ports; ports = ports->next) { tor_addr_t addr; - int port; + int port, ret; int sessiongroup = SESSION_GROUP_UNSET; unsigned isolation = ISO_DEFAULT; int prefer_no_auth = 0; @@ -5814,8 +5859,20 @@ parse_port_config(smartlist_t *out, /* Now parse the addr/port value */ addrport = smartlist_get(elts, 0); - if (is_unix_socket) { - /* leave it as it is. */ + + /* Let's start to check if it's a Unix socket path. */ + ret = config_parse_unix_port(addrport, &unix_socket_path); + if (ret < 0 && ret != -ENOENT) { + if (ret == -EINVAL) { + log_warn(LD_CONFIG, "Empty Unix socket path."); + } + goto err; + } + + if (unix_socket_path) { + port = 1; + } else if (is_unix_socket) { + unix_socket_path = tor_strdup(addrport); if (!strcmp(addrport, "0")) port = 0; else @@ -6005,12 +6062,13 @@ parse_port_config(smartlist_t *out, } if (out && port) { - size_t namelen = is_unix_socket ? strlen(addrport) : 0; + size_t namelen = unix_socket_path ? strlen(unix_socket_path) : 0; port_cfg_t *cfg = port_cfg_new(namelen); - if (is_unix_socket) { + if (unix_socket_path) { tor_addr_make_unspec(&cfg->addr); - memcpy(cfg->unix_addr, addrport, strlen(addrport) + 1); + memcpy(cfg->unix_addr, unix_socket_path, namelen + 1); cfg->is_unix_addr = 1; + tor_free(unix_socket_path); } else { tor_addr_copy(&cfg->addr, &addr); cfg->port = port; diff --git a/src/or/config.h b/src/or/config.h index 6bd3eb5..b064f05 100644 --- a/src/or/config.h +++ b/src/or/config.h @@ -113,6 +113,7 @@ int addressmap_register_auto(const char *from, const char *to, time_t expires, addressmap_entry_source_t addrmap_source, const char **msg); +int config_parse_unix_port(const char *addrport, char **path_out); /** Represents the information stored in a torrc Bridge line. */ typedef struct bridge_line_t {

1 0

[tor/master] Add correctness assertions for hashtable iteration
by nickm＠torproject.org 29 Jan '15

29 Jan '15

commit 634434514059256235d329d9430f91fb31044fd9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 6 13:57:17 2014 -0500 Add correctness assertions for hashtable iteration This is meant to prevent memory corruption bugs from doing unspeakable infinite-loop-like things to the hashtables. Addresses ticket 11737. We should disable these if they turn out to be expensive. --- changes/ticket11737 | 4 ++++ src/ext/ht.h | 24 ++++++++++++++++++++---- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/changes/ticket11737 b/changes/ticket11737 new file mode 100644 index 0000000..5c5f9dc --- /dev/null +++ b/changes/ticket11737 @@ -0,0 +1,4 @@ + o Minor features: + - Prevent bugs from causing infinite loops in our hash-table + iteration code by adding assertions that cached hash values have + not been corrupted. Closes ticket 11737. diff --git a/src/ext/ht.h b/src/ext/ht.h index 09f5dcc..ee64e55 100644 --- a/src/ext/ht.h +++ b/src/ext/ht.h @@ -121,16 +121,24 @@ ht_string_hash(const char *s) ((void)0) #endif +#define HT_BUCKET_NUM_(head, field, elm, hashfn) \ + (HT_ELT_HASH_(elm,field,hashfn) % head->hth_table_length) + /* Helper: alias for the bucket containing 'elm'. */ #define HT_BUCKET_(head, field, elm, hashfn) \ - ((head)->hth_table[HT_ELT_HASH_(elm,field,hashfn) \ - % head->hth_table_length]) + ((head)->hth_table[HT_BUCKET_NUM_(head, field, elm, hashfn)]) #define HT_FOREACH(x, name, head) \ for ((x) = HT_START(name, head); \ (x) != NULL; \ (x) = HT_NEXT(name, head, x)) +#ifndef HT_NDEBUG +#define HT_ASSERT_(x) tor_assert(x) +#else +#define HT_ASSERT_(x) (void)0 +#endif + #define HT_PROTOTYPE(name, type, field, hashfn, eqfn) \ int name##_HT_GROW(struct name *ht, unsigned min_capacity); \ void name##_HT_CLEAR(struct name *ht); \ @@ -257,8 +265,11 @@ ht_string_hash(const char *s) { \ unsigned b = 0; \ while (b < head->hth_table_length) { \ - if (head->hth_table[b]) \ + if (head->hth_table[b]) { \ + HT_ASSERT_(b == \ + HT_BUCKET_NUM_(head,field,head->hth_table[b],hashfn)); \ return &head->hth_table[b]; \ + } \ ++b; \ } \ return NULL; \ @@ -272,13 +283,18 @@ ht_string_hash(const char *s) name##_HT_NEXT(struct name *head, struct type **elm) \ { \ if ((*elm)->field.hte_next) { \ + HT_ASSERT_(HT_BUCKET_NUM_(head,field,*elm,hashfn) == \ + HT_BUCKET_NUM_(head,field,(*elm)->field.hte_next,hashfn)); \ return &(*elm)->field.hte_next; \ } else { \ unsigned b = (HT_ELT_HASH_(*elm, field, hashfn) \ % head->hth_table_length)+1; \ while (b < head->hth_table_length) { \ - if (head->hth_table[b]) \ + if (head->hth_table[b]) { \ + HT_ASSERT_(b == \ + HT_BUCKET_NUM_(head,field,head->hth_table[b],hashfn)); \ return &head->hth_table[b]; \ + } \ ++b; \ } \ return NULL; \

1 0

[tor/master] Make hidden service use the config unix prefix
by nickm＠torproject.org 29 Jan '15

29 Jan '15

commit ebc59092bc6badaa55743d85e6095c3e2d4993ff Author: David Goulet <dgoulet(a)ev0ke.net> Date: Wed Jan 28 18:01:53 2015 -0500 Make hidden service use the config unix prefix Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/or/rendservice.c | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 8d3f041..69ea6a9 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -341,7 +341,6 @@ parse_port_config(const char *string) tor_addr_t addr; const char *addrport; rend_service_port_config_t *result = NULL; - const char *socket_prefix = "socket:"; unsigned int is_unix_addr = 0; char *socket_path = NULL; @@ -365,25 +364,19 @@ parse_port_config(const char *string) realport = virtport; tor_addr_from_ipv4h(&addr, 0x7F000001u); /* 127.0.0.1 */ } else { + int ret; + addrport = smartlist_get(sl,1); - /* If it starts with socket:, try to parse it as a socket path */ - if (!strcmpstart(addrport, socket_prefix)) { - if (strlen(addrport + strlen(socket_prefix)) > 0) { -#ifdef HAVE_SYS_UN_H - is_unix_addr = 1; - socket_path = tor_strdup(addrport + strlen(socket_prefix)); -#else - log_warn(LD_CONFIG, - "Hidden service port configuration %s is for an AF_UNIX " - "socket, but we have no support available on this platform", - escaped(addrport)); - goto err; -#endif /* defined(HAVE_SYS_UN_H) */ - } else { + ret = config_parse_unix_port(addrport, &socket_path); + if (ret < 0 && ret != ENOENT) { + if (ret == -EINVAL) { log_warn(LD_CONFIG, "Empty socket path in hidden service port configuration."); - goto err; } + goto err; + } + if (socket_path) { + is_unix_addr = 1; } else if (strchr(addrport, ':') || strchr(addrport, '.')) { /* else try it as an IP:port pair if it has a : or . in it */ if (tor_addr_port_lookup(addrport, &addr, &p)<0) {

1 0

[tor/master] Restrict unix: addresses to control and socks for now
by nickm＠torproject.org 29 Jan '15

29 Jan '15

commit 4c1a77953942f4921f8a151e01933c8f9d104e7f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 29 14:51:59 2015 -0500 Restrict unix: addresses to control and socks for now --- src/or/config.c | 6 ++++++ src/or/connection.c | 27 +++++++++++++++++++-------- src/or/connection.h | 1 + 3 files changed, 26 insertions(+), 8 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index ab1f318..05b4d14 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -5862,6 +5862,12 @@ parse_port_config(smartlist_t *out, goto err; } + if (unix_socket_path && + ! conn_listener_type_supports_af_unix(listener_type)) { + log_warn(LD_CONFIG, "%sPort does not support unix sockets", portname); + goto err; + } + if (unix_socket_path) { port = 1; } else if (is_unix_socket) { diff --git a/src/or/connection.c b/src/or/connection.c index 170d3d7..b7dfb1d 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -449,6 +449,22 @@ connection_link_connections(connection_t *conn_a, connection_t *conn_b) conn_b->linked_conn = conn_a; } +/** Return true iff the provided connection listener type supports AF_UNIX + * sockets. */ +int +conn_listener_type_supports_af_unix(int type) +{ + /* For now only control ports or SOCKS ports can be Unix domain sockets + * and listeners at the same time */ + switch (type) { + case CONN_TYPE_CONTROL_LISTENER: + case CONN_TYPE_AP_LISTENER: + return 1; + default: + return 0; + } +} + /** Deallocate memory used by conn. Deallocate its buffers if * necessary, close its socket if necessary, and mark the directory as dirty * if conn is an OR or OP connection. @@ -516,8 +532,7 @@ connection_free_(connection_t *conn) if (conn->socket_family == AF_UNIX) { /* For now only control and SOCKS ports can be Unix domain sockets * and listeners at the same time */ - tor_assert(conn->type == CONN_TYPE_CONTROL_LISTENER || - conn->type == CONN_TYPE_AP_LISTENER); + tor_assert(conn_listener_type_supports_af_unix(conn->type)); if (unlink(conn->address) < 0 && errno != ENOENT) { log_warn(LD_NET, "Could not unlink %s: %s", conn->address, @@ -1172,17 +1187,13 @@ connection_listener_new(const struct sockaddr *listensockaddr, } #ifdef HAVE_SYS_UN_H /* - * AF_UNIX generic setup stuff (this covers both CONN_TYPE_CONTROL_LISTENER - * and CONN_TYPE_AP_LISTENER cases) + * AF_UNIX generic setup stuff */ } else if (listensockaddr->sa_family == AF_UNIX) { /* We want to start reading for both AF_UNIX cases */ start_reading = 1; - /* For now only control ports or SOCKS ports can be Unix domain sockets - * and listeners at the same time */ - tor_assert(type == CONN_TYPE_CONTROL_LISTENER || - type == CONN_TYPE_AP_LISTENER); + tor_assert(conn_listener_type_supports_af_unix(type)); if (check_location_for_unix_socket(options, address, (type == CONN_TYPE_CONTROL_LISTENER) ? diff --git a/src/or/connection.h b/src/or/connection.h index 50bea51..d0a34ec 100644 --- a/src/or/connection.h +++ b/src/or/connection.h @@ -17,6 +17,7 @@ const char *conn_type_to_string(int type); const char *conn_state_to_string(int type, int state); +int conn_listener_type_supports_af_unix(int type); dir_connection_t *dir_connection_new(int socket_family); or_connection_t *or_connection_new(int type, int socket_family);

1 0