- tor-commits - lists.torproject.org

[nyx/master] Correct copyright years
by atagar＠torproject.org 06 Apr '16

06 Apr '16

commit 190d48f5ed7b37fcff884d1f0f1e272305339951 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Apr 5 10:39:44 2016 -0700 Correct copyright years Turns out 'git log --follow <path>' gives us an easy method for getting when files were created, following renames. In a few cases took a little extra digging. --- nyx/__init__.py | 2 +- nyx/arguments.py | 2 +- nyx/controller.py | 2 +- nyx/curses.py | 2 +- nyx/demo_glyphs.py | 2 +- nyx/log.py | 2 +- nyx/menu.py | 2 +- nyx/panel/__init__.py | 2 +- nyx/panel/config.py | 2 +- nyx/panel/connection.py | 2 +- nyx/panel/graph.py | 2 +- nyx/panel/header.py | 2 +- nyx/panel/log.py | 2 +- nyx/panel/torrc.py | 2 +- nyx/popups.py | 2 +- nyx/starter.py | 2 +- nyx/tracker.py | 2 +- nyx/uninstall | 2 +- run_nyx | 2 +- run_tests.py | 2 +- setup.py | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/nyx/__init__.py b/nyx/__init__.py index fbd765b..f2c62f4 100644 --- a/nyx/__init__.py +++ b/nyx/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2016, Damian Johnson and The Tor Project +# Copyright 2010-2016, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/nyx/arguments.py b/nyx/arguments.py index a01ebb9..e70278b 100644 --- a/nyx/arguments.py +++ b/nyx/arguments.py @@ -1,4 +1,4 @@ -# Copyright 2016, Damian Johnson and The Tor Project +# Copyright 2013-2016, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/nyx/controller.py b/nyx/controller.py index c4ccc15..3336837 100644 --- a/nyx/controller.py +++ b/nyx/controller.py @@ -1,4 +1,4 @@ -# Copyright 2016, Damian Johnson and The Tor Project +# Copyright 2009-2016, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/nyx/curses.py b/nyx/curses.py index 95d9dda..ebe5eef 100644 --- a/nyx/curses.py +++ b/nyx/curses.py @@ -1,4 +1,4 @@ -# Copyright 2016, Damian Johnson and The Tor Project +# Copyright 2010-2016, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/nyx/demo_glyphs.py b/nyx/demo_glyphs.py index 7ca68ee..2978873 100755 --- a/nyx/demo_glyphs.py +++ b/nyx/demo_glyphs.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright 2016, Damian Johnson and The Tor Project +# Copyright 2014-2016, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/nyx/log.py b/nyx/log.py index f461937..ec09c3f 100644 --- a/nyx/log.py +++ b/nyx/log.py @@ -1,4 +1,4 @@ -# Copyright 2016, Damian Johnson and The Tor Project +# Copyright 2014-2016, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/nyx/menu.py b/nyx/menu.py index 1b6b6bf..697dfac 100644 --- a/nyx/menu.py +++ b/nyx/menu.py @@ -1,4 +1,4 @@ -# Copyright 2016, Damian Johnson and The Tor Project +# Copyright 2011-2016, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/nyx/panel/__init__.py b/nyx/panel/__init__.py index 0ae3fdb..9b616e5 100644 --- a/nyx/panel/__init__.py +++ b/nyx/panel/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2016, Damian Johnson and The Tor Project +# Copyright 2010-2016, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/nyx/panel/config.py b/nyx/panel/config.py index 1b991b6..bb432b2 100644 --- a/nyx/panel/config.py +++ b/nyx/panel/config.py @@ -1,4 +1,4 @@ -# Copyright 2016, Damian Johnson and The Tor Project +# Copyright 2010-2016, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/nyx/panel/connection.py b/nyx/panel/connection.py index 709cf52..e7e80f5 100644 --- a/nyx/panel/connection.py +++ b/nyx/panel/connection.py @@ -1,4 +1,4 @@ -# Copyright 2016, Damian Johnson and The Tor Project +# Copyright 2011-2016, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/nyx/panel/graph.py b/nyx/panel/graph.py index 7c53675..401c079 100644 --- a/nyx/panel/graph.py +++ b/nyx/panel/graph.py @@ -1,4 +1,4 @@ -# Copyright 2016, Damian Johnson and The Tor Project +# Copyright 2010-2016, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/nyx/panel/header.py b/nyx/panel/header.py index 7e83501..c6627c2 100644 --- a/nyx/panel/header.py +++ b/nyx/panel/header.py @@ -1,4 +1,4 @@ -# Copyright 2016, Damian Johnson and The Tor Project +# Copyright 2009-2016, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/nyx/panel/log.py b/nyx/panel/log.py index dc26dc3..a18b2ce 100644 --- a/nyx/panel/log.py +++ b/nyx/panel/log.py @@ -1,4 +1,4 @@ -# Copyright 2016, Damian Johnson and The Tor Project +# Copyright 2009-2016, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/nyx/panel/torrc.py b/nyx/panel/torrc.py index 23c86d3..2943807 100644 --- a/nyx/panel/torrc.py +++ b/nyx/panel/torrc.py @@ -1,4 +1,4 @@ -# Copyright 2016, Damian Johnson and The Tor Project +# Copyright 2010-2016, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/nyx/popups.py b/nyx/popups.py index 70d996a..01a5215 100644 --- a/nyx/popups.py +++ b/nyx/popups.py @@ -1,4 +1,4 @@ -# Copyright 2016, Damian Johnson and The Tor Project +# Copyright 2011-2016, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/nyx/starter.py b/nyx/starter.py index b13190f..2ddfff0 100644 --- a/nyx/starter.py +++ b/nyx/starter.py @@ -1,4 +1,4 @@ -# Copyright 2016, Damian Johnson and The Tor Project +# Copyright 2009-2016, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/nyx/tracker.py b/nyx/tracker.py index a5a4f00..6376584 100644 --- a/nyx/tracker.py +++ b/nyx/tracker.py @@ -1,4 +1,4 @@ -# Copyright 2016, Damian Johnson and The Tor Project +# Copyright 2013-2016, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/nyx/uninstall b/nyx/uninstall index 5f72d4d..c65344c 100755 --- a/nyx/uninstall +++ b/nyx/uninstall @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright 2016, Damian Johnson and The Tor Project +# Copyright 2010-2016, Damian Johnson and The Tor Project # See LICENSE for licensing information files="/usr/bin/nyx /usr/share/man/man1/nyx.1.gz /usr/share/nyx" diff --git a/run_nyx b/run_nyx index b6c7b94..29c6be5 100755 --- a/run_nyx +++ b/run_nyx @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright 2016, Damian Johnson and The Tor Project +# Copyright 2009-2016, Damian Johnson and The Tor Project # See LICENSE for licensing information import nyx diff --git a/run_tests.py b/run_tests.py index 1c52132..101b77e 100755 --- a/run_tests.py +++ b/run_tests.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright 2016, Damian Johnson and The Tor Project +# Copyright 2013-2016, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/setup.py b/setup.py index d83c8aa..bfcdefa 100644 --- a/setup.py +++ b/setup.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright 2015, Damian Johnson and The Tor Project +# Copyright 2010-2016, Damian Johnson and The Tor Project # See LICENSE for licensing information import gzip

