July 2015 - tor-commits - lists.torproject.org

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 02 Jul '15

02 Jul '15

commit 36e611110094df8fa3409f9928cadc778d167716 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jul 2 23:46:12 2015 +0000 Update translations for torbutton-torbuttondtd --- pt/torbutton.dtd | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pt/torbutton.dtd b/pt/torbutton.dtd index 6b5a4b9..0bf3ad6 100644 --- a/pt/torbutton.dtd +++ b/pt/torbutton.dtd @@ -13,7 +13,7 @@ <!ENTITY torbutton.about.title "Sobre o Torbutton"> <!ENTITY torbutton.about.version "Versão:"> <!ENTITY torbutton.about.summary "Protege a privacidade da sua navegação Tor."> -<!ENTITY torbutton.about.code "Contribuidores do Código:"> +<!ENTITY torbutton.about.code "Contribuidores do código:"> <!ENTITY torbutton.about.maintainer "Mantenedor:"> <!ENTITY torbutton.about.security_review "Revisão de Segurança:"> <!ENTITY torbutton.about.donate "Se gosta de utilizar o Tor, poderá considerar"> @@ -24,9 +24,9 @@ <!ENTITY torbutton.pref_connection_more_info.text "O Torbutton está ativado. Se desejar alterar as configurações do Proxy que não sejam do Tor, por favor, desative o Torbutton e volte aqui. Se desejar alterar as configurações do Tor, por favor, utilize a janela de preferências do Torbutton."> <!ENTITY torbutton.context_menu.new_identity "Identidade Nova"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.new_circuit "Novo Circuito Tor para este Site"> +<!ENTITY torbutton.context_menu.new_circuit "Novo circuito Tor para este sítio"> <!ENTITY torbutton.context_menu.new_circuit_key "C"> -<!ENTITY torbutton.context_menu.toggle "Alterar Estado do Tor"> +<!ENTITY torbutton.context_menu.toggle "Alterar estado do Tor"> <!ENTITY torbutton.context_menu.toggle.key "T"> <!ENTITY torbutton.context_menu.preferences "Configurações de Segurança e Privacidade..."> <!ENTITY torbutton.context_menu.preferences.key "P"> @@ -34,15 +34,15 @@ <!ENTITY torbutton.context_menu.about.key "A"> <!ENTITY torbutton.context_menu.networksettings "Configurações da Rede Tor..."> <!ENTITY torbutton.context_menu.networksettings.key "S"> -<!ENTITY torbutton.context_menu.downloadUpdate "Procurar por Atualizações do Tor..."> +<!ENTITY torbutton.context_menu.downloadUpdate "Procurar atualizações do Tor..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "A"> -<!ENTITY torbutton.context_menu.cookieProtections "Proteções para os Cookies..."> +<!ENTITY torbutton.context_menu.cookieProtections "Proteções das Cookies..."> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.context_menu.copyTor "Copiar URL do Tor"> <!ENTITY torbutton.context_menu.copyTor.key "P"> -<!ENTITY torbutton.context_menu.openTorTab "Abrir URL do Tor num novo Separador"> +<!ENTITY torbutton.context_menu.openTorTab "Abrir URL do Tor num separador novo "> <!ENTITY torbutton.context_menu.openTorTab.key "r"> -<!ENTITY torbutton.context_menu.openTorWindow "Abrir URL do Tor numa nova Janela"> +<!ENTITY torbutton.context_menu.openTorWindow "Abrir URL do Tor numa janela nova "> <!ENTITY torbutton.context_menu.openTorWindow.key "d"> <!ENTITY torbutton.button.label "Torbutton"> <!ENTITY torbutton.button.tooltip "Clique para inicializar o Torbutton">

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 02 Jul '15

02 Jul '15

