January 2018 - tor-commits - lists.torproject.org

[tor/master] Merge remote-tracking branch 'ffmancera/github/bug24573'
by nickm＠torproject.org 11 Jan '18

11 Jan '18

commit 7a606004111d8d12d4d90b26697bc9bab02b0227 Merge: c8c258a43 525c1c493 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 11 08:31:25 2018 -0500 Merge remote-tracking branch 'ffmancera/github/bug24573' changes/ticket24573 | 7 +++++++ src/or/bridges.c | 59 +++++++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 57 insertions(+), 9 deletions(-)

1 0

[tor/master] Set IPv6 preferences for bridges even if there is no ri.
by nickm＠torproject.org 11 Jan '18

11 Jan '18

commit 525c1c493ea2bcab724919c1f2b3117c5db870f6 Author: Fernando Fernandez Mancera <ffernandezmancera(a)gmail.com> Date: Tue Jan 2 15:28:15 2018 +0100 Set IPv6 preferences for bridges even if there is no ri. Tor now sets IPv6 preferences on rewrite_node_address_for_bridge() even if there is only ri or rs. It always warns about them. Also Tor now sets the IPv6 address in rs as well as it sets the one in ri. Fixes #24572 on 9e9edf7 in 0.2.4.5-alpha. Fixes #24573 on c213f27 in 0.2.8.2-alpha. Signed-off-by: Fernando Fernandez Mancera <ffernandezmancera(a)gmail.com> --- changes/ticket24573 | 7 +++++++ src/or/bridges.c | 59 +++++++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 57 insertions(+), 9 deletions(-) diff --git a/changes/ticket24573 b/changes/ticket24573 new file mode 100644 index 000000000..3026c1a12 --- /dev/null +++ b/changes/ticket24573 @@ -0,0 +1,7 @@ + o Minor bugfixes (IPv6 preferences on bridges): + - Tor now always sets IPv6 preferences for bridges, even if there is only + router information or router status and warns about them. Fixes bug + 24573; bugfix on c213f277cde in 0.2.8.2-alpha. + - Tor now sets IPv6 address in rs as well as it's set the one in ri. Closes + ticket 24572; bugfix on 9e9edf71f7d in 0.2.4.5-alpha. + Patch by "ffmancera". diff --git a/src/or/bridges.c b/src/or/bridges.c index 0b1bbbd15..204ff2684 100644 --- a/src/or/bridges.c +++ b/src/or/bridges.c @@ -716,7 +716,6 @@ rewrite_node_address_for_bridge(const bridge_info_t *bridge, node_t *node) if (node->ri) { routerinfo_t *ri = node->ri; tor_addr_from_ipv4h(&addr, ri->addr); - if ((!tor_addr_compare(&bridge->addr, &addr, CMP_EXACT) && bridge->port == ri->or_port) || (!tor_addr_compare(&bridge->addr, &ri->ipv6_addr, CMP_EXACT) && @@ -774,16 +773,58 @@ rewrite_node_address_for_bridge(const bridge_info_t *bridge, node_t *node) routerstatus_t *rs = node->rs; tor_addr_from_ipv4h(&addr, rs->addr); - if (!tor_addr_compare(&bridge->addr, &addr, CMP_EXACT) && - bridge->port == rs->or_port) { + if ((!tor_addr_compare(&bridge->addr, &addr, CMP_EXACT) && + bridge->port == rs->or_port) || + (!tor_addr_compare(&bridge->addr, &rs->ipv6_addr, CMP_EXACT) && + bridge->port == rs->ipv6_orport)) { /* they match, so no need to do anything */ } else { - rs->addr = tor_addr_to_ipv4h(&bridge->addr); - rs->or_port = bridge->port; - log_info(LD_DIR, - "Adjusted bridge routerstatus for '%s' to match " - "configured address %s.", - rs->nickname, fmt_addrport(&bridge->addr, rs->or_port)); + if (tor_addr_family(&bridge->addr) == AF_INET) { + rs->addr = tor_addr_to_ipv4h(&bridge->addr); + rs->or_port = bridge->port; + log_info(LD_DIR, + "Adjusted bridge routerstatus for '%s' to match " + "configured address %s.", + rs->nickname, fmt_addrport(&bridge->addr, rs->or_port)); + /* set IPv6 preferences even if there is no ri */ + } else if (tor_addr_family(&bridge->addr) == AF_INET6) { + tor_addr_copy(&rs->ipv6_addr, &bridge->addr); + rs->ipv6_orport = bridge->port; + log_info(LD_DIR, + "Adjusted bridge routerstatus for '%s' to match configured" + " address %s.", + rs->nickname, fmt_addrport(&rs->ipv6_addr, rs->ipv6_orport)); + } else { + log_err(LD_BUG, "Address family not supported: %d.", + tor_addr_family(&bridge->addr)); + return; + } + } + + if (options->ClientPreferIPv6ORPort == -1) { + /* Mark which address to use based on which bridge_t we got. */ + node->ipv6_preferred = (tor_addr_family(&bridge->addr) == AF_INET6 && + !tor_addr_is_null(&node->rs->ipv6_addr)); + } else { + /* Mark which address to use based on user preference */ + node->ipv6_preferred = (fascist_firewall_prefer_ipv6_orport(options) && + !tor_addr_is_null(&node->rs->ipv6_addr)); + } + + /* XXXipv6 we lack support for falling back to another address for + the same relay, warn the user */ + if (!tor_addr_is_null(&rs->ipv6_addr)) { + tor_addr_port_t ap; + node_get_pref_orport(node, &ap); + log_notice(LD_CONFIG, + "Bridge '%s' has both an IPv4 and an IPv6 address. " + "Will prefer using its %s address (%s) based on %s.", + rs->nickname, + node->ipv6_preferred ? "IPv6" : "IPv4", + fmt_addrport(&ap.addr, ap.port), + options->ClientPreferIPv6ORPort == -1 ? + "the configured Bridge address" : + "ClientPreferIPv6ORPort"); } } }