1 0

[nyx/master] Mock static screen size in tests
by atagar＠torproject.org 06 Apr '16

06 Apr '16

commit 12be6c891d8ff84246152bb940f7a99d94080508 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Apr 5 10:45:38 2016 -0700 Mock static screen size in tests Our unit tests fail on smaller minitors (like my netbook) since the popup dimensions are smaller than expected. Mocking a static size to make these more reliable. --- test/popups.py | 68 ++++++++++++++++++++++++++++++++++------------------------ 1 file changed, 40 insertions(+), 28 deletions(-) diff --git a/test/popups.py b/test/popups.py index 34ff587..0394003 100644 --- a/test/popups.py +++ b/test/popups.py @@ -163,38 +163,40 @@ Consensus Descriptor:----------+ """.strip() EXPECTED_DESCRIPTOR = """ -Consensus Descriptor (29787760145CD1A473552A2FC64C72A9A130820E):---------------------------------------------------+ -| 1 Consensus: | -| 2 | -| 3 r cyberphunk KXh3YBRc0aRzVSovxkxyqaEwgg4 VjdJThHuYj0jDY2tkkDJkCa8s1s 2016-04-04 19:03:16 94.23.150.191 8080 0 | -| 4 s Fast Guard Running Stable Valid | -| 5 w Bandwidth=8410 | -| 6 p reject 1-65535 | -| 7 | -| 8 Server Descriptor: | -| 9 | -| 10 router cyberphunk 94.23.150.191 8080 0 0 | -| 11 platform Tor 0.2.4.27 on Linux | -| 12 protocols Link 1 2 Circuit 1 | -| 13 published 2016-04-04 19:03:16 | -| 14 fingerprint 2978 7760 145C D1A4 7355 2A2F C64C 72A9 A130 820E | -| 15 uptime 3899791 | -| 16 bandwidth 10240000 10444800 6482376 | -| 17 extra-info-digest 9DC532664DDFD238A4119D623D30F136A3B851BF | -| 18 reject *:* | -| 19 router-signature | -| 20 -----BEGIN SIGNATURE----- | -| 21 EUFm38gONCoDuY7ZWHyJtBKuvk6Xi1MPuKuecS5frP3fX0wiZSrOVcpX0X8J+4Hr | -| 22 Fb5i+yuMIAXeEn6UhtjqhhZBbY9PW9GdZOMTH8hJpG+evURyr+10PZq6UElg86rA | -| 23 NCGI042p6+7UgCVT1x3WcLnq3ScV//s1wXHrUXa7vi0= | -| 24 -----END SIGNATURE----- | -+------------------------------------------------------------------------------------------------------------------+ +Consensus Descriptor (29787760145CD1A473552A2FC64C72A9A130820E):---------------+ +| 1 Consensus: | +| 2 | +| 3 r cyberphunk KXh3YBRc0aRzVSovxkxyqaEwgg4 VjdJThHuYj0jDY2tkkDJkCa8s1s | +| 2016-04-04 19:03:16 94.23.150.191 8080 0 | +| 4 s Fast Guard Running Stable Valid | +| 5 w Bandwidth=8410 | +| 6 p reject 1-65535 | +| 7 | +| 8 Server Descriptor: | +| 9 | +| 10 router cyberphunk 94.23.150.191 8080 0 0 | +| 11 platform Tor 0.2.4.27 on Linux | +| 12 protocols Link 1 2 Circuit 1 | +| 13 published 2016-04-04 19:03:16 | +| 14 fingerprint 2978 7760 145C D1A4 7355 2A2F C64C 72A9 A130 820E | +| 15 uptime 3899791 | +| 16 bandwidth 10240000 10444800 6482376 | +| 17 extra-info-digest 9DC532664DDFD238A4119D623D30F136A3B851BF | +| 18 reject *:* | +| 19 router-signature | +| 20 -----BEGIN SIGNATURE----- | +| 21 EUFm38gONCoDuY7ZWHyJtBKuvk6Xi1MPuKuecS5frP3fX0wiZSrOVcpX0X8J+4Hr | +| 22 Fb5i+yuMIAXeEn6UhtjqhhZBbY9PW9GdZOMTH8hJpG+evURyr+10PZq6UElg86rA | +| 23 NCGI042p6+7UgCVT1x3WcLnq3ScV//s1wXHrUXa7vi0= | +| 24 -----END SIGNATURE----- | ++------------------------------------------------------------------------------+ """.strip() class TestPopups(unittest.TestCase): - @patch('nyx.controller.get_controller') @patch('nyx.popups._top', Mock(return_value = 0)) + @patch('nyx.curses.screen_size', Mock(return_value = nyx.curses.Dimensions(80, 60))) + @patch('nyx.controller.get_controller') def test_help(self, get_controller_mock): header_panel = Mock() @@ -229,16 +231,19 @@ class TestPopups(unittest.TestCase): self.assertEqual(EXPECTED_HELP_POPUP, rendered.content) @patch('nyx.popups._top', Mock(return_value = 0)) + @patch('nyx.curses.screen_size', Mock(return_value = nyx.curses.Dimensions(80, 60))) def test_about(self): rendered = test.render(nyx.popups.show_about) self.assertEqual(EXPECTED_ABOUT_POPUP, rendered.content) @patch('nyx.popups._top', Mock(return_value = 0)) + @patch('nyx.curses.screen_size', Mock(return_value = nyx.curses.Dimensions(80, 60))) def test_counts_when_empty(self): rendered = test.render(nyx.popups.show_counts, 'Client Locales', {}) self.assertEqual(EXPECTED_EMPTY_COUNTS, rendered.content) @patch('nyx.popups._top', Mock(return_value = 0)) + @patch('nyx.curses.screen_size', Mock(return_value = nyx.curses.Dimensions(80, 60))) def test_counts(self): clients = { 'fr': 5, @@ -252,6 +257,7 @@ class TestPopups(unittest.TestCase): self.assertEqual(EXPECTED_COUNTS, rendered.content) @patch('nyx.popups._top', Mock(return_value = 0)) + @patch('nyx.curses.screen_size', Mock(return_value = nyx.curses.Dimensions(80, 60))) def test_select_from_list(self): options = ['each second', '5 seconds', '30 seconds', 'minutely', '15 minute', '30 minute', 'hourly', 'daily'] rendered = test.render(nyx.popups.select_from_list, 'Update Interval:', options, 'each second') @@ -259,6 +265,7 @@ class TestPopups(unittest.TestCase): self.assertEqual('each second', rendered.return_value) @patch('nyx.popups._top', Mock(return_value = 0)) + @patch('nyx.curses.screen_size', Mock(return_value = nyx.curses.Dimensions(80, 60))) def test_select_sort_order(self): previous_order = ['Man Page Entry', 'Name', 'Is Set'] options = ['Name', 'Value', 'Value Type', 'Category', 'Usage', 'Summary', 'Description', 'Man Page Entry', 'Is Set'] @@ -268,6 +275,7 @@ class TestPopups(unittest.TestCase): self.assertEqual(None, rendered.return_value) @patch('nyx.popups._top', Mock(return_value = 0)) + @patch('nyx.curses.screen_size', Mock(return_value = nyx.curses.Dimensions(80, 60))) def test_select_sort_order_usage(self): # Use the dialog to make a selection. At the end we render two options as # being selected (rather than three) because the act of selecing the third @@ -292,6 +300,7 @@ class TestPopups(unittest.TestCase): self.assertEqual(['Name', 'Summary', 'Description'], rendered.return_value) @patch('nyx.popups._top', Mock(return_value = 0)) + @patch('nyx.curses.screen_size', Mock(return_value = nyx.curses.Dimensions(80, 60))) @patch('nyx.controller.input_prompt', Mock(return_value = None)) def test_select_event_types_when_canceled(self): rendered = test.render(nyx.popups.select_event_types) @@ -299,14 +308,15 @@ class TestPopups(unittest.TestCase): self.assertEqual(None, rendered.return_value) @patch('nyx.popups._top', Mock(return_value = 0)) + @patch('nyx.curses.screen_size', Mock(return_value = nyx.curses.Dimensions(80, 60))) @patch('nyx.controller.input_prompt', Mock(return_value = '2bwe')) def test_select_event_types_with_input(self): rendered = test.render(nyx.popups.select_event_types) self.assertEqual(EXPECTED_EVENT_SELECTOR, rendered.content) self.assertEqual(set(['NYX_INFO', 'ERR', 'WARN', 'BW', 'NYX_ERR', 'NYX_WARN', 'NYX_NOTICE']), rendered.return_value) - @patch('nyx.curses.screen_size', Mock(return_value = nyx.curses.Dimensions(80, 60))) @patch('nyx.popups._top', Mock(return_value = 0)) + @patch('nyx.curses.screen_size', Mock(return_value = nyx.curses.Dimensions(80, 60))) def test_confirm_save_torrc(self): rendered = test.render(nyx.popups.confirm_save_torrc, TORRC) self.assertEqual(EXPECTED_SAVE_TORRC_CONFIRMATION, rendered.content) @@ -321,12 +331,14 @@ class TestPopups(unittest.TestCase): self.assertEqual(True, rendered.return_value) @patch('nyx.popups._top', Mock(return_value = 0)) + @patch('nyx.curses.screen_size', Mock(return_value = nyx.curses.Dimensions(80, 60))) def test_descriptor_without_fingerprint(self): rendered = test.render(nyx.popups.show_descriptor, None, nyx.curses.Color.RED, lambda key: key.match('esc')) self.assertEqual(EXPECTED_DESCRIPTOR_WITHOUT_FINGERPRINT, rendered.content) self.assertEqual(nyx.curses.KeyInput(27), rendered.return_value) @patch('nyx.popups._top', Mock(return_value = 0)) + @patch('nyx.curses.screen_size', Mock(return_value = nyx.curses.Dimensions(80, 60))) @patch('nyx.popups._descriptor_text', Mock(return_value = DESCRIPTOR_TEXT)) def test_descriptor(self): rendered = test.render(nyx.popups.show_descriptor, '29787760145CD1A473552A2FC64C72A9A130820E', nyx.curses.Color.RED, lambda key: key.match('esc'))

