3 files changed, 11 insertions, 11 deletions

diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp
index 661bdf6..19c78ee 100644
--- a/kabc/addressee.cpp
+++ b/kabc/addressee.cpp
@@ -1065,3 +1065,3 @@ QString Addressee::mobileHomePhoneLabel()
 {
-  return i18n("Mobile");
+  return i18n("Mobile (Home)");
 }
@@ -1083,3 +1083,3 @@ QString Addressee::carPhoneLabel()
 {
-  return i18n("Mobile2 (work)");
+  return i18n("Mobile2 (car)");
 }
diff --git a/kabc/plugins/qtopia/qtopiaconverter.cpp b/kabc/plugins/qtopia/qtopiaconverter.cpp
index 39d366b..9693a68 100644
--- a/kabc/plugins/qtopia/qtopiaconverter.cpp
+++ b/kabc/plugins/qtopia/qtopiaconverter.cpp
@@ -203,3 +203,3 @@ bool QtopiaConverter::qtopiaToAddressee( const QDomElement& el, Addressee &adr )
             KABC::PhoneNumber businessPhoneNum( el.attribute( "BusinessPhone" ),
-                                                KABC::PhoneNumber::Work );
+                                                KABC::PhoneNumber::Work | KABC::PhoneNumber::Pref );
             KABC::PhoneNumber businessFaxNum( el.attribute( "BusinessFax" ),
@@ -207,5 +207,5 @@ bool QtopiaConverter::qtopiaToAddressee( const QDomElement& el, Addressee &adr )
             KABC::PhoneNumber businessMobile( el.attribute( "BusinessMobile" ),
-                                              KABC::PhoneNumber::Work | KABC::PhoneNumber::Cell );
+                                              KABC::PhoneNumber::Car );
             KABC::PhoneNumber businessPager( el.attribute( "BusinessPager" ),
-                                             KABC::PhoneNumber::Work | KABC::PhoneNumber::Pager );
+                                             KABC::PhoneNumber::Pager );
             if ( !businessPhoneNum.number().isEmpty() )
@@ -232,3 +232,3 @@ bool QtopiaConverter::qtopiaToAddressee( const QDomElement& el, Addressee &adr )
             KABC::PhoneNumber homePhoneNum( el.attribute( "HomePhone" ),
-                                            KABC::PhoneNumber::Home );
+                                            KABC::PhoneNumber::Home | KABC::PhoneNumber::Pref);
             KABC::PhoneNumber homeFax( el.attribute( "HomeFax" ),
diff --git a/kabc/plugins/sharpdtm/sharpdtmconverter.cpp b/kabc/plugins/sharpdtm/sharpdtmconverter.cpp
index 4adcae4..3d429fa 100644
--- a/kabc/plugins/sharpdtm/sharpdtmconverter.cpp
+++ b/kabc/plugins/sharpdtm/sharpdtmconverter.cpp
@@ -134,3 +134,3 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa
       PhoneNumber homephone;
-      homephone.setType( PhoneNumber::Home );
+      homephone.setType( PhoneNumber::Home | PhoneNumber::Pref );
       homephone.setNumber( db->readField(ZdbAdrs::HomePhone) );
@@ -150,3 +150,3 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa
       PhoneNumber homemobile;
-      homemobile.setType( PhoneNumber::Home | PhoneNumber::Cell );
+      homemobile.setType( PhoneNumber::Cell );
       homemobile.setNumber( db->readField(ZdbAdrs::HomeMobile) );
@@ -182,3 +182,3 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa
       PhoneNumber businessphone;
-      businessphone.setType( PhoneNumber::Work );
+      businessphone.setType( PhoneNumber::Work | PhoneNumber::Pref );
       businessphone.setNumber( db->readField(ZdbAdrs::BusinessPhone) );
@@ -198,3 +198,3 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa
       PhoneNumber businessmobile;
-      businessmobile.setType( PhoneNumber::Work | PhoneNumber::Cell );
+      businessmobile.setType( PhoneNumber::Car );
       businessmobile.setNumber( db->readField(ZdbAdrs::BusinessMobile) );
@@ -206,3 +206,3 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa
       PhoneNumber businesspager;
-      businesspager.setType( PhoneNumber::Work | PhoneNumber::Pager );
+      businesspager.setType(  PhoneNumber::Pager );
       businesspager.setNumber( db->readField(ZdbAdrs::BusinessPager) );