diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-10-25 02:49:37 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-10-25 02:49:37 +0200 |
| commit | c5028dc9ce996e31e35e2d806e7db0241924e957 (patch) | |
| tree | 4fb74636c177c1b60c158660857463fba67ec47b /OpenKeychain/src/main/res/values | |
| parent | 30d0afa3632b9dda4834ab3070e18e06db32b1b7 (diff) | |
| parent | 49b237d6095234053227f6cd4ee50a27c2e6fa61 (diff) | |
| download | open-keychain-c5028dc9ce996e31e35e2d806e7db0241924e957.tar.gz open-keychain-c5028dc9ce996e31e35e2d806e7db0241924e957.tar.bz2 open-keychain-c5028dc9ce996e31e35e2d806e7db0241924e957.zip | |
Merge branch 'development' of github.com:open-keychain/open-keychain into development
Diffstat (limited to 'OpenKeychain/src/main/res/values')
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index a5763683d..f303f25b2 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -39,6 +39,7 @@ <string name="title_help">"Help"</string> <string name="title_log_display">"Log"</string> <string name="title_create_key">"Create Key"</string> + <string name="title_exchange_keys">"Exchange Keys"</string> <!-- section --> <string name="section_user_ids">"Identities"</string> @@ -238,7 +239,6 @@ <string name="select_key_to_certify">"Please select a key to be used for certification!"</string> <string name="key_too_big_for_sharing">"Key is too big to be shared this way!"</string> <string name="text_copied_to_clipboard">"Text has been copied to the clipboard!"</string> - <string name="select_key_for_exchange">"Please select a key to be used for secure exchange!"</string> <!-- errors @@ -283,12 +283,7 @@ <string name="decrypt_invalid_button">"I understand the risks, display it!"</string> <!-- Add keys --> - <string name="add_keys_section_secure_exchange">"Exchange"</string> - <string name="add_keys_section_secure_add">"Add"</string> <string name="add_keys_my_key">"My key:"</string> - <string name="add_keys_start_exchange">"Start exchange"</string> - <string name="add_keys_qr_code">"Scan QR Code"</string> - <string name="add_keys_nfc">"Receive via NFC"</string> <!-- progress dialogs, usually ending in '…' --> <string name="progress_done">"Done."</string> |