--- a/src/hbcore/hbcore.pro	Fri Sep 17 08:32:10 2010 +0300
+++ b/src/hbcore/hbcore.pro	Mon Oct 04 00:38:12 2010 +0300
@@ -102,12 +102,7 @@
 #QMAKE_DISTCLEAN += $$hbNativePath($${HB_BUILD_DIR}/include/hbcore/*)
 #QMAKE_DISTCLEAN += $$hbNativePath($${HB_BUILD_DIR}/include/hbcore/private/*)
 
-TRANSLATIONS += i18n/translations/directorylocalizer_en_GB.ts
-TRANSLATIONS += i18n/translations/directorylocalizer_de_DE.ts
-TRANSLATIONS += i18n/translations/languages.ts
-TRANSLATIONS += i18n/translations/collations.ts
-TRANSLATIONS += i18n/translations/regions.ts
-TRANSLATIONS += i18n/translations/languages_OLD.ts
+load(symbian_i18n.prf):TRANSLATIONS = directorynamelocalizer.ts
 
 symbian {
     defFilePath = defs
@@ -157,17 +152,11 @@
 
     hbExportHeaders(hbcore)
 
-    # i18n's .qm files export
-    exportqm.path = $${EPOCROOT}epoc32/winscw/c/resource/hbi18n/translations
-    exportqm.sources = $$TRANSLATIONS
-    for(file, exportqm.sources) {
-        file2 = $$replace(file, .ts, .qm)
-        file3 = $${PWD}/$$file2
-        hbPrjExport("$$file3", "$$exportqm.path/$$basename(file2)")
-    }
-    # i18n's other files export
     hbPrjExport("$${PWD}/i18n/translations/language_list.txt", "$${EPOCROOT}epoc32/winscw/c/resource/hbi18n/translations/language_list.txt")
     hbPrjExport("$${PWD}/i18n/translations/locale_mappings.txt", "$${EPOCROOT}epoc32/winscw/c/resource/hbi18n/translations/locale_mappings.txt")
+    hbPrjExport("$${PWD}/i18n/translations/collations.qm", "$${EPOCROOT}epoc32/winscw/c/resource/hbi18n/translations/collations.qm")
+    hbPrjExport("$${PWD}/i18n/translations/languages.qm", "$${EPOCROOT}epoc32/winscw/c/resource/hbi18n/translations/languages.qm")
+    hbPrjExport("$${PWD}/i18n/translations/regions.qm", "$${EPOCROOT}epoc32/winscw/c/resource/hbi18n/translations/regions.qm")
 
     LIBS += -lapparc
     LIBS += -lavkon
@@ -198,10 +187,4 @@
     hbPrjExport("$${PWD}/resources/centralrepository/20022E82.txt", "$${EPOCROOT}epoc32/release/winscw/urel/z/private/10202BE9/20022E82.txt")
 }
 
-hb_maemo_dui {
-    INCLUDEPATH += /usr/include/dui
-    INCLUDEPATH += /usr/local/include/dui
-    LIBS += -ldui
-}
-
 include($${HB_SOURCE_DIR}/src/hbcommon.pri)