1 0

[translation/whisperback_completed] Update translations for whisperback_completed
by translation＠torproject.org 06 Apr '16

06 Apr '16

commit 4026745f323793f3b658bb5fdbb0a13e841a2f48 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 6 14:45:15 2016 +0000 Update translations for whisperback_completed --- zh_HK/zh_HK.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/zh_HK/zh_HK.po b/zh_HK/zh_HK.po index aae98ce..5ccdeab 100644 --- a/zh_HK/zh_HK.po +++ b/zh_HK/zh_HK.po @@ -5,13 +5,14 @@ # Translators: # kythk <a5177958(a)drdrb.net>, 2014 # Christian Chung <alphachungys(a)gmail.com>, 2016 +# Kin Kwok, 2016 # kythk <a5177958(a)drdrb.net>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-12-16 19:54+0100\n" -"PO-Revision-Date: 2016-04-05 10:04+0000\n" +"PO-Revision-Date: 2016-04-06 14:41+0000\n" "Last-Translator: Kin Kwok\n" "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/otf/torproject/language/zh_HK/)\n" "MIME-Version: 1.0\n" @@ -29,7 +30,7 @@ msgstr "無效的電郵地址：%s" #: ../whisperBack/whisperback.py:73 #, python-format msgid "Invalid contact OpenPGP key: %s" -msgstr "無效的連略OpenPGP鎖匙：%s" +msgstr "無效的連絡OpenPGP鎖匙：%s" #: ../whisperBack/whisperback.py:75 msgid "Invalid contact OpenPGP public key block" @@ -156,7 +157,7 @@ msgid "" "\n" "You should have received a copy of the GNU General Public License\n" "along with this program. If not, see <http://www.gnu.org/licenses/>.\n" -msgstr "WhisperBack - 使用加密電郵來傳送意見反映。\nCopyright (C) 2009-2012 Tails 開發人員<tails(a)boum.org>\n\n此程式為自由軟件，你可以隨意轉發和／或修改。\n使用免費軟體基金會所發佈的GNU通用公共授權條款授權，\n授權版本3 或(由你選擇)任何較新的版本。\n\n轉發此程式時希望它有用，\n但沒有任何擔保責任；沒有適合某特定用途之默示責任擔保。\n請參閱GNU通用公共許可證瞭解更多詳細資料。\n\n隨此軟件應該收到GNU通用公共授權副本。\n如果沒有，請參閱 <http://www.gnu.org/licenses/>。\n" +msgstr "WhisperBack - 使用加密電郵來傳送意見反映。\nCopyright (C) 2009-2012 Tails 開發人員<tails(a)boum.org>\n\n此程式為自由軟件，你可以隨意轉發和╱或修改。\n使用免費軟體基金會所發佈的GNU通用公共授權條款授權，\n授權版本3或(由你選擇)任何較新的版本。\n\n轉發此程式時希望它有用，\n但沒有任何擔保責任；沒有適合某特定用途的默示責任擔保。\n請參閱GNU通用公共授權了解更多詳細資料。\n\n隨此軟件應該收到GNU通用公共授權副本。\n如果沒有，請參閱 <http://www.gnu.org/licenses/>。\n" #: ../data/whisperback.ui.h:20 msgid ""

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 06 Apr '16

