15 files changed, 86 insertions, 20 deletions

diff --git a/bin/kdepim/kaddressbook/germantranslation.txt b/bin/kdepim/kaddressbook/germantranslation.txt
index 0884a83..85aed43 100644
--- a/bin/kdepim/kaddressbook/germantranslation.txt
+++ b/bin/kdepim/kaddressbook/germantranslation.txt
@@ -363,193 +363,193 @@
 { "Size","Größe" },

 { "Date","Datum" },

 { "Mime Type","Mime Typ" },

 { "Geo Data Input","Geo Dateneingabe" },

 { "Sexagesimal","Sexagesimal" },

 { "North","Nord" },

 { "South","Süd" },

 { "East","Ost" },

 { "West","West" },

 { "Undefined","Unbestimmt" },

 { "Edit Address","Bearbeite Adresse" },

 { "Street:","Strasse:" },

 { "Post office box:","Postfach:" },

 { "Locality:","Stadt:" },

 { "Region:","Region:" },

 { "Postal code:","PLZ:" },

 { "Country:","Staat:" },

 { "This is the preferred address","Dies ist die bevorzugte Adresse" },

 { "New...","Neu..." },

 { "Change Type","Ändere Art" },

 { "Edit Address Type","Ändere Address Art" },

 { "Address Types","Address Art" },

 { "Domestic","Inland" },

 { "International","International" },

 { "Parcel","Paket" },

 { "Edit Contact Name","Ändere Kontakt Name" },

 { "Honorific prefixes:","Namensprefixes:" },

 { "Given name:","Vorname:" },

 { "Additional names:","Mittelnamen:" },

 { "Family names:","Nachname:" },

 { "Honorific suffixes:","Namenssuffixe:" },

 { "Parse name automatically","Setze Namen automatisch" },

 { "Edit Phone Numbers","Bearbeite Telefonnummern" },

 { "Number","Nummer" },

 { "Type","Typ" },

 { "Edit Phone Number","Bearbeite Telefonnummer" },

 { "Number:","Nummer:" },

 { "This is the preferred phone number","Dies ist die bevorzugte Telefonnummer" },

 { "Types","Typen" },

 { "Messenger","Messenger" },

 { "Other","Anderes" },

 { "Video","Video" },

 { "Mailbox","Mailbox" },

 { "Modem","Modem" },

 { "Car","Auto" },

 { "PCS","PCS" },

 { "Category","Kategorie" },

 { "Select Categories","Wähle Kategorien" },

 { " &Deselect All "," &Deselektiere alle " },

 { " &Edit Categories "," B&earbeite Kategorien " },

 { "&OK","&OK" },

 { "&Cancel","Abbre&chen" },

 { "Configure","Konfiguriere" },

 { "Default","Voreinstellungen" },

 { "Addressbook","Adressbuch" },

 { "Details view font","Schriftart Detailansicht" },

 { "phone:123","phone:123" },

 { "Search only after <return> key pressed","Suche nur nach <return> Taste" },

 { "Honor KDE single click","Benutze KDE Einzelklick" },

 { "Automatic name parsing for new addressees","Automa. Name Parsen für neue Einträge" },

 { "Display List and Details at once (restart)","Zeige Liste und Details zusammen(neustart)" },

 { "Ask for quit when closing Ka/Pi","Vor Beenden von Ka/Pi nachfragen" },

 { "General","Allgemein" },

 { "Extensions (restart)","Extensions (restart)" },

 { "Description","Beschreibungen" },

 { "Extensions","Extensions" },

 { "Prefixes","Prefixe" },

 { "Inclusions","Inclusions" },

 { "Suffixes","Suffixe" },

 { "Default formatted name:","Default format. Name:" },

 { "Empty","Leer" },

 { "Simple Name","Einfacher Name" },

 { "Full Name","Voller Name" },

 { "Reverse Name","Namen umdrehen" },

 { "Contact","Kontakt" },

 { "Global","Allgemein" },

 { "Phone","Telefon" },

 { "SMS","SMS" },

 { "Language:(needs restart)","Sprache:(Neustart)" },

 { "English","English" },

 { "German","Deutsch" },

 { "French","Französisch" },

 { "Italian","Italienisch" },

 { "User defined (usertranslation.txt)","Benutzerdef. (usertranslation.txt)" },

 { "Time Format(nr):","Zeit Format(nr):" },

 { "24:00","24:00" },

 { "12:00am","12:00am" },

 { "Week starts on Sunday","Woche beginnt Sonntags" },

 { "Locale","Locale" },

 { "Date Format:","Datums Format:" },

 { "24.03.2004 (%d.%m.%Y|%A %d %B %Y)","24.03.2004 (%d.%m.%Y|%A %d %B %Y)" },

 { "03.24.2004 (%m.%d.%Y|%A %B %d %Y)","03.24.2004 (%m.%d.%Y|%A %B %d %Y)" },

 { "2004-03-24 (%Y-%m-%d|%A %Y %B %d)","2004-03-24 (%Y-%m-%d|%A %Y %B %d)" },

 { "User defined","Benutzerdefiniert" },

 { "User long date:","Format langes Datum:" },

 { "User short date:","Format kurzes Datum:" },

-{ "Daylight start:","Sommerzeit Beginn:" },

+{ "Daylight start:","Sommerzeit Start:" },

 { "Daylight end:","Sommerzeit Ende:" },

 { "Actual start and end is the\nsunday before this date.","Tatsächlicher Beginn/Ende ist der\nSonntag vor diesem Datum!" },

 { "Monday 19 April 2004: %A %d %B %Y","Monday 19 April 2004: %A %d %B %Y" },

 { "Mon 19.04.04: %a %d.%m.%y","Mon 19.04.04: %a %d.%m.%y" },

 { "Mon, 19.Apr.04: %a, %d.%b.%y","Mon, 19.Apr.04: %a, %d.%b.%y" },

 { "Date Format","Datums Format" },

 { "Timezone:","Zeitzone:" },

 { "The year in the date is ignored.","Das Jahr vom Datum wird ignoriert." },

 { "Timezone has daylight saving","Zeitzone hat Sommerzeit" },

 { "Add 30 min to selected Timezone","Addiere 30 min zur Zeitzone" },

 { "Used Mail Client","Benutzter Mail Client" },

 { "Channel:","Channel:" },

 { "Message:","Message:" },

 { "Parameters:","Parameter:" },

 { "HINT: Delimiter=; Name=%1,Email=%2","Hinweis: Begrenzer=; Name=%1,Email=%2" },

 { "extra Message:","extra Message:" },

 { "extra Parameters:","extra Parameter:" },

 { "HINT: Emails=%1,Attachments=%2","Hinweis: Emails=%1,Attachments=%2" },

 { "External Apps.","Externe Appl." },

 { "Used %1 Client","Benutzer %1 Client" },

 { "No email client installed","Keine Email Client installiert" },

 { "Userdefined email client","Benutzerdef. Email Client" },

 { "OM/Pi email client","OM/Pi Email Client" },

 { "Close KA/Pi?","Schließe KA/Pi?" },

 { "\nChanges will be saved!","\nÄnderungen werden gespeichert!" },

 { "Yes!","Ja!" },

 { "There was an error while attempting to save\n the address book. Please check that some \nother application is not using it. ","#There was an error while attempting to save\n the address book. Please check that some \nother application is not using it. " },

 { "Saving addressbook ... ","Speichere Adressbuch ... " },

 { "Addressbook saved!","Adressbuch gespeichert!" },

 { "Default Table View","Default Tabellenansicht" },

 { "Merge and Remove","Zusammenfügen/entfernen" },

 { "Merge","Zusammenfügen" },

 { "Merge Contacts Editor","Contact-Zusammenfüge-Editor" },

 { "New List...","Neue Liste..." },

 { "Rename List...","Ändere Namen..." },

 { "Remove List","Lösche Liste" },

 { "Add Contact","Kontakt hinzu" },

 { "Change Email...","Ändere Email..." },

 { "Remove Contact","Entferne Kontakt" },

 { "Use Preferred","Nutze Preferred" },

 { "Distribution List Editor","Distribution List Editor" },

 { "Choose which contacts to export","Wähle Kontakte zum Exportieren" },

 { "Which contacts do you want to export?","Welche Kontakte sollen exportiert werden?" },

 { "Contact Selection","Kontaktauswahl" },

 { "&All","&Alle" },

 { "Export the entire address book","Exportiere das komplette Addressbuch" },

 { "&Selected","Au&sgewählte" },

 { "Only export contacts selected in KAddressBook.\nThis option is disabled if no contacts are selected.","###Only export contacts selected in KAddressBook.\nThis option is disabled if no contacts are selected." },

 { "By matching &filter","Zutreffender &Filter" },

 { "Only export contacts matching the selected filter.\nThis option is disabled if you haven't defined any filters","###Only export contacts matching the selected filter.\nThis option is disabled if you haven't defined any filters" },

 { "By Cate&gories","Kategorien" },

 { "Only export contacts who are members of a category that is checked on the list to the left.\nThis option is disabled if you have no categories.","###Only export contacts who are members of a category that is checked on the list to the left.\nThis option is disabled if you have no categories." },

 { "Select a filter to decide which contacts to export.","Wähle Filter zum Export aus." },

 { "Check the categories whose members you want to export.","Wähle die Kategorien zum Export aus." },

 { "Sorting","Sortieren" },

 { "Criterion:","Merkmal:" },

 { "Order:","Reihenfolge:" },

 { "Ascending","Aufsteigend" },

 { "Descending","Absteigend" },

 { "Save file","Datei speichern" },

 { "Error","Fehler" },

 { "Unable to export contacts.","Exportieren der Kontakte geht nicht." },

 { "\nNo unsaved changes detected!\nNothing will be  saved!","\nKeine ungespeicherten\nÄnderungen erkannt!\nNichts wird gespeichert!" },

 { "Manage new categories...","Verwalte neue Kategorien..." },

 { "&File","Datei" },

 { "&Edit","Bearbeite" },

 { "&View","Ansichten" },

 { "&Settings","Konfiguration" },

 { "&Change selected","Ändere Selekt." },

 { "&Help","Hilfe" },

 { "Remove sync info","Entferne Sync Info" },

 { "For all profiles","Für alle Profile" },

 { "&Change","Ändere" },

 { "Import xml (Qtopia)...","Importiere xml (Qtopia)..." },

 { "Export xml (Qtopia)...","Exportiere xml (Qtopia)..." },

 { "Export to phone","Exportiere aufs Handy..." },

 { "Which contacts do you want to select?","Welche Kontakte möchten Sie wählen?" },

 { "&Modify","Ändere" },

 { "Choose which contacts to select","Bitte Kontakte auswählen!" },

 { "After importing/loading/syncing\nthere may be new categories in\naddressees\nwhich are not in the category list.\nPlease choose what to do:\n ","Nach dem Importieren/Laden/Syncen\nkann es neue Kategorien in den \nKontakten geben, die nicht\nin der Kategorieliste enthalten sind.\nBitte wählen Sie, was passieren soll:\n " },

 { "Manage new Categories","Verwalte neue Kategorien" },

 { "Add to category list","Füge zur Kategorieliste hinzu" },

 { "Remove from addressees","Entferne von den Kontakten" },

 { "New categories not in list:","Kategorien, die nicht in der Liste sind:" },

 { "A&dd","Hinzufügen" },

 { "Please read Help-Sync Howto\nto know what settings to use.","Bitte lese Hilfe-Sync Howto\num zu erfahren welche Einstellungen\ndie richtigen sind." },

 { "NOTE: This will remove all old\ncontact data on phone!","ACHTUNG: Das löscht alle alten\nKontakt Daten auf dem Handy!" },

 { "Export to mobile phone!","Exportiere auf das Handy!" },

 { "Export to phone options","Export ans Handy Optionen" },

 { "Writing to phone...","Sende Daten ans Handy..." },

 { " This may take 1-3 minutes!"," Das kann 1-3 Minuten dauern!" },

 { "Retry","Nochmal versuchen" },

 { "KDE/Pim phone access","KDE/Pim Handy Zugriff" },

 { "Error accessing device!\nPlease turn on connection\nand retry!","Fehler beim Zugriff auf das Gerät!\nBitte die Verbindung aktivieren\nund nochmal versuchen!" },

 { "Error exporting to phone!","Fehler beim Export auf das Handy!" },

 { "&Print View","Drucke Ansicht" },

diff --git a/bin/kdepim/kopiemail/germantranslation.txt b/bin/kdepim/kopiemail/germantranslation.txt
index 903abdf..75fdd11 100644
--- a/bin/kdepim/kopiemail/germantranslation.txt
+++ b/bin/kdepim/kopiemail/germantranslation.txt
@@ -1,136 +1,136 @@
 { " Local Time"," Locale Zeit" },
 { "Preferences","Vorlieben" },
 { "Ok","Ok" },
 { "Default","Standard" },
 { "Cancel","Abbrechen" },
 { "Global","Global" },
 { "Email","Email" },
 { "Phone","Phone" },
 { "SMS","SMS" },
 { "Fax","Fax" },
 { "Pager","Pager" },
 { "SIP","SIP" },
 { "Language:(needs restart)","Sprache (Neustart!)" },
 { "English","Englisch" },
 { "German","Deutsch" },
 { "French","Französich" },
 { "Italian","Italienisch" },
 { "User defined (usertranslation.txt)","Benutzerdef.(usertranslation.txt)" },
 { "Time Format(nr):","Zeit Format(Neustart!)" },
 { "24:00","24:00" },
 { "12:00am","12:00am" },
 { "Week starts on Sunday","Woche beginnt Sonntags" },
 { "Locale","Localisation" },
 { "Date Format:","Datums Format:" },
 { "24.03.2004 (%d.%m.%Y|%A %d %B %Y)","24.03.2004 (%d.%m.%Y|%A %d %B %Y)" },
 { "03.24.2004 (%m.%d.%Y|%A %B %d %Y)","03.24.2004 (%m.%d.%Y|%A %B %d %Y)" },
 { "2004-03-24 (%Y-%m-%d|%A %Y %B %d)","2004-03-24 (%Y-%m-%d|%A %Y %B %d)" },
 { "User defined","Benutzerdefiniert" },
 { "User long date:","Format langes Datum:" },
 { "User short date:","Format kurzes Datum:" },
 { "Monday 19 April 2004: %A %d %B %Y","Montag 19 April 2004: %A %d %B %Y" },
 { "Mon 19.04.04: %a %d.%m.%y","Mon 19.04.04: %a %d.%m.%y" },
 { "Mon, 19.Apr.04: %a, %d.%b.%y","Mon, 19.Apr.04: %a, %d.%b.%y" },
 { "Date Format","Datums Format" },
 { "Timezone:","Zeitzone:" },
 { "Add 30 min to selected Timezone","Addiere 30 min zur Zeitzone" },
 { "Timezone has daylight saving","Zeitzone hat Sommerzeit" },
 { "Actual start and end is the\nsunday before this date.","Tatsächlicher Beginn/Ende ist der\nSonntag vor diesem Datum!" },
 { "The year in the date is ignored.","Das Jahr vom Datum wird ignoriert." },
