Merge remote-tracking branch 'upstream/master' into feature-conceal-software

This commit is contained in:
Daniel Albert
2014-07-13 15:39:16 +02:00
4 changed files with 225 additions and 10 deletions

View File

@@ -663,8 +663,8 @@
<!-- 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 keys</string>
<string name="passp_cache_notif_keys">Cached Keys:</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>