May 2014 - tor-commits - lists.torproject.org

[bridgedb/develop] Fix error in EmailServer due to Python2.7 buffer() interface changes.
by isis＠torproject.org 30 Apr '14

30 Apr '14

commit e8294174fa0c88f8dbe518363b20572953371f5a Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 30 20:55:46 2014 +0000 Fix error in EmailServer due to Python2.7 buffer() interface changes. * FIXES #11664. --- lib/bridgedb/EmailServer.py | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/lib/bridgedb/EmailServer.py b/lib/bridgedb/EmailServer.py index a1980d1..29787ea 100644 --- a/lib/bridgedb/EmailServer.py +++ b/lib/bridgedb/EmailServer.py @@ -31,6 +31,7 @@ from bridgedb import safelog from bridgedb import translations from bridgedb.crypto import getGPGContext from bridgedb.crypto import gpgSignMessage +from bridgedb.crypto import NEW_BUFFER_INTERFACE from bridgedb.Filters import filterBridgesByIP6 from bridgedb.Filters import filterBridgesByIP4 from bridgedb.Filters import filterBridgesByTransport @@ -314,17 +315,23 @@ def composeEmail(fromAddr, clientAddr, subject, body, msg.setdefault('Content-Type', 'text/plain; charset="utf-8"') headers = [': '.join(m) for m in msg.items()] - mail = io.BytesIO() - mail.writelines(buffer("\r\n".join(headers))) - mail.writelines(buffer("\r\n")) - mail.writelines(buffer("\r\n")) + if NEW_BUFFER_INTERFACE: + mail = io.BytesIO() + buff = buffer + else: + mail = io.StringIO() + buff = unicode + + mail.writelines(buff("\r\n".join(headers))) + mail.writelines(buff("\r\n")) + mail.writelines(buff("\r\n")) if not gpgContext: - mail.write(buffer(body)) + mail.write(buff(body)) else: signature, siglist = gpgSignMessage(gpgContext, body) if signature: - mail.writelines(buffer(signature)) + mail.writelines(buff(signature)) mail.seek(0) # Only log the email text (including all headers) if SAFE_LOGGING is

1 0

[bridgedb/develop] Merge branch 'fix/11664-email-buffer-interface' into develop
by isis＠torproject.org 30 Apr '14

30 Apr '14

commit 44b14aaa1e39829d6bfab5b20000517293ff925e Merge: b0ac1b5 e829417 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu May 1 01:04:43 2014 +0000 Merge branch 'fix/11664-email-buffer-interface' into develop lib/bridgedb/EmailServer.py | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-)

1 0

[bridgedb/master] Fix libgpgme signing error due to Python2.7 buffer() interface changes.
by isis＠torproject.org 30 Apr '14

30 Apr '14

commit 64ca16285a5dcaccf285343d754bb62898d9e9cd Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 23 05:08:10 2014 +0000 Fix libgpgme signing error due to Python2.7 buffer() interface changes. See https://mail.python.org/pipermail/python-dev/2010-October/104917.html https://docs.python.org/2/c-api/buffer.html https://github.com/SoftwareIntrospectionLab/MininGit/issues/101#issuecommen… We have to test if our Python2.7 version has the new or old builtin buffer() interface. (cherry picked from commit 3debed96a8e04894b0064e8075ffd8c1dd4ce10b) From branch: hotfix/11522-gpg-signing Backport reason: Part of the fix for #11664. Signed-off-by: Isis Lovecruft <isis(a)torproject.org> Conflicts: lib/bridgedb/crypto.py --- lib/bridgedb/crypto.py | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/crypto.py b/lib/bridgedb/crypto.py index ebab733..3b43628 100644 --- a/lib/bridgedb/crypto.py +++ b/lib/bridgedb/crypto.py @@ -49,6 +49,24 @@ from twisted.internet import ssl #: The hash digest to use for HMACs. DIGESTMOD = hashlib.sha1 +# Test to see if we have the old or new style buffer() interface. Trying +# to use an old-style buffer on Python2.7 prior to version 2.7.5 will produce: +# +# TypeError: 'buffer' does not have the buffer interface +# +#: ``True`` if we have the new-style +#: `buffer <https://docs.python.org/2/c-api/buffer.html>` interface. +NEW_BUFFER_INTERFACE = False +try: + io.BytesIO(buffer('test')) +except TypeError: + logging.warn( + "This Python version is too old! "\ + "It doesn't support new-style buffer interfaces: "\ + "https://mail.python.org/pipermail/python-dev/2010-October/104917.html") +else: + NEW_BUFFER_INTERFACE = True + class RSAKeyGenerationError(Exception): """Raised when there was an error creating an RSA keypair.""" @@ -365,8 +383,13 @@ def gpgSignMessage(gpgmeCtx, messageString, mode=None): if not mode: mode = gpgme.SIG_MODE_CLEAR - msgFile = io.StringIO(unicode(messageString)) - sigFile = io.StringIO() + if NEW_BUFFER_INTERFACE: + msgFile = io.BytesIO(buffer(messageString)) + sigFile = io.BytesIO() + else: + msgFile = io.StringIO(unicode(messageString)) + sigFile = io.StringIO() + sigList = gpgmeCtx.sign(msgFile, sigFile, mode) sigFile.seek(0) signature = sigFile.read()

