fix

21 files changed, 25 insertions, 25 deletions

diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
index 7653ee2..01c34cc 100644
--- a/ReleaseNotes.txt
+++ b/ReleaseNotes.txt
@@ -128,163 +128,163 @@ kopiemail_OZ-gcc3xx_X.X.X_arm.ipk
 korganizer-alarm_OZ-gcc3xx_X.X.X_arm.ipk
 korganizer_OZ-gcc3xx_X.X.X_arm.ipk
 kmobilephoneaccess_OZ-gcc3xx_X.X.X_arm.ipk
 pimTABicon_OZ-gcc3xx_X.X.X_arm.ipk
 pwmanager_OZ-gcc3xx_X.X.X_arm.ipk
 
 
 This package is for users of the Open Zaurus ROM 3.3.6,
 compiled by coredump (aka known as Hentges-Rom).
 The programs may run on the new
 Open Zaurus Release 3.5.1 as well, but
 they cannot be installed there properly,
 because the package manager of OZ needs more
 information in the ipk files to install them properly.
 
 If you have Open Zaurus 3.5.1, you should use
 the packages of the OZ 3.5.1 feed,
 compiled and maintained by Hrw.
 Do not ask the OZ people about problems with these
 packages, they cannot help you.
 
 CONTENT:
 
 By the way, I cannot help you as well, because I
 am not using OZ.
 
 File kmicrokdelibs_OZ-gcc3xx_X.X.X_arm.ipk:
 The libs in this file are needed to run
 any of the included programs.
 Install it.
 
 File kaddressbook_OZ-gcc3xx_X.X.X_arm.ipk:
 Contains KA/Pi addressbook program and needed additional libs.
 
 File korganizer-alarm_OZ-gcc3xx_X.X.X_arm.ipk:
 Contains KO/Pi calendar program and needed additional libs.
 
 File kopiemail_OZ-gcc3xx_X.X.X_arm.ipk:
 Contains OM/Pi email program and needed additional libs.
 
 File pwmanager_OZ-gcc3xx_X.X.X_arm.ipk:
 Contains PwM/Pi password manager program.
 
 File korganizer-alarm_OZ-gcc3xx_X.X.X_arm.ipk:
 Provides an alarm applet to get informed about alarms.
 The Zaurus will wake up from suspend
 if an event triggers an alarm.
 
 File kmobilephoneaccess_OZ-gcc3xx_X.X.X_arm.ipk:
 Contains a command line tool for accessing mobile phones.
 It is used from Kx/Pi to sync with / export to
 mobile phones. It is not working very well, please do not
 expect too much.
 
 File pimTABicon_OZ-gcc3xx_X.X.X_arm.ipk:
 If you insatll a program of the package, you may get
 a new TAB wchich is called Pim.
 If you did not have had this TAB on your Z, that
 TAB will not display an icon.
 Install this small package to assihn an icon to
 the new Pim TAB.
 
 Unzip package and install the apps in the usual way.
 
 To get the character conversion in OM/Pi working, please download
 at the sourceforge project site the package
 oz-character-conversion_OZ-gcc3xx_arm.ipk.zip
 from the section "general files for KDE/Pim"
 Instructions how to install this package are in a ReadMe in this file.
 
 
 *****************************************************
 4) Linux Desktop (SuSE 9.2)
 *****************************************************
 Filename: KDE-Pim-Pi-2.0.8-SuSE_9.2.i586.rpm
 Package contains:
 KAddessbook/Pi
 KOrganizer/Pi
 PasswordManager/Pi
 KPhone/Pi
 KTimeTracker/Pi
 KOPieMail/Pi
 and the needed microkde libs.
 
 Download file and install it on console with
 su
 rpm -ihv KDE-Pim-Pi-2.0.8-SuSE_9.2.i586.rpm
 Note:
 If you want to update, please do it with
 rpm -Uhv KDE-Pim-Pi-2.0.8-SuSE_9.2.i586.rpm
 (Uninstall with rpm -e KDE-Pim-Pi-2.0.8-SuSE_9.2)
 
 Here is the information,
 provided in the rpm file about the content:
 
 This package contains the platform-independent PIM programs from
-www.pi-sync.net, compiled for SuSE 9.2:
+www.pi-sync.info, compiled for SuSE 9.2:
 KTimeTacker/Pi
 KPhone/Pi
 KAddressbook/Pi
 KOrganizer/Pi
 PasswordManager/Pi
 KOPieMail/Pi
 
 These applications do not need anything from the KDE-desktop
 at all to run on Linux. However, there is a dependency from
 two KDE libs, because a small command line program is included
 to make it possible to sync with the KDE-desktop applications.
 
 These applications are independent from the KDE-desktop
 environment. That means, nothing of your existing
 KDE-desktop setup will be changed, or any data
 (calendar-addressbook) used by the KDE-desktop
 applications will be changed or accessed.
 These applications stores their data and config in
 $HOME/kdepim/
 However, because the same file format is used,
 an easy exchange of data with the KDE-desktop
 is possible.
 A small command line program is included
 to make it possible to sync with the KDE-desktop applications.
 You do not need to call this program from the commandline,
 it is called from the KDE-Pim/Pi apps when you choose there:
 Sync with KDE_Desktop.
 If something is going wrong, please start the
 KDE-Pim/Pi program itself from the console to get detailed output.
 
 After installation, you should have a
 PIM-pi
 folder in your KDE start menu, where you can
 start the applications from.
 
 These programs makes it possible to sync your Zaurus easily
 (with the KDE-Pim/Pi programs running on the Zaurus)
 with the KDE-desktop calendar/addressbook data.
 If you want to use that, you have to update your
 KDE-desktop to version 3.3.0 or higher.
 SuSE 9.2 contains KDE 3.3.0 such that no update is needed.
 Actually - after the (non difficult) configuration is set up -
 with two mouseklicks on the Zaurus,
 the Zaurus syncs with the corresponding KDE-Pim/Pi
 program on the Linux Desktop which syncs automatically
 with the KDE-desktop data.
 
 If you want to use the KDE-desktop calendar/addressbook applications,
 just install these apps in this package and use them as a syncing tool for the
 Zaurus <-> KDE-desktop sync.
 The sync requires a network connection from your Zaurus to
 the PC. A detailed Sync HowTo is available in the
 Help menu of the applications.
 
 These applications makes it also possible, that you can sync
 (or just export the data to) your mobile phone with your
 data of the KDE-desktop calendar/addressbook applications.
 This is tested and working for Nokia mobile phones,
 it may work with others as well.
 (More info about that: -> Sync HowTo)
 
 NOTE:
 When using SuSE 9.1 you have to update your KDE to 3.3.x
 and you have to make an online update in SuSE 9.1 to make it
 possible to get the infrared connection working, such that
 you can sync your (Nokia) mobile phone via infrared.
\ No newline at end of file
diff --git a/bin/ReadMe_Linux.txt b/bin/ReadMe_Linux.txt
index 274fa96..74e3aa6 100644
--- a/bin/ReadMe_Linux.txt
+++ b/bin/ReadMe_Linux.txt
@@ -1,103 +1,103 @@
-This is the Linux desktop (SuSE 9.1 or later) 
-version of KO/Pi and KA/Pi (www.pi-sync.net),
+This is the Linux desktop (SuSE 9.2 or later) 
+version of KO/Pi and KA/Pi (www.pi-sync.info),
 the platform independent PIM programs based on the PIM programs 
 (KOrganizer and KAddressbook) of KDE (www.kdeorg). 
 
 KO/Pi or KA/Pi are licensed under the GPL.
 Please read the file kdepim/licence.txt
 
 
 Contents of the packages and how to install:
 
 *****************************************************
 4) Linux Desktop (SuSE 9.2)
 *****************************************************
 Filename: KDE-Pim-Pi-1.9.20-SuSE_9.2.i586.rpm
 Package contains:
 KAddessbook/Pi
 KOrganizer/Pi
 PasswordManager/Pi
 KPhone/Pi
 KTimeTracker/Pi
 KOPieMail/Pi
 and the needed microkde libs.
 
 Download file and install it on console with
 su
 rpm -ihv KDE-Pim-Pi-1.9.20-SuSE_9.2.i586.rpm
 Note:
 If you want to update, please do it with
 rpm -Uhv KDE-Pim-Pi-1.9.20-SuSE_9.2.i586.rpm
 (Uninstall with rpm -e KDE-Pim-Pi-1.9.20-SuSE_9.2)
 
 Here is the information,
 provided in the rpm file about the content:
 
 This package contains the platform-independent PIM programs from
