text fixes

7 files changed, 101 insertions, 80 deletions

diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
index b250ebb..29627c9 100644
--- a/ReleaseNotes.txt
+++ b/ReleaseNotes.txt
@@ -14,3 +14,12 @@ Contents of the packages and how to install:
 *****************************************************
-Filename: kdepim_1.9.13_for_Windows.exe.zip
+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:
@@ -23,2 +32,14 @@ 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
@@ -27,3 +48,2 @@ Migration-Howto.txt in the package.
 
-
 *****************************************************
@@ -179,5 +199,5 @@ Instructions how to install this package are in a ReadMe in this file.
 *****************************************************
-4) Linux Desktop (SuSE 9.1)
+4) Linux Desktop (SuSE 9.2)
 *****************************************************
-Filename: KDE-Pim-Pi-1.9.16-SuSE_9.2.i586.rpm
+Filename: KDE-Pim-Pi-1.9.20-SuSE_9.2.i586.rpm
 Package contains:
@@ -193,7 +213,7 @@ Download file and install it on console with
 su
-rpm -ihv KDE-Pim-Pi-1.9.16-SuSE_9.2.i586.rpm
+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.16-SuSE_9.2.i586.rpm
-(Uninstall with rpm -e KDE-Pim-Pi-1.9.16-SuSE_9.2)
+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)
 
diff --git a/bin/Migration-HowTo.txt b/bin/Migration-HowTo.txt
index 08fcfa5..ef9de5c 100644
--- a/bin/Migration-HowTo.txt
+++ b/bin/Migration-HowTo.txt
@@ -3,3 +3,3 @@ Migration HowTo Outlook 200X -> KDE
 

-Version 1.0.5

+Version 1.0.6

 The latest version of this file can be downloaded from

@@ -14,4 +14,4 @@ This HowTo describes the process of migrating data ( contact and calendar data )
 We will call Outlook as OL in this document.

-The PIM programs are KAdddressbook and KOrganizer, which may be used embedded in the Kontact PIM management framework.

-This HowTo describes version 1.9.5b of the migration tools.

+The PIM programs  migrating to are KAdddressbook and KOrganizer, which may be used embedded in the Kontact PIM management framework.

+This HowTo describes version 1.9.20 of the migration tools.

 The migration tools are the platform independent versions of KAdddressbook and KOrganizer: KAdddressbook/Pi and KOrganizer/Pi.

@@ -79,3 +79,3 @@ in the popup menu.
 The data migration is is performed with the Windows versions of KAdddressbook/Pi and KOrganizer/Pi.

-Pi stands for platform-independend - platform-independend because the same program is available for different platforms, like Windows, Linux desktop and Sharp-Zaurus PDA.

+Pi stands for platform-independend - platform-independend because the same program is available for different platforms, like Windows, Linux desktop and for embedded devices like the Sharp-Zaurus PDA.

 Note: The Linux desktop versions of KOrganizer/Pi and KOrganizer/KDE-desktop are two different programs! You cannot use  KOrganizer/Pi together with, or embedded in, the KDE-desktop environment. The same is valid for KAdddressbook/Pi.

@@ -83,5 +83,5 @@ Note: The Linux desktop versions of KOrganizer/Pi and KOrganizer/KDE-desktop are
 The programs you need for the migration are: 

-a) KAdddressbook/Pi executeable + 2dlls + icons

+a) KAdddressbook/Pi executeable + 3dlls + icons

 b) KOrganizer/Pi executeable + icons

-c) The Qt3 library qt-mt331.dll and the MSVC library msvcr71.dll and the MSVC library mfc71u.dll

+c) The Qt3 library qt-mt334.dll and the MSVC library msvcr71.dll and the MSVC library mfc71u.dll

 You can download all of them at:

@@ -94,5 +94,9 @@ Please choose there package/project with name KDE/Pim
 Choose there the topmost latest version and the files

-kdepim_X.X.X_for_Windows.zip

+kdepim_X.X.X_for_Windows.exe.zip

 Such that the files to download is

-kdepim_X.X.X_for_Windows.zip

+kdepim_X.X.X_for_Windows.exe.zip

+

+NOTE:

+There may be a file with the name "kdepim_X.X.X_for_Windows_98-ME.exe.zip" available as well.

