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

[nyx/master] Integer division for scrollbars
by atagar＠torproject.org 27 Nov '16

27 Nov '16

commit c900957ef05ca900643e55fdc57855bb90b07190 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Nov 15 10:37:24 2016 -0800 Integer division for scrollbars Odd, tests fail on my netbook but pass on my pc. Not quite sure yet what's up but one clear issue is that we use standard rather than integer division. This differs between python 2.x and 3.x (the later results in a float) so normalizing us on ints. --- nyx/curses.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nyx/curses.py b/nyx/curses.py index f25839e..78eb14e 100644 --- a/nyx/curses.py +++ b/nyx/curses.py @@ -34,6 +34,7 @@ if we want Windows support in the future too. |- addstr - draws a string |- addstr_wrap - draws a string with line wrapping |- box - draws box with the given dimensions + |- scrollbar - draws a left-hand scrollbar |- hline - draws a horizontal line +- vline - draws a vertical line @@ -885,8 +886,8 @@ class _Subwindow(object): scrollbar_height = self.height - top - 1 # -1 is for the bottom border bottom_index = top_index + scrollbar_height + 1 - slider_top = scrollbar_height * top_index / size - slider_size = scrollbar_height * (bottom_index - top_index) / size + slider_top = scrollbar_height * top_index // size + slider_size = scrollbar_height * (bottom_index - top_index) // size max_slider_top = scrollbar_height - slider_size - 1 # ensures slider isn't at top or bottom unless really at those extreme bounds

1 0

[nyx/master] Ensure division order of operations
by atagar＠torproject.org 27 Nov '16

27 Nov '16

commit b1443805250655807436d23f4fb154b2f622510e Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Nov 16 09:35:14 2016 -0800 Ensure division order of operations Order of operations don't matter when just multiplying and dividing... *unless* you're doing integer division. I don't know offhand what python's binding order is nor do I want to rely on it, so forcing multiplication to go first. --- nyx/curses.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nyx/curses.py b/nyx/curses.py index 78eb14e..b733449 100644 --- a/nyx/curses.py +++ b/nyx/curses.py @@ -886,8 +886,8 @@ class _Subwindow(object): scrollbar_height = self.height - top - 1 # -1 is for the bottom border bottom_index = top_index + scrollbar_height + 1 - slider_top = scrollbar_height * top_index // size - slider_size = scrollbar_height * (bottom_index - top_index) // size + slider_top = (scrollbar_height * top_index) // size + slider_size = (scrollbar_height * (bottom_index - top_index)) // size max_slider_top = scrollbar_height - slider_size - 1 # ensures slider isn't at top or bottom unless really at those extreme bounds

1 0

[nyx/master] Fix slider math
by atagar＠torproject.org 27 Nov '16

27 Nov '16

