March 2015 - tor-commits - lists.torproject.org

[tor-browser-bundle/master] Bug 15265: Pull in golang.org/x/net
by gk＠torproject.org 23 Mar '15

23 Mar '15

commit 474bbb5e54acae925a849e77b8ef590e58ee0820 Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Sat Mar 21 14:34:06 2015 +0000 Bug 15265: Pull in golang.org/x/net The new official home for "go.net" is on golang.org, which also uses git instead of hg (yay!). As of the *next* obfs4proxy release the old go.net tarball stuff can be ripped out (leaving it in for the while). --- gitian/descriptors/linux/gitian-pluggable-transports.yml | 12 +++++++++++- gitian/descriptors/mac/gitian-pluggable-transports.yml | 12 +++++++++++- gitian/descriptors/windows/gitian-pluggable-transports.yml | 12 +++++++++++- gitian/fetch-inputs.sh | 1 + gitian/mkbundle-linux.sh | 2 +- gitian/mkbundle-mac.sh | 2 +- gitian/mkbundle-windows.sh | 2 +- gitian/verify-tags.sh | 1 + gitian/versions.alpha | 1 + gitian/versions.nightly | 1 + 10 files changed, 40 insertions(+), 6 deletions(-) diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index 9596b7f..1ae9c0c 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -38,6 +38,8 @@ remotes: "dir": "siphash" - "url": "https://go.googlesource.com/crypto" "dir": "goxcrypto" +- "url": "https://go.googlesource.com/net" + "dir": "goxnet" - "url": "https://git.torproject.org/pluggable-transports/obfs4.git" "dir": "obfs4" files: @@ -253,7 +255,15 @@ script: | go install golang.org/x/crypto/nacl/secretbox cd .. - # Building go.net + # Building golang.org/x/net (obfs4proxy > 0.0.4) + cd goxnet + find -type f | xargs touch --date="$REFERENCE_DATETIME" + mkdir -p "$GOPATH/src/golang.org/x/" + ln -sf "$PWD" "$GOPATH/src/golang.org/x/net" + go install golang.org/x/net/proxy + cd .. + + # Building go.net (obfs4proxy <= 0.0.4) tar xjf go.net.tar.bz2 cd go.net find -type f | xargs touch --date="$REFERENCE_DATETIME" diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index a1bdff9..e2693e1 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -36,6 +36,8 @@ remotes: "dir": "siphash" - "url": "https://go.googlesource.com/crypto" "dir": "goxcrypto" +- "url": "https://go.googlesource.com/net" + "dir": "goxnet" - "url": "https://git.torproject.org/pluggable-transports/obfs4.git" "dir": "obfs4" files: @@ -281,7 +283,15 @@ script: | go install golang.org/x/crypto/nacl/secretbox cd .. - # Building go.net + # Building golang.org/x/net (obfs4proxy > 0.0.4) + cd goxnet + find -type f | xargs touch --date="$REFERENCE_DATETIME" + mkdir -p "$GOPATH/src/golang.org/x/" + ln -sf "$PWD" "$GOPATH/src/golang.org/x/net" + go install golang.org/x/net/proxy + cd .. + + # Building go.net (obfs4proxy <= 0.0.4) tar xjf go.net.tar.bz2 cd go.net find -type f | xargs touch --date="$REFERENCE_DATETIME" diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml index 4ca477e..0f5ec84 100644 --- a/gitian/descriptors/windows/gitian-pluggable-transports.yml +++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml @@ -35,6 +35,8 @@ remotes: "dir": "siphash" - "url": "https://go.googlesource.com/crypto" "dir": "goxcrypto" +- "url": "https://go.googlesource.com/net" + "dir": "goxnet" - "url": "https://git.torproject.org/pluggable-transports/obfs4.git" "dir": "obfs4" files: @@ -359,7 +361,15 @@ script: | go install golang.org/x/crypto/nacl/secretbox cd .. - # Building go.net + # Building golang.org/x/net (obfs4proxy > 0.0.4) + cd goxnet + find -type f | xargs touch --date="$REFERENCE_DATETIME" + mkdir -p "$GOPATH/src/golang.org/x/" + ln -sf "$PWD" "$GOPATH/src/golang.org/x/net" + go install golang.org/x/net/proxy + cd .. + + # Building go.net (obfs4proxy <= 0.0.4) tar xjf go.net.tar.bz2 cd go.net find -type f | xargs touch --date="$REFERENCE_DATETIME" diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 3b3c43a..e86ad6d 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -269,6 +269,7 @@ faketime https://github.com/wolfcw/libfaketime $FAKETIME_TAG ed25519 https://github.com/agl/ed25519.git $GOED25519_TAG siphash https://github.com/dchest/siphash.git $GOSIPHASH_TAG goxcrypto https://go.googlesource.com/crypto $GO_X_CRYPTO_TAG +goxnet https://go.googlesource.com/net $GO_X_NET_TAG obfs4 https://git.torproject.org/pluggable-transports/obfs4.git $OBFS4_TAG EOF diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index f1ef984..15e1384 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -224,7 +224,7 @@ then echo "****** Starting Pluggable Transports Component of Linux Bundle (4/5 for Linux) ******" echo - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,goxcrypto=$GO_X_CRYPTO_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/linux/gitian-pluggable-transports.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,goxcrypto=$GO_X_CRYPTO_TAG,goxnet=$GO_X_NET_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/linux/gitian-pluggable-transports.yml if [ $? -ne 0 ]; then #mv var/build.log ./pluggable-transports-fail-linux.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index 309b1a8..01a9d1b 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -190,7 +190,7 @@ then echo "****** Starting Pluggable Transports Component of Mac Bundle (4/5 for Mac) ******" echo - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,goxcrypto=$GO_X_CRYPTO_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/mac/gitian-pluggable-transports.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,goxcrypto=$GO_X_CRYPTO_TAG,goxnet=$GO_X_NET_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/mac/gitian-pluggable-transports.yml if [ $? -ne 0 ]; then #mv var/build.log ./firefox-fail-mac.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index 0e2f87f..e7bdc87 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -194,7 +194,7 @@ then echo "****** Starting Pluggable Transports Component of Windows Bundle (4/5 for Windows) ******" echo - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,goxcrypto=$GO_X_CRYPTO_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/windows/gitian-pluggable-transports.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,goxcrypto=$GO_X_CRYPTO_TAG,goxnet=$GO_X_NET_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/windows/gitian-pluggable-transports.yml if [ $? -ne 0 ]; then #mv var/build.log ./pluggable-transports-fail-win32.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index eb1e057..79c452b 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -117,6 +117,7 @@ faketime $FAKETIME_TAG ed25519 $GOED25519_TAG siphash $GOSIPHASH_TAG goxcrypto $GO_X_CRYPTO_TAG +goxnet $GO_X_NET_TAG EOF # Verify signatures on signed packages diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 0f49a23..648027a 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -30,6 +30,7 @@ FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6 GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd GO_X_CRYPTO_TAG=4ed45ec682102c643324fae5dff8dab085b6c300 +GO_X_NET_TAG=7dbad50ab5b31073856416cdcfeb2796d682f844 OBFS4_TAG=obfs4proxy-0.0.4 GITIAN_TAG=tor-browser-builder-3.x-7 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 8bbba6e..fba4d87 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -34,6 +34,7 @@ FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6 GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd GO_X_CRYPTO_TAG=master +GO_X_NET_TAG=master OBFS4_TAG=master GITIAN_TAG=tor-browser-builder-3.x-7

