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
@@ -456,33 +456,33 @@
 { "Weekly","Hebdomadaire" },
 { "Week starts on Sunday","La semaine commence Dim." },
 { "What's Next View:","Vue "A venir..." " },
 { "What's Next ?","A venir..." },
 { "Working Hours","Horaires de travail" },
 { "Working hours color:","Couleur des heures de travail:" },
 { "Write back existing entries only","Ne réécrire que les objets existants" },
 { "Write back synced file","Ne réécrire que les objets synchronisés" },
 { "Yearly","Annuel" },
 { "year(s)","année(s)" },
 { "Yes","Oui" },
 { "You have %d item(s) selected.\n","%d Objets sélectionnés.\n" },
 { "You have to restart KOrganizer for this setting to take effect.","Vous devez redémarrer KO/Pi pour que ces modifications prennent effet." },
 { "week(s) on:","Semaine(s) le: " },
 { "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:" },
 { "Daylight end:","Heure d'hiver à partir:" },
 { "Time Zone","Heure de" },
 { "Monday 19 April 2004: %A %d %B %Y","Lundi 19 Avril 2004: %A %d %B %Y" },
 { "%A: Monday --- %a: Mon","%A: Lundi --- %a: Lun" },
 { "minutely","par min" },
 { "hourly","horaire" },
 { "daily","quotidien" },
 { "weekly","hebdomadaire" },
 { "monthly","mensuel" },
 { "day-monthly","jour-mois" },
 { "month-yearly","mois-année" },
 { "day-yearly","jour-année" },
 { "position-yearly","pos-annuel" },
 { "Edit item on doubleclick (if not, show)","Double-cliquer pour éditer (sinon, pour voir)" },
@@ -572,33 +572,33 @@
 { " With timezone "," Avec zone " },
 { " Local time ",  " Heure locale " },
 { "Manage new Categories","Gérer les nlles Catégories" },
 { "Add to category list","Ajouter à la liste" },
 { "Remove from Events/Todos","Supprimer des Evénements/Tâches" },
 { "After importing/loading/syncing\nthere may be new categories in\nevents or todos\nwhich are not in the category list.\nPlease choose what to do:\n ","Lors de l'Import/Chargement/Synchron\nil peut y avoir des nouvelles Catégories\ndans les événements et les tâches\nQue faire?\n " },
 { "New categories not in list:","Nouvelles catégories qui ne sont pas dans la liste:" },
 { "File format","Format date" },
 { "Time format","Format heure" },
 { "Delete all\ncompleted To-Dos?","Effacer les\Tâches?" },
 { "KO/Pi:Saving Data to File ...","KO/Pi: Enregistrement ..." },
 { "KO/Pi:File Saved. Needed %d sec, %d ms","KO/Pi: Fichier enreg en %d sec %d ms" },
 { "h","h" },
 { "min","Min" },
 { "hou","h" },
 { "day","Jour" },
-{ "French(nyi)","Français (bientôt implémenté)" },
+{ "French","Français" },
 { "Time","Heure" },
 { "Event Viewer","Visualisation" },
 { "Cancel Sync","Annuler Synchro" },
 { "Remote","Distant" },
 { "Local","Local" },
 { "Conflict! Please choose entry","Conflit! Chosissez un objet" },
 { "Local: ","Local: " },
 { "Remote: ","Distant: " },
 { "Last modified: ","Dernier modifié: " },
 { "Location: ","Lieu: " },
 { "<p><b>From:</b> %1 </p><p><b>To:</b> %2</p>","<p><b>De:</b> %1 </p><p><b>à:</b> %2</p>" },
 { "<p><b>On:</b> %1</p>","<p><b>le:</b> %1</p>" },
 { "<p><b>From:</b> %1</p> ","<p><b>de:</b> %1</p> " },
 { "<p><b>To:</b> %1</p>","<p><b>à:</b> %1</p>" },
 { "<p><b>On:</b> %1</p> ","<p><b>à:</b> %1</p> " },
 { "<p><b>From:</b> %1 <b>To:</b> %2</p>","<p><b>de:</b> %1 <b>à:</b> %2</p>" },
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
@@ -439,33 +439,33 @@
 { "Weekly","Wöchentlich" },
 { "Week starts on Sunday","Woche beginnt Sonntags" },
 { "What's Next View:","What's Next Anz." },
 { "What's next ?","Was kommt als nächstes?(What's Next)" },
 { "Working Hours","Tägliche Arbeitszeit" },
 { "Working hours color:","Arbeitszeit in der Agenda Ansicht:" },
 { "Write back existing entries only","Nur exisitierende Einträge zurückschreiben" },
 { "Write back synced file","Syncronisierte Datei zurückschreiben" },
 { "Yearly","Jährlich" },
 { "year(s)","Jahr(e)" },
 { "Yes","Ja" },
 { "You have %d item(s) selected.\n","Sie haben %d Einträge ausgewählt.\n" },
 { "You have to restart KOrganizer for this setting to take effect.","Sie müssem Korganizer neu starten, damit diese Einstellung aktiviert wird." },
 { "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:" },
 { "Time Zone","Zeitzone" },
 { "Monday 19 April 2004: %A %d %B %Y","Montag 19 April 2004: %A %d %B %Y" },
 { "%A: Monday --- %a: Mon","%A: Montag --- %a: Mon" },
 { "minutely","minütlich" },
 { "hourly","stündlich" },
 { "daily","täglich" },
 { "weekly","wöchentlich" },
 { "monthly","monatlich" },
 { "day-monthly","tag-monatlich" },
 { "month-yearly","monat-jährlich" },
 { "day-yearly","tag-jährlich" },
 { "position-yearly","pos-jährlich" },
 { "Edit item on doubleclick (if not, show)","Editiere mit Doppelklick(wenn nicht, zeige)" },
