13 files changed, 105 insertions, 185 deletions
diff --git a/Makefile b/Makefile
index 2f5691a..a88bd06 100644
--- a/Makefile
+++ b/Makefile
@@ -1,195 +1,195 @@
 #############################################################################
 # Makefile for building: kdepim-desktop
-# Generated by qmake (1.07a) (Qt 3.3.3) on: Sat Oct 23 09:29:11 2004
+# Generated by qmake (1.07a) (Qt 3.3.3) on: Sat Oct 23 12:23:49 2004
 # Project:  kdepim-desktop.pro
 # Template: subdirs
 # Command: $(QMAKE) "CONFIG+=thread" "CONFIG+=debug" -o Makefile kdepim-desktop.pro
 #############################################################################
        MAKEFILE =Makefile
        QMAKE    =qmake
 DEL_FILE =    rm -f
 CHK_DIR_EXISTS= test -d
 MKDIR    = mkdir -p
 INSTALL_FILE= 
 INSTALL_DIR = 
        SUBTARGETS = \
                sub-gammu-emb-common \
                sub-gammu-emb-gammu \
                sub-libical \
                sub-libkcal \
                sub-microkde \
                sub-libkdepim \
                sub-kabc \
                sub-korganizer \
                sub-kaddressbook \
                sub-kabc-plugins-file \
                sub-kabc-plugins-dir \
                sub-pwmanager-libcrypt-cipher \
                sub-pwmanager-libcrypt-error \
                sub-pwmanager-libcrypt-mpi \
                sub-pwmanager-libcrypt-zlib \
                sub-pwmanager-pwmanager
 first: all
 all: Makefile $(SUBTARGETS)
 gammu/emb/common/$(MAKEFILE): 
        @$(CHK_DIR_EXISTS) "gammu/emb/common" || $(MKDIR) "gammu/emb/common"
        cd gammu/emb/common && $(QMAKE) common.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
 sub-gammu-emb-common: gammu/emb/common/$(MAKEFILE) FORCE
        cd gammu/emb/common && $(MAKE) -f $(MAKEFILE)
 gammu/emb/gammu/$(MAKEFILE): 
        @$(CHK_DIR_EXISTS) "gammu/emb/gammu" || $(MKDIR) "gammu/emb/gammu"
        cd gammu/emb/gammu && $(QMAKE) gammu.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
 sub-gammu-emb-gammu: gammu/emb/gammu/$(MAKEFILE) FORCE
        cd gammu/emb/gammu && $(MAKE) -f $(MAKEFILE)
 libical/$(MAKEFILE): 
        @$(CHK_DIR_EXISTS) "libical" || $(MKDIR) "libical"
        cd libical && $(QMAKE) libical.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
 sub-libical: libical/$(MAKEFILE) FORCE
        cd libical && $(MAKE) -f $(MAKEFILE)
 libkcal/$(MAKEFILE): 
        @$(CHK_DIR_EXISTS) "libkcal" || $(MKDIR) "libkcal"
        cd libkcal && $(QMAKE) libkcal.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
 sub-libkcal: libkcal/$(MAKEFILE) FORCE
        cd libkcal && $(MAKE) -f $(MAKEFILE)
 microkde/$(MAKEFILE): 
        @$(CHK_DIR_EXISTS) "microkde" || $(MKDIR) "microkde"
        cd microkde && $(QMAKE) microkde.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
 sub-microkde: microkde/$(MAKEFILE) FORCE
        cd microkde && $(MAKE) -f $(MAKEFILE)
 libkdepim/$(MAKEFILE): 
        @$(CHK_DIR_EXISTS) "libkdepim" || $(MKDIR) "libkdepim"
        cd libkdepim && $(QMAKE) libkdepim.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
 sub-libkdepim: libkdepim/$(MAKEFILE) FORCE
        cd libkdepim && $(MAKE) -f $(MAKEFILE)
 kabc/$(MAKEFILE): 
        @$(CHK_DIR_EXISTS) "kabc" || $(MKDIR) "kabc"
        cd kabc && $(QMAKE) kabc.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
 sub-kabc: kabc/$(MAKEFILE) FORCE
        cd kabc && $(MAKE) -f $(MAKEFILE)
 korganizer/$(MAKEFILE): 
        @$(CHK_DIR_EXISTS) "korganizer" || $(MKDIR) "korganizer"
        cd korganizer && $(QMAKE) korganizer.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
 sub-korganizer: korganizer/$(MAKEFILE) FORCE
        cd korganizer && $(MAKE) -f $(MAKEFILE)
 kaddressbook/$(MAKEFILE): 
        @$(CHK_DIR_EXISTS) "kaddressbook" || $(MKDIR) "kaddressbook"
        cd kaddressbook && $(QMAKE) kaddressbook.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
 sub-kaddressbook: kaddressbook/$(MAKEFILE) FORCE
        cd kaddressbook && $(MAKE) -f $(MAKEFILE)
 kabc/plugins/file/$(MAKEFILE): 
        @$(CHK_DIR_EXISTS) "kabc/plugins/file" || $(MKDIR) "kabc/plugins/file"
        cd kabc/plugins/file && $(QMAKE) file.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
 sub-kabc-plugins-file: kabc/plugins/file/$(MAKEFILE) FORCE
        cd kabc/plugins/file && $(MAKE) -f $(MAKEFILE)
 kabc/plugins/dir/$(MAKEFILE): 
        @$(CHK_DIR_EXISTS) "kabc/plugins/dir" || $(MKDIR) "kabc/plugins/dir"
        cd kabc/plugins/dir && $(QMAKE) dir.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
 sub-kabc-plugins-dir: kabc/plugins/dir/$(MAKEFILE) FORCE
        cd kabc/plugins/dir && $(MAKE) -f $(MAKEFILE)
 pwmanager/libcrypt/cipher/$(MAKEFILE): 
        @$(CHK_DIR_EXISTS) "pwmanager/libcrypt/cipher" || $(MKDIR) "pwmanager/libcrypt/cipher"
        cd pwmanager/libcrypt/cipher && $(QMAKE) cipher.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
 sub-pwmanager-libcrypt-cipher: pwmanager/libcrypt/cipher/$(MAKEFILE) FORCE
        cd pwmanager/libcrypt/cipher && $(MAKE) -f $(MAKEFILE)
 pwmanager/libcrypt/error/$(MAKEFILE): 
        @$(CHK_DIR_EXISTS) "pwmanager/libcrypt/error" || $(MKDIR) "pwmanager/libcrypt/error"
        cd pwmanager/libcrypt/error && $(QMAKE) error.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
 sub-pwmanager-libcrypt-error: pwmanager/libcrypt/error/$(MAKEFILE) FORCE
        cd pwmanager/libcrypt/error && $(MAKE) -f $(MAKEFILE)
 pwmanager/libcrypt/mpi/$(MAKEFILE): 
        @$(CHK_DIR_EXISTS) "pwmanager/libcrypt/mpi" || $(MKDIR) "pwmanager/libcrypt/mpi"
        cd pwmanager/libcrypt/mpi && $(QMAKE) mpi.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
 sub-pwmanager-libcrypt-mpi: pwmanager/libcrypt/mpi/$(MAKEFILE) FORCE
        cd pwmanager/libcrypt/mpi && $(MAKE) -f $(MAKEFILE)
 pwmanager/libcrypt/zlib/$(MAKEFILE): 
        @$(CHK_DIR_EXISTS) "pwmanager/libcrypt/zlib" || $(MKDIR) "pwmanager/libcrypt/zlib"
        cd pwmanager/libcrypt/zlib && $(QMAKE) zlib.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
 sub-pwmanager-libcrypt-zlib: pwmanager/libcrypt/zlib/$(MAKEFILE) FORCE
        cd pwmanager/libcrypt/zlib && $(MAKE) -f $(MAKEFILE)
 pwmanager/pwmanager/$(MAKEFILE): 
        @$(CHK_DIR_EXISTS) "pwmanager/pwmanager" || $(MKDIR) "pwmanager/pwmanager"
        cd pwmanager/pwmanager && $(QMAKE) pwmanager.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
 sub-pwmanager-pwmanager: pwmanager/pwmanager/$(MAKEFILE) FORCE
        cd pwmanager/pwmanager && $(MAKE) -f $(MAKEFILE)
 Makefile: kdepim-desktop.pro  /usr/local/qtgcc/mkspecs/default/qmake.conf 
        $(QMAKE) "CONFIG+=thread" "CONFIG+=debug" -o Makefile kdepim-desktop.pro
 qmake: qmake_all
        @$(QMAKE) "CONFIG+=thread" "CONFIG+=debug" -o Makefile kdepim-desktop.pro
 all: $(SUBTARGETS)
 qmake_all: gammu/emb/common/$(MAKEFILE) gammu/emb/gammu/$(MAKEFILE) libical/$(MAKEFILE) libkcal/$(MAKEFILE) microkde/$(MAKEFILE) libkdepim/$(MAKEFILE) kabc/$(MAKEFILE) korganizer/$(MAKEFILE) kaddressbook/$(MAKEFILE) kabc/plugins/file/$(MAKEFILE) kabc/plugins/dir/$(MAKEFILE) pwmanager/libcrypt/cipher/$(MAKEFILE) pwmanager/libcrypt/error/$(MAKEFILE) pwmanager/libcrypt/mpi/$(MAKEFILE) pwmanager/libcrypt/zlib/$(MAKEFILE) pwmanager/pwmanager/$(MAKEFILE)
         ( [ -d gammu/emb/common ] && cd gammu/emb/common ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
         ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
         ( [ -d libical ] && cd libical ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
         ( [ -d libkcal ] && cd libkcal ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
         ( [ -d microkde ] && cd microkde ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
         ( [ -d libkdepim ] && cd libkdepim ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
         ( [ -d kabc ] && cd kabc ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
         ( [ -d korganizer ] && cd korganizer ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
         ( [ -d kaddressbook ] && cd kaddressbook ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
         ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
         ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
         ( [ -d pwmanager/libcrypt/cipher ] && cd pwmanager/libcrypt/cipher ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
         ( [ -d pwmanager/libcrypt/error ] && cd pwmanager/libcrypt/error ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
         ( [ -d pwmanager/libcrypt/mpi ] && cd pwmanager/libcrypt/mpi ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
         ( [ -d pwmanager/libcrypt/zlib ] && cd pwmanager/libcrypt/zlib ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
         ( [ -d pwmanager/pwmanager ] && cd pwmanager/pwmanager ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
 clean uicables mocables uiclean mocclean lexclean yaccclean : qmake_all FORCE
         ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) $@; ) || true
         ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) $@; ) || true
         ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) $@; ) || true
         ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) $@; ) || true
         ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) $@; ) || true
         ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) $@; ) || true
         ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) $@; ) || true
         ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) $@; ) || true
         ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) $@; ) || true
         ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) $@; ) || true
         ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) $@; ) || true
         ( [ -d pwmanager/libcrypt/cipher ] && cd pwmanager/libcrypt/cipher ; $(MAKE) -f $(MAKEFILE) $@; ) || true
         ( [ -d pwmanager/libcrypt/error ] && cd pwmanager/libcrypt/error ; $(MAKE) -f $(MAKEFILE) $@; ) || true
         ( [ -d pwmanager/libcrypt/mpi ] && cd pwmanager/libcrypt/mpi ; $(MAKE) -f $(MAKEFILE) $@; ) || true
         ( [ -d pwmanager/libcrypt/zlib ] && cd pwmanager/libcrypt/zlib ; $(MAKE) -f $(MAKEFILE) $@; ) || true
         ( [ -d pwmanager/pwmanager ] && cd pwmanager/pwmanager ; $(MAKE) -f $(MAKEFILE) $@; ) || true
 uninstall_subdirs: qmake_all FORCE
         ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
         ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
         ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
         ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
         ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
         ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
         ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
         ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
         ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
         ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
         ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
         ( [ -d pwmanager/libcrypt/cipher ] && cd pwmanager/libcrypt/cipher ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
         ( [ -d pwmanager/libcrypt/error ] && cd pwmanager/libcrypt/error ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
         ( [ -d pwmanager/libcrypt/mpi ] && cd pwmanager/libcrypt/mpi ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
         ( [ -d pwmanager/libcrypt/zlib ] && cd pwmanager/libcrypt/zlib ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
         ( [ -d pwmanager/pwmanager ] && cd pwmanager/pwmanager ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
 install_subdirs: qmake_all FORCE
         ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) install; ) || true
         ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) install; ) || true
         ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) install; ) || true
         ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) install; ) || true
diff --git a/kaddressbook/kabprefs.cpp b/kaddressbook/kabprefs.cpp
index 01c935f..3cbcc9a 100644
--- a/kaddressbook/kabprefs.cpp
+++ b/kaddressbook/kabprefs.cpp
@@ -1,213 +1,150 @@
 /*
    This file is part of KAddressBook.
    Copyright (c) 2002 Mike Pilone <mpilone@slac.com>
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
    As a special exception, permission is given to link this program
    with any edition of Qt, and distribute the resulting executable,
    without including the source code for Qt in the source distribution.
 */
 //US#ifdef KAB_EMBEDDED
 //#include <qstring.h>
 //#endif //KAB_EMBEDDED
 #include <qtextstream.h>
 #include <qfile.h>
 #include <qregexp.h>
 #include <stdlib.h>
 #include <libkdepim/kpimglobalprefs.h>
 #include <kconfig.h>
 #include <klocale.h>
 #include <kstaticdeleter.h>
 //US#include <kdebug.h> // defines kdDebug()
 #include "kabprefs.h"
 #ifdef DESKTOP_VERSION
 #include <qapplication.h>
 #endif
 KABPrefs *KABPrefs::sInstance = 0;
