aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/raw-zh
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2015-02-22 21:39:34 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2015-02-22 21:39:34 +0100
commitdf7009669ba983a1694b4a0e7d0ee64d7bc56dba (patch)
tree0d7bf579beeb0aea1f8ebea6744732d819344510 /OpenKeychain/src/main/res/raw-zh
parent21e7102e3ab73ab045a93025e976fc55da69428b (diff)
downloadopen-keychain-df7009669ba983a1694b4a0e7d0ee64d7bc56dba.tar.gz
open-keychain-df7009669ba983a1694b4a0e7d0ee64d7bc56dba.tar.bz2
open-keychain-df7009669ba983a1694b4a0e7d0ee64d7bc56dba.zip
Pull from transifex
Diffstat (limited to 'OpenKeychain/src/main/res/raw-zh')
-rw-r--r--OpenKeychain/src/main/res/raw-zh/help_changelog.html2
-rw-r--r--OpenKeychain/src/main/res/raw-zh/help_start.html2
-rw-r--r--OpenKeychain/src/main/res/raw-zh/help_wot.html2
3 files changed, 3 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/res/raw-zh/help_changelog.html b/OpenKeychain/src/main/res/raw-zh/help_changelog.html
index 728d85c11..7bba18be8 100644
--- a/OpenKeychain/src/main/res/raw-zh/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-zh/help_changelog.html
@@ -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/help_start.html b/OpenKeychain/src/main/res/raw-zh/help_start.html
index 357f937c9..1290e109a 100644
--- a/OpenKeychain/src/main/res/raw-zh/help_start.html
+++ b/OpenKeychain/src/main/res/raw-zh/help_start.html
@@ -4,7 +4,7 @@
<h2>快速上手指南</h2>
<p>首先你需要一个个人密钥。可以通过菜单创建一个密钥或者导入已有密钥。之后你就可以从网络下载朋友的密钥或者通过二维码和NFC功能交换密钥。</p>
-<p>安卓4.4一下版本可以通过该链接<a href="market://details?id=org.openintents.filemanager">下载OI File Manager文件管理器</a> 来选择和加密文件。使用二维码功能可以下载<a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a>. 点击链接可以从谷歌商店下载安装.</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/help_wot.html b/OpenKeychain/src/main/res/raw-zh/help_wot.html
index 29790139b..2a551f79c 100644
--- a/OpenKeychain/src/main/res/raw-zh/help_wot.html
+++ b/OpenKeychain/src/main/res/raw-zh/help_wot.html
@@ -2,7 +2,7 @@
<head></head>
<body>
<h2>Web of Trust</h2>
-<p>The Web of Trust describes the part of PGP 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>
+<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>Support in OpenKeychain</h2>
<p>There is only basic support for Web of Trust in OpenKeychain. This is a heavy work in progress and subject to changes in upcoming releases.</p>