06 Apr '16

commit 5f8f3818f864bc579ba5679f0ba632d1cb063310 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 6 14:45:12 2016 +0000 Update translations for whisperback --- zh_HK/zh_HK.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/zh_HK/zh_HK.po b/zh_HK/zh_HK.po index aae98ce..5ccdeab 100644 --- a/zh_HK/zh_HK.po +++ b/zh_HK/zh_HK.po @@ -5,13 +5,14 @@ # Translators: # kythk <a5177958(a)drdrb.net>, 2014 # Christian Chung <alphachungys(a)gmail.com>, 2016 +# Kin Kwok, 2016 # kythk <a5177958(a)drdrb.net>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-12-16 19:54+0100\n" -"PO-Revision-Date: 2016-04-05 10:04+0000\n" +"PO-Revision-Date: 2016-04-06 14:41+0000\n" "Last-Translator: Kin Kwok\n" "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/otf/torproject/language/zh_HK/)\n" "MIME-Version: 1.0\n" @@ -29,7 +30,7 @@ msgstr "無效的電郵地址：%s" #: ../whisperBack/whisperback.py:73 #, python-format msgid "Invalid contact OpenPGP key: %s" -msgstr "無效的連略OpenPGP鎖匙：%s" +msgstr "無效的連絡OpenPGP鎖匙：%s" #: ../whisperBack/whisperback.py:75 msgid "Invalid contact OpenPGP public key block" @@ -156,7 +157,7 @@ msgid "" "\n" "You should have received a copy of the GNU General Public License\n" "along with this program. If not, see <http://www.gnu.org/licenses/>.\n" -msgstr "WhisperBack - 使用加密電郵來傳送意見反映。\nCopyright (C) 2009-2012 Tails 開發人員<tails(a)boum.org>\n\n此程式為自由軟件，你可以隨意轉發和／或修改。\n使用免費軟體基金會所發佈的GNU通用公共授權條款授權，\n授權版本3 或(由你選擇)任何較新的版本。\n\n轉發此程式時希望它有用，\n但沒有任何擔保責任；沒有適合某特定用途之默示責任擔保。\n請參閱GNU通用公共許可證瞭解更多詳細資料。\n\n隨此軟件應該收到GNU通用公共授權副本。\n如果沒有，請參閱 <http://www.gnu.org/licenses/>。\n" +msgstr "WhisperBack - 使用加密電郵來傳送意見反映。\nCopyright (C) 2009-2012 Tails 開發人員<tails(a)boum.org>\n\n此程式為自由軟件，你可以隨意轉發和╱或修改。\n使用免費軟體基金會所發佈的GNU通用公共授權條款授權，\n授權版本3或(由你選擇)任何較新的版本。\n\n轉發此程式時希望它有用，\n但沒有任何擔保責任；沒有適合某特定用途的默示責任擔保。\n請參閱GNU通用公共授權了解更多詳細資料。\n\n隨此軟件應該收到GNU通用公共授權副本。\n如果沒有，請參閱 <http://www.gnu.org/licenses/>。\n" #: ../data/whisperback.ui.h:20 msgid ""

