diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-04-24 14:18:01 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-04-24 14:18:01 +0200 |
commit | b4aec3114d9911cf9aef0d14ee697e5131b2853f (patch) | |
tree | 7237de5955ec34d8849737b2f9229bfbb37d0c45 /OpenKeychain/src/main/res/raw-ja/help_start.md | |
parent | c2163460971cc01e65d7dfd18eec491f01ebc744 (diff) | |
parent | baac30508d24dcda6135bf8ae338c99d8c3b8ad8 (diff) | |
download | open-keychain-b4aec3114d9911cf9aef0d14ee697e5131b2853f.tar.gz open-keychain-b4aec3114d9911cf9aef0d14ee697e5131b2853f.tar.bz2 open-keychain-b4aec3114d9911cf9aef0d14ee697e5131b2853f.zip |
Merge branch 'development' into linked-identities
Conflicts:
Graphics/update-drawables.sh
OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java
OpenKeychain/build.gradle
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
Diffstat (limited to 'OpenKeychain/src/main/res/raw-ja/help_start.md')
-rw-r--r-- | OpenKeychain/src/main/res/raw-ja/help_start.md | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/res/raw-ja/help_start.md b/OpenKeychain/src/main/res/raw-ja/help_start.md index 1641f913b..4cc331942 100644 --- a/OpenKeychain/src/main/res/raw-ja/help_start.md +++ b/OpenKeychain/src/main/res/raw-ja/help_start.md @@ -1,8 +1,9 @@ +[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!) ## How do I activate OpenKeychain in K-9 Mail? To use OpenKeychain with K-9 Mail, you want to follow these steps: 1. Open K-9 Mail and long-tap on the account you want to use OpenKeychain with. - 2. Select "Account settings" and scroll to the very bottom and click "Cryptography". + 2. Select "Account settings", scroll to the very bottom and click "Cryptography". 3. Click on "OpenPGP Provider" and select OpenKeychain from the list. ## I found a bug in OpenKeychain! @@ -12,4 +13,4 @@ Please report the bug using the [issue tracker of OpenKeychain](https://github.c If you want to help us developing OpenKeychain by contributing code [follow our small guide on Github](https://github.com/openpgp-keychain/openpgp-keychain#contribute-code). ## Translations -Help translating OpenKeychain! Everybody can participate at [OpenKeychain on Transifex](https://www.transifex.com/projects/p/openpgp-keychain/).
\ No newline at end of file +Help translating OpenKeychain! Everybody can participate at [OpenKeychain on Transifex](https://www.transifex.com/projects/p/open-keychain/).
\ No newline at end of file |