cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into external-test

Browse Source 
Conflicts:
	OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
This commit is contained in:
Vincent Breitmoser
2014-07-15 17:39:36 +02:00
parent bdde6a3bd8 0ce9c13132
commit 858fe47d46
6 changed files with 380 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenKeychain/src/main/res/values/strings.xml
View File

@@ -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>