-www.pi-sync.net, compiled for SuSE 9.2:
+www.pi-sync.info, compiled for SuSE 9.2:
 KTimeTacker/Pi
 KPhone/Pi
 KAddressbook/Pi
 KOrganizer/Pi
 PasswordManager/Pi
 KOPieMail/Pi
 
 These applications do not need anything from the KDE-desktop
 at all to run on Linux. However, there is a dependency from
 two KDE libs, because a small command line program is included
 to make it possible to sync with the KDE-desktop applications.
 
 These applications are independent from the KDE-desktop
 environment. That means, nothing of your existing
 KDE-desktop setup will be changed, or any data
 (calendar-addressbook) used by the KDE-desktop
 applications will be changed or accessed.
 These applications stores their data and config in
 $HOME/kdepim/
 However, because the same file format is used,
 an easy exchange of data with the KDE-desktop
 is possible.
 A small command line program is included
 to make it possible to sync with the KDE-desktop applications.
 You do not need to call this program from the commandline,
 it is called from the KDE-Pim/Pi apps when you choose there:
 Sync with KDE_Desktop.
 If something is going wrong, please start the
 KDE-Pim/Pi program itself from the console to get detailed output.
 
 After installation, you should have a
 PIM-pi
 folder in your KDE start menu, where you can
 start the applications from.
 
 These programs makes it possible to sync your Zaurus easily
 (with the KDE-Pim/Pi programs running on the Zaurus)
 with the KDE-desktop calendar/addressbook data.
 If you want to use that, you have to update your
 KDE-desktop to version 3.3.0 or higher.
 SuSE 9.2 contains KDE 3.3.0 such that no update is needed.
 Actually - after the (non difficult) configuration is set up -
 with two mouseklicks on the Zaurus,
 the Zaurus syncs with the corresponding KDE-Pim/Pi
 program on the Linux Desktop which syncs automatically
 with the KDE-desktop data.
 
 If you want to use the KDE-desktop calendar/addressbook applications,
 just install these apps in this package and use them as a syncing tool for the
 Zaurus <-> KDE-desktop sync.
 The sync requires a network connection from your Zaurus to
 the PC. A detailed Sync HowTo is available in the
 Help menu of the applications.
 
 These applications makes it also possible, that you can sync
 (or just export the data to) your mobile phone with your
 data of the KDE-desktop calendar/addressbook applications.
 This is tested and working for Nokia mobile phones,
 it may work with others as well.
 (More info about that: -> Sync HowTo)
 
 NOTE:
 When using SuSE 9.1 you have to update your KDE to 3.3.x
 and you have to make an online update in SuSE 9.1 to make it
 possible to get the infrared connection working, such that
 you can sync your (Nokia) mobile phone via infrared.
\ No newline at end of file
diff --git a/bin/ReadMe_Windows.txt b/bin/ReadMe_Windows.txt
index dee7c7f..7a95e65 100644
--- a/bin/ReadMe_Windows.txt
+++ b/bin/ReadMe_Windows.txt
@@ -1,46 +1,46 @@
-This is the Windows version of KO/Pi and KA/Pi (www.pi-sync.net),

+This is the Windows version of KO/Pi and KA/Pi (www.pi-sync.info),

 the platform independent PIM programs based on the PIM programs 

 (KOrganizer and KAddressbook) of KDE (www.kdeorg). 

 

 KO/Pi or KA/Pi are licensed under the GPL.

 Please read the file kdepim/licence.txt

 

 

 Contents of the packages and how to install:

 

 *****************************************************

 1) Windows 32

 *****************************************************

 NOTE:

 There are two version for Windows available:

 The file

 kdepim_1.9.20_for_Windows.exe.zip, wich is for Windows 2000/XP

 and the file

 kdepim_1.9.20_for_Windows_98-ME.exe.zip, wich is for Windows 98/ME.

 The functionality is almost the same, but in the version for Windows 98/ME

 is "Import from Outlook" disabled to make it running on Windows 98/ME.

 

 Filename: kdepim_1.9.20_for_Windows.exe.zip

 Package contains:

 KO/Pi

 KA/Pi

 Phone access(kammu.exe)

 Libs for file, dir, qtopia resources.

 

 Download file.

 Unzip the file, then you are almost done.

 When installing these package for the first time, 

 you will need to install some needed dlls which are 

 available in an extra package "kdepim334.dll". This additional package contains

 the Qt3 library qt-mt334.dll and the MSVC library msvcr71.dll 

 and the MSVC library mfc71u.dll.

 You can download the "kdepim334.dll" package at:

 http://sourceforge.net/projects/kdepimpi/

 Please choose there package/project/file:

 general Files for KDE/Pim

 Needed Windows Dlls

 kdepim334dll.zip

  

 For details read the file

 Migration-Howto.txt in the package.

 

diff --git a/bin/ReadMe_Zaurus.txt b/bin/ReadMe_Zaurus.txt
index e91fb0e..085c549 100644
--- a/bin/ReadMe_Zaurus.txt
+++ b/bin/ReadMe_Zaurus.txt
@@ -1,97 +1,97 @@
-This is the Zaurus version of KO/Pi and KA/Pi (www.pi-sync.net),
+This is the Zaurus version of KO/Pi and KA/Pi (www.pi-sync.info),
 the platform independent PIM programs based on the PIM programs 
 (KOrganizer and KAddressbook) of KDE (www.kdeorg). 
 
 KO/Pi or KA/Pi are licensed under the GPL.
 Please read the file kdepim/licence.txt
 
 This ReadMe is included in two different packages.
 Depending if the filename of the package, please read
 section 2) or 3)
 
 *****************************************************
 2) Zaurus Sharp ROM, gcc 2.95 compiled
 *****************************************************
 Filename: kdepim_X.X.X_for_SharpROM.ipk.zip
 Package contains:
 kaddressbook_X.X.X_arm.ipk
 korganizer-alarm_X.X.X_arm.ipk
 kmicrokdelibs_X.X.X_arm.ipk
 kmobilephoneaccess_X.X.X_arm.ipk
 ksharpPIM-DTMaccess_X.X.X_arm.ipk
 kopiemail_X.X.X_arm.ipk
 pimTABicon_X.X.X_arm.ipk
 korganizer_X.X.X_arm.ipk
 pwmanager_X.X.X_arm.ipk
 
 This package is for users of the Sharp ROM and clones.
 Users of old OpenZaurus releases, which are gcc2.95
 compiled can use it as well.
 
 CONTENT:
 
 File kmicrokdelibs_X.X.X_arm.ipk:
   The libs in this file are needed to run
   any of the included programs.
   Install it.
 
 File kaddressbook_X.X.X_arm.ipk:
   Contains KA/Pi addressbook program and needed additional libs.
 
 File korganizer-alarm_X.X.X_arm.ipk:
   Contains KO/Pi calendar program and needed additional libs.
 
 File kopiemail_X.X.X_arm.ipk:
   Contains OM/Pi email program and needed additional libs.
 
 File pwmanager_X.X.X_arm.ipk:
   Contains PwM/Pi password manager program.
 
 File ksharpPIM-DTMaccess_X.X.X_arm.ipk:
   Contains needed program/lib to sync KA/Pi and KO/Pi
   with the Sharp PIM applications on the Zaurus,
   which use the new Sharp DMT Pim format.
 
 File korganizer-alarm_X.X.X_arm.ipk:
    Provides an alarm applet to get informed about alarms.
    The Zaurus will wake up from suspend
    if an event triggers an alarm.
 
 File kmobilephoneaccess_X.X.X_arm.ipk:
   Contains a command line tool for accessing mobile phones.
   It is used from Kx/Pi to sync with / export to
   mobile phones. It is not working very well, please do not
   expect too much.
 
 File pimTABicon_X.X.X_arm.ipk:
   If you insatll a program of the package, you may get
   a new TAB wchich is called Pim.
   If you did not have had this TAB on your Z, that
   TAB will not display an icon.
   Install this small package to assihn an icon to 
   the new Pim TAB. 
 
 
 Unzip package and install the apps in the usual way.
 
 To get the character conversion in OM/Pi working, please download
 at the sourceforge project site the package
 sr-character-conversion_SharpROM_arm.ipk.zip
 from the section "general files for KDE/Pim"
 Instructions how to install this package are in a ReadMe in this file.
 
 *****************************************************
 3) OpenZaurus ROM, gcc 3.xx compiled
 *****************************************************
 Filename: kdepim_X.X.X_for_OZ-gcc3xx.ipk.zip
 Package contains:
 kaddressbook_OZ-gcc3xx_X.X.X_arm.ipk
 kmicrokdelibs_OZ-gcc3xx_X.X.X_arm.ipk
 kopiemail_OZ-gcc3xx_X.X.X_arm.ipk
 korganizer-alarm_OZ-gcc3xx_X.X.X_arm.ipk
 korganizer_OZ-gcc3xx_X.X.X_arm.ipk
 kmobilephoneaccess_OZ-gcc3xx_X.X.X_arm.ipk
 pimTABicon_OZ-gcc3xx_X.X.X_arm.ipk
 pwmanager_OZ-gcc3xx_X.X.X_arm.ipk
 
 