1 0

[depictor/master] Sort flags in the big relay table #18712
by tom＠torproject.org 06 Apr '16

06 Apr '16

commit bbc61f0a16692bc66cfc0da6aa15239609a0fa39 Author: Tom Ritter <tom(a)ritter.vg> Date: Wed Apr 6 08:58:29 2016 -0500 Sort flags in the big relay table #18712 --- website.py | 1 + 1 file changed, 1 insertion(+) diff --git a/website.py b/website.py index 668f6eb..84d7d98 100755 --- a/website.py +++ b/website.py @@ -906,6 +906,7 @@ class WebsiteWriter: consensusFlags = self.consensus.routers[relay_fp].flags relevantFlags.update(consensusFlags) + relevantFlags = sorted(list(relevantFlags)) for dirauth_nickname in self.votes: vote = self.votes[dirauth_nickname] if relay_fp in vote.routers:

1 0

[tor-commits] [translation/tor-messenger-conversationsproperties_completed] Update translations for tor-messenger-conversationsproperties_completed
by translation＠torproject.org 06 Apr '16

06 Apr '16

commit 92836ede68095d6db4804b20274caa2ead2644ac Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 6 13:16:26 2016 +0000 Update translations for tor-messenger-conversationsproperties_completed --- zh_HK/conversations.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_HK/conversations.properties b/zh_HK/conversations.properties index 460b698..d19d36d 100644 --- a/zh_HK/conversations.properties +++ b/zh_HK/conversations.properties @@ -26,7 +26,7 @@ statusChangedFromUnknownWithStatusText=%1$S就是%2$S: %3$S。 # special case of the previous 2 strings for when an account has just # been reconnected, so the status is now known. These 2 strings should not # mislead the user into thinking the person's status has just changed. -statusKnown=你的帳戶已重新連接((%1$S就是%2$S)。 +statusKnown=你的帳戶已重新連接(%1$S就是%2$S)。 statusKnownWithStatusText=你的帳戶已重新連接(%1$S就是%2$S: %3$S)。 # LOCALIZATION NOTE (statusUnknown): # %S is the display name of the contact. @@ -51,7 +51,7 @@ topicSet=%1$S的討論主題是：%2$S topicNotSet=%S沒有主題。 # LOCALIZATION NOTE (topicChanged): # %1$S is the user who changed the topic, %2$S is the new topic. -topicChanged=%1$S以將主題更改為：%2$S +topicChanged=%1$S已將主題更改為：%2$S # LOCALIZATION NOTE (topicCleared): # %1$S is the user who cleared the topic. topicCleared=%1$S已經清除主題。

