Merge pull request #650 from open-keychain/v/import-log

Parcelable operation result with logging capabilities + import logging

1 files changed, 39 insertions, 0 deletions

diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index ad8abe78f..38f0519ac 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -523,4 +523,43 @@
     <string name="info_no_manual_account_creation">Do not create OpenKeychain-Accounts manually.\nFor more information, see Help.</string>
     <string name="contact_show_key">Show key (%s)</string>
 
+    <!-- Import log entries -->
+    <string name="msg_ip_apply_batch">Applying insert batch operation.</string>
+    <string name="msg_ip_bad_type_secret">Tried to import secret keyring as public. This is a bug, please file a report!</string>
+    <string name="msg_ip_delete_old_fail">No old key deleted (creating a new one?)</string>
+    <string name="msg_ip_delete_old_ok">Deleted old key from database</string>
+    <string name="msg_ip_encode_fail">Operation failed due to encoding error</string>
+    <string name="msg_ip_fail_io_exc">Operation failed due to i/o error</string>
+    <string name="msg_ip_fail_op_ex">Operation failed due to database error</string>
+    <string name="msg_ip_fail_remote_ex">Operation failed due to internal error</string>
+    <string name="msg_ip_importing">Importing public keyring</string>
+    <string name="msg_ip_insert_keyring">Inserting keyring data</string>
+    <string name="msg_ip_insert_subkey">Inserting subkey %s</string>
+    <string name="msg_ip_insert_subkeys">Inserting subkeys</string>
+    <string name="msg_ip_preserving_secret">Preserving available secret key</string>
+    <string name="msg_ip_reinsert_secret">Re-inserting secret key</string>
+    <string name="msg_ip_success">Successfully inserted public keyring</string>
+    <string name="msg_ip_trust_retrieve">Retrieving trusted keys</string>
+    <string name="msg_ip_trust_using">Using %s trusted keys</string>
+    <string name="msg_ip_trust_using_sec">Secret key available, self certificates are trusted</string>
+    <string name="msg_ip_uid_cert_bad">Encountered bad certificate!</string>
+    <string name="msg_ip_uid_cert_error">Error processing certificate!</string>
+    <string name="msg_ip_uid_cert_good">Found good certificate from %s</string>
+    <string name="msg_ip_uid_certs_unknown">Ignored %s certificates from unknown pubkeys</string>
+    <string name="msg_ip_uid_classifying">Classifying user ids</string>
+    <string name="msg_ip_uid_insert">Inserting user ids</string>
+    <string name="msg_ip_uid_processing">Processing user id %s</string>
+    <string name="msg_ip_uid_self_bad">Bad self certificate encountered!</string>
+    <string name="msg_ip_uid_self_good">Found good self certificate</string>
+    <string name="msg_ip_uid_self_ignoring_old">Ignoring older self certificate</string>
+    <string name="msg_ip_uid_self_newer">Using more recent good self certificate</string>
+    <string name="msg_is_bad_type_public">Tried to import public keyring as secret. This is a bug, please file a report!</string>
+    <string name="msg_is_importing">Importing secret key %s</string>
+    <string name="msg_is_importing_subkeys">Processing secret subkeys</string>
+    <string name="msg_is_io_excption">Error encoding keyring</string>
+    <string name="msg_is_subkey_nonexistent">Subkey %s unavailable in public key</string>
+    <string name="msg_is_subkey_ok">Marked %s as available</string>
+    <string name="msg_is_subkey_stripped">Marked %s as stripped</string>
+    <string name="msg_is_success">Successfully inserted secret keyring</string>
+
 </resources>