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

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

27 Nov '16

commit ddf2a427da830edcf13fb8fdf34fb65abb709af8 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 27 13:45:33 2016 +0000 Update translations for liveusb-creator_completed --- zh_TW/zh_TW.po | 62 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/zh_TW/zh_TW.po b/zh_TW/zh_TW.po index 060ec45..cf1d5bb 100644 --- a/zh_TW/zh_TW.po +++ b/zh_TW/zh_TW.po @@ -9,9 +9,9 @@ # Chinrur Yang <chinrur(a)gmail.com>, 2013 # danfong <danfong.hsieh(a)gmail.com>, 2014 # David Chen <david203812(a)gmail.com>, 2015 -# Kin Kwok, 2016 +# 大圈洋蔥, 2016 # muraji saori <muraji(a)tormail.org>, 2013 -# Nicholas Ou <oldmonou(a)gmail.com>, 2014 +# Nicholas Ou <oldmon(a)livemail.tw>, 2014 # Terry Chuang <tchuang(a)redhat.com>, 2009 # Wei-Lun Chao <william.chao(a)ossii.com.tw>, 2009 # Wen-Gan Li <wgli(a)wgli.net>, 2015 @@ -22,8 +22,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-02 21:23+0100\n" -"PO-Revision-Date: 2016-04-13 03:26+0000\n" -"Last-Translator: Kin Kwok\n" +"PO-Revision-Date: 2016-11-27 13:45+0000\n" +"Last-Translator: Agustín Wu <losangwuyts(a)gmail.com>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/otf/torproject/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -47,7 +47,7 @@ msgstr "%(distribution)s 安裝程式" #: ../liveusb/gui.py:804 #, python-format msgid "%(filename)s selected" -msgstr "%(filename)s 已選" +msgstr "%(filename)s 已選取" #: ../liveusb/gui.py:424 #, python-format @@ -129,7 +129,7 @@ msgstr "藉由在您的 USB 隨身碟配置額外空間給永久覆蓋，您將 #: ../liveusb/creator.py:1196 ../liveusb/creator.py:1459 #, python-format msgid "Calculating the SHA1 of %s" -msgstr "計算 %s 的 SHA1" +msgstr "正在計算 %s 的 SHA1 雜湊碼" #: ../liveusb/creator.py:1407 msgid "Cannot find" @@ -148,7 +148,7 @@ msgstr "建立 %sMB 永久覆蓋" #: ../liveusb/gui.py:582 msgid "" "Device is not yet mounted, so we cannot determine the amount of free space." -msgstr "裝置還沒有掛接，所以我們無法確定可用空間量。" +msgstr "裝置尚未掛載，所以我們無法確定可用空間容量。" #: ../liveusb/dialog.py:164 #, python-format @@ -175,7 +175,7 @@ msgstr "磁碟回送，略過 MBR 重設" #: ../liveusb/creator.py:837 #, python-format msgid "Entering unmount_device for '%(device)s'" -msgstr "進入未掛接裝置 '%(device)s'" +msgstr "進入未掛載裝置 '%(device)s'" #: ../liveusb/creator.py:1272 msgid "Error probing device" @@ -191,7 +191,7 @@ msgstr "錯誤：無法設定標籤或取得裝置的 UUID，無法繼續。" 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:155 msgid "Extracting live image to the target device..." @@ -200,7 +200,7 @@ msgstr "正在解壓縮即時映像檔到目標設備上..." #: ../liveusb/creator.py:1140 #, python-format msgid "Formatting %(device)s as FAT32" -msgstr "將 %(device)s 格式化成 FAT32 格式" +msgstr "正將 %(device)s 格式化成 FAT32 格式" #: ../liveusb/creator.py:150 msgid "ISO MD5 checksum passed" @@ -214,7 +214,7 @@ msgstr "ISO MD5 總和檢查碼驗證失敗" msgid "" "If you do not select an existing Live ISO, the selected release will be " "downloaded for you." -msgstr "如果您沒有選擇一個現有的 Live ISO，將會替您下載所選的版本。" +msgstr "如果您沒有選擇一個現有的 Live ISO，將會替您下載所選的版本。" #: ../liveusb/launcher_ui.py:154 msgid "" @@ -249,7 +249,7 @@ 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 。" +msgstr "由於裝置 %(pretty_name)s 不是由 Tails 安裝程式所創建，故不能進行升級。應使用 %(action)s 去升級此裝置上的 Tails 。" #: ../liveusb/gui.py:270 msgid "LiveUSB creation failed!" @@ -264,12 +264,12 @@ msgstr "執行此程式前請先解壓縮整個 libusb-creator zip 檔案。" #: ../liveusb/creator.py:1284 msgid "" "Make sure your USB key is plugged in and formatted with the FAT filesystem" -msgstr "請確認您的 USB 磁碟已插入，並使用 FAT 檔案系統進行格式化" +msgstr "請確認您的 USB 磁碟已插入，並且已被格式化成 FAT 檔案系統" #: ../liveusb/creator.py:859 #, python-format msgid "Mount %s exists after unmounting" -msgstr "取消掛接後 %s 掛接仍存在" +msgstr "取消掛載後 %s 掛載仍存在" #: ../liveusb/gui.py:588 #, python-format @@ -278,7 +278,7 @@ msgstr "裝置 %(device)s 上的可用空間不足。" #: ../liveusb/creator.py:826 msgid "No mount points found" -msgstr "找不到掛接點" +msgstr "找不到掛載點" #: ../liveusb/creator.py:410 #, python-format @@ -289,28 +289,28 @@ msgstr "裝置上的可用空間不足。\n%dMB ISO + %dMB覆蓋 > %dMB可用空 #: ../liveusb/gui.py:569 msgid "Partition is FAT16; Restricting overlay size to 2G" -msgstr "分割區為 FAT16；覆蓋限制大小為 2 GB" +msgstr "分割區為 FAT16 檔案系統；限制重疊區大小為 2 GB" #: ../liveusb/gui.py:565 msgid "Partition is FAT32; Restricting overlay size to 4G" -msgstr "分割區為 FAT32; 限制重疊大小為 4G" +msgstr "分割區為 FAT32 檔案系統; 限制重疊區大小為 4G" #: ../liveusb/creator.py:236 ../liveusb/creator.py:866 #, python-format msgid "Partitioning device %(device)s" -msgstr "分割區裝置 %(device)s" +msgstr "正在為 %(device)s 建立分割區" #: ../liveusb/gui.py:636 msgid "Persistent Storage" -msgstr "永續性儲存體" +msgstr "永久性儲存裝置" #: ../liveusb/dialog.py:168 msgid "Persistent Storage (0 MB)" -msgstr "永續性儲存體 (0 MB)" +msgstr "永久性儲存裝置 (0 MB)" #: ../liveusb/gui.py:698 ../liveusb/gui.py:727 msgid "Please confirm your device selection" -msgstr "請確認您的裝置選取" +msgstr "請確認您所選取的裝置" #: ../liveusb/gui.py:481 msgid "Refreshing releases..." @@ -318,16 +318,16 @@ msgstr "正在重新整理版本..." #: ../liveusb/gui.py:486 msgid "Releases updated!" -msgstr "版本已更新!" +msgstr "版本已更新！" #: ../liveusb/creator.py:997 ../liveusb/creator.py:1331 #, python-format msgid "Removing %(file)s" -msgstr "移除 %(file)s" +msgstr "正在移除 %(file)s" #: ../liveusb/creator.py:492 msgid "Removing existing Live OS" -msgstr "移除現有的 Live OS" +msgstr "正在移除現有的 Live OS" #: ../liveusb/creator.py:1186 #, python-format @@ -347,12 +347,12 @@ msgstr "設定 OLPC 開機檔案..." msgid "" "Some partitions of the target device %(device)s are mounted. They will be " "unmounted before starting the installation process." -msgstr "目標裝置 %(device)s 中一些分割區已掛接。它們將在開始安裝過程前被卸載。" +msgstr "目標裝置 %(device)s 中有些分割區已經被掛載。它們將在開始安裝前被自動卸載。" #: ../liveusb/creator.py:141 msgid "" "Source type does not support verification of ISO MD5 checksum, skipping" -msgstr "來源類型不支援 ISO MD5 總和檢查碼的驗證，略過" +msgstr "來源類型不支援 ISO MD5 總和檢查碼的驗證功能，略過" #: ../liveusb/creator.py:1220 msgid "Synchronizing data on disk..." @@ -367,13 +367,13 @@ msgstr "目標裝置" 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的空間)。" +msgstr "“%(pretty_name)s”設備的容量太小，無法安裝Tails (至少需要 %(size)s GB 的空間)。" #: ../liveusb/gui.py:792 msgid "" "The selected file is unreadable. Please fix its permissions or select " "another file." -msgstr "所選檔案無法讀取。請修正其權限或選擇另一個檔案。" +msgstr "所選取的檔案無法讀取，請修改該檔案之存取權限或選擇另一個檔案。" #: ../liveusb/creator.py:354 #, python-format @@ -387,7 +387,7 @@ msgid "" "This button allows you to browse for an existing Live system ISO that you " "have previously downloaded. If you do not select one, a release will be " "downloaded for you automatically." -msgstr "此按鈕讓您可以瀏覽先前已下載的 Live 系統 ISO。如果您沒有選擇的話，將會自動為您下載一個版本。" +msgstr "此按鈕讓您可以瀏覽先前已下載的 Live 系統之 ISO 檔，如果您沒有選取的話，程式將會自動為您下載一個版本。" #: ../liveusb/dialog.py:171 msgid "" @@ -395,13 +395,13 @@ msgid "" "optionally downloading a release (if an existing one wasn't selected), " "extracting the ISO to the USB device, creating the persistent overlay, and " "installing the bootloader." -msgstr "此按鈕將開始 LiveUSB 建立過程。這需要選擇性地下載一個版本 (如果沒有選擇一個現有版本的話)，將 ISO 解壓縮到 USB 裝置，建立永久覆蓋，然後安裝 bootloader。" +msgstr "此按鈕將啟動 LiveUSB 建立程序。這將會選擇性地下載一個版本 (如果您沒有選取任何現有版本的話)，再將 ISO 解壓縮到 USB 裝置，並建立永久性重疊區，然後會安裝系統之啟動載入程式。" #: ../liveusb/dialog.py:165 msgid "" "This is the USB stick that you want to install your Live system on. This " "device must be formatted with the FAT filesystem." -msgstr "這是您想安裝您的即時系統的 USB 隨身碟。此裝置必須使用 FAT 檔案系統來格式化。" +msgstr "這是您想安裝 Live 系統的 USB 隨身碟。此裝置必須是已被格式化成 FAT 檔案系統。" #: ../liveusb/dialog.py:170 msgid ""

