1 files changed, 10 insertions, 0 deletions

diff --git a/libopie/pim/ocontactfields.cpp b/libopie/pim/ocontactfields.cpp
index 831a596..7206f0d 100644
--- a/libopie/pim/ocontactfields.cpp
+++ b/libopie/pim/ocontactfields.cpp
@@ -170,12 +170,15 @@ QStringList OContactFields::trfields( bool sorted )
 */
 QStringList OContactFields::untrfields( bool sorted )
 {
     QStringList list;
     QMap<int, QString> mapIdToStr = idToUntrFields();
 
+    list.append( mapIdToStr[ Qtopia::AddressUid ] );
+    list.append( mapIdToStr[ Qtopia::AddressCategory ] );
+
     list.append( mapIdToStr[ Qtopia::Title ] );
     list.append( mapIdToStr[ Qtopia::FirstName ] );
     list.append( mapIdToStr[ Qtopia::MiddleName ] );
     list.append( mapIdToStr[ Qtopia::LastName ] );
     list.append( mapIdToStr[ Qtopia::Suffix ] );
     list.append( mapIdToStr[ Qtopia::FileAs ] );
@@ -208,12 +211,15 @@ QStringList OContactFields::untrfields( bool sorted )
     return list;
 }
 QMap<int, QString> OContactFields::idToTrFields()
 {
         QMap<int, QString> ret_map;
 
+        ret_map.insert( Qtopia::AddressUid, QObject::tr( "User Id" ) );
+        ret_map.insert( Qtopia::AddressCategory, QObject::tr( "Categories" ) );
+
         ret_map.insert( Qtopia::Title, QObject::tr( "Name Title") );
         ret_map.insert( Qtopia::FirstName, QObject::tr( "First Name" ) );
         ret_map.insert( Qtopia::MiddleName, QObject::tr( "Middle Name" ) );
         ret_map.insert( Qtopia::LastName, QObject::tr( "Last Name" ) );
         ret_map.insert( Qtopia::Suffix,  QObject::tr( "Suffix" ));
         ret_map.insert( Qtopia::FileAs, QObject::tr( "File As" ) );
@@ -271,12 +277,15 @@ QMap<int, QString> OContactFields::idToTrFields()
 }
 
 QMap<int, QString> OContactFields::idToUntrFields()
 {
         QMap<int, QString> ret_map;
 
+        ret_map.insert( Qtopia::AddressUid, "User Id" );
+        ret_map.insert( Qtopia::AddressCategory, "Categories" );
+
         ret_map.insert( Qtopia::Title, "Name Title" );
         ret_map.insert( Qtopia::FirstName, "First Name" );
         ret_map.insert( Qtopia::MiddleName, "Middle Name" );
         ret_map.insert( Qtopia::LastName, "Last Name" );
         ret_map.insert( Qtopia::Suffix, "Suffix" );
         ret_map.insert( Qtopia::FileAs, "File As" );
@@ -325,12 +334,13 @@ QMap<int, QString> OContactFields::idToUntrFields()
         ret_map.insert( Qtopia::Anniversary, "Anniversary" );
         ret_map.insert( Qtopia::Nickname, "Nickname" );
         ret_map.insert( Qtopia::Children, "Children" );
 
         // other
         ret_map.insert( Qtopia::Notes, "Notes" );
+        ret_map.insert( Qtopia::Groups, "Groups" );
 
 
         return ret_map;
 }
 
 QMap<QString, int> OContactFields::trFieldsToId()