Merge branch 'development' into v/crypto-input-parcel

This commit is contained in:
Dominik Schürmann
2015-03-29 21:00:06 +02:00
3 changed files with 42 additions and 14 deletions

View File

@@ -630,6 +630,7 @@
<string name="create_key_edit">"Change key configuration"</string>
<string name="create_key_add_email">"Add email address"</string>
<string name="create_key_add_email_text">"Additional email addresses are also associated to this key and can be used for secure communication."</string>
<string name="create_key_email_already_exists_text">"Email has already been added"</string>
<!-- View key -->
<string name="view_key_revoked">"Revoked: Key must not be used anymore!"</string>