summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--bin/kdepim/korganizer/frenchtranslation.txt4
-rw-r--r--bin/kdepim/korganizer/usertranslation.txt20
-rw-r--r--korganizer/koprefs.cpp15
-rw-r--r--korganizer/koprefsdialog.cpp4
-rw-r--r--korganizer/wordsgerman.h4
5 files changed, 35 insertions, 12 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
@@ -466,13 +466,13 @@
{ "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" },
@@ -582,13 +582,13 @@
{ "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" },
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
@@ -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" },
@@ -814,12 +814,30 @@
{ "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
@@ -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,14 +443,15 @@ 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();
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" },