diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-05-05 14:29:56 +0300 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-05-05 14:29:56 +0300 |
| commit | 4278aa1bf1614d8b41e240a4f99328f85202041b (patch) | |
| tree | 6d5e2754465cc5c9ad3b33fc4e446a7c7377dfa3 /OpenKeychain/src/main/res | |
| parent | 6cf3e4c89123284b58796cd7e348799b70fac02e (diff) | |
| download | open-keychain-4278aa1bf1614d8b41e240a4f99328f85202041b.tar.gz open-keychain-4278aa1bf1614d8b41e240a4f99328f85202041b.tar.bz2 open-keychain-4278aa1bf1614d8b41e240a4f99328f85202041b.zip | |
Revert "Added warning dialog for importing keys"
This reverts commit 9d35dcb0e924a7f8afcfcaa86752efb40799a456.
Conflicts:
OpenKeychain/src/main/res/values/strings.xml
Diffstat (limited to 'OpenKeychain/src/main/res')
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 07d2dc8db..2a44307f8 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -526,8 +526,6 @@ <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">"Import 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> |