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

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 18 May '15

18 May '15

commit 9ecc89d2ac8a72969cf89c59e57efcf6d7b5b182 Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 18 15:16:39 2015 +0000 Update translations for torbutton-torbuttonproperties --- de/torbutton.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de/torbutton.properties b/de/torbutton.properties index 0643b70..8b57de6 100644 --- a/de/torbutton.properties +++ b/de/torbutton.properties @@ -7,7 +7,7 @@ torbutton.circuit_display.this_browser = Dieser Browser torbutton.circuit_display.relay = Relais torbutton.circuit_display.tor_bridge = Brücke torbutton.circuit_display.unknown_country = Unbekanntes Land -torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online. +torbutton.content_sizer.margin_tooltip = Tor Browser fügt diese Begrenzung hinzu, um die Breite und Höhe Ihres Fensters weniger einzigartig zu machen. Dadurch wird es anderen erschwert, Sie im Internet zu verfolgen. torbutton.panel.tooltip.disabled = Klicken, um Tor zu aktivieren torbutton.panel.tooltip.enabled = Klicken, um Tor zu deaktivieren torbutton.panel.plugins.disabled = Klicken, um die Erweiterungen zu aktivieren

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 18 May '15

18 May '15

commit d9fe66b2b7564dfc7e93d5ca5ddb782cd8862947 Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 18 15:15:40 2015 +0000 Update translations for https_everywhere_completed --- pt/https-everywhere.dtd | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/pt/https-everywhere.dtd b/pt/https-everywhere.dtd index d698764..6ae2c1c 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 Qualquer Lugar"> -<!ENTITY https-everywhere.about.ext_description "Criptografe a Web! Use, automaticamente, segurança HTTPS em vários sites."> +<!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.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, pode pensar em"> +<!ENTITY https-everywhere.about.contribute "Se gosta de HTTPS Everywhere, 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,26 +19,26 @@ <!ENTITY https-everywhere.menu.showCounter "Mostrar Contador"> <!ENTITY https-everywhere.prefs.title "Preferências do HTTPS Everywhere"> -<!ENTITY https-everywhere.prefs.enable_all "Ativar todas"> -<!ENTITY https-everywhere.prefs.disable_all "Desativar todas"> -<!ENTITY https-everywhere.prefs.reset_defaults "Restaurar padrões"> +<!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.search "Procurar"> -<!ENTITY https-everywhere.prefs.site "Site"> +<!ENTITY https-everywhere.prefs.site "Sítio"> <!ENTITY https-everywhere.prefs.notes "Notas"> -<!ENTITY https-everywhere.prefs.list_caption "Que regras de redireção HTTPS devem aplicar-se?"> +<!ENTITY https-everywhere.prefs.list_caption "Quais as regras de redireção HTTPS que se devem aplicar?"> <!ENTITY https-everywhere.prefs.enabled "Ativada"> -<!ENTITY https-everywhere.prefs.ruleset_howto "Pode aprender a escrever os seus próprios grupos de regras (para adicionar suporte para outros sites)"> +<!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 Padrão"> -<!ENTITY https-everywhere.prefs.view_xml_source "Ver fonte XML"> +<!ENTITY https-everywhere.prefs.reset_default "Restaurar para a Predefinição"> +<!ENTITY https-everywhere.prefs.view_xml_source "Ver Fonte XML"> -<!ENTITY https-everywhere.source.downloading "Descarregando"> +<!ENTITY https-everywhere.source.downloading "A Transferir"> <!ENTITY https-everywhere.source.filename "Nome do ficheiro"> -<!ENTITY https-everywhere.source.unable_to_download "Impossível baixar a fonte"> +<!ENTITY https-everywhere.source.unable_to_download "Não é possível transferir a fonte."> -<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notificação"> -<!ENTITY https-everywhere.popup.paragraph1 "Oops. Estava a usar a última versão estável do HTTPS Everywhere, mas nós poderemos ter acidentalmente feito o upgrade para a versão de desenvolvimento do mesmo na nossa última versão."> +<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0 development.11 notificação"> +<!ENTITY https-everywhere.popup.paragraph1 "Ups!. Estava a utilizar a última versão do HTTPS Everywhere estável, mas nós poderemos ter-lhe atualizado acidentalmente para a versão de desenvolvimento no nosso último lançamento."> <!ENTITY https-everywhere.popup.paragraph2 "Gostaria de voltar para a versão estável?"> <!ENTITY https-everywhere.popup.paragraph3 "Adoraríamos que continuasse a usar a nossa versão de desenvolvimento e ajudasse a tornar HTTPS Everywhere melhor! Poderá encontrar ainda alguns bugs por aí, que poderá relatar para https-everywhere(a)eff.org. Pedimos desculpa pela inconveniência e obrigado por utilizar HTTPS Everywhere."> <!ENTITY https-everywhere.popup.keep "Manter-me na versão de desenvolvimento">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 18 May '15