1 0

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

27 Nov '16

commit 794402d6024ba2a83cef6eae54f3c74162673bf4 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 27 13:45:29 2016 +0000 Update translations for liveusb-creator --- zh_TW/zh_TW.po | 62 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/zh_TW/zh_TW.po b/zh_TW/zh_TW.po index 060ec45..cf1d5bb 100644 --- a/zh_TW/zh_TW.po +++ b/zh_TW/zh_TW.po @@ -9,9 +9,9 @@ # Chinrur Yang <chinrur(a)gmail.com>, 2013 # danfong <danfong.hsieh(a)gmail.com>, 2014 # David Chen <david203812(a)gmail.com>, 2015 -# Kin Kwok, 2016 +# 大圈洋蔥, 2016 # muraji saori <muraji(a)tormail.org>, 2013 -# Nicholas Ou <oldmonou(a)gmail.com>, 2014 +# Nicholas Ou <oldmon(a)livemail.tw>, 2014 # Terry Chuang <tchuang(a)redhat.com>, 2009 # Wei-Lun Chao <william.chao(a)ossii.com.tw>, 2009 # Wen-Gan Li <wgli(a)wgli.net>, 2015 @@ -22,8 +22,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-02 21:23+0100\n" -"PO-Revision-Date: 2016-04-13 03:26+0000\n" -"Last-Translator: Kin Kwok\n" +"PO-Revision-Date: 2016-11-27 13:45+0000\n" +"Last-Translator: Agustín Wu <losangwuyts(a)gmail.com>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/otf/torproject/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -47,7 +47,7 @@ msgstr "%(distribution)s 安裝程式" #: ../liveusb/gui.py:804 #, python-format msgid "%(filename)s selected" -msgstr "%(filename)s 已選" +msgstr "%(filename)s 已選取" #: ../liveusb/gui.py:424 #, python-format @@ -129,7 +129,7 @@ msgstr "藉由在您的 USB 隨身碟配置額外空間給永久覆蓋，您將 #: ../liveusb/creator.py:1196 ../liveusb/creator.py:1459 #, python-format msgid "Calculating the SHA1 of %s" -msgstr "計算 %s 的 SHA1" +msgstr "正在計算 %s 的 SHA1 雜湊碼" #: ../liveusb/creator.py:1407 msgid "Cannot find" @@ -148,7 +148,7 @@ msgstr "建立 %sMB 永久覆蓋" #: ../liveusb/gui.py:582 msgid "" "Device is not yet mounted, so we cannot determine the amount of free space." -msgstr "裝置還沒有掛接，所以我們無法確定可用空間量。" +msgstr "裝置尚未掛載，所以我們無法確定可用空間容量。" #: ../liveusb/dialog.py:164 #, python-format @@ -175,7 +175,7 @@ msgstr "磁碟回送，略過 MBR 重設" #: ../liveusb/creator.py:837 #, python-format msgid "Entering unmount_device for '%(device)s'" -msgstr "進入未掛接裝置 '%(device)s'" +msgstr "進入未掛載裝置 '%(device)s'" #: ../liveusb/creator.py:1272 msgid "Error probing device" @@ -191,7 +191,7 @@ msgstr "錯誤：無法設定標籤或取得裝置的 UUID，無法繼續。" 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:155 msgid "Extracting live image to the target device..." @@ -200,7 +200,7 @@ msgstr "正在解壓縮即時映像檔到目標設備上..." #: ../liveusb/creator.py:1140 #, python-format msgid "Formatting %(device)s as FAT32" -msgstr "將 %(device)s 格式化成 FAT32 格式" +msgstr "正將 %(device)s 格式化成 FAT32 格式" #: ../liveusb/creator.py:150 msgid "ISO MD5 checksum passed" @@ -214,7 +214,7 @@ msgstr "ISO MD5 總和檢查碼驗證失敗" msgid "" "If you do not select an existing Live ISO, the selected release will be " "downloaded for you." -msgstr "如果您沒有選擇一個現有的 Live ISO，將會替您下載所選的版本。" +msgstr "如果您沒有選擇一個現有的 Live ISO，將會替您下載所選的版本。" #: ../liveusb/launcher_ui.py:154 msgid "" @@ -249,7 +249,7 @@ 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 。" +msgstr "由於裝置 %(pretty_name)s 不是由 Tails 安裝程式所創建，故不能進行升級。應使用 %(action)s 去升級此裝置上的 Tails 。" #: ../liveusb/gui.py:270 msgid "LiveUSB creation failed!" @@ -264,12 +264,12 @@ msgstr "執行此程式前請先解壓縮整個 libusb-creator zip 檔案。" #: ../liveusb/creator.py:1284 msgid "" "Make sure your USB key is plugged in and formatted with the FAT filesystem" -msgstr "請確認您的 USB 磁碟已插入，並使用 FAT 檔案系統進行格式化" +msgstr "請確認您的 USB 磁碟已插入，並且已被格式化成 FAT 檔案系統" #: ../liveusb/creator.py:859 #, python-format msgid "Mount %s exists after unmounting" -msgstr "取消掛接後 %s 掛接仍存在" +msgstr "取消掛載後 %s 掛載仍存在" #: ../liveusb/gui.py:588 #, python-format @@ -278,7 +278,7 @@ msgstr "裝置 %(device)s 上的可用空間不足。" #: ../liveusb/creator.py:826 msgid "No mount points found" -msgstr "找不到掛接點" +msgstr "找不到掛載點" #: ../liveusb/creator.py:410 #, python-format @@ -289,28 +289,28 @@ msgstr "裝置上的可用空間不足。\n%dMB ISO + %dMB覆蓋 > %dMB可用空 #: ../liveusb/gui.py:569 msgid "Partition is FAT16; Restricting overlay size to 2G" -msgstr "分割區為 FAT16；覆蓋限制大小為 2 GB" +msgstr "分割區為 FAT16 檔案系統；限制重疊區大小為 2 GB" #: ../liveusb/gui.py:565 msgid "Partition is FAT32; Restricting overlay size to 4G" -msgstr "分割區為 FAT32; 限制重疊大小為 4G" +msgstr "分割區為 FAT32 檔案系統; 限制重疊區大小為 4G" #: ../liveusb/creator.py:236 ../liveusb/creator.py:866 #, python-format msgid "Partitioning device %(device)s" -msgstr "分割區裝置 %(device)s" +msgstr "正在為 %(device)s 建立分割區" #: ../liveusb/gui.py:636 msgid "Persistent Storage" -msgstr "永續性儲存體" +msgstr "永久性儲存裝置" #: ../liveusb/dialog.py:168 msgid "Persistent Storage (0 MB)" -msgstr "永續性儲存體 (0 MB)" +msgstr "永久性儲存裝置 (0 MB)" #: ../liveusb/gui.py:698 ../liveusb/gui.py:727 msgid "Please confirm your device selection" -msgstr "請確認您的裝置選取" +msgstr "請確認您所選取的裝置" #: ../liveusb/gui.py:481 msgid "Refreshing releases..." @@ -318,16 +318,16 @@ msgstr "正在重新整理版本..." #: ../liveusb/gui.py:486 msgid "Releases updated!" -msgstr "版本已更新!" +msgstr "版本已更新！" #: ../liveusb/creator.py:997 ../liveusb/creator.py:1331 #, python-format msgid "Removing %(file)s" -msgstr "移除 %(file)s" +msgstr "正在移除 %(file)s" #: ../liveusb/creator.py:492 msgid "Removing existing Live OS" -msgstr "移除現有的 Live OS" +msgstr "正在移除現有的 Live OS" #: ../liveusb/creator.py:1186 #, python-format @@ -347,12 +347,12 @@ msgstr "設定 OLPC 開機檔案..." msgid "" "Some partitions of the target device %(device)s are mounted. They will be " "unmounted before starting the installation process." -msgstr "目標裝置 %(device)s 中一些分割區已掛接。它們將在開始安裝過程前被卸載。" +msgstr "目標裝置 %(device)s 中有些分割區已經被掛載。它們將在開始安裝前被自動卸載。" #: ../liveusb/creator.py:141 msgid "" "Source type does not support verification of ISO MD5 checksum, skipping" -msgstr "來源類型不支援 ISO MD5 總和檢查碼的驗證，略過" +msgstr "來源類型不支援 ISO MD5 總和檢查碼的驗證功能，略過" #: ../liveusb/creator.py:1220 msgid "Synchronizing data on disk..." @@ -367,13 +367,13 @@ msgstr "目標裝置" 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的空間)。" +msgstr "“%(pretty_name)s”設備的容量太小，無法安裝Tails (至少需要 %(size)s GB 的空間)。" #: ../liveusb/gui.py:792 msgid "" "The selected file is unreadable. Please fix its permissions or select " "another file." -msgstr "所選檔案無法讀取。請修正其權限或選擇另一個檔案。" +msgstr "所選取的檔案無法讀取，請修改該檔案之存取權限或選擇另一個檔案。" #: ../liveusb/creator.py:354 #, python-format @@ -387,7 +387,7 @@ msgid "" "This button allows you to browse for an existing Live system ISO that you " "have previously downloaded. If you do not select one, a release will be " "downloaded for you automatically." -msgstr "此按鈕讓您可以瀏覽先前已下載的 Live 系統 ISO。如果您沒有選擇的話，將會自動為您下載一個版本。" +msgstr "此按鈕讓您可以瀏覽先前已下載的 Live 系統之 ISO 檔，如果您沒有選取的話，程式將會自動為您下載一個版本。" #: ../liveusb/dialog.py:171 msgid "" @@ -395,13 +395,13 @@ msgid "" "optionally downloading a release (if an existing one wasn't selected), " "extracting the ISO to the USB device, creating the persistent overlay, and " "installing the bootloader." -msgstr "此按鈕將開始 LiveUSB 建立過程。這需要選擇性地下載一個版本 (如果沒有選擇一個現有版本的話)，將 ISO 解壓縮到 USB 裝置，建立永久覆蓋，然後安裝 bootloader。" +msgstr "此按鈕將啟動 LiveUSB 建立程序。這將會選擇性地下載一個版本 (如果您沒有選取任何現有版本的話)，再將 ISO 解壓縮到 USB 裝置，並建立永久性重疊區，然後會安裝系統之啟動載入程式。" #: ../liveusb/dialog.py:165 msgid "" "This is the USB stick that you want to install your Live system on. This " "device must be formatted with the FAT filesystem." -msgstr "這是您想安裝您的即時系統的 USB 隨身碟。此裝置必須使用 FAT 檔案系統來格式化。" +msgstr "這是您想安裝 Live 系統的 USB 隨身碟。此裝置必須是已被格式化成 FAT 檔案系統。" #: ../liveusb/dialog.py:170 msgid ""

