diff --git a/OpenPGP-Keychain/res/raw/help_nfc_beam.html b/OpenPGP-Keychain/res/raw/help_nfc_beam.html index aa510008c..301c04267 100644 --- a/OpenPGP-Keychain/res/raw/help_nfc_beam.html +++ b/OpenPGP-Keychain/res/raw/help_nfc_beam.html @@ -5,12 +5,12 @@ And don't add newlines before or after p tags because of transifex --> -

How to receive keyrings

+

How to receive keys

    -
  1. Go to your partners 'Manage Public Keyrings' and long press on the keyring you want to share.
    2. +
  2. Go to your partners 'Manage Public Keys' and long press on the key you want to share.
  3. Hold the two devices back to back (they have to be almost touching) and you’ll feel a vibration.
  4. 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.
  5. Tap the card and the content will then load on the your device.
- \ No newline at end of file + diff --git a/OpenPGP-Keychain/res/values/strings.xml b/OpenPGP-Keychain/res/values/strings.xml index 3c4634eb6..c698eab79 100644 --- a/OpenPGP-Keychain/res/values/strings.xml +++ b/OpenPGP-Keychain/res/values/strings.xml @@ -20,15 +20,15 @@ Mail Inbox - Manage Public Keyrings - Manage Secret Keyrings - Select Public Keyring - Select Secret Keyring + Manage Public Keys + Manage Secret Keys + Select Public Key + Select Secret Key Encrypt Decrypt Passphrase Create Key - Edit Keyring + Edit Key Preferences Key Server Preference Change Passphrase @@ -36,17 +36,17 @@ "Send Mail…" Encrypt To File Decrypt To File - Import Keyrings - Export Keyring - Export Keyrings + Import Keys + Export Key + Export Keys Key Not Found Query Key Server Export to Key Server Unknown Signature Key - Sign Keyring + Sign Key About Help - Share keyring with NFC + Share key with NFC User IDs @@ -84,17 +84,17 @@ About Delete Account - Manage Public Keyrings - Manage Secret Keyrings + Manage Public Keys + Manage Secret Keys Settings Import from file Import from QR Code Import from NFC - Export All Keyrings + Export All Keys Export To File - Delete Keyring - Create Keyring - Edit Keyring + Delete Key + Create Key + Edit Key Search Help Query Key Server @@ -138,7 +138,7 @@ Name Comment Email - Send Keyring to Server? + Send Key to Server? Select 1 Selected Selected @@ -205,34 +205,34 @@ Successfully encrypted. Successfully encrypted to clipboard. Enter the passphrase twice. - Select at least one encryption keyring. - Select at least one encryption keyring or a signature keyring. + Select at least one encryption key. + Select at least one encryption key or a signature key. Please specify which file to encrypt to.\nWARNING! File will be overwritten if it exists. Please specify which file to decrypt to.\nWARNING! File will be overwritten if it exists. - Please specify which file to import keyrings from. (.asc or .gpg) + Please specify which file to import keys from. (.asc or .gpg) Please specify which file to export to.\nWARNING! File will be overwritten if it exists. - Please specify which file to export to.\nWARNING! You are about to export SECRET keyrings.\nWARNING! File will be overwritten if it exists. - Do you really want to delete the keyring \'%s\'?\nYou can\'t undo this! - Do you really want to delete the SECRET keyring \'%s\'?\nYou can\'t undo this! - Successfully added %1$s keyring(s) and updated %2$s keyring(s). - Successfully added %s keyring(s). - Successfully updated %s keyring(s). - No keyrings added or updated. - Successfully exported 1 keyring. - Successfully exported %s keyrings. - No keyrings exported. + Please specify which file to export to.\nWARNING! You are about to export SECRET keys.\nWARNING! File will be overwritten if it exists. + Do you really want to delete the key \'%s\'?\nYou can\'t undo this! + Do you really want to delete the SECRET key \'%s\'?\nYou can\'t undo this! + Successfully added %1$s key(s) and updated %2$s key(s). + Successfully added %s key(s). + Successfully updated %s key(s). + No keys added or updated. + Successfully exported 1 key. + Successfully exported %s keys. + No keys exported. Note: only subkeys support ElGamal, and for ElGamal the nearest keysize of 1536, 2048, 3072, 4096, or 8192 will be used. Couldn\'t find key %08X. Found %s key(s). Unknown signature, touch to look up key. %s bad secret key(s) ignored. Perhaps you exported with the option\n --export-secret-subkeys\nMake sure you export with\n --export-secret-keys\ninstead. - Unknown keyring %s, do you want to try finding it on a keyserver? - Successfully sent keyring to server - Successfully signed keyring - Successfully validated and imported keyring + Unknown key %s, do you want to try finding it on a keyserver? + Successfully sent key to server + Successfully signed key + Successfully validated and imported key Long press one entry in this list to show more options! This list is empty! - Successfully sent keyring with NFC Beam! + Successfully sent key with NFC Beam! Encrypt Decrypt - Import Public Keyrings - Import Secret Keyrings - Search Public Keyrings - Search Secret Keyrings + Import Public Keys + Import Secret Keys + Search Public Keys + Search Secret Keys Filter: \"%s\" - Share keyring with… + Share Key with… 512 @@ -337,8 +337,8 @@ - Manage Public Keyrings - My Secret Keyrings + Manage Public Keys + My Secret Keys Encrypt Decrypt Help @@ -352,13 +352,13 @@ Version: - Import keyring(s) (only locally) - Import, Sign, and upload keyring(s) + Import key(s) (only locally) + Import, Sign, and upload key(s) Finish OpenPGP: Decrypt File - OpenPGP: Import Keyring + OpenPGP: Import Key OpenPGP: Encrypt OpenPGP: Decrypt