- tor-commits - lists.torproject.org

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

04 Dec '12

commit bbb9f1ac52cbca5d347900c8703ed60387f16758 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 4 17:15:32 2012 +0000 Update translations for vidalia_help --- es/server.po | 10 +++++----- lv/bridges.po | 25 +++++++++++++------------ 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/es/server.po b/es/server.po index 21cc8d7..2d37461 100644 --- a/es/server.po +++ b/es/server.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: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2012-12-04 16:44+0000\n" +"PO-Revision-Date: 2012-12-04 16:54+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" @@ -355,7 +355,7 @@ msgid "" "connections to your computer from other computers on the Internet. If you " "want to run a Tor relay, however, other Tor clients and relays must be able " "to connect to your relay through your home router or firewall." -msgstr "Muchos usuarios domésticos se conectan a Internet vía router (enrutador), lo cuál permite compartir la misma conexión a Internet a múltiples ordenadores en una red local. A su vez, algunos usuarios podrían estar detrás de un cortafuegos (firewall), que bloquea las conexiones entrantes a su ordenador desde otros ordenadores de Internet. Sin embargo, si desea ejecutar un repetidor Tor, otros clientes y repetidores Tor deben poder conectarse a su repetidor atravesando su router doméstico y/o su firewall. " +msgstr "Muchos usuarios domésticos se conectan a Internet vía router (enrutador), lo cuál permite compartir la misma conexión a Internet entre múltiples ordenadores en una red local. A su vez, algunos usuarios podrían estar detrás de un cortafuegos (firewall), que bloquea las conexiones entrantes a su ordenador desde otros ordenadores de Internet. Sin embargo, si desea ejecutar un repetidor Tor otros clientes y repetidores Tor deben poder conectarse a su repetidor atravesando su router y/o firewall doméstico. " #. type: Content of: <html><body> #: en/server.html:200 @@ -365,7 +365,7 @@ msgid "" "known as port forwarding. Port forwarding configures your router or " "firewall to \"forward\" all connections to certain ports on your router or " "firewall to local ports on your computer." -msgstr "Para hacer su repetidor accesible públicamente, su router y/o firewall necesitan saber qué puertos permitir atravesar hasta su ordenador, configurando lo que se conoce como redireccionamiento de puertos. El redireccionamiento de puertos configura su router y/o firewall para \"redirigir\" todas las conexiones a ciertos puertos en su router y/o firewall hacia puertos locales en su ordenador." +msgstr "Para hacer su repetidor accesible públicamente, su router y/o firewall necesitan saber qué puertos permitir atravesar hasta su ordenador, configurando lo que se conoce como redireccionamiento de puertos. El redireccionamiento de puertos configura su router y/o firewall para \"redirigir\" todas las conexiones a estos por ciertos puertos, hacia los puertos locales adecuados en su ordenador." #. type: Content of: <html><body> #: en/server.html:208 @@ -390,7 +390,7 @@ msgid "" "href=\"http://192.168.0.1/\">http://192.168.0.1</a> or <a " "href=\"http://192.168.1.1/\">http://192.168.1.1</a> in your Web browser. You" " should consult your router's instruction manual for more information." -msgstr "Si el botón Prueba descubre que Vidalia no puede configurar el redireccionamiento de puertos por usted, podría necesitar activar esta característica en su router, o configurar sus puertos de forma manual. Algunos dispositivos de red tienen una característica llamada Plug-and-Play Universal (UPnP). Si puede acceder a la interfaz de administración de su router, debe buscar una opción para habilitar UPnP. Se puede acceder a la interfaz administrativa de la mayoría de los routers abriendo <a href=\"http://192.168.0.1/\">http://192.168.0.1</a> o <a href=\"http://192.168.1.1/\">http://192.168.1.1</a> en su navegador web. Consulte el manual de instrucciones de su router para más información." +msgstr "Si el botón Prueba descubre que Vidalia no puede configurar automáticamente el redireccionamiento de puertos por usted, podría necesitar activar esta característica en su router, o configurar sus puertos de forma manual. Algunos dispositivos de red tienen una característica llamada Plug-and-Play Universal (UPnP). Si puede acceder a la interfaz de administración de su router, debe buscar una opción para habilitar UPnP. Se puede acceder a la interfaz administrativa de la mayoría de los routers abriendo <a href=\"http://192.168.0.1/\">http://192.168.0.1</a> o <a href=\"http://192.168.1.1/\">http://192.168.1.1</a> en su navegador web. Consulte el manual de instrucciones de su router para más información." #. type: Content of: <html><body> #: en/server.html:229 @@ -404,4 +404,4 @@ msgid "" "Mirror the relay directory, then you will also need to forward your " "Directory Port. The Directory Port is set to port 9030 by " "default on all operating systems." -msgstr "Si necesita configurar manualmente el redireccionamiento de puertos, el sitio web <a href=\"http://www.portforward.com/english/routers/port_forwarding/routerindex.htm\">portforward.com</a> tiene instrucciones sobre cómo configurar el redireccionamiento de puertos para muchos tipos de routers y firewalls. Como mínimo, necesitará redireccionar su Puerto de repetidor (relay), que es el puerto 443 por defecto en Windows, y el 9001 en todos los demás sistemas operativos. Si además marcó la casilla Replicar el directorio repetidores (relays directory), también necesitará redireccionar su Puerto del listado de repetidores (relay directory), que es el puerto 9030 por defecto en todos los sistemas operativos. " +msgstr "Si necesita configurar manualmente el redireccionamiento de puertos, el sitio web <a href=\"http://www.portforward.com/english/routers/port_forwarding/routerindex.htm\">portforward.com</a> tiene instrucciones sobre cómo configurar el redireccionamiento de puertos para muchos tipos de routers y firewalls. Como mínimo, necesitará redireccionar su Puerto de repetidor, que es el puerto 443 por defecto en Windows, y el 9001 en todos los demás sistemas operativos. Si además marcó la casilla Replicar el repositorio de repetidores, también necesitará redireccionar su Puerto del repositorio de repetidores, que es el puerto 9030 por defecto en todos los sistemas operativos. " diff --git a/lv/bridges.po b/lv/bridges.po index e6d5634..b6785cf 100644 --- a/lv/bridges.po +++ b/lv/bridges.po @@ -1,12 +1,13 @@ # # Translators: +# Ojars Balcers <ojars.balcers(a)gmail.com>, 2012. msgid "" 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 16:58+0200\n" -"PO-Revision-Date: 2010-11-30 05:02+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2012-12-04 17:11+0000\n" +"Last-Translator: Ojars Balcers <ojars.balcers(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,17 +18,17 @@ msgstr "" #. type: Content of: <html><body><h1> #: en/bridges.html:16 msgid "Bridge Relays" -msgstr "" +msgstr "Tiltu retranslatori" #. type: Content of: <html><body> #: en/bridges.html:19 msgid "<a name=\"about\"/>" -msgstr "" +msgstr "<a name=\"par\"/>" #. type: Content of: <html><body><h3> #: en/bridges.html:20 msgid "What are bridge relays?" -msgstr "" +msgstr "Kas ir tiltu retranslatori?" #. type: Content of: <html><body> #: en/bridges.html:22 @@ -40,32 +41,32 @@ msgid "" "no complete public list of them, even if your ISP is filtering connections " "to all the known Tor relays, they probably won't be able to block all the " "bridges." -msgstr "" +msgstr "Daži interneta pakalpojumu sniedzēji (IPS) cenšas ierobežot lietotāju piekļuvi tīklam Tor, bloķējot savienojumus ar zināmiem Tor retranslatoriem. Tiltu retransatori (vai īsāktilti) ir retranslatori, kuri palīdz šādiem cenzētiem lietotājiem piekļūt tīklam Tor. Atšķirībā no citiem Tor'a retranslatoriem, tilti netiek uzskaitīti publiskajās direktorijos kuros uzskaita parastus retranslatorus. Tā kā nav viena visaptveroša retranslatoru saraksta, pat ja Jūsu IPS filtrētu savienojumus uz visiem zināmajiem Tor retranslatoriem, tomēr, ticami, ISP neizdotos bloķēt visus tiltus." #. type: Content of: <html><body> #: en/bridges.html:31 msgid "<a name=\"finding\"/>" -msgstr "" +msgstr "<a name=\"atrašana\"/>" #. type: Content of: <html><body><h3> #: en/bridges.html:32 msgid "How do I find a bridge relay?" -msgstr "" +msgstr "Kā atrast tilta retranslatoru?" #. type: Content of: <html><body> #: en/bridges.html:34 msgid "There are two main ways to learn about a bridge address:" -msgstr "" +msgstr "Pastāv divi galvenie veidi kā uzzināt tilta adresi:" #. type: Content of: <html><body><ol><li> #: en/bridges.html:36 msgid "Get some friends to run private bridges for you" -msgstr "" +msgstr "Pārliecināt draugus uzturēt Jūsu vajadzībām privātus tiltus" #. type: Content of: <html><body><ol><li> #: en/bridges.html:37 msgid "Use some of the public bridges" -msgstr "" +msgstr "Lietot dažus no publiskajiem tiltiem" #. type: Content of: <html><body> #: en/bridges.html:42 @@ -97,4 +98,4 @@ msgstr "" msgid "" "Configuring more than one bridge address will make your Tor connection more " "stable, in case some of the bridges become unreachable." -msgstr "" +msgstr "Vairāk kā vienas tilta adreses konfigurēšana padarīs Jūsu Tor savienojumu stabilāku, tad, ja daži tilti kļūtu nesasniedzami."