1 0

[sandboxed-tor-browser/master] fixup! Bug #20798: Try harder to clean up failed tor processes.
by yawning＠torproject.org 27 Nov '16

27 Nov '16

commit b342afcd1a7bdf398c8a546b2525f9ef5bacea1a Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Sun Nov 27 13:36:39 2016 +0000 fixup! Bug #20798: Try harder to clean up failed tor processes. Remove redundant cleanup. --- src/cmd/sandboxed-tor-browser/internal/ui/ui.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/cmd/sandboxed-tor-browser/internal/ui/ui.go b/src/cmd/sandboxed-tor-browser/internal/ui/ui.go index e7316f9..b25e397 100644 --- a/src/cmd/sandboxed-tor-browser/internal/ui/ui.go +++ b/src/cmd/sandboxed-tor-browser/internal/ui/ui.go @@ -289,8 +289,6 @@ func (c *Common) launchTor(async *Async, onlySystem bool) (dialFunc, error) { async.UpdateProgress("Waiting on Tor bootstrap.") c.tor = tor.NewSandboxedTor(c.Cfg, cmd) if err = c.tor.DoBootstrap(c.Cfg, async); err != nil { - c.tor.Shutdown() - c.tor = nil async.Err = err return nil, err }

1 0

[sandboxed-tor-browser/master] Bug #20798: Try harder to clean up failed tor processes.
by yawning＠torproject.org 27 Nov '16

