--- a/phonebookui/pbkcommonui/src/cntphonenumberviewitem.cpp	Fri May 14 15:42:23 2010 +0300
+++ b/phonebookui/pbkcommonui/src/cntphonenumberviewitem.cpp	Thu May 27 12:45:19 2010 +0300
@@ -245,121 +245,109 @@
     QString subTypeVideoShare = QContactOnlineAccount::SubTypeVideoShare;
     
     QStandardItem *mobile = new QStandardItem;
-    mobile->setText(hbTrId("txt_phob_dblist_mobile"));
+    mobile->setText(hbTrId("txt_phob_formlabel_val_mobile"));
     mobile->setData(subTypeMobile, DetailSubType);
     mobile->setData(CNT_PHONENUMBER_EDITOR_MAXLENGTH, DetailMaxLength);
     model->appendRow(mobile);
        
     QStandardItem *mobilehome = new QStandardItem;
-    mobilehome->setText(hbTrId("txt_phob_dblist_mobile_home"));
+    mobilehome->setText(hbTrId("txt_phob_formlabel_val_mobile_home"));
     mobilehome->setData(subTypeMobile, DetailSubType);
     mobilehome->setData(contextHome, DetailContext);
     mobilehome->setData(CNT_PHONENUMBER_EDITOR_MAXLENGTH, DetailMaxLength);
     model->appendRow(mobilehome);
        
     QStandardItem *mobilework = new QStandardItem;
-    mobilework->setText(hbTrId("txt_phob_dblist_mobile_work"));
+    mobilework->setText(hbTrId("txt_phob_formlabel_val_mobile_work"));
     mobilework->setData(subTypeMobile, DetailSubType);
     mobilework->setData(contextWork, DetailContext);
     mobilework->setData(CNT_PHONENUMBER_EDITOR_MAXLENGTH, DetailMaxLength);
     model->appendRow(mobilework);
 
     QStandardItem *land = new QStandardItem;
-    land->setText(hbTrId("txt_phob_dblist_phone"));
+    land->setText(hbTrId("txt_phob_formlabel_val_phone"));
     land->setData(subTypeLandline, DetailSubType);
     land->setData(CNT_PHONENUMBER_EDITOR_MAXLENGTH, DetailMaxLength);
     model->appendRow(land);
        
     QStandardItem *landhome = new QStandardItem;
-    landhome->setText(hbTrId("txt_phob_dblist_phone_home"));
+    landhome->setText(hbTrId("txt_phob_formlabel_val_phone_home"));
     landhome->setData(subTypeLandline, DetailSubType);
     landhome->setData(contextHome, DetailContext);
     landhome->setData(CNT_PHONENUMBER_EDITOR_MAXLENGTH, DetailMaxLength);
     model->appendRow(landhome);
        
     QStandardItem *landwork = new QStandardItem;
-    landwork->setText(hbTrId("txt_phob_dblist_phone_work"));
+    landwork->setText(hbTrId("txt_phob_formlabel_val_phone_work"));
     landwork->setData(subTypeLandline, DetailSubType);
     landwork->setData(contextWork, DetailContext);
     landwork->setData(CNT_PHONENUMBER_EDITOR_MAXLENGTH, DetailMaxLength);
     model->appendRow(landwork);
     
     QStandardItem *fax = new QStandardItem;
-    fax->setText(hbTrId("txt_phob_dblist_fax"));
+    fax->setText(hbTrId("txt_phob_formlabel_val_fax"));
     fax->setData(subTypeFax, DetailSubType);
     fax->setData(CNT_PHONENUMBER_EDITOR_MAXLENGTH, DetailMaxLength);
     model->appendRow(fax);
     
     QStandardItem *faxhome = new QStandardItem;
-    faxhome->setText(hbTrId("txt_phob_dblist_fax_home"));
+    faxhome->setText(hbTrId("txt_phob_formlabel_val_fax_home"));
     faxhome->setData(subTypeFax, DetailSubType);
     faxhome->setData(contextHome, DetailContext);
     faxhome->setData(CNT_PHONENUMBER_EDITOR_MAXLENGTH, DetailMaxLength);
     model->appendRow(faxhome);
     
     QStandardItem *faxwork = new QStandardItem;