1 0

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

04 Dec '12

commit 46d3732f2c5a9e243c75ea6d66871ed924052704 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 4 17:15:20 2012 +0000 Update translations for vidalia_alpha_completed --- es/vidalia_es.po | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index 43e0ea3..0144a0f 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-04 04:38+0000\n" +"PO-Revision-Date: 2012-12-04 17: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" @@ -336,7 +336,7 @@ msgstr "Gráfico de ancho de banda" msgctxt "BridgeDownloader" msgid "Starting HTTPS bridge request..." -msgstr "Iniciando solicitud de bridges (repetidores puente, entradas a Tor de publicidad restringida) por HTTPS..." +msgstr "Iniciando solicitud de bridges (repetidores puente, entradas a Tor de publicitación restringida) por HTTPS..." msgctxt "BridgeDownloader" msgid "Connecting to %1:%2..." @@ -352,7 +352,7 @@ msgstr "Descargando una lista de bridges..." msgctxt "BridgeDownloaderProgressDialog" msgid "Downloading Bridges" -msgstr "Descargando bridges (repetidores puente. entradas a Tor de publicidad restringida)" +msgstr "Descargando bridges (repetidores puente. entradas a Tor de publicitación restringida)" msgctxt "BridgeDownloaderProgressDialog" msgid "Unable to download bridges: %1" @@ -376,7 +376,7 @@ msgstr "Clientes de los siguientes países han usado su repetidor puente desde % msgctxt "BridgeUsageDialog" msgid "Bridge Usage Summary" -msgstr "Resumen de uso del bridge (repetidor puente, entrada a Tor de publicidad restringida)" +msgstr "Resumen de uso del bridge (repetidor puente, entrada a Tor de publicitación restringida)" msgctxt "BridgeUsageDialog" msgid "Client Summary"

1 0

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

04 Dec '12

commit 7658c50b3012382adad44bd613b25d183146716a Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 4 17:15:18 2012 +0000 Update translations for vidalia_alpha --- es/vidalia_es.po | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index 43e0ea3..0144a0f 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-04 04:38+0000\n" +"PO-Revision-Date: 2012-12-04 17: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" @@ -336,7 +336,7 @@ msgstr "Gráfico de ancho de banda" msgctxt "BridgeDownloader" msgid "Starting HTTPS bridge request..." -msgstr "Iniciando solicitud de bridges (repetidores puente, entradas a Tor de publicidad restringida) por HTTPS..." +msgstr "Iniciando solicitud de bridges (repetidores puente, entradas a Tor de publicitación restringida) por HTTPS..." msgctxt "BridgeDownloader" msgid "Connecting to %1:%2..." @@ -352,7 +352,7 @@ msgstr "Descargando una lista de bridges..." msgctxt "BridgeDownloaderProgressDialog" msgid "Downloading Bridges" -msgstr "Descargando bridges (repetidores puente. entradas a Tor de publicidad restringida)" +msgstr "Descargando bridges (repetidores puente. entradas a Tor de publicitación restringida)" msgctxt "BridgeDownloaderProgressDialog" msgid "Unable to download bridges: %1" @@ -376,7 +376,7 @@ msgstr "Clientes de los siguientes países han usado su repetidor puente desde % msgctxt "BridgeUsageDialog" msgid "Bridge Usage Summary" -msgstr "Resumen de uso del bridge (repetidor puente, entrada a Tor de publicidad restringida)" +msgstr "Resumen de uso del bridge (repetidor puente, entrada a Tor de publicitación restringida)" msgctxt "BridgeUsageDialog" msgid "Client Summary"

1 0

[stem/master] Comments for private Event attributes
by atagar＠torproject.org 04 Dec '12

04 Dec '12

commit 115607af56f7e8497c9c3343a4f7eae850b7a8a9 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Dec 4 07:53:23 2012 -0800 Comments for private Event attributes Adding comments to describe arguments like _POSITIONAL_ARGS and _SKIP_PARSING. Also dropping _QUOTED entries for key/value entries since it's no longer being used for that purpose. --- stem/response/events.py | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/stem/response/events.py b/stem/response/events.py index 1559ec5..dbd23f9 100644 --- a/stem/response/events.py +++ b/stem/response/events.py @@ -28,10 +28,10 @@ class Event(stem.response.ControlMessage): :var dict keyword_args: key/value arguments of the event """ - _POSITIONAL_ARGS = () - _KEYWORD_ARGS = {} - _QUOTED = () - _SKIP_PARSING = False + _POSITIONAL_ARGS = () # attribute names for recognized positional arguments + _KEYWORD_ARGS = {} # map of 'keyword => attribute' for recognized attributes + _QUOTED = () # positional arguments that are quoted + _SKIP_PARSING = False # skip parsing contents into our positional_args and keyword_args def _parse_message(self, arrived_at): if not str(self).strip(): @@ -156,7 +156,7 @@ class AddrMapEvent(Event): "error": "error", "EXPIRES": "utc_expiry", } - _QUOTED = ("expiry", "EXPIRES") + _QUOTED = ("expiry") def _parse(self): if self.destination == "<error>": @@ -387,8 +387,6 @@ class ClientsSeenEvent(Event): "IPVersions": "ip_versions", } - _QUOTED = ("TimeStarted",) - def _parse(self): if self.start_time != None: self.start_time = datetime.datetime.strptime(self.start_time, "%Y-%m-%d %H:%M:%S")

1 0

[stem/master] Including all entries in the Event's positional_args
by atagar＠torproject.org 04 Dec '12

04 Dec '12

commit 7011a6a2f1c306e204eb6e518604911d5561fc71 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Dec 4 08:00:58 2012 -0800 Including all entries in the Event's positional_args Fixing a semi-bug where the Event's positional_args only contained entries that we didn't recognize. This was a bug according to the Event's pydoc, but by design according to an inline comment. I'm not really sure what I did that - oh well... --- stem/response/events.py | 19 +++++++++---------- 1 files changed, 9 insertions(+), 10 deletions(-) diff --git a/stem/response/events.py b/stem/response/events.py index dbd23f9..30350a3 100644 --- a/stem/response/events.py +++ b/stem/response/events.py @@ -81,32 +81,31 @@ class Event(stem.response.ControlMessage): else: break - self.positional_args = content.split()[1:] + # Setting attributes for the fields that we recognize. - # Setting attributes for the fields that we recognize. Unrecognized fields - # only appear in our 'positional_args' and 'keyword_args' attributes. + self.positional_args = content.split()[1:] + positional = list(self.positional_args) - for i in xrange(len(self._POSITIONAL_ARGS)): - attr_name = self._POSITIONAL_ARGS[i] + for attr_name in self._POSITIONAL_ARGS: attr_value = None - if self.positional_args: + if positional: if attr_name in self._QUOTED: - attr_values = [self.positional_args.pop(0)] + attr_values = [positional.pop(0)] if not attr_values[0].startswith('"'): raise stem.ProtocolError("The %s value should be quoted, but didn't have a starting quote: %s" % self) while True: - if not self.positional_args: + if not positional: raise stem.ProtocolError("The %s value should be quoted, but didn't have an ending quote: %s" % self) - attr_values.append(self.positional_args.pop(0)) + attr_values.append(positional.pop(0)) if attr_values[-1].endswith('"'): break attr_value = " ".join(attr_values)[1:-1] else: - attr_value = self.positional_args.pop(0) + attr_value = positional.pop(0) setattr(self, attr_name, attr_value)

