diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-05 12:10:51 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-05 12:10:51 +0100 |
| commit | 7b3bc4ca98c2be52bec996287c5997c3c52e3603 (patch) | |
| tree | 861f5c7d329ea8c96e673b2c16f068d593a55fb9 /OpenKeychain/src/main/res/raw-sv/help_nfc_beam.html | |
| parent | 98ce06dbc9bea56d2960df2d7b8e7a5bc9e9e43a (diff) | |
| parent | 8c8fdd6c495bb12f5c76c9d1fc4a6a44f1c3808b (diff) | |
| download | open-keychain-7b3bc4ca98c2be52bec996287c5997c3c52e3603.tar.gz open-keychain-7b3bc4ca98c2be52bec996287c5997c3c52e3603.tar.bz2 open-keychain-7b3bc4ca98c2be52bec996287c5997c3c52e3603.zip | |
Merge branch 'development' into linked-identities
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
Diffstat (limited to 'OpenKeychain/src/main/res/raw-sv/help_nfc_beam.html')
| -rw-r--r-- | OpenKeychain/src/main/res/raw-sv/help_nfc_beam.html | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/OpenKeychain/src/main/res/raw-sv/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-sv/help_nfc_beam.html deleted file mode 100644 index 4e940a398..000000000 --- a/OpenKeychain/src/main/res/raw-sv/help_nfc_beam.html +++ /dev/null @@ -1,12 +0,0 @@ -<html> -<head></head> -<body> -<h2>Hur man tar emot nycklar</h2> -<ol> -<li>Go to your partners keys and open the key you want to share.</li> -<li>Håll de två enheternas baksidor mot varandra (de måste nästan vidröras) och du känner av en vibration.</li> -<li>Efter vibrationen kommer du att se innehållet på din partners enhet omvandlas till ett kortliknande föremål och en animation i bakgrunden som ser ut som Star Treks warp speed.</li> -<li>Tryck på kortet och innehållet kommer att laddas på den andra personens enhet.</li> -</ol> -</body> -</html> |