diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-10-26 00:38:31 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-10-26 00:38:31 +0200 |
| commit | 825baeee1bf137c40aa52e3a00115b951c0a6171 (patch) | |
| tree | 6abda71cd5855a32aefa0a4994fc11be52be703d /OpenKeychain/src/main/res | |
| parent | 8257e450f9c78cde1d12422f530e7bb59d3edf4d (diff) | |
| parent | fb7264d7fdf10099ec74d9c4f3eddce043a421a2 (diff) | |
| download | open-keychain-825baeee1bf137c40aa52e3a00115b951c0a6171.tar.gz open-keychain-825baeee1bf137c40aa52e3a00115b951c0a6171.tar.bz2 open-keychain-825baeee1bf137c40aa52e3a00115b951c0a6171.zip | |
Merge branch 'development' of github.com:open-keychain/open-keychain into development
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 bbe11f703..40f2d56be 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -688,6 +688,7 @@ <string name="msg_is_error_io_exc">"Error encoding keyring"</string> <string name="msg_is_merge_public">"Merging imported data into existing public keyring"</string> <string name="msg_is_merge_secret">"Merging imported data into existing public keyring"</string> + <string name="msg_is_merge_special">"Merging in self-certificates data from public keyring"</string> <string name="msg_is_pubring_generate">"Generating public keyring from secret keyring"</string> <string name="msg_is_subkey_nonexistent">"Subkey %s unavailable in secret key"</string> <string name="msg_is_subkey_ok">"Marked secret subkey %s as available"</string> |