[Pkg-kde-commits] rev 434 - in trunk/packages/kdepim/debian: . icons man patches po

Daniel Schepler schepler@costa.debian.org
Fri, 21 Jan 2005 04:24:46 +0100


Author: schepler
Date: 2005-01-21 04:24:38 +0100 (Fri, 21 Jan 2005)
New Revision: 434

Added:
   trunk/packages/kdepim/debian/icons/
   trunk/packages/kdepim/debian/icons/kaddressbook-16.xpm
   trunk/packages/kdepim/debian/icons/kaddressbook.xpm
   trunk/packages/kdepim/debian/icons/kalarm-16.xpm
   trunk/packages/kdepim/debian/icons/kalarm.xpm
   trunk/packages/kdepim/debian/icons/karm-16.xpm
   trunk/packages/kdepim/debian/icons/karm.xpm
   trunk/packages/kdepim/debian/icons/kmail-16.xpm
   trunk/packages/kdepim/debian/icons/kmail.xpm
   trunk/packages/kdepim/debian/icons/kmailcvt-16.xpm
   trunk/packages/kdepim/debian/icons/kmailcvt.xpm
   trunk/packages/kdepim/debian/icons/knode-16.xpm
   trunk/packages/kdepim/debian/icons/knode.xpm
   trunk/packages/kdepim/debian/icons/knotes-16.xpm
   trunk/packages/kdepim/debian/icons/knotes.xpm
   trunk/packages/kdepim/debian/icons/kontact-16.xpm
   trunk/packages/kdepim/debian/icons/kontact.xpm
   trunk/packages/kdepim/debian/icons/korganizer-16.xpm
   trunk/packages/kdepim/debian/icons/korganizer.xpm
   trunk/packages/kdepim/debian/icons/korn-16.xpm
   trunk/packages/kdepim/debian/icons/korn.xpm
   trunk/packages/kdepim/debian/icons/kpalmdoc-16.xpm
   trunk/packages/kdepim/debian/icons/kpalmdoc.xpm
   trunk/packages/kdepim/debian/icons/kpilot-16.xpm
   trunk/packages/kdepim/debian/icons/kpilot.xpm
   trunk/packages/kdepim/debian/icons/ksync-16.xpm
   trunk/packages/kdepim/debian/icons/ksync.xpm
   trunk/packages/kdepim/debian/icons/ktnef-16.xpm
   trunk/packages/kdepim/debian/icons/ktnef.xpm
   trunk/packages/kdepim/debian/kaddressbook.links
   trunk/packages/kdepim/debian/kaddressbook.manpages
   trunk/packages/kdepim/debian/kalarm.links
   trunk/packages/kdepim/debian/kalarm.manpages
   trunk/packages/kdepim/debian/kandy.links
   trunk/packages/kdepim/debian/kandy.manpages
   trunk/packages/kdepim/debian/karm.links
   trunk/packages/kdepim/debian/karm.manpages
   trunk/packages/kdepim/debian/kde.mk
   trunk/packages/kdepim/debian/kdepim-doc-html.doc-base.kaddressbook
   trunk/packages/kdepim/debian/kdepim-doc-html.doc-base.kalarm
   trunk/packages/kdepim/debian/kdepim-doc-html.doc-base.kandy
   trunk/packages/kdepim/debian/kdepim-doc-html.doc-base.karm
   trunk/packages/kdepim/debian/kdepim-doc-html.doc-base.kcontrol-kalarmd
   trunk/packages/kdepim/debian/kdepim-doc-html.doc-base.kleopatra
   trunk/packages/kdepim/debian/kdepim-doc-html.doc-base.kmail
   trunk/packages/kdepim/debian/kdepim-doc-html.doc-base.knode
   trunk/packages/kdepim/debian/kdepim-doc-html.doc-base.knotes
   trunk/packages/kdepim/debian/kdepim-doc-html.doc-base.konsolekalendar
   trunk/packages/kdepim/debian/kdepim-doc-html.doc-base.kontact
   trunk/packages/kdepim/debian/kdepim-doc-html.doc-base.korganizer
   trunk/packages/kdepim/debian/kdepim-doc-html.doc-base.korn
   trunk/packages/kdepim/debian/kdepim-doc-html.doc-base.kpilot
   trunk/packages/kdepim/debian/kdepim-doc-html.doc-base.ktnef
   trunk/packages/kdepim/debian/kdepim-doc-html.doc-base.kwatchgnupg
   trunk/packages/kdepim/debian/kdepim-doc.doc-base
   trunk/packages/kdepim/debian/kdepim-wizards.install
   trunk/packages/kdepim/debian/kdepim-wizards.manpages
   trunk/packages/kdepim/debian/kdepim-wizards.menu
   trunk/packages/kdepim/debian/kitchensync.install
   trunk/packages/kdepim/debian/kitchensync.manpages
   trunk/packages/kdepim/debian/kitchensync.menu
   trunk/packages/kdepim/debian/kleopatra.README.Debian
   trunk/packages/kdepim/debian/kleopatra.install
   trunk/packages/kdepim/debian/kleopatra.links
   trunk/packages/kdepim/debian/kleopatra.manpages
   trunk/packages/kdepim/debian/kleopatra.menu
   trunk/packages/kdepim/debian/kmail.links
   trunk/packages/kdepim/debian/kmail.manpages
   trunk/packages/kdepim/debian/kmailcvt.manpages
   trunk/packages/kdepim/debian/knode.links
   trunk/packages/kdepim/debian/knode.manpages
   trunk/packages/kdepim/debian/knotes.links
   trunk/packages/kdepim/debian/knotes.manpages
   trunk/packages/kdepim/debian/konsolekalendar.links
   trunk/packages/kdepim/debian/konsolekalendar.manpages
   trunk/packages/kdepim/debian/kontact.links
   trunk/packages/kdepim/debian/kontact.manpages
   trunk/packages/kdepim/debian/korganizer.links
   trunk/packages/kdepim/debian/korganizer.manpages
   trunk/packages/kdepim/debian/korn.links
   trunk/packages/kdepim/debian/korn.manpages
   trunk/packages/kdepim/debian/kpilot.links
   trunk/packages/kdepim/debian/kpilot.manpages
   trunk/packages/kdepim/debian/ksync.manpages
   trunk/packages/kdepim/debian/ktnef.links
   trunk/packages/kdepim/debian/ktnef.manpages
   trunk/packages/kdepim/debian/libkcal2a.install
   trunk/packages/kdepim/debian/libkleopatra0-dev.install
   trunk/packages/kdepim/debian/libkleopatra0a.install
   trunk/packages/kdepim/debian/libkpimidentities1.install
   trunk/packages/kdepim/debian/libmimelib1a.install
   trunk/packages/kdepim/debian/man/egroupwarewizard.man
   trunk/packages/kdepim/debian/man/groupwarewizard.man
   trunk/packages/kdepim/debian/man/ical2vcal.man
   trunk/packages/kdepim/debian/man/kabc2mutt.man
   trunk/packages/kdepim/debian/man/kaddressbook.man
   trunk/packages/kdepim/debian/man/kalarm.man
   trunk/packages/kdepim/debian/man/kalarmd.man
   trunk/packages/kdepim/debian/man/kandy.man
   trunk/packages/kdepim/debian/man/kandy_client.man
   trunk/packages/kdepim/debian/man/karm.man
   trunk/packages/kdepim/debian/man/kdeopt.man
   trunk/packages/kdepim/debian/man/kitchensync.man
   trunk/packages/kdepim/debian/man/kleopatra.man
   trunk/packages/kdepim/debian/man/kmail.man
   trunk/packages/kdepim/debian/man/kmail_antivir.sh.man
   trunk/packages/kdepim/debian/man/kmail_clamav.sh.man
   trunk/packages/kdepim/debian/man/kmail_fprot.sh.man
   trunk/packages/kdepim/debian/man/kmail_sav.sh.man
   trunk/packages/kdepim/debian/man/kmailcvt.man
   trunk/packages/kdepim/debian/man/knode.man
   trunk/packages/kdepim/debian/man/knotes.man
   trunk/packages/kdepim/debian/man/kolabwizard.man
   trunk/packages/kdepim/debian/man/konsolekalendar.man
   trunk/packages/kdepim/debian/man/kontact.man
   trunk/packages/kdepim/debian/man/korgac.man
   trunk/packages/kdepim/debian/man/korganizer.man
   trunk/packages/kdepim/debian/man/korganizerIn.man
   trunk/packages/kdepim/debian/man/korn.man
   trunk/packages/kdepim/debian/man/kpalmdoc.man
   trunk/packages/kdepim/debian/man/kpilot.man
   trunk/packages/kdepim/debian/man/kpilotDaemon.man
   trunk/packages/kdepim/debian/man/ksync.man
   trunk/packages/kdepim/debian/man/ktnef.man
   trunk/packages/kdepim/debian/man/kwatchgnupg.man
   trunk/packages/kdepim/debian/man/sloxwizard.man
   trunk/packages/kdepim/debian/patches/01_kdepim_branch.diff
   trunk/packages/kdepim/debian/patches/02_disable_no_undefined.diff
   trunk/packages/kdepim/debian/patches/03_automake1.8.diff
   trunk/packages/kdepim/debian/patches/04_disable_static_la_final.diff
   trunk/packages/kdepim/debian/patches/20_korganizer_makefile.diff
   trunk/packages/kdepim/debian/patches/21_lib_link.diff
   trunk/packages/kdepim/debian/patches/22_kmail_nofinal.diff
   trunk/packages/kdepim/debian/po/de.po
Removed:
   trunk/packages/kdepim/debian/kgpgcertmanager.install
   trunk/packages/kdepim/debian/libkcal2.install
   trunk/packages/kdepim/debian/libkdgantt0-dev.install
   trunk/packages/kdepim/debian/libkdgantt0.install
   trunk/packages/kdepim/debian/libmimelib1.install
   trunk/packages/kdepim/debian/man/alarmd.sgml
   trunk/packages/kdepim/debian/man/ical2vcal.sgml
   trunk/packages/kdepim/debian/man/kandy.sgml
   trunk/packages/kdepim/debian/man/korganizer.sgml
   trunk/packages/kdepim/debian/man/kpilot.sgml
   trunk/packages/kdepim/debian/patches/01_kdepim_branch.diff.uu
   trunk/packages/kdepim/debian/patches/02_autotools_update.diff
   trunk/packages/kdepim/debian/patches/03_libtool_arm.diff
   trunk/packages/kdepim/debian/patches/04_am_maintainer_mode.diff
   trunk/packages/kdepim/debian/patches/05_pedantic-errors.diff
Modified:
   trunk/packages/kdepim/debian/changelog
   trunk/packages/kdepim/debian/control
   trunk/packages/kdepim/debian/kaddressbook.install
   trunk/packages/kdepim/debian/kaddressbook.menu
   trunk/packages/kdepim/debian/kalarm.install
   trunk/packages/kdepim/debian/kalarm.menu
   trunk/packages/kdepim/debian/kandy.install
   trunk/packages/kdepim/debian/karm.install
   trunk/packages/kdepim/debian/karm.menu
   trunk/packages/kdepim/debian/kdepim-dev.install
   trunk/packages/kdepim/debian/kdepim-kfile-plugins.install
   trunk/packages/kdepim/debian/kdepim-kio-plugins.install
   trunk/packages/kdepim/debian/kmail.install
   trunk/packages/kdepim/debian/kmail.menu
   trunk/packages/kdepim/debian/kmailcvt.install
   trunk/packages/kdepim/debian/knode.install
   trunk/packages/kdepim/debian/knode.menu
   trunk/packages/kdepim/debian/knotes.install
   trunk/packages/kdepim/debian/knotes.menu
   trunk/packages/kdepim/debian/kontact.install
   trunk/packages/kdepim/debian/kontact.menu
   trunk/packages/kdepim/debian/korganizer.install
   trunk/packages/kdepim/debian/korganizer.menu
   trunk/packages/kdepim/debian/korn.install
   trunk/packages/kdepim/debian/korn.menu
   trunk/packages/kdepim/debian/kpilot.install
   trunk/packages/kdepim/debian/kpilot.menu
   trunk/packages/kdepim/debian/ksync.install
   trunk/packages/kdepim/debian/ksync.menu
   trunk/packages/kdepim/debian/ktnef.install
   trunk/packages/kdepim/debian/ktnef.menu
   trunk/packages/kdepim/debian/libkcal2-dev.install
   trunk/packages/kdepim/debian/libkdenetwork2.install
   trunk/packages/kdepim/debian/libkgantt0-dev.install
   trunk/packages/kdepim/debian/libkgantt0.install
   trunk/packages/kdepim/debian/libkpimexchange1.install
   trunk/packages/kdepim/debian/libksieve0-dev.install
   trunk/packages/kdepim/debian/libmimelib1-dev.install
   trunk/packages/kdepim/debian/rules
Log:
kdepim 4:3.3.2-1 packaging


Modified: trunk/packages/kdepim/debian/changelog
===================================================================
--- trunk/packages/kdepim/debian/changelog	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/changelog	2005-01-21 03:24:38 UTC (rev 434)
@@ -1,3 +1,151 @@
+kdepim (4:3.3.2-1) unstable; urgency=low
+
+  * Uploading to unstable.
+  * Include updates from KDE_3_3_BRANCH.
+  * Reenable gnokii support.
+
+ -- Daniel Schepler <schepler@debian.org>  Wed, 19 Jan 2005 18:20:43 -0800
+
+kdepim (4:3.3.2-0pre1) experimental; urgency=low
+
+  * New upstream release.
+  * They did it again... rename libkcal2 to libkcal2a because of removed
+    symbols SloxAccounts::self(), SloxAccounts::setServer(QString const&),
+    SloxAccounts::SloxAccounts() in libkslox.so.
+  * Bump shlibs version on libkdepim1.
+
+ -- Daniel Schepler <schepler@debian.org>  Fri, 17 Dec 2004 20:45:39 -0800
+
+kdepim (4:3.3.1-3) unstable; urgency=medium
+
+  * Disable gnokii support to attempt getting kde3.3 into sarge.
+    Closes: #284985.
+  * Disable final mode for compiling kmail, which will hopefully fix
+    the buildd timeouts.
+
+ -- Daniel Schepler <schepler@debian.org>  Sat, 11 Dec 2004 15:50:44 -0800
+
+kdepim (4:3.3.1-2) unstable; urgency=medium
+
+  * Urgency medium due to fix for buildd issues.
+  * Updates from KDE_3_3_BRANCH.
+  * Stop building static libraries to make buildd's happy (or at least
+    happier).  They were pretty useless anyway without static versions
+    of Qt or kdelibs.  Closes: #281955.
+  * Update kleopatra dependencies for current experimental gnupg2/gpgsm
+    packages.  Closes: #274611, #280759.
+  * Drop cryptplug from kmail's dependencies, since it's no longer used.
+    Closes: #274612.
+  * Add blurb about kdepim-kio-plugins and kdebase-kio-plugins
+    dependencies to kmail's description, due to the number of people who
+    somehow manage to install kmail without even noticing the Recommends
+    on these packages, then complain that things don't work.
+    Closes: #274657.
+
+ -- Daniel Schepler <schepler@debian.org>  Sun, 21 Nov 2004 15:04:40 -0800
+
+kdepim (4:3.3.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Rename 01_kdepim_branch.diff to 10_kdepim_branch.diff, and
+    other kdepim-specific patches to 2?_*.diff.
+  * New patch 04_disable_static_la_final.diff, to keep --enable-final
+    from messing up the static libraries.
+    + debian/rules: Reenable --enable-final.
+  * kde.mk: Add calls to dh_desktop.
+    + debian/control: Build-Depends on debhelper (>= 4.2.21) to ensure
+      dh_desktop is available.
+  * Correct URL in kleopatra description.  Closes: #275522.
+  * Bump shlibs version to require current version.  Closes: #275211.
+  * Package name change: libmimelib1 -> libmimelib1a, because of
+    missing DwHeaders::AllFieldBodiesAsString(DwString const&) (at least)
+    since version 4:3.2.3-1.  Closes: #276607.
+  * Package name change: libkleopatra0 -> libkleopatra0a, because of
+    missing symbols since last version:
+    + Kleo::Job::showErrorDialog(QWidget*) const
+    + Kleo::KeyListView::parentFor(QCString const&) const
+    + Kleo::KeyListView::refillFingerprintDictionary()
+    + Kleo::QGpgMEEncryptJob::showErrorDialog(QWidget*) const
+    + Kleo::QGpgMESignEncryptJob::showErrorDialog(QWidget*) const
+    + Kleo::QGpgMESignJob::showErrorDialog(QWidget*) const
+    + Kleo::KeyListViewItem::~KeyListViewItem().
+
+    To KDE upstream maintainers: every time you break binary compatibility
+    like this in a public library, I'm going to have to increase the
+    library "subversion" in the package name, which will delay packages
+    entering sid.  Please keep this in mind before making such changes, if
+    the rule that non-backward-compatible changes require a new SONAME
+    carries no weight with you.
+
+ -- Daniel Schepler <schepler@debian.org>  Sat,  6 Nov 2004 12:18:42 -0800
+
+kdepim (4:3.3.0-3) unstable; urgency=low
+
+  * Updates from KDE_3_3_BRANCH.
+    + Fixes konsolekalendar.  Closes: #269295.
+  * Move kleopatra to contrib for now, until GnuPG2 is in unstable.  In
+    the meantime, add a note to the package description on how to
+    install the package.  Closes: #269789.
+  * Move binary dependencies from kontact-plugins for korganizer and
+    kpilot to Recommends and Suggests, respectively.  Closes: #273402.
+  * kmailcvt Depends: kmail.  Closes: #268788.
+
+ -- Daniel Schepler <schepler@debian.org>  Sat, 25 Sep 2004 19:44:44 -0700
+
+kdepim (4:3.3.0-2) unstable; urgency=low
+
+  * Using automake1.7 doesn't fix the korganizer install problems; go to
+    automake1.9 and readd 03_automake1.8.diff and
+    04_korganizer_makefile.diff.
+  * New patch 05_lib_link.diff: Correct link lines for libkalarmd and
+    libkpilot so that they are linked against all necessary libraries.
+  * Include new fixes from KDE_3_3_BRANCH.
+
+ -- Daniel Schepler <schepler@debian.org>  Fri, 27 Aug 2004 07:25:15 -0700
+
+kdepim (4:3.3.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Add German debconf translations, thanks to Erik Schanze.
+    Closes: #264825.
+  * Correct typo in kpilot.install which caused file conflicts.
+    Closes: #266311.
+  * Add Recommends: kdepim-kio-plugins to kmail for newimap, and also
+    move kdebase-kio-plugins there from Depends.  Closes: #266603.
+  * Use automake1.7 instead of 1.8 to work around problem in
+    korganizer/Makefile.am.
+
+ -- Daniel Schepler <schepler@debian.org>  Wed, 25 Aug 2004 00:09:09 -0400
+
+kdepim (4:3.2.92+3.3.0rc1-1) experimental; urgency=low
+
+  * New upstream release.
+    + New packages: kdepim-wizards, kitchensync, libkleopatra0[-dev],
+      libkpimidentities1.
+    + Removed packages: libkdgantt0[-dev].
+    + Renamed kgpgcertmanager to kleopatra.
+  * Taking over maintainership, add myself to Uploaders.
+  * Build in gnokii support again.  Closes: #254643.
+  * Add Build-Depends on libgpgme11-dev for kmail.
+  * Make the *.install files a bit more robust by listing directories
+    clearly belonging to packages instead of listing each individual
+    file.
+  * Add kdepim-doc-html package for the benefit of non-KDE users.
+  * Expand package descriptions.  Closes: #209672, #209689, #209862,
+    #209997, #210088, #210094.
+  * Add menu icons.
+  * Add doc-base files for kdepim-doc and kdepim-doc-html.
+  * Write new manual pages for all binaries.
+
+ -- Daniel Schepler <schepler@debian.org>  Sat,  7 Aug 2004 23:20:22 -0700
+
+kdepim (4:3.2.3-1) unstable; urgency=high
+
+  * New upstream release.
+  * kmail Suggests: cryptplug. (Closes: #231797)
+
+ -- Christopher L Cheney <ccheney@debian.org>  Tue,  3 Aug 2004 23:00:00 -0500
+
 kdepim (4:3.2.2-2) unstable; urgency=high
 
   * Build-Conflicts: gnokii - due to gnokii not being properly maintained.

Modified: trunk/packages/kdepim/debian/control
===================================================================
--- trunk/packages/kdepim/debian/control	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/control	2005-01-21 03:24:38 UTC (rev 434)
@@ -2,37 +2,30 @@
 Section: kde
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-Uploaders: Christopher L Cheney <ccheney@debian.org>
-Build-Depends: automake1.8, bison, byacc, debhelper (>> 4.2.0), docbook-to-man, flex, gawk, gettext, kdelibs4-dev (>> 4:3.2.1), libbluetooth1-dev, libgtk1.2-dev, liblockdev1-dev, libmal-dev, libpisock-dev, libreadline4-dev, sharutils, texinfo
-Build-Depends-Indep: doxygen, qt3-doc
-Build-Conflicts: gnokii
+Uploaders: Christopher L Cheney <ccheney@debian.org>, Daniel Schepler <schepler@debian.org>
+Build-Depends: autoconf, automake1.9, bison, byacc, cdbs, debhelper (>= 4.2.21), flex, gawk, gettext, groff-base, kdelibs4-dev (>> 4:3.3.2), libbluetooth1-dev, libgnokii2-dev (>= 0.6.4), libgpgme11-dev, liblockdev1-dev, libmal-dev, libpisock-dev, libreadline4-dev, libtool, libxpm-dev, sharutils, texinfo
+Build-Depends-Indep: doxygen, qt3-doc, kdelibs4-doc
 Standards-Version: 3.6.1.0
 
 Package: kdepim
 Section: kde
 Architecture: all
-Depends: kaddressbook (>= ${Source-Version}), kalarm (>= ${Source-Version}), kandy (>= ${Source-Version}), karm (>= ${Source-Version}), kdepim-kfile-plugins (>= ${Source-Version}), kdepim-kio-plugins (>= ${Source-Version}), kgpgcertmanager (>= ${Source-Version}), kmail (>= ${Source-Version}), kmailcvt (>= ${Source-Version}), knode (>= ${Source-Version}), knotes (>= ${Source-Version}), konsolekalendar (>= ${Source-Version}), kontact (>= ${Source-Version}), korganizer (>= ${Source-Version}), korn (>= ${Source-Version}), kpilot (>= ${Source-Version}), ksync (>= ${Source-Version}), ktnef (>= ${Source-Version}), libkcal2 (>= ${Source-Version}), libkdenetwork2 (>= ${Source-Version}), libkdepim1 (>= ${Source-Version}), libkdgantt0 (>= ${Source-Version}), libkgantt0 (>= ${Source-Version}), libkpimexchange1 (>= ${Source-Version}), libksieve0 (>= ${Source-Version}), libmimelib1 (>= ${Source-Version})
+Depends: kaddressbook (>= ${Source-Version}), kalarm (>= ${Source-Version}), kandy (>= ${Source-Version}), karm (>= ${Source-Version}), kdepim-kfile-plugins (>= ${Source-Version}), kdepim-kio-plugins (>= ${Source-Version}), kdepim-wizards (>= ${Source-Version}), kitchensync (>= ${Source-Version}), kmail (>= ${Source-Version}), kmailcvt (>= ${Source-Version}), knode (>= ${Source-Version}), knotes (>= ${Source-Version}), konsolekalendar (>= ${Source-Version}), kontact (>= ${Source-Version}), korganizer (>= ${Source-Version}), korn (>= ${Source-Version}), kpilot (>= ${Source-Version}), ksync (>= ${Source-Version}), ktnef (>= ${Source-Version}), libkcal2a (>= ${Source-Version}), libkdenetwork2 (>= ${Source-Version}), libkdepim1 (>= ${Source-Version}), libkgantt0 (>= ${Source-Version}), libkleopatra0a (>= ${Source-Version}), libkpimexchange1 (>= ${Source-Version}), libkpimidentities1 (>= ${Source-Version}), libksieve0 (>= ${Source-Version}), libmimelib1a (>= ${Source-Version})
+Suggests: kdepim-doc-html
 Description: KDE Personal Information Management metapackage
- KDE is a powerful Open Source graphical desktop environment for Unix
- workstations. It combines ease of use, contemporary functionality, and
- outstanding graphical design with the technological superiority of the Unix
- operating system.
- .
  kdepim is a collection of Personal Information Management (PIM) tools for the
  K Desktop Enviromnent (KDE).
+ .
+ This is an empty package which depends on the current version of every
+ application in the kdepim distribution.
 
 Package: kdepim-dev
 Section: devel
 Architecture: any
-Depends: kaddressbook (= ${Source-Version}), kalarm (= ${Source-Version}), kmail (= ${Source-Version}), knotes (= ${Source-Version}), kontact (= ${Source-Version}), korganizer (= ${Source-Version}), kpilot (= ${Source-Version}), ksync (= ${Source-Version}), ktnef (= ${Source-Version}), libkdenetwork2 (= ${Source-Version}), libkdepim1 (= ${Source-Version})
+Depends: kaddressbook (= ${Source-Version}), kalarm (= ${Source-Version}), kdepim-wizards (= ${Source-Version}), kmail (= ${Source-Version}), knode (= ${Source-Version}), knotes (= ${Source-Version}), kontact (= ${Source-Version}), korganizer (= ${Source-Version}), kpilot (= ${Source-Version}), ksync (= ${Source-Version}), ktnef (= ${Source-Version}), libkdenetwork2 (= ${Source-Version}), libkdepim1 (= ${Source-Version}), libkpimidentities1 (= ${Source-Version})
 Conflicts: libkdenetwork1 (<< 4:3.0.0), libkdenetwork2-dev (<< 4:3.2.0)
 Replaces: kmail (<< 4:3.2.0), knotes (<< 4:3.0.0), korganizer (<< 4:3.2.0), libkdenetwork1 (<< 4:3.0.0), libkdenetwork2-dev (<< 4:3.2.0)
 Description: KDE Personal Information Management [development]
- KDE is a powerful Open Source graphical desktop environment for Unix
- workstations. It combines ease of use, contemporary functionality, and
- outstanding graphical design with the technological superiority of the Unix
- operating system.
- .
  This package contains development files needed to compile kdepim applications.
  .
  This package is part of the official KDE pim module.
@@ -40,59 +33,55 @@
 Package: kdepim-doc
 Section: doc
 Architecture: all
-Description: KDE Personal Information Management documentation
- KDE is a powerful Open Source graphical desktop environment for Unix
- workstations. It combines ease of use, contemporary functionality, and
- outstanding graphical design with the technological superiority of the Unix
- operating system.
- .
+Suggests: www-browser, doc-base
+Description: KDE Personal Information Management library documentation
  KDE core library documentation. You need this documentation to develop KDE PIM
  applications.
  .
  This package is part of the official KDE pim module.
 
+Package: kdepim-doc-html
+Section: doc
+Architecture: all
+Suggests: www-browser, doc-base
+Description: KDE PIM documentation in HTML format
+ By default the Personal Information Management applications provided with
+ KDE only provide their documentation in KDE docbook format, which can only
+ be read by Konqueror or KHelpCenter. This package provides all of the
+ KDE PIM documentation converted to HTML format so it can be read with any
+ web browser.
+ .
+ This package is part of the official KDE pim module.
+
 Package: kaddressbook
 Section: utils
 Architecture: any
 Depends: ${shlibs:Depends}
-Suggests: khelpcenter
 Replaces: kdebase (<< 4:3.0.0), kdebase-doc (<< 4:3.0.0)
 Description: KDE NG addressbook application
- KDE is a powerful Open Source graphical desktop environment for Unix
- workstations. It combines ease of use, contemporary functionality, and
- outstanding graphical design with the technological superiority of the Unix
- operating system.
+ KAddressBook is the main address book application for KDE; it enables you
+ to manage your contacts efficiently and comfortably. It can load and save
+ your contacts to many different locations, including the local file system,
+ LDAP servers, and SQL databases.
  .
- KDE next generation addressbook application.
- .
  This package is part of the official KDE pim module.
 
 Package: kalarm
 Section: kde
 Architecture: any
 Depends: ${shlibs:Depends}
-Suggests: khelpcenter
 Description: KDE alarm message and command scheduler
- KDE is a powerful Open Source graphical desktop environment for Unix
- workstations. It combines ease of use, contemporary functionality, and
- outstanding graphical design with the technological superiority of the Unix
- operating system.
+ KAlarm is a personal alarm message, command and email scheduler. It lets you
+ set up personal alarm messages which pop up on the screen at the chosen
+ time, or you can schedule commands to be executed or emails to be sent.
  .
- KDE alarm message and command scheduler.
- .
  This package is part of the official KDE pim module.
 
 Package: kandy
 Section: utils
 Architecture: any
 Depends: ${shlibs:Depends}
-Suggests: khelpcenter
 Description: KDE mobile phone utility
- KDE is a powerful Open Source graphical desktop environment for Unix
- workstations. It combines ease of use, contemporary functionality, and
- outstanding graphical design with the technological superiority of the Unix
- operating system.
- .
  At the moment Kandy is more or less a terminal program with some special
  features to store commands and their parameters, but is also has a simple GUI
  to access the phone book of a mobile phone and it is able to save this phone
@@ -106,13 +95,7 @@
 Section: utils
 Architecture: any
 Depends: ${shlibs:Depends}
-Suggests: khelpcenter
 Description: KDE time tracker tool
- KDE is a powerful Open Source graphical desktop environment for Unix
- workstations. It combines ease of use, contemporary functionality, and
- outstanding graphical design with the technological superiority of the Unix
- operating system.
- .
  KArm is a time tracker for busy people who need to keep track of the amount of
  time they spend on various tasks.
  .
@@ -122,14 +105,9 @@
 Section: kde
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: KDE File dialog plugins for vcf files
- KDE is a powerful Open Source graphical desktop environment for Unix
- workstations. It combines ease of use, contemporary functionality, and
- outstanding graphical design with the technological superiority of the Unix
- operating system.
+Description: KDE File dialog plugins for palm and vcf files
+ File dialog plugins for palm and vcf files.
  .
- File dialog plugins for vcf files.
- .
  This package is part of the official KDE pim module.
 
 Package: kdepim-kio-plugins
@@ -137,59 +115,74 @@
 Architecture: any
 Depends: ${shlibs:Depends}
 Description: KDE pim I/O Slaves
- KDE is a powerful Open Source graphical desktop environment for Unix
- workstations. It combines ease of use, contemporary functionality, and
- outstanding graphical design with the technological superiority of the Unix
- operating system.
+ This package includes the pim kioslaves. This includes newimap4 and sieve.
  .
- This package includes the pim kioslaves. This includes sieve.
+ This package is part of the official KDE pim module.
+
+Package: kdepim-wizards
+Section: kde
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: egroupware
+Description: KDE server configuration wizards
+ This package contains KDE-based wizards for configuring eGroupware,
+ Kolab, and SUSE Linux Openexchange servers.
  .
  This package is part of the official KDE pim module.
 
-Package: kgpgcertmanager
-Section: net
+Package: kitchensync
+Section: kde
 Architecture: any
 Depends: ${shlibs:Depends}
-Suggests: khelpcenter
+Description: Synchronization framework
+ This package contains a synchronization framework, still under heavy
+ development.
+ .
+ This package is part of the official KDE pim module.
+
+Package: kleopatra
+Section: contrib/net
+Architecture: any
+Depends: ${shlibs:Depends}, gpgsm, dirmngr, pinentry-qt | pinentry-x11
+Conflicts: kgpgcertmanager
+Replaces: kgpgcertmanager
+Provides: kgpgcertmanager
 Description: KDE Certificate Manager
- KDE is a powerful Open Source graphical desktop environment for Unix
- workstations. It combines ease of use, contemporary functionality, and
- outstanding graphical design with the technological superiority of the Unix
- operating system.
+ Kleopatra is the KDE tool for managing X.509 certificates in the gpgsm
+ keybox and for retrieving certificates from LDAP servers.
  .
- Certificate manager used by kdepim for encrypted email.
+ To install this package, you will need unofficial packages for GnuPG
+ version 1.9, and you will also need to recompile gpgme with S/MIME
+ support.  See http://lists.debian.org/debian-kde/2004/09/msg00102.html
+ for details.
  .
  This package is part of the official KDE pim module.
 
 Package: kmail
 Section: mail
 Architecture: any
-Depends: ${shlibs:Depends}, kdebase-kio-plugins
-Suggests: gnupg, khelpcenter
+Depends: ${shlibs:Depends}, ${perl:Depends}
+Recommends: kdebase-kio-plugins, kdepim-kio-plugins
+Suggests: gnupg, kaddressbook, kleopatra, spamassassin | bogofilter | annoyance-filter, clamav | f-prot-installer
+Replaces: libkdenetwork2 (<< 4:3.2.92)
 Provides: imap-client, mail-reader
 Description: KDE Email client
- KDE is a powerful Open Source graphical desktop environment for Unix
- workstations. It combines ease of use, contemporary functionality, and
- outstanding graphical design with the technological superiority of the Unix
- operating system.
+ KMail is a fully-featured email client that fits nicely into the KDE
+ desktop. It has features such as support for IMAP, POP3, multiple accounts,
+ mail filtering and sorting, PGP/GnuPG privacy, and inline attachments.
  .
- Mail Client based on QT and KDE.
+ You need to install kdepim-kio-plugins if you want to use IMAP, and/or
+ kdebase-kio-plugins if you want to use POP3. If you are using aptitude,
+ these should be installed for you automatically.
  .
- Supports imap, mbox, maildir, pop3, pop3s, and OpenPGP.
- .
  This package is part of the official KDE pim module.
 
 Package: kmailcvt
 Section: mail
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, kmail
 Replaces: kmail (<< 4:3.0.0)
 Description: KDE KMail addressbook converter
- KDE is a powerful Open Source graphical desktop environment for Unix
- workstations. It combines ease of use, contemporary functionality, and
- outstanding graphical design with the technological superiority of the Unix
- operating system.
- .
  Converts addressbooks to KMail format.
  .
  This package is part of the official KDE pim module.
@@ -198,45 +191,34 @@
 Section: news
 Architecture: any
 Depends: ${shlibs:Depends}
-Suggests: khelpcenter
+Replaces: libkdenetwork2 (<< 4:3.2.92)
 Provides: news-reader
 Description: KDE news reader
- KDE is a powerful Open Source graphical desktop environment for Unix
- workstations. It combines ease of use, contemporary functionality, and
- outstanding graphical design with the technological superiority of the Unix
- operating system.
+ KNode is an easy-to-use, convenient newsreader. It is intended to be usable
+ by inexperienced users, but also includes support for such features as
+ MIME attachments, article scoring, and creating and verifying GnuPG
+ signatures.
  .
- News reader for KDE.
- .
  This package is part of the official KDE pim module.
 
 Package: knotes
 Section: kde
 Architecture: any
 Depends: ${shlibs:Depends}
-Suggests: khelpcenter
-Description: KDE Notes
- KDE is a powerful Open Source graphical desktop environment for Unix
- workstations. It combines ease of use, contemporary functionality, and
- outstanding graphical design with the technological superiority of the Unix
- operating system.
+Replaces: kontact (<< 4:3.2.92)
+Description: KDE sticky notes
+ KNotes is a program that lets you write sticky notes. The notes are saved
+ automatically when you exit the program, and they display when you open the
+ program.  The program supports printing and mailing your notes.
  .
- Sticky notes for KDE.
- .
  This package is part of the official KDE pim module.
 
 Package: konsolekalendar
 Section: kde
 Architecture: any
 Depends: ${shlibs:Depends}
-Suggests: khelpcenter
 Replaces: korganizer (<< 4:3.2.0)
 Description: KDE konsole personal organizer
- KDE is a powerful Open Source graphical desktop environment for Unix
- workstations. It combines ease of use, contemporary functionality, and
- outstanding graphical design with the technological superiority of the Unix
- operating system.
- .
  To support console-based calendaring with KDE, the konsolekalendar
  complements the KDE KOrganizer with an according frontend to manage
  appointments and your schedule on a text-based console.
@@ -247,31 +229,24 @@
 Section: kde
 Architecture: any
 Depends: ${shlibs:Depends}
-Recommends: kaddressbook, kmail, knode, knotes, korganizer
-Suggests: khelpcenter
+Recommends: ${shlibs:Recommends}, kaddressbook, kitchensync, kmail, knode, knotes
+Suggests: ${shlibs:Suggests}, knewsticker, kweather
+Replaces: kontact-plugins (<< 4:3.2.92)
 Description: KDE pim application
- KDE is a powerful Open Source graphical desktop environment for Unix
- workstations. It combines ease of use, contemporary functionality, and
- outstanding graphical design with the technological superiority of the Unix
- operating system.
+ Kontact is the integrated solution to your personal information management
+ needs. It combines KDE applications like KMail, KOrganizer, and
+ KAddressBook into a single interface to provide easy access to mail,
+ scheduling, address book and other PIM functionality.
  .
- KDE next generation pim application.
- .
  This package is part of the official KDE pim module.
 
 Package: korganizer
 Section: kde
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${perl:Depends}
 Recommends: kghostview
-Suggests: khelpcenter
 Replaces: kalarm (<< 4:3.2.0)
 Description: KDE personal organizer
- KDE is a powerful Open Source graphical desktop environment for Unix
- workstations. It combines ease of use, contemporary functionality, and
- outstanding graphical design with the technological superiority of the Unix
- operating system.
- .
  A complete calendar and scheduling program. KOrganizer supports information
  interchange with other calendar applications through the industry standard
  vCalendar file format.
@@ -296,14 +271,13 @@
 Section: kde
 Architecture: any
 Depends: ${shlibs:Depends}
-Suggests: khelpcenter
 Description: KDE mail checker
- KDE is a powerful Open Source graphical desktop environment for Unix
- workstations. It combines ease of use, contemporary functionality, and
- outstanding graphical design with the technological superiority of the Unix
- operating system.
+ Korn is a KDE mail checker that can display a small summary in the Kicker
+ tray.  It supports checking mbox, pop3, imap4, and nntp sources.
  .
- Mail notifier for KDE.
+ Once mail is received you can have Korn run a third party program or change
+ the color/icon of the Kicker display.  In addition to this you can have
+ Korn run a program once you click on the docked icon in Kicker.
  .
  This package is part of the official KDE pim module.
 
@@ -311,16 +285,14 @@
 Section: utils
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: khelpcenter, knotes, korganizer
+Suggests: knotes, korganizer
 Replaces: korganizer (<< 4:3.0.0)
 Description: KDE Palm Pilot hot-sync tool
- KDE is a powerful Open Source graphical desktop environment for Unix
- workstations. It combines ease of use, contemporary functionality, and
- outstanding graphical design with the technological superiority of the Unix
- operating system.
+ KPilot is an application that synchronizes your Palm Pilot or similar device
+ (like the Handspring Visor) with your KDE desktop, much like the Palm HotSync
+ software does for Windows.  KPilot can back-up and restore your Palm Pilot
+ and synchronize the built-in applications with their KDE counterparts.
  .
- KDE Palm Pilot hot-sync tool.
- .
  This package is part of the official KDE pim module.
 
 Package: ksync
@@ -328,16 +300,11 @@
 Architecture: any
 Depends: ${shlibs:Depends}
 Description: KDE Sync
- KDE is a powerful Open Source graphical desktop environment for Unix
- workstations. It combines ease of use, contemporary functionality, and
- outstanding graphical design with the technological superiority of the Unix
- operating system.
+ KSync is a small application using libksync, which provides a GUI for
+ selecting and syncing files, which contain data of the types, for which
+ implementations of the libksync interfaces exist. It is able to sync data
+ across networks by using the KDE ioslaves.
  .
- KSync is a small application using libksync, which provides a GUI for selecting
- and syncing files, which contain data of the types, for which implementations
- of the libksync interfaces exist. It is able to sync data across networks by
- using the KDE ioslaves.
- .
  This package is part of the official KDE pim module.
 
 Package: ktnef
@@ -345,30 +312,22 @@
 Architecture: any
 Depends: ${shlibs:Depends}
 Description: KDE TNEF viewer
- KDE is a powerful Open Source graphical desktop environment for Unix
- workstations. It combines ease of use, contemporary functionality, and
- outstanding graphical design with the technological superiority of the Unix
- operating system.
+ The TNEF File Viewer allows you to handle mail attachments using the TNEF
+ format. These attachments are usually found in mails coming from Microsoft
+ mail servers and embed the mail properties as well as the actual attachments.
  .
- Viewer for Microsoft's TNEF format
- .
  This package is part of the official KDE pim module.
 
-Package: libkcal2
+Package: libkcal2a
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
-Conflicts: kdepim-libs (<< 4:3.2.0)
+Conflicts: kdepim-libs (<< 4:3.2.0), libkcal2
 Replaces: kdepim-libs (<< 4:3.2.0)
 Description: KDE calendaring library
- KDE is a powerful Open Source graphical desktop environment for Unix
- workstations. It combines ease of use, contemporary functionality, and
- outstanding graphical design with the technological superiority of the Unix
- operating system.
+ This library provides a C++ API for handling the vCalendar and iCalendar
+ formats.
  .
- This is the KDE calendaring library. It provides a C++ API for handling the
- vCalendar and iCalendar formats.
- .
  This is the runtime package for programs that use the libkcal library.
  .
  This package is part of the official KDE pim module.
@@ -376,18 +335,13 @@
 Package: libkcal2-dev
 Section: libdevel
 Architecture: any
-Depends: libkcal2 (= ${Source-Version})
+Depends: libkcal2a (= ${Source-Version})
 Conflicts: kdepim-libs (<< 4:3.0.0)
 Replaces: kdepim-dev (<< 4:3.2.0), kdepim-libs (<< 4:3.0.0)
 Description: KDE calendaring library [development]
- KDE is a powerful Open Source graphical desktop environment for Unix
- workstations. It combines ease of use, contemporary functionality, and
- outstanding graphical design with the technological superiority of the Unix
- operating system.
+ This library provides a C++ API for handling the vCalendar and iCalendar
+ formats.
  .
- This is the KDE calendaring library. It provides a C++ API for handling the
- vCalendar and iCalendar formats.
- .
  This is the development package which contains the headers for the libkcal
  library.
  .
@@ -396,14 +350,9 @@
 Package: libkdenetwork2
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${perl:Depends}
 Replaces: kgpgcertmanager (<< 4:3.2.0), kmail (<< 4:3.2.0), knode (<< 4:3.2.0)
 Description: KDE Network library
- KDE is a powerful Open Source graphical desktop environment for Unix
- workstations. It combines ease of use, contemporary functionality, and
- outstanding graphical design with the technological superiority of the Unix
- operating system.
- .
  This is the runtime package for programs that use the libkdenetwork library.
  .
  This package is part of the official KDE pim module.
@@ -415,83 +364,57 @@
 Conflicts: kdepim-libs (<< 4:3.2.0)
 Replaces: kdepim-libs (<< 4:3.2.0)
 Description: KDE PIM library
- KDE is a powerful Open Source graphical desktop environment for Unix
- workstations. It combines ease of use, contemporary functionality, and
- outstanding graphical design with the technological superiority of the Unix
- operating system.
- .
  This is the runtime package for programs that use the libkdepim library.
  .
  This package is part of the official KDE pim module.
 
-Package: libkdgantt0
+Package: libkgantt0
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: KD's gantt charting library
- KDE is a powerful Open Source graphical desktop environment for Unix
- workstations. It combines ease of use, contemporary functionality, and
- outstanding graphical design with the technological superiority of the Unix
- operating system.
+Conflicts: kdepim-libs (<< 4:3.2.0)
+Replaces: kdepim-libs (<< 4:3.2.0)
+Description: KDE gantt charting library
+ This is the runtime package for programs that use the libkgantt library.
  .
- Klarälvdalens Datakonsult AB's gantt charting library.
- .
- This is the runtime package for programs that use the libkdgantt library.
- .
  This package is part of the official KDE pim module.
 
-Package: libkdgantt0-dev
+Package: libkgantt0-dev
 Section: libdevel
 Architecture: any
-Depends: libkdgantt0 (= ${Source-Version})
-Description: KD's gantt charting library [development]
- KDE is a powerful Open Source graphical desktop environment for Unix
- workstations. It combines ease of use, contemporary functionality, and
- outstanding graphical design with the technological superiority of the Unix
- operating system.
- .
- Klarälvdalens Datakonsult AB's gantt charting library.
- .
- This is the development package which contains the headers for the libkdgantt
+Depends: libkgantt0 (= ${Source-Version})
+Conflicts: kdepim-libs (<< 4:3.0.0)
+Replaces: kdepim-dev (<< 4:3.2.0), kdepim-libs (<< 4:3.0.0)
+Description: KDE gantt charting library [development]
+ This is the development package which contains the headers for the libkgantt
  library.
  .
  This package is part of the official KDE pim module.
 
-Package: libkgantt0
+Package: libkleopatra0a
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}
-Conflicts: kdepim-libs (<< 4:3.2.0)
-Replaces: kdepim-libs (<< 4:3.2.0)
-Description: KDE gantt charting library
- KDE is a powerful Open Source graphical desktop environment for Unix
- workstations. It combines ease of use, contemporary functionality, and
- outstanding graphical design with the technological superiority of the Unix
- operating system.
+Depends: ${shlibs:Depends}, gnupg
+Conflicts: libkleopatra0
+Description: KDE GnuPG interface libraries
+ This library is used by several KDE applications to interface to the
+ GnuPG program.
  .
- KDE gantt charting library.
+ This is the runtime package for programs that use the libkleopatra library.
  .
- This is the runtime package for programs that use the libkgantt library.
- .
  This package is part of the official KDE pim module.
 
-Package: libkgantt0-dev
+Package: libkleopatra0-dev
 Section: libdevel
 Architecture: any
-Depends: libkgantt0 (= ${Source-Version})
-Conflicts: kdepim-libs (<< 4:3.0.0)
-Replaces: kdepim-dev (<< 4:3.2.0), kdepim-libs (<< 4:3.0.0)
-Description: KDE gantt charting library [development]
- KDE is a powerful Open Source graphical desktop environment for Unix
- workstations. It combines ease of use, contemporary functionality, and
- outstanding graphical design with the technological superiority of the Unix
- operating system.
+Depends: libkleopatra0a (= ${Source-Version})
+Description: KDE GnuPG interface libraries [development]
+ This library is used by several KDE applications to interface to the
+ GnuPG program.
  .
- KDE gantt charting library.
+ This is the development package which contains the headers for the
+ libkleopatra library.
  .
- This is the development package which contains the headers for the libkgantt
- library.
- .
  This package is part of the official KDE pim module.
 
 Package: libkpimexchange1
@@ -501,15 +424,9 @@
 Conflicts: kdepim-libs (<< 4:3.2.0)
 Replaces: kdepim-libs (<< 4:3.2.0)
 Description: KDE PIM Exchange library
- KDE is a powerful Open Source graphical desktop environment for Unix
- workstations. It combines ease of use, contemporary functionality, and
- outstanding graphical design with the technological superiority of the Unix
- operating system.
+ This is the runtime package for programs that use the libkpimexchange
+ library. 
  .
- KDE PIM Exchange library.
- .
- This is the runtime package for programs that use the libkpimexchange library. 
- .
  This package is part of the official KDE pim module.
 
 Package: libkpimexchange1-dev
@@ -518,30 +435,29 @@
 Depends: libkpimexchange1 (= ${Source-Version})
 Replaces: kdepim-dev (<< 4:3.2.0)
 Description: KDE PIM Exchange library [development]
- KDE is a powerful Open Source graphical desktop environment for Unix
- workstations. It combines ease of use, contemporary functionality, and
- outstanding graphical design with the technological superiority of the Unix
- operating system.
- .
- KDE PIM Exchange library.
- .
  This is the development package which contains the headers for the
  libkpimexchange library.
  .
  This package is part of the official KDE pim module.
 
-Package: libksieve0
+Package: libkpimidentities1
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: KDE mail/news message filtering library
- KDE is a powerful Open Source graphical desktop environment for Unix
- workstations. It combines ease of use, contemporary functionality, and
- outstanding graphical design with the technological superiority of the Unix
- operating system.
+Description: KDE PIM user identity information library
+ This library provides information to KDE programs about user identity,
+ such as email address, organization, etc.
  .
- KDE internet mail/usenet news message filtering library.
+ This is the runtime package for programs that use the libkpimidentities
+ library.
  .
+ This package is part of the official KDE pim module.
+
+Package: libksieve0
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: KDE mail/news message filtering library
  This is the runtime package for programs that use the libksieve library.
  .
  This package is part of the official KDE pim module.
@@ -551,44 +467,33 @@
 Architecture: any
 Depends: libksieve0 (= ${Source-Version})
 Description: KDE mail/news message filtering library [development]
- KDE is a powerful Open Source graphical desktop environment for Unix
- workstations. It combines ease of use, contemporary functionality, and
- outstanding graphical design with the technological superiority of the Unix
- operating system.
- .
- KDE internet mail/usenet news message filtering library.
- .
  This is the development package which contains the headers for the libksieve
  library.
  .
  This package is part of the official KDE pim module.
 
-Package: libmimelib1
+Package: libmimelib1a
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
+Conflicts: libmimelib1
 Description: KDE mime library
- KDE is a powerful Open Source graphical desktop environment for Unix
- workstations. It combines ease of use, contemporary functionality, and
- outstanding graphical design with the technological superiority of the Unix
- operating system.
- .
  This library is used by several KDE applications to handle mime types.
  .
+ This is the runtime package for programs that use the libmimelib library.
+ .
  This package is part of the official KDE pim module.
 
 Package: libmimelib1-dev
 Section: libdevel
 Architecture: any
-Depends: libmimelib1 (= ${Source-Version})
-Conflicts: libmimelib-dev (<< 4:3.0.0), libmimelib1 (<< 4:3.0.0)
-Replaces: libmimelib-dev (<< 4:3.0.0), libmimelib1 (<< 4:3.0.0)
+Depends: libmimelib1a (= ${Source-Version})
+Conflicts: libmimelib-dev (<< 4:3.0.0)
+Replaces: libmimelib-dev (<< 4:3.0.0)
 Description: KDE mime library [development]
- KDE is a powerful Open Source graphical desktop environment for Unix
- workstations. It combines ease of use, contemporary functionality, and
- outstanding graphical design with the technological superiority of the Unix
- operating system.
- .
  This library is used by several KDE applications to handle mime types.
  .
+ This is the development package which contains the headers for the
+ libmimelib library.
+ .
  This package is part of the official KDE pim module.

Added: trunk/packages/kdepim/debian/icons/kaddressbook-16.xpm
===================================================================
--- trunk/packages/kdepim/debian/icons/kaddressbook-16.xpm	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/icons/kaddressbook-16.xpm	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,134 @@
+/* XPM */
+static char *kaddressbook-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 112 2",
+"   c black",
+".  c #00004C",
+"X  c #091A4F",
+"o  c #1D3675",
+"O  c #1F3879",
+"+  c #243E72",
+"@  c #36477A",
+"#  c #52617F",
+"$  c #244183",
+"%  c #244184",
+"&  c #264386",
+"*  c #274489",
+"=  c #28458A",
+"-  c #2A498F",
+";  c #2A4A8F",
+":  c #2D4D94",
+">  c #2D4E96",
+",  c #39558A",
+"<  c #30529B",
+"1  c #32549D",
+"2  c #33559C",
+"3  c #3559A3",
+"4  c #3A5DA0",
+"5  c #3B5CA2",
+"6  c #395EAB",
+"7  c #3B62AF",
+"8  c #3D63AB",
+"9  c #3D63B2",
+"0  c #3F66B3",
+"q  c #52528B",
+"w  c #466196",
+"e  c #4663A0",
+"r  c #4367AD",
+"t  c #436DBE",
+"y  c #5578BD",
+"u  c #4773C6",
+"i  c #4D77C6",
+"p  c #4974C8",
+"a  c #4975C9",
+"s  c #4B77C9",
+"d  c #4E78C5",
+"f  c #4A78CB",
+"g  c #4A78CC",
+"h  c #4B79CD",
+"j  c #4B79CE",
+"k  c #4C79CC",
+"l  c #4C7ACF",
+"z  c #4D7BD0",
+"x  c #4E7DD2",
+"c  c #4F7FD6",
+"v  c #507FD7",
+"b  c #6680B2",
+"n  c #5881CE",
+"m  c #5B83CC",
+"M  c #5A83CF",
+"N  c #5281D7",
+"B  c #5180D8",
+"V  c #5284DB",
+"C  c #5284DC",
+"Z  c #5686DD",
+"A  c #5587E0",
+"S  c #5689E3",
+"D  c #5789E3",
+"F  c #578AE4",
+"G  c #5886E3",
+"H  c #5989E0",
+"J  c #588BE5",
+"K  c #5A90EB",
+"L  c #5C91ED",
+"P  c #5C92EE",
+"I  c #5C92EF",
+"U  c #5E94F1",
+"Y  c #6381C0",
+"T  c #6C8BCA",
+"R  c #678ED6",
+"E  c #708BC2",
+"W  c #7595D4",
+"Q  c #7B98D2",
+"!  c #6090E5",
+"~  c #6292E7",
+"^  c #6594E7",
+"/  c #6092EB",
+"(  c #6596ED",
+")  c #6096F3",
+"_  c #639BFA",
+"`  c #649DFD",
+"'  c #659FFF",
+"]  c #669FFF",
+"[  c #709AE5",
+"{  c #69A4FF",
+"}  c #6FA4FE",
+"|  c #6CA8FF",
+" . c #6DA9FF",
+".. c #71A1F3",
+"X. c #74A1F0",
+"o. c #7BAAFB",
+"O. c #8B9EC1",
+"+. c #87A0D2",
+"@. c #8FA0DB",
+"#. c #83ADF8",
+"$. c #8BBBFF",
+"%. c #8EBDFF",
+"&. c #90B1EC",
+"*. c #92B4EF",
+"=. c #90BAFF",
+"-. c #91BFFF",
+";. c #92C0FF",
+":. c #ACD0FF",
+">. c #BDD9FF",
+",. c #C1DAFF",
+"<. c gray100",
+"1. c None",
+/* pixels */
+"1.1.1.1.1.1.1.1.1.1.] >.>.:.$. .",
+"1.1.1.1.1.1.1.1.1.1.&.O.# *.} _ ",
+"1.1.1.1.1.1.1.1.1.] , b w R J V ",
+"1.1.1.1.1.1.1.1.1.P 4 r + i s p ",
+"1.1.1.1.1.1.1.1.1.x s 8 0 Y 9 p ",
+"1.1.1.1.1.1.1.1.1.P d 1 e T : z ",
+"1.1.1.1.1.1.1.1.P ~ v m W 5 < c ",
+"1.1.1.1.1.1.1.1.( H z m y O t 1.",
+"1.1.1.1.1.1.1.X.^ v p M o 3 s 1.",
+"1.1.1.1.1.] o.X.Z z N $ ; f 1.1.",
+"1.1.1. .-.=.#.K v D & * z 1.1.1.",
+"1.-.Q E @ [ ( F D = : x 1.1.1.1.",
+"1.%.+.X < s U u & 7 V 1.1.1.1.1.",
+"1. .{ ] K u < 6 c F 1.1.1.1.1.1.",
+"1.@.Z I Z c I ] 1.1.1.1.1.1.1.1.",
+"1.q . 1.1.1.1.1.1.1.1.1.1.1.1.1."
+};

Added: trunk/packages/kdepim/debian/icons/kaddressbook.xpm
===================================================================
--- trunk/packages/kdepim/debian/icons/kaddressbook.xpm	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/icons/kaddressbook.xpm	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,192 @@
+/* XPM */
+static char *kaddressbook[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 154 2",
+"   c black",
+".  c #00004E",
+"X  c #060652",
+"o  c #182655",
+"O  c #192B5F",
+"+  c #1A2C61",
+"@  c #1D3066",
+"#  c #1F336B",
+"$  c #2B2B6B",
+"%  c #20356D",
+"&  c #273C6B",
+"*  c #223972",
+"=  c #263E79",
+"-  c #303D60",
+";  c #363673",
+":  c #2C416A",
+">  c #27407B",
+",  c #28407C",
+"<  c #2B4582",
+"1  c #2D4886",
+"2  c #2E4A88",
+"3  c #354D86",
+"4  c #324F8F",
+"5  c #35528F",
+"6  c #3B548C",
+"7  c #345293",
+"8  c #3D5792",
+"9  c #3B5A94",
+"0  c #3B5B9E",
+"q  c #3B5DA1",
+"w  c #3E5EB3",
+"e  c #3F62A7",
+"r  c #3F62A8",
+"t  c #435480",
+"y  c #466197",
+"u  c #456199",
+"i  c #4C6395",
+"p  c #516697",
+"a  c #506799",
+"s  c #536898",
+"d  c #4162A5",
+"f  c #4164AB",
+"g  c #4965A2",
+"h  c #4E6DAC",
+"j  c #456AB3",
+"k  c #486FB8",
+"l  c #4A72BC",
+"z  c #5170AB",
+"x  c #5F73A1",
+"c  c #5B7BB9",
+"v  c #6377A5",
+"b  c #677DAD",
+"n  c #6C7FAA",
+"m  c #607CB5",
+"M  c #4D76C2",
+"N  c #4F78C6",
+"B  c #527AC5",
+"V  c #527DCB",
+"C  c #597DC1",
+"Z  c #6D86BA",
+"A  c #7187B7",
+"S  c #7C8DB2",
+"D  c #788FBF",
+"F  c #7C92BC",
+"G  c #5C85CF",
+"H  c #5582D2",
+"J  c #5985D4",
+"K  c #5986D8",
+"L  c #5B88D6",
+"P  c #5B8ADB",
+"I  c #5D8DE1",
+"U  c #5F90E4",
+"Y  c #6385C5",
+"T  c #6185C8",
+"R  c #6B8AC6",
+"E  c #6B8DCC",
+"W  c #628DDC",
+"Q  c #6491DE",
+"!  c #6D91D4",
+"~  c #6994DF",
+"^  c #708DC6",
+"/  c #7590C4",
+"(  c #7492CB",
+")  c #7C92C1",
+"_  c #7B93CF",
+"`  c #7394D0",
+"'  c #7599DA",
+"]  c #7B9AD2",
+"[  c #7B9DDA",
+"{  c #6091E5",
+"}  c #6294EA",
+"|  c #6598EF",
+" . c #6996E4",
+".. c #6D99E5",
+"X. c #6E9BE8",
+"o. c #669AF2",
+"O. c #6A9EF6",
+"+. c #6A9FF9",
+"@. c #729BE3",
+"#. c #729FEC",
+"$. c #6CA3FE",
+"%. c #7AA3EA",
+"&. c #75A3F1",
+"*. c #76A9FF",
+"=. c #79ABFF",
+"-. c #8191B7",
+";. c #8495B9",
+":. c #9393B3",
+">. c #849CCC",
+",. c #8A9CC2",
+"<. c #80A1DE",
+"1. c #88A5DA",
+"2. c #8FAADC",
+"3. c #94A6CB",
+"4. c #94AAD3",
+"5. c #99ADD3",
+"6. c #9CB4DF",
+"7. c #80A8EC",
+"8. c #88AEEF",
+"9. c #84ADF2",
+"0. c #84B3FE",
+"q. c #8BB2F3",
+"w. c #8DB8FF",
+"e. c #92AEE0",
+"r. c #94B3E8",
+"t. c #99B2E0",
+"y. c #9AB6E9",
+"u. c #94BCFE",
+"i. c #9ABBF3",
+"p. c #99BEFB",
+"a. c #A3B6DB",
+"s. c #BBBBD4",
+"d. c #A8BFE8",
+"f. c #A3BFF0",
+"g. c #9BC1FF",
+"h. c #A8C1EE",
+"j. c #A7C8FF",
+"k. c #A9C4F2",
+"l. c #ADC8F7",
+"z. c #AACBFF",
+"x. c #B4C6E8",
+"c. c #B9C7E3",
+"v. c #BBCBEA",
+"b. c #B5CDF5",
+"n. c #BDD2F7",
+"m. c #B9D4FF",
+"M. c #CCCCDD",
+"N. c #C0D1F0",
+"B. c #C5DBFF",
+"V. c #CCDBF5",
+"C. c #D1E1FB",
+"Z. c #DDEAFF",
+"A. c #FEFEFF",
+"S. c None",
+/* pixels */
+"S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.*.0.g.w.*.S.S.S.S.S.",
+"S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.i.h.k.h.b.j.w.*.$.S.S.S.",
+"S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.q.n.V.c.N.[ r.=.&.$.S.S.S.",
+"S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.o.l.S F : 2.6.E &.} } $.S.S.",
+"S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S...t 1.y.s a 2.B @.K V $.S.S.",
+"S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.o.W : ] y <.y ! l ! V l $.S.S.",
+"S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.o.P z @.y h & B l E l f +.S.S.",
+"S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.{ H 8 0 V q 9 l k R j r | S.S.",
+"S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.V P 0 : 5 j M j / c q r U S.S.",
+"S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.N H H V M f g 4.r 7 k P S.S.",
+"S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.I G l l j 7 7 D ) 7 1 N S.S.S.",
+"S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.P W l 9 < 8 A 4.a 1 1 H S.S.S.",
+"S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.I W L V V Y R >.) 2 = f V S.S.S.",
+"S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.I W H V V Y ^ 5.6 = = V S.S.S.S.",
+"S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.P Q K V V C Y >.b > # r B S.S.S.S.",
+"S.S.S.S.S.S.S.S.S.S.S.S.S.S.U { W V V N C E ,., # < N S.S.S.S.S.",
+"S.S.S.S.S.S.S.S.S.S.S.S.S.U  .~ J V V M C 5.3 # + M S.S.S.S.S.S.",
+"S.S.S.S.S.S.S.S.S.S.S.S.} X.@.P V V N l 4.i % + q M S.S.S.S.S.S.",
+"S.S.S.S.S.S.S.S.S.S.S.| #.%. .J V B M ( v % + 4 M S.S.S.S.S.S.S.",
+"S.S.S.S.S.S.S.S.S.S.o.&.7. .P V V N ( S % + < N S.S.S.S.S.S.S.S.",
+"S.S.S.S.S.S.S.S.$.$.9.8.@.~ J V N ` -.* + # N S.S.S.S.S.S.S.S.S.",
+"S.S.S.S.S.$.=.w.u.i.q.%. .P V V ] ;.* + # k S.S.S.S.S.S.S.S.S.S.",
+"S.S.S.$.p.g.k.x m q.%...P J J t.n * + , l S.S.S.S.S.S.S.S.S.S.S.",
+"S.S.m.z.s 6 1 < < k } P J ' a.i * + 1 V S.S.S.S.S.S.S.S.S.S.S.S.",
+"S.$.B.B.) o < < 2 k I  .d.,.3 * + q V S.S.S.S.S.S.S.S.S.S.S.S.S.",
+"S.$.w.A.Z.Z B ..9.h.x.4.y , * = N K S.S.S.S.S.S.S.S.S.S.S.S.S.S.",
+"S.$.$.p.C.V.V.c.5.c 0 7 < * r K P S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.",
+"S.S.$.$.} H V l f q 2 < r P } S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.",
+"S.S.s._ } U V N l j V O.+.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.",
+"S.M.:.$ . w $.$.$.$.$.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.",
+"S.:.; . . S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.",
+"S.S.X . S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S."
+};

Added: trunk/packages/kdepim/debian/icons/kalarm-16.xpm
===================================================================
--- trunk/packages/kdepim/debian/icons/kalarm-16.xpm	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/icons/kalarm-16.xpm	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,191 @@
+/* XPM */
+static char *kalarm-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 169 2",
+"   c black",
+".  c gray20",
+"X  c gray25",
+"o  c gray35",
+"O  c gray36",
+"+  c #656565",
+"@  c gray45",
+"#  c #7B7B7B",
+"$  c #8D3800",
+"%  c #8E3900",
+"&  c #974202",
+"*  c #9B4400",
+"=  c #9A4B08",
+"-  c #984B10",
+";  c #A34B00",
+":  c #A44C00",
+">  c #A74F00",
+",  c #AA5100",
+"<  c #AF5500",
+"1  c #B05600",
+"2  c #B05900",
+"3  c #B25A01",
+"4  c #B35C00",
+"5  c #B45900",
+"6  c #A76700",
+"7  c #AD6100",
+"8  c #AE6914",
+"9  c #B36200",
+"0  c #B66700",
+"q  c #B16009",
+"w  c #BB6707",
+"e  c #BC6A00",
+"r  c #BF6C10",
+"t  c #B37A00",
+"y  c #BC700E",
+"u  c #BF710C",
+"i  c #BC7820",
+"p  c #B37836",
+"a  c #AA744B",
+"s  c #B37943",
+"d  c #C26700",
+"f  c #C36600",
+"g  c #C66D00",
+"h  c #C96C00",
+"j  c #CD6E00",
+"k  c #CF6E00",
+"l  c #CC7700",
+"z  c #C97408",
+"x  c #CA7C0E",
+"c  c #CD7910",
+"v  c #D27300",
+"b  c #D27400",
+"n  c #D47500",
+"m  c #D47600",
+"M  c #D47A00",
+"N  c #B78B05",
+"B  c #BE9376",
+"V  c #BF9472",
+"C  c #C08805",
+"Z  c #C98900",
+"A  c #C98113",
+"S  c #CD8A19",
+"D  c #C49300",
+"F  c #C79D00",
+"G  c #CC901B",
+"H  c #D68C0E",
+"J  c #DB8304",
+"K  c #DA8405",
+"L  c #D79012",
+"P  c #C98528",
+"I  c #CA8A3F",
+"U  c #CD9525",
+"Y  c #D69D2D",
+"T  c #D09B39",
+"R  c #D4A500",
+"E  c #D9B600",
+"W  c #DFA423",
+"Q  c #DAA62B",
+"!  c #E28500",
+"~  c #E38800",
+"^  c #E58D02",
+"/  c #E7950D",
+"(  c #EA990C",
+")  c #E49710",
+"_  c #F89B00",
+"`  c #EBA100",
+"'  c #EBA500",
+"]  c #EAA815",
+"[  c #FFAB0A",
+"{  c #FDB100",
+"}  c #FFB502",
+"|  c #FFB414",
+" . c #FFBC1D",
+".. c #E4AF2C",
+"X. c #CC954D",
+"o. c #CDA355",
+"O. c #DBB744",
+"+. c #CDA165",
+"@. c #CEA56C",
+"#. c #DDA761",
+"$. c #E1A447",
+"%. c #E5B859",
+"&. c #DBC100",
+"*. c #DAC300",
+"=. c #DCC100",
+"-. c #E0CF00",
+";. c #FFC500",
+":. c #FFD600",
+">. c #FFDC00",
+",. c #F5C02C",
+"<. c #F8C32C",
+"1. c #FFC729",
+"2. c #FFC92B",
+"3. c #F2C535",
+"4. c #FFD539",
+"5. c #FFD639",
+"6. c #FFD93D",
+"7. c #EBE500",
+"8. c #FFE600",
+"9. c #FFF300",
+"0. c #FFF400",
+"q. c #FFFE00",
+"w. c yellow",
+"e. c #EACD4C",
+"r. c #EACE51",
+"t. c #F1CD41",
+"y. c #F3D258",
+"u. c #EEC565",
+"i. c #EAD166",
+"p. c #FFE044",
+"a. c #FFE247",
+"s. c #FFE74C",
+"d. c #FFE84E",
+"f. c #FFEE57",
+"g. c #FFEF59",
+"h. c #FFF05F",
+"j. c #FFF063",
+"k. c gray65",
+"l. c #ACACAC",
+"z. c #B4B4B4",
+"x. c gray",
+"c. c #CDA280",
+"v. c #DAB285",
+"b. c #DAC8B5",
+"n. c #E4C19D",
+"m. c #E1C3A0",
+"M. c #E2CDBF",
+"N. c #FFF484",
+"B. c #FFF699",
+"V. c #C5C5C5",
+"C. c gray80",
+"Z. c #EADACF",
+"A. c #E3DDDA",
+"S. c #E1E1E1",
+"D. c gray89",
+"F. c #E6E6E6",
+"G. c #EFE9E6",
+"H. c gray91",
+"J. c gray92",
+"K. c #ECECEC",
+"L. c #EEEEEE",
+"P. c gray94",
+"I. c gray95",
+"U. c gray96",
+"Y. c #F8F8F8",
+"T. c gray98",
+"R. c #FDFDFD",
+"E. c gray100",
+"W. c None",
+/* pixels */
+"W.W.$ 8 O.o.- W.W.W.W.W.W.W.W.W.",
+"W.W.y 5.d.j.r.$ $ $ $ s p $ W.W.",
+"W.> ) 1.p...C E &.6 i.B.N.e.= W.",
+"W.1 J / K ' >.9.w.N g.g.g.d.U W.",
+"W.$ 3 ^ M g m _ ;.-.G a.p.6.W W.",
+"W.& ( a A.T.K.@.c { *.L <.2.x W.",
+"W.y i O C.E.E.E.Z.r { 7.E R * W.",
+"W.A @.o X I.E.k.l.M.! >.w.w.t W.",
+"W.S +.E.# @ F.. z.Y.I } w.w.F W.",
+"W.3 T E.E.@ . V.U.P.B [ w.w.D W.",
+"W., Q v.E.x.+ K.L.H.V | 9.9.7 W.",
+"W.W.w Y n.U.P.J.F.S.P  .8.Z > W.",
+"W.W.2 z %.#.m.F.b.X.,.] e < W.W.",
+"W.W.j ! f $.u.y.t.3.H 0 9 W.W.W.",
+"W.W.f g W.b b b b 4 ` l * W.W.W.",
+"W.W.W.W.W.W.W.W.W.3 b j ; W.W.W."
+};

Added: trunk/packages/kdepim/debian/icons/kalarm.xpm
===================================================================
--- trunk/packages/kdepim/debian/icons/kalarm.xpm	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/icons/kalarm.xpm	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,276 @@
+/* XPM */
+static char *kalarm[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 238 2",
+"   c black",
+".  c gray20",
+"X  c #3D3D3D",
+"o  c gray25",
+"O  c #555555",
+"+  c gray35",
+"@  c #646464",
+"#  c #7C7C7C",
+"$  c #8D3800",
+"%  c #953F00",
+"&  c #954300",
+"*  c #96470D",
+"=  c #9B4400",
+"-  c #9D4F09",
+";  c #974A12",
+":  c #9D520C",
+">  c #9E6538",
+",  c #A34C00",
+"<  c #A25202",
+"1  c #AB5200",
+"2  c #A85900",
+"3  c #AD5D09",
+"4  c #A45D18",
+"5  c #AA5810",
+"6  c #B05600",
+"7  c #B45B00",
+"8  c #BB5E00",
+"9  c #B15F10",
+"0  c #A06000",
+"q  c #AC6C00",
+"w  c #AE7400",
+"e  c #B26007",
+"r  c #B1630B",
+"t  c #B76F0E",
+"y  c #BB6300",
+"u  c #BA670B",
+"i  c #BE6806",
+"p  c #B86C0E",
+"a  c #B17600",
+"s  c #B17800",
+"d  c #B87200",
+"f  c #BE7904",
+"g  c #B2711C",
+"h  c #BE7B13",
+"j  c #BF7D18",
+"k  c #AF6820",
+"l  c #A56434",
+"z  c #B2712B",
+"x  c #B87E2C",
+"c  c #B57D3B",
+"v  c #BC7730",
+"b  c #996A4A",
+"n  c #B67B4E",
+"m  c #C36500",
+"M  c #C26801",
+"N  c #C46E08",
+"B  c #CB6C00",
+"V  c #C67205",
+"C  c #C57A00",
+"Z  c #CC7200",
+"A  c #C9730A",
+"S  c #CD7D0A",
+"D  c #D27400",
+"F  c #D47B02",
+"G  c #D17A0B",
+"H  c #DB7600",
+"J  c #E47D00",
+"K  c #B88300",
+"L  c #BC801F",
+"P  c #BB9500",
+"I  c #BF892A",
+"U  c #9F806B",
+"Y  c #B88040",
+"T  c #B78767",
+"R  c #BA8962",
+"E  c #BD9273",
+"W  c #CD8302",
+"Q  c #C78419",
+"!  c #CD8514",
+"~  c #C88519",
+"^  c #CA881A",
+"/  c #C69C00",
+"(  c #D38402",
+")  c #D4830A",
+"_  c #D48C01",
+"`  c #DB8302",
+"'  c #D18612",
+"]  c #D48C14",
+"[  c #D08F1A",
+"{  c #DB8B11",
+"}  c #D59700",
+"|  c #D99202",
+" . c #D99B00",
+".. c #DE9312",
+"X. c #DF941C",
+"o. c #C78327",
+"O. c #C5842E",
+"+. c #C88436",
+"@. c #CE8837",
+"#. c #CD9423",
+"$. c #CD9A2A",
+"%. c #DC9E20",
+"&. c #D7953C",
+"*. c #CCAA00",
+"=. c #CDB700",
+"-. c #DEAE00",
+";. c #D5B200",
+":. c #D9B600",
+">. c #D4AB37",
+",. c #DDAE30",
+"<. c #E18500",
+"1. c #E58B01",
+"2. c #EB990B",
+"3. c #E19D1B",
+"4. c #E89F16",
+"5. c #F19600",
+"6. c #F39A02",
+"7. c #FB9200",
+"8. c #FA9B00",
+"9. c #E0AC00",
+"0. c #E4A21D",
+"q. c #EBA81D",
+"w. c #E0BE00",
+"e. c #F1AE00",
+"r. c #FEA200",
+"t. c #F8A60B",
+"y. c #FFAA01",
+"u. c #FFAD0C",
+"i. c #FFB300",
+"p. c #FDB314",
+"a. c #FEBA1B",
+"s. c #E1A322",
+"d. c #E3AD2C",
+"f. c #E5B42F",
+"g. c #ECB62C",
+"h. c #E7B138",
+"j. c #E5BF3B",
+"k. c #EABC34",
+"l. c #FFBF20",
+"z. c #C69642",
+"x. c #C99052",
+"c. c #C69960",
+"v. c #C79F7C",
+"b. c #DFA24A",
+"n. c #DBA050",
+"m. c #DBBA66",
+"M. c #E2A549",
+"N. c #E8B343",
+"B. c #D5C400",
+"V. c #DBC100",
+"C. c #D8D200",
+"Z. c #DBDB00",
+"A. c #E4D300",
+"S. c #F6CB00",
+"D. c #FFC500",
+"F. c #FECA00",
+"G. c #FFC119",
+"H. c #FFCD11",
+"J. c #FFDC00",
+"K. c #E8C13D",
+"L. c #FFC325",
+"P. c #FDC428",
+"I. c #FFC92B",
+"U. c #FECD31",
+"Y. c #FFD134",
+"T. c #FFD639",
+"R. c #FFD93D",
+"E. c #E4E400",
+"W. c #ECEC00",
+"Q. c #FFE201",
+"!. c #FFEA00",
+"~. c #F4F400",
+"^. c #FEF300",
+"/. c #FEFE00",
+"(. c #F5D341",
+"). c #FDDC42",
+"_. c #F2D758",
+"`. c #F6DE53",
+"'. c #ECC46E",
+"]. c #EDCB73",
+"[. c #F2D761",
+"{. c #F3D96F",
+"}. c #F4DB78",
+"|. c #FFE045",
+" X c #FEE44A",
+".X c #FFE94E",
+"XX c #F8E65C",
+"oX c #FFED53",
+"OX c #FFEF59",
+"+X c #FFF05B",
+"@X c #FFF163",
+"#X c #FFF26B",
+"$X c #FFF374",
+"%X c #FFF37C",
+"&X c #828282",
+"*X c #909090",
+"=X c gray60",
+"-X c #AF9F94",
+";X c gray64",
+":X c #AEAEAE",
+">X c #B3AEAA",
+",X c gray72",
+"<X c #C5A48B",
+"1X c #C6AB9A",
+"2X c #CFB396",
+"3X c #DEBA90",
+"4X c #D1B6A5",
+"5X c #D6BFA5",
+"6X c #DBC1AF",
+"7X c #DFC9B5",
+"8X c #E3C888",
+"9X c #E3CA98",
+"0X c #F6DE80",
+"qX c #F7DF8A",
+"wX c #E6CFB4",
+"eX c #F8E985",
+"rX c #F8EB97",
+"tX c #FFF482",
+"yX c #FFF591",
+"uX c #FFF69B",
+"iX c #FFF7A2",
+"pX c #FFF7A8",
+"aX c #FCF1BA",
+"sX c #FFF8B2",
+"dX c #CBCBCB",
+"fX c gray83",
+"gX c #DED9D5",
+"hX c #DCDCDC",
+"jX c #E1D5C7",
+"kX c #E2D2C8",
+"lX c #EADACF",
+"zX c #E4E4E4",
+"xX c #EBEBEB",
+"cX c #F3EDE6",
+"vX c #F8F3ED",
+"bX c #F3F3F3",
+"nX c #FEFEFE",
+"mX c None",
+/* pixels */
+"mXmXmXmXmXmX$ : I z.Y ; $ mXmXmXmXmXmXmXmXmXmXmXmXmXmXmXmXmXmXmX",
+"mXmXmXmXmX$ #. XOX$XyXrXz $ mXmXmXmXmXmXmXmXmXmXmXmXmXmXmXmXmXmX",
+"mXmXmXmX& [ T.|.oXOX#X$X#Xg $ mXmXmXmXmXmX$ $ $ $ $ mXmXmXmXmXmX",
+"mXmXmXmX7 L.Y.R.|..XoXOXOXL $ $ $ $ mX$ ; x.9X8Xm.I $ mXmXmXmXmX",
+"mXmXmX, ) l.I.Y.R.|.|.).h s / / / s & 4 eXiXpXuXtX#X>.$ mXmXmXmX",
+"mXmXmX1 2.a.L.P.I.Y.s.f A./././././.w XX$X%XtX%X#XOXoX$.$ mXmXmX",
+"mXmXmX7 ` p.p.a.0.W :.~./././././.~.0 OX+X@X@X@XOXoX.X).- mXmXmX",
+"mXmXmXmXD 1.F B 1.8.r.r.i.F.^././.~.P K.oXOXoXoX.X.X|.R.j mXmXmX",
+"mXmXmXmX= < ` r.r.r.r.r.r.r.8.D.^./.C.t ). X X X|.).R.Y.^ mXmXmX",
+"mXmXmX$ = t.y.6.y k z z u F r.r.r.J.W.=.~ ).).).R.T.Y.I.! mXmXmX",
+"mXmX$ & t.u.V b >XfXzXxXhX1Xl F r.r.F.E.*.' U.Y.Y.Y.I.L.7 mXmXmX",
+"mXmX$ ) g.S n dXnXnXnXnXnXnXnX4Xr 8.r.D.E.B.W q.I.L.L...1 mXmXmX",
+"mXmX$ p.p.> ;XdXnXnXnXnXnXnXnXnXlX5 6.r.J.W.Z.;._ ) F , mXmXmXmX",
+"mXmX< a.^ -X@ . ;XnXnXnXnXnXnXnXnXlX9 r.y.^./.~.E.E.W.K $ mXmXmX",
+"mXmX3 L.p dX@ . X gXnXnXnXnXbX=XdXnX6XZ r.D./././././.V.$ mXmXmX",
+"mXmXr I.c hXxXO . + nXnXnXnX# . *XnXnXn 8.r.^././././.~.$ mXmXmX",
+"mXmX9 U.g hXnXxXO . =XnXnXhX. . :XnXbXkXD r.F./././././.& mXmXmX",
+"mXmX= Y.~ gXnXnXxX+ . gXnX@ . ;XbXbXbXbXv t.i./././././.q mXmXmX",
+"mXmX, d.f.<XnXnXnXbX+ X o X ;XbXbXbXbXxXT u.r./././././.< mXmXmX",
+"mXmX, ~ ).c nXnXnXnXdX. . @ bXbXbXbXxXxXE p.u.!././././.& mXmXmX",
+"mXmXmX1 (.,.wXnXnXnXzX. . # bXbXxXxXxXzXE p.p.Q./.^.^.w.= mXmXmX",
+"mXmXmX1 ~ oXO.vXnXnXnX,X&XhXbXxXxXxXzXzXR a.p.J.!.^.!.d = mXmXmX",
+"mXmXmXmX6 j.`.O.nXnXbXbXbXxXxXxXzXzXzXhXo.G.a.Q.!.Q.-., mXmXmXmX",
+"mXmXmXmX7 i _.[.+.cXbXbXxXxXxXzXzXhXhXv.0.L.G.Q.Q.9.1 , mXmXmXmX",
+"mXmXmXmX1 2 N {.}.&.wXxXxXzXzXzXhXhX2X! I.P.H.S.W 1 1 mXmXmXmXmX",
+"mXmXmXmX6 1._ A ].sX'.n.3XkXhXhX6Xx.%.T.Y.P.| y 2 mXmXmXmXmXmXmX",
+"mXmXmXmXm 7.5._ M M.aXsX0XN.h.d.k.).|.T.3.M C  .1 mXmXmXmXmXmXmX",
+"mXmXmXmX8 J 7.B 2 Z G M.qXyX%X@XOX|.g.S W } < y 1 mXmXmXmXmXmXmX",
+"mXmXmXmXM m B B mXmXmXD D D X.X.{ Z y } e.i.e = mXmXmXmXmXmXmXmX",
+"mXmXmXmXmXmXmXmXmXmXmXmXmXmXmXmXmXmX= ( y.r.` = mXmXmXmXmXmXmXmX",
+"mXmXmXmXmXmXmXmXmXmXmXmXmXmXmXmXmXmXmXM 8.8.J , mXmXmXmXmXmXmXmX",
+"mXmXmXmXmXmXmXmXmXmXmXmXmXmXmXmXmXmXmXy B H 8 1 mXmXmXmXmXmXmXmX"
+};

Added: trunk/packages/kdepim/debian/icons/karm-16.xpm
===================================================================
--- trunk/packages/kdepim/debian/icons/karm-16.xpm	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/icons/karm-16.xpm	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,159 @@
+/* XPM */
+static char *karm-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 137 2",
+"   c black",
+".  c gray3",
+"X  c #090909",
+"o  c gray5",
+"O  c #191919",
+"+  c gray23",
+"@  c #414141",
+"#  c gray28",
+"$  c #484848",
+"%  c #4B4B4B",
+"&  c #4C4C4C",
+"*  c gray30",
+"=  c #4E4E4E",
+"-  c #505050",
+";  c gray32",
+":  c #565656",
+">  c #5A5A5A",
+",  c #5B5B5B",
+"<  c #5D5D5D",
+"1  c #654D75",
+"2  c #606060",
+"3  c gray39",
+"4  c #656565",
+"5  c #686868",
+"6  c #6C6C6C",
+"7  c gray43",
+"8  c #797979",
+"9  c gray48",
+"0  c #6170A3",
+"q  c #6B78AC",
+"w  c #697CB9",
+"e  c #4469E0",
+"r  c #496EE1",
+"t  c #4E73E2",
+"y  c #5177E4",
+"u  c #567DE6",
+"i  c #6079D6",
+"p  c #788CBE",
+"a  c #5C83E8",
+"s  c #6189EB",
+"d  c #6890ED",
+"f  c #7297ED",
+"g  c #7993E8",
+"h  c #7BA6F5",
+"j  c #AB534B",
+"k  c #F8534B",
+"l  c #E06864",
+"z  c #848484",
+"x  c #868686",
+"c  c #898989",
+"v  c #8B8B8B",
+"b  c gray55",
+"n  c #8D8D8D",
+"m  c #8E8E8E",
+"M  c gray56",
+"N  c #909090",
+"B  c #929292",
+"V  c #959595",
+"C  c gray59",
+"Z  c #8B98BD",
+"A  c #B58080",
+"S  c #A0A0A0",
+"D  c #A2A2A2",
+"F  c #A7A7A7",
+"G  c gray66",
+"H  c #AAAAAA",
+"J  c gray67",
+"K  c #AEAEAE",
+"L  c #B1B1B1",
+"P  c #B0B5B9",
+"I  c #B9B9B9",
+"U  c #859CCA",
+"Y  c #869AD5",
+"T  c #9BACC8",
+"R  c #93A8DA",
+"E  c #8DA7EE",
+"W  c #8BAEE2",
+"Q  c #81ABF6",
+"!  c #86A9F2",
+"~  c #91B9F9",
+"^  c #9BB5F2",
+"/  c #A3BDE2",
+"(  c #A7B9F1",
+")  c #A4BFF6",
+"_  c #A8BDF3",
+"`  c #ABBEF2",
+"'  c #B9C8D8",
+"]  c #A7C3F7",
+"[  c #B2C9F7",
+"{  c #B6CCF8",
+"}  c #BBCBF5",
+"|  c #BBD1F9",
+" . c #BED5FB",
+".. c #FE8D8D",
+"X. c #FEB1B1",
+"o. c gray76",
+"O. c gray77",
+"+. c #C5C5C5",
+"@. c gray79",
+"#. c #CACACA",
+"$. c gray80",
+"%. c #D0D0D0",
+"&. c LightGray",
+"*. c gray84",
+"=. c #D7D6D6",
+"-. c #D7D7D7",
+";. c #D8D8D8",
+":. c #DDDDDD",
+">. c #C8D2E0",
+",. c #C8D3E3",
+"<. c #CAD7F8",
+"1. c #DBDDE0",
+"2. c #D3E2FC",
+"3. c #D1E4FE",
+"4. c #D6E8FE",
+"5. c #DBE7F7",
+"6. c gray88",
+"7. c gray89",
+"8. c #E4E3E3",
+"9. c gray92",
+"0. c #E1EEFE",
+"q. c #E4EDFC",
+"w. c #E4F1FE",
+"e. c #E7F2FE",
+"r. c #EDF6FE",
+"t. c #EEF6FE",
+"y. c #FEEBEB",
+"u. c #F1F1F1",
+"i. c gray95",
+"p. c #F5F9FE",
+"a. c #FBFBFB",
+"s. c #F9FCFE",
+"d. c #FBFCFE",
+"f. c #FDFDFE",
+"g. c #FEFEFE",
+"h. c gray100",
+"j. c None",
+/* pixels */
+"j.j.j.g.) T  .| { [ f j.j.j.j.j.",
+"j.j.s.r.R =.g.g.g.g.^ j.j.j.j.j.",
+"j.g.e.0.Y 7.g.g.g.g._ j.j.j.j.j.",
+"g.s.e.r.i #.g.g.g.g.E j.j.j.j.j.",
+"W U p w q #.7.%.F %.Z o j.j.j.j.",
+"/ 7.7.i.a.$.x 5 $ @ $ : ; j.j.j.",
+"~ g.g.g.%.7 > O B . O.> > 4 j.j.",
+"Q 2.g.i.S - 5 L -.g.g.& C < ; j.",
+"h ] p.:.B $ & g.X.y.K D > 7 3 j.",
+"j.! p.,.3 B g.g...l c g.g.F 9 j.",
+"j.d q.,.9 . g.C 7 1 :.g.-.+ c j.",
+"j.s <.5.z C O.g.g.X...g.9.-.B j.",
+"j.a _ 4.P > v g.g.g.k g.> D c j.",
+"j.u } 3.' F O.+ g.L X.j -.O.$ j.",
+"j.y ` ( g 0 I v -.< :.A #.7 j.j.",
+"j.t r e j.j.& F F -.I K & j.j.j."
+};

Added: trunk/packages/kdepim/debian/icons/karm.xpm
===================================================================
--- trunk/packages/kdepim/debian/icons/karm.xpm	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/icons/karm.xpm	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,183 @@
+/* XPM */
+static char *karm[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 145 2",
+"   c black",
+".  c #0C0C0C",
+"X  c #131313",
+"o  c #1E1E1E",
+"O  c gray13",
+"+  c gray17",
+"@  c #353535",
+"#  c #3B3B3B",
+"$  c #14387B",
+"%  c #2C3966",
+"&  c #492C6E",
+"*  c #454545",
+"=  c #4B4B4B",
+"-  c #545454",
+";  c #5C5C5C",
+":  c #464E65",
+">  c #656565",
+",  c #626368",
+"<  c #6C6C6C",
+"1  c #6F7376",
+"2  c #757575",
+"3  c #777A7D",
+"4  c #7C7C7C",
+"5  c #3A5EDB",
+"6  c #3E62DC",
+"7  c #465EBE",
+"8  c #5C7293",
+"9  c #4F65BC",
+"0  c #556DA1",
+"q  c #576EBC",
+"w  c #61799C",
+"e  c #6E79A8",
+"r  c #6274B6",
+"t  c #687AB8",
+"y  c #4B65C8",
+"u  c #4266DD",
+"i  c #4469DE",
+"p  c #4A6EDB",
+"a  c #506DDD",
+"s  c #5570CB",
+"d  c #476CE0",
+"f  c #4A6FE1",
+"g  c #4E74E2",
+"h  c #5075E3",
+"j  c #547AE4",
+"k  c #587FE7",
+"l  c #607CCF",
+"z  c #7F8188",
+"x  c #6E81BB",
+"c  c #7487BD",
+"v  c #7A8FBF",
+"b  c #5A81E7",
+"n  c #5C84E8",
+"m  c #6A87D3",
+"M  c #7492D7",
+"N  c #6484E4",
+"B  c #6087E9",
+"V  c #638BEB",
+"C  c #6B92EC",
+"Z  c #6E98F0",
+"A  c #7594E9",
+"S  c #7995E8",
+"D  c #7B9BEC",
+"F  c #739BF1",
+"G  c #76A0F2",
+"H  c #79A4F4",
+"J  c #7FA9F6",
+"K  c #AB1913",
+"L  c #8D6B6B",
+"P  c #FB0A08",
+"I  c #FE1F1F",
+"U  c #FE4B4B",
+"Y  c #F8746B",
+"T  c #828282",
+"R  c #8C8C8C",
+"E  c #818D9A",
+"W  c #939394",
+"Q  c #989797",
+"!  c #9B9B9B",
+"~  c #A3A3A3",
+"^  c #AAAAAA",
+"/  c #B3B2B2",
+"(  c #BBBBBB",
+")  c #838DC2",
+"_  c #809FED",
+"`  c #81A0DB",
+"'  c #83A1ED",
+"]  c #8BAEE6",
+"[  c #86A5F0",
+"{  c #82AEF7",
+"}  c #8EABF0",
+"|  c #85B1F8",
+" . c #88B3F9",
+".. c #8CB8FB",
+"X. c #94A9EC",
+"o. c #98ACED",
+"O. c #93AEF0",
+"+. c #90BCFC",
+"@. c #9EB2F0",
+"#. c #9AB8F5",
+"$. c #AAB5C0",
+"%. c #AFBCDE",
+"&. c #B2BCC8",
+"*. c #A3B8F1",
+"=. c #93C0FD",
+"-. c #B6C2D0",
+";. c #BCC8D7",
+":. c #A3C2F7",
+">. c #A3C2F8",
+",. c #AEC4F5",
+"<. c #ACCBFB",
+"1. c #BBCAF5",
+"2. c #B1D3FE",
+"3. c #B8D6FE",
+"4. c #FE8D8D",
+"5. c #FEB1B1",
+"6. c #F8BCB1",
+"7. c #C2C2C2",
+"8. c #CACACA",
+"9. c #D4D4D4",
+"0. c #DBDBDB",
+"q. c #C5D6ED",
+"w. c #C6DEFE",
+"e. c #CBD6F6",
+"r. c #C8D8F9",
+"t. c #D1DBE7",
+"y. c #D0DEF9",
+"u. c #CBE1FE",
+"i. c #D7E1ED",
+"p. c #D4E3FB",
+"a. c #D6E8FE",
+"s. c #D8E4FB",
+"d. c #DCEBFD",
+"f. c #FED7D7",
+"g. c #E3E3E3",
+"h. c #ECECEC",
+"j. c #E2EDFD",
+"k. c #E4F0FE",
+"l. c #EBF3FE",
+"z. c #FBF0EB",
+"x. c #F3F3F3",
+"c. c #F1F5FD",
+"v. c #F5F9FD",
+"b. c #FEFEFE",
+"n. c None",
+/* pixels */
+"n.n.n.n.n.n.n.n.n.:.Z 8 | { J H G F Z Z C V V n.n.n.n.n.n.n.n.n.",
+"n.n.n.n.n.n.n.n.b.p.M ~ b.b.b.b.b.b.j.s.s.[ B n.n.n.n.n.n.n.n.n.",
+"n.n.n.n.n.n.v.j.v.,.v / b.b.b.b.b.b.b.b.b.} n n.n.n.n.n.n.n.n.n.",
+"n.n.n.n.n.b.l.d.v.X.c 8.b.b.b.b.b.b.b.b.b.' n.n.n.n.n.n.n.n.n.n.",
+"n.n.n.n.b.v.d.w.b.S x 8.b.b.b.b.b.b.b.b.b.D n.n.n.n.n.n.n.n.n.n.",
+"n.n.n.k.v.j.u.2.b.S t 8.b.b.b.b.b.b.b.b.b.D n.n.n.n.n.n.n.n.n.n.",
+"n.n.w.v.v.k.d.a.b.X.r ^ b.b.b.b.b.b.b.b.b.' j n.n.n.n.n.n.n.n.n.",
+"n.3.d.d.s.p.1.@.o.a 7 ^ b.b.b.b.b.b.b.b.b.*.g n.n.n.n.n.n.n.n.n.",
+"n.=.] ` M m s s y 9 e Q b.b.h.0.9.7.7.8.9.%.p n.n.n.n.n.n.n.n.n.",
+"n.w W Q Q Q ^ / / / / ( x.9.( 7.R T 2 < 3 , : # . n.n.n.n.n.n.n.",
+"n...p.b.b.b.b.b.b.b.b.g.7.( R < < - ; = = - - ; ; = . n.n.n.n.n.",
+"n...<.b.b.b.b.b.b.b.g.7./ < < - - 4 2 < # Q 4 - - ; ; @ n.n.n.n.",
+"n. .| b.b.b.b.b.b.x.( / 2 < - + ~ 9.9.; O 9.b.( < = ; > @ n.n.n.",
+"n.n.{ p.b.b.b.b.b.8.7.< < - 7.= R / b.R < 9.b.R ~ ~ - > - . n.n.",
+"n.n.J >.b.b.b.b.x.7.R 2 = / 9./ 0.9.b.b.b.b.b.9.+ 8.9.; < = n.n.",
+"n.n.J H c.b.b.b.0.7.< < + # # b.b.b.b.b.b.b.b.3 ! b.# 2 > < . n.",
+"n.n.n.H r.b.v.b.9.R T ; ~ ; # b.b.b.5.z.b.b.R T b.b.o 7.< 4 * n.",
+"n.n.n.F #.b.l.k.&.3 T 4 b.b.b.b.b.b.I Y b.^ > b.b.h./ h.^ T - n.",
+"n.n.n.C F b.l.k./ 1 T ( b.b.b.b.b.b.4.P 9.- h.b.b.b.b.b.9.4 > n.",
+"n.n.n.n.C p.v.j.-.1 4 ; + b.b.b.b.b.7.) 0 ( b.b.b.b.9.X 9.4 T . ",
+"n.n.n.n.V ,.b.d.;.L R ;   b.b./ - @ ; $ & h.b.b.b.b.0.o 7.R R . ",
+"n.n.n.n.V [ b.d.t.8 Q 8.b.b.b.9.9.b.b.b.U 6.b.b.b.b.b.b.g.Q < n.",
+"n.n.n.n.n D b.j.k.4 / T 7.~ b.b.b.b.b.b.f.U b.b.b.b.b.b.7.^ < n.",
+"n.n.n.n.n b b.j.d.~ / T < # b.b.b.b.b.b.b.U f.b.b.b.+ b.^ ( - n.",
+"n.n.n.n.b k b.d.p.q.R ~ < 8 b.b.b.b.b.b.b.f.U b.b.7.X / / ~ o n.",
+"n.n.n.n.k j b.d.u.u.z 9.W h.b.R < b.b.b.b.b.U L / b.v.^ 9.; n.n.",
+"n.n.n.n.j C b.d.a.d.i.R g.T z.R / b.b.! 7.b.f.K R x.( 0.Q . n.n.",
+"n.n.n.n.j S b.b.c.e.o.q T 9.W 4 b.b.b.X < b.b.Y Q ( g.! O n.n.n.",
+"n.n.n.n.g j A N u u 6 5 % 3 0.8.^ 7.g.R 7.x.9.7.8.h.Q O n.n.n.n.",
+"n.n.n.n.g f i u u n.n.n.n.. * ~ h.g.9./ / 9.g.h.( > . n.n.n.n.n.",
+"n.n.n.n.n.n.n.n.n.n.n.n.n.n.n.. # 4 T / / Q T = o n.n.n.n.n.n.n.",
+"n.n.n.n.n.n.n.n.n.n.n.n.n.n.n.n.n.n.n.n.n.n.n.n.n.n.n.n.n.n.n.n."
+};

Added: trunk/packages/kdepim/debian/icons/kmail-16.xpm
===================================================================
--- trunk/packages/kdepim/debian/icons/kmail-16.xpm	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/icons/kmail-16.xpm	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,257 @@
+/* XPM */
+static char *kmail-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 235 2",
+"   c #010101",
+".  c #020202",
+"X  c gray1",
+"o  c #000004",
+"O  c #000307",
+"+  c #020105",
+"@  c #040304",
+"#  c #060505",
+"$  c #070504",
+"%  c #020208",
+"&  c #05080F",
+"*  c #080A0D",
+"=  c #080A0E",
+"-  c #0A090C",
+";  c #0A090E",
+":  c #0E0C0B",
+">  c #0F0C0B",
+",  c #0E0C0C",
+"<  c #0F0D0D",
+"1  c #070911",
+"2  c #060B11",
+"3  c #070C10",
+"4  c #070C12",
+"5  c #070D12",
+"6  c #0B0C10",
+"7  c #0B0D10",
+"8  c #0E0E11",
+"9  c #110F0D",
+"0  c #100F0F",
+"q  c #110F0F",
+"w  c #121010",
+"e  c #131111",
+"r  c #131112",
+"t  c #131212",
+"y  c #141110",
+"u  c #151211",
+"i  c #141212",
+"p  c #171313",
+"a  c #151014",
+"s  c #161315",
+"d  c #171415",
+"f  c #11131D",
+"g  c #15161D",
+"h  c #191316",
+"j  c #181415",
+"k  c #1A1416",
+"l  c #1D1A1A",
+"z  c #1D1A1B",
+"x  c #171920",
+"c  c #181925",
+"v  c #1B1C2E",
+"b  c #1C1F28",
+"n  c #1D1E2F",
+"m  c #211D1C",
+"M  c #241F20",
+"N  c #353847",
+"B  c #442519",
+"V  c #482512",
+"C  c #4F2917",
+"Z  c #582208",
+"A  c #582308",
+"S  c #5A2608",
+"D  c #592B16",
+"F  c #603420",
+"G  c #664427",
+"H  c #66412C",
+"J  c #68492D",
+"K  c #6D5231",
+"L  c #7B5937",
+"P  c #464957",
+"I  c #58504C",
+"U  c #505267",
+"Y  c #5B5D62",
+"T  c #786042",
+"R  c #626271",
+"E  c #6E6D7E",
+"W  c #707073",
+"Q  c #7D7F87",
+"!  c #84400A",
+"~  c #825213",
+"^  c #975E01",
+"/  c #814B2E",
+"(  c #82562E",
+")  c #85532B",
+"_  c #85612C",
+"`  c #AA5201",
+"'  c #AF6B00",
+"]  c #AC6515",
+"[  c #BD6409",
+"{  c #C47400",
+"}  c #C37517",
+"|  c #D16413",
+" . c #DE6D1C",
+".. c #DA741C",
+"X. c #DF711C",
+"o. c #DF7E12",
+"O. c #C96427",
+"+. c #EF7B04",
+"@. c #E47316",
+"#. c #F67800",
+"$. c #F97B04",
+"%. c #BE8618",
+"&. c #968778",
+"*. c #C98106",
+"=. c #DD8116",
+"-. c #CC9732",
+";. c #D58F2D",
+":. c #D28C38",
+">. c #D58D3B",
+",. c #DE8B33",
+"<. c #E59A0D",
+"1. c #FF8500",
+"2. c #F88B00",
+"3. c #FF8E00",
+"4. c #FF9900",
+"5. c #FF9A00",
+"6. c #F49717",
+"7. c #F89413",
+"8. c #FF931F",
+"9. c #F68527",
+"0. c #F19322",
+"q. c #F19A2A",
+"w. c #FCA600",
+"e. c #F3A118",
+"r. c #FFB10A",
+"t. c #FFB50E",
+"y. c #E8A136",
+"u. c #F3AE2E",
+"i. c #FFB420",
+"p. c #FFB82A",
+"a. c #FFBC2C",
+"s. c #F9BD37",
+"d. c #CAA34A",
+"f. c #D4B678",
+"g. c #EEAB5D",
+"h. c #F6A742",
+"j. c #FFC530",
+"k. c #FFC33D",
+"l. c #FEC73E",
+"z. c #FFC140",
+"x. c #FEC741",
+"c. c #F9CE4C",
+"v. c #F3C25C",
+"b. c #FFD245",
+"n. c #FFD352",
+"m. c #F0CD67",
+"M. c #FBD770",
+"N. c #FFDA70",
+"B. c #FFE578",
+"V. c #9B8F83",
+"C. c #9A9AA0",
+"Z. c #9AA0AA",
+"A. c #B4A694",
+"S. c #A4A5A9",
+"D. c #AAABAA",
+"F. c #B7B7B7",
+"G. c #B3B4BA",
+"H. c #BBBAB8",
+"J. c gray73",
+"K. c gray",
+"L. c #BCBEC9",
+"P. c #DBB295",
+"I. c #CBBED6",
+"U. c #F0CE91",
+"Y. c #F9DB83",
+"T. c #E9CDA2",
+"R. c #EDCDAC",
+"E. c #EAD0B0",
+"W. c #FEE58E",
+"Q. c #FDF1B8",
+"!. c #C5C5C4",
+"~. c #C4C5CC",
+"^. c #CACAC9",
+"/. c #CACACA",
+"(. c #CBCBCB",
+"). c #CDCDCC",
+"_. c #CDC1D8",
+"`. c #CCCAD7",
+"'. c #D0C9C9",
+"]. c #D2D2D2",
+"[. c LightGray",
+"{. c #D4D4DA",
+"}. c #DADADA",
+"|. c #DDDDDC",
+" X c #DDDDDD",
+".X c #DFDFDE",
+"XX c #DAD2E1",
+"oX c #DBD3E1",
+"OX c #DDD5E4",
+"+X c #EFE7CC",
+"@X c #F7EDD2",
+"#X c gray88",
+"$X c #E1E2E1",
+"%X c #E3E2E4",
+"&X c #E4E4E4",
+"*X c #E6E6E6",
+"=X c #E7E7E8",
+"-X c #E6E8EA",
+";X c #E7E9ED",
+":X c #E8E8E7",
+">X c #ECE9E5",
+",X c #EAEAEA",
+"<X c #EBEAEA",
+"1X c gray92",
+"2X c #E9EBEF",
+"3X c #ECECEC",
+"4X c gray93",
+"5X c #EEECEF",
+"6X c #EFEFEF",
+"7X c #EDEFF3",
+"8X c #EFF5F6",
+"9X c #F0F0EF",
+"0X c gray94",
+"qX c #F1F1F1",
+"wX c #F0F0F2",
+"eX c #F1F1F3",
+"rX c #F2F1F3",
+"tX c gray95",
+"yX c #F3F2F2",
+"uX c #F3F3F3",
+"iX c #F3F6F7",
+"pX c gray96",
+"aX c #F6F5F6",
+"sX c #F8F8F9",
+"dX c #F8F9F8",
+"fX c #F9FBF9",
+"gX c gray98",
+"hX c #FBFBFB",
+"jX c #F8F9FC",
+"kX c #F8FFFF",
+"lX c #F9FEFF",
+"zX c #FDFFFF",
+"xX c #FEFFFF",
+"cX c gray100",
+"vX c None",
+/* pixels */
+"vXvXvXvXaXW I R.R.T.U.T vXvXvXvX",
+"vXvXvXOX%XrX'.P.@XQ.W.v.J 2 vXvX",
+"vXvXvXXX&XdXxXrX>X+XY.n.u.G & vX",
+"vXvXyXrX9XpXxXxXjX`.f.s.t.6.H 7 ",
+"vXvX4XaX6XaXsXrX3XA.d.m.x.a.>.a ",
+"vXiX*XrXrX,X1X8X{.( -.c.r.5...h ",
+"vX=X1XfX6X,X6X6XV.K ] e.2.$.O.h ",
+"8X=XrX4X}.|.4X~._ *.;.@.6.0.L 8 ",
+"Z.H.J.F.K.|.;X&.^ *.h.B.l.a.:.d ",
+"b D.%X^.[.=XL.) ' ` y.b.w.3.X.h ",
+"# Y .X^.[.$XE ! { } | 2.#.@./ t ",
+"vXg S.^.).G.n V [ <.h.9.8.q.K < ",
+"vXvXP F.!.R + + C =.N.B.j.i.,.s ",
+"vXvXf Q C.v $ @ . F g.k.5.1. .h ",
+"vXvXvXN U * : X . & B S A A D d ",
+"vXvXvXg c 9 : . vXvX& 5 5 5 = 0 "
+};

Added: trunk/packages/kdepim/debian/icons/kmail.xpm
===================================================================
--- trunk/packages/kdepim/debian/icons/kmail.xpm	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/icons/kmail.xpm	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,295 @@
+/* XPM */
+static char *kmail[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 257 2",
+"   c #080707",
+".  c #0C0A0B",
+"X  c gray2",
+"o  c #110F0F",
+"O  c #131011",
+"+  c #181516",
+"@  c #1A1718",
+"#  c #1C191A",
+"$  c #1B1828",
+"%  c #181727",
+"&  c #121A3D",
+"*  c #211D1E",
+"=  c #231F20",
+"-  c #31241E",
+";  c #342926",
+":  c #3C2B24",
+">  c #141F51",
+",  c #20265F",
+"<  c #203055",
+"1  c #323B4C",
+"2  c #333C57",
+"3  c #2A2C62",
+"4  c #222B66",
+"5  c #2C3860",
+"6  c #354877",
+"7  c #4A3630",
+"8  c #6C3100",
+"9  c #7B3E00",
+"0  c #443F75",
+"q  c #7D400B",
+"w  c #604C3E",
+"e  c #56585C",
+"r  c #444B65",
+"t  c #5B5D74",
+"y  c #6D484D",
+"u  c #6E574A",
+"i  c #705147",
+"p  c #7E604A",
+"a  c #7A6255",
+"s  c gray39",
+"d  c #79797A",
+"f  c #404E83",
+"g  c #485185",
+"h  c #6C6D82",
+"j  c #747181",
+"k  c #76758B",
+"l  c #787587",
+"z  c #767881",
+"x  c #903200",
+"c  c #A73500",
+"v  c #8E4601",
+"b  c #9D450C",
+"n  c #9F4C10",
+"m  c #974A1A",
+"M  c #8D4826",
+"N  c #835E2A",
+"B  c #994C27",
+"V  c #9C6602",
+"C  c #996B18",
+"Z  c #A95601",
+"A  c #A25113",
+"S  c #B15900",
+"D  c #BE5F00",
+"F  c #B05502",
+"G  c #A3532C",
+"H  c #AC5731",
+"J  c #A26600",
+"K  c #A66800",
+"L  c #A76F0A",
+"P  c #AB6800",
+"I  c #A16E11",
+"U  c #AE7003",
+"Y  c #B26B00",
+"T  c #BB6D00",
+"R  c #BA7400",
+"E  c #AB7C38",
+"W  c #90745D",
+"Q  c #A36F57",
+"!  c #BE7D59",
+"~  c #AF7962",
+"^  c #B07C62",
+"/  c #CF4F00",
+"(  c #C56403",
+")  c #C17100",
+"_  c #CF7100",
+"`  c #CA7B01",
+"'  c #C27903",
+"]  c #D16E01",
+"[  c #DE7807",
+"{  c #DB7913",
+"}  c #C66622",
+"|  c #C0643D",
+" . c #DB743E",
+".. c #E56A00",
+"X. c #E96100",
+"o. c #EC6F00",
+"O. c #E37A00",
+"+. c #EA7400",
+"@. c #E87800",
+"#. c #E47719",
+"$. c #F46800",
+"%. c #FB6900",
+"&. c #F47300",
+"*. c #F37C00",
+"=. c #FF7600",
+"-. c #FD7B00",
+";. c #F9780F",
+":. c #E37621",
+">. c #E1773E",
+",. c #C56840",
+"<. c #C26F48",
+"1. c #C37556",
+"2. c #E17C42",
+"3. c #BC8011",
+"4. c #B58329",
+"5. c #BF9537",
+"6. c #B48A56",
+"7. c #AB927B",
+"8. c #BA8765",
+"9. c #CC890C",
+"0. c #C48511",
+"q. c #DC8F07",
+"w. c #DE9205",
+"e. c #C0953A",
+"r. c #D6952A",
+"t. c #D19839",
+"y. c #D9A638",
+"u. c #E58615",
+"i. c #F28800",
+"p. c #FD8400",
+"a. c #FE8E00",
+"s. c #FF8F0F",
+"d. c #FF840F",
+"f. c #FE8A10",
+"g. c #FD9300",
+"h. c #FC940E",
+"j. c #FD9B00",
+"k. c #F39200",
+"l. c #E08530",
+"z. c #E18838",
+"x. c #E0833C",
+"c. c #E39221",
+"v. c #E89B33",
+"b. c #F38823",
+"n. c #F2993F",
+"m. c #EBA118",
+"M. c #FEA300",
+"N. c #FEAA00",
+"B. c #FDAE0A",
+"V. c #FEA40E",
+"C. c #F2A519",
+"Z. c #FEB30A",
+"A. c #FDB211",
+"S. c #FEB815",
+"D. c #FFBD19",
+"F. c #E3A439",
+"G. c #F5AF22",
+"H. c #FBAD32",
+"J. c #FAB22D",
+"K. c #FDBB22",
+"L. c #FEB53B",
+"P. c #FEBC35",
+"I. c #FBBC3C",
+"U. c #F7B234",
+"Y. c #DE804A",
+"T. c #DD9552",
+"R. c #C08E6A",
+"E. c #D89761",
+"W. c #D1A748",
+"Q. c #E28042",
+"!. c #E48844",
+"~. c #E7A855",
+"^. c #EBB749",
+"/. c #F6AF40",
+"(. c #FDBD4A",
+"). c #F5B74A",
+"_. c #EAA546",
+"`. c #E5AE67",
+"'. c #E5B273",
+"]. c #EEB773",
+"[. c #D1AE6D",
+"{. c #FEC52E",
+"}. c #F7C338",
+"|. c #FEC53B",
+" X c #FDC93C",
+".X c #DBC37B",
+"XX c #FFC44F",
+"oX c #FECF41",
+"OX c #F9C64A",
+"+X c #FFCA54",
+"@X c #FDCC5B",
+"#X c #FFC554",
+"$X c #F9D15C",
+"%X c #E9C868",
+"&X c #E3CB78",
+"*X c #FEC965",
+"=X c #F4D069",
+"-X c #FED466",
+";X c #FED968",
+":X c #FCDA74",
+">X c #FDDC7C",
+",X c #FED277",
+"<X c #FFE17B",
+"1X c #878787",
+"2X c #948F98",
+"3X c #939393",
+"4X c #9C9C9C",
+"5X c #9A95A0",
+"6X c #9AA2B9",
+"7X c gray64",
+"8X c #AAAAAA",
+"9X c #ADA0BA",
+"0X c #B4B4B4",
+"qX c #BABABA",
+"wX c #D8A680",
+"eX c #CCBFD7",
+"rX c #DFC5BD",
+"tX c #F3D980",
+"yX c #EDDEAE",
+"uX c #FFE484",
+"iX c #FEE789",
+"pX c #FCE590",
+"aX c #FEE994",
+"sX c #FEEBA1",
+"dX c #F4E8B7",
+"fX c #FFF0A3",
+"gX c #FEF6BA",
+"hX c #C4C4C4",
+"jX c #CCCCCC",
+"kX c #D3CCD8",
+"lX c #D4D4D4",
+"zX c #D7D7D9",
+"xX c #DBDBDB",
+"cX c #DEDBE3",
+"vX c #DFD6E2",
+"bX c #E1CBC5",
+"nX c #E4D9D3",
+"mX c #E0DCE3",
+"MX c #F9EBC7",
+"NX c #F3EED5",
+"BX c #F7F2D7",
+"VX c #FDFDD4",
+"CX c #F9F0D8",
+"ZX c #E3E3E3",
+"AX c #E8E2E9",
+"SX c #EAEAEA",
+"DX c #E6E2E8",
+"FX c #EEEBF2",
+"GX c #ECF0F6",
+"HX c #F9F0E4",
+"JX c #FFFFEA",
+"KX c #F3F3F3",
+"LX c #F6FEFE",
+"PX c #FCFAF3",
+"IX c #FEFEFE",
+"UX c #F2F7FA",
+"YX c None",
+/* pixels */
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXIXYXYXYXPXPXHXHXHXCXMXMXdX= = YXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXIXFXAXKX= wXT.'.'.`.`.~.~.~.R.= = = YXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXAXjXmXzXZXbX2.PXIXJXVXgXfX<XF.8.= = = YXYXYXYX",
+"YXYXYXYXYXYXYXYXIXxXlXIXPXmXcXrXdXBXVXgXsXtX>X$Xv.8.= = = YXYXYX",
+"YXYXYXYXYXYXYXeXkXSXxXIXIXIXPXZXlXnXNXdXpXtX;X+X Xc.~ = = = YXYX",
+"YXYXYXYXYXYXYXFXZXLXzXIXIXIXIXIXIXUXmXvXyX=X@XOX{.S.u.~ = = = YX",
+"YXYXYXYXYXYXIXmXIXPXzXIXIXIXIXIXIXIXIXjX9X%X).I.K.B.N.#.^ = = = ",
+"YXYXYXYXYXYXSXSXIXLXzXIXIXIXIXIXIXKXxXhX7..X^.G.B.M.j.g.#.~ = = ",
+"YXYXYXYXYXIXDXUXIXPXzXIXIXIXIXPXZXxXZX4X5.W..XtX:X-X@X#X(.E.= = ",
+"YXYXYXYXIXGXSXZXPXUXzXPXIXKXSXxXSXKXlXW 5.t.&X$X}.D.A.V.h.!.= = ",
+"YXYXYXYXIXmXKXZXIXLXnXUXZXZXSXKXKXSX3Xq 4.y.%X}.S.N.j.g.p.2.= = ",
+"YXYXYXLXmXSXDXFXIXUXcXSXGXKXKXSXKXqXa 8 v r.=XK.N.M.g.p.-.2.= = ",
+"YXYXYXUXzXSXmXIXPXUXnXPXKXSXSXSXZXl C N 9 Z ^.B.j.k.p.=.%.2.= = ",
+"YXYXLXcXZXLXUXPXPXUXzXSXSXSXAXSXqXu I 4.E Z _ @.@.@.o.#.!.1.= = ",
+"YXYXGXSXPXPXPXUXFXSXjXmXZXZXSXZXh C I 3.y.T._ O.i.g.j.#.6.= = = ",
+"YXLXzXlXZXZXzXjXjXhXqXZXZXZXAX0Xu V L 0.m.(.~._.L.L.L.H.v.[.= = ",
+"YX6X7X7X4X4X4X8X8X0XhXxXZXAXxXl V V U 9.C.J.iXiX;X+X|.P.H.~.= = ",
+"YX6 s qXlXjXlXjXqXlXzXxXZXZX0Xy V K U S C.I.>X XS.N.M.g.-.2.= = ",
+"YX= 1 3XzXxXxXzXqXxXZXxXZXxXk m J U R x ( I.<X{.Z.N.j.a.-.2.= = ",
+"YXYX+ e hXxXzXlXqXxXxXxXxX8Xr m P Y R A c { ).C.k.i.@.=.$.2.= = ",
+"YXYX= 2 3XxXzXlX0XlXxXxXjXk 7 b Y T ` r.} / ..+.&.&.o.x.! Q = = ",
+"YXYX= # e qXzXlX8XlXlXlX8X3 : M F ) _ w.).:.X.%.-.p.*.z.u = = = ",
+"YXYXYX= > 7.jXjX8XjXlXhXh $ O ; B D ` q.J.*Xb.;.d.f.f.h.l.w = = ",
+"YXYXYX= @ r 8XhX8XhXjX4X3 O o . - B ( q.U.*XsXpX>X;X@X+X(.].= = ",
+"YXYXYXYX= > d hX7XqXqXh O O o .   7 H @.(.,XaXoXD.B.M.g.p.Q.= = ",
+"YXYXYXYX= # 2 2X7XqX2X, O o .   X   : | u.>XpX{.A.N.j.a.p.Q.= = ",
+"YXYXYXYXYX$ & z 3X8Xt % o O o     o * i | _.uXD.N.M.g.p.=.2.= = ",
+"YXYXYXYXYXYX# 4 1Xd 4 + + + + # YX= = = ; <.c c c c c c c 2.= = ",
+"YXYXYXYXYXYX= + r h $ # * = = = YXYX= = = = = = = = = = = = = = ",
+"YXYXYXYXYXYXYX= f g * = = = = YXYXYXYX= = = = = = = = = = = = = ",
+"YXYXYXYXYXYXYX= = = = = = = = YXYXYXYXYX= = = = = = = = = = = = "
+};

Added: trunk/packages/kdepim/debian/icons/kmailcvt-16.xpm
===================================================================
--- trunk/packages/kdepim/debian/icons/kmailcvt-16.xpm	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/icons/kmailcvt-16.xpm	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,242 @@
+/* XPM */
+static char *kmailcvt-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 220 2",
+"   c black",
+".  c #010000",
+"X  c #020000",
+"o  c #030000",
+"O  c #000004",
+"+  c #040000",
+"@  c #070000",
+"#  c #0A0700",
+"$  c #0F0000",
+"%  c #110000",
+"&  c #130000",
+"*  c #150000",
+"=  c #180000",
+"-  c #1B0000",
+";  c #1C0100",
+":  c #1E0000",
+">  c #1F0300",
+",  c #1F0500",
+"<  c #1C1307",
+"1  c #210400",
+"2  c #230600",
+"3  c #230700",
+"4  c #240000",
+"5  c #240600",
+"6  c #240700",
+"7  c #250800",
+"8  c #260900",
+"9  c #270900",
+"0  c #2B0C00",
+"q  c #2D0E00",
+"w  c #231507",
+"e  c #22180A",
+"r  c #271C0B",
+"t  c #291C0B",
+"y  c #340900",
+"u  c #2E200D",
+"i  c #30210C",
+"p  c #3C2B0F",
+"a  c #3B2B11",
+"s  c #3F393B",
+"d  c #461500",
+"f  c #442E12",
+"g  c #483318",
+"h  c #4D3A17",
+"j  c #5D2300",
+"k  c #6E2A05",
+"l  c #7A2600",
+"z  c #5D4019",
+"x  c #784603",
+"c  c #7C4C02",
+"v  c #7A541E",
+"b  c #6E5522",
+"n  c #4D5252",
+"m  c #880D00",
+"M  c #8D0E00",
+"N  c #871000",
+"B  c #871100",
+"V  c #981200",
+"C  c #991400",
+"Z  c #9D1800",
+"A  c #9C2800",
+"S  c #A31F00",
+"D  c #A52401",
+"F  c #895F28",
+"G  c #94682A",
+"H  c #9B6C28",
+"J  c #B64A07",
+"K  c #BD5800",
+"L  c #AB6F0C",
+"P  c #B5750E",
+"I  c #A97B30",
+"U  c #B17A29",
+"Y  c #B67F2F",
+"T  c #B47E31",
+"R  c #967F56",
+"E  c #CD7404",
+"W  c #C17D10",
+"Q  c #DD6700",
+"!  c #C46A3F",
+"~  c #F36A00",
+"^  c #F87500",
+"/  c #FC7800",
+"(  c #FF7900",
+")  c #FF7A00",
+"_  c #9F845A",
+"`  c #9F9170",
+"'  c #A68452",
+"]  c #A58655",
+"[  c #A98656",
+"{  c #C98212",
+"}  c #D09332",
+"|  c #DDA02D",
+" . c #D6A835",
+".. c #E39419",
+"X. c #E4921D",
+"o. c #E49519",
+"O. c #E8961A",
+"+. c #EB9A1A",
+"@. c #F29F1B",
+"#. c #E59720",
+"$. c #EF9F26",
+"%. c #FF8621",
+"&. c #FCA41E",
+"*. c #FFB01C",
+"=. c #EAA43A",
+"-. c #EBB336",
+";. c #F1A024",
+":. c #F4A127",
+">. c #F5A126",
+",. c #F4A227",
+"<. c #F5A226",
+"1. c #F6A327",
+"2. c #FFAD27",
+"3. c #FFA828",
+"4. c #FFAB2D",
+"5. c #FEAE33",
+"6. c #FFAD3A",
+"7. c #FFB523",
+"8. c #F7BA30",
+"9. c #FFB031",
+"0. c #FFB535",
+"q. c #FFB737",
+"w. c #FFB93F",
+"e. c #FFBD3D",
+"r. c #C69644",
+"t. c #C09F4B",
+"y. c #C49B48",
+"u. c #CA9B47",
+"i. c #D6AD58",
+"p. c #FAB543",
+"a. c #FDB140",
+"s. c #FFB341",
+"d. c #FFB643",
+"f. c #FFB544",
+"g. c #FFB744",
+"h. c #FFB745",
+"j. c #FFB845",
+"k. c #FFBB45",
+"l. c #FFBB46",
+"z. c #FFBE41",
+"x. c #FFBC45",
+"c. c #FFB948",
+"v. c #FFC334",
+"b. c #FFC03B",
+"n. c #FFC13F",
+"m. c #FFCC3F",
+"M. c #FFC245",
+"N. c #FFC540",
+"B. c #FFC642",
+"V. c #FFC64D",
+"C. c #FFC94B",
+"Z. c #FFCF48",
+"A. c #FFCC4E",
+"S. c #FFCE4E",
+"D. c #FFCB52",
+"F. c #FFCC52",
+"G. c #FFD352",
+"H. c #FFD556",
+"J. c #FFDA55",
+"K. c #FFDE55",
+"L. c #FFD37C",
+"P. c #FFEE5B",
+"I. c #938A80",
+"U. c #9B9B9B",
+"Y. c #999B9F",
+"T. c #849FBD",
+"R. c #A5A5A5",
+"E. c gray66",
+"W. c #BFB9A9",
+"Q. c #B2B4B5",
+"!. c gray71",
+"~. c #B5BBBC",
+"^. c #B9B9B9",
+"/. c #BABBBB",
+"(. c #9EB0D2",
+"). c #ADB4C0",
+"_. c #A8BEE0",
+"`. c #BCC1AB",
+"'. c #B7C4D6",
+"]. c #C3B697",
+"[. c #D3BF9A",
+"{. c #FFE7B1",
+"}. c #C2C3C4",
+"|. c gray77",
+" X c #C3CACD",
+".X c #C8C8C8",
+"XX c #CBCBCB",
+"oX c #C0CDDF",
+"OX c #D4C8CE",
+"+X c gray82",
+"@X c #D5D6D6",
+"#X c #D3D6DD",
+"$X c #D4D7D9",
+"%X c #C4D0E1",
+"&X c #CCD3E1",
+"*X c #CADAE6",
+"=X c #DEE5EF",
+"-X c #DAE3F2",
+";X c #FFEBC7",
+":X c #FAEACC",
+">X c #FFF6C5",
+",X c #FFF1CB",
+"<X c #FFF0D2",
+"1X c #E3E3E4",
+"2X c #E5E6E8",
+"3X c #EBECED",
+"4X c #EDEEEE",
+"5X c #E2E8F6",
+"6X c #E2F6FE",
+"7X c #F3F6FA",
+"8X c #F3FAFF",
+"9X c #F6F8FD",
+"0X c #F8F8F9",
+"qX c #F8F9FA",
+"wX c #F9FFFF",
+"eX c #FFF8FD",
+"rX c #FDFFFF",
+"tX c #FEFFFF",
+"yX c gray100",
+"uX c None",
+/* pixels */
+"uXuXk A M m N N V V Z D D l   uX",
+"uXJ m.e.L.{.,X<X:X;X[.} 7.*.K   ",
+"uX%.>XyXyXyXyXyXyX*XT._ 5.p.@.4 ",
+"s eXyXyXyXyXyXqX}.Y.'.[ 4.a.$.8 ",
+"~. XQ./.|.XX.XU.R.2X%X' 9.a.;.3 ",
+"n wX4X1X+X!.R./.@X$X'.] q.f.,.6 ",
+"uXOXyXyXyX0XyXyXyX&X(._ q.h.>.3 ",
+"uX! 6X7X4X9XyX8X#XW.` r.z.f.>.6 ",
+"uX~ `.-X-X5X].t. .-.b.M.k.f.>.3 ",
+"uX) i._.~.y.8.B.K.H.F.V.k.k.1.6 ",
+"uX) e.I.u.| #   b H.G.h.f Y 3.8 ",
+"uX^ N.6.Z.a i F.I u H w   r #.q ",
+"@ ) z.f.C.t z P.S.<   v e U 2.0 ",
+"uXQ v.c.A.T O g G F   =.a h X.: ",
+"uXy E o.o.&.P c { o.L +.W x j   ",
+"uXuX  % $ % 3 8 : * , * : - uXuX"
+};

Added: trunk/packages/kdepim/debian/icons/kmailcvt.xpm
===================================================================
--- trunk/packages/kdepim/debian/icons/kmailcvt.xpm	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/icons/kmailcvt.xpm	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,295 @@
+/* XPM */
+static char *kmailcvt[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 257 2",
+"   c #010000",
+".  c #090000",
+"X  c #0C0A02",
+"o  c #160100",
+"O  c #110C04",
+"+  c #1C0000",
+"@  c #161006",
+"#  c #191106",
+"$  c #1D1508",
+"%  c #1A1900",
+"&  c #260F00",
+"*  c #2A0706",
+"=  c #241000",
+"-  c #241909",
+";  c #281D0A",
+":  c #320000",
+">  c #3E0B00",
+",  c #330A07",
+"<  c #311B00",
+"1  c #2E220C",
+"2  c #3B290E",
+"3  c #392B11",
+"4  c gray15",
+"5  c #490300",
+"6  c #590300",
+"7  c #511F00",
+"8  c #422D10",
+"9  c #45300F",
+"0  c #463010",
+"q  c #493917",
+"w  c #4A3313",
+"e  c #583C0E",
+"r  c #50360B",
+"t  c #5A3E15",
+"y  c #600F00",
+"u  c #651100",
+"i  c #6E1200",
+"p  c #750C00",
+"a  c #7A0E00",
+"s  c #721200",
+"d  c #761E00",
+"f  c #663B00",
+"g  c #7C2100",
+"h  c #7B2A00",
+"j  c #773200",
+"k  c #7F3F00",
+"l  c #5D4018",
+"z  c #634519",
+"x  c #6D4A19",
+"c  c #674512",
+"v  c #734E19",
+"b  c #7A531A",
+"n  c #6E5221",
+"m  c #7A5923",
+"M  c #585858",
+"N  c #726A5F",
+"B  c #797979",
+"V  c #862800",
+"C  c #843A00",
+"Z  c #922800",
+"A  c #A83400",
+"S  c #AA3C00",
+"D  c #BC2D00",
+"F  c #BA3301",
+"G  c #B8352D",
+"H  c #844200",
+"J  c #884400",
+"K  c #8C5807",
+"L  c #805717",
+"P  c #875B17",
+"I  c #8A5D16",
+"U  c #9C4300",
+"Y  c #915403",
+"T  c #8A5F21",
+"R  c #835B21",
+"E  c #9A6205",
+"W  c #9C6A1E",
+"Q  c #856225",
+"!  c #926523",
+"~  c #9C6B27",
+"^  c #9B732E",
+"/  c #AB4400",
+"(  c #AC7106",
+")  c #B36701",
+"_  c #B27506",
+"`  c #BB7A07",
+"'  c #BC7C08",
+"]  c #BB7706",
+"[  c #B67C10",
+"{  c #A66908",
+"}  c #AF792A",
+"|  c #A8742B",
+" . c #A37E33",
+".. c #AC7E32",
+"X. c #B37B2B",
+"o. c #BA7F29",
+"O. c #B77C25",
+"+. c #887F73",
+"@. c #C70A00",
+"#. c #CA0900",
+"$. c #CB3600",
+"%. c #D23600",
+"&. c #DC3600",
+"*. c #D3310D",
+"=. c #E13700",
+"-. c #E13800",
+";. c #D5550D",
+":. c #C07E08",
+">. c #C57702",
+",. c #D37C00",
+"<. c #E44507",
+"1. c #EE5325",
+"2. c #E76701",
+"3. c #F46530",
+"4. c #D65442",
+"5. c #A8893F",
+"6. c #AB8238",
+"7. c #B68132",
+"8. c #BF8738",
+"9. c #BA8635",
+"0. c #BC943B",
+"q. c #9D8854",
+"w. c #9B8A63",
+"e. c #90867A",
+"r. c #90887A",
+"t. c #988C77",
+"y. c #968A76",
+"u. c #A1844A",
+"i. c #A28750",
+"p. c #AA8B54",
+"a. c #B78D41",
+"s. c #B29244",
+"d. c #A69168",
+"f. c #AC9776",
+"g. c #B59565",
+"h. c #C7860A",
+"j. c #C98303",
+"k. c #C38414",
+"l. c #CA8916",
+"z. c #CE8B18",
+"x. c #DF8D02",
+"c. c #D28E19",
+"v. c #DE930C",
+"b. c #D49019",
+"n. c #D89119",
+"m. c #C38525",
+"M. c #C48629",
+"N. c #CD8B29",
+"B. c #C18631",
+"V. c #C38C3A",
+"C. c #CB8B30",
+"Z. c #C58D37",
+"A. c #C4913E",
+"S. c #C39B3F",
+"D. c #D18E2B",
+"F. c #D89220",
+"G. c #DA942B",
+"H. c #D2902D",
+"J. c #DE9934",
+"K. c #D59A3D",
+"L. c #D2A03F",
+"P. c #EA9605",
+"I. c #EE9905",
+"U. c #E79405",
+"Y. c #E29717",
+"T. c #E1971E",
+"R. c #E89B1C",
+"E. c #F19B05",
+"W. c #F09011",
+"Q. c #F99D1D",
+"!. c #F49B1A",
+"~. c #E49B2D",
+"^. c #EB9C2B",
+"/. c #E59D34",
+"(. c #E99F30",
+"). c #E29F3A",
+"_. c #F49D21",
+"`. c #F5A21E",
+"'. c #FCA11B",
+"]. c #EEA021",
+"[. c #E3A23B",
+"{. c #EBA135",
+"}. c #EDA339",
+"|. c #F5A427",
+" X c #F1A63A",
+".X c #F4A93C",
+"XX c #F8AC3E",
+"oX c #FEB03F",
+"OX c #F8BA3F",
+"+X c #CB9E42",
+"@X c #C8A245",
+"#X c #D9A445",
+"$X c #DDB576",
+"%X c #FF9647",
+"&X c #E7A845",
+"*X c #E1AF59",
+"=X c #E7B046",
+"-X c #E3B44A",
+";X c #EBB648",
+":X c #F3AB41",
+">X c #FBAD40",
+",X c #F7B648",
+"<X c #FDB344",
+"1X c #FEB846",
+"2X c #FEBB4A",
+"3X c #F1B94A",
+"4X c #FEC14D",
+"5X c #F5C04E",
+"6X c #F3C250",
+"7X c #FDC551",
+"8X c #FECB54",
+"9X c #FED37F",
+"0X c gray53",
+"qX c #8C8C8C",
+"wX c #8F8F90",
+"eX c #96928D",
+"rX c #9C9C9C",
+"tX c gray59",
+"yX c #A89F8B",
+"uX c #A49A81",
+"iX c #A09B97",
+"pX c #A68788",
+"aX c #B8AA91",
+"sX c #A4A4A3",
+"dX c #ABABAB",
+"fX c #ABA8A2",
+"gX c #AEB0B2",
+"hX c #B9B5AD",
+"jX c #BAB5A7",
+"kX c #B4B4B4",
+"lX c #BBBCBC",
+"zX c #BAB8B2",
+"xX c #D9BF8E",
+"cX c #C4BFB3",
+"vX c #CBC1AF",
+"bX c #DBCCAE",
+"nX c #D2CABB",
+"mX c #E5C08D",
+"MX c #E8D5B8",
+"NX c #C4C4C4",
+"BX c #CBCBCB",
+"VX c #DAD3C6",
+"CX c #D4D4D4",
+"ZX c #D8D7D6",
+"AX c #DBDBDB",
+"SX c #E2DACD",
+"DX c #E3DDD2",
+"FX c #EFDADA",
+"GX c #E6E1D5",
+"HX c #EEE4D5",
+"JX c #E3E3E2",
+"KX c #E6E7E8",
+"LX c #EBEBEB",
+"PX c #F4F4F4",
+"IX c #FCFDFD",
+"UX c #F6F8FA",
+"YX c None",
+/* pixels */
+"YXYXYXYXYXYXYX. . . . . . . . . . . . . . . . . . . X YXYXYXYXYX",
+"YXYXYXYX7 Z %.@.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.@.#.F p = YXYXYX",
+"YXYXf F 3.%X|.'.'.'.|.|.{. X X X}. X{.^.^._._._.Q.Q.W.2.F s   YX",
+"YXYXF 1.9XOX`.|.[.*XxXbXSXDXDXDXDXDXVXnXcXaXp.~.R.R.n.U.,.S o   ",
+"YX% ;.XX].;XmXDXIXIXIXIXIXIXUXUXLXLXJXJXBXwXN ..}.{././.n.>.s . ",
+"YX< <.!.$XHXUXIXIXIXIXIXIXIXUXPXLXKXLXCX0XrX+.X. X}.{./.J.h.V + ",
+"YX, 4.MXUXUXUXIXIXIXIXIXIXIXUXPXLXPXlXqXgXNXe.8..X X}.{./.l.C + ",
+"4 rXFXLXLXLXPXUXUXIXIXIXUXPXLXKXLXcXwXgXBXBXe.V.:X.X}.{./.z.J + ",
+"sXAXCXCXAXJXKXKXLXLXLXLXKXJXGXJXsXtXNXZXCXBXe.V.>XXX X}./.z.J + ",
+"rXrXrXrXfXkXNXCXAXGXAXAXCXCXBXrXrXBXAXZXCXBXe.V.>X>X.X}.{.c.J + ",
+"B lXCXNXlXkXdXdXdXdXdXdXdXdXqX0XNXJXAXZXBXNXe.V.<X>X.X X{.c.J + ",
+"M sXKXLXLXPXPXLXAXCXBXkXsXdXlXCXNXNXCXCXBXNXe.+X<X>XXX X}.c.J + ",
+"  M NXKXPXPXUXIXIXIXIXJXUXPXIXIXUXZXlXNXNXcX0XV.1X>XXX.X}.b.J + ",
+"YX* pXAXKXPXPXUXIXIXLXJXIXIXIXIXIXPXZXkXgXlXe.A.1X>XXX.X}.b.J + ",
+"YX: G hXJXLXPXPXPXPXKXPXIXIXIXIXIXUXPXKXkXsXe.+X<X>XXX.X&Xb.J + ",
+"YX: *.f.CXJXKXKXPXKXCXUXIXIXIXIXLXZXhXyXw.i.a.&X1X<XXX.X Xc.J + ",
+"YX: =.c.dXZXAXJXAXCXPXUXUXJXcXuXq.s.a.#X;X3X,X2X1X>XXX X Xc.J + ",
+"YX: =.E.f.lXAXAXCXCXPXKXjXd.s.@X-X6X7X8X7X4X4X2X1X<XXX X{.c.J + ",
+"YX: =.E.#XrXNXBXBXKXzXw.0.-X8X8X8X8X8X7X7X4X2X1X<X<X.X X{.c.J + ",
+"YX: =.E.:Xg.gXNXNXfXu.+X6X8X8X8X8X8X7X7X4X2X2X1X<XXX.X X{.c.J + ",
+"YX: &.E.XX:XeXdXt.6.=X5X .q 1 3 Q -X7X4X4X2X1X1XB.R C.}.).z.J + ",
+"YX: &.I.XX>Xg.y.6.=X5X6.X   ; $ @ 6.4X4X2X2X1X1Xm   I /./.z.H + ",
+"YX: &.I.XX<X.XK.:X2XK.1 X n K.#X^ m 3 m 1X7.2 l $   # 2 C.l.H + ",
+"YX: &.P..X>X>XXX1X1X9.@ - ..3X2X,XZ.  1 [.z X z -   ; 9 o.k.k + ",
+"YX: &.P. X.XXX<X<X<Xo.O 1 Z.1X1X1X,X3 X ! - - } x   v M.D.k.C + ",
+"YX: %.U.}. X.XXX>X<X8.# - 7.1X>X<X:X!   2 X 8 C.x   b D.G.k.k + ",
+"YX= $.x.{.}.}. X.X.X[.w   2 } | t X.B.-     W G.v   t O.H.[ h o ",
+"YXX A ,.n.{.}. X X X.XX.#   X X @ ~ J.0   O } ~.! X X ; O.{ u   ",
+"YXYXs / j.n.~.~.~.^.{.~.M.b e c ~ M.~.m.b P m.G.N.I r e K C .   ",
+"YXYX: 6 U ) ` ' ' ' ' h.:.] ( ( _ ` ` ] ( ( _ _ _ ( E Y j >     ",
+"YXYXYX  + 6 a g g g g g g g g g g g g g g d d d d d i 5       YX",
+"YXYXYXYX    . .   . . . . . . . .   . . . . .   . .         YXYX"
+};

Added: trunk/packages/kdepim/debian/icons/knode-16.xpm
===================================================================
--- trunk/packages/kdepim/debian/icons/knode-16.xpm	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/icons/knode-16.xpm	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,115 @@
+/* XPM */
+static char *knode-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 93 2",
+"   c #434343",
+".  c #5A5A5A",
+"X  c #5F5F5F",
+"o  c gray38",
+"O  c gray39",
+"+  c #686868",
+"@  c #6A6A6A",
+"#  c gray44",
+"$  c gray46",
+"%  c #767676",
+"&  c gray47",
+"*  c #7B7B7B",
+"=  c #7C7C7C",
+"-  c gray49",
+";  c #808080",
+":  c #818181",
+">  c gray51",
+",  c #838383",
+"<  c #848484",
+"1  c gray52",
+"2  c #888888",
+"3  c #898989",
+"4  c #8D8D8D",
+"5  c #8E8E8E",
+"6  c #909090",
+"7  c gray57",
+"8  c #929292",
+"9  c #959595",
+"0  c gray59",
+"q  c #979797",
+"w  c #989898",
+"e  c #9A9A9A",
+"r  c gray61",
+"t  c gray63",
+"y  c #A2A2A2",
+"u  c gray64",
+"i  c #A4A4A4",
+"p  c gray68",
+"a  c #AEAEAE",
+"s  c #AFAFAF",
+"d  c gray69",
+"f  c #B1B1B1",
+"g  c #B4B4B4",
+"h  c #B6B6B6",
+"j  c #B7B7B7",
+"k  c gray72",
+"l  c gray73",
+"z  c #BBBBBB",
+"x  c #BCBCBC",
+"c  c gray74",
+"v  c gray",
+"b  c #C0C0C0",
+"n  c #C1C1C1",
+"m  c gray76",
+"M  c gray77",
+"N  c #C5C5C5",
+"B  c gray78",
+"V  c #C8C8C8",
+"C  c gray79",
+"Z  c #CACACA",
+"A  c #CECECE",
+"S  c gray81",
+"D  c LightGray",
+"F  c gray83",
+"G  c #D5D5D5",
+"H  c gray84",
+"J  c #D7D7D7",
+"K  c #D8D8D8",
+"L  c gray86",
+"P  c gainsboro",
+"I  c #DDDDDD",
+"U  c gray87",
+"Y  c gray88",
+"T  c #E1E1E1",
+"R  c #E2E2E2",
+"E  c gray89",
+"W  c #E4E4E4",
+"Q  c #E6E6E6",
+"!  c #E7E7E7",
+"~  c gray91",
+"^  c #EAEAEA",
+"/  c gray92",
+"(  c gray93",
+")  c #EFEFEF",
+"_  c gray94",
+"`  c #F3F3F3",
+"'  c gray96",
+"]  c gray97",
+"[  c gray98",
+"{  c #FBFBFB",
+"}  c #FDFDFD",
+"|  c gray100",
+" . c None",
+/* pixels */
+" . . . . . . . . . . . . . . . .",
+"X t t t t t t t q - - - - - $   ",
+"q / / { | | | | | | | | | ` ` $ ",
+"6 S k S S S m t a N S S S r k 1 ",
+"q ( D | @ : e $ : @ $ 4 4 | ` 1 ",
+"t L x S t t k k a t a a a m f * ",
+"e / L L | { | | | ` E | / E / 3 ",
+"3 L E N | ( R k t e e ( m x h q ",
+"4 m L x / / / R k k q R V L L i ",
+"i | | / ( / R E D r q S L x x r ",
+"e V V x R D L L D x x S V m f 3 ",
+"6 N S N R D L E L R L D V N h 4 ",
+"6 x f f D f N R L x D R k S h 1 ",
+"3 x x i D h h V L N x D f x m 1 ",
+". + O * - - * : : * * : @ : 1 O ",
+" . . . . . . . . . . . . . . . ."
+};

Added: trunk/packages/kdepim/debian/icons/knode.xpm
===================================================================
--- trunk/packages/kdepim/debian/icons/knode.xpm	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/icons/knode.xpm	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,156 @@
+/* XPM */
+static char *knode[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 118 2",
+"   c black",
+".  c #464646",
+"X  c gray31",
+"o  c gray32",
+"O  c #565656",
+"+  c gray34",
+"@  c gray35",
+"#  c #5A5A5A",
+"$  c #606060",
+"%  c gray38",
+"&  c #626262",
+"*  c #656565",
+"=  c gray40",
+"-  c #6A6A6A",
+";  c #6C6C6C",
+":  c #6D6D6D",
+">  c gray43",
+",  c #6F6F6F",
+"<  c gray44",
+"1  c #717171",
+"2  c #727272",
+"3  c #747474",
+"4  c gray46",
+"5  c #767676",
+"6  c gray48",
+"7  c #7E7E7E",
+"8  c #818181",
+"9  c #848484",
+"0  c gray53",
+"q  c gray55",
+"w  c #8D8D8D",
+"e  c #939393",
+"r  c gray58",
+"t  c #959595",
+"y  c gray59",
+"u  c #979797",
+"i  c #989898",
+"p  c gray60",
+"a  c #9B9B9B",
+"s  c gray61",
+"d  c #9D9D9D",
+"f  c gray62",
+"g  c #9F9F9F",
+"h  c #A0A0A0",
+"j  c #A4A4A4",
+"k  c gray65",
+"l  c #A7A7A7",
+"z  c gray66",
+"x  c #ACACAC",
+"c  c gray68",
+"v  c #AEAEAE",
+"b  c gray69",
+"n  c #B2B2B2",
+"m  c gray71",
+"M  c #B6B6B6",
+"N  c #B7B7B7",
+"B  c #B9B9B9",
+"V  c gray73",
+"C  c #BCBCBC",
+"Z  c gray74",
+"A  c gray",
+"S  c gray75",
+"D  c #C1C1C1",
+"F  c gray76",
+"G  c #C3C3C3",
+"H  c gray77",
+"J  c #C5C5C5",
+"K  c #C6C6C6",
+"L  c gray78",
+"P  c gray79",
+"I  c #CACACA",
+"U  c #CBCBCB",
+"Y  c gray80",
+"T  c #CDCDCD",
+"R  c #CECECE",
+"E  c gray81",
+"W  c gray82",
+"Q  c #D2D2D2",
+"!  c LightGray",
+"~  c gray83",
+"^  c #D5D5D5",
+"/  c gray84",
+"(  c #D8D8D8",
+")  c gray85",
+"_  c #DADADA",
+"`  c gray86",
+"'  c gainsboro",
+"]  c #DDDDDD",
+"[  c gray87",
+"{  c gray88",
+"}  c #E1E1E1",
+"|  c #E2E2E2",
+" . c gray89",
+".. c #E4E4E4",
+"X. c gray90",
+"o. c #E6E6E6",
+"O. c gray91",
+"+. c #E9E9E9",
+"@. c #EAEAEA",
+"#. c gray92",
+"$. c #ECECEC",
+"%. c gray93",
+"&. c #EFEFEF",
+"*. c gray94",
+"=. c #F1F1F1",
+"-. c gray95",
+";. c #F3F3F3",
+":. c #F4F4F4",
+">. c gray96",
+",. c gray97",
+"<. c #F8F8F8",
+"1. c #F9F9F9",
+"2. c gray98",
+"3. c #FBFBFB",
+"4. c gray99",
+"5. c #FDFDFD",
+"6. c gray100",
+"7. c None",
+/* pixels */
+"7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.",
+"7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.",
+"7.. . . . . . . . . . . . . . . . . . . . . . . . . . . . 7.7.7.",
+". & 7 7 7 7 7 7 7 7 7 7 7 7 7 0 x D D D D D D Z Z D Z p & . 7.7.",
+"+ Q ] $.6.6.6.6. .] ] ] ] ] ] ] ` ` ] ` ` ` ] ] ] ]  .6.6 . 7.7.",
+"+  .o.o.o.o.o.o.$.o.o.$.o.$.o.o.$.o.$.o.$.o.o.$.o.$.o.o.D . 7.7.",
+"o $.6.$.-.6.6.6.6.6.6.6.6.-. .-.-.-.6.6.6.6.6.6.$.L ] ` T . 7.7.",
+"- o.:.N Z L T T Q  .o.$.$.^ ^ ^  .` Q T T T T T T T V v D . 7.7.",
+"2  .6.$.$.$.$.^ Z L  .T x x D T T T g N  .o.$.$.$.^ V ` 6.. 7.7.",
+"2  .6.L ^ :.6.T p 8 v v V & w 8 8 8 w w e w w p -.6.6.6.6.. 7.7.",
+"2  .6.^ ] 1.6.-.v p w Q V V v V v p e Q 5 8 v w $.$.$.$.6.. 7.7.",
+"- ] o.e e e e e e e e e e e e e e l v v v v v v v v v v -.. 7.7.",
+"2 T 6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.. 7.7.",
+"-  .1.$.-.] -.T 6.6.6.1.6.1.1.6.6.6.6.o.-.6.6.` 1.$.-.` o.. 7.7.",
+"-  .` L ] o.] T 6.6.]  .]  .] D N N g u u 6.6.T  .` ` ] o.- 7.7.",
+"2  .6.-.:.:.-.T 6.6. . .o.Q v j g u u u p 1.6.] o.` ] ] :.5 7.7.",
+"- ` L T T ^ ] T 6.6. . .o.D Z v g g x u p o.6.o. .T Q T  .5 7.7.",
+"-  .L T ` ` ] T 6.6.] ] $. .$. .v Z  .e p o.6.` 6.6.1.6.6.5 7.7.",
+"- o.:.$.$.-.$.L 6.6.]  .$.] o.] ` v D u u L 6.L -.` ]  .] 5 7.7.",
+"& -.6.6.6.6.6.L 6.6.] ] ] ] ] ] ^ p u u u T 6.L  .L ] ] ` 5 7.7.",
+"# :.` T ` ` ` ^ 6.6.1.1.1.1.1.1. .^ L T T -.6.L Q D ^ ` ] 5 7.7.",
+"# -.]  .^ T  .Q Z T L L L L ^ L L T Z D Z T D L ` ` T ` ] 2 7.7.",
+"& o.Q T ^ ^ ] L D N v L  .D  .Z N Q v Z v N x D $.^ ^  .T 5 . 7.",
+"2 $.^ Q ^ ] ` L  . . . .:.:.6.-.$.6.:.-. . .o.L  .T ^ ] Q 7 . 7.",
+"2 o.^ Q L Q ] D o.^ L ^ ^ ` $.6.] ` ^ ] ^ ^ 1.D Q L ^ ^ ^ g . 7.",
+"2  .Q ^ L ^ ` D  .^ L ^ ` `  .1.` ^ ^ ^ ^ ^ 1.D ` Q T ] ` g . 7.",
+"- ` L L ` ` T Q ] T Q L L T  .-.T T T Q L ] -.T ` Q L L ` p . 7.",
+"o ^ T Q ` ] D L Q L L L L L Q ] L D D L L L ] v T L ^ ] ` e . 7.",
+". 0 p g g Z l Z D Z Z Z Z Z L T Z Z Z D Z D T j L D D L D q . 7.",
+". . . . . . . . . * * * * * * * * * * * * * * # * * * * + . . 7.",
+"7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.",
+"7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7."
+};

Added: trunk/packages/kdepim/debian/icons/knotes-16.xpm
===================================================================
--- trunk/packages/kdepim/debian/icons/knotes-16.xpm	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/icons/knotes-16.xpm	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,181 @@
+/* XPM */
+static char *knotes-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 159 2",
+"   c black",
+".  c #090806",
+"X  c #090906",
+"o  c #0D0E0A",
+"O  c #10100B",
+"+  c #161610",
+"@  c #1C1B13",
+"#  c #1E1D14",
+"$  c #1E1E15",
+"%  c #212116",
+"&  c #25251B",
+"*  c #2A2A1C",
+"=  c #2E2E20",
+"-  c #313121",
+";  c #333322",
+":  c #343523",
+">  c #3C3D27",
+",  c #533D13",
+"<  c #44452C",
+"1  c #48482F",
+"2  c #49492E",
+"3  c #555339",
+"4  c #595731",
+"5  c #5E5932",
+"6  c #5D5D3D",
+"7  c #61572B",
+"8  c #625837",
+"9  c #665B33",
+"0  c #765E24",
+"q  c #726129",
+"w  c #7D6121",
+"e  c #7F6023",
+"r  c #79683F",
+"t  c #716743",
+"y  c #716F45",
+"u  c #835E17",
+"i  c #81611E",
+"p  c #86621C",
+"a  c #8A641C",
+"s  c #8E651D",
+"d  c #95670B",
+"f  c #93680F",
+"g  c #96690A",
+"h  c #996C0D",
+"j  c #996C0E",
+"k  c #916614",
+"l  c #916715",
+"z  c #946B1A",
+"x  c #966B1E",
+"c  c #966C1A",
+"v  c #966C1F",
+"b  c #9A6D11",
+"n  c #9A6E11",
+"m  c #9D7009",
+"M  c #9C7019",
+"N  c #9F741C",
+"B  c #9B7221",
+"V  c #A57605",
+"C  c #A0720A",
+"Z  c #AC811A",
+"A  c #B18105",
+"S  c #B98F1E",
+"D  c #939263",
+"F  c #9A9968",
+"G  c #A28555",
+"H  c #A28556",
+"J  c #A28855",
+"K  c #B39662",
+"L  c #C19824",
+"P  c #D3A925",
+"I  c #DCBD38",
+"U  c #C19C52",
+"Y  c #D7BC57",
+"T  c #D7BF7D",
+"R  c #DDC77C",
+"E  c #E2C554",
+"W  c #EAD67D",
+"Q  c #ECD87C",
+"!  c #F8DF78",
+"~  c #FFDF79",
+"^  c #F2E27D",
+"/  c #FFE07A",
+"(  c #FFE17B",
+")  c #FFE27C",
+"_  c #FFE47E",
+"`  c #FFE57F",
+"'  c #A4A688",
+"]  c #B9BA8C",
+"[  c #BABA8E",
+"{  c #C2C18E",
+"}  c #C5C48F",
+"|  c #C5C68F",
+" . c #C7C78F",
+".. c #CBC88F",
+"X. c #CCCB90",
+"o. c #CDCF90",
+"O. c #D0D18E",
+"+. c #D7D392",
+"@. c #D6D792",
+"#. c #D7D49B",
+"$. c #DADA93",
+"%. c #E0DE93",
+"&. c #E0DD98",
+"*. c #EFEB8E",
+"=. c #E2E294",
+"-. c #EBE093",
+";. c #E8E691",
+":. c #EFE997",
+">. c #EFF097",
+",. c #F4E380",
+"<. c #F2E28F",
+"1. c #FFE680",
+"2. c #FFE882",
+"3. c #FFE982",
+"4. c #FEEB84",
+"5. c #FFEC86",
+"6. c #FFEE88",
+"7. c #FFEF89",
+"8. c #F7EC97",
+"9. c #F0EA98",
+"0. c #F0EB9A",
+"q. c #F8EC92",
+"w. c #FFF28C",
+"e. c #FFF48E",
+"r. c #FFF68F",
+"t. c #F0F096",
+"y. c #F7F696",
+"u. c #F1F198",
+"i. c #F8F599",
+"p. c #FBF798",
+"a. c #FCF399",
+"s. c #FFF49B",
+"d. c #FFF699",
+"f. c #FFF799",
+"g. c #FCF79E",
+"h. c #FFFA94",
+"j. c #FFFD97",
+"k. c #FCFC99",
+"l. c #FEFD99",
+"z. c #FFFC99",
+"x. c #FEF7A0",
+"c. c #FFF6A0",
+"v. c #FFF6A2",
+"b. c #FFF7A9",
+"n. c #FFF8A1",
+"m. c #FFF8A2",
+"M. c #FFF8A3",
+"N. c #FFF8A5",
+"B. c #FFF8A6",
+"V. c #FEFAAB",
+"C. c #FFFCAE",
+"Z. c #FFFAB6",
+"A. c #FFFCB2",
+"S. c #FFFCB4",
+"D. c #FFFDB4",
+"F. c #F8FABA",
+"G. c #FFFCBC",
+"H. c #FFFCCA",
+"J. c None",
+/* pixels */
+"J.J.J.J.J.J.J.J.J.J.J.J.J.J.J.J.",
+"J.J.J.J.J.J.J.J.) W 4.e.J.J.J.J.",
+"J.J.J.J.J.) _ 3.5.*.O.k.k.J.J.J.",
+"J.J.~ _ 3.5.r.;.u.o.>.$.f.f.J.J.",
+"! 1.5.e.h.j.k.]  .]  .i.f.f.v.J.",
+"R h.y.@.u.%.....$.#.v.n.v.V.Q I ",
+"G -.=. .' { +.0.V.Z.D.D.,.P A m ",
+"y K g.f.:.0.n.B.G.H.Q L m j h n ",
+"D r T n.B.C.A.8.Y Z b N M l u , ",
+"F 6 G <.q.E S j z B x a w 7 : o ",
+"J.3 t U V f z x s i q 4 > * = J.",
+"J.+ < G d l p 0 5 1 ; % X J.J.J.",
+"J.J.$ 8 e 9 1 ; @ X   J.J.J.J.J.",
+"J.J.  O & $ X   J.J.J.J.J.J.J.J.",
+"J.J.J.      J.J.J.J.J.J.J.J.J.J.",
+"J.J.J.J.J.J.J.J.J.J.J.J.J.J.J.J."
+};

Added: trunk/packages/kdepim/debian/icons/knotes.xpm
===================================================================
--- trunk/packages/kdepim/debian/icons/knotes.xpm	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/icons/knotes.xpm	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,236 @@
+/* XPM */
+static char *knotes[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 198 2",
+"   c #000000",
+".  c #090906",
+"X  c #0D0C08",
+"o  c #100F0B",
+"O  c #11100B",
+"+  c #151411",
+"@  c #1D1C13",
+"#  c #24241A",
+"$  c #28271B",
+"%  c #29291C",
+"&  c #2D2D20",
+"*  c #322F21",
+"=  c #343323",
+"-  c #3B3B27",
+";  c #3E3E28",
+":  c #423F2B",
+">  c #44432C",
+",  c #4C4D2E",
+"<  c #484731",
+"1  c #4D4D32",
+"2  c #4C4E3E",
+"3  c #574823",
+"4  c #584921",
+"5  c #535335",
+"6  c #55553B",
+"7  c #585732",
+"8  c #5B5A34",
+"9  c #5C5C3B",
+"0  c #6E4E14",
+"q  c #7C5D1F",
+"w  c #645C2F",
+"e  c #635934",
+"r  c #645D38",
+"t  c #7A5F22",
+"y  c #7F601F",
+"u  c #6F652E",
+"i  c #646136",
+"p  c #61603E",
+"a  c #6B6333",
+"s  c #766127",
+"d  c #74612B",
+"f  c #7C6323",
+"g  c #766739",
+"h  c #605E40",
+"j  c #666445",
+"k  c #6D6B4A",
+"l  c #707247",
+"z  c #7D8180",
+"x  c #875E16",
+"c  c #815E1B",
+"v  c #895F15",
+"b  c #8E6003",
+"n  c #8E610C",
+"m  c #84601B",
+"M  c #8C6115",
+"N  c #936404",
+"B  c #91640B",
+"V  c #96680B",
+"C  c #9D6C01",
+"Z  c #996D0B",
+"A  c #916512",
+"S  c #916518",
+"D  c #956A13",
+"F  c #94691C",
+"G  c #996E12",
+"H  c #996F1D",
+"J  c #9F7108",
+"K  c #9F7210",
+"L  c #9A701A",
+"P  c #976E23",
+"I  c #986F25",
+"U  c #9B7323",
+"Y  c #A57400",
+"T  c #AC7C02",
+"R  c #A17513",
+"E  c #A17619",
+"W  c #A77A17",
+"Q  c #A2781C",
+"!  c #A57B20",
+"~  c #866C42",
+"^  c #817044",
+"/  c #8C764E",
+"(  c #8C7950",
+")  c #957749",
+"_  c #B28001",
+"`  c #B68708",
+"'  c #B88500",
+"]  c #BC8A00",
+"[  c #8D8C5E",
+"{  c #908057",
+"}  c #979565",
+"|  c #9A9868",
+" . c #A6814F",
+".. c #AF8848",
+"X. c #B28C5A",
+"o. c #B39158",
+"O. c #AE8D62",
+"+. c #BA9461",
+"@. c #BC9A6D",
+"#. c #A6A570",
+"$. c #B5B47C",
+"%. c #C69400",
+"&. c #C99400",
+"*. c #CC9900",
+"=. c #C49A1E",
+"-. c #C89B17",
+";. c #D49F00",
+":. c #CEA31E",
+">. c #D8AB05",
+",. c #D9AC1B",
+"<. c #D8AC21",
+"1. c #DCB225",
+"2. c #E4AD00",
+"3. c #E1B524",
+"4. c #E3B928",
+"5. c #C19B5D",
+"6. c #DAB648",
+"7. c #D4B159",
+"8. c #C0A066",
+"9. c #C7A772",
+"0. c #CDAD72",
+"q. c #D2BB7B",
+"w. c #D5C67D",
+"e. c #EACA4B",
+"r. c #E5C956",
+"t. c #E9CC59",
+"y. c #E9CA67",
+"u. c #EDDA70",
+"i. c #F1D868",
+"p. c #FAD765",
+"a. c #FCD865",
+"s. c #F3DF72",
+"d. c #FFDD77",
+"f. c #FFDE78",
+"g. c #F1E17A",
+"h. c #FEE17B",
+"j. c #FFE87D",
+"k. c #868982",
+"l. c #898D82",
+"z. c #939384",
+"x. c #9B9D86",
+"c. c #9EA186",
+"v. c #A3A287",
+"b. c #A4A488",
+"n. c #AAA98F",
+"m. c #B4B48B",
+"M. c #BEBB85",
+"N. c #BCBC8B",
+"B. c #C7BF81",
+"V. c #C1BE8D",
+"C. c #C3C38D",
+"Z. c #C8C58E",
+"A. c #CAC88F",
+"S. c #C5C292",
+"D. c #CCCA90",
+"F. c #DDC88E",
+"G. c #D3CE90",
+"H. c #D3D190",
+"J. c #D8D793",
+"K. c #DCDC94",
+"L. c #E1CC82",
+"P. c #E2DB8D",
+"I. c #E3E294",
+"U. c #E3E298",
+"Y. c #E9E495",
+"T. c #EBE098",
+"R. c #EBEB96",
+"E. c #EDEC9E",
+"W. c #F6E58A",
+"Q. c #FDE682",
+"!. c #FEEB84",
+"~. c #FAEB8A",
+"^. c #F2EC95",
+"/. c #F2EB9D",
+"(. c #FEF28C",
+"). c #F3F197",
+"_. c #F3F298",
+"`. c #FFF691",
+"'. c #FEF59A",
+"]. c #FEFB94",
+"[. c #FEFC9A",
+"{. c #EBE9A1",
+"}. c #F3E8A0",
+"|. c #F5F0A3",
+" X c #FEF6A2",
+".X c #FCF5AC",
+"XX c #FEF8A5",
+"oX c #FEFAAC",
+"OX c #F5F6B3",
+"+X c #F6FABC",
+"@X c #FEFCB2",
+"#X c #FEFDBA",
+"$X c #FFFEC1",
+"%X c #FFFECD",
+"&X c #FFFFD7",
+"*X c #FFFFE2",
+"=X c gray100",
+"-X c None",
+/* pixels */
+"-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X",
+"-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X",
+"-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-Xh.j.h.j.~.-X-X-X-X-X-X-X-X-X",
+"-X-X-X-X-X-X-X-X-X-X-X-X-X-X-Xh.h.h.j.w.!.(.(.].-X-X-X-X-X-X-X-X",
+"-X-X-X-X-X-X-X-X-X-X-X-Xh.h.h.j.j.!.(.M.N.].].].].-X-X-X-X-X-X-X",
+"-X-X-X-X-X-X-X-X-X-Xh.h.h.Q.Q.(.(.`.].].C.C.[.[.[.`.-X-X-X-X-X-X",
+"-X-X-X-X-X-Xf.f.h.h.Q.!.(.(.(.].].[.R.[.[.C.m.[.[.[.'.-X-X-X-X-X",
+"-X-X-X-Xf.f.h.j.!.!.(.(.`.].R.N.K.I.l.C.[.[.R.Z.R.[.'.'.-X-X-X-X",
+"a.f.f.h.j.Q.!.(.`.`.].].[.[.R.b.z R.C.l.K.D.[.I.^.'.'.'.'.-X-X-X",
+"y.!.!.!.(.(.`.].].[.[.[.[.).b.m.I.A.U.m.z.J.'.[.'.'.'.'. XoX+X-X",
+"@.~.(.`.].].[.R.R.[.).Y.C.I.K.Z.H.E.n.S.'.'.'.'.'.'.XXoX@X.XP.-X",
+"q.q.[.].[.K.x.H.K.[.Y.N.V.D.V.Z.C.XX.X|.XXXXXXXX XoX@XoXu.4.>.-X",
+"Z.o.U.[.[.c.x.c.k.I._.D.m.D.H.Y.'..X@X.X.XoXoX@X#X@Xi.3.>.%.T Z ",
+"} I 9..X[.R.^.R.z.z.b.v.R.T.[.'. X+X#X#X#X#X#X@Xg.1.*._ V n n V ",
+"#.9  .F.XX[.[.[.[.V.H.[.'.'. X XXX$X%X%X&X.Xi.,.' Y n n V V G Q ",
+"J.k g +.}.[.'.'.'.'.E. XXXXXoXoX@X&X*X.Xt.-.Y V A D K K Z N G E ",
+"{.[ 7 ) 0.XX'.'. X XXXXXoX@X#X#X@XW.6.` C n F W W E L V A A 0 4 ",
+"-X| p r X.L.@XXXXXoX@X#X#X@X~.r.=.Y N M L Q Q U F S M M q 4 O 2 ",
+"-X| j 5 / o.^.@X#X#X.X~.e.:.T N n S H L U U F S M m s w < @ . & ",
+"-X-Xj j r +.7.'.W.e.,.] C n M F U U U U S M m f u 8 , ; = * @ -X",
+"-X-X< h 7 ( @.1.*.T N n A F L U P F M v c d a 8 , ; % $ & -X-X-X",
+"-X-X@ < 5 9 @...N n D D H P F S v q s a i 9 , ; & @ X -X-X-X-X-X",
+"-X-X  # > 1 ( o.N Z D D D M m t w a 8 1 ; = % @ . -X-X-X-X-X-X-X",
+"-X-X-X. $ > j o.V B M M m w i 5 1 > = % + O . -X-X-X-X-X-X-X-X-X",
+"-X-X-X  X % > ^ S q d r 9 5 > = # @ X .     -X-X-X-X-X-X-X-X-X-X",
+"-X-X-X-X  X $ > e h 6 < = $ @ X .       -X-X-X-X-X-X-X-X-X-X-X-X",
+"-X-X-X-X    X @ & = % @ X .           -X-X-X-X-X-X-X-X-X-X-X-X-X",
+"-X-X-X-X-X    . X o X           -X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X",
+"-X-X-X-X-X                -X  -X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X",
+"-X-X-X-X-X-X-X        -X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X",
+"-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X",
+"-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X"
+};

Added: trunk/packages/kdepim/debian/icons/kontact-16.xpm
===================================================================
--- trunk/packages/kdepim/debian/icons/kontact-16.xpm	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/icons/kontact-16.xpm	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,134 @@
+/* XPM */
+static char *kontact-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 112 2",
+"   c black",
+".  c #343434",
+"X  c #333845",
+"o  c #393F49",
+"O  c gray35",
+"+  c gray40",
+"@  c DimGray",
+"#  c #727272",
+"$  c #767676",
+"%  c gray47",
+"&  c #7C7C82",
+"*  c #416FD2",
+"=  c #4A71C6",
+"-  c #5883DF",
+";  c #749BF0",
+":  c #FFD048",
+">  c gray51",
+",  c gray53",
+"<  c #80848D",
+"1  c #888888",
+"2  c gray55",
+"3  c #8D8D8D",
+"4  c gray57",
+"5  c #979797",
+"6  c gray61",
+"7  c #9D9D9D",
+"8  c #9F9F9F",
+"9  c #A19C8F",
+"0  c #A2A2A2",
+"q  c #A4A4A4",
+"w  c gray65",
+"e  c gray66",
+"r  c #A9A9A9",
+"t  c gray68",
+"y  c #AEAEAE",
+"u  c #A4A8B0",
+"i  c #ACAEB2",
+"p  c #AEACB6",
+"a  c gray69",
+"s  c #B2B2B2",
+"d  c #B6B6B6",
+"f  c #B7B7B7",
+"g  c #B0B2BA",
+"h  c #B9B9B9",
+"j  c #BBBBBB",
+"k  c gray75",
+"l  c #889DC5",
+"z  c #94A9CE",
+"x  c #95A9CF",
+"c  c #A5B1CB",
+"v  c #A9B2C2",
+"b  c #A1B2D7",
+"n  c #B5B9C2",
+"m  c #A1B4E3",
+"M  c #AABDE2",
+"N  c #A9BBED",
+"B  c #BEC2C9",
+"V  c #C5BB9F",
+"C  c gray76",
+"Z  c #C5C5C5",
+"A  c gray79",
+"S  c #CBCBCB",
+"D  c #CDCDCD",
+"F  c #CECECE",
+"G  c #C2C2D3",
+"H  c #C6C9D6",
+"J  c #C9C9D8",
+"K  c #D2D2D2",
+"L  c gray83",
+"P  c gray84",
+"I  c #DADADE",
+"U  c gainsboro",
+"Y  c #C3D4FF",
+"T  c #C9DBFE",
+"R  c #D6D6E8",
+"E  c #D7DAE2",
+"W  c #D2DAEF",
+"Q  c #DADAE4",
+"!  c #DCDCE3",
+"~  c #DBDBE8",
+"^  c #CDE0FF",
+"/  c #D7E8FF",
+"(  c #DAE7FF",
+")  c #DAEBFF",
+"_  c #DCEDFF",
+"`  c #E8E0DE",
+"'  c #FCE4C1",
+"]  c #FBF1D8",
+"[  c gray88",
+"{  c #E4E4E4",
+"}  c #E7E7E7",
+"|  c #E3E3ED",
+" . c #E7E7EC",
+".. c #E3E3FC",
+"X. c #EBEDF1",
+"o. c #E9E9FF",
+"O. c gray94",
+"+. c #F0F0F1",
+"@. c #F1F1F1",
+"#. c #F3F3F3",
+"$. c #F4F4F4",
+"%. c gray96",
+"&. c #F1F4F8",
+"*. c #F4F4FF",
+"=. c #FBFBFB",
+"-. c #FBFDFF",
+";. c gray99",
+":. c #FDFDFD",
+">. c #FCFCFE",
+",. c #FEFEFE",
+"<. c gray100",
+"1. c None",
+/* pixels */
+"1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.",
+"1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.",
+"O % % % % % 4 Z F i x l . 1.1.1.",
+"r P <.<.<.#.[ &._ / <.^ < %.<.1.",
+"P d S + 7 $ v T -.<.<.<.| J #.1.",
+"S 7 U k P =.<.Z d <.<.' Q G #.0 ",
+"K [ X.5 $ O O Z { <.<.: p 9  .7 ",
+"B ) W 5 , + r <.<.<.<.] V ` <.w ",
+"z *.R <.<.<.<.<.<.<.%.Z & # 2 d ",
+"u ( ..<.P { q 5 $ , a S <.<.=.F ",
+"y M o.I O , + <.<.<.<.<.<.<.#.C ",
+"2 n Y ! d { <.<.<.<.{ P y q , > ",
+"+ y b H <.#.E c g y j j + 1.1.1.",
+". . o m ~ N = X . . . . . 1.1.1.",
+"1.1.1.- ; * 1.1.1.1.1.1.1.1.1.1.",
+"1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1."
+};

Added: trunk/packages/kdepim/debian/icons/kontact.xpm
===================================================================
--- trunk/packages/kdepim/debian/icons/kontact.xpm	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/icons/kontact.xpm	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,165 @@
+/* XPM */
+static char *kontact[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 127 2",
+"   c black",
+".  c gray9",
+"X  c gray14",
+"o  c #2C2C2C",
+"O  c #2A2C33",
+"+  c #333333",
+"@  c #3E3E3E",
+"#  c #172C58",
+"$  c #3A404B",
+"%  c #404040",
+"&  c #4A4B4B",
+"*  c #545454",
+"=  c #595959",
+"-  c #555D6F",
+";  c #5E656F",
+":  c #5E6A7D",
+">  c #646464",
+",  c #6B6B6B",
+"<  c #757575",
+"1  c #7C7C7C",
+"2  c #375192",
+"3  c #385BAE",
+"4  c #3460CD",
+"5  c #3B66CD",
+"6  c #476AB6",
+"7  c #5E76AD",
+"8  c #607293",
+"9  c #416BCD",
+"0  c #5279D8",
+"q  c #6F87BF",
+"w  c #7B92C2",
+"e  c #7E96D3",
+"r  c #7294E8",
+"t  c #7A9BED",
+"y  c #BDAF79",
+"u  c #D1AC2C",
+"i  c #C4BC52",
+"p  c #E9AD4B",
+"a  c #FFCB00",
+"s  c #FFC429",
+"d  c #EFD37D",
+"f  c #858585",
+"g  c #8C8C8C",
+"h  c #949494",
+"j  c #9C9C9C",
+"k  c #9090A6",
+"l  c #A5A5A5",
+"z  c #A4A6AE",
+"x  c #A6A8AC",
+"c  c #AFA7AF",
+"v  c #ACABAB",
+"b  c #A2A2B6",
+"n  c #A7A7BB",
+"m  c #A6AFBF",
+"M  c #AFB4BE",
+"N  c #B5B5B5",
+"B  c #B0B4BF",
+"V  c #BDBDBD",
+"C  c #879EDA",
+"Z  c #99AFDC",
+"A  c #91ADE6",
+"S  c #9FB7E8",
+"D  c #A6B0C4",
+"F  c #A5B6D4",
+"G  c #B3B3C4",
+"H  c #BFBFC4",
+"J  c #BCBCCA",
+"K  c #BFBFD0",
+"L  c #A3BAEE",
+"P  c #ACBFE8",
+"I  c #A5BEF1",
+"U  c #AABFF7",
+"Y  c #BAC2D0",
+"T  c #AAC3EE",
+"R  c #AFC9F7",
+"E  c #BDC3E1",
+"W  c #BFCDE7",
+"Q  c #B5CBFF",
+"!  c #BBD1FE",
+"~  c #DACD93",
+"^  c #DFD394",
+"/  c #DEC9A6",
+"(  c #E0D2BD",
+")  c #E8D1B0",
+"_  c #F5D5AA",
+"`  c #C4C4C4",
+"'  c #C4C4CB",
+"]  c #C5C9CC",
+"[  c #CBCBCB",
+"{  c #C4C4D3",
+"}  c #CACAD3",
+"|  c #CCCCD8",
+" . c #C6D0DE",
+".. c #CDD2DB",
+"X. c #D2D2D2",
+"o. c #D2D2DC",
+"O. c #D9D9D9",
+"+. c #CCCCE4",
+"@. c #C2D0E7",
+"#. c #C3D3FE",
+"$. c #C5D9FE",
+"%. c #C9D5FF",
+"&. c #CDDFFF",
+"*. c #D2D2E4",
+"=. c #D2D2ED",
+"-. c #D3D8E1",
+";. c #DEDEE4",
+":. c #DBDBEF",
+">. c #D1DAF4",
+",. c #D3DEFF",
+"<. c #DCDCF7",
+"1. c #D9DBF9",
+"2. c #D5E0FF",
+"3. c #DAE8FF",
+"4. c #E4E4E4",
+"5. c #E3E3E9",
+"6. c #ECECEC",
+"7. c #E2E2F7",
+"8. c #E5E5FF",
+"9. c #EEEEF3",
+"0. c #E8E8FF",
+"q. c #EDF1FF",
+"w. c #F4F4F4",
+"e. c #F4F4F8",
+"r. c #F7F9FF",
+"t. c #FEFEFE",
+"y. c None",
+/* pixels */
+"y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.",
+"y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.",
+"y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.",
+"o + % = = = * = = * = * = 1 1 < > > , > > - 8 ; o y.y.y.y.y.y.y.",
+"= ` [ X.X.[ X.X.X.[ X.X.X.X.6.w.e.e.6.Y L &.! D o y.y.y.y.y.y.y.",
+"* 4.4.t.t.t.4.4.4.4.4.4.4.4.4.4.4.;.Z ! r.t.t.A @ y.y.y.y.y.y.y.",
+"* t.6.` 6.t.t.t.t.t.t.X.` X.X.t.$.! r.t.t.t.t.$.; [ 4.6.6.l y.y.",
+"> 6.N j N V V V V ` V V l j F Q q.t.r.e.6.6.w.4.6.r.;.} t.V y.y.",
+"> 4.6.X.6.t.g = N N y - W T >.9.9.9.t.t.t.t.r.9.t.| e.} t.V y.y.",
+"> w.X.N 6.t.` f > 1 { G w.t.t.t.t.t.t.t.t.e.t.( t.| { t.t.` y.y.",
+"> 4.N j j V O.w.t.t.r.t.t.t.f l > N t.t.t.t.) _ 9.{ | n 5.O.h y.",
+"> w.t.t.w.w.t.` e.e.X.X + = l f N 6.t.t.t.9.p s ;.y c b ' 4.h y.",
+"= 4.N N x ;.l X % = h h O.O.t.t.t.t.t.t.t.9./ a b i u k o.e.g y.",
+"> 4.t.3.T ..w.f 6.h , . & f t.t.t.t.t.t.t.t.5.~ d ^ c G w.w.v y.",
+"=  .R 2.=.o.t., > f O.w.t.t.t.t.t.t.t.t.t.t.;.w.J G t.;.w.w.N y.",
+": #.0.0.=.K t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.r.o.` l 1 > ` f ",
+"& ! 8.0.1.{ w.t.t.t.t.t.t.t.t.t.t.t.t.t.t.4.N > % * 1 * N w.X.y ",
+"& @.,.0.8.+.4.t.t.t.t.t.t.t.t.` O.f , = = h g 6.t.w.w.w.6.6.;.8 ",
+", [ I 0.8.+.4.t.` N O.N < = = f < ` w.t.t.t.t.w.w.w.w.w.6.6.4.j ",
+"< 4.m %.0.+.o.4.@ = h h O.` t.t.t.t.t.t.t.t.w.t.w.w.6.6.w.6.4.v ",
+", O.V S 0.=.' t.l h N 1 = f t.t.t.t.t.t.e.t.w.w.w.w.w.6.6.4.[ h ",
+"< O.O.D Q <.{ w.h , l 4.t.t.t.t.t.t.t.e.w.w.w.w.4.X.N j g , - y ",
+"= V N V Z 1.| O.t.t.t.t.t.t.t.t.t.t.t.4.X.V N j h &       y.y.y.",
+"* ] V V G U *.} t.t.t.t.t.t.6.X.V v j j N l l N l o y.y.y.y.y.y.",
+"@ f h v v w @.' t.4.O.` H B q 7 z N ` g ` N V V j o y.y.y.y.y.y.",
+"o o o o o O C { K } *.*.C 2 $ & & & & % & & & & @ o y.y.y.y.y.y.",
+"y.y.y.y.y.  6 K :.7.L 0 4 y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.",
+"y.y.y.y.y.y.# t #.r 5   y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.",
+"y.y.y.y.y.y.  3 9   y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.",
+"y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.",
+"y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.",
+"y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y."
+};

Added: trunk/packages/kdepim/debian/icons/korganizer-16.xpm
===================================================================
--- trunk/packages/kdepim/debian/icons/korganizer-16.xpm	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/icons/korganizer-16.xpm	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,220 @@
+/* XPM */
+static char *korganizer-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 198 2",
+"   c black",
+".  c #000200",
+"X  c #020300",
+"o  c #000700",
+"O  c #000800",
+"+  c #000900",
+"@  c #000B00",
+"#  c #001003",
+"$  c #001F04",
+"%  c #032708",
+"&  c #002903",
+"*  c #002B04",
+"=  c #002F06",
+"-  c #042E04",
+";  c #003106",
+":  c #063108",
+">  c #033E05",
+",  c #003C0A",
+"<  c #003E0B",
+"1  c #273E0A",
+"2  c #00400B",
+"3  c #004716",
+"4  c #01451A",
+"5  c #005213",
+"6  c #005915",
+"7  c #005F1A",
+"8  c #085018",
+"9  c #006B19",
+"0  c #006F18",
+"q  c #006F1A",
+"w  c #0F661E",
+"e  c #0D7415",
+"r  c #096430",
+"t  c #146B25",
+"y  c #4E617B",
+"u  c #79737D",
+"i  c #4E6380",
+"p  c #5D7A97",
+"a  c #637FA6",
+"s  c #008C1D",
+"d  c #008C1E",
+"f  c #008425",
+"g  c #008927",
+"h  c #008B2C",
+"j  c #008F2F",
+"k  c #098922",
+"l  c #02952F",
+"z  c #009934",
+"x  c #138D21",
+"c  c #198220",
+"v  c #0DA72F",
+"b  c #0FA62F",
+"n  c #0FA82F",
+"m  c #0EA13D",
+"M  c #0CA830",
+"N  c #07B034",
+"B  c #09B034",
+"V  c #09B036",
+"C  c #0DB337",
+"Z  c #10A62F",
+"A  c #279E22",
+"S  c #08B841",
+"D  c #24915F",
+"F  c #2C9B66",
+"G  c #35966C",
+"H  c #09C04D",
+"J  c #1CC056",
+"K  c #34CB64",
+"L  c #409E20",
+"P  c #5B833F",
+"I  c #6E9816",
+"U  c #6D9920",
+"Y  c #47B16A",
+"T  c #53AA7D",
+"R  c #5EDB44",
+"E  c #3BAF8C",
+"W  c #3DA49F",
+"Q  c #6482A3",
+"!  c #7091B8",
+"~  c #78BF9A",
+"^  c #6793CA",
+"/  c #6699D7",
+"(  c #6A9BD8",
+")  c #709ED3",
+"_  c #77A0D3",
+"`  c #74A2D7",
+"'  c #72A0DA",
+"]  c #7DA8D8",
+"[  c #6EA2E1",
+"{  c #6ED792",
+"}  c #60C5AA",
+"|  c #B01702",
+" . c #8D4B10",
+".. c #8D6111",
+"X. c #AC6F3E",
+"o. c #896357",
+"O. c #D57207",
+"+. c #E94600",
+"@. c #ED7500",
+"#. c #F26500",
+"$. c #F66400",
+"%. c #F26800",
+"&. c #F76A00",
+"*. c #F96900",
+"=. c #FD6F00",
+"-. c #FE6D00",
+";. c #F57300",
+":. c #F57700",
+">. c #F67800",
+",. c #FD7200",
+"<. c #FE7000",
+"1. c #FE7300",
+"2. c #FD7700",
+"3. c #FE7400",
+"4. c #FE7800",
+"5. c #FE7900",
+"6. c #FC7C00",
+"7. c #FE7C00",
+"8. c #D57C53",
+"9. c #8C7D84",
+"0. c #8D870D",
+"q. c #83B354",
+"w. c #AC9674",
+"e. c #B2846D",
+"r. c #FD8100",
+"t. c #FE8400",
+"y. c #F1922D",
+"u. c #FCAA00",
+"i. c #FDAA00",
+"p. c #FEA800",
+"a. c #FDA906",
+"s. c #FEA212",
+"d. c #FEBD08",
+"f. c #F5B11B",
+"g. c #FEA434",
+"h. c #F5B73A",
+"j. c #D79559",
+"k. c #F1AC51",
+"l. c #FDD000",
+"z. c #FED200",
+"x. c #FED007",
+"c. c #FED704",
+"v. c #FED62F",
+"b. c #FEE219",
+"n. c #FEE026",
+"m. c #FECB40",
+"M. c #E3D17B",
+"N. c #FEEE47",
+"B. c #95868B",
+"V. c #81AADA",
+"C. c #89ACD6",
+"Z. c #8CACD3",
+"A. c #81B3EC",
+"S. c #90BDF0",
+"D. c #89D1BB",
+"F. c #99CCB9",
+"G. c #90E3B3",
+"H. c #A6C293",
+"J. c #95C0EB",
+"K. c #9EC4E8",
+"L. c #A2D8DE",
+"P. c #A1C8E9",
+"I. c #A7C9E9",
+"U. c #A9C2E1",
+"Y. c #ACC3ED",
+"T. c #A3CCF2",
+"R. c #A4D2FD",
+"E. c #A4D7FE",
+"W. c #ABD8FD",
+"Q. c #ABDBFE",
+"!. c #B8C8E6",
+"~. c #B8D8F0",
+"^. c #BCDAF7",
+"/. c #BEDCF5",
+"(. c #AEE9ED",
+"). c #B8E6FE",
+"_. c #B9ECF2",
+"`. c #D6AB85",
+"'. c #E9C8A6",
+"]. c #FEF891",
+"[. c #F3F5BC",
+"{. c #C3C2C6",
+"}. c #CFD6ED",
+"|. c #D5D7F6",
+" X c #C9F3DE",
+".X c #CEE6E0",
+"XX c #C4F2E2",
+"oX c #DEE4F6",
+"OX c #DAEEFE",
+"+X c #DCE9FE",
+"@X c #D7F6FE",
+"#X c #E7FCFE",
+"$X c #EBF2FE",
+"%X c #E9F9FE",
+"&X c #FEE4E3",
+"*X c #F1F3FE",
+"=X c #F2F6FE",
+"-X c None",
+/* pixels */
+"-X-X-X-X-X-X-X:.h.8.| -X-X-X-X-X",
+"-X-X-X-X-X-X-Xu.x.g. .k q -X-X-X",
+"-X-X-X-X-X-X2.z.u.+.P S d , -X-X",
+"-X-X-X-X-X-Xu.z.t...XX.Xm q -X-X",
+"-X-X-X-X-Xr.c.d.O.H.%X+XF.l g -X",
+"-X-X-X-X-Xa.b.s.j.@X^./.$X~ f j ",
+"-X-X-X-X6.n.v.y.{.E.T.I.U.}.T h ",
+"-X-X-X-Xf.N.m.X.] A.V.Z.Z.|.D.3 ",
+"-XC K { M.].k.u i ^ ' _ Y.L.r   ",
+"x e.*XoX`.'.B.( a y / S.).F @ -X",
+"> G _.~.o.9.` ) [ Q p W.E $ -X-X",
+"  6 R [.!.P.K.J.R.W.! W 4 -X-X-X",
+"-X@ e w.&XOX=X#X(.} F 8   -X-X-X",
+"-X-X@ c q.XXG.Y t - @   -X-X-X-X",
+"-X-X-X% k w : @   -X-X-X-X-X-X-X",
+"-X-X-X      -X-X-X-X-X-X-X-X-X-X"
+};

Added: trunk/packages/kdepim/debian/icons/korganizer.xpm
===================================================================
--- trunk/packages/kdepim/debian/icons/korganizer.xpm	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/icons/korganizer.xpm	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,295 @@
+/* XPM */
+static char *korganizer[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 257 2",
+"   c #000000",
+".  c #001C00",
+"X  c #033708",
+"o  c #0C4302",
+"O  c #00450E",
+"+  c #005E1B",
+"@  c #1B5401",
+"#  c #006B1F",
+"$  c #19610E",
+"%  c #0E680B",
+"&  c #026321",
+"*  c #0E7E31",
+"=  c #1D722B",
+"-  c #2A7A57",
+";  c #4C7214",
+":  c #4E5968",
+">  c #505968",
+",  c #576A75",
+"<  c #577263",
+"1  c #616972",
+"2  c #61707F",
+"3  c #637387",
+"4  c #677A94",
+"5  c #008129",
+"6  c #008E35",
+"7  c #008839",
+"8  c #01943B",
+"9  c #019C3B",
+"0  c #049637",
+"q  c #118636",
+"w  c #129B32",
+"e  c #03AA3C",
+"r  c #00A73E",
+"t  c #1CAE35",
+"y  c #20851F",
+"u  c #3C911F",
+"i  c #219B2D",
+"p  c #3B9725",
+"a  c #299536",
+"s  c #2AA43B",
+"d  c #37B139",
+"f  c #058F5E",
+"g  c #009D43",
+"h  c #029A46",
+"j  c #07995A",
+"k  c #118A4C",
+"l  c #189943",
+"z  c #0E9176",
+"x  c #13976B",
+"c  c #00A343",
+"v  c #00AB43",
+"b  c #0BA444",
+"n  c #09BB43",
+"m  c #04B644",
+"M  c #1AAB4F",
+"N  c #17B941",
+"B  c #1CBB56",
+"V  c #19B557",
+"C  c #1AA36F",
+"Z  c #35946B",
+"A  c #29B444",
+"S  c #2FBA50",
+"D  c #31BB48",
+"F  c #28AC7F",
+"G  c #2DB37F",
+"H  c #0CC445",
+"J  c #20C859",
+"K  c #38C14C",
+"L  c #44A02A",
+"P  c #5E9141",
+"I  c #4FAC41",
+"U  c #45D178",
+"Y  c #50D97E",
+"T  c #5EE56B",
+"R  c #3CA08E",
+"E  c #3CA497",
+"W  c #409F9F",
+"Q  c #50B3A9",
+"!  c #43AAA9",
+"~  c #6D8197",
+"^  c #70839F",
+"/  c #7B95B5",
+"(  c #68AD97",
+")  c #7EBCA9",
+"_  c #7F9CC2",
+"`  c #74A2D6",
+"'  c #7CAADC",
+"]  c #78A6D8",
+"[  c #7AACE1",
+"{  c #76ADE5",
+"}  c #70C9B9",
+"|  c #7BD0B9",
+" . c #73E09C",
+".. c #7FC6CD",
+"X. c #7CC3E2",
+"o. c #AE1F00",
+"O. c #B93100",
+"+. c #98542B",
+"@. c #AD5300",
+"#. c #A55E3E",
+"$. c #B2703E",
+"%. c #80574B",
+"&. c #8A655D",
+"*. c #B76541",
+"=. c #AB6D4F",
+"-. c #C23100",
+";. c #D14100",
+":. c #C96310",
+">. c #D86A1B",
+",. c #CF6024",
+"<. c #C36331",
+"1. c #D67035",
+"2. c #EB5C00",
+"3. c #F56F04",
+"4. c #F77E00",
+"5. c #FF4545",
+"6. c #8D9A32",
+"7. c #918550",
+"8. c #AE8067",
+"9. c #ACFF7B",
+"0. c #FE8503",
+"q. c #FD8A00",
+"w. c #FA8A04",
+"e. c #FF8A1C",
+"r. c #FD9200",
+"t. c #FF9A0E",
+"y. c #FF961D",
+"u. c #FF972F",
+"i. c #EB8937",
+"p. c #FEA200",
+"a. c #FFAE02",
+"s. c #FFAE09",
+"d. c #FFB400",
+"f. c #FFBA00",
+"g. c #FFB70D",
+"h. c #FFA923",
+"j. c #FFA432",
+"k. c #FFBA36",
+"l. c #DC9852",
+"z. c #C3896B",
+"x. c #DAB243",
+"c. c #EE9B4E",
+"v. c #FFB24B",
+"b. c #F9B259",
+"n. c #FFB570",
+"m. c #FFC200",
+"M. c #FFCA00",
+"N. c #FFC40B",
+"B. c #FFCB14",
+"V. c #FFC61F",
+"C. c #FFD400",
+"Z. c #FFCC27",
+"A. c #FFD32B",
+"S. c #FFD337",
+"D. c #FFEC01",
+"F. c #FFE009",
+"G. c #FFE81C",
+"H. c #FFF200",
+"J. c #FFF714",
+"K. c #FFE821",
+"L. c #FFED38",
+"P. c #FFF738",
+"I. c #FFC749",
+"U. c #FFD948",
+"Y. c #FFDE50",
+"T. c #FFC866",
+"R. c #FFD763",
+"E. c #FFD778",
+"W. c #FFE244",
+"Q. c #FFE15B",
+"!. c #F7FF41",
+"~. c #FFFE55",
+"^. c #FFE867",
+"/. c #FFFC63",
+"(. c #FFFA73",
+"). c #809BB9",
+"_. c #9597A3",
+"`. c #8BAACB",
+"'. c #82AAD6",
+"]. c #84ADDC",
+"[. c #8AADD6",
+"{. c #8CB2DA",
+"}. c #9AB1CF",
+"|. c #96B4D6",
+" X c #95B6DB",
+".X c #8CB4E3",
+"XX c #85BBEE",
+"oX c #95BBE4",
+"OX c #9ABCE6",
+"+X c #89BCF2",
+"@X c #AABACF",
+"#X c #A2BCD9",
+"$X c #8EE8B1",
+"%X c #82C6FF",
+"&X c #9DC8EE",
+"*X c #91C2EE",
+"=X c #9BC9F5",
+"-X c #97CCFC",
+";X c #8DC8EB",
+":X c #82E0D8",
+">X c #A4CFC6",
+",X c #A4C0DC",
+"<X c #B5DDDA",
+"1X c #A6C3E5",
+"2X c #A3C8E7",
+"3X c #ADCCE7",
+"4X c #ACCCEA",
+"5X c #A6C8EC",
+"6X c #A2C8F2",
+"7X c #ACD0EE",
+"8X c #A5D4FF",
+"9X c #A9D3FA",
+"0X c #B5CBE6",
+"qX c #B6D5EE",
+"wX c #B5D4EB",
+"eX c #B2DEFF",
+"rX c #BBDAF7",
+"tX c #B5D8FA",
+"yX c #BAE5FF",
+"uX c #D1A08A",
+"iX c #FB8F97",
+"pX c #FF9B94",
+"aX c #FF9BAC",
+"sX c #FFB4E0",
+"dX c #FFD58A",
+"fX c #E0CFBD",
+"gX c #FFEC9E",
+"hX c #FFFBA0",
+"jX c #C5D9EE",
+"kX c #C1DFFE",
+"lX c #C6DBF3",
+"zX c #D2DCEB",
+"xX c #D3DFF2",
+"cX c #C3FAD8",
+"vX c #C2E6FF",
+"bX c #CCE4F7",
+"nX c #CAECFF",
+"mX c #CBE6FE",
+"MX c #D3ECFD",
+"NX c #DBEEFE",
+"BX c #D6E3F6",
+"VX c #DCF3FD",
+"CX c #D4F5F9",
+"ZX c #FFE8C9",
+"AX c #FFE5C2",
+"SX c #FFF4C1",
+"DX c #FFF9DB",
+"FX c #E9FBE8",
+"GX c #E1F3FD",
+"HX c #ECFDFF",
+"JX c #E7FCF9",
+"KX c #F5FFFF",
+"LX c #FEFEFF",
+"PX c #FFFFF3",
+"IX c #E4E6F2",
+"UX c #D3CFCF",
+"YX c None",
+/* pixels */
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXw.c.1.O.o.YXYXYXYXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXw.C.(.DXZX,.o.YXYXYXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXr.H.m.Z.dXn.o.YX# YXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYX0.M.D.d.a.0.2.o.H H 5 YXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXr.H.M.d.t.0.-.H e n e * YXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYXYX0.m.H.d.d.q.2.o.Y JX0 H e # YXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYXYXw.H.C.f.p.w.;.J LXLX<Xr e 9 O YXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYXq.f.H.m.m.t.3.; cXLXKXKX} e m 0 YXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYXr.H.F.N.g.y.@. .LXLXqXGXPXZ v v 6 YXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYXm.J.B.B.h.e.P LXLXbXGXbXbXLXk v c 6 YXYX",
+"YXYXYXYXYXYXYXYXYXYXYXq.G.G.V.Z.j.:.CXKXMXNXqXqXKXGXJX7 v 9 v YX",
+"YXYXYXYXYXYXYXYXYXYXYXf.P.A.Z.k.u.uXHXVXrX4XNXNXqXbXLX>X7 c 8 YX",
+"YXYXYXYXYXYXYXYXYXYXq.L.!.S.S.v.>.VXGX&XtXmXrXwXBXzX0XLX( h g g ",
+"YXYXYXYXYXYXYXYXYXYXd.~.U.U.I.v.z.MX*XtXyX&X4X0X,X|.zX#XLXZ h b ",
+"YXYXYXYXYXYXYXYXYXr.U.~.Y.Y.T.>.@X=XeX=X.X1X1X[.0X0X|.IXKX<Xh + ",
+"YXYXYXYXYXYXYXYXYXs.(.^.Q.R.T.+., tX' ].oX{.'.0X X[.xXBXBXC q   ",
+"YXYXYXYXYXYXn n Q x.hX^.^.E.i._.3 , OX].` ].5X'. X0XxXxXR 0     ",
+"YXYXYXH H U $XJXPXb.DXSXgXdX*.' ).> 4 ] .X.X` OXOXlXbX..h X   YX",
+"YXH s &.FXLXLXLXVXl.DXDXZX$.}.'..X^ > / ] ' .X].kXMXyXj +   YXYX",
+"YXt = 5.iXLXqXqXGX$.fXZX=.`.'.] ] 6X4 > _ { { yXvXnXx l   YXYXYX",
+"YXo N - %XMXLX2XwX8.&.$.{.[.'.{.` [ `.4 , XXeXyXvXW M     YXYXYX",
+"YX  % m W :XFXGX,X#.%.|.,X[.'.OX] [ -X6X2 , 8XeXX.h O   YXYXYXYX",
+"YXYX  i e T 9.PXqXUXwX3XjX4XoXoXmX+XXX8X`.~ ~ -Xj q   YXYXYXYXYX",
+"YXYX    t w !./.LXqXGXqX7XMX5X&X6XMXnXyXyX/ X.z l   YXYXYXYXYXYX",
+"YXYXYX  X N a aXsXKXbXqXqXlXKXHXGXCXMXvX;X! f S .   YXYXYXYXYXYX",
+"YXYXYXYX  @ m < pXAXGXKXLXLXLXKXHXwXQ j V s p .   YXYXYXYXYXYXYX",
+"YXYXYXYXYX  y b 6.I.DXLXLXLXVX} F B D u X       YXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYX  s b L Z VX| G B K L @         YXYXYXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYX    A v c B D L @         YXYXYXYXYXYXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYX  @ d p @         YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYX            YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYX    YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX"
+};

Added: trunk/packages/kdepim/debian/icons/korn-16.xpm
===================================================================
--- trunk/packages/kdepim/debian/icons/korn-16.xpm	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/icons/korn-16.xpm	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,31 @@
+/* XPM */
+static char *korn-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 9 1",
+"  c black",
+". c #585858",
+"X c #C00000",
+"o c red",
+"O c #808080",
+"+ c #A0A0A4",
+"@ c #C0C0C0",
+"# c gray100",
+"$ c None",
+/* pixels */
+"$$$  $$$$$$$$$$$",
+"$$ @@  $$$$$$$$$",
+"$ ###@@  $$$$$$$",
+"$ @####oo  $$$$$",
+" @@@@##ooX@  $$$",
+" @@@@@@#@X#@.  $",
+" @@@@@@@@X#O+.. ",
+" @@@@@@@+X#+@O# ",
+" @@@@@@@+X@@@O# ",
+"  @@@@@@@X@O@#  ",
+"$$  @@@@@X@O##  ",
+"$$$$  @@@X@+#.. ",
+"$$$$$$  @+@O#  $",
+"$$$$$$$$  @  $$$",
+"$$$$$$$$$$ $$$$$",
+"$$$$$$$$$$$$$$$$"
+};

Added: trunk/packages/kdepim/debian/icons/korn.xpm
===================================================================
--- trunk/packages/kdepim/debian/icons/korn.xpm	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/icons/korn.xpm	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,119 @@
+/* XPM */
+static char *korn[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 81 1",
+"  c #000000",
+". c #0C0C0C",
+"X c #131313",
+"o c #1A1A1A",
+"O c #242424",
+"+ c #2D2D2D",
+"@ c #333333",
+"# c #3B3B3B",
+"$ c #3D4040",
+"% c #7D1919",
+"& c #434444",
+"* c #4B4B4B",
+"= c #545454",
+"- c #555959",
+"; c #5B5B5B",
+": c #646464",
+"> c #6C6C6C",
+", c #737373",
+"< c #7B7B7C",
+"1 c #821919",
+"2 c #8B1D1D",
+"3 c #932222",
+"4 c #9C2525",
+"5 c #954646",
+"6 c #A54646",
+"7 c #B27272",
+"8 c #B67E7E",
+"9 c #C12A2A",
+"0 c #C93939",
+"q c #DF3535",
+"w c #DB3A3A",
+"e c #C95B5B",
+"r c #C77777",
+"t c #E44141",
+"y c #ED4D4D",
+"u c #EC5757",
+"i c #F05454",
+"p c #EF7F7F",
+"a c #F66363",
+"s c #F07676",
+"d c #828283",
+"f c #8B8B8B",
+"g c #8E8E90",
+"h c #908E8E",
+"j c #949394",
+"k c #979799",
+"l c #9A9A9B",
+"z c #9E9EA2",
+"x c #AF9393",
+"c c #AF9A9A",
+"v c #B29797",
+"b c #A2A2A5",
+"n c #A4A4A9",
+"m c #ABABAB",
+"M c #B3B3B3",
+"N c #B6BBBB",
+"B c #BEBEBE",
+"V c #BFC0C0",
+"C c #C2B7B7",
+"Z c #C3B9B9",
+"A c #CBBFBF",
+"S c #D2A8A8",
+"D c #DBA1A1",
+"F c #EF8383",
+"G c #C1C1C1",
+"H c #C8C6C6",
+"J c #CBCBCB",
+"K c #C7D2D2",
+"L c #D3D3D3",
+"P c #DDD4D4",
+"I c #DCDCDC",
+"U c #D6E3E3",
+"Y c #F3C6C6",
+"T c #F3CCCC",
+"R c #E4E4E4",
+"E c #EAE2E2",
+"W c #ECECEC",
+"Q c #ECF3F3",
+"! c #F4F4F4",
+"~ c #FBFBFB",
+"^ c None",
+/* pixels */
+"^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^",
+"^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^",
+"^^^^^^^     ^^^^^^^^^^^^^^^^^^^^",
+"^^^^^  X+++.   ^^^^^^^^^^^^^^^^^",
+"^^^^ o#<HGH;@@.  ^^^^^^^^^^^^^^^",
+"^^^ Xj!IJGGHHV=$   ^^^^^^^^^^^^^",
+"^^ Xj~WIILKHVS8v;&  ^^^^^^^^^^^^",
+"^ Xk~~!!WUILKF0e7x;&  ^^^^^^^^^^",
+"^ +!!!~~~!WIUpau96HM:&  ^^^^^^^^",
+" XfIIRW!~~!!Qsyyt4VGHm,#  ^^^^^^",
+" oJLLIIR!!~~~TDuq4JHGGJmd@  ^^^^",
+" oGGHLLIIR!!~~!Yw4LLJHNj>&@.#^^^",
+" oGVGGHJLIIR!!REt4IIIM,,-**&O#^^",
+" oGVVGVGHJLIIRLPw3LWJ<djjd:-*o ^",
+" oGGVVVVGGHJLIJCw3GIm,zbnzc<:X&^",
+" oGGVVVVVVGGJJLCw2HLdzzbl,dGN=X ",
+" oVVVVVVGVBVVVHAw2Mb,nnnd:fIL:. ",
+" oGVVVVVVVVVVVHZw2mk<zznzjLI:*. ",
+" oNGVVVVVVVVVVVCw1j,zlgmK~~N&*. ",
+" X<lBGVVVBVVVVVCw1h>glkgV~W;#=. ",
+"^  o,kGHVVVVVVVCw%j>jfkK!~B*&=. ",
+"^^^  O>kGGVGVVVCw%h;hkbU~I,@&=. ",
+"^^^^^  +:lGHBVGZw5l:bznQ~B=#;;. ",
+"^^^^^^^  @;lHGBZrcm=7mVQW<*><&  ",
+"^^^^^^^^^  @-bHGNMm**<BWB>>*#. ^",
+"^^^^^^^^^^^  @*bGVm&;;<bj*+X  ^^",
+"^^^^^^^^^^^^^  @*mm*:<f;OX  ^^^^",
+"^^^^^^^^^^^^^^   +#*>:OX  ^^^^^^",
+"^^^^^^^^^^^^^^^^   XoX  ^^^^^^^^",
+"^^^^^^^^^^^^^^^^^^    ^^^^^^^^^^",
+"^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^",
+"^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^"
+};

Added: trunk/packages/kdepim/debian/icons/kpalmdoc-16.xpm
===================================================================
--- trunk/packages/kdepim/debian/icons/kpalmdoc-16.xpm	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/icons/kpalmdoc-16.xpm	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,122 @@
+/* XPM */
+static char *kpalmdoc-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 100 2",
+"   c black",
+".  c #090909",
+"X  c #343634",
+"o  c gray26",
+"O  c #494949",
+"+  c #4C4C4C",
+"@  c gray30",
+"#  c #4E4E4E",
+"$  c #515151",
+"%  c gray33",
+"&  c gray35",
+"*  c #526646",
+"=  c #6A6A6A",
+"-  c #6C6C6C",
+";  c #717171",
+":  c #727272",
+">  c gray45",
+",  c #767676",
+"<  c #797979",
+"1  c gray48",
+"2  c #7E7E7E",
+"3  c gray50",
+"4  c #7AAA7A",
+"5  c #838383",
+"6  c #868688",
+"7  c #898989",
+"8  c gray54",
+"9  c #8B8B8B",
+"0  c gray57",
+"q  c #929292",
+"w  c #909790",
+"e  c gray58",
+"r  c #95959C",
+"t  c #929F92",
+"y  c #979997",
+"u  c #979C97",
+"i  c gray61",
+"p  c #9D9D9D",
+"a  c #9898A0",
+"s  c #9C9CB6",
+"d  c #82B282",
+"f  c #8ABA86",
+"g  c #96A796",
+"h  c #9BBB9B",
+"j  c gray65",
+"k  c #A8A9A8",
+"l  c #AAAAAA",
+"z  c #A6B9A6",
+"x  c #B0B0B3",
+"c  c #B6B6B6",
+"v  c #B0B0B8",
+"b  c #B3B3BD",
+"n  c #BBBBC0",
+"m  c #B9B9C6",
+"M  c #A7CAA6",
+"N  c #B3DFB3",
+"B  c #BEF2BE",
+"V  c #C2C2CA",
+"C  c #C4C4D2",
+"Z  c #C6C6D5",
+"A  c #D1D1D9",
+"S  c #D0D0DF",
+"D  c #D3D3E1",
+"F  c #D6D6E1",
+"G  c #D5D5E4",
+"H  c #DADAE7",
+"J  c #DEDEE6",
+"K  c #C2F2C2",
+"L  c #C6F6C6",
+"P  c #CAFAC6",
+"I  c #CEFECE",
+"U  c #D0EFD0",
+"Y  c #D1FED1",
+"T  c #D6FED6",
+"R  c #D9FED9",
+"E  c #E0E0EC",
+"W  c #E1E1ED",
+"Q  c #E4E4EB",
+"!  c #E5E5EF",
+"~  c #E7E7ED",
+"^  c #E9E9EF",
+"/  c #EAEAEF",
+"(  c #E6E6F0",
+")  c #E7E7F0",
+"_  c #E9E9F2",
+"`  c #EAEAF3",
+"'  c #EBEBF4",
+"]  c #ECECF4",
+"[  c #EEEEF5",
+"{  c #EFEFF6",
+"}  c #F1F1F8",
+"|  c #F3F3F9",
+" . c #F7F7F9",
+".. c #F5F5FC",
+"X. c #F6F6FD",
+"o. c #F8F8FE",
+"O. c #F9F9FE",
+"+. c #FCFCFF",
+"@. c gray100",
+"#. c None",
+/* pixels */
+"  $ $ $ $ $ $ * $ m C S s #.#.#.",
+"$ c k w w w w 4 w $ V J S s #.#.",
+"o 7 y U R T K f d < $ A D D s #.",
+"X # 5 z Y I S S S S S S s s s s ",
+"  o 7 u P L S @.X.X.' ' S s Z s ",
+"    # i M B S @.@.X.' ' S D s s ",
+"#.  o ; g N D @.@.X.{ ' s s s s ",
+"#.    # k h D @.3 3 3 3 H r ~ s ",
+"#.    o 7 t S @.@.@.| ' G b F s ",
+"    o # > 0 S @.3 2 3 2 3 r ^ s ",
+"  o = = O - S @.X.[ ( ( J x  .s ",
+"o = , 2 & + S @.3 3 3 3 3 v ~ s ",
+"o ; 3 7 < = D @.{ { ' ' ( 6 @.s ",
+"  o 9 e i j S @.3 3 3 3 3 n ^ s ",
+"    o % 3 0 D X.} { { ' ( ( J s ",
+"#.    . o o s s s s s s s s s s "
+};

Added: trunk/packages/kdepim/debian/icons/kpalmdoc.xpm
===================================================================
--- trunk/packages/kdepim/debian/icons/kpalmdoc.xpm	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/icons/kpalmdoc.xpm	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,150 @@
+/* XPM */
+static char *kpalmdoc[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 112 2",
+"   c black",
+".  c #3F3F3F",
+"X  c #424242",
+"o  c #4C4C4C",
+"O  c #535353",
+"+  c #595959",
+"@  c #526646",
+"#  c gray40",
+"$  c #6B6B6B",
+"%  c #737373",
+"&  c #717C71",
+"*  c #7A7A7A",
+"=  c #6B9B6B",
+"-  c #7E807E",
+";  c #739E73",
+":  c #72A272",
+">  c #7AA67A",
+",  c #7CAB7C",
+"<  c #838383",
+"1  c #8B8B8B",
+"2  c #859385",
+"3  c #849D85",
+"4  c #8F978F",
+"5  c #8B9C8B",
+"6  c #929592",
+"7  c #949894",
+"8  c #9D9D9D",
+"9  c #8D9CB5",
+"0  c #84AE82",
+"q  c #89A38A",
+"w  c #8EAA8D",
+"e  c #82B282",
+"r  c #8AB686",
+"t  c #8ABA86",
+"y  c #8BBC8B",
+"u  c #92B391",
+"i  c #95BA96",
+"p  c #9EACBE",
+"a  c #A4A4A4",
+"s  c #ABABAB",
+"d  c #A4ADBE",
+"f  c #B3B3B3",
+"g  c #BBBBBB",
+"h  c #A2AEC0",
+"j  c #AAB4C4",
+"k  c #AEB9CA",
+"l  c #B2B9C4",
+"z  c #B2BCCA",
+"x  c #B9BFC9",
+"c  c #92C28E",
+"v  c #95C294",
+"b  c #9AC69E",
+"n  c #9ACA96",
+"m  c #9CCC9C",
+"M  c #A2D29E",
+"N  c #A4D6A4",
+"B  c #AAD7AA",
+"V  c #AEDEAE",
+"C  c #ACDCB0",
+"Z  c #BCCABC",
+"A  c #BCDFBC",
+"S  c #AEE2AE",
+"D  c #AEE2B2",
+"F  c #B4E4B6",
+"G  c #B4E4B8",
+"H  c #BAEEBA",
+"J  c #BEF1BD",
+"K  c #B4C0CD",
+"L  c #BAC0CA",
+"P  c #B4C2D2",
+"I  c #B5C3D9",
+"U  c #BAC5D3",
+"Y  c #B9C6DA",
+"T  c #BDC8D5",
+"R  c #BECADD",
+"E  c #C0C0C0",
+"W  c #C2C6CE",
+"Q  c #C6C9CF",
+"!  c #CDCECE",
+"~  c #C0C6D1",
+"^  c #C2C9D3",
+"/  c #C0CBDB",
+"(  c #C6D3C6",
+")  c #C2CDE0",
+"_  c #C5D0E1",
+"`  c #CAD3E4",
+"'  c #CED8EA",
+"]  c #D3DCEA",
+"[  c #D8DFEC",
+"{  c #C1EBC1",
+"}  c #C6F6C6",
+"|  c #CAFAC6",
+" . c #CCFDCC",
+".. c #D8EBD8",
+"X. c #D2F5D2",
+"o. c #D6FED4",
+"O. c #D9F4D9",
+"+. c #DBFEDB",
+"@. c #D7E0EF",
+"#. c #DAE1EE",
+"$. c #DDE4F1",
+"%. c #E0E6F1",
+"&. c #E4E9F3",
+"*. c #E6EEFA",
+"=. c #E9EDF6",
+"-. c #EAEFF8",
+";. c #ECF1F9",
+":. c #F6F6F6",
+">. c #F1F5FB",
+",. c #F5F8FE",
+"<. c #FEFEFE",
+"1. c None",
+/* pixels */
+"1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.",
+"1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.",
+"1.1.1.1.1.1.1.1.1.+ + + + + + + + + + + + + + + + 1.1.1.1.1.1.1.",
+"1.1.1.1.1.1.1.1.1.+ ,.<.<.<.<.<.<.<.,.,.;.&.&.[ + + 1.1.1.1.1.1.",
+"1.1.1.1.1.1.1.1.1.+ ,.<.<.<.<.<.<.<.,.>.-.&.#.] + *.+ 1.1.1.1.1.",
+"1.X X X X X X X X @ X X <.! ! ! ! ! Q >.;.-.&.[ + *.$.+ 1.1.1.1.",
+"X f s 4 4 4 4 4 4 , 4 4 X <.<.<.<.<.,.,.>.-.&.#.+ ,.&.$.+ 1.1.1.",
+"X * 6 ( ..O.X.{ N e > * O :.<.<.<.<.<.,.>.;.&.#.+ <.,.&.$.+ 1.1.",
+"X f 6 Z +.+.o.| S t e ; a X ! ! ! ! ! Q W x =.%.+ =.=.%.] ] + 1.",
+"1.O < * +.o. .| V t y y * O <.<.<.<.<.,.>.>.=.&.+ + + + + + + + ",
+"1.X s 7 A  . .H M y c v 0 s X ! ! ! ! Q W L =.=.&.#.[ _ Y Y z + ",
+"1.1.O 8 & | } F M y v n n * O :.<.<.<.<.,.>.;.=.&.[ ` / R R Y + ",
+"1.1.X < 7 J H G m i m M N v f X ! ! ! ! ,.,.>.=.%.] ` _ ) ) ) + ",
+"1.1.X a s i F F b e : = = ; * O <.<.<.<.,.,.;.&.[ ] ` ` ` ) _ + ",
+"1.1.1.O 1 $ C B y ; = = = , 0 f X ! ! Q ^ L l h d h p p h ` ' + ",
+"1.1.1.X 8 s q b v , , r c m M * O <.,.>.;.&.#.[ [ ] ] ' ' ' ' + ",
+"1.1.1.1.O 1 % 2 i i u w 5 2 < f Z X W x l d l d j j k j j ' ] + ",
+"1.1.1.X X 8 f % $ * * 1 7 s g ! s X =.&.&.&.%.%.%.#.[ [ [ ] [ + ",
+"1.X . # o % a f f f g g E g g s < X x x z z z z z k k z k [ @.+ ",
+"X # # * + o 7 s g g f f g g a * X o -.=.=.*.&.&.%.%.%.[ $.$.$.+ ",
+"# $ % * % + $ 1 8 f s 8 1 % o O $ 1 X W x x x z K K K P z $.@.+ ",
+"$ * - < 1 % o + % * O X X O # < 8 s s X -.-.*.&.%.&.$.#.$.$.$.+ ",
+"% * < 1 6 7 6 - o + - 1 . 8 X s f f g . U U U x U P P I I @.$.+ ",
+"X < 1 6 8 8 s f 8 8 a a 1 . 6 f g g . ;.-.-.=.=.&.&.%.$.$.$.$.+ ",
+"1.X 6 8 8 s f f a s s f f f g Z X X U U T T U U U I P I P #.$.+ ",
+"1.1.X X 8 s f s s f f g f X X X >.;.:.;.;.-.=.=.&.&.&.&.$.&.$.+ ",
+"1.1.1.1.X X X X X X X X X ^ ^ ^ Q T T Q T T U T T U U Y Y $.$.+ ",
+"1.1.1.1.1.1.1.1.1.+ ,.<.<.>.>.>.;.;.;.-.;.=.=.=.&.&.&.#.$.$.$.+ ",
+"1.1.1.1.1.1.1.1.1.+ ,.<.,.>.;.:.>.;.;.;.;.;.=.=.&.&.&.$.$.$.$.+ ",
+"1.1.1.1.1.1.1.1.1.+ ,.<.<.>.,.>.>.;.;.;.T T =.$.&.$.$.$.$.&.$.+ ",
+"1.1.1.1.1.1.1.1.1.+ ;.<.,.>.>.>.>.;.;.;.;.-.-.&.&.&.$.&.$.$.$.+ ",
+"1.1.1.1.1.1.1.1.1.+ + + + + + + + + + + + + + + + + + + + + + + "
+};

Added: trunk/packages/kdepim/debian/icons/kpilot-16.xpm
===================================================================
--- trunk/packages/kdepim/debian/icons/kpilot-16.xpm	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/icons/kpilot-16.xpm	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,194 @@
+/* XPM */
+static char *kpilot-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 172 2",
+"   c black",
+".  c gray2",
+"X  c #111111",
+"o  c #131313",
+"O  c gray12",
+"+  c gray14",
+"@  c #292629",
+"#  c gray16",
+"$  c gray18",
+"%  c gray21",
+"&  c gray22",
+"*  c #3A3A3A",
+"=  c gray23",
+"-  c #3A383C",
+";  c #3C393E",
+":  c #3C3C3C",
+">  c #3F3F3F",
+",  c #4F6736",
+"<  c #526B37",
+"1  c #577139",
+"2  c #577238",
+"3  c #57703C",
+"4  c #57703D",
+"5  c #414141",
+"6  c #444244",
+"7  c #484648",
+"8  c #4C4B4E",
+"9  c #4D4B4F",
+"0  c #4E4E4E",
+"q  c #4F4F51",
+"w  c #515051",
+"e  c #5B5B5B",
+"r  c #5C7641",
+"t  c #5D7742",
+"y  c #617D47",
+"u  c #62794B",
+"i  c #637F48",
+"p  c #657C4B",
+"a  c #697D54",
+"s  c gray38",
+"d  c gray44",
+"f  c #797979",
+"g  c #7C7A7D",
+"h  c #668445",
+"j  c #65804C",
+"k  c #65814D",
+"l  c #69864B",
+"z  c #6A8153",
+"x  c #6B8751",
+"c  c #6D8952",
+"v  c #6E904A",
+"b  c #728D56",
+"n  c #758E5A",
+"m  c #73964C",
+"M  c #719053",
+"N  c #749355",
+"B  c #75935A",
+"V  c #7A9F52",
+"C  c #799B58",
+"Z  c #7B9A5A",
+"A  c #7EA057",
+"S  c #7EA257",
+"D  c #7EA258",
+"F  c #7DA05C",
+"G  c #817E82",
+"H  c #869F6B",
+"J  c #80A458",
+"K  c #82A260",
+"L  c #86A961",
+"P  c #8AA46E",
+"I  c #88AB69",
+"U  c #8EAA6F",
+"Y  c #8CB464",
+"T  c #8CB16A",
+"R  c #93A97A",
+"E  c #91B06D",
+"W  c #92B76D",
+"Q  c #90B96B",
+"!  c #91B670",
+"~  c #91B770",
+"^  c #95B375",
+"/  c #94BB70",
+"(  c #9BB67C",
+")  c #99BF75",
+"_  c #9CC479",
+"`  c #808080",
+"'  c #8A878C",
+"]  c #918D92",
+"[  c gray57",
+"{  c #919092",
+"}  c #959297",
+"|  c #99969A",
+" . c #9A989C",
+".. c #9B999D",
+"X. c #9C9B9C",
+"o. c #9CB481",
+"O. c #A0BA83",
+"+. c #A5BE89",
+"@. c #A5BF8A",
+"#. c gray63",
+"$. c #A3A2A4",
+"%. c #A7A7A7",
+"&. c gray66",
+"*. c #A9A9A9",
+"=. c #A9A8AB",
+"-. c gray67",
+";. c gray68",
+":. c #ADACAE",
+">. c #B0AFB0",
+",. c #B3BCAB",
+"<. c #B3BDAC",
+"1. c #B4BDAD",
+"2. c #B4BEAD",
+"3. c #B1B1B1",
+"4. c #B1B0B2",
+"5. c #B2B2B2",
+"6. c #B3B3B2",
+"7. c gray70",
+"8. c #B3B1B4",
+"9. c gray72",
+"0. c #BBBBBB",
+"q. c #BCBBBD",
+"w. c #BCBBBE",
+"e. c gray74",
+"r. c #A2C980",
+"t. c #A2CA80",
+"y. c #A4CA83",
+"u. c #A6CD85",
+"i. c #A6CE85",
+"p. c #A8CF86",
+"a. c #A8CF87",
+"s. c #ACC393",
+"d. c #B7CAA0",
+"f. c #B9CBA4",
+"g. c #B9CBA5",
+"h. c #B9CCA4",
+"j. c #BACDA5",
+"k. c #BBCEA7",
+"l. c #B7C1B0",
+"z. c #B9C1B1",
+"x. c #BAC3B3",
+"c. c #BFCDB0",
+"v. c #BFCEB1",
+"b. c #C0C7B9",
+"n. c #C0CEB1",
+"m. c #C4CCBD",
+"M. c #C2D0B4",
+"N. c #C4D1B4",
+"B. c #C5D2B7",
+"V. c #CAD6BC",
+"C. c #C1C0C3",
+"Z. c #C3C3C4",
+"A. c #C3C6C1",
+"S. c #C8CFC1",
+"D. c #C9CFC2",
+"F. c #CECED0",
+"G. c #CBD2C3",
+"H. c #CBD3C3",
+"J. c #CDD4C5",
+"K. c #CED5C6",
+"L. c #CED6C6",
+"P. c #D2DDC5",
+"I. c #D2D0D3",
+"U. c #D5D7D4",
+"Y. c #D6D5D7",
+"T. c #D8DED1",
+"R. c #D8DED2",
+"E. c #DAE0D4",
+"W. c #DEE6D4",
+"Q. c #DFE5D9",
+"!. c #F0F2ED",
+"~. c None",
+/* pixels */
+"~.~.# Z.I.F.F.F.F.F.F.Y.`   ~.~.",
+"~.~.e !.T.T.T.T.T.T.R.Q.U.X ~.~.",
+"~.~.g W.d.k.k.k.k.k.s.( D.@ ~.~.",
+"~.~.{ P.o.+.+.R ( U v V H.; ~.~.",
+"~.~...V.^ P H a b 2 2 J L.7 ~.~.",
+"~.~...N.E n z u , < m J L.9 ~.~.",
+"~.~.| N.Z p K t 3 3 h C L.q ~.~.",
+"~.~.} n.D l Z i N y r L G.w ~.~.",
+"~.~.] v.Y N j x c k F W G.8 ~.~.",
+"~.~.' v.W T T B I ! / ) m.6 ~.~.",
+"~.~.` M._ t.i.i.a.a.t.y.x.- ~.~.",
+"~.~.d A.2.2.x.2.z.z.<.z.7.$ ~.~.",
+"~.~.s >.6.q.$.q.8.=.C.;.X.+ ~.~.",
+"~.~.0 6.6.9.#.0.6.%.e.6.} o ~.~.",
+"~.~.% ;.=.%.-.%.=.-.%.-.f . ~.~.",
+"~.~.  % 6 > : : : : = = O   ~.~."
+};

Added: trunk/packages/kdepim/debian/icons/kpilot.xpm
===================================================================
--- trunk/packages/kdepim/debian/icons/kpilot.xpm	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/icons/kpilot.xpm	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,177 @@
+/* XPM */
+static char *kpilot[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 139 2",
+"   c #000000",
+".  c #0B0B0B",
+"X  c gray7",
+"o  c #1A1A1A",
+"O  c #222222",
+"+  c #2D2D2D",
+"@  c #343434",
+"#  c #3B3B3B",
+"$  c #4D6434",
+"%  c #506735",
+"&  c #516936",
+"*  c #546B3B",
+"=  c #57703D",
+"-  c #5A723F",
+";  c #444444",
+":  c #4A4A4A",
+">  c #5C5C5C",
+",  c #5B6E47",
+"<  c #5C6D49",
+"1  c #5B7345",
+"2  c #5F7249",
+"3  c #5E7942",
+"4  c #617D45",
+"5  c #637C4B",
+"6  c #697E52",
+"7  c #656565",
+"8  c #6D6D6D",
+"9  c #727272",
+"0  c #797979",
+"q  c #638044",
+"w  c #65804B",
+"e  c #68844A",
+"r  c #698847",
+"t  c #6C8C4A",
+"y  c #668050",
+"u  c #6A8352",
+"i  c #6C8950",
+"p  c #6F904B",
+"a  c #71855B",
+"s  c #708E53",
+"d  c #75895F",
+"f  c #71924D",
+"g  c #769B4E",
+"h  c #789D4F",
+"j  c #729153",
+"k  c #769559",
+"l  c #779B50",
+"z  c #78955B",
+"x  c #799D50",
+"c  c #79995C",
+"v  c #7F9664",
+"b  c #7DA254",
+"n  c #7FA15A",
+"m  c #839F65",
+"M  c #849A6B",
+"N  c #82A55C",
+"B  c #83A85C",
+"V  c #83A361",
+"C  c #86A06A",
+"Z  c #86AB60",
+"A  c #8AA66C",
+"S  c #88AD63",
+"D  c #8BAC6B",
+"F  c #8BB165",
+"G  c #8EB36A",
+"H  c #91AF6E",
+"J  c #92AF70",
+"K  c #90B36D",
+"L  c #91B86D",
+"P  c #94B174",
+"I  c #95BC70",
+"U  c #98B477",
+"Y  c #99B47B",
+"T  c #98BF75",
+"R  c #9CB87D",
+"E  c #96C070",
+"W  c #98C074",
+"Q  c #9DC47A",
+"!  c #A0C87E",
+"~  c #858585",
+"^  c #8B8B8B",
+"/  c #919191",
+"(  c #9B9B9B",
+")  c #9DB881",
+"_  c #A4BD89",
+"`  c #A8BF8E",
+"'  c #A4A4A4",
+"]  c #AAAAAA",
+"[  c #AEACB0",
+"{  c #B0ADB2",
+"}  c #B3B2B3",
+"|  c #B6B3B8",
+" . c #B8B6BA",
+".. c #BABABB",
+"X. c #BEBDC0",
+"o. c #A7C18C",
+"O. c #A3CC81",
+"+. c #A9C08F",
+"@. c #ABC191",
+"#. c #ADC993",
+"$. c #A6D084",
+"%. c #A8D286",
+"&. c #B3C79B",
+"*. c #B1CC96",
+"=. c #B5C99E",
+"-. c #B6D29D",
+";. c #B7CAA0",
+":. c #BAC5AC",
+">. c #B8CBA1",
+",. c #BBCBAD",
+"<. c #BEC9B0",
+"1. c #BED0AA",
+"2. c #C0CDB3",
+"3. c #C0D1AD",
+"4. c #C3D4B3",
+"5. c #C6D2BA",
+"6. c #C9D5BC",
+"7. c #CAD9BA",
+"8. c #C3C3C3",
+"9. c #C7C5C9",
+"0. c #C9C7CB",
+"q. c #CBCBCB",
+"w. c #CFCDD1",
+"e. c #C9D1C3",
+"r. c #CFDCC4",
+"t. c #D0CFD0",
+"y. c #D5DFC9",
+"u. c #D4D4D4",
+"i. c #D6D4D8",
+"p. c #DADADA",
+"a. c #DFDDE1",
+"s. c #E0DEE2",
+"d. c #E3E3E2",
+"f. c #E4E8E0",
+"g. c #ECECEC",
+"h. c #F0F0EF",
+"j. c #F2F2F2",
+"k. c #FBFBFB",
+"l. c None",
+/* pixels */
+"l.l.l.l.l.  ( ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' 9 . l.l.l.l.l.l.",
+"l.l.l.l.l.> d.j.j.h.j.j.j.h.h.h.h.j.j.h.h.h.h.j.j.~   l.l.l.l.l.",
+"l.l.l.l.  ( k.g.f.f.d.d.f.a.d.a.d.d.d.d.d.d.d.d.k.9.. l.l.l.l.l.",
+"l.l.l.l.  | j.5.} 2.2.2.2.2.2.2.2.:.2.2.2.:.2.3.f.u.O l.l.l.l.l.",
+"l.l.l.l.o 8.j.7.4.4.4.4.4.7.4.4.3.4.4.7.4.7.>.` y.p.# l.l.l.l.l.",
+"l.l.l.l.O q.g.1.=.>.=.>.=.>.>.>.>.;.&.&.` J N g 6.a.: l.l.l.l.l.",
+"l.l.l.l.+ p.g.=.` ` ` ` +.+.` ` ` _ _ R B N g g 6.s.7   l.l.l.l.",
+"l.l.l.l.# p.d.@.R R R R _ R M d M R U r 4 p g g 6.s.8   l.l.l.l.",
+"l.l.l.l.; p.f.+.U Y Y Y R R a < d G p $ $ * g x 6.s.0   l.l.l.l.",
+"l.l.l.l.; p.p.+.J U A 6 M M 6 2 i p & $ $ p x h 6.s.~   l.l.l.l.",
+"l.l.l.l.: i.p.` H J M 5 < 5 6 < - & $ & r b l h 5.p.^   l.l.l.l.",
+"l.l.l.l.: p.p._ A H H 6 5 C 6 * % % $ - b b x h 5.p.^   l.l.l.l.",
+"l.l.l.l.; u.p._ V V d 4 m D 4 % * & * - f t l b 5.i.^   l.l.l.l.",
+"l.l.l.l.; t.p._ N 5 * 4 B N 4 * 4 4 & * 3 = f b 5.u./   l.l.l.l.",
+"l.l.l.l.; q.p._ N j e 1 N S 4 * t V q - = e n N 5.w.^ . l.l.l.l.",
+"l.l.l.l.; q.u._ N B B q s F 5 = i F s 3 * 3 B Z 5.q.^ . l.l.l.l.",
+"l.l.l.l.; q.t.o.n F n q 1 k i i k i 3 i i n D S <.w.^ . l.l.l.l.",
+"l.l.l.l.; 9.t.#.n L v , w y w u 5 u 5 1 n I G G e.0.~ . l.l.l.l.",
+"l.l.l.l.; X.w.#.E E G c G W c 1 c Q K v L I L L 7.8.0   l.l.l.l.",
+"l.l.l.l.# X.w.#.F E W Q Q Q D y D Q Q Q W W I E r...0   l.l.l.l.",
+"l.l.l.l.# X.9.#.L W W Q Q Q $.Q Q $.Q O.O.Q W W 6. .9   l.l.l.l.",
+"l.l.l.l.@ :.0.-.E W ! O.$.%.%.%.%.%.%.%.O.Q Q O.r.| 7   l.l.l.l.",
+"l.l.l.l.+ } X.e.,.,.,.,.<.<.<.<.<.<.<.,.,.,.,.<.q.] >   l.l.l.l.",
+"l.l.l.l.O ] } | | [ | ..| | ..}  . ...|  .} |  .} ' :   l.l.l.l.",
+"l.l.l.l.o ' } ] / ] ' ' } ] ( ' ' } } } ' ] ( ( } ( ;   l.l.l.l.",
+"l.l.l.l.o ( } ( ] h.a.] ] ~ 8.g.8.( ] ( 8.h.0.~ } / @   l.l.l.l.",
+"l.l.l.l.X / } ] ( 8.p.[ ] / | p.2.' ] ' 9.u.] ' ] ^ + l.l.l.l.l.",
+"l.l.l.l.  ~ [ ] ] ' ' ] ] ] ' ' ' ] ] ] ' ' ' ] ] 0 o l.l.l.l.l.",
+"l.l.l.l.  0 ] ' ' ] ' ' ' ] ] ' ' ' ] ' ' ' ' ' ' 8 X l.l.l.l.l.",
+"l.l.l.l.l.> ] ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ~ >   l.l.l.l.l.",
+"l.l.l.l.l.X 7 0 0 0 9 0 9 9 9 9 9 9 8 8 9 8 8 7 > O   l.l.l.l.l.",
+"l.l.l.l.l.l.                                        l.l.l.l.l.l."
+};

Added: trunk/packages/kdepim/debian/icons/ksync-16.xpm
===================================================================
--- trunk/packages/kdepim/debian/icons/ksync-16.xpm	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/icons/ksync-16.xpm	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,29 @@
+/* XPM */
+static char *ksync-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 7 1",
+"  c black",
+". c blue",
+"X c #00C0C0",
+"o c #808080",
+"O c #C0C0C0",
+"+ c gray100",
+"@ c None",
+/* pixels */
+"@@@@@@  @@@@@@@@",
+"@@@@@@ O  @@@@@@",
+"@@  @@  ..  @@@@",
+"@@ O   +  ..  @@",
+"@@  ..  ++  Oo @",
+"@@ +  ..  ++   @",
+"@@ +++  Oo O++ @",
+"   +++++   O++ @",
+" X  ++++++ O++ @",
+"  XX  ++++ O++ @",
+" +  O O+++ OO+ @",
+" O++  O+++   O @",
+"  OO+  OO+ @@  @",
+"@@  O @  O @@@@@",
+"@@@@  @@@  @@@@@",
+"@@@@@@@@@@@@@@@@"
+};

Added: trunk/packages/kdepim/debian/icons/ksync.xpm
===================================================================
--- trunk/packages/kdepim/debian/icons/ksync.xpm	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/icons/ksync.xpm	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,47 @@
+/* XPM */
+static char *ksync[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 9 1",
+"  c black",
+". c #0000C0",
+"X c blue",
+"o c #008080",
+"O c #00C0C0",
+"+ c #808080",
+"@ c #C0C0C0",
+"# c gray100",
+"$ c None",
+/* pixels */
+"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
+"$$$$$$$$$$$$$  $$$$$$$$$$$$$$$$$",
+"$$$$$$$$$$$$$ +  $$$$$$$$$$$$$$$",
+"$$$$$$$$$$$$$ @@   $$$$$$$$$$$$$",
+"$$$$$  $$$$$$ @@ ..  $$$$$$$$$$$",
+"$$$$$ +  $$$$  + XX..  $$$$$$$$$",
+"$$$$$ @@   $$ @  ..XX..  $$$$$$$",
+"$$$$$ @@ ..   ##@  ..XX.   $$$$$",
+"$$$$$  + XX..  @##@  ..X @+  $$$",
+"$$$$$ @  ..XX..  @##@  . @@ +  $",
+"$$$$$ ##@  ..XX.   @##@  +@ @@ $",
+"$$$$$ ####@  ..X @+  @##@   @@ $",
+"$$$$$ ######@  . @@ +  ###@  + $",
+"$$$$$ ########@  +@ @@ @####@  $",
+"$  $$ ##########@   @@ @@####@ $",
+"$ o   ############@  + @@####@ $",
+"$ Ooo  @############@  @@####@ $",
+"$ oOOoo  @###########@ @@####@ $",
+"$  ooOOoo  @#########@ @@####@ $",
+"$ @  ooOO +  ########@ @@####@ $",
+"$ ##@  oo @@ @#######@ @@####@ $",
+"$ ####@   @@ @@######@ @@####@ $",
+"$ ######@  + @@######@ @@@###@ $",
+"$ ########@  @@######@   @@@#@ $",
+"$ @@#######@ @@@#####@ $$  @@@ $",
+"$  @@@#####@   @@@###@ $$$$  @ $",
+"$$$  @@@###@ $$  @@@#@ $$$$$$  $",
+"$$$$$  @@@#@ $$$$  @@@ $$$$$$$$$",
+"$$$$$$$  @@@ $$$$$$  @ $$$$$$$$$",
+"$$$$$$$$$  @ $$$$$$$$  $$$$$$$$$",
+"$$$$$$$$$$$  $$$$$$$$$$$$$$$$$$$",
+"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$"
+};

Added: trunk/packages/kdepim/debian/icons/ktnef-16.xpm
===================================================================
--- trunk/packages/kdepim/debian/icons/ktnef-16.xpm	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/icons/ktnef-16.xpm	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,257 @@
+/* XPM */
+static char *kmail-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 235 2",
+"   c #010101",
+".  c #020202",
+"X  c gray1",
+"o  c #000004",
+"O  c #000307",
+"+  c #020105",
+"@  c #040304",
+"#  c #060505",
+"$  c #070504",
+"%  c #020208",
+"&  c #05080F",
+"*  c #080A0D",
+"=  c #080A0E",
+"-  c #0A090C",
+";  c #0A090E",
+":  c #0E0C0B",
+">  c #0F0C0B",
+",  c #0E0C0C",
+"<  c #0F0D0D",
+"1  c #070911",
+"2  c #060B11",
+"3  c #070C10",
+"4  c #070C12",
+"5  c #070D12",
+"6  c #0B0C10",
+"7  c #0B0D10",
+"8  c #0E0E11",
+"9  c #110F0D",
+"0  c #100F0F",
+"q  c #110F0F",
+"w  c #121010",
+"e  c #131111",
+"r  c #131112",
+"t  c #131212",
+"y  c #141110",
+"u  c #151211",
+"i  c #141212",
+"p  c #171313",
+"a  c #151014",
+"s  c #161315",
+"d  c #171415",
+"f  c #11131D",
+"g  c #15161D",
+"h  c #191316",
+"j  c #181415",
+"k  c #1A1416",
+"l  c #1D1A1A",
+"z  c #1D1A1B",
+"x  c #171920",
+"c  c #181925",
+"v  c #1B1C2E",
+"b  c #1C1F28",
+"n  c #1D1E2F",
+"m  c #211D1C",
+"M  c #241F20",
+"N  c #353847",
+"B  c #442519",
+"V  c #482512",
+"C  c #4F2917",
+"Z  c #582208",
+"A  c #582308",
+"S  c #5A2608",
+"D  c #592B16",
+"F  c #603420",
+"G  c #664427",
+"H  c #66412C",
+"J  c #68492D",
+"K  c #6D5231",
+"L  c #7B5937",
+"P  c #464957",
+"I  c #58504C",
+"U  c #505267",
+"Y  c #5B5D62",
+"T  c #786042",
+"R  c #626271",
+"E  c #6E6D7E",
+"W  c #707073",
+"Q  c #7D7F87",
+"!  c #84400A",
+"~  c #825213",
+"^  c #975E01",
+"/  c #814B2E",
+"(  c #82562E",
+")  c #85532B",
+"_  c #85612C",
+"`  c #AA5201",
+"'  c #AF6B00",
+"]  c #AC6515",
+"[  c #BD6409",
+"{  c #C47400",
+"}  c #C37517",
+"|  c #D16413",
+" . c #DE6D1C",
+".. c #DA741C",
+"X. c #DF711C",
+"o. c #DF7E12",
+"O. c #C96427",
+"+. c #EF7B04",
+"@. c #E47316",
+"#. c #F67800",
+"$. c #F97B04",
+"%. c #BE8618",
+"&. c #968778",
+"*. c #C98106",
+"=. c #DD8116",
+"-. c #CC9732",
+";. c #D58F2D",
+":. c #D28C38",
+">. c #D58D3B",
+",. c #DE8B33",
+"<. c #E59A0D",
+"1. c #FF8500",
+"2. c #F88B00",
+"3. c #FF8E00",
+"4. c #FF9900",
+"5. c #FF9A00",
+"6. c #F49717",
+"7. c #F89413",
+"8. c #FF931F",
+"9. c #F68527",
+"0. c #F19322",
+"q. c #F19A2A",
+"w. c #FCA600",
+"e. c #F3A118",
+"r. c #FFB10A",
+"t. c #FFB50E",
+"y. c #E8A136",
+"u. c #F3AE2E",
+"i. c #FFB420",
+"p. c #FFB82A",
+"a. c #FFBC2C",
+"s. c #F9BD37",
+"d. c #CAA34A",
+"f. c #D4B678",
+"g. c #EEAB5D",
+"h. c #F6A742",
+"j. c #FFC530",
+"k. c #FFC33D",
+"l. c #FEC73E",
+"z. c #FFC140",
+"x. c #FEC741",
+"c. c #F9CE4C",
+"v. c #F3C25C",
+"b. c #FFD245",
+"n. c #FFD352",
+"m. c #F0CD67",
+"M. c #FBD770",
+"N. c #FFDA70",
+"B. c #FFE578",
+"V. c #9B8F83",
+"C. c #9A9AA0",
+"Z. c #9AA0AA",
+"A. c #B4A694",
+"S. c #A4A5A9",
+"D. c #AAABAA",
+"F. c #B7B7B7",
+"G. c #B3B4BA",
+"H. c #BBBAB8",
+"J. c gray73",
+"K. c gray",
+"L. c #BCBEC9",
+"P. c #DBB295",
+"I. c #CBBED6",
+"U. c #F0CE91",
+"Y. c #F9DB83",
+"T. c #E9CDA2",
+"R. c #EDCDAC",
+"E. c #EAD0B0",
+"W. c #FEE58E",
+"Q. c #FDF1B8",
+"!. c #C5C5C4",
+"~. c #C4C5CC",
+"^. c #CACAC9",
+"/. c #CACACA",
+"(. c #CBCBCB",
+"). c #CDCDCC",
+"_. c #CDC1D8",
+"`. c #CCCAD7",
+"'. c #D0C9C9",
+"]. c #D2D2D2",
+"[. c LightGray",
+"{. c #D4D4DA",
+"}. c #DADADA",
+"|. c #DDDDDC",
+" X c #DDDDDD",
+".X c #DFDFDE",
+"XX c #DAD2E1",
+"oX c #DBD3E1",
+"OX c #DDD5E4",
+"+X c #EFE7CC",
+"@X c #F7EDD2",
+"#X c gray88",
+"$X c #E1E2E1",
+"%X c #E3E2E4",
+"&X c #E4E4E4",
+"*X c #E6E6E6",
+"=X c #E7E7E8",
+"-X c #E6E8EA",
+";X c #E7E9ED",
+":X c #E8E8E7",
+">X c #ECE9E5",
+",X c #EAEAEA",
+"<X c #EBEAEA",
+"1X c gray92",
+"2X c #E9EBEF",
+"3X c #ECECEC",
+"4X c gray93",
+"5X c #EEECEF",
+"6X c #EFEFEF",
+"7X c #EDEFF3",
+"8X c #EFF5F6",
+"9X c #F0F0EF",
+"0X c gray94",
+"qX c #F1F1F1",
+"wX c #F0F0F2",
+"eX c #F1F1F3",
+"rX c #F2F1F3",
+"tX c gray95",
+"yX c #F3F2F2",
+"uX c #F3F3F3",
+"iX c #F3F6F7",
+"pX c gray96",
+"aX c #F6F5F6",
+"sX c #F8F8F9",
+"dX c #F8F9F8",
+"fX c #F9FBF9",
+"gX c gray98",
+"hX c #FBFBFB",
+"jX c #F8F9FC",
+"kX c #F8FFFF",
+"lX c #F9FEFF",
+"zX c #FDFFFF",
+"xX c #FEFFFF",
+"cX c gray100",
+"vX c None",
+/* pixels */
+"vXvXvXvXaXW I R.R.T.U.T vXvXvXvX",
+"vXvXvXOX%XrX'.P.@XQ.W.v.J 2 vXvX",
+"vXvXvXXX&XdXxXrX>X+XY.n.u.G & vX",
+"vXvXyXrX9XpXxXxXjX`.f.s.t.6.H 7 ",
+"vXvX4XaX6XaXsXrX3XA.d.m.x.a.>.a ",
+"vXiX*XrXrX,X1X8X{.( -.c.r.5...h ",
+"vX=X1XfX6X,X6X6XV.K ] e.2.$.O.h ",
+"8X=XrX4X}.|.4X~._ *.;.@.6.0.L 8 ",
+"Z.H.J.F.K.|.;X&.^ *.h.B.l.a.:.d ",
+"b D.%X^.[.=XL.) ' ` y.b.w.3.X.h ",
+"# Y .X^.[.$XE ! { } | 2.#.@./ t ",
+"vXg S.^.).G.n V [ <.h.9.8.q.K < ",
+"vXvXP F.!.R + + C =.N.B.j.i.,.s ",
+"vXvXf Q C.v $ @ . F g.k.5.1. .h ",
+"vXvXvXN U * : X . & B S A A D d ",
+"vXvXvXg c 9 : . vXvX& 5 5 5 = 0 "
+};

Added: trunk/packages/kdepim/debian/icons/ktnef.xpm
===================================================================
--- trunk/packages/kdepim/debian/icons/ktnef.xpm	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/icons/ktnef.xpm	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,295 @@
+/* XPM */
+static char *kmail[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 257 2",
+"   c #080707",
+".  c #0C0A0B",
+"X  c gray2",
+"o  c #110F0F",
+"O  c #131011",
+"+  c #181516",
+"@  c #1A1718",
+"#  c #1C191A",
+"$  c #1B1828",
+"%  c #181727",
+"&  c #121A3D",
+"*  c #211D1E",
+"=  c #231F20",
+"-  c #31241E",
+";  c #342926",
+":  c #3C2B24",
+">  c #141F51",
+",  c #20265F",
+"<  c #203055",
+"1  c #323B4C",
+"2  c #333C57",
+"3  c #2A2C62",
+"4  c #222B66",
+"5  c #2C3860",
+"6  c #354877",
+"7  c #4A3630",
+"8  c #6C3100",
+"9  c #7B3E00",
+"0  c #443F75",
+"q  c #7D400B",
+"w  c #604C3E",
+"e  c #56585C",
+"r  c #444B65",
+"t  c #5B5D74",
+"y  c #6D484D",
+"u  c #6E574A",
+"i  c #705147",
+"p  c #7E604A",
+"a  c #7A6255",
+"s  c gray39",
+"d  c #79797A",
+"f  c #404E83",
+"g  c #485185",
+"h  c #6C6D82",
+"j  c #747181",
+"k  c #76758B",
+"l  c #787587",
+"z  c #767881",
+"x  c #903200",
+"c  c #A73500",
+"v  c #8E4601",
+"b  c #9D450C",
+"n  c #9F4C10",
+"m  c #974A1A",
+"M  c #8D4826",
+"N  c #835E2A",
+"B  c #994C27",
+"V  c #9C6602",
+"C  c #996B18",
+"Z  c #A95601",
+"A  c #A25113",
+"S  c #B15900",
+"D  c #BE5F00",
+"F  c #B05502",
+"G  c #A3532C",
+"H  c #AC5731",
+"J  c #A26600",
+"K  c #A66800",
+"L  c #A76F0A",
+"P  c #AB6800",
+"I  c #A16E11",
+"U  c #AE7003",
+"Y  c #B26B00",
+"T  c #BB6D00",
+"R  c #BA7400",
+"E  c #AB7C38",
+"W  c #90745D",
+"Q  c #A36F57",
+"!  c #BE7D59",
+"~  c #AF7962",
+"^  c #B07C62",
+"/  c #CF4F00",
+"(  c #C56403",
+")  c #C17100",
+"_  c #CF7100",
+"`  c #CA7B01",
+"'  c #C27903",
+"]  c #D16E01",
+"[  c #DE7807",
+"{  c #DB7913",
+"}  c #C66622",
+"|  c #C0643D",
+" . c #DB743E",
+".. c #E56A00",
+"X. c #E96100",
+"o. c #EC6F00",
+"O. c #E37A00",
+"+. c #EA7400",
+"@. c #E87800",
+"#. c #E47719",
+"$. c #F46800",
+"%. c #FB6900",
+"&. c #F47300",
+"*. c #F37C00",
+"=. c #FF7600",
+"-. c #FD7B00",
+";. c #F9780F",
+":. c #E37621",
+">. c #E1773E",
+",. c #C56840",
+"<. c #C26F48",
+"1. c #C37556",
+"2. c #E17C42",
+"3. c #BC8011",
+"4. c #B58329",
+"5. c #BF9537",
+"6. c #B48A56",
+"7. c #AB927B",
+"8. c #BA8765",
+"9. c #CC890C",
+"0. c #C48511",
+"q. c #DC8F07",
+"w. c #DE9205",
+"e. c #C0953A",
+"r. c #D6952A",
+"t. c #D19839",
+"y. c #D9A638",
+"u. c #E58615",
+"i. c #F28800",
+"p. c #FD8400",
+"a. c #FE8E00",
+"s. c #FF8F0F",
+"d. c #FF840F",
+"f. c #FE8A10",
+"g. c #FD9300",
+"h. c #FC940E",
+"j. c #FD9B00",
+"k. c #F39200",
+"l. c #E08530",
+"z. c #E18838",
+"x. c #E0833C",
+"c. c #E39221",
+"v. c #E89B33",
+"b. c #F38823",
+"n. c #F2993F",
+"m. c #EBA118",
+"M. c #FEA300",
+"N. c #FEAA00",
+"B. c #FDAE0A",
+"V. c #FEA40E",
+"C. c #F2A519",
+"Z. c #FEB30A",
+"A. c #FDB211",
+"S. c #FEB815",
+"D. c #FFBD19",
+"F. c #E3A439",
+"G. c #F5AF22",
+"H. c #FBAD32",
+"J. c #FAB22D",
+"K. c #FDBB22",
+"L. c #FEB53B",
+"P. c #FEBC35",
+"I. c #FBBC3C",
+"U. c #F7B234",
+"Y. c #DE804A",
+"T. c #DD9552",
+"R. c #C08E6A",
+"E. c #D89761",
+"W. c #D1A748",
+"Q. c #E28042",
+"!. c #E48844",
+"~. c #E7A855",
+"^. c #EBB749",
+"/. c #F6AF40",
+"(. c #FDBD4A",
+"). c #F5B74A",
+"_. c #EAA546",
+"`. c #E5AE67",
+"'. c #E5B273",
+"]. c #EEB773",
+"[. c #D1AE6D",
+"{. c #FEC52E",
+"}. c #F7C338",
+"|. c #FEC53B",
+" X c #FDC93C",
+".X c #DBC37B",
+"XX c #FFC44F",
+"oX c #FECF41",
+"OX c #F9C64A",
+"+X c #FFCA54",
+"@X c #FDCC5B",
+"#X c #FFC554",
+"$X c #F9D15C",
+"%X c #E9C868",
+"&X c #E3CB78",
+"*X c #FEC965",
+"=X c #F4D069",
+"-X c #FED466",
+";X c #FED968",
+":X c #FCDA74",
+">X c #FDDC7C",
+",X c #FED277",
+"<X c #FFE17B",
+"1X c #878787",
+"2X c #948F98",
+"3X c #939393",
+"4X c #9C9C9C",
+"5X c #9A95A0",
+"6X c #9AA2B9",
+"7X c gray64",
+"8X c #AAAAAA",
+"9X c #ADA0BA",
+"0X c #B4B4B4",
+"qX c #BABABA",
+"wX c #D8A680",
+"eX c #CCBFD7",
+"rX c #DFC5BD",
+"tX c #F3D980",
+"yX c #EDDEAE",
+"uX c #FFE484",
+"iX c #FEE789",
+"pX c #FCE590",
+"aX c #FEE994",
+"sX c #FEEBA1",
+"dX c #F4E8B7",
+"fX c #FFF0A3",
+"gX c #FEF6BA",
+"hX c #C4C4C4",
+"jX c #CCCCCC",
+"kX c #D3CCD8",
+"lX c #D4D4D4",
+"zX c #D7D7D9",
+"xX c #DBDBDB",
+"cX c #DEDBE3",
+"vX c #DFD6E2",
+"bX c #E1CBC5",
+"nX c #E4D9D3",
+"mX c #E0DCE3",
+"MX c #F9EBC7",
+"NX c #F3EED5",
+"BX c #F7F2D7",
+"VX c #FDFDD4",
+"CX c #F9F0D8",
+"ZX c #E3E3E3",
+"AX c #E8E2E9",
+"SX c #EAEAEA",
+"DX c #E6E2E8",
+"FX c #EEEBF2",
+"GX c #ECF0F6",
+"HX c #F9F0E4",
+"JX c #FFFFEA",
+"KX c #F3F3F3",
+"LX c #F6FEFE",
+"PX c #FCFAF3",
+"IX c #FEFEFE",
+"UX c #F2F7FA",
+"YX c None",
+/* pixels */
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXIXYXYXYXPXPXHXHXHXCXMXMXdX= = YXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXIXFXAXKX= wXT.'.'.`.`.~.~.~.R.= = = YXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXAXjXmXzXZXbX2.PXIXJXVXgXfX<XF.8.= = = YXYXYXYX",
+"YXYXYXYXYXYXYXYXIXxXlXIXPXmXcXrXdXBXVXgXsXtX>X$Xv.8.= = = YXYXYX",
+"YXYXYXYXYXYXYXeXkXSXxXIXIXIXPXZXlXnXNXdXpXtX;X+X Xc.~ = = = YXYX",
+"YXYXYXYXYXYXYXFXZXLXzXIXIXIXIXIXIXUXmXvXyX=X@XOX{.S.u.~ = = = YX",
+"YXYXYXYXYXYXIXmXIXPXzXIXIXIXIXIXIXIXIXjX9X%X).I.K.B.N.#.^ = = = ",
+"YXYXYXYXYXYXSXSXIXLXzXIXIXIXIXIXIXKXxXhX7..X^.G.B.M.j.g.#.~ = = ",
+"YXYXYXYXYXIXDXUXIXPXzXIXIXIXIXPXZXxXZX4X5.W..XtX:X-X@X#X(.E.= = ",
+"YXYXYXYXIXGXSXZXPXUXzXPXIXKXSXxXSXKXlXW 5.t.&X$X}.D.A.V.h.!.= = ",
+"YXYXYXYXIXmXKXZXIXLXnXUXZXZXSXKXKXSX3Xq 4.y.%X}.S.N.j.g.p.2.= = ",
+"YXYXYXLXmXSXDXFXIXUXcXSXGXKXKXSXKXqXa 8 v r.=XK.N.M.g.p.-.2.= = ",
+"YXYXYXUXzXSXmXIXPXUXnXPXKXSXSXSXZXl C N 9 Z ^.B.j.k.p.=.%.2.= = ",
+"YXYXLXcXZXLXUXPXPXUXzXSXSXSXAXSXqXu I 4.E Z _ @.@.@.o.#.!.1.= = ",
+"YXYXGXSXPXPXPXUXFXSXjXmXZXZXSXZXh C I 3.y.T._ O.i.g.j.#.6.= = = ",
+"YXLXzXlXZXZXzXjXjXhXqXZXZXZXAX0Xu V L 0.m.(.~._.L.L.L.H.v.[.= = ",
+"YX6X7X7X4X4X4X8X8X0XhXxXZXAXxXl V V U 9.C.J.iXiX;X+X|.P.H.~.= = ",
+"YX6 s qXlXjXlXjXqXlXzXxXZXZX0Xy V K U S C.I.>X XS.N.M.g.-.2.= = ",
+"YX= 1 3XzXxXxXzXqXxXZXxXZXxXk m J U R x ( I.<X{.Z.N.j.a.-.2.= = ",
+"YXYX+ e hXxXzXlXqXxXxXxXxX8Xr m P Y R A c { ).C.k.i.@.=.$.2.= = ",
+"YXYX= 2 3XxXzXlX0XlXxXxXjXk 7 b Y T ` r.} / ..+.&.&.o.x.! Q = = ",
+"YXYX= # e qXzXlX8XlXlXlX8X3 : M F ) _ w.).:.X.%.-.p.*.z.u = = = ",
+"YXYXYX= > 7.jXjX8XjXlXhXh $ O ; B D ` q.J.*Xb.;.d.f.f.h.l.w = = ",
+"YXYXYX= @ r 8XhX8XhXjX4X3 O o . - B ( q.U.*XsXpX>X;X@X+X(.].= = ",
+"YXYXYXYX= > d hX7XqXqXh O O o .   7 H @.(.,XaXoXD.B.M.g.p.Q.= = ",
+"YXYXYXYX= # 2 2X7XqX2X, O o .   X   : | u.>XpX{.A.N.j.a.p.Q.= = ",
+"YXYXYXYXYX$ & z 3X8Xt % o O o     o * i | _.uXD.N.M.g.p.=.2.= = ",
+"YXYXYXYXYXYX# 4 1Xd 4 + + + + # YX= = = ; <.c c c c c c c 2.= = ",
+"YXYXYXYXYXYX= + r h $ # * = = = YXYX= = = = = = = = = = = = = = ",
+"YXYXYXYXYXYXYX= f g * = = = = YXYXYXYX= = = = = = = = = = = = = ",
+"YXYXYXYXYXYXYX= = = = = = = = YXYXYXYXYX= = = = = = = = = = = = "
+};

Modified: trunk/packages/kdepim/debian/kaddressbook.install
===================================================================
--- trunk/packages/kdepim/debian/kaddressbook.install	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/kaddressbook.install	2005-01-21 03:24:38 UTC (rev 434)
@@ -2,113 +2,51 @@
 debian/tmp/usr/bin/kaddressbook
 debian/tmp/usr/lib/kde3/kabc_imap.la
 debian/tmp/usr/lib/kde3/kabc_imap.so
+debian/tmp/usr/lib/kde3/kabc_slox.la
+debian/tmp/usr/lib/kde3/kabc_slox.so
+debian/tmp/usr/lib/kde3/kabc_xmlrpc.la
+debian/tmp/usr/lib/kde3/kabc_xmlrpc.so
 debian/tmp/usr/lib/kde3/kcm_kabconfig.la
 debian/tmp/usr/lib/kde3/kcm_kabconfig.so
+debian/tmp/usr/lib/kde3/kcm_kabcustomfields.la
+debian/tmp/usr/lib/kde3/kcm_kabcustomfields.so
 debian/tmp/usr/lib/kde3/kcm_kabldapconfig.la
 debian/tmp/usr/lib/kde3/kcm_kabldapconfig.so
 debian/tmp/usr/lib/kde3/ldifvcardthumbnail.la
 debian/tmp/usr/lib/kde3/ldifvcardthumbnail.so
-debian/tmp/usr/lib/kde3/libkaddrbk_bookmark_xxport.la
-debian/tmp/usr/lib/kde3/libkaddrbk_bookmark_xxport.so
-debian/tmp/usr/lib/kde3/libkaddrbk_cardview.la
-debian/tmp/usr/lib/kde3/libkaddrbk_cardview.so
-debian/tmp/usr/lib/kde3/libkaddrbk_csv_xxport.la
-debian/tmp/usr/lib/kde3/libkaddrbk_csv_xxport.so
-debian/tmp/usr/lib/kde3/libkaddrbk_distributionlist.la
-debian/tmp/usr/lib/kde3/libkaddrbk_distributionlist.so
-debian/tmp/usr/lib/kde3/libkaddrbk_eudora_xxport.la
-debian/tmp/usr/lib/kde3/libkaddrbk_eudora_xxport.so
-debian/tmp/usr/lib/kde3/libkaddrbk_gnokii_xxport.la
-debian/tmp/usr/lib/kde3/libkaddrbk_gnokii_xxport.so
-debian/tmp/usr/lib/kde3/libkaddrbk_iconview.la
-debian/tmp/usr/lib/kde3/libkaddrbk_iconview.so
-debian/tmp/usr/lib/kde3/libkaddrbk_kde2_xxport.la
-debian/tmp/usr/lib/kde3/libkaddrbk_kde2_xxport.so
-debian/tmp/usr/lib/kde3/libkaddrbk_ldif_xxport.la
-debian/tmp/usr/lib/kde3/libkaddrbk_ldif_xxport.so
-debian/tmp/usr/lib/kde3/libkaddrbk_location.la
-debian/tmp/usr/lib/kde3/libkaddrbk_location.so
-debian/tmp/usr/lib/kde3/libkaddrbk_merge.la
-debian/tmp/usr/lib/kde3/libkaddrbk_merge.so
-debian/tmp/usr/lib/kde3/libkaddrbk_opera_xxport.la
-debian/tmp/usr/lib/kde3/libkaddrbk_opera_xxport.so
-debian/tmp/usr/lib/kde3/libkaddrbk_pab_xxport.la
-debian/tmp/usr/lib/kde3/libkaddrbk_pab_xxport.so
-debian/tmp/usr/lib/kde3/libkaddrbk_tableview.la
-debian/tmp/usr/lib/kde3/libkaddrbk_tableview.so
-debian/tmp/usr/lib/kde3/libkaddrbk_vcard_xxport.la
-debian/tmp/usr/lib/kde3/libkaddrbk_vcard_xxport.so
+debian/tmp/usr/lib/kde3/libkaddrbk_*.la
+debian/tmp/usr/lib/kde3/libkaddrbk_*.so
 debian/tmp/usr/lib/kde3/libkaddressbookpart.la
 debian/tmp/usr/lib/kde3/libkaddressbookpart.so
+debian/tmp/usr/lib/libkabc_imap.so.0
+debian/tmp/usr/lib/libkabc_imap.so.0.0.0
+debian/tmp/usr/lib/libkabc_slox.so.0
+debian/tmp/usr/lib/libkabc_slox.so.0.0.0
+debian/tmp/usr/lib/libkabc_xmlrpc.so.1
+debian/tmp/usr/lib/libkabc_xmlrpc.so.1.0.0
 debian/tmp/usr/lib/libkabinterfaces.so.1
 debian/tmp/usr/lib/libkabinterfaces.so.1.0.0
 debian/tmp/usr/lib/libkaddressbook.so.0
 debian/tmp/usr/lib/libkaddressbook.so.0.0.0
 debian/tmp/usr/share/applications/kde/kaddressbook.desktop
-debian/tmp/usr/share/apps/kaddressbook/bookmark_xxportui.rc
-debian/tmp/usr/share/apps/kaddressbook/csv-templates/kaddressbook.desktop
-debian/tmp/usr/share/apps/kaddressbook/csv-templates/outlook2000.desktop
-debian/tmp/usr/share/apps/kaddressbook/csv-templates/yahoo.desktop
-debian/tmp/usr/share/apps/kaddressbook/csv_xxportui.rc
-debian/tmp/usr/share/apps/kaddressbook/eudora_xxportui.rc
-debian/tmp/usr/share/apps/kaddressbook/gnokii_xxportui.rc
-debian/tmp/usr/share/apps/kaddressbook/icons/crystalsvg/16x16/actions/ldap_lookup.png
-debian/tmp/usr/share/apps/kaddressbook/icons/crystalsvg/16x16/actions/smallcal.png
-debian/tmp/usr/share/apps/kaddressbook/icons/crystalsvg/32x32/actions/gohome.png
-debian/tmp/usr/share/apps/kaddressbook/icons/crystalsvg/32x32/actions/homepage.png
-debian/tmp/usr/share/apps/kaddressbook/icons/locolor/16x16/actions/contact.png
-debian/tmp/usr/share/apps/kaddressbook/icons/locolor/16x16/actions/down.png
-debian/tmp/usr/share/apps/kaddressbook/icons/locolor/16x16/actions/group.png
-debian/tmp/usr/share/apps/kaddressbook/icons/locolor/16x16/actions/up.png
-debian/tmp/usr/share/apps/kaddressbook/icons/locolor/22x22/actions/page.png
-debian/tmp/usr/share/apps/kaddressbook/kaddressbook_part.rc
-debian/tmp/usr/share/apps/kaddressbook/kaddressbookui.rc
-debian/tmp/usr/share/apps/kaddressbook/kde2_xxportui.rc
-debian/tmp/usr/share/apps/kaddressbook/ldif_xxportui.rc
-debian/tmp/usr/share/apps/kaddressbook/opera_xxportui.rc
-debian/tmp/usr/share/apps/kaddressbook/pab_xxportui.rc
-debian/tmp/usr/share/apps/kaddressbook/pics/world.jpg
-debian/tmp/usr/share/apps/kaddressbook/printing/detailed-style.png
-debian/tmp/usr/share/apps/kaddressbook/printing/mike-style.png
-debian/tmp/usr/share/apps/kaddressbook/printing/ringbinder-style.png
-debian/tmp/usr/share/apps/kaddressbook/vcard_xxportui.rc
-debian/tmp/usr/share/apps/kaddressbook/zone.tab
-debian/tmp/usr/share/doc/kde/HTML/en/kaddressbook/common
-debian/tmp/usr/share/doc/kde/HTML/en/kaddressbook/conf.png
-debian/tmp/usr/share/doc/kde/HTML/en/kaddressbook/contactdlg.png
-debian/tmp/usr/share/doc/kde/HTML/en/kaddressbook/exportdlg.png
-debian/tmp/usr/share/doc/kde/HTML/en/kaddressbook/extension.png
-debian/tmp/usr/share/doc/kde/HTML/en/kaddressbook/filtereditdlg.png
-debian/tmp/usr/share/doc/kde/HTML/en/kaddressbook/index.cache.bz2
-debian/tmp/usr/share/doc/kde/HTML/en/kaddressbook/index.docbook
-debian/tmp/usr/share/doc/kde/HTML/en/kaddressbook/mainwin.png
-debian/tmp/usr/share/doc/kde/HTML/en/kaddressbook/resourcedlg.png
-debian/tmp/usr/share/doc/kde/HTML/en/kaddressbook/vieweditdlg.png
+debian/tmp/usr/share/apps/kaddressbook
+debian/tmp/usr/share/doc/kde/HTML/en/kaddressbook
 debian/tmp/usr/share/icons/crystalsvg/128x128/apps/kaddressbook.png
 debian/tmp/usr/share/icons/crystalsvg/16x16/apps/kaddressbook.png
 debian/tmp/usr/share/icons/crystalsvg/32x32/apps/kaddressbook.png
 debian/tmp/usr/share/icons/crystalsvg/48x48/apps/kaddressbook.png
 debian/tmp/usr/share/icons/crystalsvg/64x64/apps/kaddressbook.png
 debian/tmp/usr/share/services/kabconfig.desktop
+debian/tmp/usr/share/services/kabcustomfields.desktop
 debian/tmp/usr/share/services/kabldapconfig.desktop
-debian/tmp/usr/share/services/kaddressbook/bookmark_xxport.desktop
-debian/tmp/usr/share/services/kaddressbook/cardview.desktop
-debian/tmp/usr/share/services/kaddressbook/csv_xxport.desktop
-debian/tmp/usr/share/services/kaddressbook/distributionlist.desktop
-debian/tmp/usr/share/services/kaddressbook/eudora_xxport.desktop
-debian/tmp/usr/share/services/kaddressbook/gnokii_xxport.desktop
-debian/tmp/usr/share/services/kaddressbook/iconview.desktop
-debian/tmp/usr/share/services/kaddressbook/kde2_xxport.desktop
-debian/tmp/usr/share/services/kaddressbook/ldif_xxport.desktop
-debian/tmp/usr/share/services/kaddressbook/location.desktop
-debian/tmp/usr/share/services/kaddressbook/merge.desktop
-debian/tmp/usr/share/services/kaddressbook/opera_xxport.desktop
-debian/tmp/usr/share/services/kaddressbook/pab_xxport.desktop
-debian/tmp/usr/share/services/kaddressbook/tableview.desktop
-debian/tmp/usr/share/services/kaddressbook/vcard_xxport.desktop
-debian/tmp/usr/share/services/kresources/kabc/imap.desktop
+debian/tmp/usr/share/services/kaddressbook
+debian/tmp/usr/share/services/kresources/kabc
 debian/tmp/usr/share/services/ldifvcardthumbnail.desktop
 debian/tmp/usr/share/servicetypes/dcopaddressbook.desktop
+debian/tmp/usr/share/servicetypes/kaddressbook_contacteditorwidget.desktop
+debian/tmp/usr/share/servicetypes/kaddressbookimprotocol.desktop
 debian/tmp/usr/share/servicetypes/kaddressbook_extension.desktop
 debian/tmp/usr/share/servicetypes/kaddressbook_view.desktop
 debian/tmp/usr/share/servicetypes/kaddressbook_xxport.desktop
+debian/icons/kaddressbook.xpm /usr/share/pixmaps
+debian/icons/kaddressbook-16.xpm /usr/share/pixmaps

Added: trunk/packages/kdepim/debian/kaddressbook.links
===================================================================
--- trunk/packages/kdepim/debian/kaddressbook.links	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/kaddressbook.links	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1 @@
+/usr/share/doc/kde/HTML/en/kaddressbook /usr/share/doc/kaddressbook/html

Added: trunk/packages/kdepim/debian/kaddressbook.manpages
===================================================================
--- trunk/packages/kdepim/debian/kaddressbook.manpages	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/kaddressbook.manpages	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,2 @@
+debian/man/kabc2mutt.1
+debian/man/kaddressbook.1

Modified: trunk/packages/kdepim/debian/kaddressbook.menu
===================================================================
--- trunk/packages/kdepim/debian/kaddressbook.menu	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/kaddressbook.menu	2005-01-21 03:24:38 UTC (rev 434)
@@ -3,4 +3,6 @@
 	section="Apps/Tools"\
 	hints="KDE"\
 	title="KAddressbook"\
+	icon32x32="/usr/share/pixmaps/kaddressbook.xpm"\
+	icon16x16="/usr/share/pixmaps/kaddressbook-16.xpm"\
 	command="/usr/bin/kaddressbook"

Modified: trunk/packages/kdepim/debian/kalarm.install
===================================================================
--- trunk/packages/kdepim/debian/kalarm.install	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/kalarm.install	2005-01-21 03:24:38 UTC (rev 434)
@@ -5,25 +5,15 @@
 debian/tmp/usr/share/applications/kde/kalarm.desktop
 debian/tmp/usr/share/applnk/.hidden/kalarmd.desktop
 debian/tmp/usr/share/applnk/Applications/kalarm.desktop
-debian/tmp/usr/share/apps/kalarm/icons/crystalsvg/16x16/actions/file.png
-debian/tmp/usr/share/apps/kalarm/icons/crystalsvg/16x16/actions/kalarm.png
-debian/tmp/usr/share/apps/kalarm/icons/crystalsvg/16x16/actions/message.png
-debian/tmp/usr/share/apps/kalarm/icons/crystalsvg/16x16/actions/playsound.png
-debian/tmp/usr/share/apps/kalarm/icons/crystalsvg/22x22/actions/kalarm.png
-debian/tmp/usr/share/apps/kalarm/icons/crystalsvg/22x22/actions/kalarm_disabled.png
+debian/tmp/usr/share/apps/kalarm
 debian/tmp/usr/share/autostart/kalarm.tray.desktop
 debian/tmp/usr/share/autostart/kalarmd.autostart.desktop
-debian/tmp/usr/share/doc/kde/HTML/en/kalarm/alarmmessage.png
-debian/tmp/usr/share/doc/kde/HTML/en/kalarm/common
-debian/tmp/usr/share/doc/kde/HTML/en/kalarm/editwindow.png
-debian/tmp/usr/share/doc/kde/HTML/en/kalarm/index.cache.bz2
-debian/tmp/usr/share/doc/kde/HTML/en/kalarm/index.docbook
-debian/tmp/usr/share/doc/kde/HTML/en/kalarm/mainwindow.png
-debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/kalarmd/common
-debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/kalarmd/index.cache.bz2
-debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/kalarmd/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kalarm
+debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/kalarmd
 debian/tmp/usr/share/icons/crystalsvg/16x16/actions/kalarm.png
 debian/tmp/usr/share/icons/crystalsvg/16x16/apps/kalarm.png
 debian/tmp/usr/share/icons/crystalsvg/22x22/actions/kalarm.png
 debian/tmp/usr/share/icons/crystalsvg/32x32/apps/kalarm.png
 debian/tmp/usr/share/icons/crystalsvg/48x48/apps/kalarm.png
+debian/icons/kalarm.xpm /usr/share/pixmaps
+debian/icons/kalarm-16.xpm /usr/share/pixmaps

Added: trunk/packages/kdepim/debian/kalarm.links
===================================================================
--- trunk/packages/kdepim/debian/kalarm.links	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/kalarm.links	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1 @@
+/usr/share/doc/kde/HTML/en/kalarm /usr/share/doc/kalarm/html

Added: trunk/packages/kdepim/debian/kalarm.manpages
===================================================================
--- trunk/packages/kdepim/debian/kalarm.manpages	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/kalarm.manpages	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,2 @@
+debian/man/kalarm.1
+debian/man/kalarmd.1

Modified: trunk/packages/kdepim/debian/kalarm.menu
===================================================================
--- trunk/packages/kdepim/debian/kalarm.menu	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/kalarm.menu	2005-01-21 03:24:38 UTC (rev 434)
@@ -3,4 +3,6 @@
 	section="Apps/Tools"\
 	hints="KDE"\
 	title="KAlarm"\
+	icon32x32="/usr/share/pixmaps/kalarm.xpm"\
+	icon16x16="/usr/share/pixmaps/kalarm-16.xpm"\
 	command="/usr/bin/kalarm"

Modified: trunk/packages/kdepim/debian/kandy.install
===================================================================
--- trunk/packages/kdepim/debian/kandy.install	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/kandy.install	2005-01-21 03:24:38 UTC (rev 434)
@@ -2,10 +2,6 @@
 debian/tmp/usr/bin/kandy_client
 debian/tmp/usr/share/applications/kde/kandy.desktop
 debian/tmp/usr/share/applnk/Utilities/kandy.desktop
-debian/tmp/usr/share/apps/kandy/default.kandy
-debian/tmp/usr/share/apps/kandy/kandymobileui.rc
-debian/tmp/usr/share/apps/kandy/kandyui.rc
+debian/tmp/usr/share/apps/kandy
 debian/tmp/usr/share/config.kcfg/kandy.kcfg
-debian/tmp/usr/share/doc/kde/HTML/en/kandy/common
-debian/tmp/usr/share/doc/kde/HTML/en/kandy/index.cache.bz2
-debian/tmp/usr/share/doc/kde/HTML/en/kandy/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kandy

Added: trunk/packages/kdepim/debian/kandy.links
===================================================================
--- trunk/packages/kdepim/debian/kandy.links	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/kandy.links	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1 @@
+/usr/share/doc/kde/HTML/en/kandy /usr/share/doc/kandy/html

Added: trunk/packages/kdepim/debian/kandy.manpages
===================================================================
--- trunk/packages/kdepim/debian/kandy.manpages	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/kandy.manpages	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,2 @@
+debian/man/kandy.1
+debian/man/kandy_client.1

Modified: trunk/packages/kdepim/debian/karm.install
===================================================================
--- trunk/packages/kdepim/debian/karm.install	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/karm.install	2005-01-21 03:24:38 UTC (rev 434)
@@ -1,33 +1,12 @@
 debian/tmp/usr/bin/karm
 debian/tmp/usr/share/applications/kde/karm.desktop
 debian/tmp/usr/share/applnk/Utilities/karm.desktop
-debian/tmp/usr/share/apps/karm/karmui.rc
-debian/tmp/usr/share/apps/karm/pics/active-icon-0.xpm
-debian/tmp/usr/share/apps/karm/pics/active-icon-1.xpm
-debian/tmp/usr/share/apps/karm/pics/active-icon-2.xpm
-debian/tmp/usr/share/apps/karm/pics/active-icon-3.xpm
-debian/tmp/usr/share/apps/karm/pics/active-icon-4.xpm
-debian/tmp/usr/share/apps/karm/pics/active-icon-5.xpm
-debian/tmp/usr/share/apps/karm/pics/active-icon-6.xpm
-debian/tmp/usr/share/apps/karm/pics/active-icon-7.xpm
-debian/tmp/usr/share/apps/karm/pics/clock.xpm
-debian/tmp/usr/share/apps/karm/pics/clockedit.xpm
-debian/tmp/usr/share/apps/karm/pics/empty-watch.xpm
-debian/tmp/usr/share/apps/karm/pics/filedel.xpm
-debian/tmp/usr/share/apps/karm/pics/watch-0.xpm
-debian/tmp/usr/share/apps/karm/pics/watch-1.xpm
-debian/tmp/usr/share/apps/karm/pics/watch-2.xpm
-debian/tmp/usr/share/apps/karm/pics/watch-3.xpm
-debian/tmp/usr/share/apps/karm/pics/watch-4.xpm
-debian/tmp/usr/share/apps/karm/pics/watch-5.xpm
-debian/tmp/usr/share/apps/karm/pics/watch-6.xpm
-debian/tmp/usr/share/apps/karm/pics/watch-7.xpm
-debian/tmp/usr/share/doc/kde/HTML/en/karm/common
-debian/tmp/usr/share/doc/kde/HTML/en/karm/index.cache.bz2
-debian/tmp/usr/share/doc/kde/HTML/en/karm/index.docbook
-debian/tmp/usr/share/doc/kde/HTML/en/karm/karm.png
+debian/tmp/usr/share/apps/karm
+debian/tmp/usr/share/doc/kde/HTML/en/karm
 debian/tmp/usr/share/icons/crystalsvg/128x128/apps/karm.png
 debian/tmp/usr/share/icons/crystalsvg/16x16/apps/karm.png
 debian/tmp/usr/share/icons/crystalsvg/32x32/apps/karm.png
 debian/tmp/usr/share/icons/crystalsvg/48x48/apps/karm.png
 debian/tmp/usr/share/icons/crystalsvg/64x64/apps/karm.png
+debian/icons/karm.xpm /usr/share/pixmaps
+debian/icons/karm-16.xpm /usr/share/pixmaps

Added: trunk/packages/kdepim/debian/karm.links
===================================================================
--- trunk/packages/kdepim/debian/karm.links	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/karm.links	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1 @@
+/usr/share/doc/kde/HTML/en/karm /usr/share/doc/karm/html

Added: trunk/packages/kdepim/debian/karm.manpages
===================================================================
--- trunk/packages/kdepim/debian/karm.manpages	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/karm.manpages	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1 @@
+debian/man/karm.1

Modified: trunk/packages/kdepim/debian/karm.menu
===================================================================
--- trunk/packages/kdepim/debian/karm.menu	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/karm.menu	2005-01-21 03:24:38 UTC (rev 434)
@@ -3,4 +3,6 @@
 	section="Apps/Tools"\
 	hints="KDE"\
 	title="KArm"\
+	icon32x32="/usr/share/pixmaps/karm.xpm"\
+	icon16x16="/usr/share/pixmaps/karm-16.xpm"\
 	command="/usr/bin/karm"

Added: trunk/packages/kdepim/debian/kde.mk
===================================================================
--- trunk/packages/kdepim/debian/kde.mk	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/kde.mk	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,103 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
+# Description: A class for KDE packages; sets KDE environment variables, etc
+#
+# 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, 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.
+
+
+ifndef _cdbs_bootstrap
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+endif
+
+ifndef _cdbs_class_kde
+_cdbs_class_kde := 1
+
+include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
+
+DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
+
+common-configure-arch common-configure-indep:: debian/stamp-cvs-make
+debian/stamp-cvs-make:
+	if test -n "$(DEB_KDE_CVS_MAKE)" -a ! -f configure; then \
+		$(MAKE) -f admin/Makefile.common; \
+	fi
+	touch debian/stamp-cvs-make
+
+include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
+
+export kde_cgidir = /usr/lib/cgi-bin
+export kde_confdir = /etc/kde3
+export kde_htmldir = /usr/share/doc/kde/HTML
+
+ifeq (,$(findstring nofinal,$(DEB_BUILD_OPTIONS)))
+	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
+endif
+ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+	cdbs_kde_enable_final = 
+	cdbs_kde_enable_debug = --enable-debug=full
+else
+	cdbs_kde_enable_debug = --disable-debug
+endif
+
+cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
+
+DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_COMPRESS_EXCLUDE := .dcl .docbook -license .tag
+
+common-build-arch common-build-indep:: debian/stamp-apidox
+debian/stamp-apidox:
+	if test -n "$(DEB_KDE_APIDOX)"; then \
+		$(DEB_MAKE_INVOKE) apidox; \
+	fi
+	touch debian/stamp-apidox
+
+common-install-arch common-install-indep:: install-apidox
+install-apidox::
+	if test -n "$(DEB_KDE_APIDOX)"; then \
+		$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR); \
+	fi
+
+clean::
+	if test -n "$(DEB_KDE_CVS_MAKE)"; then \
+		find . -name Makefile.in -print | \
+			xargs --no-run-if-empty rm -f; \
+		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
+			configure configure.files configure.in stamp-h.in \
+			subdirs; \
+	fi
+	rm -f debian/stamp-cvs-make
+	rm -f debian/stamp-apidox
+
+cleanbuilddir::
+	-if test "$(DEB_BUILDDIR)" != "$(DEB_SRCDIR)"; then rm -rf $(DEB_BUILDDIR); fi
+
+binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
+	set -e; \
+	for doc in `cd debian/tmp/usr/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	  pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
+	  echo Building $$pkg HTML docs...; \
+	  mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/kde/HTML/en/$$pkg; \
+	  cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/kde/HTML/en/$$pkg; \
+	  meinproc $(CURDIR)/debian/tmp/usr/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+	done
+
+$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
+	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
+
+endif

Modified: trunk/packages/kdepim/debian/kdepim-dev.install
===================================================================
--- trunk/packages/kdepim/debian/kdepim-dev.install	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/kdepim-dev.install	2005-01-21 03:24:38 UTC (rev 434)
@@ -1,45 +1,30 @@
+debian/tmp/usr/include/kde/KNotesAppIface.h
 debian/tmp/usr/include/kde/KNotesIface.h
-debian/tmp/usr/include/kde/calendar/calendardecoration.h
-debian/tmp/usr/include/kde/calendar/plugin.h
-debian/tmp/usr/include/kde/kaddressbook/configurewidget.h
-debian/tmp/usr/include/kde/kaddressbook/core.h
-debian/tmp/usr/include/kde/kaddressbook/extensionwidget.h
-debian/tmp/usr/include/kde/kaddressbook/xxport.h
+debian/tmp/usr/include/kde/kabc
+debian/tmp/usr/include/kde/calendar
+debian/tmp/usr/include/kde/kaddressbook
+debian/tmp/usr/include/kde/kitchensync
+debian/tmp/usr/include/kde/kmail
 debian/tmp/usr/include/kde/kmailIface.h
 debian/tmp/usr/include/kde/kmailicalIface.h
 debian/tmp/usr/include/kde/kmailpartIface.h
-debian/tmp/usr/include/kde/knewstuff/downloaddialog.h
-debian/tmp/usr/include/kde/knewstuff/engine.h
-debian/tmp/usr/include/kde/knewstuff/entry.h
-debian/tmp/usr/include/kde/knewstuff/ghns.h
-debian/tmp/usr/include/kde/knewstuff/knewstuff.h
-debian/tmp/usr/include/kde/knewstuff/knewstuffgeneric.h
-debian/tmp/usr/include/kde/knewstuff/provider.h
-debian/tmp/usr/include/kde/knewstuff/providerdialog.h
-debian/tmp/usr/include/kde/knewstuff/testnewstuff.h
-debian/tmp/usr/include/kde/knewstuff/uploaddialog.h
-debian/tmp/usr/include/kde/kontact/core.h
-debian/tmp/usr/include/kde/kontact/plugin.h
-debian/tmp/usr/include/kde/kontact/summary.h
-debian/tmp/usr/include/kde/korganizer/baseview.h
-debian/tmp/usr/include/kde/korganizer/calendarviewbase.h
-debian/tmp/usr/include/kde/korganizer/mainwindow.h
-debian/tmp/usr/include/kde/korganizer/part.h
-debian/tmp/usr/include/kde/kpilot/kpilotlink.h
-debian/tmp/usr/include/kde/kpilot/pilotDatabase.h
-debian/tmp/usr/include/kde/kpilot/pilotLocalDatabase.h
-debian/tmp/usr/include/kde/kpilot/pilotRecord.h
-debian/tmp/usr/include/kde/kpilot/pilotSerialDatabase.h
-debian/tmp/usr/include/kde/kpilot/plugin.h
-debian/tmp/usr/include/kde/kpilot/syncAction.h
-debian/tmp/usr/include/kde/kpilot/uiDialog.h
-debian/tmp/usr/include/kde/ktnef/ktnefattach.h
-debian/tmp/usr/include/kde/ktnef/ktnefdefs.h
-debian/tmp/usr/include/kde/ktnef/ktnefmessage.h
-debian/tmp/usr/include/kde/ktnef/ktnefparser.h
-debian/tmp/usr/include/kde/ktnef/ktnefproperty.h
-debian/tmp/usr/include/kde/ktnef/ktnefpropertyset.h
-debian/tmp/usr/include/kde/ktnef/ktnefwriter.h
+debian/tmp/usr/include/kde/kontact
+debian/tmp/usr/include/kde/korganizer
+debian/tmp/usr/include/kde/kpilot
+debian/tmp/usr/include/kde/ksharedfile.h
+debian/tmp/usr/include/kde/ktnef
+debian/tmp/usr/lib/kde3/libegroupwarewizard.la
+debian/tmp/usr/lib/kde3/libegroupwarewizard.so
+debian/tmp/usr/lib/kde3/libkolabwizard.la
+debian/tmp/usr/lib/kde3/libkolabwizard.so
+debian/tmp/usr/lib/kde3/libsloxwizard.la
+debian/tmp/usr/lib/kde3/libsloxwizard.so
+debian/tmp/usr/lib/libkabc_imap.la
+debian/tmp/usr/lib/libkabc_imap.so
+debian/tmp/usr/lib/libkabc_slox.la
+debian/tmp/usr/lib/libkabc_slox.so
+debian/tmp/usr/lib/libkabc_xmlrpc.la
+debian/tmp/usr/lib/libkabc_xmlrpc.so
 debian/tmp/usr/lib/libkabinterfaces.la
 debian/tmp/usr/lib/libkabinterfaces.so
 debian/tmp/usr/lib/libkaddressbook.la
@@ -50,21 +35,37 @@
 debian/tmp/usr/lib/libkdenetwork.so
 debian/tmp/usr/lib/libkdepim.la
 debian/tmp/usr/lib/libkdepim.so
+debian/tmp/usr/lib/libkitchensyncui.la
+debian/tmp/usr/lib/libkitchensyncui.so
 debian/tmp/usr/lib/libkmailprivate.la
 debian/tmp/usr/lib/libkmailprivate.so
-debian/tmp/usr/lib/libknewstuff.la
-debian/tmp/usr/lib/libknewstuff.so
+debian/tmp/usr/lib/libknodecommon.la
+debian/tmp/usr/lib/libknodecommon.so
+debian/tmp/usr/lib/libknotes_imap.la
+debian/tmp/usr/lib/libknotes_imap.so
+debian/tmp/usr/lib/libknotes_xmlrpc.la
+debian/tmp/usr/lib/libknotes_xmlrpc.so
+debian/tmp/usr/lib/libkonnector.la
+debian/tmp/usr/lib/libkonnector.so
 debian/tmp/usr/lib/libkontact.la
 debian/tmp/usr/lib/libkontact.so
 debian/tmp/usr/lib/libkorganizer.la
 debian/tmp/usr/lib/libkorganizer.so
+debian/tmp/usr/lib/libkorganizer_calendar.la
+debian/tmp/usr/lib/libkorganizer_calendar.so
 debian/tmp/usr/lib/libkorganizer_eventviewer.la
 debian/tmp/usr/lib/libkorganizer_eventviewer.so
 debian/tmp/usr/lib/libkpilot.la
 debian/tmp/usr/lib/libkpilot.so
+debian/tmp/usr/lib/libkpimidentities.la
+debian/tmp/usr/lib/libkpimidentities.so
 debian/tmp/usr/lib/libkpinterfaces.la
 debian/tmp/usr/lib/libkpinterfaces.so
+debian/tmp/usr/lib/libksharedfile.la
+debian/tmp/usr/lib/libksharedfile.so
 debian/tmp/usr/lib/libksync.la
 debian/tmp/usr/lib/libksync.so
+debian/tmp/usr/lib/libksync2.la
+debian/tmp/usr/lib/libksync2.so
 debian/tmp/usr/lib/libktnef.la
 debian/tmp/usr/lib/libktnef.so

Added: trunk/packages/kdepim/debian/kdepim-doc-html.doc-base.kaddressbook
===================================================================
--- trunk/packages/kdepim/debian/kdepim-doc-html.doc-base.kaddressbook	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/kdepim-doc-html.doc-base.kaddressbook	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,9 @@
+Document: kdepim-doc-html-kaddressbook
+Title: The KAddressBook Handbook
+Author: Tobias Koenig, Steffen Hansen, Don Sanders
+Abstract: KAddressBook is the KDE address book.
+Section: Apps/Tools
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kaddressbook/index.html
+Files: /usr/share/doc/kde/HTML/en/kaddressbook/*.html

Added: trunk/packages/kdepim/debian/kdepim-doc-html.doc-base.kalarm
===================================================================
--- trunk/packages/kdepim/debian/kdepim-doc-html.doc-base.kalarm	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/kdepim-doc-html.doc-base.kalarm	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,10 @@
+Document: kdepim-doc-html-kalarm
+Title: The KAlarm Handbook
+Author: David Jarvie
+Abstract: KAlarm is a personal alarm message, command and email
+ scheduler for KDE.
+Section: Apps/Tools
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kalarm/index.html
+Files: /usr/share/doc/kde/HTML/en/kalarm/*.html

Added: trunk/packages/kdepim/debian/kdepim-doc-html.doc-base.kandy
===================================================================
--- trunk/packages/kdepim/debian/kdepim-doc-html.doc-base.kandy	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/kdepim-doc-html.doc-base.kandy	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,10 @@
+Document: kdepim-doc-html-kandy
+Title: The Kandy Handbook
+Author: Cornelius Schumacher
+Abstract: Kandy is an application for synchronizing the data on a mobile
+ phone with the data on the desktop.
+Section: Apps/Tools
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kandy/index.html
+Files: /usr/share/doc/kde/HTML/en/kandy/*.html

Added: trunk/packages/kdepim/debian/kdepim-doc-html.doc-base.karm
===================================================================
--- trunk/packages/kdepim/debian/kdepim-doc-html.doc-base.karm	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/kdepim-doc-html.doc-base.karm	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,9 @@
+Document: kdepim-doc-html-karm
+Title: The KArm Handbook
+Author: Jonathan Singer, Mark Bucciarelli, Sirtaj Singh Kang
+Abstract: KArm tracks time spent on various tasks.
+Section: Apps/Tools
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/karm/index.html
+Files: /usr/share/doc/kde/HTML/en/karm/*.html

Added: trunk/packages/kdepim/debian/kdepim-doc-html.doc-base.kcontrol-kalarmd
===================================================================
--- trunk/packages/kdepim/debian/kdepim-doc-html.doc-base.kcontrol-kalarmd	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/kdepim-doc-html.doc-base.kcontrol-kalarmd	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,10 @@
+Document: kdepim-doc-html-kcontrol-kalarmd
+Title: Alarm Daemon
+Author: Lauri Watts
+Abstract: Documentation for the KAlarmd configuration applet, which allows
+ you to configure the alarm daemon from kalarm.
+Section: Apps/System
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kcontrol/kalarmd/index.html
+Files: /usr/share/doc/kde/HTML/en/kcontrol/kalarmd/*.html

Added: trunk/packages/kdepim/debian/kdepim-doc-html.doc-base.kleopatra
===================================================================
--- trunk/packages/kdepim/debian/kdepim-doc-html.doc-base.kleopatra	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/kdepim-doc-html.doc-base.kleopatra	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,9 @@
+Document: kdepim-doc-html-kleopatra
+Title: The Kleopatra Handbook
+Author: Marc Mutz
+Abstract: Kleopatra is a tool for managing X.509 certificates.
+Section: Apps/Net
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kleopatra/index.html
+Files: /usr/share/doc/kde/HTML/en/kleopatra/*.html

Added: trunk/packages/kdepim/debian/kdepim-doc-html.doc-base.kmail
===================================================================
--- trunk/packages/kdepim/debian/kdepim-doc-html.doc-base.kmail	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/kdepim-doc-html.doc-base.kmail	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,9 @@
+Document: kdepim-doc-html-kmail
+Title: The KMail Handbook
+Author: Daniel Naber, David Rugge
+Abstract: KMail is KDE's powerful and user friendly email client.
+Section: Apps/Net
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kmail/index.html
+Files: /usr/share/doc/kde/HTML/en/kmail/*.html

Added: trunk/packages/kdepim/debian/kdepim-doc-html.doc-base.knode
===================================================================
--- trunk/packages/kdepim/debian/kdepim-doc-html.doc-base.knode	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/kdepim-doc-html.doc-base.knode	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,9 @@
+Document: kdepim-doc-html-knode
+Title: The KNode manual
+Author: Stephan Johach, Thomas Schûtz
+Abstract: KNode is an easy-to-use newsreader.
+Section: Apps/Net
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/knode/index.html
+Files: /usr/share/doc/kde/HTML/en/knode/*.html

Added: trunk/packages/kdepim/debian/kdepim-doc-html.doc-base.knotes
===================================================================
--- trunk/packages/kdepim/debian/kdepim-doc-html.doc-base.knotes	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/kdepim-doc-html.doc-base.knotes	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,9 @@
+Document: kdepim-doc-html-knotes
+Title: The KNotes Handbook
+Author: Fabian Dal Santo, Grep M. Holmes
+Abstract: KNotes is a sticky notes application for the desktop.
+Section: Apps/Tools
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/knotes/index.html
+Files: /usr/share/doc/kde/HTML/en/knotes/*.html

Added: trunk/packages/kdepim/debian/kdepim-doc-html.doc-base.konsolekalendar
===================================================================
--- trunk/packages/kdepim/debian/kdepim-doc-html.doc-base.konsolekalendar	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/kdepim-doc-html.doc-base.konsolekalendar	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,9 @@
+Document: kdepim-doc-html-konsolekalendar
+Title: The KonsoleKalendar Handbook
+Author: Tuukka Pasanen, Allen Winter
+Abstract: KonsoleKalendar is a command line interface to KDE calendars.
+Section: Apps/Tools
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/konsolekalendar/index.html
+Files: /usr/share/doc/kde/HTML/en/konsolekalendar/*.html

Added: trunk/packages/kdepim/debian/kdepim-doc-html.doc-base.kontact
===================================================================
--- trunk/packages/kdepim/debian/kdepim-doc-html.doc-base.kontact	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/kdepim-doc-html.doc-base.kontact	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,9 @@
+Document: kdepim-doc-html-kontact
+Title: The Kontact Handbook
+Author: Cornelius Schumacher
+Abstract: Kontact is a command line interface to KDE calendars.
+Section: Apps/Tools
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kontact/index.html
+Files: /usr/share/doc/kde/HTML/en/kontact/*.html

Added: trunk/packages/kdepim/debian/kdepim-doc-html.doc-base.korganizer
===================================================================
--- trunk/packages/kdepim/debian/kdepim-doc-html.doc-base.korganizer	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/kdepim-doc-html.doc-base.korganizer	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,9 @@
+Document: kdepim-doc-html-korganizer
+Title: The KOrganizer Handbook
+Author: Milos Prudek, Paul E. Ahlquist Jr., Jürgen Nagel
+Abstract: KOrganizer is an easy to use personal information manager.
+Section: Apps/Tools
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/korganizer/index.html
+Files: /usr/share/doc/kde/HTML/en/korganizer/*.html

Added: trunk/packages/kdepim/debian/kdepim-doc-html.doc-base.korn
===================================================================
--- trunk/packages/kdepim/debian/kdepim-doc-html.doc-base.korn	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/kdepim-doc-html.doc-base.korn	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,9 @@
+Document: kdepim-doc-html-korn
+Title: The KOrn Handbook
+Author: Nick Betcher
+Abstract: KOrn is a mail monitor.
+Section: Apps/Net
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/korn/index.html
+Files: /usr/share/doc/kde/HTML/en/korn/*.html

Added: trunk/packages/kdepim/debian/kdepim-doc-html.doc-base.kpilot
===================================================================
--- trunk/packages/kdepim/debian/kdepim-doc-html.doc-base.kpilot	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/kdepim-doc-html.doc-base.kpilot	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,10 @@
+Document: kdepim-doc-html-kpilot
+Title: The KPilot Handbook
+Author: Carlos Leonhard Woelz, Adriaan de Groot, Dan Pilone
+Abstract: KPilot is the KDE version of the Desktop HotSync software for
+ Palm Pilot handhelds.
+Section: Apps/Tools
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kpilot/index.html
+Files: /usr/share/doc/kde/HTML/en/kpilot/*.html

Added: trunk/packages/kdepim/debian/kdepim-doc-html.doc-base.ktnef
===================================================================
--- trunk/packages/kdepim/debian/kdepim-doc-html.doc-base.ktnef	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/kdepim-doc-html.doc-base.ktnef	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,9 @@
+Document: kdepim-doc-html-ktnef
+Title: The TNEF File Viewer Handbook
+Author: Michael Goffioul
+Abstract: The TNEF File Viewer is an application for TNEF mail attachments.
+Section: Apps/Tools
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/ktnef/index.html
+Files: /usr/share/doc/kde/HTML/en/ktnef/*.html

Added: trunk/packages/kdepim/debian/kdepim-doc-html.doc-base.kwatchgnupg
===================================================================
--- trunk/packages/kdepim/debian/kdepim-doc-html.doc-base.kwatchgnupg	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/kdepim-doc-html.doc-base.kwatchgnupg	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,9 @@
+Document: kdepim-doc-html-kwatchgnupg
+Title: The KWatchGnuPG Handbook
+Author: Marc Mutz
+Abstract: KWatchGnuPG is a simple GnuPG log viewer.
+Section: Apps/Tools
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kwatchgnupg/index.html
+Files: /usr/share/doc/kde/HTML/en/kwatchgnupg/*.html

Added: trunk/packages/kdepim/debian/kdepim-doc.doc-base
===================================================================
--- trunk/packages/kdepim/debian/kdepim-doc.doc-base	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/kdepim-doc.doc-base	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,9 @@
+Document: kdepim-doc
+Title: KDE PIM Library API Documentation
+Author: The KDE Developers
+Abstract: This is the developers' API documentation for kdepim.
+Section: Apps/Programming
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kdepim-apidocs/index.html
+Files: /usr/share/doc/kde/HTML/en/kdepim-apidocs/*.html

Modified: trunk/packages/kdepim/debian/kdepim-kfile-plugins.install
===================================================================
--- trunk/packages/kdepim/debian/kdepim-kfile-plugins.install	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/kdepim-kfile-plugins.install	2005-01-21 03:24:38 UTC (rev 434)
@@ -1,3 +1,6 @@
+debian/tmp/usr/lib/kde3/kfile_palm.la
+debian/tmp/usr/lib/kde3/kfile_palm.so
 debian/tmp/usr/lib/kde3/kfile_vcf.la
 debian/tmp/usr/lib/kde3/kfile_vcf.so
+debian/tmp/usr/share/services/kfile_palm.desktop
 debian/tmp/usr/share/services/kfile_vcf.desktop

Modified: trunk/packages/kdepim/debian/kdepim-kio-plugins.install
===================================================================
--- trunk/packages/kdepim/debian/kdepim-kio-plugins.install	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/kdepim-kio-plugins.install	2005-01-21 03:24:38 UTC (rev 434)
@@ -1,3 +1,8 @@
+debian/tmp/usr/lib/kde3/kio_newimap4.la
+debian/tmp/usr/lib/kde3/kio_newimap4.so
 debian/tmp/usr/lib/kde3/kio_sieve.la
 debian/tmp/usr/lib/kde3/kio_sieve.so
+debian/tmp/usr/share/services/newimap4.protocol
+debian/tmp/usr/share/services/newimaps.protocol
+debian/tmp/usr/share/services/overview.desktop
 debian/tmp/usr/share/services/sieve.protocol

Added: trunk/packages/kdepim/debian/kdepim-wizards.install
===================================================================
--- trunk/packages/kdepim/debian/kdepim-wizards.install	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/kdepim-wizards.install	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,13 @@
+debian/tmp/usr/bin/egroupwarewizard
+debian/tmp/usr/bin/groupwarewizard
+debian/tmp/usr/bin/kolabwizard
+debian/tmp/usr/bin/sloxwizard
+debian/tmp/usr/lib/kde3/libegroupwarewizard.so.0
+debian/tmp/usr/lib/kde3/libegroupwarewizard.so.0.0.0
+debian/tmp/usr/lib/kde3/libkolabwizard.so.0
+debian/tmp/usr/lib/kde3/libkolabwizard.so.0.0.0
+debian/tmp/usr/lib/kde3/libsloxwizard.so.0
+debian/tmp/usr/lib/kde3/libsloxwizard.so.0.0.0
+debian/tmp/usr/share/config.kcfg/egroupware.kcfg
+debian/tmp/usr/share/config.kcfg/kolab.kcfg
+debian/tmp/usr/share/config.kcfg/slox.kcfg

Added: trunk/packages/kdepim/debian/kdepim-wizards.manpages
===================================================================
--- trunk/packages/kdepim/debian/kdepim-wizards.manpages	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/kdepim-wizards.manpages	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,4 @@
+debian/man/egroupwarewizard.1
+debian/man/groupwarewizard.1
+debian/man/kolabwizard.1
+debian/man/sloxwizard.1

Added: trunk/packages/kdepim/debian/kdepim-wizards.menu
===================================================================
--- trunk/packages/kdepim/debian/kdepim-wizards.menu	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/kdepim-wizards.menu	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,27 @@
+?package(kdepim-wizards):\
+	needs="X11"\
+	section="Apps/Net"\
+	hints="KDE"\
+	title="EGroupware Setup Wizard"\
+	command="/usr/bin/egroupwarewizard"
+
+?package(kdepim-wizards):\
+	needs="X11"\
+	section="Apps/Net"\
+	hints="KDE"\
+	title="KDE Groupware Wizard"\
+	command="/usr/bin/groupwarewizard"
+
+?package(kdepim-wizards):\
+	needs="X11"\
+	section="Apps/Net"\
+	hints="KDE"\
+	title="KOLab Setup Wizard"\
+	command="/usr/bin/kolabwizard"
+
+?package(kdepim-wizards):\
+	needs="X11"\
+	section="Apps/Net"\
+	hints="KDE"\
+	title="Openexchange Setup Wizard"\
+	command="/usr/bin/sloxwizard"

Deleted: trunk/packages/kdepim/debian/kgpgcertmanager.install

Added: trunk/packages/kdepim/debian/kitchensync.install
===================================================================
--- trunk/packages/kdepim/debian/kitchensync.install	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/kitchensync.install	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,45 @@
+debian/tmp/usr/bin/kitchensync
+debian/tmp/usr/lib/kde3/libkded_ksharedfile.la
+debian/tmp/usr/lib/kde3/libkded_ksharedfile.so
+debian/tmp/usr/lib/kde3/libkitchensyncpart.la
+debian/tmp/usr/lib/kde3/libkitchensyncpart.so
+debian/tmp/usr/lib/kde3/libksync_backup.la
+debian/tmp/usr/lib/kde3/libksync_backup.so
+debian/tmp/usr/lib/kde3/libksync_debugger.la
+debian/tmp/usr/lib/kde3/libksync_debugger.so
+debian/tmp/usr/lib/kde3/libksync_restore.la
+debian/tmp/usr/lib/kde3/libksync_restore.so
+debian/tmp/usr/lib/kde3/libksync_syncerpart.la
+debian/tmp/usr/lib/kde3/libksync_syncerpart.so
+debian/tmp/usr/lib/kde3/libksync_viewer.la
+debian/tmp/usr/lib/kde3/libksync_viewer.so
+debian/tmp/usr/lib/kde3/liboverviewpart.la
+debian/tmp/usr/lib/kde3/liboverviewpart.so
+debian/tmp/usr/lib/libdummykonnector.la
+debian/tmp/usr/lib/libdummykonnector.so
+debian/tmp/usr/lib/libkabckonnector.la
+debian/tmp/usr/lib/libkabckonnector.so
+debian/tmp/usr/lib/libkcalkonnector.la
+debian/tmp/usr/lib/libkcalkonnector.so
+debian/tmp/usr/lib/libkitchensyncui.so.0
+debian/tmp/usr/lib/libkitchensyncui.so.0.0.0
+debian/tmp/usr/lib/libkonnector.so.0
+debian/tmp/usr/lib/libkonnector.so.0.0.0
+debian/tmp/usr/lib/libksharedfile.so.0
+debian/tmp/usr/lib/libksharedfile.so.0.0.0
+debian/tmp/usr/lib/libksync2.so.0
+debian/tmp/usr/lib/libksync2.so.0.0.0
+debian/tmp/usr/lib/liblocalkonnector.la
+debian/tmp/usr/lib/liblocalkonnector.so
+debian/tmp/usr/lib/libqtopiakonnector.la
+debian/tmp/usr/lib/libqtopiakonnector.so
+debian/tmp/usr/lib/libremotekonnector.la
+debian/tmp/usr/lib/libremotekonnector.so
+debian/tmp/usr/share/apps/kitchensync
+debian/tmp/usr/share/mimelnk/kdedevice/cellphone.desktop
+debian/tmp/usr/share/mimelnk/kdedevice/pda.desktop
+debian/tmp/usr/share/services/kded/ksharedfile.desktop
+debian/tmp/usr/share/services/kitchensync
+debian/tmp/usr/share/services/kresources/konnector
+debian/tmp/usr/share/servicetypes/kitchensync.desktop
+debian/tmp/usr/share/servicetypes/konnector.desktop

Added: trunk/packages/kdepim/debian/kitchensync.manpages
===================================================================
--- trunk/packages/kdepim/debian/kitchensync.manpages	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/kitchensync.manpages	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1 @@
+debian/man/kitchensync.1

Added: trunk/packages/kdepim/debian/kitchensync.menu
===================================================================
--- trunk/packages/kdepim/debian/kitchensync.menu	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/kitchensync.menu	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,6 @@
+?package(kitchensync):\
+	needs="X11"\
+	section="Apps/Tools"\
+	hints="KDE"\
+	title="KitchenSync"\
+	command="/usr/bin/kitchensync"

Added: trunk/packages/kdepim/debian/kleopatra.README.Debian
===================================================================
--- trunk/packages/kdepim/debian/kleopatra.README.Debian	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/kleopatra.README.Debian	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,48 @@
+The following instructions for installing kleopatra were gotten from
+a message to the debian-qt-kde mailing list by Adeodato Simo.
+
+--
+
+these are, briefly, the steps I have followed to get some S/MIME
+support in KMail 3.3.
+
+  Wipe out all not needed packages:
+  # aptitude purge newpg gpgsm cryptplug cryptplug-dev libgpgme6 libgpgme-dev libksba0
+
+  Use packages provided by Matthias Urlichs <smurf@debian.org>:
+  # echo "deb http://smurf.noris.de/code/debian/ experimental smurf" \
+      >>/etc/apt/sources.list 
+
+  Install required packages
+  # apt-get update && apt-get install gnupg2 gnupg-agent dirmngr
+
+    NOTE 1: gnupg2 will *NOT* substitute your gpg command, it will
+    just provide /usr/bin/gpg2, which you needn't use, and some other
+    commands that the programs will use internally.
+
+    NOTE 2: the gnupg-agent package from smurf does NOT provide
+    /etc/X11/Xsession.d/90*gpg-agent.
+
+    NOTE 3: gnupg2 1.9.10+cvs-1 contains /usr/share/locale/locale.alias,
+    which is also in the locales package. you'll need dpkg
+    --force-overwrite.
+
+  ===> RECOMPILE gpgme0.4 <===
+  This is the sole cause for the error "this GPGME version was
+  compiled without S/MIME support. Now it will because of gnupg2
+  installed:
+  # apt-get source gpgme0.4 && cd gpgme0.4-0.9.0
+  # debuild && dpkg -i ../libgpgme11_0.9.0-1_i386.deb
+
+You should now see funky things in KMail -> Settings -> Configure
+KMail -> Security -> Crypto Backends -> Configure.
+
+I found this page useful:
+
+  http://jdurand.home.cern.ch/jdurand/cern_ca_and_mail/
+
+Kleopatra now works and KMail seems able to verify S/MIME messages.
+
+DISCLAIMER: I claim no deep knowledge of all of the above explained.
+
+ -- daniel <schepler@debian.org>, Sat Sep 25 16:58:08 2004

Copied: trunk/packages/kdepim/debian/kleopatra.install (from rev 433, trunk/packages/kdepim/debian/kgpgcertmanager.install)
===================================================================
--- trunk/packages/kdepim/debian/kgpgcertmanager.install	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/kleopatra.install	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,10 @@
+debian/tmp/usr/bin/kleopatra
+debian/tmp/usr/bin/kwatchgnupg
+debian/tmp/usr/lib/kde3/kcm_kleopatra.la
+debian/tmp/usr/lib/kde3/kcm_kleopatra.so
+debian/tmp/usr/share/applications/kde/kleopatra_import.desktop
+debian/tmp/usr/share/apps/kleopatra
+debian/tmp/usr/share/apps/kwatchgnupg
+debian/tmp/usr/share/doc/kde/HTML/en/kleopatra
+debian/tmp/usr/share/doc/kde/HTML/en/kwatchgnupg
+debian/tmp/usr/share/services/kleopatra_config_*.desktop

Added: trunk/packages/kdepim/debian/kleopatra.links
===================================================================
--- trunk/packages/kdepim/debian/kleopatra.links	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/kleopatra.links	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1 @@
+/usr/share/doc/kde/HTML/en/kleopatra /usr/share/doc/kleopatra/html/kleopatra

Added: trunk/packages/kdepim/debian/kleopatra.manpages
===================================================================
--- trunk/packages/kdepim/debian/kleopatra.manpages	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/kleopatra.manpages	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,2 @@
+debian/man/kleopatra.1
+debian/man/kwatchgnupg.1

Added: trunk/packages/kdepim/debian/kleopatra.menu
===================================================================
--- trunk/packages/kdepim/debian/kleopatra.menu	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/kleopatra.menu	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,13 @@
+?package(kleopatra):\
+	needs="X11"\
+	section="Apps/Net"\
+	hints="KDE"\
+	title="Kleopatra"\
+	command="/usr/bin/kleopatra"
+
+?package(kleopatra):\
+	needs="X11"\
+	section="Apps/Tools"\
+	hints="KDE"\
+	title="KWatchGnuPG"\
+	command="/usr/bin/kwatchgnupg"

Modified: trunk/packages/kdepim/debian/kmail.install
===================================================================
--- trunk/packages/kdepim/debian/kmail.install	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/kmail.install	2005-01-21 03:24:38 UTC (rev 434)
@@ -1,4 +1,15 @@
+debian/tmp/etc/kde3/kmail.antispamrc
+debian/tmp/etc/kde3/kmail.antivirusrc
 debian/tmp/usr/bin/kmail
+debian/tmp/usr/bin/kmail_*.sh
+debian/tmp/usr/lib/kde3/kcm_kmail.la
+debian/tmp/usr/lib/kde3/kcm_kmail.so
+debian/tmp/usr/lib/kde3/libkmail_bodypartformatter_application_octetstream.la
+debian/tmp/usr/lib/kde3/libkmail_bodypartformatter_application_octetstream.so
+debian/tmp/usr/lib/kde3/libkmail_bodypartformatter_text_calendar.la
+debian/tmp/usr/lib/kde3/libkmail_bodypartformatter_text_calendar.so
+debian/tmp/usr/lib/kde3/libkmail_bodypartformatter_text_vcard.la
+debian/tmp/usr/lib/kde3/libkmail_bodypartformatter_text_vcard.so
 debian/tmp/usr/lib/kde3/libkmailpart.la
 debian/tmp/usr/lib/kde3/libkmailpart.so
 debian/tmp/usr/lib/kde3/libkmailpart.so.1
@@ -6,97 +17,26 @@
 debian/tmp/usr/lib/libkmailprivate.so.0
 debian/tmp/usr/lib/libkmailprivate.so.0.0.0
 debian/tmp/usr/share/applications/kde/KMail.desktop
+debian/tmp/usr/share/applications/kde/kmail_view.desktop
 debian/tmp/usr/share/apps/kconf_update/kmail-3.1-update-new-mail-notification-settings.pl
 debian/tmp/usr/share/apps/kconf_update/kmail-3.1-use-UOID-for-identities.pl
 debian/tmp/usr/share/apps/kconf_update/kmail-3.1.4-dont-use-UOID-0-for-any-identity.pl
 debian/tmp/usr/share/apps/kconf_update/kmail-3.2-misc.sh
 debian/tmp/usr/share/apps/kconf_update/kmail-3.2-update-loop-on-goto-unread-settings.sh
+debian/tmp/usr/share/apps/kconf_update/kmail-3.3-aegypten.pl
+debian/tmp/usr/share/apps/kconf_update/kmail-3.3-misc.pl
+debian/tmp/usr/share/apps/kconf_update/kmail-3.3-move-identities.pl
+debian/tmp/usr/share/apps/kconf_update/kmail-3.3-split-sign-encr-keys.sh
+debian/tmp/usr/share/apps/kconf_update/kmail-3.3-use-ID-for-accounts.pl
+debian/tmp/usr/share/apps/kconf_update/kmail-3.3b1-misc.pl
 debian/tmp/usr/share/apps/kconf_update/kmail-pgpidentity.pl
 debian/tmp/usr/share/apps/kconf_update/kmail-upd-identities.pl
 debian/tmp/usr/share/apps/kconf_update/kmail.upd
 debian/tmp/usr/share/apps/kconf_update/upgrade-signature.pl
 debian/tmp/usr/share/apps/kconf_update/upgrade-transport.pl
-debian/tmp/usr/share/apps/kmail/about/background.png
-debian/tmp/usr/share/apps/kmail/about/bgtable.png
-debian/tmp/usr/share/apps/kmail/about/kdelogo2.png
-debian/tmp/usr/share/apps/kmail/about/kmail.png
-debian/tmp/usr/share/apps/kmail/about/konq.css
-debian/tmp/usr/share/apps/kmail/about/lines.png
-debian/tmp/usr/share/apps/kmail/about/lines2.png
-debian/tmp/usr/share/apps/kmail/about/main.html
-debian/tmp/usr/share/apps/kmail/about/pointers.png
-debian/tmp/usr/share/apps/kmail/about/shadow1.png
-debian/tmp/usr/share/apps/kmail/eventsrc
-debian/tmp/usr/share/apps/kmail/icons/crystalsvg/16x16/actions/mark_as_ham.png
-debian/tmp/usr/share/apps/kmail/icons/crystalsvg/16x16/actions/mark_as_spam.png
-debian/tmp/usr/share/apps/kmail/icons/crystalsvg/22x22/actions/mark_as_ham.png
-debian/tmp/usr/share/apps/kmail/icons/crystalsvg/22x22/actions/mark_as_spam.png
-debian/tmp/usr/share/apps/kmail/icons/crystalsvg/32x32/actions/mark_as_ham.png
-debian/tmp/usr/share/apps/kmail/icons/crystalsvg/32x32/actions/mark_as_spam.png
-debian/tmp/usr/share/apps/kmail/icons/crystalsvg/48x48/actions/mark_as_spam.png
-debian/tmp/usr/share/apps/kmail/kmcomposerui.rc
-debian/tmp/usr/share/apps/kmail/kmmainwin.rc
-debian/tmp/usr/share/apps/kmail/kmreadermainwin.rc
-debian/tmp/usr/share/apps/kmail/pics/kdelogo.png
-debian/tmp/usr/share/apps/kmail/pics/kmailwindowlayout1.png
-debian/tmp/usr/share/apps/kmail/pics/kmailwindowlayout1_no_mime.png
-debian/tmp/usr/share/apps/kmail/pics/kmailwindowlayout1_smart_mime.png
-debian/tmp/usr/share/apps/kmail/pics/kmailwindowlayout2.png
-debian/tmp/usr/share/apps/kmail/pics/kmailwindowlayout2_no_mime.png
-debian/tmp/usr/share/apps/kmail/pics/kmailwindowlayout2_smart_mime.png
-debian/tmp/usr/share/apps/kmail/pics/kmailwindowlayout3.png
-debian/tmp/usr/share/apps/kmail/pics/kmailwindowlayout3_no_mime.png
-debian/tmp/usr/share/apps/kmail/pics/kmailwindowlayout3_smart_mime.png
-debian/tmp/usr/share/apps/kmail/pics/kmailwindowlayout4.png
-debian/tmp/usr/share/apps/kmail/pics/kmailwindowlayout4_no_mime.png
-debian/tmp/usr/share/apps/kmail/pics/kmailwindowlayout4_smart_mime.png
-debian/tmp/usr/share/apps/kmail/pics/kmailwindowlayout5.png
-debian/tmp/usr/share/apps/kmail/pics/kmailwindowlayout5_no_mime.png
-debian/tmp/usr/share/apps/kmail/pics/kmailwindowlayout5_smart_mime.png
-debian/tmp/usr/share/apps/kmail/pics/kmgroupware_folder_calendar.png
-debian/tmp/usr/share/apps/kmail/pics/kmgroupware_folder_contacts.png
-debian/tmp/usr/share/apps/kmail/pics/kmgroupware_folder_notes.png
-debian/tmp/usr/share/apps/kmail/pics/kmgroupware_folder_tasks.png
-debian/tmp/usr/share/apps/kmail/pics/kmmsgdel.png
-debian/tmp/usr/share/apps/kmail/pics/kmmsgfiller.png
-debian/tmp/usr/share/apps/kmail/pics/kmmsgflag.png
-debian/tmp/usr/share/apps/kmail/pics/kmmsgforwarded.png
-debian/tmp/usr/share/apps/kmail/pics/kmmsgfullyencrypted.png
-debian/tmp/usr/share/apps/kmail/pics/kmmsgfullysigned.png
-debian/tmp/usr/share/apps/kmail/pics/kmmsgignored.png
-debian/tmp/usr/share/apps/kmail/pics/kmmsgnew.png
-debian/tmp/usr/share/apps/kmail/pics/kmmsgpartiallyencrypted.png
-debian/tmp/usr/share/apps/kmail/pics/kmmsgpartiallysigned.png
-debian/tmp/usr/share/apps/kmail/pics/kmmsgqueued.png
-debian/tmp/usr/share/apps/kmail/pics/kmmsgread.png
-debian/tmp/usr/share/apps/kmail/pics/kmmsgreplied.png
-debian/tmp/usr/share/apps/kmail/pics/kmmsgsent.png
-debian/tmp/usr/share/apps/kmail/pics/kmmsgspam.png
-debian/tmp/usr/share/apps/kmail/pics/kmmsgundefinedencrypted.png
-debian/tmp/usr/share/apps/kmail/pics/kmmsgundefinedsigned.png
-debian/tmp/usr/share/apps/kmail/pics/kmmsgunseen.png
-debian/tmp/usr/share/apps/kmail/pics/kmmsgwatched.png
-debian/tmp/usr/share/apps/kmail/pics/pgp-keys.png
-debian/tmp/usr/share/apps/kmail/pics/pub_key_red.png
-debian/tmp/usr/share/apps/kmail/pics/stopwatch.xbm
-debian/tmp/usr/share/apps/kmail/pics/stopwatchMask.xbm
-debian/tmp/usr/share/apps/kmail/profile-default-rc
-debian/tmp/usr/share/apps/kmail/profile-high-contrast-rc
-debian/tmp/usr/share/apps/kmail/profile-html-rc
-debian/tmp/usr/share/apps/kmail/profile-purist-rc
-debian/tmp/usr/share/apps/kmail/profile-secure-rc
-debian/tmp/usr/share/apps/kmail/tips
-debian/tmp/usr/share/doc/kde/HTML/en/kmail/common
-debian/tmp/usr/share/doc/kde/HTML/en/kmail/configure.docbook
-debian/tmp/usr/share/doc/kde/HTML/en/kmail/credits-and-licenses.docbook
-debian/tmp/usr/share/doc/kde/HTML/en/kmail/faq.docbook
-debian/tmp/usr/share/doc/kde/HTML/en/kmail/getting-started.docbook
-debian/tmp/usr/share/doc/kde/HTML/en/kmail/importing.docbook
-debian/tmp/usr/share/doc/kde/HTML/en/kmail/index.cache.bz2
-debian/tmp/usr/share/doc/kde/HTML/en/kmail/index.docbook
-debian/tmp/usr/share/doc/kde/HTML/en/kmail/intro.docbook
-debian/tmp/usr/share/doc/kde/HTML/en/kmail/menus.docbook
-debian/tmp/usr/share/doc/kde/HTML/en/kmail/using-kmail.docbook
+debian/tmp/usr/share/apps/kmail
+debian/tmp/usr/share/config.kcfg/kmail.kcfg
+debian/tmp/usr/share/doc/kde/HTML/en/kmail
 debian/tmp/usr/share/icons/crystalsvg/128x128/apps/kmail.png
 debian/tmp/usr/share/icons/crystalsvg/16x16/apps/kmail.png
 debian/tmp/usr/share/icons/crystalsvg/22x22/apps/kmail.png
@@ -105,4 +45,8 @@
 debian/tmp/usr/share/icons/crystalsvg/32x32/apps/kmaillight.png
 debian/tmp/usr/share/icons/crystalsvg/48x48/apps/kmail.png
 debian/tmp/usr/share/icons/crystalsvg/64x64/apps/kmail.png
+debian/tmp/usr/share/services/kmail_config_*.desktop
+debian/tmp/usr/share/servicetypes/dcopimap.desktop
 debian/tmp/usr/share/servicetypes/dcopmail.desktop
+debian/icons/kmail.xpm /usr/share/pixmaps
+debian/icons/kmail-16.xpm /usr/share/pixmaps

Added: trunk/packages/kdepim/debian/kmail.links
===================================================================
--- trunk/packages/kdepim/debian/kmail.links	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/kmail.links	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1 @@
+/usr/share/doc/kde/HTML/en/kmail /usr/share/doc/kmail/html

Added: trunk/packages/kdepim/debian/kmail.manpages
===================================================================
--- trunk/packages/kdepim/debian/kmail.manpages	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/kmail.manpages	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,5 @@
+debian/man/kmail.1
+debian/man/kmail_antivir.sh.1
+debian/man/kmail_clamav.sh.1
+debian/man/kmail_fprot.sh.1
+debian/man/kmail_sav.sh.1

Modified: trunk/packages/kdepim/debian/kmail.menu
===================================================================
--- trunk/packages/kdepim/debian/kmail.menu	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/kmail.menu	2005-01-21 03:24:38 UTC (rev 434)
@@ -3,4 +3,6 @@
 	section="Apps/Net"\
 	hints="KDE,Mail"\
 	title="KMail"\
+	icon32x32="/usr/share/pixmaps/kmail.xpm"\
+	icon16x16="/usr/share/pixmaps/kmail-16.xpm"\
 	command="/usr/bin/kmail"

Modified: trunk/packages/kdepim/debian/kmailcvt.install
===================================================================
--- trunk/packages/kdepim/debian/kmailcvt.install	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/kmailcvt.install	2005-01-21 03:24:38 UTC (rev 434)
@@ -1,7 +1,8 @@
 debian/tmp/usr/bin/kmailcvt
 debian/tmp/usr/share/applnk/Utilities/kmailcvt.desktop
-debian/tmp/usr/share/apps/kmailcvt/pics/step1.png
-debian/tmp/usr/share/apps/kmailcvt/pics/step2.png
+debian/tmp/usr/share/apps/kmailcvt
 debian/tmp/usr/share/icons/crystalsvg/16x16/apps/kmailcvt.png
 debian/tmp/usr/share/icons/crystalsvg/32x32/apps/kmailcvt.png
 debian/tmp/usr/share/icons/crystalsvg/48x48/apps/kmailcvt.png
+debian/icons/kmailcvt.xpm /usr/share/pixmaps
+debian/icons/kmailcvt-16.xpm /usr/share/pixmaps

Added: trunk/packages/kdepim/debian/kmailcvt.manpages
===================================================================
--- trunk/packages/kdepim/debian/kmailcvt.manpages	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/kmailcvt.manpages	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1 @@
+debian/man/kmailcvt.1

Modified: trunk/packages/kdepim/debian/knode.install
===================================================================
--- trunk/packages/kdepim/debian/knode.install	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/knode.install	2005-01-21 03:24:38 UTC (rev 434)
@@ -1,85 +1,15 @@
 debian/tmp/usr/bin/knode
+debian/tmp/usr/lib/kde3/kcm_knode.la
+debian/tmp/usr/lib/kde3/kcm_knode.so
 debian/tmp/usr/lib/kde3/libknodepart.la
 debian/tmp/usr/lib/kde3/libknodepart.so
 debian/tmp/usr/lib/kde3/libknodepart.so.1
 debian/tmp/usr/lib/kde3/libknodepart.so.1.0.0
+debian/tmp/usr/lib/libknodecommon.so.0
+debian/tmp/usr/lib/libknodecommon.so.0.0.0
 debian/tmp/usr/share/applications/kde/KNode.desktop
-debian/tmp/usr/share/apps/knode/filters/1.fltr
-debian/tmp/usr/share/apps/knode/filters/2.fltr
-debian/tmp/usr/share/apps/knode/filters/3.fltr
-debian/tmp/usr/share/apps/knode/filters/4.fltr
-debian/tmp/usr/share/apps/knode/filters/5.fltr
-debian/tmp/usr/share/apps/knode/filters/6.fltr
-debian/tmp/usr/share/apps/knode/filters/7.fltr
-debian/tmp/usr/share/apps/knode/filters/8.fltr
-debian/tmp/usr/share/apps/knode/filters/filters.rc
-debian/tmp/usr/share/apps/knode/headers.rc
-debian/tmp/usr/share/apps/knode/icons/crystalsvg/16x16/actions/message_reply.png
-debian/tmp/usr/share/apps/knode/icons/crystalsvg/22x22/actions/message_reply.png
-debian/tmp/usr/share/apps/knode/icons/crystalsvg/32x32/actions/message_reply.png
-debian/tmp/usr/share/apps/knode/kncomposerui.rc
-debian/tmp/usr/share/apps/knode/knodeui.rc
-debian/tmp/usr/share/apps/knode/knreaderui.rc
-debian/tmp/usr/share/apps/knode/pics/ctlart.png
-debian/tmp/usr/share/apps/knode/pics/eyes.png
-debian/tmp/usr/share/apps/knode/pics/greyball.png
-debian/tmp/usr/share/apps/knode/pics/greyballchk.png
-debian/tmp/usr/share/apps/knode/pics/group.png
-debian/tmp/usr/share/apps/knode/pics/group_big.png
-debian/tmp/usr/share/apps/knode/pics/ignore.png
-debian/tmp/usr/share/apps/knode/pics/mail.png
-debian/tmp/usr/share/apps/knode/pics/newsubs.png
-debian/tmp/usr/share/apps/knode/pics/pgp-keys.png
-debian/tmp/usr/share/apps/knode/pics/posting.png
-debian/tmp/usr/share/apps/knode/pics/server.png
-debian/tmp/usr/share/apps/knode/pics/server_big.png
-debian/tmp/usr/share/apps/knode/pics/snderr.png
-debian/tmp/usr/share/apps/knode/pics/stat_cncl.png
-debian/tmp/usr/share/apps/knode/pics/stat_edit.png
-debian/tmp/usr/share/apps/knode/pics/stat_saved.png
-debian/tmp/usr/share/apps/knode/pics/stat_sent.png
-debian/tmp/usr/share/doc/kde/HTML/en/knode/commands.docbook
-debian/tmp/usr/share/doc/kde/HTML/en/knode/common
-debian/tmp/usr/share/doc/kde/HTML/en/knode/credits.docbook
-debian/tmp/usr/share/doc/kde/HTML/en/knode/eyes.png
-debian/tmp/usr/share/doc/kde/HTML/en/knode/faq.docbook
-debian/tmp/usr/share/doc/kde/HTML/en/knode/gloss.docbook
-debian/tmp/usr/share/doc/kde/HTML/en/knode/greyball.png
-debian/tmp/usr/share/doc/kde/HTML/en/knode/greyballchk.png
-debian/tmp/usr/share/doc/kde/HTML/en/knode/index.cache.bz2
-debian/tmp/usr/share/doc/kde/HTML/en/knode/index.docbook
-debian/tmp/usr/share/doc/kde/HTML/en/knode/install.docbook
-debian/tmp/usr/share/doc/kde/HTML/en/knode/introduction.docbook
-debian/tmp/usr/share/doc/kde/HTML/en/knode/journey.docbook
-debian/tmp/usr/share/doc/kde/HTML/en/knode/knode-cleanup.png
-debian/tmp/usr/share/doc/kde/HTML/en/knode/knode-colors-fonts.png
-debian/tmp/usr/share/doc/kde/HTML/en/knode/knode-composer-attachments.png
-debian/tmp/usr/share/doc/kde/HTML/en/knode/knode-composer-settings.png
-debian/tmp/usr/share/doc/kde/HTML/en/knode/knode-edit-filter.png
-debian/tmp/usr/share/doc/kde/HTML/en/knode/knode-edit-header1.png
-debian/tmp/usr/share/doc/kde/HTML/en/knode/knode-edit-header2.png
-debian/tmp/usr/share/doc/kde/HTML/en/knode/knode-filters.png
-debian/tmp/usr/share/doc/kde/HTML/en/knode/knode-followup.png
-debian/tmp/usr/share/doc/kde/HTML/en/knode/knode-header-settings.png
-debian/tmp/usr/share/doc/kde/HTML/en/knode/knode-identity.png
-debian/tmp/usr/share/doc/kde/HTML/en/knode/knode-mail-account.png
-debian/tmp/usr/share/doc/kde/HTML/en/knode/knode-new-article.png
-debian/tmp/usr/share/doc/kde/HTML/en/knode/knode-news-account.png
-debian/tmp/usr/share/doc/kde/HTML/en/knode/knode-post-settings.png
-debian/tmp/usr/share/doc/kde/HTML/en/knode/knode-read-news-appearance-dialog.png
-debian/tmp/usr/share/doc/kde/HTML/en/knode/knode-read-news-settings.png
-debian/tmp/usr/share/doc/kde/HTML/en/knode/knode-reply.png
-debian/tmp/usr/share/doc/kde/HTML/en/knode/knode-search.png
-debian/tmp/usr/share/doc/kde/HTML/en/knode/knode-start.png
-debian/tmp/usr/share/doc/kde/HTML/en/knode/knode-subscribe.png
-debian/tmp/usr/share/doc/kde/HTML/en/knode/knode-views.png
-debian/tmp/usr/share/doc/kde/HTML/en/knode/more.docbook
-debian/tmp/usr/share/doc/kde/HTML/en/knode/newsubs.png
-debian/tmp/usr/share/doc/kde/HTML/en/knode/redball.png
-debian/tmp/usr/share/doc/kde/HTML/en/knode/redballchk.png
-debian/tmp/usr/share/doc/kde/HTML/en/knode/using-firststart.docbook
-debian/tmp/usr/share/doc/kde/HTML/en/knode/using-morefeatures.docbook
-debian/tmp/usr/share/doc/kde/HTML/en/knode/using-subscribing.docbook
+debian/tmp/usr/share/apps/knode
+debian/tmp/usr/share/doc/kde/HTML/en/knode
 debian/tmp/usr/share/icons/crystalsvg/128x128/apps/knode.png
 debian/tmp/usr/share/icons/crystalsvg/128x128/apps/knode2.png
 debian/tmp/usr/share/icons/crystalsvg/16x16/apps/knode.png
@@ -91,3 +21,6 @@
 debian/tmp/usr/share/icons/crystalsvg/64x64/apps/knode.png
 debian/tmp/usr/share/icons/crystalsvg/64x64/apps/knode2.png
 debian/tmp/usr/share/services/knewsservice.protocol
+debian/tmp/usr/share/services/knode_config_*.desktop
+debian/icons/knode.xpm /usr/share/pixmaps
+debian/icons/knode-16.xpm /usr/share/pixmaps

Added: trunk/packages/kdepim/debian/knode.links
===================================================================
--- trunk/packages/kdepim/debian/knode.links	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/knode.links	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1 @@
+/usr/share/doc/kde/HTML/en/knode /usr/share/doc/knode/html

Added: trunk/packages/kdepim/debian/knode.manpages
===================================================================
--- trunk/packages/kdepim/debian/knode.manpages	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/knode.manpages	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1 @@
+debian/man/knode.1

Modified: trunk/packages/kdepim/debian/knode.menu
===================================================================
--- trunk/packages/kdepim/debian/knode.menu	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/knode.menu	2005-01-21 03:24:38 UTC (rev 434)
@@ -3,4 +3,6 @@
 	section="Apps/Net"\
 	hints="KDE,News"\
 	title="KNode"\
+	icon32x32="/usr/share/pixmaps/knode.xpm"\
+	icon16x16="/usr/share/pixmaps/knode-16.xpm"\
 	command="/usr/bin/knode"

Modified: trunk/packages/kdepim/debian/knotes.install
===================================================================
--- trunk/packages/kdepim/debian/knotes.install	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/knotes.install	2005-01-21 03:24:38 UTC (rev 434)
@@ -1,21 +1,25 @@
 debian/tmp/usr/bin/knotes
+debian/tmp/usr/lib/kde3/knotes_imap.la
+debian/tmp/usr/lib/kde3/knotes_imap.so
+debian/tmp/usr/lib/kde3/knotes_local.la
+debian/tmp/usr/lib/kde3/knotes_local.so
+debian/tmp/usr/lib/kde3/knotes_xmlrpc.la
+debian/tmp/usr/lib/kde3/knotes_xmlrpc.so
+debian/tmp/usr/lib/libknotes_imap.so.0
+debian/tmp/usr/lib/libknotes_imap.so.0.0.0
+debian/tmp/usr/lib/libknotes_xmlrpc.so.1
+debian/tmp/usr/lib/libknotes_xmlrpc.so.1.0.0
 debian/tmp/usr/share/applications/kde/knotes.desktop
-debian/tmp/usr/share/apps/knotes/icons/crystalsvg/16x16/actions/enum_list.png
-debian/tmp/usr/share/apps/knotes/icons/crystalsvg/16x16/actions/format_decreaseindent.png
-debian/tmp/usr/share/apps/knotes/icons/crystalsvg/16x16/actions/format_increaseindent.png
-debian/tmp/usr/share/apps/knotes/icons/crystalsvg/16x16/actions/knotes_close.png
-debian/tmp/usr/share/apps/knotes/icons/crystalsvg/16x16/actions/knotes_date.png
-debian/tmp/usr/share/apps/knotes/icons/crystalsvg/16x16/actions/knotes_delete.png
-debian/tmp/usr/share/apps/knotes/icons/crystalsvg/16x16/actions/text_sub.png
-debian/tmp/usr/share/apps/knotes/icons/crystalsvg/16x16/actions/text_super.png
-debian/tmp/usr/share/apps/knotes/knotesui.rc
-debian/tmp/usr/share/config.kcfg/knotes.kcfg
-debian/tmp/usr/share/doc/kde/HTML/en/knotes/common
-debian/tmp/usr/share/doc/kde/HTML/en/knotes/index.cache.bz2
-debian/tmp/usr/share/doc/kde/HTML/en/knotes/index.docbook
+debian/tmp/usr/share/apps/knotes
+debian/tmp/usr/share/config.kcfg/knoteconfig.kcfg
+debian/tmp/usr/share/config.kcfg/knotesglobalconfig.kcfg
+debian/tmp/usr/share/doc/kde/HTML/en/knotes
 debian/tmp/usr/share/icons/crystalsvg/128x128/apps/knotes.png
 debian/tmp/usr/share/icons/crystalsvg/16x16/apps/knotes.png
 debian/tmp/usr/share/icons/crystalsvg/22x22/apps/knotes.png
 debian/tmp/usr/share/icons/crystalsvg/32x32/apps/knotes.png
 debian/tmp/usr/share/icons/crystalsvg/48x48/apps/knotes.png
 debian/tmp/usr/share/icons/crystalsvg/64x64/apps/knotes.png
+debian/tmp/usr/share/services/kresources/knotes
+debian/icons/knotes.xpm /usr/share/pixmaps
+debian/icons/knotes-16.xpm /usr/share/pixmaps

Added: trunk/packages/kdepim/debian/knotes.links
===================================================================
--- trunk/packages/kdepim/debian/knotes.links	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/knotes.links	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1 @@
+/usr/share/doc/kde/HTML/en/knotes /usr/share/doc/knotes/html

Added: trunk/packages/kdepim/debian/knotes.manpages
===================================================================
--- trunk/packages/kdepim/debian/knotes.manpages	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/knotes.manpages	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1 @@
+debian/man/knotes.1

Modified: trunk/packages/kdepim/debian/knotes.menu
===================================================================
--- trunk/packages/kdepim/debian/knotes.menu	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/knotes.menu	2005-01-21 03:24:38 UTC (rev 434)
@@ -3,4 +3,6 @@
 	section="Apps/Tools"\
 	hints="KDE"\
 	title="KNotes"\
+	icon32x32="/usr/share/pixmaps/knotes.xpm"\
+	icon16x16="/usr/share/pixmaps/knotes-16.xpm"\
 	command="/usr/bin/knotes"

Added: trunk/packages/kdepim/debian/konsolekalendar.links
===================================================================
--- trunk/packages/kdepim/debian/konsolekalendar.links	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/konsolekalendar.links	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1 @@
+/usr/share/doc/kde/HTML/en/konsolekalendar /usr/share/doc/konsolekalendar/html

Added: trunk/packages/kdepim/debian/konsolekalendar.manpages
===================================================================
--- trunk/packages/kdepim/debian/konsolekalendar.manpages	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/konsolekalendar.manpages	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1 @@
+debian/man/konsolekalendar.1

Modified: trunk/packages/kdepim/debian/kontact.install
===================================================================
--- trunk/packages/kdepim/debian/kontact.install	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/kontact.install	2005-01-21 03:24:38 UTC (rev 434)
@@ -1,49 +1,44 @@
 debian/tmp/usr/bin/kontact
+debian/tmp/usr/lib/kde3/kcm_kabsummary.la
+debian/tmp/usr/lib/kde3/kcm_kabsummary.so
+debian/tmp/usr/lib/kde3/kcm_kmailsummary.la
+debian/tmp/usr/lib/kde3/kcm_kmailsummary.so
 debian/tmp/usr/lib/kde3/kcm_kontact.la
 debian/tmp/usr/lib/kde3/kcm_kontact.so
-debian/tmp/usr/lib/kde3/libkontact_kaddressbookplugin.la
-debian/tmp/usr/lib/kde3/libkontact_kaddressbookplugin.so
-debian/tmp/usr/lib/kde3/libkontact_kmailplugin.la
-debian/tmp/usr/lib/kde3/libkontact_kmailplugin.so
-debian/tmp/usr/lib/kde3/libkontact_knodeplugin.la
-debian/tmp/usr/lib/kde3/libkontact_knodeplugin.so
-debian/tmp/usr/lib/kde3/libkontact_knotesplugin.la
-debian/tmp/usr/lib/kde3/libkontact_knotesplugin.so
-debian/tmp/usr/lib/kde3/libkontact_korganizerplugin.la
-debian/tmp/usr/lib/kde3/libkontact_korganizerplugin.so
-debian/tmp/usr/lib/kde3/libkontact_summaryplugin.la
-debian/tmp/usr/lib/kde3/libkontact_summaryplugin.so
-debian/tmp/usr/lib/kde3/libkontact_todoplugin.la
-debian/tmp/usr/lib/kde3/libkontact_todoplugin.so
-debian/tmp/usr/lib/kde3/libkontact_weatherplugin.la
-debian/tmp/usr/lib/kde3/libkontact_weatherplugin.so
+debian/tmp/usr/lib/kde3/kcm_kontactknt.la
+debian/tmp/usr/lib/kde3/kcm_kontactknt.so
+debian/tmp/usr/lib/kde3/kcm_kontactsummary.la
+debian/tmp/usr/lib/kde3/kcm_kontactsummary.so
+debian/tmp/usr/lib/kde3/kcm_korgsummary.la
+debian/tmp/usr/lib/kde3/kcm_korgsummary.so
+debian/tmp/usr/lib/kde3/libkontact_*.la
+debian/tmp/usr/lib/kde3/libkontact_*.so
 debian/tmp/usr/lib/libkontact.so.1
 debian/tmp/usr/lib/libkontact.so.1.0.0
 debian/tmp/usr/lib/libkpinterfaces.so.1
 debian/tmp/usr/lib/libkpinterfaces.so.1.0.0
 debian/tmp/usr/share/applications/kde/Kontact.desktop
-debian/tmp/usr/share/apps/knotes/knotes_part.rc
-debian/tmp/usr/share/apps/kontact/kontact.setdlg
-debian/tmp/usr/share/apps/kontact/kontactui.rc
-debian/tmp/usr/share/apps/kontact/pics/splash.png
+debian/tmp/usr/share/apps/kontact
 debian/tmp/usr/share/apps/kontactsummary/kontactsummary_part.rc
 debian/tmp/usr/share/config.kcfg/kontact.kcfg
-debian/tmp/usr/share/doc/kde/HTML/en/kontact/common
-debian/tmp/usr/share/doc/kde/HTML/en/kontact/index.cache.bz2
-debian/tmp/usr/share/doc/kde/HTML/en/kontact/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kontact
 debian/tmp/usr/share/icons/crystalsvg/128x128/apps/kontact.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/kontact_*.png
 debian/tmp/usr/share/icons/crystalsvg/16x16/apps/kontact.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/kontact_*.png
 debian/tmp/usr/share/icons/crystalsvg/32x32/apps/kontact.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/actions/kontact_*.png
 debian/tmp/usr/share/icons/crystalsvg/48x48/apps/kontact.png
 debian/tmp/usr/share/icons/crystalsvg/48x48/apps/korganizer_todo.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/actions/kontact_*.png
 debian/tmp/usr/share/icons/crystalsvg/64x64/apps/kontact.png
-debian/tmp/usr/share/services/kontact/kaddressbookplugin.desktop
-debian/tmp/usr/share/services/kontact/kmailplugin.desktop
-debian/tmp/usr/share/services/kontact/knodeplugin.desktop
-debian/tmp/usr/share/services/kontact/knotesplugin.desktop
-debian/tmp/usr/share/services/kontact/korganizerplugin.desktop
-debian/tmp/usr/share/services/kontact/summaryplugin.desktop
-debian/tmp/usr/share/services/kontact/todoplugin.desktop
-debian/tmp/usr/share/services/kontact/weatherplugin.desktop
+debian/tmp/usr/share/services/kcmkabsummary.desktop
+debian/tmp/usr/share/services/kcmkmailsummary.desktop
+debian/tmp/usr/share/services/kcmkontactknt.desktop
+debian/tmp/usr/share/services/kcmkontactsummary.desktop
+debian/tmp/usr/share/services/kcmkorgsummary.desktop
+debian/tmp/usr/share/services/kontact
 debian/tmp/usr/share/services/kontactconfig.desktop
 debian/tmp/usr/share/servicetypes/kontactplugin.desktop
+debian/icons/kontact.xpm /usr/share/pixmaps
+debian/icons/kontact-16.xpm /usr/share/pixmaps

Added: trunk/packages/kdepim/debian/kontact.links
===================================================================
--- trunk/packages/kdepim/debian/kontact.links	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/kontact.links	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1 @@
+/usr/share/doc/kde/HTML/en/kontact /usr/share/doc/kontact/html

Added: trunk/packages/kdepim/debian/kontact.manpages
===================================================================
--- trunk/packages/kdepim/debian/kontact.manpages	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/kontact.manpages	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1 @@
+debian/man/kontact.1

Modified: trunk/packages/kdepim/debian/kontact.menu
===================================================================
--- trunk/packages/kdepim/debian/kontact.menu	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/kontact.menu	2005-01-21 03:24:38 UTC (rev 434)
@@ -3,4 +3,6 @@
 	section="Apps/Tools"\
 	hints="KDE"\
 	title="Kontact"\
+	icon32x32="/usr/share/pixmaps/kontact.xpm"\
+	icon16x16="/usr/share/pixmaps/kontact-16.xpm"\
 	command="/usr/bin/kontact"

Modified: trunk/packages/kdepim/debian/korganizer.install
===================================================================
--- trunk/packages/kdepim/debian/korganizer.install	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/korganizer.install	2005-01-21 03:24:38 UTC (rev 434)
@@ -1,247 +1,36 @@
-debian/tmp/etc/kde3/khotnewstuffrc
-debian/tmp/usr/bin/ghns
 debian/tmp/usr/bin/ical2vcal
-debian/tmp/usr/bin/khotnewstuff
 debian/tmp/usr/bin/korgac
 debian/tmp/usr/bin/korganizer
 debian/tmp/usr/bin/korganizerIn
 debian/tmp/usr/lib/kde3/kcm_korganizer.la
 debian/tmp/usr/lib/kde3/kcm_korganizer.so
-debian/tmp/usr/lib/kde3/libkorg_birthdays.la
-debian/tmp/usr/lib/kde3/libkorg_birthdays.so
-debian/tmp/usr/lib/kde3/libkorg_datenums.la
-debian/tmp/usr/lib/kde3/libkorg_datenums.so
-debian/tmp/usr/lib/kde3/libkorg_exchange.la
-debian/tmp/usr/lib/kde3/libkorg_exchange.so
-debian/tmp/usr/lib/kde3/libkorg_hebrew.la
-debian/tmp/usr/lib/kde3/libkorg_hebrew.so
-debian/tmp/usr/lib/kde3/libkorg_holidays.la
-debian/tmp/usr/lib/kde3/libkorg_holidays.so
-debian/tmp/usr/lib/kde3/libkorg_projectview.la
-debian/tmp/usr/lib/kde3/libkorg_projectview.so
-debian/tmp/usr/lib/kde3/libkorg_webexport.la
-debian/tmp/usr/lib/kde3/libkorg_webexport.so
+debian/tmp/usr/lib/kde3/libkorg_*.la
+debian/tmp/usr/lib/kde3/libkorg_*.so
 debian/tmp/usr/lib/kde3/libkorganizerpart.la
 debian/tmp/usr/lib/kde3/libkorganizerpart.so
-debian/tmp/usr/lib/libknewstuff.so.1
-debian/tmp/usr/lib/libknewstuff.so.1.0.0
 debian/tmp/usr/lib/libkorganizer.so.1
 debian/tmp/usr/lib/libkorganizer.so.1.0.0
+debian/tmp/usr/lib/libkorganizer_calendar.so.1
+debian/tmp/usr/lib/libkorganizer_calendar.so.1.0.0
 debian/tmp/usr/lib/libkorganizer_eventviewer.so.1
 debian/tmp/usr/lib/libkorganizer_eventviewer.so.1.0.0
 debian/tmp/usr/share/applications/kde/korganizer.desktop
-debian/tmp/usr/share/apps/knewstuff/types
-debian/tmp/usr/share/apps/korgac/icons/crystalsvg/22x22/actions/korgac.png
-debian/tmp/usr/share/apps/korgac/icons/crystalsvg/22x22/actions/korgac_disabled.png
-debian/tmp/usr/share/apps/korganizer/holiday_Suedtirol
-debian/tmp/usr/share/apps/korganizer/holiday_at
-debian/tmp/usr/share/apps/korganizer/holiday_au
-debian/tmp/usr/share/apps/korganizer/holiday_bavarian
-debian/tmp/usr/share/apps/korganizer/holiday_be
-debian/tmp/usr/share/apps/korganizer/holiday_ca
-debian/tmp/usr/share/apps/korganizer/holiday_catalan
-debian/tmp/usr/share/apps/korganizer/holiday_ch
-debian/tmp/usr/share/apps/korganizer/holiday_co
-debian/tmp/usr/share/apps/korganizer/holiday_cz
-debian/tmp/usr/share/apps/korganizer/holiday_de
-debian/tmp/usr/share/apps/korganizer/holiday_dk
-debian/tmp/usr/share/apps/korganizer/holiday_es
-debian/tmp/usr/share/apps/korganizer/holiday_fi
-debian/tmp/usr/share/apps/korganizer/holiday_fr
-debian/tmp/usr/share/apps/korganizer/holiday_frswiss
-debian/tmp/usr/share/apps/korganizer/holiday_gb
-debian/tmp/usr/share/apps/korganizer/holiday_gt
-debian/tmp/usr/share/apps/korganizer/holiday_hu
-debian/tmp/usr/share/apps/korganizer/holiday_ie
-debian/tmp/usr/share/apps/korganizer/holiday_il
-debian/tmp/usr/share/apps/korganizer/holiday_is
-debian/tmp/usr/share/apps/korganizer/holiday_it
-debian/tmp/usr/share/apps/korganizer/holiday_ja
-debian/tmp/usr/share/apps/korganizer/holiday_mx
-debian/tmp/usr/share/apps/korganizer/holiday_nl
-debian/tmp/usr/share/apps/korganizer/holiday_no
-debian/tmp/usr/share/apps/korganizer/holiday_nz
-debian/tmp/usr/share/apps/korganizer/holiday_pl
-debian/tmp/usr/share/apps/korganizer/holiday_pt
-debian/tmp/usr/share/apps/korganizer/holiday_py
-debian/tmp/usr/share/apps/korganizer/holiday_quebec
-debian/tmp/usr/share/apps/korganizer/holiday_ro
-debian/tmp/usr/share/apps/korganizer/holiday_se
-debian/tmp/usr/share/apps/korganizer/holiday_si
-debian/tmp/usr/share/apps/korganizer/holiday_th
-debian/tmp/usr/share/apps/korganizer/holiday_us
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/16x16/actions/1day.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/16x16/actions/1downarrow.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/16x16/actions/1leftarrow.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/16x16/actions/1rightarrow.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/16x16/actions/1uparrow.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/16x16/actions/2downarrow.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/16x16/actions/2leftarrow.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/16x16/actions/2rightarrow.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/16x16/actions/2uparrow.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/16x16/actions/3downarrow.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/16x16/actions/3uparrow.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/16x16/actions/5days.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/16x16/actions/7days.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/16x16/actions/appointment.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/16x16/actions/bell.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/16x16/actions/dayview.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/16x16/actions/findf.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/16x16/actions/groupevent.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/16x16/actions/inverse_recur.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/16x16/actions/list.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/16x16/actions/mailappt.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/16x16/actions/month.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/16x16/actions/nomailappt.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/16x16/actions/organizer.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/16x16/actions/playsound.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/16x16/actions/readonlyevent.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/16x16/actions/recur.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/16x16/actions/runprog.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/16x16/actions/smallcal.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/16x16/actions/smallclock.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/16x16/actions/todo.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/16x16/actions/webexport.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/16x16/actions/whatsnext.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/22x22/actions/1day.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/22x22/actions/1downarrow.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/22x22/actions/1leftarrow.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/22x22/actions/1rightarrow.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/22x22/actions/1uparrow.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/22x22/actions/2downarrow.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/22x22/actions/2leftarrow.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/22x22/actions/2rightarrow.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/22x22/actions/2uparrow.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/22x22/actions/3downarrow.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/22x22/actions/3leftarrow.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/22x22/actions/3rightarrow.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/22x22/actions/3uparrow.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/22x22/actions/5days.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/22x22/actions/7days.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/22x22/actions/agenda.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/22x22/actions/appointment.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/22x22/actions/checkedbox.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/22x22/actions/checkedbox_mask.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/22x22/actions/checkedclipboard.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/22x22/actions/checkmark.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/22x22/actions/delete.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/22x22/actions/emptybox.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/22x22/actions/emptybox/mask.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/22x22/actions/journal.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/22x22/actions/list.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/22x22/actions/month.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/22x22/actions/newrecurevent.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/22x22/actions/newtodo.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/22x22/actions/search.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/22x22/actions/send.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/22x22/actions/timespan.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/22x22/actions/todo.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/22x22/actions/webexport.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/22x22/actions/whatsnext.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/22x22/actions/xdays.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/32x32/actions/1day.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/32x32/actions/5days.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/32x32/actions/7days.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/32x32/actions/appointment.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/32x32/actions/list.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/32x32/actions/month.png
-debian/tmp/usr/share/apps/korganizer/icons/crystalsvg/32x32/actions/todo.png
-debian/tmp/usr/share/apps/korganizer/korganizer_part.rc
-debian/tmp/usr/share/apps/korganizer/korganizergsui.rc
-debian/tmp/usr/share/apps/korganizer/korganizerui.rc
-debian/tmp/usr/share/apps/korganizer/plugins/birthdaysui.rc
-debian/tmp/usr/share/apps/korganizer/plugins/exchangeui.rc
-debian/tmp/usr/share/apps/korganizer/plugins/projectviewui.rc
-debian/tmp/usr/share/apps/korganizer/plugins/webexportui.rc
-debian/tmp/usr/share/apps/korganizer/sounds/alert.wav
-debian/tmp/usr/share/apps/korganizer/sounds/icemag.wav
-debian/tmp/usr/share/apps/korganizer/sounds/lightmag.wav
-debian/tmp/usr/share/apps/korganizer/sounds/onscreen.wav
-debian/tmp/usr/share/apps/korganizer/sounds/spinout.wav
-debian/tmp/usr/share/apps/korganizer/tips
+debian/tmp/usr/share/apps/korgac
+debian/tmp/usr/share/apps/korganizer
 debian/tmp/usr/share/autostart/korgac.desktop
 debian/tmp/usr/share/config.kcfg/korganizer.kcfg
-debian/tmp/usr/share/doc/kde/HTML/en/korganizer/common
-debian/tmp/usr/share/doc/kde/HTML/en/korganizer/ep_config.png
-debian/tmp/usr/share/doc/kde/HTML/en/korganizer/ep_download.png
-debian/tmp/usr/share/doc/kde/HTML/en/korganizer/ep_enable.png
-debian/tmp/usr/share/doc/kde/HTML/en/korganizer/ep_menu.png
-debian/tmp/usr/share/doc/kde/HTML/en/korganizer/ep_progress.png
-debian/tmp/usr/share/doc/kde/HTML/en/korganizer/exchange-plugin.docbook
-debian/tmp/usr/share/doc/kde/HTML/en/korganizer/group-scheduling.docbook
-debian/tmp/usr/share/doc/kde/HTML/en/korganizer/gs_attendee1.png
-debian/tmp/usr/share/doc/kde/HTML/en/korganizer/gs_attendee2.png
-debian/tmp/usr/share/doc/kde/HTML/en/korganizer/gs_counter.png
-debian/tmp/usr/share/doc/kde/HTML/en/korganizer/gs_filter.png
-debian/tmp/usr/share/doc/kde/HTML/en/korganizer/gs_inbox1.png
-debian/tmp/usr/share/doc/kde/HTML/en/korganizer/gs_inbox2.png
-debian/tmp/usr/share/doc/kde/HTML/en/korganizer/gs_korganizer1.png
-debian/tmp/usr/share/doc/kde/HTML/en/korganizer/gs_korganizer2.png
-debian/tmp/usr/share/doc/kde/HTML/en/korganizer/gs_korganizer3.png
-debian/tmp/usr/share/doc/kde/HTML/en/korganizer/gs_outbox1.png
-debian/tmp/usr/share/doc/kde/HTML/en/korganizer/gs_outbox2.png
-debian/tmp/usr/share/doc/kde/HTML/en/korganizer/gs_publish.png
-debian/tmp/usr/share/doc/kde/HTML/en/korganizer/gs_reply.png
-debian/tmp/usr/share/doc/kde/HTML/en/korganizer/gs_setup1.png
-debian/tmp/usr/share/doc/kde/HTML/en/korganizer/gs_setup2.png
-debian/tmp/usr/share/doc/kde/HTML/en/korganizer/gs_show1.png
-debian/tmp/usr/share/doc/kde/HTML/en/korganizer/gs_show2.png
-debian/tmp/usr/share/doc/kde/HTML/en/korganizer/gs_whatsnext.png
-debian/tmp/usr/share/doc/kde/HTML/en/korganizer/i_copy.png
-debian/tmp/usr/share/doc/kde/HTML/en/korganizer/i_cut.png
-debian/tmp/usr/share/doc/kde/HTML/en/korganizer/i_edit_find.png
-debian/tmp/usr/share/doc/kde/HTML/en/korganizer/i_file_close.png
-debian/tmp/usr/share/doc/kde/HTML/en/korganizer/i_file_new.png
-debian/tmp/usr/share/doc/kde/HTML/en/korganizer/i_file_open.png
-debian/tmp/usr/share/doc/kde/HTML/en/korganizer/i_file_print.png
-debian/tmp/usr/share/doc/kde/HTML/en/korganizer/i_file_print_preview.png
-debian/tmp/usr/share/doc/kde/HTML/en/korganizer/i_file_quit.png
-debian/tmp/usr/share/doc/kde/HTML/en/korganizer/i_file_save.png
-debian/tmp/usr/share/doc/kde/HTML/en/korganizer/i_go_backward.png
-debian/tmp/usr/share/doc/kde/HTML/en/korganizer/i_go_forward.png
-debian/tmp/usr/share/doc/kde/HTML/en/korganizer/i_go_to_today.png
-debian/tmp/usr/share/doc/kde/HTML/en/korganizer/i_paste.png
-debian/tmp/usr/share/doc/kde/HTML/en/korganizer/i_settings_prefs.png
-debian/tmp/usr/share/doc/kde/HTML/en/korganizer/i_view_day.png
-debian/tmp/usr/share/doc/kde/HTML/en/korganizer/i_view_list.png
-debian/tmp/usr/share/doc/kde/HTML/en/korganizer/i_view_todo_list.png
-debian/tmp/usr/share/doc/kde/HTML/en/korganizer/i_view_week.png
-debian/tmp/usr/share/doc/kde/HTML/en/korganizer/i_view_work_week.png
-debian/tmp/usr/share/doc/kde/HTML/en/korganizer/index.cache.bz2
-debian/tmp/usr/share/doc/kde/HTML/en/korganizer/index.docbook
-debian/tmp/usr/share/doc/kde/HTML/en/korganizer/o2v_importing1.png
-debian/tmp/usr/share/doc/kde/HTML/en/korganizer/o2v_importing2.png
-debian/tmp/usr/share/doc/kde/HTML/en/korganizer/o2v_importing3.png
-debian/tmp/usr/share/doc/kde/HTML/en/korganizer/o2v_main.png
-debian/tmp/usr/share/doc/kde/HTML/en/korganizer/o2v_progress.png
-debian/tmp/usr/share/doc/kde/HTML/en/korganizer/o2v_save.png
-debian/tmp/usr/share/doc/kde/HTML/en/korganizer/o2v_warning.png
-debian/tmp/usr/share/doc/kde/HTML/en/korganizer/outlook-to-vcalendar.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/korganizer
 debian/tmp/usr/share/icons/crystalsvg/128x128/apps/korganizer.png
-debian/tmp/usr/share/icons/crystalsvg/16x16/actions/knewstuff.png
 debian/tmp/usr/share/icons/crystalsvg/16x16/apps/korganizer.png
-debian/tmp/usr/share/icons/crystalsvg/32x32/actions/knewstuff.png
 debian/tmp/usr/share/icons/crystalsvg/32x32/apps/korganizer.png
 debian/tmp/usr/share/icons/crystalsvg/48x48/apps/korganizer.png
-debian/tmp/usr/share/icons/crystalsvg/64x64/actions/knewstuff.png
 debian/tmp/usr/share/icons/crystalsvg/64x64/apps/korganizer.png
-debian/tmp/usr/share/services/configcolors.desktop
-debian/tmp/usr/share/services/configfonts.desktop
-debian/tmp/usr/share/services/configfreebusy.desktop
-debian/tmp/usr/share/services/configgroupautomation.desktop
-debian/tmp/usr/share/services/configgroupscheduling.desktop
-debian/tmp/usr/share/services/configmain.desktop
-debian/tmp/usr/share/services/configtime.desktop
-debian/tmp/usr/share/services/configviews.desktop
-debian/tmp/usr/share/services/korganizer/birthdays.desktop
-debian/tmp/usr/share/services/korganizer/datenums.desktop
-debian/tmp/usr/share/services/korganizer/exchange.desktop
-debian/tmp/usr/share/services/korganizer/hebrew.desktop
-debian/tmp/usr/share/services/korganizer/holidays.desktop
-debian/tmp/usr/share/services/korganizer/projectview.desktop
-debian/tmp/usr/share/services/korganizer/webexport.desktop
+debian/tmp/usr/share/services/korganizer_*.desktop
+debian/tmp/usr/share/services/korganizer
 debian/tmp/usr/share/services/webcal.protocol
 debian/tmp/usr/share/servicetypes/calendardecoration.desktop
 debian/tmp/usr/share/servicetypes/calendarplugin.desktop
 debian/tmp/usr/share/servicetypes/dcopcalendar.desktop
 debian/tmp/usr/share/servicetypes/korganizerpart.desktop
+debian/icons/korganizer.xpm /usr/share/pixmaps
+debian/icons/korganizer-16.xpm /usr/share/pixmaps

Added: trunk/packages/kdepim/debian/korganizer.links
===================================================================
--- trunk/packages/kdepim/debian/korganizer.links	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/korganizer.links	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1 @@
+/usr/share/doc/kde/HTML/en/korganizer /usr/share/doc/korganizer/html

Added: trunk/packages/kdepim/debian/korganizer.manpages
===================================================================
--- trunk/packages/kdepim/debian/korganizer.manpages	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/korganizer.manpages	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,4 @@
+debian/man/ical2vcal.1
+debian/man/korgac.1
+debian/man/korganizer.1
+debian/man/korganizerIn.1

Modified: trunk/packages/kdepim/debian/korganizer.menu
===================================================================
--- trunk/packages/kdepim/debian/korganizer.menu	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/korganizer.menu	2005-01-21 03:24:38 UTC (rev 434)
@@ -3,4 +3,6 @@
 	section="Apps/Tools"\
 	hints="KDE"\
 	title="KOrganizer"\
+	icon32x32="/usr/share/pixmaps/korganizer.xpm"\
+	icon16x16="/usr/share/pixmaps/korganizer-16.xpm"\
 	command="/usr/bin/korganizer"

Modified: trunk/packages/kdepim/debian/korn.install
===================================================================
--- trunk/packages/kdepim/debian/korn.install	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/korn.install	2005-01-21 03:24:38 UTC (rev 434)
@@ -1,8 +1,8 @@
 debian/tmp/usr/bin/korn
 debian/tmp/usr/share/applications/kde/KOrn.desktop
-debian/tmp/usr/share/doc/kde/HTML/en/korn/common
-debian/tmp/usr/share/doc/kde/HTML/en/korn/index.cache.bz2
-debian/tmp/usr/share/doc/kde/HTML/en/korn/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/korn
 debian/tmp/usr/share/icons/crystalsvg/16x16/apps/korn.png
 debian/tmp/usr/share/icons/crystalsvg/32x32/apps/korn.png
 debian/tmp/usr/share/icons/crystalsvg/48x48/apps/korn.png
+debian/icons/korn.xpm /usr/share/pixmaps
+debian/icons/korn-16.xpm /usr/share/pixmaps

Added: trunk/packages/kdepim/debian/korn.links
===================================================================
--- trunk/packages/kdepim/debian/korn.links	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/korn.links	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1 @@
+/usr/share/doc/kde/HTML/en/korn /usr/share/doc/korn/html

Added: trunk/packages/kdepim/debian/korn.manpages
===================================================================
--- trunk/packages/kdepim/debian/korn.manpages	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/korn.manpages	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1 @@
+debian/man/korn.1

Modified: trunk/packages/kdepim/debian/korn.menu
===================================================================
--- trunk/packages/kdepim/debian/korn.menu	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/korn.menu	2005-01-21 03:24:38 UTC (rev 434)
@@ -3,4 +3,6 @@
 	section="Apps/Net"\
 	hints="KDE"\
 	title="KOrn"\
+	icon32x32="/usr/share/pixmaps/korn.xpm"\
+	icon16x16="/usr/share/pixmaps/korn-16.xpm"\
 	command="/usr/bin/korn"

Modified: trunk/packages/kdepim/debian/kpilot.install
===================================================================
--- trunk/packages/kdepim/debian/kpilot.install	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/kpilot.install	2005-01-21 03:24:38 UTC (rev 434)
@@ -1,84 +1,39 @@
 debian/tmp/usr/bin/kpalmdoc
 debian/tmp/usr/bin/kpilot
 debian/tmp/usr/bin/kpilotDaemon
-debian/tmp/usr/lib/kde3/conduit_address.la
-debian/tmp/usr/lib/kde3/conduit_address.so
-debian/tmp/usr/lib/kde3/conduit_doc.la
-debian/tmp/usr/lib/kde3/conduit_doc.so
-debian/tmp/usr/lib/kde3/conduit_knotes.la
-debian/tmp/usr/lib/kde3/conduit_knotes.so
-debian/tmp/usr/lib/kde3/conduit_mal.la
-debian/tmp/usr/lib/kde3/conduit_mal.so
-debian/tmp/usr/lib/kde3/conduit_popmail.la
-debian/tmp/usr/lib/kde3/conduit_popmail.so
-debian/tmp/usr/lib/kde3/conduit_sysinfo.la
-debian/tmp/usr/lib/kde3/conduit_sysinfo.so
-debian/tmp/usr/lib/kde3/conduit_time.la
-debian/tmp/usr/lib/kde3/conduit_time.so
-debian/tmp/usr/lib/kde3/conduit_todo.la
-debian/tmp/usr/lib/kde3/conduit_todo.so
-debian/tmp/usr/lib/kde3/conduit_vcal.la
-debian/tmp/usr/lib/kde3/conduit_vcal.so
+debian/tmp/usr/lib/kde3/conduit_*.la
+debian/tmp/usr/lib/kde3/conduit_*.so
+debian/tmp/usr/lib/kde3/kcm_kpilot.la
+debian/tmp/usr/lib/kde3/kcm_kpilot.so
 debian/tmp/usr/lib/libkpilot.so.0
 debian/tmp/usr/lib/libkpilot.so.0.0.0
 debian/tmp/usr/share/applications/kde/kpalmdoc.desktop
 debian/tmp/usr/share/applications/kde/kpilot.desktop
 debian/tmp/usr/share/applications/kde/kpilotdaemon.desktop
-debian/tmp/usr/share/apps/kpilot/icons/crystalsvg/16x16/actions/backup.png
-debian/tmp/usr/share/apps/kpilot/icons/crystalsvg/16x16/actions/busysync.png
-debian/tmp/usr/share/apps/kpilot/icons/crystalsvg/16x16/actions/fastsync.png
-debian/tmp/usr/share/apps/kpilot/icons/crystalsvg/16x16/actions/hotsync.png
-debian/tmp/usr/share/apps/kpilot/icons/crystalsvg/16x16/actions/restore.png
-debian/tmp/usr/share/apps/kpilot/icons/crystalsvg/16x16/apps/kpalmdoc.png
-debian/tmp/usr/share/apps/kpilot/icons/crystalsvg/22x22/actions/backup.png
-debian/tmp/usr/share/apps/kpilot/icons/crystalsvg/22x22/actions/busysync.png
-debian/tmp/usr/share/apps/kpilot/icons/crystalsvg/22x22/actions/fastsync.png
-debian/tmp/usr/share/apps/kpilot/icons/crystalsvg/22x22/actions/hotsync.png
-debian/tmp/usr/share/apps/kpilot/icons/crystalsvg/22x22/actions/restore.png
-debian/tmp/usr/share/apps/kpilot/icons/crystalsvg/22x22/apps/kpalmdoc.png
-debian/tmp/usr/share/apps/kpilot/icons/crystalsvg/32x32/apps/kpalmdoc.png
-debian/tmp/usr/share/apps/kpilot/icons/crystalsvg/48x48/apps/kpalmdoc.png
-debian/tmp/usr/share/apps/kpilot/kpilot-address.png
-debian/tmp/usr/share/apps/kpilot/kpilot-calendar.png
-debian/tmp/usr/share/apps/kpilot/kpilot-db.png
-debian/tmp/usr/share/apps/kpilot/kpilot-fileinstaller.png
-debian/tmp/usr/share/apps/kpilot/kpilot-hotsync.png
-debian/tmp/usr/share/apps/kpilot/kpilot-knotes.png
-debian/tmp/usr/share/apps/kpilot/kpilot-splash.png
-debian/tmp/usr/share/apps/kpilot/kpilot-todo.png
-debian/tmp/usr/share/apps/kpilot/kpilotui.rc
-debian/tmp/usr/share/apps/kpilot/sysinfoconduit/Template.html
-debian/tmp/usr/share/apps/kpilot/sysinfoconduit/Template.txt
-debian/tmp/usr/share/doc/kde/HTML/en/kpilot/address-app.png
-debian/tmp/usr/share/doc/kde/HTML/en/kpilot/common
-debian/tmp/usr/share/doc/kde/HTML/en/kpilot/conduit-knotes.png
-debian/tmp/usr/share/doc/kde/HTML/en/kpilot/conduit-popmail-kmail.png
-debian/tmp/usr/share/doc/kde/HTML/en/kpilot/conduit-popmail-recv-method.png
-debian/tmp/usr/share/doc/kde/HTML/en/kpilot/conduit-popmail-send-as.png
-debian/tmp/usr/share/doc/kde/HTML/en/kpilot/conduit-popmail-send-method.png
-debian/tmp/usr/share/doc/kde/HTML/en/kpilot/conduit-popmail-sendmail.png
-debian/tmp/usr/share/doc/kde/HTML/en/kpilot/conduit-popmail-smtp.png
-debian/tmp/usr/share/doc/kde/HTML/en/kpilot/conduit-popmail-top.png
-debian/tmp/usr/share/doc/kde/HTML/en/kpilot/conduit-vcal.png
-debian/tmp/usr/share/doc/kde/HTML/en/kpilot/file-app.png
-debian/tmp/usr/share/doc/kde/HTML/en/kpilot/index.cache.bz2
-debian/tmp/usr/share/doc/kde/HTML/en/kpilot/index.docbook
-debian/tmp/usr/share/doc/kde/HTML/en/kpilot/main-app.png
-debian/tmp/usr/share/doc/kde/HTML/en/kpilot/memo-app.png
-debian/tmp/usr/share/doc/kde/HTML/en/kpilot/setup-address.png
-debian/tmp/usr/share/doc/kde/HTML/en/kpilot/setup-conduit.png
-debian/tmp/usr/share/doc/kde/HTML/en/kpilot/setup-dbspecial.png
-debian/tmp/usr/share/doc/kde/HTML/en/kpilot/setup-general.png
-debian/tmp/usr/share/doc/kde/HTML/en/kpilot/setup-sync.png
-debian/tmp/usr/share/doc/kde/HTML/en/kpilot/toolbar_backup.png
-debian/tmp/usr/share/doc/kde/HTML/en/kpilot/toolbar_hotsync.png
+debian/tmp/usr/share/apps/kconf_update/kpalmdoc.upd
+debian/tmp/usr/share/apps/kconf_update/kpilot.upd
+debian/tmp/usr/share/apps/kpilot
+debian/tmp/usr/share/config.kcfg/abbrowserconduit.kcfg
+debian/tmp/usr/share/config.kcfg/docconduit.kcfg
+debian/tmp/usr/share/config.kcfg/knotesconduit.kcfg
+debian/tmp/usr/share/config.kcfg/kpalmdoc.kcfg
+debian/tmp/usr/share/config.kcfg/kpilot.kcfg
+debian/tmp/usr/share/config.kcfg/kpilotlib.kcfg
+debian/tmp/usr/share/config.kcfg/malconduit.kcfg
+debian/tmp/usr/share/config.kcfg/popmail.kcfg
+debian/tmp/usr/share/config.kcfg/sysinfoconduit.kcfg
+debian/tmp/usr/share/config.kcfg/timeconduit.kcfg
+debian/tmp/usr/share/config.kcfg/vcalconduitbase.kcfg
+debian/tmp/usr/share/doc/kde/HTML/en/kpilot
 debian/tmp/usr/share/icons/crystalsvg/16x16/apps/kpalmdoc.png
 debian/tmp/usr/share/icons/crystalsvg/16x16/apps/kpilot.png
 debian/tmp/usr/share/icons/crystalsvg/16x16/apps/kpilotDaemon.png
 debian/tmp/usr/share/icons/crystalsvg/22x22/apps/kpalmdoc.png
 debian/tmp/usr/share/icons/crystalsvg/22x22/apps/kpilot.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/apps/kpilotDaemon.png
 debian/tmp/usr/share/icons/crystalsvg/32x32/apps/kpalmdoc.png
 debian/tmp/usr/share/icons/crystalsvg/32x32/apps/kpilot.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/apps/kpilotDaemon.png
 debian/tmp/usr/share/icons/crystalsvg/48x48/apps/kpalmdoc.png
 debian/tmp/usr/share/icons/crystalsvg/48x48/apps/kpilot.png
 debian/tmp/usr/share/icons/crystalsvg/48x48/apps/kpilotDaemon.png
@@ -86,6 +41,7 @@
 debian/tmp/usr/share/services/abbrowser_conduit.desktop
 debian/tmp/usr/share/services/doc_conduit.desktop
 debian/tmp/usr/share/services/knotes-conduit.desktop
+debian/tmp/usr/share/services/kpilot_config.desktop
 debian/tmp/usr/share/services/mal_conduit.desktop
 debian/tmp/usr/share/services/popmail-conduit.desktop
 debian/tmp/usr/share/services/sysinfo_conduit.desktop
@@ -93,3 +49,7 @@
 debian/tmp/usr/share/services/todo-conduit.desktop
 debian/tmp/usr/share/services/vcal-conduit.desktop
 debian/tmp/usr/share/servicetypes/kpilotconduit.desktop
+debian/icons/kpilot.xpm /usr/share/pixmaps
+debian/icons/kpilot-16.xpm /usr/share/pixmaps
+debian/icons/kpalmdoc.xpm /usr/share/pixmaps
+debian/icons/kpalmdoc-16.xpm /usr/share/pixmaps

Added: trunk/packages/kdepim/debian/kpilot.links
===================================================================
--- trunk/packages/kdepim/debian/kpilot.links	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/kpilot.links	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1 @@
+/usr/share/doc/kde/HTML/en/kpilot /usr/share/doc/kpilot/html

Added: trunk/packages/kdepim/debian/kpilot.manpages
===================================================================
--- trunk/packages/kdepim/debian/kpilot.manpages	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/kpilot.manpages	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,3 @@
+debian/man/kpalmdoc.1
+debian/man/kpilot.1
+debian/man/kpilotDaemon.1

Modified: trunk/packages/kdepim/debian/kpilot.menu
===================================================================
--- trunk/packages/kdepim/debian/kpilot.menu	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/kpilot.menu	2005-01-21 03:24:38 UTC (rev 434)
@@ -3,6 +3,8 @@
 	section="Apps/Tools"\
 	hints="KDE"\
 	title="KPilot"\
+	icon32x32="/usr/share/pixmaps/kpilot.xpm"\
+	icon16x16="/usr/share/pixmaps/kpilot-16.xpm"\
 	command="/usr/bin/kpilot"
 
 ?package(kpilot):\
@@ -10,4 +12,6 @@
 	section="Apps/Tools"\
 	hints="KDE"\
 	title="KPalmDOC"\
+	icon32x32="/usr/share/pixmaps/kpalmdoc.xpm"\
+	icon16x16="/usr/share/pixmaps/kpalmdoc-16.xpm"\
 	command="/usr/bin/kpalmdoc"

Modified: trunk/packages/kdepim/debian/ksync.install
===================================================================
--- trunk/packages/kdepim/debian/ksync.install	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/ksync.install	2005-01-21 03:24:38 UTC (rev 434)
@@ -2,3 +2,5 @@
 debian/tmp/usr/lib/libksync.so.1
 debian/tmp/usr/lib/libksync.so.1.0.0
 debian/tmp/usr/share/apps/ksync/ksyncui.rc
+debian/icons/ksync.xpm /usr/share/pixmaps
+debian/icons/ksync-16.xpm /usr/share/pixmaps

Added: trunk/packages/kdepim/debian/ksync.manpages
===================================================================
--- trunk/packages/kdepim/debian/ksync.manpages	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/ksync.manpages	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1 @@
+debian/man/ksync.1

Modified: trunk/packages/kdepim/debian/ksync.menu
===================================================================
--- trunk/packages/kdepim/debian/ksync.menu	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/ksync.menu	2005-01-21 03:24:38 UTC (rev 434)
@@ -3,4 +3,6 @@
 	section="Apps/Tools"\
 	hints="KDE"\
 	title="KSync"\
+	icon32x32="/usr/share/pixmaps/ksync.xpm"\
+	icon16x16="/usr/share/pixmaps/ksync-16.xpm"\
 	command="/usr/bin/ksync"

Modified: trunk/packages/kdepim/debian/ktnef.install
===================================================================
--- trunk/packages/kdepim/debian/ktnef.install	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/ktnef.install	2005-01-21 03:24:38 UTC (rev 434)
@@ -2,12 +2,11 @@
 debian/tmp/usr/lib/libktnef.so.1
 debian/tmp/usr/lib/libktnef.so.1.0.0
 debian/tmp/usr/share/applications/kde/ktnef.desktop
-debian/tmp/usr/share/apps/ktnef/icons/hicolor/22x22/actions/ktnef_extract_all_to.png
-debian/tmp/usr/share/apps/ktnef/icons/hicolor/22x22/actions/ktnef_extract_to.png
-debian/tmp/usr/share/apps/ktnef/icons/locolor/16x16/actions/ktnef_extract_all_to.png
-debian/tmp/usr/share/apps/ktnef/icons/locolor/16x16/actions/ktnef_extract_to.png
-debian/tmp/usr/share/apps/ktnef/ktnefui.rc
+debian/tmp/usr/share/apps/ktnef
+debian/tmp/usr/share/doc/kde/HTML/en/ktnef
 debian/tmp/usr/share/icons/hicolor/48x48/apps/ktnef.png
 debian/tmp/usr/share/icons/locolor/16x16/apps/ktnef.png
 debian/tmp/usr/share/icons/locolor/32x32/apps/ktnef.png
 debian/tmp/usr/share/mimelnk/application/ms-tnef.desktop
+debian/icons/ktnef.xpm /usr/share/pixmaps
+debian/icons/ktnef-16.xpm /usr/share/pixmaps

Added: trunk/packages/kdepim/debian/ktnef.links
===================================================================
--- trunk/packages/kdepim/debian/ktnef.links	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/ktnef.links	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1 @@
+/usr/share/doc/kde/HTML/en/ktnef /usr/share/doc/ktnef/html

Added: trunk/packages/kdepim/debian/ktnef.manpages
===================================================================
--- trunk/packages/kdepim/debian/ktnef.manpages	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/ktnef.manpages	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1 @@
+debian/man/ktnef.1

Modified: trunk/packages/kdepim/debian/ktnef.menu
===================================================================
--- trunk/packages/kdepim/debian/ktnef.menu	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/ktnef.menu	2005-01-21 03:24:38 UTC (rev 434)
@@ -3,4 +3,6 @@
 	section="Apps/Tools"\
 	hints="KDE"\
 	title="KTnef"\
+	icon32x32="/usr/share/pixmaps/ktnef.xpm"\
+	icon16x16="/usr/share/pixmaps/ktnef-16.xpm"\
 	command="/usr/bin/ktnef"

Modified: trunk/packages/kdepim/debian/libkcal2-dev.install
===================================================================
--- trunk/packages/kdepim/debian/libkcal2-dev.install	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/libkcal2-dev.install	2005-01-21 03:24:38 UTC (rev 434)
@@ -1,43 +1,13 @@
-debian/tmp/usr/include/kde/libkcal/alarm.h
-debian/tmp/usr/include/kde/libkcal/attachment.h
-debian/tmp/usr/include/kde/libkcal/attendee.h
-debian/tmp/usr/include/kde/libkcal/calendar.h
-debian/tmp/usr/include/kde/libkcal/calendarlocal.h
-debian/tmp/usr/include/kde/libkcal/calendarnull.h
-debian/tmp/usr/include/kde/libkcal/calendarresources.h
-debian/tmp/usr/include/kde/libkcal/calfilter.h
-debian/tmp/usr/include/kde/libkcal/calformat.h
-debian/tmp/usr/include/kde/libkcal/calstorage.h
-debian/tmp/usr/include/kde/libkcal/compat.h
-debian/tmp/usr/include/kde/libkcal/customproperties.h
-debian/tmp/usr/include/kde/libkcal/dndfactory.h
-debian/tmp/usr/include/kde/libkcal/duration.h
-debian/tmp/usr/include/kde/libkcal/event.h
-debian/tmp/usr/include/kde/libkcal/exceptions.h
-debian/tmp/usr/include/kde/libkcal/filestorage.h
-debian/tmp/usr/include/kde/libkcal/freebusy.h
-debian/tmp/usr/include/kde/libkcal/htmlexport.h
-debian/tmp/usr/include/kde/libkcal/icaldrag.h
-debian/tmp/usr/include/kde/libkcal/icalformat.h
-debian/tmp/usr/include/kde/libkcal/incidence.h
-debian/tmp/usr/include/kde/libkcal/incidencebase.h
-debian/tmp/usr/include/kde/libkcal/journal.h
-debian/tmp/usr/include/kde/libkcal/listbase.h
-debian/tmp/usr/include/kde/libkcal/period.h
-debian/tmp/usr/include/kde/libkcal/person.h
-debian/tmp/usr/include/kde/libkcal/qtopiaformat.h
-debian/tmp/usr/include/kde/libkcal/recurrence.h
-debian/tmp/usr/include/kde/libkcal/resourcecached.h
-debian/tmp/usr/include/kde/libkcal/resourcecalendar.h
-debian/tmp/usr/include/kde/libkcal/resourcelocal.h
-debian/tmp/usr/include/kde/libkcal/resourcelocalconfig.h
-debian/tmp/usr/include/kde/libkcal/resourcelocaldir.h
-debian/tmp/usr/include/kde/libkcal/resourcelocaldirconfig.h
-debian/tmp/usr/include/kde/libkcal/resourceremote.h
-debian/tmp/usr/include/kde/libkcal/resourceremoteconfig.h
-debian/tmp/usr/include/kde/libkcal/scheduler.h
-debian/tmp/usr/include/kde/libkcal/todo.h
-debian/tmp/usr/include/kde/libkcal/vcaldrag.h
-debian/tmp/usr/include/kde/libkcal/vcalformat.h
+debian/tmp/usr/include/kde/libkcal
 debian/tmp/usr/lib/libkcal.la
 debian/tmp/usr/lib/libkcal.so
+debian/tmp/usr/lib/libkcal_imap.la
+debian/tmp/usr/lib/libkcal_imap.so
+debian/tmp/usr/lib/libkcal_resourceremote.la
+debian/tmp/usr/lib/libkcal_resourceremote.so
+debian/tmp/usr/lib/libkcal_slox.la
+debian/tmp/usr/lib/libkcal_slox.so
+debian/tmp/usr/lib/libkcal_xmlrpc.la
+debian/tmp/usr/lib/libkcal_xmlrpc.so
+debian/tmp/usr/lib/libkslox.la
+debian/tmp/usr/lib/libkslox.so

Deleted: trunk/packages/kdepim/debian/libkcal2.install

Copied: trunk/packages/kdepim/debian/libkcal2a.install (from rev 433, trunk/packages/kdepim/debian/libkcal2.install)
===================================================================
--- trunk/packages/kdepim/debian/libkcal2.install	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/libkcal2a.install	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,15 @@
+debian/tmp/usr/lib/kde3/kcal_*.la
+debian/tmp/usr/lib/kde3/kcal_*.so
+debian/tmp/usr/lib/libkcal.so.2
+debian/tmp/usr/lib/libkcal.so.2.0.0
+debian/tmp/usr/lib/libkcal_imap.so.1
+debian/tmp/usr/lib/libkcal_imap.so.1.0.0
+debian/tmp/usr/lib/libkcal_resourceremote.so.1
+debian/tmp/usr/lib/libkcal_resourceremote.so.1.0.0
+debian/tmp/usr/lib/libkcal_slox.so.0
+debian/tmp/usr/lib/libkcal_slox.so.0.0.0
+debian/tmp/usr/lib/libkcal_xmlrpc.so.1
+debian/tmp/usr/lib/libkcal_xmlrpc.so.1.0.0
+debian/tmp/usr/lib/libkslox.so.0
+debian/tmp/usr/lib/libkslox.so.0.0.0
+debian/tmp/usr/share/services/kresources/kcal

Modified: trunk/packages/kdepim/debian/libkdenetwork2.install
===================================================================
--- trunk/packages/kdepim/debian/libkdenetwork2.install	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/libkdenetwork2.install	2005-01-21 03:24:38 UTC (rev 434)
@@ -2,11 +2,3 @@
 debian/tmp/usr/lib/libkdenetwork.so.2.2.0
 debian/tmp/usr/share/apps/kconf_update/kpgp-3.1-upgrade-address-data.pl
 debian/tmp/usr/share/apps/kconf_update/kpgp.upd
-debian/tmp/usr/share/apps/kmail/pics/key.png
-debian/tmp/usr/share/apps/kmail/pics/key_bad.png
-debian/tmp/usr/share/apps/kmail/pics/key_ok.png
-debian/tmp/usr/share/apps/kmail/pics/key_unknown.png
-debian/tmp/usr/share/apps/knode/pics/key.png
-debian/tmp/usr/share/apps/knode/pics/key_bad.png
-debian/tmp/usr/share/apps/knode/pics/key_ok.png
-debian/tmp/usr/share/apps/knode/pics/key_unknown.png

Deleted: trunk/packages/kdepim/debian/libkdgantt0-dev.install

Deleted: trunk/packages/kdepim/debian/libkdgantt0.install

Modified: trunk/packages/kdepim/debian/libkgantt0-dev.install
===================================================================
--- trunk/packages/kdepim/debian/libkgantt0-dev.install	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/libkgantt0-dev.install	2005-01-21 03:24:38 UTC (rev 434)
@@ -1,10 +1,3 @@
-debian/tmp/usr/include/kde/kgantt/KGantt.h
-debian/tmp/usr/include/kde/kgantt/KGanttBarConfig.h
-debian/tmp/usr/include/kde/kgantt/KGanttItem.h
-debian/tmp/usr/include/kde/kgantt/KGanttRelation.h
-debian/tmp/usr/include/kde/kgantt/xQGanttBarView.h
-debian/tmp/usr/include/kde/kgantt/xQGanttBarViewPort.h
-debian/tmp/usr/include/kde/kgantt/xQGanttListView.h
-debian/tmp/usr/include/kde/kgantt/xQGanttListViewPort.h
+debian/tmp/usr/include/kde/kgantt
 debian/tmp/usr/lib/libkgantt.la
 debian/tmp/usr/lib/libkgantt.so

Modified: trunk/packages/kdepim/debian/libkgantt0.install
===================================================================
--- trunk/packages/kdepim/debian/libkgantt0.install	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/libkgantt0.install	2005-01-21 03:24:38 UTC (rev 434)
@@ -1,11 +1,3 @@
 debian/tmp/usr/lib/libkgantt.so.0
 debian/tmp/usr/lib/libkgantt.so.0.0.2
-debian/tmp/usr/share/apps/kgantt/icons/crystalsvg/16x16/actions/ganttSelect.png
-debian/tmp/usr/share/apps/kgantt/icons/crystalsvg/16x16/actions/ganttSelecttask.png
-debian/tmp/usr/share/apps/kgantt/icons/crystalsvg/16x16/actions/ganttUnselecttask.png
-debian/tmp/usr/share/apps/kgantt/icons/crystalsvg/22x22/actions/ganttSelect.png
-debian/tmp/usr/share/apps/kgantt/icons/crystalsvg/22x22/actions/ganttSelecttask.png
-debian/tmp/usr/share/apps/kgantt/icons/crystalsvg/22x22/actions/ganttUnselecttask.png
-debian/tmp/usr/share/apps/kgantt/icons/crystalsvg/32x32/actions/ganttSelect.png
-debian/tmp/usr/share/apps/kgantt/icons/crystalsvg/32x32/actions/ganttSelecttask.png
-debian/tmp/usr/share/apps/kgantt/icons/crystalsvg/32x32/actions/ganttUnselecttask.png
+debian/tmp/usr/share/apps/kgantt

Added: trunk/packages/kdepim/debian/libkleopatra0-dev.install
===================================================================
--- trunk/packages/kdepim/debian/libkleopatra0-dev.install	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/libkleopatra0-dev.install	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,9 @@
+debian/tmp/usr/include/kde/gpgme++
+debian/tmp/usr/include/kde/kleo
+debian/tmp/usr/include/kde/qgpgme
+debian/tmp/usr/lib/libgpgme++.la
+debian/tmp/usr/lib/libgpgme++.so
+debian/tmp/usr/lib/libkleopatra.la
+debian/tmp/usr/lib/libkleopatra.so
+debian/tmp/usr/lib/libqgpgme.la
+debian/tmp/usr/lib/libqgpgme.so

Added: trunk/packages/kdepim/debian/libkleopatra0a.install
===================================================================
--- trunk/packages/kdepim/debian/libkleopatra0a.install	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/libkleopatra0a.install	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,14 @@
+debian/tmp/etc/kde3/libkleopatrarc
+debian/tmp/usr/lib/libgpgme++.so.0
+debian/tmp/usr/lib/libgpgme++.so.0.1.0
+debian/tmp/usr/lib/libkleopatra.so.0
+debian/tmp/usr/lib/libkleopatra.so.0.0.0
+debian/tmp/usr/lib/libqgpgme.so.0
+debian/tmp/usr/lib/libqgpgme.so.0.0.0
+debian/tmp/usr/share/apps/libkleopatra
+debian/tmp/usr/share/icons/crystalsvg/16x16/apps/gpg.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/apps/gpgsm.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/apps/gpg.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/apps/gpgsm.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/apps/gpg.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/apps/gpgsm.png

Modified: trunk/packages/kdepim/debian/libkpimexchange1.install
===================================================================
--- trunk/packages/kdepim/debian/libkpimexchange1.install	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/libkpimexchange1.install	2005-01-21 03:24:38 UTC (rev 434)
@@ -1,2 +1,4 @@
+debian/tmp/usr/lib/kde3/resourcecalendarexchange.la
+debian/tmp/usr/lib/kde3/resourcecalendarexchange.so
 debian/tmp/usr/lib/libkpimexchange.so.1
 debian/tmp/usr/lib/libkpimexchange.so.1.0.0

Added: trunk/packages/kdepim/debian/libkpimidentities1.install
===================================================================
--- trunk/packages/kdepim/debian/libkpimidentities1.install	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/libkpimidentities1.install	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/libkpimidentities.so.1
+debian/tmp/usr/lib/libkpimidentities.so.1.0.0

Modified: trunk/packages/kdepim/debian/libksieve0-dev.install
===================================================================
--- trunk/packages/kdepim/debian/libksieve0-dev.install	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/libksieve0-dev.install	2005-01-21 03:24:38 UTC (rev 434)
@@ -1,6 +1,3 @@
-debian/tmp/usr/include/kde/ksieve/error.h
-debian/tmp/usr/include/kde/ksieve/lexer.h
-debian/tmp/usr/include/kde/ksieve/parser.h
-debian/tmp/usr/include/kde/ksieve/scriptbuilder.h
+debian/tmp/usr/include/kde/ksieve
 debian/tmp/usr/lib/libksieve.la
 debian/tmp/usr/lib/libksieve.so

Modified: trunk/packages/kdepim/debian/libmimelib1-dev.install
===================================================================
--- trunk/packages/kdepim/debian/libmimelib1-dev.install	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/libmimelib1-dev.install	2005-01-21 03:24:38 UTC (rev 434)
@@ -1,36 +1,3 @@
-debian/tmp/usr/include/kde/mimelib/address.h
-debian/tmp/usr/include/kde/mimelib/addrlist.h
-debian/tmp/usr/include/kde/mimelib/binhex.h
-debian/tmp/usr/include/kde/mimelib/body.h
-debian/tmp/usr/include/kde/mimelib/bodypart.h
-debian/tmp/usr/include/kde/mimelib/boyermor.h
-debian/tmp/usr/include/kde/mimelib/config.h
-debian/tmp/usr/include/kde/mimelib/datetime.h
-debian/tmp/usr/include/kde/mimelib/debug.h
-debian/tmp/usr/include/kde/mimelib/disptype.h
-debian/tmp/usr/include/kde/mimelib/entity.h
-debian/tmp/usr/include/kde/mimelib/enum.h
-debian/tmp/usr/include/kde/mimelib/field.h
-debian/tmp/usr/include/kde/mimelib/fieldbdy.h
-debian/tmp/usr/include/kde/mimelib/group.h
-debian/tmp/usr/include/kde/mimelib/headers.h
-debian/tmp/usr/include/kde/mimelib/mailbox.h
-debian/tmp/usr/include/kde/mimelib/mboxlist.h
-debian/tmp/usr/include/kde/mimelib/mechansm.h
-debian/tmp/usr/include/kde/mimelib/mediatyp.h
-debian/tmp/usr/include/kde/mimelib/message.h
-debian/tmp/usr/include/kde/mimelib/mimepp.h
-debian/tmp/usr/include/kde/mimelib/msgcmp.h
-debian/tmp/usr/include/kde/mimelib/msgid.h
-debian/tmp/usr/include/kde/mimelib/nntp.h
-debian/tmp/usr/include/kde/mimelib/param.h
-debian/tmp/usr/include/kde/mimelib/pop.h
-debian/tmp/usr/include/kde/mimelib/protocol.h
-debian/tmp/usr/include/kde/mimelib/smtp.h
-debian/tmp/usr/include/kde/mimelib/string.h
-debian/tmp/usr/include/kde/mimelib/text.h
-debian/tmp/usr/include/kde/mimelib/token.h
-debian/tmp/usr/include/kde/mimelib/utility.h
-debian/tmp/usr/include/kde/mimelib/uuencode.h
+debian/tmp/usr/include/kde/mimelib
 debian/tmp/usr/lib/libmimelib.la
 debian/tmp/usr/lib/libmimelib.so

Deleted: trunk/packages/kdepim/debian/libmimelib1.install

Copied: trunk/packages/kdepim/debian/libmimelib1a.install (from rev 433, trunk/packages/kdepim/debian/libmimelib1.install)

Deleted: trunk/packages/kdepim/debian/man/alarmd.sgml

Added: trunk/packages/kdepim/debian/man/egroupwarewizard.man
===================================================================
--- trunk/packages/kdepim/debian/man/egroupwarewizard.man	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/man/egroupwarewizard.man	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,15 @@
+.TH EGROUPWAREWIZARD 1
+.SH NAME
+egroupwarewizard \- KDE eGroupware Wizard
+.SH SYNOPSIS
+.B egroupwarewizard
+.I [Qt-options] [KDE-options] [options]
+.SH DESCRIPTION
+.B egroupwarewizard
+is a front end to configure eGroupware servers.
+.SH PROGRAM OPTIONS
+.TP
+.B --verbose
+Verbose output.
+.so kdeopt.man
+

Added: trunk/packages/kdepim/debian/man/groupwarewizard.man
===================================================================
--- trunk/packages/kdepim/debian/man/groupwarewizard.man	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/man/groupwarewizard.man	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,23 @@
+.TH GROUPWAREWIZARD 1
+.SH NAME
+groupwarewizard \- KDE Groupware Wizard
+.SH SYNOPSIS
+.B groupwarewizard
+.I [Qt-options] [KDE-options] [options]
+.SH DESCRIPTION
+.B groupwarewizard
+is a front end to configure eGroupware, Kolab, and SUSE Linux Openexchange
+servers.
+.SH PROGRAM OPTIONS
+.TP
+.B --serverType \fI<type>\fB
+The server type to configure.
+.so kdeopt.man
+.SH SEE ALSO
+.B egroupwarewizard
+(1),
+.B kolabwizard
+(1),
+.B sloxwizard
+(1).
+

Added: trunk/packages/kdepim/debian/man/ical2vcal.man
===================================================================
--- trunk/packages/kdepim/debian/man/ical2vcal.man	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/man/ical2vcal.man	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,20 @@
+.TH ICAL2VCAL 1
+.SH NAME
+ical2vcal \- Convert calendars from iCal to Versit vCal format
+.SH SUMMARY
+.B ical2vcal
+.I [infile] outfile
+.SH DESCRIPTION
+.B ical2vcal
+converts calendars from iCal to Versit vCal format, which is the standard
+format used internally by KOrganizer.
+.SH OPTIONS
+.TP
+.B infile
+Specifies the name of the iCal calendar file to read in.
+The default is ~/.calendar.
+.TP
+.B outfile
+Specifies the name of the vCal calendar file to write.
+.SH SEE ALSO
+.BR korganizer (1).

Deleted: trunk/packages/kdepim/debian/man/ical2vcal.sgml

Added: trunk/packages/kdepim/debian/man/kabc2mutt.man
===================================================================
--- trunk/packages/kdepim/debian/man/kabc2mutt.man	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/man/kabc2mutt.man	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,26 @@
+.TH KABC2MUTT 1
+.SH NAME
+kabc2mutt \- kabc to mutt converter
+.SH SYNOPSIS
+.B kmahjongg
+.I [Qt-options] [KDE-options] [options]
+.SH DESCRIPTION
+kabc2mutt converts the KDE address book's entries to Mutt format.
+.SH PROGRAM OPTIONS
+.TP
+.B --query \fI<substring>\fB
+Only show contacts where name or address matches \fI<substring>\fP.
+.TP
+.B --format \fI<format>\fB
+Default format is `alias'. `query' returns
+email\fB<tab>\fPname\fB<tab>\fP, as needed by mutt's query_command.
+.TP
+.B --ignore-case
+Make queries case insensitive.
+.TP
+.B --all-addresses
+Return all mail addresses, not just the preferred one.
+.so kdeopt.man
+.SH SEE ALSO
+.B kaddressbook
+(1).

Added: trunk/packages/kdepim/debian/man/kaddressbook.man
===================================================================
--- trunk/packages/kdepim/debian/man/kaddressbook.man	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/man/kaddressbook.man	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,41 @@
+.TH KADDRESSBOOK 1
+.SH NAME
+kaddressbook \- The KDE Address Book
+.SH SYNOPSIS
+.B kaddressbook
+.I [Qt-options] [KDE-options] [options]
+.SH DESCRIPTION
+\fBKAddressBook\fP is the main address book application for KDE; it enables
+you to manage your contacts efficiently and comfortably.  Since it is based
+on the kabc library it supports resources, which can be used to load and save
+your contacts to many different locations -- not just the local file system,
+but also to LDAP servers and SQL databases.
+
+The user interface is similar to MS Outlook and it supports different views
+to represent the contact data differently; it also provides an incremental
+search over all fields and a jump button bar to quickly access single entries.
+Since the underlying kabc library uses the vCard format (specified in RFC 2426)
+as its default storage medium, KAddressBook mainly reflects the supported
+entry fields in its graphical user interface.
+.SH PROGRAM OPTIONS
+.TP
+.B -a, --addr \fI<email>\fB
+Shows contact editor with given email address.
+.TP
+.B --uid \fI<uid>\fB
+Shows contact editor with given uid.
+.TP
+.B --editor-only
+Launches in editor only mode.
+.TP
+.B --new-contact
+Launches editor for the new contact.
+.TP
+.B --document \fI<file>\fB
+Work on given file.
+.so kdeopt.man
+.SH SEE ALSO
+More detailed user documentation is available from
+.BR help:/kaddressbook
+(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
+help:/kaddressbook').

Added: trunk/packages/kdepim/debian/man/kalarm.man
===================================================================
--- trunk/packages/kdepim/debian/man/kalarm.man	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/man/kalarm.man	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,108 @@
+.TH KALARM 1
+.SH NAME
+kalarm \- Personal alarm message, command and email scheduler for KDE
+.SH SYNOPSIS
+.B kalarm
+.I [Qt-options] [KDE-options] [options] [message]
+.SH DESCRIPTION
+\fBKAlarm\fP is a personal alarm message, command and email scheduler. It
+lets you set up personal alarm messages which pop up on the screen at the
+chosen time, or you can schedule commands to be executed or emails to be
+sent.
+.SH PROGRAM OPTIONS
+.TP
+.B -a, --ack-confirm
+Prompt for confirmation when alarm is acknowledged.
+.TP
+.B -A, --attach \fI<url>\fB
+Attach file to email (repeat as needed).
+.TP
+.B --bcc
+Blind copy email to self.
+.TP
+.B -b, --beep
+Beep when message is displayed.
+.TP
+.B -c, --color \fI<color>\fB
+Message background color (name or hex 0xRRGGBB).
+.TP
+.B -C, --colorfg \fI<color>\fB
+Message foreground color (name or hex 0xRRGGBB).
+.TP
+.B --calendarURL \fI<url>\fB
+URL of calendar file.
+.TP
+.B --cancelEvent \fI<eventID>\fB
+Cancel alarm with the specified event ID.
+.TP
+.B -e, --exec \fI<commandline>\fB
+Execute a shell command line.
+.TP
+.B -f, --file \fI<url>\fB
+File to display.
+.TP
+.B --handleEvent \fI<eventID>\fB
+Trigger or cancel alarm with the specified event ID.
+.TP
+.B -i, --interval \fI<period>\fB
+Interval between alarm repetitions.
+.TP
+.B -l, --late-cancel
+Cancel alarm if it cannot be triggered on time.
+.TP
+.B -L, --login
+Repeat alarm at every login.
+.TP
+.B -m, --mail \fI<address>\fB
+Send an email to the given address (repeat as needed).
+.TP
+.B -p, --play \fI<url>\fB
+Audio file to play once.
+.TP
+.B -P, --play-repeat \fI<url>\fB
+Audio file to play repeatedly.
+.TP
+.B --recurrence \fI<spec>\fB
+Specify alarm recurrence using iCalendar syntax.
+.TP
+.B -R, --reminder \fI<period>\fB
+Display reminder in advance of alarm.
+.TP
+.B --reminder-once \fI<period>\fB
+Display reminder once, before first alarm recurrence.
+.TP
+.B -r, --repeat \fI<count>\fB
+Number of times to repeat alarm (including initial occasion).
+.TP
+.B --reset
+Reset the alarm scheduling daemon.
+.TP
+.B --stop
+Stop the alarm scheduling daemon.
+.TP
+.B -S, --subject
+Email subject line.
+.TP
+.B -t, --time \fI<time>\fB
+Trigger alarm at time [[[yyyy-]mm-]dd-]hh:mm, or date yyyy-mm-dd.
+.TP
+.B --tray
+Display system tray icon.
+.TP
+.B --triggerEvent \fI<eventID>\fB
+Trigger alarm with the specified event ID.
+.TP
+.B -u, --until \fI<time>\fB
+Repeat until time [[[yyyy-]mm-]dd-]hh:mm, or date yyyy-mm-dd.
+.TP
+.B -v, --volume \fI<percent>\fB
+Volume to play audio file.
+.TP
+.B message
+Message text to display.
+.so kdeopt.man
+.SH SEE ALSO
+More detailed user documentation is available from
+.BR help:/kalarm
+(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
+help:/kalarm').

Added: trunk/packages/kdepim/debian/man/kalarmd.man
===================================================================
--- trunk/packages/kdepim/debian/man/kalarmd.man	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/man/kalarmd.man	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,18 @@
+.TH KALARMD 1
+.SH NAME
+kalarmd \- KDE alarm daemon
+.SH SYNOPSIS
+.B kalarmd
+.I [Qt-options] [KDE-options] [options]
+.SH DESCRIPTION
+.B kalarmd
+runs in the background and handles displaying the events scheduled by
+\fBkalarm\fP.  You should normally not have to run this daemon manually.
+.SH PROGRAM OPTIONS
+.TP
+.B --login
+Application is being auto-started at KDE session start.
+.so kdeopt.man
+.SH SEE ALSO
+.B kalarm
+(1).

Added: trunk/packages/kdepim/debian/man/kandy.man
===================================================================
--- trunk/packages/kdepim/debian/man/kandy.man	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/man/kandy.man	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,35 @@
+.TH KANDY 1
+.SH NAME
+kandy \- Synchronize mobile phone address books
+.SH SYNOPSIS
+.B kandy
+.I [Qt-options] [KDE-options] [options] [profile]
+.SH DESCRIPTION
+At the moment
+.B kandy
+is more or less a terminal program with some special features to store
+commands and their parameters, but it also has a simple GUI to access the
+phone book of a mobile phone and it is able to save this phone book to the
+KDE address book.
+
+.B kandy
+is aimed at mobile phones with integrate (GSM) modems.
+.SH PROGRAM OPTIONS
+.TP
+.B --terminal
+Show terminal window.
+.TP
+.B --mobilegui
+Show mobile GUI.
+.TP
+.B --nogui
+Do not show GUI.
+.TP
+.B profile
+Filename of command profile file.
+.so kdeopt.man
+.SH SEE ALSO
+More detailed user documentation is available from
+.BR help:/kandy
+(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
+help:/kandy').

Deleted: trunk/packages/kdepim/debian/man/kandy.sgml

Added: trunk/packages/kdepim/debian/man/kandy_client.man
===================================================================
--- trunk/packages/kdepim/debian/man/kandy_client.man	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/man/kandy_client.man	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,19 @@
+.TH KANDY_CLIENT 1
+.SH NAME
+kandy_client \- DCOP client for Kandy
+.SH SYNOPSIS
+.B kandy_client
+.I [Qt-options] [KDE-options] [URL]
+.SH DESCRIPTION
+.B kandy_client
+sends a URL to a running
+.B kandy
+instance.
+.SH PROGRAM OPTIONS
+.TP
+.B URL
+URL to send to \fBkandy\fP.  Default is `\fIhttp://www.kde.org'\fP.
+.so kdeopt.man
+.SH SEE ALSO
+.B kandy
+(1).

Added: trunk/packages/kdepim/debian/man/karm.man
===================================================================
--- trunk/packages/kdepim/debian/man/karm.man	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/man/karm.man	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,23 @@
+.TH KARM 1
+.SH NAME
+karm \- KDE time tracker tool
+.SH SYNOPSIS
+.B karm
+.I [Qt-options] [KDE-options]
+.SH DESCRIPTION
+.B KArm
+tracks time spent on various tasks.  It is useful for tracking billable
+hours and can report the hours logged by task and day.  This time history
+can be exported to a comma-delimited text file for import into other billing
+and/or project management tools.
+
+.B KArm
+detects when your keyboard and mouse are idle and can associate different
+tasks with different desktops, two tools that can help keep the timer
+running on the correct task.
+.so kdeopt.man
+.SH SEE ALSO
+More detailed user documentation is available from
+.BR help:/karm
+(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
+help:/karm').

Added: trunk/packages/kdepim/debian/man/kdeopt.man
===================================================================
--- trunk/packages/kdepim/debian/man/kdeopt.man	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/man/kdeopt.man	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,110 @@
+.\" This portion of the manual page is from kdeopt.man, from the
+.\" kdegames Debian package.
+.SH GENERIC OPTIONS
+.TP
+.B \-\-help
+Show help about options.
+.TP
+.B \-\-help-qt
+Show Qt specific options.
+.TP
+.B \-\-help-kde
+Show KDE specific options.
+.TP
+.B \-\-help-all
+Show all options.
+.TP
+.B \-\-author
+Show author information.
+.TP
+.B \-v, \-\-version
+Show version information.
+.TP
+.B \-\-license
+Show license information.
+.TP
+.B \-\-
+End of options.
+.SH QT OPTIONS
+.TP
+.B \-\-display \fI<displayname>\fB
+Use the X-server display `displayname'.
+.TP
+.B \-\-session \fI<sessionId>\fB
+Restore the application for the given `sessionId'.
+.TP
+.B \-\-cmap
+Causes the application to install a private color map on an 8\-bit
+display.
+.TP
+.B \-\-ncols \fI<count>\fB
+Limits the number of colors allocated in the color cube on an 8\-bit
+display, if the application is using the QApplication::ManyColor color
+specification.
+.TP
+.B \-\-nograb
+Tells Qt to never grab the mouse or the keyboard.
+.TP
+.B \-\-dograb
+Running under a debugger can cause an implicit \-nograb, use \-dograb
+to override.
+.TP
+.B \-\-sync
+Switches to synchronous mode for debugging.
+.TP
+.B \-\-fn, \-\-font \fI<fontname>\fB
+Defines the application font.
+.TP
+.B \-\-bg, \-\-background \fI<color>\fB
+Sets the default background color and an application palette (light
+and dark shades are calculated).
+.TP
+.B \-\-fg, \-\-foreground \fI<color>\fB
+Sets the default foreground color.
+.TP
+.B \-\-btn, \-\-button \fI<color>\fB
+Sets the default button color.
+.TP
+.B \-\-name \fI<name>\fB
+Sets the application name.
+.TP
+.B \-\-title \fI<title>\fB
+Sets the application title (caption).
+.TP
+.B \-\-visual TrueColor
+Forces the application to use a TrueColor visual on an 8-bit display.
+.TP
+.B \-\-inputstyle \fI<inputstyle>\fB
+Sets XIM (X Input Method) input style. Possible values are
+\fIonthespot\fP, \fIoverthespot\fP, \fIoffthespot\fP and \fIroot\fP.
+.TP
+.B \-\-im \fI<XIM server>\fB
+Set XIM server.
+.TP
+.B \-\-noxim
+Disable XIM.
+.SH KDE OPTIONS
+.TP
+.B \-\-caption \fI<caption>\fB
+Use `caption' as name in the titlebar.
+.TP
+.B \-\-icon \fI<icon>\fB
+Use `icon' as the application icon.
+.TP
+.B \-\-miniicon \fI<icon>\fB
+Use `icon' as the icon in the titlebar.
+.TP
+.B \-\-dcopserver \fI<server>\fB
+Use the DCOP Server specified by `server'.
+.TP
+.B \-\-nocrashhandler
+Disable crash handler, to get core dumps.
+.TP
+.B \-\-waitforwm
+Waits for a WM_NET compatible windowmanager.
+.TP
+.B \-\-style \fI<style>\fB
+Sets the application GUI style.
+.TP
+.B \-\-geometry \fI<geometry>\fB
+Sets the client geometry of the main widget.

Added: trunk/packages/kdepim/debian/man/kitchensync.man
===================================================================
--- trunk/packages/kdepim/debian/man/kitchensync.man	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/man/kitchensync.man	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,11 @@
+.TH KITCHENSYNC 1
+.SH NAME
+kitchensync \- Synchronize Data with KDE
+.SH SYNOPSIS
+.B kitchensync
+.I [Qt-options] [KDE-options]
+.SH DESCRIPTION
+.B kitchensync
+is a synchronization framework, still under heavy development.
+.so kdeopt.man
+

Added: trunk/packages/kdepim/debian/man/kleopatra.man
===================================================================
--- trunk/packages/kdepim/debian/man/kleopatra.man	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/man/kleopatra.man	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,29 @@
+.TH KLEOPATRA 1
+.SH NAME
+kleopatra \- KDE X.509 key manager
+.SH SYNOPSIS
+.B kleopatra
+.I [Qt-options] [KDE-options] [options] [address|URL]
+.SH DESCRIPTION
+.B Kleopatra
+is the KDE tool for managing X.509 certificates in the GpgSM keybox and for
+retrieving certificates from LDAP servers.
+.SH PROGRAM OPTIONS
+.TP
+.B --external
+Search for external certificates initially.
+.TP
+.B --query
+Initial query string.
+.TP
+.B --import-certificate
+Name of certificate file to import.
+.TP
+.B URL
+Attach the file that `URL' points to.
+.so kdeopt.man
+.SH SEE ALSO
+More detailed user documentation is available from
+.BR help:/kleopatra
+(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
+help:/kleopatra').

Added: trunk/packages/kdepim/debian/man/kmail.man
===================================================================
--- trunk/packages/kdepim/debian/man/kmail.man	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/man/kmail.man	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,54 @@
+.TH KMAIL 1
+.SH NAME
+kmail \- KDE email client
+.SH SYNOPSIS
+.B kmail
+.I [Qt-options] [KDE-options] [options] [address|URL]
+.SH DESCRIPTION
+.B KMail
+is a fully-featured email client that fits nicely into the KDE desktop.
+It has features such as support for IMAP, POP3, multiple accounts,
+mail filtering and sorting, PGP/GnuPG privacy, and inline attachments.
+.SH PROGRAM OPTIONS
+.TP
+.B -s, --subject \fI<subject>\fB
+Set subject of message.
+.TP
+.B -c, --cc \fI<address>\fB
+Send CC: to `address'.
+.TP
+.B -b, --bcc \fI<address>\fB
+Send BCC: to `address'.
+.TP
+.B -h, --header \fI<header>\fB
+Add `header' to message.
+.TP
+.B --msg \fI<file>\fB
+Read message body from `file'.
+.TP
+.B --body \fI<text>\fB
+Set body of message.
+.TP
+.B --attach \fI<url>\fB
+Add an attachment to the mail. This can be repeated.
+.TP
+.B --check
+Only check for new mail.
+.TP
+.B --composer
+Only open composer window.
+.TP
+.B --view \fI<url>\fB
+View the given message file.
+.TP
+.B address
+Send message to `address'.
+.TP
+.B URL
+Attach the file that `URL' points to.
+.so kdeopt.man
+.SH SEE ALSO
+More detailed user documentation is available from
+.BR help:/kmail
+(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
+help:/kmail').

Added: trunk/packages/kdepim/debian/man/kmail_antivir.sh.man
===================================================================
--- trunk/packages/kdepim/debian/man/kmail_antivir.sh.man	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/man/kmail_antivir.sh.man	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,8 @@
+.TH KMAIL_ANTIVIR.SH 1
+.SH NAME
+kmail_antivir.sh \- H+BEDV AntiVir backend for KMail
+.SH DESCRIPTION
+This shell script is used internally by \fBkmail\fP. Users should not run it
+directly.
+.SH SEE ALSO
+.BR kmail (1).

Added: trunk/packages/kdepim/debian/man/kmail_clamav.sh.man
===================================================================
--- trunk/packages/kdepim/debian/man/kmail_clamav.sh.man	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/man/kmail_clamav.sh.man	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,8 @@
+.TH KMAIL_CLAMAV.SH 1
+.SH NAME
+kmail_clamav.sh \- Clam Anti-Virus backend for KMail
+.SH DESCRIPTION
+This shell script is used internally by \fBkmail\fP. Users should not run it
+directly.
+.SH SEE ALSO
+.BR kmail (1).

Added: trunk/packages/kdepim/debian/man/kmail_fprot.sh.man
===================================================================
--- trunk/packages/kdepim/debian/man/kmail_fprot.sh.man	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/man/kmail_fprot.sh.man	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,8 @@
+.TH KMAIL_FPROT.SH 1
+.SH NAME
+kmail_fprot.sh \- F-Prot Anti-Virus backend for KMail
+.SH DESCRIPTION
+This shell script is used internally by \fBkmail\fP. Users should not run it
+directly.
+.SH SEE ALSO
+.BR kmail (1).

Added: trunk/packages/kdepim/debian/man/kmail_sav.sh.man
===================================================================
--- trunk/packages/kdepim/debian/man/kmail_sav.sh.man	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/man/kmail_sav.sh.man	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,8 @@
+.TH KMAIL_SAV.SH 1
+.SH NAME
+kmail_sav.sh \- Sophos Anti-Virus backend for KMail
+.SH DESCRIPTION
+This shell script is used internally by \fBkmail\fP. Users should not run it
+directly.
+.SH SEE ALSO
+.BR kmail (1).

Added: trunk/packages/kdepim/debian/man/kmailcvt.man
===================================================================
--- trunk/packages/kdepim/debian/man/kmailcvt.man	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/man/kmailcvt.man	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,15 @@
+.TH KMAILCVT 1
+.SH NAME
+kmailcvt \- KMail import filters
+.SH SYNOPSIS
+.B kmailcvt
+.I [Qt-options] [KDE-options]
+.SH DESCRIPTION
+.B kmailcvt
+provides a frontend to import mail folders into \fBkmail\fP.  Supported
+formats include Outlook Express, mbox files, plain text, Pegasus-Mail,
+and Evolution.
+.so kdeopt.man
+.SH SEE ALSO
+.B kmail
+(1).

Added: trunk/packages/kdepim/debian/man/knode.man
===================================================================
--- trunk/packages/kdepim/debian/man/knode.man	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/man/knode.man	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,21 @@
+.TH KNODE 1
+.SH NAME
+knode \- KDE news reader
+.SH SYNOPSIS
+.B knode
+.I [Qt-options] [KDE-options] [url]
+.SH DESCRIPTION
+.B KNode
+is an easy-to-use, convenient newsreader; it is intended to allow even
+newbies to use a newsreader under KDE, but it also offers advanced features
+appealing to experienced users.
+.SH PROGRAM OPTIONS
+.TP
+.B url
+A `news://server/group' URL.
+.so kdeopt.man
+.SH SEE ALSO
+More detailed user documentation is available from
+.BR help:/knode
+(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
+help:/knode').

Added: trunk/packages/kdepim/debian/man/knotes.man
===================================================================
--- trunk/packages/kdepim/debian/man/knotes.man	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/man/knotes.man	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,23 @@
+.TH KNOTES 1
+.SH NAME
+knotes \- Sticky notes application for KDE
+.SH SYNOPSIS
+.B knotes
+.I [Qt-options] [KDE-options]
+.SH DESCRIPTION
+.B KNotes
+is a program that lets you write the computer equivalent of sticky notes.
+The notes are saved automatically when you exit the program, and they
+display when you open the program.  You may print and mail your notes if
+you configure
+.B KNotes
+to use helper applications.
+
+Display features of notes such as color and font may be customized for each
+note.  You may also customize the defaults.
+.so kdeopt.man
+.SH SEE ALSO
+More detailed user documentation is available from
+.BR help:/knotes
+(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
+help:/knotes').

Added: trunk/packages/kdepim/debian/man/kolabwizard.man
===================================================================
--- trunk/packages/kdepim/debian/man/kolabwizard.man	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/man/kolabwizard.man	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,15 @@
+.TH KOLABWIZARD 1
+.SH NAME
+kolabwizard \- KDE Kolab Wizard
+.SH SYNOPSIS
+.B kolabwizard
+.I [Qt-options] [KDE-options] [options]
+.SH DESCRIPTION
+.B kolabwizard
+is a front end to configure Kolab servers.
+.SH PROGRAM OPTIONS
+.TP
+.B --verbose
+Verbose output.
+.so kdeopt.man
+

Added: trunk/packages/kdepim/debian/man/konsolekalendar.man
===================================================================
--- trunk/packages/kdepim/debian/man/konsolekalendar.man	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/man/konsolekalendar.man	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,112 @@
+.TH KONSOLEKALENDAR 1
+.SH NAME
+konsolekalendar \- Command line interface to KDE calendars
+.SH SYNOPSIS
+.B konsolekalendar
+.I [Qt-options] [KDE-options] [options]
+.SH DESCRIPTION
+.B KonsoleKalendar
+is a command line interface to KDE calendars.  It lets you view, insert,
+remove, or modify calendar events by way of the command line or from a
+scripting language.  Additionally,
+.B KonsoleKalendar
+can create a new KDE calendar, export a KDE calendar to a variety of other
+formats, and import another KDE calendar.
+.SH PROGRAM OPTIONS
+.TP
+.B --verbose
+Print helpful runtime messages.
+.TP
+.B --dry-run
+Print what would have been done, but do not execute
+.TP
+.B --file \fI<calendar-file>\fB
+Specify which calendar you want to use.
+.LP
+
+Major operation modes:
+.TP
+.B --view
+Print calendar events in specified export format.
+.TP
+.B --add
+Insert an event into the calendar.
+.TP
+.B --change
+Modify an existing calendar event.
+.TP
+.B --delete
+Remove an existing calendar event.
+.TP
+.B --create
+Create new calendar file if one does not exist.
+.TP
+.B --import \fI<import-file>\fB
+Import this calendar to main calendar.
+.LP
+
+Operation modifiers:
+.TP
+.B --all
+View all calendar entries
+.TP
+.B --next
+View next activity in calendar.
+.TP
+.B --show-next \fI<days>\fB
+From start date show next # days' activities.
+.TP
+.B --uid \fI<uid>\fB
+Event Unique-string identifier.
+.TP
+.B --date \fI<start-date>\fB
+Start from this day [YYYY-MM-DD].
+.TP
+.B --time \fI<start-time>\fB
+Start from this time [HH:MM:SS].
+.TP
+.B --end-date \fI<end-date>\fB
+End at this day [YYYY-MM-DD].
+.TP
+.B --end-time \fI<end-time>\fB
+End at this time [HH:MM:SS].
+.TP
+.B --epoch-start \fI<epoch-time>\fB
+Start from this time [secs since epoch].
+.TP
+.B --epoch-end \fI<epoch-time>\fB
+End at this time [secs since epoch].
+.TP
+.B --summary \fI<summary>\fB
+Add summary to event (for add/change modes).
+.TP
+.B --description \fI<description>\fB
+Add description to event (for add/change modes).
+.TP
+.B --location \fI<location>\fB
+Add location to event (for add/change modes).
+.LP
+
+Export options:
+.TP
+.B --export-type \fI<export-type>\fB
+Export file type (Default: text).
+.TP
+.B --export-file \fI<export-file>\fB
+Export to file (Default: stdout).
+.TP
+.B --export-list
+Print list of export types supported and exit.
+.so kdeopt.man
+.SH EXAMPLES
+konsolekalendar --view
+
+konsolekalendar --add --date 2003-06-04 --time 10:00 --end-time 12:00
+--summary "Doctor Visit" --description "Get My Head Examined"
+
+konsolekalendar --delete -uid KOrganizer-1740326.803
+.SH SEE ALSO
+More detailed user documentation is available from
+.BR help:/konsolekalendar
+(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
+help:/konsolekalendar').

Added: trunk/packages/kdepim/debian/man/kontact.man
===================================================================
--- trunk/packages/kdepim/debian/man/kontact.man	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/man/kontact.man	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,32 @@
+.TH KONTACT 1
+.SH NAME
+kontact \- Integrated KDE personal information management application
+.SH SYNOPSIS
+.B kontact
+.I [Qt-options] [KDE-options] [options]
+.SH DESCRIPTION
+.B Kontact
+is the integrated solution for personal information management.  It combines
+the well-known KDE applications for email, scheduling, address book, notes
+and newsgroups (KMail, KOrganizer, KAddressBook, KNotes and KNode) into a
+single interface.  Being based on a true component framework Kontact provides
+exactly the same functionality as the stand-alone applications, and adds
+more features, by making use of the integrated way Kontact runs the
+applications as components.  Users still retain the choice of which
+applications are run within Kontact and which are run stand-alone.
+.SH PROGRAM OPTIONS
+.TP
+.B --module \fI<module>\fB
+Start with a specific Kontact module.
+.TP
+.B --nosplash
+Disable the splash screen.
+.TP
+.B --list
+List all possible modules and exit.
+.so kdeopt.man
+.SH SEE ALSO
+More detailed user documentation is available from
+.BR help:/kontact
+(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
+help:/kontact').

Added: trunk/packages/kdepim/debian/man/korgac.man
===================================================================
--- trunk/packages/kdepim/debian/man/korgac.man	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/man/korgac.man	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,15 @@
+.TH KORGAC 1
+.SH NAME
+korgac \- KOrganizer alarm daemon
+.SH SYNOPSIS
+.B korgac
+.I [Qt-options] [KDE-options]
+.SH DESCRIPTION
+.B korgac
+runs in the background and handles displaying alarms from the KOrganizer
+calendar.  It is normally started at login and displays an icon in the
+Kicker system tray, but if you have disabled this
+feature you may need to start korgac manually.
+.so kdeopt.man
+.SH SEE ALSO
+.BR korganizer (1).

Added: trunk/packages/kdepim/debian/man/korganizer.man
===================================================================
--- trunk/packages/kdepim/debian/man/korganizer.man	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/man/korganizer.man	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,26 @@
+.TH KORGANIZER 1
+.SH NAME
+korganizer \- Personal organizer for KDE
+.SH SYNOPSIS
+.B korganizer
+.I [Qt-options] [KDE-options] [options] [calendar]
+.SH DESCRIPTION
+.B KOrganizer
+is a calendar application for KDE.  You can schedule appointments, events,
+and to-do tasks.  KOrganizer will remind you about pending tasks, and help
+you keep your schedule.  It supports event categories, highlighting
+according to category, numerous options for generating repeated events,
+emerging group scheduling support, PalmPilot synchronization, and much more.
+.SH PROGRAM OPTIONS
+.TP
+.B -i, --import \fI<url>\fB
+Import calendar at `url' into default calendar.
+.TP
+.B calendar
+A calendar file to load.
+.so kdeopt.man
+.SH SEE ALSO
+More detailed user documentation is available from
+.BR help:/korganizer
+(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
+help:/korganizer').

Deleted: trunk/packages/kdepim/debian/man/korganizer.sgml

Added: trunk/packages/kdepim/debian/man/korganizerIn.man
===================================================================
--- trunk/packages/kdepim/debian/man/korganizerIn.man	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/man/korganizerIn.man	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,14 @@
+.TH KORGANIZERIN 1
+.SH NAME
+korganizerIn \- KOrganizer event mail filter
+.SH DESCRIPTION
+.B korganizerIn
+is a mail filter which searches for vCal events in incoming messages and,
+if found, writes these events to KOrganizer's incoming queue.  You can set
+up KMail to apply this filter automatically, or you can set up procmail
+to pipe all incoming messages through this filter.
+
+.B korganizerIn
+takes no command line arguments.
+.SH SEE ALSO
+.BR korganizer (1).

Added: trunk/packages/kdepim/debian/man/korn.man
===================================================================
--- trunk/packages/kdepim/debian/man/korn.man	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/man/korn.man	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,21 @@
+.TH KORN 1
+.SH NAME
+korn \- Sticky notes application for KDE
+.SH SYNOPSIS
+.B korn
+.I [Qt-options] [KDE-options]
+.SH DESCRIPTION
+.B KOrn
+is a KDE mail checker that has the capability to dock itself to Kicker.
+KOrn can check mbox, qmail, POP3, and Imap4 mailboxes, as well as nntp
+servers.  KOrn checks your mail on an interval that is user specified for
+each separate account.  Once mail is received you can have KOrn run a
+third party program of your wish or change the color/icon of KOrn while
+docked in Kicker.  In addition to this you can have KOrn run a program
+once you click on the docked icon in Kicker.
+.so kdeopt.man
+.SH SEE ALSO
+More detailed user documentation is available from
+.BR help:/korn
+(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
+help:/korn').

Added: trunk/packages/kdepim/debian/man/kpalmdoc.man
===================================================================
--- trunk/packages/kdepim/debian/man/kpalmdoc.man	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/man/kpalmdoc.man	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,14 @@
+.TH KPALMDOC 1
+.SH NAME
+kpalmdoc \- KDE converter for PalmDOC texts
+.SH SYNOPSIS
+.B kpalmdoc
+.I [Qt-options] [KDE-options]
+.SH DESCRIPTION
+.B KPalmDOC
+provides a user interface to converting between text files and PalmDOC files.
+Note that KPilot can also handle these conversions internally using the
+PalmDOC conduit.
+.so kdeopt.man
+.SH SEE ALSO
+.BR kpilot (1).

Added: trunk/packages/kdepim/debian/man/kpilot.man
===================================================================
--- trunk/packages/kdepim/debian/man/kpilot.man	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/man/kpilot.man	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,28 @@
+.TH KPILOT 1
+.SH NAME
+kpilot \- Palm Pilot synchronization software for KDE
+.SH SYNOPSIS
+.B kpilot
+.I [Qt-options] [KDE-options] [options]
+.SH DESCRIPTION
+.B KPilot
+is an application that synchronizes a PalmPilot or similar device with
+the KDE desktop, much like the Palm Desktop HotSync software does for
+Windows.  KPilot can backup, restore, and HotSync your PalmPilot.  It can
+synchronize the built-in applications with their KDE counterparts.  It also
+features additional conduits for third-party software.
+.SH PROGRAM OPTIONS
+.TP
+.B -s, --setup
+Setup the Pilot device, conduits and other parameters.
+.TP
+.B -c, --conduit-setup
+Deprecated, use
+.B --setup
+instead.
+.so kdeopt.man
+.SH SEE ALSO
+More detailed user documentation is available from
+.BR help:/kpilot
+(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
+help:/kpilot').

Deleted: trunk/packages/kdepim/debian/man/kpilot.sgml

Added: trunk/packages/kdepim/debian/man/kpilotDaemon.man
===================================================================
--- trunk/packages/kdepim/debian/man/kpilotDaemon.man	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/man/kpilotDaemon.man	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,18 @@
+.TH KPILOTDAEMON 1
+.SH NAME
+kpilotDaemon \- KPilot server
+.SH SYNOPSIS
+.B kpilotDaemon
+.I [Qt-options] [KDE-options] [options]
+.SH DESCRIPTION
+.B kpilotDaemon
+is a program that runs in the background and handles the actual communication
+with the PalmPilot device.  It is run automatically when needed, so you
+normally should not have to run it manually.
+.SH PROGRAM OPTIONS
+.TP
+.B --fail-silently
+Fail instead of complaining about bad configuration files.
+.so kdeopt.man
+.SH SEE ALSO
+.BR kpilot (1).

Added: trunk/packages/kdepim/debian/man/ksync.man
===================================================================
--- trunk/packages/kdepim/debian/man/ksync.man	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/man/ksync.man	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,15 @@
+.TH KSYNC 1
+.SH NAME
+ksync \- KDE synchronization framework
+.SH SYNOPSIS
+.B ksync
+.I [Qt-options] [KDE-options] [file]
+.SH DESCRIPTION
+.B KSync
+allows you to synchronize calendar, bookmark, and address book data with
+external sources.
+.SH PROGRAM OPTIONS
+.TP
+.B file
+File to open.
+.so kdeopt.man

Added: trunk/packages/kdepim/debian/man/ktnef.man
===================================================================
--- trunk/packages/kdepim/debian/man/ktnef.man	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/man/ktnef.man	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,21 @@
+.TH KTNEF 1
+.SH NAME
+ktnef \- TNEF file viewer
+.SH SYNOPSIS
+.B ktnef
+.I [Qt-options] [KDE-options] [file]
+.SH DESCRIPTION
+.B Ktnef
+is an application for to view TNEF mail attachments.  These attachments are
+usually found in mails coming from Microsoft mail servers and embed the mail
+properties as well as the actual attachments.
+.SH PROGRAM OPTIONS
+.TP
+.B file
+Attachment file to view.
+.so kdeopt.man
+.SH SEE ALSO
+More detailed user documentation is available from
+.BR help:/ktnef
+(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
+help:/ktnef').

Added: trunk/packages/kdepim/debian/man/kwatchgnupg.man
===================================================================
--- trunk/packages/kdepim/debian/man/kwatchgnupg.man	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/man/kwatchgnupg.man	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,17 @@
+.TH KWATCHGNUPG 1
+.SH NAME
+kwatchgnupg \- GnuPG log viewer
+.SH SYNOPSIS
+.B kwatchgnupg
+.I [Qt-options] [KDE-options]
+.SH DESCRIPTION
+.B KWatchGnuPG
+is a simple GnuPG log viewer for GnuPG.  It works as a GUI wrapper around
+the command line tool \fBwatchgnupg\fP, which listens on a socket for log lines
+from the GnuPG backend applications.
+.so kdeopt.man
+.SH SEE ALSO
+More detailed user documentation is available from
+.BR help:/kwatchgnupg
+(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
+help:/kwatchgnupg').

Added: trunk/packages/kdepim/debian/man/sloxwizard.man
===================================================================
--- trunk/packages/kdepim/debian/man/sloxwizard.man	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/man/sloxwizard.man	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,15 @@
+.TH SLOXWIZARD 1
+.SH NAME
+sloxwizard \- KDE Openexchange Wizard
+.SH SYNOPSIS
+.B sloxwizard
+.I [Qt-options] [KDE-options] [options]
+.SH DESCRIPTION
+.B sloxwizard
+is a front end to configure SUSE Linux Openexchange servers.
+.SH PROGRAM OPTIONS
+.TP
+.B --verbose
+Verbose output.
+.so kdeopt.man
+

Added: trunk/packages/kdepim/debian/patches/01_kdepim_branch.diff
===================================================================
--- trunk/packages/kdepim/debian/patches/01_kdepim_branch.diff	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/patches/01_kdepim_branch.diff	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,9092 @@
+Index: admin/acinclude.m4.in
+===================================================================
+RCS file: /home/kde/kde-common/admin/acinclude.m4.in,v
+retrieving revision 2.461.2.2
+retrieving revision 2.461.2.3
+diff -u -r2.461.2.2 -r2.461.2.3
+--- admin/acinclude.m4.in	12 Nov 2004 22:48:09 -0000	2.461.2.2
++++ admin/acinclude.m4.in	9 Dec 2004 21:22:14 -0000	2.461.2.3
+@@ -4254,7 +4254,8 @@
+ 
+ AC_DEFUN([KDE_CHECK_PYTHON],
+ [
+-  KDE_CHECK_PYTHON_INTERN("2.3", 
++  KDE_CHECK_PYTHON_INTERN("2.4",
++   [KDE_CHECK_PYTHON_INTERN("2.3", 
+    [KDE_CHECK_PYTHON_INTERN("2.2", 
+      [KDE_CHECK_PYTHON_INTERN("2.1", 
+        [KDE_CHECK_PYTHON_INTERN("2.0", 
+@@ -4262,6 +4263,7 @@
+        ])
+      ])
+    ])
++  ])
+ ])
+ 
+ AC_DEFUN([KDE_CHECK_STL],
+Index: certmanager/conf/kleopatra_config_appear.desktop
+===================================================================
+RCS file: /home/kde/kdepim/certmanager/conf/kleopatra_config_appear.desktop,v
+retrieving revision 1.36.2.11
+retrieving revision 1.36.2.13
+diff -u -r1.36.2.11 -r1.36.2.13
+--- certmanager/conf/kleopatra_config_appear.desktop	26 Nov 2004 08:05:18 -0000	1.36.2.11
++++ certmanager/conf/kleopatra_config_appear.desktop	29 Dec 2004 21:44:48 -0000	1.36.2.13
+@@ -14,6 +14,7 @@
+ X-KDE-CfgDlgHierarchy=Kleopatra
+ 
+ Name=Appearance
++Name[ar]=مظهر
+ Name[be]=Зьнешні выгляд
+ Name[bg]=Външност
+ Name[br]=Neuziadur
+@@ -36,6 +37,7 @@
+ Name[is]=Útlit
+ Name[it]=Aspetto
+ Name[ja]=外観
++Name[mk]=Изглед
+ Name[nb]=Utseende
+ Name[nl]=Uiterlijk
+ Name[nn]=Utsjånad
+@@ -55,6 +57,7 @@
+ Name[wa]=Rivnance
+ Name[zh_CN]=外观
+ Comment=Colors & Fonts Configuration
++Comment[ar]=إعداد خطوط و ألوان
+ Comment[be]=Канфігурацыя колераў і шрыфтоў
+ Comment[bg]=Настройки на цветовете и шрифтовете
+ Comment[bs]=Podešavanje boja i fontova
+@@ -73,6 +76,7 @@
+ Comment[is]=Stilling lita og leturgerða
+ Comment[it]=Configurazione tipi di carattere e colori
+ Comment[ja]=色とフォント設定
++Comment[mk]=Конфигурација на бои и фонтови
+ Comment[nb]=Oppsett av farger og skrifttyper
+ Comment[nl]=Kleur- en lettertype-instellingen
+ Comment[nn]=Oppsett av fargar og skrifter
+@@ -91,6 +95,7 @@
+ Comment[uk]=Налаштування кольорів і шрифтів
+ Comment[zh_CN]=颜色和字体配置
+ Keywords=color,font, configuration
++Keywords[ar]=ألوان ، خطوط ، إعداد
+ Keywords[be]=колер, шрыфт, канфігурацыя, color, font, configuration
+ Keywords[bg]=цвят, шрифт, конфигуриране, настройки color, font, configuration
+ Keywords[br]=liv,nodrezh, kefluniadur
+@@ -110,6 +115,7 @@
+ Keywords[is]=litir,letur, stillingar
+ Keywords[it]=colori, font, caratteri, configurazione
+ Keywords[ja]=色 フォント 設定
++Keywords[mk]=color,font,configuration
+ Keywords[nb]=farge,skrifttype,oppsett
+ Keywords[nl]=kleur,kleuren,font,lettertype,configuratie,instellingen,setup
+ Keywords[nn]=farge,skrift,oppsett
+Index: certmanager/conf/kleopatra_config_dirserv.desktop
+===================================================================
+RCS file: /home/kde/kdepim/certmanager/conf/kleopatra_config_dirserv.desktop,v
+retrieving revision 1.30.2.8
+retrieving revision 1.30.2.9
+diff -u -r1.30.2.8 -r1.30.2.9
+--- certmanager/conf/kleopatra_config_dirserv.desktop	13 Nov 2004 07:20:47 -0000	1.30.2.8
++++ certmanager/conf/kleopatra_config_dirserv.desktop	29 Dec 2004 21:44:48 -0000	1.30.2.9
+@@ -14,6 +14,7 @@
+ X-KDE-CfgDlgHierarchy=Kleopatra
+ 
+ Name=Directory Services
++Name[ar]=خدمات الدليل
+ Name[bg]=Директорийни услуги
+ Name[bs]=Imenički servisi
+ Name[ca]=Serveis de directori
+@@ -48,6 +49,7 @@
+ Name[uk]=Служби каталогів
+ Name[zh_CN]=目录服务
+ Comment=Configuration of LDAP directory services
++Comment[ar]=إعداد LDAP في خدمات الدليل
+ Comment[bg]=Настройки на директорийните услуги LDAP
+ Comment[bs]=Podešavanje LDAP usluge imenika
+ Comment[ca]=Configuractió dels serveis de directori LDAP
+@@ -81,6 +83,7 @@
+ Comment[uk]=Налаштування служб каталогів LDAP
+ Comment[zh_CN]=LDAP 目录服务配置
+ Keywords=ldap,directory,services
++Keywords[ar]=ldap,دليل ، خدمات
+ Keywords[be]=каталёг,сэрвісы,ldap,directory,services
+ Keywords[bg]=директорийни, услуги, ldap, directory, services
+ Keywords[br]=ldap,renkell,servijeroù
+Index: certmanager/conf/kleopatra_config_dnorder.desktop
+===================================================================
+RCS file: /home/kde/kdepim/certmanager/conf/kleopatra_config_dnorder.desktop,v
+retrieving revision 1.28.2.8
+retrieving revision 1.28.2.9
+diff -u -r1.28.2.8 -r1.28.2.9
+--- certmanager/conf/kleopatra_config_dnorder.desktop	13 Nov 2004 07:20:47 -0000	1.28.2.8
++++ certmanager/conf/kleopatra_config_dnorder.desktop	29 Dec 2004 21:44:48 -0000	1.28.2.9
+@@ -14,6 +14,7 @@
+ X-KDE-CfgDlgHierarchy=Kleopatra
+ 
+ Name=DN-Attribute Order
++Name[ar]=ترتيب سمات DN
+ Name[bg]=Подредба
+ Name[bs]=Redoslijed DN atributa
+ Name[ca]=Ordre d'atributs DN
+@@ -47,6 +48,7 @@
+ Name[uk]=Порядок атрибутів DN
+ Name[zh_CN]=DN 属性顺序
+ Comment=Configure the order in which DN attributes are shown
++Comment[ar]=ترتيب عرض سمات DN
+ Comment[bg]=Настройки на подредбата на атрибутите на индекса (DN)
+ Comment[bs]=Podesite redoslijed kojim će biti prikazani DN atributi
+ Comment[ca]=Configura l'ordre en que es mostren els atributs DN
+@@ -79,6 +81,7 @@
+ Comment[uk]=Налаштування порядку показу атрибутів DN
+ Comment[zh_CN]=配置 DN 属性显示的顺序
+ Keywords=DN,order,RDN,attribute
++Keywords[ar]=DN, ترتيب, RDN, سمة
+ Keywords[be]=парадак,атрыбут,DN,order,RDN,attribute
+ Keywords[bg]=индекс, ред, подредба, атрибут DN, order, RDN, attribute
+ Keywords[bs]=DN,order,RDN,attribute,redoslijed,atribut
+Index: certmanager/lib/libkleopatrarc.desktop
+===================================================================
+RCS file: /home/kde/kdepim/certmanager/lib/libkleopatrarc.desktop,v
+retrieving revision 1.45.2.8
+retrieving revision 1.45.2.10
+diff -u -r1.45.2.8 -r1.45.2.10
+--- certmanager/lib/libkleopatrarc.desktop	13 Nov 2004 07:20:47 -0000	1.45.2.8
++++ certmanager/lib/libkleopatrarc.desktop	10 Jan 2005 09:02:03 -0000	1.45.2.10
+@@ -1,6 +1,7 @@
+ [Key Filter #0]
+ was-validated=false
+ Name=Not validated key
++Name[ar]=مفتاح غير صالح
+ Name[bg]=Невалиден ключ
+ Name[bs]=Ključ nije potvrđen
+ Name[ca]=Clau no validada
+@@ -39,7 +40,9 @@
+ is-revoked=false
+ foreground-color=255,0,0
+ Name=Expired key
++Name[ar]=مفتاح منهي الصلاحية
+ Name[bg]=Изтекъл ключ
++Name[br]=Alc'hwez kabac'het
+ Name[bs]=Istekao ključ
+ Name[ca]=Clau expirada
+ Name[cs]=Klíš s prošlou platností
+@@ -77,6 +80,7 @@
+ was-validated=true
+ is-revoked=true
+ Name=Revoked key
++Name[ar]=مفتاح مسترد
+ Name[bg]=Анулиран ключ
+ Name[bs]=Povučen ključ
+ Name[ca]=Clau revocada
+@@ -114,6 +118,7 @@
+ is-root-certificate=true
+ is-validity=ultimate
+ Name=Trusted root certificate
++Name[ar]=شهادة جذر موثوقة
+ Name[bg]=Надеждно удостоверение
+ Name[bs]=Povjerljiv korijenski certifikat
+ Name[ca]=Certificat arrel de confiança
+@@ -151,6 +156,7 @@
+ is-root-certificate=true
+ is-not-validity=ultimate
+ Name=Not trusted root certificate
++Name[ar]=شهادة جذر غير موثوقة
+ Name[bg]=Ненадеждно удостоверение
+ Name[bs]=Nepovjerljiv korijenski certifikat
+ Name[ca]=Certificat arrel sense confiança
+@@ -185,6 +191,7 @@
+ [Key Filter #5]
+ was-validated=true
+ Name=Other keys
++Name[ar]=مفاتيح أخرى
+ Name[be]=Іншыя ключы
+ Name[bg]=Други ключове
+ Name[bs]=Ostali ključevi
+Index: certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp
+===================================================================
+RCS file: /home/kde/kdepim/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp,v
+retrieving revision 1.25
+retrieving revision 1.25.2.1
+diff -u -r1.25 -r1.25.2.1
+--- certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp	22 Jun 2004 09:25:42 -0000	1.25
++++ certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp	11 Jan 2005 23:18:55 -0000	1.25.2.1
+@@ -183,8 +183,8 @@
+   else
+     rc = ( proc.normalExit() ) ? proc.exitStatus() : -1 ;
+ 
+-  if( rc != 0 ) // Can it really be non-0, when gpg-config --list-components worked?
+-    kdWarning(5150) << k_funcinfo << ":" << strerror( rc ) << endl;
++  if( rc != 0 ) // can happen when using the wrong version of gpg...
++    kdWarning(5150) << "Running 'gpgconf --list-options " << mName << "' failed. " << strerror( rc ) << ", but try that command to see the real output" << endl;
+   else {
+     if ( mCurrentGroup && !mCurrentGroup->mEntries.isEmpty() ) // only add non-empty groups
+       mGroups.insert( mCurrentGroupName, mCurrentGroup );
+Index: kaddressbook/kaddressbook.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kaddressbook/kaddressbook.desktop,v
+retrieving revision 1.139.2.4
+retrieving revision 1.139.2.5
+diff -u -r1.139.2.4 -r1.139.2.5
+--- kaddressbook/kaddressbook.desktop	28 Nov 2004 08:33:53 -0000	1.139.2.4
++++ kaddressbook/kaddressbook.desktop	12 Dec 2004 08:32:43 -0000	1.139.2.5
+@@ -26,6 +26,7 @@
+ Name[it]=Gestore degli indirizzi
+ Name[ja]=アドレスマネージャ
+ Name[lt]=Adresų tvarkyklė
++Name[mk]=Адресар
+ Name[ms]=Pengurus Alamat
+ Name[mt]=Manager tal-indirizzi
+ Name[nb]=Addressehåndterer
+Index: kaddressbook/kaddressbook_view.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kaddressbook/kaddressbook_view.desktop,v
+retrieving revision 1.41.2.3
+retrieving revision 1.41.2.4
+diff -u -r1.41.2.3 -r1.41.2.4
+--- kaddressbook/kaddressbook_view.desktop	28 Nov 2004 08:33:53 -0000	1.41.2.3
++++ kaddressbook/kaddressbook_view.desktop	29 Dec 2004 21:44:49 -0000	1.41.2.4
+@@ -3,8 +3,10 @@
+ Type=ServiceType
+ X-KDE-ServiceType=KAddressBook/View
+ Comment=KAddressBook View Plugin
++Comment[ar]=أداة إضافية لعرض kAddressBook
+ Comment[be]=Дапаўненьне K Адраснай кнігі "Выгляд"
+ Comment[bg]=Приставка за преглед на адресника
++Comment[br]=Lugent gwell KAddressBook
+ Comment[bs]=KAddressBook dodatak za pregledanje
+ Comment[ca]=Endollable visor de la llibreta d'adreces
+ Comment[cs]=Modul knihu adres pro zobrazování
+Index: kaddressbook/csv-templates/kaddressbook.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kaddressbook/csv-templates/kaddressbook.desktop,v
+retrieving revision 1.37.2.3
+retrieving revision 1.37.2.4
+diff -u -r1.37.2.3 -r1.37.2.4
+--- kaddressbook/csv-templates/kaddressbook.desktop	24 Oct 2004 07:05:54 -0000	1.37.2.3
++++ kaddressbook/csv-templates/kaddressbook.desktop	12 Dec 2004 08:32:43 -0000	1.37.2.4
+@@ -22,6 +22,7 @@
+ Name[hu]=Címjegyzék (KDE 3.1)
+ Name[is]=KPóstfangaskrá (KDE 3.1)
+ Name[it]=Rubrica indirizzi (KDE 3.1)
++Name[mk]=Адресар (KDE 3.1)
+ Name[nb]=Adressebok (KDE 3.1)
+ Name[nn]=KDE-adressebok (KDE 3.1)
+ Name[nso]=KBuka ya Diaterese (KDE 3.1)
+Index: kaddressbook/csv-templates/yahoo.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kaddressbook/csv-templates/yahoo.desktop,v
+retrieving revision 1.41.2.4
+retrieving revision 1.41.2.5
+diff -u -r1.41.2.4 -r1.41.2.5
+--- kaddressbook/csv-templates/yahoo.desktop	13 Nov 2004 07:20:47 -0000	1.41.2.4
++++ kaddressbook/csv-templates/yahoo.desktop	29 Dec 2004 21:44:49 -0000	1.41.2.5
+@@ -9,6 +9,7 @@
+ Name=Yahoo! AddressBook
+ Name[ar]=دفتر العناوين Yahoo!
+ Name[be]=Адрасная кніга Yahoo!
++Name[br]=Karned chomlec'hioù Yahoo !
+ Name[bs]=Yahoo! Adresar
+ Name[ca]=Llibreta d'adreces Yahoo!
+ Name[cs]=Kniha adres Yahoo!
+Index: kaddressbook/editors/cryptosettings.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kaddressbook/editors/cryptosettings.desktop,v
+retrieving revision 1.32.2.8
+retrieving revision 1.32.2.9
+diff -u -r1.32.2.8 -r1.32.2.9
+--- kaddressbook/editors/cryptosettings.desktop	13 Nov 2004 07:20:48 -0000	1.32.2.8
++++ kaddressbook/editors/cryptosettings.desktop	29 Dec 2004 21:44:50 -0000	1.32.2.9
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ X-KDE-Library=libkaddrbk_cryptosettings
+ Name=Crypto Preferences
++Name[ar]=تفضيلات التشفير
+ Name[be]=Перавагі крыптаграфіі
+ Name[bg]=Криптография
+ Name[bs]=Postavke kriptografije
+Index: kaddressbook/editors/imaddresseditor.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kaddressbook/editors/imaddresseditor.desktop,v
+retrieving revision 1.23.2.8
+retrieving revision 1.23.2.10
+diff -u -r1.23.2.8 -r1.23.2.10
+--- kaddressbook/editors/imaddresseditor.desktop	13 Nov 2004 07:20:48 -0000	1.23.2.8
++++ kaddressbook/editors/imaddresseditor.desktop	29 Dec 2004 21:44:50 -0000	1.23.2.10
+@@ -1,9 +1,11 @@
+ [Desktop Entry]
+ Type=Service
+ Name=Instant Messaging
++Name[ar]=إرسال  فوري
+ Name[bg]=Мигновени съобщения
+ Name[bs]=Instant poruke
+ Name[ca]=Missatgeria instantània
++Name[cs]=Komunikátor
+ Name[es]=Mensajería instantánea
+ Name[et]=Kiirsuhtlus
+ Name[fi]=Pikaviestintä
+@@ -29,9 +31,11 @@
+ Name[uk]=Миттєвий зв'язок
+ Name[zh_CN]=即时消息
+ Comment=Instant Messaging Address Editor
++Comment[ar]=محرر عنوان الرسائل الفورية
+ Comment[bg]=Редактор на адреси за мигновените съобщения
+ Comment[bs]=Editor adresa za instant poruke
+ Comment[ca]=Editor d'adreces de missatgeria instantània
++Comment[cs]=Editor adres komunikátorů
+ Comment[da]=Instant Messaging adresseeditor
+ Comment[de]= Editor für Instant Messaging Addressen
+ Comment[es]=Editor de direcciones de mensajería instantánea
+Index: kaddressbook/editors/kaddressbookimprotocol.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kaddressbook/editors/kaddressbookimprotocol.desktop,v
+retrieving revision 1.20.2.8
+retrieving revision 1.20.2.9
+diff -u -r1.20.2.8 -r1.20.2.9
+--- kaddressbook/editors/kaddressbookimprotocol.desktop	13 Nov 2004 07:20:48 -0000	1.20.2.8
++++ kaddressbook/editors/kaddressbookimprotocol.desktop	29 Dec 2004 21:44:50 -0000	1.20.2.9
+@@ -2,6 +2,7 @@
+ Type=ServiceType
+ X-KDE-ServiceType=KABC/IMProtocol
+ Name=KAddressbook Instant Messaging Protocol
++Name[ar]=بروتوكول الإرسال الفوري لـ KAddressbook
+ Name[bg]=Протокол за МС за адресника
+ Name[bs]=KAddressbook protokol za instant poruke
+ Name[ca]=Protocol de missatgeria instantània KAddressbook
+Index: kaddressbook/editors/protocols/aimprotocol.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kaddressbook/editors/protocols/aimprotocol.desktop,v
+retrieving revision 1.20.2.8
+retrieving revision 1.20.2.10
+diff -u -r1.20.2.8 -r1.20.2.10
+--- kaddressbook/editors/protocols/aimprotocol.desktop	13 Nov 2004 07:20:48 -0000	1.20.2.8
++++ kaddressbook/editors/protocols/aimprotocol.desktop	29 Dec 2004 21:44:50 -0000	1.20.2.10
+@@ -5,8 +5,10 @@
+ ServiceTypes=KABC/IMProtocol,KPluginInfo
+ X-KDE-InstantMessagingKABCField=messaging/aim
+ Comment=AIM Protocol
++Comment[ar]=بروتوكول AIM
+ Comment[be]=Пратакол AIM
+ Comment[bg]=Протокол AIM
++Comment[br]=Komenad AIM
+ Comment[bs]=AIM protokol
+ Comment[ca]=Protocol AIM
+ Comment[cs]=AIM protokol
+Index: kaddressbook/editors/protocols/gaduprotocol.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kaddressbook/editors/protocols/gaduprotocol.desktop,v
+retrieving revision 1.18.2.8
+retrieving revision 1.18.2.9
+diff -u -r1.18.2.8 -r1.18.2.9
+--- kaddressbook/editors/protocols/gaduprotocol.desktop	13 Nov 2004 07:20:48 -0000	1.18.2.8
++++ kaddressbook/editors/protocols/gaduprotocol.desktop	29 Dec 2004 21:44:50 -0000	1.18.2.9
+@@ -5,6 +5,7 @@
+ ServiceTypes=KABC/IMProtocol,KPluginInfo
+ X-KDE-InstantMessagingKABCField=messaging/gadu
+ Comment=Gadu-Gadu Protocol
++Comment[ar]=بروتوكول Gadu-Gadu
+ Comment[be]=Пратакол Gadu-Gadu
+ Comment[bg]=Протокол Gadu-Gadu
+ Comment[bs]=Gadu-Gadu protokol
+Index: kaddressbook/editors/protocols/icqprotocol.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kaddressbook/editors/protocols/icqprotocol.desktop,v
+retrieving revision 1.19.2.8
+retrieving revision 1.19.2.9
+diff -u -r1.19.2.8 -r1.19.2.9
+--- kaddressbook/editors/protocols/icqprotocol.desktop	13 Nov 2004 07:20:48 -0000	1.19.2.8
++++ kaddressbook/editors/protocols/icqprotocol.desktop	29 Dec 2004 21:44:50 -0000	1.19.2.9
+@@ -5,8 +5,10 @@
+ ServiceTypes=KABC/IMProtocol,KPluginInfo
+ X-KDE-InstantMessagingKABCField=messaging/icq
+ Comment=ICQ Protocol
++Comment[ar]=بروتوكول ICQ
+ Comment[be]=Пратакол ICQ
+ Comment[bg]=Протокол ICQ
++Comment[br]=Komenad ICQ
+ Comment[bs]=ICQ protokol
+ Comment[ca]=Protocol ICQ
+ Comment[cs]=ICQ protokol
+Index: kaddressbook/editors/protocols/ircprotocol.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kaddressbook/editors/protocols/ircprotocol.desktop,v
+retrieving revision 1.12.2.4
+retrieving revision 1.12.2.5
+diff -u -r1.12.2.4 -r1.12.2.5
+--- kaddressbook/editors/protocols/ircprotocol.desktop	13 Nov 2004 07:20:48 -0000	1.12.2.4
++++ kaddressbook/editors/protocols/ircprotocol.desktop	29 Dec 2004 21:44:50 -0000	1.12.2.5
+@@ -5,6 +5,7 @@
+ ServiceTypes=KABC/IMProtocol,KPluginInfo
+ X-KDE-InstantMessagingKABCField=messaging/irc
+ Comment=Internet Relay Chat
++Comment[ar]=محادثة إنترنت مرحلة
+ Comment[bg]=Протокол IRC
+ Comment[hu]=IRC (Internet Relay Chat)
+ Comment[ja]=インターネット・リレー・チャット
+Index: kaddressbook/editors/protocols/jabberprotocol.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kaddressbook/editors/protocols/jabberprotocol.desktop,v
+retrieving revision 1.19.2.8
+retrieving revision 1.19.2.10
+diff -u -r1.19.2.8 -r1.19.2.10
+--- kaddressbook/editors/protocols/jabberprotocol.desktop	13 Nov 2004 07:20:48 -0000	1.19.2.8
++++ kaddressbook/editors/protocols/jabberprotocol.desktop	29 Dec 2004 21:44:50 -0000	1.19.2.10
+@@ -5,8 +5,10 @@
+ ServiceTypes=KABC/IMProtocol,KPluginInfo
+ X-KDE-InstantMessagingKABCField=messaging/xmpp
+ Comment=Jabber Protocol
++Comment[ar]=بروتوكول Jabber
+ Comment[be]=Пратакол Jabber
+ Comment[bg]=Протокол Jabber
++Comment[br]=Komenad Jabber
+ Comment[bs]=Jabber protokol
+ Comment[ca]=Protocol Jabber
+ Comment[cs]=Jabber protokol
+Index: kaddressbook/editors/protocols/msnprotocol.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kaddressbook/editors/protocols/msnprotocol.desktop,v
+retrieving revision 1.6.2.4
+retrieving revision 1.6.2.5
+diff -u -r1.6.2.4 -r1.6.2.5
+--- kaddressbook/editors/protocols/msnprotocol.desktop	10 Nov 2004 07:37:26 -0000	1.6.2.4
++++ kaddressbook/editors/protocols/msnprotocol.desktop	29 Dec 2004 21:44:50 -0000	1.6.2.5
+@@ -5,6 +5,7 @@
+ ServiceTypes=KABC/IMProtocol,KPluginInfo
+ X-KDE-InstantMessagingKABCField=messaging/msn
+ Comment=MSN Messenger
++Comment[ar]=MSN Messenger إم إس إن ماسنجر
+ Comment[bg]=Протокол MSN
+ Comment[fr]=Messagerie MSN
+ Comment[ja]=MSN メッセンジャー
+Index: kaddressbook/editors/protocols/smsprotocol.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kaddressbook/editors/protocols/smsprotocol.desktop,v
+retrieving revision 1.19.2.8
+retrieving revision 1.19.2.9
+diff -u -r1.19.2.8 -r1.19.2.9
+--- kaddressbook/editors/protocols/smsprotocol.desktop	13 Nov 2004 07:20:48 -0000	1.19.2.8
++++ kaddressbook/editors/protocols/smsprotocol.desktop	29 Dec 2004 21:44:50 -0000	1.19.2.9
+@@ -5,8 +5,10 @@
+ ServiceTypes=KABC/IMProtocol,KPluginInfo
+ X-KDE-InstantMessagingKABCField=messaging/sms
+ Comment=SMS Protocol
++Comment[ar]=بروتوكول الرسائل القصيرة
+ Comment[be]=Пратакол SMS
+ Comment[bg]=Протокол SMS
++Comment[br]=Komenad SMS
+ Comment[bs]=SMS poruke
+ Comment[ca]=Protocol SMS
+ Comment[cs]=SMS protokol
+Index: kaddressbook/editors/protocols/yahooprotocol.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kaddressbook/editors/protocols/yahooprotocol.desktop,v
+retrieving revision 1.19.2.9
+retrieving revision 1.19.2.10
+diff -u -r1.19.2.9 -r1.19.2.10
+--- kaddressbook/editors/protocols/yahooprotocol.desktop	22 Nov 2004 08:35:07 -0000	1.19.2.9
++++ kaddressbook/editors/protocols/yahooprotocol.desktop	29 Dec 2004 21:44:50 -0000	1.19.2.10
+@@ -5,6 +5,7 @@
+ ServiceTypes=KABC/IMProtocol,KPluginInfo
+ X-KDE-InstantMessagingKABCField=messaging/yahoo
+ Comment=Yahoo Protocol
++Comment[ar]=قوانةن تبادل المعلومات الخاص بـ Yahoo
+ Comment[be]=Пратакол Yahoo
+ Comment[bg]=Протокол Yahoo
+ Comment[br]=Komenad Yahoo
+Index: kaddressbook/features/resourceselection.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kaddressbook/features/resourceselection.desktop,v
+retrieving revision 1.15.2.8
+retrieving revision 1.15.2.10
+diff -u -r1.15.2.8 -r1.15.2.10
+--- kaddressbook/features/resourceselection.desktop	28 Nov 2004 08:33:54 -0000	1.15.2.8
++++ kaddressbook/features/resourceselection.desktop	5 Jan 2005 07:50:29 -0000	1.15.2.10
+@@ -2,7 +2,9 @@
+ Encoding=UTF-8
+ X-KDE-Library=libkaddrbk_resourceselection
+ Name=Address Book Management Plugin
++Name[ar]=أداة إضافية لإدارة دفتر العناوين
+ Name[be]=Дапаўненьне "Кіраваньне адраснамі кнігамі"
++Name[br]=Lugent melestradur ar c'harnedoù chomlec'hioù
+ Name[bs]=Dodatak za rukovanje adresarom
+ Name[ca]=Endollable de gestió de llibretes d'adreces
+ Name[cs]=Modul pro správu knih adres
+@@ -34,6 +36,7 @@
+ Name[uk]=Втулок для керування адресною книгою
+ Name[zh_CN]=地址簿管理插件
+ Comment=Plugin for managing address books
++Comment[ar]=ملحق لإدارة قوائم التوزيع
+ Comment[be]=Дапаўненьне для кіраваньня адраснамі кнігамі
+ Comment[bg]=Приставка за управление на адресника
+ Comment[bs]=Dodatak za upravljanje adresarima
+Index: kaddressbook/interfaces/kaddressbook_contacteditorwidget.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kaddressbook/interfaces/kaddressbook_contacteditorwidget.desktop,v
+retrieving revision 1.23.2.9
+retrieving revision 1.23.2.10
+diff -u -r1.23.2.9 -r1.23.2.10
+--- kaddressbook/interfaces/kaddressbook_contacteditorwidget.desktop	13 Nov 2004 07:20:49 -0000	1.23.2.9
++++ kaddressbook/interfaces/kaddressbook_contacteditorwidget.desktop	29 Dec 2004 21:44:51 -0000	1.23.2.10
+@@ -3,6 +3,7 @@
+ Type=ServiceType
+ X-KDE-ServiceType=KAddressBook/ContactEditorWidget
+ Comment=KAddressBook Contact Editor Widget Plugin
++Comment[ar]=أداة إضافية لتحرير بيانات جهات الإتصال في KAddressBook
+ Comment[bg]=Приставка за редактиране на контактите от адресника
+ Comment[bs]=KAddressBook dodatak za prozor za izmjenu kontakta
+ Comment[ca]=Endollable de l'estri editor de contactes de la llibreta d'adreces
+Index: kaddressbook/interfaces/kaddressbook_extension.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kaddressbook/interfaces/kaddressbook_extension.desktop,v
+retrieving revision 1.28.2.3
+retrieving revision 1.28.2.4
+diff -u -r1.28.2.3 -r1.28.2.4
+--- kaddressbook/interfaces/kaddressbook_extension.desktop	28 Nov 2004 08:33:54 -0000	1.28.2.3
++++ kaddressbook/interfaces/kaddressbook_extension.desktop	29 Dec 2004 21:44:51 -0000	1.28.2.4
+@@ -3,6 +3,7 @@
+ Type=ServiceType
+ X-KDE-ServiceType=KAddressBook/Extension
+ Comment=KAddressBook Extension Plugin
++Comment[ar]=أداة لملحقات kAddressBook
+ Comment[be]=Дапаўненьне K Адраснай кнігі "Пашырэньне"
+ Comment[bg]=Приставка-разширение за адресника
+ Comment[bs]=KAddressBook dodatak proširenja
+Index: kaddressbook/interfaces/kaddressbook_xxport.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kaddressbook/interfaces/kaddressbook_xxport.desktop,v
+retrieving revision 1.30.2.4
+retrieving revision 1.30.2.5
+diff -u -r1.30.2.4 -r1.30.2.5
+--- kaddressbook/interfaces/kaddressbook_xxport.desktop	28 Nov 2004 08:33:54 -0000	1.30.2.4
++++ kaddressbook/interfaces/kaddressbook_xxport.desktop	29 Dec 2004 21:44:51 -0000	1.30.2.5
+@@ -3,6 +3,7 @@
+ Type=ServiceType
+ X-KDE-ServiceType=KAddressBook/XXPort
+ Comment=KAddressBook Import/Export Plugin
++Comment[ar]=أداة إضافية لتصدير و استيراد kAddressBook
+ Comment[be]=Дапаўненьне K Адраснай кнігі "Імпарт/Экспарт"
+ Comment[bg]=Приставка за импорт/експорт на данни от адресника
+ Comment[bs]=KAddressBook dodatak za uvoz/izvoz
+Index: kaddressbook/kcmconfigs/kabconfig.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kaddressbook/kcmconfigs/kabconfig.desktop,v
+retrieving revision 1.81.2.5
+retrieving revision 1.81.2.8
+diff -u -r1.81.2.5 -r1.81.2.8
+--- kaddressbook/kcmconfigs/kabconfig.desktop	28 Nov 2004 08:33:54 -0000	1.81.2.5
++++ kaddressbook/kcmconfigs/kabconfig.desktop	5 Jan 2005 07:50:29 -0000	1.81.2.8
+@@ -39,7 +39,6 @@
+ Name[it]=Rubrica indirizzi
+ Name[ja]=アドレス帳
+ Name[lt]=Adresų knygutė
+-Name[mk]=Адресар
+ Name[ms]=Buku Alamat
+ Name[nb]=Addressebok
+ Name[nl]=Adresboek
+@@ -62,6 +61,7 @@
+ Name[uz]=Манзиллар дафтари
+ Name[zh_CN]=地址簿
+ Comment=Configure the Address Book
++Comment[ar]=اعداد دفتر العناوين
+ Comment[be]=Настроіць адрасную кнігу
+ Comment[bg]=Настройки на адресника
+ Comment[bs]=Podesite Adresar
+Index: kaddressbook/kcmconfigs/kabcustomfields.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kaddressbook/kcmconfigs/kabcustomfields.desktop,v
+retrieving revision 1.26.2.10
+retrieving revision 1.26.2.11
+diff -u -r1.26.2.10 -r1.26.2.11
+--- kaddressbook/kcmconfigs/kabcustomfields.desktop	28 Nov 2004 08:33:54 -0000	1.26.2.10
++++ kaddressbook/kcmconfigs/kabcustomfields.desktop	29 Dec 2004 21:44:51 -0000	1.26.2.11
+@@ -13,6 +13,7 @@
+ X-KDE-CfgDlgHierarchy=KAB
+ 
+ Name=Custom Pages
++Name[ar]=صفحات مخصصة
+ Name[bg]=Потребителски полета
+ Name[bs]=Vlastite stranice
+ Name[ca]=Pàgines a mida
+@@ -47,6 +48,7 @@
+ Name[uk]=Нетипові сторінки
+ Name[zh_CN]=定制页
+ Comment=Configure the Custom Pages
++Comment[ar]=اعدادات صفحات مخصصة
+ Comment[bg]=Настройки на потребителските полета
+ Comment[bs]=Podesite vlastite stranice
+ Comment[ca]=Configura les pàgines a mida
+@@ -81,6 +83,7 @@
+ Comment[uk]=Налаштування нетипових сторінок
+ Comment[zh_CN]=配置定制页
+ Keywords=kaddressbook, configure, settings, custom fields
++Keywords[ar]=kaddressbook, تكوين , إعداد , حقول مخصصة
+ Keywords[bg]=адресник, потребителски, полета, настройки, конфигуриране, kaddressbook, configure, settings, custom fields
+ Keywords[bs]=kaddressbook, configure, settings, custom fields, podesite, postavke, vlastite, vlastito
+ Keywords[ca]=llibreta d'adreces, configura, opcions, camps a mida
+Index: kaddressbook/kcmconfigs/kabldapconfig.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kaddressbook/kcmconfigs/kabldapconfig.desktop,v
+retrieving revision 1.72.2.5
+retrieving revision 1.72.2.6
+diff -u -r1.72.2.5 -r1.72.2.6
+--- kaddressbook/kcmconfigs/kabldapconfig.desktop	28 Nov 2004 08:33:54 -0000	1.72.2.5
++++ kaddressbook/kcmconfigs/kabldapconfig.desktop	29 Dec 2004 21:44:51 -0000	1.72.2.6
+@@ -52,6 +52,7 @@
+ Name[uk]=Пошук через LDAP
+ Name[zh_CN]=LDAP 查询
+ Comment=Configure the Address Book LDAP Settings
++Comment[ar]=تكوين إعدادات LDAP لدفتر العناوين
+ Comment[bg]=Настройки на адресника за използване на сървър LDAP
+ Comment[bs]=Podesite LDAP postavke Adresara
+ Comment[ca]=Configura les opcions de la Llibreta d'adreces LDAP
+Index: kaddressbook/kcmconfigs/ldapoptionswidget.cpp
+===================================================================
+RCS file: /home/kde/kdepim/kaddressbook/kcmconfigs/ldapoptionswidget.cpp,v
+retrieving revision 1.9
+retrieving revision 1.9.2.1
+diff -u -r1.9 -r1.9.2.1
+--- kaddressbook/kcmconfigs/ldapoptionswidget.cpp	20 May 2004 14:30:28 -0000	1.9
++++ kaddressbook/kcmconfigs/ldapoptionswidget.cpp	10 Dec 2004 20:08:05 -0000	1.9.2.1
+@@ -201,8 +201,10 @@
+   bool isActive = item->isActive();
+   item->setServer( other->server() );
+   item->setIsActive( other->isActive() );
++  item->setOn( other->isActive() );
+   other->setServer( server );
+   other->setIsActive( isActive );
++  other->setOn( isActive );
+ }
+ 
+ void LDAPOptionsWidget::slotMoveUp()
+Index: kaddressbook/views/cardview.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kaddressbook/views/cardview.desktop,v
+retrieving revision 1.42.2.2
+retrieving revision 1.42.2.3
+diff -u -r1.42.2.2 -r1.42.2.3
+--- kaddressbook/views/cardview.desktop	28 Nov 2004 08:33:55 -0000	1.42.2.2
++++ kaddressbook/views/cardview.desktop	29 Dec 2004 21:44:51 -0000	1.42.2.3
+@@ -2,8 +2,10 @@
+ Encoding=UTF-8
+ X-KDE-Library=libkaddrbk_cardview
+ Name=Card View
++Name[ar]=عرض بشكل بطاقات
+ Name[be]=У выглядзе картак
+ Name[bg]=Преглед като карти
++Name[br]=Gwell ar c'hartennoù
+ Name[bs]=Pogled kartice
+ Name[ca]=Vista de targeta
+ Name[cs]=Pohled s kartičkami
+Index: kaddressbook/views/iconview.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kaddressbook/views/iconview.desktop,v
+retrieving revision 1.38.2.5
+retrieving revision 1.38.2.6
+diff -u -r1.38.2.5 -r1.38.2.6
+--- kaddressbook/views/iconview.desktop	28 Nov 2004 08:33:55 -0000	1.38.2.5
++++ kaddressbook/views/iconview.desktop	12 Dec 2004 08:32:44 -0000	1.38.2.6
+@@ -31,7 +31,6 @@
+ Name[ja]=アイコンビュー
+ Name[lt]=Rodyti piktogramas
+ Name[lv]=Ikonu Skatījums
+-Name[mk]=Приказ со икони
+ Name[ms]=Pelihat Ikon
+ Name[mt]=Ikoni
+ Name[nb]=Ikonvisning
+Index: kaddressbook/views/tableview.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kaddressbook/views/tableview.desktop,v
+retrieving revision 1.42.2.2
+retrieving revision 1.42.2.3
+diff -u -r1.42.2.2 -r1.42.2.3
+--- kaddressbook/views/tableview.desktop	28 Nov 2004 08:33:55 -0000	1.42.2.2
++++ kaddressbook/views/tableview.desktop	29 Dec 2004 21:44:51 -0000	1.42.2.3
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ X-KDE-Library=libkaddrbk_tableview
+ Name=Table View
++Name[ar]=عرض بشكل جدول
+ Name[be]=У выглядзе табліцы
+ Name[bg]=Преглед в таблица
+ Name[bs]=Pogled tabele
+Index: kaddressbook/xxport/bookmark_xxport.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kaddressbook/xxport/bookmark_xxport.desktop,v
+retrieving revision 1.47.2.6
+retrieving revision 1.47.2.7
+diff -u -r1.47.2.6 -r1.47.2.7
+--- kaddressbook/xxport/bookmark_xxport.desktop	28 Nov 2004 08:33:55 -0000	1.47.2.6
++++ kaddressbook/xxport/bookmark_xxport.desktop	29 Dec 2004 21:44:52 -0000	1.47.2.7
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ X-KDE-Library=libkaddrbk_bookmark_xxport
+ Name=KAB Bookmark XXPort Plugin
++Name[ar]=أداة إضافية لوضع إشارة مرجعية في المدخل XX التابع لـ KAB
+ Name[be]=Дапаўненьне KAB "Экспарт у закладкі"
+ Name[bs]=KAB dodatak za XXPort zabilješki
+ Name[ca]=Endollable d'importació/exportació de punts per a KAB
+@@ -38,6 +39,7 @@
+ Name[uk]=Втулок обміну закладками KAB
+ Name[zh_CN]=KAB 书签 XXPort 插件
+ Comment=Plugin to export the web addresses of the contacts as bookmarks
++Comment[ar]=أداة إضافية لتصدير عناوين الشبكة ويب لجهات الاتصال كإشارات مرجعية
+ Comment[bg]=Приставка за експорт на уеб адресите на контактите, като отметки
+ Comment[bs]=Dodatak za izvoz web adresa kontakata u formi zabilješki
+ Comment[ca]=Endollable per a exportar les adreces web dels contactes com a punts
+Index: kaddressbook/xxport/csv_xxport.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kaddressbook/xxport/csv_xxport.desktop,v
+retrieving revision 1.50.2.5
+retrieving revision 1.50.2.6
+diff -u -r1.50.2.5 -r1.50.2.6
+--- kaddressbook/xxport/csv_xxport.desktop	28 Nov 2004 08:33:55 -0000	1.50.2.5
++++ kaddressbook/xxport/csv_xxport.desktop	29 Dec 2004 21:44:52 -0000	1.50.2.6
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ X-KDE-Library=libkaddrbk_csv_xxport
+ Name=KAB CSV XXPort Plugin
++Name[ar]=أداة إضافية لـCVS في المدخل XX التابع لـ KAB
+ Name[be]=Дапаўненьне KAB "Імпарт/Экспарт CSV"
+ Name[bs]=KAB dodatak za CSV XXPort
+ Name[ca]=Endollable d'importació/exportació CSV per a KAB
+@@ -36,6 +37,7 @@
+ Name[uk]=Втулок KAB для обміну через CSV
+ Name[zh_CN]=KAB CSV XXPort 插件
+ Comment=Plugin to import and export contacts in CSV format
++Comment[ar]= أداة إضافية لاستيراد أو تصدير بيانات جهات الاتصال بتنسيق CVS
+ Comment[be]=Дапаўненьне для імпарту і экспарту кантактаў у фармаце CSV
+ Comment[bg]=Приставка за импорт/експорт на контактите във формат CSV
+ Comment[bs]=Dodatak za uvoz i izvoz kontakata u CSV formatu
+Index: kaddressbook/xxport/eudora_xxport.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kaddressbook/xxport/eudora_xxport.desktop,v
+retrieving revision 1.47.2.5
+retrieving revision 1.47.2.6
+diff -u -r1.47.2.5 -r1.47.2.6
+--- kaddressbook/xxport/eudora_xxport.desktop	28 Nov 2004 08:33:55 -0000	1.47.2.5
++++ kaddressbook/xxport/eudora_xxport.desktop	29 Dec 2004 21:44:52 -0000	1.47.2.6
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ X-KDE-Library=libkaddrbk_eudora_xxport
+ Name=KAB Eudora XXPort Plugin
++Name[ar]=أداة إضافية لـ Eudora في المدخل XX التابع لـ KAB
+ Name[be]=Дапаўненьне KAB "Імпарт/Экспарт Eudora"
+ Name[bs]=KAB dodatak za Eudora XXPort
+ Name[ca]=Endollable d'importació/exportació Eudora per a KAB
+@@ -37,6 +38,7 @@
+ Name[uk]=Втулок KAB для обміну з Eudora
+ Name[zh_CN]=KAB Eudora XXPort 插件
+ Comment=Plugin to import and export Eudora contacts
++Comment[ar]= أداة إضافية لاستيراد أو تصدير بيانات جهات الاتصال الخاصة بـ Eudora
+ Comment[be]=Дапаўненьне для імпарту і экспарту кантактаў Eudora
+ Comment[bg]=Приставка за импорт/експорт на контактите във формат на Eudora
+ Comment[bs]=Dodatak za uvoz i izvoz kontakata iz Eudore
+Index: kaddressbook/xxport/gnokii_xxport.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kaddressbook/xxport/gnokii_xxport.desktop,v
+retrieving revision 1.42.2.4
+retrieving revision 1.42.2.5
+diff -u -r1.42.2.4 -r1.42.2.5
+--- kaddressbook/xxport/gnokii_xxport.desktop	28 Nov 2004 08:33:55 -0000	1.42.2.4
++++ kaddressbook/xxport/gnokii_xxport.desktop	29 Dec 2004 21:44:52 -0000	1.42.2.5
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ X-KDE-Library=libkaddrbk_gnokii_xxport
+ Name=KAB Mobile Phone XXPort Plugin
++Name[ar]=أداة إضافية للهواتف النقالة في المدخل XX التابع لـ KAB
+ Name[bs]=KAB dodatak XXPort u/iz mobilnog telefona
+ Name[ca]=Endollable d'importació/exportació de telèfon mòbil per a KAB
+ Name[cs]=Exportní modul do mobilního telefonu
+@@ -37,6 +38,7 @@
+ Name[uk]=Втулок KAB для обміну з мобільними телефонами
+ Name[zh_CN]=KAB 移动电话 XXPort 插件
+ Comment=Mobile Phone Plugin to Import and Export Addressbook Entries
++Comment[ar]=أداة هاتف جوال إضافية لاستيراد أو تصدير إدخالات دفتر العناوين
+ Comment[bg]=Приставка за експорт/импорт на контактите от/към мобилен телефон
+ Comment[bs]=Dodatak za uvoz i izvoz stavki adresara iz mobilnog telefona
+ Comment[ca]=Endollable de telèfon mòbil per a importar i exportar entrades de la llibreta d'adreces
+Index: kaddressbook/xxport/kde2_xxport.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kaddressbook/xxport/kde2_xxport.desktop,v
+retrieving revision 1.47.2.6
+retrieving revision 1.47.2.7
+diff -u -r1.47.2.6 -r1.47.2.7
+--- kaddressbook/xxport/kde2_xxport.desktop	28 Nov 2004 08:33:55 -0000	1.47.2.6
++++ kaddressbook/xxport/kde2_xxport.desktop	29 Dec 2004 21:44:52 -0000	1.47.2.7
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ X-KDE-Library=libkaddrbk_kde2_xxport
+ Name=KAB KDE2 XXPort Plugin
++Name[ar]=أداة إضافية لـ KDE2 المدخل XX التابع لـ KAB
+ Name[be]=Дапаўненьне KAB "Імпарт/Экспарт KDE2"
+ Name[bs]=KAB dodatak za KDE2 XXPort
+ Name[ca]=Endollable d'importació/exportació KDE2 per a KAB
+@@ -37,6 +38,7 @@
+ Name[uk]=Втулок KAB для обміну з KDE2
+ Name[zh_CN]=KAB KDE2 XXPort 插件
+ Comment=Plugin to import the old KDE 2 address book
++Comment[ar]=أداة إضافية لاستيراد دفتر العناوين القديم التابع لـ KDE
+ Comment[be]=Дапаўненьне для імпарту старой адраснай кнігі KDE 2
+ Comment[bg]=Приставка за импорт на контактите от старата версия на адресника в КДЕ 2
+ Comment[bs]=Dodatak za uvoz iz starog KDE 2 adresara
+Index: kaddressbook/xxport/ldif_xxport.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kaddressbook/xxport/ldif_xxport.desktop,v
+retrieving revision 1.48.2.5
+retrieving revision 1.48.2.6
+diff -u -r1.48.2.5 -r1.48.2.6
+--- kaddressbook/xxport/ldif_xxport.desktop	28 Nov 2004 08:33:55 -0000	1.48.2.5
++++ kaddressbook/xxport/ldif_xxport.desktop	29 Dec 2004 21:44:52 -0000	1.48.2.6
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ X-KDE-Library=libkaddrbk_ldif_xxport
+ Name=KAB LDIF XXPort Plugin
++Name[ar]=أداة إضافية لمدخل XX KAB LDIF
+ Name[be]=Дапаўненьне KAB "Імпарт LDIF"
+ Name[bs]=KAB dodatak za LDIF XXPort
+ Name[ca]=Endollable per importació/exportació de LDIF per a KAB
+@@ -38,6 +39,7 @@
+ Name[uk]=Втулок KAB для обміну через LDIF
+ Name[zh_CN]=KAB LDIF XXPort 插件
+ Comment=Plugin to import and export contacts in Netscape and Mozilla LDIF format
++Comment[ar]=أداة إضافية لاستيراد أو تصدير بيانات جهات الاتصال بتنسيق Netscape و Mozilla LDIF
+ Comment[be]=Дапаўненьне для імпарту кантактаў у фармаце Netscape/Mozilla LDIF
+ Comment[bg]=Приставка за импорт/експорт на контактите във формат на Netscape и Mozilla (LDIF)
+ Comment[bs]=Dodatak za uvoz i izvoz kontakata iz LDIF formata koji koriste Netscape i Mozilla
+Index: kaddressbook/xxport/opera_xxport.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kaddressbook/xxport/opera_xxport.desktop,v
+retrieving revision 1.43.2.5
+retrieving revision 1.43.2.6
+diff -u -r1.43.2.5 -r1.43.2.6
+--- kaddressbook/xxport/opera_xxport.desktop	28 Nov 2004 08:33:55 -0000	1.43.2.5
++++ kaddressbook/xxport/opera_xxport.desktop	29 Dec 2004 21:44:52 -0000	1.43.2.6
+@@ -2,7 +2,9 @@
+ Encoding=UTF-8
+ X-KDE-Library=libkaddrbk_opera_xxport
+ Name=KAB Opera XXPort Plugin
++Name[ar]=مداة إضافية لمدخل XX KAB Opera
+ Name[be]=Дапаўненьне KAB "Імпарт Opera"
++Name[br]=Lugent KAB Opera XXPort
+ Name[bs]=KAB dodatak za Opera XXPort
+ Name[ca]=Endollable d'importació/exportació d'Opera per a KAB
+ Name[cs]=Exportní modul do Opery
+@@ -36,6 +38,7 @@
+ Name[uk]=Name=Втулок KAB для обміну з Opera
+ Name[zh_CN]=KAB Opera XXPort 插件
+ Comment=Plugin to import Opera contacts
++Comment[ar]=مداة إضافية لمدخل XX KAB Opera
+ Comment[be]=Дапаўненьне для імпарту кантактаў Opera
+ Comment[bg]=Приставка за импорт на контактите от Опера
+ Comment[bs]=Dodatak za uvoz kontakata iz Opere
+Index: kaddressbook/xxport/pab_xxport.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kaddressbook/xxport/pab_xxport.desktop,v
+retrieving revision 1.43.2.6
+retrieving revision 1.43.2.7
+diff -u -r1.43.2.6 -r1.43.2.7
+--- kaddressbook/xxport/pab_xxport.desktop	28 Nov 2004 08:33:55 -0000	1.43.2.6
++++ kaddressbook/xxport/pab_xxport.desktop	29 Dec 2004 21:44:52 -0000	1.43.2.7
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ X-KDE-Library=libkaddrbk_pab_xxport
+ Name=KAB MS Exchange Personal Addressbook XXPort Plugin
++Name[ar]=أداة إضافية لمدخل XX التابع لدفتر عناوين KAB MS Exchange
+ Name[be]=Дапаўненьне KAB "Імпарт пэрсанальнай адраснай кнігі MS Exchange"
+ Name[bs]=KAB dodatak za MS Exchange Personal Addressbook XXPort
+ Name[ca]=Endollable d'importació/exportació de la llibreta d'adreces personal d'MS Exchange per a KAB
+@@ -37,6 +38,7 @@
+ Name[uk]=Втулок KAB для обміну з персональною адресною книгою MS Exchange
+ Name[zh_CN]=KAB MS Exchange 个人地址簿 XXPort 插件
+ Comment=Plugin to import MS Exchange Personal Address Books
++Comment[ar]=أداة إضافية لاستيراد دفاتر عناويين MS Exchange
+ Comment[be]=Дапаўненьне для імпарту пэрсанальнай адраснай кнігі MS Exchange
+ Comment[bg]=Приставка за импорт на контактите от MS Exchange Personal Address Books
+ Comment[bs]=Dodatak za uvoz iz MS Exchange personalnog adresara
+Index: kaddressbook/xxport/vcard_xxport.cpp
+===================================================================
+RCS file: /home/kde/kdepim/kaddressbook/xxport/vcard_xxport.cpp,v
+retrieving revision 1.21
+retrieving revision 1.21.2.1
+diff -u -r1.21 -r1.21.2.1
+--- kaddressbook/xxport/vcard_xxport.cpp	17 Jul 2004 14:47:07 -0000	1.21
++++ kaddressbook/xxport/vcard_xxport.cpp	8 Jan 2005 01:44:10 -0000	1.21.2.1
+@@ -27,6 +27,7 @@
+ #include <qlabel.h>
+ #include <qlayout.h>
+ #include <qpushbutton.h>
++#include <qtextcodec.h>
+ 
+ #include <kabc/vcardconverter.h>
+ #include <kdialogbase.h>
+@@ -208,7 +209,13 @@
+         QByteArray rawData = file.readAll();
+         file.close();
+ 
+-        QString data = QString::fromUtf8( rawData.data(), rawData.size() + 1 );
++        QTextCodec *codec = QTextCodec::codecForContent( rawData.data(), 50 );
++ 
++        QString data;
++        if ( codec )
++          data = codec->toUnicode( rawData.data(), rawData.size() );
++        else
++          data = QString::fromUtf8( rawData.data(), rawData.size() );
+         addrList += parseVCard( data );
+ 
+         KIO::NetAccess::removeTempFile( fileName );
+Index: kaddressbook/xxport/vcard_xxport.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kaddressbook/xxport/vcard_xxport.desktop,v
+retrieving revision 1.50.2.5
+retrieving revision 1.50.2.6
+diff -u -r1.50.2.5 -r1.50.2.6
+--- kaddressbook/xxport/vcard_xxport.desktop	28 Nov 2004 08:33:55 -0000	1.50.2.5
++++ kaddressbook/xxport/vcard_xxport.desktop	29 Dec 2004 21:44:52 -0000	1.50.2.6
+@@ -2,7 +2,9 @@
+ Encoding=UTF-8
+ X-KDE-Library=libkaddrbk_vcard_xxport
+ Name=KAB vCard XXPort Plugin
++Name[ar]=أداة إضافية لمدخل XX vCard
+ Name[be]=Дапаўненьне KAB "Імпарт/Экспарт vCard"
++Name[br]=Lugent KAB vCard XXPort
+ Name[bs]=KAB dodatak za vCard XXPort
+ Name[ca]=Endollable d'importació/exportació vCard per a KAB
+ Name[cs]=Exportní modul vCard
+@@ -37,6 +39,7 @@
+ Name[uk]=Втулок KAB для обміну через vCard
+ Name[zh_CN]=KAB vCard XXPort 插件
+ Comment=Plugin to import and export contacts in vCard format
++Comment[ar]=أداة إضافية لاستيراد أو تصدير بيانات جهات الاتصال بتنسيق vCard
+ Comment[be]=Дапаўненьне для імпарту і экспарту кантактаў у фармаце vCard
+ Comment[bg]=Приставка за експорт/импорт на контактите във формат на vCard
+ Comment[bs]=Dodatak za uvoz i izvoz kontakata u vCard formatu
+Index: kalarm/Changelog
+===================================================================
+RCS file: /home/kde/kdepim/kalarm/Changelog,v
+retrieving revision 1.73.2.12
+retrieving revision 1.73.2.17
+diff -u -r1.73.2.12 -r1.73.2.17
+--- kalarm/Changelog	27 Nov 2004 12:30:33 -0000	1.73.2.12
++++ kalarm/Changelog	18 Jan 2005 22:21:42 -0000	1.73.2.17
+@@ -1,6 +1,13 @@
+ KAlarm
+ 
+-=== Version 1.1.7 --- 27 November 2004 ===
++=== Version 1.1.8 --- 9 January 2005 ===
++Fix random limit on expired alarm discard time if stepping with spinbox buttons.
++Fix dialog layouts for right-to-left languages.
++Fix time spin box layout for right-to-left languages.
++Display correct controls after loading a template in alarm edit dialog.
++Fix missing left border for time spinboxes in Plastik style.
++
++=== Version 1.1.7 (KDE 3.3.2) --- 27 November 2004 ===
+ Fix KAlarm button on message windows to make it always display main window.
+ Show scheduled times, not reminder times, in alarm list and system tray tooltip.
+ Fix time-to-alarm column in main window not always updating every minute.
+Index: kalarm/alarmtimewidget.cpp
+===================================================================
+RCS file: /home/kde/kdepim/kalarm/alarmtimewidget.cpp,v
+retrieving revision 1.13
+retrieving revision 1.13.2.1
+diff -u -r1.13 -r1.13.2.1
+--- kalarm/alarmtimewidget.cpp	3 Aug 2004 23:59:10 -0000	1.13
++++ kalarm/alarmtimewidget.cpp	5 Dec 2004 18:03:41 -0000	1.13.2.1
+@@ -153,8 +153,8 @@
+ 	{
+ 		QGridLayout* grid = new QGridLayout(topLayout, 2, 2, KDialog::spacingHint());
+ 		grid->addWidget(mAtTimeRadio, 0, 0);
+-		grid->addWidget(mDateEdit, 0, 1, Qt::AlignLeft);
+-		grid->addWidget(timeBox, 1, 1, Qt::AlignLeft);
++		grid->addWidget(mDateEdit, 0, 1, Qt::AlignAuto);
++		grid->addWidget(timeBox, 1, 1, Qt::AlignAuto);
+ 		grid->setColStretch(2, 1);
+ 		topLayout->addStretch();
+ 		QBoxLayout* layout = new QHBoxLayout(topLayout, KDialog::spacingHint());
+@@ -165,12 +165,12 @@
+ 	else
+ 	{
+ 		QGridLayout* grid = new QGridLayout(topLayout, 2, 3, KDialog::spacingHint());
+-		grid->addWidget(mAtTimeRadio, 0, 0, Qt::AlignLeft);
+-		grid->addWidget(mDateEdit, 0, 1, Qt::AlignLeft);
+-		grid->addWidget(timeBox, 0, 2, Qt::AlignLeft);
++		grid->addWidget(mAtTimeRadio, 0, 0, Qt::AlignAuto);
++		grid->addWidget(mDateEdit, 0, 1, Qt::AlignAuto);
++		grid->addWidget(timeBox, 0, 2, Qt::AlignAuto);
+ 		grid->setRowStretch(0, 1);
+-		grid->addWidget(mAfterTimeRadio, 1, 0, Qt::AlignLeft);
+-		grid->addWidget(mDelayTimeEdit, 1, 1, Qt::AlignLeft);
++		grid->addWidget(mAfterTimeRadio, 1, 0, Qt::AlignAuto);
++		grid->addWidget(mDelayTimeEdit, 1, 1, Qt::AlignAuto);
+ 		grid->setColStretch(3, 1);
+ 		topLayout->addStretch();
+ 	}
+Index: kalarm/birthdaydlg.cpp
+===================================================================
+RCS file: /home/kde/kdepim/kalarm/birthdaydlg.cpp,v
+retrieving revision 1.26
+retrieving revision 1.26.2.1
+diff -u -r1.26 -r1.26.2.1
+--- kalarm/birthdaydlg.cpp	19 Jul 2004 21:27:07 -0000	1.26
++++ kalarm/birthdaydlg.cpp	5 Dec 2004 18:03:41 -0000	1.26.2.1
+@@ -143,7 +143,7 @@
+ 	// Sound checkbox and file selector
+ 	mSoundPicker = new SoundPicker(group);
+ 	mSoundPicker->setFixedSize(mSoundPicker->sizeHint());
+-	groupLayout->addWidget(mSoundPicker, 0, Qt::AlignLeft);
++	groupLayout->addWidget(mSoundPicker, 0, Qt::AlignAuto);
+ 
+ 	// How much to advance warning to give
+ 	mReminder = new Reminder(i18n("&Reminder"),
+@@ -159,7 +159,7 @@
+ 	// Acknowledgement confirmation required - default = no confirmation
+ 	mConfirmAck = EditAlarmDlg::createConfirmAckCheckbox(group);
+ 	mConfirmAck->setFixedSize(mConfirmAck->sizeHint());
+-	groupLayout->addWidget(mConfirmAck, 0, Qt::AlignLeft);
++	groupLayout->addWidget(mConfirmAck, 0, Qt::AlignAuto);
+ 
+ 	// Late display checkbox - default = allow late display
+ 	layout = new QHBoxLayout(groupLayout, 2*spacingHint());
+Index: kalarm/editdlg.cpp
+===================================================================
+RCS file: /home/kde/kdepim/kalarm/editdlg.cpp,v
+retrieving revision 1.128.2.3
+retrieving revision 1.128.2.5
+diff -u -r1.128.2.3 -r1.128.2.5
+--- kalarm/editdlg.cpp	1 Sep 2004 11:21:19 -0000	1.128.2.3
++++ kalarm/editdlg.cpp	22 Dec 2004 22:47:51 -0000	1.128.2.5
+@@ -165,8 +165,8 @@
+ 
+ 	// Alarm action
+ 
+-	mActionGroup = new QButtonGroup(i18n("Action"), mainPage, "actionGroup");
+-	connect(mActionGroup, SIGNAL(clicked(int)), SLOT(slotAlarmTypeClicked(int)));
++	mActionGroup = new ButtonGroup(i18n("Action"), mainPage, "actionGroup");
++	connect(mActionGroup, SIGNAL(buttonSet(int)), SLOT(slotAlarmTypeChanged(int)));
+ 	topLayout->addWidget(mActionGroup, 1);
+ 	QGridLayout* grid = new QGridLayout(mActionGroup, 3, 5, marginKDE2 + marginHint(), spacingHint());
+ 	grid->addRowSpacing(0, fontMetrics().lineSpacing()/2);
+@@ -232,7 +232,7 @@
+ 	{
+ 		mTemplateTimeGroup = new ButtonGroup(i18n("Time"), mainPage, "templateGroup");
+ 		connect(mTemplateTimeGroup, SIGNAL(buttonSet(int)), SLOT(slotTemplateTimeType(int)));
+-		layout->addWidget(mTemplateTimeGroup, 0, Qt::AlignLeft);
++		layout->addWidget(mTemplateTimeGroup, 0, Qt::AlignAuto);
+ 		QBoxLayout* vlayout = new QVBoxLayout(mTemplateTimeGroup, marginKDE2 + marginHint(), spacingHint());
+ 		vlayout->addSpacing(fontMetrics().lineSpacing()/2);
+ 
+@@ -242,7 +242,7 @@
+ 		QWhatsThis::add(mTemplateDefaultTime,
+ 		      i18n("Do not specify a start time for alarms based on this template. "
+ 		           "The normal default start time will be used."));
+-		vlayout->addWidget(mTemplateDefaultTime, 0, Qt::AlignLeft);
++		vlayout->addWidget(mTemplateDefaultTime, 0, Qt::AlignAuto);
+ 
+ 		QHBox* box = new QHBox(mTemplateTimeGroup);
+ 		box->setSpacing(spacingHint());
+@@ -268,7 +268,9 @@
+ 		mTemplateAnyTime->setReadOnly(mReadOnly);
+ 		QWhatsThis::add(mTemplateAnyTime,
+ 		      i18n("Set the '%1' option for alarms based on this template.").arg(i18n("Any time")));
+-		vlayout->addWidget(mTemplateAnyTime, 0, Qt::AlignLeft);
++		vlayout->addWidget(mTemplateAnyTime, 0, Qt::AlignAuto);
++
++		layout->addStretch();
+ 	}
+ 	else
+ 	{
+@@ -295,12 +297,12 @@
+ 	QWhatsThis::add(box,
+ 	      i18n("How often the alarm recurs.\nThe alarm's recurrence is configured in the Recurrence tab."));
+ 	box->setFixedHeight(box->sizeHint().height());
+-	vlayout->addWidget(box, 0, Qt::AlignLeft);
++	vlayout->addWidget(box, 0, Qt::AlignAuto);
+ 
+ 	// Late display checkbox - default = allow late display
+ 	mLateCancel = createLateCancelCheckbox(mainPage);
+ 	mLateCancel->setFixedSize(mLateCancel->sizeHint());
+-	vlayout->addWidget(mLateCancel, 0, Qt::AlignLeft);
++	vlayout->addWidget(mLateCancel, 0, Qt::AlignAuto);
+ 
+ 	setButtonWhatsThis(Ok, i18n("Schedule the alarm at the specified time."));
+ 
+@@ -374,7 +376,7 @@
+ 	// Sound checkbox and file selector
+ 	mSoundPicker = new SoundPicker(mDisplayAlarmsFrame);
+ 	mSoundPicker->setFixedSize(mSoundPicker->sizeHint());
+-	frameLayout->addWidget(mSoundPicker, 0, Qt::AlignLeft);
++	frameLayout->addWidget(mSoundPicker, 0, Qt::AlignAuto);
+ 
+ 	// Reminder
+ 	static const QString reminderText = i18n("Enter how long in advance of the main alarm to display a reminder alarm.");
+@@ -383,7 +385,7 @@
+ 	                         QString("%1\n\n%2").arg(reminderText).arg(TimeSpinBox::shiftWhatsThis()),
+ 	                         true, true, mDisplayAlarmsFrame);
+ 	mReminder->setFixedSize(mReminder->sizeHint());
+-	frameLayout->addWidget(mReminder, 0, Qt::AlignLeft);
++	frameLayout->addWidget(mReminder, 0, Qt::AlignAuto);
+ 
+ 	// Acknowledgement confirmation required - default = no confirmation
+ 	layout = new QHBoxLayout(frameLayout);
+@@ -502,7 +504,7 @@
+ 	mEmailBcc->setFixedSize(mEmailBcc->sizeHint());
+ 	QWhatsThis::add(mEmailBcc,
+ 	      i18n("If checked, the email will be blind copied to you."));
+-	grid->addMultiCellWidget(mEmailBcc, 1, 1, 0, 1, Qt::AlignLeft);
++	grid->addMultiCellWidget(mEmailBcc, 1, 1, 0, 1, Qt::AlignAuto);
+ }
+ 
+ /******************************************************************************
+@@ -1303,7 +1305,7 @@
+ */
+ void EditAlarmDlg::slotShowMainPage()
+ {
+-	slotAlarmTypeClicked(-1);
++	slotAlarmTypeChanged(-1);
+ 	if (!mMainPageShown)
+ 	{
+ 		if (mTemplateName)
+@@ -1434,7 +1436,7 @@
+ *  Called when one of the alarm action type radio buttons is clicked,
+ *  to display the appropriate set of controls for that action type.
+ */
+-void EditAlarmDlg::slotAlarmTypeClicked(int)
++void EditAlarmDlg::slotAlarmTypeChanged(int)
+ {
+ 	QWidget* focus = 0;
+ 	if (mMessageRadio->isOn())
+Index: kalarm/editdlg.h
+===================================================================
+RCS file: /home/kde/kdepim/kalarm/editdlg.h,v
+retrieving revision 1.48.2.3
+retrieving revision 1.48.2.4
+diff -u -r1.48.2.3 -r1.48.2.4
+--- kalarm/editdlg.h	1 Sep 2004 11:21:19 -0000	1.48.2.3
++++ kalarm/editdlg.h	22 Dec 2004 22:47:51 -0000	1.48.2.4
+@@ -30,7 +30,6 @@
+ #include "datetime.h"
+ 
+ class QButton;
+-class QButtonGroup;
+ class QGroupBox;
+ class QComboBox;
+ class QTabWidget;
+@@ -89,7 +88,7 @@
+ 	private slots:
+ 		void         slotRecurTypeChange(int repeatType);
+ 		void         slotRecurFrequencyChange();
+-		void         slotAlarmTypeClicked(int id);
++		void         slotAlarmTypeChanged(int id);
+ 		void         slotEditDeferral();
+ 		void         slotBrowseFile();
+ 		void         slotFontColourSelected();
+@@ -124,7 +123,7 @@
+ 		bool              mRecurPageShown;           // true once the recurrence tab has been displayed
+ 		bool              mRecurSetDefaultEndDate;   // adjust default end date/time when recurrence tab is displayed
+ 
+-		QButtonGroup*     mActionGroup;
++		ButtonGroup*      mActionGroup;
+ 		RadioButton*      mMessageRadio;
+ 		RadioButton*      mCommandRadio;
+ 		RadioButton*      mFileRadio;
+Index: kalarm/kalarm.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kalarm/kalarm.desktop,v
+retrieving revision 1.138.2.2
+retrieving revision 1.138.2.4
+diff -u -r1.138.2.2 -r1.138.2.4
+--- kalarm/kalarm.desktop	31 Aug 2004 07:22:58 -0000	1.138.2.2
++++ kalarm/kalarm.desktop	29 Dec 2004 21:44:52 -0000	1.138.2.4
+@@ -8,6 +8,7 @@
+ Name[eo]=Alarmilo
+ Name[hi]=के-अलार्म
+ Name[ko]=KDE 알람
++Name[mk]=Роковник
+ Name[nso]=KAlamo
+ Name[pl]=Alarm
+ Name[sv]=Kalarm
+@@ -19,6 +20,7 @@
+ Icon=kalarm
+ DocPath=kalarm/index.html
+ GenericName=Personal Alarm Scheduler
++GenericName[ar]=مجدول المنبه الشخصي
+ GenericName[bg]=Настройки на аларма
+ GenericName[bs]=Lični alarm
+ GenericName[ca]=Planificador d'alarmes personals
+Index: kalarm/kalarm.h
+===================================================================
+RCS file: /home/kde/kdepim/kalarm/kalarm.h,v
+retrieving revision 1.47.2.4
+retrieving revision 1.47.2.5
+diff -u -r1.47.2.4 -r1.47.2.5
+--- kalarm/kalarm.h	27 Oct 2004 12:54:54 -0000	1.47.2.4
++++ kalarm/kalarm.h	30 Nov 2004 13:24:15 -0000	1.47.2.5
+@@ -26,7 +26,7 @@
+ #include <config.h>
+ #endif
+ 
+-#define KALARM_VERSION "1.1.7"
++#define KALARM_VERSION "1.1.8"
+ 
+ #include <kdeversion.h>
+ extern int  marginKDE2;   // KDE2 compatibility
+Index: kalarm/kalarm.tray.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kalarm/kalarm.tray.desktop,v
+retrieving revision 1.101.2.2
+retrieving revision 1.101.2.4
+diff -u -r1.101.2.2 -r1.101.2.4
+--- kalarm/kalarm.tray.desktop	31 Aug 2004 07:22:58 -0000	1.101.2.2
++++ kalarm/kalarm.tray.desktop	29 Dec 2004 21:44:52 -0000	1.101.2.4
+@@ -8,6 +8,7 @@
+ Name[eo]=Alarmilo
+ Name[hi]=के-अलार्म
+ Name[ko]=KDE 알람
++Name[mk]=Роковник
+ Name[nso]=KAlamo
+ Name[pl]=Alarm
+ Name[sv]=Kalarm
+@@ -19,6 +20,7 @@
+ Type=Application
+ DocPath=kalarm/index.html
+ Comment=Personal Alarm Scheduler: start as system tray icon
++Comment[ar]=شغل المنبه الشخصي : شغل كأيقونية في علبة النظام
+ Comment[bg]=Аларма: стартиране като икона в системния панел
+ Comment[bs]=Lični alarm: pokreni kao ikonu u panelu
+ Comment[ca]=Planificador d'alarma personal; s'inicia com a una icona a la safata del sistema
+Index: kalarm/prefdlg.cpp
+===================================================================
+RCS file: /home/kde/kdepim/kalarm/prefdlg.cpp,v
+retrieving revision 1.44.2.1
+retrieving revision 1.44.2.2
+diff -u -r1.44.2.1 -r1.44.2.2
+--- kalarm/prefdlg.cpp	27 Nov 2004 12:30:33 -0000	1.44.2.1
++++ kalarm/prefdlg.cpp	5 Dec 2004 18:36:11 -0000	1.44.2.2
+@@ -189,6 +189,9 @@
+ MiscPrefTab::MiscPrefTab(QVBox* frame)
+ 	: PrefsTabBase(frame)
+ {
++	// Get alignment to use in QGridLayout (AlignAuto doesn't work correctly there)
++	int alignment = QApplication::reverseLayout() ? Qt::AlignRight : Qt::AlignLeft;
++
+ 	QGroupBox* group = new QButtonGroup(i18n("Run Mode"), mPage, "modeGroup");
+ 	QGridLayout* grid = new QGridLayout(group, 6, 3, marginKDE2 + KDialog::marginHint(), KDialog::spacingHint());
+ 	grid->setColStretch(2, 1);
+@@ -207,14 +210,14 @@
+ 	           "1. With this option selected, closing the system tray icon will quit %2.\n"
+ 	           "2. You do not need to select this option in order for alarms to be displayed, since alarm monitoring is done by the alarm daemon. Running in the system tray simply provides easy access and a status indication.")
+ 	           .arg(kapp->aboutData()->programName()).arg(kapp->aboutData()->programName()));
+-	grid->addMultiCellWidget(mRunInSystemTray, row, row, 0, 2, AlignLeft);
++	grid->addMultiCellWidget(mRunInSystemTray, row, row, 0, 2, alignment);
+ 	++row;
+ 
+ 	mAutostartTrayIcon1 = new QCheckBox(i18n("Autostart at &login"), group, "autoTray");
+ 	mAutostartTrayIcon1->setFixedSize(mAutostartTrayIcon1->sizeHint());
+ 	QWhatsThis::add(mAutostartTrayIcon1,
+ 	      i18n("Check to run %1 whenever you start KDE.").arg(kapp->aboutData()->programName()));
+-	grid->addMultiCellWidget(mAutostartTrayIcon1, row, row, 1, 2, AlignLeft);
++	grid->addMultiCellWidget(mAutostartTrayIcon1, row, row, 1, 2, alignment);
+ 	++row;
+ 
+ 	mDisableAlarmsIfStopped = new QCheckBox(i18n("Disa&ble alarms while not running"), group, "disableAl");
+@@ -222,14 +225,14 @@
+ 	connect(mDisableAlarmsIfStopped, SIGNAL(toggled(bool)), SLOT(slotDisableIfStoppedToggled(bool)));
+ 	QWhatsThis::add(mDisableAlarmsIfStopped,
+ 	      i18n("Check to disable alarms whenever %1 is not running. Alarms will only appear while the system tray icon is visible.").arg(kapp->aboutData()->programName()));
+-	grid->addMultiCellWidget(mDisableAlarmsIfStopped, row, row, 1, 2, AlignLeft);
++	grid->addMultiCellWidget(mDisableAlarmsIfStopped, row, row, 1, 2, alignment);
+ 	++row;
+ 
+ 	mQuitWarn = new QCheckBox(i18n("Warn before &quitting"), group, "disableAl");
+ 	mQuitWarn->setFixedSize(mQuitWarn->sizeHint());
+ 	QWhatsThis::add(mQuitWarn,
+ 	      i18n("Check to display a warning prompt before quitting %1.").arg(kapp->aboutData()->programName()));
+-	grid->addWidget(mQuitWarn, row, 2, AlignLeft);
++	grid->addWidget(mQuitWarn, row, 2, alignment);
+ 	++row;
+ 
+ 	// Run-on-demand radio button has an ID of 3
+@@ -242,14 +245,14 @@
+ 	           "1. Alarms are displayed even when %2 is not running, since alarm monitoring is done by the alarm daemon.\n"
+ 	           "2. With this option selected, the system tray icon can be displayed or hidden independently of %3.")
+ 	           .arg(kapp->aboutData()->programName()).arg(kapp->aboutData()->programName()).arg(kapp->aboutData()->programName()));
+-	grid->addMultiCellWidget(mRunOnDemand, row, row, 0, 2, AlignLeft);
++	grid->addMultiCellWidget(mRunOnDemand, row, row, 0, 2, alignment);
+ 	++row;
+ 
+ 	mAutostartTrayIcon2 = new QCheckBox(i18n("Autostart system tray &icon at login"), group, "autoRun");
+ 	mAutostartTrayIcon2->setFixedSize(mAutostartTrayIcon2->sizeHint());
+ 	QWhatsThis::add(mAutostartTrayIcon2,
+ 	      i18n("Check to display the system tray icon whenever you start KDE."));
+-	grid->addMultiCellWidget(mAutostartTrayIcon2, row, row, 1, 2, AlignLeft);
++	grid->addMultiCellWidget(mAutostartTrayIcon2, row, row, 1, 2, alignment);
+ 	group->setFixedHeight(group->sizeHint().height());
+ 
+ 	QHBox* itemBox = new QHBox(mPage);
+@@ -307,7 +310,7 @@
+ 	connect(mKeepExpired, SIGNAL(toggled(bool)), SLOT(slotExpiredToggled(bool)));
+ 	QWhatsThis::add(mKeepExpired,
+ 	      i18n("Check to store alarms after expiry or deletion (except deleted alarms which were never triggered)."));
+-	grid->addMultiCellWidget(mKeepExpired, 1, 1, 0, 1, AlignLeft);
++	grid->addMultiCellWidget(mKeepExpired, 1, 1, 0, 1, AlignAuto);
+ 
+ 	box = new QHBox(group);
+ 	box->setSpacing(KDialog::spacingHint());
+@@ -323,14 +326,14 @@
+ 	mPurgeAfterLabel->setBuddy(mPurgeAfter);
+ 	QWhatsThis::add(box,
+ 	      i18n("Uncheck to store expired alarms indefinitely. Check to enter how long expired alarms should be stored."));
+-	grid->addWidget(box, 2, 1, AlignLeft);
++	grid->addWidget(box, 2, 1, AlignAuto);
+ 
+ 	mClearExpired = new QPushButton(i18n("Clear Expired Alar&ms"), group);
+ 	mClearExpired->setMinimumSize(mClearExpired->sizeHint());
+ 	connect(mClearExpired, SIGNAL(clicked()), SLOT(slotClearExpired()));
+ 	QWhatsThis::add(mClearExpired,
+ 	      i18n("Delete all existing expired alarms."));
+-	grid->addWidget(mClearExpired, 3, 1, AlignLeft);
++	grid->addWidget(mClearExpired, 3, 1, AlignAuto);
+ 	group->setFixedHeight(group->sizeHint().height());
+ 
+ 	mPage->setStretchFactor(new QWidget(mPage), 1);    // top adjust the widgets
+@@ -477,7 +480,7 @@
+ 	connect(mEmailUseControlCentre, SIGNAL(toggled(bool)), SLOT(slotEmailUseCCToggled(bool)));
+ 	QWhatsThis::add(mEmailUseControlCentre,
+ 	      i18n("Check to use the email address set in the KDE Control Center, to identify you as the sender when sending email alarms."));
+-	grid->addWidget(mEmailUseControlCentre, 2, 1, AlignLeft);
++	grid->addWidget(mEmailUseControlCentre, 2, 1, AlignAuto);
+ 
+ 	label = new QLabel(i18n("'Bcc' email address", "&Bcc:"), group);
+ 	label->setFixedSize(label->sizeHint());
+@@ -497,7 +500,7 @@
+ 	connect(mEmailBccUseControlCentre, SIGNAL(toggled(bool)), SLOT(slotEmailBccUseCCToggled(bool)));
+ 	QWhatsThis::add(mEmailBccUseControlCentre,
+ 	      i18n("Check to use the email address set in the KDE Control Center, for blind copying email alarms to yourself."));
+-	grid->addWidget(mEmailBccUseControlCentre, 4, 1, AlignLeft);
++	grid->addWidget(mEmailBccUseControlCentre, 4, 1, AlignAuto);
+ 
+ 	group->setFixedHeight(group->sizeHint().height());
+ 
+@@ -693,13 +696,13 @@
+ 	mDefaultSound = new QCheckBox(SoundPicker::i18n_s_Sound(), group, "defSound");
+ 	mDefaultSound->setMinimumSize(mDefaultSound->sizeHint());
+ 	QWhatsThis::add(mDefaultSound, defsetting.arg(SoundPicker::i18n_Sound()));
+-	grid->addMultiCellWidget(mDefaultSound, 1, 1, 0, 2, AlignLeft);
++	grid->addMultiCellWidget(mDefaultSound, 1, 1, 0, 2, AlignAuto);
+ 
+ 	mDefaultBeep = new QCheckBox(i18n("&Beep"), group, "defBeep");
+ 	mDefaultBeep->setMinimumSize(mDefaultBeep->sizeHint());
+ 	QWhatsThis::add(mDefaultBeep,
+ 	      i18n("Check to select Beep as the default setting for \"%1\" in the alarm edit dialog.").arg(SoundPicker::i18n_Sound()));
+-	grid->addMultiCellWidget(mDefaultBeep, 2, 2, 1, 2, AlignLeft);
++	grid->addMultiCellWidget(mDefaultBeep, 2, 2, 1, 2, AlignAuto);
+ 
+ 	box = new QHBox(group);   // this is to control the QWhatsThis text display area
+ 	box->setSpacing(KDialog::spacingHint());
+@@ -720,7 +723,7 @@
+ 	mDefaultSoundRepeat = new QCheckBox(i18n("Re&peat sound file"), group, "defRepeatSound");
+ 	mDefaultSoundRepeat->setMinimumSize(mDefaultSoundRepeat->sizeHint());
+ 	QWhatsThis::add(mDefaultSoundRepeat, i18n("sound file \"Repeat\" checkbox", "The default setting for sound file \"%1\" in the alarm edit dialog.").arg(SoundPicker::i18n_Repeat()));
+-	grid->addWidget(mDefaultSoundRepeat, 4, 2, AlignLeft);
++	grid->addWidget(mDefaultSoundRepeat, 4, 2, AlignAuto);
+ #ifdef WITHOUT_ARTS
+ 	mDefaultSoundRepeat->hide();
+ #endif
+@@ -864,14 +867,14 @@
+ 	connect(mListShowTime, SIGNAL(toggled(bool)), SLOT(slotListTimeToggled(bool)));
+ 	QWhatsThis::add(mListShowTime,
+ 	      i18n("Specify whether to show in the alarm list, the time at which each alarm is due"));
+-	layout->addWidget(mListShowTime, 0, Qt::AlignLeft);
++	layout->addWidget(mListShowTime, 0, Qt::AlignAuto);
+ 
+ 	mListShowTimeTo = new QCheckBox(KAlarmMainWindow::i18n_n_ShowTimeToAlarms(), group, "listTimeTo");
+ 	mListShowTimeTo->setMinimumSize(mListShowTimeTo->sizeHint());
+ 	connect(mListShowTimeTo, SIGNAL(toggled(bool)), SLOT(slotListTimeToToggled(bool)));
+ 	QWhatsThis::add(mListShowTimeTo,
+ 	      i18n("Specify whether to show in the alarm list, how long until each alarm is due"));
+-	layout->addWidget(mListShowTimeTo, 0, Qt::AlignLeft);
++	layout->addWidget(mListShowTimeTo, 0, Qt::AlignAuto);
+ 	group->setMaximumHeight(group->sizeHint().height());
+ 
+ 	group = new QGroupBox(i18n("System Tray Tooltip"), mPage);
+@@ -886,7 +889,7 @@
+ 	connect(mTooltipShowAlarms, SIGNAL(toggled(bool)), SLOT(slotTooltipAlarmsToggled(bool)));
+ 	QWhatsThis::add(mTooltipShowAlarms,
+ 	      i18n("Specify whether to include in the system tray tooltip, a summary of alarms due in the next 24 hours"));
+-	grid->addMultiCellWidget(mTooltipShowAlarms, 1, 1, 0, 2, AlignLeft);
++	grid->addMultiCellWidget(mTooltipShowAlarms, 1, 1, 0, 2, AlignAuto);
+ 
+ 	QHBox* box = new QHBox(group);
+ 	box->setSpacing(KDialog::spacingHint());
+@@ -899,21 +902,21 @@
+ 	QWhatsThis::add(box,
+ 	      i18n("Uncheck to display all of the next 24 hours' alarms in the system tray tooltip. "
+ 	           "Check to enter an upper limit on the number to be displayed."));
+-	grid->addMultiCellWidget(box, 2, 2, 1, 2, AlignLeft);
++	grid->addMultiCellWidget(box, 2, 2, 1, 2, AlignAuto);
+ 
+ 	mTooltipShowTime = new QCheckBox(KAlarmMainWindow::i18n_m_ShowAlarmTimes(), group, "tooltipTime");
+ 	mTooltipShowTime->setMinimumSize(mTooltipShowTime->sizeHint());
+ 	connect(mTooltipShowTime, SIGNAL(toggled(bool)), SLOT(slotTooltipTimeToggled(bool)));
+ 	QWhatsThis::add(mTooltipShowTime,
+ 	      i18n("Specify whether to show in the system tray tooltip, the time at which each alarm is due"));
+-	grid->addMultiCellWidget(mTooltipShowTime, 3, 3, 1, 2, AlignLeft);
++	grid->addMultiCellWidget(mTooltipShowTime, 3, 3, 1, 2, AlignAuto);
+ 
+ 	mTooltipShowTimeTo = new QCheckBox(KAlarmMainWindow::i18n_l_ShowTimeToAlarms(), group, "tooltipTimeTo");
+ 	mTooltipShowTimeTo->setMinimumSize(mTooltipShowTimeTo->sizeHint());
+ 	connect(mTooltipShowTimeTo, SIGNAL(toggled(bool)), SLOT(slotTooltipTimeToToggled(bool)));
+ 	QWhatsThis::add(mTooltipShowTimeTo,
+ 	      i18n("Specify whether to show in the system tray tooltip, how long until each alarm is due"));
+-	grid->addMultiCellWidget(mTooltipShowTimeTo, 4, 4, 1, 2, AlignLeft);
++	grid->addMultiCellWidget(mTooltipShowTimeTo, 4, 4, 1, 2, AlignAuto);
+ 
+ 	box = new QHBox(group);   // this is to control the QWhatsThis text display area
+ 	box->setSpacing(KDialog::spacingHint());
+@@ -924,7 +927,7 @@
+ 	QWhatsThis::add(box,
+ 	      i18n("Enter the text to be displayed in front of the time until the alarm, in the system tray tooltip"));
+ 	box->setFixedHeight(box->sizeHint().height());
+-	grid->addWidget(box, 5, 2, AlignLeft);
++	grid->addWidget(box, 5, 2, AlignAuto);
+ 	group->setMaximumHeight(group->sizeHint().height());
+ 
+ 	mModalMessages = new QCheckBox(i18n("Message &windows have a title bar and take keyboard focus"), mPage, "modalMsg");
+@@ -1005,7 +1008,7 @@
+ void ViewPrefTab::setList(bool time, bool timeTo)
+ {
+ 	if (!timeTo)
+-		time = true;    // ensure that at least one option is ticked
++		time = true;    // ensure that at least one time option is ticked
+ 	mIgnoreToggle = true;
+ 	mListShowTime->setChecked(time);
+ 	mListShowTimeTo->setChecked(timeTo);
+Index: kalarm/recurrenceedit.cpp
+===================================================================
+RCS file: /home/kde/kdepim/kalarm/recurrenceedit.cpp,v
+retrieving revision 1.73.2.3
+retrieving revision 1.73.2.4
+diff -u -r1.73.2.3 -r1.73.2.4
+--- kalarm/recurrenceedit.cpp	23 Aug 2004 02:05:36 -0000	1.73.2.3
++++ kalarm/recurrenceedit.cpp	5 Dec 2004 18:03:41 -0000	1.73.2.4
+@@ -223,7 +223,7 @@
+ 	mNoEndDateButton->setFixedSize(mNoEndDateButton->sizeHint());
+ 	mNoEndDateButton->setReadOnly(mReadOnly);
+ 	QWhatsThis::add(mNoEndDateButton, i18n("Repeat the alarm indefinitely"));
+-	vlayout->addWidget(mNoEndDateButton, 1, Qt::AlignLeft);
++	vlayout->addWidget(mNoEndDateButton, 1, Qt::AlignAuto);
+ 	QSize size = mNoEndDateButton->size();
+ 
+ 	layout = new QHBoxLayout(vlayout, KDialog::spacingHint());
+@@ -416,12 +416,12 @@
+ 		mWeekRuleDayBox[i] = new CheckBox(calendar->weekDayName(day), box);
+ 		mWeekRuleDayBox[i]->setFixedSize(mWeekRuleDayBox[i]->sizeHint());
+ 		mWeekRuleDayBox[i]->setReadOnly(mReadOnly);
+-		dgrid->addWidget(mWeekRuleDayBox[i], i%4, i/4, Qt::AlignLeft);
++		dgrid->addWidget(mWeekRuleDayBox[i], i%4, i/4, Qt::AlignAuto);
+ 	}
+ 	box->setFixedSize(box->sizeHint());
+ 	QWhatsThis::add(box,
+ 	      i18n("Select the days of the week on which to repeat the alarm"));
+-	grid->addWidget(box, 0, 2, Qt::AlignLeft);
++	grid->addWidget(box, 0, 2, Qt::AlignAuto);
+ 	label->setBuddy(mWeekRuleDayBox[0]);
+ 	grid->setColStretch(3, 1);
+ }
+@@ -488,7 +488,7 @@
+ 	grid->addRowSpacing(0, KDialog::marginHint());
+ 	QLabel* label = new QLabel(i18n("first week of January", "of:"), mYearRuleButtonGroup);
+ 	label->setFixedSize(label->sizeHint());
+-	grid->addWidget(label, 1, 0, Qt::AlignLeft | Qt::AlignTop);
++	grid->addWidget(label, 1, 0, Qt::AlignAuto | Qt::AlignTop);
+ 	grid->addColSpacing(1, KDialog::spacingHint());
+ 
+ 	// List the months of the year.
+@@ -500,12 +500,12 @@
+ 		mYearRuleMonthBox[i] = new CheckBox(calendar->monthName(i + 1, 2000), box);
+ 		mYearRuleMonthBox[i]->setFixedSize(mYearRuleMonthBox[i]->sizeHint());
+ 		mYearRuleMonthBox[i]->setReadOnly(mReadOnly);
+-		mgrid->addWidget(mYearRuleMonthBox[i], i%4, i/4, Qt::AlignLeft);
++		mgrid->addWidget(mYearRuleMonthBox[i], i%4, i/4, Qt::AlignAuto);
+ 	}
+ 	box->setFixedSize(box->sizeHint());
+ 	QWhatsThis::add(box,
+ 	      i18n("Select the months of the year in which to repeat the alarm"));
+-	grid->addWidget(box, 1, 2, Qt::AlignLeft);
++	grid->addWidget(box, 1, 2, Qt::AlignAuto);
+ 	grid->setColStretch(2, 1);
+ 
+ /*	layout = new QHBoxLayout(groupLayout, KDialog::spacingHint());
+Index: kalarm/specialactions.cpp
+===================================================================
+RCS file: /home/kde/kdepim/kalarm/specialactions.cpp,v
+retrieving revision 1.3
+retrieving revision 1.3.2.1
+diff -u -r1.3 -r1.3.2.1
+--- kalarm/specialactions.cpp	24 Jul 2004 14:00:01 -0000	1.3
++++ kalarm/specialactions.cpp	5 Dec 2004 18:03:41 -0000	1.3.2.1
+@@ -157,7 +157,7 @@
+ 	// Pre-alarm action
+ 	QLabel* label = new QLabel(i18n("Pre-a&larm action:"), this);
+ 	label->setFixedSize(label->sizeHint());
+-	topLayout->addWidget(label, 0, Qt::AlignLeft);
++	topLayout->addWidget(label, 0, Qt::AlignAuto);
+ 
+ 	mPreAction = new KLineEdit(this);
+ 	label->setBuddy(mPreAction);
+@@ -171,7 +171,7 @@
+ 	// Post-alarm action
+ 	label = new QLabel(i18n("Post-alar&m action:"), this);
+ 	label->setFixedSize(label->sizeHint());
+-	topLayout->addWidget(label, 0, Qt::AlignLeft);
++	topLayout->addWidget(label, 0, Qt::AlignAuto);
+ 
+ 	mPostAction = new KLineEdit(this);
+ 	label->setBuddy(mPostAction);
+Index: kalarm/widgets/spinbox.cpp
+===================================================================
+RCS file: /home/kde/kdepim/kalarm/widgets/spinbox.cpp,v
+retrieving revision 1.6
+retrieving revision 1.6.2.1
+diff -u -r1.6 -r1.6.2.1
+--- kalarm/widgets/spinbox.cpp	9 Mar 2004 13:01:26 -0000	1.6
++++ kalarm/widgets/spinbox.cpp	30 Nov 2004 13:24:15 -0000	1.6.2.1
+@@ -16,16 +16,6 @@
+  *  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.
+- *
+- *  In addition, as a special exception, the copyright holders give permission
+- *  to link the code of this program with any edition of the Qt library by
+- *  Trolltech AS, Norway (or with modified versions of Qt that use the same
+- *  license as Qt), and distribute linked combinations including the two.
+- *  You must obey the GNU General Public License in all respects for all of
+- *  the code used other than Qt.  If you modify this file, you may extend
+- *  this exception to your version of the file, but you are not obligated to
+- *  do so. If you do not wish to do so, delete this exception statement from
+- *  your version.
+  */
+ 
+ #include <kdeversion.h>
+@@ -35,7 +25,9 @@
+ 
+ 
+ SpinBox::SpinBox(QWidget* parent, const char* name)
+-	: QSpinBox(parent, name)
++	: QSpinBox(0, 99999, 1, parent, name),
++	  mMinValue(QSpinBox::minValue()),
++	  mMaxValue(QSpinBox::maxValue())
+ {
+ 	init();
+ }
+Index: kalarm/widgets/spinbox2.cpp
+===================================================================
+RCS file: /home/kde/kdepim/kalarm/widgets/spinbox2.cpp,v
+retrieving revision 1.6.6.1
+retrieving revision 1.6.6.3
+diff -u -r1.6.6.1 -r1.6.6.3
+--- kalarm/widgets/spinbox2.cpp	21 Aug 2004 18:11:20 -0000	1.6.6.1
++++ kalarm/widgets/spinbox2.cpp	16 Jan 2005 00:01:13 -0000	1.6.6.3
+@@ -1,7 +1,7 @@
+ /*
+- *  spinbox2.cpp  -  spin box with extra pair of spin buttons (for QT3)
++ *  spinbox2.cpp  -  spin box with extra pair of spin buttons (for Qt 3)
+  *  Program:  kalarm
+- *  (C) 2001, 2002 by David Jarvie  software@astrojar.org.uk
++ *  (C) 2001, 2002, 2004 by David Jarvie <software@astrojar.org.uk>
+  *
+  *  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
+@@ -25,9 +25,11 @@
+ 
+ #include <qstyle.h>
+ #include <qobjectlist.h>
++#include <qapplication.h>
+ 
+ #include "spinbox2.moc"
+ 
++int SpinBox2::mReverseLayout = -1;
+ 
+ SpinBox2::SpinBox2(QWidget* parent, const char* name)
+ 	: QFrame(parent, name)
+@@ -39,7 +41,6 @@
+ 	init();
+ }
+ 
+-
+ SpinBox2::SpinBox2(int minValue, int maxValue, int step, int step2, QWidget* parent, const char* name)
+ 	: QFrame(parent, name),
+ 	  mMinValue(minValue),
+@@ -55,6 +56,8 @@
+ 
+ void SpinBox2::init()
+ {
++	if (mReverseLayout < 0)
++		mReverseLayout = QApplication::reverseLayout() ? 1 : 0;
+ 	spinbox->setSelectOnStep(false);    // default
+ 	updown2->setSelectOnStep(false);    // always false
+ 	setFocusProxy(spinbox);
+@@ -112,9 +115,6 @@
+ 
+ void SpinBox2::stepPage(int step)
+ {
+-//	bool focus = spinbox->selectOnStep() && updown2->hasFocus();
+-//	if (focus)
+-//		spinbox->setFocus();    // make displayed text be selected, as for stepping with the spinbox buttons
+ 	if (abs(step) == updown2->lineStep())
+ 		spinbox->setValue(updown2->value());
+ 	else
+@@ -129,8 +129,6 @@
+ 	bool focus = spinbox->selectOnStep() && updown2->hasFocus();
+ 	if (focus)
+ 		spinbox->selectAll();
+-//	if (focus)
+-//		updown2->setFocus();
+ }
+ 
+ // Called when the widget is about to be displayed.
+@@ -166,16 +164,22 @@
+ 	spinbox->setGeometry(-xSpinbox, 0, spinboxFrame->width() + xSpinbox, height());
+ }
+ 
++/******************************************************************************
++* Calculate the width and position of the extra pair of spin buttons.
++* Style-specific adjustments are made for a better appearance.
++*/
+ void SpinBox2::getMetrics() const
+ {
+ 	QRect rect = updown2->style().querySubControlMetrics(QStyle::CC_SpinWidget, updown2, QStyle::SC_SpinWidgetButtonField);
+-	xUpdown2 = rect.left();
+-	wUpdown2 = updown2->width() - xUpdown2;
++	if (style().inherits("PlastikStyle"))
++		rect.setLeft(rect.left() - 1);    // Plastik excludes left border from spin widget rectangle
++	xUpdown2 = mReverseLayout ? 0 : rect.left();
++	wUpdown2 = updown2->width() - rect.left();
+ 	xSpinbox = spinbox->style().querySubControlMetrics(QStyle::CC_SpinWidget, spinbox, QStyle::SC_SpinWidgetEditField).left();
+ 	wGap = 0;
+ 
+ 	// Make style-specific adjustments for a better appearance
+-	if (style().isA("QMotifPlusStyle"))
++	if (style().inherits("QMotifPlusStyle"))
+ 	{
+ 		xSpinbox = 0;      // show the edit control left border
+ 		wGap = 2;          // leave a space to the right of the left-hand pair of spin buttons
+Index: kalarm/widgets/spinbox2.h
+===================================================================
+RCS file: /home/kde/kdepim/kalarm/widgets/spinbox2.h,v
+retrieving revision 1.4
+retrieving revision 1.4.6.1
+diff -u -r1.4 -r1.4.6.1
+--- kalarm/widgets/spinbox2.h	10 Dec 2003 19:39:10 -0000	1.4
++++ kalarm/widgets/spinbox2.h	30 Nov 2004 19:54:51 -0000	1.4.6.1
+@@ -144,10 +144,11 @@
+ 
+ 		enum { NO_BUTTON = -1, UP, DOWN, UP2, DOWN2 };
+ 
++		static int       mReverseLayout;  // widgets are mirrored right to left
+ 		QFrame*          updown2Frame;
+ 		QFrame*          spinboxFrame;
+-		SpinBox*         updown2;
+-		SB2_SpinBox*     spinbox;
++		SpinBox*         updown2;         // the extra pair of spin buttons
++		SB2_SpinBox*     spinbox;         // the visible spin box
+ 		int              mMinValue;
+ 		int              mMaxValue;
+ 
+Index: kalarmd/kalarmd.autostart.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kalarmd/Attic/kalarmd.autostart.desktop,v
+retrieving revision 1.92.2.4
+retrieving revision 1.92.2.7
+diff -u -r1.92.2.4 -r1.92.2.7
+--- kalarmd/kalarmd.autostart.desktop	28 Nov 2004 08:33:55 -0000	1.92.2.4
++++ kalarmd/kalarmd.autostart.desktop	5 Jan 2005 07:50:29 -0000	1.92.2.7
+@@ -3,7 +3,7 @@
+ Encoding=UTF-8
+ Name=Alarm Daemon
+ Name[af]=Alarm Bediener
+-Name[ar]=مراقب Alarm
++Name[ar]=مراقب KAlarm
+ Name[bg]=Демон на алармата
+ Name[br]=Diaoul Alarm
+ Name[bs]=Alarm demon
+@@ -27,6 +27,7 @@
+ Name[ja]=アラームデーモン
+ Name[lt]=Aliarmų tarnyba
+ Name[lv]=Trauksmes Dēmons
++Name[mk]=Роковник демон
+ Name[ms]=Daemon Jam Loceng
+ Name[mt]=Programm tal-allarmi
+ Name[nb]=Alarmnisse
+@@ -57,7 +58,7 @@
+ Type=Application
+ Comment=KOrganizer/KAlarm alarm daemon autostart at login
+ Comment[af]=Korganizer/K-alarm alarm bediener outomatiese begin na aanteken
+-Comment[ar]=مراقب تنبيهات KOrganizer/KAlarm يبدؤون آليا عند بدء التشغيل
++Comment[ar]=تشغيل مراقب منبه KAlarm آليا عند تسجيل الدخول
+ Comment[az]=KOrganizer/KAlarm alarm demonunun başlanğıcda avtomatik dövrəyə girməsi
+ Comment[bg]=Автоматично стартиране на демона на алармата за KOrganizer/KAlarm при включване в системата
+ Comment[bs]=Automatsko pokretanje KOrganizer/KAlarm alarm demona prilikom prijave
+@@ -82,6 +83,7 @@
+ Comment[ja]=ログイン時の KOrganizer/KAlarm アラームデーモンの自動起動
+ Comment[lt]=KOrganizer/KAlarm aliarmų tarnybos automatinis paleidimas prisiregistruojant
+ Comment[lv]=KOrganizer/KAlarm trauksmes dēmona autostarts pie pieteikšanās
++Comment[mk]=Стартувај Организатор/Роковник демон на најавување
+ Comment[mt]=Ħaddem il-programm tal-allarmi malli tidħol
+ Comment[nb]=KOrganizer/KAlarm-alarmnisse autostarter ved innlogging
+ Comment[nl]=KOrganizer/Kalarm alarmdaemon automatisch starten bij login
+Index: kalarmd/kalarmd.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kalarmd/Attic/kalarmd.desktop,v
+retrieving revision 1.99.2.2
+retrieving revision 1.99.2.5
+diff -u -r1.99.2.2 -r1.99.2.5
+--- kalarmd/kalarmd.desktop	28 Nov 2004 08:33:55 -0000	1.99.2.2
++++ kalarmd/kalarmd.desktop	5 Jan 2005 07:50:29 -0000	1.99.2.5
+@@ -3,7 +3,7 @@
+ Encoding=UTF-8
+ Name=Alarm Daemon
+ Name[af]=Alarm Bediener
+-Name[ar]=مراقب Alarm
++Name[ar]=مراقب KAlarm
+ Name[bg]=Демон на алармата
+ Name[br]=Diaoul Alarm
+ Name[bs]=Alarm demon
+@@ -27,6 +27,7 @@
+ Name[ja]=アラームデーモン
+ Name[lt]=Aliarmų tarnyba
+ Name[lv]=Trauksmes Dēmons
++Name[mk]=Роковник демон
+ Name[ms]=Daemon Jam Loceng
+ Name[mt]=Programm tal-allarmi
+ Name[nb]=Alarmnisse
+Index: kandy/src/kandy.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kandy/src/kandy.desktop,v
+retrieving revision 1.130.2.10
+retrieving revision 1.130.2.12
+diff -u -r1.130.2.10 -r1.130.2.12
+--- kandy/src/kandy.desktop	28 Nov 2004 08:33:56 -0000	1.130.2.10
++++ kandy/src/kandy.desktop	29 Dec 2004 21:44:53 -0000	1.130.2.12
+@@ -5,6 +5,7 @@
+ Name[hi]=केंडी
+ Name[ta]=Kஅன்டி
+ Comment=Tool for syncing address book data with mobile phones
++Comment[ar]=أداة لمطابقة بيانات دفتر العناويين مع الهواتف الجوالة
+ Comment[bg]=Инструмент за синхронизиране на адресника с мобилни телефони
+ Comment[bs]=Alat za sinhroniziranje podataka između adresara i mobilnih telefona
+ Comment[ca]=Eina per sincronitzar dades de la llibreta d'adreces amb telefons mòbils
+@@ -63,6 +64,7 @@
+ GenericName[ja]=携帯電話ツール
+ GenericName[lt]=Mobilaus telefono įrankis
+ GenericName[lv]=Mobīlā Telefona Rīks
++GenericName[mk]=Алатка за мобилни телефони
+ GenericName[ms]=Alatan Fon Mudah Alih
+ GenericName[nb]=Mobiltelefonverktøy
+ GenericName[nl]=Mobiele telefoon-beheer
+Index: karm/support/karm.desktop
+===================================================================
+RCS file: /home/kde/kdepim/karm/support/karm.desktop,v
+retrieving revision 1.212.2.1
+retrieving revision 1.212.2.2
+diff -u -r1.212.2.1 -r1.212.2.2
+--- karm/support/karm.desktop	24 Aug 2004 06:31:57 -0000	1.212.2.1
++++ karm/support/karm.desktop	12 Dec 2004 08:32:45 -0000	1.212.2.2
+@@ -5,6 +5,7 @@
+ Name[ar]=كارم
+ Name[eo]=Tempomezurilo
+ Name[hi]=के-आर्म
++Name[mk]=КРака
+ Name[sv]=Karm
+ Name[ta]=Kஅம்
+ Name[xh]=KAlrm
+Index: kfile-plugins/palm-databases/kfile_palm.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kfile-plugins/palm-databases/kfile_palm.desktop,v
+retrieving revision 1.21.2.8
+retrieving revision 1.21.2.9
+diff -u -r1.21.2.8 -r1.21.2.9
+--- kfile-plugins/palm-databases/kfile_palm.desktop	28 Nov 2004 08:33:56 -0000	1.21.2.8
++++ kfile-plugins/palm-databases/kfile_palm.desktop	29 Dec 2004 21:44:54 -0000	1.21.2.9
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ Type=Service
+ Name=PalmOS Database Info
++Name[ar]=معلومات عن قاعدة بيانات خاصة بنظام تشغيل PalmOS
+ Name[be]=Інфармацыя аб базе дадзеных PalmOS
+ Name[bg]=Информация за БД за PalmOS
+ Name[bs]=Informacije o PalmOS bazi podataka
+Index: kfile-plugins/rfc822/kfile_rfc822.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kfile-plugins/rfc822/kfile_rfc822.desktop,v
+retrieving revision 1.74.2.4
+retrieving revision 1.74.2.5
+diff -u -r1.74.2.4 -r1.74.2.5
+--- kfile-plugins/rfc822/kfile_rfc822.desktop	28 Nov 2004 08:33:56 -0000	1.74.2.4
++++ kfile-plugins/rfc822/kfile_rfc822.desktop	29 Dec 2004 21:44:54 -0000	1.74.2.5
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ Type=Service
+ Name=Email Info
++Name[ar]=معلومات البريد الإلكتروني
+ Name[be]=Інфармацыя аб паведамленьні электроннай пошты
+ Name[bg]=Информация за е-поща
+ Name[ca]=Informació de correu-e
+Index: kfile-plugins/vcf/kfile_vcf.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kfile-plugins/vcf/kfile_vcf.desktop,v
+retrieving revision 1.63.2.3
+retrieving revision 1.63.2.4
+diff -u -r1.63.2.3 -r1.63.2.4
+--- kfile-plugins/vcf/kfile_vcf.desktop	28 Nov 2004 08:33:57 -0000	1.63.2.3
++++ kfile-plugins/vcf/kfile_vcf.desktop	29 Dec 2004 21:44:54 -0000	1.63.2.4
+@@ -3,6 +3,7 @@
+ Type=Service
+ Name=vCard Info
+ Name[af]=Vkaart Inligting
++Name[ar]=معلومات vCard
+ Name[be]=Інфармацыя аб vCard
+ Name[bg]=Информация за vCard
+ Name[br]=Titouroù war vCard
+Index: kioslaves/imap4/mimeheader.cc
+===================================================================
+RCS file: /home/kde/kdepim/kioslaves/imap4/mimeheader.cc,v
+retrieving revision 1.19
+retrieving revision 1.19.4.2
+diff -u -r1.19 -r1.19.4.2
+--- kioslaves/imap4/mimeheader.cc	12 Jun 2004 21:36:57 -0000	1.19
++++ kioslaves/imap4/mimeheader.cc	27 Dec 2004 18:12:16 -0000	1.19.4.2
+@@ -85,9 +85,8 @@
+     {
+       int skip;
+       char *aCStr = addLine->getValue ().data ();
+-      QDict < QString > *aList;
++      QDict < QString > *aList = 0;
+ 
+-      aList = NULL;
+       skip = mimeHdrLine::parseSeparator (';', aCStr);
+       if (skip > 0)
+       {
+@@ -164,6 +163,9 @@
+ void
+ mimeHeader::addParameter (const QCString& aParameter, QDict < QString > *aList)
+ {
++  if ( !aList )
++    return;
++
+   QString *aValue;
+   QCString aLabel;
+   int pos = aParameter.find ('=');
+Index: kitchensync/devicemimetypes/cellphone.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kitchensync/devicemimetypes/Attic/cellphone.desktop,v
+retrieving revision 1.61.2.8
+retrieving revision 1.61.2.9
+diff -u -r1.61.2.8 -r1.61.2.9
+--- kitchensync/devicemimetypes/cellphone.desktop	28 Nov 2004 08:33:57 -0000	1.61.2.8
++++ kitchensync/devicemimetypes/cellphone.desktop	5 Jan 2005 07:50:29 -0000	1.61.2.9
+@@ -4,6 +4,7 @@
+ Type=MimeType
+ MimeType=kdedevice/cellphone
+ Comment=Connected Cellular Phone
++Comment[ar]=هاتف خليوي متصل
+ Comment[bg]=Връзка с мобилен телефон
+ Comment[bs]=Spojen mobilni telefon
+ Comment[ca]=Telèfon mòbil connectat
+Index: kitchensync/devicemimetypes/pda.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kitchensync/devicemimetypes/Attic/pda.desktop,v
+retrieving revision 1.46.2.2
+retrieving revision 1.46.2.4
+diff -u -r1.46.2.2 -r1.46.2.4
+--- kitchensync/devicemimetypes/pda.desktop	28 Nov 2004 08:33:57 -0000	1.46.2.2
++++ kitchensync/devicemimetypes/pda.desktop	29 Dec 2004 21:44:54 -0000	1.46.2.4
+@@ -4,6 +4,7 @@
+ Type=MimeType
+ MimeType=kdedevice/pda
+ Comment=Connected PDA
++Comment[ar]=PDA متصل
+ Comment[bg]=Връзка с PDA
+ Comment[bs]=Spojen PDA
+ Comment[ca]=PDA connectat
+@@ -25,6 +26,7 @@
+ Comment[it]=PDA connesso
+ Comment[ja]=PDA に接続しました
+ Comment[lt]=Prisijungtas PDA
++Comment[mk]=Поврзан е PDA
+ Comment[ms]=PDA Disambung
+ Comment[mt]=PDA imqabbad
+ Comment[nb]=Tilkoblet PDA
+Index: kitchensync/kitchensync/backup/backup.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kitchensync/kitchensync/backup/backup.desktop,v
+retrieving revision 1.32.2.2
+retrieving revision 1.32.2.3
+diff -u -r1.32.2.2 -r1.32.2.3
+--- kitchensync/kitchensync/backup/backup.desktop	28 Nov 2004 08:33:57 -0000	1.32.2.2
++++ kitchensync/kitchensync/backup/backup.desktop	29 Dec 2004 21:44:55 -0000	1.32.2.3
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Type=Service
+ Name=Konnector Backup
++Name[ar]= نسخة إحتياطية من Konnector
+ Name[bs]=Konnector backup
+ Name[ca]=Còpia de seguretat Konnector
+ Name[cs]=Záloha Konektoru
+Index: kitchensync/kitchensync/backup/restore.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kitchensync/kitchensync/backup/restore.desktop,v
+retrieving revision 1.18.2.8
+retrieving revision 1.18.2.9
+diff -u -r1.18.2.8 -r1.18.2.9
+--- kitchensync/kitchensync/backup/restore.desktop	13 Nov 2004 07:20:50 -0000	1.18.2.8
++++ kitchensync/kitchensync/backup/restore.desktop	29 Dec 2004 21:44:55 -0000	1.18.2.9
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Type=Service
+ Name=Konnector Restore
++Name[ar]=استعادة Konnector
+ Name[bs]=Konnector osvježi
+ Name[ca]=Recuperació de còpia de seguretat Konnector
+ Name[da]=Konnector genopret
+Index: kitchensync/kitchensync/debugger/debugger.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kitchensync/kitchensync/debugger/debugger.desktop,v
+retrieving revision 1.34.2.2
+retrieving revision 1.34.2.3
+diff -u -r1.34.2.2 -r1.34.2.3
+--- kitchensync/kitchensync/debugger/debugger.desktop	28 Nov 2004 08:33:57 -0000	1.34.2.2
++++ kitchensync/kitchensync/debugger/debugger.desktop	29 Dec 2004 21:44:55 -0000	1.34.2.3
+@@ -1,6 +1,8 @@
+ [Desktop Entry]
+ Type=Service
+ Name=Konnector Debugger
++Name[ar]=مصحح Konnector
++Name[br]=Dizraener Konnector
+ Name[bs]=Konnector debugger
+ Name[ca]=Depurador Konnector
+ Name[cs]=Ladění Konektoru
+Index: kitchensync/kitchensync/fileview/fileview.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kitchensync/kitchensync/fileview/fileview.desktop,v
+retrieving revision 1.41.2.3
+retrieving revision 1.41.2.5
+diff -u -r1.41.2.3 -r1.41.2.5
+--- kitchensync/kitchensync/fileview/fileview.desktop	28 Nov 2004 08:33:58 -0000	1.41.2.3
++++ kitchensync/kitchensync/fileview/fileview.desktop	29 Dec 2004 21:44:55 -0000	1.41.2.5
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Type=Service
+ Name=FileviewPart
++Name[ar]=حزء عرض الملف
+ Name[ca]=Part del visor de fitxers
+ Name[eo]=Dosierantaŭrigardo-parto
+ Name[es]=Parte de vista de archivo
+@@ -10,6 +11,7 @@
+ Name[is]=Skráarsýnar-íforrit
+ Name[ja]=ファイルプレビューパート
+ Name[lt]=Bylų peržiūros dalis
++Name[mk]=Разгледување датотеки
+ Name[nb]=Filforhåndsvisning
+ Name[nl]=Bestandsvoorbeeld-part
+ Name[nn]=Filvisingsdel
+Index: kitchensync/kitchensync/lib/kitchensync.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kitchensync/kitchensync/lib/kitchensync.desktop,v
+retrieving revision 1.40.2.2
+retrieving revision 1.40.2.4
+diff -u -r1.40.2.2 -r1.40.2.4
+--- kitchensync/kitchensync/lib/kitchensync.desktop	24 Oct 2004 07:05:56 -0000	1.40.2.2
++++ kitchensync/kitchensync/lib/kitchensync.desktop	29 Dec 2004 21:44:56 -0000	1.40.2.4
+@@ -2,6 +2,7 @@
+ Type=ServiceType
+ X-KDE-ServiceType=KitchenSync/ActionPart
+ Name=KitchenSync Manipulator
++Name[ar]=مشغل KitchenSync
+ Name[ca]=Manipulador KitchenSync
+ Name[cs]=KitchenSync manipulátor
+ Name[cy]=Trinydd KitchenSync
+@@ -18,6 +19,7 @@
+ Name[is]=Ruslakvörn
+ Name[it]=Manipolatore KitchenSync
+ Name[ja]=KitchenSync マニピュレータ
++Name[mk]=Kitchensynk манипулатор
+ Name[ms]=Manipulasi KitchenSync
+ Name[nb]=Allsynkroniseringsbehandler
+ Name[nl]=KitchenSync-manipulatieprogramma
+Index: kitchensync/kitchensync/organizer/organizer.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kitchensync/kitchensync/organizer/Attic/organizer.desktop,v
+retrieving revision 1.45.2.3
+retrieving revision 1.45.2.5
+diff -u -r1.45.2.3 -r1.45.2.5
+--- kitchensync/kitchensync/organizer/organizer.desktop	28 Nov 2004 08:33:58 -0000	1.45.2.3
++++ kitchensync/kitchensync/organizer/organizer.desktop	5 Jan 2005 07:50:30 -0000	1.45.2.5
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Type=Service
+ Name=OrganizerPart
++Name[ar]=منظم كيدي
+ Name[be]=Частка "Арганізатар"
+ Name[ca]=Part de Organizer
+ Name[cs]=Komponenta organizéru
+@@ -14,6 +15,7 @@
+ Name[is]=Organizer-íforrit
+ Name[it]=Parte Organizer
+ Name[ja]=Organize パート
++Name[mk]=Организатор - дел
+ Name[nb]=Tidsplanleggerdel
+ Name[nl]=Organizer-part
+ Name[nn]=Tidsplanleggjardel
+Index: kitchensync/kitchensync/overview/overview.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kitchensync/kitchensync/overview/overview.desktop,v
+retrieving revision 1.48.2.2
+retrieving revision 1.48.2.3
+diff -u -r1.48.2.2 -r1.48.2.3
+--- kitchensync/kitchensync/overview/overview.desktop	28 Nov 2004 08:33:58 -0000	1.48.2.2
++++ kitchensync/kitchensync/overview/overview.desktop	12 Dec 2004 08:32:46 -0000	1.48.2.3
+@@ -17,6 +17,7 @@
+ Name[it]=Parte Panoramica
+ Name[ja]=概観パート
+ Name[lt]=OverView dalis
++Name[mk]=Прикажувач на DVI
+ Name[ms]=Bahagian OverView
+ Name[mt]=Parti ta' sommarju
+ Name[nb]=Oversiktsdel
+Index: kitchensync/kitchensync/syncerpart/syncerpart.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kitchensync/kitchensync/syncerpart/syncerpart.desktop,v
+retrieving revision 1.36.2.1
+retrieving revision 1.36.2.2
+diff -u -r1.36.2.1 -r1.36.2.2
+--- kitchensync/kitchensync/syncerpart/syncerpart.desktop	24 Aug 2004 06:32:07 -0000	1.36.2.1
++++ kitchensync/kitchensync/syncerpart/syncerpart.desktop	29 Dec 2004 21:44:56 -0000	1.36.2.2
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Type=Service
+ Name=Synchronizer Part
++Name[ar]=جزء Synchronizer
+ Name[bs]=Dio za sinhronizaciju
+ Name[ca]=Part del sincronitzador
+ Name[cs]=Komponenta synchronizace
+Index: kitchensync/kitchensync/viewer/viewer.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kitchensync/kitchensync/viewer/viewer.desktop,v
+retrieving revision 1.20.2.9
+retrieving revision 1.20.2.11
+diff -u -r1.20.2.9 -r1.20.2.11
+--- kitchensync/kitchensync/viewer/viewer.desktop	28 Nov 2004 08:33:59 -0000	1.20.2.9
++++ kitchensync/kitchensync/viewer/viewer.desktop	4 Jan 2005 07:39:01 -0000	1.20.2.11
+@@ -1,6 +1,8 @@
+ [Desktop Entry]
+ Type=Service
+ Name=Data Viewer
++Name[ar]=عارض للبيانات
++Name[br]=Gweler ar roadoù
+ Name[bs]=Preglednik podataka
+ Name[ca]=Visor de dades
+ Name[cs]=Prohlížeč dat
+Index: kitchensync/klockfile/ksharedfile.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kitchensync/klockfile/Attic/ksharedfile.desktop,v
+retrieving revision 1.72.2.3
+retrieving revision 1.72.2.4
+diff -u -r1.72.2.3 -r1.72.2.4
+--- kitchensync/klockfile/ksharedfile.desktop	28 Nov 2004 08:33:59 -0000	1.72.2.3
++++ kitchensync/klockfile/ksharedfile.desktop	12 Dec 2004 08:32:46 -0000	1.72.2.4
+@@ -26,6 +26,7 @@
+ Name[ja]=KDED ファイル共有/ロックモジュール
+ Name[lt]=KDED bylų bendro naudojimo/užrakinimo modulis
+ Name[lv]=KDE Failu Izdalīšanas/Slēgšanas Modulis
++Name[mk]=KDED Модул за споделување/заклучување на датотеки
+ Name[ms]=Modul Perkongsian/Kunci Fail KDED
+ Name[nb]=KDED fildeling/låsemodul
+ Name[nl]=KDED Bestands Sharing/Locking-module
+@@ -78,6 +79,7 @@
+ Comment[ja]=他の人とファイルを共有
+ Comment[lt]=Dalintis bylomis su kitais
+ Comment[lv]=Izdala failus koplietošanai
++Comment[mk]=Сподели ги датотеките со другите
+ Comment[ms]=Kongsi fail dengan yang lain
+ Comment[nb]=Fildeling med andre
+ Comment[nl]=Bestanden tussen mappen delen
+Index: kitchensync/libkonnector2/konnector.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kitchensync/libkonnector2/konnector.desktop,v
+retrieving revision 1.20.2.2
+retrieving revision 1.20.2.4
+diff -u -r1.20.2.2 -r1.20.2.4
+--- kitchensync/libkonnector2/konnector.desktop	28 Nov 2004 08:33:59 -0000	1.20.2.2
++++ kitchensync/libkonnector2/konnector.desktop	29 Dec 2004 21:44:56 -0000	1.20.2.4
+@@ -3,6 +3,7 @@
+ Type=ServiceType
+ X-KDE-ServiceType=KitchenSync/Konnector
+ Comment=Konnector Definitions
++Comment[ar]=تعريفات Konnector
+ Comment[bs]=Definicije Konnectora
+ Comment[ca]=Definicions de Konnector
+ Comment[cs]=Definice konektorů
+@@ -22,6 +23,7 @@
+ Comment[it]=Definizioni di Konnector
+ Comment[ja]=Konnector 定義
+ Comment[lt]=Konnector nustatymai
++Comment[mk]=Konnector дефиниции
+ Comment[mt]=Definizzjonijiet Konnector
+ Comment[nb]=Konnector-definisjoner
+ Comment[nl]=Konnector-definities
+Index: kitchensync/libkonnector2/plugins/agenda/agenda.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kitchensync/libkonnector2/plugins/agenda/Attic/agenda.desktop,v
+retrieving revision 1.17.2.2
+retrieving revision 1.17.2.4
+diff -u -r1.17.2.2 -r1.17.2.4
+--- kitchensync/libkonnector2/plugins/agenda/agenda.desktop	13 Nov 2004 07:20:50 -0000	1.17.2.2
++++ kitchensync/libkonnector2/plugins/agenda/agenda.desktop	29 Dec 2004 21:44:57 -0000	1.17.2.4
+@@ -5,6 +5,8 @@
+ X-KDE-Library=libagendakonnector
+ 
+ Name=Agenda Vr3 Konnector
++Name[ar]=جدول أعمال Vr3 Konnector
++Name[br]=Deiziataer Vr3 Konnector
+ Name[ca]=Konnector Agenda Vr3
+ Name[cs]=Agenda Vr3 konektor
+ Name[cy]=Kysylltydd Agenda Vr3
+@@ -14,6 +16,7 @@
+ Name[fr]=Konnector Agenda Vr3
+ Name[hi]=एजेंडा वीआर3 कनेक्टर
+ Name[hu]=Agenda Vr3-konnektor
++Name[mk]=Агенда Vr3 Konnecktor
+ Name[nl]=Agenda Vr3-Konnector
+ Name[nn]=Agenda Vr3-tilknyting
+ Name[nso]= Mokgomaganyi wa Vr3 ya Lenaneotheo
+Index: kitchensync/libkonnector2/plugins/agenda/agendaplugin.cpp
+===================================================================
+RCS file: kitchensync/libkonnector2/plugins/agenda/agendaplugin.cpp
+diff -N kitchensync/libkonnector2/plugins/agenda/agendaplugin.cpp
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ kitchensync/libkonnector2/plugins/agenda/agendaplugin.cpp	12 Jan 2005 09:41:04 -0000	1.6.2.1
+@@ -0,0 +1,98 @@
++#include <kgenericfactory.h>
++
++#include <konnectorinfo.h>
++
++#include "configwidget.h"
++#include "socket.h"
++#include "konnector.h"
++
++typedef KGenericFactory<KSync::AgendaPlugin, QObject>  AgendaKonnectorPlugin;
++K_EXPORT_COMPONENT_FACTORY( libagendakonnector,  AgendaKonnectorPlugin )
++
++using namespace KSync;
++
++
++AgendaPlugin::AgendaPlugin( QObject* obj, const char* name,const QStringList )
++    : Konnector( obj, name ) {
++    m_socket = new AgendaSocket(this);
++
++    /* connect the bridge */
++    connect(m_socket, SIGNAL(sync(SynceeList) ),
++            this, SLOT(slotSync(SynceeList) ) );
++    connect(m_socket, SIGNAL(error(const Error& ) ),
++            this, SLOT(slotError(const Error& ) ) );
++    connect(m_socket, SIGNAL(prog(const Progress&) ),
++            this, SLOT(slotProg(const Progress& ) ) );
++}
++AgendaPlugin::~AgendaPlugin() {
++
++}
++KSync::Kapabilities AgendaPlugin::capabilities() {
++    KSync::Kapabilities caps;
++
++    caps.setSupportMetaSyncing( true ); // we can meta sync
++    caps.setSupportsPushSync( true ); // we can initialize the sync from here
++    caps.setNeedsConnection( true ); // we need to have pppd running
++    caps.setSupportsListDir( true ); // we will support that once there is API for it...
++    caps.setNeedsIPs( true ); // we need the IP
++    caps.setNeedsSrcIP( false ); // we do not bind to any address...
++    caps.setNeedsDestIP( true ); // we need to know where to connect
++    caps.setAutoHandle( false ); // we currently do not support auto handling
++    caps.setNeedAuthentication( false ); // HennevL says we do not need that
++    caps.setNeedsModelName( true ); // we need a name for our meta path!
++
++    return caps;
++}
++void AgendaPlugin::setCapabilities( const KSync::Kapabilities& caps ) {
++    m_socket->setIP( caps.destIP() );
++    m_socket->setMetaName( caps.modelName() );
++    m_socket->startUP(); // connect now
++}
++bool AgendaPlugin::readSyncees() {
++    m_socket->startSync();
++    return true;
++}
++bool AgendaPlugin::connectDevice() {
++    m_socket->startUP();
++    return true;
++}
++bool AgendaPlugin::disconnectDevice() {
++    m_socket->hangUP();
++    return true;
++}
++KSync::KonnectorInfo AgendaPlugin::info()const {
++    return KonnectorInfo( i18n("Agenda Vr3"),
++                          QIconSet(),
++                          QString::fromLatin1("AgendaVr3"),  // same as the .desktop file
++                          m_socket->metaName(),
++                          "agenda", // icon name
++                          m_socket->isConnected() );
++}
++void AgendaPlugin::download( const QString& ) {
++    error( StdError::downloadNotSupported() );
++}
++KSync::ConfigWidget* AgendaPlugin::configWidget( const KSync::Kapabilities& cap, QWidget* parent,
++                                                 const char* name ) {
++    return new Vr3::ConfigWidget( cap, parent, name );
++}
++KSync::ConfigWidget* AgendaPlugin::configWidget( QWidget* parent, const char* name ) {
++    return new Vr3::ConfigWidget( parent, name );
++}
++
++// bridging!! below
++bool AgendaPlugin::writeSyncees() {
++    m_socket->write( SynceeList() );
++    return true;
++}
++void AgendaPlugin::slotSync( SynceeList lst) {
++    emit synceesRead( this, lst );
++}
++void AgendaPlugin::slotError( const Error& err ) {
++    error( err );
++}
++void AgendaPlugin::slotProg( const Progress& prog ) {
++    progress( prog );
++}
++
++
++#include "agendaplugin.moc"
+Index: kitchensync/libkonnector2/plugins/agenda/agendaplugin.h
+===================================================================
+RCS file: kitchensync/libkonnector2/plugins/agenda/agendaplugin.h
+diff -N kitchensync/libkonnector2/plugins/agenda/agendaplugin.h
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ kitchensync/libkonnector2/plugins/agenda/agendaplugin.h	29 Aug 2003 18:40:29 -0000	1.6
+@@ -0,0 +1,66 @@
++#ifndef VR3_KONNECTOR_H
++#define VR3_KONNECTOR_H
++
++#include <qiconset.h>
++#include <qptrlist.h>
++
++#include <konnector.h>
++
++
++namespace KSync {
++    /**
++     * This plugin gets loaded by the KonnectorManager
++     * this is the key to the KonnectorWorld
++     * we need to implement the interface to fully support it...
++     */
++    class AgendaPlugin : public KSync::Konnector
++    { 
++        Q_OBJECT
++    public:
++        /**
++         * @param parent the Parent Object
++         * @param name the name
++         * @param strlist a QStringList which is not used but necessary for KGenericFactory
++         */
++        AgendaPlugin( QObject*, const char*, const QStringList = QStringList() );
++        ~AgendaPlugin();
++
++        /** return our capabilities() */
++        KSync::Kapabilities capabilities();
++
++        /**
++         * the user configured this konnector
++         * apply his preferecnes
++         */
++        void setCapabilities( const KSync::Kapabilities& );
++
++        bool readSyncees();
++        bool writeSyncees();
++
++        bool connectDevice();
++        bool disconnectDevice();
++
++        /** the state and some informations */
++        KSync::KonnectorInfo info()const;
++
++        /** download a resource/url/foobar */
++        void download( const QString& );
++
++        /** configuration widgets */
++        KSync::ConfigWidget* configWidget( const KSync::Kapabilities&, QWidget* parent, const char* name );
++        KSync::ConfigWidget* configWidget( QWidget* parent, const char* name );
++
++    private:
++        AgendaSocket* m_socket;
++
++    private slots:
++        /** bridge from socket->plugin->konnectormanager */
++        void slotSync( SynceeList );
++        void slotError( const Error& error );
++        void slotProg( const Progress& );
++
++    };
++}
++
++
++#endif
+Index: kitchensync/libkonnector2/plugins/dummy/dummykonnector.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kitchensync/libkonnector2/plugins/dummy/dummykonnector.desktop,v
+retrieving revision 1.33.2.1
+retrieving revision 1.33.2.2
+diff -u -r1.33.2.1 -r1.33.2.2
+--- kitchensync/libkonnector2/plugins/dummy/dummykonnector.desktop	24 Aug 2004 06:32:08 -0000	1.33.2.1
++++ kitchensync/libkonnector2/plugins/dummy/dummykonnector.desktop	29 Dec 2004 21:44:57 -0000	1.33.2.2
+@@ -5,6 +5,7 @@
+ X-KDE-Library=libdummykonnector
+ 
+ Name=Dummy Konnector
++Name[ar]=Konnector وهمي
+ Name[bs]=Testni Konnector
+ Name[ca]=Konnector de prova
+ Name[cy]=Kysylltydd Ffug
+Index: kitchensync/libkonnector2/plugins/kabc/kabckonnector.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kitchensync/libkonnector2/plugins/kabc/kabckonnector.desktop,v
+retrieving revision 1.18.2.10
+retrieving revision 1.18.2.11
+diff -u -r1.18.2.10 -r1.18.2.11
+--- kitchensync/libkonnector2/plugins/kabc/kabckonnector.desktop	28 Nov 2004 08:33:59 -0000	1.18.2.10
++++ kitchensync/libkonnector2/plugins/kabc/kabckonnector.desktop	29 Dec 2004 21:44:57 -0000	1.18.2.11
+@@ -5,6 +5,7 @@
+ X-KDE-Library=libkabckonnector
+ 
+ Name=AddressBook Konnector
++Name[ar]=دفتر العناوين Konnector
+ Name[bs]=Adresar Konnector
+ Name[ca]=Llibreta d'adreces Konnector
+ Name[cs]=Konektor Knihy adres
+Index: kitchensync/libkonnector2/plugins/kcal/kcalkonnector.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kitchensync/libkonnector2/plugins/kcal/kcalkonnector.desktop,v
+retrieving revision 1.19.2.10
+retrieving revision 1.19.2.11
+diff -u -r1.19.2.10 -r1.19.2.11
+--- kitchensync/libkonnector2/plugins/kcal/kcalkonnector.desktop	28 Nov 2004 08:34:00 -0000	1.19.2.10
++++ kitchensync/libkonnector2/plugins/kcal/kcalkonnector.desktop	29 Dec 2004 21:44:58 -0000	1.19.2.11
+@@ -5,6 +5,7 @@
+ X-KDE-Library=libkcalkonnector
+ 
+ Name=Calendar Konnector
++Name[ar]=تقويم Konnector
+ Name[bs]=Kalendar Konnector
+ Name[ca]=Calendari Konnector
+ Name[cs]=Konektor kalendáře
+Index: kitchensync/libkonnector2/plugins/local/localkonnector.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kitchensync/libkonnector2/plugins/local/localkonnector.desktop,v
+retrieving revision 1.36.2.2
+retrieving revision 1.36.2.3
+diff -u -r1.36.2.2 -r1.36.2.3
+--- kitchensync/libkonnector2/plugins/local/localkonnector.desktop	24 Oct 2004 07:05:57 -0000	1.36.2.2
++++ kitchensync/libkonnector2/plugins/local/localkonnector.desktop	29 Dec 2004 21:44:58 -0000	1.36.2.3
+@@ -5,6 +5,7 @@
+ X-KDE-Library=liblocalkonnector
+ 
+ Name=Local Konnector
++Name[ar]=Konnector محلي
+ Name[bs]=Lokalni Konnector
+ Name[ca]=Konnector local
+ Name[cs]=Místní konektor
+Index: kitchensync/libkonnector2/plugins/remote/remotekonnector.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kitchensync/libkonnector2/plugins/remote/remotekonnector.desktop,v
+retrieving revision 1.18.2.8
+retrieving revision 1.18.2.9
+diff -u -r1.18.2.8 -r1.18.2.9
+--- kitchensync/libkonnector2/plugins/remote/remotekonnector.desktop	13 Nov 2004 07:20:51 -0000	1.18.2.8
++++ kitchensync/libkonnector2/plugins/remote/remotekonnector.desktop	29 Dec 2004 21:44:58 -0000	1.18.2.9
+@@ -5,6 +5,7 @@
+ X-KDE-Library=libremotekonnector
+ 
+ Name=Remote Konnector
++Name[ar]=Konnector بعيد
+ Name[bs]=Udaljeni Konnector
+ Name[ca]=Konnector remot
+ Name[cs]=Vzdálený konektor
+Index: kitchensync/libkonnector2/plugins/threadedkonnector/threadedkonnector.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kitchensync/libkonnector2/plugins/threadedkonnector/threadedkonnector.desktop,v
+retrieving revision 1.35.2.4
+retrieving revision 1.35.2.5
+diff -u -r1.35.2.4 -r1.35.2.5
+--- kitchensync/libkonnector2/plugins/threadedkonnector/threadedkonnector.desktop	24 Oct 2004 07:05:57 -0000	1.35.2.4
++++ kitchensync/libkonnector2/plugins/threadedkonnector/threadedkonnector.desktop	29 Dec 2004 21:44:58 -0000	1.35.2.5
+@@ -5,6 +5,7 @@
+ X-KDE-Library=libthreadedkonnector
+ 
+ Name=Demo konnector for a threaded implementation
++Name[ar]=عرض Konnector توضيحي للتطبيق المترابط
+ Name[bs]=Demo konnector za implementaciju threadova
+ Name[ca]=Demostració de konnector per a una implementació amb fils
+ Name[cy]=Kysylltydd arddangosol ar gyfer weithredoliant edafeddedig
+Index: kmail/KMail.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kmail/KMail.desktop,v
+retrieving revision 1.282.2.3
+retrieving revision 1.282.2.5
+diff -u -r1.282.2.3 -r1.282.2.5
+--- kmail/KMail.desktop	26 Nov 2004 08:05:19 -0000	1.282.2.3
++++ kmail/KMail.desktop	9 Jan 2005 07:49:20 -0000	1.282.2.5
+@@ -44,7 +44,6 @@
+ GenericName[ja]=メールクライアント
+ GenericName[lt]=Pašto klientas
+ GenericName[lv]=Pasta Klients
+-GenericName[mk]=Програма за е-пошта
+ GenericName[mt]=Klijent tal-imejl
+ GenericName[nb]=E-postklient
+ GenericName[nl]=E-mailclient
+@@ -54,6 +53,7 @@
+ GenericName[pt_BR]=Cliente de E-mail
+ GenericName[ro]=Program de poştă electronică
+ GenericName[ru]=Почтовый клиент
++GenericName[se]=E-boastaprográmma
+ GenericName[sk]=Poštový klient
+ GenericName[sl]=Poštni odjemalec
+ GenericName[sr]=Е-поштански клијент
+Index: kmail/antispamwizard.cpp
+===================================================================
+RCS file: /home/kde/kdepim/kmail/antispamwizard.cpp,v
+retrieving revision 1.36.2.4
+retrieving revision 1.36.2.5
+diff -u -r1.36.2.4 -r1.36.2.5
+--- kmail/antispamwizard.cpp	3 Nov 2004 21:02:27 -0000	1.36.2.4
++++ kmail/antispamwizard.cpp	2 Jan 2005 19:33:14 -0000	1.36.2.5
+@@ -356,13 +356,13 @@
+       classHamFilter->setConfigureToolbar( TRUE );
+       filterList.append( classHamFilter );
+     }
+-
++  }
+     /* Now that all the filters have been added to the list, tell
+      * the filter manager about it. That will emit filterListUpdate
+      * which will result in the filter list in kmmainwidget being 
+      * initialized. This should happend only once. */
++  if ( !filterList.isEmpty() )
+     KMKernel::self()->filterMgr()->appendFilters( filterList );
+-  }
+ 
+   QDialog::accept();
+ }
+Index: kmail/application_octetstream.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kmail/application_octetstream.desktop,v
+retrieving revision 1.21.2.8
+retrieving revision 1.21.2.9
+diff -u -r1.21.2.8 -r1.21.2.9
+--- kmail/application_octetstream.desktop	13 Nov 2004 07:20:51 -0000	1.21.2.8
++++ kmail/application_octetstream.desktop	29 Dec 2004 21:44:59 -0000	1.21.2.9
+@@ -1,6 +1,7 @@
+ [Misc]
+ Encoding=UTF-8
+ Name=Application Octetstream
++Name[ar]=دفق ثماني الأجزاء للبرنامج
+ Name[ca]=Aplicació Octetstream
+ Name[da]=Program oktetstrøm
+ Name[es]=Aplicación en flujo de octetos
+@@ -21,6 +22,7 @@
+ Name[tg]=Миқдори зиёди бинарии барномот
+ Name[zh_CN]=应用程序 Octetstream
+ Comment=A bodypart formatter plugin for application/octet-stream
++Comment[ar]=أداة إضافية لتنسيق أجزاء من برنامج أو دفق ثماني
+ Comment[bg]=Приставка за форматиране на двоични данни
+ Comment[bs]=Dodatak za formatiranje tijela poruke za application/octet-stream
+ Comment[ca]=Un endollable formatador del cos per application/octet-stream
+Index: kmail/dcopimap.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kmail/dcopimap.desktop,v
+retrieving revision 1.9.2.2
+retrieving revision 1.9.2.4
+diff -u -r1.9.2.2 -r1.9.2.4
+--- kmail/dcopimap.desktop	24 Oct 2004 07:05:57 -0000	1.9.2.2
++++ kmail/dcopimap.desktop	9 Jan 2005 07:49:20 -0000	1.9.2.4
+@@ -3,6 +3,7 @@
+ Type=ServiceType
+ X-KDE-ServiceType=DCOP/ResourceBackend/IMAP
+ Comment=Mail program with a DCOP interface
++Comment[ar]=برنامج بريد مع واجهة DCOP
+ Comment[be]=Паштовая праграма з DCOP інтэрфэйсам
+ Comment[bg]=Клиент на електронна поща за КДЕ
+ Comment[bs]=Mail program sa DCOP interfejsom
+@@ -29,6 +30,7 @@
+ Comment[pt]=Um programa de correio electrónico com uma interface DCOP
+ Comment[pt_BR]=Programa de e-mail com uma interface DCOP
+ Comment[ru]=Почтовая программа с интерфейсом DCOP
++Comment[se]=E-boastaprográmma mas lea DCOP-lakta
+ Comment[sk]=Poštový program s DCOP rozhraním
+ Comment[sl]=Poštni program z vmesnikom DCOP
+ Comment[sr]=Е-поштански програм са DCOP интерфејсом
+Index: kmail/dcopmail.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kmail/dcopmail.desktop,v
+retrieving revision 1.42.2.2
+retrieving revision 1.42.2.4
+diff -u -r1.42.2.2 -r1.42.2.4
+--- kmail/dcopmail.desktop	24 Oct 2004 07:05:57 -0000	1.42.2.2
++++ kmail/dcopmail.desktop	9 Jan 2005 07:49:20 -0000	1.42.2.4
+@@ -3,6 +3,7 @@
+ Type=ServiceType
+ X-KDE-ServiceType=DCOP/Mailer
+ Comment=Mail program with a DCOP interface
++Comment[ar]=برنامج بريد مع واجهة DCOP
+ Comment[be]=Паштовая праграма з DCOP інтэрфэйсам
+ Comment[bg]=Клиент на електронна поща за КДЕ
+ Comment[bs]=Mail program sa DCOP interfejsom
+@@ -29,6 +30,7 @@
+ Comment[pt]=Um programa de correio electrónico com uma interface DCOP
+ Comment[pt_BR]=Programa de e-mail com uma interface DCOP
+ Comment[ru]=Почтовая программа с интерфейсом DCOP
++Comment[se]=E-boastaprográmma mas lea DCOP-lakta
+ Comment[sk]=Poštový program s DCOP rozhraním
+ Comment[sl]=Poštni program z vmesnikom DCOP
+ Comment[sr]=Е-поштански програм са DCOP интерфејсом
+Index: kmail/eventsrc
+===================================================================
+RCS file: /home/kde/kdepim/kmail/eventsrc,v
+retrieving revision 1.83.2.9
+retrieving revision 1.83.2.12
+diff -u -r1.83.2.9 -r1.83.2.12
+--- kmail/eventsrc	13 Nov 2004 07:20:51 -0000	1.83.2.9
++++ kmail/eventsrc	10 Jan 2005 09:02:03 -0000	1.83.2.12
+@@ -8,6 +8,7 @@
+ 
+ [new-mail-arrived]
+ Name=New Mail Arrived
++Name[ar]=بريد جديد قد وصل
+ Name[bg]=Имате ново писмо
+ Name[bs]=Stigla vam je nova pošta
+ Name[ca]=Ha arribat correu nou
+@@ -30,6 +31,7 @@
+ Name[pt]=Chegou Correio Novo
+ Name[pt_BR]=Chegou Nova Mensagem
+ Name[ru]=Получена новая почта
++Name[se]=Ođđa e-boasta bođii
+ Name[sk]=Prišla nová pošta
+ Name[sl]=Prispela je nova pošta
+ Name[sr]=Стигла је нова пошта
+@@ -40,7 +42,9 @@
+ Name[uk]=Отримана нова пошта
+ Name[zh_CN]=新邮件到达
+ Comment=New mail arrived
++Comment[ar]=بريد جديد قد وصل
+ Comment[bg]=Имате ново писмо
++Comment[br]=Deuet eo ur postel nevez
+ Comment[bs]=Stigla vam je nova pošta
+ Comment[ca]=Ha arribat correu nou
+ Comment[cs]=Přišla nová pošta
+@@ -63,6 +67,7 @@
+ Comment[pt]=Chegou correio novo
+ Comment[pt_BR]=Chegou Nova Mensagem
+ Comment[ru]=Получена новая почта
++Comment[se]=Ođđa e-boasta bođii
+ Comment[sk]=Prišla nová pošta
+ Comment[sl]=Prispela je nova pošta
+ Comment[sr]=Стигла је нова пошта
+Index: kmail/imapjob.h
+===================================================================
+RCS file: /home/kde/kdepim/kmail/imapjob.h,v
+retrieving revision 1.13
+retrieving revision 1.13.2.1
+diff -u -r1.13 -r1.13.2.1
+--- kmail/imapjob.h	1 Jun 2004 22:48:51 -0000	1.13
++++ kmail/imapjob.h	28 Dec 2004 19:54:13 -0000	1.13.2.1
+@@ -55,7 +55,7 @@
+ class ImapJob : public FolderJob
+ {
+   Q_OBJECT
+-  friend class KMAcctImap;
++  friend class ::KMAcctImap;
+ 
+ public:
+   ImapJob( KMMessage *msg, JobType jt = tGetMessage, KMFolderImap *folder = 0,
+Index: kmail/kmail_config_appearance.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kmail/kmail_config_appearance.desktop,v
+retrieving revision 1.33.2.11
+retrieving revision 1.33.2.14
+diff -u -r1.33.2.11 -r1.33.2.14
+--- kmail/kmail_config_appearance.desktop	26 Nov 2004 08:05:19 -0000	1.33.2.11
++++ kmail/kmail_config_appearance.desktop	9 Jan 2005 07:49:20 -0000	1.33.2.14
+@@ -13,6 +13,7 @@
+ X-KDE-CfgDlgHierarchy=KMail
+ 
+ Name=Appearance
++Name[ar]=مظهر
+ Name[be]=Зьнешні выгляд
+ Name[bg]=Външност
+ Name[br]=Neuziadur
+@@ -35,6 +36,7 @@
+ Name[is]=Útlit
+ Name[it]=Aspetto
+ Name[ja]=外観
++Name[mk]=Изглед
+ Name[nb]=Utseende
+ Name[nl]=Uiterlijk
+ Name[nn]=Utsjånad
+@@ -54,6 +56,7 @@
+ Name[wa]=Rivnance
+ Name[zh_CN]=外观
+ Comment=Customize Visual Appearance
++Comment[ar]=تخصيص العرض
+ Comment[bg]=Настройки на външността
+ Comment[bs]=Prilagodi izgled
+ Comment[ca]=Personalitza l'aparença visual
+@@ -78,6 +81,7 @@
+ Comment[pt]=Personalizar a Aparência Visual
+ Comment[pt_BR]=Personalizar Aparência Visual
+ Comment[ru]=Настройка внешнего вида
++Comment[se]=Heivet fárdda
+ Comment[sk]=Prispôsobenie vzhľadu
+ Comment[sl]=Prilagodi videz
+ Comment[sr]=Прилагодите визуелни приказ
+@@ -88,6 +92,7 @@
+ Comment[uk]=Налаштування зовнішнього вигляду
+ Comment[zh_CN]=定制视觉外观
+ Keywords=kmail,appearance
++Keywords[ar]=kmail,مظهر
+ Keywords[be]=K Пошта,зьнешні выгляд,kmail,appearance
+ Keywords[bg]=пощенски, клиент, е-поща, външен вид, външност, появяване kmail, appearance
+ Keywords[br]=kmail,neuziadur
+Index: kmail/kmail_config_composer.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kmail/kmail_config_composer.desktop,v
+retrieving revision 1.24.2.10
+retrieving revision 1.24.2.12
+diff -u -r1.24.2.10 -r1.24.2.12
+--- kmail/kmail_config_composer.desktop	13 Nov 2004 07:20:51 -0000	1.24.2.10
++++ kmail/kmail_config_composer.desktop	9 Jan 2005 07:49:20 -0000	1.24.2.12
+@@ -36,6 +36,7 @@
+ Name[pt]=Compositor
+ Name[pt_BR]=Editor de Mensagens
+ Name[ru]=Редактор писем
++Name[se]=Čállinprográmma
+ Name[sk]=Editor správ
+ Name[sl]=Sestavljalnik
+ Name[sr]=Састављач
+@@ -46,6 +47,7 @@
+ Name[uk]=Редактор листів
+ Name[zh_CN]=编写器
+ Comment=Phrases & General Behavior
++Comment[ar]=العبارات و السلوك العام
+ Comment[bg]=Настройки на редактора
+ Comment[bs]=Fraze i opšte ponašanje
+ Comment[ca]=Frases i comportament general
+@@ -69,6 +71,7 @@
+ Comment[pt]=Frases e Comportamento Geral
+ Comment[pt_BR]=Frases & Comportamento Geral
+ Comment[ru]=Фразы и общие параметры
++Comment[se]=Frásat ja oppalaš láhtten
+ Comment[sk]=Frázy a všeobecné chovanie
+ Comment[sl]=Fraze in splošno obnašanje
+ Comment[sr]=Фразе и опште понашање
+@@ -79,6 +82,7 @@
+ Comment[uk]=Фрази і загальні параметри
+ Comment[zh_CN]=短语和一般行为
+ Keywords=kmail,composer
++Keywords[ar]=kmail,المؤلف
+ Keywords[bg]=пощенски, клиент, е-поща, редактор, съставител, форматиране, текст, kmail, komposer
+ Keywords[bs]=kmail,composer,sastavljač
+ Keywords[ca]=kmail,editor
+Index: kmail/kmail_config_identity.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kmail/kmail_config_identity.desktop,v
+retrieving revision 1.23.2.11
+retrieving revision 1.23.2.13
+diff -u -r1.23.2.11 -r1.23.2.13
+--- kmail/kmail_config_identity.desktop	13 Nov 2004 07:20:51 -0000	1.23.2.11
++++ kmail/kmail_config_identity.desktop	9 Jan 2005 07:49:20 -0000	1.23.2.13
+@@ -13,8 +13,10 @@
+ X-KDE-CfgDlgHierarchy=KMail
+ 
+ Name=Identities
++Name[ar]=معرفات
+ Name[be]=Увасабленьні
+ Name[bg]=Самоличност
++Name[br]=Anvelezhioù
+ Name[bs]=Identiteti
+ Name[ca]=Identitats
+ Name[cs]=Identity
+@@ -38,6 +40,7 @@
+ Name[pt]=Identidades
+ Name[pt_BR]=Identidades
+ Name[ru]=Профили
++Name[se]=Identitehtat
+ Name[sk]=Identity
+ Name[sl]=Identitete
+ Name[sr]=Идентитети
+@@ -48,8 +51,10 @@
+ Name[uk]=Профілі
+ Name[zh_CN]=身份
+ Comment=Manage Identities
++Comment[ar]=ضبط المعرفات
+ Comment[be]=Кіраваньне увасабленьнямі
+ Comment[bg]=Настройки на самоличността
++Comment[br]=Merañ an anvelezhioù
+ Comment[bs]=Upravljaj identitetima
+ Comment[ca]=Gestiona les identitats
+ Comment[cs]=Správa identit
+@@ -73,6 +78,7 @@
+ Comment[pt]=Gerir Identidades
+ Comment[pt_BR]=Gerenciar Identidades
+ Comment[ru]=Управление профилями
++Comment[se]=Gieđahala identitehtaid
+ Comment[sk]=Správa identít
+ Comment[sl]=Upravljanje z identitetami
+ Comment[sr]=Управљање идентитетима
+@@ -83,6 +89,7 @@
+ Comment[uk]=Керування профілями
+ Comment[zh_CN]=管理身份
+ Keywords=kmail,identity
++Keywords[ar]=kmail,iمعرف
+ Keywords[be]=K Пошта,увасабленьне,kmail,identity
+ Keywords[bg]=пощенски, клиент, е-поща, самоличност, информация, kmail, identity
+ Keywords[br]=kmail,anvelezh
+Index: kmail/kmail_config_misc.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kmail/kmail_config_misc.desktop,v
+retrieving revision 1.25.2.13
+retrieving revision 1.25.2.15
+diff -u -r1.25.2.13 -r1.25.2.15
+--- kmail/kmail_config_misc.desktop	26 Nov 2004 08:05:19 -0000	1.25.2.13
++++ kmail/kmail_config_misc.desktop	9 Jan 2005 07:49:20 -0000	1.25.2.15
+@@ -13,6 +13,7 @@
+ X-KDE-CfgDlgHierarchy=KMail
+ 
+ Name=Misc
++Name[ar]=مشكل
+ Name[be]=Рознае
+ Name[bg]=Разни
+ Name[br]=A bep seurt
+@@ -41,6 +42,7 @@
+ Name[pt]=Vários
+ Name[pt_BR]=Extras
+ Name[ru]=Прочее
++Name[se]=Feará mii
+ Name[sk]=Rôzne
+ Name[sl]=Razno
+ Name[sr]=Разно
+@@ -51,6 +53,7 @@
+ Name[uk]=Різн
+ Name[zh_CN]=杂项
+ Comment=Settings that don't fit elsewhere
++Comment[ar]=إعدادات غير قابلة للتصنيف في مواضع أخرى
+ Comment[bg]=Разни настройки
+ Comment[bs]=Postavke koje ne spadaju nigdje drugo
+ Comment[ca]=Opcions que no van bé enlloc
+@@ -75,6 +78,7 @@
+ Comment[pt]=Outras configurações
+ Comment[pt_BR]=Preferências que não se encaixam em outros lugares
+ Comment[ru]=Другие настройки
++Comment[se]=Heivehusat mat eai heive eará báikkiin
+ Comment[sk]=Nastavenie, ktoré sa inam nehodí
+ Comment[sl]=Nastavitve, ki ne spadajo drugam
+ Comment[sr]=Поставке које не припадају другде
+@@ -85,6 +89,7 @@
+ Comment[uk]=Інші параметри
+ Comment[zh_CN]=其它设置
+ Keywords=kmail,misc
++Keywords[ar]=kmail,مشكل
+ Keywords[be]=K Пошта,рознае,kmail,misc
+ Keywords[bg]=пощенски, клиент, е-поща, разни, настройки, kmail, misc
+ Keywords[br]=kmail,a bep seurt
+Index: kmail/kmail_config_network.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kmail/Attic/kmail_config_network.desktop,v
+retrieving revision 1.34.2.13
+retrieving revision 1.34.2.18
+diff -u -r1.34.2.13 -r1.34.2.18
+--- kmail/kmail_config_network.desktop	26 Nov 2004 08:05:19 -0000	1.34.2.13
++++ kmail/kmail_config_network.desktop	13 Jan 2005 08:02:45 -0000	1.34.2.18
+@@ -13,6 +13,7 @@
+ X-KDE-CfgDlgHierarchy=KMail
+ 
+ Name=Network
++Name[ar]=أخبار
+ Name[az]=Şəbəkə
+ Name[be]=Сетка
+ Name[bg]=Мрежа
+@@ -42,7 +43,6 @@
+ Name[lt]=Tinklas
+ Name[lv]=Tīkls
+ Name[mi]=Hao
+-Name[mk]=Мрежа
+ Name[nb]=Nettverk
+ Name[nl]=Netwerk
+ Name[nn]=Nettverk
+@@ -52,6 +52,7 @@
+ Name[pt]=Rede
+ Name[pt_BR]=Rede
+ Name[ru]=Сеть
++Name[se]=Fierpmádat
+ Name[sk]=Sieť
+ Name[sl]=Omrežje
+ Name[sq]=Rrjeta
+@@ -70,6 +71,7 @@
+ Name[zh_CN]=网络
+ Name[zu]=Umsebenzi wokuxhumanisa
+ Comment=Setup for Sending and Receiving Messages
++Comment[ar]=الإعداد لإرسال أو استقبال الرسائل
+ Comment[bg]=Настройки на мрежата, сървърите и сметките
+ Comment[bs]=Postavke za slanje i prijem poruka
+ Comment[ca]=Configuració per enviar i rebre missatges
+@@ -92,6 +94,7 @@
+ Comment[pt]=Configuração de Envio e Recepção de Mensagens
+ Comment[pt_BR]=Configura o Envio e Recebimento de Mensagens
+ Comment[ru]=Настройка отправки и получения сообщений
++Comment[se]=Heivet e-reivviid sáddema ja vuostáiváldima
+ Comment[sk]=Nastavenie príjmu a odosielania správ
+ Comment[sl]=Nastavitve za pošiljanje in prejemanje sporočil
+ Comment[sr]=Подешавање слања и примања порука
+@@ -102,8 +105,10 @@
+ Comment[uk]=Налаштування для надсилання і отримання повідомлень
+ Comment[zh_CN]=收发邮件设置
+ Keywords=kmail,network
++Keywords[ar]=kmail,أمان
+ Keywords[be]=K Пошта,сетка,kmail,network
+ Keywords[bg]=пощенски, клиент, е-поща, мрежа, сървър, сметка, kmail, network
++Keywords[br]=kmail,rouedad
+ Keywords[bs]=kmail,network,mreža
+ Keywords[ca]=kmail,xarxa
+ Keywords[cs]=kmail,síť
+Index: kmail/kmail_config_security.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kmail/kmail_config_security.desktop,v
+retrieving revision 1.27.2.13
+retrieving revision 1.27.2.16
+diff -u -r1.27.2.13 -r1.27.2.16
+--- kmail/kmail_config_security.desktop	26 Nov 2004 08:05:19 -0000	1.27.2.13
++++ kmail/kmail_config_security.desktop	9 Jan 2005 07:49:20 -0000	1.27.2.16
+@@ -13,12 +13,14 @@
+ X-KDE-CfgDlgHierarchy=KMail
+ 
+ Name=Security
++Name[ar]=أمان
+ Name[be]=Бясьпека
+ Name[bg]=Сигурност
+ Name[br]=Surentez
+ Name[bs]=Sigurnost
+ Name[ca]=Seguretat
+ Name[cs]=Bezpečnost
++Name[cy]=Diogelwch
+ Name[da]=Sikkerhed
+ Name[de]=Sicherheit
+ Name[el]=Ασφάλεια
+@@ -40,6 +42,7 @@
+ Name[pt]=Segurança
+ Name[pt_BR]=Segurança
+ Name[ru]=Безопасность
++Name[se]=Sihkarvuohta
+ Name[sk]=Zabezpečenie
+ Name[sl]=Varnost
+ Name[sr]=Сигурност
+@@ -51,6 +54,7 @@
+ Name[uz]=Хавфсизлик
+ Name[zh_CN]=安全
+ Comment=Security & Privacy Settings
++Comment[ar]=إعدادت الأمان و الخصوصية
+ Comment[be]=Настройкі бясьпекі і прыватнасьці
+ Comment[bg]=Настройки на сигурността
+ Comment[br]=Kefluniadur ar surentez ar buhez prevez
+@@ -76,6 +80,7 @@
+ Comment[pt]=Configuração de Segurança e Privacidade
+ Comment[pt_BR]=Configurações de Segurança & Privacidade
+ Comment[ru]=Настройки безопасности
++Comment[se]=Sihkarvuohta- ja iežas suodjalan heivehusat
+ Comment[sk]=Zabezpečenie a súkromie
+ Comment[sl]=Nastavitve varnosti in zasebnosti
+ Comment[sr]=Поставке сигурности и приватности
+@@ -86,6 +91,7 @@
+ Comment[uk]=Параметри безпеки і конфіденційності
+ Comment[zh_CN]=安全和隐私设置
+ Keywords=kmail,security
++Keywords[ar]=kmail,أمان
+ Keywords[be]=K Пошта,бясьпека,kmail,security
+ Keywords[bg]=пощенски, клиент, е-поща, сигурност, конфиденциалност, kmail, security
+ Keywords[br]=kmail,surentez
+Index: kmail/kmcommands.cpp
+===================================================================
+RCS file: /home/kde/kdepim/kmail/kmcommands.cpp,v
+retrieving revision 1.163.2.6
+retrieving revision 1.163.2.7
+diff -u -r1.163.2.6 -r1.163.2.7
+--- kmail/kmcommands.cpp	18 Oct 2004 20:17:42 -0000	1.163.2.6
++++ kmail/kmcommands.cpp	3 Dec 2004 12:39:18 -0000	1.163.2.7
+@@ -1870,6 +1870,11 @@
+ {
+   if ( mDestFolder )
+     mDestFolder->close();
++  while ( !mOpenedFolders.empty() ) {
++    KMFolder *folder = mOpenedFolders.back();
++    mOpenedFolders.pop_back();
++    folder->close();
++  }
+   if ( mProgressItem )
+     mProgressItem->setComplete();
+   setResult( result );
+@@ -1887,11 +1892,15 @@
+   const QPtrList<KMMsgBase> &msgList )
+ :KMMoveCommand( findTrashFolder( srcFolder ), msgList)
+ {
++  srcFolder->open();
++  mOpenedFolders.push_back( srcFolder );
+ }
+ 
+ KMDeleteMsgCommand::KMDeleteMsgCommand( KMFolder* srcFolder, KMMessage * msg )
+ :KMMoveCommand( findTrashFolder( srcFolder ), msg)
+ {
++  srcFolder->open();
++  mOpenedFolders.push_back( srcFolder );
+ }
+ 
+ KMDeleteMsgCommand::KMDeleteMsgCommand( Q_UINT32 sernum )
+@@ -1901,6 +1910,8 @@
+   int idx;
+   kmkernel->msgDict()->getLocation( sernum, &srcFolder, &idx );
+   KMMsgBase *msg = srcFolder->getMsgBase( idx );
++  srcFolder->open();
++  mOpenedFolders.push_back( srcFolder );
+   addMsg( msg );
+   setDestFolder( findTrashFolder( srcFolder ) );
+ }
+Index: kmail/kmcommands.h
+===================================================================
+RCS file: /home/kde/kdepim/kmail/kmcommands.h,v
+retrieving revision 1.46.2.4
+retrieving revision 1.46.2.5
+diff -u -r1.46.2.4 -r1.46.2.5
+--- kmail/kmcommands.h	18 Oct 2004 20:17:42 -0000	1.46.2.4
++++ kmail/kmcommands.h	3 Dec 2004 12:39:18 -0000	1.46.2.5
+@@ -6,6 +6,7 @@
+ #include <qguardedptr.h>
+ #include <qptrlist.h>
+ #include <qvaluelist.h>
++#include <qvaluevector.h>
+ #include <kio/job.h>
+ #include "kmmsgbase.h" // for KMMsgStatus
+ #include <mimelib/string.h>
+@@ -657,6 +658,7 @@
+   KMMoveCommand( Q_UINT32 sernum );
+   void setDestFolder( KMFolder* folder ) { mDestFolder = folder; }
+   void addMsg( KMMsgBase *msg ) { mMsgList.append( msg ); }
++  QValueVector<KMFolder*> mOpenedFolders;
+ 
+ private:
+   virtual Result execute();
+Index: kmail/kmcomposewin.cpp
+===================================================================
+RCS file: /home/kde/kdepim/kmail/kmcomposewin.cpp,v
+retrieving revision 1.851.2.16
+retrieving revision 1.851.2.17
+diff -u -r1.851.2.16 -r1.851.2.17
+--- kmail/kmcomposewin.cpp	17 Nov 2004 12:54:06 -0000	1.851.2.16
++++ kmail/kmcomposewin.cpp	10 Dec 2004 21:06:34 -0000	1.851.2.17
+@@ -643,6 +643,8 @@
+     return;
+   }
+   KMMessage *msg = mComposedMessages.first();
++  if ( !msg )
++    return;
+   QCString msgStr = msg->asString();
+   QCString fname = getenv("HOME");
+   fname += "/dead.letter.tmp";
+Index: kmail/kmheaders.cpp
+===================================================================
+RCS file: /home/kde/kdepim/kmail/kmheaders.cpp,v
+retrieving revision 1.658.2.8
+retrieving revision 1.658.2.9
+diff -u -r1.658.2.8 -r1.658.2.9
+--- kmail/kmheaders.cpp	19 Nov 2004 11:46:04 -0000	1.658.2.8
++++ kmail/kmheaders.cpp	12 Dec 2004 12:08:36 -0000	1.658.2.9
+@@ -1251,7 +1251,6 @@
+   connect( this, SIGNAL(currentChanged(QListViewItem*)),
+            this, SLOT(highlightMessage(QListViewItem*)));
+ 
+-  emit messageListUpdated();
+   END_TIMER(msgAdded);
+   SHOW_TIMER(msgAdded);
+ }
+@@ -2188,7 +2187,7 @@
+   if (mReaderWindowActive)
+   {
+     KMMessage *msg = mFolder->getMsg(idx);
+-    if (!msg || msg->transferInProgress())
++    if (!msg )
+     {
+       emit selected( 0 );
+       mPrevCurrent = 0;
+Index: kmail/kmsender.cpp
+===================================================================
+RCS file: /home/kde/kdepim/kmail/kmsender.cpp,v
+retrieving revision 1.220.2.2
+retrieving revision 1.220.2.3
+diff -u -r1.220.2.2 -r1.220.2.3
+--- kmail/kmsender.cpp	16 Oct 2004 09:36:41 -0000	1.220.2.2
++++ kmail/kmsender.cpp	3 Dec 2004 14:38:42 -0000	1.220.2.3
+@@ -742,11 +742,10 @@
+       break;
+     n++;
+ 
+-    KMFolder *folder;
+-    int index;
++    KMFolder *folder = 0;
++    int index = -1;
+     kmkernel->msgDict()->getLocation(msn, &folder, &index);
+-
+-    if (folder) {
++    if (folder && index != -1) {
+       folder->open();
+       if ( status == KMMsgStatusDeleted ) {
+         // Move the message to the trash folder
+@@ -757,6 +756,8 @@
+         folder->setStatus(index, status);
+       }
+       folder->close();
++    } else {
++      kdWarning(5006) << k_funcinfo << "Cannot update linked message, it could not be found!" << endl;
+     }
+   }
+ }
+Index: kmail/mboxjob.h
+===================================================================
+RCS file: /home/kde/kdepim/kmail/mboxjob.h,v
+retrieving revision 1.7
+retrieving revision 1.7.2.1
+diff -u -r1.7 -r1.7.2.1
+--- kmail/mboxjob.h	7 May 2004 21:27:44 -0000	1.7
++++ kmail/mboxjob.h	28 Dec 2004 19:54:13 -0000	1.7.2.1
+@@ -41,7 +41,7 @@
+ class MboxJob : public FolderJob
+ {
+   Q_OBJECT
+-  friend class KMFolderMbox;
++  friend class ::KMFolderMbox;
+ public:
+   MboxJob( KMMessage *msg, JobType jt = tGetMessage, KMFolder *folder = 0 );
+   MboxJob( QPtrList<KMMessage>& msgList, const QString& sets,
+Index: kmail/profiles/profile-default-rc.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kmail/profiles/profile-default-rc.desktop,v
+retrieving revision 1.99.2.3
+retrieving revision 1.99.2.5
+diff -u -r1.99.2.3 -r1.99.2.5
+--- kmail/profiles/profile-default-rc.desktop	26 Nov 2004 08:05:19 -0000	1.99.2.3
++++ kmail/profiles/profile-default-rc.desktop	9 Jan 2005 07:49:20 -0000	1.99.2.5
+@@ -31,7 +31,6 @@
+ Name[ja]=標準
+ Name[lt]=Nutylima
+ Name[lv]=Noklusētais
+-Name[mk]=Вообичаено
+ Name[mt]=Normali
+ Name[nb]=Standard
+ Name[nl]=Standaard
+@@ -41,6 +40,7 @@
+ Name[pt_BR]=Padrão
+ Name[ro]=Implicit
+ Name[ru]=По умолчанию
++Name[se]=Standárda
+ Name[sk]=Štandarné
+ Name[sl]=Privzeto
+ Name[sr]=Подразумевано
+@@ -93,6 +93,7 @@
+ Comment[pt_BR]=Perfil padrão
+ Comment[ro]=Profil standard
+ Comment[ru]=Обычный профиль
++Comment[se]=Standárdprofiila
+ Comment[sk]=Štandardný profil
+ Comment[sl]=Običajen profil
+ Comment[sr]=Стандардни профил
+Index: kmail/profiles/profile-high-contrast-rc.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kmail/profiles/profile-high-contrast-rc.desktop,v
+retrieving revision 1.121.2.3
+retrieving revision 1.121.2.4
+diff -u -r1.121.2.3 -r1.121.2.4
+--- kmail/profiles/profile-high-contrast-rc.desktop	29 Sep 2004 14:06:30 -0000	1.121.2.3
++++ kmail/profiles/profile-high-contrast-rc.desktop	29 Dec 2004 21:44:59 -0000	1.121.2.4
+@@ -1,5 +1,6 @@
+ [KMail Profile]
+ Name=High Contrast
++Name[ar]=تباين عالي
+ Name[bg]=Висок контраст
+ Name[bs]=Visoki kontrast
+ Name[ca]=Alt contrast
+Index: kmail/profiles/profile-purist-rc.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kmail/profiles/profile-purist-rc.desktop,v
+retrieving revision 1.87.2.2
+retrieving revision 1.87.2.3
+diff -u -r1.87.2.2 -r1.87.2.3
+--- kmail/profiles/profile-purist-rc.desktop	10 Nov 2004 07:37:27 -0000	1.87.2.2
++++ kmail/profiles/profile-purist-rc.desktop	9 Jan 2005 07:49:20 -0000	1.87.2.3
+@@ -23,6 +23,7 @@
+ Name[pt_BR]=Purista
+ Name[ro]=Puritan
+ Name[ru]=Пурист
++Name[se]=Oktageardán
+ Name[sr]=Чисто
+ Name[sr@Latn]=Čisto
+ Name[sv]=Ren
+Index: kmail/profiles/profile-secure-rc.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kmail/profiles/profile-secure-rc.desktop,v
+retrieving revision 1.132.2.2
+retrieving revision 1.132.2.4
+diff -u -r1.132.2.2 -r1.132.2.4
+--- kmail/profiles/profile-secure-rc.desktop	31 Aug 2004 07:23:13 -0000	1.132.2.2
++++ kmail/profiles/profile-secure-rc.desktop	9 Jan 2005 07:49:20 -0000	1.132.2.4
+@@ -1,5 +1,6 @@
+ [KMail Profile]
+ Name=Most Secure
++Name[ar]=الأكثر أمانا
+ Name[bg]=Сигурност
+ Name[bs]=Najsigurniji
+ Name[ca]=Més segur
+@@ -27,6 +28,7 @@
+ Name[pt]=Mais Seguro
+ Name[pt_BR]=Segurança Máxima
+ Name[ru]=Самый безопасный
++Name[se]=Sihkkareamus
+ Name[sk]=Najviac bezpečné
+ Name[sl]=Najbolj varen
+ Name[sr]=Најбезбедније
+@@ -39,6 +41,7 @@
+ Name[uz]=Жуда хавфсиз
+ Name[zh_CN]=最安全
+ Comment=Sets all necessary options to achieve maximum security
++Comment[ar]=تقوم بضبط كل الخيارات لتحقيق أعلى أمان
+ Comment[bg]=Режим, в който всички настройки за сигурност за включени
+ Comment[bs]=Postavlja sve potrebne opcije radi maksimalne sigurnosti
+ Comment[ca]=Estableix totes les opcions necessàries per aconseguir una seguretat màxima
+Index: kmobile/kmobile.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kmobile/kmobile.desktop,v
+retrieving revision 1.39.2.1
+retrieving revision 1.39.2.3
+diff -u -r1.39.2.1 -r1.39.2.3
+--- kmobile/kmobile.desktop	24 Aug 2004 06:32:15 -0000	1.39.2.1
++++ kmobile/kmobile.desktop	9 Jan 2005 07:49:21 -0000	1.39.2.3
+@@ -14,6 +14,7 @@
+ Name[ta]=கேநடமாடும் தொலைபேசி
+ 
+ GenericName=Manage Mobile Devices
++GenericName[ar]=إدارة الأجهزة النقالة
+ GenericName[be]=Кіраваньне мабільнымі прыладамі
+ GenericName[bg]=Мобилни устройства
+ GenericName[bs]=Upravljajte mobilnim uređajima
+@@ -41,6 +42,7 @@
+ GenericName[pt_BR]=Gerenciar Dispositivos Móveis
+ GenericName[ro]=Manager dispozitive mobile
+ GenericName[ru]=Управление мобильными устройствами
++GenericName[se]=Gieđahala mobilovttadagaid
+ GenericName[sk]=Správa prenosných zariadení
+ GenericName[sl]=Upravljaj mobilne naprave
+ GenericName[sr]=Управљање мобилним уређајима
+@@ -53,6 +55,7 @@
+ GenericName[zh_CN]=管理移动设备
+ 
+ Comment=A KDE Mobile Devices Manager
++Comment[ar]=مدير أجهزة KDE النقالة
+ Comment[be]=Кіраваньне мабільнымі прыладамі KDE
+ Comment[bg]=Управление на мобилни устройства
+ Comment[bs]=KDE upravitelj mobilnim uređajima
+Index: kmobile/libkmobile.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kmobile/libkmobile.desktop,v
+retrieving revision 1.31.2.2
+retrieving revision 1.31.2.3
+diff -u -r1.31.2.2 -r1.31.2.3
+--- kmobile/libkmobile.desktop	24 Oct 2004 07:05:58 -0000	1.31.2.2
++++ kmobile/libkmobile.desktop	29 Dec 2004 21:45:00 -0000	1.31.2.3
+@@ -3,6 +3,7 @@
+ Type=ServiceType
+ X-KDE-ServiceType=kdedevice/mobiledevice
+ Name=KDE Mobile Device Lowlevel Hardware Driver
++Name[ar]= متنقل KDE  برنامج بدائي لتشغيل جهاز 
+ Name[bs]=KDE hardverski drajver niskog nivoa za mobilne uređaje
+ Name[ca]=Manegador KDE de dispositius de maquinari mòbil de baix nivell
+ Name[cy]=Gyrrydd Caledwedd Lefel Isel KDE ar gyfer Dyfeisiau Symudol
+Index: kmobile/devices/digicam/libkmobile_digicam.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kmobile/devices/digicam/libkmobile_digicam.desktop,v
+retrieving revision 1.52.2.2
+retrieving revision 1.52.2.4
+diff -u -r1.52.2.2 -r1.52.2.4
+--- kmobile/devices/digicam/libkmobile_digicam.desktop	10 Nov 2004 07:37:27 -0000	1.52.2.2
++++ kmobile/devices/digicam/libkmobile_digicam.desktop	9 Jan 2005 07:49:21 -0000	1.52.2.4
+@@ -32,6 +32,7 @@
+ Name[pt_BR]=Câmera Digital
+ Name[ro]=Aparat foto digital
+ Name[ru]=Цифровая камера
++Name[se]=Digitálalaš govvenapperáhta
+ Name[sk]=Digitálny fotoaparát
+ Name[sl]=Digitalna kamera
+ Name[sr]=Дигитална камера
+@@ -44,6 +45,7 @@
+ Name[uz]=Рақамли камера
+ Name[zh_CN]=数码相机
+ Comment=This driver supports many digital cameras
++Comment[ar]=هذا المحرك يعتمد عددا من أجهزة التصوير الرقمية
+ Comment[bg]=Драйвер за поддръжка на цифрови фотоапарати и камери
+ Comment[bs]=Ovaj drajver podržava mnoge digitalne kamere
+ Comment[ca]=Aquest controlador suporta la gran majoria de càmeres digitals
+Index: kmobile/devices/gammu/libkmobile_gammu.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kmobile/devices/gammu/libkmobile_gammu.desktop,v
+retrieving revision 1.39.2.3
+retrieving revision 1.39.2.4
+diff -u -r1.39.2.3 -r1.39.2.4
+--- kmobile/devices/gammu/libkmobile_gammu.desktop	24 Oct 2004 07:05:58 -0000	1.39.2.3
++++ kmobile/devices/gammu/libkmobile_gammu.desktop	29 Dec 2004 21:45:00 -0000	1.39.2.4
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Mobile Phone or Organizer (gammu)
++Name[ar]=هاتف جوال أو منظم  (gammu)
+ Name[be]=Мабільны тэлефон ці арганізатар (gammu)
+ Name[bg]=Мобилни телефони или организатори (gammu)
+ Name[bs]=Mobilni telefon ili organizer (gammu)
+@@ -40,6 +41,7 @@
+ Name[uz]=Уяли телефон ёки органайзер (gammu)
+ Name[zh_CN]=移动电话或 PDA(gammu)
+ Comment=This driver supports many NOKIA and other mobile phones via the gammu library
++Comment[ar]=برنامج التشغيل هذا يعتمد عددا من من هواتف NOKIA و غيرها عن طريق مكتبة gammu
+ Comment[bg]=Драйвер за поддръжка на мобилни телефони, предимно Нокия, чрез библиотеката gammu
+ Comment[bs]=Ovaj drajver podržava mnoge NOKIA i druge mobilne telefone putem gammu biblioteke
+ Comment[ca]=Aquest controlador suporta la gran majoria de NOKIA i d'altres telèfons mòbil mitjançant la biblioteca «gammu»
+Index: kmobile/devices/gnokii/libkmobile_gnokii.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kmobile/devices/gnokii/libkmobile_gnokii.desktop,v
+retrieving revision 1.41.2.2
+retrieving revision 1.41.2.3
+diff -u -r1.41.2.2 -r1.41.2.3
+--- kmobile/devices/gnokii/libkmobile_gnokii.desktop	24 Oct 2004 07:05:58 -0000	1.41.2.2
++++ kmobile/devices/gnokii/libkmobile_gnokii.desktop	29 Dec 2004 21:45:01 -0000	1.41.2.3
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Mobile Phone or Organizer (gnokii)
++Name[ar]= (gnokii) هاتف جوال أو منظم
+ Name[be]=Мабільны тэлефон ці арганізатар (gnokii)
+ Name[bg]=Мобилни телефони или организатори (gnokii)
+ Name[bs]=Mobilni telefon ili organizer (gnokii)
+@@ -40,6 +41,7 @@
+ Name[uz]=Уяли телефон ёки органайзер (gnokii)
+ Name[zh_CN]=移动电话或 PDA(gnokii)
+ Comment=This driver supports many NOKIA and other mobile phones via the gnokii library
++Comment[ar]=برنامج التشغيل هذا يعتمد عددا من من هواتف NOKIA و غيرها عن طريق مكتبة gnokii
+ Comment[bg]=Драйвер за поддръжка на мобилни телефони, предимно Нокия, чрез библиотеката gnokii
+ Comment[bs]=Ovaj drajver podržava mnoge NOKIA i druge mobilne telefone putem gnokii biblioteke
+ Comment[ca]=Aquest controlador suporta la gran majoria de NOKIA i d'altres telèfons mòbil mitjançant la biblioteca «gnokii»
+Index: kmobile/devices/skeleton/libkmobile_skeleton.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kmobile/devices/skeleton/libkmobile_skeleton.desktop,v
+retrieving revision 1.38.2.1
+retrieving revision 1.38.2.2
+diff -u -r1.38.2.1 -r1.38.2.2
+--- kmobile/devices/skeleton/libkmobile_skeleton.desktop	24 Aug 2004 06:32:16 -0000	1.38.2.1
++++ kmobile/devices/skeleton/libkmobile_skeleton.desktop	29 Dec 2004 21:45:01 -0000	1.38.2.2
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Skeleton Device
++Name[ar]=جهاز أساسي
+ Name[bg]=Организатори
+ Name[bs]=Skeleton uređaj
+ Name[ca]=Dispositiu Skeleton
+@@ -38,6 +39,7 @@
+ Name[uk]=Прототип пристрою
+ Name[zh_CN]=万能设备
+ Comment=Mobile Skeleton Device
++Comment[ar]=جهاز أساسي نقال
+ Comment[bg]=Мобилни организатори (устройства)
+ Comment[bs]=Mobilni skeleton uređaj
+ Comment[ca]=Dispositiu mòbil Skeleton
+Index: kmobile/kioslave/mimetypes/mobile_addressbook.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kmobile/kioslave/mimetypes/mobile_addressbook.desktop,v
+retrieving revision 1.38.2.1
+retrieving revision 1.38.2.2
+diff -u -r1.38.2.1 -r1.38.2.2
+--- kmobile/kioslave/mimetypes/mobile_addressbook.desktop	24 Aug 2004 06:32:16 -0000	1.38.2.1
++++ kmobile/kioslave/mimetypes/mobile_addressbook.desktop	29 Dec 2004 21:45:01 -0000	1.38.2.2
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Comment=Contacts in Mobile Device
++Comment[ar]=جهات الإتصال في جهاز نقال
+ Comment[be]=Кантакты ў мабільнай прыладзе
+ Comment[bg]=Контакти в мобилни устройства
+ Comment[bs]=Kontakti u mobilnom uređaju
+Index: kmobile/kioslave/mimetypes/mobile_calendar.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kmobile/kioslave/mimetypes/mobile_calendar.desktop,v
+retrieving revision 1.40.2.3
+retrieving revision 1.40.2.4
+diff -u -r1.40.2.3 -r1.40.2.4
+--- kmobile/kioslave/mimetypes/mobile_calendar.desktop	10 Nov 2004 07:37:28 -0000	1.40.2.3
++++ kmobile/kioslave/mimetypes/mobile_calendar.desktop	29 Dec 2004 21:45:01 -0000	1.40.2.4
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Comment=Calendar in Mobile Device
++Comment[ar]=تقوبم في جهاز نقال
+ Comment[be]=Каляндар у мабільнай прыладзе
+ Comment[bg]=Календар в мобилни устройства
+ Comment[bs]=Kalendar u mobilnom uređaju
+Index: kmobile/kioslave/mimetypes/mobile_device.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kmobile/kioslave/mimetypes/mobile_device.desktop,v
+retrieving revision 1.37.2.1
+retrieving revision 1.37.2.3
+diff -u -r1.37.2.1 -r1.37.2.3
+--- kmobile/kioslave/mimetypes/mobile_device.desktop	24 Aug 2004 06:32:17 -0000	1.37.2.1
++++ kmobile/kioslave/mimetypes/mobile_device.desktop	9 Jan 2005 07:49:21 -0000	1.37.2.3
+@@ -1,8 +1,10 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Comment=Mobile Device
++Comment[ar]= جهاز نقال
+ Comment[be]=Мабільная прылада
+ Comment[bg]=Мобилни устройства
++Comment[br]=Trobarzhell lem-laka
+ Comment[bs]=Mobilni uređaj
+ Comment[ca]=Dispositiu mòbil
+ Comment[cs]=Mobilní zařízení
+@@ -28,6 +30,7 @@
+ Comment[pt_BR]=Dispositivo Móvel
+ Comment[ro]=Dispozitiv mobil
+ Comment[ru]=Мобильное устройство
++Comment[se]=Mobilovttadat
+ Comment[sk]=Prenosné zariadenie
+ Comment[sl]=Mobilna naprava
+ Comment[sr]=Мобилни уређај
+Index: kmobile/kioslave/mimetypes/mobile_notes.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kmobile/kioslave/mimetypes/mobile_notes.desktop,v
+retrieving revision 1.36.2.4
+retrieving revision 1.36.2.5
+diff -u -r1.36.2.4 -r1.36.2.5
+--- kmobile/kioslave/mimetypes/mobile_notes.desktop	13 Nov 2004 07:20:52 -0000	1.36.2.4
++++ kmobile/kioslave/mimetypes/mobile_notes.desktop	29 Dec 2004 21:45:01 -0000	1.36.2.5
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Comment=Notes in Mobile Device
++Comment[ar]=ملاحظات في جهاز نقال
+ Comment[be]=Нататкі ў мабільнай прыладзе
+ Comment[bg]=Бележки в мобилни устройства
+ Comment[bs]=Bilješke u mobilnom uređaju
+Index: knode/KNode.desktop
+===================================================================
+RCS file: /home/kde/kdepim/knode/KNode.desktop,v
+retrieving revision 1.178.2.3
+retrieving revision 1.178.2.5
+diff -u -r1.178.2.3 -r1.178.2.5
+--- knode/KNode.desktop	10 Nov 2004 07:37:28 -0000	1.178.2.3
++++ knode/KNode.desktop	9 Jan 2005 07:49:22 -0000	1.178.2.5
+@@ -9,7 +9,6 @@
+ Name[ar]=قارئ الأخبار
+ Name[eo]=Diskutrondoj
+ Name[hi]=के-नोड
+-Name[mk]=КNode
+ Name[ro]=Ştiri Internet
+ Name[sv]=Knode
+ Name[ta]=Kநோடு
+@@ -43,7 +42,6 @@
+ GenericName[ja]=ニュースリーダ
+ GenericName[lt]=Naujienų skaityklė
+ GenericName[lv]=Ziņu Lasītājs
+-GenericName[mk]=Програм за читање дискусиони групи
+ GenericName[mt]=Qarrej tal-aħbarijiet (news)
+ GenericName[nb]=Njusleser
+ GenericName[nl]=Nieuwslezer
+@@ -53,6 +51,7 @@
+ GenericName[pt_BR]=Leitor de Notícias
+ GenericName[ro]=Cititor de ştiri USENET
+ GenericName[ru]=Программа для чтения новостей
++GenericName[se]=Ođaslogan
+ GenericName[sk]=Prehliadač správ
+ GenericName[sl]=Bralnik novic
+ GenericName[sr]=Читач вести
+Index: knode/knode_config_accounts.desktop
+===================================================================
+RCS file: /home/kde/kdepim/knode/knode_config_accounts.desktop,v
+retrieving revision 1.25.2.10
+retrieving revision 1.25.2.12
+diff -u -r1.25.2.10 -r1.25.2.12
+--- knode/knode_config_accounts.desktop	13 Nov 2004 07:20:52 -0000	1.25.2.10
++++ knode/knode_config_accounts.desktop	9 Jan 2005 07:49:22 -0000	1.25.2.12
+@@ -13,6 +13,7 @@
+ X-KDE-CfgDlgHierarchy=KNode
+ 
+ Name=Accounts
++Name[ar]=حسابات
+ Name[be]=Рахункі
+ Name[bg]=Сметки
+ Name[br]=Kontoù
+@@ -38,6 +39,7 @@
+ Name[pt]=Contas
+ Name[pt_BR]=Contas
+ Name[ru]=Учётные записи
++Name[se]=Kontut
+ Name[sk]=Účty
+ Name[sl]=Računi
+ Name[sr]=Налози
+@@ -50,6 +52,7 @@
+ Name[wa]=Contes
+ Name[zh_CN]=账户
+ Comment=Setup for Newsgroup and Mail Servers
++Comment[ar]=إعدادت ملقمات البريد و المجموعات الإخبارية
+ Comment[bg]=Настройки на групите и пощенските сървъри
+ Comment[bs]=Postavke za newsgrupe i mail servere
+ Comment[ca]=Configuració dels grups de notícies i servidors de correu
+@@ -72,6 +75,7 @@
+ Comment[pt]=Configuração de Servidores de Notícias e de E-mail
+ Comment[pt_BR]=Configura Grupos de Discussão e Servidores de E-mails
+ Comment[ru]=Учётные записи на почтовых серверах и серверах телеконференций
++Comment[se]=Heivet Usenet- ja e-boastabálvváid
+ Comment[sk]=Nastavenie serverov pre poštu a diskusné skupiny
+ Comment[sl]=Nastavitve za novične in poštne strežnike
+ Comment[sr]=Поставке за групе новости и сервере поште
+Index: knode/knode_config_appearance.desktop
+===================================================================
+RCS file: /home/kde/kdepim/knode/knode_config_appearance.desktop,v
+retrieving revision 1.22.2.11
+retrieving revision 1.22.2.14
+diff -u -r1.22.2.11 -r1.22.2.14
+--- knode/knode_config_appearance.desktop	26 Nov 2004 08:05:19 -0000	1.22.2.11
++++ knode/knode_config_appearance.desktop	9 Jan 2005 07:49:22 -0000	1.22.2.14
+@@ -13,6 +13,7 @@
+ X-KDE-CfgDlgHierarchy=KNode
+ 
+ Name=Appearance
++Name[ar]=مظهر
+ Name[be]=Зьнешні выгляд
+ Name[bg]=Външност
+ Name[br]=Neuziadur
+@@ -35,6 +36,7 @@
+ Name[is]=Útlit
+ Name[it]=Aspetto
+ Name[ja]=外観
++Name[mk]=Изглед
+ Name[nb]=Utseende
+ Name[nl]=Uiterlijk
+ Name[nn]=Utsjånad
+@@ -54,6 +56,7 @@
+ Name[wa]=Rivnance
+ Name[zh_CN]=外观
+ Comment=Customize Visual Appearance
++Comment[ar]=تخصيص العرض
+ Comment[bg]=Настройки на външността
+ Comment[bs]=Prilagodi izgled
+ Comment[ca]=Personalitza l'aparença visual
+@@ -78,6 +81,7 @@
+ Comment[pt]=Personalizar a Aparência Visual
+ Comment[pt_BR]=Personalizar Aparência Visual
+ Comment[ru]=Настройка внешнего вида
++Comment[se]=Heivet fárdda
+ Comment[sk]=Prispôsobenie vzhľadu
+ Comment[sl]=Prilagodi videz
+ Comment[sr]=Прилагодите визуелни приказ
+Index: knode/knode_config_cleanup.desktop
+===================================================================
+RCS file: /home/kde/kdepim/knode/knode_config_cleanup.desktop,v
+retrieving revision 1.22.2.8
+retrieving revision 1.22.2.11
+diff -u -r1.22.2.8 -r1.22.2.11
+--- knode/knode_config_cleanup.desktop	13 Nov 2004 07:20:52 -0000	1.22.2.8
++++ knode/knode_config_cleanup.desktop	9 Jan 2005 07:49:22 -0000	1.22.2.11
+@@ -13,6 +13,7 @@
+ X-KDE-CfgDlgHierarchy=KNode
+ 
+ Name=Cleanup
++Name[ar]=تنظيف
+ Name[bg]=Изчистване
+ Name[bs]=Čišćenje
+ Name[ca]=Neteja
+@@ -35,6 +36,7 @@
+ Name[pt]=Limpeza
+ Name[pt_BR]=Limpeza
+ Name[ru]=Очистка диска
++Name[se]=Čorge
+ Name[sk]=Vyčistenie
+ Name[sl]=Čiščenje
+ Name[sr]=Чишћење
+@@ -45,9 +47,11 @@
+ Name[uk]=Очищення диску
+ Name[zh_CN]=清理
+ Comment=Preserving Disk Space
++Comment[ar]=المحافظة على مساحات التخزين في القرص
+ Comment[bg]=Освобождаване на свободно място на диска
+ Comment[bs]=Čuvanje prostora na disku
+ Comment[ca]=Preservar l'espai a disc
++Comment[cs]=Zachování místa na disku
+ Comment[da]=Bevarer diskplads
+ Comment[de]=Plattenplatz bewahren
+ Comment[es]=Preservar el espacio de disco
+Index: knode/knode_config_identity.desktop
+===================================================================
+RCS file: /home/kde/kdepim/knode/knode_config_identity.desktop,v
+retrieving revision 1.24.2.11
+retrieving revision 1.24.2.13
+diff -u -r1.24.2.11 -r1.24.2.13
+--- knode/knode_config_identity.desktop	19 Nov 2004 07:37:43 -0000	1.24.2.11
++++ knode/knode_config_identity.desktop	9 Jan 2005 07:49:22 -0000	1.24.2.13
+@@ -13,6 +13,7 @@
+ X-KDE-CfgDlgHierarchy=KNode
+ 
+ Name=Identity
++Name[ar]=معرف
+ Name[be]=Увасабленьне
+ Name[bg]=Самоличност
+ Name[br]=Anvelezh
+@@ -38,6 +39,7 @@
+ Name[pt]=Identidade
+ Name[pt_BR]=Identidade
+ Name[ru]=Профиль
++Name[se]=Identitehta
+ Name[sk]=Identita
+ Name[sl]=Identiteta
+ Name[sr]=Идентитет
+@@ -74,6 +76,7 @@
+ Comment[pt]=Informação Pessoal
+ Comment[pt_BR]=Informações Pessoais
+ Comment[ru]=Персональная информация
++Comment[se]=Peršuvnnalaš dieđut
+ Comment[sk]=Osobné informácie
+ Comment[sl]=Osebne informacije
+ Comment[sr]=Лична информација
+Index: knode/knode_config_post_news.desktop
+===================================================================
+RCS file: /home/kde/kdepim/knode/knode_config_post_news.desktop,v
+retrieving revision 1.21.2.8
+retrieving revision 1.21.2.9
+diff -u -r1.21.2.8 -r1.21.2.9
+--- knode/knode_config_post_news.desktop	13 Nov 2004 07:20:52 -0000	1.21.2.8
++++ knode/knode_config_post_news.desktop	29 Dec 2004 21:45:02 -0000	1.21.2.9
+@@ -13,6 +13,7 @@
+ X-KDE-CfgDlgHierarchy=KNode
+ 
+ Name=Posting News
++Name[ar]=نشر الأخبار
+ Name[bg]=Изпращане
+ Name[bs]=Slanje na Usenet
+ Name[ca]=Enviament de notícies
+Index: knode/knode_config_privacy.desktop
+===================================================================
+RCS file: /home/kde/kdepim/knode/knode_config_privacy.desktop,v
+retrieving revision 1.22.2.8
+retrieving revision 1.22.2.9
+diff -u -r1.22.2.8 -r1.22.2.9
+--- knode/knode_config_privacy.desktop	13 Nov 2004 07:20:52 -0000	1.22.2.8
++++ knode/knode_config_privacy.desktop	29 Dec 2004 21:45:02 -0000	1.22.2.9
+@@ -13,6 +13,7 @@
+ X-KDE-CfgDlgHierarchy=KNode
+ 
+ Name=Signing/Verifying
++Name[ar]=االتوقيع و التأكد
+ Name[bg]=Подпис/проверка
+ Name[bs]=Potpisivanje/Provjera
+ Name[ca]=Signat/Verificació
+@@ -45,6 +46,7 @@
+ Name[uk]=Підписування і перевірка
+ Name[zh_CN]=签名/校验
+ Comment=Protect your privacy by signing and verifying postings
++Comment[ar]=إحم خصوصيتك عن طريق توقيع و التأكد من المنشورات
+ Comment[bg]=Защита на личната кореспонденция чрез подписване и проверка на съобщенията
+ Comment[bs]=Zaštitite vašu privatnost potpisivanjem i provjerom postinga
+ Comment[ca]=Protegiu la vostra privacitat signant i verificant els missatges
+Index: knode/knode_config_read_news.desktop
+===================================================================
+RCS file: /home/kde/kdepim/knode/knode_config_read_news.desktop,v
+retrieving revision 1.22.2.7
+retrieving revision 1.22.2.8
+diff -u -r1.22.2.7 -r1.22.2.8
+--- knode/knode_config_read_news.desktop	13 Nov 2004 07:20:52 -0000	1.22.2.7
++++ knode/knode_config_read_news.desktop	29 Dec 2004 21:45:02 -0000	1.22.2.8
+@@ -13,6 +13,7 @@
+ X-KDE-CfgDlgHierarchy=KNode
+ 
+ Name=Reading News
++Name[ar]=قراءة الأخبار
+ Name[be]=Чытаньне навін
+ Name[bg]=Четене
+ Name[bs]=Čitanje Useneta
+Index: knotes/knotes.desktop
+===================================================================
+RCS file: /home/kde/kdepim/knotes/knotes.desktop,v
+retrieving revision 1.283.2.1
+retrieving revision 1.283.2.2
+diff -u -r1.283.2.1 -r1.283.2.2
+--- knotes/knotes.desktop	24 Aug 2004 06:32:21 -0000	1.283.2.1
++++ knotes/knotes.desktop	12 Dec 2004 08:32:48 -0000	1.283.2.2
+@@ -33,6 +33,7 @@
+ GenericName[ja]=ポップアップノート
+ GenericName[lt]=Pastabos lapeliuose
+ GenericName[lv]=Izlecošās Piezīmes
++GenericName[mk]=Скокачки пораки
+ GenericName[mt]=Noti żgħar
+ GenericName[nb]=Oppsprett-notater
+ GenericName[nl]=Notities
+@@ -68,6 +69,7 @@
+ Name[hi]=के-नोट्स
+ Name[hr]=Bilješka
+ Name[lv]=KPiezīmes
++Name[mk]=Блешки
+ Name[nso]=KDitshwao
+ Name[pl]=Notatki
+ Name[ro]=Notiţe
+Index: knotes/local.desktop
+===================================================================
+RCS file: /home/kde/kdepim/knotes/local.desktop,v
+retrieving revision 1.22.2.7
+retrieving revision 1.22.2.8
+diff -u -r1.22.2.7 -r1.22.2.8
+--- knotes/local.desktop	13 Nov 2004 07:20:53 -0000	1.22.2.7
++++ knotes/local.desktop	29 Dec 2004 21:45:02 -0000	1.22.2.8
+@@ -3,6 +3,7 @@
+ Name=Notes in Local File
+ Name[be]=Нататкі ў лякальным файле
+ Name[bg]=Бележки в локален файл
++Name[br]=Notennoù e rstr lec'hel
+ Name[bs]=Bilješke u lokalnoj datoteci
+ Name[ca]=Notas a fitxer local
+ Name[cs]=Poznámky v lokálním souboru
+Index: kontact/interfaces/kontactplugin.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kontact/interfaces/kontactplugin.desktop,v
+retrieving revision 1.80.2.3
+retrieving revision 1.80.2.5
+diff -u -r1.80.2.3 -r1.80.2.5
+--- kontact/interfaces/kontactplugin.desktop	28 Nov 2004 08:34:00 -0000	1.80.2.3
++++ kontact/interfaces/kontactplugin.desktop	9 Jan 2005 07:49:22 -0000	1.80.2.5
+@@ -2,6 +2,7 @@
+ Type=ServiceType
+ X-KDE-ServiceType=Kontact/Plugin
+ Name=Kontact Plugin
++Name[ar]=أداة إضافية لـ Kontact
+ Name[be]=Дапаўненьне Кантакту
+ Name[bg]=Приставка на Kontact
+ Name[br]=Lugent Kontact
+@@ -30,6 +31,7 @@
+ Name[pt_BR]=Plug-in do Kontact
+ Name[ro]=Modul Kontact
+ Name[ru]=Модуль Kontact
++Name[se]=Kontact-lassemoduvla
+ Name[sl]=Vstavek za Kontact
+ Name[sr]=Прикључак Kontact-а
+ Name[sr@Latn]=Priključak Kontact-a
+Index: kontact/plugins/kaddressbook/kaddressbookplugin.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kontact/plugins/kaddressbook/kaddressbookplugin.desktop,v
+retrieving revision 1.46.2.4
+retrieving revision 1.46.2.6
+diff -u -r1.46.2.4 -r1.46.2.6
+--- kontact/plugins/kaddressbook/kaddressbookplugin.desktop	28 Nov 2004 08:34:00 -0000	1.46.2.4
++++ kontact/plugins/kaddressbook/kaddressbookplugin.desktop	9 Jan 2005 07:49:22 -0000	1.46.2.6
+@@ -17,8 +17,10 @@
+ X-KDE-PluginInfo-EnabledByDefault=true
+ 
+ Comment=Kontact KAddressBook Plugin
++Comment[ar]=أداة إضافية لدفتر عناوين Kontact
+ Comment[be]=Дапаўненьне Кантакту "K Адрасная кніга"
+ Comment[bg]=Приставка за адресника
++Comment[br]=Lugent Kontact KAddressBook
+ Comment[bs]=Kontact KAddressBook dodatak
+ Comment[ca]=Endollable de la llibreta d'adreces per a Kontact
+ Comment[cs]=Modul Knihy adres pro Kontact
+@@ -45,6 +47,7 @@
+ Comment[pt_BR]=Plug-in para KAddressBook do Kontact
+ Comment[ro]=Modul KAddressBook pentru Kontact
+ Comment[ru]=Модуль Kontact для доступа к адресной книге
++Comment[se]=Kontact, KDE-čujuhusgirjji lassemoduvla
+ Comment[sl]=Vstavek Adresarja za Kontact
+ Comment[sr]=Прикључак Kontact-а за KAddressBook
+ Comment[sr@Latn]=Priključak Kontact-a za KAddressBook
+@@ -56,7 +59,9 @@
+ Comment[uz]=Kontact учун KAddressBook плагини
+ Comment[zh_CN]=Kontact KAddressbook 插件
+ Name=Contacts
++Name[ar]=جهات الإتصال
+ Name[be]=Кантакты
++Name[br]=Darempredoù
+ Name[bs]=Kontakti
+ Name[ca]=Contactes
+ Name[cs]=Kontakty
+@@ -81,6 +86,7 @@
+ Name[pt_BR]=Contatos
+ Name[ro]=Contacte
+ Name[ru]=Контакты
++Name[se]=Oktavuođat
+ Name[sk]=Kontakty
+ Name[sl]=Stiki
+ Name[sr]=Контакти
+Index: kontact/plugins/kaddressbook/kcmkabsummary.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kontact/plugins/kaddressbook/kcmkabsummary.desktop,v
+retrieving revision 1.27.2.7
+retrieving revision 1.27.2.9
+diff -u -r1.27.2.7 -r1.27.2.9
+--- kontact/plugins/kaddressbook/kcmkabsummary.desktop	13 Nov 2004 07:20:53 -0000	1.27.2.7
++++ kontact/plugins/kaddressbook/kcmkabsummary.desktop	9 Jan 2005 07:49:22 -0000	1.27.2.9
+@@ -12,6 +12,7 @@
+ X-KDE-CfgDlgHierarchy=KAddressBook
+ 
+ Name=Address Book Summary
++Name[ar]=ملخص دفتر العناوين
+ Name[bg]=Обобщение на адресника
+ Name[bs]=Sažetak za adresar
+ Name[ca]=Resum de la llibreta d'adreces
+@@ -33,6 +34,7 @@
+ Name[pt]=Sumário do Livro de Endereços
+ Name[pt_BR]=Resumo do Livro de Endereços
+ Name[ru]=Контакты
++Name[se]=Čujuhusgirjji čoahkkáigeassu
+ Name[sk]=Súhrn adresára
+ Name[sl]=Povzetek Adresarja
+ Name[sr]=Сажетак адресара
+@@ -43,6 +45,7 @@
+ Name[uk]=Підсумок адресної книги
+ Name[zh_CN]=地址簿摘要
+ Comment=Address Book Summary Setup
++Comment[ar]=إعداد ملخص دفتر العناوين
+ Comment[bg]=Настройки на обобщението на адресника
+ Comment[bs]=Podešavanje sažetka za Adresar
+ Comment[ca]=Configuració del resum de la llibreta d'adreces
+@@ -64,6 +67,7 @@
+ Comment[pt]=Configuração do Sumário do Livro de Endereços
+ Comment[pt_BR]=Configuração do Resumo do Livro de Endereços
+ Comment[ru]=Модуль дайджеста контактов
++Comment[se]=Heivet čujuhusgirjji čoahkkáigeasu
+ Comment[sk]=Nastavenie súhrnu adresára
+ Comment[sl]=Nastavitve povzetka Adresarja
+ Comment[sr]=Подешавање сажетка адресара
+@@ -74,6 +78,7 @@
+ Comment[uk]=Налаштування підсумку адресної книги
+ Comment[zh_CN]=地址簿摘要设置
+ Keywords=birthday, anniversary, configure, settings
++Keywords[ar]=تاريخ الميلاد, إحتفال بذكرى, ضبط, إعدادات
+ Keywords[be]=дзень нараджэньня, гадавіна, настроіць, настройкі, birthday, anniversary, configure, settings
+ Keywords[bg]=рождени, рожден, дни, ден, годишнина, годишнини, обобщение, birthday, anniversary, configure, settings
+ Keywords[bs]=birthday, anniversary, configure, settings, rođendan, godišnjica, postavke
+Index: kontact/plugins/kitchensync/kitchensync.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kontact/plugins/kitchensync/kitchensync.desktop,v
+retrieving revision 1.54.2.4
+retrieving revision 1.54.2.6
+diff -u -r1.54.2.4 -r1.54.2.6
+--- kontact/plugins/kitchensync/kitchensync.desktop	28 Nov 2004 08:34:00 -0000	1.54.2.4
++++ kontact/plugins/kitchensync/kitchensync.desktop	9 Jan 2005 07:49:22 -0000	1.54.2.6
+@@ -14,7 +14,9 @@
+ X-KDE-PluginInfo-EnabledByDefault=false
+ 
+ Comment=KitchenSync Plugin
++Comment[ar]=أداة إضافية KitchenSyn 
+ Comment[bg]=Приставка за синхронизация
++Comment[br]=Lugent KitchenSync
+ Comment[bs]=KitchenSync dodatak
+ Comment[ca]=Endollable KitchenSync
+ Comment[cs]=Modul KitchenSync
+@@ -40,6 +42,7 @@
+ Comment[pt]='Plugin' do KitchenSync
+ Comment[pt_BR]=Plug-in para KitchenSync
+ Comment[ru]=Модуль KitchenSync
++Comment[se]=KitchenSync-lassemoduvla
+ Comment[sk]=Modul pre KitchenSync
+ Comment[sl]=Vstavek KitchenSync
+ Comment[sr]=Прикључак KitchenSync-а
+@@ -80,6 +83,7 @@
+ Name[pt_BR]=Sincronização
+ Name[ro]=Sincronizare
+ Name[ru]=Синхронизация
++Name[se]=Buohtalastin
+ Name[sk]=Synchronizácia
+ Name[sl]=Usklajevanje
+ Name[sr]=Синхронизација
+Index: kontact/plugins/kmail/kcmkmailsummary.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kontact/plugins/kmail/kcmkmailsummary.desktop,v
+retrieving revision 1.26.2.8
+retrieving revision 1.26.2.10
+diff -u -r1.26.2.8 -r1.26.2.10
+--- kontact/plugins/kmail/kcmkmailsummary.desktop	13 Nov 2004 07:20:53 -0000	1.26.2.8
++++ kontact/plugins/kmail/kcmkmailsummary.desktop	9 Jan 2005 07:49:23 -0000	1.26.2.10
+@@ -12,6 +12,7 @@
+ X-KDE-CfgDlgHierarchy=KMail
+ 
+ Name=Mail Summary
++Name[ar]=ملخص البريد
+ Name[bg]=Обобщение на писмата
+ Name[bs]=Mail sažetak
+ Name[ca]=Resum de correu
+@@ -34,6 +35,7 @@
+ Name[pt]=Resumo de E-mail
+ Name[pt_BR]=Resumo
+ Name[ru]=Почта
++Name[se]=E-boastačoahkkáigeassu
+ Name[sk]=Súhrn poštypošty
+ Name[sl]=Povzetek pošte
+ Name[sr]=Сажетак поште
+@@ -44,6 +46,7 @@
+ Name[uk]=Підсумок пошти
+ Name[zh_CN]=邮件摘要
+ Comment=Mail Summary Setup
++Comment[ar]=إعداد ملخص البريد
+ Comment[bg]=Настройки на обобщението на писмата
+ Comment[bs]=Postavke mail sažetka
+ Comment[ca]=Configuració del resum de correu
+@@ -66,6 +69,7 @@
+ Comment[pt]=Configuração do Sumário de E-mail
+ Comment[pt_BR]=Configuração de Resumo de E-mail
+ Comment[ru]=Настройка дайджеста почты
++Comment[se]=Heivet e-boastačoahkkáigeasu
+ Comment[sk]=Nastavenie súhrnu pošty
+ Comment[sl]=Nastavitve povzetka pošte
+ Comment[sr]=Подешавање сажетка поште
+@@ -76,6 +80,7 @@
+ Comment[uk]=Налаштування підсумку пошти
+ Comment[zh_CN]=邮件摘要设置
+ Keywords=email, summary, configure, settings
++Keywords[ar]=بريد إلكتروني, ملخص, ضبط, إعدادات
+ Keywords[bg]=резюме, общо, обобщение, пощенски, клиент, е-поща, email, summary, configure, settings
+ Keywords[bs]=email, summary, configure, settings, sažetak, postavke
+ Keywords[ca]=correu-e, resum, configuració, arranjament
+Index: kontact/plugins/kmail/kmailplugin.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kontact/plugins/kmail/kmailplugin.desktop,v
+retrieving revision 1.62.2.5
+retrieving revision 1.62.2.7
+diff -u -r1.62.2.5 -r1.62.2.7
+--- kontact/plugins/kmail/kmailplugin.desktop	28 Nov 2004 08:34:01 -0000	1.62.2.5
++++ kontact/plugins/kmail/kmailplugin.desktop	9 Jan 2005 07:49:23 -0000	1.62.2.7
+@@ -18,8 +18,10 @@
+ X-KDE-PluginInfo-EnabledByDefault=true
+ 
+ Comment=Kontact KMail Plugin
++Comment[ar]= Kontact KMail أداة إضافية لـ
+ Comment[be]=Дапаўненьне Кантакту "K Пошта"
+ Comment[bg]=Приставка връзка между пощата и адресника
++Comment[br]=Lugent Kontact KMail
+ Comment[bs]=Kontact KMail dodatak
+ Comment[ca]=Endollable KMail per a Kontact
+ Comment[cs]=Modul KMailu pro aplikaci Kontact
+@@ -46,6 +48,7 @@
+ Comment[pt_BR]=Plug-in para KMail do Kontact
+ Comment[ro]=Modul KMail pentru Kontact
+ Comment[ru]=Модуль Kontact для доступа к KMail
++Comment[se]=Kontackt, KMail-lassemoduvla
+ Comment[sl]=Vstavek KMaila za Kontact
+ Comment[sr]=Прикључак Kontact-а за KMail
+ Comment[sr@Latn]=Priključak Kontact-a za KMail
+@@ -57,6 +60,7 @@
+ Comment[uz]=Kontact учун KMail плагини
+ Comment[zh_CN]=Kontact KMail 插件
+ Name=Mail
++Name[ar]=بريد
+ Name[be]=Пошта
+ Name[br]=Lizher
+ Name[ca]=Correu
+@@ -85,6 +89,7 @@
+ Name[pt_BR]=Correio
+ Name[ro]=E-Mail
+ Name[ru]=Почта
++Name[se]=E-boasta
+ Name[sk]=Pošta
+ Name[sl]=Pošta
+ Name[sr]=Пошта
+Index: kontact/plugins/knode/knodeplugin.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kontact/plugins/knode/knodeplugin.desktop,v
+retrieving revision 1.48.2.5
+retrieving revision 1.48.2.7
+diff -u -r1.48.2.5 -r1.48.2.7
+--- kontact/plugins/knode/knodeplugin.desktop	28 Nov 2004 08:34:01 -0000	1.48.2.5
++++ kontact/plugins/knode/knodeplugin.desktop	9 Jan 2005 07:49:23 -0000	1.48.2.7
+@@ -15,8 +15,10 @@
+ X-KDE-PluginInfo-EnabledByDefault=false
+ 
+ Comment=Kontact KNode Plugin
++Comment[ar]=Kontact KNodel أداة إضافية لـ
+ Comment[be]=Дапаўненьне Кантакту "KNode"
+ Comment[bg]=Приставка за четене на новини
++Comment[br]=Lugent Kontact KNode
+ Comment[bs]=Kontact KNode dodatak
+ Comment[ca]=Endollable KNode per a Kontact
+ Comment[cs]=Modul KNode pro aplikaci Kontact
+@@ -43,6 +45,7 @@
+ Comment[pt_BR]=Plug-in para Knode do Kontact
+ Comment[ro]=Modul KNode pentru Kontact
+ Comment[ru]=Модуль Kontact для доступа к KNode
++Comment[se]=Kontact, KNode-lassemoduvla
+ Comment[sk]=Modul KNode pre Kontact
+ Comment[sl]=Vstavek KNode za Kontact
+ Comment[sr]=Прикључак Kontact-а за KNode
+@@ -55,6 +58,7 @@
+ Comment[uz]=Kontact учун KNode плагини
+ Comment[zh_CN]=Kontact KNode 插件
+ Name=News
++Name[ar]=أخبار
+ Name[be]=Навіны
+ Name[br]=Keleier
+ Name[bs]=Usenet
+@@ -80,6 +84,7 @@
+ Name[pt_BR]=Notícias
+ Name[ro]=Ştiri
+ Name[ru]=Новости
++Name[se]=Ođđasat
+ Name[sk]=Diskusné skupiny
+ Name[sl]=Novice
+ Name[sr]=Вести
+Index: kontact/plugins/knotes/knotesplugin.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kontact/plugins/knotes/knotesplugin.desktop,v
+retrieving revision 1.41.2.4
+retrieving revision 1.41.2.6
+diff -u -r1.41.2.4 -r1.41.2.6
+--- kontact/plugins/knotes/knotesplugin.desktop	28 Nov 2004 08:34:01 -0000	1.41.2.4
++++ kontact/plugins/knotes/knotesplugin.desktop	9 Jan 2005 07:49:23 -0000	1.41.2.6
+@@ -15,8 +15,10 @@
+ X-KDE-PluginInfo-EnabledByDefault=true
+ 
+ Comment=Kontact KNotes Plugin
++Comment[ar]= Kontact KNotes أداة إضافية لـ
+ Comment[be]=Дапаўненьне Кантакту "K Нататкі"
+ Comment[bg]=Приставка за бележки
++Comment[br]=Lugent Kontact KNotes
+ Comment[bs]=Kontact KNotes dodatak
+ Comment[ca]=Endollable KNotes per a Kontact
+ Comment[cs]=Modul KNotes pro aplikaci Kontact
+@@ -43,6 +45,7 @@
+ Comment[pt_BR]=Plug-in para Knotes do Kontact
+ Comment[ro]=Modul KNotes pentru Kontact
+ Comment[ru]=Модуль Kontact для доступа к заметкам
++Comment[se]=Kontact, KNotes-lassemoduvla
+ Comment[sl]=Vstavek KNotes za Kontact
+ Comment[sr]=Прикључак Kontact-а за KNotes
+ Comment[sr@Latn]=Priključak Kontact-a za KNotes
+@@ -54,6 +57,7 @@
+ Comment[uz]=Kontact учун KNotes плагини
+ Comment[zh_CN]=Kontact KNotes 插件
+ Name=Notes
++Name[ar]=الملاحظات
+ Name[be]=Нататкі
+ Name[br]=Notennoù
+ Name[bs]=Bilješke
+@@ -78,6 +82,7 @@
+ Name[pt_BR]=Notas
+ Name[ro]=Notiţe
+ Name[ru]=Заметки
++Name[se]=Nohtat
+ Name[sk]=Poznámky
+ Name[sl]=Notice
+ Name[sr]=Белешке
+Index: kontact/plugins/korganizer/kcmkorgsummary.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kontact/plugins/korganizer/kcmkorgsummary.desktop,v
+retrieving revision 1.25.2.10
+retrieving revision 1.25.2.12
+diff -u -r1.25.2.10 -r1.25.2.12
+--- kontact/plugins/korganizer/kcmkorgsummary.desktop	13 Nov 2004 07:20:54 -0000	1.25.2.10
++++ kontact/plugins/korganizer/kcmkorgsummary.desktop	9 Jan 2005 07:49:24 -0000	1.25.2.12
+@@ -12,6 +12,7 @@
+ X-KDE-CfgDlgHierarchy=KOrganizer
+ 
+ Name=Schedule
++Name[ar]=جدول
+ Name[be]=Расклад
+ Name[bg]=Разписание
+ Name[bs]=Raspored
+@@ -36,6 +37,7 @@
+ Name[pt]=Escalonamento
+ Name[pt_BR]=Agenda
+ Name[ru]=Календарь
++Name[se]=Plána
+ Name[sk]=Plánovanie
+ Name[sl]=Razpored
+ Name[sr]=Закажи
+@@ -46,6 +48,7 @@
+ Name[uk]=Розклад
+ Name[zh_CN]=日程安排
+ Comment=Schedule Setup
++Comment[ar]=إعداد الجدول
+ Comment[bg]=Настройки на разписанието
+ Comment[bs]=Podešavanje rasporeda
+ Comment[ca]=Configuració de la planificació
+@@ -67,6 +70,7 @@
+ Comment[pt]=Configuração do Escalonamento
+ Comment[pt_BR]=Configurações da Agenda
+ Comment[ru]=Настройка календаря
++Comment[se]=Heivet plána
+ Comment[sk]=Nastavenie plánovania
+ Comment[sl]=nastavitve razporeda
+ Comment[sr]=Подешавање заказивања
+@@ -77,6 +81,7 @@
+ Comment[uk]=Налаштування розкладу
+ Comment[zh_CN]=日程安排设置
+ Keywords=calendar, todos, configure, settings
++Keywords[ar]=تقويم, وظائف, ضبط, إعدادات
+ Keywords[be]=каляндар, заданьні, настроіць, настройкі, calendar, todos, configure, settings
+ Keywords[bg]=календар, задачи, организатор, calendar, todos, configure, settings
+ Keywords[bs]=calendar, todos, configure, settings, kalendar, zadaci, postavke
+Index: kontact/plugins/korganizer/korganizerplugin.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kontact/plugins/korganizer/korganizerplugin.desktop,v
+retrieving revision 1.49.2.5
+retrieving revision 1.49.2.7
+diff -u -r1.49.2.5 -r1.49.2.7
+--- kontact/plugins/korganizer/korganizerplugin.desktop	28 Nov 2004 08:34:01 -0000	1.49.2.5
++++ kontact/plugins/korganizer/korganizerplugin.desktop	9 Jan 2005 07:49:24 -0000	1.49.2.7
+@@ -17,8 +17,10 @@
+ X-KDE-PluginInfo-EnabledByDefault=true
+ 
+ Comment=Kontact KOrganizer Plugin
++Comment[ar]=أداة إضافية لـKontact KOrganizer 
+ Comment[be]=Дапаўненьне Кантакту "K Арганізатар"
+ Comment[bg]=Приставка за календар и връзка с KOrganizer
++Comment[br]=Lugent Kontact KOrganizer
+ Comment[bs]=Kontact KOrganizer dodatak
+ Comment[ca]=Endollable KOrganizer per a Kontact
+ Comment[cs]=Modul KOrganizeru pro aplikaci Kontact
+@@ -45,6 +47,7 @@
+ Comment[pt_BR]=Plug-in para KOrganizer do Kontact
+ Comment[ro]=Modul KOrganizer pentru Kontact
+ Comment[ru]=Модуль Kontact для доступа к органайзеру
++Comment[se]=Kontact, KOrganizer-lassemoduvla
+ Comment[sl]=Vstavek KOrganizer za Kontact
+ Comment[sr]=Прикључак Kontact-а за KOrganizer
+ Comment[sr@Latn]=Priključak Kontact-a za KOrganizer
+@@ -56,6 +59,7 @@
+ Comment[uz]=Kontact учун KOrganizer плагини
+ Comment[zh_CN]=Kontact KOrganizer 插件
+ Name=Calendar
++Name[ar]=التقويم
+ Name[be]=Каляндар
+ Name[br]=Deiziadur
+ Name[bs]=Kalendar
+@@ -83,6 +87,7 @@
+ Name[pt]=Calendário
+ Name[pt_BR]=Calendário
+ Name[ru]=Календарь
++Name[se]=Kaleandar
+ Name[sk]=Kalendár
+ Name[sl]=Koledar
+ Name[sr]=Календар
+Index: kontact/plugins/korganizer/todoplugin.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kontact/plugins/korganizer/todoplugin.desktop,v
+retrieving revision 1.58.2.7
+retrieving revision 1.58.2.10
+diff -u -r1.58.2.7 -r1.58.2.10
+--- kontact/plugins/korganizer/todoplugin.desktop	28 Nov 2004 08:34:01 -0000	1.58.2.7
++++ kontact/plugins/korganizer/todoplugin.desktop	9 Jan 2005 07:49:24 -0000	1.58.2.10
+@@ -17,6 +17,7 @@
+ X-KDE-PluginInfo-EnabledByDefault=true
+ 
+ Comment=Kontact KOrganizer Todo List Plugin
++Comment[ar]=أداة إضافية لقائمة الوظائف في Kontact KOrganizer
+ Comment[be]=Дапаўненьне Кантакту "Сьпіс заданьняў K Арганізатара"
+ Comment[bg]=Приставка за списък със задачи и връзка с KOrganizer
+ Comment[bs]=Kontact KOrganizer dodatak za listu zadataka
+@@ -55,9 +56,10 @@
+ Comment[uk]=Втулок списку завдань KOrganizer для Kontact
+ Comment[zh_CN]=Kontact KOrganizer 待办清单插件
+ Name=Todo List
++Name[ar]=قائمة الوظائف
+ Name[be]=Сьпіс заданьняў
+ Name[bs]=Lista zadataka
+-Name[ca]=Llista de pendents
++Name[ca]=Pendents
+ Name[cs]=Seznam úkolů
+ Name[cy]=Rhestr I-Wneud
+ Name[da]=Gøremålsliste
+@@ -81,6 +83,7 @@
+ Name[pt]=Lista de A-Fazer
+ Name[pt_BR]=Pendências
+ Name[ru]=Задачи
++Name[se]=Bargolistu
+ Name[sk]=Zoznam úloh
+ Name[sl]=Seznam opravil
+ Name[sr]=Листа задатака
+Index: kontact/plugins/kpilot/kpilotplugin.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kontact/plugins/kpilot/kpilotplugin.desktop,v
+retrieving revision 1.30.2.11
+retrieving revision 1.30.2.13
+diff -u -r1.30.2.11 -r1.30.2.13
+--- kontact/plugins/kpilot/kpilotplugin.desktop	28 Nov 2004 08:34:02 -0000	1.30.2.11
++++ kontact/plugins/kpilot/kpilotplugin.desktop	9 Jan 2005 07:49:24 -0000	1.30.2.13
+@@ -16,8 +16,10 @@
+ X-KDE-PluginInfo-EnabledByDefault=true
+ 
+ Comment=Kontact KPilot Plugin
++Comment[ar]=أداة إضافية لـKontact KPilot
+ Comment[be]=Дапаўненьне Кантакту "KPilot"
+ Comment[bg]=Приставка за връзка на адресника с мобилни устройства
++Comment[br]=Lugent Kontact KPilot
+ Comment[bs]=Kontact KPilot dodatak
+ Comment[ca]=Endollable de KPilot per a Kontact
+ Comment[cs]=Modul KPilotu pro aplikaci Kontact
+@@ -40,6 +42,7 @@
+ Comment[pt]='Plugin' do KPilot para o Kontact
+ Comment[pt_BR]=Plug-in do KPilot para o Kontact
+ Comment[ru]=Модуль Kontact для доступа к КПК через KPilot
++Comment[se]=Kontact, KPilot-lassemoduvla
+ Comment[sk]=Modul KPilot pre Kontact
+ Comment[sl]=Vstavek KPilota za Kontact
+ Comment[sr]=Прикључак Kontact-а за KPilot-а
+@@ -50,6 +53,7 @@
+ Comment[uk]=Втулок Kontact для KPilot
+ Comment[zh_CN]=Kontact KPilot 插件
+ Name=KPilot Configuration
++Name[ar]=تكوين KPilot
+ Name[be]=Канфігурацыя KPilot
+ Name[bs]=KPilot podešavanje
+ Name[ca]=Configuració de KPilot
+@@ -73,6 +77,7 @@
+ Name[pt]=Configuração do KPilot
+ Name[pt_BR]=Configuração do KPilot
+ Name[ru]=Синхронизация с КПК
++Name[se]=KPilot-heivehus
+ Name[sk]=Nastavenie KPilot
+ Name[sl]=Nastavitve KPilota
+ Name[sr]=KPilot подешавање
+Index: kontact/plugins/newsticker/kcmkontactknt.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kontact/plugins/newsticker/kcmkontactknt.desktop,v
+retrieving revision 1.49.2.10
+retrieving revision 1.49.2.12
+diff -u -r1.49.2.10 -r1.49.2.12
+--- kontact/plugins/newsticker/kcmkontactknt.desktop	13 Nov 2004 07:20:54 -0000	1.49.2.10
++++ kontact/plugins/newsticker/kcmkontactknt.desktop	9 Jan 2005 07:49:24 -0000	1.49.2.12
+@@ -12,6 +12,7 @@
+ X-KDE-CfgDlgHierarchy=NewsTicker
+ 
+ Name=News Sources
++Name[ar]=مصادر الأخبار
+ Name[be]=Крыніцы навін
+ Name[bs]=Izvori vijesti
+ Name[ca]=Fonts de notícies
+@@ -36,6 +37,7 @@
+ Name[pt]=Fontes de Notícias
+ Name[pt_BR]=Fontes de Notícias
+ Name[ru]=Новости
++Name[se]=Ođasgáldut
+ Name[sk]=Zdroje správ
+ Name[sl]=Viri novic
+ Name[sr]=Извори вести
+@@ -46,6 +48,7 @@
+ Name[uk]=Джерела новин
+ Name[zh_CN]=新闻来源
+ Comment=News Sources Setup
++Comment[ar]=إعداد مصادر الأخبار
+ Comment[bs]=Podešavanje izvora vijesti
+ Comment[ca]=Configuració de les fonts de notícies
+ Comment[cs]=Nastavení zdrojů novinek
+@@ -68,6 +71,7 @@
+ Comment[pt]=Configuração de Fontes de Notícias
+ Comment[pt_BR]=Configurar Fontes de Notícias
+ Comment[ru]=Настройка источников новостей
++Comment[se]=Heivet ođasgálduid
+ Comment[sk]=Nastavenie zdrojov správ
+ Comment[sl]=Nastavitve virov novic
+ Comment[sr]=Подешавање извора вести
+@@ -78,6 +82,7 @@
+ Comment[uk]=Налаштування джерел новин
+ Comment[zh_CN]=新闻来源设置
+ Keywords=news ticker, configure, settings
++Keywords[ar]=مؤشر الأخبار, تكوين, إعدادت
+ Keywords[bs]=news ticker, configure, settings, vijesti, newsticker, podešavanje
+ Keywords[ca]=teletip, configura, opcions
+ Keywords[cs]=novinky,nastavení
+Index: kontact/plugins/newsticker/newstickerplugin.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kontact/plugins/newsticker/newstickerplugin.desktop,v
+retrieving revision 1.50.2.11
+retrieving revision 1.50.2.12
+diff -u -r1.50.2.11 -r1.50.2.12
+--- kontact/plugins/newsticker/newstickerplugin.desktop	28 Nov 2004 08:34:02 -0000	1.50.2.11
++++ kontact/plugins/newsticker/newstickerplugin.desktop	29 Dec 2004 21:45:05 -0000	1.50.2.12
+@@ -15,6 +15,7 @@
+ X-KDE-PluginInfo-EnabledByDefault=true
+ 
+ Comment=Kontact NewsTicker Plugin
++Comment[ar]==Kontactأداة إضافية لمؤشر الأخبار الخاص بـ
+ Comment[bs]=Kontact NewsTicker dodatak
+ Comment[ca]=Endollable del teletip de noticies per a Kontact
+ Comment[cs]=Modul NewsTicker pro aplikaci Kontact
+@@ -46,6 +47,7 @@
+ Comment[uk]=Втулок стрічки новин Kontact
+ Comment[zh_CN]=Kontact 新闻点点通插件
+ Name=NewsTicker
++Name[ar]=مؤشر الأخبار
+ Name[ca]=Teletip de notícies
+ Name[da]=Nyhedstelegraf
+ Name[de]=News-Ticker
+Index: kontact/plugins/summary/kcmkontactsummary.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kontact/plugins/summary/kcmkontactsummary.desktop,v
+retrieving revision 1.42.2.10
+retrieving revision 1.42.2.12
+diff -u -r1.42.2.10 -r1.42.2.12
+--- kontact/plugins/summary/kcmkontactsummary.desktop	13 Nov 2004 07:20:54 -0000	1.42.2.10
++++ kontact/plugins/summary/kcmkontactsummary.desktop	9 Jan 2005 07:49:24 -0000	1.42.2.12
+@@ -12,6 +12,7 @@
+ X-KDE-CfgDlgHierarchy=KontactSummary
+ 
+ Name=Summary
++Name[ar]=ملخص
+ Name[br]=Diverrañ
+ Name[bs]=Sažetak
+ Name[ca]=Resum
+@@ -39,6 +40,7 @@
+ Name[pt_BR]=Resumo
+ Name[ro]=Sumar
+ Name[ru]=Дайджест
++Name[se]=Čoahkkáigeassu
+ Name[sk]=Súhrn
+ Name[sl]=Povzetek
+ Name[sr]=Сажетак
+@@ -51,6 +53,7 @@
+ Name[uz]=Ҳисобот
+ Name[zh_CN]=概览
+ Comment=General Configuration of Kontact's Summary View
++Comment[ar]= Kontact التكوين العام لعرض ملخص 
+ Comment[bg]=Настройка на обобщението
+ Comment[bs]=Opšte podešavanje Kontactovog prozora Sažetak
+ Comment[ca]=Configuració general de la vista de resum de Kontact
+Index: kontact/plugins/summary/summaryplugin.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kontact/plugins/summary/summaryplugin.desktop,v
+retrieving revision 1.43.2.5
+retrieving revision 1.43.2.7
+diff -u -r1.43.2.5 -r1.43.2.7
+--- kontact/plugins/summary/summaryplugin.desktop	28 Nov 2004 08:34:02 -0000	1.43.2.5
++++ kontact/plugins/summary/summaryplugin.desktop	9 Jan 2005 07:49:24 -0000	1.43.2.7
+@@ -13,6 +13,7 @@
+ X-KDE-PluginInfo-EnabledByDefault=true
+ 
+ Comment=Kontact SummaryView Plugin
++Comment[ar]=Kontact أداة إضافية لعرض ملخص
+ Comment[bg]=Приставка за обобщен преглед
+ Comment[bs]=Kontact dodatak za Sažetak
+ Comment[ca]=Endollable de la vista resum per a Kontact
+@@ -39,6 +40,7 @@
+ Comment[pt]='Plugin' do SummaryView do Kontact
+ Comment[pt_BR]=Plug-in SummaryView do Kontact
+ Comment[ru]=Модуль дайджеста Kontact
++Comment[se]=Kontact, čoahkkáigeassočájeheami lassemoduvla
+ Comment[sk]=Modul súhrnu pre Kontact
+ Comment[sl]=Vstavek povzetega pogleda za Kontact
+ Comment[sr]=Прикључак Kontact-а за приказ сажетка
+@@ -50,6 +52,7 @@
+ Comment[uk]=Втулок Kontact для перегляду зведень
+ Comment[zh_CN]=Kontact 概览视图插件
+ Name=Summary
++Name[ar]=ملخص
+ Name[br]=Diverrañ
+ Name[bs]=Sažetak
+ Name[ca]=Resum
+@@ -77,6 +80,7 @@
+ Name[pt_BR]=Resumo
+ Name[ro]=Sumar
+ Name[ru]=Дайджест
++Name[se]=Čoahkkáigeassu
+ Name[sk]=Súhrn
+ Name[sl]=Povzetek
+ Name[sr]=Сажетак
+Index: kontact/plugins/test/kptestplugin.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kontact/plugins/test/kptestplugin.desktop,v
+retrieving revision 1.82.2.5
+retrieving revision 1.82.2.8
+diff -u -r1.82.2.5 -r1.82.2.8
+--- kontact/plugins/test/kptestplugin.desktop	28 Nov 2004 08:34:02 -0000	1.82.2.5
++++ kontact/plugins/test/kptestplugin.desktop	9 Jan 2005 07:49:25 -0000	1.82.2.8
+@@ -12,6 +12,7 @@
+ X-KDE-PluginInfo-EnabledByDefault=false
+ 
+ Comment=Kontact Test Plugin
++Comment[ar]=أداة إضافية لاختبار Kontact
+ Comment[be]=Тэставае дапаўненьне Кантакту
+ Comment[bg]=Приставка за проба
+ Comment[bs]=Kontact testni dodatak
+@@ -39,6 +40,7 @@
+ Comment[pt_BR]=Plug-in para Teste do Kontact
+ Comment[ro]=Modul de test Kontact
+ Comment[ru]=Проверочный модуль Kontact
++Comment[se]=Kontact, geahččalanlassemoduvla
+ Comment[sl]=Preizkusni vstavek za Kontact
+ Comment[sr]=Пробни прикључак Kontact-а
+ Comment[sr@Latn]=Probni priključak Kontact-a
+@@ -50,6 +52,7 @@
+ Comment[uz]=Kontact учун синаш плагини
+ Comment[zh_CN]=Kontact Test 插件
+ Name=TestPlugin
++Name[ar]=أداة إضافية للإختبار
+ Name[be]=Тэставае дапаўненьне
+ Name[ca]=Endollable de prova
+ Name[cy]=AtegynPrawf
+@@ -63,6 +66,7 @@
+ Name[is]=Prufu íforrit
+ Name[it]=Plugin Test
+ Name[ja]=テストプラグイン
++Name[mk]=ПробенДодаток
+ Name[nb]=Test-programtillegg
+ Name[nl]=Test-plugin
+ Name[nn]=Test-programtillegg
+@@ -71,6 +75,7 @@
+ Name[pt_BR]=Plugin de Teste
+ Name[ro]=Modul de  test
+ Name[ru]=Проверочный модуль
++Name[se]=Geahččalan-lassemoduvla
+ Name[sk]=TestModul
+ Name[sl]=Preizkusni vstavek
+ Name[sr]=Пробни прикључак
+Index: kontact/plugins/weather/weatherplugin.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kontact/plugins/weather/weatherplugin.desktop,v
+retrieving revision 1.44.2.7
+retrieving revision 1.44.2.9
+diff -u -r1.44.2.7 -r1.44.2.9
+--- kontact/plugins/weather/weatherplugin.desktop	28 Nov 2004 08:34:03 -0000	1.44.2.7
++++ kontact/plugins/weather/weatherplugin.desktop	9 Jan 2005 07:49:25 -0000	1.44.2.9
+@@ -16,6 +16,7 @@
+ X-KDE-PluginInfo-EnabledByDefault=true
+ 
+ Comment=Kontact Weather Plugin
++Comment[ar]=Kontactأداة إضافية لحالة الطقس خاصة بـ 
+ Comment[be]=Дапаўненьне Кантакту "Надвор'е"
+ Comment[bg]=Приставка за информация за метеорологичното време
+ Comment[bs]=Kontact dodatak za vremensku prognozu
+@@ -44,6 +45,7 @@
+ Comment[pt_BR]=Plugin de Tempo do Kontact
+ Comment[ro]=Modul meteorologie Kontact
+ Comment[ru]=Модуль информации о погоде Kontact
++Comment[se]=Kontact, dáldedieđáhusaid lassemoduvla
+ Comment[sk]=Modul počasia pre Kontact
+ Comment[sl]=Vremenski vstavek za Kontact
+ Comment[sr]=Прикључак Kontact-а за време
+@@ -56,6 +58,7 @@
+ Comment[uz]=Kontact учун об-ҳаво плагини
+ Comment[zh_CN]=Kontact 天气插件
+ Name=Weather
++Name[ar]=حالة الطقس
+ Name[be]=Надвор'е
+ Name[br]=Amzer
+ Name[bs]=Vrijeme
+@@ -84,6 +87,7 @@
+ Name[pt_BR]=Tempo
+ Name[ro]=Vreme
+ Name[ru]=Погода
++Name[se]=Dáldedieđáhus
+ Name[sk]=Počasie
+ Name[sl]=Vreme
+ Name[sr]=Време
+Index: kontact/src/Kontact.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kontact/src/Kontact.desktop,v
+retrieving revision 1.39.2.2
+retrieving revision 1.39.2.5
+diff -u -r1.39.2.2 -r1.39.2.5
+--- kontact/src/Kontact.desktop	31 Aug 2004 07:23:21 -0000	1.39.2.2
++++ kontact/src/Kontact.desktop	9 Jan 2005 07:49:25 -0000	1.39.2.5
+@@ -9,6 +9,7 @@
+ Type=Application
+ Icon=kontact
+ GenericName=Personal Information Manager
++GenericName[ar]=مدير معلومات شخصية
+ GenericName[be]=Кіраваньне пэрсанальнай інфармацыяй
+ GenericName[bg]=Лична информация
+ GenericName[bs]=Upravitelj ličnim informacijama
+@@ -30,6 +31,7 @@
+ GenericName[it]=Gestione informazioni personali 
+ GenericName[ja]=個人情報マネージャ
+ GenericName[lt]=Asmeninės informacijos tvarkyklė
++GenericName[mk]=Менаџер за лични информации
+ GenericName[nb]=Personlig informasjonsbehandler
+ GenericName[nn]=Personleg informasjonshandtering
+ GenericName[pl]=Program do zarządzania informacjami osobistymi
+@@ -37,6 +39,7 @@
+ GenericName[pt_BR]=Gerenciador de Informações Pessoais
+ GenericName[ro]=Manager de informaţii personale
+ GenericName[ru]=Персональный информационный менеджер
++GenericName[se]=Persuvnnalaš diehtogieđaheapmi
+ GenericName[sk]=Osobný manažér informácii
+ GenericName[sl]=Osebni upravitelj informacij
+ GenericName[sr]=Менаџер личних информација
+Index: kontact/src/kontact.setdlg
+===================================================================
+RCS file: /home/kde/kdepim/kontact/src/kontact.setdlg,v
+retrieving revision 1.61.2.5
+retrieving revision 1.61.2.8
+diff -u -r1.61.2.5 -r1.61.2.8
+--- kontact/src/kontact.setdlg	24 Oct 2004 07:06:02 -0000	1.61.2.5
++++ kontact/src/kontact.setdlg	9 Jan 2005 07:49:25 -0000	1.61.2.8
+@@ -1,5 +1,6 @@
+ [KMail]
+ Name=Mail
++Name[ar]=بريد
+ Name[be]=Пошта
+ Name[br]=Lizher
+ Name[ca]=Correu
+@@ -28,6 +29,7 @@
+ Name[pt_BR]=Correio
+ Name[ro]=E-Mail
+ Name[ru]=Почта
++Name[se]=E-boasta
+ Name[sk]=Pošta
+ Name[sl]=Pošta
+ Name[sr]=Пошта
+@@ -40,12 +42,15 @@
+ Name[uz]=Хат-хабар
+ Name[zh_CN]=邮件
+ Comment=
++Comment[ar]=KMail
+ Weight=20
+ Icon=kmail
+ 
+ [KAB]
+ Name=Contacts
++Name[ar]=جهات الإتصال
+ Name[be]=Кантакты
++Name[br]=Darempredoù
+ Name[bs]=Kontakti
+ Name[ca]=Contactes
+ Name[cs]=Kontakty
+@@ -70,6 +75,7 @@
+ Name[pt_BR]=Contatos
+ Name[ro]=Contacte
+ Name[ru]=Контакты
++Name[se]=Oktavuođat
+ Name[sk]=Kontakty
+ Name[sl]=Stiki
+ Name[sr]=Контакти
+@@ -82,11 +88,13 @@
+ Name[uz]=Алоқалар
+ Name[zh_CN]=联系人
+ Comment=
++Comment[ar]=KMail
+ Weight=50
+ Icon=kaddressbook
+ 
+ [KOrganizer]
+ Name=Organizer
++Name[ar]=منظم كيدي
+ Name[be]=Арганізатар
+ Name[cs]=Organizér
+ Name[cy]=Trefnydd
+@@ -107,6 +115,7 @@
+ Name[pt_BR]=Organizador
+ Name[ro]=Organizator
+ Name[ru]=Органайзер
++Name[se]=Plánejeaddji
+ Name[sk]=Organizér
+ Name[sl]=Organizator
+ Name[ta]=அமைப்பாளர்
+@@ -114,11 +123,13 @@
+ Name[uk]=Тижневик
+ Name[uz]=Органайзер
+ Comment=
++Comment[ar]=KMail
+ Weight=30
+ Icon=korganizer
+ 
+ [KNode]
+ Name=News
++Name[ar]=أخبار
+ Name[be]=Навіны
+ Name[br]=Keleier
+ Name[bs]=Usenet
+@@ -144,6 +155,7 @@
+ Name[pt_BR]=Notícias
+ Name[ro]=Ştiri
+ Name[ru]=Новости
++Name[se]=Ođđasat
+ Name[sk]=Diskusné skupiny
+ Name[sl]=Novice
+ Name[sr]=Вести
+@@ -160,6 +172,7 @@
+ 
+ [KWeather]
+ Name=Weather
++Name[ar]=حالة الطقس
+ Name[be]=Надвор'е
+ Name[br]=Amzer
+ Name[bs]=Vrijeme
+@@ -188,6 +201,7 @@
+ Name[pt_BR]=Tempo
+ Name[ro]=Vreme
+ Name[ru]=Погода
++Name[se]=Dáldedieđáhus
+ Name[sk]=Počasie
+ Name[sl]=Vreme
+ Name[sr]=Време
+@@ -200,6 +214,7 @@
+ Name[uz]=Об-ҳаво
+ Name[zh_CN]=天气
+ Comment=
++Comment[ar]=KMail
+ Weight=60
+ Icon=kweather
+ 
+@@ -250,5 +265,6 @@
+ Name[zh_CN]=新闻点点通
+ Name[zu]=Umlungiseleli Wezindaba 
+ Comment=
++Comment[ar]=KMail
+ Weight=60
+ Icon=knode
+Index: kontact/src/mainwindow.cpp
+===================================================================
+RCS file: /home/kde/kdepim/kontact/src/mainwindow.cpp,v
+retrieving revision 1.124.2.2
+retrieving revision 1.124.2.4
+diff -u -r1.124.2.2 -r1.124.2.4
+--- kontact/src/mainwindow.cpp	17 Nov 2004 12:54:07 -0000	1.124.2.2
++++ kontact/src/mainwindow.cpp	18 Jan 2005 11:21:53 -0000	1.124.2.4
+@@ -32,6 +32,7 @@
+ 
+ #include <dcopclient.h>
+ #include <kapplication.h>
++#include <kcmultidialog.h>
+ #include <kconfig.h>
+ #include <kdebug.h>
+ #include <kedittoolbar.h>
+@@ -451,8 +452,11 @@
+ 
+ void MainWindow::partLoaded( Kontact::Plugin * /*plugin*/, KParts::Part *part )
+ {
+-  if ( part->widget() )
+-    mStack->addWidget( part->widget(), 0 );
++  // See if we have this part already (e.g. due to two plugins sharing it)
++  if ( mStack->id( part->widget() ) != -1 )
++    return;
++
++  mStack->addWidget( part->widget(), 0 );
+ 
+   mPartManager->addPart( part, false );
+   // Workaround for KParts misbehavior: addPart calls show!
+@@ -650,6 +654,7 @@
+   if( !dlg ) {
+     dlg = new KSettings::Dialog( KSettings::Dialog::Configurable, this );
+     dlg->addPluginInfos( mPluginInfos );
++    dlg->dialog()->setInitialSize( QSize( 900, 600 ) );
+     connect( dlg, SIGNAL( pluginSelectionChanged() ),
+          SLOT( pluginsChanged() ) );
+ //    connect( dlg, SIGNAL( okClicked() ), SLOT( pluginsChanged() ) );
+Index: korganizer/configcolors.desktop
+===================================================================
+RCS file: /home/kde/kdepim/korganizer/Attic/configcolors.desktop,v
+retrieving revision 1.49.2.4
+retrieving revision 1.49.2.7
+diff -u -r1.49.2.4 -r1.49.2.7
+--- korganizer/configcolors.desktop	26 Nov 2004 08:05:19 -0000	1.49.2.4
++++ korganizer/configcolors.desktop	9 Jan 2005 07:49:26 -0000	1.49.2.7
+@@ -43,7 +43,6 @@
+ Name[ja]=色
+ Name[lt]=Spalvos
+ Name[lv]=Krāsas
+-Name[mk]=Бои,Colors
+ Name[mt]=Kuluri
+ Name[nb]=Farger
+ Name[nl]=Kleuren
+@@ -53,6 +52,7 @@
+ Name[pt_BR]=Cores
+ Name[ro]=Culori
+ Name[ru]=Цвета
++Name[se]=Ivnnit
+ Name[sk]=Farby
+ Name[sl]=Barve
+ Name[sr]=Боје
+@@ -100,6 +100,7 @@
+ Comment[pt_BR]=Configuração de Cores do KOrganizer
+ Comment[ro]=Configurare culori KOrganizer
+ Comment[ru]=Настройка цветов органайзера KDE
++Comment[se]=KOrganizer, ivdneheivehusat
+ Comment[sk]=Nastavenie farieb pre KOrganizer
+ Comment[sl]=Nastavitve barv v KOrganizerju
+ Comment[sr]=Подешавање боја у KOrganizer-у
+@@ -111,6 +112,7 @@
+ Comment[uk]=Налаштування кольорів у KOrganizer
+ Comment[zh_CN]=KOrganizer 颜色配置
+ Keywords=korganizer,colors
++Keywords[ar]=korganizer,ألوان
+ Keywords[be]=K Арганізатар,колеры,korganizer,colors
+ Keywords[bg]=организатор, цветове, настройки, korganizer, colors
+ Keywords[br]=korganizer,livioù
+Index: korganizer/configfonts.desktop
+===================================================================
+RCS file: /home/kde/kdepim/korganizer/Attic/configfonts.desktop,v
+retrieving revision 1.48.2.4
+retrieving revision 1.48.2.6
+diff -u -r1.48.2.4 -r1.48.2.6
+--- korganizer/configfonts.desktop	26 Nov 2004 08:05:20 -0000	1.48.2.4
++++ korganizer/configfonts.desktop	9 Jan 2005 07:49:26 -0000	1.48.2.6
+@@ -41,7 +41,6 @@
+ Name[ja]=フォント
+ Name[lt]=Šriftai
+ Name[lv]=Fonti
+-Name[mk]=Фонтови
+ Name[nb]=Skrifter
+ Name[nl]=Lettertypen
+ Name[nn]=Skrifttypar
+@@ -50,6 +49,7 @@
+ Name[pt_BR]=Fontes
+ Name[ro]=Fonturi
+ Name[ru]=Шрифты
++Name[se]=Fonttat
+ Name[sk]=Písma
+ Name[sl]=Pisave
+ Name[sr]=Фонтови
+@@ -95,6 +95,7 @@
+ Comment[pt_BR]=Configuração de Fontes do KOrganizer
+ Comment[ro]=Configurare fonturi KOrganizer
+ Comment[ru]=Настройка шрифтов органайзера KDE
++Comment[se]=KOrganizer, fontaheivehusat
+ Comment[sk]=Nastavenie písiem pre KOrganizer
+ Comment[sl]=Nastavitev pisav v KOrganizerju
+ Comment[sr]=Подешавање фонтова у KOrganizer-у
+Index: korganizer/configfreebusy.desktop
+===================================================================
+RCS file: /home/kde/kdepim/korganizer/Attic/configfreebusy.desktop,v
+retrieving revision 1.38.2.5
+retrieving revision 1.38.2.6
+diff -u -r1.38.2.5 -r1.38.2.6
+--- korganizer/configfreebusy.desktop	24 Oct 2004 07:06:03 -0000	1.38.2.5
++++ korganizer/configfreebusy.desktop	29 Dec 2004 21:45:06 -0000	1.38.2.6
+@@ -51,6 +51,7 @@
+ Name[uz]=Бўш/Банд
+ Name[zh_CN]=忙/闲
+ Comment=KOrganizer Free/Busy Configuration
++Comment[ar]=تكوين KOrganizer في وضع متوفر أو مشغول
+ Comment[bg]=Настройки на свободно/заето за KOrganizer
+ Comment[bs]=KOrganizer podešavanje za Slobodan/Zauzet
+ Comment[ca]=Configuració de Lliure/ocupat per a KOrganizer
+@@ -87,6 +88,7 @@
+ Comment[uk]=Налаштування вільного/зайнятого часу в KOrganizer
+ Comment[zh_CN]=KOrganizer 空闲/忙碌配置
+ Keywords=korganizer,freebusy,scheduling
++Keywords[ar]=korganizer,متوفر مشغول,الجدولة
+ Keywords[bg]=организатор, свободно, заето, настройки, korganizer, freebusy, scheduling
+ Keywords[bs]=korganizer,freebusy,scheduling,raspored
+ Keywords[ca]=korganizer,lliure ocupat,planificació
+Index: korganizer/configgroupautomation.desktop
+===================================================================
+RCS file: /home/kde/kdepim/korganizer/Attic/configgroupautomation.desktop,v
+retrieving revision 1.44.2.2
+retrieving revision 1.44.2.4
+diff -u -r1.44.2.2 -r1.44.2.4
+--- korganizer/configgroupautomation.desktop	24 Oct 2004 07:06:03 -0000	1.44.2.2
++++ korganizer/configgroupautomation.desktop	9 Jan 2005 07:49:26 -0000	1.44.2.4
+@@ -39,6 +39,7 @@
+ Name[pt]=Automação do Grupo
+ Name[pt_BR]=Automação de Grupo
+ Name[ru]=Групповая работа
++Name[se]=Joavkoautomatiseren
+ Name[sk]=Skupinová automatizácia
+ Name[sl]=Avtomatizacija skupin
+ Name[sr]=Аутоматизација група
+@@ -50,6 +51,7 @@
+ Name[uk]=Автоматизація груп
+ Name[zh_CN]=组自动化
+ Comment=KOrganizer Group Automation Configuration
++Comment[ar]=تكوين أتمتة المجموعات في KOrganizer
+ Comment[bg]=Настройки на организация за KOrganizer
+ Comment[bs]=KOrganizer podešavanje automatizacije grupe
+ Comment[ca]=Configuració de l'automatització de grups a KOrganizer
+@@ -75,6 +77,7 @@
+ Comment[pt]=Configuração da Automação do Grupo do KOrganizer
+ Comment[pt_BR]=Configuração de Automação de Grupo do KOrganizer
+ Comment[ru]=Настройка групповой работы в органайзере KDE
++Comment[se]=KOrganizer, joavkoautomatiserema heivehusat
+ Comment[sk]=Nastavenie skupinovej automatizácie pre KOrganizer
+ Comment[sl]=Nastavitev avtomatizacije v KOrganizerju
+ Comment[sr]=Подешавање аутоматизације група у KOrganizer-у
+@@ -86,6 +89,7 @@
+ Comment[uk]=Налаштування автоматизації груп у KOrganizer
+ Comment[zh_CN]=KOrganizer 组自动化配置
+ Keywords=korganizer,group,automation
++Keywords[ar]=korganizer,مجموعة,أتمتة
+ Keywords[bg]=организатор, организация, настройки, korganizer, group, automation
+ Keywords[bs]=korganizer,group,automation,automatizacija,grupa,grupe
+ Keywords[ca]=korganizer,grup,automatització
+Index: korganizer/configgroupscheduling.desktop
+===================================================================
+RCS file: /home/kde/kdepim/korganizer/Attic/configgroupscheduling.desktop,v
+retrieving revision 1.47.2.4
+retrieving revision 1.47.2.6
+diff -u -r1.47.2.4 -r1.47.2.6
+--- korganizer/configgroupscheduling.desktop	24 Oct 2004 07:06:03 -0000	1.47.2.4
++++ korganizer/configgroupscheduling.desktop	9 Jan 2005 07:49:26 -0000	1.47.2.6
+@@ -40,6 +40,7 @@
+ Name[pt_BR]=Agendamento de Grupo
+ Name[ro]=Planificare grup
+ Name[ru]=Календарь группы
++Name[se]=Joavkoplánen
+ Name[sk]=Skupinové plánovanie
+ Name[sl]=Razporejanje skupin
+ Name[sr]=Распоређивање група
+@@ -77,6 +78,7 @@
+ Comment[pt]=Configuração do Escalonamento do Grupo do KOrganizer
+ Comment[pt_BR]=Configuração de Agendamento de Grupo do KOrganizer
+ Comment[ru]=Настройка календаря группы органайзера KDE
++Comment[se]=KOrganizer, joavkoplánema heivehusat
+ Comment[sk]=Nastavenie skupinového plánovania pre KOrganizer
+ Comment[sl]=Nastavitev razporejanja skupin v KOrganizerju
+ Comment[sr]=Подешавање распоређивања група у KOrganizer-у
+@@ -88,6 +90,7 @@
+ Comment[uk]=Налаштування групового розкладу в KOrganizer
+ Comment[zh_CN]=Korganizer 组日程安排配置
+ Keywords=korganizer,group,scheduling
++Keywords[ar]=جدولة ، مجموعات ، Korganizer
+ Keywords[bg]=организатор, разписание, настройки, korganizer, group, scheduling
+ Keywords[bs]=korganizer,group,scheduling,raspoređivanje,grupa,grupe
+ Keywords[ca]=korganizer,grup,planificació
+Index: korganizer/configmain.desktop
+===================================================================
+RCS file: /home/kde/kdepim/korganizer/Attic/configmain.desktop,v
+retrieving revision 1.49.2.5
+retrieving revision 1.49.2.7
+diff -u -r1.49.2.5 -r1.49.2.7
+--- korganizer/configmain.desktop	26 Nov 2004 08:05:20 -0000	1.49.2.5
++++ korganizer/configmain.desktop	9 Jan 2005 07:49:26 -0000	1.49.2.7
+@@ -40,6 +40,7 @@
+ Name[pt]=Pessoal
+ Name[pt_BR]=Pessoal
+ Name[ru]=Персональные настройки
++Name[se]=Peršuvnnalaš
+ Name[sk]=Osobné
+ Name[sl]=Osebno
+ Name[sr]=Лично
+@@ -52,6 +53,7 @@
+ Name[uz]=Шахсий
+ Name[zh_CN]=个人
+ Comment=KOrganizer Main Configuration
++Comment[ar]=تكوين KOrganizer الأساسي
+ Comment[bg]=Главни настройки за KOrganizer
+ Comment[bs]=KOrganizer glavno podešavanje
+ Comment[ca]=Configuració principal a KOrganizer
+@@ -78,6 +80,7 @@
+ Comment[pt]=Configuração Principal do KOrganizer
+ Comment[pt_BR]=Configuração Principal do KOrganizer
+ Comment[ru]=Общие настройки органайзера KDE
++Comment[se]=Korganizer, váldoheivehusat
+ Comment[sk]=Hlavné nastavenie KOrganizer
+ Comment[sl]=Glavne nastavitve KOrganizerja
+ Comment[sr]=Главна подешавања у KOrganizer-у
+@@ -89,6 +92,7 @@
+ Comment[uk]=Налаштування особистих даних у KOrganizer
+ Comment[zh_CN]=KOrganizer 主要配置
+ Keywords=korganizer,main,personal
++Keywords[ar]=korganizer,أساسي,شخصي
+ Keywords[bg]=организатор, главни, персонални, настройки, korganizer, main, personal
+ Keywords[bs]=korganizer,main,personal,lično
+ Keywords[ca]=korganizer,principal,personal
+Index: korganizer/configprinting.desktop
+===================================================================
+RCS file: /home/kde/kdepim/korganizer/Attic/configprinting.desktop,v
+retrieving revision 1.47.2.3
+retrieving revision 1.47.2.5
+diff -u -r1.47.2.3 -r1.47.2.5
+--- korganizer/configprinting.desktop	29 Sep 2004 14:06:36 -0000	1.47.2.3
++++ korganizer/configprinting.desktop	9 Jan 2005 07:49:26 -0000	1.47.2.5
+@@ -13,6 +13,7 @@
+ X-KDE-CfgDlgHierarchy=KOrganizer
+ 
+ Name=Printing
++Name[ar]=Purist
+ Name[be]=Друк
+ Name[bg]=Печат
+ Name[br]=O voullañ
+@@ -42,6 +43,7 @@
+ Name[pt_BR]=Impressão
+ Name[ro]=Tipărire
+ Name[ru]=Печать
++Name[se]=Čáliheapmi
+ Name[sk]=Tlač
+ Name[sl]=Tiskanje
+ Name[sr]=Штампање
+@@ -54,6 +56,7 @@
+ Name[uz]=Босиб чиқариш
+ Name[zh_CN]=打印
+ Comment=KOrganizer Printing Configuration
++Comment[ar]=أداة إضافية لتكوينات
+ Comment[be]=Канфігурацыя друку "K Арганізатара"
+ Comment[bg]=Настройки на печат за KOrganizer
+ Comment[bs]=KOrganizer podešavanje štampe
+@@ -93,6 +96,7 @@
+ Comment[uk]=Налаштування друку в KOrganizer
+ Comment[zh_CN]=KOrganizer 打印配置
+ Keywords=korganizer,printing
++Keywords[ar]=korganizer,الوقت
+ Keywords[be]=K Арганізатар,друк,korganizer,printing
+ Keywords[bg]=организатор, печат, настройки, korganizer, printing
+ Keywords[bs]=korganizer,printing,štampanje,štampa
+Index: korganizer/configtime.desktop
+===================================================================
+RCS file: /home/kde/kdepim/korganizer/Attic/configtime.desktop,v
+retrieving revision 1.47.2.4
+retrieving revision 1.47.2.6
+diff -u -r1.47.2.4 -r1.47.2.6
+--- korganizer/configtime.desktop	24 Oct 2004 07:06:03 -0000	1.47.2.4
++++ korganizer/configtime.desktop	9 Jan 2005 07:49:26 -0000	1.47.2.6
+@@ -43,6 +43,7 @@
+ Name[pt_BR]=Data & Hora
+ Name[ro]=Timp şi dată
+ Name[ru]=Дата и время
++Name[se]=Áigi ja beaivvit
+ Name[sk]=Dátum a čas
+ Name[sl]=Čas in datum
+ Name[sr]=Време и датум
+@@ -95,6 +96,7 @@
+ Comment[uk]=Налаштування часу та дати в KOrganizer
+ Comment[zh_CN]=KOrganizer 时间配置
+ Keywords=korganizer,time
++Keywords[ar]=korganizer,الوقت
+ Keywords[be]=K Арганізатар,час,korganizer,time
+ Keywords[bg]=организатор, дата, час, настройки, korganizer, time
+ Keywords[br]=korganizer,amzer
+Index: korganizer/configviews.desktop
+===================================================================
+RCS file: /home/kde/kdepim/korganizer/Attic/configviews.desktop,v
+retrieving revision 1.46.2.3
+retrieving revision 1.46.2.6
+diff -u -r1.46.2.3 -r1.46.2.6
+--- korganizer/configviews.desktop	24 Oct 2004 07:06:03 -0000	1.46.2.3
++++ korganizer/configviews.desktop	13 Jan 2005 08:02:45 -0000	1.46.2.6
+@@ -16,6 +16,7 @@
+ Name[ar]=عروض
+ Name[be]=Выгляды
+ Name[bg]=Изгледи
++Name[br]=Gweloù
+ Name[bs]=Pogledi
+ Name[ca]=Vistes
+ Name[cs]=Pohledy
+@@ -42,6 +43,7 @@
+ Name[pt_BR]=Visões
+ Name[ro]=Vizualizări
+ Name[ru]=Виды
++Name[se]=Čájeheamit
+ Name[sk]=Pohľady
+ Name[sl]=Prikazi
+ Name[sr]=Прикази
+@@ -54,6 +56,7 @@
+ Name[uz]=Кўринишлар
+ Name[zh_CN]=视图
+ Comment=KOrganizer View Configuration
++Comment[ar]=KOrganizer تكوين عرض 
+ Comment[be]=Канфігурацыя выгляду "K Арганізатара"
+ Comment[bg]=Настройки на изгледи за KOrganizer
+ Comment[bs]=KOrganizer podešavanje pogleda
+@@ -92,6 +95,7 @@
+ Comment[uk]=Налаштування переглядів у KOrganizer
+ Comment[zh_CN]=KOrganizer 视图配置
+ Keywords=korganizer,view
++Keywords[ar]=korganizer,عرض
+ Keywords[be]=K Арганізатар,выгляд,korganizer,view
+ Keywords[bg]=организатор, изглед, изгледи, настройки, korganizer, view
+ Keywords[br]=korganizer,gwell
+Index: korganizer/dcopcalendar.desktop
+===================================================================
+RCS file: /home/kde/kdepim/korganizer/dcopcalendar.desktop,v
+retrieving revision 1.41.2.2
+retrieving revision 1.41.2.3
+diff -u -r1.41.2.2 -r1.41.2.3
+--- korganizer/dcopcalendar.desktop	24 Oct 2004 07:06:03 -0000	1.41.2.2
++++ korganizer/dcopcalendar.desktop	29 Dec 2004 21:45:06 -0000	1.41.2.3
+@@ -3,6 +3,7 @@
+ Type=ServiceType
+ X-KDE-ServiceType=DCOP/Organizer
+ Comment=Organizer with a DCOP interface
++Comment[ar]=Organizer مع و اجهة تطبيق DCOP
+ Comment[be]=Арганізатар з DCOP інтэрфэйсам
+ Comment[bg]=Организатор с поддръжка на интерфейс DCOP
+ Comment[bs]=Organizer sa DCOP interfejsom
+Index: korganizer/koeditordetails.cpp
+===================================================================
+RCS file: /home/kde/kdepim/korganizer/koeditordetails.cpp,v
+retrieving revision 1.70.2.10
+retrieving revision 1.70.2.11
+diff -u -r1.70.2.10 -r1.70.2.11
+--- korganizer/koeditordetails.cpp	2 Nov 2004 13:48:17 -0000	1.70.2.10
++++ korganizer/koeditordetails.cpp	28 Dec 2004 20:59:25 -0000	1.70.2.11
+@@ -67,13 +67,13 @@
+ #include "kocore.h"
+ 
+ template <>
+-CustomListViewItem<class Attendee *>::~CustomListViewItem()
++CustomListViewItem<KCal::Attendee *>::~CustomListViewItem()
+ {
+   delete mData;
+ }
+ 
+ template <>
+-void CustomListViewItem<class Attendee *>::updateItem()
++void CustomListViewItem<KCal::Attendee *>::updateItem()
+ {
+   setText(0,mData->name());
+   setText(1,mData->email());
+Index: korganizer/koeditordetails.h
+===================================================================
+RCS file: /home/kde/kdepim/korganizer/koeditordetails.h,v
+retrieving revision 1.34.2.1
+retrieving revision 1.34.2.2
+diff -u -r1.34.2.1 -r1.34.2.2
+--- korganizer/koeditordetails.h	13 Oct 2004 12:35:44 -0000	1.34.2.1
++++ korganizer/koeditordetails.h	28 Dec 2004 20:59:25 -0000	1.34.2.2
+@@ -45,7 +45,7 @@
+ class AddresseeLineEdit;
+ }
+ 
+-typedef CustomListViewItem<Attendee *> AttendeeListItem;
++typedef CustomListViewItem<KCal::Attendee *> AttendeeListItem;
+ 
+ 
+ /** KOAttendeeListView is a child class of KListView  which supports
+Index: korganizer/korganizer.desktop
+===================================================================
+RCS file: /home/kde/kdepim/korganizer/korganizer.desktop,v
+retrieving revision 1.237.2.5
+retrieving revision 1.237.2.8
+diff -u -r1.237.2.5 -r1.237.2.8
+--- korganizer/korganizer.desktop	10 Nov 2004 07:37:28 -0000	1.237.2.5
++++ korganizer/korganizer.desktop	9 Jan 2005 07:49:26 -0000	1.237.2.8
+@@ -29,6 +29,7 @@
+ Comment[ja]=カレンダー、スケジュールプログラム
+ Comment[lt]=Kalendoriaus ir planavimo programa
+ Comment[lv]=Kalendāra un Plānošanas Programma
++Comment[mk]=Календар и роковник
+ Comment[mt]=Programm b' kalendarju w skeda
+ Comment[nb]=Et kalender- og tidsplanleggingsprogram
+ Comment[nl]=Agenda- en afsprakenprogramma
+@@ -39,6 +40,7 @@
+ Comment[pt_BR]=Programa de Calendário e Agenda
+ Comment[ro]=Program de planificare şi calendar
+ Comment[ru]=Календарь и личное расписание
++Comment[se]=Kaleandar- ja plánenprográmma
+ Comment[sk]=Kalendár a plánovací program
+ Comment[sl]=Program za koledar in razporejanje
+ Comment[sr]=Календарски и планерски програм
+@@ -72,12 +74,14 @@
+ Name[hi]=के-आर्गेनाइज़र
+ Name[is]=KSkipulag
+ Name[lv]=KOrganaizers
++Name[mk]=Организатор
+ Name[nso]=KMokopanyi
+ Name[pl]=Organizator
+ Name[sv]=Korganizer
+ Name[ta]=கேஅமைப்பாளர்
+ Name[ven]=Mulugisi wa K
+ GenericName=Personal Organizer
++GenericName[ar]=منظم شخصي
+ GenericName[be]=Пэрсанальны арганізатар
+ GenericName[bg]=Организатор
+ GenericName[bs]=Lični organizer
+Index: korganizer/korganizer_configcolors.desktop
+===================================================================
+RCS file: /home/kde/kdepim/korganizer/korganizer_configcolors.desktop,v
+retrieving revision 1.16.2.4
+retrieving revision 1.16.2.7
+diff -u -r1.16.2.4 -r1.16.2.7
+--- korganizer/korganizer_configcolors.desktop	26 Nov 2004 08:05:20 -0000	1.16.2.4
++++ korganizer/korganizer_configcolors.desktop	9 Jan 2005 07:49:26 -0000	1.16.2.7
+@@ -43,7 +43,6 @@
+ Name[ja]=色
+ Name[lt]=Spalvos
+ Name[lv]=Krāsas
+-Name[mk]=Бои,Colors
+ Name[mt]=Kuluri
+ Name[nb]=Farger
+ Name[nl]=Kleuren
+@@ -53,6 +52,7 @@
+ Name[pt_BR]=Cores
+ Name[ro]=Culori
+ Name[ru]=Цвета
++Name[se]=Ivnnit
+ Name[sk]=Farby
+ Name[sl]=Barve
+ Name[sr]=Боје
+@@ -100,6 +100,7 @@
+ Comment[pt_BR]=Configuração de Cores do KOrganizer
+ Comment[ro]=Configurare culori KOrganizer
+ Comment[ru]=Настройка цветов органайзера KDE
++Comment[se]=KOrganizer, ivdneheivehusat
+ Comment[sk]=Nastavenie farieb pre KOrganizer
+ Comment[sl]=Nastavitve barv v KOrganizerju
+ Comment[sr]=Подешавање боја у KOrganizer-у
+@@ -111,6 +112,7 @@
+ Comment[uk]=Налаштування кольорів у KOrganizer
+ Comment[zh_CN]=KOrganizer 颜色配置
+ Keywords=korganizer,colors
++Keywords[ar]=korganizer,ألوان
+ Keywords[be]=K Арганізатар,колеры,korganizer,colors
+ Keywords[bg]=организатор, цветове, настройки, korganizer, colors
+ Keywords[br]=korganizer,livioù
+Index: korganizer/korganizer_configfonts.desktop
+===================================================================
+RCS file: /home/kde/kdepim/korganizer/korganizer_configfonts.desktop,v
+retrieving revision 1.16.2.4
+retrieving revision 1.16.2.6
+diff -u -r1.16.2.4 -r1.16.2.6
+--- korganizer/korganizer_configfonts.desktop	26 Nov 2004 08:05:20 -0000	1.16.2.4
++++ korganizer/korganizer_configfonts.desktop	9 Jan 2005 07:49:26 -0000	1.16.2.6
+@@ -41,7 +41,6 @@
+ Name[ja]=フォント
+ Name[lt]=Šriftai
+ Name[lv]=Fonti
+-Name[mk]=Фонтови
+ Name[nb]=Skrifter
+ Name[nl]=Lettertypen
+ Name[nn]=Skrifttypar
+@@ -50,6 +49,7 @@
+ Name[pt_BR]=Fontes
+ Name[ro]=Fonturi
+ Name[ru]=Шрифты
++Name[se]=Fonttat
+ Name[sk]=Písma
+ Name[sl]=Pisave
+ Name[sr]=Фонтови
+@@ -95,6 +95,7 @@
+ Comment[pt_BR]=Configuração de Fontes do KOrganizer
+ Comment[ro]=Configurare fonturi KOrganizer
+ Comment[ru]=Настройка шрифтов органайзера KDE
++Comment[se]=KOrganizer, fontaheivehusat
+ Comment[sk]=Nastavenie písiem pre KOrganizer
+ Comment[sl]=Nastavitev pisav v KOrganizerju
+ Comment[sr]=Подешавање фонтова у KOrganizer-у
+Index: korganizer/korganizer_configfreebusy.desktop
+===================================================================
+RCS file: /home/kde/kdepim/korganizer/korganizer_configfreebusy.desktop,v
+retrieving revision 1.14.2.5
+retrieving revision 1.14.2.6
+diff -u -r1.14.2.5 -r1.14.2.6
+--- korganizer/korganizer_configfreebusy.desktop	24 Oct 2004 07:06:03 -0000	1.14.2.5
++++ korganizer/korganizer_configfreebusy.desktop	29 Dec 2004 21:45:06 -0000	1.14.2.6
+@@ -51,6 +51,7 @@
+ Name[uz]=Бўш/Банд
+ Name[zh_CN]=忙/闲
+ Comment=KOrganizer Free/Busy Configuration
++Comment[ar]=تكوين KOrganizer في وضع متوفر أو مشغول
+ Comment[bg]=Настройки на свободно/заето за KOrganizer
+ Comment[bs]=KOrganizer podešavanje za Slobodan/Zauzet
+ Comment[ca]=Configuració de Lliure/ocupat per a KOrganizer
+@@ -87,6 +88,7 @@
+ Comment[uk]=Налаштування вільного/зайнятого часу в KOrganizer
+ Comment[zh_CN]=KOrganizer 空闲/忙碌配置
+ Keywords=korganizer,freebusy,scheduling
++Keywords[ar]=korganizer,متوفر مشغول,الجدولة
+ Keywords[bg]=организатор, свободно, заето, настройки, korganizer, freebusy, scheduling
+ Keywords[bs]=korganizer,freebusy,scheduling,raspored
+ Keywords[ca]=korganizer,lliure ocupat,planificació
+Index: korganizer/korganizer_configgroupautomation.desktop
+===================================================================
+RCS file: /home/kde/kdepim/korganizer/korganizer_configgroupautomation.desktop,v
+retrieving revision 1.16.2.2
+retrieving revision 1.16.2.4
+diff -u -r1.16.2.2 -r1.16.2.4
+--- korganizer/korganizer_configgroupautomation.desktop	24 Oct 2004 07:06:03 -0000	1.16.2.2
++++ korganizer/korganizer_configgroupautomation.desktop	9 Jan 2005 07:49:26 -0000	1.16.2.4
+@@ -39,6 +39,7 @@
+ Name[pt]=Automação do Grupo
+ Name[pt_BR]=Automação de Grupo
+ Name[ru]=Групповая работа
++Name[se]=Joavkoautomatiseren
+ Name[sk]=Skupinová automatizácia
+ Name[sl]=Avtomatizacija skupin
+ Name[sr]=Аутоматизација група
+@@ -50,6 +51,7 @@
+ Name[uk]=Автоматизація груп
+ Name[zh_CN]=组自动化
+ Comment=KOrganizer Group Automation Configuration
++Comment[ar]=تكوين أتمتة المجموعات في KOrganizer
+ Comment[bg]=Настройки на организация за KOrganizer
+ Comment[bs]=KOrganizer podešavanje automatizacije grupe
+ Comment[ca]=Configuració de l'automatització de grups a KOrganizer
+@@ -75,6 +77,7 @@
+ Comment[pt]=Configuração da Automação do Grupo do KOrganizer
+ Comment[pt_BR]=Configuração de Automação de Grupo do KOrganizer
+ Comment[ru]=Настройка групповой работы в органайзере KDE
++Comment[se]=KOrganizer, joavkoautomatiserema heivehusat
+ Comment[sk]=Nastavenie skupinovej automatizácie pre KOrganizer
+ Comment[sl]=Nastavitev avtomatizacije v KOrganizerju
+ Comment[sr]=Подешавање аутоматизације група у KOrganizer-у
+@@ -86,6 +89,7 @@
+ Comment[uk]=Налаштування автоматизації груп у KOrganizer
+ Comment[zh_CN]=KOrganizer 组自动化配置
+ Keywords=korganizer,group,automation
++Keywords[ar]=korganizer,مجموعة,أتمتة
+ Keywords[bg]=организатор, организация, настройки, korganizer, group, automation
+ Keywords[bs]=korganizer,group,automation,automatizacija,grupa,grupe
+ Keywords[ca]=korganizer,grup,automatització
+Index: korganizer/korganizer_configgroupscheduling.desktop
+===================================================================
+RCS file: /home/kde/kdepim/korganizer/korganizer_configgroupscheduling.desktop,v
+retrieving revision 1.17.2.4
+retrieving revision 1.17.2.6
+diff -u -r1.17.2.4 -r1.17.2.6
+--- korganizer/korganizer_configgroupscheduling.desktop	24 Oct 2004 07:06:03 -0000	1.17.2.4
++++ korganizer/korganizer_configgroupscheduling.desktop	9 Jan 2005 07:49:26 -0000	1.17.2.6
+@@ -40,6 +40,7 @@
+ Name[pt_BR]=Agendamento de Grupo
+ Name[ro]=Planificare grup
+ Name[ru]=Календарь группы
++Name[se]=Joavkoplánen
+ Name[sk]=Skupinové plánovanie
+ Name[sl]=Razporejanje skupin
+ Name[sr]=Распоређивање група
+@@ -77,6 +78,7 @@
+ Comment[pt]=Configuração do Escalonamento do Grupo do KOrganizer
+ Comment[pt_BR]=Configuração de Agendamento de Grupo do KOrganizer
+ Comment[ru]=Настройка календаря группы органайзера KDE
++Comment[se]=KOrganizer, joavkoplánema heivehusat
+ Comment[sk]=Nastavenie skupinového plánovania pre KOrganizer
+ Comment[sl]=Nastavitev razporejanja skupin v KOrganizerju
+ Comment[sr]=Подешавање распоређивања група у KOrganizer-у
+@@ -88,6 +90,7 @@
+ Comment[uk]=Налаштування групового розкладу в KOrganizer
+ Comment[zh_CN]=Korganizer 组日程安排配置
+ Keywords=korganizer,group,scheduling
++Keywords[ar]=جدولة ، مجموعات ، Korganizer
+ Keywords[bg]=организатор, разписание, настройки, korganizer, group, scheduling
+ Keywords[bs]=korganizer,group,scheduling,raspoređivanje,grupa,grupe
+ Keywords[ca]=korganizer,grup,planificació
+Index: korganizer/korganizer_configmain.desktop
+===================================================================
+RCS file: /home/kde/kdepim/korganizer/korganizer_configmain.desktop,v
+retrieving revision 1.17.2.5
+retrieving revision 1.17.2.7
+diff -u -r1.17.2.5 -r1.17.2.7
+--- korganizer/korganizer_configmain.desktop	26 Nov 2004 08:05:20 -0000	1.17.2.5
++++ korganizer/korganizer_configmain.desktop	9 Jan 2005 07:49:26 -0000	1.17.2.7
+@@ -40,6 +40,7 @@
+ Name[pt]=Pessoal
+ Name[pt_BR]=Pessoal
+ Name[ru]=Персональные настройки
++Name[se]=Peršuvnnalaš
+ Name[sk]=Osobné
+ Name[sl]=Osebno
+ Name[sr]=Лично
+@@ -52,6 +53,7 @@
+ Name[uz]=Шахсий
+ Name[zh_CN]=个人
+ Comment=KOrganizer Main Configuration
++Comment[ar]=تكوين KOrganizer الأساسي
+ Comment[bg]=Главни настройки за KOrganizer
+ Comment[bs]=KOrganizer glavno podešavanje
+ Comment[ca]=Configuració principal a KOrganizer
+@@ -78,6 +80,7 @@
+ Comment[pt]=Configuração Principal do KOrganizer
+ Comment[pt_BR]=Configuração Principal do KOrganizer
+ Comment[ru]=Общие настройки органайзера KDE
++Comment[se]=Korganizer, váldoheivehusat
+ Comment[sk]=Hlavné nastavenie KOrganizer
+ Comment[sl]=Glavne nastavitve KOrganizerja
+ Comment[sr]=Главна подешавања у KOrganizer-у
+@@ -89,6 +92,7 @@
+ Comment[uk]=Налаштування особистих даних у KOrganizer
+ Comment[zh_CN]=KOrganizer 主要配置
+ Keywords=korganizer,main,personal
++Keywords[ar]=korganizer,أساسي,شخصي
+ Keywords[bg]=организатор, главни, персонални, настройки, korganizer, main, personal
+ Keywords[bs]=korganizer,main,personal,lično
+ Keywords[ca]=korganizer,principal,personal
+Index: korganizer/korganizer_configprinting.desktop
+===================================================================
+RCS file: /home/kde/kdepim/korganizer/Attic/korganizer_configprinting.desktop,v
+retrieving revision 1.15.2.3
+retrieving revision 1.15.2.5
+diff -u -r1.15.2.3 -r1.15.2.5
+--- korganizer/korganizer_configprinting.desktop	29 Sep 2004 14:06:37 -0000	1.15.2.3
++++ korganizer/korganizer_configprinting.desktop	9 Jan 2005 07:49:26 -0000	1.15.2.5
+@@ -13,6 +13,7 @@
+ X-KDE-CfgDlgHierarchy=KOrganizer
+ 
+ Name=Printing
++Name[ar]=Purist
+ Name[be]=Друк
+ Name[bg]=Печат
+ Name[br]=O voullañ
+@@ -42,6 +43,7 @@
+ Name[pt_BR]=Impressão
+ Name[ro]=Tipărire
+ Name[ru]=Печать
++Name[se]=Čáliheapmi
+ Name[sk]=Tlač
+ Name[sl]=Tiskanje
+ Name[sr]=Штампање
+@@ -54,6 +56,7 @@
+ Name[uz]=Босиб чиқариш
+ Name[zh_CN]=打印
+ Comment=KOrganizer Printing Configuration
++Comment[ar]=أداة إضافية لتكوينات
+ Comment[be]=Канфігурацыя друку "K Арганізатара"
+ Comment[bg]=Настройки на печат за KOrganizer
+ Comment[bs]=KOrganizer podešavanje štampe
+@@ -93,6 +96,7 @@
+ Comment[uk]=Налаштування друку в KOrganizer
+ Comment[zh_CN]=KOrganizer 打印配置
+ Keywords=korganizer,printing
++Keywords[ar]=korganizer,الوقت
+ Keywords[be]=K Арганізатар,друк,korganizer,printing
+ Keywords[bg]=организатор, печат, настройки, korganizer, printing
+ Keywords[bs]=korganizer,printing,štampanje,štampa
+Index: korganizer/korganizer_configtime.desktop
+===================================================================
+RCS file: /home/kde/kdepim/korganizer/korganizer_configtime.desktop,v
+retrieving revision 1.16.2.4
+retrieving revision 1.16.2.6
+diff -u -r1.16.2.4 -r1.16.2.6
+--- korganizer/korganizer_configtime.desktop	24 Oct 2004 07:06:03 -0000	1.16.2.4
++++ korganizer/korganizer_configtime.desktop	9 Jan 2005 07:49:26 -0000	1.16.2.6
+@@ -43,6 +43,7 @@
+ Name[pt_BR]=Data & Hora
+ Name[ro]=Timp şi dată
+ Name[ru]=Дата и время
++Name[se]=Áigi ja beaivvit
+ Name[sk]=Dátum a čas
+ Name[sl]=Čas in datum
+ Name[sr]=Време и датум
+@@ -95,6 +96,7 @@
+ Comment[uk]=Налаштування часу та дати в KOrganizer
+ Comment[zh_CN]=KOrganizer 时间配置
+ Keywords=korganizer,time
++Keywords[ar]=korganizer,الوقت
+ Keywords[be]=K Арганізатар,час,korganizer,time
+ Keywords[bg]=организатор, дата, час, настройки, korganizer, time
+ Keywords[br]=korganizer,amzer
+Index: korganizer/korganizer_configviews.desktop
+===================================================================
+RCS file: /home/kde/kdepim/korganizer/korganizer_configviews.desktop,v
+retrieving revision 1.16.2.3
+retrieving revision 1.16.2.6
+diff -u -r1.16.2.3 -r1.16.2.6
+--- korganizer/korganizer_configviews.desktop	24 Oct 2004 07:06:03 -0000	1.16.2.3
++++ korganizer/korganizer_configviews.desktop	13 Jan 2005 08:02:46 -0000	1.16.2.6
+@@ -16,6 +16,7 @@
+ Name[ar]=عروض
+ Name[be]=Выгляды
+ Name[bg]=Изгледи
++Name[br]=Gweloù
+ Name[bs]=Pogledi
+ Name[ca]=Vistes
+ Name[cs]=Pohledy
+@@ -42,6 +43,7 @@
+ Name[pt_BR]=Visões
+ Name[ro]=Vizualizări
+ Name[ru]=Виды
++Name[se]=Čájeheamit
+ Name[sk]=Pohľady
+ Name[sl]=Prikazi
+ Name[sr]=Прикази
+@@ -54,6 +56,7 @@
+ Name[uz]=Кўринишлар
+ Name[zh_CN]=视图
+ Comment=KOrganizer View Configuration
++Comment[ar]=KOrganizer تكوين عرض 
+ Comment[be]=Канфігурацыя выгляду "K Арганізатара"
+ Comment[bg]=Настройки на изгледи за KOrganizer
+ Comment[bs]=KOrganizer podešavanje pogleda
+@@ -92,6 +95,7 @@
+ Comment[uk]=Налаштування переглядів у KOrganizer
+ Comment[zh_CN]=KOrganizer 视图配置
+ Keywords=korganizer,view
++Keywords[ar]=korganizer,عرض
+ Keywords[be]=K Арганізатар,выгляд,korganizer,view
+ Keywords[bg]=организатор, изглед, изгледи, настройки, korganizer, view
+ Keywords[br]=korganizer,gwell
+Index: korganizer/urihandler.cpp
+===================================================================
+RCS file: /home/kde/kdepim/korganizer/urihandler.cpp,v
+retrieving revision 1.8.2.1
+retrieving revision 1.8.2.2
+diff -u -r1.8.2.1 -r1.8.2.2
+--- korganizer/urihandler.cpp	20 Oct 2004 14:54:56 -0000	1.8.2.1
++++ korganizer/urihandler.cpp	8 Jan 2005 01:33:21 -0000	1.8.2.2
+@@ -41,6 +41,8 @@
+ 
+ #ifndef KORG_NODCOP
+   if ( uri.startsWith( "kmail:" ) ) {
++    // make sure kmail is running or the part is shown
++    kapp->startServiceByDesktopPath("kmail");
+     int pos = uri.find( "/", 8 );
+     if ( pos > 8 ) {
+       QString messageId = uri.mid( 8, pos - 8 );
+Index: korganizer/interfaces/calendar/calendardecoration.desktop
+===================================================================
+RCS file: /home/kde/kdepim/korganizer/interfaces/calendar/calendardecoration.desktop,v
+retrieving revision 1.60.2.5
+retrieving revision 1.60.2.8
+diff -u -r1.60.2.5 -r1.60.2.8
+--- korganizer/interfaces/calendar/calendardecoration.desktop	28 Nov 2004 08:34:03 -0000	1.60.2.5
++++ korganizer/interfaces/calendar/calendardecoration.desktop	9 Jan 2005 07:49:26 -0000	1.60.2.8
+@@ -6,6 +6,7 @@
+ Comment[af]=Kalender Versiering Inplak
+ Comment[ar]=ملحق تزيين التقويم
+ Comment[bg]=Приставка за декорация на календара
++Comment[br]=Lugent kinkladur an deiziadur
+ Comment[bs]=Dodatak za ukrašavanje kalendara
+ Comment[ca]=Endollable de decoració del calendari
+ Comment[cs]=Modul dekorace kalendáře
+@@ -29,6 +30,7 @@
+ Comment[ja]=カレンダー装飾プラグイン
+ Comment[lt]=vCalendar dekoracijų priedas
+ Comment[lv]=Kalendāra Dekorāciju Iespraudnis
++Comment[mk]=Календар - додаток за изглед
+ Comment[mt]=Plagin ta' dekorazzjoni tal-kalendarju
+ Comment[nb]=Calendar dekorasjonsprogramtillegg
+ Comment[nl]=Agendadecoratieplugin
+@@ -39,6 +41,7 @@
+ Comment[pt_BR]=Plugin para Decoração do Calendário
+ Comment[ro]=Modul decorare calendar
+ Comment[ru]=Модуль для украшения календаря
++Comment[se]=Kaleandarčiŋaid lassemoduvla
+ Comment[sk]=Modul pre skrášlenie kalendára
+ Comment[sl]=Vstavek besedilnega okrasa za Koledar
+ Comment[sr]=Прикључак за декорацију календара
+Index: korganizer/interfaces/calendar/calendarplugin.desktop
+===================================================================
+RCS file: /home/kde/kdepim/korganizer/interfaces/calendar/calendarplugin.desktop,v
+retrieving revision 1.87.2.6
+retrieving revision 1.87.2.8
+diff -u -r1.87.2.6 -r1.87.2.8
+--- korganizer/interfaces/calendar/calendarplugin.desktop	28 Nov 2004 08:34:03 -0000	1.87.2.6
++++ korganizer/interfaces/calendar/calendarplugin.desktop	9 Jan 2005 07:49:26 -0000	1.87.2.8
+@@ -33,6 +33,7 @@
+ Comment[ko]=달력 플러그인
+ Comment[lt]=iCalendar priedas
+ Comment[lv]=Kalendāra Iespraudnis
++Comment[mk]=Календар - додаток
+ Comment[mt]=Plagin tal-kalendarju
+ Comment[nb]=Calendar-programtillegg
+ Comment[nl]=Agendaplugin
+@@ -43,6 +44,7 @@
+ Comment[pt_BR]=Plugin de Calendário
+ Comment[ro]=Modul calendar
+ Comment[ru]=Модуль для календаря
++Comment[se]=Kaleandarlassemoduvla
+ Comment[sk]=Modul Calendar
+ Comment[sl]=Vstavek za Koledar
+ Comment[sr]=Прикључак за календар
+Index: korganizer/interfaces/korganizer/korganizerpart.desktop
+===================================================================
+RCS file: /home/kde/kdepim/korganizer/interfaces/korganizer/korganizerpart.desktop,v
+retrieving revision 1.68.2.1
+retrieving revision 1.68.2.3
+diff -u -r1.68.2.1 -r1.68.2.3
+--- korganizer/interfaces/korganizer/korganizerpart.desktop	24 Aug 2004 06:32:34 -0000	1.68.2.1
++++ korganizer/interfaces/korganizer/korganizerpart.desktop	9 Jan 2005 07:49:27 -0000	1.68.2.3
+@@ -25,6 +25,7 @@
+ Comment[ja]=KOrganizer パート
+ Comment[lt]=KOrganizer dalis
+ Comment[lv]=KOrganizer Daļa
++Comment[mk]=Организатор - дел
+ Comment[mt]=Parti ta' KOrganizer
+ Comment[nb]=KOrganizerdel
+ Comment[nn]=KOrganizer-del
+@@ -34,6 +35,7 @@
+ Comment[pt_BR]=Componente do KOrganizer
+ Comment[ro]=Componentă KOrganizer
+ Comment[ru]=Компонент органайзера
++Comment[se]=KOrganizer-oassi
+ Comment[sk]=Part KOrganizer
+ Comment[sl]=Del KOrganizerja
+ Comment[sr]=Део KOrganizer-а
+Index: korganizer/korgac/korgac.desktop
+===================================================================
+RCS file: /home/kde/kdepim/korganizer/korgac/korgac.desktop,v
+retrieving revision 1.85.2.8
+retrieving revision 1.85.2.10
+diff -u -r1.85.2.8 -r1.85.2.10
+--- korganizer/korgac/korgac.desktop	13 Nov 2004 07:20:55 -0000	1.85.2.8
++++ korganizer/korgac/korgac.desktop	5 Jan 2005 07:50:31 -0000	1.85.2.10
+@@ -28,6 +28,7 @@
+ Name[ja]=KOrganizer アラームクライアント
+ Name[lt]=KOrganizer aliarmo klientas
+ Name[lv]=KOrganaizera Trauksmes Klients
++Name[mk]=Организатор/Роковник клиент
+ Name[mt]=Programm tal-allarmi tal-KOrganizer
+ Name[nb]=KOrganizer Alarm-klient
+ Name[nl]=KOrganizer Alarm
+@@ -56,6 +57,7 @@
+ Icon=korganizer
+ Type=Application
+ GenericName=KOrganizer Alarm Daemon Client
++GenericName[ar]=عميل لمراقب تنبيهات KOrganizer
+ GenericName[bg]=Клиент за алармата
+ GenericName[bs]=Klijent KOrganizer alarm demona
+ GenericName[ca]=Client del dimoni d'alarma de KOrganizer
+Index: korganizer/plugins/datenums/datenums.desktop
+===================================================================
+RCS file: /home/kde/kdepim/korganizer/plugins/datenums/datenums.desktop,v
+retrieving revision 1.101.2.10
+retrieving revision 1.101.2.11
+diff -u -r1.101.2.10 -r1.101.2.11
+--- korganizer/plugins/datenums/datenums.desktop	28 Nov 2004 08:34:03 -0000	1.101.2.10
++++ korganizer/plugins/datenums/datenums.desktop	5 Jan 2005 07:50:31 -0000	1.101.2.11
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ X-KDE-Library=libkorg_datenums
+ Name=Date Numbers Plugin for Calendars
++Name[ar]=أداة إضافية لأرقام تواريخ للتقويم
+ Name[bg]=Приставка на календара за дати и смятане с дати
+ Name[bs]=Dodatak za kalendar - brojevi datuma
+ Name[ca]=Endollable de números de data per als calendaris
+Index: korganizer/plugins/exchange/exchange.desktop
+===================================================================
+RCS file: /home/kde/kdepim/korganizer/plugins/exchange/exchange.desktop,v
+retrieving revision 1.78.2.11
+retrieving revision 1.78.2.12
+diff -u -r1.78.2.11 -r1.78.2.12
+--- korganizer/plugins/exchange/exchange.desktop	28 Nov 2004 08:34:04 -0000	1.78.2.11
++++ korganizer/plugins/exchange/exchange.desktop	5 Jan 2005 07:50:31 -0000	1.78.2.12
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ X-KDE-Library=libkorg_exchange
+ Name=Microsoft Exchange 2000 Plugin for KOrganizer
++Name[ar]= KOrganizer خاصة بـ  Microsoft Exchange 2000 أداة إضافية لـ 
+ Name[be]=Дапаўненьне K Арганізатара "Microsoft Exchange 2000"
+ Name[bg]=Приставка на организатора за връзка с Microsoft Exchange 2000
+ Name[bs]=Microsoft Exchange 2000 dodatak za KOrganizer
+Index: korganizer/plugins/hebrew/hebrew.desktop
+===================================================================
+RCS file: /home/kde/kdepim/korganizer/plugins/hebrew/hebrew.desktop,v
+retrieving revision 1.61.2.12
+retrieving revision 1.61.2.14
+diff -u -r1.61.2.12 -r1.61.2.14
+--- korganizer/plugins/hebrew/hebrew.desktop	28 Nov 2004 08:34:04 -0000	1.61.2.12
++++ korganizer/plugins/hebrew/hebrew.desktop	5 Jan 2005 07:50:32 -0000	1.61.2.14
+@@ -2,7 +2,9 @@
+ Encoding=UTF-8
+ X-KDE-Library=libkorg_hebrew
+ Name=Jewish Calendar Plugin
++Name[ar]=أداة إضافية للتقويم اليهودي
+ Name[bg]=Приставка за еврейския календар
++Name[br]=Lugent deiziadur yudev
+ Name[bs]=Dodatak za hebrejski kalendar
+ Name[ca]=Endollable de calendari jueu
+ Name[cs]=Modul židovského kalendáře
+Index: korganizer/plugins/holidays/holidays.desktop
+===================================================================
+RCS file: /home/kde/kdepim/korganizer/plugins/holidays/Attic/holidays.desktop,v
+retrieving revision 1.101.2.12
+retrieving revision 1.101.2.13
+diff -u -r1.101.2.12 -r1.101.2.13
+--- korganizer/plugins/holidays/holidays.desktop	28 Nov 2004 08:34:04 -0000	1.101.2.12
++++ korganizer/plugins/holidays/holidays.desktop	5 Jan 2005 07:50:32 -0000	1.101.2.13
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ X-KDE-Library=libkorg_holidays
+ Name=Holiday Plugin for Calendars
++Name[ar]=أداة إضافية العطل للتقويم
+ Name[bg]=Приставка на календара за празници и ваканции
+ Name[bs]=Dodatak za kalendar - praznici
+ Name[ca]=Endollable de vacances per als calendaris
+Index: korganizer/plugins/holidays/holidays/holiday_ro
+===================================================================
+RCS file: /home/kde/kdepim/korganizer/plugins/holidays/holidays/Attic/holiday_ro,v
+retrieving revision 1.3
+retrieving revision 1.3.2.1
+diff -u -r1.3 -r1.3.2.1
+--- korganizer/plugins/holidays/holidays/holiday_ro	23 Jul 2004 16:32:45 -0000	1.3
++++ korganizer/plugins/holidays/holidays/holiday_ro	26 Dec 2004 22:26:39 -0000	1.3.2.1
+@@ -3,11 +3,11 @@
+ :
+ : Author: Claudiu Costin <claudiuc@kde.org>
+ :
+-small	  "Anul nou"		on 1.1.
++small   "Anul nou"              on 1.1.
+ small   "Sărbătoarea unirii"    on 24.1
+ small   "Ziua mamei"            on 8.3
+-small	  "Ziua copilului"        on 1.6
+-small   "Ziua naţională"        on 30.12
++small   "Ziua copilului"        on 1.6
++small   "Ziua naţională"        on 1.12
+ small   "Ziua Revoluţiei"       on 22.12
+ red     "Crăciunul"             weekend on 25.12
+ small   "Ziua muncii"           on 1.5
+Index: korganizer/plugins/projectview/projectview.desktop
+===================================================================
+RCS file: /home/kde/kdepim/korganizer/plugins/projectview/projectview.desktop,v
+retrieving revision 1.85.2.5
+retrieving revision 1.85.2.6
+diff -u -r1.85.2.5 -r1.85.2.6
+--- korganizer/plugins/projectview/projectview.desktop	28 Nov 2004 08:34:04 -0000	1.85.2.5
++++ korganizer/plugins/projectview/projectview.desktop	12 Dec 2004 08:32:50 -0000	1.85.2.6
+@@ -29,6 +29,7 @@
+ Name[ja]=KOrganizer 用プロジェクトビュープラグイン
+ Name[lt]=Projekto peržiūros priedas, skirtas KOrganizer
+ Name[lv]=Projekta Skatījuma Iespraudnis KOrganaizeram
++Name[mk]=Project View додаток за Организатор
+ Name[nb]=Programtilllegg for prosjektvisning i KOrganizer
+ Name[nl]=Projectenweergaveplugin voor KOrganizer
+ Name[nn]=Prosjektvisingsmodul for KOrganizer
+Index: korganizer/plugins/webexport/webexport.desktop
+===================================================================
+RCS file: /home/kde/kdepim/korganizer/plugins/webexport/Attic/webexport.desktop,v
+retrieving revision 1.100.2.10
+retrieving revision 1.100.2.11
+diff -u -r1.100.2.10 -r1.100.2.11
+--- korganizer/plugins/webexport/webexport.desktop	28 Nov 2004 08:34:05 -0000	1.100.2.10
++++ korganizer/plugins/webexport/webexport.desktop	5 Jan 2005 07:50:32 -0000	1.100.2.11
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ X-KDE-Library=libkorg_webexport
+ Name=Web Export Plugin for KOrganizer
++Name[ar]=ملحق عرض المشاريع للمنظم
+ Name[bg]=Приставка на организатора за експорт в уеб формат
+ Name[bs]=Eksportovanje na web, dodatak za KOrganizer
+ Name[ca]=Endollable d'exportació web per a KOrganizer
+Index: kpilot/conduits/abbrowserconduit/abbrowser_conduit.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kpilot/conduits/abbrowserconduit/abbrowser_conduit.desktop,v
+retrieving revision 1.152.2.2
+retrieving revision 1.152.2.5
+diff -u -r1.152.2.2 -r1.152.2.5
+--- kpilot/conduits/abbrowserconduit/abbrowser_conduit.desktop	24 Oct 2004 07:06:06 -0000	1.152.2.2
++++ kpilot/conduits/abbrowserconduit/abbrowser_conduit.desktop	9 Jan 2005 07:49:27 -0000	1.152.2.5
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ Type=Service
+ Comment=This conduit syncs the handheld addressbook with KDE's addressbook.
++Comment[ar]=تقوم هذه القناة بمطابقة دفتر العناوين في الجهاز المحمول مع نظيره في KDE
+ Comment[bg]=Синхронизация на адресника на КДЕ с мобилни устройства
+ Comment[bs]=Ovaj conduit sinhronizuje adresar ručnog računara sa KDEovim adresarom.
+ Comment[ca]=Aquest conducte sincronitza la llibreta d'adreces de la vostra agenda electrònica amb la llibreta d'adreces de KDE.
+@@ -62,7 +63,6 @@
+ Name[it]=Rubrica degli indirizzi
+ Name[ja]=アドレス帳
+ Name[lt]=Adresų Knyga
+-Name[mk]=Адресар
+ Name[nb]=Addressebok
+ Name[nl]=Adresboek
+ Name[nn]=Adressebok
+@@ -71,6 +71,7 @@
+ Name[pt_BR]=Livro de Endereços
+ Name[ro]=Carte de adrese
+ Name[ru]=Адресная книга
++Name[se]=Čujuhusgirji
+ Name[sk]=Adresár
+ Name[sl]=Adresar
+ Name[sr]=Адресар
+Index: kpilot/conduits/docconduit/doc_conduit.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kpilot/conduits/docconduit/doc_conduit.desktop,v
+retrieving revision 1.51.2.3
+retrieving revision 1.51.2.4
+diff -u -r1.51.2.3 -r1.51.2.4
+--- kpilot/conduits/docconduit/doc_conduit.desktop	24 Oct 2004 07:06:06 -0000	1.51.2.3
++++ kpilot/conduits/docconduit/doc_conduit.desktop	29 Dec 2004 21:45:08 -0000	1.51.2.4
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ Type=Service
+ Comment=Adds text files to your Pilot, suitable for DOC readers.
++Comment[ar]=تضيف  ملفات نصية إل المرشد ، ملائم للبرامج التي تقرأ DOC
+ Comment[bg]=Добавяне на текстови файлове към Palm Pilot
+ Comment[bs]=Dodaje tekstualne datoteke prikladne za DOC čitače vašem Pilotu.
+ Comment[ca]=Afegeix fitxers de text al vostre Pilot, apropiat per a lectors de DOC.
+Index: kpilot/conduits/docconduit/kpalmdoc.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kpilot/conduits/docconduit/kpalmdoc.desktop,v
+retrieving revision 1.56.2.2
+retrieving revision 1.56.2.3
+diff -u -r1.56.2.2 -r1.56.2.3
+--- kpilot/conduits/docconduit/kpalmdoc.desktop	24 Oct 2004 07:06:06 -0000	1.56.2.2
++++ kpilot/conduits/docconduit/kpalmdoc.desktop	29 Dec 2004 21:45:08 -0000	1.56.2.3
+@@ -6,6 +6,7 @@
+ Name[sv]=Kpalm DOC
+ Name[ta]=கேகைdoc
+ GenericName=PalmDOC Converter
++GenericName[ar]=PalmDOC محول 
+ GenericName[bg]=Конвертиране на PalmDOC
+ GenericName[bs]=PalmDOC konverter
+ GenericName[ca]=Convertidor a PalmDOC
+Index: kpilot/conduits/knotes/knotes-conduit.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kpilot/conduits/knotes/knotes-conduit.desktop,v
+retrieving revision 1.123.2.3
+retrieving revision 1.123.2.5
+diff -u -r1.123.2.3 -r1.123.2.5
+--- kpilot/conduits/knotes/knotes-conduit.desktop	19 Nov 2004 07:37:43 -0000	1.123.2.3
++++ kpilot/conduits/knotes/knotes-conduit.desktop	17 Jan 2005 08:24:17 -0000	1.123.2.5
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ Type=Service
+ Comment=This conduit syncs the Memo Pad application with KNotes.
++Comment[ar]=  هذه القناة تطابق برنامج Memo Pad مع KNotes
+ Comment[bg]=Синхронизация на бележки на КДЕ с мобилни устройства
+ Comment[bs]=Ovaj conduit sinhronizuje Memo Pad aplikaciju sa KNotes.
+ Comment[ca]=Aquest conducte sincronitza l'aplicació Memo Pad amb Knotes.
+@@ -21,7 +22,7 @@
+ Comment[nb]=Denne kanalen synkroniserer notatblokk-applikasjonen med KNotes.
+ Comment[nl]=Dit conduit synchroniseert de Memo Pad met KNotes.
+ Comment[nn]=Denne koplinga synkroniserer «Memo Pad»-applikasjonen med KNotes.
+-Comment[pl]=Ten łącznik synchronizuje aplikację Memo Pad palmtopa z KNotes (notatkami).
++Comment[pl]=Ten łącznik synchronizuje program Memo Pad palmtopa z KNotes (notatkami).
+ Comment[pt]=Esta conduta sincroniza os memorandos com o KNotes.
+ Comment[pt_BR]=Este conduíte sincroniza a aplicação Memo Pad com o KNotes.
+ Comment[ro]=Această conductă sincronizează aplicaţia Memo Pad cu KNotes.
+@@ -37,6 +38,7 @@
+ Comment[uk]=Цей акведук синхронізує Memo Pad з тижневиком KNotes.
+ Comment[zh_CN]=此管道将会将您的备忘程序与 KNotes 同步。
+ Name=KNotes / Memos
++Name[ar]=KNotes / مذكرات
+ Name[be]=K Нататкі
+ Name[bg]=KNotes/Memos
+ Name[cs]=KNotes / Poznámky
+Index: kpilot/conduits/malconduit/mal_conduit.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kpilot/conduits/malconduit/mal_conduit.desktop,v
+retrieving revision 1.36.2.1
+retrieving revision 1.36.2.3
+diff -u -r1.36.2.1 -r1.36.2.3
+--- kpilot/conduits/malconduit/mal_conduit.desktop	24 Aug 2004 06:32:42 -0000	1.36.2.1
++++ kpilot/conduits/malconduit/mal_conduit.desktop	29 Dec 2004 21:45:08 -0000	1.36.2.3
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ Type=Service
+ Name=MAL (AvantGo) Conduit
++Name[ar]=مسلك خاص ببرنامج AvantGo
+ Name[ca]=Conducte MAL (AvantGo)
+ Name[cs]=Propojení s AvantGo
+ Name[cy]=Cwndid MAL (AvantGo)
+@@ -19,6 +20,7 @@
+ Name[it]=Conduit MAL (AvantGo)
+ Name[ja]=MAL (AvantGo) コンジット
+ Name[lt]=MAL (AvantGo) kanalas
++Name[mk]=МAL (AvantGo) спој
+ Name[nb]=MAL (AvantGo) kanal
+ Name[nn]=MAL-kopling (AvantGo)
+ Name[nso]=Conduit ya MAL (AvantGo)
+Index: kpilot/conduits/notepadconduit/notepad-conduit.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kpilot/conduits/notepadconduit/notepad-conduit.desktop,v
+retrieving revision 1.20.2.9
+retrieving revision 1.20.2.10
+diff -u -r1.20.2.9 -r1.20.2.10
+--- kpilot/conduits/notepadconduit/notepad-conduit.desktop	13 Nov 2004 07:20:56 -0000	1.20.2.9
++++ kpilot/conduits/notepadconduit/notepad-conduit.desktop	29 Dec 2004 21:45:09 -0000	1.20.2.10
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ Type=Service
+ Name=NotePad
++Name[ar]=دفتر المذكرات
+ Name[cs]=Poznámkový blok
+ Name[da]=Notesblok
+ Name[de]=Notizen
+@@ -19,6 +20,7 @@
+ Name[tg]=Эзоҳот
+ Name[zh_CN]=记事本
+ Comment=This conduit backs up NotePad drawings to a local folder
++Comment[ar]=هذا المسلك يقوم بنسخ رسومات NotePad إلى ملف محلي
+ Comment[bg]=Създаване на архивни копия на изображенията създадени с NotePad в локална директория
+ Comment[bs]=Ovaj pomoćnik čuva backup NotePad crteža u lokalnom direktoriju
+ Comment[ca]=Aquest conducte copia els dibuixos NotePad a una carpeta local
+Index: kpilot/conduits/null/null-conduit.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kpilot/conduits/null/null-conduit.desktop,v
+retrieving revision 1.148.2.2
+retrieving revision 1.148.2.3
+diff -u -r1.148.2.2 -r1.148.2.3
+--- kpilot/conduits/null/null-conduit.desktop	19 Nov 2004 07:37:43 -0000	1.148.2.2
++++ kpilot/conduits/null/null-conduit.desktop	29 Dec 2004 21:45:09 -0000	1.148.2.3
+@@ -8,6 +8,7 @@
+ Name[ta]=வெற்று மதிப்பு
+ Name[tr]=BOŞ
+ Comment=This conduit does nothing.
++Comment[ar]=لا تؤدي هذه القناة أي غرض
+ Comment[bg]=Това нещо прави нищо
+ Comment[bs]=Ovaj conduit ne radi ništa.
+ Comment[ca]=Aquest conducte no fa res.
+Index: kpilot/conduits/perlconduit/perl-conduit.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kpilot/conduits/perlconduit/perl-conduit.desktop,v
+retrieving revision 1.26.2.11
+retrieving revision 1.26.2.13
+diff -u -r1.26.2.11 -r1.26.2.13
+--- kpilot/conduits/perlconduit/perl-conduit.desktop	19 Nov 2004 07:37:43 -0000	1.26.2.11
++++ kpilot/conduits/perlconduit/perl-conduit.desktop	9 Jan 2005 07:49:27 -0000	1.26.2.13
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ Type=Service
+ Name=Perl (Sample)
++Name[ar]=Perl (نموذج)
+ Name[be]=Perl (прыклад)
+ Name[bs]=Perl (primjer)
+ Name[ca]=Perl (Mostra)
+@@ -24,6 +25,7 @@
+ Name[pt]=Perl (Exemplo)
+ Name[pt_BR]=Perl (exemplo)
+ Name[ru]=Perl (пример)
++Name[se]=Perl (geahččaleapmi)
+ Name[sk]=Perl (Ukážka)
+ Name[sl]=Perl (primer)
+ Name[sr]=Перл (пример)
+@@ -34,6 +36,7 @@
+ Name[uk]=Perl (зразок)
+ Name[zh_CN]=Perl (例子)
+ Comment=This sample conduit runs a Perl interpreter.
++Comment[ar]=تعطي هذه القناة نموذجا لمترجم Perl 
+ Comment[bg]=Пример за изпълнение на интерпретатора на Perl
+ Comment[bs]=Ovaj conduit poziva Perl interpreter.
+ Comment[ca]=Aquest conducte de mostra executa un intèrpret Perl.
+Index: kpilot/conduits/popmail/popmail-conduit.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kpilot/conduits/popmail/popmail-conduit.desktop,v
+retrieving revision 1.136.2.3
+retrieving revision 1.136.2.5
+diff -u -r1.136.2.3 -r1.136.2.5
+--- kpilot/conduits/popmail/popmail-conduit.desktop	24 Oct 2004 07:06:07 -0000	1.136.2.3
++++ kpilot/conduits/popmail/popmail-conduit.desktop	9 Jan 2005 07:49:27 -0000	1.136.2.5
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ Type=Service
+ Name=Mail
++Name[ar]=بريد
+ Name[be]=Пошта
+ Name[br]=Lizher
+ Name[ca]=Correu
+@@ -30,6 +31,7 @@
+ Name[pt_BR]=Correio
+ Name[ro]=E-Mail
+ Name[ru]=Почта
++Name[se]=E-boasta
+ Name[sk]=Pošta
+ Name[sl]=Pošta
+ Name[sr]=Пошта
+Index: kpilot/conduits/pythonconduit/python-conduit.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kpilot/conduits/pythonconduit/python-conduit.desktop,v
+retrieving revision 1.26.2.11
+retrieving revision 1.26.2.13
+diff -u -r1.26.2.11 -r1.26.2.13
+--- kpilot/conduits/pythonconduit/python-conduit.desktop	19 Nov 2004 07:37:44 -0000	1.26.2.11
++++ kpilot/conduits/pythonconduit/python-conduit.desktop	9 Jan 2005 07:49:28 -0000	1.26.2.13
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ Type=Service
+ Name=Python (Sample)
++Name[ar]=Python (نموذج)
+ Name[be]=Python (прыклад)
+ Name[bs]=Python (primjer)
+ Name[ca]=Python (Mostra)
+@@ -24,6 +25,7 @@
+ Name[pt]=Python (Exemplo)
+ Name[pt_BR]=Python (exemplo)
+ Name[ru]=Python (пример)
++Name[se]=Python (geahččaleapmi)
+ Name[sk]=Python (Ukážka)
+ Name[sl]=Python (primer)
+ Name[sr]=Python (пример)
+@@ -34,6 +36,7 @@
+ Name[uk]=Python (зразок)
+ Name[zh_CN]=Python (例子)
+ Comment=This sample conduit runs a Python interpreter.
++Comment[ar]=تعطي هذه القناة نموذجا لمترجم Python
+ Comment[bg]=Пример за изпълнение на интерпретатора на Python
+ Comment[bs]=Ovaj conduit pozivan Python interpreter.
+ Comment[ca]=Aquest conducte de mostra executa un intèrpret Python.
+Index: kpilot/conduits/sysinfoconduit/sysinfo_conduit.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kpilot/conduits/sysinfoconduit/sysinfo_conduit.desktop,v
+retrieving revision 1.48.2.5
+retrieving revision 1.48.2.7
+diff -u -r1.48.2.5 -r1.48.2.7
+--- kpilot/conduits/sysinfoconduit/sysinfo_conduit.desktop	22 Nov 2004 08:35:08 -0000	1.48.2.5
++++ kpilot/conduits/sysinfoconduit/sysinfo_conduit.desktop	9 Jan 2005 07:49:28 -0000	1.48.2.7
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ Type=Service
+ Comment=This conduit writes information about your handheld and the sync to a file.
++Comment[ar]=تقوم هذه الأداة بكتابة معلومات عن جهازك المحمول و تسجيل عملية المزامنة إلى ملف
+ Comment[bg]=Запис на информацията относно мобилното устройство във файл
+ Comment[bs]=Ovaj conduit ispisuje informacije o ručnom računaru i sinhronizuje ih sa datotekom.
+ Comment[ca]=Aquest conducte escriu informació a un fitxer a sobre de la vostra agenda electrònica i la sincronització.
+@@ -35,6 +36,7 @@
+ Comment[uk]=Цей акведук записує інформацію про кишеньковий пристрій і синхронізацію у файл.
+ Comment[zh_CN]=此管道写入您手持设备的信息,并同步至一文件。
+ Name=System Information
++Name[ar]=معلومات النظام
+ Name[be]=Сыстэмная інфармацыя
+ Name[br]=Titouroù war ar reizhiad
+ Name[bs]=Sistemske informacije
+@@ -63,6 +65,7 @@
+ Name[pt_BR]=Informação do Sistema
+ Name[ro]=Informaţii de sistem
+ Name[ru]=Информация о системе
++Name[se]=Vuogádatdieđut
+ Name[sk]=Informácie o systéme
+ Name[sl]=Sistemske informacije
+ Name[sr]=Информације о систему
+Index: kpilot/conduits/timeconduit/time_conduit.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kpilot/conduits/timeconduit/time_conduit.desktop,v
+retrieving revision 1.79.2.3
+retrieving revision 1.79.2.4
+diff -u -r1.79.2.3 -r1.79.2.4
+--- kpilot/conduits/timeconduit/time_conduit.desktop	10 Nov 2004 07:37:30 -0000	1.79.2.3
++++ kpilot/conduits/timeconduit/time_conduit.desktop	29 Dec 2004 21:45:10 -0000	1.79.2.4
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ Type=Service
+ Comment=This conduit sets the time on your handheld from the PC clock.
++Comment[ar]=تقوم هذه الأداة الإضافية بإعداد الوقت على جهازك المحمول من خلال وصله على الحاسوب الشخصي
+ Comment[bg]=Синхронизация на датата и часа на мобилно устройство с часовника на компютъра
+ Comment[bs]=Ovaj conduit postavlja vrijeme na vašem ručnom računaru prema PC satu.
+ Comment[ca]=Aquest conducte estableix l'hora en la vostra agenda electrònica des del rellotge del PC.
+Index: kpilot/conduits/vcalconduit/todo-conduit.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kpilot/conduits/vcalconduit/todo-conduit.desktop,v
+retrieving revision 1.133.2.8
+retrieving revision 1.133.2.10
+diff -u -r1.133.2.8 -r1.133.2.10
+--- kpilot/conduits/vcalconduit/todo-conduit.desktop	13 Nov 2004 07:20:58 -0000	1.133.2.8
++++ kpilot/conduits/vcalconduit/todo-conduit.desktop	9 Jan 2005 07:49:28 -0000	1.133.2.10
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ Type=Service
+ Comment=This conduit syncs the ToDo list from your handheld to KOrganizer.
++Comment[ar]=تقوم هذه القناة بمطابقة قائمة الوظائف من الجهاز المحمول مع نظيرتها في KOrganizer
+ Comment[bg]=Синхронизация на списъка със задачи на мобилно устройство с организатора в КДЕ
+ Comment[bs]=Ovaj conduit sinhronizuje listu Zadataka na ručnom računaru sa KOrganizerom.
+ Comment[ca]=Aquest conducte sincronitza la llista de pendents des de la vostra agenda electrònica a KOrganizer.
+@@ -36,6 +37,7 @@
+ Comment[uk]=Цей акведук синхронізує список завдань кишенькового пристрою з тижневиком KOrganizer.
+ Comment[zh_CN]=此管道会将您的待办列表与 KOrganizer 同步。
+ Name=ToDos (KOrganizer)
++Name[ar]=الوظائف (KOrganizer)
+ Name[be]=Заданьні (K Арганізатар)
+ Name[bs]=Zadaci (KOrganizer)
+ Name[ca]=Pendents (KOrganizer)
+@@ -57,6 +59,7 @@
+ Name[pt]=Por Fazer (KOrganizer)
+ Name[pt_BR]=Pendências (KOrganizer)
+ Name[ru]=Задачи (KOrganizer)
++Name[se]=Barggut (KOrganizer)
+ Name[sk]=Úlohy (KOrganizer)
+ Name[sl]=Čakajoča opravila (KOrganizer)
+ Name[sr]=Задаци (KOrganizer)
+Index: kpilot/conduits/vcalconduit/vcal-conduit.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kpilot/conduits/vcalconduit/vcal-conduit.desktop,v
+retrieving revision 1.210.2.12
+retrieving revision 1.210.2.16
+diff -u -r1.210.2.12 -r1.210.2.16
+--- kpilot/conduits/vcalconduit/vcal-conduit.desktop	18 Nov 2004 07:30:47 -0000	1.210.2.12
++++ kpilot/conduits/vcalconduit/vcal-conduit.desktop	9 Jan 2005 07:49:28 -0000	1.210.2.16
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ Type=Service
+ Comment=This conduit syncs the Datebook from your handheld to KOrganizer.
++Comment[ar]=تقوم هذه القناة بمطابقة قائمة الوظائف من الجهاز المحمول مع نظيرتها في KOrganizer
+ Comment[bg]=Синхронизация на календара на мобилно устройство с организатора в КДЕ
+ Comment[bs]=Ovaj conduit sinhronizuje Datebook aplikaciju na ručnom računaru sa KOrganizerom.
+ Comment[ca]=Aquest conducte sincronitza la llibreta de dates des de la vostra agenda electrònica a KOrganizer.
+@@ -36,7 +37,9 @@
+ Comment[uk]=Цей акведук синхронізує список подій кишенькового пристрою з тижневиком KOrganizer.
+ Comment[zh_CN]=此管道会将您手持设备中的日期表与 KOrganizer 同步。
+ Name=Calendar (KOrganizer)
++Name[ar]=التقويم(KOrganizer)
+ Name[be]=Каляндар (K Арганізатар)
++Name[br]=Deiziadur (KOrganizer)
+ Name[bs]=Kalendar (KOrganizer)
+ Name[ca]=Calendari (KOrganizer)
+ Name[cs]=Kalendář (KOrganizer)
+@@ -59,6 +62,7 @@
+ Name[pt]=Calendário (KOrganizer)
+ Name[pt_BR]=Calendário (KOrganizer)
+ Name[ru]=Календарь (KOrganizer)
++Name[se]=Kaleandar (KOrganizer)
+ Name[sk]=Kalendár (KOrganizer)
+ Name[sl]=Koledar (KOrganizer)
+ Name[sr]=Календар (KOrganizer)
+Index: kpilot/kpilot/kpilot.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kpilot/kpilot/kpilot.desktop,v
+retrieving revision 1.102.2.2
+retrieving revision 1.102.2.4
+diff -u -r1.102.2.2 -r1.102.2.4
+--- kpilot/kpilot/kpilot.desktop	31 Aug 2004 07:23:30 -0000	1.102.2.2
++++ kpilot/kpilot/kpilot.desktop	17 Dec 2004 07:31:44 -0000	1.102.2.4
+@@ -17,6 +17,7 @@
+ GenericName[ar]=أداة بالم بايلوت
+ GenericName[be]=Інструмэнт Palm Pilot
+ GenericName[bg]=Връзка с PalmPilot
++GenericName[br]=Ostilh PalmPilot
+ GenericName[bs]=Alati za PalmPilot
+ GenericName[ca]=Eina PalmPilot
+ GenericName[cs]=Nástroj pro PalmPilot
+@@ -40,6 +41,7 @@
+ GenericName[ja]=PalmPilot ツール
+ GenericName[lt]=PalmPilot įrankis
+ GenericName[lv]=PalmPilota Rīks
++GenericName[mk]=Алатка за Palm Pilot
+ GenericName[mt]=Għodda għall-Palm Pilot
+ GenericName[nb]=PalmPilot-verktøy
+ GenericName[nl]=Palm Pilot-synchronisatie
+Index: kpilot/kpilot/kpilot_config.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kpilot/kpilot/kpilot_config.desktop,v
+retrieving revision 1.29.2.11
+retrieving revision 1.29.2.13
+diff -u -r1.29.2.11 -r1.29.2.13
+--- kpilot/kpilot/kpilot_config.desktop	13 Nov 2004 07:20:58 -0000	1.29.2.11
++++ kpilot/kpilot/kpilot_config.desktop	9 Jan 2005 07:49:29 -0000	1.29.2.13
+@@ -12,6 +12,7 @@
+ X-KDE-ParentComponents=kpilot,kpilotDaemon,kontact_kpilotplugin
+ 
+ Name=KPilot Configuration
++Name[ar]=تكوين KPilot
+ Name[be]=Канфігурацыя KPilot
+ Name[bs]=KPilot podešavanje
+ Name[ca]=Configuració de KPilot
+@@ -35,6 +36,7 @@
+ Name[pt]=Configuração do KPilot
+ Name[pt_BR]=Configuração do KPilot
+ Name[ru]=Синхронизация с КПК
++Name[se]=KPilot-heivehus
+ Name[sk]=Nastavenie KPilot
+ Name[sl]=Nastavitve KPilota
+ Name[sr]=KPilot подешавање
+@@ -45,6 +47,7 @@
+ Name[uk]=Налаштування KPilot
+ Name[zh_CN]=KPilot 配置
+ Comment=KPilot Main Configuration
++Comment[ar]= KPilot تكوين أساسي لـ
+ Comment[bg]=Главни настройки на KPilot
+ Comment[bs]=KPilot glavno podešavanje
+ Comment[ca]=Configuració principal de KPilot
+@@ -78,6 +81,7 @@
+ Comment[uk]=Загальні параметри KPilot
+ Comment[zh_CN]=KPilot 主要配置
+ Keywords=kpilot,main
++Keywords[ar]=kpilot,أساسي
+ Keywords[bg]=главни, настройки, мобилен, мобилни, устройство, устройства, kpilot,main
+ Keywords[ca]=kpilot,principal
+ Keywords[cs]=kpilot,hlavní
+Index: kpilot/kpilot/kpilotdaemon.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kpilot/kpilot/kpilotdaemon.desktop,v
+retrieving revision 1.87.2.2
+retrieving revision 1.87.2.3
+diff -u -r1.87.2.2 -r1.87.2.3
+--- kpilot/kpilot/kpilotdaemon.desktop	24 Oct 2004 07:06:09 -0000	1.87.2.2
++++ kpilot/kpilot/kpilotdaemon.desktop	12 Dec 2004 08:32:51 -0000	1.87.2.3
+@@ -16,6 +16,7 @@
+ Name[it]=Demone KPilot
+ Name[ja]=KPilot デーモン
+ Name[lv]=KPilotDēmons
++Name[mk]=KPilot демон
+ Name[nso]=Daemon ya KPilot
+ Name[pl]=demon KPilota
+ Name[pt_BR]=Servidor do KPilot
+Index: kresources/egroupware/kabc_xmlrpc.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kresources/egroupware/kabc_xmlrpc.desktop,v
+retrieving revision 1.8.2.1
+retrieving revision 1.8.2.2
+diff -u -r1.8.2.1 -r1.8.2.2
+--- kresources/egroupware/kabc_xmlrpc.desktop	24 Aug 2004 06:32:46 -0000	1.8.2.1
++++ kresources/egroupware/kabc_xmlrpc.desktop	5 Jan 2005 07:50:33 -0000	1.8.2.2
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=XML-RPC
++Name[ar]=IRC
+ Name[it]=XML RPC
+ Name[nl]=XML-PRC
+ Name[pt_BR]=RPC XML
+Index: kresources/egroupware/kcal_xmlrpc.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kresources/egroupware/kcal_xmlrpc.desktop,v
+retrieving revision 1.7.2.1
+retrieving revision 1.7.2.2
+diff -u -r1.7.2.1 -r1.7.2.2
+--- kresources/egroupware/kcal_xmlrpc.desktop	24 Aug 2004 06:32:46 -0000	1.7.2.1
++++ kresources/egroupware/kcal_xmlrpc.desktop	5 Jan 2005 07:50:33 -0000	1.7.2.2
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=XML-RPC
++Name[ar]=IRC
+ Name[it]=XML RPC
+ Name[nl]=XML-PRC
+ Name[pt_BR]=RPC XML
+Index: kresources/egroupware/knotes_xmlrpc.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kresources/egroupware/knotes_xmlrpc.desktop,v
+retrieving revision 1.4.2.1
+retrieving revision 1.4.2.2
+diff -u -r1.4.2.1 -r1.4.2.2
+--- kresources/egroupware/knotes_xmlrpc.desktop	24 Aug 2004 06:32:46 -0000	1.4.2.1
++++ kresources/egroupware/knotes_xmlrpc.desktop	5 Jan 2005 07:50:33 -0000	1.4.2.2
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=XML-RPC
++Name[ar]=IRC
+ Name[it]=XML RPC
+ Name[nl]=XML-PRC
+ Name[pt_BR]=RPC XML
+Index: kresources/exchange/exchange.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kresources/exchange/exchange.desktop,v
+retrieving revision 1.54.2.8
+retrieving revision 1.54.2.9
+diff -u -r1.54.2.8 -r1.54.2.9
+--- kresources/exchange/exchange.desktop	13 Nov 2004 07:20:58 -0000	1.54.2.8
++++ kresources/exchange/exchange.desktop	5 Jan 2005 07:50:33 -0000	1.54.2.9
+@@ -6,6 +6,7 @@
+ X-KDE-ResourceType=exchange
+ ServiceTypes=KResources/Plugin
+ Name=Calendar on Exchange2000 Server
++Name[ar]=Exchange 2000 ملقم
+ Name[be]=Каляндар на сэрвэры Exchange 2000
+ Name[bg]=Календар на сървър Exchange2000
+ Name[bs]=Kalendar na Exchange2000 serveru
+Index: kresources/imap/kcal/imap.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kresources/imap/kcal/Attic/imap.desktop,v
+retrieving revision 1.25.2.8
+retrieving revision 1.25.2.10
+diff -u -r1.25.2.8 -r1.25.2.10
+--- kresources/imap/kcal/imap.desktop	13 Nov 2004 07:20:59 -0000	1.25.2.8
++++ kresources/imap/kcal/imap.desktop	18 Jan 2005 08:14:44 -0000	1.25.2.10
+@@ -1,7 +1,9 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Calendar on IMAP-server via KMail
++Name[ar]=IMAP ملقمr (uk 'vdr KMail)
+ Name[bg]=Календар на сървър IMAP чрез KMail
++Name[br]=Deiziadur en ur servijer IMAP gant KMail
+ Name[bs]=Kalendar na IMAP serveru putem KMaila
+ Name[ca]=Calendari sobre servidor IMAP mitjançant kmail
+ Name[cs]=Kalendář na IMAP serveru přes KMail
+Index: kresources/remote/remote.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kresources/remote/remote.desktop,v
+retrieving revision 1.5.2.3
+retrieving revision 1.5.2.4
+diff -u -r1.5.2.3 -r1.5.2.4
+--- kresources/remote/remote.desktop	10 Nov 2004 07:37:31 -0000	1.5.2.3
++++ kresources/remote/remote.desktop	29 Dec 2004 21:45:11 -0000	1.5.2.4
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ Name=Calendar in Remote File
+ Name[bg]=Календар в отдалечен файл
++Name[br]=Deiziadur e restr a-bell
+ Name[bs]=Kalendar u udaljenoj datoteci
+ Name[ca]=Calendari a un fitxer remot
+ Name[cs]=Kalendář ve vzdáleném souboru
+Index: kresources/slox/kabc_slox.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kresources/slox/kabc_slox.desktop,v
+retrieving revision 1.2.2.1
+retrieving revision 1.2.2.2
+diff -u -r1.2.2.1 -r1.2.2.2
+--- kresources/slox/kabc_slox.desktop	24 Aug 2004 06:32:48 -0000	1.2.2.1
++++ kresources/slox/kabc_slox.desktop	5 Jan 2005 07:50:34 -0000	1.2.2.2
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=SLOX
++Name[ar]=SMS
+ X-KDE-Library=kabc_slox
+ Type=Service
+ ServiceTypes=KResources/Plugin
+Index: kresources/slox/sloxaccounts.cpp
+===================================================================
+RCS file: /home/kde/kdepim/kresources/slox/sloxaccounts.cpp,v
+retrieving revision 1.5.2.2
+retrieving revision 1.5.2.3
+diff -u -r1.5.2.2 -r1.5.2.3
+--- kresources/slox/sloxaccounts.cpp	24 Nov 2004 10:58:02 -0000	1.5.2.2
++++ kresources/slox/sloxaccounts.cpp	2 Dec 2004 09:55:40 -0000	1.5.2.3
+@@ -137,10 +137,9 @@
+ 
+ QString SloxAccounts::cacheFile() const
+ {
+-  QString url = mBaseUrl.url();
+-  url.replace( "/", "_" );
++  QString host = mBaseUrl.host();
+ 
+-  QString file = locateLocal( "cache", "slox/accounts_" + url );
++  QString file = locateLocal( "cache", "slox/accounts_" + host );
+ 
+   kdDebug() << "SloxAccounts::cacheFile(): " << file << endl;
+ 
+Index: ksync/src/ksync.desktop
+===================================================================
+RCS file: /home/kde/kdepim/ksync/src/ksync.desktop,v
+retrieving revision 1.29.2.1
+retrieving revision 1.29.2.2
+diff -u -r1.29.2.1 -r1.29.2.2
+--- ksync/src/ksync.desktop	24 Aug 2004 06:32:50 -0000	1.29.2.1
++++ ksync/src/ksync.desktop	12 Dec 2004 08:32:51 -0000	1.29.2.2
+@@ -13,6 +13,7 @@
+ Name[fr]=KSync
+ Name[hi]=के-सिंक
+ Name[it]=KSync
++Name[mk]=КСинхронизатор
+ Name[mt]=KSync
+ Name[nso]=Ktshomisommogo
+ Name[pt_BR]=Ksync (sincronizador)
+Index: ktnef/gui/ktnef.desktop
+===================================================================
+RCS file: /home/kde/kdepim/ktnef/gui/ktnef.desktop,v
+retrieving revision 1.55.2.4
+retrieving revision 1.55.2.5
+diff -u -r1.55.2.4 -r1.55.2.5
+--- ktnef/gui/ktnef.desktop	24 Oct 2004 07:06:09 -0000	1.55.2.4
++++ ktnef/gui/ktnef.desktop	29 Dec 2004 21:45:12 -0000	1.55.2.5
+@@ -1,5 +1,6 @@
+ [Desktop Entry]
+ Name=TNEF File Viewer
++Name[ar]=عارض لملفات TNEF
+ Name[bg]=Преглед на файлове TNEF
+ Name[bs]=Preglednik TNEF datoteka
+ Name[ca]=Visor fitxer TNEF
+@@ -41,6 +42,7 @@
+ Type=Application
+ DocPath=ktnef/index.html
+ Comment=A viewer/extractor for TNEF files
++Comment[ar]=عارض و مستخلص لملفات TNEF
+ Comment[bg]=Програма за преглед и извличане на файлове TNEF
+ Comment[bs]=Preglednik/ekstraktor za TNEF datoteke
+ Comment[ca]=Un visor/extractor per a fitxers TNEF
+Index: ktnef/gui/ms-tnef.desktop
+===================================================================
+RCS file: /home/kde/kdepim/ktnef/gui/ms-tnef.desktop,v
+retrieving revision 1.41.2.3
+retrieving revision 1.41.2.4
+diff -u -r1.41.2.3 -r1.41.2.4
+--- ktnef/gui/ms-tnef.desktop	22 Nov 2004 08:35:08 -0000	1.41.2.3
++++ ktnef/gui/ms-tnef.desktop	29 Dec 2004 21:45:12 -0000	1.41.2.4
+@@ -4,6 +4,7 @@
+ Icon=tar
+ Patterns=*.tnf;
+ Comment=TNEF File
++Comment[ar]=ملف TNEF
+ Comment[be]=TNEF файл
+ Comment[bg]=Файл TNEF
+ Comment[br]=Restr TNEF
+Index: libical/src/libicalss/icalclassify.c
+===================================================================
+RCS file: /home/kde/kdepim/libical/src/libicalss/Attic/icalclassify.c,v
+retrieving revision 1.5
+retrieving revision 1.5.8.4
+diff -u -r1.5 -r1.5.8.4
+--- libical/src/libicalss/icalclassify.c	22 Jan 2003 11:20:53 -0000	1.5
++++ libical/src/libicalss/icalclassify.c	7 Jan 2005 23:03:33 -0000	1.5.8.4
+@@ -3,7 +3,7 @@
+     FILE: icalclassify.c
+     CREATOR: ebusboom 23 aug 2000
+   
+-    $Id: icalclassify.c,v 1.5 2003/01/22 11:20:53 steffen Exp $
++    $Id: icalclassify.c,v 1.5.8.4 2005/01/07 23:03:33 tilladam Exp $
+     $Locker:  $
+     
+     (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
+@@ -52,17 +52,18 @@
+ char* icalclassify_lowercase(const char* str)
+ {
+     char* p = 0;
+-    char* new = icalmemory_strdup(str);
++	char *xnew;
+ 
+     if(str ==0){
+ 	return 0;
+     }
++    xnew = icalmemory_strdup(str);
+ 
+-    for(p = new; *p!=0; p++){
++    for(p = xnew; *p!=0; p++){
+ 	*p = tolower(*p);
+     }
+ 
+-    return new;
++    return xnew;
+ }
+ 
+ /* Return a set of components that intersect in time with comp. For
+@@ -147,7 +148,9 @@
+     {
+ 	const char* this_attendee
+ 	    = icalclassify_lowercase(icalproperty_get_attendee(p));
+-	char* this_upn = strchr(this_attendee,':');
++	char* this_upn;
++        if ( !this_attendee ) continue;
++		this_upn = strchr(this_attendee,':');
+ 
+         if(this_upn == 0){
+             continue;
+@@ -241,15 +244,16 @@
+ 	p  = icalcomponent_get_first_property(inner,ICAL_ATTENDEE_PROPERTY);
+ 
+ 	if(p!=0){
+-
++	    char *attendee = 0;
+ 	    param = icalproperty_get_first_parameter(p,ICAL_PARTSTAT_PARAMETER);
+ 	    
+ 	    if(param != 0){
+ 		parts->reply_partstat = 
+ 		    icalparameter_get_partstat(param);
+ 	    }
+-	    
+-	    parts->reply_attendee = strdup(icalproperty_get_attendee(p));
++	  attendee = icalproperty_get_attendee(p);
++	 if ( attendee )
++	 	parts->reply_attendee = strdup( attendee );
+ 	}
+ 
+     }    
+Index: libkcal/kabc.desktop
+===================================================================
+RCS file: /home/kde/kdepim/libkcal/kabc.desktop,v
+retrieving revision 1.57.2.2
+retrieving revision 1.57.2.4
+diff -u -r1.57.2.2 -r1.57.2.4
+--- libkcal/kabc.desktop	24 Oct 2004 07:06:10 -0000	1.57.2.2
++++ libkcal/kabc.desktop	10 Jan 2005 09:02:04 -0000	1.57.2.4
+@@ -1,8 +1,10 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Birthdays From KAddressBook
++Name[ar]=KAddressBook تواريخ الميلاد من 
+ Name[be]=Дні нараджэньня з K Адраснай кнігі
+ Name[bg]=Рождени дни от адресника
++Name[br]=Deizioù-ha-bloazioù eus KAddressBook
+ Name[bs]=Rođendani iz KAddressBook adresara
+ Name[ca]=Aniversaris des de KAddressBook
+ Name[cs]=Narozeniny z Knihy adres
+Index: libkcal/local.desktop
+===================================================================
+RCS file: /home/kde/kdepim/libkcal/local.desktop,v
+retrieving revision 1.53.2.4
+retrieving revision 1.53.2.5
+diff -u -r1.53.2.4 -r1.53.2.5
+--- libkcal/local.desktop	10 Nov 2004 07:37:32 -0000	1.53.2.4
++++ libkcal/local.desktop	29 Dec 2004 21:45:12 -0000	1.53.2.5
+@@ -3,6 +3,7 @@
+ Name=Calendar in Local File
+ Name[be]=Каляндар у лякальным файле
+ Name[bg]=Календар в локален файл
++Name[br]=Deiziadur e restr lec'hel
+ Name[bs]=Kalendar u lokalnoj datoteci
+ Name[ca]=Calendari a un fitxer local
+ Name[cs]=Kalendář v lokálním souboru
+Index: libkcal/localdir.desktop
+===================================================================
+RCS file: /home/kde/kdepim/libkcal/localdir.desktop,v
+retrieving revision 1.55.2.3
+retrieving revision 1.55.2.5
+diff -u -r1.55.2.3 -r1.55.2.5
+--- libkcal/localdir.desktop	10 Nov 2004 07:37:32 -0000	1.55.2.3
++++ libkcal/localdir.desktop	18 Jan 2005 08:14:44 -0000	1.55.2.5
+@@ -1,8 +1,10 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Calendar in Local Directory
++Name[ar]=تقويم في دليل محلي
+ Name[be]=Каляндар у лякальным каталёгу
+ Name[bg]=Календар в локална директория
++Name[br]=Deiziadur en ur restr lec'hel
+ Name[bs]=Kalendar u lokalnom direktoriju
+ Name[ca]=Calendari a un directori local
+ Name[cs]=Kalendář v lokální složce
+Index: libkcal/vcalformat.cpp
+===================================================================
+RCS file: /home/kde/kdepim/libkcal/vcalformat.cpp,v
+retrieving revision 1.42.2.1
+retrieving revision 1.42.2.2
+diff -u -r1.42.2.1 -r1.42.2.2
+--- libkcal/vcalformat.cpp	7 Oct 2004 09:20:12 -0000	1.42.2.1
++++ libkcal/vcalformat.cpp	7 Jan 2005 17:51:38 -0000	1.42.2.2
+@@ -266,7 +266,7 @@
+     VObject *d = addPropValue(vtodo, VCDescriptionProp,
+ 			      anEvent->description().local8Bit());
+     if (anEvent->description().find('\n') != -1)
+-      addProp(d, VCQuotedPrintableProp);
++      addPropValue(d, VCEncodingProp, VCQuotedPrintableProp);
+   }
+ 
+   // summary
+@@ -534,7 +534,7 @@
+     VObject *d = addPropValue(vevent, VCDescriptionProp,
+ 			      anEvent->description().local8Bit());
+     if (anEvent->description().find('\n') != -1)
+-      addProp(d, VCQuotedPrintableProp);
++      addPropValue(d, VCEncodingProp, VCQuotedPrintableProp);
+   }
+ 
+   // summary
+Index: libkcal/versit/vcc.c
+===================================================================
+RCS file: /home/kde/kdepim/libkcal/versit/vcc.c,v
+retrieving revision 1.4
+retrieving revision 1.4.2.1
+diff -u -r1.4 -r1.4.2.1
+--- libkcal/versit/vcc.c	22 Jul 2004 21:51:23 -0000	1.4
++++ libkcal/versit/vcc.c	13 Dec 2004 01:56:50 -0000	1.4.2.1
+@@ -1,29 +1,102 @@
++/* A Bison parser, made by GNU Bison 1.875.  */
+ 
+-/*  A Bison parser, made from ./vcc.y
+-    by GNU Bison version 1.28  */
++/* Skeleton parser for Yacc-like parsing with Bison,
++   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software Foundation, Inc.
+ 
+-#define YYBISON 1  /* Identify Bison output.  */
++   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, 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, when this file is copied by Bison into a
++   Bison output file, you may use that output file without restriction.
++   This special exception was added by the Free Software Foundation
++   in version 1.24 of Bison.  */
++
++/* Written by Richard Stallman by simplifying the original so called
++   ``semantic'' parser.  */
++
++/* All symbols defined below should begin with yy or YY, to avoid
++   infringing on user name space.  This should be done even for local
++   variables, as they might otherwise be expanded by user macros.
++   There are some unavoidable exceptions within include files to
++   define necessary library symbols; they are noted "INFRINGES ON
++   USER NAME SPACE" below.  */
++
++/* Identify Bison output.  */
++#define YYBISON 1
++
++/* Skeleton name.  */
++#define YYSKELETON_NAME "yacc.c"
++
++/* Pure parsers.  */
++#define YYPURE 0
++
++/* Using locations.  */
++#define YYLSP_NEEDED 0
++
++
++
++/* Tokens.  */
++#ifndef YYTOKENTYPE
++# define YYTOKENTYPE
++   /* Put the tokens into the symbol table, so that GDB and other debuggers
++      know about them.  */
++   enum yytokentype {
++     EQ = 258,
++     COLON = 259,
++     DOT = 260,
++     SEMICOLON = 261,
++     SPACE = 262,
++     HTAB = 263,
++     LINESEP = 264,
++     NEWLINE = 265,
++     BEGIN_VCARD = 266,
++     END_VCARD = 267,
++     BEGIN_VCAL = 268,
++     END_VCAL = 269,
++     BEGIN_VEVENT = 270,
++     END_VEVENT = 271,
++     BEGIN_VTODO = 272,
++     END_VTODO = 273,
++     ID = 274,
++     STRING = 275
++   };
++#endif
++#define EQ 258
++#define COLON 259
++#define DOT 260
++#define SEMICOLON 261
++#define SPACE 262
++#define HTAB 263
++#define LINESEP 264
++#define NEWLINE 265
++#define BEGIN_VCARD 266
++#define END_VCARD 267
++#define BEGIN_VCAL 268
++#define END_VCAL 269
++#define BEGIN_VEVENT 270
++#define END_VEVENT 271
++#define BEGIN_VTODO 272
++#define END_VTODO 273
++#define ID 274
++#define STRING 275
+ 
+-#define	EQ	257
+-#define	COLON	258
+-#define	DOT	259
+-#define	SEMICOLON	260
+-#define	SPACE	261
+-#define	HTAB	262
+-#define	LINESEP	263
+-#define	NEWLINE	264
+-#define	BEGIN_VCARD	265
+-#define	END_VCARD	266
+-#define	BEGIN_VCAL	267
+-#define	END_VCAL	268
+-#define	BEGIN_VEVENT	269
+-#define	END_VEVENT	270
+-#define	BEGIN_VTODO	271
+-#define	END_VTODO	272
+-#define	ID	273
+-#define	STRING	274
+ 
+-#line 1 "./vcc.y"
++
++
++/* Copy the first part of user declarations.  */
++#line 1 "vcc.y"
+ 
+ 
+ /***************************************************************************
+@@ -125,7 +198,7 @@
+ #endif
+ 
+ #include <string.h>
+-#ifndef __FreeBSD__
++#if !defined(__FreeBSD__) && !defined(__APPLE__)
+ #include <malloc.h>
+ #endif
+ #include <stdio.h>
+@@ -173,6 +246,10 @@
+ #endif
+ 
+ int yyparse();
++static int yylex();
++
++static VObject* popVObject();
++
+ 
+ enum LexMode {
+ 	L_NORMAL,
+@@ -199,470 +276,767 @@
+ static void mime_error_(char *s);
+ 
+ 
+-#line 181 "./vcc.y"
+-typedef union {
++
++/* Enabling traces.  */
++#ifndef YYDEBUG
++# define YYDEBUG 0
++#endif
++
++/* Enabling verbose error messages.  */
++#ifdef YYERROR_VERBOSE
++# undef YYERROR_VERBOSE
++# define YYERROR_VERBOSE 1
++#else
++# define YYERROR_VERBOSE 0
++#endif
++
++#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
++#line 185 "vcc.y"
++typedef union YYSTYPE {
+     char *str;
+     VObject *vobj;
+     } YYSTYPE;
+-#include <stdio.h>
++/* Line 191 of yacc.c.  */
++#line 300 "vcc.tab.c"
++# define yystype YYSTYPE /* obsolescent; will be withdrawn */
++# define YYSTYPE_IS_DECLARED 1
++# define YYSTYPE_IS_TRIVIAL 1
++#endif
++
++
++
++/* Copy the second part of user declarations.  */
++
++
++/* Line 214 of yacc.c.  */
++#line 312 "vcc.tab.c"
++
++#if ! defined (yyoverflow) || YYERROR_VERBOSE
++
++/* The parser invokes alloca or malloc; define the necessary symbols.  */
++
++# if YYSTACK_USE_ALLOCA
++#  define YYSTACK_ALLOC alloca
++# else
++#  ifndef YYSTACK_USE_ALLOCA
++#   if defined (alloca) || defined (_ALLOCA_H)
++#    define YYSTACK_ALLOC alloca
++#   else
++#    ifdef __GNUC__
++#     define YYSTACK_ALLOC __builtin_alloca
++#    endif
++#   endif
++#  endif
++# endif
++
++# ifdef YYSTACK_ALLOC
++   /* Pacify GCC's `empty if-body' warning. */
++#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
++# else
++#  if defined (__STDC__) || defined (__cplusplus)
++#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
++#   define YYSIZE_T size_t
++#  endif
++#  define YYSTACK_ALLOC malloc
++#  define YYSTACK_FREE free
++# endif
++#endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */
++
++
++#if (! defined (yyoverflow) \
++     && (! defined (__cplusplus) \
++	 || (YYSTYPE_IS_TRIVIAL)))
++
++/* A type that is properly aligned for any stack member.  */
++union yyalloc
++{
++  short yyss;
++  YYSTYPE yyvs;
++  };
++
++/* The size of the maximum gap between one aligned stack and the next.  */
++# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
++
++/* The size of an array large to enough to hold all stacks, each with
++   N elements.  */
++# define YYSTACK_BYTES(N) \
++     ((N) * (sizeof (short) + sizeof (YYSTYPE))				\
++      + YYSTACK_GAP_MAXIMUM)
++
++/* Copy COUNT objects from FROM to TO.  The source and destination do
++   not overlap.  */
++# ifndef YYCOPY
++#  if 1 < __GNUC__
++#   define YYCOPY(To, From, Count) \
++      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
++#  else
++#   define YYCOPY(To, From, Count)		\
++      do					\
++	{					\
++	  register YYSIZE_T yyi;		\
++	  for (yyi = 0; yyi < (Count); yyi++)	\
++	    (To)[yyi] = (From)[yyi];		\
++	}					\
++      while (0)
++#  endif
++# endif
++
++/* Relocate STACK from its old location to the new one.  The
++   local variables YYSIZE and YYSTACKSIZE give the old and new number of
++   elements in the stack, and YYPTR gives the new location of the
++   stack.  Advance YYPTR to a properly aligned location for the next
++   stack.  */
++# define YYSTACK_RELOCATE(Stack)					\
++    do									\
++      {									\
++	YYSIZE_T yynewbytes;						\
++	YYCOPY (&yyptr->Stack, Stack, yysize);				\
++	Stack = &yyptr->Stack;						\
++	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
++	yyptr += yynewbytes / sizeof (*yyptr);				\
++      }									\
++    while (0)
+ 
+-#ifndef __cplusplus
+-#ifndef __STDC__
+-#define const
+ #endif
+-#endif
+-
+ 
++#if defined (__STDC__) || defined (__cplusplus)
++   typedef signed char yysigned_char;
++#else
++   typedef short yysigned_char;
++#endif
+ 
+-#define	YYFINAL		62
+-#define	YYFLAG		-32768
+-#define	YYNTBASE	21
+-
+-#define YYTRANSLATE(x) ((unsigned)(x) <= 274 ? yytranslate[x] : 51)
+-
+-static const char yytranslate[] = {     0,
+-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+-     2,     2,     2,     2,     2,     1,     3,     4,     5,     6,
+-     7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
+-    17,    18,    19,    20
++/* YYFINAL -- State number of the termination state. */
++#define YYFINAL  12
++/* YYLAST -- Last index in YYTABLE.  */
++#define YYLAST   56
++
++/* YYNTOKENS -- Number of terminals. */
++#define YYNTOKENS  21
++/* YYNNTS -- Number of nonterminals. */
++#define YYNNTS  31
++/* YYNRULES -- Number of rules. */
++#define YYNRULES  47
++/* YYNRULES -- Number of states. */
++#define YYNSTATES  62
++
++/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
++#define YYUNDEFTOK  2
++#define YYMAXUTOK   275
++
++#define YYTRANSLATE(YYX) 						\
++  ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
++
++/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
++static const unsigned char yytranslate[] =
++{
++       0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
++       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
++       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
++       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
++       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
++       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
++       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
++       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
++       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
++       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
++       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
++       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
++       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
++       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
++       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
++       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
++       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
++       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
++       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
++       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
++       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
++       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
++       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
++       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
++       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
++       2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
++       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
++      15,    16,    17,    18,    19,    20
+ };
+ 
+-#if YYDEBUG != 0
+-static const short yyprhs[] = {     0,
+-     0,     2,     3,     7,     9,    11,    13,    14,    19,    20,
+-    24,    27,    29,    30,    36,    38,    39,    43,    45,    48,
+-    50,    53,    55,    59,    61,    62,    67,    69,    71,    72,
+-    73,    78,    79,    83,    86,    88,    90,    92,    94,    95,
+-   100,   101,   105,   106,   111,   112
++#if YYDEBUG
++/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
++   YYRHS.  */
++static const unsigned char yyprhs[] =
++{
++       0,     0,     3,     5,     6,    10,    12,    14,    16,    17,
++      22,    23,    27,    30,    32,    33,    39,    41,    42,    46,
++      48,    51,    53,    56,    58,    62,    64,    65,    70,    72,
++      74,    75,    76,    81,    82,    86,    89,    91,    93,    95,
++      97,    98,   103,   104,   108,   109,   114,   115
+ };
+ 
+-static const short yyrhs[] = {    22,
+-     0,     0,    24,    23,    22,     0,    24,     0,    25,     0,
+-    40,     0,     0,    11,    26,    28,    12,     0,     0,    11,
+-    27,    12,     0,    29,    28,     0,    29,     0,     0,    31,
+-     4,    30,    37,     9,     0,     1,     0,     0,    36,    32,
+-    33,     0,    36,     0,    34,    33,     0,    34,     0,     6,
+-    35,     0,    36,     0,    36,     3,    36,     0,    19,     0,
+-     0,    39,     6,    38,    37,     0,    39,     0,    20,     0,
+-     0,     0,    13,    41,    43,    14,     0,     0,    13,    42,
+-    14,     0,    44,    43,     0,    44,     0,    45,     0,    48,
+-     0,    28,     0,     0,    15,    46,    28,    16,     0,     0,
+-    15,    47,    16,     0,     0,    17,    49,    28,    18,     0,
+-     0,    17,    50,    18,     0
++/* YYRHS -- A `-1'-separated list of the rules' RHS. */
++static const yysigned_char yyrhs[] =
++{
++      22,     0,    -1,    23,    -1,    -1,    25,    24,    23,    -1,
++      25,    -1,    26,    -1,    41,    -1,    -1,    11,    27,    29,
++      12,    -1,    -1,    11,    28,    12,    -1,    30,    29,    -1,
++      30,    -1,    -1,    32,     4,    31,    38,     9,    -1,     1,
++      -1,    -1,    37,    33,    34,    -1,    37,    -1,    35,    34,
++      -1,    35,    -1,     6,    36,    -1,    37,    -1,    37,     3,
++      37,    -1,    19,    -1,    -1,    40,     6,    39,    38,    -1,
++      40,    -1,    20,    -1,    -1,    -1,    13,    42,    44,    14,
++      -1,    -1,    13,    43,    14,    -1,    45,    44,    -1,    45,
++      -1,    46,    -1,    49,    -1,    29,    -1,    -1,    15,    47,
++      29,    16,    -1,    -1,    15,    48,    16,    -1,    -1,    17,
++      50,    29,    18,    -1,    -1,    17,    51,    18,    -1
+ };
+ 
+-#endif
+-
+-#if YYDEBUG != 0
+-static const short yyrline[] = { 0,
+-   209,   212,   215,   215,   219,   220,   223,   229,   234,   240,
+-   246,   247,   250,   254,   260,   263,   268,   268,   274,   275,
+-   278,   281,   285,   292,   295,   296,   296,   300,   301,   305,
+-   309,   311,   314,   317,   318,   321,   323,   324,   327,   334,
+-   339,   345,   351,   358,   363,   369
++/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
++static const unsigned short yyrline[] =
++{
++       0,   213,   213,   217,   216,   219,   223,   224,   229,   228,
++     239,   238,   250,   251,   255,   254,   264,   268,   267,   272,
++     278,   279,   282,   285,   289,   296,   299,   299,   300,   304,
++     306,   311,   310,   316,   315,   321,   322,   326,   327,   328,
++     333,   332,   344,   343,   357,   356,   368,   367
+ };
+ #endif
+ 
+-
+-#if YYDEBUG != 0 || defined (YYERROR_VERBOSE)
+-
+-static const char * const yytname[] = {   "$","error","$undefined.","EQ","COLON",
+-"DOT","SEMICOLON","SPACE","HTAB","LINESEP","NEWLINE","BEGIN_VCARD","END_VCARD",
+-"BEGIN_VCAL","END_VCAL","BEGIN_VEVENT","END_VEVENT","BEGIN_VTODO","END_VTODO",
+-"ID","STRING","mime","vobjects","@1","vobject","vcard","@2","@3","items","item",
+-"@4","prop","@5","attr_params","attr_param","attr","name","values","@6","value",
+-"vcal","@7","@8","calitems","calitem","eventitem","@9","@10","todoitem","@11",
+-"@12", NULL
++#if YYDEBUG || YYERROR_VERBOSE
++/* YYTNME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
++   First, the terminals, then, starting at YYNTOKENS, nonterminals. */
++static const char *const yytname[] =
++{
++  "$end", "error", "$undefined", "EQ", "COLON", "DOT", "SEMICOLON", "SPACE", 
++  "HTAB", "LINESEP", "NEWLINE", "BEGIN_VCARD", "END_VCARD", "BEGIN_VCAL", 
++  "END_VCAL", "BEGIN_VEVENT", "END_VEVENT", "BEGIN_VTODO", "END_VTODO", 
++  "ID", "STRING", "$accept", "mime", "vobjects", "@1", "vobject", "vcard", 
++  "@2", "@3", "items", "item", "@4", "prop", "@5", "attr_params", 
++  "attr_param", "attr", "name", "values", "@6", "value", "vcal", "@7", 
++  "@8", "calitems", "calitem", "eventitem", "@9", "@10", "todoitem", 
++  "@11", "@12", 0
+ };
+ #endif
+ 
+-static const short yyr1[] = {     0,
+-    21,    23,    22,    22,    24,    24,    26,    25,    27,    25,
+-    28,    28,    30,    29,    29,    32,    31,    31,    33,    33,
+-    34,    35,    35,    36,    38,    37,    37,    39,    39,    41,
+-    40,    42,    40,    43,    43,    44,    44,    44,    46,    45,
+-    47,    45,    49,    48,    50,    48
++# ifdef YYPRINT
++/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
++   token YYLEX-NUM.  */
++static const unsigned short yytoknum[] =
++{
++       0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
++     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
++     275
+ };
++# endif
+ 
+-static const short yyr2[] = {     0,
+-     1,     0,     3,     1,     1,     1,     0,     4,     0,     3,
+-     2,     1,     0,     5,     1,     0,     3,     1,     2,     1,
+-     2,     1,     3,     1,     0,     4,     1,     1,     0,     0,
+-     4,     0,     3,     2,     1,     1,     1,     1,     0,     4,
+-     0,     3,     0,     4,     0,     3
++/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
++static const unsigned char yyr1[] =
++{
++       0,    21,    22,    24,    23,    23,    25,    25,    27,    26,
++      28,    26,    29,    29,    31,    30,    30,    33,    32,    32,
++      34,    34,    35,    36,    36,    37,    39,    38,    38,    40,
++      40,    42,    41,    43,    41,    44,    44,    45,    45,    45,
++      47,    46,    48,    46,    50,    49,    51,    49
+ };
+ 
+-static const short yydefact[] = {     0,
+-     7,    30,     1,     2,     5,     6,     0,     0,     0,     0,
+-     0,    15,    24,     0,     0,     0,    16,    10,    39,    43,
+-    38,     0,     0,    36,    37,    33,     3,     8,    11,    13,
+-     0,     0,     0,     0,     0,    31,    34,    29,     0,    17,
+-    20,     0,    42,     0,    46,    28,     0,    27,    21,    22,
+-    19,    40,    44,    14,    25,     0,    29,    23,    26,     0,
+-     0,     0
++/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
++static const unsigned char yyr2[] =
++{
++       0,     2,     1,     0,     3,     1,     1,     1,     0,     4,
++       0,     3,     2,     1,     0,     5,     1,     0,     3,     1,
++       2,     1,     2,     1,     3,     1,     0,     4,     1,     1,
++       0,     0,     4,     0,     3,     2,     1,     1,     1,     1,
++       0,     4,     0,     3,     0,     4,     0,     3
+ };
+ 
+-static const short yydefgoto[] = {    60,
+-     3,    11,     4,     5,     7,     8,    21,    15,    38,    16,
+-    31,    40,    41,    49,    17,    47,    57,    48,     6,     9,
+-    10,    22,    23,    24,    32,    33,    25,    34,    35
++/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
++   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
++   means the default is an error.  */
++static const unsigned char yydefact[] =
++{
++       0,     8,    31,     0,     2,     3,     6,     7,     0,     0,
++       0,     0,     1,     0,    16,    25,     0,     0,     0,    17,
++      11,    40,    44,    39,     0,     0,    37,    38,    34,     4,
++       9,    12,    14,     0,     0,     0,     0,     0,    32,    35,
++      30,     0,    18,    21,     0,    43,     0,    47,    29,     0,
++      28,    22,    23,    20,    41,    45,    15,    26,     0,    30,
++      24,    27
+ };
+ 
+-static const short yypact[] = {    -9,
+-    -6,    -5,-32768,     7,-32768,-32768,     2,    -1,    19,    15,
+-    -9,-32768,-32768,     1,     0,    26,    27,-32768,    16,    17,
+--32768,    23,     9,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+-    33,     2,    24,     2,    25,-32768,-32768,    13,    22,-32768,
+-    33,    28,-32768,    29,-32768,-32768,    36,    40,-32768,    39,
+--32768,-32768,-32768,-32768,-32768,    22,    13,-32768,-32768,    48,
+-    49,-32768
++/* YYDEFGOTO[NTERM-NUM]. */
++static const yysigned_char yydefgoto[] =
++{
++      -1,     3,     4,    13,     5,     6,     8,     9,    23,    17,
++      40,    18,    33,    42,    43,    51,    19,    49,    59,    50,
++       7,    10,    11,    24,    25,    26,    34,    35,    27,    36,
++      37
+ };
+ 
+-static const short yypgoto[] = {-32768,
+-    41,-32768,-32768,-32768,-32768,-32768,    -7,-32768,-32768,-32768,
+--32768,    10,-32768,-32768,   -34,    -4,-32768,-32768,-32768,-32768,
+--32768,    31,-32768,-32768,-32768,-32768,-32768,-32768,-32768
++/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
++   STATE-NUM.  */
++#define YYPACT_NINF -18
++static const yysigned_char yypact[] =
++{
++      -5,   -10,   -11,     5,   -18,    10,   -18,   -18,     3,    -1,
++      12,    16,   -18,    -5,   -18,   -18,    20,     0,    29,    30,
++     -18,    19,    18,   -18,    23,     6,   -18,   -18,   -18,   -18,
++     -18,   -18,   -18,    32,     3,    24,     3,    21,   -18,   -18,
++      22,    25,   -18,    32,    27,   -18,    28,   -18,   -18,    36,
++      41,   -18,    45,   -18,   -18,   -18,   -18,   -18,    25,    22,
++     -18,   -18
+ };
+ 
+-
+-#define	YYLAST		54
+-
+-
+-static const short yytable[] = {    14,
+-    12,     1,    12,     2,    50,    -9,    -4,    29,   -32,    12,
+-    18,   -12,    28,   -12,   -12,   -12,   -12,   -12,    13,    12,
+-    13,    58,   -35,    19,    42,    20,    44,    13,    26,    30,
+-   -18,   -41,    46,    19,   -45,    20,    36,    13,    39,    43,
+-    13,    56,    45,    52,    54,    55,    53,    61,    62,     0,
+-    51,    27,    59,    37
++/* YYPGOTO[NTERM-NUM].  */
++static const yysigned_char yypgoto[] =
++{
++     -18,   -18,    37,   -18,   -18,   -18,   -18,   -18,    -8,   -18,
++     -18,   -18,   -18,     8,   -18,   -18,   -17,    -7,   -18,   -18,
++     -18,   -18,   -18,    31,   -18,   -18,   -18,   -18,   -18,   -18,
++     -18
+ };
+ 
+-static const short yycheck[] = {     7,
+-     1,    11,     1,    13,    39,    12,     0,    15,    14,     1,
+-    12,    12,    12,    14,    15,    16,    17,    18,    19,     1,
+-    19,    56,    14,    15,    32,    17,    34,    19,    14,     4,
+-     4,    16,    20,    15,    18,    17,    14,    19,     6,    16,
+-    19,     3,    18,    16,     9,     6,    18,     0,     0,    -1,
+-    41,    11,    57,    23
++/* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
++   positive, shift that token.  If negative, reduce the rule which
++   number is the opposite.  If zero, do what YYDEFACT says.
++   If YYTABLE_NINF, syntax error.  */
++#define YYTABLE_NINF -47
++static const yysigned_char yytable[] =
++{
++      16,    14,   -10,   -33,    14,    12,     1,    14,     2,    31,
++      -5,    20,   -13,    14,   -13,   -13,   -13,   -13,   -13,    15,
++     -36,    21,    15,    22,    52,    15,    44,    21,    46,    22,
++      28,    15,    30,    32,   -19,   -42,   -46,    38,    41,    47,
++      45,    60,    48,    54,    15,    56,    55,    57,    58,     0,
++      29,    53,    61,     0,     0,     0,    39
+ };
+-/* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
+-#line 3 "/usr/share/bison.simple"
+-/* This file comes from bison-1.28.  */
+-
+-/* Skeleton output parser for bison,
+-   Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc.
+-
+-   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, 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.  */
++static const yysigned_char yycheck[] =
++{
++       8,     1,    12,    14,     1,     0,    11,     1,    13,    17,
++       0,    12,    12,     1,    14,    15,    16,    17,    18,    19,
++      14,    15,    19,    17,    41,    19,    34,    15,    36,    17,
++      14,    19,    12,     4,     4,    16,    18,    14,     6,    18,
++      16,    58,    20,    16,    19,     9,    18,     6,     3,    -1,
++      13,    43,    59,    -1,    -1,    -1,    25
++};
+ 
+-/* As a special exception, when this file is copied by Bison into a
+-   Bison output file, you may use that output file without restriction.
+-   This special exception was added by the Free Software Foundation
+-   in version 1.24 of Bison.  */
++/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
++   symbol of state STATE-NUM.  */
++static const unsigned char yystos[] =
++{
++       0,    11,    13,    22,    23,    25,    26,    41,    27,    28,
++      42,    43,     0,    24,     1,    19,    29,    30,    32,    37,
++      12,    15,    17,    29,    44,    45,    46,    49,    14,    23,
++      12,    29,     4,    33,    47,    48,    50,    51,    14,    44,
++      31,     6,    34,    35,    29,    16,    29,    18,    20,    38,
++      40,    36,    37,    34,    16,    18,     9,     6,     3,    39,
++      37,    38
++};
+ 
+-/* This is the parser code that is written into each bison parser
+-  when the %semantic_parser declaration is not specified in the grammar.
+-  It was written by Richard Stallman by simplifying the hairy parser
+-  used when %semantic_parser is specified.  */
+-
+-#ifndef YYSTACK_USE_ALLOCA
+-#ifdef alloca
+-#define YYSTACK_USE_ALLOCA
+-#else /* alloca not defined */
+-#ifdef __GNUC__
+-#define YYSTACK_USE_ALLOCA
+-#define alloca __builtin_alloca
+-#else /* not GNU C.  */
+-#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi) || (defined (__sun) && defined (__i386))
+-#define YYSTACK_USE_ALLOCA
+-#include <alloca.h>
+-#else /* not sparc */
+-/* We think this test detects Watcom and Microsoft C.  */
+-/* This used to test MSDOS, but that is a bad idea
+-   since that symbol is in the user namespace.  */
+-#if (defined (_MSDOS) || defined (_MSDOS_)) && !defined (__TURBOC__)
+-#if 0 /* No need for malloc.h, which pollutes the namespace;
+-	 instead, just don't use alloca.  */
+-#include <malloc.h>
++#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
++# define YYSIZE_T __SIZE_TYPE__
+ #endif
+-#else /* not MSDOS, or __TURBOC__ */
+-#if defined(_AIX)
+-/* I don't know what this was needed for, but it pollutes the namespace.
+-   So I turned it off.   rms, 2 May 1997.  */
+-/* #include <malloc.h>  */
+- #pragma alloca
+-#define YYSTACK_USE_ALLOCA
+-#else /* not MSDOS, or __TURBOC__, or _AIX */
+-#if 0
+-#ifdef __hpux /* haible@ilog.fr says this works for HPUX 9.05 and up,
+-		 and on HPUX 10.  Eventually we can turn this on.  */
+-#define YYSTACK_USE_ALLOCA
+-#define alloca __builtin_alloca
+-#endif /* __hpux */
+-#endif
+-#endif /* not _AIX */
+-#endif /* not MSDOS, or __TURBOC__ */
+-#endif /* not sparc */
+-#endif /* not GNU C */
+-#endif /* alloca not defined */
+-#endif /* YYSTACK_USE_ALLOCA not defined */
+-
+-#ifdef YYSTACK_USE_ALLOCA
+-#define YYSTACK_ALLOC alloca
+-#else
+-#define YYSTACK_ALLOC malloc
++#if ! defined (YYSIZE_T) && defined (size_t)
++# define YYSIZE_T size_t
++#endif
++#if ! defined (YYSIZE_T)
++# if defined (__STDC__) || defined (__cplusplus)
++#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
++#  define YYSIZE_T size_t
++# endif
++#endif
++#if ! defined (YYSIZE_T)
++# define YYSIZE_T unsigned int
+ #endif
+-
+-/* Note: there must be only one dollar sign in this file.
+-   It is replaced by the list of actions, each action
+-   as one case of the switch.  */
+ 
+ #define yyerrok		(yyerrstatus = 0)
+ #define yyclearin	(yychar = YYEMPTY)
+-#define YYEMPTY		-2
++#define YYEMPTY		(-2)
+ #define YYEOF		0
++
+ #define YYACCEPT	goto yyacceptlab
+-#define YYABORT 	goto yyabortlab
++#define YYABORT		goto yyabortlab
+ #define YYERROR		goto yyerrlab1
+-/* Like YYERROR except do call yyerror.
+-   This remains here temporarily to ease the
+-   transition to the new meaning of YYERROR, for GCC.
++
++/* Like YYERROR except do call yyerror.  This remains here temporarily
++   to ease the transition to the new meaning of YYERROR, for GCC.
+    Once GCC version 2 has supplanted version 1, this can go.  */
++
+ #define YYFAIL		goto yyerrlab
++
+ #define YYRECOVERING()  (!!yyerrstatus)
+-#define YYBACKUP(token, value) \
++
++#define YYBACKUP(Token, Value)					\
+ do								\
+   if (yychar == YYEMPTY && yylen == 1)				\
+-    { yychar = (token), yylval = (value);			\
+-      yychar1 = YYTRANSLATE (yychar);				\
++    {								\
++      yychar = (Token);						\
++      yylval = (Value);						\
++      yytoken = YYTRANSLATE (yychar);				\
+       YYPOPSTACK;						\
+       goto yybackup;						\
+     }								\
+   else								\
+-    { yyerror ("syntax error: cannot back up"); YYERROR; }	\
++    { 								\
++      yyerror ("syntax error: cannot back up");\
++      YYERROR;							\
++    }								\
+ while (0)
+ 
+ #define YYTERROR	1
+ #define YYERRCODE	256
+ 
+-#ifndef YYPURE
+-#define YYLEX		yylex()
+-#endif
++/* YYLLOC_DEFAULT -- Compute the default location (before the actions
++   are run).  */
+ 
+-#ifdef YYPURE
+-#ifdef YYLSP_NEEDED
+-#ifdef YYLEX_PARAM
+-#define YYLEX		yylex(&yylval, &yylloc, YYLEX_PARAM)
+-#else
+-#define YYLEX		yylex(&yylval, &yylloc)
++#ifndef YYLLOC_DEFAULT
++# define YYLLOC_DEFAULT(Current, Rhs, N)         \
++  Current.first_line   = Rhs[1].first_line;      \
++  Current.first_column = Rhs[1].first_column;    \
++  Current.last_line    = Rhs[N].last_line;       \
++  Current.last_column  = Rhs[N].last_column;
+ #endif
+-#else /* not YYLSP_NEEDED */
++
++/* YYLEX -- calling `yylex' with the right arguments.  */
++
+ #ifdef YYLEX_PARAM
+-#define YYLEX		yylex(&yylval, YYLEX_PARAM)
++# define YYLEX yylex (YYLEX_PARAM)
+ #else
+-#define YYLEX		yylex(&yylval)
+-#endif
+-#endif /* not YYLSP_NEEDED */
++# define YYLEX yylex ()
+ #endif
+ 
+-/* If nonreentrant, generate the variables here */
++/* Enable debugging if requested.  */
++#if YYDEBUG
+ 
+-#ifndef YYPURE
++# ifndef YYFPRINTF
++#  include <stdio.h> /* INFRINGES ON USER NAME SPACE */
++#  define YYFPRINTF fprintf
++# endif
++
++# define YYDPRINTF(Args)			\
++do {						\
++  if (yydebug)					\
++    YYFPRINTF Args;				\
++} while (0)
++
++# define YYDSYMPRINT(Args)			\
++do {						\
++  if (yydebug)					\
++    yysymprint Args;				\
++} while (0)
++
++# define YYDSYMPRINTF(Title, Token, Value, Location)		\
++do {								\
++  if (yydebug)							\
++    {								\
++      YYFPRINTF (stderr, "%s ", Title);				\
++      yysymprint (stderr, 					\
++                  Token, Value);	\
++      YYFPRINTF (stderr, "\n");					\
++    }								\
++} while (0)
+ 
+-int	yychar;			/*  the lookahead symbol		*/
+-YYSTYPE	yylval;			/*  the semantic value of the		*/
+-				/*  lookahead symbol			*/
++/*------------------------------------------------------------------.
++| yy_stack_print -- Print the state stack from its BOTTOM up to its |
++| TOP (cinluded).                                                   |
++`------------------------------------------------------------------*/
+ 
+-#ifdef YYLSP_NEEDED
+-YYLTYPE yylloc;			/*  location data for the lookahead	*/
+-				/*  symbol				*/
++#if defined (__STDC__) || defined (__cplusplus)
++static void
++yy_stack_print (short *bottom, short *top)
++#else
++static void
++yy_stack_print (bottom, top)
++    short *bottom;
++    short *top;
+ #endif
++{
++  YYFPRINTF (stderr, "Stack now");
++  for (/* Nothing. */; bottom <= top; ++bottom)
++    YYFPRINTF (stderr, " %d", *bottom);
++  YYFPRINTF (stderr, "\n");
++}
+ 
+-int yynerrs;			/*  number of parse errors so far       */
+-#endif  /* not YYPURE */
++# define YY_STACK_PRINT(Bottom, Top)				\
++do {								\
++  if (yydebug)							\
++    yy_stack_print ((Bottom), (Top));				\
++} while (0)
+ 
+-#if YYDEBUG != 0
+-int yydebug;			/*  nonzero means print parse trace	*/
+-/* Since this is uninitialized, it does not stop multiple parsers
+-   from coexisting.  */
++
++/*------------------------------------------------.
++| Report that the YYRULE is going to be reduced.  |
++`------------------------------------------------*/
++
++#if defined (__STDC__) || defined (__cplusplus)
++static void
++yy_reduce_print (int yyrule)
++#else
++static void
++yy_reduce_print (yyrule)
++    int yyrule;
+ #endif
++{
++  int yyi;
++  unsigned int yylineno = yyrline[yyrule];
++  YYFPRINTF (stderr, "Reducing stack by rule %d (line %u), ",
++             yyrule - 1, yylineno);
++  /* Print the symbols being reduced, and their result.  */
++  for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++)
++    YYFPRINTF (stderr, "%s ", yytname [yyrhs[yyi]]);
++  YYFPRINTF (stderr, "-> %s\n", yytname [yyr1[yyrule]]);
++}
++
++# define YY_REDUCE_PRINT(Rule)		\
++do {					\
++  if (yydebug)				\
++    yy_reduce_print (Rule);		\
++} while (0)
++
++/* Nonzero means print parse trace.  It is left uninitialized so that
++   multiple parsers can coexist.  */
++int yydebug;
++#else /* !YYDEBUG */
++# define YYDPRINTF(Args)
++# define YYDSYMPRINT(Args)
++# define YYDSYMPRINTF(Title, Token, Value, Location)
++# define YY_STACK_PRINT(Bottom, Top)
++# define YY_REDUCE_PRINT(Rule)
++#endif /* !YYDEBUG */
+ 
+-/*  YYINITDEPTH indicates the initial size of the parser's stacks	*/
+ 
++/* YYINITDEPTH -- initial size of the parser's stacks.  */
+ #ifndef	YYINITDEPTH
+-#define YYINITDEPTH 200
++# define YYINITDEPTH 200
+ #endif
+ 
+-/*  YYMAXDEPTH is the maximum size the stacks can grow to
+-    (effective only if the built-in stack extension method is used).  */
++/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
++   if the built-in stack extension method is used).
++
++   Do not make this value too large; the results are undefined if
++   SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH)
++   evaluated with infinite-precision integer arithmetic.  */
+ 
+ #if YYMAXDEPTH == 0
+-#undef YYMAXDEPTH
++# undef YYMAXDEPTH
+ #endif
+ 
+ #ifndef YYMAXDEPTH
+-#define YYMAXDEPTH 10000
++# define YYMAXDEPTH 10000
+ #endif
++
+ 
+-/* Define __yy_memcpy.  Note that the size argument
+-   should be passed with type unsigned int, because that is what the non-GCC
+-   definitions require.  With GCC, __builtin_memcpy takes an arg
+-   of type size_t, but it can handle unsigned int.  */
+-
+-#if __GNUC__ > 1		/* GNU C and GNU C++ define this.  */
+-#define __yy_memcpy(TO,FROM,COUNT)	__builtin_memcpy(TO,FROM,COUNT)
+-#else				/* not GNU C or C++ */
+-#ifndef __cplusplus
+ 
+-/* This is the most reliable way to avoid incompatibilities
+-   in available built-in functions on various systems.  */
+-static void
+-__yy_memcpy (to, from, count)
+-     char *to;
+-     char *from;
+-     unsigned int count;
+-{
+-  register char *f = from;
+-  register char *t = to;
+-  register int i = count;
++#if YYERROR_VERBOSE
++
++# ifndef yystrlen
++#  if defined (__GLIBC__) && defined (_STRING_H)
++#   define yystrlen strlen
++#  else
++/* Return the length of YYSTR.  */
++static YYSIZE_T
++#   if defined (__STDC__) || defined (__cplusplus)
++yystrlen (const char *yystr)
++#   else
++yystrlen (yystr)
++     const char *yystr;
++#   endif
++{
++  register const char *yys = yystr;
++
++  while (*yys++ != '\0')
++    continue;
++
++  return yys - yystr - 1;
++}
++#  endif
++# endif
++
++# ifndef yystpcpy
++#  if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE)
++#   define yystpcpy stpcpy
++#  else
++/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
++   YYDEST.  */
++static char *
++#   if defined (__STDC__) || defined (__cplusplus)
++yystpcpy (char *yydest, const char *yysrc)
++#   else
++yystpcpy (yydest, yysrc)
++     char *yydest;
++     const char *yysrc;
++#   endif
++{
++  register char *yyd = yydest;
++  register const char *yys = yysrc;
+ 
+-  while (i-- > 0)
+-    *t++ = *f++;
++  while ((*yyd++ = *yys++) != '\0')
++    continue;
++
++  return yyd - 1;
+ }
++#  endif
++# endif
++
++#endif /* !YYERROR_VERBOSE */
+ 
+-#else /* __cplusplus */
++
++
++#if YYDEBUG
++/*--------------------------------.
++| Print this symbol on YYOUTPUT.  |
++`--------------------------------*/
+ 
+-/* This is the most reliable way to avoid incompatibilities
+-   in available built-in functions on various systems.  */
++#if defined (__STDC__) || defined (__cplusplus)
+ static void
+-__yy_memcpy (char *to, char *from, unsigned int count)
++yysymprint (FILE *yyoutput, int yytype, YYSTYPE *yyvaluep)
++#else
++static void
++yysymprint (yyoutput, yytype, yyvaluep)
++    FILE *yyoutput;
++    int yytype;
++    YYSTYPE *yyvaluep;
++#endif
+ {
+-  register char *t = to;
+-  register char *f = from;
+-  register int i = count;
++  /* Pacify ``unused variable'' warnings.  */
++  (void) yyvaluep;
+ 
+-  while (i-- > 0)
+-    *t++ = *f++;
++  if (yytype < YYNTOKENS)
++    {
++      YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
++# ifdef YYPRINT
++      YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
++# endif
++    }
++  else
++    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
++
++  switch (yytype)
++    {
++      default:
++        break;
++    }
++  YYFPRINTF (yyoutput, ")");
+ }
+ 
++#endif /* ! YYDEBUG */
++/*-----------------------------------------------.
++| Release the memory associated to this symbol.  |
++`-----------------------------------------------*/
++
++#if defined (__STDC__) || defined (__cplusplus)
++static void
++yydestruct (int yytype, YYSTYPE *yyvaluep)
++#else
++static void
++yydestruct (yytype, yyvaluep)
++    int yytype;
++    YYSTYPE *yyvaluep;
+ #endif
+-#endif
++{
++  /* Pacify ``unused variable'' warnings.  */
++  (void) yyvaluep;
++
++  switch (yytype)
++    {
++
++      default:
++        break;
++    }
++}
+ 
+-#line 217 "/usr/share/bison.simple"
+ 
+-/* The user can define YYPARSE_PARAM as the name of an argument to be passed
+-   into yyparse.  The argument should have type void *.
+-   It should actually point to an object.
+-   Grammar actions can access the variable by casting it
+-   to the proper pointer type.  */
++/* Prevent warnings from -Wmissing-prototypes.  */
+ 
+ #ifdef YYPARSE_PARAM
+-#ifdef __cplusplus
+-#define YYPARSE_PARAM_ARG void *YYPARSE_PARAM
+-#define YYPARSE_PARAM_DECL
+-#else /* not __cplusplus */
+-#define YYPARSE_PARAM_ARG YYPARSE_PARAM
+-#define YYPARSE_PARAM_DECL void *YYPARSE_PARAM;
+-#endif /* not __cplusplus */
+-#else /* not YYPARSE_PARAM */
+-#define YYPARSE_PARAM_ARG
+-#define YYPARSE_PARAM_DECL
+-#endif /* not YYPARSE_PARAM */
++# if defined (__STDC__) || defined (__cplusplus)
++int yyparse (void *YYPARSE_PARAM);
++# else
++int yyparse ();
++# endif
++#else /* ! YYPARSE_PARAM */
++#if defined (__STDC__) || defined (__cplusplus)
++int yyparse (void);
++#else
++int yyparse ();
++#endif
++#endif /* ! YYPARSE_PARAM */
++
++
++
++/* The lookahead symbol.  */
++int yychar;
++
++/* The semantic value of the lookahead symbol.  */
++YYSTYPE yylval;
++
++/* Number of syntax errors so far.  */
++int yynerrs;
++
++
++
++/*----------.
++| yyparse.  |
++`----------*/
+ 
+-/* Prevent warning if -Wstrict-prototypes.  */
+-#if defined (__GNUC__) && ! defined (__cplusplus)
+ #ifdef YYPARSE_PARAM
+-int yyparse (void *);
++# if defined (__STDC__) || defined (__cplusplus)
++int yyparse (void *YYPARSE_PARAM)
++# else
++int yyparse (YYPARSE_PARAM)
++  void *YYPARSE_PARAM;
++# endif
++#else /* ! YYPARSE_PARAM */
++#if defined (__STDC__) || defined (__cplusplus)
++int
++yyparse (void)
+ #else
+-int yyparse (void);
++int
++yyparse ()
++
+ #endif
+ #endif
+-
+-int
+-yyparse(YYPARSE_PARAM_ARG)
+-     YYPARSE_PARAM_DECL
+ {
++  
+   register int yystate;
+   register int yyn;
++  int yyresult;
++  /* Number of tokens to shift before error messages enabled.  */
++  int yyerrstatus;
++  /* Lookahead token as an internal (translated) token number.  */
++  int yytoken = 0;
++
++  /* Three stacks and their tools:
++     `yyss': related to states,
++     `yyvs': related to semantic values,
++     `yyls': related to locations.
++
++     Refer to the stacks thru separate pointers, to allow yyoverflow
++     to reallocate them elsewhere.  */
++
++  /* The state stack.  */
++  short	yyssa[YYINITDEPTH];
++  short *yyss = yyssa;
+   register short *yyssp;
+-  register YYSTYPE *yyvsp;
+-  int yyerrstatus;	/*  number of tokens to shift before error messages enabled */
+-  int yychar1 = 0;		/*  lookahead token as an internal (translated) token number */
+ 
+-  short	yyssa[YYINITDEPTH];	/*  the state stack			*/
+-  YYSTYPE yyvsa[YYINITDEPTH];	/*  the semantic value stack		*/
++  /* The semantic value stack.  */
++  YYSTYPE yyvsa[YYINITDEPTH];
++  YYSTYPE *yyvs = yyvsa;
++  register YYSTYPE *yyvsp;
+ 
+-  short *yyss = yyssa;		/*  refer to the stacks thru separate pointers */
+-  YYSTYPE *yyvs = yyvsa;	/*  to allow yyoverflow to reallocate them elsewhere */
+ 
+-#ifdef YYLSP_NEEDED
+-  YYLTYPE yylsa[YYINITDEPTH];	/*  the location stack			*/
+-  YYLTYPE *yyls = yylsa;
+-  YYLTYPE *yylsp;
+ 
+-#define YYPOPSTACK   (yyvsp--, yyssp--, yylsp--)
+-#else
+ #define YYPOPSTACK   (yyvsp--, yyssp--)
+-#endif
+ 
+-  int yystacksize = YYINITDEPTH;
+-  int yyfree_stacks = 0;
++  YYSIZE_T yystacksize = YYINITDEPTH;
+ 
+-#ifdef YYPURE
+-  int yychar;
+-  YYSTYPE yylval;
+-  int yynerrs;
+-#ifdef YYLSP_NEEDED
+-  YYLTYPE yylloc;
+-#endif
+-#endif
++  /* The variables used to return semantic value and location from the
++     action routines.  */
++  YYSTYPE yyval;
+ 
+-  YYSTYPE yyval;		/*  the variable used to return		*/
+-				/*  semantic values from the action	*/
+-				/*  routines				*/
+ 
++  /* When reducing, the number of symbols on the RHS of the reduced
++     rule.  */
+   int yylen;
+ 
+-#if YYDEBUG != 0
+-  if (yydebug)
+-    fprintf(stderr, "Starting parse\n");
+-#endif
++  YYDPRINTF ((stderr, "Starting parse\n"));
+ 
+   yystate = 0;
+   yyerrstatus = 0;
+@@ -674,110 +1048,96 @@
+      so that they stay on the same level as the state stack.
+      The wasted elements are never initialized.  */
+ 
+-  yyssp = yyss - 1;
++  yyssp = yyss;
+   yyvsp = yyvs;
+-#ifdef YYLSP_NEEDED
+-  yylsp = yyls;
+-#endif
+ 
+-/* Push a new state, which is found in  yystate  .  */
+-/* In all cases, when you get here, the value and location stacks
+-   have just been pushed. so pushing a state here evens the stacks.  */
+-yynewstate:
++  goto yysetstate;
++
++/*------------------------------------------------------------.
++| yynewstate -- Push a new state, which is found in yystate.  |
++`------------------------------------------------------------*/
++ yynewstate:
++  /* In all cases, when you get here, the value and location stacks
++     have just been pushed. so pushing a state here evens the stacks.
++     */
++  yyssp++;
+ 
+-  *++yyssp = yystate;
++ yysetstate:
++  *yyssp = yystate;
+ 
+-  if (yyssp >= yyss + yystacksize - 1)
++  if (yyss + yystacksize - 1 <= yyssp)
+     {
+-      /* Give user a chance to reallocate the stack */
+-      /* Use copies of these so that the &'s don't force the real ones into memory. */
+-      YYSTYPE *yyvs1 = yyvs;
+-      short *yyss1 = yyss;
+-#ifdef YYLSP_NEEDED
+-      YYLTYPE *yyls1 = yyls;
+-#endif
+-
+       /* Get the current used size of the three stacks, in elements.  */
+-      int size = yyssp - yyss + 1;
++      YYSIZE_T yysize = yyssp - yyss + 1;
+ 
+ #ifdef yyoverflow
+-      /* Each stack pointer address is followed by the size of
+-	 the data in use in that stack, in bytes.  */
+-#ifdef YYLSP_NEEDED
+-      /* This used to be a conditional around just the two extra args,
+-	 but that might be undefined if yyoverflow is a macro.  */
+-      yyoverflow("parser stack overflow",
+-		 &yyss1, size * sizeof (*yyssp),
+-		 &yyvs1, size * sizeof (*yyvsp),
+-		 &yyls1, size * sizeof (*yylsp),
+-		 &yystacksize);
+-#else
+-      yyoverflow("parser stack overflow",
+-		 &yyss1, size * sizeof (*yyssp),
+-		 &yyvs1, size * sizeof (*yyvsp),
+-		 &yystacksize);
+-#endif
++      {
++	/* Give user a chance to reallocate the stack. Use copies of
++	   these so that the &'s don't force the real ones into
++	   memory.  */
++	YYSTYPE *yyvs1 = yyvs;
++	short *yyss1 = yyss;
++
++
++	/* Each stack pointer address is followed by the size of the
++	   data in use in that stack, in bytes.  This used to be a
++	   conditional around just the two extra args, but that might
++	   be undefined if yyoverflow is a macro.  */
++	yyoverflow ("parser stack overflow",
++		    &yyss1, yysize * sizeof (*yyssp),
++		    &yyvs1, yysize * sizeof (*yyvsp),
+ 
+-      yyss = yyss1; yyvs = yyvs1;
+-#ifdef YYLSP_NEEDED
+-      yyls = yyls1;
+-#endif
++		    &yystacksize);
++
++	yyss = yyss1;
++	yyvs = yyvs1;
++      }
+ #else /* no yyoverflow */
++# ifndef YYSTACK_RELOCATE
++      goto yyoverflowlab;
++# else
+       /* Extend the stack our own way.  */
+-      if (yystacksize >= YYMAXDEPTH)
+-	{
+-	  yyerror("parser stack overflow");
+-	  if (yyfree_stacks)
+-	    {
+-	      free (yyss);
+-	      free (yyvs);
+-#ifdef YYLSP_NEEDED
+-	      free (yyls);
+-#endif
+-	    }
+-	  return 2;
+-	}
++      if (YYMAXDEPTH <= yystacksize)
++	goto yyoverflowlab;
+       yystacksize *= 2;
+-      if (yystacksize > YYMAXDEPTH)
++      if (YYMAXDEPTH < yystacksize)
+ 	yystacksize = YYMAXDEPTH;
+-#ifndef YYSTACK_USE_ALLOCA
+-      yyfree_stacks = 1;
+-#endif
+-      yyss = (short *) YYSTACK_ALLOC (yystacksize * sizeof (*yyssp));
+-      __yy_memcpy ((char *)yyss, (char *)yyss1,
+-		   size * (unsigned int) sizeof (*yyssp));
+-      yyvs = (YYSTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yyvsp));
+-      __yy_memcpy ((char *)yyvs, (char *)yyvs1,
+-		   size * (unsigned int) sizeof (*yyvsp));
+-#ifdef YYLSP_NEEDED
+-      yyls = (YYLTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yylsp));
+-      __yy_memcpy ((char *)yyls, (char *)yyls1,
+-		   size * (unsigned int) sizeof (*yylsp));
+-#endif
++
++      {
++	short *yyss1 = yyss;
++	union yyalloc *yyptr =
++	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
++	if (! yyptr)
++	  goto yyoverflowlab;
++	YYSTACK_RELOCATE (yyss);
++	YYSTACK_RELOCATE (yyvs);
++
++#  undef YYSTACK_RELOCATE
++	if (yyss1 != yyssa)
++	  YYSTACK_FREE (yyss1);
++      }
++# endif
+ #endif /* no yyoverflow */
+ 
+-      yyssp = yyss + size - 1;
+-      yyvsp = yyvs + size - 1;
+-#ifdef YYLSP_NEEDED
+-      yylsp = yyls + size - 1;
+-#endif
++      yyssp = yyss + yysize - 1;
++      yyvsp = yyvs + yysize - 1;
+ 
+-#if YYDEBUG != 0
+-      if (yydebug)
+-	fprintf(stderr, "Stack size increased to %d\n", yystacksize);
+-#endif
+ 
+-      if (yyssp >= yyss + yystacksize - 1)
++      YYDPRINTF ((stderr, "Stack size increased to %lu\n",
++		  (unsigned long int) yystacksize));
++
++      if (yyss + yystacksize - 1 <= yyssp)
+ 	YYABORT;
+     }
+ 
+-#if YYDEBUG != 0
+-  if (yydebug)
+-    fprintf(stderr, "Entering state %d\n", yystate);
+-#endif
++  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
+ 
+   goto yybackup;
+- yybackup:
++
++/*-----------.
++| yybackup.  |
++`-----------*/
++yybackup:
+ 
+ /* Do appropriate processing given the current state.  */
+ /* Read a lookahead token if we need one and don't already have one.  */
+@@ -786,514 +1146,497 @@
+   /* First try to decide what to do without reference to lookahead token.  */
+ 
+   yyn = yypact[yystate];
+-  if (yyn == YYFLAG)
++  if (yyn == YYPACT_NINF)
+     goto yydefault;
+ 
+   /* Not known => get a lookahead token if don't already have one.  */
+ 
+-  /* yychar is either YYEMPTY or YYEOF
+-     or a valid token in external form.  */
+-
++  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
+   if (yychar == YYEMPTY)
+     {
+-#if YYDEBUG != 0
+-      if (yydebug)
+-	fprintf(stderr, "Reading a token: ");
+-#endif
++      YYDPRINTF ((stderr, "Reading a token: "));
+       yychar = YYLEX;
+     }
+ 
+-  /* Convert token to internal form (in yychar1) for indexing tables with */
+-
+-  if (yychar <= 0)		/* This means end of input. */
++  if (yychar <= YYEOF)
+     {
+-      yychar1 = 0;
+-      yychar = YYEOF;		/* Don't call YYLEX any more */
+-
+-#if YYDEBUG != 0
+-      if (yydebug)
+-	fprintf(stderr, "Now at end of input.\n");
+-#endif
++      yychar = yytoken = YYEOF;
++      YYDPRINTF ((stderr, "Now at end of input.\n"));
+     }
+   else
+     {
+-      yychar1 = YYTRANSLATE(yychar);
+-
+-#if YYDEBUG != 0
+-      if (yydebug)
+-	{
+-	  fprintf (stderr, "Next token is %d (%s", yychar, yytname[yychar1]);
+-	  /* Give the individual parser a way to print the precise meaning
+-	     of a token, for further debugging info.  */
+-#ifdef YYPRINT
+-	  YYPRINT (stderr, yychar, yylval);
+-#endif
+-	  fprintf (stderr, ")\n");
+-	}
+-#endif
++      yytoken = YYTRANSLATE (yychar);
++      YYDSYMPRINTF ("Next token is", yytoken, &yylval, &yylloc);
+     }
+ 
+-  yyn += yychar1;
+-  if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != yychar1)
++  /* If the proper action on seeing token YYTOKEN is to reduce or to
++     detect an error, take that action.  */
++  yyn += yytoken;
++  if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
+     goto yydefault;
+-
+   yyn = yytable[yyn];
+-
+-  /* yyn is what to do for this token type in this state.
+-     Negative => reduce, -yyn is rule number.
+-     Positive => shift, yyn is new state.
+-       New state is final state => don't bother to shift,
+-       just return success.
+-     0, or most negative number => error.  */
+-
+-  if (yyn < 0)
++  if (yyn <= 0)
+     {
+-      if (yyn == YYFLAG)
++      if (yyn == 0 || yyn == YYTABLE_NINF)
+ 	goto yyerrlab;
+       yyn = -yyn;
+       goto yyreduce;
+     }
+-  else if (yyn == 0)
+-    goto yyerrlab;
+ 
+   if (yyn == YYFINAL)
+     YYACCEPT;
+ 
+   /* Shift the lookahead token.  */
+-
+-#if YYDEBUG != 0
+-  if (yydebug)
+-    fprintf(stderr, "Shifting token %d (%s), ", yychar, yytname[yychar1]);
+-#endif
++  YYDPRINTF ((stderr, "Shifting token %s, ", yytname[yytoken]));
+ 
+   /* Discard the token being shifted unless it is eof.  */
+   if (yychar != YYEOF)
+     yychar = YYEMPTY;
+ 
+   *++yyvsp = yylval;
+-#ifdef YYLSP_NEEDED
+-  *++yylsp = yylloc;
+-#endif
+ 
+-  /* count tokens shifted since error; after three, turn off error status.  */
+-  if (yyerrstatus) yyerrstatus--;
++
++  /* Count tokens shifted since error; after three, turn off error
++     status.  */
++  if (yyerrstatus)
++    yyerrstatus--;
+ 
+   yystate = yyn;
+   goto yynewstate;
+ 
+-/* Do the default action for the current state.  */
+-yydefault:
+ 
++/*-----------------------------------------------------------.
++| yydefault -- do the default action for the current state.  |
++`-----------------------------------------------------------*/
++yydefault:
+   yyn = yydefact[yystate];
+   if (yyn == 0)
+     goto yyerrlab;
++  goto yyreduce;
++
+ 
+-/* Do a reduction.  yyn is the number of a rule to reduce with.  */
++/*-----------------------------.
++| yyreduce -- Do a reduction.  |
++`-----------------------------*/
+ yyreduce:
++  /* yyn is the number of a rule to reduce with.  */
+   yylen = yyr2[yyn];
+-  if (yylen > 0)
+-    yyval = yyvsp[1-yylen]; /* implement default value of the action */
+-
+-#if YYDEBUG != 0
+-  if (yydebug)
+-    {
+-      int i;
+-
+-      fprintf (stderr, "Reducing via rule %d (line %d), ",
+-	       yyn, yyrline[yyn]);
+-
+-      /* Print the symbols being reduced, and their result.  */
+-      for (i = yyprhs[yyn]; yyrhs[i] > 0; i++)
+-	fprintf (stderr, "%s ", yytname[yyrhs[i]]);
+-      fprintf (stderr, " -> %s\n", yytname[yyr1[yyn]]);
+-    }
+-#endif
+ 
++  /* If YYLEN is nonzero, implement the default value of the action:
++     `$$ = $1'.
+ 
+-  switch (yyn) {
++     Otherwise, the following line sets YYVAL to garbage.
++     This behavior is undocumented and Bison
++     users should not rely upon it.  Assigning to YYVAL
++     unconditionally makes the parser a bit smaller, and it avoids a
++     GCC warning that YYVAL may be used uninitialized.  */
++  yyval = yyvsp[1-yylen];
++
++
++  YY_REDUCE_PRINT (yyn);
++  switch (yyn)
++    {
++        case 3:
++#line 217 "vcc.y"
++    { addList(&vObjList, yyvsp[0].vobj); curObj = 0; ;}
++    break;
++
++  case 5:
++#line 220 "vcc.y"
++    { addList(&vObjList, yyvsp[0].vobj); curObj = 0; ;}
++    break;
+ 
+-case 2:
+-#line 213 "./vcc.y"
+-{ addList(&vObjList, yyvsp[0].vobj); curObj = 0; ;
+-    break;}
+-case 4:
+-#line 216 "./vcc.y"
+-{ addList(&vObjList, yyvsp[0].vobj); curObj = 0; ;
+-    break;}
+-case 7:
+-#line 225 "./vcc.y"
+-{
++  case 8:
++#line 229 "vcc.y"
++    {
+ 	lexPushMode(L_VCARD);
+ 	if (!pushVObject(VCCardProp)) YYERROR;
+-	;
+-    break;}
+-case 8:
+-#line 230 "./vcc.y"
+-{
++	;}
++    break;
++
++  case 9:
++#line 234 "vcc.y"
++    {
+ 	lexPopMode(0);
+ 	yyval.vobj = popVObject();
+-	;
+-    break;}
+-case 9:
+-#line 235 "./vcc.y"
+-{
++	;}
++    break;
++
++  case 10:
++#line 239 "vcc.y"
++    {
+ 	lexPushMode(L_VCARD);
+ 	if (!pushVObject(VCCardProp)) YYERROR;
+-	;
+-    break;}
+-case 10:
+-#line 240 "./vcc.y"
+-{
++	;}
++    break;
++
++  case 11:
++#line 244 "vcc.y"
++    {
+ 	lexPopMode(0);
+ 	yyval.vobj = popVObject();
+-	;
+-    break;}
+-case 13:
+-#line 251 "./vcc.y"
+-{
++	;}
++    break;
++
++  case 14:
++#line 255 "vcc.y"
++    {
+ 	lexPushMode(L_VALUES);
+-	;
+-    break;}
+-case 14:
+-#line 255 "./vcc.y"
+-{
++	;}
++    break;
++
++  case 15:
++#line 259 "vcc.y"
++    {
+ 	if (lexWithinMode(L_BASE64) || lexWithinMode(L_QUOTED_PRINTABLE))
+ 	   lexPopMode(0);
+ 	lexPopMode(0);
+-	;
+-    break;}
+-case 16:
+-#line 264 "./vcc.y"
+-{
++	;}
++    break;
++
++  case 17:
++#line 268 "vcc.y"
++    {
+ 	enterProps(yyvsp[0].str);
+-	;
+-    break;}
+-case 18:
+-#line 269 "./vcc.y"
+-{
++	;}
++    break;
++
++  case 19:
++#line 273 "vcc.y"
++    {
+ 	enterProps(yyvsp[0].str);
+-	;
+-    break;}
+-case 22:
+-#line 282 "./vcc.y"
+-{
++	;}
++    break;
++
++  case 23:
++#line 286 "vcc.y"
++    {
+ 	enterAttr(yyvsp[0].str,0);
+-	;
+-    break;}
+-case 23:
+-#line 286 "./vcc.y"
+-{
++	;}
++    break;
++
++  case 24:
++#line 290 "vcc.y"
++    {
+ 	enterAttr(yyvsp[-2].str,yyvsp[0].str);
+ 
+-	;
+-    break;}
+-case 25:
+-#line 295 "./vcc.y"
+-{ appendValue(yyvsp[-1].str); ;
+-    break;}
+-case 27:
+-#line 297 "./vcc.y"
+-{ appendValue(yyvsp[0].str); ;
+-    break;}
+-case 29:
+-#line 302 "./vcc.y"
+-{ yyval.str = 0; ;
+-    break;}
+-case 30:
+-#line 307 "./vcc.y"
+-{ if (!pushVObject(VCCalProp)) YYERROR; ;
+-    break;}
+-case 31:
+-#line 310 "./vcc.y"
+-{ yyval.vobj = popVObject(); ;
+-    break;}
+-case 32:
+-#line 312 "./vcc.y"
+-{ if (!pushVObject(VCCalProp)) YYERROR; ;
+-    break;}
+-case 33:
+-#line 314 "./vcc.y"
+-{ yyval.vobj = popVObject(); ;
+-    break;}
+-case 39:
+-#line 329 "./vcc.y"
+-{
++	;}
++    break;
++
++  case 26:
++#line 299 "vcc.y"
++    { appendValue(yyvsp[-1].str); ;}
++    break;
++
++  case 28:
++#line 301 "vcc.y"
++    { appendValue(yyvsp[0].str); ;}
++    break;
++
++  case 30:
++#line 306 "vcc.y"
++    { yyval.str = 0; ;}
++    break;
++
++  case 31:
++#line 311 "vcc.y"
++    { if (!pushVObject(VCCalProp)) YYERROR; ;}
++    break;
++
++  case 32:
++#line 314 "vcc.y"
++    { yyval.vobj = popVObject(); ;}
++    break;
++
++  case 33:
++#line 316 "vcc.y"
++    { if (!pushVObject(VCCalProp)) YYERROR; ;}
++    break;
++
++  case 34:
++#line 318 "vcc.y"
++    { yyval.vobj = popVObject(); ;}
++    break;
++
++  case 40:
++#line 333 "vcc.y"
++    {
+ 	lexPushMode(L_VEVENT);
+ 	if (!pushVObject(VCEventProp)) YYERROR;
+-	;
+-    break;}
+-case 40:
+-#line 335 "./vcc.y"
+-{
++	;}
++    break;
++
++  case 41:
++#line 339 "vcc.y"
++    {
+ 	lexPopMode(0);
+ 	popVObject();
+-	;
+-    break;}
+-case 41:
+-#line 340 "./vcc.y"
+-{
++	;}
++    break;
++
++  case 42:
++#line 344 "vcc.y"
++    {
+ 	lexPushMode(L_VEVENT);
+ 	if (!pushVObject(VCEventProp)) YYERROR;
+-	;
+-    break;}
+-case 42:
+-#line 345 "./vcc.y"
+-{
++	;}
++    break;
++
++  case 43:
++#line 349 "vcc.y"
++    {
+ 	lexPopMode(0);
+ 	popVObject();
+-	;
+-    break;}
+-case 43:
+-#line 353 "./vcc.y"
+-{
++	;}
++    break;
++
++  case 44:
++#line 357 "vcc.y"
++    {
+ 	lexPushMode(L_VTODO);
+ 	if (!pushVObject(VCTodoProp)) YYERROR;
+-	;
+-    break;}
+-case 44:
+-#line 359 "./vcc.y"
+-{
++	;}
++    break;
++
++  case 45:
++#line 363 "vcc.y"
++    {
+ 	lexPopMode(0);
+ 	popVObject();
+-	;
+-    break;}
+-case 45:
+-#line 364 "./vcc.y"
+-{
++	;}
++    break;
++
++  case 46:
++#line 368 "vcc.y"
++    {
+ 	lexPushMode(L_VTODO);
+ 	if (!pushVObject(VCTodoProp)) YYERROR;
+-	;
+-    break;}
+-case 46:
+-#line 369 "./vcc.y"
+-{
++	;}
++    break;
++
++  case 47:
++#line 373 "vcc.y"
++    {
+ 	lexPopMode(0);
+ 	popVObject();
+-	;
+-    break;}
+-}
+-   /* the action file gets copied in in place of this dollarsign */
+-#line 543 "/usr/share/bison.simple"
++	;}
++    break;
++
++
++    }
++
++/* Line 991 of yacc.c.  */
++#line 1429 "vcc.tab.c"
+ 
+   yyvsp -= yylen;
+   yyssp -= yylen;
+-#ifdef YYLSP_NEEDED
+-  yylsp -= yylen;
+-#endif
+ 
+-#if YYDEBUG != 0
+-  if (yydebug)
+-    {
+-      short *ssp1 = yyss - 1;
+-      fprintf (stderr, "state stack now");
+-      while (ssp1 != yyssp)
+-	fprintf (stderr, " %d", *++ssp1);
+-      fprintf (stderr, "\n");
+-    }
+-#endif
++
++  YY_STACK_PRINT (yyss, yyssp);
+ 
+   *++yyvsp = yyval;
+ 
+-#ifdef YYLSP_NEEDED
+-  yylsp++;
+-  if (yylen == 0)
+-    {
+-      yylsp->first_line = yylloc.first_line;
+-      yylsp->first_column = yylloc.first_column;
+-      yylsp->last_line = (yylsp-1)->last_line;
+-      yylsp->last_column = (yylsp-1)->last_column;
+-      yylsp->text = 0;
+-    }
+-  else
+-    {
+-      yylsp->last_line = (yylsp+yylen-1)->last_line;
+-      yylsp->last_column = (yylsp+yylen-1)->last_column;
+-    }
+-#endif
+ 
+-  /* Now "shift" the result of the reduction.
+-     Determine what state that goes to,
+-     based on the state we popped back to
+-     and the rule number reduced by.  */
++  /* Now `shift' the result of the reduction.  Determine what state
++     that goes to, based on the state we popped back to and the rule
++     number reduced by.  */
+ 
+   yyn = yyr1[yyn];
+ 
+-  yystate = yypgoto[yyn - YYNTBASE] + *yyssp;
+-  if (yystate >= 0 && yystate <= YYLAST && yycheck[yystate] == *yyssp)
++  yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
++  if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
+     yystate = yytable[yystate];
+   else
+-    yystate = yydefgoto[yyn - YYNTBASE];
++    yystate = yydefgoto[yyn - YYNTOKENS];
+ 
+   goto yynewstate;
+ 
+-yyerrlab:   /* here on detecting error */
+ 
+-  if (! yyerrstatus)
+-    /* If not already recovering from an error, report this error.  */
++/*------------------------------------.
++| yyerrlab -- here on detecting error |
++`------------------------------------*/
++yyerrlab:
++  /* If not already recovering from an error, report this error.  */
++  if (!yyerrstatus)
+     {
+       ++yynerrs;
+-
+-#ifdef YYERROR_VERBOSE
++#if YYERROR_VERBOSE
+       yyn = yypact[yystate];
+ 
+-      if (yyn > YYFLAG && yyn < YYLAST)
++      if (YYPACT_NINF < yyn && yyn < YYLAST)
+ 	{
+-	  int size = 0;
+-	  char *msg;
+-	  int x, count;
+-
+-	  count = 0;
+-	  /* Start X at -yyn if nec to avoid negative indexes in yycheck.  */
+-	  for (x = (yyn < 0 ? -yyn : 0);
+-	       x < (sizeof(yytname) / sizeof(char *)); x++)
+-	    if (yycheck[x + yyn] == x)
+-	      size += strlen(yytname[x]) + 15, count++;
+-	  msg = (char *) malloc(size + 15);
+-	  if (msg != 0)
++	  YYSIZE_T yysize = 0;
++	  int yytype = YYTRANSLATE (yychar);
++	  char *yymsg;
++	  int yyx, yycount;
++
++	  yycount = 0;
++	  /* Start YYX at -YYN if negative to avoid negative indexes in
++	     YYCHECK.  */
++	  for (yyx = yyn < 0 ? -yyn : 0;
++	       yyx < (int) (sizeof (yytname) / sizeof (char *)); yyx++)
++	    if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
++	      yysize += yystrlen (yytname[yyx]) + 15, yycount++;
++	  yysize += yystrlen ("syntax error, unexpected ") + 1;
++	  yysize += yystrlen (yytname[yytype]);
++	  yymsg = (char *) YYSTACK_ALLOC (yysize);
++	  if (yymsg != 0)
+ 	    {
+-	      strcpy(msg, "parse error");
++	      char *yyp = yystpcpy (yymsg, "syntax error, unexpected ");
++	      yyp = yystpcpy (yyp, yytname[yytype]);
+ 
+-	      if (count < 5)
++	      if (yycount < 5)
+ 		{
+-		  count = 0;
+-		  for (x = (yyn < 0 ? -yyn : 0);
+-		       x < (sizeof(yytname) / sizeof(char *)); x++)
+-		    if (yycheck[x + yyn] == x)
++		  yycount = 0;
++		  for (yyx = yyn < 0 ? -yyn : 0;
++		       yyx < (int) (sizeof (yytname) / sizeof (char *));
++		       yyx++)
++		    if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
+ 		      {
+-			strcat(msg, count == 0 ? ", expecting `" : " or `");
+-			strcat(msg, yytname[x]);
+-			strcat(msg, "'");
+-			count++;
++			const char *yyq = ! yycount ? ", expecting " : " or ";
++			yyp = yystpcpy (yyp, yyq);
++			yyp = yystpcpy (yyp, yytname[yyx]);
++			yycount++;
+ 		      }
+ 		}
+-	      yyerror(msg);
+-	      free(msg);
++	      yyerror (yymsg);
++	      YYSTACK_FREE (yymsg);
+ 	    }
+ 	  else
+-	    yyerror ("parse error; also virtual memory exceeded");
++	    yyerror ("syntax error; also virtual memory exhausted");
+ 	}
+       else
+ #endif /* YYERROR_VERBOSE */
+-	yyerror("parse error");
++	yyerror ("syntax error");
+     }
+ 
+-  goto yyerrlab1;
+-yyerrlab1:   /* here on error raised explicitly by an action */
++
+ 
+   if (yyerrstatus == 3)
+     {
+-      /* if just tried and failed to reuse lookahead token after an error, discard it.  */
++      /* If just tried and failed to reuse lookahead token after an
++	 error, discard it.  */
+ 
+-      /* return failure if at end of input */
++      /* Return failure if at end of input.  */
+       if (yychar == YYEOF)
+-	YYABORT;
+-
+-#if YYDEBUG != 0
+-      if (yydebug)
+-	fprintf(stderr, "Discarding token %d (%s).\n", yychar, yytname[yychar1]);
+-#endif
++        {
++	  /* Pop the error token.  */
++          YYPOPSTACK;
++	  /* Pop the rest of the stack.  */
++	  while (yyss < yyssp)
++	    {
++	      YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
++	      yydestruct (yystos[*yyssp], yyvsp);
++	      YYPOPSTACK;
++	    }
++	  YYABORT;
++        }
+ 
++      YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc);
++      yydestruct (yytoken, &yylval);
+       yychar = YYEMPTY;
+-    }
+ 
+-  /* Else will try to reuse lookahead token
+-     after shifting the error token.  */
++    }
+ 
+-  yyerrstatus = 3;		/* Each real token shifted decrements this */
++  /* Else will try to reuse lookahead token after shifting the error
++     token.  */
++  goto yyerrlab2;
+ 
+-  goto yyerrhandle;
+ 
+-yyerrdefault:  /* current state does not do anything special for the error token. */
++/*----------------------------------------------------.
++| yyerrlab1 -- error raised explicitly by an action.  |
++`----------------------------------------------------*/
++yyerrlab1:
+ 
+-#if 0
+-  /* This is wrong; only states that explicitly want error tokens
+-     should shift them.  */
+-  yyn = yydefact[yystate];  /* If its default is to accept any token, ok.  Otherwise pop it.*/
+-  if (yyn) goto yydefault;
++  /* Suppress GCC warning that yyerrlab1 is unused when no action
++     invokes YYERROR.  */
++#if defined (__GNUC_MINOR__) && 2093 <= (__GNUC__ * 1000 + __GNUC_MINOR__) \
++    && !defined __cplusplus
++  __attribute__ ((__unused__))
+ #endif
+ 
+-yyerrpop:   /* pop the current state because it cannot handle the error token */
+ 
+-  if (yyssp == yyss) YYABORT;
+-  yyvsp--;
+-  yystate = *--yyssp;
+-#ifdef YYLSP_NEEDED
+-  yylsp--;
+-#endif
++  goto yyerrlab2;
+ 
+-#if YYDEBUG != 0
+-  if (yydebug)
+-    {
+-      short *ssp1 = yyss - 1;
+-      fprintf (stderr, "Error: state stack now");
+-      while (ssp1 != yyssp)
+-	fprintf (stderr, " %d", *++ssp1);
+-      fprintf (stderr, "\n");
+-    }
+-#endif
+ 
+-yyerrhandle:
++/*---------------------------------------------------------------.
++| yyerrlab2 -- pop states until the error token can be shifted.  |
++`---------------------------------------------------------------*/
++yyerrlab2:
++  yyerrstatus = 3;	/* Each real token shifted decrements this.  */
+ 
+-  yyn = yypact[yystate];
+-  if (yyn == YYFLAG)
+-    goto yyerrdefault;
++  for (;;)
++    {
++      yyn = yypact[yystate];
++      if (yyn != YYPACT_NINF)
++	{
++	  yyn += YYTERROR;
++	  if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
++	    {
++	      yyn = yytable[yyn];
++	      if (0 < yyn)
++		break;
++	    }
++	}
+ 
+-  yyn += YYTERROR;
+-  if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != YYTERROR)
+-    goto yyerrdefault;
++      /* Pop the current state because it cannot handle the error token.  */
++      if (yyssp == yyss)
++	YYABORT;
+ 
+-  yyn = yytable[yyn];
+-  if (yyn < 0)
+-    {
+-      if (yyn == YYFLAG)
+-	goto yyerrpop;
+-      yyn = -yyn;
+-      goto yyreduce;
++      YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
++      yydestruct (yystos[yystate], yyvsp);
++      yyvsp--;
++      yystate = *--yyssp;
++
++      YY_STACK_PRINT (yyss, yyssp);
+     }
+-  else if (yyn == 0)
+-    goto yyerrpop;
+ 
+   if (yyn == YYFINAL)
+     YYACCEPT;
+ 
+-#if YYDEBUG != 0
+-  if (yydebug)
+-    fprintf(stderr, "Shifting error token, ");
+-#endif
++  YYDPRINTF ((stderr, "Shifting error token, "));
+ 
+   *++yyvsp = yylval;
+-#ifdef YYLSP_NEEDED
+-  *++yylsp = yylloc;
+-#endif
++
+ 
+   yystate = yyn;
+   goto yynewstate;
+ 
+- yyacceptlab:
+-  /* YYACCEPT comes here.  */
+-  if (yyfree_stacks)
+-    {
+-      free (yyss);
+-      free (yyvs);
+-#ifdef YYLSP_NEEDED
+-      free (yyls);
+-#endif
+-    }
+-  return 0;
+ 
+- yyabortlab:
+-  /* YYABORT comes here.  */
+-  if (yyfree_stacks)
+-    {
+-      free (yyss);
+-      free (yyvs);
+-#ifdef YYLSP_NEEDED
+-      free (yyls);
++/*-------------------------------------.
++| yyacceptlab -- YYACCEPT comes here.  |
++`-------------------------------------*/
++yyacceptlab:
++  yyresult = 0;
++  goto yyreturn;
++
++/*-----------------------------------.
++| yyabortlab -- YYABORT comes here.  |
++`-----------------------------------*/
++yyabortlab:
++  yyresult = 1;
++  goto yyreturn;
++
++#ifndef yyoverflow
++/*----------------------------------------------.
++| yyoverflowlab -- parser overflow comes here.  |
++`----------------------------------------------*/
++yyoverflowlab:
++  yyerror ("parser stack overflow");
++  yyresult = 2;
++  /* Fall through.  */
++#endif
++
++yyreturn:
++#ifndef yyoverflow
++  if (yyss != yyssa)
++    YYSTACK_FREE (yyss);
+ #endif
+-    }
+-  return 1;
++  return yyresult;
+ }
+-#line 375 "./vcc.y"
++
++
++#line 379 "vcc.y"
+ 
+ /****************************************************************************/
+ static int pushVObject(const char *prop)
+@@ -2151,3 +2494,5 @@
+ 	}
+     }
+ 
++
++
+Index: libkcal/versit/vcc.y
+===================================================================
+RCS file: /home/kde/kdepim/libkcal/versit/vcc.y,v
+retrieving revision 1.3
+retrieving revision 1.3.8.1
+diff -u -r1.3 -r1.3.8.1
+--- libkcal/versit/vcc.y	11 Jul 2003 21:03:14 -0000	1.3
++++ libkcal/versit/vcc.y	13 Dec 2004 01:56:50 -0000	1.3.8.1
+@@ -147,6 +147,10 @@
+ #endif
+ 
+ int yyparse();
++static int yylex();
++
++static VObject* popVObject();
++
+ 
+ enum LexMode {
+ 	L_NORMAL,
+Index: libkdepim/addresseelineedit.cpp
+===================================================================
+RCS file: /home/kde/kdepim/libkdepim/addresseelineedit.cpp,v
+retrieving revision 1.24.2.6
+retrieving revision 1.24.2.9
+diff -u -r1.24.2.6 -r1.24.2.9
+--- libkdepim/addresseelineedit.cpp	24 Nov 2004 11:11:11 -0000	1.24.2.6
++++ libkdepim/addresseelineedit.cpp	30 Nov 2004 10:47:35 -0000	1.24.2.9
+@@ -86,6 +86,7 @@
+   m_useCompletion = useCompletion;
+   m_completionInitialized = false;
+   m_smartPaste = false;
++  m_addressBookConnected = false;
+ 
+   init();
+ 
+@@ -319,35 +320,17 @@
+   if ( !m_useCompletion )
+     return;
+ 
+-  QString prevAddr;
+-
+-  QString s( text() );
+-  int n = s.findRev(',');
+-
+-  if ( n >= 0 ) {
+-    n++; // Go past the ","
+-
+-    int len = s.length();
+-
+-    // Increment past any whitespace...
+-    while ( n < len && s[ n ].isSpace() )
+-      n++;
+-
+-    prevAddr = s.left( n );
+-    s = s.mid( n, 255 ).stripWhiteSpace();
+-  }
+-
+   if ( s_addressesDirty )
+     loadContacts(); // read from local address book
+ 
+   // cursor at end of string - or Ctrl+T pressed for substring completion?
+   if ( ctrlT ) {
+-    const QStringList completions = s_completion->substringCompletion( s );
++    const QStringList completions = s_completion->substringCompletion( m_searchString );
+ 
+     if ( completions.count() > 1 )
+-      m_previousAddresses = prevAddr;
++      ; //m_previousAddresses = prevAddr;
+     else if ( completions.count() == 1 )
+-      setText( prevAddr + completions.first() );
++      setText( m_previousAddresses + completions.first() );
+ 
+     setCompletedItems( completions, true ); // this makes sure the completion popup is closed if no matching items were found
+ 
+@@ -360,19 +343,19 @@
+   switch ( mode ) {
+     case KGlobalSettings::CompletionPopupAuto:
+     {
+-      if ( s.isEmpty() )
++      if ( m_searchString.isEmpty() )
+         break;
+     }
+ 
+     case KGlobalSettings::CompletionPopup:
+     {
+-      m_previousAddresses = prevAddr;
+-      QStringList items = s_completion->allMatches( s );
+-      items += s_completion->allMatches( "\"" + s );
++      //m_previousAddresses = prevAddr;
++      QStringList items = s_completion->allMatches( m_searchString );
++      items += s_completion->allMatches( "\"" + m_searchString );
+       uint beforeDollarCompletionCount = items.count();
+ 
+-      if ( s.find( ' ' ) == -1 ) // one word, possibly given name
+-        items += s_completion->allMatches( "$$" + s );
++      if ( m_searchString.find( ' ' ) == -1 ) // one word, possibly given name
++        items += s_completion->allMatches( "$$" + m_searchString );
+ 
+       if ( items.isEmpty() ) {
+         setCompletedItems( items, false );
+@@ -391,8 +374,8 @@
+         setCompletedItems( items, autoSuggest );
+ 
+         if ( !autoSuggest ) {
+-          int index = items.first().find( s );
+-          QString newText = prevAddr + items.first().mid( index );
++          int index = items.first().find( m_searchString );
++          QString newText = m_previousAddresses + items.first().mid( index );
+           setUserSelection( false );
+           setCompletedText( newText, true );
+         }
+@@ -403,9 +386,9 @@
+ 
+     case KGlobalSettings::CompletionShell:
+     {
+-      QString match = s_completion->makeCompletion( s );
+-      if ( !match.isNull() && match != s ) {
+-        setText( prevAddr + match );
++      QString match = s_completion->makeCompletion( m_searchString );
++      if ( !match.isNull() && match != m_searchString ) {
++        setText( m_previousAddresses + match );
+         cursorAtEnd();
+       }
+       break;
+@@ -414,10 +397,10 @@
+     case KGlobalSettings::CompletionMan: // Short-Auto in fact
+     case KGlobalSettings::CompletionAuto:
+     {
+-      if ( !s.isEmpty() ) {
+-        QString match = s_completion->makeCompletion( s );
+-        if ( !match.isNull() && match != s ) {
+-          QString adds = prevAddr + match;
++      if ( !m_searchString.isEmpty() ) {
++        QString match = s_completion->makeCompletion( m_searchString );
++        if ( !match.isNull() && match != m_searchString ) {
++          QString adds = m_previousAddresses + match;
+           setCompletedText( adds );
+         }
+         break;
+@@ -484,10 +467,10 @@
+ 
+   QApplication::restoreOverrideCursor();
+ 
+-  disconnect( addressBook, SIGNAL( addressBookChanged( AddressBook* ) ),
+-              this, SLOT( loadContacts() ) );
+-
+-  connect( addressBook, SIGNAL( addressBookChanged( AddressBook* ) ), SLOT( loadContacts() ) );
++  if ( !m_addressBookConnected ) {
++    connect( addressBook, SIGNAL( addressBookChanged( AddressBook* ) ), SLOT( loadContacts() ) );
++    m_addressBookConnected = true;
++  }
+ }
+ 
+ void AddresseeLineEdit::addContact( const KABC::Addressee& addr, int weight )
+@@ -559,20 +542,36 @@
+ 
+ void AddresseeLineEdit::setCompletedItems( const QStringList& items, bool autoSuggest )
+ {
+-    QString txt = text();
++    KCompletionBox* completionBox = this->completionBox();
+ 
+     if ( !items.isEmpty() &&
+-         !(items.count() == 1 && txt == items.first()) )
++         !(items.count() == 1 && m_searchString == items.first()) )
+     {
+-        if ( !txt.isEmpty() )
+-            completionBox()->setCancelledText( txt );
+-
+-        completionBox()->setItems( items );
+-        completionBox()->popup();
++        if ( completionBox->isVisible() )
++        {
++          bool wasSelected = completionBox->isSelected( completionBox->currentItem() );
++          const QString currentSelection = completionBox->currentText();
++          completionBox->setItems( items );
++          QListBoxItem* item = completionBox->findItem( currentSelection, Qt::ExactMatch );
++          if ( item )
++          {
++            completionBox->blockSignals( true );
++            completionBox->setCurrentItem( item );
++            completionBox->setSelected( item, wasSelected );
++            completionBox->blockSignals( false );
++          }
++        }
++        else // completion box not visible yet -> show it
++        {
++          if ( !m_searchString.isEmpty() )
++            completionBox->setCancelledText( m_searchString );
++          completionBox->setItems( items );
++          completionBox->popup();
++        }
+ 
+         if ( autoSuggest )
+         {
+-            int index = items.first().find( txt );
++            int index = items.first().find( m_searchString );
+             QString newText = items.first().mid( index );
+             setUserSelection(false);
+             setCompletedText(newText,true);
+@@ -580,8 +579,8 @@
+     }
+     else
+     {
+-        if ( completionBox() && completionBox()->isVisible() )
+-            completionBox()->hide();
++        if ( completionBox && completionBox->isVisible() )
++            completionBox->hide();
+     }
+ }
+ 
+@@ -626,4 +625,28 @@
+   userCancelled( cancelText ); // in KLineEdit
+ }
+ 
++void KPIM::AddresseeLineEdit::slotCompletion()
++{
++  // Called by KLineEdit's keyPressEvent -> new text, update search string
++  m_searchString = text();
++  int n = m_searchString.findRev(',');
++  if ( n >= 0 ) {
++    ++n; // Go past the ","
++
++    int len = m_searchString.length();
++
++    // Increment past any whitespace...
++    while ( n < len && m_searchString[ n ].isSpace() )
++      ++n;
++
++    m_previousAddresses = m_searchString.left( n );
++    m_searchString = m_searchString.mid( n ).stripWhiteSpace();
++  }
++  else
++  {
++    m_previousAddresses = QString::null;
++  }
++  doCompletion( false );
++}
++
+ #include "addresseelineedit.moc"
+Index: libkdepim/addresseelineedit.h
+===================================================================
+RCS file: /home/kde/kdepim/libkdepim/addresseelineedit.h,v
+retrieving revision 1.14.2.2
+retrieving revision 1.14.2.5
+diff -u -r1.14.2.2 -r1.14.2.5
+--- libkdepim/addresseelineedit.h	28 Oct 2004 20:15:59 -0000	1.14.2.2
++++ libkdepim/addresseelineedit.h	30 Nov 2004 10:47:35 -0000	1.14.2.5
+@@ -93,7 +93,7 @@
+     void slotIMAPCompletionOrderChanged();
+ 
+   private slots:
+-    void slotCompletion() { doCompletion(false); }
++    void slotCompletion();
+     void slotPopupCompletion( const QString& );
+     void slotStartLDAPLookup();
+     void slotLDAPSearchData( const KPIM::LdapResultList& );
+@@ -106,11 +106,14 @@
+     void stopLDAPLookup();
+ 
+     void setCompletedItems( const QStringList& items, bool autoSuggest );
++    QString completionSearchText( QString& );
+ 
+     QString m_previousAddresses;
++    QString m_searchString;
+     bool m_useCompletion;
+     bool m_completionInitialized;
+     bool m_smartPaste;
++    bool m_addressBookConnected;
+ 
+     //QMap<QString, KABC::Addressee> m_contactMap;
+ 
+Index: libkdepim/addresseeview.cpp
+===================================================================
+RCS file: /home/kde/kdepim/libkdepim/addresseeview.cpp,v
+retrieving revision 1.47
+retrieving revision 1.47.2.1
+diff -u -r1.47 -r1.47.2.1
+--- libkdepim/addresseeview.cpp	20 Jul 2004 19:27:08 -0000	1.47
++++ libkdepim/addresseeview.cpp	29 Nov 2004 15:05:05 -0000	1.47.2.1
+@@ -638,8 +638,8 @@
+ 
+   if ( job->error() )
+     mImageData.truncate( 0 );
+-
+-  updateView();
++  else
++    updateView();
+ }
+ 
+ void AddresseeView::load()
+Index: libkdepim/completionordereditor.cpp
+===================================================================
+RCS file: /home/kde/kdepim/libkdepim/completionordereditor.cpp,v
+retrieving revision 1.1.2.2
+retrieving revision 1.1.2.3
+diff -u -r1.1.2.2 -r1.1.2.3
+--- libkdepim/completionordereditor.cpp	28 Sep 2004 17:16:27 -0000	1.1.2.2
++++ libkdepim/completionordereditor.cpp	28 Dec 2004 19:54:14 -0000	1.1.2.3
+@@ -74,17 +74,6 @@
+ 
+ namespace KPIM {
+ 
+-// Base class for items in the list
+-class CompletionItem
+-{
+-public:
+-  virtual ~CompletionItem() {}
+-  virtual QString label() const = 0;
+-  virtual int completionWeight() const = 0;
+-  virtual void setCompletionWeight( int weight ) = 0;
+-  virtual void save( CompletionOrderEditor* ) = 0;
+-};
+-
+ int CompletionItemList::compareItems( QPtrCollection::Item s1, QPtrCollection::Item s2 )
+ {
+   int w1 = ( (CompletionItem*)s1 )->completionWeight();
+Index: libkdepim/completionordereditor.h
+===================================================================
+RCS file: /home/kde/kdepim/libkdepim/completionordereditor.h,v
+retrieving revision 1.1
+retrieving revision 1.1.2.1
+diff -u -r1.1 -r1.1.2.1
+--- libkdepim/completionordereditor.h	4 Jun 2004 23:54:52 -0000	1.1
++++ libkdepim/completionordereditor.h	28 Dec 2004 19:54:14 -0000	1.1.2.1
+@@ -38,8 +38,20 @@
+ class KListView;
+ namespace KPIM {
+ 
+-class CompletionItem;
+ class LdapSearch;
++class CompletionOrderEditor;
++
++// Base class for items in the list
++class CompletionItem
++{
++public:
++  virtual ~CompletionItem() {}
++  virtual QString label() const = 0;
++  virtual int completionWeight() const = 0;
++  virtual void setCompletionWeight( int weight ) = 0;
++  virtual void save( CompletionOrderEditor* ) = 0;
++};
++
+ 
+ // I don't like QPtrList much, but it has compareItems, which QValueList doesn't
+ class CompletionItemList : public QPtrList<CompletionItem>
+Index: libkdepim/komposer/core/komposereditor.desktop
+===================================================================
+RCS file: /home/kde/kdepim/libkdepim/komposer/core/komposereditor.desktop,v
+retrieving revision 1.20.2.8
+retrieving revision 1.20.2.10
+diff -u -r1.20.2.8 -r1.20.2.10
+--- libkdepim/komposer/core/komposereditor.desktop	13 Nov 2004 07:20:59 -0000	1.20.2.8
++++ libkdepim/komposer/core/komposereditor.desktop	10 Jan 2005 09:02:04 -0000	1.20.2.10
+@@ -4,7 +4,9 @@
+ X-KDE-ServiceType=Komposer/Editor
+ X-KDE-Derived=Komposer/Plugin
+ Comment=Komposer Editor
++Comment[ar]=Komposer محرر
+ Comment[bg]=Писане на форматиран текст
++Comment[br]=Aozer Komposer
+ Comment[bs]=Komposer editor
+ Comment[ca]=Compositor per a KDE
+ Comment[da]=Komposer editor
+Index: libkdepim/komposer/core/komposerplugin.desktop
+===================================================================
+RCS file: /home/kde/kdepim/libkdepim/komposer/core/komposerplugin.desktop,v
+retrieving revision 1.38.2.5
+retrieving revision 1.38.2.6
+diff -u -r1.38.2.5 -r1.38.2.6
+--- libkdepim/komposer/core/komposerplugin.desktop	28 Nov 2004 08:34:05 -0000	1.38.2.5
++++ libkdepim/komposer/core/komposerplugin.desktop	29 Dec 2004 21:45:12 -0000	1.38.2.6
+@@ -2,6 +2,7 @@
+ Type=ServiceType
+ X-KDE-ServiceType=Komposer/Plugin
+ Name=Komposer Plugin
++Name[ar]= أداة إضافية لـ Komposer
+ Name[bg]=Приставки на Komposer
+ Name[br]=Lugent Komposer
+ Name[bs]=Komposer dodatak
+Index: libkdepim/komposer/plugins/krichtext/krichtextplugin.desktop
+===================================================================
+RCS file: /home/kde/kdepim/libkdepim/komposer/plugins/krichtext/Attic/krichtextplugin.desktop,v
+retrieving revision 1.50.2.9
+retrieving revision 1.50.2.10
+diff -u -r1.50.2.9 -r1.50.2.10
+--- libkdepim/komposer/plugins/krichtext/krichtextplugin.desktop	28 Nov 2004 08:34:05 -0000	1.50.2.9
++++ libkdepim/komposer/plugins/krichtext/krichtextplugin.desktop	5 Jan 2005 07:50:34 -0000	1.50.2.10
+@@ -17,6 +17,7 @@
+ X-KDE-PluginInfo-Depends=
+ X-KDE-PluginInfo-License=LGPL
+ Name=RichText Editor
++Name[ar]=KPilot
+ Name[bs]=RichText editor
+ Name[ca]=Editor de text enriquit
+ Name[da]=RichText editor
+@@ -45,6 +46,7 @@
+ Name[uk]=Редактор RichText
+ Name[zh_CN]=富文本编辑器
+ Comment=Komposer KRichText Plugin
++Comment[ar]=أداة إضافية لاختبار Kontact
+ Comment[bg]=Редактор с поддръжка за форматиране на текста
+ Comment[br]=Lugent Komposer KRichText
+ Comment[bs]=Komposer KRichText dodatak
+Index: plugins/kmail/bodypartformatter/text_calendar.desktop
+===================================================================
+RCS file: /home/kde/kdepim/plugins/kmail/bodypartformatter/text_calendar.desktop,v
+retrieving revision 1.20.2.7
+retrieving revision 1.20.2.8
+diff -u -r1.20.2.7 -r1.20.2.8
+--- plugins/kmail/bodypartformatter/text_calendar.desktop	13 Nov 2004 07:21:00 -0000	1.20.2.7
++++ plugins/kmail/bodypartformatter/text_calendar.desktop	29 Dec 2004 21:45:13 -0000	1.20.2.8
+@@ -1,6 +1,7 @@
+ [Misc]
+ Encoding=UTF-8
+ Name=Application Octetstream
++Name[ar]=دفق ثماني الأجزاء للبرنامج
+ Name[ca]=Aplicació Octetstream
+ Name[da]=Program oktetstrøm
+ Name[es]=Aplicación en flujo de octetos
+@@ -21,6 +22,7 @@
+ Name[tg]=Миқдори зиёди бинарии барномот
+ Name[zh_CN]=应用程序 Octetstream
+ Comment=A bodypart formatter plugin for text/calendar
++Comment[ar]=أداة إضافية لتنسيق أجزاء لنص أو تقويم
+ Comment[bs]=Dodatak za formatiranje tijela poruke za text/calendar
+ Comment[ca]=Un endollable formatador del cos per a text/calendar
+ Comment[cs]=Formátovač těla emailu pro typ text/calendar
+Index: plugins/kmail/bodypartformatter/text_vcard.desktop
+===================================================================
+RCS file: /home/kde/kdepim/plugins/kmail/bodypartformatter/text_vcard.desktop,v
+retrieving revision 1.20.2.8
+retrieving revision 1.20.2.9
+diff -u -r1.20.2.8 -r1.20.2.9
+--- plugins/kmail/bodypartformatter/text_vcard.desktop	13 Nov 2004 07:21:00 -0000	1.20.2.8
++++ plugins/kmail/bodypartformatter/text_vcard.desktop	29 Dec 2004 21:45:13 -0000	1.20.2.9
+@@ -1,6 +1,7 @@
+ [Misc]
+ Encoding=UTF-8
+ Name=Application Octetstream
++Name[ar]=دفق ثماني الأجزاء للبرنامج
+ Name[ca]=Aplicació Octetstream
+ Name[da]=Program oktetstrøm
+ Name[es]=Aplicación en flujo de octetos
+@@ -21,6 +22,7 @@
+ Name[tg]=Миқдори зиёди бинарии барномот
+ Name[zh_CN]=应用程序 Octetstream
+ Comment=A bodypart formatter plugin for text/vcard
++Comment[ar]=أداة إضافية لتنسيق أجزاء من ملفات نصية أو vCard
+ Comment[br]=Arload tresañ Xfig
+ Comment[bs]=Dodatak za formatiranje tijela poruke za text/vcard
+ Comment[ca]=Un endollable formatador del cos per a text/vcard

Deleted: trunk/packages/kdepim/debian/patches/01_kdepim_branch.diff.uu

Deleted: trunk/packages/kdepim/debian/patches/02_autotools_update.diff

Added: trunk/packages/kdepim/debian/patches/02_disable_no_undefined.diff
===================================================================
--- trunk/packages/kdepim/debian/patches/02_disable_no_undefined.diff	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/patches/02_disable_no_undefined.diff	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,23 @@
+Index: admin/acinclude.m4.in
+===================================================================
+RCS file: /home/kde/kde-common/admin/acinclude.m4.in,v
+retrieving revision 2.461
+diff -u -r2.461 acinclude.m4.in
+--- admin/acinclude.m4.in	26 Jul 2004 14:13:36 -0000	2.461
++++ admin/acinclude.m4.in	1 Aug 2004 21:23:13 -0000
+@@ -1665,15 +1665,6 @@
+        KDE_USE_CLOSURE_TRUE="#"
+        KDE_USE_CLOSURE_FALSE=""
+        KDE_NO_UNDEFINED=""
+-       case $host in 
+-         *-*-linux-gnu)
+-           KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined],
+-                [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined],
+-		[KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"],
+-		[KDE_NO_UNDEFINED=""])],
+-	    [KDE_NO_UNDEFINED=""])
+-           ;;
+-       esac
+   fi
+   AC_SUBST(KDE_USE_CLOSURE_TRUE)
+   AC_SUBST(KDE_USE_CLOSURE_FALSE)

Added: trunk/packages/kdepim/debian/patches/03_automake1.8.diff
===================================================================
--- trunk/packages/kdepim/debian/patches/03_automake1.8.diff	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/patches/03_automake1.8.diff	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,29 @@
+Index: admin/detect-autoconf.sh
+===================================================================
+RCS file: /home/kde/kde-common/admin/detect-autoconf.sh,v
+retrieving revision 1.13
+diff -u -r1.13 detect-autoconf.sh
+--- admin/detect-autoconf.sh	24 May 2004 11:36:58 -0000	1.13
++++ admin/detect-autoconf.sh	6 Nov 2004 20:05:20 -0000
+@@ -10,8 +10,8 @@
+ # Please add higher versions first. The last version number is the minimum
+ # needed to compile KDE. Do not forget to include the name/version #
+ # separator if one is present, e.g. -1.2 where - is the separator.
+-KDE_AUTOCONF_VERS="-2.58 -2.57 257 -2.54 -2.53a -2.53 -2.52 -2.5x"
+-KDE_AUTOMAKE_VERS="-1.7 17 -1.6"
++KDE_AUTOCONF_VERS="-2.58 -2.57 257 -2.54 -2.53a -2.53 -2.52 -2.5x 2.50"
++KDE_AUTOMAKE_VERS="-1.9 -1.8 -1.7 17 -1.6"
+ 
+ # We don't use variable here for remembering the type ... strings. Local 
+ # variables are not that portable, but we fear namespace issues with our
+@@ -22,7 +22,9 @@
+     if test -x "`$WHICH $AUTOCONF$kde_autoconf_version 2>/dev/null`"; then
+       AUTOCONF="`$WHICH $AUTOCONF$kde_autoconf_version`"
+       AUTOHEADER="`$WHICH $AUTOHEADER$kde_autoconf_version`"
+-      AUTOM4TE="`$WHICH $AUTOM4TE$kde_autoconf_version`"
++      if test -x "`$WHICH $AUTOM4TE$kde_autoconf_version 2>/dev/null`"; then
++	AUTOM4TE="`$WHICH $AUTOM4TE$kde_autoconf_version`"
++      fi
+       break
+   fi
+   done

Deleted: trunk/packages/kdepim/debian/patches/03_libtool_arm.diff

Deleted: trunk/packages/kdepim/debian/patches/04_am_maintainer_mode.diff

Added: trunk/packages/kdepim/debian/patches/04_disable_static_la_final.diff
===================================================================
--- trunk/packages/kdepim/debian/patches/04_disable_static_la_final.diff	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/patches/04_disable_static_la_final.diff	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,60 @@
+Index: admin/acinclude.m4.in
+===================================================================
+RCS file: /home/kde/kde-common/admin/acinclude.m4.in,v
+retrieving revision 2.461.2.1
+diff -u -r2.461.2.1 acinclude.m4.in
+--- admin/acinclude.m4.in	25 Aug 2004 21:21:05 -0000	2.461.2.1
++++ admin/acinclude.m4.in	31 Oct 2004 19:20:31 -0000
+@@ -1634,6 +1634,8 @@
+ 
+ AC_DEFUN([KDE_CHECK_FINAL],
+ [
++  AC_REQUIRE([AC_ENABLE_STATIC])
++
+   AC_ARG_ENABLE(final,
+ 	AC_HELP_STRING([--enable-final],
+ 		       [build size optimized apps (experimental - needs lots of memory)]),
+@@ -1642,12 +1644,23 @@
+   if test "x$kde_use_final" = "xyes"; then
+       KDE_USE_FINAL_TRUE=""
+       KDE_USE_FINAL_FALSE="#"
++      if test "x$enable_static" = "xyes"; then
++	KDE_USE_FINAL_LA_TRUE="#"
++	KDE_USE_FINAL_LA_FALSE=""
++      else
++	KDE_USE_FINAL_LA_TRUE=""
++	KDE_USE_FINAL_LA_FALSE="#"
++      fi
+    else
+       KDE_USE_FINAL_TRUE="#"
+       KDE_USE_FINAL_FALSE=""
++      KDE_USE_FINAL_LA_TRUE="#"
++      KDE_USE_FINAL_LA_FALSE=""
+   fi
+   AC_SUBST(KDE_USE_FINAL_TRUE)
+   AC_SUBST(KDE_USE_FINAL_FALSE)
++  AC_SUBST(KDE_USE_FINAL_LA_TRUE)
++  AC_SUBST(KDE_USE_FINAL_LA_FALSE)
+ ])
+ 
+ AC_DEFUN([KDE_CHECK_CLOSURE],
+Index: admin/am_edit
+===================================================================
+RCS file: /home/kde/kde-common/admin/am_edit,v
+retrieving revision 1.411
+diff -u -r1.411 am_edit
+--- admin/am_edit	24 Mar 2004 22:26:00 -0000	1.411
++++ admin/am_edit	31 Oct 2004 19:20:33 -0000
+@@ -369,8 +369,10 @@
+         if (!$kdeopts{"nofinal"} && @list > 1 && $finalObjs{$program}) {
+             $new .= "$program\_final\_OBJECTS = " . $finalObjs{$program};
+             $new .= "\n$program\_nofinal\_OBJECTS = " . $realObjs{$program};
+-            $new .= "\n\@KDE_USE_FINAL_FALSE\@$program\_OBJECTS = \$($program\_nofinal\_OBJECTS)";
+-            $new .= "\n\@KDE_USE_FINAL_TRUE\@$program\_OBJECTS = \$($program\_final\_OBJECTS)";
++	    my $final_tag = (($program =~ /_la$/) ?
++			     "\@KDE_USE_FINAL_LA" : "\@KDE_USE_FINAL");
++            $new .= "\n$final_tag\_FALSE\@$program\_OBJECTS = \$($program\_nofinal\_OBJECTS)";
++            $new .= "\n$final_tag\_TRUE\@$program\_OBJECTS = \$($program\_final\_OBJECTS)";
+ 
+             $final_lines .= "$program\_OBJECTS=\"\$($program\_final_OBJECTS)\" ";
+             $final_install_lines .= "$program\_OBJECTS=\"\$($program\_final_OBJECTS)\" ";

Deleted: trunk/packages/kdepim/debian/patches/05_pedantic-errors.diff

Added: trunk/packages/kdepim/debian/patches/20_korganizer_makefile.diff
===================================================================
--- trunk/packages/kdepim/debian/patches/20_korganizer_makefile.diff	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/patches/20_korganizer_makefile.diff	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,18 @@
+Index: korganizer/Makefile.am
+===================================================================
+RCS file: /home/kde/kdepim/korganizer/Makefile.am,v
+retrieving revision 1.275
+diff -u -r1.275 Makefile.am
+--- korganizer/Makefile.am	8 Jul 2004 13:13:01 -0000	1.275
++++ korganizer/Makefile.am	5 Aug 2004 14:47:29 -0000
+@@ -48,8 +48,8 @@
+ timezone_SOURCES = timezone.cpp
+ timezone_COMPILE_FIRST = koprefs_base.h
+ 
+-lib_LTLIBRARIES = libkorganizer.la libkorganizer_eventviewer.la \
+-                  libkorganizer_calendar.la
++lib_LTLIBRARIES = libkorganizer_eventviewer.la \
++                  libkorganizer_calendar.la libkorganizer.la
+ 
+ libkorganizer_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 1:0
+ libkorganizer_la_LIBADD  = $(LIB_KPARTS) $(LIB_KFILE) \

Added: trunk/packages/kdepim/debian/patches/21_lib_link.diff
===================================================================
--- trunk/packages/kdepim/debian/patches/21_lib_link.diff	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/patches/21_lib_link.diff	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,32 @@
+Index: kalarmd/Makefile.am
+===================================================================
+RCS file: /home/kde/kdepim/kalarmd/Makefile.am,v
+retrieving revision 1.46
+diff -u -r1.46 Makefile.am
+--- kalarmd/Makefile.am	22 Mar 2004 12:15:34 -0000	1.46
++++ kalarmd/Makefile.am	27 Aug 2004 03:27:26 -0000
+@@ -3,7 +3,7 @@
+ lib_LTLIBRARIES = libkalarmd.la
+ 
+ libkalarmd_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+-libkalarmd_la_LIBADD  = $(LIB_KDECORE)
++libkalarmd_la_LIBADD  = $(LIB_KDECORE) $(top_builddir)/libkcal/libkcal.la
+ libkalarmd_la_SOURCES =  alarmdaemoniface.stub alarmguiiface.stub \
+ 	adcalendarbase.cpp
+ 
+Index: kpilot/lib/Makefile.am
+===================================================================
+RCS file: /home/kde/kdepim/kpilot/lib/Makefile.am,v
+retrieving revision 1.20
+diff -u -r1.20 Makefile.am
+--- kpilot/lib/Makefile.am	18 Jan 2004 15:32:37 -0000	1.20
++++ kpilot/lib/Makefile.am	27 Aug 2004 03:27:28 -0000
+@@ -25,7 +25,7 @@
+ 	pilotDateEntry.cc pilotTodoEntry.cc
+ 
+ libkpilot_la_LDFLAGS = $(all_libraries) $(KDE_EXTRA_RPATH) $(KDE_RPATH)
+-libkpilot_la_LIBADD = $(PISOCK_LIB)
++libkpilot_la_LIBADD = $(PISOCK_LIB) $(LIB_KDEUI)
+ 
+ kpilotincludedir = $(includedir)/kpilot
+ kpilotinclude_HEADERS = kpilotlink.h uiDialog.h plugin.h syncAction.h \

Added: trunk/packages/kdepim/debian/patches/22_kmail_nofinal.diff
===================================================================
--- trunk/packages/kdepim/debian/patches/22_kmail_nofinal.diff	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/patches/22_kmail_nofinal.diff	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,13 @@
+Index: kmail/Makefile.am
+===================================================================
+RCS file: /home/kde/kdepim/kmail/Makefile.am,v
+retrieving revision 1.286.2.4
+diff -u -r1.286.2.4 Makefile.am
+--- kmail/Makefile.am	19 Oct 2004 19:54:52 -0000	1.286.2.4
++++ kmail/Makefile.am	11 Dec 2004 23:04:20 -0000
+@@ -1,4 +1,4 @@
+-#KDE_OPTIONS = nofinal
++KDE_OPTIONS = nofinal
+ KDE_CXXFLAGS = $(USE_RTTI)
+ 
+ SUBDIRS = interfaces . about pics profiles avscripts

Added: trunk/packages/kdepim/debian/po/de.po
===================================================================
--- trunk/packages/kdepim/debian/po/de.po	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/po/de.po	2005-01-21 03:24:38 UTC (rev 434)
@@ -0,0 +1,70 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans#
+#    Developers do not need to manually edit POT or PO files.
+# Erik Schanze <mail@erikschanze.de>, 2004.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: jpilot_0.99.7-7_de\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-04-26 22:44-0500\n"
+"PO-Revision-Date: 2004-08-09 18:31+0200\n"
+"Last-Translator: Erik Schanze <mail@erikschanze.de>\n"
+"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.3.1\n"
+"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+
+#. Type: select
+#. choices
+#: ../kpilot.templates:3
+msgid "None, ttyS0, ttyS1, ttyS2, ttyS3, ircomm0, ttyUSB0, ttyUSB1"
+msgstr "kein, ttyS0, ttyS1, ttyS2, ttyS3, ircomm0, ttyUSB0, ttyUSB1"
+
+#. Type: select
+#. description
+#: ../kpilot.templates:4
+msgid "Which communication port to use with the Palm?"
+msgstr "Welchen Anschluss für den Palm benutzen?"
+
+#. Type: select
+#. description
+#: ../kpilot.templates:4
+msgid ""
+"A symbolic file /dev/pilot may be created to the port use to talk to the "
+"Palm."
+msgstr ""
+"Ein symbolischer Link /dev/pilot sollte angelegt werden, der auf den "
+"Anschluss zeigt, der für den Datenaustausch mit dem Palm benutzt wird."
+
+#. Type: select
+#. description
+#: ../kpilot.templates:4
+msgid ""
+"ttyS? are the four serial ports, ircomm0 is the IrDA (infra red) port, "
+"ttyUSB? are the USB ports."
+msgstr ""
+"ttyS? sind die seriellen Anschlüsse (COM ?), ircomm0 ist der IrDA-(Infrarot)-"
+"Anschluss, ttyUSB? sind die USB-Anschlüsse."
+
+#. Type: select
+#. description
+#: ../kpilot.templates:4
+msgid ""
+"To ease the use of the Palm connected to the port its access rights will be "
+"lowered to allow access to any user.  If it is a security problem for you, "
+"select \"None\" and manage the link and its access rights yourself."
+msgstr ""
+"Für einen einfachen Umgang mit den Palm, werden die Zugriffsrechte des "
+"jeweiligen Anschlusses herunter gesetzt, damit jeder Benutzer zugreifen "
+"kann. Wenn das für Sie ein Sicherheitsrisiko ist, wählen Sie \"kein\" aus "
+"und legen den Link mit den gewünschten Zugriffsrechten selbst an."

Modified: trunk/packages/kdepim/debian/rules
===================================================================
--- trunk/packages/kdepim/debian/rules	2005-01-21 03:11:00 UTC (rev 433)
+++ trunk/packages/kdepim/debian/rules	2005-01-21 03:24:38 UTC (rev 434)
@@ -1,224 +1,101 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-#
-# Modified to make a template file for a multi-binary package with separated
-# build-arch and build-indep targets  by Bill Allombert 2001
+#! /usr/bin/make -f
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/cdbs/1/rules/debhelper.mk
+include debian/kde.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/utils.mk
 
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
+DEB_KDE_CVS_MAKE := yes
+DEB_KDE_ENABLE_FINAL := yes
+DEB_KDE_APIDOX := yes
 
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE	?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE	?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_CONFIGURE_EXTRA_FLAGS := --enable-shared --disable-static
 
-CFLAGS = -Wall -g
+post-patches:: debian/stamp-libtool-update
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
+debian/stamp-libtool-update:
+	cp -f /usr/share/libtool/libtool.m4 admin/libtool.m4.in
+	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
+	touch debian/stamp-libtool-update
 
-objdir = $(CURDIR)/obj-$(DEB_BUILD_GNU_TYPE)
-
--include debian/debiandirs
-
-debian/debiandirs: admin/debianrules
-	perl -w admin/debianrules echodirs > debian/debiandirs
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-
-	# Apply Debian specific patches
-	if test -d $(CURDIR)/debian/patches ;\
-	then \
-		for i in $(CURDIR)/debian/patches/*.diff.uu ;\
-		do \
-			cd $(CURDIR)/debian/patches ;\
-			uudecode "$$i" ;\
-			cd $(CURDIR) ;\
-		done ;\
-		patches=$$(find $(CURDIR)/debian/patches -name *.diff | sort);\
-	fi ;\
-	if test ! -f patch-stamp; then \
-		for patch in $$patches ;\
-		do \
-			echo APPLYING PATCH\: "$${patch##*/}" ;\
-			patch -p1 < "$$patch" ;\
-		done ;\
-		touch patch-stamp ;\
-	fi
-
-	# KDE CVS does not have aclocal.m4 or configure
-	if test ! -f configure; then \
-		$(MAKE) -f admin/Makefile.common ;\
-	fi
-
-	# ensure configure is executable
-	chmod +x configure
-
-	# make build directory
-	mkdir $(objdir)
-
-	# run configure with build tree $(objdir)
-	cd $(objdir) && \
-	../configure $(configkde) --enable-final \
-	--with-extra-includes=/usr/include/libpisock \
-	--with-extra-includes=/usr/include/glib-1.2 \
-	--with-extra-includes=/usr/lib/glib/include \
-	--with-extra-includes=/usr/include/gtk-1.2
-
-	touch configure-stamp
-
-#Architecture
-build: build-arch build-indep
-
-build-arch: build-arch-stamp
-build-arch-stamp: configure-stamp
-	dh_testdir
-
-	cd $(objdir) && \
-	$(MAKE)
-
-	# generate manpages
-	for i in debian/man/*.sgml; do \
-		docbook-to-man $$i > `dirname $$i`/`basename $$i .sgml`.1 ;\
+common-build-arch:: debian/stamp-man-pages
+debian/stamp-man-pages:
+# Generate man pages for the programs
+	for f in debian/man/*.man; do \
+		soelim -Idebian/man $$f \
+		 >debian/man/`basename $$f .man`.1; \
 	done
+	touch debian/stamp-man-pages
 
-	touch build-arch-stamp
+clean::
+	rm -f debian/man/*.1
+	rm -f debian/stamp-libtool-update debian/stamp-man-pages
+	rm -f admin/libtool.m4.in admin/ltmain.sh
+	rm -f Makefile.cvs
+	rm -f debian/patches/04_korganizer_makefile.diff \
+		debian/patches/05_lib_link.diff
 
-build-indep: build-indep-stamp
-build-indep-stamp: configure-stamp
-	dh_testdir
+DEB_INSTALL_DOCS_ALL :=
 
-	cd $(objdir) && \
-	$(MAKE)
+DEB_INSTALL_CHANGELOGS_ALL = $(shell for f in ChangeLog CHANGELOG CHANGES; do if test -s $(cdbs_curpkg)/$$f; then echo $(cdbs_curpkg)/$$f; break; fi; done)
 
-	cd $(objdir) && \
-	$(MAKE) apidox
+shlibs_ver=4:3.3.1
+DEB_DH_MAKESHLIBS_ARGS_libkcal2a := -V'libkcal2a (>= 4:3.3.2)'
+DEB_DH_MAKESHLIBS_ARGS_libkdenetwork2 := -V'libkdenetwork2 (>= $(shlibs_ver))'
+DEB_DH_MAKESHLIBS_ARGS_libkdepim1 := -V'libkdepim1 (>= 4:3.3.2)'
+DEB_DH_MAKESHLIBS_ARGS_libkgantt0 := -V'libkgantt0 (>= $(shlibs_ver))'
+DEB_DH_MAKESHLIBS_ARGS_libkleopatra0 := -V'libkleopatra0 (>= $(shlibs_ver))'
+DEB_DH_MAKESHLIBS_ARGS_libkpimexchange1 := -V'libkpimexchange1 (>= $(shlibs_ver))'
+DEB_DH_MAKESHLIBS_ARGS_libkpimidentities1 := -V'libkpimidentities1 (>= $(shlibs_ver))'
+DEB_DH_MAKESHLIBS_ARGS_libksieve0 := -V'libksieve0 (>= $(shlibs_ver))'
+DEB_DH_MAKESHLIBS_ARGS_libmimelib1 := -V'libmimelib1 (>= $(shlibs_ver))'
+DEB_DH_MAKESHLIBS_ARGS_kaddressbook := -V
+DEB_DH_MAKESHLIBS_ARGS_kalarm := -V
+DEB_DH_MAKESHLIBS_ARGS_kdepim-wizards := -V
+DEB_DH_MAKESHLIBS_ARGS_kitchensync := -V
+DEB_DH_MAKESHLIBS_ARGS_kleopatra := -V
+DEB_DH_MAKESHLIBS_ARGS_kmail := -V
+DEB_DH_MAKESHLIBS_ARGS_knode := -V
+DEB_DH_MAKESHLIBS_ARGS_knotes := -V
+DEB_DH_MAKESHLIBS_ARGS_kontact := -V
+DEB_DH_MAKESHLIBS_ARGS_korganizer := -V
+DEB_DH_MAKESHLIBS_ARGS_kpilot := -V
+DEB_DH_MAKESHLIBS_ARGS_ksync := -V
+DEB_DH_MAKESHLIBS_ARGS_ktnef := -V
 
-	touch build-indep-stamp
+DEB_SHLIBDEPS_INCLUDE := \
+	debian/kaddressbook/usr/lib \
+	debian/kalarm/usr/lib \
+	debian/kdepim-wizards/usr/lib \
+	debian/kitchensync/usr/lib \
+	debian/kleopatra/usr/lib \
+	debian/kmail/usr/lib \
+	debian/knode/usr/lib \
+	debian/knotes/usr/lib \
+	debian/kontact/usr/lib \
+	debian/korganizer/usr/lib \
+	debian/kpilot/usr/lib \
+	debian/ksync/usr/lib \
+	debian/ktnef/usr/lib \
+	debian/libkcal2a/usr/lib \
+	debian/libkdenetwork2/usr/lib \
+	debian/libkdepim1/usr/lib \
+	debian/libkgantt0/usr/lib \
+	debian/libkleopatra0/usr/lib \
+	debian/libkpimexchange1/usr/lib \
+	debian/libkpimidentities1/usr/lib \
+	debian/libksieve0/usr/lib \
+	debian/libmimelib1/usr/lib
 
-debian-clean:
-	dh_testdir
-	dh_testroot
-
-	dh_clean
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-arch-stamp build-indep-stamp configure-stamp \
-		debian/debiandirs debian/man/*.1
-
-	# Remove Debian specific patches
-	if test -d $(CURDIR)/debian/patches ;\
-	then \
-		patches=$$(find $(CURDIR)/debian/patches -name *.diff | sort -r);\
-	fi ;\
-	if test -f patch-stamp; then \
-		for patch in $$patches ;\
-		do \
-			echo REMOVING PATCH\: "$${patch##*/}" ;\
-			patch -p1 -R < "$$patch" ;\
-		done ;\
-		for i in $(CURDIR)/debian/patches/*.diff.uu ;\
-		do \
-			 rm -f "$${i%%.uu}" ;\
-		done ;\
-		rm -f patch-stamp ;\
-	fi
-
-	# Remove build tree
-	rm -rf $(objdir)
-
-	# if Makefile exists run distclean
-	if test -f Makefile; then \
-		$(MAKE) distclean; \
-	fi
-
-	if test -d CVS; then \
-		$(MAKE) -f admin/Makefile.common cvs-clean ;\
-	fi
-
-	dh_clean
-
-install: install-arch install-indep
-
-install-arch:
-	dh_testdir
-	dh_testroot
-	dh_clean -k -s
-	dh_installdirs -s
-
-	cd $(objdir) && \
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-
-	dh_install -s
-
-install-indep:
-	dh_testdir
-	dh_testroot
-	dh_clean -k -i
-	dh_installdirs -i
-
-	cd $(objdir) && \
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-
-	cd $(objdir) && \
-	$(MAKE) install-apidox DESTDIR=$(CURDIR)/debian/tmp
-
-	dh_install -i
-
-# Must not depend on anything. This is to be called by
-# binary-arch/binary-indep
-# in another 'make' thread.
-binary-common:
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs
-	dh_installdocs
-#	dh_installexamples
-	dh_installmenu
-	dh_installdebconf
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress -X.bz2 -X.css -X.dcl -X.docbook -X-license -X.tag
-	dh_fixperms
-#	dh_perl
-#	dh_python
-	dh_makeshlibs -V
-	dh_installdeb
-	dh_shlibdeps -ldebian/kaddressbook/usr/lib:debian/kalarm/usr/lib:debian/kmail/usr/lib:debian/kontact/usr/lib:debian/korganizer/usr/lib:debian/kpilot/usr/lib:debian/ksync/usr/lib:debian/ktnef/usr/lib:debian/libkcal2/usr/lib:debian/libkdenetwork2/usr/lib:debian/libkdepim1/usr/lib:debian/libkdgantt0/usr/lib:debian/libkgantt0/usr/lib:debian/libkpimexchange1/usr/lib:debian/libksieve0/usr/lib:debian/libmimelib1/usr/lib
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-# Build architecture independant packages using the common target.
-binary-indep: build-indep install-indep
-	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
-
-# Build architecture dependant packages using the common target.
-binary-arch: build-arch install-arch
-	$(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
-
-binary: binary-arch binary-indep
-.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure
+# kontact starts fine without korganizer or kpilot dependencies
+DEB_DH_SHLIBDEPS_ARGS += $(DEB_DH_SHLIBDEPS_ARGS_$(cdbs_curpkg))
+DEB_DH_SHLIBDEPS_ARGS_kontact := \
+	-Xusr/lib/kde3/libkontact_korganizerplugin.so \
+	-Xusr/lib/kde3/libkontact_kpilotplugin.so \
+	-Xusr/lib/kde3/libkontact_todoplugin.so -- \
+	-dRecommends \
+	debian/kontact/usr/lib/kde3/libkontact_korganizerplugin.so \
+	debian/kontact/usr/lib/kde3/libkontact_todoplugin.so \
+	-dSuggests \
+	debian/kontact/usr/lib/kde3/libkontact_kpilotplugin.so \
+	-dDepends	# Since -u args go first in dpkg-shlibdeps call