August 2013 - tor-commits - lists.torproject.org

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 21 Aug '13

21 Aug '13

commit 5ea04e51e9fecac86b20a885c82b9fe366e8b7e0 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Aug 21 22:46:47 2013 +0000 Update translations for tails-misc --- pt_BR.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pt_BR.po b/pt_BR.po index ca94ecf..485cc29 100644 --- a/pt_BR.po +++ b/pt_BR.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Communia <ameaneantie(a)riseup.net>, 2013 # eduardolvt, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2013-07-30 19:08+0200\n" -"PO-Revision-Date: 2013-08-09 09:38+0000\n" -"Last-Translator: eduardolvt\n" +"POT-Creation-Date: 2013-08-07 14:06+0200\n" +"PO-Revision-Date: 2013-08-21 22:40+0000\n" +"Last-Translator: Communia <ameaneantie(a)riseup.net>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -34,7 +35,7 @@ msgid "" "<p>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?</p>\n" -msgstr "<h1>Ajude-nos a consertar seu bug!</h1>\n<p>Leia <a href=\"%s\">nossas instruções para reportar bug</a>.</p>\n<p><strong>Não inclua mais informações pessoais do que o necessário!</strong></p>\n<h2>Sobre dar-nos um endereço de e-mail</h2>\n<p>Se você não se importa em abrir um pouco da sua identidade\naos desenvolvedores Tails, você pode prover um email para contar-nos\nmais detalhes sobre o bug. Adicionalmente, entrando uma chave PGP\npública, nos permite encriptar futuras comunicações via e-mail.</p>\n<p>Qualquer um que puder ver esta resposta provavelmente deduzirá\nque você é um usuário Tails. Tempo para pensar o quanto você confia\nna sua internet e no seu provedor de e-mail?</p>\n" +msgstr "<h1>Ajude-nos a consertar seu bug!</h1>\n<p>Leia <a href=\"%s\">nossas instruções para de relatorio de bug</a>.</p>\n<p><strong>Não inclua mais informações pessoais do que o necessário!</strong></p>\n<h2>Sobre dar-nos um endereço de e-mail</h2>\n<p>Se você não se importar em abrir um pouco da sua identidade\naos desenvolvedores Tails, envie-nos um e-mail para contar\nmais detalhes sobre o bug. Além disso, introduzir uma chave PGP\npública, nos permite criptografar futuras comunicações relativas ao bug.</p>\n<p>Qualquer um que puder vir esta resposta provavelmente deduzirá\nque você é um usuário Tails. Tempo para pensar o quanto você confia\nna sua internet e no seu provedor de e-mail?</p>\n" #: config/chroot_local-includes/usr/local/bin/gpgApplet:136 msgid "OpenPGP encryption applet"

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 21 Aug '13

21 Aug '13

commit 93d6a2278efc2b70c09bc351bde3ddd430525895 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Aug 21 22:46:29 2013 +0000 Update translations for torbirdy --- pt_BR/torbirdy.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt_BR/torbirdy.dtd b/pt_BR/torbirdy.dtd index f8ced04..9b3d288 100644 --- a/pt_BR/torbirdy.dtd +++ b/pt_BR/torbirdy.dtd @@ -14,7 +14,7 @@ <!ENTITY torbirdy.prefs.cancel.button "Cancelar"> <!ENTITY torbirdy.prefs.extra1.button "Restaurar configurações padrão"> <!ENTITY torbirdy.prefs.extra1.key "d"> -<!ENTITY torbirdy.prefs.extra2.button ""> +<!ENTITY torbirdy.prefs.extra2.button "Testar as Configurações do Proxy"> <!ENTITY torbirdy.prefs.extra2.key "c"> <!ENTITY torbirdy.prefs.proxy.label "Configurações de Proxy"> <!ENTITY torbirdy.prefs.privacy.label "Configurações de Privacidade">

1 0

[translation/torbirdy_completed] Update translations for torbirdy_completed
by translation＠torproject.org 21 Aug '13

21 Aug '13

