diff options
author | mar-v-in <github@rvin.mooo.com> | 2014-07-06 02:24:34 +0200 |
---|---|---|
committer | mar-v-in <github@rvin.mooo.com> | 2014-07-06 02:24:34 +0200 |
commit | fdf6411d5f059a2cde6bb32841895d5bf501ebe8 (patch) | |
tree | de8f6434ad00dd2a688160204aa5762b49f14b99 /OpenKeychain/src/main/res/raw-sk/help_nfc_beam.html | |
parent | 1b0666e9de5caea14997a3e638a6209b45c97d60 (diff) | |
parent | 3363507be48e6ee77341fc8d637528610dc5136f (diff) | |
download | open-keychain-fdf6411d5f059a2cde6bb32841895d5bf501ebe8.tar.gz open-keychain-fdf6411d5f059a2cde6bb32841895d5bf501ebe8.tar.bz2 open-keychain-fdf6411d5f059a2cde6bb32841895d5bf501ebe8.zip |
Merge branch 'master' into improve-file-more
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
OpenKeychain/src/main/res/layout/encrypt_content.xml
Diffstat (limited to 'OpenKeychain/src/main/res/raw-sk/help_nfc_beam.html')
-rw-r--r-- | OpenKeychain/src/main/res/raw-sk/help_nfc_beam.html | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/raw-sk/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-sk/help_nfc_beam.html new file mode 100644 index 000000000..88492731c --- /dev/null +++ b/OpenKeychain/src/main/res/raw-sk/help_nfc_beam.html @@ -0,0 +1,12 @@ +<html> +<head></head> +<body> +<h2>How to receive keys</h2> +<ol> +<li>Go to your partners contacts and open the contact you want to share.</li> +<li>Hold the two devices back to back (they have to be almost touching) and you’ll feel a vibration.</li> +<li>After it vibrates you’ll see the content on your partners device turn into a card-like object with Star Trek warp speed-looking animation in the background.</li> +<li>Tap the card and the content will then load on the your device.</li> +</ol> +</body> +</html> |