-    faxwork->setText(hbTrId("txt_phob_dblist_fax_work"));
+    faxwork->setText(hbTrId("txt_phob_formlabel_val_fax_work"));
     faxwork->setData(subTypeFax, DetailSubType);
     faxwork->setData(contextWork, DetailContext);
     faxwork->setData(CNT_PHONENUMBER_EDITOR_MAXLENGTH, DetailMaxLength);
     model->appendRow(faxwork);
         
     QStandardItem *pager = new QStandardItem;
-    pager->setText(hbTrId("txt_phob_dblist_pager"));
+    pager->setText(hbTrId("txt_phob_formlabel_val_pager"));
     pager->setData(subTypePager, DetailSubType);
     pager->setData(CNT_PHONENUMBER_EDITOR_MAXLENGTH, DetailMaxLength);
     model->appendRow(pager);
     
     QStandardItem *assistant = new QStandardItem;
-    assistant->setText(hbTrId("txt_phob_dblist_assistant"));
+    assistant->setText(hbTrId("txt_phob_formlabel_val_assistant"));
     assistant->setData(subTypeAssistant, DetailSubType);
     assistant->setData(CNT_PHONENUMBER_EDITOR_MAXLENGTH, DetailMaxLength);
     model->appendRow(assistant);
         
     QStandardItem *carPhone = new QStandardItem;
-    carPhone->setText(hbTrId("txt_phob_dblist_car"));
+    carPhone->setText(hbTrId("txt_phob_formlabel_val_car"));
     carPhone->setData(subTypeCarPhone, DetailSubType);
     carPhone->setData(CNT_PHONENUMBER_EDITOR_MAXLENGTH, DetailMaxLength);
     model->appendRow(carPhone);
-    
-//    QStandardItem *dtmf = new QStandardItem;
-//    dtmf->setText(hbTrId("DTMF"));
-//    dtmf->setData(subTypeDtmf, DetailSubType);
-//    dtmf->setData(CNT_DTMF_EDITOR_MAXLENGTH, DetailMaxLength);
-//    model->appendRow(dtmf);
-   
+       
     QStandardItem *internet = new QStandardItem;
-    internet->setText(qtTrId("Internet call"));
+    internet->setText(hbTrId("txt_phob_formlabel_val_internet_telephone"));
     internet->setData(subTypeInternet, DetailSubType);
     internet->setData(CNT_ONLINEACCOUNT_EDITOR_MAXLENGTH, DetailMaxLength);
     model->appendRow(internet);
       
     QStandardItem *internethome = new QStandardItem;
-    internethome->setText(hbTrId("Internet call (home)"));
+    internethome->setText(hbTrId("txt_phob_formlabel_val_internet_telephone_home"));
     internethome->setData(subTypeInternet, DetailSubType);
     internethome->setData(contextHome, DetailContext);
     internethome->setData(CNT_ONLINEACCOUNT_EDITOR_MAXLENGTH, DetailMaxLength);
     model->appendRow(internethome);
 
     QStandardItem *internetwork = new QStandardItem;
-    internetwork->setText(hbTrId("Internet call (work)"));
+    internetwork->setText(hbTrId("txt_phob_formlabel_val_internet_telephone_work"));
     internetwork->setData(subTypeInternet, DetailSubType);
     internetwork->setData(contextWork, DetailContext);
     internetwork->setData(CNT_ONLINEACCOUNT_EDITOR_MAXLENGTH, DetailMaxLength);
     model->appendRow(internetwork);
           
     QStandardItem *sip = new QStandardItem;
-    sip->setText(hbTrId("SIP"));
+    sip->setText(hbTrId("txt_phob_formlabel_val_sip"));
     sip->setData(subTypeSIP, DetailSubType);
     sip->setData(CNT_ONLINEACCOUNT_EDITOR_MAXLENGTH, DetailMaxLength);
     model->appendRow(sip);
-      
-//    QStandardItem *shareVideo = new QStandardItem;
-//    shareVideo->setText(qtTrId("Share Video"));
-//    shareVideo->setData(subTypeVideoShare, DetailSubType);
-//    shareVideo->setData(CNT_ONLINEACCOUNT_EDITOR_MAXLENGTH, DetailMaxLength);
-//    model->appendRow(shareVideo);
-   
+         
     mBox->setModel( model );
     
     // search the selected index to be set