commit f2070b9fc96927ff796343d76f1e434559b2bad0 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Aug 21 22:16:43 2013 +0000 Update translations for torbirdy_completed --- pt_BR/torbirdy.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt_BR/torbirdy.properties b/pt_BR/torbirdy.properties index 1886e92..f9cf4ed 100644 --- a/pt_BR/torbirdy.properties +++ b/pt_BR/torbirdy.properties @@ -13,7 +13,7 @@ torbirdy.email.advanced=Por favor, tenha em mente que mudar as configurações a torbirdy.email.advanced.nextwarning=Mostrar esse aviso no futuro torbirdy.email.advanced.title=Configurações Avançadas do TorBirdy -torbirdy.restart=Para que as configurações de fuso horário tenham efeito, por favor reinicie o Thunderbird. +torbirdy.restart=Reinicie o Thunderbind para que a opção de zona do fuso horário seja ativada. torbirdy.firstrun=Você agora está executando o TorBirdy.\n\nPara melhorar a sua anonimidade o TorBirdy irá forçar as configurações do Thunderbird que ele criou, prevenindo que ela seja modificada por você ou por um acessório. Há algumas configurações que podem ser modificadas através das preferências do TorBirdy. Quando o TorBirdy for removido ou desativado, todas suas configurações são restauradas a seus valores padrões (os valores anteriores ao TorBirdy ser instalado)\n\nSe você for um novo usuário, recomenda-se que leia a página do TorBirdy para entender o que estamos almejando para nossos usuários com o TorBirdy. torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 21 Aug '13

21 Aug '13

commit 79f2170273202a8bb1312035c744f657fb08f3cb Author: Translation commit bot <translation(a)torproject.org> Date: Wed Aug 21 22:16:35 2013 +0000 Update translations for torbirdy --- pt_BR/torbirdy.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt_BR/torbirdy.properties b/pt_BR/torbirdy.properties index e28cd13..f9cf4ed 100644 --- a/pt_BR/torbirdy.properties +++ b/pt_BR/torbirdy.properties @@ -13,7 +13,7 @@ torbirdy.email.advanced=Por favor, tenha em mente que mudar as configurações a torbirdy.email.advanced.nextwarning=Mostrar esse aviso no futuro torbirdy.email.advanced.title=Configurações Avançadas do TorBirdy -# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect. +torbirdy.restart=Reinicie o Thunderbind para que a opção de zona do fuso horário seja ativada. torbirdy.firstrun=Você agora está executando o TorBirdy.\n\nPara melhorar a sua anonimidade o TorBirdy irá forçar as configurações do Thunderbird que ele criou, prevenindo que ela seja modificada por você ou por um acessório. Há algumas configurações que podem ser modificadas através das preferências do TorBirdy. Quando o TorBirdy for removido ou desativado, todas suas configurações são restauradas a seus valores padrões (os valores anteriores ao TorBirdy ser instalado)\n\nSe você for um novo usuário, recomenda-se que leia a página do TorBirdy para entender o que estamos almejando para nossos usuários com o TorBirdy. torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy

1 0

[translation/torbirdy_completed] Update translations for torbirdy_completed
by translation＠torproject.org 21 Aug '13

21 Aug '13

