Conflicts: installer/data/mysql/nb-NO/1-Obligatorisk/system_preferences.sql installer/data/mysql/updatedatabase.pl Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>