--- a/coreapplicationuis/ATCmdPlugin/data/atcmdpluginresource.rss	Mon Aug 02 14:01:08 2010 +0300
+++ b/coreapplicationuis/ATCmdPlugin/data/atcmdpluginresource.rss	Fri Aug 06 10:45:02 2010 +0300
@@ -1,5 +1,5 @@
 
- // Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+ // Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
  // All rights reserved.
  // This component and the accompanying materials are made available
  // under the terms of "Eclipse Public License v1.0"
@@ -15,7 +15,6 @@
 
 #include <eikon.rh>
 #include <e32keys.h>
-#include <ncp_consts.hrh>
 #include "atcmdplugin.rh"
 
 

--- a/coreapplicationuis/Rfs/Plugins/cprfsplugin/inc/cprfssettingsform.h	Mon Aug 02 14:01:08 2010 +0300
+++ b/coreapplicationuis/Rfs/Plugins/cprfsplugin/inc/cprfssettingsform.h	Fri Aug 06 10:45:02 2010 +0300
@@ -19,6 +19,7 @@
 #define CP_RFS_SETTINGSFORM_H
 
 #include <hbdataform.h>
+#include <hbtranslator.h>
 
 class HbDataFormModelItem;
 
@@ -44,6 +45,7 @@
     //DataForm List Items
     HbDataFormModelItem *mNormalRfs;
     HbDataFormModelItem *mDeepRfs;
+    HbTranslator mTrans;
 
 };
 #endif // CP_RFS_SETTINGSFORM_H

--- a/coreapplicationuis/Rfs/Plugins/cprfsplugin/src/cprfsplugin.cpp	Mon Aug 02 14:01:08 2010 +0300
+++ b/coreapplicationuis/Rfs/Plugins/cprfsplugin/src/cprfsplugin.cpp	Fri Aug 06 10:45:02 2010 +0300
@@ -19,6 +19,7 @@
 #include "cprfsview.h"
 #include <cpsettingformentryitemdataimpl.h>
 #include <cpitemdatahelper.h>
+#include <hbtranslator.h>
 
 CpRfsPlugin::CpRfsPlugin()
     {
@@ -29,8 +30,9 @@
     }
 QList<CpSettingFormItemData*> CpRfsPlugin::createSettingFormItemData(CpItemDataHelper &itemDataHelper) const
     {
+    HbTranslator trans("control_panel");
     return QList<CpSettingFormItemData*>() 
-                << new CpSettingFormEntryItemDataImpl<CpRfsView>(itemDataHelper,tr("Restore Factory Settings"));
+                << new CpSettingFormEntryItemDataImpl<CpRfsView>(itemDataHelper,hbTrId("txt_cp_dblist_reset"),hbTrId("txt_cp_dblist_reset_val_reset_your_device"),QString("qtg_large_reset"));
     }
 
 Q_EXPORT_PLUGIN2(cprfsplugin, CpRfsPlugin);

--- a/coreapplicationuis/Rfs/Plugins/cprfsplugin/src/cprfssettingsdataformcustomitem.cpp	Mon Aug 02 14:01:08 2010 +0300
+++ b/coreapplicationuis/Rfs/Plugins/cprfsplugin/src/cprfssettingsdataformcustomitem.cpp	Fri Aug 06 10:45:02 2010 +0300
@@ -18,6 +18,7 @@
 #include <cprfssettingsdataformcustomitem.h>
 #include <hbdataformmodelitem.h>
 #include <hbpushbutton.h>
+#include <hbtranslator.h>
 
 CpRfsSettingsDataFormCustomItem::CpRfsSettingsDataFormCustomItem(QGraphicsItem *parent) :
 HbDataFormViewItem(parent)