commit 723c90960e7abb6c19fd29d9ed4df23bc6e3a855 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Aug 21 18:16:35 2013 +0000 Update translations for torbirdy_completed --- es/torbirdy.dtd | 7 +++---- es/torbirdy.properties | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/es/torbirdy.dtd b/es/torbirdy.dtd index 59cce21..0b3e09b 100644 --- a/es/torbirdy.dtd +++ b/es/torbirdy.dtd @@ -12,9 +12,9 @@ <!ENTITY torbirdy.prefs.save.button "Guardar"> <!ENTITY torbirdy.prefs.save.key "g"> <!ENTITY torbirdy.prefs.cancel.button "Cancelar"> -<!ENTITY torbirdy.prefs.extra1.button "Resolver problema"> -<!ENTITY torbirdy.prefs.extra1.key "o"> -<!ENTITY torbirdy.prefs.extra2.button "Probar la configuración"> +<!ENTITY torbirdy.prefs.extra1.button "Restablecer valores predeterminados "> +<!ENTITY torbirdy.prefs.extra1.key "v"> +<!ENTITY torbirdy.prefs.extra2.button "Probar configuración para proxy"> <!ENTITY torbirdy.prefs.extra2.key "g"> <!ENTITY torbirdy.prefs.proxy.label "Configuración para proxy"> <!ENTITY torbirdy.prefs.privacy.label "Parámetros de privacidad"> @@ -59,4 +59,3 @@ <!ENTITY torbirdy.panel.preferences.label "Abrir Preferencias de TorBirdy"> <!ENTITY torbirdy.firstrun.title "Primera ejecución de TorBirdy"> -<!ENTITY torbirdy.troubleshoot.title "Resolución de problemas"> diff --git a/es/torbirdy.properties b/es/torbirdy.properties index e907559..7e6c02e 100644 --- a/es/torbirdy.properties +++ b/es/torbirdy.properties @@ -13,7 +13,7 @@ torbirdy.email.advanced=Por favor, observe que NO es recomendable cambiar la con torbirdy.email.advanced.nextwarning=Mostrar esta advertencia la próxima vez torbirdy.email.advanced.title=Configuración avanzada de TorBirdy -torbirdy.restart=Para que la configuración de zona horaria sea efectiva, cierre Thunderbird e inícielo de nuevo. +torbirdy.restart=Debe reiniciar Thunderbird para que la configuración de zona horaria tenga efecto. torbirdy.firstrun=Está ejecutando TorBirdy en este momento.\n\nPara proteger su anonimato, TorBirdy implementará las preferencias que ha establecido sobre Thunderbird, evitando que sean cambiadas por usted o por otro complemento (add-on). Hay algunas preferencias que pueden ser cambiadas, y a ellas se accede a través del cuadro de preferencias de TorBirdy. Cuando TorBirdy se desinstale o deshabilite, todas las preferencias que este cambia se restablecen a sus valores predeterminados (los valores previos a la instación de TorBirdy).\n\nSi usted es un usuario novel, es recomendable que lea el sitio web de TorBirdy para comprender qué es lo que estamos estamos intentado que TorBirdy consiga para nuestros usuarios. torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 21 Aug '13

21 Aug '13

commit 5938d6543a4c2e40dde74f9e58a3f1387cc55088 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Aug 21 18:16:30 2013 +0000 Update translations for torbirdy --- es/torbirdy.dtd | 2 +- es/torbirdy.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/es/torbirdy.dtd b/es/torbirdy.dtd index fbba5ab..0b3e09b 100644 --- a/es/torbirdy.dtd +++ b/es/torbirdy.dtd @@ -14,7 +14,7 @@ <!ENTITY torbirdy.prefs.cancel.button "Cancelar"> <!ENTITY torbirdy.prefs.extra1.button "Restablecer valores predeterminados "> <!ENTITY torbirdy.prefs.extra1.key "v"> -<!ENTITY torbirdy.prefs.extra2.button ""> +<!ENTITY torbirdy.prefs.extra2.button "Probar configuración para proxy"> <!ENTITY torbirdy.prefs.extra2.key "g"> <!ENTITY torbirdy.prefs.proxy.label "Configuración para proxy"> <!ENTITY torbirdy.prefs.privacy.label "Parámetros de privacidad"> diff --git a/es/torbirdy.properties b/es/torbirdy.properties index c1349cc..7e6c02e 100644 --- a/es/torbirdy.properties +++ b/es/torbirdy.properties @@ -13,7 +13,7 @@ torbirdy.email.advanced=Por favor, observe que NO es recomendable cambiar la con torbirdy.email.advanced.nextwarning=Mostrar esta advertencia la próxima vez torbirdy.email.advanced.title=Configuración avanzada de TorBirdy -# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect. +torbirdy.restart=Debe reiniciar Thunderbird para que la configuración de zona horaria tenga efecto. torbirdy.firstrun=Está ejecutando TorBirdy en este momento.\n\nPara proteger su anonimato, TorBirdy implementará las preferencias que ha establecido sobre Thunderbird, evitando que sean cambiadas por usted o por otro complemento (add-on). Hay algunas preferencias que pueden ser cambiadas, y a ellas se accede a través del cuadro de preferencias de TorBirdy. Cuando TorBirdy se desinstale o deshabilite, todas las preferencias que este cambia se restablecen a sus valores predeterminados (los valores previos a la instación de TorBirdy).\n\nSi usted es un usuario novel, es recomendable que lea el sitio web de TorBirdy para comprender qué es lo que estamos estamos intentado que TorBirdy consiga para nuestros usuarios. torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy

1 0

[tor/master] Merge branch 'ticket5526'
by nickm＠torproject.org 21 Aug '13

21 Aug '13

