- tor-commits - lists.torproject.org

[ooni-probe/master] Add daphn3 test yaml file
by art＠torproject.org 15 Nov '12

15 Nov '12

commit 180cfd7d1008fec4e490249d206fc73bd32df54e Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Nov 15 11:38:28 2012 +0100 Add daphn3 test yaml file --- test_inputs/daph3_yaml_file.txt | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/test_inputs/daph3_yaml_file.txt b/test_inputs/daph3_yaml_file.txt new file mode 100644 index 0000000..2412a08 --- /dev/null +++ b/test_inputs/daph3_yaml_file.txt @@ -0,0 +1,2 @@ +{client: antani, server: sblinda} +

1 0

[translation/tails-greeter_completed] Update translations for tails-greeter_completed
by translation＠torproject.org 15 Nov '12

15 Nov '12

commit 58ba0dd271271dbe752cfce301bb726309573d41 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 15 09:16:15 2012 +0000 Update translations for tails-greeter_completed --- zh_CN/zh_CN.po | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/zh_CN/zh_CN.po b/zh_CN/zh_CN.po index b780aab..3376b71 100644 --- a/zh_CN/zh_CN.po +++ b/zh_CN/zh_CN.po @@ -6,12 +6,13 @@ # <ln191810(a)gmail.com>, 2012. # <ln191810(a)gmail.com>, 2012. # Nathan <zhazhenzhong(a)gmail.com>, 2012. +# <zhazhenzhong(a)gmail.com>, 2012. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-06-01 15:10+0200\n" -"PO-Revision-Date: 2012-11-15 03:35+0000\n" +"PO-Revision-Date: 2012-11-15 08:53+0000\n" "Last-Translator: xtoaster <zhazhenzhong(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -111,7 +112,7 @@ msgstr "密码不正确" msgid "" "live-persist failed with return code %(returncode)s:\n" "%(stderr)s" -msgstr "永久激活失败，返回代码 %(returncode)s:\n%(stderr)s" +msgstr "负责持久卷设置的 live-persist 执行失败，返回代码 %(returncode)s:\n%(stderr)s" #: ../GdmGreeter/persistence.py:99 #, python-format @@ -127,7 +128,7 @@ msgid "" "live-persist failed with return code %(returncode)s:\n" "%(stdout)s\n" "%(stderr)s" -msgstr "永久激活失败，返回代码 %(returncode)s:\n%(stdout)s\n%(stderr)s" +msgstr "负责持久卷设置的 live-persist 执行失败，，返回代码 %(returncode)s:\n%(stdout)s\n%(stderr)s" #: ../GdmGreeter/persistencewindow.py:94 msgid "Wrong passphrase. Please try again."

1 0

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 15 Nov '12

15 Nov '12

commit 6db2ed0c63cc5e580df3588e250f8fe2daee0bfe Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 15 09:16:11 2012 +0000 Update translations for tails-greeter --- zh_CN/zh_CN.po | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/zh_CN/zh_CN.po b/zh_CN/zh_CN.po index b780aab..3376b71 100644 --- a/zh_CN/zh_CN.po +++ b/zh_CN/zh_CN.po @@ -6,12 +6,13 @@ # <ln191810(a)gmail.com>, 2012. # <ln191810(a)gmail.com>, 2012. # Nathan <zhazhenzhong(a)gmail.com>, 2012. +# <zhazhenzhong(a)gmail.com>, 2012. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-06-01 15:10+0200\n" -"PO-Revision-Date: 2012-11-15 03:35+0000\n" +"PO-Revision-Date: 2012-11-15 08:53+0000\n" "Last-Translator: xtoaster <zhazhenzhong(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -111,7 +112,7 @@ msgstr "密码不正确" msgid "" "live-persist failed with return code %(returncode)s:\n" "%(stderr)s" -msgstr "永久激活失败，返回代码 %(returncode)s:\n%(stderr)s" +msgstr "负责持久卷设置的 live-persist 执行失败，返回代码 %(returncode)s:\n%(stderr)s" #: ../GdmGreeter/persistence.py:99 #, python-format @@ -127,7 +128,7 @@ msgid "" "live-persist failed with return code %(returncode)s:\n" "%(stdout)s\n" "%(stderr)s" -msgstr "永久激活失败，返回代码 %(returncode)s:\n%(stdout)s\n%(stderr)s" +msgstr "负责持久卷设置的 live-persist 执行失败，，返回代码 %(returncode)s:\n%(stdout)s\n%(stderr)s" #: ../GdmGreeter/persistencewindow.py:94 msgid "Wrong passphrase. Please try again."

1 0

[torspec/master] Clarify RESOLVED cell contents.
by nickm＠torproject.org 15 Nov '12

15 Nov '12

commit 72a83c7da586c82b15dbded214742d1169b83f4e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 14 22:55:51 2012 -0500 Clarify RESOLVED cell contents. There is not a "status byte" preceding the list of answers; there is only a list of answers. Also, due to limited implementations in current Tors, RESOLVED cells must have the IPv4 address, if any, first. --- tor-spec.txt | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tor-spec.txt b/tor-spec.txt index e913a5f..186b7c0 100644 --- a/tor-spec.txt +++ b/tor-spec.txt @@ -1186,8 +1186,9 @@ see tor-design.pdf. RELAY_RESOLVE cell containing the hostname to be resolved with a NUL terminating byte. (For a reverse lookup, the OP sends a RELAY_RESOLVE cell containing an in-addr.arpa address.) The OR replies with a - RELAY_RESOLVED cell containing a status byte, and any number of - answers. Each answer is of the form: + RELAY_RESOLVED cell containing any number of answers. Each answer is + of the form: + Type (1 octet) Length (1 octet) Value (variable-width) @@ -1202,6 +1203,9 @@ see tor-design.pdf. If any answer has a type of 'Error', then no other answer may be given. + For backward compatibility, if there are any IPv4 answers, one of those + must be given as the first answer. + The RELAY_RESOLVE cell must use a nonzero, distinct streamID; the corresponding RELAY_RESOLVED cell must use the same streamID. No stream is actually created by the OR when resolving the name.