-static KStaticDeleter<KABPrefs> staticDeleter;
+static KStaticDeleter<KABPrefs> staticDeleterAB;
 KABPrefs::KABPrefs()
  : KPimPrefs("kaddressbookrc")
 {
-  mLocaleDict = 0;
  mDetailsFont = QFont("helvetica",12);
  KPrefs::setCurrentGroup( "Views" );
  addItemBool( "HonorSingleClick", &mHonorSingleClick, false );
  KPrefs::setCurrentGroup( "General" );
  addItemBool( "AutomaticNameParsing", &mAutomaticNameParsing, true );
  addItemInt( "CurrentIncSearchField", &mCurrentIncSearchField, 0 );
 #ifdef KAB_EMBEDDED
  addItemBool("AskForQuit",&mAskForQuit,true);
  addItemBool("ToolBarHor",&mToolBarHor, true );
  addItemBool("ToolBarUp",&mToolBarUp, false );
  addItemBool("SearchWithReturn",&mSearchWithReturn, true );
  addItemFont("DetailsFont",&mDetailsFont);
 #endif //KAB_EMBEDDED
  KPrefs::setCurrentGroup( "MainWindow" );
  addItemBool( "JumpButtonBarVisible", &mJumpButtonBarVisible, false );
  addItemBool( "DetailsPageVisible", &mDetailsPageVisible, true );
  addItemIntList( "ExtensionsSplitter", &mExtensionsSplitter );
  addItemIntList( "DetailsSplitter", &mDetailsSplitter );
  addItemBool( "MultipleViewsAtOnce", &mMultipleViewsAtOnce, true );
  KPrefs::setCurrentGroup( "Extensions_General" );
  QStringList defaultExtensions;
  defaultExtensions << "merge";
  defaultExtensions << "distribution_list_editor";
  addItemInt( "CurrentExtension", &mCurrentExtension, 0 );
  addItemStringList( "ActiveExtensions", &mActiveExtensions, defaultExtensions );
  KPrefs::setCurrentGroup( "Views" );
  QString defaultView = i18n( "Default Table View" );
  addItemString( "CurrentView", &mCurrentView, defaultView );
  addItemStringList( "ViewNames", &mViewNames, defaultView );
  KPrefs::setCurrentGroup( "Filters" );
  addItemInt( "CurrentFilter", &mCurrentFilter, 0 );
 }
 KABPrefs::~KABPrefs()
 {
    //qDebug("KABPrefs::~KABPrefs() ");
-  setLocaleDict( 0 );
+ if (sInstance == this)
-  if ( mLocaleDict )
+     sInstance = staticDeleterAB.setObject(0);
-      delete mLocaleDict;
 }
 
 KABPrefs *KABPrefs::instance()
 {
  if ( !sInstance ) {
 #ifdef KAB_EMBEDDED
-    sInstance = staticDeleter.setObject( new KABPrefs() );
+    sInstance = staticDeleterAB.setObject( new KABPrefs() );
 #else  //KAB_EMBEDDED
    //US the following line has changed ???. Why
-    staticDeleter.setObject( sInstance, new KABPrefs() );
+    staticDeleterAB.setObject( sInstance, new KABPrefs() );
 #endif //KAB_EMBEDDED
    sInstance->readConfig();
  }
  return sInstance;
 }
 void KABPrefs::setCategoryDefaults()
 {
  mCustomCategories.clear();
  mCustomCategories << i18n( "Business" ) << i18n( "Family" ) << i18n( "School" )
                    << i18n( "Customer" ) << i18n( "Friend" );
 }
    // US introduce a nonconst way to return the config object.
 KConfig* KABPrefs::getConfig()
 {
    return config();
 }
 void KABPrefs::usrReadConfig()
 {
-    QString fileName ;
-#ifndef DESKTOP_VERSION
-    fileName= QString(getenv("QPEDIR"))+"/pics/kdepim/kaddressbook/";
-#else
-    fileName  = qApp->applicationDirPath () + "/kdepim/kaddressbook/";
-#endif
-    int mPreferredLanguage = KPimGlobalPrefs::instance()->mPreferredLanguage;
-    mLocaleDict = 0;
-    if ( mPreferredLanguage > 0 && mPreferredLanguage < 5 ) {
-         
-        if ( mPreferredLanguage == 1 ) 
-            fileName = fileName+"germantranslation.txt"; 
-        else if ( mPreferredLanguage == 4 ) 
-            fileName = fileName+"usertranslation.txt"; 
-        else if ( mPreferredLanguage == 2 ) 
-            fileName = fileName+"frenchtranslation.txt"; 
-        else if ( mPreferredLanguage == 3 ) 
-            fileName = fileName+"italiantranslation.txt";
-        QFile file( fileName );
-        if (file.open( IO_ReadOnly ) ) {
-            QTextStream ts( &file );
-            ts.setEncoding( QTextStream::Latin1 );
-            //ts.setCodec( QTextCodec::latin1 );
-            QString  text = ts.read();
-            file.close();  
-            text.replace( QRegExp("\\\\n"), "\n" );
-            QString line;
-            QString we;
-            QString wt;
-            int br = 0;
-            int nbr;
-            nbr = text.find ( "},", br );
-            line = text.mid( br, nbr - br );
-            br = nbr+1;
-            int se, ee, st, et;
-            mLocaleDict = new QDict<QString>;
-            QString end = "{ \"\",\"\" }";
-            while ( (line != end) && (br > 1)  ) {
-                //qDebug("%d *%s* ", br, line.latin1());
-                se = line.find("\"")+1;
-                et = line.findRev("\"",-1);
-                ee = line.find("\",\"");
-                st = ee+3;
-                we = line.mid( se, ee-se );
-                wt = line.mid( st, et-st );
-                //qDebug("*%s* *%s* ", we.latin1(), wt.latin1());
-                mLocaleDict->insert( we, new QString (wt) );
-                nbr = text.find ( "}", br );
-                line = text.mid( br, nbr - br );
-                br = nbr+1;
-            }
-            //qDebug("end *%s* ", end.latin1());
-            setLocaleDict( mLocaleDict );
-        } else {
-            qDebug("KO: Cannot find translation file %s",fileName.latin1() );
-        }
-    
-        
-    }
  KPimPrefs::usrReadConfig();
 }
 /*US
 void KABPrefs::usrSetDefaults()
 {
  KPimPrefs::usrSetDefaults();
 }
 void KABPrefs::usrReadConfig()
 {
  KPimPrefs::usrReadConfig();
 }
 void KABPrefs::usrWriteConfig()
 {
  KPimPrefs::usrWriteConfig();
 }
 */
diff --git a/kaddressbook/kabprefs.h b/kaddressbook/kabprefs.h
index 1098f4c..cc8413e 100644
--- a/kaddressbook/kabprefs.h
+++ b/kaddressbook/kabprefs.h
@@ -1,96 +1,95 @@
 /*
    This file is part of KAddressBook.
    Copyright (c) 2002 Mike Pilone <mpilone@slac.com>
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
    As a special exception, permission is given to link this program
    with any edition of Qt, and distribute the resulting executable,
    without including the source code for Qt in the source distribution.
 */
 #ifndef KABPREFS_H
 #define KABPREFS_H
 #include <qstringlist.h>
 #include <qdict.h>
 #include <libkdepim/kpimprefs.h>
 class KConfig;
 class KABPrefs : public KPimPrefs
 {
  public:
    virtual ~KABPrefs();
    static KABPrefs *instance();
    // General
    bool mHonorSingleClick;
    bool mAutomaticNameParsing;
    int mCurrentIncSearchField;
 #ifdef KAB_EMBEDDED
    // US introduce a nonconst way to return the config object.
    KConfig* getConfig();
    bool mToolBarHor;
    bool mToolBarUp;
    bool mAskForQuit;
    /** Set preferences to default values */
 //    void usrSetDefaults();
    /** Read preferences from config file */
 //    void usrReadConfig();
    /** Write preferences to config file */
 //    void usrWriteConfig();
 #endif //KAB_EMBEDDED
    void usrReadConfig();
    // GUI
    bool mJumpButtonBarVisible;
    bool mDetailsPageVisible;
    bool mMultipleViewsAtOnce;
    bool mSearchWithReturn;
    QValueList<int> mExtensionsSplitter;
    QValueList<int> mDetailsSplitter;
    // Extensions stuff
    int mCurrentExtension;
    QStringList mActiveExtensions;
    // Views stuff
    QString mCurrentView;
    QStringList mViewNames;
    // Filter
    int mCurrentFilter;
    void setCategoryDefaults();
    QFont mDetailsFont;
  private:
    KABPrefs();
-    QDict<QString> *mLocaleDict;
    static KABPrefs *sInstance;
 };
 #endif
diff --git a/kmicromail/koprefs.h b/kmicromail/koprefs.h
index a47642b..f0a4463 100644
--- a/kmicromail/koprefs.h
+++ b/kmicromail/koprefs.h
@@ -1,79 +1,77 @@
 /*
    This file is part of KOrganizer.
    Copyright (c) 2000,2001 Cornelius Schumacher <schumacher@kde.org>
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
    As a special exception, permission is given to link this program
    with any edition of Qt, and distribute the resulting executable,
    without including the source code for Qt in the source distribution.
 */
 #ifndef KOPREFS_H
 #define KOPREFS_H
-#include <qdict.h>
 #include <libkdepim/kpimprefs.h>
 class KConfig;
 class QFont;
 class QColor;
 class QStringList;
 class KOPrefs : public KPimPrefs
 {
  public:
    virtual ~KOPrefs();
    /** Get instance of KOPrefs. It is made sure that there is only one
    instance. */
    static KOPrefs *instance();
    /** Set preferences to default values */
    void usrSetDefaults();
    /** Read preferences from config file */
    void usrReadConfig();
    /** Write preferences to config file */
    void usrWriteConfig();
    void setCategoryDefaults(){;};
  protected:
    /** Fill empty mail fields with default values. */
    void fillMailDefaults();
  private:
    /** Constructor disabled for public. Use instance() to create a KOPrefs
    object. */
    KOPrefs();
    static KOPrefs *mInstance;
-    QDict<QString> *mLocaleDict;
  public:
    // preferences data
    KConfig* getConfig();
    QFont mAppFont;
    QFont mComposeFont;
    QFont mReadFont;
    QString mName;
    QString mEmail;
    bool mSendLater, mViewAsHtml, mUseKapi;
  private:
 };
 #endif
