3 files changed, 31 insertions, 28 deletions

diff --git a/bin/kdepim/korganizer/featuresKOPI.txt b/bin/kdepim/korganizer/featuresKOPI.txt
index 4649efd..49315bd 100644
--- a/bin/kdepim/korganizer/featuresKOPI.txt
+++ b/bin/kdepim/korganizer/featuresKOPI.txt
@@ -11,6 +11,8 @@ KO/Pi has a monthview, a What's Next view, an event list view, a small and big t
 KO/Pi is Qt-only based and runs on Sharp Zaurus PDA, Linux and Windows.
 1) 
 Import - export - connection - syncing:
+KO/Pi on Windows can import calendar data from Outlook directly via OLE.
+  Recurring events with exceptions and attendee lists of meetings are imported properly.
 KO/Pi can import/export ics and vcs files.
 KO/Pi can save/load ics backup files.
 KO/Pi can send ics and vcs files via infrared, with and without timezone settings.( Zaurus only )
@@ -32,7 +34,7 @@ KO/Pi can save/load templates for events/todos.
 2)
 Filter:
 You can define filters for displaying/not displaying specified categories.
-Quick access to the first 20 filters via hotkeys 1-0 and <crtr>1-0
+Quick access to the first 20 filters via hotkeys 1-0 and <ctrl>1-0
 3)
 Managing categories:
 After importing/loading/syncing there may be new categories in events or todos which are not in the category list.
@@ -52,7 +54,8 @@ You can cancel an event/todo without deleting them.
 The cancelled event/todo is then displayed stricked out.
 5)
 Addressbook access:
-There are plugins avaialable to access Opie/old Qtopia/Sharp DTM addressbook data when adding an attendee to an event.
+You can access address entries stored in KA/Pi. 
+In KA/Pi you can configure a new resource to get read-only acces to Opie addressbook data.
 6)
 Quick editing:
 You can quickly clone, move, cancel, beam events/todos.
@@ -79,7 +82,8 @@ KO/Pi is available in English and German.
 Alarm:
 For Zaurus there is an alarm applet available with additional timer functionality.
 This alarm applet will make the Zaurus wake up, if the device is in suspend mode.
-You can enable in KO/Pi the internal alarm notification, such that you are informed about an alarm, if the program is running.
+On the desktop (e.g. Windows) you can enable in KO/Pi the internal alarm notification, 
+such that you are informed about an alarm, if the program is running.
 12)
 What'sThis Help:
 To use the What'sThis Help, you have to enable the What'sThis icon in the toolbar.
diff --git a/bin/kdepim/korganizer/kopiFAQ.txt b/bin/kdepim/korganizer/kopiFAQ.txt
index b87ef96..96b38b8 100644
--- a/bin/kdepim/korganizer/kopiFAQ.txt
+++ b/bin/kdepim/korganizer/kopiFAQ.txt
@@ -21,6 +21,8 @@ You can sync with the newer Sharp DTM PIMs directly.
 (Note: If you have many contacts in KO/Pi which are
 not in DTM, the very first sync may take some time)
 You can sync with any local .ics file or remote with a .ics file via ssh.
+KO/Pi on Windows can import calendar data from Outlook directly via OLE.
+Recurring events with exceptions and attendee lists of meetings are imported properly.
 *************************************************************************
 Q:  
 How can I sync via ssh?
@@ -31,7 +33,7 @@ You must have configured your access to the server such that you can
 log in from console on the server without a password.
 For that reason you have to put some keys on the servers home dir.
 Please read docu of ssh how to do that.
-There is a realy detailed ssh howto available at
+There is a  detailed ssh howto available at
 http://oek.fbl.fh-wiesbaden.de/zaurus/
 *************************************************************************
 Q:  
@@ -40,7 +42,8 @@ A:
 Well you can sync Outlook with Sharp-DTM Pims 
 and then sync KO/Pi with Sharp-DTM.
 Voila - you have your Outlook data in KO/Pi.
