Fixed translation problem

5 files changed, 36 insertions, 13 deletions

diff --git a/bin/kdepim/korganizer/frenchtranslation.txt b/bin/kdepim/korganizer/frenchtranslation.txt
index 56ac2ce..22eede5 100644
--- a/bin/kdepim/korganizer/frenchtranslation.txt
+++ b/bin/kdepim/korganizer/frenchtranslation.txt
@@ -470,5 +470,5 @@
 { "Full menu bar(nr)","Barre menu complète" },
 { "Timezone has daylight saving","Utilisation heure d'été" },
-{ "Actual start/end is the\nsunday before this date.","Date de départ est le\ndimanche précédent." },
+{ "Actual start and end is the\nsunday before this date.","Date de départ est le\ndimanche précédent." },
 { "The year in the date is ignored.","L'année de cette date est ignorée." },
 { "Daylight start:","Heure d'été à partir:" },
@@ -586,5 +586,5 @@
 { "hou","h" },
 { "day","Jour" },
-{ "French(nyi)","Français (bientôt implémenté)" },
+{ "French","Français" },
 { "Time","Heure" },
 { "Event Viewer","Visualisation" },
diff --git a/bin/kdepim/korganizer/usertranslation.txt b/bin/kdepim/korganizer/usertranslation.txt
index 4c6414b..c9107e2 100644
--- a/bin/kdepim/korganizer/usertranslation.txt
+++ b/bin/kdepim/korganizer/usertranslation.txt
@@ -453,5 +453,5 @@
 { "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:" },
@@ -818,4 +818,22 @@
 { "User translation...","Benutzer Übersetzung..." },
 { "Sync HowTo...","Synchronisation HowTo..." },
+{ "Print calendar...","Drucke Kalender..." },
+{ "Anniversary","Jahrestag" },
+{ "When importing birthdays twice\nduplicated events will be ignored,\nif the event has not been\nchanged in KO/Pi!\n","Wenn Geburtstage mehrfach importiert\nwerden, werden doppelte Einträge ignoriert\nwenn sie nicht verändert wurden.\n" },
+{ "Import Birthdays (KA/Pi)","Importiere Geburtstage (KA/Pi)" },
+{ "Next recurrence is on: ","Nächste Wiederholung ist am:" },
+{ "<b>Alarm on:  </b>","<b>Alarm am:  </b>" },
+{ "<b>Access: </b>","<b>Zugriff: </b>" },
+{ "(%1 min before)","(%1 min vorher)" },
+{ "<b>Categories: </b>","<b>Kategorien: </b>" },
+{ "Save Journal/Description...","Speichere Journal/Details..." },
+{ "This saves the text/details of selected\nJournals and Events/Todos\nto a text file.","Das speichert den Text bzw.\ndie Details von selektierten\nJournalen und Events/Todos\nin eine Textdatei." },
+{ "Continue","Weitermachen" },
+{ " birthdays/anniversaries added!"," Geburts-/Jahrestage hinzugefügt" },
+{ "Attendee:","Teilnehmer:" },
+{ "Click OK to search ->","Klicke zum Suchen auf OK ->" },
+{ "On day ","Am Tag " },
+{ "%1 of ","%1 des Monats" },
+{ "%1 of the year","%1 des Jahres" },
 { "","" },
 { "","" },
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index f3231ff..042046e 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -404,7 +404,11 @@ 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 ) ) {
@@ -413,5 +417,5 @@ void KOPrefs::usrReadConfig()
             QString  text = ts.read();
             file.close();  
-
+            text.replace( QRegExp("\\\\n"), "\n" );
             QString line;
             QString we;
@@ -443,7 +447,8 @@ 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
@@ -164,5 +164,5 @@ void  KOPrefsDialog::setupLocaleTab()
    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   ) 
@@ -1584,5 +1584,5 @@ void KOPrefsDialog::setupTimeZoneTab()
   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;   
diff --git a/korganizer/wordsgerman.h b/korganizer/wordsgerman.h
index 8310f2f..6fd347c 100644
--- a/korganizer/wordsgerman.h
+++ b/korganizer/wordsgerman.h
@@ -453,5 +453,5 @@
 { "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:" },
@@ -566,5 +566,5 @@
 { "hou","Std" },
 { "day","Tag" },
-{ "French(nyi)","Französich (noch nicht implementiert)" },
+{ "French","Französich" },
 { "Time","Zeit" },
 { "Event Viewer","Termin Ansicht" },