aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/values/strings.xml
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-06-17 21:33:31 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2015-06-17 21:33:31 +0200
commit7f3154eceaf164e702b3c471e4dd25409b330d35 (patch)
tree10a603ed93e86b2c74c28542855a36224fd4e26a /OpenKeychain/src/main/res/values/strings.xml
parent374b21410e82877efcdd1e5110376e975bddbf9f (diff)
parentf5aa36ef9f092240f99cb64b83cc64b91544d638 (diff)
downloadopen-keychain-7f3154eceaf164e702b3c471e4dd25409b330d35.tar.gz
open-keychain-7f3154eceaf164e702b3c471e4dd25409b330d35.tar.bz2
open-keychain-7f3154eceaf164e702b3c471e4dd25409b330d35.zip
Merge branch 'master' into v/multi-decrypt
Diffstat (limited to 'OpenKeychain/src/main/res/values/strings.xml')
-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 ae131e029..c21b34d55 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -1331,5 +1331,6 @@
<string name="snack_armor_off">"Output encoded as Binary."</string>
<string name="snack_compression_on">"Compression <b>enabled</b>."</string>
<string name="snack_compression_off">"Compression <b>disabled</b>."</string>
+ <string name="error_loading_keys">Error loading keys!</string>
</resources>