1 0

[translation/tor-messenger-conversationsproperties] Update translations for tor-messenger-conversationsproperties
by translation＠torproject.org 06 Apr '16

06 Apr '16

commit 94d764e4507babbb15f1bd7fe6d0a9ce2d3b2362 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 6 13:16:22 2016 +0000 Update translations for tor-messenger-conversationsproperties --- zh_HK/conversations.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_HK/conversations.properties b/zh_HK/conversations.properties index 460b698..d19d36d 100644 --- a/zh_HK/conversations.properties +++ b/zh_HK/conversations.properties @@ -26,7 +26,7 @@ statusChangedFromUnknownWithStatusText=%1$S就是%2$S: %3$S。 # special case of the previous 2 strings for when an account has just # been reconnected, so the status is now known. These 2 strings should not # mislead the user into thinking the person's status has just changed. -statusKnown=你的帳戶已重新連接((%1$S就是%2$S)。 +statusKnown=你的帳戶已重新連接(%1$S就是%2$S)。 statusKnownWithStatusText=你的帳戶已重新連接(%1$S就是%2$S: %3$S)。 # LOCALIZATION NOTE (statusUnknown): # %S is the display name of the contact. @@ -51,7 +51,7 @@ topicSet=%1$S的討論主題是：%2$S topicNotSet=%S沒有主題。 # LOCALIZATION NOTE (topicChanged): # %1$S is the user who changed the topic, %2$S is the new topic. -topicChanged=%1$S以將主題更改為：%2$S +topicChanged=%1$S已將主題更改為：%2$S # LOCALIZATION NOTE (topicCleared): # %1$S is the user who cleared the topic. topicCleared=%1$S已經清除主題。

