- tor-commits - lists.torproject.org

[stem/master] Convert keys before reporting error
by atagar＠torproject.org 30 Dec '12

30 Dec '12

commit ef5c552e59017936699048d680f5f377f1b60d66 Author: Sean Robinson <seankrobinson(a)gmail.com> Date: Sat Dec 22 04:17:38 2012 -0700 Convert keys before reporting error Non-string argument keys caused the ", ".join() to fail with a TypeError. Also, remove the the space in the join so that there is only one parameter passed to the string substitution. Signed-off-by: Sean Robinson <seankrobinson(a)gmail.com> --- test/mocking.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/test/mocking.py b/test/mocking.py index 20ac76e..fa9e71f 100644 --- a/test/mocking.py +++ b/test/mocking.py @@ -223,7 +223,8 @@ def return_for_args(args_to_return_value, default = None): return args_to_return_value[args] elif default is None: arg_label = ", ".join([str(v) for v in args]) - raise ValueError("Unrecognized argument sent for return_for_args(). Got '%s' but we only recognize '%s'." % (arg_label, ", ".join(args_to_return_value.keys()))) + arg_keys = ";".join([str(v) for v in args_to_return_value.keys()]) + raise ValueError("Unrecognized argument sent for return_for_args(). Got '%s' but we only recognize '%s'." % (arg_label, arg_keys)) else: return default(args)

1 0

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

30 Dec '12

commit 7d5ccb9e09847e87a21596a8cd63699ce9de9d6c Author: Translation commit bot <translation(a)torproject.org> Date: Sun Dec 30 04:46:07 2012 +0000 Update translations for torbirdy --- pt_BR/torbirdy.dtd | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pt_BR/torbirdy.dtd b/pt_BR/torbirdy.dtd index 2eef188..79d53b9 100644 --- a/pt_BR/torbirdy.dtd +++ b/pt_BR/torbirdy.dtd @@ -43,4 +43,4 @@ <!ENTITY torbirdy.panel.usetor.label ""> <!ENTITY torbirdy.panel.usejondo.label ""> -<!ENTITY torbirdy.panel.preferences.label ""> +<!ENTITY torbirdy.panel.preferences.label "Abrir Preferências">

1 0

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

30 Dec '12