18 May '15

commit e496203684cfe39c6e6ed17c275b781a35613418 Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 18 15:15:33 2015 +0000 Update translations for https_everywhere --- pt/https-everywhere.dtd | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/pt/https-everywhere.dtd b/pt/https-everywhere.dtd index d698764..6ae2c1c 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 Qualquer Lugar"> -<!ENTITY https-everywhere.about.ext_description "Criptografe a Web! Use, automaticamente, segurança HTTPS em vários sites."> +<!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.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, pode pensar em"> +<!ENTITY https-everywhere.about.contribute "Se gosta de HTTPS Everywhere, 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,26 +19,26 @@ <!ENTITY https-everywhere.menu.showCounter "Mostrar Contador"> <!ENTITY https-everywhere.prefs.title "Preferências do HTTPS Everywhere"> -<!ENTITY https-everywhere.prefs.enable_all "Ativar todas"> -<!ENTITY https-everywhere.prefs.disable_all "Desativar todas"> -<!ENTITY https-everywhere.prefs.reset_defaults "Restaurar padrões"> +<!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.search "Procurar"> -<!ENTITY https-everywhere.prefs.site "Site"> +<!ENTITY https-everywhere.prefs.site "Sítio"> <!ENTITY https-everywhere.prefs.notes "Notas"> -<!ENTITY https-everywhere.prefs.list_caption "Que regras de redireção HTTPS devem aplicar-se?"> +<!ENTITY https-everywhere.prefs.list_caption "Quais as regras de redireção HTTPS que se devem aplicar?"> <!ENTITY https-everywhere.prefs.enabled "Ativada"> -<!ENTITY https-everywhere.prefs.ruleset_howto "Pode aprender a escrever os seus próprios grupos de regras (para adicionar suporte para outros sites)"> +<!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 Padrão"> -<!ENTITY https-everywhere.prefs.view_xml_source "Ver fonte XML"> +<!ENTITY https-everywhere.prefs.reset_default "Restaurar para a Predefinição"> +<!ENTITY https-everywhere.prefs.view_xml_source "Ver Fonte XML"> -<!ENTITY https-everywhere.source.downloading "Descarregando"> +<!ENTITY https-everywhere.source.downloading "A Transferir"> <!ENTITY https-everywhere.source.filename "Nome do ficheiro"> -<!ENTITY https-everywhere.source.unable_to_download "Impossível baixar a fonte"> +<!ENTITY https-everywhere.source.unable_to_download "Não é possível transferir a fonte."> -<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notificação"> -<!ENTITY https-everywhere.popup.paragraph1 "Oops. Estava a usar a última versão estável do HTTPS Everywhere, mas nós poderemos ter acidentalmente feito o upgrade para a versão de desenvolvimento do mesmo na nossa última versão."> +<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0 development.11 notificação"> +<!ENTITY https-everywhere.popup.paragraph1 "Ups!. Estava a utilizar a última versão do HTTPS Everywhere estável, mas nós poderemos ter-lhe atualizado acidentalmente para a versão de desenvolvimento no nosso último lançamento."> <!ENTITY https-everywhere.popup.paragraph2 "Gostaria de voltar para a versão estável?"> <!ENTITY https-everywhere.popup.paragraph3 "Adoraríamos que continuasse a usar a nossa versão de desenvolvimento e ajudasse a tornar HTTPS Everywhere melhor! Poderá encontrar ainda alguns bugs por aí, que poderá relatar para https-everywhere(a)eff.org. Pedimos desculpa pela inconveniência e obrigado por utilizar HTTPS Everywhere."> <!ENTITY https-everywhere.popup.keep "Manter-me na versão de desenvolvimento">

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 18 May '15

18 May '15

