text fixes

5 files changed, 287 insertions, 15 deletions

diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
index f2adfc8..ee123f8 100644
--- a/ReleaseNotes.txt
+++ b/ReleaseNotes.txt
@@ -1,294 +1,311 @@
 
 KDE-Pim/Pi is available for four platforms:
 
 1) Windows 32 (not available for all releases)
 2) Zaurus Sharp ROM, gcc 2.95 compiled
 3) OpenZaurus ROM, gcc 3.xx compiled (not available for all releases)
 4) Linux Desktop (SuSE 9.2) (not available for all releases)
+5) Memory stick edition for Win_XP, Win_ME and Linux (not available for all releases)
 
 Contents of the packages and how to install:
 
 
 *****************************************************
 1) Windows 32
 *****************************************************
+
 NOTE:
 There are two version for Windows available:
 The file
-kdepim_2.1.2_for_Windows.exe.zip, wich is for Windows 2000/XP
+kdepim_X.X.XX_for_Windows_XP.exe.zip, wich is for Windows 2000/XP
 and the file
-kdepim_2.1.2_for_Windows_98-ME.exe.zip, wich is for Windows 98/ME.
+kdepim_X.X.XX_for_Windows_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_2.1.2_for_Windows.exe.zip
+Filename: kdepim_X.X.XX_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.
 
 
 *****************************************************
 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.
 You need external lib openssl to run OM/Pi.
 
 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.
 You need external lib openssl to run OM/Pi.
 
 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.
 
+NOTE:
+OM/Pi needs openssl, you can download an openssl package for the Z from here:
+http://www.net.lib.utah.edu/zaurus/openssl-0.9.7a_0.9.7a_arm.ipk
+
 *****************************************************
 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
 
 
 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.
 You need external lib openssl to run OM/Pi.
 
 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.
 You need external lib openssl to run OM/Pi.
 
 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.1.2-SuSE_9.2.i586.rpm
+
+Filename: KDE-Pim-Pi-X.X.XX-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.1.2-SuSE_9.2.i586.rpm
+rpm -ihv KDE-Pim-Pi-X.X.XX-SuSE_9.2.i586.rpm
 Note:
 If you want to update, please do it with
-rpm -Uhv KDE-Pim-Pi-2.1.2-SuSE_9.2.i586.rpm
-(Uninstall with rpm -e KDE-Pim-Pi-2.1.2-SuSE_9.2)
+rpm -Uhv KDE-Pim-Pi-X.X.XX-SuSE_9.2.i586.rpm
+(Uninstall with rpm -e KDE-Pim-Pi-X.X.XX-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.info, compiled for SuSE 9.2:
 KTimeTacker/Pi
 KPhone/Pi
 KAddressbook/Pi
 KOrganizer/Pi
 PasswordManager/Pi
-KOPieMail/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
+
+
+*****************************************************
+5) Memory Stick edition:
+*****************************************************
+
+If you download the memory stick edition you do not have to download kdepimdll.zip. The memory stick edition contains all needed files! It contains binary files of KO/Pi and KA/Pi for WindowsXP, WindowsME and Linux and the needed libs. In the memory stick edition KO/Pi and KA/Pi are already configured to run from a memory stick and to save the data to the memory stick. You may have problems to run the Linux versions of KO/Pi or KA/Pi on Linux from a MS-Dos formatted memory stick.  That depends on your Linux distribution.
+
diff --git a/bin/ReadMe_Linux.txt b/bin/ReadMe_Linux.txt
index 74e3aa6..5a07eae 100644
--- a/bin/ReadMe_Linux.txt
+++ b/bin/ReadMe_Linux.txt
@@ -1,103 +1,103 @@
 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
