Pull from transifex

4 files changed, 23 insertions, 23 deletions

diff --git a/OpenKeychain/src/main/res/raw-zh-rTW/help_about.html b/OpenKeychain/src/main/res/raw-zh-rTW/help_about.html
index 6c95c4afe..37b3a2ec6 100644
--- a/OpenKeychain/src/main/res/raw-zh-rTW/help_about.html
+++ b/OpenKeychain/src/main/res/raw-zh-rTW/help_about.html
@@ -7,7 +7,7 @@
 
 <h2>銘謝</h2>
 <ul>
-<li>Dominik Schürmann (Maintainer)</li>
+<li>Dominik Schürmann (維護人)</li>
 <li>Art O Cathain</li>
 <li>Ash Hughes</li>
 <li>Brian C. Barnes</li>
@@ -31,27 +31,27 @@
 <h2>函式庫</h2>
 <ul>
 <li>
-<a href="http://developer.android.com/tools/support-library/index.html">Android Support Library v4</a> (Apache License v2)</li>
+<a href="http://developer.android.com/tools/support-library/index.html">Android Support Library v4</a> (Apache授權條款 v2)</li>
 <li>
-<a href="http://developer.android.com/tools/support-library/index.html">Android Support Library v7 'appcompat'</a> (Apache License v2)</li>
+<a href="http://developer.android.com/tools/support-library/index.html">Android Support Library v7 'appcompat'</a> (Apache授權條款 v2)</li>
 <li>
-<a href="https://github.com/timbray/KeybaseLib">KeybaseLib</a> (Apache License v2)</li>
+<a href="https://github.com/timbray/KeybaseLib">KeybaseLib</a> (Apache授權條款 v2)</li>
 <li>
-<a href="https://github.com/JohnPersano/SuperToasts">SuperToasts</a> (Apache License v2)</li>
+<a href="https://github.com/JohnPersano/SuperToasts">SuperToasts</a> (Apache授權條款 v2)</li>
 <li>
-<a href="https://github.com/splitwise/TokenAutoComplete">TokenAutoComplete</a> (Apache License v2)</li>
+<a href="https://github.com/splitwise/TokenAutoComplete">TokenAutoComplete</a> (Apache授權條款 v2)</li>
 <li>
-<a href="https://github.com/rtreffer/minidns">MiniDNS</a> (Apache License v2)</li>
+<a href="https://github.com/rtreffer/minidns">MiniDNS</a> (Apache授權條款 v2)</li>
 <li>
-<a href="https://github.com/emilsjolander/StickyListHeaders">StickyListHeaders</a> (Apache License v2)</li>
+<a href="https://github.com/emilsjolander/StickyListHeaders">StickyListHeaders</a> (Apache授權條款 v2)</li>
 <li>
-<a href="http://code.google.com/p/zxing/">ZXing</a> (Apache License v2)</li>
+<a href="http://code.google.com/p/zxing/">ZXing</a> (Apache授權條款 v2)</li>
 <li>
-<a href="http://rtyley.github.com/spongycastle/">SpongyCastle</a> (MIT X11 License)</li>
+<a href="http://rtyley.github.com/spongycastle/">SpongyCastle</a> (MIT X11授權條款)</li>
 <li>
-<a href="https://github.com/dschuermann/html-textview">HtmlTextView</a> (Apache License v2)</li>
+<a href="https://github.com/dschuermann/html-textview">HtmlTextView</a> (Apache授權條款 v2)</li>
 <li>
-<a href="https://github.com/SafeSlingerProject/exchange-android">SafeSlinger Exchange library</a> (MIT License)</li>
+<a href="https://github.com/SafeSlingerProject/exchange-android">SafeSlinger Exchange library</a> (MIT授權條款)</li>
 </ul>
 </body>
 </html>
diff --git a/OpenKeychain/src/main/res/raw-zh-rTW/help_changelog.html b/OpenKeychain/src/main/res/raw-zh-rTW/help_changelog.html
index 4d3d293ac..bf28ea2e0 100644
--- a/OpenKeychain/src/main/res/raw-zh-rTW/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-zh-rTW/help_changelog.html
@@ -4,22 +4,22 @@
 
 <h2>3.1.2</h2>
 <ul>
