--- a/src/hbcore/i18n/hbdntxmlreader.cpp	Fri Sep 17 08:32:10 2010 +0300
+++ b/src/hbcore/i18n/hbdntxmlreader.cpp	Mon Oct 04 00:38:12 2010 +0300
@@ -23,14 +23,13 @@
 **
 ****************************************************************************/
 
-#include <QTranslator>
 #if defined(Q_OS_SYMBIAN)
 #include <e32base.h> 
 #endif // Q_OS_SYMBIAN
+#include <hbtranslator.h>
 #include "hbdntxmlreader_p.h"
 
 #define DirectoryLocalizerFile ":/i18n/hbdirectorylocalizer.xml"
-#define DirectoryLocalizerTranslationsFile "/resource/hbi18n/translations/directorylocalizer_"
 
 /*!
     Constructor of class.  
@@ -39,49 +38,26 @@
 {
     fullPaths = NULL;
     pathStrings = NULL;
-    
-    
     parseDirectoryPaths = false; 
     parsePathStrings = false;
     elementNumber = 0;
     validElement = false;
     twoDone = false;
-    QLocale locale = QLocale::system();
-    
-    trans = new QTranslator();
-    QString languageStr;
-    languageStr.append(DirectoryLocalizerTranslationsFile);
-
-    languageStr.append(locale.name());
-
-// Support for checking both Z and C drives 
-    
-#if defined(Q_OS_SYMBIAN)
-    bool succeed = false;
-    succeed = trans->load("z:" + languageStr);
-    if ( succeed == false ) {
-        trans->load("c:" + languageStr);
-    }
-#else // Q_OS_SYMBIAN
-    trans->load(languageStr);
-#endif // Q_OS_SYMBIAN
-
-    QCoreApplication::installTranslator(trans);
     validElement = false;
     
+    HbTranslator* trans = new HbTranslator("directorynamelocalizer");
+    Q_UNUSED(trans);
+    
     QFile xmlFile(DirectoryLocalizerFile);
-
     pathStrings = new QMap<QString, QString>;
     fullPaths = new QMap<QString,QString>;
-
-    if( xmlFile.exists() )
-        {
-            QXmlInputSource source( &xmlFile );
-            QXmlSimpleReader reader; 
-            reader.setContentHandler( this );  
-            reader.parse( source ) ;
-        }
     
+    if ( xmlFile.exists() ) {
+        QXmlInputSource source( &xmlFile );
+        QXmlSimpleReader reader;
+        reader.setContentHandler( this );
+        reader.parse( source );
+    }
 }
 
 /*!
@@ -91,8 +67,6 @@
 {
     delete fullPaths;
     delete pathStrings;
-    QCoreApplication::removeTranslator(trans);
-    delete trans;
 }
 
 /*!
@@ -197,7 +171,7 @@
             case 3:  // DirectoryLocalizerTranslationStr            
                 elements.insert(0,t);
                 
-                localizedStr = QCoreApplication::translate(0,charPtr);
+                localizedStr = hbTrId(charPtr);
                 delete ba;
                 ba = 0;