From 4278aa1bf1614d8b41e240a4f99328f85202041b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 5 May 2016 14:29:56 +0300
Subject: Revert "Added warning dialog for importing keys"

This reverts commit 9d35dcb0e924a7f8afcfcaa86752efb40799a456.

Conflicts:
	OpenKeychain/src/main/res/values/strings.xml
---
 OpenKeychain/src/main/res/values/strings.xml | 2 --
 1 file changed, 2 deletions(-)

(limited to 'OpenKeychain/src/main/res')

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>
-- 
cgit v1.2.3