@@ -804,28 +804,46 @@
 { "Proc.Al.: ","Proc.Al.: " },
 { "No sound set","Kein Sound definiert" },
 { "*.wav|Wav Files","*.wav|Wav Dateien" },
 { "No program set","Kein Programm definiert" },
 { "Running '%1'","Ausführen '%1'" },
 { "Playing '%1'","Abspielen '%1'" },
 { "Show Sync Events in WN/Agenda view","Zeige Sync Events in WN/Agenda Ansicht" },
 { "User defined (usertranslation.txt)","Benutzerdefiniert (usertranslation.txt)" },
 { "Load!","Laden!" },
 { "Backup file from:\n%1\nLoading  backup\nfile will delete\nyour current Data!\n","Backup Datei vom:\n%1\nDas Laden der Backup Datei\nlöscht die aktuellen Daten!\n" },
 { "KO/Pi Features and hints","KO/Pi Eigenschaften und Tipps" },
 { "KO/Pi User translation HowTo","KO/Pi Benutzer-Übersetzung HowTo" },
 { "KO/Pi Synchronization HowTo","KO/Pi Synchronisation HowTo" },
 { "Features + hints...","Eigenschaften + Tipps..." },
 { "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
@@ -390,74 +390,79 @@ QStringList KOPrefs::getDefaultList()
 void KOPrefs::usrReadConfig()
 {
    mLocaleDict = 0;
    // pending LR fix translation
    // qDebug("KOPrefs::usrReadConfig() fix translation ");
     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 );
-    }
-    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;
             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 usertranslation.txt");
+            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")
                          << i18n("Germany") << i18n("Sweden") << i18n("Forest") << i18n("Desert") << i18n("Kitchen") ;
        // << i18n("") << i18n("") << i18n("") << i18n("") << i18n("") << i18n("") << i18n("") << i18n("")
        mLocationDefaults.sort();
     }
        
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index da6644f..5ba4817 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -150,33 +150,33 @@ QFrame *topFrame = addPage(i18n("Date Format"),0,0);
    topLayout->addMultiCellWidget(lab ,iii,iii,0,1);
    ++iii;
 
 }
 
 void  KOPrefsDialog::setupLocaleTab()
 {
  QFrame *topFrame = addPage(i18n("Locale"),0,0);
    QGridLayout *topLayout = new QGridLayout(topFrame,4,2);
    topLayout->setSpacing(spacingHint());
    topLayout->setMargin(marginHint());  
    int iii = 0;
  KPrefsWidRadios *syncPrefsGroup =
       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);
    topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1);
    ++iii;   
  
    syncPrefsGroup =
        addWidRadios(i18n("Time Format(nr):"),&(KOPrefs::instance()->mPreferredTime),topFrame);
    if (  QApplication::desktop()->width() >  300   )
        syncPrefsGroup->groupBox()-> setOrientation (Qt::Vertical);
    syncPrefsGroup->addRadio(i18n("24:00"));
    syncPrefsGroup->addRadio(i18n("12:00am"));
    syncPrefsGroup->groupBox()-> setOrientation (Qt::Vertical);
    topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1);
    ++iii;   
    KPrefsWidBool *sb;
