summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/korganizer/frenchtranslation.txt4
-rw-r--r--bin/kdepim/korganizer/usertranslation.txt20
-rw-r--r--korganizer/koprefs.cpp17
-rw-r--r--korganizer/koprefsdialog.cpp4
-rw-r--r--korganizer/wordsgerman.h4
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
@@ -468,9 +468,9 @@
468{ "You have to restart KOrganizer for this setting to take effect.","Vous devez redémarrer KO/Pi pour que ces modifications prennent effet." }, 468{ "You have to restart KOrganizer for this setting to take effect.","Vous devez redémarrer KO/Pi pour que ces modifications prennent effet." },
469{ "week(s) on:","Semaine(s) le: " }, 469{ "week(s) on:","Semaine(s) le: " },
470{ "Full menu bar(nr)","Barre menu complète" }, 470{ "Full menu bar(nr)","Barre menu complète" },
471{ "Timezone has daylight saving","Utilisation heure d'été" }, 471{ "Timezone has daylight saving","Utilisation heure d'été" },
472{ "Actual start/end is the\nsunday before this date.","Date de départ est le\ndimanche précédent." }, 472{ "Actual start and end is the\nsunday before this date.","Date de départ est le\ndimanche précédent." },
473{ "The year in the date is ignored.","L'année de cette date est ignorée." }, 473{ "The year in the date is ignored.","L'année de cette date est ignorée." },
474{ "Daylight start:","Heure d'été à partir:" }, 474{ "Daylight start:","Heure d'été à partir:" },
475{ "Daylight end:","Heure d'hiver à partir:" }, 475{ "Daylight end:","Heure d'hiver à partir:" },
476{ "Time Zone","Heure de" }, 476{ "Time Zone","Heure de" },
@@ -584,9 +584,9 @@
584{ "h","h" }, 584{ "h","h" },
585{ "min","Min" }, 585{ "min","Min" },
586{ "hou","h" }, 586{ "hou","h" },
587{ "day","Jour" }, 587{ "day","Jour" },
588{ "French(nyi)","Français (bientôt implémenté)" }, 588{ "French","Français" },
589{ "Time","Heure" }, 589{ "Time","Heure" },
590{ "Event Viewer","Visualisation" }, 590{ "Event Viewer","Visualisation" },
591{ "Cancel Sync","Annuler Synchro" }, 591{ "Cancel Sync","Annuler Synchro" },
592{ "Remote","Distant" }, 592{ "Remote","Distant" },
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
@@ -451,9 +451,9 @@
451{ "You have to restart KOrganizer for this setting to take effect.","Sie müssem Korganizer neu starten, damit diese Einstellung aktiviert wird." }, 451{ "You have to restart KOrganizer for this setting to take effect.","Sie müssem Korganizer neu starten, damit diese Einstellung aktiviert wird." },
452{ "week(s) on:","Woche(n) am: " }, 452{ "week(s) on:","Woche(n) am: " },
453{ "Full menu bar(nr)","Volle Menuleiste(bn)" }, 453{ "Full menu bar(nr)","Volle Menuleiste(bn)" },
454{ "Timezone has daylight saving","Zeitzone hat Sommerzeit" }, 454{ "Timezone has daylight saving","Zeitzone hat Sommerzeit" },
455{ "Actual start/end is the\nsunday before this date.","Tatsächlicher Beginn/Ende ist der Sonntag\nvor diesem Datum!" }, 455{ "Actual start and end is the\nsunday before this date.","Tatsächlicher Beginn/Ende ist der Sonntag\nvor diesem Datum!" },
456{ "The year in the date is ignored.","Das Jahr vom Datum wird ignoriert." }, 456{ "The year in the date is ignored.","Das Jahr vom Datum wird ignoriert." },
457{ "Daylight start:","Sommerzeit Beginn:" }, 457{ "Daylight start:","Sommerzeit Beginn:" },
458{ "Daylight end:","Sommerzeit Ende:" }, 458{ "Daylight end:","Sommerzeit Ende:" },
459{ "Time Zone","Zeitzone" }, 459{ "Time Zone","Zeitzone" },
@@ -816,8 +816,26 @@
816{ "KO/Pi Synchronization HowTo","KO/Pi Synchronisation HowTo" }, 816{ "KO/Pi Synchronization HowTo","KO/Pi Synchronisation HowTo" },
817{ "Features + hints...","Eigenschaften + Tipps..." }, 817{ "Features + hints...","Eigenschaften + Tipps..." },
818{ "User translation...","Benutzer Übersetzung..." }, 818{ "User translation...","Benutzer Übersetzung..." },
819{ "Sync HowTo...","Synchronisation HowTo..." }, 819{ "Sync HowTo...","Synchronisation HowTo..." },
820{ "Print calendar...","Drucke Kalender..." },
821{ "Anniversary","Jahrestag" },
822{ "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" },
823{ "Import Birthdays (KA/Pi)","Importiere Geburtstage (KA/Pi)" },
824{ "Next recurrence is on: ","Nächste Wiederholung ist am:" },
825{ "<b>Alarm on: </b>","<b>Alarm am: </b>" },
826{ "<b>Access: </b>","<b>Zugriff: </b>" },
827{ "(%1 min before)","(%1 min vorher)" },
828{ "<b>Categories: </b>","<b>Kategorien: </b>" },
829{ "Save Journal/Description...","Speichere Journal/Details..." },
830{ "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." },
831{ "Continue","Weitermachen" },
832{ " birthdays/anniversaries added!"," Geburts-/Jahrestage hinzugefügt" },
833{ "Attendee:","Teilnehmer:" },
834{ "Click OK to search ->","Klicke zum Suchen auf OK ->" },
835{ "On day ","Am Tag " },
836{ "%1 of ","%1 des Monats" },
837{ "%1 of the year","%1 des Jahres" },
820{ "","" }, 838{ "","" },
821{ "","" }, 839{ "","" },
822{ "","" }, 840{ "","" },
823{ "","" }, 841{ "","" },
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index f3231ff..042046e 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -402,18 +402,22 @@ void KOPrefs::usrReadConfig()
402 fw = germanwords[i] [0]; 402 fw = germanwords[i] [0];
403 } 403 }
404 404
405 setLocaleDict( mLocaleDict ); 405 setLocaleDict( mLocaleDict );
406 } 406 } else {
407 if ( mPreferredLanguage == 3 ) { 407 QString fileName ;
408 QString fileName = MainWindow::resourcePath()+"usertranslation.txt"; 408 if ( mPreferredLanguage == 3 )
409 fileName = MainWindow::resourcePath()+"usertranslation.txt";
410 else if ( mPreferredLanguage == 2 )
411 fileName = MainWindow::resourcePath()+"frenchtranslation.txt";
412 else return;
409 QFile file( fileName ); 413 QFile file( fileName );
410 if (file.open( IO_ReadOnly ) ) { 414 if (file.open( IO_ReadOnly ) ) {
411 QTextStream ts( &file ); 415 QTextStream ts( &file );
412 ts.setCodec( QTextCodec::codecForLocale() ); 416 ts.setCodec( QTextCodec::codecForLocale() );
413 QString text = ts.read(); 417 QString text = ts.read();
414 file.close(); 418 file.close();
415 419 text.replace( QRegExp("\\\\n"), "\n" );
416 QString line; 420 QString line;
417 QString we; 421 QString we;
418 QString wt; 422 QString wt;
419 int br = 0; 423 int br = 0;
@@ -441,11 +445,12 @@ void KOPrefs::usrReadConfig()
441 //qDebug("end *%s* ", end.latin1()); 445 //qDebug("end *%s* ", end.latin1());
442 446
443 setLocaleDict( mLocaleDict ); 447 setLocaleDict( mLocaleDict );
444 } else { 448 } else {
445 qDebug("KO: Cannot find translation file usertranslation.txt"); 449 qDebug("KO: Cannot find translation file %s",fileName.latin1() );
446 } 450 }
447 } 451
452}
448 config()->setGroup("General"); 453 config()->setGroup("General");
449 454
450 mCustomCategories = config()->readListEntry("Custom Categories"); 455 mCustomCategories = config()->readListEntry("Custom Categories");
451 if ( KOPrefs::instance()->mLanguageChanged ) { 456 if ( KOPrefs::instance()->mLanguageChanged ) {
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index da6644f..5ba4817 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -162,9 +162,9 @@ void KOPrefsDialog::setupLocaleTab()
162 KPrefsWidRadios *syncPrefsGroup = 162 KPrefsWidRadios *syncPrefsGroup =
163 addWidRadios(i18n("Language:(needs restart)"),&(KOPrefs::instance()->mPreferredLanguage),topFrame); 163 addWidRadios(i18n("Language:(needs restart)"),&(KOPrefs::instance()->mPreferredLanguage),topFrame);
164 syncPrefsGroup->addRadio(i18n("English")); 164 syncPrefsGroup->addRadio(i18n("English"));
165 syncPrefsGroup->addRadio(i18n("German")); 165 syncPrefsGroup->addRadio(i18n("German"));
166 syncPrefsGroup->addRadio(i18n("French(nyi)")); 166 syncPrefsGroup->addRadio(i18n("French"));
167 syncPrefsGroup->addRadio(i18n("User defined (usertranslation.txt)")); 167 syncPrefsGroup->addRadio(i18n("User defined (usertranslation.txt)"));
168 if ( QApplication::desktop()->width() < 300 ) 168 if ( QApplication::desktop()->width() < 300 )
169 ;// syncPrefsGroup->groupBox()-> setOrientation (Qt::Vertical); 169 ;// syncPrefsGroup->groupBox()-> setOrientation (Qt::Vertical);
170 topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1); 170 topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1);
@@ -1582,9 +1582,9 @@ void KOPrefsDialog::setupTimeZoneTab()
1582 addWidBool(i18n("Timezone has daylight saving"), 1582 addWidBool(i18n("Timezone has daylight saving"),
1583 &(KOPrefs::instance()->mUseDaylightsaving),topFrame); 1583 &(KOPrefs::instance()->mUseDaylightsaving),topFrame);
1584 topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1); 1584 topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1);
1585 ++iii; 1585 ++iii;
1586 QLabel* lab = new QLabel( i18n("Actual start/end is the\nsunday before this date."), topFrame ); 1586 QLabel* lab = new QLabel( i18n("Actual start and end is the\nsunday before this date."), topFrame );
1587 topLayout->addMultiCellWidget(lab, iii,iii,0,1); 1587 topLayout->addMultiCellWidget(lab, iii,iii,0,1);
1588 ++iii; 1588 ++iii;
1589 lab = new QLabel( i18n("The year in the date is ignored."), topFrame ); 1589 lab = new QLabel( i18n("The year in the date is ignored."), topFrame );
1590 topLayout->addMultiCellWidget(lab, iii,iii,0,1); 1590 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
@@ -451,9 +451,9 @@
451{ "You have to restart KOrganizer for this setting to take effect.","Sie müssem Korganizer neu starten, damit diese Einstellung aktiviert wird." }, 451{ "You have to restart KOrganizer for this setting to take effect.","Sie müssem Korganizer neu starten, damit diese Einstellung aktiviert wird." },
452{ "week(s) on:","Woche(n) am: " }, 452{ "week(s) on:","Woche(n) am: " },
453{ "Full menu bar(nr)","Volle Menuleiste(bn)" }, 453{ "Full menu bar(nr)","Volle Menuleiste(bn)" },
454{ "Timezone has daylight saving","Zeitzone hat Sommerzeit" }, 454{ "Timezone has daylight saving","Zeitzone hat Sommerzeit" },
455{ "Actual start/end is the\nsunday before this date.","Tatsächlicher Beginn/Ende ist der Sonntag\nvor diesem Datum!" }, 455{ "Actual start and end is the\nsunday before this date.","Tatsächlicher Beginn/Ende ist der Sonntag\nvor diesem Datum!" },
456{ "The year in the date is ignored.","Das Jahr vom Datum wird ignoriert." }, 456{ "The year in the date is ignored.","Das Jahr vom Datum wird ignoriert." },
457{ "Daylight start:","Sommerzeit Beginn:" }, 457{ "Daylight start:","Sommerzeit Beginn:" },
458{ "Daylight end:","Sommerzeit Ende:" }, 458{ "Daylight end:","Sommerzeit Ende:" },
459{ "Time Zone","Zeitzone" }, 459{ "Time Zone","Zeitzone" },
@@ -564,9 +564,9 @@
564{ "h","Std" }, 564{ "h","Std" },
565{ "min","Min" }, 565{ "min","Min" },
566{ "hou","Std" }, 566{ "hou","Std" },
567{ "day","Tag" }, 567{ "day","Tag" },
568{ "French(nyi)","Französich (noch nicht implementiert)" }, 568{ "French","Französich" },
569{ "Time","Zeit" }, 569{ "Time","Zeit" },
570{ "Event Viewer","Termin Ansicht" }, 570{ "Event Viewer","Termin Ansicht" },
571{ "Cancel Sync","Sync Abbrechen" }, 571{ "Cancel Sync","Sync Abbrechen" },
572{ "Remote","Fern" }, 572{ "Remote","Fern" },