diff --git a/bin/kdepim/korganizer/usertranslation.txt b/bin/kdepim/korganizer/usertranslation.txt
index 97f0b3e..8355b90 100644
--- a/bin/kdepim/korganizer/usertranslation.txt
+++ b/bin/kdepim/korganizer/usertranslation.txt
@@ -951,175 +951,175 @@
 { " sync"," Sync ein" },
 { "Write back synced data","Schreibe gesyncte Daten zurck" },
 { "-- Write back (on remote) existing entries only","-- Schreibe nur existierende (entfernte) Eintr�e zurck" },
 { "-- Write back (calendar) entries in future only","-- Schreibe nur zuknftige Kalender-Eintr�e zurck" },
 { "---- Max. weeks in future: ","---- Max. wochen in der Zukunft: " },
 { "Pi-Sync ( direct Kx/Pi to Kx/Pi sync )","Pi-Sync ( direktes Kx/Pi zu Kx/Pi sync )" },
 { "Mobile device (cell phone)","Mobiles Ger� (Handy)" },
 { "Help...","Hilfe..." },
 { "Local file Cal:","Lokale Datei Kal:" },
 { "Local file ABook:","Lokale Datei ABuch:" },
 { "Local file PWMgr:","Lokale Datei PWMgr:" },
 { "Addressbook file (*.vcf) is used by KA/Pi","Adressbuch Datei (*.vcf) wird von KA/Pi genutzt" },
 { "Calendar:","Kalender:" },
 { "AddressBook:","AdressBuch:" },
 { "PWManager:","PWManager:" },
 { "Addressbook file is used by KA/Pi","Adressbuch Datei wird von KA/Pi genutzt" },
 { "ssh/scp","ssh/scp" },
 { "ftp","ftp" },
 { "Password for remote access: (could be the same for each)","Passwort fr entfernten Zugriff: (kann dasselbe sein fr alle)" },
 { "Remote IP address: (could be the same for each)","Entfernte IP Adresse: (kann dasselbe sein fr alle)" },
 { "Remote port number: (should be different for each)","Entfernte Port Nummer: (Sollte fr alle unterschiedlich sein)" },
 { "command for downloading remote file to local device","Kommando zum Download der entfernten Datei zum lokalen Ger�" },
 { "command for uploading local temp file to remote device","Kommando zum Upload der lokalen temp. Datei zum entfernten Ger�" },
 { "Insert device where\nphone is connected. E.g.:\n","Fge Device ein, an dem\ndas Handy angeschlossen ist. Z.B.:\n" },
 { "KDE-Pim sync config","KDE-Pim sync Konfig" },
 { "Insert kind of connection,e.g.:\n","Fge Art der Verbindung ein,z.B.:\n" },
 { "Recommended: Leave empty!\n(Such that model can\nbe auto detected)\nOr insert name of model:\n","Empfohlen: Leer lassen!\n(So dass das Model\nautomatisch erkannt\nwerden kann)\nOder fge Model Name ein:\n" },
 { "Port number (Default: %1)","Port Nummer (Default: %1)" },
 { "Password to enable\naccess from remote:","Passwort um entfernten\nZugriff zuzulassen:" },
 { "Automatically start\nat application startup","Starte automatisch\nbeim Programmstart" },
 { "Automatically sync\nwith KDE-Desktop","Automatischer Sync\nmit dem KDE-Desktop" },
 { "Enter port for Pi-Sync","Port Nummer fr Pi-Sync" },
 { "Disable Pi-Sync","Schalte Pi-Sync aus" },
 { "Do you really want\nto multiple sync\nwith all checked profiles?\nSyncing takes some\ntime - all profiles\nare synced twice!","Wollen Sie wirklich\nmit allen selektierten\nProfilen \"Multi-Syncen\"?\nDas Syncen dauert einige Zeit -\nalle Profile werden zweimal gesynct!" },
 { "KDE-Pim Sync","KDE-Pim Sync" },
 { "Multiple profiles","Multi-Sync Profile" },
 { "Device: ","Ger�: " },
 { "Multiple sync started.","Multi-Sync gestartet." },
 { "Nothing synced! No profiles defined for multisync!","Nichts gesynct! Keine Profile\nselektiert fr Multi-Sync" },
 { "Turn filter on","Schalte Filter an" },
 { "Turn filter off","Schalte Filter aus" },
 { "Key bindings  KOrganizer/Pi","Tastatur Belegung KOrganizer/Pi" },
 { "<p><b>White</b>: Item readonly</p>\n","<p><b>Weiss</b>: Eintrag schreibgeschtzt</p>\n" },
 { "<p><b>Dark yellow</b>:  Event/todo with attendees.</p>\n","<p><b>Dunkelgelb</b>:  Termin/Todo mit Teilnehmern.</p>\n" },
 { "<p><b>Black</b>: Event/todo with attendees. You are the organizer!</p>\n","<p><b>Schwarz</b>: Termin/Todo mit Teilnehmern. Sie sind der Organisator!</p>\n" },
 { "<p><b>Dark green</b>: Information(description) available.([i] in WN view)</p>\n","<p><b>Dunkelgrn</b>: Information(Beschreibung) verfgbar.([i] in WN Ansicht)</p>\n" },
 { "<p><b>Blue</b>: Recurrent event.([r] in Whats'Next view)</p>\n","<p><b>Blau</b>: Wiederholender Termin.([r] in Whats'Next Ansicht)</p>\n" },
 { "<p><b>Red</b>: Alarm set.([a] in Whats'Next view)</p>\n","<p><b>Rot</b>: Alarm gesetzt.([a] in Whats'Next Ansicht)</p>\n" },
 { "<p><b>Cross</b>: Item cancelled.([c] in Whats'Next view)</p>\n","<p><b>Kreuz</b>:  Eintrag gecancelt.([c] in Whats'Next Ansicht)</p>\n" },
 { "<p><b>(for square icons in agenda and month view)</b></p>\n","<p><b>(fr quadratische Icons in Agenda und Monats Ansicht)</b></p>\n" },
 { "<p><h2>KO/Pi icon colors:</h2></p>\n","<p><h2>KO/Pi Icon Farben:</h2></p>\n" },
 { "<p><b>E</b>:  Edit item</p>\n","<p><b>E</b>:  Editiere Eintrag</p>\n" },
 { "<p><b>A</b>: Show agenda view.</p>\n","<p><b>A</b>: Zeige Agenda Ansicht.</p>\n" },
 { "<p><b>I,C</b>: Close dialog.</p>\n","<p><b>I,C</b>: Schlie� Dialog.</p>\n" },
 { "<p><h3>In event/todo viewer:</h3></p>\n","<p><h3>In Termin/Todo Detail-Anzeige:</h3></p>\n" },
 { "<p><b>shift+up/down</b>: Goto first/last item</p>\n","<p><b>shift+up/down</b>: Gehe zum ersten/letzten Eintrag</p>\n" },
 { "<p><b>ctrl+up/down</b>:  Goto up/down by 20% of items</p>\n","<p><b>ctrl+up/down</b>:  Gehe hoch/runter 20% aller Eintr�e</p>\n" },
 { "<p><b>up/down</b>: Next/prev item</p>\n","<p><b>up/down</b>: N�hster/vorheriger Eintrag</p>\n" },
 { "<p><b>return+shift</b>: Deselect item+one step down</p>\n","<p><b>return+shift</b>: Deselektiere Item+Cursor einen Eintrag runter</p>\n" },
 { "<p><b>return</b>: Select item+one step down</p>\n","<p><b>return</b>: Selektiere Item+Cursor einen Eintrag runter</p>\n" },
 { "<p><b>I</b>: Show info of current item+one step down.</p>\n","<p><b>I</b>: Zeige Detail-Ansicht vom sel.Eintrag+Cursor einen Eintrag runter.</p>\n" },
 { "<p><h3>In list view:</h3></p>\n","<p><h3>In Listen Ansicht:</h3></p>\n" },
 { "<p><b>return+shift</b>:  Mark item as not completed+one step down</p>\n","<p><b>return+shift</b>:  Markiere Todo als nicht erledigt+Cursor einen Eintrag runter</p>\n" },
 { "<p><b>return</b>: Mark item as completed+one step down.</p>\n","<p><b>return</b>: Markiere Todo als erledigt+Cursor einen Eintrag runter.</p>\n" },
 { "<p><b>Q</b>: Toggle quick todo line edit.</p>\n","<p><b>Q</b>: Zeige/verstecke Quick Todo Eingabe Zeile.</p>\n" },
 { "<p><b>shift+P</b>: Make new <b>P</b>arent for todo selected with shift+S</p>\n","<p><b>shift+P</b>: Mache Todo zum neuen <b>P</b>arent Todo fr das Todo, welches mit shift+Sselektiert wurde.</p>\n" },
 { "<p><b>shift+S</b>: Make <b>S</b>ubtodo (reparent todo)</p>\n","<p><b>shift+S</b>: Mache Todo zum <b>S</b>ubtodo</p>\n" },
 { "<p><b>shift+U</b>: <b>U</b>nparent todo (make root todo)</p>\n","<p><b>shift+U</b>: <b>U</b>nparent Todo (Mache Sub-Todo zum Toplevel Todo)</p>\n" },
 { "<p><h3>In todo view:</h3></p>\n","<p><h3>In Todo Anzige:</h3></p>\n" },
 { "<p><b>ctrl+up/down</b>: Scroll small todo view</p>\n","<p><b>ctrl+up/down</b>: Scrolle kleine Todo Ansicht</p>\n" },
 { "<p><b>up/down</b>: Scroll agenda view</p>\n","<p><b>up/down</b>: Scrolle Agenda Ansicht</p>\n" },
 { "<p><h3>In agenda view:</h3></p>\n","<p><h3>In Agenda Ansicht:</h3></p>\n" },
 { "<p><b>del,backspace</b>: Delete selected item</p>\n","<p><b>del,backspace</b>: L�che selektiertes Item</p>\n" },
 { "<p><b>left</b>: Prev. week | <b>left+ctrl</b>: Prev. month</p>\n","<p><b>left</b>: Vorh. Woche | <b>left+ctrl</b>: Vorh. Monat</p>\n" },
 { "<p><b>right</b>: Next week | <b>right+ctrl</b>: Next month</p>\n","<p><b>right</b>: N�hste Woche | <b>right+ctrl</b>: N�hste Woche</p>\n" },
 { "<p><b>B</b>: Edit description (details) of selected item</p>\n","<p><b>B</b>: Editiere Beschreibung (Details) des selektierten Items</p>\n" },
 { "<p><b>C</b>: Show current time in agenda view</p>\n","<p><b>C</b>: Zeige aktuelle Zeit in Agenda Ansicht</p>\n" },
 { "<p><b>+,-</b> : Zoom in/out agenda | <b>A</b>: Toggle allday agenda height</p>\n","<p><b>+,-</b> : Zoom rein/raus Agenda | <b>A</b>: Wechsle Ganztag Agenda H�e</p>\n" },
 { "<p><b>S+ctrl</b>: Add sub-todo | <b>X</b>: Toggle datenavigator</p>\n","<p><b>S+ctrl</b>: Fge Sub-Todo hinzu | <b>X</b>: Zeige/verstecke Datenavigator</p>\n" },
 { "<p><b>T</b>: Goto today | <b>T+ctrl</b>: New Todo</p>\n","<p><b>T</b>: Gehe zu Heute | <b>T+ctrl</b>: Neues Todo</p>\n" },
 { "<p><b>E</b>: Edit selected item |<b> E+ctrl</b>: New Event</p>\n","<p><b>E</b>: Editiere selektiertes Item |<b> E+ctrl</b>: Neuer Termin</p>\n" },
 { "<p><b>D</b>: One day view | <b>M</b>: Month view</p>\n","<p><b>D</b>: Ein-Tages Ansicht | <b>M</b>: Monats Ansicht</p>\n" },
 { "<p><b>Z,Y</b>: Work week view | <b>U</b>: Week view</p>\n","<p><b>Z,Y</b>: Arbeitswochen Ansicht | <b>U</b>: Wochen Ansicht</p>\n" },
 { "<p><b>V</b>: Todo view | <b>L</b>: Event list view</p>\n","<p><b>V</b>: Todo Ansicht | <b>L</b>: Termin Listen Ansicht</p>\n" },
 { "<p><b>N</b>: Next days view| <b>W</b>: What's next view\n ","<p><b>N</b>: N�hste-Tage Ansicht days view| <b>W</b>: What's next Ansicht\n " },
 { "<p><b>1-0</b> (+<b>ctrl</b>): Select filter 1-10 (11-20)</p>\n","<p><b>1-0</b> (+<b>ctrl</b>): Selektiere Filter 1-10 (11-20)</p>\n" },
 { "<p><b>O</b>: Filter On/Off | <b>J</b>: Journal view</p>\n","<p><b>O</b>: Filter An/Aus | <b>J</b>: Journal Ansicht</p>\n" },
 { "<p><b>F</b>: Toggle filterview |<b>F+ctrl</b>: Edit filter </p>\n","<p><b>F</b>: Zeige/verstecke Filter Ansicht |<b>F+ctrl</b>: Editiere Filter </p>\n" },
 { "<p><b>Space</b>: Toggle fullscreen | <b>P</b>: Date picker</p>\n","<p><b>Space</b>: Zeige fullscreen | <b>P</b>: Datums Picker</p>\n" },
 { "<p><b>I</b>: Show info for selected event/todo</p>\n","<p><b>I</b>: Zeige Info (Details) fr selektiertes Item</p>\n" },
 { "<p><b>H</b>: This help dialog | <b>S</b>: Search dialog</p>\n","<p><b>H</b>: Dieser Hilfe Dialog | <b>S</b>: Such Dialog</p>\n" },
 { "<p><h2>KO/Pi key shortcuts:</h2></p>\n","<p><h2>KO/Pi Tastatur Kurzbefehle:</h2></p>\n" },
 { "After changing something, the data is\nautomatically saved to the file\n~/kdepim/apps/korganizer/mycalendar.ics\nafter (configurable) three minutes.\nFor safety reasons there is  one autosaving\nafter 10 minutes (of idle time) again. The \ndata is saved automatically when closing KO/Pi\nYou can create a backup file \nwith: File - Save Calendar Backup\n","Nachdem etwas ge�dert wurde, werden die\nDaten automatisch in die Datei abgespeichert\n~/kdepim/apps/korganizer/mycalendar.ics\nnach (konfigurierbar) drei Minuten.\nAus Sicherheitsgrnden wird noch einmal\nnach 10 Min. abgespeichert, wenn keine\n�derungen vorgenommen wurden. Die \nDaten werden automatisch gespeichert,\nwenn KO/Pi beendet wird.\nSie k�nen eine Backup-Datei erstellen im\nMenu: Datei - Speichere Kalender Backup\n" },
 { "Auto Saving in  KOrganizer/Pi","Auto Speichern in  KOrganizer/Pi" },
 { "\nhttp://sourceforge.net/projects/kdepimpi\n","\nhttp://sourceforge.net/projects/kdepimpi\n" },
 { "\nor report them in the bugtracker on\n","\noder trage sie in dem Bugtracker ein auf\n" },
