Pull from transifex

2 files changed, 28 insertions, 21 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 4e3a03b4b..ed32e0d5d 100644
--- a/OpenKeychain/src/main/res/raw-zh-rTW/help_about.md
+++ b/OpenKeychain/src/main/res/raw-zh-rTW/help_about.md
@@ -6,14 +6,21 @@
 
 授權：GPLv3+
 
+[//]: # (備註： 字母順序排序)
+
 ##主要開發者
   * Dominik Schürmann (維護人)
   * Vincent Breitmoser
 
-##貢獻者
+主要開發者
   * Adithya Abraham Philip
-  * Art O Cathain
   * Ash Hughes
+  * 'mar-v-in'
+  * 'Thialfihar' (APG開發者)
+  * Tim Bray
+
+##不固定的貢獻者
+  * Art O Cathain
   * Brian C. Barnes
   * Bahtiar 'kalkin' Gadimov
   * Daniel Albert
@@ -34,7 +41,6 @@
   * 'ligi'
   * Lukas Zorich
   * Manoj Khanna
-  * 'mar-v-in'
   * Markus Doits
   * Miroojin Bakshi
   * Morgan Gangwere
@@ -44,22 +50,23 @@
   * Signe Rüsch
   * Sreeram Boyapati
   * 'steelman'
-  * 'Thialfihar' (APG開發者)
-  * Tim Bray
+
+[//]: # (備註： 字母順序排序)
 
 ##函式庫
-  * [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)
+  * [FloatingActionButton](https://github.com/futuresimple/android-floating-action-button) (Apache License v2)
+  * [HtmlTextView](https://github.com/sufficientlysecure/html-textview) (Apache License v2)
   * [KeybaseLib](https://github.com/timbray/KeybaseLib) (Apache License v2)
-  * [TokenAutoComplete](https://github.com/splitwise/TokenAutoComplete) (Apache License v2)
+  * [Markdown4J](https://github.com/jdcasey/markdown4j) (Apache License v2)
+  * [MaterialDrawer](https://github.com/mikepenz/MaterialDrawer) (Apache License v2)
   * [MiniDNS](https://github.com/rtreffer/minidns) (Apache License v2)
-  * [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)
+  * [OkHttp](http://square.github.io/okhttp/) (Apache License v2)
   * [PagerSlidingTabStrip](https://github.com/jpardogo/PagerSlidingTabStrip) (Material Design) (Apache License v2)
-  * [MaterialDrawer](https://github.com/mikepenz/MaterialDrawer) (Apache License v2)
+  * [SafeSlinger Exchange library](https://github.com/SafeSlingerProject/exchange-android) (MIT License)
   * [Snackbar](https://github.com/nispok/snackbar) (MIT License)
-  * [FloatingActionButton](https://github.com/futuresimple/android-floating-action-button) (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
+  * [SpongyCastle](http://rtyley.github.com/spongycastle/) (MIT X11 License)
+  * [StickyListHeaders](https://github.com/emilsjolander/StickyListHeaders) (Apache License v2)
+  * [TokenAutoComplete](https://github.com/splitwise/TokenAutoComplete) (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)
\ 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 eae12e9fc..20f2ef6c5 100644
--- a/OpenKeychain/src/main/res/raw-zh-rTW/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-zh-rTW/help_changelog.md
@@ -2,21 +2,21 @@
 
 ## 3.5
 
-  * Key revocation on key deletion
-  * Improved checks for insecure cryptography
-  * Fix: Don't close OpenKeychain after first time wizard succeeds
+  *可以在刪除金鑰時撤銷金鑰
+  *改進對加密安全性進行檢查
+  *修正：在OpenKeychain第一次執行精靈成功後不自動關閉程式
   * API: Version 8
 
 ## 3.4
 
   * Anonymous key download over Tor
-  * Proxy support
+  *支援代理伺服器
   * Better YubiKey error handling
 
 ## 3.3
 
-  * New decryption screen
-  * Decryption of multiple files at once
+  *新的解密畫面
+  *可同時解密多個檔案
   * Better handling of YubiKey errors
 
 ## 3.2