@@ -52,20 +53,21 @@
          {
          HbDataFormModelItem::DataItemType itemType = static_cast<HbDataFormModelItem::DataItemType>(
          modelIndex().data(HbDataFormModelItem::ItemTypeRole).toInt());
+         HbTranslator trans("control_panel");
          switch(itemType)
                  {
                  case HbDataFormModelItem::CustomItemBase + 1:
                  	   {
                      //Create 1st button 
                      mButton = new HbPushButton();
-                     mButton->setText(tr("Restore"));
+                     mButton->setText(hbTrId("txt_cp_setlabel_settings_reset_val_reset_settings"));
                      return mButton;
                      }
                  case HbDataFormModelItem::CustomItemBase + 2:
                  	   {
                      //Create 2nd button
                      mButton = new HbPushButton();
-                     mButton->setText(tr("Delete Data and Restore"));
+                     mButton->setText(hbTrId("txt_cp_setlabel_device_reset_val_reset_device"));
                      return mButton;
                      }
                  //Some other cases can also be added if there are more than 2 custom data item

--- a/coreapplicationuis/Rfs/Plugins/cprfsplugin/src/cprfssettingsform.cpp	Mon Aug 02 14:01:08 2010 +0300
+++ b/coreapplicationuis/Rfs/Plugins/cprfsplugin/src/cprfssettingsform.cpp	Fri Aug 06 10:45:02 2010 +0300
@@ -25,9 +25,9 @@
 #include <rfsHandler.h>
 
 CpRfsSettingsForm::CpRfsSettingsForm(QGraphicsItem *parent) :
-    HbDataForm(parent)
+    HbDataForm(parent),mTrans("control_panel")
     {
-    this->setHeading(tr("Restore Factory Settings"));
+    this->setHeading(hbTrId("txt_cp_subhead_reset"));
 
     //initialize the form model
     initRfsSettingModel();
@@ -37,6 +37,7 @@
 
 CpRfsSettingsForm::~CpRfsSettingsForm()
     {
+    
     }
 
 void CpRfsSettingsForm::initRfsSettingModel()
@@ -45,11 +46,15 @@
 
 		// Create the custom items because HbPushButton cannot be added to the HbDataFormModelItem
     HbDataFormModelItem::DataItemType customItem1 = static_cast<HbDataFormModelItem::DataItemType>(HbDataFormModelItem::CustomItemBase + 1);
-                 
+    
     mNormalRfs = model->appendDataFormItem(customItem1, QString(), model->invisibleRootItem());
+    mNormalRfs->setLabel(hbTrId("txt_cp_setlabel_settings_reset"));
+    mNormalRfs->setDescription(hbTrId("txt_cp_info_original_settings_will_be_restored_no"));
     HbDataFormModelItem::DataItemType customItem2 = static_cast<HbDataFormModelItem::DataItemType>(HbDataFormModelItem::CustomItemBase + 2);
-                
+               
     mDeepRfs = model->appendDataFormItem(customItem2, QString(), model->invisibleRootItem());
+    mDeepRfs->setLabel(hbTrId("txt_cp_setlabel_device_reset"));
+    mDeepRfs->setDescription(hbTrId("txt_cp_info_all_data_will_be_deleted_and_factory_s")); 
     this->setModel(model);
     }
 

--- a/coreapplicationuis/SysAp/Src/SysApAppUi.cpp	Mon Aug 02 14:01:08 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/SysApAppUi.cpp	Fri Aug 06 10:45:02 2010 +0300
@@ -280,7 +280,7 @@
 	TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: trying CHbIndicatorSymbian::NewL()") ) );
     iHbIndicatorSymbian = CHbIndicatorSymbian::NewL();
 	
-	// TBool result = HbTextResolverSymbian::Init(KPsmlocalisationfile, KtsfilePath);
+	  TBool result = HbTextResolverSymbian::Init(KPsmlocalisationfile, KtsfilePath);
 	
     TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: END") ) );    
     }

--- a/coreapplicationuis/powersaveutilities/pluginlauncher/pluginlauncher.pro	Mon Aug 02 14:01:08 2010 +0300
+++ b/coreapplicationuis/powersaveutilities/pluginlauncher/pluginlauncher.pro	Fri Aug 06 10:45:02 2010 +0300
@@ -32,7 +32,7 @@
 symbian: {
     TARGET.UID3 = 0x2002DD0C 
     INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE
-    //  TARGET.CAPABILITY = ALL -TCB
+    TARGET.CAPABILITY =  ReadDeviceData  WriteDeviceData
     TARGET.EPOCALLOWDLLDATA = 1
 }