-{ "\nPlease report unexpected behaviour to\nlutz@pi-sync.net\n","\nBitte melde fehlerhaftes Verhalten an\nlutz@pi-sync.net\n" },
+{ "\nPlease report unexpected behaviour to\nlutz@pi-sync.info\n","\nBitte melde fehlerhaftes Verhalten an\nlutz@pi-sync.info\n" },
 { "2) Audio alarm daemon\nfor Zaurus is available!\nas an additional small application\n","2) Ein Audio Alarm Daemon\nfr den Zaurus ist verfgbar\nals zus�zliche Anwendung\n" },
 { "1) Importing *.vcs or *.ics files from\nother applications may not work properly,\nif there are events with properties\nKO/Pi does not support.\n","1) Importieren von *.vcs oder *.ics Dateien von\nanderen Anwendungen kann m�licherweise\n nicht richtig funktionieren,\nwenn die Termine Eigenschaften haben,\ndie KO/Pi nicht untersttzt.\n" },
 { "Known Problems in  KOrganizer/Pi","Bekannte Probleme in  KOrganizer/Pi" },
 { "KO/Pi FAQ","KO/Pi FAQ" },
-{ "(c) 2004 Lutz Rogowski\nEmail:lutz@pi-sync.net\nKO/Pi is based on KOrganizer\n(c) 2002,2003 Cornelius Schumacher\nEmail: schumacher@kde.org\nKOrganizer/Pi is licensed\nunder the GPL.\nKO/Pi can be compiled for\nLinux, Zaurus-PDA and Windows\nwww.korganizer.org\nwww.pi-sync.net\n","(c) 2004 Lutz Rogowski\nEmail:lutz@pi-sync.net\nKO/Pi basiert auf KOrganizer\n(c) 2002,2003 Cornelius Schumacher\nEmail: schumacher@kde.org\nKOrganizer/Pi ist lizensiert unter der GPL.\nKO/Pi kann kompiliert werden fr\nLinux, Zaurus-PDA und Windows\nwww.korganizer.org\nwww.pi-sync.net\n" },
+{ "(c) 2004 Lutz Rogowski\nEmail:lutz@pi-sync.info\nKO/Pi is based on KOrganizer\n(c) 2002,2003 Cornelius Schumacher\nEmail: schumacher@kde.org\nKOrganizer/Pi is licensed\nunder the GPL.\nKO/Pi can be compiled for\nLinux, Zaurus-PDA and Windows\nwww.korganizer.org\nwww.pi-sync.info\n","(c) 2004 Lutz Rogowski\nEmail:lutz@pi-sync.info\nKO/Pi basiert auf KOrganizer\n(c) 2002,2003 Cornelius Schumacher\nEmail: schumacher@kde.org\nKOrganizer/Pi ist lizensiert unter der GPL.\nKO/Pi kann kompiliert werden fr\nLinux, Zaurus-PDA und Windows\nwww.korganizer.org\nwww.pi-sync.info\n" },
 { "PDA-Edition\nfor: Zaurus 5x00 / 7x0 / 8x0\n","PDA-Edition\nfr: Zaurus 5x00 / 7x0 / 8x0\n" },
 { "KOrganizer/Platform-independent\n","KOrganizer/Platform-independent\n" },
 { "About KOrganizer/Pi","�er KOrganizer/Pi" },
 { "From: ","Von: " },
 { "Remove sync info","Entferne Sync Info" },
 { "For all profiles","Fr alle Profile" },
 { "Hide not Running","Verstecke nicht Laufende" },
 { "ME","ME" },
 { "Toolbar","Toolbar" },
 { "Undo Delete...","L�chen rckg�gig machen..." },
 { "Undo Delete","L�chen rckg�gig machen" },
 { "KDE Sync HowTo...","KDE Sync HowTo..." },
 { "Multi Sync HowTo...","Multi Sync HowTo..." },
 { "Januar","Januar" },
 { "KO/Pi Keys + Colors","KO/Pi Tasten + Farben" },
 { "No Filter","Kein Filter" },
 { "Multiple Sync options","Multi Sync Optionen" },
 { "Sync algo options","Sync Ablauf Optionen" },
 { "Apply filter when adding data to local:","Filter fr das Hinzufgen von Daten zu Lokal:" },
 { "Incoming calendar filter:","Eingehender Kalender Filter:" },
 { "Incoming addressbook filter:","Eingehender Adressbuch Filter:" },
 { "Write back options","Optionen zum Zurckschreiben" },
 { "Write back (on remote) existing entries only","Schreibe nur existierende (auf Entfernt) Eintr�e zurck" },
 { "Apply filter when adding data to remote:","Filter fr das Hinzufgen 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�e fr Zeitspanne zurck" },
 { "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 specific settings","Profil Art abh�gige Einstellungen" },
 { "Local temp file:","Lokale temp Datei:" },
 { "Multiple profiles with same name!\nPlease use unique profile names!","Mehrere Profile mit demselben Namen!\nBitte verschiedene Namen benutzen!" },
 { "Aborted! Nothing synced!","Abgebrochen! Nichts wurde gesynct!" },
 
 
 
 
 { "Language","Sprache" },
 { "Time Format","Zeit Format" },
 { "Time Zone","Zeit Zone" },
 { "Your current storage dir is:\n%1\nYour mail is stored in:\n(storagedir)/apps/kopiemail/localmail","Ihr gerade genutztes Speicherverzeichnis ist:\n%1\nIhre Mail wird gespeichert in:\n(speicherverzeichnis)/apps/kopiemail/localmail" },
 { "<b>Set new data storage dir:</b>","<b>Setze neues Datenspeicherverzeichnis:</b>" },
 { "Not existing dirs are created automatically","Nicht existierende Verzeichnisse werden 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>" },
 { "The settings of the storage\ndir is saved in the file\n%1","Die Einstellungen des Speicherverzeichnisses\nwerden in folgender Datei gespeichert:\n%1" },
 { "Data storage path","Daten Speicherpfad" },
 { "Language","Sprache" },
 { "Show time in agenda items","Zeige Zeit in Agenda Items" },
 { "Color for Sundays + category "Holiday"","Farbe fr Sonntags + Kategorie "Feiertag"" },
 { "Show events, that are done in \nWhat's Next view","Zeige abgelaufene Termine in\nWhat's Next Ansicht" },
 { "Hide not running Todos in To-do view","Verstecke nicht laufende Todos in To-do Ansicht" },
 { "+01:00 Europe/Oslo(CET)","+01:00 Europe/Oslo(CET)" },
 { "KO/Pi","KO/Pi" },
 { "There is nothing to undo!","Es gibt nichts zum\nRckg�gigmachen!" },
 { "Recreating edit dialog. Please wait...","Recreating edit dialog. Please wait..." },
 { "Sound.Al.: ","Sound.Al.: " },
 { "From: %1   To: %2   %3","Von: %1   Bis: %2   %3" },
 { "Restore","Wiederherstellen" },
 { "\nAre you sure you want\nto restore this?","\nM�hten Sie das wirklicht\nwiederherstellen?" },
 { "% completed","% komplett" },
 { "%d item(s) found.","%d Item(s) gefunden." },
 { "Set complete","Мединтекс-2005" },
 { "(cancelled)","(gecancelt)" },
 { "Click on the week number to\nshow week in agenda view","Klicke auf die Wochennummer\num die Woche in der Agenda anzuzeigen" },
 { "","" },
 { "","" },
 { "","" },
 { "","" },
 { "","" },
