--- a/wlanutilities/eapwizard/src/eapwizard_p.cpp	Fri Jul 09 10:38:19 2010 +0300
+++ b/wlanutilities/eapwizard/src/eapwizard_p.cpp	Fri Aug 06 18:38:57 2010 +0300
@@ -244,7 +244,7 @@
 
     QString string;
     if (textId) {
-        string = HbParameterLengthLimiter(hbTrId(textId)).arg(eapTypeToString(eapType));
+        string = HbParameterLengthLimiter(textId).arg(eapTypeToString(eapType));
     }
 
     OstTraceFunctionExit0( EAPWIZARDPRIVATE_ERRORSTRING_EXIT );

--- a/wlanutilities/eapwizard/src/eapwizardpageidentity.cpp	Fri Jul 09 10:38:19 2010 +0300
+++ b/wlanutilities/eapwizard/src/eapwizardpageidentity.cpp	Fri Aug 06 18:38:57 2010 +0300
@@ -154,9 +154,8 @@
         mWizard->configurations(EapWizardPrivate::OuterType).toInt() );
 
     mLabelUsername->setPlainText(
-        HbParameterLengthLimiter(
-            hbTrId("txt_occ_setlabel_user_name_for_1")).arg(
-                mWizard->eapTypeToString(plugin.pluginId())));
+        HbParameterLengthLimiter("txt_occ_setlabel_user_name_for_1").arg(
+            mWizard->eapTypeToString(plugin.pluginId())));
 
     // Configure editors properties
     mValidatorUsername.reset( 

--- a/wlanutilities/eapwizard/src/eapwizardpageinnertype.cpp	Fri Jul 09 10:38:19 2010 +0300
+++ b/wlanutilities/eapwizard/src/eapwizardpageinnertype.cpp	Fri Aug 06 18:38:57 2010 +0300
@@ -132,11 +132,10 @@
     }
 
     mTitle->setPlainText(
-        HbParameterLengthLimiter(
-            hbTrId("txt_occ_title_select_innear_eap_type_for_1")).arg(
-                mWizard->eapTypeToString(
-                    mWizard->configurations(
-                        EapWizardPrivate::OuterType).toInt())));
+        HbParameterLengthLimiter("txt_occ_title_select_innear_eap_type_for_1").arg(
+            mWizard->eapTypeToString(
+                mWizard->configurations(
+                    EapWizardPrivate::OuterType).toInt())));
 
     OstTraceFunctionExit0( EAPWIZARDPAGEINNERTYPE_INITIALIZEPAGE_EXIT );
     return mWidget;

--- a/wlanutilities/eapwizard/src/eapwizardpageusernamepassword.cpp	Fri Jul 09 10:38:19 2010 +0300
+++ b/wlanutilities/eapwizard/src/eapwizardpageusernamepassword.cpp	Fri Aug 06 18:38:57 2010 +0300
@@ -155,9 +155,8 @@
     mValidatorPassword->updateEditor(mEditPassword);
 
     mTitleUsername->setPlainText(
-        HbParameterLengthLimiter(
-            hbTrId("txt_occ_setlabel_user_name_for_1")).arg(
-                mWizard->eapTypeToString(eapType)));
+        HbParameterLengthLimiter("txt_occ_setlabel_user_name_for_1").arg(
+            mWizard->eapTypeToString(eapType)));
 
     OstTraceFunctionExit0( EAPWIZARDPAGEUSERNAMEPASSWORD_INITIALIZEPAGE_EXIT );
     return mWidget;

--- a/wlanutilities/wlanindicatorplugin/wlanindicatorplugin.pro	Fri Jul 09 10:38:19 2010 +0300
+++ b/wlanutilities/wlanindicatorplugin/wlanindicatorplugin.pro	Fri Aug 06 18:38:57 2010 +0300
@@ -20,12 +20,12 @@
 
 # directories
 DEPENDPATH += .
-INCLUDEPATH += .\inc
+INCLUDEPATH += ./inc
 
-HEADERS += inc\wlanindicatorplugin.h \
-           traces\OstTraceDefinitions.h
+HEADERS += inc/wlanindicatorplugin.h \
+           traces/OstTraceDefinitions.h
 
-SOURCES += src\wlanindicatorplugin.cpp
+SOURCES += src/wlanindicatorplugin.cpp
 
 TRANSLATIONS = wlanindicatorplugin.ts
 

