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

[ooni-probe/master] Add parallelism command line option
by art＠torproject.org 23 Dec '12

23 Dec '12

commit d484bf69ed62bbeda38b9d29f27da5ac55125e79 Author: aagbsn <aagbsn(a)extc.org> Date: Sun Dec 23 23:23:14 2012 +0000 Add parallelism command line option Aka router-melt-mode --- ooni/oonicli.py | 4 +++- ooni/runner.py | 1 + 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/ooni/oonicli.py b/ooni/oonicli.py index b06bde9..c333b27 100644 --- a/ooni/oonicli.py +++ b/ooni/oonicli.py @@ -36,7 +36,9 @@ class Options(usage.Options): ["collector", "c", None, "Address of the collector of test results. (example: http://127.0.0.1:8888)"], ["logfile", "l", None, "log file name"], - ["pcapfile", "p", None, "pcap file name"]] + ["pcapfile", "O", None, "pcap file name"], + ["parallelism", "p", "10", "input parallelism"], + ] compData = usage.Completions( extraActions=[usage.CompleteFiles( diff --git a/ooni/runner.py b/ooni/runner.py index 319f0b0..7787992 100644 --- a/ooni/runner.py +++ b/ooni/runner.py @@ -420,6 +420,7 @@ def runTestCases(test_cases, options, cmd_line_options): try: input_unit_factory = InputUnitFactory(test_inputs) + input_unit_factory.inputUnitSize = int(cmd_line_options['parallelism']) except Exception, e: log.exception(e)

1 0

[ooni-probe/master] Use handleAllFailures inside of the HTTP Test template
by art＠torproject.org 23 Dec '12

23 Dec '12

commit 7c3ff8da8321f8ac0cbed3c96e93be844689da8e Author: Arturo Filastò <art(a)fuffa.org> Date: Sun Dec 23 23:57:19 2012 +0100 Use handleAllFailures inside of the HTTP Test template --- ooni/templates/httpt.py | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ooni/templates/httpt.py b/ooni/templates/httpt.py index b350ae8..9debfa9 100644 --- a/ooni/templates/httpt.py +++ b/ooni/templates/httpt.py @@ -99,7 +99,7 @@ class HTTPTest(NetTestCase): def processInputs(self): pass - def addToReport(self, request, response=None, response_body=None, failure=None): + def addToReport(self, request, response=None, response_body=None, failure_string=None): """ Adds to the report the specified request and response. @@ -128,8 +128,8 @@ class HTTPTest(NetTestCase): 'body': response_body, 'code': response.code } - if failure: - request_response['failure'] = failureToString(failure) + if failure_string: + request_response['failure'] = failure_string self.report['requests'].append(request_response) @@ -297,9 +297,9 @@ class HTTPTest(NetTestCase): headers = TrueHeaders(request['headers']) def errback(failure, request): - failure.trap(ConnectionRefusedError, SOCKSError, DNSLookupError, TCPTimedOutError) + failure_string = handleAllFailures(failure) log.err("Error performing %s" % request) - self.addToReport(request, failure=failure) + self.addToReport(request, failure=failure_string) return d = agent.request(request['method'], request['url'], headers,

1 0

[ooni-probe/master] Refactor failure handling code in nettest
by art＠torproject.org 23 Dec '12

23 Dec '12

commit fe03d191b3158e1d5f305faa573a1aebefa8cff0 Author: Arturo Filastò <art(a)fuffa.org> Date: Sun Dec 23 23:26:01 2012 +0100 Refactor failure handling code in nettest Add function that traps all the supported failure and outputs the failure string representing it * Add support for generic timeout error --- ooni/nettest.py | 30 +++++++++++++++++++++++++----- 1 files changed, 25 insertions(+), 5 deletions(-) diff --git a/ooni/nettest.py b/ooni/nettest.py index fcc945a..062a88f 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -7,8 +7,11 @@ from twisted.trial import unittest, itrial, util from twisted.internet import defer, utils from twisted.python import usage -from twisted.internet.error import ConnectionRefusedError, DNSLookupError, TCPTimedOutError -from twisted.internet.defer import TimeoutError +from twisted.internet.error import ConnectionRefusedError, TCPTimedOutError +from twisted.internet.error import DNSLookupError +from twisted.internet.error import TimeoutError as GenericTimeoutError + +from twisted.internet.defer import TimeoutError as DeferTimeoutError from twisted.web._newclient import ResponseNeverReceived from ooni.utils import log @@ -16,6 +19,17 @@ from ooni.utils.txagentwithsocks import SOCKSError from socket import gaierror +def handleAllFailures(failure): + """ + Here we make sure to trap all the failures that are supported by the + failureToString function and we return the the string that represents the + failure. + """ + failure.trap(ConnectionRefusedError, gaierror, SOCKSError, + DNSLookupError, TCPTimedOutError, ResponseNeverReceived, + DeferTimeoutError, GenericTimeoutError) + return failureToString(failure) + def failureToString(failure): """ Given a failure instance return a string representing the kind of error @@ -54,12 +68,18 @@ def failureToString(failure): log.err("Response Never Received") string = 'response_never_received' - elif isinstance(failure.value, TimeoutError): - log.err("Deferred Timed Out Error") - string = 'deferred_timed_out_error' + elif isinstance(failure.value, DeferTimeoutError): + log.err("Deferred Timeout Error") + string = 'deferred_timeout_error' + + elif isinstance(failure.value, GenericTimeoutError): + log.err("Time Out Error") + string = 'generic_timeout_error' else: log.err("Unknown failure type: %s" % type(failure)) + string = 'unknown_failure %s' % str(failure.value) + return string class NoPostProcessor(Exception):

1 0

[ooni-probe/master] Fix bug in TCP connect test that made it not properly log errors
by art＠torproject.org 23 Dec '12

23 Dec '12

commit bcfa5d0785934d000fb78a54697281e86fd4f074 Author: Arturo Filastò <art(a)fuffa.org> Date: Sun Dec 23 23:27:36 2012 +0100 Fix bug in TCP connect test that made it not properly log errors --- nettests/blocking/tcpconnect.py | 12 +++--------- 1 files changed, 3 insertions(+), 9 deletions(-) diff --git a/nettests/blocking/tcpconnect.py b/nettests/blocking/tcpconnect.py index d0a53f8..b444c3b 100644 --- a/nettests/blocking/tcpconnect.py +++ b/nettests/blocking/tcpconnect.py @@ -3,9 +3,10 @@ from twisted.internet.protocol import Factory, Protocol from twisted.internet.endpoints import TCP4ClientEndpoint from twisted.internet.error import ConnectionRefusedError -from twisted.internet.error import TCPTimedOutError +from twisted.internet.error import TCPTimedOutError, TimeoutError from ooni import nettest +from ooni.nettest import handleAllFailures from ooni.utils import log class TCPFactory(Factory): @@ -33,14 +34,7 @@ class TCPConnectTest(nettest.NetTestCase): self.report["connection"] = 'success' def connectionFailed(failure): - failure.trap(ConnectionRefusedError, TCPTimedOutError) - log.debug("Unable to connect to %s" % self.input) - if isinstance(failure, ConnectionRefusedError): - self.report["connection"] = 'refused' - elif isinstance(failure, TCPTimedOutError): - self.report["connection"] = 'timeout' - else: - self.report["connection"] = 'failed' + self.report['connection'] = handleAllFailures(failure) from twisted.internet import reactor point = TCP4ClientEndpoint(reactor, host, int(port))

1 0

[stem/master] Fixing eronious 'missing with' warning
by atagar＠torproject.org 23 Dec '12

23 Dec '12

commit bf28436368aea5a0cad3545de9406934434a9f1a Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Dec 23 11:58:38 2012 -0800 Fixing eronious 'missing with' warning Running our tests gave a working that network.py was missing an import of the 'with' statement. This was wrong - the with statement was in its pydocs. The checker tries to be smart about what is and isn't documentation by looking for block quotes but an unusual string confused it... """ Base error for proxy issues. """ I avoid using block quotes unless things span multiple lines which is why I didn't account for this. We could fix the checker (... which isn't a bad idea) but for the moment I'm just dropping the odd block quotes since it'll probably introduce extra whitespace before and after the message in the sphinx docs. --- test/network.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/test/network.py b/test/network.py index ea15de7..a0d5ded 100644 --- a/test/network.py +++ b/test/network.py @@ -28,7 +28,7 @@ SOCKS5_CONN_BY_IPV4 = (0x05, 0x01, 0x00, 0x01) SOCKS5_CONN_BY_NAME = (0x05, 0x01, 0x00, 0x03) class ProxyError(Exception): - """ Base error for proxy issues. """ + "Base error for proxy issues." class SocksError(ProxyError): """

1 0

[translation/vidalia_alpha_completed] Update translations for vidalia_alpha_completed
by translation＠torproject.org 23 Dec '12

23 Dec '12

commit 0a325d54dc63998fd2ff1e9c295723fb08435f99 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Dec 23 17:45:27 2012 +0000 Update translations for vidalia_alpha_completed --- es/vidalia_es.po | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index 54f5cff..99ccb21 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-12-23 14:57+0000\n" +"PO-Revision-Date: 2012-12-23 17:36+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -2585,7 +2585,7 @@ msgstr "Puerto:" msgctxt "NetworkPage" msgid "Check to only connect to relays using ports allowed by your firewall" -msgstr "Marcar para conectarse sólo con repetidores que usen puertos permitidos por su firewall" +msgstr "Marcar para conectarse sólo con repetidores que usen puertos permitidos por su cortafuegos (firewall)" msgctxt "NetworkPage" msgid "My firewall only lets me connect to certain ports" @@ -2607,7 +2607,7 @@ msgctxt "NetworkPage" msgid "" "Check to encrypt directory requests and, optionally, use bridge relays to " "access the Tor network" -msgstr "Marcar para cifrar peticiones a los repositorios de repetidores y, opcionalmente, usar repetidores puente (bridges, accesos a Tor de publicitación restringida) para acceder a la red Tor" +msgstr "Marcar para cifrar peticiones a los repositorios de repetidores y, opcionalmente, usar repetidores puente (bridges, de publicitación restringida) para acceder a la red Tor" msgctxt "NetworkPage" msgid "My ISP blocks connections to the Tor network" @@ -2615,11 +2615,11 @@ msgstr "Mi proveedor de Internet (ISP) bloquea conexiones con la red Tor" msgctxt "NetworkPage" msgid "Bridge Settings" -msgstr "Configuración de repetidores puente (bridges, accesos a Tor de publicitación restringida)" +msgstr "Preferencias de bridges (repetidores puente, accesos a Tor de publicitación restringida)" msgctxt "NetworkPage" msgid "Add a Bridge:" -msgstr "Agregar un bridge: " +msgstr "Agregar un bridge:" msgctxt "NetworkPage" msgid "Remove the selected bridges from the list" @@ -2645,7 +2645,7 @@ msgctxt "NetworkPage" msgid "" "No new bridges are currently available. You can either wait a while and try " "again, or try another method of finding new bridges." -msgstr "Actualmente no hay bridges nuevos disponibles. Puede esperar un rato e intentarlo de nuevo, o probar con otro método para encontrar nuevos bridges." +msgstr "Actualmente no hay repetidores puente nuevos disponibles. Puede esperar un rato e intentarlo de nuevo, o probar con otro método para encontrar nuevos bridges." msgctxt "NetworkPage" msgid "Click Help to see other methods of finding new bridges."

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 23 Dec '12

23 Dec '12

commit 5fd617579a3c2bf3f62a768d2282237ad59f3f30 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Dec 23 17:45:25 2012 +0000 Update translations for vidalia_alpha --- es/vidalia_es.po | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index 54f5cff..99ccb21 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-12-23 14:57+0000\n" +"PO-Revision-Date: 2012-12-23 17:36+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -2585,7 +2585,7 @@ msgstr "Puerto:" msgctxt "NetworkPage" msgid "Check to only connect to relays using ports allowed by your firewall" -msgstr "Marcar para conectarse sólo con repetidores que usen puertos permitidos por su firewall" +msgstr "Marcar para conectarse sólo con repetidores que usen puertos permitidos por su cortafuegos (firewall)" msgctxt "NetworkPage" msgid "My firewall only lets me connect to certain ports" @@ -2607,7 +2607,7 @@ msgctxt "NetworkPage" msgid "" "Check to encrypt directory requests and, optionally, use bridge relays to " "access the Tor network" -msgstr "Marcar para cifrar peticiones a los repositorios de repetidores y, opcionalmente, usar repetidores puente (bridges, accesos a Tor de publicitación restringida) para acceder a la red Tor" +msgstr "Marcar para cifrar peticiones a los repositorios de repetidores y, opcionalmente, usar repetidores puente (bridges, de publicitación restringida) para acceder a la red Tor" msgctxt "NetworkPage" msgid "My ISP blocks connections to the Tor network" @@ -2615,11 +2615,11 @@ msgstr "Mi proveedor de Internet (ISP) bloquea conexiones con la red Tor" msgctxt "NetworkPage" msgid "Bridge Settings" -msgstr "Configuración de repetidores puente (bridges, accesos a Tor de publicitación restringida)" +msgstr "Preferencias de bridges (repetidores puente, accesos a Tor de publicitación restringida)" msgctxt "NetworkPage" msgid "Add a Bridge:" -msgstr "Agregar un bridge: " +msgstr "Agregar un bridge:" msgctxt "NetworkPage" msgid "Remove the selected bridges from the list" @@ -2645,7 +2645,7 @@ msgctxt "NetworkPage" msgid "" "No new bridges are currently available. You can either wait a while and try " "again, or try another method of finding new bridges." -msgstr "Actualmente no hay bridges nuevos disponibles. Puede esperar un rato e intentarlo de nuevo, o probar con otro método para encontrar nuevos bridges." +msgstr "Actualmente no hay repetidores puente nuevos disponibles. Puede esperar un rato e intentarlo de nuevo, o probar con otro método para encontrar nuevos bridges." msgctxt "NetworkPage" msgid "Click Help to see other methods of finding new bridges."

1 0

[translation/vidalia_completed] Update translations for vidalia_completed
by translation＠torproject.org 23 Dec '12

23 Dec '12

commit 23bc845a4bcb34adb7070bd48a12f73304609277 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Dec 23 17:45:22 2012 +0000 Update translations for vidalia_completed --- es/vidalia_es.po | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index e5a998a..7bf941e 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:52+0000\n" -"PO-Revision-Date: 2012-12-23 14:57+0000\n" +"PO-Revision-Date: 2012-12-23 17:35+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -2602,7 +2602,7 @@ msgstr "Puerto:" msgctxt "NetworkPage" msgid "Check to only connect to relays using ports allowed by your firewall" -msgstr "Marcar para conectarse sólo con repetidores que usen puertos permitidos por su firewall" +msgstr "Marcar para conectarse sólo con repetidores que usen puertos permitidos por su cortafuegos (firewall)" msgctxt "NetworkPage" msgid "My firewall only lets me connect to certain ports" @@ -2614,7 +2614,7 @@ msgstr "Configuración para el cortafuegos (firewall)" msgctxt "NetworkPage" msgid "Allowed Ports:" -msgstr "Puertos Permitidos:" +msgstr "Puertos permitidos por el firewall:" msgctxt "NetworkPage" msgid "80, 443" @@ -2624,45 +2624,45 @@ msgctxt "NetworkPage" msgid "" "Check to encrypt directory requests and, optionally, use bridge relays to " "access the Tor network" -msgstr "Active para peticiones de directorios encriptadas y opcionalmente, usar puentes repetidores para acceder a la red Tor" +msgstr "Marcar para cifrar peticiones a los repositorios de repetidores y, opcionalmente, usar repetidores puente (bridges, de publicitación restringida) para acceder a la red Tor" msgctxt "NetworkPage" msgid "My ISP blocks connections to the Tor network" -msgstr "Mi ISP bloquea conexiones a la red Tor" +msgstr "Mi proveedor de Internet (ISP) bloquea conexiones con la red Tor" msgctxt "NetworkPage" msgid "Bridge Settings" -msgstr "Configuración de Puentes" +msgstr "Preferencias de bridges (repetidores puente, accesos a Tor de publicitación restringida)" msgctxt "NetworkPage" msgid "Add a Bridge:" -msgstr "Agregar un puente:" +msgstr "Agregar un bridge:" msgctxt "NetworkPage" msgid "Remove the selected bridges from the list" -msgstr "Quitar de la lista los puentes seleccionados" +msgstr "Quitar de la lista los bridges seleccionados" msgctxt "NetworkPage" msgid "Copy the selected bridges to the clipboard" -msgstr "Copiar al portapapeles los puentes seleccionados" +msgstr "Copiar al portapapeles los bridges seleccionados" msgctxt "NetworkPage" msgid "Find Bridges Now" -msgstr "Buscar puentes ahora" +msgstr "Buscar bridges ahora" msgctxt "NetworkPage" msgid "<a href=\"bridges.finding\">How else can I find bridges?</a>" -msgstr "<a href=\"bridges.finding\">¿De qué otra forma puedo buscar puentes?</a>" +msgstr "<a href=\"bridges.finding\">¿De qué otra forma puedo buscar bridges?</a>" msgctxt "NetworkPage" msgid "<a href=\"bridges.finding\">How can I find bridges?</a>" -msgstr "<a href=\"bridges.finding\">¿Cómo puedo buscar puentes?</a>" +msgstr "<a href=\"bridges.finding\">¿Cómo puedo buscar bridges?</a>" msgctxt "NetworkPage" msgid "" "No new bridges are currently available. You can either wait a while and try " "again, or try another method of finding new bridges." -msgstr "Actualmente no hay nuevos puentes disponibles. Puede esperar un rato e intentar de nuevo o probar con otro método para encontrar nuevos puentes." +msgstr "Actualmente no hay repetidores puente nuevos disponibles. Puede esperar un rato e intentarlo de nuevo, o probar con otro método para encontrar nuevos bridges." msgctxt "NetworkPage" msgid "Click Help to see other methods of finding new bridges." @@ -2706,7 +2706,7 @@ msgstr "rechazar" msgctxt "RouterDescriptor" msgid "Online" -msgstr "En Línea" +msgstr "Conectado" msgctxt "RouterDescriptor" msgid "Hibernating" @@ -2714,7 +2714,7 @@ msgstr "Hibernando" msgctxt "RouterDescriptor" msgid "Offline" -msgstr "Fuera de Línea" +msgstr "Desconectado" msgctxt "RouterDescriptorView" msgid "Location:"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 23 Dec '12

23 Dec '12

commit 87d371354aa61b000d5c53cc5e2c82ef4855f3dc Author: Translation commit bot <translation(a)torproject.org> Date: Sun Dec 23 17:45:15 2012 +0000 Update translations for vidalia --- es/vidalia_es.po | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index e5a998a..7bf941e 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:52+0000\n" -"PO-Revision-Date: 2012-12-23 14:57+0000\n" +"PO-Revision-Date: 2012-12-23 17:35+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -2602,7 +2602,7 @@ msgstr "Puerto:" msgctxt "NetworkPage" msgid "Check to only connect to relays using ports allowed by your firewall" -msgstr "Marcar para conectarse sólo con repetidores que usen puertos permitidos por su firewall" +msgstr "Marcar para conectarse sólo con repetidores que usen puertos permitidos por su cortafuegos (firewall)" msgctxt "NetworkPage" msgid "My firewall only lets me connect to certain ports" @@ -2614,7 +2614,7 @@ msgstr "Configuración para el cortafuegos (firewall)" msgctxt "NetworkPage" msgid "Allowed Ports:" -msgstr "Puertos Permitidos:" +msgstr "Puertos permitidos por el firewall:" msgctxt "NetworkPage" msgid "80, 443" @@ -2624,45 +2624,45 @@ msgctxt "NetworkPage" msgid "" "Check to encrypt directory requests and, optionally, use bridge relays to " "access the Tor network" -msgstr "Active para peticiones de directorios encriptadas y opcionalmente, usar puentes repetidores para acceder a la red Tor" +msgstr "Marcar para cifrar peticiones a los repositorios de repetidores y, opcionalmente, usar repetidores puente (bridges, de publicitación restringida) para acceder a la red Tor" msgctxt "NetworkPage" msgid "My ISP blocks connections to the Tor network" -msgstr "Mi ISP bloquea conexiones a la red Tor" +msgstr "Mi proveedor de Internet (ISP) bloquea conexiones con la red Tor" msgctxt "NetworkPage" msgid "Bridge Settings" -msgstr "Configuración de Puentes" +msgstr "Preferencias de bridges (repetidores puente, accesos a Tor de publicitación restringida)" msgctxt "NetworkPage" msgid "Add a Bridge:" -msgstr "Agregar un puente:" +msgstr "Agregar un bridge:" msgctxt "NetworkPage" msgid "Remove the selected bridges from the list" -msgstr "Quitar de la lista los puentes seleccionados" +msgstr "Quitar de la lista los bridges seleccionados" msgctxt "NetworkPage" msgid "Copy the selected bridges to the clipboard" -msgstr "Copiar al portapapeles los puentes seleccionados" +msgstr "Copiar al portapapeles los bridges seleccionados" msgctxt "NetworkPage" msgid "Find Bridges Now" -msgstr "Buscar puentes ahora" +msgstr "Buscar bridges ahora" msgctxt "NetworkPage" msgid "<a href=\"bridges.finding\">How else can I find bridges?</a>" -msgstr "<a href=\"bridges.finding\">¿De qué otra forma puedo buscar puentes?</a>" +msgstr "<a href=\"bridges.finding\">¿De qué otra forma puedo buscar bridges?</a>" msgctxt "NetworkPage" msgid "<a href=\"bridges.finding\">How can I find bridges?</a>" -msgstr "<a href=\"bridges.finding\">¿Cómo puedo buscar puentes?</a>" +msgstr "<a href=\"bridges.finding\">¿Cómo puedo buscar bridges?</a>" msgctxt "NetworkPage" msgid "" "No new bridges are currently available. You can either wait a while and try " "again, or try another method of finding new bridges." -msgstr "Actualmente no hay nuevos puentes disponibles. Puede esperar un rato e intentar de nuevo o probar con otro método para encontrar nuevos puentes." +msgstr "Actualmente no hay repetidores puente nuevos disponibles. Puede esperar un rato e intentarlo de nuevo, o probar con otro método para encontrar nuevos bridges." msgctxt "NetworkPage" msgid "Click Help to see other methods of finding new bridges." @@ -2706,7 +2706,7 @@ msgstr "rechazar" msgctxt "RouterDescriptor" msgid "Online" -msgstr "En Línea" +msgstr "Conectado" msgctxt "RouterDescriptor" msgid "Hibernating" @@ -2714,7 +2714,7 @@ msgstr "Hibernando" msgctxt "RouterDescriptor" msgid "Offline" -msgstr "Fuera de Línea" +msgstr "Desconectado" msgctxt "RouterDescriptorView" msgid "Location:"

1 0

[translation/vidalia_alpha_completed] Update translations for vidalia_alpha_completed
by translation＠torproject.org 23 Dec '12

23 Dec '12

commit e0c5d730e24085edc975a4bbf4165eb5b00fc2bf Author: Translation commit bot <translation(a)torproject.org> Date: Sun Dec 23 15:15:24 2012 +0000 Update translations for vidalia_alpha_completed --- es/vidalia_es.po | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index 65193c1..54f5cff 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-12-23 14:44+0000\n" +"PO-Revision-Date: 2012-12-23 14:57+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -2553,7 +2553,7 @@ msgctxt "NetworkPage" msgid "" "You must specify one or more ports to which your firewall allows you to " "connect." -msgstr "Debe especificar uno o más puertos a los que su cortafuegos (firewall) le permita conectarse." +msgstr "Debe especificar uno o más puertos a los que su firewall le permita conectarse." msgctxt "NetworkPage" msgid "'%1' is not a valid port number." @@ -2561,7 +2561,7 @@ msgstr "'%1' no es un número de puerto válido." msgctxt "NetworkPage" msgid "Check if your local network requires a proxy to access the Internet" -msgstr "Marcar si su red local requiere de un proxy para acceder a Internet" +msgstr "Marcar si su red local requiere acceder a Internet a través de proxy" msgctxt "NetworkPage" msgid "I use a proxy to access the Internet" @@ -2573,15 +2573,15 @@ msgstr "Configuración para proxy" msgctxt "NetworkPage" msgid "Username:" -msgstr "Nombre de usuario: " +msgstr "Nombre de usuario:" msgctxt "NetworkPage" msgid "Password:" -msgstr "Contraseña: " +msgstr "Contraseña:" msgctxt "NetworkPage" msgid "Port:" -msgstr "Puerto: " +msgstr "Puerto:" msgctxt "NetworkPage" msgid "Check to only connect to relays using ports allowed by your firewall" @@ -2589,7 +2589,7 @@ msgstr "Marcar para conectarse sólo con repetidores que usen puertos permitidos msgctxt "NetworkPage" msgid "My firewall only lets me connect to certain ports" -msgstr "Mi cortafuegos (firewall) sólo me permite conectarme a ciertos puertos" +msgstr "Mi firewall sólo me permite conectarme a ciertos puertos" msgctxt "NetworkPage" msgid "Firewall Settings"

1 0