diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-06-18 22:02:07 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-06-18 22:02:07 +0200 |
| commit | 37a81af74869c4788afeb7d724558f499ab7312c (patch) | |
| tree | b8cc4787d664e0b238a5c1a7d2ab8e006ee72891 /OpenKeychain/src/main/res | |
| parent | d9ccef4899530482732eb0fada9e2d309accb8a5 (diff) | |
| parent | ada6a121748d58e8fe0477faf8bcb210deafe264 (diff) | |
| download | open-keychain-37a81af74869c4788afeb7d724558f499ab7312c.tar.gz open-keychain-37a81af74869c4788afeb7d724558f499ab7312c.tar.bz2 open-keychain-37a81af74869c4788afeb7d724558f499ab7312c.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 | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 3221cd9cd..e24ac6925 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -578,13 +578,14 @@ <string name="msg_kc_sub_bad_keyid">Subkey binding issuer id mismatch</string> <string name="msg_kc_sub_bad_time">Removing subkey binding certificate with future timestamp</string> <string name="msg_kc_sub_bad_type">Unknown subkey certificate type: %s</string> + <string name="msg_kc_sub_dup">Removing redundant subkey binding certificate</string> <string name="msg_kc_sub_primary_bad">Removing subkey binding certificate due to invalid primary binding certificate</string> <string name="msg_kc_sub_primary_bad_err">Removing subkey binding certificate due to bad primary binding certificate</string> <string name="msg_kc_sub_primary_none">Removing subkey binding certificate due to missing primary binding certificate</string> <string name="msg_kc_sub_no_cert">No valid certificate found for %s, removing from ring</string> - <string name="msg_kc_sub_revoke_bad_err">Removing bad subkey revocation key</string> - <string name="msg_kc_sub_revoke_bad">Removing bad subkey revocation key</string> - <string name="msg_kc_sub_revoke_dup">Removing redundant keyring revocation key</string> + <string name="msg_kc_sub_revoke_bad_err">Removing bad subkey revocation certificate</string> + <string name="msg_kc_sub_revoke_bad">Removing bad subkey revocation certificate</string> + <string name="msg_kc_sub_revoke_dup">Removing redundant subkey revocation certificate</string> <string name="msg_kc_success">Keyring canonicalization successful, no changes</string> <string name="msg_kc_success_bad">Keyring canonicalization successful, removed %s erroneous certificates</string> <string name="msg_kc_success_bad_and_red">Keyring canonicalization successful, removed %1$s erroneous and %2$s redundant certificates</string> |