7 files changed, 10 insertions, 38 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
@@ -808,30 +808,29 @@
 { "Eeek, there I am ticklish!","Huch, da bin ich kitzlig!" },

 { "Save using LOCAL storage","Speichere nutze LOCAL Pfad" },

 { "...and %1 more\ncontact(s) selected","...und noch %1 Kontakte\n mehr ausgewählt" },

 { "Do you really\nwant to delete the\nsetected contact(s)?\n\n","Möchten Sie wirklich\ndie ausgewählten\nKontakte löschen?\n\n" },

 { "%1 contacts\nsuccessfully\nimported.","%1 Kontakte\nerfolgreich\nimportiert." },

 { "Import this contact?","Importiere diesen Kontakt?" },

 { "Import all!","Importiere alle!" },

 { "Loading addressbook data ... please wait","Lade Adressbuchdaten ... bitte warten" },

 { "Import Format","Import Format" },

 { "Select import format!\nDefault and standard is Utf8.\nLatin1 may be the right\nfor some West Europian languages.","Wähle Import Format!\nDefault und Standard ist Utf8.\nLatin1 kann das richtige für\nWesteuropäische Sprachen sein." },

 { "Home2","Privat2" },

 { "Work2","Arbeit2" },

 { "Fax (Work)","Fax (Arbeit)" },

 { "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" },

 { "","" },

 { "","" },

 { "","" },

 { "","" },

 { "","" },
\ No newline at end of file
diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp
index 0d8e8e8..2f4a9af 100644
--- a/kabc/addressee.cpp
+++ b/kabc/addressee.cpp
@@ -1042,62 +1042,52 @@ QString Addressee::businessAddressLabelLabel()
 
 
 QString Addressee::homePhoneLabel()
 {
   return i18n("Home Phone");
 }
 
 
 QString Addressee::businessPhoneLabel()
 {
   return i18n("Work Phone");
 }
 
 
 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");
 }
 
 
 QString Addressee::homeFaxLabel()
 {
   return i18n("Fax (Home)");
 }
 
 
 QString Addressee::businessFaxLabel()
 {
   return i18n("Fax (Work)");
 }
 
 
-QString Addressee::carPhoneLabel()
-{
-  return i18n("Mobile2 (Car)");
-}
-
-
 QString Addressee::isdnLabel()
 {
   return i18n("ISDN");
 }
 
 
 QString Addressee::pagerLabel()
 {
   return i18n("Pager");
 }
 QString Addressee::otherPhoneLabel()
 {
   return i18n("Other Phone");
 }
 
 QString Addressee::sipLabel()
diff --git a/kabc/addressee.h b/kabc/addressee.h
index fcadda6..aac78dc 100644
--- a/kabc/addressee.h
+++ b/kabc/addressee.h
@@ -319,49 +319,44 @@ class Addressee
 
     /**
       Return translated label for homePhone field.
      */
     static QString homePhoneLabel();
 
     /**
       Return translated label for businessPhone field.
      */
     static QString businessPhoneLabel();
 
     /**
       Return translated label for mobilePhone field.
      */
     static QString mobilePhoneLabel();
     static QString mobileWorkPhoneLabel();
-    static QString mobileHomePhoneLabel();
 
     /**
       Return translated label for homeFax field.
      */
     static QString homeFaxLabel();
 
     /**
       Return translated label for businessFax field.
      */
     static QString businessFaxLabel();
 
-    /**
-      Return translated label for carPhone field.
-     */
-    static QString carPhoneLabel();
-
+  
     /**
       Return translated label for isdn field.
      */
     static QString isdnLabel();
 
     /**
       Return translated label for pager field.
      */
     static QString pagerLabel();
     static QString otherPhoneLabel();
     /**
       Return translated label for sip field.
      */
     static QString sipLabel();
 
     /**
diff --git a/kabc/field.cpp b/kabc/field.cpp
index 6f2b307..7c6d7a9 100644
--- a/kabc/field.cpp
+++ b/kabc/field.cpp
@@ -62,46 +62,44 @@ class Field::FieldImpl
       HomeAddressLocality,
       HomeAddressRegion,
       HomeAddressPostalCode,
       HomeAddressCountry,
       HomeAddressLabel,
       BusinessAddressStreet,
       BusinessAddressLocality,
       BusinessAddressRegion,
       BusinessAddressPostalCode,
       BusinessAddressCountry,
       BusinessAddressLabel,
       HomePhone,
       BusinessPhone,
       MobilePhone,
       HomeFax,
       BusinessFax,
-      CarPhone,
       Isdn,
       Pager,
       Email,
       Mailer,
       Title,
       Role,
       Organization,
       Note,
       Url,
       Resource,
       Sip,
       MobileWorkPhone,
-      MobileHomePhone,
       OtherPhone
     };
 
     int fieldId() { return mFieldId; }
     int category() { return mCategory; }
     
     QString label() { return mLabel; }
     QString key() { return mKey; }
     QString app() { return mApp; }
     
   private:
     int mFieldId;
     int mCategory;
 
     QString mLabel;
     QString mKey;
@@ -160,42 +158,38 @@ QString Field::label()
     case FieldImpl::BusinessAddressLocality:
       return Addressee::businessAddressLocalityLabel();
     case FieldImpl::BusinessAddressRegion:
       return Addressee::businessAddressRegionLabel();
     case FieldImpl::BusinessAddressPostalCode:
       return Addressee::businessAddressPostalCodeLabel();
     case FieldImpl::BusinessAddressCountry:
       return Addressee::businessAddressCountryLabel();
     case FieldImpl::BusinessAddressLabel:
       return Addressee::businessAddressLabelLabel();
     case FieldImpl::HomePhone:
       return Addressee::homePhoneLabel();
     case FieldImpl::BusinessPhone:
       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:
       return Addressee::pagerLabel();
     case FieldImpl::Email:
       return Addressee::emailLabel();
     case FieldImpl::Mailer:
       return Addressee::mailerLabel();
     case FieldImpl::Title:
       return Addressee::titleLabel();
     case FieldImpl::Role:
       return Addressee::roleLabel();
     case FieldImpl::Organization:
       return Addressee::organizationLabel();
     case FieldImpl::Note:
       return Addressee::noteLabel();
@@ -286,40 +280,36 @@ QString Field::value( const KABC::Addressee &a )
         return QString::null;
     case FieldImpl::Url:
       return a.url().prettyURL();
 //US    
     case FieldImpl::Resource:
       return a.resource()->resourceName();
     case FieldImpl::Category:
         return a.categories().join(",");
     case FieldImpl::HomePhone:
       return a.phoneNumber( PhoneNumber::Home| PhoneNumber::Pref  ).number();
     case FieldImpl::BusinessPhone:
       return a.phoneNumber( PhoneNumber::Work| PhoneNumber::Pref  ).number();
     case FieldImpl::MobilePhone:
       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:
       return a.phoneNumber( PhoneNumber::Pager ).number();
     case FieldImpl::Sip:
       return a.phoneNumber( PhoneNumber::Pcs | PhoneNumber::Pref ).number();
     case FieldImpl::OtherPhone:
       return a.phoneNumber( PhoneNumber::Voice ).number();
     case FieldImpl::HomeAddressStreet:
       return a.address( Address::Home ).street();
     case FieldImpl::HomeAddressLocality:
       return a.address( Address::Home ).locality();
     case FieldImpl::HomeAddressRegion:
       return a.address( Address::Home ).region();
     case FieldImpl::HomeAddressPostalCode:
       return a.address( Address::Home ).postalCode();
@@ -418,37 +408,35 @@ Field::List Field::allFields()
     createField( FieldImpl::Category );
     createField( FieldImpl::HomeAddressStreet, Address|Personal );
     createField( FieldImpl::HomeAddressLocality, Address|Personal );
     createField( FieldImpl::HomeAddressRegion, Address|Personal );
     createField( FieldImpl::HomeAddressPostalCode, Address|Personal );
     createField( FieldImpl::HomeAddressCountry, Address|Personal );
     createField( FieldImpl::HomeAddressLabel, Address|Personal );
     createField( FieldImpl::BusinessAddressStreet, Address|Organization );
     createField( FieldImpl::BusinessAddressLocality, Address|Organization );
     createField( FieldImpl::BusinessAddressRegion, Address|Organization );
     createField( FieldImpl::BusinessAddressPostalCode, Address|Organization );
     createField( FieldImpl::BusinessAddressCountry, Address|Organization );
     createField( FieldImpl::BusinessAddressLabel, Address|Organization );
     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 );
     createField( FieldImpl::Mailer, Email );
     createField( FieldImpl::Title, Organization );
     createField( FieldImpl::Role, Organization );
     createField( FieldImpl::Organization, Organization );
     createField( FieldImpl::Note );
     createField( FieldImpl::Url );
     createField( FieldImpl::Resource );
     createField( FieldImpl::Sip );
     createField( FieldImpl::OtherPhone );
   }
 
   return mAllFields;
 }
diff --git a/kabc/phonenumber.cpp b/kabc/phonenumber.cpp
index 90cc4cf..6db1bcf 100644
--- a/kabc/phonenumber.cpp
+++ b/kabc/phonenumber.cpp
@@ -220,33 +220,33 @@ PhoneNumber::TypeList PhoneNumber::typeList()
   list << Home << Work << Msg << Pref << Voice << Fax << Cell << Video
        << Bbs << Modem << Car << Isdn << Pcs << Pager;
 
   return list;
 }
 PhoneNumber::TypeList PhoneNumber::supportedTypeList()
 {
     static TypeList list;
     if ( list.count() == 0 ) 
         list << (Home| Pref) << (Work| Pref) << Cell <<(Pcs|Pref)<<  Pcs<<  Home << Work << Car  << (Work|  Msg | Voice)  << (Work|  Msg)    << (Home | Fax) <<   (Work| Fax) <<  Fax<<   Pager  << Isdn  << Video << Msg << Pref << Voice;
     return list;
 }
 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;
 }
 
 int PhoneNumber::typeListIndex4Type(int type )
 {
     TypeList list = supportedTypeList();
     int i = 0;
     while ( i <  list.count() ) {
         if ( list [i] == type )
             return i;
         ++i;
     }
     return list.count()-1;
 }
 
 QString PhoneNumber::label( int type )
@@ -271,33 +271,33 @@ QString PhoneNumber::typeLabel( int type )
           return i18n("Work");
       if ((type & Fax) == Fax) 
           return i18n("Fax (Work)");
       if ((type & Msg) == Msg) {
           if ((type & Voice) == Voice)
               return i18n("Assistent");
           return i18n("Company");
       }
       return  i18n("Work2");
   }
   if ((type & Pcs) == Pcs) {
       if ((type & Pref) == Pref) 
           return i18n("SIP");
       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)
       return i18n("ISDN");
   if ((type & Video) == Video)
       return i18n("Video");
 
   if ((type & Msg) == Msg)
       return i18n("Callback");
   if ((type & Fax) == Fax)
     return i18n("Fax (Other)");
 
   if ((type & Pref) == Pref)
       return i18n("Primary");
 
 
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
@@ -99,33 +99,33 @@ CSVImportDialog::CSVImportDialog( KABC::AddressBook *ab, QWidget *parent,
   mTypeMap.insert( KABC::Addressee::businessAddressLocalityLabel(), 
                    BusinessAddressLocality );
   mTypeMap.insert( KABC::Addressee::businessAddressRegionLabel(), 
                    BusinessAddressRegion );
   mTypeMap.insert( KABC::Addressee::businessAddressPostalCodeLabel(), 
                    BusinessAddressPostalCode );
   mTypeMap.insert( KABC::Addressee::businessAddressCountryLabel(), 
                    BusinessAddressCountry );
   mTypeMap.insert( KABC::Addressee::businessAddressLabelLabel(), 
                    BusinessAddressLabel );
 
   mTypeMap.insert( KABC::Addressee::homePhoneLabel(), HomePhone );
   mTypeMap.insert( KABC::Addressee::businessPhoneLabel(), BusinessPhone );
   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 );
   mTypeMap.insert( KABC::Addressee::mailerLabel(), Mailer );
   mTypeMap.insert( KABC::Addressee::titleLabel(), Title );
   mTypeMap.insert( KABC::Addressee::roleLabel(), Role );
   mTypeMap.insert( KABC::Addressee::organizationLabel(), Organization );
   mTypeMap.insert( KABC::Addressee::noteLabel(), Note );
   mTypeMap.insert( KABC::Addressee::urlLabel(), URL );
   mTypeMap.insert( KABC::Addressee::categoryLabel(), Categories );
 
   mCustomCounter = mTypeMap.count();
   int count = mCustomCounter;
 
   KABC::Field::List fields = mAddressBook->fields( KABC::Field::CustomCategory );
   KABC::Field::List::Iterator it;
@@ -280,33 +280,33 @@ KABC::AddresseeList CSVImportDialog::contacts() const
           }
           break;
         case HomeFax:
           if ( !value.isEmpty() ) {
             KABC::PhoneNumber number( value, KABC::PhoneNumber::Home |
                                              KABC::PhoneNumber::Fax );
             a.insertPhoneNumber( number );
           }
           break;
         case BusinessFax:
           if ( !value.isEmpty() ) {
             KABC::PhoneNumber number( value, KABC::PhoneNumber::Work |
                                              KABC::PhoneNumber::Fax );
             a.insertPhoneNumber( number );
           }
           break;
-        case CarPhone:
+        case MobileWorkPhone:
           if ( !value.isEmpty() ) {
             KABC::PhoneNumber number( value, KABC::PhoneNumber::Car );
             a.insertPhoneNumber( number );
           }
           break;
         case Isdn:
           if ( !value.isEmpty() ) {
             KABC::PhoneNumber number( value, KABC::PhoneNumber::Isdn );
             a.insertPhoneNumber( number );
           }
           break;
         case Pager:
           if ( !value.isEmpty() ) {
             KABC::PhoneNumber number( value, KABC::PhoneNumber::Pager );
             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
@@ -68,33 +68,33 @@ class CSVImportDialog : public KDialogBase
     void ignoreDuplicatesChanged( int );
     void setFile( const QString& );
     void urlChanged( const QString& );
     void codecChanged ( const QString& );
 
     void applyTemplate();
     void saveTemplate();
 
   private:
     enum { Undefined, FormattedName, FamilyName, GivenName, AdditionalName,
            Prefix, Suffix, NickName, Birthday,
            HomeAddressStreet, HomeAddressLocality, HomeAddressRegion, 
            HomeAddressPostalCode, HomeAddressCountry, HomeAddressLabel,
            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
          };
 
     QTable* mTable;
     QButtonGroup* mDelimiterBox;
     QRadioButton* mRadioComma;
     QRadioButton* mRadioSemicolon;
     QRadioButton* mRadioTab;
     QRadioButton* mRadioSpace;
     QRadioButton* mRadioOther;
     QLineEdit* mDelimiterEdit;
     QComboBox* mComboLine;
     QComboBox* mComboQuote;
     QComboBox* mComboCodec;
     QCheckBox* mIgnoreDuplicates;
     KURLRequester* mUrlRequester;