Index: branches/RC/core/install/upgrades.sql
===================================================================
diff -u -N -r10975 -r10988
--- branches/RC/core/install/upgrades.sql	(.../upgrades.sql)	(revision 10975)
+++ branches/RC/core/install/upgrades.sql	(.../upgrades.sql)	(revision 10988)
@@ -347,8 +347,6 @@
 INSERT INTO ConfigurationAdmin VALUES ('FilenameSpecialCharReplacement', 'la_Text_General', 'la_config_FilenameSpecialCharReplacement', 'select', NULL, '_=+_,-=+-', 10.16, 0, 0);
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'FilenameSpecialCharReplacement', '_', 'In-Portal', 'in-portal:configure_categories');
 
-ALTER TABLE `Language` ADD `FilenameReplacements` TEXT NULL ;
-
 CREATE TABLE SpellingDictionary (
   SpellingDictionaryId int(11) NOT NULL auto_increment,
   MisspelledWord varchar(255) NOT NULL default '',
@@ -375,16 +373,17 @@
 INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:ban_rulelist.edit', 11, 1, 1, 0);
 INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:ban_rulelist.add', 11, 1, 1, 0);
 
-ALTER TABLE Language ADD `Locale` varchar(10) NOT NULL default 'en-US';
+ALTER TABLE Language ADD FilenameReplacements TEXT NULL AFTER UnitSystem,
+ALTER TABLE Language ADD Locale varchar(10) NOT NULL default 'en-US' AFTER FilenameReplacements;
 
 CREATE TABLE LocalesList (
-  `id` int(11) NOT NULL auto_increment,
-  `LocaleIdentifier` varchar(6) character set latin1 NOT NULL default '',
-  `LocaleName` varchar(255) character set latin1 NOT NULL default '',
-  `Locale` varchar(20) character set latin1 NOT NULL default '',
-  `ScriptTag` varchar(255) character set latin1 NOT NULL default '',
-  `ANSICodePage` varchar(10) character set latin1 NOT NULL default '',
-  PRIMARY KEY  (`id`)
+  LocaleId int(11) NOT NULL auto_increment,
+  LocaleIdentifier varchar(6) NOT NULL default '',
+  LocaleName varchar(255) NOT NULL default '',
+  Locale varchar(20) NOT NULL default '',
+  ScriptTag varchar(255) NOT NULL default '',
+  ANSICodePage varchar(10) NOT NULL default '',
+  PRIMARY KEY (LocaleId)
 );
 
 INSERT INTO LocalesList VALUES