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

[stem/master] Using get_socks_listeners() for attachstream test
by atagar＠torproject.org 31 Dec '12

31 Dec '12

commit f87d9d75ef76b8755e5a3f78ae85002050ef8db0 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Dec 30 16:40:32 2012 -0800 Using get_socks_listeners() for attachstream test Using our shiny new get_socks_listeners() method in test_attachstream. Besides being nicer, this will work with older versions of tor. --- test/integ/control/controller.py | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index f6fd147..fb14120 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -725,11 +725,12 @@ class TestController(unittest.TestCase): if test.runner.require_control(self): return elif test.runner.require_online(self): return + circuit_id, circ_status_q = None, Queue() + def handle_streamcreated(stream): if stream.status == "NEW": - controller.attach_stream(int(stream.id), int(circuit_id)) + controller.attach_stream(stream.id, circuit_id) - circ_status_q = Queue() def handle_circ(circuit): circ_status_q.put(circuit) @@ -739,7 +740,7 @@ class TestController(unittest.TestCase): controller.add_event_listener(handle_streamcreated, stem.control.EventType.STREAM) try: - socksport = int(controller.get_conf('SocksListenAddress').rsplit(':', 1)[1]) + socksport = controller.get_socks_listeners()[0][1] circ_status = "" while circ_status != "BUILT":

1 0

[stem/master] Allow for blocking circuit build and extension
by atagar＠torproject.org 31 Dec '12

31 Dec '12