1 0

[bridgedb/master] Fix error in EmailServer due to Python2.7 buffer() interface changes.
by isis＠torproject.org 30 Apr '14

30 Apr '14

commit e8294174fa0c88f8dbe518363b20572953371f5a Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 30 20:55:46 2014 +0000 Fix error in EmailServer due to Python2.7 buffer() interface changes. * FIXES #11664. --- lib/bridgedb/EmailServer.py | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/lib/bridgedb/EmailServer.py b/lib/bridgedb/EmailServer.py index a1980d1..29787ea 100644 --- a/lib/bridgedb/EmailServer.py +++ b/lib/bridgedb/EmailServer.py @@ -31,6 +31,7 @@ from bridgedb import safelog from bridgedb import translations from bridgedb.crypto import getGPGContext from bridgedb.crypto import gpgSignMessage +from bridgedb.crypto import NEW_BUFFER_INTERFACE from bridgedb.Filters import filterBridgesByIP6 from bridgedb.Filters import filterBridgesByIP4 from bridgedb.Filters import filterBridgesByTransport @@ -314,17 +315,23 @@ def composeEmail(fromAddr, clientAddr, subject, body, msg.setdefault('Content-Type', 'text/plain; charset="utf-8"') headers = [': '.join(m) for m in msg.items()] - mail = io.BytesIO() - mail.writelines(buffer("\r\n".join(headers))) - mail.writelines(buffer("\r\n")) - mail.writelines(buffer("\r\n")) + if NEW_BUFFER_INTERFACE: + mail = io.BytesIO() + buff = buffer + else: + mail = io.StringIO() + buff = unicode + + mail.writelines(buff("\r\n".join(headers))) + mail.writelines(buff("\r\n")) + mail.writelines(buff("\r\n")) if not gpgContext: - mail.write(buffer(body)) + mail.write(buff(body)) else: signature, siglist = gpgSignMessage(gpgContext, body) if signature: - mail.writelines(buffer(signature)) + mail.writelines(buff(signature)) mail.seek(0) # Only log the email text (including all headers) if SAFE_LOGGING is

1 0

[bridgedb/master] Merge branch 'fix/11664-email-buffer-interface'
by isis＠torproject.org 30 Apr '14

30 Apr '14

commit 8316a92ce1837cba385a01aa11f93dd8b394d422 Merge: b758227 e829417 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu May 1 01:03:35 2014 +0000 Merge branch 'fix/11664-email-buffer-interface' lib/bridgedb/EmailServer.py | 19 +++++++++++++------ lib/bridgedb/crypto.py | 27 +++++++++++++++++++++++++-- 2 files changed, 38 insertions(+), 8 deletions(-)

1 0

[bridgedb/develop] Add Makefile directives for building/cleaning documentation.
by isis＠torproject.org 30 Apr '14

30 Apr '14