commit 74de315bc5b5eaa6884d06b361397da299a5d6d4 Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 18 15:15:11 2015 +0000 Update translations for bridgedb_completed --- de/LC_MESSAGES/bridgedb.po | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/de/LC_MESSAGES/bridgedb.po b/de/LC_MESSAGES/bridgedb.po index 163b56c..1223cf6 100644 --- a/de/LC_MESSAGES/bridgedb.po +++ b/de/LC_MESSAGES/bridgedb.po @@ -5,6 +5,7 @@ # Translators: # trantor <clucko3(a)gmail.com>, 2014 # Ettore Atalan <atalanttore(a)googlemail.com>, 2014 +# jschfr <hello(a)janschoefer.com>, 2015 # unknwon_anonymous <jackjohnson0001(a)yahoo.com>, 2014 # konstibae <konstibae(a)gmail.com>, 2014 # Locke <locke(a)dena-design.de>, 2011 @@ -16,10 +17,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" -"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" -"POT-Creation-Date: 2015-02-03 03:24+0000\n" -"PO-Revision-Date: 2015-03-04 18:22+0000\n" -"Last-Translator: qbi <kubieziel(a)googlemail.com>\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-05-17 13:22+0000\n" +"Last-Translator: jschfr <hello(a)janschoefer.com>\n" "Language-Team: German (http://www.transifex.com/projects/p/torproject/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -39,7 +39,7 @@ msgstr "" #. "fteproxy" #. "Tor" #. "Tor Browser" -#: lib/bridgedb/HTTPServer.py:122 +#: lib/bridgedb/HTTPServer.py:107 msgid "Sorry! Something went wrong with your request." msgstr "Wir bitten um Entschuldigung. Bei Ihrer Anfrage lief etwas fehl." @@ -210,26 +210,27 @@ msgstr "So starten Sie die Benutzung Ihrer Brücken" #: lib/bridgedb/strings.py:121 #, python-format msgid "" -"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n" -"Browser download page %s to start Tor Browser." -msgstr "Um Brücken zum Tor-Browser hinzuzufügen, bitte der Anleitung auf der Seite %s, zum Herunterladen des %s Tor-Browsers folgen, um den Tor-Browser zu starten." +"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" +"page %s and then follow the instructions there for downloading and starting\n" +"Tor Browser." +msgstr "Um Brücken in Tor Browser einzugeben, gehe erst auf die %s Tor Browser Downloadseite %s und folge dort den Anweisungen zum Download und Starten von Tor Browser." #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:125 +#: lib/bridgedb/strings.py:126 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" msgstr "Wenn der Dialog mit den »Tor-Netzwerkeinstellungen« erscheint, \nklicken Sie auf »Konfigurieren« und folgen den Anweisungen des Assistenten: " #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:129 +#: lib/bridgedb/strings.py:130 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor connections\n" "to the Tor network?" msgstr "Blockiert oder zensiert Ihr Internetanbieter (ISP) die Verbindungen zum Tor-Netzwerk?" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:133 +#: lib/bridgedb/strings.py:134 msgid "" "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n" "paste the bridge lines into the text input box. Finally, click 'Connect', and\n" @@ -237,29 +238,29 @@ msgid "" "button in the 'Tor Network Settings' wizard for further assistance." msgstr "Wählen Sie »Ja« und klicken dann auf »Weiter«. Um Ihre neuen Brücken zu konfigurieren, kopieren Sie die \nZeilen mit den Adressen der Brücken und fügen sie in das Texteingabefeld ein. Zum Schluss klicken Sie auf \n»Verbinden« und Sie können loslegen! Falls Sie Schwierigkeiten haben, \nversuchen Sie bitte auf den »Hilfe«-Knopf im Assistenten der »Tor- Netzwerkeinstellungen« zu klicken, \num weitere Hilfe zu erhalten." -#: lib/bridgedb/strings.py:141 +#: lib/bridgedb/strings.py:142 msgid "Displays this message." msgstr "Diese Nachricht anzeigen." #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the #. same non-Pluggable Transport bridges described above as being #. "plain-ol'-vanilla" bridges. -#: lib/bridgedb/strings.py:145 +#: lib/bridgedb/strings.py:146 msgid "Request vanilla bridges." msgstr "Standard-Brücken anfordern." -#: lib/bridgedb/strings.py:146 +#: lib/bridgedb/strings.py:147 msgid "Request IPv6 bridges." msgstr "IPv6-Brücken anfordern." #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: lib/bridgedb/strings.py:148 +#: lib/bridgedb/strings.py:149 msgid "Request a Pluggable Transport by TYPE." msgstr "Einen Pluggable Transport des TYPs anfordern." #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "GnuPG". -#: lib/bridgedb/strings.py:151 +#: lib/bridgedb/strings.py:152 msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "Eine Kopie des öffentlichen GnuPG-Schlüssels der Brückendatenbank erhalten."

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 18 May '15

18 May '15

