diff options
Diffstat (limited to 'OpenKeychain/src/main/res/values/strings.xml')
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 656f3b5cd..a5763683d 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -643,6 +643,8 @@ <string name="msg_ip_master_flags_xxsx">"Master flags: sign"</string> <string name="msg_ip_master_flags_xxxa">"Master flags: authenticate"</string> <string name="msg_ip_master_flags_xxxx">"Master flags: none"</string> + <string name="msg_ip_merge_public">"Merging new data into public keyring"</string> + <string name="msg_ip_merge_secret">"Merging new data into secret keyring"</string> <string name="msg_ip_subkey">"Processing subkey %s"</string> <string name="msg_ip_subkey_expired">"Subkey expired on %s"</string> <string name="msg_ip_subkey_expires">"Subkey expires on %s"</string> @@ -693,6 +695,8 @@ <string name="msg_is_db_exception">"Database error!"</string> <string name="msg_is_importing_subkeys">"Processing secret subkeys"</string> <string name="msg_is_error_io_exc">"Error encoding keyring"</string> + <string name="msg_is_merge_public">"Merging new data into public keyring"</string> + <string name="msg_is_merge_secret">"Merging new data into secret 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> @@ -955,7 +959,7 @@ <string name="msg_import_keyserver">"Using keyserver %s"</string> <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 keys…"</string> + <string name="msg_import_merge">"Merging keyring data from keybase and keyserver"</string> <string name="msg_import_error">"Import operation failed!"</string> <string name="msg_import_partial">"Import operation successful, with errors!"</string> <string name="msg_import_success">"Import operation successful"</string> |