Fixed translation problem

3 files changed, 14 insertions, 9 deletions

diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index f3231ff..042046e 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -403,16 +403,20 @@ void KOPrefs::usrReadConfig()
         }
         
         setLocaleDict( mLocaleDict );
-    }
-    if ( mPreferredLanguage == 3 ) {
-        QString fileName = MainWindow::resourcePath()+"usertranslation.txt"; 
+    } 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() );
             QString  text = ts.read();
             file.close();  
-
+            text.replace( QRegExp("\\\\n"), "\n" );
             QString line;
             QString we;
             QString wt;
@@ -442,8 +446,9 @@ void KOPrefs::usrReadConfig()
 
             setLocaleDict( mLocaleDict );
         } else {
-            qDebug("KO: Cannot find translation file usertranslation.txt");
+            qDebug("KO: Cannot find translation file %s",fileName.latin1() );
         }
+    
     }
     config()->setGroup("General");
     
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index da6644f..5ba4817 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -163,7 +163,7 @@ void  KOPrefsDialog::setupLocaleTab()
       addWidRadios(i18n("Language:(needs restart)"),&(KOPrefs::instance()->mPreferredLanguage),topFrame);
    syncPrefsGroup->addRadio(i18n("English"));
    syncPrefsGroup->addRadio(i18n("German")); 
-   syncPrefsGroup->addRadio(i18n("French(nyi)")); 
+   syncPrefsGroup->addRadio(i18n("French")); 
    syncPrefsGroup->addRadio(i18n("User defined (usertranslation.txt)")); 
    if (  QApplication::desktop()->width() <  300   ) 
        ;//   syncPrefsGroup->groupBox()-> setOrientation (Qt::Vertical);
@@ -1583,7 +1583,7 @@ void KOPrefsDialog::setupTimeZoneTab()
                  &(KOPrefs::instance()->mUseDaylightsaving),topFrame);
   topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1);
   ++iii;  
-  QLabel* lab = new QLabel(  i18n("Actual start/end is the\nsunday before this date."), topFrame );
+  QLabel* lab = new QLabel(  i18n("Actual start and end is the\nsunday before this date."), topFrame );
   topLayout->addMultiCellWidget(lab, iii,iii,0,1);
   ++iii;   
   lab = new QLabel(  i18n("The year in the date is ignored."), topFrame );
diff --git a/korganizer/wordsgerman.h b/korganizer/wordsgerman.h
index 8310f2f..6fd347c 100644
--- a/korganizer/wordsgerman.h
+++ b/korganizer/wordsgerman.h
@@ -452,7 +452,7 @@
 { "week(s) on:","Woche(n) am: " },
 { "Full menu bar(nr)","Volle Menuleiste(bn)" },
 { "Timezone has daylight saving","Zeitzone hat Sommerzeit" },
-{ "Actual start/end is the\nsunday before this date.","Tatsächlicher Beginn/Ende ist der Sonntag\nvor diesem Datum!" },
+{ "Actual start and end is the\nsunday before this date.","Tatsächlicher Beginn/Ende ist der Sonntag\nvor diesem Datum!" },
 { "The year in the date is ignored.","Das Jahr vom Datum wird ignoriert." },
 { "Daylight start:","Sommerzeit Beginn:" },
 { "Daylight end:","Sommerzeit Ende:" },
@@ -565,7 +565,7 @@
 { "min","Min" },
 { "hou","Std" },
 { "day","Tag" },
-{ "French(nyi)","Französich (noch nicht implementiert)" },
+{ "French","Französich" },
 { "Time","Zeit" },
 { "Event Viewer","Termin Ansicht" },
 { "Cancel Sync","Sync Abbrechen" },