master merge

2 files changed, 38 insertions, 27 deletions

diff --git a/OpenPGP-Keychain/src/main/res/values/static_strings.xml b/OpenPGP-Keychain/src/main/res/values/static_strings.xml
index 3c9cf6673..faf1e687a 100644
--- a/OpenPGP-Keychain/src/main/res/values/static_strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values/static_strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name" translatable="false">OpenPGP Keychain</string>
+    <string name="app_name" translatable="false">OpenKeychain</string>
 
 </resources>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/src/main/res/values/strings.xml b/OpenPGP-Keychain/src/main/res/values/strings.xml
index 64c9be32d..861a50eaa 100644
--- a/OpenPGP-Keychain/src/main/res/values/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values/strings.xml
@@ -13,7 +13,7 @@
     <string name="title_edit_key">Edit Key</string>
     <string name="title_preferences">Preferences</string>
     <string name="title_api_registered_apps">Registered Applications</string>
-    <string name="title_key_server_preference">Key Server Preference</string>
+    <string name="title_key_server_preference">Keyserver Preference</string>
     <string name="title_change_pass_phrase">Change Passphrase</string>
     <string name="title_set_passphrase">Set Passphrase</string>
     <string name="title_send_email">"Send Mail…"</string>
@@ -23,10 +23,10 @@
     <string name="title_export_key">Export Key</string>
     <string name="title_export_keys">Export Keys</string>
     <string name="title_key_not_found">Key Not Found</string>
-    <string name="title_key_server_query">Query Key Server</string>
-    <string name="title_send_key">Upload to Key Server</string>
+    <string name="title_key_server_query">Query Keyserver</string>
+    <string name="title_send_key">Upload to Keyserver</string>
     <string name="title_unknown_signature_key">Unknown Signature Key</string>
-    <string name="title_sign_key">Sign Key</string>
+    <string name="title_certify_key">Certify Key</string>
     <string name="title_key_details">Key Details</string>
     <string name="title_help">Help</string>
 
@@ -39,14 +39,15 @@
     <string name="section_master_key">Master Key</string>
     <string name="section_master_user_id">Master User ID</string>
     <string name="section_actions">Actions</string>
-    <string name="section_signing_key">Your Key used for Signing</string>
+    <string name="section_certification_key">Your Key used for certification</string>
     <string name="section_upload_key">Upload Key</string>
-    <string name="section_key_server">Key Server</string>
+    <string name="section_key_server">Keyserver</string>
     <string name="section_encrypt_and_or_sign">Encrypt and/or Sign</string>
     <string name="section_decrypt_verify">Decrypt and Verify</string>
 
     <!-- button -->
     <string name="btn_sign">Sign</string>
+    <string name="btn_certify">Certify</string>
     <string name="btn_decrypt">Decrypt</string>
     <string name="btn_decrypt_verify">Decrypt and Verify</string>
     <string name="btn_select_encrypt_keys">Select Recipients</string>
@@ -59,12 +60,12 @@
     <string name="btn_change_passphrase">Change New Passphrase</string>
     <string name="btn_set_passphrase">Set New Passphrase</string>
     <string name="btn_search">Search</string>
-    <string name="btn_export_to_server">Upload To Key Server</string>
+    <string name="btn_export_to_server">Upload To Keyserver</string>
     <string name="btn_next">Next</string>
     <string name="btn_back">Back</string>
     <string name="btn_clipboard">Clipboard</string>
     <string name="btn_share">Share with…</string>
-
+    <string name="btn_lookup_key">Lookup key</string>
 
     <!-- menu -->
     <string name="menu_preferences">Settings</string>
@@ -79,8 +80,8 @@
     <string name="menu_create_key">Create key</string>
     <string name="menu_create_key_expert">Create key (expert)</string>
     <string name="menu_search">Search</string>
