author | zautrix <zautrix> | 2004-08-06 16:50:03 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-08-06 16:50:03 (UTC) |
commit | 02963edb373e263bd50ab431633ea66adf32a4aa (patch) (side-by-side diff) | |
tree | 3affe8b9605f31e2a85c1c9c6cf4dfb9ab386394 /korganizer | |
parent | 55a7ffaccca40d10932c98527a34cc6cc9c89afb (diff) | |
download | kdepimpi-02963edb373e263bd50ab431633ea66adf32a4aa.zip kdepimpi-02963edb373e263bd50ab431633ea66adf32a4aa.tar.gz kdepimpi-02963edb373e263bd50ab431633ea66adf32a4aa.tar.bz2 |
Fixed translation problem
-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 @@ -405,5 +405,9 @@ 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 ); @@ -414,3 +418,3 @@ void KOPrefs::usrReadConfig() file.close(); - + text.replace( QRegExp("\\\\n"), "\n" ); QString line; @@ -444,5 +448,6 @@ void KOPrefs::usrReadConfig() } 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 @@ -165,3 +165,3 @@ void KOPrefsDialog::setupLocaleTab() syncPrefsGroup->addRadio(i18n("German")); - syncPrefsGroup->addRadio(i18n("French(nyi)")); + syncPrefsGroup->addRadio(i18n("French")); syncPrefsGroup->addRadio(i18n("User defined (usertranslation.txt)")); @@ -1585,3 +1585,3 @@ void KOPrefsDialog::setupTimeZoneTab() ++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); diff --git a/korganizer/wordsgerman.h b/korganizer/wordsgerman.h index 8310f2f..6fd347c 100644 --- a/korganizer/wordsgerman.h +++ b/korganizer/wordsgerman.h @@ -454,3 +454,3 @@ { "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." }, @@ -567,3 +567,3 @@ { "day","Tag" }, -{ "French(nyi)","Französich (noch nicht implementiert)" }, +{ "French","Französich" }, { "Time","Zeit" }, |