1 0

[translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed
by translation＠torproject.org 23 Mar '15

23 Mar '15

commit 1ba8680e0a718ac885c6f49f8d1c7cf0078c20d9 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 23 08:16:19 2015 +0000 Update translations for abouttor-homepage_completed --- zh_TW/aboutTor.dtd | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/zh_TW/aboutTor.dtd b/zh_TW/aboutTor.dtd index ffdec46..a533cc2 100644 --- a/zh_TW/aboutTor.dtd +++ b/zh_TW/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -8,7 +8,7 @@ <!ENTITY aboutTor.outOfDateTorOn.label "然而，此瀏覽器已過時。"> <!ENTITY aboutTor.outOfDateTorOff.label "並且，此瀏覽器已過時。"> -<!ENTITY aboutTor.outOfDate2.label "按一下「洋蔥」圖示，然後選擇「下載 Tor Browser Bundle 更新」。"> +<!ENTITY aboutTor.outOfDate2.label "點擊洋蔥按鈕然後選擇檢查 Tor 瀏覽器更新"> <!ENTITY aboutTor.check.label "測試 Tor 網路設定"> @@ -25,6 +25,7 @@ <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> +<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…"> <!ENTITY aboutTor.torInfo1.label "其他資訊:"> <!ENTITY aboutTor.torInfo2.label "國家和 IP 位址:">

1 0

[translation/abouttor-homepage] Update translations for abouttor-homepage
by translation＠torproject.org 23 Mar '15

23 Mar '15

commit a7ee271eaad47b80220e838413c5ed4a1db41bd1 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 23 08:16:15 2015 +0000 Update translations for abouttor-homepage --- zh_TW/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_TW/aboutTor.dtd b/zh_TW/aboutTor.dtd index 6bf7efb..a533cc2 100644 --- a/zh_TW/aboutTor.dtd +++ b/zh_TW/aboutTor.dtd @@ -8,7 +8,7 @@ <!ENTITY aboutTor.outOfDateTorOn.label "然而，此瀏覽器已過時。"> <!ENTITY aboutTor.outOfDateTorOff.label "並且，此瀏覽器已過時。"> -<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Check for Tor Browser Update."> +<!ENTITY aboutTor.outOfDate2.label "點擊洋蔥按鈕然後選擇檢查 Tor 瀏覽器更新"> <!ENTITY aboutTor.check.label "測試 Tor 網路設定">

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 23 Mar '15

23 Mar '15

commit c3865d4e8c84b375f11de81afb7da3cf8a57f809 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 23 08:16:12 2015 +0000 Update translations for tails-misc_completed --- zh_TW.po | 141 ++++++++++++++++++++++++++++++++++++++------------------------ 1 file changed, 86 insertions(+), 55 deletions(-) diff --git a/zh_TW.po b/zh_TW.po index d7cddab..355291f 100644 --- a/zh_TW.po +++ b/zh_TW.po @@ -6,14 +6,15 @@ # cges30901 <cges30901(a)gmail.com>, 2014 # danfong <danfong.hsieh(a)gmail.com>, 2014 # Po-Chun Huang <aphroteus(a)gmail.com>, 2014 +# x4r <xatierlike(a)gmail.com>, 2015 # LNDDYL, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-12-02 11:29+0100\n" -"PO-Revision-Date: 2014-12-04 08:50+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"POT-Creation-Date: 2015-02-23 16:25+0100\n" +"PO-Revision-Date: 2015-03-23 08:11+0000\n" +"Last-Translator: x4r <xatierlike(a)gmail.com>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/torproject/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -37,15 +38,39 @@ msgid "" "<p><strong>Do not include more personal information than\n" "needed!</strong></p>\n" "<h2>About giving us an email address</h2>\n" -"<p>If you don't mind disclosing some bits of your identity\n" -"to Tails developers, you can provide an email address to\n" -"let us ask more details about the bug. Additionally entering\n" -"a public PGP key enables us to encrypt such future\n" -"communication.</p>\n" -"<p>Anyone who can see this reply will probably infer you are\n" -"a Tails user. Time to wonder how much you trust your\n" -"Internet and mailbox providers?</p>\n" -msgstr "<h1>協助我們修復您的錯誤!</h1>\n<p>閱讀 <a href=\"%s\">我們的錯誤報告說明</a>。</p>\n<p><strong>不要包含比所需還多的個人\n資訊!</strong></p>\n<h2>給我們相關的電子郵件位址</h2>\n<p>如果您不介意透露自己的身份\n給 Tails 開發人員，您可以提供電\n子郵件位址，讓我們詢問更多錯誤\n相關細節。另外輸入公開 PGP 金鑰\n讓我們能對未來通訊加密。</p>\n<p>任何人誰可以看到此回覆可能會\n推斷您是 Tails 的使用者。</p>\n" +"<p>\n" +"Giving us an email address allows us to contact you to clarify the problem. This\n" +"is needed for the vast majority of the reports we receive as most reports\n" +"without any contact information are useless. On the other hand it also provides\n" +"an opportunity for eavesdroppers, like your email or Internet provider, to\n" +"confirm that you are using Tails.\n" +"</p>\n" +msgstr "<h1>幫助我們修復您的 bug！</h1>\n<p>閱讀<a href=\"%s\">我們的 Bug 回報資訊</a>.</p>\n<p><strong>請不要含有任何不必要的個人資訊！</strong></p>\n<h2>關於給我們您的 email 地址</h2>\n<p>\n給我們一個 email 地址能讓我們聯絡您來釐清問題。這是必須的也是我們收到大多數錯誤報告的方式。然而，這也是讓監聽者像是您的 email 或網路供應商機會以確認您正在使用 Tails。\n</p>\n" + +#: config/chroot_local-includes/usr/local/bin/electrum:14 +msgid "Persistence is disabled for Electrum" +msgstr "永久停用 Electrum" + +#: config/chroot_local-includes/usr/local/bin/electrum:16 +msgid "" +"When you reboot Tails, all of Electrum's data will be lost, including your " +"Bitcoin wallet. It is strongly recommended to only run Electrum when its " +"persistence feature is activated." +msgstr "當您重開 Tails 時，所有 Electrum 資料會消失，包括您的比特幣錢包。強烈建議只在當永久功能啟用時才使用 Electrum。" + +#: config/chroot_local-includes/usr/local/bin/electrum:18 +msgid "Do you want to start Electrum anyway?" +msgstr "您想要啟用 Electrum 嗎？" + +#: config/chroot_local-includes/usr/local/bin/electrum:20 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:36 +msgid "_Launch" +msgstr "_Launch" + +#: config/chroot_local-includes/usr/local/bin/electrum:21 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37 +msgid "_Exit" +msgstr "_Exit" #: config/chroot_local-includes/usr/local/bin/gpgApplet:136 msgid "OpenPGP encryption applet" @@ -274,27 +299,27 @@ msgid "" " spoofing documentation</a>." msgstr "看起來像是您被封鎖網路。這可能與 MAC 詐騙功能有關。欲了解更多資訊，請參閱<a href=\\\"file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html#blocked\\\">MAC 詐騙文件</a>。" -#: config/chroot_local-includes/usr/local/bin/tails-security-check:145 +#: config/chroot_local-includes/usr/local/bin/tails-security-check:151 msgid "This version of Tails has known security issues:" msgstr "此 Tails 版本有已知的安全性問題:" -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:29 +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:37 #, sh-format msgid "Network card ${nic} disabled" msgstr "網路卡 ${nic} 被停用" -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:30 +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:38 #, sh-format msgid "" "MAC spoofing failed for network card ${nic_name} (${nic}) so it is temporarily disabled.\n" "You might prefer to restart Tails and disable MAC spoofing. See the <a href='file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html'>documentation</a>." msgstr "網路卡 MAC 詐騙失敗 ${nic_name} (${nic}) 因此它暫時被停用。\n您可能要將 Tails 重新啟動並停用 MAC 詐騙。請參閱 <a href='file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html'>文件</a>." -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:39 +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:47 msgid "All networking disabled" msgstr "所有網路被停用" -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:40 +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:48 #, sh-format msgid "" "MAC spoofing failed for network card ${nic_name} (${nic}). The error recovery also failed so all networking is disabled.\n" @@ -302,12 +327,12 @@ msgid "" msgstr "網路卡 MAC 詐騙失敗 ${nic_name} (${nic})。錯誤還原也失敗，所以所有網路被停用。\n您可能要將 Tails 重新啟動並停用 MAC 詐騙。請參閱 <a href='file:///usr/share/doc/first_steps/startup_options/mac_spoofing.en.html'>文件</a>." #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:19 -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:61 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:22 msgid "error:" msgstr "錯誤:" #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:20 -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:62 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:23 msgid "Error" msgstr "錯誤" @@ -337,9 +362,9 @@ msgstr "主機作業系統和虛擬化軟體都能夠監控您在 Tails 中做 #: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:57 msgid "" "<a " -"href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.en.html'>Learn" +"href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.en.html#security'>Learn" " more...</a>" -msgstr "<a href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.en.html'>了解更多...</a>" +msgstr "<a href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.en.html#security'>了解更多... </a>" #: config/chroot_local-includes/usr/local/bin/tor-browser:18 msgid "Tor is not ready" @@ -357,102 +382,108 @@ msgstr "啟動 Tor 瀏覽器" msgid "Cancel" msgstr "取消" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:72 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:33 msgid "Do you really want to launch the Unsafe Browser?" msgstr "您真的要啟動不安全的瀏覽器嗎?" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:74 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35 msgid "" "Network activity within the Unsafe Browser is <b>not anonymous</b>. Only use" " the Unsafe Browser if necessary, for example if you have to login or " "register to activate your Internet connection." msgstr "在不安全的瀏覽器中的網路活動<b>無法匿名</b>。如有必要，請僅使用不安全的瀏覽器，例如，如果您必須登入或註冊來啟動您的網際網路連線。" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:75 -msgid "_Launch" -msgstr "_Launch" - -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:76 -msgid "_Exit" -msgstr "_Exit" - -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:86 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:47 msgid "Starting the Unsafe Browser..." msgstr "正在啟動不安全的瀏覽器..." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:87 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48 msgid "This may take a while, so please be patient." msgstr "這可能需要一段時間，所以請耐心等候。" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:121 -msgid "Failed to setup chroot." -msgstr "無法設定 chroot。" - -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:195 -#: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1 -msgid "Unsafe Browser" -msgstr "不安全的瀏覽器" - -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:251 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:53 msgid "Shutting down the Unsafe Browser..." msgstr "正在關閉不安全的瀏覽器..." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:252 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54 msgid "" "This may take a while, and you may not restart the Unsafe Browser until it " "is properly shut down." msgstr "這可能需要一段時間，您可能無法將不安全的瀏覽器重新啟動，直到它正確地關閉。" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:264 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:66 msgid "Failed to restart Tor." msgstr "無法重新啟動 Tor。" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:272 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:85 +#: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1 +msgid "Unsafe Browser" +msgstr "不安全的瀏覽器" + +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:93 msgid "" "Another Unsafe Browser is currently running, or being cleaned up. Please " "retry in a while." msgstr "目前正在執行另一個不安全的瀏覽器，或被清理。請在一段時間後重試。" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:285 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:105 +msgid "" +"NetworkManager passed us garbage data when trying to deduce the clearnet DNS" +" server." +msgstr "NetworkManager 通過我們的垃圾資料當試著減少 cleranet DNS server 時" + +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:115 msgid "" "No DNS server was obtained through DHCP or manually configured in " "NetworkManager." msgstr "沒有 DNS 伺服器是透過 DHCP 獲得，或在 NetworkManager 中手動設定。" -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:30 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:123 +msgid "Failed to setup chroot." +msgstr "無法設定 chroot。" + +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:129 +msgid "Failed to configure browser." +msgstr "無法設定瀏覽器" + +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:134 +msgid "Failed to run browser." +msgstr "無法開啟瀏覽器" + +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:31 msgid "I2P failed to start" msgstr "I2P 無法啟動" -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:31 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:32 msgid "" "Something went wrong when I2P was starting. Check the logs in /var/log/i2p " "for more information." msgstr "I2P 啟動時發生錯誤。更多資訊請查看位於 /var/log/i2p 的紀錄檔。" -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:42 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:43 msgid "I2P's router console is ready" msgstr "I2P 的路由控制台已就緒" -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:43 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:44 msgid "You can now access I2P's router console on http://127.0.0.1:7657." msgstr "你現在可以透過 http://127.0.0.1:7657 存取 I2P 路由主控台。" -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:48 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:49 msgid "I2P is not ready" msgstr "I2P 尚未就緒" -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:49 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:50 msgid "" "Eepsite tunnel not built within six minutes. Check the router console at " "http://127.0.0.1:7657/logs or the logs in /var/log/i2p for more information." " Reconnect to the network to try again." msgstr "Eepsite 隧道在六分鐘內沒有建立。請查看 http://127.0.0.1:7657/logs 路由控制台或者位於 /var/log/i2p 的紀錄檔獲得更多資訊。請嘗試重新連線。" -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:59 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:60 msgid "I2P is ready" msgstr "I2P 已就緒" -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:60 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:61 msgid "You can now access services on I2P." msgstr "您現在可以存取I2P服務。"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 23 Mar '15

23 Mar '15

commit fea30bbed23a9e08bf30d0c218da38a58b13dfb4 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 23 08:16:08 2015 +0000 Update translations for tails-misc --- zh_TW.po | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/zh_TW.po b/zh_TW.po index e4f86c8..355291f 100644 --- a/zh_TW.po +++ b/zh_TW.po @@ -6,14 +6,15 @@ # cges30901 <cges30901(a)gmail.com>, 2014 # danfong <danfong.hsieh(a)gmail.com>, 2014 # Po-Chun Huang <aphroteus(a)gmail.com>, 2014 +# x4r <xatierlike(a)gmail.com>, 2015 # LNDDYL, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-02-23 16:25+0100\n" -"PO-Revision-Date: 2015-02-25 08:49+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2015-03-23 08:11+0000\n" +"Last-Translator: x4r <xatierlike(a)gmail.com>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/torproject/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -44,22 +45,22 @@ msgid "" "an opportunity for eavesdroppers, like your email or Internet provider, to\n" "confirm that you are using Tails.\n" "</p>\n" -msgstr "" +msgstr "<h1>幫助我們修復您的 bug！</h1>\n<p>閱讀<a href=\"%s\">我們的 Bug 回報資訊</a>.</p>\n<p><strong>請不要含有任何不必要的個人資訊！</strong></p>\n<h2>關於給我們您的 email 地址</h2>\n<p>\n給我們一個 email 地址能讓我們聯絡您來釐清問題。這是必須的也是我們收到大多數錯誤報告的方式。然而，這也是讓監聽者像是您的 email 或網路供應商機會以確認您正在使用 Tails。\n</p>\n" #: config/chroot_local-includes/usr/local/bin/electrum:14 msgid "Persistence is disabled for Electrum" -msgstr "" +msgstr "永久停用 Electrum" #: config/chroot_local-includes/usr/local/bin/electrum:16 msgid "" "When you reboot Tails, all of Electrum's data will be lost, including your " "Bitcoin wallet. It is strongly recommended to only run Electrum when its " "persistence feature is activated." -msgstr "" +msgstr "當您重開 Tails 時，所有 Electrum 資料會消失，包括您的比特幣錢包。強烈建議只在當永久功能啟用時才使用 Electrum。" #: config/chroot_local-includes/usr/local/bin/electrum:18 msgid "Do you want to start Electrum anyway?" -msgstr "" +msgstr "您想要啟用 Electrum 嗎？" #: config/chroot_local-includes/usr/local/bin/electrum:20 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:36 @@ -363,7 +364,7 @@ msgid "" "<a " "href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.en.html#security'>Learn" " more...</a>" -msgstr "" +msgstr "<a href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.en.html#security'>了解更多... </a>" #: config/chroot_local-includes/usr/local/bin/tor-browser:18 msgid "Tor is not ready" @@ -429,7 +430,7 @@ msgstr "目前正在執行另一個不安全的瀏覽器，或被清理。請在 msgid "" "NetworkManager passed us garbage data when trying to deduce the clearnet DNS" " server." -msgstr "" +msgstr "NetworkManager 通過我們的垃圾資料當試著減少 cleranet DNS server 時" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:115 msgid "" @@ -443,11 +444,11 @@ msgstr "無法設定 chroot。" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:129 msgid "Failed to configure browser." -msgstr "" +msgstr "無法設定瀏覽器" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:134 msgid "Failed to run browser." -msgstr "" +msgstr "無法開啟瀏覽器" #: config/chroot_local-includes/usr/local/sbin/tails-i2p:31 msgid "I2P failed to start"

1 0

[translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
by translation＠torproject.org 23 Mar '15

23 Mar '15

commit 10e382a96cc226a7cd9fd54cc315f15908cf32dc Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 23 08:16:04 2015 +0000 Update translations for tor-launcher-network-settings_completed --- zh_TW/network-settings.dtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/zh_TW/network-settings.dtd b/zh_TW/network-settings.dtd index 05427fa..7abb064 100644 --- a/zh_TW/network-settings.dtd +++ b/zh_TW/network-settings.dtd @@ -9,15 +9,15 @@ <!ENTITY torSettings.firstQuestion "下列哪一項最符合您的情況?"> <!ENTITY torSettings.configurePrompt1 "這部電腦的網路連線是被審查或是有代理的。"> -<!ENTITY torSettings.configurePrompt2 "我需要配置橋接或代理設定。"> +<!ENTITY torSettings.configurePrompt2 "我需要設定橋接或本地代理設定"> <!ENTITY torSettings.configure "設定"> <!ENTITY torSettings.connectPrompt2 "我想直接連接到 Tor 網路。"> <!ENTITY torSettings.connectPrompt3 "這將在大多數情況下生效。"> <!ENTITY torSettings.connect "連接"> -<!ENTITY torSettings.proxyQuestion "這台電腦需要使用代理伺服器來存取網際網路嗎?"> +<!ENTITY torSettings.proxyQuestion "這台電腦需要使用本地代理伺服器來存取網路嗎？">  -<!ENTITY torSettings.proxyHelp "若您不確定如何回答此問題，請查看其他瀏覽器的網際網路設定，看看它是否設定成使用代理伺服器連線。"> +<!ENTITY torSettings.proxyHelp "若您無法確定如何回答這個問題，請查看其他瀏覽器的網路設定，看它是否設定為透過代理伺服器連線。"> <!ENTITY torSettings.enterProxy "輸入代理伺服器設定。"> <!ENTITY torSettings.bridgeQuestion "您的網際網路服務提供者(ISP)阻擋或審查員連接到 Tor 網路?"> <!ENTITY torSettings.bridgeHelp "如果您不確定如何回答此問題，請選擇「否」。  如果您選擇「是」，您將被要求設定Tor 橋接，這讓阻止連接到 Tor 網路更加困難。"> @@ -30,7 +30,7 @@ <!ENTITY torsettings.optional "選用"> -<!ENTITY torsettings.useProxy.checkbox "這台電腦需要使用代理伺服器來存取網際網路"> +<!ENTITY torsettings.useProxy.checkbox "這台電腦需要使用代理伺服器存取網際網路"> <!ENTITY torsettings.useProxy.type "代理伺服器類型:"> <!ENTITY torsettings.useProxy.address "位址:"> <!ENTITY torsettings.useProxy.address.placeholder "IP 位址或主機名稱">

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 23 Mar '15

23 Mar '15

commit d785866fa76b3c83528759fc4ac16b93db59bc22 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 23 08:16:01 2015 +0000 Update translations for tor-launcher-network-settings --- zh_TW/network-settings.dtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/zh_TW/network-settings.dtd b/zh_TW/network-settings.dtd index 65a5d51..7abb064 100644 --- a/zh_TW/network-settings.dtd +++ b/zh_TW/network-settings.dtd @@ -9,15 +9,15 @@ <!ENTITY torSettings.firstQuestion "下列哪一項最符合您的情況?"> <!ENTITY torSettings.configurePrompt1 "這部電腦的網路連線是被審查或是有代理的。"> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings."> +<!ENTITY torSettings.configurePrompt2 "我需要設定橋接或本地代理設定"> <!ENTITY torSettings.configure "設定"> <!ENTITY torSettings.connectPrompt2 "我想直接連接到 Tor 網路。"> <!ENTITY torSettings.connectPrompt3 "這將在大多數情況下生效。"> <!ENTITY torSettings.connect "連接"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> +<!ENTITY torSettings.proxyQuestion "這台電腦需要使用本地代理伺服器來存取網路嗎？">  -<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy."> +<!ENTITY torSettings.proxyHelp "若您無法確定如何回答這個問題，請查看其他瀏覽器的網路設定，看它是否設定為透過代理伺服器連線。"> <!ENTITY torSettings.enterProxy "輸入代理伺服器設定。"> <!ENTITY torSettings.bridgeQuestion "您的網際網路服務提供者(ISP)阻擋或審查員連接到 Tor 網路?"> <!ENTITY torSettings.bridgeHelp "如果您不確定如何回答此問題，請選擇「否」。  如果您選擇「是」，您將被要求設定Tor 橋接，這讓阻止連接到 Tor 網路更加困難。"> @@ -30,7 +30,7 @@ <!ENTITY torsettings.optional "選用"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "這台電腦需要使用代理伺服器存取網際網路"> <!ENTITY torsettings.useProxy.type "代理伺服器類型:"> <!ENTITY torsettings.useProxy.address "位址:"> <!ENTITY torsettings.useProxy.address.placeholder "IP 位址或主機名稱">

1 0

[translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed
by translation＠torproject.org 23 Mar '15

23 Mar '15

commit c224cd79a413b9665e72abbadb7603e237630a42 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 23 08:15:45 2015 +0000 Update translations for tails-persistence-setup_completed --- zh_TW/zh_TW.po | 54 +++++++++++++++++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 23 deletions(-) diff --git a/zh_TW/zh_TW.po b/zh_TW/zh_TW.po index dd663eb..97f2a54 100644 --- a/zh_TW/zh_TW.po +++ b/zh_TW/zh_TW.po @@ -5,15 +5,15 @@ # Translators: # cges30901 <cges30901(a)gmail.com>, 2014 # danfong <danfong.hsieh(a)gmail.com>, 2014 -# x4r <xatierlike(a)gmail.com>, 2014 +# x4r <xatierlike(a)gmail.com>, 2014-2015 # Zakk <zakk0610(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2014-10-08 21:13+0200\n" -"PO-Revision-Date: 2014-10-10 05:20+0000\n" -"Last-Translator: cges30901 <cges30901(a)gmail.com>\n" +"POT-Creation-Date: 2015-02-23 13:07+0100\n" +"PO-Revision-Date: 2015-03-23 08:11+0000\n" +"Last-Translator: x4r <xatierlike(a)gmail.com>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/torproject/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -94,26 +94,34 @@ msgid "Printers configuration" msgstr "印表機設定" #: ../lib/Tails/Persistence/Configuration/Presets.pm:138 +msgid "Bitcoin client" +msgstr "比特幣使用者程式" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:140 +msgid "Electrum's bitcoin wallet and configuration" +msgstr "Electrum 比特幣錢包以及設定" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:148 msgid "APT Packages" msgstr "APT 套件" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:140 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:150 msgid "Packages downloaded by APT" msgstr "透過 APT 下載的套件" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:148 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:158 msgid "APT Lists" msgstr "APT 清單" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:150 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:160 msgid "Lists downloaded by APT" msgstr "透過 APT 下載的清單" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:158 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:168 msgid "Dotfiles" msgstr "Dotfiles" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:160 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:170 msgid "" "Symlink into $HOME every file or directory found in the `dotfiles' directory" msgstr "`dotfiles' 目錄中找到的每個檔案或目錄 Symlink 到 $HOME " @@ -122,67 +130,67 @@ msgstr "`dotfiles' 目錄中找到的每個檔案或目錄 Symlink 到 $HOME " msgid "Setup Tails persistent volume" msgstr "設定 Tails 永久性磁碟區" -#: ../lib/Tails/Persistence/Setup.pm:307 ../lib/Tails/Persistence/Setup.pm:452 +#: ../lib/Tails/Persistence/Setup.pm:307 ../lib/Tails/Persistence/Setup.pm:451 msgid "Error" msgstr "錯誤" -#: ../lib/Tails/Persistence/Setup.pm:339 +#: ../lib/Tails/Persistence/Setup.pm:338 #, perl-format msgid "Device %s already has a persistent volume." msgstr "裝置 %s 已有永久性磁碟區。" -#: ../lib/Tails/Persistence/Setup.pm:347 +#: ../lib/Tails/Persistence/Setup.pm:346 #, perl-format msgid "Device %s has not enough unallocated space." msgstr "裝置 %s 沒有足夠的未配置空間。" -#: ../lib/Tails/Persistence/Setup.pm:355 ../lib/Tails/Persistence/Setup.pm:369 +#: ../lib/Tails/Persistence/Setup.pm:354 ../lib/Tails/Persistence/Setup.pm:368 #, perl-format msgid "Device %s has no persistent volume." msgstr "裝置 %s 沒有永久性磁碟區。" -#: ../lib/Tails/Persistence/Setup.pm:361 +#: ../lib/Tails/Persistence/Setup.pm:360 msgid "" "Cannot delete the persistent volume while in use. You should restart Tails " "without persistence." msgstr "使用中無法刪除永久性磁碟區。您必須重新啟動 Tails 並不使用永久性磁碟區。" -#: ../lib/Tails/Persistence/Setup.pm:380 +#: ../lib/Tails/Persistence/Setup.pm:379 msgid "Persistence volume is not unlocked." msgstr "永久性磁碟區沒有被解除鎖定。" -#: ../lib/Tails/Persistence/Setup.pm:385 +#: ../lib/Tails/Persistence/Setup.pm:384 msgid "Persistence volume is not mounted." msgstr "永久性磁碟區沒有被掛接。" -#: ../lib/Tails/Persistence/Setup.pm:390 +#: ../lib/Tails/Persistence/Setup.pm:389 msgid "Persistence volume is not readable. Permissions or ownership problems?" msgstr "無法讀取永久性磁碟區，權限或是擁有權問題?" -#: ../lib/Tails/Persistence/Setup.pm:395 +#: ../lib/Tails/Persistence/Setup.pm:394 msgid "Persistence volume is not writable. Maybe it was mounted read-only?" msgstr "永久性磁碟區無法寫入。也許它被掛接成唯讀?" -#: ../lib/Tails/Persistence/Setup.pm:404 +#: ../lib/Tails/Persistence/Setup.pm:403 #, perl-format msgid "Tails is running from non-USB / non-SDIO device %s." msgstr "Tails 正從非 USB / 非 SDIO 裝置 %s 執行。" -#: ../lib/Tails/Persistence/Setup.pm:410 +#: ../lib/Tails/Persistence/Setup.pm:409 #, perl-format msgid "Device %s is optical." msgstr "裝置 %s 是可選的。" -#: ../lib/Tails/Persistence/Setup.pm:417 +#: ../lib/Tails/Persistence/Setup.pm:416 #, perl-format msgid "Device %s was not created using Tails Installer." msgstr "裝置 %s 不是用 Tails 安裝程式安裝。" -#: ../lib/Tails/Persistence/Setup.pm:677 +#: ../lib/Tails/Persistence/Setup.pm:676 msgid "Persistence wizard - Finished" msgstr "永久性精靈 - 已完成" -#: ../lib/Tails/Persistence/Setup.pm:680 +#: ../lib/Tails/Persistence/Setup.pm:679 msgid "" "Any changes you have made will only take effect after restarting Tails.\n" "\n"

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 23 Mar '15

23 Mar '15

commit 607912c1eef0879ac715bbcfca88ca6c705e12b5 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 23 08:15:41 2015 +0000 Update translations for tails-persistence-setup --- zh_TW/zh_TW.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/zh_TW/zh_TW.po b/zh_TW/zh_TW.po index 4f4b443..97f2a54 100644 --- a/zh_TW/zh_TW.po +++ b/zh_TW/zh_TW.po @@ -5,15 +5,15 @@ # Translators: # cges30901 <cges30901(a)gmail.com>, 2014 # danfong <danfong.hsieh(a)gmail.com>, 2014 -# x4r <xatierlike(a)gmail.com>, 2014 +# x4r <xatierlike(a)gmail.com>, 2014-2015 # Zakk <zakk0610(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2015-02-23 13:07+0100\n" -"PO-Revision-Date: 2015-02-24 10:24+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2015-03-23 08:11+0000\n" +"Last-Translator: x4r <xatierlike(a)gmail.com>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/torproject/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -95,11 +95,11 @@ msgstr "印表機設定" #: ../lib/Tails/Persistence/Configuration/Presets.pm:138 msgid "Bitcoin client" -msgstr "" +msgstr "比特幣使用者程式" #: ../lib/Tails/Persistence/Configuration/Presets.pm:140 msgid "Electrum's bitcoin wallet and configuration" -msgstr "" +msgstr "Electrum 比特幣錢包以及設定" #: ../lib/Tails/Persistence/Configuration/Presets.pm:148 msgid "APT Packages"

1 0

[translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
by translation＠torproject.org 23 Mar '15

23 Mar '15

commit cbd29200a8e8b91d9581901580d9084d207ec9b1 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 23 08:15:37 2015 +0000 Update translations for liveusb-creator_completed --- zh_TW/zh_TW.po | 106 +++++++++++++++++++++++++++++--------------------------- 1 file changed, 55 insertions(+), 51 deletions(-) diff --git a/zh_TW/zh_TW.po b/zh_TW/zh_TW.po index a5884c5..8cce9bd 100644 --- a/zh_TW/zh_TW.po +++ b/zh_TW/zh_TW.po @@ -10,15 +10,15 @@ # Nicholas Ou <oldmonou(a)gmail.com>, 2014 # Terry Chuang <tchuang(a)redhat.com>, 2009 # Wei-Lun Chao <william.chao(a)ossii.com.tw>, 2009 -# x4r <xatierlike(a)gmail.com>, 2014 +# x4r <xatierlike(a)gmail.com>, 2014-2015 # x4r <xatierlike(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-12-01 18:01+0100\n" -"PO-Revision-Date: 2014-12-07 05:00+0000\n" -"Last-Translator: Nicholas Ou <oldmonou(a)gmail.com>\n" +"POT-Creation-Date: 2015-02-23 13:07+0100\n" +"PO-Revision-Date: 2015-03-23 08:11+0000\n" +"Last-Translator: x4r <xatierlike(a)gmail.com>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/torproject/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -31,22 +31,22 @@ msgstr "" msgid "%(distribution)s Installer" msgstr "%(distribution)s 安裝程式" -#: ../liveusb/gui.py:773 +#: ../liveusb/gui.py:775 #, python-format msgid "%(filename)s selected" msgstr "%(filename)s 已選" -#: ../liveusb/gui.py:423 +#: ../liveusb/gui.py:425 #, python-format msgid "%(size)s %(label)s" msgstr "%(size)s %(label)s" -#: ../liveusb/gui.py:429 +#: ../liveusb/gui.py:431 #, python-format msgid "%(vendor)s %(model)s (%(details)s) - %(device)s" msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s" -#: ../liveusb/creator.py:1059 +#: ../liveusb/creator.py:1063 #, python-format msgid "%s already bootable" msgstr "%s 已經可開機" @@ -103,12 +103,12 @@ msgid "" "persist after a reboot." msgstr "藉由在您的 USB 隨身碟配置額外空間給永久覆蓋，您將能夠在即時作業系統中存放資料和作永久修改。否則，您將無法在重新開機後儲存資料。" -#: ../liveusb/creator.py:1158 ../liveusb/creator.py:1421 +#: ../liveusb/creator.py:1162 ../liveusb/creator.py:1425 #, python-format msgid "Calculating the SHA1 of %s" msgstr "計算 %s 的 SHA1" -#: ../liveusb/creator.py:1369 +#: ../liveusb/creator.py:1373 msgid "Cannot find" msgstr "找不到" @@ -136,7 +136,7 @@ msgstr "複製\n&&\n升級" msgid "Creating %sMB persistent overlay" msgstr "建立 %sMB 永久覆蓋" -#: ../liveusb/gui.py:551 +#: ../liveusb/gui.py:553 msgid "" "Device is not yet mounted, so we cannot determine the amount of free space." msgstr "裝置還沒有掛接，所以我們無法確定可用空間量。" @@ -146,11 +146,11 @@ msgstr "裝置還沒有掛接，所以我們無法確定可用空間量。" msgid "Download %(distribution)s" msgstr "下載 %(distribution)s" -#: ../liveusb/gui.py:747 +#: ../liveusb/gui.py:749 msgid "Download complete!" msgstr "下載完成！" -#: ../liveusb/gui.py:751 +#: ../liveusb/gui.py:753 msgid "Download failed: " msgstr "下載失敗：" @@ -159,7 +159,7 @@ msgstr "下載失敗：" msgid "Downloading %s..." msgstr "正在下載 %s..." -#: ../liveusb/creator.py:1154 +#: ../liveusb/creator.py:1158 msgid "Drive is a loopback, skipping MBR reset" msgstr "磁碟回送，略過 MBR 重設" @@ -168,11 +168,11 @@ msgstr "磁碟回送，略過 MBR 重設" msgid "Entering unmount_device for '%(device)s'" msgstr "進入未掛接裝置 '%(device)s'" -#: ../liveusb/creator.py:1234 +#: ../liveusb/creator.py:1238 msgid "Error probing device" msgstr "探測裝置失敗" -#: ../liveusb/gui.py:211 +#: ../liveusb/gui.py:212 msgid "" "Error: Cannot set the label or obtain the UUID of your device. Unable to " "continue." @@ -188,7 +188,7 @@ msgstr "錯誤：您 Live CD 的 SHA1 無效。您可以使用 --noverify 引數 msgid "Extracting live image to the target device..." msgstr "正在解壓縮即時映像檔到目標設備上..." -#: ../liveusb/creator.py:1102 +#: ../liveusb/creator.py:1106 #, python-format msgid "Formatting %(device)s as FAT32" msgstr "將 %(device)s 格式化成 FAT32 格式" @@ -211,7 +211,7 @@ msgstr "如果您沒有選擇一個現有的 Live ISO，將會替您下載所 msgid "Install Tails" msgstr "安裝 Tails" -#: ../liveusb/gui.py:614 +#: ../liveusb/gui.py:616 msgid "Installation complete!" msgstr "安裝完成！" @@ -220,11 +220,11 @@ msgstr "安裝完成！" msgid "Installation complete! (%s)" msgstr "安裝完成! (%s)" -#: ../liveusb/gui.py:615 +#: ../liveusb/gui.py:617 msgid "Installation was completed. Press OK to close this program." msgstr "安裝已完成，按下「確定」關閉此程式。" -#: ../liveusb/creator.py:959 ../liveusb/creator.py:1275 +#: ../liveusb/creator.py:963 ../liveusb/creator.py:1279 msgid "Installing bootloader..." msgstr "正在安裝 bootloader..." @@ -232,13 +232,13 @@ msgstr "正在安裝 bootloader..." msgid "LiveUSB creation failed!" msgstr "LiveUSB 建立失敗！" -#: ../liveusb/creator.py:1370 +#: ../liveusb/creator.py:1374 msgid "" "Make sure to extract the entire liveusb-creator zip file before running this" " program." msgstr "執行此程式前請先解壓縮整個 libusb-creator zip 檔案。" -#: ../liveusb/creator.py:1246 +#: ../liveusb/creator.py:1250 msgid "" "Make sure your USB key is plugged in and formatted with the FAT filesystem" msgstr "請確認您的 USB 磁碟已插入，並使用 FAT 檔案系統進行格式化" @@ -248,7 +248,7 @@ msgstr "請確認您的 USB 磁碟已插入，並使用 FAT 檔案系統進行 msgid "Mount %s exists after unmounting" msgstr "取消掛接後 %s 掛接仍存在" -#: ../liveusb/gui.py:557 +#: ../liveusb/gui.py:559 #, python-format msgid "No free space on device %(device)s" msgstr "裝置 %(device)s 上的可用空間不足。" @@ -264,11 +264,11 @@ msgid "" "%dMB ISO + %dMB overlay > %dMB free space" msgstr "裝置上的可用空間不足。\n%dMB ISO + %dMB覆蓋 > %dMB可用空間" -#: ../liveusb/gui.py:538 +#: ../liveusb/gui.py:540 msgid "Partition is FAT16; Restricting overlay size to 2G" msgstr "分割區為 FAT16；覆蓋限制大小為 2 GB" -#: ../liveusb/gui.py:534 +#: ../liveusb/gui.py:536 msgid "Partition is FAT32; Restricting overlay size to 4G" msgstr "分割區為 FAT32; 限制重疊大小為 4G" @@ -277,7 +277,7 @@ msgstr "分割區為 FAT32; 限制重疊大小為 4G" msgid "Partitioning device %(device)s" msgstr "分割區裝置 %(device)s" -#: ../liveusb/gui.py:605 +#: ../liveusb/gui.py:607 msgid "Persistent Storage" msgstr "永續性儲存體" @@ -285,19 +285,19 @@ msgstr "永續性儲存體" msgid "Persistent Storage (0 MB)" msgstr "永續性儲存體 (0 MB)" -#: ../liveusb/gui.py:667 ../liveusb/gui.py:696 +#: ../liveusb/gui.py:669 ../liveusb/gui.py:698 msgid "Please confirm your device selection" msgstr "請確認您的裝置選取" -#: ../liveusb/gui.py:451 +#: ../liveusb/gui.py:453 msgid "Refreshing releases..." msgstr "正在重新整理版本..." -#: ../liveusb/gui.py:456 +#: ../liveusb/gui.py:458 msgid "Releases updated!" msgstr "版本已更新!" -#: ../liveusb/creator.py:966 ../liveusb/creator.py:1293 +#: ../liveusb/creator.py:970 ../liveusb/creator.py:1297 #, python-format msgid "Removing %(file)s" msgstr "移除 %(file)s" @@ -306,12 +306,12 @@ msgstr "移除 %(file)s" msgid "Removing existing Live OS" msgstr "移除現有的 Live OS" -#: ../liveusb/creator.py:1148 +#: ../liveusb/creator.py:1152 #, python-format msgid "Resetting Master Boot Record of %s" msgstr "重設 %s 的 MBR 主開機紀錄" -#: ../liveusb/gui.py:758 +#: ../liveusb/gui.py:760 msgid "Select Live ISO" msgstr "選取 Live ISO" @@ -331,7 +331,7 @@ msgid "" "Source type does not support verification of ISO MD5 checksum, skipping" msgstr "來源類型不支援 ISO MD5 總和檢查碼的驗證，略過" -#: ../liveusb/creator.py:1182 +#: ../liveusb/creator.py:1186 msgid "Synchronizing data on disk..." msgstr "正在同步磁碟上的資料..." @@ -339,7 +339,7 @@ msgstr "正在同步磁碟上的資料..." msgid "Target Device" msgstr "目標裝置" -#: ../liveusb/gui.py:761 +#: ../liveusb/gui.py:763 msgid "" "The selected file is unreadable. Please fix its permissions or select " "another file." @@ -383,11 +383,15 @@ msgstr "這個進度列將會表示 LiveUSB 建立過程還需要多久" msgid "This is the status console, where all messages get written to." msgstr "這是狀態主控台，所有訊息都會寫入到這裡。" -#: ../liveusb/creator.py:922 +#: ../liveusb/creator.py:925 msgid "Trying to continue anyway." msgstr "無論如何仍嘗試繼續。" -#: ../liveusb/creator.py:954 +#: ../liveusb/gui.py:407 +msgid "USB drive found" +msgstr "找到 USB 裝置" + +#: ../liveusb/creator.py:958 #, python-format msgid "Unable to change volume label: %(message)s" msgstr "無法變更磁碟區標籤: %(message)s" @@ -406,20 +410,20 @@ msgstr "無法複製 %(infile)s 到 %(outfile)s: %(message)s" msgid "Unable to find any USB drive" msgstr "找不到任何的 USB 裝置" -#: ../liveusb/creator.py:1236 +#: ../liveusb/creator.py:1240 msgid "Unable to find any supported device" msgstr "找不到任何有支援的裝置" -#: ../liveusb/creator.py:1079 +#: ../liveusb/creator.py:1083 msgid "Unable to find partition" msgstr "找不到分割區" -#: ../liveusb/creator.py:1316 +#: ../liveusb/creator.py:1320 msgid "" "Unable to get Win32_LogicalDisk; win32com query did not return any results" msgstr "無法取得 Win32_LogicalDisk; win32com 查詢沒有傳回任何結果" -#: ../liveusb/gui.py:660 +#: ../liveusb/gui.py:662 msgid "Unable to mount device" msgstr "無法掛接裝置" @@ -438,12 +442,12 @@ msgstr "無法從先前的 LiveOS 移除目錄: %(message)s" msgid "Unable to remove file from previous LiveOS: %(message)s" msgstr "無法從先前的 LiveOS 移除檔案: %(message)s" -#: ../liveusb/creator.py:1151 +#: ../liveusb/creator.py:1155 msgid "" "Unable to reset MBR. You may not have the `syslinux` package installed." msgstr "無法重設 MBR。您可能沒有安裝 `syslinux` 套件。" -#: ../liveusb/gui.py:767 +#: ../liveusb/gui.py:769 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:\\)" @@ -463,7 +467,7 @@ msgstr "未知的 ISO，略過總和檢查碼驗證" msgid "Unknown dbus exception while trying to mount device: %(message)s" msgstr "掛接裝置時發生未知的 dbus 例外: %(message)s" -#: ../liveusb/creator.py:779 ../liveusb/creator.py:933 +#: ../liveusb/creator.py:779 ../liveusb/creator.py:937 msgid "Unknown filesystem. Your device may need to be reformatted." msgstr "未知的檔案系統。您的裝置可能需要重新格式化。" @@ -482,12 +486,12 @@ msgstr "正在卸載 '%(udi)s' 在 '%(device)s'" msgid "Unmounting mounted filesystems on '%(device)s'" msgstr "正在卸載掛接在 '%(device)s' 上的檔案系統" -#: ../liveusb/creator.py:919 +#: ../liveusb/creator.py:922 #, python-format msgid "Unsupported device '%(device)s', please report a bug." msgstr "不支援的裝置 '%(device)s'，請報告錯誤。" -#: ../liveusb/creator.py:784 ../liveusb/creator.py:936 +#: ../liveusb/creator.py:784 ../liveusb/creator.py:940 #, python-format msgid "Unsupported filesystem: %s" msgstr "不支援的檔案系統：%s" @@ -499,7 +503,7 @@ msgid "" "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 & Install\" action instead." msgstr "不支援的檔案系統: %s\n如果您要升級手動安裝的 Tails 系統 (也就是說，它不是用這個安裝程式來安裝)，不支援此選項：你必須重新安裝然後開始，例如:選擇「複製並安裝」動作代替。" -#: ../liveusb/creator.py:1249 +#: ../liveusb/creator.py:1253 #, python-format msgid "" "Unsupported filesystem: %s\n" @@ -531,11 +535,11 @@ msgstr "驗證 LiveCD 映像檔的 SHA1 總和檢查碼..." msgid "Verifying SHA256 checksum of LiveCD image..." msgstr "驗證 LiveCD 映像檔的 SHA256 總和檢查碼..." -#: ../liveusb/creator.py:930 ../liveusb/creator.py:1242 +#: ../liveusb/creator.py:934 ../liveusb/creator.py:1246 msgid "Verifying filesystem..." msgstr "正在驗證檔案系統..." -#: ../liveusb/gui.py:694 +#: ../liveusb/gui.py:696 msgid "" "Warning: Creating a new persistent overlay will delete your existing one." msgstr "警告：建立新的持續性覆蓋層將會刪除您現有的持續性覆蓋層。" @@ -552,14 +556,14 @@ msgstr "警告：此工具需以系統管理員身分執行。請對圖示按滑 msgid "Wrote to device at %(speed)d MB/sec" msgstr "以 %(speed)d MB/秒的速度寫入裝置" -#: ../liveusb/gui.py:668 +#: ../liveusb/gui.py:670 #, 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 "您即將安裝 Tails 在 %(size)s %(vendor)s %(model)s 裝置 (%(device)s)。所有在所選裝置上的資料將會遺失。繼續嗎?" -#: ../liveusb/gui.py:684 +#: ../liveusb/gui.py:686 #, python-format msgid "" "You are going to upgrade Tails on the %(parent_size)s %(vendor)s %(model)s " @@ -573,7 +577,7 @@ msgid "" "ext4 filesystem" msgstr "您正使用舊版 syslinux-extlinux，不支援 ext4 檔案系統" -#: ../liveusb/gui.py:752 +#: ../liveusb/gui.py:754 msgid "You can try again to resume your download" msgstr "您可再次嘗試來繼續您的下載"

1 0