--- a/wlanutilities/wlansniffer/wlansnifferapplication/src/wlansnifferlistview.cpp	Fri Jul 09 10:38:19 2010 +0300
+++ b/wlanutilities/wlansniffer/wlansnifferapplication/src/wlansnifferlistview.cpp	Fri Aug 06 18:38:57 2010 +0300
@@ -29,6 +29,7 @@
 #include <HbDocumentLoader>
 #include <HbInstance>
 #include <HbMessageBox>
+#include <HbParameterLengthLimiter>
 
 #include <xqserviceutil.h>
 
@@ -274,15 +275,17 @@
         case WlanQtUtils::ConnStatusConnecting:
             // WLAN is connecting
             Q_ASSERT(iapId != WlanQtUtils::IapIdNone);
-            status = hbTrId("txt_occ_grid_connecting_to_1").arg(
-                mEngine->wlanQtUtils()->iapName(iapId));
+            status = HbParameterLengthLimiter(
+                "txt_occ_grid_connecting_to_1").arg(
+                    mEngine->wlanQtUtils()->iapName(iapId));
             break;
             
         case WlanQtUtils::ConnStatusConnected:
             // WLAN is connected
             Q_ASSERT(iapId != WlanQtUtils::IapIdNone);
-            status = hbTrId("txt_occ_grid_connected_to_1").arg(
-                mEngine->wlanQtUtils()->iapName(iapId));
+            status = HbParameterLengthLimiter(
+                "txt_occ_grid_connected_to_1").arg(
+                    mEngine->wlanQtUtils()->iapName(iapId));
             break;
             
         default:
@@ -337,8 +340,9 @@
         // Item was an IAP, connect it.
         mConnectingIapId = iapId;
         mStatusLabel->setPlainText(
-            hbTrId("txt_occ_grid_connecting_to_1").arg(
-                mEngine->wlanQtUtils()->iapName(iapId)));
+            HbParameterLengthLimiter(
+                "txt_occ_grid_connecting_to_1").arg(
+                    mEngine->wlanQtUtils()->iapName(iapId)));
         mEngine->wlanQtUtils()->connectIap(iapId);
     } else {
         // Item is a WLAN AP. Summon the Wlan Wizard to handle creation
@@ -439,8 +443,9 @@
     
     mConnectingIapId = WlanQtUtils::IapIdNone;
     mStatusLabel->setPlainText(
-        hbTrId("txt_occ_grid_connected_to_1").arg(
-            mEngine->wlanQtUtils()->iapName(iapId)));
+        HbParameterLengthLimiter(
+            "txt_occ_grid_connected_to_1").arg(
+                mEngine->wlanQtUtils()->iapName(iapId)));
     
     // Update the list widget content
     updateListContent();

--- a/wlanutilities/wlanwizard/src/wlanwizardpagekeyquery.cpp	Fri Jul 09 10:38:19 2010 +0300
+++ b/wlanutilities/wlanwizard/src/wlanwizardpagekeyquery.cpp	Fri Aug 06 18:38:57 2010 +0300
@@ -136,9 +136,8 @@
     }
     
     mLabelTitle->setPlainText(
-        HbParameterLengthLimiter(
-            hbTrId("txt_occ_dialog_enter_key_for_1")).arg(
-                mWizard->configuration(WlanWizardPrivate::ConfSsid).toString()));
+        HbParameterLengthLimiter("txt_occ_dialog_enter_key_for_1").arg(
+            mWizard->configuration(WlanWizardPrivate::ConfSsid).toString()));
     
     OstTraceFunctionExit0( WLANWIZARDPAGEKEYQUERY_INITIALIZEPAGE_EXIT );
     return mWidget;

--- a/wlanutilities/wlanwizard/src/wlanwizardpageprocessingsettings.cpp	Fri Jul 09 10:38:19 2010 +0300
+++ b/wlanutilities/wlanwizard/src/wlanwizardpageprocessingsettings.cpp	Fri Aug 06 18:38:57 2010 +0300
@@ -137,7 +137,7 @@
     
     mLabel->setPlainText(
         HbParameterLengthLimiter(
-            hbTrId("txt_occ_dialog_checking_connection_to_1")).arg(
+            "txt_occ_dialog_checking_connection_to_1").arg(
                 mWizard->configuration(WlanWizardPrivate::ConfSsid).toString()));
 
     OstTraceFunctionExit0( WLANWIZARDPAGEPROCESSINGSETTINGS_INITIALIZEPAGE_EXIT );