commit 7121e7bd15659052ccf42e554ae959a75cfacb45 Merge: 28485d3 71ec90f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 21 13:42:39 2013 -0400 Merge branch 'ticket5526' changes/ticket5526 | 4 ++++ src/or/hibernate.c | 7 +++++++ src/or/hibernate.h | 1 + src/or/status.c | 31 +++++++++++++++++++++++++++++++ 4 files changed, 43 insertions(+)

1 0

[tor/master] Tweak/cleanup 5526 fix.
by nickm＠torproject.org 21 Aug '13

21 Aug '13

commit 71ec90fdc8717f1f55f65756b2849cf6615d5db1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 21 13:41:15 2013 -0400 Tweak/cleanup 5526 fix. --- changes/ticket5526 | 2 +- src/or/hibernate.c | 1 + src/or/status.c | 9 ++++++--- src/or/status.h | 1 - 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/changes/ticket5526 b/changes/ticket5526 index 35c982b..35911d4 100644 --- a/changes/ticket5526 +++ b/changes/ticket5526 @@ -1,4 +1,4 @@ o Minor features: - Log current accounting state (bytes sent and received + remaining time for the current accounting period) in the server's - heartbeat message. + heartbeat message. Implements ticket 5526; patch from Peter Retzlaff. diff --git a/src/or/hibernate.c b/src/or/hibernate.c index 712a695..607dec8 100644 --- a/src/or/hibernate.c +++ b/src/or/hibernate.c @@ -255,6 +255,7 @@ accounting_get_interval_length(void) return (int)(interval_end_time - interval_start_time); } +/** Return the time at which the current accounting interval will end. */ time_t accounting_get_end_time(void) { diff --git a/src/or/status.c b/src/or/status.c index 2fda471..6e2206e 100644 --- a/src/or/status.c +++ b/src/or/status.c @@ -17,6 +17,8 @@ #include "hibernate.h" #include "statefile.h" +static void log_accounting(const time_t now, const or_options_t *options); + /** Return the total number of circuits. */ static int count_circuits(void) @@ -133,7 +135,7 @@ log_heartbeat(time_t now) return 0; } -void +static void log_accounting(const time_t now, const or_options_t *options) { or_state_t *state = get_or_state(); @@ -146,9 +148,9 @@ log_accounting(const time_t now, const or_options_t *options) format_local_iso_time(end_buf, interval_end); remaining = secs_to_uptime(interval_end - now); - log_notice(LD_HEARTBEAT, "Heartbeat: " + log_notice(LD_HEARTBEAT, "Heartbeat: Accounting enabled. " "Sent: %s / %s, Received: %s / %s. The " - "current accounting period ends on %s. That's %s left to go.", + "current accounting interval ends on %s, in %s.", acc_sent, acc_max, acc_rcvd, acc_max, end_buf, remaining); tor_free(acc_rcvd); @@ -156,3 +158,4 @@ log_accounting(const time_t now, const or_options_t *options) tor_free(acc_max); tor_free(remaining); } + diff --git a/src/or/status.h b/src/or/status.h index 4a334b1..7c3b969 100644 --- a/src/or/status.h +++ b/src/or/status.h @@ -5,7 +5,6 @@ #define TOR_STATUS_H int log_heartbeat(time_t now); -void log_accounting(const time_t now, const or_options_t *options); #endif

1 0

[tor/master] Print accounting information in heartbeat messages.
by nickm＠torproject.org 21 Aug '13

21 Aug '13