diff --git a/bin/kdepim/korganizer/usertranslationHOWTO.txt b/bin/kdepim/korganizer/usertranslationHOWTO.txt
index bf2f3ca..b8fb0ea 100644
--- a/bin/kdepim/korganizer/usertranslationHOWTO.txt
+++ b/bin/kdepim/korganizer/usertranslationHOWTO.txt
@@ -1,75 +1,75 @@
 Now it is possible, that you as a user can make a translation 
 and see the result immediately in KO/Pi.
 
 If you want to translate a language from western europe (with Latin1 characters)
 you should set the language to German and translate the file germantranslation.txt.
 
 If you want to translate a language which needs utf8 support
 you should set the language to "usertranslation.txt" and translate the file usertranslation.txt.
 Propably the file usertranslation.txt is not up to date - such that it is recommended to
 copy the file germantranslation.txt over the file usertranslation.txt.
 The file germantranslation.txt always includes the latest strings to translate.
 
 To choose the language, please do:
 
 Choose menu Actions-Configure. There the TAB Locale.
 Choose "User defined" as language (or German) and restart.
 Now all the text is translated using the file usertranslation.txt (or germantranslation.txt).
 This file is located on Zaurus in 
 /home/QtPalmtop/pics/kdepim/korganizer/usertranslation.txt.
 On Windows, it is in 
 (your install dir)\kdepim\korganizer\usertranslation.txt.
 This file includes as a default the complete German translation of KO/Pi.
 (NOTE don't forget to copy germantranslation.txt over the file usertranslation.txt before you start).
 I.e. if you start KO/Pi for the first time with option
 "User defined", you will get the German Version.
 Just replace the German words in the file usertranslation.txt 
 by words of your own language.
 You can check the results immedialtely by starting KO/Pi.
 You can do the translation on Windows
 with the Windows KO/Pi Version to test.
 Or on the zaurus, if you have some spare time somewhere ...
 
 Howto translate:
 
 An entry is of the kind
 { "&Addressbook","&Adressbuch" },
 i.e. 
 { "englishtext","translatettext" },
 Note, that the separation mark between the two texts MUST be  "," ,
 not " ," or ", " or  " , " or something other!
 
 The & in &Addressbook stands for an 'a' as keyboard shortcut. 
 Please place the & in front of the same char in your translation or leave it out.
 
 Note, that the text should fit on the small display of an 5500.
 The given english text and german translation does fit.
 
 In messageboxes, there is sometimes long text used.
 Do make text using a new line, you have to use '\n'.
 Example:
 { "Backup file\nalready exists!\nOld backup file from:\n%1\nOverwrite?\n","Backup Datei\nexistiert bereits!\nAlte Backup Datei vom:\n%1\n�berschreiben?\n" },
 
 You can set the '\n' in the text where you want, 
 but you have to make shure, that the text does 
 fit on the small display of an 5500.
 
 Sometimes translation texts have a parameter or two, 
 where some text is inserted at runtime. 
 These parameters are %1, %2 and so on.
 In the example above we have the parameter %1, 
 which stands for the file name. 
 You can place this parameter in the pext where you want. 
 But don't forget to use it. 
 And be aware, that the parameter text has some length 
 and the parameter text should fit on the small display of an 5500.
 Sometimes only a number is filled in for a parameter. 
 In this case, the length of the parameter is not a big problem.
 
 To use a " itself as a char in the translated text, you have to put a \ in front of it, like in the example: 
 { "Color for Sundays + category \"Holiday\"","Farbe f�r Sonntag + Kateg.\" Feiertag\"" },
 
 Please send the translated text to
-Lutz@pi-sync.net
+Lutz@pi-sync.info
 such that I can add it to the program package and 
 other users can benefit from your translation work.
diff --git a/bin/kdepim/pwmanager/pwmanagerFAQ.txt b/bin/kdepim/pwmanager/pwmanagerFAQ.txt
index 212e018..15cfd80 100644
--- a/bin/kdepim/pwmanager/pwmanagerFAQ.txt
+++ b/bin/kdepim/pwmanager/pwmanagerFAQ.txt
@@ -1,84 +1,84 @@
 Q:
 What is PWM/Pi?
 Q:  
 For which platform is PWM/Pi available?
 Q:
 Can I exchange the password files from PWM/Pi and PwManager?
 Q:
 Does Export/Import keep sync information in place?
 Q:
 Can PWM/Pi sync categories?
 Q:
 Which crypto, hash and compress algorithm is applied to the remote file
 while syncing?
 Q:
 What is the format of the CSV format to import passwords?
 
 *************************************************************************
 Q:
 What is PWM/Pi
 A:
 PWM/Pi is the platform-independend version of PwManager 1.0.1, written by
 Michael Buesch and the PwManager Team (http://passwordmanager.sourceforge.net)
 *************************************************************************
 Q:  
 For which platform is PWM/Pi available?
 A: 
 PWM/Pi is the platform-independend version of PWManager and it 
 includes a replacement for the KDE libraries called microkde.
 It can be compiled to any platform, where Qt is available.
 The source code  compiles without modifications on Windows, 
 Linux Desktop and Sharp Zaurus PDA. Precompiled versions are available 
-on www.pi-sync.net for Windows and Sharp Zaurus PDA.
+on www.pi-sync.info for Windows and Sharp Zaurus PDA.
 Latest versions and the source code cvs can be found at:
 http://sourceforge.net/projects/kdepimpi/
 *************************************************************************
 Q:
 Can I exchange the password files from PWM/Pi and PwManager
 A:
 The password files of PWM/Pi can not be exchanged with all versions up
 to 1.0.1 of PwManager.
 However, Michael will integrate our changes into a PwManager release
 1.1, and the password files of that release will then be interchangable
 with PWM/Pi
 *************************************************************************
 Q:
 Does Export/Import keep sync information in place
 A:
 Exporting data from PwManager removes all sync related information 
 (Meta information) from the data. Because of that, a subsequent import
 results in "new" entries that will be handled as new entries when
 syncing them with an existing password file.
 *************************************************************************
 Q:
 Can PWM/Pi sync categories?
 A:
 No. PWM/Pi does not sync categories. It syncs all pw entries of the file
 without checking for the entries categories. 
 A sync operation does not move modified entries from one category to another.
 Only if the sync operation has to create a new pw entry, it checks for the
 existance of the category and creates it if not existent.
 *************************************************************************
 Q:
 Which crypto, hash and compress algorithm is applied to the remote file
 while syncing?
 A: The sync operation applies the local crypt, hash and compress algorithm   
 to both, the local and remote copy of the passwordfile and with thus
 overwrites the settings of the remote PwManager application.
 *************************************************************************
 Q:
 What is the format of the CSV file to import passwords?
 A:
 "Category 1",, "Desc 1", "Username 1", "Password 1", "URL 1", "Launcher 1", "Comment 1"
 "Category 1",, "Desc 2", "Username 2", "Password 2", "URL 2", "Launcher 2", "Comment 2"
 ...
 
 
 -The empty "" is neccessary, because in future versions PwManager will
 support nested Categories.
 -The first line must !!not!! contain the field names.
 
 
 
 
  
diff --git a/desktop/rpm/kdepim_rpm b/desktop/rpm/kdepim_rpm
index 85c2644..4806075 100644
--- a/desktop/rpm/kdepim_rpm
+++ b/desktop/rpm/kdepim_rpm
@@ -1,84 +1,84 @@
 Summary: A collection of PIM programs
 Name: KDE-Pim-Pi
 Version: 2.0.17
 Release: SuSE_9.2
 Copyright:GPL
 Group: Productivity/Pim
 Source:http://sourceforge.net/projects/kdepimpi/
 URL:http://sourceforge.net/projects/kdepimpi/
 Packager: zautrix
 
 %description
 This package contains the platform-independent PIM programs from
-www.pi-sync.net, compiled for SuSE 9.2:
+www.pi-sync.info, compiled for SuSE 9.2:
 KTimeTacker/Pi
 KPhone/Pi
 KAddressbook/Pi
 KOrganizer/Pi
 PasswordManager/Pi
 KOPieMail/Pi
 
 These applications do not need anything from the KDE-desktop
 at all to run on Linux. However, there is a dependency from
 two KDE libs, because a small command line program is included
 to make it possible to sync with the KDE-desktop applications.
 
 These applications are independent from the KDE-desktop
 environment. That means, nothing of your existing
 KDE-desktop setup will be changed, or any data 
 (calendar-addressbook) used by the KDE-desktop
 applications will be changed or accessed.
 These applications stores their data and config in
 $HOME/kdepim/
 However, because the same file format is used,
 an easy exchange of data with the KDE-desktop
 is possible.
 A small command line program is included
 to make it possible to sync with the KDE-desktop applications.
 You do not need to call this program from the commandline,
 it is called from the KDE-Pim/Pi apps when you choose there:
 Sync with KDE_Desktop.
 If something is going wrong, please start the
 KDE-Pim/Pi program itself from the console to get detailed output.
 
 After installation, you should have a 
 PIM-pi
 folder in your KDE start menu, where you can
 start the applications from.
 
 These programs makes it possible to sync your Zaurus easily
 (with the KDE-Pim/Pi programs running on the Zaurus)
 with the KDE-desktop calendar/addressbook data.
 If you want to use that, you have to update your 
 KDE-desktop to version 3.3.0 or higher.
 SuSE 9.2 contains KDE 3.3.0 such that no update is needed.
 Actually - after the (non difficult) configuration is set up -
 with two mouseklicks on the Zaurus,
 the Zaurus syncs with the corresponding  KDE-Pim/Pi 
 program on the Linux Desktop which syncs automatically
 with the KDE-desktop data.
 
 If you want to use the KDE-desktop calendar/addressbook applications,
 just install these apps in this package and use them as a syncing tool for the
 Zaurus <-> KDE-desktop sync.
 The sync requires a network connection from your Zaurus to
 the PC. A detailed Sync HowTo is available in the
 Help menu of the applications.
 
 These applications makes it also possible, that you can sync
 (or just export the data to) your mobile phone with your 
 data of the KDE-desktop calendar/addressbook applications.
 This is tested and working for Nokia mobile phones,
 it may work with others as well.
 (More info about that: -> Sync HowTo)
 
 NOTE:
 When using SuSE 9.1 you have to update your KDE to 3.3.x
 and you have to make an online update in SuSE 9.1 to make it
 possible to get the infrared connection working, such that
 you can sync your (Nokia) mobile phone via infrared.
 
 %files
 /opt/kde3/share/applnk/PIM-pi/
 /opt/kdepimpi/
 /usr/lib/libmicro*
diff --git a/kaddressbook.control b/kaddressbook.control
index 514adc7..723bb1f 100644
--- a/kaddressbook.control
+++ b/kaddressbook.control
@@ -1,13 +1,13 @@
 Files: bin/kapi  apps/Pim/kaddressbook.desktop  pics/kdepim/kaddressbook/*  lib/libmicrokabc_q* lib/libmicrokabc_f* lib/libmicrokabc_d*  lib/libmicrokabc.* 
 Priority: optional
 Section: qpe/pim
-Maintainer: Lutz Rogowski <lutz@pi-sync.net>
+Maintainer: Lutz Rogowski <lutz@pi-sync.info>
 Architecture: arm
 Version: $KDEPIM_VERSION
 License: GPL
 Depends: kmicrokdelibs
 Description: KOrganizer/Pi and Kaddressbook/Pi
  The embedded version of KOrganizer/Platform-independend, 
     the KDE calendar and scheduling program
   optimized for 640x480 and 320x240 resolution
     on Zaurus PDA
diff --git a/kmicrokdelibs.control b/kmicrokdelibs.control
index c2964f4..b3bfeb9 100644
--- a/kmicrokdelibs.control
+++ b/kmicrokdelibs.control
@@ -1,12 +1,12 @@
 Files: pics/kdepim/*.txt lib/libmicroqt* lib/libmicrokde*
 Priority: optional
 Section: qpe
-Maintainer: Lutz Rogowski <lutz@pi-sync.net>
+Maintainer: Lutz Rogowski <lutz@pi-sync.info>
 Architecture: arm
 Version: $KDEPIM_VERSION
 License: GPL
 Description:  Needed libs help and licence files for 
     KOrganizer/Pi (KO/Pi) and 
     Kaddressbook/Pi (KA/Pi) and 
     KOpieMail/Pi (OM/Pi) and
     PasswordManager/Pi (PwM/Pi)
diff --git a/kmobilephoneaccess.control b/kmobilephoneaccess.control
index be4a4c2..8882447 100644
--- a/kmobilephoneaccess.control
+++ b/kmobilephoneaccess.control
@@ -1,10 +1,10 @@
 Files:  bin/kammu  lib/libmicrokammu*
 
 Priority: optional
 Section: qpe/pim
-Maintainer: Lutz Rogowski <lutz@pi-sync.net>
+Maintainer: Lutz Rogowski <lutz@pi-sync.info>
 Architecture: arm
 Version: $KDEPIM_VERSION
 License: GPL
 Description: Special version of gammu / libgammu
     for Zaurus PDA and microkde
diff --git a/kopiemail.control b/kopiemail.control
index 3180540..dba9f89 100644
--- a/kopiemail.control
+++ b/kopiemail.control
@@ -1,11 +1,11 @@
 Files:  bin/ompi apps/Pim/kopiemail.desktop  pics/kdepim/kopiemail/*   lib/libmicromail* lib/libmicrolibetpan*
 Priority: optional
 Section: qpe/pim
-Maintainer: Lutz Rogowski <lutz@pi-sync.net>
+Maintainer: Lutz Rogowski <lutz@pi-sync.info>
 Architecture: arm
 Version: $KDEPIM_VERSION
 License: GPL
 Depends: kmicrokdelibs openssl
 Description: KOPieMail/Pi 
  The embedded version of KOPieMail/Platform-independend (OM/Pi), 
      for 640x480 and 320x240 resolution on Zaurus PDA
diff --git a/korganizer-alarm.control b/korganizer-alarm.control
index 68bc398..01dbeff 100644
--- a/korganizer-alarm.control
+++ b/korganizer-alarm.control
@@ -1,9 +1,9 @@
 Files: plugins/applets/libkopialarmapplet.* pics/ko16.png  pics/ko24.png 
 Priority: optional
 Section: qpe/applications
-Maintainer: Lutz Rogowski <lutz@pi-sync.net>
+Maintainer: Lutz Rogowski <lutz@pi-sync.info>
 Architecture: arm
 Version: $KDEPIM_VERSION
 License: GPL
 Description: KOrganizer/Pi Alarm Daemon
  The alarm daemon needed by KOrganizer/Platform-independend showing alarms.
diff --git a/korganizer.control b/korganizer.control
index 74803e9..e7c55f1 100644
--- a/korganizer.control
+++ b/korganizer.control
@@ -1,13 +1,13 @@
 Files: bin/kopi  apps/Pim/korganizer.desktop   pics/kdepim/korganizer/* lib/libmicrokcal*
 Priority: optional
 Section: qpe/pim
-Maintainer: Lutz Rogowski <lutz@pi-sync.net>
+Maintainer: Lutz Rogowski <lutz@pi-sync.info>
 Architecture: arm
 Version: $KDEPIM_VERSION
 License: GPL
 Depends: kmicrokdelibs
 Description: KOrganizer/Pi and Kaddressbook/Pi
  The embedded version of KOrganizer/Platform-independend, 
     the KDE calendar and scheduling program
   optimized for 640x480 and 320x240 resolution
     on Zaurus PDA
diff --git a/korganizer/kolocationbox.cpp b/korganizer/kolocationbox.cpp
index f8fee2e..35a8123 100644
--- a/korganizer/kolocationbox.cpp
+++ b/korganizer/kolocationbox.cpp
@@ -1,96 +1,96 @@
 /*
     Copyright (c) 2004 Dirk Loesche <dirk.loesche@bigfoot.de>
 
     This file is part of KOrganizer/PI
     KOrganizer    Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
-    KOrganizer/PI Copyright (c) 2004 Lutz Rogowski <lutz@pi-sync.net>
+    KOrganizer/PI Copyright (c) 2004 Lutz Rogowski <lutz@pi-sync.info>
     
     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.
 */
 
 #include "kolocationbox.h"
 #include <qstring.h>
 #include <qlineedit.h>
 #include <qapplication.h>
 
 
 KOLocationBox::KOLocationBox( bool rw , QWidget *parent , int _maxItems) :
   QComboBox( rw , parent )
 {
   maxItems = _maxItems;
   maxItems = 50; // sorry - hack from me to set maxitems globally to 30
   setInsertionPolicy(AtTop);
   setDuplicatesEnabled( FALSE );
   setMaxCount( maxItems );
   setAutoCompletion( TRUE );  
 
 }
 
 KOLocationBox::~KOLocationBox()
 {
 }
 
 void KOLocationBox::load(int what)
 {
   clear();
   // qDebug("load %d ",what );
   switch(what) {
     case LOCATION:
         insertStringList( KOPrefs::instance()->mLocationDefaults, 0 );
 //        insertStringList( KOPrefs::instance()->mLocationUserDefaults, 0 );
         break;  // don't disable
     case SUMMARYEVENT:
         insertStringList( KOPrefs::instance()->mEventSummaryUser, 0 );
         break;  // don't disable
     case SUMMARYTODO:
         insertStringList( KOPrefs::instance()->mTodoSummaryUser, 0 );
         break;  // don't disable
   }
 }
 
 void KOLocationBox::save(int what)
 {
   strlist.clear();
   for( int l = 0; l < count() ; l++ ) {
     strlist << text( l );
   }
   // strlist.sort();
   QString currentLine = lineEdit()->text();
   if ( !strlist.contains( currentLine  ) )
       strlist.prepend( currentLine );
   // qDebug("save %d ", what);
   switch(what) {
     case LOCATION:
         KOPrefs::instance()->mLocationDefaults = strlist;
 //        KOPrefs::instance()->mLocationUserDefaults = strlist;
         break; // don't disable
     case SUMMARYEVENT:
         KOPrefs::instance()->mEventSummaryUser = strlist;
         break;  // don't disable
     case SUMMARYTODO:
         KOPrefs::instance()->mTodoSummaryUser = strlist;
         break;  // don't disable
   }        
 }
 
 void KOLocationBox::clearItems(int what)
 {
   clear();
   save(what);
 }
diff --git a/korganizer/kolocationbox.h b/korganizer/kolocationbox.h
index be8ea86..b604d33 100644
--- a/korganizer/kolocationbox.h
+++ b/korganizer/kolocationbox.h
@@ -1,55 +1,55 @@
 /*
     File Copyright (c) 2004 Dirk Loesche <dirk.loesche@bigfoot.de>
 
     This file is part of KOrganizer/PI
     KOrganizer    Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
-    KOrganizer/PI Copyright (c) 2004 Lutz Rogowski <lutz@pi-sync.net>
+    KOrganizer/PI Copyright (c) 2004 Lutz Rogowski <lutz@pi-sync.info>
     
     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 KOLOCATIONBOX_H
 #define KOLOCATIONBOX_H
 
 #include <qcombobox.h>
 #include "koprefs.h"
 
 class KOLocationBox : public QComboBox
 {
   public:
     KOLocationBox( bool rw , QWidget *parent , int _maxItems );
     virtual ~KOLocationBox();
     
     enum {LOCATION, SUMMARYEVENT, SUMMARYTODO};
   
   public slots:
     void        load(int);
     void        save(int);
     void        clearItems(int); // clear listbox and config rc items
 
   protected:
 //    void        focusOutEvent( QFocusEvent * );
 //    void        timerEvent( QTimerEvent * );
 
   private:
     int         maxItems;       // maximal listbox items
     QStringList strlist;        // temporary stringlist
 };
 
 #endif
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 4f71788..bd9efc8 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -1182,265 +1182,265 @@ void MainWindow::exportToPhone( int mode )
                               KPimGlobalPrefs::instance()->mEx2PhoneModel );
 
     setCaption( i18n("Writing to phone..."));
     if ( PhoneFormat::writeToPhone( cal ) )
         setCaption( i18n("Export to phone successful!"));
     else
         setCaption( i18n("Error exporting to phone!"));
     delete cal;
 }
 
 
 void MainWindow::setDefaultPreferences()
 {
     KOPrefs *p = KOPrefs::instance();
 
     p->mCompactDialogs = true;
     p->mConfirm = true;
     // p->mEnableQuickTodo = false;
 
 }
 
 QString MainWindow::resourcePath()
 {
     return KGlobal::iconLoader()->iconPath();
 }
 
 void MainWindow::displayText( QString text ,QString cap  )
 {
     QDialog dia( this, "name", true ); ;
     dia.setCaption( cap );
     QVBoxLayout* lay = new QVBoxLayout( &dia );
     lay->setSpacing( 3 );
     lay->setMargin( 3 );
     QTextBrowser tb ( &dia );
     lay->addWidget( &tb );
     tb.setText( text );
 #ifdef DESKTOP_VERSION
     dia.resize( 640, 480);
 #else
     dia.showMaximized();
 #endif
     dia.exec();
 }
 
 void MainWindow::features()
 {
 
     KApplication::showFile( i18n("KO/Pi Features and hints"), "kdepim/korganizer/featuresKOPI.txt" );
 }
 
 void MainWindow::usertrans()
 {
 
     KApplication::showFile( i18n("KO/Pi User translation HowTo"), "kdepim/korganizer/usertranslationHOWTO.txt" );
 }
 
 void MainWindow::kdesynchowto()
 {
     KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/Zaurus-KDE_syncHowTo.txt" );
 }
 void MainWindow::multisynchowto()
 {
     KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/MultiSyncHowTo.txt" );
 }
 void MainWindow::synchowto()
 {
     KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/SyncHowto.txt" );
 }
 void  MainWindow::faq()
 {
     KApplication::showFile( i18n("KO/Pi FAQ"), "kdepim/korganizer/kopiFAQ.txt" );
 
 }
 void  MainWindow::whatsNew()
 {
     KApplication::showFile( "KDE-Pim/Pi Version Info", "kdepim/WhatsNew.txt" );
 
 }
 void  MainWindow::licence()
 {
     KApplication::showLicence();
 
 }
 void MainWindow::about()
 {
     QString version;
 #include <../version>
     QMessageBox::about( this, i18n("About KOrganizer/Pi"),
                         i18n("KOrganizer/Platform-independent\n") +
                         "(KO/Pi) " + version + " - " +
 
 #ifdef DESKTOP_VERSION
                         i18n("Desktop Edition\n") +
 #else
                         i18n("PDA-Edition\nfor: Zaurus 5x00/7x0/860/3000/6000\n") +
 #endif
-                        i18n("(c)2004 Lutz Rogowski (rogowski@kde.org)\nKO/Pi is based on KOrganizer\n(c)2002,2003 Cornelius Schumacher\n(schumacher@kde.org) and the KDE team.\nKOrganizer/Pi is licensed under the GPL.\nKO/Pi can be compiled for\nLinux, Zaurus-PDA and Windows\nwww.pi-sync.net --- www.korganizer.org\nSpecial thanks to Michael and Ben\nfor intensive testing!") );
+                        i18n("(c)2004 Lutz Rogowski (rogowski@kde.org)\nKO/Pi is based on KOrganizer\n(c)2002,2003 Cornelius Schumacher\n(schumacher@kde.org) and the KDE team.\nKOrganizer/Pi is licensed under the GPL.\nKO/Pi can be compiled for\nLinux, Zaurus-PDA and Windows\nwww.pi-sync.info --- www.korganizer.org\nSpecial thanks to Michael and Ben\nfor intensive testing!") );
 }
 void MainWindow::keyBindings()
 {
     QString cap = i18n("KO/Pi Keys + Colors");
     QString text =  i18n("<p><h2>KO/Pi key shortcuts:</h2></p>\n") +
         i18n("<p><b>H</b>: This help dialog | <b>S</b>: Search dialog</p>\n")+
         i18n("<p><b>I</b>: Show info for selected event/todo</p>\n") +
         i18n("<p><b>Space</b>: Toggle fullscreen | <b>P</b>: Date picker</p>\n")+
         i18n("<p><b>F</b>: Toggle filterview |<b>F+ctrl</b>: Edit filter </p>\n")+
         i18n("<p><b>O</b>: Filter On/Off | <b>J</b>: Journal view</p>\n")+
         i18n("<p><b>1-0</b> (+<b>ctrl</b>): Select filter 1-10 (11-20)</p>\n")+
         i18n("<p><b>N</b>: Next days view| <b>W</b>: What's next view\n ")+
         i18n("<p><b>V</b>: Todo view | <b>L</b>: Event list view</p>\n")+
         i18n("<p><b>Z,Y</b>: Work week view | <b>U</b>: Week view</p>\n")+
         i18n("<p><b>D</b>: One day view | <b>M</b>: Month view</p>\n")+
         i18n("<p><b>K</b>: Week view in Month view syle</p>\n")+
         i18n("<p><b>E</b>: Edit selected item |<b> E+ctrl</b>: New Event</p>\n")+
         i18n("<p><b>T</b>: Goto today | <b>T+ctrl</b>: New Todo</p>\n")+
         i18n("<p><b>S+ctrl</b>: Add sub-todo | <b>X</b>: Toggle datenavigator</p>\n")+
         i18n("<p><b>+,-</b> : Zoom in/out agenda | <b>A</b>: Toggle allday agenda height</p>\n")+
         i18n("<p><b>C</b>: Show current time in agenda view</p>\n")+
         i18n("<p><b>B</b>: Edit description (details) of selected item</p>\n")+
         i18n("<p><b>right</b>: Next week | <b>right+ctrl</b>: Next month</p>\n")+
         i18n("<p><b>left</b>: Prev. week | <b>left+ctrl</b>: Prev. month</p>\n")+
         i18n("<p><b>del,backspace</b>: Delete selected item</p>\n")+
         i18n("<p><h3>In agenda view:</h3></p>\n") +
         i18n("<p><b>up/down</b>: Scroll agenda view</p>\n")+
         i18n("<p><b>ctrl+up/down</b>: Scroll small todo view</p>\n")+
         i18n("<p><h3>In todo view:</h3></p>\n") +
         i18n("<p><b>shift+U</b>: <b>U</b>nparent todo (make root todo)</p>\n")+
         i18n("<p><b>shift+S</b>: Make <b>S</b>ubtodo (reparent todo)</p>\n")+
         i18n("<p><b>shift+P</b>: Make new <b>P</b>arent for todo selected with shift+S</p>\n")+
         i18n("<p><b>Q</b>: Toggle quick todo line edit.</p>\n")+
         i18n("<p><b>I</b>: Show info of current item+one step down.</p>\n")+
         i18n("<p><b>return</b>: Mark item as completed+one step down.</p>\n")+
         i18n("<p><b>return+shift</b>:  Mark item as not completed+one step down</p>\n")+
         i18n("<p><h3>In list view:</h3></p>\n") +
         i18n("<p><b>I</b>: Show info of current item+one step down.</p>\n")+
         i18n("<p><b>return</b>: Select item+one step down</p>\n")+
         i18n("<p><b>return+shift</b>: Deselect item+one step down</p>\n")+
         i18n("<p><b>up/down</b>: Next/prev item</p>\n")+
         i18n("<p><b>ctrl+up/down</b>:  Goto up/down by 20% of items</p>\n")+
         i18n("<p><b>shift+up/down</b>: Goto first/last item</p>\n")+
         i18n("<p><h3>In event/todo viewer:</h3></p>\n") +
         i18n("<p><b>I,C</b>: Close dialog.</p>\n")+
         i18n("<p><b>A</b>: Show agenda view.</p>\n")+
         i18n("<p><b>E</b>:  Edit item</p>\n") +
         i18n("<p><h2>KO/Pi icon colors:</h2></p>\n") +
         i18n("<p><b>(for square icons in agenda and month view)</b></p>\n") +
         i18n("<p><b>Cross</b>: Item cancelled.([c] in Whats'Next view)</p>\n")+
         i18n("<p><b>Red</b>: Alarm set.([a] in Whats'Next view)</p>\n")+
         i18n("<p><b>Blue</b>: Recurrent event.([r] in Whats'Next view)</p>\n")+
         i18n("<p><b>Dark green</b>: Information(description) available.([i] in WN view)</p>\n")+
         i18n("<p><b>Black</b>: Event/todo with attendees. You are the organizer!</p>\n")+
         i18n("<p><b>Dark yellow</b>:  Event/todo with attendees.</p>\n") +
         i18n("<p><b>White</b>: Item readonly</p>\n");
     displayText( text, cap);
 }
 void MainWindow::aboutAutoSaving()
 {
     QString text = i18n("After changing something, the data is\nautomatically saved to the file\n~/kdepim/apps/korganizer/mycalendar.ics\nafter (configurable) three minutes.\nFor safety reasons there is  one autosaving\nafter 10 minutes (of idle time) again. The \ndata is saved automatically when closing KO/Pi\nYou can create a backup file \nwith: File - Save Calendar Backup\n");
   
     KApplication::showText( i18n("Auto Saving in  KOrganizer/Pi"), text);
 
 }
 void MainWindow::aboutKnownBugs()
 {
     QMessageBox* msg;
     msg = new QMessageBox(  i18n("Known Problems in  KOrganizer/Pi"),
                             i18n("1) Importing *.vcs or *.ics files from\nother applications may not work properly,\nif there are events with properties\nKO/Pi does not support.\n")+
                             i18n("2) Audio alarm daemon\nfor Zaurus is available!\nas an additional small application\n")+
-                            i18n("\nPlease report unexpected behaviour to\nlutz@pi-sync.net\n") +
+                            i18n("\nPlease report unexpected behaviour to\nlutz@pi-sync.info\n") +
                             i18n("\nor report them in the bugtracker on\n") +
                             i18n("\nhttp://sourceforge.net/projects/kdepimpi\n"),
                             QMessageBox::NoIcon,
                             QMessageBox::Ok,
                             QMessageBox::NoButton,
                             QMessageBox::NoButton);
     msg->exec();
     delete msg;
 
 }
 
 QString MainWindow::defaultFileName()
 {
     return locateLocal( "data", "korganizer/mycalendar.ics" );
 }
 QString MainWindow::syncFileName()
 {
 #ifdef DESKTOP_VERSION
     return  locateLocal( "tmp", "synccalendar.ics" );
 #else
     return QString( "/tmp/synccalendar.ics" );
 #endif
 }
 void MainWindow::updateWeek(QDate seda)
 {
     int weekNum = 0;
     QDate d = QDate ( seda.year(), 1,1);
     seda = seda.addDays( 1-seda.dayOfWeek() );//we are on monday
     if ( seda.addDays(6).year() != seda.year()  ) {
         if ( seda.year() != d.year() ) {
             if ( d.dayOfWeek() > 4 )
                 d = QDate ( seda.year(), 1,1);
             else
                 weekNum = 1;
         } else {
             QDate dd( seda.year()+1, 1,1);
             if ( dd.dayOfWeek() <= 4 )
                 weekNum = 1;
         }
     }
     if ( weekNum == 0 ){
         int dow = d.dayOfWeek();
         if ( dow <= 4 )
             d = d.addDays( 1-dow );
         else // 5,6,7
             d = d.addDays( 8-dow );
         // we have the first week of the year.we are on monday
         weekNum =  d.daysTo( seda ) / 7 +1;
     }
     
     mWeekPixmap.fill( mWeekBgColor );
     QPainter p ( &mWeekPixmap );
     p.setFont( mWeekFont );
     p.drawText( 0,0,mWeekPixmap.width(), mWeekPixmap.height(),AlignCenter, QString::number( weekNum) );
     p.end();   
     QIconSet icon3 ( mWeekPixmap );
     mWeekAction->setIconSet ( icon3 );
 
 }
 void MainWindow::updateWeekNum(const DateList &selectedDates)
 {
     updateWeek( selectedDates.first() );
 }
 void MainWindow::processIncidenceSelection( Incidence *incidence )
 {
 
     if ( !incidence ) {
         enableIncidenceActions( false );
 
         mNewSubTodoAction->setEnabled( false );
         setCaptionToDates();
         return;
 
     }
 
     //KGlobal::locale()->formatDateTime(nextA, true);
     QString startString = "";
     if ( incidence->type() != "Todo" ) {
         if ( incidence->dtStart().date() < incidence->dtEnd().date()   ) {
             if ( incidence->doesFloat() ) {
             startString += ": "+incidence->dtStartDateStr( true );
             startString += " --- "+((Event*)incidence)->dtEndDateStr( true );
 
             } else {
             startString = ": "+incidence->dtStartStr(true);
             startString += " --- "+((Event*)incidence)->dtEndStr(true);
 
             }
 
         } else {
             if ( incidence->dtStart().time() != incidence->dtEnd().time() )
                 startString = ": "+KGlobal::locale()->formatTime(incidence->dtStart().time())+
                     "-"+KGlobal::locale()->formatTime(incidence->dtEnd().time());
             if ( incidence->categories().contains( i18n("Birthday") ) || incidence->categories().contains( i18n("Anniversary") )  ) {
                 bool ok;
                 QDateTime noc = incidence->getNextOccurence( mView->startDate().addDays(-1), &ok );
diff --git a/ksharpPIM-DTMaccess.control b/ksharpPIM-DTMaccess.control
index f4bf08b..8e92c37 100644
--- a/ksharpPIM-DTMaccess.control
+++ b/ksharpPIM-DTMaccess.control
@@ -1,10 +1,10 @@
 Files:  bin/db2file lib/libmicrokabc_sharp*
 Priority: optional
 Section: qpe/pim
-Maintainer: Lutz Rogowski <lutz@pi-sync.net>
+Maintainer: Lutz Rogowski <lutz@pi-sync.info>
 Architecture: arm
 Version: $KDEPIM_VERSION
 License: GPL
 Depends: kmicrokdelibs
 Description: Program/lib needed to access 
     Sharp DTM PIM from KDE-Pim/Pi programs. 
diff --git a/oz-character-conversion.control b/oz-character-conversion.control
index 373868e..4591db1 100644
--- a/oz-character-conversion.control
+++ b/oz-character-conversion.control
@@ -1,8 +1,8 @@
 Files: lib/gconv/*
 Priority: optional
 Section: qpe/applications
-Maintainer: Lutz Rogowski <lutz@pi-sync.net>
+Maintainer: Lutz Rogowski <lutz@pi-sync.info>
 Architecture: arm
 Version: OZ-gcc3xx
 License: GPL
 Description: Character conversion tables, needed by OM/Pi.
diff --git a/pimTABicon.control b/pimTABicon.control
index 0007c7c..f798e69 100644
--- a/pimTABicon.control
+++ b/pimTABicon.control
@@ -1,9 +1,9 @@
 Files:  apps/Pim/.directory  pics/ko24ti.png
 Priority: optional
 Section: qpe/pim
-Maintainer: Lutz Rogowski <lutz@pi-sync.net>
+Maintainer: Lutz Rogowski <lutz@pi-sync.info>
 Architecture: arm
 Version: $KDEPIM_VERSION
 License: GPL
 Description: Icon for Pim TAB
     for Zaurus PDA and microkde
diff --git a/sr-character-conversion.control b/sr-character-conversion.control
index c5fe32d..d50704e 100644
--- a/sr-character-conversion.control
+++ b/sr-character-conversion.control
@@ -1,8 +1,8 @@
 Files: lib/gconv/*
 Priority: optional
 Section: qpe/applications
-Maintainer: Lutz Rogowski <lutz@pi-sync.net>
+Maintainer: Lutz Rogowski <lutz@pi-sync.info>
 Architecture: arm
 Version: SharpROM
 License: GPL
 Description: Character conversion tables, needed by OM/Pi.