From 14a8586e8c132aa1c217225e1d78b7185af3b7c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Tue, 15 Apr 2014 22:37:36 +0200
Subject: Improve verification result display, close #568

---
 OpenKeychain/src/main/res/values/strings.xml | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

(limited to 'OpenKeychain/src/main/res/values/strings.xml')

diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 3a73735cd..1cb4da986 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -209,8 +209,6 @@
     <string name="file_delete_confirmation">Are you sure you want to delete\n%s?</string>
     <string name="file_delete_successful">Successfully deleted.</string>
     <string name="no_file_selected">Select a file first.</string>
-    <string name="decrypt_successful">Successfully decrypted.</string>
-    <string name="decrypt_verified_successful">Successfully decrypted and/or verified.</string>
     <string name="encrypt_sign_successful">Successfully signed and/or encrypted.</string>
     <string name="encrypt_sign_clipboard_successful">Successfully signed and/or encrypted to clipboard.</string>
     <string name="enter_passphrase_twice">Enter the passphrase twice.</string>
@@ -258,7 +256,6 @@
         <item quantity="other">Found %d keys.</item>
     </plurals>
 
-    <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>
@@ -295,7 +292,6 @@
     <string name="error_main_user_id_must_not_be_empty">main user id must not be empty</string>
     <string name="error_key_needs_master_key">need at least a master key</string>
     <string name="error_no_encryption_keys_or_passphrase">no encryption keys or passphrase given</string>
-    <string name="error_signature_failed">signature failed</string>
     <string name="error_no_signature_passphrase">no passphrase given</string>
     <string name="error_no_signature_key">no signature key given</string>
     <string name="error_invalid_data">not valid encryption data</string>
@@ -305,14 +301,16 @@
     <string name="error_wrong_passphrase">wrong passphrase</string>
     <string name="error_saving_keys">error saving some keys</string>
     <string name="error_could_not_extract_private_key">could not extract private key</string>
-    <string name="error_only_files_are_supported">Direct binary data without actual file in filesystem is not supported. This is only supported by ACTION_ENCRYPT_STREAM_AND_RETURN.</string>
-    <string name="error_jelly_bean_needed">You need Android 4.1 alias Jelly Bean to use Androids NFC Beam feature!</string>
-    <string name="error_nfc_needed">NFC is not available on your device!</string>
-    <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>
+
+    <!-- errors without preceeding Error: -->
+    <string name="error_only_files_are_supported">Direct binary data without actual file in filesystem is not supported. This is only supported by ACTION_ENCRYPT_STREAM_AND_RETURN.</string>
+    <string name="error_jelly_bean_needed">You need Android 4.1 alias Jelly Bean to use Androids NFC Beam feature!</string>
+    <string name="error_nfc_needed">NFC is not available on your device!</string>
+    <string name="error_nothing_import">Nothing to import!</string>
     <string name="error_keyserver_insufficient_query">Insufficient server query</string>
     <string name="error_keyserver_query">Querying keyserver failed</string>
     <string name="error_keyserver_too_many_responses">Too many responses</string>
@@ -328,6 +326,16 @@
     </plurals>
     <string name="error_change_something_first">You must make changes to the keyring before you can save it</string>
 
+    <!-- results shown after decryption/verification -->
+    <string name="decrypt_result_invalid_signature">Invalid signature!</string>
+    <string name="decrypt_result_signature_unknown_pub_key">Unknown public key</string>
+    <string name="decrypt_result_signature_uncertified">Valid signature (uncertified)</string>
+    <string name="decrypt_result_signature_certified">Valid signature (certified)</string>
+    <string name="decrypt_result_decrypted">Successfully decrypted</string>
+    <string name="decrypt_result_decrypted_unknown_pub_key">Successfully decrypted but unknown public key</string>
+    <string name="decrypt_result_decrypted_and_signature_uncertified">Successfully decrypted and valid signature (uncertified)</string>
+    <string name="decrypt_result_decrypted_and_signature_certified">Successfully decrypted and valid signature (certified)</string>
+
     <!-- progress dialogs, usually ending in '…' -->
     <string name="progress_done">Done.</string>
     <string name="progress_cancel">Cancel</string>
-- 
cgit v1.2.3