commit a337d4b7cb9ae7f4e4ec4567b9efd64bbed70298 Author: Peter Retzlaff <peter.retzlaff(a)student.hpi.uni-potsdam.de> Date: Wed Jun 12 10:51:39 2013 +0200 Print accounting information in heartbeat messages. Implements ticket 5526. --- changes/ticket5526 | 4 ++++ src/or/hibernate.c | 6 ++++++ src/or/hibernate.h | 1 + src/or/status.c | 28 ++++++++++++++++++++++++++++ src/or/status.h | 1 + 5 files changed, 40 insertions(+) diff --git a/changes/ticket5526 b/changes/ticket5526 new file mode 100644 index 0000000..35c982b --- /dev/null +++ b/changes/ticket5526 @@ -0,0 +1,4 @@ + o Minor features: + - Log current accounting state (bytes sent and received + remaining + time for the current accounting period) in the server's + heartbeat message. diff --git a/src/or/hibernate.c b/src/or/hibernate.c index 22c0f25..712a695 100644 --- a/src/or/hibernate.c +++ b/src/or/hibernate.c @@ -255,6 +255,12 @@ accounting_get_interval_length(void) return (int)(interval_end_time - interval_start_time); } +time_t +accounting_get_end_time(void) +{ + return interval_end_time; +} + /** Called from main.c to tell us that <b>seconds</b> seconds have * passed, <b>n_read</b> bytes have been read, and <b>n_written</b> * bytes have been written. */ diff --git a/src/or/hibernate.h b/src/or/hibernate.h index 18832fb..4f7331c 100644 --- a/src/or/hibernate.h +++ b/src/or/hibernate.h @@ -15,6 +15,7 @@ int accounting_parse_options(const or_options_t *options, int validate_only); int accounting_is_enabled(const or_options_t *options); int accounting_get_interval_length(void); +time_t accounting_get_end_time(void); void configure_accounting(time_t now); void accounting_run_housekeeping(time_t now); void accounting_add_bytes(size_t n_read, size_t n_written, int seconds); diff --git a/src/or/status.c b/src/or/status.c index 577587d..2fda471 100644 --- a/src/or/status.c +++ b/src/or/status.c @@ -15,6 +15,7 @@ #include "circuitlist.h" #include "main.h" #include "hibernate.h" +#include "statefile.h" /** Return the total number of circuits. */ static int @@ -111,6 +112,10 @@ log_heartbeat(time_t now) uptime, count_circuits(),bw_sent,bw_rcvd, hibernating?" We are currently hibernating.":""); + if (server_mode(options) && accounting_is_enabled(options) && !hibernating) { + log_accounting(now, options); + } + if (stats_n_data_cells_packaged && !hibernating) log_notice(LD_HEARTBEAT, "Average packaged cell fullness: %2.3f%%", 100*(U64_TO_DBL(stats_n_data_bytes_packaged) / @@ -128,3 +133,26 @@ log_heartbeat(time_t now) return 0; } +void +log_accounting(const time_t now, const or_options_t *options) +{ + or_state_t *state = get_or_state(); + char *acc_rcvd = bytes_to_usage(state->AccountingBytesReadInInterval); + char *acc_sent = bytes_to_usage(state->AccountingBytesWrittenInInterval); + char *acc_max = bytes_to_usage(options->AccountingMax); + time_t interval_end = accounting_get_end_time(); + char end_buf[ISO_TIME_LEN + 1]; + char *remaining = NULL; + format_local_iso_time(end_buf, interval_end); + remaining = secs_to_uptime(interval_end - now); + + log_notice(LD_HEARTBEAT, "Heartbeat: " + "Sent: %s / %s, Received: %s / %s. The " + "current accounting period ends on %s. That's %s left to go.", + acc_sent, acc_max, acc_rcvd, acc_max, end_buf, remaining); + + tor_free(acc_rcvd); + tor_free(acc_sent); + tor_free(acc_max); + tor_free(remaining); +} diff --git a/src/or/status.h b/src/or/status.h index 7c3b969..4a334b1 100644 --- a/src/or/status.h +++ b/src/or/status.h @@ -5,6 +5,7 @@ #define TOR_STATUS_H int log_heartbeat(time_t now); +void log_accounting(const time_t now, const or_options_t *options); #endif

1 0

[translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
by translation＠torproject.org 21 Aug '13

21 Aug '13

commit e5be6254bf7310f8923e233eccec62e9d63037b6 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Aug 21 15:16:15 2013 +0000 Update translations for liveusb-creator_completed --- pt_BR/pt_BR.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po index cc842e8..5438795 100644 --- a/pt_BR/pt_BR.po +++ b/pt_BR/pt_BR.po @@ -16,7 +16,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-08-07 16:08+0200\n" -"PO-Revision-Date: 2013-08-21 14:40+0000\n" +"PO-Revision-Date: 2013-08-21 14:50+0000\n" "Last-Translator: Communia <ameaneantie(a)riseup.net>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -256,7 +256,7 @@ msgstr "Não há espaço suficiente no dispositivo." #: ../liveusb/gui.py:543 msgid "Partition is FAT16; Restricting overlay size to 2G" -msgstr "A partição é FAT16; restringindo tamanho da camada a 2GB" +msgstr "A partição é FAT16; Restringindo o tamanho da camada a 2GB" #: ../liveusb/gui.py:539 msgid "Partition is FAT32; Restricting overlay size to 4G"

1 0