commit c65423936046dbd7a00f4ea1a23aa6d47f34c7ef Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jul 2 23:45:28 2015 +0000 Update translations for https_everywhere_completed --- pt/https-everywhere.dtd | 16 ++++++++-------- pt/ssl-observatory.dtd | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pt/https-everywhere.dtd b/pt/https-everywhere.dtd index 940521e..34cbb30 100644 --- a/pt/https-everywhere.dtd +++ b/pt/https-everywhere.dtd @@ -1,11 +1,11 @@ <!ENTITY https-everywhere.about.title "Sobre o HTTPS Everywhere"> -<!ENTITY https-everywhere.about.ext_name "HTTPS Em todo o lado"> +<!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere"> <!ENTITY https-everywhere.about.ext_description "Encripte a Web! Use automaticamente a segurança HTTPS em vários sítios."> <!ENTITY https-everywhere.about.version "Versão"> <!ENTITY https-everywhere.about.created_by "Criado por"> <!ENTITY https-everywhere.about.librarians "Bibliotecas de Regras"> <!ENTITY https-everywhere.about.thanks "Obrigado a"> -<!ENTITY https-everywhere.about.contribute "Se gosta de HTTPS Everywhere, poderá considerar"> +<!ENTITY https-everywhere.about.contribute "Se gosta de HTTPS Em todo o lado, poderá considerar"> <!ENTITY https-everywhere.about.donate_tor "Doar ao Tor"> <!ENTITY https-everywhere.about.tor_lang_code "pt"> <!ENTITY https-everywhere.about.or "ou"> @@ -19,9 +19,9 @@ <!ENTITY https-everywhere.menu.showCounter "Mostrar Contador"> <!ENTITY https-everywhere.prefs.title "Preferências do HTTPS Everywhere"> -<!ENTITY https-everywhere.prefs.enable_all "Ativar Tudo"> -<!ENTITY https-everywhere.prefs.disable_all "Desativar Tudo"> -<!ENTITY https-everywhere.prefs.reset_defaults "Restaurar para as Predefinições"> +<!ENTITY https-everywhere.prefs.enable_all "Ativar tudo"> +<!ENTITY https-everywhere.prefs.disable_all "Desativar tudo"> +<!ENTITY https-everywhere.prefs.reset_defaults "Restaurar predefinições"> <!ENTITY https-everywhere.prefs.search "Procurar"> <!ENTITY https-everywhere.prefs.site "Sítio"> <!ENTITY https-everywhere.prefs.notes "Notas"> @@ -30,10 +30,10 @@ <!ENTITY https-everywhere.prefs.ruleset_howto "Pode aprender a escrever os seus próprios grupos de regras (para adicionar suporte para outros sítios)"> <!ENTITY https-everywhere.prefs.here_link "aqui"> <!ENTITY https-everywhere.prefs.toggle "Alternar"> -<!ENTITY https-everywhere.prefs.reset_default "Restaurar para a Predefinição"> -<!ENTITY https-everywhere.prefs.view_xml_source "Ver Fonte XML"> +<!ENTITY https-everywhere.prefs.reset_default "Restaurar predefinição"> +<!ENTITY https-everywhere.prefs.view_xml_source "Ver fonte XML"> -<!ENTITY https-everywhere.source.downloading "A Transferir"> +<!ENTITY https-everywhere.source.downloading "A descarregar"> <!ENTITY https-everywhere.source.filename "Nome do ficheiro"> <!ENTITY https-everywhere.source.unable_to_download "Não é possível transferir a fonte."> diff --git a/pt/ssl-observatory.dtd b/pt/ssl-observatory.dtd index f231ea8..5d9e2ea 100644 --- a/pt/ssl-observatory.dtd +++ b/pt/ssl-observatory.dtd @@ -3,7 +3,7 @@ <!ENTITY ssl-observatory.popup.later "Perguntar Mais Tarde"> <!ENTITY ssl-observatory.popup.no "Não"> -<!ENTITY ssl-observatory.popup.text "HTTPS Em Qualquer Lugar pode detetar ataques contra o seu navegador, enviando os certificados que recebe para o Observatório. Ativar isto?"> +<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere pode detetar ataques contra o seu navegador, enviando os certificados que recebe para o Observatório. Ativar isto?">  <!ENTITY ssl-observatory.popup.title -"HTTPS Em Qalquer Lugar deve utilizar o Observatório SSL?"> +"HTTPS Everywhere deverá usar o Observatório SSL?"> <!ENTITY ssl-observatory.popup.yes "Sim">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 02 Jul '15

