aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
diff options
context:
space:
mode:
authorAlex Fong <alexfongg@gmail.com>2016-04-17 13:33:41 +0800
committerAlex Fong <alexfongg@gmail.com>2016-05-05 07:57:20 +0800
commit9d35dcb0e924a7f8afcfcaa86752efb40799a456 (patch)
tree714afde7c89352bed3757470e8d59272052dae9b /OpenKeychain/src/main/res
parentf43edcdd7afb1692fab1239c54c3cd535506c9e1 (diff)
downloadopen-keychain-9d35dcb0e924a7f8afcfcaa86752efb40799a456.tar.gz
open-keychain-9d35dcb0e924a7f8afcfcaa86752efb40799a456.tar.bz2
open-keychain-9d35dcb0e924a7f8afcfcaa86752efb40799a456.zip
Added warning dialog for importing keys
Diffstat (limited to 'OpenKeychain/src/main/res')
-rw-r--r--OpenKeychain/src/main/res/values/strings.xml2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 2a44307f8..b15bd5775 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -526,6 +526,8 @@
<string name="import_qr_code_too_short_fingerprint">"Fingerprint is too short!"</string>
<string name="import_qr_code_button">"Scan QR Code"</string>
<string name="import_qr_code_text">"Place your camera over the QR Code!"</string>
+ <string name="import_warning_title">"Warning"</string>
+ <string name="import_warning">"Imported keys will overwrite existing keys that have the same IDs!"</string>
<!-- Import from URL -->
<string name="import_url_warn_no_search_parameter">"No search query defined. You can still manually search on this keyserver."</string>