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

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

23 Dec '12

commit 0cdbf220d7fa46a04bb36d574a71d30726c09914 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Dec 23 00:15:26 2012 +0000 Update translations for vidalia_alpha_completed --- es/vidalia_es.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index 9d119b8..6e64a7b 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-22 22:32+0000\n" +"PO-Revision-Date: 2012-12-23 00:11+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" @@ -1749,7 +1749,7 @@ msgstr "¡Conectado a la red Tor!" msgctxt "MainWindow" msgid "miscellaneous" -msgstr "Miscelanea" +msgstr "miscelánea" msgctxt "MainWindow" msgid "identity mismatch" @@ -1773,7 +1773,7 @@ msgstr "error de lectura/escritura" msgctxt "MainWindow" msgid "no route to host" -msgstr "no hay ruta hacia el anfitrión (host)" +msgstr "no hay ruta hacia el servidor (host)" msgctxt "MainWindow" msgid "insufficient resources"

1 0

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

23 Dec '12

commit a8088fcb83314a8279202430de87bdc97df66188 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Dec 23 00:15:23 2012 +0000 Update translations for vidalia_alpha --- es/vidalia_es.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index 9d119b8..6e64a7b 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-22 22:32+0000\n" +"PO-Revision-Date: 2012-12-23 00:11+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" @@ -1749,7 +1749,7 @@ msgstr "¡Conectado a la red Tor!" msgctxt "MainWindow" msgid "miscellaneous" -msgstr "Miscelanea" +msgstr "miscelánea" msgctxt "MainWindow" msgid "identity mismatch" @@ -1773,7 +1773,7 @@ msgstr "error de lectura/escritura" msgctxt "MainWindow" msgid "no route to host" -msgstr "no hay ruta hacia el anfitrión (host)" +msgstr "no hay ruta hacia el servidor (host)" msgctxt "MainWindow" msgid "insufficient resources"

1 0

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

23 Dec '12

commit 840d7553c6c082ab36dd5353c516e21cf4aa5f3f Author: Translation commit bot <translation(a)torproject.org> Date: Sun Dec 23 00:15:21 2012 +0000 Update translations for vidalia_completed --- es/vidalia_es.po | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index 37c6fb6..6b8e051 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-22 22:30+0000\n" +"PO-Revision-Date: 2012-12-23 00:14+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" @@ -1771,7 +1771,7 @@ msgstr "Conectando a la red Tor" msgctxt "MainWindow" msgid "Establishing a Tor circuit" -msgstr "Estableciendo un circuito Tor" +msgstr "Estableciendo un circuito a través de Tor" msgctxt "MainWindow" msgid "Connected to the Tor network!" @@ -1783,7 +1783,7 @@ msgstr "miscelánea" msgctxt "MainWindow" msgid "identity mismatch" -msgstr "no hay coincidencia de identidad" +msgstr "las identidades no coinciden" msgctxt "MainWindow" msgid "done" @@ -1799,11 +1799,11 @@ msgstr "tiempo de espera de conexión agotado" msgctxt "MainWindow" msgid "read/write error" -msgstr "error de escritura/lectura" +msgstr "error de lectura/escritura" msgctxt "MainWindow" msgid "no route to host" -msgstr "no hay ruta hacia el host" +msgstr "no hay ruta hacia el servidor (host)" msgctxt "MainWindow" msgid "insufficient resources"

1 0

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

23 Dec '12

commit d6a866e78962208575a87ab768db6bbbf193284c Author: Translation commit bot <translation(a)torproject.org> Date: Sun Dec 23 00:15:15 2012 +0000 Update translations for vidalia --- es/vidalia_es.po | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index 37c6fb6..6b8e051 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-22 22:30+0000\n" +"PO-Revision-Date: 2012-12-23 00:14+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" @@ -1771,7 +1771,7 @@ msgstr "Conectando a la red Tor" msgctxt "MainWindow" msgid "Establishing a Tor circuit" -msgstr "Estableciendo un circuito Tor" +msgstr "Estableciendo un circuito a través de Tor" msgctxt "MainWindow" msgid "Connected to the Tor network!" @@ -1783,7 +1783,7 @@ msgstr "miscelánea" msgctxt "MainWindow" msgid "identity mismatch" -msgstr "no hay coincidencia de identidad" +msgstr "las identidades no coinciden" msgctxt "MainWindow" msgid "done" @@ -1799,11 +1799,11 @@ msgstr "tiempo de espera de conexión agotado" msgctxt "MainWindow" msgid "read/write error" -msgstr "error de escritura/lectura" +msgstr "error de lectura/escritura" msgctxt "MainWindow" msgid "no route to host" -msgstr "no hay ruta hacia el host" +msgstr "no hay ruta hacia el servidor (host)" msgctxt "MainWindow" msgid "insufficient resources"