-It is planned that KO/Pi windows version syncs directly with Outlook.
+On Windows, KO/Pi can import calendar data from Outlook directly via OLE.
+Recurring events with exceptions and attendee lists of meetings are imported properly.
 *************************************************************************
 Q:  
 I sync with Outlook via the Sharp DTM.
@@ -62,25 +65,6 @@ An event( with alarm ) created on outlook make KO/Pi alarm goes off,
 but there will be no datebook alarm :-)
 *************************************************************************
 Q:  
-I cannot sync Outlook with Sharp-DTM. How can I get my data from Outlook?
-A:
-There is a tool called Outport. 
-With that tool you can export your Outlook data to many small .ics files.
-To get one big .ics file to able to import the data quickly in KO/Pi 
-you can do the following on Linux:
-cat *.ics > mycalendar
-mv mycalendar mycalendar.ics
-Now you have one file, but kopi cannot read it.
-You have to remove all lines in the file 
-(take a texteditor where search and replace is done quickly ) which are:
-BEGIN:VCALENDAR
-END:VCALENDAR
-Only the very first 
-BEGIN:VCALENDAR and the very last 
-END:VCALENDAR may remain in the file.
-Now KO/Pi can read the modified file.
-*************************************************************************
-Q:  
 Why does not KO/Pi import several .isc files at once?
 A:
 Because it is not yet implemented.
@@ -88,11 +72,13 @@ Because it is not yet implemented.
 Q:  
 Why does not KO/Pi sync directly with Outlook?
 A:
-Because it is not yet implemented.
-But it is planned to be implemented.
+On Windows, KO/Pi can import calendar data from Outlook directly via OLE.
+Recurring events with exceptions and attendee lists of meetings are imported properly.
+It would be difficult to implememt an actual syncing.
+This will be implemented later.
 *************************************************************************
 Q:  
-Why does KO/Pi start up on restarts?
+Why does KO/Pi start up on restarts on the Zaurus?
 A:
 Fastload causes KO/Pi to startup when Qtopia starts.
 *************************************************************************
@@ -125,6 +111,8 @@ 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?
@@ -151,6 +139,7 @@ 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.
 *************************************************************************
 *************************************************************************
 *************************************************************************
@@ -222,8 +211,12 @@ A:
 The default alarm sound is a wav file:
 It is  (QPEDIR)/pics/korganizer/koalarm.wav.
 (Usually QPEDIR=/home/QtPalmtop).
+(On the desktop, the path is:
+(installdir)/kdepim/korganizer/koalarm.wav)
 Just replace this file by another one und do a 
 'simulate alarm' to ckeck, if it works.
+('Simulate alarm' not available on the desktop,
+because it is in the alarm applet)
 Wav files can have different sampling data. 
 (e.g. 16/8bit, stereo/mono, 22kHz/11kHz/...)
 Note: It seems to be that there are problems with particular
@@ -278,11 +271,12 @@ I can not install KO/Pi on the SD card (ext2 formated),
 it can be installed only in the internal memory. 
 What can I do ? 
 A:
-I don't know.
 KO/Pi and friends are now installable on SD-Card!
 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.
 
 
 
diff --git a/bin/kdepim/korganizer/kopiWhatsNew.txt b/bin/kdepim/korganizer/kopiWhatsNew.txt
index 1b4e804..8982a9c 100644
--- a/bin/kdepim/korganizer/kopiWhatsNew.txt
+++ b/bin/kdepim/korganizer/kopiWhatsNew.txt
@@ -1,6 +1,11 @@
 Info about the changes in new versions of KO/Pi
 and KDE-Pim/Pi
 
+********** VERSION 1.9.3 ************
+1)
+Now KO/Pi on Windows imports directly the calendar data of
+an installed Outlook. Should work with OL version >= 2000.
+ 
 ********** VERSION 1.9.2 ************
 1)
 KDE-Pim/Pi has got a new member: