1 files changed, 10 insertions, 1 deletions

diff --git a/kabc/phonenumber.cpp b/kabc/phonenumber.cpp
index ad3e65b..04b1168 100644
--- a/kabc/phonenumber.cpp
+++ b/kabc/phonenumber.cpp
@@ -64,141 +64,150 @@ bool PhoneNumber::operator==( const PhoneNumber &p ) const
 bool PhoneNumber::operator!=( const PhoneNumber &p ) const
 {
   return !( p == *this );
 }
 
 void PhoneNumber::setId( const QString &id )
 {
   mId = id;
 }
 
 QString PhoneNumber::id() const
 {
   return mId;
 }
 
 void PhoneNumber::setNumber( const QString &number )
 {
   mNumber = number;
 }
 
 QString PhoneNumber::number() const
 {
   return mNumber;
 }
 
 void PhoneNumber::setType( int type )
 {
   mType = type;
 }
 
 int PhoneNumber::type() const
 {
   return mType;
 }
 
 QString PhoneNumber::typeLabel() const
 {
   QString label;
   bool first = true;
 
   TypeList list = typeList();
 
   TypeList::Iterator it;
   for ( it = list.begin(); it != list.end(); ++it ) {
     if ( ( type() & (*it) ) && ( (*it) != Pref ) ) {
       label.append( ( first ? "" : "/" ) + typeLabel( *it ) );
       if ( first )
         first = false;
     }
   }
 
   return label;
 }
 
 QString PhoneNumber::label() const
 {
   return typeLabel( type() );
 }
 
 PhoneNumber::TypeList PhoneNumber::typeList()
 {
   TypeList list;
   
   list << Home << Work << Msg << Pref << Voice << Fax << Cell << Video
        << Bbs << Modem << Car << Isdn << Pcs << Pager;
 
   return list;
 }
 
 QString PhoneNumber::label( int type )
 {
   return typeLabel( type );
 }
 
 QString PhoneNumber::typeLabel( int type )
 {
   switch ( type ) {
     case Home:
       return i18n("Home phone", "Home");
       break;
     case Work:
       return i18n("Work phone", "Work");
       break;
     case Msg:
       return i18n("Messenger");
       break;  
     case Pref:
       return i18n("Preferred Number");
       break;
     case Voice:
       return i18n("Voice");
       break;  
     case Fax:
       return i18n("Fax");
       break;  
     case Cell:
-      return i18n("Mobile Phone", "Mobile" );
+      return i18n("Mobile Phone" );
+      break;  
+    case Cell | Home:
+      return i18n("Home Mobile" );
+      break;  
+    case Cell | Work:
+      return i18n("Home Mobile" );
       break;  
     case Video:
       return i18n("Video");
       break;
     case Bbs:
       return i18n("Mailbox");
       break;
     case Modem:
       return i18n("Modem");
       break;
     case Car:
       return i18n("Car Phone", "Car" );
       break;
     case Isdn:
       return i18n("ISDN");
       break;
     case Pcs:
       return i18n("PCS");
       break;
     case Pager:
       return i18n("Pager");
       break;
+    case Work | Pager:
+      return i18n("Work Pager");
+      break;
     case Home | Fax:
       return i18n("Home Fax");
       break;
     case Work | Fax:
       return i18n("Work Fax");
       break;
     default:
       return i18n("Other");
   }
 }
 
 QDataStream &KABC::operator<<( QDataStream &s, const PhoneNumber &phone )
 {
     return s << phone.mId << phone.mType << phone.mNumber;
 }
 
 QDataStream &KABC::operator>>( QDataStream &s, PhoneNumber &phone )
 {
     s >> phone.mId >> phone.mType >> phone.mNumber;
 
     return s;
 }