From d934f3fe2a62f6a696992335124c4434cd77d990 Mon Sep 17 00:00:00 2001
From: zautrix <zautrix>
Date: Fri, 28 Oct 2005 03:41:01 +0000
Subject: and some bugs fixed

---
diff --git a/bin/kdepim/kaddressbook/germantranslation.txt b/bin/kdepim/kaddressbook/germantranslation.txt
index 62e567e..2ae6eb9 100644
--- a/bin/kdepim/kaddressbook/germantranslation.txt
+++ b/bin/kdepim/kaddressbook/germantranslation.txt
@@ -821,10 +821,15 @@
 { "Fax (Home)","Fax (Privat)" },
 { "Assistent","Sekretär(in)" },
 { "Company","Firma" },
-{ "Mobile2 (Work)","Handy2 (Arbeit)" },
+{ "Mobile2 (work)","Handy2 (Arbeit)" },
+{ "Mobile2 (car)","Handy2 (Auto)" },
 { "Callback","Rückruf" },
 { "Fax (Other)","Fax (Anderes)" },
 { "Primary","Bevorzugt" },
+{ "Mobile (Home)","Handy (Privat)" },
+{ "","" },
+{ "","" },
+{ "","" },
 { "","" },
 { "","" },
 { "","" },
diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp
index 661bdf6..19c78ee 100644
--- a/kabc/addressee.cpp
+++ b/kabc/addressee.cpp
@@ -1063,7 +1063,7 @@ QString Addressee::mobileWorkPhoneLabel()
 }
 QString Addressee::mobileHomePhoneLabel()
 {
-  return i18n("Mobile");
+  return i18n("Mobile (Home)");
 }
 
 
@@ -1081,7 +1081,7 @@ QString Addressee::businessFaxLabel()
 
 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
@@ -201,13 +201,13 @@ bool QtopiaConverter::qtopiaToAddressee( const QDomElement& el, Addressee &adr )
             adr.setOrganization( el.attribute( "Company" ) );
 
             KABC::PhoneNumber businessPhoneNum( el.attribute( "BusinessPhone" ),
-                                                KABC::PhoneNumber::Work );
+                                                KABC::PhoneNumber::Work | KABC::PhoneNumber::Pref );
             KABC::PhoneNumber businessFaxNum( el.attribute( "BusinessFax" ),
                                               KABC::PhoneNumber::Work | KABC::PhoneNumber::Fax );
             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() )
               adr.insertPhoneNumber( businessPhoneNum );
             if ( !businessFaxNum.number().isEmpty() )
@@ -230,7 +230,7 @@ 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" ),
                                        KABC::PhoneNumber::Home | KABC::PhoneNumber::Fax );
 
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
@@ -132,7 +132,7 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa
     if (!db->readField(ZdbAdrs::HomePhone).isEmpty())
     {
       PhoneNumber homephone;
-      homephone.setType( PhoneNumber::Home );
+      homephone.setType( PhoneNumber::Home | PhoneNumber::Pref );
       homephone.setNumber( db->readField(ZdbAdrs::HomePhone) );
       addr.insertPhoneNumber( homephone );
     }
@@ -148,7 +148,7 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa
     if (!db->readField(ZdbAdrs::HomeMobile).isEmpty())
     {
       PhoneNumber homemobile;
-      homemobile.setType( PhoneNumber::Home | PhoneNumber::Cell );
+      homemobile.setType( PhoneNumber::Cell );
       homemobile.setNumber( db->readField(ZdbAdrs::HomeMobile) );
       addr.insertPhoneNumber( homemobile );
     }
@@ -180,7 +180,7 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa
     if (!db->readField(ZdbAdrs::BusinessPhone).isEmpty())
     {
       PhoneNumber businessphone;
-      businessphone.setType( PhoneNumber::Work );
+      businessphone.setType( PhoneNumber::Work | PhoneNumber::Pref );
       businessphone.setNumber( db->readField(ZdbAdrs::BusinessPhone) );
       addr.insertPhoneNumber( businessphone );
     }
@@ -196,7 +196,7 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa
     if (!db->readField(ZdbAdrs::BusinessMobile).isEmpty())
     {
       PhoneNumber businessmobile;
-      businessmobile.setType( PhoneNumber::Work | PhoneNumber::Cell );
+      businessmobile.setType( PhoneNumber::Car );
       businessmobile.setNumber( db->readField(ZdbAdrs::BusinessMobile) );
       addr.insertPhoneNumber( businessmobile );
     }
@@ -204,7 +204,7 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa
     if (!db->readField(ZdbAdrs::BusinessPager).isEmpty())
     {
       PhoneNumber businesspager;
-      businesspager.setType( PhoneNumber::Work | PhoneNumber::Pager );
+      businesspager.setType(  PhoneNumber::Pager );
       businesspager.setNumber( db->readField(ZdbAdrs::BusinessPager) );
       addr.insertPhoneNumber( businesspager );
     }
--
cgit v0.9.0.2