aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/values
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2015-03-29 21:00:06 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2015-03-29 21:00:06 +0200
commit7ffb55faaa42b748c7742a11ba223f0ebed65622 (patch)
tree6552e89c381a7d72f7e0a5c84e97b06894dfe151 /OpenKeychain/src/main/res/values
parent95f1527afe81c59a116cadc2ed37c065da1819ac (diff)
parent6b48ddd71747bc5179861c25b6b327dae3321fca (diff)
downloadopen-keychain-7ffb55faaa42b748c7742a11ba223f0ebed65622.tar.gz
open-keychain-7ffb55faaa42b748c7742a11ba223f0ebed65622.tar.bz2
open-keychain-7ffb55faaa42b748c7742a11ba223f0ebed65622.zip
Merge branch 'development' into v/crypto-input-parcel
Diffstat (limited to 'OpenKeychain/src/main/res/values')
-rw-r--r--OpenKeychain/src/main/res/values/strings.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index f6fbd132c..274504315 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -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>