27 Nov '16

commit ca15fda88cf2b304cf16deb7416c531798c48e08 Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Sun Nov 27 13:13:08 2016 +0000 Bug #20798: Try harder to clean up failed tor processes. Error detectionw was sort of broken, so Shutdown() wasn't getting called corretly. This is now made explciit. When killing containered processes, the signal needs to be sent to bwrap's child, so use`--info-fd` to get that information, and re-write cmd.Process.Pid. --- .../internal/sandbox/hugbox.go | 38 ++++++++++-- src/cmd/sandboxed-tor-browser/internal/tor/tor.go | 68 +++++++++++----------- src/cmd/sandboxed-tor-browser/internal/ui/ui.go | 5 +- 3 files changed, 73 insertions(+), 38 deletions(-) diff --git a/src/cmd/sandboxed-tor-browser/internal/sandbox/hugbox.go b/src/cmd/sandboxed-tor-browser/internal/sandbox/hugbox.go index 2877d45..8ecafa1 100644 --- a/src/cmd/sandboxed-tor-browser/internal/sandbox/hugbox.go +++ b/src/cmd/sandboxed-tor-browser/internal/sandbox/hugbox.go @@ -18,6 +18,7 @@ package sandbox import ( "encoding/hex" + "encoding/json" "fmt" "io" "os" @@ -231,6 +232,7 @@ func (h *hugbox) run() (*exec.Cmd, error) { } // Handle the files to be injected via pipes. + fdIdx := 4 pendingWriteFds := []*os.File{argsWrFd} for i := 0; i < len(h.fileData); i++ { r, w, err := os.Pipe() @@ -239,6 +241,7 @@ func (h *hugbox) run() (*exec.Cmd, error) { } cmd.ExtraFiles = append(cmd.ExtraFiles, r) pendingWriteFds = append(pendingWriteFds, w) + fdIdx++ } // Prep the seccomp pipe if required. @@ -248,10 +251,20 @@ func (h *hugbox) run() (*exec.Cmd, error) { if err != nil { return nil, err } - // The `-1` is because the args fd is added at this point... - fdArgs = append(fdArgs, "--seccomp", fmt.Sprintf("%d", 4+len(cmd.ExtraFiles)-1)) + fdArgs = append(fdArgs, "--seccomp", fmt.Sprintf("%d", fdIdx)) cmd.ExtraFiles = append(cmd.ExtraFiles, r) seccompWrFd = w + fdIdx++ + } + + // Prep the info pipe. + var infoRdFd *os.File + if r, w, err := os.Pipe(); err != nil { + return nil, err + } else { + cmd.ExtraFiles = append(cmd.ExtraFiles, w) + fdArgs = append(fdArgs, "--info-fd", fmt.Sprintf("%d", fdIdx)) + infoRdFd = r } // Convert the arg vector to a format fit for bubblewrap, and schedule the @@ -283,7 +296,7 @@ func (h *hugbox) run() (*exec.Cmd, error) { // Write the seccomp rules. if h.seccompFn != nil { // This should be the one and only remaining extra file. - if len(cmd.ExtraFiles) != 1 { + if len(cmd.ExtraFiles) != 2 { panic("sandbox: unexpected extra files when writing seccomp rules") } else if seccompWrFd == nil { panic("sandbox: missing fd when writing seccomp rules") @@ -292,14 +305,31 @@ func (h *hugbox) run() (*exec.Cmd, error) { cmd.Process.Kill() return nil, err } - cmd.ExtraFiles = nil + cmd.ExtraFiles = cmd.ExtraFiles[1:] } else if seccompWrFd != nil { panic("sandbox: seccomp fd exists when there are no rules to be written") } + // Read back the child pid. + decoder := json.NewDecoder(infoRdFd) + info := &bwrapInfo{} + if err := decoder.Decode(info); err != nil { + return nil, err + } + + Debugf("sandbox: bwrap pid is: %v", cmd.Process.Pid) + Debugf("sandbox: child pid is: %v", info.Pid) + + // This is more useful to us. + cmd.Process.Pid = info.Pid + return cmd, nil } +type bwrapInfo struct { + Pid int `json:"child-pid"` +} + func newHugbox() (*hugbox, error) { h := &hugbox{ unshare: unshareOpts{ diff --git a/src/cmd/sandboxed-tor-browser/internal/tor/tor.go b/src/cmd/sandboxed-tor-browser/internal/tor/tor.go index 180535f..64a9fd9 100644 --- a/src/cmd/sandboxed-tor-browser/internal/tor/tor.go +++ b/src/cmd/sandboxed-tor-browser/internal/tor/tor.go @@ -53,7 +53,8 @@ var ErrTorNotRunning = errors.New("tor not running") type Tor struct { sync.Mutex - isSystem bool + isSystem bool + isBootstrapped bool cmd *exec.Cmd ctrl *bulb.Conn @@ -157,7 +158,7 @@ func (t *Tor) Shutdown() { } if t.cmd != nil { - t.cmd.Process.Signal(syscall.SIGTERM) + t.cmd.Process.Signal(syscall.SIGKILL) t.ctrl = nil } @@ -229,6 +230,7 @@ func NewSystemTor(cfg *config.Config) (*Tor, error) { t := new(Tor) t.isSystem = true t.ctrlEvents = make(chan *bulb.Response, 16) + t.isBootstrapped = true net := cfg.SystemTorControlNet addr := cfg.SystemTorControlAddr @@ -257,27 +259,25 @@ func NewSystemTor(cfg *config.Config) (*Tor, error) { return t, nil } -// NewSandboxedTor creates a Tor struct around a sandboxed tor instance, -// and boostraps. -func NewSandboxedTor(cfg *config.Config, async *Async, cmd *exec.Cmd) (t *Tor, err error) { - var torCleanup *Tor - defer func() { // Automagically handle async error propagation. - if err != nil { - async.Err = err - if torCleanup != nil { - torCleanup.Shutdown() - } - } - }() - - t = new(Tor) - torCleanup = t +// NewSandboxedTor creates a Tor struct around a sandboxed tor instance. +func NewSandboxedTor(cfg *config.Config, cmd *exec.Cmd) *Tor { + t := new(Tor) t.isSystem = false t.cmd = cmd t.socksNet = "unix" t.socksAddr = filepath.Join(cfg.TorDataDir, "socks") t.ctrlEvents = make(chan *bulb.Response, 16) + return t +} + +// DoBootstrap will bootstrap a tor instance, if it is one that is lauched +// by us. +func (t *Tor) DoBootstrap(cfg *config.Config, async *Async) (err error) { + if t.isBootstrapped { + return nil + } + hz := time.NewTicker(1 * time.Second) defer hz.Stop() @@ -294,13 +294,13 @@ func NewSandboxedTor(cfg *config.Config, async *Async, cmd *exec.Cmd) (t *Tor, e nTicks++ continue case <-async.Cancel: - return nil, ErrCanceled + return ErrCanceled } } - return nil, err + return err } if ctrlPortAddr == nil { - return nil, fmt.Errorf("tor: timeout waiting for the control port") + return fmt.Errorf("tor: timeout waiting for the control port") } Debugf("tor: control port is: %v", string(ctrlPortAddr)) @@ -308,12 +308,12 @@ func NewSandboxedTor(cfg *config.Config, async *Async, cmd *exec.Cmd) (t *Tor, e // Dial the control port. async.UpdateProgress("Connecting to the Tor Control Port.") if t.ctrl, err = bulb.Dial("unix", filepath.Join(cfg.TorDataDir, "control")); err != nil { - return nil, err + return err } // Authenticate with the control port. if err = t.ctrl.Authenticate(cfg.Tor.CtrlPassword); err != nil { - return nil, err + return err } // Take ownership of the tor process such that it will self terminate @@ -322,7 +322,7 @@ func NewSandboxedTor(cfg *config.Config, async *Async, cmd *exec.Cmd) (t *Tor, e // occaision. :( log.Printf("tor: Taking ownership of the tor process") if _, err = t.ctrl.Request("TAKEOWNERSHIP"); err != nil { - return nil, err + return err } // Start the event async reader. @@ -331,13 +331,13 @@ func NewSandboxedTor(cfg *config.Config, async *Async, cmd *exec.Cmd) (t *Tor, e // Register the `STATUS_CLIENT` event handler. if _, err = t.ctrl.Request("SETEVENTS STATUS_CLIENT"); err != nil { - return nil, err + return err } // Start the bootstrap. async.UpdateProgress("Connecting to the Tor network.") if _, err = t.ctrl.Request("RESETCONF DisableNetwork"); err != nil { - return nil, err + return err } // Wait for bootstrap to finish. @@ -353,15 +353,15 @@ func NewSandboxedTor(cfg *config.Config, async *Async, cmd *exec.Cmd) (t *Tor, e } bootstrapFinished, newPct = handleBootstrapEvent(async, strings.TrimPrefix(ev.Reply, evPrefix)) case <-async.Cancel: - return nil, ErrCanceled + return ErrCanceled case <-hz.C: const statusPrefix = "status/bootstrap-phase=" // As a fallback, use kill(pid, 0) to detect if the process has // puked. waitpid(2) is probably better since it's a child, but // this should be good enough, and is only to catch tor crashing. - if err := syscall.Kill(cmd.Process.Pid, 0); err == syscall.ESRCH { - return nil, fmt.Errorf("tor process appears to have crashed.") + if err := syscall.Kill(t.cmd.Process.Pid, 0); err == syscall.ESRCH { + return fmt.Errorf("tor process appears to have crashed.") } // Fallback in case something goes wrong, poll the bootstrap status @@ -373,7 +373,7 @@ func NewSandboxedTor(cfg *config.Config, async *Async, cmd *exec.Cmd) (t *Tor, e resp, err := t.getinfo("status/bootstrap-phase") if err != nil { - return nil, err + return err } bootstrapFinished, newPct = handleBootstrapEvent(async, strings.TrimPrefix(resp.Data[0], statusPrefix)) } @@ -384,12 +384,12 @@ func NewSandboxedTor(cfg *config.Config, async *Async, cmd *exec.Cmd) (t *Tor, e } } if !bootstrapFinished { - return nil, fmt.Errorf("tor: timeout connecting to the tor network") + return fmt.Errorf("tor: timeout connecting to the tor network") } // Squelch the events, and drain the event queue. if _, err = t.ctrl.Request("SETEVENTS"); err != nil { - return nil, err + return err } for len(t.ctrlEvents) > 0 { <-t.ctrlEvents @@ -397,10 +397,12 @@ func NewSandboxedTor(cfg *config.Config, async *Async, cmd *exec.Cmd) (t *Tor, e // Launch the surrogates. if err = t.launchSurrogates(cfg); err != nil { - return nil, err + return err } - return t, nil + t.isBootstrapped = true + + return nil } // CfgToSandboxTorrc converts the `ui/config/Config` to a sandboxed tor ready diff --git a/src/cmd/sandboxed-tor-browser/internal/ui/ui.go b/src/cmd/sandboxed-tor-browser/internal/ui/ui.go index 5bbc17f..e7316f9 100644 --- a/src/cmd/sandboxed-tor-browser/internal/ui/ui.go +++ b/src/cmd/sandboxed-tor-browser/internal/ui/ui.go @@ -287,7 +287,10 @@ func (c *Common) launchTor(async *Async, onlySystem bool) (dialFunc, error) { } async.UpdateProgress("Waiting on Tor bootstrap.") - if c.tor, err = tor.NewSandboxedTor(c.Cfg, async, cmd); err != nil { + c.tor = tor.NewSandboxedTor(c.Cfg, cmd) + if err = c.tor.DoBootstrap(c.Cfg, async); err != nil { + c.tor.Shutdown() + c.tor = nil async.Err = err return nil, err }

