aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2015-07-02 10:58:23 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2015-07-02 10:58:23 +0200
commit06c1871542eaad899c48431fdab620d815217fd8 (patch)
treed80d79f82b1689e15a1d308713a0d8909fe93a42 /OpenKeychain/src/main/res
parent9fe05ed1e7fff479430f0042c47842151a0cb68d (diff)
parent7b5c35ee8787934d97d24f3d6f79fd6340ab8a4d (diff)
downloadopen-keychain-06c1871542eaad899c48431fdab620d815217fd8.tar.gz
open-keychain-06c1871542eaad899c48431fdab620d815217fd8.tar.bz2
open-keychain-06c1871542eaad899c48431fdab620d815217fd8.zip
Merge pull request #1400 from open-keychain/keyserver-preference
Fixe Keyserver Preference crash on empty list
Diffstat (limited to 'OpenKeychain/src/main/res')
-rw-r--r--OpenKeychain/src/main/res/values/strings.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 619c67ee3..c216cd869 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -685,7 +685,8 @@
<string name="add_keyserver_without_verification">"Keyserver added without verification."</string>
<string name="add_keyserver_invalid_url">"Invalid URL!"</string>
<string name="add_keyserver_connection_failed">"Failed to connect to keyserver. Please check the URL and your internet connection."</string>
- <string name="keyserver_deleted">"%s deleted"</string>
+ <string name="keyserver_preference_deleted">"%s deleted"</string>
+ <string name="keyserver_preference_cannot_delete_last">"Cannot delete last keyserver. At least one is required!"</string>
<!-- Navigation Drawer -->
<string name="nav_keys">"Keys"</string>