aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-06-03 13:06:49 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-06-03 13:06:49 +0200
commit84d03dd5142902e013d52dca256d0a66d551ee6e (patch)
tree8560088fe57ab8454fa8c35e21bbff7591085fb5 /OpenKeychain/src/main/res
parent39997a802ec2a56039d216cd44c3ec89ab75c1a2 (diff)
parent4a47126f05ee53c9d09f46b9445918230937ccf2 (diff)
downloadopen-keychain-84d03dd5142902e013d52dca256d0a66d551ee6e.tar.gz
open-keychain-84d03dd5142902e013d52dca256d0a66d551ee6e.tar.bz2
open-keychain-84d03dd5142902e013d52dca256d0a66d551ee6e.zip
Merge pull request #643 from open-keychain/v/dev
wrap bouncycastle objects and don't use them in android-related code
Diffstat (limited to 'OpenKeychain/src/main/res')
-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 1ba8a6d2d..eeb6b3742 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -517,6 +517,7 @@
<string name="title_view_cert">View Certificate Details</string>
<string name="unknown_algorithm">unknown</string>
<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>
</resources>