1 0

[translation/tails-greeter_completed] Update translations for tails-greeter_completed
by translation＠torproject.org 15 Nov '12

15 Nov '12

commit 2fab113bbfba10f8f78f1a6031dd35bbc62f7108 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 15 03:45:57 2012 +0000 Update translations for tails-greeter_completed --- zh_CN/zh_CN.po | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/zh_CN/zh_CN.po b/zh_CN/zh_CN.po index ac4b39a..b780aab 100644 --- a/zh_CN/zh_CN.po +++ b/zh_CN/zh_CN.po @@ -3,14 +3,16 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# <ln191810(a)gmail.com>, 2012. # <ln191810(a)gmail.com>, 2012. +# Nathan <zhazhenzhong(a)gmail.com>, 2012. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-06-01 15:10+0200\n" -"PO-Revision-Date: 2012-10-26 12:37+0000\n" -"Last-Translator: ln191810 <ln191810(a)gmail.com>\n" +"PO-Revision-Date: 2012-11-15 03:35+0000\n" +"Last-Translator: xtoaster <zhazhenzhong(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,7 +31,7 @@ msgstr "欢迎进入 Tails" #: ../glade/persistencewindow.glade.h:3 msgid "Use persistence?" -msgstr "永久使用？" +msgstr "持久保存工作数据？" #: ../glade/persistencewindow.glade.h:4 msgid "Yes" @@ -117,7 +119,7 @@ msgid "" "cryptsetup failed with return code %(returncode)s:\n" "%(stdout)s\n" "%(stderr)s" -msgstr "伪装设置失败，返回代码 %(returncode)s:\n%(stdout)s\n%(stderr)s" +msgstr "加密设置失败，返回代码 %(returncode)s:\n%(stdout)s\n%(stderr)s" #: ../GdmGreeter/persistence.py:124 #, python-format

1 0

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 15 Nov '12

15 Nov '12

commit c77c370637434f37ca60495b8feed3a6037faabc Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 15 03:45:55 2012 +0000 Update translations for tails-greeter --- zh_CN/zh_CN.po | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/zh_CN/zh_CN.po b/zh_CN/zh_CN.po index ac4b39a..b780aab 100644 --- a/zh_CN/zh_CN.po +++ b/zh_CN/zh_CN.po @@ -3,14 +3,16 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# <ln191810(a)gmail.com>, 2012. # <ln191810(a)gmail.com>, 2012. +# Nathan <zhazhenzhong(a)gmail.com>, 2012. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-06-01 15:10+0200\n" -"PO-Revision-Date: 2012-10-26 12:37+0000\n" -"Last-Translator: ln191810 <ln191810(a)gmail.com>\n" +"PO-Revision-Date: 2012-11-15 03:35+0000\n" +"Last-Translator: xtoaster <zhazhenzhong(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,7 +31,7 @@ msgstr "欢迎进入 Tails" #: ../glade/persistencewindow.glade.h:3 msgid "Use persistence?" -msgstr "永久使用？" +msgstr "持久保存工作数据？" #: ../glade/persistencewindow.glade.h:4 msgid "Yes" @@ -117,7 +119,7 @@ msgid "" "cryptsetup failed with return code %(returncode)s:\n" "%(stdout)s\n" "%(stderr)s" -msgstr "伪装设置失败，返回代码 %(returncode)s:\n%(stdout)s\n%(stderr)s" +msgstr "加密设置失败，返回代码 %(returncode)s:\n%(stdout)s\n%(stderr)s" #: ../GdmGreeter/persistence.py:124 #, python-format

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 15 Nov '12

15 Nov '12