02 Jul '15

commit e818ec0a25ca79c29f637eb002f0144ff7d3d6e6 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jul 2 23:45:22 2015 +0000 Update translations for https_everywhere --- pt/https-everywhere.dtd | 16 ++++++++-------- pt/ssl-observatory.dtd | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pt/https-everywhere.dtd b/pt/https-everywhere.dtd index 5c7c968..34cbb30 100644 --- a/pt/https-everywhere.dtd +++ b/pt/https-everywhere.dtd @@ -1,11 +1,11 @@ <!ENTITY https-everywhere.about.title "Sobre o HTTPS Everywhere"> -<!ENTITY https-everywhere.about.ext_name "HTTPS em todo o lado"> +<!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere"> <!ENTITY https-everywhere.about.ext_description "Encripte a Web! Use automaticamente a segurança HTTPS em vários sítios."> <!ENTITY https-everywhere.about.version "Versão"> <!ENTITY https-everywhere.about.created_by "Criado por"> <!ENTITY https-everywhere.about.librarians "Bibliotecas de Regras"> <!ENTITY https-everywhere.about.thanks "Obrigado a"> -<!ENTITY https-everywhere.about.contribute "Se gosta de HTTPS Everywhere, poderá considerar"> +<!ENTITY https-everywhere.about.contribute "Se gosta de HTTPS Em todo o lado, poderá considerar"> <!ENTITY https-everywhere.about.donate_tor "Doar ao Tor"> <!ENTITY https-everywhere.about.tor_lang_code "pt"> <!ENTITY https-everywhere.about.or "ou"> @@ -19,9 +19,9 @@ <!ENTITY https-everywhere.menu.showCounter "Mostrar Contador"> <!ENTITY https-everywhere.prefs.title "Preferências do HTTPS Everywhere"> -<!ENTITY https-everywhere.prefs.enable_all "Ativar Tudo"> -<!ENTITY https-everywhere.prefs.disable_all "Desativar Tudo"> -<!ENTITY https-everywhere.prefs.reset_defaults "Restaurar para as Predefinições"> +<!ENTITY https-everywhere.prefs.enable_all "Ativar tudo"> +<!ENTITY https-everywhere.prefs.disable_all "Desativar tudo"> +<!ENTITY https-everywhere.prefs.reset_defaults "Restaurar predefinições"> <!ENTITY https-everywhere.prefs.search "Procurar"> <!ENTITY https-everywhere.prefs.site "Sítio"> <!ENTITY https-everywhere.prefs.notes "Notas"> @@ -30,10 +30,10 @@ <!ENTITY https-everywhere.prefs.ruleset_howto "Pode aprender a escrever os seus próprios grupos de regras (para adicionar suporte para outros sítios)"> <!ENTITY https-everywhere.prefs.here_link "aqui"> <!ENTITY https-everywhere.prefs.toggle "Alternar"> -<!ENTITY https-everywhere.prefs.reset_default "Restaurar para a Predefinição"> -<!ENTITY https-everywhere.prefs.view_xml_source "Ver Fonte XML"> +<!ENTITY https-everywhere.prefs.reset_default "Restaurar predefinição"> +<!ENTITY https-everywhere.prefs.view_xml_source "Ver fonte XML"> -<!ENTITY https-everywhere.source.downloading "A Transferir"> +<!ENTITY https-everywhere.source.downloading "A descarregar"> <!ENTITY https-everywhere.source.filename "Nome do ficheiro"> <!ENTITY https-everywhere.source.unable_to_download "Não é possível transferir a fonte."> diff --git a/pt/ssl-observatory.dtd b/pt/ssl-observatory.dtd index f231ea8..5d9e2ea 100644 --- a/pt/ssl-observatory.dtd +++ b/pt/ssl-observatory.dtd @@ -3,7 +3,7 @@ <!ENTITY ssl-observatory.popup.later "Perguntar Mais Tarde"> <!ENTITY ssl-observatory.popup.no "Não"> -<!ENTITY ssl-observatory.popup.text "HTTPS Em Qualquer Lugar pode detetar ataques contra o seu navegador, enviando os certificados que recebe para o Observatório. Ativar isto?"> +<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere pode detetar ataques contra o seu navegador, enviando os certificados que recebe para o Observatório. Ativar isto?">  <!ENTITY ssl-observatory.popup.title -"HTTPS Em Qalquer Lugar deve utilizar o Observatório SSL?"> +"HTTPS Everywhere deverá usar o Observatório SSL?"> <!ENTITY ssl-observatory.popup.yes "Sim">

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 02 Jul '15

