From 02963edb373e263bd50ab431633ea66adf32a4aa Mon Sep 17 00:00:00 2001 From: zautrix Date: Fri, 06 Aug 2004 16:50:03 +0000 Subject: Fixed translation problem --- 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 @@ -469,7 +469,7 @@ { "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:" }, @@ -585,7 +585,7 @@ { "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" }, 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 @@ -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:" }, @@ -817,6 +817,24 @@ { "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:" }, +{ "Alarm on: ","Alarm am: " }, +{ "Access: ","Zugriff: " }, +{ "(%1 min before)","(%1 min vorher)" }, +{ "Categories: ","Kategorien: " }, +{ "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 @@ -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,9 +446,10 @@ 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"); mCustomCategories = config()->readListEntry("Custom Categories"); 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" }, -- cgit v0.9.0.2