-    <string name="menu_key_server">Import from key server</string>
-    <string name="menu_update_key">Update from key server</string>
+    <string name="menu_key_server">Import from keyserver</string>
+    <string name="menu_update_key">Update from keyserver</string>
     <string name="menu_export_key_to_server">Upload to key server</string>
     <string name="menu_share">Share</string>
     <string name="menu_share_title_fingerprint">Share fingerprint…</string>
@@ -115,8 +116,8 @@
     <string name="label_passphrase_cache_ttl">Passphrase Cache</string>
     <string name="label_message_compression">Message Compression</string>
     <string name="label_file_compression">File Compression</string>
-    <string name="label_force_v3_signature">Force V3 Signatures</string>
-    <string name="label_key_servers">Key Servers</string>
+    <string name="label_force_v3_signature">Force old OpenPGPv3 Signatures</string>
+    <string name="label_key_servers">Keyservers</string>
     <string name="label_key_id">Key ID</string>
     <string name="label_creation">Creation</string>
     <string name="label_expiry">Expiry</string>
@@ -126,7 +127,7 @@
     <string name="label_name">Name</string>
     <string name="label_comment">Comment</string>
     <string name="label_email">Email</string>
-    <string name="label_send_key">Upload key to selected key server after signing</string>
+    <string name="label_send_key">Upload key to selected keyserver after certification</string>
     <string name="label_fingerprint">Fingerprint</string>
     <string name="select_keys_button_default">Select</string>
 
@@ -142,10 +143,11 @@
     <string name="can_encrypt">can encrypt</string>
     <string name="can_sign">can sign</string>
     <string name="expired">expired</string>
+    <string name="revoked">revoked</string>
 
     <plurals name="n_key_servers">
-        <item quantity="one">%d key server</item>
-        <item quantity="other">%d key servers</item>
+        <item quantity="one">%d keyserver</item>
+        <item quantity="other">%d keyservers</item>
     </plurals>
 
     <string name="fingerprint">Fingerprint:</string>
@@ -235,15 +237,14 @@
         <item quantity="other">Found %d keys.</item>
     </plurals>
 
-    <string name="unknown_signature_key_touch_to_look_up">Unknown signature, touch to look up key.</string>
+    <string name="unknown_signature">Unknown signature, click button to lookup the missing key.</string>
 
     <plurals name="bad_keys_encountered">
         <item quantity="one">%d bad secret key ignored. Perhaps you exported with the option\n --export-secret-subkeys\nMake sure you export with\n --export-secret-keys\ninstead.</item>
         <item quantity="other">%d bad secret keys ignored. Perhaps you exported with the option\n --export-secret-subkeys\nMake sure you export with\n --export-secret-keys\ninstead.</item>
     </plurals>
 
-    <string name="lookup_unknown_key">Unknown key %s, do you want to try finding it on a keyserver?</string>
-    <string name="key_send_success">Successfully sent key to server</string>
+    <string name="key_send_success">Successfully uploaded key to server</string>
     <string name="key_sign_success">Successfully signed key</string>
     <string name="list_empty">This list is empty!</string>
     <string name="nfc_successfull">Successfully sent key with NFC Beam!</string>
@@ -277,6 +278,7 @@
     <string name="error_no_signature_key">no signature key given</string>
     <string name="error_invalid_data">not valid encryption data</string>
     <string name="error_corrupt_data">corrupt data</string>
+    <string name="error_integrity_check_failed">integrity check failed! Data has been modified!</string>
     <string name="error_no_symmetric_encryption_packet">couldn\'t find a packet with symmetric encryption</string>
     <string name="error_wrong_passphrase">wrong passphrase</string>
     <string name="error_saving_keys">error saving some keys</string>
@@ -287,13 +289,19 @@
     <string name="error_nothing_import">Nothing to import!</string>
     <string name="error_expiry_must_come_after_creation">expiry date must come after creation date</string>
     <string name="error_save_first">please save the keyring first</string>