@@ -1570,33 +1570,33 @@ void KOPrefsDialog::setupTimeZoneTab()
   int nCurrentlySet = 11;
   for (int i = 0; i < mTimeZoneCombo->count(); i++)
     {
       if (mTimeZoneCombo->text(i) == sCurrentlySet)
         {
          nCurrentlySet = i;
          break;
         }
     }
   mTimeZoneCombo->setCurrentItem(nCurrentlySet);
   int iii = 1;
   KPrefsWidBool *sb =
       addWidBool(i18n("Timezone has daylight saving"),
                  &(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 );
   topLayout->addMultiCellWidget(lab, iii,iii,0,1);
   ++iii; 
   lab = new QLabel(  i18n("Daylight start:"), topFrame );
   topLayout->addWidget(lab, iii,0);
   mStartDateSavingEdit = new KDateEdit(topFrame);
   topLayout->addWidget(mStartDateSavingEdit, iii,1);
   ++iii;
 
   lab = new QLabel(  i18n("Daylight end:"), topFrame );
   topLayout->addWidget(lab, iii,0);
   mEndDateSavingEdit = new KDateEdit(topFrame);
   topLayout->addWidget(mEndDateSavingEdit, iii,1);
   ++iii;
diff --git a/korganizer/wordsgerman.h b/korganizer/wordsgerman.h
index 8310f2f..6fd347c 100644
--- a/korganizer/wordsgerman.h
+++ b/korganizer/wordsgerman.h
@@ -439,33 +439,33 @@
 { "Weekly","Wöchentlich" },
 { "Week starts on Sunday","Woche beginnt Sonntags" },
 { "What's Next View:","What's Next Anz." },
 { "What's next ?","Was kommt als nächstes?(What's Next)" },
 { "Working Hours","Tägliche Arbeitszeit" },
 { "Working hours color:","Arbeitszeit in der Agenda Ansicht:" },
 { "Write back existing entries only","Nur exisitierende Einträge zurückschreiben" },
 { "Write back synced file","Syncronisierte Datei zurückschreiben" },
 { "Yearly","Jährlich" },
 { "year(s)","Jahr(e)" },
 { "Yes","Ja" },
 { "You have %d item(s) selected.\n","Sie haben %d Einträge ausgewählt.\n" },
 { "You have to restart KOrganizer for this setting to take effect.","Sie müssem Korganizer neu starten, damit diese Einstellung aktiviert wird." },
 { "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:" },
 { "Time Zone","Zeitzone" },
 { "Monday 19 April 2004: %A %d %B %Y","Montag 19 April 2004: %A %d %B %Y" },
 { "%A: Monday --- %a: Mon","%A: Montag --- %a: Mon" },
 { "minutely","minütlich" },
 { "hourly","stündlich" },
 { "daily","täglich" },
 { "weekly","wöchentlich" },
 { "monthly","monatlich" },
 { "day-monthly","tag-monatlich" },
 { "month-yearly","monat-jährlich" },
 { "day-yearly","tag-jährlich" },
 { "position-yearly","pos-jährlich" },
 { "Edit item on doubleclick (if not, show)","Editiere mit Doppelklick(wenn nicht, zeige)" },
@@ -552,33 +552,33 @@
 { " With timezone "," Mit Zeitzone " },
 { " Local time ",  " Lokale Zeit " },
 { "Manage new Categories","Verwalte neue Kategorien" },
 { "Add to category list","Füge zur Kategorieliste hinzu" },
 { "Remove from Events/Todos","Entferne von Terminen/Todos" },
 { "After importing/loading/syncing\nthere may be new categories in\nevents or todos\nwhich are not in the category list.\nPlease choose what to do:\n ","Nach dem Importieren/Laden/Syncen\nkann es neue Kategorien in den \nTerminen oder Todos geben, die nicht\nin der Kategorieliste enthalten sind.\nBitte wählen Sie, was passieren soll:\n " },
 { "New categories not in list:","Kategorien, die nicht in der Liste sind:" },
 { "File format","Datei Format" },
 { "Time format","Zeit Format" },
 { "Delete all\ncompleted To-Dos?","Lösche alle\nerledigten To-Dos?" },
 { "KO/Pi:Saving Data to File ...","KO/Pi: Speichere Kalender in Datei ..." },
 { "KO/Pi:File Saved. Needed %d sec, %d ms","KO/Pi: Abgespeichert in %d sec, %d ms" },
 { "h","Std" },
 { "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" },
 { "Remote","Fern" },
 { "Local","Lokal" },
 { "Conflict! Please choose entry","Konflikt! Bitte Eintrag wählen" },
 { "Local: ","Lokal: " },
 { "Remote: ","Fern: " },
 { "Last modified: ","Zuletzt geändert: " },
 { "Location: ","Ort: " },
 { "<p><b>From:</b> %1 </p><p><b>To:</b> %2</p>","<p><b>Von:</b> %1 </p><p><b>Bis:</b> %2</p>" },
 { "<p><b>On:</b> %1</p>","<p><b>Am:</b> %1</p>" },
 { "<p><b>From:</b> %1</p> ","<p><b>Von:</b> %1</p> " },
 { "<p><b>To:</b> %1</p>","<p><b>Bis:</b> %1</p>" },
 { "<p><b>On:</b> %1</p> ","<p><b>Am:</b> %1</p> " },
 { "<p><b>From:</b> %1 <b>To:</b> %2</p>","<p><b>Von:</b> %1 <b>Bis:</b> %2</p>" },