2 files changed, 53 insertions, 38 deletions

diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp
index 472b13e..2eb9ddf 100644
--- a/core/pim/addressbook/addressbook.cpp
+++ b/core/pim/addressbook/addressbook.cpp
@@ -33,3 +33,3 @@
 #include <qpe/config.h>
-#include <qpe/contact.h>
+#include <opie/ocontact.h>
 
@@ -859,2 +859,3 @@ void AddressbookWindow::initFields()
         }
+        
         if ( slOrderedFields.count() > 0 ) {
diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp
index b01583f..bae3a2b 100644
--- a/core/pim/addressbook/contacteditor.cpp
+++ b/core/pim/addressbook/contacteditor.cpp
@@ -86,2 +86,4 @@ void ContactEditor::init() {
 
+        QStringList trlChooserNames;
+
         for (i = 0; i <= 6; i++) {
@@ -105,2 +107,3 @@ void ContactEditor::init() {
                 QStringList::ConstIterator it = slOrdered.begin();
+
                 for ( i = 0; it != slOrdered.end(); i++, ++it ) {
@@ -108,3 +111,4 @@ void ContactEditor::init() {
                         if ( (*it) == "Business Fax" ) {
-                                slChooserNames.append( tr( "Business Fax" ) );
+                                trlChooserNames.append( tr( "Business Fax" ) );
+                                slChooserNames.append( *it );
                                 slChooserValues.append("" );
@@ -115,3 +119,4 @@ void ContactEditor::init() {
                         if ( (*it) == "Home Fax" ) {
-                                slChooserNames.append( tr( "Home Fax" ) );
+                                trlChooserNames.append( tr( "Home Fax" ) );
+                                slChooserNames.append( *it );
                                 slChooserValues.append("" );
@@ -123,3 +128,4 @@ void ContactEditor::init() {
                         if ( (*it) == "Business Phone" ) {
-                                slChooserNames.append( tr( "Business Phone" ) );
+                                trlChooserNames.append( tr( "Business Phone" ) );
+                                slChooserNames.append( *it );
                                 slChooserValues.append( "" );
@@ -130,3 +136,4 @@ void ContactEditor::init() {
                         if ( (*it) == "Home Phone" ) {
-                                slChooserNames.append( tr( "Home Phone" ) );
+                                trlChooserNames.append( tr( "Home Phone" ) );
+                                slChooserNames.append( *it );
                                 slChooserValues.append( "" );
@@ -145,3 +152,4 @@ void ContactEditor::init() {
                         if ( (*it) == "Business Mobile" ) {
-                                slChooserNames.append( tr( "Business Mobile" ) );
+                                trlChooserNames.append( tr( "Business Mobile" ) );
+                                slChooserNames.append( *it );
                                 slChooserValues.append( "" );
@@ -152,3 +160,4 @@ void ContactEditor::init() {
                         if ( (*it) == "Home Mobile" ) {
-                                slChooserNames.append( tr( "Home Mobile" ) );
+                                trlChooserNames.append( tr( "Home Mobile" ) );
+                                slChooserNames.append( *it );
                                 slChooserValues.append( "" );
@@ -160,3 +169,4 @@ void ContactEditor::init() {
                         if ( (*it) == "Business WebPage" ) {
-                                slChooserNames.append( tr( "Business WebPage" ) );
+                                trlChooserNames.append( tr( "Business WebPage" ) );
+                                slChooserNames.append( *it );
                                 slChooserValues.append( "" );
@@ -167,3 +177,4 @@ void ContactEditor::init() {
                         if ( (*it) == "Home Web Page" ) {
-                                slChooserNames.append( tr( "Home Web Page" ) );
+                                trlChooserNames.append( tr( "Home Web Page" ) );
+                                slChooserNames.append( *it );
                                 slChooserValues.append( "" );
@@ -174,3 +185,4 @@ void ContactEditor::init() {
                         if ( (*it) == "Business Pager" ) {
-                                slChooserNames.append( tr( "Business Pager" ) );
+                                trlChooserNames.append( tr( "Business Pager" ) );
+                                slChooserNames.append( *it );
                                 slChooserValues.append( "" );
@@ -181,3 +193,4 @@ void ContactEditor::init() {
                         if ( *it == "Default Email" ) {
-                                slChooserNames.append( tr( "Default Email" ) );
+                                trlChooserNames.append( tr( "Default Email" ) );
+                                slChooserNames.append( *it );
                                 slChooserValues.append( "" );
@@ -188,3 +201,4 @@ void ContactEditor::init() {
                         if ( *it == "Emails" ) {
-                                slChooserNames.append( tr( "Emails" ) );
+                                trlChooserNames.append( tr( "Emails" ) );
+                                slChooserNames.append( *it );
                                 slChooserValues.append( "" );
@@ -751,6 +765,6 @@ void ContactEditor::init() {
 
-        cmbChooserField1->insertStringList( slChooserNames );
-        cmbChooserField2->insertStringList( slChooserNames );
-        cmbChooserField3->insertStringList( slChooserNames );
-        cmbChooserField4->insertStringList( slChooserNames );
+        cmbChooserField1->insertStringList( trlChooserNames );
+        cmbChooserField2->insertStringList( trlChooserNames );
+        cmbChooserField3->insertStringList( trlChooserNames );
+        cmbChooserField4->insertStringList( trlChooserNames );
 
@@ -1362,33 +1376,33 @@ void ContactEditor::setEntry( const OContact &entry ) {
         for ( it = slDynamicEntries.begin(); it != slDynamicEntries.end(); ++it, ++itLE) {
-                if ( *it =="Department" )
+                if ( *it == tr( "Department" ) )
                         (*itLE)->setText( ent.department() );
 
-                if ( *it == "Company" )
+                if ( *it ==  tr( "Company" ) )
                         (*itLE)->setText( ent.company() );
 
-                if ( *it == "Office" )
+                if ( *it ==  tr( "Office" ) )
                         (*itLE)->setText( ent.office() );
 
-                if ( *it == "Profession" )
+                if ( *it == tr( "Profession" ) )
                         (*itLE)->setText( ent.profession() );
 
-                if ( *it == "Assistant" )
+                if ( *it == tr( "Assistant" ) )
                         (*itLE)->setText( ent.assistant() );
 
-                if ( *it == "Manager" )
+                if ( *it == tr( "Manager" ) )
                         (*itLE)->setText( ent.manager() );
 
-                if ( *it == "Spouse" )
+                if ( *it == tr( "Spouse" ) )
                         (*itLE)->setText( ent.spouse() );
 
-                if ( *it == "Birthday" )
+                if ( *it == tr( "Birthday" ) )
                         (*itLE)->setText( ent.birthday() );
 
-                if ( *it == "Anniversary" )
+                if ( *it == tr( "Anniversary" ) )
                         (*itLE)->setText( ent.anniversary() );
 
-                if ( *it == "Nickname" )
+                if ( *it == tr( "Nickname" ) )
                         (*itLE)->setText( ent.nickname() );
 
-                if ( *it == "Children" )
+                if ( *it == tr( "Children" ) )
                         (*itLE)->setText( ent.children() );
@@ -1560,33 +1574,33 @@ void ContactEditor::saveEntry() {
         for ( it = slDynamicEntries.begin(); it != slDynamicEntries.end(); ++it, ++itLE) {
-                if ( *it == "Department" )
+                if ( *it == tr( "Department" ) )
                         ent.setDepartment( (*itLE)->text() );
 
-                if ( *it == "Company" )
+                if ( *it == tr( "Company" ) )
                         ent.setCompany( (*itLE)->text() );
 
-                if ( *it == "Office" )
+                if ( *it == tr( "Office" ) )
                         ent.setOffice( (*itLE)->text() );
 
-                if ( *it == "Profession" )
+                if ( *it == tr( "Profession" ) )
                         ent.setProfession( (*itLE)->text() );
 
-                if ( *it == "Assistant" )
+                if ( *it == tr( "Assistant" ) )
                         ent.setAssistant( (*itLE)->text() );
 
-                if ( *it == "Manager" )
+                if ( *it == tr( "Manager" ) )
                         ent.setManager( (*itLE)->text() );
 
-                if ( *it == "Spouse" )
+                if ( *it == tr( "Spouse" ) )
                         ent.setSpouse( (*itLE)->text() );
 
-                if ( *it == "Birthday" )
+                if ( *it == tr( "Birthday" ) )
                         ent.setBirthday( (*itLE)->text() );
 
-                if ( *it == "Anniversary" )
+                if ( *it == tr( "Anniversary" ) )
                         ent.setAnniversary( (*itLE)->text() );
 
-                if ( *it == "Nickname" )
+                if ( *it == tr( "Nickname" ) )
                         ent.setNickname( (*itLE)->text() );
 
-                if ( *it == "Children" )
+                if ( *it == tr( "Children" ) )
                         ent.setChildren( (*itLE)->text() );