commit 8c3465cf02cf381fc6887b7f2194dfd4ea15dfa5 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Apr 24 15:26:25 2014 +0000 Add Makefile directives for building/cleaning documentation. --- Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Makefile b/Makefile index 22a231e..6e027a7 100644 --- a/Makefile +++ b/Makefile @@ -37,6 +37,12 @@ reinstall: uninstall force-install translations: ./maint/get-completed-translations +docs: + python setup.py build_sphinx + +clean-docs: + -rm -rf build/sphinx + clean: -rm -rf build -rm -rf dist

1 0

[bridgedb/develop] Update CHANGELOG with translations updates.
by isis＠torproject.org 30 Apr '14

30 Apr '14

commit bc52087dc68e9adbdd47a16c88dc108fc59763cb Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Apr 24 15:22:31 2014 +0000 Update CHANGELOG with translations updates. --- CHANGELOG | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index f640282..23ddd1e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,14 @@ +Changes in version 0.2.1 - + * + +And includes the following general changes: + * UPDATE Italian (it) gettext file. + Thanks to Francesca Ciceri. + * ADD Welsh (cy) translations. + Thanks to huwwaters and littlegreykida. + * ADD Slovak (sk) translations. + Thanks to Michelozzo and Svistwarrior273. + Changes in version 0.2.0 - 2014-04-19 * FIXES #5232 Perform long running and blocking transactions in background threads. Primarily this moves bridge descriptor

1 0

[bridgedb/develop] Add AUTHORS file.
by isis＠torproject.org 30 Apr '14

30 Apr '14

commit 530f2b34f72d16d344cd6f1179865bc42b967dc5 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Apr 24 16:18:52 2014 +0000 Add AUTHORS file. --- AUTHORS | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 0000000..4995534 --- /dev/null +++ b/AUTHORS @@ -0,0 +1,19 @@ +Current core developers: + Isis Lovecruft <isis(a)torproject.org> 0xA3ADB67A2CDB8B35 + Matthew Finkel <sysrqb(a)torproject.org> 0x017DD169EA793BE2 + +Past core developers: + Nick Mathewson <nickm(a)torproject.org> 0x21194EBB165733EA + Aaron Gibson <aagbsn(a)torproject.org> 0x2C4B239DD876C9F6 + Christian Fromme <kaner(a)torproject.org> 0xA922CB73CC0960D0 + +Contributors: + Roger Dingledine <arma(a)torproject.org> + Karsten Loesing <karsten(a)torproject.org> + Robert Ransom <rransom.8774(a)gmail.com> + Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> + Steven Murdoch <Steven.Murdoch(a)cl.cam.ac.uk> + George Kadianakis <asn(a)torproject.org> + Kostas Jakeliunas <kostas(a)jakeliunas.com> + katmagic <the.magical.kat(a)gmail.com> + ovnicraft

1 0

[bridgedb/develop] Remove unused unittest lib/bridgedb/test/bridgedb.conf file.
by isis＠torproject.org 30 Apr '14

30 Apr '14