1 0

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

27 Nov '16

commit 2296256b76442838aadf3b4f4b8b26ff19b3856c Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 27 11:17:30 2016 +0000 Update translations for tails-onioncircuits_completed --- zh_TW/onioncircuits.pot | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/zh_TW/onioncircuits.pot b/zh_TW/onioncircuits.pot index bfe2db9..4bfd794 100644 --- a/zh_TW/onioncircuits.pot +++ b/zh_TW/onioncircuits.pot @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Agustín Wu <losangwuyts(a)gmail.com>, 2016 # 男孩不壞, 2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-31 14:42+0200\n" -"PO-Revision-Date: 2016-06-05 15:29+0000\n" -"Last-Translator: 男孩不壞\n" +"PO-Revision-Date: 2016-11-27 10:52+0000\n" +"Last-Translator: Agustín Wu <losangwuyts(a)gmail.com>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/otf/torproject/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,15 +21,15 @@ msgstr "" #: ../onioncircuits:81 msgid "You are not connected to Tor yet..." -msgstr "您尚未連接至Tor..." +msgstr "您尚未連接至洋蔥路由網路..." #: ../onioncircuits:95 msgid "Onion Circuits" -msgstr "洋蔥迴圈" +msgstr "洋蔥迴路" #: ../onioncircuits:125 msgid "Circuit" -msgstr "迴圈" +msgstr "迴路" #: ../onioncircuits:126 msgid "Status" @@ -40,7 +41,7 @@ msgstr "按下迴圈以查看Tor中繼節點的細節" #: ../onioncircuits:221 msgid "The connection to Tor was lost..." -msgstr "至Tor的連接已遺失..." +msgstr "洋蔥路由網路的連線已中斷..." #: ../onioncircuits:317 msgid "..." @@ -53,7 +54,7 @@ msgstr "%s: %s" #: ../onioncircuits:554 msgid "GeoIP database unavailable. No country information will be displayed." -msgstr "地理IP資料庫失效。無法顯示國家資訊。" +msgstr "無法使用IP地理資料庫，故將不會顯示國家資訊。" #: ../onioncircuits:585 #, c-format

