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

Merge branch 'master' of github.com:open-keychain/open-keychain

Browse Source 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
This commit is contained in:
Dominik Schürmann
2014-08-20 19:48:19 +02:00
parent f46f2b6895 2a96912a96
commit 0e152d1db0
8 changed files with 72 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -703,7 +703,7 @@
</plurals>
<string name="msg_con_reimport_secret_skip">No secret keys to reimport, skipping…</string>
<string name="msg_con_warn_delete_public">Exception deleting public cache file</string>
<string name="msg_con_warn_delete_secret">Exception deleting public cache file</string>
<string name="msg_con_warn_delete_secret">Exception deleting secret cache file</string>
<!-- PassphraseCache -->
<string name="passp_cache_notif_click_to_clear">Click to clear cached passphrases</string>