Update from transifex

4 files changed, 102 insertions, 74 deletions

diff --git a/OpenKeychain/src/main/res/raw-zh-rTW/help_about.md b/OpenKeychain/src/main/res/raw-zh-rTW/help_about.md
index 95fca0cec..4e3a03b4b 100644
--- a/OpenKeychain/src/main/res/raw-zh-rTW/help_about.md
+++ b/OpenKeychain/src/main/res/raw-zh-rTW/help_about.md
@@ -2,12 +2,16 @@
 
 [http://www.openkeychain.org](http://www.openkeychain.org)
 
-<a href="http://www.openkeychain.org">OpenKeychain</a>是一個Android的OpenPGP應用。
+[OpenKeychain](http://www.openkeychain.org)是一個Android的OpenPGP應用。
 
-授權: GPLv3+
+授權：GPLv3+
 
-## Developers
-  * Dominik Schürmann (Maintainer)
+##主要開發者
+  * Dominik Schürmann (維護人)
+  * Vincent Breitmoser
+
+##貢獻者
+  * Adithya Abraham Philip
   * Art O Cathain
   * Ash Hughes
   * Brian C. Barnes
@@ -15,20 +19,35 @@
   * Daniel Albert
   * Daniel Hammann
   * Daniel Haß
+  * Daniel Nelz
+  * Daniel Ramos
   * Greg Witczak
+  * 'iseki'
+  * Ishan Khanna
+  * 'jellysheep'
+  * 'Jesperbk'
+  * 'jkolo'
+  * Joey Castillo
+  * Kai Jiang
+  * Kartik Arora
+  * 'Kent'
+  * 'ligi'
+  * Lukas Zorich
+  * Manoj Khanna
   * 'mar-v-in'
   * Markus Doits
   * Miroojin Bakshi
+  * Morgan Gangwere
   * Nikhil Peter Raj
   * Paul Sarbinowski
   * 'Senecaso'
   * Signe Rüsch
   * Sreeram Boyapati
-  * Thialfihar (APG 1.x)
+  * 'steelman'
+  * 'Thialfihar' (APG開發者)
   * Tim Bray
-  * Vincent Breitmoser
 
-## Libraries
+##函式庫
   * [SpongyCastle](http://rtyley.github.com/spongycastle/) (MIT X11 License)
   * [SafeSlinger Exchange library](https://github.com/SafeSlingerProject/exchange-android) (MIT License)
   * [Android Support Libraries](http://developer.android.com/tools/support-library/index.html) (Apache License v2)
@@ -38,9 +57,9 @@
   * [StickyListHeaders](https://github.com/emilsjolander/StickyListHeaders) (Apache License v2)
   * [ZXing](https://github.com/zxing/zxing) (Apache License v2)
   * [ZXing Android Minimal](https://github.com/journeyapps/zxing-android-embedded) (Apache License v2)
-  * [PagerSlidingTabStrip](https://github.com/jpardogo/PagerSlidingTabStrip) (Material Design)</a> (Apache License v2)
-  * [MaterialNavigationDrawer](https://github.com/neokree/MaterialNavigationDrawer) (Apache License v2)
+  * [PagerSlidingTabStrip](https://github.com/jpardogo/PagerSlidingTabStrip) (Material Design) (Apache License v2)
+  * [MaterialDrawer](https://github.com/mikepenz/MaterialDrawer) (Apache License v2)
   * [Snackbar](https://github.com/nispok/snackbar) (MIT License)
   * [FloatingActionButton](https://github.com/futuresimple/android-floating-action-button) (Apache License v2)
-  * [HtmlTextView](https://github.com/dschuermann/html-textview) (Apache License v2)
+  * [HtmlTextView](https://github.com/sufficientlysecure/html-textview) (Apache License v2)
   * [Markdown4J](https://github.com/jdcasey/markdown4j) (Apache License v2)
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/raw-zh-rTW/help_certification.md b/OpenKeychain/src/main/res/raw-zh-rTW/help_certification.md
index a69349fa2..2055f2e36 100644
--- a/OpenKeychain/src/main/res/raw-zh-rTW/help_certification.md
+++ b/OpenKeychain/src/main/res/raw-zh-rTW/help_certification.md
@@ -1,28 +1,28 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
-金鑰認證
-這個身分識別尚未經過認證，你不能確認這個身分識別是否屬於真的某個人。
-最簡單確認金鑰的方式就是透過掃描QR code或是經由NFC交換。
-To confirm keys between more than two persons, we suggest to use the key exchange method available for your keys.
+##金鑰確認
+在經過確認之前，你無法確定這個金鑰是否真實屬於某個人。
+確認金鑰的最簡單方式就是透過掃描QR code或是經由NFC交換。
+要在多於兩個人之間確認彼此的金鑰，我們建議使用金鑰交換方式。
 
 ## 金鑰狀態
 
 <img src="status_signature_verified_cutout_24dp"/>  
-已認證： 你已經認證了這個金鑰，例如透過掃描QR Code。  
+已確認：你已經確認了這個金鑰，例如透過掃描QR Code。  
 <img src="status_signature_unverified_cutout_24dp"/>  
-未確認：這個身分識別尚未經過認證，你不能確認這個身分識別是否屬於真的某個人。  
+未確認：這個金鑰尚未經過確認，你無法確定這個金鑰是否真實屬於某個人。  
 <img src="status_signature_expired_cutout_24dp"/>  
-已過期：這個金鑰因超過有效期限而失效。只有金鑰擁有者可以改變有效期限。  
+已過期：這個金鑰不再有效。只有金鑰擁有者可以展延有效期限。  
 <img src="status_signature_revoked_cutout_24dp"/>  
 已撤銷：這個金鑰已經被擁有者撤銷而失效。
 
-## Advanced Information
-在OpenKeychain中，透過根據標準OpenPGP所建立的證書可以簡單的認證一個金鑰。
-This certification is a ["generic certification (0x10)"](http://tools.ietf.org/html/rfc4880#section-5.2.1) described in the standard by:
-"The issuer of this certification does not make any particular assertion as to how well the certifier has checked that the owner of the key is in fact the person described by the User ID."
+##進階資訊
+在OpenKeychain中，確認金鑰是透過根據OpenPGP標準簽發認證來達成。
+這是一個“[一般認證 (0x10)](http://tools.ietf.org/html/rfc4880#section-5.2.1)”，規範描述如下：
+“認證的發行者不就妥善檢查金鑰持有人與金鑰所示身份相符與否一事做出任何允諾。”
 
-Traditionally, certifications (also with higher certification levels, such as "positive certifications" (0x13)) are organized in OpenPGP's Web of Trust.
-Our model of key confirmation is a much simpler concept to avoid common usability problems related to this Web of Trust.
-We assume that keys are verified only to a certain degree that is still usable enough to be executed "on the go".
-We also do not implement (potentially transitive) trust signatures or an ownertrust database like in GnuPG.
-Furthermore, keys which contain at least one user ID certified by a trusted key will be marked as "confirmed" in the key listings.
\ No newline at end of file
+傳統上，包含更高等級的（像是主動型認證(0x13)）認證在內，認證是有組織的存在於OpenPGP信任網當中。
+我們的金鑰確認模型採用一套相對簡單的概念，以避開普遍存在的信任網相關可用性問題。
+我們假設金鑰只驗證到足以隨時隨地使用的程度。
+同時我們暫時也不打算導入像是GnuPG的信任簽章或主觀信任資料庫。
+此外，如果某金鑰含有至少一個被信任金鑰所認證的身分時，這把金鑰將被標記為已確認。
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/raw-zh-rTW/help_changelog.md b/OpenKeychain/src/main/res/raw-zh-rTW/help_changelog.md
index ab7fa8773..da95f2184 100644
--- a/OpenKeychain/src/main/res/raw-zh-rTW/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-zh-rTW/help_changelog.md
@@ -1,75 +1,84 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+
+## 3.3
+
+  * New decryption screen
+  * Decryption of multiple files at once
+  * Better handling of YubiKey errors
+
 ## 3.2
 
-  * Material design
-  * Integration of QR Scanner (New permissions required)
-  * Improved key creation wizard
-  * Fix missing contacts after sync
-  * Requires Android 4
-  * Redesigned key screen
-  * Simplify crypto preferences, better selection of secure ciphers
-  * API: Detached signatures, free selection of signing key,...
-  * Fix: Some valid keys were shown revoked or expired
-  * Don't accept signatures by expired or revoked subkeys
-  * Keybase.io support in advanced view
+  * 首次完整支援Yubikey：修改金鑰、連結Yubikey與金鑰、...
+  * 素材設計
+  * 整合QR條碼掃描 (需要新權限)
+  * 改進的金鑰建立精靈
+  * 修正同步後遺失聯絡人
+  * 最低要求 Android 4
+  * 重新設計的金鑰畫面
+  * 簡化的加密參數，更佳的安全加密算法選項
+  * API：分離的簽名、自由選擇用來簽名的金鑰、...
+  * 修正：部分有效的金鑰被顯示為已撤銷或過期
+  * 不接受來自已撤銷或過期子金鑰的簽名
+  * 進階檢視中的Keybase.io支援
+  * 可以一次更新所有的金鑰了
 
 
 ## 3.1.2
 
-  * Fix key export to files (now for real)
+  * 修正匯出金鑰到檔案的功能（這次是真的了）
 
 
 ## 3.1.1
 
-  * Fix key export to files (they were written partially)
-  * Fix crash on Android 2.3
+  * 修正匯出金鑰到檔案功能（一部分）
+  * 修正在Android 2.3上的崩潰
 
 
 ## 3.1
 
-  * Fix crash on Android 5
-  * New certify screen
-  * Secure Exchange directly from key list (SafeSlinger library)
-  * New QR Code program flow
-  * Redesigned decrypt screen
-  * New icon usage and colors
-  * Fix import of secret keys from Symantec Encryption Desktop
-  * Subkey IDs on Yubikeys are now checked correctly
+  * 修正在Android 5上的崩潰
+  * 新的認證畫面
+  * 直接在金鑰清單進行安全金鑰交換（使用SafeSlinger）
+  * 新的QR條碼作業流程
+  * 重新設計的解密畫面
+  * 新的圖示和配色
+  * 修正從Symantec Encryption Desktop匯入密鑰的問題
+  * 實驗性的YubiKey支援：子金鑰ID現在可以正確的檢查了
 
 
 ## 3.0.1
 
-  * Better handling of large key imports
-  * Improved subkey selection
+  * 更好的大型金鑰匯入處理
+  * 改良的子金鑰選取
 
 
 ## 3.0
 
-  * Full support for Yubikey signature generation and decryption!
-  * Propose installable compatible apps in apps list
-  * New design for decryption screens
-  * Many fixes for key import, also fixes stripped keys
+  * 在應用列表中建議相容的應用
+  * 新設計的解密畫面
+  * 許多匯入金鑰的修正，並修正剝離的金鑰
   * Honor and display key authenticate flags
-  * User interface to generate custom keys
-  * Fixing user id revocation certificates
-  * New cloud search (searches over traditional keyservers and keybase.io)
-  * Support for stripping keys inside OpenKeychain
+  * 產生自訂金鑰的介面
+  * 修復使用者身分撤銷
+  * 新的雲端檢索功能（同時搜尋傳統的金鑰伺服器以及keybase.io資料庫）
+  * 現在OpenKeychain可以支援剝離的金鑰了
+  * 實驗性的YubiKey支援：支援簽名和解密
 
 
 ## 2.9.2
 
-  * Fix keys broken in 2.9.1
-  * Yubikey decryption now working via API
+  * 修正2.9.1導致金鑰破損的問題
+  * 實驗性的YubiKey支援：現在可以透過API進行解密
 
 
 ## 2.9.1
 
-  * Split encrypt screen into two
+  * 加密畫面現在一分為二
   * Fix key flags handling (now supporting Mailvelope 0.7 keys)
   * Improved passphrase handling
   * Key sharing via SafeSlinger
-  * Yubikey: preference to allow other PINs, currently only signing via the OpenPGP API works, not inside of OpenKeychain
+  * Experimental YubiKey support: Preference to allow other PINs, currently only signing via the OpenPGP API works, not inside of OpenKeychain
   * Fix usage of stripped keys
   * SHA256 as default for compatibility
   * Intent API has changed, see https://github.com/open-keychain/open-keychain/wiki/Intent-API
@@ -80,7 +89,7 @@
 
   * Fixing crashes introduced in v2.8
   * Experimental ECC support
-  * Experimental Yubikey support (signing-only with imported keys)
+  * Experimental YubiKey support: Only signing with imported keys
 
 
 ## 2.8
diff --git a/OpenKeychain/src/main/res/raw-zh-rTW/help_start.md b/OpenKeychain/src/main/res/raw-zh-rTW/help_start.md
index 4cc331942..a27d029ad 100644
--- a/OpenKeychain/src/main/res/raw-zh-rTW/help_start.md
+++ b/OpenKeychain/src/main/res/raw-zh-rTW/help_start.md
@@ -1,16 +1,16 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
-## How do I activate OpenKeychain in K-9 Mail?
-To use OpenKeychain with K-9 Mail, you want to follow these steps:
-  1. Open K-9 Mail and long-tap on the account you want to use OpenKeychain with.
-  2. Select "Account settings", scroll to the very bottom and click "Cryptography".
-  3. Click on "OpenPGP Provider" and select OpenKeychain from the list.
+##我要如何在K-9 Mail啟用OpenKeychain？
+要在K-9 Mail使用OpenKeychain，請依下列指示操作：
+  1. 打開K-9 Mail，長按要設置OpenKeychain的帳號。
+  2. 選擇“帳戶設定”，捲動至最下方並選擇“加密”。
+  3. 選擇“OpenPGP提供者”，並從清單中選取OpenKeychain。
 
-## I found a bug in OpenKeychain!
-Please report the bug using the [issue tracker of OpenKeychain](https://github.com/openpgp-keychain/openpgp-keychain/issues).
+##我在OpenKeychain發現問題！
+請通過[OpenKeychain問題追蹤](https://github.com/openpgp-keychain/openpgp-keychain/issues)回報問題。
 
-## Contribute
-If you want to help us developing OpenKeychain by contributing code [follow our small guide on Github](https://github.com/openpgp-keychain/openpgp-keychain#contribute-code).
+##發佈
+如果你願意發佈原始碼協助我們開發，請參考我們Github上的[發佈指南](https://github.com/openpgp-keychain/openpgp-keychain#contribute-code)。
 
-## Translations
-Help translating OpenKeychain! Everybody can participate at [OpenKeychain on Transifex](https://www.transifex.com/projects/p/open-keychain/).
\ No newline at end of file
+##翻譯
+請協助翻譯OpenKeychain！每個人都可以在[OpenKeychain on Transifex](https://www.transifex.com/projects/p/open-keychain/)貢獻一己之力。
\ No newline at end of file