1 0

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

22 Dec '12

commit 5521a0ac3c166593d7063f949427400371526653 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Dec 22 22:45:23 2012 +0000 Update translations for vidalia_alpha_completed --- es/vidalia_es.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index 7eebed4..9d119b8 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-22 19:37+0000\n" +"PO-Revision-Date: 2012-12-22 22:32+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" @@ -1725,11 +1725,11 @@ msgstr "Cargando el estado de la red" msgctxt "MainWindow" msgid "Loading authority certificates" -msgstr "Cargando los certificados de autoridad (de red Tor)" +msgstr "Cargando los certificados de autoridades" msgctxt "MainWindow" msgid "Requesting relay information" -msgstr "Solicitando información del repetidor (relay)" +msgstr "Solicitando información del repetidor" msgctxt "MainWindow" msgid "Loading relay information"

1 0

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

22 Dec '12

commit 340a921de8663ea0630e7e064429d8000bfd1280 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Dec 22 22:45:20 2012 +0000 Update translations for vidalia_alpha --- es/vidalia_es.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index 7eebed4..9d119b8 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-22 19:37+0000\n" +"PO-Revision-Date: 2012-12-22 22:32+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" @@ -1725,11 +1725,11 @@ msgstr "Cargando el estado de la red" msgctxt "MainWindow" msgid "Loading authority certificates" -msgstr "Cargando los certificados de autoridad (de red Tor)" +msgstr "Cargando los certificados de autoridades" msgctxt "MainWindow" msgid "Requesting relay information" -msgstr "Solicitando información del repetidor (relay)" +msgstr "Solicitando información del repetidor" msgctxt "MainWindow" msgid "Loading relay information"

1 0

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

22 Dec '12

commit fd261d10aabe4faefdcd1e025d9bd004161d9dd8 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Dec 22 22:45:18 2012 +0000 Update translations for vidalia_completed --- es/vidalia_es.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index 7716518..37c6fb6 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-22 21:59+0000\n" +"PO-Revision-Date: 2012-12-22 22:30+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"

1 0

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

22 Dec '12

commit c1b7fda131a02e6df706376cede46d3fb7547cd3 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Dec 22 22:45:14 2012 +0000 Update translations for vidalia --- es/vidalia_es.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index 7716518..37c6fb6 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-22 21:59+0000\n" +"PO-Revision-Date: 2012-12-22 22:30+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"

1 0

[stem/master] Documentation and output string fixes
by atagar＠torproject.org 22 Dec '12

22 Dec '12

