fixx

4 files changed, 5 insertions, 32 deletions

diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp
index 0d8e8e8..2f4a9af 100644
--- a/kabc/addressee.cpp
+++ b/kabc/addressee.cpp
@@ -1057,3 +1057,3 @@ QString Addressee::mobilePhoneLabel()
 {
-  return i18n("Mobile Phone");
+  return i18n("Mobile");
 }
@@ -1061,7 +1061,3 @@ QString Addressee::mobileWorkPhoneLabel()
 {
-  return i18n("Mobile2 (Work)");
-}
-QString Addressee::mobileHomePhoneLabel()
-{
-  return i18n("Mobile (Home)");
+  return i18n("Mobile2");
 }
@@ -1081,8 +1077,2 @@ QString Addressee::businessFaxLabel()
 
-QString Addressee::carPhoneLabel()
-{
-  return i18n("Mobile2 (Car)");
-}
-
-
 QString Addressee::isdnLabel()
diff --git a/kabc/addressee.h b/kabc/addressee.h
index fcadda6..aac78dc 100644
--- a/kabc/addressee.h
+++ b/kabc/addressee.h
@@ -334,3 +334,2 @@ class Addressee
     static QString mobileWorkPhoneLabel();
-    static QString mobileHomePhoneLabel();
 
@@ -346,7 +345,3 @@ class Addressee
 
-    /**
-      Return translated label for carPhone field.
-     */
-    static QString carPhoneLabel();
-
+  
     /**
diff --git a/kabc/field.cpp b/kabc/field.cpp
index 6f2b307..7c6d7a9 100644
--- a/kabc/field.cpp
+++ b/kabc/field.cpp
@@ -77,3 +77,2 @@ class Field::FieldImpl
       BusinessFax,
-      CarPhone,
       Isdn,
@@ -90,3 +89,2 @@ class Field::FieldImpl
       MobileWorkPhone,
-      MobileHomePhone,
       OtherPhone
@@ -175,4 +173,2 @@ QString Field::label()
       return Addressee::mobilePhoneLabel();
-    case FieldImpl::MobileHomePhone:
-      return Addressee::mobileHomePhoneLabel();
     case FieldImpl::MobileWorkPhone:
@@ -183,4 +179,2 @@ QString Field::label()
       return Addressee::businessFaxLabel();
-    case FieldImpl::CarPhone:
-      return Addressee::carPhoneLabel();
     case FieldImpl::Isdn:
@@ -301,4 +295,2 @@ QString Field::value( const KABC::Addressee &a )
       return a.phoneNumber( PhoneNumber::Car ).number();
-    case FieldImpl::MobileHomePhone:
-      return a.phoneNumber( PhoneNumber::Cell  ).number();
     case FieldImpl::HomeFax:
@@ -307,4 +299,2 @@ QString Field::value( const KABC::Addressee &a )
       return a.phoneNumber( PhoneNumber::Work | PhoneNumber::Fax ).number();
-    case FieldImpl::CarPhone:
-      return a.phoneNumber( PhoneNumber::Car ).number();
     case FieldImpl::Isdn:
@@ -433,3 +423,2 @@ Field::List Field::allFields()
     createField( FieldImpl::MobilePhone, Frequent );
-    createField( FieldImpl::MobileHomePhone, Frequent );
     createField( FieldImpl::MobileWorkPhone, Frequent );
@@ -437,3 +426,2 @@ Field::List Field::allFields()
     createField( FieldImpl::BusinessFax );
-    createField( FieldImpl::CarPhone );
     createField( FieldImpl::Isdn );
diff --git a/kabc/phonenumber.cpp b/kabc/phonenumber.cpp
index 90cc4cf..6db1bcf 100644
--- a/kabc/phonenumber.cpp
+++ b/kabc/phonenumber.cpp
@@ -235,3 +235,3 @@ QStringList PhoneNumber::supportedTypeListNames()
   if ( list.count() == 0 ) 
-      list << i18n("Home") <<  i18n("Work") << i18n("Mobile") << i18n("SIP") << i18n("VoIP") <<i18n("Home2")<< i18n("Work2") << i18n("Mobile2 (Work)") <<  i18n("Assistent") << i18n("Company") << i18n("Fax (Home)") << i18n("Fax (Work)") << i18n("Fax (Other)")  << i18n("Pager") << i18n("ISDN") << i18n("Video") << i18n("Callback") << i18n("Primary")<< i18n("Other");
+      list << i18n("Home") <<  i18n("Work") << i18n("Mobile") << i18n("SIP") << i18n("VoIP") <<i18n("Home2")<< i18n("Work2") << i18n("Mobile2") <<  i18n("Assistent") << i18n("Company") << i18n("Fax (Home)") << i18n("Fax (Work)") << i18n("Fax (Other)")  << i18n("Pager") << i18n("ISDN") << i18n("Video") << i18n("Callback") << i18n("Primary")<< i18n("Other");
   return list;
@@ -286,3 +286,3 @@ QString PhoneNumber::typeLabel( int type )
   if ((type & Car) == Car)
-      return i18n("Mobile2 (Work)");
+      return i18n("Mobile2");
   if ((type & Pager) == Pager)