02 Jul '15

commit dac846656269b335938b59b17f068772b6117e8a Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jul 2 23:45:08 2015 +0000 Update translations for bridgedb_completed --- pt/LC_MESSAGES/bridgedb.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pt/LC_MESSAGES/bridgedb.po b/pt/LC_MESSAGES/bridgedb.po index b762ca7..f3e12c0 100644 --- a/pt/LC_MESSAGES/bridgedb.po +++ b/pt/LC_MESSAGES/bridgedb.po @@ -5,6 +5,7 @@ # Translators: # alfalb.as, 2015 # André Monteiro <andre.monteir(a)gmail.com>, 2014 +# Bruno D. Rodrigues <bruno.rodrigues(a)litux.org>, 2015 # kagazz <lourenxo_619(a)hotmail.com>, 2014 # alfalb_mansil, 2014 # MMSRS, 2015 @@ -16,8 +17,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'POT-Creation-Date: 2015-03-19 22:13+0000\n" -"PO-Revision-Date: 2015-06-18 13:20+0000\n" -"Last-Translator: MMSRS\n" +"PO-Revision-Date: 2015-07-02 23:34+0000\n" +"Last-Translator: Bruno D. Rodrigues <bruno.rodrigues(a)litux.org>\n" "Language-Team: Portuguese (http://www.transifex.com/projects/p/torproject/language/pt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -177,7 +178,7 @@ msgstr "Aqui estão as suas linhas de ponte:" #: lib/bridgedb/strings.py:104 msgid "Get Bridges!" -msgstr "Obter Ligações!" +msgstr "Obter ligações!" #: lib/bridgedb/strings.py:108 msgid "Please select options for bridge type:" @@ -385,4 +386,4 @@ msgstr "%sS%sim!" #: lib/bridgedb/templates/options.html:151 #, python-format msgid "%sG%set Bridges" -msgstr "%sO%sbter Ligações" +msgstr "%sO%sbter ligações"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 02 Jul '15

02 Jul '15

commit 4b9b8e861b90e948e01f40bd5d229a4d55a7aecc Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jul 2 23:45:04 2015 +0000 Update translations for bridgedb --- pt/LC_MESSAGES/bridgedb.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pt/LC_MESSAGES/bridgedb.po b/pt/LC_MESSAGES/bridgedb.po index b762ca7..f3e12c0 100644 --- a/pt/LC_MESSAGES/bridgedb.po +++ b/pt/LC_MESSAGES/bridgedb.po @@ -5,6 +5,7 @@ # Translators: # alfalb.as, 2015 # André Monteiro <andre.monteir(a)gmail.com>, 2014 +# Bruno D. Rodrigues <bruno.rodrigues(a)litux.org>, 2015 # kagazz <lourenxo_619(a)hotmail.com>, 2014 # alfalb_mansil, 2014 # MMSRS, 2015 @@ -16,8 +17,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'POT-Creation-Date: 2015-03-19 22:13+0000\n" -"PO-Revision-Date: 2015-06-18 13:20+0000\n" -"Last-Translator: MMSRS\n" +"PO-Revision-Date: 2015-07-02 23:34+0000\n" +"Last-Translator: Bruno D. Rodrigues <bruno.rodrigues(a)litux.org>\n" "Language-Team: Portuguese (http://www.transifex.com/projects/p/torproject/language/pt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -177,7 +178,7 @@ msgstr "Aqui estão as suas linhas de ponte:" #: lib/bridgedb/strings.py:104 msgid "Get Bridges!" -msgstr "Obter Ligações!" +msgstr "Obter ligações!" #: lib/bridgedb/strings.py:108 msgid "Please select options for bridge type:" @@ -385,4 +386,4 @@ msgstr "%sS%sim!" #: lib/bridgedb/templates/options.html:151 #, python-format msgid "%sG%set Bridges" -msgstr "%sO%sbter Ligações" +msgstr "%sO%sbter ligações"

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 02 Jul '15