-{ "Daylight start:","Sommerzeit Beginn:" },
+{ "Daylight start:","Sommerzeit Start:" },
 { "Mon","Mo" },
 { "Tue","Di" },
 { "Wed","Mi" },
 { "Thu","Do" },
 { "Fri","Fr" },
 { "Sat","Sa" },
 { "Sun","So" },
 { "January","Januar" },
 { "February","Februar" },
 { "March","März" },
 { "April","April" },
 { "May","Mai" },
 { "June","Juni" },
 { "July","Juli" },
 { "August","August" },
 { "September","September" },
 { "October","Oktober" },
 { "November","November" },
 { "December","Dezember" },
 { "tomorrow","morgen" },
 { "today","heute" },
 { "yesterday","gestern" },
 { "Monday","Montag" },
 { "Tuesday","Dienstag" },
 { "Wednesday","Mittwoch" },
 { "Thursday","Donnerstag" },
 { "Friday","Freitag" },
 { "Saturday","Samstag" },
 { "Sunday","Sonntag" },
 { "Daylight end:","Sommerzeit Ende:" },
 { "Time Zone","Zeitzone" },
 { "Used Mail Client","Benutzter Mail Client" },
 { "Channel:","Channel:" },
 { "Message:","Message:" },
 { "Parameters:","Parameter:" },
 { "HINT: Delimiter=; Name=%1,Email=%2","Hinweis: Begrenzer=; Name=%1,Email=%2" },
 { "extra Message:","extra Message:" },
 { "extra Parameters:","extra Parameter:" },
 { "HINT: Emails=%1,Attachments=%2","Hinweis: Emails=%1,Attachments=%2" },
 { "External Apps.","Externe Appl." },
 { "General","Allgemein" },
 { "Full &name:","Vor- und &Nachname:" },
 { "E&mail address:","E&mail Adresse:" },
 { "Fonts","Schriftart" },
 { "Choose...","Wähle..." },
 { "Used %1 Client","Benutzter %1 Client" },
 { "No email client installed","Kein Email Klient installiert" },
 { "Userdefined email client","Benutzerdef. Email Klient" },
 { "OM/Pi email client","OM/Pi Email Klient" },
 { "Delete","Löschen" },
 { "New","Neu" },
 { "Edit","Bearbeite" },
 { "Close","Schließen" },
 { "Size","Größe" },
 { "Date","Datum" },
 { "Please set at","Bitte einstellen in" },
 { "Settings@General TAB","Einstellungen@Allgemein TAB" },
 { "KOpieMail/Pi","KOpieMail/Pi" },
 { "Mail","Mail" },
 { "Settings","Konfig" },
 { "Get all new mails","Hole alle neuen Mails" },
 { "Get new messages","Hole neue mails" },
 { "Compose new mail","Schreibe neue Mail" },
 { "Send queued mails","Sende gespeicherte Mails" },
 { "Show/Hide folders","Zeige Verzeichnisse" },
 { "Delete Mail","Lösche Mail" },
 { "Edit settings","Ändere Einstellungen" },
 { "Configure accounts","Konfiguriere Zugänge" },
 { "Mailbox","Mailbox" },
 { "Subject","Betreff" },
 { "Sender","Sender" },
 { "Size","Größe" },
 { "Date","Datum" },
 { "Close","Schliessen" },
 { "Help","Hilfe" },
 { "About","Über" },
 { "Licence","Lizenz" },
 { "LibEtPan Licence","LibEtPan Lizenz" },
 { "Settings - some need a restart (nr)","Einstellungen - manche benötigen einen Neustart (nr)" },
 { "HINT: Separate multiple\neMail addresses by ";"","Hinweis:Trenne mehrere\nAddressen mit einem ";"" },
 { "Ignore above settings and\nuse KA/Pi "Who am I" instead!","Ignoriere obige Einstellungen und\nbenutze KA/Pi "Wer bin ich"\nstattdessen!" },
 { "View mail as html","Zeige Mails als html" },
 { "Send mails later","Sende Mails später" },
 { "Application(nr)","Applikation(nr)" },
 { "OK","OK" },
 { "Compose mail:","Verfasse Mail:" },
 { "Dear Mr.","Hallo Herr" },
 { "Read mail:","Lese Mail:" },
 { "Hello","Hallo" },
 { "Configure Accounts","Konfigure Zugänge" },
 { "Name of the Account","Name des Zugangs" },
 { "News","News" },
 { "Account","Zugang" },
 { "Type","Typ" },
 { "<p>Please select an account.</p>","<p>Bitte wähle einen Zugang.</p>" },
 { "Error","Fehler" },
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index 5693112..fa18304 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -352,193 +352,193 @@
 { "Shopping","Einkaufen" },
 { "Show Dates","Zeige Daten" },
 { "Show events that recur daily in date nav.","Zeige tägl.wiederh.Term.in Datums Nav." },
 { "Show Event...","Zeige Termin..." },
 { "Show ev. that recur weekly in date nav.","Zeige wöch.wiederh.Term.in Datums Nav." },
 { "Show Marcus Bains line","Zeige Marcus Bains Linie" },
 { "Show summary after syncing","Zeige Zusammenfassung nach Sync." },
 { "Show time as:","Zeige Zeit als" },
 { "Show Todo...","Zeige To-Do" },
 { "Show vertical screen (Needs restart)","Vertikaler Bildschirm-Layout (Neustart!)" },
 { "&Show","Zeige" },
 { "Show...","Zeige..." },
 { "Show","Zeige" },
 { "Small","Klein" },
 { "Sorry","Entschuldigung" },
 {"Sorry, the copy command failed!\nCommand was:\n","Der Kopierbefehl schlug fehl!\nBefehl war:\n"},
 { "Start:","Start:" },
 { "Start Date","Start Datum" },
 { "Start date: %1","Start Datum: %1" },
 { "Start Time","Start Zeit" },
 { "Status:","Status:" },
 { "Status","Status:" },
 { "Summaries","Titel" },
 { "Summary:","Titel:" },
 { "Summary","Titel" },
 { "Sunday","Sonntag" },
 { "Sun","So" },
 { "Sync preferences:","Sync Einstellungen" },
 { "Sync Prefs","Sync Einstellungen" },
 { "Syncronize","Daten abgleich" },
 { "Take local entry on conflict","Nimm lokalen Eintrag beim Konflikt" },
 { "Take newest entry on conflict","Nimm neuesten Eintrag beim Konflikt" },
 { "Take remote entry on conflict","Nimm fernen Eintrag beim Konflikt" },
 { "Template '%1' does not contain a valid Todo.","Template '%1' enthält kein gültiges To-Do" },
 { "Template does not contain a valid Event.","Template '%1' enthält keinen gültigen Termin" },
 { "Template...","Vorlage..." },
 { "This day","Dieser Tag" },
 { "This is an experimental feature. ","Dieses Feature ist experimentel" },
 { "This item will be\npermanently deleted.","Dieser Eintrag wird\nkomplett gelöscht." },
 { "This item will be permanently deleted.",  "Dieser Eintrag wird komplett gelöscht." },
 { "Thu","Do" },
 { "Thursday","Donnerstag" },
 { "Time associated","Mit Zeit" },
 { "Time bar:","Uhrzeit Zeile:" },
 { "Time && Date","Zeit und Datum" },
 { "Time Format","Zeit Format" },
 { "Time Format(nr):","Zeit Format(Neustart!)" },
 { "Date Labels:","Datumsleiste:" },
 { "Time: ","Zeit: " },
 { "Timezone:","Zeitzone:" },
 { "To: ","Bis: " },
 { "To:","Bis:" },
 { "Today: ","Heute: " },
 { "Todo due today color:","Heute fällige To-Do's" },
 { "To-do items:","To-Do items:" },
 { "Todo overdue color:","Überfällige To-Do's" },
 { "Todo","Todo" },
 { "To-do view shows completed Todos","To-do Ansicht zeigt erledigte To-dos" },
 { "ToDoView:","Todo Ansicht:" },
 { "Toggle Alarm","Wechsle Alarm" },
 { "Toggle Allday","Umschalten Ganztag" },
 { "Tomorrow: ","Morgen: " },
 { "Tue","Di" },
 { "Tuesday","Dienstag" },
 { "Two entries are in conflict, if: ","Zwei Einträge haben einen Konflikt, wenn:" },
 { "Unable to find template '%1'.","Kann Vorlage '%1' nicht finden." },
 { "Unknown","Unbekannt" },
 { "Up","Hinauf" },
 { "Use password (if not, ask when syncing)","Passwort: (sonst jedesmal anfragen)" },
 { "User defined","Benutzerdefiniert" },
 { "User long date:","Format langes Datum:" },
 { "User short date:","Forma kurzes Datum:" },
 { "View","Ansicht" },
 { "View Fonts","Schriftarten Ansichten" },
 { "Views","Ansichten" },
 { "Wed","Mi" },
 { "Wednesday","Mittwoch" },
 { "Week %1","Woche %1" },
 { "Weekly","Wöchentlich" },
 { "Week starts on Sunday","Woche beginnt Sonntags" },
 { "What's Next View:","What's Next Anz." },
 { "What's next ?","Was kommt als nächstes?(What's Next)" },
 { "Working Hours","Tägliche Arbeitszeit" },
 { "Working hours color:","Arbeitszeit in der Agenda Ansicht:" },
 { "Write back existing entries only","Nur exisitierende Einträge zurückschreiben" },
 { "Write back synced file","Syncronisierte Datei zurückschreiben" },
 { "Yearly","Jährlich" },
 { "year(s)","Jahr(e)" },
 { "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 and end is the\nsunday before this date.","Tatsächlicher Beginn/Ende ist der\nSonntag vor diesem Datum!" },
 { "The year in the date is ignored.","Das Jahr vom Datum wird ignoriert." },
-{ "Daylight start:","Sommerzeit Beginn:" },
+{ "Daylight start:","Sommerzeit Start:" },
 { "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" },
 { "minutely","minütlich" },
 { "hourly","stündlich" },
 { "daily","täglich" },
 { "weekly","wöchentlich" },
 { "monthly","monatlich" },
 { "day-monthly","tag-monatlich" },
 { "month-yearly","monat-jährlich" },
 { "day-yearly","tag-jährlich" },
 { "position-yearly","pos-jährlich" },
 { "Edit item on doubleclick (if not, show)","Editiere mit Doppelklick(wenn nicht, zeige)" },
 { "Highlight current day in agenda","Hebe >>heute<< in Agenda hervor" },
 { "Use light color for highlight current day","Helle Farbe für >>heute<< Hervorhebung" },
 { "Highlight selection in Time Edit","Hebe Auswahl in Zeit Edit hervor" },
 { "Hold fullscreen on view change","Behalte Vollbild bei Ansichswechsel" },
 { "Hold non-fullscreen on view change","Behalte Nicht-Vollbild bei Ansichtsw." },
 { "Event list view uses full window","Listenansicht nutzt Vollbild" },
 { "Set agenda to DayBeginsAt on change","Setze Agenda auf TagBeginntUm bei Wechsel" },
 { "Set agenda to current time on change","Setze Agenda auf gegenw.Zeit bei Wechsel" },
 { "Listview uses monthly timespan","Listenansicht zeigt monatliche Zeitspanne" },
 { "ViewChange","Ansichtswechsel" },
 { "Default alarm *.wav file:","Standard Alarm *.wav Datei:" },
 { "This setting is useless for 5500 user!","Diese Einst. ist nutzlos für 5500 Nutzer" },
 { "File","Datei" },
 { "Clone...","Dupliziere.." },
 { "Move...","Bewege..." },
 { "Beam...","Sende via IR..." },
 { "&Clone...","Dupliziere.." },
 { "&Move...","Bewege..." },
 { "&Beam...","Sende via IR..." },
 { "Show Completed","Zeige erledigte Todos" },
 { "Show Quick Todo","Zeige Quick Todo" },
 { "Unparent Todo","Un-sub Todo" },
 { "Save selected to file...","Speichere Selektierte..." },
 { "Add Categ. to selected...","Füge zu Selekt. Kateg. hinzu..." },
 { "Set Categ. for selected...","Setze Kateg. für Selekt." },
 { "Beam selected via IR","Sende Selekt. via IR..." },
 { "Search","Suchen" },
 { "Date Picker","Datum auswählen" },
 { "Day View","Tagesansicht" },
 { "Work Week","Arbeitswoche" },
 { "Week","Wochenansicht" },
 { "Month","Monatsansicht" },
 { "Todo View","Todo Liste" },
 { "Journal","Journal" },
 { "Next days","Nächste Tage" },
 { "Print agenda selection...","Drucke Agendaselektion..." },
 { "Toggle DateNavigator","Navigator umschalten" },
 { "Toggle FilterView","Filteransicht umschalten" },
 { "Prev. month","Vorheriger Monat" },
 { "Go backward","Gehe zurück" },
 { "Go forward","Gehe weiter" },
 { "Synchronize","Synchronisieren" },
 { "AgendaSize","Agendagröße" },
 { "Import (*.ics/*.vcs) file","Importiere (*.ics/*.vcs) Datei" },
 { "Import last file","Importiere letzte Datei" },
 { "Import Opie/Qtopia Cal.","Importiere Opie/Qtopia Kal." },
 { "Load Calendar Backup","Lade Kalender Backup" },
 { "Save Calendar Backup","Speichere Kalender Backup" },
 { "Export VCalendar","Exportiere VCalendar" },
 { "Manage new categories...","Verwalte neue Kategorien..." },
 { "Beam complete calendar...","Sende kompletten Kalender via IR" },
 { "Beam filtered calendar...","Sende gefilterten Kalender via IR" },
 { "Remote via ssh","Über Netzwerk via ssh" },
 { "With local file","Mit lokaler Datei" },
 { "With last file","Mit letzter Datei" },
 { "KO/Pi: Ready for beaming","KO/Pi: Bereit zum Senden" },
 { "KO/Pi:Beaming done","KO/Pi: Senden erfolgt" },
 { "Save filename","Speichern: Dateinamen wählen" },
 { "File already exists!\nOld file from:\n%1\nOverwrite?\n","Dateiname existiert bereits!\nAlte Datei vom:\n%1\nÜberschreiben?\n" },
 { "KO/Pi: Warning!","KO/Pi: Warnung!" },
 { "Overwrite!","Überschreibe!" },
 { "KO/Pi:Saved %1","KO/Pi:Gespeichert %1" },
 { "All selected items will be\npermanently deleted.\n(Deleting items will take\nsome time on a PDA)\n","Alle selektierten Einträge werden\nunwiederbringlich gelöscht.\n(Löschen kann auf dem\nPDA einige Zeit dauern)\n" },
 { "KO/Pi Confirmation","KO/Pi Bestätigung" },
 { "Close dialog to abort deletion!","Schließe Dialog um das Löschen abzubrechen!" },
 { "Deleting item %d ...","Lösche Eintrag %d ..." },
 { "%d items remaining in list.","%d Einträge sind in der Liste verblieben." },
 { "Size","Größe" },
 { "Date","Datum" },
 { "Mime Type","Datei Typ" },
 { "All Files","Alle Dateien" },
 { "Files","Dateien" },
 { "Documents","DoKumente" },
 { "Select Categories","Selektiere Kategorien" },
 { " &Deselect All "," Auswahl aufheben " },
 { "A&dd","Hinzu" },
 { "&Modify","Ändern" },
 { "Edit Categories","Editiere Kategorien" },
 { " &Edit Categories "," &Editiere Kategorien " },
 { "Beam Options","Beam Einstellungen" },
 { " With timezone "," Mit Zeitzone " },
 { " Local time ",  " Lokale Zeit " },