commit f716fedc97ea3cc522571ad8bd505e847379c0d7 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Dec 30 18:59:11 2012 -0800 Allow for blocking circuit build and extension Callers of new_circuit() and extend_circuit() will often (maybe usually?) want their call to block until the circuit is actually ready to be used. Unfortunately this is a little tricky for them to hack together on their own since it requires a listener (polling doesn't work reliably - after a couple of hours of hair pulling I now know that all too well). Hence doing this work for them. This includes a CircuitExtensionFailed exception so we can communicate the circuit event that reported the failure. --- stem/__init__.py | 12 +++++ stem/control.py | 102 ++++++++++++++++++++++++++----------- test/integ/control/controller.py | 21 +------- 3 files changed, 86 insertions(+), 49 deletions(-) diff --git a/stem/__init__.py b/stem/__init__.py index e17dc0f..2482299 100644 --- a/stem/__init__.py +++ b/stem/__init__.py @@ -9,6 +9,7 @@ Library for working with the tor process. |- ProtocolError - Malformed socket data. |- OperationFailed - Tor was unable to successfully complete the operation. | |- UnsatisfiableRequest - Tor was unable to satisfy a valid request. + | | +- CircuitExtensionFailed - Attempt to make or extend a circuit failed. | +- InvalidRequest - Invalid request. | +- InvalidArguments - Invalid request parameters. +- SocketError - Communication with the socket failed. @@ -421,6 +422,17 @@ class UnsatisfiableRequest(OperationFailed): Exception raised if Tor was unable to process our request. """ +class CircuitExtensionFailed(UnsatisfiableRequest): + """ + An attempt to create or extend a circuit failed. + + :var stem.response.CircuitEvent circ: response notifying us of the failure + """ + + def __init__(self, message, circ = None): + super(CircuitExtensionFailed, self).__init__(message = message) + self.circ = circ + class InvalidRequest(OperationFailed): """ Exception raised when the request was invalid or malformed. diff --git a/stem/control.py b/stem/control.py index efe1403..14d636e 100644 --- a/stem/control.py +++ b/stem/control.py @@ -140,6 +140,8 @@ import stem.util.connection import stem.util.enum import stem.version +from stem import CircStatus + from stem.util import log import stem.util.tor_tools @@ -1537,20 +1539,23 @@ class Controller(BaseController): if default == UNDEFINED: raise exc else: return default - def new_circuit(self, path = None, purpose = "general"): + def new_circuit(self, path = None, purpose = "general", await_build = False): """ Requests a new circuit. If the path isn't provided, one is automatically selected. :param list,str path: one or more relays to make a circuit through :param str purpose: "general" or "controller" + :param bool await_build: blocks until the circuit is built if **True** :returns: str of the circuit id of the newly created circuit + + :raises: :class:`stem.ControllerError` if the call fails """ - return self.extend_circuit('0', path, purpose) + return self.extend_circuit('0', path, purpose, await_build) - def extend_circuit(self, circuit_id = "0", path = None, purpose = "general"): + def extend_circuit(self, circuit_id = "0", path = None, purpose = "general", await_build = False): """ Either requests the creation of a new circuit or extends an existing one. @@ -1561,7 +1566,7 @@ class Controller(BaseController): A python interpreter session used to create circuits could look like this... :: - + >>> control.extend_circuit('0', ["718BCEA286B531757ACAFF93AE04910EA73DE617", "30BAB8EE7606CBD12F3CC269AE976E0153E7A58D", "2765D8A8C4BBA3F89585A9FFE0E8575615880BEB"]) 19 >>> control.extend_circuit('0') @@ -1574,41 +1579,76 @@ class Controller(BaseController): :param list,str path: one or more relays to make a circuit through, this is required if the circuit id is non-zero :param str purpose: "general" or "controller" + :param bool await_build: blocks until the circuit is built if **True** :returns: str of the circuit id of the created or extended circuit - :raises: :class:`stem.InvalidRequest` if one of the parameters were invalid + :raises: + :class:`stem.InvalidRequest` if one of the parameters were invalid + :class:`stem.CircuitExtensionFailed` if we were waiting for the circuit + to build but it failed + :class:`stem.ControllerError` if the call fails """ - # we might accidently get integer circuit ids - circuit_id = str(circuit_id) - - if path is None and circuit_id == '0': - path_opt_version = stem.version.Requirement.EXTENDCIRCUIT_PATH_OPTIONAL - - if not self.get_version().meets_requirements(path_opt_version): - raise stem.InvalidRequest(512, "EXTENDCIRCUIT requires the path prior to version %s" % path_opt_version) + # Attaches a temporary listener for CIRC events if we'll be waiting for it + # to build. This is icky, but we can't reliably do this via polling since + # we then can't get the failure if it can't be created. - args = [circuit_id] - if type(path) == str: path = [path] - if path: args.append(",".join(path)) - if purpose: args.append("purpose=%s" % purpose) + circ_queue, circ_listener = None, None - response = self.msg("EXTENDCIRCUIT %s" % " ".join(args)) - stem.response.convert("SINGLELINE", response) - - if response.is_ok(): - try: - extended, new_circuit = response.message.split(" ") - assert extended == "EXTENDED" - except: - raise stem.ProtocolError("EXTENDCIRCUIT response invalid:\n%s", str(response)) - elif response.code in ('512', '552'): - raise stem.InvalidRequest(response.code, response.message) - else: - raise stem.ProtocolError("EXTENDCIRCUIT returned unexpected response code: %s" % response.code) + if await_build: + circ_queue = Queue.Queue() + + def circ_listener(event): + circ_queue.put(event) + + self.add_event_listener(circ_listener, EventType.CIRC) - return new_circuit + try: + # we might accidently get integer circuit ids + circuit_id = str(circuit_id) + + if path is None and circuit_id == '0': + path_opt_version = stem.version.Requirement.EXTENDCIRCUIT_PATH_OPTIONAL + + if not self.get_version().meets_requirements(path_opt_version): + raise stem.InvalidRequest(512, "EXTENDCIRCUIT requires the path prior to version %s" % path_opt_version) + + args = [circuit_id] + if type(path) == str: path = [path] + if path: args.append(",".join(path)) + if purpose: args.append("purpose=%s" % purpose) + + response = self.msg("EXTENDCIRCUIT %s" % " ".join(args)) + stem.response.convert("SINGLELINE", response) + + if response.is_ok(): + try: + extended, new_circuit = response.message.split(" ") + assert extended == "EXTENDED" + except: + raise stem.ProtocolError("EXTENDCIRCUIT response invalid:\n%s", str(response)) + elif response.code in ('512', '552'): + raise stem.InvalidRequest(response.code, response.message) + else: + raise stem.ProtocolError("EXTENDCIRCUIT returned unexpected response code: %s" % response.code) + + if await_build: + while True: + circ = circ_queue.get() + + if circ.id == new_circuit: + if circ.status == CircStatus.BUILT: + break + elif circ.status == CircStatus.FAILED: + raise stem.CircuitExtensionFailed("Circuit failed to be created: %s" % circ.reason, circ) + elif circ.status == CircStatus.CLOSED: + raise stem.CircuitExtensionFailed("Circuit was closed prior to build", circ) + + return new_circuit + finally: + if circ_listener: + self.remove_event_listener(circ_listener) def repurpose_circuit(self, circuit_id, purpose): """ diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index fb14120..c8055ab 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -13,8 +13,6 @@ import threading import time import unittest -from Queue import Queue - import stem.connection import stem.control import stem.descriptor.reader @@ -725,31 +723,19 @@ class TestController(unittest.TestCase): if test.runner.require_control(self): return elif test.runner.require_online(self): return - circuit_id, circ_status_q = None, Queue() + circuit_id = None def handle_streamcreated(stream): - if stream.status == "NEW": + if stream.status == "NEW" and circuit_id: controller.attach_stream(stream.id, circuit_id) - def handle_circ(circuit): - circ_status_q.put(circuit) - with test.runner.get_runner().get_tor_controller() as controller: controller.set_conf("__LeaveStreamsUnattached", "1") - controller.add_event_listener(handle_circ, stem.control.EventType.CIRC) controller.add_event_listener(handle_streamcreated, stem.control.EventType.STREAM) try: + circuit_id = controller.new_circuit(await_build = True) socksport = controller.get_socks_listeners()[0][1] - circ_status = "" - - while circ_status != "BUILT": - circuit_id = controller.new_circuit() - - while not circ_status in ("BUILT", "FAILED"): - circ_event = circ_status_q.get() - if circ_event.id == circuit_id: - circ_status = circ_event.status ip = test.util.external_ip('127.0.0.1', socksport) exit_circuit = controller.get_circuit(circuit_id) @@ -758,7 +744,6 @@ class TestController(unittest.TestCase): self.assertEquals(exit_ip, ip) finally: - controller.remove_event_listener(handle_circ) controller.remove_event_listener(handle_streamcreated) controller.reset_conf("__LeaveStreamsUnattached")

1 0

[stem/master] Circuit attachment and getter defaults
by atagar＠torproject.org 31 Dec '12

31 Dec '12

commit af6fd83f74f6f39981cb32e1f871421755edfdaa Merge: dc003e8 f716fed Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Dec 30 19:05:14 2012 -0800 Circuit attachment and getter defaults Originally I set out to merge in Ravi's branch for attach_stream (https://trac.torproject.org/7152) but this turned into an odyssey of general Controller improvements. The most notable bits (besides attach_stream) are... * All of the Controller's getter methods now support a 'default' argument. https://trac.torproject.org/7832 * Added methods to get circuits. This was part of Ravi's branch though I expanded it a bit. * The new_circuit() and extend_circuit() now have an 'await_build' option to block until the circuit is ready to be used. stem/__init__.py | 12 + stem/control.py | 765 ++++++++++++++++++++++++-------------- test/integ/control/controller.py | 93 ++++-- test/util.py | 25 +- 4 files changed, 576 insertions(+), 319 deletions(-)

1 0

[stem/master] Reverting __LeaveStreamsUnattached when test fails
by atagar＠torproject.org 31 Dec '12

31 Dec '12

commit 11ef43c64479af8a9fe50b01e980d02234671977 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Dec 30 16:32:16 2012 -0800 Reverting __LeaveStreamsUnattached when test fails Putting the cleanup activity for test_attachstream() into a finally block so we still do it when the test fails. We also forgot to remove the handle_circ listener. --- test/integ/control/controller.py | 58 +++++++++++++++++++------------------ 1 files changed, 30 insertions(+), 28 deletions(-) diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index 40c0f8c..f6fd147 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -722,42 +722,44 @@ class TestController(unittest.TestCase): if count > 10: break def test_attachstream(self): - if test.runner.require_control(self): return elif test.runner.require_online(self): return - runner = test.runner.get_runner() + def handle_streamcreated(stream): + if stream.status == "NEW": + controller.attach_stream(int(stream.id), int(circuit_id)) - with runner.get_tor_controller() as controller: + circ_status_q = Queue() + def handle_circ(circuit): + circ_status_q.put(circuit) + + with test.runner.get_runner().get_tor_controller() as controller: controller.set_conf("__LeaveStreamsUnattached", "1") - socksport = int(controller.get_conf('SocksListenAddress').rsplit(':', 1)[1]) - circ_status, circ_status_q = "", Queue() - - def handle_circ(circuit): - circ_status_q.put(circuit) - - def handle_streamcreated(stream): - if stream.status == "NEW": - controller.attach_stream(int(stream.id), int(circuit_id)) - controller.add_event_listener(handle_circ, stem.control.EventType.CIRC) - while circ_status != "BUILT": - circuit_id = controller.new_circuit() - while not circ_status in ("BUILT", "FAILED"): - circ_event = circ_status_q.get() - if circ_event.id == circuit_id: - circ_status = circ_event.status - controller.add_event_listener(handle_streamcreated, stem.control.EventType.STREAM) - ip = test.util.external_ip('127.0.0.1', socksport) - exit_circuit = controller.get_circuit(circuit_id) - self.assertTrue(exit_circuit) - exit_ip = controller.get_network_status(exit_circuit.path[2][0]).address - - self.assertEquals(exit_ip, ip) - controller.remove_event_listener(handle_streamcreated) - controller.reset_conf("__LeaveStreamsUnattached") + try: + socksport = int(controller.get_conf('SocksListenAddress').rsplit(':', 1)[1]) + circ_status = "" + + while circ_status != "BUILT": + circuit_id = controller.new_circuit() + + while not circ_status in ("BUILT", "FAILED"): + circ_event = circ_status_q.get() + if circ_event.id == circuit_id: + circ_status = circ_event.status + + ip = test.util.external_ip('127.0.0.1', socksport) + exit_circuit = controller.get_circuit(circuit_id) + self.assertTrue(exit_circuit) + exit_ip = controller.get_network_status(exit_circuit.path[2][0]).address + + self.assertEquals(exit_ip, ip) + finally: + controller.remove_event_listener(handle_circ) + controller.remove_event_listener(handle_streamcreated) + controller.reset_conf("__LeaveStreamsUnattached") def test_get_circuits(self): """

1 0

[translation/vidalia_help_completed] Update translations for vidalia_help_completed
by translation＠torproject.org 31 Dec '12

31 Dec '12

commit cd0f7ae685b026e1acb04f1f12a15d6489767520 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 31 02:45:37 2012 +0000 Update translations for vidalia_help_completed --- es/services.po | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/es/services.po b/es/services.po index bcc3fe4..b282567 100644 --- a/es/services.po +++ b/es/services.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2012-12-20 23:29+0000\n" +"PO-Revision-Date: 2012-12-31 02:37+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" @@ -29,7 +29,7 @@ msgid "" "configuration. So, don't rely on it, or rather, don't blame us if something " "goes wrong. If you find bugs or have comments on this new feature, please " "let us know! We need your feedback. <a name=\"about\"/>" -msgstr "Aviso: El soporte para servicios ocultos es nuevo en Vidalia. Debe esperar encontrarse fallos, algunos de los cuales pueden corromper la configuración de sus servicios ocultos. Así que no confíe en ellos, o más bien, no nos culpe si algo va mal. Si encuentra fallos o tiene algún comentario acerca de esta nueva característica, por favor ¡háganoslo saber! Necesitamos su respuesta. <a name=\"acerca_de\"/>" +msgstr "Aviso: El soporte para servicios ocultos es nuevo en Vidalia. Debe esperar encontrarse fallos, algunos de los cuales podrían corromper la configuración de sus servicios ocultos. Así que no confíe en ellos, o más bien, no nos culpe si algo va mal. Si encuentra fallos o tiene algún comentario acerca de esta nueva característica, por favor ¡háganoslo saber! Necesitamos su respuesta. <a name=\"acercade\"/>" #. type: Content of: <html><body><h3> #: en/services.html:26 @@ -43,7 +43,7 @@ msgid "" "HTTP service, to others without revealing your IP address. The protocol to " "provide a hidden service is built on top of the same circuits that Tor uses " "for anonymous browsing and roughly has similar anonymity properties." -msgstr "Los servicios ocultos le permiten ofrecer cualquier tipo de servicio basado en TCP, ej. un servicio HTTP, sin revelar su dirección IP a otros. El protocolo para ofrecer un servicio oculto se establece sobre los mismos circuitos que Tor utiliza para la navegación anónima y tiene unas propiedades de anonimato similares." +msgstr "Los servicios ocultos le permiten ofrecer cualquier tipo de servicio basado en TCP, ej. un servicio HTTP, sin revelar su dirección IP a otros. El protocolo para ofrecer un servicio oculto se establece sobre los mismos circuitos que Tor utiliza para la navegación anónima, y tiene unas propiedades de anonimato bastante similares." #. type: Content of: <html><body><p> #: en/services.html:35 @@ -73,14 +73,14 @@ msgstr "Para proporcionar un servicio oculto debe seguir al menos dos pasos:" msgid "" "Install a web server locally (or a server for whatever service you want to " "provide, e.g. IRC) to listen for local requests." -msgstr "Instale un servidor web localmente (o un servidor de cualquier servicio que desee ofrecer, ej. IRC) que reciba peticiones locales." +msgstr "Instale un servidor web localmente (o un servidor de cualquier servicio que desee ofrecer, ej. IRC) para escuchar peticiones locales." #. type: Content of: <html><body><p><ol><li> #: en/services.html:47 msgid "" "Configure your hidden service, so that Tor relays requests coming from Tor " "users to your local server." -msgstr "Configure su servicio oculto para que Tor pase a su servidor local aquellas peticiones que procedan de los usuarios de Tor." +msgstr "Configure su servicio oculto para que Tor pase a su servidor local aquellas peticiones que procedan de usuarios de Tor." #. type: Content of: <html><body><p> #: en/services.html:50

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 31 Dec '12

31 Dec '12

commit 1677dc27ee81b109f5058dd7c932222b68908994 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 31 02:45:28 2012 +0000 Update translations for vidalia_help --- es/services.po | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/es/services.po b/es/services.po index bcc3fe4..b282567 100644 --- a/es/services.po +++ b/es/services.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2012-12-20 23:29+0000\n" +"PO-Revision-Date: 2012-12-31 02:37+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" @@ -29,7 +29,7 @@ msgid "" "configuration. So, don't rely on it, or rather, don't blame us if something " "goes wrong. If you find bugs or have comments on this new feature, please " "let us know! We need your feedback. <a name=\"about\"/>" -msgstr "Aviso: El soporte para servicios ocultos es nuevo en Vidalia. Debe esperar encontrarse fallos, algunos de los cuales pueden corromper la configuración de sus servicios ocultos. Así que no confíe en ellos, o más bien, no nos culpe si algo va mal. Si encuentra fallos o tiene algún comentario acerca de esta nueva característica, por favor ¡háganoslo saber! Necesitamos su respuesta. <a name=\"acerca_de\"/>" +msgstr "Aviso: El soporte para servicios ocultos es nuevo en Vidalia. Debe esperar encontrarse fallos, algunos de los cuales podrían corromper la configuración de sus servicios ocultos. Así que no confíe en ellos, o más bien, no nos culpe si algo va mal. Si encuentra fallos o tiene algún comentario acerca de esta nueva característica, por favor ¡háganoslo saber! Necesitamos su respuesta. <a name=\"acercade\"/>" #. type: Content of: <html><body><h3> #: en/services.html:26 @@ -43,7 +43,7 @@ msgid "" "HTTP service, to others without revealing your IP address. The protocol to " "provide a hidden service is built on top of the same circuits that Tor uses " "for anonymous browsing and roughly has similar anonymity properties." -msgstr "Los servicios ocultos le permiten ofrecer cualquier tipo de servicio basado en TCP, ej. un servicio HTTP, sin revelar su dirección IP a otros. El protocolo para ofrecer un servicio oculto se establece sobre los mismos circuitos que Tor utiliza para la navegación anónima y tiene unas propiedades de anonimato similares." +msgstr "Los servicios ocultos le permiten ofrecer cualquier tipo de servicio basado en TCP, ej. un servicio HTTP, sin revelar su dirección IP a otros. El protocolo para ofrecer un servicio oculto se establece sobre los mismos circuitos que Tor utiliza para la navegación anónima, y tiene unas propiedades de anonimato bastante similares." #. type: Content of: <html><body><p> #: en/services.html:35 @@ -73,14 +73,14 @@ msgstr "Para proporcionar un servicio oculto debe seguir al menos dos pasos:" msgid "" "Install a web server locally (or a server for whatever service you want to " "provide, e.g. IRC) to listen for local requests." -msgstr "Instale un servidor web localmente (o un servidor de cualquier servicio que desee ofrecer, ej. IRC) que reciba peticiones locales." +msgstr "Instale un servidor web localmente (o un servidor de cualquier servicio que desee ofrecer, ej. IRC) para escuchar peticiones locales." #. type: Content of: <html><body><p><ol><li> #: en/services.html:47 msgid "" "Configure your hidden service, so that Tor relays requests coming from Tor " "users to your local server." -msgstr "Configure su servicio oculto para que Tor pase a su servidor local aquellas peticiones que procedan de los usuarios de Tor." +msgstr "Configure su servicio oculto para que Tor pase a su servidor local aquellas peticiones que procedan de usuarios de Tor." #. type: Content of: <html><body><p> #: en/services.html:50

1 0

[translation/vidalia_help_completed] Update translations for vidalia_help_completed
by translation＠torproject.org 31 Dec '12

31 Dec '12

commit 89f97e3314aa235365f197682c1ab21e905337fe Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 31 02:15:41 2012 +0000 Update translations for vidalia_help_completed --- es/netview.po | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/es/netview.po b/es/netview.po index dfda7f4..7b870fa 100644 --- a/es/netview.po +++ b/es/netview.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2012-12-30 23:42+0000\n" +"PO-Revision-Date: 2012-12-31 02:13+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" @@ -153,7 +153,7 @@ msgid "" "All bandwidth values are estimates based on the minimum of either the " "maximum bandwidth sustained input or output over any ten second period in " "the past day." -msgstr "Todos los valores de ancho de banda son estimaciones basadas en el valor más bajo de entre los valores máximos de ancho de banda de entrada o de salida, sostenidos en periodos de diez segundos, durante el pasado día." +msgstr "Todos los valores de ancho de banda de entrada o salida son estimaciones basadas en el valor más bajo entre los valores máximos de ancho de banda, sostenidos en periodos de diez segundos, durante el día anterior." #. type: Content of: <html><body> #: en/netview.html:122 @@ -173,14 +173,14 @@ msgid "" "href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream" " in the list of your current circuits and streams, this panel will show you " "details about each relay through which your traffic is currently being sent." -msgstr "El panel de detalles del repetidor en el lado derecho de la pantalla, le da detalles sobre el repetidor o repetidores actualmente seleccionados en la <a href=\"#relaylist\">lista de repetidores</a>. Si ha seleccionado un circuito o secuencia (stream) de la lista de sus circuitos y secuencias actuales, este panel le mostrará los detalles acerca de cada repetidor a través cuales que se envía su tráfico." +msgstr "El panel de detalles del repetidor en el lado derecho de la pantalla, le da detalles sobre el repetidor o repetidores actualmente seleccionados en la <a href=\"#relaylist\">lista de repetidores</a>. Si ha seleccionado un circuito o secuencia de datos (stream) de la lista de sus circuitos y secuencias actuales, este panel le mostrará los detalles acerca de cada repetidor a través de los que se envía su tráfico." #. type: Content of: <html><body><p> #: en/netview.html:132 msgid "" "The fields that you may see in the panel are as follows (<i>Note</i>: not " "all of these fields will always be present):" -msgstr "Los campos que podría ver en el panel son las siguientes (<i>Nota:</i> No todos estos campos estarán presentes siempre):" +msgstr "Los campos que podría ver en el panel son como los siguientes (<i>Nota:</i> No todos estos campos estarán presentes siempre):" #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:138 @@ -224,7 +224,7 @@ msgstr "<b>Ancho de banda</b>" msgid "" "Estimated maximum amount of bandwidth that the directory relays have seen " "this relay handle recently." -msgstr "Volumen máximo estimado de ancho de banda que los repositorios de repetidores (relays) han visto manejar a este repetidor recientemente." +msgstr "Volumen máximo estimado de ancho de banda que los repositorios de repetidores han visto manejar a este repetidor recientemente." #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:160 @@ -236,7 +236,7 @@ msgstr "<b>Tiempo activado</b>" msgid "" "Length of time this relay has been available, which can be used to help " "estimate this relay's stability." -msgstr "Periodo continuo de tiempo que este repetidor ha estado disponible, que puede ayudar a estimar la estabilidad de este repetidor." +msgstr "Periodo continuo de tiempo que este repetidor ha estado disponible, que puede usarse para ayudar a estimar la estabilidad de este repetidor." #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:167

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 31 Dec '12

31 Dec '12

commit 76a946795383777696721aeed4cebdab164549a0 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 31 02:15:28 2012 +0000 Update translations for vidalia_help --- es/netview.po | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/es/netview.po b/es/netview.po index dfda7f4..7b870fa 100644 --- a/es/netview.po +++ b/es/netview.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2012-12-30 23:42+0000\n" +"PO-Revision-Date: 2012-12-31 02:13+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" @@ -153,7 +153,7 @@ msgid "" "All bandwidth values are estimates based on the minimum of either the " "maximum bandwidth sustained input or output over any ten second period in " "the past day." -msgstr "Todos los valores de ancho de banda son estimaciones basadas en el valor más bajo de entre los valores máximos de ancho de banda de entrada o de salida, sostenidos en periodos de diez segundos, durante el pasado día." +msgstr "Todos los valores de ancho de banda de entrada o salida son estimaciones basadas en el valor más bajo entre los valores máximos de ancho de banda, sostenidos en periodos de diez segundos, durante el día anterior." #. type: Content of: <html><body> #: en/netview.html:122 @@ -173,14 +173,14 @@ msgid "" "href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream" " in the list of your current circuits and streams, this panel will show you " "details about each relay through which your traffic is currently being sent." -msgstr "El panel de detalles del repetidor en el lado derecho de la pantalla, le da detalles sobre el repetidor o repetidores actualmente seleccionados en la <a href=\"#relaylist\">lista de repetidores</a>. Si ha seleccionado un circuito o secuencia (stream) de la lista de sus circuitos y secuencias actuales, este panel le mostrará los detalles acerca de cada repetidor a través cuales que se envía su tráfico." +msgstr "El panel de detalles del repetidor en el lado derecho de la pantalla, le da detalles sobre el repetidor o repetidores actualmente seleccionados en la <a href=\"#relaylist\">lista de repetidores</a>. Si ha seleccionado un circuito o secuencia de datos (stream) de la lista de sus circuitos y secuencias actuales, este panel le mostrará los detalles acerca de cada repetidor a través de los que se envía su tráfico." #. type: Content of: <html><body><p> #: en/netview.html:132 msgid "" "The fields that you may see in the panel are as follows (<i>Note</i>: not " "all of these fields will always be present):" -msgstr "Los campos que podría ver en el panel son las siguientes (<i>Nota:</i> No todos estos campos estarán presentes siempre):" +msgstr "Los campos que podría ver en el panel son como los siguientes (<i>Nota:</i> No todos estos campos estarán presentes siempre):" #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:138 @@ -224,7 +224,7 @@ msgstr "<b>Ancho de banda</b>" msgid "" "Estimated maximum amount of bandwidth that the directory relays have seen " "this relay handle recently." -msgstr "Volumen máximo estimado de ancho de banda que los repositorios de repetidores (relays) han visto manejar a este repetidor recientemente." +msgstr "Volumen máximo estimado de ancho de banda que los repositorios de repetidores han visto manejar a este repetidor recientemente." #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:160 @@ -236,7 +236,7 @@ msgstr "<b>Tiempo activado</b>" msgid "" "Length of time this relay has been available, which can be used to help " "estimate this relay's stability." -msgstr "Periodo continuo de tiempo que este repetidor ha estado disponible, que puede ayudar a estimar la estabilidad de este repetidor." +msgstr "Periodo continuo de tiempo que este repetidor ha estado disponible, que puede usarse para ayudar a estimar la estabilidad de este repetidor." #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:167

1 0

[translation/vidalia_help_completed] Update translations for vidalia_help_completed
by translation＠torproject.org 30 Dec '12

30 Dec '12

commit dd416f3201a8ec2191b36e2445c32d9874ec2074 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Dec 30 23:45:38 2012 +0000 Update translations for vidalia_help_completed --- es/netview.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/es/netview.po b/es/netview.po index 34a602e..dfda7f4 100644 --- a/es/netview.po +++ b/es/netview.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2012-12-30 20:41+0000\n" +"PO-Revision-Date: 2012-12-30 23:42+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" @@ -145,7 +145,7 @@ msgstr "El repetidor está conectado y ha mostrado un rendimiento de >=60 KB/ #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:110 msgid "The relay is online and has shown a throughput >= 400 KB/s." -msgstr "El repetidor está conectado y ha mostrado un rendimiento de>=400 KB/s." +msgstr "El repetidor está conectado y ha mostrado un rendimiento de >=400 KB/s." #. type: Content of: <html><body><p> #: en/netview.html:116

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 30 Dec '12

30 Dec '12

commit eea9326d24bed0ad58d7f8aab0c0b80000667e6f Author: Translation commit bot <translation(a)torproject.org> Date: Sun Dec 30 23:45:28 2012 +0000 Update translations for vidalia_help --- es/netview.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/es/netview.po b/es/netview.po index 34a602e..dfda7f4 100644 --- a/es/netview.po +++ b/es/netview.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2012-12-30 20:41+0000\n" +"PO-Revision-Date: 2012-12-30 23:42+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" @@ -145,7 +145,7 @@ msgstr "El repetidor está conectado y ha mostrado un rendimiento de >=60 KB/ #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:110 msgid "The relay is online and has shown a throughput >= 400 KB/s." -msgstr "El repetidor está conectado y ha mostrado un rendimiento de>=400 KB/s." +msgstr "El repetidor está conectado y ha mostrado un rendimiento de >=400 KB/s." #. type: Content of: <html><body><p> #: en/netview.html:116

1 0