diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-07-30 17:47:25 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-07-30 17:47:25 +0200 |
| commit | 927b12027557e4415b8046372a368801a00299aa (patch) | |
| tree | 7d49f95d11bc011cd48f0d8f0d53f9b491ea61d8 /OpenKeychain/src/main/res | |
| parent | 65488cbf05b0c90ac84d9b1895c68455217e3f1b (diff) | |
| parent | 64aac8023ef9c9b08d17346e41d06a667480a118 (diff) | |
| download | open-keychain-927b12027557e4415b8046372a368801a00299aa.tar.gz open-keychain-927b12027557e4415b8046372a368801a00299aa.tar.bz2 open-keychain-927b12027557e4415b8046372a368801a00299aa.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 e9a7e98dd..6fa90b31a 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -580,6 +580,7 @@ <string name="msg_ip_uid_processing">Processing user id %s</string> <string name="msg_ip_uid_revoked">User id is revoked</string> <string name="msg_is_bad_type_public">Tried to import public keyring as secret. This is a bug, please file a report!</string> + <string name="msg_is_bad_type_uncanon">Tried to import a keyring without canonicalization. This is a bug, please file a report!</string> <!-- Import Secret log entries --> <string name="msg_is">Importing secret key %s</string> |