diff -r 786160610b4d -r afcd8e6d025b ginebra2/emulator/main.cpp --- a/ginebra2/emulator/main.cpp Wed Sep 01 13:56:21 2010 -0400 +++ b/ginebra2/emulator/main.cpp Fri Sep 17 12:11:40 2010 -0400 @@ -244,7 +244,7 @@ #ifdef QTHIGHWAY //qDebug() << "ServiceInfo:" << (XQServiceUtil::isService() ? "Service" : "Normal") << "launch"; //qDebug() << " Embedded=" << XQServiceUtil::isEmbedded() << "Interface=" << XQServiceUtil::interfaceName() << "Operation=" << XQServiceUtil::operationName(); - + // provide service for html mime type FileService *fileServiceProvider = new FileService(); #endif @@ -258,7 +258,7 @@ if (BEDROCK_PROVISIONING::BedrockProvisioning::createBedrockProvisioning()->value("DnsPrefetchEnabled").toBool()) { // Specifies whether QtWebkit will try to pre-fetch DNS entries to speed up browsing. - // Without this technique, the DNS lookup is performed only when you click on the link, + // Without this technique, the DNS lookup is performed only when you click on the link, // adding a wait of 250ms (on average) before the page even starts to show up. // This only works as a global attribute. QWebSettings::globalSettings()->setAttribute(QWebSettings::DnsPrefetchEnabled, true); @@ -270,16 +270,14 @@ //install the common translator from platform QTranslator common; - common.load(":/resource/qt/translations/common_" + lang); + common.load("z:/resource/qt/translations/common_" + lang); QApplication::installTranslator(&common); //install the translator from Browser QTranslator translator; - QString transFilePath = ":/translations"; - //Todo: when platform delivers .ts file - //QString transFilePath = "Z:/resource/qt/translations/"; - QString transFile = QLatin1String("browserLoc_") + lang; + QString transFilePath = "Z:/resource/qt/translations/"; + QString transFile = QLatin1String("browserloc_") + lang; translator.load(transFile, transFilePath); QApplication::installTranslator(&translator);