From cc482c3d1a50cc0f5398b3140cda70b1d0d9e12f Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Sat, 30 Aug 2008 11:43:22 +0000
Subject: ** Fixes bug #549554 (patch from Paul Bolle)

2008-08-30  Matthew Barnes  <mbarnes@redhat.com>

	** Fixes bug #549554 (patch from Paul Bolle)

	* shell/e-shell-importer.c: (struct info):
	Drop sentence about an "Automatic" option.


svn path=/trunk/; revision=36218
---
 shell/ChangeLog          | 7 +++++++
 shell/e-shell-importer.c | 4 +---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/shell/ChangeLog b/shell/ChangeLog
index c37515e259..2349fa7198 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,10 @@
+2008-08-30  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes bug #549554 (patch from Paul Bolle)
+
+	* e-shell-importer.c: (struct info):
+	Drop sentence about an "Automatic" option.
+
 2008-08-27  Sankar P  <psankar@novell.com>
 
 License Changes
diff --git a/shell/e-shell-importer.c b/shell/e-shell-importer.c
index 23b473a0a9..6826c44f67 100644
--- a/shell/e-shell-importer.c
+++ b/shell/e-shell-importer.c
@@ -132,9 +132,7 @@ static struct {
 	},
 	{ "file_html",
 	  N_("Choose the file that you want to import into Evolution, "
-	     "and select what type of file it is from the list.\n\n"
-	     "You can select \"Automatic\" if you do not know, and "
-	     "Evolution will attempt to work it out.")
+	     "and select what type of file it is from the list.")
 	},
 	{ "dest_html",
 	  N_("Choose the destination for this import")
-- 
cgit v1.2.3