diff --git a/bin/kdepim/pwmanager/germantranslation.txt b/bin/kdepim/pwmanager/germantranslation.txt
index beb066e..a50dd04 100644
--- a/bin/kdepim/pwmanager/germantranslation.txt
+++ b/bin/kdepim/pwmanager/germantranslation.txt
@@ -40,193 +40,193 @@
 { "Ask for preferences before sync","Frage nach Synchronisationseinstellungen vor dem Syncen" },

 { "Sync preferences","Synchronisations Einstellungen" },

 { "Take local entry on conflict","Nimm lokalen Eintrag beim Konflikt" },

 { "Take remote entry on conflict","Nimm fernen Eintrag beim Konflikt" },

 { "Take newest entry on conflict","Nimm neuesten Eintrag beim Konflikt" },

 { "Ask for every entry on conflict","Frage bei Konflikten nach" },

 { "Force: Take local entry always","Erzwinge: Nimm immer lokalen Eintrag" },

 { "Force: Take remote entry always","Erzwinge: Nimm immer fernen Eintrag" },

 { "Show summary after sync","Zeige Zusammenfassung nach dem Synchronisieren" },

 { "Apply filter when adding data to local:","Filter für das Hinzufügen von Daten zu Lokal:" },

 { "Incoming calendar filter:","Eingehender Kalender Filter:" },

 { "Incoming addressbook filter:","Eingehender Adressbuch Filter:" },

 { "Write back synced data","Schreibe gesyncte Daten zurück" },

 { "Write back options","Optionen zum Zurückschreiben" },

 { "Write back (on remote) existing entries only","Schreibe nur existierende (auf Entfernt) Einträge zurück" },

 { "Apply filter when adding data to remote:","Filter für das Hinzufügen von Daten zu Entfernt:" },

 { "Outgoing calendar filter:","Ausgehender Kalender Filter:" },

 { "Outgoing addressbook filter:","Ausgehender Adressbuch Filter:" },

 { "Write back (calendar) entries for time period only","Schreibe nur Kalender Einträge für Zeitspanne zurück" },

 { "Time period","Zeitspanne" },

 { "From ","Von " },

 { " weeks in the past to "," Wochen in der Vergangenheit bis zu " },

 { " weeks in the future "," Wochen in der Zukunft " },

 { "Profile kind","Profil Art" },

 { "Local file","Lokale Datei" },

 { "Pi-Sync ( direct Kx/Pi to Kx/Pi sync )","Pi-Sync ( direktes Kx/Pi zu Kx/Pi sync )" },

 { "Remote file (w down/upload command)","Entfernte Datei (via down/upload Kommando)" },

 { "Mobile device (cell phone)","Mobiles Gerät (Handy)" },

 { "Profile kind specific settings","Profil Art abhängige Einstellungen" },

 { "I/O device: ","I/O device: " },

 { "Help...","Hilfe..." },

 { "Connection: ","Connection: " },

 { "Model(opt.): ","Model(opt.): " },

 { "Local file Cal:","Lokale Datei Kal:" },

 { "Local file ABook:","Lokale Datei ABuch:" },

 { "Local file PWMgr:","Lokale Datei PWMgr:" },

 { "Choose...","Wähle..." },

 { "Addressbook file (*.vcf) is used by KA/Pi","Adressbuch Datei (*.vcf) wird von KA/Pi genutzt" },

 { "Calendar:","Kalender:" },

 { "AddressBook:","AdressBuch:" },

 { "PWManager:","PWManager:" },

 { "Pre sync (download) command:","Bevor Sync (download) Kommando:" },

 { "Local temp file:","Lokale temp Datei:" },

 { "Post sync (upload) command:","Nach Sync (upload) Kommando:" },

 { "Addressbook file is used by KA/Pi","Adressbuch Datei wird von KA/Pi genutzt" },

 { "Fill in default values for:","Setze Beispiel Werte ein für:" },

 { "ssh/scp","ssh/scp" },

 { "ftp","ftp" },

 { "Hint: Use $PWD$ for placeholder of password!","Hinweis: Benutze $PWD$ als Platzhalter für ein Passwort!" },

 { "Password for remote access: (could be the same for each)","Passwort für entfernten Zugriff: (kann dasselbe sein für alle)" },

 { "Remote IP address: (could be the same for each)","Entfernte IP Adresse: (kann dasselbe sein für alle)" },

 { "Remote port number: (should be different for each)","Entfernte Port Nummer: (Sollte für alle unterschiedlich sein)" },

 { "command for downloading remote file to local device","Kommando zum Download der entfernten Datei zum lokalen Gerät" },

 { "command for uploading local temp file to remote device","Kommando zum Upload der lokalen temp. Datei zum entfernten Gerät" },

 { "No Filter","Kein Filter" },

 { "KO/Pi config error","KO/Pi Konfig. Fehler" },

 { "Local device name undefined!\nPlease define device name!","Name dieses Gerätes undefiniert!\nBitte Namen angeben!" },

 { "Multiple profiles with same name!\nPlease use unique profile names!","Mehrere Profile mit demselben Namen!\nBitte verschiedene Namen benutzen!" },

 { "Configure","Konfiguriere" },

 { "Apply","Anwenden" },

 { "None","Kein" },

 { "Global","Allgemein" },

 { "Email","E-Mail" },

 { "Phone","Telefon" },

 { "SMS","SMS" },

 { "Fax","Fax" },

 { "Pager","Pager" },

 { "SIP","SIP" },

 { "Language:(needs restart)","Sprache:(Neustart)" },

 { "English","English" },

 { "German","Deutsch" },

 { "French","Französisch" },

 { "Italian","Italienisch" },

 { "User defined (usertranslation.txt)","Benutzerdef. (usertranslation.txt)" },

 { "Language","Sprache" },

 { "Time Format(nr):","Zeit Format(nr):" },

 { "24:00","24:00" },

 { "12:00am","12:00am" },

 { "Week starts on Sunday","Woche beginnt Sonntags" },

 { "Time Format","Zeit Format" },

 { "Date Format:","Datums Format:" },

 { "24.03.2004 (%d.%m.%Y|%A %d %B %Y)","24.03.2004 (%d.%m.%Y|%A %d %B %Y)" },

 { "03.24.2004 (%m.%d.%Y|%A %B %d %Y)","03.24.2004 (%m.%d.%Y|%A %B %d %Y)" },

 { "2004-03-24 (%Y-%m-%d|%A %Y %B %d)","2004-03-24 (%Y-%m-%d|%A %Y %B %d)" },

 { "User defined","Benutzerdefiniert" },

 { "User long date:","Format langes Datum:" },

 { "User short date:","Format kurzes Datum:" },

 { "Monday 19 April 2004: %A %d %B %Y","Monday 19 April 2004: %A %d %B %Y" },

 { "Mon 19.04.04: %a %d.%m.%y","Mon 19.04.04: %a %d.%m.%y" },

 { "Mon, 19.Apr.04: %a, %d.%b.%y","Mon, 19.Apr.04: %a, %d.%b.%y" },

 { "Date Format","Datums Format" },

 { "Timezone:","Zeitzone:" },

 { "Add 30 min to selected Timezone","Addiere 30 min zur Zeitzone" },

 { "Timezone has daylight saving","Zeitzone hat Sommerzeit" },

 { "Actual start and end is the\nsunday before this date.","Tatsächlicher Beginn/Ende ist der\nSonntag vor diesem Datum!" },

 { "The year in the date is ignored.","Das Jahr vom Datum wird ignoriert." },

-{ "Daylight start:","Sommerzeit Beginn:" },

+{ "Daylight start:","Sommerzeit Start:" },

 { "Mon","Mo" },

 { "Tue","Di" },

 { "Wed","Mi" },

 { "Thu","Do" },

 { "Fri","Fr" },

 { "Sat","Sa" },

 { "Sun","So" },

 { "January","Januar" },

 { "February","Februar" },

 { "March","März" },

 { "April","April" },

 { "May","Mai" },

 { "June","Juni" },

 { "July","July" },

 { "August","August" },

 { "September","September" },

 { "October","October" },

 { "November","November" },

 { "December","Dezember" },

 { "tomorrow","Morgen" },

 { "today","Heute" },

 { "yesterday","Gestern" },

 { "Monday","Montag" },

 { "Tuesday","Dienstag" },

 { "Wednesday","Mittwoch" },

 { "Thursday","Donnerstag" },

 { "Friday","Freitag" },

 { "Saturday","Samstag" },

 { "Sunday","Sonntag" },

 { "Daylight end:","Sommerzeit Ende:" },

 { "Time Zone","Zeit Zone" },

 { "Used Mail Client","Benutzter Mail Client" },

 { "Channel:","Channel:" },

 { "Message:","Message:" },

 { "Parameters:","Parameter:" },

 { "HINT: Delimiter=; Name=%1,Email=%2","Hinweis: Begrenzer=; Name=%1,Email=%2" },

 { "extra Message:","extra Message:" },

 { "extra Parameters:","extra Parameter:" },

 { "HINT: Emails=%1,Attachments=%2","Hinweis: Emails=%1,Attachments=%2" },

 { "External Apps.","Externe Appl." },

 { "Your current storage dir is:\n%1\nYour mail is stored in:\n(storagedir)/apps/kopiemail/localmail","Aktuelles Speicherverzeichnis ist:\n%1\nIhre Mail wird gespeichert in:\n(speicherverz.)/apps/kopiemail/localmail" },

 { "<b>New data storage dir:</b>","<b>Neues Datenspeicherverzeichnis:</b>" },

 { "New dirs are created automatically","Neue Verzeichnisse werden aut. erstellt" },

 { "Save settings","Speichere Einstellungen" },

 { "Save standard","Speichere Standard" },

 { "<b>New settings are used\nafter a restart</b>","<b>Neue Einstellungen werden nach\neinem Neustart genutzt</b>" },

 { "Settings are stored in\n%1","Einstellungen werden gespeichert in:\n%1" },

 { "Data storage path","Daten Speicherpfad" },

 { "Used %1 Client","Benutzer %1 Client" },

 { "No email client installed","Keine Email Client installiert" },

 { "Userdefined email client","Benutzerdef. Email Client" },

 { "OM/Pi email client","OM/Pi Email Client" },

 { "URL:","URL:" },

 { "No","Nein" },

 { "Yes","Ja" },

 { "Untitled","Unbenannt" },

 { "&New","&Neu" },

 { "&Open","&Öffne" },

 { "&Close","Schließen" },

 { "Save &as...","Speichere &als..." },

 { "&Text-file...","&Text-Datei..." },

 { "&Gpasman / Kpasman ...","&Gpasman / Kpasman ..." },

 { "&CSV (Comma Separated Value) ...","&CSV (Komma getrennte Werte) ..." },

 { "E&xport","E&xport" },

 { "I&mport","I&mport" },

 { "&Quit","Beenden" },

 { "&Add password","&Passwort hinzufügen" },

 { "&Delete","Lösche" },

 { "Change &Master Password","Ändere &Master Passwort" },

 { "&Manage","Verwalte" },

 { "&Find","&Finde" },

 { "&Lock all entries","Sperre alle Einträge" },

 { "&Deep-lock all entries","Sperre total alle Einträge" },

 { "&Unlock all entries","Entsperre alle Einträge" },

 { "&Configure...","Konfiguriere..." },

 { "&Options","Konfig" },

 { "C&ategories...","K&ategorien..." },

 { "&Sync","&Sync" },

 { "&License","&Lizenz" },

 { "&Faq","&Faq" },

 { "&About PwManager","Über PwManager" },

 { "&Sync HowTo","&Sync HowTo" },

 { "&What's New","Was ist neu?" },

 { "New","Neu" },

 { "Open","Öffnen" },

 { "Save","Speichern" },

 { "Save as","Speichern als" },

 { "Print...","Drucke..." },

 { "Add password","Passwort hinzufügen" },

 { "Edit password","Passwort ändern" },

 { "Delete password","Passwort löschen" },

 { "Find entry","Finde Eintrag" },

 { "Lock all entries","Sperre alle Einträge" },

 { "Deep-Lock all entries","Sperre total alle Einträge" },

 { "Unlock all entries","Entsperre alle Einträge" },

 { "Categories:","Kategorien:" },

diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index df606d0..c32a2a4 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -1,342 +1,346 @@
 /*
     This file is part of KOrganizer.
     Copyright (c) 2001 Eitzenberger Thomas <thomas.eitzenberger@siemens.at>
     Parts of the source code have been copied from kdpdatebutton.cpp
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source ode for Qt in the source distribution.
 */
 
 #include <qevent.h>
 #include <qpainter.h>
 #include <qptrlist.h>
 #include <qtimer.h>
 #include <qwhatsthis.h>
 
 #include <kglobal.h>
 #include <kdebug.h>
 #include <klocale.h>
 
 #include <libkcal/vcaldrag.h>
 #include <libkcal/icaldrag.h>
 #include <libkcal/dndfactory.h>
 #include <libkcal/calendarresources.h>
 #include <libkcal/resourcecalendar.h>
 #include <kresources/resourceselectdialog.h>
 
 #include <kcalendarsystem.h>
 
 #ifndef KORG_NOPLUGINS
 #include "kocore.h"
 #endif
 #include "koprefs.h"
 #include "koglobals.h"
 
 #include "kodaymatrix.h"
 
 // ============================================================================
 //  D Y N A M I C   T I P
 // ============================================================================
 
 DynamicTip::DynamicTip( QWidget * parent )
     : QToolTip( parent )
 {
     matrix = (KODayMatrix*)parent;
 }
 
 class KODaymatrixWhatsThis :public QWhatsThis
 {
 public:
     KODaymatrixWhatsThis( KODayMatrix* view ) : QWhatsThis( view ),_view (view) { ;};
-    ~KODaymatrixWhatsThis() { ;  };
+    ~KODaymatrixWhatsThis() { qDebug("DELETE KODaymatrixWhatsThis ");  };
 
 protected:
   virtual QString text( const QPoint& p )
   {
     return _view->getWhatsThisText( p ) ;
   }
 private:
   KODayMatrix * _view;
 };
 
 void DynamicTip::maybeTip( const QPoint &pos )
 {
   //calculate which cell of the matrix the mouse is in
   QRect sz = matrix->frameRect();
   int dheight = sz.height()*7 / 42;
   int dwidth = sz.width() / 7;
   int row = pos.y()/dheight;
   int col = pos.x()/dwidth;
 
   QRect rct(col*dwidth, row*dheight, dwidth, dheight);
 
 //  kdDebug() << "DynamicTip::maybeTip matrix cell index [" <<
 //                col << "][" << row << "] => " <<(col+row*7) << endl;
 
   //show holiday names only
   QString str = matrix->getHolidayLabel(col+row*7);
   if (str.isEmpty()) return;
   tip(rct, str);
 }
 
 
 // ============================================================================
 //  K O D A Y M A T R I X
 // ============================================================================
 
 const int KODayMatrix::NOSELECTION = -1000;
 const int KODayMatrix::NUMDAYS = 42;
 
 KODayMatrix::KODayMatrix( QWidget *parent, const char *name )
     : QFrame( parent, name , Qt::WRepaintNoErase ), mCalendar( 0 )
 