commit 02a1f374f9a5310f95a247509339774c2db99b70 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 15 03:45:50 2012 +0000 Update translations for liveusb-creator --- zh_CN/zh_CN.po | 123 ++++++++++++++++++++++++++++---------------------------- 1 files changed, 62 insertions(+), 61 deletions(-) diff --git a/zh_CN/zh_CN.po b/zh_CN/zh_CN.po index c90bb13..15b4a6a 100644 --- a/zh_CN/zh_CN.po +++ b/zh_CN/zh_CN.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Nathan <zhazhenzhong(a)gmail.com>, 2012. # 甘露(Gan Lu) <rhythm.gan(a)gmail.com>. 2008, 2009. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-04-13 14:16+0200\n" -"PO-Revision-Date: 2012-10-03 18:09+0000\n" -"Last-Translator: Tor Project <tor-assistants(a)torproject.org>\n" +"PO-Revision-Date: 2012-11-15 03:38+0000\n" +"Last-Translator: xtoaster <zhazhenzhong(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,7 +22,7 @@ msgstr "" #: ../liveusb/gui.py:80 #, python-format msgid "Unknown release: %s" -msgstr "未知发行：%s" +msgstr "未知发行版：%s" #: ../liveusb/gui.py:84 #, python-format @@ -31,18 +32,18 @@ msgstr "正在下载 %s..." #: ../liveusb/gui.py:197 #, python-format msgid "Device is too small: it must be at least %s MiB." -msgstr "" +msgstr "设备容量太小:至少要 %s MiB 空间。" #: ../liveusb/gui.py:226 msgid "" "Error: Cannot set the label or obtain the UUID of your device. Unable to " "continue." -msgstr "错误：无法设定标签或获得你设备的 UUID。不能继续。" +msgstr "错误：无法设定标签或获得你设备的UUID。不能继续。" #: ../liveusb/gui.py:276 #, python-format msgid "Installation complete! (%s)" -msgstr "" +msgstr "安装完成! (%s)" #: ../liveusb/gui.py:281 msgid "LiveUSB creation failed!" @@ -53,26 +54,26 @@ msgid "" "Warning: This tool needs to be run as an Administrator. To do this, right " "click on the icon and open the Properties. Under the Compatibility tab, " "check the \"Run this program as an administrator\" box." -msgstr "" +msgstr "警告: 本工具需要以管理员权限运行。请右键单击本工具的快捷方式图标，在文件属性的兼容性选项卡中的选中\"以管理员身份运行此程序\"。" #: ../liveusb/gui.py:413 msgid "Unable to find any USB drive" -msgstr "" +msgstr "未发现任何 U 盘" #: ../liveusb/gui.py:521 msgid "" "Device is not yet mounted, so we cannot determine the amount of free space." " Setting a maximum limit of 8G for the persistent storage." -msgstr "" +msgstr "设备未挂载，无法确定可用空间容量。暂设置持久卷的空间最大限额至8G。" #: ../liveusb/gui.py:528 #, python-format msgid "No free space on device %(device)s" -msgstr "" +msgstr " %(device)s 设备中无可用空间" #: ../liveusb/gui.py:533 msgid "Partition is FAT16; Restricting overlay size to 2G" -msgstr "" +msgstr "分区为 FAT16 格式；正在设置层叠存储大小为 2G" #: ../liveusb/gui.py:577 msgid "Persistent Storage" @@ -80,40 +81,40 @@ msgstr "持久存储器" #: ../liveusb/gui.py:586 msgid "Installation complete!" -msgstr "" +msgstr "安装完成!" #: ../liveusb/gui.py:587 msgid "Installation was completed. Press OK to close this program." -msgstr "" +msgstr "安装完成。点击确认关闭程序。" #: ../liveusb/gui.py:610 msgid "" "The Master Boot Record on your device is blank. Pressing 'Create Live USB' " "again will reset the MBR on this device." -msgstr "" +msgstr "此设备的 MBR 主导区记录一片空白。再次点击‘创建 Live USB’将重置设备的 MBR。" #: ../liveusb/gui.py:624 msgid "" "Warning: The Master Boot Record on your device does not match your system's " "syslinux MBR. If you have trouble booting this stick, try running the " "liveusb-creator with the --reset-mbr option." -msgstr "" +msgstr "警告: 设备中的主导区记录与您系统的 syslinux MBR 不符。如果您的 U 盘启动有困难，请尝试使用 --reset-mbr 参数运行 liveusb-creator 。" #: ../liveusb/gui.py:638 msgid "Unable to mount device" -msgstr "" +msgstr "无法挂载设备" #: ../liveusb/gui.py:644 msgid "Warning: All data on the selected drive will be lost." -msgstr "" +msgstr "警告: 所选 U 盘中的所有数据都将被删除。" #: ../liveusb/gui.py:646 ../liveusb/gui.py:663 msgid "Press 'Next' if you wish to continue." -msgstr "" +msgstr "继续请点击‘下一步’。" #: ../liveusb/gui.py:648 ../liveusb/gui.py:665 msgid "Next" -msgstr "" +msgstr "下一步" #: ../liveusb/gui.py:658 msgid "" @@ -124,7 +125,7 @@ msgstr "你的设备已经包含一个 LiveOS。\n如果你继续，它将被覆 #: ../liveusb/gui.py:661 msgid "" "Warning: Creating a new persistent overlay will delete your existing one." -msgstr "警告：创建一个新的持久覆盖将删除你现存的这个。" +msgstr "警告：创建一个新的持久层叠文件，将删除您现存的这个。" #: ../liveusb/gui.py:717 msgid "Download complete!" @@ -146,18 +147,18 @@ msgstr "选择 Live ISO" msgid "" "The selected file is unreadable.Please fix its permissions or select another" " file." -msgstr "" +msgstr "无法获取您选择的文件。请检查文件的读写权限，或选择其他文件。" #: ../liveusb/gui.py:737 msgid "" "Unable to use the selected file. You may have better luck if you move your " "ISO to the root of your drive (ie: C:\\)" -msgstr "" +msgstr "无法使用所选文件。您可以将文件移动到磁盘根目录后再试(例如 C:\\)" #: ../liveusb/gui.py:743 #, python-format msgid "%(filename)s selected" -msgstr "" +msgstr "%(filename)s 已选取" #: ../liveusb/creator.py:91 msgid "You must run this application as root" @@ -166,7 +167,7 @@ msgstr "你必须作为根用户(root)来运行本程序" #: ../liveusb/creator.py:130 msgid "" "Source type does not support verification of ISO MD5 checksum, skipping" -msgstr "" +msgstr "来源类型不支持 ISO 文件的 MD5 校验，正在跳过" #: ../liveusb/creator.py:132 msgid "Verifying ISO MD5 checksum" @@ -174,11 +175,11 @@ msgstr "正在验证 ISO MD5 校验值" #: ../liveusb/creator.py:137 msgid "ISO MD5 checksum verification failed" -msgstr "" +msgstr "ISO 映像的 MD5 校验值验证失败" #: ../liveusb/creator.py:139 msgid "ISO MD5 checksum passed" -msgstr "" +msgstr "ISO 映像的 MD5 校验值验证通过" #: ../liveusb/creator.py:144 msgid "Extracting live image to USB device..." @@ -187,7 +188,7 @@ msgstr "正在解压 live 映像到 USB 设备..." #: ../liveusb/creator.py:151 #, python-format msgid "Wrote to device at %(speed)d MB/sec" -msgstr "" +msgstr "写入设备，写入速度 %(speed)d MB/s" #: ../liveusb/creator.py:181 msgid "Setting up OLPC boot file..." @@ -198,21 +199,21 @@ msgstr "正在设定 OLPC 启动文件..." msgid "" "There was a problem executing the following command: `%(command)s`.\n" "A more detailed error log has been written to '%(filename)s'." -msgstr "" +msgstr "执行以下文件时出错:‘%(command)s’。\n更详细的错误日志已写入‘%(filename)s’。" #: ../liveusb/creator.py:384 msgid "Verifying SHA1 checksum of LiveCD image..." -msgstr "" +msgstr "正在验证 LiveCD 映像的 SHA1 校验值..." #: ../liveusb/creator.py:388 msgid "Verifying SHA256 checksum of LiveCD image..." -msgstr "" +msgstr "正在验证 LiveCD 映像的 SHA256 校验值..." #: ../liveusb/creator.py:404 msgid "" "Error: The SHA1 of your Live CD is invalid. You can run this program with " "the --noverify argument to bypass this verification check." -msgstr "错误：你 Live CD 的 SHA1 值不符。你能够使用 --noverify 参数运行本程序来避开该验证。" +msgstr "错误：Live CD 的 SHA1 值不符。您可以使用 --noverify 参数运行本程序来绕过验证。" #: ../liveusb/creator.py:410 msgid "Unknown ISO, skipping checksum verification" @@ -230,26 +231,26 @@ msgstr "正在创建 %sMB 持久覆盖" #: ../liveusb/creator.py:487 #, python-format msgid "Unable to copy %(infile)s to %(outfile)s: %(message)s" -msgstr "" +msgstr "无法复制 %(infile)s 至 %(outfile)s : %(message)s" #: ../liveusb/creator.py:497 msgid "Removing existing Live OS" -msgstr "" +msgstr "正在删除现存的 Live OS" #: ../liveusb/creator.py:506 ../liveusb/creator.py:517 #, python-format msgid "Unable to chmod %(file)s: %(message)s" -msgstr "" +msgstr "无法 chmod %(file)s：%(message)s" #: ../liveusb/creator.py:510 #, python-format msgid "Unable to remove file from previous LiveOS: %(message)s" -msgstr "" +msgstr "无法从之前的 LiveOS 中删除文件：%(message)s" #: ../liveusb/creator.py:522 #, python-format msgid "Unable to remove directory from previous LiveOS: %(message)s" -msgstr "" +msgstr "无法从之前的 LiveOS 中删除目录：%(message)s" #: ../liveusb/creator.py:573 #, python-format @@ -260,30 +261,30 @@ msgstr "无法找到设备 %s" msgid "" "You are using an old version of syslinux-extlinux that does not support the " "ext4 filesystem" -msgstr "" +msgstr "您正在使用旧版的 syslinux-extlinux ，它不支持 ext4 文件系统" #: ../liveusb/creator.py:718 #, python-format msgid "Unable to write on %(device)s, skipping." -msgstr "" +msgstr "无法向 %(device)s 中写入，正在跳过。" #: ../liveusb/creator.py:737 #, python-format msgid "" "Some partitions of USB device %(device)s are mounted. They will be unmounted" " before starting the installation process." -msgstr "" +msgstr "USB 设备 %(device)s 的一些分区已挂载。它们在安装开始前将被卸载。" #: ../liveusb/creator.py:786 ../liveusb/creator.py:886 msgid "Unknown filesystem. Your device may need to be reformatted." -msgstr "" +msgstr "未知的文件系统。您的设备也许需要重新格式化。" #: ../liveusb/creator.py:789 #, python-format msgid "" "Unsupported filesystem: %s\n" "In case you are trying to upgrade a manually installed Tails system (that is, if it was installed without this installer), this option is not supported: you need to install it anew to start with, e.g. by choosing the \"Clone Tails\" action instead." -msgstr "" +msgstr "不支持的文件系统: %s\n如果您正在视图升级一个您手动安装的 Tails 系统(即并非通过本安装程序安装)，则无法支持此选项：您需要重新安装，例如通过使用“克隆 Tails”操作。" #: ../liveusb/creator.py:791 ../liveusb/creator.py:889 #, python-format @@ -293,21 +294,21 @@ msgstr "不支持的文件系统：%s" #: ../liveusb/creator.py:807 #, python-format msgid "Unknown dbus exception while trying to mount device: %(message)s" -msgstr "" +msgstr "尝试挂载设备时发生未知 dbus 异常: %(message)s" #: ../liveusb/creator.py:811 #, python-format msgid "Unable to mount device: %(message)s" -msgstr "" +msgstr "无法挂载设备：%(message)s" #: ../liveusb/creator.py:823 msgid "No mount points found" -msgstr "" +msgstr "未找到挂载点" #: ../liveusb/creator.py:834 #, python-format msgid "Unmounting %(device)s" -msgstr "" +msgstr "正在卸载设备 %(device)s" #: ../liveusb/creator.py:846 #, python-format @@ -321,61 +322,61 @@ msgstr "正在验证文件系统..." #: ../liveusb/creator.py:907 #, python-format msgid "Unable to change volume label: %(message)s" -msgstr "" +msgstr "无法改变卷标: %(message)s" #: ../liveusb/creator.py:912 ../liveusb/creator.py:1236 msgid "Installing bootloader..." -msgstr "" +msgstr "正在安装引导程序..." #: ../liveusb/creator.py:935 ../liveusb/creator.py:1254 #, python-format msgid "Removing %(file)s" -msgstr "" +msgstr "正在删除 %(file)s" #: ../liveusb/creator.py:1017 #, python-format msgid "%s already bootable" -msgstr "" +msgstr "%s 已经是可引导盘" #: ../liveusb/creator.py:1037 msgid "Unable to find partition" -msgstr "" +msgstr "找不到分区" #: ../liveusb/creator.py:1060 #, python-format msgid "Formatting %(device)s as FAT32" -msgstr "" +msgstr "正在格式化 %(device)s 为 FAT32 格式" #: ../liveusb/creator.py:1109 #, python-format msgid "Resetting Master Boot Record of %s" -msgstr "" +msgstr "正在重置 %s 的 MBR" #: ../liveusb/creator.py:1112 msgid "" "Unable to reset MBR. You may not have the `syslinux` package installed." -msgstr "" +msgstr "无法重置 MBR 。您可能未安装‘syslinux’软件包。" #: ../liveusb/creator.py:1115 msgid "Drive is a loopback, skipping MBR reset" -msgstr "" +msgstr "驱动器类型为 loopback ，正在跳过 MBR 检测" #: ../liveusb/creator.py:1119 ../liveusb/creator.py:1382 #, python-format msgid "Calculating the SHA1 of %s" -msgstr "" +msgstr "正在计算 %s 的 SHA1 校验值" #: ../liveusb/creator.py:1143 msgid "Synchronizing data on disk..." -msgstr "" +msgstr "正在同步硬盘中的数据..." #: ../liveusb/creator.py:1195 msgid "Error probing device" -msgstr "" +msgstr "检测设备时出错" #: ../liveusb/creator.py:1197 msgid "Unable to find any removable device" -msgstr "" +msgstr "找不到任何可移动设备" #: ../liveusb/creator.py:1207 msgid "" @@ -392,14 +393,14 @@ msgstr "不支持的文件系统：%s\n请备份并用 FAT 文件系统格式化 #: ../liveusb/creator.py:1277 msgid "" "Unable to get Win32_LogicalDisk; win32com query did not return any results" -msgstr "" +msgstr "无法调用 Win32_LogicalDisk 函数；win32com 查询未返回任何结果" #: ../liveusb/creator.py:1330 msgid "Cannot find" -msgstr "无法找到" +msgstr "找不到" #: ../liveusb/creator.py:1331 msgid "" "Make sure to extract the entire liveusb-creator zip file before running this" " program." -msgstr "" +msgstr "请确认您在使用本程序前，已经解压整个 liveusb-creator zip 文件。"

