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

[nyx/master] Remove old event dialog
by atagar＠torproject.org 07 Jun '16

07 Jun '16

commit a5d0dfe835c6fd0468cdcd839a120b19d849ef72 Merge: 78f67af 8b6970b Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jun 7 10:29:48 2016 -0700 Remove old event dialog Dropping the old event selection dialog in favor of our new, shiny one. This also changes our '--log' argument to accept a comma separated list of events rather than arcane flags. nyx/arguments.py | 145 +---------------------------------------------- nyx/log.py | 22 +++---- nyx/panel/log.py | 18 +----- nyx/popups.py | 38 +------------ nyx/settings/strings.cfg | 27 ++------- nyx/starter.py | 12 ---- test/arguments.py | 78 ++----------------------- test/popups.py | 73 +++++++----------------- 8 files changed, 43 insertions(+), 370 deletions(-)

1 0

[nyx/master] Drop missing_event_types()
by atagar＠torproject.org 07 Jun '16

07 Jun '16

commit 9e9be8296bb5fb70e6c462509e5613f83b713e30 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jun 7 09:40:46 2016 -0700 Drop missing_event_types() Now that we do event selection based on what tor supports rather than a hardcoded list of events we accept there's no longer a set of 'UNKNOWN' events. --- nyx/arguments.py | 21 +-------------------- nyx/log.py | 5 ----- nyx/settings/strings.cfg | 1 - nyx/starter.py | 12 ------------ test/arguments.py | 30 +----------------------------- 5 files changed, 2 insertions(+), 67 deletions(-) diff --git a/nyx/arguments.py b/nyx/arguments.py index 6ed405d..f771e0b 100644 --- a/nyx/arguments.py +++ b/nyx/arguments.py @@ -14,7 +14,7 @@ import nyx.log import stem.util.connection -from nyx import DATA_DIR, tor_controller, msg +from nyx import DATA_DIR, msg DEFAULT_ARGS = { 'control_address': '127.0.0.1', @@ -201,22 +201,3 @@ def validate_events(events): raise ValueError(','.join(invalid_events)) else: return accepted_events - - -def missing_event_types(): - """ - Provides the event types the current tor connection supports but nyx - doesn't. This provides an empty list if no event types are missing or the - GETINFO query fails. - - :returns: **list** of missing event types - """ - - response = tor_controller().get_info('events/names', None) - - if response is None: - return [] # GETINFO query failed - - tor_event_types = response.split(' ') - recognized_types = TOR_EVENT_TYPES.values() - return list(filter(lambda x: x not in recognized_types, tor_event_types)) diff --git a/nyx/log.py b/nyx/log.py index 2a60a9e..3929548 100644 --- a/nyx/log.py +++ b/nyx/log.py @@ -190,11 +190,6 @@ def listen_for_events(listener, events): tor_events = events.intersection(set(nyx.arguments.TOR_EVENT_TYPES.values())) nyx_events = events.intersection(set(NYX_RUNLEVELS)) - # adds events unrecognized by nyx if we're listening to the 'UNKNOWN' type - - if 'UNKNOWN' in events: - tor_events.update(set(nyx.arguments.missing_event_types())) - controller = nyx.tor_controller() controller.remove_event_listener(listener) diff --git a/nyx/settings/strings.cfg b/nyx/settings/strings.cfg index 51dbfde..c19930b 100644 --- a/nyx/settings/strings.cfg +++ b/nyx/settings/strings.cfg @@ -33,7 +33,6 @@ msg.setup.chroot_doesnt_exist The chroot path set in your config ({path}) doesn' msg.setup.set_freebsd_chroot Adjusting paths to account for Tor running in a FreeBSD jail at: {path} msg.setup.tor_is_running_as_root Tor is currently running with root permissions. This isn't a good idea, nor should it be necessary. See the 'User UID' option on Tor's man page for an easy method of reducing its permissions after startup. msg.setup.unable_to_determine_pid Unable to determine Tor's pid. Some information, like its resource usage will be unavailable. -msg.setup.unknown_event_types nyx doesn't recognize the following event types: {event_types} (log 'UNKNOWN' events to see them) msg.setup.color_support_available Terminal color support detected and enabled msg.setup.color_support_unavailable Terminal color support unavailable diff --git a/nyx/starter.py b/nyx/starter.py index 7162e53..b9df29a 100644 --- a/nyx/starter.py +++ b/nyx/starter.py @@ -80,7 +80,6 @@ def main(config): _warn_if_root(controller) _warn_if_unable_to_get_pid(controller) _setup_freebsd_chroot(controller) - _notify_of_unknown_events() _use_english_subcommands() _use_no_esc_delay() _use_unicode() @@ -205,17 +204,6 @@ def _setup_freebsd_chroot(controller, config): config.set('tor.chroot', jail_chroot) -def _notify_of_unknown_events(): - """ - Provides a notice about any event types tor supports but nyx doesn't. - """ - - missing_events = nyx.arguments.missing_event_types() - - if missing_events: - log.info('setup.unknown_event_types', event_types = ', '.join(missing_events)) - - def _use_english_subcommands(): """ Make subcommands we run (ps, netstat, etc) provide us with English results. diff --git a/test/arguments.py b/test/arguments.py index 9d12651..58bf954 100644 --- a/test/arguments.py +++ b/test/arguments.py @@ -1,8 +1,6 @@ import unittest -from mock import Mock, patch - -from nyx.arguments import DEFAULT_ARGS, parse, missing_event_types +from nyx.arguments import DEFAULT_ARGS, parse class TestArgumentParsing(unittest.TestCase): @@ -63,29 +61,3 @@ class TestArgumentParsing(unittest.TestCase): for invalid_input in invalid_inputs: self.assertRaises(ValueError, parse, ['--interface', invalid_input]) - - -class TestMissingEventTypes(unittest.TestCase): - @patch('nyx.arguments.tor_controller') - def test_with_a_failed_query(self, controller_mock): - controller = Mock() - controller.get_info.return_value = None - controller_mock.return_value = controller - - self.assertEqual([], missing_event_types()) - - @patch('nyx.arguments.tor_controller') - def test_without_unrecognized_events(self, controller_mock): - controller = Mock() - controller.get_info.return_value = 'DEBUG INFO NOTICE WARN ERR' - controller_mock.return_value = controller - - self.assertEqual([], missing_event_types()) - - @patch('nyx.arguments.tor_controller') - def test_with_unrecognized_events(self, controller_mock): - controller = Mock() - controller.get_info.return_value = 'EVENT1 DEBUG INFO NOTICE WARN EVENT2 ERR EVENT3' - controller_mock.return_value = controller - - self.assertEqual(['EVENT1', 'EVENT2', 'EVENT3'], missing_event_types())