1 0

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

27 Nov '16

commit 6eb864f1dd167f5a98399ab96315ba91148e8435 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 27 11:17:26 2016 +0000 Update translations for tails-onioncircuits --- zh_TW/onioncircuits.pot | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/zh_TW/onioncircuits.pot b/zh_TW/onioncircuits.pot index bfe2db9..4bfd794 100644 --- a/zh_TW/onioncircuits.pot +++ b/zh_TW/onioncircuits.pot @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Agustín Wu <losangwuyts(a)gmail.com>, 2016 # 男孩不壞, 2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-31 14:42+0200\n" -"PO-Revision-Date: 2016-06-05 15:29+0000\n" -"Last-Translator: 男孩不壞\n" +"PO-Revision-Date: 2016-11-27 10:52+0000\n" +"Last-Translator: Agustín Wu <losangwuyts(a)gmail.com>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/otf/torproject/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,15 +21,15 @@ msgstr "" #: ../onioncircuits:81 msgid "You are not connected to Tor yet..." -msgstr "您尚未連接至Tor..." +msgstr "您尚未連接至洋蔥路由網路..." #: ../onioncircuits:95 msgid "Onion Circuits" -msgstr "洋蔥迴圈" +msgstr "洋蔥迴路" #: ../onioncircuits:125 msgid "Circuit" -msgstr "迴圈" +msgstr "迴路" #: ../onioncircuits:126 msgid "Status" @@ -40,7 +41,7 @@ msgstr "按下迴圈以查看Tor中繼節點的細節" #: ../onioncircuits:221 msgid "The connection to Tor was lost..." -msgstr "至Tor的連接已遺失..." +msgstr "洋蔥路由網路的連線已中斷..." #: ../onioncircuits:317 msgid "..." @@ -53,7 +54,7 @@ msgstr "%s: %s" #: ../onioncircuits:554 msgid "GeoIP database unavailable. No country information will be displayed." -msgstr "地理IP資料庫失效。無法顯示國家資訊。" +msgstr "無法使用IP地理資料庫，故將不會顯示國家資訊。" #: ../onioncircuits:585 #, c-format

1 0

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

27 Nov '16

commit f1d1de75cc2785fc7d628fc7198d200456161a7b Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 27 11:16:17 2016 +0000 Update translations for tails-misc_completed --- zh_TW.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/zh_TW.po b/zh_TW.po index ae52043..67c6311 100644 --- a/zh_TW.po +++ b/zh_TW.po @@ -19,7 +19,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-11-13 08:15+0100\n" -"PO-Revision-Date: 2016-11-27 10:45+0000\n" +"PO-Revision-Date: 2016-11-27 10:47+0000\n" "Last-Translator: Agustín Wu <losangwuyts(a)gmail.com>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/otf/torproject/language/zh_TW/)\n" "MIME-Version: 1.0\n" @@ -379,7 +379,7 @@ msgstr "了解如何使用 Tails" #: ../config/chroot_local-includes/usr/share/applications/i2p-browser.desktop.in.h:1 msgid "Anonymous overlay network browser" -msgstr "匿名覆蓋網路瀏覽器" +msgstr "匿名式重疊網路瀏覽器" #: ../config/chroot_local-includes/usr/share/applications/i2p-browser.desktop.in.h:2 msgid "I2P Browser" @@ -391,7 +391,7 @@ msgstr "了解更多關於 Tails" #: ../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:1 msgid "Tor Browser" -msgstr "Tor 瀏覽器" +msgstr "洋蔥路由瀏覽器" #: ../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:2 msgid "Anonymous Web Browser"

1 0

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

27 Nov '16