-#if 0
-KODayMatrix::KODayMatrix(QWidget *parent, Calendar* calendar, QDate date, const char *name) :
-  QFrame(parent, name)
-#endif
+
 { 
+    mLastView = -1;
     oldW = 0;
     oldH = 0;
     myPix.resize( 150, 120 );
     mRedrawNeeded = true;
   mKODaymatrixWhatsThis =  new KODaymatrixWhatsThis(this);
   mPendingUpdateBeforeRepaint = false;
   mouseDown = false;
   // initialize dynamic arrays
   bDays.resize ( NUMDAYS );
   pDays.resize ( NUMDAYS );
   hDays.resize ( NUMDAYS );
   eDays.resize ( NUMDAYS );
   days = new QDate[NUMDAYS];
   daylbls = new QString[NUMDAYS];
   //events = new int[NUMDAYS];
   mToolTip = new DynamicTip(this);
 
   // set default values used for drawing the matrix
   mDefaultBackColor = palette().active().base();
   mDefaultTextColor = palette().active().foreground();
   mDefaultTextColorShaded = getShadedColor(mDefaultTextColor);
   mHolidayColorShaded = getShadedColor(KOPrefs::instance()->mHolidayColor);
   mSelectedDaysColor = QColor("white");
   mTodayMarginWidth = 2;
   mSelEnd = mSelStart = NOSELECTION;
 
   setAcceptDrops(true);
   //setFont( QFont("Arial", 10) );
 
   mUpdateTimer = new QTimer( this );
   connect (mUpdateTimer ,SIGNAL(timeout()), this, SLOT ( updateViewTimed() ));
   mRepaintTimer = new QTimer( this );
   connect (mRepaintTimer ,SIGNAL(timeout()), this, SLOT ( repaintViewTimed() ));
   mDayChanged = false;
   updateView();
 }
 QString KODayMatrix::getWhatsThisText( QPoint p )
 {
 
     int tmp = getDayIndexFrom(p.x(), p.y());
     if ( tmp < 0 || tmp > NUMDAYS-1 || !mCalendar )
         return QString();
     QDate mDate = days[tmp];
     QPtrList<Event> eventlist = mCalendar->events(mDate);
     Event *event;
     QStringList mToolTip;
     for(event=eventlist.first();event != 0;event=eventlist.next()) {
         QString mToolTipText;
         QString text;
         int multiday = 0;// 1 = start, 2 = midddle, 3 = end day
         if (event->isMultiDay()) {
             QString prefix = "<->";multiday = 2; 
             QString time;
             if ( event->doesRecur() ) {
                 if ( event->recursOn( mDate) ) {
                     prefix ="->" ;multiday = 1;
                 }
                 else {
                     int days =  event->dtStart().date().daysTo ( event->dtEnd().date() );
                     if ( event->recursOn( mDate.addDays( -days)) ) {
                         prefix ="<-" ;multiday = 3;
                     }
                 } 
             } else {
                 if (mDate == event->dtStart().date()) {
                     prefix ="->" ;multiday = 1;
                 } else if (mDate == event->dtEnd().date()) {
                     prefix ="<-" ;multiday = 3;
                 }
             }
             if ( !event->doesFloat() ) {
                 if ( mDate == event->dtStart().date () )
                     time = KGlobal::locale()->formatTime(event->dtStart().time())+" ";
                 else if ( mDate == event->dtEnd().date () )
                     time = KGlobal::locale()->formatTime(event->dtEnd().time())+" ";
 
             }
             text = time + event->summary();
             mToolTipText += prefix + text;
         } else {
             if (event->doesFloat()) {
                 text = event->summary();
                 mToolTipText += text;
             }
             else {
                 text = KGlobal::locale()->formatTime(event->dtStart().time());
                 text += " " + event->summary();
                 mToolTipText +=  KGlobal::locale()->formatTime(event->dtStart().time()) +"-"+KGlobal::locale()->formatTime(event->dtEnd().time())+" " + event->summary();
             }
         }
         if ( !event->location().isEmpty() )
             mToolTipText += " (" + event->location() + ")";
 #if QT_VERSION >= 0x030000
         mToolTipText.replace( '<' , "&lt;" );
         mToolTipText.replace( '>' , "&gt;" );
 #else
         if ( mToolTipText.find ('<') >= 0 ) {
             mToolTipText.replace( QRegExp("<") , "&lt;" );
         }
         if ( mToolTipText.find ('>') >= 0 ) {
             mToolTipText.replace( QRegExp(">") , "&gt;" );
         }
 #endif
         //qDebug("TTT: %s ", mToolTipText.latin1());
         mToolTip.append( mToolTipText );
     }
     mToolTip.sort();
     return  "<b>"+KGlobal::locale()->formatDate(days[tmp]) + "</b><br>" + mToolTip.join("<br>");
 }
 void KODayMatrix::setCalendar( Calendar *cal )
 {
   mCalendar = cal;
 
   setAcceptDrops( mCalendar );
 
   updateEvents();
 }
 
 QColor KODayMatrix::getShadedColor(QColor color)
 {
   QColor shaded;
   int h=0;
   int s=0;
   int v=0;
   color.hsv(&h,&s,&v);
   s = s/4;
   v = 192+v/4;
   shaded.setHsv(h,s,v);
 
   return shaded;
 }
 
 KODayMatrix::~KODayMatrix()
 {
+#if QT_VERSION >= 0x030000
+
+#else
+   delete mKODaymatrixWhatsThis;
+#endif 
+
     //  delete mKODaymatrixWhatsThis;
   delete [] days;
   delete [] daylbls;
   //delete [] events;
   delete mToolTip;
 }
 
 /*
 void KODayMatrix::setStartDate(QDate start)
 {
   updateView(start);
 }
 */
 
 void KODayMatrix::addSelectedDaysTo(DateList& selDays)
 {
  
   if (mSelStart == NOSELECTION) {
     return;
   }
 
   //cope with selection being out of matrix limits at top (< 0)
   int i0 = mSelStart;
   if (i0 < 0) {
     for (int i = i0; i < 0; i++) {
       selDays.append(days[0].addDays(i));
     }
     i0 = 0;
   }
 
   //cope with selection being out of matrix limits at bottom (> NUMDAYS-1)
   if (mSelEnd > NUMDAYS-1) {
     for (int i = i0; i <= NUMDAYS-1; i++) {
       selDays.append(days[i]);
     }
     for (int i = NUMDAYS; i < mSelEnd; i++) {
       selDays.append(days[0].addDays(i));
     }
 
   // apply normal routine to selection being entirely within matrix limits
   } else {
     for (int i = i0; i <= mSelEnd; i++) {
       selDays.append(days[i]);
     }
   }
 }
 
 bool KODayMatrix::setSelectedDaysFrom(const QDate& start, const QDate& end)
 {  
     mRedrawNeeded = true;
     bool noSel = (mSelEnd == NOSELECTION && mSelStart == NOSELECTION );
   mSelStart = startdate.daysTo(start);
   if ( mSelStart < 0 )
       mSelStart = 0;
   mSelEnd = startdate.daysTo(end);
   if ( mSelEnd  > NUMDAYS-1 )
       mSelEnd = NUMDAYS-1;
   if ( mSelEnd < 0 || mSelStart >  NUMDAYS-1 ) {
       clearSelection();
       if ( noSel )
           return false;
   }
  
   return true;
 }
 void KODayMatrix::clearSelection()
 {
     mSelEnd = mSelStart = NOSELECTION;
 }
 
 
 void KODayMatrix::recalculateToday()
 {
     today = -1;
     for (int i=0; i<NUMDAYS; i++) {
         //events[i] = 0;
       days[i] = startdate.addDays(i);
       daylbls[i] = QString::number( KOGlobals::self()->calendarSystem()->day( days[i] ));
       
       // if today is in the currently displayed month, hilight today
       if (days[i].year() == QDate::currentDate().year() &&
           days[i].month() == QDate::currentDate().month() &&
           days[i].day() == QDate::currentDate().day()) {
         today = i;
       }
     }
     // qDebug(QString("Today is visible at %1.").arg(today));
 }
 
 void KODayMatrix::updateView()
 {
   updateView(startdate);
 }
 void KODayMatrix::repaintViewTimed()
 { 
     mRedrawNeeded = true;
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index d9d7924..e4bee63 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -935,196 +935,192 @@ dummy =
 
  dummy =
     addWidBool(i18n("Colors are applied to text"),
                &(KOPrefs::instance()->mTodoViewUsesForegroundColor),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
 
  dummy =
     addWidBool(i18n("Allday Agenda view shows todos"),
                &(KOPrefs::instance()->mShowTodoInAgenda),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
 
 
    topFrame = addPage(i18n("View Options"),0,0);
 
   topLayout = new QGridLayout(topFrame,4,1);
   topLayout->setSpacing(mSpacingHint);
   topLayout->setMargin(mMarginHint);
   ii = 0;  
 
    dummy  =
       addWidBool(i18n("Show Sync Events"),
                  &(KOPrefs::instance()->mShowSyncEvents),topFrame);
   topLayout->addWidget(dummy->checkBox(), ii++,0);
 
   lab = new QLabel( i18n("Show in todo/event viewer:"), topFrame);
   topLayout->addWidget(lab ,ii++,0);
 
   dummy = addWidBool(i18n("Details"),
                &(KOPrefs::instance()->mEVshowDetails),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
   dummy = addWidBool(i18n("Created time"),
                &(KOPrefs::instance()->mEVshowCreated),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
   dummy = addWidBool(i18n("Last modified time"),
                &(KOPrefs::instance()->mEVshowChanged),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
 
 
   lab = new QLabel( i18n("Show in What'sThis quick overview:"), topFrame);
   topLayout->addWidget(lab ,ii++,0);
 
   dummy = addWidBool(i18n("Details"),
                &(KOPrefs::instance()->mWTshowDetails),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
   dummy = addWidBool(i18n("Created time"),
                &(KOPrefs::instance()->mWTshowCreated),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
   dummy = addWidBool(i18n("Last modified time"),
                &(KOPrefs::instance()->mWTshowChanged),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
 
 
    topFrame = addPage(i18n("Alarm"),0,0);
     //  DesktopIcon("viewmag",KIcon::SizeMedium));
 
   topLayout = new QGridLayout(topFrame,2,1);
   topLayout->setSpacing(mSpacingHint);
   topLayout->setMargin(mMarginHint);
   int iii = 0;
 
  dummy =
     addWidBool(i18n("Use internal alarm notification"),
                &(KOPrefs::instance()->mUseInternalAlarmNotification),topFrame);
   topLayout->addWidget(dummy->checkBox(),iii++,0);
   lab = new QLabel( i18n("Note: KO/Pi must be running to notify you about an alarm. Recommended for use on Zaurus: Disable this option and install KO/Pi alarm applet.\n"), topFrame);
 
    topLayout->addWidget(lab ,iii++,0);
 #ifndef DESKTOP_VERSION
     lab->setAlignment( AlignLeft|WordBreak|AlignTop);
 #else
     lab->setAlignment( AlignLeft|BreakAnywhere|WordBreak|AlignTop);
     lab->setSizePolicy( QSizePolicy(  QSizePolicy::Ignored , QSizePolicy::Ignored,true) );
 #endif
  
     QHBox* dummyBox = new QHBox(topFrame);
     new QLabel(i18n("Play beeps count:"),dummyBox);
     mAlarmPlayBeeps = new QSpinBox(0,500,1,dummyBox);
     topLayout->addWidget(dummyBox,iii++,0);
 
     dummyBox = new QHBox(topFrame);
     new QLabel(i18n("Beeps interval in sec:"),dummyBox);
     mAlarmBeepInterval = new QSpinBox(1,600,1,dummyBox);
     topLayout->addWidget(dummyBox,iii++,0);
 
     dummyBox = new QHBox(topFrame);
     new QLabel(i18n("Default suspend time in min:"),dummyBox);
     mAlarmSuspendTime = new QSpinBox(1,600,1,dummyBox);
     topLayout->addWidget(dummyBox,iii++,0);
 
     dummyBox = new QHBox(topFrame);
     new QLabel(i18n("Auto suspend count:"),dummyBox);
     mAlarmSuspendCount = new QSpinBox(0,60,1,dummyBox);
     topLayout->addWidget(dummyBox,iii++,0);
 
 
 
-
-
-
-
     QHBox* hbo = new QHBox ( topFrame );
     mDefaultAlarmFile = new QLineEdit(hbo);
     QPushButton * loadTemplate = new QPushButton(hbo); 
     QPixmap icon;
     if ( QApplication::desktop()->width() < 321 ) 
         icon = SmallIcon("fileimport16");
     else
         icon = SmallIcon("fileimport");
     loadTemplate->setIconSet (icon ) ; 
     connect( loadTemplate, SIGNAL( clicked() ), this , SLOT( selectSoundFile() ) );
     int size = loadTemplate->sizeHint().height();
     loadTemplate->setFixedSize(  size, size );
   //lab = new QLabel( i18n("This setting is useless for 5500 user!"), topFrame);
   // topLayout->addWidget(lab ,iii++,0);
    lab = new QLabel( i18n("Alarm *.wav file for newly created alarm:"), topFrame);
    topLayout->addWidget(lab ,iii++,0);
    topLayout->addWidget(hbo,iii++,0);
   //  lab = new QLabel( i18n("Note: This does not mean, that for every alarm this file is replayed. This file here is associated with a newly created alarm."), topFrame);
 
 //    topLayout->addWidget(lab ,iii++,0);
 // #ifndef DESKTOP_VERSION
 //     lab->setAlignment( AlignLeft|WordBreak|AlignTop);
 // #else
 //     lab->setAlignment( AlignLeft|BreakAnywhere|WordBreak|AlignTop);
 //     lab->setSizePolicy( QSizePolicy(  QSizePolicy::Ignored , QSizePolicy::Ignored,true) );
 // #endif
  
 
 }
 
 void KOPrefsDialog::selectSoundFile()
 {
     QString fileName = mDefaultAlarmFile->text();
     fileName = KFileDialog::getSaveFileName(  mDefaultAlarmFile->text() , "Choose default alarm file", this );
      if ( fileName.length() > 0 )
          mDefaultAlarmFile->setText( fileName );
 }
 void KOPrefsDialog::setupFontsTab()
 {
  
     QFrame *topFrame = addPage(i18n("Fonts"),0,0);
     //  DesktopIcon("fonts",KIcon::SizeMedium));
 
   QGridLayout *topLayout = new QGridLayout(topFrame,7,3);
   topLayout->setSpacing(1);
   topLayout->setMargin(3);
   KPrefsDialogWidFont * tVFont;
   int i = 0;
   KPrefsDialogWidFont *timeLabelsFont =
       addWidFont(i18n("23"),i18n("DateNavigator:(nr)"),
                  &(KOPrefs::instance()->mDateNavigatorFont),topFrame);
   topLayout->addWidget(timeLabelsFont->label(),i,0);
   topLayout->addWidget(timeLabelsFont->preview(),i,1);
   topLayout->addWidget(timeLabelsFont->button(),i,2);
   ++i;
 
 
   timeLabelsFont =
       addWidFont(i18n("Mon 15"),i18n("Date Labels:"),
                  &(KOPrefs::instance()->mTimeLabelsFont),topFrame);
   topLayout->addWidget(timeLabelsFont->label(),i,0);
   topLayout->addWidget(timeLabelsFont->preview(),i,1);
   topLayout->addWidget(timeLabelsFont->button(),i,2);
   ++i;
 
   KPrefsDialogWidFont *timeBarFont =
       addWidFont(KGlobal::locale()->formatTime(QTime(12,34)),i18n("Time bar:"),
                  &(KOPrefs::instance()->mTimeBarFont),topFrame);
   topLayout->addWidget(timeBarFont->label(),i,0);
   topLayout->addWidget(timeBarFont->preview(),i,1);
   topLayout->addWidget(timeBarFont->button(),i,2);
   ++i;
 
 
   KPrefsDialogWidFont *marcusBainsFont =
       addWidFont(KGlobal::locale()->formatTime(QTime(12,34,23)),i18n("M. Bains line:"),
                  &(KOPrefs::instance()->mMarcusBainsFont),topFrame);
   topLayout->addWidget(marcusBainsFont->label(),i,0);
   topLayout->addWidget(marcusBainsFont->preview(),i,1);
   topLayout->addWidget(marcusBainsFont->button(),i,2);
   ++i;
 
   tVFont =
       addWidFont(i18n("Summary"),i18n("Event Viewer:"),
                  &(KOPrefs::instance()->mEventViewFont),topFrame);
   topLayout->addWidget(tVFont->label(),i,0);
   topLayout->addWidget(tVFont->preview(),i,1);
   topLayout->addWidget(tVFont->button(),i,2);
   ++i;
 
 
 
   tVFont =
       addWidFont(i18n("Details"),i18n("EditorBox:"),
                  &(KOPrefs::instance()->mEditBoxFont),topFrame);
   topLayout->addWidget(tVFont->label(),i,0);
diff --git a/libkcal/icalformatimpl.cpp b/libkcal/icalformatimpl.cpp
index fe7413f..2405682 100644
--- a/libkcal/icalformatimpl.cpp
+++ b/libkcal/icalformatimpl.cpp
@@ -602,217 +602,220 @@ icalproperty *ICalFormatImpl::writeRecurrenceRule(Recurrence *recur)
       r.freq = ICAL_MONTHLY_RECURRENCE;
 
       tmpDays = recur->monthDays();
       for (tmpDay = tmpDays.first();
            tmpDay;
            tmpDay = tmpDays.next()) {
         r.by_month_day[index++] = icalrecurrencetype_day_position(*tmpDay*8);//*tmpDay);
       }
 //      r.by_day[index] = ICAL_RECURRENCE_ARRAY_MAX;
       break;
     case Recurrence::rYearlyMonth:
     case Recurrence::rYearlyPos:
       r.freq = ICAL_YEARLY_RECURRENCE;
 
       tmpDays = recur->yearNums();
       for (tmpDay = tmpDays.first();
            tmpDay;
            tmpDay = tmpDays.next()) {
         r.by_month[index++] = *tmpDay;
       }
 //      r.by_set_pos[index] = ICAL_RECURRENCE_ARRAY_MAX;
       if (recur->doesRecur() == Recurrence::rYearlyPos) {
         tmpPositions = recur->monthPositions();
         for (tmpPos = tmpPositions.first();
              tmpPos;
              tmpPos = tmpPositions.next()) {
           for (i = 0; i < 7; i++) {
             if (tmpPos->rDays.testBit(i)) {
               day = (i + 1)%7 + 1;     // convert from Monday=0 to Sunday=1
               day += tmpPos->rPos*8;
               if (tmpPos->negative) day = -day;
               r.by_day[index2++] = day;
             }
           }
         }
 //        r.by_day[index2] = ICAL_RECURRENCE_ARRAY_MAX;
       }
       break;
     case Recurrence::rYearlyDay:
       r.freq = ICAL_YEARLY_RECURRENCE;
 
       tmpDays = recur->yearNums();
       for (tmpDay = tmpDays.first();
            tmpDay;
            tmpDay = tmpDays.next()) {
         r.by_year_day[index++] = *tmpDay;
       }
 //      r.by_year_day[index] = ICAL_RECURRENCE_ARRAY_MAX;
       break;
     default:
       r.freq = ICAL_NO_RECURRENCE;
       kdDebug(5800) << "ICalFormatImpl::writeRecurrence(): no recurrence" << endl;
       break;
   }
 
   r.interval = recur->frequency();
 
   if (recur->duration() > 0) {
     r.count = recur->duration();
   } else if (recur->duration() == -1) {
     r.count = 0;
   } else {
     if (datetime)
       r.until = writeICalDateTime(recur->endDateTime());
     else
       r.until = writeICalDate(recur->endDate());
   }
 
 // Debug output
 #if 0
   const char *str = icalrecurrencetype_as_string(&r);
   if (str) {
     kdDebug(5800) << " String: " << str << endl;
   } else {
     kdDebug(5800) << " No String" << endl;
   }
 #endif
 
   return icalproperty_new_rrule(r);
 }
 
 icalcomponent *ICalFormatImpl::writeAlarm(Alarm *alarm)
 {
   icalcomponent *a = icalcomponent_new(ICAL_VALARM_COMPONENT);
 
   icalproperty_action action;
   icalattach *attach = 0;
 
   switch (alarm->type()) {
     case Alarm::Procedure:
       action = ICAL_ACTION_PROCEDURE;
       attach = icalattach_new_from_url( QFile::encodeName(alarm->programFile()).data() );
       icalcomponent_add_property(a,icalproperty_new_attach(attach));
       if (!alarm->programArguments().isEmpty()) {
         icalcomponent_add_property(a,icalproperty_new_description(alarm->programArguments().utf8()));
       }
+      icalattach_unref( attach );
       break;
     case Alarm::Audio:
       action = ICAL_ACTION_AUDIO;
       if (!alarm->audioFile().isEmpty()) {
           attach = icalattach_new_from_url(QFile::encodeName( alarm->audioFile() ).data());
         icalcomponent_add_property(a,icalproperty_new_attach(attach));
+          icalattach_unref( attach );
       }
       break;
     case Alarm::Email: {
       action = ICAL_ACTION_EMAIL;
       QValueList<Person> addresses = alarm->mailAddresses();
       for (QValueList<Person>::Iterator ad = addresses.begin();  ad != addresses.end();  ++ad) {
         icalproperty *p = icalproperty_new_attendee("MAILTO:" + (*ad).email().utf8());
         if (!(*ad).name().isEmpty()) {
           icalproperty_add_parameter(p,icalparameter_new_cn((*ad).name().utf8()));
         }
         icalcomponent_add_property(a,p);
       }
       icalcomponent_add_property(a,icalproperty_new_summary(alarm->mailSubject().utf8()));
       icalcomponent_add_property(a,icalproperty_new_description(alarm->text().utf8()));
       QStringList attachments = alarm->mailAttachments();
       if (attachments.count() > 0) {
         for (QStringList::Iterator at = attachments.begin();  at != attachments.end();  ++at) {
             attach = icalattach_new_from_url(QFile::encodeName( *at ).data());
           icalcomponent_add_property(a,icalproperty_new_attach(attach));
+            icalattach_unref( attach );
         }
       }
       break;
     }
     case Alarm::Display:
       action = ICAL_ACTION_DISPLAY;
       icalcomponent_add_property(a,icalproperty_new_description(alarm->text().utf8()));
       break;
     case Alarm::Invalid:
     default:
       kdDebug(5800) << "Unknown type of alarm" << endl;
       action = ICAL_ACTION_NONE;
       break;
   }
   icalcomponent_add_property(a,icalproperty_new_action(action));
 
   // Trigger time
   icaltriggertype trigger;
   if ( alarm->hasTime() ) {
     trigger.time = writeICalDateTime(alarm->time());
     trigger.duration = icaldurationtype_null_duration();
   } else {
     trigger.time = icaltime_null_time();
     Duration offset;
     if ( alarm->hasStartOffset() )
       offset = alarm->startOffset();
     else
       offset = alarm->endOffset();
     trigger.duration = icaldurationtype_from_int( offset.asSeconds() );
   }
   icalproperty *p = icalproperty_new_trigger(trigger);
   if ( alarm->hasEndOffset() )
     icalproperty_add_parameter(p,icalparameter_new_related(ICAL_RELATED_END));
   icalcomponent_add_property(a,p);
 
   // Repeat count and duration
   if (alarm->repeatCount()) {
     icalcomponent_add_property(a,icalproperty_new_repeat(alarm->repeatCount()));
     icalcomponent_add_property(a,icalproperty_new_duration(
                              icaldurationtype_from_int(alarm->snoozeTime()*60)));
   }
 
   // Custom properties
   QMap<QCString, QString> custom = alarm->customProperties();
   for (QMap<QCString, QString>::Iterator c = custom.begin();  c != custom.end();  ++c) {
     icalproperty *p = icalproperty_new_x(c.data().utf8());
     icalproperty_set_x_name(p,c.key());
     icalcomponent_add_property(a,p);
   }
 
   return a;
 }
 
 Todo *ICalFormatImpl::readTodo(icalcomponent *vtodo)
 {
   Todo *todo = new Todo;
 
   readIncidence(vtodo,todo);
 
   icalproperty *p = icalcomponent_get_first_property(vtodo,ICAL_ANY_PROPERTY);
 
 //  int intvalue;
   icaltimetype icaltime;
 
   QStringList categories;
 
   while (p) {
     icalproperty_kind kind = icalproperty_isa(p);
     switch (kind) {
 
       case ICAL_DUE_PROPERTY:  // due date
         icaltime = icalproperty_get_due(p);
         if (icaltime.is_date) {
           todo->setDtDue(QDateTime(readICalDate(icaltime),QTime(0,0,0)));
           todo->setFloats(true);
 
         } else {
           todo->setDtDue(readICalDateTime(icaltime));
           todo->setFloats(false);
         }
         todo->setHasDueDate(true);
         break;
 
       case ICAL_COMPLETED_PROPERTY:  // completion date
         icaltime = icalproperty_get_completed(p);
         todo->setCompleted(readICalDateTime(icaltime));
         break;
 
       case ICAL_PERCENTCOMPLETE_PROPERTY:  // Percent completed
         todo->setPercentComplete(icalproperty_get_percentcomplete(p));
         break;
 
       case ICAL_RELATEDTO_PROPERTY:  // related todo (parent)
         todo->setRelatedToUid(QString::fromUtf8(icalproperty_get_relatedto(p)));
         mTodosRelate.append(todo);
         break;
diff --git a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp
index 753d90a..fbfbc45 100644
--- a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp
+++ b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp
@@ -1,213 +1,252 @@
 /*
     This file is part of KdePim/Pi.
     Copyright (c) 2004 Ulf Schenk
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #include <qlayout.h>
 #include <qtabwidget.h>
 #include <qcombobox.h>
 #include <qgroupbox.h>
 #include <qlabel.h>
 #include <qlineedit.h>
 #include <qbuttongroup.h>
+#include <qcheckbox.h>
 #include <qfile.h>
 #include <qvbox.h>
 #include <qdir.h>
 #include <qregexp.h>
+#include <qspinbox.h>
 
 #include <kdialog.h>
 #include <kprefsdialog.h>
 #include <klocale.h>
+#include <kglobalsettings.h>
 #include <kdateedit.h>
 #include <kglobal.h>
 #include <stdlib.h>
 
 /*US
 #include <qcheckbox.h>
 #include <qframe.h>
 #include <qpushbutton.h>
 #include <qcombobox.h>
 #include <qlineedit.h>
 #include <qlabel.h>
 #include <qfile.h>
 
 #include <kconfig.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <klistview.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
 
 #ifndef KAB_EMBEDDED
 #include <ktrader.h>
 #else // KAB_EMBEDDED
 #include <mergewidget.h>
 #include <distributionlistwidget.h>
 #endif // KAB_EMBEDDED
 
 #include "addresseewidget.h"
 #include "extensionconfigdialog.h"
 #include "extensionwidget.h"
 */
 
 #include "qapplication.h"
 
 #include "kpimglobalprefs.h"
 
 #include "kdepimconfigwidget.h"
 #include <kprefs.h>
 #include <kmessagebox.h>
 
 
 KDEPIMConfigWidget::KDEPIMConfigWidget(KPimGlobalPrefs *prefs, QWidget *parent, const char *name )
   : KPrefsWidget(prefs, parent, name )
 {
   mExternalAppsMap.insert(ExternalAppHandler::EMAIL, i18n("Email"));
   mExternalAppsMap.insert(ExternalAppHandler::PHONE, i18n("Phone"));
   mExternalAppsMap.insert(ExternalAppHandler::SMS, i18n("SMS"));
   mExternalAppsMap.insert(ExternalAppHandler::FAX, i18n("Fax"));
   mExternalAppsMap.insert(ExternalAppHandler::PAGER, i18n("Pager"));
   mExternalAppsMap.insert(ExternalAppHandler::SIP, i18n("SIP"));
 
 
   QVBoxLayout *topLayout = new QVBoxLayout( this, 0,
                                             KDialog::spacingHint() );
 
   tabWidget = new QTabWidget( this );
   topLayout->addWidget( tabWidget );
 
 
   setupLocaleTab();
   setupLocaleDateTab();
   setupTimeZoneTab();
   setupExternalAppTab();
   setupStoreTab();
-
+  setupBackupTab();
 }
 void KDEPIMConfigWidget::showTimeZoneTab()
 {
     tabWidget->setCurrentPage ( 3 ) ;
 }
+void KDEPIMConfigWidget::setupBackupTab()
+{
+    QVBox *colorPage = new QVBox( this );
+    tabWidget->addTab( colorPage, i18n( "Backup" ) );
+    QWidget* topFrame = new QWidget( colorPage ); 
+    QVBoxLayout *topLayout = new QVBoxLayout(topFrame);
+    KPrefsWidBool *sb = addWidBool(i18n("Backup enabled"),
+                      &(KPimGlobalPrefs::instance()->mBackupEnabled),topFrame);
+    topLayout->addWidget((QWidget*)sb->checkBox());
+    QWidget* bupFrame = new QWidget( topFrame ); 
+    topLayout->addWidget((bupFrame));
+    QObject::connect ( sb->checkBox(), SIGNAL (toggled ( bool ) ), bupFrame, SLOT ( setEnabled( bool ) ) );
+    QVBoxLayout *bupLayout = new QVBoxLayout(bupFrame);
+    sb = addWidBool(i18n("Use standard backup dir"),
+                      &(KPimGlobalPrefs::instance()->mBackupEnabled),bupFrame);
+    bupLayout->addWidget((QWidget*)sb->checkBox());
+    mBackupUrl = new KURLRequester( bupFrame );
+    mBackupUrl->setURL( KGlobalSettings::backupDataDir() );
+    QObject::connect ( sb->checkBox(), SIGNAL (toggled ( bool ) ), mBackupUrl ,SLOT ( setDisabled( bool ) ) );
+    bupLayout->addWidget( mBackupUrl );
+
+
+    QHBox *dummy = new QHBox(bupFrame);
+    new QLabel(i18n("Number of Backups:"),dummy);
+    mBackupNumbersSpin = new QSpinBox(1,21,1,dummy);
+    new QLabel(i18n(" "),dummy);
+    bupLayout->addWidget( dummy );
+
+    dummy = new QHBox(bupFrame);
+    new QLabel(i18n("Make backup every "),dummy);
+    mBackupDayCountSpin = new QSpinBox(1,28,1,dummy);
+    new QLabel(i18n(" days"),dummy);
+    new QLabel(i18n(" "),dummy);
+    bupLayout->addWidget( dummy );
+
+}
 void KDEPIMConfigWidget::setupStoreTab()
 {
     QVBox *colorPage = new QVBox( this );
     tabWidget->addTab( colorPage, i18n( "Colors" ) );
     QWidget* cw = new QWidget( colorPage ); 
     KPrefsWidColor *holidayColor =
       addWidColor(i18n("Alternating background of list views"),
                   &(KPimGlobalPrefs::instance()->mAlternateColor),cw);
     QHBoxLayout *topLayout = new QHBoxLayout(cw);
     topLayout->addWidget(holidayColor->label());
     topLayout->addWidget( (QWidget* )holidayColor->button());
 
 
     QVBox *storePage = new QVBox( this );
     new QLabel( i18n("Your current storage dir is:\n%1\nYour mail is stored in:\n(storagedir)/apps/kopiemail/localmail").arg(KGlobal::dirs()->localkdedir()), storePage  );
     new QLabel( i18n("<b>New data storage dir:</b>"), storePage );
     mStoreUrl = new KURLRequester( storePage );
     mStoreUrl->setURL( KGlobal::dirs()->localkdedir() );
 #ifdef DESKTOP_VERSION     
     QString confFile = qApp->applicationDirPath ()+ "/.microkdehome" ;
     QFileInfo fi ( confFile );
     if ( fi.exists() ) {
         KConfig cfg (   confFile );
         cfg.setGroup("Global");
         QString localKdeDir = cfg.readEntry( "MICROKDEHOME", "x_x_x" );
         if ( localKdeDir != "x_x_x" ) {
             mStoreUrl->setURL( localKdeDir );
             qDebug("Reading config from %s ", confFile.latin1());
         }
     }
                
 #endif
     new QLabel( i18n("New dirs are created automatically"), storePage  );
     QHBox *bb = new QHBox( storePage );
     QPushButton * pb;
     if ( QApplication::desktop()->width() < 640 )
         pb = new QPushButton ( i18n("Save"), bb  );
     else
         pb = new QPushButton ( i18n("Save settings"), bb  );
     connect(pb, SIGNAL( clicked() ), this, SLOT ( saveStoreSettings() ) );
     pb = new QPushButton ( i18n("Save standard"), bb  );
     connect(pb, SIGNAL( clicked() ), this, SLOT ( setStandardStore() ) );
 #ifdef DESKTOP_VERSION
     pb = new QPushButton ( i18n("Save using LOCAL storage"), bb  );
     connect(pb, SIGNAL( clicked() ), this, SLOT ( setLocalStore() ) );
 #endif
     new QLabel( i18n("<b>New settings are used\nafter a restart</b>"), storePage );
     new QLabel( i18n("Settings are stored in\n%1").arg(QDir::homeDirPath() + "/.microkdehome" ), storePage  );
     tabWidget->addTab( storePage, i18n( "Data storage path" ) );
 }
 void KDEPIMConfigWidget::setLocalStore()
 {
     mStoreUrl->setURL(  "LOCAL:kdepimpi"  );
     saveStoreSettings();
     QString message = i18n("'LOCAL' mode makes is possible to run\nKA/Pi and KO/Pi from a USB memory stick.\nIn LOCAL mode the data is stored\nin a path relative to the executable.\nNote, that in LOCAL mode only addressbook\nresource files in\n <path of the executable>/<dirname after LOCAL:>/apps/kabc/*.vcf\n are supported.\nIf you use the standard addressbook settings\nyou do not have to reconfigure any path,\njust restart the application and import\nyour addressbook and calendar data.");
     KMessageBox::information( this, message);
 }
 void KDEPIMConfigWidget::setStandardStore()
 {
     mStoreUrl->setURL(  QDir::homeDirPath() + "/kdepim"  );
     saveStoreSettings();
 }
 void KDEPIMConfigWidget::saveStoreSettings()
 {
     if ( !mStoreUrl->url().isEmpty() ) {
         QString path = QDir::homeDirPath();
         QString url = mStoreUrl->url();
 #ifdef DESKTOP_VERSION
         if ( url.startsWith( "LOCAL:" ) ) {
             path = qApp->applicationDirPath () ;
         }
 #endif
         KConfig cfg (   path + "/.microkdehome" );
         cfg.setGroup("Global");
         cfg.writeEntry( "MICROKDEHOME", url ); 
         qDebug("cfg.writeEntry( MICROKDEHOME, %s  ", url.latin1());
         cfg.sync();
     } else {
         mStoreUrl->setURL(  QDir::homeDirPath() + "/kdepim"  );
         saveStoreSettings();
     }
 }
 void KDEPIMConfigWidget::setupExternalAppTab()
 {
   QWidget *externalAppsPage = new QWidget( this );
   QVBoxLayout* layout = new QVBoxLayout( externalAppsPage, KDialog::marginHintSmall(),
                                             KDialog::spacingHintSmall() );
 
   mExternalApps = new QComboBox( externalAppsPage );
 
   QMap<ExternalAppHandler::Types, QString>::Iterator it;
   for( it = mExternalAppsMap.begin(); it != mExternalAppsMap.end(); ++it )
     mExternalApps->insertItem( it.data(), it.key() );
 
   layout->addWidget( mExternalApps );
 
diff --git a/libkdepim/kcmconfigs/kdepimconfigwidget.h b/libkdepim/kcmconfigs/kdepimconfigwidget.h
index 984e4e0..c0b92a9 100644
--- a/libkdepim/kcmconfigs/kdepimconfigwidget.h
+++ b/libkdepim/kcmconfigs/kdepimconfigwidget.h
@@ -1,161 +1,163 @@
 /*
     This file is part of KDEPim/Pi.
     Copyright (c) 2004 Ulf Schenk
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #ifndef KDEPIMCONFIGWIDGET_H
 #define KDEPIMCONFIGWIDGET_H
 
 #include <kprefswidget.h>
 #include <kio/kfile/kurlrequester.h>
 #include <qmap.h>
 
 #include "externalapphandler.h"
 
 
 class QComboBox;
 class QLineEdit;
 class KPimGlobalPrefs;
 class QGroupBox;
 class QTabWidget;
 class KDateEdit;
 
 class KDEPIMConfigWidget : public KPrefsWidget
 {
   Q_OBJECT
 
   public:
     KDEPIMConfigWidget(KPimGlobalPrefs *prefs, QWidget *parent, const char *name = 0 );
 
   public slots:
     void textChanged( const QString& text );
     void showTimeZoneTab();
 
   protected:
     /** Implement this to read custom configuration widgets. */
   virtual void usrReadConfig();
     /** Implement this to write custom configuration widgets. */
   virtual void usrWriteConfig();
 
 
   private slots:
 //    void configureExtension();
 //    void selectionChanged( QListViewItem* );
 //    void itemClicked( QListViewItem* );
     void client_changed( int newClient );
     void externalapp_changed( int newApp );
     void saveStoreSettings();
     void setStandardStore();
     void setLocalStore(); 
 
   private:
     void setupExternalAppTab();
     void setupLocaleDateTab();
     void setupLocaleTab();
     void setupTimeZoneTab();
     void setupStoreTab();
+    void setupBackupTab();
     KURLRequester* mStoreUrl;
 
     void setCombo(QComboBox *combo,const QString & text, const QStringList *tags = 0);
 
 
     void saveEditFieldSettings();
     void updateClientWidgets();
 
     QTabWidget *tabWidget;
 
 
     QLineEdit* mUserDateFormatShort;
     QLineEdit* mUserDateFormatLong;
     QComboBox* mTimeZoneCombo;
     KDateEdit* mStartDateSavingEdit;
     KDateEdit* mEndDateSavingEdit; 
 
 //    void restoreExtensionSettings();
 //    void saveExtensionSettings();
 
 //    KListView *mExtensionView;
 
 //    QCheckBox *mNameParsing;
 //    QCheckBox *mViewsSingleClickBox;
 //    QPushButton *mConfigureButton;
 	QComboBox* mExternalApps;
 	QGroupBox* mExternalAppGroupBox;
 
 
     QComboBox* mClient;
     QLineEdit* mChannel;
     QLineEdit* mMessage;
     QLineEdit* mParameters;
     QLineEdit* mMessage2;
     QLineEdit* mParameters2;
 
     ExternalAppHandler::Types mCurrentApp;
     int mCurrentClient;
 
 
     int mEmailClient;
     QString mEmailOtherChannel;
     QString mEmailOtherMessage;
     QString mEmailOtherMessageParameters;
     QString mEmailOtherMessage2;
     QString mEmailOtherMessageParameters2;
 
     int mPhoneClient;
     QString mPhoneOtherChannel;
     QString mPhoneOtherMessage;
     QString mPhoneOtherMessageParameters;
 
     int mFaxClient;
     QString mFaxOtherChannel;
     QString mFaxOtherMessage;
     QString mFaxOtherMessageParameters;
 
     int mSMSClient;
     QString mSMSOtherChannel;
     QString mSMSOtherMessage;
     QString mSMSOtherMessageParameters;
 
     int mPagerClient;
     QString mPagerOtherChannel;
     QString mPagerOtherMessage;
     QString mPagerOtherMessageParameters;
 
     int mSipClient;
     QString mSipOtherChannel;
     QString mSipOtherMessage;
     QString mSipOtherMessageParameters;
 
 
-
+    KURLRequester* mBackupUrl;
+    QSpinBox* mBackupDayCountSpin, *mBackupNumbersSpin   ;
     QMap<ExternalAppHandler::Types, QString> mExternalAppsMap;
 
 //    AddresseeWidget *mAddresseeWidget;
 };
 
 #endif
diff --git a/libkdepim/kpimglobalprefs.cpp b/libkdepim/kpimglobalprefs.cpp
index 873f0eb..90321b2 100644
--- a/libkdepim/kpimglobalprefs.cpp
+++ b/libkdepim/kpimglobalprefs.cpp
@@ -18,192 +18,199 @@
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #include <kglobal.h>
 #include <kconfig.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kglobalsettings.h>
 #include <kstaticdeleter.h>
 
 #include <qregexp.h>
 #include <qfile.h>
 #include <stdlib.h>
 #include <qtextstream.h>
 #include <qapplication.h>
 #include "kpimglobalprefs.h"
 
 KPimGlobalPrefs *KPimGlobalPrefs::sInstance = 0;
 static KStaticDeleter<KPimGlobalPrefs> staticDeleterGP;
 
 
 KPimGlobalPrefs::KPimGlobalPrefs( const QString &name )
   : KPrefs("microkdeglobalrc")
 {
     mLocaleDict = 0;
   KPrefs::setCurrentGroup("Fonts");
   addItemFont("ApplicationFont",&mApplicationFont,KGlobalSettings::generalFont() );
   KPrefs::setCurrentGroup("Locale");
   addItemInt("PreferredLanguage",&mPreferredLanguage,0);
   addItemInt("PreferredTime",&mPreferredTime,0);
   addItemInt("PreferredDate",&mPreferredDate,0);
   addItemBool("WeekStartsOnSunday",&mWeekStartsOnSunday,false);
   addItemString("UserDateFormatLong", &mUserDateFormatLong, "%AK %d. %b %y");
   addItemString("UserDateFormatShort", &mUserDateFormatShort, "%aK %d.%m.%y");
 
   KPrefs::setCurrentGroup("Colors");
   addItemColor("AlternateBGcolor",&mAlternateColor,KGlobalSettings::alternateBackgroundColor());
 
 
   KPrefs::setCurrentGroup("Time & Date");
 
   addItemString("TimeZoneName",&mTimeZoneId, ("+01:00 Europe/Oslo(CET)") );
   addItemBool("UseDaylightsaving",&mUseDaylightsaving,true);
   addItemBool("TimeZoneAdd30min",&mTimeZoneAdd30min,false);
   addItemInt("DaylightsavingStart",&mDaylightsavingStart,90);
   addItemInt("DaylightsavingEnd",&mDaylightsavingEnd,304);
 
   KPrefs::setCurrentGroup( "ExternalApplications" );
 
   addItemInt( "EmailChannelType", &mEmailClient, OMPI_EMC );
   addItemString( "EmailChannel", &mEmailOtherChannel, "" );
   addItemString( "EmailChannelMessage", &mEmailOtherMessage, "" );
   addItemString( "EmailChannelParameters", &mEmailOtherMessageParameters, "" );
   addItemString( "EmailChannelMessage2", &mEmailOtherMessage2, "" );
   addItemString( "EmailChannelParameters2", &mEmailOtherMessageParameters2, "" );
 
   addItemInt( "PhoneChannelType", &mPhoneClient, KPPI_PHC );
   addItemString( "PhoneChannel", &mPhoneOtherChannel, "" );
   addItemString( "PhoneChannelMessage", &mPhoneOtherMessage, "" );
   addItemString( "PhoneChannelParameters", &mPhoneOtherMessageParameters, "" );
 
   addItemInt( "FaxChannelType", &mFaxClient, NONE_FAC );
   addItemString( "FaxChannel", &mFaxOtherChannel, "" );
   addItemString( "FaxChannelMessage", &mFaxOtherMessage, "" );
   addItemString( "FaxChannelParameters", &mFaxOtherMessageParameters, "" );
 
   addItemInt( "SMSChannelType", &mSMSClient, NONE_SMC );
   addItemString( "SMSChannel", &mSMSOtherChannel, "" );
   addItemString( "SMSChannelMessage", &mSMSOtherMessage, "" );
   addItemString( "SMSChannelParameters", &mSMSOtherMessageParameters, "" );
 
   addItemInt( "PagerChannelType", &mPagerClient, NONE_PAC );
   addItemString( "PagerChannel", &mPagerOtherChannel, "" );
   addItemString( "PagerChannelMessage", &mPagerOtherMessage, "" );
   addItemString( "PagerChannelParameters", &mPagerOtherMessageParameters, "" );
 
   addItemInt( "SIPChannelType", &mSipClient, KPPI_SIC );
   addItemString( "SIPChannel", &mSipOtherChannel, "" );
   addItemString( "SIPChannelMessage", &mSipOtherMessage, "" );
   addItemString( "SIPChannelParameters", &mSipOtherMessageParameters, "" );
 
   KPrefs::setCurrentGroup( "PhoneAccess" );
   addItemString("Ex2PhoneDevice",&mEx2PhoneDevice,"/dev/ircomm");
   addItemString("Ex2PhoneConnection",&mEx2PhoneConnection,"irda");
   addItemString("Ex2PhoneModel",&mEx2PhoneModel,"6310i");
 
+  KPrefs::setCurrentGroup( "BackupSettings" );
+  addItemString("BackupDatadir",&mBackupDatadir,KGlobalSettings::backupDataDir());
+  addItemInt( "BackupNumbers", &mBackupNumbers, 3 );
+  addItemInt( "BackupDayCount", &mBackupDayCount, 2 );
+  addItemBool( "BackupUseDefaultDir",&mBackupUseDefaultDir, true );
+  addItemBool( "BackupEnabled",&mBackupEnabled, false );
+
 }
 
 void KPimGlobalPrefs::setGlobalConfig()
 {
     if ( mLocaleDict == 0 ) {
         QString fileName ; 
         QString name = KGlobal::getAppName() +"/";
 #ifndef DESKTOP_VERSION
         fileName= QString(getenv("QPEDIR"))+"/pics/kdepim/"+name;
 #else
         fileName  = qApp->applicationDirPath () + "/kdepim/"+ name;
 #endif
         mLocaleDict = 0;
         if ( mPreferredLanguage > 0 && mPreferredLanguage < 5 ) {
          
             if ( mPreferredLanguage == 1 ) 
                 fileName = fileName+"germantranslation.txt"; 
             else if ( mPreferredLanguage == 4 ) 
                 fileName = fileName+"usertranslation.txt"; 
             else if ( mPreferredLanguage == 2 ) 
                 fileName = fileName+"frenchtranslation.txt"; 
             else if ( mPreferredLanguage == 3 ) 
                 fileName = fileName+"italiantranslation.txt";
             QFile file( fileName );
             if (file.open( IO_ReadOnly ) ) {
                 QTextStream ts( &file );
                 ts.setEncoding( QTextStream::Latin1 );
                 //ts.setCodec( QTextCodec::latin1 );
                 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 );
                 line = text.mid( br, nbr - br );
                 br = nbr+1;
                 int se, ee, st, et;
                 mLocaleDict = new QDict<QString>;
                 mLocaleDict->setAutoDelete( true );
                 QString end = "{ \"\",\"\" }";
                 while ( (line != end) && (br > 1)  ) {
                     //qDebug("%d *%s* ", br, line.latin1());
                     se = line.find("\"")+1;
                     et = line.findRev("\"",-1);
                     ee = line.find("\",\"");
                     st = ee+3;
                     we = line.mid( se, ee-se );
                     if (  mPreferredLanguage == 4  )
                         wt = QString::fromUtf8(line.mid( st, et-st ).latin1());
                     else
                         wt = line.mid( st, et-st );
                     //qDebug("*%s* *%s* ", we.latin1(), wt.latin1());
                     mLocaleDict->insert( we, new QString (wt) );
                     nbr = text.find ( "}", br );
                     line = text.mid( br, nbr - br );
                     br = nbr+1;
                 }
                 //qDebug("end *%s* ", end.latin1());
 
                 setLocaleDict( mLocaleDict );
             } else {
                 qDebug("KO: Cannot find translation file %s",fileName.latin1() );
             }
         }
     }
 
     KGlobal::locale()->setHore24Format( !mPreferredTime );
     KGlobal::locale()->setWeekStartMonday( !mWeekStartsOnSunday );
     KGlobal::locale()->setIntDateFormat( (KLocale::IntDateFormat)mPreferredDate );
     KGlobal::locale()->setLanguage( mPreferredLanguage );
     QString dummy = mUserDateFormatLong;
     KGlobal::locale()->setDateFormat(dummy.replace( QRegExp("K"), QString(",") ));
     dummy = mUserDateFormatShort;
     KGlobal::locale()->setDateFormatShort(dummy.replace( QRegExp("K"), QString(",") ));
     KGlobal::locale()->setDaylightSaving( mUseDaylightsaving,
                                           mDaylightsavingStart,
                                           mDaylightsavingEnd );
     KGlobal::locale()->setTimezone( mTimeZoneId, mTimeZoneAdd30min );
     KGlobalSettings::setAlternateBackgroundColor(mAlternateColor);
 
 }
 KPimGlobalPrefs::~KPimGlobalPrefs()
 { 
     if (sInstance == this)
       sInstance = staticDeleterGP.setObject(0); 
     else
         qDebug("Whats this? Error in KPimGlobalPrefs::~KPimGlobalPrefs() ?");
     if ( mLocaleDict )
         delete mLocaleDict;
 }
 
 KPimGlobalPrefs *KPimGlobalPrefs::instance()
 {
diff --git a/libkdepim/kpimglobalprefs.h b/libkdepim/kpimglobalprefs.h
index 36cc25a..94ac8ae 100644
--- a/libkdepim/kpimglobalprefs.h
+++ b/libkdepim/kpimglobalprefs.h
@@ -47,99 +47,105 @@ class KPimGlobalPrefs : public KPrefs
 
     enum EMailClients {
       NONE_EMC = 0,
       OTHER_EMC = 1,
       OMPI_EMC = 2,
       QTOPIA_EMC = 3,
       OPIE_EMC = 4,
       OPIE_MAILIT_EMC = 5
     };
 
     enum PhoneClients {
       NONE_PHC = 0,
       OTHER_PHC = 1,
       KPPI_PHC = 2
     };
 
     enum FaxClients {
       NONE_FAC = 0,
       OTHER_FAC = 1
     };
 
     enum SMSClients {
       NONE_SMC = 0,
       OTHER_SMC = 1
     };
 
     enum PagerClients {
       NONE_PAC = 0,
       OTHER_PAC = 1
     };
 
     enum SIPClients {
       NONE_SIC = 0,
       OTHER_SIC = 1,
       KPPI_SIC = 2
     };
 
   private:
     KPimGlobalPrefs( const QString &name = QString::null );
 
    static KPimGlobalPrefs *sInstance;
     QDict<QString> *mLocaleDict;
 
 
   public:
     //US I copied the following "locale" settings from KOPrefs 
     int mPreferredDate;
     QString mUserDateFormatLong;
     QString mUserDateFormatShort;
     int mPreferredLanguage;
     int mPreferredTime;
     bool mWeekStartsOnSunday;
     QString mTimeZoneId;
     bool mUseDaylightsaving;
     int mDaylightsavingStart;
     int mDaylightsavingEnd;
     bool mTimeZoneAdd30min;
     QFont mApplicationFont;
     QColor mAlternateColor;
 
     int mEmailClient;
     QString mEmailOtherChannel;
     QString mEmailOtherMessage;
     QString mEmailOtherMessageParameters;
     QString mEmailOtherMessage2;
     QString mEmailOtherMessageParameters2;
 
     int mPhoneClient;
     QString mPhoneOtherChannel;
     QString mPhoneOtherMessage;
     QString mPhoneOtherMessageParameters;
 
     int mFaxClient;
     QString mFaxOtherChannel;
     QString mFaxOtherMessage;
     QString mFaxOtherMessageParameters;
 
     int mSMSClient;
     QString mSMSOtherChannel;
     QString mSMSOtherMessage;
     QString mSMSOtherMessageParameters;
 
     int mPagerClient;
     QString mPagerOtherChannel;
     QString mPagerOtherMessage;
     QString mPagerOtherMessageParameters;
 
     int mSipClient;
     QString mSipOtherChannel;
     QString mSipOtherMessage;
     QString mSipOtherMessageParameters;
 
     QString mEx2PhoneDevice;
     QString mEx2PhoneConnection;
     QString mEx2PhoneModel;
 
+
+    bool mBackupEnabled;
+    QString mBackupDatadir;
+    bool mBackupUseDefaultDir;
+    int mBackupNumbers;
+    int mBackupDayCount;
 };
 
 #endif
diff --git a/libkdepim/kprefsdialog.cpp b/libkdepim/kprefsdialog.cpp
index dd9a602..b6ae775 100644
--- a/libkdepim/kprefsdialog.cpp
+++ b/libkdepim/kprefsdialog.cpp
@@ -187,193 +187,193 @@ KPrefsDialogWidTime::KPrefsDialogWidTime(const QString &text,int *reference,
 void KPrefsDialogWidTime::readConfig()
 {
   mSpin->setValue(*mReference);
 }
 
 void KPrefsDialogWidTime::writeConfig()
 {
   *mReference = mSpin->value();
 }
 
 QLabel *KPrefsDialogWidTime::label()
 {
   return mLabel;
 }
 
 QSpinBox *KPrefsDialogWidTime::spinBox()
 {
   return mSpin;
 }
 
 
 KPrefsDialogWidRadios::KPrefsDialogWidRadios(const QString &text,int *reference,
                 QWidget *parent)
 {
   mReference = reference;
 
   mBox = new QButtonGroup(1,Qt::Horizontal,text,parent);
 }
 
 KPrefsDialogWidRadios::~KPrefsDialogWidRadios()
 {
 }
 
 void KPrefsDialogWidRadios::addRadio(const QString &text)
 {
   new QRadioButton(text,mBox);
 }
 
 QButtonGroup *KPrefsDialogWidRadios::groupBox()
 {
   return mBox;
 }
 
 void KPrefsDialogWidRadios::readConfig()
 {
   mBox->setButton(*mReference);
 }
 
 void KPrefsDialogWidRadios::writeConfig()
 {
   *mReference = mBox->id(mBox->selected());
 }
 
 
 KPrefsDialogWidString::KPrefsDialogWidString(const QString &text,QString *reference,
                                  QWidget *parent, QLineEdit::EchoMode echomode)
 {
   mReference = reference;
   
   mLabel = new QLabel(text,parent);
   mEdit = new QLineEdit(parent);
   mEdit->setEchoMode( echomode );
 }
 
 KPrefsDialogWidString::~KPrefsDialogWidString()
 {
 }
 
 void KPrefsDialogWidString::readConfig()
 {
   mEdit->setText(*mReference);
 }
 
 void KPrefsDialogWidString::writeConfig()
 {
   *mReference = mEdit->text();
 }
 
 QLabel *KPrefsDialogWidString::label()
 {
   return mLabel;
 }
 
 QLineEdit *KPrefsDialogWidString::lineEdit()
 {
   return mEdit;
 }
 
 
 KPrefsDialog::KPrefsDialog(KPrefs *prefs,QWidget *parent,char *name,bool modal) :
   KDialogBase(IconList,i18n("Preferences"),Ok|Cancel|Default,Ok,parent,
               name,modal,true)
 {
   mPrefs = prefs;
 
 // This seems to cause a crash on exit. Investigate later.
-//  mPrefsWids.setAutoDelete(true);
+  mPrefsWids.setAutoDelete(true);
 
   connect(this,SIGNAL(defaultClicked()),SLOT(slotDefault()));
   //connect(this,SIGNAL(cancelClicked()),SLOT(slotDefault()));
   //connect(this,SIGNAL(cancelClicked()),SLOT(reject()));
 }
 
 KPrefsDialog::~KPrefsDialog()
 {
 }
 
 void KPrefsDialog::addWid(KPrefsDialogWid *wid)
 {
   mPrefsWids.append(wid);
 }
 
 KPrefsDialogWidBool *KPrefsDialog::addWidBool(const QString &text,bool *reference,QWidget *parent)
 {
   KPrefsDialogWidBool *w = new KPrefsDialogWidBool(text,reference,parent);
   addWid(w);
   return w;
 }
 
 KPrefsDialogWidTime *KPrefsDialog::addWidTime(const QString &text,int *reference,QWidget *parent)
 {
   KPrefsDialogWidTime *w = new KPrefsDialogWidTime(text,reference,parent);
   addWid(w);
   return w;
 }
 
 KPrefsDialogWidColor *KPrefsDialog::addWidColor(const QString &text,QColor *reference,QWidget *parent)
 {
   KPrefsDialogWidColor *w = new KPrefsDialogWidColor(text,reference,parent);
   addWid(w);
   return w;
 }
 
 KPrefsDialogWidRadios *KPrefsDialog::addWidRadios(const QString &text,int *reference,QWidget *parent)
 {
   KPrefsDialogWidRadios *w = new KPrefsDialogWidRadios(text,reference,parent);
   addWid(w);
   return w;
 }
 
 KPrefsDialogWidString *KPrefsDialog::addWidString(const QString &text,QString *reference,QWidget *parent)
 {
   KPrefsDialogWidString *w = new KPrefsDialogWidString(text,reference,parent);
   addWid(w);
   return w;
 }
 
 KPrefsDialogWidString *KPrefsDialog::addWidPassword(const QString &text,QString *reference,QWidget *parent)
 {
   KPrefsDialogWidString *w = new KPrefsDialogWidString(text,reference,parent,QLineEdit::Password);
   addWid(w);
   return w;
 }
 
 KPrefsDialogWidFont *KPrefsDialog::addWidFont(const QString &sampleText,const QString &buttonText,
                                         QFont *reference,QWidget *parent)
 {
   KPrefsDialogWidFont *w = new KPrefsDialogWidFont(sampleText,buttonText,reference,parent);
   addWid(w);
   return w;
 }
 
 void KPrefsDialog::setDefaults()
 {
   mPrefs->setDefaults();
   
   readConfig();
 }
 
 void KPrefsDialog::readConfig()
 {
 //  kdDebug(5300) << "KPrefsDialog::readConfig()" << endl;
 
   KPrefsDialogWid *wid;
   for(wid = mPrefsWids.first();wid;wid=mPrefsWids.next()) {
     wid->readConfig();
   }
 
   usrReadConfig();
 }
 
 void KPrefsDialog::writeConfig()
 {
 //  kdDebug(5300) << "KPrefsDialog::writeConfig()" << endl;
 
   KPrefsDialogWid *wid;
   for(wid = mPrefsWids.first();wid;wid=mPrefsWids.next()) {
     wid->writeConfig();
   }
 
   usrWriteConfig();
 
 //  kdDebug(5300) << "KPrefsDialog::writeConfig() now writing..." << endl;
diff --git a/libkdepim/kprefsdialog.h b/libkdepim/kprefsdialog.h
index ad13b78..efcb86a 100644
--- a/libkdepim/kprefsdialog.h
+++ b/libkdepim/kprefsdialog.h
@@ -1,278 +1,277 @@
 /*
     This file is part of KOrganizer.
     Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 #ifndef _KPREFSDIALOG_H
 #define _KPREFSDIALOG_H
 // $Id$
 
 #include <qptrlist.h>
 #include <qlineedit.h>
 
 #include <kdialogbase.h>
 
 class KPrefs;
 class KPrefsDialog;
 
 class KColorButton;
 class QCheckBox;
 class QLabel;
 class QSpinBox;
 class QButtonGroup;
 
 /**
   @short Base class for widgets used by @ref KPrefsDialog.
   @author Cornelius Schumacher
   @see KPrefsDialog
 
   This class provides the interface for the preferences widgets used by
   KPrefsDialog.
 */
-class KPrefsDialogWid
+class KPrefsDialogWid : public QObject
 {
   public:
     /**
       This function is called to read value of the setting from the
       stored configuration and display it in the widget.
     */
     virtual void readConfig() = 0;
     /**
       This function is called to write the current setting of the widget to the
       stored configuration.
     */
     virtual void writeConfig() = 0;
 };
 
 /**
   @short Widget for bool settings in @ref KPrefsDialog.
   
   This class provides a widget for configuring bool values. It is meant to be
   used by KPrefsDialog. The user is responsible for the layout management.
 */
 class KPrefsDialogWidBool : public KPrefsDialogWid
 {
   public:
     /**
       Create a bool widget consisting of a QCheckbox.
       
       @param text      Text of QCheckBox.
       @param reference Pointer to variable read and written by this widget.
       @param parent    Parent widget.
     */
     KPrefsDialogWidBool(const QString &text,bool *reference,QWidget *parent);
     
     /**
       Return the QCheckbox used by this widget.
     */
     QCheckBox *checkBox();
     
     void readConfig();
     void writeConfig();
     
   private:
     bool *mReference;
     
     QCheckBox *mCheck;
 };
 
 /**
   @short Widget for time settings in @ref KPrefsDialog.
   
   This class provides a widget for configuring time values. It is meant to be
   used by KPrefsDialog. The user is responsible for the layout management.
 */
 class KPrefsDialogWidTime : public KPrefsDialogWid
 {
   public:
     /**
       Create a time widget consisting of a label and a spinbox.
       
       @param text      Text of Label.
       @param reference Pointer to variable read and written by this widget.
       @param parent    Parent widget.
     */
     KPrefsDialogWidTime(const QString &text,int *reference,QWidget *parent);
     
     /**
       Return QLabel used by this widget.
     */
     QLabel *label();
     /**
       Return QSpinBox used by this widget.
     */
     QSpinBox *spinBox();
     
     void readConfig();
     void writeConfig();
     
   private:
     int *mReference;
     
     QLabel *mLabel;
     QSpinBox *mSpin;
 };
 
 /**
   @short Widget for color settings in @ref KPrefsDialog.
   
   This class provides a widget for configuring color values. It is meant to be
   used by KPrefsDialog. The user is responsible for the layout management.
 */
-class KPrefsDialogWidColor : public QObject, public KPrefsDialogWid
+class KPrefsDialogWidColor : public KPrefsDialogWid
 {
-    Q_OBJECT
   public:
     /**
       Create a color widget consisting of a test field and a button for opening
       a color dialog.
       
       @param text      Text of button.
       @param reference Pointer to variable read and written by this widget.
       @param parent    Parent widget.
     */
     KPrefsDialogWidColor(const QString &text,QColor *reference,QWidget *parent);
     /**
       Destruct color setting widget.
     */
     ~KPrefsDialogWidColor();
     
     /**
       Return QLabel for the button
     */
     QLabel *label();
     /**
       Return button opening the color dialog.
     */
     KColorButton *button();
     
     void readConfig();
     void writeConfig();
     
   private:
     QColor *mReference;
     
     QLabel *mLabel;
     KColorButton *mButton;
 };
 
 /**
   @short Widget for font settings in @ref KPrefsDialog.
   
   This class provides a widget for configuring font values. It is meant to be
   used by KPrefsDialog. The user is responsible for the layout management.
 */
-class KPrefsDialogWidFont : public QObject, public KPrefsDialogWid
+class KPrefsDialogWidFont : public KPrefsDialogWid
 {
     Q_OBJECT
   public:
     /**
       Create a font widget consisting of a test field and a button for opening
       a font dialog.
       
       @param label     Text of label.
       @param reference Pointer to variable read and written by this widget.
       @param parent    Parent widget.
     */
     KPrefsDialogWidFont(const QString &sampleText,const QString &labelText,
                   QFont *reference,QWidget *parent);
     /**
       Destruct font setting widget.
     */
     ~KPrefsDialogWidFont();
     
     /**
       Return label.
     */
     QLabel *label();
     /**
       Return QFrame used as preview field.
     */
     QLabel *preview();
     /**
       Return button opening the font dialog.
     */
     QPushButton *button();
     
     void readConfig();
     void writeConfig();
 
   protected slots:
     void selectFont();
     
   private:
     QFont *mReference;
     
     QLabel *mLabel;
     QLabel *mPreview;
     QPushButton *mButton;
 };
 
 /**
   @short Widget for settings represented by a group of radio buttons in
   @ref KPrefsDialog.
   
   This class provides a widget for configuring selections. It is meant to be
   used by KPrefsDialog. The user is responsible for the layout management. The
   setting is interpreted as an int value, corresponding to the position of the
   radio button. The position of the button is defined by the sequence of @ref
   addRadio() calls, starting with 0.
 */
 class KPrefsDialogWidRadios : public KPrefsDialogWid
 {
   public:
     /**
       Create a widget for selection of an option. It consists of a box with
       several radio buttons.
       
       @param text      Text of main box.
       @param reference Pointer to variable read and written by this widget.
       @param parent    Parent widget.
     */
     KPrefsDialogWidRadios(const QString &text,int *reference,QWidget *parent);
     virtual ~KPrefsDialogWidRadios();
 
     /**
       Add a radio button.
       
       @param text Text of the button.
     */
     void addRadio(const QString &text);
     
     /**
       Return the box widget used by this widget.
     */
     QButtonGroup *groupBox();
     
     void readConfig();
     void writeConfig();
     
   private:
     int *mReference;
 
     QButtonGroup *mBox;
 };
 
 
 /**
   @short Widget for string settings in @ref KPrefsDialog.
   
   This class provides a widget for configuring string values. It is meant to be
   used by KPrefsDialog. The user is responsible for the layout management.
diff --git a/microkde/kglobalsettings.cpp b/microkde/kglobalsettings.cpp
index 5976aae..3f8a630 100644
--- a/microkde/kglobalsettings.cpp
+++ b/microkde/kglobalsettings.cpp
@@ -1,95 +1,104 @@
 #include "kglobalsettings.h"
 #include "kconfig.h"
 #include "kglobal.h"
 #include "kconfigbase.h"
 
 #include <qapplication.h>
 
 #ifdef DESKTOP_VERSION
   QColor KGlobalSettings::mAlternate = QColor( 235, 235, 235 );
 #else
   QColor KGlobalSettings::mAlternate =  QColor( 210, 210, 210 );
 #endif 
 
 
 QFont KGlobalSettings::generalFont()
 {
    int size = 12;
    if (QApplication::desktop()->width() < 480 ) {
         size = 10;   
    }
 #ifndef DESKTOP_VERSION
    else
     if (QApplication::desktop()->width() >= 480 && QApplication::desktop()->width() <= 640 )
         size = 18;  
 #endif 
     QFont f = QApplication::font();
     //qDebug("pointsize %d %s", f.pointSize(),f.family().latin1());
     f.setPointSize( size );
     return f;
 }
 QFont KGlobalSettings::generalMaxFont()
 {
    int size = 12;
    if (QApplication::desktop()->width() < 480 ) {
         size = 10;   
    }
 #ifndef DESKTOP_VERSION
    else
     if (QApplication::desktop()->width() >= 480 && QApplication::desktop()->width() <= 640 )
         size = 18;  
 #endif 
     QFont f = QApplication::font();
     if ( f.pointSize() > size )
         f.setPointSize( size );
     return f;
 }
 
 QString KGlobalSettings::timeTrackerDir()
 {
     static QString dir;
     if ( dir.isEmpty() ) {
         dir = locateLocal( "data", "timetrackerdir/d.ttl" );
         dir = dir.left ( dir.length() - 5);
     }
     return dir;
 }
+QString KGlobalSettings::backupDataDir()
+{
+    static QString dir;
+    if ( dir.isEmpty() ) {
+        dir = locateLocal( "data", "backupdir/d.ttl" );
+        dir = dir.left ( dir.length() - 5);
+    }
+    return dir;
+}
 
 QFont KGlobalSettings::toolBarFont()
 {
     return  QApplication::font();
 }
 
 QColor KGlobalSettings::toolBarHighlightColor()
 {
     return QColor( "black" );
 }
 
 QColor KGlobalSettings::alternateBackgroundColor()
 {
     return mAlternate;
 
 }
 void  KGlobalSettings::setAlternateBackgroundColor(QColor c)
 {
    mAlternate = c;
 
 }
 
 QRect KGlobalSettings::desktopGeometry( QWidget * )
 {
   return QApplication::desktop()->rect();
 }
 
     /**
      * Returns whether KDE runs in single (default) or double click
      * mode.
      * see http://developer.kde.org/documentation/standards/kde/style/mouse/index.html
      * @return true if single click mode, or false if double click mode.
      **/
 bool KGlobalSettings::singleClick()
 {   
     KConfig *c = KGlobal::config();
     KConfigGroupSaver cgs( c, "KDE" );
     return c->readBoolEntry("SingleClick", KDE_DEFAULT_SINGLECLICK);
 }
diff --git a/microkde/kglobalsettings.h b/microkde/kglobalsettings.h
index 05ef279..4e4d87c 100644
--- a/microkde/kglobalsettings.h
+++ b/microkde/kglobalsettings.h
@@ -1,35 +1,36 @@
 #ifndef MICROKDE_KGLOBALSETTINGS_H
 #define MICROKDE_KGLOBALSETTINGS_H
 
 #include <qfont.h>
 #include <qrect.h>
 
 
 #define KDE_DEFAULT_SINGLECLICK true
 
 
 class KGlobalSettings
 {
   public:
     static QFont generalFont();
     static QFont generalMaxFont();
     static QFont toolBarFont();
     
     static QColor mAlternate;
     static QColor toolBarHighlightColor();
     static QColor alternateBackgroundColor();
     static void  setAlternateBackgroundColor(QColor);
     static QRect desktopGeometry( QWidget * );
     static QString timeTrackerDir();
+    static QString backupDataDir();
     
     /**
      * Returns whether KDE runs in single (default) or double click
      * mode.
      * see http://developer.kde.org/documentation/standards/kde/style/mouse/index.html
      * @return true if single click mode, or false if double click mode.
      **/
     static bool singleClick();
     
 };
 
 #endif