1 0

[translation/torbutton-abouttorproperties_completed] Update translations for torbutton-abouttorproperties_completed
by translation＠torproject.org 11 Jan '18

11 Jan '18

commit cd72065f79e224d0966e94755f39a2f3bb95cc04 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 11 12:18:41 2018 +0000 Update translations for torbutton-abouttorproperties_completed --- zh_CN/abouttor.properties | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/zh_CN/abouttor.properties b/zh_CN/abouttor.properties index 0bd6766fc..1ef742ee2 100644 --- a/zh_CN/abouttor.properties +++ b/zh_CN/abouttor.properties @@ -7,3 +7,14 @@ aboutTor.searchDDG.privacy=使用<a href="%2$S">DuckDuckGo</a><a href="%1$S">安 aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchDDG.search.link=https://duckduckgo.com/ + +aboutTor.donationBanner.donate=立即捐助！ + +aboutTor.donationBanner.slogan=Tor:提供数据防护 +aboutTor.donationBanner.mozilla=立即捐助，Mozilla将会采取配额捐赠行动。 + +aboutTor.donationBanner.tagline1=自2006年起保护记者，告密者&活动家 +aboutTor.donationBanner.tagline2=世界范围内的网络自由 +aboutTor.donationBanner.tagline3=网络自由 +aboutTor.donationBanner.tagline4=世界范围内的言论自由 +aboutTor.donationBanner.tagline5=每日保护百万人的隐私

1 0