1 0

[translation/tor-messenger-authdtd_completed] Update translations for tor-messenger-authdtd_completed
by translation＠torproject.org 06 Apr '16

06 Apr '16

commit caede796b2dfee9abfc07e6033c4ada78156b4dd Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 6 12:46:15 2016 +0000 Update translations for tor-messenger-authdtd_completed --- zh_HK/auth.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_HK/auth.dtd b/zh_HK/auth.dtd index 750006e..381db02 100644 --- a/zh_HK/auth.dtd +++ b/zh_HK/auth.dtd @@ -13,8 +13,8 @@ <!ENTITY authDialog.manualInstruction "驗證數碼指紋，可於物質世界聯絡對方，例如經電話連線交換數碼指紋資料。若數碼指紋吻合，請於下方話匣選取「已經驗證」。"> <!ENTITY authDialog.choose "選取"> <!ENTITY authDialog.how "如何驗證連絡人的身份？"> -<!ENTITY authDialog.qaInstruction "驗證他們身份，請選一個只有你和對方知道答案的問題，輸入該問題或其答案二擇其一，並等候對方輸入相應的回覆，若對方回復的答案或問題不吻合，則表示對方是假冒。"> -<!ENTITY authDialog.secretInstruction "驗證他們身份，請選一個只有你和對方知道的秘密，輸入此祕密並等待對方也輸入該秘密，若雙方的秘密不吻合，則表示對方是假冒。"> +<!ENTITY authDialog.qaInstruction "驗證他們身份，請選一個只有你和對方知道答案的問題，輸入該問題或其答案二擇其一，並等候對方輸入相應的回覆，若對方回覆的答案或問題不吻合，則表示對方是假冒。"> +<!ENTITY authDialog.secretInstruction "驗證他們身份，請選一個只有你和對方知道的秘密，輸入此祕密並等候對方也輸入該秘密，若雙方的秘密不吻合，則表示對方是假冒。"> <!ENTITY authDialog.question "請輸入問題："> <!ENTITY authDialog.answer "請在此輸入答案(大小楷寫視為不同)："> <!ENTITY authDialog.secret "請輸入秘密：">

