- tor-commits - lists.torproject.org

[nyx/master] Merge KeyInput into nyx.curses
by atagar＠torproject.org 14 Mar '16

14 Mar '16

commit bbf5199938d7f0b9beb7fb2bd2091fc9b11fcb52 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Mar 13 19:16:52 2016 -0700 Merge KeyInput into nyx.curses Simple class that clearly belongs in nyx.curses (not the panel). --- nyx/controller.py | 4 ++-- nyx/curses.py | 63 ++++++++++++++++++++++++++++++++++++++++++++++++- nyx/panel/__init__.py | 56 ------------------------------------------- nyx/panel/connection.py | 4 ++-- nyx/popups.py | 2 +- 5 files changed, 67 insertions(+), 62 deletions(-) diff --git a/nyx/controller.py b/nyx/controller.py index c3b9146..9a75f60 100644 --- a/nyx/controller.py +++ b/nyx/controller.py @@ -151,7 +151,7 @@ class Controller: Gets keystroke from the user. """ - return nyx.panel.KeyInput(self.get_screen().getch()) + return nyx.curses.KeyInput(self.get_screen().getch()) def get_page_count(self): """ @@ -444,7 +444,7 @@ def start_nyx(stdscr): key, override_key = override_key, None else: curses.halfdelay(CONFIG['features.redrawRate'] * 10) - key = nyx.panel.KeyInput(stdscr.getch()) + key = nyx.curses.KeyInput(stdscr.getch()) if key.match('right'): control.next_page() diff --git a/nyx/curses.py b/nyx/curses.py index 4e32fd9..18da7f2 100644 --- a/nyx/curses.py +++ b/nyx/curses.py @@ -17,6 +17,11 @@ if we want Windows support in the future too. disable_acs - renders replacements for ACS characters is_wide_characters_supported - checks if curses supports wide character + KeyInput - user keyboard input + |- match - checks if this matches the given inputs + |- is_scroll - true if key is used for scrolling + +- is_selection - true if key should trigger selection + Scroller - scrolls content with keyboard navigation |- location - present scroll location +- handle_key - moves scroll based on user input @@ -96,6 +101,20 @@ CURSES_ATTRIBUTES = { DEFAULT_COLOR_ATTR = dict([(color, 0) for color in Color]) COLOR_ATTR = None +SCROLL_KEYS = (curses.KEY_UP, curses.KEY_DOWN, curses.KEY_PPAGE, curses.KEY_NPAGE, curses.KEY_HOME, curses.KEY_END) + +SPECIAL_KEYS = { + 'up': curses.KEY_UP, + 'down': curses.KEY_DOWN, + 'left': curses.KEY_LEFT, + 'right': curses.KEY_RIGHT, + 'home': curses.KEY_HOME, + 'end': curses.KEY_END, + 'page_up': curses.KEY_PPAGE, + 'page_down': curses.KEY_NPAGE, + 'esc': 27, +} + def conf_handler(key, value): if key == 'features.colorOverride': @@ -261,6 +280,48 @@ def is_wide_characters_supported(): return False +class KeyInput(object): + """ + Keyboard input by the user. + """ + + def __init__(self, key): + self._key = key # pressed key as an integer + + def match(self, *keys): + """ + Checks if we have a case insensitive match with the given key. Beside + characters, this also recognizes: up, down, left, right, home, end, + page_up, page_down, and esc. + """ + + for key in keys: + if key in SPECIAL_KEYS: + if self._key == SPECIAL_KEYS[key]: + return True + elif len(key) == 1: + if self._key in (ord(key.lower()), ord(key.upper())): + return True + else: + raise ValueError("%s wasn't among our recognized key codes" % key) + + return False + + def is_scroll(self): + """ + True if the key is used for scrolling, false otherwise. + """ + + return self._key in SCROLL_KEYS + + def is_selection(self): + """ + True if the key matches the enter or space keys. + """ + + return self._key in (curses.KEY_ENTER, 10, ord(' ')) + + class Scroller(object): """ Simple scroller that provides keyboard navigation of content. @@ -296,7 +357,7 @@ class Scroller(object): * page up / page down - scrolls by the page_height * home / end - moves to the top or bottom - :param nyx.util.panel.KeyInput key: pressed key + :param nyx.curses.KeyInput key: pressed key :param int content_height: height of the content being renered :param int page_height: height visible on the page diff --git a/nyx/panel/__init__.py b/nyx/panel/__init__.py index 0bbde97..0394d55 100644 --- a/nyx/panel/__init__.py +++ b/nyx/panel/__init__.py @@ -20,20 +20,6 @@ from stem.util import conf, str_tools CURSES_LOCK = RLock() -SCROLL_KEYS = (curses.KEY_UP, curses.KEY_DOWN, curses.KEY_PPAGE, curses.KEY_NPAGE, curses.KEY_HOME, curses.KEY_END) - -SPECIAL_KEYS = { - 'up': curses.KEY_UP, - 'down': curses.KEY_DOWN, - 'left': curses.KEY_LEFT, - 'right': curses.KEY_RIGHT, - 'home': curses.KEY_HOME, - 'end': curses.KEY_END, - 'page_up': curses.KEY_PPAGE, - 'page_down': curses.KEY_NPAGE, - 'esc': 27, -} - PASS = -1 __all__ = [ @@ -806,45 +792,3 @@ class Panel(object): self.addch(top, left + width - 1, curses.ACS_URCORNER, *attributes) self.addch(top + height - 1, left, curses.ACS_LLCORNER, *attributes) self.addch(top + height - 1, left + width - 1, curses.ACS_LRCORNER, *attributes) - - -class KeyInput(object): - """ - Keyboard input by the user. - """ - - def __init__(self, key): - self._key = key # pressed key as an integer - - def match(self, *keys): - """ - Checks if we have a case insensitive match with the given key. Beside - characters, this also recognizes: up, down, left, right, home, end, - page_up, page_down, and esc. - """ - - for key in keys: - if key in SPECIAL_KEYS: - if self._key == SPECIAL_KEYS[key]: - return True - elif len(key) == 1: - if self._key in (ord(key.lower()), ord(key.upper())): - return True - else: - raise ValueError("%s wasn't among our recognized key codes" % key) - - return False - - def is_scroll(self): - """ - True if the key is used for scrolling, false otherwise. - """ - - return self._key in SCROLL_KEYS - - def is_selection(self): - """ - True if the key matches the enter or space keys. - """ - - return self._key in (curses.KEY_ENTER, 10, ord(' ')) diff --git a/nyx/panel/connection.py b/nyx/panel/connection.py index 1f6d820..7e19a02 100644 --- a/nyx/panel/connection.py +++ b/nyx/panel/connection.py @@ -364,9 +364,9 @@ class ConnectionPanel(nyx.panel.Panel, threading.Thread): if not key or key.is_selection() or key.match('d'): break # closes popup elif key.match('left'): - self.handle_key(nyx.panel.KeyInput(curses.KEY_UP)) + self.handle_key(nyx.curses.KeyInput(curses.KEY_UP)) elif key.match('right'): - self.handle_key(nyx.panel.KeyInput(curses.KEY_DOWN)) + self.handle_key(nyx.curses.KeyInput(curses.KEY_DOWN)) self.set_title_visible(True) self.redraw(True) diff --git a/nyx/popups.py b/nyx/popups.py index d594409..70db69a 100644 --- a/nyx/popups.py +++ b/nyx/popups.py @@ -445,7 +445,7 @@ def show_descriptor_popup(fingerprint, color, max_width, is_close_key): :param function is_close_key: method to indicate if a key should close the dialog or not - :returns: :class:`~nyx.panel.KeyInput` for the keyboard input that + :returns: :class:`~nyx.curses.KeyInput` for the keyboard input that closed the dialog """

1 0

[webwml/master] Update tor2web link
by sebastian＠torproject.org 13 Mar '16

13 Mar '16

commit a941ba5ec1ef3b6f1bf1785b86cface966a07620 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sun Mar 13 22:59:35 2016 +0100 Update tor2web link --- getinvolved/en/volunteer.wml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/getinvolved/en/volunteer.wml b/getinvolved/en/volunteer.wml index 2e0eed2..f0d2c8d 100644 --- a/getinvolved/en/volunteer.wml +++ b/getinvolved/en/volunteer.wml @@ -794,7 +794,7 @@ meetings around the world.</li> <a id="project-tor2web"></a> <h3><a - href="http://wiki.tor2web.org/index.php/Main_Page">Tor2web</a> (<a + href="https://www.tor2web.org">Tor2web</a> (<a href="https://github.com/globaleaks/tor2web-3.0/wiki">code</a>)</h3> <p>

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 13 Mar '16

13 Mar '16

commit 5293185e6e9fdfff4173ce0668bd0ee74a895694 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Mar 13 17:45:53 2016 +0000 Update translations for torbutton-torbuttondtd --- zh_CN/torbutton.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_CN/torbutton.dtd b/zh_CN/torbutton.dtd index 0d2c5bb..d947470 100644 --- a/zh_CN/torbutton.dtd +++ b/zh_CN/torbutton.dtd @@ -24,7 +24,7 @@ <!ENTITY torbutton.pref_connection_more_info.text "Torbutton 当前已启用。如需对 Tor 之外的代理设置进行更改，请禁用 Torbutton 后再返回这里。如需更改 Tor 的设置，请在 Torbutton 首选项窗口中进行设置。"> <!ENTITY torbutton.context_menu.new_identity "新身份"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.new_circuit "为该站点新建 Tor 线路"> +<!ENTITY torbutton.context_menu.new_circuit "为此站点使用新 Tor 线路"> <!ENTITY torbutton.context_menu.new_circuit_key "C"> <!ENTITY torbutton.context_menu.toggle "切换 Tor 状态"> <!ENTITY torbutton.context_menu.toggle.key "T"> @@ -181,5 +181,5 @@ <!ENTITY torbutton.prefs.sec_webfonts_desc "某些字体和图标可能无法正确显示。"> <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "禁用网站提供的字体文件。"> <!ENTITY torbutton.prefs.sec_custom "自定义"> -<!ENTITY torbutton.circuit_display.title "该站点所用的 Tor 线路"> +<!ENTITY torbutton.circuit_display.title "为此站点使用的 Tor 线路">

1 0

[translation/tor-messenger-ircproperties_completed] Update translations for tor-messenger-ircproperties_completed
by translation＠torproject.org 13 Mar '16

13 Mar '16

commit 08a82fd9da0f251fd3ca9dc6dab1df1939fe8295 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Mar 13 03:46:46 2016 +0000 Update translations for tor-messenger-ircproperties_completed --- zh_CN/irc.properties | 3 +++ 1 file changed, 3 insertions(+) diff --git a/zh_CN/irc.properties b/zh_CN/irc.properties index 99cdd99..9e6d28a 100644 --- a/zh_CN/irc.properties +++ b/zh_CN/irc.properties @@ -172,6 +172,9 @@ error.sendMessageFailed=发送您的最后一条消息时出错。请在连接 # %1$S is the channel the user tried to join, %2$S is the channel # he was forwarded to. error.channelForward=您可能未加入 %1$S，我们已自动重定向到 %2$S。 +# %S is the mode that the user tried to set but was not recognized +# by the server as a valid mode. +error.unknownMode=“%S”在这个服务器上不是有效的用户模式。 # LOCALIZATION NOTE (tooltip.*): # These are the descriptions given in a tooltip with information received

1 0

[translation/tor-messenger-ircproperties] Update translations for tor-messenger-ircproperties
by translation＠torproject.org 13 Mar '16

13 Mar '16

commit aad5fdb23d5d6a14dfb00d84980295e438e305ea Author: Translation commit bot <translation(a)torproject.org> Date: Sun Mar 13 03:46:41 2016 +0000 Update translations for tor-messenger-ircproperties --- zh_CN/irc.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN/irc.properties b/zh_CN/irc.properties index c3bf848..9e6d28a 100644 --- a/zh_CN/irc.properties +++ b/zh_CN/irc.properties @@ -174,7 +174,7 @@ error.sendMessageFailed=发送您的最后一条消息时出错。请在连接 error.channelForward=您可能未加入 %1$S，我们已自动重定向到 %2$S。 # %S is the mode that the user tried to set but was not recognized # by the server as a valid mode. -error.unknownMode='%S' is not a valid user mode on this server. +error.unknownMode=“%S”在这个服务器上不是有效的用户模式。 # LOCALIZATION NOTE (tooltip.*): # These are the descriptions given in a tooltip with information received

1 0

[translation/tor_animation_completed] Update translations for tor_animation_completed
by translation＠torproject.org 13 Mar '16

13 Mar '16

commit 304c40ecb87184475cc8c9fa51c2f84232079471 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Mar 13 03:46:08 2016 +0000 Update translations for tor_animation_completed --- zh_CN.srt | 100 +++++++++++++++++++++++++++++++------------------------------- 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/zh_CN.srt b/zh_CN.srt index f786e82..4326e8e 100644 --- a/zh_CN.srt +++ b/zh_CN.srt @@ -20,127 +20,127 @@ 6 00:00:14,920 --> 00:00:17,740 -此次此刻，有人想要查询你的信息 +此时此刻，假如有人想要查询你的信息 7 00:00:18,060 --> 00:00:22,480 -他们可以发现你的真实身份、具体位置、你用的操作系统 +他们可以找到你的真实身份、具体位置，以及你所用的操作系统 8 00:00:22,800 --> 00:00:26,500 -你打开过的网站，还有看网页用了哪个浏览器 +你打开过的所有网站，还有看网页时用了哪个浏览器 9 00:00:26,700 --> 00:00:29,140 -他们可以找到大量关于你的信息，但你可能没有意识到 +他们可以找到大量有关你的信息，但你可能完全没有意识到 10 -00:00:29,620 --> 00:00:32,460 -自己在与陌生人分享这些数据，这些人很容易 +00:00:29,200 --> 00:00:31,500 +自己在与陌生人分享这些数据 11 -00:00:32,920 --> 00:00:35,840 -利用你的个人信息，对你造成影响或伤害 +00:00:31,700 --> 00:00:34,000 +这些人很容易利用你的个人信息，对你造成影响或伤害 12 -00:00:36,220 --> 00:00:38,120 -不过，Tor 可以让你避免这些担忧！ +00:00:34,500 --> 00:00:37,000 +但是现在，Tor 可以让你免除这些担忧！ 13 -00:00:39,140 --> 00:00:42,840 -Tor 浏览器保护你的在线隐私和身份 +00:00:37,140 --> 00:00:40,840 +Tor 浏览器能保护你的在线隐私和身份 14 -00:00:43,560 --> 00:00:46,760 -通过三层加密， Tor 确保你的连接安全 +00:00:41,560 --> 00:00:44,760 +通过三层加密，Tor 能确保你的连接安全 15 -00:00:46,940 --> 00:00:51,760 -Tor 网络由世界各地的自愿者搭建的节点组成 +00:00:44,940 --> 00:00:49,760 +Tor 网络由世界各地的志愿者搭建的节点组成通过三个这样的节点访问互联网 16 -00:00:52,280 --> 00:00:55,520 +00:00:50,280 --> 00:00:53,520 确保我们能够自由地在线沟通，并保持匿名 17 -00:00:58,560 --> 00:01:00,280 -另外，面对企业或政府定向监视和大众监控 +00:00:56,560 --> 00:00:58,280 +此外，面对企业或政府的定向或普遍监控 18 -00:01:00,400 --> 00:01:03,900 +00:00:58,400 --> 00:01:01,900 Tor 同样可以保护我们的在线隐私 19 -00:01:04,880 --> 00:01:09,340 -或许你所在的国家试图监控互联网 +00:01:02,880 --> 00:01:07,340 +或许你所在的国家在试图监控互联网 20 -00:01:09,900 --> 00:01:13,800 +00:01:07,900 --> 00:01:11,800 或许你不想那些大公司利用你的个人信息 21 -00:01:14,880 --> 00:01:17,640 -使用 Tor 可以让每个用户看起来一模一样 +00:01:12,880 --> 00:01:15,640 +使用 Tor，让每个用户看起来都一模一样 22 -00:01:17,920 --> 00:01:20,800 -如果网站和服务器无法区分你和其他人 +00:01:15,920 --> 00:01:18,800 +如果网站和服务器无法区分你与其他人那么你就是匿名的 23 -00:01:21,500 --> 00:01:24,980 +00:01:19,500 --> 00:01:22,980 所以，更多人使用 Tor -进行区分就更难，你就更能够保持匿名 +区分他们就更难，你就更能保持匿名 24 -00:01:25,140 --> 00:01:29,800 +00:01:23,140 --> 00:01:27,800 因为，如果大家看起来都一样 -就无法把你从人群中找出来 +其他人就无法把你从人群中找出来 25 -00:01:30,700 --> 00:01:33,240 +00:01:28,700 --> 00:01:31,240 你可以绕过网络封锁和审查 26 -00:01:33,400 --> 00:01:36,100 +00:01:31,400 --> 00:01:34,100 同时无需担心审查人员 -知道你在网络做了什么 +知道你在网上做了什么 27 -00:01:38,540 --> 00:01:41,440 +00:01:36,540 --> 00:01:39,440 也不用担心点击一个链接后 28 -00:01:41,640 --> 00:01:43,300 -几个月都会看到类似的广告 +00:01:39,640 --> 00:01:41,300 +几个月内都会看到与其相关的广告 29 -00:01:45,880 --> 00:01:49,380 +00:01:43,880 --> 00:01:47,380 使用 Tor 浏览器 30 -00:01:49,540 --> 00:01:51,760 -网站就无法知道你是谁，你在地球的哪个角落 +00:01:47,540 --> 00:01:49,760 +网站就无法知道你是谁，以及你从地球上的哪个角落访问它 31 -00:01:51,920 --> 00:01:53,920 -当然，除非你登录网站并透露这些信息 +00:01:49,920 --> 00:01:51,920 +当然，前提是你没有登录网站和透露这些信息 32 -00:01:56,200 --> 00:01:57,840 -使用 Tor 浏览器 +00:01:54,200 --> 00:01:55,840 +下载并使用 Tor 浏览器 33 -00:01:58,200 --> 00:02:00,560 +00:01:56,200 --> 00:01:58,560 保护那些需要匿名的人 34 -00:02:00,880 --> 00:02:03,640 -比如，异议人士，行动者，记者和博客作者 +00:01:58,880 --> 00:02:01,640 +例如异议人士、组织者、记者和博客作者等 35 -00:02:04,000 --> 00:02:09,000 -马上下载，开始用 Tor！ -另外，你也可以搭建 Tor 中继节点！ +00:02:02,000 --> 00:02:07,000 +马上下载并开始使用 Tor 吧！ +你还可以搭建一个 Tor 中继节点！

1 0

[translation/tor_animation] Update translations for tor_animation
by translation＠torproject.org 13 Mar '16

13 Mar '16

commit 534c5ca25454ef7b735d32460838d078fe15a2b8 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Mar 13 03:46:03 2016 +0000 Update translations for tor_animation --- zh_CN.srt | 100 +++++++++++++++++++++++++++++++------------------------------- 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/zh_CN.srt b/zh_CN.srt index f786e82..4326e8e 100644 --- a/zh_CN.srt +++ b/zh_CN.srt @@ -20,127 +20,127 @@ 6 00:00:14,920 --> 00:00:17,740 -此次此刻，有人想要查询你的信息 +此时此刻，假如有人想要查询你的信息 7 00:00:18,060 --> 00:00:22,480 -他们可以发现你的真实身份、具体位置、你用的操作系统 +他们可以找到你的真实身份、具体位置，以及你所用的操作系统 8 00:00:22,800 --> 00:00:26,500 -你打开过的网站，还有看网页用了哪个浏览器 +你打开过的所有网站，还有看网页时用了哪个浏览器 9 00:00:26,700 --> 00:00:29,140 -他们可以找到大量关于你的信息，但你可能没有意识到 +他们可以找到大量有关你的信息，但你可能完全没有意识到 10 -00:00:29,620 --> 00:00:32,460 -自己在与陌生人分享这些数据，这些人很容易 +00:00:29,200 --> 00:00:31,500 +自己在与陌生人分享这些数据 11 -00:00:32,920 --> 00:00:35,840 -利用你的个人信息，对你造成影响或伤害 +00:00:31,700 --> 00:00:34,000 +这些人很容易利用你的个人信息，对你造成影响或伤害 12 -00:00:36,220 --> 00:00:38,120 -不过，Tor 可以让你避免这些担忧！ +00:00:34,500 --> 00:00:37,000 +但是现在，Tor 可以让你免除这些担忧！ 13 -00:00:39,140 --> 00:00:42,840 -Tor 浏览器保护你的在线隐私和身份 +00:00:37,140 --> 00:00:40,840 +Tor 浏览器能保护你的在线隐私和身份 14 -00:00:43,560 --> 00:00:46,760 -通过三层加密， Tor 确保你的连接安全 +00:00:41,560 --> 00:00:44,760 +通过三层加密，Tor 能确保你的连接安全 15 -00:00:46,940 --> 00:00:51,760 -Tor 网络由世界各地的自愿者搭建的节点组成 +00:00:44,940 --> 00:00:49,760 +Tor 网络由世界各地的志愿者搭建的节点组成通过三个这样的节点访问互联网 16 -00:00:52,280 --> 00:00:55,520 +00:00:50,280 --> 00:00:53,520 确保我们能够自由地在线沟通，并保持匿名 17 -00:00:58,560 --> 00:01:00,280 -另外，面对企业或政府定向监视和大众监控 +00:00:56,560 --> 00:00:58,280 +此外，面对企业或政府的定向或普遍监控 18 -00:01:00,400 --> 00:01:03,900 +00:00:58,400 --> 00:01:01,900 Tor 同样可以保护我们的在线隐私 19 -00:01:04,880 --> 00:01:09,340 -或许你所在的国家试图监控互联网 +00:01:02,880 --> 00:01:07,340 +或许你所在的国家在试图监控互联网 20 -00:01:09,900 --> 00:01:13,800 +00:01:07,900 --> 00:01:11,800 或许你不想那些大公司利用你的个人信息 21 -00:01:14,880 --> 00:01:17,640 -使用 Tor 可以让每个用户看起来一模一样 +00:01:12,880 --> 00:01:15,640 +使用 Tor，让每个用户看起来都一模一样 22 -00:01:17,920 --> 00:01:20,800 -如果网站和服务器无法区分你和其他人 +00:01:15,920 --> 00:01:18,800 +如果网站和服务器无法区分你与其他人那么你就是匿名的 23 -00:01:21,500 --> 00:01:24,980 +00:01:19,500 --> 00:01:22,980 所以，更多人使用 Tor -进行区分就更难，你就更能够保持匿名 +区分他们就更难，你就更能保持匿名 24 -00:01:25,140 --> 00:01:29,800 +00:01:23,140 --> 00:01:27,800 因为，如果大家看起来都一样 -就无法把你从人群中找出来 +其他人就无法把你从人群中找出来 25 -00:01:30,700 --> 00:01:33,240 +00:01:28,700 --> 00:01:31,240 你可以绕过网络封锁和审查 26 -00:01:33,400 --> 00:01:36,100 +00:01:31,400 --> 00:01:34,100 同时无需担心审查人员 -知道你在网络做了什么 +知道你在网上做了什么 27 -00:01:38,540 --> 00:01:41,440 +00:01:36,540 --> 00:01:39,440 也不用担心点击一个链接后 28 -00:01:41,640 --> 00:01:43,300 -几个月都会看到类似的广告 +00:01:39,640 --> 00:01:41,300 +几个月内都会看到与其相关的广告 29 -00:01:45,880 --> 00:01:49,380 +00:01:43,880 --> 00:01:47,380 使用 Tor 浏览器 30 -00:01:49,540 --> 00:01:51,760 -网站就无法知道你是谁，你在地球的哪个角落 +00:01:47,540 --> 00:01:49,760 +网站就无法知道你是谁，以及你从地球上的哪个角落访问它 31 -00:01:51,920 --> 00:01:53,920 -当然，除非你登录网站并透露这些信息 +00:01:49,920 --> 00:01:51,920 +当然，前提是你没有登录网站和透露这些信息 32 -00:01:56,200 --> 00:01:57,840 -使用 Tor 浏览器 +00:01:54,200 --> 00:01:55,840 +下载并使用 Tor 浏览器 33 -00:01:58,200 --> 00:02:00,560 +00:01:56,200 --> 00:01:58,560 保护那些需要匿名的人 34 -00:02:00,880 --> 00:02:03,640 -比如，异议人士，行动者，记者和博客作者 +00:01:58,880 --> 00:02:01,640 +例如异议人士、组织者、记者和博客作者等 35 -00:02:04,000 --> 00:02:09,000 -马上下载，开始用 Tor！ -另外，你也可以搭建 Tor 中继节点！ +00:02:02,000 --> 00:02:07,000 +马上下载并开始使用 Tor 吧！ +你还可以搭建一个 Tor 中继节点！

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 13 Mar '16

13 Mar '16

commit 7dcc86286b52fd2596bb9bc452c86632ee267f88 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Mar 13 03:45:52 2016 +0000 Update translations for torbutton-torbuttondtd --- zh_CN/torbutton.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN/torbutton.dtd b/zh_CN/torbutton.dtd index 1972a7a..0d2c5bb 100644 --- a/zh_CN/torbutton.dtd +++ b/zh_CN/torbutton.dtd @@ -22,7 +22,7 @@ <!ENTITY torbutton.pref_connection.more_info "更多信息"> <!ENTITY torbutton.pref_connection_more_info.title "帮助"> <!ENTITY torbutton.pref_connection_more_info.text "Torbutton 当前已启用。如需对 Tor 之外的代理设置进行更改，请禁用 Torbutton 后再返回这里。如需更改 Tor 的设置，请在 Torbutton 首选项窗口中进行设置。"> -<!ENTITY torbutton.context_menu.new_identity "新标识"> +<!ENTITY torbutton.context_menu.new_identity "新身份"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.new_circuit "为该站点新建 Tor 线路"> <!ENTITY torbutton.context_menu.new_circuit_key "C">

1 0

[stem/master] Don't mention Vidalia on FAQ
by atagar＠torproject.org 13 Mar '16

13 Mar '16

commit 7f4fcf8f6da3941e84376ee67747135e7f34462b Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Mar 12 18:54:11 2016 -0800 Don't mention Vidalia on FAQ Link is dead and Vidalia's no longer something most of our visitors would be familiar with. --- docs/faq.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/faq.rst b/docs/faq.rst index 2a4ec83..f559045 100644 --- a/docs/faq.rst +++ b/docs/faq.rst @@ -35,7 +35,7 @@ General Information What is Stem? ------------- -Stem is a Python controller library that you can use to interact with `Tor <https://www.torproject.org/>`_. With it you can write scripts and applications with capabilities similar to `Vidalia <https://www.torproject.org/getinvolved/volunteer.html.en#project-vidalia>`_ and `arm <https://www.atagar.com/arm/>`_. +Stem is a Python controller library that you can use to interact with `Tor <https://www.torproject.org/>`_. With it you can write scripts and applications with capabilities similar `arm <https://www.atagar.com/arm/>`_. From a technical standpoint, Stem is a Python implementation of Tor's `directory <https://gitweb.torproject.org/torspec.git/tree/dir-spec.txt>`_ and `control specifications <https://gitweb.torproject.org/torspec.git/tree/control-spec.txt>`_. `To get started see our tutorials! <tutorials.html>`_

1 0

[translation/torbutton-abouttbupdatedtd] Update translations for torbutton-abouttbupdatedtd
by translation＠torproject.org 12 Mar '16

12 Mar '16

commit e866b220ca5a33276a0460e509253101fd50fe1c Author: Translation commit bot <translation(a)torproject.org> Date: Sat Mar 12 19:46:57 2016 +0000 Update translations for torbutton-abouttbupdatedtd --- cs/abouttbupdate.dtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cs/abouttbupdate.dtd b/cs/abouttbupdate.dtd index 37567bd..67b914f 100644 --- a/cs/abouttbupdate.dtd +++ b/cs/abouttbupdate.dtd @@ -1,6 +1,6 @@ -<!ENTITY aboutTBUpdate.title "Tor Browser Update"> -<!ENTITY aboutTBUpdate.updated "Tor Browser has been updated."> +<!ENTITY aboutTBUpdate.title "Aktualizace Tor Browseru"> +<!ENTITY aboutTBUpdate.updated "Tor Browser byl aktualizován."> <!ENTITY aboutTBUpdate.linkPrefix "For the most up-to-date information about this release, "> -<!ENTITY aboutTBUpdate.linkLabel "visit our website"> +<!ENTITY aboutTBUpdate.linkLabel "navštivte naši webovou stránku"> <!ENTITY aboutTBUpdate.linkSuffix "."> -<!ENTITY aboutTBUpdate.changeLogHeading "Changelog:"> +<!ENTITY aboutTBUpdate.changeLogHeading "Seznam změn:">

1 0