commit cfc745e95010b4c86a8d794c118bfafafee4d59d Author: Sean Robinson <seankrobinson(a)gmail.com> Date: Fri Dec 21 09:17:23 2012 -0700 Documentation and output string fixes Signed-off-by: Sean Robinson <seankrobinson(a)gmail.com> --- stem/control.py | 10 +++++----- stem/descriptor/extrainfo_descriptor.py | 2 +- stem/response/__init__.py | 1 + test/mocking.py | 2 +- test/unit/response/control_message.py | 4 ++-- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/stem/control.py b/stem/control.py index 1e5250a..15b762e 100644 --- a/stem/control.py +++ b/stem/control.py @@ -1045,8 +1045,8 @@ class Controller(BaseController): There are three use cases for GETCONF: - 1. a single value is provided (ex. **ControlPort**) - 2. multiple values are provided for the option (ex. **ExitPolicy**) + 1. a single value is provided (e.g. **ControlPort**) + 2. multiple values are provided for the option (e.g. **ExitPolicy**) 3. a set of options that weren't necessarily requested are returned (for instance querying **HiddenServiceOptions** gives **HiddenServiceDir**, **HiddenServicePort**, etc) @@ -1061,8 +1061,8 @@ class Controller(BaseController): :param str,list params: configuration option(s) to be queried :param object default: value for the mappings if the configuration option is either undefined or the query fails - :param bool multiple: if **True** then the provided are lists with all of - the present values + :param bool multiple: if **True** then the values provided are lists with + all of the present values :returns: **dict** of the 'config key => value' mappings. The value is a... @@ -1429,7 +1429,7 @@ class Controller(BaseController): :param list,str path: one or more relays to make a circuit through :param str purpose: "general" or "controller" - :returns: int of the circuit id of the newly created circuit + :returns: str of the circuit id of the newly created circuit """ return self.extend_circuit(0, path, purpose) diff --git a/stem/descriptor/extrainfo_descriptor.py b/stem/descriptor/extrainfo_descriptor.py index d53f79b..8ad10e1 100644 --- a/stem/descriptor/extrainfo_descriptor.py +++ b/stem/descriptor/extrainfo_descriptor.py @@ -856,7 +856,7 @@ class BridgeExtraInfoDescriptor(ExtraInfoDescriptor): for entry in value.split(','): if not '=' in entry: - raise stem.ProtocolError("The bridge-ip-versions should be a comma separated listing of '<protocol>=<count>' mappings: %s" % line) + raise stem.ProtocolError("The bridge-ip-versions should be a comma separated listing of '<protocol>=<count>' mappings: %s" % line) protocol, count = entry.split('=', 1) diff --git a/stem/response/__init__.py b/stem/response/__init__.py index 2e9296d..06c80ca 100644 --- a/stem/response/__init__.py +++ b/stem/response/__init__.py @@ -63,6 +63,7 @@ def convert(response_type, message, **kwargs): * **\*** GETINFO * **\*** GETCONF * **&** **^** MAPADDRESS + * EVENT * PROTOCOLINFO * AUTHCHALLENGE * SINGLELINE diff --git a/test/mocking.py b/test/mocking.py index 86acb2a..20ac76e 100644 --- a/test/mocking.py +++ b/test/mocking.py @@ -445,7 +445,7 @@ def get_message(content, reformat = True): :param str content: base content for the controller message :param str reformat: modifies content to be more accommodating to being parsed - :returns: stem.socket.ControlMessage instance + :returns: stem.response.ControlMessage instance """ if reformat: diff --git a/test/unit/response/control_message.py b/test/unit/response/control_message.py index 9ebd4bc..51ad8f0 100644 --- a/test/unit/response/control_message.py +++ b/test/unit/response/control_message.py @@ -96,8 +96,8 @@ class TestControlMessage(unittest.TestCase): def test_no_crlf(self): """ - Checks that we get a ProtocolError when we don't have both a carrage - returna and newline for line endings. This doesn't really check for + Checks that we get a ProtocolError when we don't have both a carriage + return and newline for line endings. This doesn't really check for newlines (since that's what readline would break on), but not the end of the world. """

1 0

[stem/master] Fix test_close_circuit crash by concatenating strings
by atagar＠torproject.org 22 Dec '12

22 Dec '12

commit 9119f9f0d0091a030654002a2e7ae6ccf91a789f Author: Sean Robinson <seankrobinson(a)gmail.com> Date: Sun Dec 16 19:32:22 2012 -0700 Fix test_close_circuit crash by concatenating strings Traceback: File "./test/integ/control/controller.py", line 521, in test_close_circuit self.assertRaises(stem.InvalidArguments, controller.close_circuit, circ_id + 1024) TypeError: cannot concatenate 'str' and 'int' objects Also, change to standard variable name "circuit_id". Signed-off-by: Sean Robinson <seankrobinson(a)gmail.com> --- test/integ/control/controller.py | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index 0cee344..969836b 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -552,20 +552,20 @@ class TestController(unittest.TestCase): runner = test.runner.get_runner() with runner.get_tor_controller() as controller: - circ_id = controller.new_circuit() - controller.close_circuit(circ_id) + circuit_id = controller.new_circuit() + controller.close_circuit(circuit_id) circuit_output = controller.get_info("circuit-status") circ = [x.split()[0] for x in circuit_output.splitlines()] self.assertFalse(circ_id in circ) - circ_id = controller.new_circuit() - controller.close_circuit(circ_id, "IfUnused") + circuit_id = controller.new_circuit() + controller.close_circuit(circuit_id, "IfUnused") circuit_output = controller.get_info("circuit-status") circ = [x.split()[0] for x in circuit_output.splitlines()] self.assertFalse(circ_id in circ) - circ_id = controller.new_circuit() - self.assertRaises(stem.InvalidArguments, controller.close_circuit, circ_id + 1024) + circuit_id = controller.new_circuit() + self.assertRaises(stem.InvalidArguments, controller.close_circuit, circuit_id + "1024") self.assertRaises(stem.InvalidRequest, controller.close_circuit, "") def test_mapaddress(self):

1 0