-<li>Fix key export to files (now for real)</li>
+<li>修正〝匯出金鑰到檔案〞功能(這次是真的了)</li>
 </ul>
 <h2>3.1.1</h2>
 <ul>
-<li>Fix key export to files (they were written partially)</li>
-<li>Fix crash on Android 2.3</li>
+<li>修正〝匯出金鑰到檔案〞功能(部分完成)</li>
+<li>修正在Android 2.3上的崩潰</li>
 </ul>
 <h2>3.1</h2>
 <ul>
-<li>Fix crash on Android 5</li>
-<li>New certify screen</li>
-<li>Secure Exchange directly from key list (SafeSlinger library)</li>
+<li>修正在Android 5上的崩潰</li>
+<li>新的認證畫面</li>
+<li>直接在金鑰清單進行安全的金鑰交換 (使用SafeSlinger程式庫)</li>
 <li>New QR Code program flow</li>
-<li>Redesigned decrypt screen</li>
+<li>重新設計的解密畫面</li>
 <li>New icon usage and colors</li>
-<li>Fix import of secret keys from Symantec Encryption Desktop</li>
+<li>修正從Symantec Encryption Desktop匯入密鑰的問題</li>
 <li>Subkey IDs on Yubikeys are now checked correctly</li>
 </ul>
 <h2>3.0.1</h2>
@@ -99,7 +99,7 @@
 </ul>
 <h2>2.5</h2>
 <ul>
-<li>Fix decryption of symmetric pgp messages/files</li>
+<li>Fix decryption of symmetric OpenPGP messages/files</li>
 <li>Refactored key edit screen (thanks to Ash Hughes)</li>
 <li>New modern design for encrypt/decrypt screens</li>
 <li>OpenPGP API version 3 (multiple api accounts, internal fixes, key lookup)</li>
diff --git a/OpenKeychain/src/main/res/raw-zh-rTW/help_start.html b/OpenKeychain/src/main/res/raw-zh-rTW/help_start.html
index ce6e388a8..44835cc46 100644
--- a/OpenKeychain/src/main/res/raw-zh-rTW/help_start.html
+++ b/OpenKeychain/src/main/res/raw-zh-rTW/help_start.html
@@ -4,7 +4,7 @@
 <h2>快速上手</h2>
 <p>首先你需要一支個人金鑰，通過選單來建立一支金鑰或是匯入現有私鑰。接下來，你可以下載你朋友的金鑰，或是通過QR條碼和NFC進行交換。</p>
 
-<p>Android 4.4以下的裝置可以下載<a href="market://details?id=org.openintents.filemanager">OI File Manager檔案總管</a>來選擇和加密檔案，要通過QR條碼分享需要先安裝<a href="market://details?id=com.google.zxing.client.android">條碼掃描器</a>。點選連結開啟Google Play商店或F-Droid進行安裝。</p>
+<p>On Android lower 4.4, it is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection.</p>
 
 <h2>我在OpenKeychain發現問題！</h2>
 <p>請通過<a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">OpenKeychain問題追蹤</a>回報問題。</p>
diff --git a/OpenKeychain/src/main/res/raw-zh-rTW/help_wot.html b/OpenKeychain/src/main/res/raw-zh-rTW/help_wot.html
index 3674f22c2..0db0d354f 100644
--- a/OpenKeychain/src/main/res/raw-zh-rTW/help_wot.html
+++ b/OpenKeychain/src/main/res/raw-zh-rTW/help_wot.html
@@ -2,7 +2,7 @@
 <head></head>
 <body>
 <h2>信任網</h2>
-<p>信任網描述了PGP建立與紀錄認證的部分，它提供使用者追蹤公鑰所有人並與他人分享此一資訊的機制。為了確保加密通訊的隱私，你必須確認用來加密的公鑰屬於你所期望的對象。</p>
+<p>The Web of Trust describes the part of OpenPGP which deals with creation and bookkeeping of certifications. It provides mechanisms to help the user keep track of who a public key belongs to, and share this information with others; To ensure the privacy of encrypted communication, it is essential to know that the public key you encrypt to belongs to the person you think it does.</p>
 
 <h2>OpenKeychain的支援狀況</h2>
 <p>目前OpenKeychain對信任網只有基本程度的支援。這是一件大工程，有任何進展將隨時發佈。</p>