diff --git a/korganizer/kodialogmanager.cpp b/korganizer/kodialogmanager.cpp
index 58198a2..db7c3f2 100644
--- a/korganizer/kodialogmanager.cpp
+++ b/korganizer/kodialogmanager.cpp
@@ -1,304 +1,303 @@
 /*
  This file is part of KOrganizer.
  Copyright (c) 2001
  Cornelius Schumacher <schumacher@kde.org>
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
  the Free Software Foundation; either version 2 of the License, or
  (at your option) any later version.
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
          MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
  GNU General Public License for more details.
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 #include <libkdepim/categoryeditdialog.h>
 #include "calendarview.h"
 #include "incomingdialog.h"
 #include "outgoingdialog.h"
 #include "koprefsdialog.h"
 #include "koeventeditor.h"
 #include "koprefs.h"
 #include "datenavigator.h"
 #include "kotodoeditor.h"
 #include "searchdialog.h"
 #include "filtereditdialog.h"
 #ifndef KORG_NOPLUGINS
 #include "plugindialog.h"
 #endif
 #ifndef KORG_NOARCHIVE
 #include "archivedialog.h"
 #endif
 #include "kconfig.h"
 #include "kodialogmanager.h"
 KODialogManager::KODialogManager( CalendarView *mainView ) :
  QObject(), mMainView( mainView )
 {
  mOutgoingDialog = 0;
  mIncomingDialog = 0;
  mOptionsDialog = 0;
  mSearchDialog = 0;
  mArchiveDialog = 0;
  mFilterEditDialog = 0;
  mPluginDialog = 0;
  // mCategoryEditDialog = new KPIM::CategoryEditDialog(KOPrefs::instance(),mMainView);
  //KOGlobals::fitDialogToScreen( mCategoryEditDialog );
 }
 KODialogManager::~KODialogManager()
 {
  delete mOutgoingDialog;
  delete mIncomingDialog;
  delete mOptionsDialog;
  delete mSearchDialog;
 #ifndef KORG_NOARCHIVE
  delete mArchiveDialog;
 #endif
  delete mFilterEditDialog;
 #ifndef KORG_NOPLUGINS
  delete mPluginDialog;
 #endif
 }
 OutgoingDialog *KODialogManager::outgoingDialog()
 {
  createOutgoingDialog();
  return mOutgoingDialog;
 }
 void KODialogManager::createOutgoingDialog()
 {
  if (!mOutgoingDialog) {
    mOutgoingDialog = new OutgoingDialog(mMainView->calendar(),mMainView);
    if (mIncomingDialog) mIncomingDialog->setOutgoingDialog(mOutgoingDialog);
    connect(mOutgoingDialog,SIGNAL(numMessagesChanged(int)),
            mMainView,SIGNAL(numOutgoingChanged(int)));
  }
 }
 void KODialogManager::showOptionsDialog( bool showSync )
 {
-    int curLanguage = KOPrefs::instance()->mPreferredLanguage;
+   
  if (!mOptionsDialog) {
    mOptionsDialog = new KOPrefsDialog(mMainView);
    //mOptionsDialog->readConfig();
    connect(mOptionsDialog,SIGNAL(configChanged()),
            mMainView,SLOT(updateConfig()));
    //connect(mCategoryEditDialog,SIGNAL(categoryConfigChanged()),
    //      mOptionsDialog,SLOT(updateCategories()));
    
  }
  mOptionsDialog->readConfig();
 #ifndef DESKTOP_VERSION  
  mOptionsDialog->showMaximized();
 #else
  mOptionsDialog->show();
 #endif
  if ( showSync )
      mOptionsDialog->showSyncPage();
  mOptionsDialog->exec();
-  if ( curLanguage != KOPrefs::instance()->mPreferredLanguage )
+  
-      KOPrefs::instance()->mLanguageChanged = true;
 }
 void KODialogManager::showSyncOptions()
 {
    showOptionsDialog( true );
 }
 void KODialogManager::showOutgoingDialog()
 {
  createOutgoingDialog();
  mOutgoingDialog->show();
  mOutgoingDialog->raise();
 }
 IncomingDialog *KODialogManager::incomingDialog()
 {
  createOutgoingDialog();
  if (!mIncomingDialog) {
    mIncomingDialog = new IncomingDialog(mMainView->calendar(),mOutgoingDialog,mMainView);
    connect(mIncomingDialog,SIGNAL(numMessagesChanged(int)),
            mMainView,SIGNAL(numIncomingChanged(int)));
    connect(mIncomingDialog,SIGNAL(calendarUpdated()),
            mMainView,SLOT(updateView()));
  }
  return mIncomingDialog;
 }
 void KODialogManager::createIncomingDialog()
 {
  createOutgoingDialog();
  if (!mIncomingDialog) {
    mIncomingDialog = new IncomingDialog(mMainView->calendar(),mOutgoingDialog,mMainView);
    connect(mIncomingDialog,SIGNAL(numMessagesChanged(int)),
            mMainView,SIGNAL(numIncomingChanged(int)));
    connect(mIncomingDialog,SIGNAL(calendarUpdated()),
            mMainView,SLOT(updateView()));
  }
 }
 void KODialogManager::showIncomingDialog()
 {
  createIncomingDialog();
  mIncomingDialog->show();
  mIncomingDialog->raise();
 }
 /*
 void KODialogManager::showCategoryEditDialog()
 {
  mCategoryEditDialog->show();
 }
 */
 void KODialogManager::hideSearchDialog()
 {
  if (mSearchDialog) 
      mSearchDialog->hide();
 }
 void KODialogManager::showSearchDialog()
 {
  if (!mSearchDialog) {
      mSearchDialog = new SearchDialog(mMainView->calendar(),mMainView); 
      KOListView * lview = mSearchDialog->listview();
      connect(lview, SIGNAL(showIncidenceSignal(Incidence *)),
              mMainView, SLOT(showIncidence(Incidence *)));
      connect(lview, SIGNAL(editIncidenceSignal(Incidence *)),
              mMainView, SLOT(editIncidence(Incidence *)));
      connect(lview, SIGNAL(deleteIncidenceSignal(Incidence *)),
              mMainView, SLOT(deleteIncidence(Incidence *)));
      connect(lview, SIGNAL(cloneIncidenceSignal(Incidence *)),
              mMainView, SLOT(cloneIncidence(Incidence *)));
      connect(lview, SIGNAL(beamIncidenceSignal(Incidence *)),
              mMainView, SLOT(beamIncidence(Incidence *)));
      connect(lview, SIGNAL(moveIncidenceSignal(Incidence *)),
              mMainView, SLOT(moveIncidence(Incidence *)));
      connect(lview, SIGNAL(beamIncidenceList(QPtrList<Incidence> )),
              mMainView, SLOT(beamIncidenceList(QPtrList<Incidence> )));
       connect(mMainView, SIGNAL(configChanged()), mSearchDialog, SLOT(updateConfig()));
       connect(mMainView, SIGNAL(updateSearchDialog()), mSearchDialog, SLOT(updateList()));
      //  connect( lview, SIGNAL( incidenceSelected( Incidence * ) ),
      //       mMainView, SLOT( processMainViewSelection( Incidence * ) ) );  
 #ifndef DESKTOP_VERSION    
    mSearchDialog->setMaximumSize( 640, 480 );
    //mSearchDialog->setGeometry( 40,40, 400, 300);
    mSearchDialog->showMaximized();
 #else
    KConfig *config = KOGlobals::config();
    config->setGroup("WidgetLayout");
    QStringList list;
    list = config->readListEntry("SearchLayout");
    int x,y,w,h;
    if ( ! list.isEmpty() ) {
        x = list[0].toInt();
        y = list[1].toInt();
        w = list[2].toInt();
        h = list[3].toInt();
        mSearchDialog->setGeometry(x,y,w,h);
       
    }
 #endif
  }
  // make sure the widget is on top again
  mSearchDialog->show();
  mSearchDialog->raise();
 }
 SearchDialog * KODialogManager::getSearchDialog()
 {
    return mSearchDialog;
 }
 void KODialogManager::showArchiveDialog()
 {
 #ifndef KORG_NOARCHIVE
  if (!mArchiveDialog) {
    mArchiveDialog = new ArchiveDialog(mMainView->calendar(),mMainView);
    connect(mArchiveDialog,SIGNAL(eventsDeleted()),
            mMainView,SLOT(updateView()));
  }
  mArchiveDialog->show();
  mArchiveDialog->raise();
  // Workaround.
  QApplication::restoreOverrideCursor();
 #endif
 }
 void KODialogManager::showFilterEditDialog(QPtrList<CalFilter> *filters)
 {
  if (!mFilterEditDialog) {
    mFilterEditDialog = new FilterEditDialog(filters,mMainView);
    connect(mFilterEditDialog,SIGNAL(filterChanged()),
            mMainView,SLOT(filterEdited()));
    
  }
 #ifndef DESKTOP_VERSION  
  mFilterEditDialog->showMaximized();
 #else
  mFilterEditDialog->show();
 #endif
  mFilterEditDialog->raise();
 }
 void KODialogManager::showPluginDialog()
 {
 #ifndef KORG_NOPLUGINS
  if (!mPluginDialog) {
    mPluginDialog = new PluginDialog(mMainView);
    connect(mPluginDialog,SIGNAL(configChanged()),
            mMainView,SLOT(updateConfig()));
  }
  mPluginDialog->show();
  mPluginDialog->raise();
 #endif
 }
 KOEventEditor *KODialogManager::getEventEditor()
 {
  KOEventEditor *eventEditor = new KOEventEditor( mMainView->calendar(),
                                                  mMainView );
  connect(eventEditor,SIGNAL(eventAdded(Event *)),
          mMainView,SLOT(eventAdded(Event *)));
  connect(eventEditor,SIGNAL(eventChanged(Event *)),
          mMainView,SLOT(eventChanged(Event *)));
  connect(eventEditor,SIGNAL(eventDeleted()),
          mMainView,SLOT(eventDeleted()));
  connect(eventEditor,SIGNAL(deleteAttendee(Incidence *)),
          mMainView,SLOT(schedule_cancel(Incidence *)));
  connect( eventEditor, SIGNAL(jumpToTime( const QDate  &)), 
           mMainView->dateNavigator(), SLOT( selectWeek( const QDate & ) ) );
  connect( eventEditor, SIGNAL( showAgendaView( bool)), 
           mMainView->viewManager(), SLOT(  showAgendaView( bool) ) );
  //  connect(mCategoryEditDialog,SIGNAL(categoryConfigChanged()),
  //      eventEditor,SLOT(updateCategoryConfig()));
  // connect(eventEditor,SIGNAL(editCategories()),
  //      mCategoryEditDialog,SLOT(show()));
  connect(eventEditor,SIGNAL(dialogClose(Incidence*)),
          mMainView,SLOT(dialogClosing(Incidence*)));
  //connect(mMainView,SIGNAL(closingDown()),eventEditor,SLOT(reject()));
  return eventEditor;
 }
 KOTodoEditor *KODialogManager::getTodoEditor()
 {
  KOTodoEditor *todoEditor = new KOTodoEditor( mMainView->calendar(),
                                               mMainView );
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index ba1c6d1..f44debc 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -1,555 +1,477 @@
 /*
    This file is part of KOrganizer.
    Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
    As a special exception, permission is given to link this program
    with any edition of Qt, and distribute the resulting executable,
    without including the source code for Qt in the source distribution.
 */
 #include <time.h>
 #ifndef _WIN32_
 #include <unistd.h>
 #endif
 #include <qdir.h>
 #include <qtextstream.h>
 #include <qtextcodec.h>
 #include <qstring.h>
 #include <qregexp.h>
 #include <qfont.h>
 #include <qcolor.h>
 #include <qstringlist.h>
 #include <stdlib.h>
 #include <kglobal.h>
 #include <kconfig.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kemailsettings.h>
 #include <kstaticdeleter.h>
 #include <libkdepim/kpimglobalprefs.h>
 #include "koprefs.h"
 #include "mainwindow.h"
-const char *germanwords[][2] = { 
-#include "wordsgerman.h"
-  "", ""
-};
 KOPrefs *KOPrefs::mInstance = 0;
 static KStaticDeleter<KOPrefs> insd;
 KOPrefs::KOPrefs() :
  KPimPrefs("korganizerrc")
 {
  mCategoryColors.setAutoDelete(true);
-  mLocaleDict = 0;
  fillMailDefaults();
  mDefaultCategoryColor           = QColor(175,210,255);//196,196,196);
  QColor defaultHolidayColor      = QColor(255,0,0);
  QColor defaultHighlightColor    = QColor(129,112,255);//64,64,255);
  QColor defaultAgendaBgColor     = QColor(239,241,169);//128,128,128);
  QColor defaultWorkingHoursColor = QColor(170,223,150);//160,160,160);
  QColor defaultTodoDueTodayColor = QColor(255,220,100);
  QColor defaultTodoOverdueColor  = QColor(255,153,125);
  mTimeBarFont = QFont("helvetica",10);//,QFont::Bold);
  mDefaultViewFont = QFont("helvetica",10);
  mDefaultMonthViewFont = QFont("helvetica",8);
  mMarcusBainsFont= QFont("helvetica",10);
  mDateNavigatorFont= QFont("helvetica",10, QFont::Bold);
  mEditBoxFont = QFont("helvetica",12);
  mJornalViewFont = QFont("helvetica",12);
  KPrefs::setCurrentGroup("General");
  addItemBool("Enable Group Scheduling",&mEnableGroupScheduling,false);
  addItemBool("ShowIconNewTodo",&mShowIconNewTodo,true);
  addItemBool("ShowIconNewEvent",&mShowIconNewEvent,true);
  addItemBool("ShowIconSearch",&mShowIconSearch,true);
  addItemBool("ShowIconList",&mShowIconList,true);
  addItemBool("ShowIconDay1",&mShowIconDay1,true);
  addItemBool("ShowIconDay5",&mShowIconDay5,true);
  addItemBool("ShowIconDay7",&mShowIconDay7,true);
  addItemBool("ShowIconMonth",&mShowIconMonth,true);
  addItemBool("ShowIconTodoview",&mShowIconTodoview,true);
  addItemBool("ShowIconBackFast",&mShowIconBackFast,true);
  addItemBool("ShowIconBack",&mShowIconBack,true);
  addItemBool("ShowIconToday",&mShowIconToday,true);
  addItemBool("ShowIconForward",&mShowIconForward,true);
  addItemBool("ShowIconForwardFast",&mShowIconForwardFast,true);
  addItemBool("ShowIconWhatsThis",&mShowIconWhatsThis,false);
  addItemBool("ShowIconNextDays",&mShowIconNextDays,true);
  addItemBool("ShowIconNext",&mShowIconNext,true);
  addItemBool("ShowIconJournal",&mShowIconJournal,true); 
  addItemBool("ShowIconStretch",&mShowIconStretch,true); 
-  addItemBool("LanguageChanged",&mLanguageChanged,false); 
+  addItemInt("LastLoadedLanguage",&mOldLanguage,0);
  addItemBool("AskForQuit",&mAskForQuit,false); 
 #ifndef DESKTOP_VERSION
  addItemBool("ShowFullMenu",&mShowFullMenu,false); 
 #else
  addItemBool("ShowFullMenu",&mShowFullMenu,true); 
 #endif
  addItemBool("ToolBarHor",&mToolBarHor, true );
  addItemBool("ToolBarUp",&mToolBarUp, false );
  addItemBool("ToolBarMiniIcons",&mToolBarMiniIcons, false );
  addItemInt("Whats Next Days",&mWhatsNextDays,3);
  addItemInt("Whats Next Prios",&mWhatsNextPrios,1);
  addItemBool("ShowTodoInAgenda",&mShowTodoInAgenda,true);
  addItemBool("ShowCompletedTodo",&mShowCompletedTodo,true);
  addItemInt("AllDay Size",&mAllDaySize,28);
  QString defAlarm = KGlobal::iconLoader()->iconPath()+"koalarm.wav";
  addItemString("DefaultAlarmFile",&mDefaultAlarmFile,defAlarm );
  addItemStringList("LocationDefaults",&mLocationDefaults );
  addItemStringList("EventSummary User",&mEventSummaryUser);
  addItemStringList("TodoSummary User",&mTodoSummaryUser);
  addItemBool("Enable Group Scheduling",&mEnableGroupScheduling,false);
  addItemBool("Enable Project View",&mEnableProjectView,false);
  addItemBool("Auto Save",&mAutoSave,false);
  addItemInt("Auto Save Interval",&mAutoSaveInterval,3);
  addItemBool("Confirm Deletes",&mConfirm,true);
  addItemString("Archive File",&mArchiveFile);
  addItemString("Html Export File",&mHtmlExportFile,
      QDir::homeDirPath() + "/" + i18n("Default export file", "calendar.html"));
  addItemBool("Html With Save",&mHtmlWithSave,false);
  KPrefs::setCurrentGroup("Personal Settings");
  addItemInt("Mail Client",&mMailClient,MailClientKMail);
  addItemBool("Use Control Center Email",&mEmailControlCenter,false);
  addItemBool("Bcc",&mBcc,false);
  KPrefs::setCurrentGroup("Time & Date");
  addItemInt("Default Start Time",&mStartTime,10);
  addItemInt("Default Duration",&mDefaultDuration,2);
  addItemInt("Default Alarm Time",&mAlarmTime,3);
  KPrefs::setCurrentGroup("AlarmSettings");
  addItemInt("AlarmPlayBeeps",&mAlarmPlayBeeps,20);
  addItemInt("AlarmSuspendTime",&mAlarmSuspendTime,7);
  addItemInt("AlarmSuspendCount",&mAlarmSuspendCount,5);
  addItemInt("AlarmBeepInterval",&mAlarmBeepInterval,3);
  KPrefs::setCurrentGroup("Calendar");
  addItemInt("Default Calendar Format",&mDefaultFormat,FormatICalendar);
  KPrefs::setCurrentGroup("Fonts");
  // qDebug(" KPrefs::setCurrentGroup(Fonts); ");
  addItemFont("TimeBar Font",&mTimeBarFont);
  addItemFont("MonthView Font",&mMonthViewFont);
  addItemFont("AgendaView Font",&mAgendaViewFont);
  addItemFont("MarcusBains Font",&mMarcusBainsFont);
  addItemFont("TimeLabels Font",&mTimeLabelsFont);
  addItemFont("TodoView Font",&mTodoViewFont);
  addItemFont("ListView Font",&mListViewFont);
  addItemFont("DateNavigator Font",&mDateNavigatorFont);
  addItemFont("EditBox Font",&mEditBoxFont);
  addItemFont("JournalView Font",&mJornalViewFont);
  addItemFont("WhatsNextView Font",&mWhatsNextFont);
  addItemFont("EventView Font",&mEventViewFont);
 //   KPrefs::setCurrentGroup("SyncProfiles");
 //   addItemString("LocalMachineName",&mLocalMachineName, "undefined");
 //   addItemStringList("SyncProfileNames",&mSyncProfileNames);
 //   addItemStringList("ExternSyncProfiles",&mExternSyncProfileNames);
  KPrefs::setCurrentGroup("RemoteSyncing");
 //   addItemBool("UsePasswd",&mUsePassWd,false); 
 //   addItemBool("WriteBackFile",&mWriteBackFile,true);
 //   addItemBool("WriteBackExistingOnly",&mWriteBackExistingOnly,false);
 //   addItemBool("AskForPreferences",&mAskForPreferences,true); 
 //   addItemBool("ShowSyncSummary",&mShowSyncSummary,true);
  addItemString("ActiveSyncPort",&mActiveSyncPort,"9197" );  
  addItemString("ActiveSyncIP",&mActiveSyncIP,"192.168.0.40" ); 
  addItemBool("ShowSyncEvents",&mShowSyncEvents,false); 
  addItemInt("LastSyncTime",&mLastSyncTime,0); 
 #ifdef _WIN32_
  QString hdp= locateLocal("data","korganizer")+"\\\\";
 #else
  QString hdp= locateLocal("data","korganizer")+"/";
 #endif
  KPrefs::setCurrentGroup("LoadSaveFileNames");
  addItemString("LastImportFile", &mLastImportFile ,hdp +"import.ics" );
  addItemString("LastVcalFile", &mLastVcalFile ,hdp +"export.vcs" );
  addItemString("LastSaveFile", &mLastSaveFile ,hdp +"mybackup.ics" );
  addItemString("LastLoadFile", &mLastLoadFile ,hdp +"mybackup.ics" );
 
  KPrefs::setCurrentGroup("Locale");
-  addItemInt("PreferredLanguage",&mPreferredLanguage,0);
-  addItemInt("PreferredTime",&mPreferredTime,0);
-  addItemInt("PreferredDate",&mPreferredDate,0);
-  addItemBool("WeekStartsOnSunday",&mWeekStartsOnSunday,false); 
  addItemBool("ShortDateInViewer",&mShortDateInViewer,false); 
-  addItemString("UserDateFormatLong", &mUserDateFormatLong, "%A %d %b %y");
-  addItemString("UserDateFormatShort", &mUserDateFormatShort, "%aK %d.%m.%y");
  KPrefs::setCurrentGroup("Colors");
  addItemColor("Holiday Color",&mHolidayColor,defaultHolidayColor);
  addItemColor("Highlight Color",&mHighlightColor,defaultHighlightColor);
  addItemColor("Event Color",&mEventColor,mDefaultCategoryColor);
  addItemColor("Agenda Background Color",&mAgendaBgColor,defaultAgendaBgColor);
  addItemColor("WorkingHours Color",&mWorkingHoursColor,defaultWorkingHoursColor);
  addItemColor("Todo due today Color",&mTodoDueTodayColor,defaultTodoDueTodayColor);
  addItemColor("Todo overdue Color",&mTodoOverdueColor,defaultTodoOverdueColor);
  addItemColor("MonthViewEvenColor",&mMonthViewEvenColor,QColor( 160,160,255 ));
  addItemColor("MonthViewOddColor",&mMonthViewOddColor,QColor( 160,255,160 ));
  addItemColor("MonthViewHolidayColor",&mMonthViewHolidayColor,QColor( 255,160,160 ));
  addItemBool("MonthViewUsesDayColors",&mMonthViewUsesDayColors,true); 
  addItemBool("MonthViewSatSunTog",&mMonthViewSatSunTog,true);
  addItemBool("HightlightDateTimeEdit",&mHightlightDateTimeEdit,false); 
  addItemColor("AppColor1",&mAppColor1,QColor( 130,170,255 ));
  addItemColor("AppColor2",&mAppColor2,QColor(  174,216,255 ));
  addItemBool("UseAppColors",&mUseAppColors,false); 
  
  KPrefs::setCurrentGroup("Views");
  addItemInt("Hour Size",&mHourSize,8);
  addItemBool("Show Daily Recurrences",&mDailyRecur,true);
  addItemBool("Show Weekly Recurrences",&mWeeklyRecur,true);
  addItemBool("Show Month Daily Recurrences",&mMonthDailyRecur,true);
  addItemBool("Show Month Weekly Recurrences",&mMonthWeeklyRecur,true);
  addItemBool("ShowShortMonthName",&mMonthShowShort,false);
  addItemBool("ShowIconsInMonthCell",&mMonthShowIcons,true);
  addItemBool("Enable ToolTips",&mEnableToolTips,false);
  addItemBool("Enable MonthView ScrollBars",&mEnableMonthScroll,false);
  addItemBool("Marcus Bains shows seconds",&mMarcusBainsShowSeconds,false);
  addItemBool("Show Marcus Bains",&mMarcusBainsEnabled,true);
  addItemBool("EditOnDoubleClick",&mEditOnDoubleClick,true);
  addItemBool("ViewChangeHoldFullscreen",&mViewChangeHoldFullscreen,false);
  addItemBool("ViewChangeHoldNonFullscreen",&mViewChangeHoldNonFullscreen,false);
  addItemBool("CenterOnCurrentTime",&mCenterOnCurrentTime,false);
  addItemBool("SetTimeToDayStartAt",&mSetTimeToDayStartAt,true);
  addItemBool("HighlightCurrentDay",&mHighlightCurrentDay,true);
  addItemBool("WNViewShowsParents",&mWNViewShowsParents,true);
  addItemBool("WNViewShowLocation",&mWNViewShowLocation,false);
  addItemBool("UseHighlightLightColor",&mUseHighlightLightColor,false);
  addItemBool("ListViewMonthTimespan",&mListViewMonthTimespan,true);
  addItemBool("TodoViewUsesCatColors",&mTodoViewUsesCatColors,false);
  addItemBool("TodoViewShowsPercentage",&mTodoViewShowsPercentage,false);
  addItemBool("TodoViewUsesSmallFont",&mTodoViewUsesSmallFont,false);
  addItemBool("TodoViewUsesForegroundColor",&mTodoViewUsesForegroundColor,false);
  addItemBool("MonthViewUsesForegroundColor",&mMonthViewUsesForegroundColor,false);
 #ifdef DESKTOP_VERSION
  addItemBool("UseInternalAlarmNotification",&mUseInternalAlarmNotification,true);
 #else
  addItemBool("UseInternalAlarmNotification",&mUseInternalAlarmNotification,false);
 #endif
  addItemInt("Day Begins",&mDayBegins,7);
  addItemInt("Working Hours Start",&mWorkingHoursStart,8);
  addItemInt("Working Hours End",&mWorkingHoursEnd,17);
  addItemBool("Exclude Holidays",&mExcludeHolidays,true);
  addItemBool("Exclude Saturdays",&mExcludeSaturdays,true);
  addItemBool("Month View Uses Category Color",&mMonthViewUsesCategoryColor,false);
  addItemBool("Full View Month",&mFullViewMonth,true);
  addItemBool("Full View Todo",&mFullViewTodo,true);
  addItemBool("Quick Todo",&mEnableQuickTodo,false);
  addItemInt("Next X Days",&mNextXDays,3);
  KPrefs::setCurrentGroup("Printer");
  KPrefs::setCurrentGroup("Layout");
  addItemBool("CompactDialogs",&mCompactDialogs,false);
  addItemBool("VerticalScreen",&mVerticalScreen,true);
  KPrefs::setCurrentGroup("KOrganizer Plugins");
  addItemStringList("SelectedPlugins",&mSelectedPlugins,"holidays");
  KPrefs::setCurrentGroup("Group Scheduling");
  addItemInt("IMIPScheduler",&mIMIPScheduler,IMIPKMail);
  addItemInt("IMIPSend",&mIMIPSend,IMIPdirectsend);
  addItemStringList("AdditionalMails",&mAdditionalMails,"");
  addItemInt("IMIP auto refresh",&mIMIPAutoRefresh,neverAuto);
  addItemInt("IMIP auto insert request",&mIMIPAutoInsertRequest,neverAuto);
  addItemInt("IMIP auto insert reply",&mIMIPAutoInsertReply,neverAuto);
  addItemInt("IMIP auto FreeBusy",&mIMIPAutoFreeBusy,neverAuto);
  addItemInt("IMIP auto save FreeBusy",&mIMIPAutoFreeBusyReply,neverAuto);
  KPrefs::setCurrentGroup( "Editors" );
  addItemStringList( "EventTemplates", &mEventTemplates );
  addItemStringList( "TodoTemplates", &mTodoTemplates );
  addItemInt("DestinationPolicy",&mDestination,standardDestination);
 }
 KOPrefs::~KOPrefs()
 {
  if (mInstance == this)
      mInstance = insd.setObject(0); 
-  setLocaleDict( 0 );
+ 
-  if ( mLocaleDict )
-      delete mLocaleDict;
  //qDebug("KOPrefs::~KOPrefs() ");
 }
 KOPrefs *KOPrefs::instance()
 {
  if (!mInstance) {
      mInstance = insd.setObject(new KOPrefs());
      mInstance->readConfig();
  }
  return mInstance;
 }
 void KOPrefs::usrSetDefaults()
 {
   
 }
 void KOPrefs::fillMailDefaults()
 {
  if (mName.isEmpty()) mName = i18n("Anonymous");
  if (mEmail.isEmpty()) mEmail = i18n("nobody@nowhere");
 }
 void KOPrefs::setTimeZoneIdDefault()
 {
    ;
 }
 void KOPrefs::setCategoryDefaults()
 {
  mCustomCategories.clear();
  mCustomCategories = getDefaultList();
  QStringList::Iterator it;
  for (it = mCustomCategories.begin();it != mCustomCategories.end();++it ) {
    setCategoryColor(*it,mDefaultCategoryColor);
  }
 }
 QStringList KOPrefs::getDefaultList()
 {
    QStringList retval ;
    retval << i18n("Anniversary") << i18n("Appointment") << i18n("Birthday") << i18n("Business") << i18n("Business Travel") << i18n("Cinema")  << i18n("Customer")
           << i18n("Break")<< i18n("Breakfast")<< i18n("Competition")<< i18n("Dinner")
           << i18n("Education")<< i18n("Family")  << i18n("Favorites")  << i18n("Festival")<< i18n("Fishing")<< i18n("Flight") << i18n("Gifts")  
           << i18n("Holiday") << i18n("Holiday Cards")<< i18n("Hot Contacts") << i18n("Hiking") << i18n("Hunting") << i18n("Key Customer") << i18n("Kids") 
                    << i18n("Lunch")  << i18n("Meeting") << i18n("Miscellaneous") << i18n("Partner")<< i18n("Party") << i18n("Personal") << i18n("Personal Travel")
           << i18n("PHB") << i18n("Phone Calls") << i18n("Projects") << i18n("Recurring") << i18n("School") << i18n("Shopping")
           << i18n("Speach")  << i18n("Special Occasion") << i18n("Sports") << i18n("Talk") << i18n("Travel") << i18n("TV")<< i18n("University")
           << i18n("Vacation") << i18n("VIP") << i18n("SyncEvent")  ;
    retval.sort();
    return retval; 
 }
 void KOPrefs::usrReadConfig()
 {
-    mPreferredLanguage = KPimGlobalPrefs::instance()->mPreferredLanguage;
-    mLocaleDict = 0;
-    // pending LR fix translation
-    // qDebug("KOPrefs::usrReadConfig() fix translation ");
-    if ( mPreferredLanguage > 0 && mPreferredLanguage < 5 ) {
-        if ( mPreferredLanguage == 1 ) {
-            mLocaleDict = new QDict<QString>;
-            int i = 0;
-            QString fw ( germanwords[i] [0]);
-            while ( !fw.isEmpty() ) {
-                mLocaleDict->insert( fw, new QString (germanwords[i] [1] ));
-                ++i;
-                fw = germanwords[i] [0];
-            }
-        
-            setLocaleDict( mLocaleDict );
-        } else {
-            QString fileName ;
-            if ( mPreferredLanguage == 4 ) 
-                fileName = MainWindow::resourcePath()+"usertranslation.txt"; 
-            else if ( mPreferredLanguage == 2 ) 
-                fileName = MainWindow::resourcePath()+"frenchtranslation.txt"; 
-            else if ( mPreferredLanguage == 3 ) 
-                fileName = MainWindow::resourcePath()+"italiantranslation.txt";
-            QFile file( fileName );
-            if (file.open( IO_ReadOnly ) ) {
-                QTextStream ts( &file );
-                ts.setEncoding( QTextStream::Latin1 );
-                //ts.setCodec( QTextCodec::latin1 );
-                QString  text = ts.read();
-                file.close();  
-                text.replace( QRegExp("\\\\n"), "\n" );
-                QString line;
-                QString we;
-                QString wt;
-                int br = 0;
-                int nbr;
-                nbr = text.find ( "},", br );
-                line = text.mid( br, nbr - br );
-                br = nbr+1;
-                int se, ee, st, et;
-                mLocaleDict = new QDict<QString>;
-                QString end = "{ \"\",\"\" }";
-                while ( (line != end) && (br > 1)  ) {
-                    //qDebug("%d *%s* ", br, line.latin1());
-                    se = line.find("\"")+1;
-                    et = line.findRev("\"",-1);
-                    ee = line.find("\",\"");
-                    st = ee+3;
-                    we = line.mid( se, ee-se );
-                    wt = line.mid( st, et-st );
-                    //qDebug("*%s* *%s* ", we.latin1(), wt.latin1());
-                    mLocaleDict->insert( we, new QString (wt) );
-                    nbr = text.find ( "}", br );
-                    line = text.mid( br, nbr - br );
-                    br = nbr+1;
-                }
-                //qDebug("end *%s* ", end.latin1());
-                setLocaleDict( mLocaleDict );
-            } else {
-                qDebug("KO: Cannot find translation file %s",fileName.latin1() );
-            }
-    
-        }
-    }
    config()->setGroup("General");
    
    mCustomCategories = config()->readListEntry("Custom Categories");
-    if ( KOPrefs::instance()->mLanguageChanged ) {
+    if ( KPimGlobalPrefs::instance()->mPreferredLanguage != mOldLanguage ) {
        mLocationDefaults.clear();
        mEventSummaryUser.clear();
        mTodoSummaryUser.clear();
    }
+    mOldLoadedLanguage = mOldLanguage ;
+    mOldLanguage = KPimGlobalPrefs::instance()->mPreferredLanguage;
   if (mLocationDefaults.isEmpty()) {
       mLocationDefaults << i18n("Home") << i18n("Office") << i18n("Library") << i18n("School") << i18n("Doctor") << i18n("Beach") 
                         << i18n("University") << i18n("Restaurant")  << i18n("Bar") << i18n("Conference room") << i18n("Cinema")  << i18n("Lake") << i18n("Kindergarten")
                         << i18n("Germany") << i18n("Sweden") << i18n("Forest") << i18n("Desert") << i18n("Kitchen") ;
       // << i18n("") << i18n("") << i18n("") << i18n("") << i18n("") << i18n("") << i18n("") << i18n("")
       mLocationDefaults.sort();
    }
       
   if (mEventSummaryUser.isEmpty()) {
        mEventSummaryUser  = getDefaultList() ;
    }
   if (mTodoSummaryUser.isEmpty()) {
       mTodoSummaryUser  = getDefaultList() ;
   }
  
  if (mCustomCategories.isEmpty()) setCategoryDefaults();
  config()->setGroup("Personal Settings");
  mName = config()->readEntry("user_name","");
  mEmail = config()->readEntry("user_email","");
  fillMailDefaults();
  config()->setGroup("Category Colors");
  QStringList::Iterator it;
  for (it = mCustomCategories.begin();it != mCustomCategories.end();++it ) {
    setCategoryColor(*it,config()->readColorEntry(*it,&mDefaultCategoryColor));
   
  }
 
  KPimPrefs::usrReadConfig();
 }
 void KOPrefs::usrWriteConfig()
 {
  config()->setGroup("General");
  config()->writeEntry("Custom Categories",mCustomCategories); 
  
  config()->setGroup("Personal Settings");
  config()->writeEntry("user_name",mName);
  config()->writeEntry("user_email",mEmail);
  config()->setGroup("Category Colors");
  QDictIterator<QColor> it(mCategoryColors);
  while (it.current()) {
    config()->writeEntry(it.currentKey(),*(it.current()));
    ++it;
  }
  KPimPrefs::usrWriteConfig();
 }
 void KOPrefs::setCategoryColor(QString cat,const QColor & color)
 {
  mCategoryColors.replace(cat,new QColor(color));
 }
 QColor *KOPrefs::categoryColor(QString cat)
 {
  QColor *color = 0;
  if (!cat.isEmpty()) color = mCategoryColors[cat];
  if (color) return color;
  else return &mDefaultCategoryColor;
 }
 void KOPrefs::setFullName(const QString &name)
 {
  mName = name;
 }
 void KOPrefs::setEmail(const QString &email)
 {
    //qDebug(" KOPrefs::setEmai*********** %s",email.latin1() );
  mEmail = email;
 }
 QString KOPrefs::fullName()
 {
  if (mEmailControlCenter) {
    KEMailSettings settings;
    return settings.getSetting(KEMailSettings::RealName);
  } else {
    return mName;
  }
 }
 QString KOPrefs::email()
 {
  if (mEmailControlCenter) {
    KEMailSettings settings;
    return settings.getSetting(KEMailSettings::EmailAddress);
  } else {
    return mEmail;
  }
 }
 KConfig* KOPrefs::getConfig()
 {
    return config();
 }
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h
index c74b0ef..0656644 100644
--- a/korganizer/koprefs.h
+++ b/korganizer/koprefs.h
@@ -1,283 +1,273 @@
 /*
    This file is part of KOrganizer.
    Copyright (c) 2000,2001 Cornelius Schumacher <schumacher@kde.org>
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
    As a special exception, permission is given to link this program
    with any edition of Qt, and distribute the resulting executable,
    without including the source code for Qt in the source distribution.
 */
 #ifndef KOPREFS_H
 #define KOPREFS_H
-#include <qdict.h>
 #include <libkdepim/kpimprefs.h>
+#include <qdict.h>
 class KConfig;
 class QFont;
 class QColor;
 class QStringList;
 class KOPrefs : public KPimPrefs
 {
  public:
    enum { FormatVCalendar, FormatICalendar };
    enum { MailClientKMail, MailClientSendmail };
    enum { IMIPDummy, IMIPKMail };
    enum { IMIPOutbox, IMIPdirectsend };
    enum { neverAuto, addressbookAuto, selectedAuto };
    enum { standardDestination, askDestination };
    virtual ~KOPrefs();
    /** Get instance of KOPrefs. It is made sure that there is only one
    instance. */
    static KOPrefs *instance();
    /** Set preferences to default values */
    void usrSetDefaults();
    /** Read preferences from config file */
    void usrReadConfig();
    /** Write preferences to config file */
    void usrWriteConfig();
    void setCategoryDefaults();
  protected:
    void setTimeZoneIdDefault();
    /** Fill empty mail fields with default values. */
    void fillMailDefaults();
  private:
    /** Constructor disabled for public. Use instance() to create a KOPrefs
    object. */
    KOPrefs();
    static KOPrefs *mInstance;
-    QDict<QString> *mLocaleDict;
    QStringList getDefaultList();
  public:
    // preferences data
    KConfig* getConfig();
    void setFullName(const QString &);
    QString fullName();
    void setEmail(const QString &);
    QString email();
    QString mAdditional;
    bool    mEmailControlCenter;
    bool    mBcc;
    bool    mAutoSave;
    int     mAutoSaveInterval;
    bool    mConfirm;
    bool    mEnableGroupScheduling;
    bool    mEnableProjectView;
    int     mDefaultFormat;
    int     mMailClient;
    int     mStartTime;
    int     mDefaultDuration;
    int     mAlarmTime;
    int     mWorkingHoursStart;
    int     mWorkingHoursEnd;
    bool    mExcludeHolidays;
    bool    mExcludeSaturdays;
    bool    mMarcusBainsShowSeconds;
    QFont   mTimeBarFont;
    QFont   mMonthViewFont;
    QFont   mAgendaViewFont;
    QFont   mMarcusBainsFont;
    QFont   mTimeLabelsFont;
    QFont   mTodoViewFont;
    QFont   mListViewFont;
    QFont   mDateNavigatorFont;
    QFont   mEditBoxFont;
    QFont   mJornalViewFont;
    QFont   mWhatsNextFont;
    QFont   mEventViewFont;
    QColor  mHolidayColor;
    QColor  mHighlightColor;
    QColor  mEventColor;
    QColor  mAgendaBgColor;
    QColor  mWorkingHoursColor;
    QColor  mTodoDueTodayColor;
    QColor  mTodoOverdueColor;
    QColor  mMonthViewEvenColor;
    QColor  mMonthViewOddColor;
    QColor  mMonthViewHolidayColor;
    bool mMonthViewUsesDayColors;
    bool mMonthViewSatSunTog;
    QColor  mAppColor1;
    QColor  mAppColor2;
    bool mUseAppColors;
    int     mDayBegins;
    int     mHourSize;
    int     mAllDaySize;
    bool    mShowFullMenu;
    bool    mDailyRecur;
    bool    mWeeklyRecur;
    bool    mMonthDailyRecur;
    bool    mMonthWeeklyRecur;
    bool    mMonthShowIcons;
    bool    mMonthShowShort;
    bool    mEnableToolTips;
    bool    mEnableMonthScroll;
    bool    mFullViewMonth;
    bool    mMonthViewUsesCategoryColor;
    bool    mFullViewTodo;
    bool    mShowCompletedTodo;
    bool    mMarcusBainsEnabled;
    int     mNextXDays;
    int     mWhatsNextDays;
    int     mWhatsNextPrios;
    bool    mEnableQuickTodo;
-    bool    mLanguageChanged;
    bool    mCompactDialogs;
    bool    mVerticalScreen;
    bool mShowIconNewTodo;
    bool mShowIconNewEvent;
    bool mShowIconSearch;
    bool mShowIconList;
    bool mShowIconDay1;
    bool mShowIconDay5;
    bool mShowIconDay7;
    bool mShowIconMonth;
    bool mShowIconTodoview;
    bool mShowIconBackFast;
    bool mShowIconBack;
    bool mShowIconToday;
    bool mShowIconForward;
    bool mShowIconForwardFast;
    bool mShowIconWhatsThis;
    bool mShowIconNextDays;
    bool mShowIconNext;
    bool mShowIconJournal;
    
    bool mShowIconStretch;
    bool mToolBarHor;
    bool mToolBarUp;
    bool mToolBarMiniIcons;
    bool mAskForQuit;
    bool mUsePassWd;
    bool mShowSyncEvents;
    bool mShowTodoInAgenda;
    int mLastSyncTime;
    void setCategoryColor(QString cat,const QColor & color);
    QColor *categoryColor(QString cat);
    QString mArchiveFile;
    QString mHtmlExportFile;
    bool    mHtmlWithSave;
    QStringList mSelectedPlugins;
  
    QString mLastImportFile;
    QString mLastVcalFile;
    QString mLastSaveFile;
    QString mLastLoadFile;
    QString mDefaultAlarmFile;
    int mIMIPScheduler;
    int mIMIPSend;
    QStringList mAdditionalMails;
    int mIMIPAutoRefresh;
    int mIMIPAutoInsertReply;
    int mIMIPAutoInsertRequest;
    int mIMIPAutoFreeBusy;
    int mIMIPAutoFreeBusyReply;
    QStringList mTodoTemplates;
    QStringList mEventTemplates;
    int mDestination;
    bool mEditOnDoubleClick;
    bool mViewChangeHoldFullscreen;
    bool mViewChangeHoldNonFullscreen;
    bool mCenterOnCurrentTime;
    bool mSetTimeToDayStartAt;
    bool mHighlightCurrentDay;
    bool mUseHighlightLightColor;
    bool mListViewMonthTimespan;
    bool mWNViewShowsParents;
    bool mWNViewShowLocation;
    bool mTodoViewShowsPercentage;
    bool mTodoViewUsesCatColors;
    bool mTodoViewUsesSmallFont;
    bool mTodoViewUsesForegroundColor;
    bool mMonthViewUsesForegroundColor;
    bool mHightlightDateTimeEdit;
    bool mShortDateInViewer;
    QStringList mLocationDefaults;
    QStringList mEventSummaryUser;
    QStringList mTodoSummaryUser;
    bool mUseInternalAlarmNotification;
    int mAlarmPlayBeeps;
    int mAlarmSuspendTime;
    int mAlarmSuspendCount;
    int mAlarmBeepInterval;
+    int mOldLanguage;
+    int mOldLoadedLanguage;
  
    QString mActiveSyncPort;
    QString mActiveSyncIP;
-    //US I copied the following settings into KPimGlobalPrefs
-    // that allows us later to easily remove the settings from here.
-    int mPreferredDate;
-    QString mUserDateFormatLong;
-    QString mUserDateFormatShort;
-    int mPreferredLanguage;
-    int mPreferredTime;
-    bool mWeekStartsOnSunday;
  private:
    QDict<QColor> mCategoryColors;
    QColor mDefaultCategoryColor;
    QFont mDefaultTimeBarFont;
    QFont mDefaultViewFont;
    QFont mDefaultMonthViewFont;
    QString mName;
    QString mEmail;
 };
 #endif
diff --git a/korganizer/ktimeedit.cpp b/korganizer/ktimeedit.cpp
index cf07a1a..f5a1c50 100644
--- a/korganizer/ktimeedit.cpp
+++ b/korganizer/ktimeedit.cpp
@@ -1,433 +1,434 @@
 /*
    This file is part of KOrganizer.
    Copyright (c) 1999 Preston Brown, Ian Dawes
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
    As a special exception, permission is given to link this program
    with any edition of Qt, and distribute the resulting executable,
    without including the source code for Qt in the source distribution.
 */
 #include <qkeycode.h>
 #include <qcombobox.h>
 #include <qdatetime.h>
 #include <qlineedit.h>
 #include <qapplication.h>
 #include <kmessagebox.h>
 #include <kglobal.h>
 #include <kdebug.h>
 #include <klocale.h>
+#include <kpimglobalprefs.h>
 #include "ktimeedit.h"
 #include "koprefs.h"
 #include <qvalidator.h>
 // Validator for a time value with only hours and minutes (no seconds)
 // Mostly locale aware. Author: David Faure <faure@kde.org>
 class KOTimeValidator : public QValidator
 {
 public:
    KOTimeValidator(QWidget* parent, const char* name=0) : QValidator(parent, name) {}
    virtual State validate(QString& str, int& /*cursorPos*/) const
    {
        return Acceptable;
        bool ok = false;
        // TODO use KLocale::WithoutSeconds in HEAD
        /*QTime time =*/ KGlobal::locale()->readTime(str, &ok);
        if ( ok )
            return Acceptable;
        // readTime doesn't help knowing when the string is "Intermediate".
        int length = str.length();
        if ( !str ) // empty string?
            return Invalid; // there should always be a ':' in it, right?
        // HACK. Not fully locale aware etc. (esp. the separator is '.' in sv_SE...)
        QChar sep = ':';
        // I want to allow "HH:", ":MM" and ":" to make editing easier
        if ( str[0] == sep )
        {
            if ( length == 1 ) // just ":"
                return Intermediate;
            QString minutes = str.mid(1);
            int m = minutes.toInt(&ok);
            if ( ok && m >= 0 && m < 60 )
                return Intermediate;
        } else if ( str.at(str.length()-1) == sep )
        {
            QString hours = str.left(length-1);
            int h = hours.toInt(&ok);
            if ( ok && h >= 0 && h < 24 )
                return Intermediate;
        }
        return Invalid;
    }
 };
 // KTimeWidget/QTimeEdit provide nicer editing, but don't provide a combobox.
 // Difficult to get all in one...
 // But Qt-3.2 will offer QLineEdit::setMask, so a "99:99" mask would help.
 KOTimeEdit::KOTimeEdit(QWidget *parent, QTime qt, const char *name)
  : QComboBox(TRUE, parent, name)
 {
  setInsertionPolicy(NoInsertion);
  setValidator( new KOTimeValidator( this ) );
    mFlagKeyPressed = false;
    if ( QApplication::desktop()->width() < 650 )
        setSizeLimit ( 6 ); 
  mTime = qt;
 //  mNoTimeString = i18n("No Time");
 //  insertItem( mNoTimeString );
  // Fill combo box with selection of times in localized format.
  QTime timeEntry(0,0,0);
  do {
    insertItem(KGlobal::locale()->formatTime(timeEntry));
    timeEntry = timeEntry.addSecs(60*15);
  } while (!timeEntry.isNull());
  // Add end of day.
  insertItem( KGlobal::locale()->formatTime( QTime( 23, 59, 59 ) ) );
  updateText();
  setFocusPolicy(QWidget::StrongFocus);
  connect(this, SIGNAL(activated(int)), this, SLOT(activ(int)));
  connect(this, SIGNAL(highlighted(int)), this, SLOT(hilit(int)));
  connect(this,SIGNAL(textChanged(const QString&)),this,SLOT(changedText()));
  QFontMetrics fm ( font() );
  QString timeString = "24:00";
-  if ( KOPrefs::instance()->mPreferredTime == 1 )
+  if ( KPimGlobalPrefs::instance()->mPreferredTime == 1 )
      timeString = "02:00pm";
  int addSpace = 32;
  if ( QApplication::desktop()->width() > 320 )
      timeString += ":00";
  setFixedWidth(fm.width( timeString ) + 32 );
  // Highlight Background and Textcolor change from default
  QPalette palette = QWidget::palette();
  unsigned char red, green, blue;
  red = palette.color( QPalette::Normal , QColorGroup::Background ).red() - 10;
  green = palette.color( QPalette::Normal , QColorGroup::Background ).green() - 10;
  blue = palette.color( QPalette::Normal , QColorGroup::Background ).blue() - 10;
  palette.setColor( QColorGroup::Highlight, QColor(red,green,blue) );
  palette.setColor( QColorGroup::HighlightedText, palette.color( QPalette::Normal , QColorGroup::Foreground ) );
  setPalette( palette );
 }
 KOTimeEdit::~KOTimeEdit()
 {
 }
 bool KOTimeEdit::hasTime() const
 {
  // Can't happen
  if ( currentText().isEmpty() ) return false;
  //if ( currentText() == mNoTimeString ) return false;
  return true; // always
 }
 QTime KOTimeEdit::getTime() const
 {
  //kdDebug(5850) << "KOTimeEdit::getTime(), currentText() = " << currentText() << endl;
  // TODO use KLocale::WithoutSeconds in HEAD
  QTime time = KGlobal::locale()->readTime(currentText());
  // kdDebug(5850) << "KOTimeEdit::getTime(): " << time.toString() << endl;
  return time;
 }
 /*
 QSizePolicy  KOTimeEdit::sizePolicy() const
 {
  // Set size policy to Fixed, because edit cannot contain more text than the
  // string representing the time. It doesn't make sense to provide more space.
  QSizePolicy sizePolicy(QSizePolicy::Fixed,QSizePolicy::Fixed);
  return sizePolicy;
 }
 */
 void KOTimeEdit::setTime(QTime newTime)
 {
  if ( mTime != newTime )
  {
    kdDebug(5850) << "KOTimeEdit::setTime(): " << newTime.toString() << endl;
    mTime = newTime;
    updateText();
  }
 }
 void KOTimeEdit::activ(int i)
 {
    // The last entry, 23:59, is a special case
    if( i == count() - 1 )
        mTime = QTime( 23, 59, 0 );
    else
        mTime = QTime(0,0,0).addSecs(i*15*60);
    emit timeChanged(mTime);
 }
 void KOTimeEdit::hilit(int )
 {
  // we don't currently need to do anything here.
 }
 void KOTimeEdit::addTime(QTime qt, bool update)
 {
  // Calculate the new time.
    //qDebug("add h %d min %d  ", qt.hour(),qt.minute() );
  mTime = mTime.addSecs(qt.minute()*60+qt.hour()*3600);
  // if ( update )
      updateText();
  emit timeChanged(mTime);
 }
 void KOTimeEdit::subTime(QTime qt, bool update)
 {
  int h, m;
  //qDebug("sub  h %d min %d  ", qt.hour(),qt.minute() );
  mTime = mTime.addSecs(-(qt.minute()*60+qt.hour()*3600));
  // store the newly calculated time.
  // mTime.setHMS(h, m, 0);
  //if ( update )
      updateText();
  emit timeChanged(mTime);
 }
 // void KOTimeEdit::mouseReleaseEvent ( QMouseEvent * )
 // {
 //     qDebug("mouseReleaseEvent ( QMouseEvent * )  ");
 // }
 // void KOTimeEdit::focusInEvent ( QFocusEvent * )
 // {
 //     qDebug("focusInEvent ( QFocusEvent * )   ");
 // }
 void KOTimeEdit::keyReleaseEvent(QKeyEvent *e)
 {
  if ( !e->isAutoRepeat() ) {
      mFlagKeyPressed = false;
    }
 }
 void KOTimeEdit::setSelect( int from, int to )
 {
    if ( KOPrefs::instance()->mHightlightDateTimeEdit)
        lineEdit()->setSelection( from , to );
 }
 void KOTimeEdit::keyPressEvent(QKeyEvent *e)
 {
  qApp->processEvents();
-  bool hour12Format =  ( KOPrefs::instance()->mPreferredTime == 1 );
+  bool hour12Format =  ( KPimGlobalPrefs::instance()->mPreferredTime == 1 );
  int maxpos = hour12Format?7:5;
  if ( e->isAutoRepeat() && !mFlagKeyPressed ) {
    e->ignore();
    // qDebug("  ignore  %d",e->isAutoRepeat()  );
    return;
  }
  if (! e->isAutoRepeat() ) {
    mFlagKeyPressed = true;
  }
  // Tap -> Focus Next Widget
  if ( e->key() == Key_Tab ) {
    QComboBox::keyPressEvent(e);
    return;
  }
  // save Text from QLineEdit and CursorPosition
  QString text = lineEdit()->text();
  int cpos = lineEdit()->cursorPosition();
  // qDebug("cpos %d  ", cpos);
  // Switch for arrows, backspace and escape
  switch(e->key()) {
  case Key_Escape:
      lineEdit()->deselect();
  case Key_Tab:
      QComboBox::keyPressEvent(e);
    break;
  case Key_Up:
      if ( e->state () == Qt::ControlButton ) {
          addTime(QTime(0,15,0), false );
          lineEdit()->setCursorPosition(3);
          setSelect( 3 , 2 );
      }
      else
          if ( e->state () == Qt::ShiftButton ) {
              addTime(QTime(1,0,0), false );
              lineEdit()->setCursorPosition(0);
              setSelect( 0 , 2 );
          }
          else
              // switch time up, cursor location depend
              switch (cpos) {
                  case 7:
                  case 6:
                  case 5:
                      if(!hour12Format) {
                          lineEdit()->setCursorPosition(cpos = 4);
                      } else {
                          addTime(QTime(12,0,0), false );
                          setSelect ( 5 , 2 );
                          break;
                      }
                  case 4:
                      addTime(QTime(0,1,0), false );
                      setSelect ( cpos , 1 );
                      break;
                  case 3:
                      addTime(QTime(0,10,0), false );
                      setSelect ( cpos , 1 );
                      break;
                  case 2:
                      lineEdit()->setCursorPosition(--cpos);
                  case 1:
                  case 0:
                      addTime(QTime(1,0,0), false );
                      setSelect ( 0, 2 );
                      break;
              }
      break;
  case Key_Down:
      if ( e->state () == Qt::ControlButton ) {
          subTime(QTime(0,15,0), false );
          lineEdit()->setCursorPosition(3);
          setSelect( 3 , 2 );
      }
      else
          if ( e->state () == Qt::ShiftButton ) {
              subTime(QTime(1,0,0), false );
              lineEdit()->setCursorPosition(0);
              setSelect( 0 , 2 );
          }
          else
              // switch time down, cursor location depend
              switch (cpos) {
                  case 7:
                  case 6:
                  case 5:
                      if(!hour12Format) {
                          lineEdit()->setCursorPosition(cpos = 4);
                      } else {
                          subTime(QTime(12,0,0), false );
                          setSelect ( 5 , 2 );
                          break;
                      }
                  case 4:
                      subTime(QTime(0,1,0), false );
                      setSelect ( cpos , 1 );
                      break;
                  case 3:
                      subTime(QTime(0,10,0), false );
                      setSelect ( cpos , 1 );
                      break;
                  case 2:
                      lineEdit()->setCursorPosition(--cpos);
                  case 1:
                  case 0:
                      subTime(QTime(1,0,0), false );
                      setSelect ( 0 , 2 );
                      break;
              }
      break;
  // set cursor to correct place
  case Key_Left:
    if ( cpos == 3 )
        --cpos;
    if ( cpos >  0) {
        lineEdit()->setCursorPosition(--cpos);
        setSelect ( cpos , 1 );
    }
    else
        setSelect ( 0 , 1 );
    break;
  // set cursor to correct place
  case Key_Right:
    if ( cpos == 1 )
        ++cpos;
    if ( cpos < maxpos ) {
        lineEdit()->setCursorPosition(++cpos);
        setSelect ( cpos , 1 );
    }
    break;
  // rest
  case Key_Prior:
    subTime(QTime(1,0,0));
    break;
  case Key_Next:
    addTime(QTime(1,0,0));
    break;
  case Key_Backspace:
      if ( cpos >  0) {
          if ( cpos == 3 )
              --cpos;
          if ( cpos > 5)
              cpos = 5;
          text.at( cpos-1 ) = '0';
          lineEdit()->setText( text );
          lineEdit()->setCursorPosition(--cpos);
          setSelect ( cpos , 1 );
      changedText();
      }
    break;
  } // switch arrows
  // if cursor at string end, alltext market and keyEvent don't ArrowLeft -> deselect and cpos
  if( cpos > 4 && lineEdit()->markedText().length() == 5 && e->key() != Key_Left ) {
      lineEdit()->deselect();
      cpos = 0;
      lineEdit()->setCursorPosition(cpos);
      setSelect(cpos , 1);
  }
  if (  cpos == 2 ) {
      lineEdit()->setCursorPosition(++cpos);
  }
  // num keys when cursorPos preEnd
  if (  cpos  < 5  ) {
      // switch another keys
      switch(e->key()) {
      case Key_Delete:
          text.at( cpos ) = '0';
          lineEdit()->setText( text );
          lineEdit()->setCursorPosition(cpos);
          setSelect ( cpos , 1 );
          changedText();
          break;
      case Key_9:
      case Key_8:
      case Key_7:
      case Key_6:
          if ( !(cpos == 1 ||  cpos == 4)  )
              return;
          if ( cpos == 1  && text.at( 0 ) > '1')
              text.at( 0 ) = '1';
      case Key_5:
      case Key_4:
      case Key_3:
          if ( cpos < 1 )
              return;
          if ( hour12Format  && cpos == 1  )
              return;
      case Key_2:
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index fbfcd20..dc2026b 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -36,388 +36,387 @@
 #endif
 #include <libkcal/calendarlocal.h>
 #include <libkcal/todo.h>
 #include <libkcal/phoneformat.h>
 #include <libkdepim/ksyncprofile.h>
 #include <libkdepim/phoneaccess.h>
 #include <libkcal/kincidenceformatter.h>
 #include <libkdepim/kpimglobalprefs.h>
 #include "calendarview.h"
 #include "koviewmanager.h"
 #include "datenavigator.h"
 #include "koagendaview.h"
 #include "koagenda.h"
 #include "kodialogmanager.h"
 #include "kdialogbase.h"
 #include "kapplication.h"
 #include "kofilterview.h"
 #include "kstandarddirs.h"
 #include "koprefs.h"
 #include "kfiledialog.h"
 #include "koglobals.h"
 #include "kglobal.h"
 #include "klocale.h"
 #include "kconfig.h"
 #include "simplealarmclient.h"
 #include "externalapphandler.h"
 using namespace KCal;
 #ifndef _WIN32_
 #include <unistd.h>
 #else
 #include "koimportoldialog.h"
 #endif
 #include "mainwindow.h"
 class KOex2phonePrefs : public QDialog
 {
  public:
    KOex2phonePrefs( QWidget *parent=0, const char *name=0 ) :
      QDialog( parent, name, true ) 
    {
        setCaption( i18n("Export to phone options") );
        QVBoxLayout* lay = new QVBoxLayout( this );
        lay->setSpacing( 3 );
        lay->setMargin( 3 );
        QLabel *lab;
        lay->addWidget(lab = new QLabel( i18n("Please read Help-Sync Howto\nto know what settings to use."), this ) );  
        lab->setAlignment (AlignHCenter  ); 
        QHBox* temphb;
        temphb = new QHBox( this );
        new QLabel( i18n("I/O device: "), temphb ); 
        mPhoneDevice = new QLineEdit( temphb);
        lay->addWidget( temphb );
        temphb = new QHBox( this );
        new QLabel( i18n("Connection: "), temphb ); 
        mPhoneConnection = new QLineEdit( temphb);
        lay->addWidget( temphb );
        temphb = new QHBox( this );
        new QLabel( i18n("Model(opt.): "), temphb ); 
        mPhoneModel = new QLineEdit( temphb);
        lay->addWidget( temphb );
        mWriteBackFuture= new QCheckBox( i18n("Write back events in future only"), this );
        mWriteBackFuture->setChecked( true );
        lay->addWidget( mWriteBackFuture );
        temphb = new QHBox( this );
        new QLabel( i18n("Max. weeks in future: ") , temphb );
        mWriteBackFutureWeeks= new QSpinBox(1,104, 1, temphb);
        mWriteBackFutureWeeks->setValue( 8 );
        lay->addWidget( temphb );  
        lay->addWidget(lab = new QLabel( i18n("NOTE: This will remove all old\ntodo/calendar data on phone!"), this ) );  
        lab->setAlignment (AlignHCenter  ); 
        QPushButton * ok = new QPushButton( i18n("Export to mobile phone!"), this );
        lay->addWidget( ok );
        QPushButton * cancel = new QPushButton( i18n("Cancel"), this );
        lay->addWidget( cancel );
        connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() )  );
        connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject())  );
        resize( 220, 240 );
        
    }
   
 public:
    QLineEdit* mPhoneConnection, *mPhoneDevice, *mPhoneModel; 
    QCheckBox* mWriteBackFuture;
    QSpinBox* mWriteBackFutureWeeks;
 };
 int globalFlagBlockStartup;
 MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
    QMainWindow( parent, name )
 {
  
 #ifdef DESKTOP_VERSION
    setFont( QFont("Arial"), 14 );
 #endif
    mClosed = false;
    //QString confFile = KStandardDirs::appDir() + "config/korganizerrc";
    QString confFile = locateLocal("config","korganizerrc");
    QFileInfo finf ( confFile );
    bool showWarning =  !finf.exists();
    setIcon(SmallIcon( "ko24" )  );
    mBlockAtStartup = true;
    mFlagKeyPressed = false;
    setCaption("KOrganizer/Pi");
    KOPrefs *p = KOPrefs::instance();
    KPimGlobalPrefs::instance()->setGlobalConfig();
    if ( p->mHourSize >  18 )
        p->mHourSize = 18;
    QMainWindow::ToolBarDock tbd;
    if ( p->mToolBarHor ) {
        if ( p->mToolBarUp )
            tbd = Bottom;
        else
            tbd = Top;
    }
    else {
        if ( p->mToolBarUp )
            tbd = Right;
        else
            tbd = Left;
    }
    if ( KOPrefs::instance()->mUseAppColors )
        QApplication::setPalette( QPalette (KOPrefs::instance()->mAppColor1, KOPrefs::instance()->mAppColor2), true );
    globalFlagBlockStartup = 1;
    iconToolBar = new QPEToolBar( this );
    addToolBar (iconToolBar , tbd );
    mCalendarModifiedFlag = false;
    QLabel* splash  = new QLabel(i18n("KO/Pi is starting ... "), this );
    splash->setAlignment ( AlignCenter );
    setCentralWidget( splash );
 #ifndef DESKTOP_VERSION
    showMaximized();
 #endif
    //qDebug("Mainwidget x %d y %d w %d  h %d",  x(), y(), width(), height ());
    setDefaultPreferences();
    mCalendar = new CalendarLocal();
    mView = new CalendarView( mCalendar, this,"mCalendar " );
    mView->hide();
    //mView->resize(splash->size() );
    initActions(); 
    mSyncManager = new KSyncManager((QWidget*)this, (KSyncInterface*)mView, KSyncManager::KOPI, KOPrefs::instance(), syncMenu);
    mSyncManager->setBlockSave(false);
    mView->setSyncManager(mSyncManager);
 #ifndef DESKTOP_VERSION
    iconToolBar->show();
    qApp->processEvents();
 #endif
    //qDebug("Splashwidget x %d y %d w %d  h %d", splash-> x(), splash->y(), splash->width(),splash-> height ());
    int vh = height() ;
    int vw = width();
    //qDebug("Toolbar hei %d ",iconToolBar->height() );
    if ( iconToolBar->orientation () == Qt:: Horizontal ) {
        vh -=  iconToolBar->height();
    } else {
        vw -= iconToolBar->height();
    }
    //mView->setMaximumSize( splash->size() );
    //mView->resize( splash->size() );
    //qDebug("MainView x %d y %d w %d  h %d",  mView->x(),mView-> y(), mView->width(), mView->height ());
    mView->readSettings();
    bool newFile = false;
    if( !QFile::exists( defaultFileName() ) ) {
        QFileInfo finfo ( defaultFileName() );
        QString oldFile = QDir::convertSeparators(  QDir::homeDirPath()+"/Applications/korganizer/mycalendar.ics");
        qDebug("oldfile %s ", oldFile.latin1());
        QString message = "You are starting KO/Pi for the\nfirst time after updating to a\nversion >= 1.9.1. The location of the\ndefault calendar file has changed.\nA mycalendar.ics file was detected\nat the old location.\nThis file will be loaded now\nand stored at the new location!\n(Config file location has changed, too!)\nPlease read menu Help-What's New!\n";
        finfo.setFile( oldFile );
        if (finfo.exists() ) {
            KMessageBox::information( this, message);
            mView->openCalendar( oldFile );
            qApp->processEvents();
        } else {
            oldFile = QDir::convertSeparators(  QDir::homeDirPath()+"/korganizer/mycalendar.ics");
            finfo.setFile( oldFile );
            if (finfo.exists() ) {
                KMessageBox::information( this, message);
                mView->openCalendar( oldFile );
                qApp->processEvents();
            }
        }
        mView->saveCalendar( defaultFileName() );
        newFile = true;
    }
    QTime neededSaveTime = QDateTime::currentDateTime().time();
    mView->openCalendar( defaultFileName() );
    int msNeeded = neededSaveTime.msecsTo( QDateTime::currentDateTime().time() );
    qDebug("KO: Calendar loading time: %d ms",msNeeded );
-    if ( KOPrefs::instance()->mLanguageChanged ) {
+    if ( KPimGlobalPrefs::instance()->mPreferredLanguage != KOPrefs::instance()->mOldLoadedLanguage ) {
        KOPrefs::instance()->setCategoryDefaults();
        int count = mView->addCategories();
-        KOPrefs::instance()->mLanguageChanged = false;
    }
    processIncidenceSelection( 0 );
    connect( mView, SIGNAL( incidenceSelected( Incidence * ) ),
             SLOT( processIncidenceSelection( Incidence * ) ) );
    connect( mView, SIGNAL( modifiedChanged( bool ) ),
             SLOT( slotModifiedChanged( bool ) ) );
    connect( mView, SIGNAL( tempDisableBR(bool) ),
             SLOT( disableBR(bool) ) );
    connect( &mSaveTimer, SIGNAL( timeout() ), SLOT( save() ) );
    mView->setModified( false );
    mBlockAtStartup = false;
    mView->setModified( false );
    setCentralWidget( mView );
    globalFlagBlockStartup = 0;
    mView->show();
    delete splash;
    if ( newFile )
        mView->updateConfig();
    // qApp->processEvents();
    //qDebug("MainView x %d y %d w %d  h %d",  mView->x(),mView-> y(), mView->width(), mView->height ());
    //fillSyncMenu();
   
    
    connect(mSyncManager , SIGNAL( save() ), this, SLOT( save() ) );
    connect(mSyncManager , SIGNAL( request_file() ), this, SLOT( syncFileRequest() ) );
    connect(mSyncManager , SIGNAL( getFile( bool )), this, SLOT(getFile( bool ) ) );
    mSyncManager->setDefaultFileName( defaultFileName()); 
    connect ( syncMenu, SIGNAL( activated ( int )  ), mSyncManager, SLOT (slotSyncMenu( int ) ) );
    mSyncManager->fillSyncMenu();
    mView->viewManager()->agendaView()->setStartHour( KOPrefs::instance()->mDayBegins  );
    if ( showWarning ) {
        KMessageBox::information( this,
                         "You are starting KO/Pi for the first time.\nPlease read menu: Help-What's New,\nif you did an update!\nPlease choose your timezone in the \nConfigure Dialog TAB Time Zone!\nPlease choose your language\nin the TAB Locale!\nYou get the Configure Dialog\nvia Menu: Actions - Configure....\nClick OK to show the Configure Dialog!\n", "KO/Pi information");
        qApp->processEvents();
        mView->dialogManager()->showSyncOptions();
    }
  //US listen for result adressed from Ka/Pi
 #ifndef DESKTOP_VERSION
  connect(qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & )));
 #endif
 #ifndef DESKTOP_VERSION
    infrared = 0;
 #endif
    
    mBRdisabled = false;
    toggleBeamReceive();
 }
 MainWindow::~MainWindow()
 {
    //qDebug("MainWindow::~MainWindow() ");
    //save toolbar location
    delete mCalendar;
    delete mSyncManager;
 #ifndef DESKTOP_VERSION
    if ( infrared )
        delete infrared;
 #endif
 }
 void MainWindow::disableBR(bool b)
 {
 #ifndef DESKTOP_VERSION
    if ( b ) {
        if ( infrared ) {
            toggleBeamReceive();
            mBRdisabled = true;
        }
        mBRdisabled = true;
    } else {
        if ( mBRdisabled ) {
            mBRdisabled = false;
            //makes no sense,because other cal ap is probably running
            // toggleBeamReceive(); 
        }
    }
 #endif
 }
 bool MainWindow::beamReceiveEnabled()
 {
 #ifndef DESKTOP_VERSION
    return ( infrared != 0 );
 #endif
    return false;
 }
 void MainWindow::toggleBeamReceive()
 {
    if ( mBRdisabled  )
        return;
 #ifndef DESKTOP_VERSION
    if ( infrared ) {
        qDebug("disable BeamReceive ");
        delete infrared;
        infrared = 0;
        brAction->setOn(false);
        return;
    } 
    qDebug("enable BeamReceive ");
    brAction->setOn(true);
    infrared = new QCopChannel("QPE/Application/datebook",this, "channel" ) ;   
    QObject::connect( infrared, SIGNAL (received ( const QCString &, const QByteArray & )),this, SLOT(recieve(  const QCString&, const QByteArray& )));
 #endif
 }
 void MainWindow::showMaximized () 
 {
 #ifndef DESKTOP_VERSION
    if ( ! globalFlagBlockStartup )
        if ( mClosed )
            mView->goToday();
 #endif
    QWidget::showMaximized () ;
    mClosed = false;
 }
 void MainWindow::closeEvent( QCloseEvent* ce )
 {
    if ( ! KOPrefs::instance()->mAskForQuit ) {
        saveOnClose();
        mClosed = true;
        ce->accept();
        return;
    }
    switch( QMessageBox::information( this, "KO/Pi",
                                      i18n("Do you really want\nto close KO/Pi?"),
                                      i18n("Close"), i18n("No"),
                                      0, 0 ) ) {
    case 0:
        saveOnClose();
        mClosed = true;
        ce->accept();
        break;
    case 1:
        ce->ignore();
        break;
    case 2:
    default:
        break;
    }
 }
 void MainWindow::recieve( const QCString& cmsg, const QByteArray& data )
 {
    QDataStream stream( data, IO_ReadOnly );
    // QMessageBox::about( this, "About KOrganizer/Pi", "*" +msg +"*" );
    //QString datamess;
    //qDebug("message ");
    qDebug("KO: QCOP message received: %s ", cmsg.data()  );
 
    if ( cmsg == "setDocument(QString)" ) {
        QDataStream stream( data, IO_ReadOnly );
        QString fileName;
        stream >> fileName;
        //qDebug("filename %s ", fileName.latin1());
        showMaximized();
        raise();
        KOPrefs::instance()->mLastSyncedLocalFile = fileName ;
        mSyncManager->slotSyncMenu( 1002 );
        return;
    }
    if ( cmsg == "-writeFile" ) {
        // I made from the "-writeFile" an "-writeAlarm"
        mView->viewManager()->showWhatsNextView();
        mCalendar->checkAlarmForIncidence( 0, true);
        showMaximized();
        raise();
        return;
    }
    if ( cmsg == "-writeFileSilent" ) {
        // I made from the "-writeFile" an "-writeAlarm"
        // mView->viewManager()->showWhatsNextView();
        mCalendar->checkAlarmForIncidence( 0, true);
        //showMaximized();
        //raise();
        hide();
diff --git a/libkdepim/kpimglobalprefs.cpp b/libkdepim/kpimglobalprefs.cpp
index 0a580ca..5298f0c 100644
--- a/libkdepim/kpimglobalprefs.cpp
+++ b/libkdepim/kpimglobalprefs.cpp
@@ -1,139 +1,207 @@
 /*
    This file is part of libkdepim.
    Copyright (c) 2002 Cornelius Schumacher <schumacher@kde.org>
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
    As a special exception, permission is given to link this program
    with any edition of Qt, and distribute the resulting executable,
    without including the source code for Qt in the source distribution.
 */
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 $Id$
 */
 #include <kglobal.h>
 #include <kconfig.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kstaticdeleter.h>
 #include <qregexp.h>
+#include <qfile.h>
+#include <qtextstream.h>
+#include <qapplication.h>
 #include "kpimglobalprefs.h"
 KPimGlobalPrefs *KPimGlobalPrefs::sInstance = 0;
-static KStaticDeleter<KPimGlobalPrefs> staticDeleter;
+static KStaticDeleter<KPimGlobalPrefs> staticDeleterGP;
 KPimGlobalPrefs::KPimGlobalPrefs( const QString &name )
  : KPrefs("microkdeglobalrc")
 {
+    mLocaleDict = 0;
  KPrefs::setCurrentGroup("Locale");
  addItemInt("PreferredLanguage",&mPreferredLanguage,0);
  addItemInt("PreferredTime",&mPreferredTime,0);
  addItemInt("PreferredDate",&mPreferredDate,0);
  addItemBool("WeekStartsOnSunday",&mWeekStartsOnSunday,false); 
  //addItemBool("QuickSavingWOUnicode",&mUseQuicksave,false); 
  //  addItemBool("ShortDateInViewer",&mShortDateInViewer,false); 
  addItemString("UserDateFormatLong", &mUserDateFormatLong, "%A %d %b %y");
  addItemString("UserDateFormatShort", &mUserDateFormatShort, "%aK %d.%m.%y");
  KPrefs::setCurrentGroup("Time & Date");
  addItemString("TimeZoneName",&mTimeZoneId, ("+01:00 Europe/Oslo(CET)") );
  addItemBool("UseDaylightsaving",&mUseDaylightsaving,true);
  addItemBool("TimeZoneAdd30min",&mTimeZoneAdd30min,false);
  addItemInt("DaylightsavingStart",&mDaylightsavingStart,90);
  addItemInt("DaylightsavingEnd",&mDaylightsavingEnd,304);
  KPrefs::setCurrentGroup( "ExternalApplications" );
  addItemInt( "EmailChannelType", &mEmailClient, OMPI_EMC );
  addItemString( "EmailChannel", &mEmailOtherChannel, "" );
  addItemString( "EmailChannelMessage", &mEmailOtherMessage, "" );
  addItemString( "EmailChannelParameters", &mEmailOtherMessageParameters, "" );
  addItemString( "EmailChannelMessage2", &mEmailOtherMessage2, "" );
  addItemString( "EmailChannelParameters2", &mEmailOtherMessageParameters2, "" );
  addItemInt( "PhoneChannelType", &mPhoneClient, KPPI_PHC );
  addItemString( "PhoneChannel", &mPhoneOtherChannel, "" );
  addItemString( "PhoneChannelMessage", &mPhoneOtherMessage, "" );
  addItemString( "PhoneChannelParameters", &mPhoneOtherMessageParameters, "" );
  addItemInt( "FaxChannelType", &mFaxClient, NONE_FAC );
  addItemString( "FaxChannel", &mFaxOtherChannel, "" );
  addItemString( "FaxChannelMessage", &mFaxOtherMessage, "" );
  addItemString( "FaxChannelParameters", &mFaxOtherMessageParameters, "" );
  addItemInt( "SMSChannelType", &mSMSClient, NONE_SMC );
  addItemString( "SMSChannel", &mSMSOtherChannel, "" );
  addItemString( "SMSChannelMessage", &mSMSOtherMessage, "" );
  addItemString( "SMSChannelParameters", &mSMSOtherMessageParameters, "" );
  addItemInt( "PagerChannelType", &mPagerClient, NONE_PAC );
  addItemString( "PagerChannel", &mPagerOtherChannel, "" );
  addItemString( "PagerChannelMessage", &mPagerOtherMessage, "" );
  addItemString( "PagerChannelParameters", &mPagerOtherMessageParameters, "" );
  addItemInt( "SIPChannelType", &mSipClient, KPPI_SIC );
  addItemString( "SIPChannel", &mSipOtherChannel, "" );
  addItemString( "SIPChannelMessage", &mSipOtherMessage, "" );
  addItemString( "SIPChannelParameters", &mSipOtherMessageParameters, "" );
  KPrefs::setCurrentGroup( "PhoneAccess" );
  addItemString("Ex2PhoneDevice",&mEx2PhoneDevice,"/dev/ircomm");
  addItemString("Ex2PhoneConnection",&mEx2PhoneConnection,"irda");
  addItemString("Ex2PhoneModel",&mEx2PhoneModel,"6310i");
 }
 void KPimGlobalPrefs::setGlobalConfig()
 {
+    if ( mLocaleDict == 0 ) {
+        QString fileName ; 
+        QString name = KGlobal::getAppName() +"/";
+#ifndef DESKTOP_VERSION
+        fileName= QString(getenv("QPEDIR"))+"/pics/kdepim/"+name
+#else
+            fileName  = qApp->applicationDirPath () + "/kdepim/"+ name;
+#endif
+        mLocaleDict = 0;
+        if ( mPreferredLanguage > 0 && mPreferredLanguage < 5 ) {
+         
+            if ( mPreferredLanguage == 1 ) 
+                fileName = fileName+"germantranslation.txt"; 
+            else if ( mPreferredLanguage == 4 ) 
+                fileName = fileName+"usertranslation.txt"; 
+            else if ( mPreferredLanguage == 2 ) 
+                fileName = fileName+"frenchtranslation.txt"; 
+            else if ( mPreferredLanguage == 3 ) 
+                fileName = fileName+"italiantranslation.txt";
+            QFile file( fileName );
+            if (file.open( IO_ReadOnly ) ) {
+                QTextStream ts( &file );
+                ts.setEncoding( QTextStream::Latin1 );
+                //ts.setCodec( QTextCodec::latin1 );
+                QString  text = ts.read();
+                file.close();  
+                text.replace( QRegExp("\\\\n"), "\n" );
+                QString line;
+                QString we;
+                QString wt;
+                int br = 0;
+                int nbr;
+                nbr = text.find ( "},", br );
+                line = text.mid( br, nbr - br );
+                br = nbr+1;
+                int se, ee, st, et;
+                mLocaleDict = new QDict<QString>;
+                QString end = "{ \"\",\"\" }";
+                while ( (line != end) && (br > 1)  ) {
+                    //qDebug("%d *%s* ", br, line.latin1());
+                    se = line.find("\"")+1;
+                    et = line.findRev("\"",-1);
+                    ee = line.find("\",\"");
+                    st = ee+3;
+                    we = line.mid( se, ee-se );
+                    wt = line.mid( st, et-st );
+                    //qDebug("*%s* *%s* ", we.latin1(), wt.latin1());
+                    mLocaleDict->insert( we, new QString (wt) );
+                    nbr = text.find ( "}", br );
+                    line = text.mid( br, nbr - br );
+                    br = nbr+1;
+                }
+                //qDebug("end *%s* ", end.latin1());
+                setLocaleDict( mLocaleDict );
+            } else {
+                qDebug("KO: Cannot find translation file %s",fileName.latin1() );
+            }
+        }
+    }
    KGlobal::locale()->setHore24Format( !mPreferredTime );
    KGlobal::locale()->setWeekStartMonday( !mWeekStartsOnSunday );
    KGlobal::locale()->setIntDateFormat( (KLocale::IntDateFormat)mPreferredDate );
    KGlobal::locale()->setLanguage( mPreferredLanguage );
    QString dummy = mUserDateFormatLong;
    KGlobal::locale()->setDateFormat(dummy.replace( QRegExp("K"), QString(",") ));
    dummy = mUserDateFormatShort;
    KGlobal::locale()->setDateFormatShort(dummy.replace( QRegExp("K"), QString(",") ));
    KGlobal::locale()->setDaylightSaving( mUseDaylightsaving,
                                          mDaylightsavingStart,
                                          mDaylightsavingEnd );
    KGlobal::locale()->setTimezone( mTimeZoneId, mTimeZoneAdd30min );
 }
 KPimGlobalPrefs::~KPimGlobalPrefs()
 { 
+    if (sInstance == this)
+      sInstance = staticDeleterGP.setObject(0); 
+    else
+        qDebug("Whats this? Error in KPimGlobalPrefs::~KPimGlobalPrefs() ?");
    //qDebug("KPimGlobalPrefs::~KPimGlobalPrefs() ");
    writeConfig();
+    if ( mLocaleDict )
+        delete mLocaleDict;
 }
 KPimGlobalPrefs *KPimGlobalPrefs::instance()
 {
  if ( !sInstance ) {
-    sInstance = staticDeleter.setObject( new KPimGlobalPrefs() );
+    sInstance = staticDeleterGP.setObject( new KPimGlobalPrefs() );
    sInstance->readConfig();
  }
  return sInstance;
 }
diff --git a/libkdepim/kpimglobalprefs.h b/libkdepim/kpimglobalprefs.h
index d09c3da..11c534a 100644
--- a/libkdepim/kpimglobalprefs.h
+++ b/libkdepim/kpimglobalprefs.h
@@ -1,140 +1,142 @@
 /*
    This file is part of libkdepim.
    Copyright (c) 2004 Ulf Schenk
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
    As a special exception, permission is given to link this program
    with any edition of Qt, and distribute the resulting executable,
    without including the source code for Qt in the source distribution.
 */
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 $Id$
 */
 #ifndef KPIMGLOBALPREFS_H
 #define KPIMGLOBALPREFS_H
 #include "kprefs.h"
+#include <qdict.h>
 class KPimGlobalPrefs : public KPrefs
 {
  public:
    void setGlobalConfig();
    static KPimGlobalPrefs *instance();
    virtual ~KPimGlobalPrefs();
    enum EMailClients {
      NONE_EMC = 0,
      OTHER_EMC = 1,
      OMPI_EMC = 2,
      QTOPIA_EMC = 3,
      OPIE_EMC = 4
    };
    enum PhoneClients {
      NONE_PHC = 0,
      OTHER_PHC = 1,
      KPPI_PHC = 2
    };
    enum FaxClients {
      NONE_FAC = 0,
      OTHER_FAC = 1
    };
    enum SMSClients {
      NONE_SMC = 0,
      OTHER_SMC = 1
    };
    enum PagerClients {
      NONE_PAC = 0,
      OTHER_PAC = 1
    };
    enum SIPClients {
      NONE_SIC = 0,
      OTHER_SIC = 1,
      KPPI_SIC = 2
    };
  private:
    KPimGlobalPrefs( const QString &name = QString::null );
   static KPimGlobalPrefs *sInstance;
+    QDict<QString> *mLocaleDict;
  public:
    //US I copied the following "locale" settings from KOPrefs 
    int mPreferredDate;
    QString mUserDateFormatLong;
    QString mUserDateFormatShort;
    int mPreferredLanguage;
    int mPreferredTime;
    bool mWeekStartsOnSunday;
    QString mTimeZoneId;
    bool mUseDaylightsaving;
    int mDaylightsavingStart;
    int mDaylightsavingEnd;
    bool mTimeZoneAdd30min;
    int mEmailClient;
    QString mEmailOtherChannel;
    QString mEmailOtherMessage;
    QString mEmailOtherMessageParameters;
    QString mEmailOtherMessage2;
    QString mEmailOtherMessageParameters2;
    int mPhoneClient;
    QString mPhoneOtherChannel;
    QString mPhoneOtherMessage;
    QString mPhoneOtherMessageParameters;
    int mFaxClient;
    QString mFaxOtherChannel;
    QString mFaxOtherMessage;
    QString mFaxOtherMessageParameters;
    int mSMSClient;
    QString mSMSOtherChannel;
    QString mSMSOtherMessage;
    QString mSMSOtherMessageParameters;
    int mPagerClient;
    QString mPagerOtherChannel;
    QString mPagerOtherMessage;
    QString mPagerOtherMessageParameters;
    int mSipClient;
    QString mSipOtherChannel;
    QString mSipOtherMessage;
    QString mSipOtherMessageParameters;
    QString mEx2PhoneDevice;
    QString mEx2PhoneConnection;
    QString mEx2PhoneModel;
 };
 #endif
diff --git a/microkde/kstaticdeleter.h b/microkde/kstaticdeleter.h
index dfd3929..d9c2b72 100644
--- a/microkde/kstaticdeleter.h
+++ b/microkde/kstaticdeleter.h
@@ -1,37 +1,38 @@
 /*
 * This file is part of the KDE Libraries
 * Copyright (C) 2000 Stephan Kulow <coolo@kde.org>
 *               2001 KDE Team
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Library General Public
 * License as published by the Free Software Foundation; either
 * version 2 of the License, or (at your option) any later version.
 *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Library General Public License for more details.
 *
 * You should have received a copy of the GNU Library General Public License
 * along with this library; see the file COPYING.LIB.  If not, write to
 * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 * Boston, MA 02111-1307, USA.
 *
 */
 #ifndef _KSTATIC_DELETER_H_
 #define _KSTATIC_DELETER_H_
 template<class type>
 class KStaticDeleter
 {
  public:
    KStaticDeleter() {};
-    type *setObject( type *obj, bool isArray = false) { _mobj = obj;return obj; }
+    type *setObject( type *obj, bool isArray = false) { _mobj = obj;_isArray = isArray;return obj; }
-    virtual ~KStaticDeleter() {delete _mobj;};
+    virtual ~KStaticDeleter() {if (_isArray) delete[] _mobj; else delete _mobj;};
 private:
    type* _mobj;
+    bool _isArray;
 };
 #endif
diff --git a/pwmanager/pwmanager/pwmprefs.cpp b/pwmanager/pwmanager/pwmprefs.cpp
index fdc34e0..68d5b68 100644
--- a/pwmanager/pwmanager/pwmprefs.cpp
+++ b/pwmanager/pwmanager/pwmprefs.cpp
@@ -1,273 +1,277 @@
 /*
    This file is part of PwManager/Pi
    Copyright (c) 2004 Ulf Schenk
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
    As a special exception, permission is given to link this program
    with any edition of Qt, and distribute the resulting executable,
    without including the source code for Qt in the source distribution.
    $Id$
 */
 #include <kconfig.h>
 #include <klocale.h>
 #include <kstaticdeleter.h>
 #include "pwmprefs.h"
 PWMPrefs *PWMPrefs::sInstance = 0;
-static KStaticDeleter<PWMPrefs> staticDeleter;
+static KStaticDeleter<PWMPrefs> staticDeleterPP;
 PWMPrefs::PWMPrefs()
  : KPimPrefs("pwmanagerrc")
 {
  KPrefs::setCurrentGroup( "Global" );
  addItemString( "autoStart", &mAutoStart, "" );
  addItemString( "browserCommand", &mBrowserCommand, "" );
  addItemString( "xtermCommand", &mXTermCommand, CONF_DEFAULT_XTERMCOMMAND);
  addItemFont( "entryFont", &mEntryFont);
  addItemInt( "pwTimeout", &mPwTimeout, CONF_DEFAULT_PWTIMEOUT );
  addItemInt( "lockTimeout", &mLockTimeout, CONF_DEFAULT_LOCKTIMEOUT );
  addItemInt( "compression", &mCompression, CONF_DEFAULT_COMPRESSION );
  addItemInt("cryptAlgo", &mCryptAlgo, CONF_DEFAULT_CRYPTALGO);
  addItemInt("hashAlgo", &mHashAlgo, CONF_DEFAULT_HASHALGO);
  addItemInt( "filePermissions", &mFilePermissions, CONF_DEFAULT_FILEPERMISSIONS );
  addItemInt( "minimizeLock", &mMinimizeLock, CONF_DEFAULT_MINIMIZELOCK );
  addItemBool( "unlockOnOpen", &mUnlockOnOpen, CONF_DEFAULT_UNLOCKONOPEN );
  addItemBool( "tray", &mTray, CONF_DEFAULT_TRAY );
  addItemBool( "makeFileBackup", &mMakeFileBackup, CONF_DEFAULT_MAKEFILEBACKUP );
  addItemBool( "autostartDeepLocked", &mAutostartDeeplocked, CONF_DEFAULT_AUTOSTART_DEEPL );
  addItemBool( "autoDeepLock", &mAutoDeeplock, CONF_DEFAULT_AUTODEEPLOCK );
  addItemBool( "kwalletEmu", &mKWalletEmu, CONF_DEFAULT_KWALLETEMU );
  addItemBool( "newEntrLockStat", &mNewEntrLockStat, CONF_DEFAULT_NEWENTRLOCKSTAT );
  KPrefs::setCurrentGroup( "Wnd" );
  addItemSize( "MainWndSize", &mMainWndSize);
  addItemInt( "MainViewStyle", &mMainViewStyle, CONF_DEFAULT_MAINVIEWSTYLE );
  addItemBool( "autoMinimizeOnStart", &mAutoMinimizeOnStart, CONF_DEFAULT_AUTOMINIMIZE );
  addItemBool( "close", &mClose, CONF_DEFAULT_WNDCLOSE );
  addItemIntList( "commentSplitter", &mCommentSplitter );
  addItemIntList( "categorySplitter", &mCategorySplitter );
 }
 PWMPrefs::~PWMPrefs()
-{
+{  
+    if (sInstance == this)
+        sInstance = staticDeleterPP.setObject(0); 
+    else
+        qDebug("Whats this? Error in PWMPrefs::~PWMPrefs()?");
 }
 PWMPrefs *PWMPrefs::instance()
 {
  if ( !sInstance ) {
 #ifdef PWM_EMBEDDED
-    sInstance = staticDeleter.setObject( new PWMPrefs() );
+    sInstance = staticDeleterPP.setObject( new PWMPrefs() );
 #else  //PWM_EMBEDDED
    //US the following line has changed ???. Why
-    staticDeleter.setObject( sInstance, new PWMPrefs() );
+    staticDeleterPP.setObject( sInstance, new PWMPrefs() );
 #endif //KAB_EMBEDDED
    sInstance->readConfig();
  }
  return sInstance;
 }
    // US introduce a nonconst way to return the config object.
 KConfig* PWMPrefs::getConfig()
 {
    return config();
 }
 /*******************************************************************
 *  functions for reading the configuration settings
 *******************************************************************/
 QString PWMPrefs::confGlobAutoStart()
 {
  return mAutoStart;
 }
 QString PWMPrefs::confGlobBrowserCommand()
 {
  return mBrowserCommand;
 }
 QString PWMPrefs::confGlobXtermCommand()
 {
  return mXTermCommand;
 }
 QFont PWMPrefs::confGlobEntryFont()
 {
  return mEntryFont;
 }
 int PWMPrefs::confGlobPwTimeout()
 {
  return mPwTimeout;
 }
 int PWMPrefs::confGlobLockTimeout()
 {
  return mLockTimeout;
 }
 int PWMPrefs::confGlobCompression()
 {
  return mCompression;
 }
 int PWMPrefs::confGlobFilePermissions()
 {
  return mFilePermissions;
 }
 int PWMPrefs::confGlobMinimizeLock()
 {
  return mMinimizeLock;
 }
 bool PWMPrefs::confGlobUnlockOnOpen()
 {
  return mUnlockOnOpen;
 }
 bool PWMPrefs::confGlobTray()
 {
  return mTray;
 }
 bool PWMPrefs::confGlobMakeFileBackup()
 {
  return mMakeFileBackup;
 }
 bool PWMPrefs::confGlobAutostartDeepLocked()
 {
  return mAutostartDeeplocked;
 }
 bool PWMPrefs::confGlobAutoDeepLock()
 {
  return mAutoDeeplock;
 }
 bool PWMPrefs::confGlobKwalletEmu()
 {
  return mKWalletEmu;
 }
 bool PWMPrefs::confGlobNewEntrLockStat()
 {
  return mNewEntrLockStat;
 }
 QSize PWMPrefs::confWndMainWndSize()
 {
  return mMainWndSize;
 }
 int PWMPrefs::confWndMainViewStyle()
 {
  return mMainViewStyle;
 }
 bool PWMPrefs::confWndAutoMinimizeOnStart()
 {
  return mAutoMinimizeOnStart;
 }
 bool PWMPrefs::confWndClose()
 {
  return mClose;
 }
 int PWMPrefs::confGlobCryptAlgo()
 {
  return mCryptAlgo + 1;
 }
 int PWMPrefs::confGlobHashAlgo()
 {
  return mHashAlgo + 1;
 }
 /*******************************************************************
 *  functions for writing the configuration settings
 *******************************************************************/
 void PWMPrefs::confGlobAutoStart(const QString &e)
 {
  mAutoStart = e;
 }
 void PWMPrefs::confGlobBrowserCommand(const QString &e)
 {
  mBrowserCommand = e;
 }
 void PWMPrefs::confGlobXtermCommand(const QString &e)
 {
  mXTermCommand = e;
 }
 void PWMPrefs::confGlobEntryFont(const QFont &e)
 {
  mEntryFont = e;
 }
 void PWMPrefs::confGlobPwTimeout(int e)
 {
  mPwTimeout = e;
 }
 void PWMPrefs::confGlobLockTimeout(int e)
 {
  mLockTimeout = e;
 }
 void PWMPrefs::confGlobCompression(int e)
 {
  mCompression = e;
 }
 void PWMPrefs::confGlobFilePermissions(int e)
 {
  mFilePermissions = e;
 }
 void PWMPrefs::confGlobMinimizeLock(int e)
 {
  mMinimizeLock = e;
 }
 void PWMPrefs::confGlobUnlockOnOpen(bool e)
 {
  mUnlockOnOpen = e;
 }
 void PWMPrefs::confGlobTray(bool e)
 {
  mTray = e;
 }
 void PWMPrefs::confGlobMakeFileBackup(bool e)
 {
  mMakeFileBackup = e;
 }
 void PWMPrefs::confGlobAutostartDeepLocked(bool e)