1 0

[translation/tor-messenger-authdtd] Update translations for tor-messenger-authdtd
by translation＠torproject.org 06 Apr '16

06 Apr '16

commit 6b455922f568816c97b7c31223da90899d333f5d Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 6 12:46:12 2016 +0000 Update translations for tor-messenger-authdtd --- zh_HK/auth.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_HK/auth.dtd b/zh_HK/auth.dtd index 750006e..381db02 100644 --- a/zh_HK/auth.dtd +++ b/zh_HK/auth.dtd @@ -13,8 +13,8 @@ <!ENTITY authDialog.manualInstruction "驗證數碼指紋，可於物質世界聯絡對方，例如經電話連線交換數碼指紋資料。若數碼指紋吻合，請於下方話匣選取「已經驗證」。"> <!ENTITY authDialog.choose "選取"> <!ENTITY authDialog.how "如何驗證連絡人的身份？"> -<!ENTITY authDialog.qaInstruction "驗證他們身份，請選一個只有你和對方知道答案的問題，輸入該問題或其答案二擇其一，並等候對方輸入相應的回覆，若對方回復的答案或問題不吻合，則表示對方是假冒。"> -<!ENTITY authDialog.secretInstruction "驗證他們身份，請選一個只有你和對方知道的秘密，輸入此祕密並等待對方也輸入該秘密，若雙方的秘密不吻合，則表示對方是假冒。"> +<!ENTITY authDialog.qaInstruction "驗證他們身份，請選一個只有你和對方知道答案的問題，輸入該問題或其答案二擇其一，並等候對方輸入相應的回覆，若對方回覆的答案或問題不吻合，則表示對方是假冒。"> +<!ENTITY authDialog.secretInstruction "驗證他們身份，請選一個只有你和對方知道的秘密，輸入此祕密並等候對方也輸入該秘密，若雙方的秘密不吻合，則表示對方是假冒。"> <!ENTITY authDialog.question "請輸入問題："> <!ENTITY authDialog.answer "請在此輸入答案(大小楷寫視為不同)："> <!ENTITY authDialog.secret "請輸入秘密：">

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 06 Apr '16

06 Apr '16

commit 49948ce76672bbbad006f97006555a94da33b8e0 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 6 12:15:54 2016 +0000 Update translations for torbutton-torbuttonproperties --- zh_HK/torbutton.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_HK/torbutton.properties b/zh_HK/torbutton.properties index 39465d9..4efb6dc 100644 --- a/zh_HK/torbutton.properties +++ b/zh_HK/torbutton.properties @@ -44,7 +44,7 @@ torbutton.popup.redirect = 重新導向 torbutton.popup.no_redirect = 不要重新導向 torbutton.popup.prompted_language = 為了更佳私隱，Torbutton可要求網站顯示英語版本。這可導致原以你慣用語言來顯示的網頁，改成英語顯示。\n\n顯示英語網頁來取得更佳私隱嗎？ torbutton.popup.no_newnym = Torbutton不能安全地予你一個新身份。它無法存取Tor洋蔥路由的控制連接埠。\n\n正在執行的是Tor洋蔥路由瀏覽器嗎？ -torbutton.popup.use_tbb = 你似乎正以Firefox使用Torbutton，我們並不建議此方法。\n\n相反，我們建議你藉由發送電子郵件到gettor@torproject.org或在下列網址下載取得最新的Tor洋蔥路由瀏覽器套件： +torbutton.popup.use_tbb = 你似乎正以Firefox使用Torbutton，我們並不建議此方法。\n\n相反，我們建議你藉由發送電郵到gettor@torproject.org或在下列網址下載取得最新的Tor洋蔥路由瀏覽器套件： torbutton.popup.pref_error = Torbutton無法更新洋蔥路由瀏覽器設定檔目錄中的喜好設定。 torbutton.popup.permission_denied = 請重新設定Tor洋蔥路由瀏覽器目錄的使用權限，或將其複製到新的位置。 torbutton.popup.device_full = 磁碟空間可能已滿。請釋放空間或將Tor洋蔥路由瀏覽器移至新的裝置。

1 0