commit dabcc36baab06598fa4baa76bb779f09d82814cc Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Nov 16 09:52:35 2016 -0800 Fix slider math Damn this scrollbar method has given me a lot of headaches. Correcting an off-by-one error that caused the tests to fail on my netbook but pass on my pc. I really hope this is the last time I need to weed one of these out. For my personal reference here's the numbers when working through the test... top = 15 top_index = 21 size = 30 self.height = 25 scrollbar_height = self.height - top - 1 = 25 - 15 - 1 = 9 bottom_index = top_index + scrollbar_height = 21 + 9 = 30 slider_top = (scrollbar_height * top_index) // size = (9 * 21) // 30 = 6 slider_size = (scrollbar_height * (bottom_index - top_index + 1)) // size = (9 * (30 - 21 + 1)) // 30 = 3 --- nyx/curses.py | 9 +++++++-- test/subwindow.py | 6 +++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/nyx/curses.py b/nyx/curses.py index b733449..4396ab4 100644 --- a/nyx/curses.py +++ b/nyx/curses.py @@ -885,9 +885,14 @@ class _Subwindow(object): # determines scrollbar dimensions scrollbar_height = self.height - top - 1 # -1 is for the bottom border - bottom_index = top_index + scrollbar_height + 1 + + # Bottom index of the scroll bar. We show (scrollbar_height + 1) items at a + # time but have -1 to make the bottom bound inclusive. + + bottom_index = top_index + scrollbar_height + slider_top = (scrollbar_height * top_index) // size - slider_size = (scrollbar_height * (bottom_index - top_index)) // size + slider_size = (scrollbar_height * (bottom_index - top_index + 1)) // size max_slider_top = scrollbar_height - slider_size - 1 # ensures slider isn't at top or bottom unless really at those extreme bounds diff --git a/test/subwindow.py b/test/subwindow.py index db97970..61246d2 100644 --- a/test/subwindow.py +++ b/test/subwindow.py @@ -34,7 +34,7 @@ EXPECTED_SCROLLBAR_TOP = """ *| *| *| - | +*| | | | @@ -48,7 +48,7 @@ EXPECTED_SCROLLBAR_MIDDLE = """ *| *| *| - | +*| | | | @@ -62,7 +62,7 @@ EXPECTED_SCROLLBAR_BOTTOM = """ | | | - | +*| *| *| *|

1 0

[translation/tails-greeter-2_completed] Update translations for tails-greeter-2_completed
by translation＠torproject.org 27 Nov '16

27 Nov '16

commit bdaf7488f08b33537ba46180beeba3b967e0950a Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 27 16:48:14 2016 +0000 Update translations for tails-greeter-2_completed --- es/es.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es/es.po b/es/es.po index 41148e0..f5e97e3 100644 --- a/es/es.po +++ b/es/es.po @@ -284,7 +284,7 @@ msgstr "Tendría la capacidad de establecer un almacenamiento cifrado. " #: ../tailsgreeter/gui.py:783 msgid "Failed to relock persistent storage." -msgstr "No se pudo bloquear de nuevo el almacenamiento permanente" +msgstr "No se pudo volver a bloquear el almacenamiento permanente." #: ../tailsgreeter/gui.py:900 msgid "Bridge & Proxy"

1 0

[translation/tails-greeter-2] Update translations for tails-greeter-2
by translation＠torproject.org 27 Nov '16

27 Nov '16

commit aadea6b428e4b2b699247d615c35b61d11b084b8 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 27 16:48:09 2016 +0000 Update translations for tails-greeter-2 --- es/es.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es/es.po b/es/es.po index 41148e0..f5e97e3 100644 --- a/es/es.po +++ b/es/es.po @@ -284,7 +284,7 @@ msgstr "Tendría la capacidad de establecer un almacenamiento cifrado. " #: ../tailsgreeter/gui.py:783 msgid "Failed to relock persistent storage." -msgstr "No se pudo bloquear de nuevo el almacenamiento permanente" +msgstr "No se pudo volver a bloquear el almacenamiento permanente." #: ../tailsgreeter/gui.py:900 msgid "Bridge & Proxy"

1 0

[translation/tails-greeter-2_completed] Update translations for tails-greeter-2_completed
by translation＠torproject.org 27 Nov '16

27 Nov '16

commit d59957bc12680c23587f12642d62111c63ae7592 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 27 14:48:25 2016 +0000 Update translations for tails-greeter-2_completed --- zh_TW/zh_TW.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_TW/zh_TW.po b/zh_TW/zh_TW.po index 24b691d..25a3fd1 100644 --- a/zh_TW/zh_TW.po +++ b/zh_TW/zh_TW.po @@ -70,7 +70,7 @@ msgid "" " as it helps you hide your geographical location. But it might also create " "connectivity problems or look suspicious." msgstr "" -"每張網路卡都有一個獨一無二的實體位址，偽裝此位址可以避免本地端的網路(無論是有線或無線)得知您真實的網路卡實體位址，進而掩飾您實際的所在地。但是在某些情況中，可能會造成網路連線的問題，或是增加可疑性。" +"每張網路卡都有一個獨一無二的實體位址，偽裝此位址可以避免本地端的網路(無論是有線或無線)得知您真實的網路卡實體位址，進而掩飾您實際的地理位置。但是在某些情況中，可能會造成網路連線的問題，或是增加可疑性。" #: ../data/greeter.ui.h:12 msgid "Spoof all MAC addresses (default)"

1 0

[translation/tails-greeter-2] Update translations for tails-greeter-2
by translation＠torproject.org 27 Nov '16

27 Nov '16

commit 62078cf5b74abdea93810d39b138ab1401414325 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 27 14:48:21 2016 +0000 Update translations for tails-greeter-2 --- zh_TW/zh_TW.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_TW/zh_TW.po b/zh_TW/zh_TW.po index 24b691d..25a3fd1 100644 --- a/zh_TW/zh_TW.po +++ b/zh_TW/zh_TW.po @@ -70,7 +70,7 @@ msgid "" " as it helps you hide your geographical location. But it might also create " "connectivity problems or look suspicious." msgstr "" -"每張網路卡都有一個獨一無二的實體位址，偽裝此位址可以避免本地端的網路(無論是有線或無線)得知您真實的網路卡實體位址，進而掩飾您實際的所在地。但是在某些情況中，可能會造成網路連線的問題，或是增加可疑性。" +"每張網路卡都有一個獨一無二的實體位址，偽裝此位址可以避免本地端的網路(無論是有線或無線)得知您真實的網路卡實體位址，進而掩飾您實際的地理位置。但是在某些情況中，可能會造成網路連線的問題，或是增加可疑性。" #: ../data/greeter.ui.h:12 msgid "Spoof all MAC addresses (default)"

1 0

[translation/torbutton-aboutdialogdtd_completed] Update translations for torbutton-aboutdialogdtd_completed
by translation＠torproject.org 27 Nov '16

27 Nov '16

commit c895e6dc670b2cef5d3fc7f3cfd3233d1a3d815a Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 27 14:47:15 2016 +0000 Update translations for torbutton-aboutdialogdtd_completed --- zh_TW/aboutdialog.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_TW/aboutdialog.dtd b/zh_TW/aboutdialog.dtd index c0875ff..76b3064 100644 --- a/zh_TW/aboutdialog.dtd +++ b/zh_TW/aboutdialog.dtd @@ -15,5 +15,5 @@  <!ENTITY bottomLinks.grow "幫助洋蔥路由網路成長茁壯！">  -<!ENTITY bottomLinks.license "認證訊息"> -<!ENTITY tor.TrademarkStatement "「Tor」和「Onion Logo」是Tor Project, Inc 的註冊商標。"> +<!ENTITY bottomLinks.license "授權資訊"> +<!ENTITY tor.TrademarkStatement "「Tor」和「Onion Logo」皆是 Tor Project, Inc 的註冊商標。">

1 0

[translation/torbutton-aboutdialogdtd] Update translations for torbutton-aboutdialogdtd
by translation＠torproject.org 27 Nov '16

27 Nov '16

commit 2b98a417e5c36a447b41c661b53e762467b70660 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 27 14:47:11 2016 +0000 Update translations for torbutton-aboutdialogdtd --- zh_TW/aboutdialog.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_TW/aboutdialog.dtd b/zh_TW/aboutdialog.dtd index c0875ff..76b3064 100644 --- a/zh_TW/aboutdialog.dtd +++ b/zh_TW/aboutdialog.dtd @@ -15,5 +15,5 @@  <!ENTITY bottomLinks.grow "幫助洋蔥路由網路成長茁壯！">  -<!ENTITY bottomLinks.license "認證訊息"> -<!ENTITY tor.TrademarkStatement "「Tor」和「Onion Logo」是Tor Project, Inc 的註冊商標。"> +<!ENTITY bottomLinks.license "授權資訊"> +<!ENTITY tor.TrademarkStatement "「Tor」和「Onion Logo」皆是 Tor Project, Inc 的註冊商標。">

1 0

[translation/tails-perl5lib_completed] Update translations for tails-perl5lib_completed
by translation＠torproject.org 27 Nov '16

27 Nov '16

commit 94047bb4471f908a5b1e8e38241d147d94e00449 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 27 14:46:58 2016 +0000 Update translations for tails-perl5lib_completed --- zh_TW.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/zh_TW.po b/zh_TW.po index bb4706c..c68d482 100644 --- a/zh_TW.po +++ b/zh_TW.po @@ -6,14 +6,14 @@ # Agustín Wu <losangwuyts(a)gmail.com>, 2016 # cges30901 <cges30901(a)gmail.com>, 2014 # danfong <danfong.hsieh(a)gmail.com>, 2014 -# Kin Kwok, 2016 +# 大圈洋蔥, 2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2016-01-25 16:59+0100\n" -"PO-Revision-Date: 2016-04-13 03:25+0000\n" -"Last-Translator: Kin Kwok\n" +"POT-Creation-Date: 2016-09-20 15:58+0200\n" +"PO-Revision-Date: 2016-11-27 14:31+0000\n" +"Last-Translator: Agustín Wu <losangwuyts(a)gmail.com>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/otf/torproject/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,10 +29,10 @@ msgstr "錯誤" msgid "" "The device Tails is running from cannot be found. Maybe you used the `toram'" " option?" -msgstr "Tail 啟動時的執行裝置已找不到。可能您使用了「toram」選項?" +msgstr "用於啟動 Tails 之裝置找不到，或許您使用了「toram」選項？" #: ../lib/Tails/RunningSystem.pm:192 msgid "" "The drive Tails is running from cannot be found. Maybe you used the `toram' " "option?" -msgstr "Tails 系統所啟動執行的儲存裝置未找到，請確認您是否啟用了「toram」選項。" +msgstr "用於啟動 Tails 之磁碟找不到，或許您使用了「toram」選項？"

1 0