commit 3b73c977115a10e170ee768eb05760ae9da7aac1 Author: Translation commit bot <translation(a)torproject.org> Date: Sun May 17 13:45:03 2015 +0000 Update translations for bridgedb --- de/LC_MESSAGES/bridgedb.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de/LC_MESSAGES/bridgedb.po b/de/LC_MESSAGES/bridgedb.po index 5273a8d..1223cf6 100644 --- a/de/LC_MESSAGES/bridgedb.po +++ b/de/LC_MESSAGES/bridgedb.po @@ -18,7 +18,7 @@ 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-05-17 13:13+0000\n" +"PO-Revision-Date: 2015-05-17 13:22+0000\n" "Last-Translator: jschfr <hello(a)janschoefer.com>\n" "Language-Team: German (http://www.transifex.com/projects/p/torproject/language/de/)\n" "MIME-Version: 1.0\n"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 18 May '15

18 May '15

commit 172c8837d5bca1d6e45d37684e09e08c4856e4de Author: Translation commit bot <translation(a)torproject.org> Date: Sun May 17 13:15:03 2015 +0000 Update translations for bridgedb --- de/LC_MESSAGES/bridgedb.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/de/LC_MESSAGES/bridgedb.po b/de/LC_MESSAGES/bridgedb.po index f40dd14..5273a8d 100644 --- a/de/LC_MESSAGES/bridgedb.po +++ b/de/LC_MESSAGES/bridgedb.po @@ -5,6 +5,7 @@ # Translators: # trantor <clucko3(a)gmail.com>, 2014 # Ettore Atalan <atalanttore(a)googlemail.com>, 2014 +# jschfr <hello(a)janschoefer.com>, 2015 # unknwon_anonymous <jackjohnson0001(a)yahoo.com>, 2014 # konstibae <konstibae(a)gmail.com>, 2014 # Locke <locke(a)dena-design.de>, 2011 @@ -17,8 +18,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-04-19 08:23+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2015-05-17 13:13+0000\n" +"Last-Translator: jschfr <hello(a)janschoefer.com>\n" "Language-Team: German (http://www.transifex.com/projects/p/torproject/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -212,7 +213,7 @@ msgid "" "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" "page %s and then follow the instructions there for downloading and starting\n" "Tor Browser." -msgstr "" +msgstr "Um Brücken in Tor Browser einzugeben, gehe erst auf die %s Tor Browser Downloadseite %s und folge dort den Anweisungen zum Download und Starten von Tor Browser." #. TRANSLATORS: Please DO NOT translate "Tor". #: lib/bridgedb/strings.py:126

1 0

[nyx/master] Drop log panel lock
by atagar＠torproject.org 15 May '15

15 May '15

commit fcf97845dbc0f49c717979bb786e679ef4c980b8 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri May 15 09:08:15 2015 -0700 Drop log panel lock Drop the lock we used to prevent concurrent modifications of our content while we redraw. This was half-assed (not covering all our setters). Safer to just make our draw function make shallow copies of what it needs. --- nyx/log_panel.py | 195 +++++++++++++++++++++++++++--------------------------- nyx/util/log.py | 7 ++ 2 files changed, 105 insertions(+), 97 deletions(-) diff --git a/nyx/log_panel.py b/nyx/log_panel.py index a76340d..4180f57 100644 --- a/nyx/log_panel.py +++ b/nyx/log_panel.py @@ -69,15 +69,15 @@ class LogPanel(panel.Panel, threading.Thread): threading.Thread.__init__(self) self.setDaemon(True) - self._logged_events = nyx.util.log.LogGroup(CONFIG['cache.log_panel.size'], group_by_day = True) - self._logged_event_types = nyx.util.log.listen_for_events(self._register_tor_event, logged_events) + self._event_log = nyx.util.log.LogGroup(CONFIG['cache.log_panel.size'], group_by_day = True) + self._event_types = nyx.util.log.listen_for_events(self._register_tor_event, logged_events) self._log_file = nyx.util.log.LogFileOutput(CONFIG['features.logFile']) self._filter = nyx.util.log.LogFilters(initial_filters = CONFIG['features.log.regex']) + self._show_duplicates = CONFIG['features.log.showDuplicateEntries'] - self.set_pause_attr('_logged_events') + self.set_pause_attr('_event_log') self._halt = False # terminates thread if true - self._lock = threading.RLock() self._pause_condition = threading.Condition() self._has_new_event = False @@ -89,14 +89,14 @@ class LogPanel(panel.Panel, threading.Thread): if log_location: try: for entry in reversed(list(nyx.util.log.read_tor_log(log_location, CONFIG['features.log.prepopulateReadLimit']))): - if entry.type in self._logged_event_types: - self._logged_events.add(entry) + if entry.type in self._event_types: + self._event_log.add(entry) except IOError as exc: log.info('Unable to read log located at %s: %s' % (log_location, exc)) except ValueError as exc: log.info(str(exc)) - self._last_content_height = len(self._logged_events) # height of the rendered content when last drawn + self._last_content_height = len(self._event_log) # height of the rendered content when last drawn self._scroll = 0 # merge NYX_LOGGER into us, and listen for its future events @@ -114,8 +114,7 @@ class LogPanel(panel.Panel, threading.Thread): they're deduplicated """ - nyx_config = conf.get_config('nyx') - nyx_config.set('features.log.showDuplicateEntries', str(is_visible)) + self._show_duplicates = is_visible def get_filter(self): """ @@ -163,10 +162,9 @@ class LogPanel(panel.Panel, threading.Thread): user_input = user_input.replace(' ', '') # strip spaces event_types = nyx.arguments.expand_events(user_input) - if event_types != self._logged_event_types: - with self._lock: - self._logged_event_types = nyx.util.log.listen_for_events(self._register_tor_event, event_types) - self.redraw(True) + if event_types != self._event_types: + self._event_types = nyx.util.log.listen_for_events(self._register_tor_event, event_types) + self.redraw(True) except ValueError as exc: nyx.popups.show_msg('Invalid flags: %s' % str(exc), 2) finally: @@ -191,9 +189,8 @@ class LogPanel(panel.Panel, threading.Thread): Clears the contents of the event log. """ - with self._lock: - self._logged_events = nyx.util.log.LogGroup(CONFIG['cache.log_panel.size'], group_by_day = True) - self.redraw(True) + self._event_log = nyx.util.log.LogGroup(CONFIG['cache.log_panel.size'], group_by_day = True) + self.redraw(True) def save_snapshot(self, path): """ @@ -217,14 +214,16 @@ class LogPanel(panel.Panel, threading.Thread): except OSError as exc: raise IOError("unable to make directory '%s'" % base_dir) - with self._lock: - with open(path, 'w') as snapshot_file: - try: - for entry in reversed(list(self._logged_events)): - if self._filter.match(entry.display_message): - snapshot_file.write(entry.display_message + '\n') - except Exception as exc: - raise IOError("unable to write to '%s': %s" % (path, exc)) + event_log = list(self._event_log) + event_filter = self._filter.clone() + + with open(path, 'w') as snapshot_file: + try: + for entry in reversed(event_log): + if event_filter.match(entry.display_message): + snapshot_file.write(entry.display_message + '\n') + except Exception as exc: + raise IOError("unable to write to '%s': %s" % (path, exc)) def handle_key(self, key): if key.is_scroll(): @@ -232,13 +231,11 @@ class LogPanel(panel.Panel, threading.Thread): new_scroll = ui_tools.get_scroll_position(key, self._scroll, page_height, self._last_content_height) if self._scroll != new_scroll: - with self._lock: - self._scroll = new_scroll - self.redraw(True) - elif key.match('u'): - with self._lock: - self.set_duplicate_visability(not CONFIG['features.log.showDuplicateEntries']) + self._scroll = new_scroll self.redraw(True) + elif key.match('u'): + self.set_duplicate_visability(not self._show_duplicates) + self.redraw(True) elif key.match('c'): msg = 'This will clear the log. Are you sure (c again to confirm)?' key_press = nyx.popups.show_msg(msg, attr = curses.A_BOLD) @@ -274,98 +271,103 @@ class LogPanel(panel.Panel, threading.Thread): ('a', 'save snapshot of the log', None), ('e', 'change logged events', None), ('f', 'log regex filter', 'enabled' if self._filter.selection() else 'disabled'), - ('u', 'duplicate log entries', 'visible' if CONFIG['features.log.showDuplicateEntries'] else 'hidden'), + ('u', 'duplicate log entries', 'visible' if self._show_duplicates else 'hidden'), ('c', 'clear event log', None), ] def draw(self, width, height): - with self._lock: - event_log = list(self.get_attr('_logged_events')) - self._scroll = max(0, min(self._scroll, self._last_content_height - height + 1)) + self._scroll = max(0, min(self._scroll, self._last_content_height - height + 1)) - is_scroll_bar_visible = self._last_content_height > height - 1 + event_log = list(self.get_attr('_event_log')) + event_filter = self._filter.clone() + event_types = list(self._event_types) + scroll = int(self._scroll) + last_content_height = int(self._last_content_height) + show_duplicates = self._show_duplicates - if is_scroll_bar_visible: - self.add_scroll_bar(self._scroll, self._scroll + height - 1, self._last_content_height, 1) + is_scroll_bar_visible = last_content_height > height - 1 - x, y = 3 if is_scroll_bar_visible else 1, 1 - self._scroll + if is_scroll_bar_visible: + self.add_scroll_bar(scroll, scroll + height - 1, last_content_height, 1) - # group entries by date, filtering out those that aren't visible + x, y = 3 if is_scroll_bar_visible else 1, 1 - scroll - day_to_entries, today = {}, nyx.util.log.day_count(time.time()) + # group entries by date, filtering out those that aren't visible - for entry in event_log: - if entry.is_duplicate and not CONFIG['features.log.showDuplicateEntries']: - continue # deduplicated message - elif not self._filter.match(entry.display_message): - continue # filter doesn't match log message + day_to_entries, today = {}, nyx.util.log.day_count(time.time()) - day_to_entries.setdefault(entry.day_count(), []).append(entry) + for entry in event_log: + if entry.is_duplicate and not show_duplicates: + continue # deduplicated message + elif not event_filter.match(entry.display_message): + continue # filter doesn't match log message - for day in sorted(day_to_entries.keys(), reverse = True): - if day == today: - for entry in day_to_entries[day]: - y = self._draw_entry(x, y, width, entry) - else: - original_y, y = y, y + 1 + day_to_entries.setdefault(entry.day_count(), []).append(entry) - for entry in day_to_entries[day]: - y = self._draw_entry(x, y, width, entry) + for day in sorted(day_to_entries.keys(), reverse = True): + if day == today: + for entry in day_to_entries[day]: + y = self._draw_entry(x, y, width, entry, show_duplicates) + else: + original_y, y = y, y + 1 - ui_tools.draw_box(self, original_y, x - 1, width - x + 1, y - original_y + 1, curses.A_BOLD, 'yellow') - time_label = time.strftime(' %B %d, %Y ', time.localtime(day_to_entries[day][0].timestamp)) - self.addstr(original_y, x + 1, time_label, curses.A_BOLD, curses.A_BOLD, 'yellow') + for entry in day_to_entries[day]: + y = self._draw_entry(x, y, width, entry, show_duplicates) - y += 1 + ui_tools.draw_box(self, original_y, x - 1, width - x + 1, y - original_y + 1, curses.A_BOLD, 'yellow') + time_label = time.strftime(' %B %d, %Y ', time.localtime(day_to_entries[day][0].timestamp)) + self.addstr(original_y, x + 1, time_label, curses.A_BOLD, curses.A_BOLD, 'yellow') - # drawing the title after the content, so we'll clear content from the top line + y += 1 - if self.is_title_visible(): - self._draw_title(width) + # drawing the title after the content, so we'll clear content from the top line - # redraw the display if... - # - last_content_height was off by too much - # - we're off the bottom of the page + if self.is_title_visible(): + self._draw_title(width, event_types, event_filter) - new_content_height = y + self._scroll - 1 - content_height_delta = abs(self._last_content_height - new_content_height) - force_redraw, force_redraw_reason = True, '' + # redraw the display if... + # - last_content_height was off by too much + # - we're off the bottom of the page - if content_height_delta >= CONTENT_HEIGHT_REDRAW_THRESHOLD: - force_redraw_reason = 'estimate was off by %i' % content_height_delta - elif new_content_height > height and self._scroll + height - 1 > new_content_height: - force_redraw_reason = 'scrolled off the bottom of the page' - elif not is_scroll_bar_visible and new_content_height > height - 1: - force_redraw_reason = "scroll bar wasn't previously visible" - elif is_scroll_bar_visible and new_content_height <= height - 1: - force_redraw_reason = "scroll bar shouldn't be visible" - else: - force_redraw = False + new_content_height = y + scroll - 1 + content_height_delta = abs(last_content_height - new_content_height) + force_redraw, force_redraw_reason = True, '' - self._last_content_height = new_content_height - self._has_new_event = False + if content_height_delta >= CONTENT_HEIGHT_REDRAW_THRESHOLD: + force_redraw_reason = 'estimate was off by %i' % content_height_delta + elif new_content_height > height and self._scroll + height - 1 > new_content_height: + force_redraw_reason = 'scrolled off the bottom of the page' + elif not is_scroll_bar_visible and new_content_height > height - 1: + force_redraw_reason = "scroll bar wasn't previously visible" + elif is_scroll_bar_visible and new_content_height <= height - 1: + force_redraw_reason = "scroll bar shouldn't be visible" + else: + force_redraw = False - if force_redraw: - log.debug('redrawing the log panel with the corrected content height (%s)' % force_redraw_reason) - self.redraw(True) + self._last_content_height = new_content_height + self._has_new_event = False - def _draw_title(self, width): + if force_redraw: + log.debug('redrawing the log panel with the corrected content height (%s)' % force_redraw_reason) + self.redraw(True) + + def _draw_title(self, width, event_types, event_filter): """ Panel title with the event types we're logging and our regex filter if set. """ self.addstr(0, 0, ' ' * width) # clear line - title_comp = list(nyx.util.log.condense_runlevels(*self._logged_event_types)) + title_comp = list(nyx.util.log.condense_runlevels(*event_types)) - if self._filter.selection(): - title_comp.append('filter: %s' % self._filter.selection()) + if event_filter.selection(): + title_comp.append('filter: %s' % event_filter.selection()) title_comp_str = join(title_comp, ', ', width - 10) title = 'Events (%s):' % title_comp_str if title_comp_str else 'Events:' self.addstr(0, 0, title, curses.A_STANDOUT) - def _draw_entry(self, x, y, width, entry): + def _draw_entry(self, x, y, width, entry, show_duplicates): """ Presents a log entry with line wrapping. """ @@ -397,7 +399,7 @@ class LogPanel(panel.Panel, threading.Thread): x, y = draw_msg(min_x, x, y, width, msg, boldness, color) - if entry.duplicates and not CONFIG['features.log.showDuplicateEntries']: + if entry.duplicates and not show_duplicates: duplicate_count = len(entry.duplicates) - 1 plural = 's' if duplicate_count > 1 else '' duplicate_msg = ' [%i duplicate%s hidden]' % (duplicate_count, plural) @@ -462,17 +464,16 @@ class LogPanel(panel.Panel, threading.Thread): self._register_event(nyx.util.log.LogEntry(int(record.created), 'NYX_%s' % record.levelname, record.msg)) def _register_event(self, event): - if event.type not in self._logged_event_types: + if event.type not in self._event_types: return - with self._lock: - self._logged_events.add(event) - self._log_file.write(event.display_message) + self._event_log.add(event) + self._log_file.write(event.display_message) - # notifies the display that it has new content + # notifies the display that it has new content - if self._filter.match(event.display_message): - self._has_new_event = True + if self._filter.match(event.display_message): + self._has_new_event = True - with self._pause_condition: - self._pause_condition.notifyAll() + with self._pause_condition: + self._pause_condition.notifyAll() diff --git a/nyx/util/log.py b/nyx/util/log.py index ca2b520..c2e1a4c 100644 --- a/nyx/util/log.py +++ b/nyx/util/log.py @@ -392,6 +392,13 @@ class LogFilters(object): regex_filter = self._past_filters.get(self._selected) return not regex_filter or bool(regex_filter.search(message)) + def clone(self): + with self._lock: + clone = LogFilters(max_filters = self._max_filters) + clone._selected = self._selected + clone._past_filters = self._past_filters + return clone + def trace(msg, **attr): _log(stem.util.log.TRACE, msg, **attr)

1 0

[stem/master] Descriptor tutorial section for 'Where do descriptors come from?'
by atagar＠torproject.org 15 May '15

15 May '15

commit aa4e1bbb909c502cad7c824912d18282f9e35ae9 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri May 15 09:59:00 2015 -0700 Descriptor tutorial section for 'Where do descriptors come from?' Jordan Wright's recent article gives a great excuse to add a little section on this. :P https://jordan-wright.github.io/blog/2015/05/14/how-tor-works-part-three-th… https://jordan-wright.github.io/images/blog/how_tor_works/consensus.png --- docs/tutorials/mirror_mirror_on_the_wall.rst | 26 ++++++++++++++++++++++++++ stem/__init__.py | 2 +- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/docs/tutorials/mirror_mirror_on_the_wall.rst b/docs/tutorials/mirror_mirror_on_the_wall.rst index bec30a7..9ef620f 100644 --- a/docs/tutorials/mirror_mirror_on_the_wall.rst +++ b/docs/tutorials/mirror_mirror_on_the_wall.rst @@ -5,6 +5,7 @@ The following is an overview of **Tor descriptors**. If you're already familiar with what they are and where to get them then you may want to skip to the end. * :ref:`what-is-a-descriptor` +* :ref:`where-do-descriptors-come-from` * :ref:`where-can-i-get-the-current-descriptors` * :ref:`where-can-i-get-past-descriptors` * :ref:`can-i-get-descriptors-from-the-tor-process` @@ -34,6 +35,31 @@ Descriptor Type `Hidden Service Descriptor <../api/descriptor/hidden_service_descriptor.html>`_ Information pertaining to a `Hidden Service <https://www.torproject.org/docs/hidden-services.html.en>`_. These can only be `queried through the tor process <over_the_river.html#hidden-service-descriptors>`_. ================================================================================ =========== +.. _where-do-descriptors-come-from: + +Where do descriptors come from? +------------------------------- + +Descriptors fall into two camps: + +* **Server**, **extra-info**, and **hidden service** descriptors are + **self-published documents**. Relays and hidden services publish these about + themselves, and so naturally can indicate anything they'd like in them (true + or not). + + These are **self contained documents**, bundling within themselves a + signiture Stem can `optionally check + <./mirror_mirror_on_the_wall.html#validating-the-descriptors-content>`_. + +* **Network status documents** (aka **votes**, the **consensus**, and **router + status entries** they contain) are created by the **directory authorities**. + For a great overview on how this works see `Jordan Wright's article on how + the consensus is made + <https://jordan-wright.github.io/blog/2015/05/14/how-tor-works-part-three-th…>`_. + +**Microdescriptors** are merely a distilled copy of a **server descriptor**, +and so belong to the first camp. + .. _where-can-i-get-the-current-descriptors: Where can I get the current descriptors? diff --git a/stem/__init__.py b/stem/__init__.py index 5134c2f..7229453 100644 --- a/stem/__init__.py +++ b/stem/__init__.py @@ -441,7 +441,7 @@ Library for working with the tor process. ================= =========== """ -__version__ = '1.4.0' +__version__ = '1.4.0-dev' __author__ = 'Damian Johnson' __contact__ = 'atagar(a)torproject.org' __url__ = 'https://stem.torproject.org/'

1 0

[translation/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties
by translation＠torproject.org 15 May '15

15 May '15

commit 60ffdf8c1d7079b9fea32de5be29246a35c84b70 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 15 13:46:24 2015 +0000 Update translations for torbutton-abouttorproperties --- it/abouttor.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/it/abouttor.properties b/it/abouttor.properties index cf2863d..db49b15 100644 --- a/it/abouttor.properties +++ b/it/abouttor.properties @@ -2,7 +2,7 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +aboutTor.searchSP.privacy=Cerca <a href="%1$S"> in sicurezza</a>con<a href="%2$S">Starpage</a> # The following string is a link which replaces %1$S above. aboutTor.searchSP.privacy.link=https://startpage.com/ita/protect-privacy.ht… # The following string is a link which replaces %2$S above. @@ -14,7 +14,7 @@ aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchDDG.search.link=https://duckduckgo.com/ -aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>. +aboutTor.searchDC.privacy=Cerca <a href="%1$S"> in sicurezza </a> con <a href="%2$S">Disconnect.me</a>. # The following string is a link which replaces %1$S above. aboutTor.searchDC.privacy.link=https://disconnect.me/privacy # The following string is a link which replaces %2$S above.

1 0

[translation/torbutton-aboutdialogdtd_completed] Update translations for torbutton-aboutdialogdtd_completed
by translation＠torproject.org 15 May '15

15 May '15

commit 05493fa7f966c09b1f5cd87c39435ab0ba3324d9 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 15 13:46:21 2015 +0000 Update translations for torbutton-aboutdialogdtd_completed --- it/aboutdialog.dtd | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/it/aboutdialog.dtd b/it/aboutdialog.dtd new file mode 100644 index 0000000..ae910f9 --- /dev/null +++ b/it/aboutdialog.dtd @@ -0,0 +1,19 @@ +<!ENTITY project.start "&brandShortName; è sviluppato da"> + +<!ENTITY project.tpoLink "il &vendorShortName;"> +<!ENTITY project.end ", un lavoro no profit per difendere la tua privacy e la tua libertà online."> + +<!ENTITY help.start "Vuoi aiutare?"> + +<!ENTITY help.donateLink "Dona"> +<!ENTITY help.or "o"> + +<!ENTITY help.getInvolvedLink "partecipa"> +<!ENTITY help.end "!"> + +<!ENTITY bottomLinks.questions "Domande?"> + +<!ENTITY bottomLinks.grow "Aiuta la rete Tor a crescere!"> + +<!ENTITY bottomLinks.license "Informazioni sulla licenza"> +<!ENTITY tor.TrademarkStatement "'Tor' e 'Onion Logo' sono marchi registrati su Tor Project, Inc.">

1 0