| -rw-r--r-- | korganizer/koprefs.cpp | 17 | ||||
| -rw-r--r-- | korganizer/koprefsdialog.cpp | 4 | ||||
| -rw-r--r-- | korganizer/wordsgerman.h | 4 |
3 files changed, 15 insertions, 10 deletions
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp index f3231ff..042046e 100644 --- a/korganizer/koprefs.cpp +++ b/korganizer/koprefs.cpp @@ -400,22 +400,26 @@ void KOPrefs::usrReadConfig() 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 ); @@ -439,15 +443,16 @@ void KOPrefs::usrReadConfig() 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(); diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp index da6644f..5ba4817 100644 --- a/korganizer/koprefsdialog.cpp +++ b/korganizer/koprefsdialog.cpp @@ -160,13 +160,13 @@ void KOPrefsDialog::setupLocaleTab() 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; @@ -1580,13 +1580,13 @@ void KOPrefsDialog::setupTimeZoneTab() 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 ); diff --git a/korganizer/wordsgerman.h b/korganizer/wordsgerman.h index 8310f2f..6fd347c 100644 --- a/korganizer/wordsgerman.h +++ b/korganizer/wordsgerman.h @@ -449,13 +449,13 @@ { "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" }, @@ -562,13 +562,13 @@ { "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" }, |