--- a/wlanutilities/wlanwizard/src/wlanwizardpagescanning.cpp	Fri Jul 09 10:38:19 2010 +0300
+++ b/wlanutilities/wlanwizard/src/wlanwizardpagescanning.cpp	Fri Aug 06 18:38:57 2010 +0300
@@ -133,10 +133,9 @@
     }
 
     mLabel->setPlainText(HbParameterLengthLimiter(
-        hbTrId("txt_occ_dialog_searching")).arg(mWizard->configuration(
+        "txt_occ_dialog_searching").arg(mWizard->configuration(
             WlanWizardPrivate::ConfSsid).toString()));
 
-
     OstTraceFunctionExit0( WLANWIZARDPAGESCANNING_INITIALIZEPAGE_EXIT );
     return mWidget;
 }

--- a/wlanutilities/wlanwizard/t_wlanwizard/ut/testwlanwizardcontext.cpp	Fri Jul 09 10:38:19 2010 +0300
+++ b/wlanutilities/wlanwizard/t_wlanwizard/ut/testwlanwizardcontext.cpp	Fri Aug 06 18:38:57 2010 +0300
@@ -326,23 +326,23 @@
                 return verifyDialogText("dialog", info);
 
             case WlanWizardPageInternal::PageKeyQuery:
-                return verifyDialogText("dialog", HbParameterLengthLimiter(hbTrId("txt_occ_dialog_enter_key_for_1")).arg(info));
+                return verifyDialogText("dialog", HbParameterLengthLimiter("txt_occ_dialog_enter_key_for_1").arg(info));
 
             case WlanWizardPageInternal::PageProcessSettings:
-                return verifyDialogText("dialog", HbParameterLengthLimiter(hbTrId("txt_occ_dialog_checking_connection_to_1")).arg(info));
+                return verifyDialogText("dialog", HbParameterLengthLimiter("txt_occ_dialog_checking_connection_to_1").arg(info));
 
             case WlanWizardPageInternal::PageScanning:
-                return verifyDialogText("dialog", HbParameterLengthLimiter(hbTrId("txt_occ_dialog_searching")).arg(info));
+                return verifyDialogText("dialog", HbParameterLengthLimiter("txt_occ_dialog_searching").arg(info));
                
             case EapWizardPage::PageUsernamePassword:
                 ret &= verifyDialogText(
                     "setlabel_55",
-                    HbParameterLengthLimiter(hbTrId("txt_occ_setlabel_user_name_for_1")).arg(info));
+                    HbParameterLengthLimiter("txt_occ_setlabel_user_name_for_1").arg(info));
                 ret &= verifyDialogText("setlabel_56", hbTrId("txt_occ_setlabel_eap_password"));
                 return ret;
                 
             case EapWizardPage::PageIdentity:
-                ret &= verifyDialogText("setlabel_53", HbParameterLengthLimiter(hbTrId("txt_occ_setlabel_user_name_for_1")).arg(info));
+                ret &= verifyDialogText("setlabel_53", HbParameterLengthLimiter("txt_occ_setlabel_user_name_for_1").arg(info));
                 ret &= verifyDialogText("setlabel_53_val", hbTrId("txt_occ_setlabel_user_name_val_generate_automatic"));
                 ret &= verifyDialogText("setlabel_54", hbTrId("txt_occ_setlabel_eap_realm"));
                 ret &= verifyDialogText("setlabel_54_val", hbTrId("txt_occ_setlabel_eap_realm_val_generate_automatically"));
@@ -350,7 +350,7 @@
                 
             case EapWizardPage::PageInnerTypePeap:
             case EapWizardPage::PageInnerTypeEapTtls:
-                return verifyDialogText("title", HbParameterLengthLimiter(hbTrId("txt_occ_title_select_innear_eap_type_for_1")).arg(info));
+                return verifyDialogText("title", HbParameterLengthLimiter("txt_occ_title_select_innear_eap_type_for_1").arg(info));
             
             default:
                 return verifyCurrentPage(pageId, retries, wait_ms);

--- a/wlanutilities/wlanwizard/wlanwizard.pro	Fri Jul 09 10:38:19 2010 +0300
+++ b/wlanutilities/wlanwizard/wlanwizard.pro	Fri Aug 06 18:38:57 2010 +0300
@@ -73,7 +73,7 @@
 symbian {
     INCLUDEPATH += \
         inc \
-        ..\inc
+        ../inc
 
     TARGET.UID3 = 0x2002C39A
     TARGET.CAPABILITY = CAP_GENERAL_DLL