1 0

[stem/master] Purging use of the variable 'i'
by atagar＠torproject.org 04 Dec '12

04 Dec '12

commit d50b8a06744a8476bc16c04268fef75b20712b2b Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Dec 4 08:21:09 2012 -0800 Purging use of the variable 'i' A pox upon whoever taught me to use variables like i, j, and k for loop constants. It's ungrepable and a practice that should be purged via fire and pitchforks. I'm keeping it in for list interpolation (since it's localized to a single line), but replacing it with 'index' everywhere else. I'm also replacing a few points that do... for i in range(len(my_list)): my_item = my_list[i] ... with calls to enumerate(). --- stem/util/connection.py | 6 +++--- test/check_whitespace.py | 18 +++++++++--------- test/integ/control/base_controller.py | 2 +- test/mocking.py | 4 ++-- .../networkstatus/directory_authority.py | 4 ++-- test/unit/descriptor/networkstatus/document_v3.py | 20 +++++++++----------- test/unit/descriptor/router_status_entry.py | 4 ++-- test/unit/exit_policy/policy.py | 10 +++++----- test/unit/response/authchallenge.py | 4 ++-- test/unit/response/control_message.py | 14 +++++++------- test/unit/response/events.py | 2 +- test/unit/version.py | 8 ++++---- 12 files changed, 47 insertions(+), 49 deletions(-) diff --git a/stem/util/connection.py b/stem/util/connection.py index a5afc2b..a21cde8 100644 --- a/stem/util/connection.py +++ b/stem/util/connection.py @@ -142,9 +142,9 @@ def expand_ipv6_address(address): address = address.replace("::", "::" + ":" * missing_groups) # inserts missing zeros - for i in xrange(8): - start = i * 5 - end = address.index(":", start) if i != 7 else len(address) + for index in xrange(8): + start = index * 5 + end = address.index(":", start) if index != 7 else len(address) missing_zeros = 4 - (end - start) if missing_zeros > 0: diff --git a/test/check_whitespace.py b/test/check_whitespace.py index fa26a09..7f7b46e 100644 --- a/test/check_whitespace.py +++ b/test/check_whitespace.py @@ -44,8 +44,8 @@ def get_issues(base_path = DEFAULT_TARGET): has_with_import, given_with_warning = False, False is_block_comment = False - for i in xrange(len(lines)): - whitespace, content = re.match("^(\s*)(.*)$", lines[i]).groups() + for index, line in enumerate(lines): + whitespace, content = re.match("^(\s*)(.*)$", line).groups() if '"""' in content: is_block_comment = not is_block_comment @@ -54,23 +54,23 @@ def get_issues(base_path = DEFAULT_TARGET): has_with_import = True elif content.startswith("with ") and content.endswith(":") \ and not has_with_import and not given_with_warning and not is_block_comment: - file_issues.append((i + 1, "missing 'with' import (from __future__ import with_statement)")) + file_issues.append((index + 1, "missing 'with' import (from __future__ import with_statement)")) given_with_warning = True if "\t" in whitespace: - file_issues.append((i + 1, "indentation has a tab")) + file_issues.append((index + 1, "indentation has a tab")) elif "\r" in content: - file_issues.append((i + 1, "contains a windows newline")) + file_issues.append((index + 1, "contains a windows newline")) elif content != content.rstrip(): - file_issues.append((i + 1, "line has trailing whitespace")) + file_issues.append((index + 1, "line has trailing whitespace")) elif content == '': # empty line, check its indentation against the previous and next line # with content next_indent = 0 - for k in xrange(i + 1, len(lines)): - future_whitespace, future_content = re.match("^(\s*)(.*)$", lines[k]).groups() + for future_index in xrange(index + 1, len(lines)): + future_whitespace, future_content = re.match("^(\s*)(.*)$", lines[future_index]).groups() if future_content: next_indent = len(future_whitespace) @@ -86,7 +86,7 @@ def get_issues(base_path = DEFAULT_TARGET): else: msg = msg % ("%i or %i" % (next_indent, prev_indent)) - file_issues.append((i + 1, msg)) + file_issues.append((index + 1, msg)) else: # we had content and it's fine, making a note of its indentation prev_indent = len(whitespace) diff --git a/test/integ/control/base_controller.py b/test/integ/control/base_controller.py index eebb788..900afad 100644 --- a/test/integ/control/base_controller.py +++ b/test/integ/control/base_controller.py @@ -119,7 +119,7 @@ class TestBaseController(unittest.TestCase): msg_thread.setDaemon(True) msg_thread.start() - for i in xrange(100): + for index in xrange(100): controller.connect() controller.close() diff --git a/test/mocking.py b/test/mocking.py index e48ce64..6f05411 100644 --- a/test/mocking.py +++ b/test/mocking.py @@ -380,8 +380,8 @@ def get_all_combinations(attr, include_empty = False): if include_empty: yield () seen = set() - for i in xrange(1, len(attr) + 1): - product_arg = [attr for _ in xrange(i)] + for index in xrange(1, len(attr) + 1): + product_arg = [attr for _ in xrange(index)] for item in itertools.product(*product_arg): # deduplicate, sort, and only provide if we haven't seen it yet diff --git a/test/unit/descriptor/networkstatus/directory_authority.py b/test/unit/descriptor/networkstatus/directory_authority.py index f01604f..545d72f 100644 --- a/test/unit/descriptor/networkstatus/directory_authority.py +++ b/test/unit/descriptor/networkstatus/directory_authority.py @@ -99,8 +99,8 @@ class TestDirectoryAuthority(unittest.TestCase): lines = get_directory_authority(content = True).split("\n") - for i in xrange(len(lines)): - content = "\n".join(lines[:i] + [lines[i]] + lines[i:]) + for index, duplicate_line in enumerate(lines): + content = "\n".join(lines[:index] + [duplicate_line] + lines[index:]) self.assertRaises(ValueError, DirectoryAuthority, content) authority = DirectoryAuthority(content, False) diff --git a/test/unit/descriptor/networkstatus/document_v3.py b/test/unit/descriptor/networkstatus/document_v3.py index 0396754..9eb45a5 100644 --- a/test/unit/descriptor/networkstatus/document_v3.py +++ b/test/unit/descriptor/networkstatus/document_v3.py @@ -161,14 +161,14 @@ class TestNetworkStatusDocument(unittest.TestCase): attr = {"vote-status": "consensus"} if is_consensus else {"vote-status": "vote"} lines = get_network_status_document_v3(attr, content = True).split("\n") - for i in xrange(len(lines) - 1): + for index in xrange(len(lines) - 1): # once we reach the crypto blob we're done since swapping those won't # be detected - if lines[i].startswith(CRYPTO_BLOB[1:10]): break + if lines[index].startswith(CRYPTO_BLOB[1:10]): break # swaps this line with the one after it test_lines = list(lines) - test_lines[i], test_lines[i + 1] = test_lines[i + 1], test_lines[i] + test_lines[index], test_lines[index + 1] = test_lines[index + 1], test_lines[index] content = "\n".join(test_lines) self.assertRaises(ValueError, NetworkStatusDocumentV3, content) @@ -184,18 +184,18 @@ class TestNetworkStatusDocument(unittest.TestCase): attr = {"vote-status": "consensus"} if is_consensus else {"vote-status": "vote"} lines = get_network_status_document_v3(attr, content = True).split("\n") - for i in xrange(len(lines)): + for index, line in enumerate(lines): # Stop when we hit the 'directory-signature' for a couple reasons... # - that is the one field that can validly appear multiple times # - after it is a crypto blob, which won't trigger this kind of # validation failure test_lines = list(lines) - if test_lines[i].startswith("directory-signature "): + if line.startswith("directory-signature "): break # duplicates the line - test_lines.insert(i, test_lines[i]) + test_lines.insert(index, line) content = "\n".join(test_lines) self.assertRaises(ValueError, NetworkStatusDocumentV3, content) @@ -548,11 +548,9 @@ class TestNetworkStatusDocument(unittest.TestCase): weight_entries, expected = [], {} - for i in xrange(len(BANDWIDTH_WEIGHT_ENTRIES)): - key, value = BANDWIDTH_WEIGHT_ENTRIES[i], i - 5 - - weight_entries.append("%s=%i" % (key, value)) - expected[key] = value + for index, key in enumerate(BANDWIDTH_WEIGHT_ENTRIES): + weight_entries.append("%s=%i" % (key, index - 5)) + expected[key] = index - 5 document = get_network_status_document_v3({"bandwidth-weights": " ".join(weight_entries)}) self.assertEquals(expected, document.bandwidth_weights) diff --git a/test/unit/descriptor/router_status_entry.py b/test/unit/descriptor/router_status_entry.py index d971906..27eb76d 100644 --- a/test/unit/descriptor/router_status_entry.py +++ b/test/unit/descriptor/router_status_entry.py @@ -148,8 +148,8 @@ class TestRouterStatusEntry(unittest.TestCase): lines = get_router_status_entry_v3(content = True).split("\n") - for i in xrange(len(lines)): - content = "\n".join(lines[:i] + [lines[i]] + lines[i:]) + for index, duplicate_line in enumerate(lines): + content = "\n".join(lines[:index] + [duplicate_line] + lines[index:]) self.assertRaises(ValueError, RouterStatusEntryV3, content) entry = RouterStatusEntryV3(content, False) diff --git a/test/unit/exit_policy/policy.py b/test/unit/exit_policy/policy.py index 6f4b5a9..0714ef9 100644 --- a/test/unit/exit_policy/policy.py +++ b/test/unit/exit_policy/policy.py @@ -63,12 +63,12 @@ class TestExitPolicy(unittest.TestCase): policy = ExitPolicy('accept *:80', 'accept *:443', 'reject *:*') - for i in xrange(1, 500): - ip_addr = "%i.%i.%i.%i" % (i / 2, i / 2, i / 2, i / 2) - expected_result = i in (80, 443) + for index in xrange(1, 500): + ip_addr = "%i.%i.%i.%i" % (index / 2, index / 2, index / 2, index / 2) + expected_result = index in (80, 443) - self.assertEquals(expected_result, policy.can_exit_to(ip_addr, i)) - self.assertEquals(expected_result, policy.can_exit_to(port = i)) + self.assertEquals(expected_result, policy.can_exit_to(ip_addr, index)) + self.assertEquals(expected_result, policy.can_exit_to(port = index)) def test_is_exiting_allowed(self): test_inputs = { diff --git a/test/unit/response/authchallenge.py b/test/unit/response/authchallenge.py index 5560b03..19ce931 100644 --- a/test/unit/response/authchallenge.py +++ b/test/unit/response/authchallenge.py @@ -43,12 +43,12 @@ class TestAuthChallengeResponse(unittest.TestCase): auth_challenge_comp = VALID_RESPONSE.split() - for i in xrange(1, len(auth_challenge_comp)): + for index in xrange(1, len(auth_challenge_comp)): # Attempts to parse a message without this item. The first item is # skipped because, without the 250 code, the message won't be # constructed. - remaining_comp = auth_challenge_comp[:i] + auth_challenge_comp[i + 1:] + remaining_comp = auth_challenge_comp[:index] + auth_challenge_comp[index + 1:] control_message = mocking.get_message(' '.join(remaining_comp)) self.assertRaises(stem.ProtocolError, stem.response.convert, "AUTHCHALLENGE", control_message) diff --git a/test/unit/response/control_message.py b/test/unit/response/control_message.py index 68a5c42..115aed5 100644 --- a/test/unit/response/control_message.py +++ b/test/unit/response/control_message.py @@ -107,14 +107,14 @@ class TestControlMessage(unittest.TestCase): infonames_lines = [line + "\n" for line in GETINFO_INFONAMES.splitlines()] - for i in range(len(infonames_lines)): + for index, line in enumerate(infonames_lines): # replace the CRLF for the line - infonames_lines[i] = infonames_lines[i].rstrip("\r\n") + "\n" + infonames_lines[index] = line.rstrip("\r\n") + "\n" test_socket_file = StringIO.StringIO("".join(infonames_lines)) self.assertRaises(stem.ProtocolError, stem.socket.recv_message, test_socket_file) # puts the CRLF back - infonames_lines[i] = infonames_lines[i].rstrip("\n") + "\r\n" + infonames_lines[index] = infonames_lines[index].rstrip("\n") + "\r\n" # sanity check the above test isn't broken due to leaving infonames_lines # with invalid data @@ -126,12 +126,12 @@ class TestControlMessage(unittest.TestCase): Checks parsing for responses where the header is missing a digit or divider. """ - for i in range(len(EVENT_BW)): + for index in range(len(EVENT_BW)): # makes test input with that character missing or replaced - removal_test_input = EVENT_BW[:i] + EVENT_BW[i + 1:] - replacement_test_input = EVENT_BW[:i] + "#" + EVENT_BW[i + 1:] + removal_test_input = EVENT_BW[:index] + EVENT_BW[index + 1:] + replacement_test_input = EVENT_BW[:index] + "#" + EVENT_BW[index + 1:] - if i < 4 or i >= (len(EVENT_BW) - 2): + if index < 4 or index >= (len(EVENT_BW) - 2): # dropping the character should cause an error if... # - this is part of the message prefix # - this is disrupting the line ending diff --git a/test/unit/response/events.py b/test/unit/response/events.py index 6fbd907..2ce5167 100644 --- a/test/unit/response/events.py +++ b/test/unit/response/events.py @@ -213,7 +213,7 @@ class TestEvents(unittest.TestCase): self.assertEqual("sent: 25, received: 15", msg) def event_sender(): - for i in xrange(3): + for index in xrange(3): print_bw(self._get_event("650 BW 15 25")) time.sleep(0.05) diff --git a/test/unit/version.py b/test/unit/version.py index 0ff39dd..df4caa5 100644 --- a/test/unit/version.py +++ b/test/unit/version.py @@ -194,8 +194,8 @@ class TestVersion(unittest.TestCase): requirements = stem.version.VersionRequirements() requirements.in_range(Version("0.2.2.0"), Version("0.2.3.0")) - for i in xrange(0, 100): - self.assertTrue(Version("0.2.2.%i" % i).meets_requirements(requirements)) + for index in xrange(0, 100): + self.assertTrue(Version("0.2.2.%i" % index).meets_requirements(requirements)) def test_requirements_multiple_rules(self): """ @@ -210,8 +210,8 @@ class TestVersion(unittest.TestCase): self.assertTrue(Version("0.2.3.0").meets_requirements(requirements)) self.assertFalse(Version("0.2.2.0").meets_requirements(requirements)) - for i in xrange(0, 100): - self.assertFalse(Version("0.2.2.%i" % i).meets_requirements(requirements)) + for index in xrange(0, 100): + self.assertFalse(Version("0.2.2.%i" % index).meets_requirements(requirements)) def assert_versions_match(self, version, major, minor, micro, patch, status, extra): """

1 0

[stem/master] Checking for None by identity
by atagar＠torproject.org 04 Dec '12

04 Dec '12

commit 69f72efc9367092c989819bb2e408598ecc9dcdb Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Dec 4 08:37:59 2012 -0800 Checking for None by identity According to PEP 290 comparisons to None should be done via identity (the 'is' keyword): http://www.python.org/dev/peps/pep-0290/#testing-for-none I had already been doing this, albeit inconsistently. Inequality checks were still using '!=' - swapping all None comparisons to be by identity. --- run_tests.py | 2 +- stem/control.py | 6 +++--- stem/descriptor/__init__.py | 6 +++--- stem/descriptor/server_descriptor.py | 2 +- stem/exit_policy.py | 4 ++-- stem/response/events.py | 30 +++++++++++++++--------------- stem/util/conf.py | 10 +++++----- test/integ/control/controller.py | 8 ++++---- test/output.py | 2 +- test/runner.py | 2 +- 10 files changed, 36 insertions(+), 36 deletions(-) diff --git a/run_tests.py b/run_tests.py index a9aebbe..cbf08d6 100755 --- a/run_tests.py +++ b/run_tests.py @@ -358,7 +358,7 @@ if __name__ == '__main__': # Queue up all the targets with torrc options we want to run against. integ_run_targets = [] - all_run_targets = [t for t in Target if CONFIG["target.torrc"].get(t) != None] + all_run_targets = [t for t in Target if CONFIG["target.torrc"].get(t) is not None] if test_config.get("integ.target.run.all", False): # test against everything with torrc options diff --git a/stem/control.py b/stem/control.py index 8665a51..4d3bc8b 100644 --- a/stem/control.py +++ b/stem/control.py @@ -460,7 +460,7 @@ class BaseController(object): with self._status_listeners_lock: change_timestamp = time.time() - if expect_alive != None and expect_alive != self.is_alive(): + if expect_alive is not None and expect_alive != self.is_alive(): return for listener, spawn in self._status_listeners: @@ -1546,13 +1546,13 @@ def _parse_circ_entry(entry): # old style, nickname only fingerprint, nickname = None, entry - if fingerprint != None: + if fingerprint is not None: if not stem.util.tor_tools.is_valid_fingerprint(fingerprint, True): raise stem.ProtocolError("Fingerprint in the circuit path is malformed (%s)" % fingerprint) fingerprint = fingerprint[1:] # strip off the leading '$' - if nickname != None and not stem.util.tor_tools.is_valid_nickname(nickname): + if nickname is not None and not stem.util.tor_tools.is_valid_nickname(nickname): raise stem.ProtocolError("Nickname in the circuit path is malformed (%s)" % fingerprint) return (fingerprint, nickname) diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index d667946..4c5841e 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -197,7 +197,7 @@ def _read_until_keywords(keywords, descriptor_file, inclusive = False, ignore_fi if ignore_first: first_line = descriptor_file.readline() - if content != None and first_line != None: + if content is not None and first_line is not None: content.append(first_line) while True: @@ -220,11 +220,11 @@ def _read_until_keywords(keywords, descriptor_file, inclusive = False, ignore_fi if line_keyword in keywords: if not inclusive: descriptor_file.seek(last_position) - elif content != None: + elif content is not None: content.append(line) break - elif content != None: + elif content is not None: content.append(line) return content diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index 584d426..b87683c 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -821,7 +821,7 @@ class BridgeDescriptor(ServerDescriptor): scrubbing, this list is empty if we're properly scrubbed """ - if self._scrubbing_issues == None: + if self._scrubbing_issues is None: issues = [] if not self.address.startswith("10."): diff --git a/stem/exit_policy.py b/stem/exit_policy.py index 159fa2c..ce56551 100644 --- a/stem/exit_policy.py +++ b/stem/exit_policy.py @@ -443,7 +443,7 @@ class ExitPolicyRule(object): """ # validate our input and check if the argument doesn't match our address type - if address != None: + if address is not None: if stem.util.connection.is_valid_ip_address(address): if self.address_type == AddressType.IPv6: return False elif stem.util.connection.is_valid_ipv6_address(address, allow_brackets = True): @@ -453,7 +453,7 @@ class ExitPolicyRule(object): else: raise ValueError("'%s' isn't a valid IPv4 or IPv6 address" % address) - if port != None and not stem.util.connection.is_valid_port(port): + if port is not None and not stem.util.connection.is_valid_port(port): raise ValueError("'%s' isn't a valid port" % port) if not self.is_address_wildcard(): diff --git a/stem/response/events.py b/stem/response/events.py index 30350a3..eb2aa64 100644 --- a/stem/response/events.py +++ b/stem/response/events.py @@ -161,10 +161,10 @@ class AddrMapEvent(Event): if self.destination == "<error>": self.destination = None - if self.expiry != None: + if self.expiry is not None: self.expiry = datetime.datetime.strptime(self.expiry, "%Y-%m-%d %H:%M:%S") - if self.utc_expiry != None: + if self.utc_expiry is not None: self.utc_expiry = datetime.datetime.strptime(self.utc_expiry, "%Y-%m-%d %H:%M:%S") class AuthDirNewDescEvent(Event): @@ -247,7 +247,7 @@ class BuildTimeoutSetEvent(Event): for param in ('total_times', 'timeout', 'xm', 'close_timeout'): param_value = getattr(self, param) - if param_value != None: + if param_value is not None: try: setattr(self, param, int(param_value)) except ValueError: @@ -256,7 +256,7 @@ class BuildTimeoutSetEvent(Event): for param in ('alpha', 'quantile', 'timeout_rate', 'close_rate'): param_value = getattr(self, param) - if param_value != None: + if param_value is not None: try: setattr(self, param, float(param_value)) except ValueError: @@ -300,16 +300,16 @@ class CircuitEvent(Event): def _parse(self): self.path = tuple(stem.control._parse_circ_path(self.path)) - if self.build_flags != None: + if self.build_flags is not None: self.build_flags = tuple(self.build_flags.split(',')) - if self.created != None: + if self.created is not None: try: self.created = str_tools.parse_iso_timestamp(self.created) except ValueError, exc: raise stem.ProtocolError("Unable to parse create date (%s): %s" % (exc, self)) - if self.id != None and not tor_tools.is_valid_circuit_id(self.id): + if self.id is not None and not tor_tools.is_valid_circuit_id(self.id): raise stem.ProtocolError("Circuit IDs must be one to sixteen alphanumeric characters, got '%s': %s" % (self.id, self)) self._log_if_unrecognized('status', stem.CircStatus) @@ -352,16 +352,16 @@ class CircMinorEvent(Event): def _parse(self): self.path = tuple(stem.control._parse_circ_path(self.path)) - if self.build_flags != None: + if self.build_flags is not None: self.build_flags = tuple(self.build_flags.split(',')) - if self.created != None: + if self.created is not None: try: self.created = str_tools.parse_iso_timestamp(self.created) except ValueError, exc: raise stem.ProtocolError("Unable to parse create date (%s): %s" % (exc, self)) - if self.id != None and not tor_tools.is_valid_circuit_id(self.id): + if self.id is not None and not tor_tools.is_valid_circuit_id(self.id): raise stem.ProtocolError("Circuit IDs must be one to sixteen alphanumeric characters, got '%s': %s" % (self.id, self)) self._log_if_unrecognized('event', stem.CircEvent) @@ -387,10 +387,10 @@ class ClientsSeenEvent(Event): } def _parse(self): - if self.start_time != None: + if self.start_time is not None: self.start_time = datetime.datetime.strptime(self.start_time, "%Y-%m-%d %H:%M:%S") - if self.locales != None: + if self.locales is not None: locale_to_count = {} for entry in self.locales.split(','): @@ -410,7 +410,7 @@ class ClientsSeenEvent(Event): self.locales = locale_to_count - if self.ip_versions != None: + if self.ip_versions is not None: protocol_to_count = {} for entry in self.ip_versions.split(','): @@ -607,7 +607,7 @@ class ORConnEvent(Event): self.endpoint_address = address self.endpoint_port = int(port) - if self.circ_count != None: + if self.circ_count is not None: if not self.circ_count.isdigit(): raise stem.ProtocolError("ORCONN event got a non-numeric circuit count (%s): %s" % (self.circ_count, self)) @@ -754,7 +754,7 @@ class StreamBwEvent(Event): _POSITIONAL_ARGS = ("id", "written", "read") def _parse(self): - if self.id != None and not tor_tools.is_valid_stream_id(self.id): + if self.id is not None and not tor_tools.is_valid_stream_id(self.id): raise stem.ProtocolError("Stream IDs must be one to sixteen alphanumeric characters, got '%s': %s" % (self.id, self)) elif not self.written: raise stem.ProtocolError("STREAM_BW event is missing its written value") diff --git a/stem/util/conf.py b/stem/util/conf.py index cc80cb8..395d8f1 100644 --- a/stem/util/conf.py +++ b/stem/util/conf.py @@ -606,9 +606,9 @@ class Config(object): conf_comp = [entry.strip() for entry in conf_value.split(",")] # check if the count doesn't match - if count != None and len(conf_comp) != count: + if count is not None and len(conf_comp) != count: msg = "Config entry '%s' is expected to be %i comma separated values" % (key, count) - if default != None and (isinstance(default, list) or isinstance(default, tuple)): + if default is not None and (isinstance(default, list) or isinstance(default, tuple)): defaultStr = ", ".join([str(i) for i in default]) msg += ", defaulting to '%s'" % defaultStr @@ -642,7 +642,7 @@ class Config(object): base_error_msg = "Config entry '%s' is expected to %%s" % key # includes our default value in the message - if default != None and (isinstance(default, list) or isinstance(default, tuple)): + if default is not None and (isinstance(default, list) or isinstance(default, tuple)): default_str = ", ".join([str(i) for i in default]) base_error_msg += ", defaulting to '%s'" % default_str @@ -651,10 +651,10 @@ class Config(object): error_msg = base_error_msg % "only have integer values" break else: - if min_value != None and int(val) < min_value: + if min_value is not None and int(val) < min_value: error_msg = base_error_msg % "only have values over %i" % min_value break - elif max_value != None and int(val) > max_value: + elif max_value is not None and int(val) > max_value: error_msg = base_error_msg % "only have values less than %i" % max_value break diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index 496028c..7c424cf 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -554,8 +554,8 @@ class TestController(unittest.TestCase): count = 0 for desc in controller.get_server_descriptors(): - self.assertTrue(desc.fingerprint != None) - self.assertTrue(desc.nickname != None) + self.assertTrue(desc.fingerprint is not None) + self.assertTrue(desc.nickname is not None) # Se don't want to take the time to read the whole thing. We already # have another test that reads the full cached descriptors (and takes a @@ -620,8 +620,8 @@ class TestController(unittest.TestCase): count = 0 for desc in controller.get_network_statuses(): - self.assertTrue(desc.fingerprint != None) - self.assertTrue(desc.nickname != None) + self.assertTrue(desc.fingerprint is not None) + self.assertTrue(desc.nickname is not None) count += 1 if count > 10: break diff --git a/test/output.py b/test/output.py index 001c6a5..fdbafac 100644 --- a/test/output.py +++ b/test/output.py @@ -99,7 +99,7 @@ def apply_filters(testing_output, *filters): line = result_filter(line_type, line) if line is None: break - if line != None: + if line is not None: results.append(line) return "\n".join(results) + "\n" diff --git a/test/runner.py b/test/runner.py index acf346e..0393a68 100644 --- a/test/runner.py +++ b/test/runner.py @@ -360,7 +360,7 @@ class Runner(object): # Check for an unexpected shutdown by calling subprocess.Popen.poll(), # which returns the exit code or None if we're still running. - if self._tor_process and self._tor_process.poll() != None: + if self._tor_process and self._tor_process.poll() is not None: # clean up the temporary resources and note the unexpected shutdown self.stop() test.output.print_line("tor shut down unexpectedly", *ERROR_ATTR)

1 0

[translation/whisperback_completed] Update translations for whisperback_completed
by translation＠torproject.org 04 Dec '12

04 Dec '12

commit 08aebaaa7c53b6e4993acfb3a52a3d1e5ce0dda3 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 4 16:45:51 2012 +0000 Update translations for whisperback_completed --- lv/lv.po | 247 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 247 insertions(+), 0 deletions(-) diff --git a/lv/lv.po b/lv/lv.po new file mode 100644 index 0000000..a90397f --- /dev/null +++ b/lv/lv.po @@ -0,0 +1,247 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Ojars Balcers <ojars.balcers(a)gmail.com>, 2012. +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2012-02-16 22:33+0100\n" +"PO-Revision-Date: 2012-12-04 16:16+0000\n" +"Last-Translator: Ojars Balcers <ojars.balcers(a)gmail.com>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: lv\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n" + +#. XXX use a better exception +#: ../whisperBack/whisperback.py:63 +#, python-format +msgid "Invalid contact email: %s" +msgstr "Nederīgs saziņas e-pasts: %s" + +#: ../whisperBack/whisperback.py:80 +#, python-format +msgid "Invalid contact OpenPGP key: %s" +msgstr "Nederīga saziņas OpenPGP atslēga: %s" + +#: ../whisperBack/whisperback.py:82 +msgid "Invalid contact OpenPGP public key block" +msgstr "Nederīgs saziņas OpenPGP publiskās atslēgas bloks" + +#: ../whisperBack/encryption.py:126 +msgid "No keys found." +msgstr "Atslēgas netika atrastas." + +#: ../whisperBack/exceptions.py:41 +#, python-format +msgid "" +"The variable %s was not found in any of the configuation " +"files/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py" +msgstr "Mainīgais %s netika atrasts nevienā no konfigurācijas datnēm/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py" + +#: ../whisperBack/gui.py:114 +msgid "Name of the affected software" +msgstr "Ietekmētās programatūras nosaukums" + +#: ../whisperBack/gui.py:115 +msgid "Exact steps to reproduce the problem" +msgstr "Precīzi soļi problēmas atkārtotai izraisīšanai" + +#: ../whisperBack/gui.py:116 +msgid "Actual result / the problem" +msgstr "Faktiskais rezultāts / problēma" + +#: ../whisperBack/gui.py:117 +msgid "Desired result" +msgstr "Vēlamais rezultāts" + +#: ../whisperBack/gui.py:155 +msgid "Unable to load a valid configuration." +msgstr "Nespēj ielādēt derīgu konfigurāciju." + +#: ../whisperBack/gui.py:177 +#, python-format +msgid "" +"<h1>Help us fix your bug!</h1>\n" +"Read <a href=\"%s\">our bug reporting instructions</a>.\n" +"Do not include more personal information than\n" +"needed!\n" +"<h2>About giving us an email address</h2>\n" +"If you don't mind disclosing some bits of your identity\n" +"to Tails developers, you can provide an email address to\n" +"let us ask more details about the bug. Additionally entering\n" +"a public PGP key enables us to encrypt such future\n" +"communication.\n" +"Anyone who can see this reply will probably infer you are\n" +"a Tails user. Time to wonder how much you trust your\n" +"Internet and mailbox providers?\n" +msgstr "<h1>Palīdziet mums atrisināt Jūsu problēmu!</h1>\nLasiet <a href=\"%s\">mūsu kļūdu pieteikšanas instrukcijas</a>.\nNenorādiet vairāk personiskas informācijas kā nepieciešamas!\n<h2>Par e-pasta adreses norādīšanu</h2>\nJa neiebilstat atklāt daļu no savas identitātes Tails izstrādātājiem, variet norādīt savu e-pasta adresi,lai mē varētu uzdot vairāk jautājumus par kļūdu. Turklāt publiskas PGP atslēgas norādīšana sniegtu mums iespēju šifrēt mūsu turpmāko saziņu.\nIkviens, kas var redzēt šo atbildi, tā varētu domāt, uzskatīs Jūs par Tails lietotāju. Varbūt ir pienācis laiks izvērtēt cik daudz Jūs uzticaties saviem interneta un e-pasta pakalpojumu sniedzējiem?\n" + +#: ../whisperBack/gui.py:229 +msgid "Sending mail..." +msgstr "Sūta e-pastu..." + +#: ../whisperBack/gui.py:230 +msgid "Sending mail" +msgstr "Sūta e-pastu" + +#. pylint: disable=C0301 +#: ../whisperBack/gui.py:232 +msgid "This could take a while..." +msgstr "Tas varētu aizņemt kādu brītiņu..." + +#: ../whisperBack/gui.py:246 +msgid "The contact email adress doesn't seem valid." +msgstr "Šķiet, ka saziņas e-pasta adrese nav derīga." + +#: ../whisperBack/gui.py:263 +msgid "Unable to send the mail: SMTP error." +msgstr "Nespēj nosūtīt e-pastu: SMTP kļūda." + +#: ../whisperBack/gui.py:265 +msgid "Unable to connect to the server." +msgstr "Nespēj izveidot savienojumu ar serveri." + +#: ../whisperBack/gui.py:267 +msgid "Unable to create or to send the mail." +msgstr "Nespēj izveidot vai nosūtīt e-pastu." + +#: ../whisperBack/gui.py:270 +msgid "" +"\n" +"\n" +"The bug report could not be sent, likely due to network problems. Please try to reconnect to the network and click send again.\n" +"\n" +"If it does not work, you will be offered to save the bug report." +msgstr "\n\nKļūdu ziņojumu nebija iespējams nosūtīt, ticami, ar tīklu saistītu kļūmju dēļ. Lūdzu, mēģiniet atkārtoti pievienoties tīklam un nospiediet SŪTĪT vēlreiz.\n\nJa tas nelīdzēs, tiks piedāvāts saglabāt kļūdu ziņojumu." + +#: ../whisperBack/gui.py:283 +msgid "Your message has been sent." +msgstr "Jūsu vēstījums ir nosūtīts." + +#: ../whisperBack/gui.py:289 +msgid "Unable to find encryption key." +msgstr "Nespēj atrast šifrēšanas atslēgu." + +#: ../whisperBack/gui.py:293 +msgid "An error occured during encryption." +msgstr "Šifrēšanas laikā notika kļūda." + +#: ../whisperBack/gui.py:313 +#, python-format +msgid "Unable to save %s." +msgstr "Nespēj saglabāt %s." + +#. XXX: fix string +#: ../whisperBack/gui.py:337 +#, python-format +msgid "" +"The bug report could not be sent, likely due to network problems.\n" +"\n" +"As a work-around you can save the bug report as a file on a USB drive and try to send it to us at %s from your email account using another system. Note that your bug report will not be anonymous when doing so unless you take further steps yourself (e.g. using Tor with a throw-away email account).\n" +"\n" +"Do you want to save the bug report to a file?" +msgstr "Kļūdu ziņojumu nebija iespējams nosūtīt, ticami, ar tīklu saistītu kļūmju dēļ.\n\nAizstājējrisinājums ir saglabāt kļūdu ziņojumu datnē vai zibatmiņā jeb USB diskā, tad mēģināt nosūtīt ziņojumu mums uz %s no sava e-pasta, bet izmantojot citu sistēmu. Ievērojiet, ka tā darot kļūdu ziņojums nebūs anonīms, ja vien pats neveiksit atbilstīgus pasākumus (piem., lietot Tor ar citādi nelietojamu e-pastu).\n\nVai vēlaties saglabāt kļūdu ziņojumu datnē?" + +#: ../whisperBack/gui.py:401 ../data/whisperback.ui.h:11 +msgid "WhisperBack" +msgstr "WhisperBack" + +#: ../whisperBack/gui.py:402 ../data/whisperback.ui.h:8 +msgid "Send feedback in an encrypted mail." +msgstr "Sūtīt atsauksmes šifrētā e-pastā." + +#: ../whisperBack/gui.py:405 +msgid "Copyright © 2009-2012 Tails developpers (tails(a)boum.org)" +msgstr "Autortiesības © 2009-2012 Tails developpers (tails(a)boum.org)" + +#: ../whisperBack/gui.py:406 +msgid "Tails developers <tails(a)boum.org>" +msgstr "Tails izstrādātāji <tails(a)boum.org>" + +#: ../whisperBack/gui.py:407 +msgid "translator-credits" +msgstr "tulkotāji" + +#: ../whisperBack/gui.py:434 +msgid "This doesn's seem to be a valid URL or OpenPGP key." +msgstr "Šķiet, ka šie nav derīgi URL vai OpenPGP atslēga." + +#: ../data/whisperback.ui.h:1 +msgid "" +"Add a PGP key if you want us to encrypt messages when we respond to you." +msgstr "Pievienot PGP atslēgu, ja vēlaties, lai atbildot šifrējam ziņojumus." + +#: ../data/whisperback.ui.h:2 +msgid "Bug description" +msgstr "Kļūdas apraksts" + +#: ../data/whisperback.ui.h:3 +msgid "Copyright © 2009-2012 tails(a)boum.org" +msgstr "Autortiesības © 2009-2012 tails(a)boum.org" + +#: ../data/whisperback.ui.h:4 +msgid "Help" +msgstr "Palīdzība" + +#: ../data/whisperback.ui.h:5 +msgid "" +"If you want us to encrypt messages when we respond to you, add your key ID, " +"a link to your key, or the key as a public key block:" +msgstr "Ja vēlaties, lai atbildot šifrējam ziņojumus, pievienojiet savu atslēgas ID, saiti uz savu atslēgu, vai atslēgu kā publisku atslēgu bloku:" + +#: ../data/whisperback.ui.h:6 +msgid "Optional email address to contact you" +msgstr "Neobligāta e-pasta adrese saziņai ar Jums" + +#: ../data/whisperback.ui.h:7 +msgid "Send" +msgstr "Nosūtīt" + +#: ../data/whisperback.ui.h:9 +msgid "Summary" +msgstr "Kopsavilkums" + +#: ../data/whisperback.ui.h:10 +msgid "Technical details to include" +msgstr "Iekļaujamā tehniskā informācija" + +#: ../data/whisperback.ui.h:12 +msgid "" +"WhisperBack - Send feedback in an encrypted mail\n" +"Copyright (C) 2009-2012 Tails developers <tails(a)boum.org>\n" +"\n" +"This program is free software; you can redistribute it and/or modify\n" +"it under the terms of the GNU General Public License as published by\n" +"the Free Software Foundation; either version 3 of the License, or (at\n" +"your option) any later version.\n" +"\n" +"This program is distributed in the hope that it will be useful, but\n" +"WITHOUT ANY WARRANTY; without even the implied warranty of\n" +"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n" +"General Public License for more details.\n" +"\n" +"You should have received a copy of the GNU General Public License\n" +"along with this program. If not, see <http://www.gnu.org/licenses/>.\n" +msgstr "WhisperBack - sūtīt atsauksmes šifrētā e-pastā\nAutortiesības (C) 2009-2012 Tails izstrādātāji <tails(a)boum.org>\n\nŠī programma ir bezmaksas programmatūra; variet to izplatīt un/vai modificēt\nievērojot GNU Vispārējas publiskas licences noteikumus, kurus publicējis Brīvas programmatūras fonds; vai nu Licences 3. versiju, vai arī (pēc savas izvēles) jebkuru vēlāku versiju.\n\nŠo programmatūru izplata cerot, ka tā būs derīga, tomēr \nBEZ NEKĀDĀM GARANTIJĀM; pat bez tieši nenolīgtām TIRDZNIECĪBAS garantījām vai t.s. PIEMĒROTĪBAS NOTEIKTAM NOLŪKAM. Papildu informācijai lūdzu skatiet GNU Vispārējo publisko licenci.\n\nKopā ar šo programmu Jums vajadzēja saņemt GNU Vispārējās publiskās licences kopiju. Ja tas tā nav, skatiet <http://www.gnu.org/licenses/>.\n" + +#: ../data/whisperback.ui.h:28 +msgid "debugging info" +msgstr "atkļūdošanas informācija" + +#: ../data/whisperback.ui.h:29 +msgid "headers" +msgstr "galvenes" + +#: ../data/whisperback.ui.h:30 +msgid "https://tails.boum.org/" +msgstr "https://tails.boum.org/" + +#: ../data/whisperback.ui.h:31 +msgid "optional PGP key" +msgstr "neobligāta PGP atslēga"

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 04 Dec '12

04 Dec '12

commit a20e9b0024a6b5cee69b6d7873dd66760cad1be4 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 4 16:45:49 2012 +0000 Update translations for whisperback --- lv/lv.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lv/lv.po b/lv/lv.po index ec34931..a90397f 100644 --- a/lv/lv.po +++ b/lv/lv.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-02-16 22:33+0100\n" -"PO-Revision-Date: 2012-12-04 16:03+0000\n" +"PO-Revision-Date: 2012-12-04 16:16+0000\n" "Last-Translator: Ojars Balcers <ojars.balcers(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -228,7 +228,7 @@ msgid "" "\n" "You should have received a copy of the GNU General Public License\n" "along with this program. If not, see <http://www.gnu.org/licenses/>.\n" -msgstr "" +msgstr "WhisperBack - sūtīt atsauksmes šifrētā e-pastā\nAutortiesības (C) 2009-2012 Tails izstrādātāji <tails(a)boum.org>\n\nŠī programma ir bezmaksas programmatūra; variet to izplatīt un/vai modificēt\nievērojot GNU Vispārējas publiskas licences noteikumus, kurus publicējis Brīvas programmatūras fonds; vai nu Licences 3. versiju, vai arī (pēc savas izvēles) jebkuru vēlāku versiju.\n\nŠo programmatūru izplata cerot, ka tā būs derīga, tomēr \nBEZ NEKĀDĀM GARANTIJĀM; pat bez tieši nenolīgtām TIRDZNIECĪBAS garantījām vai t.s. PIEMĒROTĪBAS NOTEIKTAM NOLŪKAM. Papildu informācijai lūdzu skatiet GNU Vispārējo publisko licenci.\n\nKopā ar šo programmu Jums vajadzēja saņemt GNU Vispārējās publiskās licences kopiju. Ja tas tā nav, skatiet <http://www.gnu.org/licenses/>.\n" #: ../data/whisperback.ui.h:28 msgid "debugging info"

1 0

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

04 Dec '12

commit 5c5262848b5c8e46a43c414e71d335d58cfe2c65 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 4 16:45:38 2012 +0000 Update translations for vidalia_help_completed --- es/server.po | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/es/server.po b/es/server.po index 258c991..21cc8d7 100644 --- a/es/server.po +++ b/es/server.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: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2012-12-04 16:14+0000\n" +"PO-Revision-Date: 2012-12-04 16:44+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" @@ -201,7 +201,7 @@ msgid "" "resource from your relay. If the box labeled Misc Other Services is " "checked, Tor users will be able to access other services not covered by the " "other checkboxes or Tor's default exit policy." -msgstr "Cada una de las casillas representa un tipo de recurso cuyo acceso puede permitir a los usuarios de Tor a través de su repetidor. Si desmarca la casilla junto a un recurso en particular, los usuarios de Tor no podrán acceder a ese recurso desde su repetidor. Si la casilla Otros servicios está marcada, los usuarios de Tor podrán acceder a otros servicios no cubiertos por las otras casillas de marcado o por la política de salida por defecto de Tor. " +msgstr "Cada una de las casillas representa un tipo de recurso cuyo acceso puede permitir a los usuarios de Tor a través de su repetidor. Si desmarca la casilla junto a un recurso en particular, los usuarios de Tor no podrán acceder a ese recurso a través de su repetidor. Si la casilla Otros servicios está marcada, los usuarios de Tor podrán acceder a otros servicios no configurados por las demás casillas o por la política de salida por defecto de Tor a través de su repetidor." #. type: Content of: <html><body> #: en/server.html:130 @@ -210,12 +210,12 @@ msgid "" "represented by each of the exit policy checkboxes. The Description " "column describes the resources Tor clients will be allowed to access through" " your relay, if the associated box is checked." -msgstr "La siguiente tabla contiene la lista completa de los números de puerto específicos representados por cada una de las casillas de las políticas de salida. La columna Descripción describe los recursos que los clientes de Tor tendrán permiso de acceder a través de su repetidor, si la casilla correspondiente está marcada." +msgstr "Para completar, la siguiente tabla lista los números de puerto específicos representados por cada una de las casillas de las políticas de salida. La columna Descripción describe los recursos que los clientes de Tor tendrán permiso para acceder a través de su repetidor, si la casilla correspondiente está marcada." #. type: Content of: <html><body><table><tr><td> #: en/server.html:138 msgid "Checkbox" -msgstr "Casillas de marcado" +msgstr "Casilla de política de salida" #. type: Content of: <html><body><table><tr><td> #: en/server.html:139 @@ -275,7 +275,7 @@ msgstr "Descarga de correo (no permite el envío de correo)" #. type: Content of: <html><body><table><tr><td> #: en/server.html:158 msgid "Instant Messaging (IM)" -msgstr "Mensajería Instantanea (IM)" +msgstr "Mensajería instantanea (IM)" #. type: Content of: <html><body><table><tr><td> #: en/server.html:159 @@ -306,7 +306,7 @@ msgstr "Clientes y servidores de IRC" #. type: Content of: <html><body><table><tr><td> #: en/server.html:168 msgid "Misc. Other Services" -msgstr "Otros Servicios" +msgstr "Otros servicios" #. type: Content of: <html><body><table><tr><td> #: en/server.html:169 @@ -316,7 +316,7 @@ msgstr "*" #. type: Content of: <html><body><table><tr><td> #: en/server.html:170 msgid "All other applications that aren't covered by the previous checkboxes" -msgstr "Todas las demás aplicaciones que no están cubiertas por las casillas de marcado anteriores" +msgstr "Todas las demás aplicaciones que no están cubiertas por las casillas de configuración anteriores" #. type: Content of: <html><body> #: en/server.html:175 @@ -326,7 +326,7 @@ msgid "" "uncheck all of the checkboxes, your relay is still useful to the Tor " "network. Your relay will allow other Tor users to connect to the Tor " "network and will help relay traffic between other Tor relays." -msgstr "Si no desea permitir a otros usuarios de Tor hacer conexiones hacia el exterior de la red Tor desde su repetidor, puede desmarcar todas las casillas. Incluso si desmarca todas las casillas, su repetidor es todavía útil para la red Tor. Su repetidor permitirá a otros usuarios conectarse a la red Tor y ayudará a rebotar el tráfico entre otros repetidores Tor." +msgstr "Si no desea permitir a otros usuarios de Tor hacer conexiones hacia el exterior de la red Tor desde su repetidor, puede desmarcar todas las casillas. Incluso si desmarca todas las casillas su repetidor es todavía útil para la red Tor, permitirá a otros usuarios conectarse a la red Tor y ayudará a otros repetidores Tor a rebotar tráfico entre ellos." #. type: Content of: <html><body> #: en/server.html:182 @@ -334,7 +334,7 @@ msgid "" "If you chose to run a bridge relay, the Exit Policies tab will be " "grayed out, since bridge relays do not allow exit connections. Bridges are " "only used by Tor clients to connect to the Tor network." -msgstr "Si elige correr un repetidor puente (bridge relay, de propagación restringida), las pestaña de Políticas de Salida aparecerá sombreada, ya que los repetidores puente no permiten las conexiones de salida. Los bridges sólo son usados por los clientes de Tor para conectarse a la red Tor." +msgstr "Si elige ejecutar un repetidor puente (bridge, acceso a Tor de publicitación restringida), las pestaña de Políticas de salida aparecerá sombreada, ya que los bridges no permiten conexiones de salida de Tor. Los bridges sólo son usados por los clientes de Tor para conectarse a la red Tor." #. type: Content of: <html><body> #: en/server.html:188 @@ -344,7 +344,7 @@ msgstr "<a name=\"upnp\"/>" #. type: Content of: <html><body><h3> #: en/server.html:189 msgid "Port Forwarding" -msgstr "Redireccionamiento de Puertos" +msgstr "Redireccionamiento de puertos" #. type: Content of: <html><body> #: en/server.html:191

1 0