Merge pull request #649 from mar-v-in/automatic-contact-discovery

Automatic contact discovery and more
This commit is contained in:
Dominik Schürmann
2014-06-06 22:57:51 +02:00
22 changed files with 639 additions and 58 deletions

View File

@@ -520,5 +520,7 @@
<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.\nFor more information, see Help.</string>
<string name="contact_show_key">Show key (%s)</string>
</resources>