Some final language fixes

3 files changed, 63 insertions, 26 deletions

diff --git a/core/pim/addressbook/TODO b/core/pim/addressbook/TODO
index 83e3c6b..a4fc29a 100644
--- a/core/pim/addressbook/TODO
+++ b/core/pim/addressbook/TODO
@@ -8,4 +8,7 @@ Important:
 - Finishing of new View functions (List, Phonebook...)
 - Reload if contacts were changed externally
+- "What's this" should be added
+- The names of the countries are sorted by there english names, only..
+  Even if they are translated.. :S
 
 Less important:
diff --git a/core/pim/addressbook/abtable.cpp b/core/pim/addressbook/abtable.cpp
index 08c6d0a..70c070f 100644
--- a/core/pim/addressbook/abtable.cpp
+++ b/core/pim/addressbook/abtable.cpp
@@ -131,5 +131,5 @@ AbTable::AbTable( const QValueList<int> *order, QWidget *parent, const char *nam
                  currFindRow( -2 ),
                  mCat( 0 ),
-                 m_contactdb ("addressbook")
+                 m_contactdb ("addressbook", 0l, 0l, false) // Handle syncing myself.. !
 {
         mCat.load( categoryFileName() );
diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp
index bae3a2b..e7f2ebd 100644
--- a/core/pim/addressbook/contacteditor.cpp
+++ b/core/pim/addressbook/contacteditor.cpp
@@ -341,5 +341,4 @@ void ContactEditor::init() {
                         }
 
-
                         slDynamicEntries.append( *it );
                 }
@@ -709,7 +708,8 @@ void ContactEditor::init() {
         gl = new QGridLayout( container, 1, 2, 2, 4 );
 
+        // Create Labels and lineedit fields for every dynamic entry
         QStringList::ConstIterator it = slDynamicEntries.begin();
         for (i = 0; it != slDynamicEntries.end(); i++, ++it) {
-                l = new QLabel( *it, container );
+                l = new QLabel( QString::null , container );
                 listName.append( l );
                 gl->addWidget( l, i, 0 );
@@ -718,4 +718,6 @@ void ContactEditor::init() {
                 gl->addWidget( e, i, 1);
         }
+        // Fill labels with names..
+        loadFields();
 
         l = new QLabel( tr("Gender"), container );
@@ -1013,5 +1015,37 @@ void ContactEditor::loadFields() {
         QListIterator<QLabel> lit( listName );
         for ( it = slDynamicEntries.begin(); *lit; ++lit, ++it) {
-                (*lit)->setText( *it );
+
+                if ( *it ==  "Department"  )
+                        (*lit)->setText( tr( "Department" ) );
+
+                if ( *it ==  "Company" )
+                        (*lit)->setText( tr( "Company" ) );
+
+                if ( *it ==  "Office" )
+                        (*lit)->setText( tr( "Office" ) );
+
+                if ( *it == "Profession" )
+                        (*lit)->setText( tr( "Profession" ) );
+
+                if ( *it ==  "Assistant" )
+                        (*lit)->setText( tr( "Assistant" ) );
+
+                if ( *it == "Manager" )
+                        (*lit)->setText( tr( "Manager" ) );
+
+                if ( *it == "Spouse" )
+                        (*lit)->setText( tr( "Spouse" ) );
+
+                if ( *it == "Birthday" )
+                        (*lit)->setText( tr( "Birthday" ) );
+
+                if ( *it == "Anniversary" )
+                        (*lit)->setText( tr( "Anniversary" ) );
+
+                if ( *it == "Nickname" )
+                        (*lit)->setText( tr( "Nickname" ) );
+
+                if ( *it == "Children" )
+                        (*lit)->setText( tr( "Children" ) );
         }
 }
@@ -1375,35 +1409,35 @@ void ContactEditor::setEntry( const OContact &entry ) {
         QListIterator<QLineEdit> itLE( listValue );
         for ( it = slDynamicEntries.begin(); it != slDynamicEntries.end(); ++it, ++itLE) {
-                if ( *it == tr( "Department" ) )
+                if ( *it ==  "Department"  )
                         (*itLE)->setText( ent.department() );
 
-                if ( *it ==  tr( "Company" ) )
+                if ( *it == "Company" )
                         (*itLE)->setText( ent.company() );
 
-                if ( *it ==  tr( "Office" ) )
+                if ( *it ==  "Office" )
                         (*itLE)->setText( ent.office() );
 
-                if ( *it == tr( "Profession" ) )
+                if ( *it ==  "Profession" )
                         (*itLE)->setText( ent.profession() );
 
-                if ( *it == tr( "Assistant" ) )
+                if ( *it == "Assistant" )
                         (*itLE)->setText( ent.assistant() );
 
-                if ( *it == tr( "Manager" ) )
+                if ( *it == "Manager" )
                         (*itLE)->setText( ent.manager() );
 
-                if ( *it == tr( "Spouse" ) )
+                if ( *it == "Spouse" )
                         (*itLE)->setText( ent.spouse() );
 
-                if ( *it == tr( "Birthday" ) )
+                if ( *it == "Birthday" )
                         (*itLE)->setText( ent.birthday() );
 
-                if ( *it == tr( "Anniversary" ) )
+                if ( *it == "Anniversary" )
                         (*itLE)->setText( ent.anniversary() );
 
-                if ( *it == tr( "Nickname" ) )
+                if ( *it == "Nickname" )
                         (*itLE)->setText( ent.nickname() );
 
-                if ( *it == tr( "Children" ) )
+                if ( *it == "Children" )
                         (*itLE)->setText( ent.children() );
 
@@ -1573,35 +1607,35 @@ void ContactEditor::saveEntry() {
         QListIterator<QLineEdit> itLE( listValue );
         for ( it = slDynamicEntries.begin(); it != slDynamicEntries.end(); ++it, ++itLE) {
-                if ( *it == tr( "Department" ) )
+                if ( *it == "Department" )
                         ent.setDepartment( (*itLE)->text() );
 
-                if ( *it == tr( "Company" ) )
+                if ( *it == "Company" )
                         ent.setCompany( (*itLE)->text() );
 
-                if ( *it == tr( "Office" ) )
+                if ( *it == "Office" )
                         ent.setOffice( (*itLE)->text() );
 
-                if ( *it == tr( "Profession" ) )
+                if ( *it == "Profession" )
                         ent.setProfession( (*itLE)->text() );
 
-                if ( *it == tr( "Assistant" ) )
+                if ( *it == "Assistant" )
                         ent.setAssistant( (*itLE)->text() );
 
-                if ( *it == tr( "Manager" ) )
+                if ( *it == "Manager" )
                         ent.setManager( (*itLE)->text() );
 
-                if ( *it == tr( "Spouse" ) )
+                if ( *it == "Spouse" )
                         ent.setSpouse( (*itLE)->text() );
 
-                if ( *it == tr( "Birthday" ) )
+                if ( *it == "Birthday" )
                         ent.setBirthday( (*itLE)->text() );
 
-                if ( *it == tr( "Anniversary" ) )
+                if ( *it == "Anniversary" )
                         ent.setAnniversary( (*itLE)->text() );
 
-                if ( *it == tr( "Nickname" ) )
+                if ( *it == "Nickname" )
                         ent.setNickname( (*itLE)->text() );
 
-                if ( *it == tr( "Children" ) )
+                if ( *it == "Children" )
                         ent.setChildren( (*itLE)->text() );