diff options
| author | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-05-31 02:40:06 +0530 |
|---|---|---|
| committer | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-05-31 02:49:11 +0530 |
| commit | 93f3a98eae1fdd8f9a3a82d415a7284548a2e4bf (patch) | |
| tree | 285121ab1a4eddfd5d465b85bd838f02404baf0a /OpenKeychain/src/main/res/values | |
| parent | 5d87872245ed781fa610cfa61a35d5e3f85a984e (diff) | |
| download | open-keychain-93f3a98eae1fdd8f9a3a82d415a7284548a2e4bf.tar.gz open-keychain-93f3a98eae1fdd8f9a3a82d415a7284548a2e4bf.tar.bz2 open-keychain-93f3a98eae1fdd8f9a3a82d415a7284548a2e4bf.zip | |
prevent keybase key replacing keyserver key
Diffstat (limited to 'OpenKeychain/src/main/res/values')
| -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> |