--- a/hb.pro	Thu Sep 02 20:44:51 2010 +0300
+++ b/hb.pro	Fri Sep 17 08:32:10 2010 +0300
@@ -44,12 +44,20 @@
     INSTALLS += feature
 }
 else {
-    tmp = $$split(HB_FEATURES_DIR, :)
-    HB_SYMBIAN_PRF_EXPORT_DIR = $$last(tmp)
+    HB_SYMBIAN_PRF_EXPORT_DIR = $$hbStripDriveLetter($$HB_FEATURES_DIR)
     BLD_INF_RULES.prj_exports += "hb.prf $$HB_SYMBIAN_PRF_EXPORT_DIR/hb.prf"
     BLD_INF_RULES.prj_exports += "hb_install.prf $$HB_SYMBIAN_PRF_EXPORT_DIR/hb_install.prf"
     BLD_INF_RULES.prj_exports += "mkspecs/hb_functions.prf $$HB_SYMBIAN_PRF_EXPORT_DIR/hb_functions.prf"
     BLD_INF_RULES.prj_exports += "mkspecs/docml2bin.prf $$HB_SYMBIAN_PRF_EXPORT_DIR/docml2bin.prf"
+
+    host_tools {
+        exists($${HB_BUILD_DIR}/bin/docml2bin) {
+            hbPrjExport("$${HB_BUILD_DIR}/bin/docml2bin", "$${HB_BIN_DIR}/docml2bin")
+        }
+        exists($${HB_BUILD_DIR}/bin/docml2bin.exe) {
+            hbPrjExport("$${HB_BUILD_DIR}/bin/docml2bin.exe", "$${HB_BIN_DIR}/docml2bin.exe")
+        }
+    }
 }
 
 QMAKE_DISTCLEAN += $$hbNativePath($$HB_BUILD_DIR/.qmake.cache)
@@ -88,15 +96,16 @@
 
 !symbian {
     LRELEASE = $$hbNativePath($$[QT_INSTALL_BINS]/lrelease)
-    # comments to be removed once localisation is ready
-    #COMMON_EXTENSIONS = ar eu bg ca hr cs da nl en_US et fi fr fr_CA gl de el he hi zh_HK hu is id it ja ko lv lt ms no pl pt pt_BR zh ro ru sr sk sl es es_419 sv tl zh_TW th tr uk ur vi
-    translations.input = $$HB_SOURCE_DIR/src/hbcore/i18n/translations/common
+    COMMON_EXTENSIONS = ar eu bg ca hr cs da nl en_US et fi fr fr_CA gl de el he hi zh_HK hu is id it ja ko lv lt ms nb pl pt pt_BR zh ro ru sr sk sl es es_419 sv tl zh_TW th tr uk ur vi
+    translations.input = $$HB_SOURCE_DIR/src/hbcore/i18n/translations/commonstrings
     translations.path = $${HB_TRANSLATIONS_DIR}
+
     translations.commands = $$LRELEASE -silent -idbased $$translations.input/commonstrings_en.ts -qm $$translations.path/commonstrings_en.qm
-    
 #    for(ext, COMMON_EXTENSIONS) {
 #        file = commonstrings_$$ext
-#        translations.commands += && $$LRELEASE -silent -idbased $$translations.input/$${file}.ts -qm $$translations.path/$${file}.qm
+#        eval(trans_$${ext}.commands += $$LRELEASE -silent -idbased $$translations.input/$${file}.ts -qm $$translations.path/$${file}.qm)
+#        QMAKE_EXTRA_TARGETS += trans_$${ext}
+#        eval(translations.depends += trans_$${ext})
 #    }
 
     QMAKE_EXTRA_TARGETS += translations