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

Merge branch 'master' into automatic-contact-discovery

Browse Source 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
This commit is contained in:
mar-v-in
2014-06-04 21:32:37 +02:00
parent 6a63746278 52f1f30846
commit cae0071342
149 changed files with 4049 additions and 2424 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -517,6 +517,7 @@
<string name="title_view_cert">View Certificate Details</string>
<string name="unknown_algorithm">unknown</string>
<string name="can_sign_not">cannot sign</string>
<string name="error_encoding">Encoding error</string>
<string name="error_no_encrypt_subkey">No encryption subkey available!</string>
<string name="info_no_manual_account_creation">Do not create OpenKeychain-Accounts manually.
For more information, see Help.</string>