Merge remote-tracking branch 'origin/master' into v/multi-decrypt

This commit is contained in:
Vincent Breitmoser
2015-06-26 02:44:59 +02:00
23 changed files with 461 additions and 198 deletions

View File

@@ -1221,9 +1221,12 @@
<string name="msg_export_log_success">"Log exported successfully!"</string>
<!-- PassphraseCache -->
<string name="passp_cache_notif_click_to_clear">"Click to clear cached passwords"</string>
<string name="passp_cache_notif_n_keys">"OpenKeychain has cached %d passwords"</string>
<string name="passp_cache_notif_keys">"Cached Passwords:"</string>
<string name="passp_cache_notif_click_to_clear">"Touch to clear password cache."</string>
<plurals name="passp_cache_notif_n_keys">
<item quantity="one">"%d password cached"</item>
<item quantity="other">"%d passwords cached"</item>
</plurals>
<string name="passp_cache_notif_keys">"Cached passwords"</string>
<string name="passp_cache_notif_clear">"Clear Cache"</string>
<string name="passp_cache_notif_pwd">"Password"</string>