diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-08 15:12:02 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-08 15:12:02 +0200 |
| commit | 1c06dd43cf2754ccfc3e73617b6747de9ff35bdf (patch) | |
| tree | ab57ab53b8a1671f7f3d7d38c63e341ac8828b45 /OpenKeychain/src/main/res | |
| parent | 0d40d5999b8bb8175fbffeda9ee6703e37be2999 (diff) | |
| parent | ceea2667e8544b58acfc59f8d3284f4dcbd7cf7a (diff) | |
| download | open-keychain-1c06dd43cf2754ccfc3e73617b6747de9ff35bdf.tar.gz open-keychain-1c06dd43cf2754ccfc3e73617b6747de9ff35bdf.tar.bz2 open-keychain-1c06dd43cf2754ccfc3e73617b6747de9ff35bdf.zip | |
Merge branch 'master' of github.com:open-keychain/open-keychain
Diffstat (limited to 'OpenKeychain/src/main/res')
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 5 |
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..64affdfde 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> |