commit 1ab9bf8459ad32c8f547c8872d181ac974b420b9 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Dec 30 04:46:05 2012 +0000 Update translations for tails-greeter_completed --- pt_BR/pt_BR.po | 140 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 140 insertions(+), 0 deletions(-) diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po new file mode 100644 index 0000000..186ff04 --- /dev/null +++ b/pt_BR/pt_BR.po @@ -0,0 +1,140 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# <alkaidw(a)gmail.com>, 2012. +# <geronimo.bruno(a)gmail.com>, 2012. +# <luis_zik13(a)hotmail.com>, 2012. +# <rafaelmartinsrm(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-06-01 15:10+0200\n" +"PO-Revision-Date: 2012-12-30 04:22+0000\n" +"Last-Translator: alkaid <alkaidw(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: pt_BR\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#: ../glade/persistencewindow.glade.h:1 ../glade/optionswindow.glade.h:1 +#: ../GdmGreeter/persistencewindow.py:128 +msgid "Login" +msgstr "Login" + +#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:2 +msgid "Welcome to Tails" +msgstr "Bem-vindo ao Tails" + +#: ../glade/persistencewindow.glade.h:3 +msgid "Use persistence?" +msgstr "Usar persistência?" + +#: ../glade/persistencewindow.glade.h:4 +msgid "Yes" +msgstr "Sim" + +#: ../glade/persistencewindow.glade.h:5 +msgid "No" +msgstr "Não" + +#: ../glade/persistencewindow.glade.h:6 +msgid "Passphrase:" +msgstr "Senha:" + +#: ../glade/persistencewindow.glade.h:7 +msgid "Read-Only?" +msgstr "Somente leitura?" + +#: ../glade/persistencewindow.glade.h:8 ../glade/optionswindow.glade.h:8 +#: ../glade/langpanel.glade.h:1 +msgid " " +msgstr " " + +#: ../glade/persistencewindow.glade.h:9 +msgid "More options?" +msgstr "Mais opções?" + +#: ../glade/optionswindow.glade.h:3 +msgid "Administration password" +msgstr "Senha do administrador" + +#: ../glade/optionswindow.glade.h:4 +msgid "" +"Enter an administration password in case you need to perform administration tasks.\n" +"Otherwise it will be disabled for better security." +msgstr "Crie uma senha do administrador caso você precise realizar tarefas administrativas.\nCaso contrário essa função será desabilitada por segurança." + +#: ../glade/optionswindow.glade.h:6 +msgid "Password:" +msgstr "Senha:" + +#: ../glade/optionswindow.glade.h:7 +msgid "Verify Password:" +msgstr "Verificar Senha:" + +#: ../glade/optionswindow.glade.h:9 +msgid "Windows Camouflage" +msgstr "Camuflar Janela" + +#: ../glade/optionswindow.glade.h:10 +msgid "" +"This option makes Tails look more like Microsoft Windows XP. This may be " +"useful in public places in order to avoid attracting suspicion." +msgstr "Essa opção deixa o Tails mais parecido com o Microsoft Windows XP. Isso poderá ser útil em lugares públicos para evitar suspeitas." + +#: ../glade/optionswindow.glade.h:11 +msgid "Activate Microsoft Windows XP Camouflage" +msgstr "Ativar Camuflagem Microsoft Windows XP" + +#: ../glade/langpanel.glade.h:2 ../GdmGreeter/langpanel.py:42 +msgid "Language" +msgstr "Linguagem" + +#: ../glade/langpanel.glade.h:3 +msgid "Locale" +msgstr "Local" + +#: ../glade/langpanel.glade.h:4 +msgid "Layout" +msgstr "Layout" + +#: ../GdmGreeter/optionswindow.py:68 +msgid "Passwords do not match" +msgstr "As senhas não conferem" + +#: ../GdmGreeter/persistence.py:59 +#, python-format +msgid "" +"live-persist failed with return code %(returncode)s:\n" +"%(stderr)s" +msgstr "live-persist falhou com código de retorno %(returncode)s:\n%(stderr)s" + +#: ../GdmGreeter/persistence.py:99 +#, python-format +msgid "" +"cryptsetup failed with return code %(returncode)s:\n" +"%(stdout)s\n" +"%(stderr)s" +msgstr "cryptsetup falhou com código de retorno %(returncode)s:\n%(stdout)s\n%(stderr)s" + +#: ../GdmGreeter/persistence.py:124 +#, python-format +msgid "" +"live-persist failed with return code %(returncode)s:\n" +"%(stdout)s\n" +"%(stderr)s" +msgstr "live-persist falhou com código de retorno %(returncode)s:\n%(stdout)s\n%(stderr)s" + +#: ../GdmGreeter/persistencewindow.py:94 +msgid "Wrong passphrase. Please try again." +msgstr "Senha incorreta. Tente novamente." + +#: ../GdmGreeter/langpanel.py:124 ../GdmGreeter/langpanel.py:148 +#: ../GdmGreeter/langpanel.py:181 +msgid "Other..." +msgstr "Outro..."

1 0

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

30 Dec '12

commit bf2e606704f0852580d7d0c5c83ce2d3cebdc1f1 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Dec 30 04:46:03 2012 +0000 Update translations for tails-greeter --- pt_BR/pt_BR.po | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po index 47ebd3a..186ff04 100644 --- a/pt_BR/pt_BR.po +++ b/pt_BR/pt_BR.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# <alkaidw(a)gmail.com>, 2012. # <geronimo.bruno(a)gmail.com>, 2012. # <luis_zik13(a)hotmail.com>, 2012. # <rafaelmartinsrm(a)gmail.com>, 2012. @@ -11,8 +12,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-06-01 15:10+0200\n" -"PO-Revision-Date: 2012-12-27 23:11+0000\n" -"Last-Translator: Killer <luis_zik13(a)hotmail.com>\n" +"PO-Revision-Date: 2012-12-30 04:22+0000\n" +"Last-Translator: alkaid <alkaidw(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" @@ -111,7 +112,7 @@ msgstr "As senhas não conferem" msgid "" "live-persist failed with return code %(returncode)s:\n" "%(stderr)s" -msgstr "" +msgstr "live-persist falhou com código de retorno %(returncode)s:\n%(stderr)s" #: ../GdmGreeter/persistence.py:99 #, python-format @@ -119,7 +120,7 @@ msgid "" "cryptsetup failed with return code %(returncode)s:\n" "%(stdout)s\n" "%(stderr)s" -msgstr "" +msgstr "cryptsetup falhou com código de retorno %(returncode)s:\n%(stdout)s\n%(stderr)s" #: ../GdmGreeter/persistence.py:124 #, python-format @@ -127,7 +128,7 @@ msgid "" "live-persist failed with return code %(returncode)s:\n" "%(stdout)s\n" "%(stderr)s" -msgstr "" +msgstr "live-persist falhou com código de retorno %(returncode)s:\n%(stdout)s\n%(stderr)s" #: ../GdmGreeter/persistencewindow.py:94 msgid "Wrong passphrase. Please try again."