02 Jul '15

commit 8d12217b21ed1d58a9b85f63efc046a426ba2c93 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jul 2 23:16:15 2015 +0000 Update translations for torbutton-torbuttondtd --- pt/torbutton.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt/torbutton.dtd b/pt/torbutton.dtd index e946ff2..6b5a4b9 100644 --- a/pt/torbutton.dtd +++ b/pt/torbutton.dtd @@ -1,6 +1,6 @@ <!ENTITY torbutton.prefs.title "Preferências Torbutton"> <!ENTITY torbutton.prefs.tor_settings "Configurações do Proxy"> -<!ENTITY torbutton.prefs.recommended_settings "Utilize as configurações recomendadas do proxy para a minha versão do Firefox"> +<!ENTITY torbutton.prefs.recommended_settings "Use as configurações recomendadas do proxy para a minha versão do Firefox"> <!ENTITY torbutton.prefs.use_privoxy "Utilizar Privoxy"> <!ENTITY torbutton.prefs.use_polipo "Utilizar Polipo"> <!ENTITY torbutton.prefs.custom_settings "Utilize as configurações do proxy personalizadas">

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 02 Jul '15

02 Jul '15

commit 501107f9c57657dd90184f51f6732ff57c1551de Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jul 2 23:15:25 2015 +0000 Update translations for https_everywhere_completed --- pt/https-everywhere.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pt/https-everywhere.dtd b/pt/https-everywhere.dtd index 136f6eb..940521e 100644 --- a/pt/https-everywhere.dtd +++ b/pt/https-everywhere.dtd @@ -1,6 +1,6 @@ <!ENTITY https-everywhere.about.title "Sobre o HTTPS Everywhere"> -<!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere"> -<!ENTITY https-everywhere.about.ext_description "Encripte a Web! Use, Utilize automaticamente a segurança HTTPS em vários sítios."> +<!ENTITY https-everywhere.about.ext_name "HTTPS Em todo o lado"> +<!ENTITY https-everywhere.about.ext_description "Encripte a Web! Use automaticamente a segurança HTTPS em vários sítios."> <!ENTITY https-everywhere.about.version "Versão"> <!ENTITY https-everywhere.about.created_by "Criado por"> <!ENTITY https-everywhere.about.librarians "Bibliotecas de Regras">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 02 Jul '15

02 Jul '15

commit 0706f36f45c1ad6a13d2f5f3dca190c892beabb7 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jul 2 23:15:17 2015 +0000 Update translations for https_everywhere --- pt/https-everywhere.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pt/https-everywhere.dtd b/pt/https-everywhere.dtd index 136f6eb..5c7c968 100644 --- a/pt/https-everywhere.dtd +++ b/pt/https-everywhere.dtd @@ -1,6 +1,6 @@ <!ENTITY https-everywhere.about.title "Sobre o HTTPS Everywhere"> -<!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere"> -<!ENTITY https-everywhere.about.ext_description "Encripte a Web! Use, Utilize automaticamente a segurança HTTPS em vários sítios."> +<!ENTITY https-everywhere.about.ext_name "HTTPS em todo o lado"> +<!ENTITY https-everywhere.about.ext_description "Encripte a Web! Use automaticamente a segurança HTTPS em vários sítios."> <!ENTITY https-everywhere.about.version "Versão"> <!ENTITY https-everywhere.about.created_by "Criado por"> <!ENTITY https-everywhere.about.librarians "Bibliotecas de Regras">