commit da446fefad215ba89d87dbc5dd4fd8eacd6c13f0 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 27 11:16:14 2016 +0000 Update translations for tails-misc --- zh_TW.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/zh_TW.po b/zh_TW.po index ae52043..67c6311 100644 --- a/zh_TW.po +++ b/zh_TW.po @@ -19,7 +19,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-11-13 08:15+0100\n" -"PO-Revision-Date: 2016-11-27 10:45+0000\n" +"PO-Revision-Date: 2016-11-27 10:47+0000\n" "Last-Translator: Agustín Wu <losangwuyts(a)gmail.com>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/otf/torproject/language/zh_TW/)\n" "MIME-Version: 1.0\n" @@ -379,7 +379,7 @@ msgstr "了解如何使用 Tails" #: ../config/chroot_local-includes/usr/share/applications/i2p-browser.desktop.in.h:1 msgid "Anonymous overlay network browser" -msgstr "匿名覆蓋網路瀏覽器" +msgstr "匿名式重疊網路瀏覽器" #: ../config/chroot_local-includes/usr/share/applications/i2p-browser.desktop.in.h:2 msgid "I2P Browser" @@ -391,7 +391,7 @@ msgstr "了解更多關於 Tails" #: ../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:1 msgid "Tor Browser" -msgstr "Tor 瀏覽器" +msgstr "洋蔥路由瀏覽器" #: ../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:2 msgid "Anonymous Web Browser"

1 0

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

27 Nov '16

commit d712b7b3ba60e8b47857bdff5965f2bd20cdceb2 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 27 10:46:18 2016 +0000 Update translations for tails-misc_completed --- zh_TW.po | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/zh_TW.po b/zh_TW.po index 92e4124..ae52043 100644 --- a/zh_TW.po +++ b/zh_TW.po @@ -18,9 +18,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-02 16:02+0200\n" -"PO-Revision-Date: 2016-09-03 08:57+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"POT-Creation-Date: 2016-11-13 08:15+0100\n" +"PO-Revision-Date: 2016-11-27 10:45+0000\n" +"Last-Translator: Agustín Wu <losangwuyts(a)gmail.com>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/otf/torproject/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -30,7 +30,7 @@ msgstr "" #: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:39 msgid "Tor is ready" -msgstr "Tor 就緒" +msgstr "洋蔥路由已就緒" #: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:40 msgid "You can now access the Internet." @@ -109,7 +109,7 @@ msgstr "關閉電源" #: config/chroot_local-includes/usr/local/bin/tails-about:22 #: ../config/chroot_local-includes/usr/share/desktop-directories/Tails.directory.in.h:1 msgid "Tails" -msgstr "尾部" +msgstr "Tails" #: config/chroot_local-includes/usr/local/bin/tails-about:25 #: ../config/chroot_local-includes/usr/share/applications/tails-about.desktop.in.h:1 @@ -118,7 +118,7 @@ msgstr "關於 Tails" #: config/chroot_local-includes/usr/local/bin/tails-about:35 msgid "The Amnesic Incognito Live System" -msgstr "Amnesic Incognito Live 系統" +msgstr "The Amnesic Incognito Live System" #: config/chroot_local-includes/usr/local/bin/tails-about:36 #, python-format @@ -157,17 +157,17 @@ msgstr "與系統的時鐘同步" msgid "" "Tor needs an accurate clock to work properly, especially for Hidden " "Services. Please wait..." -msgstr "Tor 需要準確的時鐘才能正常運作，特別是對隱藏的服務。請稍候..." +msgstr "洋蔥路由需要精確的時鐘才能正常運作，特別是針對隱藏式服務。請稍候..." #: config/chroot_local-includes/usr/local/lib/tails-htp-notify-user:87 msgid "Failed to synchronize the clock!" msgstr "無法與時鐘同步!" -#: config/chroot_local-includes/usr/local/bin/tails-security-check:146 +#: config/chroot_local-includes/usr/local/bin/tails-security-check:124 msgid "This version of Tails has known security issues:" msgstr "此 Tails 版本有已知的安全性問題:" -#: config/chroot_local-includes/usr/local/bin/tails-security-check:156 +#: config/chroot_local-includes/usr/local/bin/tails-security-check:134 msgid "Known security issues" msgstr "已知的安全性問題" @@ -181,7 +181,7 @@ msgstr "網路卡 ${nic} 被停用" 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." -msgstr "網路卡 ${nic_name} (${nic}) 進行MAC詐騙失敗，故它暫時被停用。\n您可能要將 Tails 重新啟動並停用 MAC 詐騙。" +msgstr "網路卡 ${nic_name} (${nic}) 之實體位址偽裝失敗，故已被暫時停用。\n您可能要將 Tails 重新啟動並且停用網路卡實體位址偽裝功能。" #: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:62 msgid "All networking disabled" @@ -192,7 +192,7 @@ msgstr "所有網路被停用" msgid "" "MAC spoofing failed for network card ${nic_name} (${nic}). The error recovery also failed so all networking is disabled.\n" "You might prefer to restart Tails and disable MAC spoofing." -msgstr "網路卡 ${nic_name} (${nic}) 進行MAC詐騙失敗。\n而在進行還原時也失敗，故它暫時被停用。\n您可能要將 Tails 重新啟動並停用 MAC 詐騙。" +msgstr "網路卡 ${nic_name} (${nic}) 之實體位址偽裝失敗，且錯誤還原過程亦失敗了，所以所有網路連線功能皆被關閉了。\n您可能要將 Tails 重新啟動，並且停用網路卡實體位址偽裝功能。" #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:24 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27 @@ -219,13 +219,13 @@ msgstr "<b>檢查升級時沒有足夠的記憶體可用。</b>\n\n請確保該 #: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:67 msgid "Warning: virtual machine detected!" -msgstr "警告: 偵測到虛擬機器!" +msgstr "警告: 偵測到虛擬機器！" #: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:69 msgid "" "Both the host operating system and the virtualization software are able to " "monitor what you are doing in Tails." -msgstr "主機作業系統和虛擬化軟體都能夠監控您在 Tails 中做什麼。" +msgstr "主系統和虛擬化軟體都能夠監控您在 Tails 中做什麼。" #: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:72 msgid "Warning: non-free virtual machine detected!" @@ -245,15 +245,15 @@ msgstr "繼續閱讀" #: config/chroot_local-includes/usr/local/bin/tor-browser:40 msgid "Tor is not ready" -msgstr "Tor 未就緒" +msgstr "洋蔥路由尚未就緒" #: config/chroot_local-includes/usr/local/bin/tor-browser:41 msgid "Tor is not ready. Start Tor Browser anyway?" -msgstr "Tor 未就緒。無論如何啟動 Tor 瀏覽器嗎?" +msgstr "洋蔥路由尚未就緒，您確定仍要啟動洋蔥路由瀏覽器嗎？" #: config/chroot_local-includes/usr/local/bin/tor-browser:42 msgid "Start Tor Browser" -msgstr "啟動 Tor 瀏覽器" +msgstr "啟動洋蔥路由瀏覽器" #: config/chroot_local-includes/usr/local/bin/tor-browser:43 msgid "Cancel" @@ -261,7 +261,7 @@ msgstr "取消" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38 msgid "Do you really want to launch the Unsafe Browser?" -msgstr "您真的要啟動不安全的瀏覽器嗎?" +msgstr "您真的要啟動不安全的瀏覽器嗎？" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40 msgid "" @@ -290,7 +290,7 @@ msgstr "這可能需要一段時間，您可能無法將不安全的瀏覽器重 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70 msgid "Failed to restart Tor." -msgstr "無法重新啟動 Tor。" +msgstr "無法重新啟動洋蔥路由。" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1

