First attempt to fix language translation bug. Comboboxes should now

work if translation is broken... Some translations should be reenabled
in next fix..

1 files changed, 13 insertions, 11 deletions

diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp
index cf2eddf..472b13e 100644
--- a/core/pim/addressbook/addressbook.cpp
+++ b/core/pim/addressbook/addressbook.cpp
@@ -814,6 +814,8 @@ void AddressbookWindow::initFields()
         QStringList xmlFields = OContact::fields();
-        QStringList visibleFields = OContact::trfields();
+        QStringList visibleFields = OContact::untrfields();
+        // QStringList trFields = OContact::trfields();
+
         xmlFields.remove( "Title" );
-        visibleFields.remove( tr("Name Title") );
-        visibleFields.remove( tr("Notes") );
+        visibleFields.remove( "Name Title" );
+        visibleFields.remove( "Notes" );
         
@@ -840,3 +842,3 @@ void AddressbookWindow::initFields()
                 while ( !zn.isNull() ) {
-                        if ( zn.contains( tr("Work") ) || zn.contains( tr("Mb") ) ) {
+                        if ( zn.contains( "Work" ) || zn.contains( "Mb" ) ) {
                                 slOrderedFields.clear();
@@ -887,9 +889,9 @@ void AddressbookWindow::initFields()
                 orderedFields.remove( Qtopia::Gender );
-                slOrderedFields.remove( tr("Name Title") );
-                slOrderedFields.remove( tr("First Name") );
-                slOrderedFields.remove( tr("Last Name") );
-                slOrderedFields.remove( tr("File As") );
-                slOrderedFields.remove( tr("Default Email") );
-                slOrderedFields.remove( tr("Notes") );
-                slOrderedFields.remove( tr("Gender") );
+                slOrderedFields.remove( "Name Title" );
+                slOrderedFields.remove( "First Name" );
+                slOrderedFields.remove( "Last Name" );
+                slOrderedFields.remove( "File As" );
+                slOrderedFields.remove( "Default Email" );
+                slOrderedFields.remove( "Notes" );
+                slOrderedFields.remove( "Gender" );