1 0

[nyx/master] Updated --log commandline argument and startup.events
by atagar＠torproject.org 07 Jun '16

07 Jun '16

commit 14ddf7331ad0bf5b7c766090b869055448accaba Author: Sambuddha Basu <sambuddhabasu1(a)gmail.com> Date: Sun Jun 5 20:35:47 2016 -0700 Updated --log commandline argument and startup.events --- nyx/arguments.py | 26 ++++++++++++++++++++++++-- nyx/panel/log.py | 4 ++-- test/arguments.py | 8 ++++---- 3 files changed, 30 insertions(+), 8 deletions(-) diff --git a/nyx/arguments.py b/nyx/arguments.py index ad8ea4a..6627eb1 100644 --- a/nyx/arguments.py +++ b/nyx/arguments.py @@ -24,7 +24,7 @@ DEFAULT_ARGS = { 'user_provided_socket': False, 'config': os.path.join(DATA_DIR, 'nyxrc'), 'debug_path': None, - 'logged_events': 'N3', + 'logged_events': 'NOTICE,NYX_NOTICE', 'print_version': False, 'print_help': False, } @@ -135,7 +135,7 @@ def parse(argv): args['debug_path'] = os.path.expanduser(arg) elif opt in ('-l', '--log'): try: - expand_events(arg) + validate_events(arg) except ValueError as exc: raise ValueError(msg('usage.unrecognized_log_flags', flags = exc)) @@ -183,6 +183,28 @@ def get_version(): ) +def validate_events(events): + """ + Check whether the events are any one of Tor runlevels, Nyx runlevels or + Tor events. + """ + + valid_events = set(TOR_EVENT_TYPES.values() + nyx.log.NYX_RUNLEVELS) + 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: + raise ValueError(','.join(invalid_events)) + else: + return accepted_events + + def expand_events(flags): """ Expands event abbreviations to their full names. Beside mappings provided in diff --git a/nyx/panel/log.py b/nyx/panel/log.py index d7b4ede..9c2eb68 100644 --- a/nyx/panel/log.py +++ b/nyx/panel/log.py @@ -39,7 +39,7 @@ CONFIG = conf.config_dict('nyx', { 'features.log.prepopulate': True, 'features.log.prepopulateReadLimit': 5000, 'features.log.regex': [], - 'startup.events': 'N3', + 'startup.events': 'NOTICE,NYX_NOTICE', }, conf_handler) UPDATE_RATE = 0.3 @@ -68,7 +68,7 @@ class LogPanel(nyx.panel.DaemonPanel): def __init__(self): nyx.panel.DaemonPanel.__init__(self, 'log', UPDATE_RATE) - logged_events = nyx.arguments.expand_events(CONFIG['startup.events']) + logged_events = nyx.arguments.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) diff --git a/test/arguments.py b/test/arguments.py index 76c6d38..a0f678e 100644 --- a/test/arguments.py +++ b/test/arguments.py @@ -28,8 +28,8 @@ class TestArgumentParsing(unittest.TestCase): args = parse(['--debug', '/tmp/dump']) self.assertEqual('/tmp/dump', args.debug_path) - args = parse(['--log', 'D1']) - self.assertEqual('D1', args.logged_events) + args = parse(['--log', 'DEBUG,NYX_DEBUG']) + self.assertEqual('DEBUG,NYX_DEBUG', args.logged_events) args = parse(['--version']) self.assertEqual(True, args.print_version) @@ -41,8 +41,8 @@ class TestArgumentParsing(unittest.TestCase): args = parse(['-i', '1643']) self.assertEqual(1643, args.control_port) - args = parse(['-l', 'we', '-c', '/tmp/cfg']) - self.assertEqual('we', args.logged_events) + args = parse(['-l', 'WARN,ERR', '-c', '/tmp/cfg']) + self.assertEqual('WARN,ERR', args.logged_events) self.assertEqual('/tmp/cfg', args.config) def test_that_we_reject_unrecognized_arguments(self):

1 0

[nyx/master] Updated logged_events and startup.events
by atagar＠torproject.org 07 Jun '16

07 Jun '16

commit 3bfd5aff2773944f064e2595a432f88d3e008f82 Author: Sambuddha Basu <sambuddhabasu1(a)gmail.com> Date: Mon Jun 6 21:48:55 2016 -0700 Updated logged_events and startup.events Updated unrecognized_log_flags message --- nyx/arguments.py | 4 ++-- nyx/panel/log.py | 2 +- nyx/settings/strings.cfg | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nyx/arguments.py b/nyx/arguments.py index 6627eb1..633c55d 100644 --- a/nyx/arguments.py +++ b/nyx/arguments.py @@ -24,7 +24,7 @@ DEFAULT_ARGS = { 'user_provided_socket': False, 'config': os.path.join(DATA_DIR, 'nyxrc'), 'debug_path': None, - 'logged_events': 'NOTICE,NYX_NOTICE', + 'logged_events': 'NOTICE,WARN,ERR,NYX_NOTICE,NYX_WARNING,NYX_ERROR', 'print_version': False, 'print_help': False, } @@ -137,7 +137,7 @@ def parse(argv): try: validate_events(arg) except ValueError as exc: - raise ValueError(msg('usage.unrecognized_log_flags', flags = exc)) + raise ValueError(msg('usage.unrecognized_log_events', events = exc)) args['logged_events'] = arg elif opt in ('-v', '--version'): diff --git a/nyx/panel/log.py b/nyx/panel/log.py index 9c2eb68..6cf11c7 100644 --- a/nyx/panel/log.py +++ b/nyx/panel/log.py @@ -39,7 +39,7 @@ CONFIG = conf.config_dict('nyx', { 'features.log.prepopulate': True, 'features.log.prepopulateReadLimit': 5000, 'features.log.regex': [], - 'startup.events': 'NOTICE,NYX_NOTICE', + 'startup.events': 'NOTICE,WARN,ERR,NYX_NOTICE,NYX_WARNING,NYX_ERROR', }, conf_handler) UPDATE_RATE = 0.3 diff --git a/nyx/settings/strings.cfg b/nyx/settings/strings.cfg index f669e43..e182b96 100644 --- a/nyx/settings/strings.cfg +++ b/nyx/settings/strings.cfg @@ -49,7 +49,7 @@ msg.tracker.unable_to_use_resolver Unable to query connections with {old_resolve msg.usage.invalid_arguments {error} (for usage provide --help) msg.usage.not_a_valid_address '{address_input}' isn't a valid IPv4 address msg.usage.not_a_valid_port '{port_input}' isn't a valid port number -msg.usage.unrecognized_log_flags Unrecognized event flags: {flags} +msg.usage.unrecognized_log_events Unrecognized events: {events} msg.usage.unable_to_set_color_override "{color}" isn't a valid color msg.debug.header

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 07 Jun '16

07 Jun '16

commit 9fc4916f93d40c60710d1ba9ce3e2ea1e9f6f3ef Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 7 17:15:09 2016 +0000 Update translations for bridgedb_completed --- it/LC_MESSAGES/bridgedb.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/it/LC_MESSAGES/bridgedb.po b/it/LC_MESSAGES/bridgedb.po index dd50a84..9ddbd93 100644 --- a/it/LC_MESSAGES/bridgedb.po +++ b/it/LC_MESSAGES/bridgedb.po @@ -10,6 +10,7 @@ # ironbishop <ironbishop(a)fsfe.org>, 2011 # ironbishop <ironbishop(a)fsfe.org>, 2011 # Jacob Appelbaum <jacob(a)appelbaum.net>, 2009 +# Leunam X1 <leunam.x1(a)gmail.com>, 2016 # Luca Marzo <luca(a)jeckodevelopment.it>, 2011 # Matteo Anese <anese.matteo(a)gmail.com>, 2015 # Alessandro Manfredi <a.n0on3(a)gmail.com>, 2011 @@ -22,8 +23,8 @@ 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-07-25 03:40+0000\n" -"PO-Revision-Date: 2016-03-21 16:27+0000\n" -"Last-Translator: Alberto <alberto.pilato(a)gmail.com>\n" +"PO-Revision-Date: 2016-06-07 16:58+0000\n" +"Last-Translator: Leunam X1 <leunam.x1(a)gmail.com>\n" "Language-Team: Italian (http://www.transifex.com/otf/torproject/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -82,7 +83,7 @@ msgstr "Codice QR per le tue bridge lines" #: bridgedb/https/templates/bridges.html:67 #: bridgedb/https/templates/bridges.html:125 msgid "Uh oh, spaghettios!" -msgstr "Uh oh, spaghettios!" +msgstr "Mamma mmia!" #: bridgedb/https/templates/bridges.html:68 msgid "It seems there was an error getting your QRCode."

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 07 Jun '16

07 Jun '16

commit d9145d761d3e2a6bde642d45ba532238cd0c79a7 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 7 17:15:03 2016 +0000 Update translations for bridgedb --- it/LC_MESSAGES/bridgedb.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/it/LC_MESSAGES/bridgedb.po b/it/LC_MESSAGES/bridgedb.po index dd50a84..9ddbd93 100644 --- a/it/LC_MESSAGES/bridgedb.po +++ b/it/LC_MESSAGES/bridgedb.po @@ -10,6 +10,7 @@ # ironbishop <ironbishop(a)fsfe.org>, 2011 # ironbishop <ironbishop(a)fsfe.org>, 2011 # Jacob Appelbaum <jacob(a)appelbaum.net>, 2009 +# Leunam X1 <leunam.x1(a)gmail.com>, 2016 # Luca Marzo <luca(a)jeckodevelopment.it>, 2011 # Matteo Anese <anese.matteo(a)gmail.com>, 2015 # Alessandro Manfredi <a.n0on3(a)gmail.com>, 2011 @@ -22,8 +23,8 @@ 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-07-25 03:40+0000\n" -"PO-Revision-Date: 2016-03-21 16:27+0000\n" -"Last-Translator: Alberto <alberto.pilato(a)gmail.com>\n" +"PO-Revision-Date: 2016-06-07 16:58+0000\n" +"Last-Translator: Leunam X1 <leunam.x1(a)gmail.com>\n" "Language-Team: Italian (http://www.transifex.com/otf/torproject/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -82,7 +83,7 @@ msgstr "Codice QR per le tue bridge lines" #: bridgedb/https/templates/bridges.html:67 #: bridgedb/https/templates/bridges.html:125 msgid "Uh oh, spaghettios!" -msgstr "Uh oh, spaghettios!" +msgstr "Mamma mmia!" #: bridgedb/https/templates/bridges.html:68 msgid "It seems there was an error getting your QRCode."

1 0

[torbirdy/master] Set secure defaults for outgoing servers (#19330)
by sukhbir＠torproject.org 07 Jun '16

07 Jun '16

commit 3fef66ce5e06830ead85d4c955908e0f6dc8c56d Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Tue Jun 7 12:19:27 2016 -0400 Set secure defaults for outgoing servers (#19330) --- components/torbirdy.js | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/components/torbirdy.js b/components/torbirdy.js index fa1aa6b..1c71bf0 100644 --- a/components/torbirdy.js +++ b/components/torbirdy.js @@ -3,6 +3,7 @@ var { interfaces: Ci, utils: Cu, classes: Cc } = Components; Cu.import("resource://gre/modules/XPCOMUtils.jsm"); Cu.import("resource://gre/modules/imXPCOMUtils.jsm"); Cu.import("resource://gre/modules/AddonManager.jsm"); +Cu.import("resource://gre/modules/Preferences.jsm"); var SERVICE_CTRID = "@torproject.org/torbirdy;1"; var SERVICE_ID = Components.ID("{ebd85413-18c8-4265-a708-a8890ec8d1ed}"); @@ -687,6 +688,30 @@ TorBirdy.prototype = { // Set the authentication to normal, connection is already encrypted. account.authMethod = 3; } + + // We need to set safe defaults for the outgoing servers in case there + // are accounts using insecure configurations. One other way way of + // accessing the server list can be through nsIMsgIdentity but multiple + // identities can share the same server so fetching the preference value + // mail.smtpservers seems a better way to do it. + let smtpAccounts = this.prefs.getCharPref("mail.smtpservers").split(","); + let smtpPrefs = [ + ["mail.smtpserver.%smtp%.port", 465], // SMTP over TLS + ["mail.smtpserver.%smtp%.authMethod", 3], // Normal password + ["mail.smtpserver.%smtp%.try_ssl", 3], // SSL/TLS + ]; + for (let i = 0; i < smtpAccounts.length; i++) { + for each (var [pref_template, value] in smtpPrefs) { + let pref = pref_template.replace("%smtp%", smtpAccounts[i]); + if (this.prefs.prefHasUserValue(pref)) { + let currentPref = Preferences.get(pref); + // Save the values so that we can restore them later. + Preferences.set(kRestoreBranch + pref, currentPref); + TorBirdyOldPrefs.push(pref); + Preferences.set(pref, value); + } + } + } } this.prefs.setBoolPref("extensions.torbirdy.first_run", false); },

1 0

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

07 Jun '16

commit f5aa9b8fdc2b4d41d7660134342b7af05d45bb4f Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 7 13:15:58 2016 +0000 Update translations for tails-iuk_completed --- zh_CN.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN.po b/zh_CN.po index deb96fb..953d5e6 100644 --- a/zh_CN.po +++ b/zh_CN.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2016-05-25 16:55+0200\n" -"PO-Revision-Date: 2016-06-07 12:41+0000\n" +"PO-Revision-Date: 2016-06-07 13:11+0000\n" "Last-Translator: Andrews\n" "Language-Team: Chinese (China) (http://www.transifex.com/otf/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n"

1 0

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

07 Jun '16

commit b81725e995f93577a944f98ab1cd48bcc50e3d0d Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 7 13:15:53 2016 +0000 Update translations for tails-iuk --- zh_CN.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN.po b/zh_CN.po index deb96fb..953d5e6 100644 --- a/zh_CN.po +++ b/zh_CN.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2016-05-25 16:55+0200\n" -"PO-Revision-Date: 2016-06-07 12:41+0000\n" +"PO-Revision-Date: 2016-06-07 13:11+0000\n" "Last-Translator: Andrews\n" "Language-Team: Chinese (China) (http://www.transifex.com/otf/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n"

1 0

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

07 Jun '16

commit fb9ea5e042176968964570b380543225f93c5de8 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 7 12:46:01 2016 +0000 Update translations for tails-iuk_completed --- zh_CN.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/zh_CN.po b/zh_CN.po index 9c5de5f..deb96fb 100644 --- a/zh_CN.po +++ b/zh_CN.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Andrews, 2016 # ihints <inactive+ihints(a)transifex.com>, 2014 # kwh(Kim Wan-Ho) <14alpaca(a)gmail.com>, 2013 # khi, 2014 @@ -13,8 +14,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2016-05-25 16:55+0200\n" -"PO-Revision-Date: 2016-05-26 15:02+0000\n" -"Last-Translator: Y.F Yang <yfdyh000(a)gmail.com>\n" +"PO-Revision-Date: 2016-06-07 12:41+0000\n" +"Last-Translator: Andrews\n" "Language-Team: Chinese (China) (http://www.transifex.com/otf/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -40,7 +41,7 @@ msgid "" "Check your network connection, and restart Tails to try upgrading again.\n" "\n" "If the problem persists, go to file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html" -msgstr "<b>无法从我们的网站上检测是否有升级可用</b>\n\n请检查您的网络连接，并且重启Tails然后重新尝试升级\n\n如果依旧有这个问题，请到 file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html" +msgstr "<b>无法从我们的网站上检测是否有升级可用</b>\n\n请检查您的网络连接，并且重启Tails然后重新尝试升级\n\n如果依旧有这个问题，请参阅本地文件 file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html" #: ../lib/Tails/IUK/Frontend.pm:235 msgid "no automatic upgrade is available from our website for this version"

1 0