1 0

[nyx/master] Rewrite port count dialog
by atagar＠torproject.org 02 Jul '15

02 Jul '15

commit 35206a3a09979f6321aa8e9ce97728b4b1ccf92c Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jul 2 09:57:13 2015 -0700 Rewrite port count dialog Revising the dialog that shows aggregated counts for entry or exit connections (locales if a guard, or port usage if an exit). This is a pretty small popup and code got even smaller with the cleanup, so moving it into popups.py. --- nyx/connections/__init__.py | 1 - nyx/connections/conn_panel.py | 19 +++++-- nyx/connections/count_popup.py | 107 ---------------------------------------- nyx/popups.py | 51 +++++++++++++++++++ 4 files changed, 67 insertions(+), 111 deletions(-) diff --git a/nyx/connections/__init__.py b/nyx/connections/__init__.py index 447adf6..c7e90a9 100644 --- a/nyx/connections/__init__.py +++ b/nyx/connections/__init__.py @@ -6,7 +6,6 @@ __all__ = [ 'circ_entry', 'conn_entry', 'conn_panel', - 'count_popup', 'descriptor_popup', 'entries', ] diff --git a/nyx/connections/conn_panel.py b/nyx/connections/conn_panel.py index c555a38..0a27721 100644 --- a/nyx/connections/conn_panel.py +++ b/nyx/connections/conn_panel.py @@ -10,7 +10,7 @@ import threading import nyx.popups import nyx.util.tracker -from nyx.connections import count_popup, descriptor_popup, entries, conn_entry, circ_entry +from nyx.connections import descriptor_popup, entries, conn_entry, circ_entry from nyx.util import panel, tor_controller, tracker, ui_tools from stem.control import State @@ -24,6 +24,8 @@ DETAILS_HEIGHT = 7 Listing = enum.Enum(('IP_ADDRESS', 'IP Address'), 'HOSTNAME', 'FINGERPRINT', 'NICKNAME') +EXIT_USAGE_WIDTH = 15 + def conf_handler(key, value): if key == 'features.connection.listing_type': @@ -335,9 +337,20 @@ class ConnectionPanel(panel.Panel, threading.Thread): self.set_title_visible(True) self.redraw(True) elif key.match('c') and self.is_clients_allowed(): - count_popup.showCountDialog(count_popup.CountType.CLIENT_LOCALE, self._client_locale_usage) + nyx.popups.show_count_dialog('Client Locales', self._client_locale_usage) elif key.match('e') and self.is_exits_allowed(): - count_popup.showCountDialog(count_popup.CountType.EXIT_PORT, self._exit_port_usage) + counts = {} + key_width = max(map(len, self._exit_port_usage.keys())) + + for k, v in self._exit_port_usage.items(): + usage = connection.port_usage(k) + + if usage: + k = k.ljust(key_width + 3) + usage.ljust(EXIT_USAGE_WIDTH) + + counts[k] = v + + nyx.popups.show_count_dialog('Exiting Port Usage', counts) else: return False diff --git a/nyx/connections/count_popup.py b/nyx/connections/count_popup.py deleted file mode 100644 index e61dc26..0000000 --- a/nyx/connections/count_popup.py +++ /dev/null @@ -1,107 +0,0 @@ -""" -Provides a dialog with client locale or exiting port counts. -""" - -import curses -import operator - -import nyx.controller -import nyx.popups - -from stem.util import connection, enum, log - -CountType = enum.Enum('CLIENT_LOCALE', 'EXIT_PORT') -EXIT_USAGE_WIDTH = 15 - - -def showCountDialog(count_type, counts): - """ - Provides a dialog with bar graphs and percentages for the given set of - counts. Pressing any key closes the dialog. - - Arguments: - count_type - type of counts being presented - counts - mapping of labels to counts - """ - - is_no_stats = not counts - no_stats_msg = "Usage stats aren't available yet, press any key..." - - if is_no_stats: - height, width = 3, len(no_stats_msg) + 4 - else: - height, width = 4 + max(1, len(counts)), 80 - - with nyx.popups.popup_window(height, width) as (popup, height, width): - if popup: - control = nyx.controller.get_controller() - - popup.win.box() - - # dialog title - - if count_type == CountType.CLIENT_LOCALE: - title = 'Client Locales' - elif count_type == CountType.EXIT_PORT: - title = 'Exiting Port Usage' - else: - title = '' - log.warn('Unrecognized count type: %s' % count_type) - - popup.addstr(0, 0, title, curses.A_STANDOUT) - - if is_no_stats: - popup.addstr(1, 2, no_stats_msg, curses.A_BOLD, 'cyan') - else: - sorted_counts = sorted(counts.iteritems(), key=operator.itemgetter(1)) - sorted_counts.reverse() - - # constructs string formatting for the max key and value display width - - key_width, val_width, value_total = 3, 1, 0 - - for k, v in sorted_counts: - key_width = max(key_width, len(k)) - val_width = max(val_width, len(str(v))) - value_total += v - - # extra space since we're adding usage informaion - - if count_type == CountType.EXIT_PORT: - key_width += EXIT_USAGE_WIDTH - - label_format = '%%-%is %%%ii (%%%%%%-2i)' % (key_width, val_width) - - for i in range(height - 4): - k, v = sorted_counts[i] - - # includes a port usage column - - if count_type == CountType.EXIT_PORT: - usage = connection.port_usage(k) - - if usage: - key_format = '%%-%is %%s' % (key_width - EXIT_USAGE_WIDTH) - k = key_format % (k, usage[:EXIT_USAGE_WIDTH - 3]) - - label = label_format % (k, v, v * 100 / value_total) - popup.addstr(i + 1, 2, label, curses.A_BOLD, 'green') - - # All labels have the same size since they're based on the max widths. - # If this changes then this'll need to be the max label width. - - label_width = len(label) - - # draws simple bar graph for percentages - - fill_width = v * (width - 4 - label_width) / value_total - - for j in range(fill_width): - popup.addstr(i + 1, 3 + label_width + j, ' ', curses.A_STANDOUT, 'red') - - popup.addstr(height - 2, 2, 'Press any key...') - - popup.win.refresh() - - curses.cbreak() - control.key_input() diff --git a/nyx/popups.py b/nyx/popups.py index 38eade0..351467f 100644 --- a/nyx/popups.py +++ b/nyx/popups.py @@ -3,12 +3,15 @@ Functions for displaying popups in the interface. """ import curses +import operator import nyx.controller from nyx import __version__, __release_date__ from nyx.util import panel, ui_tools +NO_STATS_MSG = "Usage stats aren't available yet, press any key..." + def popup_window(height = -1, width = -1, top = 0, left = 0, below_static = True): """ @@ -199,6 +202,54 @@ def show_about_popup(): control.key_input() +def show_count_dialog(title, counts): + """ + Provides a dialog with bar graphs and percentages for the given set of + counts. Pressing any key closes the dialog. + + :param str title: dialog title + :param dict counts: mapping of labels to their value + """ + + if not counts: + height, width = 3, len(NO_STATS_MSG) + 4 + else: + height, width = 4 + max(1, len(counts)), 80 + + with nyx.popups.popup_window(height, width) as (popup, width, height): + if not popup: + return + + if not counts: + popup.addstr(1, 2, NO_STATS_MSG, curses.A_BOLD, 'cyan') + else: + key_width, val_width, value_total = 3, 1, 0 + + for k, v in counts.items(): + key_width = max(key_width, len(k)) + val_width = max(val_width, len(str(v))) + value_total += v + + sorted_counts = sorted(counts.iteritems(), key = operator.itemgetter(1), reverse = True) + graph_width = width - key_width - val_width - 11 # border, extra spaces, and percentage column + + for y, (k, v) in enumerate(sorted_counts): + label = '%s %s (%-2i%%)' % (k.ljust(key_width), str(v).rjust(val_width), v * 100 / value_total) + x = popup.addstr(y + 1, 2, label, curses.A_BOLD, 'green') + + for j in range(graph_width * v / value_total): + popup.addstr(y + 1, x + j + 1, ' ', curses.A_STANDOUT, 'red') + + popup.addstr(height - 2, 2, 'Press any key...') + + popup.win.box() + popup.addstr(0, 0, title, curses.A_STANDOUT) + popup.win.refresh() + + curses.cbreak() + nyx.controller.get_controller().key_input() + + def show_sort_dialog(title, options, old_selection, option_colors): """ Displays a sorting dialog of the form:

