diff options
| author | mar-v-in <github@rvin.mooo.com> | 2014-06-04 21:32:37 +0200 |
|---|---|---|
| committer | mar-v-in <github@rvin.mooo.com> | 2014-06-04 21:32:37 +0200 |
| commit | cae0071342e746c934490298c3dd3ee230a2ee32 (patch) | |
| tree | 5c540d7c8ad84b462fd3cbc87b0aea7c5513fc9c /OpenKeychain/src/main/res/raw-ja/help_changelog.html | |
| parent | 6a637462782b4ce57ecf154edf0974114181b8ad (diff) | |
| parent | 52f1f30846ad7efa6e6ae11ed96f5b68626bfb3b (diff) | |
| download | open-keychain-cae0071342e746c934490298c3dd3ee230a2ee32.tar.gz open-keychain-cae0071342e746c934490298c3dd3ee230a2ee32.tar.bz2 open-keychain-cae0071342e746c934490298c3dd3ee230a2ee32.zip | |
Merge branch 'master' into automatic-contact-discovery
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
Diffstat (limited to 'OpenKeychain/src/main/res/raw-ja/help_changelog.html')
| -rw-r--r-- | OpenKeychain/src/main/res/raw-ja/help_changelog.html | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenKeychain/src/main/res/raw-ja/help_changelog.html b/OpenKeychain/src/main/res/raw-ja/help_changelog.html index 4bf40cbc3..0aae03ba6 100644 --- a/OpenKeychain/src/main/res/raw-ja/help_changelog.html +++ b/OpenKeychain/src/main/res/raw-ja/help_changelog.html @@ -4,10 +4,10 @@ <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> +<li>新しい鍵のビューのデザイン (Dominik, Vincent)</li> +<li>新しいフラットな Android ボタン (Dominik, Vincent)</li> +<li>API のフィックス (Dominik)</li> +<li>Keybase.io からのインポート (Tim Bray)</li> </ul> <h2>2.6.1</h2> <ul> |