diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-14 13:31:01 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-14 13:31:01 +0200 |
commit | 6da17ef6bbe9569e53268b446e59dcc69aaa2da4 (patch) | |
tree | 0747b0f06b974f032573f48c08930498050ab9ce /OpenKeychain/src/main/res/raw-ar/help_nfc_beam.html | |
parent | 881a50207af0a9f9f5aa69f451110de786779b54 (diff) | |
parent | 37edd0f390064e725d1b5c1c866a76c9922b0f64 (diff) | |
download | open-keychain-6da17ef6bbe9569e53268b446e59dcc69aaa2da4.tar.gz open-keychain-6da17ef6bbe9569e53268b446e59dcc69aaa2da4.tar.bz2 open-keychain-6da17ef6bbe9569e53268b446e59dcc69aaa2da4.zip |
Merge branch 'master' into yubikey
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java
Diffstat (limited to 'OpenKeychain/src/main/res/raw-ar/help_nfc_beam.html')
-rw-r--r-- | OpenKeychain/src/main/res/raw-ar/help_nfc_beam.html | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/OpenKeychain/src/main/res/raw-ar/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-ar/help_nfc_beam.html deleted file mode 100644 index 88492731c..000000000 --- a/OpenKeychain/src/main/res/raw-ar/help_nfc_beam.html +++ /dev/null @@ -1,12 +0,0 @@ -<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> |