7 files changed, 9 insertions, 37 deletions

diff --git a/bin/kdepim/kaddressbook/germantranslation.txt b/bin/kdepim/kaddressbook/germantranslation.txt
index 06f25e9..3448dcc 100644
--- a/bin/kdepim/kaddressbook/germantranslation.txt
+++ b/bin/kdepim/kaddressbook/germantranslation.txt
@@ -821,12 +821,11 @@
 { "Fax (Home)","Fax (Privat)" },

 { "Assistent","Sekretär(in)" },

 { "Company","Firma" },

-{ "Mobile2 (Work)","Handy2 (Arbeit)" },

-{ "Mobile2 (Car)","Handy2 (Auto)" },

+{ "Mobile2","Handy2" },

 { "Callback","Rückruf" },

 { "Fax (Other)","Fax (Sonst.)" },

 { "Primary","Bevorzugt" },

-{ "Mobile (Home)","Handy (Privat)" },

+{ "Mobile","Handy" },

 { "Unfiled","Nicht zugeordnet" },

 { "Format.n.:","Format.N.:" },

 { "Other Phone","Sonst. Telefon" },

diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp
index 0d8e8e8..2f4a9af 100644
--- a/kabc/addressee.cpp
+++ b/kabc/addressee.cpp
@@ -1055,15 +1055,11 @@ QString Addressee::businessPhoneLabel()
 
 QString Addressee::mobilePhoneLabel()
 {
-  return i18n("Mobile Phone");
+  return i18n("Mobile");
 }
 QString Addressee::mobileWorkPhoneLabel()
 {
-  return i18n("Mobile2 (Work)");
-}
-QString Addressee::mobileHomePhoneLabel()
-{
-  return i18n("Mobile (Home)");
+  return i18n("Mobile2");
 }
 
 
@@ -1079,12 +1075,6 @@ QString Addressee::businessFaxLabel()
 }
 
 