1 0

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

30 Dec '12

commit 16cd157d88d2f9a7a8932a61a751f3ce190edaba Author: Translation commit bot <translation(a)torproject.org> Date: Sun Dec 30 04:45:59 2012 +0000 Update translations for liveusb-creator --- ja/ja.po | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ja/ja.po b/ja/ja.po index 02c6354..84ab2c3 100644 --- a/ja/ja.po +++ b/ja/ja.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# <alkaidw(a)gmail.com>, 2012. # Hajime Taira <htaira(a)redhat.com>, 2010. # Hyu_gabaru Ryu_ichi <hyu_gabaru(a)yahoo.co.jp>, 2009. msgid "" @@ -10,8 +11,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-04-13 14:16+0200\n" -"PO-Revision-Date: 2012-10-03 18:09+0000\n" -"Last-Translator: Tor Project <tor-assistants(a)torproject.org>\n" +"PO-Revision-Date: 2012-12-30 04:39+0000\n" +"Last-Translator: alkaid <alkaidw(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" @@ -114,7 +115,7 @@ msgstr "" #: ../liveusb/gui.py:648 ../liveusb/gui.py:665 msgid "Next" -msgstr "" +msgstr "次" #: ../liveusb/gui.py:658 msgid ""

1 0

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

30 Dec '12

commit beb857526526b05fdff36f72594c57286eccf1b8 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Dec 30 04:45:39 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 d5ab717..9e174e4 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 04:13+0000\n" +"PO-Revision-Date: 2012-12-30 04:20+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" @@ -46,7 +46,7 @@ msgid "" "through a series of relays on the network. Your application's traffic is " "then sent as a stream through that circuit. For efficiency, multiple " "streams may share the same circuit." -msgstr "Cuando quiere comunicarse de forma anónima a través de Tor (por ejemplo, al conectar a un sitio web), Tor crea un túnel, o circuito, de conexiones cifradas a través de una serie de repetidores (relays) en la red Tor. El tráfico de su aplicación se envía como una secuencia (stream) a través de ese circuito. Por eficiencia, múltiples secuencias pueden compartir el mismo circuito." +msgstr "Cuando quiere comunicarse de forma anónima a través de Tor (ej. al conectar a un sitio web), Tor crea un túnel, o circuito, de conexiones cifradas a través de una serie de repetidores en la red Tor. El tráfico de su aplicación se envía como una secuencia (stream) a través de ese circuito. Por eficiencia, múltiples secuencias pueden compartir el mismo circuito." #. type: Content of: <html><body> #: en/netview.html:35

1 0

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

30 Dec '12

commit 818b0cb85390a8f5fb0ed6d872ba707bebdb6147 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Dec 30 04:45:32 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 d5ab717..9e174e4 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 04:13+0000\n" +"PO-Revision-Date: 2012-12-30 04:20+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" @@ -46,7 +46,7 @@ msgid "" "through a series of relays on the network. Your application's traffic is " "then sent as a stream through that circuit. For efficiency, multiple " "streams may share the same circuit." -msgstr "Cuando quiere comunicarse de forma anónima a través de Tor (por ejemplo, al conectar a un sitio web), Tor crea un túnel, o circuito, de conexiones cifradas a través de una serie de repetidores (relays) en la red Tor. El tráfico de su aplicación se envía como una secuencia (stream) a través de ese circuito. Por eficiencia, múltiples secuencias pueden compartir el mismo circuito." +msgstr "Cuando quiere comunicarse de forma anónima a través de Tor (ej. al conectar a un sitio web), Tor crea un túnel, o circuito, de conexiones cifradas a través de una serie de repetidores en la red Tor. El tráfico de su aplicación se envía como una secuencia (stream) a través de ese circuito. Por eficiencia, múltiples secuencias pueden compartir el mismo circuito." #. type: Content of: <html><body> #: en/netview.html:35

