diff -r d316aecb87fd -r c34c36d1c835 deviceupdatesui/deviceupdates/src/serversettingsview.cpp --- a/deviceupdatesui/deviceupdates/src/serversettingsview.cpp Tue Jul 13 04:01:20 2010 +0530 +++ b/deviceupdatesui/deviceupdates/src/serversettingsview.cpp Fri Jul 23 16:30:56 2010 +0530 @@ -74,12 +74,12 @@ serverpwd->setContentWidgetData(QString("echoMode"),HbLineEdit::Password ); serverpwd->setContentWidgetData(QString("text"), settingdatalist[2]); QStringList sList; - sList <setContentWidgetData(QString("text"), sList[0]);//Internet selected sessionmode->setContentWidgetData(QString("additionalText"), sList[1]); - apdata.append(hbTrId("txt_device_update_setlabel_access_point_val_defaul")); + apdata.append(hbTrId("txt_deviceupdate_setlabel_access_point_val_default")); accesspoint->setContentWidgetData(QString("items"), apdata); currentiapindex = currentap; if(currentap >= 0) @@ -95,8 +95,8 @@ userpwd->setContentWidgetData(QString("echoMode"),HbLineEdit::Password ); userpwd->setContentWidgetData(QString("text"),settingdatalist[5]); QStringList yesnoList; - yesnoList <setContentWidgetData(QString("text"), yesnoList[0]); networkauth->setContentWidgetData(QString("additionalText"), yesnoList[1]); networkusername->setContentWidgetData(QString("text"),settingdatalist[6]); @@ -144,7 +144,7 @@ QString netauthdata = sessionmode->contentWidgetData(QString("text")).toString(); bool netauthval = false; - if (netauthdata.compare("yes")) + if (netauthdata.compare(hbTrId("txt_deviceupdate_setlabel_network_auth_val_yes"))) netauthval = true; //check server name , server id, host addr & usrname if ((itemlist[0].length() > 0) && (itemlist[1].length() > 0) @@ -258,13 +258,13 @@ itemname = hbTrId("txt_device_update_formlabel_password"); userpwd = dataformmodel->appendDataFormItem(HbDataFormModelItem::TextItem, itemname); - itemname = hbTrId("txt_device_update_setlabel_network_authentication"); + itemname = hbTrId("txt_device_update_formlabel_network_authentication"); networkauth = dataformmodel->appendDataFormItem(HbDataFormModelItem::ToggleValueItem, itemname); - itemname = hbTrId("txt_device_update_formlabel_network_user_name"); + itemname = hbTrId("txt_device_update_formlabel_network_username"); networkusername = dataformmodel->appendDataFormItem(HbDataFormModelItem::TextItem, itemname); - itemname = hbTrId("txt_device_update_formlabel_network_password"); + itemname = hbTrId("txt_device_update_setlabel_network_password"); networkpwd = dataformmodel->appendDataFormItem(HbDataFormModelItem::TextItem, itemname); } }