1 0

[stem/master] Add OnionBalance to examples page
by atagar＠torproject.org 02 Jul '15

02 Jul '15

commit 073d0a50d58c2b908118f58d31a0df38ed8ab1e6 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jul 2 09:08:42 2015 -0700 Add OnionBalance to examples page --- docs/tutorials/double_double_toil_and_trouble.rst | 1 + stem/response/__init__.py | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/docs/tutorials/double_double_toil_and_trouble.rst b/docs/tutorials/double_double_toil_and_trouble.rst index b2f7b97..df8fce3 100644 --- a/docs/tutorials/double_double_toil_and_trouble.rst +++ b/docs/tutorials/double_double_toil_and_trouble.rst @@ -68,6 +68,7 @@ Applications `exit-funding <https://github.com/torservers/exit-funding>`_ Script to estimate how much exit relays have been used. `torsearch <https://github.com/wfn/torsearch>`_ Search engine prototype for descriptor data. `or-applet <https://github.com/Yawning/or-applet>`_ GUI widget to provide circuit information and an interactive interpreter. +`OnionBalance <https://github.com/DonnchaC/onionbalance>`_ Tool for making distributed hidden service requests. `OnionShare <https://github.com/micahflee/onionshare>`_ Hidden service based file sharing application. `Syboa <https://gitorious.org/syboa/syboa>`_ GTK Tor interface similar to `TorK <http://sourceforge.net/projects/tork/>`_. `hs-health <https://gitlab.com/hs-health/hs-health>`_ Experiment to measure churn and reachability of hidden services. diff --git a/stem/response/__init__.py b/stem/response/__init__.py index df534a9..0612007 100644 --- a/stem/response/__init__.py +++ b/stem/response/__init__.py @@ -76,12 +76,13 @@ def convert(response_type, message, **kwargs): =================== ===== response_type Class =================== ===== - **GETINFO** :class:`stem.response.getinfo.GetInfoResponse` + **ADD_ONION** :class:`stem.response.add_onion.AddOnionResponse` + **AUTHCHALLENGE** :class:`stem.response.authchallenge.AuthChallengeResponse` + **EVENT** :class:`stem.response.events.Event` subclass **GETCONF** :class:`stem.response.getconf.GetConfResponse` + **GETINFO** :class:`stem.response.getinfo.GetInfoResponse` **MAPADDRESS** :class:`stem.response.mapaddress.MapAddressResponse` - **EVENT** :class:`stem.response.events.Event` subclass **PROTOCOLINFO** :class:`stem.response.protocolinfo.ProtocolInfoResponse` - **AUTHCHALLENGE** :class:`stem.response.authchallenge.AuthChallengeResponse` **SINGLELINE** :class:`stem.response.SingleLineResponse` =================== ===== @@ -119,11 +120,11 @@ def convert(response_type, message, **kwargs): 'ADD_ONION': stem.response.add_onion.AddOnionResponse, 'AUTHCHALLENGE': stem.response.authchallenge.AuthChallengeResponse, 'EVENT': stem.response.events.Event, - 'GETINFO': stem.response.getinfo.GetInfoResponse, 'GETCONF': stem.response.getconf.GetConfResponse, + 'GETINFO': stem.response.getinfo.GetInfoResponse, 'MAPADDRESS': stem.response.mapaddress.MapAddressResponse, - 'SINGLELINE': SingleLineResponse, 'PROTOCOLINFO': stem.response.protocolinfo.ProtocolInfoResponse, + 'SINGLELINE': SingleLineResponse, } try:

1 0