diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-04-18 07:31:38 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-04-18 07:31:38 +0200 |
| commit | ed82c362e64a16d144acfa2f1d2047c3e0a2736e (patch) | |
| tree | 38511a34a82aa2ad48c88aff01421f88dc3d9edb /OpenKeychain/src/main/res | |
| parent | 15ed1c9a63fb0505651e4edf4f4ef65644640429 (diff) | |
| parent | b9df34468b71f156045a4f1cdb7123e3808e3789 (diff) | |
| download | open-keychain-ed82c362e64a16d144acfa2f1d2047c3e0a2736e.tar.gz open-keychain-ed82c362e64a16d144acfa2f1d2047c3e0a2736e.tar.bz2 open-keychain-ed82c362e64a16d144acfa2f1d2047c3e0a2736e.zip | |
Merge branch 'master' of github.com:open-keychain/open-keychain
Diffstat (limited to 'OpenKeychain/src/main/res')
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 1 |
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 22d79d9b8..48187c342 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -380,6 +380,7 @@ <string name="error_integrity_check_failed">"integrity check failed! Data has been modified!"</string> <string name="error_wrong_passphrase">"wrong password"</string> <string name="error_could_not_extract_private_key">"could not extract private key"</string> + <string name="error_wrong_security_token">"this security token doesn't contain required key"</string> <!-- errors without preceeding Error: --> <string name="error_jelly_bean_needed">"You need Android 4.1 to use Android's NFC Beam feature!"</string> |