June 2016 - tor-commits - lists.torproject.org

[nyx/master] Validate startup.events
by atagar＠torproject.org 08 Jun '16

08 Jun '16

commit fc08a1a26c5b4ad85b30e4cc4c2fb3e6cf67201b Author: Sambuddha Basu <sambuddhabasu1(a)gmail.com> Date: Tue Jun 7 21:58:50 2016 -0700 Validate startup.events --- nyx/panel/log.py | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/nyx/panel/log.py b/nyx/panel/log.py index 5fd0cdf..482b567 100644 --- a/nyx/panel/log.py +++ b/nyx/panel/log.py @@ -31,6 +31,27 @@ def conf_handler(key, value): return max(1000, value) +def validate_events(events): + """ + Check whether the events are any one of Tor runlevels, Nyx runlevels or + Tor events. If not, return the default events. + """ + valid_events = tor_controller().get_info('events/names').split() + accepted_events, invalid_events = set(), set() + + events = events.split(',') + for event in events: + if event in valid_events: + accepted_events.update([event]) + else: + invalid_events.update([event]) + + if invalid_events: + return ['NOTICE', 'WARN', 'ERR', 'NYX_NOTICE', 'NYX_WARNING', 'NYX_ERROR'] + else: + return accepted_events + + CONFIG = conf.config_dict('nyx', { 'attr.log_color': {}, 'cache.log_panel.size': 1000, @@ -68,7 +89,7 @@ class LogPanel(nyx.panel.DaemonPanel): def __init__(self): nyx.panel.DaemonPanel.__init__(self, 'log', UPDATE_RATE) - logged_events = CONFIG['startup.events'].split(',') + logged_events = validate_events(CONFIG['startup.events']) self._event_log = nyx.log.LogGroup(CONFIG['cache.log_panel.size'], group_by_day = True) self._event_log_paused = None self._event_types = nyx.log.listen_for_events(self._register_tor_event, logged_events)

1 0

[nyx/master] Revise handlign for invalid --log input
by atagar＠torproject.org 08 Jun '16

08 Jun '16

commit 6e40473ba31f50079aff1b4f5bf2d1cdaca58e4c Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jun 8 10:26:48 2016 -0700 Revise handlign for invalid --log input Few change to the previous commit... * We didn't recognize the nyx runlevels (NYX_NOTICE and such). * Our getinfo request didn't have a default so it could cause us to stacktrace. * Making this a bit simpler. --- nyx/panel/log.py | 30 ++++++++---------------------- 1 file changed, 8 insertions(+), 22 deletions(-) diff --git a/nyx/panel/log.py b/nyx/panel/log.py index 482b567..9de7353 100644 --- a/nyx/panel/log.py +++ b/nyx/panel/log.py @@ -31,27 +31,6 @@ def conf_handler(key, value): return max(1000, value) -def validate_events(events): - """ - Check whether the events are any one of Tor runlevels, Nyx runlevels or - Tor events. If not, return the default events. - """ - valid_events = tor_controller().get_info('events/names').split() - accepted_events, invalid_events = set(), set() - - events = events.split(',') - for event in events: - if event in valid_events: - accepted_events.update([event]) - else: - invalid_events.update([event]) - - if invalid_events: - return ['NOTICE', 'WARN', 'ERR', 'NYX_NOTICE', 'NYX_WARNING', 'NYX_ERROR'] - else: - return accepted_events - - CONFIG = conf.config_dict('nyx', { 'attr.log_color': {}, 'cache.log_panel.size': 1000, @@ -89,7 +68,14 @@ class LogPanel(nyx.panel.DaemonPanel): def __init__(self): nyx.panel.DaemonPanel.__init__(self, 'log', UPDATE_RATE) - logged_events = validate_events(CONFIG['startup.events']) + logged_events = CONFIG['startup.events'].split(',') + tor_events = tor_controller().get_info('events/names', '').split() + invalid_events = filter(lambda event: not event.startswith('NYX_') and event not in tor_events, logged_events) + + if invalid_events: + logged_events = ['NOTICE', 'WARN', 'ERR', 'NYX_NOTICE', 'NYX_WARNING', 'NYX_ERROR'] + log.warn("Your --log argument had the following events tor doesn't recognize: %s" % ', '.join(invalid_events)) + self._event_log = nyx.log.LogGroup(CONFIG['cache.log_panel.size'], group_by_day = True) self._event_log_paused = None self._event_types = nyx.log.listen_for_events(self._register_tor_event, logged_events)

1 0

[tor-messenger-build/master] Bump tags to THUNDERBIRD_45_1_1_RELEASE
by arlo＠torproject.org 08 Jun '16

08 Jun '16

commit 660110af409d06dcadc4cb198b9513e9da4d4bad Author: Arlo Breault <arlolra(a)gmail.com> Date: Wed Jun 8 10:05:19 2016 -0700 Bump tags to THUNDERBIRD_45_1_1_RELEASE --- ChangeLog | 4 ++-- projects/instantbird/config | 2 +- projects/mozilla/config | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2093f0c..2505d5a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ Tor Messenger 0.1.0b7 -- * All Platforms - * Use the THUNDERBIRD_45_1_0_RELEASE tag on mozilla-esr45 - * Use the THUNDERBIRD_45_1_0_RELEASE tag on comm-esr45 + * Use the THUNDERBIRD_45_1_1_RELEASE tag on mozilla-esr45 + * Use the THUNDERBIRD_45_1_1_RELEASE tag on comm-esr45 * Bug 19053: Display plaintext in notifications * ctypes-otr * GH 66: Provide functionality for adding verified fingerprints (patch by Vu Quoc Huy) diff --git a/projects/instantbird/config b/projects/instantbird/config index 3b4a650..d6c3a2b 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' hg_url: https://hg.mozilla.org/releases/comm-esr45/ -hg_hash: THUNDERBIRD_45_1_0_RELEASE +hg_hash: THUNDERBIRD_45_1_1_RELEASE filename: "[% project %]-[% c('version') %]-[% c('var/osname') %]-[% c('var/build_id') %].[% c('var/archive_suffix') %]" remote_docker: 1 var: diff --git a/projects/mozilla/config b/projects/mozilla/config index 59ee866..653fb7a 100644 --- a/projects/mozilla/config +++ b/projects/mozilla/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' hg_url: https://hg.mozilla.org/releases/mozilla-esr45/ -hg_hash: THUNDERBIRD_45_1_0_RELEASE +hg_hash: THUNDERBIRD_45_1_1_RELEASE src: | #!/bin/sh set -e

1 0

[translation/tails-onioncircuits_completed] Update translations for tails-onioncircuits_completed
by translation＠torproject.org 08 Jun '16

08 Jun '16

commit b7b848e48eab9551de1391c9f517b4189023d94d Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 8 15:47:26 2016 +0000 Update translations for tails-onioncircuits_completed --- de/onioncircuits.pot | 88 ++++++++++++++++++++++++---------------------------- 1 file changed, 41 insertions(+), 47 deletions(-) diff --git a/de/onioncircuits.pot b/de/onioncircuits.pot index 144d4d7..5d84364 100644 --- a/de/onioncircuits.pot +++ b/de/onioncircuits.pot @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-31 21:31+0200\n" -"PO-Revision-Date: 2016-05-20 11:48+0000\n" +"POT-Creation-Date: 2016-05-31 14:42+0200\n" +"PO-Revision-Date: 2016-06-08 15:35+0000\n" "Last-Translator: Ettore Atalan <atalanttore(a)googlemail.com>\n" "Language-Team: German (http://www.transifex.com/otf/torproject/language/de/)\n" "MIME-Version: 1.0\n" @@ -19,74 +19,68 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../onioncircuits:81 -msgid "" -"Cannot connect to the Tor daemon. Onion Circuits will try to reconnect..." -msgstr "Kann nicht mit dem Tor-Daemon verbinden. Onion Circuits versucht eine erneute Verbindung..." +msgid "You are not connected to Tor yet..." +msgstr "Sie sind noch nicht mit Tor verbunden..." -#: ../onioncircuits:94 +#: ../onioncircuits:95 msgid "Onion Circuits" msgstr "Onion Circuits" -#: ../onioncircuits:95 -msgid "Display Tor circuits and streams" -msgstr "Tor-Leitungen und -Datenströme anzeigen" - -#: ../onioncircuits:107 -msgid "OK" -msgstr "OK" - -#: ../onioncircuits:124 -msgid "Path" -msgstr "Pfad" - #: ../onioncircuits:125 +msgid "Circuit" +msgstr "Kanal" + +#: ../onioncircuits:126 msgid "Status" msgstr "Status" -#: ../onioncircuits:141 -msgid "Click on a path to get details" -msgstr "Klicken Sie auf einen Pfad, um Details zu erhalten" +#: ../onioncircuits:142 +msgid "Click on a circuit for more detail about its Tor relays." +msgstr "Klicken Sie auf einen Kanal für mehr Details über seine Relays." -#: ../onioncircuits:215 -msgid "" -"Lost connection to the Tor daemon. Onion Circuits will try to reconnect..." -msgstr "Verbindung zum Tor-Daemon verloren. Onion Circuits versucht eine erneute Verbindung..." - -#: ../onioncircuits:232 -msgid "Connected to the Tor daemon! You can use now Onion Circuits." -msgstr "Mit dem Tor-Daemon verbunden! Sie können nun Onion Circuits verwenden." +#: ../onioncircuits:221 +msgid "The connection to Tor was lost..." +msgstr "Die Verbindung zu Tor wurde verloren..." -#: ../onioncircuits:314 -msgid "Building..." -msgstr "Aufbauen..." +#: ../onioncircuits:317 +msgid "..." +msgstr "..." -#: ../onioncircuits:339 +#: ../onioncircuits:343 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: ../onioncircuits:564 +#: ../onioncircuits:554 +msgid "GeoIP database unavailable. No country information will be displayed." +msgstr "GeoIP-Datenbank nicht verfügbar. Länderinformationen werden nicht angezeigt." + +#: ../onioncircuits:585 +#, c-format +msgid "%s (%s)" +msgstr "%s (%s)" + +#: ../onioncircuits:590 +#, c-format +msgid "%.2f Mb/s" +msgstr "%.2f Mb/s" + +#: ../onioncircuits:592 ../onioncircuits:593 ../onioncircuits:594 +msgid "Unknown" +msgstr "Unbekannt" + +#: ../onioncircuits:607 msgid "Fingerprint:" msgstr "Fingerabdruck:" -#: ../onioncircuits:565 +#: ../onioncircuits:608 msgid "Published:" msgstr "Veröffentlicht:" -#: ../onioncircuits:566 +#: ../onioncircuits:609 msgid "IP:" msgstr "IP:" -#: ../onioncircuits:566 -#, c-format -msgid "%s (%s)" -msgstr "%s (%s)" - -#: ../onioncircuits:567 +#: ../onioncircuits:610 msgid "Bandwidth:" msgstr "Bandbreite:" - -#: ../onioncircuits:567 -#, c-format -msgid "%.2f Mb/s" -msgstr "%.2f Mb/s"

1 0

[translation/tails-onioncircuits] Update translations for tails-onioncircuits
by translation＠torproject.org 08 Jun '16

08 Jun '16

commit 6525ad86f255702e295241c56602c44864db399b Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 8 15:47:21 2016 +0000 Update translations for tails-onioncircuits --- de/onioncircuits.pot | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/de/onioncircuits.pot b/de/onioncircuits.pot index 4f47619..5d84364 100644 --- a/de/onioncircuits.pot +++ b/de/onioncircuits.pot @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-31 14:42+0200\n" -"PO-Revision-Date: 2016-06-01 09:23+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2016-06-08 15:35+0000\n" +"Last-Translator: Ettore Atalan <atalanttore(a)googlemail.com>\n" "Language-Team: German (http://www.transifex.com/otf/torproject/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,7 +20,7 @@ msgstr "" #: ../onioncircuits:81 msgid "You are not connected to Tor yet..." -msgstr "" +msgstr "Sie sind noch nicht mit Tor verbunden..." #: ../onioncircuits:95 msgid "Onion Circuits" @@ -28,7 +28,7 @@ msgstr "Onion Circuits" #: ../onioncircuits:125 msgid "Circuit" -msgstr "" +msgstr "Kanal" #: ../onioncircuits:126 msgid "Status" @@ -36,15 +36,15 @@ msgstr "Status" #: ../onioncircuits:142 msgid "Click on a circuit for more detail about its Tor relays." -msgstr "" +msgstr "Klicken Sie auf einen Kanal für mehr Details über seine Relays." #: ../onioncircuits:221 msgid "The connection to Tor was lost..." -msgstr "" +msgstr "Die Verbindung zu Tor wurde verloren..." #: ../onioncircuits:317 msgid "..." -msgstr "" +msgstr "..." #: ../onioncircuits:343 #, c-format @@ -53,7 +53,7 @@ msgstr "%s: %s" #: ../onioncircuits:554 msgid "GeoIP database unavailable. No country information will be displayed." -msgstr "" +msgstr "GeoIP-Datenbank nicht verfügbar. Länderinformationen werden nicht angezeigt." #: ../onioncircuits:585 #, c-format @@ -67,7 +67,7 @@ msgstr "%.2f Mb/s" #: ../onioncircuits:592 ../onioncircuits:593 ../onioncircuits:594 msgid "Unknown" -msgstr "" +msgstr "Unbekannt" #: ../onioncircuits:607 msgid "Fingerprint:"

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 08 Jun '16

08 Jun '16

commit 82ed3d1439b588aa92560b89c734ebca97a599fe Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 8 15:46:12 2016 +0000 Update translations for tails-misc_completed --- de.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/de.po b/de.po index 6bc67ca..2cd2bc6 100644 --- a/de.po +++ b/de.po @@ -28,8 +28,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-05-25 20:25+0200\n" -"PO-Revision-Date: 2016-05-27 10:12+0000\n" +"POT-Creation-Date: 2016-06-06 14:26+0200\n" +"PO-Revision-Date: 2016-06-08 15:33+0000\n" "Last-Translator: carolyn <carolyn(a)anhalt.org>\n" "Language-Team: German (http://www.transifex.com/otf/torproject/language/de/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 08 Jun '16

08 Jun '16

commit c9f6dfa749ec2b18fbc18402cb63c6d1e8aa88dc Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 8 15:46:07 2016 +0000 Update translations for tails-misc --- de.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/de.po b/de.po index 6bc67ca..2cd2bc6 100644 --- a/de.po +++ b/de.po @@ -28,8 +28,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-05-25 20:25+0200\n" -"PO-Revision-Date: 2016-05-27 10:12+0000\n" +"POT-Creation-Date: 2016-06-06 14:26+0200\n" +"PO-Revision-Date: 2016-06-08 15:33+0000\n" "Last-Translator: carolyn <carolyn(a)anhalt.org>\n" "Language-Team: German (http://www.transifex.com/otf/torproject/language/de/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed
by translation＠torproject.org 08 Jun '16

08 Jun '16

commit 491129ad1508b155adfb95d8bbda2f3e7a5428e4 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 8 15:45:57 2016 +0000 Update translations for tor-launcher-properties_completed --- de/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de/torlauncher.properties b/de/torlauncher.properties index bbf1be6..8406776 100644 --- a/de/torlauncher.properties +++ b/de/torlauncher.properties @@ -49,7 +49,7 @@ torlauncher.bootstrapStatus.loading_keys=Autorisierungszertifikate werden gelade torlauncher.bootstrapStatus.requesting_descriptors=Relaisinformationen werden angefordert torlauncher.bootstrapStatus.loading_descriptors=Relaisinformationen werden geladen torlauncher.bootstrapStatus.conn_or=Zum Tor-Netzwerk wird verbunden -torlauncher.bootstrapStatus.handshake_or=Tor-Verbindung wird hergestellt +torlauncher.bootstrapStatus.handshake_or=Tor-Kanal wird hergestellt torlauncher.bootstrapStatus.done=Zum Tor-Netzwerk wurde verbunden! torlauncher.bootstrapWarning.done=abgeschlossen

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 08 Jun '16

08 Jun '16

commit 564481064df2eec532a0cc854d4fbaca37ca5371 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 8 15:45:51 2016 +0000 Update translations for tor-launcher-properties --- de/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de/torlauncher.properties b/de/torlauncher.properties index bbf1be6..8406776 100644 --- a/de/torlauncher.properties +++ b/de/torlauncher.properties @@ -49,7 +49,7 @@ torlauncher.bootstrapStatus.loading_keys=Autorisierungszertifikate werden gelade torlauncher.bootstrapStatus.requesting_descriptors=Relaisinformationen werden angefordert torlauncher.bootstrapStatus.loading_descriptors=Relaisinformationen werden geladen torlauncher.bootstrapStatus.conn_or=Zum Tor-Netzwerk wird verbunden -torlauncher.bootstrapStatus.handshake_or=Tor-Verbindung wird hergestellt +torlauncher.bootstrapStatus.handshake_or=Tor-Kanal wird hergestellt torlauncher.bootstrapStatus.done=Zum Tor-Netzwerk wurde verbunden! torlauncher.bootstrapWarning.done=abgeschlossen

1 0

[translation/mat-gui_completed] Update translations for mat-gui_completed
by translation＠torproject.org 08 Jun '16

08 Jun '16

commit a9e4041fc96d4e3fb14b758e6e0e9b10d6e362ad Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 8 15:45:46 2016 +0000 Update translations for mat-gui_completed --- de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de.po b/de.po index 3754ca2..8444580 100644 --- a/de.po +++ b/de.po @@ -18,7 +18,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-10 23:06+0100\n" -"PO-Revision-Date: 2016-03-21 16:34+0000\n" +"PO-Revision-Date: 2016-06-08 15:33+0000\n" "Last-Translator: Thilo N\n" "Language-Team: German (http://www.transifex.com/otf/torproject/language/de/)\n" "MIME-Version: 1.0\n"

1 0