diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-10-25 02:38:09 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-10-25 02:38:09 +0200 |
commit | e332c664cf935dc76bdf41c7e77b586b98f6124a (patch) | |
tree | f03745939703d0d70a7841f69aa824b2d6c6085a /OpenKeychain/src/main/res | |
parent | 33b54ab03ea611223864dded6f1f99b9eac0870b (diff) | |
parent | 7c4bbc83cbe6a65edb8cd6a4cccb6c9867454f9e (diff) | |
download | open-keychain-e332c664cf935dc76bdf41c7e77b586b98f6124a.tar.gz open-keychain-e332c664cf935dc76bdf41c7e77b586b98f6124a.tar.bz2 open-keychain-e332c664cf935dc76bdf41c7e77b586b98f6124a.zip |
Merge branch 'development' of github.com:open-keychain/open-keychain into development
Diffstat (limited to 'OpenKeychain/src/main/res')
-rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 10 |
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 b6de54c14..87c0acd6a 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -941,6 +941,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 retrieved! (Network problems?)"</string> + <string name="msg_import_fetch_keybase">"Retrieving from keybase.io: %s"</string> + <string name="msg_import_fetch_keyserver_error">"Could not retrieve key from keybase!"</string> + <string name="msg_import_fetch_keyserver">"Retrieving from keyserver: %s"</string> + <string name="msg_import_fetch_keyserver_ok">"Key retrieval successful"</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> |