1 0

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

27 Nov '16

commit 87fd9dbdd699c5c3cf16139e567f99e5ee691d1b Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 27 10:46:13 2016 +0000 Update translations for tails-misc --- zh_TW.po | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/zh_TW.po b/zh_TW.po index 92e4124..ae52043 100644 --- a/zh_TW.po +++ b/zh_TW.po @@ -18,9 +18,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-02 16:02+0200\n" -"PO-Revision-Date: 2016-09-03 08:57+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"POT-Creation-Date: 2016-11-13 08:15+0100\n" +"PO-Revision-Date: 2016-11-27 10:45+0000\n" +"Last-Translator: Agustín Wu <losangwuyts(a)gmail.com>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/otf/torproject/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -30,7 +30,7 @@ msgstr "" #: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:39 msgid "Tor is ready" -msgstr "Tor 就緒" +msgstr "洋蔥路由已就緒" #: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:40 msgid "You can now access the Internet." @@ -109,7 +109,7 @@ msgstr "關閉電源" #: config/chroot_local-includes/usr/local/bin/tails-about:22 #: ../config/chroot_local-includes/usr/share/desktop-directories/Tails.directory.in.h:1 msgid "Tails" -msgstr "尾部" +msgstr "Tails" #: config/chroot_local-includes/usr/local/bin/tails-about:25 #: ../config/chroot_local-includes/usr/share/applications/tails-about.desktop.in.h:1 @@ -118,7 +118,7 @@ msgstr "關於 Tails" #: config/chroot_local-includes/usr/local/bin/tails-about:35 msgid "The Amnesic Incognito Live System" -msgstr "Amnesic Incognito Live 系統" +msgstr "The Amnesic Incognito Live System" #: config/chroot_local-includes/usr/local/bin/tails-about:36 #, python-format @@ -157,17 +157,17 @@ msgstr "與系統的時鐘同步" msgid "" "Tor needs an accurate clock to work properly, especially for Hidden " "Services. Please wait..." -msgstr "Tor 需要準確的時鐘才能正常運作，特別是對隱藏的服務。請稍候..." +msgstr "洋蔥路由需要精確的時鐘才能正常運作，特別是針對隱藏式服務。請稍候..." #: config/chroot_local-includes/usr/local/lib/tails-htp-notify-user:87 msgid "Failed to synchronize the clock!" msgstr "無法與時鐘同步!" -#: config/chroot_local-includes/usr/local/bin/tails-security-check:146 +#: config/chroot_local-includes/usr/local/bin/tails-security-check:124 msgid "This version of Tails has known security issues:" msgstr "此 Tails 版本有已知的安全性問題:" -#: config/chroot_local-includes/usr/local/bin/tails-security-check:156 +#: config/chroot_local-includes/usr/local/bin/tails-security-check:134 msgid "Known security issues" msgstr "已知的安全性問題" @@ -181,7 +181,7 @@ msgstr "網路卡 ${nic} 被停用" 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." -msgstr "網路卡 ${nic_name} (${nic}) 進行MAC詐騙失敗，故它暫時被停用。\n您可能要將 Tails 重新啟動並停用 MAC 詐騙。" +msgstr "網路卡 ${nic_name} (${nic}) 之實體位址偽裝失敗，故已被暫時停用。\n您可能要將 Tails 重新啟動並且停用網路卡實體位址偽裝功能。" #: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:62 msgid "All networking disabled" @@ -192,7 +192,7 @@ msgstr "所有網路被停用" msgid "" "MAC spoofing failed for network card ${nic_name} (${nic}). The error recovery also failed so all networking is disabled.\n" "You might prefer to restart Tails and disable MAC spoofing." -msgstr "網路卡 ${nic_name} (${nic}) 進行MAC詐騙失敗。\n而在進行還原時也失敗，故它暫時被停用。\n您可能要將 Tails 重新啟動並停用 MAC 詐騙。" +msgstr "網路卡 ${nic_name} (${nic}) 之實體位址偽裝失敗，且錯誤還原過程亦失敗了，所以所有網路連線功能皆被關閉了。\n您可能要將 Tails 重新啟動，並且停用網路卡實體位址偽裝功能。" #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:24 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27 @@ -219,13 +219,13 @@ msgstr "<b>檢查升級時沒有足夠的記憶體可用。</b>\n\n請確保該 #: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:67 msgid "Warning: virtual machine detected!" -msgstr "警告: 偵測到虛擬機器!" +msgstr "警告: 偵測到虛擬機器！" #: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:69 msgid "" "Both the host operating system and the virtualization software are able to " "monitor what you are doing in Tails." -msgstr "主機作業系統和虛擬化軟體都能夠監控您在 Tails 中做什麼。" +msgstr "主系統和虛擬化軟體都能夠監控您在 Tails 中做什麼。" #: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:72 msgid "Warning: non-free virtual machine detected!" @@ -245,15 +245,15 @@ msgstr "繼續閱讀" #: config/chroot_local-includes/usr/local/bin/tor-browser:40 msgid "Tor is not ready" -msgstr "Tor 未就緒" +msgstr "洋蔥路由尚未就緒" #: config/chroot_local-includes/usr/local/bin/tor-browser:41 msgid "Tor is not ready. Start Tor Browser anyway?" -msgstr "Tor 未就緒。無論如何啟動 Tor 瀏覽器嗎?" +msgstr "洋蔥路由尚未就緒，您確定仍要啟動洋蔥路由瀏覽器嗎？" #: config/chroot_local-includes/usr/local/bin/tor-browser:42 msgid "Start Tor Browser" -msgstr "啟動 Tor 瀏覽器" +msgstr "啟動洋蔥路由瀏覽器" #: config/chroot_local-includes/usr/local/bin/tor-browser:43 msgid "Cancel" @@ -261,7 +261,7 @@ msgstr "取消" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38 msgid "Do you really want to launch the Unsafe Browser?" -msgstr "您真的要啟動不安全的瀏覽器嗎?" +msgstr "您真的要啟動不安全的瀏覽器嗎？" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40 msgid "" @@ -290,7 +290,7 @@ msgstr "這可能需要一段時間，您可能無法將不安全的瀏覽器重 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70 msgid "Failed to restart Tor." -msgstr "無法重新啟動 Tor。" +msgstr "無法重新啟動洋蔥路由。" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1

1 0