diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-07-15 17:39:36 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-07-15 17:39:36 +0200 |
| commit | 858fe47d4677d4c727d0696a2d683a349ad2ad3b (patch) | |
| tree | e13f65753f0b4ce9db35d1a6e10cec0db92161ea /OpenKeychain/src/main/res/values | |
| parent | bdde6a3bd843e05f0fa5065ca31ed96d09731d86 (diff) | |
| parent | 0ce9c131327ce754eb8c0c934ea59eecf005a26e (diff) | |
| download | open-keychain-858fe47d4677d4c727d0696a2d683a349ad2ad3b.tar.gz open-keychain-858fe47d4677d4c727d0696a2d683a349ad2ad3b.tar.bz2 open-keychain-858fe47d4677d4c727d0696a2d683a349ad2ad3b.zip | |
Merge remote-tracking branch 'origin/master' into external-test
Conflicts:
OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
Diffstat (limited to 'OpenKeychain/src/main/res/values')
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 5efe51aa9..c444d64a1 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -673,6 +673,13 @@ <string name="msg_mf_unlock_error">Error unlocking keyring!</string> <string name="msg_mf_unlock">Unlocking keyring</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> + <string name="passp_cache_notif_keys">Cached Passphrases:</string> + <string name="passp_cache_notif_clear">Clear Cache</string> + <string name="passp_cache_notif_pwd">Password</string> + <!-- unsorted --> <string name="section_certifier_id">Certifier</string> <string name="section_cert">Certificate Details</string> |