diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-05-14 16:02:28 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-05-14 16:02:28 +0200 |
| commit | 2f95100d88954db389cba8e615390795d121c1c8 (patch) | |
| tree | 1bf4ffb29bb83fac33ba2ed7c84fb1d6a8af2bd4 /OpenKeychain/src/main/res/raw-ja | |
| parent | 90ac60b6db0637fbefbce5cb2cd80a64f5bb708d (diff) | |
| parent | 638554f2560b3c5fd36ca9b4ba205cb5a999b84b (diff) | |
| download | open-keychain-2f95100d88954db389cba8e615390795d121c1c8.tar.gz open-keychain-2f95100d88954db389cba8e615390795d121c1c8.tar.bz2 open-keychain-2f95100d88954db389cba8e615390795d121c1c8.zip | |
Merge remote-tracking branch 'origin/master' into wrapped-key-ring
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewCertActivity.java
OpenKeychain/src/main/res/values/strings.xml
Diffstat (limited to 'OpenKeychain/src/main/res/raw-ja')
| -rw-r--r-- | OpenKeychain/src/main/res/raw-ja/help_changelog.html | 10 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/raw-ja/help_start.html | 5 |
2 files changed, 14 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/res/raw-ja/help_changelog.html b/OpenKeychain/src/main/res/raw-ja/help_changelog.html index c7f943602..4bf40cbc3 100644 --- a/OpenKeychain/src/main/res/raw-ja/help_changelog.html +++ b/OpenKeychain/src/main/res/raw-ja/help_changelog.html @@ -1,6 +1,14 @@ <html> <head></head> <body> +<h2>2.7</h2> +<ul> +<li>Purple! (Dominik, Vincent)</li> +<li>New key view design (Dominik, Vincent)</li> +<li>New flat Android buttons (Dominik, Vincent)</li> +<li>API fixes (Dominik)</li> +<li>Keybase.io import (Tim Bray)</li> +</ul> <h2>2.6.1</h2> <ul> <li>いくつかのリグレッションバグ修正</li> @@ -25,7 +33,7 @@ また、以下の人達(アルファベット順)の作ってくれたいくつもののさなパッチや相当数のパッチにも: Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.</p> <ul> -<li>新しい統合キーリスト</li> +<li>新しい統合鍵リスト</li> <li>鍵指紋のカラー化</li> <li>鍵サーバのポート設定のサポート</li> <li>弱い鍵の生成が可能だったのを無効化</li> diff --git a/OpenKeychain/src/main/res/raw-ja/help_start.html b/OpenKeychain/src/main/res/raw-ja/help_start.html index 13154ce47..502d4adb8 100644 --- a/OpenKeychain/src/main/res/raw-ja/help_start.html +++ b/OpenKeychain/src/main/res/raw-ja/help_start.html @@ -6,6 +6,11 @@ <p>ファイルの選択を拡張するには<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>を生成したQRコードのスキャンのため、それぞれのインストールを必要とします。 リンクをクリックして、Google Play Store上かF-Droidからインストールしてください。</p> +<h2>Applications</h2> +<p>Several applications support OpenKeychain to encrypt/sign your private communication:</p> +<p><a href="market://details?id=eu.siacs.conversations"><img src="apps_conversations">Conversations</a>: Jabber/XMPP client</p> +<p><img src="apps_k9">K-9 Mail: OpenKeychain support available in current <a href="https://github.com/k9mail/k-9/releases/tag/4.904">alpha build</a>!</p> + <h2>OpenKeychainでバグを見付けた!</h2> <p><a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">OpenKeychainのIssueトラッカー</a>を使ってバグレポートを送ってください。</p> |