aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/values
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2014-09-08 14:32:55 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2014-09-08 14:35:15 +0200
commit055fb59ec34a986ea9f5620554b51c438d809361 (patch)
tree6d7ea5356e162372c3bcfe49339d7f1a26dfa0c0 /OpenKeychain/src/main/res/values
parent9eed414a772bb75783c5c74e221fb34313b6e862 (diff)
downloadopen-keychain-055fb59ec34a986ea9f5620554b51c438d809361.tar.gz
open-keychain-055fb59ec34a986ea9f5620554b51c438d809361.tar.bz2
open-keychain-055fb59ec34a986ea9f5620554b51c438d809361.zip
Properly handle uneditable key types in EditKeyFragment
More specifically, return an OperationResultParcel for stripped and divert-to-card keys, with an appropriate error message in the log. part of #828
Diffstat (limited to 'OpenKeychain/src/main/res/values')
-rw-r--r--OpenKeychain/src/main/res/values/strings.xml5
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 24effb7f1..2a89f15bc 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -756,6 +756,11 @@
<string name="msg_con_warn_delete_public">"Exception deleting public cache file"</string>
<string name="msg_con_warn_delete_secret">"Exception deleting secret cache file"</string>
+ <!-- Other messages used in OperationLogs -->
+ <string name="msg_ek_error_divert">"editing of nfc keys is not (yet) supported"</string>
+ <string name="msg_ek_error_dummy">"cannot edit keyring with stripped master key!"</string>
+ <string name="msg_ek_error_not_found">"key not found"</string>
+
<!-- PassphraseCache -->
<string name="passp_cache_notif_click_to_clear">"Click to clear cached passphrases"</string>
<string name="passp_cache_notif_n_keys">"OpenKeychain has cached %d passphrases"</string>