text fixes

7 files changed, 104 insertions, 83 deletions

diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
index b250ebb..29627c9 100644
--- a/ReleaseNotes.txt
+++ b/ReleaseNotes.txt
@@ -7,30 +7,50 @@ KDE-Pim/Pi is available for four platforms:
 4) Linux Desktop (SuSE 9.2) (not available for all releases)
 
 Contents of the packages and how to install:
 
 
 *****************************************************
 1) Windows 32
 *****************************************************
-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:
 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
@@ -172,35 +192,35 @@ 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.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:
 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.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)
 
 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:
 KTimeTacker/Pi
 KPhone/Pi
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
@@ -1,24 +1,24 @@
 

 Migration HowTo Outlook 200X -> KDE 

 

-Version 1.0.5

+Version 1.0.6

 The latest version of this file can be downloaded from

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

 Please choose there package/project/file:

 general Files for KDE/Pim

 MigrationHowTo_OL2KDE

 MigrationHowTo_OL2KDE.txt.zip

 

 

 This HowTo describes the process of migrating data ( contact and calendar data ) from Outlook 98/200X (TM) to the PIM programs of the KDE-Desktop-Environment. 

 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.

 If you want to migrate emails, you can do that via an IMAP server.

 A Kolab server is an IMAP server.

 A HowTo how to migrate emails and contact and calendar data to a Kolab server using the Toltec (TM) Outlook(TM)  plugin is available as well.

 You can found it on

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

 Please choose there package/project/file:

 general Files for KDE/Pim

@@ -72,72 +72,77 @@ To copy it, right click on that subfolder and choose
 Copy "<subfoldername>"...

 in the popup menu.

 

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

 3) Where to get the migration tools

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

 

 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.

 

 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:

 

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

 

 Download of a) and b)

 Please choose there package/project with name KDE/Pim

 (Direct link: http://sourceforge.net/project/showfiles.php?group_id=104103&package_id=112604 )

 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.

 

 To download c)

 Please choose there package/project/file:

 general Files for KDE/Pim

 Needed Windows Dlls

-kdepimdll.zip

+kdepim334dll.zip

 

 (Direct link: http://sourceforge.net/project/showfiles.php?group_id=104103&package_id=122438&release_id=256700 )

 Choose there the file:

-kdepimdll.zip

+kdepim334dll.zip

 

 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

 

 and we can continue to install the files, which is simply unzipping them.

 

 

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

 4) How to install the migration tools

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

 

 You have downloaded the files

  

-kdepim_X.X.X_for_Windows.zip

-kdepimdll.zip

+kdepim_X.X.X_for_Windows.exe.zip

+kdepim334dll.zip

 

 Unzip these files.

 Now choose an arbitrary installation directory, where to copy all the needed files together.

 You should have now the following files and the directory "kdepim" in the same directory:

 kopi.exe  

 kapi.exe  

 microkabc_dir.dll  

-microkabc_file.dll   

+microkabc_file.dll

+microkabc_qtopia.dll

 msvcr71.dll

 mfc71u.dll

-qt-mt331.dll  

+qt-mt334.dll  

 ReadMich.txt

 kdepim (directory)

 

 The directory "kdepim" should contain subdirectories 

 kaddressbook  

 korganizer

 which itself contain some subdirectories with icons and help text.

 

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
@@ -5,61 +5,53 @@ the platform independent PIM programs based on the PIM programs
 
 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.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:
 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.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.
-
+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:
 
-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
 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,
@@ -67,38 +59,45 @@ 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:
-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
-you can sync your (Nokia) mobile phone via infrared.
+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 be6137a..dee7c7f 100644
--- a/bin/ReadMe_Windows.txt
+++ b/bin/ReadMe_Windows.txt
@@ -6,19 +6,41 @@ 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

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

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

 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/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
@@ -16,19 +16,18 @@ There is no menu entry that supports my ROM.
 *************************************************************************
 Q:  
 For which platform is KA/Pi available?
 A: 
 KA/Pi is the platform-independend version of KAddressbook 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.
-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/
 *************************************************************************
 Q:
 I can not install KA/Pi on the SD card (ext2 formated), 
 it can be installed only in the internal memory. 
 What can I do ? 
 A:
 KA/Pi and friends are now installable on SD-Card!
