1 files changed, 6 insertions, 4 deletions

diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index 0db8e6d..dd978bf 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -388,16 +388,17 @@ QStringList KOPrefs::getDefaultList()
     return retval; 
 }
 
 void KOPrefs::usrReadConfig()
 {
    mLocaleDict = 0;
    // pending LR fix translation
    // qDebug("KOPrefs::usrReadConfig() fix translation ");
+    if ( mPreferredLanguage > 0 && mPreferredLanguage < 4 ) {
     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];
@@ -405,21 +406,21 @@ void KOPrefs::usrReadConfig()
         
         setLocaleDict( mLocaleDict );
     } else {
         QString fileName ;
         if ( mPreferredLanguage == 3 ) 
             fileName = MainWindow::resourcePath()+"usertranslation.txt"; 
         else if ( mPreferredLanguage == 2 ) 
             fileName = MainWindow::resourcePath()+"frenchtranslation.txt"; 
-        else return;
         QFile file( fileName );
         if (file.open( IO_ReadOnly ) ) {
             QTextStream ts( &file );
-            ts.setCodec( QTextCodec::codecForLocale() );
+                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;
@@ -446,27 +447,28 @@ void KOPrefs::usrReadConfig()
             //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 ) {
         mLocationDefaults.clear();
         mEventSummaryUser.clear();
         mTodoSummaryUser.clear();
     }
    if (mLocationDefaults.isEmpty()) {
-       mLocationDefaults << i18n("Home") << i18n("Office") << i18n("Libary") << i18n("School") << i18n("Doctor") << i18n("Beach") 
-                         << i18n("University") << i18n("Restaurant")  << i18n("Bar") << i18n("Conference room") << i18n("Cinema")  << i18n("Lake") << i18n("Kindergarden")
+       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() ;
     }