r14244 by cbradney - Bump about date and comment out Qt3 related UTF-16 hack

[scribus-commit]

Revision: 14244
Author: cbradney
Date: 2009-10-27T18:14:40.587493Z
Commit message: Bump about date and comment out Qt3 related UTF-16 hack

Changeset: 
M  /trunk/Scribus/scribus/ui/gtdialogs.cpp
M  /trunk/Scribus/scribus/ui/about.cpp

Diffs:
Index: scribus/ui/about.cpp
===================================================================
--- scribus/ui/about.cpp	(revision 14243)
+++ scribus/ui/about.cpp	(revision 14244)
@@ -114,7 +114,7 @@
 	buildID = new QLabel( tab );
 	buildID->setAlignment(Qt::AlignCenter);
 	buildID->setTextInteractionFlags(Qt::TextSelectableByMouse);
-	QString BUILD_DAY = "08";
+	QString BUILD_DAY = "27";
 	QString BUILD_MONTH = CommonStrings::october;
 	QString BUILD_YEAR = "2009";
 	QString BUILD_TIME = "";
Index: scribus/ui/gtdialogs.cpp
===================================================================
--- scribus/ui/gtdialogs.cpp	(revision 14243)
+++ scribus/ui/gtdialogs.cpp	(revision 14244)
@@ -134,8 +134,8 @@
 		if (!fileName.isEmpty())
 			accepted = true;
 		encoding = fdia->encodingCombo->currentText();
-		if (encoding == "UTF-16")
-			encoding = "ISO-10646-UCS-2";
+//		if (encoding == "UTF-16")
+//			encoding = "ISO-10646-UCS-2";
 		importer = fdia->importerCombo->currentIndex() - 1;
 		dirs->set("get_text", fileName.left(fileName.lastIndexOf("/")));
 	}