aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/raw-zh
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2015-03-10 16:19:46 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2015-03-10 16:19:46 +0100
commit58d066a54e5ed1d4f7f28f22f49826fe5b69e172 (patch)
treefeb3c84d1a34a829dea892fd523256e80da04860 /OpenKeychain/src/main/res/raw-zh
parent446e16fc62df97ceb554efee5a745e018afcb569 (diff)
downloadopen-keychain-58d066a54e5ed1d4f7f28f22f49826fe5b69e172.tar.gz
open-keychain-58d066a54e5ed1d4f7f28f22f49826fe5b69e172.tar.bz2
open-keychain-58d066a54e5ed1d4f7f28f22f49826fe5b69e172.zip
Pull from transifex
Diffstat (limited to 'OpenKeychain/src/main/res/raw-zh')
-rw-r--r--OpenKeychain/src/main/res/raw-zh/help_about.html20
-rw-r--r--OpenKeychain/src/main/res/raw-zh/help_changelog.html4
-rw-r--r--OpenKeychain/src/main/res/raw-zh/help_start.html13
3 files changed, 22 insertions, 15 deletions
diff --git a/OpenKeychain/src/main/res/raw-zh/help_about.html b/OpenKeychain/src/main/res/raw-zh/help_about.html
index 7c3813133..9fa512604 100644
--- a/OpenKeychain/src/main/res/raw-zh/help_about.html
+++ b/OpenKeychain/src/main/res/raw-zh/help_about.html
@@ -31,27 +31,31 @@
<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://rtyley.github.com/spongycastle/">SpongyCastle</a> (MIT X11 License)</li>
+<li>
+<a href="https://github.com/SafeSlingerProject/exchange-android">SafeSlinger Exchange library</a> (MIT License)</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 Libraries</a> (Apache License v2)</li>
<li>
<a href="https://github.com/timbray/KeybaseLib">KeybaseLib</a> (Apache License v2)</li>
<li>
-<a href="https://github.com/JohnPersano/SuperToasts">SuperToasts</a> (Apache License v2)</li>
-<li>
<a href="https://github.com/splitwise/TokenAutoComplete">TokenAutoComplete</a> (Apache License v2)</li>
<li>
<a href="https://github.com/rtreffer/minidns">MiniDNS</a> (Apache License v2)</li>
<li>
<a href="https://github.com/emilsjolander/StickyListHeaders">StickyListHeaders</a> (Apache License v2)</li>
<li>
-<a href="http://code.google.com/p/zxing/">ZXing</a> (Apache License v2)</li>
+<a href="https://github.com/zxing/zxing">ZXing</a> (Apache License v2)</li>
<li>
-<a href="http://rtyley.github.com/spongycastle/">SpongyCastle</a> (MIT X11 License)</li>
+<a href="https://github.com/journeyapps/zxing-android-embedded">ZXing Android Minimal</a> (Apache License v2)</li>
<li>
-<a href="https://github.com/dschuermann/html-textview">HtmlTextView</a> (Apache License v2)</li>
+<a href="https://github.com/jpardogo/PagerSlidingTabStrip">PagerSlidingTabStrip (Material Design)</a> (Apache License v2)</li>
<li>
-<a href="https://github.com/SafeSlingerProject/exchange-android">SafeSlinger Exchange library</a> (MIT License)</li>
+<a href="https://github.com/neokree/MaterialNavigationDrawer">MaterialNavigationDrawer</a> (Apache License v2)</li>
+<li>
+<a href="https://github.com/nispok/snackbar">Snackbar</a> (MIT License)</li>
+<li>
+<a href="https://github.com/futuresimple/android-floating-action-button">FloatingActionButton</a> (Apache License v2)</li>
</ul>
</body>
</html>
diff --git a/OpenKeychain/src/main/res/raw-zh/help_changelog.html b/OpenKeychain/src/main/res/raw-zh/help_changelog.html
index 7bba18be8..af25ad08e 100644
--- a/OpenKeychain/src/main/res/raw-zh/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-zh/help_changelog.html
@@ -9,11 +9,11 @@
<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>解决在 Android 2.3 下的崩溃</li>
</ul>
<h2>3.1</h2>
<ul>
-<li>Fix crash on Android 5</li>
+<li>解决在 Android 5 下的崩溃</li>
<li>New certify screen</li>
<li>Secure Exchange directly from key list (SafeSlinger library)</li>
<li>New QR Code program flow</li>
diff --git a/OpenKeychain/src/main/res/raw-zh/help_start.html b/OpenKeychain/src/main/res/raw-zh/help_start.html
index 1290e109a..cf1b84941 100644
--- a/OpenKeychain/src/main/res/raw-zh/help_start.html
+++ b/OpenKeychain/src/main/res/raw-zh/help_start.html
@@ -1,18 +1,21 @@
<html>
<head></head>
<body>
-<h2>快速上手指南</h2>
-<p>首先你需要一个个人密钥。可以通过菜单创建一个密钥或者导入已有密钥。之后你就可以从网络下载朋友的密钥或者通过二维码和NFC功能交换密钥。</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>How do I activate OpenKeychain in K-9 Mail?</h2>
+<p>To use OpenKeychain with K-9 Mail, you want to follow these steps:</p>
+<ol>
+<li>Open K-9 Mail and long-tap on the account you want to use OpenKeychain with.</li>
+ <li>Select "Account settings" and scroll to the very bottom and click "Cryptography".</li>
+ <li>Click on "OpenPGP Provider" and select OpenKeychain from the list.</li>
+</ol>
<h2>我在OpenKeychain發現問題!</h2>
<p>請利用 <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">OpenKeychain 項目回報系統</a>回報問題。</p>
<h2>發布</h2>
<p>帮助我们开发 <a href="https://github.com/openpgp-keychain/openpgp-keychain#contribute-code">Github</a>.</p>
-<h2>翻譯</h2>
+<h2>翻译</h2>
<p>帮助翻译 OpenKeychain。 <a href="https://www.transifex.com/projects/p/openpgp-keychain/">OpenKeychain on Transifex</a>.</p>
</body>