1 0

[tor-design-2012/master] Minor tweaks.
by nickm＠torproject.org 14 Nov '12

14 Nov '12

commit 257db156317bdcc64042f90e1e20e558d8b58f02 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 14 16:50:58 2012 -0500 Minor tweaks. --- tor-design-2012.tex | 54 ++++++++++++++++++++++++++++++-------------------- 1 files changed, 32 insertions(+), 22 deletions(-) diff --git a/tor-design-2012.tex b/tor-design-2012.tex index cb8c1b5..6f43085 100644 --- a/tor-design-2012.tex +++ b/tor-design-2012.tex @@ -58,7 +58,7 @@ \author{Roger Dingledine \\ The Free Haven Project \\ arma(a)freehaven.net \and Nick Mathewson \\ The Free Haven Project \\ nickm(a)freehaven.net \and Paul Syverson \\ Naval Research Lab \\ syverson(a)itd.nrl.navy.mil} - +% XXX Should Steven be listed as author, too? \maketitle \thispagestyle{empty} @@ -80,7 +80,7 @@ between anonymity, usability, and efficiency. An earlier paper in 2004 described Tor's original design; here we explain Tor's current design as of late 2012, and describe our experiences with an international network of -approximately 3000 nodes and XXXXX %????? +approximately 3000 nodes and 500000 users. We close with a list of open problems in anonymous communication. \end{abstract} @@ -140,7 +140,9 @@ were never written, so many applications were never supported. Tor uses the standard and near-ubiquitous SOCKS~\cite{socks4} proxy interface, allowing us to support most TCP-based programs without modification. For the protocol cleaning of HTTP and -HTTPS, Tor relies on Torbutton~\cite{torbutton} (a Firefox +HTTPS, Tor relies on Torbutton +% XXX Put back in once there's a bibtex entry: ~\cite{torbutton} +(a Firefox add-on) and modifications made to the version of Firefox delivered to users as part of the Tor Browser Bundle. @@ -664,7 +666,7 @@ which are always interpreted by the node that receives them, \emph{relay} cells, which carry end-to-end stream data, or \emph{relay\_early} cells, which work similarly to \emph{relay} cells but are distinguished to enforce the maximum path length -(see \prettyref{sec:XXX}). The fixed-size control cell commands +(see \prettyref{subsec:dos}). The fixed-size control cell commands are: \emph{padding} (currently used for keepalive, but also usable for link padding); \emph{create} or \emph{created} (used to set up a new circuit); \emph{create\_fast} or @@ -741,7 +743,7 @@ After an intermediary design that relied (fragilely % Cite stuff about how TLS renegotiation went away for a % while once everybody realized it was insecure -NM and observably) -on TLS renegotiation +on TLS renegotiation% % Cite proposal 130. , Tor shifted to a mixed authentication model, where the TLS handshake can complete with any @@ -751,7 +753,7 @@ authentication that Tor actually wants.\footnote{To determine that this newer version of the link protocol handshake is to be used, the initiator avoids using the exact set of ciphersuites used by early Tor versions, and the Tor - responder uses an X509 certificate unlike those generated by + responder uses an X.509 certificate unlike those generated by earlier versions of Tor. % Cite proposal 176 and tor-spec This may be too clever for Tor's @@ -762,13 +764,13 @@ To perform the inner handshake once the TLS handshake is done, the parties negotiate a Tor link protocol version by exchanging \emph{versions} cells containing the list of link protocol versions each supports, then choosing the highest -versions supported by both. Next, the responder sends an +version supported by both. Next, the responder sends a \emph{certs} cell containing the actual certificate chain authenticating the public key it used for the TLS handshake with its identity key. The -responder also sends a random nonces as a challenge. If the +responder also sends a random nonce as a challenge. If the initiator also wishes to authenticate herself as an OR, she -sends an \emph{certs} cell of her own, followed by an +sends a \emph{certs} cell of her own, followed by an \emph{authenenticate} cell signed by her link key, containing: a digest of both identity keys, a digest of all messages she has sent and received so far, a digest of the @@ -826,7 +828,7 @@ With careful configuration, this system can be used to avoid numerous linking attacks. For example, a user accessing multiple pseudonymous chat accounts could configure her chat application to use a separate SOCKS username for each one, -thus telling Tor not place any of their streams on the same +thus telling Tor not to place any of their streams on the same circuit (which would reveal to the exit node and suggest to the exit that the accounts were shared by the same user). Or for applications that don't support SOCKS authentication, @@ -923,9 +925,10 @@ be encrypted with padded RSA-1024 is less than the size needed to hold an DH-1024 value, we need to use hybrid encryption. Tor's original hybrid encryption approach here was somewhat poorly designed, but turns out to be secure -anyway; \cite{TAP} has more details. +anyway. +% XXX Put back in once there's a bibtex entry: \cite{TAP} has more details. -As an optimization, Alice client may sent an \emph{create\_fast} cell in +As an optimization, Alice client may sent a \emph{create\_fast} cell in place of her first \emph{create} cell: instead of sending an encrypted $g^x$ value, she simply sends a random value $x$, Bob replies with a \emph{created\_fast} cell containing a random value $y$, and they base their @@ -1024,7 +1027,7 @@ node A is suitable for use at any point in a circuit, but node B is suitable only as the middle node, then node A will be considered for use three times as often as B. If the two nodes have equal bandwidth, node A will be chosen three times as often, leading to it -being overloaded in comparison with B. So now +being overloaded in comparison with B. As of 0.2.2.10-alpha, we moved to a more sophisticated approach, where nodes are chosen proportionally to their bandwidth, as weighted by an algorithm to optimize load-balancing between nodes of different @@ -1043,7 +1046,7 @@ very high bandwidth. But now, clients use \emph{measured} bandwidth values published in the network status consensus document (see -section~\ref{what?XXX}). A subset of the authorities measure and +section~\ref{subsec:dirservers}). A subset of the authorities measure and vote on nodes' observed bandwidth, to prevent misbehaving nodes from claiming (intentionally or accidentally) to have too much capacity. @@ -1087,7 +1090,7 @@ are going to be compromised, but it's better to increase your probability of having no compromised circuits at the expense of also increasing the proportion of your circuits that will be compromised if any of them are. This is because compromising a fraction of a -user's circuits—sometimes even just one—can be enough to compromise +user's circuits---sometimes even just one---can be enough to compromise a user's anonymity. For users who have good guard nodes, the situation is much better, and for users with bad guard nodes the situation is not much worse than before. @@ -1143,7 +1146,7 @@ circuit to the chosen OR. (As an optimization, to avoid a round-trip while waiting for a connected reply, clients may send data immediately after the -connected cell. The need to be ready to send the same data to +connected cell. They need to be ready to send the same data to another stream, though, if no connected cell arrives.) There's a catch to using SOCKS, however---some applications pass @@ -1216,7 +1219,8 @@ however, is more complex. We could do integrity checking of the relay cells at each hop, either by including MACs or by using an authenticating cipher -mode like GCM~\cite{gcm}, but there are some problems. First, +mode like GCM, but there are some problems. First, +% XXX Put back in once there's a bibtex entry: \cite{gcm} these approaches impose a message-expansion overhead at each hop, and so we would have to either leak the path length or waste bytes by padding to a maximum path length. Second, these @@ -1258,8 +1262,9 @@ while tagging attacks don't provide more information than an end-to-end attacker could get through passive correlation attacks, they succeed more quickly. Even that isn't such a big deal, were it not for a class of attacks that become possible if an attacker -can detect non-corelatable circuits early and kill them (see -\ref{???XXXsomewhere-in-attacks-and-defenses}). We are therefore looking +can detect non-corelatable circuits early and kill them. +% XXX Put back in once there's a label: (see \ref{???XXXsomewhere-in-attacks-and-defenses}). +We are therefore looking into improved constructions for integrity, especially ones based on wide-block ciphers. We hope to also take the opportunity to move the authentication mechanism away from the moribund SHA-1. @@ -1349,7 +1354,7 @@ soon as enough cells have arrived, the stream-level congestion control also has to check whether data has been successfully flushed onto the TCP stream; it sends the \emph{relay sendme} cell only when the number of bytes pending to be flushed is -under some threshold (currently 10 cells' worth). +under some threshold (currently 10 cells worth). % I don't believe that the numbers are 1000 and 100 any more. Must check -NM These arbitrarily chosen parameters give tolerable but not great @@ -1586,7 +1591,7 @@ is limited to 8, enforced by the distinction between \emph{relay\_early} cells may contain any type of relay cell but if they are not destined for the OR which receives them, result in a further \emph{relay\_early} cell being generated. -Only 8 \emph{Relay\_early} cells are permitted to be sent on a +Only 8 \emph{relay\_early} cells are permitted to be sent on a circuit. Similarly \emph{relay} cells result in a \emph{relay} cell being created, and may be sent without limit, but \emph{relay} cells cannot contain an extend request. In this @@ -1799,7 +1804,12 @@ consensus votes doesn't hurt the network, and by keeping in touch with the authority operators, who try to keep the number of running authorities well above the threshold. We have not yet needed to deal with a hostile or compromised -authority: our design restricts the damage that such an +authority: +% XXX Actually, moria1 and gabelmoo have been compromised a few +% years ago.. There were no signs of compromising them for their +% roles as Tor directory authorities, but the above statement is +% not quite correct. +our design restricts the damage that such an authority could do to casting a maliciously designed vote, or preventing the vote from occurring. In the event of such a denial of service from a hostile authority, it would be