1 0

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

30 Dec '12

commit 4ccbd0f99744fa0abc5e249126dbed284678b361 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Dec 30 04:16:12 2012 +0000 Update translations for torbirdy_completed --- es/torbirdy.dtd | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/es/torbirdy.dtd b/es/torbirdy.dtd index e06fa4e..49104f5 100644 --- a/es/torbirdy.dtd +++ b/es/torbirdy.dtd @@ -40,3 +40,7 @@ <!ENTITY torbirdy.prefs.account_specific "Configuración específica de la cuenta"> <!ENTITY torbirdy.prefs.select_account.key "C"> <!ENTITY torbirdy.prefs.select_account.label "Elegir una cuenta"> + +<!ENTITY torbirdy.panel.usetor.label "Usar router onion de Tor"> +<!ENTITY torbirdy.panel.usejondo.label "Usar JonDo (premium)"> +<!ENTITY torbirdy.panel.preferences.label "Abrir Preferencias de TorBirdy">

1 0

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

30 Dec '12

commit 9231704a57a2ed1e9a1746ff362b8ca19770d550 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Dec 30 04:16:09 2012 +0000 Update translations for torbirdy --- es/torbirdy.dtd | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/es/torbirdy.dtd b/es/torbirdy.dtd index 9dcfe2f..49104f5 100644 --- a/es/torbirdy.dtd +++ b/es/torbirdy.dtd @@ -41,6 +41,6 @@ <!ENTITY torbirdy.prefs.select_account.key "C"> <!ENTITY torbirdy.prefs.select_account.label "Elegir una cuenta"> -<!ENTITY torbirdy.panel.usetor.label ""> -<!ENTITY torbirdy.panel.usejondo.label ""> -<!ENTITY torbirdy.panel.preferences.label ""> +<!ENTITY torbirdy.panel.usetor.label "Usar router onion de Tor"> +<!ENTITY torbirdy.panel.usejondo.label "Usar JonDo (premium)"> +<!ENTITY torbirdy.panel.preferences.label "Abrir Preferencias de TorBirdy">

1 0

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

30 Dec '12

commit 54db0e952f510a1ec54bc7c78307997aa9777f60 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Dec 30 04:15:42 2012 +0000 Update translations for vidalia_help_completed --- es/netview.po | 4 ++-- es/troubleshooting.po | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/es/netview.po b/es/netview.po index 405e715..d5ab717 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-20 04:00+0000\n" +"PO-Revision-Date: 2012-12-30 04: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" @@ -31,7 +31,7 @@ msgstr "El visor de red le permite ver los repetidores de la red Tor y por donde #. type: Content of: <html><body> #: en/netview.html:25 msgid "<a name=\"overview\"/>" -msgstr "<a name=\"sumario\"/>" +msgstr "<a name=\"vistageneral\"/>" #. type: Content of: <html><body><h3> #: en/netview.html:26 diff --git a/es/troubleshooting.po b/es/troubleshooting.po index cdc6974..a75124f 100644 --- a/es/troubleshooting.po +++ b/es/troubleshooting.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-08-03 15:49-0300\n" -"PO-Revision-Date: 2012-12-30 03:45+0000\n" +"PO-Revision-Date: 2012-12-30 03:52+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" @@ -206,7 +206,7 @@ msgstr "Si Tor se cierra inmediatamente después de iniciarlo, seguramente tendr msgid "" "connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n" "Is Tor already running?\n" -msgstr "connection_create_listener (): No se pudo anclar (bind) en 127.0.0.1:9050\n(la conexión de control de Vidalia con su software Tor). La dirección ya está en uso.\n¿Está Tor ejecutándose?\n" +msgstr "connection_create_listener (): No se pudo anclar (bind) en 127.0.0.1:9050\n(control de Tor por socket de dominio Unix): La dirección ya está en uso.\n¿Está Tor ejecutándose?\n" # type: Content of: <html><body> #: en/troubleshooting.html:135

1 0