aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2014-10-25 01:59:15 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2014-10-25 01:59:15 +0200
commit478b2a4d8ba9de9a1c6756c592c9d26f6ce06c52 (patch)
tree908d84bb6ab50895291ac438c150f20e74b0bafd /OpenKeychain/src/main/res
parent1cbedb60d66b745993121d9c02d141f8beb6558a (diff)
downloadopen-keychain-478b2a4d8ba9de9a1c6756c592c9d26f6ce06c52.tar.gz
open-keychain-478b2a4d8ba9de9a1c6756c592c9d26f6ce06c52.tar.bz2
open-keychain-478b2a4d8ba9de9a1c6756c592c9d26f6ce06c52.zip
add logging to import and change order of import, keyservers first
Diffstat (limited to 'OpenKeychain/src/main/res')
-rw-r--r--OpenKeychain/src/main/res/values/strings.xml10
1 files changed, 10 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 3cfacbfd5..a65894fcc 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -946,6 +946,16 @@
<item quantity="one">"Importing key"</item>
<item quantity="other">"Importing %d keys"</item>
</plurals>
+ <string name="msg_import_fetch_error_decode">"Error decoding retrieved keyring!"</string>
+ <string name="msg_import_fetch_error">"Key could not be fetched! (Network problems?)"</string>
+ <string name="msg_import_fetch_keybase">"Fetching from keybase.io: %s"</string>
+ <string name="msg_import_fetch_keyserver_error">"Could not fetch key from keybase!"</string>
+ <string name="msg_import_fetch_keyserver">"Fetching from keyserver: %s"</string>
+ <string name="msg_import_fetch_keyserver_ok">"Fingerprint of fetched key didn't match expected!"</string>
+ <string name="msg_import_keyserver">"Using keyserver %s"</string>
+ <string name="msg_import_fingerprint_error">"Fingerprint of fetched key didn't match expected!"</string>
+ <string name="msg_import_fingerprint_ok">"Fingerprint check OK"</string>
+ <string name="msg_import_merge">"Merging keys…"</string>
<string name="msg_import_error">"Import operation failed!"</string>
<string name="msg_import_partial">"Import operation successful, with errors!"</string>
<string name="msg_import_success">"Import operation successful"</string>