+    <string name="error_can_not_delete_contact">you can not delete this contact because it is your own.</string>
+    <string name="error_can_not_delete_contacts">you can not delete the following contacts because they are your own:\n%s</string>
+    <plurals name="error_can_not_delete_info">
+        <item quantity="one">Please delete it from the \'My Keys\' screen!</item>
+        <item quantity="other">Please delete them from the \'My Keys\' screen!</item>
+    </plurals>
 
     <!-- progress dialogs, usually ending in '…' -->
     <string name="progress_done">done.</string>
     <string name="progress_saving">saving…</string>
     <string name="progress_importing">importing…</string>
     <string name="progress_exporting">exporting…</string>
-    <string name="progress_generating">generating key, this can take a while…</string>
+    <string name="progress_generating">generating key, this can take up to 3 minutes…</string>
     <string name="progress_building_key">building key…</string>
     <string name="progress_preparing_master_key">preparing master key…</string>
     <string name="progress_certifying_master_key">certifying master key…</string>
@@ -365,13 +373,13 @@
     <string name="import_clipboard_button">Get key from clipboard</string>
 
     <!-- Intent labels -->
-    <string name="intent_decrypt_file">OpenPGP: Decrypt File</string>
-    <string name="intent_import_key">OpenPGP: Import Key</string>
-    <string name="intent_send_encrypt">OpenPGP: Encrypt</string>
-    <string name="intent_send_decrypt">OpenPGP: Decrypt</string>
+    <string name="intent_decrypt_file">OpenKeychain: Decrypt File</string>
+    <string name="intent_import_key">OpenKeychain: Import Key</string>
+    <string name="intent_send_encrypt">OpenKeychain: Encrypt</string>
+    <string name="intent_send_decrypt">OpenKeychain: Decrypt</string>
 
     <!-- Remote API -->
-    <string name="api_no_apps">No registered applications!</string>
+    <string name="api_no_apps">No registered applications!\n\nThird-party applications can request access to OpenKeychain. After granting access, they will be listed here.</string>
     <string name="api_settings_show_advanced">Show advanced settings</string>
     <string name="api_settings_hide_advanced">Hide advanced settings</string>
     <string name="api_settings_no_key">No key selected</string>
@@ -381,14 +389,14 @@
     <string name="api_settings_revoke">Revoke access</string>
     <string name="api_settings_package_name">Package Name</string>
     <string name="api_settings_package_signature">SHA-256 of Package Signature</string>
-    <string name="api_register_text">The following application requests access to OpenPGP Keychain\'s API.\n\nAllow permanent access?</string>
+    <string name="api_register_text">The displayed application requests access to OpenKeychain.\nAllow access?\n\nWARNING: If you do not know why this screen appeared, disallow access! You can revoke access later using the \'Registered Applications\' screen.</string>
     <string name="api_register_allow">Allow access</string>
     <string name="api_register_disallow">Disallow access</string>
     <string name="api_register_error_select_key">Please select a key!</string>
     <string name="api_select_pub_keys_missing_text">No public keys were found for these user ids:</string>
     <string name="api_select_pub_keys_dublicates_text">More than one public key exist for these user ids:</string>
     <string name="api_select_pub_keys_text">Please review the list of recipients!</string>
-    <string name="api_error_wrong_signature">Signature check failed! Have you installed this app from a different source? If you are sure that this is not an attack, revoke this app\'s registration in OpenPGP Keychain and then register the app again.</string>
+    <string name="api_error_wrong_signature">Signature check failed! Have you installed this app from a different source? If you are sure that this is not an attack, revoke this app\'s registration in OpenKeychain and then register the app again.</string>
 
     <!-- Share -->
     <string name="share_qr_code_dialog_title">Share with QR Code</string>
@@ -411,6 +419,9 @@
 
     <!-- Key view -->
     <string name="key_view_action_encrypt">Encrypt to this contact</string>
+    <string name="key_view_action_certify">Certify this contact\'s key</string>
+    <string name="key_view_tab_main">Info</string>
+    <string name="key_view_tab_certs">Certifications</string>
 
     <!-- Navigation Drawer -->
     <string name="nav_contacts">Contacts</string>