diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-15 20:02:57 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-15 20:02:57 +0100 |
| commit | 4afd6b881edfd0bc404734a4e8959a7a0fa785a7 (patch) | |
| tree | 63a051fb595d168f8ddbfd76a51bb2319889d40b /OpenKeychain/src/main/res/raw/nfc_beam_share.html | |
| parent | ba7d8a58673d55660bc7faf68970229f17458514 (diff) | |
| parent | db39b779c984a758e13adc16837893509f3b364f (diff) | |
| download | open-keychain-4afd6b881edfd0bc404734a4e8959a7a0fa785a7.tar.gz open-keychain-4afd6b881edfd0bc404734a4e8959a7a0fa785a7.tar.bz2 open-keychain-4afd6b881edfd0bc404734a4e8959a7a0fa785a7.zip | |
Merge branch 'development' into linked-identities
Conflicts:
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/nfc_beam_share.html')
| -rw-r--r-- | OpenKeychain/src/main/res/raw/nfc_beam_share.html | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/OpenKeychain/src/main/res/raw/nfc_beam_share.html b/OpenKeychain/src/main/res/raw/nfc_beam_share.html deleted file mode 100644 index 873c71777..000000000 --- a/OpenKeychain/src/main/res/raw/nfc_beam_share.html +++ /dev/null @@ -1,15 +0,0 @@ -<!-- Maintain structure with headings with h2 tags and content with p tags. -This makes it easy to translate the values with transifex! -And don't add newlines before or after p tags because of transifex --> -<html> -<head> -</head> -<body> -<ol> -<li>Make sure that NFC is turned on in Settings > More > NFC and make sure that Android Beam is also on in the same section.</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 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 other person’s device.</li> -</ol> -</body> -</html>
\ No newline at end of file |