-QString Addressee::carPhoneLabel()
-{
-  return i18n("Mobile2 (Car)");
-}
-
-
 QString Addressee::isdnLabel()
 {
   return i18n("ISDN");
diff --git a/kabc/addressee.h b/kabc/addressee.h
index fcadda6..aac78dc 100644
--- a/kabc/addressee.h
+++ b/kabc/addressee.h
@@ -332,7 +332,6 @@ class Addressee
      */
     static QString mobilePhoneLabel();
     static QString mobileWorkPhoneLabel();
-    static QString mobileHomePhoneLabel();
 
     /**
       Return translated label for homeFax field.
@@ -344,10 +343,6 @@ class Addressee
      */
     static QString businessFaxLabel();
 
-    /**
-      Return translated label for carPhone field.
-     */
-    static QString carPhoneLabel();
 
     /**
       Return translated label for isdn field.
diff --git a/kabc/field.cpp b/kabc/field.cpp
index 6f2b307..7c6d7a9 100644
--- a/kabc/field.cpp
+++ b/kabc/field.cpp
@@ -75,7 +75,6 @@ class Field::FieldImpl
       MobilePhone,
       HomeFax,
       BusinessFax,
-      CarPhone,
       Isdn,
       Pager,
       Email,
@@ -88,7 +87,6 @@ class Field::FieldImpl
       Resource,
       Sip,
       MobileWorkPhone,
-      MobileHomePhone,
       OtherPhone
     };
 
@@ -173,16 +171,12 @@ QString Field::label()
       return Addressee::businessPhoneLabel();
     case FieldImpl::MobilePhone:
       return Addressee::mobilePhoneLabel();
-    case FieldImpl::MobileHomePhone:
-      return Addressee::mobileHomePhoneLabel();
     case FieldImpl::MobileWorkPhone:
       return Addressee::mobileWorkPhoneLabel();
     case FieldImpl::HomeFax:
       return Addressee::homeFaxLabel();
     case FieldImpl::BusinessFax:
       return Addressee::businessFaxLabel();
-    case FieldImpl::CarPhone:
-      return Addressee::carPhoneLabel();
     case FieldImpl::Isdn:
       return Addressee::isdnLabel();
     case FieldImpl::Pager:
@@ -299,14 +293,10 @@ QString Field::value( const KABC::Addressee &a )
       return a.phoneNumber( PhoneNumber::Cell ).number();
     case FieldImpl::MobileWorkPhone:
       return a.phoneNumber( PhoneNumber::Car ).number();
-    case FieldImpl::MobileHomePhone:
-      return a.phoneNumber( PhoneNumber::Cell  ).number();
     case FieldImpl::HomeFax:
       return a.phoneNumber( PhoneNumber::Home | PhoneNumber::Fax ).number();
     case FieldImpl::BusinessFax:
       return a.phoneNumber( PhoneNumber::Work | PhoneNumber::Fax ).number();
-    case FieldImpl::CarPhone:
-      return a.phoneNumber( PhoneNumber::Car ).number();
     case FieldImpl::Isdn:
       return a.phoneNumber( PhoneNumber::Isdn ).number();
     case FieldImpl::Pager:
@@ -431,11 +421,9 @@ Field::List Field::allFields()
     createField( FieldImpl::HomePhone, Personal|Frequent );
     createField( FieldImpl::BusinessPhone, Organization|Frequent );
     createField( FieldImpl::MobilePhone, Frequent );
-    createField( FieldImpl::MobileHomePhone, Frequent );
     createField( FieldImpl::MobileWorkPhone, Frequent );
     createField( FieldImpl::HomeFax );
     createField( FieldImpl::BusinessFax );
-    createField( FieldImpl::CarPhone );
     createField( FieldImpl::Isdn );
     createField( FieldImpl::Pager );
     createField( FieldImpl::Email, Email|Frequent );
diff --git a/kabc/phonenumber.cpp b/kabc/phonenumber.cpp
index 90cc4cf..6db1bcf 100644
--- a/kabc/phonenumber.cpp
+++ b/kabc/phonenumber.cpp
@@ -233,7 +233,7 @@ QStringList PhoneNumber::supportedTypeListNames()
 {
   static QStringList list;
   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;
 }
 
@@ -284,7 +284,7 @@ QString PhoneNumber::typeLabel( int type )
       return i18n("VoIP");
   }
   if ((type & Car) == Car)
-      return i18n("Mobile2 (Work)");
+      return i18n("Mobile2");
   if ((type & Pager) == Pager)
       return i18n("Pager");
   if ((type & Isdn) == Isdn)
diff --git a/kaddressbook/xxport/csvimportdialog.cpp b/kaddressbook/xxport/csvimportdialog.cpp
index 4044fa8..862241e 100644
--- a/kaddressbook/xxport/csvimportdialog.cpp
+++ b/kaddressbook/xxport/csvimportdialog.cpp
@@ -112,7 +112,7 @@ CSVImportDialog::CSVImportDialog( KABC::AddressBook *ab, QWidget *parent,
   mTypeMap.insert( KABC::Addressee::mobilePhoneLabel(), MobilePhone );
   mTypeMap.insert( KABC::Addressee::homeFaxLabel(), HomeFax );
   mTypeMap.insert( KABC::Addressee::businessFaxLabel(), BusinessFax );
-  mTypeMap.insert( KABC::Addressee::carPhoneLabel(), CarPhone );
+  mTypeMap.insert( KABC::Addressee::mobileWorkPhoneLabel(), MobileWorkPhone );
   mTypeMap.insert( KABC::Addressee::isdnLabel(), Isdn );
   mTypeMap.insert( KABC::Addressee::pagerLabel(), Pager );
   mTypeMap.insert( KABC::Addressee::emailLabel(), Email );
@@ -293,7 +293,7 @@ KABC::AddresseeList CSVImportDialog::contacts() const
             a.insertPhoneNumber( number );
           }
           break;
-        case CarPhone:
+        case MobileWorkPhone:
           if ( !value.isEmpty() ) {
             KABC::PhoneNumber number( value, KABC::PhoneNumber::Car );
             a.insertPhoneNumber( number );
diff --git a/kaddressbook/xxport/csvimportdialog.h b/kaddressbook/xxport/csvimportdialog.h
index 5f55ab2..2661420 100644
--- a/kaddressbook/xxport/csvimportdialog.h
+++ b/kaddressbook/xxport/csvimportdialog.h
@@ -81,7 +81,7 @@ class CSVImportDialog : public KDialogBase
            BusinessAddressStreet, BusinessAddressLocality, BusinessAddressRegion,
            BusinessAddressPostalCode, BusinessAddressCountry, 
            BusinessAddressLabel,
-           HomePhone, BusinessPhone, MobilePhone, HomeFax, BusinessFax, CarPhone,
+           HomePhone, BusinessPhone, MobilePhone, HomeFax, BusinessFax, MobileWorkPhone,
            Isdn, Pager, Email, Mailer, Title, Role, Organization, Note, URL, Categories
          };