+The programs of that package do not contain the import from Outlook functionality.

 

@@ -102,3 +106,3 @@ general Files for KDE/Pim
 Needed Windows Dlls

-kdepimdll.zip

+kdepim334dll.zip

 

@@ -106,3 +110,3 @@ kdepimdll.zip
 Choose there the file:

-kdepimdll.zip

+kdepim334dll.zip

 

@@ -110,4 +114,4 @@ Now you have downloaded the files
 

-kdepim_X.X.X_for_Windows.zip

-kdepimdll.zip

+kdepim_X.X.X_for_Windows.exe.zip

+kdepim334dll.zip

 

@@ -122,4 +126,4 @@ You have downloaded the files
  

-kdepim_X.X.X_for_Windows.zip

-kdepimdll.zip

+kdepim_X.X.X_for_Windows.exe.zip

+kdepim334dll.zip

 

@@ -132,5 +136,6 @@ microkabc_dir.dll
 microkabc_file.dll   

+microkabc_qtopia.dll

 msvcr71.dll

 mfc71u.dll

-qt-mt331.dll  

+qt-mt334.dll  

 ReadMich.txt

diff --git a/bin/ReadMe_Linux.txt b/bin/ReadMe_Linux.txt
index ec825ee..274fa96 100644
--- a/bin/ReadMe_Linux.txt
+++ b/bin/ReadMe_Linux.txt
@@ -12,5 +12,5 @@ Contents of the packages and how to install:
 *****************************************************
-4) Linux Desktop (SuSE 9.1)
+4) Linux Desktop (SuSE 9.2)
 *****************************************************
-Filename: KDE-Pim-Pi-1.9.10-SuSE9.1.i586.rpm
+Filename: KDE-Pim-Pi-1.9.20-SuSE_9.2.i586.rpm
 Package contains:
@@ -26,15 +26,7 @@ Download file and install it on console with
 su
-rpm -ihv KDE-Pim-Pi-1.9.10-SuSE9.1.i586.rpm
+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.10-SuSE9.1.i586.rpm
-   (Uninstall with rpm -e KDE-Pim-Pi-1.9.10-SuSE9.1)
-
-If you want to be able to sync your phone via infrared
-(if you have an infrared port on your laptop)
-please make an online update to get infrared working.
-
-If you want to be able to sync KDE-Pim/Pi with the KDE-desktop
-please update SuSE 9.1 to KDE 3.3.0 or higher.
-
+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)
 
@@ -43,6 +35,4 @@ provided in the rpm file about the content:
 
-KDE-Pim-Pi
-Version: 1.9.12-SuSE_9.1
 This package contains the platform-independent PIM programs from
-www.pi-sync.net, compiled for SuSE 9.1:
+www.pi-sync.net, compiled for SuSE 9.2:
 KTimeTacker/Pi
@@ -53,2 +43,3 @@ PasswordManager/Pi
 KOPieMail/Pi
+
 These applications do not need anything from the KDE-desktop
@@ -57,2 +48,3 @@ 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
@@ -74,2 +66,3 @@ 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
@@ -78,2 +71,3 @@ folder in your KDE start menu, where you can
 start the applications from.
+
 These programs makes it possible to sync your Zaurus easily
@@ -83,2 +77,3 @@ 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 -
@@ -88,2 +83,3 @@ program on the Linux Desktop which syncs automatically
 with the KDE-desktop data.
+
 If you want to use the KDE-desktop calendar/addressbook applications,
@@ -94,2 +90,3 @@ 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
@@ -100,4 +97,6 @@ it may work with others as well.
 (More info about that: -> Sync HowTo)
+
 NOTE:
-You have to make an online update in SuSE 9.1 to make it
+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
diff --git a/bin/ReadMe_Windows.txt b/bin/ReadMe_Windows.txt
index be6137a..dee7c7f 100644
--- a/bin/ReadMe_Windows.txt
+++ b/bin/ReadMe_Windows.txt
@@ -13,3 +13,12 @@ Contents of the packages and how to install:
 *****************************************************

-Filename: kdepim_1.9.11_for_Windows.exe.zip

+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:

@@ -22,3 +31,16 @@ 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/kdepim/kaddressbook/kapiFAQ.txt b/bin/kdepim/kaddressbook/kapiFAQ.txt
index cc70b39..25fe3d7 100644
--- a/bin/kdepim/kaddressbook/kapiFAQ.txt
+++ b/bin/kdepim/kaddressbook/kapiFAQ.txt
@@ -23,5 +23,4 @@ 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.
-Latest versions and the source code cvs can be found at:
+Linux Desktop and Sharp Zaurus PDA. 
+Precompiled versions and the source code cvs can be found at:
 http://sourceforge.net/projects/kdepimpi/
@@ -43,5 +42,3 @@ KA/Pi startup time is very slow. What can I do ?
 A:
-- Use the binary resource format to store your contacts instead
-of the vCard format.
-- If not neede, disable all extensions in
+If not neede, disable all extensions in
 Settings/Configure KAddressbook/Addressbook/General
@@ -72,9 +69,5 @@ The following access libraries are available:
 
-ROM: OpenZaurus
-libname: libmicrokabc_opie.so
-linked to: libqpe, libqte, libopie
-
-ROM: old Sharp format (qtopia, XML format)
+ROM: OpenZaurus and old Sharp format (qtopia, XML format)
 libname: libmicrokabc_qtopia.so
-linked to: libqpe, libqpepim
+linked to: no external libs needed
 
diff --git a/bin/kdepim/korganizer/kopiFAQ.txt b/bin/kdepim/korganizer/kopiFAQ.txt
index deaf4c0..cd617d9 100644
--- a/bin/kdepim/korganizer/kopiFAQ.txt
+++ b/bin/kdepim/korganizer/kopiFAQ.txt
@@ -62,5 +62,4 @@ 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.
-Latest versions and the source code cvs can be found at:
+Linux Desktop and Sharp Zaurus PDA. 
+Precompiled versions and the source code cvs can be found at:
 http://sourceforge.net/projects/kdepimpi/
@@ -161,2 +160,5 @@ but I can't access the addressbook when adding attendees.
 A:
+NOTE: KO/Pi versions > 1.9.0 do not support addressbook plugins any more.
+The addressbook data is accessed via KA/Pi only.
+
 The qtopiaKABC plug-in is for old non DTM Qtopia Pims only.
@@ -167,4 +169,2 @@ Opie(for Sharp Rom) libs+adressbook and the opieKABC plug-in.
 That works with KO/Pi.
-NOTE: Versions > 1.9.0 does not support alarm plugins any more.
-The addressbook data is accessed via KA/Pi only.
 *************************************************************************
@@ -177,22 +177,4 @@ That is no packaging bug.
 This is a feature.
-The author of KO/pi has a Tab 'Pim'.
-*************************************************************************
-Q:  
-When installing kmicrokdelibs_1.9.2_arm.ipk (or newer version)
-I get a "This application depends on other programs".
-What programs I am missing? 
-A:  
-You probably do not have to care about that.
-kmicrokdelibs_1.9.2 will come with some
-resource plugins, which needs additional libraries.
-(E.g. libopie1, if you want to use the 
-opie resource connector in KA/Pi).
-If you do not have this libraries installed,
-you simply cannot use the resource.
-To make it clear:
-If the libraries are missing, the applications
-using kmicrokdelibs will start, 
-because the resources are plugins.
-If you get an error, simply install the other packages and try again.
-If the install problem persists rebooting may be helpful.
+The author of KO/Pi has a Tab 'Pim'.
+
 *************************************************************************
@@ -267,3 +249,3 @@ Yes.
 Choose search dialog.
-Serach there after the events you want to send.
+Search there for the events you want to send.
 Make sure, you get all wanted events and maybe some more.
@@ -300,3 +282,3 @@ Yes, but KO/Pi has to be running to notify you about an alarm.
 Choose menu: Action - Configure.
-There the last TAB alarm.
+There the TAB alarm.
 Check "Use internal alarm notification" to get the alarm on
diff --git a/desktop/rpm/kdepim_rpm b/desktop/rpm/kdepim_rpm
index 9d1b1b8..9dd9034 100644
--- a/desktop/rpm/kdepim_rpm
+++ b/desktop/rpm/kdepim_rpm
@@ -2,3 +2,3 @@ Summary: A collection of PIM programs
 Name: KDE-Pim-Pi
-Version: 1.9.14
+Version: 1.9.20
 Release: SuSE_9.2