commit d061571b2887f73905b8cc7749a19daa11cceab5 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Apr 24 15:31:02 2014 +0000 Remove unused unittest lib/bridgedb/test/bridgedb.conf file. --- lib/bridgedb/test/bridgedb.conf | 55 --------------------------------------- 1 file changed, 55 deletions(-) diff --git a/lib/bridgedb/test/bridgedb.conf b/lib/bridgedb/test/bridgedb.conf deleted file mode 100644 index ce12096..0000000 --- a/lib/bridgedb/test/bridgedb.conf +++ /dev/null @@ -1,55 +0,0 @@ -BRIDGE_FILES = ["bridge-descriptors"] -EXTRA_INFO_FILES = ["cached-extrainfo", "cached-extrainfo.new"] -STATUS_FILE = "networkstatus-bridges" -HTTPS_CERT_FILE="cert" -HTTPS_KEY_FILE="privkey.pem" -LOGFILE = "bridgedb.log" -ASSIGNMENTS_FILE = "assignments.log" -PIDFILE = "bridgedb.pid" -DB_FILE = "bridgedist.db" -DB_LOG_FILE = "bridgedist.log" -MASTER_KEY_FILE = "secret_key" -PROXY_LIST_FILES = [] -LOGLEVEL = "DEBUG" -SAFELOGGING = True -LOGFILE_COUNT = 5 -LOGFILE_ROTATE_SIZE = 10000000 -BRIDGE_PURPOSE = "bridge" -N_IP_CLUSTERS = 4 -FORCE_PORTS = [(443, 1)] -FORCE_FLAGS = [("Stable", 1)] -HTTPS_DIST = True -HTTPS_BIND_IP = '127.0.0.1' -HTTPS_PORT = 6789 -HTTPS_N_BRIDGES_PER_ANSWER = 3 -HTTPS_INCLUDE_FINGERPRINTS = True -HTTPS_USE_IP_FROM_FORWARDED_HEADER = False -HTTP_UNENCRYPTED_BIND_IP = None -HTTP_UNENCRYPTED_PORT = None -HTTP_USE_IP_FROM_FORWARDED_HEADER = False -HTTP_N_BRIDGES_PER_ANSWER = 3 -EMAIL_DIST = True -EMAIL_FROM_ADDR = "bridges(a)torproject.org" -EMAIL_SMTP_FROM_ADDR = "bridges(a)torproject.org" -EMAIL_SMTP_HOST = "127.0.0.1" -EMAIL_SMTP_PORT = 25 -EMAIL_USERNAME = "bridges" -EMAIL_DOMAINS = ["gmail.com", "yahoo.com"] -EMAIL_DOMAIN_MAP = { "mail.google.com" : "gmail.com", - "googlemail.com" : "gmail.com"} -EMAIL_DOMAIN_RULES = { 'gmail.com' : ["ignore_dots", "dkim"], - 'yahoo.com' : ["dkim"]} -EMAIL_RESTRICT_IPS = [] -EMAIL_BIND_IP="127.0.0.1" -EMAIL_PORT=6725 -EMAIL_N_BRIDGES_PER_ANSWER=3 -EMAIL_INCLUDE_FINGERPRINTS = True -EMAIL_GPG_SIGNING_ENABLED = True -EMAIL_GPG_SIGNING_KEY = 'TESTING.subkeys.sec' -HTTPS_SHARE = 10 -EMAIL_SHARE = 10 -RESERVED_SHARE = 2 -FILE_BUCKETS = {} -RECAPTCHA_ENABLED = False -RECAPTCHA_PUB_KEY = '' -RECAPTCHA_PRIV_KEY = ''

1 0

[bridgedb/develop] Update translations: Welsh (cy), Italian (it), Slovak (sk).
by isis＠torproject.org 30 Apr '14

30 Apr '14