1 0

[tor-design-2012/master] Add a placeholder author entry for Steven
by nickm＠torproject.org 14 Nov '12

14 Nov '12

commit 66c332e359ea80c59e14ebbf3317c3a9db0b681e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 14 17:45:44 2012 -0500 Add a placeholder author entry for Steven --- tor-design-2012.tex | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tor-design-2012.tex b/tor-design-2012.tex index 6f43085..712b381 100644 --- a/tor-design-2012.tex +++ b/tor-design-2012.tex @@ -57,8 +57,8 @@ \author{Roger Dingledine \\ The Free Haven Project \\ arma(a)freehaven.net \and Nick Mathewson \\ The Free Haven Project \\ nickm(a)freehaven.net \and +Steven Murdoch \\ affiliation \\ email \and Paul Syverson \\ Naval Research Lab \\ syverson(a)itd.nrl.navy.mil} -% XXX Should Steven be listed as author, too? \maketitle \thispagestyle{empty}

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 14 Nov '12

14 Nov '12

commit f61dacb4e90e903fb7496b94726a71fd4ac8690c Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 14 20:45:27 2012 +0000 Update translations for vidalia_help --- el/config.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/el/config.po b/el/config.po index 4d853ec..55c2241 100644 --- a/el/config.po +++ b/el/config.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 16:58+0200\n" -"PO-Revision-Date: 2012-11-14 14:20+0000\n" +"PO-Revision-Date: 2012-11-14 20:24+0000\n" "Last-Translator: anvo <fragos.george(a)hotmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -90,7 +90,7 @@ msgid "" "proxy is listening for connections. If your proxy requires authentication, " "you can also enter the Username and Password you use to " "connect to your proxy. Otherwise, you can leave those fields blank." -msgstr "" +msgstr "ÎÎ¹Î± ÏÏÏÏÎ²Î±ÏÎ· ÏÏÎ¿ ÎÎ¹Î±ÎŽÎ¯ÎºÏÏÎ¿ ÏÏÎ·ÏÎ¹ÎŒÎ¿ÏÎ¿Î¹Ï ÎÎœÎ± ÎŽÎ¹Î±ÎºÎ¿ÎŒÎ¹ÏÏÎ® ÎŒÎµÏÎ¿Î»Î¬Î²Î·ÏÎ·Ï-proxy: ÎÎœ Î· ÏÏÎœÎŽÎµÏÎ® ÏÎ±Ï ÏÏÎ¿ ÎÎ¹Î±ÎŽÎ¯ÎºÏÏÎ¿ Î±ÏÎ±Î¹ÏÎµÎ¯ ÎºÎ¬ÏÎ¿Î¹Î¿Îœ ÎŽÎ¹Î±ÎºÎ¿ÎŒÎ¹ÏÏÎ® proxy, ÎŒÏÎ¿ÏÎµÎ¯ÏÎµ ÎœÎ± ÏÏÎžÎŒÎ¯ÏÎµÏÎµ ÏÎ¿ Tor ÏÏÏÎµ ÎœÎ± ÏÏÎÎ»ÎœÎµÎ¹ ÏÎ»Î± ÏÎ± Î±Î¹ÏÎ®ÎŒÎ±ÏÎ± ÎºÎ±ÏÎ±Î»ÏÎ³Î¿Ï ÎºÎ±Î¹ ÏÎ¹Ï ÏÏÎœÎŽÎÏÎµÎ¹Ï Î±ÎœÎ±ÎŒÎµÏÎ¬ÎŽÎ¿ÏÎ·Ï ÎŒÎÏÏ ÏÎ¿Ï ÎŽÎ¹Î±ÎºÎ¿ÎŒÎ¹ÏÏÎ® ÎŒÎµÏÎ¿Î»Î¬Î²Î·ÏÎ·Ï. Î ÏÎÏÎµÎ¹ ÎœÎ± ÎŽÎ·Î»ÏÏÎµÏÎµ ÏÎ¿ÏÎ»Î¬ÏÎ¹ÏÏÎ¿Îœ ÏÎ¿ ÏÎœÎ¿ÎŒÎ± hostname Î® ÏÎ·Îœ ÎŽÎ¹ÎµÏÎžÏÎœÏÎ· ÏÎ¿Ï ÎŽÎ¹Î±ÎºÎ¿ÎŒÎ¹ÏÏÎ® ÎºÎ±ÎžÏÏ ÎºÎ±Î¹ ÏÎ·Îœ ÎžÏÏÎ± ÎŒÎÏÏ ÏÎ·Ï Î¿ÏÎ¿Î¯Î±Ï Î¿ ÎŽÎ¹Î±ÎºÎ¿ÎŒÎ¹ÏÏÎ®Ï ÎŒÎµÏÎ¿Î»Î¬Î²Î·ÏÎ·Ï Î±ÏÎ¿ÏÎ³ÎºÏÎ¬Î¶ÎµÏÎ±Î¹ ÏÎ¹Ï ÏÏÎœÎŽÎÏÎµÎ¹Ï ÏÎ±Ï. ÎÎœ Î¿ ÎŽÎ¹Î±ÎºÎ¿ÎŒÎ¹ÏÏÎ®Ï ÎŒÎµÏÎ¿Î»Î¬Î²Î·ÏÎ·Ï Î±ÏÎ±Î¹ÏÎµÎ¯ ÎµÎŸÎ±ÎºÏÎ¯Î²ÏÏÎ· ÎŒÏÎ¿ÏÎµÎ¯ÏÎµ ÎµÏÎ¯ÏÎ·Ï ÎœÎ± ÎµÎ¹ÏÎ¬Î³ÎµÏÎµ ÏÎ¿ ÎÎœÎ¿ÎŒÎ± ÏÏÎ®ÏÏ Î· ÎºÎ±Î¹ ÏÎ¿Îœ ÎÏÎŽÎ¹ÎºÏ ÏÎ±Ï Î³Î¹Î± ÎœÎ± ÏÏÎœÎŽÎµÎžÎµÎ¯ÏÎµ ÏÏÎ¿ ÎÎ¹Î±ÎŽÎ¯ÎºÏÏÎ¿. ÎÎ»Î»Î¹ÏÏ, ÎŒÏÎ¿ÏÎµÎ¯ÏÎµ ÎœÎ± Î±ÏÎ®ÏÎµÏÎµ ÏÎ± ÏÎµÎŽÎ¯Î± Î±ÏÏÎ¬ ÎºÎ±Î¹ÎœÎ¬." #. type: Content of: <html><body><ul><li> #: en/config.html:62 @@ -101,7 +101,7 @@ msgid "" "listening on the ports allowed by your firewall or proxy. Simply enter a " "list of ports permitted by your firewall or proxy, separated by commas. " "(Example: 80,443,8080)" -msgstr "" +msgstr "Î€Î¿ ÏÎµÎ¯ÏÎ¿Ï ÏÏÎ¿ÏÏÎ±ÏÎ¯Î±Ï ÎµÏÎ¹ÏÏÎÏÎµÎ¹ ÏÏÎœÎŽÎÏÎµÎ¹Ï ÎŒÏÎœÎ¿Îœ ÏÎµ ÏÏÎ³ÎºÎµÎºÏÎ¹ÎŒÎÎœÎµÏ ÎžÏÏÎµÏ: ÎÎœ Î²ÏÎ¯ÏÎºÎµÏÏÎµ ÏÎ¯ÏÏ Î±ÏÏ ÏÎµÏÎ¹Î¿ÏÎ¹ÏÏÎ¹ÎºÏ ÏÎµÎ¯ÏÎ¿Ï ÏÏÎ¿ÏÏÎ±ÏÎ¯Î±Ï Î® ÎŽÎ¹Î±ÎºÎ¿ÎŒÎ¹ÏÏÎ® ÎŒÎµÏÎ¿Î»Î¬Î²Î·ÏÎ·Ï ÏÎ¿Ï ÏÎµÏÎ¹Î¿ÏÎ¯Î¶Î¿ÏÎœ ÏÎ¹Ï ÎžÏÏÎµÏ ÏÏÎ¹Ï Î¿ÏÎ¿Î¯ÎµÏ ÎŒÏÎ¿ÏÎµÎ¯ÏÎµ ÎœÎ± ÏÏÎœÎŽÎµÎžÎµÎ¯ÏÎµ, ÎŒÏÎ¿ÏÎµÎ¯ÏÎµ ÎœÎ± ÏÏÎžÎŒÎ¯ÏÎµÏÎµ ÏÎ¿ Tor ÏÏÏÎµ ÎœÎ± ÏÏÎœÎŽÎÎµÏÎ±Î¹ Î±ÏÎµÏÎžÎµÎ¯Î±Ï ÎŒÏÎœÎ¿Îœ ÏÎµ Î±ÎœÎ±ÎŒÎµÏÎ±ÎŽÏÏÎµÏ ÏÎ¿Ï Î±ÎºÏÎ¿Î¬Î¶Î¿ÎœÏÎ±Î¹ ÏÎ¹Ï ÎžÏÏÎµÏ ÏÎ¿Ï ÎµÏÎ¹ÏÏÎÏÎ¿ÎœÏÎ±Î¹ Î±ÏÏ ÏÎ¿ ÏÎµÎ¯ÏÎ¿Ï ÏÏÎ¿ÏÏÎ±ÏÎ¯Î±Ï Î® ÏÎ¿Îœ ÎŽÎ¹Î±ÎºÎ¿ÎŒÎ¹ÏÏÎ® ÎŒÎµÏÎ¿Î»Î¬Î²Î·ÏÎ·Ï. ÎÏÎ»ÏÏ, ÎµÎ¹ÏÎ¬Î³ÎµÏÎµ ÎŒÎ¹Î± Î»Î¯ÏÏÎ± ÎŒÎµ ÏÎ¹Ï ÎµÏÎ¹ÏÏÎµÏÏÎŒÎµÎœÎµÏ Î±ÏÏ ÏÎ¿ ÏÎµÎ¯ÏÎ¿Ï ÏÏÎ¿ÏÏÎ±ÏÎ¯Î±Ï Î® ÏÎ¿Îœ ÎŽÎ¹Î±ÎŒÎµÏÎ¿Î»Î±Î²Î·ÏÎ® ÎžÏÏÎµÏ, ÎŽÎ¹Î±ÏÏÏÎ¹ÏÎŒÎÎœÎµÏ ÎŒÎµ ÎºÏÎŒÎŒÎ±(Î Î±ÏÎ¬ÎŽÎµÎ¹Î³ÎŒÎ±: 80,443,80 80)" #. type: Content of: <html><body><ul><li> #: en/config.html:69

1 0