+Filename: KDE-Pim-Pi-X.X.XX-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
+rpm -ihv KDE-Pim-Pi-X.X.XX-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)
+rpm -Uhv KDE-Pim-Pi-X.X.XX-SuSE_9.2.i586.rpm
+(Uninstall with rpm -e KDE-Pim-Pi-X.X.XX-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.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 7a95e65..0eaf6ff 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.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

+kdepim_X.X.XX_for_Windows_XP.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.

+kdepim_X.X.XX_for_Windows_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

+Filename: kdepim_X.X.XX_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 085c549..41ca8ea 100644
--- a/bin/ReadMe_Zaurus.txt
+++ b/bin/ReadMe_Zaurus.txt
@@ -1,159 +1,164 @@
 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.
 
+NOTE:
+OM/Pi needs openssl, you can download an openssl package for the Z from here:
+http://www.net.lib.utah.edu/zaurus/openssl-0.9.7a_0.9.7a_arm.ipk
+
+
 *****************************************************
 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
 
 
 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.
\ No newline at end of file
diff --git a/changelog.txt b/changelog.txt
index 45e0322..dec26f6 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,98 +1,348 @@
 Info about the changes in new versions of KDE-Pim/Pi
 
+********** VERSION 2.1.17 ************
+
+KO/Pi:
+Added option to display times in What's Next View on two lines.
+(Useful for display on the Zaurus with 240x320 screen)
+Removed "Allday" for allday events of one day duration in What's Next View.
+Added date range for allday events of more than one day duration in What's Next View.
+Fixed two problems in the data importing from Outlook:
+  Fixed the duplicated import if the summary, location or description had whitespaces at the end.
+  Fixed a problem importing certain recurrence rules.  
+
+A journal in an ics file may have no dtStart value (as files from KNotes, which stores its notes in an ics journal file).
+If now a journal has no dtStart value the dtStart value is set to the created value of the journal when loading the file. That makes it possible to view and edit "notes" from KNotes. Simply add another Resource in KO/Pi which is a copy of the ics file from KNotes. You will find the "notes" in KO/Pi as a journal entry on the date you created it.
+
+And some minor fixes in KO/Pi.
+
+
+********** VERSION 2.1.16 ************
+
+Fixed a problem with the menu bar in KO/Pi and using the "Menu" hardware key on the Zaurus.
+Added columns for datetime in todo view: Last modified, created and last modified subtodo
+Fixed a bug in agenda view displaying recurring multiday events which are longer than two days.
+Made conflict detection up to 4 times faster.
+
+********** VERSION 2.1.15 ************
+
+Fixed two layout problems on the Z:
+Made the with of the newly added buttons on the Quick-Todo smaller.
+Made listweek layout in 2 columns on the Z760 in portait screen and full menubar visible.
+
+
+********** VERSION 2.1.14 ************
+
+Added some buttons to the KO/Pi Quick-todo line to make it possible to quickly access some todo view layout settings like display all flat/open/close and hide/show running/done.
+Added a button to add a subtodo quickly.
+
+Added a possibility to search for conflicting events. (In the Action menu. Keyboard shortcut "q", shift+q or ctrl +q ).
+Added an option to change the layout of the list week to column mode.
+
+Fixed some usability problems in pi-sync mode by adding some progress information about file transfer.
+
+Fixed pi-sync problems with the new multi calendar feature.
+Now pi-sync behaviour should be:
+1) Local sends file request ( as usual )
+2) Remote sends file which contains data of all enabled ( the calendar where the "eye" column is checked ) calendars.
+3) Local syncs with data, adds new entries to default calendar and sends file back ( as usual ).
+   If the data which local receives contains entries which are on disabled calendars on local this entries are updated and not added as duplicates to the default calendar.
+4) Remote updates the data and adds new entries to default calendar. Readonly entries are not changed on remote.
+   If the data which remote receives contains entries which are on disabled calendars on remote this entries are updated and not added as duplicates to the default calendar.
+
+Summary: 
+No new item ( new created after the last sync ) in a disabled calendar is propagated to the sync partner. Readonly items are synced and added/changed on the sync partner if it is not readonly on the sync partner.
+If you have different calendars on remote and local and some of them disabled you may get some "strange" bahaviour.
+Well, the syncing has become quite complicated ... you should have no problems if you enable all calendars. 
+
+********** VERSION 2.1.13 ************
+
+Fixed a problem in KA/Pi search.
+Fixed some minor problems in KO/Pi.
+Added calendar selection possibility to the todo view popup and to the event/todo/journal editor.
+
+Fixed memory usage problems in KA/Pi:
+When loading data KA/Pi did load the file data twice.
+Example:
+  A 600k file did consume 1200k memory during loading process.
+  This is fixed, it does now consume only  600k during loading process.
+When saving data KA/Pi did consume a lot of memory for the data parsing during the save process.
+This is fixed.
+Example:
+  Before saving a 600k file KA/Pi did consume 21.7 Meg of Ram.
+  When saving  KA/Pi did consume 28.6 Meg of Ram. That causes a crash on the Zaurus because there was no memeory left in the system.
+  Now  KA/Pi is consuming on saving the same data 22.0 Meg of Ram during the save process. 
+Note: The memory usage of KA/Pi after the data is loaded/saved has not changed.
+The saving of data may be a bit slower now.
+
+Fixed memory usage problems in KO/Pi:
+When KO/Pi did save the data to file, it did not release the used buffers after saving.
+The used buffer was released after saving the next time, but there was new buffer space allocated again on that save operation.
+This is fixed.
+Example:
+  When saving a 400k file KO/Pi do now use 400k less memory now.
+
+Optimized memory usage in KO/Pi Agenda view:
+KO/Pi is storing some paint information in extra buffers for faster repainting of the agenda view.
+These buffers were not made smaller (i.e. downsized)  because of performance reasons.
+The handling of these buffers are now much smarter:
+Two (of six) buffers are removed completely.
+The remaing four buffers are now downsized after not using the agenda view for 45 seconds.
+Such that the memory usage of KO/Pi is smaller now in general ( because 2 buffers are removed) and is much smaller when not using the agenda view. That is very important when using fastload for KO/Pi.
+
+Worst case example ( for a maximum size agenda content):
+  When resizing the agenda content to a large scale, KO/Pi did use 17Meg of mem ( and did not use less memory until it was stopped). Now KO/Pi is using on the same operation only 14.3 Meg of mem and after 45 seconds not using the agenda view it uses only 9.4 Meg of mem.
+
+When switching to an unused Agenda view now KO/Pi is upizing the buffers again. This takes less than a second. Such that switching to Agenda view (after not using it for more than 45 seconds) is now a bit slower. 
+
+Summary:
+Many memory wasting problems of KA/Pi and KO/Pi fixed such that it is better to use on the Zaurus.
+
+********** VERSION 2.1.12 ************
+
+KO/Pi:
+Many small usability fixes, e.g. rearranged the popup menus such that they are better to use on the Zaurus.
+Fixed a problem with the month view when file was saved but KO/Pi was not the active window.
+Fixed some problems in the resource config dialog (e.g. added a warning if you set all calendars to read-only).
+Fixed some other small problems.
+
+********** VERSION 2.1.11 ************
+
+KO/Pi:
+Because we can have many calendars now in KO/Pi we can have more than one journal entry per day.
+Added features to handle (and add ) more than one journal entry per day.
+Added option for a journal title.
+
+Added info about the calendar, the item belongs to, to the event/todo/journal viewer. 
+Fixed a problem of the alarm of completed recurring todos.
+Added to the event/todo editor to set quickly the category of an item.
+
+
+Fixed some problems when calling KO/Pi or KA/Pi from the alarm applet.
+
+Added KA/Pi multi sync to the multi sync called from the alarm applet.
+ 
+********** VERSION 2.1.10 ************
+
+KO/Pi:
+Importing Birthdays will now create another file resource "Birthdays" and import the birthday data from KA/Pi into that file.
+When a multidayevent is selected in monthview all occurences of this event in the monthview are now hightlighted.
+Fixed a bug in searching for a small timerange, i.e. one day.
+
+KA/Pi:
+Fixed two problems in csv export.
+Fixed problems when calling the contact selection dialog from KO/Pi or OM/Pi.
+
+********** VERSION 2.1.9 ************
+
+KO/Pi:
+Fixed some problems of the new search options in the search dialog.
+Fixed some problems in the new resource config options.
+Changed the recurrence edit of events and todos such that the recurrence edit page now is notified about a change of the start date on the first page.
+Fixed a problem creating new events in the agenda view if at the day/time is already an agenda item shown:
+Now you can click on the bottom/top of an allday agenda item or on the left/right side of an agenda item to get the "new todo/new event" popup.
+
+Fixed a problem in recurrence range in syncing with DTM.
+
+KA/Pi:
+Made it posiible to show in the contact overview the details of all data available for that contact( e.g. office, spouse, children, nickname ...)
+
+PwM/Pi:
+Added "sec" to the timeout config settings to make it clear the timeout values are seconds.
+
+********** VERSION 2.1.8 ************
+
+KO/Pi:
+Added info about the completion state of a todo in the ListView/Searchdialog.
+If in TodoView is selected "do not show compledted todos" then completed todos are not shown in the ListView as well.
+Fixed some updating problems when changing the filter.
+
+KA/Pi:
+In the addressee selection dialog now the formatted name is shown, if not empty.
+Added a column "category" to the addressee selection dialog to make it possible to sort addressees after category.
+Now in the addressee selection dialog a selected contact is remove with a single click from the selected list.
+
+Fixed in the file selector on the Zaurus the problem that symbolic links to files/dirs were ignored.
+Fixed the sorting for size in the file selector on the Z.
+
+Changed the color selection dialog on the Zaurus to a more user friendly version.
+
+********** VERSION 2.1.7 ************
+
+KO/Pi:
+Fixed several problems in the new Resource handling.
+Added more options to the search dialog. 
+Fixed a problem in the Month view.  
+Added more options to the dialog when setting a todo to stopped.     
+
+Fixed two small problems in KO/Pi Alarm applet.
+
+********** VERSION 2.1.6 ************
+
+This release is for testing only.
+
+KO/Pi:
+Added to the list view (the list view is used in search dialog as well) the possibility to print it.
+Added to the list view the possibility to hide entries, if you do not want to print all entries of the list view.
+Added to the list view the possibility to add all subtodos of selected todos to an export/beam.
+Added to the search dialog the possibility to make an additive search such that you can get a better list for export/printout.
+Added to the search dialog the possibility to hide the checkboxes such that there is more space for the list view on the Zaurus.
+Fixed a problem in the AlarmTimer Applet: Now utf8 messages are displayed properly.
+
+Added support for multiple calendar files in KO/Pi. Only local ical (*.ics) files are supported as calendars.
+In the sync profile config it is still missing to specify a particular calendar to sync with this profile. That setting will be added later.
+Now on every sync the set of calendars is synced which are enabled in the resource view. 
+
+A calendar is enabled in the resource view if the "eye" column is checked. 
+You can set a calendar to be the default for new items( "+" column ).
+You can tell KO/Pi to ignore all alarm of a calendar ( "bell" column ) and you can set it readonly.
+To find out how to add a new calendar and how to remove a calendar is left as an exercise to the reader ...
+
+
+********** VERSION 2.1.5 ************
+
+This is the new stable version.
+Bugfix:
+Fixed a problem with agenda popup on the desktop in KO/Pi.
+Fixed a crash when reloading file, e.g. after a passive pi-sync synchronization.
+Added config option to not display completed todos in agenda view.
+Addressee view is now using the formatted name, if defined.
+That makes it possible to display "lastname, firstname" in that view now.
+To set the formatted name for all contacts, please use menu:
+Edit->Change->Set formatted name.
+Fixed the bug in KA/Pi that is was not possible to add images to a contact on Windows.
+
+********** VERSION 2.1.4 ************
+
+Fixed two more bugs in the KA/Pi CSV import dialog:
+Made it possible to read multi-line fields and import it to the "Note" field.
+Fixed a problem in mapping custom fields, whatever a custem field is...
+
+********** VERSION 2.1.3 ************
+
+Changed the menu structure of the alarm applet:
+Moved "Simulate" to " Play Beeps" submenu and re-added "Todo List".
+
+Fixed several problems in the KA/Pi CSV import dialog:
+Added "Category", made codec configureable and made it possible to map many fields to the "Note" field.
+
+
+********** VERSION 2.1.2 ************
+
+Fixed a problem closing the alarm dialog on Zaurus with "OK" button.
+
+Fixed a problem when importing data from Outlook with mutiple categories set.
+
+Changed display of days in datenavigator:
+Birthdays are now blue, not dark green.
+When todo view is shown, no birtdays are shown and days with due todos are shown blue.
+When journal view is shown, only holidays are shown and days with journals are blue. 
+
+Added Backup options to global config:
+You can create now x-daily backups for KO/Pi, KA/Pi (for file resources only, file resource is the standard type) and PwM/Pi ( all files you will open ). 
+It is recommended to use another HDD/Memory card for the backup directory. If (very useful on the Zaurus) the specified backup directory does not exist you are asked if you want to try again to create a backup. That makes it possible to insert your memory card in the Zaurus and then trying again.
+The backup is created when the application wants to save for the first time on a backup-day. You can specify the amount of backups and the day interval of backups.
+
+********** VERSION 2.1.1 ************
+
+Stable release 2.1.1!
+
+KO/Pi:
+Fixed one problem in the layout of the edit dialogs on the Zaurus with 640x480 display.
+
 ********** VERSION 2.1.0 ************
 
 Stable release 2.1.0!
 
 Summary of changes/fixes compared to version 2.0.6:
 
 Many bugs of version 2.0.6 fixed.
 Most of them were small bugs, but some of them were important.
 It is recommended to use version 2.1.0 and not version 2.0.6.
 
 Important changes:
 
 Added recurring todos to KO/Pi.
 
 Added global application font settings (for all KDE-Pim/Pi apps) to the general settings.
 
 Made Passwordmanager PwM/Pi more userfriendly: Rearranged some toolbar icons, optimized setting of focus, fixed layout problems and more.
 
 Datenavigator can now display many months. Very useful on the desktop.
 
 KO/Pi alarm applet changed: Made buttons in alarm dialog much bigger and other usebility enhancements.
 
 Made alarm sound working on Linux desktop.
 
 Made KO/Pi and KA/Pi running from a memory stick. Please read storage HowTo for details.
 
 Added timetracking feature in KO/Pi todo view. Please read timetraker HowTo for details.
 
 Many other usebility enhancements.
 Special thanks to Ben for his suggestions!
 
 You can find the complete changelog 
 from version 1.7.7 to  2.1.0 
 in the source package or on 
 
 http://www.pi-sync.net/html/changelog.html
 
 ********** VERSION 2.0.28 ************
 
 KO/Pi:
 Fixed two problems in KO/Pi timetracking.
 Added context menu to month view for creating new events/todos.
 Fixed some other small bugs.
 
 
 ********** VERSION 2.0.27 ************
 
 More bugfixes.
 Added possibility to clone in KO/Pi a todo with all its subtodos.
 Added config option for alternate background in list views.
 
 Added a timetracker funtionality in KO/Pi for todos in the todo view.
 If a todo is set to started and then to stopped it is saving information about the runtime in
 <yourhome>/kdepim/apps/timetrackerdir.
 To read, display, print this information an external program is needed which will be developed.
 It will display the data in a Gantt timetable view with one row for each todo.
 It will have many possibilities sorting the data after category, parent todos, attendees, ... and for creating/printing status reports/summaries.
 Merging of data from different computers/users will be quite easy because every run is stored in a single file.
 
 ********** VERSION 2.0.26 ************
 
 Added two more fields to the KA/Pi view config:
 A "Mobile (home)" and a "Mobile (work)" field.
 Fixed utf8 import (e.g. for Japaneese text) in KA/Pi.
 
 Some alarm applet enhancements, e.g. sound stops automatically if value of suspend spinbox changes.
 And again fixed some more small bugs.
 
 ********** VERSION 2.0.25 ************
 
 And again fixed some bugs.
 
 ********** VERSION 2.0.24 ************
 
 Fixed again a lot of small bugs.
 Some performance optimizations in date navigator.
 Month view displays now multi days events on top of each cell, such that it is more likely that all multi days items of one event are in the same row.
 
 ********** VERSION 2.0.23 ************
 
 Fixed again a lot of small and strange  bugs, e.g. the missing toolbar of KA/Pi after a new installation.
 Fixed the (agenda) layout of KO/Pi on 5500er.
 Some usebility enhancements (e.g. reselection the current item of the todo view after some changes).
 
 ********** VERSION 2.0.22 ************
 
 KO/Pi:
 Fix for creating events/todos via the abgenda context menu.
 Added option to split toolbar to 3 toolbars.
 (Toolbar moving s disabled for this option due to a bug in Qt somewhere). 
 Added option to show one small filter-view-toolbar.
 Added a print option to the desktop version:
 Now you can print out the view of the "Event Viewer".
 That means you can print all data of one particular event/todo.
 Added scaling options to printout of Event Viewer and What'sNext View.
 Fixed some problems in the month view in "week start sunday" mode.