commit 6ba28bb31275a10b3efa97919c864fa17470cc6f Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Apr 24 15:03:46 2014 +0000 Update translations: Welsh (cy), Italian (it), Slovak (sk). * UPDATE Italian (it) gettext file. Thanks to Francesca Ciceri. * ADD Welsh (cy) translations. Thanks to huwwaters and littlegreykida. * ADD Slovak (sk) translations. Thanks to Michelozzo and Svistwarrior273. --- lib/bridgedb/i18n/cy/LC_MESSAGES/bridgedb.po | 102 ++++++++++++++++++++++++++ lib/bridgedb/i18n/it/LC_MESSAGES/bridgedb.po | 14 ++-- lib/bridgedb/i18n/sk/LC_MESSAGES/bridgedb.po | 102 ++++++++++++++++++++++++++ 3 files changed, 212 insertions(+), 6 deletions(-) diff --git a/lib/bridgedb/i18n/cy/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/cy/LC_MESSAGES/bridgedb.po new file mode 100644 index 0000000..b209bf3 --- /dev/null +++ b/lib/bridgedb/i18n/cy/LC_MESSAGES/bridgedb.po @@ -0,0 +1,102 @@ +# Translations template for BridgeDB. +# Copyright (C) 2013 ORGANIZATION +# This file is distributed under the same license as the BridgeDB project. +# +# Translators: +# Translators: +# huwwaters <huwwaters(a)gmail.com>, 2014 +# littlegreykida <theinfinitygap(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-26 08:20+0000\n" +"Last-Translator: littlegreykida <theinfinitygap(a)gmail.com>\n" +"Language-Team: Welsh (http://www.transifex.com/projects/p/torproject/language/cy/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 0.9.6\n" +"Language: cy\n" +"Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n" + +#: lib/bridgedb/templates/base.html:33 +msgid "What are bridges?" +msgstr "Beth yw pontydd?" + +#: lib/bridgedb/templates/base.html:34 +#, python-format +msgid "" +"%s Bridge relays %s are Tor relays that help you circumvent censorship." +msgstr "%s Pontydd gyfnewid %s yw'r gyfnewidiau Tor sy'n helpu chithau i osgoi sensoriaeth." + +#: lib/bridgedb/templates/base.html:39 +msgid "I need an alternative way of getting bridges!" +msgstr "Rwyf yn angen ffordd arall i cael gafael ar pontydd!" + +#: lib/bridgedb/templates/base.html:40 +#, 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 "Ffordd arall i canfod cyfeiriadau pontydd cyhoeddys yw i anfon e-bost (o %s neu gyfeiriad %s) i %s gyda'r llinell 'get bridges' ar ei ben ei hyn o fewn corff yr e-bost." + +#: lib/bridgedb/templates/base.html:48 +msgid "My bridges don't work! I need help!" +msgstr "Nid yw fy mhontydd yn gweithio! Rwyf yn angen help!" + +#: lib/bridgedb/templates/base.html:49 +#, python-format +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 "Os nad yw'ch Tor yn gweithio, dylech e-bostio %s. Ceisiwch cynnwys cymaint o gwybodaith ag y bo modd, yn cynnwys yr rhestr o pontydd rydych wedi defnyddio, enw'r pecyn a defnyddwyd, yr negeseuon a rhoddwyd allan gan Tor, ayyb." + +#: lib/bridgedb/templates/bridges.html:10 +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 "I defnyddio'r llinellau uwchben, cer i tydalen osodiadau Vidalia's Network, ac pwyswch \"Mae fy ISP yn wahardd cysylltiadau i'r rhwydwaith Tor.\" Wedyn, ychwanegwch pob gyfeiriad pont, un ar amser." + +#: lib/bridgedb/templates/bridges.html:13 +msgid "No bridges currently available" +msgstr "Nid oes pontydd ar gael" + +#: lib/bridgedb/templates/captcha.html:6 +msgid "Upgrade your browser to Firefox" +msgstr "Diweddarwch eich porwr i Firefox" + +#: lib/bridgedb/templates/captcha.html:8 +msgid "Type the two words" +msgstr "Teipiwch y ddau air" + +#: lib/bridgedb/templates/index.html:6 +msgid "Step 1" +msgstr "Cam 1" + +#: lib/bridgedb/templates/index.html:8 +#, python-format +msgid "Get %s Tor Browser Bundle %s" +msgstr "Cael gafael ar y %s Pecyn Porwr Tor %s" + +#: lib/bridgedb/templates/index.html:13 +msgid "Step 2" +msgstr "Cam 2" + +#: lib/bridgedb/templates/index.html:15 +#, python-format +msgid "Get %s bridges %s" +msgstr "Cael gafael ar %s pontydd %s" + +#: lib/bridgedb/templates/index.html:19 +msgid "Step 3" +msgstr "Cam 3" + +#: lib/bridgedb/templates/index.html:21 +#, python-format +msgid "Now %s add the bridges to Tor %s" +msgstr "Nawr %s ychwanegwch y pontydd i Tor %s" diff --git a/lib/bridgedb/i18n/it/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/it/LC_MESSAGES/bridgedb.po index 14a6ab5..923e096 100644 --- a/lib/bridgedb/i18n/it/LC_MESSAGES/bridgedb.po +++ b/lib/bridgedb/i18n/it/LC_MESSAGES/bridgedb.po @@ -3,16 +3,18 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: +# Translators: +# Francesca Ciceri <madamezou(a)zouish.org>, 2014 # ironbishop <ironbishop(a)fsfe.org>, 2011 -# Random_R <rand(a)yopmail.com>, 2013 +# Random_R, 2013 # fetidyoo <tru74368(a)yahoo.com>, 2011 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: 2013-05-05 13:00+0000\n" -"Last-Translator: Random_R <rand(a)yopmail.com>\n" +"PO-Revision-Date: 2014-04-24 12:26+0000\n" +"Last-Translator: Francesca Ciceri <madamezou(a)zouish.org>\n" "Language-Team: Italian (http://www.transifex.com/projects/p/torproject/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,7 +31,7 @@ msgstr "Cosa sono i bridge?" #, python-format msgid "" "%s Bridge relays %s are Tor relays that help you circumvent censorship." -msgstr "%s I relay bridge %s sono relay Tor che ti aiutano ad eludere le censure." +msgstr "%s I relay bridge %s sono relay Tor che ti aiutano ad eludere la censura." #: lib/bridgedb/templates/base.html:39 msgid "I need an alternative way of getting bridges!" @@ -41,7 +43,7 @@ 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 "Un altro metodo per trovare bridge pubblici è di inviare un'email (da un %s o un indirizzo %s) a %s con la sola frase 'get bridges' nel corpo dell'email." +msgstr "Un altro metodo per trovare bridge pubblici è di inviare una email (da un %s o un indirizzo %s) a %s contenente la sola frase \"get bridges\"." #: lib/bridgedb/templates/base.html:48 msgid "My bridges don't work! I need help!" @@ -53,7 +55,7 @@ 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 "Se il tuo Tor non funziona, manda un'email a %s. Cerca di fornire più informazioni possibili sul tuo problema, inclusa la lista dei bridge che hai usato, nome e versione del bundle in uso, i messaggi ricevuti da Tor, ecc." +msgstr "Se il tuo Tor non funziona, manda una email a %s. Cerca di fornire più informazioni possibili sul tuo problema, inclusa la lista dei bridge che hai usato, nome e versione del bundle in uso, i messaggi ricevuti da Tor, ecc." #: lib/bridgedb/templates/bridges.html:10 msgid "" diff --git a/lib/bridgedb/i18n/sk/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/sk/LC_MESSAGES/bridgedb.po new file mode 100644 index 0000000..e982650 --- /dev/null +++ b/lib/bridgedb/i18n/sk/LC_MESSAGES/bridgedb.po @@ -0,0 +1,102 @@ +# Translations template for BridgeDB. +# Copyright (C) 2013 ORGANIZATION +# 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 +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" +"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" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 0.9.6\n" +"Language: sk\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" + +#: lib/bridgedb/templates/base.html:33 +msgid "What are bridges?" +msgstr "Čo sú to premostenia?" + +#: lib/bridgedb/templates/base.html:34 +#, 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." + +#: lib/bridgedb/templates/base.html:39 +msgid "I need an alternative way of getting bridges!" +msgstr "Potrebujem iný spôsob ako získať premostenia!" + +#: lib/bridgedb/templates/base.html:40 +#, 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'." + +#: lib/bridgedb/templates/base.html:48 +msgid "My bridges don't work! I need help!" +msgstr "Moje premostenia nefungujú! Potrebujem pomoc!" + +#: lib/bridgedb/templates/base.html:49 +#, python-format +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ď." + +#: lib/bridgedb/templates/bridges.html:10 +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." + +#: lib/bridgedb/templates/bridges.html:13 +msgid "No bridges currently available" +msgstr "Momentálne nie sú dostupné žiadne premostenia." + +#: lib/bridgedb/templates/captcha.html:6 +msgid "Upgrade your browser to Firefox" +msgstr "Aktualizujte váš prehliadač na Firefox" + +#: lib/bridgedb/templates/captcha.html:8 +msgid "Type the two words" +msgstr "Napíšte dve slová" + +#: lib/bridgedb/templates/index.html:6 +msgid "Step 1" +msgstr "Krok 1" + +#: lib/bridgedb/templates/index.html:8 +#, python-format +msgid "Get %s Tor Browser Bundle %s" +msgstr "Získajte %s Tor Browser Bundle %s" + +#: lib/bridgedb/templates/index.html:13 +msgid "Step 2" +msgstr "Krok 2" + +#: lib/bridgedb/templates/index.html:15 +#, 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:21 +#, python-format +msgid "Now %s add the bridges to Tor %s" +msgstr "Teraz %s pridajte premostenia k Toru %s"

1 0