[translation/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties
by translation＠torproject.org 11 Jan '18

11 Jan '18

commit b2fcbd6b714cea195baebc57ed5f27c1a4707a2d Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 11 12:18:34 2018 +0000 Update translations for torbutton-abouttorproperties --- zh_CN/abouttor.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN/abouttor.properties b/zh_CN/abouttor.properties index 729400d6c..1ef742ee2 100644 --- a/zh_CN/abouttor.properties +++ b/zh_CN/abouttor.properties @@ -11,7 +11,7 @@ aboutTor.searchDDG.search.link=https://duckduckgo.com/ aboutTor.donationBanner.donate=立即捐助！ aboutTor.donationBanner.slogan=Tor:提供数据防护 -aboutTor.donationBanner.mozilla=Give today and Mozilla will match your gift! +aboutTor.donationBanner.mozilla=立即捐助，Mozilla将会采取配额捐赠行动。 aboutTor.donationBanner.tagline1=自2006年起保护记者，告密者&活动家 aboutTor.donationBanner.tagline2=世界范围内的网络自由

1 0

[translation/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties
by translation＠torproject.org 11 Jan '18

11 Jan '18

commit d125a5f777628cb4ebe32f8d90bd38ebdaf33503 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 11 11:48:31 2018 +0000 Update translations for torbutton-abouttorproperties --- zh_CN/abouttor.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/zh_CN/abouttor.properties b/zh_CN/abouttor.properties index 11033d541..729400d6c 100644 --- a/zh_CN/abouttor.properties +++ b/zh_CN/abouttor.properties @@ -10,11 +10,11 @@ aboutTor.searchDDG.search.link=https://duckduckgo.com/ aboutTor.donationBanner.donate=立即捐助！ -aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance +aboutTor.donationBanner.slogan=Tor:提供数据防护 aboutTor.donationBanner.mozilla=Give today and Mozilla will match your gift! aboutTor.donationBanner.tagline1=自2006年起保护记者，告密者&活动家 -aboutTor.donationBanner.tagline2=Networking Freedom Worldwide -aboutTor.donationBanner.tagline3=Freedom Online -aboutTor.donationBanner.tagline4=Fostering Free Expression Worldwide +aboutTor.donationBanner.tagline2=世界范围内的网络自由 +aboutTor.donationBanner.tagline3=网络自由 +aboutTor.donationBanner.tagline4=世界范围内的言论自由 aboutTor.donationBanner.tagline5=每日保护百万人的隐私

1 0

[translation/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties
by translation＠torproject.org 11 Jan '18

11 Jan '18

commit a89f5cabd2e31eea9137e18461bcc37653e3bd7e Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 11 11:18:35 2018 +0000 Update translations for torbutton-abouttorproperties --- zh_CN/abouttor.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_CN/abouttor.properties b/zh_CN/abouttor.properties index 391b60939..11033d541 100644 --- a/zh_CN/abouttor.properties +++ b/zh_CN/abouttor.properties @@ -13,8 +13,8 @@ aboutTor.donationBanner.donate=立即捐助！ aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance aboutTor.donationBanner.mozilla=Give today and Mozilla will match your gift! -aboutTor.donationBanner.tagline1=Protecting Journalists, Whistleblowers, & Activists Since 2006 +aboutTor.donationBanner.tagline1=自2006年起保护记者，告密者&活动家 aboutTor.donationBanner.tagline2=Networking Freedom Worldwide aboutTor.donationBanner.tagline3=Freedom Online aboutTor.donationBanner.tagline4=Fostering Free Expression Worldwide -aboutTor.donationBanner.tagline5=Protecting the Privacy of Millions Every Day +aboutTor.donationBanner.tagline5=每日保护百万人的隐私

1 0

[translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
by translation＠torproject.org 11 Jan '18

11 Jan '18

commit b7890e0646c5bff2f9af0a18fed07670083e12d6 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 11 11:15:58 2018 +0000 Update translations for liveusb-creator_completed --- zh_CN/zh_CN.po | 357 +++++++++++++++++++++++---------------------------------- 1 file changed, 144 insertions(+), 213 deletions(-) diff --git a/zh_CN/zh_CN.po b/zh_CN/zh_CN.po index 16bd3286a..82393f6e3 100644 --- a/zh_CN/zh_CN.po +++ b/zh_CN/zh_CN.po @@ -4,13 +4,15 @@ # # Translators: # khi, 2013 +# Birkhoff <simonpond(a)outlook.com>, 2017 # Chi-Hsun Tsai, 2017 # g ghost, 2017 # paperbag, 2016 # bnw, 2014 # JasonZ <pbbqdd(a)gmail.com>, 2015 # khi, 2015 -# kwh(Kim Wan-Ho) <14alpaca(a)gmail.com>, 2013 +# kwh(Kim Wan-Ho), 2013 +# Lafrenze Laurant <lusciniacyanbird(a)gmail.com>, 2018 # leungsookfan <leung.sookfan(a)riseup.net>, 2014 # xtoaster <zhazhenzhong(a)gmail.com>, 2012 # Sanya chang <408070986(a)qq.com>, 2013 @@ -23,9 +25,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-06-30 13:14+0200\n" -"PO-Revision-Date: 2017-07-17 18:48+0000\n" -"Last-Translator: Yu Zhou\n" +"POT-Creation-Date: 2017-11-10 15:57+0100\n" +"PO-Revision-Date: 2018-01-11 11:02+0000\n" +"Last-Translator: Lafrenze Laurant <lusciniacyanbird(a)gmail.com>\n" "Language-Team: Chinese (China) (http://www.transifex.com/otf/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -33,262 +35,257 @@ msgstr "" "Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ../tails_installer/creator.py:100 +#: ../tails_installer/creator.py:101 msgid "You must run this application as root" msgstr "你必须使用root权限来运行本程序" -#: ../tails_installer/creator.py:146 +#: ../tails_installer/creator.py:147 msgid "Extracting live image to the target device..." msgstr "提取实况映像给目标设备..." -#: ../tails_installer/creator.py:153 +#: ../tails_installer/creator.py:154 #, python-format msgid "Wrote to device at %(speed)d MB/sec" msgstr "写入设备，写入速度 %(speed)d MB/s" -#: ../tails_installer/creator.py:183 +#: ../tails_installer/creator.py:184 msgid "Setting up OLPC boot file..." msgstr "正在设定 OLPC 启动文件..." -#: ../tails_installer/creator.py:302 +#: ../tails_installer/creator.py:315 #, python-format msgid "" "There was a problem executing the following command: `%(command)s`.\n" "A more detailed error log has been written to '%(filename)s'." msgstr "执行以下指令时出错:‘%(command)s’。\n更详细的错误日志已写入‘%(filename)s’。" -#: ../tails_installer/creator.py:321 +#: ../tails_installer/creator.py:334 msgid "Verifying SHA1 checksum of LiveCD image..." msgstr "正在验证 LiveCD 映像的 SHA1 校验值..." -#: ../tails_installer/creator.py:325 +#: ../tails_installer/creator.py:338 msgid "Verifying SHA256 checksum of LiveCD image..." msgstr "正在验证 LiveCD 映像的 SHA256 校验值..." -#: ../tails_installer/creator.py:341 +#: ../tails_installer/creator.py:354 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 参数运行本程序来绕过验证。" -#: ../tails_installer/creator.py:347 +#: ../tails_installer/creator.py:360 msgid "Unknown ISO, skipping checksum verification" msgstr "未知的 ISO，正在跳过校验值验证" -#: ../tails_installer/creator.py:358 +#: ../tails_installer/creator.py:371 #, python-format msgid "" "Not enough free space on device.\n" "%dMB ISO + %dMB overlay > %dMB free space" msgstr "设备可用空间不足。\n%dMB ISO + %dMB 覆盖 > %dMB 可用空间" -#: ../tails_installer/creator.py:365 +#: ../tails_installer/creator.py:378 #, python-format msgid "Creating %sMB persistent overlay" msgstr "正在创建 %sMB 持久覆盖" -#: ../tails_installer/creator.py:426 +#: ../tails_installer/creator.py:439 #, python-format msgid "Unable to copy %(infile)s to %(outfile)s: %(message)s" msgstr "无法复制 %(infile)s 至 %(outfile)s : %(message)s" -#: ../tails_installer/creator.py:440 +#: ../tails_installer/creator.py:453 msgid "Removing existing Live OS" msgstr "正在移除现存的 Live OS" -#: ../tails_installer/creator.py:449 ../tails_installer/creator.py:460 +#: ../tails_installer/creator.py:462 ../tails_installer/creator.py:473 #, python-format msgid "Unable to chmod %(file)s: %(message)s" msgstr "无法更改权限 %(file)s：%(message)s" -#: ../tails_installer/creator.py:453 +#: ../tails_installer/creator.py:466 #, python-format msgid "Unable to remove file from previous LiveOS: %(message)s" msgstr "无法从之前的 LiveOS 中删除文件：%(message)s" -#: ../tails_installer/creator.py:465 +#: ../tails_installer/creator.py:478 #, python-format msgid "Unable to remove directory from previous LiveOS: %(message)s" msgstr "无法从之前的 LiveOS 中删除目录：%(message)s" -#: ../tails_installer/creator.py:513 +#: ../tails_installer/creator.py:526 #, python-format msgid "Cannot find device %s" msgstr "无法找到设备 %s" -#: ../tails_installer/creator.py:678 +#: ../tails_installer/creator.py:695 #, python-format msgid "Unable to write on %(device)s, skipping." msgstr "无法向 %(device)s 中写入，正在跳过。" -#: ../tails_installer/creator.py:697 +#: ../tails_installer/creator.py:719 #, python-format msgid "" "Some partitions of the target device %(device)s are mounted. They will be " "unmounted before starting the installation process." msgstr "目标设备的一些分区 %(device)s 已经加载，并将在安装过程开始之前卸载。" -#: ../tails_installer/creator.py:740 ../tails_installer/creator.py:964 +#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:974 msgid "Unknown filesystem. Your device may need to be reformatted." msgstr "未知的文件系统。您的设备也许需要重新格式化。" -#: ../tails_installer/creator.py:743 ../tails_installer/creator.py:967 +#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:977 #, python-format msgid "Unsupported filesystem: %s" msgstr "不支持的文件系统：%s" -#: ../tails_installer/creator.py:760 +#: ../tails_installer/creator.py:782 #, python-format msgid "Unknown GLib exception while trying to mount device: %(message)s" -msgstr "尝试安装下列设备时遇到未知的 GLib 异常：%(message)s" +msgstr "尝试挂载设备时遇到未知的 GLib 异常：%(message)s" -#: ../tails_installer/creator.py:764 +#: ../tails_installer/creator.py:786 #, python-format msgid "Unable to mount device: %(message)s" msgstr "无法挂载设备：%(message)s" -#: ../tails_installer/creator.py:769 +#: ../tails_installer/creator.py:791 msgid "No mount points found" msgstr "未找到挂载点" -#: ../tails_installer/creator.py:780 +#: ../tails_installer/creator.py:802 #, python-format msgid "Entering unmount_device for '%(device)s'" msgstr "输入 '%(device)s' 的卸载设备" -#: ../tails_installer/creator.py:790 +#: ../tails_installer/creator.py:812 #, python-format msgid "Unmounting mounted filesystems on '%(device)s'" msgstr "卸载 '%(device)s' 上的已挂载文件系统" -#: ../tails_installer/creator.py:794 +#: ../tails_installer/creator.py:816 #, python-format msgid "Unmounting '%(udi)s' on '%(device)s'" msgstr "卸载 '%(device)s' 上的 '%(udi)s'" -#: ../tails_installer/creator.py:804 +#: ../tails_installer/creator.py:826 #, python-format msgid "Mount %s exists after unmounting" msgstr "卸载之后掛载已存在 %s " -#: ../tails_installer/creator.py:817 +#: ../tails_installer/creator.py:839 #, python-format msgid "Partitioning device %(device)s" msgstr "分区设备 %(device)s" -#: ../tails_installer/creator.py:895 -#, python-format -msgid "Updating properties of system partition %(system_partition)s" -msgstr "更新系统分区属性 %(system_partition)s" - -#: ../tails_installer/creator.py:949 +#: ../tails_installer/creator.py:959 #, python-format msgid "Unsupported device '%(device)s', please report a bug." msgstr "不是支持的设备'%(device)s',请报告此故障。" -#: ../tails_installer/creator.py:952 +#: ../tails_installer/creator.py:962 msgid "Trying to continue anyway." msgstr "无论如何正在尝试继续" -#: ../tails_installer/creator.py:961 ../tails_installer/creator.py:1354 +#: ../tails_installer/creator.py:971 ../tails_installer/creator.py:1364 msgid "Verifying filesystem..." msgstr "正在验证文件系统..." -#: ../tails_installer/creator.py:985 +#: ../tails_installer/creator.py:995 #, python-format msgid "Unable to change volume label: %(message)s" msgstr "无法改变卷标: %(message)s" -#: ../tails_installer/creator.py:990 ../tails_installer/creator.py:1387 +#: ../tails_installer/creator.py:1000 ../tails_installer/creator.py:1397 msgid "Installing bootloader..." msgstr "正在安装引导程序..." -#: ../tails_installer/creator.py:1016 +#: ../tails_installer/creator.py:1026 #, python-format msgid "Could not find the '%s' COM32 module" msgstr "无法找到“%s” COM32 模块" -#: ../tails_installer/creator.py:1024 ../tails_installer/creator.py:1405 +#: ../tails_installer/creator.py:1034 ../tails_installer/creator.py:1415 #, python-format msgid "Removing %(file)s" msgstr "正在移除 %(file)s" -#: ../tails_installer/creator.py:1136 +#: ../tails_installer/creator.py:1146 #, python-format msgid "%s already bootable" msgstr "%s 已经是可引导盘" -#: ../tails_installer/creator.py:1156 +#: ../tails_installer/creator.py:1166 msgid "Unable to find partition" msgstr "找不到分区" -#: ../tails_installer/creator.py:1179 +#: ../tails_installer/creator.py:1189 #, python-format msgid "Formatting %(device)s as FAT32" msgstr "正在格式化 %(device)s 为 FAT32 格式" -#: ../tails_installer/creator.py:1239 +#: ../tails_installer/creator.py:1249 msgid "Could not find syslinux' gptmbr.bin" msgstr "无法找到 syslinux 的 gptmbr.bin" -#: ../tails_installer/creator.py:1252 +#: ../tails_installer/creator.py:1262 #, python-format msgid "Reading extracted MBR from %s" -msgstr "读取从 %s 提取的 MBR" +msgstr "正在读取从 %s 提取的 MBR" -#: ../tails_installer/creator.py:1256 +#: ../tails_installer/creator.py:1266 #, python-format msgid "Could not read the extracted MBR from %(path)s" msgstr "无法读取从 %(path)s 提取的 MBR" -#: ../tails_installer/creator.py:1269 ../tails_installer/creator.py:1270 +#: ../tails_installer/creator.py:1279 ../tails_installer/creator.py:1280 #, python-format msgid "Resetting Master Boot Record of %s" msgstr "正在重置 %s 的 MBR" -#: ../tails_installer/creator.py:1275 +#: ../tails_installer/creator.py:1285 msgid "Drive is a loopback, skipping MBR reset" msgstr "驱动器为环回，跳过 MBR 重设" -#: ../tails_installer/creator.py:1279 ../tails_installer/creator.py:1533 +#: ../tails_installer/creator.py:1289 ../tails_installer/creator.py:1543 #, python-format msgid "Calculating the SHA1 of %s" msgstr "正在计算 %s 的 SHA1 校验值" -#: ../tails_installer/creator.py:1304 +#: ../tails_installer/creator.py:1314 msgid "Synchronizing data on disk..." msgstr "正在同步硬盘中的数据..." -#: ../tails_installer/creator.py:1346 +#: ../tails_installer/creator.py:1356 msgid "Error probing device" msgstr "检测设备时出错" -#: ../tails_installer/creator.py:1348 +#: ../tails_installer/creator.py:1358 msgid "Unable to find any supported device" msgstr "无法找到任何支持的设备。" -#: ../tails_installer/creator.py:1358 +#: ../tails_installer/creator.py:1368 msgid "" "Make sure your USB key is plugged in and formatted with the FAT filesystem" msgstr "请确认你的U盘已插入并已用 FAT 文件系统格式化" -#: ../tails_installer/creator.py:1361 +#: ../tails_installer/creator.py:1371 #, python-format msgid "" "Unsupported filesystem: %s\n" "Please backup and format your USB key with the FAT filesystem." msgstr "不支持的文件系统：%s\n请备份并用 FAT 文件系统格式化你的U盘" -#: ../tails_installer/creator.py:1428 +#: ../tails_installer/creator.py:1438 msgid "" "Unable to get Win32_LogicalDisk; win32com query did not return any results" msgstr "无法调用 Win32_LogicalDisk 函数；win32com 查询未返回任何结果" -#: ../tails_installer/creator.py:1481 +#: ../tails_installer/creator.py:1491 msgid "Cannot find" msgstr "找不到" -#: ../tails_installer/creator.py:1482 +#: ../tails_installer/creator.py:1492 msgid "" "Make sure to extract the entire tails-installer zip file before running this" " program." @@ -304,150 +301,155 @@ msgstr "未知发行版：%s" msgid "Downloading %s..." msgstr "正在下载 %s..." -#: ../tails_installer/gui.py:204 +#: ../tails_installer/gui.py:211 msgid "" "Error: Cannot set the label or obtain the UUID of your device. Unable to " "continue." msgstr "错误：无法设定标签或获得你设备的UUID。不能继续。" -#: ../tails_installer/gui.py:253 +#: ../tails_installer/gui.py:258 #, python-format msgid "Installation complete! (%s)" msgstr "安装完成! (%s)" -#: ../tails_installer/gui.py:258 +#: ../tails_installer/gui.py:263 msgid "Tails installation failed!" msgstr "Tails 安装失败！" -#: ../tails_installer/gui.py:353 +#: ../tails_installer/gui.py:363 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 "警告: 本工具需要以管理员权限运行。请右键单击本工具的快捷方式图标，在文件属性的兼容性选项卡中的选中\"以管理员身份运行此程序\"。" -#: ../tails_installer/gui.py:365 ../tails_installer/launcher.py:31 +#: ../tails_installer/gui.py:375 msgid "Tails Installer" msgstr "Tails 安装程序" -#: ../tails_installer/gui.py:440 -msgid "No device suitable to install Tails could be found" -msgstr "找不到适合安装 Tails 的设备" +#: ../tails_installer/gui.py:456 +msgid "Upgrade" +msgstr "升级" -#: ../tails_installer/gui.py:442 -#, python-format -msgid "Please plug a USB flash drive or SD card of at least %0.1f GB." -msgstr "请插入容量大小至少为 %0.1f GB 的 U 盘或 SD 卡。" +#: ../tails_installer/gui.py:462 ../data/tails-installer.ui.h:7 +msgid "Install" +msgstr "安装" -#: ../tails_installer/gui.py:474 +#: ../tails_installer/gui.py:469 #, python-format -msgid "%(size)s %(label)s" -msgstr "%(size)s %(label)s" +msgid "%(size)s %(vendor)s %(model)s device (%(device)s)" +msgstr "%(size)s%(vendor)s%(model)s设备（%(device)s）" + +#: ../tails_installer/gui.py:481 +msgid "No ISO image selected" +msgstr "无选中的ISO映像" + +#: ../tails_installer/gui.py:482 +msgid "Please select a Tails ISO image." +msgstr "请选择一个Tails的ISO映像。" + +#: ../tails_installer/gui.py:521 +msgid "No device suitable to install Tails could be found" +msgstr "找不到适合安装 Tails 的设备" -#: ../tails_installer/gui.py:480 +#: ../tails_installer/gui.py:523 #, python-format -msgid "%(vendor)s %(model)s (%(details)s) - %(device)s" -msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s" +msgid "Please plug a USB flash drive or SD card of at least %0.1f GB." +msgstr "请插入容量 %0.1f GB 以上的的 U 盘或 SD 卡。" -#: ../tails_installer/gui.py:488 +#: ../tails_installer/gui.py:557 #, python-format msgid "" "The USB stick \"%(pretty_name)s\" is configured as non-removable by its " "manufacturer and Tails will fail to start on it. Please try installing on a " "different model." -msgstr "此USB移动存储设备\"%(pretty_name)s\"被生产厂商配置为非可移动磁盘，Tail无法在其上启动。请尝试在其他移动存储设备上安装。" +msgstr "此USB移动存储设备\"%(pretty_name)s\"被生产厂商配置为不可移动磁盘，Tail无法从其上启动。请尝试在其他移动存储设备上安装。" -#: ../tails_installer/gui.py:498 +#: ../tails_installer/gui.py:567 #, python-format msgid "" "The device \"%(pretty_name)s\" is too small to install Tails (at least " "%(size)s GB is required)." msgstr "设备“%(pretty_name)s”太小，不足以安装 Tails（需要至少 %(size)s GB 的空间）。" -#: ../tails_installer/gui.py:511 -msgid "\"Install by cloning\"" -msgstr "通过克隆安装" - -#: ../tails_installer/gui.py:513 -msgid "\"Install from ISO\"" -msgstr "“从 ISO 安装”" - -#: ../tails_installer/gui.py:514 -#, python-format -msgid "" -"It is impossible to upgrade the device %(pretty_name)s because it was not " -"created using Tails Installer. You should instead use %(action)s to upgrade " -"Tails on this device." -msgstr "不可能升级设备 %(pretty_name)s，它并非通过 Tails 安装程序创建。您应该改用 %(action)s 来升级此设备上的 Tails。" - -#: ../tails_installer/gui.py:533 +#: ../tails_installer/gui.py:589 msgid "An error happened while installing Tails" msgstr "安装 Tails 时发生错误" -#: ../tails_installer/gui.py:545 +#: ../tails_installer/gui.py:601 msgid "Refreshing releases..." msgstr "刷新发布..." -#: ../tails_installer/gui.py:550 +#: ../tails_installer/gui.py:606 msgid "Releases updated!" msgstr "发布已更新！" -#: ../tails_installer/gui.py:589 +#: ../tails_installer/gui.py:648 msgid "Installation complete!" msgstr "安装完成!" -#: ../tails_installer/gui.py:590 +#: ../tails_installer/gui.py:649 msgid "Installation was completed." msgstr "安装完成。" -#: ../tails_installer/gui.py:635 +#: ../tails_installer/gui.py:698 msgid "Unable to mount device" msgstr "无法挂载设备" -#: ../tails_installer/gui.py:642 ../tails_installer/gui.py:670 -msgid "Please confirm your device selection" -msgstr "请确认你的设备选项" +#: ../tails_installer/gui.py:705 ../tails_installer/gui.py:735 +msgid "Confirm the target USB stick" +msgstr "确认目标USB存储器" -#: ../tails_installer/gui.py:643 +#: ../tails_installer/gui.py:706 #, python-format msgid "" -"You are going to install Tails on the %(size)s %(vendor)s %(model)s device " -"(%(device)s). All data on the selected device will be lost. Continue?" -msgstr "您将在%(size)s %(vendor)s %(model)s 磁盘 (%(device)s)安装Tails。在您选择的磁盘上的所有数据将会丢失。是否继续？" +"%(size)s %(vendor)s %(model)s device (%(device)s)\n" +"\n" +"All data on this USB stick will be lost." +msgstr "%(size)s%(vendor)s%(model)s磁盘（%(device)s）\n\n此USB存储器上的所有数据将会丢失。" -#: ../tails_installer/gui.py:660 +#: ../tails_installer/gui.py:722 #, python-format +msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)" +msgstr "%(parent_size)s%(vendor)s%(model)s设备（%(device)s）" + +#: ../tails_installer/gui.py:730 msgid "" -"You are going to upgrade Tails on the %(parent_size)s %(vendor)s %(model)s " -"device (%(device)s). Any persistent volume on this device will remain " -"unchanged. Continue?" -msgstr "您正在升级 %(parent_size)s %(vendor)s %(model)s 设备 (%(device)s) 上的Tails.任何在此磁盘上的持久存储区将会保持不变。是否继续？" +"\n" +"\n" +"The persistent storage on this USB stick will be preserved." +msgstr "\n\nUSB存储器上现存的永久存储将会被保留。" -#: ../tails_installer/gui.py:716 +#: ../tails_installer/gui.py:731 +#, python-format +msgid "%(description)s%(persistence_message)s" +msgstr "%(description)s%(persistence_message)s" + +#: ../tails_installer/gui.py:781 msgid "Download complete!" msgstr "下载完成！" -#: ../tails_installer/gui.py:720 +#: ../tails_installer/gui.py:785 msgid "Download failed: " msgstr "下载失败！" -#: ../tails_installer/gui.py:721 +#: ../tails_installer/gui.py:786 msgid "You can try again to resume your download" msgstr "你可以重试续传你的下载" -#: ../tails_installer/gui.py:729 +#: ../tails_installer/gui.py:794 msgid "" "The selected file is unreadable. Please fix its permissions or select " "another file." msgstr "选中文件不可读。请修改其许可或选择其他文件。" -#: ../tails_installer/gui.py:735 +#: ../tails_installer/gui.py:800 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 "无法使用所选文件。您可以将文件移动到磁盘根目录后再试(例如 C:\\)" -#: ../tails_installer/gui.py:741 +#: ../tails_installer/gui.py:806 #, python-format msgid "%(filename)s selected" msgstr "%(filename)s 已选取" @@ -477,7 +479,7 @@ msgstr "“%s” 不存在" #: ../tails_installer/source.py:65 #, python-format msgid "'%s' is not a directory" -msgstr "“%s” 不是目录" +msgstr "“%s” 不是一个文件夹" #: ../tails_installer/source.py:75 #, python-format @@ -491,101 +493,30 @@ msgid "" "%s" msgstr "执行 %s 时发生错误。%s%s" -#: ../tails_installer/utils.py:119 +#: ../tails_installer/utils.py:124 msgid "Could not open device for writing." -msgstr "无法打开设备的写入模式。" +msgstr "无法向设备中写入数据。" #: ../data/tails-installer.ui.h:1 -msgid "Use existing Live system ISO:" -msgstr "使用现有的 Live 系统 ISO：" +msgid "Installation Instructions" +msgstr "安装说明" #: ../data/tails-installer.ui.h:2 -msgid "Select a distribution to download:" -msgstr "选择一个要下载的发行版：" +msgid "Clone the current Tails" +msgstr "克隆当前的Tails" #: ../data/tails-installer.ui.h:3 -msgid "Target Device:" -msgstr "目标设备：" +msgid "Use a downloaded Tails ISO image" +msgstr "使用下载的Tails ISO映像" #: ../data/tails-installer.ui.h:4 -msgid "Install Tails" -msgstr "安装Tails" - -#: ../data/tails-installer-launcher.ui.h:1 -msgid "" -"To run Tails Installer you need an ISO image which can be downloaded from " -"the Tails website: <a " -"href=\"https://tails.boum.org/download/\">https://tails.boum.org/download/</a>" -msgstr "运行 Tails 安装程序之前您需要从 Tails 网站 <a href=\"https://tails.boum.org/download/\">https://tails.boum.org/download/</a> 下载 ISO 镜像。" - -#: ../data/tails-installer-launcher.ui.h:2 -msgid "Install" -msgstr "安装" - -#: ../data/tails-installer-launcher.ui.h:3 -msgid "• Install Tails on a new USB stick." -msgstr "在新 U 盘上安装 Tails。" - -#: ../data/tails-installer-launcher.ui.h:4 -msgid "• The USB stick that you install on is formatted and all data is lost." -msgstr "您用于安装的 U 盘已被格式化，清除了所有数据。" - -#: ../data/tails-installer-launcher.ui.h:5 -msgid "Upgrade" -msgstr "升级" - -#: ../data/tails-installer-launcher.ui.h:6 -msgid "• Upgrade a Tails USB stick to the version of an ISO image." -msgstr "升级 Tails U盘到 ISO 镜像的版本。" - -#: ../data/tails-installer-launcher.ui.h:7 -msgid "" -"• The encrypted persistent storage of the Tails USB stick that you upgrade " -"is preserved." -msgstr "你升级的USB移动存储上Tails系统的加密永久存储被被保留了。" - -#: ../data/tails-installer-launcher.ui.h:8 -msgid "" -"Need help? Read the <a " -"href=\"https://tails.boum.org/doc/first_steps/installation/\">documentation</a>" -msgstr "需要帮助？查看<a href=\"https://tails.boum.org/doc/first_steps/installation/\">文档</a>" - -#: ../data/tails-installer-launcher.ui.h:9 -msgid "Install by cloning" -msgstr "通过克隆安装" - -#: ../data/tails-installer-launcher.ui.h:10 -msgid "" -"• Install Tails on another USB stick by copying the Tails system that you " -"are currently using." -msgstr "通过复制你正在使用的Tails系统，安装Tails到另一个USB移动存储设备。" - -#: ../data/tails-installer-launcher.ui.h:11 -msgid "" -"• The encrypted persistent storage of the Tails USB stick that you are " -"currently using is not copied." -msgstr "你正在使用的USB移动存储上的Tails的加密永久存储不会被复制。" - -#: ../data/tails-installer-launcher.ui.h:12 -msgid "Upgrade by cloning" -msgstr "通过克隆升级" - -#: ../data/tails-installer-launcher.ui.h:13 -msgid "" -"• Upgrade another Tails USB stick to the same version of Tails that you are " -"currently using." -msgstr "升级其他 Tails U盘到您正在使用的 Tails 版本" - -#: ../data/tails-installer-launcher.ui.h:14 -msgid "Upgrade from ISO" -msgstr "从 ISO 升级" +msgid "Select a distribution to download:" +msgstr "选择一个您想要下载的发行版：" -#: ../data/tails-installer-launcher.ui.h:15 -msgid "• Upgrade another Tails USB stick to the version of an ISO image." -msgstr "• 升级另一个 Tails U盘到一个 ISO 镜像的版本。" +#: ../data/tails-installer.ui.h:5 +msgid "Target USB stick:" +msgstr "目标USB存储器：" -#: ../data/tails-installer-launcher.ui.h:16 -msgid "" -"Need help? Read the <a " -"href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\">documentation</a>" -msgstr "需要帮助？查看<a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\">文档</a>" +#: ../data/tails-installer.ui.h:6 +msgid "Reinstall (delete all data)" +msgstr "重新安装（删除所有数据）"

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 11 Jan '18

11 Jan '18

commit 69df48dd90cb6de1e2bdab981324af7f562859a3 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 11 11:15:53 2018 +0000 Update translations for liveusb-creator --- zh_CN/zh_CN.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_CN/zh_CN.po b/zh_CN/zh_CN.po index 372db34f3..82393f6e3 100644 --- a/zh_CN/zh_CN.po +++ b/zh_CN/zh_CN.po @@ -26,7 +26,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-11-10 15:57+0100\n" -"PO-Revision-Date: 2018-01-11 10:45+0000\n" +"PO-Revision-Date: 2018-01-11 11:02+0000\n" "Last-Translator: Lafrenze Laurant <lusciniacyanbird(a)gmail.com>\n" "Language-Team: Chinese (China) (http://www.transifex.com/otf/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -411,7 +411,7 @@ msgstr "%(size)s%(vendor)s%(model)s磁盘（%(device)s）\n\n此USB存储器上 #: ../tails_installer/gui.py:722 #, python-format msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)" -msgstr "" +msgstr "%(parent_size)s%(vendor)s%(model)s设备（%(device)s）" #: ../tails_installer/gui.py:730 msgid ""

1 0

[translation/exoneratorproperties_completed] Update translations for exoneratorproperties_completed
by translation＠torproject.org 11 Jan '18

11 Jan '18

commit a26021d5c70021ab031c4d3fcb0ad8385750e3ff Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 11 10:50:50 2018 +0000 Update translations for exoneratorproperties_completed --- zh_CN/exonerator.properties | 2 ++ 1 file changed, 2 insertions(+) diff --git a/zh_CN/exonerator.properties b/zh_CN/exonerator.properties index 43c8ff3f6..5795dceed 100644 --- a/zh_CN/exonerator.properties +++ b/zh_CN/exonerator.properties @@ -19,6 +19,8 @@ summary.invalidparams.invalidip.title=无效的 IP 地址参数 summary.invalidparams.invalidip.body=抱歉，%s 不是一个有效的 IP 地址。预期的 IP 地址格式是 %s 或 %s。 summary.invalidparams.invalidtimestamp.title=无效的日期参数 summary.invalidparams.invalidtimestamp.body=抱歉，%s 不是一个有效的日期。预期的日期格式是 %s。 +summary.invalidparams.timestamptoorecent.title=日期参数太过接近当前时间 +summary.invalidparams.timestamptoorecent.body=数据库尚未包含足够的数据正确的回应此请求，因为最新接受的数据为前天的数据。请基于其他日期进行搜索。 summary.serverproblem.nodata.title=服务器问题 summary.serverproblem.nodata.body.text=数据库在请求日期的不包含任何数据。请稍后再试。如果问题持续存在，请%s！ summary.serverproblem.nodata.body.link=告知我们

1 0

[translation/exoneratorproperties] Update translations for exoneratorproperties
by translation＠torproject.org 11 Jan '18

11 Jan '18

commit bcd38fa5db74df1feea1a8725d55411f50bb61a2 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 11 10:50:44 2018 +0000 Update translations for exoneratorproperties --- zh_CN/exonerator.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_CN/exonerator.properties b/zh_CN/exonerator.properties index 904770792..5795dceed 100644 --- a/zh_CN/exonerator.properties +++ b/zh_CN/exonerator.properties @@ -19,8 +19,8 @@ summary.invalidparams.invalidip.title=无效的 IP 地址参数 summary.invalidparams.invalidip.body=抱歉，%s 不是一个有效的 IP 地址。预期的 IP 地址格式是 %s 或 %s。 summary.invalidparams.invalidtimestamp.title=无效的日期参数 summary.invalidparams.invalidtimestamp.body=抱歉，%s 不是一个有效的日期。预期的日期格式是 %s。 -summary.invalidparams.timestamptoorecent.title=Date parameter too recent -summary.invalidparams.timestamptoorecent.body=The database may not yet contain enough data to correctly answer this request. The latest accepted data is the day before yesterday. Please repeat your search on another day. +summary.invalidparams.timestamptoorecent.title=日期参数太过接近当前时间 +summary.invalidparams.timestamptoorecent.body=数据库尚未包含足够的数据正确的回应此请求，因为最新接受的数据为前天的数据。请基于其他日期进行搜索。 summary.serverproblem.nodata.title=服务器问题 summary.serverproblem.nodata.body.text=数据库在请求日期的不包含任何数据。请稍后再试。如果问题持续存在，请%s！ summary.serverproblem.nodata.body.link=告知我们

1 0