@@ -36,19 +35,17 @@ It is recommended to install all libs and apps
 on the SD card or all in the internal storage.
 There may be problems, if this is mixed.
 If you get an error when installing,
 simply install the other packages and try again.
 *************************************************************************
 Q:
 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
 and restart Ka/Pi.
 *************************************************************************
 Q:
 Can I receive contacts via infrared (IR) directly with KA/Pi?
 A:
 Yes, KA/Pi can receice data via IR when it is running!
 
@@ -65,19 +62,15 @@ It looks like I can not import the original addressbook into Ka/Pi
 There is no menu entry that supports my ROM.   
 A:
 When Ka/Pi starts, it tries to load all existing addressbook access
 libraries. Those libraries again are trying to load ROM dependent libs.
 If one of those related libs is missing, the menu will not inlcude an entry
 for that addressbook type.
 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
 
 ROM: new Sharp format (DTM database format)
 libname: libmicrokabc_sharpdtm.so
 linked to: libqpe, libqte, libzdtm, libsl  
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
@@ -55,19 +55,18 @@ What can I do ?
 *************************************************************************
 Q:  
 For which platform KO/Pi is available?
 A: 
 KO/Pi is the platform-independend version of KOrganizer 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.
-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/
 *************************************************************************
 Q:  
 What files/data can KO/Pi import or export?
 A: 
 KO/Pi saves its data in iCalandar format (*.ics) 
 You can import .ics (used by KDE KOrganizer/Mozillas/Appli iCal) or .vcs files.
 You can import xml based PIMs (Opie, old Sharp and old TKC).
@@ -154,52 +153,35 @@ A:
 When deinstalling KO/Pi alarm applet, Qtopia reboots.
 Please do not deinstall KO/Pi alarm applet and KO/Pi together.
 It may be that because of the reboot  KO/Pi itself is not deinstalled properly.
 *************************************************************************
 Q:  
 I installed the qtopiaKABC plugin, 
 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.
 This plug-in works with xml based addressbooks.  
 There is no solution currently for the DTM addressbook.
 On a newer Sharp Rom (using DTM), you can install 
 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.
 *************************************************************************
 Q:  
 Why do I have two pim tabs?
 A:  
 The original tab has the 'PIM' tab and kopi is installed in the 'Pim' tab.  
 The difference in capitalization keeps them separate.
 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'.
+
 *************************************************************************
 *************************************************************************
 *************************************************************************
 
 Q:
 How do I change the timezone? All my appointments do show 6 hours ahead.
 A:
 The default timezone in KO/Pi is CET. 
@@ -260,17 +242,17 @@ Note: When FastLoad is enabled for KO/Pi, KO/Pi is always running and
 you do not need to "start" KO/Pi.
 
 *************************************************************************
 Q:
 I want to send a friend all the public holidays in my calendar. Can I do that?
 A:
 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.
 Maybe sort the items and select all items you want to send.
 With a 'right' mouse click 
 (hold pen down for a while and then relase) you get a popup menu.
 Choose there 'Save selected to file'.
 Now all selected entries are saved.
 Send the file to your friend, he can import them in his calendar now.
 *************************************************************************
@@ -293,17 +275,17 @@ combination of these settings.
 If one file is not replayed properly, 
 just try another file/ another sampling data.
 *************************************************************************
 Q:
 Is there a solution to get an alarm on Windows?
 A:
 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
 Windows and Linux desktop.
 You can configure the behaviour of the alarm there. 
 *************************************************************************
 Q:
 I have Zaurus 5600 and I want to get wav alarm instead of the buzzer.
 Is that possible?
 A:
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
@@ -1,11 +1,11 @@
 Summary: A collection of PIM programs
 Name: KDE-Pim-Pi
-Version: 1.9.14
+Version: 1.9.20
 Release: SuSE_9.2
 Copyright:GPL
 Group: Productivity/Pim
 Source:http://sourceforge.net/projects/kdepimpi/
 URL:http://sourceforge.net/projects/kdepimpi/
 Packager: zautrix
 
 %description