aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/raw-ja
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-09-08 14:26:10 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-09-08 14:26:10 +0200
commit980674b322dffe2b38b8349dc9e569d18b86b4fd (patch)
tree96876e4d43dcdc3cb9f77064f034d25f41f7b6cd /OpenKeychain/src/main/res/raw-ja
parentfcd4be5ba008563ee4cfea3db64e0086356cfec4 (diff)
downloadopen-keychain-980674b322dffe2b38b8349dc9e569d18b86b4fd.tar.gz
open-keychain-980674b322dffe2b38b8349dc9e569d18b86b4fd.tar.bz2
open-keychain-980674b322dffe2b38b8349dc9e569d18b86b4fd.zip
Pull from transifex
Diffstat (limited to 'OpenKeychain/src/main/res/raw-ja')
-rw-r--r--OpenKeychain/src/main/res/raw-ja/help_about.html3
-rw-r--r--OpenKeychain/src/main/res/raw-ja/help_changelog.html14
2 files changed, 16 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/res/raw-ja/help_about.html b/OpenKeychain/src/main/res/raw-ja/help_about.html
index 834d9f6de..6a5882640 100644
--- a/OpenKeychain/src/main/res/raw-ja/help_about.html
+++ b/OpenKeychain/src/main/res/raw-ja/help_about.html
@@ -22,6 +22,7 @@
<li>Nikhil Peter Raj</li>
<li>Paul Sarbinowski</li>
<li>'Senecaso'</li>
+<li>Signe Rüsch</li>
<li>Sreeram Boyapati</li>
<li>Thialfihar (APG 1.x)</li>
<li>Tim Bray</li>
@@ -49,6 +50,8 @@
<a href="http://rtyley.github.com/spongycastle/">SpongyCastle</a> (MIT X11 License)</li>
<li>
<a href="https://github.com/dschuermann/html-textview">HtmlTextView</a> (Apache License v2)</li>
+<li>
+<a href="https://github.com/SafeSlingerProject/exchange-android">SafeSlinger Exchange library</a> (MIT License)</li>
</ul>
</body>
</html>
diff --git a/OpenKeychain/src/main/res/raw-ja/help_changelog.html b/OpenKeychain/src/main/res/raw-ja/help_changelog.html
index 959e10d21..3234a49ae 100644
--- a/OpenKeychain/src/main/res/raw-ja/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-ja/help_changelog.html
@@ -1,6 +1,18 @@
<html>
<head></head>
<body>
+<h2>2.10</h2>
+<ul>
+<li>Split encrypt screen into two</li>
+<li>Fix key flags handling (now supporting Mailvelope 0.7 keys)</li>
+<li>Improved passphrase handling</li>
+<li>Key sharing via SafeSlinger</li>
+<li>Yubikey: preference to allow other PINs, currently only signing via the OpenPGP API works, not inside of OpenKeychain</li>
+<li>Fix usage of stripped keys</li>
+<li>SHA256 as default for compatibility</li>
+<li>Intent API has changed, see https://github.com/open-keychain/open-keychain/wiki/Intent-API</li>
+<li>OpenPGP API now handles revoked/expired keys and returns all user ids</li>
+</ul>
<h2>2.9</h2>
<ul>
<li>v2.8 から発生したクラッシュ問題をFix</li>
@@ -57,7 +69,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
<li>新しい統合キーリスト</li>
<li>鍵指紋のカラー化</li>
<li>鍵サーバのポート設定のサポート</li>
-<li>弱い鍵の生成をしてしまうのを無効化</li>
+<li>弱い鍵の生成が可能だったのを無効化</li>
<li>さらなるAPIでの内部動作</li>
<li>ユーザーIDの証明</li>
<li>鍵サーバへの要求をマシンリーダブル出力を基盤にした</li>