diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-06-01 10:15:46 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-06-01 10:15:46 +0200 |
| commit | af5fc6622943acc20948f4daf8ae13fb80e4ef5d (patch) | |
| tree | 066c76b0cec20c735e93794e0dadee5e44f5c770 /OpenKeychain/src/main/res/values/strings.xml | |
| parent | 784dbc087e82826269ed58cc61e64b2b89c40dfe (diff) | |
| parent | 93f3a98eae1fdd8f9a3a82d415a7284548a2e4bf (diff) | |
| download | open-keychain-af5fc6622943acc20948f4daf8ae13fb80e4ef5d.tar.gz open-keychain-af5fc6622943acc20948f4daf8ae13fb80e4ef5d.tar.bz2 open-keychain-af5fc6622943acc20948f4daf8ae13fb80e4ef5d.zip | |
Merge pull request #1317 from adithyaphilip/master
Merge key from Keyserver with that from Keybase instead of replacing
Diffstat (limited to 'OpenKeychain/src/main/res/values/strings.xml')
| -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 58e9292de..853acbaa5 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -1154,6 +1154,7 @@ <string name="msg_import_fingerprint_error">"Fingerprint of fetched key didn't match expected!"</string> <string name="msg_import_fingerprint_ok">"Fingerprint check OK"</string> <string name="msg_import_merge">"Merging retrieved data"</string> + <string name="msg_import_merge_error">"Error merging retrieved data!"</string> <string name="msg_import_error">"Import operation failed!"</string> <string name="msg_import_error_io">"Import operation failed due to i/o error!"</string> <string name="msg_import_partial">"Import operation successful, with errors!"</string> |