diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-06 01:08:12 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-06 01:08:12 +0200 |
| commit | 881a50207af0a9f9f5aa69f451110de786779b54 (patch) | |
| tree | 776bf4363c3e8736c3678eba93017387fffd8463 /OpenKeychain/src/main/res/raw-ja/help_changelog.html | |
| parent | 0bfac9989f801aa93d8bc336307d60b817995688 (diff) | |
| parent | 6ba7536838b8fbc69684bec7c3e847afcb5e9d6a (diff) | |
| download | open-keychain-881a50207af0a9f9f5aa69f451110de786779b54.tar.gz open-keychain-881a50207af0a9f9f5aa69f451110de786779b54.tar.bz2 open-keychain-881a50207af0a9f9f5aa69f451110de786779b54.zip | |
Merge branch 'master' into yubikey
Conflicts:
.gitmodules
OpenKeychain/build.gradle
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
extern/openpgp-api-lib
settings.gradle
Diffstat (limited to 'OpenKeychain/src/main/res/raw-ja/help_changelog.html')
| -rw-r--r-- | OpenKeychain/src/main/res/raw-ja/help_changelog.html | 2 |
1 files changed, 1 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 0aae03ba6..0bde8d000 100644 --- a/OpenKeychain/src/main/res/raw-ja/help_changelog.html +++ b/OpenKeychain/src/main/res/raw-ja/help_changelog.html @@ -38,7 +38,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa <li>鍵サーバのポート設定のサポート</li> <li>弱い鍵の生成が可能だったのを無効化</li> <li>さらなるAPIでの内部動作</li> -<li>ユーザーIDの証明</li> +<li>ユーザIDの証明</li> <li>鍵サーバへの要求をマシンリーダブル出力を基盤にした</li> <li>タブレットでのナビゲーションドロワーのロック</li> <li>鍵の生成についてメールでのサジェスト</li> |